From bb53645b0f3d7ea5df91969b2011e6861f81ee9f Mon Sep 17 00:00:00 2001 From: Alexander Foremny Date: Wed, 12 Jun 2013 13:23:00 +0200 Subject: [PATCH 001/798] Add Elm and elm-server --- pkgs/development/compilers/elm/elm-server.nix | 21 ++++++++++++++++++ pkgs/development/compilers/elm/elm.nix | 22 +++++++++++++++++++ .../haskell/concatenative/default.nix | 13 +++++++++++ .../libraries/haskell/indents/default.nix | 14 ++++++++++++ pkgs/top-level/haskell-packages.nix | 8 +++++++ 5 files changed, 78 insertions(+) create mode 100644 pkgs/development/compilers/elm/elm-server.nix create mode 100644 pkgs/development/compilers/elm/elm.nix create mode 100644 pkgs/development/libraries/haskell/concatenative/default.nix create mode 100644 pkgs/development/libraries/haskell/indents/default.nix diff --git a/pkgs/development/compilers/elm/elm-server.nix b/pkgs/development/compilers/elm/elm-server.nix new file mode 100644 index 00000000000..1750213ac8a --- /dev/null +++ b/pkgs/development/compilers/elm/elm-server.nix @@ -0,0 +1,21 @@ +{ cabal, blazeHtml, deepseq, Elm, filepath, happstackServer, HTTP +, mtl, parsec, transformers +}: + +cabal.mkDerivation (self: { + pname = "elm-server"; + version = "0.8"; + sha256 = "0mnxayfg54f5mr27sd1zw3xrdijppgvrz2yzzmhp07qc1jiyfald"; + isLibrary = false; + isExecutable = true; + buildDepends = [ + blazeHtml deepseq Elm filepath happstackServer HTTP mtl parsec + transformers + ]; + meta = { + homepage = "http://elm-lang.org"; + description = "The Elm language server"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/compilers/elm/elm.nix b/pkgs/development/compilers/elm/elm.nix new file mode 100644 index 00000000000..8196458c70d --- /dev/null +++ b/pkgs/development/compilers/elm/elm.nix @@ -0,0 +1,22 @@ +{ cabal, blazeHtml, blazeMarkup, cmdargs, deepseq, filepath, hjsmin +, indents, json, mtl, pandoc, parsec, shakespeare, text +, transformers +}: + +cabal.mkDerivation (self: { + pname = "Elm"; + version = "0.8.0.3"; + sha256 = "0zai8glmkiqramivgz405zh385cz166gpry2yl29g37dxpwxffzb"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + blazeHtml blazeMarkup cmdargs deepseq filepath hjsmin indents json + mtl pandoc parsec shakespeare text transformers + ]; + meta = { + homepage = "http://elm-lang.org"; + description = "The Elm language module"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/concatenative/default.nix b/pkgs/development/libraries/haskell/concatenative/default.nix new file mode 100644 index 00000000000..34344c1566b --- /dev/null +++ b/pkgs/development/libraries/haskell/concatenative/default.nix @@ -0,0 +1,13 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "concatenative"; + version = "1.0.1"; + sha256 = "05xwqvcdnk8bsyj698ab9jxpa1nk23pf3m7wi9mwmw0q8n99fngd"; + meta = { + homepage = "https://patch-tag.com/r/salazar/concatenative/snapshot/current/content/pretty"; + description = "A library for postfix control flow"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/indents/default.nix b/pkgs/development/libraries/haskell/indents/default.nix new file mode 100644 index 00000000000..84a19f541ee --- /dev/null +++ b/pkgs/development/libraries/haskell/indents/default.nix @@ -0,0 +1,14 @@ +{ cabal, concatenative, mtl, parsec }: + +cabal.mkDerivation (self: { + pname = "indents"; + version = "0.3.3"; + sha256 = "16lz21bp9j14xilnq8yym22p3saxvc9fsgfcf5awn2a6i6n527xn"; + buildDepends = [ concatenative mtl parsec ]; + meta = { + homepage = "http://patch-tag.com/r/salazar/indents"; + description = "indentation sensitive parser-combinators for parsec"; + 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 a0d5bad3ec1..5d622066bdc 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -716,6 +716,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); compactStringFix = callPackage ../development/libraries/haskell/compact-string-fix {}; + concatenative = callPackage ../development/libraries/haskell/concatenative {}; + conduit = callPackage ../development/libraries/haskell/conduit {}; ConfigFile = callPackage ../development/libraries/haskell/ConfigFile {}; @@ -893,6 +895,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); elerea = callPackage ../development/libraries/haskell/elerea {}; + Elm = callPackage ../development/compilers/elm/elm.nix {}; + + elmServer = callPackage ../development/compilers/elm/elm-server.nix {}; + emailValidate = callPackage ../development/libraries/haskell/email-validate {}; encoding = callPackage ../development/libraries/haskell/encoding {}; @@ -1246,6 +1252,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); ieee754 = callPackage ../development/libraries/haskell/ieee754 {}; + indents = callPackage ../development/libraries/haskell/indents {}; + instantGenerics = callPackage ../development/libraries/haskell/instant-generics {}; ioChoice = callPackage ../development/libraries/haskell/io-choice {}; From ed3a63b5d7aec50f803e3e91fcb71a001a7ebe78 Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Sat, 15 Jun 2013 21:57:05 +1000 Subject: [PATCH 002/798] php53: fix on darwin * add libssh2 to build inputs (configure fails without this) * link with stdc++ * add icu/lib directory to DYLD_LIBRARY_PATH (and wrap binaries with this environment variable * add libiconv to build inputs * fix --with-iconv configure flag (was --with-iconv-dir which is not a valid flag) --- pkgs/development/interpreters/php/5.3.nix | 43 ++++++++++++++++------- 1 file changed, 31 insertions(+), 12 deletions(-) diff --git a/pkgs/development/interpreters/php/5.3.nix b/pkgs/development/interpreters/php/5.3.nix index 35508230ebd..1625c924cbb 100644 --- a/pkgs/development/interpreters/php/5.3.nix +++ b/pkgs/development/interpreters/php/5.3.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, composableDerivation, autoconf, automake, flex, bison , apacheHttpd, mysql, libxml2, readline, zlib, curl, gd, postgresql, gettext -, openssl, pkgconfig, sqlite, config, libiconv, libjpeg, libpng, freetype -, libxslt, libmcrypt, bzip2, icu }: +, openssl, pkgconfig, sqlite, config, libjpeg, libpng, freetype, libxslt +, libmcrypt, bzip2, icu, libssh2, makeWrapper, libiconvOrEmpty, libiconv }: let libmcryptOverride = libmcrypt.override { disablePosixThreads = true; }; @@ -15,7 +15,15 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) enableParallelBuilding = true; - buildInputs = ["flex" "bison" "pkgconfig"]; + buildInputs + = [ flex bison pkgconfig ] + ++ stdenv.lib.optionals stdenv.isDarwin [ libssh2 makeWrapper ]; + + # need to include the C++ standard library when compiling on darwin + NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lstdc++"; + + # need to specify where the dylib for icu is stored + DYLD_LIBRARY_PATH = stdenv.lib.optionalString stdenv.isDarwin "${icu}/lib"; flags = { @@ -41,11 +49,11 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) }; libxml2 = { - configureFlags = [ - "--with-libxml-dir=${libxml2}" - #"--with-iconv-dir=${libiconv}" - ]; - buildInputs = [ libxml2 ]; + configureFlags + = [ "--with-libxml-dir=${libxml2}" ] + ++ stdenv.lib.optional (libiconvOrEmpty != []) + [ "--with-iconv=${libiconv}" ]; + buildInputs = [ libxml2 ] ++ libiconvOrEmpty; }; readline = { @@ -89,7 +97,12 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) }; gd = { - configureFlags = ["--with-gd=${gd} --with-freetype-dir=${freetype}"]; + configureFlags = [ + "--with-gd" + "--with-freetype-dir=${freetype}" + "--with-png-dir=${libpng}" + "--with-jpeg-dir=${libjpeg}" + ]; buildInputs = [gd libpng libjpeg freetype]; }; @@ -197,7 +210,11 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) installPhase = '' unset installPhase; installPhase; cp php.ini-production $iniFile - ''; + '' + ( stdenv.lib.optionalString stdenv.isDarwin '' + for prog in $out/bin/*; do + wrapProgram "$prog" --prefix DYLD_LIBRARY_PATH : "$DYLD_LIBRARY_PATH" + done + '' ); src = fetchurl { url = "http://nl.php.net/get/php-${version}.tar.bz2/from/this/mirror"; @@ -207,8 +224,10 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) meta = { description = "The PHP language runtime engine"; - homepage = http://www.php.net/; - license = "PHP-3"; + homepage = http://www.php.net/; + license = "PHP-3"; + maintainers = with stdenv.lib.maintainers; [ lovek323 ]; + platforms = stdenv.lib.platforms.unix; }; patches = [./fix.patch]; From 6ae1241934323fc04badab567ed64875fb51ba85 Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Thu, 20 Jun 2013 17:42:09 +1000 Subject: [PATCH 003/798] php53: add optional pcntl flag --- pkgs/development/interpreters/php/5.3.nix | 35 +++++++++++++---------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/pkgs/development/interpreters/php/5.3.nix b/pkgs/development/interpreters/php/5.3.nix index 1625c924cbb..a6f5964091f 100644 --- a/pkgs/development/interpreters/php/5.3.nix +++ b/pkgs/development/interpreters/php/5.3.nix @@ -43,6 +43,10 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) buildInputs = [curl openssl]; }; + pcntl = { + configureFlags = [ "--enable-pcntl" ]; + }; + zlib = { configureFlags = ["--with-zlib=${zlib}"]; buildInputs = [zlib]; @@ -174,30 +178,31 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) }; cfg = { - mysqlSupport = config.php.mysql or true; - mysqliSupport = config.php.mysqli or true; - pdo_mysqlSupport = config.php.pdo_mysql or true; - libxml2Support = config.php.libxml2 or true; apxs2Support = config.php.apxs2 or true; bcmathSupport = config.php.bcmath or true; - socketsSupport = config.php.sockets or true; + bz2Support = config.php.bz2 or false; curlSupport = config.php.curl or true; + exifSupport = config.php.exif or true; + ftpSupport = config.php.ftp or true; + gdSupport = config.php.gd or true; gettextSupport = config.php.gettext or true; + intlSupport = config.php.intl or true; + libxml2Support = config.php.libxml2 or true; + mbstringSupport = config.php.mbstring or true; + mcryptSupport = config.php.mcrypt or false; + mysqlSupport = config.php.mysql or true; + mysqliSupport = config.php.mysqli or true; + opensslSupport = config.php.openssl or true; + pcntlSupport = config.php.pcntl or true; + pdo_mysqlSupport = config.php.pdo_mysql or true; postgresqlSupport = config.php.postgresql or true; readlineSupport = config.php.readline or true; - sqliteSupport = config.php.sqlite or true; soapSupport = config.php.soap or true; - zlibSupport = config.php.zlib or true; - opensslSupport = config.php.openssl or true; - mbstringSupport = config.php.mbstring or true; - gdSupport = config.php.gd or true; - intlSupport = config.php.intl or true; - exifSupport = config.php.exif or true; + socketsSupport = config.php.sockets or true; + sqliteSupport = config.php.sqlite or true; xslSupport = config.php.xsl or false; - mcryptSupport = config.php.mcrypt or false; - bz2Support = config.php.bz2 or false; zipSupport = config.php.zip or true; - ftpSupport = config.php.ftp or true; + zlibSupport = config.php.zlib or true; }; configurePhase = '' From a7746e3585cbdf437c57f43fa50750a1bc6c3c11 Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Thu, 20 Jun 2013 17:45:29 +1000 Subject: [PATCH 004/798] php53: restore nix gd version --- pkgs/development/interpreters/php/5.3.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/php/5.3.nix b/pkgs/development/interpreters/php/5.3.nix index a6f5964091f..347a374ffcc 100644 --- a/pkgs/development/interpreters/php/5.3.nix +++ b/pkgs/development/interpreters/php/5.3.nix @@ -102,7 +102,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) gd = { configureFlags = [ - "--with-gd" + "--with-gd=${gd}" "--with-freetype-dir=${freetype}" "--with-png-dir=${libpng}" "--with-jpeg-dir=${libjpeg}" From d195372ebacb660f640e71bf16145e11ba307dcb Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Fri, 21 Jun 2013 15:03:00 +1000 Subject: [PATCH 005/798] php53-xdebug: add expression --- pkgs/top-level/all-packages.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6316f0a7557..9bcfd7ba145 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3009,7 +3009,11 @@ let php_xcache = callPackage ../development/libraries/php-xcache { }; - phpXdebug = callPackage ../development/interpreters/php-xdebug { }; + phpXdebug_5_3 = callPackage ../development/interpreters/php-xdebug { + php = php53; + }; + phpXdebug_5_4 = callPackage ../development/interpreters/php-xdebug { }; + phpXdebug = phpXdebug_5_4; picolisp = callPackage ../development/interpreters/picolisp {}; From f84119331ce2a27128f2d8c00d5d3251ead5affd Mon Sep 17 00:00:00 2001 From: rnons Date: Fri, 21 Jun 2013 22:55:37 +0800 Subject: [PATCH 006/798] yesod-bin: as of yesod 1.2, binaries are kept in yesod-bin. --- .../libraries/haskell/yesod-bin/default.nix | 31 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/libraries/haskell/yesod-bin/default.nix diff --git a/pkgs/development/libraries/haskell/yesod-bin/default.nix b/pkgs/development/libraries/haskell/yesod-bin/default.nix new file mode 100644 index 00000000000..717ca54d808 --- /dev/null +++ b/pkgs/development/libraries/haskell/yesod-bin/default.nix @@ -0,0 +1,31 @@ +{ cabal, attoparsec, base64Bytestring, blazeBuilder, Cabal, conduit +, fileEmbed, filepath, fsnotify, ghcPaths, httpConduit +, httpReverseProxy, httpTypes, liftedBase, network, networkConduit +, optparseApplicative, parsec, projectTemplate, resourcet +, shakespeare, shakespeareCss, shakespeareJs, shakespeareText +, split, systemFileio, systemFilepath, tar, text, time +, transformers, unixCompat, unorderedContainers, wai, warp, yaml +, zlib +}: + +cabal.mkDerivation (self: { + pname = "yesod-bin"; + version = "1.2.0.1"; + sha256 = "0dikjxs1wdqv87ng6iqnnc3pwi3hzgqfwnnj3bb1fpz4plv4bnbc"; + isLibrary = false; + isExecutable = true; + buildDepends = [ + attoparsec base64Bytestring blazeBuilder Cabal conduit fileEmbed + filepath fsnotify ghcPaths httpConduit httpReverseProxy httpTypes + liftedBase network networkConduit optparseApplicative parsec + projectTemplate resourcet shakespeare shakespeareCss shakespeareJs + shakespeareText split systemFileio systemFilepath tar text time + transformers unixCompat unorderedContainers wai warp yaml zlib + ]; + meta = { + homepage = "http://www.yesodweb.com/"; + description = "The yesod helper executable"; + 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 58706742e07..5c443f22d1c 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2117,6 +2117,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); yesodAuth = callPackage ../development/libraries/haskell/yesod-auth {}; + yesodBin = callPackage ../development/libraries/haskell/yesod-bin {}; + yesodCore = callPackage ../development/libraries/haskell/yesod-core {}; yesodDefault = callPackage ../development/libraries/haskell/yesod-default {}; From dbe9bf7e59a47d4a64d790841b4741e5076dafab Mon Sep 17 00:00:00 2001 From: Domen Kozar Date: Fri, 21 Jun 2013 19:59:20 +0200 Subject: [PATCH 007/798] networkmanagerapplet: 0.9.8.0 -> 0.9.8.2 Upgraded because some icons weren't displaying. Also adds new dependency libsecret. --- .../libraries/libsecret/default.nix | 22 +++++++++++++++++++ .../network-manager-applet/default.nix | 10 ++++----- pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 29 insertions(+), 5 deletions(-) create mode 100644 pkgs/development/libraries/libsecret/default.nix diff --git a/pkgs/development/libraries/libsecret/default.nix b/pkgs/development/libraries/libsecret/default.nix new file mode 100644 index 00000000000..70c20caa88a --- /dev/null +++ b/pkgs/development/libraries/libsecret/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, glib, dbus_libs, unzip, automake, libtool, autoconf, m4, docbook_xsl, + intltool, gtk_doc, gobjectIntrospection, pkgconfig, libxslt, libgcrypt }: + +stdenv.mkDerivation rec { + version = "0.15"; + name = "libsecret-${version}"; + + src = fetchurl { + url = "https://git.gnome.org/browse/libsecret/snapshot/libsecret-${version}.zip"; + sha256 = "088v1z7zbdi8b0779jads7q20x1gx6c4zmrj3q0vysc7a0k16i6k"; + }; + + propagatedBuildInputs = [ glib dbus_libs ]; + nativeBuildInputs = [ unzip ]; + buildInputs = [ gtk_doc automake libtool autoconf intltool gobjectIntrospection pkgconfig libxslt libgcrypt m4 docbook_xsl ]; + + configureScript = "./autogen.sh"; + + meta = { + inherit (glib.meta) platforms maintainers; + }; +} diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix index 7daf1207567..7e86b576967 100644 --- a/pkgs/tools/networking/network-manager-applet/default.nix +++ b/pkgs/tools/networking/network-manager-applet/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, intltool, pkgconfig, gtk, libglade, networkmanager, GConf -, libnotify, libgnome_keyring, dbus_glib, polkit, isocodes +, libnotify, libsecret, dbus_glib, polkit, isocodes, libgnome_keyring , mobile_broadband_provider_info, glib_networking, gsettings_desktop_schemas , makeWrapper, networkmanager_openvpn, udev }: let pn = "network-manager-applet"; major = "0.9"; - version = "${major}.8.0"; + version = "${major}.8.2"; in stdenv.mkDerivation rec { @@ -14,12 +14,12 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pn}/${major}/${name}.tar.xz"; - sha256 = "141m0n4fhsv1k82jm4531f12mq29d3213lph5c9rbfkhd1rnxyqs"; + sha256 = "1ixd19b7ap29lz9lq4mmlq9lqsmnisix1a33hrxrl68wjx1wfh55"; }; buildInputs = [ - gtk libglade networkmanager GConf libnotify libgnome_keyring dbus_glib - polkit isocodes makeWrapper udev + gtk libglade networkmanager GConf libnotify libsecret dbus_glib + polkit isocodes makeWrapper udev libgnome_keyring ]; nativeBuildInputs = [ intltool pkgconfig ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 404a36bb2b9..1db460827c5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4420,6 +4420,8 @@ let libgnome_keyring = callPackage ../development/libraries/libgnome-keyring { }; libgnome_keyring3 = gnome3.libgnome_keyring; + libsecret = callPackage ../development/libraries/libsecret { }; + libgtop = callPackage ../development/libraries/libgtop {}; liblo = callPackage ../development/libraries/liblo { }; From a3bf1ca3b19d326ba6d7733541ec175061a44729 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 21 Jun 2013 17:21:03 -0400 Subject: [PATCH 008/798] Linux 3.9.7 Signed-off-by: Shea Levy --- pkgs/os-specific/linux/kernel/linux-3.9.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.9.nix b/pkgs/os-specific/linux/kernel/linux-3.9.nix index ed7451dfe5d..4a2a0c1d163 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.9.nix @@ -253,7 +253,7 @@ in import ./generic.nix ( rec { - version = "3.9.6"; + version = "3.9.7"; testing = false; preConfigure = '' @@ -262,7 +262,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "0spba7qkf56j233r84y23xl7d44ndvw5ja7h3pfhsq861dypcc0i"; + sha256 = "1xgk13bj33wayrs2jfgb2vf4xfys3vm28ijaavpjgs2wlsav94lx"; }; config = configWithPlatform stdenv.platform; From 09e6ae577bcd7eb8d8e142fc473798f938cbae1c Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Sat, 22 Jun 2013 08:52:27 +0300 Subject: [PATCH 009/798] Python: add DETERMINISTIC_BUILD env var. If set, python doesn't write timestamps to pyc files. Tested by building argparse, compiling from cli, compiling using py_compile. --- .../interpreters/python/2.7/default.nix | 4 +++ .../python/2.7/deterministic-build.patch | 36 +++++++++++++++++++ .../python-modules/generic/default.nix | 1 + 3 files changed, 41 insertions(+) create mode 100644 pkgs/development/interpreters/python/2.7/deterministic-build.patch diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix index 4110f2502dc..ccb423ef32e 100644 --- a/pkgs/development/interpreters/python/2.7/default.nix +++ b/pkgs/development/interpreters/python/2.7/default.nix @@ -25,6 +25,10 @@ let # doesn't work in Nix because Nix changes the mtime of files in # the Nix store to 1. So treat that as a special case. ./nix-store-mtime.patch + + # patch python to put zero timestamp into pyc + # if DETERMINISTIC_BUILD env var is set + ./deterministic-build.patch ]; postPatch = stdenv.lib.optionalString (stdenv.gcc.libc != null) '' diff --git a/pkgs/development/interpreters/python/2.7/deterministic-build.patch b/pkgs/development/interpreters/python/2.7/deterministic-build.patch new file mode 100644 index 00000000000..98d9d339fa1 --- /dev/null +++ b/pkgs/development/interpreters/python/2.7/deterministic-build.patch @@ -0,0 +1,36 @@ +diff -ur orig/Lib/py_compile.py new/Lib/py_compile.py +--- orig/Lib/py_compile.py ++++ new/Lib/py_compile.py +@@ -122,7 +122,10 @@ + cfile = file + (__debug__ and 'c' or 'o') + with open(cfile, 'wb') as fc: + fc.write('\0\0\0\0') +- wr_long(fc, timestamp) ++ if "DETERMINISTIC_BUILD" in os.environ: ++ fc.write('\0\0\0\0') ++ else: ++ wr_long(fc, timestamp) + marshal.dump(codeobject, fc) + fc.flush() + fc.seek(0, 0) +diff -ur orig/Python/import.c new/Python/import.c +--- orig/Python/import.c ++++ new/Python/import.c +@@ -939,10 +939,12 @@ + return; + } + /* Now write the true mtime (as a 32-bit field) */ +- fseek(fp, 4L, 0); +- assert(mtime <= 0xFFFFFFFF); +- PyMarshal_WriteLongToFile((long)mtime, fp, Py_MARSHAL_VERSION); +- fflush(fp); ++ if (Py_GETENV("DETERMINISTIC_BUILD") == NULL) { ++ fseek(fp, 4L, 0); ++ assert(mtime <= 0xFFFFFFFF); ++ PyMarshal_WriteLongToFile((long)mtime, fp, Py_MARSHAL_VERSION); ++ fflush(fp); ++ } + fclose(fp); + if (Py_VerboseFlag) + PySys_WriteStderr("# wrote %s\n", cpathname); + diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index f72fbff1806..d32c6818bb2 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -68,6 +68,7 @@ python.stdenv.mkDerivation (attrs // { pythonPath = [ setuptools ] ++ pythonPath; preConfigure = '' + export DETERMINISTIC_BUILD=1 PYTHONPATH="${offlineDistutils}/lib/${python.libPrefix}/site-packages:$PYTHONPATH" ${preConfigure} ''; From 7b924a9ac46c0f6e30b06cb6fb76353af96c04e9 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Sat, 22 Jun 2013 14:10:10 +0200 Subject: [PATCH 010/798] Add supervisor, a system for controlling process state under UNIX --- pkgs/top-level/python-packages.nix | 37 ++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6c27ef4bf01..431e9c6a28e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2401,6 +2401,24 @@ pythonPackages = python.modules // rec { }); + meld3 = buildPythonPackage rec { + name = "meld3-0.6.10"; + + src = fetchurl { + url = https://pypi.python.org/packages/source/m/meld3/meld3-0.6.10.tar.gz; + md5 = "42e58624e9d427be7659d7a28e2b0b6f"; + }; + + doCheck = false; + + meta = { + description = "An HTML/XML templating engine used by supervisor"; + homepage = https://github.com/supervisor/meld3; + license = "ZPL"; + }; + }; + + memcached = buildPythonPackage rec { name = "memcached-1.48"; @@ -4430,6 +4448,25 @@ pythonPackages = python.modules // rec { }; }; + + supervisor = buildPythonPackage rec { + name = "supervisor-3.0b2"; + + src = fetchurl { + url = https://pypi.python.org/packages/source/s/supervisor/supervisor-3.0b2.tar.gz; + md5 = "e2557853239ee69955f993091b0eddc4"; + }; + + buildInputs = [ mock ]; + propagatedBuildInputs = [ meld3 ]; + + meta = { + description = "A system for controlling process state under UNIX"; + homepage = http://supervisord.org/; + }; + }; + + sphinx = buildPythonPackage (rec { name = "Sphinx-1.1.3"; From 2f4d1a5656054fe6c3529e440319701690a37178 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Sat, 22 Jun 2013 14:11:47 +0200 Subject: [PATCH 011/798] memtest86: udpate to 4.1.0, fix download url --- pkgs/tools/misc/memtest86/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/memtest86/default.nix b/pkgs/tools/misc/memtest86/default.nix index 35395fc116f..978bb2729f8 100644 --- a/pkgs/tools/misc/memtest86/default.nix +++ b/pkgs/tools/misc/memtest86/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation { - name = "memtest86-4.0a"; + name = "memtest86-4.1.0"; src = fetchurl { - url = http://memtest86.com/memtest86-4.0a.tar.gz; - sha256 = "0d2n3nzyvna9k880zk6vl1z3b7wal1hrwcqay9vda8br7yp7634y"; + url = http://www.memtest86.com/downloads/memtest86-4.1.0-src.tar.gz; + sha256 = "1kdvq16s8hvk7plprws33mfh7cnhmfl1m32sfgbmzygbhk5wqxxq"; }; preBuild = '' From 819dbd2539db30b0821b73a54e5a550630836c0d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 22 Jun 2013 14:59:59 +0200 Subject: [PATCH 012/798] haskell-hledger-irr: add version 0.1.1.2 --- pkgs/applications/office/hledger-irr/default.nix | 16 ++++++++++++++++ pkgs/top-level/haskell-packages.nix | 1 + 2 files changed, 17 insertions(+) create mode 100644 pkgs/applications/office/hledger-irr/default.nix diff --git a/pkgs/applications/office/hledger-irr/default.nix b/pkgs/applications/office/hledger-irr/default.nix new file mode 100644 index 00000000000..1f4dd165c50 --- /dev/null +++ b/pkgs/applications/office/hledger-irr/default.nix @@ -0,0 +1,16 @@ +{ cabal, Cabal, hledgerLib, statistics, time }: + +cabal.mkDerivation (self: { + pname = "hledger-irr"; + version = "0.1.1.2"; + sha256 = "1mh1lzhnxc8ps8n5j37wrmbqafwdyap60j8rqr6xdfa2syfyq8i2"; + isLibrary = false; + isExecutable = true; + buildDepends = [ Cabal hledgerLib statistics time ]; + meta = { + description = "computes the internal rate of return of an investment"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.simons ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 5c443f22d1c..411f735dbe8 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1164,6 +1164,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); hledger = callPackage ../development/libraries/haskell/hledger {}; hledgerLib = callPackage ../development/libraries/haskell/hledger-lib {}; hledgerInterest = callPackage ../applications/office/hledger-interest {}; + hledgerIrr = callPackage ../applications/office/hledger-irr {}; hledgerWeb = callPackage ../development/libraries/haskell/hledger-web {}; HList = callPackage ../development/libraries/haskell/HList {}; From 01bc9204e004a517a93d07e6f5790e0d5a094fcd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 22 Jun 2013 15:41:11 +0200 Subject: [PATCH 013/798] git-annex: fix installation of git-annex-shell --- .../version-management/git-and-tools/git-annex/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix index 5086f4f31b3..9991a506485 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix @@ -7,8 +7,8 @@ , monadControl, mtl, network, networkInfo, networkMulticast , networkProtocolXmpp, openssh, QuickCheck, random, regexTdfa , rsync, SafeSemaphore, SHA, stm, text, time, transformers -, unixCompat, utf8String, uuid, wai, waiLogger, warp, xmlConduit -, xmlTypes, yesod, yesodDefault, yesodForm, yesodStatic +, unixCompat, utf8String, uuid, wai, waiLogger, warp, which +, xmlConduit, xmlTypes, yesod, yesodDefault, yesodForm, yesodStatic }: cabal.mkDerivation (self: { @@ -28,7 +28,7 @@ cabal.mkDerivation (self: { uuid wai waiLogger warp xmlConduit xmlTypes yesod yesodDefault yesodForm yesodStatic ]; - buildTools = [ bup curl git gnupg1 lsof openssh rsync ]; + buildTools = [ bup curl git gnupg1 lsof openssh rsync which ]; configureFlags = "-fS3 -fWebDAV -fInotify @@ -41,6 +41,7 @@ cabal.mkDerivation (self: { -fProduction -fTDFA"; preConfigure = "patchShebangs ."; + installPhase = "make PREFIX=$out CABAL=./Setup docs install"; checkPhase = '' export HOME="$NIX_BUILD_TOP/tmp" mkdir "$HOME" From ad06d4df18a9f0c081e79139803bd45fbcc82486 Mon Sep 17 00:00:00 2001 From: Aristid Breitkreuz Date: Thu, 20 Jun 2013 22:48:35 +0200 Subject: [PATCH 014/798] update pulseaudio to 4.0 and sbc to 1.1 --- pkgs/development/libraries/sbc/default.nix | 4 ++-- pkgs/servers/pulseaudio/default.nix | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/sbc/default.nix b/pkgs/development/libraries/sbc/default.nix index d621eed6728..12662b9dea9 100644 --- a/pkgs/development/libraries/sbc/default.nix +++ b/pkgs/development/libraries/sbc/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libsndfile, pkgconfig }: stdenv.mkDerivation rec { - name = "sbc-1.0"; + name = "sbc-1.1"; src = fetchurl { url = "http://www.kernel.org/pub/linux/bluetooth/${name}.tar.xz"; - sha256 = "10mq2rmh3h90bwq5cdcmizf93zf8f2br8gds0jxr9i962ai0m5xz"; + sha256 = "1ipvkhilyhdbd2nzq0la6l7q361l0zm0c6kvga2a0y89q8nssc4s"; }; buildInputs = [ pkgconfig libsndfile ]; diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index e315f788904..04318a792e8 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, gnum4, gdbm, libtool, glib, dbus, avahi , gconf, gtk, intltool, gettext -, alsaLib, libsamplerate, libsndfile, speex, bluez, udev +, alsaLib, libsamplerate, libsndfile, speex, bluez, sbc, udev, libcap , jackaudioSupport ? false, jackaudio ? null , x11Support ? false, xlibs , json_c @@ -10,11 +10,11 @@ assert jackaudioSupport -> jackaudio != null; stdenv.mkDerivation rec { - name = "pulseaudio-2.1"; + name = "pulseaudio-4.0"; src = fetchurl { - url = "http://freedesktop.org/software/pulseaudio/releases/pulseaudio-2.1.tar.xz"; - sha256 = "0zyal2mix7lzhxmr3pxlmss5kjca061iapvrh20bkgvsyixk8szg"; + url = "http://freedesktop.org/software/pulseaudio/releases/pulseaudio-4.0.tar.xz"; + sha256 = "1bndz4l8jxyq3zq128gzp3gryxl6yjs66j2y1d7yabw2n5mv7kim"; }; # Since `libpulse*.la' contain `-lgdbm', it must be propagated. @@ -22,8 +22,8 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig gnum4 libtool intltool glib dbus avahi - libsamplerate libsndfile speex alsaLib bluez udev - json_c + libsamplerate libsndfile speex alsaLib bluez sbc udev + json_c libcap #gtk gconf ] ++ stdenv.lib.optional jackaudioSupport jackaudio From 860161dcb70a74d7dfecf1c3ddcfe415a6128be2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sat, 22 Jun 2013 18:59:37 +0000 Subject: [PATCH 015/798] remake: bump from version 3.81+dbg-0.2 to 3.82+dbg-0.6 This version needs readline. And the license is GPLv3. Also, add meta.platforms and meta.maintainers attributes. --- .../tools/build-managers/remake/default.nix | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/build-managers/remake/default.nix b/pkgs/development/tools/build-managers/remake/default.nix index af2465c208c..676354a6e8d 100644 --- a/pkgs/development/tools/build-managers/remake/default.nix +++ b/pkgs/development/tools/build-managers/remake/default.nix @@ -1,15 +1,21 @@ -{stdenv, fetchurl}: +{ stdenv, fetchurl, readline }: + +stdenv.mkDerivation rec { + name = "remake-${version}"; + version = "3.82+dbg-0.6"; -stdenv.mkDerivation { - name = "remake-3.81-dbg-0.2"; src = fetchurl { - url = mirror://sourceforge/bashdb/remake-3.81+dbg-0.2.tar.gz; - sha256 = "0mhc06zgd39dl8rk16ii0m2x22b9zi67d48km7rn0fzzv519lmwc"; + url = "mirror://sourceforge/project/bashdb/remake/${version}/${name}.tar.bz2"; + sha256 = "0i2g6vi9zya78d9zpigfnmzg2qcl93myjfibh3kfmjk7b9lajfyz"; }; + buildInputs = [ readline ]; + meta = { homepage = http://bashdb.sourceforge.net/remake/; - license = "GPL"; + license = stdenv.lib.licenses.gpl3; description = "GNU Make with comprehensible tracing and a debugger"; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ bjornfor ]; }; } From dbda1a29890d67558db712bc878d03a12703ff50 Mon Sep 17 00:00:00 2001 From: Aristid Breitkreuz Date: Sat, 22 Jun 2013 22:59:55 +0200 Subject: [PATCH 016/798] libcap needs to be a propagated build input for pulseaudio --- pkgs/servers/pulseaudio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index 04318a792e8..e78dc7b5dec 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { sha256 = "1bndz4l8jxyq3zq128gzp3gryxl6yjs66j2y1d7yabw2n5mv7kim"; }; - # Since `libpulse*.la' contain `-lgdbm', it must be propagated. - propagatedBuildInputs = [ gdbm ]; + # Since `libpulse*.la' contain `-lgdbm' and `-lcap', it must be propagated. + propagatedBuildInputs = [ gdbm libcap ]; buildInputs = [ pkgconfig gnum4 libtool intltool glib dbus avahi libsamplerate libsndfile speex alsaLib bluez sbc udev - json_c libcap + json_c #gtk gconf ] ++ stdenv.lib.optional jackaudioSupport jackaudio From 2c8acd9cec396ef67b21a2893411867d46a0de9d Mon Sep 17 00:00:00 2001 From: Domen Kozar Date: Sun, 23 Jun 2013 00:11:42 +0200 Subject: [PATCH 017/798] oiio: 1.1.8 -> 1.1.12 --- pkgs/applications/graphics/openimageio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/openimageio/default.nix b/pkgs/applications/graphics/openimageio/default.nix index fa7d16ccf0a..f8160e4d688 100644 --- a/pkgs/applications/graphics/openimageio/default.nix +++ b/pkgs/applications/graphics/openimageio/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "oiio-${version}"; - version = "1.1.8"; + version = "1.1.12"; src = fetchurl { url = "https://github.com/OpenImageIO/oiio/archive/Release-${version}.zip"; - sha256 = "08a6qhplzs8kianqb1gjgrndg81h3il5531jn9g6i4940b1xispg"; + sha256 = "196iq15waa2yyryiwhf6ynlpqnpknm4cc4azakg01xs70yiphsfl"; }; buildInputs = [ @@ -31,4 +31,4 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.goibhniu ]; platforms = platforms.linux; }; -} \ No newline at end of file +} From c74b3e26f74cc28995f0e4ed4cce487f1c07d481 Mon Sep 17 00:00:00 2001 From: Song Wenwu Date: Sun, 23 Jun 2013 14:53:18 +0800 Subject: [PATCH 018/798] kmplayer: update to 0.11.3d --- pkgs/applications/video/kmplayer/builder.sh | 9 --------- pkgs/applications/video/kmplayer/default.nix | 20 +++++++++++++------- 2 files changed, 13 insertions(+), 16 deletions(-) delete mode 100644 pkgs/applications/video/kmplayer/builder.sh diff --git a/pkgs/applications/video/kmplayer/builder.sh b/pkgs/applications/video/kmplayer/builder.sh deleted file mode 100644 index 92c7515c9a9..00000000000 --- a/pkgs/applications/video/kmplayer/builder.sh +++ /dev/null @@ -1,9 +0,0 @@ -source $stdenv/setup - -myPatchPhase() -{ - sed -i -e "s|files.length|files.size|" \ - -e "s|chlds.length|chlds.size|" src/kmplayerapp.cpp -} -patchPhase=myPatchPhase -genericBuild diff --git a/pkgs/applications/video/kmplayer/default.nix b/pkgs/applications/video/kmplayer/default.nix index a762bed0e28..5f6c2259d1c 100644 --- a/pkgs/applications/video/kmplayer/default.nix +++ b/pkgs/applications/video/kmplayer/default.nix @@ -1,17 +1,23 @@ -{stdenv, fetchurl, lib, cmake, qt4, perl, gettext, pango, gtk, dbus_glib, kdelibs, automoc4, phonon}: +{ stdenv, fetchurl, cmake, pkgconfig, gettext +, kdelibs, gtk +}: stdenv.mkDerivation { - name = "kmplayer-0.11.2c"; + name = "kmplayer-0.11.3d"; + src = fetchurl { - url = http://kmplayer.kde.org/pkgs/kmplayer-0.11.2c.tar.bz2; - sha256 = "1qhafq865bzpz6m9k7cjdv4884qfpn481ak77ly0nidpq2ab0l9m"; + url = http://kmplayer.kde.org/pkgs/kmplayer-0.11.3d.tar.bz2; + sha256 = "1yvbkb1hh5y7fqfvixjf2rryzm0fm0fpkx4lmvhi7k7d0v4wpgky"; }; - builder = ./builder.sh; - buildInputs = [ cmake qt4 perl gettext stdenv.gcc.libc pango gtk dbus_glib kdelibs automoc4 phonon ]; + + buildInputs = [ + cmake gettext pkgconfig kdelibs gtk + ]; + meta = { description = "MPlayer front-end for KDE"; license = "GPL"; homepage = http://kmplayer.kde.org; - maintainers = [ lib.maintainers.sander ]; + maintainers = [ stdenv.lib.maintainers.sander ]; }; } From 48e1e1cae649231b533c03a4f8ebda59b2c6424f Mon Sep 17 00:00:00 2001 From: Song Wenwu Date: Sun, 23 Jun 2013 17:48:21 +0800 Subject: [PATCH 019/798] add smplayer 0.8.5 --- pkgs/applications/video/smplayer/default.nix | 22 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/applications/video/smplayer/default.nix diff --git a/pkgs/applications/video/smplayer/default.nix b/pkgs/applications/video/smplayer/default.nix new file mode 100644 index 00000000000..21be1fdb74a --- /dev/null +++ b/pkgs/applications/video/smplayer/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, qt4 }: + +stdenv.mkDerivation rec { + name = "smplayer-0.8.5"; + + src = fetchurl { + url = "mirror://sourceforge/smplayer/${name}.tar.bz2"; + sha256 = "0vbfvaqg5c25vabq1mf9xg6kzgvxnpd0i172y1gjznnlpcw2fxrw"; + }; + + buildInputs = [ qt4 ]; + + preConfigure = '' + makeFlags="PREFIX=$out" + ''; + + meta = { + description = "A complete front-end for MPlayer"; + homepage = "http://smplayer.sourceforge.net/"; + license = "GPLv3+"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1db460827c5..9944bff7c3a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7874,6 +7874,8 @@ let ruby_ncursesw_sup = callPackage ../development/libraries/ruby_ncursesw_sup { }; + smplayer = callPackage ../applications/video/smplayer { }; + sup = callPackage ../applications/networking/mailreaders/sup { ruby = ruby19; From 43c9ab900b884bd981e00d59845bb07d042794d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 23 Jun 2013 13:06:03 +0200 Subject: [PATCH 020/798] virtualbox-guestadditions: fix xorg incompatibility A recent X update broke VirtualBox guest additions (vboxvideo driver version mismatch, desktop won't start). This fixes it. Here is the error log: (II) "glx" will be loaded by default. (II) LoadModule: "glx" (II) Loading /nix/store/kzvmnjlps51q4piqmwr7zbmxcg2z9vgk-xorg-server-1.13.4/lib/xorg/modules/extensions/libglx.so (II) Module glx: vendor="X.Org Foundation" compiled for 1.13.4, module version = 1.0.0 ABI class: X.Org Server Extension, version 7.0 (==) AIGLX enabled Loading extension GLX (II) LoadModule: "vboxvideo" (II) Loading /nix/store/4kbxi00h8xsmfgbws2qqh674lcfp03h6-VirtualBox-GuestAdditions-4.2.14-3.2.46/lib/xorg/modules/drivers/vboxvideo_drv.so (II) Module vboxvideo: vendor="Oracle Corporation" compiled for 10.12.0, module version = 1.0.1 Module class: X.Org Video Driver ABI class: X.Org Video Driver, version 12.0 (EE) module ABI major version (12) doesn't match the server's version (13) (II) UnloadModule: "vboxvideo" (II) Unloading vboxvideo (EE) Failed to load module "vboxvideo" (module requirement mismatch, 0) (II) LoadModule: "vboxmouse" (WW) Warning, couldn't open module vboxmouse (II) UnloadModule: "vboxmouse" (II) Unloading vboxmouse (EE) Failed to load module "vboxmouse" (module does not exist, 0) (EE) No drivers available. Fatal server error: no screens found --- .../virtualization/virtualbox/guest-additions/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index f3d7c18a2c6..98fffe90ff6 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -104,7 +104,7 @@ stdenv.mkDerivation { # Install Xorg drivers mkdir -p $out/lib/xorg/modules/{drivers,input} - install -m 644 lib/VBoxGuestAdditions/vboxvideo_drv_112.so $out/lib/xorg/modules/drivers/vboxvideo_drv.so + install -m 644 lib/VBoxGuestAdditions/vboxvideo_drv_113.so $out/lib/xorg/modules/drivers/vboxvideo_drv.so # Install kernel modules cd src From 45f7b9c319d9f5659278391ea660025953b0a07d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 23 Jun 2013 13:57:13 +0200 Subject: [PATCH 021/798] virtualbox: make guest additions use driver according to xserver version --- .../virtualbox/guest-additions/default.nix | 13 ++++++++----- pkgs/servers/x11/xorg/overrides.nix | 1 + 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index 98fffe90ff6..50449b8f094 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -1,8 +1,11 @@ { stdenv, fetchurl, lib, patchelf, cdrkit, kernelDev, which, makeWrapper -, libX11, libXt, libXext, libXmu, libXcomposite, libXfixes, libXrandr, libXcursor -, dbus }: +, xorg, dbus }: -let version = "4.2.12"; in +let + version = "4.2.12"; + xserverVListFunc = builtins.elemAt (stdenv.lib.splitString "." xorg.xorgserver.version); + xserverABI = xserverVListFunc 0 + xserverVListFunc 1; +in stdenv.mkDerivation { name = "VirtualBox-GuestAdditions-${version}-${kernelDev.version}"; @@ -22,7 +25,7 @@ stdenv.mkDerivation { ''; - buildCommand = '' + buildCommand = with xorg; '' ${if stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" then '' isoinfo -J -i $src -x /VBoxLinuxAdditions.run > ./VBoxLinuxAdditions.run chmod 755 ./VBoxLinuxAdditions.run @@ -104,7 +107,7 @@ stdenv.mkDerivation { # Install Xorg drivers mkdir -p $out/lib/xorg/modules/{drivers,input} - install -m 644 lib/VBoxGuestAdditions/vboxvideo_drv_113.so $out/lib/xorg/modules/drivers/vboxvideo_drv.so + install -m 644 lib/VBoxGuestAdditions/vboxvideo_drv_${xserverABI}.so $out/lib/xorg/modules/drivers/vboxvideo_drv.so # Install kernel modules cd src diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index ff815fb1cf5..22e0096ad65 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -209,6 +209,7 @@ in rm -fr $out/share/X11/xkb/compiled ln -s /var/tmp $out/share/X11/xkb/compiled ''; + passthru.version = (builtins.parseDrvName attrs.name).version; # needed by virtualbox guest additions }; From 4cad420d5c7693737c39e0575ccc0e9e5ac05dc7 Mon Sep 17 00:00:00 2001 From: Song Wenwu Date: Sun, 23 Jun 2013 21:26:43 +0800 Subject: [PATCH 022/798] smplayer: add platform and set license to `stdenv.lib.licenses.gpl3Plus` --- pkgs/applications/video/smplayer/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/video/smplayer/default.nix b/pkgs/applications/video/smplayer/default.nix index 21be1fdb74a..ab48d74c00d 100644 --- a/pkgs/applications/video/smplayer/default.nix +++ b/pkgs/applications/video/smplayer/default.nix @@ -17,6 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "A complete front-end for MPlayer"; homepage = "http://smplayer.sourceforge.net/"; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; + platforms = stdenv.lib.platforms.linux; }; } From 6c86398ff3f56794b0ef08f7613cabe8ef5652fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 23 Jun 2013 14:35:33 +0200 Subject: [PATCH 023/798] virtualbox: minor update, lock versions with guest-additions I saw no reason to use requireFile, it seems normally downloadable. --- .../virtualization/virtualbox/default.nix | 15 +++++++-------- .../virtualbox/guest-additions/default.nix | 6 +++--- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 3dd020dfa10..6ca2c66a35a 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -11,8 +11,7 @@ with stdenv.lib; let - version = "4.2.12"; - extpackRevision = "84980"; + version = "4.2.14"; # changes ./guest-additions as well forEachModule = action: '' for mod in \ @@ -31,12 +30,10 @@ let done ''; - extensionPack = requireFile { - name = "Oracle_VM_VirtualBox_Extension_Pack-${version}-${extpackRevision}" - + ".vbox-extpack"; + extensionPack = fetchurl { + url = "http://download.virtualbox.org/virtualbox/${version}/Oracle_VM_VirtualBox_Extension_Pack-${version}.vbox-extpack"; # Has to be base16 because it's used as an input to VBoxExtPackHelperApp! - sha256 = "ad15a92e49095c2115bd1793b3b957d3eaf44af0f5d24bb53d6b4fc81c3e2fc4"; - url = "https://www.virtualbox.org/wiki/Downloads"; + sha256 = "5813cae72790de4893cadb839ffbd148290a44ec6913d901d84c9b3740ab1b1e"; }; in stdenv.mkDerivation { @@ -44,7 +41,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"; - sha256 = "eb65ecac94f63d6292a967d39cb5e28326404c10d0e8c2c50399eedb59c17ee6"; + sha256 = "038k65cdvr80da5nfan5r3rjrnxqab2fbf2pr2jq8g1gc4cxrxpq"; }; buildInputs = @@ -137,6 +134,8 @@ in stdenv.mkDerivation { done ''; + passthru = { inherit version; /* for guest additions */ }; + meta = { description = "PC emulator"; homepage = http://www.virtualbox.org/; diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index 50449b8f094..e7843b07fc3 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, lib, patchelf, cdrkit, kernelDev, which, makeWrapper -, xorg, dbus }: +, xorg, dbus, virtualbox }: let - version = "4.2.12"; + version = virtualbox.version; xserverVListFunc = builtins.elemAt (stdenv.lib.splitString "." xorg.xorgserver.version); xserverABI = xserverVListFunc 0 + xserverVListFunc 1; in @@ -12,7 +12,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso"; - sha256 = "aed4730b643aca8daa0829e1122b7c8d592b9f6cea902a98e390c4d22373dfb8"; + sha256 = "9f08f13bbd818fb3ef9916658542ad0999c35e11afc1f6e8ff0b944405486e8a"; }; KERN_DIR = "${kernelDev}/lib/modules/*/build"; From e387731b823cfbc7616610b3ae80a53c5315987f Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sun, 23 Jun 2013 09:38:44 +0200 Subject: [PATCH 024/798] youtube-dl: upgrade to 2013.06.21 --- pkgs/tools/misc/youtube-dl/default.nix | 16 +++++++--------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 54b3e6a4856..e4d934968b2 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -1,27 +1,25 @@ -{ stdenv, fetchurl, python, pandoc, zip }: +{ stdenv, fetchurl, python, zip }: let - version = "2012.12.11"; + version = "2013.06.21"; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "youtube-dl-${version}"; src = fetchurl { - url = "https://github.com/downloads/rg3/youtube-dl/youtube-dl.${version}.tar.gz"; - sha256 = "03zv3z8p0fi122nqj7ff8hkgqscir4s7psm03rq7dfpg1z35klmn"; + url = "http://youtube-dl.org/downloads/${version}/${name}.tar.gz"; + sha256 = "3d4e9cc38af3c2fccfafd83d0c6382080531fd03e9067ceccc6864dfbea92b1e"; }; buildInputs = [ python ]; - nativeBuildInputs = [ zip ] ++ - stdenv.lib.optional (stdenv.isi686 || stdenv.isx86_64) pandoc; + nativeBuildInputs = [ zip ]; patchPhase = '' rm youtube-dl - substituteInPlace Makefile --replace "#!/usr/bin/env python" "#!${python}/bin/python" ''; configurePhase = '' - makeFlagsArray=( PREFIX=$out SYSCONFDIR=$out/etc ) + makeFlagsArray=( PREFIX=$out SYSCONFDIR=$out/etc PYTHON=${python}/bin/python ) ''; meta = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9944bff7c3a..c45192bde66 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1989,7 +1989,7 @@ let xvfb_run = callPackage ../tools/misc/xvfb-run { inherit (texFunctions) fontsConf; }; - youtubeDL = callPackage ../tools/misc/youtube-dl { inherit (haskellPackages) pandoc; }; + youtubeDL = callPackage ../tools/misc/youtube-dl { }; zbar = callPackage ../tools/graphics/zbar { pygtk = lib.overrideDerivation pygtk (x: { From c9130547485d978512d04fd121ae29187769540e Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sun, 23 Jun 2013 17:00:06 +0200 Subject: [PATCH 025/798] linux-3.2: upgrade to 3.2.47 --- pkgs/os-specific/linux/kernel/linux-3.2.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.2.nix b/pkgs/os-specific/linux/kernel/linux-3.2.nix index 9f16fc78b09..c07448b43b5 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.2.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.2.nix @@ -240,7 +240,7 @@ in import ./generic.nix ( rec { - version = "3.2.46"; + version = "3.2.47"; modDirVersion = version; @@ -249,8 +249,8 @@ import ./generic.nix ( ''; src = fetchurl { - url = "mirror://kernel/linux/kernel/v3.0/linux-${version}.tar.xz"; - sha256 = "1yxkkiay2a84113zjxyf680fz5l0ihvjq3fcik8hfibrb5x2rhgr"; + url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; + sha256 = "1554c7r32q87jxkkpggpgwg4rcc4zanahmrw30sg39krxbf2s7q1"; }; config = configWithPlatform stdenv.platform; From 4e10617bc41d7b1f2b5f0f55b60b620dc161bcc5 Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 21 Jun 2013 16:15:07 +0200 Subject: [PATCH 026/798] winswitch: Basic somewhat working version. Wow, this is one of the most dangerous programs I've seen in a while. It not only tries to probe for a package manager to install dependencies but also tries to execute a whole bunch of programs in $PATH. That's why I decided to override the postFixup phase for now in order to get rid of the current $PATH and meanwhile getting the basics working. So, I'm still not sure how to do the best implementation here on NixOS without allowing winswitch to be too invasive and without restricting it too much so that it's of no use. But let's figure that out once we trimmed down the radiation level of this "living" thing ;-) Signed-off-by: aszlig --- pkgs/tools/X11/winswitch/default.nix | 46 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++- 2 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 pkgs/tools/X11/winswitch/default.nix diff --git a/pkgs/tools/X11/winswitch/default.nix b/pkgs/tools/X11/winswitch/default.nix new file mode 100644 index 00000000000..b53db509daf --- /dev/null +++ b/pkgs/tools/X11/winswitch/default.nix @@ -0,0 +1,46 @@ +{ stdenv, fetchurl, buildPythonPackage, pythonPackages +, which, xpra, xmodmap }: + +let + base = buildPythonPackage rec { + name = "winswitch-${version}"; + namePrefix = ""; + version = "0.12.16"; + + src = fetchurl { + url = "http://winswitch.org/src/${name}.src.tar.bz2"; + sha256 = "0ix122d7rgzdkk70f2q3sd7a4pvyaqsyxkw93pc4zkcg1xh9z3y8"; + }; + + propagatedBuildInputs = with pythonPackages; [ + pygtk twisted pycrypto pyasn1 which xpra xmodmap + ]; + + patchPhase = '' + sed -i -r -e 's|(PREFIX_DIR *= *).*|\1"'"$out"'"|' \ + -e 's|(PREFIX_SEARCH_ORDER *= *).*|\1["'"$out"'"]|' \ + -e 's|(ETC_SEARCH_ORDER *= *).*|\1["'"$out/etc"'"]|' \ + -e 's|(BIN_SEARCH_ORDER *= *).*|\1["'"$out/bin"'"]|' \ + winswitch/util/paths.py + + sed -i -e '/elif *LINUX:/,/distro_helper/{ + s/elif *LINUX:.*/else: name = "NixOS"/p + /distro_helper/!d + }' winswitch/util/distro_packaging_util.py + ''; + + buildPhase = '' + python setup.py build + ''; + + installCommand = '' + PREFIX="$out" python ./setup.py install --prefix="$out" + ''; + + doCheck = false; + }; +in stdenv.lib.overrideDerivation base (b: { + postFixup = b.postFixup + '' + sed -i -e 's/\''${PATH:+:}\$PATH//g' "$out/bin"/* + ''; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c45192bde66..c8acc2c39c7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8395,7 +8395,9 @@ let glSupport = true; }; }; - + + winswitch = callPackage ../tools/X11/winswitch { }; + wings = callPackage ../applications/graphics/wings { erlang = erlangR14B04; esdl = esdl.override { erlang = erlangR14B04; }; From 5228e569e8686f271d124d137354204e7d67d5e8 Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 24 Jun 2013 08:31:46 +0200 Subject: [PATCH 027/798] gpgme: Update to latest upstream version 1.4.1. Signed-off-by: aszlig --- pkgs/development/libraries/gpgme/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix index 4ba4cbb3347..9b56344743d 100644 --- a/pkgs/development/libraries/gpgme/default.nix +++ b/pkgs/development/libraries/gpgme/default.nix @@ -11,16 +11,16 @@ let "${gnupg}/bin/gpg2"; in stdenv.mkDerivation rec { - name = "gpgme-1.3.1"; + name = "gpgme-1.4.1"; src = fetchurl { url = "ftp://ftp.gnupg.org/gcrypt/gpgme/${name}.tar.bz2"; - sha256 = "1m7l7nicn6gd952cgspv9xr8whqivbg33nbg8kbpj3dffnl2gvqm"; + sha1 = "d6110763e7459214fd72705e87ebc682e3b5815e"; }; propagatedBuildInputs = [ libgpgerror glib libassuan pth ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig gnupg ]; configureFlags = "--with-gpg=${gpgPath}"; } From 63c937ba069f6d75632a863867b542f6fadd67b7 Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 24 Jun 2013 08:33:09 +0200 Subject: [PATCH 028/798] python-packages: Add new package pyparted v3.10. This is one of our required dependencies for the soon-to-be-packaged blivet library. Signed-off-by: aszlig --- pkgs/top-level/python-packages.nix | 37 ++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 431e9c6a28e..376d5dc3d1a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3647,6 +3647,43 @@ pythonPackages = python.modules // rec { }; }; + + pyparted = buildPythonPackage rec { + name = "pyparted-${version}"; + version = "3.10"; + + src = fetchurl { + url = "https://fedorahosted.org/releases/p/y/pyparted/${name}.tar.gz"; + sha256 = "17wq4invmv1nfazaksf59ymqyvgv3i8h4q03ry2az0s9lldyg3dv"; + }; + + postPatch = '' + sed -i -e 's|/sbin/mke2fs|${pkgs.e2fsprogs}&|' tests/baseclass.py + sed -i -e ' + s|e\.path\.startswith("/tmp/temp-device-")|"temp-device-" in e.path| + ' tests/test__ped_ped.py + ''; + + preConfigure = '' + PATH="${pkgs.parted}/sbin:$PATH" + ''; + + buildInputs = [ pkgs.pkgconfig ]; + + propagatedBuildInputs = [ pkgs.parted ]; + + checkPhase = '' + python -m unittest discover -v + ''; + + meta = { + homepage = "https://fedorahosted.org/pyparted/"; + description = "Python interface for libparted"; + license = pkgs.lib.licenses.gpl2Plus; + }; + }; + + pyptlib = buildPythonPackage (rec { name = "pyptlib-${version}"; version = "0.0.3"; From c53918b6f1eaa4dc033db319b695c4e78e43c697 Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 24 Jun 2013 08:35:03 +0200 Subject: [PATCH 029/798] python-packages: Add pykickstart version 1.99.32. Needed for blivet and this is part of Anaconda (Fedora's installation system). The reason I'm packaging this is because of blivet and because it's quite well decoupled from Anaconda itself, so it can be used for other purposes. Signed-off-by: aszlig --- pkgs/top-level/python-packages.nix | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 376d5dc3d1a..3df30c6dc48 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3630,6 +3630,30 @@ pythonPackages = python.modules // rec { }; + pykickstart = buildPythonPackage rec { + name = "pykickstart-${version}"; + version = "1.99.32-1"; + + src = fetchurl { + url = "https://git.fedorahosted.org/cgit/pykickstart.git/snapshot/" + + "r${version}.tar.bz2"; + sha256 = "1sq68jvc39k9wrkcc4xlabhwi8gdz019yh2k5nrl7ya35b8daqw0"; + }; + + propagatedBuildInputs = [ urlgrabber ]; + + checkPhase = '' + python tests/baseclass.py -vv + ''; + + meta = { + homepage = "http://fedoraproject.org/wiki/Pykickstart"; + description = "Read and write Fedora kickstart files"; + license = pkgs.lib.licenses.gpl2Plus; + }; + }; + + pyparsing = buildPythonPackage rec { name = "pyparsing-1.5.6"; From b574d0146fdd1077d637dbf9433c569dfb533622 Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 24 Jun 2013 08:37:33 +0200 Subject: [PATCH 030/798] libselinux: Add option to enable Python support. The reason this is optional is because we might want to use it for bootstrapping in some constellations. And we really don't want whole lot of dependencies in those situations. Signed-off-by: aszlig --- pkgs/os-specific/linux/libselinux/default.nix | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/libselinux/default.nix b/pkgs/os-specific/linux/libselinux/default.nix index 873065d5424..01935e76632 100644 --- a/pkgs/os-specific/linux/libselinux/default.nix +++ b/pkgs/os-specific/linux/libselinux/default.nix @@ -1,4 +1,10 @@ -{ stdenv, fetchurl, pkgconfig, libsepol, pcre }: +{ stdenv, fetchurl, pkgconfig, libsepol, pcre +, enablePython ? false, swig ? null, python ? null +}: + +assert enablePython -> swig != null && python != null; + +with stdenv.lib; stdenv.mkDerivation rec { name = "libselinux-${version}"; @@ -17,7 +23,8 @@ stdenv.mkDerivation rec { patches = [ ./fPIC.patch ]; # libsemanage seems to need -fPIC everywhere - buildInputs = [ pkgconfig libsepol pcre ]; + buildInputs = [ pkgconfig libsepol pcre ] + ++ optionals enablePython [ swig python ]; prePatch = '' tar xvf ${patch_src} @@ -26,7 +33,12 @@ stdenv.mkDerivation rec { done ''; - preInstall = '' makeFlags="$makeFlags PREFIX=$out DESTDIR=$out" ''; + postPatch = optionalString enablePython '' + sed -i -e 's|\$(LIBDIR)/libsepol.a|${libsepol}/lib/libsepol.a|' src/Makefile + ''; + + installFlags = [ "PREFIX=$(out)" "DESTDIR=$(out)" "LIBSEPOLDIR=${libsepol}" ]; + installTargets = [ "install" ] ++ optional enablePython "install-pywrap"; meta = { inherit (libsepol.meta) homepage platforms maintainers; From 8c469779417b7e2e811bbe0580d85e6bcabb2d20 Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 24 Jun 2013 08:40:12 +0200 Subject: [PATCH 031/798] python-packages: Add pyudev in version 0.16.1. Thought this would be needed for blivet, but it wasn't the case. They seem to have their own mini-implementation. But it might be useful for other Nixers, who knows? Signed-off-by: aszlig --- pkgs/top-level/python-packages.nix | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3df30c6dc48..395f20bc77d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3737,6 +3737,32 @@ pythonPackages = python.modules // rec { }; }); + + pyudev = buildPythonPackage rec { + name = "pyudev-${version}"; + version = "0.16.1"; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/pyudev/${name}.tar.gz"; + md5 = "4034de584b6d9efcbfc590a047c63285"; + }; + + postPatch = '' + sed -i -e '/udev_library_name/,/^ *libudev/ { + s|CDLL([^,]*|CDLL("${pkgs.udev}/lib/libudev.so.1"|p; d + }' pyudev/_libudev.py + ''; + + propagatedBuildInputs = [ pkgs.udev ]; + + meta = { + homepage = "http://pyudev.readthedocs.org/"; + description = "Pure Python libudev binding"; + license = stdenv.lib.licenses.lgpl21Plus; + }; + }; + + pynzb = buildPythonPackage (rec { name = "pynzb-0.1.0"; From e7c4273cb908079cc7b32096361d47037fe480e3 Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 24 Jun 2013 09:16:04 +0200 Subject: [PATCH 032/798] python-packages: Add pyblock in version 0.52. This is needed for blivet in order to work with dmraid and lvm. Signed-off-by: aszlig --- pkgs/top-level/python-packages.nix | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 395f20bc77d..08d62f87055 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3445,6 +3445,35 @@ pythonPackages = python.modules // rec { }); + pyblock = stdenv.mkDerivation rec { + name = "python-pyblock-${version}"; + version = "0.52-1"; + + src = fetchurl { + url = "https://git.fedorahosted.org/cgit/pyblock.git/snapshot/" + + "pyblock-${version}.tar.bz2"; + sha256 = "1jj5hd1dcr8xx00rg3jynsf4ak88wwr5id3fmb0qf6zvim1whj7l"; + }; + + postPatch = '' + sed -i -e 's|/usr/include/python|${python}/include/python|' \ + -e 's/-Werror *//' -e 's|/usr/|'"$out"'/|' Makefile + ''; + + buildInputs = [ python pkgs.lvm2 pkgs.dmraid ]; + + makeFlags = [ + "USESELINUX=0" + "SITELIB=$(out)/lib/${python.libPrefix}/site-packages" + ]; + + meta = { + description = "Interface for working with block devices"; + license = stdenv.lib.licenses.gpl2Plus; + }; + }; + + pycryptopp = buildPythonPackage (rec { name = "pycryptopp-0.5.29"; From b785a7192e92428a3473328a01ad927ae4d59f52 Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 24 Jun 2013 09:23:44 +0200 Subject: [PATCH 033/798] cryptsetup: Allow to build with Python support. This again is only optional to avoid too much dependencies when bootstrapping small systems or when constrained to RAM disks of lower size. It is needed for blivet as well, which will override the option in its dependency list. Signed-off-by: aszlig --- pkgs/os-specific/linux/cryptsetup/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/cryptsetup/default.nix b/pkgs/os-specific/linux/cryptsetup/default.nix index 6d612f8cdbd..0eb4be30284 100644 --- a/pkgs/os-specific/linux/cryptsetup/default.nix +++ b/pkgs/os-specific/linux/cryptsetup/default.nix @@ -1,4 +1,8 @@ -{ stdenv, fetchurl, devicemapper, libgcrypt, libuuid, pkgconfig, popt }: +{ stdenv, fetchurl, devicemapper, libgcrypt, libuuid, pkgconfig, popt +, enablePython ? false, python ? null +}: + +assert enablePython -> python != null; stdenv.mkDerivation rec { name = "cryptsetup-1.5.1"; @@ -8,9 +12,11 @@ stdenv.mkDerivation rec { sha256 = "0dib3nw6ifd7d7hr9k4iyaha3hz0pkzairqa38l3fndkr9w3zlhn"; }; - configureFlags = "--enable-cryptsetup-reencrypt"; + configureFlags = [ "--enable-cryptsetup-reencrypt" ] + ++ stdenv.lib.optional enablePython "--enable-python"; - buildInputs = [ devicemapper libgcrypt libuuid pkgconfig popt ]; + buildInputs = [ devicemapper libgcrypt libuuid pkgconfig popt ] + ++ stdenv.lib.optional enablePython python; meta = { homepage = http://code.google.com/p/cryptsetup/; From b0f4ae64c29289d024d22767b9ca0d582cf1db3e Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 24 Jun 2013 10:22:03 +0200 Subject: [PATCH 034/798] python-packages: Add blivet version 0.16-1. This still doesn't have all possibly required dependencies, but at least we can do basic partitioning, which is our primary goal. At least when it comes to the Hetzner target of nixops. But even for partitioning when installing NixOS this library could be _very_ useful. Test cases currently don't work because they're filled with syntax errors and some references to the mocking library are missing. As you can see in propagatedBuildInputs, here are the promised overrides for Python support of libselinux and cryptsetup. Signed-off-by: aszlig --- pkgs/top-level/python-packages.nix | 38 ++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 08d62f87055..6aa12fdf3ae 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -451,6 +451,44 @@ pythonPackages = python.modules // rec { }; + blivet = buildPythonPackage rec { + name = "blivet-${version}"; + version = "0.16-1"; + + src = fetchurl { + url = "https://git.fedorahosted.org/cgit/blivet.git/snapshot/" + + "${name}.tar.bz2"; + sha256 = "0gfxf86sc0mkpqjcainch6gqh3r7brgma85pbl4nfpzmylhzj5sg"; + }; + + postPatch = '' + sed -i -e '/find_library/,/find_library/ { + c libudev = "${pkgs.udev}/lib/libudev.so.1" + }' blivet/pyudev.py + sed -i -e 's|"multipath"|"${pkgs.multipath_tools}/sbin/multipath"|' \ + blivet/devicelibs/mpath.py blivet/devices.py + ''; + + propagatedBuildInputs = let + pyenable = { enablePython = true; }; + selinuxWithPython = pkgs.libselinux.override pyenable; + cryptsetupWithPython = pkgs.cryptsetup.override pyenable; + in [ + pykickstart pyparted pkgs.udev pyblock + selinuxWithPython cryptsetupWithPython + ]; + + # tests are currently _heavily_ broken upstream + doCheck = false; + + meta = { + homepage = "https://fedoraproject.org/wiki/Blivet"; + description = "Module for management of a system's storage configuration"; + license = [ "GPLv2+" "LGPLv2.1+" ]; + }; + }; + + # euca2ools (and maybe Nova) needs boto 1.9, 2.0 doesn't work. boto_1_9 = buildPythonPackage (rec { name = "boto-1.9b"; From f04b0db6d3d325fcdafab9d14534e25b5f4aebbf Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 24 Jun 2013 12:36:44 +0200 Subject: [PATCH 035/798] python-pyparted: Fix test cases for 32bit systems. Fixes http://hydra.nixos.org/build/5425941 Signed-off-by: aszlig --- pkgs/top-level/python-packages.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6aa12fdf3ae..80d75d109d5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3753,6 +3753,10 @@ pythonPackages = python.modules // rec { sed -i -e ' s|e\.path\.startswith("/tmp/temp-device-")|"temp-device-" in e.path| ' tests/test__ped_ped.py + '' + pkgs.lib.optionalString stdenv.isi686 '' + # remove some integers in this test case which overflow on 32bit systems + sed -i -r -e '/class *UnitGetSizeTestCase/,/^$/{/[0-9]{11}/d}' \ + tests/test__ped_ped.py ''; preConfigure = '' From 86d14a5ab2dec0981b51cac8b2223bd29906a99b Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 24 Jun 2013 14:06:30 +0200 Subject: [PATCH 036/798] pykickstart: Run test cases in order of name. This should ensure the test casnes are always running in the same order, regardless of the target machine. We're just using the class name here, which should be sufficient enough to address the issue. Now the following build should be fixed: http://hydra.nixos.org/build/5425811 Big thanks to @rbvermaa for being a *really* great help debugging the problem quickly, because I couldn't reproduce it here (the run order of the test cases on my machine were 'accidentally' right). Signed-off-by: aszlig --- pkgs/top-level/python-packages.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 80d75d109d5..f0e74a0277f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3707,6 +3707,11 @@ pythonPackages = python.modules // rec { sha256 = "1sq68jvc39k9wrkcc4xlabhwi8gdz019yh2k5nrl7ya35b8daqw0"; }; + postPatch = '' + sed -i -e "s/for tst in tstList/for tst in sorted(tstList, \ + key=lambda m: m.__name__)/" tests/baseclass.py + ''; + propagatedBuildInputs = [ urlgrabber ]; checkPhase = '' From f305fe1c02b223463af9263a9800fc6b606527db Mon Sep 17 00:00:00 2001 From: Song Wenwu Date: Tue, 25 Jun 2013 07:32:04 +0800 Subject: [PATCH 037/798] kmplayer: minor fixes Wrap mplayer into PATH Remove unneeded dependency on gtk --- pkgs/applications/video/kmplayer/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/kmplayer/default.nix b/pkgs/applications/video/kmplayer/default.nix index 5f6c2259d1c..553b86a3801 100644 --- a/pkgs/applications/video/kmplayer/default.nix +++ b/pkgs/applications/video/kmplayer/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, cmake, pkgconfig, gettext -, kdelibs, gtk +{ stdenv, fetchurl, cmake, pkgconfig, gettext, makeWrapper +, kdelibs, cairo, dbus_glib, mplayer }: stdenv.mkDerivation { @@ -11,9 +11,14 @@ stdenv.mkDerivation { }; buildInputs = [ - cmake gettext pkgconfig kdelibs gtk + cmake gettext pkgconfig makeWrapper + kdelibs cairo dbus_glib ]; + postInstall = '' + wrapProgram $out/bin/kmplayer --suffix PATH : ${mplayer}/bin + ''; + meta = { description = "MPlayer front-end for KDE"; license = "GPL"; From f22880408ea8661529b2760c21ecb82f70463801 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Tue, 25 Jun 2013 09:59:19 +0300 Subject: [PATCH 038/798] Kindly ask strip to not mess up timestamps in static libraries --- pkgs/stdenv/generic/setup-repeatable.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/stdenv/generic/setup-repeatable.sh b/pkgs/stdenv/generic/setup-repeatable.sh index 8247ede3e46..3b2e0151932 100644 --- a/pkgs/stdenv/generic/setup-repeatable.sh +++ b/pkgs/stdenv/generic/setup-repeatable.sh @@ -724,12 +724,12 @@ fixupPhase() { if [ -z "$dontStrip" ]; then stripDebugList=${stripDebugList:-lib lib32 lib64 libexec bin sbin} if [ -n "$stripDebugList" ]; then - stripDirs "$stripDebugList" "${stripDebugFlags:--S}" + stripDirs "$stripDebugList" "${stripDebugFlags:--S --enable-deterministic-archives}" fi stripAllList=${stripAllList:-} if [ -n "$stripAllList" ]; then - stripDirs "$stripAllList" "${stripAllFlags:--s}" + stripDirs "$stripAllList" "${stripAllFlags:--s --enable-deterministic-archives}" fi fi From 0889bbe88fc6c6a9c962421ce38b7f2fad690e4a Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Tue, 25 Jun 2013 10:53:37 +0300 Subject: [PATCH 039/798] Patch binutils to produce more deterministic output --- pkgs/development/tools/misc/binutils/default.nix | 9 ++++++--- .../tools/misc/binutils/deterministic.patch | 12 ++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 20 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/tools/misc/binutils/deterministic.patch diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index e1afceebaa2..ca763a5e1fb 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, noSysDirs, zlib, cross ? null, gold ? false, bison ? null, flex2535 ? null, bc ? null, dejagnu ? null }: +{ stdenv, fetchurl, noSysDirs, zlib +, cross ? null, gold ? false, bison ? null, flex2535 ? null, bc ? null, dejagnu ? null +, deterministic ? false }: let basename = "binutils-2.23.1"; in stdenv.mkDerivation rec { @@ -19,7 +21,7 @@ stdenv.mkDerivation rec { # That requires upstream changes for things to work. So we can patch it to # get the old behaviour by now. ./dtneeded.patch - ]; + ] ++ (stdenv.lib.optional deterministic ./deterministic.patch); buildInputs = [ zlib ] @@ -48,7 +50,8 @@ stdenv.mkDerivation rec { + stdenv.lib.optionalString (stdenv.system == "mips64el-linux") " --enable-fix-loongson2f-nop" + stdenv.lib.optionalString (cross != null) " --target=${cross.config}" - + stdenv.lib.optionalString gold " --enable-gold"; + + stdenv.lib.optionalString gold " --enable-gold" + + stdenv.lib.optionalString deterministic " --enable-deterministic-archives"; enableParallelBuilding = true; diff --git a/pkgs/development/tools/misc/binutils/deterministic.patch b/pkgs/development/tools/misc/binutils/deterministic.patch new file mode 100644 index 00000000000..736e0aca6ce --- /dev/null +++ b/pkgs/development/tools/misc/binutils/deterministic.patch @@ -0,0 +1,12 @@ +diff -ur orig/binutils-2.23.1/ld/ldlang.c binutils-2.23.1/ld/ldlang.c +--- orig/ld/ldlang.c ++++ new/ld/ldlang.c +@@ -3095,6 +3095,8 @@ + ldfile_output_machine)) + einfo (_("%P%F:%s: can not set architecture: %E\n"), name); + ++ link_info.output_bfd->flags |= BFD_DETERMINISTIC_OUTPUT; ++ + link_info.hash = bfd_link_hash_table_create (link_info.output_bfd); + if (link_info.hash == NULL) + einfo (_("%P%F: can not create hash table: %E\n")); diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c8acc2c39c7..ba9a6c4b7de 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3206,6 +3206,8 @@ let inherit noSysDirs; }; + binutils_deterministic = binutils.override { deterministic = true; }; + binutils_gold = lowPrio (callPackage ../development/tools/misc/binutils { inherit noSysDirs; gold = true; From 92a48cb305add94aa76382f27b57ba9b2cffbf2d Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Tue, 25 Jun 2013 10:59:25 +0300 Subject: [PATCH 040/798] Add gcc4.6 wrapped using deterministic binutils --- pkgs/top-level/all-packages.nix | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ba9a6c4b7de..25b5db6f872 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2131,6 +2131,37 @@ let gcc45 = gcc45_real; + wrapDeterministicGCCWith = gccWrapper: glibc: baseGCC: gccWrapper { + nativeTools = stdenv ? gcc && stdenv.gcc.nativeTools; + nativeLibc = stdenv ? gcc && stdenv.gcc.nativeLibc; + nativePrefix = if stdenv ? gcc then stdenv.gcc.nativePrefix else ""; + gcc = baseGCC; + libc = glibc; + shell = bash; + binutils = binutils_deterministic; + inherit stdenv coreutils zlib; + }; + + wrapDeterministicGCC = wrapDeterministicGCCWith (import ../build-support/gcc-wrapper) glibc; + + gcc46_deterministic = lowPrio (wrapDeterministicGCC (callPackage ../development/compilers/gcc/4.6 { + inherit noSysDirs; + + # bootstrapping a profiled compiler does not work in the sheevaplug: + # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43944 + profiledCompiler = !stdenv.isArm; + + # When building `gcc.crossDrv' (a "Canadian cross", with host == target + # and host != build), `cross' must be null but the cross-libc must still + # be passed. + cross = null; + libcCross = if crossSystem != null then libcCross else null; + libpthreadCross = + if crossSystem != null && crossSystem.config == "i586-pc-gnu" + then gnu.libpthreadCross + else null; + })); + gcc46 = gcc46_real; gcc47 = gcc47_real; From 6c9838ad54727574bb0faa62fc46a1e0fcced9ba Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Tue, 25 Jun 2013 11:03:47 +0300 Subject: [PATCH 041/798] Rename repeatableStdenv to deterministicStdenv for consistency. Make it plug more holes to avoid regular binutils sneaking in and ruining builds. --- pkgs/top-level/all-packages.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 25b5db6f872..b9018dc568c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2844,7 +2844,14 @@ let ocaml = ocaml_3_08_0; }; - repeatableStdenv = lowPrio (stdenvAdapters.overrideSetup stdenv ../stdenv/generic/setup-repeatable.sh ); + deterministicStdenv = lowPrio ( + overrideInStdenv ( + stdenvAdapters.overrideGCC + (stdenvAdapters.overrideSetup stdenv ../stdenv/generic/setup-repeatable.sh ) + gcc46_deterministic + ) + [ binutils_deterministic ] + ); roadsend = callPackage ../development/compilers/roadsend { }; From 97bf9fbbc846e5e7a2d24e931dc91fdc6ef74d63 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Fri, 21 Jun 2013 09:13:38 +0200 Subject: [PATCH 042/798] xbmc: Make it read /etc/zoneinfo --- pkgs/applications/video/xbmc/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/video/xbmc/default.nix b/pkgs/applications/video/xbmc/default.nix index 55734e49539..d3b3556baf4 100644 --- a/pkgs/applications/video/xbmc/default.nix +++ b/pkgs/applications/video/xbmc/default.nix @@ -68,6 +68,11 @@ stdenv.mkDerivation rec { dontUseCmakeConfigure = true; + preConfigure = '' + substituteInPlace xbmc/linux/LinuxTimezone.cpp \ + --replace 'usr/share/zoneinfo' 'etc/zoneinfo' + ''; + configureFlags = [ "--enable-external-libraries" "--disable-webserver" From 270da328b94caaf6ef5a29fdeecc872f3a25d7da Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Tue, 25 Jun 2013 10:03:00 +0200 Subject: [PATCH 043/798] qemu: Enable virtfs This makes it possible to share host directories to qemu guests using 9P. --- pkgs/applications/virtualization/qemu/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index b1165b3535b..997cc8bd49d 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, python, zlib, pkgconfig, glib, SDL, ncurses, perl, pixman }: +{ stdenv, fetchurl, python, zlib, pkgconfig, glib, SDL, ncurses, perl, pixman +, attr, libcap }: stdenv.mkDerivation rec { name = "qemu-1.4.0"; @@ -8,10 +9,16 @@ stdenv.mkDerivation rec { sha256 = "1a7d11vjs1p6i1ck2ff9annmkhpkbjl73hl9i1cbg3s0fznrfqh6"; }; - buildInputs = [ python zlib pkgconfig glib SDL ncurses perl pixman ]; + buildInputs = [ + python zlib pkgconfig glib SDL ncurses perl pixman attr libcap + ]; enableParallelBuilding = true; + configureFlags = [ + "--enable-virtfs" + ]; + meta = { description = "QEmu processor emulator"; license = "GPLv2+"; From 266da813a3cba3462394e05c5bda97fb858a7fcc Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Tue, 25 Jun 2013 12:19:38 +0200 Subject: [PATCH 044/798] spotify: Update to 0.9.1.55 --- pkgs/applications/audio/spotify/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index 36c6c2ca9cd..ccdfcbb3d99 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -3,7 +3,7 @@ assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; let - version = "0.9.0.133"; + version = "0.9.1.55"; qt4webkit = if stdenv.system == "i686-linux" then fetchurl { @@ -25,13 +25,13 @@ stdenv.mkDerivation { src = if stdenv.system == "i686-linux" then fetchurl { - url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client_${version}.gd18ed58.259-1_i386.deb"; - sha256 = "15kbwll63pm99262f7xq1z0c5bwmk5cz46pkh8xd5xsqxlsvvv1n"; + url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client_${version}.gbdd3b79.203-1_i386.deb"; + sha256 = "1sls4gb85700126bbk4sz73ipa2rjcinmpnsi78q0bsdj365y2wc"; } else if stdenv.system == "x86_64-linux" then fetchurl { - url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client_${version}.gd18ed58.259-1_amd64.deb"; - sha256 = "0l3nikhf4hyj6z7639s668kd806730va005rwqcxvymxddcbcp03"; + url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client_${version}.gbdd3b79.203-1_amd64.deb"; + sha256 = "10pzj3p8bjbxh9nnm4qc5s1hn9nh7hgh3vbwm0xblj9rn71wl03y"; } else throw "Spotify not supported on this platform."; From 9e85628fb94ffc10c27a56698646dc543517f1a7 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Tue, 25 Jun 2013 12:20:00 +0200 Subject: [PATCH 045/798] mkpasswd: Update to 5.0.25 --- pkgs/tools/security/mkpasswd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/mkpasswd/default.nix b/pkgs/tools/security/mkpasswd/default.nix index a1982cc4e66..f131fcef4ce 100644 --- a/pkgs/tools/security/mkpasswd/default.nix +++ b/pkgs/tools/security/mkpasswd/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "mkpasswd-${version}"; - version = "5.0.20"; + version = "5.0.25"; src = fetchurl { url = "http://ftp.debian.org/debian/pool/main/w/whois/whois_${version}.tar.xz"; - sha256 = "1kwf5pwc7w8dw40nrd4m4637mz7pbhc4c1v78j56nqj38sak50w1"; + sha256 = "0qb859vwd6g93cb5zbf19gpw2g2b9s1qlq4nqia1a966pjkvw1qj"; }; preConfigure = '' From 8496b31e34be68cc663c66169dd868935597bee5 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Tue, 25 Jun 2013 12:31:44 +0200 Subject: [PATCH 046/798] sbt: Use recommended java options --- .../tools/build-managers/simple-build-tool/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/simple-build-tool/default.nix b/pkgs/development/tools/build-managers/simple-build-tool/default.nix index a72f94d52f6..e446bf1c1eb 100644 --- a/pkgs/development/tools/build-managers/simple-build-tool/default.nix +++ b/pkgs/development/tools/build-managers/simple-build-tool/default.nix @@ -66,8 +66,8 @@ versionedDerivation "simple-build-tool" version { "xsbt-0.12.3" = let version = "0.12.3"; in { name = "xsbt-${version}"; - # scala needs much more PermGen space - javaArgs = "-Xmx1024M"; + # Recommended java options from sbt Getting started guide + javaArgs = "-Xms512M -Xmx1536M -Xss1M -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=384M"; # from https://github.com/harrah/xsbt/wiki/Getting-Started-Setup src = fetchurl { url = http://repo.typesafe.com/typesafe/ivy-releases/org.scala-sbt/sbt-launch/0.12.3/sbt-launch.jar; From 0dbb2fdcfe68de0b231e5007a104cd92c7c417c0 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Tue, 25 Jun 2013 12:32:28 +0200 Subject: [PATCH 047/798] sbt: Remove duplicate package --- .../tools/build-managers/sbt/default.nix | 27 ------------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 29 deletions(-) delete mode 100644 pkgs/development/tools/build-managers/sbt/default.nix diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix deleted file mode 100644 index 90045b97352..00000000000 --- a/pkgs/development/tools/build-managers/sbt/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ stdenv, fetchurl, writeScript, bash, jre }: - -let - - sbt = writeScript "sbt.sh" '' - #!${bash}/bin/bash - ${jre}/bin/java -Xms512M -Xmx1536M -Xss1M -XX:+CMSClassUnloadingEnabled \ - -XX:MaxPermSize=384M -jar @out@/lib/sbt-launch.jar "$@" - ''; - -in stdenv.mkDerivation rec { - name = "sbt-${version}"; - - version = "0.12.3"; - - src = fetchurl { - url = "http://scalasbt.artifactoryonline.com/scalasbt/sbt-native-packages/org/scala-sbt/sbt/${version}/sbt.tgz"; - sha256 = "154ydaxd6ink5sy4flzpyh47nnhgkxwpzmml8q16am7655fpib08"; - }; - - installPhase = '' - mkdir -p $out/lib $out/bin - mv bin/sbt-launch.jar $out/lib/ - cp ${sbt} $out/bin/sbt - substituteInPlace $out/bin/sbt --replace @out@ $out - ''; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b9018dc568c..89fb02eba0e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3537,8 +3537,6 @@ let jre = jdk; }; - sbt = callPackage ../development/tools/build-managers/sbt { }; - scons = callPackage ../development/tools/build-managers/scons { }; simpleBuildTool = callPackage ../development/tools/build-managers/simple-build-tool { }; From 9b2a657f420cd8b3dbca5f46862585fcbc921f16 Mon Sep 17 00:00:00 2001 From: Gergely Risko Date: Tue, 25 Jun 2013 13:01:41 +0200 Subject: [PATCH 048/798] Add regex-tdfa-text --- .../libraries/haskell/regex-tdfa-text/default.nix | 13 +++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/development/libraries/haskell/regex-tdfa-text/default.nix diff --git a/pkgs/development/libraries/haskell/regex-tdfa-text/default.nix b/pkgs/development/libraries/haskell/regex-tdfa-text/default.nix new file mode 100644 index 00000000000..1a329c25b2d --- /dev/null +++ b/pkgs/development/libraries/haskell/regex-tdfa-text/default.nix @@ -0,0 +1,13 @@ +{ cabal, regexBase, regexTdfa, text }: + +cabal.mkDerivation (self: { + pname = "regex-tdfa-text"; + version = "1.0.0.2"; + sha256 = "1p17xv3j2xd74iilyqwlqhkmyp26asq4k1pb0h2f0wdqqfr87bfd"; + buildDepends = [ regexBase regexTdfa text ]; + meta = { + description = "Text interface for regex-tdfa"; + 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 411f735dbe8..4bcce23fc3b 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1691,6 +1691,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); regexTDFA = callPackage ../development/libraries/haskell/regex-tdfa {}; regexTdfa = self.regexTDFA; + regexTdfaText = callPackage ../development/libraries/haskell/regex-tdfa-text {}; + regexPCRE = callPackage ../development/libraries/haskell/regex-pcre {}; regexPcre = self.regexPCRE; From cbf2526bfda604260fcf69973fffddc535afc099 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 25 Jun 2013 13:21:35 +0200 Subject: [PATCH 049/798] Add nixops --- .../package-management/nixops/default.nix | 37 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/tools/package-management/nixops/default.nix diff --git a/pkgs/tools/package-management/nixops/default.nix b/pkgs/tools/package-management/nixops/default.nix new file mode 100644 index 00000000000..4e47a50078a --- /dev/null +++ b/pkgs/tools/package-management/nixops/default.nix @@ -0,0 +1,37 @@ +{ lib, pythonPackages, fetchurl, libxslt, docbook5_xsl }: + +pythonPackages.buildPythonPackage rec { + name = "nixops-1.0"; + namePrefix = ""; + + src = fetchurl { + url = "http://nixos.org/releases/nixops/${name}/${name}.tar.bz2"; + sha256 = "9ae2dfac8e1fa895aef81323b14a3398f03a1cbd8c86ea10b6fff7312e1fadbb"; + }; + + buildInputs = [ libxslt ]; + + pythonPath = + [ pythonPackages.prettytable + pythonPackages.boto + pythonPackages.sqlite3 + ]; + + doCheck = false; + + postInstall = + '' + make -C doc/manual install nixops.1 docbookxsl=${docbook5_xsl}/xml/xsl/docbook \ + docdir=$out/share/doc/nixops mandir=$out/share/man + + mkdir -p $out/share/nix/nixops + cp -av nix/* $out/share/nix/nixops + ''; + + meta = { + homepage = https://github.com/NixOS/nixops; + description = "NixOS cloud provisioning and deployment tool"; + maintainers = [ lib.maintainers.eelco lib.maintainers.rob ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 89fb02eba0e..782e83d1948 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9428,6 +9428,8 @@ let }; */ + nixops = callPackage ../tools/package-management/nixops { }; + nut = callPackage ../applications/misc/nut { }; solfege = callPackage ../misc/solfege { From acba9240cdd89295c6e3a22525dc67cb936d164c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 25 Jun 2013 14:05:48 +0200 Subject: [PATCH 050/798] nixos.org/tarballs -> tarballs.nixos.org It's currently the same machine, but tarballs.nixos.org should become an S3/CloudFront site eventually. --- doc/release-notes.xml | 4 ++-- pkgs/applications/editors/emacs-modes/cua/default.nix | 2 +- pkgs/applications/editors/monodevelop/default.nix | 2 +- pkgs/applications/editors/monodoc/default.nix | 2 +- pkgs/applications/graphics/batik/default.nix | 2 +- pkgs/applications/graphics/f-spot/default.nix | 2 +- pkgs/applications/video/mplayer/default.nix | 2 +- pkgs/build-support/fetchurl/default.nix | 2 +- pkgs/build-support/fetchurl/mirrors.nix | 2 +- pkgs/data/fonts/bakoma-ttf/default.nix | 2 +- pkgs/data/misc/cacert/default.nix | 2 +- pkgs/development/compilers/ghc/6.4.2-binary.nix | 2 +- pkgs/development/compilers/ocaml/3.08.0.nix | 2 +- pkgs/development/compilers/openjdk/bootstrap.nix | 4 ++-- pkgs/development/compilers/qcmm/default.nix | 2 +- pkgs/development/libraries/db4/db4-4.4.nix | 2 +- pkgs/development/libraries/gtk-sharp-1/default.nix | 2 +- pkgs/development/libraries/gtkmozembed-sharp/default.nix | 2 +- .../development/libraries/gtksourceview-sharp/default.nix | 2 +- pkgs/development/libraries/imlib/default.nix | 2 +- pkgs/development/libraries/java/jakarta-bcel/default.nix | 2 +- .../development/libraries/java/jakarta-regexp/default.nix | 2 +- pkgs/development/libraries/pdf2xml/default.nix | 2 +- .../tools/build-managers/gnumake-3.80/default.nix | 2 +- pkgs/development/tools/build-managers/mk/default.nix | 2 +- pkgs/games/keen4/default.nix | 2 +- pkgs/games/quake3/demo/default.nix | 4 ++-- pkgs/os-specific/linux/aufs-util/2.nix | 2 +- pkgs/os-specific/linux/aufs/2.nix | 2 +- pkgs/os-specific/linux/usbutils/default.nix | 2 +- pkgs/stdenv/linux/bootstrap/armv5tel/default.nix | 2 +- pkgs/stdenv/linux/bootstrap/i686/default.nix | 2 +- pkgs/stdenv/linux/bootstrap/loongson2f/default.nix | 2 +- pkgs/stdenv/linux/bootstrap/powerpc/default.nix | 8 ++++---- pkgs/stdenv/linux/bootstrap/x86_64/default.nix | 2 +- pkgs/tools/filesystems/aefs/default.nix | 2 +- pkgs/tools/misc/getopt/default.nix | 2 +- pkgs/tools/networking/openssh/default.nix | 2 +- pkgs/tools/networking/p2p/azureus/default.nix | 2 +- pkgs/tools/security/gnupg1/default.nix | 2 +- pkgs/tools/system/pciutils/default.nix | 2 +- pkgs/tools/text/xml/xpf/default.nix | 2 +- pkgs/tools/typesetting/bibtex-tools/default.nix | 2 +- pkgs/tools/virtualization/ec2-ami-tools/default.nix | 2 +- pkgs/tools/virtualization/ec2-api-tools/default.nix | 2 +- pkgs/top-level/perl-packages.nix | 2 +- 46 files changed, 52 insertions(+), 52 deletions(-) diff --git a/doc/release-notes.xml b/doc/release-notes.xml index 0551b36cdbf..2a1fb9f3109 100644 --- a/doc/release-notes.xml +++ b/doc/release-notes.xml @@ -237,12 +237,12 @@ fetchurl { fetchurl will first try to download this file from . + xlink:href="http://tarballs.nixos.org/sha1/eb72f55e4a8bf08e8c6ef227c0ade3d068ba1082"/>. If that file doesn’t exist, it will try the original URL. In general, the “content-addressed” location is mirror/hash-type/hash. There is currently only one content-addressable mirror (), but more can be + xlink:href="http://tarballs.nixos.org"/>), but more can be specified in the hashedMirrors attribute in pkgs/build-support/fetchurl/mirrors.nix, or by setting the NIX_HASHED_MIRRORS environment variable diff --git a/pkgs/applications/editors/emacs-modes/cua/default.nix b/pkgs/applications/editors/emacs-modes/cua/default.nix index b5348967a3e..a03c6447622 100644 --- a/pkgs/applications/editors/emacs-modes/cua/default.nix +++ b/pkgs/applications/editors/emacs-modes/cua/default.nix @@ -2,7 +2,7 @@ name = "cua-mode-2.10"; builder = ./builder.sh; src = fetchurl { - url = http://nixos.org/tarballs/cua-mode-2.10.el; + url = http://tarballs.nixos.org/cua-mode-2.10.el; md5 = "5bf5e43f5f38c8383868c7c6c5baca09"; }; } diff --git a/pkgs/applications/editors/monodevelop/default.nix b/pkgs/applications/editors/monodevelop/default.nix index c823ecfdf83..aad6325fa44 100644 --- a/pkgs/applications/editors/monodevelop/default.nix +++ b/pkgs/applications/editors/monodevelop/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { builder = ./builder.sh; src = fetchurl { - url = http://nixos.org/tarballs/monodevelop-0.6-pre2315.tar.bz2; + url = http://tarballs.nixos.org/monodevelop-0.6-pre2315.tar.bz2; md5 = "8c33df5629b0676b7ab552854c1de6fd"; }; diff --git a/pkgs/applications/editors/monodoc/default.nix b/pkgs/applications/editors/monodoc/default.nix index 8f6b6d6024c..0e8421646a8 100644 --- a/pkgs/applications/editors/monodoc/default.nix +++ b/pkgs/applications/editors/monodoc/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { builder = ./builder.sh; src = fetchurl { - url = http://nixos.org/tarballs/monodoc-1.0.6.tar.gz; + url = http://tarballs.nixos.org/monodoc-1.0.6.tar.gz; md5 = "f2fc27e8e4717d90dc7efa2450625693"; }; diff --git a/pkgs/applications/graphics/batik/default.nix b/pkgs/applications/graphics/batik/default.nix index fbe67d1600d..d776d433b37 100644 --- a/pkgs/applications/graphics/batik/default.nix +++ b/pkgs/applications/graphics/batik/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "batik-1.6"; builder = ./builder.sh; src = fetchurl { - url = http://nixos.org/tarballs/batik-1.6.zip; + url = http://tarballs.nixos.org/batik-1.6.zip; md5 = "edff288fc64f968ff96ca49763d50f3c"; }; diff --git a/pkgs/applications/graphics/f-spot/default.nix b/pkgs/applications/graphics/f-spot/default.nix index 856795ea356..8ecfc0df162 100644 --- a/pkgs/applications/graphics/f-spot/default.nix +++ b/pkgs/applications/graphics/f-spot/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { inherit makeWrapper; src = fetchurl { - url = http://nixos.org/tarballs/f-spot-0.0.10.tar.bz2; + url = http://tarballs.nixos.org/f-spot-0.0.10.tar.bz2; md5 = "19cc6e067ccc261b0502ff6189b79832"; }; diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix index a1ec200aaf0..2051590a819 100644 --- a/pkgs/applications/video/mplayer/default.nix +++ b/pkgs/applications/video/mplayer/default.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { src = fetchurl { # Old kind of URL: - # url = http://nixos.org/tarballs/mplayer-snapshot-20101227.tar.bz2; + # url = http://tarballs.nixos.org/mplayer-snapshot-20101227.tar.bz2; # Snapshot I took on 20110423 #Transient diff --git a/pkgs/build-support/fetchurl/default.nix b/pkgs/build-support/fetchurl/default.nix index 6c981229531..294d9a43ef7 100644 --- a/pkgs/build-support/fetchurl/default.nix +++ b/pkgs/build-support/fetchurl/default.nix @@ -91,7 +91,7 @@ stdenv.mkDerivation { urls = urls_; # If set, prefer the content-addressable mirrors - # (http://nixos.org/tarballs) over the original URLs. + # (http://tarballs.nixos.org) over the original URLs. preferHashedMirrors = true; # New-style output content requirements. diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix index d6ad25afbad..70a06735e68 100644 --- a/pkgs/build-support/fetchurl/mirrors.nix +++ b/pkgs/build-support/fetchurl/mirrors.nix @@ -2,7 +2,7 @@ rec { # Content-addressable Nix mirrors. hashedMirrors = [ - http://nixos.org/tarballs + http://tarballs.nixos.org ]; # Mirrors for mirror://site/filename URIs, where "site" is diff --git a/pkgs/data/fonts/bakoma-ttf/default.nix b/pkgs/data/fonts/bakoma-ttf/default.nix index 5f9cbec7a97..8b607adaaae 100644 --- a/pkgs/data/fonts/bakoma-ttf/default.nix +++ b/pkgs/data/fonts/bakoma-ttf/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "bakoma-ttf"; src = fetchurl { - url = http://nixos.org/tarballs/bakoma-ttf.tar.bz2; + url = http://tarballs.nixos.org/bakoma-ttf.tar.bz2; sha256 = "1j1y3cq6ys30m734axc0brdm2q9n2as4h32jws15r7w5fwr991km"; }; diff --git a/pkgs/data/misc/cacert/default.nix b/pkgs/data/misc/cacert/default.nix index 711ebc9e88f..aafb9104e22 100644 --- a/pkgs/data/misc/cacert/default.nix +++ b/pkgs/data/misc/cacert/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "cacert-20121229"; src = fetchurl { - url = "http://nixos.org/tarballs/${name}.pem.bz2"; + url = "http://tarballs.nixos.org/${name}.pem.bz2"; sha256 = "031s86pqvn620zkj6w97hqgjvkp6vsvlymzz7rwvkv25zvrjsgif"; }; diff --git a/pkgs/development/compilers/ghc/6.4.2-binary.nix b/pkgs/development/compilers/ghc/6.4.2-binary.nix index 8e4e6c58a3f..b42602829ac 100644 --- a/pkgs/development/compilers/ghc/6.4.2-binary.nix +++ b/pkgs/development/compilers/ghc/6.4.2-binary.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { src = if stdenv.system == "i686-linux" then fetchurl { - url = http://nixos.org/tarballs/ghc-6.4.2-i386-unknown-linux.tar.bz2; + url = http://tarballs.nixos.org/ghc-6.4.2-i386-unknown-linux.tar.bz2; md5 = "092fe2e25dab22b926babe97cc77db1f"; } else if stdenv.system == "x86_64-linux" then diff --git a/pkgs/development/compilers/ocaml/3.08.0.nix b/pkgs/development/compilers/ocaml/3.08.0.nix index 4f7e9469bbf..f4640b36e67 100644 --- a/pkgs/development/compilers/ocaml/3.08.0.nix +++ b/pkgs/development/compilers/ocaml/3.08.0.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "ocaml-3.08.0"; builder = ./builder.sh; src = fetchurl { - url = http://nixos.org/tarballs/ocaml-3.08.0.tar.gz; + url = http://tarballs.nixos.org/ocaml-3.08.0.tar.gz; md5 = "c6ef478362295c150101cdd2efcd38e0"; }; configureScript = ./configure-3.08.0; diff --git a/pkgs/development/compilers/openjdk/bootstrap.nix b/pkgs/development/compilers/openjdk/bootstrap.nix index 2ac2eed117c..01ed43069b6 100644 --- a/pkgs/development/compilers/openjdk/bootstrap.nix +++ b/pkgs/development/compilers/openjdk/bootstrap.nix @@ -4,12 +4,12 @@ let # !!! These should be on nixos.org src = if glibc.system == "x86_64-linux" then fetchurl { - url = http://nixos.org/tarballs/openjdk-bootstrap-x86_64-linux-2012-08-24.tar.xz; + url = http://tarballs.nixos.org/openjdk-bootstrap-x86_64-linux-2012-08-24.tar.xz; sha256 = "0gla9dxrfq2w1hvgsnn8jg8a60k27im6z43a6iidi0qmwa0wah32"; } else if glibc.system == "i686-linux" then fetchurl { - url = http://nixos.org/tarballs/openjdk-bootstrap-i686-linux-2012-08-24.tar.xz; + url = http://tarballs.nixos.org/openjdk-bootstrap-i686-linux-2012-08-24.tar.xz; sha256 = "184wq212bycwbbq4ix8cc6jwjxkrqw9b01zb86q95kqpa8zy5206"; } else throw "No bootstrap for system"; diff --git a/pkgs/development/compilers/qcmm/default.nix b/pkgs/development/compilers/qcmm/default.nix index b7f11866687..a221ae29f04 100644 --- a/pkgs/development/compilers/qcmm/default.nix +++ b/pkgs/development/compilers/qcmm/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation { name = "qcmm-2006-01-31"; src = fetchurl { - url = http://nixos.org/tarballs/qc--20060131.tar.gz; + url = http://tarballs.nixos.org/qc--20060131.tar.gz; md5 = "9097830775bcf22c9bad54f389f5db23"; }; buildInputs = [ mk ocaml noweb groff ]; diff --git a/pkgs/development/libraries/db4/db4-4.4.nix b/pkgs/development/libraries/db4/db4-4.4.nix index 7444439fc73..ab3ffa85cf2 100644 --- a/pkgs/development/libraries/db4/db4-4.4.nix +++ b/pkgs/development/libraries/db4/db4-4.4.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { src = fetchurl { urls = [ http://download.oracle.com/berkeley-db/db-4.4.20.NC.tar.gz - http://nixos.org/tarballs/db-4.4.20.NC.tar.gz + http://tarballs.nixos.org/db-4.4.20.NC.tar.gz ]; md5 = "afd9243ea353bbaa04421488d3b37900"; }; diff --git a/pkgs/development/libraries/gtk-sharp-1/default.nix b/pkgs/development/libraries/gtk-sharp-1/default.nix index 2110884a022..aad440bf672 100644 --- a/pkgs/development/libraries/gtk-sharp-1/default.nix +++ b/pkgs/development/libraries/gtk-sharp-1/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { builder = ./builder.sh; src = fetchurl { - url = http://nixos.org/tarballs/gtk-sharp-1.0.6.tar.gz; + url = http://tarballs.nixos.org/gtk-sharp-1.0.6.tar.gz; md5 = "2651d14fe77174ab20b8af53d150ee11"; }; diff --git a/pkgs/development/libraries/gtkmozembed-sharp/default.nix b/pkgs/development/libraries/gtkmozembed-sharp/default.nix index 43476d6e78a..b54f3cc2f61 100644 --- a/pkgs/development/libraries/gtkmozembed-sharp/default.nix +++ b/pkgs/development/libraries/gtkmozembed-sharp/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { builder = ./builder.sh; src = fetchurl { - url = http://nixos.org/tarballs/gtkmozembed-sharp-0.7-pre41601.tar.bz2; + url = http://tarballs.nixos.org/gtkmozembed-sharp-0.7-pre41601.tar.bz2; md5 = "34aac139377296791acf3af9b5dc27ed"; }; diff --git a/pkgs/development/libraries/gtksourceview-sharp/default.nix b/pkgs/development/libraries/gtksourceview-sharp/default.nix index abd97ca777b..56c6e1b1ee5 100644 --- a/pkgs/development/libraries/gtksourceview-sharp/default.nix +++ b/pkgs/development/libraries/gtksourceview-sharp/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { builder = ./builder.sh; src = fetchurl { - url = http://nixos.org/tarballs/gtksourceview-sharp-0.6-pre40261.tar.bz2; + url = http://tarballs.nixos.org/gtksourceview-sharp-0.6-pre40261.tar.bz2; md5 = "8bc26c182bd897f50988e110a9a11f34"; }; diff --git a/pkgs/development/libraries/imlib/default.nix b/pkgs/development/libraries/imlib/default.nix index 24e7d2afab5..27aaad7598a 100644 --- a/pkgs/development/libraries/imlib/default.nix +++ b/pkgs/development/libraries/imlib/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "imlib-1.9.15"; src = fetchurl { - url = http://nixos.org/tarballs/imlib-1.9.15.tar.gz; + url = http://tarballs.nixos.org/imlib-1.9.15.tar.gz; md5 = "2a5561457e7f8b2e04d88f73508fd13a"; }; diff --git a/pkgs/development/libraries/java/jakarta-bcel/default.nix b/pkgs/development/libraries/java/jakarta-bcel/default.nix index 3bea2a0d8f4..1ff88a36247 100644 --- a/pkgs/development/libraries/java/jakarta-bcel/default.nix +++ b/pkgs/development/libraries/java/jakarta-bcel/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { builder = ./builder.sh; src = fetchurl { - url = http://nixos.org/tarballs/bcel-5.1.tar.gz; + url = http://tarballs.nixos.org/bcel-5.1.tar.gz; md5 = "318f22e4f5f59b68cd004db83a7d65dc"; }; diff --git a/pkgs/development/libraries/java/jakarta-regexp/default.nix b/pkgs/development/libraries/java/jakarta-regexp/default.nix index d6c093423d8..55c3beff70a 100644 --- a/pkgs/development/libraries/java/jakarta-regexp/default.nix +++ b/pkgs/development/libraries/java/jakarta-regexp/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { builder = ./java-bin-builder.sh; src = fetchurl { - url = http://nixos.org/tarballs/jakarta-regexp-1.4.tar.gz; + url = http://tarballs.nixos.org/jakarta-regexp-1.4.tar.gz; md5 = "d903d84c949df848009f3bf205b32c97"; }; diff --git a/pkgs/development/libraries/pdf2xml/default.nix b/pkgs/development/libraries/pdf2xml/default.nix index 0f9a3dc2b2d..4f3cd931fce 100644 --- a/pkgs/development/libraries/pdf2xml/default.nix +++ b/pkgs/development/libraries/pdf2xml/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "pdf2xml"; src = fetchurl { - url = http://nixos.org/tarballs/pdf2xml.tar.gz; + url = http://tarballs.nixos.org/pdf2xml.tar.gz; sha256 = "04rl7ppxqgnvxvvws669cxp478lnrdmiqj0g3m4p69bawfjc4z3w"; }; sourceRoot = "pdf2xml/pdf2xml"; diff --git a/pkgs/development/tools/build-managers/gnumake-3.80/default.nix b/pkgs/development/tools/build-managers/gnumake-3.80/default.nix index dbc68e1d90c..b0926a7f531 100644 --- a/pkgs/development/tools/build-managers/gnumake-3.80/default.nix +++ b/pkgs/development/tools/build-managers/gnumake-3.80/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "gnumake-3.80"; src = fetchurl { - url = http://nixos.org/tarballs/make-3.80.tar.bz2; + url = http://tarballs.nixos.org/make-3.80.tar.bz2; md5 = "0bbd1df101bc0294d440471e50feca71"; }; patches = [./log.patch]; diff --git a/pkgs/development/tools/build-managers/mk/default.nix b/pkgs/development/tools/build-managers/mk/default.nix index 9cd208f5a81..6e40e4653ac 100644 --- a/pkgs/development/tools/build-managers/mk/default.nix +++ b/pkgs/development/tools/build-managers/mk/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "mk-2006-01-31"; src = fetchurl { - url = http://nixos.org/tarballs/mk-20060131.tar.gz; + url = http://tarballs.nixos.org/mk-20060131.tar.gz; md5 = "167fd4e0eea4f49def01984ec203289b"; }; builder = ./builder.sh; diff --git a/pkgs/games/keen4/default.nix b/pkgs/games/keen4/default.nix index 745d9f6b38c..4d6189603a9 100644 --- a/pkgs/games/keen4/default.nix +++ b/pkgs/games/keen4/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { builder = ./builder.sh; dist = fetchurl { - url = http://nixos.org/tarballs/keen4.zip; + url = http://tarballs.nixos.org/keen4.zip; md5 = "ffcdd9e3bce224d92797166bc3f56f1c"; }; diff --git a/pkgs/games/quake3/demo/default.nix b/pkgs/games/quake3/demo/default.nix index fb6d1f0b232..99c07a9a7e0 100644 --- a/pkgs/games/quake3/demo/default.nix +++ b/pkgs/games/quake3/demo/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation { # This is needed for pak0.pk3. demo = fetchurl { - url = http://nixos.org/tarballs/linuxq3ademo-1.11-6.x86.gz.sh; + url = http://tarballs.nixos.org/linuxq3ademo-1.11-6.x86.gz.sh; md5 = "484610c1ce34272223a52ec331c99d5d"; }; # This is needed for the additional pak?.pk3 files. update = fetchurl { - url = http://nixos.org/tarballs/linuxq3apoint-1.31.x86.run; + url = http://tarballs.nixos.org/linuxq3apoint-1.31.x86.run; md5 = "2620b9eefb6d0775f766b6570870157a"; }; diff --git a/pkgs/os-specific/linux/aufs-util/2.nix b/pkgs/os-specific/linux/aufs-util/2.nix index 130cfd85ee7..e4968b92048 100644 --- a/pkgs/os-specific/linux/aufs-util/2.nix +++ b/pkgs/os-specific/linux/aufs-util/2.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { name = "aufs2-util-${version}-${kernelDev.version}"; src = fetchurl { - url = "http://nixos.org/tarballs/aufs2-util-git-${version}.tar.bz2"; + url = "http://tarballs.nixos.org/aufs2-util-git-${version}.tar.bz2"; sha256 = "0ly0c3p8fjxqbk8k5rmm1a91wg8wcrvhi1lv4aawalkkk8rqbnwk"; }; diff --git a/pkgs/os-specific/linux/aufs/2.nix b/pkgs/os-specific/linux/aufs/2.nix index 87d16c113a5..a4a40823f7a 100644 --- a/pkgs/os-specific/linux/aufs/2.nix +++ b/pkgs/os-specific/linux/aufs/2.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { src = if (builtins.lessThan (builtins.compareVersions kernelDev.version "2.6.35") 0) then fetchurl { - url = "http://nixos.org/tarballs/aufs2-standalone-git-${version}.tar.bz2"; + url = "http://tarballs.nixos.org/aufs2-standalone-git-${version}.tar.bz2"; sha256 = "1g4mw4qx2xzpygdwjiw36bkhfz1hi7wxx7w79n2h0lr5grzzdnd6"; } else diff --git a/pkgs/os-specific/linux/usbutils/default.nix b/pkgs/os-specific/linux/usbutils/default.nix index 5af28876dc1..3956b5e04d0 100644 --- a/pkgs/os-specific/linux/usbutils/default.nix +++ b/pkgs/os-specific/linux/usbutils/default.nix @@ -4,7 +4,7 @@ let # Obtained from http://www.linux-usb.org/usb.ids.bz2. usbids = fetchurl { - url = http://nixos.org/tarballs/usb.ids.20120920.bz2; + url = http://tarballs.nixos.org/usb.ids.20120920.bz2; sha256 = "0sz860g7grf6kx22p49s6j8h85c69ymcw16a8110klzfl9hl9hli"; }; diff --git a/pkgs/stdenv/linux/bootstrap/armv5tel/default.nix b/pkgs/stdenv/linux/bootstrap/armv5tel/default.nix index 3a8a03e5a54..1d4d53a38ee 100644 --- a/pkgs/stdenv/linux/bootstrap/armv5tel/default.nix +++ b/pkgs/stdenv/linux/bootstrap/armv5tel/default.nix @@ -7,7 +7,7 @@ curl = ./curl.bz2; bootstrapTools = { - url = "http://nixos.org/tarballs/stdenv-linux/armv5tel/r18744/bootstrap-tools.cpio.bz2"; + url = "http://tarballs.nixos.org/stdenv-linux/armv5tel/r18744/bootstrap-tools.cpio.bz2"; sha256 = "1rn4n5kilqmv62dfjfcscbsm0w329k3gyb2v9155fsi1sl2cfzcb"; }; } diff --git a/pkgs/stdenv/linux/bootstrap/i686/default.nix b/pkgs/stdenv/linux/bootstrap/i686/default.nix index 1d709766bfd..dc4fee1becc 100644 --- a/pkgs/stdenv/linux/bootstrap/i686/default.nix +++ b/pkgs/stdenv/linux/bootstrap/i686/default.nix @@ -7,7 +7,7 @@ curl = ./curl.bz2; bootstrapTools = { - url = http://nixos.org/tarballs/stdenv-linux/i686/r24519/bootstrap-tools.cpio.bz2; + url = http://tarballs.nixos.org/stdenv-linux/i686/r24519/bootstrap-tools.cpio.bz2; sha256 = "0imypaxy6piwbk8ff2y1nr7yk49pqmdgdbv6g8miq1zs5yfip6ij"; }; } diff --git a/pkgs/stdenv/linux/bootstrap/loongson2f/default.nix b/pkgs/stdenv/linux/bootstrap/loongson2f/default.nix index b0ad8d6545d..b9a294e1332 100644 --- a/pkgs/stdenv/linux/bootstrap/loongson2f/default.nix +++ b/pkgs/stdenv/linux/bootstrap/loongson2f/default.nix @@ -7,7 +7,7 @@ curl = ./curl.bz2; bootstrapTools = { - url = "http://nixos.org/tarballs/stdenv-linux/loongson2f/r22849/cross-bootstrap-tools.cpio.bz2"; + url = "http://tarballs.nixos.org/stdenv-linux/loongson2f/r22849/cross-bootstrap-tools.cpio.bz2"; sha256 = "00aavbk76qjj2gdlmpaaj66r8nzl4d7pyl8cv1gigyzgpbr5vv3j"; }; } diff --git a/pkgs/stdenv/linux/bootstrap/powerpc/default.nix b/pkgs/stdenv/linux/bootstrap/powerpc/default.nix index 61f7f863512..d3569362b6c 100644 --- a/pkgs/stdenv/linux/bootstrap/powerpc/default.nix +++ b/pkgs/stdenv/linux/bootstrap/powerpc/default.nix @@ -6,22 +6,22 @@ tar = ./tar.bz2; staticToolsURL = { - url = http://nixos.org/tarballs/stdenv-linux/powerpc/r9828/static-tools.tar.bz2; + url = http://tarballs.nixos.org/stdenv-linux/powerpc/r9828/static-tools.tar.bz2; sha1 = "e4d1680e3dfa752e49a996a31140db53b10061cb"; }; binutilsURL = { - url = http://nixos.org/tarballs/stdenv-linux/powerpc/r9828/binutils.tar.bz2; + url = http://tarballs.nixos.org/stdenv-linux/powerpc/r9828/binutils.tar.bz2; sha1 = "2609f4d9277a60fcd178395d3d49911190e08f36"; }; gccURL = { - url = http://nixos.org/tarballs/stdenv-linux/powerpc/r9828/gcc.tar.bz2; + url = http://tarballs.nixos.org/stdenv-linux/powerpc/r9828/gcc.tar.bz2; sha1 = "71d79d736bfef6252208fe6239e528a591becbed"; }; glibcURL = { - url = http://nixos.org/tarballs/stdenv-linux/powerpc/r9828/glibc.tar.bz2; + url = http://tarballs.nixos.org/stdenv-linux/powerpc/r9828/glibc.tar.bz2; sha1 = "bf0245e16235800c8aa9c6a5de6565583a66e46d"; }; } diff --git a/pkgs/stdenv/linux/bootstrap/x86_64/default.nix b/pkgs/stdenv/linux/bootstrap/x86_64/default.nix index d9b9b460db2..eb8c1834a3a 100644 --- a/pkgs/stdenv/linux/bootstrap/x86_64/default.nix +++ b/pkgs/stdenv/linux/bootstrap/x86_64/default.nix @@ -4,7 +4,7 @@ { bootstrapTools = { - url = http://nixos.org/tarballs/stdenv-linux/x86_64/r23302/bootstrap-tools.cpio.bz2; + url = http://tarballs.nixos.org/stdenv-linux/x86_64/r23302/bootstrap-tools.cpio.bz2; sha256 = "0w89kqhx47yl0jifp2vffp073pyrqha5f312kp971smi4h41drna"; }; } diff --git a/pkgs/tools/filesystems/aefs/default.nix b/pkgs/tools/filesystems/aefs/default.nix index 7e52190d43a..d081f08ffc7 100644 --- a/pkgs/tools/filesystems/aefs/default.nix +++ b/pkgs/tools/filesystems/aefs/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "aefs-0.4pre259-8843b7c"; src = fetchurl { - url = "http://nixos.org/tarballs/${name}.tar.bz2"; + url = "http://tarballs.nixos.org/${name}.tar.bz2"; sha256 = "167hp58hmgdavg2mqn5dx1xgq24v08n8d6psf33jhbdabzx6a6zq"; }; diff --git a/pkgs/tools/misc/getopt/default.nix b/pkgs/tools/misc/getopt/default.nix index faa4a9e8f7a..41bc2ffc99d 100644 --- a/pkgs/tools/misc/getopt/default.nix +++ b/pkgs/tools/misc/getopt/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "getopt-1.1.4"; builder = ./builder.sh; src = fetchurl { - url = http://nixos.org/tarballs/getopt-1.1.4.tar.gz; + url = http://tarballs.nixos.org/getopt-1.1.4.tar.gz; md5 = "02188ca68da27c4175d6e9f3da732101"; }; } diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index 9de3156f2a7..8542580e431 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -6,7 +6,7 @@ let hpnSrc = fetchurl { - url = http://nixos.org/tarballs/openssh-6.1p1-hpn13v14.diff.gz; + url = http://tarballs.nixos.org/openssh-6.1p1-hpn13v14.diff.gz; sha256 = "14das6lim6fxxnx887ssw76ywsbvx3s4q3n43afgh5rgvs4xmnnq"; }; diff --git a/pkgs/tools/networking/p2p/azureus/default.nix b/pkgs/tools/networking/p2p/azureus/default.nix index 3e613bb9a6b..ffa360f3de4 100644 --- a/pkgs/tools/networking/p2p/azureus/default.nix +++ b/pkgs/tools/networking/p2p/azureus/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "azureus-2.3.0.6"; builder = ./builder.sh; src = fetchurl { - url = http://nixos.org/tarballs/Azureus2.3.0.6.jar; + url = http://tarballs.nixos.org/Azureus2.3.0.6.jar; md5 = "84f85b144cdc574338c2c84d659ca620"; }; # buildInputs = [unzip]; diff --git a/pkgs/tools/security/gnupg1/default.nix b/pkgs/tools/security/gnupg1/default.nix index c779b979d9d..f9b959061da 100644 --- a/pkgs/tools/security/gnupg1/default.nix +++ b/pkgs/tools/security/gnupg1/default.nix @@ -8,7 +8,7 @@ let idea = fetchurl { - url = http://nixos.org/tarballs/idea.c.gz; + url = http://tarballs.nixos.org/idea.c.gz; md5 = "9dc3bc086824a8c7a331f35e09a3e57f"; }; diff --git a/pkgs/tools/system/pciutils/default.nix b/pkgs/tools/system/pciutils/default.nix index 3cab8b0ef10..78ff9131fa8 100644 --- a/pkgs/tools/system/pciutils/default.nix +++ b/pkgs/tools/system/pciutils/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { pciids = fetchurl { # Obtained from http://pciids.sourceforge.net/v2.2/pci.ids.bz2. - url = http://nixos.org/tarballs/pci.ids.20120929.bz2; + url = http://tarballs.nixos.org/pci.ids.20120929.bz2; sha256 = "1q3i479ay88wam1zz1vbgkbqb2axg8av9qjxaigrqbnw2pv0srmb"; }; diff --git a/pkgs/tools/text/xml/xpf/default.nix b/pkgs/tools/text/xml/xpf/default.nix index fa8e8078362..3ff89294ab1 100644 --- a/pkgs/tools/text/xml/xpf/default.nix +++ b/pkgs/tools/text/xml/xpf/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { name = "xpf-0.2"; src = fetchurl { - url = http://nixos.org/tarballs/xpf-0.2.tar.gz; + url = http://tarballs.nixos.org/xpf-0.2.tar.gz; md5 = "d92658828139e1495e052d0cfe25d312"; }; diff --git a/pkgs/tools/typesetting/bibtex-tools/default.nix b/pkgs/tools/typesetting/bibtex-tools/default.nix index 304f50f2906..c2c9a942845 100644 --- a/pkgs/tools/typesetting/bibtex-tools/default.nix +++ b/pkgs/tools/typesetting/bibtex-tools/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "bibtex-tools-0.2pre13026"; src = fetchurl { - url = http://nixos.org/tarballs/bibtex-tools-0.2pre13026.tar.gz; + url = http://tarballs.nixos.org/bibtex-tools-0.2pre13026.tar.gz; md5 = "2d8a5de7c53eb670307048eb3d14cdd6"; }; configureFlags = " diff --git a/pkgs/tools/virtualization/ec2-ami-tools/default.nix b/pkgs/tools/virtualization/ec2-ami-tools/default.nix index 1905166c38e..e9b62886fce 100644 --- a/pkgs/tools/virtualization/ec2-ami-tools/default.nix +++ b/pkgs/tools/virtualization/ec2-ami-tools/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { buildInputs = [ unzip makeWrapper ]; src = fetchurl { - url = "http://nixos.org/tarballs/${name}.zip"; + url = "http://tarballs.nixos.org/${name}.zip"; sha256 = "0icpjr2ipch3f6cf4rg9x5z2y9k6a4rd85npsmw3a1ambs3dwxlq"; }; diff --git a/pkgs/tools/virtualization/ec2-api-tools/default.nix b/pkgs/tools/virtualization/ec2-api-tools/default.nix index ac2902aab94..a80ad91c4c3 100644 --- a/pkgs/tools/virtualization/ec2-api-tools/default.nix +++ b/pkgs/tools/virtualization/ec2-api-tools/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "ec2-api-tools-1.6.5.1"; src = fetchurl { - url = "http://nixos.org/tarballs/${name}.zip"; + url = "http://tarballs.nixos.org/${name}.zip"; sha256 = "1j2pc20vggi4hv950999mhh7dl6475yma76nyj6k0hzkd1lf5hda"; }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 5c4574fddd8..c4fc6a1767a 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -152,7 +152,7 @@ rec { ArchiveZip = buildPerlPackage { name = "Archive-Zip-1.16"; src = fetchurl { - url = http://nixos.org/tarballs/Archive-Zip-1.16.tar.gz; + url = http://tarballs.nixos.org/Archive-Zip-1.16.tar.gz; md5 = "e28dff400d07b1659d659d8dde7071f1"; }; }; From e382e34f51fcbbbd31eb8203cf2bb43b78bb3025 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Tue, 25 Jun 2013 19:47:01 +0200 Subject: [PATCH 051/798] qemu: Enable support for VDE networking --- pkgs/applications/virtualization/qemu/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 997cc8bd49d..434ec180203 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, python, zlib, pkgconfig, glib, SDL, ncurses, perl, pixman -, attr, libcap }: +, attr, libcap, vde2 }: stdenv.mkDerivation rec { name = "qemu-1.4.0"; @@ -11,12 +11,14 @@ stdenv.mkDerivation rec { buildInputs = [ python zlib pkgconfig glib SDL ncurses perl pixman attr libcap + vde2 ]; enableParallelBuilding = true; configureFlags = [ "--enable-virtfs" + "--enable-vde" ]; meta = { From b7ccfc258abce98f999035dac83b821360016ac4 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Tue, 25 Jun 2013 13:42:35 +0200 Subject: [PATCH 052/798] Linux 3.2-3.9: Add CONFIG_RC_DEVICES=y, to enable IR devices that can be used by lirc/devinput --- pkgs/os-specific/linux/kernel/linux-3.2.nix | 1 + pkgs/os-specific/linux/kernel/linux-3.4.nix | 1 + pkgs/os-specific/linux/kernel/linux-3.7.nix | 1 + pkgs/os-specific/linux/kernel/linux-3.8.nix | 1 + pkgs/os-specific/linux/kernel/linux-3.9.nix | 1 + 5 files changed, 5 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/linux-3.2.nix b/pkgs/os-specific/linux/kernel/linux-3.2.nix index c07448b43b5..318b417f444 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.2.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.2.nix @@ -197,6 +197,7 @@ let NET_FC y # Fibre Channel driver support PPP_MULTILINK y # PPP multilink support REGULATOR y # Voltage and Current Regulator Support + RC_DEVICES y # Enable IR devices SCSI_LOGGING y # SCSI logging facility SERIAL_8250 y # 8250/16550 and compatible serial support SLIP_COMPRESSED y # CSLIP compressed headers diff --git a/pkgs/os-specific/linux/kernel/linux-3.4.nix b/pkgs/os-specific/linux/kernel/linux-3.4.nix index cd7e9f2b375..440f39227ed 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix @@ -199,6 +199,7 @@ let NET_FC y # Fibre Channel driver support PPP_MULTILINK y # PPP multilink support REGULATOR y # Voltage and Current Regulator Support + RC_DEVICES y # Enable IR devices SCSI_LOGGING y # SCSI logging facility SERIAL_8250 y # 8250/16550 and compatible serial support SLIP_COMPRESSED y # CSLIP compressed headers diff --git a/pkgs/os-specific/linux/kernel/linux-3.7.nix b/pkgs/os-specific/linux/kernel/linux-3.7.nix index 8f77334901d..2b31ec282ca 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.7.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.7.nix @@ -200,6 +200,7 @@ let NET_FC y # Fibre Channel driver support PPP_MULTILINK y # PPP multilink support REGULATOR y # Voltage and Current Regulator Support + RC_DEVICES y # Enable IR devices SCSI_LOGGING y # SCSI logging facility SERIAL_8250 y # 8250/16550 and compatible serial support SLIP_COMPRESSED y # CSLIP compressed headers diff --git a/pkgs/os-specific/linux/kernel/linux-3.8.nix b/pkgs/os-specific/linux/kernel/linux-3.8.nix index 6681438edd5..1516f97521d 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.8.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.8.nix @@ -200,6 +200,7 @@ let NET_FC y # Fibre Channel driver support PPP_MULTILINK y # PPP multilink support REGULATOR y # Voltage and Current Regulator Support + RC_DEVICES y # Enable IR devices SCSI_LOGGING y # SCSI logging facility SERIAL_8250 y # 8250/16550 and compatible serial support SLIP_COMPRESSED y # CSLIP compressed headers diff --git a/pkgs/os-specific/linux/kernel/linux-3.9.nix b/pkgs/os-specific/linux/kernel/linux-3.9.nix index 4a2a0c1d163..b63dfd5d827 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.9.nix @@ -200,6 +200,7 @@ let NET_FC y # Fibre Channel driver support PPP_MULTILINK y # PPP multilink support REGULATOR y # Voltage and Current Regulator Support + RC_DEVICES y # Enable IR devices SCSI_LOGGING y # SCSI logging facility SERIAL_8250 y # 8250/16550 and compatible serial support SLIP_COMPRESSED y # CSLIP compressed headers From 1802152e93717c66e67e93934412de03eff6773d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 25 Jun 2013 17:59:23 +0200 Subject: [PATCH 053/798] Remove Firefox 20.0 --- .../networking/browsers/firefox/20.0.nix | 175 ------------------ pkgs/top-level/all-packages.nix | 7 - 2 files changed, 182 deletions(-) delete mode 100644 pkgs/applications/networking/browsers/firefox/20.0.nix diff --git a/pkgs/applications/networking/browsers/firefox/20.0.nix b/pkgs/applications/networking/browsers/firefox/20.0.nix deleted file mode 100644 index 39cf69dcfb0..00000000000 --- a/pkgs/applications/networking/browsers/firefox/20.0.nix +++ /dev/null @@ -1,175 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL -, libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs -, freetype, fontconfig, file, alsaLib, nspr, nss, libnotify -, yasm, mesa, sqlite, unzip, makeWrapper, pysqlite - -, # If you want the resulting program to call itself "Firefox" instead - # of "Shiretoko" or whatever, enable this option. However, those - # binaries may not be distributed without permission from the - # Mozilla Foundation, see - # http://www.mozilla.org/foundation/trademarks/. - enableOfficialBranding ? false -}: - -assert stdenv.gcc ? libc && stdenv.gcc.libc != null; - -rec { - - firefoxVersion = "20.0"; - - xulVersion = "20.0"; # this attribute is used by other packages - - - src = fetchurl { - urls = [ - # It is better to use this url for official releases, to take load off Mozilla's ftp server. - "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2" - # Fall back to this url for versions not available at releases.mozilla.org. - "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2" - ]; - sha1 = "6d776c29da0be0d2a50abeb504d63b06b7861218"; - }; - - commonConfigureFlags = - [ "--enable-optimize" - #"--enable-profiling" - "--disable-debug" - "--enable-strip" - "--with-system-jpeg" # now we use recent libjpeg-turbo - "--with-system-zlib" - "--with-system-bz2" - "--with-system-nspr" - "--with-system-nss" - # "--with-system-png" # <-- "--with-system-png won't work because the system's libpng doesn't have APNG support" - # "--enable-system-cairo" # <-- doesn't build - "--enable-system-sqlite" - "--disable-crashreporter" - "--disable-tests" - "--disable-necko-wifi" # maybe we want to enable this at some point - "--disable-installer" - "--disable-updater" - ]; - - - xulrunner = stdenv.mkDerivation rec { - name = "xulrunner-${xulVersion}"; - - inherit src; - - buildInputs = - [ pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2 - python dbus dbus_glib pango freetype fontconfig xlibs.libXi - xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file - alsaLib nspr nss libnotify xlibs.pixman yasm mesa - xlibs.libXScrnSaver xlibs.scrnsaverproto pysqlite - xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper - ]; - - configureFlags = - [ "--enable-application=xulrunner" - "--disable-javaxpcom" - ] ++ commonConfigureFlags; - - enableParallelBuilding = true; - - preConfigure = - '' - export NIX_LDFLAGS="$NIX_LDFLAGS -L$out/lib/xulrunner-${xulVersion}" - - mkdir ../objdir - cd ../objdir - configureScript=../mozilla-release/configure - ''; # */ - - #installFlags = "SKIP_GRE_REGISTRATION=1"; - - postInstall = '' - # Fix run-mozilla.sh search - libDir=$(cd $out/lib && ls -d xulrunner-[0-9]*) - echo libDir: $libDir - test -n "$libDir" - cd $out/bin - rm xulrunner - - for i in $out/lib/$libDir/*; do - file $i; - if file $i | grep executable &>/dev/null; then - echo -e '#! /bin/sh\nexec "'"$i"'" "$@"' > "$out/bin/$(basename "$i")"; - chmod a+x "$out/bin/$(basename "$i")"; - fi; - done - for i in $out/lib/$libDir/*.so; do - patchelf --set-rpath "$(patchelf --print-rpath "$i"):$out/lib/$libDir" $i || true - done - for i in $out/lib/$libDir/{plugin-container,xulrunner,xulrunner-stub}; do - wrapProgram $i --prefix LD_LIBRARY_PATH ':' "$out/lib/$libDir" - done - rm -f $out/bin/run-mozilla.sh - ''; # */ - - meta = { - description = "Mozilla Firefox XUL runner"; - homepage = http://www.mozilla.com/en-US/firefox/; - }; - - passthru = { inherit gtk; version = xulVersion; }; - }; - - - firefox = stdenv.mkDerivation rec { - name = "firefox-${firefoxVersion}"; - - inherit src; - - enableParallelBuilding = true; - - buildInputs = - [ pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2 python - dbus dbus_glib pango freetype fontconfig alsaLib nspr nss libnotify - xlibs.pixman yasm mesa sqlite file unzip pysqlite - ]; - - propagatedBuildInputs = [xulrunner]; - - configureFlags = - [ "--enable-application=browser" - "--with-libxul-sdk=${xulrunner}/lib/xulrunner-devel-${xulrunner.version}" - "--enable-chrome-format=jar" - ] - ++ commonConfigureFlags - ++ stdenv.lib.optional enableOfficialBranding "--enable-official-branding"; - - makeFlags = [ - "SYSTEM_LIBXUL=1" - ]; - - # Hack to work around make's idea of -lbz2 dependency - preConfigure = - '' - find . -name Makefile.in -execdir sed -i '{}' -e '1ivpath %.so ${ - stdenv.lib.concatStringsSep ":" - (map (s : s + "/lib") (buildInputs ++ [stdenv.gcc.libc])) - }' ';' - ''; - - postInstall = - '' - ln -s ${xulrunner}/lib/xulrunner-${xulrunner.version} $(echo $out/lib/firefox-*)/xulrunner - cd "$out/lib/"firefox-* - rm firefox - echo -e '#!${stdenv.shell}\nexec ${xulrunner}/bin/xulrunner "'"$PWD"'/application.ini" "$@"' > firefox - chmod a+x firefox - ''; # */ - - meta = { - description = "Mozilla Firefox - the browser, reloaded"; - homepage = http://www.mozilla.com/en-US/firefox/; - maintainers = [ stdenv.lib.maintainers.eelco ]; - }; - - passthru = { - inherit gtk xulrunner nspr; - isFirefox3Like = true; - }; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 782e83d1948..6c5e3c6025e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7379,13 +7379,6 @@ let firefox13Wrapper = lowPrio (wrapFirefox { browser = firefox13Pkgs.firefox; }); - firefox20Pkgs = callPackage ../applications/networking/browsers/firefox/20.0.nix { - inherit (gnome) libIDL; - inherit (pythonPackages) pysqlite; - }; - - firefox20Wrapper = lowPrio (wrapFirefox { browser = firefox20Pkgs.firefox; }); - firefox21Pkgs = callPackage ../applications/networking/browsers/firefox/21.0.nix { inherit (gnome) libIDL; inherit (pythonPackages) pysqlite; From 9da4ccaf3d3a1d5c686678a2bf3f1d0bb41faa17 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 25 Jun 2013 18:02:41 +0200 Subject: [PATCH 054/798] firefox: Rename 21.0.nix to default.nix --- .../networking/browsers/firefox/{21.0.nix => default.nix} | 0 pkgs/top-level/all-packages.nix | 8 ++------ 2 files changed, 2 insertions(+), 6 deletions(-) rename pkgs/applications/networking/browsers/firefox/{21.0.nix => default.nix} (100%) diff --git a/pkgs/applications/networking/browsers/firefox/21.0.nix b/pkgs/applications/networking/browsers/firefox/default.nix similarity index 100% rename from pkgs/applications/networking/browsers/firefox/21.0.nix rename to pkgs/applications/networking/browsers/firefox/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6c5e3c6025e..058833a13a8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7363,10 +7363,6 @@ let firefox = pkgs.firefoxPkgs.firefox; - firefoxWrapper = wrapFirefox { browser = pkgs.firefox; }; - - firefoxPkgs = pkgs.firefox21Pkgs; - firefox36Pkgs = callPackage ../applications/networking/browsers/firefox/3.6.nix { inherit (gnome) libIDL; }; @@ -7379,12 +7375,12 @@ let firefox13Wrapper = lowPrio (wrapFirefox { browser = firefox13Pkgs.firefox; }); - firefox21Pkgs = callPackage ../applications/networking/browsers/firefox/21.0.nix { + firefoxPkgs = callPackage ../applications/networking/browsers/firefox { inherit (gnome) libIDL; inherit (pythonPackages) pysqlite; }; - firefox21Wrapper = lowPrio (wrapFirefox { browser = firefox21Pkgs.firefox; }); + firefoxWrapper = lowPrio (wrapFirefox { browser = firefoxPkgs.firefox; }); flac = callPackage ../applications/audio/flac { }; From 94d9f18e4765f53bf0f29e0ad0ca30470269b81a Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 25 Jun 2013 20:58:12 +0200 Subject: [PATCH 055/798] firefox: Update to 22.0 --- pkgs/applications/networking/browsers/firefox/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index 35ba2cad124..5a50bab0945 100644 --- a/pkgs/applications/networking/browsers/firefox/default.nix +++ b/pkgs/applications/networking/browsers/firefox/default.nix @@ -19,9 +19,9 @@ assert useSystemCairo -> cairo != null; let optional = stdenv.lib.optional; in rec { - firefoxVersion = "21.0"; + firefoxVersion = "22.0"; - xulVersion = "21.0"; # this attribute is used by other packages + xulVersion = "22.0"; # this attribute is used by other packages src = fetchurl { @@ -31,7 +31,7 @@ in rec { # Fall back to this url for versions not available at releases.mozilla.org. "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2" ]; - sha1 = "e63b5488eaec1956947f59609d5839332ba7ffe1"; + sha1 = "db2d5b028b6ea95b5f006b46e153f50f7a52bf80"; }; commonConfigureFlags = From 489040bf58f5f10b7ad347bf9d1c0389b52419a5 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Tue, 25 Jun 2013 22:17:00 +0200 Subject: [PATCH 056/798] Linux 3.2: Doesn't support CONFIG_RC_DEVICES option --- pkgs/os-specific/linux/kernel/linux-3.2.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.2.nix b/pkgs/os-specific/linux/kernel/linux-3.2.nix index 318b417f444..c07448b43b5 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.2.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.2.nix @@ -197,7 +197,6 @@ let NET_FC y # Fibre Channel driver support PPP_MULTILINK y # PPP multilink support REGULATOR y # Voltage and Current Regulator Support - RC_DEVICES y # Enable IR devices SCSI_LOGGING y # SCSI logging facility SERIAL_8250 y # 8250/16550 and compatible serial support SLIP_COMPRESSED y # CSLIP compressed headers From 978fa9893346bd04f0bf0e264a9c2db5831a6ca9 Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Tue, 25 Jun 2013 22:19:31 +0200 Subject: [PATCH 057/798] avrdude: Add libusb to enable USB support --- pkgs/development/tools/misc/avrdude/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/avrdude/default.nix b/pkgs/development/tools/misc/avrdude/default.nix index 7a294e72078..adbaf5e3e8b 100644 --- a/pkgs/development/tools/misc/avrdude/default.nix +++ b/pkgs/development/tools/misc/avrdude/default.nix @@ -1,4 +1,4 @@ -{ composableDerivation, fetchurl, yacc, flex, texLive }: +{ composableDerivation, fetchurl, yacc, flex, texLive, libusb }: let edf = composableDerivation.edf; in @@ -12,7 +12,7 @@ composableDerivation.composableDerivation {} rec { configureFlags = [ "--disable-dependency-tracking" ]; - buildInputs = [ yacc flex ]; + buildInputs = [ yacc flex libusb ]; flags = edf { name = "doc"; enable = { buildInputs = texLive; configureFlags = ["--enable-doc"]; }; } From 896da1bf8a31ba72ef8be91421afca66af8548f4 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 26 Jun 2013 11:24:10 +0200 Subject: [PATCH 058/798] Fix reference to firefox21 --- pkgs/top-level/release.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index ffe054ee674..8a711d56405 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -359,7 +359,7 @@ let }; firefox36Pkgs.firefox = linux; - firefox21Pkgs.firefox = linux; + firefoxPkgs.firefox = linux; gnome = { gnome_panel = linux; From 1e7e9c583d2aaecbe0e6e0c6eb4ed20755e07190 Mon Sep 17 00:00:00 2001 From: Song Wenwu Date: Wed, 26 Jun 2013 19:25:09 +0800 Subject: [PATCH 059/798] add retroarch 0.9.9 --- pkgs/misc/emulators/retroarch/default.nix | 27 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/misc/emulators/retroarch/default.nix diff --git a/pkgs/misc/emulators/retroarch/default.nix b/pkgs/misc/emulators/retroarch/default.nix new file mode 100644 index 00000000000..a98e6db2db4 --- /dev/null +++ b/pkgs/misc/emulators/retroarch/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, pkgconfig, which +, SDL, mesa, alsaLib +}: + +stdenv.mkDerivation rec { + name = "retroarch-0.9.9"; + + src = fetchurl { + url = "http://themaister.net/retroarch-dl/${name}.tar.gz"; + sha256 = "08xlndpl14c4ccgp752ixx3a7ajf3xp93nawhinwxq0cw801prda"; + }; + + buildInputs = [ + pkgconfig which SDL mesa alsaLib + ]; + + preConfigure = '' + configureFlags="--global-config-dir=$out/etc" + ''; + + meta = { + description = "A cross-platform multi-system emulator"; + homepage = "http://themaister.net/retroarch.html"; + license = stdenv.lib.licenses.gpl3Plus; + platform = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 058833a13a8..bf19d3e01c1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9474,6 +9474,8 @@ let putty = callPackage ../applications/networking/remote/putty { }; + retroarch = callPackage ../misc/emulators/retroarch { }; + rssglx = callPackage ../misc/screensavers/rss-glx { }; xlockmore = callPackage ../misc/screensavers/xlockmore { }; From 0db328dde0cd62491d104f4846cd86f2d37be62a Mon Sep 17 00:00:00 2001 From: David Guibert Date: Tue, 18 Jun 2013 17:20:28 +0200 Subject: [PATCH 060/798] String::ToIdentifier::EN: Update to 0.10 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c4fc6a1767a..2139341f3b5 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5775,10 +5775,10 @@ rec { }; StringToIdentifierEN = buildPerlPackage rec { - name = "String-ToIdentifier-EN-0.06"; + name = "String-ToIdentifier-EN-0.10"; src = fetchurl { url = "mirror://cpan/modules/by-module/String/${name}.tar.gz"; - sha256 = "1rmldr7jf4jvkhzlv8hgp48lrmybvinmhv8kcnrpa8las0ijm4vm"; + sha256 = "1xm0v1cq9hdgx4mswa9wdr2lqk7z9kh1bwjkx4wb5xljd0lxhas6"; }; propagatedBuildInputs = [ LinguaENInflectPhrase TextUnidecode namespaceclean ]; From 3d8cd48c58903110e85f3ee41bf7bc961fc1b676 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 26 Jun 2013 23:46:47 +0200 Subject: [PATCH 061/798] Making ccrtp propagate its build time requirement, ucommon. --- pkgs/development/libraries/ccrtp/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/ccrtp/default.nix b/pkgs/development/libraries/ccrtp/default.nix index a6e426b164a..c5ae776fe3e 100644 --- a/pkgs/development/libraries/ccrtp/default.nix +++ b/pkgs/development/libraries/ccrtp/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation { sha256 = "1p4zzqn02zvnyjy84khiq8v65pl422fb6ni946h9sxh4yw2lgn01"; }; - buildInputs = [ openssl pkgconfig libgcrypt ucommon ]; + buildInputs = [ openssl pkgconfig libgcrypt ]; + propagatedBuildInputs = [ ucommon ]; doCheck = true; From c77f6a0c2fb99235d8eca2b8b09c54b655999d2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 26 Jun 2013 23:47:09 +0200 Subject: [PATCH 062/798] As libccrtp propagates ucommon, it's not needed in libzrtpcpp. --- pkgs/development/libraries/libzrtpcpp/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libzrtpcpp/default.nix b/pkgs/development/libraries/libzrtpcpp/default.nix index 9e569eea580..02741bc6fa1 100644 --- a/pkgs/development/libraries/libzrtpcpp/default.nix +++ b/pkgs/development/libraries/libzrtpcpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, ucommon, openssl, pkgconfig, ccrtp }: +{ stdenv, fetchurl, cmake, openssl, pkgconfig, ccrtp }: stdenv.mkDerivation rec { name = "libzrtpcpp-2.0.0"; @@ -8,7 +8,12 @@ stdenv.mkDerivation rec { sha256 = "05yw8n5xpj0jxkvzgsvn3xkxirpypc1japy9k1jqs9301fgb1a3i"; }; - buildInputs = [ cmake ucommon openssl pkgconfig ccrtp ]; + # We disallow 'lib64', or pkgconfig will not find it. + prePatch = '' + sed -i s/lib64/lib/ CMakeLists.txt + ''; + + buildInputs = [ cmake openssl pkgconfig ccrtp ]; meta = { description = "GNU RTP stack for the zrtp protocol developed by Phil Zimmermann"; From d3e7649eeec968b7979ea4c1f6f16c8d7d292155 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 26 Jun 2013 23:47:34 +0200 Subject: [PATCH 063/798] Update ucommon to 6.0.5. The hope that newer means better. --- pkgs/development/libraries/ucommon/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/ucommon/default.nix b/pkgs/development/libraries/ucommon/default.nix index cfcb47dd54f..ca0427481da 100644 --- a/pkgs/development/libraries/ucommon/default.nix +++ b/pkgs/development/libraries/ucommon/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, gnutls, pkgconfig, zlib, libgcrypt }: stdenv.mkDerivation rec { - name = "ucommon-5.2.2"; + name = "ucommon-6.0.5"; src = fetchurl { - url = mirror://gnu/commoncpp/ucommon-5.2.2.tar.gz; - sha256 = "1s9r7yhvqnj57aiw7sklp2p6llfzn1jxvc3hwhpli5zq3r6kypwx"; + url = mirror://gnu/commoncpp/ucommon-6.0.5.tar.gz; + sha256 = "0w5nl2a2l630n4kvfaz22by1s92ybd87g0q1zpcmsl8i5d00789l"; }; buildInputs = [ pkgconfig gnutls zlib ]; From 53f38dcbd041b95c09dabae536fb3ff73d3bb61d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 26 Jun 2013 23:48:55 +0200 Subject: [PATCH 064/798] Adding partially sflphone (only daemon, maybe failing to build) --- .../instant-messengers/sflphone/default.nix | 32 +++++++++++++++++++ .../sflphone/libzrtpcpp-cflags.patch | 15 +++++++++ pkgs/top-level/all-packages.nix | 3 +- 3 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/networking/instant-messengers/sflphone/default.nix create mode 100644 pkgs/applications/networking/instant-messengers/sflphone/libzrtpcpp-cflags.patch diff --git a/pkgs/applications/networking/instant-messengers/sflphone/default.nix b/pkgs/applications/networking/instant-messengers/sflphone/default.nix new file mode 100644 index 00000000000..4dbfa3da979 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/sflphone/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, libyaml, alsaLib, openssl, libuuid, pkgconfig, pulseaudio, libsamplerate, +commoncpp2, ccrtp, libzrtpcpp, dbus, dbus_cplusplus, expat, pcre, gsm, speex, ilbc, libopus, +autoconf, automake, libtool, gettext, perl }: + +stdenv.mkDerivation rec { + name = "sflphone-1.2.3"; + + src = fetchurl { + url = "https://projects.savoirfairelinux.com/attachments/download/6423/${name}.tar.gz"; + sha256 = "0aiwlky7mp5l51a7kkhkmaz7ivapypar291kdxzdxl1s3qy0x6fd"; + }; + + patches = [ ./libzrtpcpp-cflags.patch ]; + + preConfigure = '' + cd daemon + + # Post patch, required + autoreconf -vfi + + cd libs + bash ./compile_pjsip.sh + cd .. + ''; + + configureFlags = "--with-expat --with-expat-inc=${expat}/include " + + "--with-expat-lib=-lexpat --with-opus "; + + buildInputs = [ libyaml alsaLib openssl libuuid pkgconfig pulseaudio libsamplerate + commoncpp2 ccrtp libzrtpcpp dbus dbus_cplusplus expat pcre gsm speex ilbc libopus + autoconf automake libtool gettext perl ]; +} diff --git a/pkgs/applications/networking/instant-messengers/sflphone/libzrtpcpp-cflags.patch b/pkgs/applications/networking/instant-messengers/sflphone/libzrtpcpp-cflags.patch new file mode 100644 index 00000000000..972d9c58808 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/sflphone/libzrtpcpp-cflags.patch @@ -0,0 +1,15 @@ +diff --git a/daemon/src/audio/audiortp/Makefile.am b/daemon/src/audio/audiortp/Makefile.am +index c27eedd..fe64077 100644 +--- a/daemon/src/audio/audiortp/Makefile.am ++++ b/daemon/src/audio/audiortp/Makefile.am +@@ -4,6 +4,10 @@ noinst_LTLIBRARIES = libaudiortp.la + + if BUILD_ZRTP + SFL_ZRTP_SRC=audio_zrtp_session.h audio_zrtp_session.cpp zrtp_session_callback.cpp zrtp_session_callback.h ++libaudiortp_la_CXXFLAGS = \ ++ @CCGNU2_CFLAGS@ \ ++ @ZRTPCPP_CFLAGS@ \ ++ @CCRTP_CFLAGS@ + endif + + libaudiortp_la_SOURCES = \ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6316f0a7557..7ac7ff889ff 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8107,6 +8107,8 @@ let seq24 = callPackage ../applications/audio/seq24 { }; + sflphone = callPackage ../applications/networking/instant-messengers/sflphone { }; + siproxd = callPackage ../applications/networking/siproxd { }; skype = callPackage_i686 ../applications/networking/instant-messengers/skype { @@ -8115,7 +8117,6 @@ let skype4pidgin = callPackage ../applications/networking/instant-messengers/pidgin-plugins/skype4pidgin { }; - skype_call_recorder = callPackage ../applications/networking/instant-messengers/skype-call-recorder { }; st = callPackage ../applications/misc/st { From 538a1d3aa14358446e66dfe41ccd82fa8f032e9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 27 Jun 2013 00:09:26 +0200 Subject: [PATCH 065/798] Making sflphone build, and its gnome client too. --- .../instant-messengers/sflphone/default.nix | 83 +++++++++++++++---- pkgs/top-level/all-packages.nix | 4 +- 2 files changed, 68 insertions(+), 19 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/sflphone/default.nix b/pkgs/applications/networking/instant-messengers/sflphone/default.nix index 4dbfa3da979..79b554798ee 100644 --- a/pkgs/applications/networking/instant-messengers/sflphone/default.nix +++ b/pkgs/applications/networking/instant-messengers/sflphone/default.nix @@ -1,8 +1,10 @@ -{ stdenv, fetchurl, libyaml, alsaLib, openssl, libuuid, pkgconfig, pulseaudio, libsamplerate, -commoncpp2, ccrtp, libzrtpcpp, dbus, dbus_cplusplus, expat, pcre, gsm, speex, ilbc, libopus, -autoconf, automake, libtool, gettext, perl }: +{ stdenv, fetchurl, libyaml, alsaLib, openssl, libuuid, pkgconfig, pulseaudio, libsamplerate +, commoncpp2, ccrtp, libzrtpcpp, dbus, dbus_cplusplus, expat, pcre, gsm, speex, ilbc, libopus +, autoconf, automake, libtool, gettext, perl +, cmake, qt4 +, gtk, glib, dbus_glib, libnotify, intltool }: -stdenv.mkDerivation rec { +let name = "sflphone-1.2.3"; src = fetchurl { @@ -10,23 +12,68 @@ stdenv.mkDerivation rec { sha256 = "0aiwlky7mp5l51a7kkhkmaz7ivapypar291kdxzdxl1s3qy0x6fd"; }; - patches = [ ./libzrtpcpp-cflags.patch ]; + meta = { + homepage = http://sflphone.org/; + license = "GPLv3+"; + description = "Free software enterprise-class softphone for GNU/Linux"; + platforms = with stdenv.lib.platforms; linux; + maintainers = with stdenv.lib.maintainers; [viric]; + }; - preConfigure = '' - cd daemon +in +rec { + daemon = stdenv.mkDerivation { + name = name + "-daemon"; - # Post patch, required - autoreconf -vfi + inherit src; - cd libs - bash ./compile_pjsip.sh - cd .. - ''; + patches = [ ./libzrtpcpp-cflags.patch ]; - configureFlags = "--with-expat --with-expat-inc=${expat}/include " + - "--with-expat-lib=-lexpat --with-opus "; + preConfigure = '' + cd daemon - buildInputs = [ libyaml alsaLib openssl libuuid pkgconfig pulseaudio libsamplerate - commoncpp2 ccrtp libzrtpcpp dbus dbus_cplusplus expat pcre gsm speex ilbc libopus - autoconf automake libtool gettext perl ]; + # Post patch, required + autoreconf -vfi + + cd libs + bash ./compile_pjsip.sh + cd .. + ''; + + configureFlags = "--with-expat --with-expat-inc=${expat}/include " + + "--with-expat-lib=-lexpat --with-opus "; + + buildInputs = [ libyaml alsaLib openssl libuuid pkgconfig pulseaudio libsamplerate + commoncpp2 ccrtp libzrtpcpp dbus dbus_cplusplus expat pcre gsm speex ilbc libopus + autoconf automake libtool gettext perl ]; + }; + + # This fails still. + # I don't know the best way to make this a KDE program (with switchable kde + # libs, like digikam for example) + /* + kde = stdenv.mkDerivation { + name = name + "-kde"; + + inherit src; + + preConfigure = '' + cd kde + ''; + + buildInputs = [ daemon cmake qt4 pkgconfig ]; + }; + */ + + gnome = stdenv.mkDerivation { + name = name + "-gnome"; + + inherit src; + + preConfigure = '' + cd gnome + ''; + + buildInputs = [ daemon pkgconfig gtk glib dbus_glib libnotify intltool ]; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7ac7ff889ff..45ed59df888 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8107,7 +8107,9 @@ let seq24 = callPackage ../applications/audio/seq24 { }; - sflphone = callPackage ../applications/networking/instant-messengers/sflphone { }; + sflphone = callPackage ../applications/networking/instant-messengers/sflphone { + gtk = gtk3; + }; siproxd = callPackage ../applications/networking/siproxd { }; From 81a0a3d458b226dabf7b2849f3ee00d4a9a688e5 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Thu, 27 Jun 2013 00:35:47 +0200 Subject: [PATCH 066/798] python-six: Update to 1.3.0 --- 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 f0e74a0277f..9e15a2f2952 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4546,11 +4546,11 @@ pythonPackages = python.modules // rec { six = buildPythonPackage rec { - name = "six-1.1.0"; + name = "six-1.3.0"; src = fetchurl { url = "http://pypi.python.org/packages/source/s/six/${name}.tar.gz"; - md5 = "9e8099b57cd27493a6988e9c9b313e23"; + md5 = "ec47fe6070a8a64c802363d2c2b1e2ee"; }; # error: invalid command 'test' From 84a4d03b51037be41b33e9db4b4f4955c1b9c47e Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Thu, 27 Jun 2013 00:36:28 +0200 Subject: [PATCH 067/798] python-mrbob: fix it and update to 0.1a9 --- pkgs/top-level/python-packages.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9e15a2f2952..45afdf766ef 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2541,16 +2541,17 @@ pythonPackages = python.modules // rec { mrbob = buildPythonPackage rec { name = "mrbob-${version}"; - version = "0.1a6"; + version = "0.1a9"; src = fetchurl { url = "http://pypi.python.org/packages/source/m/mr.bob/mr.bob-${version}.zip"; - md5 = "361c8ac7a31953ab94a95cf34d9a0b2b"; + md5 = "2d27d9bd1fc6269a3ecfd1a1ae47cd8a"; }; - buildInputs = [ pkgs.unzip six ] ++ (optionals isPy26 [ importlib ordereddict ]); + buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ argparse jinja2 ]; + propagatedBuildInputs = [ argparse jinja2 six python.modules.readline ] ++ + (optionals isPy26 [ importlib ordereddict ]); meta = { homepage = https://github.com/iElectric/mr.bob.git; From 72afda56d5913672ff2189a4e04c50a0f9201546 Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Thu, 27 Jun 2013 11:21:11 +1000 Subject: [PATCH 068/798] vim-xdebug: add expression --- pkgs/misc/vim-plugins/default.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index da06eaec35c..68e968d571e 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -166,5 +166,19 @@ in cp -R syntax "$out/vim-plugins" ''; }; + + xdebug = stdenv.mkDerivation { + name = "vim-xdebug-a4980fa65f7f159780593ee37c178281691ba2c4"; + + src = fetchurl { + url = "https://github.com/joonty/vim-xdebug/archive/a4980fa65f7f159780593ee37c178281691ba2c4.tar.gz"; + sha256 = "1348gzp0zhc2wifvs5vmf92m9y8ik8ldnvy7bawsxahy8hmhiksk"; + }; + + installPhase = '' + mkdir -p "$out/vim-plugins" + cp -R plugin "$out/vim-plugins" + ''; + }; } From 25cffccc288453ce4ffc18c2da0fb065d62ad463 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Thu, 27 Jun 2013 09:50:52 +0300 Subject: [PATCH 069/798] Fix binutils_deterministic to not break evaluation in certain cases. Quite a sneaky bug! --- pkgs/top-level/all-packages.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 78d8561c2b5..578734e9b9e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3244,7 +3244,10 @@ let inherit noSysDirs; }; - binutils_deterministic = binutils.override { deterministic = true; }; + binutils_deterministic = lowPrio (callPackage ../development/tools/misc/binutils { + inherit noSysDirs; + deterministic = true; + }); binutils_gold = lowPrio (callPackage ../development/tools/misc/binutils { inherit noSysDirs; From 6afd6588d3ac34e8d292b4f58b85c2791a6af200 Mon Sep 17 00:00:00 2001 From: Sergey Mironov Date: Thu, 27 Jun 2013 14:00:58 +0400 Subject: [PATCH 070/798] wicd: fix copying dhclient's config to it's initial location --- pkgs/tools/networking/wicd/dhclient.patch | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/wicd/dhclient.patch b/pkgs/tools/networking/wicd/dhclient.patch index 52d91846518..fbda1caacb7 100644 --- a/pkgs/tools/networking/wicd/dhclient.patch +++ b/pkgs/tools/networking/wicd/dhclient.patch @@ -1,4 +1,23 @@ -diff -ruN wicd-1.7.2.4.orig/wicd/wnettools.py wicd-1.7.2.4/wicd/wnettools.py +diff -ruN wicd-1.7.2.4.orig/wicd/wicd-daemon.py wicd-1.7.2.4/wicd/wicd-daemon.py +--- wicd-1.7.2.4.orig/wicd/wicd-daemon.py 2013-06-22 18:55:02.641242947 +0000 ++++ wicd-1.7.2.4/wicd/wicd-daemon.py 2013-06-22 18:58:33.990244153 +0000 +@@ -69,6 +69,7 @@ + wireless_conf = os.path.join(wpath.etc, "wireless-settings.conf") + wired_conf = os.path.join(wpath.etc, "wired-settings.conf") + dhclient_conf = os.path.join(wpath.etc, "dhclient.conf.template") ++dhclient_conf_default = os.path.join(wpath.share, "other", "dhclient.conf.template.default") + + class WicdDaemon(dbus.service.Object): + """ The main wicd daemon class. +@@ -910,7 +911,7 @@ + + if not os.path.isfile(dhclient_conf): + print "dhclient.conf.template not found, copying..." +- shutil.copy(dhclient_conf + ".default", dhclient_conf) ++ shutil.copy(dhclient_conf_default, dhclient_conf) + # Hide the files, so the keys aren't exposed. + print "chmoding configuration files 0600..." + os.chmod(app_conf.get_config(), 0600)diff -ruN wicd-1.7.2.4.orig/wicd/wnettools.py wicd-1.7.2.4/wicd/wnettools.py --- wicd-1.7.2.4.orig/wicd/wnettools.py 2013-03-30 21:47:19.804907552 +0000 +++ wicd-1.7.2.4/wicd/wnettools.py 2013-03-31 08:44:37.572792110 +0000 @@ -37,6 +37,7 @@ From b0c946a86a85cdb80e090e66a4d681e929caaa96 Mon Sep 17 00:00:00 2001 From: Joachim Schiele Date: Thu, 27 Jun 2013 12:04:46 +0200 Subject: [PATCH 071/798] added mcrypt --- pkgs/tools/misc/mcrypt/default.nix | 21 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/tools/misc/mcrypt/default.nix diff --git a/pkgs/tools/misc/mcrypt/default.nix b/pkgs/tools/misc/mcrypt/default.nix new file mode 100644 index 00000000000..7701f0e2059 --- /dev/null +++ b/pkgs/tools/misc/mcrypt/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, libmcrypt, libmhash }: + +stdenv.mkDerivation rec { + version = "2.6.8"; + name = "mcrypt-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/mcrypt/MCrypt/${version}/${name}.tar.gz"; + sha256 = "5145aa844e54cca89ddab6fb7dd9e5952811d8d787c4f4bf27eb261e6c182098"; + }; + + buildInputs = [libmcrypt libmhash]; + + meta = { + description = "mcrypt, and the accompanying libmcrypt, are intended to be replacements for the old Unix crypt, except that they are under the GPL and support an ever-wider range of algorithms and modes."; + homepage = http://mcrypt.sourceforge.net; + license = "GPLv2"; + platforms = stdenv.lib.platforms.all; + maintainers = [ stdenv.lib.maintainers.qknight ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 578734e9b9e..6f59d442dea 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -522,6 +522,8 @@ let syslogng = callPackage ../tools/system/syslog-ng { }; rsyslog = callPackage ../tools/system/rsyslog { }; + mcrypt = callPackage ../tools/misc/mcrypt { }; + mcelog = callPackage ../os-specific/linux/mcelog { }; asciidoc = callPackage ../tools/typesetting/asciidoc { }; From 4800a33b883fbdfb483dd69056b30032b650377f Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Thu, 27 Jun 2013 12:13:14 +0200 Subject: [PATCH 072/798] Linux 3.4: Doesn't support CONFIG_RC_DEVICES option --- pkgs/os-specific/linux/kernel/linux-3.4.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.4.nix b/pkgs/os-specific/linux/kernel/linux-3.4.nix index 440f39227ed..cd7e9f2b375 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix @@ -199,7 +199,6 @@ let NET_FC y # Fibre Channel driver support PPP_MULTILINK y # PPP multilink support REGULATOR y # Voltage and Current Regulator Support - RC_DEVICES y # Enable IR devices SCSI_LOGGING y # SCSI logging facility SERIAL_8250 y # 8250/16550 and compatible serial support SLIP_COMPRESSED y # CSLIP compressed headers From 989c58eb2966b1cdcfd93b406e1525966845aa00 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 27 Jun 2013 13:31:35 +0200 Subject: [PATCH 073/798] Process /etc/fonts/conf.d before upstream fonts/conf.d Otherwise the user won't be able to override anything specified in NixOS' /etc/fonts/conf.d, since ~/.config/fontconfig is included from upstream fonts/conf.5/50-user.conf. --- .../libraries/fontconfig/make-fonts-conf.xsl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/fontconfig/make-fonts-conf.xsl b/pkgs/development/libraries/fontconfig/make-fonts-conf.xsl index f716700d98e..68c91596ac5 100644 --- a/pkgs/development/libraries/fontconfig/make-fonts-conf.xsl +++ b/pkgs/development/libraries/fontconfig/make-fonts-conf.xsl @@ -22,19 +22,19 @@ - /etc/fonts/conf.d /etc/fonts/conf.d - + /etc/fonts/conf.d + /var/cache/fontconfig ~/.fontconfig - + - + - + From 4d3c59f454611e3471598bf309d460d766b004aa Mon Sep 17 00:00:00 2001 From: Joachim Schiele Date: Thu, 27 Jun 2013 13:43:50 +0200 Subject: [PATCH 074/798] added AES crypt --- pkgs/tools/misc/aescrypt/default.nix | 32 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/tools/misc/aescrypt/default.nix diff --git a/pkgs/tools/misc/aescrypt/default.nix b/pkgs/tools/misc/aescrypt/default.nix new file mode 100644 index 00000000000..34987cd717e --- /dev/null +++ b/pkgs/tools/misc/aescrypt/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + version = "3.0.9"; + name = "aescrypt-${version}"; + + src = fetchurl { + url = "http://www.aescrypt.com/download/v3/linux/${name}.tgz"; + sha256 = "3f3590f9b7e50039611ba9c0cf1cae1b188a44bd39cfc41553db7ec5709c0882"; + }; + + preBuild = '' + cd src + ''; + + installPhase= '' + mkdir -p $out/bin + cp aescrypt $out/bin + cp aescrypt_keygen $out/bin + ''; + + buildInputs = []; + + meta = { + description = "AES Crypt is a file encryption software available on several operating systems that uses the industry standard Advanced Encryption Standard (AES) to easily and securely encrypt files."; + homepage = http://www.aescrypt.com/; + license = "GPLv2"; + platforms = stdenv.lib.platforms.all; + maintainers = [ stdenv.lib.maintainers.qknight ]; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 578734e9b9e..62fcdc8bbbb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -389,6 +389,8 @@ let aespipe = callPackage ../tools/security/aespipe { }; + aescrypt = callPackage ../tools/misc/aescrypt { }; + ahcpd = callPackage ../tools/networking/ahcpd { }; aircrackng = callPackage ../tools/networking/aircrack-ng { }; From 2d521d84042640574bf08ef0d531215923882224 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 27 Jun 2013 14:27:03 +0200 Subject: [PATCH 075/798] google-talk-plugin: Enable screen sharing --- .../google-talk-plugin/default.nix | 8 ++--- .../google-talk-plugin/preload.c | 32 +++++++++++++++++-- 2 files changed, 34 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix index 8cc62aa02db..0110dad9dc8 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix @@ -79,13 +79,13 @@ stdenv.mkDerivation rec { $plugins/libnpgtpo3dautoplugin.so mkdir -p $out/libexec/google/talkplugin - cp opt/google/talkplugin/GoogleTalkPlugin $out/libexec/google/talkplugin/ - + cp -prd opt/google/talkplugin/{GoogleTalkPlugin,locale,windowpicker.glade} $out/libexec/google/talkplugin/ + mkdir -p $out/libexec/google/talkplugin/lib cp opt/google/talkplugin/lib/libCg* $out/libexec/google/talkplugin/lib/ patchelf --set-rpath "$out/libexec/google/talkplugin/lib" \ - $out/libexec/google/talkplugin/lib/libCgGL.so + $out/libexec/google/talkplugin/lib/libCgGL.so patchelf \ --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ @@ -102,7 +102,7 @@ stdenv.mkDerivation rec { dontStrip = true; dontPatchELF = true; - + passthru.mozillaPlugin = "/lib/mozilla/plugins"; meta = { diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/preload.c b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/preload.c index 9c543fed758..a643e39c31a 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/preload.c +++ b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/preload.c @@ -12,8 +12,8 @@ #include #include -char origDir [] = "/opt/google/talkplugin/GoogleTalkPlugin"; -char realDir [] = OUT "/libexec/google/talkplugin/GoogleTalkPlugin"; +char origDir [] = "/opt/google/talkplugin"; +char realDir [] = OUT "/libexec/google/talkplugin"; const char * rewrite(const char * path, char * buf) { @@ -29,3 +29,31 @@ int execvp(const char * path, char * const argv[]) char buf[PATH_MAX]; return _execvp(rewrite(path, buf), argv); } + +int open(const char *path, int flags, ...) +{ + char buf[PATH_MAX]; + int (*_open) (const char *, int, mode_t) = dlsym(RTLD_NEXT, "open"); + mode_t mode = 0; + if (flags & O_CREAT) { + va_list ap; + va_start(ap, flags); + mode = va_arg(ap, mode_t); + va_end(ap); + } + return _open(rewrite(path, buf), flags, mode); +} + +int open64(const char *path, int flags, ...) +{ + char buf[PATH_MAX]; + int (*_open64) (const char *, int, mode_t) = dlsym(RTLD_NEXT, "open64"); + mode_t mode = 0; + if (flags & O_CREAT) { + va_list ap; + va_start(ap, flags); + mode = va_arg(ap, mode_t); + va_end(ap); + } + return _open64(rewrite(path, buf), flags, mode); +} From 9936b7c230a908e290c0242d7add132cdc97101e Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Thu, 27 Jun 2013 15:32:11 +0200 Subject: [PATCH 076/798] disnix: push to latest 0.3 development release --- .../disnix/activation-scripts/default.nix | 48 ------------------- .../package-management/disnix/default.nix | 14 +++--- .../disnix/disnixos/default.nix | 6 +-- .../disnix/dysnomia/default.nix | 48 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 +- 5 files changed, 58 insertions(+), 60 deletions(-) delete mode 100644 pkgs/tools/package-management/disnix/activation-scripts/default.nix create mode 100644 pkgs/tools/package-management/disnix/dysnomia/default.nix diff --git a/pkgs/tools/package-management/disnix/activation-scripts/default.nix b/pkgs/tools/package-management/disnix/activation-scripts/default.nix deleted file mode 100644 index beae2e3b5f6..00000000000 --- a/pkgs/tools/package-management/disnix/activation-scripts/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ stdenv, fetchurl -, ejabberd ? null, mysql ? null, postgresql ? null, subversion ? null -, enableApacheWebApplication ? false -, enableAxis2WebService ? false -, enableEjabberdDump ? false -, enableMySQLDatabase ? false -, enablePostgreSQLDatabase ? false -, enableSubversionRepository ? false -, enableTomcatWebApplication ? false -, catalinaBaseDir ? "/var/tomcat" -}: - -assert enableMySQLDatabase -> mysql != null; -assert enablePostgreSQLDatabase -> postgresql != null; -assert enableSubversionRepository -> subversion != null; -assert enableEjabberdDump -> ejabberd != null; - -stdenv.mkDerivation { - name = "disnix-activation-scripts-0.3pre30423"; - src = fetchurl { - url = http://hydra.nixos.org/build/2794103/download/1/disnix-activation-scripts-0.3pre30423.tar.gz; - sha256 = "1x1702isjnrkvwzycryc8rvjgka4qqmd1dk34pwl51y1l2bxymrx"; - }; - - preConfigure = if enableEjabberdDump then "export PATH=$PATH:${ejabberd}/sbin" else ""; - - configureFlags = '' - ${if enableApacheWebApplication then "--with-apache" else "--without-apache"} - ${if enableAxis2WebService then "--with-axis2" else "--without-axis2"} - ${if enableEjabberdDump then "--with-ejabberd" else "--without-ejabberd"} - ${if enableMySQLDatabase then "--with-mysql" else "--without-mysql"} - ${if enablePostgreSQLDatabase then "--with-postgresql" else "--without-postgresql"} - ${if enableSubversionRepository then "--with-subversion" else "--without-subversion"} - ${if enableTomcatWebApplication then "--with-tomcat=${catalinaBaseDir}" else "--without-tomcat"} - ''; - - buildInputs = [] - ++ stdenv.lib.optional enableEjabberdDump ejabberd - ++ stdenv.lib.optional enableMySQLDatabase mysql - ++ stdenv.lib.optional enablePostgreSQLDatabase postgresql - ++ stdenv.lib.optional enableSubversionRepository subversion; - - meta = { - description = "Provides various activation types for Disnix"; - license = "MIT"; - maintainers = [ stdenv.lib.maintainers.sander ]; - }; -} diff --git a/pkgs/tools/package-management/disnix/default.nix b/pkgs/tools/package-management/disnix/default.nix index 9c17b9b78f7..e63de65410c 100644 --- a/pkgs/tools/package-management/disnix/default.nix +++ b/pkgs/tools/package-management/disnix/default.nix @@ -1,17 +1,15 @@ -{ stdenv, fetchurl, pkgconfig, dbus_glib, libxml2, libxslt, getopt, nixUnstable, gettext, libiconv }: +{ stdenv, fetchurl, pkgconfig, dbus_glib, libxml2, libxslt, getopt, nixUnstable, libintlOrEmpty, libiconvOrEmpty }: stdenv.mkDerivation { - name = "disnix-0.3pre32254"; + name = "disnix-0.3pre106668a42f982af4180d7657b47d8316862d4d1d"; src = fetchurl { - url = http://hydra.nixos.org/build/2368541/download/4/disnix-0.3pre32254.tar.gz; - sha256 = "1jznx4mb6vwpzzpbk4c16j73hjgng7v1nraq8yya7f7m1s2gyhcw"; + url = http://hydra.nixos.org/build/5430218/download/4/disnix-0.3pre106668a42f982af4180d7657b47d8316862d4d1d.tar.gz; + sha256 = "1cnrbw70gpkm9rg5a3j0kkbq0q0wrkc5hwqb614fvja20y52hld6"; }; - buildInputs = [ pkgconfig dbus_glib libxml2 libxslt getopt nixUnstable ] - ++ stdenv.lib.optional (!stdenv.isLinux) libiconv - ++ stdenv.lib.optional (!stdenv.isLinux) gettext; - + buildInputs = [ pkgconfig dbus_glib libxml2 libxslt getopt nixUnstable libintlOrEmpty libiconvOrEmpty ]; + dontStrip = true; meta = { diff --git a/pkgs/tools/package-management/disnix/disnixos/default.nix b/pkgs/tools/package-management/disnix/disnixos/default.nix index 93cd2f3f846..46422d010fa 100644 --- a/pkgs/tools/package-management/disnix/disnixos/default.nix +++ b/pkgs/tools/package-management/disnix/disnixos/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, disnix, socat, pkgconfig }: stdenv.mkDerivation { - name = "disnixos-0.2pre33586"; + name = "disnixos-0.2pre827a5b52b8a68b7c16a2d92898e6281c54e7b1ff"; src = fetchurl { - url = http://hydra.nixos.org/build/2368187/download/3/disnixos-0.2pre33586.tar.gz; - sha256 = "110vn4390447dws343py8ss6s8jizx8yg7yl38i64nlqh0bcn4ny"; + url = http://hydra.nixos.org/build/5430738/download/3/disnixos-0.2pre827a5b52b8a68b7c16a2d92898e6281c54e7b1ff.tar.gz; + sha256 = "1alyzypli32whd371w9wfxcnq6by9zng88nysd3gy8nrvns8di7x"; }; buildInputs = [ socat pkgconfig disnix ]; diff --git a/pkgs/tools/package-management/disnix/dysnomia/default.nix b/pkgs/tools/package-management/disnix/dysnomia/default.nix new file mode 100644 index 00000000000..a2e2a78a46e --- /dev/null +++ b/pkgs/tools/package-management/disnix/dysnomia/default.nix @@ -0,0 +1,48 @@ +{ stdenv, fetchurl +, ejabberd ? null, mysql ? null, postgresql ? null, subversion ? null +, enableApacheWebApplication ? false +, enableAxis2WebService ? false +, enableEjabberdDump ? false +, enableMySQLDatabase ? false +, enablePostgreSQLDatabase ? false +, enableSubversionRepository ? false +, enableTomcatWebApplication ? false +, catalinaBaseDir ? "/var/tomcat" +}: + +assert enableMySQLDatabase -> mysql != null; +assert enablePostgreSQLDatabase -> postgresql != null; +assert enableSubversionRepository -> subversion != null; +assert enableEjabberdDump -> ejabberd != null; + +stdenv.mkDerivation { + name = "disnix-activation-scripts-0.3predff2da00e2d29d15feb2b6b42931232d691f7f03"; + src = fetchurl { + url = http://hydra.nixos.org/build/5430159/download/1/dysnomia-0.3predff2da00e2d29d15feb2b6b42931232d691f7f03.tar.gz; + sha256 = "1y9qf14ygdgq2hjh1p6rf7hcgij02wv091s8wpsn36mrmc9zk6rf"; + }; + + preConfigure = if enableEjabberdDump then "export PATH=$PATH:${ejabberd}/sbin" else ""; + + configureFlags = '' + ${if enableApacheWebApplication then "--with-apache" else "--without-apache"} + ${if enableAxis2WebService then "--with-axis2" else "--without-axis2"} + ${if enableEjabberdDump then "--with-ejabberd" else "--without-ejabberd"} + ${if enableMySQLDatabase then "--with-mysql" else "--without-mysql"} + ${if enablePostgreSQLDatabase then "--with-postgresql" else "--without-postgresql"} + ${if enableSubversionRepository then "--with-subversion" else "--without-subversion"} + ${if enableTomcatWebApplication then "--with-tomcat=${catalinaBaseDir}" else "--without-tomcat"} + ''; + + buildInputs = [] + ++ stdenv.lib.optional enableEjabberdDump ejabberd + ++ stdenv.lib.optional enableMySQLDatabase mysql + ++ stdenv.lib.optional enablePostgreSQLDatabase postgresql + ++ stdenv.lib.optional enableSubversionRepository subversion; + + meta = { + description = "Provides various activation types for Disnix"; + license = "MIT"; + maintainers = [ stdenv.lib.maintainers.sander ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 578734e9b9e..d7af6c8e69c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9433,7 +9433,7 @@ let disnix = callPackage ../tools/package-management/disnix { }; - disnix_activation_scripts = callPackage ../tools/package-management/disnix/activation-scripts { + dysnomia = callPackage ../tools/package-management/disnix/dysnomia { enableApacheWebApplication = config.disnix.enableApacheWebApplication or false; enableAxis2WebService = config.disnix.enableAxis2WebService or false; enableEjabberdDump = config.disnix.enableEjabberdDump or false; From 916fc482100465876b9716181854eddcdf9a366c Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Thu, 27 Jun 2013 17:49:05 +0200 Subject: [PATCH 077/798] moderntimeline: Add extra source URL --- pkgs/tools/typesetting/tex/texlive/moderntimeline.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix b/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix index 6139911623f..d129cc62020 100644 --- a/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix +++ b/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix @@ -3,7 +3,10 @@ rec { version = "0.7"; name = "moderntimeline-${version}"; src = fetchurl { - url = "http://www.ctan.org/tex-archive/macros/latex/contrib/moderntimeline.zip"; + urls = [ + "http://www.ctan.org/tex-archive/macros/latex/contrib/moderntimeline.zip" + "http://mirror.ctan.org/macros/latex/contrib/moderntimeline.zip" + ]; sha256 = "0dxwybanj7qvbr69wgsllha1brq6qjsnjfff6nw4r3nijzvvh876"; }; From 38a59aa95347a013155ac0e57ef50f8ad7613730 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 27 Jun 2013 20:42:17 +0200 Subject: [PATCH 078/798] maintainers: change my attrname to be uniform --- pkgs/applications/misc/lyx/default.nix | 2 +- pkgs/lib/maintainers.nix | 2 +- pkgs/os-specific/linux/broadcom-sta/default.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/lyx/default.nix b/pkgs/applications/misc/lyx/default.nix index 07de6271289..31c00626847 100644 --- a/pkgs/applications/misc/lyx/default.nix +++ b/pkgs/applications/misc/lyx/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { description = "WYSIWYM frontend for LaTeX, DocBook, etc."; homepage = "http://www.lyx.org"; license = "GPL2"; - maintainers = [ stdenv.lib.maintainers.neznalek ]; + maintainers = [ stdenv.lib.maintainers.vcunat ]; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/lib/maintainers.nix b/pkgs/lib/maintainers.nix index 5e506ce25c2..da4d13b354d 100644 --- a/pkgs/lib/maintainers.nix +++ b/pkgs/lib/maintainers.nix @@ -29,7 +29,6 @@ ludo = "Ludovic Courtès "; marcweber = "Marc Weber "; mornfall = "Petr Ročkai "; - neznalek = "Vladimír Čunát "; offline = "Jaka Hudoklin "; orbitz = "Malcolm Matalka "; page = "Carles Pagès "; @@ -48,6 +47,7 @@ thammers = "Tobias Hammerschmidt "; the-kenny = "Moritz Ulrich "; urkud = "Yury G. Kudryashov "; + vcunat = "Vladimír Čunát "; viric = "Lluís Batlle i Rossell "; winden = "Antonio Vargas Gonzalez "; z77z = "Marco Maggesi "; diff --git a/pkgs/os-specific/linux/broadcom-sta/default.nix b/pkgs/os-specific/linux/broadcom-sta/default.nix index 43ba9dfc2b5..816a099e243 100644 --- a/pkgs/os-specific/linux/broadcom-sta/default.nix +++ b/pkgs/os-specific/linux/broadcom-sta/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation { description = "Kernel module driver for some Broadcom's wireless cards"; homepage = http://www.broadcom.com/support/802.11/linux_sta.php; license = "unfree-redistributable"; - maintainers = [ stdenv.lib.maintainers.neznalek ]; + maintainers = [ stdenv.lib.maintainers.vcunat ]; platforms = stdenv.lib.platforms.linux; }; } From 0689016e3edf46cdf747740d0e8d0c457a33b0a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 27 Jun 2013 20:43:05 +0200 Subject: [PATCH 079/798] liferea: add -- A GTK-based news feed reader --- .../newsreaders/liferea/default.nix | 27 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/applications/networking/newsreaders/liferea/default.nix diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix new file mode 100644 index 00000000000..4703a4f28c8 --- /dev/null +++ b/pkgs/applications/networking/newsreaders/liferea/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, pkgconfig, intltool, glib, gtk2, gnome2 /*just GConf*/ +, libsoup, libunique, libxslt, webkit_gtk2, json_glib +, libnotify /*optional*/ }: + +let version = "1.8.15"; +in +stdenv.mkDerivation rec { + name = "liferea-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/liferea/Liferea%20Stable/${version}/${name}.tar.bz2"; + sha256 = "12hhdl5biwcvr9ds7pdhhvlp4vggjix6xm4z5pnfaz53ai2dnc99"; + }; + + buildInputs = [ + pkgconfig intltool gtk2 gnome2.GConf + libsoup libunique libxslt webkit_gtk2 json_glib + libnotify + ]; + + meta = { + description = "A GTK-based news feed agregator"; + homepage = http://lzone.de/liferea/; + maintainers = [ stdenv.lib.maintainers.vcunat ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d7af6c8e69c..b75fd707b34 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7739,6 +7739,8 @@ let poppler = poppler_0_18; }; + liferea = callPackage ../applications/networking/newsreaders/liferea { }; + lingot = callPackage ../applications/audio/lingot { inherit (gnome) libglade; }; From 7f413e4d5c3d0e0374a3ea8d1c575ceb7249be16 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Tue, 25 Jun 2013 09:17:34 +0200 Subject: [PATCH 080/798] whitespace cleaning --- pkgs/applications/graphics/gimp/default.nix | 4 ++-- pkgs/development/libraries/ffmpeg/1.x.nix | 6 +++--- pkgs/development/libraries/gegl/0_0_22.nix | 4 ++-- pkgs/development/libraries/leptonica/default.nix | 2 +- pkgs/development/libraries/qt-3/default.nix | 4 ++-- pkgs/development/ocaml-modules/camlimages/default.nix | 2 +- pkgs/games/minetest/default.nix | 10 +++++----- pkgs/top-level/all-packages.nix | 2 +- 8 files changed, 17 insertions(+), 17 deletions(-) diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix index b59b2bb6750..f2a4ec90f97 100644 --- a/pkgs/applications/graphics/gimp/default.nix +++ b/pkgs/applications/graphics/gimp/default.nix @@ -5,12 +5,12 @@ stdenv.mkDerivation rec { name = "gimp-2.6.12"; - + src = fetchurl { url = "ftp://ftp.gtk.org/pub/gimp/v2.6/${name}.tar.bz2"; sha256 = "0qpcgaa4pdqqhyyy8vjvzfflxgsrrs25zk79gixzlnbzq3qwjlym"; }; - + buildInputs = [ pkgconfig gtk freetype fontconfig libart_lgpl libtiff libjpeg libpng12 libexif zlib perl diff --git a/pkgs/development/libraries/ffmpeg/1.x.nix b/pkgs/development/libraries/ffmpeg/1.x.nix index 119e785ea4f..3798119acd2 100644 --- a/pkgs/development/libraries/ffmpeg/1.x.nix +++ b/pkgs/development/libraries/ffmpeg/1.x.nix @@ -30,12 +30,12 @@ assert playSupport -> SDL != null; stdenv.mkDerivation rec { name = "ffmpeg-1.2"; - + src = fetchurl { url = "http://www.ffmpeg.org/releases/${name}.tar.bz2"; sha256 = "1bssxbn4p813xlgb8whg4b60j90yzfy92x70b4q8j35fgp0gnfcs"; }; - + # `--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. @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional playSupport SDL; enableParallelBuilding = true; - + crossAttrs = { dontSetConfigureCross = true; configureFlags = configureFlags ++ [ diff --git a/pkgs/development/libraries/gegl/0_0_22.nix b/pkgs/development/libraries/gegl/0_0_22.nix index 150ba1ac961..4eeb6886d71 100644 --- a/pkgs/development/libraries/gegl/0_0_22.nix +++ b/pkgs/development/libraries/gegl/0_0_22.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, glib, babl_0_0_22, libpng12, cairo, libjpeg , librsvg, pango, gtk }: - + stdenv.mkDerivation { name = "gegl-0.0.22"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { buildInputs = [ pkgconfig glib babl_0_0_22 libpng12 cairo libjpeg librsvg pango gtk ]; - meta = { + meta = { description = "Graph-based image processing framework"; homepage = http://www.gegl.org; license = "GPL3"; diff --git a/pkgs/development/libraries/leptonica/default.nix b/pkgs/development/libraries/leptonica/default.nix index 232f2775c00..177b2d1f260 100644 --- a/pkgs/development/libraries/leptonica/default.nix +++ b/pkgs/development/libraries/leptonica/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation { name = "leptonica-1.68"; - + src = fetchurl { url = http://www.leptonica.org/source/leptonica-1.68.tar.gz; sha256 = "13qzm24zy46bj9b476jxzbw9qh7p96jikfzxg88kz4dj1p2vdvxc"; diff --git a/pkgs/development/libraries/qt-3/default.nix b/pkgs/development/libraries/qt-3/default.nix index 91eec5fcd31..a24f444488d 100644 --- a/pkgs/development/libraries/qt-3/default.nix +++ b/pkgs/development/libraries/qt-3/default.nix @@ -59,10 +59,10 @@ stdenv.mkDerivation { patches = [ # Don't strip everything so we can get useful backtraces. ./strip.patch - + # Build on NixOS. ./qt-pwd.patch - + # randr.h and Xrandr.h need not be in the same prefix. ./xrandr.patch diff --git a/pkgs/development/ocaml-modules/camlimages/default.nix b/pkgs/development/ocaml-modules/camlimages/default.nix index 037ebdea6b6..29816d297b5 100644 --- a/pkgs/development/ocaml-modules/camlimages/default.nix +++ b/pkgs/development/ocaml-modules/camlimages/default.nix @@ -9,7 +9,7 @@ in stdenv.mkDerivation { name = "${pname}-${version}"; - src = fetchurl { + src = fetchurl { url = "https://bitbucket.org/camlspotter/camlimages/get/v4.0.1.tar.gz"; sha256 = "b40237c1505487049799a7af296eb3996b3fa08eab94415546f46d61355747c4"; }; diff --git a/pkgs/games/minetest/default.nix b/pkgs/games/minetest/default.nix index 3b06cd8694c..0a9a40140ef 100644 --- a/pkgs/games/minetest/default.nix +++ b/pkgs/games/minetest/default.nix @@ -15,23 +15,23 @@ let }; in stdenv.mkDerivation { name = "minetest-${version}"; - + src = sources.src; - + cmakeFlags = [ "-DIRRLICHT_INCLUDE_DIR=${irrlicht3843}/include/irrlicht" ]; - + buildInputs = [ cmake irrlicht3843 libpng12 bzip2 libjpeg libXxf86vm mesa openal libvorbis x11 ]; - + postInstall = '' mkdir -pv $out/share/minetest/games/minetest_game/ cp -rv ${sources.data}/* $out/share/minetest/games/minetest_game/ ''; - + meta = { homepage = "http://minetest.net/"; description = "Minetest is an infinite-world block sandbox game."; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b75fd707b34..22e43b0e4c9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4042,7 +4042,7 @@ let glpk = callPackage ../development/libraries/glpk { }; - glsurf = callPackage ../applications/science/math/glsurf { + glsurf = callPackage ../applications/science/math/glsurf { inherit (ocamlPackages) lablgl findlib camlimages ocaml_mysql mlgmp; }; From 0b17251c06e9b63456b90c4046b7a2dbb39f8155 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Wed, 26 Jun 2013 16:48:45 +0200 Subject: [PATCH 081/798] libpng: keep versioning in all-packages.nix, not in individual expressions --- pkgs/applications/audio/spotify/default.nix | 4 +-- .../display-managers/slim/default.nix | 4 +-- pkgs/applications/graphics/gimp/default.nix | 4 +-- .../google-talk-plugin/default.nix | 4 +-- .../science/math/glsurf/default.nix | 5 ++-- pkgs/development/libraries/gegl/0_0_22.nix | 4 +-- .../libraries/leptonica/default.nix | 4 +-- pkgs/development/libraries/qt-3/default.nix | 4 +-- .../ocaml-modules/camlimages/default.nix | 8 +++--- pkgs/games/minetest/default.nix | 4 +-- pkgs/top-level/all-packages.nix | 25 +++++++++++++++---- 11 files changed, 42 insertions(+), 28 deletions(-) diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index ccdfcbb3d99..f4d264c0d8f 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, dpkg, xlibs, qt4, alsaLib, makeWrapper, openssl, freetype, glib, pango, cairo, atk, gdk_pixbuf, gtk, cups, nspr, nss, libpng12, GConf, libgcrypt, chromium, sqlite, gst_plugins_base, gstreamer }: +{ fetchurl, stdenv, dpkg, xlibs, qt4, alsaLib, makeWrapper, openssl, freetype, glib, pango, cairo, atk, gdk_pixbuf, gtk, cups, nspr, nss, libpng, GConf, libgcrypt, chromium, sqlite, gst_plugins_base, gstreamer }: assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; @@ -73,7 +73,7 @@ stdenv.mkDerivation { mkdir -p $out/libexec/spotify gcc -shared ${./preload.c} -o $preload -ldl -DOUT=\"$out\" -fPIC - wrapProgram $out/bin/spotify --set LD_PRELOAD $preload --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ GConf libpng12 cups libgcrypt sqlite gst_plugins_base gstreamer]}:$out/lib" + wrapProgram $out/bin/spotify --set LD_PRELOAD $preload --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ GConf libpng cups libgcrypt sqlite gst_plugins_base gstreamer]}:$out/lib" ''; # */ dontStrip = true; diff --git a/pkgs/applications/display-managers/slim/default.nix b/pkgs/applications/display-managers/slim/default.nix index 601aa7bf53a..9d5c728de26 100644 --- a/pkgs/applications/display-managers/slim/default.nix +++ b/pkgs/applications/display-managers/slim/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, pkgconfig, x11, libjpeg, libpng12, libXmu +{ stdenv, fetchurl, cmake, pkgconfig, x11, libjpeg, libpng, libXmu , fontconfig, freetype, pam, dbus_libs }: stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ]; buildInputs = - [ cmake pkgconfig x11 libjpeg libpng12 libXmu fontconfig freetype + [ cmake pkgconfig x11 libjpeg libpng libXmu fontconfig freetype pam dbus_libs ]; diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix index f2a4ec90f97..33d52c6645b 100644 --- a/pkgs/applications/graphics/gimp/default.nix +++ b/pkgs/applications/graphics/gimp/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gtk, freetype -, fontconfig, libart_lgpl, libtiff, libjpeg, libpng12, libexif, zlib, perl +, fontconfig, libart_lgpl, libtiff, libjpeg, libpng, libexif, zlib, perl , perlXMLParser, python, pygtk, gettext, xlibs, intltool, babl_0_0_22, gegl_0_0_22 }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig gtk freetype fontconfig - libart_lgpl libtiff libjpeg libpng12 libexif zlib perl + libart_lgpl libtiff libjpeg libpng libexif zlib perl perlXMLParser python pygtk gettext intltool babl_0_0_22 gegl_0_0_22 ]; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix index 0110dad9dc8..110f9522030 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, rpm, cpio, mesa, xorg, cairo -, libpng12, gtk, glib, gdk_pixbuf, fontconfig, freetype, curl +, libpng, gtk, glib, gdk_pixbuf, fontconfig, freetype, curl , dbus_glib, alsaLib, pulseaudio, udev, pango }: @@ -14,7 +14,7 @@ let xorg.libXt xorg.libX11 cairo - libpng12 + libpng gtk glib fontconfig diff --git a/pkgs/applications/science/math/glsurf/default.nix b/pkgs/applications/science/math/glsurf/default.nix index 51b2850347b..a056a32c64c 100644 --- a/pkgs/applications/science/math/glsurf/default.nix +++ b/pkgs/applications/science/math/glsurf/default.nix @@ -1,5 +1,4 @@ - -{ stdenv, fetchdarcs, ocaml, findlib, lablgl, camlimages, mesa, freeglut, ocaml_mysql, mlgmp, mpfr, gmp, libtiff, libjpeg, libpng12, giflib }: +{ stdenv, fetchdarcs, ocaml, findlib, lablgl, camlimages, mesa, freeglut, ocaml_mysql, mlgmp, mpfr, gmp, libtiff, libjpeg, libpng, giflib }: let ocaml_version = (builtins.parseDrvName ocaml.name).version; @@ -16,7 +15,7 @@ stdenv.mkDerivation { buildInputs = [ ocaml findlib freeglut mesa lablgl camlimages ocaml_mysql mlgmp mpfr gmp - libtiff libjpeg libpng12 giflib ]; + libtiff libjpeg libpng giflib ]; installPhase = '' mkdir -p $out/bin $out/share/doc/glsurf diff --git a/pkgs/development/libraries/gegl/0_0_22.nix b/pkgs/development/libraries/gegl/0_0_22.nix index 4eeb6886d71..b2f2e85a1ea 100644 --- a/pkgs/development/libraries/gegl/0_0_22.nix +++ b/pkgs/development/libraries/gegl/0_0_22.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, babl_0_0_22, libpng12, cairo, libjpeg +{ stdenv, fetchurl, pkgconfig, glib, babl_0_0_22, libpng, cairo, libjpeg , librsvg, pango, gtk }: stdenv.mkDerivation { @@ -11,7 +11,7 @@ stdenv.mkDerivation { configureFlags = "--disable-docs"; # needs fonts otherwise don't know how to pass them - buildInputs = [ pkgconfig glib babl_0_0_22 libpng12 cairo libjpeg librsvg pango gtk ]; + buildInputs = [ pkgconfig glib babl_0_0_22 libpng cairo libjpeg librsvg pango gtk ]; meta = { description = "Graph-based image processing framework"; diff --git a/pkgs/development/libraries/leptonica/default.nix b/pkgs/development/libraries/leptonica/default.nix index 177b2d1f260..e84bd0656c4 100644 --- a/pkgs/development/libraries/leptonica/default.nix +++ b/pkgs/development/libraries/leptonica/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, libpng12, libtiff, libjpeg, zlib}: +{stdenv, fetchurl, libpng, libtiff, libjpeg, zlib}: stdenv.mkDerivation { name = "leptonica-1.68"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "13qzm24zy46bj9b476jxzbw9qh7p96jikfzxg88kz4dj1p2vdvxc"; }; - buildInputs = [ libpng12 libtiff libjpeg zlib ]; + buildInputs = [ libpng libtiff libjpeg zlib ]; meta = { description = "Image processing and analysis library"; diff --git a/pkgs/development/libraries/qt-3/default.nix b/pkgs/development/libraries/qt-3/default.nix index a24f444488d..b3dfc021da9 100644 --- a/pkgs/development/libraries/qt-3/default.nix +++ b/pkgs/development/libraries/qt-3/default.nix @@ -7,10 +7,10 @@ , threadSupport ? true , mysqlSupport ? false, mysql ? null , openglSupport ? false, mesa ? null, libXmu ? null -, x11, xextproto, zlib, libjpeg, libpng12, which +, x11, xextproto, zlib, libjpeg, libpng, which }: -let libpng = libpng12; in +let libpng = libpng; in assert xftSupport -> libXft != null; assert xrenderSupport -> xftSupport && libXrender != null; diff --git a/pkgs/development/ocaml-modules/camlimages/default.nix b/pkgs/development/ocaml-modules/camlimages/default.nix index 29816d297b5..21610f8f310 100644 --- a/pkgs/development/ocaml-modules/camlimages/default.nix +++ b/pkgs/development/ocaml-modules/camlimages/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, omake, ocaml, omake_rc1, libtiff, libjpeg, libpng12, giflib, findlib, libXpm, freetype, graphicsmagick, ghostscript }: +{stdenv, fetchurl, omake, ocaml, omake_rc1, libtiff, libjpeg, libpng, giflib, findlib, libXpm, freetype, graphicsmagick, ghostscript }: let ocaml_version = (builtins.parseDrvName ocaml.name).version; @@ -14,9 +14,9 @@ stdenv.mkDerivation { sha256 = "b40237c1505487049799a7af296eb3996b3fa08eab94415546f46d61355747c4"; }; - buildInputs = [ocaml omake_rc1 findlib graphicsmagick ghostscript libtiff libjpeg libpng12 giflib freetype libXpm ]; - - propagatedbuildInputs = [libtiff libjpeg libpng12 giflib freetype libXpm ]; + buildInputs = [ocaml omake_rc1 findlib graphicsmagick ghostscript libtiff libjpeg libpng giflib freetype libXpm ]; + + propagatedbuildInputs = [libtiff libjpeg libpng giflib freetype libXpm ]; createFindlibDestdir = true; diff --git a/pkgs/games/minetest/default.nix b/pkgs/games/minetest/default.nix index 0a9a40140ef..6c860d42925 100644 --- a/pkgs/games/minetest/default.nix +++ b/pkgs/games/minetest/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, cmake, irrlicht3843, libpng12, bzip2, +{ stdenv, fetchgit, cmake, irrlicht3843, libpng, bzip2, libjpeg, libXxf86vm, mesa, openal, libvorbis, x11 }: let @@ -23,7 +23,7 @@ in stdenv.mkDerivation { ]; buildInputs = [ - cmake irrlicht3843 libpng12 bzip2 libjpeg + cmake irrlicht3843 libpng bzip2 libjpeg libXxf86vm mesa openal libvorbis x11 ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 22e43b0e4c9..fbd8cac417e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1191,7 +1191,9 @@ let minecraft = callPackage ../games/minecraft { }; - minetest = callPackage ../games/minetest { }; + minetest = callPackage ../games/minetest { + libpng = libpng12; + }; miniupnpc = callPackage ../tools/networking/miniupnpc { }; @@ -2744,7 +2746,9 @@ let camomile_0_8_2 = callPackage ../development/ocaml-modules/camomile/0.8.2.nix { }; camomile = callPackage ../development/ocaml-modules/camomile { }; - camlimages = callPackage ../development/ocaml-modules/camlimages { }; + camlimages = callPackage ../development/ocaml-modules/camlimages { + libpng = libpng12; + }; ocaml_cairo = callPackage ../development/ocaml-modules/ocaml-cairo { }; @@ -3921,6 +3925,7 @@ let gegl_0_0_22 = callPackage ../development/libraries/gegl/0_0_22.nix { # avocodec avformat librsvg + libpng = libpng12; }; geoclue = callPackage ../development/libraries/geoclue {}; @@ -4044,6 +4049,7 @@ let glsurf = callPackage ../applications/science/math/glsurf { inherit (ocamlPackages) lablgl findlib camlimages ocaml_mysql mlgmp; + libpng = libpng12; }; gmime = callPackage ../development/libraries/gmime { }; @@ -4333,7 +4339,9 @@ let levmar = callPackage ../development/libraries/levmar { }; - leptonica = callPackage ../development/libraries/leptonica { }; + leptonica = callPackage ../development/libraries/leptonica { + libpng = libpng12; + }; lib3ds = callPackage ../development/libraries/lib3ds { }; @@ -5114,6 +5122,7 @@ let qt3 = callPackage ../development/libraries/qt-3 { openglSupport = mesaSupported; + libpng = libpng12; }; qt4 = pkgs.kde4.qt4; @@ -7425,6 +7434,7 @@ let gimp_2_6 = callPackage ../applications/graphics/gimp { inherit (gnome) libart_lgpl; + libpng = libpng12; }; gimp_2_8 = callPackage ../applications/graphics/gimp/2.8.nix { @@ -7548,7 +7558,9 @@ let googleearth = callPackage_i686 ../applications/misc/googleearth { }; - google_talk_plugin = callPackage ../applications/networking/browsers/mozilla-plugins/google-talk-plugin { }; + google_talk_plugin = callPackage ../applications/networking/browsers/mozilla-plugins/google-talk-plugin { + libpng = libpng12; + }; gosmore = builderDefsPackage ../applications/misc/gosmore { inherit fetchsvn curl pkgconfig libxml2 gtk; @@ -8175,7 +8187,9 @@ let lightdm_gtk_greeter = callPackage ../applications/display-managers/lightdm-gtk-greeter { }; - slim = callPackage ../applications/display-managers/slim { }; + slim = callPackage ../applications/display-managers/slim { + libpng = libpng12; + }; sndBase = builderDefsPackage (import ../applications/audio/snd) { inherit fetchurl stdenv stringsWithDeps lib fftw; @@ -8203,6 +8217,7 @@ let spotify = callPackage ../applications/audio/spotify { inherit (gnome) GConf; + libpng = libpng12; }; libspotify = callPackage ../development/libraries/libspotify { From e78b013fe39522ac51bd6e4a11b8d1e5249e5995 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Wed, 26 Jun 2013 10:54:06 +0200 Subject: [PATCH 082/798] libpng: merge apng expression (keep patch disabled by default) I made sure no rebuild will happen because of this. Unfortunately this meant merging attrsets instead of just using an optionalString for postPatch --- pkgs/development/libraries/libpng/default.nix | 25 ++++++++++++---- .../libraries/libpng/libpng-apng.nix | 30 ------------------- pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 20 insertions(+), 37 deletions(-) delete mode 100644 pkgs/development/libraries/libpng/libpng-apng.nix diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix index 0a150610781..c537ce55cf2 100644 --- a/pkgs/development/libraries/libpng/default.nix +++ b/pkgs/development/libraries/libpng/default.nix @@ -1,12 +1,19 @@ -{ stdenv, fetchurl, zlib }: +{ stdenv, fetchurl, zlib, apngSupport ? false}: assert zlib != null; -stdenv.mkDerivation rec { - name = "libpng-1.6.2"; +let whenPatched = stdenv.lib.optionalString apngSupport; + version = "1.6.2"; + patch_src = fetchurl { + url = "mirror://sourceforge/libpng-apng/libpng-${version}-apng.patch.gz"; + sha256 = "0fy7p197ilr9phwqqk9h91s1mc28r6gj0w2ilrw5liagi71z75j1"; + }; + +in stdenv.mkDerivation (rec { + name = "libpng" + whenPatched "-apng" + "-${version}"; src = fetchurl { - url = "mirror://sourceforge/libpng/${name}.tar.xz"; + url = "mirror://sourceforge/libpng/libpng-${version}.tar.xz"; sha256 = "1pljkqjqgyz8c32w8fipd9f0v2gcyhah2ypp0h7ya1r1q85sk5qw"; }; @@ -17,9 +24,15 @@ stdenv.mkDerivation rec { passthru = { inherit zlib; }; meta = { - description = "The official reference implementation for the PNG file format"; + description = "The official reference implementation for the PNG file format" + whenPatched " with animation patch"; homepage = http://www.libpng.org/pub/png/libpng.html; license = "free-non-copyleft"; # http://www.libpng.org/pub/png/src/libpng-LICENSE.txt platforms = stdenv.lib.platforms.all; }; -} +} // stdenv.lib.optionalAttrs apngSupport { + + postPatch = '' + gunzip < ${patch_src} | patch -Np1 + ''; + +}) diff --git a/pkgs/development/libraries/libpng/libpng-apng.nix b/pkgs/development/libraries/libpng/libpng-apng.nix deleted file mode 100644 index bc6a773dba3..00000000000 --- a/pkgs/development/libraries/libpng/libpng-apng.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv, fetchurl, zlib }: - -stdenv.mkDerivation rec { - version = "1.5.14"; - name = "libpng-apng-${version}"; - - patch_src = fetchurl { - url = "mirror://sourceforge/libpng-apng/libpng15/${version}/libpng-${version}-apng.patch.gz"; - sha256 = "1vcqbkdssy4srm8jqyzaipdc70xzanilqssypmwqyngp8ph0m45p"; - }; - - src = fetchurl { - url = "mirror://sourceforge/libpng/libpng-${version}.tar.xz"; - sha256 = "0m3vz3gig7s63zanq5b1dgb5ph12qm0cylw4g4fbxlsq3f74hn8l"; - }; - - preConfigure = '' - gunzip < ${patch_src} | patch -Np1 - ''; - - propagatedBuildInputs = [ zlib ]; - - passthru = { inherit zlib; }; - - meta = { - description = "The official reference implementation for the PNG file format with animation patch"; - homepage = http://www.libpng.org/pub/png/libpng.html; - license = "free-non-copyleft"; # http://www.libpng.org/pub/png/src/libpng-LICENSE.txt - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fbd8cac417e..d9e5242183f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4688,7 +4688,7 @@ let libpcap = callPackage ../development/libraries/libpcap { }; libpng = callPackage ../development/libraries/libpng { }; - libpng_apng = callPackage ../development/libraries/libpng/libpng-apng.nix { }; + libpng_apng = libpng.override { apngSupport = true; }; libpng12 = callPackage ../development/libraries/libpng/12.nix { }; libpng15 = callPackage ../development/libraries/libpng/15.nix { }; From bf61d25dacf03502efd0c9e5acc0a18acccafc11 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Wed, 26 Jun 2013 13:31:21 +0200 Subject: [PATCH 083/798] kde 4.10: option to use a libcanberra with gtk support by default (as it was before), kde depends on a libcanberra with its gtk dependency removed so a kde system can be gtk-free. However, both firefox and chromium depend on gtk+ and libcanberra too. So this leads to 2 versions being installed. this option combats that by letting the kde use the other libcanberra --- pkgs/desktops/kde-4.10/kde-runtime.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/kde-4.10/kde-runtime.nix b/pkgs/desktops/kde-4.10/kde-runtime.nix index b562d8cadd5..2282ee57c2c 100644 --- a/pkgs/desktops/kde-4.10/kde-runtime.nix +++ b/pkgs/desktops/kde-4.10/kde-runtime.nix @@ -1,12 +1,21 @@ { kde, kdelibs, shared_desktop_ontologies, bzip2, libssh, exiv2, attica , libcanberra, virtuoso, samba, libjpeg, ntrack, pkgconfig, qca2, xz, pulseaudio -, networkmanager, kactivities, kdepimlibs, openexr, ilmbase +, networkmanager, kactivities, kdepimlibs, openexr, ilmbase, config }: +let libcanberraWithoutGTK = if (config ? kde_runtime && config.kde_runtime ? libcanberraWithoutGTK) + then config.kde_runtime.libcanberraWithoutGTK + else true; + + canberra = if libcanberraWithoutGTK + then libcanberra.override { gtk = null; } + else libcanberra; +in + kde { buildInputs = [ kdelibs attica xz bzip2 libssh libjpeg exiv2 ntrack - qca2 samba (libcanberra.override { gtk = null; }) pulseaudio + qca2 samba canberra pulseaudio networkmanager kactivities kdepimlibs openexr #todo: add openslp ]; From f7b3032da7f0b5b0b331b629247a007a8642fdda Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Tue, 25 Jun 2013 16:17:52 +0200 Subject: [PATCH 084/798] ffmpeg-1.x: passthrough vdpauSupport --- pkgs/development/libraries/ffmpeg/1.x.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/ffmpeg/1.x.nix b/pkgs/development/libraries/ffmpeg/1.x.nix index 3798119acd2..9f731d118bc 100644 --- a/pkgs/development/libraries/ffmpeg/1.x.nix +++ b/pkgs/development/libraries/ffmpeg/1.x.nix @@ -89,6 +89,10 @@ stdenv.mkDerivation rec { ]; }; + passthru = { + inherit vdpauSupport; + }; + meta = { homepage = http://www.ffmpeg.org/; description = "A complete, cross-platform solution to record, convert and stream audio and video"; From d51c01ac8ea8723459c214cff0e62bb8cf36ad87 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Thu, 27 Jun 2013 09:22:40 +0200 Subject: [PATCH 085/798] firefox 22: use system libpng --- pkgs/applications/networking/browsers/firefox/default.nix | 8 ++++---- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index 5a50bab0945..912a193eec9 100644 --- a/pkgs/applications/networking/browsers/firefox/default.nix +++ b/pkgs/applications/networking/browsers/firefox/default.nix @@ -46,7 +46,7 @@ in rec { "--with-system-nss" "--with-system-libevent" "--with-system-libvpx" - # "--with-system-png" # <-- "--with-system-png won't work because the system's libpng doesn't have APNG support" + "--with-system-png" "--enable-startup-notification" "--enable-system-ffi" "--enable-system-hunspell" @@ -66,7 +66,7 @@ in rec { inherit src; buildInputs = - [ pkgconfig gtk perl zip libIDL libjpeg libpng zlib bzip2 + [ pkgconfig libpng gtk perl zip libIDL libjpeg zlib bzip2 python dbus dbus_glib pango freetype fontconfig xlibs.libXi xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file alsaLib nspr nss libnotify xlibs.pixman yasm mesa @@ -82,7 +82,7 @@ in rec { enableParallelBuilding = true; - patches = optional useSystemCairo ./system-cairo.patch; # probably in 22 + patches = optional useSystemCairo ./system-cairo.patch; preConfigure = '' @@ -136,7 +136,7 @@ in rec { enableParallelBuilding = true; buildInputs = - [ pkgconfig gtk perl zip libIDL libjpeg zlib bzip2 python + [ pkgconfig libpng gtk perl zip libIDL libjpeg zlib bzip2 python dbus dbus_glib pango freetype fontconfig alsaLib nspr nss libnotify xlibs.pixman yasm mesa sqlite file unzip pysqlite hunspell libevent libstartup_notification libvpx diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d9e5242183f..3ee03794796 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7390,6 +7390,7 @@ let firefoxPkgs = callPackage ../applications/networking/browsers/firefox { inherit (gnome) libIDL; inherit (pythonPackages) pysqlite; + libpng = libpng.override { apngSupport = true; }; }; firefoxWrapper = lowPrio (wrapFirefox { browser = firefoxPkgs.firefox; }); From ffddc1be9f2484aa333f1286f80f19082f8d7dee Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Wed, 26 Jun 2013 14:32:24 +0200 Subject: [PATCH 086/798] eclipse: use latest cairo/gtk Eclipse seems to work fine without this now (after x-updates merge). --- pkgs/top-level/all-packages.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3ee03794796..98604d6e9bb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7149,11 +7149,7 @@ let eaglemode = callPackage ../applications/misc/eaglemode { }; - eclipses = recurseIntoAttrs ( - (callPackage ../applications/editors/eclipse { }).deepOverride { - cairo = cairo_1_12_2; - } - ); + eclipses = recurseIntoAttrs (callPackage ../applications/editors/eclipse { }); ed = callPackage ../applications/editors/ed { }; From 7c24918a5f8b618fa12baae71930eb318acb1ee1 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 26 Jun 2013 05:05:39 +0200 Subject: [PATCH 087/798] python-blivet: Fix path and call to wipefs. First of all, the path to wipefs didn't work at all, and though it is documented, the "-f" flag only works when used as a long option ("--force"). This is probably fixed upstream in util-linux, but using the long-option will stay compatible. Signed-off-by: aszlig --- pkgs/top-level/python-packages.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 45afdf766ef..bdb91f1765a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -467,6 +467,10 @@ pythonPackages = python.modules // rec { }' blivet/pyudev.py sed -i -e 's|"multipath"|"${pkgs.multipath_tools}/sbin/multipath"|' \ blivet/devicelibs/mpath.py blivet/devices.py + sed -i -e '/"wipefs"/ { + s|wipefs|${pkgs.utillinux}/sbin/wipefs| + s/-f/--force/ + }' blivet/formats/__init__.py ''; propagatedBuildInputs = let From e3c4acb3ddc7c5b5065f5f084aa19bb8eb373633 Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 27 Jun 2013 20:04:36 +0200 Subject: [PATCH 088/798] python-nevow: Fix indentation of expression. No functionality change, the expression just got a bit too far to the right :-) Signed-off-by: aszlig --- pkgs/top-level/python-packages.nix | 48 +++++++++++++++--------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bdb91f1765a..2621cc28468 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2744,36 +2744,36 @@ pythonPackages = python.modules // rec { name = "${name}.tar.gz"; }; - propagatedBuildInputs = [ twisted ]; + propagatedBuildInputs = [ twisted ]; - postInstall = "twistd --help > /dev/null"; + postInstall = "twistd --help > /dev/null"; - meta = { - description = "Nevow, a web application construction kit for Python"; + meta = { + description = "Nevow, a web application construction kit for Python"; - longDescription = '' - Nevow - Pronounced as the French "nouveau", or "noo-voh", Nevow - is a web application construction kit written in Python. It is - designed to allow the programmer to express as much of the view - logic as desired in Python, and includes a pure Python XML - expression syntax named stan to facilitate this. However it - also provides rich support for designer-edited templates, using - a very small XML attribute language to provide bi-directional - template manipulation capability. + longDescription = '' + Nevow - Pronounced as the French "nouveau", or "noo-voh", Nevow + is a web application construction kit written in Python. It is + designed to allow the programmer to express as much of the view + logic as desired in Python, and includes a pure Python XML + expression syntax named stan to facilitate this. However it + also provides rich support for designer-edited templates, using + a very small XML attribute language to provide bi-directional + template manipulation capability. - Nevow also includes formless, a declarative syntax for - specifying the types of method parameters and exposing these - methods to the web. Forms can be rendered automatically, and - form posts will be validated and input coerced, rendering error - pages if appropriate. Once a form post has validated - successfully, the method will be called with the coerced values. - ''; + Nevow also includes formless, a declarative syntax for + specifying the types of method parameters and exposing these + methods to the web. Forms can be rendered automatically, and + form posts will be validated and input coerced, rendering error + pages if appropriate. Once a form post has validated + successfully, the method will be called with the coerced values. + ''; - homepage = http://divmod.org/trac/wiki/DivmodNevow; + homepage = http://divmod.org/trac/wiki/DivmodNevow; - license = "BSD-style"; - }; - }); + license = "BSD-style"; + }; + }); nose = buildPythonPackage rec { name = "nose-1.2.1"; From 64d2bbc7e8c773f1d20f2ca3c492d368e553b057 Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 28 Jun 2013 03:29:33 +0200 Subject: [PATCH 089/798] python-blivet: Patch in paths for mount and lsof. This adds the correct store paths for mount, umount and lsof to blivet as these commands are still generic enough to _not_ add them as a dependency. Signed-off-by: aszlig --- pkgs/top-level/python-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2621cc28468..d61916e184a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -471,6 +471,8 @@ pythonPackages = python.modules // rec { s|wipefs|${pkgs.utillinux}/sbin/wipefs| s/-f/--force/ }' blivet/formats/__init__.py + sed -i -e 's|"lsof"|"${pkgs.lsof}/bin/lsof"|' blivet/formats/fs.py + sed -i -r -e 's|"(u?mount)"|"${pkgs.utillinux}/bin/\1"|' blivet/util.py ''; propagatedBuildInputs = let From 082252bc162608440ccb76542e427994b363f615 Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 28 Jun 2013 03:31:11 +0200 Subject: [PATCH 090/798] python-blivet: Fix pvscan to not require lvmetad. The --cache argument to pvscan won't work on NixOS, for specifics about this, please have a look at: http://www.mail-archive.com/pld-cvs-commit@lists.pld-linux.org/msg310821.html Signed-off-by: aszlig --- pkgs/top-level/python-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d61916e184a..3c0eccc5dbf 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -473,6 +473,7 @@ pythonPackages = python.modules // rec { }' blivet/formats/__init__.py sed -i -e 's|"lsof"|"${pkgs.lsof}/bin/lsof"|' blivet/formats/fs.py sed -i -r -e 's|"(u?mount)"|"${pkgs.utillinux}/bin/\1"|' blivet/util.py + sed -i '/pvscan/s/, *"--cache"//' blivet/devicelibs/lvm.py ''; propagatedBuildInputs = let From 08a9a9b020c22dce241a18988efdbace88fc0c06 Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 28 Jun 2013 03:34:55 +0200 Subject: [PATCH 091/798] radeon-juniper: Update to new JUNIPER_rlc.bin. Kinda icky to not have archives available here, but I got an error during VM tests because of an sha256sum mismatch, hence the update. Maybe Hydra has cached this? And yes, I checked twice, it wasn't a broken download - there really *is* a new upstream version available. Signed-off-by: aszlig --- pkgs/os-specific/linux/firmware/radeon-juniper/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/firmware/radeon-juniper/default.nix b/pkgs/os-specific/linux/firmware/radeon-juniper/default.nix index ad277ac8dda..53e0fb235a5 100644 --- a/pkgs/os-specific/linux/firmware/radeon-juniper/default.nix +++ b/pkgs/os-specific/linux/firmware/radeon-juniper/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { }; srcRlc = fetchurl { url = "http://people.freedesktop.org/~agd5f/radeon_ucode/JUNIPER_rlc.bin"; - sha256 = "1y3xr7qc7cvszgw0bh66vzy36pn4m1sj17bzy5dc9kfw01kq3n0y"; + sha256 = "0hglq8ab1f3d81mvcb4aikkfdwh6i4a93ps0f9czq1qz5h0q6wlk"; }; unpackPhase = "true"; From b2973d3b07475bf4d1562bf3c7dcacddff1f41ec Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 28 Jun 2013 04:15:27 +0200 Subject: [PATCH 092/798] python-packages: Add nixpart version 0.1. This version is preliminary because it quite heavily depends on pykickstart (through blivet) and the roadmap is to have a nice NixOS attrset-based specification of partitions. Currently the main purpose for this is in preparation for the Hetzner nixops backend, but we might want to make this part of the standard NixOS installer. Signed-off-by: aszlig --- pkgs/top-level/python-packages.nix | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3c0eccc5dbf..c6fec3ee925 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2778,6 +2778,26 @@ pythonPackages = python.modules // rec { }; }); + nixpart = buildPythonPackage rec { + name = "nixpart-${version}"; + version = "0.1"; + + src = fetchurl { + url = "https://github.com/aszlig/nixpart/archive/v${version}.tar.gz"; + sha256 = "1gyk260qnv14w94f0ljfra4mmigq9i6cx0gy4ppf3fia5wfj2a6j"; + }; + + propagatedBuildInputs = [ blivet ]; + + doCheck = false; + + meta = { + description = "NixOS Anaconda Kickstart helper"; + license = pkgs.lib.licenses.gpl2Plus; + maintainers = [ stdenv.lib.maintainers.aszlig ]; + }; + }; + nose = buildPythonPackage rec { name = "nose-1.2.1"; From b394ffc3ad50142183681efa831ea84f88f29e7d Mon Sep 17 00:00:00 2001 From: Karn Kallio Date: Thu, 27 Jun 2013 18:40:42 -0430 Subject: [PATCH 093/798] racket: fix build broken by new libpng version and advance version to 5.3.5 --- pkgs/development/interpreters/racket/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index 347647fd87e..da3390bb1e1 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -4,12 +4,12 @@ stdenv.mkDerivation rec { pname = "racket"; - version = "5.3.4"; + version = "5.3.5"; name = "${pname}-${version}"; src = fetchurl { url = "http://download.racket-lang.org/installers/${version}/${pname}/${name}-src-unix.tgz"; - sha256 = "0yrdmpdvzf092869y6zjjjxl6j2kypgiv7qrfkv7lj8w01pbh7sd"; + sha256 = "0xrd25d2iskkih08ydcjqnasg84r7g32apvdw7qzlp4xs1xynjwk"; }; # Various racket executables do run-time searches for these. diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 98604d6e9bb..fb3247ff44f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3096,7 +3096,9 @@ let qi = callPackage ../development/compilers/qi { }; - racket = callPackage ../development/interpreters/racket { }; + racket = callPackage ../development/interpreters/racket { + libpng = libpng15; + }; regina = callPackage ../development/interpreters/regina {}; From bf94beff4217db662ed81ac952eebda082fc42ef Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 28 Jun 2013 07:50:20 +0200 Subject: [PATCH 094/798] chromium: Update dev channel to v29.0.1547.0. Build tested and works on my machine. Signed-off-by: aszlig --- pkgs/applications/networking/browsers/chromium/sources.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/sources.nix b/pkgs/applications/networking/browsers/chromium/sources.nix index dce02893a56..952ecf2a6f1 100644 --- a/pkgs/applications/networking/browsers/chromium/sources.nix +++ b/pkgs/applications/networking/browsers/chromium/sources.nix @@ -1,9 +1,9 @@ # This file is autogenerated from update.sh in the same directory. { dev = { - version = "29.0.1541.2"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-29.0.1541.2.tar.xz"; - sha256 = "0i3vp2zrk1sjdhkwdhig08jh0qmzahn96pm0i22r63cp8i9vny1p"; + version = "29.0.1547.0"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-29.0.1547.0.tar.xz"; + sha256 = "0ydinl0zrsm995rcpph4i56335nzhp1fqnlz39lg4vbjsshchh9x"; }; beta = { version = "28.0.1500.52"; From 9404b2cc12c2c5c094f6fde8024cacae4abe2bb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 28 Jun 2013 08:33:09 +0200 Subject: [PATCH 095/798] qt3: fix infinite recursion created by 0b17251c06e --- pkgs/development/libraries/qt-3/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/libraries/qt-3/default.nix b/pkgs/development/libraries/qt-3/default.nix index b3dfc021da9..9b5cb0452d6 100644 --- a/pkgs/development/libraries/qt-3/default.nix +++ b/pkgs/development/libraries/qt-3/default.nix @@ -10,8 +10,6 @@ , x11, xextproto, zlib, libjpeg, libpng, which }: -let libpng = libpng; in - assert xftSupport -> libXft != null; assert xrenderSupport -> xftSupport && libXrender != null; assert xrandrSupport -> libXrandr != null && randrproto != null; From 4278f778b4bbbfe7862a74ae021bc84a68388d2a Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Fri, 28 Jun 2013 21:34:33 +0200 Subject: [PATCH 096/798] Improve error message for option that is not defined and has now default value. --- pkgs/lib/modules.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/lib/modules.nix b/pkgs/lib/modules.nix index ea38010cecc..9dda89b09f0 100644 --- a/pkgs/lib/modules.nix +++ b/pkgs/lib/modules.nix @@ -309,7 +309,7 @@ rec { let opt = option.decl; in opt.apply ( if isNotDefined then - opt.default or (throw "Not defined.") + opt.default or (throw "Option `${addName name}' not defined and does not have a default value.") else opt.merge defs ) ); From baf822a28743816924f71237f9541d70b00a5bf8 Mon Sep 17 00:00:00 2001 From: Benjamin Cahill Date: Fri, 28 Jun 2013 16:35:57 -0500 Subject: [PATCH 097/798] rmlint: Install to /bin, not /usr/bin --- pkgs/tools/misc/rmlint/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/tools/misc/rmlint/default.nix b/pkgs/tools/misc/rmlint/default.nix index a1cf21aa64a..805bcf6b01c 100644 --- a/pkgs/tools/misc/rmlint/default.nix +++ b/pkgs/tools/misc/rmlint/default.nix @@ -8,6 +8,11 @@ stdenv.mkDerivation rec { sha256 = "bea39a5872b39d3596e756f242967bc5bde6febeb996fdcd63fbcf5bfdc75f01"; }; + preConfigure = '' + substituteInPlace Makefile.in \ + --replace "/usr/" "/" + ''; + makeFlags="DESTDIR=$(out)"; meta = { From f3f447ac6f7c126c39098e6e7316663ee9eb92d9 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 28 Jun 2013 20:16:39 -0400 Subject: [PATCH 098/798] ledger3: Update Signed-off-by: Shea Levy --- pkgs/applications/office/ledger/3.0.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/office/ledger/3.0.nix b/pkgs/applications/office/ledger/3.0.nix index d564f2f561e..b51fd6fe41e 100644 --- a/pkgs/applications/office/ledger/3.0.nix +++ b/pkgs/applications/office/ledger/3.0.nix @@ -1,15 +1,15 @@ { stdenv, fetchgit, cmake, boost, gmp, mpfr, libedit, python, texinfo }: let - rev = "2c7ab8be"; + rev = "26d7197"; in stdenv.mkDerivation { - name = "ledger3-2013.04.${rev}"; + name = "ledger3-2013.06.${rev}"; src = fetchgit { - url = "git://github.com/jwiegley/ledger.git"; + url = "https://github.com/ledger/ledger.git"; inherit rev; - sha256 = "1ng5ymzqzbgdrn2ghhr7jvcjv5y7ikhyck5p1yv5j024s17xdyj5"; + sha256 = "02nf4kdrd61q9rf5rrarwmx47y2ya5qix7n82cj9qi9p4v3k3m2g"; }; buildInputs = [ cmake boost gmp mpfr libedit python texinfo ]; From b02b7bd1621d69cd04d2d21b1381af9db2f5dae7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sat, 29 Jun 2013 13:31:17 +0200 Subject: [PATCH 099/798] sqlite: set meta.platforms so that Hydra will build it I'm sure that sqlite works on more platforms than linux, but I cannot verify that myself (I only have linux). So I'll leave it up to the users of other platforms to expand this as needed. --- pkgs/development/libraries/sqlite/3.7.14.nix | 1 + pkgs/development/libraries/sqlite/3.7.16.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/development/libraries/sqlite/3.7.14.nix b/pkgs/development/libraries/sqlite/3.7.14.nix index be3a24c1e4c..50338f98a2c 100644 --- a/pkgs/development/libraries/sqlite/3.7.14.nix +++ b/pkgs/development/libraries/sqlite/3.7.14.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation { meta = { homepage = http://www.sqlite.org/; description = "A self-contained, serverless, zero-configuration, transactional SQL database engine"; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/sqlite/3.7.16.nix b/pkgs/development/libraries/sqlite/3.7.16.nix index 231f4e5d69c..f681e94c6ba 100644 --- a/pkgs/development/libraries/sqlite/3.7.16.nix +++ b/pkgs/development/libraries/sqlite/3.7.16.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation { meta = { homepage = http://www.sqlite.org/; description = "A self-contained, serverless, zero-configuration, transactional SQL database engine"; + platforms = stdenv.lib.platforms.linux; }; } From 748a0f607b126ef1130293072d72f11ee34bff77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 28 Jun 2013 23:47:54 +0200 Subject: [PATCH 100/798] Updating siproxd to 0.8.1, and libosip. --- pkgs/applications/networking/siproxd/cheaders.patch | 13 +++++++++++++ pkgs/applications/networking/siproxd/default.nix | 10 ++++++---- pkgs/development/libraries/osip/default.nix | 4 ++-- 3 files changed, 21 insertions(+), 6 deletions(-) create mode 100644 pkgs/applications/networking/siproxd/cheaders.patch diff --git a/pkgs/applications/networking/siproxd/cheaders.patch b/pkgs/applications/networking/siproxd/cheaders.patch new file mode 100644 index 00000000000..53c4813cc33 --- /dev/null +++ b/pkgs/applications/networking/siproxd/cheaders.patch @@ -0,0 +1,13 @@ +diff --git a/src/dejitter.c b/src/dejitter.c +index 1904ab3..cb3624d 100644 +--- a/src/dejitter.c ++++ b/src/dejitter.c +@@ -22,6 +22,8 @@ + + #include + ++#include ++#include + #include + #include + #include diff --git a/pkgs/applications/networking/siproxd/default.nix b/pkgs/applications/networking/siproxd/default.nix index 3395ba6947a..69ebab78f94 100644 --- a/pkgs/applications/networking/siproxd/default.nix +++ b/pkgs/applications/networking/siproxd/default.nix @@ -1,13 +1,15 @@ { stdenv, fetchurl, libosip }: -stdenv.mkDerivation { - name = "siproxd-0.8.0"; +stdenv.mkDerivation rec { + name = "siproxd-0.8.1"; src = fetchurl { - url = mirror://sourceforge/siproxd/siproxd-0.8.0.tar.gz; - sha256 = "0hl51z33cf68ki707jkrrjjc3a5vpaf49gbrsz3g4rfxypdhc0qs"; + url = "mirror://sourceforge/siproxd/${name}.tar.gz"; + sha256 = "1bcxl0h5nc28m8lcdhpbl5yc93w98xm53mfzrf04knsvmx7z0bfz"; }; + patches = [ ./cheaders.patch ]; + buildInputs = [ libosip ]; meta = { diff --git a/pkgs/development/libraries/osip/default.nix b/pkgs/development/libraries/osip/default.nix index 2c1b148251c..3ec3dac221f 100644 --- a/pkgs/development/libraries/osip/default.nix +++ b/pkgs/development/libraries/osip/default.nix @@ -1,9 +1,9 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - version = "3.6.0"; + version = "4.0.0"; src = fetchurl { url = "mirror://gnu/osip/libosip2-${version}.tar.gz"; - sha256 = "1kcndqvsyxgbhkksgydvvjw15znfq6jiznvw058d21h5fq68p8f9"; + sha256 = "05dhj4s5k4qmhn2amca070xgh1gkcl42n040fhwsn3vm86524bdv"; }; name = "libosip2-${version}"; From a6c1edf947ed9f7a3af49e11c3b1f774c7c6530b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sat, 29 Jun 2013 10:19:26 +0200 Subject: [PATCH 101/798] Updating pjsip to 2.1 --- pkgs/applications/networking/pjsip/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/pjsip/default.nix b/pkgs/applications/networking/pjsip/default.nix index 2dc909ca915..558394199f4 100644 --- a/pkgs/applications/networking/pjsip/default.nix +++ b/pkgs/applications/networking/pjsip/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, openssl, libsamplerate}: stdenv.mkDerivation rec { - name = "pjsip-1.8.10"; + name = "pjsip-2.1"; src = fetchurl { - url = http://www.pjsip.org/release/1.8.10/pjproject-1.8.10.tar.bz2; - sha256 = "1v2mgbgzn7d3msb406jmg69ms97a0rqg58asykx71dmjipbaiqc0"; + url = http://www.pjsip.org/release/2.1/pjproject-2.1.tar.bz2; + md5 = "310eb63638dac93095f6a1fc8ee1f578"; }; buildInputs = [ openssl libsamplerate ]; From 7c74edc9bca4c19dc625b3900e82a8e4bb19a489 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sat, 29 Jun 2013 15:30:05 +0200 Subject: [PATCH 102/798] sipwitch: update to 1.6.1 to fix build --- pkgs/development/libraries/exosip/default.nix | 4 ++-- pkgs/servers/sip/sipwitch/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/exosip/default.nix b/pkgs/development/libraries/exosip/default.nix index d850618ecdf..2a1aea6df32 100644 --- a/pkgs/development/libraries/exosip/default.nix +++ b/pkgs/development/libraries/exosip/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, libosip, openssl, pkgconfig }: stdenv.mkDerivation rec { - version = "3.6.0"; + version = "4.0.0"; src = fetchurl { url = "http://download.savannah.gnu.org/releases/exosip/libeXosip2-${version}.tar.gz"; - sha256 = "0r1mj8x5991bgwf03bx1ajn5kbbmw1136jabw2pn7dls9h41mnli"; + sha256 = "1rdjr3x7s992w004cqf4xji1522an9rpzsr9wvyhp685khmahrsj"; }; name = "libexosip2-${version}"; diff --git a/pkgs/servers/sip/sipwitch/default.nix b/pkgs/servers/sip/sipwitch/default.nix index 097dde325f1..90e71f5e47a 100644 --- a/pkgs/servers/sip/sipwitch/default.nix +++ b/pkgs/servers/sip/sipwitch/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, pkgconfig, ucommon, libosip, libexosip, gnutls, zlib }: stdenv.mkDerivation rec { - name = "sipwitch-1.2.4"; + name = "sipwitch-1.6.1"; src = fetchurl { url = "mirror://gnu/sipwitch/${name}.tar.gz"; - sha256 = "1c826832xi9p85l7c9va33xx8hx01m3jq49s0d1xl4c8kvri7bsj"; + sha256 = "1sa4fbv8filzcxqx2viyixsq4pwgvkidn6l6g3k62gl8bvdfk7p9"; }; buildInputs = [ pkgconfig ucommon libosip libexosip gnutls zlib ]; From 169c8ce3f700482802de5606e72911ba9446e483 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sat, 29 Jun 2013 16:50:56 +0200 Subject: [PATCH 103/798] Linphone 3.6.1 Lots of updates and new/old libs to get the latest linphone It segfaults on running. --- .../instant-messengers/linphone/default.nix | 18 ++++++++++-------- pkgs/development/libraries/exosip/3.x.nix | 17 +++++++++++++++++ .../libraries/libzrtpcpp/default.nix | 8 +++++--- .../libraries/mediastreamer/default.nix | 15 +++++++-------- pkgs/development/libraries/ortp/default.nix | 10 +++++++--- pkgs/development/libraries/osip/3.nix | 17 +++++++++++++++++ pkgs/development/libraries/srtp/default.nix | 6 +++--- pkgs/development/libraries/srtp/linphone.nix | 15 +++++++++++++++ pkgs/top-level/all-packages.nix | 17 +++++++++++++++-- 9 files changed, 96 insertions(+), 27 deletions(-) create mode 100644 pkgs/development/libraries/exosip/3.x.nix create mode 100644 pkgs/development/libraries/osip/3.nix create mode 100644 pkgs/development/libraries/srtp/linphone.nix diff --git a/pkgs/applications/networking/instant-messengers/linphone/default.nix b/pkgs/applications/networking/instant-messengers/linphone/default.nix index a4a32327d0c..c3af0ad0e34 100644 --- a/pkgs/applications/networking/instant-messengers/linphone/default.nix +++ b/pkgs/applications/networking/instant-messengers/linphone/default.nix @@ -1,21 +1,23 @@ { stdenv, fetchurl, intltool, pkgconfig, gtk, libglade, libosip, libexosip -, speex, readline, mediastreamer, libsoup }: +, speex, readline, mediastreamer, libsoup, udev, libnotify }: stdenv.mkDerivation rec { - name = "linphone-3.5.2"; + name = "linphone-3.6.1"; src = fetchurl { - url = "mirror://savannah/linphone/3.5.x/sources/${name}.tar.gz"; - sha256 = "0830iam7kgqphgk3q6qx93kp5wrf0gnm5air82jamy7377jxadys"; + url = "mirror://savannah/linphone/3.6.x/sources/${name}.tar.gz"; + sha256 = "186jm4nd4ggb0j8cs8wnpm4sy9cr7chq0c6kx2yc6y4k7qi83fh5"; }; - patches = [ ./fix-deprecated.patch ]; - - buildInputs = [ gtk libglade libosip libexosip readline mediastreamer speex libsoup ]; + buildInputs = [ gtk libglade libosip libexosip readline mediastreamer speex libsoup udev + libnotify ]; nativeBuildInputs = [ intltool pkgconfig ]; - preConfigure = "rm -r mediastreamer2 oRTP"; + preConfigure = '' + rm -r mediastreamer2 oRTP + sed -i s,/bin/echo,echo, coreapi/Makefile* + ''; configureFlags = "--enable-external-ortp --enable-external-mediastreamer"; diff --git a/pkgs/development/libraries/exosip/3.x.nix b/pkgs/development/libraries/exosip/3.x.nix new file mode 100644 index 00000000000..d850618ecdf --- /dev/null +++ b/pkgs/development/libraries/exosip/3.x.nix @@ -0,0 +1,17 @@ +{stdenv, fetchurl, libosip, openssl, pkgconfig }: + +stdenv.mkDerivation rec { + version = "3.6.0"; + src = fetchurl { + url = "http://download.savannah.gnu.org/releases/exosip/libeXosip2-${version}.tar.gz"; + sha256 = "0r1mj8x5991bgwf03bx1ajn5kbbmw1136jabw2pn7dls9h41mnli"; + }; + name = "libexosip2-${version}"; + + buildInputs = [ libosip openssl pkgconfig ]; + + meta = { + license = "GPLv2+"; + description = "Library that hides the complexity of using the SIP protocol"; + }; +} diff --git a/pkgs/development/libraries/libzrtpcpp/default.nix b/pkgs/development/libraries/libzrtpcpp/default.nix index 02741bc6fa1..e6c4cafcd55 100644 --- a/pkgs/development/libraries/libzrtpcpp/default.nix +++ b/pkgs/development/libraries/libzrtpcpp/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, openssl, pkgconfig, ccrtp }: stdenv.mkDerivation rec { - name = "libzrtpcpp-2.0.0"; + name = "libzrtpcpp-2.3.3"; src = fetchurl { url = "mirror://gnu/ccrtp/${name}.tar.gz"; - sha256 = "05yw8n5xpj0jxkvzgsvn3xkxirpypc1japy9k1jqs9301fgb1a3i"; + sha256 = "1p8i3qb4j1r64r7miva8hamaszk42kncpy1x5xlq1l0465h01rvg"; }; # We disallow 'lib64', or pkgconfig will not find it. @@ -13,7 +13,9 @@ stdenv.mkDerivation rec { sed -i s/lib64/lib/ CMakeLists.txt ''; - buildInputs = [ cmake openssl pkgconfig ccrtp ]; + nativeBuildInputs = [ cmake pkgconfig ]; + + propagatedBuildInputs = [ openssl ccrtp ]; meta = { description = "GNU RTP stack for the zrtp protocol developed by Phil Zimmermann"; diff --git a/pkgs/development/libraries/mediastreamer/default.nix b/pkgs/development/libraries/mediastreamer/default.nix index 4aa78570b2f..3b1fd9faa6b 100644 --- a/pkgs/development/libraries/mediastreamer/default.nix +++ b/pkgs/development/libraries/mediastreamer/default.nix @@ -1,21 +1,20 @@ -{ stdenv, fetchurl, pkgconfig, alsaLib, ffmpeg, speex, ortp, pulseaudio, xorg, - libv4l, libtheora, intltool, libvpx, gsm }: +{ stdenv, fetchurl, pkgconfig, alsaLib, ffmpeg, speex, ortp, pulseaudio, +libv4l, libtheora, intltool, libvpx, gsm, mesa, libX11, libXv, libXext, +glew, libopus, libupnp, vim }: stdenv.mkDerivation rec { - name = "mediastreamer-2.8.2"; + name = "mediastreamer-2.9.0"; src = fetchurl { url = "mirror://savannah/linphone/mediastreamer/${name}.tar.gz"; - sha256 = "0csg9a4mwfw5j475q9d5klhy82jnpcqfrlbvw81nxnqki40bnbm6"; + sha256 = "1mdcaqkcdwzlj7hy3bz0ipkrrqiw1cgy01in8f24rfra9i2bjif2"; }; # TODO: make it load plugins from *_PLUGIN_PATH nativeBuildInputs = [pkgconfig intltool]; - propagatedBuildInputs = [alsaLib ffmpeg speex ortp pulseaudio xorg.libX11 - xorg.libXv xorg.libXext libv4l libtheora libvpx gsm ]; - -#patches = [ ./h264.patch ./plugins.patch ]; + propagatedBuildInputs = [ alsaLib ffmpeg speex ortp pulseaudio libX11 + libXv libXext libv4l libtheora libvpx gsm mesa glew libopus libupnp vim ]; configureFlags = "--enable-external-ortp"; } diff --git a/pkgs/development/libraries/ortp/default.nix b/pkgs/development/libraries/ortp/default.nix index 255d9198105..ff7536de403 100644 --- a/pkgs/development/libraries/ortp/default.nix +++ b/pkgs/development/libraries/ortp/default.nix @@ -1,13 +1,17 @@ -{stdenv, fetchurl}: +{stdenv, fetchurl, srtp, libzrtpcpp, pkgconfig }: stdenv.mkDerivation rec { - name = "ortp-0.18.0"; + name = "ortp-0.22.0"; src = fetchurl { url = "mirror://savannah/linphone/ortp/sources/${name}.tar.gz"; - sha256 = "1cgx9xid0abk3cad3xjdvx7p9whinlhrviphyrd9zkhhx7ddkih2"; + sha256 = "02rdm6ymgblbx8fnjfvivkl4qkgbdizrf35fyb0vln9m7jdy4dvf"; }; + configureFlags = "--enable-zrtp"; + + propagatedBuildInputs = [ srtp libzrtpcpp pkgconfig ]; + meta = { description = "A Real-Time Transport Protocol (RFC3550) stack"; homepage = http://www.linphone.org/index.php/eng/code_review/ortp; diff --git a/pkgs/development/libraries/osip/3.nix b/pkgs/development/libraries/osip/3.nix new file mode 100644 index 00000000000..2c1b148251c --- /dev/null +++ b/pkgs/development/libraries/osip/3.nix @@ -0,0 +1,17 @@ +{stdenv, fetchurl}: +stdenv.mkDerivation rec { + version = "3.6.0"; + src = fetchurl { + url = "mirror://gnu/osip/libosip2-${version}.tar.gz"; + sha256 = "1kcndqvsyxgbhkksgydvvjw15znfq6jiznvw058d21h5fq68p8f9"; + }; + name = "libosip2-${version}"; + + meta = { + license = "LGPLv2.1+"; + homepage = http://www.gnu.org/software/osip/; + description = "The GNU oSIP library, an implementation of the Session Initiation Protocol (SIP)"; + maintainers = with stdenv.lib.maintainers; [ raskin ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/development/libraries/srtp/default.nix b/pkgs/development/libraries/srtp/default.nix index 1b8b654ca80..ee264a4e956 100644 --- a/pkgs/development/libraries/srtp/default.nix +++ b/pkgs/development/libraries/srtp/default.nix @@ -11,10 +11,10 @@ let (builtins.attrNames (builtins.removeAttrs x helperArgNames)); sourceInfo = rec { baseName="srtp"; - version="1.4.2"; + version="1.4.4"; name="${baseName}-${version}"; - url="http://srtp.sourceforge.net/${name}.tgz"; - hash="1497mcxharnhiccjhny30g4wlv28ckdxhj14jrwvdnnvhl80jf43"; + url="mirror://sourceforge/${name}.tgz"; + hash="057k191hx7sf84wdvc8wr1nk4whhrvbg1vv3r4nyswjir6qwphnr"; }; in rec { diff --git a/pkgs/development/libraries/srtp/linphone.nix b/pkgs/development/libraries/srtp/linphone.nix new file mode 100644 index 00000000000..9108be5e30c --- /dev/null +++ b/pkgs/development/libraries/srtp/linphone.nix @@ -0,0 +1,15 @@ +{ stdenv, fetchgit, automake, autoconf, libtool }: + +stdenv.mkDerivation { + name = "srtp-linphone-git-20130530-1c9bd9065"; + + src = fetchgit { + url = git://git.linphone.org/srtp.git; + rev = "1c9bd9065"; + sha256 = "0r4wbrih8bggs69fnfmzm17z1pp1zp8x9qwcckcq6wc54b16d9g3"; + }; + + preConfigure = "autoreconf -vfi"; + + buildInputs = [ automake autoconf libtool ]; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2962a24db31..975b43bdf6b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4498,6 +4498,10 @@ let libexosip = callPackage ../development/libraries/exosip {}; + libexosip_3 = callPackage ../development/libraries/exosip/3.x.nix { + libosip = libosip_3; + }; + libextractor = callPackage ../development/libraries/libextractor { libmpeg2 = mpeg2dec; }; @@ -4685,6 +4689,8 @@ let libosip = callPackage ../development/libraries/osip {}; + libosip_3 = callPackage ../development/libraries/osip/3.nix {}; + libotr = callPackage ../development/libraries/libotr { }; libotr_3_2 = callPackage ../development/libraries/libotr/3.2.nix { }; @@ -4879,7 +4885,9 @@ let mdds = callPackage ../development/libraries/mdds { }; # failed to build - mediastreamer = callPackage ../development/libraries/mediastreamer { }; + mediastreamer = callPackage ../development/libraries/mediastreamer { + ffmpeg = ffmpeg_1; + }; mesaSupported = lib.elem system lib.platforms.mesaPlatforms; @@ -5049,7 +5057,9 @@ let }; }; - ortp = callPackage ../development/libraries/ortp { }; + ortp = callPackage ../development/libraries/ortp { + srtp = srtp_linphone; + }; p11_kit = callPackage ../development/libraries/p11-kit { }; @@ -5278,6 +5288,8 @@ let srtp = callPackage ../development/libraries/srtp {}; + srtp_linphone = callPackage ../development/libraries/srtp/linphone.nix { }; + sqlite_3_7_16 = lowPrio (callPackage ../development/libraries/sqlite/3.7.16.nix { readline = null; ncurses = null; @@ -7771,6 +7783,7 @@ let linphone = callPackage ../applications/networking/instant-messengers/linphone { inherit (gnome) libglade; + libexosip = libexosip_3; }; linuxsampler = callPackage ../applications/audio/linuxsampler { }; From e20244fcf7835e681e1e8720b8b0d198e6827c1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sat, 29 Jun 2013 16:55:35 +0200 Subject: [PATCH 104/798] Fixing linphone crossed lib versions on libosip. --- pkgs/top-level/all-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 975b43bdf6b..2221d06cad5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7781,9 +7781,10 @@ let links2 = callPackage ../applications/networking/browsers/links2 { }; - linphone = callPackage ../applications/networking/instant-messengers/linphone { + linphone = callPackage ../applications/networking/instant-messengers/linphone rec { inherit (gnome) libglade; libexosip = libexosip_3; + libosip = libosip_3; }; linuxsampler = callPackage ../applications/audio/linuxsampler { }; From 18ddfda81a74555757295e9c87b2823b21bb34a8 Mon Sep 17 00:00:00 2001 From: Domen Kozar Date: Sat, 29 Jun 2013 18:30:22 +0200 Subject: [PATCH 105/798] fix rmlint --- pkgs/tools/misc/rmlint/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/rmlint/default.nix b/pkgs/tools/misc/rmlint/default.nix index a1cf21aa64a..3e69f160083 100644 --- a/pkgs/tools/misc/rmlint/default.nix +++ b/pkgs/tools/misc/rmlint/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "bea39a5872b39d3596e756f242967bc5bde6febeb996fdcd63fbcf5bfdc75f01"; }; - makeFlags="DESTDIR=$(out)"; + makeFlags="DESTDIR=$(out) INSTALLPATH=$(out)/bin/"; meta = { description = "A tool to remove duplicates and other lint"; From efa4aac21e45db4b965f7aa84e3cf9827abac10a Mon Sep 17 00:00:00 2001 From: Domen Kozar Date: Sat, 29 Jun 2013 18:46:37 +0200 Subject: [PATCH 106/798] dd-agent: ab14fde6f9 -> 3.8.0 --- pkgs/tools/networking/dd-agent/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/networking/dd-agent/default.nix b/pkgs/tools/networking/dd-agent/default.nix index e83ad7933f1..ab0ba37daac 100644 --- a/pkgs/tools/networking/dd-agent/default.nix +++ b/pkgs/tools/networking/dd-agent/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchgit, python, sysstat }: +{ stdenv, fetchurl, python, sysstat, unzip }: stdenv.mkDerivation rec { - name = "dd-agent-ab14fde6f9"; + version = "3.8.0"; + name = "dd-agent-${version}"; - src = fetchgit { - url = git://github.com/DataDog/dd-agent.git; - rev = "ab14fde6f9b9f6cb3544f643cece97ef18a0d770"; - sha256 = "2615a2f122ac97363eba8973dfc6c2ce81cb61a26eb61c2988faad2abd05efc5"; + src = fetchurl { + url = "https://github.com/DataDog/dd-agent/archive/${version}.zip"; + sha256 = "1mh22rbja07gc7ydn357hlij0dl2rygkqsya9ckynsvmkkzn2gyx"; }; - buildInputs = [ python ]; + buildInputs = [ python unzip ]; postUnpack = "export sourceRoot=$sourceRoot/packaging"; From 175eb450cddae6a2471b657f3bb900f8511db578 Mon Sep 17 00:00:00 2001 From: Domen Kozar Date: Sat, 29 Jun 2013 19:12:11 +0200 Subject: [PATCH 107/798] Revert "fix rmlint" This reverts commit 18ddfda81a74555757295e9c87b2823b21bb34a8. --- pkgs/tools/misc/rmlint/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/rmlint/default.nix b/pkgs/tools/misc/rmlint/default.nix index 3e69f160083..a1cf21aa64a 100644 --- a/pkgs/tools/misc/rmlint/default.nix +++ b/pkgs/tools/misc/rmlint/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "bea39a5872b39d3596e756f242967bc5bde6febeb996fdcd63fbcf5bfdc75f01"; }; - makeFlags="DESTDIR=$(out) INSTALLPATH=$(out)/bin/"; + makeFlags="DESTDIR=$(out)"; meta = { description = "A tool to remove duplicates and other lint"; From 33717c46361221f03edabca3e2606f11e944ed71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sat, 29 Jun 2013 20:07:21 +0200 Subject: [PATCH 108/798] python-demjson: new package demjson is a Python JSON module that reads, writes and validates JSON-encoded data; compliant with RFC 4627. It also includes a lint checker, jsonlint, which can be used to validate JSON documents for strict conformance to the RFC specification; as well as to reformat them, either by re-indenting or for minimal/canonical JSON output. Homepage: http://deron.meranda.us/python/demjson/ --- pkgs/top-level/python-packages.nix | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c6fec3ee925..00bcfcfd33c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -997,6 +997,30 @@ pythonPackages = python.modules // rec { }; + demjson = buildPythonPackage rec { + name = "demjson-1.6"; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/d/demjson/${name}.tar.gz"; + sha256 = "0abf7wqqq7rk1sycy47ayn5p93yy7gjq50cb2z69wmik1qqrr60x"; + }; + + doCheck = false; # there are no tests + + preFixup = '' + mkdir -p "$out/bin" + cp jsonlint "$out/bin/" + ''; + + meta = { + description = "Encoder/decoder and lint/validator for JSON (JavaScript Object Notation)"; + homepage = http://deron.meranda.us/python/demjson/; + maintainers = with stdenv.lib.maintainers; [ bjornfor ]; + platforms = stdenv.lib.platforms.all; + }; + }; + + evdev = buildPythonPackage rec { version = "0.3.2"; name = "evdev-${version}"; From ae1c5a58440baecfbf3157ba13e9a49322fcbf9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sat, 29 Jun 2013 20:32:04 +0200 Subject: [PATCH 109/798] python-demjson: add missing license (LGPLv3 or later) --- pkgs/top-level/python-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 00bcfcfd33c..8993e467632 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1015,6 +1015,7 @@ pythonPackages = python.modules // rec { meta = { description = "Encoder/decoder and lint/validator for JSON (JavaScript Object Notation)"; homepage = http://deron.meranda.us/python/demjson/; + license = stdenv.lib.licenses.lgpl3Plus; maintainers = with stdenv.lib.maintainers; [ bjornfor ]; platforms = stdenv.lib.platforms.all; }; From f01588653c4781e0fbfa64cb00e3e3244257b474 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Sat, 29 Jun 2013 20:50:44 +0200 Subject: [PATCH 110/798] Update get_iplayer to 2.83, and fix the package. --- pkgs/applications/misc/get_iplayer/default.nix | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/misc/get_iplayer/default.nix b/pkgs/applications/misc/get_iplayer/default.nix index 0e222366729..308b181fe88 100644 --- a/pkgs/applications/misc/get_iplayer/default.nix +++ b/pkgs/applications/misc/get_iplayer/default.nix @@ -1,19 +1,23 @@ -{stdenv, fetchurl, flvstreamer, ffmpeg, makeWrapper, perl}: - -stdenv.mkDerivation { - name = "get_iplayer-2.80"; +{stdenv, fetchurl, flvstreamer, ffmpeg, makeWrapper, perl, buildPerlPackage, perlPackages, vlc, rtmpdump}: +buildPerlPackage { + name = "get_iplayer-2.83"; buildInputs = [makeWrapper perl]; + propagatedBuildInputs = with perlPackages; [HTMLParser HTTPCookies LWP]; + + preConfigure = "touch Makefile.PL"; + doCheck = false; installPhase = '' mkdir -p $out/bin cp get_iplayer $out/bin - wrapProgram $out/bin/get_iplayer --suffix PATH ${ffmpeg}/bin:${flvstreamer}/bin + sed -i 's|^update_script|#update_script|' $out/bin/get_iplayer + wrapProgram $out/bin/get_iplayer --suffix PATH : ${ffmpeg}/bin:${flvstreamer}/bin:${vlc}/bin:${rtmpdump}/bin ''; src = fetchurl { - url = ftp://ftp.infradead.org/pub/get_iplayer/get_iplayer-2.80.tar.gz; - sha256 = "1hnadryyzca3bv1hfk2q3np9ihwvyxa3prwcrply6ywy4vnayjf8"; + url = ftp://ftp.infradead.org/pub/get_iplayer/get_iplayer-2.83.tar.gz; + sha256 = "169zji0rr3z5ng6r4cyzvs89779m4iklln9gsqpryvm81ipalfga"; }; } From 1ebaebbd93b4adf2b05779622e27adc507f296f2 Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Sun, 30 Jun 2013 02:51:20 +0200 Subject: [PATCH 111/798] php-xdebug: update to latest version --- pkgs/development/interpreters/php-xdebug/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/interpreters/php-xdebug/default.nix b/pkgs/development/interpreters/php-xdebug/default.nix index 5a242f3c85a..fe7bbb869da 100644 --- a/pkgs/development/interpreters/php-xdebug/default.nix +++ b/pkgs/development/interpreters/php-xdebug/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl, php, autoconf, automake }: -stdenv.mkDerivation { - name = "php-xdebug-2.0.5"; +stdenv.mkDerivation rec { + version = "2.2.3"; + name = "php-xdebug-${version}"; src = fetchurl { - url = "http://xdebug.org/files/xdebug-2.0.5.tgz"; - sha256 = "1cmq7c36gj8n41mfq1wba5rij8j77yqhydpcsbcysk1zchg68f26"; + url = "http://xdebug.org/files/xdebug-2.2.3.tgz"; + sha256 = "076px4ax3qcqr3mmhi9jjkfhn7pcymrpda4hzy6kgn3flhnqfldk"; }; buildInputs = [ php autoconf automake ]; From 6d42b3b1dc3b857748b078b971feaed1eda6131d Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 30 Jun 2013 12:09:42 +0400 Subject: [PATCH 112/798] srtp: fix URL --- pkgs/development/libraries/srtp/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/srtp/default.nix b/pkgs/development/libraries/srtp/default.nix index ee264a4e956..c6cf56e59d6 100644 --- a/pkgs/development/libraries/srtp/default.nix +++ b/pkgs/development/libraries/srtp/default.nix @@ -13,7 +13,7 @@ let baseName="srtp"; version="1.4.4"; name="${baseName}-${version}"; - url="mirror://sourceforge/${name}.tgz"; + url="mirror://sourceforge/${baseName}/${name}.tgz"; hash="057k191hx7sf84wdvc8wr1nk4whhrvbg1vv3r4nyswjir6qwphnr"; }; in From cffec59612492877038871630e781234697ea492 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 30 Jun 2013 10:47:44 +0200 Subject: [PATCH 113/798] cairo: no openGL on darwin by default (see #692) --- 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 2221d06cad5..cc64901dbb5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4184,7 +4184,7 @@ let pixman = callPackage ../development/libraries/pixman { }; cairo = callPackage ../development/libraries/cairo { - glSupport = lib.elem system lib.platforms.mesaPlatforms; + glSupport = config.cairo.gl or stdenv.isLinux; }; cairo_1_12_2 = callPackage ../development/libraries/cairo/1.12.2.nix { }; cairomm = callPackage ../development/libraries/cairomm { }; From 0d8025c612d3bfe1c52d0fd35b455693da3ec006 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 30 Jun 2013 20:55:21 -0400 Subject: [PATCH 114/798] Linux 3.10 Signed-off-by: Shea Levy --- pkgs/os-specific/linux/kernel/linux-3.10.nix | 281 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 15 +- pkgs/top-level/platforms.nix | 6 +- 3 files changed, 298 insertions(+), 4 deletions(-) create mode 100644 pkgs/os-specific/linux/kernel/linux-3.10.nix diff --git a/pkgs/os-specific/linux/kernel/linux-3.10.nix b/pkgs/os-specific/linux/kernel/linux-3.10.nix new file mode 100644 index 00000000000..5e991d750ac --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-3.10.nix @@ -0,0 +1,281 @@ +args @ { stdenv, fetchurl, extraConfig ? "" +, perl, mktemp, module_init_tools, bc +, ... }: + +let + configWithPlatform = kernelPlatform : + '' + # Power management and debugging for powertop. + DEBUG_KERNEL y + PM_ADVANCED_DEBUG y + PM_RUNTIME y + TIMER_STATS y + BACKTRACE_SELF_TEST n + CPU_NOTIFIER_ERROR_INJECT? n + DEBUG_DEVRES n + DEBUG_NX_TEST n + DEBUG_STACK_USAGE n + DEBUG_STACKOVERFLOW n + RCU_TORTURE_TEST n + SCHEDSTATS n + + # Support drivers that need external firmware. + STANDALONE n + + # Make /proc/config.gz available. + IKCONFIG_PROC y + + # Optimize with -O2, not -Os. + CC_OPTIMIZE_FOR_SIZE n + + # Enable the kernel's built-in memory tester. + MEMTEST y + + # Include the CFQ I/O scheduler in the kernel, rather than as a + # module, so that the initrd gets a good I/O scheduler. + IOSCHED_CFQ y + BLK_CGROUP y # required by CFQ + + # Enable NUMA. + NUMA? y + + # Disable some expensive (?) features. + FTRACE n + KPROBES n + PM_TRACE_RTC n + + # Enable various subsystems. + ACCESSIBILITY y # Accessibility support + AUXDISPLAY y # Auxiliary Display support + DONGLE y # Serial dongle support + HIPPI? y + MTD_COMPLEX_MAPPINGS y # needed for many devices + SCSI_LOWLEVEL y # enable lots of SCSI devices + SCSI_LOWLEVEL_PCMCIA y + SPI y # needed for many devices + SPI_MASTER y + WAN y + + # Networking options. + IP_PNP n + IPV6_PRIVACY y + NETFILTER_ADVANCED y + IP_VS_PROTO_TCP y + IP_VS_PROTO_UDP y + IP_VS_PROTO_ESP y + IP_VS_PROTO_AH y + IP_DCCP_CCID3 n # experimental + CLS_U32_PERF y + CLS_U32_MARK y + + # Wireless networking. + IPW2100_MONITOR y # support promiscuous mode + IPW2200_MONITOR? y # support promiscuous mode + HOSTAP_FIRMWARE y # Support downloading firmware images with Host AP driver + HOSTAP_FIRMWARE_NVRAM y + ATH9K_PCI y # Detect Atheros AR9xxx cards on PCI(e) bus + ATH9K_AHB y # Ditto, AHB bus + B43_PHY_HT y + BCMA_HOST_PCI y + CFG80211_WEXT y # Without it, ipw2200 drivers don't build + + # Some settings to make sure that fbcondecor works - in particular, + # disable tileblitting and the drivers that need it. + + # Enable various FB devices. + FB y + FB_EFI y + FB_NVIDIA_I2C y # Enable DDC Support + FB_RIVA_I2C y + FB_ATY_CT y # Mach64 CT/VT/GT/LT (incl. 3D RAGE) support + FB_ATY_GX y # Mach64 GX support + FB_SAVAGE_I2C y + FB_SAVAGE_ACCEL y + FB_SIS_300 y + FB_SIS_315 y + FB_3DFX_ACCEL y + FB_GEODE y + + # Video configuration + # Enable KMS for devices whose X.org driver supports it. + DRM_I915_KMS y + DRM_RADEON_KMS? y + # Hybrid graphics support + VGA_SWITCHEROO y + + # Sound. + SND_AC97_POWER_SAVE y # AC97 Power-Saving Mode + SND_HDA_INPUT_BEEP y # Support digital beep via input layer + SND_USB_CAIAQ_INPUT y + PSS_MIXER y # Enable PSS mixer (Beethoven ADSP-16 and other compatible) + + # USB serial devices. + USB_SERIAL_GENERIC y # USB Generic Serial Driver + USB_SERIAL_KEYSPAN_MPR y # include firmware for various USB serial devices + USB_SERIAL_KEYSPAN_USA28 y + USB_SERIAL_KEYSPAN_USA28X y + USB_SERIAL_KEYSPAN_USA28XA y + USB_SERIAL_KEYSPAN_USA28XB y + USB_SERIAL_KEYSPAN_USA19 y + USB_SERIAL_KEYSPAN_USA18X y + USB_SERIAL_KEYSPAN_USA19W y + USB_SERIAL_KEYSPAN_USA19QW y + USB_SERIAL_KEYSPAN_USA19QI y + USB_SERIAL_KEYSPAN_USA49W y + USB_SERIAL_KEYSPAN_USA49WLC y + + # Filesystem options - in particular, enable extended attributes and + # ACLs for all filesystems that support them. + EXT2_FS_XATTR y # Ext2 extended attributes + EXT2_FS_POSIX_ACL y # Ext2 POSIX Access Control Lists + EXT2_FS_SECURITY y # Ext2 Security Labels + EXT2_FS_XIP y # Ext2 execute in place support + EXT4_FS_POSIX_ACL y + EXT4_FS_SECURITY y + REISERFS_FS_XATTR y + REISERFS_FS_POSIX_ACL y + REISERFS_FS_SECURITY y + JFS_POSIX_ACL y + JFS_SECURITY y + XFS_QUOTA y + XFS_POSIX_ACL y + XFS_RT y # XFS Realtime subvolume support + OCFS2_DEBUG_MASKLOG n + BTRFS_FS_POSIX_ACL y + UBIFS_FS_XATTR? y + UBIFS_FS_ADVANCED_COMPR y + NFSD_V2_ACL y + NFSD_V3 y + NFSD_V3_ACL y + NFSD_V4 y + NFS_FSCACHE y + CIFS_XATTR y + CIFS_POSIX y + CIFS_FSCACHE y + + # Security related features. + STRICT_DEVMEM y # Filter access to /dev/mem + SECURITY_SELINUX_BOOTPARAM_VALUE 0 # disable SELinux by default + + # Misc. options. + 8139TOO_8129 y + 8139TOO_PIO n # PIO is slower + AIC79XX_DEBUG_ENABLE n + AIC7XXX_DEBUG_ENABLE n + AIC94XX_DEBUG n + AUDIT_LOGINUID_IMMUTABLE y + B43_PCMCIA y + BLK_DEV_CMD640_ENHANCED y # CMD640 enhanced support + BLK_DEV_IDEACPI y # IDE ACPI support + BLK_DEV_INTEGRITY y + BSD_PROCESS_ACCT_V3 y + BT_HCIUART_BCSP y + BT_HCIUART_H4 y # UART (H4) protocol support + BT_HCIUART_LL y + BT_RFCOMM m + BT_RFCOMM_TTY y # RFCOMM TTY support + CRASH_DUMP n + DMAR? n # experimental + DVB_DYNAMIC_MINORS? y # we use udev + EFI_STUB y # EFI bootloader in the bzImage itself + FHANDLE y # used by systemd + FUSION y # Fusion MPT device support + IDE_GD_ATAPI y # ATAPI floppy support + IRDA_ULTRA y # Ultra (connectionless) protocol + JOYSTICK_IFORCE_232 y # I-Force Serial joysticks and wheels + JOYSTICK_IFORCE_USB y # I-Force USB joysticks and wheels + JOYSTICK_XPAD_FF y # X-Box gamepad rumble support + JOYSTICK_XPAD_LEDS y # LED Support for Xbox360 controller 'BigX' LED + LDM_PARTITION y # Windows Logical Disk Manager (Dynamic Disk) support + LEDS_TRIGGER_IDE_DISK y # LED IDE Disk Trigger + LOGIRUMBLEPAD2_FF y # Logitech Rumblepad 2 force feedback + LOGO n # not needed + MEDIA_ATTACH? y + MEGARAID_NEWGEN y + MICROCODE_AMD y + MODVERSIONS y + MOUSE_PS2_ELANTECH y # Elantech PS/2 protocol extension + MTRR_SANITIZER y + NET_FC y # Fibre Channel driver support + PPP_MULTILINK y # PPP multilink support + REGULATOR y # Voltage and Current Regulator Support + RC_DEVICES y # Enable IR devices + SCSI_LOGGING y # SCSI logging facility + SERIAL_8250 y # 8250/16550 and compatible serial support + SLIP_COMPRESSED y # CSLIP compressed headers + SLIP_SMART y + THERMAL_HWMON y # Hardware monitoring support + USB_DEBUG n + USB_EHCI_ROOT_HUB_TT y # Root Hub Transaction Translators + USB_EHCI_TT_NEWSCHED y # Improved transaction translator scheduling + X86_CHECK_BIOS_CORRUPTION y + X86_MCE y + + # Linux Containers + RT_GROUP_SCHED? y + CGROUP_DEVICE? y + MEMCG? y + MEMCG_SWAP? y + DEVPTS_MULTIPLE_INSTANCES? y + + # Enable staging drivers. These are somewhat experimental, but + # they generally don't hurt. + STAGING y + + # PROC_EVENTS requires that the netlink connector is not built + # as a module. This is required by libcgroup's cgrulesengd. + CONNECTOR y + PROC_EVENTS y + + # Tracing + FTRACE y + FUNCTION_TRACER y + FTRACE_SYSCALLS y + SCHED_TRACER y + + # Devtmpfs support. + DEVTMPFS y + + # Media support + MEDIA_CAMERA_SUPPORT? y + MEDIA_RC_SUPPORT? y + MEDIA_USB_SUPPORT y + + # Easier debug of NFS issues + SUNRPC_DEBUG y + + ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""} + ${extraConfig} + ''; +in + +import ./generic.nix ( + + rec { + version = "3.10"; + modDirVersion = "3.10.0"; + testing = false; + + preConfigure = '' + substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' "" + ''; + + src = fetchurl { + url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz"; + sha256 = "0i1mmp1fym49az75rjnwxbbh11b387qqjjkczq5l373ssa9gl9yz"; + }; + + config = configWithPlatform stdenv.platform; + configCross = configWithPlatform stdenv.cross.platform; + + features.iwlwifi = true; + features.efiBootStub = true; + features.needsCifsUtils = true; + features.canDisableNetfilterConntrackHelpers = true; + features.netfilterRPFilter = true; + + extraNativeBuildInputs = [bc]; + } + + // removeAttrs args ["extraConfig"] +) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cc64901dbb5..5341afbc776 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6299,6 +6299,18 @@ let ]; }; + linux_3_10 = makeOverridable (import ../os-specific/linux/kernel/linux-3.10.nix) { + inherit fetchurl stdenv perl mktemp bc module_init_tools ubootChooser; + kernelPatches = + [ + kernelPatches.sec_perm_2_6_24 + ] ++ lib.optionals (platform.kernelArch == "mips") + [ kernelPatches.mips_fpureg_emu + kernelPatches.mips_fpu_sigill + kernelPatches.mips_ext3_n32 + ]; + }; + /* Linux kernel modules are inherently tied to a specific kernel. So rather than provide specific instances of those packages for a specific kernel, we have a function that builds those packages @@ -6426,8 +6438,9 @@ let linuxPackages_3_7 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_7 linuxPackages_3_7); linuxPackages_3_8 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_8 linuxPackages_3_8); linuxPackages_3_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_9 linuxPackages_3_9); + linuxPackages_3_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_10 linuxPackages_3_10); # Update this when adding a new version! - linuxPackages_latest = pkgs.linuxPackages_3_9; + linuxPackages_latest = pkgs.linuxPackages_3_10; # The current default kernel / kernel modules. linux = linuxPackages.kernel; diff --git a/pkgs/top-level/platforms.nix b/pkgs/top-level/platforms.nix index 3c53be875e3..a7445c21a70 100644 --- a/pkgs/top-level/platforms.nix +++ b/pkgs/top-level/platforms.nix @@ -13,10 +13,10 @@ rec { kernelExtraConfig = '' # Virtualisation (KVM, Xen...). - PARAVIRT_GUEST y + PARAVIRT_GUEST? y #Doesn't exist in 3.10 KVM_CLOCK? y #Part of KVM_GUEST since linux 3.7 - KVM_GUEST y - XEN y + KVM_GUEST? y #Doesn't exist in 3.10 + XEN? y #Doesn't exist in 3.10 KSM y # We need 64 GB (PAE) support for Xen guest support. From 270ba268d7b8f5a1dbc430259f2500bdf6eaed79 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 30 Jun 2013 21:42:51 -0400 Subject: [PATCH 115/798] Add HYPERVISOR_GUEST for linux 3.10 Signed-off-by: Shea Levy --- pkgs/top-level/platforms.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/platforms.nix b/pkgs/top-level/platforms.nix index a7445c21a70..b2a12bf8b50 100644 --- a/pkgs/top-level/platforms.nix +++ b/pkgs/top-level/platforms.nix @@ -13,6 +13,7 @@ rec { kernelExtraConfig = '' # Virtualisation (KVM, Xen...). + HYPERVISOR_GUEST? y #3.10 version of the paravirt options PARAVIRT_GUEST? y #Doesn't exist in 3.10 KVM_CLOCK? y #Part of KVM_GUEST since linux 3.7 KVM_GUEST? y #Doesn't exist in 3.10 From fe622f65232d16808e7be51cb4451a10375a6e24 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Fri, 28 Jun 2013 23:04:28 +0200 Subject: [PATCH 116/798] upgrade some packages to libusb1 on my systems, I can now override "libusb = libusb1" in all of nixpkgs so perhaps we can soon drop libusb 0.1 support? --- pkgs/misc/cups/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index ad25b4180b5..bb1f60ed5db 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, zlib, libjpeg, libpng, libtiff, pam, openssl -, dbus, libusb1, acl }: +, dbus, libusb, acl }: let version = "1.5.4"; in @@ -13,7 +13,7 @@ stdenv.mkDerivation { md5 = "de3006e5cf1ee78a9c6145ce62c4e982"; }; - buildInputs = [ pkgconfig zlib libjpeg libpng libtiff libusb1 ] + buildInputs = [ pkgconfig zlib libjpeg libpng libtiff libusb ] ++ stdenv.lib.optionals stdenv.isLinux [ pam dbus.libs acl ] ; propagatedBuildInputs = [ openssl ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5341afbc776..14c6ed1d497 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -901,7 +901,7 @@ let # use config.packageOverrides if you prefer original gnupg1 gnupg1 = gnupg1compat; - gnupg = callPackage ../tools/security/gnupg { }; + gnupg = callPackage ../tools/security/gnupg { libusb = libusb1; }; gnupg2_1 = lowPrio (callPackage ../tools/security/gnupg/git.nix { libassuan = libassuan2_1; @@ -942,7 +942,7 @@ let buggyBiosCDSupport = config.grub.buggyBiosCDSupport or true; }; - grub2 = callPackage ../tools/misc/grub/2.0x.nix { }; + grub2 = callPackage ../tools/misc/grub/2.0x.nix { libusb = libusb1; }; grub2_efi = grub2.override { EFIsupport = true; }; @@ -8992,6 +8992,7 @@ let boost = boost149; eigen = eigen2; libotr = libotr_3_2; + libusb = libusb1; }) ../desktops/kde-4.10; kdePackagesFor = self: dir: @@ -9379,7 +9380,7 @@ let auctex = callPackage ../tools/typesetting/tex/auctex { }; - cups = callPackage ../misc/cups { }; + cups = callPackage ../misc/cups { libusb = libusb1; }; cups_pdf_filter = callPackage ../misc/cups/pdf-filter.nix { }; @@ -9547,6 +9548,7 @@ let saneBackends = callPackage ../applications/graphics/sane/backends.nix { gt68xxFirmware = config.sane.gt68xxFirmware or null; hotplugSupport = config.sane.hotplugSupport or true; + libusb = libusb1; }; saneBackendsGit = callPackage ../applications/graphics/sane/backends-git.nix { From 6937609391eebf0be294637db1c40d74ef662b33 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sat, 29 Jun 2013 11:49:46 +0200 Subject: [PATCH 117/798] clucene_core: upgrade some packages to clucene_core_2 on my systems, I can now override "clucene_core = clucene_core_2" globally in nixpkgs. so perhaps we can soon drop v1? --- pkgs/applications/office/libreoffice/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index fc5f5058f97..cd45f76761d 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -6,7 +6,7 @@ , libXinerama, openssl, gperf, cppunit, GConf, ORBit2, poppler , librsvg, gnome_vfs, gstreamer, gst_plugins_base, mesa , autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr -, libwpg, dbus_glib, qt4, kde4, clucene_core_2, libcdr, lcms2, vigra +, libwpg, dbus_glib, qt4, kde4, clucene_core, libcdr, lcms2, vigra , libiodbc, mdds, saneBackends, mythes, libexttextcat, libvisio , fontsConf , langs ? [ "en-US" "en-GB" "ca" "ru" "eo" "fr" "nl" "de" ] @@ -162,7 +162,7 @@ stdenv.mkDerivation rec { ]; buildInputs = - [ ant ArchiveZip autoconf automake bison boost cairo clucene_core_2 + [ ant ArchiveZip autoconf automake bison boost cairo clucene_core CompressZlib cppunit cups curl db4 dbus_glib expat file flex fontconfig freetype GConf getopt gnome_vfs gperf gst_plugins_base gstreamer gtk hunspell icu jdk kde4.kdelibs lcms2 libcdr libexttextcat libiodbc libjpeg diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 14c6ed1d497..e1e1cb19b09 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5260,7 +5260,7 @@ let sofia_sip = callPackage ../development/libraries/sofia-sip { }; - soprano = callPackage ../development/libraries/soprano { }; + soprano = callPackage ../development/libraries/soprano { clucene_core = clucene_core_2; }; soqt = callPackage ../development/libraries/soqt { }; @@ -5314,7 +5314,7 @@ let stlport = callPackage ../development/libraries/stlport { }; - strigi = callPackage ../development/libraries/strigi {}; + strigi = callPackage ../development/libraries/strigi { clucene_core = clucene_core_2; }; suil = callPackage ../development/libraries/audio/suil { }; @@ -7779,6 +7779,7 @@ let ]; }; poppler = poppler_0_18; + clucene_core = clucene_core_2; }; liferea = callPackage ../applications/networking/newsreaders/liferea { }; From 04cbaef102366be98e105a8d56c183ae7a90c1c5 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sat, 29 Jun 2013 16:07:15 +0200 Subject: [PATCH 118/798] keep lcms versioning in all-packages.nix --- pkgs/applications/graphics/gimp/2.8.nix | 4 ++-- pkgs/applications/office/libreoffice/default.nix | 4 ++-- pkgs/development/libraries/libcdr/default.nix | 4 ++-- pkgs/development/libraries/openjpeg/default.nix | 4 ++-- pkgs/development/libraries/poppler/0.18.nix | 4 ++-- pkgs/development/libraries/poppler/default.nix | 4 ++-- pkgs/misc/ghostscript/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 10 +++++++--- 8 files changed, 21 insertions(+), 17 deletions(-) diff --git a/pkgs/applications/graphics/gimp/2.8.nix b/pkgs/applications/graphics/gimp/2.8.nix index 4a9890720a3..10426b4a5bd 100644 --- a/pkgs/applications/graphics/gimp/2.8.nix +++ b/pkgs/applications/graphics/gimp/2.8.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, intltool, babl, gegl, gtk, glib, gdk_pixbuf -, pango, cairo, freetype, fontconfig, lcms2, libpng, libjpeg, poppler, libtiff +, pango, cairo, freetype, fontconfig, lcms, libpng, libjpeg, poppler, libtiff , webkit, libmng, librsvg, libwmf, zlib, libzip, ghostscript, aalib, jasper , python, pygtk, libart_lgpl, libexif, gettext, xlibs }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig intltool babl gegl gtk glib gdk_pixbuf pango cairo - freetype fontconfig lcms2 libpng libjpeg poppler libtiff webkit + freetype fontconfig lcms libpng libjpeg poppler libtiff webkit libmng librsvg libwmf zlib libzip ghostscript aalib jasper python pygtk libart_lgpl libexif gettext ]; diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index cd45f76761d..6e3f83caae3 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -6,7 +6,7 @@ , libXinerama, openssl, gperf, cppunit, GConf, ORBit2, poppler , librsvg, gnome_vfs, gstreamer, gst_plugins_base, mesa , autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr -, libwpg, dbus_glib, qt4, kde4, clucene_core, libcdr, lcms2, vigra +, libwpg, dbus_glib, qt4, kde4, clucene_core, libcdr, lcms, vigra , libiodbc, mdds, saneBackends, mythes, libexttextcat, libvisio , fontsConf , langs ? [ "en-US" "en-GB" "ca" "ru" "eo" "fr" "nl" "de" ] @@ -165,7 +165,7 @@ stdenv.mkDerivation rec { [ ant ArchiveZip autoconf automake bison boost cairo clucene_core CompressZlib cppunit cups curl db4 dbus_glib expat file flex fontconfig freetype GConf getopt gnome_vfs gperf gst_plugins_base gstreamer gtk - hunspell icu jdk kde4.kdelibs lcms2 libcdr libexttextcat libiodbc libjpeg + hunspell icu jdk kde4.kdelibs lcms libcdr libexttextcat libiodbc libjpeg libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11 libXaw libXext libXi libXinerama libxml2 libxslt libXtst mdds mesa mythes neon nspr nss openldap openssl ORBit2 pam perl pkgconfigUpstream poppler diff --git a/pkgs/development/libraries/libcdr/default.nix b/pkgs/development/libraries/libcdr/default.nix index d2d68640560..1da25527ef7 100644 --- a/pkgs/development/libraries/libcdr/default.nix +++ b/pkgs/development/libraries/libcdr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libwpg, libwpd, lcms2, pkgconfig }: +{ stdenv, fetchurl, libwpg, libwpd, lcms, pkgconfig }: stdenv.mkDerivation rec { name = "libcdr-0.0.8"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "117a8gp29xs3kin6kaisb3frsx8dwrsjgs4wq4y5hjqprzy6lwz0"; }; - buildInputs = [ libwpg libwpd lcms2 ]; + buildInputs = [ libwpg libwpd lcms ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/openjpeg/default.nix b/pkgs/development/libraries/openjpeg/default.nix index 7fd18af450c..a47cacd62bc 100644 --- a/pkgs/development/libraries/openjpeg/default.nix +++ b/pkgs/development/libraries/openjpeg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libpng, libtiff, lcms2, glib/*passthru only*/ }: +{ stdenv, fetchurl, pkgconfig, libpng, libtiff, lcms, glib/*passthru only*/ }: stdenv.mkDerivation rec { name = "openjpeg-1.5.1"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativebuildInputs = [ pkgconfig ]; - propagatedBuildInputs = [ libpng libtiff lcms2 ]; # in closure anyway + propagatedBuildInputs = [ libpng libtiff lcms ]; # in closure anyway postInstall = glib.flattenInclude; diff --git a/pkgs/development/libraries/poppler/0.18.nix b/pkgs/development/libraries/poppler/0.18.nix index 29e99b67549..123d229f2ba 100644 --- a/pkgs/development/libraries/poppler/0.18.nix +++ b/pkgs/development/libraries/poppler/0.18.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, cairo, freetype, fontconfig, zlib , libjpeg, curl, libpthreadstubs, xorg, openjpeg -, libxml2, pkgconfig, cmake, lcms2, libiconvOrEmpty +, libxml2, pkgconfig, cmake, lcms, libiconvOrEmpty , glibSupport ? false, glib, gtk3Support ? false, gtk3 # gtk2 no longer accepted , qt4Support ? false, qt4 ? null }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; propagatedBuildInputs = with xorg; - [ zlib cairo freetype fontconfig libjpeg lcms2 curl + [ zlib cairo freetype fontconfig libjpeg lcms curl libpthreadstubs libxml2 stdenv.gcc.libc libXau libXdmcp libxcb libXrender libXext openjpeg diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index 7c392832406..55ab0da0cfd 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchgit, pkgconfig, cmake, libiconvOrEmpty, libintlOrEmpty -, zlib, curl, cairo, freetype, fontconfig, lcms2, libjpeg, openjpeg +, zlib, curl, cairo, freetype, fontconfig, lcms, libjpeg, openjpeg , qt4Support ? false, qt4 ? null }: @@ -26,7 +26,7 @@ let inherit sha256; }; - propagatedBuildInputs = [ zlib cairo freetype fontconfig libjpeg lcms2 curl openjpeg ]; + propagatedBuildInputs = [ zlib cairo freetype fontconfig libjpeg lcms curl openjpeg ]; nativeBuildInputs = [ pkgconfig cmake ] ++ libiconvOrEmpty ++ libintlOrEmpty; diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix index 79f36744603..24debae860a 100644 --- a/pkgs/misc/ghostscript/default.nix +++ b/pkgs/misc/ghostscript/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, libjpeg, libpng, libtiff, zlib, pkgconfig, fontconfig, openssl -, lcms2, freetype, libpaper, jbig2dec, expat, libiconvOrEmpty +, lcms, freetype, libpaper, jbig2dec, expat, libiconvOrEmpty , x11Support, x11 ? null , cupsSupport ? false, cups ? null , gnuFork ? true @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - libjpeg libpng libtiff zlib pkgconfig fontconfig openssl lcms2 + libjpeg libpng libtiff zlib pkgconfig fontconfig openssl lcms libpaper jbig2dec expat ] ++ stdenv.lib.optionals x11Support [x11 freetype] ++ stdenv.lib.optional cupsSupport cups diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e1e1cb19b09..5e99403130a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4393,7 +4393,7 @@ let libcdio = callPackage ../development/libraries/libcdio { }; - libcdr = callPackage ../development/libraries/libcdr { }; + libcdr = callPackage ../development/libraries/libcdr { lcms = lcms2; }; libchamplain = callPackage ../development/libraries/libchamplain { inherit (gnome) libsoup; @@ -5045,7 +5045,7 @@ let opal = callPackage ../development/libraries/opal {}; - openjpeg = callPackage ../development/libraries/openjpeg { }; + openjpeg = callPackage ../development/libraries/openjpeg { lcms = lcms2; }; openscenegraph = callPackage ../development/libraries/openscenegraph {}; @@ -5099,11 +5099,12 @@ let policykit = callPackage ../development/libraries/policykit { }; - poppler = let popplers = callPackage ../development/libraries/poppler { }; + poppler = let popplers = callPackage ../development/libraries/poppler { lcms = lcms2; }; in popplers // popplers.poppler_glib; popplerQt4 = poppler.poppler_qt4; poppler_0_18 = callPackage ../development/libraries/poppler/0.18.nix { + lcms = lcms2; glibSupport = true; gtk3Support = false; qt4Support = false; @@ -7470,6 +7471,7 @@ let gimp_2_8 = callPackage ../applications/graphics/gimp/2.8.nix { inherit (gnome) libart_lgpl; webkit = null; + lcms = lcms2; }; gimp = gimp_2_6; @@ -7780,6 +7782,7 @@ let }; poppler = poppler_0_18; clucene_core = clucene_core_2; + lcms = lcms2; }; liferea = callPackage ../applications/networking/newsreaders/liferea { }; @@ -9420,6 +9423,7 @@ let gensgs = callPackage_i686 ../misc/emulators/gens-gs { }; ghostscript = callPackage ../misc/ghostscript { + lcms = lcms2; x11Support = false; cupsSupport = config.ghostscript.cups or true; gnuFork = config.ghostscript.gnu or false; From bd7823d5de4e4c54f235e022a752c9c861c0e231 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sat, 29 Jun 2013 16:08:14 +0200 Subject: [PATCH 119/798] upgrade some packages to lcms2 --- pkgs/top-level/all-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5e99403130a..c1dbfb0d064 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4641,7 +4641,7 @@ let libmowgli = callPackage ../development/libraries/libmowgli { }; - libmng = callPackage ../development/libraries/libmng { }; + libmng = callPackage ../development/libraries/libmng { lcms = lcms2; }; libmnl = callPackage ../development/libraries/libmnl { }; @@ -7682,6 +7682,7 @@ let inkscape = callPackage ../applications/graphics/inkscape { inherit (pythonPackages) lxml; + lcms = lcms2; }; ion3 = callPackage ../applications/window-managers/ion-3 { From 3a0dfdd87ac8d3130257ca20b0662756b6299daa Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sat, 29 Jun 2013 18:55:01 +0200 Subject: [PATCH 120/798] kde 4.10: use up-to-date ffmpeg --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c1dbfb0d064..74666795c8f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8998,6 +8998,7 @@ let eigen = eigen2; libotr = libotr_3_2; libusb = libusb1; + ffmpeg = ffmpeg_1; }) ../desktops/kde-4.10; kdePackagesFor = self: dir: From ca5b44a218acf41ed35727de493e382244691dd1 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sat, 29 Jun 2013 19:33:45 +0200 Subject: [PATCH 121/798] explicitly flag gcc 4.6 as needing texinfo 4.13 --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 74666795c8f..5a2f7a9be08 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2311,6 +2311,7 @@ let if crossSystem != null && crossSystem.config == "i586-pc-gnu" then gnu.libpthreadCross else null; + texinfo = texinfo413; })); # A non-stripped version of GCC. From cbf48a8cd10f744f57c2aed683f81f6605f6de36 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sat, 29 Jun 2013 21:52:12 +0200 Subject: [PATCH 122/798] upgrade to texinfo5 for some packages --- .../version-management/git-and-tools/default.nix | 5 +++-- pkgs/top-level/all-packages.nix | 16 ++++++++++------ 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index fe5aebeb96e..69aeba92fd8 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -9,8 +9,9 @@ rec { git = lib.makeOverridable (import ./git) { inherit fetchurl stdenv curl openssl zlib expat perl python gettext gnugrep - asciidoc texinfo xmlto docbook2x docbook_xsl docbook_xml_dtd_45 libxslt - cpio tcl tk makeWrapper subversionClient gzip; + asciidoc xmlto docbook2x docbook_xsl docbook_xml_dtd_45 libxslt cpio tcl + tk makeWrapper subversionClient gzip; + texinfo = texinfo5; svnSupport = false; # for git-svn support guiSupport = false; # requires tcl/tk sendEmailSupport = false; # requires plenty of perl libraries diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5a2f7a9be08..6260aa46f2a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -721,6 +721,7 @@ let docbook2x = callPackage ../tools/typesetting/docbook2x { inherit (perlPackages) XMLSAX XMLParser XMLNamespaceSupport; + texinfo = texinfo5; }; dosfstools = callPackage ../tools/filesystems/dosfstools { }; @@ -1149,7 +1150,7 @@ let lxc = callPackage ../os-specific/linux/lxc { }; - lzip = callPackage ../tools/compression/lzip { }; + lzip = callPackage ../tools/compression/lzip { texinfo = texinfo5; }; lzma = xz; @@ -2020,6 +2021,7 @@ let bashInteractive = appendToName "interactive" (callPackage ../shells/bash { interactive = true; + texinfo = texinfo5; }); bashCompletion = callPackage ../shells/bash-completion { }; @@ -3870,6 +3872,7 @@ let ffmpeg_1 = callPackage ../development/libraries/ffmpeg/1.x.nix { vpxSupport = !stdenv.isMips; + texinfo = texinfo5; }; ffms = callPackage ../development/libraries/ffms { }; @@ -7220,6 +7223,7 @@ let librsvg = null; alsaLib = null; imagemagick = null; + texinfo = texinfo5; }; emacsPackages = emacs: self: let callPackage = newScope self; in rec { @@ -7227,7 +7231,7 @@ let autoComplete = callPackage ../applications/editors/emacs-modes/auto-complete { }; - bbdb = callPackage ../applications/editors/emacs-modes/bbdb { }; + bbdb = callPackage ../applications/editors/emacs-modes/bbdb { texinfo = texinfo5; }; cedet = callPackage ../applications/editors/emacs-modes/cedet { }; @@ -7247,9 +7251,9 @@ let emacsSessionManagement = callPackage ../applications/editors/emacs-modes/session-management-for-emacs { }; - emacsw3m = callPackage ../applications/editors/emacs-modes/emacs-w3m { }; + emacsw3m = callPackage ../applications/editors/emacs-modes/emacs-w3m { texinfo = texinfo5; }; - emms = callPackage ../applications/editors/emacs-modes/emms { }; + emms = callPackage ../applications/editors/emacs-modes/emms { texinfo = texinfo5; }; ess = callPackage ../applications/editors/emacs-modes/ess { }; @@ -7285,7 +7289,7 @@ let loremIpsum = callPackage ../applications/editors/emacs-modes/lorem-ipsum { }; - magit = callPackage ../applications/editors/emacs-modes/magit { }; + magit = callPackage ../applications/editors/emacs-modes/magit { texinfo = texinfo5; }; maudeMode = callPackage ../applications/editors/emacs-modes/maude { }; @@ -7293,7 +7297,7 @@ let # This is usually a newer version of Org-Mode than that found in GNU Emacs, so # we want it to have higher precedence. - org = hiPrio (callPackage ../applications/editors/emacs-modes/org { }); + org = hiPrio (callPackage ../applications/editors/emacs-modes/org { texinfo = texinfo5; }); org2blog = callPackage ../applications/editors/emacs-modes/org2blog { }; From fc8c97f5d96993fefee2c9809233358486377c26 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sun, 30 Jun 2013 12:09:43 +0200 Subject: [PATCH 123/798] linux-3.9: upgrade to 3.9.8 --- pkgs/os-specific/linux/kernel/linux-3.9.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.9.nix b/pkgs/os-specific/linux/kernel/linux-3.9.nix index b63dfd5d827..3c9976868bd 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.9.nix @@ -254,7 +254,7 @@ in import ./generic.nix ( rec { - version = "3.9.7"; + version = "3.9.8"; testing = false; preConfigure = '' @@ -263,7 +263,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "1xgk13bj33wayrs2jfgb2vf4xfys3vm28ijaavpjgs2wlsav94lx"; + sha256 = "0dfk3yrc6kcgywjgrj16lyi0m80847mn2l5sib8n5h2zadbdy0qy"; }; config = configWithPlatform stdenv.platform; From a1febc799a7ffb1b62d8ee8140f3975ea519556e Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Fri, 28 Jun 2013 23:04:43 +0200 Subject: [PATCH 124/798] whitespace cleaning --- pkgs/applications/graphics/gimp/2.8.nix | 8 ++++---- pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/graphics/gimp/2.8.nix b/pkgs/applications/graphics/gimp/2.8.nix index 10426b4a5bd..b4c1fccf9dc 100644 --- a/pkgs/applications/graphics/gimp/2.8.nix +++ b/pkgs/applications/graphics/gimp/2.8.nix @@ -5,17 +5,17 @@ stdenv.mkDerivation rec { name = "gimp-2.8.4"; - + src = fetchurl { url = "ftp://ftp.gimp.org/pub/gimp/v2.8/${name}.tar.bz2"; md5 = "392592e8755d046317878d226145900f"; }; - - buildInputs = + + buildInputs = [ pkgconfig intltool babl gegl gtk glib gdk_pixbuf pango cairo freetype fontconfig lcms libpng libjpeg poppler libtiff webkit libmng librsvg libwmf zlib libzip ghostscript aalib jasper - python pygtk libart_lgpl libexif gettext + python pygtk libart_lgpl libexif gettext ]; passthru = { inherit gtk; }; # probably its a good idea to use the same gtk in plugins ? diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6260aa46f2a..2e11edd297c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2147,9 +2147,9 @@ let binutils = binutils_deterministic; inherit stdenv coreutils zlib; }; - + wrapDeterministicGCC = wrapDeterministicGCCWith (import ../build-support/gcc-wrapper) glibc; - + gcc46_deterministic = lowPrio (wrapDeterministicGCC (callPackage ../development/compilers/gcc/4.6 { inherit noSysDirs; From 9cf9b24dc44290db591fca1fd4c60e25ffef0d03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 1 Jul 2013 08:55:55 +0200 Subject: [PATCH 125/798] kde4.rsibreak: fix broken download and homepage --- pkgs/applications/misc/rsibreak/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/rsibreak/default.nix b/pkgs/applications/misc/rsibreak/default.nix index fe8118b1976..6587fb2debf 100644 --- a/pkgs/applications/misc/rsibreak/default.nix +++ b/pkgs/applications/misc/rsibreak/default.nix @@ -1,11 +1,13 @@ { stdenv, fetchurl, kdelibs, kdebase_workspace, gettext }: +let version = "0.11"; +in stdenv.mkDerivation rec { - name = "rsibreak-0.11"; + name = "rsibreak-${version}"; src = fetchurl { - url = "${meta.homepage}/files/${name}.tar.bz2"; - sha256 = "1yrf73r8mixskh8b531wb8dfs9z7rrw010xsrflhjhjmqh94h8mw"; + url = "mirror://debian/pool/main/r/rsibreak/rsibreak_${version}.orig.tar.gz"; + sha256 = "0g27aswh8iz5v67v1wkjny4p100vs2gm0lw0qzfkg6sw1pb4i519"; }; nativeBuildInputs = [ gettext ]; @@ -13,8 +15,8 @@ stdenv.mkDerivation rec { buildInputs = [ kdelibs kdebase_workspace ]; meta = { - homepage = http://www.rsibreak.org/; - description = "Repetitive Strain Injury prevention"; + homepage = http://userbase.kde.org/RSIBreak; # http://www.rsibreak.org/ is down since 2011 + description = "Utility to help prevent repetitive strain injury for KDE 4"; inherit (kdelibs.meta) platforms maintainers; }; } From 64cbe2d6ee8c68cbbd8170643adacc1516db1d52 Mon Sep 17 00:00:00 2001 From: Gergely Risko Date: Mon, 1 Jul 2013 11:39:58 +0200 Subject: [PATCH 126/798] Update hflags to 0.2 --- pkgs/development/libraries/haskell/hflags/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hflags/default.nix b/pkgs/development/libraries/haskell/hflags/default.nix index 17c01f9a659..89d2f2d518e 100644 --- a/pkgs/development/libraries/haskell/hflags/default.nix +++ b/pkgs/development/libraries/haskell/hflags/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "hflags"; - version = "0.1.3"; - sha256 = "0nn08xqn0hvdlblnaad3nsdfkc0ssab6kvhi4qbrcq9jmjmspld3"; + version = "0.2"; + sha256 = "1bz8w1vxqlc2c9iygr2dhy2ck1sd56zjwqzz707nqcmsqqsfmyhb"; buildDepends = [ text ]; meta = { homepage = "http://github.com/errge/hflags"; From b0b9f1fd5cddbc4824e8dc5640080bb1606d59e5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 1 Jul 2013 11:00:50 +0200 Subject: [PATCH 127/798] haskell-time: update to version 1.4.1 --- .../development/libraries/haskell/time/1.1.2.4.nix | 14 -------------- .../haskell/time/{1.4.0.2.nix => 1.4.1.nix} | 4 ++-- pkgs/top-level/haskell-packages.nix | 3 +-- 3 files changed, 3 insertions(+), 18 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/time/1.1.2.4.nix rename pkgs/development/libraries/haskell/time/{1.4.0.2.nix => 1.4.1.nix} (85%) diff --git a/pkgs/development/libraries/haskell/time/1.1.2.4.nix b/pkgs/development/libraries/haskell/time/1.1.2.4.nix deleted file mode 100644 index 56072676b67..00000000000 --- a/pkgs/development/libraries/haskell/time/1.1.2.4.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ cabal }: - -cabal.mkDerivation (self: { - pname = "time"; - version = "1.1.2.4"; - sha256 = "11dfcb9b5ca76428a7a31019928c3c1898320f774e5d3df8e4407580d074fad3"; - meta = { - homepage = "http://semantic.org/TimeLib/"; - description = "A time library"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/time/1.4.0.2.nix b/pkgs/development/libraries/haskell/time/1.4.1.nix similarity index 85% rename from pkgs/development/libraries/haskell/time/1.4.0.2.nix rename to pkgs/development/libraries/haskell/time/1.4.1.nix index 62232d1aa5a..1e675110190 100644 --- a/pkgs/development/libraries/haskell/time/1.4.0.2.nix +++ b/pkgs/development/libraries/haskell/time/1.4.1.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "time"; - version = "1.4.0.2"; - sha256 = "0p4ncankr9968lp4fnbq6pc5xwv2198gxhbds656da9jbv74w7j8"; + version = "1.4.1"; + sha256 = "04ndcp7m1a7mia4by15dqrwl5k0d2477x20s6xcrdb7in8w9ccvp"; buildDepends = [ deepseq ]; testDepends = [ Cabal deepseq QuickCheck testFramework testFrameworkQuickcheck2 diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 4bcce23fc3b..f117bf9d05e 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1930,8 +1930,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); threads = callPackage ../development/libraries/haskell/threads {}; - time_1_1_2_4 = callPackage ../development/libraries/haskell/time/1.1.2.4.nix {}; - time_1_4_0_2 = callPackage ../development/libraries/haskell/time/1.4.0.2.nix {}; + time_1_4_1 = callPackage ../development/libraries/haskell/time/1.4.1.nix {}; # time is in the core package set. It should only be necessary to # pass it explicitly in rare circumstances. time = null; From 4b75f5a2ae73bd3a23f729a313d5e11f54f67062 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 1 Jul 2013 11:04:02 +0200 Subject: [PATCH 128/798] haskell-git-annex: update to version 4.20130627 --- .../git-and-tools/git-annex/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix index 9991a506485..f0c8c94437c 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix @@ -8,13 +8,14 @@ , networkProtocolXmpp, openssh, QuickCheck, random, regexTdfa , rsync, SafeSemaphore, SHA, stm, text, time, transformers , unixCompat, utf8String, uuid, wai, waiLogger, warp, which -, xmlConduit, xmlTypes, yesod, yesodDefault, yesodForm, yesodStatic +, xmlConduit, xmlTypes, yesod, yesodCore, yesodDefault, yesodForm +, yesodStatic }: cabal.mkDerivation (self: { pname = "git-annex"; - version = "4.20130601"; - sha256 = "0l6jbi9r26w5h9hfg9v9qybqvijp4n7c9l1zd4ikxg2nqcc8j8ln"; + version = "4.20130627"; + sha256 = "1q9hdh7m04idx1nm631624s37p6w1b9j1z5n06j2449b3pxqrn3y"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -25,8 +26,8 @@ cabal.mkDerivation (self: { MonadCatchIOTransformers monadControl mtl network networkInfo networkMulticast networkProtocolXmpp QuickCheck random regexTdfa SafeSemaphore SHA stm text time transformers unixCompat utf8String - uuid wai waiLogger warp xmlConduit xmlTypes yesod yesodDefault - yesodForm yesodStatic + uuid wai waiLogger warp xmlConduit xmlTypes yesod yesodCore + yesodDefault yesodForm yesodStatic ]; buildTools = [ bup curl git gnupg1 lsof openssh rsync which ]; configureFlags = "-fS3 @@ -51,7 +52,7 @@ cabal.mkDerivation (self: { meta = { homepage = "http://git-annex.branchable.com/"; description = "manage files with git, without checking their contents into git"; - license = "GPL"; + license = self.stdenv.lib.licenses.gpl3; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.simons ]; }; From cf0fba67dcc73627ff2e0aad3e400663f3592d03 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 1 Jul 2013 11:04:02 +0200 Subject: [PATCH 129/798] haskell-acid-state: update to version 0.11.3 --- pkgs/development/libraries/haskell/acid-state/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/acid-state/default.nix b/pkgs/development/libraries/haskell/acid-state/default.nix index dcd6698a5a2..ed31aaed000 100644 --- a/pkgs/development/libraries/haskell/acid-state/default.nix +++ b/pkgs/development/libraries/haskell/acid-state/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "acid-state"; - version = "0.10.0"; - sha256 = "0jjjh8l6ka8kawgp1gm75is4ajavl7nd6b2l717wjs8sy93qnzsc"; + version = "0.11.3"; + sha256 = "0808wcr2n9r3z94ljlzalzkfr7ri327vm5s8xif42n9dw600xi0j"; buildDepends = [ cereal extensibleExceptions filepath mtl network safecopy stm ]; From ee5387106243517471ea99ba725c8d8056eb78d4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 1 Jul 2013 11:04:02 +0200 Subject: [PATCH 130/798] haskell-authenticate-oauth: update to version 1.4.0.7 --- .../libraries/haskell/authenticate-oauth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/authenticate-oauth/default.nix b/pkgs/development/libraries/haskell/authenticate-oauth/default.nix index c21d6eddbee..2ddd7c05ee9 100644 --- a/pkgs/development/libraries/haskell/authenticate-oauth/default.nix +++ b/pkgs/development/libraries/haskell/authenticate-oauth/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "authenticate-oauth"; - version = "1.4.0.6"; - sha256 = "1ylfvc744wqyn5xbv6fivfys5kk9k9r2b9xf63zfzj5l5yqmv91a"; + version = "1.4.0.7"; + sha256 = "1pmkj35rpbhgyjrfdg8j51xn9a420aawkwfg28fpxz7kid0cqw8g"; buildDepends = [ base64Bytestring blazeBuilder blazeBuilderConduit conduit cryptoPubkeyTypes dataDefault httpConduit httpTypes monadControl From 6e07719f4c3712dcf3ae7a1eb075049925ba6381 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 1 Jul 2013 11:04:02 +0200 Subject: [PATCH 131/798] haskell-cmdargs: update to version 0.10.4 --- pkgs/development/libraries/haskell/cmdargs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/cmdargs/default.nix b/pkgs/development/libraries/haskell/cmdargs/default.nix index dfaed86b9af..e180863e133 100644 --- a/pkgs/development/libraries/haskell/cmdargs/default.nix +++ b/pkgs/development/libraries/haskell/cmdargs/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "cmdargs"; - version = "0.10.3"; - sha256 = "1cglfbkmgbsv3k32vdfg4xk6b5g5c2z8pm0xgbmdb4bbg765lrh6"; + version = "0.10.4"; + sha256 = "0y8jmpm31z7dd02xa6b5i6gpdjb6pz4pg7m5wbqff7fhbipf0lk0"; isLibrary = true; isExecutable = true; buildDepends = [ filepath transformers ]; From 126dd12da2c35541c8d232e9dbc92dab6c2577ca Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 1 Jul 2013 11:04:03 +0200 Subject: [PATCH 132/798] haskell-comonad-transformers: update to version 3.0.3 --- .../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 99c4016947d..eb1a83c80e8 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.2"; - sha256 = "1910hqp7f03p44alxm4dm8i4wikf0b60hmm85yrhbq02kcr3379d"; + version = "3.0.3"; + sha256 = "1q11xasl90z8sv9f7h77dxjsi2cwnjxqpaf0n5pvzn88nz9h6g66"; buildDepends = [ comonad contravariant distributive semigroupoids semigroups transformers From d83f8248c357f127ab7a67495fc900a03e9e7288 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 1 Jul 2013 11:04:03 +0200 Subject: [PATCH 133/798] haskell-comonad: update to version 3.0.3 --- pkgs/development/libraries/haskell/comonad/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/comonad/default.nix b/pkgs/development/libraries/haskell/comonad/default.nix index 7e11886fc58..86a8a5c2c30 100644 --- a/pkgs/development/libraries/haskell/comonad/default.nix +++ b/pkgs/development/libraries/haskell/comonad/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "comonad"; - version = "3.0.2"; - sha256 = "0ryyifcxc5rmjrf9323zzj357709mah1hdsrnrbakd5ck7grjfay"; + version = "3.0.3"; + sha256 = "1wngwa1cdww5c631dcil0c7mgkqx9bj7m5i63p7d9ymhpyx9sw2l"; buildDepends = [ semigroups transformers ]; testDepends = [ doctest filepath ]; meta = { From 3e5b4ccd9a6a483db5a20bd9ce87123b2ec73beb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 1 Jul 2013 11:04:03 +0200 Subject: [PATCH 134/798] haskell-comonads-fd: update to version 3.0.2 --- pkgs/development/libraries/haskell/comonads-fd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/comonads-fd/default.nix b/pkgs/development/libraries/haskell/comonads-fd/default.nix index 5921d8b07d3..08032cb60ab 100644 --- a/pkgs/development/libraries/haskell/comonads-fd/default.nix +++ b/pkgs/development/libraries/haskell/comonads-fd/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "comonads-fd"; - version = "3.0.1"; - sha256 = "0ap9sw7h130bza43091mbl9a5bsin6342zawgycdcsag49wm3dyy"; + version = "3.0.2"; + sha256 = "1gzgld895b11j556nc5pj7nbafx746b1z49bx4z38l9wq6qzbvqa"; buildDepends = [ comonad comonadTransformers mtl semigroups transformers ]; From 2cb552f2dc8726a402237f2ddef914350edb5e1d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 1 Jul 2013 11:04:03 +0200 Subject: [PATCH 135/798] haskell-conduit: update to version 1.0.7 --- pkgs/development/libraries/haskell/conduit/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/conduit/default.nix b/pkgs/development/libraries/haskell/conduit/default.nix index 6a12708ea33..26d775772e0 100644 --- a/pkgs/development/libraries/haskell/conduit/default.nix +++ b/pkgs/development/libraries/haskell/conduit/default.nix @@ -1,17 +1,17 @@ -{ cabal, doctest, hspec, liftedBase, mmorph, monadControl +{ cabal, doctest, hspec, liftedBase, mmorph, monadControl, mtl , QuickCheck, resourcet, text, transformers, transformersBase, void }: cabal.mkDerivation (self: { pname = "conduit"; - version = "1.0.6"; - sha256 = "0da5wxhsfjgcn850iimcp15vhg5lw0fa8i7c3hdw4yvrpza14dcn"; + version = "1.0.7"; + sha256 = "0nail476sz4dmr052sl5s14hkk336zp22hpgmr2qf141zzy8i2m1"; buildDepends = [ - liftedBase mmorph monadControl resourcet text transformers + liftedBase mmorph monadControl mtl resourcet text transformers transformersBase void ]; testDepends = [ - doctest hspec QuickCheck resourcet text transformers void + doctest hspec mtl QuickCheck resourcet text transformers void ]; meta = { homepage = "http://github.com/snoyberg/conduit"; From 3af166f42b0fd488783a0550dd4b9709c3dd0a34 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 1 Jul 2013 11:04:03 +0200 Subject: [PATCH 136/798] haskell-constraints: update to version 0.3.3 --- pkgs/development/libraries/haskell/constraints/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/constraints/default.nix b/pkgs/development/libraries/haskell/constraints/default.nix index 0fe2cb8864a..87ec5d82724 100644 --- a/pkgs/development/libraries/haskell/constraints/default.nix +++ b/pkgs/development/libraries/haskell/constraints/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "constraints"; - version = "0.3.2"; - sha256 = "1fmjl6dh2iswvmq8r3izplp6zg9m8yq1c4rj0zpqjbv2iqsi4kl1"; + version = "0.3.3"; + sha256 = "0mglqd6l6bc333i7gymbm8q037hj5fny6jzyg1zmw5kg6r3xcwdi"; buildDepends = [ newtype ]; meta = { homepage = "http://github.com/ekmett/constraints/"; From 2c33e25eed5aa93d2a96fbd48e86aa7e7b75e898 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 1 Jul 2013 11:04:03 +0200 Subject: [PATCH 137/798] haskell-cryptohash: update to version 0.9.1 --- pkgs/development/libraries/haskell/cryptohash/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/cryptohash/default.nix b/pkgs/development/libraries/haskell/cryptohash/default.nix index 97f74e80530..03fee5bac92 100644 --- a/pkgs/development/libraries/haskell/cryptohash/default.nix +++ b/pkgs/development/libraries/haskell/cryptohash/default.nix @@ -1,12 +1,12 @@ -{ cabal, cereal, cryptoApi, HUnit, QuickCheck, tagged +{ cabal, byteable, cereal, cryptoApi, HUnit, QuickCheck, tagged , testFramework, testFrameworkHunit, testFrameworkQuickcheck2 }: cabal.mkDerivation (self: { pname = "cryptohash"; - version = "0.9.0"; - sha256 = "0ipzrp83pz33qc7gmn9bmhbmc1f0hfvagyfr5bnmhgrh6lgy9s7l"; - buildDepends = [ cereal cryptoApi tagged ]; + version = "0.9.1"; + sha256 = "164j43dja91k2cssh0s2dw9riibijl02bap9mn8jn1h6vjb6w9z0"; + buildDepends = [ byteable cereal cryptoApi tagged ]; testDepends = [ HUnit QuickCheck testFramework testFrameworkHunit testFrameworkQuickcheck2 From 4b40122b6974df3fc889fdcac16ff8e403750f33 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 1 Jul 2013 11:04:03 +0200 Subject: [PATCH 138/798] haskell-dimensional: update to version 0.12 --- pkgs/development/libraries/haskell/dimensional/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/dimensional/default.nix b/pkgs/development/libraries/haskell/dimensional/default.nix index 329722abe8e..e820df4f0ba 100644 --- a/pkgs/development/libraries/haskell/dimensional/default.nix +++ b/pkgs/development/libraries/haskell/dimensional/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "dimensional"; - version = "0.10.2"; - sha256 = "14idyacd38a2kc97hp773j8iiim2lxh9czr8gp12m66w4n603znn"; + version = "0.12"; + sha256 = "1bk52wxmgcm34b516npy1ynrzqajgkshd8vfjm44vjcjvfrlf3bc"; buildDepends = [ numtype time ]; meta = { homepage = "http://dimensional.googlecode.com/"; From de20da33c388fbe20268a2afdeffa0bfaf246202 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 1 Jul 2013 11:04:03 +0200 Subject: [PATCH 139/798] haskell-either: update to version 3.4.1 --- pkgs/development/libraries/haskell/either/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/either/default.nix b/pkgs/development/libraries/haskell/either/default.nix index 4730af58569..67c1962cbe9 100644 --- a/pkgs/development/libraries/haskell/either/default.nix +++ b/pkgs/development/libraries/haskell/either/default.nix @@ -3,8 +3,8 @@ cabal.mkDerivation (self: { pname = "either"; - version = "3.4"; - sha256 = "05nbp8gp50wq592k6dsrpzp6wmqjn9pz6mkizqfb65z1wvd1xiz2"; + version = "3.4.1"; + sha256 = "1cq4glqhxz9k8fxf0dc8b6hcxxfn4yci6h7wmfkmkfq5ca61ax1b"; buildDepends = [ MonadRandom mtl semigroupoids semigroups transformers ]; From 932df79a8515e9e47f0a0acdf4e5b6d41270a0a3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 1 Jul 2013 11:04:03 +0200 Subject: [PATCH 140/798] haskell-errors: update to version 1.4.2 --- pkgs/development/libraries/haskell/errors/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/errors/default.nix b/pkgs/development/libraries/haskell/errors/default.nix index 7ed890c513c..d15ac59feba 100644 --- a/pkgs/development/libraries/haskell/errors/default.nix +++ b/pkgs/development/libraries/haskell/errors/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "errors"; - version = "1.4.1"; - sha256 = "18npfwr6byh0aib9qxpynr2gf0v92c0xbxky4a733jbdrwli5c40"; + version = "1.4.2"; + sha256 = "1csry8bbz7r4gc7x3lf1ih10rvnig2i91nfij227p9744yndl2xw"; buildDepends = [ either safe transformers ]; meta = { description = "Simplified error-handling"; From 3b29e271dd25a126efec44778219fed2dbcff377 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 1 Jul 2013 11:04:03 +0200 Subject: [PATCH 141/798] haskell-file-embed: update to version 0.0.4.9 --- pkgs/development/libraries/haskell/file-embed/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/file-embed/default.nix b/pkgs/development/libraries/haskell/file-embed/default.nix index ccb0f8bac82..2eb9ac94d8c 100644 --- a/pkgs/development/libraries/haskell/file-embed/default.nix +++ b/pkgs/development/libraries/haskell/file-embed/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "file-embed"; - version = "0.0.4.8"; - sha256 = "1jq4jdrxw822gzz7mc07nx4yj233mwmykp6xk371pf3hnq8rly0h"; + version = "0.0.4.9"; + sha256 = "128z3jwxn6d13dkrfjx7maxgmax8bfgr8n2jfhqg3rvv4ryjnqv2"; buildDepends = [ filepath ]; testDepends = [ filepath HUnit ]; meta = { From 717a181d0dbb8a67bb33459c488de857fdcb92e0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 1 Jul 2013 11:04:03 +0200 Subject: [PATCH 142/798] haskell-gloss: update to version 1.7.8.4 --- pkgs/development/libraries/haskell/gloss/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/gloss/default.nix b/pkgs/development/libraries/haskell/gloss/default.nix index 003207e77ae..a5984aef77c 100644 --- a/pkgs/development/libraries/haskell/gloss/default.nix +++ b/pkgs/development/libraries/haskell/gloss/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "gloss"; - version = "1.7.8.3"; - sha256 = "0wbp8bz5c3hzix6r7nbg6dmakb77i3lq4hgjk3gd8mvksd3n97jr"; + version = "1.7.8.4"; + sha256 = "06m90n0gxjhfdl2jalwzwsbgdg854bqw1qygkxbcfcknrpd2ampk"; buildDepends = [ bmp GLUT OpenGL ]; jailbreak = true; meta = { From 2838565f9a38c423289e6ecd7b7a9a7cb0f710d0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 1 Jul 2013 11:04:04 +0200 Subject: [PATCH 143/798] haskell-highlighting-kate: update to version 0.5.4 --- .../libraries/haskell/highlighting-kate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/highlighting-kate/default.nix b/pkgs/development/libraries/haskell/highlighting-kate/default.nix index fb7d0d4a00a..f09e3efaeb4 100644 --- a/pkgs/development/libraries/haskell/highlighting-kate/default.nix +++ b/pkgs/development/libraries/haskell/highlighting-kate/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "highlighting-kate"; - version = "0.5.3.9"; - sha256 = "158k38snqhgfjyzq82f8k1fkrpw0ld023wndzyzwwc6s933ap8hc"; + version = "0.5.4"; + sha256 = "0khwhhcjvhsh92b420bylx4c1ahpvk6c50s8y6bacfwfq71ydwmb"; isLibrary = true; isExecutable = true; buildDepends = [ blazeHtml filepath mtl parsec regexPcre ]; From 54fb831ad7021162211f2f169fcf705298b1ac51 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 1 Jul 2013 11:04:04 +0200 Subject: [PATCH 144/798] haskell-hledger-lib: update to version 0.21.3 --- pkgs/development/libraries/haskell/hledger-lib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hledger-lib/default.nix b/pkgs/development/libraries/haskell/hledger-lib/default.nix index 57cb8dc8710..87d5181fa7d 100644 --- a/pkgs/development/libraries/haskell/hledger-lib/default.nix +++ b/pkgs/development/libraries/haskell/hledger-lib/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "hledger-lib"; - version = "0.21.2"; - sha256 = "07li348kmwz9j4bfgmkq7zs9nyqxi5hhydij2fg4jwj0hbfxvmy9"; + version = "0.21.3"; + sha256 = "1vvki1dg98f8r9w6gmblazkbin7g2hzifwqd1frb0a3kp869i870"; buildDepends = [ cmdargs csv filepath HUnit mtl parsec prettyShow regexCompat regexpr safe split time transformers utf8String From f3ee0ca9045055b4ca28ea41236760152af35aa2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 1 Jul 2013 11:04:04 +0200 Subject: [PATCH 145/798] haskell-hledger: update to version 0.21.3 --- pkgs/development/libraries/haskell/hledger/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hledger/default.nix b/pkgs/development/libraries/haskell/hledger/default.nix index 5d81a49f10b..36012251e07 100644 --- a/pkgs/development/libraries/haskell/hledger/default.nix +++ b/pkgs/development/libraries/haskell/hledger/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "hledger"; - version = "0.21.2"; - sha256 = "04n9bm97zqh8am83fr2aflw3gv5nwm9jm7bp9vzd4986f1c43ig3"; + version = "0.21.3"; + sha256 = "14j0axlq6xfaih7m6lqpis26ya0yl4v6g6xrqbihmjddvx7j32f2"; isLibrary = true; isExecutable = true; buildDepends = [ From e6535b526a5fa9e0439e492d9a7edafac0dcfb40 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 1 Jul 2013 11:04:04 +0200 Subject: [PATCH 146/798] haskell-hspec-meta: update to version 1.6.1 --- pkgs/development/libraries/haskell/hspec-meta/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/hspec-meta/default.nix b/pkgs/development/libraries/haskell/hspec-meta/default.nix index 93162ff8cdf..1e0c9275a24 100644 --- a/pkgs/development/libraries/haskell/hspec-meta/default.nix +++ b/pkgs/development/libraries/haskell/hspec-meta/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hspec-meta"; - version = "1.5.4"; - sha256 = "07m7wxannk9rr8q2bdxhkjjlvwlzp7lq2c41y6cgjkjcm2x9qcc8"; + version = "1.6.1"; + sha256 = "089j6dpl856q3m1wyc7n822k7vppzb7pxdcwvzbhck2cadad3zn5"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -14,9 +14,9 @@ cabal.mkDerivation (self: { ]; doCheck = false; meta = { - homepage = "http://hspec.github.com/"; + homepage = "http://hspec.github.io/"; description = "A version of Hspec which is used to test Hspec itself"; - license = self.stdenv.lib.licenses.bsd3; + license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; }; }) From e3f3271812a1088097ebf788e0c091610cfa3e83 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 1 Jul 2013 11:04:04 +0200 Subject: [PATCH 147/798] haskell-hspec: update to version 1.6.1 --- pkgs/development/libraries/haskell/hspec/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/hspec/default.nix b/pkgs/development/libraries/haskell/hspec/default.nix index 354cd286de0..7b06ea9c21c 100644 --- a/pkgs/development/libraries/haskell/hspec/default.nix +++ b/pkgs/development/libraries/haskell/hspec/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "hspec"; - version = "1.5.4"; - sha256 = "18c7mj2qh0q7ksb9sa7jhpfzsbbsfbv3gpkjpz1fx17bd3h8vkld"; + version = "1.6.1"; + sha256 = "16gwzc5x04kj7847w4nw0msj7myk22hlfkpal9dcpdvslzzy44nh"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -20,9 +20,9 @@ cabal.mkDerivation (self: { ]; doCheck = false; meta = { - homepage = "http://hspec.github.com/"; + homepage = "http://hspec.github.io/"; description = "Behavior-Driven Development for Haskell"; - license = self.stdenv.lib.licenses.bsd3; + license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; }; }) From 585ee36fb9e8d3e059d71c35a25f5fc641e939ae Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 1 Jul 2013 11:04:04 +0200 Subject: [PATCH 148/798] haskell-http-conduit: update to version 1.9.4.1 --- 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 cea5708c269..d1cff617a82 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"; - sha256 = "0zm8m3nvxyc9z3b8d47ggx56raqpz1aa8r268k6gidpc5zpad2yl"; + version = "1.9.4.1"; + sha256 = "181irzldrr554naq2yvs0yzmkkfk26n59snrsmxhr79d9kdp73l4"; buildDepends = [ asn1Data base64Bytestring blazeBuilder blazeBuilderConduit caseInsensitive certificate conduit cookie cprngAes dataDefault From 469ec818b7bf158237d6abc8d755d5791734bdf2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 1 Jul 2013 11:04:04 +0200 Subject: [PATCH 149/798] haskell-http-reverse-proxy: update to version 0.2.0 --- .../libraries/haskell/http-reverse-proxy/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix b/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix index 6d1c34556f7..9be23188db4 100644 --- a/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix +++ b/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix @@ -1,17 +1,17 @@ { cabal, blazeBuilder, caseInsensitive, classyPrelude, conduit , dataDefault, hspec, httpConduit, httpTypes, liftedBase , monadControl, network, networkConduit, text, transformers, wai -, warp, word8 +, waiLogger, warp, word8 }: cabal.mkDerivation (self: { pname = "http-reverse-proxy"; - version = "0.1.1.6"; - sha256 = "0fh61rm3k00shzis2dkgifnkfn78vx124dzmmdzlf550kjmhxb9l"; + version = "0.2.0"; + sha256 = "01kqf9c2yr3x5jwzyn44gs76fbffpacxs2j89aa902l0rz6l8ral"; buildDepends = [ blazeBuilder caseInsensitive classyPrelude conduit dataDefault httpConduit httpTypes liftedBase monadControl network - networkConduit text wai warp word8 + networkConduit text wai waiLogger warp word8 ]; testDepends = [ blazeBuilder conduit hspec httpConduit httpTypes liftedBase network From 265e043cff14a80808763742cfd63fbbeef1de84 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 1 Jul 2013 11:04:04 +0200 Subject: [PATCH 150/798] haskell-io-choice: update to version 0.0.5 --- pkgs/development/libraries/haskell/io-choice/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/io-choice/default.nix b/pkgs/development/libraries/haskell/io-choice/default.nix index bec6431b42b..4cceb87c97e 100644 --- a/pkgs/development/libraries/haskell/io-choice/default.nix +++ b/pkgs/development/libraries/haskell/io-choice/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "io-choice"; - version = "0.0.4"; - sha256 = "1b6jvk37jkpd4m3r6ip70xwzrz67a30yam831nqpljsbgk2f9arq"; + version = "0.0.5"; + sha256 = "19nr8kxcg98510cqgjn4c9sd8i9yz8fv4ryqg6lzzgpwqzkvx5ph"; buildDepends = [ liftedBase monadControl transformers transformersBase ]; From 42c3918056b09acc16769022644e0fd3b02a80ae Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 1 Jul 2013 11:04:04 +0200 Subject: [PATCH 151/798] haskell-mime-mail: update to version 0.4.2 --- pkgs/development/libraries/haskell/mime-mail/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/mime-mail/default.nix b/pkgs/development/libraries/haskell/mime-mail/default.nix index d24bf5719bd..5b21949d5fa 100644 --- a/pkgs/development/libraries/haskell/mime-mail/default.nix +++ b/pkgs/development/libraries/haskell/mime-mail/default.nix @@ -1,12 +1,15 @@ -{ cabal, base64Bytestring, blazeBuilder, filepath, random, text }: +{ cabal, base64Bytestring, blazeBuilder, filepath, hspec, random +, text +}: cabal.mkDerivation (self: { pname = "mime-mail"; - version = "0.4.1.2"; - sha256 = "01dw9zvgxmwg0jslw14a9kjrmyjvwla8bw40w2426ifdwwxb3ywy"; + version = "0.4.2"; + sha256 = "1v9qdj53swhg8xg9s2x0m6d6xaff5ya6bpdifya2vsp08fmgn4l9"; buildDepends = [ base64Bytestring blazeBuilder filepath random text ]; + testDepends = [ blazeBuilder hspec ]; meta = { homepage = "http://github.com/snoyberg/mime-mail"; description = "Compose MIME email messages"; From 88034ca8196adaad5138ed1892d40f4ca8a67233 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 1 Jul 2013 11:04:04 +0200 Subject: [PATCH 152/798] haskell-oeis: update to version 0.3.2 --- pkgs/development/libraries/haskell/oeis/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/oeis/default.nix b/pkgs/development/libraries/haskell/oeis/default.nix index c8b9e984eb1..74b355c522a 100644 --- a/pkgs/development/libraries/haskell/oeis/default.nix +++ b/pkgs/development/libraries/haskell/oeis/default.nix @@ -1,12 +1,13 @@ -{ cabal, HTTP, network }: +{ cabal, HTTP, HUnit, network, testFramework, testFrameworkHunit }: cabal.mkDerivation (self: { pname = "oeis"; - version = "0.3.1"; - sha256 = "0kxs25b1z0b807vhrn8v7chsdsw8civqiym8767fy2rk5si0i4w2"; + version = "0.3.2"; + sha256 = "1lp4mbsh98vnyfbnq9224n98hajv8q5prpzgbcw90bih0rbiw4w4"; buildDepends = [ HTTP network ]; + testDepends = [ HUnit testFramework testFrameworkHunit ]; meta = { - description = "Interface to the Online Encyclopedia of Integer Sequences"; + description = "Interface to the Online Encyclopedia of Integer Sequences (OEIS)"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.andres ]; From be17d7d06c2411bf5bf64d03407f851a56cca072 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 1 Jul 2013 11:04:04 +0200 Subject: [PATCH 153/798] haskell-persistent-postgresql: update to version 1.2.1 --- .../libraries/haskell/persistent-postgresql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/persistent-postgresql/default.nix b/pkgs/development/libraries/haskell/persistent-postgresql/default.nix index c7d6b532db6..4195a048458 100644 --- a/pkgs/development/libraries/haskell/persistent-postgresql/default.nix +++ b/pkgs/development/libraries/haskell/persistent-postgresql/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "persistent-postgresql"; - version = "1.2.0"; - sha256 = "0i5ha1vs91makwrw4qqwdzp92i24ynmmsmjyqpik6q80fxxiwps6"; + version = "1.2.1"; + sha256 = "04gl1qdhag60q4j2r61qr1skim1wcyx2vq34j51qk1a62wyqsdrl"; buildDepends = [ aeson blazeBuilder conduit monadControl persistent postgresqlLibpq postgresqlSimple text time transformers From f35d36ed00d6716f177b7196c79325219027e595 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 1 Jul 2013 11:04:05 +0200 Subject: [PATCH 154/798] haskell-persistent-sqlite: update to version 1.2.1 --- .../libraries/haskell/persistent-sqlite/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/persistent-sqlite/default.nix b/pkgs/development/libraries/haskell/persistent-sqlite/default.nix index bb7a6731a26..e4a3bc77600 100644 --- a/pkgs/development/libraries/haskell/persistent-sqlite/default.nix +++ b/pkgs/development/libraries/haskell/persistent-sqlite/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "persistent-sqlite"; - version = "1.2.0"; - sha256 = "09xd9z16rcq9ymx5ysshzdr30lih55b9kasvbq5xw6wq7lvg6q4h"; + version = "1.2.1"; + sha256 = "1lbb8s6p3xixlkgwx30p473b438qjnw9s41bcm1q38vkklpa75y0"; buildDepends = [ aeson conduit monadControl monadLogger persistent text transformers ]; From 15a12839377c18d75e99cc8f0232a399df1862bd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 1 Jul 2013 11:04:05 +0200 Subject: [PATCH 155/798] haskell-persistent: update to version 1.2.1 --- pkgs/development/libraries/haskell/persistent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/persistent/default.nix b/pkgs/development/libraries/haskell/persistent/default.nix index 57bb615800b..7c4c1dba381 100644 --- a/pkgs/development/libraries/haskell/persistent/default.nix +++ b/pkgs/development/libraries/haskell/persistent/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "persistent"; - version = "1.2.0.2"; - sha256 = "026zdfccy57dbsacg8227jzcdyq50nb1bkcr56ryxi91ymlyf50k"; + version = "1.2.1"; + sha256 = "1f01fvagjxqqycblq3z3z6qcas9vp9bgxnjz09173x4c9xvg3qj2"; buildDepends = [ aeson attoparsec base64Bytestring blazeHtml blazeMarkup conduit liftedBase monadControl monadLogger pathPieces poolConduit From d71ce2786dc87e50661b0dc4c80c648937f22ce5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 1 Jul 2013 11:04:05 +0200 Subject: [PATCH 156/798] haskell-profunctor-extras: update to version 3.3.1 --- .../libraries/haskell/profunctor-extras/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/profunctor-extras/default.nix b/pkgs/development/libraries/haskell/profunctor-extras/default.nix index df16898ddd3..0094ec5a340 100644 --- a/pkgs/development/libraries/haskell/profunctor-extras/default.nix +++ b/pkgs/development/libraries/haskell/profunctor-extras/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "profunctor-extras"; - version = "3.3"; - sha256 = "0sdiwc1d2jx2xrzsxjsxjh8m24f4blr2m8vmh78knpi9hy0bxgvr"; + version = "3.3.1"; + sha256 = "0z3lip0mjw0xyf516shdrnkkp9h53wglz6sjjqagpjj2viyqkprb"; buildDepends = [ comonad profunctors semigroupoidExtras semigroupoids tagged transformers From 7a5c8039327763cab2821e2669615bbb6fa61483 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 1 Jul 2013 11:04:05 +0200 Subject: [PATCH 157/798] haskell-semigroupoids: update to version 3.0.3 --- pkgs/development/libraries/haskell/semigroupoids/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/semigroupoids/default.nix b/pkgs/development/libraries/haskell/semigroupoids/default.nix index 4f1367dd559..f8b535824cf 100644 --- a/pkgs/development/libraries/haskell/semigroupoids/default.nix +++ b/pkgs/development/libraries/haskell/semigroupoids/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "semigroupoids"; - version = "3.0.2"; - sha256 = "0k137iafw0srgmy4qwx3cbx00519c0h91nmszdbx6pzpvf6m5fwm"; + version = "3.0.3"; + sha256 = "0hxg3q4bx6lmccxx9hrgb1yvnvcgb5vcaw4xv1fgdcbrydjfgfrm"; buildDepends = [ comonad contravariant semigroups transformers ]; meta = { homepage = "http://github.com/ekmett/semigroupoids"; From ec8723e71a1c3c0fd4698767797409da923d2f71 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 1 Jul 2013 11:04:05 +0200 Subject: [PATCH 158/798] haskell-shake: update to version 0.10.6 --- pkgs/development/libraries/haskell/shake/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/shake/default.nix b/pkgs/development/libraries/haskell/shake/default.nix index b7f605c2b7e..26171a56fdc 100644 --- a/pkgs/development/libraries/haskell/shake/default.nix +++ b/pkgs/development/libraries/haskell/shake/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "shake"; - version = "0.10.5"; - sha256 = "1abbls2rmpyxpj41c0afvfjh1bw6j6rz1n0w4jhqrmq0d32kpg7a"; + version = "0.10.6"; + sha256 = "0d2wrgraifcj0rv9jmvc5a0gl0j1jjkc4r0nmaypnv6929kl26q8"; isLibrary = true; isExecutable = true; buildDepends = [ From b7e4259ac56b18dd06b02b4942766357f59f8ecd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 1 Jul 2013 11:04:05 +0200 Subject: [PATCH 159/798] haskell-shelly: update to version 1.3.0.1 --- pkgs/development/libraries/haskell/shelly/default.nix | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/haskell/shelly/default.nix b/pkgs/development/libraries/haskell/shelly/default.nix index 1e9e1f8c6cc..a61dfec8b7e 100644 --- a/pkgs/development/libraries/haskell/shelly/default.nix +++ b/pkgs/development/libraries/haskell/shelly/default.nix @@ -1,17 +1,13 @@ -{ cabal, hspec, HUnit, mtl, systemFileio, systemFilepath, text -, time, unixCompat +{ cabal, mtl, systemFileio, systemFilepath, text, time, unixCompat }: cabal.mkDerivation (self: { pname = "shelly"; - version = "0.15.4.1"; - sha256 = "12m11s22izz0ny1syb1ykp2hi9n240myf0nhapvn8jx1fgf5iyck"; + version = "1.3.0.1"; + sha256 = "0xcx6cxlb13wrn5wfnnb070h8cj3lnk285fxmigi6x97b9rjdl8w"; buildDepends = [ mtl systemFileio systemFilepath text time unixCompat ]; - testDepends = [ - hspec HUnit mtl systemFileio systemFilepath text time unixCompat - ]; meta = { homepage = "https://github.com/yesodweb/Shelly.hs"; description = "shell-like (systems) programming in Haskell"; From 643455fcea4a5d1c8dfa7a6cb39da73de95b1dd3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 1 Jul 2013 11:04:05 +0200 Subject: [PATCH 160/798] haskell-smallcheck: update to version 1.0.4 --- pkgs/development/libraries/haskell/smallcheck/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/smallcheck/default.nix b/pkgs/development/libraries/haskell/smallcheck/default.nix index 6d82e7e5132..bf4ba55e751 100644 --- a/pkgs/development/libraries/haskell/smallcheck/default.nix +++ b/pkgs/development/libraries/haskell/smallcheck/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "smallcheck"; - version = "1.0.2"; - sha256 = "09zlsvgbwgpjwkjhizbzzww2nvkyxvkf214yqxzfaa1cj9xzbbdi"; + version = "1.0.4"; + sha256 = "0zqssw7r56k7gi1lxdss3f4piqa692y728rli9p81q9rbcvi3x7z"; buildDepends = [ logict mtl ]; meta = { homepage = "https://github.com/feuerbach/smallcheck"; From 2af75c20c7bfba84bab8ff99db5629d75283b327 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 1 Jul 2013 11:04:05 +0200 Subject: [PATCH 161/798] haskell-tagged: update to version 0.6.1 --- pkgs/development/libraries/haskell/tagged/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/tagged/default.nix b/pkgs/development/libraries/haskell/tagged/default.nix index 42f0beef125..baf9703b161 100644 --- a/pkgs/development/libraries/haskell/tagged/default.nix +++ b/pkgs/development/libraries/haskell/tagged/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "tagged"; - version = "0.6"; - sha256 = "0w2sx6lys074y5ck2ll53dmak39pfnckbh6llgmicrj4zhgcd8jm"; + version = "0.6.1"; + sha256 = "1n3m1y06lhbsx9rfwwdx5xqnw4ni41b39iyysgj5894iz9rwrrnv"; meta = { homepage = "http://github.com/ekmett/tagged"; description = "Haskell 98 phantom types to avoid unsafely passing dummy arguments"; From edc1b8d14afa898c507cf9d1da6839830184430d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 1 Jul 2013 11:04:05 +0200 Subject: [PATCH 162/798] haskell-threadmanager: update to version 0.1.6 --- .../libraries/haskell/threadmanager/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/threadmanager/default.nix b/pkgs/development/libraries/haskell/threadmanager/default.nix index dc058844247..4641ec80f23 100644 --- a/pkgs/development/libraries/haskell/threadmanager/default.nix +++ b/pkgs/development/libraries/haskell/threadmanager/default.nix @@ -2,11 +2,10 @@ cabal.mkDerivation (self: { pname = "threadmanager"; - version = "0.1.5"; - sha256 = "0jdr0rrpx7frnh0a2vibg0170w48wvn6gv8imkiqiz6y6481ny5p"; + version = "0.1.6"; + sha256 = "16q09kx3rfjaa3rvyfwrxpsnvw50r3q8pk1if6xm0v4ya3lbvibs"; meta = { - homepage = "http://github.com/bsl/threadmanager"; - description = "Simple thread management"; + description = "(deprecated in favor of 'threads') Simple thread management"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.andres ]; From 435eab8d237cc46f68a61fca2854fe7f6a372003 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 1 Jul 2013 11:04:05 +0200 Subject: [PATCH 163/798] haskell-unix-time: update to version 0.1.9 --- pkgs/development/libraries/haskell/unix-time/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/unix-time/default.nix b/pkgs/development/libraries/haskell/unix-time/default.nix index 22d3af28fd0..c3e5ca14b23 100644 --- a/pkgs/development/libraries/haskell/unix-time/default.nix +++ b/pkgs/development/libraries/haskell/unix-time/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "unix-time"; - version = "0.1.8"; - sha256 = "1s9r2i4hl7nm1f4zya03q0a2ayliby51caziz1w79schhplfa5sv"; + version = "0.1.9"; + sha256 = "0z4761g7rkw771r9828h1l37pp3brrra9ihjg203h66jc1wlvb72"; testDepends = [ doctest hspec QuickCheck time ]; meta = { description = "Unix time parser/formatter and utilities"; From 66e80948bb60a005b40f6c954da74f4f3c6de52d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 1 Jul 2013 11:04:05 +0200 Subject: [PATCH 164/798] haskell-void: update to version 0.6.1 --- pkgs/development/libraries/haskell/void/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/void/default.nix b/pkgs/development/libraries/haskell/void/default.nix index 591040a9548..39cdcd8407f 100644 --- a/pkgs/development/libraries/haskell/void/default.nix +++ b/pkgs/development/libraries/haskell/void/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "void"; - version = "0.6"; - sha256 = "0g1dja7qcp2d9a4m8j1f4ddyvbl003znyk7yn5w5qiiqr1pacs1n"; + version = "0.6.1"; + sha256 = "09pa0n17b7cz7sa699gjdmp1hxcshl3170nl5sx2x99zvxz2mv42"; buildDepends = [ hashable semigroups ]; meta = { homepage = "http://github.com/ekmett/void"; From e0470dcdff95012eead8a7f11b0fffd48a94b584 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 1 Jul 2013 11:04:05 +0200 Subject: [PATCH 165/798] haskell-wai-test: update to version 1.3.1.1 --- pkgs/development/libraries/haskell/wai-test/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/wai-test/default.nix b/pkgs/development/libraries/haskell/wai-test/default.nix index 2d0f6637171..bbc1ed1d136 100644 --- a/pkgs/development/libraries/haskell/wai-test/default.nix +++ b/pkgs/development/libraries/haskell/wai-test/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "wai-test"; - version = "1.3.1"; - sha256 = "0dw9lbwb27yr3953ill0r727ivqav5b2ica8gbaalvnh3h5c8akg"; + version = "1.3.1.1"; + sha256 = "0daaq8kn1c35y26y7pb00sw1jyhp84zpzk6vfy1p4vfay4ppknd2"; buildDepends = [ blazeBuilder blazeBuilderConduit caseInsensitive conduit cookie httpTypes HUnit network text transformers wai From 3c5de343a2f85dc4bc25a59f1ea7d3fdb1a84bed Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 1 Jul 2013 11:04:05 +0200 Subject: [PATCH 166/798] haskell-warp: update to version 1.3.9 --- .../libraries/haskell/warp/default.nix | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix index 3cf1f8e6ba6..91f51a76e2a 100644 --- a/pkgs/development/libraries/haskell/warp/default.nix +++ b/pkgs/development/libraries/haskell/warp/default.nix @@ -1,22 +1,23 @@ { cabal, blazeBuilder, blazeBuilderConduit, caseInsensitive -, conduit, hashable, hspec, httpTypes, HUnit, liftedBase, network -, networkConduit, QuickCheck, simpleSendfile, transformers -, unixCompat, void, wai +, conduit, hashable, hspec, httpAttoparsec, httpTypes, HUnit +, liftedBase, network, networkConduit, QuickCheck, simpleSendfile +, transformers, unixCompat, void, wai }: cabal.mkDerivation (self: { pname = "warp"; - version = "1.3.8.2"; - sha256 = "0s8na04n21glgkc0bcc0171ikh9cagx35s2h6i1pb5pwa8l0akv6"; + version = "1.3.9"; + sha256 = "1gnsikk1z5q1mblwshg9pbaa1ijy64da7vscanzp70lw63jjk7cg"; buildDepends = [ blazeBuilder blazeBuilderConduit caseInsensitive conduit hashable - httpTypes liftedBase network networkConduit simpleSendfile - transformers unixCompat void wai + httpAttoparsec httpTypes liftedBase network networkConduit + simpleSendfile transformers unixCompat void wai ]; testDepends = [ blazeBuilder blazeBuilderConduit caseInsensitive conduit hashable - hspec httpTypes HUnit liftedBase network networkConduit QuickCheck - simpleSendfile transformers unixCompat void wai + hspec httpAttoparsec httpTypes HUnit liftedBase network + networkConduit QuickCheck simpleSendfile transformers unixCompat + void wai ]; meta = { homepage = "http://github.com/yesodweb/wai"; From aa4d6ca07d78c962109fa46c02062a8f59257e61 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 1 Jul 2013 11:04:06 +0200 Subject: [PATCH 167/798] haskell-xss-sanitize: update to version 0.3.4 --- pkgs/development/libraries/haskell/xss-sanitize/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/xss-sanitize/default.nix b/pkgs/development/libraries/haskell/xss-sanitize/default.nix index 89bdab65b17..d75f68818ef 100644 --- a/pkgs/development/libraries/haskell/xss-sanitize/default.nix +++ b/pkgs/development/libraries/haskell/xss-sanitize/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "xss-sanitize"; - version = "0.3.3"; - sha256 = "0xnyp8nwglh4waawijk1q5z8higf8mggh6hp0pp6ys4bm7gsp74a"; + version = "0.3.4"; + sha256 = "0xal75mk90a2hj70ipgcj95n6yw8hiki1r1vzad918aq2ihjqa53"; buildDepends = [ attoparsec cssText network tagsoup text utf8String ]; From 4c3f84b572be7730793b7e5eba062b1c810bd5e4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 1 Jul 2013 11:04:06 +0200 Subject: [PATCH 168/798] haskell-yesod-bin: update to version 1.2.1 --- pkgs/development/libraries/haskell/yesod-bin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-bin/default.nix b/pkgs/development/libraries/haskell/yesod-bin/default.nix index 717ca54d808..1a88ccfd223 100644 --- a/pkgs/development/libraries/haskell/yesod-bin/default.nix +++ b/pkgs/development/libraries/haskell/yesod-bin/default.nix @@ -10,8 +10,8 @@ cabal.mkDerivation (self: { pname = "yesod-bin"; - version = "1.2.0.1"; - sha256 = "0dikjxs1wdqv87ng6iqnnc3pwi3hzgqfwnnj3bb1fpz4plv4bnbc"; + version = "1.2.1"; + sha256 = "0qag1phagcdn1zq3kgxbxynqdy5grj8icifz896v0n6bzjsn102b"; isLibrary = false; isExecutable = true; buildDepends = [ From 928af0cb5532ecdef032ed7176cda3f6c5c74184 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 1 Jul 2013 11:04:06 +0200 Subject: [PATCH 169/798] haskell-yesod-core: update to version 1.2.3 --- pkgs/development/libraries/haskell/yesod-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix index d2188c68951..c725ef53d3d 100644 --- a/pkgs/development/libraries/haskell/yesod-core/default.nix +++ b/pkgs/development/libraries/haskell/yesod-core/default.nix @@ -10,8 +10,8 @@ cabal.mkDerivation (self: { pname = "yesod-core"; - version = "1.2.2"; - sha256 = "1fapqx1lrhhqjc9k9yc964sxnawj7ga62w83csbkkhwq3g5425yp"; + version = "1.2.3"; + sha256 = "0b7rs5w7s88mv2mwg778dpkvcdwawq10i9r176fqi321g3170iwk"; buildDepends = [ aeson attoparsecConduit blazeBuilder blazeHtml blazeMarkup caseInsensitive cereal clientsession conduit cookie dataDefault From 9e6de5d8c7024baf35498f574ef2a45d93b3a3b3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 1 Jul 2013 11:04:06 +0200 Subject: [PATCH 170/798] haskell-yesod-form: update to version 1.3.0.1 --- pkgs/development/libraries/haskell/yesod-form/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-form/default.nix b/pkgs/development/libraries/haskell/yesod-form/default.nix index d693cd1d0a4..d41dcb64b1f 100644 --- a/pkgs/development/libraries/haskell/yesod-form/default.nix +++ b/pkgs/development/libraries/haskell/yesod-form/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "yesod-form"; - version = "1.3.0"; - sha256 = "1y729h61w30yi4mcva727317gdc70nhn6jzxb7fmc9hqgnh136nc"; + version = "1.3.0.1"; + sha256 = "02qkx148yx7dm059h05xrrahsifckcjwgcfxfq1kjdiik45j7xiz"; buildDepends = [ aeson attoparsec blazeBuilder blazeHtml blazeMarkup cryptoApi dataDefault emailValidate hamlet network persistent resourcet From 028dd8b25e9c130d215ff24f533829f97448d30e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 1 Jul 2013 11:04:06 +0200 Subject: [PATCH 171/798] haskell-yesod: update to version 1.2.1.1 --- pkgs/development/libraries/haskell/yesod/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod/default.nix b/pkgs/development/libraries/haskell/yesod/default.nix index d2d0417da27..d195d59dd31 100644 --- a/pkgs/development/libraries/haskell/yesod/default.nix +++ b/pkgs/development/libraries/haskell/yesod/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "yesod"; - version = "1.2.1"; - sha256 = "19gwhav6sr6gd2kh92ga8a09hq9grllmnacdqkgasxwjsfxqa6zg"; + version = "1.2.1.1"; + sha256 = "1zx0r02k6znrm62wmhjcdlad3dil93kp6p862rvsvbkazwfy768a"; buildDepends = [ aeson blazeHtml blazeMarkup dataDefault hamlet monadControl networkConduit safe shakespeareCss shakespeareJs text transformers From 66a0b56567d61f624f2fd45758f6edba181ec82b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 1 Jul 2013 11:04:06 +0200 Subject: [PATCH 172/798] haskell-zeromq3-haskell: update to version 0.4 --- .../libraries/haskell/zeromq3-haskell/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/zeromq3-haskell/default.nix b/pkgs/development/libraries/haskell/zeromq3-haskell/default.nix index 3b4f9f8ff32..3711c66b8ca 100644 --- a/pkgs/development/libraries/haskell/zeromq3-haskell/default.nix +++ b/pkgs/development/libraries/haskell/zeromq3-haskell/default.nix @@ -1,12 +1,14 @@ -{ cabal, ansiTerminal, checkers, MonadCatchIOTransformers -, QuickCheck, transformers, zeromq +{ cabal, ansiTerminal, async, checkers, MonadCatchIOTransformers +, QuickCheck, semigroups, transformers, zeromq }: cabal.mkDerivation (self: { pname = "zeromq3-haskell"; - version = "0.3.1"; - sha256 = "0wr157wl2qpnbfsqy4nlsnd6nbkl063387f7ab4qa07yhj5av80f"; - buildDepends = [ MonadCatchIOTransformers transformers ]; + version = "0.4"; + sha256 = "0kwf4bzqp02vk78c9rphyamwbmvzff1z9hqp70dhfggm0q2d655s"; + buildDepends = [ + async MonadCatchIOTransformers semigroups transformers + ]; testDepends = [ ansiTerminal checkers MonadCatchIOTransformers QuickCheck transformers From 6b58b32ad8275370536736424265954e2c906a33 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 1 Jul 2013 11:04:06 +0200 Subject: [PATCH 173/798] haskell-hlint: update to version 1.8.47 --- 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 99b4ff3d1bc..f8e7492184d 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.46"; - sha256 = "0mq25xv0lmxfp9099pj7akmmw5pi0adq2w286wb4lpli82v8nfzf"; + version = "1.8.47"; + sha256 = "0ljqkqjn0b3j9la1i51k0019pirg4j8ap5v5b01ch7lj3jqzr85f"; isLibrary = true; isExecutable = true; buildDepends = [ From df12e039e374717c82330af4df10d4b89c2338dc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 1 Jul 2013 11:04:06 +0200 Subject: [PATCH 174/798] haskell-keter: update to version 0.4.0 --- pkgs/development/tools/haskell/keter/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/haskell/keter/default.nix b/pkgs/development/tools/haskell/keter/default.nix index f9d09abcc3f..7e8b3ea11ff 100644 --- a/pkgs/development/tools/haskell/keter/default.nix +++ b/pkgs/development/tools/haskell/keter/default.nix @@ -1,23 +1,23 @@ { cabal, attoparsec, blazeBuilder, caseInsensitive, conduit -, dataDefault, filepath, hinotify, httpConduit, httpReverseProxy +, dataDefault, filepath, fsnotify, httpConduit, httpReverseProxy , httpTypes, mtl, network, networkConduit, networkConduitTls , random, regexTdfa, systemFileio, systemFilepath, tar, text, time , transformers, unixCompat, unixProcessConduit, wai, waiAppStatic -, yaml, zlib +, warp, warpTls, yaml, zlib }: cabal.mkDerivation (self: { pname = "keter"; - version = "0.3.6.1"; - sha256 = "0jww64q74kx5h69mnv9wgc4kx0nlb06r7lf651gjkai8mf9dkqf2"; + version = "0.4.0"; + sha256 = "0ny8z2rfn090vci262xvyrdbkmdb7qjb4x15r81l2691ibf09ppv"; isLibrary = true; isExecutable = true; buildDepends = [ attoparsec blazeBuilder caseInsensitive conduit dataDefault - filepath hinotify httpConduit httpReverseProxy httpTypes mtl + filepath fsnotify httpConduit httpReverseProxy httpTypes mtl network networkConduit networkConduitTls random regexTdfa systemFileio systemFilepath tar text time transformers unixCompat - unixProcessConduit wai waiAppStatic yaml zlib + unixProcessConduit wai waiAppStatic warp warpTls yaml zlib ]; meta = { homepage = "http://www.yesodweb.com/"; From b8a44d72891238a5ee3b05a7f003042434fa04c3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 1 Jul 2013 11:38:45 +0200 Subject: [PATCH 175/798] haskell-byteable: add version 0.1.1 --- .../libraries/haskell/byteable/default.nix | 13 +++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/development/libraries/haskell/byteable/default.nix diff --git a/pkgs/development/libraries/haskell/byteable/default.nix b/pkgs/development/libraries/haskell/byteable/default.nix new file mode 100644 index 00000000000..6e527cc9958 --- /dev/null +++ b/pkgs/development/libraries/haskell/byteable/default.nix @@ -0,0 +1,13 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "byteable"; + version = "0.1.1"; + sha256 = "1qizg0kxxjqnd3cbrjhhidk5pbbciz0pb3z5kzikjjxnnnhk8fr4"; + meta = { + homepage = "http://github.com/vincenthz/hs-byteable"; + description = "Type class for sequence of bytes"; + 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 f117bf9d05e..9d6803f45b4 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -627,6 +627,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); boomerang = callPackage ../development/libraries/haskell/boomerang {}; + byteable = callPackage ../development/libraries/haskell/byteable {}; + bytedump = callPackage ../development/libraries/haskell/bytedump {}; byteorder = callPackage ../development/libraries/haskell/byteorder {}; From 2ece8f76f5ea31535147bddb5cc70c69851327aa Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 1 Jul 2013 11:38:54 +0200 Subject: [PATCH 176/798] haskell-warp-tls: add version 1.4.1.3 --- .../libraries/haskell/warp-tls/default.nix | 20 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/development/libraries/haskell/warp-tls/default.nix diff --git a/pkgs/development/libraries/haskell/warp-tls/default.nix b/pkgs/development/libraries/haskell/warp-tls/default.nix new file mode 100644 index 00000000000..5655ed9d8a1 --- /dev/null +++ b/pkgs/development/libraries/haskell/warp-tls/default.nix @@ -0,0 +1,20 @@ +{ cabal, certificate, conduit, cprngAes, cryptocipher +, cryptoRandomApi, network, networkConduit, pem, tls, tlsExtra +, transformers, wai, warp +}: + +cabal.mkDerivation (self: { + pname = "warp-tls"; + version = "1.4.1.3"; + sha256 = "0g26cw86kjg61agplqskhjb41ywcydyfzb46pjjc38g77xlcm2wx"; + buildDepends = [ + certificate conduit cprngAes cryptocipher cryptoRandomApi network + networkConduit pem tls tlsExtra transformers wai warp + ]; + meta = { + homepage = "http://github.com/yesodweb/wai"; + description = "HTTP over SSL/TLS support for Warp via the TLS package"; + 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 9d6803f45b4..cec83917a14 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2042,6 +2042,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); warp = callPackage ../development/libraries/haskell/warp {}; + warpTls = callPackage ../development/libraries/haskell/warp-tls {}; + WebBits_1_0 = callPackage ../development/libraries/haskell/WebBits/1.0.nix { parsec = self.parsec2; }; From 8bb29fb94ac2d3c792705a7ef7d4c6976b0ddaf5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 1 Jul 2013 11:39:03 +0200 Subject: [PATCH 177/798] haskell-http-attoparsec: add version 0.1.0 --- .../libraries/haskell/http-attoparsec/default.nix | 14 ++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/libraries/haskell/http-attoparsec/default.nix diff --git a/pkgs/development/libraries/haskell/http-attoparsec/default.nix b/pkgs/development/libraries/haskell/http-attoparsec/default.nix new file mode 100644 index 00000000000..9a7ad41de57 --- /dev/null +++ b/pkgs/development/libraries/haskell/http-attoparsec/default.nix @@ -0,0 +1,14 @@ +{ cabal, attoparsec, httpTypes }: + +cabal.mkDerivation (self: { + pname = "http-attoparsec"; + version = "0.1.0"; + sha256 = "1ncdjzgb5kv20y9kps4nawvbwaqnfil9g552if638vv8hag8cwq9"; + buildDepends = [ attoparsec httpTypes ]; + meta = { + homepage = "https://github.com/tlaitinen/http-attoparsec"; + description = "Attoparsec parsers for http-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 cec83917a14..722b82e9353 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1123,6 +1123,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); HTTP_4000_2_8 = callPackage ../development/libraries/haskell/HTTP/4000.2.8.nix {}; HTTP = self.HTTP_4000_2_8; + httpAttoparsec = callPackage ../development/libraries/haskell/http-attoparsec {}; + httpReverseProxy = callPackage ../development/libraries/haskell/http-reverse-proxy {}; hackageDb = callPackage ../development/libraries/haskell/hackage-db {}; From d9a71f35c8e0f023477df0595258ddc674ed970a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 1 Jul 2013 11:51:28 +0200 Subject: [PATCH 178/798] haskell-oeis: the test suite depends on network access --- pkgs/development/libraries/haskell/oeis/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/oeis/default.nix b/pkgs/development/libraries/haskell/oeis/default.nix index 74b355c522a..6236495a87a 100644 --- a/pkgs/development/libraries/haskell/oeis/default.nix +++ b/pkgs/development/libraries/haskell/oeis/default.nix @@ -6,6 +6,7 @@ cabal.mkDerivation (self: { sha256 = "1lp4mbsh98vnyfbnq9224n98hajv8q5prpzgbcw90bih0rbiw4w4"; buildDepends = [ HTTP network ]; testDepends = [ HUnit testFramework testFrameworkHunit ]; + doCheck = false; meta = { description = "Interface to the Online Encyclopedia of Integer Sequences (OEIS)"; license = self.stdenv.lib.licenses.bsd3; From 8e95d2564dd2a91dc86d08b3545eabcfaf58128d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 1 Jul 2013 12:16:38 +0200 Subject: [PATCH 179/798] haskell-time: bring back version 1.1.2.4 to un-break Haskell Platform 2009.2.0.2 --- .../development/libraries/haskell/time/1.1.2.4.nix | 14 ++++++++++++++ pkgs/top-level/haskell-packages.nix | 1 + 2 files changed, 15 insertions(+) create mode 100644 pkgs/development/libraries/haskell/time/1.1.2.4.nix diff --git a/pkgs/development/libraries/haskell/time/1.1.2.4.nix b/pkgs/development/libraries/haskell/time/1.1.2.4.nix new file mode 100644 index 00000000000..56072676b67 --- /dev/null +++ b/pkgs/development/libraries/haskell/time/1.1.2.4.nix @@ -0,0 +1,14 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "time"; + version = "1.1.2.4"; + sha256 = "11dfcb9b5ca76428a7a31019928c3c1898320f774e5d3df8e4407580d074fad3"; + meta = { + homepage = "http://semantic.org/TimeLib/"; + description = "A time library"; + 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 722b82e9353..f92a67ed5b7 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1934,6 +1934,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); threads = callPackage ../development/libraries/haskell/threads {}; + time_1_1_2_4 = callPackage ../development/libraries/haskell/time/1.1.2.4.nix {}; time_1_4_1 = callPackage ../development/libraries/haskell/time/1.4.1.nix {}; # time is in the core package set. It should only be necessary to # pass it explicitly in rare circumstances. From 47931dcefa8a1f6ae92e4fb8d7e30e98753147cd Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Mon, 1 Jul 2013 14:27:18 +0200 Subject: [PATCH 180/798] dysnomia: Some updated meta information --- pkgs/tools/package-management/disnix/dysnomia/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/disnix/dysnomia/default.nix b/pkgs/tools/package-management/disnix/dysnomia/default.nix index a2e2a78a46e..d932d0fa8b2 100644 --- a/pkgs/tools/package-management/disnix/dysnomia/default.nix +++ b/pkgs/tools/package-management/disnix/dysnomia/default.nix @@ -16,7 +16,7 @@ assert enableSubversionRepository -> subversion != null; assert enableEjabberdDump -> ejabberd != null; stdenv.mkDerivation { - name = "disnix-activation-scripts-0.3predff2da00e2d29d15feb2b6b42931232d691f7f03"; + name = "dysnomia-0.3predff2da00e2d29d15feb2b6b42931232d691f7f03"; src = fetchurl { url = http://hydra.nixos.org/build/5430159/download/1/dysnomia-0.3predff2da00e2d29d15feb2b6b42931232d691f7f03.tar.gz; sha256 = "1y9qf14ygdgq2hjh1p6rf7hcgij02wv091s8wpsn36mrmc9zk6rf"; @@ -41,7 +41,7 @@ stdenv.mkDerivation { ++ stdenv.lib.optional enableSubversionRepository subversion; meta = { - description = "Provides various activation types for Disnix"; + description = "Automated deployment of mutable components and services for Disnix"; license = "MIT"; maintainers = [ stdenv.lib.maintainers.sander ]; }; From cb534f1baa3ab0fb0d95dfb27a8703a1ac54e62a Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Mon, 1 Jul 2013 14:52:57 +0200 Subject: [PATCH 181/798] New package: Google Closure compiler version 20130603. A JavaScript optimizing compiler. --- .../development/compilers/closure/default.nix | 31 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/compilers/closure/default.nix diff --git a/pkgs/development/compilers/closure/default.nix b/pkgs/development/compilers/closure/default.nix new file mode 100644 index 00000000000..13c9f1c0350 --- /dev/null +++ b/pkgs/development/compilers/closure/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl, jre, gnutar, bash }: + +stdenv.mkDerivation rec { + name = "closure-compiler-${version}"; + version = "20130603"; + + src = fetchurl { + url = "http://dl.google.com/closure-compiler/compiler-${version}.tar.gz"; + sha256 = "0bk0s8p9r9an5m0l8y23wjlx490k15i4zah0a384a2akzji8y095"; + }; + + phases = [ "installPhase" ]; + + buildInputs = [ gnutar ]; + + installPhase = '' + mkdir -p $out/lib/java $out/bin + tar -xzf $src + cp -r compiler.jar $out/lib/java/ + echo "#!${bash}/bin/bash" > $out/bin/closure-compiler + echo "${jre}/bin/java -jar $out/lib/java/compiler.jar \"\$@\"" >> $out/bin/closure-compiler + chmod +x $out/bin/closure-compiler + ''; + + meta = { + description = "A tool for making JavaScript download and run faster"; + homepage = https://developers.google.com/closure/compiler/; + license = stdenv.lib.licenses.asl20; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2e11edd297c..bc6545833fa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2069,6 +2069,8 @@ let clean = callPackage ../development/compilers/clean { }; + closurecompiler = callPackage ../development/compilers/closure { }; + cmucl_binary = callPackage ../development/compilers/cmucl/binary.nix { }; cython = callPackage ../development/interpreters/cython { }; From 00df29c471d12b625f533e0adfafb17ea72432cc Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Mon, 1 Jul 2013 15:39:39 +0200 Subject: [PATCH 182/798] New package: lessc, version 1.4.0 Compiles LESS to CSS --- pkgs/development/compilers/lessc/default.nix | 28 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/compilers/lessc/default.nix diff --git a/pkgs/development/compilers/lessc/default.nix b/pkgs/development/compilers/lessc/default.nix new file mode 100644 index 00000000000..1d2bd5e7d0b --- /dev/null +++ b/pkgs/development/compilers/lessc/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchgit, nodejs }: + +stdenv.mkDerivation rec { + name = "lessc-${version}"; + version = "1.4.0"; + + src = fetchgit { + url = https://github.com/less/less.js.git; + rev = "refs/tags/v${version}"; + sha256 = "12nzaz7v1bnqzylh4zm1srrj7w7f45fqj4sihxyg0bknfvfwdc56"; + }; + + phases = [ "installPhase" ]; + + installPhase = '' + mkdir -p $out/bin $out/lib + cp -r $src/bin/* $out/bin/ + cp -r $src/lib/* $out/lib/ + substituteInPlace $out/bin/lessc --replace "/usr/bin/env node" ${nodejs}/bin/node + ''; + + meta = { + description = "LESS to CSS compiler"; + homepage = http://lesscss.org/; + license = stdenv.lib.licenses.asl20; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bc6545833fa..b464e8bf007 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2683,6 +2683,8 @@ let fpc = fpc; }; + lessc = callPackage ../development/compilers/lessc { }; + llvm = callPackage ../development/compilers/llvm { stdenv = if stdenv.isDarwin then stdenvAdapters.overrideGCC stdenv gccApple From 070ddf83678df43e879ecfb66cc8d3ea30a26876 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Mon, 1 Jul 2013 16:14:52 +0200 Subject: [PATCH 183/798] New package: Twitter Bootstrap 2.3.2, a front-end framework for web development. --- .../web/twitter-bootstrap/default.nix | 30 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/development/web/twitter-bootstrap/default.nix diff --git a/pkgs/development/web/twitter-bootstrap/default.nix b/pkgs/development/web/twitter-bootstrap/default.nix new file mode 100644 index 00000000000..9df7e3126d5 --- /dev/null +++ b/pkgs/development/web/twitter-bootstrap/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchgit, lessc, closurecompiler }: + +stdenv.mkDerivation rec { + name = "twitter-bootstrap-${version}"; + version = "2.3.2"; + + src = fetchgit { + url = https://github.com/twitter/bootstrap.git; + rev = "refs/tags/v${version}"; + sha256 = "093z4yxqhrr30vna67ksxz3bq146q2xr05hinh78pg2ls88k77la"; + }; + + buildInputs = [ lessc closurecompiler ]; + + phases = [ "installPhase" ]; + + installPhase = '' + mkdir -p $out/css $out/js $out/img + cp $src/img/* $out/img/ + closure-compiler --js $src/js/*.js > $out/js/bootstrap.js + lessc $src/less/bootstrap.less -O2 -x > $out/css/bootstrap.css + ''; + + meta = { + description = "Front-end framework for faster and easier web development"; + homepage = http://getbootstrap.com/; + license = stdenv.lib.licenses.asl20; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b464e8bf007..e58efe6569a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1753,6 +1753,8 @@ let ttf2pt1 = callPackage ../tools/misc/ttf2pt1 { }; + twitterBootstrap = callPackage ../development/web/twitter-bootstrap {}; + txt2man = callPackage ../tools/misc/txt2man { }; ucl = callPackage ../development/libraries/ucl { }; From 431cd91f01322853e2b1752833b1854f9c062cbd Mon Sep 17 00:00:00 2001 From: Joachim Schiele Date: Mon, 1 Jul 2013 18:24:43 +0200 Subject: [PATCH 184/798] fixed requested changes --- pkgs/tools/misc/aescrypt/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/aescrypt/default.nix b/pkgs/tools/misc/aescrypt/default.nix index 34987cd717e..8e2427d6139 100644 --- a/pkgs/tools/misc/aescrypt/default.nix +++ b/pkgs/tools/misc/aescrypt/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = []; meta = { - description = "AES Crypt is a file encryption software available on several operating systems that uses the industry standard Advanced Encryption Standard (AES) to easily and securely encrypt files."; + description = "A file encryption util that uses the industry standard Advanced Encryption Standard (AES) to easily and securely encrypt files"; homepage = http://www.aescrypt.com/; license = "GPLv2"; platforms = stdenv.lib.platforms.all; From e2e77c641a11d1e8e490c00301ff0db391ae1af6 Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 1 Jul 2013 18:54:01 +0200 Subject: [PATCH 185/798] python-blivet: Update to upstream version 0.17-1. Changes since 0.16-1: - Used Python type instead of variable name (hamzy) - Fix detection of valid EFI system partition during autopart. (dlehman) Full changelog can be found in the spec file in the package or at: https://git.fedorahosted.org/cgit/blivet.git/tree/python-blivet.spec Signed-off-by: aszlig --- 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 8993e467632..24630016729 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -453,12 +453,12 @@ pythonPackages = python.modules // rec { blivet = buildPythonPackage rec { name = "blivet-${version}"; - version = "0.16-1"; + version = "0.17-1"; src = fetchurl { url = "https://git.fedorahosted.org/cgit/blivet.git/snapshot/" + "${name}.tar.bz2"; - sha256 = "0gfxf86sc0mkpqjcainch6gqh3r7brgma85pbl4nfpzmylhzj5sg"; + sha256 = "0b28q539657mqif0mn5dfqcpqv7gbyszg83gf2fv6z7q6206rnx5"; }; postPatch = '' From 168115f610835654c1ed85a1bcf089f0919c9566 Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 1 Jul 2013 18:59:24 +0200 Subject: [PATCH 186/798] python-nixpart: Update to new version 0.2.0. This introduces the ability to mount filesystems (only). Also, the description is now less kickstart specific as in the long term we want to move away from kickstart syntax to Nix attribute sets. Signed-off-by: aszlig --- 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 24630016729..5049d0628b5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2805,11 +2805,11 @@ pythonPackages = python.modules // rec { nixpart = buildPythonPackage rec { name = "nixpart-${version}"; - version = "0.1"; + version = "0.2.0"; src = fetchurl { url = "https://github.com/aszlig/nixpart/archive/v${version}.tar.gz"; - sha256 = "1gyk260qnv14w94f0ljfra4mmigq9i6cx0gy4ppf3fia5wfj2a6j"; + sha256 = "1z94h76jn9igksgr84wwbi03fjamwb15hg432x189kgsld1ark4n"; }; propagatedBuildInputs = [ blivet ]; @@ -2817,7 +2817,7 @@ pythonPackages = python.modules // rec { doCheck = false; meta = { - description = "NixOS Anaconda Kickstart helper"; + description = "NixOS storage manager/partitioner"; license = pkgs.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.aszlig ]; }; From e969c941b3fab05fd35500b158cb1037c74dcc3d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 1 Jul 2013 19:55:33 +0200 Subject: [PATCH 187/798] thunderbird: Update to 17.0.7 --- .../networking/mailreaders/thunderbird/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 95ae70810a1..7d537d3085d 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -12,14 +12,14 @@ enableOfficialBranding ? false }: -let version = "17.0.6"; in +let version = "17.0.7"; in stdenv.mkDerivation { name = "thunderbird-${version}"; src = fetchurl { url = "ftp://ftp.mozilla.org/pub/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.bz2"; - sha1 = "cb5cb5dbfe77179b5853345c826eaa2bc634d48c"; + sha1 = "d6dca3e1cc4293f2e15d6b35056bd8dc319014ee"; }; enableParallelBuilding = false; From 61fef700eeb7791450e2428564cbc2dc8eb50424 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 1 Jul 2013 14:53:56 -0400 Subject: [PATCH 188/798] On linux-3.10, build in #! script support Starting with 3.10, #! script handling can be built modularly (or not at all). By default the nixpkgs builder sets everything modular, but since our initird init is a #! script this creates a chicken-and-egg problem on NixOS. Signed-off-by: Shea Levy --- pkgs/os-specific/linux/kernel/linux-3.10.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/linux-3.10.nix b/pkgs/os-specific/linux/kernel/linux-3.10.nix index 5e991d750ac..8c48a5b6c84 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.10.nix @@ -244,6 +244,9 @@ let # Easier debug of NFS issues SUNRPC_DEBUG y + # Our initrd init uses shebang scripts, so can't be modular + BINFMT_SCRIPT y + ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""} ${extraConfig} ''; From ebe81d17d7cb59733bdf5a185c3df8f98f927d85 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 2 Jul 2013 14:40:08 +0200 Subject: [PATCH 189/798] linux: Update to 3.2.48, 3.4.51 --- pkgs/os-specific/linux/kernel/linux-3.2.nix | 4 ++-- pkgs/os-specific/linux/kernel/linux-3.4.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.2.nix b/pkgs/os-specific/linux/kernel/linux-3.2.nix index c07448b43b5..36e97f15c2b 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.2.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.2.nix @@ -240,7 +240,7 @@ in import ./generic.nix ( rec { - version = "3.2.47"; + version = "3.2.48"; modDirVersion = version; @@ -250,7 +250,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "1554c7r32q87jxkkpggpgwg4rcc4zanahmrw30sg39krxbf2s7q1"; + sha256 = "1i24vpv2q8va4ywac970hjisi4jyra7ik99g9zv3bmxmm86k7nqk"; }; config = configWithPlatform stdenv.platform; diff --git a/pkgs/os-specific/linux/kernel/linux-3.4.nix b/pkgs/os-specific/linux/kernel/linux-3.4.nix index cd7e9f2b375..90df69dcf16 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix @@ -246,7 +246,7 @@ in import ./generic.nix ( rec { - version = "3.4.47"; + version = "3.4.51"; testing = false; preConfigure = '' @@ -255,7 +255,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "0hdrwzhfnm3c26i2iaw2rfhi7rl89n7dpvbznn29k27p3ifi3rp6"; + sha256 = "02msq95m2f73bw0y0sf2gsvg6yd7gfr6n1f2id77604mc6svb69s"; }; config = configWithPlatform stdenv.platform; From 75e34854f667506ecffcc6b5f8ba51a1aa6e4d43 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 2 Jul 2013 17:03:29 +0200 Subject: [PATCH 190/798] Remove redundant cifs option --- pkgs/build-support/vm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index b1eb82ed830..52b50adbfec 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -123,14 +123,14 @@ rec { echo "mounting Nix store..." mkdir -p /fs/nix/store - mount -t cifs //10.0.2.4/store /fs/nix/store -o guest,sec=none,sec=ntlm + mount -t cifs //10.0.2.4/store /fs/nix/store -o guest,sec=ntlm mkdir -p /fs/tmp mount -t tmpfs -o "mode=755" none /fs/tmp echo "mounting host's temporary directory..." mkdir -p /fs/tmp/xchg - mount -t cifs //10.0.2.4/xchg /fs/tmp/xchg -o guest,sec=none,sec=ntlm + mount -t cifs //10.0.2.4/xchg /fs/tmp/xchg -o guest,sec=ntlm mkdir -p /fs/proc mount -t proc none /fs/proc From ac8eb2523bfa6990f75e9bf070f25317c35fb69a Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Tue, 2 Jul 2013 18:38:56 +0200 Subject: [PATCH 191/798] darktable: Update to 1.2.2 --- pkgs/applications/graphics/darktable/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix index 91c91dc3925..315e101857e 100644 --- a/pkgs/applications/graphics/darktable/default.nix +++ b/pkgs/applications/graphics/darktable/default.nix @@ -8,12 +8,12 @@ assert stdenv ? glibc; stdenv.mkDerivation rec { - version = "1.2"; + version = "1.2.2"; name = "darktable-${version}"; src = fetchurl { url = "mirror://sourceforge/darktable/darktable/1.2/darktable-${version}.tar.xz"; - sha256 = "0l2lrly46nda7b2y4gskqqxaajia34g487bgjcpd5ysxbhmmhlnw"; + sha256 = "0nf85wjhlisbgwkfkc1wb8y7dpnx3v8zk9g3ghbd51gi7s62x40j"; }; buildInputs = From c590a5b4c32329a678680b83c53716ddd47d6dce Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Wed, 3 Jul 2013 00:14:25 +0200 Subject: [PATCH 192/798] plone: updating 4.3.0 to 4.3.1, minor renaming of nix files --- .../web/plone/{4.1.6.nix => 4.1.nix} | 0 .../web/plone/{4.2.5.nix => 4.2.nix} | 0 .../web/plone/{4.3.0.nix => 4.3.nix} | 405 ++++++++++-------- pkgs/top-level/all-packages.nix | 6 +- 4 files changed, 240 insertions(+), 171 deletions(-) rename pkgs/development/web/plone/{4.1.6.nix => 4.1.nix} (100%) rename pkgs/development/web/plone/{4.2.5.nix => 4.2.nix} (100%) rename pkgs/development/web/plone/{4.3.0.nix => 4.3.nix} (93%) diff --git a/pkgs/development/web/plone/4.1.6.nix b/pkgs/development/web/plone/4.1.nix similarity index 100% rename from pkgs/development/web/plone/4.1.6.nix rename to pkgs/development/web/plone/4.1.nix diff --git a/pkgs/development/web/plone/4.2.5.nix b/pkgs/development/web/plone/4.2.nix similarity index 100% rename from pkgs/development/web/plone/4.2.5.nix rename to pkgs/development/web/plone/4.2.nix diff --git a/pkgs/development/web/plone/4.3.0.nix b/pkgs/development/web/plone/4.3.nix similarity index 93% rename from pkgs/development/web/plone/4.3.0.nix rename to pkgs/development/web/plone/4.3.nix index 6dd85a17994..a0b0ff46153 100644 --- a/pkgs/development/web/plone/4.3.0.nix +++ b/pkgs/development/web/plone/4.3.nix @@ -1,7 +1,7 @@ # DO NOT EDIT THIS FILE! # # Nix expressions autogenerated with: -# bin/pypi2nix -n plone43Packages -d Plone -d mailinglogger -d zc.recipe.egg -d plone.recipe.zope2instance -d Pillow -i setuptools -i zc_buildout -i pillow -e plone/4.3.0.json -p plone/4.3.0.txt -o plone/4.3.0.nix +# bin/pypi2nix -n plone43Packages -d Plone -d mailinglogger -d zc.recipe.egg -d plone.recipe.zope2instance -d plone.recipe.zeoserver -d plone.recipe.varnish -d Pillow -i setuptools -i zc_buildout -i pillow -e plone/4.3.1.json -p plone/4.3.1.txt -o plone/4.3.1.nix { pkgs, pythonPackages }: @@ -10,10 +10,10 @@ let plone43Packages = pythonPackages.python.modules // rec { inherit (pkgs) fetchurl stdenv; plone_app_portlets = buildPythonPackage rec { - name = "plone.app.portlets-2.4.3"; + name = "plone.app.portlets-2.4.4"; src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.app.portlets/plone.app.portlets-2.4.3.zip"; - md5 = "2222bde82199670b40a6d1a242ce100a"; + url = "https://pypi.python.org/packages/source/p/plone.app.portlets/plone.app.portlets-2.4.4.zip"; + md5 = "c1144f7686cacf3d64fcd202ab2e5e2d"; }; buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ products_cmfdynamicviewfti zope_interface zope_traversing plone_app_form datetime zope_container zope_lifecycleevent zope_annotation five_customerize zope_i18nmessageid zope_publisher products_genericsetup plone_i18n feedparser zope_event zope_browser zope_contentprovider plone_memoize zope2 zope_schema acquisition transaction products_pluggableauthservice zope_site zope_component plone_app_vocabularies plone_portlets plone_app_i18n zope_configuration zope_formlib zodb3 five_formlib setuptools products_cmfcore ]; @@ -33,10 +33,10 @@ let plone43Packages = pythonPackages.python.modules // rec { }; zope2 = buildPythonPackage rec { - name = "Zope2-2.13.19"; + name = "Zope2-2.13.20"; src = fetchurl { - url = "http://pypi.python.org/packages/source/Z/Zope2/Zope2-2.13.19.zip"; - md5 = "26fee311aace7c12e406543ea91eb42a"; + url = "http://pypi.python.org/packages/source/Z/Zope2/Zope2-2.13.20.zip"; + md5 = "557b08fec37620c37e32f2dc01020f29"; }; buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ zope_testing zope_interface zope_traversing multimapping zope_size zope_contenttype zope_browserpage datetime zope_component zope_sendmail zope_lifecycleevent products_zctextindex products_standardcachemanagers persistence products_mimetools zope_i18nmessageid zope_publisher missing zope_viewlet zope_sequencesort zope_testbrowser docutils zope_event products_pythonscripts zope_browser zope_structuredtext zope_contentprovider zope_browsermenu zope_tal zope_exceptions products_mailhost products_btreefolder2 zopeundo zconfig record accesscontrol pytz products_ofsp zope_schema zexceptions zope_processlifetime acquisition extensionclass zope_proxy zope_site zope_container zope_pagetemplate zdaemon zope_browserresource zope_deferredimport initgroups zope_security zope_configuration zope_i18n products_zcatalog restrictedpython zodb3 documenttemplate setuptools zope_ptresource zlog tempstorage transaction zope_tales zope_location products_externalmethod ]; @@ -240,10 +240,10 @@ let plone43Packages = pythonPackages.python.modules // rec { }; plone_app_locales = buildPythonPackage rec { - name = "plone.app.locales-4.3"; + name = "plone.app.locales-4.3.1"; src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.app.locales/plone.app.locales-4.3.zip"; - md5 = "932a31c6d6c7328dca87ed2fcf25f5a8"; + url = "http://pypi.python.org/packages/source/p/plone.app.locales/plone.app.locales-4.3.1.zip"; + md5 = "c88b2da05361a24a564bdef30fb371aa"; }; buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ setuptools ]; @@ -291,8 +291,8 @@ let plone43Packages = pythonPackages.python.modules // rec { url = "http://pypi.python.org/packages/source/P/Products.GenericSetup/Products.GenericSetup-1.7.3.tar.gz"; md5 = "c48967c81c880ed33ee16a14caab3b11"; }; - buildInputs = [ ]; - propagatedBuildInputs = [ zope_formlib five_localsitemanager zope2 setuptools ]; + buildInputs = [ eggtestinfo ]; + propagatedBuildInputs = [ zope_formlib five_localsitemanager zope2 setuptools eggtestinfo ]; doCheck = false; installCommand = '' easy_install --always-unzip --no-deps --prefix="$out" . @@ -562,10 +562,10 @@ let plone43Packages = pythonPackages.python.modules // rec { }; plone_app_theming = buildPythonPackage rec { - name = "plone.app.theming-1.1"; + name = "plone.app.theming-1.1.1"; src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.app.theming/plone.app.theming-1.1.zip"; - md5 = "be281b5b740f8e35c73ba15adcd0f98d"; + url = "https://pypi.python.org/packages/source/p/plone.app.theming/plone.app.theming-1.1.1.zip"; + md5 = "a694b7a050b6e7c25d720d1e99bb73fa"; }; buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ products_cmfplone plone_subrequest repoze_xmliter plone_app_registry plone_transformchain zope_traversing lxml docutils roman plone_resource setuptools five_globalrequest diazo plone_resourceeditor ]; @@ -797,8 +797,8 @@ let plone43Packages = pythonPackages.python.modules // rec { url = "http://pypi.python.org/packages/source/P/Products.CMFCore/Products.CMFCore-2.2.7.tar.gz"; md5 = "9320a4023b8575097feacfd4a400e930"; }; - buildInputs = [ ]; - propagatedBuildInputs = [ products_genericsetup zope_app_publication products_zsqlmethods zope2 setuptools five_localsitemanager ]; + buildInputs = [ eggtestinfo ]; + propagatedBuildInputs = [ products_genericsetup zope_app_publication products_zsqlmethods zope2 setuptools five_localsitemanager eggtestinfo ]; doCheck = false; installCommand = '' easy_install --always-unzip --no-deps --prefix="$out" . @@ -930,12 +930,12 @@ let plone43Packages = pythonPackages.python.modules // rec { }; zconfig = buildPythonPackage rec { - name = "ZConfig-2.9.0"; + name = "ZConfig-2.9.1"; src = fetchurl { - url = "http://pypi.python.org/packages/source/Z/ZConfig/ZConfig-2.9.0.zip"; - md5 = "5c932690a70c8907efd240cdd76a7bc4"; + url = "http://pypi.python.org/packages/source/Z/ZConfig/ZConfig-2.9.1.tar.gz"; + md5 = "4738de641d90b992de5b89ff1bc2fe49"; }; - buildInputs = [ pkgs.unzip ]; + buildInputs = [ ]; propagatedBuildInputs = [ ]; doCheck = false; installCommand = '' @@ -1022,10 +1022,10 @@ let plone43Packages = pythonPackages.python.modules // rec { }; plone_outputfilters = buildPythonPackage rec { - name = "plone.outputfilters-1.9"; + name = "plone.outputfilters-1.10"; src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.outputfilters/plone.outputfilters-1.9.zip"; - md5 = "5ce62a45272c5501bf7d99325d2352c6"; + url = "https://pypi.python.org/packages/source/p/plone.outputfilters/plone.outputfilters-1.10.zip"; + md5 = "2c8ba3b7fd2bf18406eb49d01b478139"; }; buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ products_portaltransforms products_mimetypesregistry products_cmfcore setuptools products_genericsetup ]; @@ -1136,6 +1136,29 @@ let plone43Packages = pythonPackages.python.modules // rec { }; }; + zope_mkzeoinstance = buildPythonPackage rec { + name = "zope.mkzeoinstance-3.9.5"; + src = fetchurl { + url = "http://pypi.python.org/packages/source/z/zope.mkzeoinstance/zope.mkzeoinstance-3.9.5.tar.gz"; + md5 = "2c2dcf7cc7de58f7d009ca3294f54377"; + }; + buildInputs = [ ]; + propagatedBuildInputs = [ zodb3 setuptools ]; + doCheck = false; + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + meta = { + description = "UNKNOWN"; + homepage = "UNKNOWN"; + maintainers = [ + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.iElectric + ]; + }; + }; + repoze_xmliter = buildPythonPackage rec { name = "repoze.xmliter-0.5"; src = fetchurl { @@ -1205,6 +1228,29 @@ let plone43Packages = pythonPackages.python.modules // rec { }; }; + plone_recipe_varnish = buildPythonPackage rec { + name = "plone.recipe.varnish-1.2.2"; + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/plone.recipe.varnish/plone.recipe.varnish-1.2.2.zip"; + md5 = "100f8bd4857926b8aa1c6decfd05626b"; + }; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ zc_buildout setuptools ]; + doCheck = false; + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + meta = { + description = "UNKNOWN"; + homepage = "UNKNOWN"; + maintainers = [ + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.iElectric + ]; + }; + }; + zodb3 = buildPythonPackage rec { name = "ZODB3-3.10.5"; src = fetchurl { @@ -1229,10 +1275,10 @@ let plone43Packages = pythonPackages.python.modules // rec { }; plone_batching = buildPythonPackage rec { - name = "plone.batching-1.0b1"; + name = "plone.batching-1.0"; src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.batching/plone.batching-1.0b1.zip"; - md5 = "813a7d2d89fedf4f8e90e0c8da949c48"; + url = "https://pypi.python.org/packages/source/p/plone.batching/plone.batching-1.0.zip"; + md5 = "cabd58ccfec67cd384602343ce40dc7b"; }; buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ setuptools ]; @@ -1275,10 +1321,10 @@ let plone43Packages = pythonPackages.python.modules // rec { }; plone_app_search = buildPythonPackage rec { - name = "plone.app.search-1.1.3"; + name = "plone.app.search-1.1.4"; src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.app.search/plone.app.search-1.1.3.zip"; - md5 = "396677c3fba762077360ed97b14071e6"; + url = "https://pypi.python.org/packages/source/p/plone.app.search/plone.app.search-1.1.4.zip"; + md5 = "fb24320380ed2ba11e6f20cc1fe3b6df"; }; buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ plone_app_contentlisting setuptools ]; @@ -1367,10 +1413,10 @@ let plone43Packages = pythonPackages.python.modules // rec { }; products_cmfdifftool = buildPythonPackage rec { - name = "Products.CMFDiffTool-2.0.2"; + name = "Products.CMFDiffTool-2.1"; src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.CMFDiffTool/Products.CMFDiffTool-2.0.2.zip"; - md5 = "c12ba4fb9912a9a5a046b07b5b1cf69d"; + url = "https://pypi.python.org/packages/source/P/Products.CMFDiffTool/Products.CMFDiffTool-2.1.zip"; + md5 = "7513d954294e9f318182f9d61660abdb"; }; buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ zope2 products_genericsetup zope_interface setuptools products_cmfcore acquisition ]; @@ -1459,10 +1505,10 @@ let plone43Packages = pythonPackages.python.modules // rec { }; plonetheme_classic = buildPythonPackage rec { - name = "plonetheme.classic-1.3.1"; + name = "plonetheme.classic-1.3.2"; src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plonetheme.classic/plonetheme.classic-1.3.1.zip"; - md5 = "8f78a3e79dce692a568c5fbc58ba742a"; + url = "https://pypi.python.org/packages/source/p/plonetheme.classic/plonetheme.classic-1.3.2.zip"; + md5 = "c77d4c34afaf7c02df44d4df72328155"; }; buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ setuptools ]; @@ -1620,10 +1666,10 @@ let plone43Packages = pythonPackages.python.modules // rec { }; products_passwordresettool = buildPythonPackage rec { - name = "Products.PasswordResetTool-2.0.13"; + name = "Products.PasswordResetTool-2.0.14"; src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.PasswordResetTool/Products.PasswordResetTool-2.0.13.zip"; - md5 = "c87de8564cea91eb21c620669ef1a660"; + url = "https://pypi.python.org/packages/source/P/Products.PasswordResetTool/Products.PasswordResetTool-2.0.14.zip"; + md5 = "4267a5fef471d0ebe5ca848e86630702"; }; buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ zope_i18nmessageid zope2 zope_interface plone_memoize datetime zope_component setuptools zope_i18n products_cmfcore acquisition ]; @@ -1758,10 +1804,10 @@ let plone43Packages = pythonPackages.python.modules // rec { }; plone_portlet_collection = buildPythonPackage rec { - name = "plone.portlet.collection-2.1.4"; + name = "plone.portlet.collection-2.1.5"; src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.portlet.collection/plone.portlet.collection-2.1.4.zip"; - md5 = "00a139248309043e7b539dee5462e105"; + url = "http://pypi.python.org/packages/source/p/plone.portlet.collection/plone.portlet.collection-2.1.5.zip"; + md5 = "065f0d9141860229cf66d0ff2ed6d4ea"; }; buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ plone_memoize setuptools plone_app_vocabularies plone_app_form plone_portlets plone_app_portlets ]; @@ -1988,10 +2034,10 @@ let plone43Packages = pythonPackages.python.modules // rec { }; plone_dexterity = buildPythonPackage rec { - name = "plone.dexterity-2.1.2"; + name = "plone.dexterity-2.1.3"; src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.dexterity/plone.dexterity-2.1.2.zip"; - md5 = "3404947376be89f18e54bbfb5c0d3595"; + url = "https://pypi.python.org/packages/source/p/plone.dexterity/plone.dexterity-2.1.3.zip"; + md5 = "7f6444a2c26488e4068217266fd243b7"; }; buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ products_cmfdynamicviewfti zope_interface plone_memoize zope_dottedname zope_container zope_lifecycleevent plone_synchronize zope_annotation plone_autoform plone_behavior plone_folder zope_publisher products_cmfdefault zope_filerepresentation zope_browser plone_rfc822 zope_size plone_alterego products_statusmessages zope_schema zope2 zope_component zope_location zope_security plone_z3cform zodb3 plone_supermodel plone_uuid setuptools products_cmfcore ]; @@ -2148,6 +2194,29 @@ let plone43Packages = pythonPackages.python.modules // rec { }; }; + plone_recipe_zeoserver = buildPythonPackage rec { + name = "plone.recipe.zeoserver-1.2.6"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plone.recipe.zeoserver/plone.recipe.zeoserver-1.2.6.zip"; + md5 = "3e2b1634c850b76b0f485675799d0189"; + }; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ zope_mkzeoinstance zopeundo zodb3 zc_buildout setuptools zc_recipe_egg ]; + doCheck = false; + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + meta = { + description = "UNKNOWN"; + homepage = "UNKNOWN"; + maintainers = [ + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.iElectric + ]; + }; + }; + mailinglogger = buildPythonPackage rec { name = "mailinglogger-3.7.0"; src = fetchurl { @@ -2218,10 +2287,10 @@ let plone43Packages = pythonPackages.python.modules // rec { }; zope_tales = buildPythonPackage rec { - name = "zope.tales-3.5.2"; + name = "zope.tales-3.5.3"; src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.tales/zope.tales-3.5.2.tar.gz"; - md5 = "1c5060bd766a0a18632b7879fc9e4e1e"; + url = "http://pypi.python.org/packages/source/z/zope.tales/zope.tales-3.5.3.tar.gz"; + md5 = "a2dbc6e41140c29de81b66a4d703fc3f"; }; buildInputs = [ ]; propagatedBuildInputs = [ zope_interface setuptools zope_tal ]; @@ -2287,10 +2356,10 @@ let plone43Packages = pythonPackages.python.modules // rec { }; plone_i18n = buildPythonPackage rec { - name = "plone.i18n-2.0.6"; + name = "plone.i18n-2.0.8"; src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.i18n/plone.i18n-2.0.6.zip"; - md5 = "651e8cbc2cea201276777ab56337a3ee"; + url = "https://pypi.python.org/packages/source/p/plone.i18n/plone.i18n-2.0.8.zip"; + md5 = "572c21e86b99316a06dc9998454d7750"; }; buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ unidecode zope_publisher zope_interface zope_component setuptools zope_i18n ]; @@ -2402,10 +2471,10 @@ let plone43Packages = pythonPackages.python.modules // rec { }; archetypes_referencebrowserwidget = buildPythonPackage rec { - name = "archetypes.referencebrowserwidget-2.4.17"; + name = "archetypes.referencebrowserwidget-2.4.18"; src = fetchurl { - url = "http://pypi.python.org/packages/source/a/archetypes.referencebrowserwidget/archetypes.referencebrowserwidget-2.4.17.zip"; - md5 = "bb7552f5ccfddcd068649d7b8162020c"; + url = "https://pypi.python.org/packages/source/a/archetypes.referencebrowserwidget/archetypes.referencebrowserwidget-2.4.18.zip"; + md5 = "6eff85cbde401ff1566a76323792d514"; }; buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ plone_app_jquerytools zope_component zope_interface plone_app_form zope_formlib setuptools ]; @@ -2471,10 +2540,10 @@ let plone43Packages = pythonPackages.python.modules // rec { }; plonetheme_sunburst = buildPythonPackage rec { - name = "plonetheme.sunburst-1.4.1"; + name = "plonetheme.sunburst-1.4.4"; src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plonetheme.sunburst/plonetheme.sunburst-1.4.1.zip"; - md5 = "e2008dae3dad458dd7bf3be10e95160b"; + url = "https://pypi.python.org/packages/source/p/plonetheme.sunburst/plonetheme.sunburst-1.4.4.zip"; + md5 = "f2cb3fdd66ecc14d1a542d2ca76252db"; }; buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ setuptools ]; @@ -2540,10 +2609,10 @@ let plone43Packages = pythonPackages.python.modules // rec { }; products_archetypes = buildPythonPackage rec { - name = "Products.Archetypes-1.8.7"; + name = "Products.Archetypes-1.9.1"; src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.Archetypes/Products.Archetypes-1.8.7.zip"; - md5 = "b8a6b04a2f01251e0da1681199511537"; + url = "https://pypi.python.org/packages/source/P/Products.Archetypes/Products.Archetypes-1.9.1.zip"; + md5 = "c2343539f9f3e485f0bc98b46c12cd85"; }; buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ products_cmfformcontroller zope_interface zope_contenttype datetime zope_component products_mimetypesregistry plone_app_folder zope2 zope_lifecycleevent zope_i18nmessageid zope_publisher products_genericsetup products_validation products_portaltransforms products_cmfquickinstallertool products_placelesstranslationservice zope_event acquisition products_dcworkflow products_cmfdefault zope_tal plone_folder products_zsqlmethods products_statusmessages zope_schema zope_viewlet products_cmfcalendar extensionclass zope_datetime products_marshall zope_site zope_deferredimport zodb3 plone_uuid setuptools transaction zope_i18n products_cmfcore ]; @@ -2609,10 +2678,10 @@ let plone43Packages = pythonPackages.python.modules // rec { }; plone_scale = buildPythonPackage rec { - name = "plone.scale-1.3.1"; + name = "plone.scale-1.3.2"; src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.scale/plone.scale-1.3.1.zip"; - md5 = "05f3e5f79237ef9c318730a7c9b367be"; + url = "https://pypi.python.org/packages/source/p/plone.scale/plone.scale-1.3.2.zip"; + md5 = "584ccbf515aff9fef363c2cc8abac789"; }; buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ setuptools ]; @@ -2747,10 +2816,10 @@ let plone43Packages = pythonPackages.python.modules // rec { }; plone_app_linkintegrity = buildPythonPackage rec { - name = "plone.app.linkintegrity-1.5.1"; + name = "plone.app.linkintegrity-1.5.2"; src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.app.linkintegrity/plone.app.linkintegrity-1.5.1.zip"; - md5 = "89701634d59c3b1a6fc61e5a21c4de52"; + url = "https://pypi.python.org/packages/source/p/plone.app.linkintegrity/plone.app.linkintegrity-1.5.2.zip"; + md5 = "f97c61da9f243391cafdfe3fe1cf6d6c"; }; buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ setuptools ]; @@ -2770,10 +2839,10 @@ let plone43Packages = pythonPackages.python.modules // rec { }; products_resourceregistries = buildPythonPackage rec { - name = "Products.ResourceRegistries-2.2.7"; + name = "Products.ResourceRegistries-2.2.9"; src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.ResourceRegistries/Products.ResourceRegistries-2.2.7.zip"; - md5 = "954e31a168a1eb3153e2fd4e590bb9ba"; + url = "https://pypi.python.org/packages/source/P/Products.ResourceRegistries/Products.ResourceRegistries-2.2.9.zip"; + md5 = "8dd4f36eb894d868366b51941f6f0966"; }; buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ zope2 products_genericsetup zope_interface datetime plone_app_registry zope_component zodb3 setuptools zope_viewlet products_cmfcore acquisition ]; @@ -2862,10 +2931,10 @@ let plone43Packages = pythonPackages.python.modules // rec { }; plone_app_z3cform = buildPythonPackage rec { - name = "plone.app.z3cform-0.7.2"; + name = "plone.app.z3cform-0.7.3"; src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.app.z3cform/plone.app.z3cform-0.7.2.zip"; - md5 = "aa8d1d45f8072ccfbfe0a608cd7144b6"; + url = "https://pypi.python.org/packages/source/p/plone.app.z3cform/plone.app.z3cform-0.7.3.zip"; + md5 = "deddc1af36efb26a6792c9803531c665"; }; buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ zope2 setuptools plone_z3cform zope_interface z3c_formwidget_query collective_z3cform_datetimewidget zope_component zope_browserpage plone_protect zope_traversing ]; @@ -2977,10 +3046,10 @@ let plone43Packages = pythonPackages.python.modules // rec { }; plone_app_discussion = buildPythonPackage rec { - name = "plone.app.discussion-2.2.5"; + name = "plone.app.discussion-2.2.6"; src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.app.discussion/plone.app.discussion-2.2.5.zip"; - md5 = "a6c3a6e5590943f6ac63a49f8e075cdb"; + url = "https://pypi.python.org/packages/source/p/plone.app.discussion/plone.app.discussion-2.2.6.zip"; + md5 = "36cf9cd22119282f49facd03fb3c2632"; }; buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ plone_app_uuid zope_site plone_indexer collective_monkeypatcher zope_interface plone_app_z3cform zope_container plone_app_layout plone_z3cform plone_app_registry zope_component zodb3 zope_event setuptools z3c_form zope_lifecycleevent zope_annotation plone_registry ]; @@ -3023,10 +3092,10 @@ let plone43Packages = pythonPackages.python.modules // rec { }; plone = buildPythonPackage rec { - name = "Plone-4.3"; + name = "Plone-4.3.1"; src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Plone/Plone-4.3.zip"; - md5 = "be27f5d87cf44338be6f209459b13b70"; + url = "https://pypi.python.org/packages/source/P/Plone/Plone-4.3.1.zip"; + md5 = "faefd5d2044a9f7660fd18388fd71a4e"; }; buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ products_cmfplone plone_app_caching plone_app_dexterity plone_app_theming setuptools products_cmfplacefulworkflow plone_app_openid plone_app_iterate wicked ]; @@ -3138,10 +3207,10 @@ let plone43Packages = pythonPackages.python.modules // rec { }; plone_recipe_zope2instance = buildPythonPackage rec { - name = "plone.recipe.zope2instance-4.2.10"; + name = "plone.recipe.zope2instance-4.2.11"; src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.recipe.zope2instance/plone.recipe.zope2instance-4.2.10.zip"; - md5 = "787fad7fa44757de74a50a91e9bcfcb5"; + url = "https://pypi.python.org/packages/source/p/plone.recipe.zope2instance/plone.recipe.zope2instance-4.2.11.zip"; + md5 = "ac51fe0566b43866906181134a3c8a9e"; }; buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ zodb3 mailinglogger zc_buildout setuptools zope2 zc_recipe_egg ]; @@ -3161,10 +3230,10 @@ let plone43Packages = pythonPackages.python.modules // rec { }; plone_supermodel = buildPythonPackage rec { - name = "plone.supermodel-1.2.1"; + name = "plone.supermodel-1.2.2"; src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.supermodel/plone.supermodel-1.2.1.zip"; - md5 = "b60d1553b297d41d9e2181afe15da4f4"; + url = "https://pypi.python.org/packages/source/p/plone.supermodel/plone.supermodel-1.2.2.zip"; + md5 = "6e829dc362d6ff8e3c7696277e11e322"; }; buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ lxml zope_deferredimport zope_interface zope_dottedname zope_component z3c_zcmlhook setuptools zope_schema ]; @@ -3184,10 +3253,10 @@ let plone43Packages = pythonPackages.python.modules // rec { }; plone_app_registry = buildPythonPackage rec { - name = "plone.app.registry-1.2.2"; + name = "plone.app.registry-1.2.3"; src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.app.registry/plone.app.registry-1.2.2.zip"; - md5 = "d4659a2c4cfb3a66cd6c7ff1ca17be7f"; + url = "https://pypi.python.org/packages/source/p/plone.app.registry/plone.app.registry-1.2.3.zip"; + md5 = "b2269e10516e8f2faf83545e3d0163d8"; }; buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ zope_i18nmessageid lxml plone_registry products_genericsetup plone_supermodel plone_app_z3cform zope_dottedname zope_component zope2 setuptools zope_interface products_statusmessages plone_autoform products_cmfcore ]; @@ -3345,13 +3414,13 @@ let plone43Packages = pythonPackages.python.modules // rec { }; plone_app_imaging = buildPythonPackage rec { - name = "plone.app.imaging-1.0.7"; + name = "plone.app.imaging-1.0.9"; src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.app.imaging/plone.app.imaging-1.0.7.zip"; - md5 = "27c24477bdcbcebeba6cd83419a57aa6"; + url = "https://pypi.python.org/packages/source/p/plone.app.imaging/plone.app.imaging-1.0.9.zip"; + md5 = "e680c5540021a70266343b935ac732a7"; }; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ plone_scale setuptools ]; + propagatedBuildInputs = [ ]; doCheck = false; installCommand = '' easy_install --always-unzip --no-deps --prefix="$out" . @@ -3483,10 +3552,10 @@ let plone43Packages = pythonPackages.python.modules // rec { }; pytz = buildPythonPackage rec { - name = "pytz-2012g"; + name = "pytz-2013b"; src = fetchurl { - url = "http://pypi.python.org/packages/source/p/pytz/pytz-2012g.zip"; - md5 = "1a9b24da1ab6328074b48fc3d4525078"; + url = "http://pypi.python.org/packages/source/p/pytz/pytz-2013b.zip"; + md5 = "c70dc37ffe435dd77e3f967a0dffe928"; }; buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ ]; @@ -3575,10 +3644,10 @@ let plone43Packages = pythonPackages.python.modules // rec { }; plone_app_upgrade = buildPythonPackage rec { - name = "plone.app.upgrade-1.3.1"; + name = "plone.app.upgrade-1.3.3"; src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.app.upgrade/plone.app.upgrade-1.3.1.zip"; - md5 = "ebbfe71e31e40df535c8c1a2bc6133e6"; + url = "https://pypi.python.org/packages/source/p/plone.app.upgrade/plone.app.upgrade-1.3.3.zip"; + md5 = "1c45e809fba27bec11e8a40f686f0f5b"; }; buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ products_cmfformcontroller zope_interface products_cmfactionicons products_cmfeditions products_archetypes products_mimetypesregistry plone_app_folder products_cmfuid products_securemailhost zope_ramcache products_genericsetup products_cmfdifftool five_localsitemanager products_cmfquickinstallertool products_portaltransforms products_cmfdefault acquisition products_dcworkflow products_zcatalog borg_localrole products_contentmigration products_resourceregistries plone_portlets zope2 plone_app_portlets products_cmfcalendar products_plonepas transaction products_pluggableauthservice zope_site zope_component zope_location products_plonelanguagetool plone_session setuptools products_cmfcore ]; @@ -3621,10 +3690,10 @@ let plone43Packages = pythonPackages.python.modules // rec { }; plone_resourceeditor = buildPythonPackage rec { - name = "plone.resourceeditor-1.0b4"; + name = "plone.resourceeditor-1.0"; src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.resourceeditor/plone.resourceeditor-1.0b4.zip"; - md5 = "6e419868c2ea94a322dd631a1b0b753c"; + url = "https://pypi.python.org/packages/source/p/plone.resourceeditor/plone.resourceeditor-1.0.zip"; + md5 = "443ff0a0ad83b94fc08cac46ee3b2ad4"; }; buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ plone_resource zope2 zope_publisher zope_interface zope_component setuptools zope_schema ]; @@ -3644,10 +3713,10 @@ let plone43Packages = pythonPackages.python.modules // rec { }; products_atcontenttypes = buildPythonPackage rec { - name = "Products.ATContentTypes-2.1.12"; + name = "Products.ATContentTypes-2.1.13"; src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.ATContentTypes/Products.ATContentTypes-2.1.12.zip"; - md5 = "ef38ce0769a5f44e272623f8f118a669"; + url = "https://pypi.python.org/packages/source/P/Products.ATContentTypes/Products.ATContentTypes-2.1.13.zip"; + md5 = "093899fc74f5e2a83db464c96d0f5293"; }; buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ products_cmfdynamicviewfti zope_interface plone_memoize datetime products_archetypes products_mimetypesregistry plone_app_folder zope2 zope_i18nmessageid zope_publisher products_genericsetup plone_i18n products_portaltransforms products_cmfdefault products_atreferencebrowserwidget zope_tal zconfig archetypes_referencebrowserwidget transaction products_validation acquisition extensionclass zope_component plone_app_layout zodb3 setuptools zope_i18n products_cmfcore ]; @@ -3713,10 +3782,10 @@ let plone43Packages = pythonPackages.python.modules // rec { }; plone_app_content = buildPythonPackage rec { - name = "plone.app.content-2.1.1"; + name = "plone.app.content-2.1.2"; src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.app.content/plone.app.content-2.1.1.zip"; - md5 = "96d9967254ea616783ca8b340a542d46"; + url = "https://pypi.python.org/packages/source/p/plone.app.content/plone.app.content-2.1.2.zip"; + md5 = "247eb174269b2ab03c05f318915f087e"; }; buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ zope_i18nmessageid zope2 zope_publisher zope_container plone_batching zope_interface plone_memoize plone_i18n zope_component zope_event products_cmfcore setuptools zope_schema zope_lifecycleevent zope_i18n zope_viewlet acquisition products_cmfdefault ]; @@ -3759,10 +3828,10 @@ let plone43Packages = pythonPackages.python.modules // rec { }; plone_autoform = buildPythonPackage rec { - name = "plone.autoform-1.3"; + name = "plone.autoform-1.4"; src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.autoform/plone.autoform-1.3.zip"; - md5 = "4cb2935ba9cda3eb3ee801ad8cda7c60"; + url = "https://pypi.python.org/packages/source/p/plone.autoform/plone.autoform-1.4.zip"; + md5 = "01e5ccb59253bfaaa02c1ab4be3f212f"; }; buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ z3c_form zope_interface zope_dottedname zope_security setuptools plone_supermodel zope_schema plone_z3cform ]; @@ -3782,10 +3851,10 @@ let plone43Packages = pythonPackages.python.modules // rec { }; plone_app_contentrules = buildPythonPackage rec { - name = "plone.app.contentrules-3.0.1"; + name = "plone.app.contentrules-3.0.3"; src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.app.contentrules/plone.app.contentrules-3.0.1.zip"; - md5 = "08138cb6e3f15a2a9d43990f55fdae5f"; + url = "https://pypi.python.org/packages/source/p/plone.app.contentrules/plone.app.contentrules-3.0.3.zip"; + md5 = "518c1e22a9cfe187b6770e62be4f8bd8"; }; buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ zope_interface zope_traversing plone_app_form zope_component zope_lifecycleevent zope_annotation zope_i18nmessageid products_genericsetup zope_event products_cmfdefault zope_browser plone_uuid plone_memoize zope2 plone_stringinterp products_statusmessages plone_contentrules zope_schema acquisition transaction zope_site zope_container plone_app_vocabularies zope_publisher zope_formlib zodb3 five_formlib setuptools products_cmfcore ]; @@ -3851,10 +3920,10 @@ let plone43Packages = pythonPackages.python.modules // rec { }; products_plonetestcase = buildPythonPackage rec { - name = "Products.PloneTestCase-0.9.16"; + name = "Products.PloneTestCase-0.9.17"; src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.PloneTestCase/Products.PloneTestCase-0.9.16.zip"; - md5 = "968a265bede995f485988158e4e6dd7f"; + url = "https://pypi.python.org/packages/source/P/Products.PloneTestCase/Products.PloneTestCase-0.9.17.zip"; + md5 = "2a5bfb94220a520961d710abc92280f2"; }; buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ products_cmfplone zope_testing zope2 products_genericsetup zope_site zope_interface products_atcontenttypes zope_component zodb3 setuptools products_cmfcore acquisition ]; @@ -3874,10 +3943,10 @@ let plone43Packages = pythonPackages.python.modules // rec { }; plone_stringinterp = buildPythonPackage rec { - name = "plone.stringinterp-1.0.7"; + name = "plone.stringinterp-1.0.10"; src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.stringinterp/plone.stringinterp-1.0.7.zip"; - md5 = "81909716210c6ac3fd0ee87f45ea523d"; + url = "https://pypi.python.org/packages/source/p/plone.stringinterp/plone.stringinterp-1.0.10.zip"; + md5 = "595074e94944ad6860e2105a020a3b9a"; }; buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ zope_i18n products_cmfcore setuptools ]; @@ -3897,10 +3966,10 @@ let plone43Packages = pythonPackages.python.modules // rec { }; plone_formwidget_namedfile = buildPythonPackage rec { - name = "plone.formwidget.namedfile-1.0.5"; + name = "plone.formwidget.namedfile-1.0.6"; src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.formwidget.namedfile/plone.formwidget.namedfile-1.0.5.zip"; - md5 = "7d39a5760d679c89d8e41abbc295240f"; + url = "https://pypi.python.org/packages/source/p/plone.formwidget.namedfile/plone.formwidget.namedfile-1.0.6.zip"; + md5 = "afd20f030906a72fca7548876bdcbb48"; }; buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ z3c_form plone_z3cform plone_namedfile setuptools ]; @@ -3943,10 +4012,10 @@ let plone43Packages = pythonPackages.python.modules // rec { }; products_cmfdynamicviewfti = buildPythonPackage rec { - name = "Products.CMFDynamicViewFTI-4.0.4"; + name = "Products.CMFDynamicViewFTI-4.0.5"; src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.CMFDynamicViewFTI/Products.CMFDynamicViewFTI-4.0.4.zip"; - md5 = "0358cdcfcaaafd6ff407a49752c8066b"; + url = "https://pypi.python.org/packages/source/P/Products.CMFDynamicViewFTI/Products.CMFDynamicViewFTI-4.0.5.zip"; + md5 = "2d31b1700ed8b1441adc737b454af693"; }; buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ extensionclass products_genericsetup zope_browsermenu zope_interface zope_component zope2 setuptools products_cmfcore acquisition ]; @@ -4219,10 +4288,10 @@ let plone43Packages = pythonPackages.python.modules // rec { }; products_tinymce = buildPythonPackage rec { - name = "Products.TinyMCE-1.3.3"; + name = "Products.TinyMCE-1.3.4"; src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.TinyMCE/Products.TinyMCE-1.3.3.zip"; - md5 = "3a88b1d1cbd34b860fbe6b3de979e2ea"; + url = "https://pypi.python.org/packages/source/P/Products.TinyMCE/Products.TinyMCE-1.3.4.zip"; + md5 = "e697dfdd72f3b6238e26908bb455d39a"; }; buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ products_archetypes plone_app_imaging plone_namedfile plone_app_layout zope_schema products_resourceregistries zope_app_content plone_caching setuptools plone_outputfilters ]; @@ -4265,13 +4334,13 @@ let plone43Packages = pythonPackages.python.modules // rec { }; z3c_form = buildPythonPackage rec { - name = "z3c.form-3.0.0a3"; + name = "z3c.form-3.0.1"; src = fetchurl { - url = "http://pypi.python.org/packages/source/z/z3c.form/z3c.form-3.0.0a3.zip"; - md5 = "557032834c90b71cf55b1068ee41472b"; + url = "https://pypi.python.org/packages/source/z/z3c.form/z3c.form-3.0.1.zip"; + md5 = "7c9338dbe89b8c27ebba7441b14786ac"; }; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ zope_i18nmessageid zope_publisher zope_site zope_pagetemplate zope_interface zope_browserresource six zope_security zope_configuration zope_component zope_event zope_traversing setuptools zope_schema zope_lifecycleevent zope_browser zope_i18n zope_location zope_contentprovider ]; + propagatedBuildInputs = [ zope_i18nmessageid zope_publisher zope_site zope_pagetemplate zope_interface zope_browserresource six zope_security zope_configuration zope_component zope_browserpage zope_event zope_traversing setuptools zope_schema zope_lifecycleevent zope_browser zope_i18n zope_location zope_contentprovider ]; doCheck = false; installCommand = '' easy_install --always-unzip --no-deps --prefix="$out" . @@ -4495,13 +4564,13 @@ let plone43Packages = pythonPackages.python.modules // rec { }; plone_app_dexterity = buildPythonPackage rec { - name = "plone.app.dexterity-2.0.7"; + name = "plone.app.dexterity-2.0.8"; src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.app.dexterity/plone.app.dexterity-2.0.7.zip"; - md5 = "3187fc0a9082847d773eeec9bce6d217"; + url = "https://pypi.python.org/packages/source/p/plone.app.dexterity/plone.app.dexterity-2.0.8.zip"; + md5 = "2e0ec48224a3a8afd51656c22d574359"; }; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ collective_z3cform_datetimewidget zope_interface zope_component plone_dexterity plone_autoform plone_behavior lxml zope_publisher products_genericsetup plone_supermodel plone_namedfile plone_app_content plone_app_textfield plone_app_z3cform plone_rfc822 plone_formwidget_namedfile z3c_form plone_portlets plone_app_uuid zope_browserpage plone_contentrules products_cmfplone zope_schema products_atcontenttypes zope2 plone_app_layout plone_schemaeditor plone_z3cform setuptools products_cmfcore ]; + propagatedBuildInputs = [ collective_z3cform_datetimewidget zope_interface zope_component plone_dexterity plone_autoform plone_app_z3cform plone_behavior lxml zope_publisher products_genericsetup plone_supermodel plone_namedfile plone_app_content z3c_form plone_app_textfield plone_rfc822 plone_formwidget_namedfile plone_portlets plone_app_uuid zope_browserpage plone_contentrules products_cmfplone zope_schema products_atcontenttypes zope2 plone_app_layout plone_schemaeditor plone_z3cform setuptools products_cmfcore ]; doCheck = false; installCommand = '' easy_install --always-unzip --no-deps --prefix="$out" . @@ -4541,10 +4610,10 @@ let plone43Packages = pythonPackages.python.modules // rec { }; plone_app_layout = buildPythonPackage rec { - name = "plone.app.layout-2.3.4"; + name = "plone.app.layout-2.3.5"; src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.app.layout/plone.app.layout-2.3.4.zip"; - md5 = "817819f27ad46fcb8a9d66e988fa08f2"; + url = "https://pypi.python.org/packages/source/p/plone.app.layout/plone.app.layout-2.3.5.zip"; + md5 = "960665807ad60eb3e12c52a0cf092ceb"; }; buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ products_cmfdynamicviewfti zope_deprecation zope_interface plone_memoize zope_dottedname datetime zope_component zope_annotation zope_publisher plone_i18n products_cmfdefault plone_app_viewletmanager plone_portlets plone_app_portlets zope_schema zope_viewlet acquisition zope2 setuptools zope_i18n plone_locking products_cmfcore products_cmfeditions ]; @@ -4840,10 +4909,10 @@ let plone43Packages = pythonPackages.python.modules // rec { }; plone_app_workflow = buildPythonPackage rec { - name = "plone.app.workflow-2.1.2"; + name = "plone.app.workflow-2.1.5"; src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.app.workflow/plone.app.workflow-2.1.2.zip"; - md5 = "8da95b396f3a9ec54895085ef12202a7"; + url = "https://pypi.python.org/packages/source/p/plone.app.workflow/plone.app.workflow-2.1.5.zip"; + md5 = "b3589b4def82201adc196b3075b54213"; }; buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ zope_i18nmessageid transaction products_genericsetup zope_site zope_interface plone_memoize zope_testing datetime zope_component products_statusmessages zope2 setuptools products_dcworkflow zope_schema zope_i18n products_cmfcore acquisition ]; @@ -4932,10 +5001,10 @@ let plone43Packages = pythonPackages.python.modules // rec { }; plone_app_collection = buildPythonPackage rec { - name = "plone.app.collection-1.0.9"; + name = "plone.app.collection-1.0.10"; src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.app.collection/plone.app.collection-1.0.9.zip"; - md5 = "bde68dc585ca0a4715ab55d4b4afcf9a"; + url = "https://pypi.python.org/packages/source/p/plone.app.collection/plone.app.collection-1.0.10.zip"; + md5 = "1042ac059be2311d4758452a3fa4f82e"; }; buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ plone_portlet_collection zope_i18nmessageid transaction plone_app_contentlisting zope_component plone_app_vocabularies plone_app_form products_validation zope_configuration plone_portlets setuptools products_archetypes zope2 plone_app_portlets zope_interface zope_schema products_cmfquickinstallertool archetypes_querywidget products_cmfcore zope_formlib ]; @@ -4955,10 +5024,10 @@ let plone43Packages = pythonPackages.python.modules // rec { }; zc_lockfile = buildPythonPackage rec { - name = "zc.lockfile-1.0.0"; + name = "zc.lockfile-1.0.2"; src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zc.lockfile/zc.lockfile-1.0.0.tar.gz"; - md5 = "6cf83766ef9935c33e240b0904c7a45e"; + url = "http://pypi.python.org/packages/source/z/zc.lockfile/zc.lockfile-1.0.2.tar.gz"; + md5 = "f099d4cf2583a0c7bea0146a44dc4d59"; }; buildInputs = [ ]; propagatedBuildInputs = [ setuptools ]; @@ -5001,10 +5070,10 @@ let plone43Packages = pythonPackages.python.modules // rec { }; plone_contentrules = buildPythonPackage rec { - name = "plone.contentrules-2.0.2"; + name = "plone.contentrules-2.0.3"; src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.contentrules/plone.contentrules-2.0.2.zip"; - md5 = "a32370656c4fd58652fcd8a234db69c5"; + url = "https://pypi.python.org/packages/source/p/plone.contentrules/plone.contentrules-2.0.3.zip"; + md5 = "e743dca41b07b7ac1c2a65b652679201"; }; buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ zope_i18nmessageid zope_container zope_interface zope_testing zope_configuration zope_component zope_componentvocabulary setuptools zodb3 zope_schema zope_lifecycleevent zope_annotation ]; @@ -5070,10 +5139,10 @@ let plone43Packages = pythonPackages.python.modules // rec { }; plone_app_caching = buildPythonPackage rec { - name = "plone.app.caching-1.1.3"; + name = "plone.app.caching-1.1.4"; src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.app.caching/plone.app.caching-1.1.3.zip"; - md5 = "1975506ecf8d42944946dbb2b8f8dc01"; + url = "https://pypi.python.org/packages/source/p/plone.app.caching/plone.app.caching-1.1.4.zip"; + md5 = "bbb46c9dc36f0ac6cc833ee152203a81"; }; buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ products_cmfdynamicviewfti z3c_form zope_interface plone_memoize zope_component plone_caching zope_publisher products_genericsetup plone_app_registry z3c_zcmlhook setuptools plone_app_z3cform products_statusmessages python_dateutil plone_cachepurging acquisition zope2 zope_pagetemplate zope_browserresource plone_protect plone_registry products_cmfcore ]; @@ -5093,10 +5162,10 @@ let plone43Packages = pythonPackages.python.modules // rec { }; products_cmfplone = buildPythonPackage rec { - name = "Products.CMFPlone-4.3"; + name = "Products.CMFPlone-4.3.1"; src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.CMFPlone/Products.CMFPlone-4.3.zip"; - md5 = "25be0a93702c242ed5985cebde34f872"; + url = "https://pypi.python.org/packages/source/P/Products.CMFPlone/Products.CMFPlone-4.3.1.zip"; + md5 = "2fee0c66e0d9bdf28b513bcd6d95a602"; }; buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ products_cmfdynamicviewfti plone_app_blob products_dcworkflow products_extendedpathindex zope_dottedname datetime zope_traversing products_tinymce zope_publisher plonetheme_classic plone_batching plone_fieldsets products_cmfdefault acquisition plone_app_contentlisting products_externaleditor products_pluginregistry products_cmfeditions products_resourceregistries zope_tal plone_app_jquerytools products_genericsetup pillow five_localsitemanager plone_app_vocabularies zope_location zope_deferredimport products_plonelanguagetool borg_localrole zope_i18n plone_browserlayer plone_theme plone_memoize plone_app_contentmenu plone_app_i18n zope_component products_mimetypesregistry plone_app_customerize plone_app_folder plone_registry zope_i18nmessageid plone_app_upgrade products_cmfdifftool five_customerize plone_app_search products_portaltransforms plone_app_controlpanel plone_app_locales plone_app_linkintegrity zope2 plone_contentrules plone_app_portlets products_plonepas zope_pagetemplate zodb3 plone_locking products_cmfformcontroller zope_deprecation plone_app_form plone_app_layout products_cmfquickinstallertool archetypes_querywidget plone_app_redirector plone_i18n plone_app_registry products_placelesstranslationservice plone_app_users zope_interface zope_event plone_app_viewletmanager zope_structuredtext z3c_autoinclude zope_app_locales plone_portlets products_statusmessages products_cmfcalendar extensionclass products_pluggableauthservice plone_indexer products_cmfuid zope_container plone_app_workflow setuptools plone_portlet_collection plone_app_contentrules products_cmfactionicons products_archetypes plone_intelligenttext plone_app_collection products_passwordresettool plone_app_content plonetheme_sunburst plone_protect zope_tales plone_app_uuid archetypes_referencebrowserwidget products_atcontenttypes plone_app_jquery transaction zope_site plone_app_discussion plone_portlet_static plone_session products_cmfcore ]; @@ -5139,10 +5208,10 @@ let plone43Packages = pythonPackages.python.modules // rec { }; plone_app_controlpanel = buildPythonPackage rec { - name = "plone.app.controlpanel-2.3.4"; + name = "plone.app.controlpanel-2.3.6"; src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.app.controlpanel/plone.app.controlpanel-2.3.4.zip"; - md5 = "d01b8c188498080a52275de2a50b25eb"; + url = "https://pypi.python.org/packages/source/p/plone.app.controlpanel/plone.app.controlpanel-2.3.6.zip"; + md5 = "ca5e0e0c8497d9860603e39e0eeba9b8"; }; buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ zope_testing zope_interface plone_memoize zope_component plone_app_workflow zope_annotation zope_ramcache zope_publisher products_portaltransforms plone_fieldsets zope_event products_cmfdefault zope_cachedescriptors plone_app_form setuptools products_statusmessages zope_schema zope2 acquisition products_plonepas zope_site plone_app_vocabularies zope_formlib zodb3 plone_protect zope_i18n plone_locking products_cmfcore ]; @@ -5162,10 +5231,10 @@ let plone43Packages = pythonPackages.python.modules // rec { }; plone_app_redirector = buildPythonPackage rec { - name = "plone.app.redirector-1.2a1"; + name = "plone.app.redirector-1.2"; src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.app.redirector/plone.app.redirector-1.2a1.zip"; - md5 = "b63b6443b4bbc5562bddcb43600349f7"; + url = "https://pypi.python.org/packages/source/p/plone.app.redirector/plone.app.redirector-1.2.zip"; + md5 = "bc0508844f276ac7a7b9556d37281cc8"; }; buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ plone_memoize setuptools ]; @@ -5231,10 +5300,10 @@ let plone43Packages = pythonPackages.python.modules // rec { }; plone_namedfile = buildPythonPackage rec { - name = "plone.namedfile-2.0.1"; + name = "plone.namedfile-2.0.2"; src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.namedfile/plone.namedfile-2.0.1.zip"; - md5 = "9739c2fe25977d7e050a85eaed9e776a"; + url = "https://pypi.python.org/packages/source/p/plone.namedfile/plone.namedfile-2.0.2.zip"; + md5 = "f6168ab9e38f3a171dc35483527b3e01"; }; buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ zope_traversing zope_security zope_component zope_browserpage setuptools plone_rfc822 ]; @@ -5369,10 +5438,10 @@ let plone43Packages = pythonPackages.python.modules // rec { }; products_zctextindex = buildPythonPackage rec { - name = "Products.ZCTextIndex-2.13.3"; + name = "Products.ZCTextIndex-2.13.4"; src = fetchurl { - url = "http://pypi.python.org/packages/source/P/Products.ZCTextIndex/Products.ZCTextIndex-2.13.3.zip"; - md5 = "bf95ea9fa2831237fa3c3d38fafdec96"; + url = "http://pypi.python.org/packages/source/P/Products.ZCTextIndex/Products.ZCTextIndex-2.13.4.zip"; + md5 = "8bbfa5fcd3609246990a9314d6f826b4"; }; buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ accesscontrol transaction zope_interface zexceptions zodb3 persistence setuptools acquisition ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b165dd78e95..0000d81b861 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5656,17 +5656,17 @@ let python = python27; }); - plone41Packages = recurseIntoAttrs (import ../development/web/plone/4.1.6.nix { + plone41Packages = recurseIntoAttrs (import ../development/web/plone/4.1.nix { inherit pkgs; pythonPackages = python26Packages; }); - plone42Packages = recurseIntoAttrs (import ../development/web/plone/4.2.5.nix { + plone42Packages = recurseIntoAttrs (import ../development/web/plone/4.2.nix { inherit pkgs; pythonPackages = python26Packages; }); - plone43Packages = recurseIntoAttrs (import ../development/web/plone/4.3.0.nix { + plone43Packages = recurseIntoAttrs (import ../development/web/plone/4.3.nix { inherit pkgs; pythonPackages = python27Packages; }); From 79ec396f6ff3ee35804dad96e864c41f3ba45e6d Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Wed, 3 Jul 2013 02:32:01 +0200 Subject: [PATCH 193/798] plone: z3c.form downgraded to 3.0 --- pkgs/development/web/plone/4.3.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/web/plone/4.3.nix b/pkgs/development/web/plone/4.3.nix index a0b0ff46153..7da9a7a47c5 100644 --- a/pkgs/development/web/plone/4.3.nix +++ b/pkgs/development/web/plone/4.3.nix @@ -4334,10 +4334,10 @@ let plone43Packages = pythonPackages.python.modules // rec { }; z3c_form = buildPythonPackage rec { - name = "z3c.form-3.0.1"; + name = "z3c.form-3.0"; src = fetchurl { - url = "https://pypi.python.org/packages/source/z/z3c.form/z3c.form-3.0.1.zip"; - md5 = "7c9338dbe89b8c27ebba7441b14786ac"; + url = "https://pypi.python.org/packages/source/z/z3c.form/z3c.form-3.0.zip"; + md5 = "f9fa3cf56c83722425b3b1be4467ce46"; }; buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ zope_i18nmessageid zope_publisher zope_site zope_pagetemplate zope_interface zope_browserresource six zope_security zope_configuration zope_component zope_browserpage zope_event zope_traversing setuptools zope_schema zope_lifecycleevent zope_browser zope_i18n zope_location zope_contentprovider ]; From 52dd19be1b38af9182f89ba62bbb56b3480ab39e Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Wed, 3 Jul 2013 02:47:14 +0200 Subject: [PATCH 194/798] plone: plone_recipe_varnish updated to 1.3dev to support varnish >= 3 --- pkgs/development/web/plone/4.3.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/web/plone/4.3.nix b/pkgs/development/web/plone/4.3.nix index 7da9a7a47c5..db209292442 100644 --- a/pkgs/development/web/plone/4.3.nix +++ b/pkgs/development/web/plone/4.3.nix @@ -1229,10 +1229,10 @@ let plone43Packages = pythonPackages.python.modules // rec { }; plone_recipe_varnish = buildPythonPackage rec { - name = "plone.recipe.varnish-1.2.2"; + name = "plone.recipe.varnish-1.3dev"; src = fetchurl { - url = "http://pypi.python.org/packages/source/p/plone.recipe.varnish/plone.recipe.varnish-1.2.2.zip"; - md5 = "100f8bd4857926b8aa1c6decfd05626b"; + url = "https://github.com/collective/plone.recipe.varnish/archive/38ef4a86ce2e1c407e35ab36487bc1311c4eb1e3.zip"; + md5 = "9aa448793ca115790d38df6f676bd7d8"; }; buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ zc_buildout setuptools ]; From bf540904debdfed09ff36ffd1f6f3280af253aee Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Wed, 3 Jul 2013 03:36:15 +0200 Subject: [PATCH 195/798] haproxy: update to 1.4.24 (set platform to linux, for now) --- pkgs/tools/networking/haproxy/default.nix | 26 +++++++++++++++-------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix index 0a43251dc35..3d2c26b6df5 100644 --- a/pkgs/tools/networking/haproxy/default.nix +++ b/pkgs/tools/networking/haproxy/default.nix @@ -1,21 +1,29 @@ -{ stdenv, fetchurl }: +{ stdenv, pkgs, fetchurl }: -stdenv.mkDerivation { - name = "haproxy-1.4.20"; +stdenv.mkDerivation rec { + version = "1.4.24"; + name = "haproxy-${version}"; src = fetchurl { - url = http://haproxy.1wt.eu/download/1.4/src/haproxy-1.4.20.tar.gz; - sha256 = "0gi81dg8k3ypljs7ifbppvpfrwrnbafjv41fjpwnyqfwbxa4j2gh"; + url = "http://haproxy.1wt.eu/download/1.4/src/${name}.tar.gz"; + sha256 = "1vy7jz7l8qdd6ah3y65zarz9x9pf3bs02icxnrckpgh1s3s2h2b8"; }; - buildInputs = []; + buildInputs = [ ]; + # TODO: make it work on darwin/bsd as well preConfigure = '' - export makeFlags="TARGET=linux26 PREFIX=$out" + export makeFlags="TARGET=linux2628 PREFIX=$out" ''; - + meta = { description = "HAProxy is a free, very fast and reliable solution offering high availability, load balancing, and proxying for TCP and HTTP-based applications."; - homepage = http://haproxy.1wt.eu/; + homepage = "http://haproxy.1wt.eu"; + maintainers = [ stdenv.lib.maintainers.garbas ]; + platforms = stdenv.lib.platforms.linux; + license = [ + pkgs.lib.licenses.gpl2 + pkgs.lib.licenses.lgpl21 + ]; }; } From 0a527048eb9ccc230e76694f4ac1d33cebfd1627 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Wed, 3 Jul 2013 04:26:02 +0200 Subject: [PATCH 196/798] pythonPackages.genshi: update to 0.7 --- 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 5049d0628b5..cba57b16739 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1877,11 +1877,11 @@ pythonPackages = python.modules // rec { }; genshi = buildPythonPackage { - name = "genshi-0.6"; + name = "genshi-0.7"; src = fetchurl { - url = http://ftp.edgewall.com/pub/genshi/Genshi-0.6.tar.gz; - sha256 = "0jrajyppdzb3swcxv3w1mpp88vcy7400gy1v2h2gm3pq0dmggaij"; + url = http://ftp.edgewall.com/pub/genshi/Genshi-0.7.tar.gz; + sha256 = "0lkkbp6fbwzv0zda5iqc21rr7rdldkwh3hfabfjl9i4bwq14858x"; }; # FAIL: test_sanitize_remove_script_elem (genshi.filters.tests.html.HTMLSanitizerTestCase) From 7816aa4ada8968a79ade52f1a8c689cf5fdeecb3 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Wed, 3 Jul 2013 04:26:27 +0200 Subject: [PATCH 197/798] plone: adding collective_recipe_template package --- pkgs/development/web/plone/4.3.nix | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/plone/4.3.nix b/pkgs/development/web/plone/4.3.nix index db209292442..f57b8e63817 100644 --- a/pkgs/development/web/plone/4.3.nix +++ b/pkgs/development/web/plone/4.3.nix @@ -1,7 +1,7 @@ # DO NOT EDIT THIS FILE! # # Nix expressions autogenerated with: -# bin/pypi2nix -n plone43Packages -d Plone -d mailinglogger -d zc.recipe.egg -d plone.recipe.zope2instance -d plone.recipe.zeoserver -d plone.recipe.varnish -d Pillow -i setuptools -i zc_buildout -i pillow -e plone/4.3.1.json -p plone/4.3.1.txt -o plone/4.3.1.nix +# bin/pypi2nix -n plone43Packages -d Plone -d mailinglogger -d zc.recipe.egg -d plone.recipe.zope2instance -d plone.recipe.zeoserver -d plone.recipe.varnish -d collective.recipe.template -d Pillow -i setuptools -i zc_buildout -i pillow -e plone/4.3.1.json -p plone/4.3.1.txt -o plone/4.3.1.nix { pkgs, pythonPackages }: @@ -837,6 +837,29 @@ let plone43Packages = pythonPackages.python.modules // rec { }; }; + collective_recipe_template = buildPythonPackage rec { + name = "collective.recipe.template-1.9"; + src = fetchurl { + url = "http://pypi.python.org/packages/source/c/collective.recipe.template/collective.recipe.template-1.9.zip"; + md5 = "f8b8eab3cf183ea92c2e50a54da228e8"; + }; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ zc_buildout setuptools pythonPackages.genshi ]; + doCheck = false; + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + meta = { + description = "UNKNOWN"; + homepage = "UNKNOWN"; + maintainers = [ + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.iElectric + ]; + }; + }; + zope_configuration = buildPythonPackage rec { name = "zope.configuration-3.7.4"; src = fetchurl { @@ -4336,7 +4359,7 @@ let plone43Packages = pythonPackages.python.modules // rec { z3c_form = buildPythonPackage rec { name = "z3c.form-3.0"; src = fetchurl { - url = "https://pypi.python.org/packages/source/z/z3c.form/z3c.form-3.0.zip"; + url = "http://pypi.python.org/packages/source/z/z3c.form/z3c.form-3.0.zip"; md5 = "f9fa3cf56c83722425b3b1be4467ce46"; }; buildInputs = [ pkgs.unzip ]; From e84ba407f9ca49320d50e1a4db60923fb4062dfd Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Wed, 3 Jul 2013 04:44:01 +0200 Subject: [PATCH 198/798] plone: adding collective_recipe_filestorage package --- pkgs/development/web/plone/4.3.nix | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/pkgs/development/web/plone/4.3.nix b/pkgs/development/web/plone/4.3.nix index f57b8e63817..badd213daf6 100644 --- a/pkgs/development/web/plone/4.3.nix +++ b/pkgs/development/web/plone/4.3.nix @@ -1,7 +1,7 @@ # DO NOT EDIT THIS FILE! # # Nix expressions autogenerated with: -# bin/pypi2nix -n plone43Packages -d Plone -d mailinglogger -d zc.recipe.egg -d plone.recipe.zope2instance -d plone.recipe.zeoserver -d plone.recipe.varnish -d collective.recipe.template -d Pillow -i setuptools -i zc_buildout -i pillow -e plone/4.3.1.json -p plone/4.3.1.txt -o plone/4.3.1.nix +# bin/pypi2nix -n plone43Packages -d Plone -d mailinglogger -d zc.recipe.egg -d plone.recipe.zope2instance -d plone.recipe.zeoserver -d plone.recipe.varnish -d collective.recipe.template -d collective.recipe.filestorage -d Pillow -i setuptools -i zc_buildout -i pillow -e plone/4.3.1.json -p plone/4.3.1.txt -o plone/4.3.1.nix { pkgs, pythonPackages }: @@ -1504,6 +1504,29 @@ let plone43Packages = pythonPackages.python.modules // rec { }; }; + collective_recipe_filestorage = buildPythonPackage rec { + name = "collective.recipe.filestorage-0.6"; + src = fetchurl { + url = "http://pypi.python.org/packages/source/c/collective.recipe.filestorage/collective.recipe.filestorage-0.6.zip"; + md5 = "c0d85a82a858a860dc665dd38303fedd"; + }; + buildInputs = [ pkgs.unzip ]; + propagatedBuildInputs = [ zc_buildout setuptools plone_recipe_zope2instance ]; + doCheck = false; + installCommand = '' + easy_install --always-unzip --no-deps --prefix="$out" . + ''; + + meta = { + description = "UNKNOWN"; + homepage = "UNKNOWN"; + maintainers = [ + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.iElectric + ]; + }; + }; + plone_intelligenttext = buildPythonPackage rec { name = "plone.intelligenttext-2.0.2"; src = fetchurl { From 72a771b6e4b3583a3f8b5ae118b60fc16b012ac9 Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Wed, 3 Jul 2013 19:52:22 +1000 Subject: [PATCH 199/798] emacs24: fix build on darwin --- pkgs/applications/editors/emacs-24/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 6 ++++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/emacs-24/default.nix b/pkgs/applications/editors/emacs-24/default.nix index a781cb37346..470d8f53cb8 100644 --- a/pkgs/applications/editors/emacs-24/default.nix +++ b/pkgs/applications/editors/emacs-24/default.nix @@ -44,7 +44,7 @@ EOF doCheck = true; - meta = { + meta = with stdenv.lib; { description = "GNU Emacs 24, the extensible, customizable text editor"; longDescription = '' @@ -67,7 +67,7 @@ EOF homepage = "http://www.gnu.org/software/emacs/"; license = "GPLv3+"; - maintainers = with stdenv.lib.maintainers; [ ludo simons chaoflow ]; - platforms = stdenv.lib.platforms.all; + maintainers = with maintainers; [ chaoflow lovek323 ludo simons ]; + platforms = platforms.all; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0000d81b861..134e2101043 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7232,6 +7232,12 @@ let alsaLib = null; imagemagick = null; texinfo = texinfo5; + + # use gccApple on darwin to deal with: unexec: 'my_edata is not in section + # __data' + stdenv = if stdenv.isDarwin + then stdenvAdapters.overrideGCC stdenv gccApple + else stdenv; }; emacsPackages = emacs: self: let callPackage = newScope self; in rec { From bdf5a5c20e8912f3e8115b9c7f9176da91fcacf3 Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Wed, 3 Jul 2013 19:52:46 +1000 Subject: [PATCH 200/798] liboil: fix build on darwin * force --build=x86_64 --- pkgs/development/libraries/liboil/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/liboil/default.nix b/pkgs/development/libraries/liboil/default.nix index 45f75b4f805..de2ffdffca7 100644 --- a/pkgs/development/libraries/liboil/default.nix +++ b/pkgs/development/libraries/liboil/default.nix @@ -12,9 +12,15 @@ stdenv.mkDerivation rec { patches = [ ./x86_64-cpuid.patch ]; - meta = { - homepage = http://liboil.freedesktop.org; + # fix "argb_paint_i386.c:53:Incorrect register `%rax' used with `l' suffix" + # errors + configureFlags = stdenv.lib.optional stdenv.isDarwin "--build=x86_64"; + + meta = with stdenv.lib; { description = "A library of simple functions that are optimized for various CPUs"; - license = "BSD-2"; + homepage = http://liboil.freedesktop.org; + license = libraries.bsd2; + maintainers = with maintainers; [ lovek323 ]; + platforms = platforms.all; }; } From 80213cbb051f2e172be20c03e51069f122d8bb6c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 3 Jul 2013 12:41:27 +0200 Subject: [PATCH 201/798] meta.license is a list of strings (not attribute sets) http://hydra.nixos.org/build/5453648 --- pkgs/lib/licenses.nix | 21 ++++----------------- pkgs/tools/networking/haproxy/default.nix | 6 +++--- 2 files changed, 7 insertions(+), 20 deletions(-) diff --git a/pkgs/lib/licenses.nix b/pkgs/lib/licenses.nix index 0669bc3f5c3..f6c1fddfd14 100644 --- a/pkgs/lib/licenses.nix +++ b/pkgs/lib/licenses.nix @@ -4,8 +4,7 @@ * add it to this list. The URL mentioned above is a good source for inspiration. */ - agpl3 = { - shortName = "AGPLv3"; + agpl3 = "AGPLv3"; fullName = "GNU Affero General Public License version 3 only"; url = https://www.gnu.org/licenses/agpl.html; }; @@ -76,11 +75,7 @@ url = http://www.eclipse.org/legal/epl-v10.html; }; - gpl2 = { - shortName = "GPLv2"; - fullName = "GNU General Public License version 2 only"; - url = http://www.gnu.org/licenses/old-licenses/gpl-2.0.html; - }; + gpl2 = "GPLv2"; gpl2Oss = { shortName = "GPLv2+OSS"; @@ -136,11 +131,7 @@ url = https://fedoraproject.org/wiki/Licensing/libtiff; }; - lgpl2 = { - shortName = "LGPLv2"; - fullName = "GNU Library General Public License version 2"; - url = http://www.gnu.org/licenses/old-licenses/lgpl-2.0.html; - }; + lgpl2 = "LGPLv2"; lgpl2Plus = { shortName = "LGPLv2+"; @@ -148,11 +139,7 @@ url = http://www.gnu.org/licenses/old-licenses/lgpl-2.0.html; }; - lgpl21 = { - shortName = "LGPLv2.1"; - fullName = "GNU Lesser General Public License version 2.1 only"; - url = http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html; - }; + lgpl21 = "LGPLv2.1"; lgpl21Plus = { shortName = "LGPLv2.1+"; diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix index 3d2c26b6df5..d44c9f831f3 100644 --- a/pkgs/tools/networking/haproxy/default.nix +++ b/pkgs/tools/networking/haproxy/default.nix @@ -18,12 +18,12 @@ stdenv.mkDerivation rec { meta = { description = "HAProxy is a free, very fast and reliable solution offering high availability, load balancing, and proxying for TCP and HTTP-based applications."; - homepage = "http://haproxy.1wt.eu"; + homepage = http://haproxy.1wt.eu; maintainers = [ stdenv.lib.maintainers.garbas ]; platforms = stdenv.lib.platforms.linux; license = [ - pkgs.lib.licenses.gpl2 - pkgs.lib.licenses.lgpl21 + stdenv.lib.licenses.gpl2 + stdenv.lib.licenses.lgpl21 ]; }; } From 6307798b45347a298d39fa78ed79c7d69a8b9f15 Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Wed, 3 Jul 2013 20:09:27 +1000 Subject: [PATCH 202/798] gnome.ORBit2: fix build on darwin * add libintlOrEmpty to build inputs --- .../gnome-2/platform/ORBit2/default.nix | 23 +++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-2/platform/ORBit2/default.nix b/pkgs/desktops/gnome-2/platform/ORBit2/default.nix index 22c22c6bcf5..94aaf30a49d 100644 --- a/pkgs/desktops/gnome-2/platform/ORBit2/default.nix +++ b/pkgs/desktops/gnome-2/platform/ORBit2/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl_gnome, pkgconfig, glib, libIDL}: +{ stdenv, fetchurl_gnome, pkgconfig, glib, libIDL, libintlOrEmpty }: stdenv.mkDerivation rec { name = src.pkgname; @@ -14,5 +14,24 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ pkgconfig ]; - propagatedBuildInputs = [ glib libIDL ]; + propagatedBuildInputs = [ glib libIDL ] ++ libintlOrEmpty; + + meta = with stdenv.lib; { + homepage = https://projects.gnome.org/ORBit2/; + description = "A a CORBA 2.4-compliant Object Request Broker"; + platforms = platforms.unix; + maintainers = with maintainers; [ lovek323 ]; + + longDescription = '' + ORBit2 is a CORBA 2.4-compliant Object Request Broker (ORB) featuring + mature C, C++ and Python bindings. Bindings (in various degrees of + completeness) are also available for Perl, Lisp, Pascal, Ruby, and TCL; + others are in-progress. It supports POA, DII, DSI, TypeCode, Any, IR and + IIOP. Optional features including INS and threading are available. ORBit2 + is engineered for the desktop workstation environment, with a focus on + performance, low resource usage, and security. The core ORB is written in + C, and runs under Linux, UNIX (BSD, Solaris, HP-UX, ...), and Windows. + ORBit2 is developed and released as open source software under GPL/LGPL. + ''; + }; } From 3b54af72b17c33bfafcd748156475f3f432bbdec Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Wed, 3 Jul 2013 22:00:52 +1000 Subject: [PATCH 203/798] cracklib: fix build on darwin * add libintlOrEmpty to build inputs --- pkgs/development/libraries/cracklib/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/cracklib/default.nix b/pkgs/development/libraries/cracklib/default.nix index 32d1c478a49..7fb9089420d 100644 --- a/pkgs/development/libraries/cracklib/default.nix +++ b/pkgs/development/libraries/cracklib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, libintlOrEmpty }: stdenv.mkDerivation rec { name = "cracklib-2.8.16"; @@ -8,8 +8,12 @@ stdenv.mkDerivation rec { sha256 = "1g3mchdvra9nihxlkl3rdz96as3xnfw5m59hmr5k17l7qa9a8fpw"; }; - meta = { - homepage = http://sourceforge.net/projects/cracklib; + buildInputs = libintlOrEmpty; + + meta = with stdenv.lib; { + homepage = http://sourceforge.net/projects/cracklib; description = "A library for checking the strength of passwords"; + maintainers = with maintainers; [ lovek323 ]; + platforms = platforms.unix; }; } From 84f5d870f38e753b2e5de505aa2958b4ac2e8e23 Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Wed, 3 Jul 2013 22:01:34 +1000 Subject: [PATCH 204/798] glib: remove unnecessary restrictions on darwin --- pkgs/development/libraries/glib/default.nix | 24 ++++++--------------- 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 7469b07ce86..b500967af78 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -24,7 +24,7 @@ let ''; in -stdenv.mkDerivation (rec { +stdenv.mkDerivation rec { name = "glib-2.36.1"; src = fetchurl { @@ -41,10 +41,7 @@ stdenv.mkDerivation (rec { configureFlags = "--with-pcre=system --disable-fam"; - postConfigure = "sed '/SANE_MALLOC_PROTOS/s,^,//,' -i config.h" # https://bugzilla.gnome.org/show_bug.cgi?id=698716 :-) - + stdenv.lib.optionalString stdenv.isDarwin '' - sed '24 i #include ' - ''; + postConfigure = "sed '/SANE_MALLOC_PROTOS/s,^,//,' -i config.h"; enableParallelBuilding = true; @@ -55,12 +52,12 @@ stdenv.mkDerivation (rec { inherit flattenInclude; }; - meta = { + meta = with stdenv.lib; { description = "GLib, a C library of programming buildings blocks"; homepage = http://www.gtk.org/; - license = "LGPLv2+"; - maintainers = with stdenv.lib.maintainers; [ raskin urkud lovek323 ]; - platforms = stdenv.lib.platforms.unix; + license = licenses.lgpl2Plus; + maintainers = with maintainers; [ lovek323 raskin urkud ]; + platforms = platforms.unix; longDescription = '' GLib provides the core application building blocks for libraries @@ -71,12 +68,3 @@ stdenv.mkDerivation (rec { }; } -// - -(stdenv.lib.optionalAttrs stdenv.isDarwin { - # XXX: Disable the NeXTstep back-end because stdenv.gcc doesn't support - # Objective-C. - postConfigure = - '' sed -i configure -e's/glib_have_cocoa=yes/glib_have_cocoa=no/g' - ''; -})) From 216d47be0c39df07c4cd3bfcf4f05b01a8409a78 Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Wed, 3 Jul 2013 22:02:40 +1000 Subject: [PATCH 205/798] gobject-introspection: fix build on darwin * add otool expression (add otool to build inputs) * add libintlOrEmpty to build inputs --- .../gobject-introspection/default.nix | 24 ++++++++++---- pkgs/development/tools/misc/otool/default.nix | 31 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 51 insertions(+), 6 deletions(-) create mode 100644 pkgs/development/tools/misc/otool/default.nix diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix index b96d5b25bb1..99a80640bb8 100644 --- a/pkgs/development/libraries/gobject-introspection/default.nix +++ b/pkgs/development/libraries/gobject-introspection/default.nix @@ -1,14 +1,17 @@ -{ stdenv, fetchurl, glib, flex, bison, pkgconfig, libffi, python, gdk_pixbuf }: +{ stdenv, fetchurl, glib, flex, bison, pkgconfig, libffi, python, gdk_pixbuf +, libintlOrEmpty, autoconf, automake, otool }: stdenv.mkDerivation rec { name = "gobject-introspection-1.34.2"; - buildInputs = [ flex bison glib pkgconfig python gdk_pixbuf ]; + buildInputs = [ flex bison glib pkgconfig python gdk_pixbuf ] + ++ libintlOrEmpty + ++ stdenv.lib.optional stdenv.isDarwin otool; propagatedBuildInputs = [ libffi ]; # Tests depend on cairo, which is undesirable (it pulls in lots of # other dependencies). - configureFlags = "--disable-tests"; + configureFlags = [ "--disable-tests" ]; src = fetchurl { url = "mirror://gnome/sources/gobject-introspection/1.34/${name}.tar.xz"; @@ -18,8 +21,17 @@ stdenv.mkDerivation rec { postInstall = "rm -rf $out/share/gtk-doc"; meta = with stdenv.lib; { - maintainers = [ maintainers.urkud ]; - platforms = platforms.linux; - homepage = http://live.gnome.org/GObjectIntrospection; + description = "A middleware layer between C libraries and language bindings"; + homepage = http://live.gnome.org/GObjectIntrospection; + maintainers = with maintainers; [ lovek323 urkud ]; + platforms = platforms.unix; + + longDescription = '' + GObject introspection is a middleware layer between C libraries (using + GObject) and language bindings. The C library can be scanned at compile + time and generate a metadata file, in addition to the actual native C + library. Then at runtime, language bindings can read this metadata and + automatically provide bindings to call into the C library. + ''; }; } diff --git a/pkgs/development/tools/misc/otool/default.nix b/pkgs/development/tools/misc/otool/default.nix new file mode 100644 index 00000000000..aa365fc29d5 --- /dev/null +++ b/pkgs/development/tools/misc/otool/default.nix @@ -0,0 +1,31 @@ +{ stdenv }: + +stdenv.mkDerivation { + name = "otool"; + + src = "/usr/bin/otool"; + + unpackPhase = "true"; + configurePhase = "true"; + buildPhase = "true"; + + installPhase = '' + mkdir -p "$out/bin" + cp /usr/bin/otool "$out/bin" + ''; + + meta = with stdenv.lib; { + description = "Object file displaying tool"; + homepage = https://developer.apple.com/library/mac/documentation/Darwin/Reference/ManPages/man1/otool.1.html; + maintainers = with maintainers; [ lovek323 ]; + platforms = platforms.darwin; + + longDescription = '' + The otool command displays specified parts of object files or libraries. + If the, -m option is not used, the file arguments may be of the form + libx.a(foo.o), to request information about only that object file and not + the entire library. + ''; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 134e2101043..8bbe1e14cca 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -444,6 +444,8 @@ let apg = callPackage ../tools/security/apg { }; + otool = callPackage ../development/tools/misc/otool { }; + xcodeenv = callPackage ../development/mobile/xcodeenv { }; titaniumenv_2_1 = import ../development/mobile/titaniumenv { From 5cfa68ab50f49f73618c068724f6c590a0ae231a Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 3 Jul 2013 14:38:56 +0200 Subject: [PATCH 206/798] Reinstate sec=none Seems to be required, despite the subsequent sec=ntlm. But the NixOS VM tests work fine without this flag :-S http://hydra.nixos.org/build/5451901 --- pkgs/build-support/vm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 52b50adbfec..b1eb82ed830 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -123,14 +123,14 @@ rec { echo "mounting Nix store..." mkdir -p /fs/nix/store - mount -t cifs //10.0.2.4/store /fs/nix/store -o guest,sec=ntlm + mount -t cifs //10.0.2.4/store /fs/nix/store -o guest,sec=none,sec=ntlm mkdir -p /fs/tmp mount -t tmpfs -o "mode=755" none /fs/tmp echo "mounting host's temporary directory..." mkdir -p /fs/tmp/xchg - mount -t cifs //10.0.2.4/xchg /fs/tmp/xchg -o guest,sec=ntlm + mount -t cifs //10.0.2.4/xchg /fs/tmp/xchg -o guest,sec=none,sec=ntlm mkdir -p /fs/proc mount -t proc none /fs/proc From b9960211abaaaac044d9bfa0a8395fde46847d05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 3 Jul 2013 15:33:02 +0200 Subject: [PATCH 207/798] add GNU Guix --- .../tools/package-management/guix/default.nix | 73 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 75 insertions(+) create mode 100644 pkgs/tools/package-management/guix/default.nix diff --git a/pkgs/tools/package-management/guix/default.nix b/pkgs/tools/package-management/guix/default.nix new file mode 100644 index 00000000000..37957235629 --- /dev/null +++ b/pkgs/tools/package-management/guix/default.nix @@ -0,0 +1,73 @@ +{ fetchurl, stdenv, guile, libgcrypt, sqlite, bzip2, pkgconfig }: + +let + # Getting the bootstrap Guile binary. This is normally performed by Guix's build system. + base_url = arch: + "http://alpha.gnu.org/gnu/guix/bootstrap/${arch}-linux/20130105/guile-2.0.7.tar.xz"; + boot_guile = { + i686 = fetchurl { + url = base_url "i686"; + sha256 = "f9a7c6f4c556eaafa2a69bcf07d4ffbb6682ea831d4c9da9ba095aca3ccd217c"; + }; + x86_64 = fetchurl { + url = base_url "x86_64"; + sha256 = "bc43210dcd146d242bef4d354b0aeac12c4ef3118c07502d17ffa8d49e15aa2c"; + }; + }; +in stdenv.mkDerivation rec { + name = "guix-0.2"; + + src = fetchurl { + url = "ftp://alpha.gnu.org/gnu/guix/${name}.tar.gz"; + sha256 = "140y0ywbgl6vxl4nwswz4vim2wwdiajxlksj24lnv40aw5hyvifr"; + }; + + configureFlags = + [ "--localstatedir=/nix/var" + "--with-libgcrypt-prefix=${libgcrypt}" + ]; + + preBuild = + # Copy the bootstrap Guile tarballs like Guix's makefile normally does. + '' cp -v "${boot_guile.i686}" gnu/packages/bootstrap/i686-linux/guile-2.0.7.tar.xz + cp -v "${boot_guile.x86_64}" gnu/packages/bootstrap/x86_64-linux/guile-2.0.7.tar.xz + ''; + + preCheck = + # XXX: Skip this test (see commit 91fe0e20c7da2b706a1ac0e7b75235b6c1e6ed0a). + '' sed -i tests/guix-package.sh -e's/guix package --version/exit 0/' + ''; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ guile libgcrypt sqlite bzip2 ]; + + doCheck = true; + enableParallelBuilding = true; + + meta = { + description = "Functional package manager with a Scheme interface"; + + longDescription = '' + GNU Guix is a purely functional package manager for the GNU system, and a distribution thereof. + + In addition to standard package management features, Guix supports + transactional upgrades and roll-backs, unprivileged package management, + per-user profiles, and garbage collection. + + It provides Guile Scheme APIs, including high-level embedded + domain-specific languages (EDSLs), to describe how packages are built + and composed. + + A user-land free software distribution for GNU/Linux comes as part of + Guix. + + Guix is based on the Nix package manager. + ''; + + license = "GPLv3+"; + + maintainers = [ stdenv.lib.maintainers.ludo ]; + + homepage = http://www.gnu.org/software/guix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0000d81b861..516fe0a2a56 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9448,6 +9448,8 @@ let x11Support = true; }); + guix = callPackage ../tools/package-management/guix { }; + gxemul = callPackage ../misc/gxemul { }; hatari = callPackage ../misc/emulators/hatari { }; From 2ddcab06170072d74c62070bc1ee50f1fb0459e3 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 2 Jul 2013 18:46:53 -0400 Subject: [PATCH 208/798] Updte nodePackages Signed-off-by: Shea Levy --- pkgs/top-level/node-packages-generated.nix | 165 ++++++++++++--------- 1 file changed, 93 insertions(+), 72 deletions(-) diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix index c4a6bbb7ca6..0d83b2b4f58 100644 --- a/pkgs/top-level/node-packages-generated.nix +++ b/pkgs/top-level/node-packages-generated.nix @@ -102,9 +102,9 @@ } { baseName = "aws-sdk"; - version = "1.2.0"; + version = "1.3.1"; fullName = "aws-sdk-*"; - hash = "e2d4b32fba387b8f099c4180579b67554f875895a69e4c1ddb0a28546db9ba4c"; + hash = "1c8c49435a4ddf5ceb29b0c9d130893a95de30207785c3dc9d902c9174362967"; patchLatest = true; topLevel = true; dependencies = [ @@ -114,9 +114,9 @@ } { baseName = "aws-sdk"; - version = "1.2.0"; + version = "1.3.1"; fullName = "aws-sdk->=1.2.0 <2"; - hash = "e2d4b32fba387b8f099c4180579b67554f875895a69e4c1ddb0a28546db9ba4c"; + hash = "1c8c49435a4ddf5ceb29b0c9d130893a95de30207785c3dc9d902c9174362967"; patchLatest = true; topLevel = false; dependencies = [ @@ -306,9 +306,9 @@ } { baseName = "connect"; - version = "2.7.11"; - fullName = "connect-2.7.11"; - hash = "8c9aaabcb7e6f0d733f82b876db59a37a6d711aab7ea2dead9f624d9282b1245"; + version = "2.8.1"; + fullName = "connect-2.8.1"; + hash = "f838a4e8bccdf065cda7affe0118f018bdf1baa87375cd1df92e2cff29da2948"; patchLatest = false; topLevel = false; dependencies = [ @@ -321,14 +321,15 @@ { name = "bytes"; range = "0.2.0"; } { name = "fresh"; range = "0.1.0"; } { name = "pause"; range = "0.0.1"; } + { name = "uid2"; range = "0.0.2"; } { name = "debug"; range = "*"; } ]; } { baseName = "connect"; - version = "2.7.11"; + version = "2.8.1"; fullName = "connect-~2"; - hash = "8c9aaabcb7e6f0d733f82b876db59a37a6d711aab7ea2dead9f624d9282b1245"; + hash = "f838a4e8bccdf065cda7affe0118f018bdf1baa87375cd1df92e2cff29da2948"; patchLatest = false; topLevel = false; dependencies = [ @@ -341,6 +342,7 @@ { name = "bytes"; range = "0.2.0"; } { name = "fresh"; range = "0.1.0"; } { name = "pause"; range = "0.0.1"; } + { name = "uid2"; range = "0.0.2"; } { name = "debug"; range = "*"; } ]; } @@ -507,13 +509,13 @@ } { baseName = "express"; - version = "3.2.6"; + version = "3.3.1"; fullName = "express-*"; - hash = "a0c9ee92fe1366daf166f30ae77f824aa65c2f5e121596fa2c4f439b518cde99"; + hash = "8ca5ce06324343402e5186263c2dca3a28f055093bc6e7bd7270ce4a7356ae8b"; patchLatest = false; topLevel = true; dependencies = [ - { name = "connect"; range = "2.7.11"; } + { name = "connect"; range = "2.8.1"; } { name = "commander"; range = "0.6.1"; } { name = "range-parser"; range = "0.0.4"; } { name = "mkdirp"; range = "0.3.4"; } @@ -521,7 +523,7 @@ { name = "buffer-crc32"; range = "0.2.1"; } { name = "fresh"; range = "0.1.0"; } { name = "methods"; range = "0.0.1"; } - { name = "send"; range = "0.1.0"; } + { name = "send"; range = "0.1.1"; } { name = "cookie-signature"; range = "1.0.1"; } { name = "debug"; range = "*"; } ]; @@ -699,9 +701,9 @@ } { baseName = "graceful-fs"; - version = "1.2.1"; + version = "1.2.2"; fullName = "graceful-fs-1"; - hash = "eeef3c36c6a6476059a7e7a32d0b87e62133b11392c540f5c8c68c87f65c7c59"; + hash = "a23fe552c6b0a221fc961e1ef0ed567e081ad948f4fcac6be660fa6741c0dbd6"; patchLatest = false; topLevel = false; dependencies = [ @@ -709,9 +711,9 @@ } { baseName = "graceful-fs"; - version = "1.2.1"; + version = "1.2.2"; fullName = "graceful-fs-~1"; - hash = "eeef3c36c6a6476059a7e7a32d0b87e62133b11392c540f5c8c68c87f65c7c59"; + hash = "a23fe552c6b0a221fc961e1ef0ed567e081ad948f4fcac6be660fa6741c0dbd6"; patchLatest = false; topLevel = false; dependencies = [ @@ -719,9 +721,9 @@ } { baseName = "graceful-fs"; - version = "1.2.1"; + version = "1.2.2"; fullName = "graceful-fs-~1.2.0"; - hash = "eeef3c36c6a6476059a7e7a32d0b87e62133b11392c540f5c8c68c87f65c7c59"; + hash = "a23fe552c6b0a221fc961e1ef0ed567e081ad948f4fcac6be660fa6741c0dbd6"; patchLatest = false; topLevel = false; dependencies = [ @@ -896,9 +898,9 @@ } { baseName = "jshint"; - version = "2.1.3"; + version = "2.1.4"; fullName = "jshint-*"; - hash = "aaad18f3e6ec6e118d2990d8e627f62125c34ed28f864c9f3b6c46d4cf5d3288"; + hash = "ff5afb38e1e82801b670a18033dc29a903fe883ca6073459360178871f8d71db"; patchLatest = false; topLevel = true; dependencies = [ @@ -1026,16 +1028,6 @@ dependencies = [ ]; } - { - baseName = "mime"; - version = "1.2.6"; - fullName = "mime-1.2.6"; - hash = "7460134d6b4686d64fd1e7b878d34e2bdd258ad29b6665cf62e6d92659e81591"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } { baseName = "mime"; version = "1.2.9"; @@ -1102,6 +1094,16 @@ { name = "sigmund"; range = "~1.0.0"; } ]; } + { + baseName = "minimist"; + version = "0.0.1"; + fullName = "minimist-~0.0.1"; + hash = "4afcfc7d9ed3d2ff113bf93d777507e2ff7ddfef7ed282e4573ab5dd8422b0d3"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } { baseName = "mkdirp"; version = "0.3.5"; @@ -1142,16 +1144,6 @@ dependencies = [ ]; } - { - baseName = "mkdirp"; - version = "0.3.3"; - fullName = "mkdirp-0.3.3"; - hash = "b67a12855b7522c3cfb767e36b95f4eaaf9d423c5bd01f7f0449172259957df9"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } { baseName = "mkdirp"; version = "0.3.4"; @@ -1162,11 +1154,21 @@ dependencies = [ ]; } + { + baseName = "mkdirp"; + version = "0.3.5"; + fullName = "mkdirp-0.3.5"; + hash = "8ae9c5107acb41110106224f5e7be2b50b00d15d062ea7941301c111b863fd26"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } { baseName = "mocha"; - version = "1.10.0"; + version = "1.12.0"; fullName = "mocha-*"; - hash = "d19c4fdcddb6498d0f303c3e5fd85401888a269f36ccdfcc92763dcc9e80bf97"; + hash = "657b833347df35fc39cd1fb0e420f2713db57c4430cbebd10e2f6b37548e4f20"; patchLatest = false; topLevel = true; dependencies = [ @@ -1175,7 +1177,7 @@ { name = "jade"; range = "0.26.3"; } { name = "diff"; range = "1.0.2"; } { name = "debug"; range = "*"; } - { name = "mkdirp"; range = "0.3.3"; } + { name = "mkdirp"; range = "0.3.5"; } { name = "ms"; range = "0.3.0"; } { name = "glob"; range = "3.2.1"; } ]; @@ -1233,9 +1235,9 @@ } { baseName = "node-gyp"; - version = "0.10.0"; + version = "0.10.4"; fullName = "node-gyp-*"; - hash = "9edecaa701601f07b15da7bd6e9de4fae98ef1acdd5a1fc6cc144451a68773dd"; + hash = "b8bd44e4f5143fff5c22d5961982ae1504467dff17624be4525728c0500fd3a4"; patchLatest = false; topLevel = true; dependencies = [ @@ -1249,7 +1251,7 @@ { name = "osenv"; range = "0"; } { name = "request"; range = "2"; } { name = "rimraf"; range = "2"; } - { name = "semver"; range = "1"; } + { name = "semver"; range = "~2.0.7"; } { name = "tar"; range = "0"; } { name = "which"; range = "1"; } ]; @@ -1339,9 +1341,9 @@ } { baseName = "npmlog"; - version = "0.0.2"; + version = "0.0.3"; fullName = "npmlog-0"; - hash = "ce98d4d3380390c0259695cce407e2e96d2970c5caee1461a62ecbd38e8caed4"; + hash = "3214a04d9a54c588d2585b657c7068f9561dba34dd2323c4ac7ec98e69e3e9cd"; patchLatest = false; topLevel = false; dependencies = [ @@ -1370,13 +1372,14 @@ } { baseName = "optimist"; - version = "0.5.2"; + version = "0.6.0"; fullName = "optimist-*"; - hash = "838ad97b81beedb85fd0f0c4cd4740a940ddefb9a3db8e261f5fed7528693d3d"; + hash = "a75df1152906f1b66583c957cbffba34aaead644547d4a0300b713281279d4cf"; patchLatest = false; topLevel = true; dependencies = [ { name = "wordwrap"; range = "~0.0.2"; } + { name = "minimist"; range = "~0.0.1"; } ]; } { @@ -1562,8 +1565,19 @@ } { baseName = "rimraf"; - version = "2.1.4"; + version = "2.2.0"; fullName = "rimraf-2"; + hash = "4d250a91e5da8f0e839647149268d3682c868a65e920477ff5baae26591ebeb2"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "graceful-fs"; range = "~1"; } + ]; + } + { + baseName = "rimraf"; + version = "2.1.4"; + fullName = "rimraf-~2.1.4"; hash = "093154365aab3c09aea8e83dda7c5a7fd785c787ebbf1fcdc415cb5f74d1acac"; patchLatest = false; topLevel = false; @@ -1586,9 +1600,9 @@ } { baseName = "sax"; - version = "0.5.2"; - fullName = "sax-0.5.2"; - hash = "6bb7cd44e9dfea598997d4ba9d3279dafe75bed7b45904561ca9eb4d85cfd953"; + version = "0.5.4"; + fullName = "sax-0.5.x"; + hash = "5c4f074b559f56a7170663142e4ccbcf8cbef229ad7eb787b6c6e0b79ddb936a"; patchLatest = false; topLevel = false; dependencies = [ @@ -1606,9 +1620,9 @@ } { baseName = "semver"; - version = "1.1.4"; + version = "2.0.8"; fullName = "semver-*"; - hash = "59c0180521d0d4cee57caa5f6ef190500b04099bfa5786edb3e21e364ae8e989"; + hash = "7eefaea9185bc43025725a55179425f04abc80c33f9d90b10385e0bf54710876"; patchLatest = false; topLevel = true; dependencies = [ @@ -1635,17 +1649,13 @@ ]; } { - baseName = "send"; - version = "0.1.0"; - fullName = "send-0.1.0"; - hash = "28b5a6ec41b5072521eb792cc901b92cdbb6b743c578d7008727dbbd3eb717de"; + baseName = "semver"; + version = "2.0.8"; + fullName = "semver-~2.0.7"; + hash = "7eefaea9185bc43025725a55179425f04abc80c33f9d90b10385e0bf54710876"; patchLatest = false; topLevel = false; dependencies = [ - { name = "debug"; range = "*"; } - { name = "mime"; range = "1.2.6"; } - { name = "fresh"; range = "0.1.0"; } - { name = "range-parser"; range = "0.0.4"; } ]; } { @@ -1739,9 +1749,9 @@ } { baseName = "source-map"; - version = "0.1.22"; + version = "0.1.25"; fullName = "source-map-*"; - hash = "6ebe1b2b3c730e5e206a34a25192aa43307b84dfe3aaaafd71c5c6b6a02a4700"; + hash = "3ef1ff114aa3504871ad8b16a38ac744b293c6d8f37b0b6e673b44592a08626d"; patchLatest = false; topLevel = true; dependencies = [ @@ -1807,12 +1817,13 @@ } { baseName = "temp"; - version = "0.5.0"; + version = "0.5.1"; fullName = "temp-*"; - hash = "082285c060c7519b9d8a6dbc1a51e3caa7de43a807d3f7cec4eab220ad1207be"; + hash = "04bb3c0bde8f3ffab53bc4935b5c1ca306735e4da8844c1dc25e74b0ae8f6540"; patchLatest = false; topLevel = true; dependencies = [ + { name = "rimraf"; range = "~2.1.4"; } ]; } { @@ -1825,6 +1836,16 @@ dependencies = [ ]; } + { + baseName = "uid2"; + version = "0.0.2"; + fullName = "uid2-0.0.2"; + hash = "8a3b12223830ed536ce022271a4059cedfbb21d0f63149742347c4f7fc0ed442"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } { baseName = "underscore"; version = "1.4.4"; @@ -1974,13 +1995,13 @@ } { baseName = "xml2js"; - version = "0.2.7"; + version = "0.2.8"; fullName = "xml2js-0.2.x"; - hash = "ab3ae8402a8af36d93e1aa6e83102e365b82f03e605d1b8b8361dacc95e52397"; + hash = "faa75fc23ae6346002555df236250c3612cf76dfac104aff131a5ab5de49b8de"; patchLatest = false; topLevel = false; dependencies = [ - { name = "sax"; range = "0.5.2"; } + { name = "sax"; range = "0.5.x"; } ]; } { From 47aafb73f877630e279673163d0eb046685a112f Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 2 Jul 2013 18:55:45 -0400 Subject: [PATCH 209/798] Add stream-splitter-transform nodePackage Signed-off-by: Shea Levy --- pkgs/top-level/node-packages-generated.nix | 21 +++++++++++++++++++++ pkgs/top-level/node-packages.json | 1 + 2 files changed, 22 insertions(+) diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix index 0d83b2b4f58..1c4581256dd 100644 --- a/pkgs/top-level/node-packages-generated.nix +++ b/pkgs/top-level/node-packages-generated.nix @@ -210,6 +210,16 @@ dependencies = [ ]; } + { + baseName = "buffertools"; + version = "1.1.1"; + fullName = "buffertools->=1.1.1 <2.0.0"; + hash = "f5962aec81246077a46ee075072d40fa533c31ada7a0ec18e1ff3600af2d8f3f"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } { baseName = "bunyan"; version = "0.21.1"; @@ -1791,6 +1801,17 @@ { name = "readable-stream"; range = "~1.0.2"; } ]; } + { + baseName = "stream-splitter-transform"; + version = "0.0.3"; + fullName = "stream-splitter-transform-*"; + hash = "613ca5994f2fe645cbb21dcac24f034ed8546d6cc49097d8ee0b4501e6d9a887"; + patchLatest = false; + topLevel = true; + dependencies = [ + { name = "buffertools"; range = ">=1.1.1 <2.0.0"; } + ]; + } { baseName = "swig"; version = "0.14.0"; diff --git a/pkgs/top-level/node-packages.json b/pkgs/top-level/node-packages.json index 8116f769654..2d941fd1411 100644 --- a/pkgs/top-level/node-packages.json +++ b/pkgs/top-level/node-packages.json @@ -35,4 +35,5 @@ , "ansi-remover" , "mkdirp" , "jshint" +, "stream-splitter-transform" ] From a42133a102a6c00d98de985b1d3073eed173c8aa Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Thu, 4 Jul 2013 00:21:46 +1000 Subject: [PATCH 210/798] gnome.GConf: fix build on darwin * disable polkit * add --enable-static to configureFlags --- pkgs/desktops/gnome-2/platform/GConf/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-2/platform/GConf/default.nix b/pkgs/desktops/gnome-2/platform/GConf/default.nix index 4769247a516..847983e2c49 100644 --- a/pkgs/desktops/gnome-2/platform/GConf/default.nix +++ b/pkgs/desktops/gnome-2/platform/GConf/default.nix @@ -9,10 +9,16 @@ stdenv.mkDerivation { sha256 = "09ch709cb9fniwc4221xgkq0jf0x0lxs814sqig8p2dcll0llvzk"; }; - buildInputs = [ ORBit2 dbus_libs dbus_glib libxml2 polkit gtk ]; + buildInputs = [ ORBit2 dbus_libs dbus_glib libxml2 gtk ] + # polkit requires pam, which requires shadow.h, which is not available on + # darwin + ++ stdenv.lib.optional (!stdenv.isDarwin) polkit; + propagatedBuildInputs = [ glib ]; nativeBuildInputs = [ pkgconfig intltool ]; - configureFlags = "--with-gtk=2.0"; + configureFlags = [ "--with-gtk=2.0" ] + # fixes the "libgconfbackend-oldxml.so is not portable" error on darwin + ++ stdenv.lib.optional stdenv.isDarwin [ "--enable-static" ]; } From 3e14bb6fdf3e079e58e8b3556a7cf751a79e8835 Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Thu, 4 Jul 2013 00:25:53 +1000 Subject: [PATCH 211/798] gst-plugins-base: fix build on darwin * remove alsaLib and cdparanoia from build inputs * add cairo to build inputs --- .../gstreamer/gst-plugins-base/default.nix | 27 ++++++++++--------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix b/pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix index 2ac325dc282..e29be91c34b 100644 --- a/pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix +++ b/pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix @@ -1,7 +1,5 @@ -{ fetchurl, stdenv, pkgconfig, python, gstreamer -, xlibs, alsaLib, cdparanoia, libogg -, libtheora, libvorbis, freetype, pango -, liboil, glib +{ fetchurl, stdenv, pkgconfig, python, gstreamer, xlibs, alsaLib, cdparanoia +, libogg, libtheora, libvorbis, freetype, pango, liboil, glib, cairo , # Whether to build no plugins that have external dependencies # (except the ALSA plugin). minimalDeps ? false @@ -25,22 +23,25 @@ stdenv.mkDerivation rec { # TODO : v4l, libvisual buildInputs = - [ pkgconfig glib alsaLib ] + [ pkgconfig glib cairo ] + # can't build alsaLib on darwin + ++ stdenv.lib.optional (!stdenv.isDarwin) alsaLib ++ stdenv.lib.optionals (!minimalDeps) - [ xlibs.xlibs xlibs.libXv cdparanoia libogg libtheora libvorbis - freetype pango liboil - ]; + [ xlibs.xlibs xlibs.libXv libogg libtheora libvorbis freetype pango + liboil ] + # can't build cdparanoia on darwin + ++ stdenv.lib.optional (!minimalDeps && !stdenv.isDarwin) cdparanoia; propagatedBuildInputs = [ gstreamer ]; postInstall = "rm -rf $out/share/gtk-doc"; - meta = { - homepage = http://gstreamer.freedesktop.org; - + meta = with stdenv.lib; { + homepage = http://gstreamer.freedesktop.org; description = "Base plug-ins for GStreamer"; - - license = "LGPLv2+"; + license = licences.lgpl2Plus; + maintainers = with maintainers; [ lovek323 ]; + platforms = platforms.unix; }; } From d8f8d052c585fbcae5a2cc418428721cdc34e81e Mon Sep 17 00:00:00 2001 From: Joachim Schiele Date: Wed, 3 Jul 2013 16:24:06 +0200 Subject: [PATCH 212/798] fixes two issues via patches to get knetwork compiling MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit kopete-4.10.4-kopete-linphonemediaengine.patch ---------------------------------------------- patch copied from here: https://bugs.kde.org/show_bug.cgi?id=318825 kopete-4.10.4-kopete-stun.patch ------------------------------- when compiling kopete/protocols/jabber/googletalk/libjingle/talk/session/phone/channelmanager.cc it would produce this error: kopete/protocols/jabber/googletalk/libjingle/talk/p2p/base/stunrequest.h:91:9: error: ‘StunMessageType’ does not name a type problem: this is cased by a cyclic use of stun.h, stunrequest.h and channelmanager.cc with the outcome, that kdenetwork couldn't be compiled since kopete fails to build. solution: move the StunMessageType enum into its own #ifndef --- ...te-4.10.4-kopete-linphonemediaengine.patch | 22 +++++++++ .../kopete-4.10.4-kopete-stun.patch | 47 +++++++++++++++++++ pkgs/desktops/kde-4.10/kdenetwork/kopete.nix | 2 + 3 files changed, 71 insertions(+) create mode 100644 pkgs/desktops/kde-4.10/kdenetwork/kopete-4.10.4-kopete-linphonemediaengine.patch create mode 100644 pkgs/desktops/kde-4.10/kdenetwork/kopete-4.10.4-kopete-stun.patch diff --git a/pkgs/desktops/kde-4.10/kdenetwork/kopete-4.10.4-kopete-linphonemediaengine.patch b/pkgs/desktops/kde-4.10/kdenetwork/kopete-4.10.4-kopete-linphonemediaengine.patch new file mode 100644 index 00000000000..ec003732344 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdenetwork/kopete-4.10.4-kopete-linphonemediaengine.patch @@ -0,0 +1,22 @@ +diff --git a/kopete/protocols/jabber/googletalk/libjingle/talk/session/phone/linphonemediaengine.cc b/kopete/protocols/jabber/googletalk/libjingle/talk/session/phone/linphonemediaengine.cc +index 88fdbd1..57c6c05 100644 +--- a/kopete/protocols/jabber/googletalk/libjingle/talk/session/phone/linphonemediaengine.cc ++++ b/kopete/protocols/jabber/googletalk/libjingle/talk/session/phone/linphonemediaengine.cc +@@ -200,7 +200,7 @@ bool LinphoneVoiceChannel::SetSendCodecs(const std::vector& codecs) + LOG(LS_INFO) << "Using " << i->name << "/" << i->clockrate; + pt_ = i->id; + audio_stream_ = audio_stream_start(&av_profile, -1, "localhost", port1, i->id, 250, 0); /* -1 means that function will choose some free port */ +- port2 = rtp_session_get_local_port(audio_stream_->session); ++ port2 = rtp_session_get_local_port(audio_stream_->ms.session); + first = false; + } + } +@@ -211,7 +211,7 @@ bool LinphoneVoiceChannel::SetSendCodecs(const std::vector& codecs) + // working with a buggy client; let's try PCMU. + LOG(LS_WARNING) << "Received empty list of codces; using PCMU/8000"; + audio_stream_ = audio_stream_start(&av_profile, -1, "localhost", port1, 0, 250, 0); /* -1 means that function will choose some free port */ +- port2 = rtp_session_get_local_port(audio_stream_->session); ++ port2 = rtp_session_get_local_port(audio_stream_->ms.session); + } + + return true; diff --git a/pkgs/desktops/kde-4.10/kdenetwork/kopete-4.10.4-kopete-stun.patch b/pkgs/desktops/kde-4.10/kdenetwork/kopete-4.10.4-kopete-stun.patch new file mode 100644 index 00000000000..d6aa9515b76 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdenetwork/kopete-4.10.4-kopete-stun.patch @@ -0,0 +1,47 @@ +diff --git a/kopete/protocols/jabber/googletalk/libjingle/talk/p2p/base/stun.h b/kopete/protocols/jabber/googletalk/libjingle/talk/p2p/base/stun.h +--- a/kopete/protocols/jabber/googletalk/libjingle/talk/p2p/base/stun.h ++++ b/kopete/protocols/jabber/googletalk/libjingle/talk/p2p/base/stun.h +@@ -25,16 +25,8 @@ + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +-#ifndef __STUN_H__ +-#define __STUN_H__ +- +-// This file contains classes for dealing with the STUN and TURN protocols. +-// Both protocols use the same wire format. +- +-#include "talk/base/basictypes.h" +-#include "talk/base/bytebuffer.h" +-#include +-#include ++#ifndef STUN__HH__IN__STUNREQUEST_CYCLIC_PROBLEM_FIX ++#define STUN__HH__IN__STUNREQUEST_CYCLIC_PROBLEM_FIX + + namespace cricket { + +@@ -55,6 +47,23 @@ + STUN_DATA_INDICATION = 0x0115 + }; + ++} ++ ++#endif // STUN__HH__IN__STUNREQUEST_CYCLIC_PROBLEM_FIX ++ ++#ifndef __STUN_H__ ++#define __STUN_H__ ++ ++// This file contains classes for dealing with the STUN and TURN protocols. ++// Both protocols use the same wire format. ++ ++#include "talk/base/basictypes.h" ++#include "talk/base/bytebuffer.h" ++#include ++#include ++ ++namespace cricket { ++ + // These are the types of attributes defined in STUN & TURN. Next to each is + // the name of the class (T is StunTAttribute) that implements that type. + enum StunAttributeType { + diff --git a/pkgs/desktops/kde-4.10/kdenetwork/kopete.nix b/pkgs/desktops/kde-4.10/kdenetwork/kopete.nix index 3907b67c42a..7139c62981c 100644 --- a/pkgs/desktops/kde-4.10/kdenetwork/kopete.nix +++ b/pkgs/desktops/kde-4.10/kdenetwork/kopete.nix @@ -18,6 +18,8 @@ kde { patchPhase = '' cp -v ${./FindmsiLBC.cmake} kopete/cmake/modules/FindmsiLBC.cmake + patch -p1 < ${./kopete-4.10.4-kopete-linphonemediaengine.patch} + patch -p1 < ${./kopete-4.10.4-kopete-stun.patch} ''; cmakeFlags = [ "-DBUILD_skypebuttons=TRUE" ]; From 074acec50bf58c4fed0fd5fe8ebeb1a341271e23 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 3 Jul 2013 16:35:13 +0200 Subject: [PATCH 213/798] Doh --- pkgs/lib/licenses.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/lib/licenses.nix b/pkgs/lib/licenses.nix index f6c1fddfd14..0dcdff0bee4 100644 --- a/pkgs/lib/licenses.nix +++ b/pkgs/lib/licenses.nix @@ -4,7 +4,8 @@ * add it to this list. The URL mentioned above is a good source for inspiration. */ - agpl3 = "AGPLv3"; + agpl3 = { + shortName = "AGPLv3"; fullName = "GNU Affero General Public License version 3 only"; url = https://www.gnu.org/licenses/agpl.html; }; From 5bb91ac679f13191162c1defacbe8c3927c6c43a Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Wed, 3 Jul 2013 17:28:49 +0200 Subject: [PATCH 214/798] Added nodejs packages for: bcrypt, nconf, winston, jade, view-helpers, mongoose, passport, gzippo, walk, forever, kue, supertest and should --- pkgs/top-level/node-packages-generated.nix | 1738 ++++++++++++++++++++ pkgs/top-level/node-packages.json | 18 + 2 files changed, 1756 insertions(+) diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix index 1c4581256dd..ec40cc2cb5c 100644 --- a/pkgs/top-level/node-packages-generated.nix +++ b/pkgs/top-level/node-packages-generated.nix @@ -49,6 +49,17 @@ dependencies = [ ]; } + { + baseName = "apparatus"; + version = "0.0.7"; + fullName = "apparatus->= 0.0.4"; + hash = "77ce711505bf1c65222b5dd01e055284b25cf52ee3229fcae7fcfa3e5664826c"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "sylvester"; range = ">= 0.0.8"; } + ]; + } { baseName = "asn1"; version = "0.1.11"; @@ -90,6 +101,36 @@ dependencies = [ ]; } + { + baseName = "async"; + version = "0.1.22"; + fullName = "async-0.1.x"; + hash = "6fd2750cd519a754b0e32ef3423e64768055129e00a95d9297005bda29fdef18"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "async"; + version = "0.2.9"; + fullName = "async-0.2.x"; + hash = "7215c94b63ccaa543b4b75c5dd9b820fd4839e1f9616b08a0334a8ac74939c53"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "async"; + version = "0.2.9"; + fullName = "async-~0.2.6"; + hash = "7215c94b63ccaa543b4b75c5dd9b820fd4839e1f9616b08a0334a8ac74939c53"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } { baseName = "async"; version = "0.2.9"; @@ -124,6 +165,16 @@ { name = "xmlbuilder"; range = "*"; } ]; } + { + baseName = "aws-sign"; + version = "0.2.0"; + fullName = "aws-sign-~0.2.0"; + hash = "145962c6b9b4fe70f587fa745157522c2c6dac4c22bb6fdf3f6cb297f723647e"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } { baseName = "aws-sign"; version = "0.3.0"; @@ -155,6 +206,37 @@ dependencies = [ ]; } + { + baseName = "bcrypt"; + version = "0.7.6"; + fullName = "bcrypt-*"; + hash = "e7964429b2bc8aea9b9fb66b914cb3a7952a77029ae13a5a4c4cdbf837d40b2a"; + patchLatest = false; + topLevel = true; + dependencies = [ + { name = "bindings"; range = "1.0.0"; } + ]; + } + { + baseName = "bindings"; + version = "1.1.0"; + fullName = "bindings-*"; + hash = "9ce864c7ce347eb3f8728fc03bc5a01f5e6195b145e6b9674eb2b98c5c715865"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "bindings"; + version = "1.0.0"; + fullName = "bindings-1.0.0"; + hash = "cb211ac856d135af5ee864762fae9e554225a613ea1fd815c20b8fdd1679c9ed"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } { baseName = "block-stream"; version = "0.0.6"; @@ -166,6 +248,17 @@ { name = "inherits"; range = "~1.0.0"; } ]; } + { + baseName = "boom"; + version = "0.3.8"; + fullName = "boom-0.3.x"; + hash = "0ea9787bd5c5df98a06a2c7b629d4768c712611032d9af162332e825f9131d8a"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "hoek"; range = "0.7.x"; } + ]; + } { baseName = "boom"; version = "0.4.2"; @@ -177,6 +270,36 @@ { name = "hoek"; range = "0.9.x"; } ]; } + { + baseName = "broadway"; + version = "0.2.7"; + fullName = "broadway-0.2.7"; + hash = "b1ceb289fb1a6de82cddab0851fc905bb60e75167d0e37f32147f8985fa8d368"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "cliff"; range = "0.1.8"; } + { name = "eventemitter2"; range = "0.4.11"; } + { name = "nconf"; range = "0.6.7"; } + { name = "winston"; range = "0.6.2"; } + { name = "utile"; range = "0.1.7"; } + ]; + } + { + baseName = "broadway"; + version = "0.2.7"; + fullName = "broadway-0.2.x"; + hash = "b1ceb289fb1a6de82cddab0851fc905bb60e75167d0e37f32147f8985fa8d368"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "cliff"; range = "0.1.8"; } + { name = "eventemitter2"; range = "0.4.11"; } + { name = "nconf"; range = "0.6.7"; } + { name = "winston"; range = "0.6.2"; } + { name = "utile"; range = "0.1.7"; } + ]; + } { baseName = "browserchannel"; version = "1.0.4"; @@ -190,6 +313,36 @@ { name = "request"; range = "~2"; } ]; } + { + baseName = "bson"; + version = "0.1.8"; + fullName = "bson-0.1.8"; + hash = "a9cbdee757f213b93aca860fc06143b1f9e9a983130616732beab452681bae17"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "bson"; + version = "0.1.9"; + fullName = "bson-0.1.9"; + hash = "8bb768566c4e8063883d07d2c7965ce8e5380892fd5e34448729c7f44c5f42c8"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "buffer-crc32"; + version = "0.1.1"; + fullName = "buffer-crc32-0.1.1"; + hash = "9e35b724e4e1fd7112e97a6856e7d52b2644761c184f1ed391f6a576fbbb80e1"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } { baseName = "buffer-crc32"; version = "0.2.1"; @@ -200,6 +353,16 @@ dependencies = [ ]; } + { + baseName = "buffer-crc32"; + version = "0.2.1"; + fullName = "buffer-crc32-~0.2.1"; + hash = "b6ea96d57411e37c15e18fb8ca600656399912ce16355f9af3c662f765507f01"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } { baseName = "buffertools"; version = "1.1.1"; @@ -242,6 +405,16 @@ dependencies = [ ]; } + { + baseName = "character-parser"; + version = "1.0.2"; + fullName = "character-parser-1.0.2"; + hash = "751edecb1143ea951e9cef5c7e1ac71526c712cfab538d09cbb2e90e56d76865"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } { baseName = "cli"; version = "0.4.4-2"; @@ -253,6 +426,19 @@ { name = "glob"; range = ">= 3.1.4"; } ]; } + { + baseName = "cliff"; + version = "0.1.8"; + fullName = "cliff-0.1.8"; + hash = "702f7ce79168e38b982eb3141485bd99e3a6480dac42f579365dc522c3950588"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "colors"; range = "0.x.x"; } + { name = "eyes"; range = "0.1.x"; } + { name = "winston"; range = "0.6.x"; } + ]; + } { baseName = "clone"; version = "0.1.5"; @@ -283,6 +469,36 @@ dependencies = [ ]; } + { + baseName = "colors"; + version = "0.6.0-1"; + fullName = "colors-0.6.0-1"; + hash = "ca97f462664d77f5ae813029d020d4610ec9fd3f9eef3875e551d3665be7ab7d"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "colors"; + version = "0.6.0-1"; + fullName = "colors-0.6.x"; + hash = "ca97f462664d77f5ae813029d020d4610ec9fd3f9eef3875e551d3665be7ab7d"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "colors"; + version = "0.6.0-1"; + fullName = "colors-0.x.x"; + hash = "ca97f462664d77f5ae813029d020d4610ec9fd3f9eef3875e551d3665be7ab7d"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } { baseName = "combined-stream"; version = "0.0.4"; @@ -314,6 +530,37 @@ dependencies = [ ]; } + { + baseName = "commander"; + version = "1.2.0"; + fullName = "commander-1.2.0"; + hash = "caeda1cecf7c1b5bf505cdf8d34b984db6ebb307af3798f4af2efdb554d31a4b"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "keypress"; range = "0.1.x"; } + ]; + } + { + baseName = "connect"; + version = "2.7.5"; + fullName = "connect-2.7.5"; + hash = "0c36efa44c6fee030b617a57e52c23f92e7e3949ed01405ee0cb9804403d137f"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "qs"; range = "0.5.1"; } + { name = "formidable"; range = "1.0.11"; } + { name = "cookie-signature"; range = "1.0.0"; } + { name = "buffer-crc32"; range = "0.1.1"; } + { name = "cookie"; range = "0.0.5"; } + { name = "send"; range = "0.1.0"; } + { name = "bytes"; range = "0.2.0"; } + { name = "fresh"; range = "0.1.0"; } + { name = "pause"; range = "0.0.1"; } + { name = "debug"; range = "*"; } + ]; + } { baseName = "connect"; version = "2.8.1"; @@ -335,6 +582,27 @@ { name = "debug"; range = "*"; } ]; } + { + baseName = "connect-flash"; + version = "0.1.1"; + fullName = "connect-flash-*"; + hash = "3a0a9ac9d73695abcf67a88cb1bc433cc67c55aeca3b515eb922453c7ba0c393"; + patchLatest = false; + topLevel = true; + dependencies = [ + ]; + } + { + baseName = "connect-mongo"; + version = "0.3.2"; + fullName = "connect-mongo-*"; + hash = "1f37b52d7816769f33dfa94fad0323f8685139a3a01d738b7a29531f172f86b6"; + patchLatest = false; + topLevel = true; + dependencies = [ + { name = "mongodb"; range = "1.2.x"; } + ]; + } { baseName = "connect"; version = "2.8.1"; @@ -366,6 +634,17 @@ dependencies = [ ]; } + { + baseName = "constantinople"; + version = "1.0.1"; + fullName = "constantinople-~1.0.1"; + hash = "3740bec1b48ee60653c946ab295fecefb9c08b47e1a495330757b415c7cd402f"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "uglify-js"; range = "~2.3.6"; } + ]; + } { baseName = "cookie"; version = "0.0.5"; @@ -386,6 +665,16 @@ dependencies = [ ]; } + { + baseName = "cookie-jar"; + version = "0.2.0"; + fullName = "cookie-jar-~0.2.0"; + hash = "eeb643c638f828e39dfc9f44ad8d8e5376930868fdcaf3818ff316806e65af6d"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } { baseName = "cookie-jar"; version = "0.3.0"; @@ -396,6 +685,16 @@ dependencies = [ ]; } + { + baseName = "cookie-signature"; + version = "1.0.0"; + fullName = "cookie-signature-1.0.0"; + hash = "990a69fb94e6504390dd0fe935b9fe380f925e1a8360e200e97baa908fca86c6"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } { baseName = "cookie-signature"; version = "1.0.1"; @@ -406,6 +705,27 @@ dependencies = [ ]; } + { + baseName = "cookiejar"; + version = "1.3.0"; + fullName = "cookiejar-1.3.0"; + hash = "3bf00caf0e2f9dcd03c7175dcf6c5d700fa6d6f6f7ed77875b986e3c1a606ba7"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "cryptiles"; + version = "0.1.3"; + fullName = "cryptiles-0.1.x"; + hash = "bac017be67d2b33c01a9b625726b3f8e1e1786711f3132a3cc6f85779ee1d103"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "boom"; range = "0.3.x"; } + ]; + } { baseName = "cryptiles"; version = "0.2.1"; @@ -417,6 +737,48 @@ { name = "boom"; range = "0.4.x"; } ]; } + { + baseName = "css-parse"; + version = "1.0.4"; + fullName = "css-parse-1.0.4"; + hash = "3d7dcc526083cc1dc584d10c179100a199a82e93991c8bdc92b96ee4bfb7ccac"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "css-stringify"; + version = "1.0.5"; + fullName = "css-stringify-1.0.5"; + hash = "ef45a473b200f24e4cb2f0a97da70b629261ae8a54482e49e1eabc3e4cc36c0e"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "css"; + version = "1.0.8"; + fullName = "css-~1.0.8"; + hash = "535bcca2a3635e315a5add3536d2b97fe5636bbee5d039e4fadd8cd422912b8b"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "css-parse"; range = "1.0.4"; } + { name = "css-stringify"; range = "1.0.5"; } + ]; + } + { + baseName = "cssom"; + version = "0.2.5"; + fullName = "cssom-0.2.x"; + hash = "22594077e4241c81038cdaac23fcb5ed7f8329a1dc5645286fa55db45c8ac13b"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } { baseName = "ctype"; version = "0.5.0"; @@ -437,6 +799,16 @@ dependencies = [ ]; } + { + baseName = "cycle"; + version = "1.0.2"; + fullName = "cycle-1.0.x"; + hash = "ee5dd9af8f0a59624bb32bb6a6f67c13710e180112dba5a578f3d427a3268748"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } { baseName = "debug"; version = "0.7.2"; @@ -457,6 +829,26 @@ dependencies = [ ]; } + { + baseName = "debug"; + version = "0.7.2"; + fullName = "debug-~0.7.2"; + hash = "f9142856b1c2652a11e50f2aca068edbad7598f50d9e6d003b8ee85b2a333d63"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "deep-equal"; + version = "0.0.0"; + fullName = "deep-equal-*"; + hash = "6a5666d4bfa5d2786a9f86ede2eaa8252f783edb9d78e69cba645f7cb6e153b8"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } { baseName = "deep-equal"; version = "0.0.0"; @@ -487,6 +879,16 @@ dependencies = [ ]; } + { + baseName = "director"; + version = "1.1.10"; + fullName = "director-1.1.10"; + hash = "292c96d0d5bf8276a498595c576a6cfc832247703f2b75f09ad37c19caa5fca6"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } { baseName = "dtrace-provider"; version = "0.2.8"; @@ -497,6 +899,16 @@ dependencies = [ ]; } + { + baseName = "emitter-component"; + version = "1.0.0"; + fullName = "emitter-component-1.0.0"; + hash = "1ffc29fc11b2e4ccbac6064443e65a606a21d826e313886932596bf11784dcdb"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } { baseName = "escape-html"; version = "1.0.0"; @@ -507,6 +919,37 @@ dependencies = [ ]; } + { + baseName = "event-stream"; + version = "0.5.3"; + fullName = "event-stream-~0.5"; + hash = "988f4ee3e8f86d6f5f267b56de88bf733e05fe6f1adc0e135090c308822e9e86"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "optimist"; range = "0.2"; } + ]; + } + { + baseName = "eventemitter2"; + version = "0.4.11"; + fullName = "eventemitter2-0.4.11"; + hash = "2825d48a2313f703dfb6829e8a3bc89fe6442272b7dbec9d9c51e4794da81a83"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "eventemitter2"; + version = "0.4.12"; + fullName = "eventemitter2-~0.4.11"; + hash = "466b3aa03fe384b46c8384ec7cc42248117a70e9b48c0e20706889b97edcdeac"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } { baseName = "events.node"; version = "0.4.9"; @@ -538,6 +981,27 @@ { name = "debug"; range = "*"; } ]; } + { + baseName = "express"; + version = "3.1.2"; + fullName = "express-~3.1.1"; + hash = "d72eb1b799ddfe78afc369168881bfef866213baf5cd47a56902fd732dbbd2b6"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "connect"; range = "2.7.5"; } + { name = "commander"; range = "0.6.1"; } + { name = "range-parser"; range = "0.0.4"; } + { name = "mkdirp"; range = "~0.3.4"; } + { name = "cookie"; range = "0.0.5"; } + { name = "buffer-crc32"; range = "~0.2.1"; } + { name = "fresh"; range = "0.1.0"; } + { name = "methods"; range = "0.0.1"; } + { name = "send"; range = "0.1.0"; } + { name = "cookie-signature"; range = "1.0.0"; } + { name = "debug"; range = "*"; } + ]; + } { baseName = "extend"; version = "1.1.3"; @@ -568,6 +1032,16 @@ dependencies = [ ]; } + { + baseName = "eyes"; + version = "0.1.8"; + fullName = "eyes-0.1.x"; + hash = "4fa6db8f2c9926fb39a211c622d7eb3a76efbc4878559f9bd155d647a6963735"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } { baseName = "faye-websocket"; version = "0.6.0"; @@ -589,6 +1063,64 @@ dependencies = [ ]; } + { + baseName = "flatiron"; + version = "0.3.5"; + fullName = "flatiron-0.3.5"; + hash = "8f1e074d3f678fe3d4720e27b260f95ee9d69deb2ab3059c6b9854531d8b247f"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "broadway"; range = "0.2.7"; } + { name = "optimist"; range = "0.3.5"; } + { name = "prompt"; range = "0.2.9"; } + { name = "director"; range = "1.1.10"; } + { name = "pkginfo"; range = "0.3.0"; } + ]; + } + { + baseName = "forEachAsync"; + version = "2.2.0"; + fullName = "forEachAsync-~2.2"; + hash = "43367e7aad92f59595f22ad3e586ba2b370fd03b7f55da381503494528693e05"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "sequence"; range = ">= 2.2.1"; } + ]; + } + { + baseName = "forever"; + version = "0.10.8"; + fullName = "forever-*"; + hash = "858a7405a72d55fea21a3f3396d34ad0cfb35f15dd6ded76e2856b828ff20cae"; + patchLatest = false; + topLevel = true; + dependencies = [ + { name = "colors"; range = "0.6.0-1"; } + { name = "cliff"; range = "0.1.8"; } + { name = "flatiron"; range = "0.3.5"; } + { name = "forever-monitor"; range = "1.2.2"; } + { name = "nconf"; range = "0.6.7"; } + { name = "nssocket"; range = "~0.5.1"; } + { name = "optimist"; range = "0.4.0"; } + { name = "pkginfo"; range = "0.3.0"; } + { name = "timespan"; range = "2.0.1"; } + { name = "watch"; range = "0.7.0"; } + { name = "utile"; range = "0.1.7"; } + { name = "winston"; range = "0.7.1"; } + ]; + } + { + baseName = "forever-agent"; + version = "0.2.0"; + fullName = "forever-agent-~0.2.0"; + hash = "d6fac115c60bb3aa6b5b653ea6612e9c1c1d172e08c98251fcfd2d066c1fcda3"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } { baseName = "forever-agent"; version = "0.5.0"; @@ -599,6 +1131,22 @@ dependencies = [ ]; } + { + baseName = "forever-monitor"; + version = "1.2.2"; + fullName = "forever-monitor-1.2.2"; + hash = "ff2f10f179ec6003278a250f76dd53ebaaace37c3c2409478b7b36ecee650a0c"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "broadway"; range = "0.2.x"; } + { name = "minimatch"; range = "0.0.x"; } + { name = "pkginfo"; range = "0.x.x"; } + { name = "ps-tree"; range = "0.0.x"; } + { name = "watch"; range = "0.5.x"; } + { name = "utile"; range = "0.1.x"; } + ]; + } { baseName = "form-data"; version = "0.0.8"; @@ -612,6 +1160,29 @@ { name = "async"; range = "~0.2.7"; } ]; } + { + baseName = "form-data"; + version = "0.0.10"; + fullName = "form-data-~0.0.3"; + hash = "d49669b81c27dd6c7e359ee9892880c6741dae6c325b617ab3eb5a78bf103822"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "combined-stream"; range = "~0.0.4"; } + { name = "mime"; range = "~1.2.2"; } + { name = "async"; range = "~0.2.7"; } + ]; + } + { + baseName = "formidable"; + version = "1.0.11"; + fullName = "formidable-1.0.11"; + hash = "39b345d14d69c27fe262e12f16900cef6be220510788866e0a12c9fedd03766e"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } { baseName = "formidable"; version = "1.0.13"; @@ -632,6 +1203,16 @@ dependencies = [ ]; } + { + baseName = "formidable"; + version = "1.0.9"; + fullName = "formidable-1.0.9"; + hash = "3b54deef3897d910d1e6dedd81fa2f4a65b7e93b5dd5cf1c8c098b63260c214c"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } { baseName = "fresh"; version = "0.1.0"; @@ -749,6 +1330,17 @@ dependencies = [ ]; } + { + baseName = "gzippo"; + version = "0.2.0"; + fullName = "gzippo-*"; + hash = "844f214312ef8ec2dee4543e6da383728ae081e96961f5ccb6786f0eed8474ab"; + patchLatest = false; + topLevel = true; + dependencies = [ + { name = "send"; range = "*"; } + ]; + } { baseName = "hat"; version = "0.0.3"; @@ -759,6 +1351,20 @@ dependencies = [ ]; } + { + baseName = "hawk"; + version = "0.10.2"; + fullName = "hawk-~0.10.2"; + hash = "a55c7f967a8e01b6307185abc796320b54a9d6126952e41281dca3c1841affb8"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "hoek"; range = "0.7.x"; } + { name = "boom"; range = "0.3.x"; } + { name = "cryptiles"; range = "0.1.x"; } + { name = "sntp"; range = "0.1.x"; } + ]; + } { baseName = "hawk"; version = "0.13.1"; @@ -773,6 +1379,27 @@ { name = "sntp"; range = "0.2.x"; } ]; } + { + baseName = "hiredis"; + version = "0.1.15"; + fullName = "hiredis-*"; + hash = "621bb738d1ef8335fe2f373d5446a4817a62bf8ab6e956fb6a7aa4932f8ccb08"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "bindings"; range = "*"; } + ]; + } + { + baseName = "hoek"; + version = "0.7.6"; + fullName = "hoek-0.7.x"; + hash = "135068c73cf7f0db625d95461991db113b9b4a09c6d118a80f4b33d1cad41d9b"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } { baseName = "hoek"; version = "0.8.5"; @@ -793,6 +1420,16 @@ dependencies = [ ]; } + { + baseName = "hooks"; + version = "0.2.1"; + fullName = "hooks-0.2.1"; + hash = "65b9c6940a0edc5324e9c7f2422cdf2700436a1d2e9008e2a9f5dcc732cd46bd"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } { baseName = "htdigest"; version = "1.0.7"; @@ -854,6 +1491,16 @@ { name = "ctype"; range = "0.5.2"; } ]; } + { + baseName = "i"; + version = "0.3.1"; + fullName = "i-0.3.x"; + hash = "9dbd68b705366f5bdda60b9cf80149c89255d444649e21cc12556b14fb7ee784"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } { baseName = "inherits"; version = "1.0.0"; @@ -884,6 +1531,43 @@ dependencies = [ ]; } + { + baseName = "ini"; + version = "1.1.0"; + fullName = "ini-1.x.x"; + hash = "307ecc5f8664773587a0d74165d1dbdb226754b638542596b7a1e2ed0a578a28"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "is-promise"; + version = "1.0.0"; + fullName = "is-promise-~1"; + hash = "65806ec461b83060a8857d2571c84bd66451db0683969ed3f9180f8a2c1a915f"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "jade"; + version = "0.32.0"; + fullName = "jade-*"; + hash = "25bd8ad332bdf7dba4bcd2bf38b6f5ff49e1a9401668a4c4edf50e1277031e2d"; + patchLatest = false; + topLevel = true; + dependencies = [ + { name = "commander"; range = "1.2.0"; } + { name = "mkdirp"; range = "0.3.x"; } + { name = "transformers"; range = "2.0.1"; } + { name = "character-parser"; range = "1.0.2"; } + { name = "monocle"; range = "0.1.48"; } + { name = "with"; range = "~1.1.0"; } + { name = "constantinople"; range = "~1.0.1"; } + ]; + } { baseName = "jade"; version = "0.26.3"; @@ -931,6 +1615,16 @@ dependencies = [ ]; } + { + baseName = "json-stringify-safe"; + version = "3.0.0"; + fullName = "json-stringify-safe-~3.0.0"; + hash = "77580345a4d3d5db0e530757c86a6bd032b69b31f509f58a8d1232abc14690c0"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } { baseName = "json-stringify-safe"; version = "4.0.0"; @@ -974,6 +1668,26 @@ dependencies = [ ]; } + { + baseName = "kerberos"; + version = "0.0.3"; + fullName = "kerberos-*"; + hash = "40300bf5e4ca224127b7e88586dce003c58e59cf4972f699fdc95079135a76fe"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "keypress"; + version = "0.1.0"; + fullName = "keypress-0.1.x"; + hash = "2e43d67e9df19176f874e1a44693f2ea802df77e255d3fc272a0de8124f83be5"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } { baseName = "knox"; version = "0.8.3"; @@ -988,6 +1702,32 @@ { name = "stream-counter"; range = "~0.1.0"; } ]; } + { + baseName = "kue"; + version = "0.6.2"; + fullName = "kue-*"; + hash = "c52cb0ebc11226bff8d1fb8068cc4cc562c3970d1d24c201d8a8ed68847b9115"; + patchLatest = false; + topLevel = true; + dependencies = [ + { name = "redis"; range = "0.7.2"; } + { name = "express"; range = "~3.1.1"; } + { name = "jade"; range = "0.26.3"; } + { name = "stylus"; range = "0.27.2"; } + { name = "nib"; range = "0.5.0"; } + { name = "reds"; range = "0.1.4"; } + ]; + } + { + baseName = "lazy"; + version = "1.0.11"; + fullName = "lazy-~1.0.11"; + hash = "05a9685292102599629d3212fbd04102ff71b0cf306cee9773ab1602c75a4ab0"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } { baseName = "lru-cache"; version = "2.3.0"; @@ -1018,6 +1758,16 @@ dependencies = [ ]; } + { + baseName = "lru-cache"; + version = "1.0.6"; + fullName = "lru-cache-~1.0.2"; + hash = "f3a419d4989d9db292a7207f04b6108eed6d8316553d888a462cccd4c9e8855e"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } { baseName = "methods"; version = "0.0.1"; @@ -1038,6 +1788,26 @@ dependencies = [ ]; } + { + baseName = "mime"; + version = "1.2.5"; + fullName = "mime-1.2.5"; + hash = "ccf05a6c47146e8acb9d0671eee09d2eb077cf9ddd1f7e8eccf49dbf969d6c72"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "mime"; + version = "1.2.6"; + fullName = "mime-1.2.6"; + hash = "7460134d6b4686d64fd1e7b878d34e2bdd258ad29b6665cf62e6d92659e81591"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } { baseName = "mime"; version = "1.2.9"; @@ -1058,6 +1828,16 @@ dependencies = [ ]; } + { + baseName = "mime"; + version = "1.2.9"; + fullName = "mime-~1.2.7"; + hash = "60120b9859a92a94480a76327a9406b4a72a34f2317bc7fa33dcb99b9c72678a"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } { baseName = "mime"; version = "1.2.9"; @@ -1080,6 +1860,17 @@ { name = "sigmund"; range = "~1.0.0"; } ]; } + { + baseName = "minimatch"; + version = "0.0.5"; + fullName = "minimatch-0.0.x"; + hash = "063694baa9f9ab077e687ff59031f461998ef38fda656ec7c3475931177ccf36"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "lru-cache"; range = "~1.0.2"; } + ]; + } { baseName = "minimatch"; version = "0.2.12"; @@ -1092,6 +1883,18 @@ { name = "sigmund"; range = "~1.0.0"; } ]; } + { + baseName = "minimatch"; + version = "0.2.12"; + fullName = "minimatch->=0.2.4"; + hash = "205cff8b4ba926e86ff0e6f7f566553906113892028083ea221989a42500c246"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "lru-cache"; range = "2"; } + { name = "sigmund"; range = "~1.0.0"; } + ]; + } { baseName = "minimatch"; version = "0.2.12"; @@ -1174,6 +1977,36 @@ dependencies = [ ]; } + { + baseName = "mkdirp"; + version = "0.3.5"; + fullName = "mkdirp-0.3.x"; + hash = "8ae9c5107acb41110106224f5e7be2b50b00d15d062ea7941301c111b863fd26"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "mkdirp"; + version = "0.3.5"; + fullName = "mkdirp-0.x.x"; + hash = "8ae9c5107acb41110106224f5e7be2b50b00d15d062ea7941301c111b863fd26"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "mkdirp"; + version = "0.3.5"; + fullName = "mkdirp-~0.3.4"; + hash = "8ae9c5107acb41110106224f5e7be2b50b00d15d062ea7941301c111b863fd26"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } { baseName = "mocha"; version = "1.12.0"; @@ -1192,6 +2025,89 @@ { name = "glob"; range = "3.2.1"; } ]; } + { + baseName = "mongodb"; + version = "1.2.14"; + fullName = "mongodb-1.2.x"; + hash = "011e76d49fb99a58659db12e55d340c4731184dd635b769717db374db3f701a0"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "bson"; range = "0.1.8"; } + ]; + } + { + baseName = "mongodb"; + version = "1.3.10"; + fullName = "mongodb-1.3.10"; + hash = "ea6f279c0bebedec94f0d757fef775302dba6dd4a3792f59696d094bd2c2f113"; + patchLatest = true; + topLevel = false; + dependencies = [ + { name = "bson"; range = "0.1.9"; } + { name = "kerberos"; range = "*"; } + ]; + } + { + baseName = "mongoose"; + version = "3.6.13"; + fullName = "mongoose-*"; + hash = "b6d79ace01b4acbabb0c07d4c053f6fdf4a6b7252cc506ccbbc7a6db5e6bbe36"; + patchLatest = false; + topLevel = true; + dependencies = [ + { name = "hooks"; range = "0.2.1"; } + { name = "mongodb"; range = "1.3.10"; } + { name = "ms"; range = "0.1.0"; } + { name = "sliced"; range = "0.0.3"; } + { name = "muri"; range = "0.3.1"; } + { name = "mpromise"; range = "0.2.1"; } + { name = "mpath"; range = "0.1.1"; } + { name = "regexp-clone"; range = "0.0.1"; } + ]; + } + { + baseName = "monocle"; + version = "0.1.48"; + fullName = "monocle-0.1.48"; + hash = "3a94a890f37ff135ea82f640d8e693f10a11bca3d30c3ec7456a9f97683f15d5"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "readdirp"; range = "~0.2.3"; } + ]; + } + { + baseName = "mpath"; + version = "0.1.1"; + fullName = "mpath-0.1.1"; + hash = "23e83ac6c4b3d67cc34dc1ba05d1085a3d9ef8243caa756b1ca4af12b4370751"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "mpromise"; + version = "0.2.1"; + fullName = "mpromise-0.2.1"; + hash = "56d035a66b1a19a8ad64e99354355e128b18394f69d545597bb5a25fe80147bf"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "sliced"; range = "0.0.4"; } + ]; + } + { + baseName = "ms"; + version = "0.1.0"; + fullName = "ms-0.1.0"; + hash = "474bcdb7965551c5a111be2fcdb5e4607491c70a601d04d818ec7e1e1c2ff88b"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } { baseName = "ms"; version = "0.3.0"; @@ -1202,6 +2118,26 @@ dependencies = [ ]; } + { + baseName = "muri"; + version = "0.3.1"; + fullName = "muri-0.3.1"; + hash = "5e1b7ac7790350f6043fc8fa1b18f85818fefe0adda18d0c058460413757f959"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "mute-stream"; + version = "0.0.3"; + fullName = "mute-stream-~0.0.2"; + hash = "7bb2401ad9afaa6f04bc1d2d9411a6e41d7a6198de929d4522e95eeae78b1082"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } { baseName = "mv"; version = "0.0.5"; @@ -1212,6 +2148,57 @@ dependencies = [ ]; } + { + baseName = "natural"; + version = "0.0.69"; + fullName = "natural-0.0.69"; + hash = "1cd394575cbeba7963378fc572a85a3279c4359b75740f9062dddb5b64d6c402"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "sylvester"; range = ">= 0.0.12"; } + { name = "apparatus"; range = ">= 0.0.4"; } + { name = "underscore"; range = "*"; } + ]; + } + { + baseName = "nconf"; + version = "0.6.7"; + fullName = "nconf-*"; + hash = "1ec390b8fa439e1160e432edc0f9ccec544b8216dfaba3db7002d38351ccfa1c"; + patchLatest = false; + topLevel = true; + dependencies = [ + { name = "async"; range = "0.1.x"; } + { name = "ini"; range = "1.x.x"; } + { name = "optimist"; range = "0.3.x"; } + { name = "pkginfo"; range = "0.2.x"; } + ]; + } + { + baseName = "nconf"; + version = "0.6.7"; + fullName = "nconf-0.6.7"; + hash = "1ec390b8fa439e1160e432edc0f9ccec544b8216dfaba3db7002d38351ccfa1c"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "async"; range = "0.1.x"; } + { name = "ini"; range = "1.x.x"; } + { name = "optimist"; range = "0.3.x"; } + { name = "pkginfo"; range = "0.2.x"; } + ]; + } + { + baseName = "ncp"; + version = "0.2.7"; + fullName = "ncp-0.2.x"; + hash = "9bae6495de613c5adb418348224512b9dc42f2b74c7a2fabecf02f8b7d08343d"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } { baseName = "negotiator"; version = "0.2.5"; @@ -1222,6 +2209,16 @@ dependencies = [ ]; } + { + baseName = "nib"; + version = "0.5.0"; + fullName = "nib-0.5.0"; + hash = "9e3ebce2cfb055b8eadcb2fcac3e49570e429a5262ce5a59844857fbcb27f4c7"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } { baseName = "nijs"; version = "0.0.8"; @@ -1316,6 +2313,16 @@ dependencies = [ ]; } + { + baseName = "nodemon"; + version = "0.7.8"; + fullName = "nodemon-*"; + hash = "123a54f51297e5186061846a5dae5117c2a218a8a477364055828a0c2ea39bed"; + patchLatest = false; + topLevel = true; + dependencies = [ + ]; + } { baseName = "nopt"; version = "2.1.1"; @@ -1360,6 +2367,28 @@ { name = "ansi"; range = "~0.1.2"; } ]; } + { + baseName = "nssocket"; + version = "0.5.1"; + fullName = "nssocket-~0.5.1"; + hash = "aaf06b612cd99bf9e5790b2bf9b0f1963c2b605eaf3529b905c1fbdc1dee5333"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "eventemitter2"; range = "~0.4.11"; } + { name = "lazy"; range = "~1.0.11"; } + ]; + } + { + baseName = "oauth-sign"; + version = "0.2.0"; + fullName = "oauth-sign-~0.2.0"; + hash = "ef91b4266c71c68478dd7c50767085210006ebfb9e9263c72d42f47972991580"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } { baseName = "oauth-sign"; version = "0.3.0"; @@ -1392,6 +2421,61 @@ { name = "minimist"; range = "~0.0.1"; } ]; } + { + baseName = "optimist"; + version = "0.2.8"; + fullName = "optimist-0.2"; + hash = "5ee9f3bbd03239903831ccc33c6c365251550cbfd88d9fb92011feac4376cf84"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "wordwrap"; range = ">=0.0.1 <0.1.0"; } + ]; + } + { + baseName = "optimist"; + version = "0.3.5"; + fullName = "optimist-0.3.5"; + hash = "a407715c9745c9242923f282a70d55947e21f5c4800c99b09d2eb6e48735a09d"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "wordwrap"; range = "~0.0.2"; } + ]; + } + { + baseName = "optimist"; + version = "0.3.7"; + fullName = "optimist-0.3.x"; + hash = "ba534aa013072a9650a18da311de8025d73b58b71dcea7c7ade4d8e8f274dd33"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "wordwrap"; range = "~0.0.2"; } + ]; + } + { + baseName = "optimist"; + version = "0.4.0"; + fullName = "optimist-0.4.0"; + hash = "bbbd3c9e8c1e8f59e7097271a78fa628c6dc76de894a02fc625872b72bc99555"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "wordwrap"; range = "~0.0.2"; } + ]; + } + { + baseName = "optimist"; + version = "0.3.7"; + fullName = "optimist-~0.3.5"; + hash = "ba534aa013072a9650a18da311de8025d73b58b71dcea7c7ade4d8e8f274dd33"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "wordwrap"; range = "~0.0.2"; } + ]; + } { baseName = "optparse"; version = "1.0.4"; @@ -1422,6 +2506,42 @@ dependencies = [ ]; } + { + baseName = "passport"; + version = "0.1.17"; + fullName = "passport-*"; + hash = "65c15a1666abc16a86d586233f40b89b68b50bf88107809878742973af8b516e"; + patchLatest = false; + topLevel = true; + dependencies = [ + { name = "pkginfo"; range = "0.2.x"; } + { name = "pause"; range = "0.0.1"; } + ]; + } + { + baseName = "passport-local"; + version = "0.1.6"; + fullName = "passport-local-*"; + hash = "de7dbe29a63fc648686425ba4ef23b99195372ae322037977864db08657e262d"; + patchLatest = false; + topLevel = true; + dependencies = [ + { name = "pkginfo"; range = "0.2.x"; } + { name = "passport"; range = "~0.1.1"; } + ]; + } + { + baseName = "passport"; + version = "0.1.17"; + fullName = "passport-~0.1.1"; + hash = "65c15a1666abc16a86d586233f40b89b68b50bf88107809878742973af8b516e"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "pkginfo"; range = "0.2.x"; } + { name = "pause"; range = "0.0.1"; } + ]; + } { baseName = "pause"; version = "0.0.1"; @@ -1432,6 +2552,46 @@ dependencies = [ ]; } + { + baseName = "pkginfo"; + version = "0.2.3"; + fullName = "pkginfo-0.2.x"; + hash = "0685c2cd94db8515a95b8127d1ab4e2a82d37deb4f808b41c9e0c033e34fe77f"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "pkginfo"; + version = "0.3.0"; + fullName = "pkginfo-0.3.0"; + hash = "e55f5e0f767cabc55b638808736f952d6d74157938a87192106ce83c66a195a5"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "pkginfo"; + version = "0.3.0"; + fullName = "pkginfo-0.3.x"; + hash = "e55f5e0f767cabc55b638808736f952d6d74157938a87192106ce83c66a195a5"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "pkginfo"; + version = "0.3.0"; + fullName = "pkginfo-0.x.x"; + hash = "e55f5e0f767cabc55b638808736f952d6d74157938a87192106ce83c66a195a5"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } { baseName = "posix-getopt"; version = "1.0.0"; @@ -1442,6 +2602,53 @@ dependencies = [ ]; } + { + baseName = "promise"; + version = "2.0.0"; + fullName = "promise-~2.0"; + hash = "ccc3f345cd6facd0bcb0e599320e1da06b447ee573982b04f6b615a3da1ba7df"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "is-promise"; range = "~1"; } + ]; + } + { + baseName = "prompt"; + version = "0.2.9"; + fullName = "prompt-0.2.9"; + hash = "2444c21920d4169c51cae11fafed129c09df11f4bdda8e7ad76ea626a8828878"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "pkginfo"; range = "0.x.x"; } + { name = "read"; range = "1.0.x"; } + { name = "revalidator"; range = "0.1.x"; } + { name = "utile"; range = "0.1.x"; } + { name = "winston"; range = "0.6.x"; } + ]; + } + { + baseName = "ps-tree"; + version = "0.0.3"; + fullName = "ps-tree-0.0.x"; + hash = "d6af58e1062457f3aa92306c8eb970f32d2d52b93ecca4920c7409afd419a78d"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "event-stream"; range = "~0.5"; } + ]; + } + { + baseName = "qs"; + version = "0.5.1"; + fullName = "qs-0.5.1"; + hash = "85bf27180b586499902d4e2bea83974b337924c870f6b790a23e6bfeb982c2e5"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } { baseName = "qs"; version = "0.5.5"; @@ -1462,6 +2669,16 @@ dependencies = [ ]; } + { + baseName = "qs"; + version = "0.5.6"; + fullName = "qs-~0.5.4"; + hash = "3c7b49a51d52e5c8b988c2a53f8605d03a18d5e29b55b4f187c6a0fc714d00e9"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } { baseName = "qs"; version = "0.6.5"; @@ -1492,6 +2709,17 @@ dependencies = [ ]; } + { + baseName = "read"; + version = "1.0.4"; + fullName = "read-1.0.x"; + hash = "8be269afeaa7cc62feb4672e8e61e5133152266dc5347b23cf5b05bc40789601"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "mute-stream"; range = "~0.0.2"; } + ]; + } { baseName = "readable-stream"; version = "1.0.2"; @@ -1502,6 +2730,70 @@ dependencies = [ ]; } + { + baseName = "readdirp"; + version = "0.2.5"; + fullName = "readdirp-~0.2.3"; + hash = "22d8e0e38c0d358c951221d0051d1e9e1eafeaf2136ac7fe0aa3bfd36238052c"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "minimatch"; range = ">=0.2.4"; } + ]; + } + { + baseName = "redis"; + version = "0.8.4"; + fullName = "redis-*"; + hash = "077932b14c6b0a4985b7a41cf20e4495463c693c7b9932ebc46e0144918ff3c3"; + patchLatest = false; + topLevel = true; + dependencies = [ + ]; + } + { + baseName = "redis"; + version = "0.7.2"; + fullName = "redis-0.7.2"; + hash = "d56d99e15dd35f6fabf545d9e91545553d60eaeb32ecf5caa1f357458df161ab"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "hiredis"; range = "*"; } + ]; + } + { + baseName = "redis"; + version = "0.8.4"; + fullName = "redis->= 0.6.6"; + hash = "077932b14c6b0a4985b7a41cf20e4495463c693c7b9932ebc46e0144918ff3c3"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "reds"; + version = "0.1.4"; + fullName = "reds-0.1.4"; + hash = "3166c2f0f82efc624dac4e9058bc0ffa3bb864499785a746c461b813b90640ac"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "natural"; range = "0.0.69"; } + { name = "redis"; range = ">= 0.6.6"; } + ]; + } + { + baseName = "regexp-clone"; + version = "0.0.1"; + fullName = "regexp-clone-0.0.1"; + hash = "e11276212cce9fa15aa07276b800f750ec7d9c25e76ace7cf07f3e713d6d79e0"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } { baseName = "request"; version = "2.21.0"; @@ -1524,6 +2816,37 @@ { name = "form-data"; range = "0.0.8"; } ]; } + { + baseName = "request"; + version = "2.16.6"; + fullName = "request-2.16.x"; + hash = "9424cb952b4c5723678d0c5a6daf3ea6fa76ccad4cbd175f0a489dc54c6e1453"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "form-data"; range = "~0.0.3"; } + { name = "mime"; range = "~1.2.7"; } + { name = "hawk"; range = "~0.10.2"; } + { name = "node-uuid"; range = "~1.4.0"; } + { name = "cookie-jar"; range = "~0.2.0"; } + { name = "aws-sign"; range = "~0.2.0"; } + { name = "oauth-sign"; range = "~0.2.0"; } + { name = "forever-agent"; range = "~0.2.0"; } + { name = "tunnel-agent"; range = "~0.2.0"; } + { name = "json-stringify-safe"; range = "~3.0.0"; } + { name = "qs"; range = "~0.5.4"; } + ]; + } + { + baseName = "request"; + version = "2.9.203"; + fullName = "request-2.9.x"; + hash = "2af8f83a63c7227383fbdd6114e470e0921af86a037c4e82f42883120f35f836"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } { baseName = "request"; version = "2.21.0"; @@ -1573,6 +2896,26 @@ { name = "dtrace-provider"; range = "0.2.8"; } ]; } + { + baseName = "revalidator"; + version = "0.1.5"; + fullName = "revalidator-0.1.x"; + hash = "54938a414b54882f9459e93b9bfd5d267c41985c1191a9a913c713e369ec639e"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "rimraf"; + version = "1.0.9"; + fullName = "rimraf-1.x.x"; + hash = "3ef93e5f75d1fc4778b8f5409e07c72510ee2f86c926abe4e9acff9825f14c5b"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } { baseName = "rimraf"; version = "2.2.0"; @@ -1668,6 +3011,34 @@ dependencies = [ ]; } + { + baseName = "send"; + version = "0.1.1"; + fullName = "send-*"; + hash = "4d237af8bc86148952d0577bed44bd41928a4422c9a6e25e45fc35103aa6e872"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "debug"; range = "*"; } + { name = "mime"; range = "~1.2.9"; } + { name = "fresh"; range = "0.1.0"; } + { name = "range-parser"; range = "0.0.4"; } + ]; + } + { + baseName = "send"; + version = "0.1.0"; + fullName = "send-0.1.0"; + hash = "28b5a6ec41b5072521eb792cc901b92cdbb6b743c578d7008727dbbd3eb717de"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "debug"; range = "*"; } + { name = "mime"; range = "1.2.6"; } + { name = "fresh"; range = "0.1.0"; } + { name = "range-parser"; range = "0.0.4"; } + ]; + } { baseName = "send"; version = "0.1.1"; @@ -1682,6 +3053,16 @@ { name = "range-parser"; range = "0.0.4"; } ]; } + { + baseName = "sequence"; + version = "2.2.1"; + fullName = "sequence->= 2.2.1"; + hash = "f14e1262b6a234acc3f50fdd5bd28c02f0cc8cbf882922b5af994babf4206b62"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } { baseName = "shelljs"; version = "0.1.4"; @@ -1692,6 +3073,16 @@ dependencies = [ ]; } + { + baseName = "should"; + version = "1.2.2"; + fullName = "should-*"; + hash = "af7916b687bf54b95bd8ff2837f430ab2758f1db22b5cde5b4ae30dac472f330"; + patchLatest = false; + topLevel = true; + dependencies = [ + ]; + } { baseName = "sigmund"; version = "1.0.0"; @@ -1702,6 +3093,26 @@ dependencies = [ ]; } + { + baseName = "sliced"; + version = "0.0.3"; + fullName = "sliced-0.0.3"; + hash = "ce5765e669217d4c9500d79d6ffaf8d22b6507e826fd1dc0bb05bb746ab6227c"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "sliced"; + version = "0.0.4"; + fullName = "sliced-0.0.4"; + hash = "b9320aec8a9c5796d34b4c95b1289912548fcc8682fe9fed09749847b7dc0d85"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } { baseName = "smartdc"; version = "7.0.0"; @@ -1734,6 +3145,17 @@ { name = "vasync"; range = "1.3.3"; } ]; } + { + baseName = "sntp"; + version = "0.1.4"; + fullName = "sntp-0.1.x"; + hash = "5fc290630e8a4599dfb1ee4ed67fdc3c94fc97c6c0cbbc188691669ff55dcb4f"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "hoek"; range = "0.7.x"; } + ]; + } { baseName = "sntp"; version = "0.2.4"; @@ -1768,6 +3190,17 @@ { name = "amdefine"; range = ">=0.0.4"; } ]; } + { + baseName = "source-map"; + version = "0.1.25"; + fullName = "source-map-~0.1.7"; + hash = "3ef1ff114aa3504871ad8b16a38ac744b293c6d8f37b0b6e673b44592a08626d"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "amdefine"; range = ">=0.0.4"; } + ]; + } { baseName = "spdy"; version = "1.7.1"; @@ -1790,6 +3223,16 @@ { name = "posix-getopt"; range = "1.0.0"; } ]; } + { + baseName = "stack-trace"; + version = "0.0.6"; + fullName = "stack-trace-0.0.x"; + hash = "398b3307d34c25b9249049229cd4a340ce8587dc3e3ab5cec830af19031c10a4"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } { baseName = "stream-counter"; version = "0.1.0"; @@ -1812,6 +3255,48 @@ { name = "buffertools"; range = ">=1.1.1 <2.0.0"; } ]; } + { + baseName = "stylus"; + version = "0.27.2"; + fullName = "stylus-0.27.2"; + hash = "8e18cc51592e04e42096e324d3409a132dbb3b40b0a606a746c4c57268bb63ea"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "cssom"; range = "0.2.x"; } + { name = "mkdirp"; range = "0.3.x"; } + { name = "debug"; range = "*"; } + ]; + } + { + baseName = "superagent"; + version = "0.15.1"; + fullName = "superagent-0.15.1"; + hash = "8306a3c7476e9f9d61ffe33117ffcf2a4fba6c9fcc59a2b8eee059f57d7d5614"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "qs"; range = "0.6.5"; } + { name = "formidable"; range = "1.0.9"; } + { name = "mime"; range = "1.2.5"; } + { name = "emitter-component"; range = "1.0.0"; } + { name = "methods"; range = "0.0.1"; } + { name = "cookiejar"; range = "1.3.0"; } + { name = "debug"; range = "~0.7.2"; } + ]; + } + { + baseName = "supertest"; + version = "0.7.1"; + fullName = "supertest-*"; + hash = "85246177740d16565f6ed4a932f0c85aca55c897ae352e3bb404da0cdad60a16"; + patchLatest = false; + topLevel = true; + dependencies = [ + { name = "superagent"; range = "0.15.1"; } + { name = "methods"; range = "0.0.1"; } + ]; + } { baseName = "swig"; version = "0.14.0"; @@ -1823,6 +3308,26 @@ { name = "underscore"; range = ">=1.1.7"; } ]; } + { + baseName = "sylvester"; + version = "0.0.21"; + fullName = "sylvester->= 0.0.12"; + hash = "8b97514fbb01de0f73b9104091bb79e835d227eb4c2ca88a843696b22f347022"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "sylvester"; + version = "0.0.21"; + fullName = "sylvester->= 0.0.8"; + hash = "8b97514fbb01de0f73b9104091bb79e835d227eb4c2ca88a843696b22f347022"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } { baseName = "tar"; version = "0.1.17"; @@ -1847,6 +3352,39 @@ { name = "rimraf"; range = "~2.1.4"; } ]; } + { + baseName = "timespan"; + version = "2.0.1"; + fullName = "timespan-2.0.1"; + hash = "2c9693ac1c16e4bf0061904f487ab5fbf13f3d35817de1575dbfd9eaf85d452c"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "transformers"; + version = "2.0.1"; + fullName = "transformers-2.0.1"; + hash = "503430f608716eb2d55764c27f1417e363049aadd08988ad9e26ecb2daa33cb9"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "promise"; range = "~2.0"; } + { name = "css"; range = "~1.0.8"; } + { name = "uglify-js"; range = "~2.2.5"; } + ]; + } + { + baseName = "tunnel-agent"; + version = "0.2.0"; + fullName = "tunnel-agent-~0.2.0"; + hash = "d5c7fe6b4cd377ac54ff994f3b53b368fb4c0edafceddcf0e575402aa2451808"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } { baseName = "tunnel-agent"; version = "0.3.0"; @@ -1857,6 +3395,44 @@ dependencies = [ ]; } + { + baseName = "uglify-js"; + version = "2.3.6"; + fullName = "uglify-js-2.3.6"; + hash = "a361bc8092c8400d99d73d071c46fcfceb7156a557effd82abd8ca8a5c5ad09e"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "async"; range = "~0.2.6"; } + { name = "source-map"; range = "~0.1.7"; } + { name = "optimist"; range = "~0.3.5"; } + ]; + } + { + baseName = "uglify-js"; + version = "2.2.5"; + fullName = "uglify-js-~2.2.5"; + hash = "f9d166cda4c881a396b53f8b8892b17bb1bc09ffb531ba1fa16e7bf9022a2ca2"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "source-map"; range = "~0.1.7"; } + { name = "optimist"; range = "~0.3.5"; } + ]; + } + { + baseName = "uglify-js"; + version = "2.3.6"; + fullName = "uglify-js-~2.3.6"; + hash = "a361bc8092c8400d99d73d071c46fcfceb7156a557effd82abd8ca8a5c5ad09e"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "async"; range = "~0.2.6"; } + { name = "source-map"; range = "~0.1.7"; } + { name = "optimist"; range = "~0.3.5"; } + ]; + } { baseName = "uid2"; version = "0.0.2"; @@ -1918,6 +3494,38 @@ { name = "events.node"; range = ">= 0.4.0"; } ]; } + { + baseName = "utile"; + version = "0.1.7"; + fullName = "utile-0.1.7"; + hash = "5e5dc150fa657729c288a211389cdf47419b73f4f8b4304a0c84dc584bf804b5"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "async"; range = "0.1.x"; } + { name = "deep-equal"; range = "*"; } + { name = "i"; range = "0.3.x"; } + { name = "mkdirp"; range = "0.x.x"; } + { name = "ncp"; range = "0.2.x"; } + { name = "rimraf"; range = "1.x.x"; } + ]; + } + { + baseName = "utile"; + version = "0.1.7"; + fullName = "utile-0.1.x"; + hash = "5e5dc150fa657729c288a211389cdf47419b73f4f8b4304a0c84dc584bf804b5"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "async"; range = "0.1.x"; } + { name = "deep-equal"; range = "*"; } + { name = "i"; range = "0.3.x"; } + { name = "mkdirp"; range = "0.x.x"; } + { name = "ncp"; range = "0.2.x"; } + { name = "rimraf"; range = "1.x.x"; } + ]; + } { baseName = "vasync"; version = "1.3.3"; @@ -1963,6 +3571,47 @@ { name = "extsprintf"; range = "1.0.2"; } ]; } + { + baseName = "view-helpers"; + version = "0.1.2"; + fullName = "view-helpers-*"; + hash = "b9605b3acd8da98a68a34840061b7dde70eac65529667666014b38b03d198439"; + patchLatest = false; + topLevel = true; + dependencies = [ + ]; + } + { + baseName = "walk"; + version = "2.2.1"; + fullName = "walk-*"; + hash = "ed78c4a01a936c69c43eac60dde1a54a918fed66681671bf4cfdfa090b49a8ad"; + patchLatest = false; + topLevel = true; + dependencies = [ + { name = "forEachAsync"; range = "~2.2"; } + ]; + } + { + baseName = "watch"; + version = "0.5.1"; + fullName = "watch-0.5.x"; + hash = "1c7497c12e6ad97e194b3527ee6fa919e8f9045e588d9f810592dfec58f1d965"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "watch"; + version = "0.7.0"; + fullName = "watch-0.7.0"; + hash = "8cebd59e96b3c8a25dce0de0204d29cb94f8bd99c7e0c6772f07eb309fd22c54"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } { baseName = "websocket-driver"; version = "0.2.1"; @@ -1983,6 +3632,95 @@ dependencies = [ ]; } + { + baseName = "winston"; + version = "0.7.2"; + fullName = "winston-*"; + hash = "562d3a3d8dc0ba580bfdfb167e16297940d3386ac4b82e65ad09f4859c4af181"; + patchLatest = false; + topLevel = true; + dependencies = [ + { name = "async"; range = "0.2.x"; } + { name = "colors"; range = "0.6.x"; } + { name = "cycle"; range = "1.0.x"; } + { name = "eyes"; range = "0.1.x"; } + { name = "pkginfo"; range = "0.3.x"; } + { name = "request"; range = "2.16.x"; } + { name = "stack-trace"; range = "0.0.x"; } + ]; + } + { + baseName = "winston"; + version = "0.6.2"; + fullName = "winston-0.6.2"; + hash = "bfe4e73f8b42e1521a1c5dbdc50150fc80d508148376c4dfc925caa6516b2a81"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "async"; range = "0.1.x"; } + { name = "colors"; range = "0.x.x"; } + { name = "cycle"; range = "1.0.x"; } + { name = "eyes"; range = "0.1.x"; } + { name = "pkginfo"; range = "0.2.x"; } + { name = "request"; range = "2.9.x"; } + { name = "stack-trace"; range = "0.0.x"; } + ]; + } + { + baseName = "winston"; + version = "0.6.2"; + fullName = "winston-0.6.x"; + hash = "bfe4e73f8b42e1521a1c5dbdc50150fc80d508148376c4dfc925caa6516b2a81"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "async"; range = "0.1.x"; } + { name = "colors"; range = "0.x.x"; } + { name = "cycle"; range = "1.0.x"; } + { name = "eyes"; range = "0.1.x"; } + { name = "pkginfo"; range = "0.2.x"; } + { name = "request"; range = "2.9.x"; } + { name = "stack-trace"; range = "0.0.x"; } + ]; + } + { + baseName = "winston"; + version = "0.7.1"; + fullName = "winston-0.7.1"; + hash = "8504626efcd7b629a69500b0ab70b964fbabb53d6ebb506fdf3e1ecc6f2ca294"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "async"; range = "0.2.x"; } + { name = "colors"; range = "0.6.x"; } + { name = "cycle"; range = "1.0.x"; } + { name = "eyes"; range = "0.1.x"; } + { name = "pkginfo"; range = "0.3.x"; } + { name = "request"; range = "2.16.x"; } + { name = "stack-trace"; range = "0.0.x"; } + ]; + } + { + baseName = "with"; + version = "1.1.0"; + fullName = "with-~1.1.0"; + hash = "884c829a32f2b9d79d62bc455fd363cc307cf8b5284b822b550221c319ee6db4"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "uglify-js"; range = "2.3.6"; } + ]; + } + { + baseName = "wordwrap"; + version = "0.0.2"; + fullName = "wordwrap->=0.0.1 <0.1.0"; + hash = "66a2fa688509738922c3ad62a6159fe3c93268bd3bca2bff24df4bc02cc31582"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } { baseName = "wordwrap"; version = "0.0.2"; diff --git a/pkgs/top-level/node-packages.json b/pkgs/top-level/node-packages.json index 2d941fd1411..1cf0d169dbd 100644 --- a/pkgs/top-level/node-packages.json +++ b/pkgs/top-level/node-packages.json @@ -36,4 +36,22 @@ , "mkdirp" , "jshint" , "stream-splitter-transform" +, "bcrypt" +, "nconf" +, "winston" +, "jade" +, "view-helpers" +, "redis" +, "mongoose" +, "connect-mongo" +, "connect-flash" +, "passport" +, "passport-local" +, "gzippo" +, "walk" +, "forever" +, "kue" +, "supertest" +, "should" +, "nodemon" ] From d36c91568670ebac62d17058a7181fe6f9bda6d1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 3 Jul 2013 16:59:32 +0200 Subject: [PATCH 215/798] haskell-oeis: update to version 0.3.3 --- pkgs/development/libraries/haskell/oeis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/oeis/default.nix b/pkgs/development/libraries/haskell/oeis/default.nix index 6236495a87a..09e7b00fb74 100644 --- a/pkgs/development/libraries/haskell/oeis/default.nix +++ b/pkgs/development/libraries/haskell/oeis/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "oeis"; - version = "0.3.2"; - sha256 = "1lp4mbsh98vnyfbnq9224n98hajv8q5prpzgbcw90bih0rbiw4w4"; + version = "0.3.3"; + sha256 = "0a0h7wmyy11iqb121w4i6d8masd0xi77dnihickrhlblpbbwq0xn"; buildDepends = [ HTTP network ]; testDepends = [ HUnit testFramework testFrameworkHunit ]; doCheck = false; From 4d8327877c7bbde455a025604683c43de1efc1dc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 3 Jul 2013 16:59:32 +0200 Subject: [PATCH 216/798] haskell-shakespeare-css: update to version 1.0.6.1 --- .../development/libraries/haskell/shakespeare-css/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/shakespeare-css/default.nix b/pkgs/development/libraries/haskell/shakespeare-css/default.nix index a18df3062e2..89a6a0970e8 100644 --- a/pkgs/development/libraries/haskell/shakespeare-css/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-css/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "shakespeare-css"; - version = "1.0.5.1"; - sha256 = "06x57cm9ni7cgdizdwzqzpqdmgzhchax7c4mbqvk3ymgf3lybrss"; + version = "1.0.6.1"; + sha256 = "1hzq7z7yhb80f4qqnjjky5kva0j1lk4jp4h50j822jyn9xn783vw"; buildDepends = [ parsec shakespeare text transformers ]; testDepends = [ hspec HUnit shakespeare text ]; meta = { From d31b934ad2021a260e7369f0bde11ce2fb77c6d3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 3 Jul 2013 16:59:32 +0200 Subject: [PATCH 217/798] haskell-shelly: update to version 1.3.0.2 --- pkgs/development/libraries/haskell/shelly/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/shelly/default.nix b/pkgs/development/libraries/haskell/shelly/default.nix index a61dfec8b7e..639d913e040 100644 --- a/pkgs/development/libraries/haskell/shelly/default.nix +++ b/pkgs/development/libraries/haskell/shelly/default.nix @@ -3,8 +3,8 @@ cabal.mkDerivation (self: { pname = "shelly"; - version = "1.3.0.1"; - sha256 = "0xcx6cxlb13wrn5wfnnb070h8cj3lnk285fxmigi6x97b9rjdl8w"; + version = "1.3.0.2"; + sha256 = "1vhjqm2y6hfaq88k4qz0gdjic1316c5p1gyzgz19r0iwry6msrh2"; buildDepends = [ mtl systemFileio systemFilepath text time unixCompat ]; From b3a3f0f521eea3714f534d1ba2e189d3159cff87 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 3 Jul 2013 16:59:33 +0200 Subject: [PATCH 218/798] haskell-yaml: update to version 0.8.3 --- pkgs/development/libraries/haskell/yaml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yaml/default.nix b/pkgs/development/libraries/haskell/yaml/default.nix index fe40fb785c9..1324a2137b1 100644 --- a/pkgs/development/libraries/haskell/yaml/default.nix +++ b/pkgs/development/libraries/haskell/yaml/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "yaml"; - version = "0.8.2.4"; - sha256 = "0gk2h3wfx818jibj51jh5ksrrkghx4ykvdqfji4lrh1mv08ah3d0"; + version = "0.8.3"; + sha256 = "1lbf0dgc3qvcdiyzk8zkpkga7f7g4i2rxriwdvwbxx199xr4apx3"; buildDepends = [ aeson attoparsec conduit resourcet text transformers unorderedContainers vector From e533af98e45bb6b48d2f3e3b2f6ae1097b062dad Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 3 Jul 2013 17:24:03 +0200 Subject: [PATCH 219/798] git-annex: enable web-related features --- .../version-management/git-and-tools/git-annex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix index f0c8c94437c..7b56d8f92da 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix @@ -34,8 +34,8 @@ cabal.mkDerivation (self: { -fWebDAV -fInotify -fDbus - -f-Assistant - -f-Webapp + -fAssistant + -fWebapp -fPairing -fXMPP -fDNS From cb31653acbfa3cfb7d14a57c9e15172932e5e6e4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 3 Jul 2013 18:55:51 +0200 Subject: [PATCH 220/798] boost: add version 1.54.0 --- pkgs/development/libraries/boost/1.54.nix | 91 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 3 +- 2 files changed, 93 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/boost/1.54.nix diff --git a/pkgs/development/libraries/boost/1.54.nix b/pkgs/development/libraries/boost/1.54.nix new file mode 100644 index 00000000000..ba4252feaa5 --- /dev/null +++ b/pkgs/development/libraries/boost/1.54.nix @@ -0,0 +1,91 @@ +{ stdenv, fetchurl, icu, expat, zlib, bzip2, python +, enableRelease ? true +, enableDebug ? false +, enableSingleThreaded ? false +, enableMultiThreaded ? true +, enableShared ? true +, enableStatic ? false +, enablePIC ? false +, enableExceptions ? false +, taggedLayout ? ((enableRelease && enableDebug) || (enableSingleThreaded && enableMultiThreaded) || (enableShared && enableStatic)) +}: + +let + + variant = stdenv.lib.concatStringsSep "," + (stdenv.lib.optional enableRelease "release" ++ + stdenv.lib.optional enableDebug "debug"); + + threading = stdenv.lib.concatStringsSep "," + (stdenv.lib.optional enableSingleThreaded "single" ++ + stdenv.lib.optional enableMultiThreaded "multi"); + + link = stdenv.lib.concatStringsSep "," + (stdenv.lib.optional enableShared "shared" ++ + stdenv.lib.optional enableStatic "static"); + + # To avoid library name collisions + layout = if taggedLayout then "tagged" else "system"; + + cflags = if enablePIC && enableExceptions then + "cflags=\"-fPIC -fexceptions\" cxxflags=-fPIC linkflags=-fPIC" + else if enablePIC then + "cflags=-fPIC cxxflags=-fPIC linkflags=-fPIC" + else if enableExceptions then + "cflags=-fexceptions" + else + ""; +in + +stdenv.mkDerivation { + name = "boost-1.54.0"; + + meta = { + homepage = "http://boost.org/"; + description = "Boost C++ Library Collection"; + license = "boost-license"; + + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.simons ]; + }; + + src = fetchurl { + url = "mirror://sourceforge/boost/boost_1_54_0.tar.bz2"; + sha256 = "07df925k56pbz3gvhxpx54aij34qd40a7sxw4im11brnwdyr4zh4"; + }; + + enableParallelBuilding = true; + + buildInputs = [icu expat zlib bzip2 python]; + + configureScript = "./bootstrap.sh"; + configureFlags = "--with-icu=${icu} --with-python=${python}/bin/python"; + + buildPhase = "./b2 -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat}/include -sEXPAT_LIBPATH=${expat}/lib --layout=${layout} variant=${variant} threading=${threading} link=${link} ${cflags} install"; + + # normal install does not install bjam, this is a separate step + installPhase = '' + cd tools/build/v2 + sh bootstrap.sh + ./b2 -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat}/include -sEXPAT_LIBPATH=${expat}/lib --layout=${layout} variant=${variant} threading=${threading} link=${link} ${cflags} install + ''; + + crossAttrs = rec { + buildInputs = [ expat.crossDrv zlib.crossDrv bzip2.crossDrv ]; + # all buildInputs set previously fell into propagatedBuildInputs, as usual, so we have to + # override them. + propagatedBuildInputs = buildInputs; + # We want to substitute the contents of configureFlags, removing thus the + # usual --build and --host added on cross building. + preConfigure = '' + export configureFlags="--prefix=$out --without-icu" + ''; + buildPhase = '' + set -x + cat << EOF > user-config.jam + using gcc : cross : $crossConfig-g++ ; + EOF + ./b2 -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat.crossDrv}/include -sEXPAT_LIBPATH=${expat.crossDrv}/lib --layout=${layout} --user-config=user-config.jam toolset=gcc-cross variant=${variant} threading=${threading} link=${link} ${cflags} --without-python install + ''; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 516fe0a2a56..8b3642e48ce 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3700,7 +3700,8 @@ let boost144 = callPackage ../development/libraries/boost/1.44.nix { }; boost149 = callPackage ../development/libraries/boost/1.49.nix { }; boost153 = callPackage ../development/libraries/boost/1.53.nix { }; - boost = boost153; + boost154 = callPackage ../development/libraries/boost/1.54.nix { }; + boost = boost154; boostHeaders153 = callPackage ../development/libraries/boost/1.53-headers.nix { }; boostHeaders = boostHeaders153; From ea04555518f69a303ef63289ec79fabba1854982 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 3 Jul 2013 21:26:31 +0200 Subject: [PATCH 221/798] boost-headers: update to version 1.54.0 --- .../boost/{1.53-headers.nix => 1.54-headers.nix} | 8 ++++---- pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) rename pkgs/development/libraries/boost/{1.53-headers.nix => 1.54-headers.nix} (65%) diff --git a/pkgs/development/libraries/boost/1.53-headers.nix b/pkgs/development/libraries/boost/1.54-headers.nix similarity index 65% rename from pkgs/development/libraries/boost/1.53-headers.nix rename to pkgs/development/libraries/boost/1.54-headers.nix index 04bad16bd70..c50833b12a3 100644 --- a/pkgs/development/libraries/boost/1.53-headers.nix +++ b/pkgs/development/libraries/boost/1.54-headers.nix @@ -1,18 +1,18 @@ { stdenv, fetchurl }: stdenv.mkDerivation { - name = "boost-headers-1.53.0"; + name = "boost-headers-1.54.0"; src = fetchurl { - url = "mirror://sourceforge/boost/boost_1_53_0.tar.bz2"; - sha256 = "15livg6y1l3gdsg6ybvp3y4gp0w3xh1rdcq5bjf0qaw804dh92pq"; + url = "mirror://sourceforge/boost/boost_1_54_0.tar.bz2"; + sha256 = "07df925k56pbz3gvhxpx54aij34qd40a7sxw4im11brnwdyr4zh4"; }; phases = [ "installPhase" ]; installPhase = '' mkdir -p $out/include - tar xf $src -C $out/include --strip-components=1 boost_1_53_0/boost + tar xf $src -C $out/include --strip-components=1 boost_1_54_0/boost ''; meta = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8b3642e48ce..342e5736ccc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3703,8 +3703,8 @@ let boost154 = callPackage ../development/libraries/boost/1.54.nix { }; boost = boost154; - boostHeaders153 = callPackage ../development/libraries/boost/1.53-headers.nix { }; - boostHeaders = boostHeaders153; + boostHeaders154 = callPackage ../development/libraries/boost/1.54-headers.nix { }; + boostHeaders = boostHeaders154; botan = callPackage ../development/libraries/botan { }; From 9e98650f8d32ed25fe04de141f17391490a1477d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 3 Jul 2013 21:38:34 +0200 Subject: [PATCH 222/798] boost: generalize the header-only expression The 'header-only-wrapper' expression can now wrap any version of boost that's passed to it as an argument. --- .../{1.54-headers.nix => header-only-wrapper.nix} | 13 +++++++++---- pkgs/top-level/all-packages.nix | 3 +-- 2 files changed, 10 insertions(+), 6 deletions(-) rename pkgs/development/libraries/boost/{1.54-headers.nix => header-only-wrapper.nix} (59%) diff --git a/pkgs/development/libraries/boost/1.54-headers.nix b/pkgs/development/libraries/boost/header-only-wrapper.nix similarity index 59% rename from pkgs/development/libraries/boost/1.54-headers.nix rename to pkgs/development/libraries/boost/header-only-wrapper.nix index c50833b12a3..d32462d3720 100644 --- a/pkgs/development/libraries/boost/1.54-headers.nix +++ b/pkgs/development/libraries/boost/header-only-wrapper.nix @@ -1,10 +1,15 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, boost }: + +let + version = stdenv.lib.removePrefix "boost-" boost.name; + pkgid = stdenv.lib.replaceChars ["-" "."] ["_" "_"] boost.name; +in stdenv.mkDerivation { - name = "boost-headers-1.54.0"; + name = "boost-headers-${version}"; src = fetchurl { - url = "mirror://sourceforge/boost/boost_1_54_0.tar.bz2"; + url = "mirror://sourceforge/boost/${pkgid}.tar.bz2"; sha256 = "07df925k56pbz3gvhxpx54aij34qd40a7sxw4im11brnwdyr4zh4"; }; @@ -12,7 +17,7 @@ stdenv.mkDerivation { installPhase = '' mkdir -p $out/include - tar xf $src -C $out/include --strip-components=1 boost_1_54_0/boost + tar xf $src -C $out/include --strip-components=1 ${pkgid}/boost ''; meta = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 342e5736ccc..6a85db38225 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3703,8 +3703,7 @@ let boost154 = callPackage ../development/libraries/boost/1.54.nix { }; boost = boost154; - boostHeaders154 = callPackage ../development/libraries/boost/1.54-headers.nix { }; - boostHeaders = boostHeaders154; + boostHeaders = callPackage ../development/libraries/boost/header-only-wrapper.nix { }; botan = callPackage ../development/libraries/botan { }; From 67e5eb909ba6e5cf59d88dd7310b0a193ebabf82 Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Thu, 4 Jul 2013 08:48:55 +1000 Subject: [PATCH 223/798] llvm: fix build on darwin * add DYLD_LIBRARY_PATH * don't build with shared libs --- pkgs/development/compilers/llvm/default.nix | 22 ++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix index 59e2bdc5509..2385332e05c 100644 --- a/pkgs/development/compilers/llvm/default.nix +++ b/pkgs/development/compilers/llvm/default.nix @@ -18,19 +18,23 @@ stdenv.mkDerivation { propagatedBuildInputs = [ libffi ]; buildInputs = [ perl groff cmake python ]; # ToDo: polly, libc++; enable cxx11? - # created binaries need to be run before installation... I coudn't find a better way - preBuild = ''export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:"`pwd`/lib''; + # created binaries need to be run before installation... I coudn't find a + # better way + preBuild = ( if stdenv.isDarwin + then "export DYLD_LIBRARY_PATH='$DYLD_LIBRARY_PATH:'`pwd`/lib" + else "export LD_LIBRARY_PATH='$LD_LIBRARY_PATH:'`pwd`/lib" ); - cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" "-DBUILD_SHARED_LIBS=ON" ]; + cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ] + ++ stdenv.lib.optional (!stdenv.isDarwin) [ "-DBUILD_SHARED_LIBS=ON" ]; enableParallelBuilding = true; - #doCheck = true; # tests are broken, don't know why + doCheck = true; # tests are broken, don't know why - meta = { - homepage = http://llvm.org/; + meta = with stdenv.lib; { description = "Collection of modular and reusable compiler and toolchain technologies"; - license = "BSD"; - maintainers = with stdenv.lib.maintainers; [viric shlevy raskin]; - platforms = with stdenv.lib.platforms; all; + homepage = http://llvm.org/; + license = licenses.bsd; + maintainers = with maintainers; [ lovek323 raskin shlevy viric ]; + platforms = platforms.all; }; } From 3babc55ae29fba3a6981a5722fa86186924aebfd Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Thu, 4 Jul 2013 08:49:30 +1000 Subject: [PATCH 224/798] wxGTK29: fix build on darwin * use clang to compile * add configure flags to enable building for 64-bit * add setFile to build inputs --- .../libraries/wxGTK-2.9/default.nix | 32 ++++++++++++------- pkgs/top-level/all-packages.nix | 5 +++ 2 files changed, 25 insertions(+), 12 deletions(-) diff --git a/pkgs/development/libraries/wxGTK-2.9/default.nix b/pkgs/development/libraries/wxGTK-2.9/default.nix index fca5a4a278e..e8a661a3389 100644 --- a/pkgs/development/libraries/wxGTK-2.9/default.nix +++ b/pkgs/development/libraries/wxGTK-2.9/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gtk, libXinerama, libSM, libXxf86vm, xf86vidmodeproto -, gstreamer, gst_plugins_base, GConf +, gstreamer, gst_plugins_base, GConf, setFile , withMesa ? true, mesa ? null, compat24 ? false, compat26 ? true, unicode ? true, }: @@ -18,19 +18,23 @@ stdenv.mkDerivation { sha256 = "04jda4bns7cmp7xy68qz112yg0lribpc6xs5k9gilfqcyhshqlvc"; }; - buildInputs = [ gtk libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer gst_plugins_base GConf ] - ++ optional withMesa mesa; + buildInputs = + [ gtk libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer + gst_plugins_base GConf ] + ++ optional withMesa mesa + ++ optional stdenv.isDarwin setFile; nativeBuildInputs = [ pkgconfig ]; - configureFlags = [ - "--enable-gtk2" - (if compat24 then "--enable-compat24" else "--disable-compat24") - (if compat26 then "--enable-compat26" else "--disable-compat26") - "--disable-precomp-headers" - (if unicode then "--enable-unicode" else "") - "--enable-mediactrl" - ] ++ optional withMesa "--with-opengl"; + configureFlags = + [ "--enable-gtk2" "--disable-precomp-headers" "--enable-mediactrl" + (if compat24 then "--enable-compat24" else "--disable-compat24") + (if compat26 then "--enable-compat26" else "--disable-compat26") ] + ++ optional unicode "--enable-unicode" + ++ optional withMesa "--with-opengl" + ++ optionals stdenv.isDarwin + # allow building on 64-bit + [ "--with-cocoa" "--enable-universal-binaries" ]; SEARCH_LIB = optionalString withMesa "${mesa}/lib"; @@ -38,7 +42,11 @@ stdenv.mkDerivation { substituteInPlace configure --replace 'SEARCH_INCLUDE=' 'DUMMY_SEARCH_INCLUDE=' substituteInPlace configure --replace 'SEARCH_LIB=' 'DUMMY_SEARCH_LIB=' substituteInPlace configure --replace /usr /no-such-path - "; + " + optionalString stdenv.isDarwin '' + substituteInPlace configure --replace \ + 'ac_cv_prog_SETFILE="/Developer/Tools/SetFile"' \ + 'ac_cv_prog_SETFILE="${setFile}/bin/SetFile"' + ''; postInstall = " (cd $out/include && ln -s wx-*/* .) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8bbe1e14cca..c584c195c79 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5475,6 +5475,11 @@ let wxGTK29 = callPackage ../development/libraries/wxGTK-2.9/default.nix { inherit (gnome) GConf; withMesa = lib.elem system lib.platforms.mesaPlatforms; + + # use for Objective-C++ compiler + stdenv = if stdenv.isDarwin + then clangStdenv + else stdenv; }; wtk = callPackage ../development/libraries/wtk { }; From c2901da1b829a51f6490a2d0927fd4d668e45311 Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Thu, 4 Jul 2013 08:50:37 +1000 Subject: [PATCH 225/798] setFile: add expression --- .../tools/misc/setFile/default.nix | 31 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/tools/misc/setFile/default.nix diff --git a/pkgs/development/tools/misc/setFile/default.nix b/pkgs/development/tools/misc/setFile/default.nix new file mode 100644 index 00000000000..9f86184634f --- /dev/null +++ b/pkgs/development/tools/misc/setFile/default.nix @@ -0,0 +1,31 @@ +{ stdenv }: + +stdenv.mkDerivation { + name = "setFile"; + + src = "/usr/bin/SetFile"; + + unpackPhase = "true"; + configurePhase = "true"; + buildPhase = "true"; + + installPhase = '' + mkdir -p "$out/bin" + cp $src "$out/bin" + ''; + + meta = with stdenv.lib; { + description = "Set attributes of files and directories"; + homepage = "http://developer.apple.com/library/mac/#documentation/Darwin/Reference/ManPages/man1/setfile.1.html"; + maintainers = with maintainers; [ lovek323 ]; + platforms = platforms.darwin; + + longDescription = '' + SetFile is a tool to set the file attributes on files in an HFS+ + directory. It attempts to be similar to the setfile command in MPW. It can + apply rules to more than one file with the options apply- ing to all files + listed. + ''; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c584c195c79..b3a5b35ac47 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -446,6 +446,8 @@ let otool = callPackage ../development/tools/misc/otool { }; + setFile = callPackage ../development/tools/misc/setFile { }; + xcodeenv = callPackage ../development/mobile/xcodeenv { }; titaniumenv_2_1 = import ../development/mobile/titaniumenv { From 4c9cff322adbf2c8ea12b6b3d3f7a21e7b4ac511 Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Thu, 4 Jul 2013 08:51:25 +1000 Subject: [PATCH 226/798] gnuplot: fix build on darwin * add readline to build inputs * don't use wxGTK --- pkgs/tools/graphics/gnuplot/default.nix | 22 +++++++++++++--------- pkgs/top-level/all-packages.nix | 5 +++++ 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix index 485edf7335d..5dee1079ae2 100644 --- a/pkgs/tools/graphics/gnuplot/default.nix +++ b/pkgs/tools/graphics/gnuplot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib, gd, texinfo, makeWrapper +{ stdenv, fetchurl, zlib, gd, texinfo, makeWrapper, readline , texLive ? null , lua ? null , emacs ? null @@ -10,9 +10,9 @@ , pango ? null , cairo ? null , pkgconfig ? null -, readline -, fontconfig ? null, gnused ? null, coreutils ? null -}: +, fontconfig ? null +, gnused ? null +, coreutils ? null }: assert libX11 != null -> (fontconfig != null && gnused != null && coreutils != null); @@ -26,11 +26,14 @@ stdenv.mkDerivation rec { buildInputs = [ zlib gd texinfo readline emacs lua texLive libX11 libXt libXpm libXaw - wxGTK pango cairo pkgconfig makeWrapper - ]; + pango cairo pkgconfig makeWrapper ] + # compiling with wxGTK causes a malloc (double free) error on darwin + ++ stdenv.lib.optional (!stdenv.isDarwin) wxGTK; configureFlags = if libX11 != null then ["--with-x"] else ["--without-x"]; + NIX_CFLAGS_COMPILE = "-I${cairo}/include/cairo"; + postInstall = stdenv.lib.optionalString (libX11 != null) '' wrapProgram $out/bin/gnuplot \ --prefix PATH : '${gnused}/bin' \ @@ -39,9 +42,10 @@ stdenv.mkDerivation rec { --run '. ${./set-gdfontpath-from-fontconfig.sh}' ''; - meta = { - homepage = "http://www.gnuplot.info"; + meta = with stdenv.lib; { + homepage = http://www.gnuplot.info; description = "A portable command-line driven graphing utility for many platforms"; - platforms = stdenv.lib.platforms.all; + platforms = platforms.all; + maintainers = with maintainers; [ lovek323 ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b3a5b35ac47..bff4b0ef896 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -917,6 +917,11 @@ let gnuplot = callPackage ../tools/graphics/gnuplot { texLive = null; lua = null; + + # use gccApple to compile on darwin, seems to resolve a malloc error + stdenv = if stdenv.isDarwin + then stdenvAdapters.overrideGCC stdenv gccApple + else stdenv; }; gnused = callPackage ../tools/text/gnused { }; From 7ccf7c1529dceaeac130417daf4e3f20e1936eee Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Thu, 4 Jul 2013 09:12:39 +1000 Subject: [PATCH 227/798] ncmpcpp: fix build on darwin * add libiconvOrEmpty to build inputs --- pkgs/applications/audio/ncmpcpp/default.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/audio/ncmpcpp/default.nix b/pkgs/applications/audio/ncmpcpp/default.nix index b6ac7f26d60..186c5265433 100644 --- a/pkgs/applications/audio/ncmpcpp/default.nix +++ b/pkgs/applications/audio/ncmpcpp/default.nix @@ -1,4 +1,5 @@ -{stdenv, fetchurl, ncurses, curl, taglib, fftw, mpd_clientlib, pkgconfig}: +{ stdenv, fetchurl, ncurses, curl, taglib, fftw, mpd_clientlib, pkgconfig +, libiconvOrEmpty }: stdenv.mkDerivation rec { version = "0.5.10"; @@ -9,14 +10,15 @@ stdenv.mkDerivation rec { sha256 = "ff6d5376a2d9caba6f5bb78e68af77cefbdb2f04cd256f738e39f8ac9a79a4a8"; }; - buildInputs = [ ncurses curl taglib fftw mpd_clientlib pkgconfig ]; + buildInputs = [ ncurses curl taglib fftw mpd_clientlib pkgconfig ] + ++ libiconvOrEmpty; - meta = { + meta = with stdenv.lib; { description = "Curses-based interface for MPD (music player daemon)"; - homepage = http://unkart.ovh.org/ncmpcpp/; - license = "GPLv2+"; - maintainers = [ stdenv.lib.maintainers.mornfall ]; - platforms = stdenv.lib.platforms.all; + homepage = http://unkart.ovh.org/ncmpcpp/; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ lovek323 mornfall ]; + platforms = platforms.all; }; } From 2a21046f246b9c3b1351d116c5193980477bc19e Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Thu, 4 Jul 2013 19:01:47 +1000 Subject: [PATCH 228/798] otool & setFile: only allow on darwin --- pkgs/development/tools/misc/otool/default.nix | 3 +++ pkgs/development/tools/misc/setFile/default.nix | 3 +++ 2 files changed, 6 insertions(+) diff --git a/pkgs/development/tools/misc/otool/default.nix b/pkgs/development/tools/misc/otool/default.nix index aa365fc29d5..21eb2b591c2 100644 --- a/pkgs/development/tools/misc/otool/default.nix +++ b/pkgs/development/tools/misc/otool/default.nix @@ -1,5 +1,8 @@ { stdenv }: +# this tool only exists on darwin +assert stdenv.isDarwin; + stdenv.mkDerivation { name = "otool"; diff --git a/pkgs/development/tools/misc/setFile/default.nix b/pkgs/development/tools/misc/setFile/default.nix index 9f86184634f..e3fbd2cbc6d 100644 --- a/pkgs/development/tools/misc/setFile/default.nix +++ b/pkgs/development/tools/misc/setFile/default.nix @@ -1,5 +1,8 @@ { stdenv }: +# this tool only exists on darwin +assert stdenv.isDarwin; + stdenv.mkDerivation { name = "setFile"; From 3b490b7ccbb365088feef242518af46d6dd3a19a Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Thu, 4 Jul 2013 19:02:40 +1000 Subject: [PATCH 229/798] llvm: re-disabling tests accidentally re-enabled doCheck, which isn't working yet --- pkgs/development/compilers/llvm/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix index 2385332e05c..c06abe0db94 100644 --- a/pkgs/development/compilers/llvm/default.nix +++ b/pkgs/development/compilers/llvm/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { ++ stdenv.lib.optional (!stdenv.isDarwin) [ "-DBUILD_SHARED_LIBS=ON" ]; enableParallelBuilding = true; - doCheck = true; # tests are broken, don't know why + # doCheck = true; # tests are broken, don't know why meta = with stdenv.lib; { description = "Collection of modular and reusable compiler and toolchain technologies"; From bd3c2c76c7fceda8853503f3f62b4fb10b643af3 Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Sun, 30 Jun 2013 08:20:47 +1000 Subject: [PATCH 230/798] subversion: fix build on darwin * remove useless -no-cpp-precomp flags --- pkgs/applications/version-management/subversion/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index 42503b97440..c5a74042590 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -49,6 +49,8 @@ stdenv.mkDerivation rec { preBuild = '' makeFlagsArray=(APACHE_LIBEXECDIR=$out/modules) + '' + stdenv.lib.optionalString stdenv.isDarwin '' + substituteInPlace configure --replace "-no-cpp-precomp" "" ''; postInstall = '' @@ -74,7 +76,7 @@ stdenv.mkDerivation rec { meta = { description = "A version control system intended to be a compelling replacement for CVS in the open source community"; homepage = http://subversion.apache.org/; - maintainers = [ stdenv.lib.maintainers.eelco ]; + maintainers = with stdenv.lib.maintainers; [ eelco lovek323 ]; platforms = stdenv.lib.platforms.all; }; } From cf3364bdb634380ad7f190e085946874f4f16064 Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Thu, 4 Jul 2013 19:12:26 +1000 Subject: [PATCH 231/798] libspotify: add darwin library --- .../libraries/libspotify/default.nix | 77 ++++++++++++------- 1 file changed, 50 insertions(+), 27 deletions(-) diff --git a/pkgs/development/libraries/libspotify/default.nix b/pkgs/development/libraries/libspotify/default.nix index 1972a4be653..86007920d0e 100644 --- a/pkgs/development/libraries/libspotify/default.nix +++ b/pkgs/development/libraries/libspotify/default.nix @@ -1,25 +1,56 @@ -{ stdenv, fetchurl, libspotify, alsaLib, readline, pkgconfig, apiKey }: +{ stdenv, fetchurl, libspotify, alsaLib, readline, pkgconfig, apiKey, unzip }: let version = "12.1.51"; in -if stdenv.system != "x86_64-linux" then throw '' - Check https://developer.spotify.com/technologies/libspotify/ for a tarball for your system and add it here -'' else stdenv.mkDerivation { +if (stdenv.system == "x86_64-linux" && stdenv.system != "x86_64-darwin") +then throw "Check https://developer.spotify.com/technologies/libspotify/ for a tarball for your system and add it here" +else stdenv.mkDerivation { name = "libspotify-${version}"; - src = fetchurl { - url = "https://developer.spotify.com/download/libspotify/libspotify-${version}-Linux-x86_64-release.tar.gz"; - - sha256 = "0n0h94i4xg46hfba95n3ypah93crwb80bhgsg00f6sms683lx8a3"; - }; + src = + if stdenv.system == "x86_64-linux" then + fetchurl { + url = "https://developer.spotify.com/download/libspotify/libspotify-${version}-Linux-x86_64-release.tar.gz"; + sha256 = "0n0h94i4xg46hfba95n3ypah93crwb80bhgsg00f6sms683lx8a3"; + } + else if stdenv.system == "x86_64-darwin" then + fetchurl { + url = "https://developer.spotify.com/download/libspotify/libspotify-${version}-Darwin-universal.zip"; + sha256 = "1gcgrc8arim3hnszcc886lmcdb4iigc08abkaa02l6gng43ky1c0"; + } + else + null; + # common buildPhase = "true"; + # no patch or build phase for darwin + phases = [ "unpackPhase" "installPhase" ] + ++ stdenv.lib.optionals (stdenv.system == "x86_64-linux") + [ "patchPhase" "buildPhase" ]; + installPhase = if (stdenv.system == "x86_64-linux") + then "installPhase" + else '' + mkdir -p "$out"/include/libspotify + mv -v libspotify.framework/Versions/Current/Headers/api.h \ + "$out"/include/libspotify + mkdir -p "$out"/lib + mv -v libspotify.framework/Versions/Current/libspotify \ + "$out"/lib/libspotify.dylib + mkdir -p "$out"/share/man + mv -v man3 "$out"/share/man + ''; + - installFlags = "prefix=$(out)"; + # darwin-specific + buildInputs = stdenv.lib.optional (stdenv.system == "x86_64-darwin") unzip; - postInstall = "mv -v share $out"; - - patchPhase = "sed -i 's/ldconfig//' Makefile"; + # linux-specific + installFlags = stdenv.lib.optionalString (stdenv.system == "x86_64-linux") + "prefix=$(out)"; + patchPhase = stdenv.lib.optionalString (stdenv.system == "x86_64-linux") + "sed -i 's/ldconfig//' Makefile"; + postInstall = stdenv.lib.optionalString (stdenv.system == "x86_64-linux") + "mv -v share $out"; passthru = { samples = if apiKey == null @@ -27,35 +58,27 @@ if stdenv.system != "x86_64-linux" then throw '' Please visit ${libspotify.meta.homepage} to get an api key then set config.libspotify.apiKey accordingly '' else stdenv.mkDerivation { name = "libspotify-samples-${version}"; - src = libspotify.src; - - buildInputs = [ pkgconfig libspotify alsaLib readline ]; - + buildInputs = [ pkgconfig libspotify readline ] + ++ stdenv.lib.optional (!stdenv.isDarwin) alsaLib; postUnpack = "sourceRoot=$sourceRoot/share/doc/libspotify/examples"; - patchPhase = "cp ${apiKey} appkey.c"; - installPhase = '' mkdir -p $out/bin install -m 755 jukebox/jukebox $out/bin install -m 755 spshell/spshell $out/bin install -m 755 localfiles/posix_stu $out/bin ''; - meta = libspotify.meta // { description = "Spotify API library samples"; }; }; inherit apiKey; }; - meta = { + meta = with stdenv.lib; { description = "Spotify API library"; - - homepage = https://developer.spotify.com/technologies/libspotify; - - maintainers = [ stdenv.lib.maintainers.shlevy ]; - - license = stdenv.lib.licenses.unfree; + homepage = https://developer.spotify.com/technologies/libspotify; + maintainers = with maintainers; [ lovek323 shlevy ]; + license = licenses.unfree; }; } From 16bc5e12aa6b204dbb4b2413487d4c83351d7006 Mon Sep 17 00:00:00 2001 From: "Jason \\\"Don\\\" O'Conal" Date: Thu, 4 Jul 2013 09:21:27 +1000 Subject: [PATCH 232/798] mopidy: update to latest version (0.14.2) --- pkgs/applications/audio/mopidy/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix index d79ef44cabe..a8c33329227 100644 --- a/pkgs/applications/audio/mopidy/default.nix +++ b/pkgs/applications/audio/mopidy/default.nix @@ -5,12 +5,11 @@ pythonPackages.buildPythonPackage rec { name = "mopidy-${version}"; - version = "0.14.1"; + version = "0.14.2"; src = fetchgit { - url = "https://github.com/mopidy/mopidy.git"; - rev = "refs/tags/v${version}"; - sha256 = "0lgd8dpiri9m6sigpf1g1qzvz25lkb38lskgwvb8j7x64y104z0v"; + url = "https://github.com/mopidy/mopidy/archive/v${version}.tar.gz"; + sha256 = "0fqx7lk9g61d744b951cwx0szqbyji58dhw2ravnq9785nkhi7i4"; }; propagatedBuildInputs = with pythonPackages; [ From dff980733aa0f63bf8105f131dda5bc145f50112 Mon Sep 17 00:00:00 2001 From: "Jason \\\"Don\\\" O'Conal" Date: Sun, 30 Jun 2013 11:49:24 +1000 Subject: [PATCH 233/798] add au debian mirror --- pkgs/build-support/fetchurl/mirrors.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix index 70a06735e68..b7461678fea 100644 --- a/pkgs/build-support/fetchurl/mirrors.nix +++ b/pkgs/build-support/fetchurl/mirrors.nix @@ -159,6 +159,7 @@ rec { # Debian. debian = [ + ftp://ftp.au.debian.org/debian/ ftp://ftp.de.debian.org/debian/ ftp://ftp.es.debian.org/debian/ ftp://ftp.fr.debian.org/debian/ From bd61c42d223864e6582584f7ac1c5db0a3987150 Mon Sep 17 00:00:00 2001 From: "Jason \\\"Don\\\" O'Conal" Date: Sun, 30 Jun 2013 08:39:32 +1000 Subject: [PATCH 234/798] tk: fix build on darwin --- pkgs/development/libraries/tk/default.nix | 11 +++++++++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/tk/default.nix b/pkgs/development/libraries/tk/default.nix index 290580e5212..5cfd0d178eb 100644 --- a/pkgs/development/libraries/tk/default.nix +++ b/pkgs/development/libraries/tk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, tcl, x11 }: +{ stdenv, fetchurl, tcl, x11, libX11 }: stdenv.mkDerivation { name = "tk-8.5.7"; @@ -16,11 +16,18 @@ stdenv.mkDerivation { preConfigure = "cd unix"; - buildInputs = [tcl x11]; + buildInputs = [ tcl x11 libX11 ]; inherit tcl; passthru = { libPrefix = "tk8.5"; }; + + meta = { + description = "A widget toolkit that provides a library of basic elements for building a GUI in many different programming languages"; + homepage = http://www.tcl.tk/; + maintainers = with stdenv.lib.maintainers; [ eelco lovek323 ]; + platforms = stdenv.lib.platforms.all; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 543e28c08d2..e0318190777 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5376,7 +5376,9 @@ let tinyxml2 = callPackage ../development/libraries/tinyxml/2.6.2.nix { }; - tk = callPackage ../development/libraries/tk { }; + tk = callPackage ../development/libraries/tk { + libX11 = xlibs.libX11; + }; tnt = callPackage ../development/libraries/tnt { }; From 9007e57f281cc692c7ac2682c088d5e48b161d76 Mon Sep 17 00:00:00 2001 From: "Jason \\\"Don\\\" O'Conal" Date: Sun, 30 Jun 2013 09:49:55 +1000 Subject: [PATCH 235/798] python27: compile with tkinterp on darwin --- pkgs/development/interpreters/python/2.7/default.nix | 5 ++--- pkgs/development/libraries/tk/default.nix | 2 +- pkgs/top-level/all-packages.nix | 4 +++- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix index ccb423ef32e..76ef7399812 100644 --- a/pkgs/development/interpreters/python/2.7/default.nix +++ b/pkgs/development/interpreters/python/2.7/default.nix @@ -1,6 +1,5 @@ { stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2 -, sqlite, tcl, tk, x11, openssl, readline, db4, ncurses, gdbm -}: +, sqlite, tcl, tk, x11, openssl, readline, db4, ncurses, gdbm, libX11 }: assert zlibSupport -> zlib != null; @@ -179,7 +178,7 @@ let tkinter = buildInternalPythonModule { moduleName = "tkinter"; - deps = [ tcl tk x11 ]; + deps = [ tcl tk x11 libX11 ]; }; readline = buildInternalPythonModule { diff --git a/pkgs/development/libraries/tk/default.nix b/pkgs/development/libraries/tk/default.nix index 5cfd0d178eb..a45c4217c7b 100644 --- a/pkgs/development/libraries/tk/default.nix +++ b/pkgs/development/libraries/tk/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { meta = { description = "A widget toolkit that provides a library of basic elements for building a GUI in many different programming languages"; homepage = http://www.tcl.tk/; - maintainers = with stdenv.lib.maintainers; [ eelco lovek323 ]; + maintainers = with stdenv.lib.maintainers; [ lovek323 ]; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e0318190777..61690974366 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3094,7 +3094,9 @@ let python = python27; python26 = callPackage ../development/interpreters/python/2.6 { }; - python27 = callPackage ../development/interpreters/python/2.7 { }; + python27 = callPackage ../development/interpreters/python/2.7 { + libX11 = xlibs.libX11; + }; pythonFull = python27Full; python26Full = callPackage ../development/interpreters/python/wrapper.nix { From 1f9005a3f6bb6586c809e0feb71a5b39e5690499 Mon Sep 17 00:00:00 2001 From: "Jason \\\"Don\\\" O'Conal" Date: Mon, 24 Jun 2013 14:32:02 +0200 Subject: [PATCH 236/798] php53: add imap option --- pkgs/development/interpreters/php/5.3.nix | 21 ++++++++------------- pkgs/tools/networking/uwimap/default.nix | 4 +++- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/pkgs/development/interpreters/php/5.3.nix b/pkgs/development/interpreters/php/5.3.nix index 347a374ffcc..d879a611c2a 100644 --- a/pkgs/development/interpreters/php/5.3.nix +++ b/pkgs/development/interpreters/php/5.3.nix @@ -1,7 +1,8 @@ { stdenv, fetchurl, composableDerivation, autoconf, automake, flex, bison , apacheHttpd, mysql, libxml2, readline, zlib, curl, gd, postgresql, gettext , openssl, pkgconfig, sqlite, config, libjpeg, libpng, freetype, libxslt -, libmcrypt, bzip2, icu, libssh2, makeWrapper, libiconvOrEmpty, libiconv }: +, libmcrypt, bzip2, icu, libssh2, makeWrapper, libiconvOrEmpty, libiconv, uwimap +, pam }: let libmcryptOverride = libmcrypt.override { disablePosixThreads = true; }; @@ -132,6 +133,11 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) buildInputs = [gettext]; }; + imap = { + configureFlags = [ "--with-imap=${uwimap}" "--with-imap-ssl" ]; + buildInputs = [ uwimap openssl pam ]; + }; + intl = { configureFlags = ["--enable-intl"]; buildInputs = [icu]; @@ -163,18 +169,6 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) ftp = { configureFlags = ["--enable-ftp"]; }; - - /* - php is build within this derivation in order to add the xdebug lines to the php.ini. - So both Apache and command line php both use xdebug without having to configure anything. - Xdebug could be put in its own derivation. - * / - meta = { - description = "debugging support for PHP"; - homepage = http://xdebug.org; - license = "based on the PHP license - as is"; - }; - */ }; cfg = { @@ -186,6 +180,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) ftpSupport = config.php.ftp or true; gdSupport = config.php.gd or true; gettextSupport = config.php.gettext or true; + imapSupport = config.php.imap or false; intlSupport = config.php.intl or true; libxml2Support = config.php.libxml2 or true; mbstringSupport = config.php.mbstring or true; diff --git a/pkgs/tools/networking/uwimap/default.nix b/pkgs/tools/networking/uwimap/default.nix index 8c8c0241204..be3153ba281 100644 --- a/pkgs/tools/networking/uwimap/default.nix +++ b/pkgs/tools/networking/uwimap/default.nix @@ -8,7 +8,9 @@ stdenv.mkDerivation { sha256 = "0a2a00hbakh0640r2wdpnwr8789z59wnk7rfsihh3j0vbhmmmqak"; }; - makeFlags = "lnp"; # Linux with PAM modules + makeFlags = "lnp" # Linux with PAM modules + # -fPIC is required to compile php with imap on x86_64 systems + + stdenv.lib.optionalString stdenv.isx86_64 " EXTRACFLAGS=-fPIC"; buildInputs = [ pam openssl ]; From 91855156111c56b4e8726e2ae8eb1e27e21bdfd4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 4 Jul 2013 11:35:57 +0200 Subject: [PATCH 237/798] R: add various features * Ensure that R can link blas, liblapack, and libgfortran at run-time. * Ensure that R can run the Tcl/Tk interpreter. * Add Java support. * Install texinfo and PDF documentation. --- pkgs/applications/science/math/R/default.nix | 57 ++++++++++++++++++- .../math/R/no-usr-local-search-paths.patch | 24 ++++++++ 2 files changed, 78 insertions(+), 3 deletions(-) create mode 100644 pkgs/applications/science/math/R/no-usr-local-search-paths.patch diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index 5ceefb87af0..fd391b988c9 100644 --- a/pkgs/applications/science/math/R/default.nix +++ b/pkgs/applications/science/math/R/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchurl, blas, bzip2, gfortran, liblapack, libX11, libXmu, libXt , libjpeg, libpng, libtiff, ncurses, pango, pcre, perl, readline, tcl -, texLive, tk, xz, zlib, less, texinfo, graphviz +, texLive, tk, xz, zlib, less, texinfo, graphviz, icu, pkgconfig, bison +, imake, which, jdk, atlas }: stdenv.mkDerivation rec { @@ -13,15 +14,65 @@ stdenv.mkDerivation rec { buildInputs = [ blas bzip2 gfortran liblapack libX11 libXmu libXt libXt libjpeg libpng libtiff ncurses pango pcre perl readline tcl - texLive tk xz zlib less texinfo graphviz ]; + texLive tk xz zlib less texinfo graphviz icu pkgconfig bison imake + which jdk atlas + ]; + + patches = [ ./no-usr-local-search-paths.patch ]; + + preConfigure = '' + configureFlagsArray=( + --disable-lto + --with-blas="-L${atlas}/lib -lf77blas -latlas" + --with-lapack="-L${liblapack}/lib -llapack" + --with-readline + --with-tcltk --with-tcl-config="${tcl}/lib/tclConfig.sh" --with-tk-config="${tk}/lib/tkConfig.sh" + --with-cairo + --with-libpng + --with-jpeglib + --with-libtiff + --with-system-zlib + --with-system-bzlib + --with-system-pcre + --with-system-xz + --with-ICU + R_SHELL="${stdenv.shell}" + JAVA_HOME="${jdk}" + LDFLAGS="-L${gfortran.gcc}/lib" + ) + echo "TCLLIBPATH=${tk}/lib" >>etc/Renviron.in + ''; + + installTargets = [ "install" "install-info" "install-pdf" ]; + + doCheck = true; enableParallelBuilding = true; meta = { - description = "a free software environment for statistical computing and graphics"; homepage = "http://www.r-project.org/"; + description = "a free software environment for statistical computing and graphics"; license = stdenv.lib.licenses.gpl2Plus; + longDescription = '' + GNU R is a language and environment for statistical computing and + graphics that provides a wide variety of statistical (linear and + nonlinear modelling, classical statistical tests, time-series + analysis, classification, clustering, ...) and graphical + techniques, and is highly extensible. One of R's strengths is the + ease with which well-designed publication-quality plots can be + produced, including mathematical symbols and formulae where + needed. R is an integrated suite of software facilities for data + manipulation, calculation and graphical display. It includes an + effective data handling and storage facility, a suite of operators + for calculations on arrays, in particular matrices, a large, + coherent, integrated collection of intermediate tools for data + analysis, graphical facilities for data analysis and display + either on-screen or on hardcopy, and a well-developed, simple and + effective programming language which includes conditionals, loops, + user-defined recursive functions and input and output facilities. + ''; + platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.simons ]; }; diff --git a/pkgs/applications/science/math/R/no-usr-local-search-paths.patch b/pkgs/applications/science/math/R/no-usr-local-search-paths.patch new file mode 100644 index 00000000000..6c7f6d4ee02 --- /dev/null +++ b/pkgs/applications/science/math/R/no-usr-local-search-paths.patch @@ -0,0 +1,24 @@ +diff -ubr R-3.0.1-orig/configure R-3.0.1/configure +--- R-3.0.1-orig/configure 2013-07-04 10:46:42.336133947 +0200 ++++ R-3.0.1/configure 2013-07-04 10:46:17.181919960 +0200 +@@ -3800,13 +3800,13 @@ + : ${LIBnn=$libnn} + ## We provide these defaults so that headers and libraries in + ## '/usr/local' are found (by the native tools, mostly). +-if test -f "/sw/etc/fink.conf"; then +- : ${CPPFLAGS="-I/sw/include -I/usr/local/include"} +- : ${LDFLAGS="-L/sw/lib -L/usr/local/lib"} +-else +- : ${CPPFLAGS="-I/usr/local/include"} +- : ${LDFLAGS="-L/usr/local/${LIBnn}"} +-fi ++# if test -f "/sw/etc/fink.conf"; then ++# : ${CPPFLAGS="-I/sw/include -I/usr/local/include"} ++# : ${LDFLAGS="-L/sw/lib -L/usr/local/lib"} ++# else ++# : ${CPPFLAGS="-I/usr/local/include"} ++# : ${LDFLAGS="-L/usr/local/${LIBnn}"} ++# fi + + ## take care not to override the command-line setting + if test "${libdir}" = '${exec_prefix}/lib'; then From 3df0409cb6b36466817bf8eb4e9e8c5509770d15 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 4 Jul 2013 13:26:34 +0200 Subject: [PATCH 238/798] liblapack: propagate the 'shared' flag to atlas --- pkgs/development/libraries/science/math/liblapack/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/science/math/liblapack/default.nix b/pkgs/development/libraries/science/math/liblapack/default.nix index 029deecb93a..e54eaba4f15 100644 --- a/pkgs/development/libraries/science/math/liblapack/default.nix +++ b/pkgs/development/libraries/science/math/liblapack/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, gfortran, atlas, cmake, python, shared ? false }: -let - atlasMaybeShared = if shared then atlas.override {shared=true;} else atlas; +let + atlasMaybeShared = atlas.override { inherit shared; }; usedLibExtension = if shared then ".so" else ".a"; in stdenv.mkDerivation { From 70a437e4a770fb6b646958a10d0e69bd545ec113 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 4 Jul 2013 14:12:42 +0200 Subject: [PATCH 239/798] editres: add version 1.0.6 The tool doesn't seem to work well for me. Not sure whether I'm building it wrong, maybe? --- pkgs/tools/graphics/editres/default.nix | 22 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 5 +++++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/tools/graphics/editres/default.nix diff --git a/pkgs/tools/graphics/editres/default.nix b/pkgs/tools/graphics/editres/default.nix new file mode 100644 index 00000000000..50f81c3ea4d --- /dev/null +++ b/pkgs/tools/graphics/editres/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, pkgconfig, libXt, libXaw, libXres, utilmacros }: + +stdenv.mkDerivation rec { + name = "editres-1.0.6"; + + src = fetchurl { + url = "http://xorg.freedesktop.org/releases/individual/app/${name}.tar.gz"; + sha256 = "06kv7dmw6pzlqc46dbh8k9xpb6sn4ihh0bcpxq0zpvw2lm66dx45"; + }; + + buildInputs = [ pkgconfig libXt libXaw libXres utilmacros ]; + + preConfigure = "configureFlags=--with-appdefaultdir=$out/share/X11/app-defaults/editres"; + + meta = { + homepage = "http://cgit.freedesktop.org/xorg/app/editres/"; + description = "a dynamic resource editor for X Toolkit applications"; + + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.simons ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 61690974366..13131781b39 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -755,6 +755,11 @@ let ecryptfs = callPackage ../tools/security/ecryptfs { }; + editres = callPackage ../tools/graphics/editres { + inherit (xlibs) libXt libXaw; + inherit (xorg) utilmacros; + }; + edk2 = callPackage ../development/compilers/edk2 { }; efibootmgr = callPackage ../tools/system/efibootmgr { }; From e2874236d38666436d4147ee7682284cf35f3e9f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 4 Jul 2013 17:47:02 +0200 Subject: [PATCH 240/798] llvm: fix meta.license attribute --- pkgs/development/compilers/llvm/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix index c06abe0db94..1e53256a240 100644 --- a/pkgs/development/compilers/llvm/default.nix +++ b/pkgs/development/compilers/llvm/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Collection of modular and reusable compiler and toolchain technologies"; homepage = http://llvm.org/; - license = licenses.bsd; + license = licenses.bsd3; maintainers = with maintainers; [ lovek323 raskin shlevy viric ]; platforms = platforms.all; }; From f0738b3c1648a8f627e3029ba43ff6fd44c3c98c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 4 Jul 2013 17:38:56 +0200 Subject: [PATCH 241/798] haskell-oeis: update to version 0.3.4 --- pkgs/development/libraries/haskell/oeis/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/oeis/default.nix b/pkgs/development/libraries/haskell/oeis/default.nix index 09e7b00fb74..0b26de00e05 100644 --- a/pkgs/development/libraries/haskell/oeis/default.nix +++ b/pkgs/development/libraries/haskell/oeis/default.nix @@ -2,11 +2,10 @@ cabal.mkDerivation (self: { pname = "oeis"; - version = "0.3.3"; - sha256 = "0a0h7wmyy11iqb121w4i6d8masd0xi77dnihickrhlblpbbwq0xn"; + version = "0.3.4"; + sha256 = "15xn7cybk43lk8wjd22l3zwvkyrmlixpfyrxsy3rnvh0vmn0r25d"; buildDepends = [ HTTP network ]; testDepends = [ HUnit testFramework testFrameworkHunit ]; - doCheck = false; meta = { description = "Interface to the Online Encyclopedia of Integer Sequences (OEIS)"; license = self.stdenv.lib.licenses.bsd3; From cfbae2de737f3ac95e107bdf599b2095e3df24f7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 4 Jul 2013 17:38:57 +0200 Subject: [PATCH 242/798] haskell-shelly: update to version 1.3.0.3 --- pkgs/development/libraries/haskell/shelly/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/shelly/default.nix b/pkgs/development/libraries/haskell/shelly/default.nix index 639d913e040..7bb9466864e 100644 --- a/pkgs/development/libraries/haskell/shelly/default.nix +++ b/pkgs/development/libraries/haskell/shelly/default.nix @@ -3,8 +3,8 @@ cabal.mkDerivation (self: { pname = "shelly"; - version = "1.3.0.2"; - sha256 = "1vhjqm2y6hfaq88k4qz0gdjic1316c5p1gyzgz19r0iwry6msrh2"; + version = "1.3.0.3"; + sha256 = "0izfxv45b5j9p3q2nrlxdn9g4vfmzghl4ab7zisn07gx381wk9qq"; buildDepends = [ mtl systemFileio systemFilepath text time unixCompat ]; From 4a0952d2fa1389a41a09684d7d1ab267c2315983 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 4 Jul 2013 18:13:20 +0200 Subject: [PATCH 243/798] fix bad "licence" names Mostly what I merged from @lovek323. Such errors can be easily checked by nix-env -f . -qa \* --meta --xml --drv-path --show-trace >/dev/null --- pkgs/applications/audio/abcde/default.nix | 2 +- pkgs/applications/audio/cd-discid/default.nix | 4 ++-- .../science/molecular-dynamics/gromacs/default.nix | 2 +- pkgs/development/interpreters/renpy/default.nix | 2 +- .../libraries/gstreamer/gst-plugins-base/default.nix | 2 +- pkgs/development/libraries/liboil/default.nix | 2 +- pkgs/development/python-modules/pygame/default.nix | 2 +- pkgs/os-specific/linux/latencytop/default.nix | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/audio/abcde/default.nix b/pkgs/applications/audio/abcde/default.nix index e8c37d25694..c6b5e9da0dd 100644 --- a/pkgs/applications/audio/abcde/default.nix +++ b/pkgs/applications/audio/abcde/default.nix @@ -61,7 +61,7 @@ in meta = { homepage = "http://lly.org/~rcw/abcde/page/"; - licence = "GPLv2+"; + license = "GPLv2+"; description = "A Better CD Encoder (ABCDE)"; longDescription = '' diff --git a/pkgs/applications/audio/cd-discid/default.nix b/pkgs/applications/audio/cd-discid/default.nix index 24e0be5eac0..c67830a94e7 100644 --- a/pkgs/applications/audio/cd-discid/default.nix +++ b/pkgs/applications/audio/cd-discid/default.nix @@ -19,7 +19,7 @@ in meta = { homepage = http://lly.org/~rcw/cd-discid/; - licence = "GPLv2+"; + license = "GPLv2+"; description = "cd-discid, a command-line utility to retrieve a disc's CDDB ID"; longDescription = '' @@ -28,4 +28,4 @@ in abcde), but can be used for any purpose requiring CDDB data. ''; }; - } \ No newline at end of file + } diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix index c687fd5908c..de4bb171497 100644 --- a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix +++ b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = { homepage = "http://www.gromacs.org"; - licence = "GPLv2"; + license = "GPLv2"; description = "The GROMACS molecular dynamics software package"; longDescription = '' GROMACS is a versatile package to perform molecular dynamics, diff --git a/pkgs/development/interpreters/renpy/default.nix b/pkgs/development/interpreters/renpy/default.nix index 9b34f9a1fef..f7d8b93f966 100644 --- a/pkgs/development/interpreters/renpy/default.nix +++ b/pkgs/development/interpreters/renpy/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation { meta = { description = "Ren'Py Visual Novel Engine"; homepage = "http://renpy.org/"; - licence = "MIT"; + license = "MIT"; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix b/pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix index e29be91c34b..da861dda12d 100644 --- a/pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix +++ b/pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://gstreamer.freedesktop.org; description = "Base plug-ins for GStreamer"; - license = licences.lgpl2Plus; + license = licenses.lgpl2Plus; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/liboil/default.nix b/pkgs/development/libraries/liboil/default.nix index de2ffdffca7..66d07b547c5 100644 --- a/pkgs/development/libraries/liboil/default.nix +++ b/pkgs/development/libraries/liboil/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A library of simple functions that are optimized for various CPUs"; homepage = http://liboil.freedesktop.org; - license = libraries.bsd2; + license = licenses.bsd2; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.all; }; diff --git a/pkgs/development/python-modules/pygame/default.nix b/pkgs/development/python-modules/pygame/default.nix index 912642e3ea9..a6efb8bdc2b 100644 --- a/pkgs/development/python-modules/pygame/default.nix +++ b/pkgs/development/python-modules/pygame/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation { meta = { description = "Python library for games"; homepage = "http://www.pygame.org/"; - licences = "LGPLv2.1+"; + license = "LGPLv2.1+"; }; } diff --git a/pkgs/os-specific/linux/latencytop/default.nix b/pkgs/os-specific/linux/latencytop/default.nix index d5c857cf4c9..eb776dcb86d 100644 --- a/pkgs/os-specific/linux/latencytop/default.nix +++ b/pkgs/os-specific/linux/latencytop/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://latencytop.org; description = "Tool to show kernel reports on latencies (LATENCYTOP option)"; - licence = "GPLv2"; + license = "GPLv2"; maintainers = [ stdenv.lib.maintainers.viric ]; platforms = stdenv.lib.platforms.linux; }; From 9da1586d7529af32337b3ec8de261d60d1312a4a Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 4 Jul 2013 16:52:43 +0200 Subject: [PATCH 244/798] qemu: Update to 1.5.1 --- pkgs/applications/virtualization/qemu/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 434ec180203..bfbc9a8ab72 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -2,11 +2,11 @@ , attr, libcap, vde2 }: stdenv.mkDerivation rec { - name = "qemu-1.4.0"; + name = "qemu-1.5.1"; src = fetchurl { url = "http://wiki.qemu.org/download/${name}.tar.bz2"; - sha256 = "1a7d11vjs1p6i1ck2ff9annmkhpkbjl73hl9i1cbg3s0fznrfqh6"; + sha256 = "1s7316pgizpayr472la8p8a4vhv7ymmzd5qlbkmq6y9q5zpa25ac"; }; buildInputs = [ @@ -22,9 +22,10 @@ stdenv.mkDerivation rec { ]; meta = { - description = "QEmu processor emulator"; + homepage = http://www.qemu.org/; + description = "A generic and open source machine emulator and virtualizer"; license = "GPLv2+"; - maintainers = with stdenv.lib.maintainers; [ viric shlevy ]; - platforms = with stdenv.lib.platforms; linux; + maintainers = with stdenv.lib.maintainers; [ viric shlevy eelco ]; + platforms = stdenv.lib.platforms.linux; }; } From e3e35c1f15730f861aa70707236ce304bd7c90b7 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 4 Jul 2013 17:35:52 +0200 Subject: [PATCH 245/798] spice-protocol: Update to 0.12.6 --- pkgs/development/libraries/spice-protocol/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/spice-protocol/default.nix b/pkgs/development/libraries/spice-protocol/default.nix index 25f42275644..e281b1fcf9d 100644 --- a/pkgs/development/libraries/spice-protocol/default.nix +++ b/pkgs/development/libraries/spice-protocol/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "spice-protocol-0.12.2"; + name = "spice-protocol-0.12.6"; src = fetchurl { url = "http://www.spice-space.org/download/releases/${name}.tar.bz2"; - sha256 = "0v6msf6gbl8g69qamp97dggz148zpc3ncbfgbq3b472wszjdkclb"; + sha256 = "16r5x2sppiaa6pzawkrvk5q4hmw7ynmlp2xr38f1vaxj5rh4aiwx"; }; meta = { From e638620100989bc00d645fd4ff0641766cb3e108 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 4 Jul 2013 17:36:02 +0200 Subject: [PATCH 246/798] spice: Update to 0.12.3 --- pkgs/development/libraries/spice/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/spice/default.nix b/pkgs/development/libraries/spice/default.nix index 2bcb9e593b8..bcbe60ffa6d 100644 --- a/pkgs/development/libraries/spice/default.nix +++ b/pkgs/development/libraries/spice/default.nix @@ -1,20 +1,20 @@ { stdenv, fetchurl, pkgconfig, pixman, celt, alsaLib, openssl , libXrandr, libXfixes, libXext, libXrender, libXinerama, libjpeg, zlib -, spice_protocol, python, pyparsing }: +, spice_protocol, python, pyparsing, glib }: with stdenv.lib; stdenv.mkDerivation rec { - name = "spice-0.12.0"; + name = "spice-0.12.3"; src = fetchurl { url = "http://www.spice-space.org/download/releases/${name}.tar.bz2"; - sha256 = "15mp6nz467h4l5jg3vk51si6r5w7g329jvsy61f2gl3yabwcxmva"; + sha256 = "0il50hcw87mzs3dw80a9gkidmhgf9s8691xmki3gj9358qf5xmmz"; }; buildInputs = [ pixman celt alsaLib openssl libjpeg zlib libXrandr libXfixes libXrender libXext libXinerama - python pyparsing ]; + python pyparsing glib ]; nativeBuildInputs = [ pkgconfig spice_protocol ]; From d199fe766a6f96d8739b5e8d1a9d9211d5f795e8 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 4 Jul 2013 17:44:44 +0200 Subject: [PATCH 247/798] qemu: Merge stuff from qemu-kvm --- .../virtualization/qemu/default.nix | 28 ++++++++++++------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index bfbc9a8ab72..91d803fb026 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -1,5 +1,9 @@ -{ stdenv, fetchurl, python, zlib, pkgconfig, glib, SDL, ncurses, perl, pixman -, attr, libcap, vde2 }: +{ stdenv, fetchurl, python, zlib, pkgconfig, glib, ncurses, perl, pixman +, attr, libcap, vde2, alsaLib, texinfo, libuuid +, sdlSupport ? true, SDL +, vncSupport ? true, libjpeg, libpng +, spiceSupport ? false, spice, spice_protocol +}: stdenv.mkDerivation rec { name = "qemu-1.5.1"; @@ -9,17 +13,21 @@ stdenv.mkDerivation rec { sha256 = "1s7316pgizpayr472la8p8a4vhv7ymmzd5qlbkmq6y9q5zpa25ac"; }; - buildInputs = [ - python zlib pkgconfig glib SDL ncurses perl pixman attr libcap - vde2 - ]; + buildInputs = + [ python zlib pkgconfig glib ncurses perl pixman attr libcap + vde2 alsaLib texinfo libuuid + ] + ++ stdenv.lib.optionals sdlSupport [ SDL ] + ++ stdenv.lib.optionals vncSupport [ libjpeg libpng ] + ++ stdenv.lib.optionals spiceSupport [ spice_protocol spice ]; enableParallelBuilding = true; - configureFlags = [ - "--enable-virtfs" - "--enable-vde" - ]; + configureFlags = + [ "--audio-drv-list=alsa" + "--smbd=smbd" # use `smbd' from $PATH + ] + ++ stdenv.lib.optional spiceSupport "--enable-spice"; meta = { homepage = http://www.qemu.org/; From b625a16068f0142fd3c90d772c8111d549b35dac Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 4 Jul 2013 17:45:37 +0200 Subject: [PATCH 248/798] qemu: Merge qemu-kvm dependencies --- pkgs/applications/virtualization/qemu/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 91d803fb026..76783957d57 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--audio-drv-list=alsa" - "--smbd=smbd" # use `smbd' from $PATH + "--smbd=smbd" # use `smbd' from $PATH ] ++ stdenv.lib.optional spiceSupport "--enable-spice"; From abc10b47158c2be67aafb4f29f259665c7b94a8e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 4 Jul 2013 18:01:11 +0200 Subject: [PATCH 249/798] qemu: Allow building only the x86 emulator --- pkgs/applications/virtualization/qemu/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 76783957d57..91050619e43 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -3,6 +3,7 @@ , sdlSupport ? true, SDL , vncSupport ? true, libjpeg, libpng , spiceSupport ? false, spice, spice_protocol +, x86Only ? false }: stdenv.mkDerivation rec { @@ -27,7 +28,8 @@ stdenv.mkDerivation rec { [ "--audio-drv-list=alsa" "--smbd=smbd" # use `smbd' from $PATH ] - ++ stdenv.lib.optional spiceSupport "--enable-spice"; + ++ stdenv.lib.optional spiceSupport "--enable-spice" + ++ stdenv.lib.optional x86Only "--target-list=i386-softmmu,x86_64-softmmu"; meta = { homepage = http://www.qemu.org/; From 7afc1149d9fd506dc682faebf23de9813fba3357 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 4 Jul 2013 18:23:25 +0200 Subject: [PATCH 250/798] testRPMImage: Use x86_64 image --- pkgs/build-support/vm/test.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/vm/test.nix b/pkgs/build-support/vm/test.nix index e59bc934d4b..eed7cd017c4 100644 --- a/pkgs/build-support/vm/test.nix +++ b/pkgs/build-support/vm/test.nix @@ -8,7 +8,7 @@ rec { buildPatchelfInVM = runInLinuxVM patchelf; - testRPMImage = makeImageTestScript diskImages.fedora16i386; + testRPMImage = makeImageTestScript diskImages.fedora16x86_64; buildPatchelfRPM = buildRPM { From f5a130b6b3ccd7c44c23357e32573cb2ab466c5a Mon Sep 17 00:00:00 2001 From: "Jason \\\"Don\\\" O'Conal" Date: Sun, 2 Jun 2013 16:27:00 +1000 Subject: [PATCH 251/798] newsbeuter: add expression --- .../feedreaders/newsbeuter/default.nix | 41 ++++++++++ pkgs/development/libraries/ncurses/5_4.nix | 75 +++++++++++++++++++ pkgs/development/libraries/stfl/default.nix | 37 +++++++++ pkgs/top-level/all-packages.nix | 18 ++++- 4 files changed, 170 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/networking/feedreaders/newsbeuter/default.nix create mode 100644 pkgs/development/libraries/ncurses/5_4.nix create mode 100644 pkgs/development/libraries/stfl/default.nix diff --git a/pkgs/applications/networking/feedreaders/newsbeuter/default.nix b/pkgs/applications/networking/feedreaders/newsbeuter/default.nix new file mode 100644 index 00000000000..db29c4f22ea --- /dev/null +++ b/pkgs/applications/networking/feedreaders/newsbeuter/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchurl, sqlite, curl, pkgconfig, libxml2, stfl, json_c, ncurses +, gettext, libiconvOrEmpty, makeWrapper }: + +stdenv.mkDerivation rec { + name = "newsbeuter-2.6"; + + src = fetchurl { + url = "http://www.newsbeuter.org/downloads/${name}.tar.gz"; + sha256 = "1hywz5206k0ykjklkjvnfy9fm4jfv9phz8dkzzwhfcjvqv9zv29i"; + }; + + buildInputs + # use gettext instead of libintlOrEmpty so we have access to the msgfmt + # command + = [ pkgconfig sqlite curl libxml2 stfl json_c ncurses gettext ] + ++ libiconvOrEmpty + ++ stdenv.lib.optional stdenv.isDarwin makeWrapper; + + preBuild = '' + sed -i -e 104,108d config.sh + export LDFLAGS=-lncursesw + ''; + + installPhase = '' + DESTDIR=$out prefix=\"\" make install + '' + + stdenv.lib.optionalString stdenv.isDarwin '' + for prog in $out/bin/*; do + wrapProgram "$prog" --prefix DYLD_LIBRARY_PATH : "${stfl}/lib" + done + ''; + + meta = { + homepage = http://www.newsbeuter.org; + description = "An open-source RSS/Atom feed reader for text terminals"; + maintainers = with stdenv.lib.maintainers; [ lovek323 ]; + license = stdenv.lib.licenses.mit; + platforms = stdenv.lib.platforms.unix; + }; +} + diff --git a/pkgs/development/libraries/ncurses/5_4.nix b/pkgs/development/libraries/ncurses/5_4.nix new file mode 100644 index 00000000000..1cf08bd30c6 --- /dev/null +++ b/pkgs/development/libraries/ncurses/5_4.nix @@ -0,0 +1,75 @@ +{stdenv, fetchurl, unicode ? true}: + +let + /* C++ bindings fail to build on `i386-pc-solaris2.11' with GCC 3.4.3: + . + It seems that it could be worked around by #including in the + right place, according to + , + but this is left as an exercise to the reader. + So disable them for now. */ + cxx = stdenv.system != "i686-solaris"; +in +stdenv.mkDerivation (rec { + name = "ncurses-5.4"; + + src = fetchurl { + url = "mirror://gnu/ncurses/${name}.tar.gz"; + sha256 = "0div11f5flig67v702fd3sj362zagrnaj0d8wvs905s3rxiy1g2s"; + }; + + configureFlags = '' + --with-shared --includedir=''${out}/include --without-debug + ${if unicode then "--enable-widec" else ""}${if cxx then "" else "--without-cxx-binding"} + ''; + + selfNativeBuildInput = true; + + enableParallelBuilding = true; + + preBuild = + # On Darwin, we end up using the native `sed' during bootstrap, and it + # fails to run this command, which isn't needed anyway. + stdenv.lib.optionalString (!stdenv.isDarwin) + ''sed -e "s@\([[:space:]]\)sh @\1''${SHELL} @" -i */Makefile Makefile''; + + # When building a wide-character (Unicode) build, create backward + # compatibility links from the the "normal" libraries to the + # wide-character libraries (e.g. libncurses.so to libncursesw.so). + postInstall = if unicode then '' + ${if cxx then "chmod 644 $out/lib/libncurses++w.a" else ""} + for lib in curses ncurses form panel menu; do + if test -e $out/lib/lib''${lib}w.a; then + rm -f $out/lib/lib$lib.so + echo "INPUT(-l''${lib}w)" > $out/lib/lib$lib.so + ln -svf lib''${lib}w.a $out/lib/lib$lib.a + ln -svf lib''${lib}w.so.5 $out/lib/lib$lib.so.5 + fi + done; + '' else ""; + + meta = { + description = "GNU Ncurses, a free software emulation of curses in SVR4 and more"; + + longDescription = '' + The Ncurses (new curses) library is a free software emulation of + curses in System V Release 4.0, and more. It uses Terminfo + format, supports pads and color and multiple highlights and + forms characters and function-key mapping, and has all the other + SYSV-curses enhancements over BSD Curses. + + The ncurses code was developed under GNU/Linux. It has been in + use for some time with OpenBSD as the system curses library, and + on FreeBSD and NetBSD as an external package. It should port + easily to any ANSI/POSIX-conforming UNIX. It has even been + ported to OS/2 Warp! + ''; + + homepage = http://www.gnu.org/software/ncurses/; + + license = "X11"; + + maintainers = [ stdenv.lib.maintainers.ludo ]; + platforms = stdenv.lib.platforms.all; + }; +} // ( if stdenv.isDarwin then { postFixup = "rm $out/lib/*.so"; } else { } ) ) diff --git a/pkgs/development/libraries/stfl/default.nix b/pkgs/development/libraries/stfl/default.nix new file mode 100644 index 00000000000..9e3f749ca8f --- /dev/null +++ b/pkgs/development/libraries/stfl/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchurl, ncurses, libiconvOrEmpty }: + +stdenv.mkDerivation rec { + name = "stfl-0.22"; + + src = fetchurl { + url = "http://www.clifford.at/stfl/${name}.tar.gz"; + sha256 = "062lqlf3qhp8bcapbpc0k3wym7x6ngncql8jmx5x06p6679szp9d"; + }; + + buildInputs = [ ncurses ] ++ libiconvOrEmpty; + + buildPhase = '' + sed -i s%ncursesw/ncurses.h%ncurses.h% stfl_internals.h + '' + ( stdenv.lib.optionalString stdenv.isDarwin '' + sed -i 's/LDLIBS += -lncursesw/LDLIBS += -lncursesw -liconv/' Makefile + sed -i s/-soname/-install_name/ Makefile + '' ) + '' + make + ''; + + installPhase = '' + DESTDIR=$out prefix=\"\" make install + + # some programs rely on libstfl.so.0 to be present, so link it + ln -s $out/lib/libstfl.so.0.22 $out/lib/libstfl.so.0 + ''; + + meta = { + homepage = http://www.clifford.at/stfl/; + description = "A library which implements a curses-based widget set for text terminals"; + maintainers = with stdenv.lib.maintainers; [ lovek323 ]; + license = stdenv.lib.licenses.lgpl3; + platforms = stdenv.lib.platforms.unix; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 13131781b39..ad6a1032d9b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1319,6 +1319,8 @@ let networkmanagerapplet = newScope gnome ../tools/networking/network-manager-applet { }; + newsbeuter = callPackage ../applications/networking/feedreaders/newsbeuter { }; + pa_applet = callPackage ../tools/audio/pa-applet { }; nilfs_utils = callPackage ../tools/filesystems/nilfs-utils {}; @@ -4982,7 +4984,14 @@ let mythes = callPackage ../development/libraries/mythes { }; - ncurses = makeOverridable (import ../development/libraries/ncurses) { + ncurses_5_4 = makeOverridable (import ../development/libraries/ncurses/5_4.nix) { + inherit fetchurl; + unicode = system != "i686-cygwin"; + stdenv = if stdenv.isDarwin + then allStdenvs.stdenvNative + else stdenv; + }; + ncurses_5_9 = makeOverridable (import ../development/libraries/ncurses) { inherit fetchurl; unicode = system != "i686-cygwin"; stdenv = @@ -4993,6 +5002,7 @@ let then allStdenvs.stdenvNative else stdenv; }; + ncurses = ncurses_5_9; neon = callPackage ../development/libraries/neon { compressionSupport = true; @@ -5339,6 +5349,12 @@ let inherit readline ncurses; }); + stfl = callPackage ../development/libraries/stfl { + stdenv = if stdenv.isDarwin + then overrideGCC stdenv gccApple + else stdenv; + }; + stlink = callPackage ../development/tools/misc/stlink { }; stlport = callPackage ../development/libraries/stlport { }; From 061462aef95dcdbc33391b571ffa1f90768744e1 Mon Sep 17 00:00:00 2001 From: "Jason \\\"Don\\\" O'Conal" Date: Thu, 4 Jul 2013 04:06:39 +0200 Subject: [PATCH 252/798] newsbeuter: fix perl shebang --- .../networking/feedreaders/newsbeuter/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/feedreaders/newsbeuter/default.nix b/pkgs/applications/networking/feedreaders/newsbeuter/default.nix index db29c4f22ea..3bca5cc91da 100644 --- a/pkgs/applications/networking/feedreaders/newsbeuter/default.nix +++ b/pkgs/applications/networking/feedreaders/newsbeuter/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, sqlite, curl, pkgconfig, libxml2, stfl, json_c, ncurses -, gettext, libiconvOrEmpty, makeWrapper }: +, gettext, libiconvOrEmpty, makeWrapper, perl }: stdenv.mkDerivation rec { name = "newsbeuter-2.6"; @@ -12,12 +12,13 @@ stdenv.mkDerivation rec { buildInputs # use gettext instead of libintlOrEmpty so we have access to the msgfmt # command - = [ pkgconfig sqlite curl libxml2 stfl json_c ncurses gettext ] + = [ pkgconfig sqlite curl libxml2 stfl json_c ncurses gettext perl ] ++ libiconvOrEmpty ++ stdenv.lib.optional stdenv.isDarwin makeWrapper; preBuild = '' sed -i -e 104,108d config.sh + sed -i "1 s%^.*$%#!${perl}/bin/perl%" txt2h.pl export LDFLAGS=-lncursesw ''; From 5597e9a2a5dfd7423d6ef480e9dfec4a0ba2202b Mon Sep 17 00:00:00 2001 From: Jonas Hoersch Date: Thu, 4 Jul 2013 16:45:56 +0200 Subject: [PATCH 253/798] aria2: update to version 1.17.1 and add sqlite support also add missing pkgconfig dependency, so that the buildInputs zlib, openssl, and sqlite are properly found. --- pkgs/tools/networking/aria2/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/aria2/default.nix b/pkgs/tools/networking/aria2/default.nix index 383a2963ff2..75b6492a851 100644 --- a/pkgs/tools/networking/aria2/default.nix +++ b/pkgs/tools/networking/aria2/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchurl, openssl, libxml2, zlib }: +{ stdenv, fetchurl, pkgconfig, openssl, libxml2, sqlite, zlib }: stdenv.mkDerivation rec { - name = "aria2-1.10.8"; + name = "aria2-1.17.1"; src = fetchurl { url = "mirror://sourceforge/aria2/stable/${name}/${name}.tar.bz2"; - sha256 = "1cbcrxwdc6gp4l4zqg2i18zdg5ry5f9r3zj66kx6l5plwfjv9fdc"; + sha256 = "0v0cdbv6v7fb4870rz5s9vscsj74fzbj70gsa2y4hysai4a0im3y"; }; - buildInputs = [ openssl libxml2 zlib ]; + buildInputs = [ pkgconfig openssl libxml2 sqlite zlib ]; meta = { homepage = http://aria2.sourceforge.net/; From f925c5ae7f00f0b70f2d8021465d7b3add09f32a Mon Sep 17 00:00:00 2001 From: Aristid Breitkreuz Date: Mon, 1 Jul 2013 20:22:34 +0200 Subject: [PATCH 254/798] fix bash completion for perf --- pkgs/os-specific/linux/kernel/perf.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/kernel/perf.nix b/pkgs/os-specific/linux/kernel/perf.nix index ebbf9557245..cc5ec7f2f24 100644 --- a/pkgs/os-specific/linux/kernel/perf.nix +++ b/pkgs/os-specific/linux/kernel/perf.nix @@ -12,6 +12,7 @@ stdenv.mkDerivation { preConfigure = '' cd tools/perf sed -i s,/usr/include/elfutils,$elfutils/include/elfutils, Makefile + sed -i 's,^have perf,_have perf,' bash_completion export makeFlags="DESTDIR=$out $makeFlags" ''; From c222c31745ae7044148c35ca3456ab43137d07e9 Mon Sep 17 00:00:00 2001 From: Aristid Breitkreuz Date: Mon, 1 Jul 2013 21:04:46 +0200 Subject: [PATCH 255/798] do not patch non-existent bash_completion for old kernels --- pkgs/os-specific/linux/kernel/perf.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/perf.nix b/pkgs/os-specific/linux/kernel/perf.nix index cc5ec7f2f24..83de0effcec 100644 --- a/pkgs/os-specific/linux/kernel/perf.nix +++ b/pkgs/os-specific/linux/kernel/perf.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { preConfigure = '' cd tools/perf sed -i s,/usr/include/elfutils,$elfutils/include/elfutils, Makefile - sed -i 's,^have perf,_have perf,' bash_completion + -f bash_completion && sed -i 's,^have perf,_have perf,' bash_completion export makeFlags="DESTDIR=$out $makeFlags" ''; From 53f6bd73ad27d21131aa315efa91a6c6aa60fa8b Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Thu, 4 Jul 2013 20:26:06 +0200 Subject: [PATCH 256/798] plone: updating plone.app.discussion to 2.2.7 --- pkgs/development/web/plone/4.3.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/web/plone/4.3.nix b/pkgs/development/web/plone/4.3.nix index badd213daf6..0eac538951d 100644 --- a/pkgs/development/web/plone/4.3.nix +++ b/pkgs/development/web/plone/4.3.nix @@ -3092,10 +3092,10 @@ let plone43Packages = pythonPackages.python.modules // rec { }; plone_app_discussion = buildPythonPackage rec { - name = "plone.app.discussion-2.2.6"; + name = "plone.app.discussion-2.2.7"; src = fetchurl { - url = "https://pypi.python.org/packages/source/p/plone.app.discussion/plone.app.discussion-2.2.6.zip"; - md5 = "36cf9cd22119282f49facd03fb3c2632"; + url = "https://pypi.python.org/packages/source/p/plone.app.discussion/plone.app.discussion-2.2.7.tar.gz"; + md5 = "47e2713140dbbcd6dd9c3fa6dbd17fd0"; }; buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ plone_app_uuid zope_site plone_indexer collective_monkeypatcher zope_interface plone_app_z3cform zope_container plone_app_layout plone_z3cform plone_app_registry zope_component zodb3 zope_event setuptools z3c_form zope_lifecycleevent zope_annotation plone_registry ]; From d1c3c10d95d7f92bed31c60c16823d745a1c478e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 4 Jul 2013 21:29:52 +0200 Subject: [PATCH 257/798] R: delete obsolete version 2.x from Nixpkgs --- .../interpreters/r-lang/default.nix | 37 ------------------- pkgs/top-level/all-packages.nix | 4 -- 2 files changed, 41 deletions(-) delete mode 100644 pkgs/development/interpreters/r-lang/default.nix diff --git a/pkgs/development/interpreters/r-lang/default.nix b/pkgs/development/interpreters/r-lang/default.nix deleted file mode 100644 index 43219899380..00000000000 --- a/pkgs/development/interpreters/r-lang/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ stdenv, fetchurl, readline, perl, gfortran, libX11, libpng, libXt, zlib -, withBioconductor ? false -}: - -stdenv.mkDerivation { - name = "r-lang"; - version = "2.12.0"; - src = fetchurl { - url = http://cran.r-project.org/src/base/R-2/R-2.12.0.tar.gz; - sha256 = "93d72d845b01c6cd00e58f04b5e78fd6c83de96a8620505ad2a016772af02179"; - }; - - bioconductor = if withBioconductor then import ../development/libraries/science/biology/bioconductor { inherit fetchurl stdenv readline; } else null; - - postUnpack = '' - gunzip R-2.12.0/src/library/Recommended/Matrix_0.999375-44.tar.gz - tar --file=R-2.12.0/src/library/Recommended/Matrix_0.999375-44.tar --delete Matrix/src/dummy.cpp - gzip R-2.12.0/src/library/Recommended/Matrix_0.999375-44.tar - ''; - - buildInputs = [readline perl gfortran libpng libX11 libXt zlib]; - configureFlags = ["--enable-R-shlib"] ; - - meta = { - description = "R is a language and environment for statistical computing and graphics"; - license = "GPL2"; - homepage = http://www.r-project.org/; - longDescription = '' - R is a language and environment for statistical computing and - graphics. It is a GNU project which is similar to the S language. - R provides a wide variety of statistical (linear and nonlinear - modelling, classical statistical tests, time-series analysis, - classification, clustering, ...) and graphical techniques, and is - highly extensible. - ''; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ad6a1032d9b..00428a2ad7b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3154,10 +3154,6 @@ let rubySqlite3 = callPackage ../development/ruby-modules/sqlite3 { }; - rLang = callPackage ../development/interpreters/r-lang { - withBioconductor = config.rLang.withBioconductor or false; - }; - rubygemsFun = ruby: builderDefsPackage (import ../development/interpreters/ruby/rubygems.nix) { inherit ruby makeWrapper; }; From 7a2daf2db718829989ecd89ba41b1ec9dc3df858 Mon Sep 17 00:00:00 2001 From: Aristid Breitkreuz Date: Thu, 4 Jul 2013 23:36:29 +0200 Subject: [PATCH 258/798] update xdg-utils to 1.1.0-rc1, fixes problems with generic xdg-open code --- pkgs/tools/X11/xdg-utils/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/X11/xdg-utils/default.nix b/pkgs/tools/X11/xdg-utils/default.nix index df5d59c7b57..52ddb5a0f6b 100644 --- a/pkgs/tools/X11/xdg-utils/default.nix +++ b/pkgs/tools/X11/xdg-utils/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, file }: stdenv.mkDerivation rec { - name = "xdg-utils-1.0.2"; + name = "xdg-utils-1.1.0-rc1"; src = fetchurl { - url = "http://portland.freedesktop.org/download/${name}.tgz"; - sha256 = "1b019d3r1379b60p33d6z44kx589xjgga62ijz9vha95dg8vgbi1"; + url = "http://portland.freedesktop.org/download/${name}.tar.gz"; + sha256 = "00lisw4x43sp189lb7dz46j2l09y5v2fijk3d0sxx3mvwj55a1bv"; }; postInstall = '' From 400d4a03b082207020cca30cd0d577cd791012e9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 4 Jul 2013 23:41:22 +0200 Subject: [PATCH 259/798] Update references to 'rLang' to the new name 'R'. --- pkgs/desktops/kde-4.10/kdeedu/cantor.nix | 4 ++-- .../science/biology/biolib/default.nix | 21 +++++++++---------- pkgs/top-level/release-python.nix | 2 +- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/pkgs/desktops/kde-4.10/kdeedu/cantor.nix b/pkgs/desktops/kde-4.10/kdeedu/cantor.nix index d2a1b095b82..4563012ac67 100644 --- a/pkgs/desktops/kde-4.10/kdeedu/cantor.nix +++ b/pkgs/desktops/kde-4.10/kdeedu/cantor.nix @@ -1,7 +1,7 @@ -{ kde, kdelibs, libspectre, analitza, rLang, pkgconfig, gfortran, libqalculate }: +{ kde, kdelibs, libspectre, analitza, R, pkgconfig, gfortran, libqalculate }: kde { - buildInputs = [ kdelibs libspectre analitza rLang gfortran libqalculate]; + buildInputs = [ kdelibs libspectre analitza R gfortran libqalculate]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/science/biology/biolib/default.nix b/pkgs/development/libraries/science/biology/biolib/default.nix index b12366c0142..4e4c3c55361 100644 --- a/pkgs/development/libraries/science/biology/biolib/default.nix +++ b/pkgs/development/libraries/science/biology/biolib/default.nix @@ -1,26 +1,25 @@ -{ stdenv, fetchurl, cmake, rLang, zlib }: +{ stdenv, fetchurl, cmake, R, zlib }: stdenv.mkDerivation rec { name = "biolib-${version}"; - + version = "0.0.1"; - + src = fetchurl { url = "http://bio3.xparrot.eu/download/nix-biology/biolib-${version}.tar.gz"; sha256 = "1la639rs0v4f3ayvarqv0yxwlnwn188bb1v71d2ybw1xr6gdy688"; }; - buildInputs = [cmake rLang zlib]; + buildInputs = [cmake R zlib]; meta = { + homepage = "http://biolib.open-bio.org/"; description = "BioLib"; - longDescription = - '' - BioLib brings together a set of opensource libraries written - in C/C++ and makes them available for major Bio* languages: - BioPerl, BioRuby, BioPython - ''; license = "GPL2"; - homepage = http://biolib.open-bio.org/; + longDescription = '' + BioLib brings together a set of opensource libraries written + in C/C++ and makes them available for major Bio* languages: + BioPerl, BioRuby, BioPython + ''; }; } diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix index ad2f8e901c1..9cde018632f 100644 --- a/pkgs/top-level/release-python.nix +++ b/pkgs/top-level/release-python.nix @@ -1522,7 +1522,7 @@ in rhpl = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; rigsofrods = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; rili = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - rLang = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; + R = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; rockbox_utility = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; rpm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; rrdtool = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; From ed37a6b465cb75d86ecf2265a8a8869717e05739 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 4 Jul 2013 18:30:26 +0200 Subject: [PATCH 260/798] VM builds: Use qemu instead of the obsolete qemu-kvm --- pkgs/build-support/vm/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index b1eb82ed830..492c7f3e818 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -16,7 +16,9 @@ rec { # in parallel). So apply a patch to increase the timeout to 120s. kernel = assert pkgs.linux.features.cifsTimeout; linuxKernel; - kvm = pkgs.qemu_kvm; + kvm = pkgs.qemu; + + qemuProg = "${kvm}/bin/qemu-system-" + (if stdenv.system == "x86_64-linux" then "x86_64" else "i386"); modulesClosure = makeModulesClosure { @@ -195,7 +197,8 @@ rec { qemuCommandLinux = '' - ${kvm}/bin/qemu-kvm \ + ${qemuProg} \ + -enable-kvm \ ${lib.optionalString (pkgs.stdenv.system == "x86_64-linux") "-cpu kvm64"} \ -nographic -no-reboot \ -net nic,model=virtio \ @@ -393,7 +396,8 @@ rec { qemuCommandGeneric = '' PATH="${samba}/sbin:$PATH" \ - ${kvm}/bin/qemu-kvm \ + ${qemuProg} \ + -enable-kvm \ -nographic -no-reboot \ -smb $(pwd) -hda $diskImage \ $QEMU_OPTS From 5f8571405baa596c598d3b9a5a70bbf50cfc1810 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 4 Jul 2013 19:01:25 +0200 Subject: [PATCH 261/798] VM builds: Use ext4 instead of ext2 --- pkgs/build-support/vm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 492c7f3e818..9d76f40afd4 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -2,7 +2,7 @@ , linuxKernel ? pkgs.linux_3_9 , img ? "bzImage" , rootModules ? - [ "cifs" "virtio_net" "virtio_pci" "virtio_blk" "virtio_balloon" "nls_utf8" "ext2" "ext3" + [ "cifs" "virtio_net" "virtio_pci" "virtio_blk" "virtio_balloon" "nls_utf8" "ext4" "unix" "hmac" "md4" "ecb" "des_generic" "sha256" ] }: @@ -297,8 +297,8 @@ rec { defaultCreateRootFS = '' mkdir /mnt - ${e2fsprogs}/sbin/mke2fs -F /dev/${hd} - ${utillinux}/bin/mount -t ext2 /dev/${hd} /mnt + ${e2fsprogs}/sbin/mkfs.ext4 /dev/${hd} + ${utillinux}/bin/mount -t ext4 /dev/${hd} /mnt if test -e /mnt/.debug; then exec ${bash}/bin/sh From 2321f2d55c6742fae0830142023816439ad83690 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 4 Jul 2013 23:35:31 +0200 Subject: [PATCH 262/798] VM builds: Panic on OOM --- pkgs/build-support/vm/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 9d76f40afd4..eb585f2bc50 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -80,6 +80,8 @@ rec { mount -t proc none /proc mount -t sysfs none /sys + echo 2 > /proc/sys/vm/panic_on_oom + for o in $(cat /proc/cmdline); do case $o in mountDisk=1) From 9efe759dd8fb8fd85368483923a77f832b8805c6 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 4 Jul 2013 23:36:17 +0200 Subject: [PATCH 263/798] VM builds: Increase the default memory size to 512 MB --- pkgs/build-support/vm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index eb585f2bc50..8065e5fa910 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -324,7 +324,7 @@ rec { `preVM' can optionally contain a shell command to be evaluated *before* the VM is started (i.e., on the host). The attribute `memSize' specifies the memory size of the VM in megabytes, - defaulting to 256. The attribute `diskImage' can optionally + defaulting to 512. The attribute `diskImage' can optionally specify a file system image to be attached to /dev/sda. (Note that currently we expect the image to contain a filesystem, not a full disk image with a partition table etc.) @@ -339,7 +339,7 @@ rec { args = ["-e" (vmRunCommand qemuCommandLinux)]; origArgs = attrs.args; origBuilder = attrs.builder; - QEMU_OPTS = "-m ${toString (if attrs ? memSize then attrs.memSize else 256)}"; + QEMU_OPTS = "-m ${toString (if attrs ? memSize then attrs.memSize else 512)}"; }); From 0e386d0c1373809d3459d09532ad36be0faf6dfb Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 5 Jul 2013 00:06:08 +0200 Subject: [PATCH 264/798] VM builds: Use 9p/virtfs instead of CIFS 9p (with caching enabled) is much faster than CIFS and doesn't require Samba or virtual networking. For instance, building GNU Hello with CIFS takes ~323s on my laptop, but with 9p it takes 54s. More measurements will be needed to see if "cache=fscache" is really faster than "cache=loose" (the former seems to be a little bit faster). --- pkgs/build-support/vm/default.nix | 71 +++------------------ pkgs/build-support/vm/test.nix | 10 ++- pkgs/os-specific/linux/kernel/linux-3.9.nix | 4 ++ 3 files changed, 21 insertions(+), 64 deletions(-) diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 8065e5fa910..4e02118edff 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -1,21 +1,14 @@ { pkgs -, linuxKernel ? pkgs.linux_3_9 +, kernel ? pkgs.linux_3_9 , img ? "bzImage" , rootModules ? - [ "cifs" "virtio_net" "virtio_pci" "virtio_blk" "virtio_balloon" "nls_utf8" - "ext4" "unix" "hmac" "md4" "ecb" "des_generic" "sha256" - ] + [ "virtio_pci" "virtio_blk" "virtio_balloon" "ext4" "unix" "9p" "9pnet_virtio" ] }: with pkgs; rec { - # The 15 second CIFS timeout is too short if the host if heavily - # loaded (e.g., in the Hydra build farm when it's running many jobs - # in parallel). So apply a patch to increase the timeout to 120s. - kernel = assert pkgs.linux.features.cifsTimeout; linuxKernel; - kvm = pkgs.qemu; qemuProg = "${kvm}/bin/qemu-system-" + (if stdenv.system == "x86_64-linux" then "x86_64" else "i386"); @@ -99,21 +92,13 @@ rec { done for i in $(cat ${modulesClosure}/insmod-list); do - args= - case $i in - */cifs.ko) - args="CIFSMaxBufSize=4194304" - ;; - esac echo "loading module $(basename $i .ko)" - insmod $i $args + insmod $i done mount -t tmpfs none /dev ${createDeviceNodes "/dev"} - ifconfig eth0 up 10.0.2.15 - mkdir /fs if test -z "$mountDisk"; then @@ -127,14 +112,14 @@ rec { echo "mounting Nix store..." mkdir -p /fs/nix/store - mount -t cifs //10.0.2.4/store /fs/nix/store -o guest,sec=none,sec=ntlm + mount -t 9p store /fs/nix/store -o trans=virtio,version=9p2000.L,msize=262144,cache=fscache mkdir -p /fs/tmp mount -t tmpfs -o "mode=755" none /fs/tmp echo "mounting host's temporary directory..." mkdir -p /fs/tmp/xchg - mount -t cifs //10.0.2.4/xchg /fs/tmp/xchg -o guest,sec=none,sec=ntlm + mount -t 9p xchg /fs/tmp/xchg -o trans=virtio,version=9p2000.L,msize=262144,cache=fscache mkdir -p /fs/proc mount -t proc none /fs/proc @@ -203,9 +188,8 @@ rec { -enable-kvm \ ${lib.optionalString (pkgs.stdenv.system == "x86_64-linux") "-cpu kvm64"} \ -nographic -no-reboot \ - -net nic,model=virtio \ - -chardev socket,id=samba,path=./samba \ - -net user,guestfwd=tcp:10.0.2.4:445-chardev:samba \ + -virtfs local,path=/nix/store,security_model=none,mount_tag=store \ + -virtfs local,path=$TMPDIR/xchg,security_model=none,mount_tag=xchg \ -drive file=$diskImage,if=virtio,cache=writeback,werror=report \ -kernel ${kernel}/${img} \ -initrd ${initrd}/initrd \ @@ -214,40 +198,6 @@ rec { ''; - startSamba = - '' - export WHO=`whoami` - mkdir -p $TMPDIR/xchg - - cat > $TMPDIR/smb.conf < /dev/null 2>&1 & - while [ ! -e ./samba ]; do sleep 0.1; done # ugly - ''; - - vmRunCommand = qemuCommand: writeText "vm-run" '' export > saved-env @@ -267,7 +217,6 @@ rec { diskImage=$diskImage TMPDIR=$TMPDIR cd $TMPDIR - ${startSamba} ${qemuCommand} EOF @@ -314,9 +263,9 @@ rec { /* Run a derivation in a Linux virtual machine (using Qemu/KVM). By default, there is no disk image; the root filesystem is a tmpfs, - and /nix/store is shared with the host (via the CIFS protocol to - a Samba instance automatically started by Qemu). Thus, any pure - Nix derivation should run unmodified, e.g. the call + and /nix/store is shared with the host (via the 9P protocol). + Thus, any pure Nix derivation should run unmodified, e.g. the + call runInLinuxVM patchelf diff --git a/pkgs/build-support/vm/test.nix b/pkgs/build-support/vm/test.nix index eed7cd017c4..798c283a177 100644 --- a/pkgs/build-support/vm/test.nix +++ b/pkgs/build-support/vm/test.nix @@ -7,6 +7,10 @@ rec { # Run the PatchELF derivation in a VM. buildPatchelfInVM = runInLinuxVM patchelf; + buildHelloInVM = runInLinuxVM hello; + + buildPanInVM = runInLinuxVM pan; + testRPMImage = makeImageTestScript diskImages.fedora16x86_64; @@ -17,10 +21,10 @@ rec { diskImage = diskImages.fedora16x86_64; }; - + testUbuntuImage = makeImageTestScript diskImages.ubuntu810i386; - + buildInDebian = runInLinuxImage (stdenv.mkDerivation { name = "deb-compile"; src = patchelf.src; @@ -65,6 +69,6 @@ rec { make install ''; }; -*/ +*/ } diff --git a/pkgs/os-specific/linux/kernel/linux-3.9.nix b/pkgs/os-specific/linux/kernel/linux-3.9.nix index 3c9976868bd..7803504d91e 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.9.nix @@ -246,6 +246,10 @@ let # Easier debug of NFS issues SUNRPC_DEBUG y + # Enable the 9P cache to speed up NixOS VM tests. + 9P_FSCACHE y + 9P_FS_POSIX_ACL y + ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""} ${extraConfig} ''; From 9f5f30a7e6efe42b2e6ccddebaf710706dd6a73c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 5 Jul 2013 00:11:47 +0200 Subject: [PATCH 265/798] Remove runInGenericVM It's not used anywhere and probably doesn't work anymore. --- pkgs/build-support/vm/default.nix | 50 ------------------------------- pkgs/build-support/vm/test.nix | 35 ---------------------- 2 files changed, 85 deletions(-) diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 4e02118edff..097fcf21c1b 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -345,56 +345,6 @@ rec { }); - qemuCommandGeneric = '' - PATH="${samba}/sbin:$PATH" \ - ${qemuProg} \ - -enable-kvm \ - -nographic -no-reboot \ - -smb $(pwd) -hda $diskImage \ - $QEMU_OPTS - ''; - - - /* Run a command in an x86 virtual machine image containing an - arbitrary OS. The VM should be configured to do the following: - - - Write log output to the serial port. - - - Mount //10.0.2.4/qemu via SMB. - - - Execute the command "cmd" on the SMB share. It can access the - original derivation attributes in "saved-env" on the share. - - - Produce output under "out" on the SMB share. - - - Write an exit code to "in-vm-exit" on the SMB share ("0" - meaning success). - - - Power-off or reboot the machine. - */ - runInGenericVM = drv: lib.overrideDerivation drv (attrs: { - requiredSystemFeatures = [ "kvm" ]; - builder = "${bash}/bin/sh"; - args = ["-e" (vmRunCommand qemuCommandGeneric)]; - QEMU_OPTS = "-m ${toString (if attrs ? memSize then attrs.memSize else 256)}"; - - preVM = '' - diskImage=$(pwd)/disk-image.qcow2 - origImage=${attrs.diskImage} - if test -d "$origImage"; then origImage="$origImage/disk-image.qcow2"; fi - ${kvm}/bin/qemu-img create -b "$origImage" -f qcow2 $diskImage - - echo "$buildCommand" > cmd - - eval "$postPreVM" - ''; - - postVM = '' - cp -prvd out $out - ''; - }); - - /* Like runInLinuxVM, but run the build not using the stdenv from the Nix store, but using the tools provided by /bin, /usr/bin etc. from the specified filesystem image, which typically is a diff --git a/pkgs/build-support/vm/test.nix b/pkgs/build-support/vm/test.nix index 798c283a177..d0d85fce366 100644 --- a/pkgs/build-support/vm/test.nix +++ b/pkgs/build-support/vm/test.nix @@ -36,39 +36,4 @@ rec { ''; }); -/* - testFreeBSD = runInGenericVM { - name = "aterm-freebsd"; - src = aterm242fixes.src; - diskImage = "/tmp/freebsd-7.0.qcow"; - - postPreVM = '' - cp $src aterm.tar.bz2 - ''; - - buildCommand = '' - set > /tmp/my-env - . /mnt/saved-env - . /tmp/my-env - unset TEMP - unset TEMPDIR - unset TMP - unset TMPDIR - - set -x - - echo "Hello World!!!" - mkdir /mnt/out - echo "bar" > /mnt/out/foo - - cd /tmp - tar xvf /mnt/aterm.tar.bz2 - cd aterm-* - ./configure --prefix=/mnt/out - make - make install - ''; - }; -*/ - } From 8938d57025f9e5b46ecec62376e97a7b3836bb98 Mon Sep 17 00:00:00 2001 From: "Jason \\\"Don\\\" O'Conal" Date: Wed, 3 Jul 2013 09:13:28 +0000 Subject: [PATCH 266/798] heroku gem: add expression --- .../interpreters/ruby/generated.nix | 130 ++++++++++++++++++ 1 file changed, 130 insertions(+) diff --git a/pkgs/development/interpreters/ruby/generated.nix b/pkgs/development/interpreters/ruby/generated.nix index 2e899128252..77464bdce37 100644 --- a/pkgs/development/interpreters/ruby/generated.nix +++ b/pkgs/development/interpreters/ruby/generated.nix @@ -28,6 +28,7 @@ g: # Get dependencies from patched gems erubis = g.erubis_2_7_0; eventmachine = g.eventmachine_1_0_3; eventmachine_tail = g.eventmachine_tail_0_6_4; + excon = g.excon_0_25_0; execjs = g.execjs_1_4_0; fakes3 = g.fakes3_0_1_5; faraday = g.faraday_0_8_7; @@ -36,6 +37,8 @@ g: # Get dependencies from patched gems file_tail = g.file_tail_1_0_12; foreman = g.foreman_0_62_0; gettext = g.gettext_2_3_9; + heroku = g.heroku_2_39_4; + heroku_api = g.heroku_api_0_3_13; highline = g.highline_1_6_16; hike = g.hike_1_2_1; hoe = g.hoe_3_1_0; @@ -46,6 +49,7 @@ g: # Get dependencies from patched gems jsduck = g.jsduck_4_7_1; json = g.json_1_7_7; json_pure = g.json_pure_1_7_7; + launchy = g.launchy_2_3_0; libv8 = g.libv8_3_3_10_4; locale = g.locale_2_0_8; lockfile = g.lockfile_2_1_0; @@ -57,6 +61,7 @@ g: # Get dependencies from patched gems multipart_post = g.multipart_post_1_2_0; net_sftp = g.net_sftp_2_0_5; net_ssh = g.net_ssh_2_6_6; + netrc = g.netrc_0_7_7; nix = g.nix_0_1_1; nokogiri = g.nokogiri_1_5_9; papertrail = g.papertrail_0_9_7; @@ -72,9 +77,11 @@ g: # Get dependencies from patched gems railties = g.railties_3_2_13; rake = g.rake_10_0_4; rb_fsevent = g.rb_fsevent_0_9_3; + rb_readline = g.rb_readline_0_5_0; rdiscount = g.rdiscount_2_0_7_1; rdoc = g.rdoc_3_12_2; remote_syslog = g.remote_syslog_1_6_13; + rest_client = g.rest_client_1_6_7; right_aws = g.right_aws_3_0_5; right_http_connection = g.right_http_connection_1_3_0; rjb = g.rjb_1_4_6; @@ -222,6 +229,20 @@ adds support for IRIs and URI templates. requiredGems = [ ]; sha256 = ''0nn583ba8kq4hhpr4lr2zzpm4r0mga0zfalxxpa6a4v27q71v5hh''; }; + addressable_2_3_5 = { + basename = ''addressable''; + meta = { + description = ''URI Implementation''; + homepage = ''http://addressable.rubyforge.org/''; + longDescription = ''Addressable is a replacement for the URI implementation that is part of +Ruby's standard library. It more closely conforms to the relevant RFCs and +adds support for IRIs and URI templates. +''; + }; + name = ''addressable-2.3.5''; + requiredGems = [ ]; + sha256 = ''11hv69v6h39j7m4v51a4p7my7xwjbhxbsg3y7ja156z7by10wkg7''; + }; arel_3_0_2 = { basename = ''arel''; meta = { @@ -504,6 +525,17 @@ using TCP/IP, especially if custom protocols are required.''; requiredGems = [ g.eventmachine_1_0_3 ]; sha256 = ''1pvlb34vdzd81kf9f3xyibb4f55xjqm7lqqy28dgyci5cyv50y61''; }; + excon_0_25_0 = { + basename = ''excon''; + meta = { + description = ''speed, persistence, http(s)''; + homepage = ''https://github.com/geemus/excon''; + longDescription = ''EXtended http(s) CONnections''; + }; + name = ''excon-0.25.0''; + requiredGems = [ ]; + sha256 = ''0wv5bc7d138xw2v608ywl9cwhq7d7gl1l2hzdh96ia2a06hf4rry''; + }; execjs_1_4_0 = { basename = ''execjs''; meta = { @@ -593,6 +625,28 @@ So you can use GNU gettext tools for maintaining. requiredGems = [ g.locale_2_0_8 g.text_1_2_1 ]; sha256 = ''1i4kzkan7mnyr1ihphx0sqs3k4qj9i1ldg4a1cwf5h2fz657wvjj''; }; + heroku_2_39_4 = { + basename = ''heroku''; + meta = { + description = ''Client library and CLI to deploy apps on Heroku.''; + homepage = ''http://heroku.com/''; + longDescription = ''Client library and command-line tool to deploy and manage apps on Heroku.''; + }; + name = ''heroku-2.39.4''; + requiredGems = [ g.heroku_api_0_3_13 g.netrc_0_7_7 g.rest_client_1_6_7 g.launchy_2_3_0 g.rubyzip_0_9_9 g.rb_readline_0_5_0 ]; + sha256 = ''1dhj529kqk6q66406f7iwlxwsifndlzcm0513i0hzlhc4lbkbf4x''; + }; + heroku_api_0_3_13 = { + basename = ''heroku_api''; + meta = { + description = ''Ruby Client for the Heroku API''; + homepage = ''http://github.com/heroku/heroku.rb''; + longDescription = ''Ruby Client for the Heroku API''; + }; + name = ''heroku-api-0.3.13''; + requiredGems = [ g.excon_0_25_0 ]; + sha256 = ''179asf4rxjyg59zh5s7lcrnj7rrz9ymz1km24hdydgyay7px0yvi''; + }; highline_1_6_16 = { basename = ''highline''; meta = { @@ -753,6 +807,17 @@ For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf''; requiredGems = [ ]; sha256 = ''0jxp0amx9xhka0ixnhvfgwc5ydr82hkxp81pvw32z31arx7jrwl6''; }; + launchy_2_3_0 = { + basename = ''launchy''; + meta = { + description = ''Launchy is helper class for launching cross-platform applications in a fire and forget manner.''; + homepage = ''http://github.com/copiousfreetime/launchy''; + longDescription = ''Launchy is helper class for launching cross-platform applications in a fire and forget manner. There are application concepts (browser, email client, etc) that are common across all platforms, and they may be launched differently on each platform. Launchy is here to make a common approach to launching external application from within ruby programs.''; + }; + name = ''launchy-2.3.0''; + requiredGems = [ g.addressable_2_3_5 ]; + sha256 = ''0ckvs40f29ancs0ki12pqb94k380cz41b4gbjplm85ly6kd57sph''; + }; libv8_3_3_10_4 = { basename = ''libv8''; meta = { @@ -841,6 +906,38 @@ added from the the {LTSW collection}[http://www.ltsw.se/knbase/internet/mime.htp requiredGems = [ ]; sha256 = ''1qmx53a2kqk0nnhjbfvbc213wsxiprl0wqm7f2xvcsh253ld91iw''; }; + mime_types_1_23 = { + basename = ''mime_types''; + meta = { + description = ''This library allows for the identification of a file's likely MIME content type''; + homepage = ''http://mime-types.rubyforge.org/''; + longDescription = ''This library allows for the identification of a file's likely MIME content +type. This is release 1.23 that adds the ability to enumerate over the +collection of MIME types and updates the sources of a few MIME types. The +identification of MIME content type is based on a file's filename extensions. + +MIME types are used in MIME-compliant communications, as in e-mail or HTTP +traffic, to indicate the type of content which is transmitted. MIME::Types +provides the ability for detailed information about MIME entities (provided as +a set of MIME::Type objects) to be determined and used programmatically. There +are many types defined by RFCs and vendors, so the list is long but not +complete; don't hesitate to ask to add additional information. This library +follows the IANA collection of MIME types (see below for reference). + +MIME::Types for Ruby was originally based on and synchronized with MIME::Types +for Perl by Mark Overmeer, copyright 2001 - 2009. As of version 1.15, the data +format for the MIME::Type list has changed and the synchronization will no +longer happen. + +MIME::Types is built to conform to the MIME types of RFCs 2045 and 2231. It +follows the official {IANA registry}[http://www.iana.org/assignments/media-types/] +({ftp}[ftp://ftp.iana.org/assignments/media-types]) with some unofficial types +added from the the {LTSW collection}[http://www.ltsw.se/knbase/internet/mime.htp].''; + }; + name = ''mime-types-1.23''; + requiredGems = [ ]; + sha256 = ''1ch5ngx67nhbq6j1y79c88gzk6i8pzqi860iwfpxp9c0bwf6fags''; + }; minitar_0_5_3 = { basename = ''minitar''; meta = { @@ -907,6 +1004,17 @@ added from the the {LTSW collection}[http://www.ltsw.se/knbase/internet/mime.htp requiredGems = [ ]; sha256 = ''00fdnwv3jf311jjcc51lq8w26r62vzma91i79h5hj8i1ylrilx51''; }; + netrc_0_7_7 = { + basename = ''netrc''; + meta = { + description = ''Library to read and write netrc files.''; + homepage = ''https://github.com/geemus/netrc''; + longDescription = ''This library can read and update netrc files, preserving formatting including comments and whitespace.''; + }; + name = ''netrc-0.7.7''; + requiredGems = [ ]; + sha256 = ''1y64v93hsxdwgx3dfkyzdki3zqd1slm42dmi23v0zy3kap4vpard''; + }; nix_0_1_1 = { basename = ''nix''; meta = { @@ -1129,6 +1237,17 @@ request helpers feature.''; requiredGems = [ ]; sha256 = ''0bdnxwdxj4r1kdxfi5nszbsb126njrr81p912g64xxs2bgxd1bp1''; }; + rb_readline_0_5_0 = { + basename = ''rb_readline''; + meta = { + description = ''Pure-Ruby Readline Implementation''; + homepage = ''http://github.com/luislavena/rb-readline''; + longDescription = ''The readline library provides a pure Ruby implementation of the GNU readline C library, as well as the Readline extension that ships as part of the standard library.''; + }; + name = ''rb-readline-0.5.0''; + requiredGems = [ ]; + sha256 = ''1aixbqpwrlzvrii4c80982jih4syanc2jl0lfcbibqvjasy9h9c8''; + }; rdiscount_2_0_7_1 = { basename = ''rdiscount''; meta = { @@ -1165,6 +1284,17 @@ See RDoc for a description of RDoc's markup and basic use.''; requiredGems = [ g.servolux_0_10_0 g.file_tail_1_0_12 g.eventmachine_1_0_3 g.eventmachine_tail_0_6_4 g.syslog_protocol_0_9_2 g.em_resolv_replace_1_1_3 ]; sha256 = ''0q35j02k2l3fw3fdzq0i3rd6chsqr982gj13f3m3lsxm7kms03nw''; }; + rest_client_1_6_7 = { + basename = ''rest_client''; + meta = { + description = ''Simple HTTP and REST client for Ruby, inspired by microframework syntax for specifying actions.''; + homepage = ''http://github.com/archiloque/rest-client''; + longDescription = ''A simple HTTP and REST client for Ruby, inspired by the Sinatra microframework style of specifying actions: get, put, post, delete.''; + }; + name = ''rest-client-1.6.7''; + requiredGems = [ g.mime_types_1_23 ]; + sha256 = ''0nn7zalgidz2yj0iqh3xvzh626krm2al79dfiij19jdhp0rk8853''; + }; right_aws_3_0_5 = { basename = ''right_aws''; meta = { From 6f5e5cfe06d57db31c815b8b3c9d80be07dd2b9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 5 Jul 2013 14:22:01 +0200 Subject: [PATCH 267/798] kde4: unify used libcanberra I wondered why I'm getting two versions in the closure of KDE apps. --- pkgs/desktops/kde-4.10/kde-runtime.nix | 11 +---------- pkgs/desktops/kde-4.7/kde-runtime.nix | 2 +- pkgs/desktops/kde-4.8/kde-runtime.nix | 2 +- pkgs/top-level/all-packages.nix | 6 ++++++ 4 files changed, 9 insertions(+), 12 deletions(-) diff --git a/pkgs/desktops/kde-4.10/kde-runtime.nix b/pkgs/desktops/kde-4.10/kde-runtime.nix index 2282ee57c2c..a2fef65d75c 100644 --- a/pkgs/desktops/kde-4.10/kde-runtime.nix +++ b/pkgs/desktops/kde-4.10/kde-runtime.nix @@ -3,19 +3,10 @@ , networkmanager, kactivities, kdepimlibs, openexr, ilmbase, config }: -let libcanberraWithoutGTK = if (config ? kde_runtime && config.kde_runtime ? libcanberraWithoutGTK) - then config.kde_runtime.libcanberraWithoutGTK - else true; - - canberra = if libcanberraWithoutGTK - then libcanberra.override { gtk = null; } - else libcanberra; -in - kde { buildInputs = [ kdelibs attica xz bzip2 libssh libjpeg exiv2 ntrack - qca2 samba canberra pulseaudio + qca2 samba libcanberra pulseaudio networkmanager kactivities kdepimlibs openexr #todo: add openslp ]; diff --git a/pkgs/desktops/kde-4.7/kde-runtime.nix b/pkgs/desktops/kde-4.7/kde-runtime.nix index 9b25e77b083..b82ec2f6678 100644 --- a/pkgs/desktops/kde-4.7/kde-runtime.nix +++ b/pkgs/desktops/kde-4.7/kde-runtime.nix @@ -5,7 +5,7 @@ kde { buildInputs = [ kdelibs shared_desktop_ontologies bzip2 libssh exiv2 attica - samba (libcanberra.override { gtk = null; }) ntrack libjpeg + samba libcanberra ntrack libjpeg ]; passthru.propagatedUserEnvPackages = [ virtuoso ]; diff --git a/pkgs/desktops/kde-4.8/kde-runtime.nix b/pkgs/desktops/kde-4.8/kde-runtime.nix index f8246190462..b8f9afff7b3 100644 --- a/pkgs/desktops/kde-4.8/kde-runtime.nix +++ b/pkgs/desktops/kde-4.8/kde-runtime.nix @@ -6,7 +6,7 @@ kde { buildInputs = [ kdelibs shared_desktop_ontologies bzip2 libssh exiv2 attica xz networkmanager - samba (libcanberra.override { gtk = null; }) ntrack libjpeg qca2 pulseaudio + samba libcanberra ntrack libjpeg qca2 pulseaudio ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 00428a2ad7b..44df80361af 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4410,6 +4410,9 @@ let libcaca = callPackage ../development/libraries/libcaca { }; libcanberra = callPackage ../development/libraries/libcanberra { }; + libcanberra_kde = if (config.kde_runtime.libcanberraWithoutGTK or true) + then libcanberra.override { gtk = null; } + else libcanberra; libcello = callPackage ../development/libraries/libcello {}; @@ -9038,6 +9041,7 @@ let eigen = eigen2; libotr = libotr_3_2; libgphoto2 = libgphoto2_4; + libcanberra = libcanberra_kde; }) ../desktops/kde-4.7; kde48 = kdePackagesFor (pkgs.kde48 // { @@ -9045,6 +9049,7 @@ let eigen = eigen2; libotr = libotr_3_2; libgphoto2 = libgphoto2_4; + libcanberra = libcanberra_kde; }) ../desktops/kde-4.8; kde410 = kdePackagesFor (pkgs.kde410 // { @@ -9053,6 +9058,7 @@ let libotr = libotr_3_2; libusb = libusb1; ffmpeg = ffmpeg_1; + libcanberra = libcanberra_kde; }) ../desktops/kde-4.10; kdePackagesFor = self: dir: From 355092dcdc450507e28e4d39e7ff1b2933b71c9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 3 Apr 2013 16:07:01 +0200 Subject: [PATCH 268/798] kile: minor update --- pkgs/applications/editors/kile/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/kile/default.nix b/pkgs/applications/editors/kile/default.nix index 6b14b40a2c9..b428289b95d 100644 --- a/pkgs/applications/editors/kile/default.nix +++ b/pkgs/applications/editors/kile/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, kdelibs, cmake, gettext }: stdenv.mkDerivation rec { - name = "kile-2.1.2"; + name = "kile-2.1.3"; src = fetchurl { url = "mirror://sourceforge/kile/${name}.tar.bz2"; - sha256 = "0nx5fmjrxrndnzvknxnybd8qh15jzfxzbny2rljq3amjw02y9lc2"; + sha256 = "18nfi37s46v9xav7vyki3phasddgcy4m7nywzxis198vr97yqqx0"; }; nativeBuildInputs = [ cmake gettext ]; From 6726776c74019b8ee6c47c2cf35473db0908237b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 5 Jul 2013 13:09:43 +0200 Subject: [PATCH 269/798] kdiff3: maintenance update --- pkgs/tools/text/kdiff3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/kdiff3/default.nix b/pkgs/tools/text/kdiff3/default.nix index fc8813e7cec..52781ed3792 100644 --- a/pkgs/tools/text/kdiff3/default.nix +++ b/pkgs/tools/text/kdiff3/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, cmake, kdelibs, gettext }: stdenv.mkDerivation rec { - name = "kdiff3-0.9.96"; + name = "kdiff3-0.9.97"; src = fetchurl { url = "mirror://sourceforge/kdiff3/${name}.tar.gz"; - sha256 = "14fnflp5ansi7b59h8vn81mb8pdqpbanz0qzyw9sxk2pgp24xrqh"; + sha256 = "0ajsnzfr0aqzdiv5wqssxsgfv87v4g5c2zl16264v0cw8jxiddz3"; }; buildInputs = [ kdelibs ]; From 51a22a8f8ac56ad4c827ff89616d068315187689 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Fri, 5 Jul 2013 15:02:43 +0200 Subject: [PATCH 270/798] Add loopback network device and localhost entry to /etc/hosts for VM tests. --- pkgs/build-support/vm/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 097fcf21c1b..c184e8af0fa 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -99,6 +99,8 @@ rec { mount -t tmpfs none /dev ${createDeviceNodes "/dev"} + ifconfig lo up + mkdir /fs if test -z "$mountDisk"; then @@ -129,6 +131,7 @@ rec { mkdir -p /fs/etc ln -sf /proc/mounts /fs/etc/mtab + echo "127.0.0.1 localhost" > /fs/etc/hosts echo "Now running: $command" test -n "$command" From 7853c0c60a529ddb05774c7a8c2a5759b9688c81 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 2 Jul 2013 17:05:19 +0400 Subject: [PATCH 271/798] Update acpi-call for Linux 3.10 compatibility --- pkgs/os-specific/linux/acpi-call/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/acpi-call/default.nix b/pkgs/os-specific/linux/acpi-call/default.nix index 43902aded67..9fd8168948d 100644 --- a/pkgs/os-specific/linux/acpi-call/default.nix +++ b/pkgs/os-specific/linux/acpi-call/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation { src = fetchgit { url = "git://github.com/mkottman/acpi_call.git"; - rev = "b570c3b6c7016174107558464e864391d8bbd176"; - sha256 = "a89c62d391b721bb87a094f81cefc77d9c80de4bb314bb6ea449c3ef2decad5e"; + rev = "46dd97e115ddc7219c88b0818c4d5b235162fe6e"; + sha256 = "1bi0azd7xxhrivjhnmxllj2sfj12br56mxii20mnqdpqwyz0rhni"; }; preBuild = '' - sed -e 's/break/true/' -i test_off.sh - sed -e 's@/bin/bash@.bin/sh@' -i test_off.sh + sed -e 's/break/true/' -i examples/turn_off_gpu.sh + sed -e 's@/bin/bash@.bin/sh@' -i examples/turn_off_gpu.sh sed -e "s@/lib/modules/\$(.*)@${kernelDev}/lib/modules/${kernelDev.modDirVersion}@" -i Makefile ''; @@ -19,7 +19,7 @@ stdenv.mkDerivation { mkdir -p $out/lib/modules/${kernelDev.modDirVersion}/misc cp acpi_call.ko $out/lib/modules/${kernelDev.modDirVersion}/misc mkdir -p $out/bin - cp test_off.sh $out/bin/test_discrete_video_off.sh + cp examples/turn_off_gpu.sh $out/bin/test_discrete_video_off.sh chmod a+x $out/bin/test_discrete_video_off.sh ''; From b2e912fd8d0a5dd0a0d1cb941b8606220d49a4c6 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Fri, 5 Jul 2013 18:20:01 +0400 Subject: [PATCH 272/798] Update fdm --- pkgs/tools/networking/fdm/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/fdm/default.nix b/pkgs/tools/networking/fdm/default.nix index 052367400ef..a6700284af5 100644 --- a/pkgs/tools/networking/fdm/default.nix +++ b/pkgs/tools/networking/fdm/default.nix @@ -11,10 +11,10 @@ let (builtins.attrNames (builtins.removeAttrs x helperArgNames)); sourceInfo = rec { baseName="fdm"; - version="1.6"; + version="1.7"; name="${baseName}-${version}"; - url="http://downloads.sourceforge.net/${baseName}/${name}.tar.gz"; - hash="01ipxay4rv52ra2zzybf92x6n1hyklib94ncsg04k3rp4w5a8sbj"; + url="mirror://sourceforge/${baseName}/${baseName}/${name}.tar.gz"; + hash="0apg1jasn4m5j3vh0v9lr2l3lyzy35av1ylxr0wf8k0j9w4p8i28"; }; in rec { @@ -26,7 +26,7 @@ rec { inherit (sourceInfo) name version; inherit buildInputs; - phaseNames = ["fixInstall" "doMakeInstall"]; + phaseNames = ["doConfigure" "fixInstall" "doMakeInstall"]; makeFlags = ["PREFIX=$out"]; fixInstall = a.fullDepEntry ('' sed -i */Makefile -i Makefile -e 's@ -g bin @ @' From 20301af4975fe19942fbe37c9153fcc65cdd7b90 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 5 Jul 2013 17:29:04 +0200 Subject: [PATCH 273/798] testdisk: Add to channel --- pkgs/tools/misc/testdisk/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/testdisk/default.nix b/pkgs/tools/misc/testdisk/default.nix index 6ccfea50482..47734b4cd69 100644 --- a/pkgs/tools/misc/testdisk/default.nix +++ b/pkgs/tools/misc/testdisk/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation { name = "testdisk-6.13"; - + src = fetchurl { url = http://www.cgsecurity.org/testdisk-6.13.tar.bz2; sha256 = "087jrn41z3ymf1b6njl2bg99pr79v8l1f63f7rn5ni69vz6mq9s8"; @@ -13,6 +13,8 @@ stdenv.mkDerivation { meta = { homepage = http://www.cgsecurity.org/wiki/TestDisk; license = "GPLv2+"; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.eelco ]; longDescription = '' TestDisk is a program for data recovery, primarily designed to help recover lost partitions and/or make non-booting disks From da7db90068a435c754110f6aea315c7b6aca772b Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Fri, 5 Jul 2013 17:52:42 +0200 Subject: [PATCH 274/798] Add CentOS 6.4 to vm images --- pkgs/build-support/vm/default.nix | 46 +++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index c184e8af0fa..66998b34130 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -989,6 +989,30 @@ rec { packages = commonOpenSUSEPackages; }; + centos64i386 = { + name = "centos-6.4-i386"; + fullName = "CentOS 6.4 (i386)"; + packagesList = fetchurl { + url = http://mirror.centos.org/centos/6.4/os/i386/repodata/87aa4c4e19f9a3ec93e3d820f1ea6b6ece8810cb45f117a16354465e57a1b50d-primary.xml.gz; + sha256 = "03dml5bmwijlcfhigwa5rc88ikkfdgmg286qwf9yr8zr3574ral7"; + }; + urlPrefix = http://mirror.centos.org/centos/6.4/os/i386/ ; + archs = ["noarch" "i386"]; + packages = commonCentOSPackages; + }; + + centos64x86_64 = { + name = "centos-6.4-x86_64"; + fullName = "CentOS 6.4 (x86_64)"; + packagesList = fetchurl { + url = http://mirror.centos.org/centos/6.4/os/x86_64/repodata/4d4030b92f010f466eb4f004312b9f532b9e85e60c5e6421e8b429c180ac1efe-primary.xml.gz; + sha256 = "1zhymj0c2adlx0hn8phcws2rwaskkwmk217hnip4c3q15ywk0h2d"; + }; + urlPrefix = http://mirror.centos.org/centos/6.4/os/x86_64/ ; + archs = ["noarch" "x86_64"]; + packages = commonCentOSPackages; + }; + }; @@ -1417,6 +1441,28 @@ rec { "unzip" ]; + commonCentOSPackages = [ + "autoconf" + "automake" + "basesystem" + "bzip2" + "curl" + "diffutils" + "centos-release" + "findutils" + "gawk" + "gcc-c++" + "gzip" + "make" + "patch" + "perl" + "pkgconfig" + "procps" + "rpm" + "rpm-build" + "tar" + "unzip" + ]; /* Common packages for openSUSE images. */ commonOpenSUSEPackages = [ From 2da7f32b2527df7f8535c6502588da8b35460b68 Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Thu, 4 Jul 2013 19:13:36 +1000 Subject: [PATCH 275/798] install_name_tool: add expression --- .../darwin/install_name_tool/default.nix | 29 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ pkgs/top-level/python-packages.nix | 3 +- 3 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 pkgs/os-specific/darwin/install_name_tool/default.nix diff --git a/pkgs/os-specific/darwin/install_name_tool/default.nix b/pkgs/os-specific/darwin/install_name_tool/default.nix new file mode 100644 index 00000000000..6a7e6caaa26 --- /dev/null +++ b/pkgs/os-specific/darwin/install_name_tool/default.nix @@ -0,0 +1,29 @@ +{ stdenv }: + +assert stdenv.isDarwin; + +stdenv.mkDerivation { + name = "install_name_tool"; + src = "/usr/bin/install_name_tool"; + unpackPhase = "true"; + configurePhase = "true"; + buildPhase = "true"; + + installPhase = '' + mkdir -p "$out"/bin + ln -s "$src" "$out"/bin + ''; + + meta = with stdenv.lib; { + description = "Change dynamic shared library install names"; + homepage = https://developer.apple.com/library/mac/documentation/Darwin/Reference/Manpages/man1/install_name_tool.1.html; + maintainers = with maintainers; [ lovek323 ]; + platforms = platforms.darwin; + + longDescription = '' + Install_name_tool changes the dynamic shared library install names and or + adds, changes or deletes the rpaths recorded in a Mach-O binary. + ''; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6a85db38225..e7ff0d7b047 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -444,6 +444,8 @@ let apg = callPackage ../tools/security/apg { }; + install_name_tool = callPackage ../os-specific/darwin/install_name_tool { }; + xcodeenv = callPackage ../development/mobile/xcodeenv { }; titaniumenv_2_1 = import ../development/mobile/titaniumenv { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cba57b16739..9f4a2780301 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6190,7 +6190,8 @@ pythonPackages = python.modules // rec { sha256 = "1rvgrviwn6f037m8vq395chz6a1119dbsdhfwdbv5ambi0bak6ll"; }; - buildInputs = [ pkgs.libspotify ]; + buildInputs = [ pkgs.libspotify ] + ++ stdenv.lib.optional stdenv.isDarwin pkgs.install_name_tool; # python zip complains about old timestamps preConfigure = '' From 0f4f212adc498f57c5ff1f952fb93822efa48582 Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Thu, 4 Jul 2013 19:14:32 +1000 Subject: [PATCH 276/798] pyspotify: fix build on darwin * use install_name_tool to have _spotify.so point to the correct library --- pkgs/top-level/python-packages.nix | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9f4a2780301..2e56a26ec88 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6197,14 +6197,24 @@ pythonPackages = python.modules // rec { preConfigure = '' find -print0 | xargs -0 touch ''; + + postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + find "$out" -name _spotify.so -exec \ + install_name_tool -change \ + @loader_path/../Frameworks/libspotify.framework/libspotify \ + ${pkgs.libspotify}/lib/libspotify.dylib \ + {} \; + ''; # There are no tests doCheck = false; - meta = { - homepage = http://pyspotify.mopidy.com; + meta = with stdenv.lib; { + homepage = http://pyspotify.mopidy.com; description = "A Python interface to Spotify’s online music streaming service"; - maintainers = [ stdenv.lib.maintainers.rickynils ]; + license = licenses.unfree; + maintainers = with maintainers; [ lovek323 rickynils ]; + platforms = platforms.unix; }; }; From 1aad70826e8b4736d8d8a3dc4a67696c2338bb94 Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Sat, 6 Jul 2013 16:45:33 +1000 Subject: [PATCH 277/798] pyspotify: update to latest version --- pkgs/top-level/python-packages.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2e56a26ec88..2a65c8e8ecf 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6182,12 +6182,11 @@ pythonPackages = python.modules // rec { pyspotify = buildPythonPackage rec { name = "pyspotify-${version}"; - version = "1.10"; + version = "1.11"; - src = fetchgit { - url = "https://github.com/mopidy/pyspotify.git"; - rev = "refs/tags/v${version}"; - sha256 = "1rvgrviwn6f037m8vq395chz6a1119dbsdhfwdbv5ambi0bak6ll"; + src = fetchurl { + url = "https://github.com/mopidy/pyspotify/archive/v1.11.tar.gz"; + sha256 = "089ml6pqr3f2d15n70jpzbaqjp5pjgqlyv4algkxw92xscjw2izg"; }; buildInputs = [ pkgs.libspotify ] From 52ed09d210d3d6bcb1e3021058c3afe69a02a318 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 6 Jul 2013 10:34:17 +0200 Subject: [PATCH 278/798] pciutils: update This breaks udev145 due to enabling compression again, but I rather think we should remove udev145 (not used anywhere). --- pkgs/tools/system/pciutils/default.nix | 33 ++++++++++++-------------- 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/pkgs/tools/system/pciutils/default.nix b/pkgs/tools/system/pciutils/default.nix index 78ff9131fa8..3f63d077c7f 100644 --- a/pkgs/tools/system/pciutils/default.nix +++ b/pkgs/tools/system/pciutils/default.nix @@ -1,29 +1,26 @@ -{ stdenv, fetchurl, zlib }: - -stdenv.mkDerivation rec { - name = "pciutils-3.1.10"; - - src = fetchurl { - url = "mirror://kernel/software/utils/pciutils/${name}.tar.bz2"; - sha256 = "0xdahcxd00c921wnxi0f0w3lzjqdfphwa5vglfcpf0lv3l2w40pl"; - }; - - buildInputs = [ zlib ]; +{ stdenv, fetchurl, pkgconfig, zlib, kmod, which }: +let pciids = fetchurl { # Obtained from http://pciids.sourceforge.net/v2.2/pci.ids.bz2. url = http://tarballs.nixos.org/pci.ids.20120929.bz2; sha256 = "1q3i479ay88wam1zz1vbgkbqb2axg8av9qjxaigrqbnw2pv0srmb"; }; +in +stdenv.mkDerivation rec { + name = "pciutils-3.2.0"; - # Override broken auto-detect logic. - # Note: we can't compress pci.ids (ZLIB=yes) because udev requires - # an uncompressed pci.ids. - makeFlags = "ZLIB=no DNS=yes SHARED=yes PREFIX=\${out}"; + src = fetchurl { + url = "mirror://kernel/software/utils/pciutils/${name}.tar.bz2"; + sha256 = "0d9as9jzjjg5c1nwf58z1y1i7rf9fqxmww1civckhcvcn0xr85mq"; + }; - preBuild = '' - bunzip2 < $pciids > pci.ids - ''; + buildInputs = [ pkgconfig zlib kmod which ]; + + # currently up-to-date + #preBuild = "bunzip2 < ${pciids} > pci.ids"; + + makeFlags = "SHARED=yes PREFIX=\${out}"; installTargets = "install install-lib"; From 0a30727ca0f462f866a6fa1c0ef291dc4f42cac5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 6 Jul 2013 11:55:40 +0200 Subject: [PATCH 279/798] usbutils: update 006 -> 007 --- pkgs/os-specific/linux/usbutils/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/usbutils/default.nix b/pkgs/os-specific/linux/usbutils/default.nix index 3956b5e04d0..b7d139a534f 100644 --- a/pkgs/os-specific/linux/usbutils/default.nix +++ b/pkgs/os-specific/linux/usbutils/default.nix @@ -11,16 +11,17 @@ let in stdenv.mkDerivation rec { - name = "usbutils-006"; + name = "usbutils-007"; src = fetchurl { - url = mirror://kernel/linux/utils/usb/usbutils/usbutils-006.tar.xz; - sha256 = "03pd57vv8c6x0hgjqcbrxnzi14h8hcghmapg89p8k5zpwpkvbdfr"; + url = "mirror://kernel/linux/utils/usb/usbutils/${name}.tar.xz"; + sha256 = "197gpbxnspy6ncqv5mziaikcfqgb3irbqqlfwjgzvh5v4hbs14vm"; }; buildInputs = [ pkgconfig libusb1 ]; - preBuild = "bunzip2 < ${usbids} > usb.ids"; + # currently up-to-date + #preBuild = "bunzip2 < ${usbids} > usb.ids"; meta = { homepage = http://www.linux-usb.org/; From cd5f3dc1fa16a20f8bd909e80c1fe8f7cf148b1b Mon Sep 17 00:00:00 2001 From: "Jason \\\"Don\\\" O'Conal" Date: Sat, 6 Jul 2013 17:56:54 +1000 Subject: [PATCH 280/798] portaudio: fix build on darwin * remove alsaLib from build inputs * add --build=x86_64 to configure flags * add --without-oss to configure flags * add --enable-static to configure flags * add --enable-shared to configure flags * add framework header files * disable failed tests * copy all headers on install * build with gccApple --- .../libraries/portaudio/default.nix | 37 ++++++++++++++++--- pkgs/top-level/all-packages.nix | 8 +++- 2 files changed, 39 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/portaudio/default.nix b/pkgs/development/libraries/portaudio/default.nix index 89361bf3121..36e2e10ee08 100644 --- a/pkgs/development/libraries/portaudio/default.nix +++ b/pkgs/development/libraries/portaudio/default.nix @@ -8,13 +8,40 @@ stdenv.mkDerivation rec { sha256 = "168vmcag3c5y3zwf7h5298ydh83g72q5bznskrw9cr2h1lrx29lw"; }; - buildInputs = [ alsaLib pkgconfig ]; - - meta = { + buildInputs = [ pkgconfig ] + ++ stdenv.lib.optional (!stdenv.isDarwin) alsaLib; + + configureFlags = stdenv.lib.optionals stdenv.isDarwin + [ "--build=x86_64" "--without-oss" "--enable-static" "--enable-shared" ]; + + preBuild = stdenv.lib.optionalString stdenv.isDarwin '' + sed -i '50 i\ + #include \ + #include \ + #include ' \ + include/pa_mac_core.h + + # disable two tests that don't compile + sed -i -e 105d Makefile + sed -i -e 107d Makefile + ''; + + # not sure why, but all the headers seem to be installed by the make install + installPhase = if stdenv.isDarwin then '' + mkdir -p "$out" + cp -r include "$out" + cp -r lib "$out" + '' else '' + make install + ''; + + meta = with stdenv.lib; { description = "Portable cross-platform Audio API"; - homepage = http://www.portaudio.com/; + homepage = http://www.portaudio.com/; # Not exactly a bsd license, but alike - license = "BSD"; + license = licenses.bsd; + maintainers = with maintainers; [ lovek323 ]; + platforms = platforms.unix; }; passthru = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 44df80361af..eb7a79c7f69 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5149,7 +5149,13 @@ let popt = callPackage ../development/libraries/popt { }; - portaudio = callPackage ../development/libraries/portaudio { }; + portaudio = callPackage ../development/libraries/portaudio { + # resolves a variety of compile-time errors + stdenv = if stdenv.isDarwin + then clangStdenv + else stdenv; + }; + portaudioSVN = callPackage ../development/libraries/portaudio/svn-head.nix { }; prison = callPackage ../development/libraries/prison { }; From 5e45773df121f6262d5e8c89b0ed41476a7eff7d Mon Sep 17 00:00:00 2001 From: "Jason \\\"Don\\\" O'Conal" Date: Sat, 6 Jul 2013 18:00:45 +1000 Subject: [PATCH 281/798] pyaudio: fix build on darwin * build with '--static-link' flag * set 'PORTAUDIO_PATH' environment variable --- pkgs/top-level/python-packages.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cba57b16739..535949eb8f5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3481,10 +3481,14 @@ pythonPackages = python.modules // rec { buildInputs = [ python pkgs.portaudio ]; - installPhase = '' - python setup.py install --prefix=$out + buildPhase = if stdenv.isDarwin then '' + PORTAUDIO_PATH="${pkgs.portaudio}" python setup.py build --static-link + '' else '' + python setup.py build ''; + installPhase = "python setup.py install --prefix=$out"; + meta = { description = "Python bindings for PortAudio"; homepage = "http://people.csail.mit.edu/hubert/pyaudio/"; From c979360b528d927fc19539ed720ebb6b56a15ffd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 30 Jun 2013 14:32:36 +0200 Subject: [PATCH 282/798] Adding a wrapper for sflphone-gnome (to find gtk3 schema files) --- .../networking/instant-messengers/sflphone/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/sflphone/default.nix b/pkgs/applications/networking/instant-messengers/sflphone/default.nix index 79b554798ee..2401d796bfd 100644 --- a/pkgs/applications/networking/instant-messengers/sflphone/default.nix +++ b/pkgs/applications/networking/instant-messengers/sflphone/default.nix @@ -2,7 +2,7 @@ , commoncpp2, ccrtp, libzrtpcpp, dbus, dbus_cplusplus, expat, pcre, gsm, speex, ilbc, libopus , autoconf, automake, libtool, gettext, perl , cmake, qt4 -, gtk, glib, dbus_glib, libnotify, intltool }: +, gtk, glib, dbus_glib, libnotify, intltool, makeWrapper }: let name = "sflphone-1.2.3"; @@ -74,6 +74,11 @@ rec { cd gnome ''; - buildInputs = [ daemon pkgconfig gtk glib dbus_glib libnotify intltool ]; + # gtk3 programs have the runtime dependency on XDG_DATA_DIRS + postInstall = '' + wrapProgram $out/bin/sflphone* --prefix XDG_DATA_DIRS ":" ${gtk}/share + ''; + + buildInputs = [ daemon pkgconfig gtk glib dbus_glib libnotify intltool makeWrapper ]; }; } From be2dfd1b7225f96de63094ae2ea34b7bf787d5d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sat, 6 Jul 2013 14:33:32 +0200 Subject: [PATCH 283/798] Updating libzrtpcpp to 2.3.4. I think it fixes the security threats exposed in: http://blog.azimuthsecurity.com/2013/06/attacking-crypto-phones-weaknesses-in.html --- pkgs/development/libraries/libzrtpcpp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libzrtpcpp/default.nix b/pkgs/development/libraries/libzrtpcpp/default.nix index e6c4cafcd55..b18aa6848bf 100644 --- a/pkgs/development/libraries/libzrtpcpp/default.nix +++ b/pkgs/development/libraries/libzrtpcpp/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, openssl, pkgconfig, ccrtp }: stdenv.mkDerivation rec { - name = "libzrtpcpp-2.3.3"; + name = "libzrtpcpp-2.3.4"; src = fetchurl { url = "mirror://gnu/ccrtp/${name}.tar.gz"; - sha256 = "1p8i3qb4j1r64r7miva8hamaszk42kncpy1x5xlq1l0465h01rvg"; + sha256 = "020hfyrh8qdwkqdg1r1n65wdzj5i01ba9dzjghbm9lbz93gd9r83"; }; # We disallow 'lib64', or pkgconfig will not find it. From 525a6856f237add6fa07da4c19d7e7b6e5366dce Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Sun, 7 Jul 2013 18:54:33 +1000 Subject: [PATCH 284/798] otool and setfile: cleanup --- pkgs/development/libraries/wxGTK-2.9/default.nix | 6 +++--- .../tools/misc => os-specific/darwin}/otool/default.nix | 3 ++- .../misc/setFile => os-specific/darwin/setfile}/default.nix | 5 +++-- pkgs/top-level/all-packages.nix | 4 ++-- 4 files changed, 10 insertions(+), 8 deletions(-) rename pkgs/{development/tools/misc => os-specific/darwin}/otool/default.nix (93%) rename pkgs/{development/tools/misc/setFile => os-specific/darwin/setfile}/default.nix (91%) diff --git a/pkgs/development/libraries/wxGTK-2.9/default.nix b/pkgs/development/libraries/wxGTK-2.9/default.nix index e8a661a3389..f61c7eafd73 100644 --- a/pkgs/development/libraries/wxGTK-2.9/default.nix +++ b/pkgs/development/libraries/wxGTK-2.9/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gtk, libXinerama, libSM, libXxf86vm, xf86vidmodeproto -, gstreamer, gst_plugins_base, GConf, setFile +, gstreamer, gst_plugins_base, GConf, setfile , withMesa ? true, mesa ? null, compat24 ? false, compat26 ? true, unicode ? true, }: @@ -22,7 +22,7 @@ stdenv.mkDerivation { [ gtk libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer gst_plugins_base GConf ] ++ optional withMesa mesa - ++ optional stdenv.isDarwin setFile; + ++ optional stdenv.isDarwin setfile; nativeBuildInputs = [ pkgconfig ]; @@ -45,7 +45,7 @@ stdenv.mkDerivation { " + optionalString stdenv.isDarwin '' substituteInPlace configure --replace \ 'ac_cv_prog_SETFILE="/Developer/Tools/SetFile"' \ - 'ac_cv_prog_SETFILE="${setFile}/bin/SetFile"' + 'ac_cv_prog_SETFILE="${setfile}/bin/SetFile"' ''; postInstall = " diff --git a/pkgs/development/tools/misc/otool/default.nix b/pkgs/os-specific/darwin/otool/default.nix similarity index 93% rename from pkgs/development/tools/misc/otool/default.nix rename to pkgs/os-specific/darwin/otool/default.nix index 21eb2b591c2..c998253d148 100644 --- a/pkgs/development/tools/misc/otool/default.nix +++ b/pkgs/os-specific/darwin/otool/default.nix @@ -14,12 +14,13 @@ stdenv.mkDerivation { installPhase = '' mkdir -p "$out/bin" - cp /usr/bin/otool "$out/bin" + ln -s $src "$out/bin" ''; meta = with stdenv.lib; { description = "Object file displaying tool"; homepage = https://developer.apple.com/library/mac/documentation/Darwin/Reference/ManPages/man1/otool.1.html; + license = licenses.unfree; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.darwin; diff --git a/pkgs/development/tools/misc/setFile/default.nix b/pkgs/os-specific/darwin/setfile/default.nix similarity index 91% rename from pkgs/development/tools/misc/setFile/default.nix rename to pkgs/os-specific/darwin/setfile/default.nix index e3fbd2cbc6d..94320c94bc0 100644 --- a/pkgs/development/tools/misc/setFile/default.nix +++ b/pkgs/os-specific/darwin/setfile/default.nix @@ -4,7 +4,7 @@ assert stdenv.isDarwin; stdenv.mkDerivation { - name = "setFile"; + name = "setfile"; src = "/usr/bin/SetFile"; @@ -14,12 +14,13 @@ stdenv.mkDerivation { installPhase = '' mkdir -p "$out/bin" - cp $src "$out/bin" + ln -s $src "$out/bin" ''; meta = with stdenv.lib; { description = "Set attributes of files and directories"; homepage = "http://developer.apple.com/library/mac/#documentation/Darwin/Reference/ManPages/man1/setfile.1.html"; + license = licenses.unfree; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.darwin; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 44df80361af..e51251cea6c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -444,9 +444,9 @@ let apg = callPackage ../tools/security/apg { }; - otool = callPackage ../development/tools/misc/otool { }; + otool = callPackage ../os-specific/darwin/otool { }; - setFile = callPackage ../development/tools/misc/setFile { }; + setfile = callPackage ../os-specific/darwin/setfile { }; xcodeenv = callPackage ../development/mobile/xcodeenv { }; From 03f716d05e3a1d377459a3922ea12fe7a9ed66be Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Sun, 7 Jul 2013 19:21:45 +1000 Subject: [PATCH 285/798] autojump: fix build on darwin * remove install.sh shell check --- pkgs/tools/misc/autojump/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/tools/misc/autojump/default.nix b/pkgs/tools/misc/autojump/default.nix index 459c9c86ce4..9b9155a1edb 100644 --- a/pkgs/tools/misc/autojump/default.nix +++ b/pkgs/tools/misc/autojump/default.nix @@ -16,6 +16,9 @@ in dontBuild = true; installPhase = '' + # don't check shell support (we're running with bash anyway) + sed -i -e 150,153d install.sh + bash ./install.sh -d $out mkdir -p "$out/etc/bash_completion.d" From 0dd6c441834fbca7b916a50265ddd4257877fb58 Mon Sep 17 00:00:00 2001 From: "Jason \\\"Don\\\" O'Conal" Date: Sun, 7 Jul 2013 20:51:41 +1000 Subject: [PATCH 286/798] portaudio: fix license (fix #728) --- pkgs/development/libraries/portaudio/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/portaudio/default.nix b/pkgs/development/libraries/portaudio/default.nix index 36e2e10ee08..34d5bac6adb 100644 --- a/pkgs/development/libraries/portaudio/default.nix +++ b/pkgs/development/libraries/portaudio/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { description = "Portable cross-platform Audio API"; homepage = http://www.portaudio.com/; # Not exactly a bsd license, but alike - license = licenses.bsd; + license = licenses.mit; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; }; From ec9f54602e761c2a6b7ac7dd6ce58de907bd0ec9 Mon Sep 17 00:00:00 2001 From: "Jason \\\"Don\\\" O'Conal" Date: Sun, 7 Jul 2013 20:35:25 +1000 Subject: [PATCH 287/798] avahi: fix build on darwin --- pkgs/development/libraries/avahi/default.nix | 29 ++++++++++++-------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/avahi/default.nix b/pkgs/development/libraries/avahi/default.nix index 39a03e0b002..9c6c5b3f85a 100644 --- a/pkgs/development/libraries/avahi/default.nix +++ b/pkgs/development/libraries/avahi/default.nix @@ -1,5 +1,6 @@ { fetchurl, stdenv, pkgconfig, libdaemon, dbus, perl, perlXMLParser -, expat, gettext, intltool, glib, qt4 ? null, libiconvOrEmpty +, expat, gettext, intltool, glib, libiconvOrEmpty +, qt4 ? null , qt4Support ? false , withLibdnssdCompat ? false }: @@ -25,23 +26,29 @@ stdenv.mkDerivation rec { [ "--disable-qt3" "--disable-gdbm" "--disable-mono" "--disable-gtk" "--disable-gtk3" "--${if qt4Support then "enable" else "disable"}-qt4" - "--disable-python" - "--with-distro=none" "--localstatedir=/var" - ] ++ stdenv.lib.optional withLibdnssdCompat "--enable-compat-libdns_sd"; + "--disable-python" "--localstatedir=/var" "--with-distro=none" ] + ++ stdenv.lib.optional withLibdnssdCompat "--enable-compat-libdns_sd" + # autoipd won't build on darwin + ++ stdenv.lib.optional stdenv.isDarwin "--disable-autoipd"; - meta = { + preBuild = stdenv.lib.optionalString stdenv.isDarwin '' + sed -i '20 i\ + #define __APPLE_USE_RFC_2292' \ + avahi-core/socket.c + ''; + + meta = with stdenv.lib; { description = "Avahi, an mDNS/DNS-SD implementation"; + homepage = http://avahi.org; + license = licenses.lgpl2Plus; + platforms = platforms.unix; + maintainers = with maintainers; [ lovek323 ludo ]; + longDescription = '' Avahi is a system which facilitates service discovery on a local network. It is an implementation of the mDNS (for "Multicast DNS") and DNS-SD (for "DNS-Based Service Discovery") protocols. ''; - - homepage = http://avahi.org; - license = "LGPLv2+"; - - platforms = stdenv.lib.platforms.linux; # arbitrary choice - maintainers = [ stdenv.lib.maintainers.ludo ]; }; } From 3fe02f7c8b5b06b33ff037466d992aad44c7d817 Mon Sep 17 00:00:00 2001 From: "Jason \\\"Don\\\" O'Conal" Date: Sun, 7 Jul 2013 19:16:00 +1000 Subject: [PATCH 288/798] aescrypt: fix build on darwin * add libiconvOrEmpty to build inputs * add '-liconv' to LDFLAGS --- pkgs/tools/misc/aescrypt/default.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/misc/aescrypt/default.nix b/pkgs/tools/misc/aescrypt/default.nix index 8e2427d6139..bec0840490d 100644 --- a/pkgs/tools/misc/aescrypt/default.nix +++ b/pkgs/tools/misc/aescrypt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, libiconvOrEmpty }: stdenv.mkDerivation rec { version = "3.0.9"; @@ -19,14 +19,16 @@ stdenv.mkDerivation rec { cp aescrypt_keygen $out/bin ''; - buildInputs = []; + buildInputs = [ libiconvOrEmpty ]; + + NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-liconv"; - meta = { + meta = with stdenv.lib; { description = "A file encryption util that uses the industry standard Advanced Encryption Standard (AES) to easily and securely encrypt files"; - homepage = http://www.aescrypt.com/; - license = "GPLv2"; - platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.qknight ]; + homepage = http://www.aescrypt.com/; + license = licenses.gpl2; + maintainers = with maintainers; [ lovek323 qknight ]; + platforms = stdenv.lib.platforms.all; }; } From ccb7715de88f3bef875b6e9bae7994e1f72fa910 Mon Sep 17 00:00:00 2001 From: "Jason \\\"Don\\\" O'Conal" Date: Sun, 7 Jul 2013 19:02:56 +1000 Subject: [PATCH 289/798] apacheHttpd_2_4: fix build on darwin --- pkgs/servers/http/apache-httpd/2.4.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index da353212657..bbf84a852b8 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { optional libxml2Support libxml2; # Required for ‘pthread_cancel’. - NIX_LDFLAGS = "-lgcc_s"; + NIX_LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s"; configureFlags = '' --with-apr=${apr} @@ -58,11 +58,11 @@ stdenv.mkDerivation rec { inherit apr aprutil sslSupport proxySupport ldapSupport; }; - meta = { + meta = with stdenv.lib; { description = "Apache HTTPD, the world's most popular web server"; - homepage = "http://httpd.apache.org/"; - license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.simons ]; + homepage = http://httpd.apache.org/; + license = licenses.asl20; + platforms = stdenv.lib.platforms.unix; + maintainers = with maintainers; [ lovek323 simons ]; }; } From 24f6c85096e2b8096285467c92fef280b1accd65 Mon Sep 17 00:00:00 2001 From: "Jason \\\"Don\\\" O'Conal" Date: Sun, 7 Jul 2013 18:19:39 +1000 Subject: [PATCH 290/798] eyeD3: add expression --- pkgs/top-level/python-packages.nix | 82 ++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index be9089b49c0..7fdb2f187df 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -732,6 +732,28 @@ pythonPackages = python.modules // rec { }); + cogapp = buildPythonPackage rec { + version = "2.3"; + name = "cogapp-${version}"; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/c/cogapp/${name}.tar.gz"; + sha256 = "0gzmzbsk54r1qa6wd0yg4zzdxvn2f19ciprr2acldxaknzrpllnn"; + }; + + # there are no tests + doCheck = false; + + meta = with stdenv.lib; { + description = "A code generator for executing Python snippets in source files"; + homepage = http://nedbatchelder.com/code/cog; + license = licenses.mit; + maintainers = with maintainers; [ lovek323 ]; + platforms = platforms.unix; + }; + }; + + colorama = buildPythonPackage rec { name = "clientform-0.2.10"; @@ -1045,6 +1067,41 @@ pythonPackages = python.modules // rec { }; }; + + eyeD3 = buildPythonPackage rec { + version = "0.7.2"; + name = "eyeD3-${version}"; + + src = fetchurl { + url = http://eyed3.nicfit.net/releases/eyeD3-0.7.2.tgz; + sha256 = "1r0vxdflrj83s8jc5f2qg4p00k37pskn3djym0w73bvq167vkxar"; + }; + + buildInputs = [ paver ]; + + postInstall = '' + for prog in $out/bin/*; do + wrapProgram "$prog" --prefix PYTHONPATH : "$PYTHONPATH" + done + ''; + + meta = with stdenv.lib; { + description = "A Python module and command line program for processing ID3 tags"; + homepage = http://eyed3.nicfit.net/; + license = licenses.gpl2; + maintainers = with maintainers; [ lovek323 ]; + platforms = platforms.unix; + + longDescription = '' + eyeD3 is a Python module and command line program for processing ID3 + tags. Information about mp3 files (i.e bit rate, sample frequency, play + time, etc.) is also provided. The formats supported are ID3 v1.0/v1.1 + and v2.3/v2.4. + ''; + }; + }; + + fabric = buildPythonPackage rec { name = "fabric-1.6.1"; src = fetchurl { @@ -1077,6 +1134,31 @@ pythonPackages = python.modules // rec { }; + paver = buildPythonPackage rec { + version = "1.2.1"; + name = "Paver-${version}"; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/P/Paver/Paver-${version}.tar.gz"; + sha256 = "1b1023jks1gi1rwphdy3y2zx7dh4bvwk2050kclp95j7xym1ya0y"; + }; + + buildInputs = [ cogapp mock virtualenv ]; + + propagatedBuildInputs = [ nose ]; + + # the tests do not pass + doCheck = false; + + meta = with stdenv.lib; { + description = "A Python-based build/distribution/deployment scripting tool"; + homepage = http://github.com/paver/paver; + matinainers = with maintainers; [ lovek323 ]; + platforms = platforms.unix; + }; + }; + + peppercorn = buildPythonPackage rec { name = "peppercorn-0.4"; From f43003237a497a56c8e74d51e138d009475ea0be Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sun, 7 Jul 2013 22:44:58 +0200 Subject: [PATCH 291/798] linux-3.9: upgrade to 3.9.9 --- pkgs/os-specific/linux/kernel/linux-3.9.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.9.nix b/pkgs/os-specific/linux/kernel/linux-3.9.nix index 7803504d91e..c0441982dd3 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.9.nix @@ -258,7 +258,7 @@ in import ./generic.nix ( rec { - version = "3.9.8"; + version = "3.9.9"; testing = false; preConfigure = '' @@ -267,7 +267,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "0dfk3yrc6kcgywjgrj16lyi0m80847mn2l5sib8n5h2zadbdy0qy"; + sha256 = "1zrw65m8kvxjkqfj708s418qdm87x0axjm0mr6c2zas5fnla981k"; }; config = configWithPlatform stdenv.platform; From ad8a3b86abc1cef7e3180f3f0e3b7ac099077c33 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sun, 7 Jul 2013 22:40:20 +0200 Subject: [PATCH 292/798] linux-3.10: forward-port 9p speedup from 3.9 --- pkgs/os-specific/linux/kernel/linux-3.10.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/linux-3.10.nix b/pkgs/os-specific/linux/kernel/linux-3.10.nix index 8c48a5b6c84..bcf555201a2 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.10.nix @@ -247,6 +247,10 @@ let # Our initrd init uses shebang scripts, so can't be modular BINFMT_SCRIPT y + # Enable the 9P cache to speed up NixOS VM tests. + 9P_FSCACHE y + 9P_FS_POSIX_ACL y + ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""} ${extraConfig} ''; From e41456cebec86993d1f987faa2b5cedac784827b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 7 Jul 2013 15:32:29 +0200 Subject: [PATCH 293/798] python-gevent: new package gevent is a coroutine-based Python networking library that uses greenlet to provide a high-level synchronous API on top of the libevent event loop. Run tested. --- pkgs/top-level/python-packages.nix | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cba57b16739..e4a4b526283 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1903,6 +1903,27 @@ pythonPackages = python.modules // rec { }; }; + gevent = buildPythonPackage rec { + name = "gevent-0.13.8"; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/g/gevent/${name}.tar.gz"; + sha256 = "0plmxnb53qbxxf6macq84dvclsiyrpv3xrm32q4qqh6f01ix5f2l"; + }; + + buildInputs = [ pkgs.libevent ]; + propagatedBuildInputs = [ greenlet ]; + + meta = with stdenv.lib; { + description = "Coroutine-based networking library"; + homepage = http://www.gevent.org/; + license = licenses.mit; + platforms = platforms.linux; + maintainers = [ maintainers.bjornfor ]; + }; + }; + + genzshcomp = buildPythonPackage { name = "genzshcomp-0.2.2"; From 30bb106aa9fe616553f428ca84a19cee87334d93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 7 Jul 2013 19:12:46 +0200 Subject: [PATCH 294/798] python-pyodbc: new package The pyodbc module enables python programs to connect to almost any database using ODBC. Build and "import pyodbc" tested, but I haven't tried connecting to any database yet. --- pkgs/top-level/python-packages.nix | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e4a4b526283..ef8d2adaf41 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3800,6 +3800,26 @@ pythonPackages = python.modules // rec { }; + pyodbc = buildPythonPackage rec { + name = "pyodbc-3.0.6"; + + src = fetchurl { + url = "https://pyodbc.googlecode.com/files/${name}.zip"; + sha256 = "0v9nymllw5zq5294rqp8ip3l0g6l3l3mljwhxn5jajyzxlnz39z5"; + }; + + buildInputs = [ pkgs.unzip pkgs.libiodbc ]; + + meta = with stdenv.lib; { + description = "Python ODBC module to connect to almost any database"; + homepage = https://code.google.com/p/pyodbc/; + license = licenses.mit; + platforms = platforms.linux; + maintainers = [ maintainers.bjornfor ]; + }; + }; + + pyparsing = buildPythonPackage rec { name = "pyparsing-1.5.6"; From 0a0b15321a20f9ef84dd6d060205b60c36b72fa8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 7 Jul 2013 19:23:10 +0200 Subject: [PATCH 295/798] python-construct: new package Construct is a powerful declarative parser (and builder) for binary data. Run tested. --- pkgs/top-level/python-packages.nix | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ef8d2adaf41..f39d1846bbb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -814,6 +814,27 @@ pythonPackages = python.modules // rec { }; }); + + construct = buildPythonPackage rec { + name = "construct-2.5.1"; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/c/construct/${name}.tar.gz"; + sha256 = "08qksl87vr6g2wjxwsyrjh4w6v8bfmcgrcgln7irqvw5vv7qgqss"; + }; + + propagatedBuildInputs = [ six ]; + + meta = with stdenv.lib; { + description = "Powerful declarative parser (and builder) for binary data"; + homepage = http://construct.readthedocs.org/; + license = licenses.mit; + platforms = platforms.linux; + maintainers = [ maintainers.bjornfor ]; + }; + }; + + coverage = buildPythonPackage rec { name = "coverage-3.6"; From 5dd026a063eb6e1d38c5f838cfb644233715a3b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 7 Jul 2013 19:39:36 +0200 Subject: [PATCH 296/798] python-bitstring: new package bitstring is a python module for binary data manipulation. Run tested. --- pkgs/top-level/python-packages.nix | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f39d1846bbb..dd7b65faf4d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -451,6 +451,29 @@ pythonPackages = python.modules // rec { }; + bitstring = buildPythonPackage rec { + name = "bitstring-3.1.2"; + + src = fetchurl { + url = "https://python-bitstring.googlecode.com/files/${name}.zip"; + sha256 = "1i1p3rkj4ad108f23xyib34r4rcy571gy65paml6fk77knh0k66p"; + }; + + buildInputs = [ pkgs.unzip ]; + + # error: invalid command 'test' + doCheck = false; + + meta = with stdenv.lib; { + description = "Module for binary data manipulation"; + homepage = https://code.google.com/p/python-bitstring/; + license = licenses.mit; + platforms = platforms.linux; + maintainers = [ maintainers.bjornfor ]; + }; + }; + + blivet = buildPythonPackage rec { name = "blivet-${version}"; version = "0.17-1"; From 0360d4bfb63ded586430e7d64f2ec7941f13160c Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Mon, 8 Jul 2013 00:47:03 +0200 Subject: [PATCH 297/798] alot: updated to latest revision --- 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 7fdb2f187df..e4ffbd010d9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -197,13 +197,13 @@ pythonPackages = python.modules // rec { alot = buildPythonPackage rec { - rev = "d3c1880a60ddd8ded397d92cddf310a948b97fdc"; + rev = "0711cf8efaf1a4cca24617c3406210a415006457"; name = "alot-0.3.4_${rev}"; src = fetchurl { url = "https://github.com/pazz/alot/tarball/${rev}"; name = "${name}.tar.bz"; - sha256 = "049fzxs83zry5xr3al5wjvh7bcjq63wilf9wxh2c6sjmg96kpvvl"; + sha256 = "1rxkx9cjajsv9x1dl4xp1r3vr0kb66sglxaqzjiwaknqzahmmji5"; }; # error: invalid command 'test' From 6b6eaf3bf373d9b3fdaa0be43f5866bc21292f0b Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Mon, 8 Jul 2013 01:18:12 +0200 Subject: [PATCH 298/798] i3lock: updating to 2.5 --- pkgs/applications/window-managers/i3/lock.nix | 8 ++++---- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/window-managers/i3/lock.nix b/pkgs/applications/window-managers/i3/lock.nix index 2331b1eaf81..c37ed0d85f2 100644 --- a/pkgs/applications/window-managers/i3/lock.nix +++ b/pkgs/applications/window-managers/i3/lock.nix @@ -1,16 +1,16 @@ { fetchurl, stdenv, which, pkgconfig, libxcb, xcbutilkeysyms, xcbutilimage, - pam, libX11, libev, cairo }: + pam, libX11, libev, cairo, libxkbcommon, libxkbfile }: stdenv.mkDerivation rec { - name = "i3lock-2.4.1"; + name = "i3lock-2.5"; src = fetchurl { url = "http://i3wm.org/i3lock/${name}.tar.bz2"; - sha256 = "4d29e66841138de562e71903d31ecaaefd8ecffe5e68da0d6c8d560ed543047c"; + sha256 = "0xqdklvfcn2accwdbzsly7add0f3rh9sxjnahawas4zwwk4p49xc"; }; buildInputs = [ which pkgconfig libxcb xcbutilkeysyms xcbutilimage pam libX11 - libev cairo ]; + libev cairo libxkbcommon libxkbfile ]; makeFlags = "all"; installFlags = "PREFIX=\${out} SYSCONFDIR=\${out}/etc"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 78858e10634..f44a70f2211 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7692,6 +7692,7 @@ let i3 = callPackage ../applications/window-managers/i3 { }; i3lock = callPackage ../applications/window-managers/i3/lock.nix { + inherit (xorg) libxkbfile; cairo = cairo.override { xcbSupport = true; }; }; From e3a67bbb99f8c9d04aa0efae85cc8412d2380c97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Wed, 22 May 2013 10:44:32 +0200 Subject: [PATCH 299/798] diffuse: new package, close #731. Diffuse is a graphical diff and merge tool. http://diffuse.sourceforge.net/ --- .../version-management/diffuse/default.nix | 31 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/applications/version-management/diffuse/default.nix diff --git a/pkgs/applications/version-management/diffuse/default.nix b/pkgs/applications/version-management/diffuse/default.nix new file mode 100644 index 00000000000..92cdddd8dcb --- /dev/null +++ b/pkgs/applications/version-management/diffuse/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl, python, pygtk, makeWrapper }: + +stdenv.mkDerivation rec { + version = "0.4.7"; + name = "diffuse-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/project/diffuse/diffuse/${version}/${name}.tar.bz2"; + sha256 = "1b1riy9wix2gby78v9i30ijycjhkcyqsllggjakbkx26sb5nmxdh"; + }; + + buildInputs = [ python pygtk makeWrapper ]; + + buildPhase = '' + python ./install.py --prefix="$out" --sysconfdir="$out/etc" --pythonbin="${python}/bin/python" + wrapProgram "$out/bin/diffuse" --prefix PYTHONPATH : $PYTHONPATH:${pygtk}/lib/${python.libPrefix}/site-packages/gtk-2.0 + ''; + + # no-op, everything is done in buildPhase + installPhase = "true"; + + # NOTE: diffuse installs a .desktop file itself + + meta = with stdenv.lib; { + description = "Graphical diff and merge tool"; + homepage = http://diffuse.sourceforge.net/; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = [ maintainers.bjornfor ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f44a70f2211..c1629e31721 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7207,6 +7207,8 @@ let inherit (pkgs.gnome) libart_lgpl libgnomeui; }; + diffuse = callPackage ../applications/version-management/diffuse { }; + distrho = callPackage ../applications/audio/distrho {}; djvulibre = callPackage ../applications/misc/djvulibre { }; From f8783e18dca53dca5899ee1894fc6f04cb3822ef Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Mon, 8 Jul 2013 11:14:59 +0200 Subject: [PATCH 300/798] Add mongoose-schema-extend, passport-http, timezone, libyaml and i18next nodejs packages --- pkgs/top-level/node-packages-generated.nix | 240 +++++++++++++++------ pkgs/top-level/node-packages.json | 5 + 2 files changed, 177 insertions(+), 68 deletions(-) diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix index ec40cc2cb5c..4ff44f54155 100644 --- a/pkgs/top-level/node-packages-generated.nix +++ b/pkgs/top-level/node-packages-generated.nix @@ -563,9 +563,9 @@ } { baseName = "connect"; - version = "2.8.1"; - fullName = "connect-2.8.1"; - hash = "f838a4e8bccdf065cda7affe0118f018bdf1baa87375cd1df92e2cff29da2948"; + version = "2.8.3"; + fullName = "connect-2.8.3"; + hash = "a68c7f95eb1d8f574ffbba1c6ceaaa8a05189774099dcb327e29721f4514f309"; patchLatest = false; topLevel = false; dependencies = [ @@ -573,13 +573,14 @@ { name = "formidable"; range = "1.0.14"; } { name = "cookie-signature"; range = "1.0.1"; } { name = "buffer-crc32"; range = "0.2.1"; } - { name = "cookie"; range = "0.0.5"; } - { name = "send"; range = "0.1.1"; } + { name = "cookie"; range = "0.1.0"; } + { name = "send"; range = "0.1.2"; } { name = "bytes"; range = "0.2.0"; } { name = "fresh"; range = "0.1.0"; } { name = "pause"; range = "0.0.1"; } { name = "uid2"; range = "0.0.2"; } { name = "debug"; range = "*"; } + { name = "methods"; range = "0.0.1"; } ]; } { @@ -594,9 +595,9 @@ } { baseName = "connect-mongo"; - version = "0.3.2"; + version = "0.3.3"; fullName = "connect-mongo-*"; - hash = "1f37b52d7816769f33dfa94fad0323f8685139a3a01d738b7a29531f172f86b6"; + hash = "d3613f8e747b83ac1cc559366cba85c47fa391337166719ac87d98dd98bb2433"; patchLatest = false; topLevel = true; dependencies = [ @@ -605,9 +606,9 @@ } { baseName = "connect"; - version = "2.8.1"; + version = "2.8.3"; fullName = "connect-~2"; - hash = "f838a4e8bccdf065cda7affe0118f018bdf1baa87375cd1df92e2cff29da2948"; + hash = "a68c7f95eb1d8f574ffbba1c6ceaaa8a05189774099dcb327e29721f4514f309"; patchLatest = false; topLevel = false; dependencies = [ @@ -615,13 +616,14 @@ { name = "formidable"; range = "1.0.14"; } { name = "cookie-signature"; range = "1.0.1"; } { name = "buffer-crc32"; range = "0.2.1"; } - { name = "cookie"; range = "0.0.5"; } - { name = "send"; range = "0.1.1"; } + { name = "cookie"; range = "0.1.0"; } + { name = "send"; range = "0.1.2"; } { name = "bytes"; range = "0.2.0"; } { name = "fresh"; range = "0.1.0"; } { name = "pause"; range = "0.0.1"; } { name = "uid2"; range = "0.0.2"; } { name = "debug"; range = "*"; } + { name = "methods"; range = "0.0.1"; } ]; } { @@ -715,6 +717,16 @@ dependencies = [ ]; } + { + baseName = "cookies"; + version = "0.3.6"; + fullName = "cookies->= 0.2.2"; + hash = "e35b00cc06a33a3bc1d808daa7bc29f02674c02158c5dd812cf73f275bda8b83"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } { baseName = "cryptiles"; version = "0.1.3"; @@ -728,9 +740,9 @@ } { baseName = "cryptiles"; - version = "0.2.1"; + version = "0.2.2"; fullName = "cryptiles-0.2.x"; - hash = "a7ad8087bf6abbbfa0ae159756c04326a490f373212f6f2fd0f3a1f63f475892"; + hash = "ed3c2d5d3c1322d5389cceb46778a6c39a62842f737047666d63abda5b39fab5"; patchLatest = false; topLevel = false; dependencies = [ @@ -962,21 +974,21 @@ } { baseName = "express"; - version = "3.3.1"; + version = "3.3.3"; fullName = "express-*"; - hash = "8ca5ce06324343402e5186263c2dca3a28f055093bc6e7bd7270ce4a7356ae8b"; + hash = "ba67b79732082d24acebb38e273ce7749a86590d999bab2d5f2f9cc566ee8c9c"; patchLatest = false; topLevel = true; dependencies = [ - { name = "connect"; range = "2.8.1"; } - { name = "commander"; range = "0.6.1"; } + { name = "connect"; range = "2.8.3"; } + { name = "commander"; range = "1.2.0"; } { name = "range-parser"; range = "0.0.4"; } - { name = "mkdirp"; range = "0.3.4"; } + { name = "mkdirp"; range = "0.3.5"; } { name = "cookie"; range = "0.1.0"; } { name = "buffer-crc32"; range = "0.2.1"; } { name = "fresh"; range = "0.1.0"; } { name = "methods"; range = "0.0.1"; } - { name = "send"; range = "0.1.1"; } + { name = "send"; range = "0.1.2"; } { name = "cookie-signature"; range = "1.0.1"; } { name = "debug"; range = "*"; } ]; @@ -1044,9 +1056,9 @@ } { baseName = "faye-websocket"; - version = "0.6.0"; + version = "0.6.1"; fullName = "faye-websocket-*"; - hash = "192f09ecd1c52fc357d2ad3ae3121be35556b7b09e30ce74117d80b9dbae3f60"; + hash = "f99544759c7f0ae24f283d6e3e062d4ea816243985b88d00c8cd124ba617d7c5"; patchLatest = false; topLevel = true; dependencies = [ @@ -1320,6 +1332,16 @@ dependencies = [ ]; } + { + baseName = "growl"; + version = "1.5.1"; + fullName = "growl-1.5.x"; + hash = "81ad61e3f06d087da4c680e5e83a878f164925d3ed5a7f44b734e6ecd79cb8b0"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } { baseName = "growl"; version = "1.7.0"; @@ -1480,9 +1502,9 @@ } { baseName = "http-signature"; - version = "0.9.11"; - fullName = "http-signature-~0.9.11"; - hash = "44b89f3c1917bf02723a5720f08fbe47448e0370a5d3498d1be860eaf28beb3b"; + version = "0.10.0"; + fullName = "http-signature-~0.10.0"; + hash = "badaa47893d7a6c352ffb0746d68dd225fbb057b7d7149ad87093276445bf95b"; patchLatest = false; topLevel = false; dependencies = [ @@ -1501,6 +1523,17 @@ dependencies = [ ]; } + { + baseName = "i18next"; + version = "1.6.8"; + fullName = "i18next-*"; + hash = "5c2652a8efaaefa0d268e4cd02dd79742eb3c5a74725621d6b0f5a856db4210a"; + patchLatest = false; + topLevel = true; + dependencies = [ + { name = "cookies"; range = ">= 0.2.2"; } + ]; + } { baseName = "inherits"; version = "1.0.0"; @@ -1671,7 +1704,7 @@ { baseName = "kerberos"; version = "0.0.3"; - fullName = "kerberos-*"; + fullName = "kerberos-0.0.3"; hash = "40300bf5e4ca224127b7e88586dce003c58e59cf4972f699fdc95079135a76fe"; patchLatest = false; topLevel = false; @@ -1728,6 +1761,16 @@ dependencies = [ ]; } + { + baseName = "libyaml"; + version = "0.2.2"; + fullName = "libyaml-*"; + hash = "20bd05a1abc5ba18cc3b5de52bc44095fa59b03c6c3ffb6f46c55bd801cff3db"; + patchLatest = false; + topLevel = true; + dependencies = [ + ]; + } { baseName = "lru-cache"; version = "2.3.0"; @@ -1957,16 +2000,6 @@ dependencies = [ ]; } - { - baseName = "mkdirp"; - version = "0.3.4"; - fullName = "mkdirp-0.3.4"; - hash = "f87444f2376c56bf47846f3b885aae926c5d9504328923b166794b78c0e08425"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } { baseName = "mkdirp"; version = "0.3.5"; @@ -2025,6 +2058,21 @@ { name = "glob"; range = "3.2.1"; } ]; } + { + baseName = "mocha"; + version = "1.3.2"; + fullName = "mocha-~1.3.2"; + hash = "38bb1638122140c4c8986e02dd0c23105abedaca2ad8d2c8f3bc64bbfa7f6f53"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "commander"; range = "0.6.1"; } + { name = "growl"; range = "1.5.x"; } + { name = "jade"; range = "0.26.3"; } + { name = "diff"; range = "1.0.2"; } + { name = "debug"; range = "*"; } + ]; + } { baseName = "mongodb"; version = "1.2.14"; @@ -2038,26 +2086,26 @@ } { baseName = "mongodb"; - version = "1.3.10"; - fullName = "mongodb-1.3.10"; - hash = "ea6f279c0bebedec94f0d757fef775302dba6dd4a3792f59696d094bd2c2f113"; - patchLatest = true; + version = "1.3.11"; + fullName = "mongodb-1.3.11"; + hash = "cd00f9c0fafd280d30f9e604c76aa7eb59748521f5b0438c15ced90533376a62"; + patchLatest = false; topLevel = false; dependencies = [ { name = "bson"; range = "0.1.9"; } - { name = "kerberos"; range = "*"; } + { name = "kerberos"; range = "0.0.3"; } ]; } { baseName = "mongoose"; - version = "3.6.13"; + version = "3.6.14"; fullName = "mongoose-*"; - hash = "b6d79ace01b4acbabb0c07d4c053f6fdf4a6b7252cc506ccbbc7a6db5e6bbe36"; + hash = "eab35fb10f1da7a24a4b3c3c0edfea6941031e8d9e9b6120c683b736329a5781"; patchLatest = false; topLevel = true; dependencies = [ { name = "hooks"; range = "0.2.1"; } - { name = "mongodb"; range = "1.3.10"; } + { name = "mongodb"; range = "1.3.11"; } { name = "ms"; range = "0.1.0"; } { name = "sliced"; range = "0.0.3"; } { name = "muri"; range = "0.3.1"; } @@ -2066,6 +2114,18 @@ { name = "regexp-clone"; range = "0.0.1"; } ]; } + { + baseName = "mongoose-schema-extend"; + version = "0.1.3"; + fullName = "mongoose-schema-extend-*"; + hash = "f91e0851475ea525544bc65578e6ca55de345bc4c3332cc732fd3a66e1af1b1b"; + patchLatest = false; + topLevel = true; + dependencies = [ + { name = "owl-deepcopy"; range = "~0.0.1"; } + { name = "mocha"; range = "~1.3.2"; } + ]; + } { baseName = "monocle"; version = "0.1.48"; @@ -2242,9 +2302,9 @@ } { baseName = "node-gyp"; - version = "0.10.4"; + version = "0.10.5"; fullName = "node-gyp-*"; - hash = "b8bd44e4f5143fff5c22d5961982ae1504467dff17624be4525728c0500fd3a4"; + hash = "e52cdb18b2b457600b6c5178a6c5f3de6ec81b94cde85e14c0c8f6e58a2c041a"; patchLatest = false; topLevel = true; dependencies = [ @@ -2506,6 +2566,16 @@ dependencies = [ ]; } + { + baseName = "owl-deepcopy"; + version = "0.0.2"; + fullName = "owl-deepcopy-~0.0.1"; + hash = "69f76104c1f4610a4905ef7a184026850660b5e1fcaac9beb8ad0d6e4d54b58b"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } { baseName = "passport"; version = "0.1.17"; @@ -2518,6 +2588,18 @@ { name = "pause"; range = "0.0.1"; } ]; } + { + baseName = "passport-http"; + version = "0.2.2"; + fullName = "passport-http-*"; + hash = "3a333781016b3e20462fde18ebeb1d9794c6353564ee646b3008ce2540504d1f"; + patchLatest = false; + topLevel = true; + dependencies = [ + { name = "pkginfo"; range = "0.2.x"; } + { name = "passport"; range = "~0.1.3"; } + ]; + } { baseName = "passport-local"; version = "0.1.6"; @@ -2542,6 +2624,18 @@ { name = "pause"; range = "0.0.1"; } ]; } + { + baseName = "passport"; + version = "0.1.17"; + fullName = "passport-~0.1.3"; + hash = "65c15a1666abc16a86d586233f40b89b68b50bf88107809878742973af8b516e"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "pkginfo"; range = "0.2.x"; } + { name = "pause"; range = "0.0.1"; } + ]; + } { baseName = "pause"; version = "0.0.1"; @@ -2796,9 +2890,9 @@ } { baseName = "request"; - version = "2.21.0"; + version = "2.22.0"; fullName = "request-2"; - hash = "fe31c3119bc4423f07aa7c9849cb642d5ad22bdf2a2700eab56fb83fa8ed429c"; + hash = "d0a7ebc001800143d05cedf616cc164a31425bcbfdb8eb533b59d8c123b1275c"; patchLatest = false; topLevel = false; dependencies = [ @@ -2806,7 +2900,7 @@ { name = "json-stringify-safe"; range = "~4.0.0"; } { name = "forever-agent"; range = "~0.5.0"; } { name = "tunnel-agent"; range = "~0.3.0"; } - { name = "http-signature"; range = "~0.9.11"; } + { name = "http-signature"; range = "~0.10.0"; } { name = "hawk"; range = "~0.13.0"; } { name = "aws-sign"; range = "~0.3.0"; } { name = "oauth-sign"; range = "~0.3.0"; } @@ -2849,9 +2943,9 @@ } { baseName = "request"; - version = "2.21.0"; + version = "2.22.0"; fullName = "request-~2"; - hash = "fe31c3119bc4423f07aa7c9849cb642d5ad22bdf2a2700eab56fb83fa8ed429c"; + hash = "d0a7ebc001800143d05cedf616cc164a31425bcbfdb8eb533b59d8c123b1275c"; patchLatest = false; topLevel = false; dependencies = [ @@ -2859,7 +2953,7 @@ { name = "json-stringify-safe"; range = "~4.0.0"; } { name = "forever-agent"; range = "~0.5.0"; } { name = "tunnel-agent"; range = "~0.3.0"; } - { name = "http-signature"; range = "~0.9.11"; } + { name = "http-signature"; range = "~0.10.0"; } { name = "hawk"; range = "~0.13.0"; } { name = "aws-sign"; range = "~0.3.0"; } { name = "oauth-sign"; range = "~0.3.0"; } @@ -2973,9 +3067,9 @@ } { baseName = "semver"; - version = "2.0.8"; + version = "2.0.9"; fullName = "semver-*"; - hash = "7eefaea9185bc43025725a55179425f04abc80c33f9d90b10385e0bf54710876"; + hash = "cc1b4edd155fdec8638cf0acb90ba7855a9c8ea27f0a3ae2da21c12582d40050"; patchLatest = false; topLevel = true; dependencies = [ @@ -3003,9 +3097,9 @@ } { baseName = "semver"; - version = "2.0.8"; + version = "2.0.9"; fullName = "semver-~2.0.7"; - hash = "7eefaea9185bc43025725a55179425f04abc80c33f9d90b10385e0bf54710876"; + hash = "cc1b4edd155fdec8638cf0acb90ba7855a9c8ea27f0a3ae2da21c12582d40050"; patchLatest = false; topLevel = false; dependencies = [ @@ -3013,9 +3107,9 @@ } { baseName = "send"; - version = "0.1.1"; + version = "0.1.2"; fullName = "send-*"; - hash = "4d237af8bc86148952d0577bed44bd41928a4422c9a6e25e45fc35103aa6e872"; + hash = "d3fdea73a77e9f0f826e3fa5fa7ed7ef60a51912f5b976d4c112d7c52ac4668f"; patchLatest = false; topLevel = false; dependencies = [ @@ -3041,9 +3135,9 @@ } { baseName = "send"; - version = "0.1.1"; - fullName = "send-0.1.1"; - hash = "4d237af8bc86148952d0577bed44bd41928a4422c9a6e25e45fc35103aa6e872"; + version = "0.1.2"; + fullName = "send-0.1.2"; + hash = "d3fdea73a77e9f0f826e3fa5fa7ed7ef60a51912f5b976d4c112d7c52ac4668f"; patchLatest = false; topLevel = false; dependencies = [ @@ -3362,6 +3456,16 @@ dependencies = [ ]; } + { + baseName = "timezone"; + version = "0.0.21"; + fullName = "timezone-*"; + hash = "6f595e6376708b1c35d1dac3b3c1c44384b3928f7b3a4f33165817275548c8d1"; + patchLatest = false; + topLevel = true; + dependencies = [ + ]; + } { baseName = "transformers"; version = "2.0.1"; @@ -3445,9 +3549,9 @@ } { baseName = "underscore"; - version = "1.4.4"; + version = "1.5.1"; fullName = "underscore-*"; - hash = "a848a28193850d58d7b98249d70844bc7f35a7d8b6b5ed75e08e829aa6e763d3"; + hash = "40e2c86742d4af529cbb58f8cb68de128a18a32a78ab3b8bfa9f9a9544003018"; patchLatest = false; topLevel = true; dependencies = [ @@ -3465,9 +3569,9 @@ } { baseName = "underscore"; - version = "1.4.4"; + version = "1.5.1"; fullName = "underscore->=1.1.7"; - hash = "a848a28193850d58d7b98249d70844bc7f35a7d8b6b5ed75e08e829aa6e763d3"; + hash = "40e2c86742d4af529cbb58f8cb68de128a18a32a78ab3b8bfa9f9a9544003018"; patchLatest = false; topLevel = false; dependencies = [ @@ -3475,9 +3579,9 @@ } { baseName = "underscore"; - version = "1.4.4"; + version = "1.5.1"; fullName = "underscore->=1.4.3"; - hash = "a848a28193850d58d7b98249d70844bc7f35a7d8b6b5ed75e08e829aa6e763d3"; + hash = "40e2c86742d4af529cbb58f8cb68de128a18a32a78ab3b8bfa9f9a9544003018"; patchLatest = false; topLevel = false; dependencies = [ @@ -3614,9 +3718,9 @@ } { baseName = "websocket-driver"; - version = "0.2.1"; + version = "0.2.2"; fullName = "websocket-driver->=0.2.0"; - hash = "8aab2b32695fecd2bca57d95bc51f0eb8a9a5bb298187a8fe3a84cd2cd8e3dc7"; + hash = "2a5da351b8f716ef2595899b1e6911f739a420df64e65bfba2adf1fab42fe423"; patchLatest = false; topLevel = false; dependencies = [ diff --git a/pkgs/top-level/node-packages.json b/pkgs/top-level/node-packages.json index 1cf0d169dbd..640777cca29 100644 --- a/pkgs/top-level/node-packages.json +++ b/pkgs/top-level/node-packages.json @@ -43,10 +43,12 @@ , "view-helpers" , "redis" , "mongoose" +, "mongoose-schema-extend" , "connect-mongo" , "connect-flash" , "passport" , "passport-local" +, "passport-http" , "gzippo" , "walk" , "forever" @@ -54,4 +56,7 @@ , "supertest" , "should" , "nodemon" +, "timezone" +, "libyaml" +, "i18next" ] From 40ad1858915fcf167ab4305df6e5a107256bc08b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 8 Jul 2013 14:04:51 +0200 Subject: [PATCH 301/798] git: update to version 1.8.3.2 --- .../version-management/git-and-tools/git/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index f042b2e0faa..fcd3b77889d 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -10,7 +10,7 @@ let - version = "1.8.2.3"; + version = "1.8.3.2"; svn = subversionClient.override { perlBindings = true; }; @@ -21,7 +21,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://git-core.googlecode.com/files/git-${version}.tar.gz"; - sha1 = "2831f7deec472db4d0d0cdffb4d82d91cecdf295"; + sha256 = "0mfylhcdrh8prxkbs0gc877rmra2ks48bchg4hhaf2vpw9hpdf63"; }; patches = [ ./docbook2texi.patch ./symlinks-in-bin.patch ]; From 7b89bb2da4e3a854210706d9d4996ae2cfe3f70d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 8 Jul 2013 11:53:10 +0200 Subject: [PATCH 302/798] haskell-attoparsec-conduit: update to version 1.0.1.1 --- .../libraries/haskell/attoparsec-conduit/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix b/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix index 663a91b0c30..a08495db61b 100644 --- a/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix +++ b/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix @@ -3,14 +3,14 @@ cabal.mkDerivation (self: { pname = "attoparsec-conduit"; - version = "1.0.1"; - sha256 = "14b6ym5sjvg1x82ijydhrjk5445kg0fvwqzqwqld59akbqb6fpg5"; + version = "1.0.1.1"; + sha256 = "0v6d5a720fksvgaysbhqfzsq9a9h0l37yw3dbskxljbdy66gqsh0"; buildDepends = [ attoparsec conduit text transformers ]; testDepends = [ attoparsec conduit hspec resourcet text ]; meta = { homepage = "http://github.com/snoyberg/conduit"; description = "Consume attoparsec parsers via conduit"; - license = self.stdenv.lib.licenses.bsd3; + license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.andres ]; }; From 75e376120a4c3894fc49610caa77b8e722c7a8ff Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 8 Jul 2013 11:53:10 +0200 Subject: [PATCH 303/798] haskell-conduit: update to version 1.0.7.1 --- pkgs/development/libraries/haskell/conduit/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/conduit/default.nix b/pkgs/development/libraries/haskell/conduit/default.nix index 26d775772e0..be94e811e8d 100644 --- a/pkgs/development/libraries/haskell/conduit/default.nix +++ b/pkgs/development/libraries/haskell/conduit/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "conduit"; - version = "1.0.7"; - sha256 = "0nail476sz4dmr052sl5s14hkk336zp22hpgmr2qf141zzy8i2m1"; + version = "1.0.7.1"; + sha256 = "1j80kc1nwhsglh991rp9lfawlhr0kc8q8lzglfkda60f0nihiijy"; buildDepends = [ liftedBase mmorph monadControl mtl resourcet text transformers transformersBase void @@ -16,7 +16,7 @@ cabal.mkDerivation (self: { meta = { homepage = "http://github.com/snoyberg/conduit"; description = "Streaming data processing library"; - license = self.stdenv.lib.licenses.bsd3; + license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.andres ]; }; From ff42719fd7c9d4343615463935dee782e03f38d7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 8 Jul 2013 11:53:10 +0200 Subject: [PATCH 304/798] haskell-data-binary-ieee754: update to version 0.4.4 --- .../libraries/haskell/data-binary-ieee754/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/data-binary-ieee754/default.nix b/pkgs/development/libraries/haskell/data-binary-ieee754/default.nix index 5066a83c5f6..db9b90574e4 100644 --- a/pkgs/development/libraries/haskell/data-binary-ieee754/default.nix +++ b/pkgs/development/libraries/haskell/data-binary-ieee754/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "data-binary-ieee754"; - version = "0.4.3"; - sha256 = "0aba7qvjvhfp9cpr65j8zs62niv9yccrardk10aaqpkz3ihc86pm"; + version = "0.4.4"; + sha256 = "02nzg1barhqhpf4x26mpzvk7jd29nali033qy01adjplv2z5m5sr"; buildDepends = [ binary ]; meta = { homepage = "https://john-millikin.com/software/data-binary-ieee754/"; From 1d0fa2194416cd5f9f98eae94f537b6a4674070c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 8 Jul 2013 11:53:10 +0200 Subject: [PATCH 305/798] haskell-filesystem-conduit: update to version 1.0.0.1 --- .../libraries/haskell/filesystem-conduit/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/filesystem-conduit/default.nix b/pkgs/development/libraries/haskell/filesystem-conduit/default.nix index 46ae27fc090..f1a0554e380 100644 --- a/pkgs/development/libraries/haskell/filesystem-conduit/default.nix +++ b/pkgs/development/libraries/haskell/filesystem-conduit/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "filesystem-conduit"; - version = "1.0.0"; - sha256 = "1fz3iihcqpg6m3svjqdg8lvkpza955qn8cbs9b3w333vxkglhi6v"; + version = "1.0.0.1"; + sha256 = "04l8i97mr0jzkc7vc77j885n45qd2qyn5kmzxyckp3za96sjsqqw"; buildDepends = [ conduit systemFileio systemFilepath text transformers ]; @@ -15,7 +15,7 @@ cabal.mkDerivation (self: { meta = { homepage = "http://github.com/snoyberg/conduit"; description = "Use system-filepath data types with conduits"; - license = self.stdenv.lib.licenses.bsd3; + license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; }; }) From df2295fa5fe03138d50de499e327d4bf4357713a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 8 Jul 2013 11:53:10 +0200 Subject: [PATCH 306/798] haskell-hmatrix: update to version 0.15.0.0 --- pkgs/development/libraries/haskell/hmatrix/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/hmatrix/default.nix b/pkgs/development/libraries/haskell/hmatrix/default.nix index 2542e200586..eda7e1ff859 100644 --- a/pkgs/development/libraries/haskell/hmatrix/default.nix +++ b/pkgs/development/libraries/haskell/hmatrix/default.nix @@ -1,12 +1,12 @@ -{ cabal, binary, blas, gsl, liblapack, random, storableComplex -, vector +{ cabal, binary, blas, deepseq, gsl, liblapack, random +, storableComplex, vector }: cabal.mkDerivation (self: { pname = "hmatrix"; - version = "0.14.1.0"; - sha256 = "10fvbk3k2fgac46a86mc8g0s5gsw1p1bz4k57gn6dzgwh73mxjx7"; - buildDepends = [ binary random storableComplex vector ]; + version = "0.15.0.0"; + sha256 = "1n3m36kkgxhhmm7cmz4is9q558dw3l5h1laxnxwhs3cfdzfclyfs"; + buildDepends = [ binary deepseq random storableComplex vector ]; extraLibraries = [ blas gsl liblapack ]; meta = { homepage = "https://github.com/albertoruiz/hmatrix"; From 68c14a66bee95d466b970e0ccf3cd60d5104458a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 8 Jul 2013 11:53:10 +0200 Subject: [PATCH 307/798] haskell-network-conduit-tls: update to version 1.0.0.3 --- .../libraries/haskell/network-conduit-tls/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/network-conduit-tls/default.nix b/pkgs/development/libraries/haskell/network-conduit-tls/default.nix index 483271fe959..2785f9c5ab1 100644 --- a/pkgs/development/libraries/haskell/network-conduit-tls/default.nix +++ b/pkgs/development/libraries/haskell/network-conduit-tls/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "network-conduit-tls"; - version = "1.0.0.2"; - sha256 = "1vzhalz6hxal73rxm6f2l9m7j34mldamz16wrb6ay67wg6giq55z"; + version = "1.0.0.3"; + sha256 = "0gaws4spd50dmqjsxdxvjk5n5l0ib4q0brwnxrk725d3b3hanpz1"; buildDepends = [ aeson certificate conduit cryptoApi cryptoRandomApi network networkConduit pem systemFileio systemFilepath tls tlsExtra From 62afa83e715ffd8da168f8c4dc255a755bf1c7aa Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 8 Jul 2013 11:53:10 +0200 Subject: [PATCH 308/798] haskell-oeis: update to version 0.3.5 --- pkgs/development/libraries/haskell/oeis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/oeis/default.nix b/pkgs/development/libraries/haskell/oeis/default.nix index 0b26de00e05..d5ec97b6f6a 100644 --- a/pkgs/development/libraries/haskell/oeis/default.nix +++ b/pkgs/development/libraries/haskell/oeis/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "oeis"; - version = "0.3.4"; - sha256 = "15xn7cybk43lk8wjd22l3zwvkyrmlixpfyrxsy3rnvh0vmn0r25d"; + version = "0.3.5"; + sha256 = "0r23mqbfvvvx6shzdclzfrqi8r95gxl93cih7ny7w7px3w5yc5x6"; buildDepends = [ HTTP network ]; testDepends = [ HUnit testFramework testFrameworkHunit ]; meta = { From 8976670d9dd1ce826cba3cceb852029b93f29c1e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 8 Jul 2013 11:53:10 +0200 Subject: [PATCH 309/798] haskell-persistent: update to version 1.2.1.1 --- pkgs/development/libraries/haskell/persistent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/persistent/default.nix b/pkgs/development/libraries/haskell/persistent/default.nix index 7c4c1dba381..7a573139795 100644 --- a/pkgs/development/libraries/haskell/persistent/default.nix +++ b/pkgs/development/libraries/haskell/persistent/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "persistent"; - version = "1.2.1"; - sha256 = "1f01fvagjxqqycblq3z3z6qcas9vp9bgxnjz09173x4c9xvg3qj2"; + version = "1.2.1.1"; + sha256 = "12gn84svbi72122si9q61987wmb8zbam0x7jy2x20r2bbdfh50rv"; buildDepends = [ aeson attoparsec base64Bytestring blazeHtml blazeMarkup conduit liftedBase monadControl monadLogger pathPieces poolConduit From 5e867b6e808eb062884d65980ece8f59dbb66cb6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 8 Jul 2013 11:53:10 +0200 Subject: [PATCH 310/798] haskell-threadmanager: update to version 0.1.7 --- pkgs/development/libraries/haskell/threadmanager/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/threadmanager/default.nix b/pkgs/development/libraries/haskell/threadmanager/default.nix index 4641ec80f23..e4a82835c55 100644 --- a/pkgs/development/libraries/haskell/threadmanager/default.nix +++ b/pkgs/development/libraries/haskell/threadmanager/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "threadmanager"; - version = "0.1.6"; - sha256 = "16q09kx3rfjaa3rvyfwrxpsnvw50r3q8pk1if6xm0v4ya3lbvibs"; + version = "0.1.7"; + sha256 = "17s26hlailbr8c9d3dv1pwiy81m3nzr3sw0v9y716rmhldf7k09f"; meta = { description = "(deprecated in favor of 'threads') Simple thread management"; license = self.stdenv.lib.licenses.bsd3; From 31d4df10dc1d9e095406f823e6563d948dc3ad99 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 8 Jul 2013 11:53:10 +0200 Subject: [PATCH 311/798] haskell-yesod-auth: update to version 1.2.0.2 --- pkgs/development/libraries/haskell/yesod-auth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-auth/default.nix b/pkgs/development/libraries/haskell/yesod-auth/default.nix index 22f1c583011..3327dc1c08c 100644 --- a/pkgs/development/libraries/haskell/yesod-auth/default.nix +++ b/pkgs/development/libraries/haskell/yesod-auth/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "yesod-auth"; - version = "1.2.0.1"; - sha256 = "02nljkc12mgjhvkiv876w6w13q9s9iigya8v4jzj6myv48lainvd"; + version = "1.2.0.2"; + sha256 = "1vimv1zcpq167nd8fa3y0mrrwh1hqh2rqwmz5mg9zvqzz95wvhmh"; buildDepends = [ aeson authenticate blazeHtml blazeMarkup dataDefault emailValidate fileEmbed hamlet httpConduit httpTypes liftedBase mimeMail network From 56518d73b8abe1e1741abf3a28b81012785aa14c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 8 Jul 2013 11:53:11 +0200 Subject: [PATCH 312/798] haskell-yesod-platform: update to version 1.2.2 --- .../haskell/yesod-platform/default.nix | 58 ++++++++++--------- 1 file changed, 30 insertions(+), 28 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-platform/default.nix b/pkgs/development/libraries/haskell/yesod-platform/default.nix index fbec41ce124..20d45781631 100644 --- a/pkgs/development/libraries/haskell/yesod-platform/default.nix +++ b/pkgs/development/libraries/haskell/yesod-platform/default.nix @@ -1,21 +1,22 @@ { cabal, aeson, ansiTerminal, asn1Data, asn1Types, attoparsec , attoparsecConduit, authenticate, base64Bytestring , baseUnicodeSymbols, blazeBuilder, blazeBuilderConduit, blazeHtml -, blazeMarkup, byteorder, caseInsensitive, cereal, certificate -, cipherAes, cipherRc4, clientsession, conduit, cookie, cprngAes -, cryptoApi, cryptoConduit, cryptohash, cryptoNumbers, cryptoPubkey -, cryptoPubkeyTypes, cryptoRandomApi, cssText, dataDefault -, dataDefaultClass, dataDefaultInstancesBase +, blazeMarkup, byteable, byteorder, caseInsensitive, cereal +, certificate, cipherAes, cipherRc4, clientsession, conduit, cookie +, cprngAes, cryptoApi, cryptoConduit, cryptohash, cryptoNumbers +, cryptoPubkey, cryptoPubkeyTypes, cryptoRandomApi, cssText +, dataDefault, dataDefaultClass, dataDefaultInstancesBase , dataDefaultInstancesContainers, dataDefaultInstancesDlist , dataDefaultInstancesOldLocale, dateCache, dlist, emailValidate , entropy, failure, fastLogger, fileEmbed, filesystemConduit -, hamlet, hashable, hjsmin, hspec, hspecExpectations, htmlConduit -, httpConduit, httpDate, httpTypes, languageJavascript, liftedBase -, mimeMail, mimeTypes, mmorph, monadControl, monadLogger -, networkConduit, pathPieces, pem, persistent, persistentTemplate -, poolConduit, primitive, publicsuffixlist, pureMD5, pwstoreFast -, quickcheckIo, resourcePool, resourcet, safe, semigroups, setenv -, SHA, shakespeare, shakespeareCss, shakespeareI18n, shakespeareJs +, hamlet, hjsmin, hspec, hspecExpectations, htmlConduit +, httpAttoparsec, httpConduit, httpDate, httpTypes +, languageJavascript, liftedBase, mimeMail, mimeTypes, mmorph +, monadControl, monadLogger, networkConduit, pathPieces, pem +, persistent, persistentTemplate, poolConduit, primitive +, publicsuffixlist, pureMD5, pwstoreFast, quickcheckIo +, resourcePool, resourcet, safe, semigroups, setenv, SHA +, shakespeare, shakespeareCss, shakespeareI18n, shakespeareJs , shakespeareText, silently, simpleSendfile, skein, socks , stringsearch, systemFileio, systemFilepath, tagged, tagsoup , tagstreamConduit, tls, tlsExtra, transformersBase, unixCompat @@ -28,25 +29,26 @@ cabal.mkDerivation (self: { pname = "yesod-platform"; - version = "1.2.1"; - sha256 = "1wa1g37ipigscv8xwb5zyfawjw0fxqmwr2l6wdf507r0kvclk2ap"; + version = "1.2.2"; + sha256 = "18kgw094y3vzlpdn1rfrsrrqymhsw5y7kyrql3ghwgp0cm3fiks0"; buildDepends = [ aeson ansiTerminal asn1Data asn1Types attoparsec attoparsecConduit authenticate base64Bytestring baseUnicodeSymbols blazeBuilder - blazeBuilderConduit blazeHtml blazeMarkup byteorder caseInsensitive - cereal certificate cipherAes cipherRc4 clientsession conduit cookie - cprngAes cryptoApi cryptoConduit cryptohash cryptoNumbers - cryptoPubkey cryptoPubkeyTypes cryptoRandomApi cssText dataDefault - dataDefaultClass dataDefaultInstancesBase - dataDefaultInstancesContainers dataDefaultInstancesDlist - dataDefaultInstancesOldLocale dateCache dlist emailValidate entropy - failure fastLogger fileEmbed filesystemConduit hamlet hashable - hjsmin hspec hspecExpectations htmlConduit httpConduit httpDate - httpTypes languageJavascript liftedBase mimeMail mimeTypes mmorph - monadControl monadLogger networkConduit pathPieces pem persistent - persistentTemplate poolConduit primitive publicsuffixlist pureMD5 - pwstoreFast quickcheckIo resourcePool resourcet safe semigroups - setenv SHA shakespeare shakespeareCss shakespeareI18n shakespeareJs + blazeBuilderConduit blazeHtml blazeMarkup byteable byteorder + caseInsensitive cereal certificate cipherAes cipherRc4 + clientsession conduit cookie cprngAes cryptoApi cryptoConduit + cryptohash cryptoNumbers cryptoPubkey cryptoPubkeyTypes + cryptoRandomApi cssText dataDefault dataDefaultClass + dataDefaultInstancesBase dataDefaultInstancesContainers + dataDefaultInstancesDlist dataDefaultInstancesOldLocale dateCache + dlist emailValidate entropy failure fastLogger fileEmbed + filesystemConduit hamlet hjsmin hspec hspecExpectations htmlConduit + httpAttoparsec httpConduit httpDate httpTypes languageJavascript + liftedBase mimeMail mimeTypes mmorph monadControl monadLogger + networkConduit pathPieces pem persistent persistentTemplate + poolConduit primitive publicsuffixlist pureMD5 pwstoreFast + quickcheckIo resourcePool resourcet safe semigroups setenv SHA + shakespeare shakespeareCss shakespeareI18n shakespeareJs shakespeareText silently simpleSendfile skein socks stringsearch systemFileio systemFilepath tagged tagsoup tagstreamConduit tls tlsExtra transformersBase unixCompat unorderedContainers utf8Light From 5d06f7aa5ab32856dff4b40d309e81092eae70f5 Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 2 Jul 2013 16:57:10 +0200 Subject: [PATCH 313/798] pythonPackages: Add a callPackage attribute. This is to allow for easy overriding using .override and might be used by other python modules not directly in pythonPackages. Signed-off-by: aszlig --- pkgs/top-level/python-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b01af3f2cd3..ca3d7286628 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13,6 +13,8 @@ pythonPackages = python.modules // rec { # helpers + callPackage = pkgs.lib.callPackageWith (pkgs // pythonPackages); + buildPythonPackage = import ../development/python-modules/generic { inherit (pkgs) lib; inherit python wrapPython setuptools recursivePthLoader offlineDistutils; From 231b182c365f547ddaee30a8dc2eb04aa52bad4c Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 2 Jul 2013 17:00:39 +0200 Subject: [PATCH 314/798] python-blivet: Move into python-modules/blivet. This is in preparation for adding overridable function attributes. Signed-off-by: aszlig --- .../python-modules/blivet/default.nix | 46 ++++++++++++++++++ pkgs/top-level/python-packages.nix | 47 +------------------ 2 files changed, 48 insertions(+), 45 deletions(-) create mode 100644 pkgs/development/python-modules/blivet/default.nix diff --git a/pkgs/development/python-modules/blivet/default.nix b/pkgs/development/python-modules/blivet/default.nix new file mode 100644 index 00000000000..00018893eea --- /dev/null +++ b/pkgs/development/python-modules/blivet/default.nix @@ -0,0 +1,46 @@ +{ stdenv, fetchurl, buildPythonPackage, pykickstart, pyparted, pyblock +, libselinux, cryptsetup, multipath_tools, lsof, utillinux, udev +}: + +let + pyenable = { enablePython = true; }; + selinuxWithPython = libselinux.override pyenable; + cryptsetupWithPython = cryptsetup.override pyenable; +in buildPythonPackage rec { + name = "blivet-${version}"; + version = "0.17-1"; + + src = fetchurl { + url = "https://git.fedorahosted.org/cgit/blivet.git/snapshot/" + + "${name}.tar.bz2"; + sha256 = "0b28q539657mqif0mn5dfqcpqv7gbyszg83gf2fv6z7q6206rnx5"; + }; + + postPatch = '' + sed -i -e '/find_library/,/find_library/ { + c libudev = "${udev}/lib/libudev.so.1" + }' blivet/pyudev.py + sed -i -e 's|"multipath"|"${multipath_tools}/sbin/multipath"|' \ + blivet/devicelibs/mpath.py blivet/devices.py + sed -i -e '/"wipefs"/ { + s|wipefs|${utillinux}/sbin/wipefs| + s/-f/--force/ + }' blivet/formats/__init__.py + sed -i -e 's|"lsof"|"${lsof}/bin/lsof"|' blivet/formats/fs.py + sed -i -r -e 's|"(u?mount)"|"${utillinux}/bin/\1"|' blivet/util.py + sed -i '/pvscan/s/, *"--cache"//' blivet/devicelibs/lvm.py + ''; + + propagatedBuildInputs = [ + pykickstart pyparted pyblock udev selinuxWithPython cryptsetupWithPython + ]; + + # tests are currently _heavily_ broken upstream + doCheck = false; + + meta = { + homepage = "https://fedoraproject.org/wiki/Blivet"; + description = "Module for management of a system's storage configuration"; + license = [ "GPLv2+" "LGPLv2.1+" ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ca3d7286628..cffc7f25141 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -50,6 +50,8 @@ pythonPackages = python.modules // rec { # packages defined elsewhere + blivet = callPackage ../development/python-modules/blivet { }; + ipython = import ../shells/ipython { inherit (pkgs) stdenv fetchurl sip pyqt4; inherit buildPythonPackage pythonPackages; @@ -476,51 +478,6 @@ pythonPackages = python.modules // rec { }; - blivet = buildPythonPackage rec { - name = "blivet-${version}"; - version = "0.17-1"; - - src = fetchurl { - url = "https://git.fedorahosted.org/cgit/blivet.git/snapshot/" - + "${name}.tar.bz2"; - sha256 = "0b28q539657mqif0mn5dfqcpqv7gbyszg83gf2fv6z7q6206rnx5"; - }; - - postPatch = '' - sed -i -e '/find_library/,/find_library/ { - c libudev = "${pkgs.udev}/lib/libudev.so.1" - }' blivet/pyudev.py - sed -i -e 's|"multipath"|"${pkgs.multipath_tools}/sbin/multipath"|' \ - blivet/devicelibs/mpath.py blivet/devices.py - sed -i -e '/"wipefs"/ { - s|wipefs|${pkgs.utillinux}/sbin/wipefs| - s/-f/--force/ - }' blivet/formats/__init__.py - sed -i -e 's|"lsof"|"${pkgs.lsof}/bin/lsof"|' blivet/formats/fs.py - sed -i -r -e 's|"(u?mount)"|"${pkgs.utillinux}/bin/\1"|' blivet/util.py - sed -i '/pvscan/s/, *"--cache"//' blivet/devicelibs/lvm.py - ''; - - propagatedBuildInputs = let - pyenable = { enablePython = true; }; - selinuxWithPython = pkgs.libselinux.override pyenable; - cryptsetupWithPython = pkgs.cryptsetup.override pyenable; - in [ - pykickstart pyparted pkgs.udev pyblock - selinuxWithPython cryptsetupWithPython - ]; - - # tests are currently _heavily_ broken upstream - doCheck = false; - - meta = { - homepage = "https://fedoraproject.org/wiki/Blivet"; - description = "Module for management of a system's storage configuration"; - license = [ "GPLv2+" "LGPLv2.1+" ]; - }; - }; - - # euca2ools (and maybe Nova) needs boto 1.9, 2.0 doesn't work. boto_1_9 = buildPythonPackage (rec { name = "boto-1.9b"; From 513de0ff572e876454a892a96ce85a681193bb5a Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 2 Jul 2013 17:02:14 +0200 Subject: [PATCH 315/798] python-nixpart: Move into tools/filesystems/. Signed-off-by: aszlig --- pkgs/tools/filesystems/nixpart/default.nix | 21 +++++++++++++++++++++ pkgs/top-level/python-packages.nix | 22 ++-------------------- 2 files changed, 23 insertions(+), 20 deletions(-) create mode 100644 pkgs/tools/filesystems/nixpart/default.nix diff --git a/pkgs/tools/filesystems/nixpart/default.nix b/pkgs/tools/filesystems/nixpart/default.nix new file mode 100644 index 00000000000..6f787d0ba20 --- /dev/null +++ b/pkgs/tools/filesystems/nixpart/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, buildPythonPackage, blivet }: + +buildPythonPackage rec { + name = "nixpart-${version}"; + version = "0.2.0"; + + src = fetchurl { + url = "https://github.com/aszlig/nixpart/archive/v${version}.tar.gz"; + sha256 = "1z94h76jn9igksgr84wwbi03fjamwb15hg432x189kgsld1ark4n"; + }; + + propagatedBuildInputs = [ blivet ]; + + doCheck = false; + + meta = { + description = "NixOS storage manager/partitioner"; + license = stdenv.lib.licenses.gpl2Plus; + maintainers = [ stdenv.lib.maintainers.aszlig ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cffc7f25141..bbedf8a87cb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -65,6 +65,8 @@ pythonPackages = python.modules // rec { pylabQtSupport = false; }); + nixpart = callPackage ../tools/filesystems/nixpart { }; + pil = import ../development/python-modules/pil { inherit (pkgs) fetchurl stdenv libjpeg zlib freetype; inherit python buildPythonPackage; @@ -2909,26 +2911,6 @@ pythonPackages = python.modules // rec { }; }); - nixpart = buildPythonPackage rec { - name = "nixpart-${version}"; - version = "0.2.0"; - - src = fetchurl { - url = "https://github.com/aszlig/nixpart/archive/v${version}.tar.gz"; - sha256 = "1z94h76jn9igksgr84wwbi03fjamwb15hg432x189kgsld1ark4n"; - }; - - propagatedBuildInputs = [ blivet ]; - - doCheck = false; - - meta = { - description = "NixOS storage manager/partitioner"; - license = pkgs.lib.licenses.gpl2Plus; - maintainers = [ stdenv.lib.maintainers.aszlig ]; - }; - }; - nose = buildPythonPackage rec { name = "nose-1.2.1"; From ad9af11c1a0338d9d03d5c8267b0d367e9c9a7d6 Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 2 Jul 2013 17:16:19 +0200 Subject: [PATCH 316/798] python-blivet: Allow to use external udev. This allows blivet to be used outside of NixOS and with a different udev SO major number. Particularily, this is needed for the NixOps Hetzner backend which is coming soon :-) Signed-off-by: aszlig --- .../python-modules/blivet/default.nix | 23 +++++++++++++------ 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/blivet/default.nix b/pkgs/development/python-modules/blivet/default.nix index 00018893eea..564b89347b5 100644 --- a/pkgs/development/python-modules/blivet/default.nix +++ b/pkgs/development/python-modules/blivet/default.nix @@ -1,7 +1,12 @@ { stdenv, fetchurl, buildPythonPackage, pykickstart, pyparted, pyblock -, libselinux, cryptsetup, multipath_tools, lsof, utillinux, udev +, libselinux, cryptsetup, multipath_tools, lsof, utillinux +, useNixUdev ? true, udev ? null +# This is only used when useNixUdev is false +, udevSoMajor ? 1 }: +assert useNixUdev -> udev != null; + let pyenable = { enablePython = true; }; selinuxWithPython = libselinux.override pyenable; @@ -17,9 +22,6 @@ in buildPythonPackage rec { }; postPatch = '' - sed -i -e '/find_library/,/find_library/ { - c libudev = "${udev}/lib/libudev.so.1" - }' blivet/pyudev.py sed -i -e 's|"multipath"|"${multipath_tools}/sbin/multipath"|' \ blivet/devicelibs/mpath.py blivet/devices.py sed -i -e '/"wipefs"/ { @@ -29,11 +31,18 @@ in buildPythonPackage rec { sed -i -e 's|"lsof"|"${lsof}/bin/lsof"|' blivet/formats/fs.py sed -i -r -e 's|"(u?mount)"|"${utillinux}/bin/\1"|' blivet/util.py sed -i '/pvscan/s/, *"--cache"//' blivet/devicelibs/lvm.py - ''; + '' + (if useNixUdev then '' + sed -i -e '/find_library/,/find_library/ { + c libudev = "${udev}/lib/libudev.so.1" + }' blivet/pyudev.py + '' else '' + sed -i -e '/^somajor *=/s/=.*/= ${toString udevSoMajor}/p' \ + blivet/pyudev.py + ''); propagatedBuildInputs = [ - pykickstart pyparted pyblock udev selinuxWithPython cryptsetupWithPython - ]; + pykickstart pyparted pyblock selinuxWithPython cryptsetupWithPython + ] ++ stdenv.lib.optional useNixUdev udev; # tests are currently _heavily_ broken upstream doCheck = false; From b2311fbf3acbb8c747fd3002f2895f773c874c8a Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 2 Jul 2013 17:35:31 +0200 Subject: [PATCH 317/798] python-nixpart: Propagate overrides of blivet. This allows for easy overriding of blivets udev dependency using only nixpart.override. Signed-off-by: aszlig --- pkgs/tools/filesystems/nixpart/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/filesystems/nixpart/default.nix b/pkgs/tools/filesystems/nixpart/default.nix index 6f787d0ba20..6c13d38c6f9 100644 --- a/pkgs/tools/filesystems/nixpart/default.nix +++ b/pkgs/tools/filesystems/nixpart/default.nix @@ -1,6 +1,13 @@ -{ stdenv, fetchurl, buildPythonPackage, blivet }: +{ stdenv, fetchurl, buildPythonPackage, blivet +# Propagated to blivet +, useNixUdev ? null, udevSoMajor ? null +}: -buildPythonPackage rec { +let + blivetOverrides = stdenv.lib.filterAttrs (k: v: v != null) { + inherit useNixUdev udevSoMajor; + }; +in buildPythonPackage rec { name = "nixpart-${version}"; version = "0.2.0"; @@ -9,7 +16,7 @@ buildPythonPackage rec { sha256 = "1z94h76jn9igksgr84wwbi03fjamwb15hg432x189kgsld1ark4n"; }; - propagatedBuildInputs = [ blivet ]; + propagatedBuildInputs = [ (blivet.override blivetOverrides) ]; doCheck = false; From 1a9e99a8e4e9a0521b081958f03b2347d93178cd Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 4 Jul 2013 11:12:01 +0200 Subject: [PATCH 318/798] Add new package minmay in version 1.0.0. This is a fork of the iksemel library, which is no longer maintained and is highly broken in regards to TLS support (even in the release versions). Signed-off-by: aszlig --- pkgs/development/libraries/minmay/default.nix | 19 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/development/libraries/minmay/default.nix diff --git a/pkgs/development/libraries/minmay/default.nix b/pkgs/development/libraries/minmay/default.nix new file mode 100644 index 00000000000..4518b4dd760 --- /dev/null +++ b/pkgs/development/libraries/minmay/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, cmake, openssl }: + +stdenv.mkDerivation rec { + name = "minmay-${version}"; + version = "1.0.0"; + + src = fetchurl { + url = "https://github.com/mazhe/minmay/archive/1.0.0.tar.gz"; + sha256 = "1amycxvhbd0lv6j5zsvxiwrx29jvndcy856j3b3bisys24h95zw2"; + }; + + buildInputs = [ cmake openssl ]; + + meta = { + homepage = "https://github.com/mazhe/minmay"; + license = stdenv.lib.licenses.lgpl21Plus; + description = "An XMPP library (forked from the iksemel project)"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c1629e31721..e22640303fa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4953,6 +4953,8 @@ let ming = callPackage ../development/libraries/ming { }; + minmay = callPackage ../development/libraries/minmay { }; + mkvtoolnix = callPackage ../applications/video/mkvtoolnix { }; mlt = callPackage ../development/libraries/mlt { From 1182929a0b74720f772e2d8c6d84a7ccf59a881c Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 4 Jul 2013 11:16:02 +0200 Subject: [PATCH 319/798] zabbix20: Migrate XMPP support over to minmay. This should fix support for TLS and in addition, we now _only_ depend on one library rather than OpenSSL *and* GnuTLS as we no longer need iksemel. Signed-off-by: aszlig --- pkgs/servers/monitoring/zabbix/2.0.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/zabbix/2.0.nix b/pkgs/servers/monitoring/zabbix/2.0.nix index fef5010218c..90206f35853 100644 --- a/pkgs/servers/monitoring/zabbix/2.0.nix +++ b/pkgs/servers/monitoring/zabbix/2.0.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, postgresql, curl, openssl, zlib, gettext -, enableJabber ? false, iksemel ? null }: +, enableJabber ? false, minmay ? null }: -assert enableJabber -> iksemel != null; +assert enableJabber -> minmay != null; let @@ -37,7 +37,15 @@ in "--with-postgresql" "--with-libcurl" "--with-gettext" - ] ++ stdenv.lib.optional enableJabber "--with-jabber=${iksemel}"; + ] ++ stdenv.lib.optional enableJabber "--with-jabber=${minmay}"; + + postPatch = '' + sed -i -e 's/iksemel/minmay/g' configure src/libs/zbxmedia/jabber.c + sed -i \ + -e '/^static ikstransport/,/}/d' \ + -e 's/iks_connect_with\(.*\), &zbx_iks_transport/mmay_connect_via\1/' \ + -e 's/iks/mmay/g' -e 's/IKS/MMAY/g' src/libs/zbxmedia/jabber.c + ''; buildInputs = [ pkgconfig postgresql curl openssl zlib ]; From 6fcc6816e7c20f3a9fcaee0947e086febf9d8898 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sat, 6 Jul 2013 10:29:56 +0200 Subject: [PATCH 320/798] nixpart: Update to new version 0.2.1. This is a minor bugfix release and only corrects "type" in fileSystems output to "fsType". Signed-off-by: aszlig --- pkgs/tools/filesystems/nixpart/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/nixpart/default.nix b/pkgs/tools/filesystems/nixpart/default.nix index 6c13d38c6f9..8bf7222edd8 100644 --- a/pkgs/tools/filesystems/nixpart/default.nix +++ b/pkgs/tools/filesystems/nixpart/default.nix @@ -9,11 +9,11 @@ let }; in buildPythonPackage rec { name = "nixpart-${version}"; - version = "0.2.0"; + version = "0.2.1"; src = fetchurl { url = "https://github.com/aszlig/nixpart/archive/v${version}.tar.gz"; - sha256 = "1z94h76jn9igksgr84wwbi03fjamwb15hg432x189kgsld1ark4n"; + sha256 = "03v2n2cf9cq9brnxx3yx26nsm3fkgdhmkcm52s89g33c1rmzzgbk"; }; propagatedBuildInputs = [ (blivet.override blivetOverrides) ]; From 79b1f3069a7822e36eedf57a7e13833fa559422e Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 8 Jul 2013 03:57:23 +0200 Subject: [PATCH 321/798] chromium: Unset -Werror in gypFlags. Thanks to @jcumming for notifying me about this in #nixos: 03:47 < jack_c> aszlig: chromium builds with -Werror by default. 03:47 < jack_c> Putting: werror = ""; 03:48 < jack_c> into gypFlags fixes that.. ... 03:52 < jack_c> aszlig: agree -Werror is a good linting tool, but it should probably disabled for distribution. So, I guess it makes sense in our case, especially because different GCC versions will issue different warnings. Signed-off-by: aszlig --- pkgs/applications/networking/browsers/chromium/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index b5557cc1200..3f072b50994 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -145,6 +145,7 @@ in stdenv.mkDerivation rec { use_cups = cupsSupport; linux_sandbox_path="${libExecPath}/${packageName}_sandbox"; linux_sandbox_chrome_path="${libExecPath}/${packageName}"; + werror = ""; } // optionalAttrs proprietaryCodecs { # enable support for the H.264 codec proprietary_codecs = true; From d21493cf7d959ff7db86bffdb5f20ad8401b9cf6 Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 8 Jul 2013 07:30:45 +0200 Subject: [PATCH 322/798] python-nixpart: Add Hetzner-specific attribute. This is for NixOps and the corresponding Hetzner backend and allows for easy referencing by nix-build using the -A argument. Basically the Hetzner rescue system uses an older udev version from Debian, so we need to use shared object major number 0 here. Signed-off-by: aszlig --- pkgs/top-level/python-packages.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bbedf8a87cb..95be4c09fb6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -66,6 +66,10 @@ pythonPackages = python.modules // rec { }); nixpart = callPackage ../tools/filesystems/nixpart { }; + nixpartHetzner = nixpart.override { + useNixUdev = false; + udevSoMajor = 0; + }; pil = import ../development/python-modules/pil { inherit (pkgs) fetchurl stdenv libjpeg zlib freetype; From 82967d897ec5093a27b569cdfc4b6cbedce2c473 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Mon, 8 Jul 2013 15:30:05 +0200 Subject: [PATCH 323/798] Added stylus nodejs package --- pkgs/top-level/node-packages-generated.nix | 13 +++++++++++++ pkgs/top-level/node-packages.json | 1 + 2 files changed, 14 insertions(+) diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix index 4ff44f54155..6a74c807581 100644 --- a/pkgs/top-level/node-packages-generated.nix +++ b/pkgs/top-level/node-packages-generated.nix @@ -3349,6 +3349,19 @@ { name = "buffertools"; range = ">=1.1.1 <2.0.0"; } ]; } + { + baseName = "stylus"; + version = "0.33.1"; + fullName = "stylus-*"; + hash = "5db972473ed5d5d50ef4b76b019b35b8a6b368209a694ee2f94bb8d6c9f50245"; + patchLatest = false; + topLevel = true; + dependencies = [ + { name = "cssom"; range = "0.2.x"; } + { name = "mkdirp"; range = "0.3.x"; } + { name = "debug"; range = "*"; } + ]; + } { baseName = "stylus"; version = "0.27.2"; diff --git a/pkgs/top-level/node-packages.json b/pkgs/top-level/node-packages.json index 640777cca29..64e13d07696 100644 --- a/pkgs/top-level/node-packages.json +++ b/pkgs/top-level/node-packages.json @@ -59,4 +59,5 @@ , "timezone" , "libyaml" , "i18next" +, "stylus" ] From 58975755ea696f16c3560ad239cc743213f4d6bf Mon Sep 17 00:00:00 2001 From: Domen Kozar Date: Mon, 8 Jul 2013 13:58:31 +0200 Subject: [PATCH 324/798] add bpython --- pkgs/tools/networking/dd-agent/default.nix | 3 ++- pkgs/top-level/python-packages.nix | 19 +++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/dd-agent/default.nix b/pkgs/tools/networking/dd-agent/default.nix index ab0ba37daac..91061a457d4 100644 --- a/pkgs/tools/networking/dd-agent/default.nix +++ b/pkgs/tools/networking/dd-agent/default.nix @@ -10,6 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ python unzip ]; + propagatedBuildInputs = [ python ]; postUnpack = "export sourceRoot=$sourceRoot/packaging"; @@ -27,7 +28,7 @@ stdenv.mkDerivation rec { homepage = http://www.datadoghq.com; - maintainers = [ stdenv.lib.maintainers.shlevy ]; + maintainers = [ stdenv.lib.maintainers.shlevy stdenv.lib.maintainers.iElectric ]; license = stdenv.lib.licenses.bsd3; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 95be4c09fb6..cd77c014d44 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -483,6 +483,25 @@ pythonPackages = python.modules // rec { }; }; + bpython = buildPythonPackage rec { + name = "bpython-0.11"; + src = fetchurl { + url = "http://www.bpython-interpreter.org/releases/bpython-0.11.tar.gz"; + sha256 = "02dkmsmgy04l33nyw54rlxkjwff0yf3cy2kvdx8s5w344mqkkkv0"; + }; + + propagatedBuildInputs = [ python.modules.curses pygments ]; + doCheck = false; + + meta = { + description = "UNKNOWN"; + homepage = "UNKNOWN"; + maintainers = [ + stdenv.lib.maintainers.iElectric + ]; + }; + }; + # euca2ools (and maybe Nova) needs boto 1.9, 2.0 doesn't work. boto_1_9 = buildPythonPackage (rec { From d7d873fb95af64fda99f66fd0c56b4a7568ddaf2 Mon Sep 17 00:00:00 2001 From: Domen Kozar Date: Mon, 8 Jul 2013 21:08:40 +0200 Subject: [PATCH 325/798] add extundelete --- .../tools/filesystems/extundelete/default.nix | 21 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/tools/filesystems/extundelete/default.nix diff --git a/pkgs/tools/filesystems/extundelete/default.nix b/pkgs/tools/filesystems/extundelete/default.nix new file mode 100644 index 00000000000..16ad17aa243 --- /dev/null +++ b/pkgs/tools/filesystems/extundelete/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, e2fsprogs }: + +stdenv.mkDerivation rec { + version = "0.2.4"; + name = "extundelete-${version}"; + + src = fetchurl { + url = "http://downloads.sourceforge.net/project/extundelete/extundelete/0.2.4/extundelete-0.2.4.tar.bz2"; + sha256 = "1x0r7ylxlp9lbj3d7sqf6j2a222dwy2nfpff05jd6mkh4ihxvyd1"; + }; + + buildInputs = [ e2fsprogs ]; + + meta = with stdenv.lib; { + description = "utility that can recover deleted files from an ext3 or ext4 partition"; + homepage = http://extundelete.sourceforge.net/; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = [ maintainers.iElectric ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e22640303fa..bf546a23b09 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -786,6 +786,8 @@ let exiftags = callPackage ../tools/graphics/exiftags { }; + extundelete = callPackage ../tools/filesystems/extundelete { }; + expect = callPackage ../tools/misc/expect { }; fabric = pythonPackages.fabric; From 6e8a060bca385953fb47905a908b3048bf39bcc1 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Mon, 8 Jul 2013 07:01:21 +0200 Subject: [PATCH 326/798] spice: enable client this will split nicely once we merge multiple-outputs --- pkgs/development/libraries/spice/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/spice/default.nix b/pkgs/development/libraries/spice/default.nix index bcbe60ffa6d..dd16d6ef94e 100644 --- a/pkgs/development/libraries/spice/default.nix +++ b/pkgs/development/libraries/spice/default.nix @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-sasl=no" "--disable-smartcard" + "--enable-client" ]; postInstall = '' From f154735aefee5b73558cb7b298dfa7b08330d7fb Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Mon, 8 Jul 2013 12:09:06 +0200 Subject: [PATCH 327/798] freerdp: upgrade to 1.0.2 --- pkgs/applications/networking/remote/freerdp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/remote/freerdp/default.nix b/pkgs/applications/networking/remote/freerdp/default.nix index d8634e31dad..8f89d70405a 100644 --- a/pkgs/applications/networking/remote/freerdp/default.nix +++ b/pkgs/applications/networking/remote/freerdp/default.nix @@ -21,11 +21,11 @@ assert printerSupport -> cups != null; stdenv.mkDerivation rec { name = "freerdp-${version}"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { url = "https://github.com/FreeRDP/FreeRDP/archive/${version}.tar.gz"; - sha256 = "1my8gamvfrn6v9gcqxsa9cgxr42shc0l826zvxj8wpcay6gd321w"; + sha256 = "1w9dk7dsbppspnnms2xwwmbg7jm61i7aw5nkwzbpdyxngbgkgwf0"; }; buildInputs = [ From 2fd13d8fcafdc9291c385787bb8ef4778d3d814d Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 9 Jul 2013 07:37:39 +0200 Subject: [PATCH 328/798] Add new hetzner-nixops-installer package. This fixes a bunch of issues for the NixOps Hetzner backend, because over there, it's quite difficult to export the references graph without either duplicaing lots of code or make a bunch of workarounds. A detailed description about how it works can be found in the meta.longDescription attribute. Signed-off-by: aszlig --- .../misc/hetzner-nixops-installer/default.nix | 99 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 3 + 2 files changed, 102 insertions(+) create mode 100644 pkgs/tools/misc/hetzner-nixops-installer/default.nix diff --git a/pkgs/tools/misc/hetzner-nixops-installer/default.nix b/pkgs/tools/misc/hetzner-nixops-installer/default.nix new file mode 100644 index 00000000000..3322097ec77 --- /dev/null +++ b/pkgs/tools/misc/hetzner-nixops-installer/default.nix @@ -0,0 +1,99 @@ +{ stdenv, perl, gnutar, pathsFromGraph, nix, pythonPackages }: + +let + base = stdenv.mkDerivation { + name = "hetzner-nixops-base"; + + buildCommand = '' + ensureDir "$out/bin" + ln -s "${nix}"/bin/* "$out/bin/" + ln -s "${stdenv.shell}" "$out/bin/sh" + ''; + }; +in stdenv.mkDerivation { + name = "hetzner-nixops-installer"; + + exportReferencesGraph = [ + "refs-base" base + "refs-nixpart" pythonPackages.nixpartHetzner + ]; + + buildCommand = '' + ensureDir "usr/bin" + + # Create the chroot wrappers for Nix + for path in "${nix}"/bin/*; do + base="$(basename "$path")" + wrapper="usr/bin/$base" + echo "#!/bin/sh" > "$wrapper" + echo "chroot /mnt \"$path\" \$@" >> "$wrapper" + chmod +x "$wrapper" + done + + # Only a symlink that is goint to be put into the Tar file. + ln -ns "${pythonPackages.nixpartHetzner}/bin/nixpart" usr/bin/nixpart + + base_storepaths="$("${perl}/bin/perl" "${pathsFromGraph}" refs-base)" + base_registration="$(printRegistration=1 \ + "${perl}/bin/perl" "${pathsFromGraph}" refs-base)" + + ( # Don't use stdenv.shell here, we're NOT on NixOS! + echo "#!/bin/sh" + # Do not quote because we want to inline the paths! + echo 'mkdir -m 1777 -p "/mnt/nix/store"' + echo "cp -a" $base_storepaths "/mnt/nix/store/" + echo "chroot /mnt \"${base}/bin/nix-store\" --load-db <<'REGINFO'" + echo "$base_registration" + echo "REGINFO" + echo 'ln -sn "${stdenv.shell}" /mnt/bin/sh' + ) > "usr/bin/activate-remote" + chmod +x "usr/bin/activate-remote" + + full_storepaths="$("${perl}/bin/perl" "${pathsFromGraph}" refs-*)" + stripped_full_storepaths="$(echo "$full_storepaths" | sed 's|/*||')" + + ( echo "#!${stdenv.shell}" + echo 'tarfile="$(mktemp)"' + echo 'trap "rm -f $tarfile" EXIT' + echo "lnum=\"\$(grep -m1 -an '^EXISTING_TAR${"\$"}' \"$out\")\"" + echo 'tail -n +$((''${lnum%%:*} + 1)) "'"$out"'" > "$tarfile"' + # As before, don't quote here! + echo '${gnutar}/bin/tar rf "$tarfile" -C /' $stripped_full_storepaths + echo 'cat "$tarfile"' + echo "exit 0" + echo EXISTING_TAR + tar c usr + ) > "$out" + chmod +x "$out" + ''; + + meta = { + description = "Basic Nix bootstrap installer for NixOps"; + longDescription = '' + It works like this: + + Preapare a base image with reference graph, which is to be copied over to + the mount point and contains wrappers for the system outside the mount + point. Those wrappers basically just chroot into the mountpoint path and + execute the corresponding counterparts over there. The base derivation + itself only contains everything necessary in order to get a Nix + bootstrapped, like Nix itself and a shell linked to /mnt/bin/sh. + + From outside the mountpoint, we just provide a small derivation which + contains a partitioner, an activate-remote and a script which is the + output of this derivation. In detail: + + $out: Creates a tarball of of the full closure of the base derivation and + its reference information, the partitioner and activate-remote. The + script outputs the tarball on stdout, so it's easy for NixOps to + pipe it to the remote system. + + activate-remote: Copies the base derivation into /mnt and registers it + with the Nix database. Afterwards, it creates the + mentioned chroot wrappers and puts them into /usr/bin + (remember, we're on a non-NixOS system here), together + with the partitioner. + ''; + maintainer = stdenv.lib.maintainers.aszlig; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bf546a23b09..027172935ae 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7683,6 +7683,9 @@ let hexedit = callPackage ../applications/editors/hexedit { }; + hetznerNixOpsInstaller = + callPackage ../tools/misc/hetzner-nixops-installer { }; + hipchat = callPackage_i686 ../applications/networking/instant-messengers/hipchat { }; homebank = callPackage ../applications/office/homebank { }; From d58a5eb5729656661ef68c65f3fef139d1154335 Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 9 Jul 2013 07:42:34 +0200 Subject: [PATCH 329/798] Move nixpartHetzner into hetzner-nixops-installer. This should keep all Hetzner/NixOps specific stuff in one place. Signed-off-by: aszlig --- pkgs/tools/misc/hetzner-nixops-installer/default.nix | 9 +++++++-- pkgs/top-level/python-packages.nix | 4 ---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/misc/hetzner-nixops-installer/default.nix b/pkgs/tools/misc/hetzner-nixops-installer/default.nix index 3322097ec77..e1b122c9a86 100644 --- a/pkgs/tools/misc/hetzner-nixops-installer/default.nix +++ b/pkgs/tools/misc/hetzner-nixops-installer/default.nix @@ -1,6 +1,11 @@ { stdenv, perl, gnutar, pathsFromGraph, nix, pythonPackages }: let + nixpart = pythonPackages.nixpart.override { + useNixUdev = false; + udevSoMajor = 0; + }; + base = stdenv.mkDerivation { name = "hetzner-nixops-base"; @@ -15,7 +20,7 @@ in stdenv.mkDerivation { exportReferencesGraph = [ "refs-base" base - "refs-nixpart" pythonPackages.nixpartHetzner + "refs-nixpart" nixpart ]; buildCommand = '' @@ -31,7 +36,7 @@ in stdenv.mkDerivation { done # Only a symlink that is goint to be put into the Tar file. - ln -ns "${pythonPackages.nixpartHetzner}/bin/nixpart" usr/bin/nixpart + ln -ns "${nixpart}/bin/nixpart" usr/bin/nixpart base_storepaths="$("${perl}/bin/perl" "${pathsFromGraph}" refs-base)" base_registration="$(printRegistration=1 \ diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cd77c014d44..65320967e07 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -66,10 +66,6 @@ pythonPackages = python.modules // rec { }); nixpart = callPackage ../tools/filesystems/nixpart { }; - nixpartHetzner = nixpart.override { - useNixUdev = false; - udevSoMajor = 0; - }; pil = import ../development/python-modules/pil { inherit (pkgs) fetchurl stdenv libjpeg zlib freetype; From 99e4890e9e6add5e967393334c2efd56c489ab89 Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 9 Jul 2013 08:23:25 +0200 Subject: [PATCH 330/798] hetzner-nixops-installer: Reset helper timestamps. This should prevent some annoying messages such as: tar: usr/bin/nix-build: time stamp 2013-07-09 07:45:19 is 0.159248271 s in the f uture tar: usr/bin/nix-channel: time stamp 2013-07-09 07:45:19 is 0.159088763 s in the future tar: usr/bin/nix-collect-garbage: time stamp 2013-07-09 07:45:19 is 0.15901664 s in the future tar: usr/bin/nix-copy-closure: time stamp 2013-07-09 07:45:19 is 0.158948028 s i n the future tar: usr/bin/nix-daemon: time stamp 2013-07-09 07:45:19 is 0.158888042 s in the future Signed-off-by: aszlig --- pkgs/tools/misc/hetzner-nixops-installer/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/tools/misc/hetzner-nixops-installer/default.nix b/pkgs/tools/misc/hetzner-nixops-installer/default.nix index e1b122c9a86..f671ea8afcb 100644 --- a/pkgs/tools/misc/hetzner-nixops-installer/default.nix +++ b/pkgs/tools/misc/hetzner-nixops-installer/default.nix @@ -57,6 +57,9 @@ in stdenv.mkDerivation { full_storepaths="$("${perl}/bin/perl" "${pathsFromGraph}" refs-*)" stripped_full_storepaths="$(echo "$full_storepaths" | sed 's|/*||')" + # Reset timestamps to those of 'nix-store' to prevent annoying warnings. + find usr -exec touch -h -r "${nix}/bin/nix-store" {} + + ( echo "#!${stdenv.shell}" echo 'tarfile="$(mktemp)"' echo 'trap "rm -f $tarfile" EXIT' From 3e70cde4debaa88bb8d399b253ef5bc3988c9ddd Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 9 Jul 2013 11:19:02 +0200 Subject: [PATCH 331/798] nvidia-x11: Update to 319.32 --- pkgs/os-specific/linux/nvidia-x11/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 809ae316516..b5d8abab241 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -8,7 +8,7 @@ with stdenv.lib; -let versionNumber = "319.17"; in +let versionNumber = "319.32"; in stdenv.mkDerivation { name = "nvidia-x11-${versionNumber}${optionalString (!libsOnly) "-${kernelDev.version}"}"; @@ -21,12 +21,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 = "1ja5hc74dff8nhsccqhd5km732a8mafdv7xvzj39asw2r3ma37bp"; + sha256 = "02rjiizgb9mgal0qrklzjvfzybv139yv6za8xp045k7qdyqvsqzf"; } 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 = "0a6yir07x38b0z51pi7kqgsaidhsib781rd53bpkkkk33yzviaqj"; + sha256 = "18268q3pa6v4ygfnlm888jmp84dmg1w9c323cr51pn5jg54vygcm"; } else throw "nvidia-x11 does not support platform ${stdenv.system}"; From f728650731610548b78b4d4263985e8054843492 Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 9 Jul 2013 11:28:39 +0200 Subject: [PATCH 332/798] pythonPackages: Add new hetzner module, v0.2.1. This is for accessing the Hetzner Robot API (an IPMI-like interface). Signed-off-by: aszlig --- pkgs/top-level/python-packages.nix | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 65320967e07..55059c111ef 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2125,6 +2125,29 @@ pythonPackages = python.modules // rec { }; }; + + hetzner = buildPythonPackage rec { + name = "hetzner-${version}"; + version = "0.2.1"; + + src = fetchurl { + url = "https://github.com/RedMoonStudios/hetzner/archive/" + + "v${version}.tar.gz"; + sha256 = "0im7frzmbd1v89251ci8ahrjhw578nmksqlfcdakim0jr23si4wh"; + }; + + # not there yet, but coming soon. + doCheck = false; + + meta = { + homepage = "https://github.com/RedMoonStudios/hetzner"; + description = "High-level Python API for accessing the Hetzner robot"; + license = stdenv.lib.licenses.bsd3; + maintainers = [ stdenv.lib.maintainers.aszlig ]; + }; + }; + + html5lib = buildPythonPackage (rec { name = "html5lib-0.95"; From 049d2381c569eb1b7eb6e652f76c4debb1e38533 Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 9 Jul 2013 11:31:06 +0200 Subject: [PATCH 333/798] hetzner-nixops-install: Correct typo in meta attr. I think it's called maintainerS :-) Signed-off-by: aszlig --- pkgs/tools/misc/hetzner-nixops-installer/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/hetzner-nixops-installer/default.nix b/pkgs/tools/misc/hetzner-nixops-installer/default.nix index f671ea8afcb..1aa3fd875bb 100644 --- a/pkgs/tools/misc/hetzner-nixops-installer/default.nix +++ b/pkgs/tools/misc/hetzner-nixops-installer/default.nix @@ -102,6 +102,6 @@ in stdenv.mkDerivation { (remember, we're on a non-NixOS system here), together with the partitioner. ''; - maintainer = stdenv.lib.maintainers.aszlig; + maintainers = [ stdenv.lib.maintainers.aszlig ]; }; } From aa35e66257c190f8e7ac79eefecea72fe5b7497f Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 9 Jul 2013 11:53:01 +0200 Subject: [PATCH 334/798] hetzner-nixops-installer: Build on Hydra. This is in order to prepare for fetching the build output from the corresponding target machine to even further speed up deployment. Signed-off-by: aszlig --- pkgs/tools/misc/hetzner-nixops-installer/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/misc/hetzner-nixops-installer/default.nix b/pkgs/tools/misc/hetzner-nixops-installer/default.nix index 1aa3fd875bb..772f679b957 100644 --- a/pkgs/tools/misc/hetzner-nixops-installer/default.nix +++ b/pkgs/tools/misc/hetzner-nixops-installer/default.nix @@ -102,6 +102,7 @@ in stdenv.mkDerivation { (remember, we're on a non-NixOS system here), together with the partitioner. ''; + platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.aszlig ]; }; } From f2ee089784081f1295782dbf1d271816ec48b9e2 Mon Sep 17 00:00:00 2001 From: Domen Kozar Date: Tue, 9 Jul 2013 15:37:58 +0200 Subject: [PATCH 335/798] nginx: 1.2.8 -> 1.2.9 (CVE-2013-2070) --- pkgs/servers/http/nginx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/nginx/default.nix b/pkgs/servers/http/nginx/default.nix index 52a17ea399c..aff585fd4ae 100644 --- a/pkgs/servers/http/nginx/default.nix +++ b/pkgs/servers/http/nginx/default.nix @@ -9,11 +9,11 @@ let in stdenv.mkDerivation rec { - name = "nginx-1.2.8"; + name = "nginx-1.2.9"; src = fetchurl { url = "http://nginx.org/download/${name}.tar.gz"; - sha256 = "0dvi8n3ljh3zz80r5zkb5q7f94mg62kkakn0wsqi3lxyqnc7r56j"; + sha256 = "071bs9wh1q1xmprhisyy8i4psmc2xxl6xv7plj9smxjpnxs6cj3i"; }; buildInputs = [ openssl zlib pcre libxml2 libxslt ] ++ stdenv.lib.optional fullWebDAV expat; From 1f6fbcb1766100f429988b4d9fc0b732a3716837 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 9 Jul 2013 16:07:14 +0200 Subject: [PATCH 336/798] ikiwiki: update to version 3.20130518 --- pkgs/applications/misc/ikiwiki/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix index de1df426052..baf97e7a824 100644 --- a/pkgs/applications/misc/ikiwiki/default.nix +++ b/pkgs/applications/misc/ikiwiki/default.nix @@ -23,7 +23,7 @@ assert mercurialSupport -> (mercurial != null); let name = "ikiwiki"; - version = "3.20130212"; + version = "3.20130518"; lib = stdenv.lib; in @@ -32,7 +32,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://ftp.de.debian.org/debian/pool/main/i/ikiwiki/${name}_${version}.tar.gz"; - sha256 = "1svajjhrwaq7wwgmhaxc2ld12cla3pdi9i7m8ll2rfa11cdhhf6m"; + sha256 = "00mmxxlbzv6bz3cz3746r5lqwby6liwsg7m3jfba8258y52w13qp"; }; buildInputs = [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate From ff330bc24e79fe080e7065dcb5969414855c1116 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sat, 6 Jul 2013 18:42:17 +0200 Subject: [PATCH 337/798] gnunet_svn update to 27775 --- pkgs/applications/networking/p2p/gnunet/svn.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/p2p/gnunet/svn.nix b/pkgs/applications/networking/p2p/gnunet/svn.nix index eb05461ec85..b6b9db99f90 100644 --- a/pkgs/applications/networking/p2p/gnunet/svn.nix +++ b/pkgs/applications/networking/p2p/gnunet/svn.nix @@ -4,7 +4,7 @@ , makeWrapper, autoconf, automake }: let - rev = "27399"; + rev = "27775"; in stdenv.mkDerivation rec { name = "gnunet-svn-${rev}"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchsvn { url = https://gnunet.org/svn/gnunet; inherit rev; - sha256 = "0fn7ppfnc4v6lkxwww11s0h8mdvwyv7f40f6wrbfilqpn2ncrf8c"; + sha256 = "1fa2g63rrn0mmim9v62gnm2hqr556mbcafb7cs7afycbinix4spf"; }; buildInputs = [ From 9ba86ecd14c57b9946844e8b16cacfa8ef6d8ceb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 8 Jul 2013 19:39:00 +0200 Subject: [PATCH 338/798] iptraf: update to 3.0.1 --- pkgs/applications/networking/iptraf/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/iptraf/default.nix b/pkgs/applications/networking/iptraf/default.nix index 1d4c772d6f7..f0a6dbbe7e7 100644 --- a/pkgs/applications/networking/iptraf/default.nix +++ b/pkgs/applications/networking/iptraf/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, ncurses}: stdenv.mkDerivation rec { - name = "iptraf-3.0.0"; + name = "iptraf-3.0.1"; src = fetchurl { - url = ftp://iptraf.seul.org/pub/iptraf/iptraf-3.0.0.tar.gz; - sha256 = "0qsi5f8d84mgdszvz22acyv6mjnbrpk55d54km9i5mkkapck7r4y"; + url = ftp://iptraf.seul.org/pub/iptraf/iptraf-3.0.1.tar.gz; + md5 = "004c2c005a1b78739e22bc49d33e244d"; }; patchPhase = '' From 42c5584cb109cc6b8c6f611938445948c18b3985 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 10 Jul 2013 01:25:08 +0200 Subject: [PATCH 339/798] easytag: Update to version 2.1.8. Easytag has moved to gnome.org and thus this commit also updates and cleans up a few meta attributes. More information about the move can be found in the announcement: https://mail.gnome.org/archives/easytag-list/2012-November/msg00006.html In order to get it to compile, we need to do a bit of patching, for example the configure script tries to find libid3tag through pkg-config, but unfortunately libid3tag doesn't have a *.pc script, so we're patching it out of the configure script and use NIX_LDFLAGS to inject the library during linking (note the "-lz" - it's a propagated dependency of libid3tag). Also added for MP4 support: taglib. Thanks to @devhell for the notification of the new upstream release. Signed-off-by: aszlig --- pkgs/applications/audio/easytag/default.nix | 38 +++++++++++++-------- 1 file changed, 24 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/audio/easytag/default.nix b/pkgs/applications/audio/easytag/default.nix index 18a31460987..c421dcc60cb 100644 --- a/pkgs/applications/audio/easytag/default.nix +++ b/pkgs/applications/audio/easytag/default.nix @@ -1,22 +1,32 @@ -{ stdenv, fetchurl, pkgconfig, gtk, libid3tag, id3lib, libvorbis, libogg, flac }: +{ stdenv, fetchurl, pkgconfig, intltool, gtk, glib, libid3tag, id3lib, taglib +, libvorbis, libogg, flac +}: -let - - version = "2.1.7"; - sha256 = "bfed34cbdce96aca299a0db2b531dbc66feb489b911a34f0a9c67f2eb6ee9301"; - -in stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "easytag-${version}"; + version = "2.1.8"; + src = fetchurl { - url = "mirror://sourceforge/easytag/easytag-${version}.tar.bz2"; - inherit sha256; + url = "mirror://gnome/sources/easytag/2.1/${name}.tar.xz"; + sha256 = "1ab5iv0a83cdf07qzi81ydfk5apay06nxags9m07msqalz4pabqs"; }; - buildInputs = [ pkgconfig gtk libid3tag id3lib libvorbis libogg flac ]; + preConfigure = '' + # pkg-config v0.23 should be enough. + sed -i -e '/_pkg_min_version=0.24/s/24/23/' \ + -e 's/have_mp3=no/have_mp3=yes/' \ + -e 's/ID3TAG_DEPS="id3tag"/ID3TAG_DEPS=""/' configure + ''; + + NIX_LDFLAGS = "-lid3tag -lz"; + + buildInputs = [ + pkgconfig intltool gtk glib libid3tag id3lib taglib libvorbis libogg flac + ]; meta = { - description = "an utility for viewing and editing tags for various audio files"; - homepage = http://http://easytag.sourceforge.net/; - license = stdenv.lib.licenses.gpl2; + description = "View and edit tags for various audio files"; + homepage = "http://projects.gnome.org/easytag/"; + license = stdenv.lib.licenses.gpl2Plus; }; -} \ No newline at end of file +} From abd423621a33279f5d17abc6854f0a7579b4b5c1 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Wed, 10 Jul 2013 08:48:36 +0200 Subject: [PATCH 340/798] php 5.4: Add LDAP support --- pkgs/development/interpreters/php/5.4.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/5.4.nix b/pkgs/development/interpreters/php/5.4.nix index 35b1f82c246..4aa0c9df75e 100644 --- a/pkgs/development/interpreters/php/5.4.nix +++ b/pkgs/development/interpreters/php/5.4.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, composableDerivation, autoconf, automake, flex, bison , apacheHttpd, mysql, libxml2, readline, zlib, curl, gd, postgresql, gettext , openssl, pkgconfig, sqlite, config, libiconv, libjpeg, libpng, freetype -, libxslt, libmcrypt, bzip2, icu }: +, libxslt, libmcrypt, bzip2, icu, openldap, cyrus_sasl }: let libmcryptOverride = libmcrypt.override { disablePosixThreads = true; }; @@ -30,6 +30,11 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) # Extensions + ldap = { + configureFlags = ["--with-ldap=${openldap}"]; + buildInputs = [openldap cyrus_sasl openssl]; + }; + curl = { configureFlags = ["--with-curl=${curl}" "--with-curlwrappers"]; buildInputs = [curl openssl]; @@ -167,6 +172,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) }; cfg = { + ldapSupport = config.php.ldap or true; mysqlSupport = config.php.mysql or true; mysqliSupport = config.php.mysqli or true; pdo_mysqlSupport = config.php.pdo_mysql or true; @@ -214,7 +220,10 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) ''; src = fetchurl { - url = "http://nl.php.net/get/php-${version}.tar.bz2/from/this/mirror"; + urls = [ + "http://nl.php.net/get/php-${version}.tar.bz2/from/this/mirror" + "http://se1.php.net/get/php-${version}.tar.bz2/from/this/mirror" + ]; sha256 = "0dh159svdrakvm9nsyg3yyln7cqqzpxgs2163cqxplnc93d8a8id"; name = "php-${version}.tar.bz2"; }; From a49aeec10d76977ed2e143337113b12a6fc67529 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Wed, 10 Jul 2013 08:49:04 +0200 Subject: [PATCH 341/798] openldap: Upgrade to 2.4.35 --- pkgs/development/libraries/openldap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix index 1d5a0961340..60b9c7738a0 100644 --- a/pkgs/development/libraries/openldap/default.nix +++ b/pkgs/development/libraries/openldap/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, openssl, cyrus_sasl, db4, groff}: stdenv.mkDerivation rec { - name = "openldap-2.4.34"; + name = "openldap-2.4.35"; src = fetchurl { url = "ftp://ftp.nl.uu.net/pub/unix/db/openldap/openldap-release/${name}.tgz"; - sha256 = "01h6zq6zki9b1k07pbyps5vxj9w39ybzjvkyz5h9xk09dd54raza"; + sha256 = "1swy3rly6y0asikp862sigmab8gcll6scb65ln10vps7q5s0640n"; }; buildInputs = [ openssl cyrus_sasl db4 groff ]; From 92083803e66a1dea42f973d5d438fbe520331d10 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Wed, 10 Jul 2013 08:49:37 +0200 Subject: [PATCH 342/798] nss-pam-ldapd: Upgrade to 0.8.13 --- pkgs/tools/networking/nss-pam-ldapd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/nss-pam-ldapd/default.nix b/pkgs/tools/networking/nss-pam-ldapd/default.nix index 92cb053bb44..a63ec2a3d68 100644 --- a/pkgs/tools/networking/nss-pam-ldapd/default.nix +++ b/pkgs/tools/networking/nss-pam-ldapd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "nss-pam-ldapd-${version}"; - version = "0.8.11"; + version = "0.8.13"; src = fetchurl { url = "http://arthurdejong.org/nss-pam-ldapd/${name}.tar.gz"; - sha256 = "9a841f6a46bf9f87213dc806c0f6507ac5016a2ee550d42c3ed9fb280c1e38e6"; + sha256 = "08jxxskzv983grc28zksk9fd8q5qad64rma9vcjsq0l4r6cax4mp"; }; buildInputs = [ makeWrapper pkgconfig python openldap pam ]; From ea216363206589ca3a4050353ed05cb938dcc484 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 10 Jul 2013 10:14:05 +0200 Subject: [PATCH 343/798] sane-backends: update saneBackendsGit to the latest version For some reason, SANE suddenly stopped recognizing my scanner recently: | $ scanimage -L | | No scanners were identified. If you were expecting something different, | check that the scanner is plugged in, turned on and detected by the | sane-find-scanner tool (if appropriate). Please read the documentation | which came with this software (README, FAQ, manpages). I was able to remedy this issue by building SANE with the latest version of the backends package from Git, by adding the following override to ~/.nixpkgs/config.nix: | { | packageOverrides = pkgs: | { | saneBackends = pkgs.saneBackendsGit; | }; | } --- pkgs/applications/graphics/sane/backends-git.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/graphics/sane/backends-git.nix b/pkgs/applications/graphics/sane/backends-git.nix index 2455923bbb8..c9cea4109dc 100644 --- a/pkgs/applications/graphics/sane/backends-git.nix +++ b/pkgs/applications/graphics/sane/backends-git.nix @@ -5,12 +5,12 @@ in assert hotplugSupport -> (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"); stdenv.mkDerivation { - name = "sane-backends-1.0.22.482-g071f226"; + name = "sane-backends-1.0.23.296-gf139120"; src = fetchgit { url = "http://git.debian.org/git/sane/sane-backends.git"; - rev = "071f2269cd68d3411cbfa05a3d028b74496db970"; - sha256 = "178xkv30m6irk4k0gqnfcl5kramm1qyj24dar8gp32428z1444xf"; + rev = "f139120c72db6de98be95b52c206c2a4d8071e92"; + sha256 = "1b2fv19c8ijh9l0jjilli3j70n17wvcgpqq1nxmiby3ai6nrzk8d"; }; udevSupport = hotplugSupport; @@ -34,7 +34,7 @@ stdenv.mkDerivation { meta = { homepage = "http://www.sane-project.org/"; description = "Scanner Access Now Easy"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.simons ]; platforms = stdenv.lib.platforms.linux; From b42f757d6bcd594333a903f4df327f5d45ab937f Mon Sep 17 00:00:00 2001 From: Gergely Risko Date: Mon, 8 Jul 2013 22:14:13 +0200 Subject: [PATCH 344/798] Build haddock for transformers-compat --- .../libraries/haskell/transformers-compat/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/libraries/haskell/transformers-compat/default.nix b/pkgs/development/libraries/haskell/transformers-compat/default.nix index f3120a61f20..2abd6efa0ce 100644 --- a/pkgs/development/libraries/haskell/transformers-compat/default.nix +++ b/pkgs/development/libraries/haskell/transformers-compat/default.nix @@ -5,7 +5,6 @@ cabal.mkDerivation (self: { version = "0.1.1.1"; sha256 = "0i0bcfmqsnqa8fyp81virr5bh3hk23261xyx28jcfamrc18ly9ij"; buildDepends = [ transformers ]; - noHaddock = true; meta = { homepage = "http://github.com/ekmett/transformers-compat/"; description = "A small compatibility shim exposing the new types from transformers 0.3 to older Haskell platforms."; From 70835adb281e3de2916032345ef2c8aeb1aec7d4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 10 Jul 2013 09:20:34 +0200 Subject: [PATCH 345/798] haskell-git-annex: update to version 4.20130709 --- .../version-management/git-and-tools/git-annex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix index 7b56d8f92da..78c33a24d34 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix @@ -14,8 +14,8 @@ cabal.mkDerivation (self: { pname = "git-annex"; - version = "4.20130627"; - sha256 = "1q9hdh7m04idx1nm631624s37p6w1b9j1z5n06j2449b3pxqrn3y"; + version = "4.20130709"; + sha256 = "1xsv5wi0sipp71p7yw90cwd4spm4sr0kcqj47zyd19mgdyd80p9i"; isLibrary = false; isExecutable = true; buildDepends = [ From cc121fb9fe65ae787bee48c934453a9c51ae81ae Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 10 Jul 2013 09:20:34 +0200 Subject: [PATCH 346/798] haskell-abstract-deque: update to version 0.2.2 --- .../libraries/haskell/abstract-deque/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/abstract-deque/default.nix b/pkgs/development/libraries/haskell/abstract-deque/default.nix index 475abb0b3a9..6a97c6372e0 100644 --- a/pkgs/development/libraries/haskell/abstract-deque/default.nix +++ b/pkgs/development/libraries/haskell/abstract-deque/default.nix @@ -2,9 +2,9 @@ cabal.mkDerivation (self: { pname = "abstract-deque"; - version = "0.2"; - sha256 = "0cq1k74b854flfvh7qhfnpngn4vyzp1az1rkaara23wlylydgs89"; - buildDepends = [ HUnit random ]; + version = "0.2.2"; + sha256 = "12g4y3j59nkjw9ja247m8ydhj6a033lzfbqkp4a5slrqdxfdlvyb"; + buildDepends = [ HUnit random testFramework testFrameworkHunit ]; testDepends = [ HUnit random testFramework testFrameworkHunit ]; meta = { homepage = "https://github.com/rrnewton/haskell-lockfree-queue/wiki"; From eda01e3439f0098d2572984335dbae59c03b4457 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 10 Jul 2013 09:20:34 +0200 Subject: [PATCH 347/798] haskell-atomic-primops: update to version 0.2.2 --- .../libraries/haskell/atomic-primops/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/atomic-primops/default.nix b/pkgs/development/libraries/haskell/atomic-primops/default.nix index 4b37ea84d58..4645442a199 100644 --- a/pkgs/development/libraries/haskell/atomic-primops/default.nix +++ b/pkgs/development/libraries/haskell/atomic-primops/default.nix @@ -1,10 +1,10 @@ -{ cabal, Cabal, primitive }: +{ cabal, bitsAtomic, Cabal, primitive }: cabal.mkDerivation (self: { pname = "atomic-primops"; - version = "0.1.0.2"; - sha256 = "1qjm97hi2wr658yk7f5cfppizaawmrkvs2q7qzq00h14fr71xxca"; - buildDepends = [ Cabal primitive ]; + version = "0.2.2"; + sha256 = "1a3svsh96pl6915g70sf9zhqby0ahhifww6m13cn0zr4za32vl7n"; + buildDepends = [ bitsAtomic Cabal primitive ]; meta = { homepage = "https://github.com/rrnewton/haskell-lockfree-queue/wiki"; description = "A safe approach to CAS and other atomic ops in Haskell"; From a7c66776cb922eead0a3a0339744f9029ba6daa7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 10 Jul 2013 09:20:34 +0200 Subject: [PATCH 348/798] haskell-persistent: update to version 1.2.2.0 --- pkgs/development/libraries/haskell/persistent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/persistent/default.nix b/pkgs/development/libraries/haskell/persistent/default.nix index 7a573139795..7ccbe145d70 100644 --- a/pkgs/development/libraries/haskell/persistent/default.nix +++ b/pkgs/development/libraries/haskell/persistent/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "persistent"; - version = "1.2.1.1"; - sha256 = "12gn84svbi72122si9q61987wmb8zbam0x7jy2x20r2bbdfh50rv"; + version = "1.2.2.0"; + sha256 = "18p3yz683ks0gdn1l4qys29jj7iqhlwh7i0s50bkl4x1w0mpa1kh"; buildDepends = [ aeson attoparsec base64Bytestring blazeHtml blazeMarkup conduit liftedBase monadControl monadLogger pathPieces poolConduit From 2ddb1bce7421d86ef8f61d4e7f04c998f415b514 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 10 Jul 2013 09:20:35 +0200 Subject: [PATCH 349/798] haskell-postgresql-libpq: update to version 0.8.2.3 --- .../libraries/haskell/postgresql-libpq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/postgresql-libpq/default.nix b/pkgs/development/libraries/haskell/postgresql-libpq/default.nix index 90a92019f0e..a3ffd276c2c 100644 --- a/pkgs/development/libraries/haskell/postgresql-libpq/default.nix +++ b/pkgs/development/libraries/haskell/postgresql-libpq/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "postgresql-libpq"; - version = "0.8.2.2"; - sha256 = "1mmsfgia318p34l8jx8hihb160sx2wpg2h5r741akcs50v6p5878"; + version = "0.8.2.3"; + sha256 = "08l3va5v8ppajgl8ywmzjdvd6v2vhqfj0y55mb1jxkdpvkd5hckl"; extraLibraries = [ postgresql ]; meta = { homepage = "http://github.com/lpsmith/postgresql-libpq"; From a77b49be65c465f6d10d703d82b756b61b2d6d10 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 10 Jul 2013 09:20:35 +0200 Subject: [PATCH 350/798] haskell-shelly: update to version 1.3.0.6 --- pkgs/development/libraries/haskell/shelly/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/shelly/default.nix b/pkgs/development/libraries/haskell/shelly/default.nix index 7bb9466864e..61342c09084 100644 --- a/pkgs/development/libraries/haskell/shelly/default.nix +++ b/pkgs/development/libraries/haskell/shelly/default.nix @@ -3,8 +3,8 @@ cabal.mkDerivation (self: { pname = "shelly"; - version = "1.3.0.3"; - sha256 = "0izfxv45b5j9p3q2nrlxdn9g4vfmzghl4ab7zisn07gx381wk9qq"; + version = "1.3.0.6"; + sha256 = "0sm55f02cm89m8szhf9zb2jww86amzd6wdk44b3cqr7aza08clvj"; buildDepends = [ mtl systemFileio systemFilepath text time unixCompat ]; From 6fde3cf455fba75285768a750f987032d138def4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 10 Jul 2013 09:20:35 +0200 Subject: [PATCH 351/798] haskell-xml-conduit: update to version 1.1.0.4 --- 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 b586a6336bc..7a03815c183 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.3"; - sha256 = "04mnn6j9bbkhvav04gl9cbd4rldl7bwgcapvykwvf2p3nb3d7bi4"; + version = "1.1.0.4"; + sha256 = "0mbn0xm3br4f645qk1cv09zjlrcws5qdn498iwm5lx4j2ygg9swa"; buildDepends = [ attoparsec attoparsecConduit blazeBuilder blazeBuilderConduit blazeHtml blazeMarkup conduit dataDefault failure monadControl From eed2a02d868a9e989db69f4adc135d1a300ecd53 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Wed, 10 Jul 2013 12:27:25 +0200 Subject: [PATCH 352/798] php 5.4: Add mhash support --- pkgs/development/interpreters/php/5.4.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/php/5.4.nix b/pkgs/development/interpreters/php/5.4.nix index 4aa0c9df75e..6cb8c733601 100644 --- a/pkgs/development/interpreters/php/5.4.nix +++ b/pkgs/development/interpreters/php/5.4.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, composableDerivation, autoconf, automake, flex, bison , apacheHttpd, mysql, libxml2, readline, zlib, curl, gd, postgresql, gettext , openssl, pkgconfig, sqlite, config, libiconv, libjpeg, libpng, freetype -, libxslt, libmcrypt, bzip2, icu, openldap, cyrus_sasl }: +, libxslt, libmcrypt, bzip2, icu, openldap, cyrus_sasl, libmhash }: let libmcryptOverride = libmcrypt.override { disablePosixThreads = true; }; @@ -35,6 +35,11 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) buildInputs = [openldap cyrus_sasl openssl]; }; + mhash = { + configureFlags = ["--with-mhash"]; + buildInputs = [libmhash]; + }; + curl = { configureFlags = ["--with-curl=${curl}" "--with-curlwrappers"]; buildInputs = [curl openssl]; @@ -173,6 +178,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) cfg = { ldapSupport = config.php.ldap or true; + mhashSupport = config.php.mhash or true; mysqlSupport = config.php.mysql or true; mysqliSupport = config.php.mysqli or true; pdo_mysqlSupport = config.php.pdo_mysql or true; From 5a58b0e57a13e18e70dd3cca6481e81e7e86da74 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Wed, 10 Jul 2013 17:45:51 +0200 Subject: [PATCH 353/798] Update nixops to version 1.0.1 --- pkgs/tools/package-management/nixops/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/nixops/default.nix b/pkgs/tools/package-management/nixops/default.nix index 4e47a50078a..7f2b533383e 100644 --- a/pkgs/tools/package-management/nixops/default.nix +++ b/pkgs/tools/package-management/nixops/default.nix @@ -1,12 +1,12 @@ { lib, pythonPackages, fetchurl, libxslt, docbook5_xsl }: pythonPackages.buildPythonPackage rec { - name = "nixops-1.0"; + name = "nixops-1.0.1"; namePrefix = ""; src = fetchurl { url = "http://nixos.org/releases/nixops/${name}/${name}.tar.bz2"; - sha256 = "9ae2dfac8e1fa895aef81323b14a3398f03a1cbd8c86ea10b6fff7312e1fadbb"; + sha256 = "c6dda2597ba0ab2f60c984d4715163c02940f20803619668d6c16eba8570a394"; }; buildInputs = [ libxslt ]; @@ -21,6 +21,9 @@ pythonPackages.buildPythonPackage rec { postInstall = '' + # Backward compatibility symlink. + ln -s nixops $out/bin/charon + make -C doc/manual install nixops.1 docbookxsl=${docbook5_xsl}/xml/xsl/docbook \ docdir=$out/share/doc/nixops mandir=$out/share/man From 9a8677caeb7f0e3eb6f72d0247054f606a4f1094 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Wed, 10 Jul 2013 21:00:56 +0200 Subject: [PATCH 354/798] Add easyrsa --- pkgs/tools/networking/easyrsa/default.nix | 45 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/tools/networking/easyrsa/default.nix diff --git a/pkgs/tools/networking/easyrsa/default.nix b/pkgs/tools/networking/easyrsa/default.nix new file mode 100644 index 00000000000..99cfb92a18b --- /dev/null +++ b/pkgs/tools/networking/easyrsa/default.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchurl, autoconf, automake111x, makeWrapper +, gnugrep, openssl}: + +stdenv.mkDerivation rec { + name = "easyrsa-2.2.0"; + + src = fetchurl { + url = "https://github.com/OpenVPN/easy-rsa/archive/v2.2.0.tar.gz"; + sha256 = "1xq4by5frb6ikn53ss3y8v7ss639dccxfq8jfrbk07ynkmk668qk"; + }; + + # Copy missing files and autoreconf + preConfigure = '' + cp ${automake111x}/share/automake/install-sh . + cp ${automake111x}/share/automake/missing . + + autoreconf + ''; + + preBuild = '' + mkdir -p $out/share/easy-rsa + ''; + + nativeBuildInputs = [ autoconf makeWrapper automake111x ]; + buildInputs = [ gnugrep openssl]; + + # Make sane defaults and patch default config vars + postInstall = '' + for prog in $(find "$out/share/easy-rsa" -executable); do + makeWrapper "$prog" "$out/bin/$(basename $prog)" \ + --set EASY_RSA "$out/share/easy-rsa" \ + --set OPENSSL "${openssl}/bin/openssl" \ + --set GREP "${gnugrep}/bin/grep" + done + sed -i "/EASY_RSA=\|OPENSSL=\|GREP=/d" $out/share/easy-rsa/vars + ''; + + meta = with stdenv.lib; { + description = "Simple shell based CA utility"; + homepage = http://openvpn.net/; + license = licenses.gpl2; + maintainers = [ maintainers.offline ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 027172935ae..7698faf4c6d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -753,6 +753,8 @@ let e2fsprogs = callPackage ../tools/filesystems/e2fsprogs { }; + easyrsa = callPackage ../tools/networking/easyrsa { }; + ebook_tools = callPackage ../tools/text/ebook-tools { }; ecryptfs = callPackage ../tools/security/ecryptfs { }; From e9bee7d9cb3c7289570738d694ae25ca42c1d5fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Fri, 3 May 2013 21:50:10 +0200 Subject: [PATCH 355/798] ExtUtilsTypemapsDefault: fix for perl < 5.16 Add missing dependencies for ExtUtilsTypemapsDefault, needed when building with perl < 5.16. This works for perl 5.16 too. ExtUtils-ParseXS 3.15 has disappeared from the mirrors, so I had to bump it to something available from CPAN; version 3.18. See note from CPAN[1]: This module [ExtUtilsTypemap] exists merely as a compatibility wrapper around ExtUtils::Typemaps. In a nutshell, ExtUtils::Typemap was renamed to ExtUtils::Typemaps because the Typemap directory in lib/ could collide with the typemap file on case-insensitive file systems. The ExtUtils::Typemaps module is part of the ExtUtils::ParseXS distribution and ships with the standard library of perl starting with perl version 5.16. [1] http://search.cpan.org/~smueller/ExtUtils-Typemap-1.00/lib/ExtUtils/Typemap.pm: --- pkgs/top-level/perl-packages.nix | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 2139341f3b5..7b113cadd4b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2569,19 +2569,40 @@ rec { }; ExtUtilsParseXS = buildPerlPackage rec { - name = "ExtUtils-ParseXS-3.15"; + name = "ExtUtils-ParseXS-3.18"; src = fetchurl { url = "mirror://cpan/modules/by-module/ExtUtils/${name}.tar.gz"; - sha256 = "06baf0nsmdkfk50p4x9kss4ncm8h49gkzy8hl5cxbxdsab65gmrb"; + sha256 = "0kvbx66vncgk2c72994z31bgh2w3rsrlnx0z7cmxqa7w3hlc4741"; }; }; + # From CPAN[1]: + # This module exists merely as a compatibility wrapper around + # ExtUtils::Typemaps. In a nutshell, ExtUtils::Typemap was renamed to + # ExtUtils::Typemaps because the Typemap directory in lib/ could collide with + # the typemap file on case-insensitive file systems. + # + # The ExtUtils::Typemaps module is part of the ExtUtils::ParseXS distribution + # and ships with the standard library of perl starting with perl version + # 5.16. + # + # [1] http://search.cpan.org/~smueller/ExtUtils-Typemap-1.00/lib/ExtUtils/Typemap.pm: + ExtUtilsTypemap = buildPerlPackage rec { + name = "ExtUtils-Typemap-1.00"; + src = fetchurl { + url = "mirror://cpan/modules/by-module/ExtUtils/${name}.tar.gz"; + sha256 = "1iqz0xlscg655gnwb2h1wrjj70llblps1zznl29qn1mv5mvibc5i"; + }; + buildInputs = [ ExtUtilsParseXS ]; + }; + ExtUtilsTypemapsDefault = buildPerlModule rec { name = "ExtUtils-Typemaps-Default-1.01"; src = fetchurl { url = "mirror://cpan/modules/by-module/ExtUtils/${name}.tar.gz"; sha256 = "0k03rr7bmhnn6j0505w9id5apss85yvqnx76hxf3javn3klj1m5z"; }; + propagatedBuildInputs = [ ExtUtilsTypemap ExtUtilsParseXS ]; }; ExtUtilsXSpp = buildPerlModule rec { From f094996e9cb2709034d6205225941626ca28be6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sat, 4 May 2013 22:32:17 +0200 Subject: [PATCH 356/798] perlPackages: compatibility with perl <= 5.10 This is just a small dependency fix for ExtUtils::CBuilder and Module::Build to make them build with perl 5.10. It seems that perl gradually adds CPAN modules into its core. So when using older perl there typically some more dependencies to take care of. ExtUtils-CBuilder 0.280202 is not available anymore, so I had to bump it to 0.280205. --- pkgs/top-level/perl-packages.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 7b113cadd4b..1697ad5be94 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2472,11 +2472,12 @@ rec { }; ExtUtilsCBuilder = buildPerlPackage rec { - name = "ExtUtils-CBuilder-0.280202"; + name = "ExtUtils-CBuilder-0.280205"; src = fetchurl { url = "mirror://cpan/modules/by-module/ExtUtils/${name}.tar.gz"; - sha256 = "13qjdz1kmrp5mp404by94cdsyydjadg974ykinqga450djjaqpbq"; + sha256 = "0nfrr3zd71gnsbp5xacdb70n17slrzj421s4nyr11zg5cqsj3ngs"; }; + buildInputs = [ PerlOSType ]; }; ExtUtilsConfig = buildPerlPackage { @@ -4064,6 +4065,7 @@ rec { url = mirror://cpan/authors/id/L/LE/LEONT/Module-Build-0.4005.tar.gz; sha256 = "eb2522507251550f459c11223ea6d86b34f1dee9b3e3928d0d6a0497505cb7ef"; }; + buildInputs = [ CPANMeta ExtUtilsCBuilder ]; meta = { description = "Build and install Perl modules"; license = "perl"; From 2efe295e9258cf0783126a7a9abef0733ec4117d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 11 Jul 2013 01:31:48 +0200 Subject: [PATCH 357/798] haskell-hledger-web: update to version 0.21.3 --- .../libraries/haskell/hledger-web/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/hledger-web/default.nix b/pkgs/development/libraries/haskell/hledger-web/default.nix index acffb0e55ff..e4dd6ef1faa 100644 --- a/pkgs/development/libraries/haskell/hledger-web/default.nix +++ b/pkgs/development/libraries/haskell/hledger-web/default.nix @@ -2,14 +2,14 @@ , dataDefault, filepath, hamlet, hjsmin, hledger, hledgerLib, hspec , httpConduit, HUnit, json, networkConduit, parsec, regexpr, safe , shakespeareText, text, time, transformers, wai, waiExtra -, waiHandlerLaunch, warp, yaml, yesod, yesodCore, yesodPlatform -, yesodStatic, yesodTest +, waiHandlerLaunch, warp, yaml, yesod, yesodCore, yesodStatic +, yesodTest }: cabal.mkDerivation (self: { pname = "hledger-web"; - version = "0.21.2"; - sha256 = "1z8nyvqzyjh36g50w4gmh8mzvydanfn1s3gx4nliwk4mjfj4bbkl"; + version = "0.21.3"; + sha256 = "18gil6qwlzfk0y0f9q1la5np5phi0h3nqlb8rwn9qjjgvs134jgy"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -17,7 +17,7 @@ cabal.mkDerivation (self: { hamlet hjsmin hledger hledgerLib httpConduit HUnit json networkConduit parsec regexpr safe shakespeareText text time transformers wai waiExtra waiHandlerLaunch warp yaml yesod - yesodCore yesodPlatform yesodStatic + yesodCore yesodStatic ]; testDepends = [ hspec yesod yesodTest ]; doCheck = false; From 49fccb03e9c0509d8b983c4e59665f3192ade9e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 28 Apr 2013 12:59:00 +0200 Subject: [PATCH 358/798] slic3r: new package Slic3r is a G-code generator for 3D printers. - Math-Clipper and Boost-Geometry-Utils have been bumped to satisfy Slic3r. - Slic3r has problems with perl 5.16 due to a locale issue (comma vs period in floating point numbers). So we use perl 5.14. - The tests fail, so we skip them. According to the author of Slic3r, that should be safe: "Tests failed because of a typo when the 0.9.10b tag was applied. You can safely ignore the test results, Slic3r will work." See https://github.com/alexrj/Slic3r/issues/1303 For reference, the errors look like this: Use of uninitialized value $deg in numeric eq (==) at /tmp/nix-build-perl-slic3r-0.9.10b.drv-0/git-export/t/../lib/Slic3r/TriangleMesh.pm line 328. # Looks like your test exited with 255 before it could output anything. --- pkgs/applications/misc/slic3r/default.nix | 61 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 16 ++++++ pkgs/top-level/perl-packages.nix | 8 +-- 3 files changed, 81 insertions(+), 4 deletions(-) create mode 100644 pkgs/applications/misc/slic3r/default.nix diff --git a/pkgs/applications/misc/slic3r/default.nix b/pkgs/applications/misc/slic3r/default.nix new file mode 100644 index 00000000000..aa2ceb08e80 --- /dev/null +++ b/pkgs/applications/misc/slic3r/default.nix @@ -0,0 +1,61 @@ +{ stdenv, fetchgit, perl, makeWrapper, makeDesktopItem +# Perl modules: +, EncodeLocale, MathClipper, ExtUtilsXSpp, BoostGeometryUtils +, MathConvexHullMonotoneChain, MathGeometryVoronoi, MathPlanePath, Moo +, IOStringy, ClassXSAccessor, Wx, GrowlGNTP, NetDBus }: + +stdenv.mkDerivation rec { + version = "0.9.10b"; + name = "slic3r-${version}"; + + # Slic3r doesn't put out tarballs, only a git repository is available + src = fetchgit { + url = "git://github.com/alexrj/Slic3r"; + rev = "refs/tags/${version}"; + sha256 = "0j06h0z65qn4kyb2b7pnq6bcn4al60q227iz9jlrin0ffx3l0ra7"; + }; + + buildInputs = [ perl makeWrapper + EncodeLocale MathClipper ExtUtilsXSpp BoostGeometryUtils + MathConvexHullMonotoneChain MathGeometryVoronoi MathPlanePath Moo + IOStringy ClassXSAccessor Wx GrowlGNTP NetDBus + ]; + + desktopItem = makeDesktopItem { + name = "slic3r"; + exec = "slic3r"; + icon = "slic3r"; + comment = "G-code generator for 3D printers"; + desktopName = "Slic3r"; + genericName = "3D printer tool"; + categories = "Application;Development;"; + }; + + # Nothing to do here + buildPhase = "true"; + + installPhase = '' + mkdir -p "$out/share/slic3r/" + cp -r * "$out/share/slic3r/" + wrapProgram "$out/share/slic3r/slic3r.pl" --prefix PERL5LIB : $PERL5LIB + mkdir -p "$out/bin" + ln -s "$out/share/slic3r/slic3r.pl" "$out/bin/slic3r" + mkdir -p "$out/share/pixmaps/" + ln -s "$out/share/slic3r/var/Slic3r.png" "$out/share/pixmaps/slic3r.png" + mkdir -p "$out/share/applications" + cp "$desktopItem"/share/applications/* "$out/share/applications/" + ''; + + meta = with stdenv.lib; { + description = "G-code generator for 3D printers"; + longDescription = '' + Slic3r is the tool you need to convert a digital 3D model into printing + instructions for your 3D printer. It cuts the model into horizontal + slices (layers), generates toolpaths to fill them and calculates the + amount of material to be extruded.''; + homepage = http://slic3r.org/; + license = licenses.agpl3; + platforms = platforms.linux; + maintainers = [ maintainers.bjornfor ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7698faf4c6d..c69fc1a4962 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5679,6 +5679,14 @@ let __overrides = (config.perl510PackageOverrides or (p: {})) pkgs; }; + perl514Packages = import ./perl-packages.nix { + pkgs = pkgs // { + perl = perl514; + buildPerlPackage = import ../development/perl-modules/generic perl514; + }; + __overrides = (config.perl514PackageOverrides or (p: {})) pkgs; + }; + perlXMLParser = perlPackages.XMLParser; ack = perlPackages.ack; @@ -8301,6 +8309,14 @@ let lightdm_gtk_greeter = callPackage ../applications/display-managers/lightdm-gtk-greeter { }; + # slic3r 0.9.10b says: "Running Slic3r under Perl >= 5.16 is not supported nor recommended" + slic3r = callPackage ../applications/misc/slic3r { + inherit (perl514Packages) EncodeLocale MathClipper ExtUtilsXSpp + BoostGeometryUtils MathConvexHullMonotoneChain MathGeometryVoronoi + MathPlanePath Moo IOStringy ClassXSAccessor Wx GrowlGNTP NetDBus; + perl = perl514; + }; + slim = callPackage ../applications/display-managers/slim { libpng = libpng12; }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 1697ad5be94..f179f4ed830 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -296,10 +296,10 @@ rec { }; BoostGeometryUtils = buildPerlModule rec { - name = "Boost-Geometry-Utils-0.09"; + name = "Boost-Geometry-Utils-0.12"; src = fetchurl { url = "mirror://cpan/authors/id/A/AA/AAR/${name}.tar.gz"; - sha256 = "0wgd36rxd5lj0vlkp7l9zgx8bgbv0nj4kia83ipb7p64xpyysghg"; + sha256 = "1pywbxjf05qpcixshblhd2cham601zwa9w7c3k5waz4cdild6g1m"; }; propagatedBuildInputs = [ ModuleBuildWithXSpp ExtUtilsTypemapsDefault ]; }; @@ -3934,10 +3934,10 @@ rec { }; MathClipper = buildPerlModule rec { - name = "Math-Clipper-1.19"; + name = "Math-Clipper-1.22"; src = fetchurl { url = "mirror://cpan/modules/by-module/Math/${name}.tar.gz"; - sha256 = "1hrdand4i937bgsr3f3yma5ckkdwkprdwmkyyl37v1vqcjdrjr7j"; + sha256 = "0p5iblg979v3pb6a8kyhjdv33yadr5997nhz9asjksgvww328nfa"; }; propagatedBuildInputs = [ ModuleBuildWithXSpp ExtUtilsXSpp ExtUtilsTypemapsDefault TestDeep ]; }; From 1800db96d731b5e0d2580490ef3cdd46d741d022 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 11 Jul 2013 10:23:35 +0400 Subject: [PATCH 359/798] Update nginx --- pkgs/servers/http/nginx/default.nix | 5 +++-- pkgs/servers/http/nginx/default.upstream | 8 ++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 pkgs/servers/http/nginx/default.upstream diff --git a/pkgs/servers/http/nginx/default.nix b/pkgs/servers/http/nginx/default.nix index aff585fd4ae..083dbc482f0 100644 --- a/pkgs/servers/http/nginx/default.nix +++ b/pkgs/servers/http/nginx/default.nix @@ -9,11 +9,11 @@ let in stdenv.mkDerivation rec { - name = "nginx-1.2.9"; + name = "nginx-${meta.version}"; src = fetchurl { url = "http://nginx.org/download/${name}.tar.gz"; - sha256 = "071bs9wh1q1xmprhisyy8i4psmc2xxl6xv7plj9smxjpnxs6cj3i"; + sha256 = "06ficmjiya3m8mdlyq3bgqx604h475n77qc5c502kfjijzld39dw"; }; buildInputs = [ openssl zlib pcre libxml2 libxslt ] ++ stdenv.lib.optional fullWebDAV expat; @@ -41,5 +41,6 @@ stdenv.mkDerivation rec { description = "A reverse proxy and lightweight webserver"; maintainers = [ stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.all; + version = "1.4.1"; }; } diff --git a/pkgs/servers/http/nginx/default.upstream b/pkgs/servers/http/nginx/default.upstream new file mode 100644 index 00000000000..f6a12eedda4 --- /dev/null +++ b/pkgs/servers/http/nginx/default.upstream @@ -0,0 +1,8 @@ +url http://nginx.org/en/download.html +version_link '.*-([0-9]+[.][0-9]*[02468]([.][0-9]+)*)[.]tar[.][a-z0-9]*$' + +do_overwrite() { + ensure_hash + set_var_value version "$CURRENT_VERSION" + set_var_value sha256 "$CURRENT_HASH" 2 +} From f75f7e793b790b04c342dd348f432c946a9d6253 Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 11 Jul 2013 16:04:06 +0200 Subject: [PATCH 360/798] nixpart: New upstream version 0.3.0. This fixes two issues: - Don't _always_ print out NixOS configuration, only when explicitly requested with -p. - Add GRUB boot devices to NixOS configuration output. Signed-off-by: aszlig --- pkgs/tools/filesystems/nixpart/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/nixpart/default.nix b/pkgs/tools/filesystems/nixpart/default.nix index 8bf7222edd8..3467c07b753 100644 --- a/pkgs/tools/filesystems/nixpart/default.nix +++ b/pkgs/tools/filesystems/nixpart/default.nix @@ -9,11 +9,11 @@ let }; in buildPythonPackage rec { name = "nixpart-${version}"; - version = "0.2.1"; + version = "0.3.0"; src = fetchurl { url = "https://github.com/aszlig/nixpart/archive/v${version}.tar.gz"; - sha256 = "03v2n2cf9cq9brnxx3yx26nsm3fkgdhmkcm52s89g33c1rmzzgbk"; + sha256 = "0v47vgj79k1idsvw7gd3g2vm5zfb2g4i2935y9sd2av5rb2w4c05"; }; propagatedBuildInputs = [ (blivet.override blivetOverrides) ]; From 4d29005771611bf63d3897c3f8cc1c9b7c7be949 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Fri, 12 Jul 2013 02:51:47 +0300 Subject: [PATCH 361/798] Fix url --- pkgs/development/libraries/libxtc_dxtn/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libxtc_dxtn/default.nix b/pkgs/development/libraries/libxtc_dxtn/default.nix index a23d74a2be8..1f94bcbef99 100644 --- a/pkgs/development/libraries/libxtc_dxtn/default.nix +++ b/pkgs/development/libraries/libxtc_dxtn/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "libtxc_dxtn-1.0.1"; src = fetchurl { - url = "people.freedesktop.org/~cbrill/libtxc_dxtn/${name}.tar.bz2"; + url = "http://people.freedesktop.org/~cbrill/libtxc_dxtn/${name}.tar.bz2"; sha256 = "0q5fjaknl7s0z206dd8nzk9bdh8g4p23bz7784zrllnarl90saa5"; }; From c1749e5fb43dfcb41fb21b7e00e764480e892c66 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Fri, 12 Jul 2013 05:09:36 +0300 Subject: [PATCH 362/798] Add Mechanize Gem. Update other gems as a side effect :/ --- .../interpreters/ruby/generated.nix | 1044 ++++++++--------- 1 file changed, 501 insertions(+), 543 deletions(-) diff --git a/pkgs/development/interpreters/ruby/generated.nix b/pkgs/development/interpreters/ruby/generated.nix index 77464bdce37..97a8eb67001 100644 --- a/pkgs/development/interpreters/ruby/generated.nix +++ b/pkgs/development/interpreters/ruby/generated.nix @@ -3,122 +3,118 @@ g: # Get dependencies from patched gems { aliases = { - ZenTest = g.ZenTest_4_9_0; - actionmailer = g.actionmailer_3_2_13; - actionpack = g.actionpack_3_2_13; - activemodel = g.activemodel_3_2_13; - activerecord = g.activerecord_3_2_13; - activeresource = g.activeresource_3_2_13; - activesupport = g.activesupport_3_2_13; - addressable = g.addressable_2_3_3; - arel = g.arel_3_0_2; + ZenTest = g.ZenTest_4_9_2; + actionmailer = g.actionmailer_4_0_0; + actionpack = g.actionpack_4_0_0; + activemodel = g.activemodel_4_0_0; + activerecord = g.activerecord_4_0_0; + activerecord_deprecated_finders = g.activerecord_deprecated_finders_1_0_3; + activesupport = g.activesupport_4_0_0; + addressable = g.addressable_2_3_5; + arel = g.arel_4_0_0; + atomic = g.atomic_1_1_10; atoulme_Antwrap = g.atoulme_Antwrap_0_7_4; autotest_rails = g.autotest_rails_4_1_2; - aws_sdk = g.aws_sdk_1_8_5; + aws_sdk = g.aws_sdk_1_12_0; bitbucket_backup = g.bitbucket_backup_0_2_2; - builder = g.builder_3_2_0; - buildr = g.buildr_1_4_11; - bundler = g.bundler_1_3_4; + builder = g.builder_3_2_2; + buildr = g.buildr_1_4_12; + bundler = g.bundler_1_3_5; childprocess = g.childprocess_0_3_9; chronic = g.chronic_0_9_1; daemons = g.daemons_1_1_9; diff_lcs = g.diff_lcs_1_1_3; dimensions = g.dimensions_1_2_0; + domain_name = g.domain_name_0_5_12; + dotenv = g.dotenv_0_8_0; em_resolv_replace = g.em_resolv_replace_1_1_3; erubis = g.erubis_2_7_0; eventmachine = g.eventmachine_1_0_3; eventmachine_tail = g.eventmachine_tail_0_6_4; - excon = g.excon_0_25_0; execjs = g.execjs_1_4_0; fakes3 = g.fakes3_0_1_5; faraday = g.faraday_0_8_7; faraday_middleware = g.faraday_middleware_0_8_8; - ffi = g.ffi_1_6_0; + ffi = g.ffi_1_9_0; file_tail = g.file_tail_1_0_12; - foreman = g.foreman_0_62_0; - gettext = g.gettext_2_3_9; - heroku = g.heroku_2_39_4; - heroku_api = g.heroku_api_0_3_13; - highline = g.highline_1_6_16; - hike = g.hike_1_2_1; + foreman = g.foreman_0_63_0; + highline = g.highline_1_6_19; + hike = g.hike_1_2_3; hoe = g.hoe_3_1_0; + http_cookie = g.http_cookie_1_0_1; i18n = g.i18n_0_6_4; - iconv = g.iconv_1_0_3; - journey = g.journey_1_0_4; jruby_pageant = g.jruby_pageant_1_1_1; - jsduck = g.jsduck_4_7_1; - json = g.json_1_7_7; - json_pure = g.json_pure_1_7_7; - launchy = g.launchy_2_3_0; - libv8 = g.libv8_3_3_10_4; - locale = g.locale_2_0_8; - lockfile = g.lockfile_2_1_0; + jsduck = g.jsduck_4_10_4; + json = g.json_1_8_0; + json_pure = g.json_pure_1_8_0; + libv8 = g.libv8_3_11_8_17_x86_linux; macaddr = g.macaddr_1_6_1; - mail = g.mail_2_5_3; - mime_types = g.mime_types_1_21; + mail = g.mail_2_5_4; + mechanize = g.mechanize_2_7_1; + mime_types = g.mime_types_1_23; + mini_portile = g.mini_portile_0_5_1; minitar = g.minitar_0_5_3; - multi_json = g.multi_json_1_7_2; + minitest = g.minitest_4_7_5; + multi_json = g.multi_json_1_7_7; multipart_post = g.multipart_post_1_2_0; + net_http_digest_auth = g.net_http_digest_auth_1_3; + net_http_persistent = g.net_http_persistent_2_8; net_sftp = g.net_sftp_2_0_5; - net_ssh = g.net_ssh_2_6_6; - netrc = g.netrc_0_7_7; + net_ssh = g.net_ssh_2_6_8; nix = g.nix_0_1_1; - nokogiri = g.nokogiri_1_5_9; + nokogiri = g.nokogiri_1_6_0; + ntlm_http = g.ntlm_http_0_1_1; papertrail = g.papertrail_0_9_7; papertrail_cli = g.papertrail_cli_0_9_3; - parallel = g.parallel_0_6_3; + parallel = g.parallel_0_7_1; polyglot = g.polyglot_0_3_3; rack = g.rack_1_5_2; - rack_cache = g.rack_cache_1_2; rack_protection = g.rack_protection_1_5_0; - rack_ssl = g.rack_ssl_1_3_3; rack_test = g.rack_test_0_6_2; - rails = g.rails_3_2_13; - railties = g.railties_3_2_13; - rake = g.rake_10_0_4; + rails = g.rails_4_0_0; + railties = g.railties_4_0_0; + rake = g.rake_10_1_0; rb_fsevent = g.rb_fsevent_0_9_3; - rb_readline = g.rb_readline_0_5_0; - rdiscount = g.rdiscount_2_0_7_1; - rdoc = g.rdoc_3_12_2; - remote_syslog = g.remote_syslog_1_6_13; - rest_client = g.rest_client_1_6_7; - right_aws = g.right_aws_3_0_5; - right_http_connection = g.right_http_connection_1_3_0; - rjb = g.rjb_1_4_6; - rmail = g.rmail_1_0_0; + rdiscount = g.rdiscount_2_1_6; + ref = g.ref_1_0_5; + remote_syslog = g.remote_syslog_1_6_14; + right_aws = g.right_aws_3_1_0; + right_http_connection = g.right_http_connection_1_4_0; + rjb = g.rjb_1_4_8; rspec = g.rspec_2_11_0; rspec_core = g.rspec_core_2_11_1; rspec_expectations = g.rspec_expectations_2_11_3; rspec_mocks = g.rspec_mocks_2_11_3; rubyforge = g.rubyforge_2_0_4; rubyzip = g.rubyzip_0_9_9; - sass = g.sass_3_2_7; - selenium_webdriver = g.selenium_webdriver_2_31_0; + sass = g.sass_3_2_9; + selenium_webdriver = g.selenium_webdriver_2_33_0; servolux = g.servolux_0_10_0; sinatra = g.sinatra_1_3_2; - sprockets = g.sprockets_2_2_2; + sprockets = g.sprockets_2_10_0; + sprockets_rails = g.sprockets_rails_2_0_0; syslog_protocol = g.syslog_protocol_0_9_2; systemu = g.systemu_2_5_2; - text = g.text_1_2_1; - therubyracer = g.therubyracer_0_10_2; + therubyracer = g.therubyracer_0_11_4; thin = g.thin_1_5_1; - thor = g.thor_0_18_0; - tilt = g.tilt_1_3_6; - tins = g.tins_0_7_2; - treetop = g.treetop_1_4_12; - trollop = g.trollop_2_0; + thor = g.thor_0_18_1; + thread_safe = g.thread_safe_0_1_0; + tilt = g.tilt_1_4_1; + tins = g.tins_0_8_2; + treetop = g.treetop_1_4_14; tzinfo = g.tzinfo_0_3_37; + unf = g.unf_0_1_1; + unf_ext = g.unf_ext_0_0_6; uuid = g.uuid_2_3_7; - uuidtools = g.uuidtools_2_1_3; + uuidtools = g.uuidtools_2_1_4; + webrobots = g.webrobots_0_1_1; websocket = g.websocket_1_0_7; - xapian_full_alaveteli = g.xapian_full_alaveteli_1_2_9_5; - xapian_ruby = g.xapian_ruby_1_2_15_1; xml_simple = g.xml_simple_1_1_1; yajl_ruby = g.yajl_ruby_1_1_0; }; - gem_nix_args = [ ''autotest-rails'' ''aws-sdk'' ''bitbucket-backup'' ''buildr'' ''fakes3'' ''foreman'' ''jsduck'' ''nix'' ''papertrail-cli'' ''rails'' ''rake'' ''rb-fsevent'' ''remote_syslog'' ''right_aws'' ''sass'' ''selenium-webdriver'' ''sinatra-1.3.2'' ''thin'' ''uuid'' ]; + gem_nix_args = [ ''autotest-rails'' ''aws-sdk'' ''bitbucket-backup'' ''buildr'' ''fakes3'' ''foreman'' ''jsduck'' ''mechanize'' ''nix'' ''papertrail-cli'' ''rails'' ''rake'' ''rb-fsevent'' ''remote_syslog'' ''right_aws'' ''sass'' ''selenium-webdriver'' ''sinatra-1.3.2'' ''thin'' ''uuid'' ]; gems = { - ZenTest_4_9_0 = { + ZenTest_4_9_2 = { basename = ''ZenTest''; meta = { description = ''ZenTest provides 4 different tools: zentest, unit_diff, autotest, and multiruby''; @@ -145,89 +141,75 @@ multiruby runs anything you want on multiple versions of ruby. Great for compatibility checking! Use multiruby_setup to manage your installed versions.''; }; - name = ''ZenTest-4.9.0''; + name = ''ZenTest-4.9.2''; requiredGems = [ ]; - sha256 = ''16bp7rwl463m0d213rmwp4rjfwiw1bm529c518v91l18h7hcnb96''; + sha256 = ''18hzvxpr3lzjy3gwlxxaihsvabibpcs2yvqvky1d62gkaj6v9npi''; }; - actionmailer_3_2_13 = { + actionmailer_4_0_0 = { basename = ''actionmailer''; meta = { description = ''Email composition, delivery, and receiving framework (part of Rails).''; homepage = ''http://www.rubyonrails.org''; longDescription = ''Email on Rails. Compose, deliver, receive, and test emails using the familiar controller/view pattern. First-class support for multipart email and attachments.''; }; - name = ''actionmailer-3.2.13''; - requiredGems = [ g.actionpack_3_2_13 g.mail_2_5_3 ]; - sha256 = ''0ksw1b5rba8l6400qgc6zjdn14q68n6crjmm76ggg32r4wv3xn06''; + name = ''actionmailer-4.0.0''; + requiredGems = [ g.actionpack_4_0_0 g.mail_2_5_4 ]; + sha256 = ''0d63hmddll0vdbzzxj4zl6njv1pm7j2njvqfccvvyypwsynfjkgk''; }; - actionpack_3_2_13 = { + actionpack_4_0_0 = { basename = ''actionpack''; meta = { description = ''Web-flow and rendering framework putting the VC in MVC (part of Rails).''; homepage = ''http://www.rubyonrails.org''; longDescription = ''Web apps on Rails. Simple, battle-tested conventions for building and testing MVC web applications. Works with any Rack-compatible server.''; }; - name = ''actionpack-3.2.13''; - requiredGems = [ g.activesupport_3_2_13 g.activemodel_3_2_13 g.rack_cache_1_2 g.builder_3_0_4 g.rack_1_4_5 g.rack_test_0_6_2 g.journey_1_0_4 g.sprockets_2_2_2 g.erubis_2_7_0 ]; - sha256 = ''1m3kd3rwa4z0yik68xi0l9q71lyzq4gdciqaw5w2w9pal1cj8y5w''; + name = ''actionpack-4.0.0''; + requiredGems = [ g.activesupport_4_0_0 g.builder_3_1_4 g.rack_1_5_2 g.rack_test_0_6_2 g.erubis_2_7_0 ]; + sha256 = ''0hx9hdbqqm73l81p5r520zdk218739414yhw9yrys905ks2f5j4d''; }; - activemodel_3_2_13 = { + activemodel_4_0_0 = { basename = ''activemodel''; meta = { description = ''A toolkit for building modeling frameworks (part of Rails).''; homepage = ''http://www.rubyonrails.org''; - longDescription = ''A toolkit for building modeling frameworks like Active Record and Active Resource. Rich support for attributes, callbacks, validations, observers, serialization, internationalization, and testing.''; + longDescription = ''A toolkit for building modeling frameworks like Active Record. Rich support for attributes, callbacks, validations, observers, serialization, internationalization, and testing.''; }; - name = ''activemodel-3.2.13''; - requiredGems = [ g.activesupport_3_2_13 g.builder_3_0_4 ]; - sha256 = ''0lpc9ylwm00g66hmgj06iq51m2l234ii7k6qsjiywf9x5fq6khn5''; + name = ''activemodel-4.0.0''; + requiredGems = [ g.activesupport_4_0_0 g.builder_3_1_4 ]; + sha256 = ''0vsq5bzsyfrzgnhizlipivmh7m9p0ky29avx47wnaqwjlpkir5m2''; }; - activerecord_3_2_13 = { + activerecord_4_0_0 = { basename = ''activerecord''; meta = { description = ''Object-relational mapper framework (part of Rails).''; homepage = ''http://www.rubyonrails.org''; longDescription = ''Databases on Rails. Build a persistent domain model by mapping database tables to Ruby classes. Strong conventions for associations, validations, aggregations, migrations, and testing come baked-in.''; }; - name = ''activerecord-3.2.13''; - requiredGems = [ g.activesupport_3_2_13 g.activemodel_3_2_13 g.arel_3_0_2 g.tzinfo_0_3_37 ]; - sha256 = ''1z5rrjy2v27xldr24sd4sxi6k6f5anyg20kwj3qyc0jjn8c0gv85''; + name = ''activerecord-4.0.0''; + requiredGems = [ g.activesupport_4_0_0 g.activemodel_4_0_0 g.arel_4_0_0 g.activerecord_deprecated_finders_1_0_3 ]; + sha256 = ''0lhksb0172kz23yhibr1rxihyp01h2ajqxd0l4nahs2qc9jlr722''; }; - activeresource_3_2_13 = { - basename = ''activeresource''; + activerecord_deprecated_finders_1_0_3 = { + basename = ''activerecord_deprecated_finders''; meta = { - description = ''REST modeling framework (part of Rails).''; - homepage = ''http://www.rubyonrails.org''; - longDescription = ''REST on Rails. Wrap your RESTful web app with Ruby classes and work with them like Active Record models.''; + description = ''This gem contains deprecated finder APIs extracted from Active Record.''; + homepage = ''https://github.com/rails/activerecord-deprecated_finders''; + longDescription = ''Deprecated finder APIs extracted from Active Record.''; }; - name = ''activeresource-3.2.13''; - requiredGems = [ g.activesupport_3_2_13 g.activemodel_3_2_13 ]; - sha256 = ''1r4ph4cqd32d4lq9bfyv1dpfxc4qndcqhqx7h7xg4p0va7dz251l''; + name = ''activerecord-deprecated_finders-1.0.3''; + requiredGems = [ ]; + sha256 = ''1z2g7h2ywhplrsjrsh8961agf17s9rj8ypdwjj482mw86if3dslp''; }; - activesupport_3_2_13 = { + activesupport_4_0_0 = { basename = ''activesupport''; meta = { description = ''A toolkit of support libraries and Ruby core extensions extracted from the Rails framework.''; homepage = ''http://www.rubyonrails.org''; longDescription = ''A toolkit of support libraries and Ruby core extensions extracted from the Rails framework. Rich support for multibyte strings, internationalization, time zones, and testing.''; }; - name = ''activesupport-3.2.13''; - requiredGems = [ g.i18n_0_6_1 g.multi_json_1_7_2 ]; - sha256 = ''1vailj8ja9g3s029p5qbvqdpxcis5gcpkl2d6j7a6d36hxlwlf8y''; - }; - addressable_2_3_3 = { - basename = ''addressable''; - meta = { - description = ''URI Implementation''; - homepage = ''http://addressable.rubyforge.org/''; - longDescription = ''Addressable is a replacement for the URI implementation that is part of -Ruby's standard library. It more closely conforms to the relevant RFCs and -adds support for IRIs and URI templates. -''; - }; - name = ''addressable-2.3.3''; - requiredGems = [ ]; - sha256 = ''0nn583ba8kq4hhpr4lr2zzpm4r0mga0zfalxxpa6a4v27q71v5hh''; + name = ''activesupport-4.0.0''; + requiredGems = [ g.i18n_0_6_4 g.multi_json_1_7_7 g.tzinfo_0_3_37 g.minitest_4_7_5 g.thread_safe_0_1_0 ]; + sha256 = ''0agxkvjhhv6r9rpm0lcgjny4sn1ihhvhlgs46rgi3fz0y1d93ids''; }; addressable_2_3_5 = { basename = ''addressable''; @@ -243,7 +225,7 @@ adds support for IRIs and URI templates. requiredGems = [ ]; sha256 = ''11hv69v6h39j7m4v51a4p7my7xwjbhxbsg3y7ja156z7by10wkg7''; }; - arel_3_0_2 = { + arel_4_0_0 = { basename = ''arel''; meta = { description = ''Arel is a SQL AST manager for Ruby''; @@ -257,9 +239,20 @@ It is intended to be a framework framework; that is, you can build your own ORM with it, focusing on innovative object and collection modeling as opposed to database compatibility and query generation.''; }; - name = ''arel-3.0.2''; + name = ''arel-4.0.0''; requiredGems = [ ]; - sha256 = ''158bvrhammpblky9z9dgimjr55bdypfx6w5s1dm4vyj42h49qpkx''; + sha256 = ''19xzg8jhp4p18xlf6sp4yhf6vdpc3hl8lm23n6glikclm7rvgick''; + }; + atomic_1_1_10 = { + basename = ''atomic''; + meta = { + description = ''An atomic reference implementation for JRuby, Rubinius, and MRI''; + homepage = ''http://github.com/headius/ruby-atomic''; + longDescription = ''An atomic reference implementation for JRuby, Rubinius, and MRI''; + }; + name = ''atomic-1.1.10''; + requiredGems = [ ]; + sha256 = ''0ms6b2f9hij6bap901ra2wx7lk4y2bsasifcqr7m3z8l5my372jh''; }; atoulme_Antwrap_0_7_4 = { basename = ''atoulme_Antwrap''; @@ -280,7 +273,7 @@ database compatibility and query generation.''; check out Buildr!''; }; name = ''atoulme-Antwrap-0.7.4''; - requiredGems = [ g.rjb_1_4_6 ]; + requiredGems = [ g.rjb_1_4_8 ]; sha256 = ''0sh9capkya88qm9mvixwly32fwb2c4nzif9j9vv0f73rqw8kz4j4''; }; autotest_rails_4_1_2 = { @@ -292,19 +285,19 @@ database compatibility and query generation.''; rails support and extra plugins for migrations and fixtures.''; }; name = ''autotest-rails-4.1.2''; - requiredGems = [ g.ZenTest_4_9_0 ]; + requiredGems = [ g.ZenTest_4_9_2 ]; sha256 = ''1wkb5jayb39yx0i8ly7sibygf9f9c3w24jg2z1qgm135zlb070v4''; }; - aws_sdk_1_8_5 = { + aws_sdk_1_12_0 = { basename = ''aws_sdk''; meta = { description = ''AWS SDK for Ruby''; homepage = ''http://aws.amazon.com/sdkforruby''; longDescription = ''AWS SDK for Ruby''; }; - name = ''aws-sdk-1.8.5''; - requiredGems = [ g.uuidtools_2_1_3 g.nokogiri_1_5_9 g.json_1_7_7 ]; - sha256 = ''0rhkkkfsw0qzckn99mnvpbnl7b1kysma3x8bbqwah2x438kwygpb''; + name = ''aws-sdk-1.12.0''; + requiredGems = [ g.uuidtools_2_1_4 g.nokogiri_1_5_10 g.json_1_8_0 ]; + sha256 = ''0ijz5ch7ch5kj19j5caf5h3hdfmmny9v9clkdh664cr46ylvkv3n''; }; bitbucket_backup_0_2_2 = { basename = ''bitbucket_backup''; @@ -314,25 +307,9 @@ rails support and extra plugins for migrations and fixtures.''; longDescription = ''A tool to backup Bitbucket repos.''; }; name = ''bitbucket-backup-0.2.2''; - requiredGems = [ g.highline_1_6_16 g.json_1_7_7 ]; + requiredGems = [ g.highline_1_6_19 g.json_1_8_0 ]; sha256 = ''1kzg6pkzw04n96i6mhb74gpg4c899wly5fc2m1y6m2xvn71qksys''; }; - builder_3_0_4 = { - basename = ''builder''; - meta = { - description = ''Builders for MarkUp.''; - homepage = ''http://onestepback.org''; - longDescription = ''Builder provides a number of builder objects that make creating structured data -simple to do. Currently the following builder objects are supported: - -* XML Markup -* XML Events -''; - }; - name = ''builder-3.0.4''; - requiredGems = [ ]; - sha256 = ''0hn41h249v82wj7d9vji2lm568jxv8pzq2czh2v0603hjv21r8x1''; - }; builder_3_1_3 = { basename = ''builder''; meta = { @@ -349,7 +326,7 @@ simple to do. Currently the following builder objects are supported: requiredGems = [ ]; sha256 = ''0w6xsq9vyvzdy0xb52sajgipr9ml2bbpivk6dxm69c6987dk7him''; }; - builder_3_2_0 = { + builder_3_1_4 = { basename = ''builder''; meta = { description = ''Builders for MarkUp.''; @@ -361,11 +338,27 @@ simple to do. Currently the following builder objects are supported: * XML Events ''; }; - name = ''builder-3.2.0''; + name = ''builder-3.1.4''; requiredGems = [ ]; - sha256 = ''0f2cpfx6lpazb1wrz3lf06qp6f0qf0gdq5z8xnhkplc3fz3kslb0''; + sha256 = ''1p0bjy1vb0zbswd6bsh5qda0f0br53p8vak8cm7hls62094r405p''; }; - buildr_1_4_11 = { + builder_3_2_2 = { + basename = ''builder''; + meta = { + description = ''Builders for MarkUp.''; + homepage = ''http://onestepback.org''; + longDescription = ''Builder provides a number of builder objects that make creating structured data +simple to do. Currently the following builder objects are supported: + +* XML Markup +* XML Events +''; + }; + name = ''builder-3.2.2''; + requiredGems = [ ]; + sha256 = ''14fii7ab8qszrvsvhz6z2z3i4dw0h41a62fjr2h1j8m41vbrmyv2''; + }; + buildr_1_4_12 = { basename = ''buildr''; meta = { description = ''Build like you code''; @@ -377,20 +370,20 @@ to do, and it takes care of the rest. But also something we can easily extend for those one-off tasks, with a language that's a joy to use. ''; }; - name = ''buildr-1.4.11''; - requiredGems = [ g.rake_0_9_2_2 g.builder_3_1_3 g.net_ssh_2_6_0 g.net_sftp_2_0_5 g.rubyzip_0_9_9 g.highline_1_6_2 g.json_pure_1_7_5 g.rubyforge_2_0_4 g.hoe_3_1_0 g.rjb_1_4_2 g.atoulme_Antwrap_0_7_4 g.diff_lcs_1_1_3 g.rspec_expectations_2_11_3 g.rspec_mocks_2_11_3 g.rspec_core_2_11_1 g.rspec_2_11_0 g.xml_simple_1_1_1 g.minitar_0_5_3 g.bundler_1_3_4 ]; - sha256 = ''0bdrwl9jvxc5h2wqsyacr688hxvzcqan1bhqyryb5bg9a5gpscb4''; + name = ''buildr-1.4.12''; + requiredGems = [ g.rake_0_9_2_2 g.builder_3_1_3 g.net_ssh_2_6_0 g.net_sftp_2_0_5 g.rubyzip_0_9_9 g.highline_1_6_2 g.json_pure_1_7_5 g.rubyforge_2_0_4 g.hoe_3_1_0 g.rjb_1_4_2 g.atoulme_Antwrap_0_7_4 g.diff_lcs_1_1_3 g.rspec_expectations_2_11_3 g.rspec_mocks_2_11_3 g.rspec_core_2_11_1 g.rspec_2_11_0 g.xml_simple_1_1_1 g.minitar_0_5_3 g.bundler_1_3_5 ]; + sha256 = ''0hsy9bkfp1pq5f3jx8i6fsk0r309nmq778ykk6w103rkrdb3l6s6''; }; - bundler_1_3_4 = { + bundler_1_3_5 = { basename = ''bundler''; meta = { description = ''The best way to manage your application's dependencies''; homepage = ''http://gembundler.com''; longDescription = ''Bundler manages an application's dependencies through its entire life, across many machines, systematically and repeatably''; }; - name = ''bundler-1.3.4''; + name = ''bundler-1.3.5''; requiredGems = [ ]; - sha256 = ''1vgrc71nhnqlrg08zvs63afa1z9kzn2vvn95b14dvy14k2br3qhj''; + sha256 = ''1r7zx8qfwzr3pbgrjbsml7z5qgscwyyv33x2jzhz6adqyx3r1f08''; }; childprocess_0_3_9 = { basename = ''childprocess''; @@ -400,7 +393,7 @@ for those one-off tasks, with a language that's a joy to use. longDescription = ''This gem aims at being a simple and reliable solution for controlling external programs running in the background on any Ruby / OS combination.''; }; name = ''childprocess-0.3.9''; - requiredGems = [ g.ffi_1_6_0 ]; + requiredGems = [ g.ffi_1_9_0 ]; sha256 = ''0jbz2ix7ff9ry8717lhcq9w8j8yd45akw48giwgdqccay5mlph7d''; }; chronic_0_9_1 = { @@ -461,6 +454,32 @@ is the MIT license.''; requiredGems = [ ]; sha256 = ''1pqb7yzjcpbgbyi196ifqbd1wy570cn12bkzcvpcha4xilhajja0''; }; + domain_name_0_5_12 = { + basename = ''domain_name''; + meta = { + description = ''Domain Name manipulation library for Ruby''; + homepage = ''https://github.com/knu/ruby-domain_name''; + longDescription = ''This is a Domain Name manipulation library for Ruby. + +It can also be used for cookie domain validation based on the Public +Suffix List. +''; + }; + name = ''domain_name-0.5.12''; + requiredGems = [ g.unf_0_1_1 ]; + sha256 = ''1i4lrlay8pfxrsdl9ifz7dqvs6p23gf5j87rg16zdvhbkd1d0qx0''; + }; + dotenv_0_8_0 = { + basename = ''dotenv''; + meta = { + description = ''Loads environment variables from `.env`.''; + homepage = ''https://github.com/bkeepers/dotenv''; + longDescription = ''Loads environment variables from `.env`.''; + }; + name = ''dotenv-0.8.0''; + requiredGems = [ ]; + sha256 = ''1l93ksw6szh77yzrsl4pzsg0ryry3j5n9k0xf8614gyl07p9rh51''; + }; em_resolv_replace_1_1_3 = { basename = ''em_resolv_replace''; meta = { @@ -525,17 +544,6 @@ using TCP/IP, especially if custom protocols are required.''; requiredGems = [ g.eventmachine_1_0_3 ]; sha256 = ''1pvlb34vdzd81kf9f3xyibb4f55xjqm7lqqy28dgyci5cyv50y61''; }; - excon_0_25_0 = { - basename = ''excon''; - meta = { - description = ''speed, persistence, http(s)''; - homepage = ''https://github.com/geemus/excon''; - longDescription = ''EXtended http(s) CONnections''; - }; - name = ''excon-0.25.0''; - requiredGems = [ ]; - sha256 = ''0wv5bc7d138xw2v608ywl9cwhq7d7gl1l2hzdh96ia2a06hf4rry''; - }; execjs_1_4_0 = { basename = ''execjs''; meta = { @@ -544,7 +552,7 @@ using TCP/IP, especially if custom protocols are required.''; longDescription = ''ExecJS lets you run JavaScript code from Ruby.''; }; name = ''execjs-1.4.0''; - requiredGems = [ g.multi_json_1_7_2 ]; + requiredGems = [ g.multi_json_1_7_7 ]; sha256 = ''0b69ci2afbcdqsri3i89a7s7j7palxsxdb65x6h2wx79kzlc5xcs''; }; fakes3_0_1_5 = { @@ -554,7 +562,7 @@ using TCP/IP, especially if custom protocols are required.''; longDescription = ''Use FakeS3 to test basic S3 functionality without actually connecting to S3''; }; name = ''fakes3-0.1.5''; - requiredGems = [ g.thor_0_18_0 g.builder_3_2_0 ]; + requiredGems = [ g.thor_0_18_1 g.builder_3_2_2 ]; sha256 = ''1na5wrbarla6s414svqmr5spbpv6vmcgpswal444x4clcpmadhib''; }; faraday_0_8_7 = { @@ -578,16 +586,16 @@ using TCP/IP, especially if custom protocols are required.''; requiredGems = [ g.faraday_0_8_7 ]; sha256 = ''1n0g8pm7ynx6ffyqhscc1cqw97zhvd8isr31yfyj15335j1jsncz''; }; - ffi_1_6_0 = { + ffi_1_9_0 = { basename = ''ffi''; meta = { description = ''Ruby FFI''; homepage = ''http://wiki.github.com/ffi/ffi''; longDescription = ''Ruby FFI library''; }; - name = ''ffi-1.6.0''; + name = ''ffi-1.9.0''; requiredGems = [ ]; - sha256 = ''0jhjzj8gb6cakv32a6czgrx8krb0hx8mmkwh5yv2lhdcv3ak013v''; + sha256 = ''0rnh9yyfzcpdmi8m7giyd21lgqj00afgxvgbx41hsi2ls1ghfwvy''; }; file_tail_1_0_12 = { basename = ''file_tail''; @@ -597,57 +605,21 @@ using TCP/IP, especially if custom protocols are required.''; longDescription = ''Library to tail files in Ruby''; }; name = ''file-tail-1.0.12''; - requiredGems = [ g.tins_0_7_2 ]; + requiredGems = [ g.tins_0_8_2 ]; sha256 = ''0mzxxnwj7k5pwxs0rdbmb3b41zgvzw7x40sf3qlkch4zdfx91i1j''; }; - foreman_0_62_0 = { + foreman_0_63_0 = { basename = ''foreman''; meta = { description = ''Process manager for applications with multiple components''; homepage = ''http://github.com/ddollar/foreman''; longDescription = ''Process manager for applications with multiple components''; }; - name = ''foreman-0.62.0''; - requiredGems = [ g.thor_0_18_0 ]; - sha256 = ''08i34rgs3bydk52zwpps4p0y2fvcnibp9lvfdhr75ppin7wv7lmr''; + name = ''foreman-0.63.0''; + requiredGems = [ g.thor_0_18_1 g.dotenv_0_8_0 ]; + sha256 = ''0yqyjix9jm4iwyc4f3wc32vxr28rpjcw1c9ni5brs4s2a24inzlk''; }; - gettext_2_3_9 = { - basename = ''gettext''; - meta = { - description = ''Gettext is a pure Ruby libary and tools to localize messages.''; - homepage = ''http://ruby-gettext.github.com/''; - longDescription = ''Gettext is a GNU gettext-like program for Ruby. -The catalog file(po-file) is same format with GNU gettext. -So you can use GNU gettext tools for maintaining. -''; - }; - name = ''gettext-2.3.9''; - requiredGems = [ g.locale_2_0_8 g.text_1_2_1 ]; - sha256 = ''1i4kzkan7mnyr1ihphx0sqs3k4qj9i1ldg4a1cwf5h2fz657wvjj''; - }; - heroku_2_39_4 = { - basename = ''heroku''; - meta = { - description = ''Client library and CLI to deploy apps on Heroku.''; - homepage = ''http://heroku.com/''; - longDescription = ''Client library and command-line tool to deploy and manage apps on Heroku.''; - }; - name = ''heroku-2.39.4''; - requiredGems = [ g.heroku_api_0_3_13 g.netrc_0_7_7 g.rest_client_1_6_7 g.launchy_2_3_0 g.rubyzip_0_9_9 g.rb_readline_0_5_0 ]; - sha256 = ''1dhj529kqk6q66406f7iwlxwsifndlzcm0513i0hzlhc4lbkbf4x''; - }; - heroku_api_0_3_13 = { - basename = ''heroku_api''; - meta = { - description = ''Ruby Client for the Heroku API''; - homepage = ''http://github.com/heroku/heroku.rb''; - longDescription = ''Ruby Client for the Heroku API''; - }; - name = ''heroku-api-0.3.13''; - requiredGems = [ g.excon_0_25_0 ]; - sha256 = ''179asf4rxjyg59zh5s7lcrnj7rrz9ymz1km24hdydgyay7px0yvi''; - }; - highline_1_6_16 = { + highline_1_6_19 = { basename = ''highline''; meta = { description = ''HighLine is a high-level command-line IO library.''; @@ -658,9 +630,9 @@ crank out anything from simple list selection to complete shells with just minutes of work. ''; }; - name = ''highline-1.6.16''; + name = ''highline-1.6.19''; requiredGems = [ ]; - sha256 = ''1v9dps96hryg7c8hqw41vbm1q02d7wpq7fj1c3bkzsd5518idgzi''; + sha256 = ''0gylnz2cdaswgszgl8x2qx0c87md4246r1i0blgm3nqvgd4hlsxd''; }; highline_1_6_2 = { basename = ''highline''; @@ -677,16 +649,16 @@ minutes of work. requiredGems = [ ]; sha256 = ''0azmahb70f1nlg6lq5wljbzcijhfb9lz8skwb4k2977kdml07mcn''; }; - hike_1_2_1 = { + hike_1_2_3 = { basename = ''hike''; meta = { description = ''Find files in a set of paths''; homepage = ''http://github.com/sstephenson/hike''; longDescription = ''A Ruby library for finding files in a set of paths.''; }; - name = ''hike-1.2.1''; + name = ''hike-1.2.3''; requiredGems = [ ]; - sha256 = ''1c78gja9i9nj76gdj65czhvwam6550l0w9ilnn8vysj9cwv0rg7b''; + sha256 = ''0i6c9hrszzg3gn2j41v3ijnwcm8cc2931fnjiv6mnpl4jcjjykhm''; }; hoe_3_1_0 = { basename = ''hoe''; @@ -708,16 +680,16 @@ For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf''; requiredGems = [ g.rake_0_9_6 ]; sha256 = ''0i961x0hrd6fs1nsfham87dhn64gqpnai27l14jag7qbnp3a79yp''; }; - i18n_0_6_1 = { - basename = ''i18n''; + http_cookie_1_0_1 = { + basename = ''http_cookie''; meta = { - description = ''New wave Internationalization support for Ruby''; - homepage = ''http://github.com/svenfuchs/i18n''; - longDescription = ''New wave Internationalization support for Ruby.''; + description = ''A Ruby library to handle HTTP Cookies based on RFC 6265''; + homepage = ''https://github.com/sparklemotion/http-cookie''; + longDescription = ''HTTP::Cookie is a Ruby library to handle HTTP Cookies based on RFC 6265. It has with security, standards compliance and compatibility in mind, to behave just the same as today's major web browsers. It has builtin support for the legacy cookies.txt and the latest cookies.sqlite formats of Mozilla Firefox, and its modular API makes it easy to add support for a new backend store.''; }; - name = ''i18n-0.6.1''; - requiredGems = [ ]; - sha256 = ''0x3lhp1vl1k4dfqx6k93hhxcpjkz57y8cf007ws7p845ywk6ibfl''; + name = ''http-cookie-1.0.1''; + requiredGems = [ g.domain_name_0_5_12 ]; + sha256 = ''0gzghirmim217g7gf1rq3xiav8gfg32r38mcz0w9vznk30psy7d9''; }; i18n_0_6_4 = { basename = ''i18n''; @@ -730,28 +702,6 @@ For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf''; requiredGems = [ ]; sha256 = ''0wz1rnrs4n21j1rw9a120j2pfdkbikp1yvxaqi3mk30iw6mx4p0f''; }; - iconv_1_0_3 = { - basename = ''iconv''; - meta = { - description = ''iconv wrapper library''; - homepage = ''https://github.com/nurse/iconv''; - longDescription = ''iconv wrapper library''; - }; - name = ''iconv-1.0.3''; - requiredGems = [ ]; - sha256 = ''1nhjn07h2fqivdj6xqzi2x2kzh28vigx8z3q5fv2cqn9aqmbdacl''; - }; - journey_1_0_4 = { - basename = ''journey''; - meta = { - description = ''Journey is a router''; - homepage = ''http://github.com/rails/journey''; - longDescription = ''Journey is a router. It routes requests.''; - }; - name = ''journey-1.0.4''; - requiredGems = [ ]; - sha256 = ''03y1xidg1rx1yjz8xb50083vfwcsfkgs4zmizc040y1h4mhvhm3l''; - }; jruby_pageant_1_1_1 = { basename = ''jruby_pageant''; meta = { @@ -763,27 +713,27 @@ For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf''; requiredGems = [ ]; sha256 = ''1kgqsn0bagr41gf5kbqaxbs38a7s5bm85m0pdx4qz7d70v9nc9cl''; }; - jsduck_4_7_1 = { + jsduck_4_10_4 = { basename = ''jsduck''; meta = { description = ''Simple JavaScript Duckumentation generator''; homepage = ''https://github.com/senchalabs/jsduck''; longDescription = ''Documentation generator for Sencha JS frameworks''; }; - name = ''jsduck-4.7.1''; - requiredGems = [ g.rdiscount_2_0_7_1 g.json_1_7_7 g.parallel_0_6_3 g.execjs_1_4_0 g.therubyracer_0_10_2 g.dimensions_1_2_0 ]; - sha256 = ''0yn568ix4j4xpyrsk07cp5c3migsl7ymlg07fsyn5a65yrwyaiyv''; + name = ''jsduck-4.10.4''; + requiredGems = [ g.rdiscount_2_1_6 g.json_1_8_0 g.parallel_0_7_1 g.execjs_1_4_0 g.therubyracer_0_11_4 g.dimensions_1_2_0 ]; + sha256 = ''1xnad96wmszz0m66wrwciihba6whpg8bglwkbazrifxh9kcw7wih''; }; - json_1_7_7 = { + json_1_8_0 = { basename = ''json''; meta = { description = ''JSON Implementation for Ruby''; homepage = ''http://flori.github.com/json''; longDescription = ''This is a JSON implementation as a Ruby extension in C.''; }; - name = ''json-1.7.7''; + name = ''json-1.8.0''; requiredGems = [ ]; - sha256 = ''1v5pn3g9ignbgrfl72dbf7bzvxsm90ybp24fa3bm9cv5cpa2ww7x''; + sha256 = ''0a8prb853nwz9xqjhcd4rm9a5ng8arcn06hlacf0kcizzz69rr47''; }; json_pure_1_7_5 = { basename = ''json_pure''; @@ -796,61 +746,27 @@ For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf''; requiredGems = [ ]; sha256 = ''14nwwf001mh70qnynpb3h8c0kgcfi666yrg2frib4p6lr57jx8ap''; }; - json_pure_1_7_7 = { + json_pure_1_8_0 = { basename = ''json_pure''; meta = { description = ''JSON Implementation for Ruby''; homepage = ''http://flori.github.com/json''; longDescription = ''This is a JSON implementation in pure Ruby.''; }; - name = ''json_pure-1.7.7''; + name = ''json_pure-1.8.0''; requiredGems = [ ]; - sha256 = ''0jxp0amx9xhka0ixnhvfgwc5ydr82hkxp81pvw32z31arx7jrwl6''; + sha256 = ''0kkn5zhiffav2cffj43wwvzj07825r4j463ilfjgik034vnbjs83''; }; - launchy_2_3_0 = { - basename = ''launchy''; - meta = { - description = ''Launchy is helper class for launching cross-platform applications in a fire and forget manner.''; - homepage = ''http://github.com/copiousfreetime/launchy''; - longDescription = ''Launchy is helper class for launching cross-platform applications in a fire and forget manner. There are application concepts (browser, email client, etc) that are common across all platforms, and they may be launched differently on each platform. Launchy is here to make a common approach to launching external application from within ruby programs.''; - }; - name = ''launchy-2.3.0''; - requiredGems = [ g.addressable_2_3_5 ]; - sha256 = ''0ckvs40f29ancs0ki12pqb94k380cz41b4gbjplm85ly6kd57sph''; - }; - libv8_3_3_10_4 = { + libv8_3_11_8_17_x86_linux = { basename = ''libv8''; meta = { description = ''Distribution of the V8 JavaScript engine''; - homepage = ''http://github.com/fractaloop/libv8''; + homepage = ''http://github.com/cowboyd/libv8''; longDescription = ''Distributes the V8 JavaScript engine in binary and source forms in order to support fast builds of The Ruby Racer''; }; - name = ''libv8-3.3.10.4''; + name = ''libv8-3.11.8.17-x86-linux''; requiredGems = [ ]; - sha256 = ''0zy585rs1ihm8nsw525wgmbkcq7aqy1k9dbkk8s6953adl0bpz42''; - }; - locale_2_0_8 = { - basename = ''locale''; - meta = { - description = ''Ruby-Locale is the pure ruby library which provides basic APIs for localization.''; - homepage = ''https://github.com/ruby-gettext/locale''; - longDescription = ''Ruby-Locale is the pure ruby library which provides basic APIs for localization. -''; - }; - name = ''locale-2.0.8''; - requiredGems = [ ]; - sha256 = ''1hmixxg4aigl3h1qmz4fdsrv81p0bblcjbks32nrcvcpwmlylf12''; - }; - lockfile_2_1_0 = { - basename = ''lockfile''; - meta = { - description = ''lockfile''; - homepage = ''https://github.com/ahoward/lockfile''; - longDescription = ''description: lockfile kicks the ass''; - }; - name = ''lockfile-2.1.0''; - requiredGems = [ ]; - sha256 = ''1yfpz9k0crb7q7y5bcaavf2jzbc170dj84hqz13qp75rj7bl3qhf''; + sha256 = ''1szy5cjvin3bnydfia5nnb3n3z3prfhjl4q2nbk08zpvp162fk0n''; }; macaddr_1_6_1 = { basename = ''macaddr''; @@ -863,48 +779,31 @@ For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf''; requiredGems = [ g.systemu_2_5_2 ]; sha256 = ''1vd9l1d0lc0sq3rn1ya816wrzgxxqdzq6pgq0y0435qm6ikwy7ch''; }; - mail_2_5_3 = { + mail_2_5_4 = { basename = ''mail''; meta = { description = ''Mail provides a nice Ruby DSL for making, sending and reading emails.''; homepage = ''http://github.com/mikel/mail''; longDescription = ''A really Ruby Mail handler.''; }; - name = ''mail-2.5.3''; - requiredGems = [ g.mime_types_1_21 g.treetop_1_4_12 g.i18n_0_6_4 ]; - sha256 = ''1afr3acz7vsvr4gp6wnrkw1iwbjhf14mh8g8mlm40r86wcwzr39k''; + name = ''mail-2.5.4''; + requiredGems = [ g.mime_types_1_23 g.treetop_1_4_14 ]; + sha256 = ''0z15ksb8blcppchv03g34844f7xgf36ckp484qjj2886ig1qara4''; }; - mime_types_1_21 = { - basename = ''mime_types''; + mechanize_2_7_1 = { + basename = ''mechanize''; meta = { - description = ''This library allows for the identification of a file's likely MIME content type''; - homepage = ''http://mime-types.rubyforge.org/''; - longDescription = ''This library allows for the identification of a file's likely MIME content -type. This is release 1.21 with new MIME types. The identification of MIME -content type is based on a file's filename extensions. - -MIME types are used in MIME-compliant communications, as in e-mail or -HTTP traffic, to indicate the type of content which is transmitted. -MIME::Types provides the ability for detailed information about MIME -entities (provided as a set of MIME::Type objects) to be determined and -used programmatically. There are many types defined by RFCs and vendors, -so the list is long but not complete; don't hesitate to ask to add -additional information. This library follows the IANA collection of MIME -types (see below for reference). - -MIME::Types for Ruby was originally based on and synchronized with MIME::Types -for Perl by Mark Overmeer, copyright 2001 - 2009. As of version 1.15, the data -format for the MIME::Type list has changed and the synchronization will no -longer happen. - -MIME::Types is built to conform to the MIME types of RFCs 2045 and 2231. It -follows the official {IANA registry}[http://www.iana.org/assignments/media-types/] -({ftp}[ftp://ftp.iana.org/assignments/media-types]) with some unofficial types -added from the the {LTSW collection}[http://www.ltsw.se/knbase/internet/mime.htp].''; + description = ''The Mechanize library is used for automating interaction with websites''; + homepage = ''http://mechanize.rubyforge.org''; + longDescription = ''The Mechanize library is used for automating interaction with websites. +Mechanize automatically stores and sends cookies, follows redirects, +and can follow links and submit forms. Form fields can be populated and +submitted. Mechanize also keeps track of the sites that you have visited as +a history.''; }; - name = ''mime-types-1.21''; - requiredGems = [ ]; - sha256 = ''1qmx53a2kqk0nnhjbfvbc213wsxiprl0wqm7f2xvcsh253ld91iw''; + name = ''mechanize-2.7.1''; + requiredGems = [ g.net_http_digest_auth_1_3 g.net_http_persistent_2_8 g.mime_types_1_23 g.http_cookie_1_0_1 g.nokogiri_1_6_0 g.ntlm_http_0_1_1 g.webrobots_0_1_1 g.domain_name_0_5_12 ]; + sha256 = ''0abcrabsjamp4fjbizp4dv8nkz7jv03r9n0lpn9yypb48ij876vh''; }; mime_types_1_23 = { basename = ''mime_types''; @@ -938,6 +837,17 @@ added from the the {LTSW collection}[http://www.ltsw.se/knbase/internet/mime.htp requiredGems = [ ]; sha256 = ''1ch5ngx67nhbq6j1y79c88gzk6i8pzqi860iwfpxp9c0bwf6fags''; }; + mini_portile_0_5_1 = { + basename = ''mini_portile''; + meta = { + description = ''Simplistic port-like solution for developers''; + homepage = ''http://github.com/luislavena/mini_portile''; + longDescription = ''Simplistic port-like solution for developers. It provides a standard and simplified way to compile against dependency libraries without messing up your system.''; + }; + name = ''mini_portile-0.5.1''; + requiredGems = [ ]; + sha256 = ''0cafnlhdzakzl5vqcm9b97kchj9bvhlcf4ylkyr85lz1263hbagg''; + }; minitar_0_5_3 = { basename = ''minitar''; meta = { @@ -949,16 +859,79 @@ added from the the {LTSW collection}[http://www.ltsw.se/knbase/internet/mime.htp requiredGems = [ ]; sha256 = ''035vs1knnnjsb8arfp8vx75warvwcdpiljjwv38lqljai9v8fq53''; }; - multi_json_1_7_2 = { + minitest_4_7_5 = { + basename = ''minitest''; + meta = { + description = ''minitest provides a complete suite of testing facilities supporting TDD, BDD, mocking, and benchmarking''; + homepage = ''https://github.com/seattlerb/minitest''; + longDescription = ''minitest provides a complete suite of testing facilities supporting +TDD, BDD, mocking, and benchmarking. + + "I had a class with Jim Weirich on testing last week and we were + allowed to choose our testing frameworks. Kirk Haines and I were + paired up and we cracked open the code for a few test + frameworks... + + I MUST say that minitest is *very* readable / understandable + compared to the 'other two' options we looked at. Nicely done and + thank you for helping us keep our mental sanity." + + -- Wayne E. Seguin + +minitest/unit is a small and incredibly fast unit testing framework. +It provides a rich set of assertions to make your tests clean and +readable. + +minitest/spec is a functionally complete spec engine. It hooks onto +minitest/unit and seamlessly bridges test assertions over to spec +expectations. + +minitest/benchmark is an awesome way to assert the performance of your +algorithms in a repeatable manner. Now you can assert that your newb +co-worker doesn't replace your linear algorithm with an exponential +one! + +minitest/mock by Steven Baker, is a beautifully tiny mock (and stub) +object framework. + +minitest/pride shows pride in testing and adds coloring to your test +output. I guess it is an example of how to write IO pipes too. :P + +minitest/unit is meant to have a clean implementation for language +implementors that need a minimal set of methods to bootstrap a working +test suite. For example, there is no magic involved for test-case +discovery. + + "Again, I can't praise enough the idea of a testing/specing + framework that I can actually read in full in one sitting!" + + -- Piotr Szotkowski + +Comparing to rspec: + + rspec is a testing DSL. minitest is ruby. + + -- Adam Hawkins, "Bow Before MiniTest" + +minitest doesn't reinvent anything that ruby already provides, like: +classes, modules, inheritance, methods. This means you only have to +learn ruby to use minitest and all of your regular OO practices like +extract-method refactorings still apply.''; + }; + name = ''minitest-4.7.5''; + requiredGems = [ ]; + sha256 = ''03p6iban9gcpcflzp4z901s1hgj9369p6515h967ny6hlqhcf2iy''; + }; + multi_json_1_7_7 = { basename = ''multi_json''; meta = { - description = ''A gem to provide swappable JSON backends.''; + description = ''A common interface to multiple JSON libraries.''; homepage = ''http://github.com/intridea/multi_json''; - longDescription = ''A gem to provide easy switching between different JSON backends, including Oj, Yajl, the JSON gem (with C-extensions), the pure-Ruby JSON gem, and OkJson.''; + longDescription = ''A common interface to multiple JSON libraries, including Oj, Yajl, the JSON gem (with C-extensions), the pure-Ruby JSON gem, NSJSONSerialization, gson.rb, JrJackson, and OkJson.''; }; - name = ''multi_json-1.7.2''; + name = ''multi_json-1.7.7''; requiredGems = [ ]; - sha256 = ''17mfs58bilkn2b9g3ggh6pz1w4c2a72mqsr6zf0qd8vahw5h158q''; + sha256 = ''1w3fpi52h4a7r0a670xzrwa40l5irh69r45cbvxw24bsp19sfxzr''; }; multipart_post_1_2_0 = { basename = ''multipart_post''; @@ -971,6 +944,43 @@ added from the the {LTSW collection}[http://www.ltsw.se/knbase/internet/mime.htp requiredGems = [ ]; sha256 = ''12p7lnmc52di1r4h73h6xrpppplzyyhani9p7wm8l4kgf1hnmwnc''; }; + net_http_digest_auth_1_3 = { + basename = ''net_http_digest_auth''; + meta = { + description = ''An implementation of RFC 2617 - Digest Access Authentication''; + homepage = ''http://github.com/drbrain/net-http-digest_auth''; + longDescription = ''An implementation of RFC 2617 - Digest Access Authentication. At this time +the gem does not drop in to Net::HTTP and can be used for with other HTTP +clients. + +In order to use net-http-digest_auth you'll need to perform some request +wrangling on your own. See the class documentation at Net::HTTP::DigestAuth +for an example.''; + }; + name = ''net-http-digest_auth-1.3''; + requiredGems = [ ]; + sha256 = ''11hn4fb02rx799ck1gghmz7b32977zbi9sz2jpfyz43igwz2dvzy''; + }; + net_http_persistent_2_8 = { + basename = ''net_http_persistent''; + meta = { + description = ''Manages persistent connections using Net::HTTP plus a speed fix for Ruby 1.8''; + homepage = ''http://docs.seattlerb.org/net-http-persistent''; + longDescription = ''Manages persistent connections using Net::HTTP plus a speed fix for Ruby 1.8. +It's thread-safe too! + +Using persistent HTTP connections can dramatically increase the speed of HTTP. +Creating a new HTTP connection for every request involves an extra TCP +round-trip and causes TCP congestion avoidance negotiation to start over. + +Net::HTTP supports persistent connections with some API methods but does not +handle reconnection gracefully. Net::HTTP::Persistent supports reconnection +and retry according to RFC 2616.''; + }; + name = ''net-http-persistent-2.8''; + requiredGems = [ ]; + sha256 = ''1y50ssi8lcxfady4wwy242sgsr1424g5rg3wpav6kqc9rba74v9l''; + }; net_sftp_2_0_5 = { basename = ''net_sftp''; meta = { @@ -979,7 +989,7 @@ added from the the {LTSW collection}[http://www.ltsw.se/knbase/internet/mime.htp longDescription = ''A pure Ruby implementation of the SFTP client protocol''; }; name = ''net-sftp-2.0.5''; - requiredGems = [ g.net_ssh_2_6_6 ]; + requiredGems = [ g.net_ssh_2_6_8 ]; sha256 = ''0lqk735wspm8rbiyxpbil8ikrqcyg00ss1df7fny0761c3as6m0v''; }; net_ssh_2_6_0 = { @@ -993,27 +1003,16 @@ added from the the {LTSW collection}[http://www.ltsw.se/knbase/internet/mime.htp requiredGems = [ g.jruby_pageant_1_1_1 ]; sha256 = ''18fsgps4a9dfrjszkl3py8j7vw0xwi70bcp59ccj2rlr6i1jv5gw''; }; - net_ssh_2_6_6 = { + net_ssh_2_6_8 = { basename = ''net_ssh''; meta = { description = ''Net::SSH: a pure-Ruby implementation of the SSH2 client protocol.''; homepage = ''https://github.com/net-ssh/net-ssh''; longDescription = ''Net::SSH: a pure-Ruby implementation of the SSH2 client protocol. It allows you to write programs that invoke and interact with processes on remote servers, via SSH2.''; }; - name = ''net-ssh-2.6.6''; + name = ''net-ssh-2.6.8''; requiredGems = [ ]; - sha256 = ''00fdnwv3jf311jjcc51lq8w26r62vzma91i79h5hj8i1ylrilx51''; - }; - netrc_0_7_7 = { - basename = ''netrc''; - meta = { - description = ''Library to read and write netrc files.''; - homepage = ''https://github.com/geemus/netrc''; - longDescription = ''This library can read and update netrc files, preserving formatting including comments and whitespace.''; - }; - name = ''netrc-0.7.7''; - requiredGems = [ ]; - sha256 = ''1y64v93hsxdwgx3dfkyzdki3zqd1slm42dmi23v0zy3kap4vpard''; + sha256 = ''0vf9w8b9f5ha94nwhvwxyqk4lfpy42ihl1g0qib8dfvswlkqw3mx''; }; nix_0_1_1 = { basename = ''nix''; @@ -1026,7 +1025,7 @@ added from the the {LTSW collection}[http://www.ltsw.se/knbase/internet/mime.htp requiredGems = [ ]; sha256 = ''0kwrbkkg0gxibhsz9dpd5zabcf2wqsicg28yiazyb3dc9dslk26k''; }; - nokogiri_1_5_9 = { + nokogiri_1_5_10 = { basename = ''nokogiri''; meta = { description = ''Nokogiri (鋸) is an HTML, XML, SAX, and Reader parser''; @@ -1037,9 +1036,35 @@ many features is the ability to search documents via XPath or CSS3 selectors. XML is like violence - if it doesn’t solve your problems, you are not using enough of it.''; }; - name = ''nokogiri-1.5.9''; + name = ''nokogiri-1.5.10''; requiredGems = [ ]; - sha256 = ''08qx4p3p6dd1yh58c4waz5rjmkzv3v315fr0l6n0dgkg71dczbi9''; + sha256 = ''0dblphzwzl705xmlqcflz8s60xzbcgi4xqzx7984l4kcssbkn71b''; + }; + nokogiri_1_6_0 = { + basename = ''nokogiri''; + meta = { + description = ''Nokogiri (鋸) is an HTML, XML, SAX, and Reader parser''; + homepage = ''http://nokogiri.org''; + longDescription = ''Nokogiri (鋸) is an HTML, XML, SAX, and Reader parser. Among Nokogiri's +many features is the ability to search documents via XPath or CSS3 selectors. + +XML is like violence - if it doesn’t solve your problems, you are not using +enough of it.''; + }; + name = ''nokogiri-1.6.0''; + requiredGems = [ g.mini_portile_0_5_1 ]; + sha256 = ''1icrny9w2hd0pm7cyq5wqdkbzr57dkma1lbyrr0x14lsnangkidb''; + }; + ntlm_http_0_1_1 = { + basename = ''ntlm_http''; + meta = { + description = ''Ruby/NTLM HTTP library.''; + homepage = ''http://www.mindflowsolutions.net''; + longDescription = ''Ruby/NTLM HTTP provides NTLM authentication over http.''; + }; + name = ''ntlm-http-0.1.1''; + requiredGems = [ ]; + sha256 = ''0yx01ffrw87wya1syivqzf8hz02axk7jdpw6aw221xwvib767d36''; }; papertrail_0_9_7 = { basename = ''papertrail''; @@ -1049,7 +1074,7 @@ enough of it.''; longDescription = ''Command-line client for Papertrail hosted log management service. Tails and searches app server logs and system syslog. Supports Boolean search and works with grep and pipe output (Unix).''; }; name = ''papertrail-0.9.7''; - requiredGems = [ g.addressable_2_3_3 g.yajl_ruby_1_1_0 g.chronic_0_9_1 g.faraday_0_8_7 g.faraday_middleware_0_8_8 ]; + requiredGems = [ g.addressable_2_3_5 g.yajl_ruby_1_1_0 g.chronic_0_9_1 g.faraday_0_8_7 g.faraday_middleware_0_8_8 ]; sha256 = ''0v0m1v0qabbr9pmyl77znz39qy1m7p0xwvf3lf9hyq6n524f2dwr''; }; papertrail_cli_0_9_3 = { @@ -1063,15 +1088,15 @@ enough of it.''; requiredGems = [ g.papertrail_0_9_7 ]; sha256 = ''1914dcfqsmw5rl4xd1zwjrfbgwglyncxm8km06bgxaqn4wnaq5iv''; }; - parallel_0_6_3 = { + parallel_0_7_1 = { basename = ''parallel''; meta = { description = ''Run any kind of code in parallel processes''; homepage = ''https://github.com/grosser/parallel''; }; - name = ''parallel-0.6.3''; + name = ''parallel-0.7.1''; requiredGems = [ ]; - sha256 = ''17mg4vfx1c4z7399azf982a3cn522m43kavdqfhfs6i89m7z0l9n''; + sha256 = ''1kzz6ydg7r23ks2b7zbpx4vz3h186n19vhgnjcwi7xwd6h2f1fsq''; }; polyglot_0_3_3 = { basename = ''polyglot''; @@ -1087,24 +1112,6 @@ augments 'require' to find and load matching files.''; requiredGems = [ ]; sha256 = ''082zmail2h3cxd9z1wnibhk6aj4sb1f3zzwra6kg9bp51kx2c00v''; }; - rack_1_4_5 = { - basename = ''rack''; - meta = { - description = ''a modular Ruby webserver interface''; - homepage = ''http://rack.github.com/''; - longDescription = ''Rack provides a minimal, modular and adaptable interface for developing -web applications in Ruby. By wrapping HTTP requests and responses in -the simplest way possible, it unifies and distills the API for web -servers, web frameworks, and software in between (the so-called -middleware) into a single method call. - -Also see http://rack.github.com/. -''; - }; - name = ''rack-1.4.5''; - requiredGems = [ ]; - sha256 = ''027k0nbb8d7cl24x2cywdc6lgrr4lwvdwwjk8wkgz8h9ism3zgzp''; - }; rack_1_5_2 = { basename = ''rack''; meta = { @@ -1123,17 +1130,6 @@ Also see http://rack.github.com/. requiredGems = [ ]; sha256 = ''19szfw76cscrzjldvw30jp3461zl00w4xvw1x9lsmyp86h1g0jp6''; }; - rack_cache_1_2 = { - basename = ''rack_cache''; - meta = { - description = ''HTTP Caching for Rack''; - homepage = ''http://tomayko.com/src/rack-cache/''; - longDescription = ''Rack::Cache is suitable as a quick drop-in component to enable HTTP caching for Rack-based applications that produce freshness (Expires, Cache-Control) and/or validation (Last-Modified, ETag) information.''; - }; - name = ''rack-cache-1.2''; - requiredGems = [ g.rack_1_5_2 ]; - sha256 = ''073ffpsqmy4nqxz178qisb3a4v3305c49ypj0jw6s9mkz02yvgq2''; - }; rack_protection_1_5_0 = { basename = ''rack_protection''; meta = { @@ -1145,18 +1141,6 @@ Also see http://rack.github.com/. requiredGems = [ g.rack_1_5_2 ]; sha256 = ''10wm67f2mp9pryg0s8qapbyxd2lcrpb8ywsbicg29cv2xprhbl4j''; }; - rack_ssl_1_3_3 = { - basename = ''rack_ssl''; - meta = { - description = ''Force SSL/TLS in your app.''; - homepage = ''https://github.com/josh/rack-ssl''; - longDescription = '' Rack middleware to force SSL/TLS. -''; - }; - name = ''rack-ssl-1.3.3''; - requiredGems = [ g.rack_1_5_2 ]; - sha256 = ''0rkmj71s87prswa8sqal42kdllgpfd35ir5m9ahhnlmrrpqd0hr5''; - }; rack_test_0_6_2 = { basename = ''rack_test''; meta = { @@ -1171,27 +1155,27 @@ request helpers feature.''; requiredGems = [ g.rack_1_5_2 ]; sha256 = ''01mk715ab5qnqf6va8k3hjsvsmplrfqpz6g58qw4m3l8mim0p4ky''; }; - rails_3_2_13 = { + rails_4_0_0 = { basename = ''rails''; meta = { description = ''Full-stack web application framework.''; homepage = ''http://www.rubyonrails.org''; longDescription = ''Ruby on Rails is a full-stack web framework optimized for programmer happiness and sustainable productivity. It encourages beautiful code by favoring convention over configuration.''; }; - name = ''rails-3.2.13''; - requiredGems = [ g.activesupport_3_2_13 g.actionpack_3_2_13 g.activerecord_3_2_13 g.activeresource_3_2_13 g.actionmailer_3_2_13 g.railties_3_2_13 g.bundler_1_3_4 ]; - sha256 = ''1f5w4ivy0jxpjf1gkav064i0gd5x9xqnznwrkbc3slc9savprifz''; + name = ''rails-4.0.0''; + requiredGems = [ g.activesupport_4_0_0 g.actionpack_4_0_0 g.activerecord_4_0_0 g.actionmailer_4_0_0 g.railties_4_0_0 g.bundler_1_3_5 g.sprockets_rails_2_0_0 ]; + sha256 = ''12q2z2zpqpr61rqdx8can2ay6y1xxi6ghmlkyvfvxnnwwzxypavf''; }; - railties_3_2_13 = { + railties_4_0_0 = { basename = ''railties''; meta = { description = ''Tools for creating, working with, and running Rails applications.''; homepage = ''http://www.rubyonrails.org''; longDescription = ''Rails internals: application bootup, plugins, generators, and rake tasks.''; }; - name = ''railties-3.2.13''; - requiredGems = [ g.rake_10_0_4 g.rack_ssl_1_3_3 g.thor_0_18_0 g.rdoc_3_12_2 g.activesupport_3_2_13 g.actionpack_3_2_13 ]; - sha256 = ''01wbqfnlrs9nbs0b97dbxh7aap2bma7my530pcggxdf8ckms8kr9''; + name = ''railties-4.0.0''; + requiredGems = [ g.activesupport_4_0_0 g.actionpack_4_0_0 g.rake_10_1_0 g.thor_0_18_1 ]; + sha256 = ''063yyp75b87z0nr1mayzyq462nnhfm834mn97fcyg2mf3zr8qbly''; }; rake_0_9_2_2 = { basename = ''rake''; @@ -1215,16 +1199,16 @@ request helpers feature.''; requiredGems = [ ]; sha256 = ''09kyh351gddn6gjz255hbaza1cw235xvfz9dc15rhyq9phvqdphc''; }; - rake_10_0_4 = { + rake_10_1_0 = { basename = ''rake''; meta = { description = ''Ruby based make-like utility.''; homepage = ''http://rake.rubyforge.org''; longDescription = ''Rake is a Make-like program implemented in Ruby. Tasks and dependencies arespecified in standard Ruby syntax.''; }; - name = ''rake-10.0.4''; + name = ''rake-10.1.0''; requiredGems = [ ]; - sha256 = ''032z0csyi5bjfgzq3winvqvi9fpf3bfx518hzzapkfy90y702ds1''; + sha256 = ''1frsqpihi39x3yqaa7m9vbls1kd24wckbj5cpiwqix8xmcwnic7q''; }; rb_fsevent_0_9_3 = { basename = ''rb_fsevent''; @@ -1237,65 +1221,39 @@ request helpers feature.''; requiredGems = [ ]; sha256 = ''0bdnxwdxj4r1kdxfi5nszbsb126njrr81p912g64xxs2bgxd1bp1''; }; - rb_readline_0_5_0 = { - basename = ''rb_readline''; - meta = { - description = ''Pure-Ruby Readline Implementation''; - homepage = ''http://github.com/luislavena/rb-readline''; - longDescription = ''The readline library provides a pure Ruby implementation of the GNU readline C library, as well as the Readline extension that ships as part of the standard library.''; - }; - name = ''rb-readline-0.5.0''; - requiredGems = [ ]; - sha256 = ''1aixbqpwrlzvrii4c80982jih4syanc2jl0lfcbibqvjasy9h9c8''; - }; - rdiscount_2_0_7_1 = { + rdiscount_2_1_6 = { basename = ''rdiscount''; meta = { description = ''Fast Implementation of Gruber's Markdown in C''; - homepage = ''http://github.com/rtomayko/rdiscount''; + homepage = ''http://dafoster.net/projects/rdiscount/''; }; - name = ''rdiscount-2.0.7.1''; + name = ''rdiscount-2.1.6''; requiredGems = [ ]; - sha256 = ''1xjwi99wfyjhn72h8k709kbq2npqmw2zvikszxfg6in83yb8vmxn''; + sha256 = ''180ln9gwxn0cyflg0i1viv7jyalmjqvqr34cb65xsmmsz1nz55q2''; }; - rdoc_3_12_2 = { - basename = ''rdoc''; + ref_1_0_5 = { + basename = ''ref''; meta = { - description = ''RDoc produces HTML and command-line documentation for Ruby projects''; - homepage = ''http://docs.seattlerb.org/rdoc''; - longDescription = ''RDoc produces HTML and command-line documentation for Ruby projects. RDoc -includes the +rdoc+ and +ri+ tools for generating and displaying online -documentation. - -See RDoc for a description of RDoc's markup and basic use.''; + description = ''Library that implements weak, soft, and strong references in Ruby.''; + homepage = ''http://github.com/bdurand/ref''; + longDescription = ''Library that implements weak, soft, and strong references in Ruby that work across multiple runtimes (MRI, REE, YARV, Jruby, Rubinius, and IronRuby). Also includes implementation of maps/hashes that use references and a reference queue.''; }; - name = ''rdoc-3.12.2''; - requiredGems = [ g.json_1_7_7 ]; - sha256 = ''1v9k4sp5yzj2bshngckdvivj6bszciskk1nd2r3wri2ygs7vgqm8''; + name = ''ref-1.0.5''; + requiredGems = [ ]; + sha256 = ''19qgpsfszwc2sfh6wixgky5agn831qq8ap854i1jqqhy1zsci3la''; }; - remote_syslog_1_6_13 = { + remote_syslog_1_6_14 = { basename = ''remote_syslog''; meta = { description = ''Monitor plain text log file(s) for new entries and send to remote syslog collector''; homepage = ''http://github.com/papertrail/remote_syslog''; longDescription = ''Lightweight daemon to tail one or more log files and transmit UDP syslog messages to a remote syslog host (centralized log aggregation). Generates UDP packets itself instead of depending on a system syslog daemon, so it doesn't affect system-wide logging configuration.''; }; - name = ''remote_syslog-1.6.13''; + name = ''remote_syslog-1.6.14''; requiredGems = [ g.servolux_0_10_0 g.file_tail_1_0_12 g.eventmachine_1_0_3 g.eventmachine_tail_0_6_4 g.syslog_protocol_0_9_2 g.em_resolv_replace_1_1_3 ]; - sha256 = ''0q35j02k2l3fw3fdzq0i3rd6chsqr982gj13f3m3lsxm7kms03nw''; + sha256 = ''1f2yjyqhbdc4vlx52zli1b33f6yn8qc1kd4n0dpv27zswj9qfdkr''; }; - rest_client_1_6_7 = { - basename = ''rest_client''; - meta = { - description = ''Simple HTTP and REST client for Ruby, inspired by microframework syntax for specifying actions.''; - homepage = ''http://github.com/archiloque/rest-client''; - longDescription = ''A simple HTTP and REST client for Ruby, inspired by the Sinatra microframework style of specifying actions: get, put, post, delete.''; - }; - name = ''rest-client-1.6.7''; - requiredGems = [ g.mime_types_1_23 ]; - sha256 = ''0nn7zalgidz2yj0iqh3xvzh626krm2al79dfiij19jdhp0rk8853''; - }; - right_aws_3_0_5 = { + right_aws_3_1_0 = { basename = ''right_aws''; meta = { description = ''The RightScale AWS gems have been designed to provide a robust, fast, and secure interface to Amazon EC2, EBS, S3, SQS, SDB, and CloudFront.''; @@ -1339,11 +1297,11 @@ The RightScale AWS gems comprise: - Test suite (requires AWS account to do "live" testing). ''; }; - name = ''right_aws-3.0.5''; - requiredGems = [ g.right_http_connection_1_3_0 ]; - sha256 = ''0pxdmxmqiidy3dpxsp4l0b1l6nq9b1sh4p1gkzalqm4l24646h4k''; + name = ''right_aws-3.1.0''; + requiredGems = [ g.right_http_connection_1_4_0 ]; + sha256 = ''1a3l5vyvq078nq976rzkrd6fbj522sbgrxpdq3p9z373h0awha09''; }; - right_http_connection_1_3_0 = { + right_http_connection_1_4_0 = { basename = ''right_http_connection''; meta = { description = ''RightScale's robust HTTP/S connection module''; @@ -1358,9 +1316,9 @@ algorithm for low-level network errors. - HTTPS certificate checking ''; }; - name = ''right_http_connection-1.3.0''; + name = ''right_http_connection-1.4.0''; requiredGems = [ ]; - sha256 = ''0900zy2ya57vhxdkdm2gj7xmvzj4gwm5l7ad0lh68ka3vxhdi7ap''; + sha256 = ''0m4phly7srnwyvfqp01lpaxrgrybhszar0p23zl8b12r6bdjl84g''; }; rjb_1_4_2 = { basename = ''rjb''; @@ -1374,7 +1332,7 @@ algorithm for low-level network errors. requiredGems = [ ]; sha256 = ''1cgbwpc45djs0mw05ydxf5apmb9ibj61n240ylqwzrajf13banzh''; }; - rjb_1_4_6 = { + rjb_1_4_8 = { basename = ''rjb''; meta = { description = ''Ruby Java bridge''; @@ -1382,20 +1340,9 @@ algorithm for low-level network errors. longDescription = ''RJB is a bridge program that connect between Ruby and Java with Java Native Interface. ''; }; - name = ''rjb-1.4.6''; + name = ''rjb-1.4.8''; requiredGems = [ ]; - sha256 = ''0q2czc3ghk32hnxf76xsf0jqcfrnx60aqarvdjhgsfdc9a5pmk20''; - }; - rmail_1_0_0 = { - basename = ''rmail''; - meta = { - description = ''A MIME mail parsing and generation library.''; - homepage = ''http://www.rfc20.org/rubymail''; - longDescription = ''RMail is a lightweight mail library containing various utility classes and modules that allow ruby scripts to parse, modify, and generate MIME mail messages.''; - }; - name = ''rmail-1.0.0''; - requiredGems = [ ]; - sha256 = ''0nsg7yda1gdwa96j4hlrp2s0m06vrhcc4zy5mbq7gxmlmwf9yixp''; + sha256 = ''06ps4ssaxb8jwja53h7v7kb31hsdr997b8na89d1yasm5zyraliw''; }; rspec_2_11_0 = { basename = ''rspec''; @@ -1456,7 +1403,7 @@ algorithm for low-level network errors. * For all rubyforge upgrades, run 'rubyforge config' to ensure you have latest.''; }; name = ''rubyforge-2.0.4''; - requiredGems = [ g.json_pure_1_7_7 ]; + requiredGems = [ g.json_pure_1_8_0 ]; sha256 = ''1wdaa4nzy39yzy848fa1rybi72qlyf9vhi1ra9wpx9rpi810fwh1''; }; rubyzip_0_9_9 = { @@ -1469,7 +1416,7 @@ algorithm for low-level network errors. requiredGems = [ ]; sha256 = ''1khf6d903agnwd8965f5f8b353rzmfvygxp53z1199rqzw8h46q2''; }; - sass_3_2_7 = { + sass_3_2_9 = { basename = ''sass''; meta = { description = ''A powerful but elegant CSS compiler that makes CSS fun again.''; @@ -1480,20 +1427,20 @@ algorithm for low-level network errors. command line tool or a web-framework plugin. ''; }; - name = ''sass-3.2.7''; + name = ''sass-3.2.9''; requiredGems = [ ]; - sha256 = ''0c494gh1i4llk4lbi35vidsgclf3cgxind1a7nm499ac9sdz084s''; + sha256 = ''08lvbi4siavvci0g4m65576axcagw23i0iamdqv33kwdimik717q''; }; - selenium_webdriver_2_31_0 = { + selenium_webdriver_2_33_0 = { basename = ''selenium_webdriver''; meta = { description = ''The next generation developer focused tool for automated testing of webapps''; homepage = ''http://selenium.googlecode.com''; longDescription = ''WebDriver is a tool for writing automated tests of websites. It aims to mimic the behaviour of a real user, and as such interacts with the HTML of the application.''; }; - name = ''selenium-webdriver-2.31.0''; - requiredGems = [ g.multi_json_1_7_2 g.rubyzip_0_9_9 g.childprocess_0_3_9 g.websocket_1_0_7 ]; - sha256 = ''1nv3ff31g183kdb97jjz0y7ny3vdnccd09pgblpj87bzhrrdfv3r''; + name = ''selenium-webdriver-2.33.0''; + requiredGems = [ g.multi_json_1_7_7 g.rubyzip_0_9_9 g.childprocess_0_3_9 g.websocket_1_0_7 ]; + sha256 = ''000fpc5vaf268g96vmqq9vlg8fgyh78290agayrk9qkds8i8cr5d''; }; servolux_0_10_0 = { basename = ''servolux''; @@ -1517,19 +1464,29 @@ interpreters.''; longDescription = ''Sinatra is a DSL for quickly creating web applications in Ruby with minimal effort.''; }; name = ''sinatra-1.3.2''; - requiredGems = [ g.rack_1_5_2 g.rack_protection_1_5_0 g.tilt_1_3_6 ]; + requiredGems = [ g.rack_1_5_2 g.rack_protection_1_5_0 g.tilt_1_4_1 ]; sha256 = ''05blf915zpiwyz7agcn9rwdmddwxz0z4l3gd4qlqmrgd2vkw4sxc''; }; - sprockets_2_2_2 = { + sprockets_2_10_0 = { basename = ''sprockets''; meta = { description = ''Rack-based asset packaging system''; homepage = ''http://getsprockets.org/''; longDescription = ''Sprockets is a Rack-based asset packaging system that concatenates and serves JavaScript, CoffeeScript, CSS, LESS, Sass, and SCSS.''; }; - name = ''sprockets-2.2.2''; - requiredGems = [ g.hike_1_2_1 g.multi_json_1_7_2 g.rack_1_5_2 g.tilt_1_3_6 ]; - sha256 = ''15ngw3bjbyr31ygzmmdxxa30ylah6pdn8akgdy9w30vfx2vr7s7s''; + name = ''sprockets-2.10.0''; + requiredGems = [ g.hike_1_2_3 g.multi_json_1_7_7 g.rack_1_5_2 g.tilt_1_4_1 ]; + sha256 = ''1z0kiaymvqm07wqqy479vd8a60ggr3f3520b4splljbn2055fn3s''; + }; + sprockets_rails_2_0_0 = { + basename = ''sprockets_rails''; + meta = { + description = ''Sprockets Rails integration''; + homepage = ''https://github.com/rails/sprockets-rails''; + }; + name = ''sprockets-rails-2.0.0''; + requiredGems = [ g.sprockets_2_10_0 g.actionpack_4_0_0 g.activesupport_4_0_0 ]; + sha256 = ''068w0ly7x1vciy4j6mwgsnz6a983pld4rzk1fpvfsmkdqcizb20x''; }; syslog_protocol_0_9_2 = { basename = ''syslog_protocol''; @@ -1553,27 +1510,16 @@ interpreters.''; requiredGems = [ ]; sha256 = ''0h834ajdg9w4xrijp31fn98pjfj08gi08xjvp5xh3i6hz9a25fhr''; }; - text_1_2_1 = { - basename = ''text''; - meta = { - description = ''A collection of text algorithms''; - homepage = ''http://github.com/threedaymonk/text''; - longDescription = ''A collection of text algorithms: Levenshtein, Soundex, Metaphone, Double Metaphone, Porter Stemming''; - }; - name = ''text-1.2.1''; - requiredGems = [ ]; - sha256 = ''0s186kh125imdr7dahr10payc1gmxgk6wjy1v3agdyvl53yn5z3z''; - }; - therubyracer_0_10_2 = { + therubyracer_0_11_4 = { basename = ''therubyracer''; meta = { - description = ''Embed the V8 Javascript interpreter into Ruby''; + description = ''Embed the V8 JavaScript interpreter into Ruby''; homepage = ''http://github.com/cowboyd/therubyracer''; - longDescription = ''Call javascript code and manipulate javascript objects from ruby. Call ruby code and manipulate ruby objects from javascript.''; + longDescription = ''Call JavaScript code and manipulate JavaScript objects from Ruby. Call Ruby code and manipulate Ruby objects from JavaScript.''; }; - name = ''therubyracer-0.10.2''; - requiredGems = [ g.libv8_3_3_10_4 ]; - sha256 = ''111hm2l613v06sy7pzjzmnyi4x11rg3c2syhnpv8fn0wnn9rdiyb''; + name = ''therubyracer-0.11.4''; + requiredGems = [ g.ref_1_0_5 g.libv8_3_11_8_17_x86_linux ]; + sha256 = ''15n9zi9jzb5k34id9xfkxx39y0nap7a4h02z8r00msjjajxag3iq''; }; thin_1_5_1 = { basename = ''thin''; @@ -1586,63 +1532,59 @@ interpreters.''; requiredGems = [ g.rack_1_5_2 g.eventmachine_1_0_3 g.daemons_1_1_9 ]; sha256 = ''0hrq9m3hb6pm8yrqshhg0gafkphdpvwcqmr7k722kgdisp3w91ga''; }; - thor_0_18_0 = { + thor_0_18_1 = { basename = ''thor''; meta = { description = ''A scripting framework that replaces rake, sake and rubigen''; homepage = ''http://whatisthor.com/''; longDescription = ''A scripting framework that replaces rake, sake and rubigen''; }; - name = ''thor-0.18.0''; + name = ''thor-0.18.1''; requiredGems = [ ]; - sha256 = ''0m7pl518j5q1ymgxmsi6xfjp6k40mwbmzk33s760v53azwxkfxan''; + sha256 = ''0d1g37j6sc7fkidf8rqlm3wh9zgyg3g7y8h2x1y34hmil5ywa8c3''; }; - tilt_1_3_6 = { + thread_safe_0_1_0 = { + basename = ''thread_safe''; + meta = { + description = ''A collection of data structures and utilities to make thread-safe programming in Ruby easier''; + homepage = ''https://github.com/headius/thread_safe''; + longDescription = ''Thread-safe collections and utilities for Ruby''; + }; + name = ''thread_safe-0.1.0''; + requiredGems = [ g.atomic_1_1_10 ]; + sha256 = ''0fhx4110il4iiij5wdfq3afn0wvsz7pdvmx5v2zv24gah1861rsf''; + }; + tilt_1_4_1 = { basename = ''tilt''; meta = { description = ''Generic interface to multiple Ruby template engines''; homepage = ''http://github.com/rtomayko/tilt/''; longDescription = ''Generic interface to multiple Ruby template engines''; }; - name = ''tilt-1.3.6''; + name = ''tilt-1.4.1''; requiredGems = [ ]; - sha256 = ''1yz6zfnwq0qyjn71115vd63ly8zm1jss0b2v7fbcbzzj9lrnq9y6''; + sha256 = ''00sr3yy7sbqaq7cb2d2kpycajxqf1b1wr1yy33z4bnzmqii0b0ir''; }; - tins_0_7_2 = { + tins_0_8_2 = { basename = ''tins''; meta = { description = ''Useful stuff.''; homepage = ''http://flori.github.com/tins''; longDescription = ''All the stuff that isn't good/big enough for a real library.''; }; - name = ''tins-0.7.2''; + name = ''tins-0.8.2''; requiredGems = [ ]; - sha256 = ''142mvgn8218wikwdvd5gq4g6k3p24f273wlqvczzfhz02livrz90''; + sha256 = ''0wjc21jf374pyhfha8yw0zvf9br4pnmibx98z8yk9pa4qbslryq9''; }; - treetop_1_4_12 = { + treetop_1_4_14 = { basename = ''treetop''; meta = { description = ''A Ruby-based text parsing and interpretation DSL''; homepage = ''https://github.com/cjheath/treetop''; }; - name = ''treetop-1.4.12''; + name = ''treetop-1.4.14''; requiredGems = [ g.polyglot_0_3_3 g.polyglot_0_3_3 ]; - sha256 = ''1jlfjq67n933sm0px0s2j965v1kl1rj8fbx6xk8y4yppkv6ygxc8''; - }; - trollop_2_0 = { - basename = ''trollop''; - meta = { - description = ''Trollop is a commandline option parser for Ruby that just gets out of your way.''; - homepage = ''http://trollop.rubyforge.org''; - longDescription = ''Trollop is a commandline option parser for Ruby that just -gets out of your way. One line of code per option is all you need to write. -For that, you get a nice automatically-generated help page, robust option -parsing, command subcompletion, and sensible defaults for everything you don't -specify.''; - }; - name = ''trollop-2.0''; - requiredGems = [ ]; - sha256 = ''0iz5k7ax7a5jm9x6p81k6f4mgp48wxxb0j55ypnwxnznih8fsghz''; + sha256 = ''0qbk97wgbvj31sz4h3p8kfmvc8ig97gh91dfmk3m7j1h8vq87acs''; }; tzinfo_0_3_37 = { basename = ''tzinfo''; @@ -1655,6 +1597,30 @@ specify.''; requiredGems = [ ]; sha256 = ''0pi2vabsg73h6z4wfwyd27k63issp2qp1nh0vd74rdk740gmb3kc''; }; + unf_0_1_1 = { + basename = ''unf''; + meta = { + description = ''A wrapper library to bring Unicode Normalization Form support to Ruby/JRuby''; + homepage = ''https://github.com/knu/ruby-unf''; + longDescription = ''This is a wrapper library to bring Unicode Normalization Form support +to Ruby/JRuby. +''; + }; + name = ''unf-0.1.1''; + requiredGems = [ g.unf_ext_0_0_6 ]; + sha256 = ''1q7g7kf1w0bkbfmkbbcsz4hrc45kamll9br8a65l5fv8clbb0m7f''; + }; + unf_ext_0_0_6 = { + basename = ''unf_ext''; + meta = { + description = ''Unicode Normalization Form support library for CRuby''; + homepage = ''https://github.com/knu/ruby-unf_ext''; + longDescription = ''Unicode Normalization Form support library for CRuby''; + }; + name = ''unf_ext-0.0.6''; + requiredGems = [ ]; + sha256 = ''07zbmkzcid6pzdqgla3456ipfdka7j1v4hsx1iaa8rbnllqbmkdg''; + }; uuid_2_3_7 = { basename = ''uuid''; meta = { @@ -1668,7 +1634,7 @@ specify.''; requiredGems = [ g.macaddr_1_6_1 ]; sha256 = ''04q10an3v40zwjihvdwm23fw6vl39fbkhdiwfw78a51ym9airnlp''; }; - uuidtools_2_1_3 = { + uuidtools_2_1_4 = { basename = ''uuidtools''; meta = { description = ''UUID generator''; @@ -1676,9 +1642,21 @@ specify.''; longDescription = ''A simple universally unique ID generation library. ''; }; - name = ''uuidtools-2.1.3''; + name = ''uuidtools-2.1.4''; requiredGems = [ ]; - sha256 = ''0v8scs7760334kkwca7n8kah6nk4hyw7izgk014zg1l1yv7kzpi9''; + sha256 = ''1w0bhnkp5515f3yx5fakfrfkawxjpb4fjm1r2c6lk691xlr696s3''; + }; + webrobots_0_1_1 = { + basename = ''webrobots''; + meta = { + description = ''A Ruby library to help write robots.txt compliant web robots''; + homepage = ''https://github.com/knu/webrobots''; + longDescription = ''This library helps write robots.txt compliant web robots in Ruby. +''; + }; + name = ''webrobots-0.1.1''; + requiredGems = [ ]; + sha256 = ''1jlnhhpa1mkrgsmihs2qx13z3n6xhswjnlk5a2ypyplw2id5x32n''; }; websocket_1_0_7 = { basename = ''websocket''; @@ -1691,26 +1669,6 @@ specify.''; requiredGems = [ ]; sha256 = ''1jrfz4295qbnjaxv37fw9jzxyxz61izp7c0683mnscacpx262zw0''; }; - xapian_full_alaveteli_1_2_9_5 = { - basename = ''xapian_full_alaveteli''; - meta = { - description = ''xapian-core + Ruby xapian-bindings''; - longDescription = ''Xapian bindings for Ruby without dependency on system Xapian library''; - }; - name = ''xapian-full-alaveteli-1.2.9.5''; - requiredGems = [ ]; - sha256 = ''0qg1jkx5lr4a5v7l3f9gq7f07al6qaxxzma230zrzs48bz3qnhxm''; - }; - xapian_ruby_1_2_15_1 = { - basename = ''xapian_ruby''; - meta = { - description = ''xapian libraries and ruby bindings''; - homepage = ''https://github.com/garaio/xapian-ruby''; - }; - name = ''xapian-ruby-1.2.15.1''; - requiredGems = [ ]; - sha256 = ''02v3l931246asbcivkr4j0x99pl4i4fjvfsr8ga8v6lkvz0ls1xp''; - }; xml_simple_1_1_1 = { basename = ''xml_simple''; meta = { From 50e1a9a06e45cd860ce2d3dbc2263b99d90813c6 Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Thu, 11 Jul 2013 10:54:15 +0200 Subject: [PATCH 363/798] Update bittorrent-sync to 1.1.33. Signed-off-by: Moritz Ulrich --- 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 ae339abb799..73b456dc9a5 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.0.134"; - sha256 = if stdenv.system == "x86_64-linux" then "1kyxiqjabqgsg7n0a8snh03axxzpniazp93shb2l1b6x0f7d24n7" - else if stdenv.system == "i686-linux" then "02wb8pqcb1rk108r49cqyg7s14grmjnkr6p3068pkiwdwwgi8jak" + version = "1.1.33"; + sha256 = if stdenv.system == "x86_64-linux" then "1h3b84cbj6w28q591v6ydvmkgv9ydl0qknxjb3vaba0dym5gblvv" + else if stdenv.system == "i686-linux" then "1l7l6najsbqxb01wld54fzgsb122z5a2mlnv1r48sxq26cfwp6bk" else throw "Bittorrent Sync for: ${stdenv.system} not supported!"; in stdenv.mkDerivation { From 096f422545f0e48c5dbf6f41f52c55920c6e11ea Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Fri, 12 Jul 2013 14:57:32 +0200 Subject: [PATCH 364/798] Add memcached to the channel --- pkgs/servers/memcached/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/memcached/default.nix b/pkgs/servers/memcached/default.nix index 17c674b4d06..1c3c3f706e4 100644 --- a/pkgs/servers/memcached/default.nix +++ b/pkgs/servers/memcached/default.nix @@ -15,6 +15,7 @@ stdenv.mkDerivation { homepage = http://memcached.org/; license = "bsd"; maintainers = [ stdenv.lib.maintainers.coconnor ]; + platforms = stdenv.lib.platforms.linux; }; } From 5a562ccac8cb238044f26c0d8e3fd5c978a4e89e Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Fri, 12 Jul 2013 16:30:24 +0300 Subject: [PATCH 365/798] Soprano: version bump to 2.9.3 --- pkgs/development/libraries/soprano/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/soprano/default.nix b/pkgs/development/libraries/soprano/default.nix index 8ca16ff72c7..1447dd5346a 100644 --- a/pkgs/development/libraries/soprano/default.nix +++ b/pkgs/development/libraries/soprano/default.nix @@ -2,11 +2,11 @@ , pkgconfig }: stdenv.mkDerivation rec { - name = "soprano-2.9.2"; + name = "soprano-2.9.3"; src = fetchurl { url = "mirror://sourceforge/soprano/${name}.tar.bz2"; - sha256 = "105xlng1ka0661gk2ap39rjjy7znp670df0c5569x04vppgd45g1"; + sha256 = "08gb5d8bgy7vc6qd6r1kkmmc5rli67dlglpjqjlahpnvs26r1cwl"; }; patches = [ ./find-virtuoso.patch ]; From 67b0d62aa9216f55fb1e5b258ccd2bfd991d1191 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Fri, 12 Jul 2013 16:31:01 +0300 Subject: [PATCH 366/798] attica: version bump to 0.4.2 --- pkgs/development/libraries/attica/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/attica/default.nix b/pkgs/development/libraries/attica/default.nix index 99fe36faa4b..87f6c019fb7 100644 --- a/pkgs/development/libraries/attica/default.nix +++ b/pkgs/development/libraries/attica/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, qt4 }: stdenv.mkDerivation rec { - name = "attica-0.4.1"; + name = "attica-0.4.2"; src = fetchurl { url = "mirror://kde/stable/attica/${name}.tar.bz2"; - sha256 = "1rnd861vy6waf25b1ilsr3rwb06dmmlnd8zq3l8y6r0lq5i2bl9n"; + sha256 = "1y74gsyzi70dfr9d1f1b08k130rm3jaibsppg8dv5h3211vm771v"; }; buildInputs = [ qt4 ]; From c7fbb70af0e3188e78e0b06a6ca261d17679b222 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Fri, 12 Jul 2013 16:31:27 +0300 Subject: [PATCH 367/798] shared-desktop-ontologies: version bump to 0.11.0 --- pkgs/data/misc/shared-desktop-ontologies/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/shared-desktop-ontologies/default.nix b/pkgs/data/misc/shared-desktop-ontologies/default.nix index 23a800f6ae0..831028467f4 100644 --- a/pkgs/data/misc/shared-desktop-ontologies/default.nix +++ b/pkgs/data/misc/shared-desktop-ontologies/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake }: stdenv.mkDerivation rec { - name = "shared-desktop-ontologies-0.10.0"; + name = "shared-desktop-ontologies-0.11.0"; src = fetchurl { url = "mirror://sourceforge/oscaf/${name}.tar.bz2"; - sha256 = "00y55bjmxrwiiw8q0n0jcv95l945hp7nglbwj408sk5m2vq026di"; + sha256 = "1m5vnijg7rnwg41vig2ckg632dlczzdab1gsq51g4x7m9k1fdbw2"; }; buildInputs = [ cmake ]; From f95ece9acdcf01a6961570628493b37141a16549 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Fri, 12 Jul 2013 16:35:34 +0300 Subject: [PATCH 368/798] KDE 4.10: bump to 4.10.5 --- pkgs/desktops/kde-4.10/default.nix | 4 +- pkgs/desktops/kde-4.10/kde-base-artwork.nix | 2 +- pkgs/desktops/kde-4.10/kde-package/4.10.5.nix | 399 ++++++++++++++++++ ...sharing.nix => kdenetwork-filesharing.nix} | 0 ...ns.nix => kdenetwork-strigi-analyzers.nix} | 0 .../kde-4.10/l10n/manifest-4.10.5.nix | 282 +++++++++++++ pkgs/desktops/kde-4.10/oxygen-icons.nix | 2 +- 7 files changed, 684 insertions(+), 5 deletions(-) create mode 100644 pkgs/desktops/kde-4.10/kde-package/4.10.5.nix rename pkgs/desktops/kde-4.10/kdenetwork/{filesharing.nix => kdenetwork-filesharing.nix} (100%) rename pkgs/desktops/kde-4.10/kdenetwork/{kfile-plugins.nix => kdenetwork-strigi-analyzers.nix} (100%) create mode 100644 pkgs/desktops/kde-4.10/l10n/manifest-4.10.5.nix diff --git a/pkgs/desktops/kde-4.10/default.nix b/pkgs/desktops/kde-4.10/default.nix index 9fbb58fe242..f56e64e2d15 100644 --- a/pkgs/desktops/kde-4.10/default.nix +++ b/pkgs/desktops/kde-4.10/default.nix @@ -1,8 +1,6 @@ -{ callPackage, callPackageOrig, stdenv, qt48 }: +{ callPackage, callPackageOrig, stdenv, qt48, release ? "4.10.5" }: let - release = "4.10.4"; - # Need callPackageOrig to avoid infinite cycle kde = callPackageOrig ./kde-package { inherit release ignoreList extraSubpkgs callPackage; diff --git a/pkgs/desktops/kde-4.10/kde-base-artwork.nix b/pkgs/desktops/kde-4.10/kde-base-artwork.nix index 3f416cebddc..d953a830641 100644 --- a/pkgs/desktops/kde-4.10/kde-base-artwork.nix +++ b/pkgs/desktops/kde-4.10/kde-base-artwork.nix @@ -3,7 +3,7 @@ kde { outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "0mrd3w7rhsj0v92c8rh9zjxyifq7wyvwszksf2gyn53dzd06blk8"; + outputHash = "0mrd3w7rhsj0v92c8rh9zjxyifq7wyvwszksf2gyn53dzd06blk5"; buildInputs = [ kdelibs ]; diff --git a/pkgs/desktops/kde-4.10/kde-package/4.10.5.nix b/pkgs/desktops/kde-4.10/kde-package/4.10.5.nix new file mode 100644 index 00000000000..b1abdb8afec --- /dev/null +++ b/pkgs/desktops/kde-4.10/kde-package/4.10.5.nix @@ -0,0 +1,399 @@ +{stable=true; +hashes=builtins.listToAttrs[ + {name="analitza";value="0lc83vmapd66ilph26hlf8shd4xv0v9y8jsjycw5nl4xpfm7l5nr";} + {name="ark";value="1fvb6phcfd17fxcbb5w4njmkj0vlnz6g5qa6wv5szn4fakb5db1v";} + {name="audiocd-kio";value="11ma2pvc7w6gdd98h806i163dsjhxxly4wv4xdcqq4yhdviq29qv";} + {name="blinken";value="1lfv15blwy3m88zylqsa7k1a5z01qmakjrb9wq9yxnjbhb12nyf8";} + {name="bomber";value="0z704hzpgl1s7jdcpicvixd2dnfsh7i4ainjd5zc1rcljgabmvmx";} + {name="bovo";value="10wp4spcdwsa4nbq9qhancvddv83q12qbi72ksnvds50md12h5xx";} + {name="cantor";value="070al4dx7x7kk568lpd1ajq0q5gws48w3n76g0wlf4dqqlijjfx6";} + {name="dragon";value="0wj89v1d34s595ky97zwph7rxb97h03qya3bi6y1npcp7kjlv2j9";} + {name="ffmpegthumbs";value="0ilc8k601g3m4x1slfcczah87f402a9143a70gvbjprffd7iyf9q";} + {name="filelight";value="1wfd498ir1ivcks1ys3h8whvi0l4xwfgz2j5c4m4b517dskrmaxf";} + {name="granatier";value="04i1zzqkv0da6ymqvdxlaxgws7z44521zj51nw4mvapf1jcck7bq";} + {name="gwenview";value="0rz3va3djm3qxqvchxa3549r1qf124sb4105bs6s42a05h4mzhqv";} + {name="jovie";value="05cc6qzn9hgdvqgi8a2k2i89ggx10fv970293z8d59r6wbh1skv6";} + {name="juk";value="00j9c3g1zsa9vbfwpg37jb4w8753sr28q9xbxp3kfablndwid3w9";} + {name="kaccessible";value="0rsdxzqamq2i3f59npsv6pir9bys3g6zd345sfnpbdkinvxyhrdn";} + {name="kactivities";value="0sfbc3w0cvjfp2zs6v28fv69pq5ikignily572jamm8nwaid5h2g";} + {name="kajongg";value="1yffsgbabnp4mckirl888bghpyrj71d8fbsb0rjk96av1kzl2yvx";} + {name="kalgebra";value="0slvk1c1n9g2b5nakfi53l7gh3c2y78pvcy2snj9f1z5c0sr05cn";} + {name="kalzium";value="12gp0k11zf3m5g2aabrbrd7kpi5k3z46w74kalzzk3s1babgnwxn";} + {name="kamera";value="13qka1nc0ibn3kb03l11v64r6w3k4g7ayq539ncp1syba5726xy1";} + {name="kanagram";value="11vd5abdsggzv4svj4wj6q7mcpbxnpjk4gv0m1zw82ya26aarjnk";} + {name="kapman";value="19r8a7k2ib2fijipajbj461b1sfvlfxrlpfmm52njg61xizdxy20";} + {name="kate";value="0wzvhywvkagshs1q8q1rmq3dxlc5h62y7mlfb2x9wzp945rshq6d";} + {name="katomic";value="0vqqjv1magpc7wgwj0cvbykl9qvphc3s03i30qndygi96mf36iwc";} + {name="kblackbox";value="197r2nfrpdynqix1c81y1y72jrbzzl3prjd6q9sca9qnd47xx9kb";} + {name="kblocks";value="0nnbaskl1s9gy6kn8qk3j9qr6vmsbnpmjj4ddn1fvr32kqjfzr3h";} + {name="kbounce";value="0i962rbbi41m8fd7x1vrbi6q46qnij3d8kdc3cwn7mmjp79gzwmq";} + {name="kbreakout";value="1mh7ki87y1jjk7g4n8flr0ym6qk9nh922xsca2ww1vv16mpxww9w";} + {name="kbruch";value="1632a7rjrmll42yazdab1hmgjv39mp16xhkj6mq61sqdd4pj316v";} + {name="kcalc";value="1gyp45f873q6v2y1l8k52x70b92893314h6ci5a07c0asm8ffrpa";} + {name="kcharselect";value="12w3mzh0gqgh6aaih69djv3f4b1z34cxwhnchqz75z2yb9lcdj1c";} + {name="kcolorchooser";value="19b0r8jjy3fkhhzp9hhxw7zyrkb7fafkxs22ik3lzlm6wri1dwpj";} + {name="kdeadmin";value="1fg49z2lgmsvkhhyvahasb5z0l9cad4xwq5ps3qv5f1yj0hfzic4";} + {name="kdeartwork";value="1z1xnljs5lzmahn3i5xs429bpyxzc6b8sw2m216cs06dwfk77if6";} + {name="kde-baseapps";value="1d08wqb3a9fi0gzkls4jmlnmqpfd5fmg4310d2ih78gflv1yk2gz";} + {name="kde-base-artwork";value="1hq35i8mw3akbg9m6wvp9fv6xpamv9na2bjqzqyph8sx0633dxrw";} + {name="kdegraphics-mobipocket";value="0jq1qrrax9w60w35qxvjrazl4c8qvninhgp9na7pgz6sk6ydb0jf";} + {name="kdegraphics-strigi-analyzer";value="07z3nzmfw5pxg97qx2jj54f3r6qc2x22yxhn3kmcpifzr3gyi555";} + {name="kdegraphics-thumbnailers";value="1iwmyn2r43i3bykrc4vx0785f3x5zrnvvfdhfpr88f6pxr95f7bq";} + {name="kdelibs";value="1lgjz90irrqwz8h6w7iwy8icvqyj4kb2sarnyrxna8dy1fah9m5n";} + {name="kdenetwork";value="1lra150av4ndq5s9msx1khwdwd8k0n756qg6d4fsjp2fy7scf26k";} + {name="kdepim";value="0qs1znrvfzrkhlh1d68pri9fnaq2nhxnih5fsjcn2m7d537havq1";} + {name="kdepimlibs";value="01hyi3r2an8g9ds59az39c8qdm8qiws6q16558jna7f6w4m0yq5r";} + {name="kdepim-runtime";value="1p293zqwdc0g77h996slc0qwa01a24nq5yh5a4q6ng92rfzzkrl3";} + {name="kdeplasma-addons";value="0hs9bmg4gcl9lks78pmb0n29jzzh56w5islyzhzccrrcbimsqvzp";} + {name="kde-runtime";value="0daw0sjyqrdhsah920fla05wvcf9zrck1lbkdcbvrk1qvvqwjhpx";} + {name="kdesdk";value="0h1il5dza8qcfz1fgz6qhsaccqkp0g5fdi4k3413vr6lhg67dh78";} + {name="kdetoys";value="1r2rh0hdipwfxwq29whicbvxa7dr5vswh9pqw60x1c634cgba49p";} + {name="kde-wallpapers";value="1d96asb1nn88rwzb2nis37d8qwliaswpzfc15zq6jkcbdyzaxfpv";} + {name="kdewebdev";value="18s79ah9j01mb3lpzpsi6wxbh3wjpkswx5snpv1fyphf760jzb3n";} + {name="kde-workspace";value="0xg8asnxq48x6zydh09bfga11363bya7hfkygas7ar7rb0144im3";} + {name="kdf";value="0d3i5jpikh285vwr93044lws34ihhbszb05gbyvibx7faqdllg2h";} + {name="kdiamond";value="1dca5h88lm2syhnk5bd8g83lx9422hyg972di4xj69vnnpl5nsp9";} + {name="kfloppy";value="02yq8p8ma1aghm9k442xznk1xwb4mcd36h040ix5rc7j3j02l79m";} + {name="kfourinline";value="0ljs9szk4r6iasn4qkclpq3nij5hb8xnyqj36w8nxbvsmka69d2p";} + {name="kgamma";value="0byvsk5j2g1ycfq5zskg9bkbmq9jddv0nzck2w4qayf072cqn8b3";} + {name="kgeography";value="0icf21sr6w920ga6as9yx1ja85gwk3h2bb1ra9k5bs32vw5r7nk9";} + {name="kgoldrunner";value="18i0mj3j6q1gycf33z416kcf9lsksrmk8fnp4j1jg9mlr6y1xc6c";} + {name="kgpg";value="1x04mj6ykmhmlr2074bn6kc88zz4y3lgbvnf4qkcj8q5wil1p3gv";} + {name="khangman";value="0yrqd17w78pl18ln8rqcb0cmqis8al9k3zvg0hvxyh3qp013xb9m";} + {name="kig";value="1wd8kk4gkvgxp83q6dqdqkqaznbrl8kk88ixk17qhlj03iykxfcj";} + {name="kigo";value="1g78wqsk72mki48inxam6337hpjd491325j3cmvvlz0196q3s4zn";} + {name="killbots";value="1kjmwsrqmj85yawbw6xr025bkv3kidwasiyrjr01mgsndlkn3y47";} + {name="kimono";value="0wswbykjq56rxf0rkkl97ipy36r5q8h9sws758fvwmd16nylhdg0";} + {name="kiriki";value="0iv3lak13szc93gqqjlqdmdbg3jy4xbxvnahzka0d3m2nkg9iv6h";} + {name="kiten";value="1112kl5vbz58v52nss4gd4plnrl3nkp57mnhdbs58dlxv1s1s7b9";} + {name="kjumpingcube";value="1y9pgqsq72v9mxw04dkg4x2m15jyl5iahqshxczzihh3pjllv7sr";} + {name="klettres";value="0kqjw7vrpzvrr4g6zhdsqppbr2viqr7jann4npnzh0bw48842zhp";} + {name="klickety";value="0d78nak6dzmkfsxq7cxndca51paw2giawk31s70fgr7kwa7s9g9f";} + {name="klines";value="0z8bp1xwy17k1nv7d8mrgsk7vgb5137icdy0d66jwaa9bzsv3khh";} + {name="kmag";value="1iamiy8ppyd4qkbdhqykxgh6c8w31glpjv1srk9s4gqyqj51mf24";} + {name="kmahjongg";value="02ai75zc5rfch3b7a2zz9kmw6r3kgkbzr9pi8c1zrdgif8awrl3x";} + {name="kmines";value="0hc838cd5h8gjm4alszi8z70r3jmjxqwmhni1silk16gsiy3kqvy";} + {name="kmix";value="08ls620ndrvszx36sy2xj32fvwm5b8aggp86cwvzqjvp47c46wjv";} + {name="kmousetool";value="02lg84gpnic2l84ay01adw2fynr0x7byklqdz3zphiqhddhfnb81";} + {name="kmouth";value="09jg2xar4p6rrcc41qfj0h57fapdgpdpjh6ackhyana0871q5cam";} + {name="kmplot";value="17s7n51x2nl5g4l0862gnzigkwa7qwipmvy7krn8b1z051n2jwfx";} + {name="knavalbattle";value="15qpgn5bjbk4smwzz5x0x9f1kd5mjhg6p4h4dalcay8k9zixxxvl";} + {name="knetwalk";value="0yqdxcah56z1q21xfrk33s4fx6l9q21na5dx1p12d114vzgr3gzq";} + {name="kolf";value="08ba3flnknzjgys73lhpy7b98j544wwv6vvbrd6p2675imwk168w";} + {name="kollision";value="1jahrgkb9j8shwrmm1486f3w1hd5snwfwv53gj7973z0mmm5468r";} + {name="kolourpaint";value="18ql77778zdc9149qd7mslkh780v6qkhdc1wfljrr1mj98p08av9";} + {name="konquest";value="1iyqgzyg004lyqssmvh4951m9v56ayw7ggza6awh6a805j0zz0sp";} + {name="konsole";value="1zqmmv4zpq59nm2r7ccmp1ij5q3qjclmbmcm667hxmq9dyrwv5an";} + {name="korundum";value="12cqg6ib06icadyslnqzqmkal6rmjhki02na09gacqdiwc7gf2p2";} + {name="kpat";value="1zdv4jvqg0xbbsf39d2n8d0ya2mqzva06s46m2hb66flyjz5pd3p";} + {name="kremotecontrol";value="0jw4jjlhy378f58wgqm5cikqj8i3bdz1s1qm4r24bb1677dqyd4x";} + {name="kreversi";value="1mxgb60zbq8qkjnamvlr072vii2px224mg03fjjds063321swx0z";} + {name="kross-interpreters";value="0r2y7lscsgk6jkzby7dqwd62yk2nyzwm6chihsvivl9frl38wqza";} + {name="kruler";value="0gwyy0k8h705bnp6q7jgzbk8i9d6csffhwlas7y0zwcl7n03664x";} + {name="ksaneplugin";value="187n3s19xdfl7bbcpgyappw1v2bgjki8kh1qh8dy8mscm2qn50j9";} + {name="kscd";value="0wqm2vhj593x4vps3205gfnl29yglr2szzpdiazi6rq80r8ifvbq";} + {name="kshisen";value="1n5131kckixwbllp8sxn5y93z9q2fdvjj77pcy4sadngx5slz718";} + {name="ksirk";value="0b2084h246jhphwpa5iwpxbib4z4h6cwvi8bp18l7yid77wz28f2";} + {name="ksnakeduel";value="0v74l5svmr21gahxzfz7sjnj5gzhnyir7l7cny1q7xnha7bnaw81";} + {name="ksnapshot";value="05l18i9mv9pghlf50qax9drlcrmdahgiljnvcq20vadrxw4qxghv";} + {name="kspaceduel";value="0q8iqg5n7w0v5llbgan7vnf41zbfagc0rd8ya7fp9gf5pmx422zf";} + {name="ksquares";value="0fnz1hy2n0i1gal9b8ij8bi5sql5iybbjpkyy55dapcbph2br8xc";} + {name="kstars";value="0nf3n9f6dmp8401d2jfcyh26xbwmwdav4maacp5dmhv6xvr2ivis";} + {name="ksudoku";value="07lxxaw6ykhlxzkbhzsz43ingfx0l1gb38v2z0ag8jd3iln7l79v";} + {name="ktimer";value="112449fn8zbgz3s22bswyc8fisa126j6xvmwxzb91c5vx0wj9qg8";} + {name="ktouch";value="0a9x6ym3gw3d6jqvlfaw5qyxzcn9vi4sa55ig0d9cdy8057y5pwz";} + {name="ktuberling";value="1ihvv3mais39yk84k1a76mpz5c9sbbnw80n536adh3y3fad4yw5a";} + {name="kturtle";value="07fxjiaq69x97w45z8r3g1iyi0vyk0wyqwjwn1qb7a1ziwva5jl9";} + {name="kubrick";value="0mqf52lp0s61qsv8q47h012m5k8mf6gqwjpb7swrs7hxsc58dspy";} + {name="kwallet";value="0mb8ph0wf761gpss7xmi4zngxfalm3sdngjxrpr8brczjp8v9wdm";} + {name="kwordquiz";value="0rbrfswf13pw4cam8fj9w7g12yhzvg82izzy79xsxb0dkk4ki42n";} + {name="libkcddb";value="033vmv8fin87m788qjyjaravf5gr9cj953yvcfg9438qpavd79qr";} + {name="libkcompactdisc";value="105w0bnw6gzjb8gnp2gmwcjgaz3gi4f16fninbl2658dnb24b1kq";} + {name="libkdcraw";value="0p1wbdrhpp6rg82kfrxhaz4lxqjix6mb1grj16zy1i24x89mxlya";} + {name="libkdeedu";value="1b6qpd3i59hfd7rwij255xyrxp5ylw5mpyr6k10py5pj7fn4zhc2";} + {name="libkdegames";value="1cc5011xm9rz9fz2dk3ibfr4cqq3rmw3i7vlcsrhfscsx0xm88sc";} + {name="libkexiv2";value="18ngfrz30q0prsrwy92hb7y0hxhcxlr4ic7lq7fv4l45434ry7pv";} + {name="libkipi";value="00nn96qwynfx2ajqllh8zkwccc1prigbcq75s1hnpm67nnfc98as";} + {name="libkmahjongg";value="06qpykgaxx5r7n3ymph1g2fy0dj2vclfqlnzbdc41ma3l66jci64";} + {name="libksane";value="0a0ipz9jmrw076mxsj2k3njaf7dwfrdqd5bqwcc4q8qqlhpp4ljy";} + {name="lskat";value="1sxmjhw61w1d19zidf96qkddx9r0h8z5kbjl8xgah8k25ji5qsr6";} + {name="marble";value="04cy00jsnahmigffjyqviizj5bvj2aldfgkyj2g5iadfsqflxvy4";} + {name="mplayerthumbs";value="0hmdvyillr779c1fmia3h6dcy7j7j0kvxvh4mdz1adfwaz4zgymy";} + {name="nepomuk-core";value="12grw88gc4b4i1h346ahpkv8493gyvhvkpcqxwc2dqpsqsfc7rpz";} + {name="nepomuk-widgets";value="1npmwv1vh5ci6c9a291vyps85c5cvdg5dn9r9h28dq58s2h274yh";} + {name="okular";value="05v23g4w6sw525w7qllcbyhk92k75hyqrvx9hncylig4blivjp9f";} + {name="oxygen-icons";value="1y7iq77fyiykmjf8xdyprnshlasazdv6fcjp6ayfx0jkixb2gqya";} + {name="pairs";value="1v4h0d04b7g59axkl69gyml02hzxjkfzcgg320mj05xx5q0kjyq5";} + {name="palapeli";value="13hvppav7yz9wvvly8f8kads9arqvl25spwa8awpl2f4a394c0sa";} + {name="parley";value="0wk6p4rw6063089iq758a0mcq10fh8c1pg0wq00dhs9d05gwk873";} + {name="perlkde";value="1hh5y4zmmb97py281i0jhzwg8r4ii3qmilzbwbrvk9j4ngcz37gg";} + {name="perlqt";value="09880varap78a44zifqx72wbx23wq0hqq540hf466fmmxk744877";} + {name="picmi";value="060a1n5lclsaz4zjq1dpm9y20fqgq3rjlkm54prp3kkj5hpi6kcl";} + {name="print-manager";value="0jmvfy376axdwi4a2fc78ldlny4jbk7kxvhi1mwf8piibwc10dvf";} + {name="pykde4";value="10aqvx6dfcbi9mrsr0sdhhxp2jqkw06rf55p2nxdadmcszad2k7k";} + {name="qtruby";value="042nya6n5sp2r9a9s3limbph8wv5z04fha7pkqznvrkr040qykvj";} + {name="qyoto";value="0nxhxvh4zpskvxv7mjz06vililg2wqlabaaaf61j0naxz4aynyrv";} + {name="rocs";value="10xb6qh29g4l369dyimwj0yk8s5yi6jg1byaf4z5jnr2w8ysbf7j";} + {name="smokegen";value="0myzqfqcl7i8kikcyj2vbip9y4al411jmjm02hv55baccygls8yr";} + {name="smokekde";value="0b1m9g1swj9r44zbg8lbqmxp9l342dz8b4wsnn6n9ih0b15p512h";} + {name="smokeqt";value="047am45yjkyyza281zfzvv84kvldvmbgch5q3fd89vcvl5sh399j";} + {name="step";value="05rjnb16mzz91q7473k2g83g792xqh77p4gc2xmw0a5j4qk6f6ga";} + {name="superkaramba";value="0vxb8656ag6hmy3nx9w3xa38j12rajkqsmv4kx6ylnpk6v71s7x2";} + {name="svgpart";value="17j59rwg483p7ip1zxq37jnzvkafrkj7yabwrbwk0vvxkqcbqpx3";} + {name="sweeper";value="0yhp6k2ai7wgn242932w10xwainq07bf9zjm2fvaavrg3gh38644";} +]; +modules=[ +{ + module="kdemultimedia"; + split=true; + pkgs=[ + { name="audiocd-kio"; sane="audiocd_kio"; } + { name="dragon"; } + { name="ffmpegthumbs"; } + { name="juk"; } + { name="kmix"; } + { name="kscd"; } + { name="libkcddb"; } + { name="libkcompactdisc"; } + { name="mplayerthumbs"; } + ]; +} +{ + module="kdegraphics"; + split=true; + pkgs=[ + { name="gwenview"; } + { name="kamera"; } + { name="kcolorchooser"; } + { name="kdegraphics-mobipocket"; sane="kdegraphics_mobipocket"; } + { name="kdegraphics-strigi-analyzer"; sane="kdegraphics_strigi_analyzer"; } + { name="kdegraphics-thumbnailers"; sane="kdegraphics_thumbnailers"; } + { name="kgamma"; } + { name="kolourpaint"; } + { name="kruler"; } + { name="ksaneplugin"; } + { name="ksnapshot"; } + { name="libkdcraw"; } + { name="libkexiv2"; } + { name="libkipi"; } + { name="libksane"; } + { name="okular"; } + { name="svgpart"; } + ]; +} +{ + module="kdelibs"; + split=true; + pkgs=[ + { name="kdelibs"; } + { name="nepomuk-core"; sane="nepomuk_core"; } + { name="nepomuk-widgets"; sane="nepomuk_widgets"; } + ]; +} +{ + module="kdeutils"; + split=true; + pkgs=[ + { name="ark"; } + { name="filelight"; } + { name="kcalc"; } + { name="kcharselect"; } + { name="kdf"; } + { name="kfloppy"; } + { name="kgpg"; } + { name="kremotecontrol"; } + { name="ktimer"; } + { name="kwallet"; } + { name="print-manager"; sane="print_manager"; } + { name="superkaramba"; } + { name="sweeper"; } + ]; +} +{ + module="applications"; + split=true; + pkgs=[ + { name="kate"; } + { name="konsole"; } + ]; +} +{ + module="kdegames"; + split=true; + pkgs=[ + { name="bomber"; } + { name="bovo"; } + { name="granatier"; } + { name="kajongg"; } + { name="kapman"; } + { name="katomic"; } + { name="kblackbox"; } + { name="kblocks"; } + { name="kbounce"; } + { name="kbreakout"; } + { name="kdiamond"; } + { name="kfourinline"; } + { name="kgoldrunner"; } + { name="kigo"; } + { name="killbots"; } + { name="kiriki"; } + { name="kjumpingcube"; } + { name="klickety"; } + { name="klines"; } + { name="kmahjongg"; } + { name="kmines"; } + { name="knavalbattle"; } + { name="knetwalk"; } + { name="kolf"; } + { name="kollision"; } + { name="konquest"; } + { name="kpat"; } + { name="kreversi"; } + { name="kshisen"; } + { name="ksirk"; } + { name="ksnakeduel"; } + { name="kspaceduel"; } + { name="ksquares"; } + { name="ksudoku"; } + { name="ktuberling"; } + { name="kubrick"; } + { name="libkdegames"; } + { name="libkmahjongg"; } + { name="lskat"; } + { name="palapeli"; } + { name="picmi"; } + ]; +} +{ + module="kdeedu"; + split=true; + pkgs=[ + { name="analitza"; } + { name="blinken"; } + { name="cantor"; } + { name="kalgebra"; } + { name="kalzium"; } + { name="kanagram"; } + { name="kbruch"; } + { name="kgeography"; } + { name="khangman"; } + { name="kig"; } + { name="kiten"; } + { name="klettres"; } + { name="kmplot"; } + { name="kstars"; } + { name="ktouch"; } + { name="kturtle"; } + { name="kwordquiz"; } + { name="libkdeedu"; } + { name="marble"; } + { name="pairs"; } + { name="parley"; } + { name="rocs"; } + { name="step"; } + ]; +} +{ + module="kdebindings"; + split=true; + pkgs=[ + { name="kimono"; } + { name="korundum"; } + { name="kross-interpreters"; sane="kross_interpreters"; } + { name="perlkde"; } + { name="perlqt"; } + { name="pykde4"; } + { name="qtruby"; } + { name="qyoto"; } + { name="smokegen"; } + { name="smokekde"; } + { name="smokeqt"; } + ]; +} +{ + module="kdeaccessibility"; + split=true; + pkgs=[ + { name="jovie"; } + { name="kaccessible"; } + { name="kmag"; } + { name="kmousetool"; } + { name="kmouth"; } + ]; +} +{ + module="kde-baseapps"; +sane="kde_baseapps"; split=true; + pkgs=[ + { name="kde-baseapps"; sane="kde_baseapps"; } + ]; +} +{ module="kactivities"; split=false;} +{ module="kdeadmin"; split=false; + pkgs=[ + { name="strigi-analyzer"; sane="strigi_analyzer";} + { name="kuser"; } + { name="ksystemlog"; } + { name="kcron"; } + ]; + +} +{ module="kdeartwork"; split=false; + pkgs=[ + { name="ColorSchemes"; } + { name="IconThemes"; } + { name="emoticons"; } + { name="kscreensaver"; } + { name="kwin-styles"; sane="kwin_styles";} + { name="sounds"; } + { name="styles"; } + { name="wallpapers"; } + { name="HighResolutionWallpapers"; } + { name="WeatherWallpapers"; } + { name="desktopthemes"; } + ]; + +} +{ module="kde-base-artwork"; sane="kde_base_artwork"; split=false;} +{ module="kdenetwork"; split=false; + pkgs=[ + { name="kdenetwork-strigi-analyzers"; sane="kdenetwork_strigi_analyzers";} + { name="kdenetwork-filesharing"; sane="kdenetwork_filesharing";} + { name="kppp"; } + { name="kdnssd"; } + { name="krdc"; } + { name="krfb"; } + { name="kget"; } + { name="kopete"; } + ]; + +} +{ module="kdepim"; split=false;} +{ module="kdepimlibs"; split=false;} +{ module="kdepim-runtime"; sane="kdepim_runtime"; split=false;} +{ module="kdeplasma-addons"; sane="kdeplasma_addons"; split=false;} +{ module="kde-runtime"; sane="kde_runtime"; split=false;} +#had to add fake pkgs to kdesdk to get it to be treated like a split module +{ module="kdesdk"; split=false; pkgs = [{ name="fake"; }]; } +{ module="kdetoys"; split=false; + pkgs=[ + { name="kteatime"; } + { name="ktux"; } + { name="amor"; } + ]; + +} +{ module="kde-wallpapers"; sane="kde_wallpapers"; split=false;} +{ module="kdewebdev"; split=false; + pkgs=[ + { name="klinkstatus"; } + { name="kfilereplace"; } + { name="kimagemapeditor"; } + { name="kommander"; } + ]; + +} +{ module="kde-workspace"; sane="kde_workspace"; split=false;} +{ module="oxygen-icons"; sane="oxygen_icons"; split=false;} +]; +} diff --git a/pkgs/desktops/kde-4.10/kdenetwork/filesharing.nix b/pkgs/desktops/kde-4.10/kdenetwork/kdenetwork-filesharing.nix similarity index 100% rename from pkgs/desktops/kde-4.10/kdenetwork/filesharing.nix rename to pkgs/desktops/kde-4.10/kdenetwork/kdenetwork-filesharing.nix diff --git a/pkgs/desktops/kde-4.10/kdenetwork/kfile-plugins.nix b/pkgs/desktops/kde-4.10/kdenetwork/kdenetwork-strigi-analyzers.nix similarity index 100% rename from pkgs/desktops/kde-4.10/kdenetwork/kfile-plugins.nix rename to pkgs/desktops/kde-4.10/kdenetwork/kdenetwork-strigi-analyzers.nix diff --git a/pkgs/desktops/kde-4.10/l10n/manifest-4.10.5.nix b/pkgs/desktops/kde-4.10/l10n/manifest-4.10.5.nix new file mode 100644 index 00000000000..9862efe0b58 --- /dev/null +++ b/pkgs/desktops/kde-4.10/l10n/manifest-4.10.5.nix @@ -0,0 +1,282 @@ +[ +{ + lang = "ar"; + saneName = "ar"; + sha256 = "0mxvp97sf1f6w2rfy966fdhpflqfmwv253zswaz3cv9b5m9yf5q8"; +} +{ + lang = "bg"; + saneName = "bg"; + sha256 = "0fk5r0bqnks1ygac6cs8f5gb16lr4qrh32jgdk50hnv6ad51agfv"; +} +{ + lang = "bs"; + saneName = "bs"; + sha256 = "10kc76l1fm56rhnc6wvm29ij15v2pvmsq1djvm6zxhsdm99af25k"; +} +{ + lang = "ca"; + saneName = "ca"; + sha256 = "0gn4ghvwwi09aibmx5940b159d7svnbcq25cg02lhvjvfrmyfp1j"; +} +{ + lang = "ca@valencia"; + saneName = "ca_valencia"; + sha256 = "175j2gn35vzjb17rbd0mvrxas180wq3v1x6q1caykm2qddqqmqgv"; +} +{ + lang = "cs"; + saneName = "cs"; + sha256 = "0zxa2cmcwdbdwgz5wm58v0gqzphcc1b1vzzgrrnpsmfjqb6h951c"; +} +{ + lang = "da"; + saneName = "da"; + sha256 = "0qab4gbilpb8fwyjqcvvmzms4hdbrii4xr5xgcl87v8va5gcdc8s"; +} +{ + lang = "de"; + saneName = "de"; + sha256 = "1vh9h185qa42q7gkyflp7g93hgvhxjd2cknwz0yq6dxsx8dg5iqd"; +} +{ + lang = "el"; + saneName = "el"; + sha256 = "1f8wsq9hh2d6wpd7v1bz5mchb1zjnc895mmpawy67rv6s45vx6y8"; +} +{ + lang = "en_GB"; + saneName = "en_GB"; + sha256 = "1nz7q6fq3242vjh2961r4v4kp1fywknnjrnfadgf3g0dvav2vkq8"; +} +{ + lang = "es"; + saneName = "es"; + sha256 = "1mazkh53vdvsz5zrx41fi49x44isibpwmrrqwcmpbcwdqx7iaf9v"; +} +{ + lang = "et"; + saneName = "et"; + sha256 = "0f7bi50gzrhnvif7c1h6mgscbbjvz0cqifdnaaqr9m7d9iafwwyz"; +} +{ + lang = "eu"; + saneName = "eu"; + sha256 = "0k0w849nqjsaxsi8rm4jd13fqcvk88v6j0yar36mvblh6x61qgq8"; +} +{ + lang = "fa"; + saneName = "fa"; + sha256 = "12fmd6zy14wsd2i1nszc4bl3q0asvf9wqsgwihxipw34fwa6irpv"; +} +{ + lang = "fi"; + saneName = "fi"; + sha256 = "0k76zlfjjz7vlvlz298713c27zbcybjip33wix76ldj7is9yb07v"; +} +{ + lang = "fr"; + saneName = "fr"; + sha256 = "03qxm8q3bvx4cqaxvfbdj07q2rpcwrqyp333x3jwmcc5xj731pww"; +} +{ + lang = "ga"; + saneName = "ga"; + sha256 = "09n5wpc4s2xxv1016dvg8zwbvx6lx6942lnyq3b4adl4yjcghs32"; +} +{ + lang = "gl"; + saneName = "gl"; + sha256 = "1w7hj6ma3d03wv2x651hwhxxc4ird23f0khc4z03ncpl9xvyikky"; +} +{ + lang = "he"; + saneName = "he"; + sha256 = "0jirch5cw99lcs9d83kzifb9wdqz1aqdjmi4wam0gi8nciws8hwr"; +} +{ + lang = "hi"; + saneName = "hi"; + sha256 = "02g0a4l1mlmx64acxfl6a1lqbivnwdfx98q8f9nyb3836i8i3sd7"; +} +{ + lang = "hr"; + saneName = "hr"; + sha256 = "087jww1daqqwrrxi1hz72kc39ipj6hj73cqzy4ds24hm112z58dc"; +} +{ + lang = "hu"; + saneName = "hu"; + sha256 = "1mwmbhnzvhxzcfk3j6f61jfprfwaan8mf9l4s7r8f3ddmsz66kha"; +} +{ + lang = "ia"; + saneName = "ia"; + sha256 = "0grmi972ndizf3gpjxjv79crc0si4b3dadayzmayrykndd5b30i6"; +} +{ + lang = "is"; + saneName = "is"; + sha256 = "13d8ikfhlswpaxrj9l6f0kf4dzbmgri5d3miz3r8h6lmmszq2phr"; +} +{ + lang = "it"; + saneName = "it"; + sha256 = "1m17wqak0alhkk81fhl32fcv0b2nnszjs7xia0df75z8c2js9vmm"; +} +{ + lang = "ja"; + saneName = "ja"; + sha256 = "1br0gipw4ra3bvzdal9dn8x8kldmmk4miw1z5hsimhkgc5y5amb3"; +} +{ + lang = "kk"; + saneName = "kk"; + sha256 = "0vmdfcy2dmxd6bjvz31xhjkxd2q55px70c9d6lj3fmf4bxiqlmc4"; +} +{ + lang = "km"; + saneName = "km"; + sha256 = "1snrn2yw7z2m0m3wqxgqrq1rxqnjb4ylngdnn0ym87yh7bh6kjsc"; +} +{ + lang = "ko"; + saneName = "ko"; + sha256 = "1dyymy3wdldmkxai47y25qzpcajsi18h4rl0m1izm90giwadrk85"; +} +{ + lang = "lt"; + saneName = "lt"; + sha256 = "1im120mlnvjdlh5gna9q0qfixg2zz2shhzbxih37ikzpjxr7v5zs"; +} +{ + lang = "lv"; + saneName = "lv"; + sha256 = "07303s04qkh7pa78ranvcvqs75wll427vdb0iv6sr07smd0fzf1d"; +} +{ + lang = "mr"; + saneName = "mr"; + sha256 = "1dzzzc3wkjhapmdlbp178w6rm00ibixmp4xhkbsavr7hy18a048c"; +} +{ + lang = "nb"; + saneName = "nb"; + sha256 = "039gi1ba8z9w80b6xsh3b51alq91d4phr6pmfnaqngwqmaksxidh"; +} +{ + lang = "nds"; + saneName = "nds"; + sha256 = "0bg55dl284y7wvcl40sgspnvpfiqkapvwwi02n4jyl3w4xsy3b8j"; +} +{ + lang = "nl"; + saneName = "nl"; + sha256 = "048pr21vfcwvfxpw56kil4awmx7samva4jd86g6rvrs6q85c0mxj"; +} +{ + lang = "nn"; + saneName = "nn"; + sha256 = "10xy5r3s79gh28zzy72dhs79ap616qnrqms3mgg9kdvmmi2n32nm"; +} +{ + lang = "pa"; + saneName = "pa"; + sha256 = "08ib4pbahgjww4d82vcgahc7jxky85riim1p0ck5dzhri0664zx8"; +} +{ + lang = "pl"; + saneName = "pl"; + sha256 = "0kqr4jvqsyasdacv0kxjcx5nfd6m0kd1vk7418mzbabjyb2nbvl1"; +} +{ + lang = "pt"; + saneName = "pt"; + sha256 = "0nfnwcq2n5dp721wi7arp3via0kvhf3rfq8h78k9dqs5afyhf4n1"; +} +{ + lang = "pt_BR"; + saneName = "pt_BR"; + sha256 = "1886fga94c7zp0g1hdijqj64mi8asgbmykic6n0mzin33c4rwyjs"; +} +{ + lang = "ro"; + saneName = "ro"; + sha256 = "0q51v23dviwrgy1zaq3823xh2vfm2zvkpqizgmi111m681s0n4kx"; +} +{ + lang = "ru"; + saneName = "ru"; + sha256 = "0mm8mfqlfbj0r2d4xyli2n8x8sgpw2bjxnlq8yy38pgi9pksgcsl"; +} +{ + lang = "si"; + saneName = "si"; + sha256 = "0qcvdil9gbgwf10v4j606d0vi4705vb77aq7p1kq3y57khldlhsa"; +} +{ + lang = "sk"; + saneName = "sk"; + sha256 = "1rmxh12r7i9cc7nkigxx6igvzjjq1rk3y5nm2mdjq7gcv067gp9i"; +} +{ + lang = "sl"; + saneName = "sl"; + sha256 = "0xdd5ini0b0fi5xfai533y8a5g8gyphfrz6qvivpgdd81rfckpk1"; +} +{ + lang = "sr"; + saneName = "sr"; + sha256 = "09rfcrw58f0bvqqkdcpiy56xv591yk6v0iinlabamza63h011rmk"; +} +{ + lang = "sv"; + saneName = "sv"; + sha256 = "1slznfn6ghqy5cy870apwgcygdhvbfvh1dy6rplhwnv0riwnx3ay"; +} +{ + lang = "tg"; + saneName = "tg"; + sha256 = "12ic6nd65l6w7vqymfr1djbkn8jfghc5vyyi783mdf3pwx3xjk8i"; +} +{ + lang = "th"; + saneName = "th"; + sha256 = "0v02h8gdwnabahb3invxvp2ap5x6b4a0pf0sl15phi8s2m1y9fad"; +} +{ + lang = "tr"; + saneName = "tr"; + sha256 = "10asd6ha7fjs4b11vp27xp1piycalvidv3l6z5sv9j5bs4hayp1g"; +} +{ + lang = "ug"; + saneName = "ug"; + sha256 = "11n6z1d2b2b93lj9vps4ry6k671m5lssrv4hi5nr0a1vbc1d6ix1"; +} +{ + lang = "uk"; + saneName = "uk"; + sha256 = "1lrghs0s3hmhmrqarsc29518ax95wz6gnhimxs8lyc88b4jil0p5"; +} +{ + lang = "vi"; + saneName = "vi"; + sha256 = "198rr7i673a77v3qlld1c0rm2vr86rr6nf97v4wckcvyz8b6s6i8"; +} +{ + lang = "wa"; + saneName = "wa"; + sha256 = "01glzj5vhhmv6zvrmwd4wwx0bq6b0p08ixx0rf3bh4pdbi42hiin"; +} +{ + lang = "zh_CN"; + saneName = "zh_CN"; + sha256 = "0cj8flr5c73crrwchfz3j60snzmvbr3bc1p4pnk4s3vajmwsdaas"; +} +{ + lang = "zh_TW"; + saneName = "zh_TW"; + sha256 = "0lc896x55ww3s5jz7ms0gmm22qq9yjpnbzbjfq64574pvr2m3s5y"; +} +] diff --git a/pkgs/desktops/kde-4.10/oxygen-icons.nix b/pkgs/desktops/kde-4.10/oxygen-icons.nix index 373f2c7b5ac..adee87c8316 100644 --- a/pkgs/desktops/kde-4.10/oxygen-icons.nix +++ b/pkgs/desktops/kde-4.10/oxygen-icons.nix @@ -3,7 +3,7 @@ kde { outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "0nl3praln6kfdpr4diln850f29242496p5yrfcyq6xjkpsswq55w"; + outputHash = "1aad2qb9zrjcild5s584q4zz6zc3wgkclv79gnfwkhmy0viqx9l6"; nativeBuildInputs = [ cmake ]; From 0024926701875c6cac245281f07d899f2ee14d92 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Fri, 12 Jul 2013 15:43:51 +0200 Subject: [PATCH 369/798] Updated nodejs packages --- pkgs/top-level/node-packages-generated.nix | 148 ++++++++++++--------- 1 file changed, 84 insertions(+), 64 deletions(-) diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix index 6a74c807581..141ba26ea52 100644 --- a/pkgs/top-level/node-packages-generated.nix +++ b/pkgs/top-level/node-packages-generated.nix @@ -143,9 +143,9 @@ } { baseName = "aws-sdk"; - version = "1.3.1"; + version = "1.3.2"; fullName = "aws-sdk-*"; - hash = "1c8c49435a4ddf5ceb29b0c9d130893a95de30207785c3dc9d902c9174362967"; + hash = "6ad0b23bf6eba85609caed4a190ff0068cf0a0a94437b6cfab98fa6ea0c911fe"; patchLatest = true; topLevel = true; dependencies = [ @@ -155,9 +155,9 @@ } { baseName = "aws-sdk"; - version = "1.3.1"; + version = "1.3.2"; fullName = "aws-sdk->=1.2.0 <2"; - hash = "1c8c49435a4ddf5ceb29b0c9d130893a95de30207785c3dc9d902c9174362967"; + hash = "6ad0b23bf6eba85609caed4a190ff0068cf0a0a94437b6cfab98fa6ea0c911fe"; patchLatest = true; topLevel = false; dependencies = [ @@ -219,9 +219,9 @@ } { baseName = "bindings"; - version = "1.1.0"; + version = "1.1.1"; fullName = "bindings-*"; - hash = "9ce864c7ce347eb3f8728fc03bc5a01f5e6195b145e6b9674eb2b98c5c715865"; + hash = "6145f4ae35591a3c51bbcc20628070347353ab90b5313993eda1c1c6927e375b"; patchLatest = false; topLevel = false; dependencies = [ @@ -563,9 +563,9 @@ } { baseName = "connect"; - version = "2.8.3"; - fullName = "connect-2.8.3"; - hash = "a68c7f95eb1d8f574ffbba1c6ceaaa8a05189774099dcb327e29721f4514f309"; + version = "2.8.4"; + fullName = "connect-2.8.4"; + hash = "e42ef0828b98bdcbbe32f3208ee40b0a92026f3b1fd04425854577454e26546f"; patchLatest = false; topLevel = false; dependencies = [ @@ -574,7 +574,7 @@ { name = "cookie-signature"; range = "1.0.1"; } { name = "buffer-crc32"; range = "0.2.1"; } { name = "cookie"; range = "0.1.0"; } - { name = "send"; range = "0.1.2"; } + { name = "send"; range = "0.1.3"; } { name = "bytes"; range = "0.2.0"; } { name = "fresh"; range = "0.1.0"; } { name = "pause"; range = "0.0.1"; } @@ -606,9 +606,9 @@ } { baseName = "connect"; - version = "2.8.3"; + version = "2.8.4"; fullName = "connect-~2"; - hash = "a68c7f95eb1d8f574ffbba1c6ceaaa8a05189774099dcb327e29721f4514f309"; + hash = "e42ef0828b98bdcbbe32f3208ee40b0a92026f3b1fd04425854577454e26546f"; patchLatest = false; topLevel = false; dependencies = [ @@ -617,7 +617,7 @@ { name = "cookie-signature"; range = "1.0.1"; } { name = "buffer-crc32"; range = "0.2.1"; } { name = "cookie"; range = "0.1.0"; } - { name = "send"; range = "0.1.2"; } + { name = "send"; range = "0.1.3"; } { name = "bytes"; range = "0.2.0"; } { name = "fresh"; range = "0.1.0"; } { name = "pause"; range = "0.0.1"; } @@ -974,13 +974,13 @@ } { baseName = "express"; - version = "3.3.3"; + version = "3.3.4"; fullName = "express-*"; - hash = "ba67b79732082d24acebb38e273ce7749a86590d999bab2d5f2f9cc566ee8c9c"; + hash = "96a3fc9c2250d13f9aa183660466590fe285a2dd19e6ebdc4b2340295ee1aa65"; patchLatest = false; topLevel = true; dependencies = [ - { name = "connect"; range = "2.8.3"; } + { name = "connect"; range = "2.8.4"; } { name = "commander"; range = "1.2.0"; } { name = "range-parser"; range = "0.0.4"; } { name = "mkdirp"; range = "0.3.5"; } @@ -988,7 +988,7 @@ { name = "buffer-crc32"; range = "0.2.1"; } { name = "fresh"; range = "0.1.0"; } { name = "methods"; range = "0.0.1"; } - { name = "send"; range = "0.1.2"; } + { name = "send"; range = "0.1.3"; } { name = "cookie-signature"; range = "1.0.1"; } { name = "debug"; range = "*"; } ]; @@ -1237,43 +1237,43 @@ } { baseName = "fstream"; - version = "0.1.22"; + version = "0.1.23"; fullName = "fstream-0"; - hash = "2ace3993d34cbf5e97bcb9c7eec3f011fa2041ce66cb688e39e747285084496a"; + hash = "1f3f03be2b18815b133e551b0cde8ab77148d0de31fdd61d90f21317f02c8342"; patchLatest = false; topLevel = false; dependencies = [ { name = "rimraf"; range = "2"; } { name = "mkdirp"; range = "0.3"; } - { name = "graceful-fs"; range = "~1.2.0"; } + { name = "graceful-fs"; range = "~2.0.0"; } { name = "inherits"; range = "~1.0.0"; } ]; } { baseName = "fstream"; - version = "0.1.22"; + version = "0.1.23"; fullName = "fstream-~0.1.8"; - hash = "2ace3993d34cbf5e97bcb9c7eec3f011fa2041ce66cb688e39e747285084496a"; + hash = "1f3f03be2b18815b133e551b0cde8ab77148d0de31fdd61d90f21317f02c8342"; patchLatest = false; topLevel = false; dependencies = [ { name = "rimraf"; range = "2"; } { name = "mkdirp"; range = "0.3"; } - { name = "graceful-fs"; range = "~1.2.0"; } + { name = "graceful-fs"; range = "~2.0.0"; } { name = "inherits"; range = "~1.0.0"; } ]; } { baseName = "glob"; - version = "3.2.1"; + version = "3.2.3"; fullName = "glob-3"; - hash = "a457c2115213ce2cb59582ddc3a25eb3ae7490af687e412111c0032f72966f51"; + hash = "82e04561e897c9b682c0568bafbc57b0ee2fc592579535bb0f5929cd1605c9c3"; patchLatest = false; topLevel = false; dependencies = [ { name = "minimatch"; range = "~0.2.11"; } - { name = "graceful-fs"; range = "~1.2.0"; } - { name = "inherits"; range = "1"; } + { name = "graceful-fs"; range = "~2.0.0"; } + { name = "inherits"; range = "2"; } ]; } { @@ -1291,22 +1291,22 @@ } { baseName = "glob"; - version = "3.2.1"; + version = "3.2.3"; fullName = "glob->= 3.1.4"; - hash = "a457c2115213ce2cb59582ddc3a25eb3ae7490af687e412111c0032f72966f51"; + hash = "82e04561e897c9b682c0568bafbc57b0ee2fc592579535bb0f5929cd1605c9c3"; patchLatest = false; topLevel = false; dependencies = [ { name = "minimatch"; range = "~0.2.11"; } - { name = "graceful-fs"; range = "~1.2.0"; } - { name = "inherits"; range = "1"; } + { name = "graceful-fs"; range = "~2.0.0"; } + { name = "inherits"; range = "2"; } ]; } { baseName = "graceful-fs"; - version = "1.2.2"; - fullName = "graceful-fs-1"; - hash = "a23fe552c6b0a221fc961e1ef0ed567e081ad948f4fcac6be660fa6741c0dbd6"; + version = "2.0.0"; + fullName = "graceful-fs-2"; + hash = "36f8fb1de88a8599cc828a0eb4c96f12c25437756e91e42aeadce00a7887241c"; patchLatest = false; topLevel = false; dependencies = [ @@ -1314,9 +1314,9 @@ } { baseName = "graceful-fs"; - version = "1.2.2"; + version = "1.2.3"; fullName = "graceful-fs-~1"; - hash = "a23fe552c6b0a221fc961e1ef0ed567e081ad948f4fcac6be660fa6741c0dbd6"; + hash = "b8d9e0af2261259525a65281573e416b70b91788ea7f7b13f4598aaa7818255a"; patchLatest = false; topLevel = false; dependencies = [ @@ -1324,9 +1324,19 @@ } { baseName = "graceful-fs"; - version = "1.2.2"; + version = "1.2.3"; fullName = "graceful-fs-~1.2.0"; - hash = "a23fe552c6b0a221fc961e1ef0ed567e081ad948f4fcac6be660fa6741c0dbd6"; + hash = "b8d9e0af2261259525a65281573e416b70b91788ea7f7b13f4598aaa7818255a"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "graceful-fs"; + version = "2.0.0"; + fullName = "graceful-fs-~2.0.0"; + hash = "36f8fb1de88a8599cc828a0eb4c96f12c25437756e91e42aeadce00a7887241c"; patchLatest = false; topLevel = false; dependencies = [ @@ -1554,6 +1564,16 @@ dependencies = [ ]; } + { + baseName = "inherits"; + version = "2.0.0"; + fullName = "inherits-2"; + hash = "9c0e9ab9e025f0be599d62752764964416832d38d93a4143242ec4deb4de1ae0"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } { baseName = "inherits"; version = "1.0.0"; @@ -1586,9 +1606,9 @@ } { baseName = "jade"; - version = "0.32.0"; + version = "0.33.0"; fullName = "jade-*"; - hash = "25bd8ad332bdf7dba4bcd2bf38b6f5ff49e1a9401668a4c4edf50e1277031e2d"; + hash = "9c03589c5ca55fcf6b4583c1daefd052fb8ef46e91962bab4ee75f6135963e4f"; patchLatest = false; topLevel = true; dependencies = [ @@ -1670,9 +1690,9 @@ } { baseName = "jsontool"; - version = "5.1.3"; + version = "6.0.0"; fullName = "jsontool-*"; - hash = "097889f294920e43c2a8f8d9156971860c67c61ecfe5a1e411c4d641e521985c"; + hash = "4a1e5d6d89571a561b3f7aea39d6ba6274bb8075d802b0a514e17abf186d781c"; patchLatest = false; topLevel = true; dependencies = [ @@ -2281,9 +2301,9 @@ } { baseName = "nijs"; - version = "0.0.8"; + version = "0.0.9"; fullName = "nijs-*"; - hash = "134a4f764835280487334f5cfd5a0d271cdd784fe954ad619fad250f54c3b3b9"; + hash = "1be26e71151d67b0bcced2431b8507ad9a1ce07fdc895480b63c058e89ed4f0b"; patchLatest = false; topLevel = true; dependencies = [ @@ -2302,14 +2322,14 @@ } { baseName = "node-gyp"; - version = "0.10.5"; + version = "0.10.6"; fullName = "node-gyp-*"; - hash = "e52cdb18b2b457600b6c5178a6c5f3de6ec81b94cde85e14c0c8f6e58a2c041a"; + hash = "1b1fc060c1a84eb0f52c495d7d13e3a7f03b2753b74dc6c1c801c5b8d563c5b0"; patchLatest = false; topLevel = true; dependencies = [ { name = "glob"; range = "3"; } - { name = "graceful-fs"; range = "1"; } + { name = "graceful-fs"; range = "2"; } { name = "fstream"; range = "0"; } { name = "minimatch"; range = "0"; } { name = "mkdirp"; range = "0"; } @@ -2418,9 +2438,9 @@ } { baseName = "npmlog"; - version = "0.0.3"; + version = "0.0.4"; fullName = "npmlog-0"; - hash = "3214a04d9a54c588d2585b657c7068f9561dba34dd2323c4ac7ec98e69e3e9cd"; + hash = "16da9f0f239813f201156b81a5ebe552c9a3f78a405dbb24c2c1743fe3a0d579"; patchLatest = false; topLevel = false; dependencies = [ @@ -2795,9 +2815,9 @@ } { baseName = "rbytes"; - version = "0.0.2"; + version = "1.0.0"; fullName = "rbytes-*"; - hash = "0fd4697be996ee12c65f8fb13b2edc7a554d22c31d1a344539bc611ce73b69aa"; + hash = "ccacb9951421c0a219f63b5d356098adffa43e42367be78afb94a433f84593e7"; patchLatest = false; topLevel = true; dependencies = [ @@ -3067,9 +3087,9 @@ } { baseName = "semver"; - version = "2.0.9"; + version = "2.0.10"; fullName = "semver-*"; - hash = "cc1b4edd155fdec8638cf0acb90ba7855a9c8ea27f0a3ae2da21c12582d40050"; + hash = "121f81da02804485b7bc06769ec2a71284c2d8933030b1a4f17602c34ef04111"; patchLatest = false; topLevel = true; dependencies = [ @@ -3097,9 +3117,9 @@ } { baseName = "semver"; - version = "2.0.9"; + version = "2.0.10"; fullName = "semver-~2.0.7"; - hash = "cc1b4edd155fdec8638cf0acb90ba7855a9c8ea27f0a3ae2da21c12582d40050"; + hash = "121f81da02804485b7bc06769ec2a71284c2d8933030b1a4f17602c34ef04111"; patchLatest = false; topLevel = false; dependencies = [ @@ -3107,9 +3127,9 @@ } { baseName = "send"; - version = "0.1.2"; + version = "0.1.3"; fullName = "send-*"; - hash = "d3fdea73a77e9f0f826e3fa5fa7ed7ef60a51912f5b976d4c112d7c52ac4668f"; + hash = "45d768e247b184ec2d78aef495d4986b62675daa2d40add4f993cc122bba557f"; patchLatest = false; topLevel = false; dependencies = [ @@ -3135,9 +3155,9 @@ } { baseName = "send"; - version = "0.1.2"; - fullName = "send-0.1.2"; - hash = "d3fdea73a77e9f0f826e3fa5fa7ed7ef60a51912f5b976d4c112d7c52ac4668f"; + version = "0.1.3"; + fullName = "send-0.1.3"; + hash = "45d768e247b184ec2d78aef495d4986b62675daa2d40add4f993cc122bba557f"; patchLatest = false; topLevel = false; dependencies = [ @@ -3351,9 +3371,9 @@ } { baseName = "stylus"; - version = "0.33.1"; + version = "0.34.1"; fullName = "stylus-*"; - hash = "5db972473ed5d5d50ef4b76b019b35b8a6b368209a694ee2f94bb8d6c9f50245"; + hash = "efbcf5f35d84264609be85b122513af30e922687a4f5c961928febf0f27e3d9e"; patchLatest = false; topLevel = true; dependencies = [ @@ -3471,9 +3491,9 @@ } { baseName = "timezone"; - version = "0.0.21"; + version = "0.0.22"; fullName = "timezone-*"; - hash = "6f595e6376708b1c35d1dac3b3c1c44384b3928f7b3a4f33165817275548c8d1"; + hash = "5bb9d42f401ae3084ab7dba7e0ecf1158995a987242311c86062177ad89561c3"; patchLatest = false; topLevel = true; dependencies = [ From 7ef50f50986b0a830051e641f1a5c795d79d8460 Mon Sep 17 00:00:00 2001 From: "Jason \\\"Don\\\" O'Conal" Date: Thu, 4 Jul 2013 14:52:51 +1000 Subject: [PATCH 370/798] audiofile: fix build on darwin * disable alsaLib * build with gccApple --- pkgs/development/libraries/audiofile/default.nix | 11 ++++++----- pkgs/top-level/all-packages.nix | 6 +++++- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/audiofile/default.nix b/pkgs/development/libraries/audiofile/default.nix index 8ea6470cde8..1190f7437cb 100644 --- a/pkgs/development/libraries/audiofile/default.nix +++ b/pkgs/development/libraries/audiofile/default.nix @@ -3,17 +3,18 @@ stdenv.mkDerivation rec { name = "audiofile-0.3.3"; - buildInputs = [ alsaLib ]; + buildInputs = stdenv.lib.optional (!stdenv.isDarwin) alsaLib; src = fetchurl { url = "http://audiofile.68k.org/${name}.tar.gz"; sha256 = "1qm7z0g1d9rcxi1m87slgdi0rhl94g13dx3d2b05dilghwpgjjgq"; }; - meta = { + meta = with stdenv.lib; { description = "A library for reading and writing audio files in various formats"; - homepage = http://www.68k.org/~michael/audiofile/; - license = "lgpl"; - maintainers = [ stdenv.lib.maintainers.shlevy ]; + homepage = http://www.68k.org/~michael/audiofile/; + license = licenses.lgpl; + maintainers = with maintainers; [ lovek323 shlevy ]; + platforms = platforms.unix; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c69fc1a4962..c19d1126d8c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3703,7 +3703,11 @@ let aubio = callPackage ../development/libraries/aubio { }; - audiofile = callPackage ../development/libraries/audiofile { }; + audiofile = callPackage ../development/libraries/audiofile { + stdenv = if stdenv.isDarwin + then overrideGCC stdenv gccApple + else stdenv; + }; axis = callPackage ../development/libraries/axis { }; From 735555d86fb3c707f94a06f85048c239c89d75d1 Mon Sep 17 00:00:00 2001 From: "Jason \\\"Don\\\" O'Conal" Date: Thu, 4 Jul 2013 14:55:32 +1000 Subject: [PATCH 371/798] ffmpeg: fix build on darwin * build with gccApple * don't delete '*.a' files when building xvidcore --- pkgs/development/libraries/ffmpeg/default.nix | 6 ++++-- .../libraries/xvidcore/default.nix | 19 ++++++++++++++----- pkgs/top-level/all-packages.nix | 4 ++++ 3 files changed, 22 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/ffmpeg/default.nix b/pkgs/development/libraries/ffmpeg/default.nix index b37fcdf4436..98a6c35c8b8 100644 --- a/pkgs/development/libraries/ffmpeg/default.nix +++ b/pkgs/development/libraries/ffmpeg/default.nix @@ -78,8 +78,10 @@ stdenv.mkDerivation rec { inherit vdpauSupport; }; - meta = { - homepage = http://www.ffmpeg.org/; + meta = with stdenv.lib; { + homepage = http://www.ffmpeg.org/; description = "A complete, cross-platform solution to record, convert and stream audio and video"; + maintainers = with maintainers; [ lovek323 ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/xvidcore/default.nix b/pkgs/development/libraries/xvidcore/default.nix index e03773292bb..4ddbc5484ba 100644 --- a/pkgs/development/libraries/xvidcore/default.nix +++ b/pkgs/development/libraries/xvidcore/default.nix @@ -12,11 +12,20 @@ stdenv.mkDerivation rec { buildInputs = [ nasm ]; - postInstall = - '' - rm $out/lib/*.a - (cd $out/lib && ln -s *.so.4.* libxvidcore.so && ln -s *.so.4.* libxvidcore.so.4 ) - ''; + buildInputs = [ nasm ] + ++ stdenv.lib.optionals stdenv.isDarwin [ autoconf automake libtool ]; + + # don't delete the '.a' files on darwin -- they're needed to compile ffmpeg + # (and perhaps other things) + postInstall = stdenv.lib.optionalString (!stdenv.isDarwin) '' + rm $out/lib/*.a + '' + '' + cd $out/lib + ln -s *.so.4.* libxvidcore.so + if [ ! -e libxvidcore.so.4 ]; then + ln -s *.so.4.* libxvidcore.so.4 + fi + ''; meta = { description = "MPEG-4 video codec for PC"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c19d1126d8c..e063024c0c5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3896,6 +3896,10 @@ let ffmpeg = callPackage ../development/libraries/ffmpeg { vpxSupport = !stdenv.isMips; + + stdenv = if stdenv.isDarwin + then overrideGCC stdenv gccApple + else stdenv; }; ffmpeg_0_6_90 = callPackage ../development/libraries/ffmpeg/0.6.90.nix { From 8ac7701c4cc0538108430b7f9a7b3bdd787df29d Mon Sep 17 00:00:00 2001 From: "Jason \\\"Don\\\" O'Conal" Date: Thu, 4 Jul 2013 14:51:32 +1000 Subject: [PATCH 372/798] fluidsynth: fix build on darwin * disable pulseaudio * disable alaLib * disable jackaudio * add CoreAudio headers * link to CoreAudio framework --- .../applications/audio/fluidsynth/default.nix | 23 +++++++++++++++---- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/audio/fluidsynth/default.nix b/pkgs/applications/audio/fluidsynth/default.nix index 70a405b3fd6..413e7d0661b 100644 --- a/pkgs/applications/audio/fluidsynth/default.nix +++ b/pkgs/applications/audio/fluidsynth/default.nix @@ -10,12 +10,25 @@ stdenv.mkDerivation rec { sha256 = "1x73a5rsyvfmh1j0484kzgnk251q61g1g2jdja673l8fizi0xd24"; }; - buildInputs = [ alsaLib glib jackaudio libsndfile pkgconfig pulseaudio ]; + preBuild = stdenv.lib.optionalString stdenv.isDarwin '' + sed -i '40 i\ + #include \ + #include \ + #include ' \ + src/drivers/fluid_coreaudio.c + ''; + + NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin + "-framework CoreAudio"; + + buildInputs = [ glib libsndfile pkgconfig ] + ++ stdenv.lib.optionals (!stdenv.isDarwin) [ alsaLib pulseaudio jackaudio ]; meta = with stdenv.lib; { - description = "real-time software synthesizer based on the SoundFont 2 specifications"; - homepage = http://www.fluidsynth.org; - license = licenses.lgpl2; - maintainers = [ maintainers.goibhniu ]; + description = "Real-time software synthesizer based on the SoundFont 2 specifications"; + homepage = http://www.fluidsynth.org; + license = licenses.lgpl2; + maintainers = with maintainers; [ goibhniu lovek323 ]; + platforms = platforms.unix; }; } From 8c54b95273cd97d87c3372d53b9c820da9394927 Mon Sep 17 00:00:00 2001 From: "Jason \\\"Don\\\" O'Conal" Date: Thu, 4 Jul 2013 14:54:20 +1000 Subject: [PATCH 373/798] glib: fix build on darwin * add libintlOrEmpty to build inputs * add -lintl to CFLAGS --- pkgs/development/libraries/glib/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index b500967af78..b5e2b1e43b2 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gettext, perl, libiconvOrEmpty, zlib, libffi -, python, pcre, libelf }: +, python, pcre, libelf, libintlOrEmpty }: # TODO: # * Add gio-module-fam @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { }; # configure script looks for d-bus but it is only needed for tests - buildInputs = [ libelf ]; + buildInputs = [ libelf ] ++ libintlOrEmpty; nativeBuildInputs = [ perl pkgconfig gettext python ]; @@ -43,6 +43,8 @@ stdenv.mkDerivation rec { postConfigure = "sed '/SANE_MALLOC_PROTOS/s,^,//,' -i config.h"; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; + enableParallelBuilding = true; postInstall = ''rm -rvf $out/share/gtk-doc''; From 75730566521b2a40836a3f215732bf6a885b5982 Mon Sep 17 00:00:00 2001 From: "Jason \\\"Don\\\" O'Conal" Date: Thu, 4 Jul 2013 14:54:57 +1000 Subject: [PATCH 374/798] gtk++: fix build on darwin * add -lintl to CFLAGS --- pkgs/development/libraries/gtk+/2.x.nix | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk+/2.x.nix index c7dc45aa462..6b889f76ca5 100644 --- a/pkgs/development/libraries/gtk+/2.x.nix +++ b/pkgs/development/libraries/gtk+/2.x.nix @@ -17,7 +17,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - NIX_CFLAGS_COMPILE = "-I${cairo}/include/cairo"; + NIX_CFLAGS_COMPILE = "-I${cairo}/include/cairo" + + stdenv.lib.optionalString (libintlOrEmpty != null) " -lintl"; nativeBuildInputs = [ perl pkgconfig gettext ]; @@ -34,8 +35,12 @@ stdenv.mkDerivation rec { postInstall = "rm -rf $out/share/gtk-doc"; - meta = { + meta = with stdenv.lib; { description = "A multi-platform toolkit for creating graphical user interfaces"; + homepage = http://www.gtk.org/; + license = licenses.lgpl2Plus; + maintainers = with maintainers; [ lovek323 raskin ]; + platforms = platforms.all; longDescription = '' GTK+ is a highly usable, feature rich toolkit for creating @@ -47,12 +52,5 @@ stdenv.mkDerivation rec { proprietary software with GTK+ without any license fees or royalties. ''; - - homepage = http://www.gtk.org/; - - license = "LGPLv2+"; - - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.all; }; } From 970346e2d1309335b789bd71161cc3c44bf3eabd Mon Sep 17 00:00:00 2001 From: "Jason \\\"Don\\\" O'Conal" Date: Thu, 4 Jul 2013 17:07:30 +1000 Subject: [PATCH 375/798] libmad: fix build on darwin * stop building with an i486 architecture Conflicts: pkgs/development/libraries/libmad/default.nix --- pkgs/development/libraries/libmad/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libmad/default.nix b/pkgs/development/libraries/libmad/default.nix index 6e2e2c949cc..883ad072c7b 100644 --- a/pkgs/development/libraries/libmad/default.nix +++ b/pkgs/development/libraries/libmad/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, autoconf}: -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "libmad-0.15.1b"; src = fetchurl { - url = mirror://sourceforge/mad/libmad-0.15.1b.tar.gz; + url = "mirror://sourceforge/mad/${name}.tar.gz"; sha256 = "bbfac3ed6bfbc2823d3775ebb931087371e142bb0e9bb1bee51a76a6e0078690"; }; @@ -16,10 +16,13 @@ stdenv.mkDerivation { preConfigure = '' autoconf substituteInPlace configure --replace "-fforce-mem" "" + substituteInPlace configure --replace "arch=\"-march=i486\"" "" ''; - meta = { - homepage = http://sourceforge.net/projects/mad/; + meta = with stdenv.lib; { + homepage = http://sourceforge.net/projects/mad/; description = "A high-quality, fixed-point MPEG audio decoder supporting MPEG-1 and MPEG-2"; + maintainers = with maintainers; [ lovek323 ]; + platforms = platforms.unix; }; } From c449a67e0176b5fc0027ace17d6d6b58a5b43b0c Mon Sep 17 00:00:00 2001 From: "Jason \\\"Don\\\" O'Conal" Date: Thu, 4 Jul 2013 14:58:32 +1000 Subject: [PATCH 376/798] libmikmod: fix build on darwin * build with gccApple --- pkgs/development/libraries/libmikmod/default.nix | 12 +++++++----- pkgs/top-level/all-packages.nix | 7 ++++++- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/libmikmod/default.nix b/pkgs/development/libraries/libmikmod/default.nix index cde3aecce07..8ef95650ce6 100644 --- a/pkgs/development/libraries/libmikmod/default.nix +++ b/pkgs/development/libraries/libmikmod/default.nix @@ -6,15 +6,17 @@ stdenv.mkDerivation rec { sha256 = "07k6iyx6pyzisncgdkd071w2dhm3rx6l34hbja3wbc7rpf888k3k"; }; buildInputs = [ texinfo ]; - meta = { + + meta = with stdenv.lib; { description = "A library for playing tracker music module files"; + homepage = http://mikmod.shlomifish.org/; + license = licenses.lgpl2Plus; + maintainers = with maintainers; [ astsmtl lovek323 ]; + platforms = platforms.unix; + longDescription = '' A library for playing tracker music module files supporting many formats, including MOD, S3M, IT and XM. ''; - homepage = http://mikmod.shlomifish.org/; - license = "LGPLv2+"; - maintainers = with stdenv.lib.maintainers; [ astsmtl ]; - platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e063024c0c5..66116c1266a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4676,7 +4676,12 @@ let libmicrohttpd = callPackage ../development/libraries/libmicrohttpd { }; - libmikmod = callPackage ../development/libraries/libmikmod { }; + libmikmod = callPackage ../development/libraries/libmikmod { + # resolve the "stray '@' in program" errors + stdenv = if stdenv.isDarwin + then overrideGCC stdenv gccApple + else stdenv; + }; libmilter = callPackage ../development/libraries/libmilter { }; From 3a1a7b2d6ab4509453f211125ab7d76018e95ca3 Mon Sep 17 00:00:00 2001 From: "Jason \\\"Don\\\" O'Conal" Date: Thu, 4 Jul 2013 14:59:41 +1000 Subject: [PATCH 377/798] libsamplerate: fix build on darwin * build with gccApple * add Carbon include path --- .../libraries/libsamplerate/default.nix | 19 ++++++++++++------- pkgs/top-level/all-packages.nix | 6 +++++- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/libsamplerate/default.nix b/pkgs/development/libraries/libsamplerate/default.nix index 17f06e46711..3b7434dc9fb 100644 --- a/pkgs/development/libraries/libsamplerate/default.nix +++ b/pkgs/development/libraries/libsamplerate/default.nix @@ -15,14 +15,19 @@ stdenv.mkDerivation rec { #--disable-fftw disable usage of FFTW #--disable-cpu-clip disable tricky cpu specific clipper - meta = { + # need headers from the Carbon.framework in /System/Library/Frameworks to + # compile this on darwin -- not sure how to handle + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin + "-I/System/Library/Frameworks/Carbon.framework/Versions/A/Headers"; + + meta = with stdenv.lib; { description = "Sample Rate Converter for audio"; - homepage = http://www.mega-nerd.com/SRC/index.html; + homepage = http://www.mega-nerd.com/SRC/index.html; # you can choose one of the following licenses: - license = [ - "GPL" - # http://www.mega-nerd.com/SRC/libsamplerate-cul.pdf - "libsamplerate Commercial Use License" - ]; + # GPL or a commercial-use license (available at + # http://www.mega-nerd.com/SRC/libsamplerate-cul.pdf) + licenses = with licenses; [ gpl unfree ]; + maintainers = with maintainers; [ lovek323 ]; + platforms = platforms.all; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 66116c1266a..ba18fd850e4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4618,7 +4618,11 @@ let libre = callPackage ../development/libraries/libre {}; librem = callPackage ../development/libraries/librem {}; - libsamplerate = callPackage ../development/libraries/libsamplerate { }; + libsamplerate = callPackage ../development/libraries/libsamplerate { + stdenv = if stdenv.isDarwin + then overrideGCC stdenv gccApple + else stdenv; + }; libspectre = callPackage ../development/libraries/libspectre { }; From dcc4ffdb7f49ade1bafa947a4e602df3ca87432e Mon Sep 17 00:00:00 2001 From: "Jason \\\"Don\\\" O'Conal" Date: Thu, 4 Jul 2013 15:02:09 +1000 Subject: [PATCH 378/798] libsndfile: fix build on darwin * build with gccApple * add Carbon headers to include path --- .../libraries/libsndfile/default.nix | 55 ++++++++++--------- pkgs/top-level/all-packages.nix | 6 +- 2 files changed, 34 insertions(+), 27 deletions(-) diff --git a/pkgs/development/libraries/libsndfile/default.nix b/pkgs/development/libraries/libsndfile/default.nix index d9b4afbf0ff..7cf9cbca51f 100644 --- a/pkgs/development/libraries/libsndfile/default.nix +++ b/pkgs/development/libraries/libsndfile/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, flac, libogg, libvorbis, pkgconfig }: +{ stdenv, fetchurl, flac, libogg, libvorbis, pkgconfig }: stdenv.mkDerivation rec { name = "libsndfile-1.0.23"; @@ -8,35 +8,38 @@ stdenv.mkDerivation rec { sha256 = "0k9x4804gfh9d9zd4rm1v2izm8l716rzk4d6jlrjcf45b5sw7jal"; }; - buildInputs = [pkgconfig flac libogg libvorbis]; + buildInputs = [ pkgconfig flac libogg libvorbis ]; - meta = { - description = "Libsndfile, a C library for reading and writing files containing sampled sound"; + # need headers from the Carbon.framework in /System/Library/Frameworks to + # compile this on darwin -- not sure how to handle + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin + "-I/System/Library/Frameworks/Carbon.framework/Versions/A/Headers"; - longDescription = - '' Libsndfile is a C library for reading and writing files containing - sampled sound (such as MS Windows WAV and the Apple/SGI AIFF format) - through one standard library interface. It is released in source - code format under the GNU Lesser General Public License. + meta = with stdenv.lib; { + description = "A C library for reading and writing files containing sampled sound"; + homepage = http://www.mega-nerd.com/libsndfile/; + license = licenses.lgpl2Plus; + maintainers = with maintainers; [ lovek323 ludo ]; + platfomrs = platforms.unix; - The library was written to compile and run on a Linux system but - should compile and run on just about any Unix (including MacOS X). - There are also pre-compiled binaries available for 32 and 64 bit - windows. + longDescription = '' + Libsndfile is a C library for reading and writing files containing + sampled sound (such as MS Windows WAV and the Apple/SGI AIFF format) + through one standard library interface. It is released in source + code format under the GNU Lesser General Public License. - It was designed to handle both little-endian (such as WAV) and - big-endian (such as AIFF) data, and to compile and run correctly on - little-endian (such as Intel and DEC/Compaq Alpha) processor systems - as well as big-endian processor systems such as Motorola 68k, Power - PC, MIPS and SPARC. Hopefully the design of the library will also - make it easy to extend for reading and writing new sound file - formats. - ''; + The library was written to compile and run on a Linux system but + should compile and run on just about any Unix (including MacOS X). + There are also pre-compiled binaries available for 32 and 64 bit + windows. - homepage = http://www.mega-nerd.com/libsndfile/; - - license = "LGPLv2+"; - - maintainers = [ stdenv.lib.maintainers.ludo ]; + It was designed to handle both little-endian (such as WAV) and + big-endian (such as AIFF) data, and to compile and run correctly on + little-endian (such as Intel and DEC/Compaq Alpha) processor systems + as well as big-endian processor systems such as Motorola 68k, Power + PC, MIPS and SPARC. Hopefully the design of the library will also + make it easy to extend for reading and writing new sound file + formats. + ''; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ba18fd850e4..22623abb046 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4781,7 +4781,11 @@ let # To bootstrap SBCL, I need CLisp 2.44.1; it needs libsigsegv 2.5 libsigsegv_25 = callPackage ../development/libraries/libsigsegv/2.5.nix { }; - libsndfile = callPackage ../development/libraries/libsndfile { }; + libsndfile = callPackage ../development/libraries/libsndfile { + stdenv = if stdenv.isDarwin + then overrideGCC stdenv gccApple + else stdenv; + }; libsoup = callPackage ../development/libraries/libsoup { }; From f3c863b8e3868ae4d427727f8dfc4d5bf9dd89c6 Mon Sep 17 00:00:00 2001 From: "Jason \\\"Don\\\" O'Conal" Date: Thu, 4 Jul 2013 15:02:52 +1000 Subject: [PATCH 379/798] libsoup: fix build on darwin * add libintlOrEmpty to build inputs * add -lintl to LDFLAGS --- pkgs/development/libraries/libsoup/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix index 08784a0f257..a5ce0fda270 100644 --- a/pkgs/development/libraries/libsoup/default.nix +++ b/pkgs/development/libraries/libsoup/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, glib, libxml2, pkgconfig -, gnomeSupport ? true, libgnome_keyring, sqlite, glib_networking }: +, gnomeSupport ? true, libgnome_keyring, sqlite, glib_networking +, libintlOrEmpty }: stdenv.mkDerivation { name = "libsoup-2.38.1"; @@ -10,6 +11,7 @@ stdenv.mkDerivation { }; + buildInputs = libintlOrEmpty; nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ glib libxml2 ] ++ stdenv.lib.optionals gnomeSupport [ libgnome_keyring sqlite ]; @@ -18,6 +20,8 @@ stdenv.mkDerivation { # glib_networking is a runtime dependency, not a compile-time dependency configureFlags = "--disable-tls-check"; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; + meta = { inherit (glib.meta) maintainers platforms; }; From 7b975abc16f4f8774ee5bf621a820fe800c5cabc Mon Sep 17 00:00:00 2001 From: "Jason \\\"Don\\\" O'Conal" Date: Thu, 4 Jul 2013 15:03:18 +1000 Subject: [PATCH 380/798] libvdpau: fix build on drawin * force x86_64 arch --- pkgs/development/libraries/libvdpau/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/libvdpau/default.nix b/pkgs/development/libraries/libvdpau/default.nix index 15810624705..835e2711a77 100644 --- a/pkgs/development/libraries/libvdpau/default.nix +++ b/pkgs/development/libraries/libvdpau/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { buildInputs = with xlibs; [ pkgconfig dri2proto libXext ]; propagatedBuildInputs = [ xlibs.libX11 ]; + + configureFlags = stdenv.lib.optional stdenv.isDarwin [ "--build=x86_64" ]; meta = { homepage = http://people.freedesktop.org/~aplattner/vdpau/; From 481be8185fbc6d3d01382347c45075032508e48a Mon Sep 17 00:00:00 2001 From: "Jason \\\"Don\\\" O'Conal" Date: Thu, 4 Jul 2013 15:03:46 +1000 Subject: [PATCH 381/798] libvpx: fix build on darwin * remove --enable-shared configure flag * replace '-arch x86_64' with 'march=x86-64' --- pkgs/development/libraries/libvpx/default.nix | 23 +++++++++---------- 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/pkgs/development/libraries/libvpx/default.nix b/pkgs/development/libraries/libvpx/default.nix index 494a5c36a3c..3ca2239ac8e 100644 --- a/pkgs/development/libraries/libvpx/default.nix +++ b/pkgs/development/libraries/libvpx/default.nix @@ -21,27 +21,26 @@ stdenv.mkDerivation rec { preConfigure = '' mkdir -p build cd build + substituteInPlace make/configure.sh --replace "-arch x86_64" "-march=x86-64" ''; configureScript = "../configure"; - configureFlags = [ - "--disable-install-srcs" - "--disable-install-docs" - "--disable-examples" - "--enable-vp8" - "--enable-runtime-cpu-detect" - "--enable-shared" - "--enable-pic" - ]; + configureFlags = + [ "--disable-install-srcs" "--disable-install-docs" "--disable-examples" + "--enable-vp8" "--enable-runtime-cpu-detect" "--enable-pic" ] + # --enable-shared is only supported on ELF + ++ stdenv.lib.optional (!stdenv.isDarwin) "--enable-shared"; installPhase = '' make quiet=false DIST_DIR=$out install ''; - meta = { + meta = with stdenv.lib; { description = "VP8 video encoder"; - homepage = http://code.google.com/p/webm; - license = "BSD"; + homepage = http://code.google.com/p/webm; + license = licenses.bsd; + maintainers = with maintainers; [ lovek323 ]; + platforms = platforms.unix; }; } From 5c8a44fd181a95eb246fbe4d5faed83fa8e0cf4c Mon Sep 17 00:00:00 2001 From: "Jason \\\"Don\\\" O'Conal" Date: Thu, 4 Jul 2013 15:07:37 +1000 Subject: [PATCH 382/798] mpd: fix build on darwin * disable systemd * disable alsaLib * disable ffado * compile with gccApple * disable libmad --- pkgs/servers/mpd/default.nix | 80 +++++++++++++++++---------------- pkgs/top-level/all-packages.nix | 8 +++- 2 files changed, 49 insertions(+), 39 deletions(-) diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index 54c9d160565..43da84dcb81 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -18,8 +18,7 @@ , samplerateSupport ? true, libsamplerate , mmsSupport ? true, libmms , mpg123Support ? true, mpg123 -, aacSupport ? true, faad2 -}: +, aacSupport ? true, faad2 }: let @@ -28,17 +27,20 @@ let mkFlag = c: f: if c then "--enable-${f}" else "--disable-${f}"; in stdenv.mkDerivation rec { - name = "mpd-0.17.3"; + name = "mpd-0.17.4"; src = fetchurl { - url = "mirror://sourceforge/musicpd/${name}.tar.bz2"; - sha256 = "1iilimlyhw22lpbqiab4qprznxg9c4d68fkrr9jww765b4c7x1ip"; + url = "http://www.musicpd.org/download/mpd/stable/${name}.tar.gz"; + sha256 = "06diyprg65xx0c0bgxdwlgrc5bhwy6cf39rabwnv9ikhimh94ir3"; }; - buildInputs = [ pkgconfig glib systemd ] - ++ opt alsaSupport alsaLib + buildInputs = [ pkgconfig glib ] + ++ opt (!stdenv.isDarwin) systemd + ++ opt (!stdenv.isDarwin && alsaSupport) alsaLib ++ opt flacSupport flac ++ opt vorbisSupport libvorbis - ++ opt madSupport libmad + # using libmad to decode mp3 files on darwin is causing a segfault -- there + # is probably a solution, but I'm disabling it for now + ++ opt (!stdenv.isDarwin && madSupport) libmad ++ opt id3tagSupport libid3tag ++ opt mikmodSupport libmikmod ++ opt shoutSupport libshout @@ -47,7 +49,7 @@ in stdenv.mkDerivation rec { ++ opt soupSupport libsoup ++ opt bzip2Support bzip2 ++ opt audiofileSupport audiofile - ++ opt ffadoSupport ffado + ++ opt (!stdenv.isDarwin && ffadoSupport) ffado ++ opt ffmpegSupport ffmpeg ++ opt fluidsynthSupport fluidsynth ++ opt samplerateSupport libsamplerate @@ -56,45 +58,47 @@ in stdenv.mkDerivation rec { ++ opt aacSupport faad2 ++ opt zipSupport zziplib; - configureFlags = [ - "--with-systemdsystemunitdir=$(out)/etc/systemd/system" - (mkFlag alsaSupport "alsa") - (mkFlag flacSupport "flac") - (mkFlag vorbisSupport "vorbis") - (mkFlag vorbisSupport "vorbis-encoder") - (mkFlag madSupport "mad") - (mkFlag mikmodSupport "mikmod") - (mkFlag id3tagSupport "id3") - (mkFlag shoutSupport "shout") - (mkFlag sqliteSupport "sqlite") - (mkFlag curlSupport "curl") - (mkFlag soupSupport "soup") - (mkFlag audiofileSupport "audiofile") - (mkFlag bzip2Support "bzip2") - (mkFlag ffadoSupport "ffado") - (mkFlag ffmpegSupport "ffmpeg") - (mkFlag fluidsynthSupport "fluidsynth") - (mkFlag zipSupport "zzip") - (mkFlag samplerateSupport "lsr") - (mkFlag mmsSupport "mms") - (mkFlag mpg123Support "mpg123") - (mkFlag aacSupport "aac") - ]; + configureFlags = + [ (mkFlag (!stdenv.isDarwin && alsaSupport) "alsa") + (mkFlag flacSupport "flac") + (mkFlag vorbisSupport "vorbis") + (mkFlag vorbisSupport "vorbis-encoder") + (mkFlag (!stdenv.isDarwin && madSupport) "mad") + (mkFlag mikmodSupport "mikmod") + (mkFlag id3tagSupport "id3") + (mkFlag shoutSupport "shout") + (mkFlag sqliteSupport "sqlite") + (mkFlag curlSupport "curl") + (mkFlag soupSupport "soup") + (mkFlag audiofileSupport "audiofile") + (mkFlag bzip2Support "bzip2") + (mkFlag (!stdenv.isDarwin && ffadoSupport) "ffado") + (mkFlag ffmpegSupport "ffmpeg") + (mkFlag fluidsynthSupport "fluidsynth") + (mkFlag zipSupport "zzip") + (mkFlag samplerateSupport "lsr") + (mkFlag mmsSupport "mms") + (mkFlag mpg123Support "mpg123") + (mkFlag aacSupport "aac") + "--enable-debugging" ] + ++ opt (!stdenv.isDarwin) + "--with-systemdsystemunitdir=$(out)/etc/systemd/system"; NIX_LDFLAGS = '' ${if shoutSupport then "-lshout" else ""} ''; - meta = { + meta = with stdenv.lib; { description = "A flexible, powerful daemon for playing music"; + homepage = http://mpd.wikia.com/wiki/Music_Player_Daemon_Wiki; + license = licenses.gpl2; + maintainers = with maintainers; [ astsmtl ]; + platforms = platforms.unix; + longDescription = '' Music Player Daemon (MPD) is a flexible, powerful daemon for playing music. Through plugins and libraries it can play a variety of sound files while being controlled by its network protocol. ''; - homepage = http://mpd.wikia.com/wiki/Music_Player_Daemon_Wiki; - license = "GPLv2"; - maintainers = with stdenv.lib.maintainers; [ astsmtl ]; - platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 22623abb046..0bd4252a8fb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5902,7 +5902,13 @@ let mod_wsgi = callPackage ../servers/http/apache-modules/mod_wsgi { }; - mpd = callPackage ../servers/mpd { }; + mpd = callPackage ../servers/mpd { + # resolve the "stray '@' in program" errors + stdenv = if stdenv.isDarwin + then overrideGCC stdenv gccApple + else stdenv; + }; + mpd_clientlib = callPackage ../servers/mpd/clientlib.nix { }; miniHttpd = callPackage ../servers/http/mini-httpd {}; From 8df4be3ee32520c98732f64f9f9818eae063a73f Mon Sep 17 00:00:00 2001 From: "Jason \\\"Don\\\" O'Conal" Date: Thu, 4 Jul 2013 14:52:14 +1000 Subject: [PATCH 383/798] mpg123: fix darwin build (and upgrade to latest) * disable alsaLib * upgrade to 1.15.4 --- pkgs/applications/audio/mpg123/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/mpg123/default.nix b/pkgs/applications/audio/mpg123/default.nix index 80de5567000..029c2ba4bcd 100644 --- a/pkgs/applications/audio/mpg123/default.nix +++ b/pkgs/applications/audio/mpg123/default.nix @@ -1,14 +1,14 @@ {stdenv, fetchurl, alsaLib }: stdenv.mkDerivation { - name = "mpg123-1.12.3"; + name = "mpg123-1.15.4"; src = fetchurl { - url = mirror://sourceforge/mpg123/mpg123-1.12.3.tar.bz2; - sha256 = "1ij689s7jch3d4g0ja3jylaphallc8vgrsrm9b12254phnyy23xf"; + url = mirror://sourceforge/mpg123/mpg123-1.15.4.tar.bz2; + sha256 = "05aizspky9mp1bq2lfrkjzrsnjykl7gkbrhn93xcarj5b2izv1b8"; }; - buildInputs = [ alsaLib ]; + buildInputs = stdenv.lib.optional (!stdenv.isDarwin) alsaLib; crossAttrs = { configureFlags = if stdenv.cross ? mpg123 then From ab067cf633af53d3229336e6c0516a2fd16b3b52 Mon Sep 17 00:00:00 2001 From: "Jason \\\"Don\\\" O'Conal" Date: Thu, 4 Jul 2013 15:04:19 +1000 Subject: [PATCH 384/798] openal: fix build on darwin * disable alsaLib --- pkgs/development/libraries/openal/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/openal/default.nix b/pkgs/development/libraries/openal/default.nix index 2c23e51c22a..75d6033e1cc 100644 --- a/pkgs/development/libraries/openal/default.nix +++ b/pkgs/development/libraries/openal/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { name = "openal-soft-${version}.tar.bz2"; }; - buildInputs = [ cmake alsaLib ]; + buildInputs = [ cmake ] ++ stdenv.lib.optional (!stdenv.isDarwin) alsaLib; meta = { description = "OpenAL, a cross-platform 3D audio API"; From 3d6f857f9958e64e33c8dd85fdbc1138e578128a Mon Sep 17 00:00:00 2001 From: "Jason \\\"Don\\\" O'Conal" Date: Thu, 4 Jul 2013 15:04:58 +1000 Subject: [PATCH 385/798] pangomm: fix build on darwin * add cairo to build inputs * fix cairo include path --- pkgs/development/libraries/pangomm/2.28.x.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/pangomm/2.28.x.nix b/pkgs/development/libraries/pangomm/2.28.x.nix index 7f4d14dfbac..46875901181 100644 --- a/pkgs/development/libraries/pangomm/2.28.x.nix +++ b/pkgs/development/libraries/pangomm/2.28.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pango, glibmm, cairomm, libpng }: +{ stdenv, fetchurl, pkgconfig, pango, glibmm, cairomm, libpng, cairo }: stdenv.mkDerivation rec { name = "pangomm-2.28.4"; @@ -9,10 +9,16 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - propagatedBuildInputs = [ pango glibmm cairomm libpng ]; + propagatedBuildInputs = [ pango glibmm cairomm libpng cairo ]; - meta = { + NIX_CFLAGS_COMPILE = "-I${cairo}/include/cairo"; + + meta = with stdenv.lib; { description = "C++ interface to the Pango text rendering library"; + homepage = http://www.pango.org/; + license = licenses.lgplv2Plus; + maintainers = with maintainers; [ lovek323 raskin ]; + platforms = platforms.unix; longDescription = '' Pango is a library for laying out and rendering of text, with an @@ -21,11 +27,5 @@ stdenv.mkDerivation rec { far has been done in the context of the GTK+ widget toolkit. Pango forms the core of text and font handling for GTK+-2.x. ''; - - homepage = http://www.pango.org/; - license = "LGPLv2+"; - - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; }; } From 6fc89eead6ff281ef8d482c08ef4e61fd16ea32d Mon Sep 17 00:00:00 2001 From: "Jason \\\"Don\\\" O'Conal" Date: Thu, 4 Jul 2013 15:05:41 +1000 Subject: [PATCH 386/798] qt48: fix build on darwin * build with clang --- pkgs/development/libraries/qt-4.x/4.8/default.nix | 8 ++++---- pkgs/top-level/all-packages.nix | 5 +++++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix index b797f631b8e..29116d0eb11 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -147,10 +147,10 @@ stdenv.mkDerivation rec { }; meta = { - homepage = http://qt-project.org/; + homepage = http://qt-project.org/; description = "A cross-platform application framework for C++"; - license = "GPL/LGPL"; - maintainers = with maintainers; [ urkud sander phreedom ]; - platforms = platforms.all; + license = "GPL/LGPL"; + maintainers = with maintainers; [ lovek323 phreedom sander urkud ]; + platforms = platforms.all; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0bd4252a8fb..73cfc6f005e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5222,6 +5222,11 @@ let # GNOME dependencies are not used unless gtkStyle == true inherit (pkgs.gnome) libgnomeui GConf gnome_vfs; cups = if stdenv.isLinux then cups else null; + + # resolve unrecognised flag '-fconstant-cfstrings' errors + stdenv = if stdenv.isDarwin + then clangStdenv + else stdenv; }; qt48Full = callPackage ../development/libraries/qt-4.x/4.8 { From fbe2fe36e35f0b665cc919c6de897af966fec8bd Mon Sep 17 00:00:00 2001 From: "Jason \\\"Don\\\" O'Conal" Date: Thu, 4 Jul 2013 15:07:02 +1000 Subject: [PATCH 387/798] sip: fix build on darwin * prevent complaints about python not being built as a framework --- .../python-modules/python-sip/default.nix | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/python-sip/default.nix b/pkgs/development/python-modules/python-sip/default.nix index fa958971cf3..fa2bae7ae27 100644 --- a/pkgs/development/python-modules/python-sip/default.nix +++ b/pkgs/development/python-modules/python-sip/default.nix @@ -10,14 +10,21 @@ stdenv.mkDerivation rec { ]; sha256 = "1bwdd5xhrx8dx8rr86r043ddlbg7gd1vh0pm2nxw5l1yprwa7paa"; }; - - configurePhase = "python ./configure.py -d $out/lib/${python.libPrefix}/site-packages -b $out/bin -e $out/include"; + + configurePhase = stdenv.lib.optionalString stdenv.isDarwin '' + # prevent sip from complaining about python not being built as a framework + sed -i -e 1564,1565d siputils.py + '' + '' + python ./configure.py -d $out/lib/${python.libPrefix}/site-packages \ + -b $out/bin -e $out/include + ''; buildInputs = [ python ]; - meta = { + meta = with stdenv.lib; { description = "Creates C++ bindings for Python modules"; - license = "GPL"; - maintainers = with stdenv.lib.maintainers; [ urkud sander ]; + license = licenses.gpl; + maintainers = with maintainers; [ lovek323 sander urkud ]; + platforms = platforms.all; }; } From f2dea7d2875d88ee1cc8e3ea1ce9e58e914b9816 Mon Sep 17 00:00:00 2001 From: "Jason \\\"Don\\\" O'Conal" Date: Thu, 4 Jul 2013 15:06:22 +1000 Subject: [PATCH 388/798] xvidcore: fix build on darwin * remove unnecessary gcc flag * add --enable-macosx_module configure flag * add --disable-assembly configure flag * fix postInstall phase --- .../libraries/xvidcore/default.nix | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/xvidcore/default.nix b/pkgs/development/libraries/xvidcore/default.nix index 4ddbc5484ba..df7404e1faf 100644 --- a/pkgs/development/libraries/xvidcore/default.nix +++ b/pkgs/development/libraries/xvidcore/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, nasm}: +{ stdenv, fetchurl, nasm, autoconf, automake, libtool }: stdenv.mkDerivation rec { name = "xvidcore-1.3.2"; @@ -8,9 +8,14 @@ stdenv.mkDerivation rec { sha256 = "1x0b2rq6fv99ramifhkakycd0prjc93lbzrffbjgjwg7w4s17hfn"; }; - preConfigure = "cd build/generic"; + preConfigure = '' + cd build/generic + '' + stdenv.lib.optionalString stdenv.isDarwin '' + substituteInPlace configure --replace "-no-cpp-precomp" "" + ''; - buildInputs = [ nasm ]; + configureFlags = stdenv.lib.optionals stdenv.isDarwin + [ "--enable-macosx_module" "--disable-assembly" ]; buildInputs = [ nasm ] ++ stdenv.lib.optionals stdenv.isDarwin [ autoconf automake libtool ]; @@ -27,10 +32,12 @@ stdenv.mkDerivation rec { fi ''; - meta = { + meta = with stdenv.lib; { description = "MPEG-4 video codec for PC"; - homepage = http://www.xvid.org/; - license = "GPLv2+"; + homepage = http://www.xvid.org/; + license = licenses.gplv2Plus; + maintainers = with maintainers; [ lovek323 ]; + platforms = platforms.all; }; } From 1af178559f71821478765bfc76c87bf1cf14dce0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Thu, 11 Jul 2013 22:03:49 +0200 Subject: [PATCH 389/798] ethtool: 3.2 -> 3.10 And add package meta data. --- pkgs/tools/misc/ethtool/default.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/ethtool/default.nix b/pkgs/tools/misc/ethtool/default.nix index 1fc03a4ebff..90d345daa13 100644 --- a/pkgs/tools/misc/ethtool/default.nix +++ b/pkgs/tools/misc/ethtool/default.nix @@ -1,11 +1,18 @@ {stdenv, fetchurl}: -stdenv.mkDerivation { - name = "ethtool-3.2"; +stdenv.mkDerivation rec { + name = "ethtool-3.10"; src = fetchurl { - url = mirror://kernel/software/network/ethtool/ethtool-3.2.tar.xz; - sha256 = "0g9ldaba3vwlsmf490j33y3fgsmpfzxlzzblwashl448f8lcfap7"; + url = "mirror://kernel/software/network/ethtool/${name}.tar.xz"; + sha256 = "0h0wvi0s6s80v26plkh66aiyybpfyi18sjg5pl9idrd0ccdr93gq"; }; + meta = with stdenv.lib; { + description = "Utility for controlling network drivers and hardware"; + homepage = https://www.kernel.org/pub/software/network/ethtool/; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = [ maintainers.bjornfor ]; + }; } From a97936fba88f859121299d715c0e1bf93af0f159 Mon Sep 17 00:00:00 2001 From: Gergely Risko Date: Thu, 11 Jul 2013 18:55:46 +0200 Subject: [PATCH 390/798] Add bindings-DSL and bindings-posix hackage packages --- .../libraries/haskell/bindings-DSL/default.nix | 13 +++++++++++++ .../libraries/haskell/bindings-posix/default.nix | 13 +++++++++++++ pkgs/top-level/haskell-packages.nix | 4 ++++ 3 files changed, 30 insertions(+) create mode 100644 pkgs/development/libraries/haskell/bindings-DSL/default.nix create mode 100644 pkgs/development/libraries/haskell/bindings-posix/default.nix diff --git a/pkgs/development/libraries/haskell/bindings-DSL/default.nix b/pkgs/development/libraries/haskell/bindings-DSL/default.nix new file mode 100644 index 00000000000..9d6e8d1a04d --- /dev/null +++ b/pkgs/development/libraries/haskell/bindings-DSL/default.nix @@ -0,0 +1,13 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "bindings-DSL"; + version = "1.0.16"; + sha256 = "1sly88585f94dsnhyw6nagnr4jfjixnn61my85x05987flf325px"; + meta = { + homepage = "http://bitbucket.org/mauricio/bindings-dsl"; + description = "FFI domain specific language, on top of hsc2hs"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/bindings-posix/default.nix b/pkgs/development/libraries/haskell/bindings-posix/default.nix new file mode 100644 index 00000000000..23994140d6c --- /dev/null +++ b/pkgs/development/libraries/haskell/bindings-posix/default.nix @@ -0,0 +1,13 @@ +{ cabal, bindingsDSL }: + +cabal.mkDerivation (self: { + pname = "bindings-posix"; + version = "1.2.3"; + sha256 = "0nj18lfpn8hmlaa7cmvdkjnk8fi2f6ysjbigkx7zbrpqnvbi63ba"; + buildDepends = [ bindingsDSL ]; + meta = { + description = "Low level bindings to posix"; + 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 f92a67ed5b7..bd7959463f3 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -591,6 +591,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); binaryShared = callPackage ../development/libraries/haskell/binary-shared {}; + bindingsDSL = callPackage ../development/libraries/haskell/bindings-DSL {}; + + bindingsPosix = callPackage ../development/libraries/haskell/bindings-posix {}; + bitarray = callPackage ../development/libraries/haskell/bitarray {}; bitmap = callPackage ../development/libraries/haskell/bitmap {}; From b17f4486a1040fabb6f55797505e905b8f34d050 Mon Sep 17 00:00:00 2001 From: Oliver Charles Date: Fri, 5 Jul 2013 17:47:02 +0100 Subject: [PATCH 391/798] More Perl libraries Adds: - File-Share-0.02 - Module-Install-AuthorRequires-0.02 - Module-Install-AuthorTests-0.002 - Test-EOL-1.5 - Test-NoTabs-1.3 --- pkgs/top-level/perl-packages.nix | 65 ++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index f179f4ed830..05fed84dff5 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2740,6 +2740,20 @@ rec { }; }; + FileShare = buildPerlPackage { + name = "File-Share-0.02"; + src = fetchurl { + url = mirror://cpan/authors/id/I/IN/INGY/File-Share-0.02.tar.gz; + sha256 = "1vdgyf3m08s4pwj70bgbb31jsj8hixdl940m15phyx2hpy8dkabw"; + }; + propagatedBuildInputs = [ FileShareDir ]; + meta = { + homepage = http://github.com/ingydotnet/file-share-pm/tree; + description = "Extend File::ShareDir to Local Libraries"; + license = "perl"; + }; + }; + FileShareDir = buildPerlPackage { name = "File-ShareDir-1.03"; src = fetchurl { @@ -4136,6 +4150,32 @@ rec { }; }; + ModuleInstallAuthorRequires = buildPerlPackage { + name = "Module-Install-AuthorRequires-0.02"; + src = fetchurl { + url = mirror://cpan/authors/id/F/FL/FLORA/Module-Install-AuthorRequires-0.02.tar.gz; + sha256 = "1v2ciw75dj5y8lh10d1vrhwmjx266gpqavr8m21jlpblgm9j2qyc"; + }; + propagatedBuildInputs = [ ModuleInstall ]; + meta = { + description = "Declare author-only dependencies"; + license = "perl"; + }; + }; + + ModuleInstallAuthorTests = buildPerlPackage { + name = "Module-Install-AuthorTests-0.002"; + src = fetchurl { + url = mirror://cpan/authors/id/R/RJ/RJBS/Module-Install-AuthorTests-0.002.tar.gz; + sha256 = "121dyggy38316xss06v1zkwx4b59gl7b00c5q99xyzimwqnp49a0"; + }; + propagatedBuildInputs = [ ModuleInstall ]; + meta = { + description = "Designate tests only run by module authors"; + license = "perl"; + }; + }; + ModuleMetadata = buildPerlPackage rec { name = "Module-Metadata-1.000005"; src = fetchurl { @@ -6227,6 +6267,19 @@ rec { }; }; + TestEOL = buildPerlPackage { + name = "Test-EOL-1.5"; + src = fetchurl { + url = mirror://cpan/authors/id/B/BO/BOBTFISH/Test-EOL-1.5.tar.gz; + sha256 = "0qfdn71562xzmgnhmkkdbpp3vj851ldl1zlmxvharxsr16gjh6s3"; + }; + meta = { + homepage = http://metacpan.org/release/Test-EOL; + description = "Check the correct line endings in your project"; + license = "perl5"; + }; + }; + TestException = buildPerlPackage rec { name = "Test-Exception-0.31"; src = fetchurl { @@ -6356,6 +6409,18 @@ rec { }; }; + TestNoTabs = buildPerlPackage { + name = "Test-NoTabs-1.3"; + src = fetchurl { + url = mirror://cpan/authors/id/B/BO/BOBTFISH/Test-NoTabs-1.3.tar.gz; + sha256 = "06gvj0pgljc7n9rxhvwb0gq9wk51i3ks41lgh7a5ycqfkh9d0glw"; + }; + meta = { + description = "Check the presence of tabs in your project"; + license = "perl"; + }; + }; + TestNoWarnings = buildPerlPackage { name = "Test-NoWarnings-1.04"; src = fetchurl { From 18e9efe0f7a491041a49d5904d391009691a7434 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Fri, 12 Jul 2013 16:55:19 +0200 Subject: [PATCH 392/798] nijs: update to 0.0.9 --- pkgs/top-level/node-packages-generated.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix index 141ba26ea52..15b5c05b6f1 100644 --- a/pkgs/top-level/node-packages-generated.nix +++ b/pkgs/top-level/node-packages-generated.nix @@ -2303,7 +2303,7 @@ baseName = "nijs"; version = "0.0.9"; fullName = "nijs-*"; - hash = "1be26e71151d67b0bcced2431b8507ad9a1ce07fdc895480b63c058e89ed4f0b"; + hash = "fdcc60b869d3308549818608593c5a9eab75574a5e85df66e35f6f896a4d3544"; patchLatest = false; topLevel = true; dependencies = [ From a4c333474c66eeadf14373f135c66079b2631c21 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 12 Jul 2013 12:36:36 -0400 Subject: [PATCH 393/798] lib/lists.nix: Remove uses of the tail function nix lists are not like haskell lists, and tail is an O(n) operation. This makes recursion using tail less efficient than recursion using length + elemAt. Signed-off-by: Shea Levy --- pkgs/lib/lists.nix | 154 ++++++++++++++++++++++++--------------------- 1 file changed, 83 insertions(+), 71 deletions(-) diff --git a/pkgs/lib/lists.nix b/pkgs/lib/lists.nix index 3c01b165fc1..164ff3e1ec9 100644 --- a/pkgs/lib/lists.nix +++ b/pkgs/lib/lists.nix @@ -1,9 +1,13 @@ # General list operations. -with { +let inherit (import ./trivial.nix) deepSeq; -}; -rec { + inc = builtins.add 1; + + dec = n: builtins.sub n 1; + + inherit (builtins) elemAt; +in rec { inherit (builtins) head tail length isList add sub lessThan; @@ -17,50 +21,39 @@ rec { # `list' with `nul' as the starting value, i.e., `fold op nul [x_1 # x_2 ... x_n] == op x_1 (op x_2 ... (op x_n nul))'. (This is # Haskell's foldr). - fold = - if builtins ? elemAt - then op: nul: list: - let - len = length list; - fold' = n: - if n == len - then nul - else op (builtins.elemAt list n) (fold' (add n 1)); - in fold' 0 - else op: nul: - let fold' = list: - if list == [] + fold = op: nul: list: + let + len = length list; + fold' = n: + if n == len then nul - else op (head list) (fold' (tail list)); - in fold'; + else op (elemAt list n) (fold' (inc n)); + in fold' 0; - # Left fold: `fold op nul [x_1 x_2 ... x_n] == op (... (op (op nul # x_1) x_2) ... x_n)'. - foldl = - if builtins ? elemAt - then op: nul: list: - let - len = length list; - foldl' = n: - if n == minus1 - then nul - else op (foldl' (sub n 1)) (builtins.elemAt list n); - in foldl' (sub (length list) 1) - else op: - let foldl' = nul: list: - if list == [] + foldl = op: nul: list: + let + len = length list; + foldl' = n: + if n == minus1 then nul - else foldl' (op nul (head list)) (tail list); - in foldl'; + else op (foldl' (dec n)) (elemAt list n); + in foldl' (dec (length list)); - minus1 = sub 0 1; + minus1 = dec 0; # map with index: `imap (i: v: "${v}-${toString i}") ["a" "b"] == # ["a-1" "b-2"]' imap = f: list: - zipListsWith f (range 1 (length list)) list; + let + len = length list; + imap' = n: + if n == len + then [] + else [ (f n (elemAt list n)) ] ++ imap' (inc n); + in imap' 0; # Concatenate a list of lists. @@ -102,10 +95,10 @@ rec { # predicate, returns `default' if no such element exists, or # `multiple' if there are multiple matching elements. findSingle = pred: default: multiple: list: - let found = filter pred list; - in if found == [] then default - else if tail found != [] then multiple - else head found; + let found = filter pred list; len = length found; + in if len == 0 then default + else if len != 1 then multiple + else head found; # Find the first element in the list matching the specified @@ -159,65 +152,84 @@ rec { zipListsWith = f: fst: snd: - if fst != [] && snd != [] then - [ (f (head fst) (head snd)) ] - ++ zipListsWith f (tail fst) (tail snd) - else []; + let + len1 = length fst; + len2 = length snd; + len = if builtins.lessThan len1 len2 then len1 else len2; + zipListsWith' = n: + if n != len then + [ (f (elemAt fst n) (elemAt snd n)) ] + ++ zipListsWith' (inc n) + else []; + in zipListsWith' 0; zipLists = zipListsWith (fst: snd: { inherit fst snd; }); # Reverse the order of the elements of a list. - reverseList = l: - let reverse_ = accu: l: - if l == [] then accu - else reverse_ ([(head l)] ++ accu) (tail l); - in reverse_ [] l; + reverseList = fold (e: acc: acc ++ [ e ]) []; - # Sort a list based on a comparator function which compares two # elements and returns true if the first argument is strictly below # the second argument. The returned list is sorted in an increasing # order. The implementation does a quick-sort. sort = strictLess: list: let - # This implementation only has one element list on the left hand - # side of the concatenation operator. - qs = l: concat: - if l == [] then concat - else if length l == 1 then l ++ concat - else let - part = partition (strictLess (head l)) (tail l); - in - qs part.wrong ([(head l)] ++ qs part.right concat); + len = length list; + first = head list; + pivot' = n: acc@{ left, right }: let el = elemAt list n; next = pivot' (inc n); in + if n == len + then acc + else if strictLess first el + then next { inherit left; right = [ el ] ++ right; } + else + next { left = [ el ] ++ left; inherit right; }; + pivot = pivot' 1 { left = []; right = []; }; in - qs list []; + if lessThan len 2 then list + else (sort strictLess pivot.left) ++ [ first ] ++ (sort strictLess pivot.right); # Return the first (at most) N elements of a list. take = count: list: - if list == [] || count == 0 then [] - else [ (head list) ] ++ take (builtins.sub count 1) (tail list); + let + len = length list; + take' = n: + if n == len || n == count + then [] + else + [ (elemAt list n) ] ++ take' (inc n); + in take' 0; # Remove the first (at most) N elements of a list. drop = count: list: - if count == 0 then list - else drop (builtins.sub count 1) (tail list); + let + len = length list; + drop' = n: + if n == minus1 || lessThan n count + then [] + else + drop' (dec n) ++ [ (elemAt list n) ]; + in drop' (dec len); last = list: - assert list != []; - let loop = l: if tail l == [] then head l else loop (tail l); in - loop list; + assert list != []; elemAt list (dec (length list)); # Zip two lists together. zipTwoLists = xs: ys: - if xs != [] && ys != [] then - [ {first = head xs; second = head ys;} ] - ++ zipTwoLists (tail xs) (tail ys) - else []; + let + len1 = length xs; + len2 = length ys; + len = if lessThan len1 len2 then len1 else len2; + zipTwoLists' = n: + if n != len then + [ { first = elemAt xs n; second = elemAt ys n; } ] + ++ zipTwoLists' (inc n) + else []; + in zipTwoLists' 0; deepSeqList = xs: y: if any (x: deepSeq x false) xs then y else y; } From b47e2c2ab6db02e57ac72c200944739a7b4e53e1 Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 12 Jul 2013 18:38:41 +0200 Subject: [PATCH 394/798] nixpart: New upstream version 0.4.0. Changes are: - Properly detect GPT disklabels and create proper BIOS boot partitions if necessary. - Return exit code 100 if reboot is required due to the kernel not picking up the new partition table. - Don't include BIOS boot partition in GRUB devices. Signed-off-by: aszlig --- pkgs/tools/filesystems/nixpart/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/nixpart/default.nix b/pkgs/tools/filesystems/nixpart/default.nix index 3467c07b753..36972573b35 100644 --- a/pkgs/tools/filesystems/nixpart/default.nix +++ b/pkgs/tools/filesystems/nixpart/default.nix @@ -9,11 +9,11 @@ let }; in buildPythonPackage rec { name = "nixpart-${version}"; - version = "0.3.0"; + version = "0.4.0"; src = fetchurl { url = "https://github.com/aszlig/nixpart/archive/v${version}.tar.gz"; - sha256 = "0v47vgj79k1idsvw7gd3g2vm5zfb2g4i2935y9sd2av5rb2w4c05"; + sha256 = "1kgiyqh7gndr0zs3qgi6r0dpy5p71d32c2k9kbd8pjf2xyyb6fk6"; }; propagatedBuildInputs = [ (blivet.override blivetOverrides) ]; From 8a66c8b8f8b0629cb03babb2cd9f26d6884b0541 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 12 Jul 2013 13:06:15 -0400 Subject: [PATCH 395/798] imap previously mapped with 1-based indices Why???? Signed-off-by: Shea Levy --- pkgs/lib/lists.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/lib/lists.nix b/pkgs/lib/lists.nix index 164ff3e1ec9..578686ae366 100644 --- a/pkgs/lib/lists.nix +++ b/pkgs/lib/lists.nix @@ -52,7 +52,7 @@ in rec { imap' = n: if n == len then [] - else [ (f n (elemAt list n)) ] ++ imap' (inc n); + else [ (f (inc n) (elemAt list n)) ] ++ imap' (inc n); in imap' 0; From e820a54431bc4a3277378c468737b72b8a2d82e7 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sat, 13 Jul 2013 15:15:50 -0400 Subject: [PATCH 396/798] Linux 3.10.1 Signed-off-by: Shea Levy --- pkgs/os-specific/linux/kernel/linux-3.10.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.10.nix b/pkgs/os-specific/linux/kernel/linux-3.10.nix index bcf555201a2..c0242406075 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.10.nix @@ -259,8 +259,7 @@ in import ./generic.nix ( rec { - version = "3.10"; - modDirVersion = "3.10.0"; + version = "3.10.1"; testing = false; preConfigure = '' @@ -269,7 +268,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "0i1mmp1fym49az75rjnwxbbh11b387qqjjkczq5l373ssa9gl9yz"; + sha256 = "1gqrafyzi381pbd4719g853hgi17q79nvzwdja2gk1d9jiq69f6s"; }; config = configWithPlatform stdenv.platform; From 3b274caaac78eda9d0a8f67c916f3b18ec111c59 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sat, 13 Jul 2013 15:54:39 -0400 Subject: [PATCH 397/798] Fix tarball Signed-off-by: Shea Levy --- .../interpreters/ruby/generated.nix | 136 ++++++++++++++++-- .../libraries/audiofile/default.nix | 2 +- .../libraries/libsamplerate/default.nix | 2 +- pkgs/development/libraries/libvpx/default.nix | 2 +- pkgs/development/libraries/pangomm/2.28.x.nix | 2 +- .../libraries/xvidcore/default.nix | 2 +- .../python-modules/python-sip/default.nix | 2 +- pkgs/top-level/all-packages.nix | 2 +- 8 files changed, 132 insertions(+), 18 deletions(-) diff --git a/pkgs/development/interpreters/ruby/generated.nix b/pkgs/development/interpreters/ruby/generated.nix index 97a8eb67001..7446e52704c 100644 --- a/pkgs/development/interpreters/ruby/generated.nix +++ b/pkgs/development/interpreters/ruby/generated.nix @@ -38,16 +38,20 @@ g: # Get dependencies from patched gems ffi = g.ffi_1_9_0; file_tail = g.file_tail_1_0_12; foreman = g.foreman_0_63_0; + gettext = g.gettext_2_3_9; highline = g.highline_1_6_19; hike = g.hike_1_2_3; hoe = g.hoe_3_1_0; http_cookie = g.http_cookie_1_0_1; i18n = g.i18n_0_6_4; + iconv = g.iconv_1_0_3; jruby_pageant = g.jruby_pageant_1_1_1; jsduck = g.jsduck_4_10_4; json = g.json_1_8_0; json_pure = g.json_pure_1_8_0; - libv8 = g.libv8_3_11_8_17_x86_linux; + libv8 = g.libv8_3_11_8_17_x86_64_linux; + locale = g.locale_2_0_8; + lockfile = g.lockfile_2_1_0; macaddr = g.macaddr_1_6_1; mail = g.mail_2_5_4; mechanize = g.mechanize_2_7_1; @@ -81,6 +85,7 @@ g: # Get dependencies from patched gems right_aws = g.right_aws_3_1_0; right_http_connection = g.right_http_connection_1_4_0; rjb = g.rjb_1_4_8; + rmail = g.rmail_1_0_0; rspec = g.rspec_2_11_0; rspec_core = g.rspec_core_2_11_1; rspec_expectations = g.rspec_expectations_2_11_3; @@ -95,13 +100,15 @@ g: # Get dependencies from patched gems sprockets_rails = g.sprockets_rails_2_0_0; syslog_protocol = g.syslog_protocol_0_9_2; systemu = g.systemu_2_5_2; + text = g.text_1_2_1; therubyracer = g.therubyracer_0_11_4; thin = g.thin_1_5_1; thor = g.thor_0_18_1; thread_safe = g.thread_safe_0_1_0; tilt = g.tilt_1_4_1; - tins = g.tins_0_8_2; + tins = g.tins_0_8_3; treetop = g.treetop_1_4_14; + trollop = g.trollop_2_0; tzinfo = g.tzinfo_0_3_37; unf = g.unf_0_1_1; unf_ext = g.unf_ext_0_0_6; @@ -109,10 +116,12 @@ g: # Get dependencies from patched gems uuidtools = g.uuidtools_2_1_4; webrobots = g.webrobots_0_1_1; websocket = g.websocket_1_0_7; + xapian_full = g.xapian_full_1_2_3; + xapian_ruby = g.xapian_ruby_1_2_15_1; xml_simple = g.xml_simple_1_1_1; yajl_ruby = g.yajl_ruby_1_1_0; }; - gem_nix_args = [ ''autotest-rails'' ''aws-sdk'' ''bitbucket-backup'' ''buildr'' ''fakes3'' ''foreman'' ''jsduck'' ''mechanize'' ''nix'' ''papertrail-cli'' ''rails'' ''rake'' ''rb-fsevent'' ''remote_syslog'' ''right_aws'' ''sass'' ''selenium-webdriver'' ''sinatra-1.3.2'' ''thin'' ''uuid'' ]; + gem_nix_args = [ ''autotest-rails'' ''aws-sdk'' ''bitbucket-backup'' ''buildr'' ''fakes3'' ''foreman'' ''gettext'' ''iconv'' ''jsduck'' ''lockfile'' ''mechanize'' ''nix'' ''papertrail-cli'' ''rails'' ''rake'' ''rb-fsevent'' ''remote_syslog'' ''right_aws'' ''rmail'' ''sass'' ''selenium-webdriver'' ''sinatra-1.3.2'' ''thin'' ''trollop'' ''uuid'' ''xapian-full'' ''xapian-ruby'' ]; gems = { ZenTest_4_9_2 = { basename = ''ZenTest''; @@ -605,7 +614,7 @@ using TCP/IP, especially if custom protocols are required.''; longDescription = ''Library to tail files in Ruby''; }; name = ''file-tail-1.0.12''; - requiredGems = [ g.tins_0_8_2 ]; + requiredGems = [ g.tins_0_8_3 ]; sha256 = ''0mzxxnwj7k5pwxs0rdbmb3b41zgvzw7x40sf3qlkch4zdfx91i1j''; }; foreman_0_63_0 = { @@ -619,6 +628,20 @@ using TCP/IP, especially if custom protocols are required.''; requiredGems = [ g.thor_0_18_1 g.dotenv_0_8_0 ]; sha256 = ''0yqyjix9jm4iwyc4f3wc32vxr28rpjcw1c9ni5brs4s2a24inzlk''; }; + gettext_2_3_9 = { + basename = ''gettext''; + meta = { + description = ''Gettext is a pure Ruby libary and tools to localize messages.''; + homepage = ''http://ruby-gettext.github.com/''; + longDescription = ''Gettext is a GNU gettext-like program for Ruby. +The catalog file(po-file) is same format with GNU gettext. +So you can use GNU gettext tools for maintaining. +''; + }; + name = ''gettext-2.3.9''; + requiredGems = [ g.locale_2_0_8 g.text_1_2_1 ]; + sha256 = ''1i4kzkan7mnyr1ihphx0sqs3k4qj9i1ldg4a1cwf5h2fz657wvjj''; + }; highline_1_6_19 = { basename = ''highline''; meta = { @@ -702,6 +725,17 @@ For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf''; requiredGems = [ ]; sha256 = ''0wz1rnrs4n21j1rw9a120j2pfdkbikp1yvxaqi3mk30iw6mx4p0f''; }; + iconv_1_0_3 = { + basename = ''iconv''; + meta = { + description = ''iconv wrapper library''; + homepage = ''https://github.com/nurse/iconv''; + longDescription = ''iconv wrapper library''; + }; + name = ''iconv-1.0.3''; + requiredGems = [ ]; + sha256 = ''1nhjn07h2fqivdj6xqzi2x2kzh28vigx8z3q5fv2cqn9aqmbdacl''; + }; jruby_pageant_1_1_1 = { basename = ''jruby_pageant''; meta = { @@ -757,16 +791,39 @@ For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf''; requiredGems = [ ]; sha256 = ''0kkn5zhiffav2cffj43wwvzj07825r4j463ilfjgik034vnbjs83''; }; - libv8_3_11_8_17_x86_linux = { + libv8_3_11_8_17_x86_64_linux = { basename = ''libv8''; meta = { description = ''Distribution of the V8 JavaScript engine''; homepage = ''http://github.com/cowboyd/libv8''; longDescription = ''Distributes the V8 JavaScript engine in binary and source forms in order to support fast builds of The Ruby Racer''; }; - name = ''libv8-3.11.8.17-x86-linux''; + name = ''libv8-3.11.8.17-x86_64-linux''; requiredGems = [ ]; - sha256 = ''1szy5cjvin3bnydfia5nnb3n3z3prfhjl4q2nbk08zpvp162fk0n''; + sha256 = ''1s2j79rm2idny701l6rsnig6451w2wfipgmfvxf05d1syn14cmg9''; + }; + locale_2_0_8 = { + basename = ''locale''; + meta = { + description = ''Ruby-Locale is the pure ruby library which provides basic APIs for localization.''; + homepage = ''https://github.com/ruby-gettext/locale''; + longDescription = ''Ruby-Locale is the pure ruby library which provides basic APIs for localization. +''; + }; + name = ''locale-2.0.8''; + requiredGems = [ ]; + sha256 = ''1hmixxg4aigl3h1qmz4fdsrv81p0bblcjbks32nrcvcpwmlylf12''; + }; + lockfile_2_1_0 = { + basename = ''lockfile''; + meta = { + description = ''lockfile''; + homepage = ''https://github.com/ahoward/lockfile''; + longDescription = ''description: lockfile kicks the ass''; + }; + name = ''lockfile-2.1.0''; + requiredGems = [ ]; + sha256 = ''1yfpz9k0crb7q7y5bcaavf2jzbc170dj84hqz13qp75rj7bl3qhf''; }; macaddr_1_6_1 = { basename = ''macaddr''; @@ -1344,6 +1401,17 @@ algorithm for low-level network errors. requiredGems = [ ]; sha256 = ''06ps4ssaxb8jwja53h7v7kb31hsdr997b8na89d1yasm5zyraliw''; }; + rmail_1_0_0 = { + basename = ''rmail''; + meta = { + description = ''A MIME mail parsing and generation library.''; + homepage = ''http://www.rfc20.org/rubymail''; + longDescription = ''RMail is a lightweight mail library containing various utility classes and modules that allow ruby scripts to parse, modify, and generate MIME mail messages.''; + }; + name = ''rmail-1.0.0''; + requiredGems = [ ]; + sha256 = ''0nsg7yda1gdwa96j4hlrp2s0m06vrhcc4zy5mbq7gxmlmwf9yixp''; + }; rspec_2_11_0 = { basename = ''rspec''; meta = { @@ -1510,6 +1578,17 @@ interpreters.''; requiredGems = [ ]; sha256 = ''0h834ajdg9w4xrijp31fn98pjfj08gi08xjvp5xh3i6hz9a25fhr''; }; + text_1_2_1 = { + basename = ''text''; + meta = { + description = ''A collection of text algorithms''; + homepage = ''http://github.com/threedaymonk/text''; + longDescription = ''A collection of text algorithms: Levenshtein, Soundex, Metaphone, Double Metaphone, Porter Stemming''; + }; + name = ''text-1.2.1''; + requiredGems = [ ]; + sha256 = ''0s186kh125imdr7dahr10payc1gmxgk6wjy1v3agdyvl53yn5z3z''; + }; therubyracer_0_11_4 = { basename = ''therubyracer''; meta = { @@ -1518,7 +1597,7 @@ interpreters.''; longDescription = ''Call JavaScript code and manipulate JavaScript objects from Ruby. Call Ruby code and manipulate Ruby objects from JavaScript.''; }; name = ''therubyracer-0.11.4''; - requiredGems = [ g.ref_1_0_5 g.libv8_3_11_8_17_x86_linux ]; + requiredGems = [ g.ref_1_0_5 g.libv8_3_11_8_17_x86_64_linux ]; sha256 = ''15n9zi9jzb5k34id9xfkxx39y0nap7a4h02z8r00msjjajxag3iq''; }; thin_1_5_1 = { @@ -1565,16 +1644,16 @@ interpreters.''; requiredGems = [ ]; sha256 = ''00sr3yy7sbqaq7cb2d2kpycajxqf1b1wr1yy33z4bnzmqii0b0ir''; }; - tins_0_8_2 = { + tins_0_8_3 = { basename = ''tins''; meta = { description = ''Useful stuff.''; homepage = ''http://flori.github.com/tins''; longDescription = ''All the stuff that isn't good/big enough for a real library.''; }; - name = ''tins-0.8.2''; + name = ''tins-0.8.3''; requiredGems = [ ]; - sha256 = ''0wjc21jf374pyhfha8yw0zvf9br4pnmibx98z8yk9pa4qbslryq9''; + sha256 = ''14wrkki06g088fla8pab331p31ywdij90m14cva1hcpsd9a666ld''; }; treetop_1_4_14 = { basename = ''treetop''; @@ -1586,6 +1665,21 @@ interpreters.''; requiredGems = [ g.polyglot_0_3_3 g.polyglot_0_3_3 ]; sha256 = ''0qbk97wgbvj31sz4h3p8kfmvc8ig97gh91dfmk3m7j1h8vq87acs''; }; + trollop_2_0 = { + basename = ''trollop''; + meta = { + description = ''Trollop is a commandline option parser for Ruby that just gets out of your way.''; + homepage = ''http://trollop.rubyforge.org''; + longDescription = ''Trollop is a commandline option parser for Ruby that just +gets out of your way. One line of code per option is all you need to write. +For that, you get a nice automatically-generated help page, robust option +parsing, command subcompletion, and sensible defaults for everything you don't +specify.''; + }; + name = ''trollop-2.0''; + requiredGems = [ ]; + sha256 = ''0iz5k7ax7a5jm9x6p81k6f4mgp48wxxb0j55ypnwxnznih8fsghz''; + }; tzinfo_0_3_37 = { basename = ''tzinfo''; meta = { @@ -1669,6 +1763,26 @@ to Ruby/JRuby. requiredGems = [ ]; sha256 = ''1jrfz4295qbnjaxv37fw9jzxyxz61izp7c0683mnscacpx262zw0''; }; + xapian_full_1_2_3 = { + basename = ''xapian_full''; + meta = { + description = ''xapian-core + Ruby xapian-bindings''; + longDescription = ''Xapian bindings for Ruby without dependency on system Xapian library''; + }; + name = ''xapian-full-1.2.3''; + requiredGems = [ ]; + sha256 = ''02z0wsir38jsp5d6sqrkgv5prk8s6sdf6g2h718j2374kpnkyrxv''; + }; + xapian_ruby_1_2_15_1 = { + basename = ''xapian_ruby''; + meta = { + description = ''xapian libraries and ruby bindings''; + homepage = ''https://github.com/garaio/xapian-ruby''; + }; + name = ''xapian-ruby-1.2.15.1''; + requiredGems = [ ]; + sha256 = ''02v3l931246asbcivkr4j0x99pl4i4fjvfsr8ga8v6lkvz0ls1xp''; + }; xml_simple_1_1_1 = { basename = ''xml_simple''; meta = { diff --git a/pkgs/development/libraries/audiofile/default.nix b/pkgs/development/libraries/audiofile/default.nix index 1190f7437cb..57ca21885dd 100644 --- a/pkgs/development/libraries/audiofile/default.nix +++ b/pkgs/development/libraries/audiofile/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A library for reading and writing audio files in various formats"; homepage = http://www.68k.org/~michael/audiofile/; - license = licenses.lgpl; + license = licenses.lgpl21; maintainers = with maintainers; [ lovek323 shlevy ]; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/libsamplerate/default.nix b/pkgs/development/libraries/libsamplerate/default.nix index 3b7434dc9fb..57eaf529a63 100644 --- a/pkgs/development/libraries/libsamplerate/default.nix +++ b/pkgs/development/libraries/libsamplerate/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { # you can choose one of the following licenses: # GPL or a commercial-use license (available at # http://www.mega-nerd.com/SRC/libsamplerate-cul.pdf) - licenses = with licenses; [ gpl unfree ]; + licenses = with licenses; [ gpl3.shortName unfree ]; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/libvpx/default.nix b/pkgs/development/libraries/libvpx/default.nix index 3ca2239ac8e..46e73a121fe 100644 --- a/pkgs/development/libraries/libvpx/default.nix +++ b/pkgs/development/libraries/libvpx/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "VP8 video encoder"; homepage = http://code.google.com/p/webm; - license = licenses.bsd; + license = licenses.bsd3; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/pangomm/2.28.x.nix b/pkgs/development/libraries/pangomm/2.28.x.nix index 46875901181..411b969cb24 100644 --- a/pkgs/development/libraries/pangomm/2.28.x.nix +++ b/pkgs/development/libraries/pangomm/2.28.x.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "C++ interface to the Pango text rendering library"; homepage = http://www.pango.org/; - license = licenses.lgplv2Plus; + license = licenses.lgpl2Plus; maintainers = with maintainers; [ lovek323 raskin ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/xvidcore/default.nix b/pkgs/development/libraries/xvidcore/default.nix index df7404e1faf..b4d44be1738 100644 --- a/pkgs/development/libraries/xvidcore/default.nix +++ b/pkgs/development/libraries/xvidcore/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "MPEG-4 video codec for PC"; homepage = http://www.xvid.org/; - license = licenses.gplv2Plus; + license = licenses.gpl2Plus; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.all; }; diff --git a/pkgs/development/python-modules/python-sip/default.nix b/pkgs/development/python-modules/python-sip/default.nix index fa2bae7ae27..076cba1fad2 100644 --- a/pkgs/development/python-modules/python-sip/default.nix +++ b/pkgs/development/python-modules/python-sip/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Creates C++ bindings for Python modules"; - license = licenses.gpl; + license = licenses.gpl3Plus; maintainers = with maintainers; [ lovek323 sander urkud ]; platforms = platforms.all; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 73cfc6f005e..a656cdf1c41 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8086,7 +8086,7 @@ let lockfile = rubyLibs.lockfile; mime_types = rubyLibs.mime_types; ncursesw_sup = ruby_ncursesw_sup; - rake = rubyLibs.rake_10_0_4; + rake = rubyLibs.rake_10_1_0; rmail = rubyLibs.rmail; text = rubyLibs.text; trollop = rubyLibs.trollop; From e193a4f8987e2ffeb4c65fd39ede34082dd199df Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sat, 13 Jul 2013 16:01:06 -0400 Subject: [PATCH 398/798] Fix gtk2 build libintlOrEmpty is [], not null, when libintl isn't needed Signed-off-by: Shea Levy --- pkgs/development/libraries/gtk+/2.x.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk+/2.x.nix index 6b889f76ca5..8c6e76726af 100644 --- a/pkgs/development/libraries/gtk+/2.x.nix +++ b/pkgs/development/libraries/gtk+/2.x.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; NIX_CFLAGS_COMPILE = "-I${cairo}/include/cairo" - + stdenv.lib.optionalString (libintlOrEmpty != null) " -lintl"; + + stdenv.lib.optionalString (libintlOrEmpty != []) " -lintl"; nativeBuildInputs = [ perl pkgconfig gettext ]; From b4dbb8e4983efe6d834cad8551c5d327bb7c76ce Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Sun, 14 Jul 2013 07:35:03 +1000 Subject: [PATCH 399/798] fluidsynth: fix build on darwin * remove unnecessary include --- pkgs/applications/audio/fluidsynth/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/audio/fluidsynth/default.nix b/pkgs/applications/audio/fluidsynth/default.nix index 413e7d0661b..b0c5a88cb1a 100644 --- a/pkgs/applications/audio/fluidsynth/default.nix +++ b/pkgs/applications/audio/fluidsynth/default.nix @@ -13,7 +13,6 @@ stdenv.mkDerivation rec { preBuild = stdenv.lib.optionalString stdenv.isDarwin '' sed -i '40 i\ #include \ - #include \ #include ' \ src/drivers/fluid_coreaudio.c ''; From 291e0a111a712aa4e02f0af0d8ca4fadc0929d9a Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Sun, 14 Jul 2013 08:06:01 +1000 Subject: [PATCH 400/798] gst-plugins-base: fix build on darwin * add libintl --- .../libraries/gstreamer/gst-plugins-base/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix b/pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix index da861dda12d..d6717d799f1 100644 --- a/pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix +++ b/pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix @@ -1,5 +1,6 @@ { fetchurl, stdenv, pkgconfig, python, gstreamer, xlibs, alsaLib, cdparanoia , libogg, libtheora, libvorbis, freetype, pango, liboil, glib, cairo +, libintlOrEmpty , # Whether to build no plugins that have external dependencies # (except the ALSA plugin). minimalDeps ? false @@ -30,7 +31,10 @@ stdenv.mkDerivation rec { [ xlibs.xlibs xlibs.libXv libogg libtheora libvorbis freetype pango liboil ] # can't build cdparanoia on darwin - ++ stdenv.lib.optional (!minimalDeps && !stdenv.isDarwin) cdparanoia; + ++ stdenv.lib.optional (!minimalDeps && !stdenv.isDarwin) cdparanoia + ++ libintlOrEmpty; + + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; propagatedBuildInputs = [ gstreamer ]; From 3af273f3c30199a322836afc75ce9f1f5c5833f2 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Sat, 13 Jul 2013 22:34:04 +0300 Subject: [PATCH 401/798] 3dpong: fix version to match tarball --- pkgs/games/pong3d/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/pong3d/default.nix b/pkgs/games/pong3d/default.nix index 24baff5394a..d5f9ca6ee23 100644 --- a/pkgs/games/pong3d/default.nix +++ b/pkgs/games/pong3d/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, libX11}: stdenv.mkDerivation { - name = "3dpong-0.5.0"; + name = "3dpong-0.5"; src = fetchurl { url = ftp://ftp.tuxpaint.org/unix/x/3dpong/src/3dpong-0.5.tar.gz; sha256 = "1ibb79sbzlbn4ra3n0qk22gqr6fg7q0jy6cm0wg2qj4z64c7hmdi"; From 83e37cdac8db0f710ed378ce0f0b9803409aa7ca Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Sat, 13 Jul 2013 22:40:19 +0300 Subject: [PATCH 402/798] atool: fix version to match tarball --- pkgs/tools/archivers/atool/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/archivers/atool/default.nix b/pkgs/tools/archivers/atool/default.nix index d376f75a552..e0ece8825c0 100644 --- a/pkgs/tools/archivers/atool/default.nix +++ b/pkgs/tools/archivers/atool/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, perl}: stdenv.mkDerivation rec { - name = "atool-0.39"; + name = "atool-0.39.0"; src = fetchurl { url = http://savannah.nongnu.org/download/atool/atool-0.39.0.tar.gz; sha256 = "aaf60095884abb872e25f8e919a8a63d0dabaeca46faeba87d12812d6efc703b"; From 6c1fc08df7a855433ddbe4a954695a5db575de40 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Sat, 13 Jul 2013 22:41:52 +0300 Subject: [PATCH 403/798] blobby-volley: fix version to match tarball --- pkgs/games/blobby/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/blobby/default.nix b/pkgs/games/blobby/default.nix index 5c10154998d..7e4f6b00587 100644 --- a/pkgs/games/blobby/default.nix +++ b/pkgs/games/blobby/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, SDL, SDL_image, mesa, cmake, physfs, boost, zip, zlib}: stdenv.mkDerivation rec { - version = "2.0-rc3"; + version = "1.0-rc3"; name = "blobby-volley-${version}"; src = fetchurl { From 7e5e50a084224478752f72fc20492c8dab9f77d3 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Sat, 13 Jul 2013 22:46:09 +0300 Subject: [PATCH 404/798] strategoxt.dryad: fix version to match tarball --- pkgs/development/compilers/strategoxt/0.17.nix | 2 +- pkgs/development/compilers/strategoxt/0.18.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/strategoxt/0.17.nix b/pkgs/development/compilers/strategoxt/0.17.nix index c84734d7ac7..d621cbf5f0c 100644 --- a/pkgs/development/compilers/strategoxt/0.17.nix +++ b/pkgs/development/compilers/strategoxt/0.17.nix @@ -82,7 +82,7 @@ rec { dryad = stdenv.mkDerivation rec { - name = "dryad-0.2pre1835518355"; + name = "dryad-0.2pre18355"; src = fetchurl { url = "http://releases.strategoxt.org/dryad/${name}-zbqfh1rm/dryad-0.2pre18355.tar.gz"; diff --git a/pkgs/development/compilers/strategoxt/0.18.nix b/pkgs/development/compilers/strategoxt/0.18.nix index 85d373afa0d..83ee5f3b06e 100644 --- a/pkgs/development/compilers/strategoxt/0.18.nix +++ b/pkgs/development/compilers/strategoxt/0.18.nix @@ -92,7 +92,7 @@ rec { } // ( if stdenv.system == "i686-cygwin" then { CFLAGS = "-O2"; } else {} ) ) ; dryad = stdenv.mkDerivation rec { - name = "dryad-0.2pre1835518355"; + name = "dryad-0.2pre18355"; src = fetchurl { url = "http://releases.strategoxt.org/dryad/${name}-zbqfh1rm/dryad-0.2pre18355.tar.gz"; From a42ba6d8fedb8083b5535116aababc08f89ba597 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Sat, 13 Jul 2013 22:53:33 +0300 Subject: [PATCH 405/798] filegive: change url so that it's friendlyto automated processing. This changes the tarball a little(likely metadata) but it still builds. --- pkgs/tools/networking/filegive/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/filegive/default.nix b/pkgs/tools/networking/filegive/default.nix index 3072ba3bd4f..fc2b56efd10 100644 --- a/pkgs/tools/networking/filegive/default.nix +++ b/pkgs/tools/networking/filegive/default.nix @@ -18,9 +18,8 @@ stdenv.mkDerivation rec { name = "filegive-${version}"; src = fetchurl { - url = "http://viric.name/cgi-bin/filegive/tarball/${name}.tar.gz?uuid=v${version}"; - name = "${name}.tar.gz"; - sha256 = "172cvm41bqaixz50f86ppqbbridb0qnrcdldfswrs03dc569szm1"; + url = "http://viric.name/cgi-bin/filegive/tarball/${name}.tar.gz"; + sha256 = "11rjw906nr73kysm9l84yg443rxzh22l934hir7892h02924i4c4"; }; buildInputs = [ go ]; From 14d4740ba76267a51944e27d966f6c407f00c1c9 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Sat, 13 Jul 2013 22:59:03 +0300 Subject: [PATCH 406/798] firebird: fix version to match tarball --- pkgs/servers/firebird/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/firebird/default.nix b/pkgs/servers/firebird/default.nix index 12dfc20e736..8ad16a3df2e 100644 --- a/pkgs/servers/firebird/default.nix +++ b/pkgs/servers/firebird/default.nix @@ -22,7 +22,7 @@ */ stdenv.mkDerivation rec { - version = "2.5.2"; + version = "2.5.2.26539-0"; name = "firebird-${version}"; configureFlags = @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ++ (stdenv.lib.optional superServer "--enable-superserver=true"); src = fetchurl { - url = "mirror://sourceforge/firebird/Firebird-${version}.26539-0.tar.bz2"; + url = "mirror://sourceforge/firebird/Firebird-${version}.tar.bz2"; sha256 = "1j5bcfl35hr6i4lcd08zls19bal2js3ar16gnwkzbhwxkxbyb43b"; }; From 33dac7832315d595e15eed21d34f5b3250b4bbf7 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Sat, 13 Jul 2013 23:01:58 +0300 Subject: [PATCH 407/798] golly: fix version to match tarball --- pkgs/applications/science/misc/golly/src-for-default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/science/misc/golly/src-for-default.nix b/pkgs/applications/science/misc/golly/src-for-default.nix index 00038373d56..23742ac9040 100644 --- a/pkgs/applications/science/misc/golly/src-for-default.nix +++ b/pkgs/applications/science/misc/golly/src-for-default.nix @@ -1,5 +1,5 @@ rec { - version="2.4-src"; + version="2.4"; name="golly-2.4-src"; hash="06vajm019q4q4wfy6pc1669fbjqdb4jaxcc419bk0vzky40anl9w"; url="http://downloads.sourceforge.net/project/golly/golly/golly-2.4/golly-2.4-src.tar.gz"; From 9a3d4fba5e4895a3f609edf3c69808abec10c827 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Sat, 13 Jul 2013 23:04:19 +0300 Subject: [PATCH 408/798] hdf5: fix version to match tarball --- pkgs/tools/misc/hdf5/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/hdf5/default.nix b/pkgs/tools/misc/hdf5/default.nix index c8ba478af33..0aacf744b1a 100644 --- a/pkgs/tools/misc/hdf5/default.nix +++ b/pkgs/tools/misc/hdf5/default.nix @@ -3,7 +3,7 @@ , fetchurl }: stdenv.mkDerivation { - name = "hdf5-1.8.10"; + name = "hdf5-1.8.10-patch1"; src = fetchurl { url = http://www.hdfgroup.org/ftp/HDF5/current/src/hdf5-1.8.10-patch1.tar.gz; sha256 = "08ad32fhnci6rdfn6mn3w9v1wcaxdcd326n3ljwkcq4dzhkh28qz"; From 36d0df04987ee422981683d5432f55b92e60b753 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Sat, 13 Jul 2013 23:09:19 +0300 Subject: [PATCH 409/798] lesstif: fix version to match tarball --- pkgs/development/libraries/lesstif/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/lesstif/default.nix b/pkgs/development/libraries/lesstif/default.nix index feeed3c14a6..21b4eac30af 100644 --- a/pkgs/development/libraries/lesstif/default.nix +++ b/pkgs/development/libraries/lesstif/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, x11, libXp, libXau}: stdenv.mkDerivation { - name = "lesstif-0.95-p2"; + name = "lesstif-0.95.0-p2"; src = fetchurl { url = mirror://sourceforge/lesstif/lesstif-0.95.0.tar.bz2; md5 = "ab895165c149d7f95843c7584b1c7ad4"; From 8a2da9525595638718a2d658c16775d2f453a1f1 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Sat, 13 Jul 2013 23:10:46 +0300 Subject: [PATCH 410/798] luarocks: fix version to match tarball --- pkgs/development/tools/misc/luarocks/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/luarocks/default.nix b/pkgs/development/tools/misc/luarocks/default.nix index da44a7d73a5..7681c8153db 100644 --- a/pkgs/development/tools/misc/luarocks/default.nix +++ b/pkgs/development/tools/misc/luarocks/default.nix @@ -3,7 +3,7 @@ let s = # Generated upstream information rec { baseName="luarocks"; - version="2.0.13"; + version="2.0.13-rc1"; name="${baseName}-${version}"; hash="1cpdi61dwcc2i4bwrn7bb8fibkd1s75jrr0bjcbs8p76rn6hkb2y"; url="http://luarocks.org/releases/luarocks-2.0.13-rc1.tar.gz"; From 64d5bf475c530a5034ba280a76a0e4aec3600f5b Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Sat, 13 Jul 2013 23:12:59 +0300 Subject: [PATCH 411/798] matchbox: fix version to match tarball --- pkgs/applications/window-managers/matchbox/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/window-managers/matchbox/default.nix b/pkgs/applications/window-managers/matchbox/default.nix index 27a4014d461..ed2637eff6e 100644 --- a/pkgs/applications/window-managers/matchbox/default.nix +++ b/pkgs/applications/window-managers/matchbox/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, libmatchbox, pkgconfig}: stdenv.mkDerivation rec { - name = "matchbox-1.2.2"; + name = "matchbox-1.2"; buildInputs = [ libmatchbox pkgconfig ]; From 8c8ac0fc8b0aa3acf7d76b6ea0b4ce3b8ff9eaa5 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Sat, 13 Jul 2013 23:14:00 +0300 Subject: [PATCH 412/798] mktorrent: fix version to match tarball --- pkgs/tools/misc/mktorrent/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/mktorrent/default.nix b/pkgs/tools/misc/mktorrent/default.nix index 713d6dc70b8..f177e9e84c2 100644 --- a/pkgs/tools/misc/mktorrent/default.nix +++ b/pkgs/tools/misc/mktorrent/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, openssl}: stdenv.mkDerivation { - name = "mktorrent-1.0.0"; + name = "mktorrent-1.0"; src = fetchurl { url = mirror://sourceforge/mktorrent/mktorrent-1.0.tar.gz; From f889b52c300df93f20694423aa244ff5ae258aa0 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Sat, 13 Jul 2013 23:16:23 +0300 Subject: [PATCH 413/798] libgeotiff: fix version to match tarball --- pkgs/development/libraries/libgeotiff/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libgeotiff/default.nix b/pkgs/development/libraries/libgeotiff/default.nix index 920f40abd5a..07e8d2869ce 100644 --- a/pkgs/development/libraries/libgeotiff/default.nix +++ b/pkgs/development/libraries/libgeotiff/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, libtiff }: stdenv.mkDerivation { - name = "libgeotiff-1.2.4"; + name = "libgeotiff-1.2.5"; src = fetchurl { url = ftp://ftp.remotesensing.org/pub/geotiff/libgeotiff/libgeotiff-1.2.5.tar.gz; From fb07ba725be1fe2fdedf66e9cfc26d785e5c4901 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Sat, 13 Jul 2013 23:18:36 +0300 Subject: [PATCH 414/798] libgnomeprintui: fix version to match tarball --- pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix b/pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix index a406f9209a3..da7673de419 100644 --- a/pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, pkgconfig, gtk, gettext, intltool, libgnomecanvas, libgnomeprint, gnomeicontheme}: stdenv.mkDerivation { - name = "libgnomeprintui-2.11.1"; + name = "libgnomeprintui-2.18.4"; src = fetchurl { url = mirror://gnome/sources/libgnomeprintui/2.18/libgnomeprintui-2.18.4.tar.bz2; From c8e8cfc0d13d237631254e47b924ce87c759a3f1 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Sat, 13 Jul 2013 23:20:15 +0300 Subject: [PATCH 415/798] libmrss: fix version to match tarball --- pkgs/development/libraries/libmrss/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libmrss/default.nix b/pkgs/development/libraries/libmrss/default.nix index 395b254d34d..b1f7b0071c8 100644 --- a/pkgs/development/libraries/libmrss/default.nix +++ b/pkgs/development/libraries/libmrss/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, curl, libnxml, pkgconfig}: stdenv.mkDerivation { - name = "libmrss-1.0"; + name = "libmrss-0.19.2"; src = fetchurl { url = "http://www.autistici.org/bakunin/libmrss/libmrss-0.19.2.tar.gz"; From 5d56681505225f06be9c228c4c8d0d27d0508942 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Sat, 13 Jul 2013 23:21:11 +0300 Subject: [PATCH 416/798] extlib: fix version to match tarball --- pkgs/development/ocaml-modules/extlib/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/extlib/default.nix b/pkgs/development/ocaml-modules/extlib/default.nix index d59dbae45fe..41620b9424f 100644 --- a/pkgs/development/ocaml-modules/extlib/default.nix +++ b/pkgs/development/ocaml-modules/extlib/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, ocaml, findlib}: stdenv.mkDerivation { - name = "ocaml-extlib-1.5.2"; + name = "ocaml-extlib-1.5.3"; src = fetchurl { url = http://ocaml-extlib.googlecode.com/files/extlib-1.5.3.tar.gz; From e01d16f7d481054fe9a5fd105d1afc7f93d87366 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Sat, 13 Jul 2013 23:23:22 +0300 Subject: [PATCH 417/798] pam_console: fix version to match tarball --- pkgs/os-specific/linux/pam_console/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/pam_console/default.nix b/pkgs/os-specific/linux/pam_console/default.nix index fbdcce2d1b1..7c1e83c0ed6 100644 --- a/pkgs/os-specific/linux/pam_console/default.nix +++ b/pkgs/os-specific/linux/pam_console/default.nix @@ -9,7 +9,7 @@ let in stdenv.mkDerivation { - name = "pam_console-0.99.5"; + name = "pam_console-0.99.5-1"; src = fetchurl { url = http://cvs.fedora.redhat.com/repo/dist/pam/pam-redhat-0.99.5-1.tar.bz2/e2edde7861c48195728bc531e5a277e0/pam-redhat-0.99.5-1.tar.bz2; From e675a2a9960a3a293b49e3a116ddf67932758e65 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Sat, 13 Jul 2013 23:24:34 +0300 Subject: [PATCH 418/798] perl-io-pager: fix version --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 05fed84dff5..edc0160f96f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3408,7 +3408,7 @@ rec { }; IOPager = buildPerlPackage { - name = "IO-Pager-0.06.tgz"; + name = "IO-Pager-0.06"; src = fetchurl { url = mirror://cpan/authors/id/J/JP/JPIERCE/IO-Pager-0.06.tgz; sha256 = "0r3af4gyjpy0f7bhs7hy5s7900w0yhbckb2dl3a1x5wpv7hcbkjb"; From 3fe900b053235038adcb5d4d46d9832fcaa4b4bb Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Sat, 13 Jul 2013 23:27:51 +0300 Subject: [PATCH 419/798] perl-uri-url: fix version to match tarball --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index edc0160f96f..307e277a2b1 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7084,7 +7084,7 @@ rec { }; URIURL = buildPerlPackage { - name = "URI-URL-5.04"; + name = "URI-URL-1.60"; src = fetchurl { url = mirror://cpan/authors/id/G/GA/GAAS/URI-1.60.tar.gz; sha256 = "0xr31mf7lfrwhyvlx4pzp6p7alls5gi4bj8pk5g89f5cckfd74hz"; From 744e06b4c3f6bcfe76dba9ca064c9d07bd1050b4 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Sat, 13 Jul 2013 23:29:40 +0300 Subject: [PATCH 420/798] python-colorama: fix name --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 55059c111ef..87e0201b5e9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -758,7 +758,7 @@ pythonPackages = python.modules // rec { colorama = buildPythonPackage rec { - name = "clientform-0.2.10"; + name = "colorama-0.2.5"; src = fetchurl { url = "https://pypi.python.org/packages/source/c/colorama/colorama-0.2.5.tar.gz"; From 88a2e70184b02d2c0e4ff4979f5ec8e3481b6283 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Sat, 13 Jul 2013 23:30:23 +0300 Subject: [PATCH 421/798] python-paramiko: fix version to match tarball --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 87e0201b5e9..e4ff3b6968a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3211,7 +3211,7 @@ pythonPackages = python.modules // rec { }; paramiko = buildPythonPackage rec { - name = "paramiko-1.10"; + name = "paramiko-1.10.1"; src = fetchurl { url = https://pypi.python.org/packages/source/p/paramiko/paramiko-1.10.1.tar.gz; From 366dfa988317660517dd83a45cc611e5a6e7d6f8 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Sat, 13 Jul 2013 23:31:28 +0300 Subject: [PATCH 422/798] python-twisted: fix version to match tarball --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e4ff3b6968a..d080e913399 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5134,7 +5134,7 @@ pythonPackages = python.modules // rec { }); twisted = buildPythonPackage rec { - name = "twisted-12.3.0"; + name = "twisted-10.2.0"; src = fetchurl { url = http://tmrc.mit.edu/mirror/twisted/Twisted/10.2/Twisted-10.2.0.tar.bz2; From 649dd8377ec85928cd93fb6cf37ef48f39daa7c2 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Sat, 13 Jul 2013 23:33:06 +0300 Subject: [PATCH 423/798] perl-net-amazon-s3-policy: fix version to match tarball --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 307e277a2b1..64f677093b3 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4790,7 +4790,7 @@ rec { }; NetAmazonS3Policy = buildPerlPackage { - name = "Net-Amazon-S3-Policy-0.001002"; + name = "Net-Amazon-S3-Policy-0.1.2"; src = fetchurl { url = mirror://cpan/authors/id/P/PO/POLETTIX/Net-Amazon-S3-Policy-0.1.2.tar.gz; sha256 = "1kkzimvxwxx0mypf75dalksxmvwsb8b575yx2nzmvjkvjg3j9na0"; From b53f429c6cfea2eae58bfa2c4b4ac9ae16f21f7c Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Sat, 13 Jul 2013 23:34:53 +0300 Subject: [PATCH 424/798] rapidvn: fix version to match tarball --- pkgs/applications/version-management/rapidsvn/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/rapidsvn/default.nix b/pkgs/applications/version-management/rapidsvn/default.nix index 3a22338ed7e..264340b4826 100644 --- a/pkgs/applications/version-management/rapidsvn/default.nix +++ b/pkgs/applications/version-management/rapidsvn/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, wxGTK, subversion, apr, aprutil, python}: stdenv.mkDerivation { - name = "rapidsvn-0.12"; + name = "rapidsvn-0.12.0-1"; src = fetchurl { url = http://www.rapidsvn.org/download/release/0.12/rapidsvn-0.12.0-1.tar.gz; From f61a4118d03a14010c399854fc962a0d16457c90 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Sat, 13 Jul 2013 23:36:41 +0300 Subject: [PATCH 425/798] renameutils: fix version to match tarball --- pkgs/tools/misc/renameutils/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/renameutils/default.nix b/pkgs/tools/misc/renameutils/default.nix index 6d4793a4aab..527dbe85813 100644 --- a/pkgs/tools/misc/renameutils/default.nix +++ b/pkgs/tools/misc/renameutils/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, readline}: stdenv.mkDerivation { - name = "renameutils-0.12"; + name = "renameutils-0.12.0"; src = fetchurl { url = mirror://savannah/renameutils/renameutils-0.12.0.tar.gz; From d614ae9959982414beddd0b2e21b7a3222ec2f23 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Sat, 13 Jul 2013 23:39:00 +0300 Subject: [PATCH 426/798] sylpheed: fix version to match tarball --- pkgs/applications/networking/mailreaders/sylpheed/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/mailreaders/sylpheed/default.nix b/pkgs/applications/networking/mailreaders/sylpheed/default.nix index bf9e19642b8..31e65a857df 100644 --- a/pkgs/applications/networking/mailreaders/sylpheed/default.nix +++ b/pkgs/applications/networking/mailreaders/sylpheed/default.nix @@ -11,7 +11,7 @@ assert sslSupport -> openssl != null; assert gpgSupport -> gpgme != null; stdenv.mkDerivation { - name = "sylpheed-3.2"; + name = "sylpheed-3.2.0"; src = fetchurl { url = http://sylpheed.sraoss.jp/sylpheed/v3.2/sylpheed-3.2.0.tar.bz2; From bbd631250dda231527fc0c8f7dcaa0a73c7900ab Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Sat, 13 Jul 2013 23:42:17 +0300 Subject: [PATCH 427/798] ucl: fix version to match tarball --- pkgs/development/libraries/ucl/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/ucl/default.nix b/pkgs/development/libraries/ucl/default.nix index e9739d44bca..cef853698a8 100644 --- a/pkgs/development/libraries/ucl/default.nix +++ b/pkgs/development/libraries/ucl/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl}: stdenv.mkDerivation { - name = "ucl-1.0.3"; + name = "ucl-1.03"; src = fetchurl { url = http://www.oberhumer.com/opensource/ucl/download/ucl-1.03.tar.gz; sha256 = "b865299ffd45d73412293369c9754b07637680e5c826915f097577cd27350348"; From 9afe9c9c53430e321d3008dd66a8d210003042f3 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Sat, 13 Jul 2013 23:44:33 +0300 Subject: [PATCH 428/798] uw-imap: fix version to match tarball --- pkgs/tools/networking/uwimap/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/uwimap/default.nix b/pkgs/tools/networking/uwimap/default.nix index be3153ba281..5ffeb53dd29 100644 --- a/pkgs/tools/networking/uwimap/default.nix +++ b/pkgs/tools/networking/uwimap/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, pam, openssl}: stdenv.mkDerivation { - name = "uw-imap-2007"; + name = "uw-imap-2007f"; src = fetchurl { url = "ftp://ftp.cac.washington.edu/imap/imap-2007f.tar.gz"; From 1d07e3ef7771eaf83b15cc32a2578b0c375557b6 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Sat, 13 Jul 2013 23:46:54 +0300 Subject: [PATCH 429/798] wmii: fix version to match tarball --- pkgs/applications/window-managers/wmii/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/window-managers/wmii/default.nix b/pkgs/applications/window-managers/wmii/default.nix index 3df24cf3360..a44c54f7b57 100644 --- a/pkgs/applications/window-managers/wmii/default.nix +++ b/pkgs/applications/window-managers/wmii/default.nix @@ -1,5 +1,5 @@ args: with args; stdenv.mkDerivation { - name = "wmii-20071116"; + name = "wmii-3.6"; src = fetchurl { url = http://dl.suckless.org/wmii/wmii-3.6.tar.gz; From 58988f332508b8463cd0606acb8e11432def9724 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Sat, 13 Jul 2013 23:58:14 +0300 Subject: [PATCH 430/798] python-rhpl: fix mirror. unfortunately can't use mirror://fedora for this because this is a very old package which isn't hosted by all the mirrors. --- pkgs/development/python-modules/rhpl/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/rhpl/default.nix b/pkgs/development/python-modules/rhpl/default.nix index 7b33932492b..92330a378c8 100644 --- a/pkgs/development/python-modules/rhpl/default.nix +++ b/pkgs/development/python-modules/rhpl/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "rhpl-0.218"; src = fetchurl { - url = http://ftp.stw-bonn.de/pub/fedora/linux/releases/10/Everything/source/SRPMS/rhpl-0.218-1.src.rpm; + url = http://ftp-stud.hs-esslingen.de/pub/Mirrors/archive.fedoraproject.org/fedora/linux/releases/10/Everything/source/SRPMS//rhpl-0.218-1.src.rpm; md5 = "a72c6b66df782ca1d4950959d2aad292"; }; From 567b74b5d3c581296bd55929f8a0ef160e6aeb9f Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Sun, 14 Jul 2013 00:11:40 +0300 Subject: [PATCH 431/798] vmime: indicate that this is a pre-release version --- pkgs/development/libraries/vmime/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/vmime/default.nix b/pkgs/development/libraries/vmime/default.nix index 24234469fa2..c92df5a8bcb 100644 --- a/pkgs/development/libraries/vmime/default.nix +++ b/pkgs/development/libraries/vmime/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, gsasl, gnutls, pkgconfig, zlib, libtasn1, libgcrypt }: stdenv.mkDerivation { - name = "vmime-0.9.2svn"; + name = "vmime-0.9.2-pre-svn603"; src = fetchurl { url = http://download.zarafa.com/community/final/7.0/7.0.5-31880/sourcecode/libvmime-0.9.2+svn603.tar.bz2; #url = mirror://sourceforge/vmime/libvmime-0.9.1.tar.bz2; From d078f07f4c551ac6de1ec540169ac08e4094caea Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Sun, 14 Jul 2013 00:14:07 +0300 Subject: [PATCH 432/798] strategoxt.java-front: fix version to match tarball --- pkgs/development/compilers/strategoxt/0.18.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/strategoxt/0.18.nix b/pkgs/development/compilers/strategoxt/0.18.nix index 83ee5f3b06e..7e58c561739 100644 --- a/pkgs/development/compilers/strategoxt/0.18.nix +++ b/pkgs/development/compilers/strategoxt/0.18.nix @@ -59,7 +59,7 @@ rec { }; javafront = stdenv.mkDerivation (rec { - name = "java-front-0.9.1"; + name = "java-front-0.9.1pre20122"; src = fetchurl { url = "http://hydra.nixos.org/build/766286/download/1/java-front-0.9.1pre20122.tar.gz"; From 297a56149188d0cb4452a7e4afc9fb49fe3ab693 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Sun, 14 Jul 2013 00:19:20 +0300 Subject: [PATCH 433/798] eduke32: fix version to match tarball --- pkgs/games/eduke32/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/eduke32/default.nix b/pkgs/games/eduke32/default.nix index b8a215e3b49..4f1b126ac47 100644 --- a/pkgs/games/eduke32/default.nix +++ b/pkgs/games/eduke32/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, SDL, SDL_mixer, libvorbis, mesa, gtk, pkgconfig, nasm, libvpx, flac, makeDesktopItem}: stdenv.mkDerivation rec { - name = "eduke32-3542"; + name = "eduke32-20130303-3542"; src = fetchurl { url = http://dukeworld.duke4.net/eduke32/synthesis/20130303-3542/eduke32_src_20130303-3542.tar.bz2; From 4c952c64de901a9beb52dd09f3be09e596a05e85 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Sun, 14 Jul 2013 00:23:46 +0300 Subject: [PATCH 434/798] eggdrop: fix version to match tarball --- pkgs/tools/networking/eggdrop/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/eggdrop/default.nix b/pkgs/tools/networking/eggdrop/default.nix index 8649eda4bf7..13efc944bd0 100644 --- a/pkgs/tools/networking/eggdrop/default.nix +++ b/pkgs/tools/networking/eggdrop/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, tcl}: stdenv.mkDerivation { - name = "eggdrop-1.6.19"; + name = "eggdrop-1.6.19+ctcpfix"; src = fetchurl { url = ftp://ftp.eggheads.org/pub/eggdrop/GNU/1.6/eggdrop1.6.19+ctcpfix.tar.gz; From 0f99aace031aec27fbd874473bc1bbe6ad7571c4 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Sun, 14 Jul 2013 00:38:34 +0300 Subject: [PATCH 435/798] ssreflect: fix url --- pkgs/applications/science/logic/ssreflect/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/science/logic/ssreflect/default.nix b/pkgs/applications/science/logic/ssreflect/default.nix index 764954f54f8..ba831cc62f5 100644 --- a/pkgs/applications/science/logic/ssreflect/default.nix +++ b/pkgs/applications/science/logic/ssreflect/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { inherit name; src = fetchurl { - url = "${webpage}/${name}-coq8.4.tar.gz"; + url = "https://gforge.inria.fr/frs/download.php/31453/${name}-coq8.4.tar.gz"; sha256 = "1ysx29xw09i86lq0d92z9cnyx133jfgq4qddy3501000fn7xwi7h"; }; From d3f53cdde47ef962a4bf6f439d45234d25c6fa95 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Sun, 14 Jul 2013 00:48:06 +0300 Subject: [PATCH 436/798] alchemy: fix version to match tarball --- pkgs/applications/graphics/alchemy/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/alchemy/default.nix b/pkgs/applications/graphics/alchemy/default.nix index 2f31b568e34..6a212a7a931 100644 --- a/pkgs/applications/graphics/alchemy/default.nix +++ b/pkgs/applications/graphics/alchemy/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, jre}: stdenv.mkDerivation { - name = "alchemy-007-alpha"; + name = "alchemy-007"; enableParallelBuilding = true; src = fetchurl { From 075796e0531506fa106be1d2f47a9c866b70b99c Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Sun, 14 Jul 2013 01:11:27 +0300 Subject: [PATCH 437/798] aspell dictionaries: update where possible and try to make it easier to automatically parse versions --- .../libraries/aspell/dictionaries.nix | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/pkgs/development/libraries/aspell/dictionaries.nix b/pkgs/development/libraries/aspell/dictionaries.nix index c2aefd64c79..100960ef8e8 100644 --- a/pkgs/development/libraries/aspell/dictionaries.nix +++ b/pkgs/development/libraries/aspell/dictionaries.nix @@ -29,43 +29,43 @@ let in { de = buildDict { - shortName = "de-20030222_1"; + shortName = "de-20120607"; fullName = "German"; src = fetchurl { - url = mirror://gnu/aspell/dict/de/aspell6-de-20030222-1.tar.bz2; - sha256 = "01p92qj66cqb346gk7hjfynaap5sbcn85xz07kjfdq623ghr8v5s"; + url = https://www.j3e.de/ispell/igerman98/dict/igerman98-20120607.tar.bz2; + sha256 = "1m9jzxwrh0hwsrjs6l98v88miia45y643nbayzjjria2harq7yy5"; }; }; en = buildDict { - shortName = "en-6.0_0"; + shortName = "en-7.1-0"; fullName = "English"; src = fetchurl { - url = mirror://gnu/aspell/dict/en/aspell6-en-6.0-0.tar.bz2; - sha256 = "1628rrx1yq9jmnd86sr24vih101smb818vf10vx97f6j263niw14"; + url = mirror://gnu/aspell/dict/en/aspell6-en-7.1-0.tar.bz2; + sha256 = "02ldfiny4iakgfgy4sdrzjqdzi7l1rmb6y30lv31kfy5x31g77gz"; }; }; es = buildDict { - shortName = "es-0.50_2"; + shortName = "es-1.11-2"; fullName = "Spanish"; src = fetchurl { - url = mirror://gnu/aspell/dict/es/aspell-es-0.50-2.tar.bz2; - sha256 = "0i96xswcng35n5zhgpiswmi5sdpx63kl8bg7fl1zp5j1shr2l3jw"; + url = mirror://gnu/aspell/dict/es/aspell6-es-1.11-2.tar.bz2; + sha256 = "1k5g328ac1hdpp6fsg57d8md6i0aqcwlszp3gbmp5706wyhpydmd"; }; }; eo = buildDict { - shortName = "eo-0.50_2"; + shortName = "eo-2.1.20000225a-2"; fullName = "Esperanto"; src = fetchurl { - url = mirror://gnu/aspell/dict/eo/aspell-eo-0.50-2.tar.bz2; - sha256 = "19vhdm599ng98nq8jxspgvanv5hwryp0qri1vx6zsjl0jx1acqbc"; + url = mirror://gnu/aspell/dict/eo/aspell6-eo-2.1.20000225a-2.tar.bz2; + sha256 = "09vf0mbiicbmyb4bwb7v7lgpabnylg0wy7m3hlhl5rjdda6x3lj1"; }; }; fr = buildDict { - shortName = "fr-0.50_3"; + shortName = "fr-0.50-3"; fullName = "French"; src = fetchurl { url = mirror://gnu/aspell/dict/fr/aspell-fr-0.50-3.tar.bz2; @@ -74,16 +74,16 @@ in { }; it = buildDict { - shortName = "it-0.53_0"; + shortName = "it-2.2_20050523-0"; fullName = "Italian"; src = fetchurl { - url = mirror://gnu/aspell/dict/it/aspell-it-0.53-0.tar.bz2; - sha256 = "0vzs2mk0h2znx0jjs5lqiwdrc4nf6v3f8xbrsni8pfnxhh5ik1rv"; + url = mirror://gnu/aspell/dict/it/aspell6-it-2.2_20050523-0.tar.bz2; + sha256 = "1gdf7bc1a0kmxsmphdqq8pl01h667mjsj6hihy6kqy14k5qdq69v"; }; }; la = buildDict { - shortName = "la-20020503_0"; + shortName = "la-20020503-0"; fullName = "Latin"; src = fetchurl { url = mirror://gnu/aspell/dict/la/aspell6-la-20020503-0.tar.bz2; @@ -92,7 +92,7 @@ in { }; nl = buildDict { - shortName = "nl-0.50_2"; + shortName = "nl-0.50-2"; fullName = "Dutch"; src = fetchurl { url = mirror://gnu/aspell/dict/nl/aspell-nl-0.50-2.tar.bz2; @@ -105,7 +105,7 @@ in { }; pl = buildDict { - shortName = "pl-6.0_20061121_0"; + shortName = "pl-6.0_20061121-0"; fullName = "Polish"; src = fetchurl { url = mirror://gnu/aspell/dict/pl/aspell6-pl-6.0_20061121-0.tar.bz2; @@ -114,7 +114,7 @@ in { }; ru = buildDict { - shortName = "ru-0.99f7_1"; + shortName = "ru-0.99f7-1"; fullName = "Russian"; src = fetchurl { url = mirror://gnu/aspell/dict/ru/aspell6-ru-0.99f7-1.tar.bz2; From 22e62bc467042fb56a9bfb0c9d4409665ba72d59 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Sun, 14 Jul 2013 01:29:50 +0300 Subject: [PATCH 438/798] seg3d: fix version to match tarball --- pkgs/applications/graphics/seg3d/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/seg3d/default.nix b/pkgs/applications/graphics/seg3d/default.nix index 7cca0c8f8ab..23a2d23b1ae 100644 --- a/pkgs/applications/graphics/seg3d/default.nix +++ b/pkgs/applications/graphics/seg3d/default.nix @@ -4,7 +4,7 @@ libuuid }: assert (stdenv ? glibc); stdenv.mkDerivation { - name = "seg3d-1.12"; + name = "seg3d-1.12_20090930"; src = fetchurl { url = http://www.sci.utah.edu/releases/seg3d_v1.12/Seg3D_1.12_20090930_source.tgz; sha256 = "1wr6rc6v5qjjkmws8yrc03z35h3iydxk1z28p06v1wdnca0y71z8"; From bb48cab77745a1337540961dabd7cbf41bfe50ca Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Sun, 14 Jul 2013 02:08:03 +0300 Subject: [PATCH 439/798] Fix licenses. My fixes were more carefully checked against sources and home page license claims :) --- pkgs/development/libraries/audiofile/default.nix | 2 +- pkgs/development/libraries/pangomm/2.28.x.nix | 2 +- pkgs/development/libraries/xvidcore/default.nix | 2 +- pkgs/development/python-modules/python-sip/default.nix | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/audiofile/default.nix b/pkgs/development/libraries/audiofile/default.nix index 57ca21885dd..2f4de88c94c 100644 --- a/pkgs/development/libraries/audiofile/default.nix +++ b/pkgs/development/libraries/audiofile/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A library for reading and writing audio files in various formats"; homepage = http://www.68k.org/~michael/audiofile/; - license = licenses.lgpl21; + license = licenses.lgpl21Plus; maintainers = with maintainers; [ lovek323 shlevy ]; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/pangomm/2.28.x.nix b/pkgs/development/libraries/pangomm/2.28.x.nix index 411b969cb24..d03aa4311fe 100644 --- a/pkgs/development/libraries/pangomm/2.28.x.nix +++ b/pkgs/development/libraries/pangomm/2.28.x.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "C++ interface to the Pango text rendering library"; homepage = http://www.pango.org/; - license = licenses.lgpl2Plus; + license = with licenses; [ lgpl2 lgpl21 ]; maintainers = with maintainers; [ lovek323 raskin ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/xvidcore/default.nix b/pkgs/development/libraries/xvidcore/default.nix index b4d44be1738..fd5efdcc3d1 100644 --- a/pkgs/development/libraries/xvidcore/default.nix +++ b/pkgs/development/libraries/xvidcore/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "MPEG-4 video codec for PC"; homepage = http://www.xvid.org/; - license = licenses.gpl2Plus; + license = licenses.gpl2; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.all; }; diff --git a/pkgs/development/python-modules/python-sip/default.nix b/pkgs/development/python-modules/python-sip/default.nix index 076cba1fad2..6d79cf53a6b 100644 --- a/pkgs/development/python-modules/python-sip/default.nix +++ b/pkgs/development/python-modules/python-sip/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Creates C++ bindings for Python modules"; - license = licenses.gpl3Plus; + license = licenses.gpl2Plus; maintainers = with maintainers; [ lovek323 sander urkud ]; platforms = platforms.all; }; From aa85b804595660a541e727632f0cdc86b0779fe6 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Sun, 14 Jul 2013 02:35:26 +0300 Subject: [PATCH 440/798] Change package urls to use mirror://sourceforge --- pkgs/applications/editors/emacs-modes/bbdb/default.nix | 1 + pkgs/os-specific/linux/lxc/default.nix | 2 +- pkgs/tools/networking/aria/default.nix | 2 +- pkgs/tools/security/bmrsa/11.nix | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/bbdb/default.nix b/pkgs/applications/editors/emacs-modes/bbdb/default.nix index ec7a3e8e600..da92c38d078 100644 --- a/pkgs/applications/editors/emacs-modes/bbdb/default.nix +++ b/pkgs/applications/editors/emacs-modes/bbdb/default.nix @@ -4,6 +4,7 @@ stdenv.mkDerivation { name = "bbdb-2.35"; src = fetchurl { + # not using mirror:// because it produces a different file url = http://bbdb.sourceforge.net/bbdb-2.35.tar.gz; sha256 = "3fb1316e2ed74d47ca61187fada550e58797467bd9e8ad67343ed16da769f916"; }; diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix index c2a9deaa11f..c1dec8b926a 100644 --- a/pkgs/os-specific/linux/lxc/default.nix +++ b/pkgs/os-specific/linux/lxc/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "lxc-0.9.0"; src = fetchurl { - url = "http://lxc.sf.net/download/lxc/${name}.tar.gz"; + url = "mirror://sourceforge/lxc/${name}.tar.gz"; sha256 = "0821clxymkgp71n720xj5ngs22s2v8jks68f5j4vypycwvm6f5qy"; }; diff --git a/pkgs/tools/networking/aria/default.nix b/pkgs/tools/networking/aria/default.nix index 120e32ab29c..4f58463ecf9 100644 --- a/pkgs/tools/networking/aria/default.nix +++ b/pkgs/tools/networking/aria/default.nix @@ -4,7 +4,7 @@ let version="0.14.0"; in rec { src = /* Here a fetchurl expression goes */ fetchurl { - url = "http://downloads.sourceforge.net/aria2/aria2c-${version}.tar.bz2"; + url = "mirror://sourceforge/aria2/aria2c-${version}.tar.bz2"; sha256 = "0d6vpy7f4228byahsg4dlhalfkbscx941klhdlxd0y5c3mxxwkfr"; }; diff --git a/pkgs/tools/security/bmrsa/11.nix b/pkgs/tools/security/bmrsa/11.nix index 3200d27c004..5d6eaf55173 100644 --- a/pkgs/tools/security/bmrsa/11.nix +++ b/pkgs/tools/security/bmrsa/11.nix @@ -11,7 +11,7 @@ let in rec { src = fetchurl { - url = "http://prdownloads.sourceforge.net/sourceforge/bmrsa/bmrsa${version}.zip"; + url = "mirror://sourceforge/bmrsa/bmrsa${version}.zip"; sha256 = "0ksd9xkvm9lkvj4yl5sl0zmydp1wn3xhc55b28gj70gi4k75kcl4"; }; From 5ae43d2494ad18f06278f79c49cd3c5f25524aaa Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Sun, 14 Jul 2013 02:48:32 +0300 Subject: [PATCH 441/798] Change more packages from direct downloads to mirror://sourceforge --- pkgs/applications/audio/csound/default.nix | 2 +- pkgs/applications/editors/bvi/default.nix | 2 +- .../networking/instant-messengers/carrier/2.5.0.nix | 2 +- pkgs/applications/science/geometry/drgeo/default.nix | 2 +- pkgs/development/libraries/ctl/default.nix | 2 +- pkgs/tools/graphics/dmtx/default.nix | 2 +- pkgs/tools/security/clamav/default.nix | 2 +- pkgs/tools/text/cheetah-template/2.0.1.nix | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/audio/csound/default.nix b/pkgs/applications/audio/csound/default.nix index 5e3d056f498..34e98ae620d 100644 --- a/pkgs/applications/audio/csound/default.nix +++ b/pkgs/applications/audio/csound/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; src = fetchurl { - url = http://netcologne.dl.sourceforge.net/project/csound/csound5/csound5.18/Csound5.18.02.tar.gz; + url = mirror://sourceforge/csound/Csound5.18.02.tar.gz; sha256 = "4c461cf3bf60b83671224949dd33805379b7121bf2c0ad6af5e191e7f6f8adc8"; }; diff --git a/pkgs/applications/editors/bvi/default.nix b/pkgs/applications/editors/bvi/default.nix index 4dfe3a204d3..84b810bf460 100644 --- a/pkgs/applications/editors/bvi/default.nix +++ b/pkgs/applications/editors/bvi/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "bvi-1.3.2"; src = fetchurl { - url = http://prdownloads.sourceforge.net/bvi/bvi-1.3.2.src.tar.gz; + url = mirror://sourceforge/bvi/bvi-1.3.2.src.tar.gz; sha256 = "110wxqnyianqamxq4y53drqqxb9vp4k2fcvic45qggvlqkqhlfgz"; }; diff --git a/pkgs/applications/networking/instant-messengers/carrier/2.5.0.nix b/pkgs/applications/networking/instant-messengers/carrier/2.5.0.nix index 8bb28f7ce00..9cf2558ef32 100644 --- a/pkgs/applications/networking/instant-messengers/carrier/2.5.0.nix +++ b/pkgs/applications/networking/instant-messengers/carrier/2.5.0.nix @@ -9,7 +9,7 @@ let in rec { src = fetchurl { - url = http://downloads.sourceforge.net/funpidgin/carrier-2.5.0.tar.bz2; + url = mirror://sourceforge/funpidgin/carrier-2.5.0.tar.bz2; sha256 = "0m80s7hnvz5vc2dy3xiy1zfb6incmb7p28zahzxdif2vz44riz28"; }; diff --git a/pkgs/applications/science/geometry/drgeo/default.nix b/pkgs/applications/science/geometry/drgeo/default.nix index 2b10ec238c9..c18a6ed7426 100644 --- a/pkgs/applications/science/geometry/drgeo/default.nix +++ b/pkgs/applications/science/geometry/drgeo/default.nix @@ -2,7 +2,7 @@ args : with args; let version = lib.attrByPath ["version"] "1.1.0" args; in rec { src = fetchurl { - url = http://downloads.sourceforge.net/ofset/drgeo-1.1.0.tar.gz; + url = mirror://sourceforge/ofset/drgeo-1.1.0.tar.gz; sha256 = "05i2czgzhpzi80xxghinvkyqx4ym0gm9f38fz53idjhigiivp4wc"; }; diff --git a/pkgs/development/libraries/ctl/default.nix b/pkgs/development/libraries/ctl/default.nix index 950fe1baf08..a802f571674 100644 --- a/pkgs/development/libraries/ctl/default.nix +++ b/pkgs/development/libraries/ctl/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "ctl-1.4.1"; src = fetchurl { - url = http://surfnet.dl.sourceforge.net/sourceforge/ampasctl/ctl-1.4.1.tar.gz; + url = mirror://sourceforge/ampasctl/ctl-1.4.1.tar.gz; sha256 = "16lzgbpxdyhykdwndj1i9vx3h4bfkxqqcrvasvgg70gb5raxj0mj"; }; diff --git a/pkgs/tools/graphics/dmtx/default.nix b/pkgs/tools/graphics/dmtx/default.nix index ae3a227a4fe..29c6b5ebf79 100644 --- a/pkgs/tools/graphics/dmtx/default.nix +++ b/pkgs/tools/graphics/dmtx/default.nix @@ -12,7 +12,7 @@ let in rec { src = fetchurl { - url = "http://prdownloads.sourceforge.net/libdmtx/libdmtx-${version}.tar.bz2"; + url = "mirror://sourceforge/libdmtx/libdmtx-${version}.tar.bz2"; sha256 = "0iin2j3ad7ldj32dwc04g28k54iv3lrc5121rgyphm7l9hvigbvk"; }; diff --git a/pkgs/tools/security/clamav/default.nix b/pkgs/tools/security/clamav/default.nix index bccf0cc77c5..cb32085a8cf 100644 --- a/pkgs/tools/security/clamav/default.nix +++ b/pkgs/tools/security/clamav/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { version = "0.97.5"; src = fetchurl { - url = "http://tenet.dl.sourceforge.net/project/clamav/clamav/${version}/clamav-${version}.tar.gz"; + url = "mirror://sourceforge/clamav/clamav-${version}.tar.gz"; sha256 = "039wm64wl2sx7k019g5ll5dkdlsq64fnd0ng0s00pjn8bqd5wv6v"; }; diff --git a/pkgs/tools/text/cheetah-template/2.0.1.nix b/pkgs/tools/text/cheetah-template/2.0.1.nix index c20f5db9798..0bfa72ca00d 100644 --- a/pkgs/tools/text/cheetah-template/2.0.1.nix +++ b/pkgs/tools/text/cheetah-template/2.0.1.nix @@ -1,7 +1,7 @@ args : with args; rec { src = fetchurl { - url = http://downloads.sourceforge.net/cheetahtemplate/Cheetah-2.0.1.tar.gz; + url = mirror://sourceforge/cheetahtemplate/Cheetah-2.0.1.tar.gz; sha256 = "134k4s5f116k23vb7wf9bynlx3gf0wwl7y0zp9ciz0q66nh1idkh"; }; From d0b4c8bfaa97c299acf9dfa2dfe710ecf00d8eb9 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Sun, 14 Jul 2013 03:09:34 +0300 Subject: [PATCH 442/798] gktspell: version bump to 2.0.16 because the old one has disappeared --- pkgs/applications/graphics/gimp/plugins/default.nix | 2 +- pkgs/applications/misc/gmrun/default.nix | 4 ++-- pkgs/applications/science/misc/golly/src-for-default.nix | 2 +- pkgs/development/compilers/fpc/default.nix | 2 +- pkgs/development/libraries/faac/default.nix | 2 +- pkgs/development/libraries/gtkspell/default.nix | 6 +++--- pkgs/games/extremetuxracer/default.nix | 2 +- pkgs/os-specific/linux/e1000e/default.nix | 2 +- pkgs/os-specific/linux/frandom/default.nix | 2 +- pkgs/tools/filesystems/extundelete/default.nix | 2 +- 10 files changed, 13 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index 962cb387c73..bdb4fa631f0 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -148,7 +148,7 @@ rec { name = "gmic-1.3.2.0"; buildInputs = [ imagemagick pkgconfig gimp pkgs.fftwSinglePrec ] ++ gimp.nativeBuildInputs; src = fetchurl { - url = http://dfn.dl.sourceforge.net/sourceforge/gmic/gmic_1.3.2.0.tar.gz; + url = mirror://sourceforge/gmic/gmic_1.3.2.0.tar.gz; sha256 = "0mxq664vzzc2l6k6sqm9syp34mihhi262i6fixk1g12lmc28797h"; }; preConfigure = '' diff --git a/pkgs/applications/misc/gmrun/default.nix b/pkgs/applications/misc/gmrun/default.nix index 930df87214a..0b19eef3c8c 100644 --- a/pkgs/applications/misc/gmrun/default.nix +++ b/pkgs/applications/misc/gmrun/default.nix @@ -8,8 +8,8 @@ stdenv.mkDerivation rec { name = "gmrun-${version}"; src = fetchurl { - url = "http://downloads.sourceforge.net/project/gmrun/gmrun/${version}/${name}.tar.gz"; - md5 = "6cef37a968006d9496fc56a7099c603c"; + url = "mirror://sourceforge/gmrun/${name}.tar.gz"; + sha256 = "180z6hbax1qypy5cyy2z6nn7fzxla4ib47ck8mqwr714ag77na8p"; }; buildInputs = [ glib gtk2 pkgconfig popt ]; diff --git a/pkgs/applications/science/misc/golly/src-for-default.nix b/pkgs/applications/science/misc/golly/src-for-default.nix index 23742ac9040..331c63aa180 100644 --- a/pkgs/applications/science/misc/golly/src-for-default.nix +++ b/pkgs/applications/science/misc/golly/src-for-default.nix @@ -2,7 +2,7 @@ rec { version="2.4"; name="golly-2.4-src"; hash="06vajm019q4q4wfy6pc1669fbjqdb4jaxcc419bk0vzky40anl9w"; - url="http://downloads.sourceforge.net/project/golly/golly/golly-2.4/golly-2.4-src.tar.gz"; + url="mirror://sourceforge/golly/golly-2.4-src.tar.gz"; advertisedUrl="http://downloads.sourceforge.net/project/golly/golly/golly-2.4/golly-2.4-src.tar.gz"; diff --git a/pkgs/development/compilers/fpc/default.nix b/pkgs/development/compilers/fpc/default.nix index e87dd88bf0d..6be976783bc 100644 --- a/pkgs/development/compilers/fpc/default.nix +++ b/pkgs/development/compilers/fpc/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { name = "fpc-${version}"; src = fetchurl { - url = "http://downloads.sourceforge.net/sourceforge/freepascal/Source/${version}/fpcbuild-${version}.tar.gz"; + url = "mirror://sourceforge/freepascal/fpcbuild-${version}.tar.gz"; sha256 = "1vxy2y8pm0ribhpdhqlwwz696ncnz4rk2dafbn1mjgipm97qb26p"; }; diff --git a/pkgs/development/libraries/faac/default.nix b/pkgs/development/libraries/faac/default.nix index 732b591353c..8e79afb5f9e 100644 --- a/pkgs/development/libraries/faac/default.nix +++ b/pkgs/development/libraries/faac/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "faac-1.28"; src = fetchurl { - url = "http://downloads.sourceforge.net/faac/${name}.tar.gz"; + url = "mirror://sourceforge/faac/${name}.tar.gz"; sha256 = "1pqr7nf6p2r283n0yby2czd3iy159gz8rfinkis7vcfgyjci2565"; }; diff --git a/pkgs/development/libraries/gtkspell/default.nix b/pkgs/development/libraries/gtkspell/default.nix index 46e1bba488a..017c5be403a 100644 --- a/pkgs/development/libraries/gtkspell/default.nix +++ b/pkgs/development/libraries/gtkspell/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, gtk, aspell, pkgconfig}: stdenv.mkDerivation { - name = "gtkspell-2.0.11"; + name = "gtkspell-2.0.16"; src = fetchurl { - url = http://gtkspell.sourceforge.net/download/gtkspell-2.0.11.tar.gz; - md5 = "494869f67146a12a3f17a958f51aeb05"; + url = mirror://sourceforge/gtkspell/gtkspell-2.0.16.tar.gz; + sha256 = "00hdv28bp72kg1mq2jdz1sdw2b8mb9iclsp7jdqwpck705bdriwg"; }; buildInputs = [aspell pkgconfig gtk]; diff --git a/pkgs/games/extremetuxracer/default.nix b/pkgs/games/extremetuxracer/default.nix index db24a6d1ebf..898334a1d4a 100644 --- a/pkgs/games/extremetuxracer/default.nix +++ b/pkgs/games/extremetuxracer/default.nix @@ -12,7 +12,7 @@ let in rec { src = fetchurl { - url = "http://downloads.sourceforge.net/extremetuxracer/extremetuxracer-${version}.tar.gz"; + url = "mirror://sourceforge/extremetuxracer/extremetuxracer-${version}.tar.gz"; sha256 = "04d99fsfna5mc9apjxsiyw0zgnswy33kwmm1s9d03ihw6rba2zxs"; }; diff --git a/pkgs/os-specific/linux/e1000e/default.nix b/pkgs/os-specific/linux/e1000e/default.nix index 8d1320afc68..e1abeea49b7 100644 --- a/pkgs/os-specific/linux/e1000e/default.nix +++ b/pkgs/os-specific/linux/e1000e/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "e1000e-1.5.1-${kernelDev.version}"; src = fetchurl { - url = "http://downloads.sourceforge.net/e1000/e1000e-1.5.1.tar.gz"; + url = "mirror://sourceforge/e1000/e1000e-1.5.1.tar.gz"; sha256 = "0nzjlarpqcpm5y112n3vzra4qv32hiygpfkk10y8g4nln4adhqsw"; }; diff --git a/pkgs/os-specific/linux/frandom/default.nix b/pkgs/os-specific/linux/frandom/default.nix index 10876e96fc8..a28ba527218 100644 --- a/pkgs/os-specific/linux/frandom/default.nix +++ b/pkgs/os-specific/linux/frandom/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { name = "${baseName}-${kernelDev.version}"; src = fetchurl { - url = "http://sourceforge.net/projects/frandom/files/${baseName}.tar.gz"; + url = "mirror://sourceforge/frandom/${baseName}.tar.gz"; sha256 = "15rgyk4hfawqg7z1spk2xlk1nn6rcdls8gdhc70f91shrc9pvlls"; }; diff --git a/pkgs/tools/filesystems/extundelete/default.nix b/pkgs/tools/filesystems/extundelete/default.nix index 16ad17aa243..3d8fa0827ca 100644 --- a/pkgs/tools/filesystems/extundelete/default.nix +++ b/pkgs/tools/filesystems/extundelete/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "extundelete-${version}"; src = fetchurl { - url = "http://downloads.sourceforge.net/project/extundelete/extundelete/0.2.4/extundelete-0.2.4.tar.bz2"; + url = "mirror://sourceforge/extundelete/extundelete-0.2.4.tar.bz2"; sha256 = "1x0r7ylxlp9lbj3d7sqf6j2a222dwy2nfpff05jd6mkh4ihxvyd1"; }; From cea107c07fce8d577c05f177df83c6883cbec75f Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Sun, 14 Jul 2013 03:31:12 +0300 Subject: [PATCH 443/798] More mirror:// URL fixes --- pkgs/applications/video/kino/default.nix | 2 +- pkgs/data/fonts/junicode/default.nix | 2 +- pkgs/development/libraries/libvncserver/default.nix | 2 +- pkgs/os-specific/linux/ndiswrapper/default.nix | 2 +- pkgs/tools/filesystems/jfsrec/default.nix | 2 +- pkgs/tools/misc/mdbtools/default.nix | 2 +- pkgs/tools/networking/iperf/default.nix | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/video/kino/default.nix b/pkgs/applications/video/kino/default.nix index 696c1e4738c..30e0bdfb197 100644 --- a/pkgs/applications/video/kino/default.nix +++ b/pkgs/applications/video/kino/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation { name = "kino-1.3.4"; src = fetchurl { - url = http://downloads.sourceforge.net/kino/kino-1.3.4.tar.gz; + url = mirror://sourceforge/kino/kino-1.3.4.tar.gz; sha256 = "020s05k0ma83rq2kfs8x474pqicaqp9spar81qc816ddfrnh8k8i"; }; diff --git a/pkgs/data/fonts/junicode/default.nix b/pkgs/data/fonts/junicode/default.nix index 1690f82aa37..ea579a589c4 100644 --- a/pkgs/data/fonts/junicode/default.nix +++ b/pkgs/data/fonts/junicode/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "junicode-0.6.15"; src = fetchurl { - url = http://prdownloads.sourceforge.net/junicode/junicode-0.6.15.zip; + url = mirror://sourceforge/junicode/junicode-0.6.15.zip; sha256 = "0p16r5s6qwyz0hayb6k61s5r2sfachlx7r6gpqqx5myx6ipbfdns"; }; diff --git a/pkgs/development/libraries/libvncserver/default.nix b/pkgs/development/libraries/libvncserver/default.nix index 65a8880fc9d..7856183e5e9 100644 --- a/pkgs/development/libraries/libvncserver/default.nix +++ b/pkgs/development/libraries/libvncserver/default.nix @@ -12,7 +12,7 @@ let in rec { src = fetchurl { - url = "http://downloads.sourceforge.net/libvncserver/LibVNCServer-${version}.tar.gz"; + url = "mirror://sourceforge/libvncserver/LibVNCServer-${version}.tar.gz"; sha256 = "1y83z31wbjivbxs60kj8a8mmjmdkgxlvr2x15yz95yy24lshs1ng"; }; diff --git a/pkgs/os-specific/linux/ndiswrapper/default.nix b/pkgs/os-specific/linux/ndiswrapper/default.nix index 109faac97c5..e2db1a4106b 100644 --- a/pkgs/os-specific/linux/ndiswrapper/default.nix +++ b/pkgs/os-specific/linux/ndiswrapper/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { # should we use unstable? src = fetchurl { - url = http://downloads.sourceforge.net/ndiswrapper/ndiswrapper-1.56.tar.gz; + url = mirror://sourceforge/ndiswrapper/ndiswrapper-1.56.tar.gz; sha256 = "10yqg1a08v6z1qm1qr1v4rbhl35c90gzrazapr09vp372hky8f57"; }; diff --git a/pkgs/tools/filesystems/jfsrec/default.nix b/pkgs/tools/filesystems/jfsrec/default.nix index 91060795e7c..fb5b72d714a 100644 --- a/pkgs/tools/filesystems/jfsrec/default.nix +++ b/pkgs/tools/filesystems/jfsrec/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "jfsrec-pre-svn-7"; src = fetchurl { - url = http://downloads.sourceforge.net/jfsrec/jfsrec-svn-7.tar.gz; + url = mirror://sourceforge/jfsrec/jfsrec-svn-7.tar.gz; sha256 = "163z6ljr05vw2k5mj4fim2nlg4khjyibrii95370pvn474mg28vg"; }; diff --git a/pkgs/tools/misc/mdbtools/default.nix b/pkgs/tools/misc/mdbtools/default.nix index 9b1968c6fd1..ee9dc4f28b6 100644 --- a/pkgs/tools/misc/mdbtools/default.nix +++ b/pkgs/tools/misc/mdbtools/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "mdbtools-0.6pre1"; src = fetchurl { - url = http://prdownloads.sourceforge.net/mdbtools/mdbtools-0.6pre1.tar.gz; + url = mirror://sourceforge/mdbtools/mdbtools-0.6pre1.tar.gz; sha256 = "1lz33lmqifjszad7rl1r7rpxbziprrm5rkb27wmswyl5v98dqsbi"; }; diff --git a/pkgs/tools/networking/iperf/default.nix b/pkgs/tools/networking/iperf/default.nix index 1cb984e3d1c..66f600f7678 100644 --- a/pkgs/tools/networking/iperf/default.nix +++ b/pkgs/tools/networking/iperf/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "iperf-2.0.4"; src = fetchurl { - url = http://garr.dl.sourceforge.net/sourceforge/iperf/iperf-2.0.4.tar.gz; + url = mirror://sourceforge/iperf/iperf-2.0.4.tar.gz; sha256 = "0i3r75prbyxs56rngjbrag8rg480ki3daaa924krrafng30z2liv"; }; From b084b29d268d534464862860f81426274581c2e6 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Sun, 14 Jul 2013 04:17:07 +0300 Subject: [PATCH 444/798] Even more mirror:// fixes --- pkgs/applications/audio/snd/default.nix | 2 +- pkgs/applications/editors/emacs-modes/php/default.nix | 2 +- .../emacs-modes/session-management-for-emacs/default.nix | 3 +-- pkgs/applications/graphics/gimp/plugins/default.nix | 2 +- pkgs/applications/misc/rxvt/default.nix | 2 +- .../pidgin-plugins/pidgin-latex/pidgin-latex-sf.nix | 2 +- pkgs/data/fonts/wqy-zenhei/default.nix | 2 +- pkgs/development/compilers/yap/default.nix | 2 +- pkgs/development/libraries/ode/default.nix | 2 +- pkgs/development/libraries/openexr_ctl/default.nix | 2 +- pkgs/development/python-modules/irclib/default.nix | 2 +- pkgs/development/python-modules/xmpppy/default.nix | 2 +- pkgs/development/tools/misc/openocd/default.nix | 2 +- pkgs/os-specific/linux/firmware/zd1211/default.nix | 2 +- pkgs/os-specific/linux/statifier/default.nix | 2 +- pkgs/servers/rpcbind/default.nix | 2 +- pkgs/servers/sabnzbd/default.nix | 2 +- pkgs/servers/xmpp/pyIRCt/default.nix | 2 +- pkgs/tools/admin/webdruid/src-for-default.nix | 2 +- pkgs/tools/backup/partimage/default.nix | 2 +- pkgs/tools/compression/upx/default.nix | 2 +- pkgs/tools/graphics/pstoedit/default.nix | 2 +- pkgs/tools/misc/ttf2pt1/default.nix | 2 +- pkgs/tools/networking/philter/default.nix | 2 +- pkgs/tools/security/pwgen/default.nix | 2 +- pkgs/tools/system/thinkfan/default.nix | 2 +- pkgs/top-level/python-packages.nix | 6 +++--- 27 files changed, 29 insertions(+), 30 deletions(-) diff --git a/pkgs/applications/audio/snd/default.nix b/pkgs/applications/audio/snd/default.nix index c295767687f..fe32aca029b 100644 --- a/pkgs/applications/audio/snd/default.nix +++ b/pkgs/applications/audio/snd/default.nix @@ -27,7 +27,7 @@ let in rec { src = fetchurl { - url = "http://downloads.sourceforge.net/snd/snd-${version}.tar.gz"; + url = "mirror://sourceforge/snd/snd-${version}.tar.gz"; sha256 = "0zqgfnkvkqxby1k74mwba1r4pb520glcsz5jjmpzm9m41nqnghmm"; }; diff --git a/pkgs/applications/editors/emacs-modes/php/default.nix b/pkgs/applications/editors/emacs-modes/php/default.nix index ec160dccd9f..2b3cf7b2971 100644 --- a/pkgs/applications/editors/emacs-modes/php/default.nix +++ b/pkgs/applications/editors/emacs-modes/php/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "php-mode-1.5.0"; src = fetchurl { - url = "http://downloads.sourceforge.net/php-mode/${name}.tar.gz"; + url = "mirror://sourceforge/php-mode/${name}.tar.gz"; sha256 = "1bffgg4rpiggxqc1hvjcby24sfyzj5728zg7r6f4v6a126a7kcfq"; }; diff --git a/pkgs/applications/editors/emacs-modes/session-management-for-emacs/default.nix b/pkgs/applications/editors/emacs-modes/session-management-for-emacs/default.nix index 185bc20021e..0d2fcf09786 100644 --- a/pkgs/applications/editors/emacs-modes/session-management-for-emacs/default.nix +++ b/pkgs/applications/editors/emacs-modes/session-management-for-emacs/default.nix @@ -4,8 +4,7 @@ stdenv.mkDerivation rec { name = "session-management-for-emacs-2.2a"; src = fetchurl { - url = "http://downloads.sourceforge.net/project/emacs-session/session/2.2a/session-2.2a.tar.gz"; -# url = "mirror://sourceforge.net/sourceforge/emacs-session/session-2.2a.tar.gz"; + url = "mirror://sourceforge/emacs-session/session-2.2a.tar.gz"; sha256 = "37dfba7420b5164eab90dafa9e8bf9a2c8f76505fe2fefa14a64e81fa76d0144"; }; diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index bdb4fa631f0..d314d93ea4c 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -107,7 +107,7 @@ rec { name = "texturize-2.1"; buildInputs = [ gimp ] ++ gimp.nativeBuildInputs; src = fetchurl { - url = http://prdownloads.sourceforge.net/gimp-texturize/texturize-2.1_src.tgz; + url = mirror://sourceforge/gimp-texturize/texturize-2.1_src.tgz; sha256 = "0cdjq25g3yfxx6bzx6nid21kq659s1vl9id4wxyjs2dhcv229cg3"; }; installPhase = "installPlugins src/texturize"; diff --git a/pkgs/applications/misc/rxvt/default.nix b/pkgs/applications/misc/rxvt/default.nix index 13597f3ee9b..c3b5fc861a8 100644 --- a/pkgs/applications/misc/rxvt/default.nix +++ b/pkgs/applications/misc/rxvt/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "rxvt-2.6.4"; src = fetchurl { - url = http://downloads.sourceforge.net/rxvt/rxvt-2.6.4.tar.gz; + url = mirror://sourceforge/rxvt/rxvt-2.6.4.tar.gz; sha256 = "0hi29whjv8v11nkjbq1i6ms411v6csykghmlpkmayfjn9nxr02xg"; }; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/pidgin-latex-sf.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/pidgin-latex-sf.nix index 868b5dbb342..7f7d5abccfd 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/pidgin-latex-sf.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/pidgin-latex-sf.nix @@ -1,7 +1,7 @@ args : with args; rec { src = fetchurl { - url = http://mesh.dl.sourceforge.net/sourceforge/pidgin-latex/pidgin-latex-1.2.1.tar.bz2; + url = mirror://sourceforge/pidgin-latex/pidgin-latex-1.2.1.tar.bz2; sha256 = "19h76fwsx5y30l5wda2930k10r385aipngfljz5bdi7b9y52lii7"; }; diff --git a/pkgs/data/fonts/wqy-zenhei/default.nix b/pkgs/data/fonts/wqy-zenhei/default.nix index 698ecc53046..960c74f6841 100644 --- a/pkgs/data/fonts/wqy-zenhei/default.nix +++ b/pkgs/data/fonts/wqy-zenhei/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "wqy-zenhei-0.4.23-1"; src = fetchurl { - url = http://prdownloads.sourceforge.net/wqy/wqy-zenhei-0.4.23-1.tar.gz; + url = mirror://sourceforge/wqy/wqy-zenhei-0.4.23-1.tar.gz; sha256 = "138nn81ai240av0xvcq4ab3rl73n0qlj3gwr3a36i63ry8vdj5qm"; }; diff --git a/pkgs/development/compilers/yap/default.nix b/pkgs/development/compilers/yap/default.nix index 753c0f8ee77..f9a48468df3 100644 --- a/pkgs/development/compilers/yap/default.nix +++ b/pkgs/development/compilers/yap/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "yap-5.1.1"; src = fetchurl { - url = "http://downloads.sourceforge.net/yap/Yap-5.1.1.tar.gz"; + url = "mirror://sourceforge/yap/Yap-5.1.1.tar.gz"; sha256 = "0bajxmlla9gay4m4l7y7x6qldxzi0jcq2ykgpjk9liky7g5kbnya"; }; diff --git a/pkgs/development/libraries/ode/default.nix b/pkgs/development/libraries/ode/default.nix index 31b2aa7dad9..e7368e4f60b 100644 --- a/pkgs/development/libraries/ode/default.nix +++ b/pkgs/development/libraries/ode/default.nix @@ -10,7 +10,7 @@ let in rec { src = fetchurl { - url = "http://downloads.sourceforge.net/opende/ode-${version}.tar.bz2"; + url = "mirror://sourceforge/opende/ode-${version}.tar.bz2"; sha256 = "1883gbsnn7zldrpwfdh6kwj20g627n5bspz3yb2z6lrxdal88y47"; }; diff --git a/pkgs/development/libraries/openexr_ctl/default.nix b/pkgs/development/libraries/openexr_ctl/default.nix index 1b15fdb6c9e..cd26aae660c 100644 --- a/pkgs/development/libraries/openexr_ctl/default.nix +++ b/pkgs/development/libraries/openexr_ctl/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "openexr_ctl-1.0.1"; src = fetchurl { - url = http://kent.dl.sourceforge.net/sourceforge/ampasctl/openexr_ctl-1.0.1.tar.gz; + url = mirror://sourceforge/ampasctl/openexr_ctl-1.0.1.tar.gz; sha256 = "1jg9smpaplal8l14djp184wzk11nwd3dvm4lhkp69kjgw8jdd21d"; }; diff --git a/pkgs/development/python-modules/irclib/default.nix b/pkgs/development/python-modules/irclib/default.nix index c840e0a1003..3e0eda34b17 100644 --- a/pkgs/development/python-modules/irclib/default.nix +++ b/pkgs/development/python-modules/irclib/default.nix @@ -9,7 +9,7 @@ let in rec { src = fetchurl { - url = "http://prdownloads.sourceforge.net/sourceforge/python-irclib/python-irclib-${version}.tar.gz"; + url = "mirror://sourceforge/python-irclib/python-irclib-${version}.tar.gz"; sha256 = "1x5456y4rbxmnw4yblhb4as5791glcw394bm36px3x6l05j3mvl1"; }; patches = [(fetchurl { diff --git a/pkgs/development/python-modules/xmpppy/default.nix b/pkgs/development/python-modules/xmpppy/default.nix index df5d37853f7..57b35ad91ed 100644 --- a/pkgs/development/python-modules/xmpppy/default.nix +++ b/pkgs/development/python-modules/xmpppy/default.nix @@ -9,7 +9,7 @@ let in rec { src = fetchurl { - url = "http://prdownloads.sourceforge.net/sourceforge/xmpppy/xmpppy-${version}.tar.gz"; + url = "mirror://sourceforge/xmpppy/xmpppy-${version}.tar.gz"; sha256 = "16hbh8kwc5n4qw2rz1mrs8q17rh1zq9cdl05b1nc404n7idh56si"; }; diff --git a/pkgs/development/tools/misc/openocd/default.nix b/pkgs/development/tools/misc/openocd/default.nix index c87bd9d5535..e0da284887c 100644 --- a/pkgs/development/tools/misc/openocd/default.nix +++ b/pkgs/development/tools/misc/openocd/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.7.0"; src = fetchurl { - url = "http://downloads.sourceforge.net/project/openocd/openocd/${version}/openocd-${version}.tar.bz2"; + url = "mirror://sourceforge/openocd/openocd-${version}.tar.bz2"; sha256 = "0qwfyd821sy5p0agz0ybgn5nd7vplipw4mhm485ldj1hcmw7n8sj"; }; diff --git a/pkgs/os-specific/linux/firmware/zd1211/default.nix b/pkgs/os-specific/linux/firmware/zd1211/default.nix index a717bd9e117..cb4466dc20f 100644 --- a/pkgs/os-specific/linux/firmware/zd1211/default.nix +++ b/pkgs/os-specific/linux/firmware/zd1211/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { - url = "http://surfnet.dl.sourceforge.net/sourceforge/zd1211/${name}.tar.bz2"; + url = "mirror://sourceforge/zd1211/${name}.tar.bz2"; sha256 = "866308f6f59f7075f075d4959dff2ede47735c751251fecd1496df1ba4d338e1"; }; diff --git a/pkgs/os-specific/linux/statifier/default.nix b/pkgs/os-specific/linux/statifier/default.nix index 4e28dce1670..b4e37a36ff5 100644 --- a/pkgs/os-specific/linux/statifier/default.nix +++ b/pkgs/os-specific/linux/statifier/default.nix @@ -9,7 +9,7 @@ let in rec { src = fetchurl { - url = "http://sourceforge.net/projects/statifier/files/statifier/statifier-${version}.tar.gz"; + url = "mirror://sourceforge/statifier/statifier-${version}.tar.gz"; sha256 = "0lhdbp7hc15nn6r31yxx7i993a5k8926n5r6j2gi2vvkmf1hciqf"; }; diff --git a/pkgs/servers/rpcbind/default.nix b/pkgs/servers/rpcbind/default.nix index 33965299a9b..8d8a677647c 100644 --- a/pkgs/servers/rpcbind/default.nix +++ b/pkgs/servers/rpcbind/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "rpcbind-0.2.0"; src = fetchurl { - url = "http://freefr.dl.sourceforge.net/project/rpcbind/rpcbind/0.2.0/rpcbind-0.2.0.tar.bz2"; + url = "mirror://sourceforge/rpcbind/rpcbind-0.2.0.tar.bz2"; sha256 = "c92f263e0353887f16379d7708ef1fb4c7eedcf20448bc1e4838f59497a00de3"; }; diff --git a/pkgs/servers/sabnzbd/default.nix b/pkgs/servers/sabnzbd/default.nix index 50e07f27329..599f6ee31f3 100644 --- a/pkgs/servers/sabnzbd/default.nix +++ b/pkgs/servers/sabnzbd/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "sabnzbd-0.4.12"; src = fetchurl { - url = http://mesh.dl.sourceforge.net/project/sabnzbdplus/sabnzbdplus/sabnzbd-0.4.12/SABnzbd-0.4.12-src.tar.gz; + url = mirro://sourceforge/sabnzbdplus/SABnzbd-0.4.12-src.tar.gz; sha256 = "35ce4172688925ef608fba433ff676357dab7d2abdc1cf83112a1c99682fdd32"; }; diff --git a/pkgs/servers/xmpp/pyIRCt/default.nix b/pkgs/servers/xmpp/pyIRCt/default.nix index 27982601f73..422ddd8c73d 100644 --- a/pkgs/servers/xmpp/pyIRCt/default.nix +++ b/pkgs/servers/xmpp/pyIRCt/default.nix @@ -9,7 +9,7 @@ let in rec { src = fetchurl { - url = "http://prdownloads.sourceforge.net/sourceforge/xmpppy/irc-transport-${version}.tar.gz"; + url = "mirror://sourceforge/xmpppy/irc-transport-${version}.tar.gz"; sha256 = "0gbc0dvj1p3088b6x315yjrlwnc5vvzp0var36wlf9z60ghvk8yb"; }; diff --git a/pkgs/tools/admin/webdruid/src-for-default.nix b/pkgs/tools/admin/webdruid/src-for-default.nix index edc770a5fbb..73102be6afe 100644 --- a/pkgs/tools/admin/webdruid/src-for-default.nix +++ b/pkgs/tools/admin/webdruid/src-for-default.nix @@ -1,7 +1,7 @@ rec { advertisedUrl="http://downloads.sourceforge.net/webdruid/files/webdruid/0.6.0-alpha5/webdruid-0.6.0-alpha5.tar.gz"; version = "0.6.0-alpha5"; - url="http://downloads.sourceforge.net/webdruid/files/webdruid/${version}/webdruid-${version}.tar.gz"; + url="mirror://sourceforge/webdruid/webdruid-${version}.tar.gz"; hash = "1aiqffccayvf02snl9la62zqb1674cp4rv19af6xyxgvw4334hw0"; name = "webdruid-0.6.0-alpha5"; diff --git a/pkgs/tools/backup/partimage/default.nix b/pkgs/tools/backup/partimage/default.nix index d06ef2c8366..009dc90576b 100644 --- a/pkgs/tools/backup/partimage/default.nix +++ b/pkgs/tools/backup/partimage/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; src = fetchurl { - url = http://sourceforge.net/projects/partimage/files/stable/0.6.9/partimage-0.6.9.tar.bz2; + url = mirror://sourceforge/partimage/partimage-0.6.9.tar.bz2; sha256 = "0db6xiphk6xnlpbxraiy31c5xzj0ql6k4rfkmqzh665yyj0nqfkm"; }; configureFlags = "--with-ssl-headers=${openssl}/include/openssl"; diff --git a/pkgs/tools/compression/upx/default.nix b/pkgs/tools/compression/upx/default.nix index f3b8037a9f1..4df2947d137 100644 --- a/pkgs/tools/compression/upx/default.nix +++ b/pkgs/tools/compression/upx/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "upx-3.07"; src = fetchurl { - url = http://upx.sourceforge.net/download/upx-3.07-src.tar.bz2; + url = mirror://sourceforge/upx/upx-3.07-src.tar.bz2; sha256 = "07pcgjn7x0a734mvhgqwz24qkm1rzqrkcp67pmagzz6i765cp7bs"; }; diff --git a/pkgs/tools/graphics/pstoedit/default.nix b/pkgs/tools/graphics/pstoedit/default.nix index b3d75106980..efdeffe1ad7 100644 --- a/pkgs/tools/graphics/pstoedit/default.nix +++ b/pkgs/tools/graphics/pstoedit/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "pstoedit-3.50"; src = fetchurl { - url = http://prdownloads.sourceforge.net/pstoedit/pstoedit-3.50.tar.gz; + url = mirror://sourceforge/pstoedit/pstoedit-3.50.tar.gz; sha256 = "04ap21fxj2zn6vj9mv7zknj4svcbkb1gxwfzxkw5i0sksx969c92"; }; diff --git a/pkgs/tools/misc/ttf2pt1/default.nix b/pkgs/tools/misc/ttf2pt1/default.nix index 659b04a6238..5a03e099539 100644 --- a/pkgs/tools/misc/ttf2pt1/default.nix +++ b/pkgs/tools/misc/ttf2pt1/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "ttf2pt1-3.4.4"; src = fetchurl { - url = http://prdownloads.sourceforge.net/ttf2pt1/ttf2pt1-3.4.4.tgz; + url = mirror://sourceforge/ttf2pt1/ttf2pt1-3.4.4.tgz; sha256 = "1l718n4k4widx49xz7qrj4mybzb8q67kp2jw7f47604ips4654mf"; }; diff --git a/pkgs/tools/networking/philter/default.nix b/pkgs/tools/networking/philter/default.nix index 7457a72b5d5..af5b9aacffc 100644 --- a/pkgs/tools/networking/philter/default.nix +++ b/pkgs/tools/networking/philter/default.nix @@ -13,7 +13,7 @@ let baseName="philter"; version="1.1"; name="${baseName}-${version}"; - url="http://prdownloads.sourceforge.net/${baseName}/${name}.tar.gz"; + url="mirror://sourceforge/${baseName}/${name}.tar.gz"; hash="177pqfflhdn2mw9lc1wv9ik32ji69rjqr6dw83hfndwlsva5151l"; }; in diff --git a/pkgs/tools/security/pwgen/default.nix b/pkgs/tools/security/pwgen/default.nix index ecbc95362e6..aaa3b577657 100644 --- a/pkgs/tools/security/pwgen/default.nix +++ b/pkgs/tools/security/pwgen/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "pwgen-2.05"; src = fetchurl { - url = ftp://ftp.chg.ru/pub/sourceforge/p/pw/pwgen/pwgen-2.05.tar.gz; + url = mirror://sourceforge/pwgen/pwgen-2.05.tar.gz; sha256 = "1afxbkdl9b81760pyb972k18dmidrciy3vzcnspp3jg0aa316yn8"; }; meta = { diff --git a/pkgs/tools/system/thinkfan/default.nix b/pkgs/tools/system/thinkfan/default.nix index a13f500c34f..63850454b3d 100644 --- a/pkgs/tools/system/thinkfan/default.nix +++ b/pkgs/tools/system/thinkfan/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { name = "thinkfan-${version}"; src = fetchurl { - url = "http://downloads.sourceforge.net/project/thinkfan/thinkfan-${version}.tar.gz"; + url = "mirror://sourceforge/thinkfan/thinkfan-${version}.tar.gz"; sha256 = "04akla66r8k10x0jvmcpfi92hj2sppygcl7hhwn8n8zsvvf0yqxs"; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d080e913399..5fbe0ea553f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1956,7 +1956,7 @@ pythonPackages = python.modules // rec { name = "${baseName}-${version}"; src = fetchurl { - url = "http://downloads.sourceforge.net/sourceforge/fuse/fuse-python-${version}.tar.gz"; + url = "mirror://sourceforge/fuse/fuse-python-${version}.tar.gz"; sha256 = "06rmp1ap6flh64m81j0n3a357ij2vj9zwcvvw0p31y6hz1id9shi"; }; @@ -2564,7 +2564,7 @@ pythonPackages = python.modules // rec { matplotlib = buildPythonPackage ( rec { name = "matplotlib-1.1.0"; src = fetchurl { - url = "http://downloads.sourceforge.net/matplotlib/${name}.tar.gz"; + url = "mirror://sourceforge/matplotlib/${name}.tar.gz"; sha256 = "be37e1d86c65ecacae6683f8805e051e9904e5f2e02bf2b7a34262c46a6d06a7"; }; @@ -3314,7 +3314,7 @@ pythonPackages = python.modules // rec { name = "pexpect-2.3"; src = fetchurl { - url = "http://pexpect.sourceforge.net/pexpect-2.3.tar.gz"; + url = "mirror://sourceforge/pexpect/pexpect-2.3.tar.gz"; sha256 = "0x8bfjjqygriry1iyygm5048ykl5qpbpzqfp6i8dhkslm3ryf5fk"; }; From 1d7d0addcc0df4ae50f5d11ece142f33bc241f5e Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Sun, 14 Jul 2013 11:24:45 +1000 Subject: [PATCH 445/798] vim-plugins: add expression command-t * also fix build of vim on darwin --- pkgs/applications/editors/vim/default.nix | 6 ++-- pkgs/misc/vim-plugins/default.nix | 35 ++++++++++++++++++++++- pkgs/top-level/all-packages.nix | 7 ++++- 3 files changed, 44 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/vim/default.nix b/pkgs/applications/editors/vim/default.nix index ff8da0e0947..a3e40004550 100644 --- a/pkgs/applications/editors/vim/default.nix +++ b/pkgs/applications/editors/vim/default.nix @@ -41,8 +41,10 @@ stdenv.mkDerivation rec { sed -i -e 's/as_fn_error.*int32.*/:/' src/auto/configure ''; - meta = { + meta = with stdenv.lib; { description = "The most popular clone of the VI editor"; - homepage = http://www.vim.org; + homepage = http://www.vim.org; + maintainers = with maintainers; [ lovek323 ]; + platforms = platforms.unix; }; } diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 68e968d571e..e8d9e9a11e4 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -1,4 +1,4 @@ -{fetchurl, stdenv, python, cmake, vim}: +{ fetchurl, stdenv, python, cmake, vim, perl, ruby }: /* About Vim and plugins @@ -142,6 +142,8 @@ in cp -R doc "$out/vim-plugins" cp -R plugin "$out/vim-plugins" cp -R syntax_checkers "$out/vim-plugins" + + ${vimHelptags "$out/vim-plugins/doc"} ''; }; @@ -164,6 +166,35 @@ in cp -R ftplugin "$out/vim-plugins" cp -R indent "$out/vim-plugins" cp -R syntax "$out/vim-plugins" + + ${vimHelptags "$out/vim-plugins/doc"} + ''; + }; + + commandT = stdenv.mkDerivation { + name = "vim-command-t-1.4"; + + src = fetchurl { + url = "https://github.com/wincent/Command-T/archive/1.4.tar.gz"; + sha256 = "1ka9hwx9n0vj1dd5qsd2l1wq0kriwl76jmmdjzh7zaf0p547v98s"; + }; + + buildInputs = [ perl ruby ]; + + buildPhase = '' + pushd ruby/command-t + ruby extconf.rb + make + popd + ''; + + installPhase = '' + mkdir -p "$out/vim-plugins" + cp -R doc "$out/doc" + cp -R plugin "$out/vim-plugins" + cp -R ruby "$out/vim-plugins" + + ${vimHelptags "$out/vim-plugins/doc"} ''; }; @@ -179,6 +210,8 @@ in mkdir -p "$out/vim-plugins" cp -R plugin "$out/vim-plugins" ''; + + postInstall = false; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a656cdf1c41..3edefd59eed 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8546,7 +8546,12 @@ let flup = pythonPackages.flup; }; - vim = callPackage ../applications/editors/vim { }; + vim = callPackage ../applications/editors/vim { + # for Objective-C compilation + stdenv = if stdenv.isDarwin + then clangStdenv + else stdenv; + }; vimHugeX = vim_configurable; From da4be371e97fb6e51c39e1972f78769b98ba47ec Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Sun, 14 Jul 2013 05:23:06 +0300 Subject: [PATCH 446/798] make package use mirror:// for gnu, savannah and gnome repositories where possible --- pkgs/applications/audio/lingot/default.nix | 2 +- pkgs/applications/audio/normalize/default.nix | 2 +- pkgs/applications/editors/emacs-modes/color-theme/default.nix | 2 +- pkgs/applications/graphics/exrdisplay/default.nix | 2 +- pkgs/applications/version-management/cvs/default.nix | 2 +- pkgs/applications/version-management/meld/default.nix | 2 +- pkgs/applications/window-managers/stumpwm/default.nix | 2 +- pkgs/data/fonts/ttf-bitstream-vera/default.nix | 2 +- pkgs/desktops/gnome-2/bindings/gnome-python/default.nix | 2 +- pkgs/desktops/gnome-2/desktop/vte/default.nix | 2 +- pkgs/desktops/gnome-3/core/evince/default.nix | 2 +- pkgs/development/libraries/aspell/default.nix | 2 +- pkgs/development/libraries/confuse/default.nix | 2 +- pkgs/development/libraries/exosip/3.x.nix | 2 +- pkgs/development/libraries/exosip/default.nix | 2 +- pkgs/development/libraries/gtk-sharp-2/default.nix | 2 +- pkgs/development/libraries/ilmbase/default.nix | 2 +- pkgs/development/libraries/libchamplain/0.6.nix | 2 +- pkgs/development/libraries/libcm/default.nix | 2 +- pkgs/development/libraries/libsigcxx/1.2.nix | 2 +- pkgs/development/libraries/libsigcxx/default.nix | 2 +- pkgs/development/libraries/libunwind/default.nix | 2 +- pkgs/development/libraries/openexr/default.nix | 2 +- pkgs/development/python-modules/pygobject/3.nix | 2 +- pkgs/development/python-modules/pygobject/default.nix | 2 +- pkgs/development/python-modules/pygtk/default.nix | 2 +- pkgs/development/tools/misc/avrdude/default.nix | 2 +- pkgs/development/tools/misc/indent/default.nix | 2 +- pkgs/development/tools/misc/texi2html/default.nix | 2 +- pkgs/games/globulation/default.nix | 2 +- pkgs/games/gnuchess/default.nix | 2 +- pkgs/games/gtypist/default.nix | 2 +- pkgs/games/liquidwar/default.nix | 2 +- pkgs/games/xboard/default.nix | 2 +- pkgs/os-specific/linux/dmidecode/default.nix | 2 +- pkgs/tools/X11/autocutsel/default.nix | 2 +- pkgs/tools/archivers/atool/default.nix | 2 +- pkgs/tools/backup/rdiff-backup/default.nix | 2 +- pkgs/tools/compression/lzip/default.nix | 2 +- pkgs/tools/graphics/barcode/default.nix | 3 +-- pkgs/tools/misc/hddtemp/default.nix | 4 ++-- pkgs/tools/misc/man-db/default.nix | 2 +- pkgs/tools/misc/units/default.nix | 2 +- pkgs/tools/networking/flvstreamer/default.nix | 2 +- pkgs/tools/networking/gvpe/src-for-default.nix | 2 +- pkgs/tools/security/oath-toolkit/default.nix | 2 +- pkgs/tools/text/numdiff/default.nix | 2 +- pkgs/tools/typesetting/tex/auctex/default.nix | 2 +- 48 files changed, 49 insertions(+), 50 deletions(-) diff --git a/pkgs/applications/audio/lingot/default.nix b/pkgs/applications/audio/lingot/default.nix index e93f6ffc584..44d946af2db 100644 --- a/pkgs/applications/audio/lingot/default.nix +++ b/pkgs/applications/audio/lingot/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "lingot-0.9.0"; src = fetchurl { - url = http://download.savannah.gnu.org/releases/lingot/lingot-0.9.0.tar.gz; + url = mirror://savannah/lingot/lingot-0.9.0.tar.gz; sha256 = "07z129lp8m4sz608q409wb11c639w7cbn497r7bscgg08p6c07xb"; }; diff --git a/pkgs/applications/audio/normalize/default.nix b/pkgs/applications/audio/normalize/default.nix index e422eee363c..ca746f524c5 100644 --- a/pkgs/applications/audio/normalize/default.nix +++ b/pkgs/applications/audio/normalize/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.7.7"; src = fetchurl { - url = "http://savannah.nongnu.org/download/normalize/normalize-0.7.7.tar.gz"; + url = "mirror://savannah/normalize/normalize-0.7.7.tar.gz"; sha256 = "1n5khss10vjjp6w69q9qcl4kqfkd0pr555lgqghrchn6rjms4mb0"; }; diff --git a/pkgs/applications/editors/emacs-modes/color-theme/default.nix b/pkgs/applications/editors/emacs-modes/color-theme/default.nix index 9cc0e7fd42b..327e11bf086 100644 --- a/pkgs/applications/editors/emacs-modes/color-theme/default.nix +++ b/pkgs/applications/editors/emacs-modes/color-theme/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "color-theme-6.6.0"; src = fetchurl { - url = "http://download.savannah.gnu.org/releases/color-theme/${name}.tar.gz"; + url = "mirror://savannah/color-theme/${name}.tar.gz"; sha256 = "0yx1ghcjc66s1rl0v3d4r1k88ifw591hf814ly3d73acvh15zlsn"; }; diff --git a/pkgs/applications/graphics/exrdisplay/default.nix b/pkgs/applications/graphics/exrdisplay/default.nix index 65c86a6cf97..7b415df42f5 100644 --- a/pkgs/applications/graphics/exrdisplay/default.nix +++ b/pkgs/applications/graphics/exrdisplay/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { name ="openexr_viewers-1.0.1"; src = fetchurl { - url = "http://download.savannah.nongnu.org/releases/openexr/openexr_viewers-1.0.1.tar.gz"; + url = "mirror://savannah/openexr/openexr_viewers-1.0.1.tar.gz"; sha256 = "1w5qbcdp7sw48z1wk2v07f7p14vqqb1m2ncxyxnbkm9f4ab0ymg6"; }; diff --git a/pkgs/applications/version-management/cvs/default.nix b/pkgs/applications/version-management/cvs/default.nix index 0be984df761..0e43972fab6 100644 --- a/pkgs/applications/version-management/cvs/default.nix +++ b/pkgs/applications/version-management/cvs/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "cvs-1.12.13"; src = fetchurl { - url = http://ftp.gnu.org/non-gnu/cvs/source/feature/1.12.13/cvs-1.12.13.tar.bz2; + url = mirror://savannah/cvs/source/feature/1.12.13/cvs-1.12.13.tar.bz2; sha256 = "0pjir8cwn0087mxszzbsi1gyfc6373vif96cw4q3m1x6p49kd1bq"; }; diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix index 6e099cd5608..9c547b2193d 100644 --- a/pkgs/applications/version-management/meld/default.nix +++ b/pkgs/applications/version-management/meld/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { name = "meld-${version}"; src = fetchurl { - url = "http://ftp.gnome.org/pub/gnome/sources/meld/${minor}/meld-${version}.tar.xz"; + url = "mirror://gnome/sources/meld/${minor}/meld-${version}.tar.xz"; sha256 = "00rsff0yl5qwzh0igkdns6ry2xsbxad70avpqpkbd2bldi94v76y"; }; diff --git a/pkgs/applications/window-managers/stumpwm/default.nix b/pkgs/applications/window-managers/stumpwm/default.nix index db0b6e1037c..ab261a78fb0 100644 --- a/pkgs/applications/window-managers/stumpwm/default.nix +++ b/pkgs/applications/window-managers/stumpwm/default.nix @@ -12,7 +12,7 @@ let in rec { src = fetchurl { - url = "http://download.savannah.gnu.org/releases/stumpwm/${pkgName}-${version}.tgz"; + url = "mirror://savannah/stumpwm/${pkgName}-${version}.tgz"; sha256 = "a0793d22ef90731d34f84e51deafb4bc2095a357c70b9505dc57516f481cdf78"; }; diff --git a/pkgs/data/fonts/ttf-bitstream-vera/default.nix b/pkgs/data/fonts/ttf-bitstream-vera/default.nix index 64b18ffdaaa..1dfaa376df4 100644 --- a/pkgs/data/fonts/ttf-bitstream-vera/default.nix +++ b/pkgs/data/fonts/ttf-bitstream-vera/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "ttf-bitstream-vera-1.10"; src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/sources/ttf-bitstream-vera/1.10/ttf-bitstream-vera-1.10.tar.bz2; + url = mirror://gnome/sources/ttf-bitstream-vera/1.10/ttf-bitstream-vera-1.10.tar.bz2; sha256 = "1p3qs51x5327gnk71yq8cvmxc6wgx79sqxfvxcv80cdvgggjfnyv"; }; buildPhase = "true"; diff --git a/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix b/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix index 83505dc42fc..ed794715ff8 100644 --- a/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix +++ b/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { name = "gnome-python-${version}.1"; src = fetchurl { - url = "http://ftp.gnome.org/pub/GNOME/sources/gnome-python/${version}/${name}.tar.bz2"; + url = "mirror://gnome/sources/gnome-python/${version}/${name}.tar.bz2"; sha256 = "759ce9344cbf89cf7f8449d945822a0c9f317a494f56787782a901e4119b96d8"; }; diff --git a/pkgs/desktops/gnome-2/desktop/vte/default.nix b/pkgs/desktops/gnome-2/desktop/vte/default.nix index c91522e695e..00072657e06 100644 --- a/pkgs/desktops/gnome-2/desktop/vte/default.nix +++ b/pkgs/desktops/gnome-2/desktop/vte/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "vte-0.28.0"; src = fetchurl { - url = "http://ftp.gnome.org/pub/gnome/sources/vte/0.28/${name}.tar.bz2"; + url = "mirror://gnome/sources/vte/0.28/${name}.tar.bz2"; sha256 = "0blmblvjr35xajr0a07zcd58lk6x2hzympx17biw2mcym9kcarql"; }; diff --git a/pkgs/desktops/gnome-3/core/evince/default.nix b/pkgs/desktops/gnome-3/core/evince/default.nix index de49bffc419..a9fce636937 100644 --- a/pkgs/desktops/gnome-3/core/evince/default.nix +++ b/pkgs/desktops/gnome-3/core/evince/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { name = "evince-3.6.1"; src = fetchurl { - url = "http://ftp.gnome.org/pub/GNOME/sources/evince/3.6/${name}.tar.xz"; + url = "mirror://gnome/sources/evince/3.6/${name}.tar.xz"; sha256 = "1da1pij030dh8mb0pr0jnyszgsbjnh8lc17rj5ii52j3kmbv51qv"; }; diff --git a/pkgs/development/libraries/aspell/default.nix b/pkgs/development/libraries/aspell/default.nix index cac5ec483fe..dd7b6fcb218 100644 --- a/pkgs/development/libraries/aspell/default.nix +++ b/pkgs/development/libraries/aspell/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "aspell-0.60.6.1"; src = fetchurl { - url = "ftp://ftp.gnu.org/gnu/aspell/${name}.tar.gz"; + url = "mirror://gnu/aspell/${name}.tar.gz"; sha256 = "1qgn5psfyhbrnap275xjfrzppf5a83fb67gpql0kfqv37al869gm"; }; diff --git a/pkgs/development/libraries/confuse/default.nix b/pkgs/development/libraries/confuse/default.nix index 7291aa5eb38..67fe669a037 100644 --- a/pkgs/development/libraries/confuse/default.nix +++ b/pkgs/development/libraries/confuse/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { name = "confuse-2.7"; src = fetchurl { - url = "http://savannah.nongnu.org/download/confuse/${name}.tar.gz"; + url = "mirror://savannah/confuse/${name}.tar.gz"; sha256 = "0y47r2ashz44wvnxdb18ivpmj8nxhw3y9bf7v9w0g5byhgyp89g3"; }; diff --git a/pkgs/development/libraries/exosip/3.x.nix b/pkgs/development/libraries/exosip/3.x.nix index d850618ecdf..123b53783a6 100644 --- a/pkgs/development/libraries/exosip/3.x.nix +++ b/pkgs/development/libraries/exosip/3.x.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { version = "3.6.0"; src = fetchurl { - url = "http://download.savannah.gnu.org/releases/exosip/libeXosip2-${version}.tar.gz"; + url = "mirror://savannah/exosip/libeXosip2-${version}.tar.gz"; sha256 = "0r1mj8x5991bgwf03bx1ajn5kbbmw1136jabw2pn7dls9h41mnli"; }; name = "libexosip2-${version}"; diff --git a/pkgs/development/libraries/exosip/default.nix b/pkgs/development/libraries/exosip/default.nix index 2a1aea6df32..fb13e0b8c6f 100644 --- a/pkgs/development/libraries/exosip/default.nix +++ b/pkgs/development/libraries/exosip/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { version = "4.0.0"; src = fetchurl { - url = "http://download.savannah.gnu.org/releases/exosip/libeXosip2-${version}.tar.gz"; + url = "mirror://savannah/exosip/libeXosip2-${version}.tar.gz"; sha256 = "1rdjr3x7s992w004cqf4xji1522an9rpzsr9wvyhp685khmahrsj"; }; name = "libexosip2-${version}"; diff --git a/pkgs/development/libraries/gtk-sharp-2/default.nix b/pkgs/development/libraries/gtk-sharp-2/default.nix index 9baac518ff7..0e659fb074b 100644 --- a/pkgs/development/libraries/gtk-sharp-2/default.nix +++ b/pkgs/development/libraries/gtk-sharp-2/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { builder = ./builder.sh; src = fetchurl { - url = http://ftp.gnome.org/pub/gnome/sources/gtk-sharp/2.12/gtk-sharp-2.12.10.tar.gz; + url = mirror://gnome/sources/gtk-sharp/2.12/gtk-sharp-2.12.10.tar.gz; sha256 = "1y55vc2cp4lggmbil2lb28d0gn71iq6wfyja1l9mya5xll8svzwc"; }; diff --git a/pkgs/development/libraries/ilmbase/default.nix b/pkgs/development/libraries/ilmbase/default.nix index 2b7952d3b20..3c9ad9cfc33 100644 --- a/pkgs/development/libraries/ilmbase/default.nix +++ b/pkgs/development/libraries/ilmbase/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "ilmbase-1.0.1"; src = fetchurl { - url = http://download.savannah.nongnu.org/releases/openexr/ilmbase-1.0.1.tar.gz; + url = mirror://savannah/openexr/ilmbase-1.0.1.tar.gz; sha256 = "0z9r3r0bxyhgwhkdwln0dg1lnxz691qnjygrqlg3jym34rxzq52g"; }; } diff --git a/pkgs/development/libraries/libchamplain/0.6.nix b/pkgs/development/libraries/libchamplain/0.6.nix index 86b8dc5d550..5ec324131e3 100644 --- a/pkgs/development/libraries/libchamplain/0.6.nix +++ b/pkgs/development/libraries/libchamplain/0.6.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "libchamplain-0.6.1"; src = fetchurl { - url = "http://download.gnome.org/sources/libchamplain/0.6/${name}.tar.gz"; + url = "mirror://gnome/sources/libchamplain/0.6/${name}.tar.gz"; sha256 = "1l1in4khnral157j46aq2d26nviz23icnm353587vcwjhdbw86sg"; }; diff --git a/pkgs/development/libraries/libcm/default.nix b/pkgs/development/libraries/libcm/default.nix index 197a1e7fc97..09ef21dff59 100644 --- a/pkgs/development/libraries/libcm/default.nix +++ b/pkgs/development/libraries/libcm/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "libcm-0.1.1"; src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/sources/libcm/0.1/libcm-0.1.1.tar.bz2; + url = mirror://gnome/sources/libcm/0.1/libcm-0.1.1.tar.bz2; sha256 = "11i5z8l5v5ffihif35k5j8igj0rahsk4jdmsj24xhdw2s0zx53kn"; }; buildInputs = [ diff --git a/pkgs/development/libraries/libsigcxx/1.2.nix b/pkgs/development/libraries/libsigcxx/1.2.nix index 6436a88bdc8..29a7093dbbd 100644 --- a/pkgs/development/libraries/libsigcxx/1.2.nix +++ b/pkgs/development/libraries/libsigcxx/1.2.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "libsigc++-1.2.7"; src = fetchurl { - url = "http://ftp.gnome.org/pub/GNOME/sources/libsigc++/1.2/${name}.tar.bz2"; + url = "mirror://gnome/sources/libsigc++/1.2/${name}.tar.bz2"; sha256 = "099224v5y0y1ggqrfc8vga8afr3nb93iicn7cj8xxgsrwa83s5nr"; }; diff --git a/pkgs/development/libraries/libsigcxx/default.nix b/pkgs/development/libraries/libsigcxx/default.nix index f8fdb4c28c2..b1e4f31c567 100644 --- a/pkgs/development/libraries/libsigcxx/default.nix +++ b/pkgs/development/libraries/libsigcxx/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "libsigc++-2.2.10"; src = fetchurl { - url = "http://ftp.gnome.org/pub/GNOME/sources/libsigc++/2.2/${name}.tar.xz"; + url = "mirror://gnome/sources/libsigc++/2.2/${name}.tar.xz"; sha256 = "8ceb6f2732f5399ef50d5b70f433d49945a12e0900b8f9f43c135866a2e5bf47"; }; diff --git a/pkgs/development/libraries/libunwind/default.nix b/pkgs/development/libraries/libunwind/default.nix index 49e23017369..5c3670e2365 100644 --- a/pkgs/development/libraries/libunwind/default.nix +++ b/pkgs/development/libraries/libunwind/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "libunwind-1.0.1"; src = fetchurl { - url = "http://download.savannah.nongnu.org/releases/libunwind/${name}.tar.gz"; + url = "mirror://savannah/libunwind/${name}.tar.gz"; sha256 = "aa95fd184c0b90d95891c2f3bac2c7df708ff016d2a6ee8b2eabb769f864101f"; }; diff --git a/pkgs/development/libraries/openexr/default.nix b/pkgs/development/libraries/openexr/default.nix index 33397e8b98e..b54375ae062 100644 --- a/pkgs/development/libraries/openexr/default.nix +++ b/pkgs/development/libraries/openexr/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "openexr-1.7.1"; src = fetchurl { - url = "http://download.savannah.nongnu.org/releases/openexr/${name}.tar.gz"; + url = "mirror://savannah/openexr/${name}.tar.gz"; sha256 = "0l2rdbx9lg4qk2ms98hwbsnzpggdrx3pbjl6pcvrrpjqp5m905n6"; }; diff --git a/pkgs/development/python-modules/pygobject/3.nix b/pkgs/development/python-modules/pygobject/3.nix index b5b8f8408aa..ffbe906a900 100644 --- a/pkgs/development/python-modules/pygobject/3.nix +++ b/pkgs/development/python-modules/pygobject/3.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "pygobject-3.0.4"; src = fetchurl { - url = "http://ftp.gnome.org/pub/GNOME/sources/pygobject/3.0/${name}.tar.xz"; + url = "mirror://gnome/sources/pygobject/3.0/${name}.tar.xz"; sha256 = "f457b1d7f6b8bfa727593c3696d2b405da66b4a8d34cd7d3362ebda1221f0661"; }; diff --git a/pkgs/development/python-modules/pygobject/default.nix b/pkgs/development/python-modules/pygobject/default.nix index 8d6a1368d8b..9393b0a2f94 100644 --- a/pkgs/development/python-modules/pygobject/default.nix +++ b/pkgs/development/python-modules/pygobject/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "pygobject-2.28.6"; src = fetchurl { - url = "http://ftp.gnome.org/pub/GNOME/sources/pygobject/2.28/${name}.tar.xz"; + url = "mirror://gnome/sources/pygobject/2.28/${name}.tar.xz"; sha256 = "1f5dfxjnil2glfwxnqr14d2cjfbkghsbsn8n04js2c2icr7iv2pv"; }; diff --git a/pkgs/development/python-modules/pygtk/default.nix b/pkgs/development/python-modules/pygtk/default.nix index 940ba18f2a2..e291544911c 100644 --- a/pkgs/development/python-modules/pygtk/default.nix +++ b/pkgs/development/python-modules/pygtk/default.nix @@ -5,7 +5,7 @@ buildPythonPackage rec { name = "pygtk-2.22.0"; src = fetchurl { - url = "http://ftp.gnome.org/pub/GNOME/sources/pygtk/2.22/${name}.tar.bz2"; + url = "mirror://gnome/sources/pygtk/2.22/${name}.tar.bz2"; sha256 = "4acf0ef2bde8574913c40ee4a43d9c4f43bb77b577b67147271b534501a54cc8"; }; diff --git a/pkgs/development/tools/misc/avrdude/default.nix b/pkgs/development/tools/misc/avrdude/default.nix index adbaf5e3e8b..7574500dbbb 100644 --- a/pkgs/development/tools/misc/avrdude/default.nix +++ b/pkgs/development/tools/misc/avrdude/default.nix @@ -6,7 +6,7 @@ composableDerivation.composableDerivation {} rec { name="avrdude-5.10"; src = fetchurl { - url = "http://download.savannah.gnu.org/releases/avrdude/${name}.tar.gz"; + url = "mirror://savannah/avrdude/${name}.tar.gz"; sha256 = "0pmy73777x8p7f2aj2w2q1dnk1bvhd1cm7hcs1s9hsdqsmiinl41"; }; diff --git a/pkgs/development/tools/misc/indent/default.nix b/pkgs/development/tools/misc/indent/default.nix index 00ff11c3c88..0c82c2cd275 100644 --- a/pkgs/development/tools/misc/indent/default.nix +++ b/pkgs/development/tools/misc/indent/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "indent-2.2.10"; src = fetchurl { - url = "ftp://ftp.gnu.org/gnu/indent/${name}.tar.gz"; + url = "mirror://gnu/indent/${name}.tar.gz"; sha256 = "0f9655vqdvfwbxvs1gpa7py8k1z71aqh8hp73f65vazwbfz436wa"; }; diff --git a/pkgs/development/tools/misc/texi2html/default.nix b/pkgs/development/tools/misc/texi2html/default.nix index 2089142284f..7fa604e4af6 100644 --- a/pkgs/development/tools/misc/texi2html/default.nix +++ b/pkgs/development/tools/misc/texi2html/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "texi2html-1.82"; src = fetchurl { - url = "http://www.very-clever.com/download/nongnu/texi2html/${name}.tar.bz2"; + url = "mirror://savannah/texi2html/${name}.tar.bz2"; sha256 = "1wdli2szkgm3l0vx8rf6lylw0b0m47dlz9iy004n928nqkzix76n"; }; diff --git a/pkgs/games/globulation/default.nix b/pkgs/games/globulation/default.nix index 2b60abd0092..f1ffec85566 100644 --- a/pkgs/games/globulation/default.nix +++ b/pkgs/games/globulation/default.nix @@ -15,7 +15,7 @@ let version="0.9.4"; patchlevel="4"; name="${baseName}-${version}.${patchlevel}"; - url="http://dl.sv.nongnu.org/releases/glob2/${version}/${name}.tar.gz"; + url="mirror://savannah/glob2/${version}/${name}.tar.gz"; hash="1f0l2cqp2g3llhr9jl6jj15k0wb5q8n29vqj99xy4p5hqs78jk8g"; }; in diff --git a/pkgs/games/gnuchess/default.nix b/pkgs/games/gnuchess/default.nix index ae7938c02b8..8a4bfe5f6ec 100644 --- a/pkgs/games/gnuchess/default.nix +++ b/pkgs/games/gnuchess/default.nix @@ -6,7 +6,7 @@ let version="6.0.3"; name="${baseName}-${version}"; hash="01ff8qd8pk39c6pv24wbcqkx78kvay8rxvgxqq9cqp9gqv39jfkw"; - url="http://ftp.gnu.org/gnu/chess/gnuchess-6.0.3.tar.gz"; + url="mirror://gnu/chess/gnuchess-6.0.3.tar.gz"; sha256="01ff8qd8pk39c6pv24wbcqkx78kvay8rxvgxqq9cqp9gqv39jfkw"; }; buildInputs = [ diff --git a/pkgs/games/gtypist/default.nix b/pkgs/games/gtypist/default.nix index d0793a8d13d..f83e21eab7c 100644 --- a/pkgs/games/gtypist/default.nix +++ b/pkgs/games/gtypist/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "gtypist-2.9.1"; src = fetchurl { - url = "ftp://ftp.gnu.org/gnu/gtypist/gtypist-2.9.1.tar.xz"; + url = "mirror://gnu/gtypist/gtypist-2.9.1.tar.xz"; sha256 = "1yv209aih1ixbs477vzzk1xj013g6w32vi33g0hldfzvfxbl9y5s"; }; diff --git a/pkgs/games/liquidwar/default.nix b/pkgs/games/liquidwar/default.nix index 085c990f1a0..292aa2ff190 100644 --- a/pkgs/games/liquidwar/default.nix +++ b/pkgs/games/liquidwar/default.nix @@ -14,7 +14,7 @@ rec { name = "liquidwar6-0.0.13beta"; src = a.fetchurl { - url = "http://ftp.gnu.org/gnu/liquidwar6/${name}.tar.gz"; + url = "mirror://gnu/liquidwar6/${name}.tar.gz"; sha256 = "1jjf7wzb8jf02hl3473vz1q74fhmxn0szbishgi1f1j6a7234wx2"; }; diff --git a/pkgs/games/xboard/default.nix b/pkgs/games/xboard/default.nix index 21870fc3777..7e73bfad540 100644 --- a/pkgs/games/xboard/default.nix +++ b/pkgs/games/xboard/default.nix @@ -8,7 +8,7 @@ let version="4.7.1"; name="${baseName}-${version}"; hash="0hnav2swswaf0463c4wnmgwaif3g42f2a1mqyqc5fa1py32iy6ry"; - url="http://ftp.gnu.org/gnu/xboard/xboard-4.7.1.tar.gz"; + url="mirror://gnu/xboard/xboard-4.7.1.tar.gz"; sha256="0hnav2swswaf0463c4wnmgwaif3g42f2a1mqyqc5fa1py32iy6ry"; }; buildInputs = [ diff --git a/pkgs/os-specific/linux/dmidecode/default.nix b/pkgs/os-specific/linux/dmidecode/default.nix index f0649ccc390..e6b5035bd8e 100644 --- a/pkgs/os-specific/linux/dmidecode/default.nix +++ b/pkgs/os-specific/linux/dmidecode/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "dmidecode-2.11"; src = fetchurl { - url = "http://download.savannah.gnu.org/releases/dmidecode/${name}.tar.bz2"; + url = "mirror://savannah/dmidecode/${name}.tar.bz2"; sha256 = "0l9v8985piykc98hmbg1cq5r4xwvp0jjl4li3avr3ddkg4s699bd"; }; diff --git a/pkgs/tools/X11/autocutsel/default.nix b/pkgs/tools/X11/autocutsel/default.nix index 871dc5e130a..f4776933e53 100644 --- a/pkgs/tools/X11/autocutsel/default.nix +++ b/pkgs/tools/X11/autocutsel/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { inherit name; src = fetchurl { - url = "http://savannah.nongnu.org/download/autocutsel/${name}.tar.gz"; + url = "mirror://savannah/autocutsel/${name}.tar.gz"; sha256 = "0hp335qq57l0kp58pfwb0bk930zx5497frq8y0lzr4icvk1fpw5y"; }; diff --git a/pkgs/tools/archivers/atool/default.nix b/pkgs/tools/archivers/atool/default.nix index e0ece8825c0..f041f2050ea 100644 --- a/pkgs/tools/archivers/atool/default.nix +++ b/pkgs/tools/archivers/atool/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { name = "atool-0.39.0"; src = fetchurl { - url = http://savannah.nongnu.org/download/atool/atool-0.39.0.tar.gz; + url = mirror://savannah/atool/atool-0.39.0.tar.gz; sha256 = "aaf60095884abb872e25f8e919a8a63d0dabaeca46faeba87d12812d6efc703b"; }; diff --git a/pkgs/tools/backup/rdiff-backup/default.nix b/pkgs/tools/backup/rdiff-backup/default.nix index f108e6a5063..d52cbdebb67 100644 --- a/pkgs/tools/backup/rdiff-backup/default.nix +++ b/pkgs/tools/backup/rdiff-backup/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "rdiff-backup-1.2.8"; src = fetchurl { - url = http://savannah.nongnu.org/download/rdiff-backup/rdiff-backup-1.2.8.tar.gz; + url = mirror://savannah/rdiff-backup/rdiff-backup-1.2.8.tar.gz; sha256 = "1nwmmh816f96h0ff1jxk95ad38ilbhbdl5dgibx1d4cl81dsi48d"; }; diff --git a/pkgs/tools/compression/lzip/default.nix b/pkgs/tools/compression/lzip/default.nix index de29c34f150..03a8a7f169d 100644 --- a/pkgs/tools/compression/lzip/default.nix +++ b/pkgs/tools/compression/lzip/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { buildInputs = [ texinfo ]; src = fetchurl { - url = "http://download.savannah.gnu.org/releases/lzip/${name}.tar.gz"; + url = "mirror://savannah/lzip/${name}.tar.gz"; sha256 = "1rybhk2pxpfh2789ck9mrkdv3bpx7b7miwndlshb5vb02m9crxbz"; }; diff --git a/pkgs/tools/graphics/barcode/default.nix b/pkgs/tools/graphics/barcode/default.nix index 946d18b8cc5..6f8ec54c4c0 100644 --- a/pkgs/tools/graphics/barcode/default.nix +++ b/pkgs/tools/graphics/barcode/default.nix @@ -12,8 +12,7 @@ let version="0.98"; baseName="barcode"; name="${baseName}-${version}"; - # mirror://gnu/ doesn't work for this package - url="http://ftp.gnu.org/gnu/${baseName}/${name}.tar.gz"; + url="mirror://gnu/${baseName}/${name}.tar.gz"; hash="0ddn17a6hz817bchgjxrjg76v64kzl5zlll8x73ply5rg69f2aa2"; }; in diff --git a/pkgs/tools/misc/hddtemp/default.nix b/pkgs/tools/misc/hddtemp/default.nix index eb9aa5feaa3..f3c5dd02c7e 100644 --- a/pkgs/tools/misc/hddtemp/default.nix +++ b/pkgs/tools/misc/hddtemp/default.nix @@ -4,12 +4,12 @@ stdenv.mkDerivation { name = "hddtemp-0.3_beta15"; db = fetchurl{ - url = http://download.savannah.nongnu.org/releases/hddtemp/hddtemp.db; + url = mirror://savannah/hddtemp/hddtemp.db; sha256 = "1fr6qgns6qv7cr40lic5yqwkkc7yjmmgx8j0z6d93csg3smzhhya"; }; src = fetchurl { - url = http://download.savannah.nongnu.org/releases/hddtemp/hddtemp-0.3-beta15.tar.bz2; + url = mirror://savannah/hddtemp/hddtemp-0.3-beta15.tar.bz2; sha256 = "0nzgg4nl8zm9023wp4dg007z6x3ir60rwbcapr9ks2al81c431b1"; }; diff --git a/pkgs/tools/misc/man-db/default.nix b/pkgs/tools/misc/man-db/default.nix index 54367e671ea..5374cb74361 100644 --- a/pkgs/tools/misc/man-db/default.nix +++ b/pkgs/tools/misc/man-db/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "man-db-2.5.1"; src = fetchurl { - url = http://download.savannah.nongnu.org/releases/man-db/man-db-2.5.1.tar.gz; + url = mirror://savannah/man-db/man-db-2.5.1.tar.gz; sha256 = "178w1fk23ffh8vabj29cn0yyg5ps7bwy1zrrrcsw8aypbh3sfjy3"; }; diff --git a/pkgs/tools/misc/units/default.nix b/pkgs/tools/misc/units/default.nix index a056ec13f02..d4cd07aa4c6 100644 --- a/pkgs/tools/misc/units/default.nix +++ b/pkgs/tools/misc/units/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "units-1.86"; src = fetchurl { - url = ftp://ftp.gnu.org/gnu/units/units-1.86.tar.gz; + url = mirror://gnu/units/units-1.86.tar.gz; sha256 = "1syc4d3x1wb03hcxnz7rkgapk96biazfk2qqn2wfyx54bq829lhi"; }; diff --git a/pkgs/tools/networking/flvstreamer/default.nix b/pkgs/tools/networking/flvstreamer/default.nix index cbc07522019..c9bc05658d0 100644 --- a/pkgs/tools/networking/flvstreamer/default.nix +++ b/pkgs/tools/networking/flvstreamer/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "flvstreamer-2.1c1"; src = fetchurl { - url = "http://download.savannah.gnu.org/releases/flvstreamer/source/${name}.tar.gz"; + url = "mirror://savannah/flvstreamer/source/${name}.tar.gz"; sha256 = "e90e24e13a48c57b1be01e41c9a7ec41f59953cdb862b50cf3e667429394d1ee"; }; diff --git a/pkgs/tools/networking/gvpe/src-for-default.nix b/pkgs/tools/networking/gvpe/src-for-default.nix index 097f275feff..88264c5d771 100644 --- a/pkgs/tools/networking/gvpe/src-for-default.nix +++ b/pkgs/tools/networking/gvpe/src-for-default.nix @@ -2,7 +2,7 @@ rec { version="2.24"; name="gvpe-2.24"; hash="1szwia7n24fx9n40yvmdidna55b97459ccq6d2c4863q4pfkqpjy"; - url="http://ftp.gnu.org/gnu/gvpe/gvpe-${version}.tar.gz"; + url="mirror://gnu/gvpe/gvpe-${version}.tar.gz"; advertisedUrl="http://ftp.gnu.org/gnu/gvpe/gvpe-2.24.tar.gz"; diff --git a/pkgs/tools/security/oath-toolkit/default.nix b/pkgs/tools/security/oath-toolkit/default.nix index 58786f1bd61..80ab866e1f3 100644 --- a/pkgs/tools/security/oath-toolkit/default.nix +++ b/pkgs/tools/security/oath-toolkit/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "oath-toolkit-2.0.2"; src = fetchurl { - url = "http://download.savannah.gnu.org/releases/oath-toolkit/${name}.tar.gz"; + url = "mirror://savannah/oath-toolkit/${name}.tar.gz"; sha256 = "0i2rf5j83kb8h3sd9lsm0a46zq805kzagvccc4rk7879lg1fnl99"; }; diff --git a/pkgs/tools/text/numdiff/default.nix b/pkgs/tools/text/numdiff/default.nix index eb5ebf612b2..1eae8c4d527 100644 --- a/pkgs/tools/text/numdiff/default.nix +++ b/pkgs/tools/text/numdiff/default.nix @@ -6,7 +6,7 @@ in stdenv.mkDerivation { name = "numdiff-${version}"; src = fetchurl { - url = "http://ftp.igh.cnrs.fr/pub/nongnu/numdiff/numdiff-${version}.tar.gz"; + url = "mirror://savannah/numdiff/numdiff-${version}.tar.gz"; sha256 = "062byxp9vajj4flg1rqh0r2nwg9yx608mbsj5y25wkrzmkgcq3fx"; }; meta = { diff --git a/pkgs/tools/typesetting/tex/auctex/default.nix b/pkgs/tools/typesetting/tex/auctex/default.nix index 6ca85167aed..9774d7d1a94 100644 --- a/pkgs/tools/typesetting/tex/auctex/default.nix +++ b/pkgs/tools/typesetting/tex/auctex/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation ( rec { }; src = fetchurl { - url = "http://ftp.gnu.org/pub/gnu/${pname}/${name}.tar.gz"; + url = "mirror://gnu/${pname}/${name}.tar.gz"; sha256 = "aebbea00431f8fd1e6be6519d9cc28e974942000737f956027da2c952a6d304e"; }; From 021c40c72d3d857180659ce8208e02c7ab511b84 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sat, 13 Jul 2013 22:22:44 -0400 Subject: [PATCH 447/798] buildNodePackage: Handle bundledDependencies by nuking them Signed-off-by: Shea Levy --- pkgs/development/web/nodejs/build-node-package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/web/nodejs/build-node-package.nix b/pkgs/development/web/nodejs/build-node-package.nix index d260b290016..8a56e3e798b 100644 --- a/pkgs/development/web/nodejs/build-node-package.nix +++ b/pkgs/development/web/nodejs/build-node-package.nix @@ -38,6 +38,7 @@ stdenv.mkDerivation ({ mkdir -p $out/node_modules mv node_modules/${requireName} $out/node_modules mv node_modules/.bin $out/node_modules 2>/dev/null || true + rm -fR $out/node_modules/${requireName}/node_modules mv node_modules $out/node_modules/${requireName} if [ -d "$out/node_modules/.bin" ]; then ln -sv node_modules/.bin $out/bin From aefae32c8ca79c8c9ae9faf2e5a04f23796b923d Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sat, 13 Jul 2013 22:23:59 -0400 Subject: [PATCH 448/798] Add npm nodePackage Signed-off-by: Shea Levy --- pkgs/top-level/node-packages-generated.nix | 804 ++++++++++++++++++++- pkgs/top-level/node-packages.json | 1 + 2 files changed, 803 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix index 15b5c05b6f1..4e1cc57a0a4 100644 --- a/pkgs/top-level/node-packages-generated.nix +++ b/pkgs/top-level/node-packages-generated.nix @@ -9,6 +9,16 @@ dependencies = [ ]; } + { + baseName = "abbrev"; + version = "1.0.4"; + fullName = "abbrev-~1.0.4"; + hash = "8dc0f480571a4a19e74f1abd4f31f6a70f94953d1ccafa16ed1a544a19a6f3a8"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } { baseName = "amdefine"; version = "0.0.5"; @@ -60,6 +70,16 @@ { name = "sylvester"; range = ">= 0.0.8"; } ]; } + { + baseName = "archy"; + version = "0.0.2"; + fullName = "archy-0"; + hash = "355bafab4acbb86e4e94c00c55900215abe41ae72ab454be889c766e5889a6e5"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } { baseName = "asn1"; version = "0.1.11"; @@ -415,6 +435,36 @@ dependencies = [ ]; } + { + baseName = "child-process-close"; + version = "0.1.1"; + fullName = "child-process-close-~0.1.1"; + hash = "b68574f217d23d11cd4a1e5f1f2be17bf93e2bd38940ae6b07c35b69ec8d456a"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "chmodr"; + version = "0.1.0"; + fullName = "chmodr-~0.1.0"; + hash = "2c0bda3df1766290f9fe21940ab455e92bc37d608f2030b0e0b7dfdda9cff9cd"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "chownr"; + version = "0.0.1"; + fullName = "chownr-0"; + hash = "da1fbb894b4103a1a3c912fc780f6dcf7339865298f2fdc4e20afdf00a94b821"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } { baseName = "cli"; version = "0.4.4-2"; @@ -459,6 +509,18 @@ dependencies = [ ]; } + { + baseName = "cmd-shim"; + version = "1.1.0"; + fullName = "cmd-shim-~1.1.0"; + hash = "ccc0d6f184b9f77ab9d723e4bcecd88b8fa1a480507eb45cdd67b182617fad33"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "mkdirp"; range = "~0.3.3"; } + { name = "graceful-fs"; range = "1.2"; } + ]; + } { baseName = "coffee-script"; version = "1.6.3"; @@ -541,6 +603,18 @@ { name = "keypress"; range = "0.1.x"; } ]; } + { + baseName = "config-chain"; + version = "1.1.7"; + fullName = "config-chain-~1.1.1"; + hash = "a161af33500f1dc18e4da364ff9f3e0a516c08aa030859ea639480676b9c3f5c"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "proto-list"; range = "~1.2.1"; } + { name = "ini"; range = "1"; } + ]; + } { baseName = "connect"; version = "2.7.5"; @@ -727,6 +801,17 @@ dependencies = [ ]; } + { + baseName = "couch-login"; + version = "0.1.17"; + fullName = "couch-login-~0.1.15"; + hash = "49b941220d82f17077187b66f9fd88d2eb4a791b9f5beaac046290389c73d268"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "request"; range = "2 >=2.14"; } + ]; + } { baseName = "cryptiles"; version = "0.1.3"; @@ -911,6 +996,16 @@ dependencies = [ ]; } + { + baseName = "editor"; + version = "0.0.4"; + fullName = "editor-0.0.4"; + hash = "2f66957e121e49c8b52a9c54ff24b718ab8bf571591177ff09121e603704b591"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } { baseName = "emitter-component"; version = "1.0.0"; @@ -1249,6 +1344,59 @@ { name = "inherits"; range = "~1.0.0"; } ]; } + { + baseName = "fstream-ignore"; + version = "0.0.7"; + fullName = "fstream-ignore-~0.0.5"; + hash = "1f009e5aac56314d31c5adc339990d1b814595a5020e828cda4a06da536425c5"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "minimatch"; range = "~0.2.0"; } + { name = "fstream"; range = "~0.1.17"; } + { name = "inherits"; range = "2"; } + ]; + } + { + baseName = "fstream-npm"; + version = "0.1.5"; + fullName = "fstream-npm-~0.1.3"; + hash = "23751124b295b9d9beefd7b4146b8e6d4fe0d4587cc70bc0b134c10da307b1b0"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "fstream-ignore"; range = "~0.0.5"; } + { name = "inherits"; range = "2"; } + ]; + } + { + baseName = "fstream"; + version = "0.1.23"; + fullName = "fstream-~0.1.17"; + hash = "1f3f03be2b18815b133e551b0cde8ab77148d0de31fdd61d90f21317f02c8342"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "rimraf"; range = "2"; } + { name = "mkdirp"; range = "0.3"; } + { name = "graceful-fs"; range = "~2.0.0"; } + { name = "inherits"; range = "~1.0.0"; } + ]; + } + { + baseName = "fstream"; + version = "0.1.23"; + fullName = "fstream-~0.1.23"; + hash = "1f3f03be2b18815b133e551b0cde8ab77148d0de31fdd61d90f21317f02c8342"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "rimraf"; range = "2"; } + { name = "mkdirp"; range = "0.3"; } + { name = "graceful-fs"; range = "~2.0.0"; } + { name = "inherits"; range = "~1.0.0"; } + ]; + } { baseName = "fstream"; version = "0.1.23"; @@ -1263,6 +1411,16 @@ { name = "inherits"; range = "~1.0.0"; } ]; } + { + baseName = "github-url-from-git"; + version = "1.1.1"; + fullName = "github-url-from-git-~1.1.1"; + hash = "7f02b5799b4d73af273a2f4c290118b0cfa999ba5888896b85ab1cbb0c2e207e"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } { baseName = "glob"; version = "3.2.3"; @@ -1302,6 +1460,42 @@ { name = "inherits"; range = "2"; } ]; } + { + baseName = "glob"; + version = "3.2.3"; + fullName = "glob-~3.2.1"; + hash = "82e04561e897c9b682c0568bafbc57b0ee2fc592579535bb0f5929cd1605c9c3"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "minimatch"; range = "~0.2.11"; } + { name = "graceful-fs"; range = "~2.0.0"; } + { name = "inherits"; range = "2"; } + ]; + } + { + baseName = "glob"; + version = "3.2.3"; + fullName = "glob-~3.2.3"; + hash = "82e04561e897c9b682c0568bafbc57b0ee2fc592579535bb0f5929cd1605c9c3"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "minimatch"; range = "~0.2.11"; } + { name = "graceful-fs"; range = "~2.0.0"; } + { name = "inherits"; range = "2"; } + ]; + } + { + baseName = "graceful-fs"; + version = "1.2.3"; + fullName = "graceful-fs-1.2"; + hash = "b8d9e0af2261259525a65281573e416b70b91788ea7f7b13f4598aaa7818255a"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } { baseName = "graceful-fs"; version = "2.0.0"; @@ -1322,6 +1516,16 @@ dependencies = [ ]; } + { + baseName = "graceful-fs"; + version = "1.2.3"; + fullName = "graceful-fs-~1.2"; + hash = "b8d9e0af2261259525a65281573e416b70b91788ea7f7b13f4598aaa7818255a"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } { baseName = "graceful-fs"; version = "1.2.3"; @@ -1523,6 +1727,19 @@ { name = "ctype"; range = "0.5.2"; } ]; } + { + baseName = "http-signature"; + version = "0.9.11"; + fullName = "http-signature-~0.9.11"; + hash = "44b89f3c1917bf02723a5720f08fbe47448e0370a5d3498d1be860eaf28beb3b"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "assert-plus"; range = "0.1.2"; } + { name = "asn1"; range = "0.1.11"; } + { name = "ctype"; range = "0.5.2"; } + ]; + } { baseName = "i"; version = "0.3.1"; @@ -1584,6 +1801,16 @@ dependencies = [ ]; } + { + baseName = "ini"; + version = "1.1.0"; + fullName = "ini-1"; + hash = "307ecc5f8664773587a0d74165d1dbdb226754b638542596b7a1e2ed0a578a28"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } { baseName = "ini"; version = "1.1.0"; @@ -1594,6 +1821,30 @@ dependencies = [ ]; } + { + baseName = "ini"; + version = "1.1.0"; + fullName = "ini-~1.1.0"; + hash = "307ecc5f8664773587a0d74165d1dbdb226754b638542596b7a1e2ed0a578a28"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "init-package-json"; + version = "0.0.10"; + fullName = "init-package-json-0.0.10"; + hash = "6efeef6f30253ee6b8cc9a22154096f42e1ea8621e79acce96b5425925229431"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "promzard"; range = "~0.2.0"; } + { name = "read"; range = "~1.0.1"; } + { name = "read-package-json"; range = "1"; } + { name = "semver"; range = "2.x"; } + ]; + } { baseName = "is-promise"; version = "1.0.0"; @@ -1743,9 +1994,9 @@ } { baseName = "knox"; - version = "0.8.3"; + version = "0.8.4"; fullName = "knox-*"; - hash = "fe3cb0d94b3e85413626ffee386c751931afe200b170bd555173e413d7044c75"; + hash = "14072716bf13af98ab908f9f370f18e2353e326a0a945c53e1ff82f70725f161"; patchLatest = false; topLevel = true; dependencies = [ @@ -1791,6 +2042,16 @@ dependencies = [ ]; } + { + baseName = "lockfile"; + version = "0.4.0"; + fullName = "lockfile-~0.4.0"; + hash = "80b81e5d9e8af9f661cfa57f6cf88ec7f2cac90196dae8ca4b382a812694d68e"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } { baseName = "lru-cache"; version = "2.3.0"; @@ -1831,6 +2092,16 @@ dependencies = [ ]; } + { + baseName = "lru-cache"; + version = "2.3.0"; + fullName = "lru-cache-~2.3.0"; + hash = "fbb1a14e0314095b7999a3a7489c92983f3d95b188857af697487ac8a778e942"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } { baseName = "methods"; version = "0.0.1"; @@ -1958,6 +2229,18 @@ { name = "sigmund"; range = "~1.0.0"; } ]; } + { + baseName = "minimatch"; + version = "0.2.12"; + fullName = "minimatch-~0.2.0"; + hash = "205cff8b4ba926e86ff0e6f7f566553906113892028083ea221989a42500c246"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "lru-cache"; range = "2"; } + { name = "sigmund"; range = "~1.0.0"; } + ]; + } { baseName = "minimatch"; version = "0.2.12"; @@ -1970,6 +2253,18 @@ { name = "sigmund"; range = "~1.0.0"; } ]; } + { + baseName = "minimatch"; + version = "0.2.12"; + fullName = "minimatch-~0.2.12"; + hash = "205cff8b4ba926e86ff0e6f7f566553906113892028083ea221989a42500c246"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "lru-cache"; range = "2"; } + { name = "sigmund"; range = "~1.0.0"; } + ]; + } { baseName = "minimist"; version = "0.0.1"; @@ -2050,6 +2345,16 @@ dependencies = [ ]; } + { + baseName = "mkdirp"; + version = "0.3.5"; + fullName = "mkdirp-~0.3.3"; + hash = "8ae9c5107acb41110106224f5e7be2b50b00d15d062ea7941301c111b863fd26"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } { baseName = "mkdirp"; version = "0.3.5"; @@ -2343,6 +2648,29 @@ { name = "which"; range = "1"; } ]; } + { + baseName = "node-gyp"; + version = "0.10.6"; + fullName = "node-gyp-~0.10.6"; + hash = "1b1fc060c1a84eb0f52c495d7d13e3a7f03b2753b74dc6c1c801c5b8d563c5b0"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "glob"; range = "3"; } + { name = "graceful-fs"; range = "2"; } + { name = "fstream"; range = "0"; } + { name = "minimatch"; range = "0"; } + { name = "mkdirp"; range = "0"; } + { name = "nopt"; range = "2"; } + { name = "npmlog"; range = "0"; } + { name = "osenv"; range = "0"; } + { name = "request"; range = "2"; } + { name = "rimraf"; range = "2"; } + { name = "semver"; range = "~2.0.7"; } + { name = "tar"; range = "0"; } + { name = "which"; range = "1"; } + ]; + } { baseName = "node-uuid"; version = "1.4.0"; @@ -2425,6 +2753,110 @@ { name = "abbrev"; range = "1"; } ]; } + { + baseName = "nopt"; + version = "2.1.1"; + fullName = "nopt-~2.1.1"; + hash = "a7a84f3fe51cb8fb97c678bc73130b53d6782ee90dc0e9b15ae39630ce2fa203"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "abbrev"; range = "1"; } + ]; + } + { + baseName = "normalize-package-data"; + version = "0.2.0"; + fullName = "normalize-package-data-~0.2"; + hash = "acde245885200d357f307740e7d3b3a169e1088bed51cbd81d76d6e7dfcf8fa8"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "semver"; range = "2"; } + { name = "github-url-from-git"; range = "~1.1.1"; } + ]; + } + { + baseName = "npm"; + version = "1.3.4"; + fullName = "npm-*"; + hash = "fcf0a1a2bfb920fb7fd4dd172df3ea02b7155247f509add164041645d8742225"; + patchLatest = false; + topLevel = true; + dependencies = [ + { name = "semver"; range = "~2.0.8"; } + { name = "ini"; range = "~1.1.0"; } + { name = "slide"; range = "~1.1.4"; } + { name = "abbrev"; range = "~1.0.4"; } + { name = "graceful-fs"; range = "~2.0.0"; } + { name = "minimatch"; range = "~0.2.12"; } + { name = "nopt"; range = "~2.1.1"; } + { name = "rimraf"; range = "~2.2.0"; } + { name = "request"; range = "~2.21.0"; } + { name = "which"; range = "1"; } + { name = "tar"; range = "~0.1.17"; } + { name = "fstream"; range = "~0.1.23"; } + { name = "block-stream"; range = "*"; } + { name = "inherits"; range = "1"; } + { name = "mkdirp"; range = "~0.3.3"; } + { name = "read"; range = "~1.0.4"; } + { name = "lru-cache"; range = "~2.3.0"; } + { name = "node-gyp"; range = "~0.10.6"; } + { name = "fstream-npm"; range = "~0.1.3"; } + { name = "uid-number"; range = "0"; } + { name = "archy"; range = "0"; } + { name = "chownr"; range = "0"; } + { name = "npmlog"; range = "0.0.4"; } + { name = "ansi"; range = "~0.1.2"; } + { name = "npm-registry-client"; range = "~0.2.27"; } + { name = "read-package-json"; range = "~1.1.0"; } + { name = "read-installed"; range = "~0.2.2"; } + { name = "glob"; range = "~3.2.3"; } + { name = "init-package-json"; range = "0.0.10"; } + { name = "osenv"; range = "0"; } + { name = "lockfile"; range = "~0.4.0"; } + { name = "retry"; range = "~0.6.0"; } + { name = "once"; range = "~1.1.1"; } + { name = "npmconf"; range = "~0.1.1"; } + { name = "opener"; range = "~1.3.0"; } + { name = "chmodr"; range = "~0.1.0"; } + { name = "cmd-shim"; range = "~1.1.0"; } + { name = "sha"; range = "~1.0.1"; } + { name = "editor"; range = "0.0.4"; } + { name = "child-process-close"; range = "~0.1.1"; } + { name = "npm-user-validate"; range = "0.0.3"; } + ]; + } + { + baseName = "npm-registry-client"; + version = "0.2.27"; + fullName = "npm-registry-client-~0.2.27"; + hash = "9899d95fb9e71224ae49120621e245d20c2e05658e817442b2a30fcf8928441b"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "request"; range = "2 >=2.20.0"; } + { name = "graceful-fs"; range = "~2.0.0"; } + { name = "semver"; range = "~2.0.5"; } + { name = "slide"; range = "~1.1.3"; } + { name = "chownr"; range = "0"; } + { name = "mkdirp"; range = "~0.3.3"; } + { name = "rimraf"; range = "~2"; } + { name = "retry"; range = "0.6.0"; } + { name = "couch-login"; range = "~0.1.15"; } + { name = "npmlog"; range = ""; } + ]; + } + { + baseName = "npm-user-validate"; + version = "0.0.3"; + fullName = "npm-user-validate-0.0.3"; + hash = "3ba7b67338af6deff49c8c6588542aaea83f034cad0dfe34519b546c05f29402"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } { baseName = "npm2nix"; version = "1.2.0"; @@ -2436,6 +2868,35 @@ { name = "semver"; range = "1"; } ]; } + { + baseName = "npmconf"; + version = "0.1.1"; + fullName = "npmconf-~0.1.1"; + hash = "e4448bd02d4745549324fd0dbc333bcd9bf37de11e2ecc7bc02bf9655ddec2e9"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "config-chain"; range = "~1.1.1"; } + { name = "inherits"; range = "~1.0.0"; } + { name = "once"; range = "~1.1.1"; } + { name = "mkdirp"; range = "~0.3.3"; } + { name = "osenv"; range = "0.0.3"; } + { name = "nopt"; range = "2"; } + { name = "semver"; range = "2"; } + { name = "ini"; range = "~1.1.0"; } + ]; + } + { + baseName = "npmlog"; + version = "0.0.4"; + fullName = "npmlog-"; + hash = "16da9f0f239813f201156b81a5ebe552c9a3f78a405dbb24c2c1743fe3a0d579"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "ansi"; range = "~0.1.2"; } + ]; + } { baseName = "npmlog"; version = "0.0.4"; @@ -2447,6 +2908,17 @@ { name = "ansi"; range = "~0.1.2"; } ]; } + { + baseName = "npmlog"; + version = "0.0.4"; + fullName = "npmlog-0.0.4"; + hash = "16da9f0f239813f201156b81a5ebe552c9a3f78a405dbb24c2c1743fe3a0d579"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "ansi"; range = "~0.1.2"; } + ]; + } { baseName = "nssocket"; version = "0.5.1"; @@ -2489,6 +2961,26 @@ dependencies = [ ]; } + { + baseName = "once"; + version = "1.1.1"; + fullName = "once-~1.1.1"; + hash = "3fdc1a246f2522991fd9a6554a93c012c3192ea99918fdd893a2d4f2d546fe93"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "opener"; + version = "1.3.0"; + fullName = "opener-~1.3.0"; + hash = "8ce1113b83487849625156d72483e4eef7b8eebf63a9e8d7732df15c240efa06"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } { baseName = "optimist"; version = "0.6.0"; @@ -2586,6 +3078,16 @@ dependencies = [ ]; } + { + baseName = "osenv"; + version = "0.0.3"; + fullName = "osenv-0.0.3"; + hash = "aafbb23637b7338c9025f9da336f31f96674d7926c30f209e4d93ce16d5251c4"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } { baseName = "owl-deepcopy"; version = "0.0.2"; @@ -2742,6 +3244,27 @@ { name = "winston"; range = "0.6.x"; } ]; } + { + baseName = "promzard"; + version = "0.2.0"; + fullName = "promzard-~0.2.0"; + hash = "e9dcdf4084876c4b751f2f5939f149071495f0d23bf80a9ec4a73cd84080184b"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "read"; range = "1"; } + ]; + } + { + baseName = "proto-list"; + version = "1.2.2"; + fullName = "proto-list-~1.2.1"; + hash = "1a1916d1a55ada8d8f3530d2073d57b6b9f0547b317686a7bc0492305d1d8e3b"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } { baseName = "ps-tree"; version = "0.0.3"; @@ -2823,6 +3346,17 @@ dependencies = [ ]; } + { + baseName = "read"; + version = "1.0.4"; + fullName = "read-1"; + hash = "8be269afeaa7cc62feb4672e8e61e5133152266dc5347b23cf5b05bc40789601"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "mute-stream"; range = "~0.0.2"; } + ]; + } { baseName = "read"; version = "1.0.4"; @@ -2834,6 +3368,70 @@ { name = "mute-stream"; range = "~0.0.2"; } ]; } + { + baseName = "read-installed"; + version = "0.2.2"; + fullName = "read-installed-~0.2.2"; + hash = "1237a4eb7444063ef83be336ecd317ffeafd2fef8f9e81468a5d7545e1a80c23"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "semver"; range = "2"; } + { name = "slide"; range = "~1.1.3"; } + { name = "read-package-json"; range = "1"; } + { name = "graceful-fs"; range = "~1.2.0"; } + ]; + } + { + baseName = "read-package-json"; + version = "1.1.0"; + fullName = "read-package-json-1"; + hash = "f3d2f47ffcab7512bb5cfba1854e708534dcae073704c3c9baba36de19b89969"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "glob"; range = "~3.2.1"; } + { name = "lru-cache"; range = "2"; } + { name = "normalize-package-data"; range = "~0.2"; } + { name = "graceful-fs"; range = "~1.2"; } + ]; + } + { + baseName = "read-package-json"; + version = "1.1.0"; + fullName = "read-package-json-~1.1.0"; + hash = "f3d2f47ffcab7512bb5cfba1854e708534dcae073704c3c9baba36de19b89969"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "glob"; range = "~3.2.1"; } + { name = "lru-cache"; range = "2"; } + { name = "normalize-package-data"; range = "~0.2"; } + { name = "graceful-fs"; range = "~1.2"; } + ]; + } + { + baseName = "read"; + version = "1.0.4"; + fullName = "read-~1.0.1"; + hash = "8be269afeaa7cc62feb4672e8e61e5133152266dc5347b23cf5b05bc40789601"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "mute-stream"; range = "~0.0.2"; } + ]; + } + { + baseName = "read"; + version = "1.0.4"; + fullName = "read-~1.0.4"; + hash = "8be269afeaa7cc62feb4672e8e61e5133152266dc5347b23cf5b05bc40789601"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "mute-stream"; range = "~0.0.2"; } + ]; + } { baseName = "readable-stream"; version = "1.0.2"; @@ -2930,6 +3528,50 @@ { name = "form-data"; range = "0.0.8"; } ]; } + { + baseName = "request"; + version = "2.22.0"; + fullName = "request-2 >=2.14"; + hash = "d0a7ebc001800143d05cedf616cc164a31425bcbfdb8eb533b59d8c123b1275c"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "qs"; range = "~0.6.0"; } + { name = "json-stringify-safe"; range = "~4.0.0"; } + { name = "forever-agent"; range = "~0.5.0"; } + { name = "tunnel-agent"; range = "~0.3.0"; } + { name = "http-signature"; range = "~0.10.0"; } + { name = "hawk"; range = "~0.13.0"; } + { name = "aws-sign"; range = "~0.3.0"; } + { name = "oauth-sign"; range = "~0.3.0"; } + { name = "cookie-jar"; range = "~0.3.0"; } + { name = "node-uuid"; range = "~1.4.0"; } + { name = "mime"; range = "~1.2.9"; } + { name = "form-data"; range = "0.0.8"; } + ]; + } + { + baseName = "request"; + version = "2.22.0"; + fullName = "request-2 >=2.20.0"; + hash = "d0a7ebc001800143d05cedf616cc164a31425bcbfdb8eb533b59d8c123b1275c"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "qs"; range = "~0.6.0"; } + { name = "json-stringify-safe"; range = "~4.0.0"; } + { name = "forever-agent"; range = "~0.5.0"; } + { name = "tunnel-agent"; range = "~0.3.0"; } + { name = "http-signature"; range = "~0.10.0"; } + { name = "hawk"; range = "~0.13.0"; } + { name = "aws-sign"; range = "~0.3.0"; } + { name = "oauth-sign"; range = "~0.3.0"; } + { name = "cookie-jar"; range = "~0.3.0"; } + { name = "node-uuid"; range = "~1.4.0"; } + { name = "mime"; range = "~1.2.9"; } + { name = "form-data"; range = "0.0.8"; } + ]; + } { baseName = "request"; version = "2.16.6"; @@ -2983,6 +3625,28 @@ { name = "form-data"; range = "0.0.8"; } ]; } + { + baseName = "request"; + version = "2.21.0"; + fullName = "request-~2.21.0"; + hash = "fe31c3119bc4423f07aa7c9849cb642d5ad22bdf2a2700eab56fb83fa8ed429c"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "qs"; range = "~0.6.0"; } + { name = "json-stringify-safe"; range = "~4.0.0"; } + { name = "forever-agent"; range = "~0.5.0"; } + { name = "tunnel-agent"; range = "~0.3.0"; } + { name = "http-signature"; range = "~0.9.11"; } + { name = "hawk"; range = "~0.13.0"; } + { name = "aws-sign"; range = "~0.3.0"; } + { name = "oauth-sign"; range = "~0.3.0"; } + { name = "cookie-jar"; range = "~0.3.0"; } + { name = "node-uuid"; range = "~1.4.0"; } + { name = "mime"; range = "~1.2.9"; } + { name = "form-data"; range = "0.0.8"; } + ]; + } { baseName = "restify"; version = "2.4.1"; @@ -3010,6 +3674,26 @@ { name = "dtrace-provider"; range = "0.2.8"; } ]; } + { + baseName = "retry"; + version = "0.6.0"; + fullName = "retry-0.6.0"; + hash = "983e676af24ff4dcbac396420fca3c195ce3b1de5f731f697888b4fe6b7bbd2a"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "retry"; + version = "0.6.0"; + fullName = "retry-~0.6.0"; + hash = "983e676af24ff4dcbac396420fca3c195ce3b1de5f731f697888b4fe6b7bbd2a"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } { baseName = "revalidator"; version = "0.1.5"; @@ -3041,6 +3725,17 @@ { name = "graceful-fs"; range = "~1"; } ]; } + { + baseName = "rimraf"; + version = "2.2.0"; + fullName = "rimraf-~2"; + hash = "4d250a91e5da8f0e839647149268d3682c868a65e920477ff5baae26591ebeb2"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "graceful-fs"; range = "~1"; } + ]; + } { baseName = "rimraf"; version = "2.1.4"; @@ -3052,6 +3747,17 @@ { name = "graceful-fs"; range = "~1"; } ]; } + { + baseName = "rimraf"; + version = "2.2.0"; + fullName = "rimraf-~2.2.0"; + hash = "4d250a91e5da8f0e839647149268d3682c868a65e920477ff5baae26591ebeb2"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "graceful-fs"; range = "~1"; } + ]; + } { baseName = "s3http"; version = "0.0.2"; @@ -3115,6 +3821,36 @@ dependencies = [ ]; } + { + baseName = "semver"; + version = "2.0.10"; + fullName = "semver-2"; + hash = "121f81da02804485b7bc06769ec2a71284c2d8933030b1a4f17602c34ef04111"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "semver"; + version = "2.0.10"; + fullName = "semver-2.x"; + hash = "121f81da02804485b7bc06769ec2a71284c2d8933030b1a4f17602c34ef04111"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "semver"; + version = "2.0.10"; + fullName = "semver-~2.0.5"; + hash = "121f81da02804485b7bc06769ec2a71284c2d8933030b1a4f17602c34ef04111"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } { baseName = "semver"; version = "2.0.10"; @@ -3125,6 +3861,16 @@ dependencies = [ ]; } + { + baseName = "semver"; + version = "2.0.10"; + fullName = "semver-~2.0.8"; + hash = "121f81da02804485b7bc06769ec2a71284c2d8933030b1a4f17602c34ef04111"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } { baseName = "send"; version = "0.1.3"; @@ -3177,6 +3923,17 @@ dependencies = [ ]; } + { + baseName = "sha"; + version = "1.0.1"; + fullName = "sha-~1.0.1"; + hash = "b540d2ae52395b7c22c8ad1fa4e0cf430ccab917847ddea5308fa833cf85c5fb"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "graceful-fs"; range = "1.2"; } + ]; + } { baseName = "shelljs"; version = "0.1.4"; @@ -3227,6 +3984,26 @@ dependencies = [ ]; } + { + baseName = "slide"; + version = "1.1.4"; + fullName = "slide-~1.1.3"; + hash = "db50179b7ceac3a1d79527a7c3db39ee1d5e936a07504e6aa542f9078aa33a6a"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } + { + baseName = "slide"; + version = "1.1.4"; + fullName = "slide-~1.1.4"; + hash = "db50179b7ceac3a1d79527a7c3db39ee1d5e936a07504e6aa542f9078aa33a6a"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } { baseName = "smartdc"; version = "7.0.0"; @@ -3468,6 +4245,19 @@ { name = "fstream"; range = "~0.1.8"; } ]; } + { + baseName = "tar"; + version = "0.1.17"; + fullName = "tar-~0.1.17"; + hash = "577832975440eba0a9293244d53fa2c383e5c27ec2f68e3defde0cc23910b978"; + patchLatest = false; + topLevel = false; + dependencies = [ + { name = "inherits"; range = "1.x"; } + { name = "block-stream"; range = "*"; } + { name = "fstream"; range = "~0.1.8"; } + ]; + } { baseName = "temp"; version = "0.5.1"; @@ -3570,6 +4360,16 @@ { name = "optimist"; range = "~0.3.5"; } ]; } + { + baseName = "uid-number"; + version = "0.0.3"; + fullName = "uid-number-0"; + hash = "e8eab0de35bcb20a55f58a276b2f6cfe1c531fae5982d7a3af7286807dbbe42b"; + patchLatest = false; + topLevel = false; + dependencies = [ + ]; + } { baseName = "uid2"; version = "0.0.2"; diff --git a/pkgs/top-level/node-packages.json b/pkgs/top-level/node-packages.json index 64e13d07696..ac09384b1ee 100644 --- a/pkgs/top-level/node-packages.json +++ b/pkgs/top-level/node-packages.json @@ -60,4 +60,5 @@ , "libyaml" , "i18next" , "stylus" +, "npm" ] From 2c71290da78b5b750f9fe5b615637a087e871253 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Sun, 14 Jul 2013 05:30:42 +0300 Subject: [PATCH 449/798] Fix perl packages go use mirror://cpan where possible --- pkgs/top-level/perl-packages.nix | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 64f677093b3..8a060381aa4 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -268,7 +268,7 @@ rec { BitVector = buildPerlPackage { name = "Bit-Vector-7.3"; src = fetchurl { - url = http://cpan.metacpan.org/authors/id/S/ST/STBEY/Bit-Vector-7.3.tar.gz; + url = mirror://cpan/authors/id/S/ST/STBEY/Bit-Vector-7.3.tar.gz; sha256 = "0gcg1173i1bsx2qvyw77kw90xbf03b861jc42hvq744vzc5k6xjs"; }; propagatedBuildInputs = [CarpClan]; @@ -365,7 +365,7 @@ rec { CaptchaReCAPTCHA = buildPerlPackage rec { name = "Captcha-reCAPTCHA-0.97"; src = fetchurl { - url = http://cpan.metacpan.org/authors/id/P/PH/PHRED/Captcha-reCAPTCHA-0.97.tar.gz; + url = mirror://cpan/authors/id/P/PH/PHRED/Captcha-reCAPTCHA-0.97.tar.gz; sha256 = "12f2yh89aji6mnkrqxjcllws5dlg545wvz0j7wamy149xyqi12wq"; }; propagatedBuildInputs = [HTMLTiny LWP]; @@ -1687,7 +1687,7 @@ rec { DateCalc = buildPerlPackage { name = "Date-Calc-6.3"; src = fetchurl { - url = http://cpan.metacpan.org/authors/id/S/ST/STBEY/Date-Calc-6.3.tar.gz; + url = mirror://cpan/authors/id/S/ST/STBEY/Date-Calc-6.3.tar.gz; sha256 = "14yvbgy9n8icwlm5zi86lskvxd6nsl42i1g9f5dwdaw9my463diy"; }; propagatedBuildInputs = [CarpClan BitVector]; @@ -2425,7 +2425,7 @@ rec { ExceptionBase = buildPerlPackage { name = "Exception-Base-0.25"; src = fetchurl { - url = http://cpan.metacpan.org/authors/id/D/DE/DEXTER/Exception-Base-0.25.tar.gz; + url = mirror://cpan/authors/id/D/DE/DEXTER/Exception-Base-0.25.tar.gz; sha256 = "1s2is862xba2yy633wn2nklrya36yrlwxlbpqjrv8m31xj2c8khw"; }; buildInputs = [ TestUnitLite ]; @@ -3641,8 +3641,8 @@ rec { libintl_perl = buildPerlPackage rec { name = "libintl-perl-1.23"; src = fetchurl { - url = http://cpan.metacpan.org/authors/id/G/GU/GUIDO/libintl-perl-1.23.tar.gz; - sha256 = "1ylz6yhjifblhmnva0k05ch12a4cdii5v0icah69ma1gdhsidnk0"; + url = mirror://cpan/authors/id/G/GU/GUIDO/libintl-perl-1.23.tar.gz; + sha256 = "1ylz6yhjifblhmnva0k05ch12a4cdii5v0icah69ma1gdhsidnk0"; }; }; @@ -3745,8 +3745,8 @@ rec { ListUtilsBy = buildPerlPackage rec { name = "List-UtilsBy-0.09"; src = fetchurl { - url = http://cpan.metacpan.org/authors/id/P/PE/PEVANS/List-UtilsBy-0.09.tar.gz; - sha256 = "1xcsgz8898h670zmwqd8azfn3a2y9nq7z8cva9dsyhzkk8ajmra1"; + url = mirror://cpan/authors/id/P/PE/PEVANS/List-UtilsBy-0.09.tar.gz; + sha256 = "1xcsgz8898h670zmwqd8azfn3a2y9nq7z8cva9dsyhzkk8ajmra1"; }; }; @@ -4251,7 +4251,7 @@ rec { ModuleVersions = buildPerlPackage { name = "Module-Versions-0.02"; src = fetchurl { - url = http://cpan.metacpan.org/authors/id/T/TH/THW/Module-Versions-0.02.zip; + url = mirror://cpan/authors/id/T/TH/THW/Module-Versions-0.02.zip; sha256 = "0g7qs6vqg91xpwg1cdy91m3kh9m1zbkzyz1qsy453b572xdscf0d"; }; buildInputs = [ pkgs.unzip ]; @@ -4511,8 +4511,8 @@ rec { MooseXSingleton = buildPerlPackage rec { name = "MooseX-Singleton-0.29"; src = fetchurl { - url = http://cpan.metacpan.org/authors/id/K/KA/KAARE/MooseX-Singleton-0.29.tar.gz; - sha256 = "0103f0hi7fp3mc0y0ydnz4ghcnag5gwgn2160y2zp6rnydx2p2sc"; + url = mirror://cpan/authors/id/K/KA/KAARE/MooseX-Singleton-0.29.tar.gz; + sha256 = "0103f0hi7fp3mc0y0ydnz4ghcnag5gwgn2160y2zp6rnydx2p2sc"; }; buildInputs = [ Moose TestFatal TestRequires ]; }; @@ -4603,7 +4603,7 @@ rec { MooseXTypesLoadableClass = buildPerlPackage rec { name = "MooseX-Types-LoadableClass-0.008"; src = fetchurl { - url = http://cpan.metacpan.org/authors/id/B/BO/BOBTFISH/MooseX-Types-LoadableClass-0.008.tar.gz; + url = mirror://cpan/authors/id/B/BO/BOBTFISH/MooseX-Types-LoadableClass-0.008.tar.gz; sha256 = "0wh4zxknqv98nrmsp6yg6mazjyl3vacrgywarzjg5gks78c84i8g"; }; propagatedBuildInputs = [ ClassLoad Moose MooseXTypes namespaceclean ]; @@ -5500,7 +5500,7 @@ rec { RSSParserLite = buildPerlPackage { name = "RSS-Parser-Lite-0.10"; src = fetchurl { - url = http://cpan.metacpan.org/authors/id/E/EB/EBOSRUP/RSS-Parser-Lite-0.10.tar.gz; + url = mirror://cpan/authors/id/E/EB/EBOSRUP/RSS-Parser-Lite-0.10.tar.gz; sha256 = "1spvi0z62saz2cam8kwk2k561aavw2w42g3ykj38w1kmydvsk8z6"; }; propagatedBuildInputs = [ SOAPLite ]; @@ -6664,7 +6664,7 @@ rec { TestXPath = buildPerlModule { name = "Test-XPath-0.16"; src = fetchurl { - url = http://cpan.metacpan.org/authors/id/D/DW/DWHEELER/Test-XPath-0.16.tar.gz; + url = mirror://cpan/authors/id/D/DW/DWHEELER/Test-XPath-0.16.tar.gz; sha256 = "09s47d5jcrx35dz623gjiqn0qmjrv0wb54czr7h01wffw1w8akxi"; }; propagatedBuildInputs = [ XMLLibXML ]; From fba8b902da803e904e6175f3ad2a9fd329c74c42 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Sun, 14 Jul 2013 05:38:03 +0300 Subject: [PATCH 450/798] fix packages to use mirror://xorg --- pkgs/applications/misc/xfontsel/default.nix | 2 +- pkgs/applications/misc/xlsfonts/default.nix | 2 +- pkgs/applications/window-managers/xcompmgr/default.nix | 2 +- pkgs/tools/graphics/editres/default.nix | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/xfontsel/default.nix b/pkgs/applications/misc/xfontsel/default.nix index 3179e1f3440..b159dd282e2 100644 --- a/pkgs/applications/misc/xfontsel/default.nix +++ b/pkgs/applications/misc/xfontsel/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { name = "xfontsel-1.0.2"; src = fetchurl { - url = "http://www.x.org/releases/individual/app/${name}.tar.bz2"; + url = "mirror://xorg/individual/app/${name}.tar.bz2"; sha256 = "1a86a08sf0wjrki9ydh7hr5qf6hrixc4ljlxizakjzmx20wvlrks"; }; diff --git a/pkgs/applications/misc/xlsfonts/default.nix b/pkgs/applications/misc/xlsfonts/default.nix index 8fe930ce9a5..879f5ae568c 100644 --- a/pkgs/applications/misc/xlsfonts/default.nix +++ b/pkgs/applications/misc/xlsfonts/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { name = "xlsfonts-1.0.2"; src = fetchurl { - url = "http://www.x.org/releases/individual/app/${name}.tar.bz2"; + url = "mirror://xorg/individual/app/${name}.tar.bz2"; sha256 = "070iym754g3mf9x6xczl4gdnpvlk6rdyl1ndwhpjl21vg2dm2vnc"; }; diff --git a/pkgs/applications/window-managers/xcompmgr/default.nix b/pkgs/applications/window-managers/xcompmgr/default.nix index 3e402b05b94..930b612f691 100644 --- a/pkgs/applications/window-managers/xcompmgr/default.nix +++ b/pkgs/applications/window-managers/xcompmgr/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { name = "xcompmgr-1.1.6"; src = fetchurl { - url = "http://www.x.org/releases/individual/app/${name}.tar.bz2"; + url = "mirror://xorg/individual/app/${name}.tar.bz2"; sha256 = "c98949d36793b30ed1ed47495c87a05fa245ac0fc2857d2abc54979124687c02"; }; buildInputs = [ pkgconfig libXcomposite libXfixes libXdamage libXrender libXext ]; diff --git a/pkgs/tools/graphics/editres/default.nix b/pkgs/tools/graphics/editres/default.nix index 50f81c3ea4d..64222185044 100644 --- a/pkgs/tools/graphics/editres/default.nix +++ b/pkgs/tools/graphics/editres/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "editres-1.0.6"; src = fetchurl { - url = "http://xorg.freedesktop.org/releases/individual/app/${name}.tar.gz"; + url = "mirror://xorg/individual/app/${name}.tar.gz"; sha256 = "06kv7dmw6pzlqc46dbh8k9xpb6sn4ihh0bcpxq0zpvw2lm66dx45"; }; From c8cc4128acfe874422ec543a4876cd5565336f5e Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Sun, 14 Jul 2013 13:42:33 +1000 Subject: [PATCH 451/798] numpy: fix build on darwin * remove unnecessary gcc flag --- pkgs/top-level/python-packages.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 55059c111ef..d468fbf6c71 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3064,6 +3064,10 @@ pythonPackages = python.modules // rec { sha256 = "1pawfmf7j7pd3mjzhmmw9hkglc2qdirrkvv29m5nsmpf2b3ip2vq"; }; + preConfigure = '' + sed -i 's/-faltivec//' numpy/distutils/system_info.py + ''; + # TODO: add ATLAS=${pkgs.atlas} installCommand = '' export BLAS=${pkgs.blas} LAPACK=${pkgs.liblapack} From 0fa697405ccd8c57369a8293f5dab05151d985ec Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sat, 13 Jul 2013 16:42:15 +0200 Subject: [PATCH 452/798] dmg2img: upgrade to 1.6.4 --- pkgs/tools/misc/dmg2img/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/dmg2img/default.nix b/pkgs/tools/misc/dmg2img/default.nix index b9a15ac6a20..75a9a2037db 100644 --- a/pkgs/tools/misc/dmg2img/default.nix +++ b/pkgs/tools/misc/dmg2img/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, zlib, bzip2, openssl }: stdenv.mkDerivation rec { - name = "dmg2img-1.6.2"; + name = "dmg2img-1.6.4"; src = fetchurl { url = "http://vu1tur.eu.org/tools/${name}.tar.gz"; - sha256 = "1ibxjsrl9g877qi3jjpv0zdgl4x8j1vnd4y27q17a8my1jkhh5cg"; + sha256 = "1vcrkphrxdn6dlna8j47a5zaxvdr74msf1sqnc4ldskf35k87fyb"; }; - + buildInputs = [zlib bzip2 openssl]; installPhase = '' From 0716e5b9e2ff3a49509d245330292f8928e85b05 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sun, 14 Jul 2013 09:40:19 +0200 Subject: [PATCH 453/798] python-hetzner: Update to new version 0.3.0. Changes are: - Ability to set the name of a server (Server.set_name()). - New sub-command (set-name) for hetznerctl to set server name. - Show server name in list command. Signed-off-by: aszlig --- 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 5fbe0ea553f..741d2549258 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2128,12 +2128,12 @@ pythonPackages = python.modules // rec { hetzner = buildPythonPackage rec { name = "hetzner-${version}"; - version = "0.2.1"; + version = "0.3.0"; src = fetchurl { url = "https://github.com/RedMoonStudios/hetzner/archive/" + "v${version}.tar.gz"; - sha256 = "0im7frzmbd1v89251ci8ahrjhw578nmksqlfcdakim0jr23si4wh"; + sha256 = "10ywn7jbrv86ippf3bpbf01a4jnalwkkd0k7kxc39a55mfbx5s7d"; }; # not there yet, but coming soon. From 9566d6617114765a003cb84d9cd3139b2fadbf67 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 14 Jul 2013 14:46:51 +0400 Subject: [PATCH 454/798] Fix gtkspell --- pkgs/development/libraries/gtkspell/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gtkspell/default.nix b/pkgs/development/libraries/gtkspell/default.nix index 017c5be403a..030375938a6 100644 --- a/pkgs/development/libraries/gtkspell/default.nix +++ b/pkgs/development/libraries/gtkspell/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, gtk, aspell, pkgconfig}: +{stdenv, fetchurl, gtk, aspell, pkgconfig, enchant, intltool}: stdenv.mkDerivation { name = "gtkspell-2.0.16"; @@ -8,5 +8,5 @@ stdenv.mkDerivation { sha256 = "00hdv28bp72kg1mq2jdz1sdw2b8mb9iclsp7jdqwpck705bdriwg"; }; - buildInputs = [aspell pkgconfig gtk]; + buildInputs = [aspell pkgconfig gtk enchant intltool]; } From 483755e9abaa581256d04ce902f014d033caf9de Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 14 Jul 2013 14:07:39 -0400 Subject: [PATCH 455/798] buildNodePacakge: Create man page symlinks when needed Signed-off-by: Shea Levy --- pkgs/development/web/nodejs/build-node-package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/web/nodejs/build-node-package.nix b/pkgs/development/web/nodejs/build-node-package.nix index 8a56e3e798b..1e6d5cc6bca 100644 --- a/pkgs/development/web/nodejs/build-node-package.nix +++ b/pkgs/development/web/nodejs/build-node-package.nix @@ -45,6 +45,10 @@ stdenv.mkDerivation ({ find -L $out/node_modules/.bin/* -type f -print0 | \ xargs -0 sed --follow-symlinks -i 's@#!/usr/bin/env node@#!${nodejs}/bin/node@' fi + if [ -e "$out/node_modules/${requireName}/man" ]; then + mkdir $out/share + ln -sv node_modules/${requireName}/man $out/share/man + fi runHook postInstall ''; From a895082e5663211dcf0d251b7da92915c7871993 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 14 Jul 2013 14:41:53 -0400 Subject: [PATCH 456/798] nodePackages: Update to npm2nix 2.0 format Signed-off-by: Shea Levy --- pkgs/top-level/node-packages-generated.nix | 9660 ++++++++++---------- pkgs/top-level/node-packages.nix | 36 +- 2 files changed, 5094 insertions(+), 4602 deletions(-) diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix index 4e1cc57a0a4..536bb2ef944 100644 --- a/pkgs/top-level/node-packages-generated.nix +++ b/pkgs/top-level/node-packages-generated.nix @@ -1,4713 +1,5199 @@ [ { - baseName = "abbrev"; + name = "abbrev"; + spec = "1"; version = "1.0.4"; - fullName = "abbrev-1"; - hash = "8dc0f480571a4a19e74f1abd4f31f6a70f94953d1ccafa16ed1a544a19a6f3a8"; - patchLatest = false; topLevel = false; dependencies = [ ]; + patchLatest = false; + sha1 = "bd55ae5e413ba1722ee4caba1f6ea10414a59ecd"; + tarball = "http://registry.npmjs.org/abbrev/-/abbrev-1.0.4.tgz"; } { - baseName = "abbrev"; + name = "abbrev"; + spec = "~1.0.4"; version = "1.0.4"; - fullName = "abbrev-~1.0.4"; - hash = "8dc0f480571a4a19e74f1abd4f31f6a70f94953d1ccafa16ed1a544a19a6f3a8"; - patchLatest = false; topLevel = false; dependencies = [ ]; + patchLatest = false; + sha1 = "bd55ae5e413ba1722ee4caba1f6ea10414a59ecd"; + tarball = "http://registry.npmjs.org/abbrev/-/abbrev-1.0.4.tgz"; } { - baseName = "amdefine"; + name = "amdefine"; + spec = "*"; version = "0.0.5"; - fullName = "amdefine-*"; - hash = "7d7a691c9742d4c9aaa8036b823823e45a676dec6897f2e072b90c7d37722fc1"; - patchLatest = false; topLevel = true; dependencies = [ ]; + patchLatest = false; + sha1 = "86b6e9470f8cde955ef7daa3cf5d544ba81aa3db"; + tarball = "http://registry.npmjs.org/amdefine/-/amdefine-0.0.5.tgz"; } { - baseName = "amdefine"; + name = "amdefine"; + spec = ">=0.0.4"; version = "0.0.5"; - fullName = "amdefine->=0.0.4"; - hash = "7d7a691c9742d4c9aaa8036b823823e45a676dec6897f2e072b90c7d37722fc1"; - patchLatest = false; topLevel = false; dependencies = [ ]; - } - { - baseName = "ansi-remover"; - version = "0.0.2"; - fullName = "ansi-remover-*"; - hash = "cda72261ea8d6b830892764d69eff8d926be852fc91ad3b8b5b258d606400bc7"; patchLatest = false; - topLevel = true; - dependencies = [ - ]; + sha1 = "86b6e9470f8cde955ef7daa3cf5d544ba81aa3db"; + tarball = "http://registry.npmjs.org/amdefine/-/amdefine-0.0.5.tgz"; } { - baseName = "ansi"; + name = "ansi"; + spec = "~0.1.2"; version = "0.1.2"; - fullName = "ansi-~0.1.2"; - hash = "6f2288b1db642eb822578f4ee70bf26bf97173cc7d3f10f496070fb96250006b"; - patchLatest = false; topLevel = false; dependencies = [ ]; - } - { - baseName = "apparatus"; - version = "0.0.7"; - fullName = "apparatus->= 0.0.4"; - hash = "77ce711505bf1c65222b5dd01e055284b25cf52ee3229fcae7fcfa3e5664826c"; patchLatest = false; - topLevel = false; - dependencies = [ - { name = "sylvester"; range = ">= 0.0.8"; } - ]; + sha1 = "2627e29498f06e2a1c2ece9c21e28fd494430827"; + tarball = "http://registry.npmjs.org/ansi/-/ansi-0.1.2.tgz"; } { - baseName = "archy"; + name = "ansi-remover"; + spec = "*"; version = "0.0.2"; - fullName = "archy-0"; - hash = "355bafab4acbb86e4e94c00c55900215abe41ae72ab454be889c766e5889a6e5"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "asn1"; - version = "0.1.11"; - fullName = "asn1-0.1.11"; - hash = "7206eadc8a9344e484bcce979e22a12c9fa64c1395aa0544b8b767808b268f43"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "assert"; - version = "0.4.9"; - fullName = "assert-*"; - hash = "976a12385f7286d123734fabc7355bbeecd2532daccfada02909818b905abeeb"; - patchLatest = false; - topLevel = true; - dependencies = [ - { name = "util"; range = ">= 0.4.9"; } - ]; - } - { - baseName = "assert-plus"; - version = "0.1.2"; - fullName = "assert-plus-0.1.2"; - hash = "bd62e853460024d1e35d3f76065f4c856a271e55ef1ce684f3033314b7377c61"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "async"; - version = "0.2.9"; - fullName = "async-*"; - hash = "7215c94b63ccaa543b4b75c5dd9b820fd4839e1f9616b08a0334a8ac74939c53"; - patchLatest = false; topLevel = true; dependencies = [ ]; - } - { - baseName = "async"; - version = "0.1.22"; - fullName = "async-0.1.x"; - hash = "6fd2750cd519a754b0e32ef3423e64768055129e00a95d9297005bda29fdef18"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "async"; - version = "0.2.9"; - fullName = "async-0.2.x"; - hash = "7215c94b63ccaa543b4b75c5dd9b820fd4839e1f9616b08a0334a8ac74939c53"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "async"; - version = "0.2.9"; - fullName = "async-~0.2.6"; - hash = "7215c94b63ccaa543b4b75c5dd9b820fd4839e1f9616b08a0334a8ac74939c53"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "async"; - version = "0.2.9"; - fullName = "async-~0.2.7"; - hash = "7215c94b63ccaa543b4b75c5dd9b820fd4839e1f9616b08a0334a8ac74939c53"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "aws-sdk"; - version = "1.3.2"; - fullName = "aws-sdk-*"; - hash = "6ad0b23bf6eba85609caed4a190ff0068cf0a0a94437b6cfab98fa6ea0c911fe"; - patchLatest = true; - topLevel = true; - dependencies = [ - { name = "xml2js"; range = "0.2.4"; } - { name = "xmlbuilder"; range = "*"; } - ]; - } - { - baseName = "aws-sdk"; - version = "1.3.2"; - fullName = "aws-sdk->=1.2.0 <2"; - hash = "6ad0b23bf6eba85609caed4a190ff0068cf0a0a94437b6cfab98fa6ea0c911fe"; - patchLatest = true; - topLevel = false; - dependencies = [ - { name = "xml2js"; range = "0.2.4"; } - { name = "xmlbuilder"; range = "*"; } - ]; - } - { - baseName = "aws-sign"; - version = "0.2.0"; - fullName = "aws-sign-~0.2.0"; - hash = "145962c6b9b4fe70f587fa745157522c2c6dac4c22bb6fdf3f6cb297f723647e"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "aws-sign"; - version = "0.3.0"; - fullName = "aws-sign-~0.3.0"; - hash = "5acca27ed2b1b9f081e4dd230e03808b6a038f8a4afa698db985320efe6dda5e"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "backbone"; - version = "1.0.0"; - fullName = "backbone-*"; - hash = "6c66edc5134bb531b33a7f140c75c4a65cdc21711eed64c29300a84cba84f3a7"; - patchLatest = false; - topLevel = true; - dependencies = [ - { name = "underscore"; range = ">=1.4.3"; } - ]; - } - { - baseName = "backoff"; - version = "2.1.0"; - fullName = "backoff-2.1.0"; - hash = "d1f5bf32f2f5954f6259582ead30fc8a769db35bac9900c94593b77f915cee0d"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "bcrypt"; - version = "0.7.6"; - fullName = "bcrypt-*"; - hash = "e7964429b2bc8aea9b9fb66b914cb3a7952a77029ae13a5a4c4cdbf837d40b2a"; - patchLatest = false; - topLevel = true; - dependencies = [ - { name = "bindings"; range = "1.0.0"; } - ]; - } - { - baseName = "bindings"; - version = "1.1.1"; - fullName = "bindings-*"; - hash = "6145f4ae35591a3c51bbcc20628070347353ab90b5313993eda1c1c6927e375b"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "bindings"; - version = "1.0.0"; - fullName = "bindings-1.0.0"; - hash = "cb211ac856d135af5ee864762fae9e554225a613ea1fd815c20b8fdd1679c9ed"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "block-stream"; - version = "0.0.6"; - fullName = "block-stream-*"; - hash = "2fc365b42b8601c8ee150d453f6cc762a01054b7fb28bdfcfcbce7c97e93601b"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "inherits"; range = "~1.0.0"; } - ]; - } - { - baseName = "boom"; - version = "0.3.8"; - fullName = "boom-0.3.x"; - hash = "0ea9787bd5c5df98a06a2c7b629d4768c712611032d9af162332e825f9131d8a"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "hoek"; range = "0.7.x"; } - ]; - } - { - baseName = "boom"; - version = "0.4.2"; - fullName = "boom-0.4.x"; - hash = "294e022990269e7fa1e3015862d2d24847cc83c3e68d214dad5a2d0d3826a08f"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "hoek"; range = "0.9.x"; } - ]; - } - { - baseName = "broadway"; - version = "0.2.7"; - fullName = "broadway-0.2.7"; - hash = "b1ceb289fb1a6de82cddab0851fc905bb60e75167d0e37f32147f8985fa8d368"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "cliff"; range = "0.1.8"; } - { name = "eventemitter2"; range = "0.4.11"; } - { name = "nconf"; range = "0.6.7"; } - { name = "winston"; range = "0.6.2"; } - { name = "utile"; range = "0.1.7"; } - ]; - } - { - baseName = "broadway"; - version = "0.2.7"; - fullName = "broadway-0.2.x"; - hash = "b1ceb289fb1a6de82cddab0851fc905bb60e75167d0e37f32147f8985fa8d368"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "cliff"; range = "0.1.8"; } - { name = "eventemitter2"; range = "0.4.11"; } - { name = "nconf"; range = "0.6.7"; } - { name = "winston"; range = "0.6.2"; } - { name = "utile"; range = "0.1.7"; } - ]; - } - { - baseName = "browserchannel"; - version = "1.0.4"; - fullName = "browserchannel-*"; - hash = "516add6af10f887500c5eaae7347ce92c0101a6bea1a67d5221a674d07bc7999"; - patchLatest = false; - topLevel = true; - dependencies = [ - { name = "hat"; range = "*"; } - { name = "connect"; range = "~2"; } - { name = "request"; range = "~2"; } - ]; - } - { - baseName = "bson"; - version = "0.1.8"; - fullName = "bson-0.1.8"; - hash = "a9cbdee757f213b93aca860fc06143b1f9e9a983130616732beab452681bae17"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "bson"; - version = "0.1.9"; - fullName = "bson-0.1.9"; - hash = "8bb768566c4e8063883d07d2c7965ce8e5380892fd5e34448729c7f44c5f42c8"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "buffer-crc32"; - version = "0.1.1"; - fullName = "buffer-crc32-0.1.1"; - hash = "9e35b724e4e1fd7112e97a6856e7d52b2644761c184f1ed391f6a576fbbb80e1"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "buffer-crc32"; - version = "0.2.1"; - fullName = "buffer-crc32-0.2.1"; - hash = "b6ea96d57411e37c15e18fb8ca600656399912ce16355f9af3c662f765507f01"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "buffer-crc32"; - version = "0.2.1"; - fullName = "buffer-crc32-~0.2.1"; - hash = "b6ea96d57411e37c15e18fb8ca600656399912ce16355f9af3c662f765507f01"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "buffertools"; - version = "1.1.1"; - fullName = "buffertools-*"; - hash = "f5962aec81246077a46ee075072d40fa533c31ada7a0ec18e1ff3600af2d8f3f"; - patchLatest = false; - topLevel = true; - dependencies = [ - ]; - } - { - baseName = "buffertools"; - version = "1.1.1"; - fullName = "buffertools->=1.1.1 <2.0.0"; - hash = "f5962aec81246077a46ee075072d40fa533c31ada7a0ec18e1ff3600af2d8f3f"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "bunyan"; - version = "0.21.1"; - fullName = "bunyan-0.21.1"; - hash = "95dca2405dcbe5b700e15d7c89b2a64fb21a097fb7ada5c274979f2057adcbef"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "mv"; range = "0.0.5"; } - { name = "dtrace-provider"; range = "0.2.8"; } - ]; - } - { - baseName = "bytes"; - version = "0.2.0"; - fullName = "bytes-0.2.0"; - hash = "e70bd4dccc886a5cf1c925092b4acd7a262a9da3e1b51ccde10a3fcd0a328465"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "character-parser"; - version = "1.0.2"; - fullName = "character-parser-1.0.2"; - hash = "751edecb1143ea951e9cef5c7e1ac71526c712cfab538d09cbb2e90e56d76865"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "child-process-close"; - version = "0.1.1"; - fullName = "child-process-close-~0.1.1"; - hash = "b68574f217d23d11cd4a1e5f1f2be17bf93e2bd38940ae6b07c35b69ec8d456a"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "chmodr"; - version = "0.1.0"; - fullName = "chmodr-~0.1.0"; - hash = "2c0bda3df1766290f9fe21940ab455e92bc37d608f2030b0e0b7dfdda9cff9cd"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "chownr"; - version = "0.0.1"; - fullName = "chownr-0"; - hash = "da1fbb894b4103a1a3c912fc780f6dcf7339865298f2fdc4e20afdf00a94b821"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "cli"; - version = "0.4.4-2"; - fullName = "cli-0.4.x"; - hash = "27a0db02501285da601c47495d0cd837ddeb4577bfd507c5503d2ee8cd0caffb"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "glob"; range = ">= 3.1.4"; } - ]; - } - { - baseName = "cliff"; - version = "0.1.8"; - fullName = "cliff-0.1.8"; - hash = "702f7ce79168e38b982eb3141485bd99e3a6480dac42f579365dc522c3950588"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "colors"; range = "0.x.x"; } - { name = "eyes"; range = "0.1.x"; } - { name = "winston"; range = "0.6.x"; } - ]; - } - { - baseName = "clone"; - version = "0.1.5"; - fullName = "clone-0.1.5"; - hash = "9fd586470ccc3fa585dcccad730b5e6fa9c471b49acdb38d724c110777a287d9"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "clone"; - version = "0.1.6"; - fullName = "clone-0.1.6"; - hash = "9849c9faa2549d982106d3b43862dc4ceb308563badcd3ff59e30655d54e897a"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "cmd-shim"; - version = "1.1.0"; - fullName = "cmd-shim-~1.1.0"; - hash = "ccc0d6f184b9f77ab9d723e4bcecd88b8fa1a480507eb45cdd67b182617fad33"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "mkdirp"; range = "~0.3.3"; } - { name = "graceful-fs"; range = "1.2"; } - ]; - } - { - baseName = "coffee-script"; - version = "1.6.3"; - fullName = "coffee-script-*"; - hash = "642d226d4fab1a8464e54347cec919b1c8771da55d88e3ceb15d826fcee84525"; - patchLatest = false; - topLevel = true; - dependencies = [ - ]; - } - { - baseName = "colors"; - version = "0.6.0-1"; - fullName = "colors-0.6.0-1"; - hash = "ca97f462664d77f5ae813029d020d4610ec9fd3f9eef3875e551d3665be7ab7d"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "colors"; - version = "0.6.0-1"; - fullName = "colors-0.6.x"; - hash = "ca97f462664d77f5ae813029d020d4610ec9fd3f9eef3875e551d3665be7ab7d"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "colors"; - version = "0.6.0-1"; - fullName = "colors-0.x.x"; - hash = "ca97f462664d77f5ae813029d020d4610ec9fd3f9eef3875e551d3665be7ab7d"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "combined-stream"; - version = "0.0.4"; - fullName = "combined-stream-~0.0.4"; - hash = "2502ed7a4406db1a65b09cae3106221051d6af20d3f1d7e8cc38cfc72a36432c"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "delayed-stream"; range = "0.0.5"; } - ]; - } - { - baseName = "commander"; - version = "0.5.1"; - fullName = "commander-0.5.1"; - hash = "91042851d0731b28a5e7c342e5cbce7723a7243d31ae378fa86c45ca9493a924"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "commander"; - version = "0.6.1"; - fullName = "commander-0.6.1"; - hash = "7b7fdd1bc4d16f6776169a64f133d629efe2e3a7cd338b1d0884ee909abbd729"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "commander"; - version = "1.2.0"; - fullName = "commander-1.2.0"; - hash = "caeda1cecf7c1b5bf505cdf8d34b984db6ebb307af3798f4af2efdb554d31a4b"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "keypress"; range = "0.1.x"; } - ]; - } - { - baseName = "config-chain"; - version = "1.1.7"; - fullName = "config-chain-~1.1.1"; - hash = "a161af33500f1dc18e4da364ff9f3e0a516c08aa030859ea639480676b9c3f5c"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "proto-list"; range = "~1.2.1"; } - { name = "ini"; range = "1"; } - ]; - } - { - baseName = "connect"; - version = "2.7.5"; - fullName = "connect-2.7.5"; - hash = "0c36efa44c6fee030b617a57e52c23f92e7e3949ed01405ee0cb9804403d137f"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "qs"; range = "0.5.1"; } - { name = "formidable"; range = "1.0.11"; } - { name = "cookie-signature"; range = "1.0.0"; } - { name = "buffer-crc32"; range = "0.1.1"; } - { name = "cookie"; range = "0.0.5"; } - { name = "send"; range = "0.1.0"; } - { name = "bytes"; range = "0.2.0"; } - { name = "fresh"; range = "0.1.0"; } - { name = "pause"; range = "0.0.1"; } - { name = "debug"; range = "*"; } - ]; - } - { - baseName = "connect"; - version = "2.8.4"; - fullName = "connect-2.8.4"; - hash = "e42ef0828b98bdcbbe32f3208ee40b0a92026f3b1fd04425854577454e26546f"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "qs"; range = "0.6.5"; } - { name = "formidable"; range = "1.0.14"; } - { name = "cookie-signature"; range = "1.0.1"; } - { name = "buffer-crc32"; range = "0.2.1"; } - { name = "cookie"; range = "0.1.0"; } - { name = "send"; range = "0.1.3"; } - { name = "bytes"; range = "0.2.0"; } - { name = "fresh"; range = "0.1.0"; } - { name = "pause"; range = "0.0.1"; } - { name = "uid2"; range = "0.0.2"; } - { name = "debug"; range = "*"; } - { name = "methods"; range = "0.0.1"; } - ]; - } - { - baseName = "connect-flash"; - version = "0.1.1"; - fullName = "connect-flash-*"; - hash = "3a0a9ac9d73695abcf67a88cb1bc433cc67c55aeca3b515eb922453c7ba0c393"; - patchLatest = false; - topLevel = true; - dependencies = [ - ]; - } - { - baseName = "connect-mongo"; - version = "0.3.3"; - fullName = "connect-mongo-*"; - hash = "d3613f8e747b83ac1cc559366cba85c47fa391337166719ac87d98dd98bb2433"; - patchLatest = false; - topLevel = true; - dependencies = [ - { name = "mongodb"; range = "1.2.x"; } - ]; - } - { - baseName = "connect"; - version = "2.8.4"; - fullName = "connect-~2"; - hash = "e42ef0828b98bdcbbe32f3208ee40b0a92026f3b1fd04425854577454e26546f"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "qs"; range = "0.6.5"; } - { name = "formidable"; range = "1.0.14"; } - { name = "cookie-signature"; range = "1.0.1"; } - { name = "buffer-crc32"; range = "0.2.1"; } - { name = "cookie"; range = "0.1.0"; } - { name = "send"; range = "0.1.3"; } - { name = "bytes"; range = "0.2.0"; } - { name = "fresh"; range = "0.1.0"; } - { name = "pause"; range = "0.0.1"; } - { name = "uid2"; range = "0.0.2"; } - { name = "debug"; range = "*"; } - { name = "methods"; range = "0.0.1"; } - ]; - } - { - baseName = "console-browserify"; - version = "0.1.6"; - fullName = "console-browserify-0.1.x"; - hash = "e774c881920562b0893e50844332f79fc5a08752d28791d942c35fcc3ef2d75d"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "constantinople"; - version = "1.0.1"; - fullName = "constantinople-~1.0.1"; - hash = "3740bec1b48ee60653c946ab295fecefb9c08b47e1a495330757b415c7cd402f"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "uglify-js"; range = "~2.3.6"; } - ]; - } - { - baseName = "cookie"; - version = "0.0.5"; - fullName = "cookie-0.0.5"; - hash = "17938b21dcd85f09994b85484abb5aeddc4e92c61d1b599b764bbaaa7ad6adee"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "cookie"; - version = "0.1.0"; - fullName = "cookie-0.1.0"; - hash = "aff5d22a617d744319cc70e42fc4ab11bcbcf924244af565495fa799c0639650"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "cookie-jar"; - version = "0.2.0"; - fullName = "cookie-jar-~0.2.0"; - hash = "eeb643c638f828e39dfc9f44ad8d8e5376930868fdcaf3818ff316806e65af6d"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "cookie-jar"; - version = "0.3.0"; - fullName = "cookie-jar-~0.3.0"; - hash = "c7bac7739b9ceb194f431a4a9ac1a0ba4ffd4a60492c61dd1925dbcdb9030746"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "cookie-signature"; - version = "1.0.0"; - fullName = "cookie-signature-1.0.0"; - hash = "990a69fb94e6504390dd0fe935b9fe380f925e1a8360e200e97baa908fca86c6"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "cookie-signature"; - version = "1.0.1"; - fullName = "cookie-signature-1.0.1"; - hash = "e2ea4f290fdcfe82d8fb76991fee4106d4ae1f5d5a2f8b8d91442e047c538c8e"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "cookiejar"; - version = "1.3.0"; - fullName = "cookiejar-1.3.0"; - hash = "3bf00caf0e2f9dcd03c7175dcf6c5d700fa6d6f6f7ed77875b986e3c1a606ba7"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "cookies"; - version = "0.3.6"; - fullName = "cookies->= 0.2.2"; - hash = "e35b00cc06a33a3bc1d808daa7bc29f02674c02158c5dd812cf73f275bda8b83"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "couch-login"; - version = "0.1.17"; - fullName = "couch-login-~0.1.15"; - hash = "49b941220d82f17077187b66f9fd88d2eb4a791b9f5beaac046290389c73d268"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "request"; range = "2 >=2.14"; } - ]; - } - { - baseName = "cryptiles"; - version = "0.1.3"; - fullName = "cryptiles-0.1.x"; - hash = "bac017be67d2b33c01a9b625726b3f8e1e1786711f3132a3cc6f85779ee1d103"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "boom"; range = "0.3.x"; } - ]; - } - { - baseName = "cryptiles"; - version = "0.2.2"; - fullName = "cryptiles-0.2.x"; - hash = "ed3c2d5d3c1322d5389cceb46778a6c39a62842f737047666d63abda5b39fab5"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "boom"; range = "0.4.x"; } - ]; - } - { - baseName = "css-parse"; - version = "1.0.4"; - fullName = "css-parse-1.0.4"; - hash = "3d7dcc526083cc1dc584d10c179100a199a82e93991c8bdc92b96ee4bfb7ccac"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "css-stringify"; - version = "1.0.5"; - fullName = "css-stringify-1.0.5"; - hash = "ef45a473b200f24e4cb2f0a97da70b629261ae8a54482e49e1eabc3e4cc36c0e"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "css"; - version = "1.0.8"; - fullName = "css-~1.0.8"; - hash = "535bcca2a3635e315a5add3536d2b97fe5636bbee5d039e4fadd8cd422912b8b"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "css-parse"; range = "1.0.4"; } - { name = "css-stringify"; range = "1.0.5"; } - ]; - } - { - baseName = "cssom"; - version = "0.2.5"; - fullName = "cssom-0.2.x"; - hash = "22594077e4241c81038cdaac23fcb5ed7f8329a1dc5645286fa55db45c8ac13b"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "ctype"; - version = "0.5.0"; - fullName = "ctype-0.5.0"; - hash = "50157e6c5e44d1c833bfc239a7a337ee08fd6f3c5a15f7ef5cee5571a86b0378"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "ctype"; - version = "0.5.2"; - fullName = "ctype-0.5.2"; - hash = "4a7224a74f19dc6a1206fa1c04ae1a4ab795cd4ba842466e2f511fa714f82c60"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "cycle"; - version = "1.0.2"; - fullName = "cycle-1.0.x"; - hash = "ee5dd9af8f0a59624bb32bb6a6f67c13710e180112dba5a578f3d427a3268748"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "debug"; - version = "0.7.2"; - fullName = "debug-*"; - hash = "f9142856b1c2652a11e50f2aca068edbad7598f50d9e6d003b8ee85b2a333d63"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "debug"; - version = "0.7.2"; - fullName = "debug-~0.7.0"; - hash = "f9142856b1c2652a11e50f2aca068edbad7598f50d9e6d003b8ee85b2a333d63"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "debug"; - version = "0.7.2"; - fullName = "debug-~0.7.2"; - hash = "f9142856b1c2652a11e50f2aca068edbad7598f50d9e6d003b8ee85b2a333d63"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "deep-equal"; - version = "0.0.0"; - fullName = "deep-equal-*"; - hash = "6a5666d4bfa5d2786a9f86ede2eaa8252f783edb9d78e69cba645f7cb6e153b8"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "deep-equal"; - version = "0.0.0"; - fullName = "deep-equal-0.0.0"; - hash = "6a5666d4bfa5d2786a9f86ede2eaa8252f783edb9d78e69cba645f7cb6e153b8"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "delayed-stream"; - version = "0.0.5"; - fullName = "delayed-stream-0.0.5"; - hash = "f40e440dac0f853577d5225d7bd4b2026ea1447a724f4ba1096e29983ee595dd"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "diff"; - version = "1.0.2"; - fullName = "diff-1.0.2"; - hash = "5de1d8c3f2bfc447a7e664cadd4aca2ef4952a43256310cc51a36b30b5be3045"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "director"; - version = "1.1.10"; - fullName = "director-1.1.10"; - hash = "292c96d0d5bf8276a498595c576a6cfc832247703f2b75f09ad37c19caa5fca6"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "dtrace-provider"; - version = "0.2.8"; - fullName = "dtrace-provider-0.2.8"; - hash = "200941239983fa0953415cf28e96d9347c50218d31280604cfc9252e448e714c"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "editor"; - version = "0.0.4"; - fullName = "editor-0.0.4"; - hash = "2f66957e121e49c8b52a9c54ff24b718ab8bf571591177ff09121e603704b591"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "emitter-component"; - version = "1.0.0"; - fullName = "emitter-component-1.0.0"; - hash = "1ffc29fc11b2e4ccbac6064443e65a606a21d826e313886932596bf11784dcdb"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "escape-html"; - version = "1.0.0"; - fullName = "escape-html-*"; - hash = "c763095c6b27fddf666f34d48a4f09f95009a76a6d16d1799175ecd0c1912456"; - patchLatest = false; - topLevel = true; - dependencies = [ - ]; - } - { - baseName = "event-stream"; - version = "0.5.3"; - fullName = "event-stream-~0.5"; - hash = "988f4ee3e8f86d6f5f267b56de88bf733e05fe6f1adc0e135090c308822e9e86"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "optimist"; range = "0.2"; } - ]; - } - { - baseName = "eventemitter2"; - version = "0.4.11"; - fullName = "eventemitter2-0.4.11"; - hash = "2825d48a2313f703dfb6829e8a3bc89fe6442272b7dbec9d9c51e4794da81a83"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "eventemitter2"; - version = "0.4.12"; - fullName = "eventemitter2-~0.4.11"; - hash = "466b3aa03fe384b46c8384ec7cc42248117a70e9b48c0e20706889b97edcdeac"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "events.node"; - version = "0.4.9"; - fullName = "events.node->= 0.4.0"; - hash = "aedaf9faa7a33f16e2bf1754ed988a836570d00064748a8c1c8ee48805b9f0b6"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "express"; - version = "3.3.4"; - fullName = "express-*"; - hash = "96a3fc9c2250d13f9aa183660466590fe285a2dd19e6ebdc4b2340295ee1aa65"; - patchLatest = false; - topLevel = true; - dependencies = [ - { name = "connect"; range = "2.8.4"; } - { name = "commander"; range = "1.2.0"; } - { name = "range-parser"; range = "0.0.4"; } - { name = "mkdirp"; range = "0.3.5"; } - { name = "cookie"; range = "0.1.0"; } - { name = "buffer-crc32"; range = "0.2.1"; } - { name = "fresh"; range = "0.1.0"; } - { name = "methods"; range = "0.0.1"; } - { name = "send"; range = "0.1.3"; } - { name = "cookie-signature"; range = "1.0.1"; } - { name = "debug"; range = "*"; } - ]; - } - { - baseName = "express"; - version = "3.1.2"; - fullName = "express-~3.1.1"; - hash = "d72eb1b799ddfe78afc369168881bfef866213baf5cd47a56902fd732dbbd2b6"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "connect"; range = "2.7.5"; } - { name = "commander"; range = "0.6.1"; } - { name = "range-parser"; range = "0.0.4"; } - { name = "mkdirp"; range = "~0.3.4"; } - { name = "cookie"; range = "0.0.5"; } - { name = "buffer-crc32"; range = "~0.2.1"; } - { name = "fresh"; range = "0.1.0"; } - { name = "methods"; range = "0.0.1"; } - { name = "send"; range = "0.1.0"; } - { name = "cookie-signature"; range = "1.0.0"; } - { name = "debug"; range = "*"; } - ]; - } - { - baseName = "extend"; - version = "1.1.3"; - fullName = "extend-*"; - hash = "0b27709829110f2e84926ebe3494b82df6e79ad49a618ad3444e4edf62b57a57"; - patchLatest = false; - topLevel = true; - dependencies = [ - ]; - } - { - baseName = "extsprintf"; - version = "1.0.0"; - fullName = "extsprintf-1.0.0"; - hash = "9cae7f1f192e5f35746e13047ab4c13e8b5b686469feeaec301ba7d370df5670"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "extsprintf"; - version = "1.0.2"; - fullName = "extsprintf-1.0.2"; - hash = "ea000cf3e51cba7fac7fb1e425ddb79bf46f3ce40955955bf35fd487184a04ab"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "eyes"; - version = "0.1.8"; - fullName = "eyes-0.1.x"; - hash = "4fa6db8f2c9926fb39a211c622d7eb3a76efbc4878559f9bd155d647a6963735"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "faye-websocket"; - version = "0.6.1"; - fullName = "faye-websocket-*"; - hash = "f99544759c7f0ae24f283d6e3e062d4ea816243985b88d00c8cd124ba617d7c5"; - patchLatest = false; - topLevel = true; - dependencies = [ - { name = "websocket-driver"; range = ">=0.2.0"; } - ]; - } - { - baseName = "faye-websocket"; - version = "0.4.4"; - fullName = "faye-websocket-0.4.4"; - hash = "c682f6269bcaba0667ef4ae0ecb0b662e35ea6338b075e25ebce9e13019bc3a2"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "flatiron"; - version = "0.3.5"; - fullName = "flatiron-0.3.5"; - hash = "8f1e074d3f678fe3d4720e27b260f95ee9d69deb2ab3059c6b9854531d8b247f"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "broadway"; range = "0.2.7"; } - { name = "optimist"; range = "0.3.5"; } - { name = "prompt"; range = "0.2.9"; } - { name = "director"; range = "1.1.10"; } - { name = "pkginfo"; range = "0.3.0"; } - ]; - } - { - baseName = "forEachAsync"; - version = "2.2.0"; - fullName = "forEachAsync-~2.2"; - hash = "43367e7aad92f59595f22ad3e586ba2b370fd03b7f55da381503494528693e05"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "sequence"; range = ">= 2.2.1"; } - ]; - } - { - baseName = "forever"; - version = "0.10.8"; - fullName = "forever-*"; - hash = "858a7405a72d55fea21a3f3396d34ad0cfb35f15dd6ded76e2856b828ff20cae"; - patchLatest = false; - topLevel = true; - dependencies = [ - { name = "colors"; range = "0.6.0-1"; } - { name = "cliff"; range = "0.1.8"; } - { name = "flatiron"; range = "0.3.5"; } - { name = "forever-monitor"; range = "1.2.2"; } - { name = "nconf"; range = "0.6.7"; } - { name = "nssocket"; range = "~0.5.1"; } - { name = "optimist"; range = "0.4.0"; } - { name = "pkginfo"; range = "0.3.0"; } - { name = "timespan"; range = "2.0.1"; } - { name = "watch"; range = "0.7.0"; } - { name = "utile"; range = "0.1.7"; } - { name = "winston"; range = "0.7.1"; } - ]; - } - { - baseName = "forever-agent"; - version = "0.2.0"; - fullName = "forever-agent-~0.2.0"; - hash = "d6fac115c60bb3aa6b5b653ea6612e9c1c1d172e08c98251fcfd2d066c1fcda3"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "forever-agent"; - version = "0.5.0"; - fullName = "forever-agent-~0.5.0"; - hash = "0a7eda1f87f3cfa7fad8ba655a642992033b38a1929becfa0bfcab8241b7d78b"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "forever-monitor"; - version = "1.2.2"; - fullName = "forever-monitor-1.2.2"; - hash = "ff2f10f179ec6003278a250f76dd53ebaaace37c3c2409478b7b36ecee650a0c"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "broadway"; range = "0.2.x"; } - { name = "minimatch"; range = "0.0.x"; } - { name = "pkginfo"; range = "0.x.x"; } - { name = "ps-tree"; range = "0.0.x"; } - { name = "watch"; range = "0.5.x"; } - { name = "utile"; range = "0.1.x"; } - ]; - } - { - baseName = "form-data"; - version = "0.0.8"; - fullName = "form-data-0.0.8"; - hash = "cf7d5669259ec4c5474b9c2100127ba065a4757ff33b878a1d99509b8e448220"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "combined-stream"; range = "~0.0.4"; } - { name = "mime"; range = "~1.2.2"; } - { name = "async"; range = "~0.2.7"; } - ]; - } - { - baseName = "form-data"; - version = "0.0.10"; - fullName = "form-data-~0.0.3"; - hash = "d49669b81c27dd6c7e359ee9892880c6741dae6c325b617ab3eb5a78bf103822"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "combined-stream"; range = "~0.0.4"; } - { name = "mime"; range = "~1.2.2"; } - { name = "async"; range = "~0.2.7"; } - ]; - } - { - baseName = "formidable"; - version = "1.0.11"; - fullName = "formidable-1.0.11"; - hash = "39b345d14d69c27fe262e12f16900cef6be220510788866e0a12c9fedd03766e"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "formidable"; - version = "1.0.13"; - fullName = "formidable-1.0.13"; - hash = "c3c7c6ecdd4b1ad9ec9b1c273d8dd1db2bc12f9a699c233d3885fcded58ceec6"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "formidable"; - version = "1.0.14"; - fullName = "formidable-1.0.14"; - hash = "b36e58f659fd0d7c734b4ab2c611fa6e40bd988c2237a29d25025460f18f7ea1"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "formidable"; - version = "1.0.9"; - fullName = "formidable-1.0.9"; - hash = "3b54deef3897d910d1e6dedd81fa2f4a65b7e93b5dd5cf1c8c098b63260c214c"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "fresh"; - version = "0.1.0"; - fullName = "fresh-0.1.0"; - hash = "c402fbd25e26c0167bf288e1ba791716808bfaa5de32b76ae68e8e8a3d7e2b33"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "fstream"; - version = "0.1.23"; - fullName = "fstream-0"; - hash = "1f3f03be2b18815b133e551b0cde8ab77148d0de31fdd61d90f21317f02c8342"; patchLatest = false; - topLevel = false; - dependencies = [ - { name = "rimraf"; range = "2"; } - { name = "mkdirp"; range = "0.3"; } - { name = "graceful-fs"; range = "~2.0.0"; } - { name = "inherits"; range = "~1.0.0"; } - ]; + sha1 = "7020086289f10e195d85d828de065ccdd50e6e66"; + tarball = "http://registry.npmjs.org/ansi-remover/-/ansi-remover-0.0.2.tgz"; } { - baseName = "fstream-ignore"; + name = "apparatus"; + spec = ">= 0.0.4"; version = "0.0.7"; - fullName = "fstream-ignore-~0.0.5"; - hash = "1f009e5aac56314d31c5adc339990d1b814595a5020e828cda4a06da536425c5"; - patchLatest = false; topLevel = false; dependencies = [ - { name = "minimatch"; range = "~0.2.0"; } - { name = "fstream"; range = "~0.1.17"; } - { name = "inherits"; range = "2"; } + { name = "sylvester"; spec = ">= 0.0.8"; } ]; + patchLatest = false; + sha1 = "033f355507b6851ebeb1bd9475ede23c802327fe"; + tarball = "http://registry.npmjs.org/apparatus/-/apparatus-0.0.7.tgz"; } { - baseName = "fstream-npm"; - version = "0.1.5"; - fullName = "fstream-npm-~0.1.3"; - hash = "23751124b295b9d9beefd7b4146b8e6d4fe0d4587cc70bc0b134c10da307b1b0"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "fstream-ignore"; range = "~0.0.5"; } - { name = "inherits"; range = "2"; } - ]; - } - { - baseName = "fstream"; - version = "0.1.23"; - fullName = "fstream-~0.1.17"; - hash = "1f3f03be2b18815b133e551b0cde8ab77148d0de31fdd61d90f21317f02c8342"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "rimraf"; range = "2"; } - { name = "mkdirp"; range = "0.3"; } - { name = "graceful-fs"; range = "~2.0.0"; } - { name = "inherits"; range = "~1.0.0"; } - ]; - } - { - baseName = "fstream"; - version = "0.1.23"; - fullName = "fstream-~0.1.23"; - hash = "1f3f03be2b18815b133e551b0cde8ab77148d0de31fdd61d90f21317f02c8342"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "rimraf"; range = "2"; } - { name = "mkdirp"; range = "0.3"; } - { name = "graceful-fs"; range = "~2.0.0"; } - { name = "inherits"; range = "~1.0.0"; } - ]; - } - { - baseName = "fstream"; - version = "0.1.23"; - fullName = "fstream-~0.1.8"; - hash = "1f3f03be2b18815b133e551b0cde8ab77148d0de31fdd61d90f21317f02c8342"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "rimraf"; range = "2"; } - { name = "mkdirp"; range = "0.3"; } - { name = "graceful-fs"; range = "~2.0.0"; } - { name = "inherits"; range = "~1.0.0"; } - ]; - } - { - baseName = "github-url-from-git"; - version = "1.1.1"; - fullName = "github-url-from-git-~1.1.1"; - hash = "7f02b5799b4d73af273a2f4c290118b0cfa999ba5888896b85ab1cbb0c2e207e"; - patchLatest = false; + name = "archy"; + spec = "0"; + version = "0.0.2"; topLevel = false; dependencies = [ ]; - } - { - baseName = "glob"; - version = "3.2.3"; - fullName = "glob-3"; - hash = "82e04561e897c9b682c0568bafbc57b0ee2fc592579535bb0f5929cd1605c9c3"; patchLatest = false; - topLevel = false; - dependencies = [ - { name = "minimatch"; range = "~0.2.11"; } - { name = "graceful-fs"; range = "~2.0.0"; } - { name = "inherits"; range = "2"; } - ]; + sha1 = "910f43bf66141fc335564597abc189df44b3d35e"; + tarball = "http://registry.npmjs.org/archy/-/archy-0.0.2.tgz"; } { - baseName = "glob"; - version = "3.2.1"; - fullName = "glob-3.2.1"; - hash = "a457c2115213ce2cb59582ddc3a25eb3ae7490af687e412111c0032f72966f51"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "minimatch"; range = "~0.2.11"; } - { name = "graceful-fs"; range = "~1.2.0"; } - { name = "inherits"; range = "1"; } - ]; - } - { - baseName = "glob"; - version = "3.2.3"; - fullName = "glob->= 3.1.4"; - hash = "82e04561e897c9b682c0568bafbc57b0ee2fc592579535bb0f5929cd1605c9c3"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "minimatch"; range = "~0.2.11"; } - { name = "graceful-fs"; range = "~2.0.0"; } - { name = "inherits"; range = "2"; } - ]; - } - { - baseName = "glob"; - version = "3.2.3"; - fullName = "glob-~3.2.1"; - hash = "82e04561e897c9b682c0568bafbc57b0ee2fc592579535bb0f5929cd1605c9c3"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "minimatch"; range = "~0.2.11"; } - { name = "graceful-fs"; range = "~2.0.0"; } - { name = "inherits"; range = "2"; } - ]; - } - { - baseName = "glob"; - version = "3.2.3"; - fullName = "glob-~3.2.3"; - hash = "82e04561e897c9b682c0568bafbc57b0ee2fc592579535bb0f5929cd1605c9c3"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "minimatch"; range = "~0.2.11"; } - { name = "graceful-fs"; range = "~2.0.0"; } - { name = "inherits"; range = "2"; } - ]; - } - { - baseName = "graceful-fs"; - version = "1.2.3"; - fullName = "graceful-fs-1.2"; - hash = "b8d9e0af2261259525a65281573e416b70b91788ea7f7b13f4598aaa7818255a"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "graceful-fs"; - version = "2.0.0"; - fullName = "graceful-fs-2"; - hash = "36f8fb1de88a8599cc828a0eb4c96f12c25437756e91e42aeadce00a7887241c"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "graceful-fs"; - version = "1.2.3"; - fullName = "graceful-fs-~1"; - hash = "b8d9e0af2261259525a65281573e416b70b91788ea7f7b13f4598aaa7818255a"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "graceful-fs"; - version = "1.2.3"; - fullName = "graceful-fs-~1.2"; - hash = "b8d9e0af2261259525a65281573e416b70b91788ea7f7b13f4598aaa7818255a"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "graceful-fs"; - version = "1.2.3"; - fullName = "graceful-fs-~1.2.0"; - hash = "b8d9e0af2261259525a65281573e416b70b91788ea7f7b13f4598aaa7818255a"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "graceful-fs"; - version = "2.0.0"; - fullName = "graceful-fs-~2.0.0"; - hash = "36f8fb1de88a8599cc828a0eb4c96f12c25437756e91e42aeadce00a7887241c"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "growl"; - version = "1.5.1"; - fullName = "growl-1.5.x"; - hash = "81ad61e3f06d087da4c680e5e83a878f164925d3ed5a7f44b734e6ecd79cb8b0"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "growl"; - version = "1.7.0"; - fullName = "growl-1.7.x"; - hash = "52a6e9edae2fd5a66ddb87c52a398a17ee697eb0e8e1480e9506a6dcdbf3ffcf"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "gzippo"; - version = "0.2.0"; - fullName = "gzippo-*"; - hash = "844f214312ef8ec2dee4543e6da383728ae081e96961f5ccb6786f0eed8474ab"; - patchLatest = false; - topLevel = true; - dependencies = [ - { name = "send"; range = "*"; } - ]; - } - { - baseName = "hat"; - version = "0.0.3"; - fullName = "hat-*"; - hash = "7bf52b3b020ca333a42eb67411090912b21abb6ac746d587022a0955b16e5f5c"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "hawk"; - version = "0.10.2"; - fullName = "hawk-~0.10.2"; - hash = "a55c7f967a8e01b6307185abc796320b54a9d6126952e41281dca3c1841affb8"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "hoek"; range = "0.7.x"; } - { name = "boom"; range = "0.3.x"; } - { name = "cryptiles"; range = "0.1.x"; } - { name = "sntp"; range = "0.1.x"; } - ]; - } - { - baseName = "hawk"; - version = "0.13.1"; - fullName = "hawk-~0.13.0"; - hash = "659e5ada1e9dc44a634e07899937d5eaeaa1c06658f181ca187f7f6faa0c592a"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "hoek"; range = "0.8.x"; } - { name = "boom"; range = "0.4.x"; } - { name = "cryptiles"; range = "0.2.x"; } - { name = "sntp"; range = "0.2.x"; } - ]; - } - { - baseName = "hiredis"; + name = "argparse"; + spec = "0.1.15"; version = "0.1.15"; - fullName = "hiredis-*"; - hash = "621bb738d1ef8335fe2f373d5446a4817a62bf8ab6e956fb6a7aa4932f8ccb08"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "bindings"; range = "*"; } - ]; - } - { - baseName = "hoek"; - version = "0.7.6"; - fullName = "hoek-0.7.x"; - hash = "135068c73cf7f0db625d95461991db113b9b4a09c6d118a80f4b33d1cad41d9b"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "hoek"; - version = "0.8.5"; - fullName = "hoek-0.8.x"; - hash = "637e524cd4b48b66db137d6fa93cbe254f112ce638ea9fd399bab73591ede965"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "hoek"; - version = "0.9.1"; - fullName = "hoek-0.9.x"; - hash = "34480468d2e85781ecdd7134523b4d6fea978d333edd2bcb828edd33bbbe8a3f"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "hooks"; - version = "0.2.1"; - fullName = "hooks-0.2.1"; - hash = "65b9c6940a0edc5324e9c7f2422cdf2700436a1d2e9008e2a9f5dcc732cd46bd"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "htdigest"; - version = "1.0.7"; - fullName = "htdigest-1.0.7"; - hash = "10fb047addf1c4f1089a26389066d5ff8f5ffa1ccce272a701bb4c2a30d90c58"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "commander"; range = "0.5.1"; } - ]; - } - { - baseName = "htpasswd"; - version = "1.1.0"; - fullName = "htpasswd-1.1.0"; - hash = "cee9c0a525e717e3565ba6ffea8a64c480bc8a9e7800cb9bfc385d1a8e713ec9"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "commander"; range = "0.5.1"; } - ]; - } - { - baseName = "http-auth"; - version = "1.2.7"; - fullName = "http-auth-1.2.7"; - hash = "874dbb5907d03602f31eae959a0927a3112da8e868231d9a2119bb50d2fe63d2"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "node-uuid"; range = "1.2.0"; } - { name = "htpasswd"; range = "1.1.0"; } - { name = "htdigest"; range = "1.0.7"; } - ]; - } - { - baseName = "http-signature"; - version = "0.9.11"; - fullName = "http-signature-0.9.11"; - hash = "44b89f3c1917bf02723a5720f08fbe47448e0370a5d3498d1be860eaf28beb3b"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "assert-plus"; range = "0.1.2"; } - { name = "asn1"; range = "0.1.11"; } - { name = "ctype"; range = "0.5.2"; } - ]; - } - { - baseName = "http-signature"; - version = "0.10.0"; - fullName = "http-signature-~0.10.0"; - hash = "badaa47893d7a6c352ffb0746d68dd225fbb057b7d7149ad87093276445bf95b"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "assert-plus"; range = "0.1.2"; } - { name = "asn1"; range = "0.1.11"; } - { name = "ctype"; range = "0.5.2"; } - ]; - } - { - baseName = "http-signature"; - version = "0.9.11"; - fullName = "http-signature-~0.9.11"; - hash = "44b89f3c1917bf02723a5720f08fbe47448e0370a5d3498d1be860eaf28beb3b"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "assert-plus"; range = "0.1.2"; } - { name = "asn1"; range = "0.1.11"; } - { name = "ctype"; range = "0.5.2"; } - ]; - } - { - baseName = "i"; - version = "0.3.1"; - fullName = "i-0.3.x"; - hash = "9dbd68b705366f5bdda60b9cf80149c89255d444649e21cc12556b14fb7ee784"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "i18next"; - version = "1.6.8"; - fullName = "i18next-*"; - hash = "5c2652a8efaaefa0d268e4cd02dd79742eb3c5a74725621d6b0f5a856db4210a"; - patchLatest = false; - topLevel = true; - dependencies = [ - { name = "cookies"; range = ">= 0.2.2"; } - ]; - } - { - baseName = "inherits"; - version = "1.0.0"; - fullName = "inherits-1"; - hash = "2be196fa6bc6a0c65fecd737af457589ef88b22a95d5dc31aab01d92ace48186"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "inherits"; - version = "1.0.0"; - fullName = "inherits-1.x"; - hash = "2be196fa6bc6a0c65fecd737af457589ef88b22a95d5dc31aab01d92ace48186"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "inherits"; - version = "2.0.0"; - fullName = "inherits-2"; - hash = "9c0e9ab9e025f0be599d62752764964416832d38d93a4143242ec4deb4de1ae0"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "inherits"; - version = "1.0.0"; - fullName = "inherits-~1.0.0"; - hash = "2be196fa6bc6a0c65fecd737af457589ef88b22a95d5dc31aab01d92ace48186"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "ini"; - version = "1.1.0"; - fullName = "ini-1"; - hash = "307ecc5f8664773587a0d74165d1dbdb226754b638542596b7a1e2ed0a578a28"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "ini"; - version = "1.1.0"; - fullName = "ini-1.x.x"; - hash = "307ecc5f8664773587a0d74165d1dbdb226754b638542596b7a1e2ed0a578a28"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "ini"; - version = "1.1.0"; - fullName = "ini-~1.1.0"; - hash = "307ecc5f8664773587a0d74165d1dbdb226754b638542596b7a1e2ed0a578a28"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "init-package-json"; - version = "0.0.10"; - fullName = "init-package-json-0.0.10"; - hash = "6efeef6f30253ee6b8cc9a22154096f42e1ea8621e79acce96b5425925229431"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "promzard"; range = "~0.2.0"; } - { name = "read"; range = "~1.0.1"; } - { name = "read-package-json"; range = "1"; } - { name = "semver"; range = "2.x"; } - ]; - } - { - baseName = "is-promise"; - version = "1.0.0"; - fullName = "is-promise-~1"; - hash = "65806ec461b83060a8857d2571c84bd66451db0683969ed3f9180f8a2c1a915f"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "jade"; - version = "0.33.0"; - fullName = "jade-*"; - hash = "9c03589c5ca55fcf6b4583c1daefd052fb8ef46e91962bab4ee75f6135963e4f"; - patchLatest = false; - topLevel = true; - dependencies = [ - { name = "commander"; range = "1.2.0"; } - { name = "mkdirp"; range = "0.3.x"; } - { name = "transformers"; range = "2.0.1"; } - { name = "character-parser"; range = "1.0.2"; } - { name = "monocle"; range = "0.1.48"; } - { name = "with"; range = "~1.1.0"; } - { name = "constantinople"; range = "~1.0.1"; } - ]; - } - { - baseName = "jade"; - version = "0.26.3"; - fullName = "jade-0.26.3"; - hash = "ea314287eb192b6987f7bb9d7010bf2c35ff6288f125fa00796ad93bdba14d0b"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "commander"; range = "0.6.1"; } - { name = "mkdirp"; range = "0.3.0"; } - ]; - } - { - baseName = "jayschema"; - version = "0.1.5"; - fullName = "jayschema-*"; - hash = "66e17d82f0b24d882321d42da2f094ab2b14df8a3f558b88867800e672f5c80d"; - patchLatest = false; - topLevel = true; - dependencies = [ - ]; - } - { - baseName = "jshint"; - version = "2.1.4"; - fullName = "jshint-*"; - hash = "ff5afb38e1e82801b670a18033dc29a903fe883ca6073459360178871f8d71db"; - patchLatest = false; - topLevel = true; - dependencies = [ - { name = "shelljs"; range = "0.1.x"; } - { name = "underscore"; range = "1.4.x"; } - { name = "cli"; range = "0.4.x"; } - { name = "minimatch"; range = "0.x.x"; } - { name = "console-browserify"; range = "0.1.x"; } - ]; - } - { - baseName = "json-schema"; - version = "0.2.2"; - fullName = "json-schema-0.2.2"; - hash = "41b873a8fb542caf337ec17ad5593761e8db5ce8e33f4074b733b34ec656f0e8"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "json-stringify-safe"; - version = "3.0.0"; - fullName = "json-stringify-safe-~3.0.0"; - hash = "77580345a4d3d5db0e530757c86a6bd032b69b31f509f58a8d1232abc14690c0"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "json-stringify-safe"; - version = "4.0.0"; - fullName = "json-stringify-safe-~4.0.0"; - hash = "2461befc8dab37d1d83927ab4bf4aa68b162a35b5a85c1a90c70f86500091b60"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "jsontool"; - version = "6.0.0"; - fullName = "jsontool-*"; - hash = "4a1e5d6d89571a561b3f7aea39d6ba6274bb8075d802b0a514e17abf186d781c"; - patchLatest = false; - topLevel = true; - dependencies = [ - ]; - } - { - baseName = "jsprim"; - version = "0.3.0"; - fullName = "jsprim-0.3.0"; - hash = "0fd12872374ee55cc0c005a1590ef65def0e96de04734a753e0d1480c3ffc4bd"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "extsprintf"; range = "1.0.0"; } - { name = "json-schema"; range = "0.2.2"; } - { name = "verror"; range = "1.3.3"; } - ]; - } - { - baseName = "keep-alive-agent"; - version = "0.0.1"; - fullName = "keep-alive-agent-0.0.1"; - hash = "481f10eeb5b9759ad28d9556f30c1747a5e71fbbad55fb130b96eacc7ac1c7a1"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "kerberos"; - version = "0.0.3"; - fullName = "kerberos-0.0.3"; - hash = "40300bf5e4ca224127b7e88586dce003c58e59cf4972f699fdc95079135a76fe"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "keypress"; - version = "0.1.0"; - fullName = "keypress-0.1.x"; - hash = "2e43d67e9df19176f874e1a44693f2ea802df77e255d3fc272a0de8124f83be5"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "knox"; - version = "0.8.4"; - fullName = "knox-*"; - hash = "14072716bf13af98ab908f9f370f18e2353e326a0a945c53e1ff82f70725f161"; - patchLatest = false; - topLevel = true; - dependencies = [ - { name = "mime"; range = "*"; } - { name = "xml2js"; range = "0.2.x"; } - { name = "debug"; range = "~0.7.0"; } - { name = "stream-counter"; range = "~0.1.0"; } - ]; - } - { - baseName = "kue"; - version = "0.6.2"; - fullName = "kue-*"; - hash = "c52cb0ebc11226bff8d1fb8068cc4cc562c3970d1d24c201d8a8ed68847b9115"; - patchLatest = false; - topLevel = true; - dependencies = [ - { name = "redis"; range = "0.7.2"; } - { name = "express"; range = "~3.1.1"; } - { name = "jade"; range = "0.26.3"; } - { name = "stylus"; range = "0.27.2"; } - { name = "nib"; range = "0.5.0"; } - { name = "reds"; range = "0.1.4"; } - ]; - } - { - baseName = "lazy"; - version = "1.0.11"; - fullName = "lazy-~1.0.11"; - hash = "05a9685292102599629d3212fbd04102ff71b0cf306cee9773ab1602c75a4ab0"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "libyaml"; - version = "0.2.2"; - fullName = "libyaml-*"; - hash = "20bd05a1abc5ba18cc3b5de52bc44095fa59b03c6c3ffb6f46c55bd801cff3db"; - patchLatest = false; - topLevel = true; - dependencies = [ - ]; - } - { - baseName = "lockfile"; - version = "0.4.0"; - fullName = "lockfile-~0.4.0"; - hash = "80b81e5d9e8af9f661cfa57f6cf88ec7f2cac90196dae8ca4b382a812694d68e"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "lru-cache"; - version = "2.3.0"; - fullName = "lru-cache-2"; - hash = "fbb1a14e0314095b7999a3a7489c92983f3d95b188857af697487ac8a778e942"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "lru-cache"; - version = "2.2.0"; - fullName = "lru-cache-2.2.0"; - hash = "bdfb66f74cc4097f3bfd6062b2edbb7790d709f414c7d0f3419241840b1bffed"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "lru-cache"; - version = "2.3.0"; - fullName = "lru-cache-2.3.0"; - hash = "fbb1a14e0314095b7999a3a7489c92983f3d95b188857af697487ac8a778e942"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "lru-cache"; - version = "1.0.6"; - fullName = "lru-cache-~1.0.2"; - hash = "f3a419d4989d9db292a7207f04b6108eed6d8316553d888a462cccd4c9e8855e"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "lru-cache"; - version = "2.3.0"; - fullName = "lru-cache-~2.3.0"; - hash = "fbb1a14e0314095b7999a3a7489c92983f3d95b188857af697487ac8a778e942"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "methods"; - version = "0.0.1"; - fullName = "methods-0.0.1"; - hash = "2f7e32954dff5991dd8220e8f5dcdd32aeec5ec56ce9f7235872444af51b3adb"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "mime"; - version = "1.2.9"; - fullName = "mime-*"; - hash = "60120b9859a92a94480a76327a9406b4a72a34f2317bc7fa33dcb99b9c72678a"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "mime"; - version = "1.2.5"; - fullName = "mime-1.2.5"; - hash = "ccf05a6c47146e8acb9d0671eee09d2eb077cf9ddd1f7e8eccf49dbf969d6c72"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "mime"; - version = "1.2.6"; - fullName = "mime-1.2.6"; - hash = "7460134d6b4686d64fd1e7b878d34e2bdd258ad29b6665cf62e6d92659e81591"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "mime"; - version = "1.2.9"; - fullName = "mime-1.2.9"; - hash = "60120b9859a92a94480a76327a9406b4a72a34f2317bc7fa33dcb99b9c72678a"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "mime"; - version = "1.2.9"; - fullName = "mime-~1.2.2"; - hash = "60120b9859a92a94480a76327a9406b4a72a34f2317bc7fa33dcb99b9c72678a"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "mime"; - version = "1.2.9"; - fullName = "mime-~1.2.7"; - hash = "60120b9859a92a94480a76327a9406b4a72a34f2317bc7fa33dcb99b9c72678a"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "mime"; - version = "1.2.9"; - fullName = "mime-~1.2.9"; - hash = "60120b9859a92a94480a76327a9406b4a72a34f2317bc7fa33dcb99b9c72678a"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "minimatch"; - version = "0.2.12"; - fullName = "minimatch-0"; - hash = "205cff8b4ba926e86ff0e6f7f566553906113892028083ea221989a42500c246"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "lru-cache"; range = "2"; } - { name = "sigmund"; range = "~1.0.0"; } - ]; - } - { - baseName = "minimatch"; - version = "0.0.5"; - fullName = "minimatch-0.0.x"; - hash = "063694baa9f9ab077e687ff59031f461998ef38fda656ec7c3475931177ccf36"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "lru-cache"; range = "~1.0.2"; } - ]; - } - { - baseName = "minimatch"; - version = "0.2.12"; - fullName = "minimatch-0.x.x"; - hash = "205cff8b4ba926e86ff0e6f7f566553906113892028083ea221989a42500c246"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "lru-cache"; range = "2"; } - { name = "sigmund"; range = "~1.0.0"; } - ]; - } - { - baseName = "minimatch"; - version = "0.2.12"; - fullName = "minimatch->=0.2.4"; - hash = "205cff8b4ba926e86ff0e6f7f566553906113892028083ea221989a42500c246"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "lru-cache"; range = "2"; } - { name = "sigmund"; range = "~1.0.0"; } - ]; - } - { - baseName = "minimatch"; - version = "0.2.12"; - fullName = "minimatch-~0.2.0"; - hash = "205cff8b4ba926e86ff0e6f7f566553906113892028083ea221989a42500c246"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "lru-cache"; range = "2"; } - { name = "sigmund"; range = "~1.0.0"; } - ]; - } - { - baseName = "minimatch"; - version = "0.2.12"; - fullName = "minimatch-~0.2.11"; - hash = "205cff8b4ba926e86ff0e6f7f566553906113892028083ea221989a42500c246"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "lru-cache"; range = "2"; } - { name = "sigmund"; range = "~1.0.0"; } - ]; - } - { - baseName = "minimatch"; - version = "0.2.12"; - fullName = "minimatch-~0.2.12"; - hash = "205cff8b4ba926e86ff0e6f7f566553906113892028083ea221989a42500c246"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "lru-cache"; range = "2"; } - { name = "sigmund"; range = "~1.0.0"; } - ]; - } - { - baseName = "minimist"; - version = "0.0.1"; - fullName = "minimist-~0.0.1"; - hash = "4afcfc7d9ed3d2ff113bf93d777507e2ff7ddfef7ed282e4573ab5dd8422b0d3"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "mkdirp"; - version = "0.3.5"; - fullName = "mkdirp-*"; - hash = "8ae9c5107acb41110106224f5e7be2b50b00d15d062ea7941301c111b863fd26"; - patchLatest = false; - topLevel = true; - dependencies = [ - ]; - } - { - baseName = "mkdirp"; - version = "0.3.5"; - fullName = "mkdirp-0"; - hash = "8ae9c5107acb41110106224f5e7be2b50b00d15d062ea7941301c111b863fd26"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "mkdirp"; - version = "0.3.5"; - fullName = "mkdirp-0.3"; - hash = "8ae9c5107acb41110106224f5e7be2b50b00d15d062ea7941301c111b863fd26"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "mkdirp"; - version = "0.3.0"; - fullName = "mkdirp-0.3.0"; - hash = "708366e3a89c976ae8418056f2c5f784147b9310e8093f9bb7246d2f55f7c27d"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "mkdirp"; - version = "0.3.5"; - fullName = "mkdirp-0.3.5"; - hash = "8ae9c5107acb41110106224f5e7be2b50b00d15d062ea7941301c111b863fd26"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "mkdirp"; - version = "0.3.5"; - fullName = "mkdirp-0.3.x"; - hash = "8ae9c5107acb41110106224f5e7be2b50b00d15d062ea7941301c111b863fd26"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "mkdirp"; - version = "0.3.5"; - fullName = "mkdirp-0.x.x"; - hash = "8ae9c5107acb41110106224f5e7be2b50b00d15d062ea7941301c111b863fd26"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "mkdirp"; - version = "0.3.5"; - fullName = "mkdirp-~0.3.3"; - hash = "8ae9c5107acb41110106224f5e7be2b50b00d15d062ea7941301c111b863fd26"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "mkdirp"; - version = "0.3.5"; - fullName = "mkdirp-~0.3.4"; - hash = "8ae9c5107acb41110106224f5e7be2b50b00d15d062ea7941301c111b863fd26"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "mocha"; - version = "1.12.0"; - fullName = "mocha-*"; - hash = "657b833347df35fc39cd1fb0e420f2713db57c4430cbebd10e2f6b37548e4f20"; - patchLatest = false; - topLevel = true; - dependencies = [ - { name = "commander"; range = "0.6.1"; } - { name = "growl"; range = "1.7.x"; } - { name = "jade"; range = "0.26.3"; } - { name = "diff"; range = "1.0.2"; } - { name = "debug"; range = "*"; } - { name = "mkdirp"; range = "0.3.5"; } - { name = "ms"; range = "0.3.0"; } - { name = "glob"; range = "3.2.1"; } - ]; - } - { - baseName = "mocha"; - version = "1.3.2"; - fullName = "mocha-~1.3.2"; - hash = "38bb1638122140c4c8986e02dd0c23105abedaca2ad8d2c8f3bc64bbfa7f6f53"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "commander"; range = "0.6.1"; } - { name = "growl"; range = "1.5.x"; } - { name = "jade"; range = "0.26.3"; } - { name = "diff"; range = "1.0.2"; } - { name = "debug"; range = "*"; } - ]; - } - { - baseName = "mongodb"; - version = "1.2.14"; - fullName = "mongodb-1.2.x"; - hash = "011e76d49fb99a58659db12e55d340c4731184dd635b769717db374db3f701a0"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "bson"; range = "0.1.8"; } - ]; - } - { - baseName = "mongodb"; - version = "1.3.11"; - fullName = "mongodb-1.3.11"; - hash = "cd00f9c0fafd280d30f9e604c76aa7eb59748521f5b0438c15ced90533376a62"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "bson"; range = "0.1.9"; } - { name = "kerberos"; range = "0.0.3"; } - ]; - } - { - baseName = "mongoose"; - version = "3.6.14"; - fullName = "mongoose-*"; - hash = "eab35fb10f1da7a24a4b3c3c0edfea6941031e8d9e9b6120c683b736329a5781"; - patchLatest = false; - topLevel = true; - dependencies = [ - { name = "hooks"; range = "0.2.1"; } - { name = "mongodb"; range = "1.3.11"; } - { name = "ms"; range = "0.1.0"; } - { name = "sliced"; range = "0.0.3"; } - { name = "muri"; range = "0.3.1"; } - { name = "mpromise"; range = "0.2.1"; } - { name = "mpath"; range = "0.1.1"; } - { name = "regexp-clone"; range = "0.0.1"; } - ]; - } - { - baseName = "mongoose-schema-extend"; - version = "0.1.3"; - fullName = "mongoose-schema-extend-*"; - hash = "f91e0851475ea525544bc65578e6ca55de345bc4c3332cc732fd3a66e1af1b1b"; - patchLatest = false; - topLevel = true; - dependencies = [ - { name = "owl-deepcopy"; range = "~0.0.1"; } - { name = "mocha"; range = "~1.3.2"; } - ]; - } - { - baseName = "monocle"; - version = "0.1.48"; - fullName = "monocle-0.1.48"; - hash = "3a94a890f37ff135ea82f640d8e693f10a11bca3d30c3ec7456a9f97683f15d5"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "readdirp"; range = "~0.2.3"; } - ]; - } - { - baseName = "mpath"; - version = "0.1.1"; - fullName = "mpath-0.1.1"; - hash = "23e83ac6c4b3d67cc34dc1ba05d1085a3d9ef8243caa756b1ca4af12b4370751"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "mpromise"; - version = "0.2.1"; - fullName = "mpromise-0.2.1"; - hash = "56d035a66b1a19a8ad64e99354355e128b18394f69d545597bb5a25fe80147bf"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "sliced"; range = "0.0.4"; } - ]; - } - { - baseName = "ms"; - version = "0.1.0"; - fullName = "ms-0.1.0"; - hash = "474bcdb7965551c5a111be2fcdb5e4607491c70a601d04d818ec7e1e1c2ff88b"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "ms"; - version = "0.3.0"; - fullName = "ms-0.3.0"; - hash = "f72eab0186a6dabbbea7118f83d4e2c01119e427f6671096a0c7ed522abe07f2"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "muri"; - version = "0.3.1"; - fullName = "muri-0.3.1"; - hash = "5e1b7ac7790350f6043fc8fa1b18f85818fefe0adda18d0c058460413757f959"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "mute-stream"; - version = "0.0.3"; - fullName = "mute-stream-~0.0.2"; - hash = "7bb2401ad9afaa6f04bc1d2d9411a6e41d7a6198de929d4522e95eeae78b1082"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "mv"; - version = "0.0.5"; - fullName = "mv-0.0.5"; - hash = "6ddbf4770ffd02170a8fc492cee418ad92ce2f1e2eb4c549febac1f60e6533b9"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "natural"; - version = "0.0.69"; - fullName = "natural-0.0.69"; - hash = "1cd394575cbeba7963378fc572a85a3279c4359b75740f9062dddb5b64d6c402"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "sylvester"; range = ">= 0.0.12"; } - { name = "apparatus"; range = ">= 0.0.4"; } - { name = "underscore"; range = "*"; } - ]; - } - { - baseName = "nconf"; - version = "0.6.7"; - fullName = "nconf-*"; - hash = "1ec390b8fa439e1160e432edc0f9ccec544b8216dfaba3db7002d38351ccfa1c"; - patchLatest = false; - topLevel = true; - dependencies = [ - { name = "async"; range = "0.1.x"; } - { name = "ini"; range = "1.x.x"; } - { name = "optimist"; range = "0.3.x"; } - { name = "pkginfo"; range = "0.2.x"; } - ]; - } - { - baseName = "nconf"; - version = "0.6.7"; - fullName = "nconf-0.6.7"; - hash = "1ec390b8fa439e1160e432edc0f9ccec544b8216dfaba3db7002d38351ccfa1c"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "async"; range = "0.1.x"; } - { name = "ini"; range = "1.x.x"; } - { name = "optimist"; range = "0.3.x"; } - { name = "pkginfo"; range = "0.2.x"; } - ]; - } - { - baseName = "ncp"; - version = "0.2.7"; - fullName = "ncp-0.2.x"; - hash = "9bae6495de613c5adb418348224512b9dc42f2b74c7a2fabecf02f8b7d08343d"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "negotiator"; - version = "0.2.5"; - fullName = "negotiator-0.2.5"; - hash = "37f567acba03ef7748802c4f6b41ca7e57a3fb556c4435cda515028c73d76542"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "nib"; - version = "0.5.0"; - fullName = "nib-0.5.0"; - hash = "9e3ebce2cfb055b8eadcb2fcac3e49570e429a5262ce5a59844857fbcb27f4c7"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "nijs"; - version = "0.0.9"; - fullName = "nijs-*"; - hash = "fdcc60b869d3308549818608593c5a9eab75574a5e85df66e35f6f896a4d3544"; - patchLatest = false; - topLevel = true; - dependencies = [ - { name = "optparse"; range = ">= 1.0.3"; } - ]; - } - { - baseName = "node-expat"; - version = "2.0.0"; - fullName = "node-expat-*"; - hash = "9d5b7efd708fc546f5c17e98f4ee322abafaaa02fbb6c281f651d10d9523c83f"; - patchLatest = false; - topLevel = true; - dependencies = [ - ]; - } - { - baseName = "node-gyp"; - version = "0.10.6"; - fullName = "node-gyp-*"; - hash = "1b1fc060c1a84eb0f52c495d7d13e3a7f03b2753b74dc6c1c801c5b8d563c5b0"; - patchLatest = false; - topLevel = true; - dependencies = [ - { name = "glob"; range = "3"; } - { name = "graceful-fs"; range = "2"; } - { name = "fstream"; range = "0"; } - { name = "minimatch"; range = "0"; } - { name = "mkdirp"; range = "0"; } - { name = "nopt"; range = "2"; } - { name = "npmlog"; range = "0"; } - { name = "osenv"; range = "0"; } - { name = "request"; range = "2"; } - { name = "rimraf"; range = "2"; } - { name = "semver"; range = "~2.0.7"; } - { name = "tar"; range = "0"; } - { name = "which"; range = "1"; } - ]; - } - { - baseName = "node-gyp"; - version = "0.10.6"; - fullName = "node-gyp-~0.10.6"; - hash = "1b1fc060c1a84eb0f52c495d7d13e3a7f03b2753b74dc6c1c801c5b8d563c5b0"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "glob"; range = "3"; } - { name = "graceful-fs"; range = "2"; } - { name = "fstream"; range = "0"; } - { name = "minimatch"; range = "0"; } - { name = "mkdirp"; range = "0"; } - { name = "nopt"; range = "2"; } - { name = "npmlog"; range = "0"; } - { name = "osenv"; range = "0"; } - { name = "request"; range = "2"; } - { name = "rimraf"; range = "2"; } - { name = "semver"; range = "~2.0.7"; } - { name = "tar"; range = "0"; } - { name = "which"; range = "1"; } - ]; - } - { - baseName = "node-uuid"; - version = "1.4.0"; - fullName = "node-uuid-*"; - hash = "87a1944b5334351ddd1d3e44d2e423ebfc027e858111efb72324054092cfd1bc"; - patchLatest = false; - topLevel = true; - dependencies = [ - ]; - } - { - baseName = "node-uuid"; - version = "1.2.0"; - fullName = "node-uuid-1.2.0"; - hash = "96d3ce178ea0825d27a855630de74243a577dc988512512eea572829b208a3d2"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "node-uuid"; - version = "1.3.3"; - fullName = "node-uuid-1.3.3"; - hash = "a3fbccc904944a9c8eadc59e55aaac908cc458569f539b50077d9672a84587a8"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "node-uuid"; - version = "1.4.0"; - fullName = "node-uuid-1.4.0"; - hash = "87a1944b5334351ddd1d3e44d2e423ebfc027e858111efb72324054092cfd1bc"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "node-uuid"; - version = "1.4.0"; - fullName = "node-uuid-~1.4.0"; - hash = "87a1944b5334351ddd1d3e44d2e423ebfc027e858111efb72324054092cfd1bc"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "nodemon"; - version = "0.7.8"; - fullName = "nodemon-*"; - hash = "123a54f51297e5186061846a5dae5117c2a218a8a477364055828a0c2ea39bed"; - patchLatest = false; - topLevel = true; - dependencies = [ - ]; - } - { - baseName = "nopt"; - version = "2.1.1"; - fullName = "nopt-2"; - hash = "a7a84f3fe51cb8fb97c678bc73130b53d6782ee90dc0e9b15ae39630ce2fa203"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "abbrev"; range = "1"; } - ]; - } - { - baseName = "nopt"; - version = "2.0.0"; - fullName = "nopt-2.0.0"; - hash = "112e9bea8b745a2e5a59d239e6f6f02e720e080ab8cdca89b6b8f0143ae718b5"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "abbrev"; range = "1"; } - ]; - } - { - baseName = "nopt"; - version = "2.1.1"; - fullName = "nopt-~2.1.1"; - hash = "a7a84f3fe51cb8fb97c678bc73130b53d6782ee90dc0e9b15ae39630ce2fa203"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "abbrev"; range = "1"; } - ]; - } - { - baseName = "normalize-package-data"; - version = "0.2.0"; - fullName = "normalize-package-data-~0.2"; - hash = "acde245885200d357f307740e7d3b3a169e1088bed51cbd81d76d6e7dfcf8fa8"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "semver"; range = "2"; } - { name = "github-url-from-git"; range = "~1.1.1"; } - ]; - } - { - baseName = "npm"; - version = "1.3.4"; - fullName = "npm-*"; - hash = "fcf0a1a2bfb920fb7fd4dd172df3ea02b7155247f509add164041645d8742225"; - patchLatest = false; - topLevel = true; - dependencies = [ - { name = "semver"; range = "~2.0.8"; } - { name = "ini"; range = "~1.1.0"; } - { name = "slide"; range = "~1.1.4"; } - { name = "abbrev"; range = "~1.0.4"; } - { name = "graceful-fs"; range = "~2.0.0"; } - { name = "minimatch"; range = "~0.2.12"; } - { name = "nopt"; range = "~2.1.1"; } - { name = "rimraf"; range = "~2.2.0"; } - { name = "request"; range = "~2.21.0"; } - { name = "which"; range = "1"; } - { name = "tar"; range = "~0.1.17"; } - { name = "fstream"; range = "~0.1.23"; } - { name = "block-stream"; range = "*"; } - { name = "inherits"; range = "1"; } - { name = "mkdirp"; range = "~0.3.3"; } - { name = "read"; range = "~1.0.4"; } - { name = "lru-cache"; range = "~2.3.0"; } - { name = "node-gyp"; range = "~0.10.6"; } - { name = "fstream-npm"; range = "~0.1.3"; } - { name = "uid-number"; range = "0"; } - { name = "archy"; range = "0"; } - { name = "chownr"; range = "0"; } - { name = "npmlog"; range = "0.0.4"; } - { name = "ansi"; range = "~0.1.2"; } - { name = "npm-registry-client"; range = "~0.2.27"; } - { name = "read-package-json"; range = "~1.1.0"; } - { name = "read-installed"; range = "~0.2.2"; } - { name = "glob"; range = "~3.2.3"; } - { name = "init-package-json"; range = "0.0.10"; } - { name = "osenv"; range = "0"; } - { name = "lockfile"; range = "~0.4.0"; } - { name = "retry"; range = "~0.6.0"; } - { name = "once"; range = "~1.1.1"; } - { name = "npmconf"; range = "~0.1.1"; } - { name = "opener"; range = "~1.3.0"; } - { name = "chmodr"; range = "~0.1.0"; } - { name = "cmd-shim"; range = "~1.1.0"; } - { name = "sha"; range = "~1.0.1"; } - { name = "editor"; range = "0.0.4"; } - { name = "child-process-close"; range = "~0.1.1"; } - { name = "npm-user-validate"; range = "0.0.3"; } - ]; - } - { - baseName = "npm-registry-client"; - version = "0.2.27"; - fullName = "npm-registry-client-~0.2.27"; - hash = "9899d95fb9e71224ae49120621e245d20c2e05658e817442b2a30fcf8928441b"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "request"; range = "2 >=2.20.0"; } - { name = "graceful-fs"; range = "~2.0.0"; } - { name = "semver"; range = "~2.0.5"; } - { name = "slide"; range = "~1.1.3"; } - { name = "chownr"; range = "0"; } - { name = "mkdirp"; range = "~0.3.3"; } - { name = "rimraf"; range = "~2"; } - { name = "retry"; range = "0.6.0"; } - { name = "couch-login"; range = "~0.1.15"; } - { name = "npmlog"; range = ""; } - ]; - } - { - baseName = "npm-user-validate"; - version = "0.0.3"; - fullName = "npm-user-validate-0.0.3"; - hash = "3ba7b67338af6deff49c8c6588542aaea83f034cad0dfe34519b546c05f29402"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "npm2nix"; - version = "1.2.0"; - fullName = "npm2nix-*"; - hash = "b79bd319e4030704bb41078dbbec0db9eebb984966c6bd3cad55ba4c76ec622c"; - patchLatest = false; - topLevel = true; - dependencies = [ - { name = "semver"; range = "1"; } - ]; - } - { - baseName = "npmconf"; - version = "0.1.1"; - fullName = "npmconf-~0.1.1"; - hash = "e4448bd02d4745549324fd0dbc333bcd9bf37de11e2ecc7bc02bf9655ddec2e9"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "config-chain"; range = "~1.1.1"; } - { name = "inherits"; range = "~1.0.0"; } - { name = "once"; range = "~1.1.1"; } - { name = "mkdirp"; range = "~0.3.3"; } - { name = "osenv"; range = "0.0.3"; } - { name = "nopt"; range = "2"; } - { name = "semver"; range = "2"; } - { name = "ini"; range = "~1.1.0"; } - ]; - } - { - baseName = "npmlog"; - version = "0.0.4"; - fullName = "npmlog-"; - hash = "16da9f0f239813f201156b81a5ebe552c9a3f78a405dbb24c2c1743fe3a0d579"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "ansi"; range = "~0.1.2"; } - ]; - } - { - baseName = "npmlog"; - version = "0.0.4"; - fullName = "npmlog-0"; - hash = "16da9f0f239813f201156b81a5ebe552c9a3f78a405dbb24c2c1743fe3a0d579"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "ansi"; range = "~0.1.2"; } - ]; - } - { - baseName = "npmlog"; - version = "0.0.4"; - fullName = "npmlog-0.0.4"; - hash = "16da9f0f239813f201156b81a5ebe552c9a3f78a405dbb24c2c1743fe3a0d579"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "ansi"; range = "~0.1.2"; } - ]; - } - { - baseName = "nssocket"; - version = "0.5.1"; - fullName = "nssocket-~0.5.1"; - hash = "aaf06b612cd99bf9e5790b2bf9b0f1963c2b605eaf3529b905c1fbdc1dee5333"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "eventemitter2"; range = "~0.4.11"; } - { name = "lazy"; range = "~1.0.11"; } - ]; - } - { - baseName = "oauth-sign"; - version = "0.2.0"; - fullName = "oauth-sign-~0.2.0"; - hash = "ef91b4266c71c68478dd7c50767085210006ebfb9e9263c72d42f47972991580"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "oauth-sign"; - version = "0.3.0"; - fullName = "oauth-sign-~0.3.0"; - hash = "a202acb9ea84ef53e6a82a6ee5113328cd4bfd68d6ba04d15f1da933660b087e"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "once"; - version = "1.1.1"; - fullName = "once-1.1.1"; - hash = "3fdc1a246f2522991fd9a6554a93c012c3192ea99918fdd893a2d4f2d546fe93"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "once"; - version = "1.1.1"; - fullName = "once-~1.1.1"; - hash = "3fdc1a246f2522991fd9a6554a93c012c3192ea99918fdd893a2d4f2d546fe93"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "opener"; - version = "1.3.0"; - fullName = "opener-~1.3.0"; - hash = "8ce1113b83487849625156d72483e4eef7b8eebf63a9e8d7732df15c240efa06"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "optimist"; - version = "0.6.0"; - fullName = "optimist-*"; - hash = "a75df1152906f1b66583c957cbffba34aaead644547d4a0300b713281279d4cf"; - patchLatest = false; - topLevel = true; - dependencies = [ - { name = "wordwrap"; range = "~0.0.2"; } - { name = "minimist"; range = "~0.0.1"; } - ]; - } - { - baseName = "optimist"; - version = "0.2.8"; - fullName = "optimist-0.2"; - hash = "5ee9f3bbd03239903831ccc33c6c365251550cbfd88d9fb92011feac4376cf84"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "wordwrap"; range = ">=0.0.1 <0.1.0"; } - ]; - } - { - baseName = "optimist"; - version = "0.3.5"; - fullName = "optimist-0.3.5"; - hash = "a407715c9745c9242923f282a70d55947e21f5c4800c99b09d2eb6e48735a09d"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "wordwrap"; range = "~0.0.2"; } - ]; - } - { - baseName = "optimist"; - version = "0.3.7"; - fullName = "optimist-0.3.x"; - hash = "ba534aa013072a9650a18da311de8025d73b58b71dcea7c7ade4d8e8f274dd33"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "wordwrap"; range = "~0.0.2"; } - ]; - } - { - baseName = "optimist"; - version = "0.4.0"; - fullName = "optimist-0.4.0"; - hash = "bbbd3c9e8c1e8f59e7097271a78fa628c6dc76de894a02fc625872b72bc99555"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "wordwrap"; range = "~0.0.2"; } - ]; - } - { - baseName = "optimist"; - version = "0.3.7"; - fullName = "optimist-~0.3.5"; - hash = "ba534aa013072a9650a18da311de8025d73b58b71dcea7c7ade4d8e8f274dd33"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "wordwrap"; range = "~0.0.2"; } - ]; - } - { - baseName = "optparse"; - version = "1.0.4"; - fullName = "optparse-*"; - hash = "8413ed6a2318ffecdb428181a6966013d1853ff62644afcbcff682c1efc9367a"; - patchLatest = false; - topLevel = true; - dependencies = [ - ]; - } - { - baseName = "optparse"; - version = "1.0.4"; - fullName = "optparse->= 1.0.3"; - hash = "8413ed6a2318ffecdb428181a6966013d1853ff62644afcbcff682c1efc9367a"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "osenv"; - version = "0.0.3"; - fullName = "osenv-0"; - hash = "aafbb23637b7338c9025f9da336f31f96674d7926c30f209e4d93ce16d5251c4"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "osenv"; - version = "0.0.3"; - fullName = "osenv-0.0.3"; - hash = "aafbb23637b7338c9025f9da336f31f96674d7926c30f209e4d93ce16d5251c4"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "owl-deepcopy"; - version = "0.0.2"; - fullName = "owl-deepcopy-~0.0.1"; - hash = "69f76104c1f4610a4905ef7a184026850660b5e1fcaac9beb8ad0d6e4d54b58b"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "passport"; - version = "0.1.17"; - fullName = "passport-*"; - hash = "65c15a1666abc16a86d586233f40b89b68b50bf88107809878742973af8b516e"; - patchLatest = false; - topLevel = true; - dependencies = [ - { name = "pkginfo"; range = "0.2.x"; } - { name = "pause"; range = "0.0.1"; } - ]; - } - { - baseName = "passport-http"; - version = "0.2.2"; - fullName = "passport-http-*"; - hash = "3a333781016b3e20462fde18ebeb1d9794c6353564ee646b3008ce2540504d1f"; - patchLatest = false; - topLevel = true; - dependencies = [ - { name = "pkginfo"; range = "0.2.x"; } - { name = "passport"; range = "~0.1.3"; } - ]; - } - { - baseName = "passport-local"; - version = "0.1.6"; - fullName = "passport-local-*"; - hash = "de7dbe29a63fc648686425ba4ef23b99195372ae322037977864db08657e262d"; - patchLatest = false; - topLevel = true; - dependencies = [ - { name = "pkginfo"; range = "0.2.x"; } - { name = "passport"; range = "~0.1.1"; } - ]; - } - { - baseName = "passport"; - version = "0.1.17"; - fullName = "passport-~0.1.1"; - hash = "65c15a1666abc16a86d586233f40b89b68b50bf88107809878742973af8b516e"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "pkginfo"; range = "0.2.x"; } - { name = "pause"; range = "0.0.1"; } - ]; - } - { - baseName = "passport"; - version = "0.1.17"; - fullName = "passport-~0.1.3"; - hash = "65c15a1666abc16a86d586233f40b89b68b50bf88107809878742973af8b516e"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "pkginfo"; range = "0.2.x"; } - { name = "pause"; range = "0.0.1"; } - ]; - } - { - baseName = "pause"; - version = "0.0.1"; - fullName = "pause-0.0.1"; - hash = "d37b84046db0c28c9768be649e8f02bd991ede34b276b5dba7bade23b523235e"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "pkginfo"; - version = "0.2.3"; - fullName = "pkginfo-0.2.x"; - hash = "0685c2cd94db8515a95b8127d1ab4e2a82d37deb4f808b41c9e0c033e34fe77f"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "pkginfo"; - version = "0.3.0"; - fullName = "pkginfo-0.3.0"; - hash = "e55f5e0f767cabc55b638808736f952d6d74157938a87192106ce83c66a195a5"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "pkginfo"; - version = "0.3.0"; - fullName = "pkginfo-0.3.x"; - hash = "e55f5e0f767cabc55b638808736f952d6d74157938a87192106ce83c66a195a5"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "pkginfo"; - version = "0.3.0"; - fullName = "pkginfo-0.x.x"; - hash = "e55f5e0f767cabc55b638808736f952d6d74157938a87192106ce83c66a195a5"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "posix-getopt"; - version = "1.0.0"; - fullName = "posix-getopt-1.0.0"; - hash = "134cea188854422ab047db9ebfcb7e2610f0a239fe27382b55c10894c4f5ba9d"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "promise"; - version = "2.0.0"; - fullName = "promise-~2.0"; - hash = "ccc3f345cd6facd0bcb0e599320e1da06b447ee573982b04f6b615a3da1ba7df"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "is-promise"; range = "~1"; } - ]; - } - { - baseName = "prompt"; - version = "0.2.9"; - fullName = "prompt-0.2.9"; - hash = "2444c21920d4169c51cae11fafed129c09df11f4bdda8e7ad76ea626a8828878"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "pkginfo"; range = "0.x.x"; } - { name = "read"; range = "1.0.x"; } - { name = "revalidator"; range = "0.1.x"; } - { name = "utile"; range = "0.1.x"; } - { name = "winston"; range = "0.6.x"; } - ]; - } - { - baseName = "promzard"; - version = "0.2.0"; - fullName = "promzard-~0.2.0"; - hash = "e9dcdf4084876c4b751f2f5939f149071495f0d23bf80a9ec4a73cd84080184b"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "read"; range = "1"; } - ]; - } - { - baseName = "proto-list"; - version = "1.2.2"; - fullName = "proto-list-~1.2.1"; - hash = "1a1916d1a55ada8d8f3530d2073d57b6b9f0547b317686a7bc0492305d1d8e3b"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "ps-tree"; - version = "0.0.3"; - fullName = "ps-tree-0.0.x"; - hash = "d6af58e1062457f3aa92306c8eb970f32d2d52b93ecca4920c7409afd419a78d"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "event-stream"; range = "~0.5"; } - ]; - } - { - baseName = "qs"; - version = "0.5.1"; - fullName = "qs-0.5.1"; - hash = "85bf27180b586499902d4e2bea83974b337924c870f6b790a23e6bfeb982c2e5"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "qs"; - version = "0.5.5"; - fullName = "qs-0.5.5"; - hash = "8ed820b83bf4aff299422dc406c7a52793e05f510803cc1cc2da7de1528837f1"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "qs"; - version = "0.6.5"; - fullName = "qs-0.6.5"; - hash = "293e5dfd16bfe0aee8b3fe130abb951ac9c8c084d1103f7d81c4e5c312b2940d"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "qs"; - version = "0.5.6"; - fullName = "qs-~0.5.4"; - hash = "3c7b49a51d52e5c8b988c2a53f8605d03a18d5e29b55b4f187c6a0fc714d00e9"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "qs"; - version = "0.6.5"; - fullName = "qs-~0.6.0"; - hash = "293e5dfd16bfe0aee8b3fe130abb951ac9c8c084d1103f7d81c4e5c312b2940d"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "range-parser"; - version = "0.0.4"; - fullName = "range-parser-0.0.4"; - hash = "8e1bcce3544330b51644ea0cb4d25f0daa4b43008a75da27e285635f4ac4b1ce"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "rbytes"; - version = "1.0.0"; - fullName = "rbytes-*"; - hash = "ccacb9951421c0a219f63b5d356098adffa43e42367be78afb94a433f84593e7"; - patchLatest = false; - topLevel = true; - dependencies = [ - ]; - } - { - baseName = "read"; - version = "1.0.4"; - fullName = "read-1"; - hash = "8be269afeaa7cc62feb4672e8e61e5133152266dc5347b23cf5b05bc40789601"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "mute-stream"; range = "~0.0.2"; } - ]; - } - { - baseName = "read"; - version = "1.0.4"; - fullName = "read-1.0.x"; - hash = "8be269afeaa7cc62feb4672e8e61e5133152266dc5347b23cf5b05bc40789601"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "mute-stream"; range = "~0.0.2"; } - ]; - } - { - baseName = "read-installed"; - version = "0.2.2"; - fullName = "read-installed-~0.2.2"; - hash = "1237a4eb7444063ef83be336ecd317ffeafd2fef8f9e81468a5d7545e1a80c23"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "semver"; range = "2"; } - { name = "slide"; range = "~1.1.3"; } - { name = "read-package-json"; range = "1"; } - { name = "graceful-fs"; range = "~1.2.0"; } - ]; - } - { - baseName = "read-package-json"; - version = "1.1.0"; - fullName = "read-package-json-1"; - hash = "f3d2f47ffcab7512bb5cfba1854e708534dcae073704c3c9baba36de19b89969"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "glob"; range = "~3.2.1"; } - { name = "lru-cache"; range = "2"; } - { name = "normalize-package-data"; range = "~0.2"; } - { name = "graceful-fs"; range = "~1.2"; } - ]; - } - { - baseName = "read-package-json"; - version = "1.1.0"; - fullName = "read-package-json-~1.1.0"; - hash = "f3d2f47ffcab7512bb5cfba1854e708534dcae073704c3c9baba36de19b89969"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "glob"; range = "~3.2.1"; } - { name = "lru-cache"; range = "2"; } - { name = "normalize-package-data"; range = "~0.2"; } - { name = "graceful-fs"; range = "~1.2"; } - ]; - } - { - baseName = "read"; - version = "1.0.4"; - fullName = "read-~1.0.1"; - hash = "8be269afeaa7cc62feb4672e8e61e5133152266dc5347b23cf5b05bc40789601"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "mute-stream"; range = "~0.0.2"; } - ]; - } - { - baseName = "read"; - version = "1.0.4"; - fullName = "read-~1.0.4"; - hash = "8be269afeaa7cc62feb4672e8e61e5133152266dc5347b23cf5b05bc40789601"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "mute-stream"; range = "~0.0.2"; } - ]; - } - { - baseName = "readable-stream"; - version = "1.0.2"; - fullName = "readable-stream-~1.0.2"; - hash = "45a918b25f0799f87d7144dbbb7d2b5974dc079fcb1a2149a305d080f1155754"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "readdirp"; - version = "0.2.5"; - fullName = "readdirp-~0.2.3"; - hash = "22d8e0e38c0d358c951221d0051d1e9e1eafeaf2136ac7fe0aa3bfd36238052c"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "minimatch"; range = ">=0.2.4"; } - ]; - } - { - baseName = "redis"; - version = "0.8.4"; - fullName = "redis-*"; - hash = "077932b14c6b0a4985b7a41cf20e4495463c693c7b9932ebc46e0144918ff3c3"; - patchLatest = false; - topLevel = true; - dependencies = [ - ]; - } - { - baseName = "redis"; - version = "0.7.2"; - fullName = "redis-0.7.2"; - hash = "d56d99e15dd35f6fabf545d9e91545553d60eaeb32ecf5caa1f357458df161ab"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "hiredis"; range = "*"; } - ]; - } - { - baseName = "redis"; - version = "0.8.4"; - fullName = "redis->= 0.6.6"; - hash = "077932b14c6b0a4985b7a41cf20e4495463c693c7b9932ebc46e0144918ff3c3"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "reds"; - version = "0.1.4"; - fullName = "reds-0.1.4"; - hash = "3166c2f0f82efc624dac4e9058bc0ffa3bb864499785a746c461b813b90640ac"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "natural"; range = "0.0.69"; } - { name = "redis"; range = ">= 0.6.6"; } - ]; - } - { - baseName = "regexp-clone"; - version = "0.0.1"; - fullName = "regexp-clone-0.0.1"; - hash = "e11276212cce9fa15aa07276b800f750ec7d9c25e76ace7cf07f3e713d6d79e0"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "request"; - version = "2.22.0"; - fullName = "request-2"; - hash = "d0a7ebc001800143d05cedf616cc164a31425bcbfdb8eb533b59d8c123b1275c"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "qs"; range = "~0.6.0"; } - { name = "json-stringify-safe"; range = "~4.0.0"; } - { name = "forever-agent"; range = "~0.5.0"; } - { name = "tunnel-agent"; range = "~0.3.0"; } - { name = "http-signature"; range = "~0.10.0"; } - { name = "hawk"; range = "~0.13.0"; } - { name = "aws-sign"; range = "~0.3.0"; } - { name = "oauth-sign"; range = "~0.3.0"; } - { name = "cookie-jar"; range = "~0.3.0"; } - { name = "node-uuid"; range = "~1.4.0"; } - { name = "mime"; range = "~1.2.9"; } - { name = "form-data"; range = "0.0.8"; } - ]; - } - { - baseName = "request"; - version = "2.22.0"; - fullName = "request-2 >=2.14"; - hash = "d0a7ebc001800143d05cedf616cc164a31425bcbfdb8eb533b59d8c123b1275c"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "qs"; range = "~0.6.0"; } - { name = "json-stringify-safe"; range = "~4.0.0"; } - { name = "forever-agent"; range = "~0.5.0"; } - { name = "tunnel-agent"; range = "~0.3.0"; } - { name = "http-signature"; range = "~0.10.0"; } - { name = "hawk"; range = "~0.13.0"; } - { name = "aws-sign"; range = "~0.3.0"; } - { name = "oauth-sign"; range = "~0.3.0"; } - { name = "cookie-jar"; range = "~0.3.0"; } - { name = "node-uuid"; range = "~1.4.0"; } - { name = "mime"; range = "~1.2.9"; } - { name = "form-data"; range = "0.0.8"; } - ]; - } - { - baseName = "request"; - version = "2.22.0"; - fullName = "request-2 >=2.20.0"; - hash = "d0a7ebc001800143d05cedf616cc164a31425bcbfdb8eb533b59d8c123b1275c"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "qs"; range = "~0.6.0"; } - { name = "json-stringify-safe"; range = "~4.0.0"; } - { name = "forever-agent"; range = "~0.5.0"; } - { name = "tunnel-agent"; range = "~0.3.0"; } - { name = "http-signature"; range = "~0.10.0"; } - { name = "hawk"; range = "~0.13.0"; } - { name = "aws-sign"; range = "~0.3.0"; } - { name = "oauth-sign"; range = "~0.3.0"; } - { name = "cookie-jar"; range = "~0.3.0"; } - { name = "node-uuid"; range = "~1.4.0"; } - { name = "mime"; range = "~1.2.9"; } - { name = "form-data"; range = "0.0.8"; } - ]; - } - { - baseName = "request"; - version = "2.16.6"; - fullName = "request-2.16.x"; - hash = "9424cb952b4c5723678d0c5a6daf3ea6fa76ccad4cbd175f0a489dc54c6e1453"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "form-data"; range = "~0.0.3"; } - { name = "mime"; range = "~1.2.7"; } - { name = "hawk"; range = "~0.10.2"; } - { name = "node-uuid"; range = "~1.4.0"; } - { name = "cookie-jar"; range = "~0.2.0"; } - { name = "aws-sign"; range = "~0.2.0"; } - { name = "oauth-sign"; range = "~0.2.0"; } - { name = "forever-agent"; range = "~0.2.0"; } - { name = "tunnel-agent"; range = "~0.2.0"; } - { name = "json-stringify-safe"; range = "~3.0.0"; } - { name = "qs"; range = "~0.5.4"; } - ]; - } - { - baseName = "request"; - version = "2.9.203"; - fullName = "request-2.9.x"; - hash = "2af8f83a63c7227383fbdd6114e470e0921af86a037c4e82f42883120f35f836"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "request"; - version = "2.22.0"; - fullName = "request-~2"; - hash = "d0a7ebc001800143d05cedf616cc164a31425bcbfdb8eb533b59d8c123b1275c"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "qs"; range = "~0.6.0"; } - { name = "json-stringify-safe"; range = "~4.0.0"; } - { name = "forever-agent"; range = "~0.5.0"; } - { name = "tunnel-agent"; range = "~0.3.0"; } - { name = "http-signature"; range = "~0.10.0"; } - { name = "hawk"; range = "~0.13.0"; } - { name = "aws-sign"; range = "~0.3.0"; } - { name = "oauth-sign"; range = "~0.3.0"; } - { name = "cookie-jar"; range = "~0.3.0"; } - { name = "node-uuid"; range = "~1.4.0"; } - { name = "mime"; range = "~1.2.9"; } - { name = "form-data"; range = "0.0.8"; } - ]; - } - { - baseName = "request"; - version = "2.21.0"; - fullName = "request-~2.21.0"; - hash = "fe31c3119bc4423f07aa7c9849cb642d5ad22bdf2a2700eab56fb83fa8ed429c"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "qs"; range = "~0.6.0"; } - { name = "json-stringify-safe"; range = "~4.0.0"; } - { name = "forever-agent"; range = "~0.5.0"; } - { name = "tunnel-agent"; range = "~0.3.0"; } - { name = "http-signature"; range = "~0.9.11"; } - { name = "hawk"; range = "~0.13.0"; } - { name = "aws-sign"; range = "~0.3.0"; } - { name = "oauth-sign"; range = "~0.3.0"; } - { name = "cookie-jar"; range = "~0.3.0"; } - { name = "node-uuid"; range = "~1.4.0"; } - { name = "mime"; range = "~1.2.9"; } - { name = "form-data"; range = "0.0.8"; } - ]; - } - { - baseName = "restify"; - version = "2.4.1"; - fullName = "restify-2.4.1"; - hash = "b46ed86ef17f1896a4dd961de8cc8ec96b57b7f44ef7421f3804764289f5b563"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "assert-plus"; range = "0.1.2"; } - { name = "backoff"; range = "2.1.0"; } - { name = "bunyan"; range = "0.21.1"; } - { name = "deep-equal"; range = "0.0.0"; } - { name = "formidable"; range = "1.0.13"; } - { name = "http-signature"; range = "0.9.11"; } - { name = "keep-alive-agent"; range = "0.0.1"; } - { name = "lru-cache"; range = "2.3.0"; } - { name = "mime"; range = "1.2.9"; } - { name = "negotiator"; range = "0.2.5"; } - { name = "node-uuid"; range = "1.4.0"; } - { name = "once"; range = "1.1.1"; } - { name = "qs"; range = "0.5.5"; } - { name = "semver"; range = "1.1.4"; } - { name = "spdy"; range = "1.7.1"; } - { name = "verror"; range = "1.3.6"; } - { name = "dtrace-provider"; range = "0.2.8"; } - ]; - } - { - baseName = "retry"; - version = "0.6.0"; - fullName = "retry-0.6.0"; - hash = "983e676af24ff4dcbac396420fca3c195ce3b1de5f731f697888b4fe6b7bbd2a"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "retry"; - version = "0.6.0"; - fullName = "retry-~0.6.0"; - hash = "983e676af24ff4dcbac396420fca3c195ce3b1de5f731f697888b4fe6b7bbd2a"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "revalidator"; - version = "0.1.5"; - fullName = "revalidator-0.1.x"; - hash = "54938a414b54882f9459e93b9bfd5d267c41985c1191a9a913c713e369ec639e"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "rimraf"; - version = "1.0.9"; - fullName = "rimraf-1.x.x"; - hash = "3ef93e5f75d1fc4778b8f5409e07c72510ee2f86c926abe4e9acff9825f14c5b"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "rimraf"; - version = "2.2.0"; - fullName = "rimraf-2"; - hash = "4d250a91e5da8f0e839647149268d3682c868a65e920477ff5baae26591ebeb2"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "graceful-fs"; range = "~1"; } - ]; - } - { - baseName = "rimraf"; - version = "2.2.0"; - fullName = "rimraf-~2"; - hash = "4d250a91e5da8f0e839647149268d3682c868a65e920477ff5baae26591ebeb2"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "graceful-fs"; range = "~1"; } - ]; - } - { - baseName = "rimraf"; - version = "2.1.4"; - fullName = "rimraf-~2.1.4"; - hash = "093154365aab3c09aea8e83dda7c5a7fd785c787ebbf1fcdc415cb5f74d1acac"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "graceful-fs"; range = "~1"; } - ]; - } - { - baseName = "rimraf"; - version = "2.2.0"; - fullName = "rimraf-~2.2.0"; - hash = "4d250a91e5da8f0e839647149268d3682c868a65e920477ff5baae26591ebeb2"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "graceful-fs"; range = "~1"; } - ]; - } - { - baseName = "s3http"; - version = "0.0.2"; - fullName = "s3http-*"; - hash = "03cbaa20c8920371c94333d6424c3d3b09824d1c6e30a9e1567805f53d1cd16d"; - patchLatest = false; - topLevel = true; - dependencies = [ - { name = "aws-sdk"; range = ">=1.2.0 <2"; } - { name = "commander"; range = "0.5.1"; } - { name = "http-auth"; range = "1.2.7"; } - ]; - } - { - baseName = "sax"; - version = "0.5.4"; - fullName = "sax-0.5.x"; - hash = "5c4f074b559f56a7170663142e4ccbcf8cbef229ad7eb787b6c6e0b79ddb936a"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "sax"; - version = "0.5.4"; - fullName = "sax->=0.4.2"; - hash = "5c4f074b559f56a7170663142e4ccbcf8cbef229ad7eb787b6c6e0b79ddb936a"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "semver"; - version = "2.0.10"; - fullName = "semver-*"; - hash = "121f81da02804485b7bc06769ec2a71284c2d8933030b1a4f17602c34ef04111"; - patchLatest = false; - topLevel = true; - dependencies = [ - ]; - } - { - baseName = "semver"; - version = "1.1.4"; - fullName = "semver-1"; - hash = "59c0180521d0d4cee57caa5f6ef190500b04099bfa5786edb3e21e364ae8e989"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "semver"; - version = "1.1.4"; - fullName = "semver-1.1.4"; - hash = "59c0180521d0d4cee57caa5f6ef190500b04099bfa5786edb3e21e364ae8e989"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "semver"; - version = "2.0.10"; - fullName = "semver-2"; - hash = "121f81da02804485b7bc06769ec2a71284c2d8933030b1a4f17602c34ef04111"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "semver"; - version = "2.0.10"; - fullName = "semver-2.x"; - hash = "121f81da02804485b7bc06769ec2a71284c2d8933030b1a4f17602c34ef04111"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "semver"; - version = "2.0.10"; - fullName = "semver-~2.0.5"; - hash = "121f81da02804485b7bc06769ec2a71284c2d8933030b1a4f17602c34ef04111"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "semver"; - version = "2.0.10"; - fullName = "semver-~2.0.7"; - hash = "121f81da02804485b7bc06769ec2a71284c2d8933030b1a4f17602c34ef04111"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "semver"; - version = "2.0.10"; - fullName = "semver-~2.0.8"; - hash = "121f81da02804485b7bc06769ec2a71284c2d8933030b1a4f17602c34ef04111"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "send"; - version = "0.1.3"; - fullName = "send-*"; - hash = "45d768e247b184ec2d78aef495d4986b62675daa2d40add4f993cc122bba557f"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "debug"; range = "*"; } - { name = "mime"; range = "~1.2.9"; } - { name = "fresh"; range = "0.1.0"; } - { name = "range-parser"; range = "0.0.4"; } - ]; - } - { - baseName = "send"; - version = "0.1.0"; - fullName = "send-0.1.0"; - hash = "28b5a6ec41b5072521eb792cc901b92cdbb6b743c578d7008727dbbd3eb717de"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "debug"; range = "*"; } - { name = "mime"; range = "1.2.6"; } - { name = "fresh"; range = "0.1.0"; } - { name = "range-parser"; range = "0.0.4"; } - ]; - } - { - baseName = "send"; - version = "0.1.3"; - fullName = "send-0.1.3"; - hash = "45d768e247b184ec2d78aef495d4986b62675daa2d40add4f993cc122bba557f"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "debug"; range = "*"; } - { name = "mime"; range = "~1.2.9"; } - { name = "fresh"; range = "0.1.0"; } - { name = "range-parser"; range = "0.0.4"; } - ]; - } - { - baseName = "sequence"; - version = "2.2.1"; - fullName = "sequence->= 2.2.1"; - hash = "f14e1262b6a234acc3f50fdd5bd28c02f0cc8cbf882922b5af994babf4206b62"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "sha"; - version = "1.0.1"; - fullName = "sha-~1.0.1"; - hash = "b540d2ae52395b7c22c8ad1fa4e0cf430ccab917847ddea5308fa833cf85c5fb"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "graceful-fs"; range = "1.2"; } - ]; - } - { - baseName = "shelljs"; - version = "0.1.4"; - fullName = "shelljs-0.1.x"; - hash = "21a6f3dc5eaeb1c10efbe62e31aeb6762241f707fb1fdcda4766c8bccde3eaf0"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "should"; - version = "1.2.2"; - fullName = "should-*"; - hash = "af7916b687bf54b95bd8ff2837f430ab2758f1db22b5cde5b4ae30dac472f330"; - patchLatest = false; - topLevel = true; - dependencies = [ - ]; - } - { - baseName = "sigmund"; - version = "1.0.0"; - fullName = "sigmund-~1.0.0"; - hash = "ddf823295db284ac4720b9d40f381d7375dc0b05881b98269346b33fe9835e25"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "sliced"; - version = "0.0.3"; - fullName = "sliced-0.0.3"; - hash = "ce5765e669217d4c9500d79d6ffaf8d22b6507e826fd1dc0bb05bb746ab6227c"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "sliced"; - version = "0.0.4"; - fullName = "sliced-0.0.4"; - hash = "b9320aec8a9c5796d34b4c95b1289912548fcc8682fe9fed09749847b7dc0d85"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "slide"; - version = "1.1.4"; - fullName = "slide-~1.1.3"; - hash = "db50179b7ceac3a1d79527a7c3db39ee1d5e936a07504e6aa542f9078aa33a6a"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "slide"; - version = "1.1.4"; - fullName = "slide-~1.1.4"; - hash = "db50179b7ceac3a1d79527a7c3db39ee1d5e936a07504e6aa542f9078aa33a6a"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "smartdc"; - version = "7.0.0"; - fullName = "smartdc-*"; - hash = "add769b05ecef4ea657d7bc473d96ee3e67b8ad8bc77077120bd5ae1efe94911"; - patchLatest = false; - topLevel = true; - dependencies = [ - { name = "assert-plus"; range = "0.1.2"; } - { name = "lru-cache"; range = "2.2.0"; } - { name = "nopt"; range = "2.0.0"; } - { name = "restify"; range = "2.4.1"; } - { name = "bunyan"; range = "0.21.1"; } - { name = "clone"; range = "0.1.6"; } - { name = "smartdc-auth"; range = "1.0.0"; } - ]; - } - { - baseName = "smartdc-auth"; - version = "1.0.0"; - fullName = "smartdc-auth-1.0.0"; - hash = "7611510ac66507398f6e371b25068c7ad193ecd69a3031fdfca0e3c652cfdcbf"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "assert-plus"; range = "0.1.2"; } - { name = "clone"; range = "0.1.5"; } - { name = "ssh-agent"; range = "0.2.1"; } - { name = "once"; range = "1.1.1"; } - { name = "vasync"; range = "1.3.3"; } - ]; - } - { - baseName = "sntp"; - version = "0.1.4"; - fullName = "sntp-0.1.x"; - hash = "5fc290630e8a4599dfb1ee4ed67fdc3c94fc97c6c0cbbc188691669ff55dcb4f"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "hoek"; range = "0.7.x"; } - ]; - } - { - baseName = "sntp"; - version = "0.2.4"; - fullName = "sntp-0.2.x"; - hash = "1f91a8d60fd48751e4b169885f530012ce2a8223ed29006abcee175f2b10d779"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "hoek"; range = "0.9.x"; } - ]; - } - { - baseName = "sockjs"; - version = "0.3.7"; - fullName = "sockjs-*"; - hash = "711a6c41e6a7b2a9cd0dc44abc7407f09729d400be450d94887391997b07a1a5"; - patchLatest = false; - topLevel = true; - dependencies = [ - { name = "node-uuid"; range = "1.3.3"; } - { name = "faye-websocket"; range = "0.4.4"; } - ]; - } - { - baseName = "source-map"; - version = "0.1.25"; - fullName = "source-map-*"; - hash = "3ef1ff114aa3504871ad8b16a38ac744b293c6d8f37b0b6e673b44592a08626d"; - patchLatest = false; - topLevel = true; - dependencies = [ - { name = "amdefine"; range = ">=0.0.4"; } - ]; - } - { - baseName = "source-map"; - version = "0.1.25"; - fullName = "source-map-~0.1.7"; - hash = "3ef1ff114aa3504871ad8b16a38ac744b293c6d8f37b0b6e673b44592a08626d"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "amdefine"; range = ">=0.0.4"; } - ]; - } - { - baseName = "spdy"; - version = "1.7.1"; - fullName = "spdy-1.7.1"; - hash = "d90516bb6b6cf39fb52face8ec332be98de116ce84d7d400fbb19529a30fa678"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "ssh-agent"; - version = "0.2.1"; - fullName = "ssh-agent-0.2.1"; - hash = "b420d5816d4a8a242a8d1454f064954eab8fec9856310e867a2e7f1b2432f934"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "ctype"; range = "0.5.0"; } - { name = "posix-getopt"; range = "1.0.0"; } - ]; - } - { - baseName = "stack-trace"; - version = "0.0.6"; - fullName = "stack-trace-0.0.x"; - hash = "398b3307d34c25b9249049229cd4a340ce8587dc3e3ab5cec830af19031c10a4"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "stream-counter"; - version = "0.1.0"; - fullName = "stream-counter-~0.1.0"; - hash = "8c51bd894bf905ec607654a1d7d3fe4fdc4763ccec4d37723cb8d0a0fd7cb69c"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "readable-stream"; range = "~1.0.2"; } - ]; - } - { - baseName = "stream-splitter-transform"; - version = "0.0.3"; - fullName = "stream-splitter-transform-*"; - hash = "613ca5994f2fe645cbb21dcac24f034ed8546d6cc49097d8ee0b4501e6d9a887"; - patchLatest = false; - topLevel = true; - dependencies = [ - { name = "buffertools"; range = ">=1.1.1 <2.0.0"; } - ]; - } - { - baseName = "stylus"; - version = "0.34.1"; - fullName = "stylus-*"; - hash = "efbcf5f35d84264609be85b122513af30e922687a4f5c961928febf0f27e3d9e"; - patchLatest = false; - topLevel = true; - dependencies = [ - { name = "cssom"; range = "0.2.x"; } - { name = "mkdirp"; range = "0.3.x"; } - { name = "debug"; range = "*"; } - ]; - } - { - baseName = "stylus"; - version = "0.27.2"; - fullName = "stylus-0.27.2"; - hash = "8e18cc51592e04e42096e324d3409a132dbb3b40b0a606a746c4c57268bb63ea"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "cssom"; range = "0.2.x"; } - { name = "mkdirp"; range = "0.3.x"; } - { name = "debug"; range = "*"; } - ]; - } - { - baseName = "superagent"; - version = "0.15.1"; - fullName = "superagent-0.15.1"; - hash = "8306a3c7476e9f9d61ffe33117ffcf2a4fba6c9fcc59a2b8eee059f57d7d5614"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "qs"; range = "0.6.5"; } - { name = "formidable"; range = "1.0.9"; } - { name = "mime"; range = "1.2.5"; } - { name = "emitter-component"; range = "1.0.0"; } - { name = "methods"; range = "0.0.1"; } - { name = "cookiejar"; range = "1.3.0"; } - { name = "debug"; range = "~0.7.2"; } - ]; - } - { - baseName = "supertest"; - version = "0.7.1"; - fullName = "supertest-*"; - hash = "85246177740d16565f6ed4a932f0c85aca55c897ae352e3bb404da0cdad60a16"; - patchLatest = false; - topLevel = true; - dependencies = [ - { name = "superagent"; range = "0.15.1"; } - { name = "methods"; range = "0.0.1"; } - ]; - } - { - baseName = "swig"; - version = "0.14.0"; - fullName = "swig-*"; - hash = "9eeafb591606008c7ab33501ebfdb6ed80830cca5736513c6c5874ded65cfb3f"; - patchLatest = false; - topLevel = true; - dependencies = [ - { name = "underscore"; range = ">=1.1.7"; } - ]; - } - { - baseName = "sylvester"; - version = "0.0.21"; - fullName = "sylvester->= 0.0.12"; - hash = "8b97514fbb01de0f73b9104091bb79e835d227eb4c2ca88a843696b22f347022"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "sylvester"; - version = "0.0.21"; - fullName = "sylvester->= 0.0.8"; - hash = "8b97514fbb01de0f73b9104091bb79e835d227eb4c2ca88a843696b22f347022"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "tar"; - version = "0.1.17"; - fullName = "tar-0"; - hash = "577832975440eba0a9293244d53fa2c383e5c27ec2f68e3defde0cc23910b978"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "inherits"; range = "1.x"; } - { name = "block-stream"; range = "*"; } - { name = "fstream"; range = "~0.1.8"; } - ]; - } - { - baseName = "tar"; - version = "0.1.17"; - fullName = "tar-~0.1.17"; - hash = "577832975440eba0a9293244d53fa2c383e5c27ec2f68e3defde0cc23910b978"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "inherits"; range = "1.x"; } - { name = "block-stream"; range = "*"; } - { name = "fstream"; range = "~0.1.8"; } - ]; - } - { - baseName = "temp"; - version = "0.5.1"; - fullName = "temp-*"; - hash = "04bb3c0bde8f3ffab53bc4935b5c1ca306735e4da8844c1dc25e74b0ae8f6540"; - patchLatest = false; - topLevel = true; - dependencies = [ - { name = "rimraf"; range = "~2.1.4"; } - ]; - } - { - baseName = "timespan"; - version = "2.0.1"; - fullName = "timespan-2.0.1"; - hash = "2c9693ac1c16e4bf0061904f487ab5fbf13f3d35817de1575dbfd9eaf85d452c"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "timezone"; - version = "0.0.22"; - fullName = "timezone-*"; - hash = "5bb9d42f401ae3084ab7dba7e0ecf1158995a987242311c86062177ad89561c3"; - patchLatest = false; - topLevel = true; - dependencies = [ - ]; - } - { - baseName = "transformers"; - version = "2.0.1"; - fullName = "transformers-2.0.1"; - hash = "503430f608716eb2d55764c27f1417e363049aadd08988ad9e26ecb2daa33cb9"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "promise"; range = "~2.0"; } - { name = "css"; range = "~1.0.8"; } - { name = "uglify-js"; range = "~2.2.5"; } - ]; - } - { - baseName = "tunnel-agent"; - version = "0.2.0"; - fullName = "tunnel-agent-~0.2.0"; - hash = "d5c7fe6b4cd377ac54ff994f3b53b368fb4c0edafceddcf0e575402aa2451808"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "tunnel-agent"; - version = "0.3.0"; - fullName = "tunnel-agent-~0.3.0"; - hash = "5b23c1d29e85143e213ba5aca118419ab42d25774da92e816074a73f423bcabd"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "uglify-js"; - version = "2.3.6"; - fullName = "uglify-js-2.3.6"; - hash = "a361bc8092c8400d99d73d071c46fcfceb7156a557effd82abd8ca8a5c5ad09e"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "async"; range = "~0.2.6"; } - { name = "source-map"; range = "~0.1.7"; } - { name = "optimist"; range = "~0.3.5"; } - ]; - } - { - baseName = "uglify-js"; - version = "2.2.5"; - fullName = "uglify-js-~2.2.5"; - hash = "f9d166cda4c881a396b53f8b8892b17bb1bc09ffb531ba1fa16e7bf9022a2ca2"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "source-map"; range = "~0.1.7"; } - { name = "optimist"; range = "~0.3.5"; } - ]; - } - { - baseName = "uglify-js"; - version = "2.3.6"; - fullName = "uglify-js-~2.3.6"; - hash = "a361bc8092c8400d99d73d071c46fcfceb7156a557effd82abd8ca8a5c5ad09e"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "async"; range = "~0.2.6"; } - { name = "source-map"; range = "~0.1.7"; } - { name = "optimist"; range = "~0.3.5"; } - ]; - } - { - baseName = "uid-number"; - version = "0.0.3"; - fullName = "uid-number-0"; - hash = "e8eab0de35bcb20a55f58a276b2f6cfe1c531fae5982d7a3af7286807dbbe42b"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "uid2"; - version = "0.0.2"; - fullName = "uid2-0.0.2"; - hash = "8a3b12223830ed536ce022271a4059cedfbb21d0f63149742347c4f7fc0ed442"; - patchLatest = false; topLevel = false; dependencies = [ + { name = "underscore"; spec = "~1.4.3"; } + { name = "underscore.string"; spec = "~2.3.1"; } ]; - } - { - baseName = "underscore"; - version = "1.5.1"; - fullName = "underscore-*"; - hash = "40e2c86742d4af529cbb58f8cb68de128a18a32a78ab3b8bfa9f9a9544003018"; - patchLatest = false; - topLevel = true; - dependencies = [ - ]; - } - { - baseName = "underscore"; - version = "1.4.4"; - fullName = "underscore-1.4.x"; - hash = "a848a28193850d58d7b98249d70844bc7f35a7d8b6b5ed75e08e829aa6e763d3"; patchLatest = false; - topLevel = false; - dependencies = [ - ]; + sha1 = "28a1f72c43113e763220e5708414301c8840f0a1"; + tarball = "http://registry.npmjs.org/argparse/-/argparse-0.1.15.tgz"; } { - baseName = "underscore"; - version = "1.5.1"; - fullName = "underscore->=1.1.7"; - hash = "40e2c86742d4af529cbb58f8cb68de128a18a32a78ab3b8bfa9f9a9544003018"; - patchLatest = false; + name = "asn1"; + spec = "0.1.11"; + version = "0.1.11"; topLevel = false; dependencies = [ ]; - } - { - baseName = "underscore"; - version = "1.5.1"; - fullName = "underscore->=1.4.3"; - hash = "40e2c86742d4af529cbb58f8cb68de128a18a32a78ab3b8bfa9f9a9544003018"; patchLatest = false; - topLevel = false; - dependencies = [ - ]; + sha1 = "559be18376d08a4ec4dbe80877d27818639b2df7"; + tarball = "http://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"; } { - baseName = "util"; + name = "assert"; + spec = "*"; version = "0.4.9"; - fullName = "util->= 0.4.9"; - hash = "30ecc26c9e749650562c1ef20bc3f1a0d8d7c109134b510be34526d1ceae90e5"; - patchLatest = false; - topLevel = false; + topLevel = true; dependencies = [ - { name = "events.node"; range = ">= 0.4.0"; } + { name = "util"; spec = ">= 0.4.9"; } ]; + patchLatest = false; + sha1 = "45faff1a58f718508118873dead940c8b51db939"; + tarball = "http://registry.npmjs.org/assert/-/assert-0.4.9.tgz"; } { - baseName = "utile"; - version = "0.1.7"; - fullName = "utile-0.1.7"; - hash = "5e5dc150fa657729c288a211389cdf47419b73f4f8b4304a0c84dc584bf804b5"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "async"; range = "0.1.x"; } - { name = "deep-equal"; range = "*"; } - { name = "i"; range = "0.3.x"; } - { name = "mkdirp"; range = "0.x.x"; } - { name = "ncp"; range = "0.2.x"; } - { name = "rimraf"; range = "1.x.x"; } - ]; - } - { - baseName = "utile"; - version = "0.1.7"; - fullName = "utile-0.1.x"; - hash = "5e5dc150fa657729c288a211389cdf47419b73f4f8b4304a0c84dc584bf804b5"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "async"; range = "0.1.x"; } - { name = "deep-equal"; range = "*"; } - { name = "i"; range = "0.3.x"; } - { name = "mkdirp"; range = "0.x.x"; } - { name = "ncp"; range = "0.2.x"; } - { name = "rimraf"; range = "1.x.x"; } - ]; - } - { - baseName = "vasync"; - version = "1.3.3"; - fullName = "vasync-1.3.3"; - hash = "603d15b81e25b6a634d7ff2025487b3460a60d0d7e1a1ed02e66faff5ef7b699"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "jsprim"; range = "0.3.0"; } - { name = "verror"; range = "1.1.0"; } - ]; - } - { - baseName = "verror"; - version = "1.1.0"; - fullName = "verror-1.1.0"; - hash = "ac0fc2dfbcdfc3440c281cf272d902ec74bf2abdf2f9c9eb5c0c3505dc6646d7"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "extsprintf"; range = "1.0.0"; } - ]; - } - { - baseName = "verror"; - version = "1.3.3"; - fullName = "verror-1.3.3"; - hash = "9b3e9307cb5a788c1a4c6706ed32582893ffcd64dc55a14a153be1ea15bb916a"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "extsprintf"; range = "1.0.0"; } - ]; - } - { - baseName = "verror"; - version = "1.3.6"; - fullName = "verror-1.3.6"; - hash = "96135dd5fef7b75bfe26513658ca3fc1ab38e17a9bec522fc5ec6e54b6b63f89"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "extsprintf"; range = "1.0.2"; } - ]; - } - { - baseName = "view-helpers"; + name = "assert-plus"; + spec = "0.1.2"; version = "0.1.2"; - fullName = "view-helpers-*"; - hash = "b9605b3acd8da98a68a34840061b7dde70eac65529667666014b38b03d198439"; + topLevel = false; + dependencies = [ + ]; patchLatest = false; + sha1 = "d93ffdbb67ac5507779be316a7d65146417beef8"; + tarball = "http://registry.npmjs.org/assert-plus/-/assert-plus-0.1.2.tgz"; + } + { + name = "async"; + spec = "*"; + version = "0.2.9"; topLevel = true; dependencies = [ ]; + patchLatest = false; + sha1 = "df63060fbf3d33286a76aaf6d55a2986d9ff8619"; + tarball = "http://registry.npmjs.org/async/-/async-0.2.9.tgz"; } { - baseName = "walk"; - version = "2.2.1"; - fullName = "walk-*"; - hash = "ed78c4a01a936c69c43eac60dde1a54a918fed66681671bf4cfdfa090b49a8ad"; + name = "async"; + spec = "0.1.x"; + version = "0.1.22"; + topLevel = false; + dependencies = [ + ]; patchLatest = false; + sha1 = "0fc1aaa088a0e3ef0ebe2d8831bab0dcf8845061"; + tarball = "http://registry.npmjs.org/async/-/async-0.1.22.tgz"; + } + { + name = "async"; + spec = "0.2.x"; + version = "0.2.9"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "df63060fbf3d33286a76aaf6d55a2986d9ff8619"; + tarball = "http://registry.npmjs.org/async/-/async-0.2.9.tgz"; + } + { + name = "async"; + spec = "~0.2.6"; + version = "0.2.9"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "df63060fbf3d33286a76aaf6d55a2986d9ff8619"; + tarball = "http://registry.npmjs.org/async/-/async-0.2.9.tgz"; + } + { + name = "async"; + spec = "~0.2.7"; + version = "0.2.9"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "df63060fbf3d33286a76aaf6d55a2986d9ff8619"; + tarball = "http://registry.npmjs.org/async/-/async-0.2.9.tgz"; + } + { + name = "aws-sdk"; + spec = "*"; + version = "1.3.2"; topLevel = true; dependencies = [ - { name = "forEachAsync"; range = "~2.2"; } + { name = "xml2js"; spec = "0.2.4"; } + { name = "xmlbuilder"; spec = "*"; } ]; + patchLatest = true; + sha1 = "23a6cca1eb4a3c50ac67fb354ec9a5725d31a1f4"; + tarball = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-1.3.2.tgz"; } { - baseName = "watch"; - version = "0.5.1"; - fullName = "watch-0.5.x"; - hash = "1c7497c12e6ad97e194b3527ee6fa919e8f9045e588d9f810592dfec58f1d965"; - patchLatest = false; + name = "aws-sdk"; + spec = ">=1.2.0 <2"; + version = "1.3.2"; + topLevel = false; + dependencies = [ + { name = "xml2js"; spec = "0.2.4"; } + { name = "xmlbuilder"; spec = "*"; } + ]; + patchLatest = true; + sha1 = "23a6cca1eb4a3c50ac67fb354ec9a5725d31a1f4"; + tarball = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-1.3.2.tgz"; + } + { + name = "aws-sign"; + spec = "~0.2.0"; + version = "0.2.0"; topLevel = false; dependencies = [ ]; + patchLatest = false; + sha1 = "c55013856c8194ec854a0cbec90aab5a04ce3ac5"; + tarball = "http://registry.npmjs.org/aws-sign/-/aws-sign-0.2.0.tgz"; } { - baseName = "watch"; - version = "0.7.0"; - fullName = "watch-0.7.0"; - hash = "8cebd59e96b3c8a25dce0de0204d29cb94f8bd99c7e0c6772f07eb309fd22c54"; - patchLatest = false; + name = "aws-sign"; + spec = "~0.3.0"; + version = "0.3.0"; topLevel = false; dependencies = [ ]; + patchLatest = false; + sha1 = "3d81ca69b474b1e16518728b51c24ff0bbedc6e9"; + tarball = "http://registry.npmjs.org/aws-sign/-/aws-sign-0.3.0.tgz"; } { - baseName = "websocket-driver"; - version = "0.2.2"; - fullName = "websocket-driver->=0.2.0"; - hash = "2a5da351b8f716ef2595899b1e6911f739a420df64e65bfba2adf1fab42fe423"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "which"; - version = "1.0.5"; - fullName = "which-1"; - hash = "e26f39d7b152c700636472ab4da57bfb9af17972c49a9e2a06f9ff347d8fad42"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "winston"; - version = "0.7.2"; - fullName = "winston-*"; - hash = "562d3a3d8dc0ba580bfdfb167e16297940d3386ac4b82e65ad09f4859c4af181"; - patchLatest = false; + name = "backbone"; + spec = "*"; + version = "1.0.0"; topLevel = true; dependencies = [ - { name = "async"; range = "0.2.x"; } - { name = "colors"; range = "0.6.x"; } - { name = "cycle"; range = "1.0.x"; } - { name = "eyes"; range = "0.1.x"; } - { name = "pkginfo"; range = "0.3.x"; } - { name = "request"; range = "2.16.x"; } - { name = "stack-trace"; range = "0.0.x"; } + { name = "underscore"; spec = ">=1.4.3"; } ]; + patchLatest = false; + sha1 = "5e146e1efa8a5361462e578377c39ed0f16b0b4c"; + tarball = "http://registry.npmjs.org/backbone/-/backbone-1.0.0.tgz"; } { - baseName = "winston"; - version = "0.6.2"; - fullName = "winston-0.6.2"; - hash = "bfe4e73f8b42e1521a1c5dbdc50150fc80d508148376c4dfc925caa6516b2a81"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "async"; range = "0.1.x"; } - { name = "colors"; range = "0.x.x"; } - { name = "cycle"; range = "1.0.x"; } - { name = "eyes"; range = "0.1.x"; } - { name = "pkginfo"; range = "0.2.x"; } - { name = "request"; range = "2.9.x"; } - { name = "stack-trace"; range = "0.0.x"; } - ]; - } - { - baseName = "winston"; - version = "0.6.2"; - fullName = "winston-0.6.x"; - hash = "bfe4e73f8b42e1521a1c5dbdc50150fc80d508148376c4dfc925caa6516b2a81"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "async"; range = "0.1.x"; } - { name = "colors"; range = "0.x.x"; } - { name = "cycle"; range = "1.0.x"; } - { name = "eyes"; range = "0.1.x"; } - { name = "pkginfo"; range = "0.2.x"; } - { name = "request"; range = "2.9.x"; } - { name = "stack-trace"; range = "0.0.x"; } - ]; - } - { - baseName = "winston"; - version = "0.7.1"; - fullName = "winston-0.7.1"; - hash = "8504626efcd7b629a69500b0ab70b964fbabb53d6ebb506fdf3e1ecc6f2ca294"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "async"; range = "0.2.x"; } - { name = "colors"; range = "0.6.x"; } - { name = "cycle"; range = "1.0.x"; } - { name = "eyes"; range = "0.1.x"; } - { name = "pkginfo"; range = "0.3.x"; } - { name = "request"; range = "2.16.x"; } - { name = "stack-trace"; range = "0.0.x"; } - ]; - } - { - baseName = "with"; - version = "1.1.0"; - fullName = "with-~1.1.0"; - hash = "884c829a32f2b9d79d62bc455fd363cc307cf8b5284b822b550221c319ee6db4"; - patchLatest = false; - topLevel = false; - dependencies = [ - { name = "uglify-js"; range = "2.3.6"; } - ]; - } - { - baseName = "wordwrap"; - version = "0.0.2"; - fullName = "wordwrap->=0.0.1 <0.1.0"; - hash = "66a2fa688509738922c3ad62a6159fe3c93268bd3bca2bff24df4bc02cc31582"; - patchLatest = false; + name = "backoff"; + spec = "2.1.0"; + version = "2.1.0"; topLevel = false; dependencies = [ ]; + patchLatest = false; + sha1 = "19b4e9f9fb75c122ad7bb1c6c376d6085d43ea09"; + tarball = "http://registry.npmjs.org/backoff/-/backoff-2.1.0.tgz"; } { - baseName = "wordwrap"; - version = "0.0.2"; - fullName = "wordwrap-~0.0.2"; - hash = "66a2fa688509738922c3ad62a6159fe3c93268bd3bca2bff24df4bc02cc31582"; - patchLatest = false; - topLevel = false; - dependencies = [ - ]; - } - { - baseName = "wu"; - version = "0.1.8"; - fullName = "wu-*"; - hash = "2400d0ca7da862a9063a6a8d914bb4e585f81a5121b0fda8e40b1f6e782c72c6"; - patchLatest = false; + name = "bcrypt"; + spec = "*"; + version = "0.7.6"; topLevel = true; dependencies = [ + { name = "bindings"; spec = "1.0.0"; } ]; + patchLatest = false; + sha1 = "97eae4472baf2352699f5fd1662e77e63d0cd0aa"; + tarball = "http://registry.npmjs.org/bcrypt/-/bcrypt-0.7.6.tgz"; } { - baseName = "xml2js"; - version = "0.2.4"; - fullName = "xml2js-0.2.4"; - hash = "8daebb075fc7c564d84221a0cef7825ac824db8e312f873daee59a6adf38da28"; - patchLatest = false; + name = "bindings"; + spec = "*"; + version = "1.1.1"; topLevel = false; dependencies = [ - { name = "sax"; range = ">=0.4.2"; } ]; + patchLatest = false; + sha1 = "951f7ae010302ffc50b265b124032017ed2bf6f3"; + tarball = "http://registry.npmjs.org/bindings/-/bindings-1.1.1.tgz"; } { - baseName = "xml2js"; - version = "0.2.8"; - fullName = "xml2js-0.2.x"; - hash = "faa75fc23ae6346002555df236250c3612cf76dfac104aff131a5ab5de49b8de"; - patchLatest = false; + name = "bindings"; + spec = "1.0.0"; + version = "1.0.0"; topLevel = false; dependencies = [ - { name = "sax"; range = "0.5.x"; } ]; + patchLatest = false; + sha1 = "c3ccde60e9de6807c6f1aa4ef4843af29191c828"; + tarball = "http://registry.npmjs.org/bindings/-/bindings-1.0.0.tgz"; } { - baseName = "xmlbuilder"; + name = "block-stream"; + spec = "*"; + version = "0.0.6"; + topLevel = false; + dependencies = [ + { name = "inherits"; spec = "~1.0.0"; } + ]; + patchLatest = false; + sha1 = "f7027aea2ecc357153fa3bad6caeaf25f391aa4f"; + tarball = "http://registry.npmjs.org/block-stream/-/block-stream-0.0.6.tgz"; + } + { + name = "boom"; + spec = "0.3.x"; + version = "0.3.8"; + topLevel = false; + dependencies = [ + { name = "hoek"; spec = "0.7.x"; } + ]; + patchLatest = false; + sha1 = "c8cdb041435912741628c044ecc732d1d17c09ea"; + tarball = "http://registry.npmjs.org/boom/-/boom-0.3.8.tgz"; + } + { + name = "boom"; + spec = "0.4.x"; version = "0.4.2"; - fullName = "xmlbuilder-*"; - hash = "3137e5bf9db1f114767f8ba56be753f2a9f512e38a2df64d7677ae3c9318a0fe"; + topLevel = false; + dependencies = [ + { name = "hoek"; spec = "0.9.x"; } + ]; patchLatest = false; + sha1 = "7a636e9ded4efcefb19cef4947a3c67dfaee911b"; + tarball = "http://registry.npmjs.org/boom/-/boom-0.4.2.tgz"; + } + { + name = "broadway"; + spec = "0.2.7"; + version = "0.2.7"; + topLevel = false; + dependencies = [ + { name = "cliff"; spec = "0.1.8"; } + { name = "eventemitter2"; spec = "0.4.11"; } + { name = "nconf"; spec = "0.6.7"; } + { name = "winston"; spec = "0.6.2"; } + { name = "utile"; spec = "0.1.7"; } + ]; + patchLatest = false; + sha1 = "3ba2f4b3de163e95e38a4950b61fd5f882a90762"; + tarball = "http://registry.npmjs.org/broadway/-/broadway-0.2.7.tgz"; + } + { + name = "broadway"; + spec = "0.2.x"; + version = "0.2.7"; + topLevel = false; + dependencies = [ + { name = "cliff"; spec = "0.1.8"; } + { name = "eventemitter2"; spec = "0.4.11"; } + { name = "nconf"; spec = "0.6.7"; } + { name = "winston"; spec = "0.6.2"; } + { name = "utile"; spec = "0.1.7"; } + ]; + patchLatest = false; + sha1 = "3ba2f4b3de163e95e38a4950b61fd5f882a90762"; + tarball = "http://registry.npmjs.org/broadway/-/broadway-0.2.7.tgz"; + } + { + name = "browserchannel"; + spec = "*"; + version = "1.0.4"; + topLevel = true; + dependencies = [ + { name = "hat"; spec = "*"; } + { name = "connect"; spec = "~2"; } + { name = "request"; spec = "~2"; } + ]; + patchLatest = false; + sha1 = "077c1d59d7872d84932172d373c5f8f45698e975"; + tarball = "http://registry.npmjs.org/browserchannel/-/browserchannel-1.0.4.tgz"; + } + { + name = "bson"; + spec = "0.1.8"; + version = "0.1.8"; topLevel = false; dependencies = [ ]; + patchLatest = false; + sha1 = "cf34fdcff081a189b589b4b3e5e9309cd6506c81"; + tarball = "http://registry.npmjs.org/bson/-/bson-0.1.8.tgz"; + } + { + name = "bson"; + spec = "0.1.9"; + version = "0.1.9"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "7528f81ed770e6d630ca8c2ccdf5394a4096db14"; + tarball = "http://registry.npmjs.org/bson/-/bson-0.1.9.tgz"; + } + { + name = "buffer-crc32"; + spec = "0.1.1"; + version = "0.1.1"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "7e110dc9953908ab7c32acdc70c9f945b1cbc526"; + tarball = "http://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.1.1.tgz"; + } + { + name = "buffer-crc32"; + spec = "0.2.1"; + version = "0.2.1"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "be3e5382fc02b6d6324956ac1af98aa98b08534c"; + tarball = "http://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.1.tgz"; + } + { + name = "buffer-crc32"; + spec = "~0.2.1"; + version = "0.2.1"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "be3e5382fc02b6d6324956ac1af98aa98b08534c"; + tarball = "http://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.1.tgz"; + } + { + name = "buffertools"; + spec = "*"; + version = "1.1.1"; + topLevel = true; + dependencies = [ + ]; + patchLatest = false; + sha1 = "1071a5f40fe76c39d7a4fe2ea030324d09d6ec9d"; + tarball = "http://registry.npmjs.org/buffertools/-/buffertools-1.1.1.tgz"; + } + { + name = "buffertools"; + spec = ">=1.1.1 <2.0.0"; + version = "1.1.1"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "1071a5f40fe76c39d7a4fe2ea030324d09d6ec9d"; + tarball = "http://registry.npmjs.org/buffertools/-/buffertools-1.1.1.tgz"; + } + { + name = "bunyan"; + spec = "0.21.1"; + version = "0.21.1"; + topLevel = false; + dependencies = [ + { name = "mv"; spec = "0.0.5"; } + { name = "dtrace-provider"; spec = "0.2.8"; } + ]; + patchLatest = false; + sha1 = "ea00a0d5223572e31e1e71efba2237cb1915942a"; + tarball = "http://registry.npmjs.org/bunyan/-/bunyan-0.21.1.tgz"; + } + { + name = "bytes"; + spec = "0.2.0"; + version = "0.2.0"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "aad33ec14e3dc2ca74e8e7d451f9ba053ad4f7a0"; + tarball = "http://registry.npmjs.org/bytes/-/bytes-0.2.0.tgz"; + } + { + name = "character-parser"; + spec = "1.0.2"; + version = "1.0.2"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "55384d6afcf8c6b9dd483e8347646a790e4545e7"; + tarball = "http://registry.npmjs.org/character-parser/-/character-parser-1.0.2.tgz"; + } + { + name = "child-process-close"; + spec = "~0.1.1"; + version = "0.1.1"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "c153ede7a5eb65ac69e78a38973b1a286377f75f"; + tarball = "http://registry.npmjs.org/child-process-close/-/child-process-close-0.1.1.tgz"; + } + { + name = "chmodr"; + spec = "~0.1.0"; + version = "0.1.0"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "e09215a1d51542db2a2576969765bcf6125583eb"; + tarball = "http://registry.npmjs.org/chmodr/-/chmodr-0.1.0.tgz"; + } + { + name = "chownr"; + spec = "0"; + version = "0.0.1"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "51d18189d9092d5f8afd623f3288bfd1c6bf1a62"; + tarball = "http://registry.npmjs.org/chownr/-/chownr-0.0.1.tgz"; + } + { + name = "cli"; + spec = "0.4.x"; + version = "0.4.4"; + topLevel = false; + dependencies = [ + { name = "glob"; spec = ">= 3.1.4"; } + ]; + patchLatest = false; + sha1 = "13ceb30872e7c9addc383e5519fb2949ab61ba43"; + tarball = "http://registry.npmjs.org/cli/-/cli-0.4.4.tgz"; + } + { + name = "cliff"; + spec = "0.1.8"; + version = "0.1.8"; + topLevel = false; + dependencies = [ + { name = "colors"; spec = "0.x.x"; } + { name = "eyes"; spec = "0.1.x"; } + { name = "winston"; spec = "0.6.x"; } + ]; + patchLatest = false; + sha1 = "43ca8ad9fe3943489693ab62dce0cae22509d272"; + tarball = "http://registry.npmjs.org/cliff/-/cliff-0.1.8.tgz"; + } + { + name = "clone"; + spec = "0.1.5"; + version = "0.1.5"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "46f29143d0766d663dbd7f80b7520a15783d2042"; + tarball = "http://registry.npmjs.org/clone/-/clone-0.1.5.tgz"; + } + { + name = "clone"; + spec = "0.1.6"; + version = "0.1.6"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "4af2296d4a23a64168c2f5fb0a2aa65e80517000"; + tarball = "http://registry.npmjs.org/clone/-/clone-0.1.6.tgz"; + } + { + name = "cmd-shim"; + spec = "~1.1.0"; + version = "1.1.0"; + topLevel = false; + dependencies = [ + { name = "mkdirp"; spec = "~0.3.3"; } + { name = "graceful-fs"; spec = "1.2"; } + ]; + patchLatest = false; + sha1 = "e69fe26e9a8b9040c7b61dc8ad6b04d7dbabe767"; + tarball = "http://registry.npmjs.org/cmd-shim/-/cmd-shim-1.1.0.tgz"; + } + { + name = "coffee-script"; + spec = "*"; + version = "1.6.3"; + topLevel = true; + dependencies = [ + ]; + patchLatest = false; + sha1 = "6355d32cf1b04cdff6b484e5e711782b2f0c39be"; + tarball = "http://registry.npmjs.org/coffee-script/-/coffee-script-1.6.3.tgz"; + } + { + name = "colors"; + spec = "0.6.0-1"; + version = "0.6.0-1"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "6dbb68ceb8bc60f2b313dcc5ce1599f06d19e67a"; + tarball = "http://registry.npmjs.org/colors/-/colors-0.6.0-1.tgz"; + } + { + name = "colors"; + spec = "0.6.x"; + version = "0.6.0"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "07ec10d8ac4f5a2e78f8d820e3e7832b3b463cad"; + tarball = "http://registry.npmjs.org/colors/-/colors-0.6.0.tgz"; + } + { + name = "colors"; + spec = "0.x.x"; + version = "0.6.0"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "07ec10d8ac4f5a2e78f8d820e3e7832b3b463cad"; + tarball = "http://registry.npmjs.org/colors/-/colors-0.6.0.tgz"; + } + { + name = "combined-stream"; + spec = "~0.0.4"; + version = "0.0.4"; + topLevel = false; + dependencies = [ + { name = "delayed-stream"; spec = "0.0.5"; } + ]; + patchLatest = false; + sha1 = "2d1a43347dbe9515a4a2796732e5b88473840b22"; + tarball = "http://registry.npmjs.org/combined-stream/-/combined-stream-0.0.4.tgz"; + } + { + name = "commander"; + spec = "0.5.1"; + version = "0.5.1"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "08477afb326d1adf9d4ee73af7170c70caa14f95"; + tarball = "http://registry.npmjs.org/commander/-/commander-0.5.1.tgz"; + } + { + name = "commander"; + spec = "0.6.1"; + version = "0.6.1"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "fa68a14f6a945d54dbbe50d8cdb3320e9e3b1a06"; + tarball = "http://registry.npmjs.org/commander/-/commander-0.6.1.tgz"; + } + { + name = "commander"; + spec = "1.2.0"; + version = "1.2.0"; + topLevel = false; + dependencies = [ + { name = "keypress"; spec = "0.1.x"; } + ]; + patchLatest = false; + sha1 = "fd5713bfa153c7d6cc599378a5ab4c45c535029e"; + tarball = "http://registry.npmjs.org/commander/-/commander-1.2.0.tgz"; + } + { + name = "config-chain"; + spec = "~1.1.1"; + version = "1.1.7"; + topLevel = false; + dependencies = [ + { name = "proto-list"; spec = "~1.2.1"; } + { name = "ini"; spec = "1"; } + ]; + patchLatest = false; + sha1 = "99fcaaaf343a557782a142d201747bb8142bbf9a"; + tarball = "http://registry.npmjs.org/config-chain/-/config-chain-1.1.7.tgz"; + } + { + name = "connect"; + spec = "2.7.5"; + version = "2.7.5"; + topLevel = false; + dependencies = [ + { name = "qs"; spec = "0.5.1"; } + { name = "formidable"; spec = "1.0.11"; } + { name = "cookie-signature"; spec = "1.0.0"; } + { name = "buffer-crc32"; spec = "0.1.1"; } + { name = "cookie"; spec = "0.0.5"; } + { name = "send"; spec = "0.1.0"; } + { name = "bytes"; spec = "0.2.0"; } + { name = "fresh"; spec = "0.1.0"; } + { name = "pause"; spec = "0.0.1"; } + { name = "debug"; spec = "*"; } + ]; + patchLatest = false; + sha1 = "139111b4b03f0533a524927a88a646ae467b2c02"; + tarball = "http://registry.npmjs.org/connect/-/connect-2.7.5.tgz"; + } + { + name = "connect"; + spec = "2.8.4"; + version = "2.8.4"; + topLevel = false; + dependencies = [ + { name = "qs"; spec = "0.6.5"; } + { name = "formidable"; spec = "1.0.14"; } + { name = "cookie-signature"; spec = "1.0.1"; } + { name = "buffer-crc32"; spec = "0.2.1"; } + { name = "cookie"; spec = "0.1.0"; } + { name = "send"; spec = "0.1.3"; } + { name = "bytes"; spec = "0.2.0"; } + { name = "fresh"; spec = "0.1.0"; } + { name = "pause"; spec = "0.0.1"; } + { name = "uid2"; spec = "0.0.2"; } + { name = "debug"; spec = "*"; } + { name = "methods"; spec = "0.0.1"; } + ]; + patchLatest = false; + sha1 = "ead3eb0e7c5e79bf25e246371d85849cbbbbc656"; + tarball = "http://registry.npmjs.org/connect/-/connect-2.8.4.tgz"; + } + { + name = "connect"; + spec = "~2"; + version = "2.8.4"; + topLevel = false; + dependencies = [ + { name = "qs"; spec = "0.6.5"; } + { name = "formidable"; spec = "1.0.14"; } + { name = "cookie-signature"; spec = "1.0.1"; } + { name = "buffer-crc32"; spec = "0.2.1"; } + { name = "cookie"; spec = "0.1.0"; } + { name = "send"; spec = "0.1.3"; } + { name = "bytes"; spec = "0.2.0"; } + { name = "fresh"; spec = "0.1.0"; } + { name = "pause"; spec = "0.0.1"; } + { name = "uid2"; spec = "0.0.2"; } + { name = "debug"; spec = "*"; } + { name = "methods"; spec = "0.0.1"; } + ]; + patchLatest = false; + sha1 = "ead3eb0e7c5e79bf25e246371d85849cbbbbc656"; + tarball = "http://registry.npmjs.org/connect/-/connect-2.8.4.tgz"; + } + { + name = "connect-flash"; + spec = "*"; + version = "0.1.1"; + topLevel = true; + dependencies = [ + ]; + patchLatest = false; + sha1 = "d8630f26d95a7f851f9956b1e8cc6732f3b6aa30"; + tarball = "http://registry.npmjs.org/connect-flash/-/connect-flash-0.1.1.tgz"; + } + { + name = "connect-mongo"; + spec = "*"; + version = "0.3.3"; + topLevel = true; + dependencies = [ + { name = "mongodb"; spec = "1.2.x"; } + ]; + patchLatest = false; + sha1 = "aeaa1ca8c947599131bd90e1a024cdb789fe0100"; + tarball = "http://registry.npmjs.org/connect-mongo/-/connect-mongo-0.3.3.tgz"; + } + { + name = "console-browserify"; + spec = "0.1.x"; + version = "0.1.6"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "d128a3c0bb88350eb5626c6e7c71a6f0fd48983c"; + tarball = "http://registry.npmjs.org/console-browserify/-/console-browserify-0.1.6.tgz"; + } + { + name = "constantinople"; + spec = "~1.0.1"; + version = "1.0.1"; + topLevel = false; + dependencies = [ + { name = "uglify-js"; spec = "~2.3.6"; } + ]; + patchLatest = false; + sha1 = "038727385eb70567ffb5a825abc44870b56f4de9"; + tarball = "http://registry.npmjs.org/constantinople/-/constantinople-1.0.1.tgz"; + } + { + name = "cookie"; + spec = "0.0.5"; + version = "0.0.5"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "f9acf9db57eb7568c9fcc596256b7bb22e307c81"; + tarball = "http://registry.npmjs.org/cookie/-/cookie-0.0.5.tgz"; + } + { + name = "cookie"; + spec = "0.1.0"; + version = "0.1.0"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "90eb469ddce905c866de687efc43131d8801f9d0"; + tarball = "http://registry.npmjs.org/cookie/-/cookie-0.1.0.tgz"; + } + { + name = "cookie-jar"; + spec = "~0.2.0"; + version = "0.2.0"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "64ecc06ac978db795e4b5290cbe48ba3781400fa"; + tarball = "http://registry.npmjs.org/cookie-jar/-/cookie-jar-0.2.0.tgz"; + } + { + name = "cookie-jar"; + spec = "~0.3.0"; + version = "0.3.0"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "bc9a27d4e2b97e186cd57c9e2063cb99fa68cccc"; + tarball = "http://registry.npmjs.org/cookie-jar/-/cookie-jar-0.3.0.tgz"; + } + { + name = "cookie-signature"; + spec = "1.0.0"; + version = "1.0.0"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "0044f332ac623df851c914e88eacc57f0c9704fe"; + tarball = "http://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.0.tgz"; + } + { + name = "cookie-signature"; + spec = "1.0.1"; + version = "1.0.1"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "44e072148af01e6e8e24afbf12690d68ae698ecb"; + tarball = "http://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.1.tgz"; + } + { + name = "cookiejar"; + spec = "1.3.0"; + version = "1.3.0"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "dd00b35679021e99cbd4e855b9ad041913474765"; + tarball = "http://registry.npmjs.org/cookiejar/-/cookiejar-1.3.0.tgz"; + } + { + name = "cookies"; + spec = ">= 0.2.2"; + version = "0.3.6"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "1b5e4bd66fc732ea2e8b5087a8fb3718b4ec8597"; + tarball = "http://registry.npmjs.org/cookies/-/cookies-0.3.6.tgz"; + } + { + name = "couch-login"; + spec = "~0.1.15"; + version = "0.1.17"; + topLevel = false; + dependencies = [ + { name = "request"; spec = "2 >=2.14"; } + ]; + patchLatest = false; + sha1 = "ab3ac31dd56e1061ea5f7faa838c7bda32a2b2ed"; + tarball = "http://registry.npmjs.org/couch-login/-/couch-login-0.1.17.tgz"; + } + { + name = "cryptiles"; + spec = "0.1.x"; + version = "0.1.3"; + topLevel = false; + dependencies = [ + { name = "boom"; spec = "0.3.x"; } + ]; + patchLatest = false; + sha1 = "1a556734f06d24ba34862ae9cb9e709a3afbff1c"; + tarball = "http://registry.npmjs.org/cryptiles/-/cryptiles-0.1.3.tgz"; + } + { + name = "cryptiles"; + spec = "0.2.x"; + version = "0.2.2"; + topLevel = false; + dependencies = [ + { name = "boom"; spec = "0.4.x"; } + ]; + patchLatest = false; + sha1 = "ed91ff1f17ad13d3748288594f8a48a0d26f325c"; + tarball = "http://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz"; + } + { + name = "css"; + spec = "~1.0.8"; + version = "1.0.8"; + topLevel = false; + dependencies = [ + { name = "css-parse"; spec = "1.0.4"; } + { name = "css-stringify"; spec = "1.0.5"; } + ]; + patchLatest = false; + sha1 = "9386811ca82bccc9ee7fb5a732b1e2a317c8a3e7"; + tarball = "http://registry.npmjs.org/css/-/css-1.0.8.tgz"; + } + { + name = "css-parse"; + spec = "1.0.4"; + version = "1.0.4"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "38b0503fbf9da9f54e9c1dbda60e145c77117bdd"; + tarball = "http://registry.npmjs.org/css-parse/-/css-parse-1.0.4.tgz"; + } + { + name = "css-stringify"; + spec = "1.0.5"; + version = "1.0.5"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "b0d042946db2953bb9d292900a6cb5f6d0122031"; + tarball = "http://registry.npmjs.org/css-stringify/-/css-stringify-1.0.5.tgz"; + } + { + name = "cssom"; + spec = "0.2.x"; + version = "0.2.5"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "2682709b5902e7212df529116ff788cd5b254894"; + tarball = "http://registry.npmjs.org/cssom/-/cssom-0.2.5.tgz"; + } + { + name = "ctype"; + spec = "0.5.0"; + version = "0.5.0"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "672673ec67587eb495c1ed694da1abb964ff65e3"; + tarball = "http://registry.npmjs.org/ctype/-/ctype-0.5.0.tgz"; + } + { + name = "ctype"; + spec = "0.5.2"; + version = "0.5.2"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "fe8091d468a373a0b0c9ff8bbfb3425c00973a1d"; + tarball = "http://registry.npmjs.org/ctype/-/ctype-0.5.2.tgz"; + } + { + name = "cycle"; + spec = "1.0.x"; + version = "1.0.2"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "269aca6f1b8d2baeefc8ccbc888b459f322c4e60"; + tarball = "http://registry.npmjs.org/cycle/-/cycle-1.0.2.tgz"; + } + { + name = "debug"; + spec = "*"; + version = "0.7.2"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "056692c86670977f115de82917918b8e8b9a10f0"; + tarball = "http://registry.npmjs.org/debug/-/debug-0.7.2.tgz"; + } + { + name = "debug"; + spec = "~0.7.0"; + version = "0.7.2"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "056692c86670977f115de82917918b8e8b9a10f0"; + tarball = "http://registry.npmjs.org/debug/-/debug-0.7.2.tgz"; + } + { + name = "debug"; + spec = "~0.7.2"; + version = "0.7.2"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "056692c86670977f115de82917918b8e8b9a10f0"; + tarball = "http://registry.npmjs.org/debug/-/debug-0.7.2.tgz"; + } + { + name = "deep-equal"; + spec = "*"; + version = "0.0.0"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "99679d3bbd047156fcd450d3d01eeb9068691e83"; + tarball = "http://registry.npmjs.org/deep-equal/-/deep-equal-0.0.0.tgz"; + } + { + name = "deep-equal"; + spec = "0.0.0"; + version = "0.0.0"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "99679d3bbd047156fcd450d3d01eeb9068691e83"; + tarball = "http://registry.npmjs.org/deep-equal/-/deep-equal-0.0.0.tgz"; + } + { + name = "delayed-stream"; + spec = "0.0.5"; + version = "0.0.5"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "d4b1f43a93e8296dfe02694f4680bc37a313c73f"; + tarball = "http://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"; + } + { + name = "diff"; + spec = "1.0.2"; + version = "1.0.2"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "4ae73f1aee8d6fcf484f1a1ce77ce651d9b7f0c9"; + tarball = "http://registry.npmjs.org/diff/-/diff-1.0.2.tgz"; + } + { + name = "director"; + spec = "1.1.10"; + version = "1.1.10"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "e6c1d64f2f079216f19ea83b566035dde9901179"; + tarball = "http://registry.npmjs.org/director/-/director-1.1.10.tgz"; + } + { + name = "dtrace-provider"; + spec = "0.2.8"; + version = "0.2.8"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "e243f19219aa95fbf0d8f2ffb07f5bd64e94fe20"; + tarball = "http://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.2.8.tgz"; + } + { + name = "editor"; + spec = "0.0.4"; + version = "0.0.4"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "478920f77bca6c1c1749d5e3edde4bd5966efda8"; + tarball = "http://registry.npmjs.org/editor/-/editor-0.0.4.tgz"; + } + { + name = "emitter-component"; + spec = "1.0.0"; + version = "1.0.0"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "f04dd18fc3dc3e9a74cbc0f310b088666e4c016f"; + tarball = "http://registry.npmjs.org/emitter-component/-/emitter-component-1.0.0.tgz"; + } + { + name = "escape-html"; + spec = "*"; + version = "1.0.0"; + topLevel = true; + dependencies = [ + ]; + patchLatest = false; + sha1 = "fedcd79564444ddaf2bd85b22c9961b3a3a38bf5"; + tarball = "http://registry.npmjs.org/escape-html/-/escape-html-1.0.0.tgz"; + } + { + name = "event-stream"; + spec = "~0.5"; + version = "0.5.3"; + topLevel = false; + dependencies = [ + { name = "optimist"; spec = "0.2"; } + ]; + patchLatest = false; + sha1 = "b77b9309f7107addfeab63f0c0eafd8db0bd8c1c"; + tarball = "http://registry.npmjs.org/event-stream/-/event-stream-0.5.3.tgz"; + } + { + name = "eventemitter2"; + spec = "0.4.11"; + version = "0.4.11"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "8bbf2b6ac7b31e2eea0c8d8f533ef41f849a9e2c"; + tarball = "http://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.11.tgz"; + } + { + name = "eventemitter2"; + spec = "~0.4.11"; + version = "0.4.12"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "6cf14249fdc8799be7416e871e73fd2bb89e35e0"; + tarball = "http://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.12.tgz"; + } + { + name = "events.node"; + spec = ">= 0.4.0"; + version = "0.4.9"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "82998ea749501145fd2da7cf8ecbe6420fac02a4"; + tarball = "http://registry.npmjs.org/events.node/-/events.node-0.4.9.tgz"; + } + { + name = "express"; + spec = "*"; + version = "3.3.4"; + topLevel = true; + dependencies = [ + { name = "connect"; spec = "2.8.4"; } + { name = "commander"; spec = "1.2.0"; } + { name = "range-parser"; spec = "0.0.4"; } + { name = "mkdirp"; spec = "0.3.5"; } + { name = "cookie"; spec = "0.1.0"; } + { name = "buffer-crc32"; spec = "0.2.1"; } + { name = "fresh"; spec = "0.1.0"; } + { name = "methods"; spec = "0.0.1"; } + { name = "send"; spec = "0.1.3"; } + { name = "cookie-signature"; spec = "1.0.1"; } + { name = "debug"; spec = "*"; } + ]; + patchLatest = false; + sha1 = "9abf22017213a8f6f54a421ce22b8ec27b7def62"; + tarball = "http://registry.npmjs.org/express/-/express-3.3.4.tgz"; + } + { + name = "express"; + spec = "~3.1.1"; + version = "3.1.2"; + topLevel = false; + dependencies = [ + { name = "connect"; spec = "2.7.5"; } + { name = "commander"; spec = "0.6.1"; } + { name = "range-parser"; spec = "0.0.4"; } + { name = "mkdirp"; spec = "~0.3.4"; } + { name = "cookie"; spec = "0.0.5"; } + { name = "buffer-crc32"; spec = "~0.2.1"; } + { name = "fresh"; spec = "0.1.0"; } + { name = "methods"; spec = "0.0.1"; } + { name = "send"; spec = "0.1.0"; } + { name = "cookie-signature"; spec = "1.0.0"; } + { name = "debug"; spec = "*"; } + ]; + patchLatest = false; + sha1 = "52a02c8db8f22bbfa0d7478d847cd45161f985f7"; + tarball = "http://registry.npmjs.org/express/-/express-3.1.2.tgz"; + } + { + name = "extend"; + spec = "*"; + version = "1.1.3"; + topLevel = true; + dependencies = [ + ]; + patchLatest = false; + sha1 = "5ae3d12e33009879dfb574e911a2da1e3da29ef4"; + tarball = "http://registry.npmjs.org/extend/-/extend-1.1.3.tgz"; + } + { + name = "extsprintf"; + spec = "1.0.0"; + version = "1.0.0"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "4d58b815ace5bebfc4ebf03cf98b0a7604a99b86"; + tarball = "http://registry.npmjs.org/extsprintf/-/extsprintf-1.0.0.tgz"; + } + { + name = "extsprintf"; + spec = "1.0.2"; + version = "1.0.2"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "e1080e0658e300b06294990cc70e1502235fd550"; + tarball = "http://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz"; + } + { + name = "eyes"; + spec = "0.1.x"; + version = "0.1.8"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "62cf120234c683785d902348a800ef3e0cc20bc0"; + tarball = "http://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz"; + } + { + name = "faye-websocket"; + spec = "*"; + version = "0.6.1"; + topLevel = true; + dependencies = [ + { name = "websocket-driver"; spec = ">=0.2.0"; } + ]; + patchLatest = false; + sha1 = "43a54b2ab807761d7ec335d12f48eb69ec4ab61c"; + tarball = "http://registry.npmjs.org/faye-websocket/-/faye-websocket-0.6.1.tgz"; + } + { + name = "faye-websocket"; + spec = "0.4.4"; + version = "0.4.4"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "c14c5b3bf14d7417ffbfd990c0a7495cd9f337bc"; + tarball = "http://registry.npmjs.org/faye-websocket/-/faye-websocket-0.4.4.tgz"; + } + { + name = "flatiron"; + spec = "0.3.5"; + version = "0.3.5"; + topLevel = false; + dependencies = [ + { name = "broadway"; spec = "0.2.7"; } + { name = "optimist"; spec = "0.3.5"; } + { name = "prompt"; spec = "0.2.9"; } + { name = "director"; spec = "1.1.10"; } + { name = "pkginfo"; spec = "0.3.0"; } + ]; + patchLatest = false; + sha1 = "a91fe730f6a7fc1ea655a0ca48eaa977bef64625"; + tarball = "http://registry.npmjs.org/flatiron/-/flatiron-0.3.5.tgz"; + } + { + name = "forEachAsync"; + spec = "~2.2"; + version = "2.2.0"; + topLevel = false; + dependencies = [ + { name = "sequence"; spec = ">= 2.2.1"; } + ]; + patchLatest = false; + sha1 = "093b32ce868cb69f5166dcf331fae074adc71cee"; + tarball = "http://registry.npmjs.org/forEachAsync/-/forEachAsync-2.2.0.tgz"; + } + { + name = "forever"; + spec = "*"; + version = "0.10.8"; + topLevel = true; + dependencies = [ + { name = "colors"; spec = "0.6.0-1"; } + { name = "cliff"; spec = "0.1.8"; } + { name = "flatiron"; spec = "0.3.5"; } + { name = "forever-monitor"; spec = "1.2.2"; } + { name = "nconf"; spec = "0.6.7"; } + { name = "nssocket"; spec = "~0.5.1"; } + { name = "optimist"; spec = "0.4.0"; } + { name = "pkginfo"; spec = "0.3.0"; } + { name = "timespan"; spec = "2.0.1"; } + { name = "watch"; spec = "0.7.0"; } + { name = "utile"; spec = "0.1.7"; } + { name = "winston"; spec = "0.7.1"; } + ]; + patchLatest = false; + sha1 = "a78137a46fb8ca4adbf2f497d98816a526bb1f82"; + tarball = "http://registry.npmjs.org/forever/-/forever-0.10.8.tgz"; + } + { + name = "forever-agent"; + spec = "~0.2.0"; + version = "0.2.0"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "e1c25c7ad44e09c38f233876c76fcc24ff843b1f"; + tarball = "http://registry.npmjs.org/forever-agent/-/forever-agent-0.2.0.tgz"; + } + { + name = "forever-agent"; + spec = "~0.5.0"; + version = "0.5.0"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "0c1647a74f3af12d76a07a99490ade7c7249c8f0"; + tarball = "http://registry.npmjs.org/forever-agent/-/forever-agent-0.5.0.tgz"; + } + { + name = "forever-monitor"; + spec = "1.2.2"; + version = "1.2.2"; + topLevel = false; + dependencies = [ + { name = "broadway"; spec = "0.2.x"; } + { name = "minimatch"; spec = "0.0.x"; } + { name = "pkginfo"; spec = "0.x.x"; } + { name = "ps-tree"; spec = "0.0.x"; } + { name = "watch"; spec = "0.5.x"; } + { name = "utile"; spec = "0.1.x"; } + ]; + patchLatest = false; + sha1 = "c1ad6c6ab837a89fa2d47bb439727ca968235684"; + tarball = "http://registry.npmjs.org/forever-monitor/-/forever-monitor-1.2.2.tgz"; + } + { + name = "form-data"; + spec = "0.0.8"; + version = "0.0.8"; + topLevel = false; + dependencies = [ + { name = "combined-stream"; spec = "~0.0.4"; } + { name = "mime"; spec = "~1.2.2"; } + { name = "async"; spec = "~0.2.7"; } + ]; + patchLatest = false; + sha1 = "0890cd1005c5ccecc0b9d24a88052c92442d0db5"; + tarball = "http://registry.npmjs.org/form-data/-/form-data-0.0.8.tgz"; + } + { + name = "form-data"; + spec = "~0.0.3"; + version = "0.0.10"; + topLevel = false; + dependencies = [ + { name = "combined-stream"; spec = "~0.0.4"; } + { name = "mime"; spec = "~1.2.2"; } + { name = "async"; spec = "~0.2.7"; } + ]; + patchLatest = false; + sha1 = "db345a5378d86aeeb1ed5d553b869ac192d2f5ed"; + tarball = "http://registry.npmjs.org/form-data/-/form-data-0.0.10.tgz"; + } + { + name = "formidable"; + spec = "1.0.11"; + version = "1.0.11"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "68f63325a035e644b6f7bb3d11243b9761de1b30"; + tarball = "http://registry.npmjs.org/formidable/-/formidable-1.0.11.tgz"; + } + { + name = "formidable"; + spec = "1.0.13"; + version = "1.0.13"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "70caf0f9d69692a77e04021ddab4f46b01c82aea"; + tarball = "http://registry.npmjs.org/formidable/-/formidable-1.0.13.tgz"; + } + { + name = "formidable"; + spec = "1.0.14"; + version = "1.0.14"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "2b3f4c411cbb5fdd695c44843e2a23514a43231a"; + tarball = "http://registry.npmjs.org/formidable/-/formidable-1.0.14.tgz"; + } + { + name = "formidable"; + spec = "1.0.9"; + version = "1.0.9"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "419e3bccead3e8874d539f5b3e72a4c503b31a98"; + tarball = "http://registry.npmjs.org/formidable/-/formidable-1.0.9.tgz"; + } + { + name = "fresh"; + spec = "0.1.0"; + version = "0.1.0"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "03e4b0178424e4c2d5d19a54d8814cdc97934850"; + tarball = "http://registry.npmjs.org/fresh/-/fresh-0.1.0.tgz"; + } + { + name = "fstream"; + spec = "0"; + version = "0.1.23"; + topLevel = false; + dependencies = [ + { name = "rimraf"; spec = "2"; } + { name = "mkdirp"; spec = "0.3"; } + { name = "graceful-fs"; spec = "~2.0.0"; } + { name = "inherits"; spec = "~1.0.0"; } + ]; + patchLatest = false; + sha1 = "e1ac8d0945a7f27789e71f00a6d86575d14fc4ec"; + tarball = "http://registry.npmjs.org/fstream/-/fstream-0.1.23.tgz"; + } + { + name = "fstream"; + spec = "~0.1.17"; + version = "0.1.23"; + topLevel = false; + dependencies = [ + { name = "rimraf"; spec = "2"; } + { name = "mkdirp"; spec = "0.3"; } + { name = "graceful-fs"; spec = "~2.0.0"; } + { name = "inherits"; spec = "~1.0.0"; } + ]; + patchLatest = false; + sha1 = "e1ac8d0945a7f27789e71f00a6d86575d14fc4ec"; + tarball = "http://registry.npmjs.org/fstream/-/fstream-0.1.23.tgz"; + } + { + name = "fstream"; + spec = "~0.1.23"; + version = "0.1.23"; + topLevel = false; + dependencies = [ + { name = "rimraf"; spec = "2"; } + { name = "mkdirp"; spec = "0.3"; } + { name = "graceful-fs"; spec = "~2.0.0"; } + { name = "inherits"; spec = "~1.0.0"; } + ]; + patchLatest = false; + sha1 = "e1ac8d0945a7f27789e71f00a6d86575d14fc4ec"; + tarball = "http://registry.npmjs.org/fstream/-/fstream-0.1.23.tgz"; + } + { + name = "fstream"; + spec = "~0.1.8"; + version = "0.1.23"; + topLevel = false; + dependencies = [ + { name = "rimraf"; spec = "2"; } + { name = "mkdirp"; spec = "0.3"; } + { name = "graceful-fs"; spec = "~2.0.0"; } + { name = "inherits"; spec = "~1.0.0"; } + ]; + patchLatest = false; + sha1 = "e1ac8d0945a7f27789e71f00a6d86575d14fc4ec"; + tarball = "http://registry.npmjs.org/fstream/-/fstream-0.1.23.tgz"; + } + { + name = "fstream-ignore"; + spec = "~0.0.5"; + version = "0.0.7"; + topLevel = false; + dependencies = [ + { name = "minimatch"; spec = "~0.2.0"; } + { name = "fstream"; spec = "~0.1.17"; } + { name = "inherits"; spec = "2"; } + ]; + patchLatest = false; + sha1 = "eea3033f0c3728139de7b57ab1b0d6d89c353c63"; + tarball = "http://registry.npmjs.org/fstream-ignore/-/fstream-ignore-0.0.7.tgz"; + } + { + name = "fstream-npm"; + spec = "~0.1.3"; + version = "0.1.5"; + topLevel = false; + dependencies = [ + { name = "fstream-ignore"; spec = "~0.0.5"; } + { name = "inherits"; spec = "2"; } + ]; + patchLatest = false; + sha1 = "8f9fdd38c0940f91f7b6ebda4b6611be88f97ec9"; + tarball = "http://registry.npmjs.org/fstream-npm/-/fstream-npm-0.1.5.tgz"; + } + { + name = "github-url-from-git"; + spec = "~1.1.1"; + version = "1.1.1"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "1f89623453123ef9623956e264c60bf4c3cf5ccf"; + tarball = "http://registry.npmjs.org/github-url-from-git/-/github-url-from-git-1.1.1.tgz"; + } + { + name = "glob"; + spec = "3"; + version = "3.2.3"; + topLevel = false; + dependencies = [ + { name = "minimatch"; spec = "~0.2.11"; } + { name = "graceful-fs"; spec = "~2.0.0"; } + { name = "inherits"; spec = "2"; } + ]; + patchLatest = false; + sha1 = "e313eeb249c7affaa5c475286b0e115b59839467"; + tarball = "http://registry.npmjs.org/glob/-/glob-3.2.3.tgz"; + } + { + name = "glob"; + spec = "3.2.1"; + version = "3.2.1"; + topLevel = false; + dependencies = [ + { name = "minimatch"; spec = "~0.2.11"; } + { name = "graceful-fs"; spec = "~1.2.0"; } + { name = "inherits"; spec = "1"; } + ]; + patchLatest = false; + sha1 = "57af70ec73ba2323bfe3f29a067765db64c5d758"; + tarball = "http://registry.npmjs.org/glob/-/glob-3.2.1.tgz"; + } + { + name = "glob"; + spec = ">= 3.1.4"; + version = "3.2.3"; + topLevel = false; + dependencies = [ + { name = "minimatch"; spec = "~0.2.11"; } + { name = "graceful-fs"; spec = "~2.0.0"; } + { name = "inherits"; spec = "2"; } + ]; + patchLatest = false; + sha1 = "e313eeb249c7affaa5c475286b0e115b59839467"; + tarball = "http://registry.npmjs.org/glob/-/glob-3.2.3.tgz"; + } + { + name = "glob"; + spec = "~3.2.1"; + version = "3.2.3"; + topLevel = false; + dependencies = [ + { name = "minimatch"; spec = "~0.2.11"; } + { name = "graceful-fs"; spec = "~2.0.0"; } + { name = "inherits"; spec = "2"; } + ]; + patchLatest = false; + sha1 = "e313eeb249c7affaa5c475286b0e115b59839467"; + tarball = "http://registry.npmjs.org/glob/-/glob-3.2.3.tgz"; + } + { + name = "glob"; + spec = "~3.2.3"; + version = "3.2.3"; + topLevel = false; + dependencies = [ + { name = "minimatch"; spec = "~0.2.11"; } + { name = "graceful-fs"; spec = "~2.0.0"; } + { name = "inherits"; spec = "2"; } + ]; + patchLatest = false; + sha1 = "e313eeb249c7affaa5c475286b0e115b59839467"; + tarball = "http://registry.npmjs.org/glob/-/glob-3.2.3.tgz"; + } + { + name = "graceful-fs"; + spec = "1.2"; + version = "1.2.3"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "15a4806a57547cb2d2dbf27f42e89a8c3451b364"; + tarball = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz"; + } + { + name = "graceful-fs"; + spec = "2"; + version = "2.0.0"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "c9a206f6f5f4b94e1046dfaaccfe9e12d0ab8cef"; + tarball = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.0.tgz"; + } + { + name = "graceful-fs"; + spec = "~1"; + version = "1.2.3"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "15a4806a57547cb2d2dbf27f42e89a8c3451b364"; + tarball = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz"; + } + { + name = "graceful-fs"; + spec = "~1.2"; + version = "1.2.3"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "15a4806a57547cb2d2dbf27f42e89a8c3451b364"; + tarball = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz"; + } + { + name = "graceful-fs"; + spec = "~1.2.0"; + version = "1.2.3"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "15a4806a57547cb2d2dbf27f42e89a8c3451b364"; + tarball = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz"; + } + { + name = "graceful-fs"; + spec = "~2.0.0"; + version = "2.0.0"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "c9a206f6f5f4b94e1046dfaaccfe9e12d0ab8cef"; + tarball = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.0.tgz"; + } + { + name = "growl"; + spec = "1.5.x"; + version = "1.5.1"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "1decd1f22a4b30dae7d363799ec624cf40cc0070"; + tarball = "http://registry.npmjs.org/growl/-/growl-1.5.1.tgz"; + } + { + name = "growl"; + spec = "1.7.x"; + version = "1.7.0"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "de2d66136d002e112ba70f3f10c31cf7c350b2da"; + tarball = "http://registry.npmjs.org/growl/-/growl-1.7.0.tgz"; + } + { + name = "gzippo"; + spec = "*"; + version = "0.2.0"; + topLevel = true; + dependencies = [ + { name = "send"; spec = "*"; } + ]; + patchLatest = false; + sha1 = "ffc594c482190c56531ed2d4a5864d0b0b7d2733"; + tarball = "http://registry.npmjs.org/gzippo/-/gzippo-0.2.0.tgz"; + } + { + name = "hat"; + spec = "*"; + version = "0.0.3"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "bb014a9e64b3788aed8005917413d4ff3d502d8a"; + tarball = "http://registry.npmjs.org/hat/-/hat-0.0.3.tgz"; + } + { + name = "hawk"; + spec = "~0.10.2"; + version = "0.10.2"; + topLevel = false; + dependencies = [ + { name = "hoek"; spec = "0.7.x"; } + { name = "boom"; spec = "0.3.x"; } + { name = "cryptiles"; spec = "0.1.x"; } + { name = "sntp"; spec = "0.1.x"; } + ]; + patchLatest = false; + sha1 = "9b361dee95a931640e6d504e05609a8fc3ac45d2"; + tarball = "http://registry.npmjs.org/hawk/-/hawk-0.10.2.tgz"; + } + { + name = "hawk"; + spec = "~0.13.0"; + version = "0.13.1"; + topLevel = false; + dependencies = [ + { name = "hoek"; spec = "0.8.x"; } + { name = "boom"; spec = "0.4.x"; } + { name = "cryptiles"; spec = "0.2.x"; } + { name = "sntp"; spec = "0.2.x"; } + ]; + patchLatest = false; + sha1 = "3617958821f58311e4d7f6de291fca662b412ef4"; + tarball = "http://registry.npmjs.org/hawk/-/hawk-0.13.1.tgz"; + } + { + name = "hiredis"; + spec = "*"; + version = "0.1.15"; + topLevel = false; + dependencies = [ + { name = "bindings"; spec = "*"; } + ]; + patchLatest = false; + sha1 = "00eb2205c85dcf50de838203e513896dc304dd49"; + tarball = "http://registry.npmjs.org/hiredis/-/hiredis-0.1.15.tgz"; + } + { + name = "hoek"; + spec = "0.7.x"; + version = "0.7.6"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "60fbd904557541cd2b8795abf308a1b3770e155a"; + tarball = "http://registry.npmjs.org/hoek/-/hoek-0.7.6.tgz"; + } + { + name = "hoek"; + spec = "0.8.x"; + version = "0.8.5"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "1e9fd770ef7ebe0274adfcb5b0806a025a5e4e9f"; + tarball = "http://registry.npmjs.org/hoek/-/hoek-0.8.5.tgz"; + } + { + name = "hoek"; + spec = "0.9.x"; + version = "0.9.1"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "3d322462badf07716ea7eb85baf88079cddce505"; + tarball = "http://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"; + } + { + name = "hooks"; + spec = "0.2.1"; + version = "0.2.1"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "0f591b1b344bdcb3df59773f62fbbaf85bf4028b"; + tarball = "http://registry.npmjs.org/hooks/-/hooks-0.2.1.tgz"; + } + { + name = "htdigest"; + spec = "1.0.7"; + version = "1.0.7"; + topLevel = false; + dependencies = [ + { name = "commander"; spec = "0.5.1"; } + ]; + patchLatest = false; + sha1 = "0c55ba3a018855e134fd82f7a4aa6235167181b2"; + tarball = "http://registry.npmjs.org/htdigest/-/htdigest-1.0.7.tgz"; + } + { + name = "htpasswd"; + spec = "1.1.0"; + version = "1.1.0"; + topLevel = false; + dependencies = [ + { name = "commander"; spec = "0.5.1"; } + ]; + patchLatest = false; + sha1 = "4e9e6a2203405005aa1ae7dee80d3b6d6a8d93d6"; + tarball = "http://registry.npmjs.org/htpasswd/-/htpasswd-1.1.0.tgz"; + } + { + name = "http-auth"; + spec = "1.2.7"; + version = "1.2.7"; + topLevel = false; + dependencies = [ + { name = "node-uuid"; spec = "1.2.0"; } + { name = "htpasswd"; spec = "1.1.0"; } + { name = "htdigest"; spec = "1.0.7"; } + ]; + patchLatest = false; + sha1 = "d15b9c08646c9fdcc4f92edb9888f57cb6cf9ca7"; + tarball = "http://registry.npmjs.org/http-auth/-/http-auth-1.2.7.tgz"; + } + { + name = "http-signature"; + spec = "0.9.11"; + version = "0.9.11"; + topLevel = false; + dependencies = [ + { name = "assert-plus"; spec = "0.1.2"; } + { name = "asn1"; spec = "0.1.11"; } + { name = "ctype"; spec = "0.5.2"; } + ]; + patchLatest = false; + sha1 = "9e882714572315e6790a5d0a7955efff1f19e653"; + tarball = "http://registry.npmjs.org/http-signature/-/http-signature-0.9.11.tgz"; + } + { + name = "http-signature"; + spec = "~0.10.0"; + version = "0.10.0"; + topLevel = false; + dependencies = [ + { name = "assert-plus"; spec = "0.1.2"; } + { name = "asn1"; spec = "0.1.11"; } + { name = "ctype"; spec = "0.5.2"; } + ]; + patchLatest = false; + sha1 = "1494e4f5000a83c0f11bcc12d6007c530cb99582"; + tarball = "http://registry.npmjs.org/http-signature/-/http-signature-0.10.0.tgz"; + } + { + name = "http-signature"; + spec = "~0.9.11"; + version = "0.9.11"; + topLevel = false; + dependencies = [ + { name = "assert-plus"; spec = "0.1.2"; } + { name = "asn1"; spec = "0.1.11"; } + { name = "ctype"; spec = "0.5.2"; } + ]; + patchLatest = false; + sha1 = "9e882714572315e6790a5d0a7955efff1f19e653"; + tarball = "http://registry.npmjs.org/http-signature/-/http-signature-0.9.11.tgz"; + } + { + name = "i"; + spec = "0.3.x"; + version = "0.3.1"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "6ecf7847caed3168b17b86ccc390d7b805be0ee4"; + tarball = "http://registry.npmjs.org/i/-/i-0.3.1.tgz"; + } + { + name = "i18next"; + spec = "*"; + version = "1.6.8"; + topLevel = true; + dependencies = [ + { name = "cookies"; spec = ">= 0.2.2"; } + ]; + patchLatest = false; + sha1 = "9c5806d50d374d09ad76e13da4c6d7357e8c555b"; + tarball = "http://registry.npmjs.org/i18next/-/i18next-1.6.8.tgz"; + } + { + name = "inherits"; + spec = "1"; + version = "1.0.0"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "38e1975285bf1f7ba9c84da102bb12771322ac48"; + tarball = "http://registry.npmjs.org/inherits/-/inherits-1.0.0.tgz"; + } + { + name = "inherits"; + spec = "1.x"; + version = "1.0.0"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "38e1975285bf1f7ba9c84da102bb12771322ac48"; + tarball = "http://registry.npmjs.org/inherits/-/inherits-1.0.0.tgz"; + } + { + name = "inherits"; + spec = "2"; + version = "2.0.0"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "76c81b3b1c10ddee3a60bf2c247162bc369f8ba8"; + tarball = "http://registry.npmjs.org/inherits/-/inherits-2.0.0.tgz"; + } + { + name = "inherits"; + spec = "~1.0.0"; + version = "1.0.0"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "38e1975285bf1f7ba9c84da102bb12771322ac48"; + tarball = "http://registry.npmjs.org/inherits/-/inherits-1.0.0.tgz"; + } + { + name = "ini"; + spec = "1"; + version = "1.1.0"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "4e808c2ce144c6c1788918e034d6797bc6cf6281"; + tarball = "http://registry.npmjs.org/ini/-/ini-1.1.0.tgz"; + } + { + name = "ini"; + spec = "1.x.x"; + version = "1.1.0"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "4e808c2ce144c6c1788918e034d6797bc6cf6281"; + tarball = "http://registry.npmjs.org/ini/-/ini-1.1.0.tgz"; + } + { + name = "ini"; + spec = "~1.1.0"; + version = "1.1.0"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "4e808c2ce144c6c1788918e034d6797bc6cf6281"; + tarball = "http://registry.npmjs.org/ini/-/ini-1.1.0.tgz"; + } + { + name = "init-package-json"; + spec = "0.0.10"; + version = "0.0.10"; + topLevel = false; + dependencies = [ + { name = "promzard"; spec = "~0.2.0"; } + { name = "read"; spec = "~1.0.1"; } + { name = "read-package-json"; spec = "1"; } + { name = "semver"; spec = "2.x"; } + ]; + patchLatest = false; + sha1 = "7baf10535227e0878105a04e44b78f132475da6a"; + tarball = "http://registry.npmjs.org/init-package-json/-/init-package-json-0.0.10.tgz"; + } + { + name = "is-promise"; + spec = "~1"; + version = "1.0.0"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "b998d17551f16f69f7bd4828f58f018cc81e064f"; + tarball = "http://registry.npmjs.org/is-promise/-/is-promise-1.0.0.tgz"; + } + { + name = "jade"; + spec = "*"; + version = "0.33.0"; + topLevel = true; + dependencies = [ + { name = "commander"; spec = "1.2.0"; } + { name = "mkdirp"; spec = "0.3.x"; } + { name = "transformers"; spec = "2.0.1"; } + { name = "character-parser"; spec = "1.0.2"; } + { name = "monocle"; spec = "0.1.48"; } + { name = "with"; spec = "~1.1.0"; } + { name = "constantinople"; spec = "~1.0.1"; } + ]; + patchLatest = false; + sha1 = "1b0bb45f9dd4ce57723605177713d80bccd4e429"; + tarball = "http://registry.npmjs.org/jade/-/jade-0.33.0.tgz"; + } + { + name = "jade"; + spec = "0.26.3"; + version = "0.26.3"; + topLevel = false; + dependencies = [ + { name = "commander"; spec = "0.6.1"; } + { name = "mkdirp"; spec = "0.3.0"; } + ]; + patchLatest = false; + sha1 = "8f10d7977d8d79f2f6ff862a81b0513ccb25686c"; + tarball = "http://registry.npmjs.org/jade/-/jade-0.26.3.tgz"; + } + { + name = "jayschema"; + spec = "*"; + version = "0.1.5"; + topLevel = true; + dependencies = [ + ]; + patchLatest = false; + sha1 = "348a83baaec3b5fb9901c7efe7e64cdd1a8f46e2"; + tarball = "http://registry.npmjs.org/jayschema/-/jayschema-0.1.5.tgz"; + } + { + name = "jshint"; + spec = "*"; + version = "2.1.4"; + topLevel = true; + dependencies = [ + { name = "shelljs"; spec = "0.1.x"; } + { name = "underscore"; spec = "1.4.x"; } + { name = "cli"; spec = "0.4.x"; } + { name = "minimatch"; spec = "0.x.x"; } + { name = "console-browserify"; spec = "0.1.x"; } + ]; + patchLatest = false; + sha1 = "8d5be86628eea91c073c8700dd6e4c90afd9ab38"; + tarball = "http://registry.npmjs.org/jshint/-/jshint-2.1.4.tgz"; + } + { + name = "json-schema"; + spec = "0.2.2"; + version = "0.2.2"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "50354f19f603917c695f70b85afa77c3b0f23506"; + tarball = "http://registry.npmjs.org/json-schema/-/json-schema-0.2.2.tgz"; + } + { + name = "json-stringify-safe"; + spec = "~3.0.0"; + version = "3.0.0"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "9db7b0e530c7f289c5e8c8432af191c2ff75a5b3"; + tarball = "http://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-3.0.0.tgz"; + } + { + name = "json-stringify-safe"; + spec = "~4.0.0"; + version = "4.0.0"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "77c271aaea54302e68efeaccb56abbf06a9b1a54"; + tarball = "http://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-4.0.0.tgz"; + } + { + name = "jsontool"; + spec = "*"; + version = "6.0.0"; + topLevel = true; + dependencies = [ + ]; + patchLatest = false; + sha1 = "dc2a535b2aa8a10b0b7359c76fa8920cdb92ce6d"; + tarball = "http://registry.npmjs.org/jsontool/-/jsontool-6.0.0.tgz"; + } + { + name = "jsprim"; + spec = "0.3.0"; + version = "0.3.0"; + topLevel = false; + dependencies = [ + { name = "extsprintf"; spec = "1.0.0"; } + { name = "json-schema"; spec = "0.2.2"; } + { name = "verror"; spec = "1.3.3"; } + ]; + patchLatest = false; + sha1 = "cd13466ea2480dbd8396a570d47d31dda476f8b1"; + tarball = "http://registry.npmjs.org/jsprim/-/jsprim-0.3.0.tgz"; + } + { + name = "keep-alive-agent"; + spec = "0.0.1"; + version = "0.0.1"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "44847ca394ce8d6b521ae85816bd64509942b385"; + tarball = "http://registry.npmjs.org/keep-alive-agent/-/keep-alive-agent-0.0.1.tgz"; + } + { + name = "kerberos"; + spec = "0.0.3"; + version = "0.0.3"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "de3c44078eca649501babab04938c948b1252d1b"; + tarball = "http://registry.npmjs.org/kerberos/-/kerberos-0.0.3.tgz"; + } + { + name = "keypress"; + spec = "0.1.x"; + version = "0.1.0"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "4a3188d4291b66b4f65edb99f806aa9ae293592a"; + tarball = "http://registry.npmjs.org/keypress/-/keypress-0.1.0.tgz"; + } + { + name = "knox"; + spec = "*"; + version = "0.8.4"; + topLevel = true; + dependencies = [ + { name = "mime"; spec = "*"; } + { name = "xml2js"; spec = "0.2.x"; } + { name = "debug"; spec = "~0.7.0"; } + { name = "stream-counter"; spec = "~0.1.0"; } + ]; + patchLatest = false; + sha1 = "4e1e98e9942120c3e7fd36286ee4a249b00ac370"; + tarball = "http://registry.npmjs.org/knox/-/knox-0.8.4.tgz"; + } + { + name = "kue"; + spec = "*"; + version = "0.6.2"; + topLevel = true; + dependencies = [ + { name = "redis"; spec = "0.7.2"; } + { name = "express"; spec = "~3.1.1"; } + { name = "jade"; spec = "0.26.3"; } + { name = "stylus"; spec = "0.27.2"; } + { name = "nib"; spec = "0.5.0"; } + { name = "reds"; spec = "0.1.4"; } + ]; + patchLatest = false; + sha1 = "9a6a95081842cf4ee3da5c61770bc23616a943f2"; + tarball = "http://registry.npmjs.org/kue/-/kue-0.6.2.tgz"; + } + { + name = "lazy"; + spec = "~1.0.11"; + version = "1.0.11"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "daa068206282542c088288e975c297c1ae77b690"; + tarball = "http://registry.npmjs.org/lazy/-/lazy-1.0.11.tgz"; + } + { + name = "libyaml"; + spec = "*"; + version = "0.2.2"; + topLevel = true; + dependencies = [ + ]; + patchLatest = false; + sha1 = "a22d5f699911b6b622d6dc323fb62320c877c9c8"; + tarball = "http://registry.npmjs.org/libyaml/-/libyaml-0.2.2.tgz"; + } + { + name = "lockfile"; + spec = "~0.4.0"; + version = "0.4.0"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "0f815a7ee7c3d603ddec6fbfa8a212b5645d54c5"; + tarball = "http://registry.npmjs.org/lockfile/-/lockfile-0.4.0.tgz"; + } + { + name = "lru-cache"; + spec = "2"; + version = "2.3.0"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "1cee12d5a9f28ed1ee37e9c332b8888e6b85412a"; + tarball = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.3.0.tgz"; + } + { + name = "lru-cache"; + spec = "2.2.0"; + version = "2.2.0"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "ec2bba603f4c5bb3e7a1bf62ce1c1dbc1d474e08"; + tarball = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.2.0.tgz"; + } + { + name = "lru-cache"; + spec = "2.3.0"; + version = "2.3.0"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "1cee12d5a9f28ed1ee37e9c332b8888e6b85412a"; + tarball = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.3.0.tgz"; + } + { + name = "lru-cache"; + spec = "~1.0.2"; + version = "1.0.6"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "aa50f97047422ac72543bda177a9c9d018d98452"; + tarball = "http://registry.npmjs.org/lru-cache/-/lru-cache-1.0.6.tgz"; + } + { + name = "lru-cache"; + spec = "~2.3.0"; + version = "2.3.0"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "1cee12d5a9f28ed1ee37e9c332b8888e6b85412a"; + tarball = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.3.0.tgz"; + } + { + name = "methods"; + spec = "0.0.1"; + version = "0.0.1"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "277c90f8bef39709645a8371c51c3b6c648e068c"; + tarball = "http://registry.npmjs.org/methods/-/methods-0.0.1.tgz"; + } + { + name = "mime"; + spec = "*"; + version = "1.2.9"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "009cd40867bd35de521b3b966f04e2f8d4d13d09"; + tarball = "http://registry.npmjs.org/mime/-/mime-1.2.9.tgz"; + } + { + name = "mime"; + spec = "1.2.5"; + version = "1.2.5"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "9eed073022a8bf5e16c8566c6867b8832bfbfa13"; + tarball = "http://registry.npmjs.org/mime/-/mime-1.2.5.tgz"; + } + { + name = "mime"; + spec = "1.2.6"; + version = "1.2.6"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "b1f86c768c025fa87b48075f1709f28aeaf20365"; + tarball = "http://registry.npmjs.org/mime/-/mime-1.2.6.tgz"; + } + { + name = "mime"; + spec = "1.2.9"; + version = "1.2.9"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "009cd40867bd35de521b3b966f04e2f8d4d13d09"; + tarball = "http://registry.npmjs.org/mime/-/mime-1.2.9.tgz"; + } + { + name = "mime"; + spec = "~1.2.2"; + version = "1.2.9"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "009cd40867bd35de521b3b966f04e2f8d4d13d09"; + tarball = "http://registry.npmjs.org/mime/-/mime-1.2.9.tgz"; + } + { + name = "mime"; + spec = "~1.2.7"; + version = "1.2.9"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "009cd40867bd35de521b3b966f04e2f8d4d13d09"; + tarball = "http://registry.npmjs.org/mime/-/mime-1.2.9.tgz"; + } + { + name = "mime"; + spec = "~1.2.9"; + version = "1.2.9"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "009cd40867bd35de521b3b966f04e2f8d4d13d09"; + tarball = "http://registry.npmjs.org/mime/-/mime-1.2.9.tgz"; + } + { + name = "minimatch"; + spec = "0"; + version = "0.2.12"; + topLevel = false; + dependencies = [ + { name = "lru-cache"; spec = "2"; } + { name = "sigmund"; spec = "~1.0.0"; } + ]; + patchLatest = false; + sha1 = "ea82a012ac662c7ddfaa144f1c147e6946f5dafb"; + tarball = "http://registry.npmjs.org/minimatch/-/minimatch-0.2.12.tgz"; + } + { + name = "minimatch"; + spec = "0.0.x"; + version = "0.0.5"; + topLevel = false; + dependencies = [ + { name = "lru-cache"; spec = "~1.0.2"; } + ]; + patchLatest = false; + sha1 = "96bb490bbd3ba6836bbfac111adf75301b1584de"; + tarball = "http://registry.npmjs.org/minimatch/-/minimatch-0.0.5.tgz"; + } + { + name = "minimatch"; + spec = "0.x.x"; + version = "0.2.12"; + topLevel = false; + dependencies = [ + { name = "lru-cache"; spec = "2"; } + { name = "sigmund"; spec = "~1.0.0"; } + ]; + patchLatest = false; + sha1 = "ea82a012ac662c7ddfaa144f1c147e6946f5dafb"; + tarball = "http://registry.npmjs.org/minimatch/-/minimatch-0.2.12.tgz"; + } + { + name = "minimatch"; + spec = ">=0.2.4"; + version = "0.2.12"; + topLevel = false; + dependencies = [ + { name = "lru-cache"; spec = "2"; } + { name = "sigmund"; spec = "~1.0.0"; } + ]; + patchLatest = false; + sha1 = "ea82a012ac662c7ddfaa144f1c147e6946f5dafb"; + tarball = "http://registry.npmjs.org/minimatch/-/minimatch-0.2.12.tgz"; + } + { + name = "minimatch"; + spec = "~0.2.0"; + version = "0.2.12"; + topLevel = false; + dependencies = [ + { name = "lru-cache"; spec = "2"; } + { name = "sigmund"; spec = "~1.0.0"; } + ]; + patchLatest = false; + sha1 = "ea82a012ac662c7ddfaa144f1c147e6946f5dafb"; + tarball = "http://registry.npmjs.org/minimatch/-/minimatch-0.2.12.tgz"; + } + { + name = "minimatch"; + spec = "~0.2.11"; + version = "0.2.12"; + topLevel = false; + dependencies = [ + { name = "lru-cache"; spec = "2"; } + { name = "sigmund"; spec = "~1.0.0"; } + ]; + patchLatest = false; + sha1 = "ea82a012ac662c7ddfaa144f1c147e6946f5dafb"; + tarball = "http://registry.npmjs.org/minimatch/-/minimatch-0.2.12.tgz"; + } + { + name = "minimatch"; + spec = "~0.2.12"; + version = "0.2.12"; + topLevel = false; + dependencies = [ + { name = "lru-cache"; spec = "2"; } + { name = "sigmund"; spec = "~1.0.0"; } + ]; + patchLatest = false; + sha1 = "ea82a012ac662c7ddfaa144f1c147e6946f5dafb"; + tarball = "http://registry.npmjs.org/minimatch/-/minimatch-0.2.12.tgz"; + } + { + name = "minimist"; + spec = "~0.0.1"; + version = "0.0.1"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "fa2439fbf7da8525c51b2a74e2815b380abc8ab6"; + tarball = "http://registry.npmjs.org/minimist/-/minimist-0.0.1.tgz"; + } + { + name = "mkdirp"; + spec = "*"; + version = "0.3.5"; + topLevel = true; + dependencies = [ + ]; + patchLatest = false; + sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7"; + tarball = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz"; + } + { + name = "mkdirp"; + spec = "0"; + version = "0.3.5"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7"; + tarball = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz"; + } + { + name = "mkdirp"; + spec = "0.3"; + version = "0.3.5"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7"; + tarball = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz"; + } + { + name = "mkdirp"; + spec = "0.3.0"; + version = "0.3.0"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "1bbf5ab1ba827af23575143490426455f481fe1e"; + tarball = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz"; + } + { + name = "mkdirp"; + spec = "0.3.5"; + version = "0.3.5"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7"; + tarball = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz"; + } + { + name = "mkdirp"; + spec = "0.3.x"; + version = "0.3.5"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7"; + tarball = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz"; + } + { + name = "mkdirp"; + spec = "0.x.x"; + version = "0.3.5"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7"; + tarball = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz"; + } + { + name = "mkdirp"; + spec = "~0.3.3"; + version = "0.3.5"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7"; + tarball = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz"; + } + { + name = "mkdirp"; + spec = "~0.3.4"; + version = "0.3.5"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7"; + tarball = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz"; + } + { + name = "mocha"; + spec = "*"; + version = "1.12.0"; + topLevel = true; + dependencies = [ + { name = "commander"; spec = "0.6.1"; } + { name = "growl"; spec = "1.7.x"; } + { name = "jade"; spec = "0.26.3"; } + { name = "diff"; spec = "1.0.2"; } + { name = "debug"; spec = "*"; } + { name = "mkdirp"; spec = "0.3.5"; } + { name = "ms"; spec = "0.3.0"; } + { name = "glob"; spec = "3.2.1"; } + ]; + patchLatest = false; + sha1 = "95fc936622ce156b8b19ff8def466ac2f3a3f29e"; + tarball = "http://registry.npmjs.org/mocha/-/mocha-1.12.0.tgz"; + } + { + name = "mocha"; + spec = "~1.3.2"; + version = "1.3.2"; + topLevel = false; + dependencies = [ + { name = "commander"; spec = "0.6.1"; } + { name = "growl"; spec = "1.5.x"; } + { name = "jade"; spec = "0.26.3"; } + { name = "diff"; spec = "1.0.2"; } + { name = "debug"; spec = "*"; } + ]; + patchLatest = false; + sha1 = "ab97b4f1e5942b9fe4d4436b8bd9eeda0eb01e13"; + tarball = "http://registry.npmjs.org/mocha/-/mocha-1.3.2.tgz"; + } + { + name = "mongodb"; + spec = "1.2.x"; + version = "1.2.14"; + topLevel = false; + dependencies = [ + { name = "bson"; spec = "0.1.8"; } + ]; + patchLatest = false; + sha1 = "269665552066437308d0942036646e6795c3a9a3"; + tarball = "http://registry.npmjs.org/mongodb/-/mongodb-1.2.14.tgz"; + } + { + name = "mongodb"; + spec = "1.3.11"; + version = "1.3.11"; + topLevel = false; + dependencies = [ + { name = "bson"; spec = "0.1.9"; } + { name = "kerberos"; spec = "0.0.3"; } + ]; + patchLatest = false; + sha1 = "dba6f669dd30612b3d07fc13e2181b9d2b105da2"; + tarball = "http://registry.npmjs.org/mongodb/-/mongodb-1.3.11.tgz"; + } + { + name = "mongoose"; + spec = "*"; + version = "3.6.14"; + topLevel = true; + dependencies = [ + { name = "hooks"; spec = "0.2.1"; } + { name = "mongodb"; spec = "1.3.11"; } + { name = "ms"; spec = "0.1.0"; } + { name = "sliced"; spec = "0.0.3"; } + { name = "muri"; spec = "0.3.1"; } + { name = "mpromise"; spec = "0.2.1"; } + { name = "mpath"; spec = "0.1.1"; } + { name = "regexp-clone"; spec = "0.0.1"; } + ]; + patchLatest = false; + sha1 = "acf28354ba4f792ded931ccd0dfe038a65757832"; + tarball = "http://registry.npmjs.org/mongoose/-/mongoose-3.6.14.tgz"; + } + { + name = "mongoose-schema-extend"; + spec = "*"; + version = "0.1.3"; + topLevel = true; + dependencies = [ + { name = "owl-deepcopy"; spec = "~0.0.1"; } + { name = "mocha"; spec = "~1.3.2"; } + ]; + patchLatest = false; + sha1 = "8ee39f48c7a0beb4aad555c25cbac59fe7bd6502"; + tarball = "http://registry.npmjs.org/mongoose-schema-extend/-/mongoose-schema-extend-0.1.3.tgz"; + } + { + name = "monocle"; + spec = "0.1.48"; + version = "0.1.48"; + topLevel = false; + dependencies = [ + { name = "readdirp"; spec = "~0.2.3"; } + ]; + patchLatest = false; + sha1 = "b96730f5ca900fa75a56041eb6db10aad980a383"; + tarball = "http://registry.npmjs.org/monocle/-/monocle-0.1.48.tgz"; + } + { + name = "mpath"; + spec = "0.1.1"; + version = "0.1.1"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "23da852b7c232ee097f4759d29c0ee9cd22d5e46"; + tarball = "http://registry.npmjs.org/mpath/-/mpath-0.1.1.tgz"; + } + { + name = "mpromise"; + spec = "0.2.1"; + version = "0.2.1"; + topLevel = false; + dependencies = [ + { name = "sliced"; spec = "0.0.4"; } + ]; + patchLatest = false; + sha1 = "fbbdc28cb0207e49b8a4eb1a4c0cea6c2de794c8"; + tarball = "http://registry.npmjs.org/mpromise/-/mpromise-0.2.1.tgz"; + } + { + name = "ms"; + spec = "0.1.0"; + version = "0.1.0"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "f21fac490daf1d7667fd180fe9077389cc9442b2"; + tarball = "http://registry.npmjs.org/ms/-/ms-0.1.0.tgz"; + } + { + name = "ms"; + spec = "0.3.0"; + version = "0.3.0"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "03edc348d613e66a56486cfdac53bcbe899cbd61"; + tarball = "http://registry.npmjs.org/ms/-/ms-0.3.0.tgz"; + } + { + name = "muri"; + spec = "0.3.1"; + version = "0.3.1"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "861889c5c857f1a43700bee85d50731f61727c9a"; + tarball = "http://registry.npmjs.org/muri/-/muri-0.3.1.tgz"; + } + { + name = "mute-stream"; + spec = "~0.0.2"; + version = "0.0.3"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "f09c090d333b3063f615cbbcca71b349893f0152"; + tarball = "http://registry.npmjs.org/mute-stream/-/mute-stream-0.0.3.tgz"; + } + { + name = "mv"; + spec = "0.0.5"; + version = "0.0.5"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "15eac759479884df1131d6de56bce20b654f5391"; + tarball = "http://registry.npmjs.org/mv/-/mv-0.0.5.tgz"; + } + { + name = "natural"; + spec = "0.0.69"; + version = "0.0.69"; + topLevel = false; + dependencies = [ + { name = "sylvester"; spec = ">= 0.0.12"; } + { name = "apparatus"; spec = ">= 0.0.4"; } + { name = "underscore"; spec = "*"; } + ]; + patchLatest = false; + sha1 = "60d9ce23797a54ec211600eb721cc66779b954d3"; + tarball = "http://registry.npmjs.org/natural/-/natural-0.0.69.tgz"; + } + { + name = "nconf"; + spec = "*"; + version = "0.6.7"; + topLevel = true; + dependencies = [ + { name = "async"; spec = "0.1.x"; } + { name = "ini"; spec = "1.x.x"; } + { name = "optimist"; spec = "0.3.x"; } + { name = "pkginfo"; spec = "0.2.x"; } + ]; + patchLatest = false; + sha1 = "f2ffce75f4573857429c719d9f6ed0a9a231a47c"; + tarball = "http://registry.npmjs.org/nconf/-/nconf-0.6.7.tgz"; + } + { + name = "nconf"; + spec = "0.6.7"; + version = "0.6.7"; + topLevel = false; + dependencies = [ + { name = "async"; spec = "0.1.x"; } + { name = "ini"; spec = "1.x.x"; } + { name = "optimist"; spec = "0.3.x"; } + { name = "pkginfo"; spec = "0.2.x"; } + ]; + patchLatest = false; + sha1 = "f2ffce75f4573857429c719d9f6ed0a9a231a47c"; + tarball = "http://registry.npmjs.org/nconf/-/nconf-0.6.7.tgz"; + } + { + name = "ncp"; + spec = "0.2.x"; + version = "0.2.7"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "46fac2b7dda2560a4cb7e628677bd5f64eac5be1"; + tarball = "http://registry.npmjs.org/ncp/-/ncp-0.2.7.tgz"; + } + { + name = "negotiator"; + spec = "0.2.5"; + version = "0.2.5"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "12ec7b4a9f3b4c894c31d8c4ec015925ba547eec"; + tarball = "http://registry.npmjs.org/negotiator/-/negotiator-0.2.5.tgz"; + } + { + name = "nib"; + spec = "0.5.0"; + version = "0.5.0"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "ad0a7dfa2bca8680c8cb8adaa6ab68c80e5221e5"; + tarball = "http://registry.npmjs.org/nib/-/nib-0.5.0.tgz"; + } + { + name = "nijs"; + spec = "*"; + version = "0.0.9"; + topLevel = true; + dependencies = [ + { name = "optparse"; spec = ">= 1.0.3"; } + ]; + patchLatest = false; + sha1 = "26f0165431664b3518c2576f78397f27054e03aa"; + tarball = "http://registry.npmjs.org/nijs/-/nijs-0.0.9.tgz"; + } + { + name = "node-expat"; + spec = "*"; + version = "2.0.0"; + topLevel = true; + dependencies = [ + ]; + patchLatest = false; + sha1 = "a10271b3463484fa4b59895df61693a1de4ac735"; + tarball = "http://registry.npmjs.org/node-expat/-/node-expat-2.0.0.tgz"; + } + { + name = "node-gyp"; + spec = "*"; + version = "0.10.6"; + topLevel = true; + dependencies = [ + { name = "glob"; spec = "3"; } + { name = "graceful-fs"; spec = "2"; } + { name = "fstream"; spec = "0"; } + { name = "minimatch"; spec = "0"; } + { name = "mkdirp"; spec = "0"; } + { name = "nopt"; spec = "2"; } + { name = "npmlog"; spec = "0"; } + { name = "osenv"; spec = "0"; } + { name = "request"; spec = "2"; } + { name = "rimraf"; spec = "2"; } + { name = "semver"; spec = "~2.0.7"; } + { name = "tar"; spec = "0"; } + { name = "which"; spec = "1"; } + ]; + patchLatest = false; + sha1 = "2b81f9c1b9cd3cc8fd56fe776744814e394d3427"; + tarball = "http://registry.npmjs.org/node-gyp/-/node-gyp-0.10.6.tgz"; + } + { + name = "node-gyp"; + spec = "~0.10.6"; + version = "0.10.6"; + topLevel = false; + dependencies = [ + { name = "glob"; spec = "3"; } + { name = "graceful-fs"; spec = "2"; } + { name = "fstream"; spec = "0"; } + { name = "minimatch"; spec = "0"; } + { name = "mkdirp"; spec = "0"; } + { name = "nopt"; spec = "2"; } + { name = "npmlog"; spec = "0"; } + { name = "osenv"; spec = "0"; } + { name = "request"; spec = "2"; } + { name = "rimraf"; spec = "2"; } + { name = "semver"; spec = "~2.0.7"; } + { name = "tar"; spec = "0"; } + { name = "which"; spec = "1"; } + ]; + patchLatest = false; + sha1 = "2b81f9c1b9cd3cc8fd56fe776744814e394d3427"; + tarball = "http://registry.npmjs.org/node-gyp/-/node-gyp-0.10.6.tgz"; + } + { + name = "node-uuid"; + spec = "*"; + version = "1.4.0"; + topLevel = true; + dependencies = [ + ]; + patchLatest = false; + sha1 = "07f9b2337572ff6275c775e1d48513f3a45d7a65"; + tarball = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.4.0.tgz"; + } + { + name = "node-uuid"; + spec = "1.2.0"; + version = "1.2.0"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "81a9fe32934719852499b58b2523d2cd5fdfd65b"; + tarball = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.2.0.tgz"; + } + { + name = "node-uuid"; + spec = "1.3.3"; + version = "1.3.3"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "d3db4d7b56810d9e4032342766282af07391729b"; + tarball = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.3.3.tgz"; + } + { + name = "node-uuid"; + spec = "1.4.0"; + version = "1.4.0"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "07f9b2337572ff6275c775e1d48513f3a45d7a65"; + tarball = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.4.0.tgz"; + } + { + name = "node-uuid"; + spec = "~1.4.0"; + version = "1.4.0"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "07f9b2337572ff6275c775e1d48513f3a45d7a65"; + tarball = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.4.0.tgz"; + } + { + name = "nodemon"; + spec = "*"; + version = "0.7.8"; + topLevel = true; + dependencies = [ + ]; + patchLatest = false; + sha1 = "c0667a000f208dbf6a4dad08a5186595a9889590"; + tarball = "http://registry.npmjs.org/nodemon/-/nodemon-0.7.8.tgz"; + } + { + name = "nopt"; + spec = "2"; + version = "2.1.1"; + topLevel = false; + dependencies = [ + { name = "abbrev"; spec = "1"; } + ]; + patchLatest = false; + sha1 = "91eb7c4b017e7c00adcad1fd6d63944d0fdb75c1"; + tarball = "http://registry.npmjs.org/nopt/-/nopt-2.1.1.tgz"; + } + { + name = "nopt"; + spec = "2.0.0"; + version = "2.0.0"; + topLevel = false; + dependencies = [ + { name = "abbrev"; spec = "1"; } + ]; + patchLatest = false; + sha1 = "ca7416f20a5e3f9c3b86180f96295fa3d0b52e0d"; + tarball = "http://registry.npmjs.org/nopt/-/nopt-2.0.0.tgz"; + } + { + name = "nopt"; + spec = "~2.1.1"; + version = "2.1.1"; + topLevel = false; + dependencies = [ + { name = "abbrev"; spec = "1"; } + ]; + patchLatest = false; + sha1 = "91eb7c4b017e7c00adcad1fd6d63944d0fdb75c1"; + tarball = "http://registry.npmjs.org/nopt/-/nopt-2.1.1.tgz"; + } + { + name = "normalize-package-data"; + spec = "~0.2"; + version = "0.2.0"; + topLevel = false; + dependencies = [ + { name = "semver"; spec = "2"; } + { name = "github-url-from-git"; spec = "~1.1.1"; } + ]; + patchLatest = false; + sha1 = "b9349e2db3242912e6ab3d180823309b63a74a92"; + tarball = "http://registry.npmjs.org/normalize-package-data/-/normalize-package-data-0.2.0.tgz"; + } + { + name = "npm"; + spec = "*"; + version = "1.3.4"; + topLevel = true; + dependencies = [ + { name = "semver"; spec = "~2.0.8"; } + { name = "ini"; spec = "~1.1.0"; } + { name = "slide"; spec = "~1.1.4"; } + { name = "abbrev"; spec = "~1.0.4"; } + { name = "graceful-fs"; spec = "~2.0.0"; } + { name = "minimatch"; spec = "~0.2.12"; } + { name = "nopt"; spec = "~2.1.1"; } + { name = "rimraf"; spec = "~2.2.0"; } + { name = "request"; spec = "~2.21.0"; } + { name = "which"; spec = "1"; } + { name = "tar"; spec = "~0.1.17"; } + { name = "fstream"; spec = "~0.1.23"; } + { name = "block-stream"; spec = "*"; } + { name = "inherits"; spec = "1"; } + { name = "mkdirp"; spec = "~0.3.3"; } + { name = "read"; spec = "~1.0.4"; } + { name = "lru-cache"; spec = "~2.3.0"; } + { name = "node-gyp"; spec = "~0.10.6"; } + { name = "fstream-npm"; spec = "~0.1.3"; } + { name = "uid-number"; spec = "0"; } + { name = "archy"; spec = "0"; } + { name = "chownr"; spec = "0"; } + { name = "npmlog"; spec = "0.0.4"; } + { name = "ansi"; spec = "~0.1.2"; } + { name = "npm-registry-client"; spec = "~0.2.27"; } + { name = "read-package-json"; spec = "~1.1.0"; } + { name = "read-installed"; spec = "~0.2.2"; } + { name = "glob"; spec = "~3.2.3"; } + { name = "init-package-json"; spec = "0.0.10"; } + { name = "osenv"; spec = "0"; } + { name = "lockfile"; spec = "~0.4.0"; } + { name = "retry"; spec = "~0.6.0"; } + { name = "once"; spec = "~1.1.1"; } + { name = "npmconf"; spec = "~0.1.1"; } + { name = "opener"; spec = "~1.3.0"; } + { name = "chmodr"; spec = "~0.1.0"; } + { name = "cmd-shim"; spec = "~1.1.0"; } + { name = "sha"; spec = "~1.0.1"; } + { name = "editor"; spec = "0.0.4"; } + { name = "child-process-close"; spec = "~0.1.1"; } + { name = "npm-user-validate"; spec = "0.0.3"; } + ]; + patchLatest = false; + sha1 = "1dacc91458f2197c362d774d2cbf111680f86ec2"; + tarball = "http://registry.npmjs.org/npm/-/npm-1.3.4.tgz"; + } + { + name = "npm-registry-client"; + spec = "0.2.27"; + version = "0.2.27"; + topLevel = false; + dependencies = [ + { name = "request"; spec = "2 >=2.20.0"; } + { name = "graceful-fs"; spec = "~2.0.0"; } + { name = "semver"; spec = "~2.0.5"; } + { name = "slide"; spec = "~1.1.3"; } + { name = "chownr"; spec = "0"; } + { name = "mkdirp"; spec = "~0.3.3"; } + { name = "rimraf"; spec = "~2"; } + { name = "retry"; spec = "0.6.0"; } + { name = "couch-login"; spec = "~0.1.15"; } + { name = "npmlog"; spec = ""; } + ]; + patchLatest = false; + sha1 = "8f338189d32769267886a07ad7b7fd2267446adf"; + tarball = "http://registry.npmjs.org/npm-registry-client/-/npm-registry-client-0.2.27.tgz"; + } + { + name = "npm-registry-client"; + spec = "~0.2.27"; + version = "0.2.27"; + topLevel = false; + dependencies = [ + { name = "request"; spec = "2 >=2.20.0"; } + { name = "graceful-fs"; spec = "~2.0.0"; } + { name = "semver"; spec = "~2.0.5"; } + { name = "slide"; spec = "~1.1.3"; } + { name = "chownr"; spec = "0"; } + { name = "mkdirp"; spec = "~0.3.3"; } + { name = "rimraf"; spec = "~2"; } + { name = "retry"; spec = "0.6.0"; } + { name = "couch-login"; spec = "~0.1.15"; } + { name = "npmlog"; spec = ""; } + ]; + patchLatest = false; + sha1 = "8f338189d32769267886a07ad7b7fd2267446adf"; + tarball = "http://registry.npmjs.org/npm-registry-client/-/npm-registry-client-0.2.27.tgz"; + } + { + name = "npm-user-validate"; + spec = "0.0.3"; + version = "0.0.3"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "818eca4312d13da648f9bc1d7f80bb4f151e0c2e"; + tarball = "http://registry.npmjs.org/npm-user-validate/-/npm-user-validate-0.0.3.tgz"; + } + { + name = "npm2nix"; + spec = "*"; + version = "2.0.0"; + topLevel = true; + dependencies = [ + { name = "semver"; spec = ">=2.0.10 <3.0.0"; } + { name = "argparse"; spec = "0.1.15"; } + { name = "npm-registry-client"; spec = "0.2.27"; } + { name = "npmconf"; spec = "0.1.1"; } + ]; + patchLatest = false; + sha1 = "9e1ff781524ee313bf64e3b5f390e90ced87ae6d"; + tarball = "http://registry.npmjs.org/npm2nix/-/npm2nix-2.0.0.tgz"; + } + { + name = "npmconf"; + spec = "0.1.1"; + version = "0.1.1"; + topLevel = false; + dependencies = [ + { name = "config-chain"; spec = "~1.1.1"; } + { name = "inherits"; spec = "~1.0.0"; } + { name = "once"; spec = "~1.1.1"; } + { name = "mkdirp"; spec = "~0.3.3"; } + { name = "osenv"; spec = "0.0.3"; } + { name = "nopt"; spec = "2"; } + { name = "semver"; spec = "2"; } + { name = "ini"; spec = "~1.1.0"; } + ]; + patchLatest = false; + sha1 = "7a254182591ca22d77b2faecc0d17e0f9bdf25a1"; + tarball = "http://registry.npmjs.org/npmconf/-/npmconf-0.1.1.tgz"; + } + { + name = "npmconf"; + spec = "~0.1.1"; + version = "0.1.1"; + topLevel = false; + dependencies = [ + { name = "config-chain"; spec = "~1.1.1"; } + { name = "inherits"; spec = "~1.0.0"; } + { name = "once"; spec = "~1.1.1"; } + { name = "mkdirp"; spec = "~0.3.3"; } + { name = "osenv"; spec = "0.0.3"; } + { name = "nopt"; spec = "2"; } + { name = "semver"; spec = "2"; } + { name = "ini"; spec = "~1.1.0"; } + ]; + patchLatest = false; + sha1 = "7a254182591ca22d77b2faecc0d17e0f9bdf25a1"; + tarball = "http://registry.npmjs.org/npmconf/-/npmconf-0.1.1.tgz"; + } + { + name = "npmlog"; + spec = ""; + version = "0.0.4"; + topLevel = false; + dependencies = [ + { name = "ansi"; spec = "~0.1.2"; } + ]; + patchLatest = false; + sha1 = "a12a7418606b7e0183a2851d97a8729b9a0f3837"; + tarball = "http://registry.npmjs.org/npmlog/-/npmlog-0.0.4.tgz"; + } + { + name = "npmlog"; + spec = "0"; + version = "0.0.4"; + topLevel = false; + dependencies = [ + { name = "ansi"; spec = "~0.1.2"; } + ]; + patchLatest = false; + sha1 = "a12a7418606b7e0183a2851d97a8729b9a0f3837"; + tarball = "http://registry.npmjs.org/npmlog/-/npmlog-0.0.4.tgz"; + } + { + name = "npmlog"; + spec = "0.0.4"; + version = "0.0.4"; + topLevel = false; + dependencies = [ + { name = "ansi"; spec = "~0.1.2"; } + ]; + patchLatest = false; + sha1 = "a12a7418606b7e0183a2851d97a8729b9a0f3837"; + tarball = "http://registry.npmjs.org/npmlog/-/npmlog-0.0.4.tgz"; + } + { + name = "nssocket"; + spec = "~0.5.1"; + version = "0.5.1"; + topLevel = false; + dependencies = [ + { name = "eventemitter2"; spec = "~0.4.11"; } + { name = "lazy"; spec = "~1.0.11"; } + ]; + patchLatest = false; + sha1 = "11f0428335ad8d89ff9cf96ab2852a23b1b33b71"; + tarball = "http://registry.npmjs.org/nssocket/-/nssocket-0.5.1.tgz"; + } + { + name = "oauth-sign"; + spec = "~0.2.0"; + version = "0.2.0"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "a0e6a1715daed062f322b622b7fe5afd1035b6e2"; + tarball = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.2.0.tgz"; + } + { + name = "oauth-sign"; + spec = "~0.3.0"; + version = "0.3.0"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "cb540f93bb2b22a7d5941691a288d60e8ea9386e"; + tarball = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.3.0.tgz"; + } + { + name = "once"; + spec = "1.1.1"; + version = "1.1.1"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "9db574933ccb08c3a7614d154032c09ea6f339e7"; + tarball = "http://registry.npmjs.org/once/-/once-1.1.1.tgz"; + } + { + name = "once"; + spec = "~1.1.1"; + version = "1.1.1"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "9db574933ccb08c3a7614d154032c09ea6f339e7"; + tarball = "http://registry.npmjs.org/once/-/once-1.1.1.tgz"; + } + { + name = "opener"; + spec = "~1.3.0"; + version = "1.3.0"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "130ba662213fa842edb4cd0361d31a15301a43e2"; + tarball = "http://registry.npmjs.org/opener/-/opener-1.3.0.tgz"; + } + { + name = "optimist"; + spec = "*"; + version = "0.6.0"; + topLevel = true; + dependencies = [ + { name = "wordwrap"; spec = "~0.0.2"; } + { name = "minimist"; spec = "~0.0.1"; } + ]; + patchLatest = false; + sha1 = "69424826f3405f79f142e6fc3d9ae58d4dbb9200"; + tarball = "http://registry.npmjs.org/optimist/-/optimist-0.6.0.tgz"; + } + { + name = "optimist"; + spec = "0.2"; + version = "0.2.8"; + topLevel = false; + dependencies = [ + { name = "wordwrap"; spec = ">=0.0.1 <0.1.0"; } + ]; + patchLatest = false; + sha1 = "e981ab7e268b457948593b55674c099a815cac31"; + tarball = "http://registry.npmjs.org/optimist/-/optimist-0.2.8.tgz"; + } + { + name = "optimist"; + spec = "0.3.5"; + version = "0.3.5"; + topLevel = false; + dependencies = [ + { name = "wordwrap"; spec = "~0.0.2"; } + ]; + patchLatest = false; + sha1 = "03654b52417030312d109f39b159825b60309304"; + tarball = "http://registry.npmjs.org/optimist/-/optimist-0.3.5.tgz"; + } + { + name = "optimist"; + spec = "0.3.x"; + version = "0.3.7"; + topLevel = false; + dependencies = [ + { name = "wordwrap"; spec = "~0.0.2"; } + ]; + patchLatest = false; + sha1 = "c90941ad59e4273328923074d2cf2e7cbc6ec0d9"; + tarball = "http://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz"; + } + { + name = "optimist"; + spec = "0.4.0"; + version = "0.4.0"; + topLevel = false; + dependencies = [ + { name = "wordwrap"; spec = "~0.0.2"; } + ]; + patchLatest = false; + sha1 = "cb8ec37f2fe3aa9864cb67a275250e7e19620a25"; + tarball = "http://registry.npmjs.org/optimist/-/optimist-0.4.0.tgz"; + } + { + name = "optimist"; + spec = "~0.3.5"; + version = "0.3.7"; + topLevel = false; + dependencies = [ + { name = "wordwrap"; spec = "~0.0.2"; } + ]; + patchLatest = false; + sha1 = "c90941ad59e4273328923074d2cf2e7cbc6ec0d9"; + tarball = "http://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz"; + } + { + name = "optparse"; + spec = "*"; + version = "1.0.4"; + topLevel = true; + dependencies = [ + ]; + patchLatest = false; + sha1 = "c062579d2d05d243c221a304a71e0c979623ccf1"; + tarball = "http://registry.npmjs.org/optparse/-/optparse-1.0.4.tgz"; + } + { + name = "optparse"; + spec = ">= 1.0.3"; + version = "1.0.4"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "c062579d2d05d243c221a304a71e0c979623ccf1"; + tarball = "http://registry.npmjs.org/optparse/-/optparse-1.0.4.tgz"; + } + { + name = "osenv"; + spec = "0"; + version = "0.0.3"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "cd6ad8ddb290915ad9e22765576025d411f29cb6"; + tarball = "http://registry.npmjs.org/osenv/-/osenv-0.0.3.tgz"; + } + { + name = "osenv"; + spec = "0.0.3"; + version = "0.0.3"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "cd6ad8ddb290915ad9e22765576025d411f29cb6"; + tarball = "http://registry.npmjs.org/osenv/-/osenv-0.0.3.tgz"; + } + { + name = "owl-deepcopy"; + spec = "~0.0.1"; + version = "0.0.2"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "056c40e1af73dff6e2c7afae983d2a7760fdff88"; + tarball = "http://registry.npmjs.org/owl-deepcopy/-/owl-deepcopy-0.0.2.tgz"; + } + { + name = "passport"; + spec = "*"; + version = "0.1.17"; + topLevel = true; + dependencies = [ + { name = "pkginfo"; spec = "0.2.x"; } + { name = "pause"; spec = "0.0.1"; } + ]; + patchLatest = false; + sha1 = "2cd503be0d35f33a9726d00ad2654786643a23fc"; + tarball = "http://registry.npmjs.org/passport/-/passport-0.1.17.tgz"; + } + { + name = "passport"; + spec = "~0.1.1"; + version = "0.1.17"; + topLevel = false; + dependencies = [ + { name = "pkginfo"; spec = "0.2.x"; } + { name = "pause"; spec = "0.0.1"; } + ]; + patchLatest = false; + sha1 = "2cd503be0d35f33a9726d00ad2654786643a23fc"; + tarball = "http://registry.npmjs.org/passport/-/passport-0.1.17.tgz"; + } + { + name = "passport"; + spec = "~0.1.3"; + version = "0.1.17"; + topLevel = false; + dependencies = [ + { name = "pkginfo"; spec = "0.2.x"; } + { name = "pause"; spec = "0.0.1"; } + ]; + patchLatest = false; + sha1 = "2cd503be0d35f33a9726d00ad2654786643a23fc"; + tarball = "http://registry.npmjs.org/passport/-/passport-0.1.17.tgz"; + } + { + name = "passport-http"; + spec = "*"; + version = "0.2.2"; + topLevel = true; + dependencies = [ + { name = "pkginfo"; spec = "0.2.x"; } + { name = "passport"; spec = "~0.1.3"; } + ]; + patchLatest = false; + sha1 = "2501314c0ff4a831e8a51ccfdb1b68f5c7cbc9f6"; + tarball = "http://registry.npmjs.org/passport-http/-/passport-http-0.2.2.tgz"; + } + { + name = "passport-local"; + spec = "*"; + version = "0.1.6"; + topLevel = true; + dependencies = [ + { name = "pkginfo"; spec = "0.2.x"; } + { name = "passport"; spec = "~0.1.1"; } + ]; + patchLatest = false; + sha1 = "fb0cf828048db931b67d19985c7aa06dd377a9db"; + tarball = "http://registry.npmjs.org/passport-local/-/passport-local-0.1.6.tgz"; + } + { + name = "pause"; + spec = "0.0.1"; + version = "0.0.1"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "1d408b3fdb76923b9543d96fb4c9dfd535d9cb5d"; + tarball = "http://registry.npmjs.org/pause/-/pause-0.0.1.tgz"; + } + { + name = "pkginfo"; + spec = "0.2.x"; + version = "0.2.3"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "7239c42a5ef6c30b8f328439d9b9ff71042490f8"; + tarball = "http://registry.npmjs.org/pkginfo/-/pkginfo-0.2.3.tgz"; + } + { + name = "pkginfo"; + spec = "0.3.0"; + version = "0.3.0"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "726411401039fe9b009eea86614295d5f3a54276"; + tarball = "http://registry.npmjs.org/pkginfo/-/pkginfo-0.3.0.tgz"; + } + { + name = "pkginfo"; + spec = "0.3.x"; + version = "0.3.0"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "726411401039fe9b009eea86614295d5f3a54276"; + tarball = "http://registry.npmjs.org/pkginfo/-/pkginfo-0.3.0.tgz"; + } + { + name = "pkginfo"; + spec = "0.x.x"; + version = "0.3.0"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "726411401039fe9b009eea86614295d5f3a54276"; + tarball = "http://registry.npmjs.org/pkginfo/-/pkginfo-0.3.0.tgz"; + } + { + name = "posix-getopt"; + spec = "1.0.0"; + version = "1.0.0"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "42a90eca6119014c78bc4b9b70463d294db1aa87"; + tarball = "http://registry.npmjs.org/posix-getopt/-/posix-getopt-1.0.0.tgz"; + } + { + name = "promise"; + spec = "~2.0"; + version = "2.0.0"; + topLevel = false; + dependencies = [ + { name = "is-promise"; spec = "~1"; } + ]; + patchLatest = false; + sha1 = "46648aa9d605af5d2e70c3024bf59436da02b80e"; + tarball = "http://registry.npmjs.org/promise/-/promise-2.0.0.tgz"; + } + { + name = "prompt"; + spec = "0.2.9"; + version = "0.2.9"; + topLevel = false; + dependencies = [ + { name = "pkginfo"; spec = "0.x.x"; } + { name = "read"; spec = "1.0.x"; } + { name = "revalidator"; spec = "0.1.x"; } + { name = "utile"; spec = "0.1.x"; } + { name = "winston"; spec = "0.6.x"; } + ]; + patchLatest = false; + sha1 = "fdd01e3f9654d0c44fbb8671f8d3f6ca009e3c16"; + tarball = "http://registry.npmjs.org/prompt/-/prompt-0.2.9.tgz"; + } + { + name = "promzard"; + spec = "~0.2.0"; + version = "0.2.0"; + topLevel = false; + dependencies = [ + { name = "read"; spec = "1"; } + ]; + patchLatest = false; + sha1 = "766f33807faadeeecacf8057024fe5f753cfa3c1"; + tarball = "http://registry.npmjs.org/promzard/-/promzard-0.2.0.tgz"; + } + { + name = "proto-list"; + spec = "~1.2.1"; + version = "1.2.2"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "48b88798261ec2c4a785720cdfec6200d57d3326"; + tarball = "http://registry.npmjs.org/proto-list/-/proto-list-1.2.2.tgz"; + } + { + name = "ps-tree"; + spec = "0.0.x"; + version = "0.0.3"; + topLevel = false; + dependencies = [ + { name = "event-stream"; spec = "~0.5"; } + ]; + patchLatest = false; + sha1 = "dbf8d752a7fe22fa7d58635689499610e9276ddc"; + tarball = "http://registry.npmjs.org/ps-tree/-/ps-tree-0.0.3.tgz"; + } + { + name = "qs"; + spec = "0.5.1"; + version = "0.5.1"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "9f6bf5d9ac6c76384e95d36d15b48980e5e4add0"; + tarball = "http://registry.npmjs.org/qs/-/qs-0.5.1.tgz"; + } + { + name = "qs"; + spec = "0.5.5"; + version = "0.5.5"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "b07f0d7ffe3efc6fc2fcde6c66a20775641423f3"; + tarball = "http://registry.npmjs.org/qs/-/qs-0.5.5.tgz"; + } + { + name = "qs"; + spec = "0.6.5"; + version = "0.6.5"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "294b268e4b0d4250f6dde19b3b8b34935dff14ef"; + tarball = "http://registry.npmjs.org/qs/-/qs-0.6.5.tgz"; + } + { + name = "qs"; + spec = "~0.5.4"; + version = "0.5.6"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "31b1ad058567651c526921506b9a8793911a0384"; + tarball = "http://registry.npmjs.org/qs/-/qs-0.5.6.tgz"; + } + { + name = "qs"; + spec = "~0.6.0"; + version = "0.6.5"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "294b268e4b0d4250f6dde19b3b8b34935dff14ef"; + tarball = "http://registry.npmjs.org/qs/-/qs-0.6.5.tgz"; + } + { + name = "range-parser"; + spec = "0.0.4"; + version = "0.0.4"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "c0427ffef51c10acba0782a46c9602e744ff620b"; + tarball = "http://registry.npmjs.org/range-parser/-/range-parser-0.0.4.tgz"; + } + { + name = "rbytes"; + spec = "*"; + version = "1.0.0"; + topLevel = true; + dependencies = [ + ]; + patchLatest = false; + sha1 = "4eeb85c457f710d8147329d5eed5cd02c798fa4d"; + tarball = "http://registry.npmjs.org/rbytes/-/rbytes-1.0.0.tgz"; + } + { + name = "read"; + spec = "1"; + version = "1.0.4"; + topLevel = false; + dependencies = [ + { name = "mute-stream"; spec = "~0.0.2"; } + ]; + patchLatest = false; + sha1 = "c2374be81787fc8633602a1b98232569d52fc655"; + tarball = "http://registry.npmjs.org/read/-/read-1.0.4.tgz"; + } + { + name = "read"; + spec = "1.0.x"; + version = "1.0.4"; + topLevel = false; + dependencies = [ + { name = "mute-stream"; spec = "~0.0.2"; } + ]; + patchLatest = false; + sha1 = "c2374be81787fc8633602a1b98232569d52fc655"; + tarball = "http://registry.npmjs.org/read/-/read-1.0.4.tgz"; + } + { + name = "read"; + spec = "~1.0.1"; + version = "1.0.4"; + topLevel = false; + dependencies = [ + { name = "mute-stream"; spec = "~0.0.2"; } + ]; + patchLatest = false; + sha1 = "c2374be81787fc8633602a1b98232569d52fc655"; + tarball = "http://registry.npmjs.org/read/-/read-1.0.4.tgz"; + } + { + name = "read"; + spec = "~1.0.4"; + version = "1.0.4"; + topLevel = false; + dependencies = [ + { name = "mute-stream"; spec = "~0.0.2"; } + ]; + patchLatest = false; + sha1 = "c2374be81787fc8633602a1b98232569d52fc655"; + tarball = "http://registry.npmjs.org/read/-/read-1.0.4.tgz"; + } + { + name = "read-installed"; + spec = "~0.2.2"; + version = "0.2.2"; + topLevel = false; + dependencies = [ + { name = "semver"; spec = "2"; } + { name = "slide"; spec = "~1.1.3"; } + { name = "read-package-json"; spec = "1"; } + { name = "graceful-fs"; spec = "~1.2.0"; } + ]; + patchLatest = false; + sha1 = "f570ac84fb29c75f16faa3940a8c1e602c8eecab"; + tarball = "http://registry.npmjs.org/read-installed/-/read-installed-0.2.2.tgz"; + } + { + name = "read-package-json"; + spec = "1"; + version = "1.1.0"; + topLevel = false; + dependencies = [ + { name = "glob"; spec = "~3.2.1"; } + { name = "lru-cache"; spec = "2"; } + { name = "normalize-package-data"; spec = "~0.2"; } + { name = "graceful-fs"; spec = "~1.2"; } + ]; + patchLatest = false; + sha1 = "6447ac4d10788c76d0682cf2086eaa809076aafc"; + tarball = "http://registry.npmjs.org/read-package-json/-/read-package-json-1.1.0.tgz"; + } + { + name = "read-package-json"; + spec = "~1.1.0"; + version = "1.1.0"; + topLevel = false; + dependencies = [ + { name = "glob"; spec = "~3.2.1"; } + { name = "lru-cache"; spec = "2"; } + { name = "normalize-package-data"; spec = "~0.2"; } + { name = "graceful-fs"; spec = "~1.2"; } + ]; + patchLatest = false; + sha1 = "6447ac4d10788c76d0682cf2086eaa809076aafc"; + tarball = "http://registry.npmjs.org/read-package-json/-/read-package-json-1.1.0.tgz"; + } + { + name = "readable-stream"; + spec = "~1.0.2"; + version = "1.0.2"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "213ce36864fc1f0d4e98e03b9eb92c64042299d4"; + tarball = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.2.tgz"; + } + { + name = "readdirp"; + spec = "~0.2.3"; + version = "0.2.5"; + topLevel = false; + dependencies = [ + { name = "minimatch"; spec = ">=0.2.4"; } + ]; + patchLatest = false; + sha1 = "c4c276e52977ae25db5191fe51d008550f15d9bb"; + tarball = "http://registry.npmjs.org/readdirp/-/readdirp-0.2.5.tgz"; + } + { + name = "redis"; + spec = "*"; + version = "0.8.4"; + topLevel = true; + dependencies = [ + ]; + patchLatest = false; + sha1 = "14609f26414e211c31e3cd07dc79b04bf9ff1980"; + tarball = "http://registry.npmjs.org/redis/-/redis-0.8.4.tgz"; + } + { + name = "redis"; + spec = "0.7.2"; + version = "0.7.2"; + topLevel = false; + dependencies = [ + { name = "hiredis"; spec = "*"; } + ]; + patchLatest = false; + sha1 = "fa557fef4985ab3e3384fdc5be6e2541a0bb49af"; + tarball = "http://registry.npmjs.org/redis/-/redis-0.7.2.tgz"; + } + { + name = "redis"; + spec = ">= 0.6.6"; + version = "0.8.4"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "14609f26414e211c31e3cd07dc79b04bf9ff1980"; + tarball = "http://registry.npmjs.org/redis/-/redis-0.8.4.tgz"; + } + { + name = "reds"; + spec = "0.1.4"; + version = "0.1.4"; + topLevel = false; + dependencies = [ + { name = "natural"; spec = "0.0.69"; } + { name = "redis"; spec = ">= 0.6.6"; } + ]; + patchLatest = false; + sha1 = "a97819180c30f6ecd01cad03cecb574eaabb4bee"; + tarball = "http://registry.npmjs.org/reds/-/reds-0.1.4.tgz"; + } + { + name = "regexp-clone"; + spec = "0.0.1"; + version = "0.0.1"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "a7c2e09891fdbf38fbb10d376fb73003e68ac589"; + tarball = "http://registry.npmjs.org/regexp-clone/-/regexp-clone-0.0.1.tgz"; + } + { + name = "request"; + spec = "2"; + version = "2.22.0"; + topLevel = false; + dependencies = [ + { name = "qs"; spec = "~0.6.0"; } + { name = "json-stringify-safe"; spec = "~4.0.0"; } + { name = "forever-agent"; spec = "~0.5.0"; } + { name = "tunnel-agent"; spec = "~0.3.0"; } + { name = "http-signature"; spec = "~0.10.0"; } + { name = "hawk"; spec = "~0.13.0"; } + { name = "aws-sign"; spec = "~0.3.0"; } + { name = "oauth-sign"; spec = "~0.3.0"; } + { name = "cookie-jar"; spec = "~0.3.0"; } + { name = "node-uuid"; spec = "~1.4.0"; } + { name = "mime"; spec = "~1.2.9"; } + { name = "form-data"; spec = "0.0.8"; } + ]; + patchLatest = false; + sha1 = "b883a769cc4a909571eb5004b344c43cf7e51592"; + tarball = "http://registry.npmjs.org/request/-/request-2.22.0.tgz"; + } + { + name = "request"; + spec = "2 >=2.14"; + version = "2.22.0"; + topLevel = false; + dependencies = [ + { name = "qs"; spec = "~0.6.0"; } + { name = "json-stringify-safe"; spec = "~4.0.0"; } + { name = "forever-agent"; spec = "~0.5.0"; } + { name = "tunnel-agent"; spec = "~0.3.0"; } + { name = "http-signature"; spec = "~0.10.0"; } + { name = "hawk"; spec = "~0.13.0"; } + { name = "aws-sign"; spec = "~0.3.0"; } + { name = "oauth-sign"; spec = "~0.3.0"; } + { name = "cookie-jar"; spec = "~0.3.0"; } + { name = "node-uuid"; spec = "~1.4.0"; } + { name = "mime"; spec = "~1.2.9"; } + { name = "form-data"; spec = "0.0.8"; } + ]; + patchLatest = false; + sha1 = "b883a769cc4a909571eb5004b344c43cf7e51592"; + tarball = "http://registry.npmjs.org/request/-/request-2.22.0.tgz"; + } + { + name = "request"; + spec = "2 >=2.20.0"; + version = "2.22.0"; + topLevel = false; + dependencies = [ + { name = "qs"; spec = "~0.6.0"; } + { name = "json-stringify-safe"; spec = "~4.0.0"; } + { name = "forever-agent"; spec = "~0.5.0"; } + { name = "tunnel-agent"; spec = "~0.3.0"; } + { name = "http-signature"; spec = "~0.10.0"; } + { name = "hawk"; spec = "~0.13.0"; } + { name = "aws-sign"; spec = "~0.3.0"; } + { name = "oauth-sign"; spec = "~0.3.0"; } + { name = "cookie-jar"; spec = "~0.3.0"; } + { name = "node-uuid"; spec = "~1.4.0"; } + { name = "mime"; spec = "~1.2.9"; } + { name = "form-data"; spec = "0.0.8"; } + ]; + patchLatest = false; + sha1 = "b883a769cc4a909571eb5004b344c43cf7e51592"; + tarball = "http://registry.npmjs.org/request/-/request-2.22.0.tgz"; + } + { + name = "request"; + spec = "2.16.x"; + version = "2.16.6"; + topLevel = false; + dependencies = [ + { name = "form-data"; spec = "~0.0.3"; } + { name = "mime"; spec = "~1.2.7"; } + { name = "hawk"; spec = "~0.10.2"; } + { name = "node-uuid"; spec = "~1.4.0"; } + { name = "cookie-jar"; spec = "~0.2.0"; } + { name = "aws-sign"; spec = "~0.2.0"; } + { name = "oauth-sign"; spec = "~0.2.0"; } + { name = "forever-agent"; spec = "~0.2.0"; } + { name = "tunnel-agent"; spec = "~0.2.0"; } + { name = "json-stringify-safe"; spec = "~3.0.0"; } + { name = "qs"; spec = "~0.5.4"; } + ]; + patchLatest = false; + sha1 = "872fe445ae72de266b37879d6ad7dc948fa01cad"; + tarball = "http://registry.npmjs.org/request/-/request-2.16.6.tgz"; + } + { + name = "request"; + spec = "2.9.x"; + version = "2.9.203"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "6c1711a5407fb94a114219563e44145bcbf4723a"; + tarball = "http://registry.npmjs.org/request/-/request-2.9.203.tgz"; + } + { + name = "request"; + spec = "~2"; + version = "2.22.0"; + topLevel = false; + dependencies = [ + { name = "qs"; spec = "~0.6.0"; } + { name = "json-stringify-safe"; spec = "~4.0.0"; } + { name = "forever-agent"; spec = "~0.5.0"; } + { name = "tunnel-agent"; spec = "~0.3.0"; } + { name = "http-signature"; spec = "~0.10.0"; } + { name = "hawk"; spec = "~0.13.0"; } + { name = "aws-sign"; spec = "~0.3.0"; } + { name = "oauth-sign"; spec = "~0.3.0"; } + { name = "cookie-jar"; spec = "~0.3.0"; } + { name = "node-uuid"; spec = "~1.4.0"; } + { name = "mime"; spec = "~1.2.9"; } + { name = "form-data"; spec = "0.0.8"; } + ]; + patchLatest = false; + sha1 = "b883a769cc4a909571eb5004b344c43cf7e51592"; + tarball = "http://registry.npmjs.org/request/-/request-2.22.0.tgz"; + } + { + name = "request"; + spec = "~2.21.0"; + version = "2.21.0"; + topLevel = false; + dependencies = [ + { name = "qs"; spec = "~0.6.0"; } + { name = "json-stringify-safe"; spec = "~4.0.0"; } + { name = "forever-agent"; spec = "~0.5.0"; } + { name = "tunnel-agent"; spec = "~0.3.0"; } + { name = "http-signature"; spec = "~0.9.11"; } + { name = "hawk"; spec = "~0.13.0"; } + { name = "aws-sign"; spec = "~0.3.0"; } + { name = "oauth-sign"; spec = "~0.3.0"; } + { name = "cookie-jar"; spec = "~0.3.0"; } + { name = "node-uuid"; spec = "~1.4.0"; } + { name = "mime"; spec = "~1.2.9"; } + { name = "form-data"; spec = "0.0.8"; } + ]; + patchLatest = false; + sha1 = "5728ab9c45e5a87c99daccd530298b6673a868d7"; + tarball = "http://registry.npmjs.org/request/-/request-2.21.0.tgz"; + } + { + name = "restify"; + spec = "2.4.1"; + version = "2.4.1"; + topLevel = false; + dependencies = [ + { name = "assert-plus"; spec = "0.1.2"; } + { name = "backoff"; spec = "2.1.0"; } + { name = "bunyan"; spec = "0.21.1"; } + { name = "deep-equal"; spec = "0.0.0"; } + { name = "formidable"; spec = "1.0.13"; } + { name = "http-signature"; spec = "0.9.11"; } + { name = "keep-alive-agent"; spec = "0.0.1"; } + { name = "lru-cache"; spec = "2.3.0"; } + { name = "mime"; spec = "1.2.9"; } + { name = "negotiator"; spec = "0.2.5"; } + { name = "node-uuid"; spec = "1.4.0"; } + { name = "once"; spec = "1.1.1"; } + { name = "qs"; spec = "0.5.5"; } + { name = "semver"; spec = "1.1.4"; } + { name = "spdy"; spec = "1.7.1"; } + { name = "verror"; spec = "1.3.6"; } + { name = "dtrace-provider"; spec = "0.2.8"; } + ]; + patchLatest = false; + sha1 = "35790a052bd0927e7f6a06cc3d079e56fabc9371"; + tarball = "http://registry.npmjs.org/restify/-/restify-2.4.1.tgz"; + } + { + name = "retry"; + spec = "0.6.0"; + version = "0.6.0"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "1c010713279a6fd1e8def28af0c3ff1871caa537"; + tarball = "http://registry.npmjs.org/retry/-/retry-0.6.0.tgz"; + } + { + name = "retry"; + spec = "~0.6.0"; + version = "0.6.0"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "1c010713279a6fd1e8def28af0c3ff1871caa537"; + tarball = "http://registry.npmjs.org/retry/-/retry-0.6.0.tgz"; + } + { + name = "revalidator"; + spec = "0.1.x"; + version = "0.1.5"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "205bc02e4186e63e82a0837498f29ba287be3861"; + tarball = "http://registry.npmjs.org/revalidator/-/revalidator-0.1.5.tgz"; + } + { + name = "rimraf"; + spec = "1.x.x"; + version = "1.0.9"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "be4801ff76c2ba6f1c50c78e9700eb1d21f239f1"; + tarball = "http://registry.npmjs.org/rimraf/-/rimraf-1.0.9.tgz"; + } + { + name = "rimraf"; + spec = "2"; + version = "2.2.0"; + topLevel = false; + dependencies = [ + { name = "graceful-fs"; spec = "~1"; } + ]; + patchLatest = false; + sha1 = "70797542e81a935849443d7b69bec612ca74c96e"; + tarball = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.0.tgz"; + } + { + name = "rimraf"; + spec = "~2"; + version = "2.2.0"; + topLevel = false; + dependencies = [ + { name = "graceful-fs"; spec = "~1"; } + ]; + patchLatest = false; + sha1 = "70797542e81a935849443d7b69bec612ca74c96e"; + tarball = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.0.tgz"; + } + { + name = "rimraf"; + spec = "~2.1.4"; + version = "2.1.4"; + topLevel = false; + dependencies = [ + { name = "graceful-fs"; spec = "~1"; } + ]; + patchLatest = false; + sha1 = "5a6eb62eeda068f51ede50f29b3e5cd22f3d9bb2"; + tarball = "http://registry.npmjs.org/rimraf/-/rimraf-2.1.4.tgz"; + } + { + name = "rimraf"; + spec = "~2.2.0"; + version = "2.2.0"; + topLevel = false; + dependencies = [ + { name = "graceful-fs"; spec = "~1"; } + ]; + patchLatest = false; + sha1 = "70797542e81a935849443d7b69bec612ca74c96e"; + tarball = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.0.tgz"; + } + { + name = "s3http"; + spec = "*"; + version = "0.0.2"; + topLevel = true; + dependencies = [ + { name = "aws-sdk"; spec = ">=1.2.0 <2"; } + { name = "commander"; spec = "0.5.1"; } + { name = "http-auth"; spec = "1.2.7"; } + ]; + patchLatest = false; + sha1 = "e0c8bdee66981c6ddef2dfc41bb1fe51765984e5"; + tarball = "http://registry.npmjs.org/s3http/-/s3http-0.0.2.tgz"; + } + { + name = "sax"; + spec = "0.5.x"; + version = "0.5.4"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "a3a4e1a9cf182bb547156c5232a49a1c3732ff7d"; + tarball = "http://registry.npmjs.org/sax/-/sax-0.5.4.tgz"; + } + { + name = "sax"; + spec = ">=0.4.2"; + version = "0.5.4"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "a3a4e1a9cf182bb547156c5232a49a1c3732ff7d"; + tarball = "http://registry.npmjs.org/sax/-/sax-0.5.4.tgz"; + } + { + name = "semver"; + spec = "*"; + version = "2.0.10"; + topLevel = true; + dependencies = [ + ]; + patchLatest = false; + sha1 = "e3199263b1e9f1913dbc91efb4af559e8e4d3d31"; + tarball = "http://registry.npmjs.org/semver/-/semver-2.0.10.tgz"; + } + { + name = "semver"; + spec = "1.1.4"; + version = "1.1.4"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "2e5a4e72bab03472cc97f72753b4508912ef5540"; + tarball = "http://registry.npmjs.org/semver/-/semver-1.1.4.tgz"; + } + { + name = "semver"; + spec = "2"; + version = "2.0.10"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "e3199263b1e9f1913dbc91efb4af559e8e4d3d31"; + tarball = "http://registry.npmjs.org/semver/-/semver-2.0.10.tgz"; + } + { + name = "semver"; + spec = "2.x"; + version = "2.0.10"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "e3199263b1e9f1913dbc91efb4af559e8e4d3d31"; + tarball = "http://registry.npmjs.org/semver/-/semver-2.0.10.tgz"; + } + { + name = "semver"; + spec = ">=2.0.10 <3.0.0"; + version = "2.0.10"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "e3199263b1e9f1913dbc91efb4af559e8e4d3d31"; + tarball = "http://registry.npmjs.org/semver/-/semver-2.0.10.tgz"; + } + { + name = "semver"; + spec = "~2.0.5"; + version = "2.0.10"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "e3199263b1e9f1913dbc91efb4af559e8e4d3d31"; + tarball = "http://registry.npmjs.org/semver/-/semver-2.0.10.tgz"; + } + { + name = "semver"; + spec = "~2.0.7"; + version = "2.0.10"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "e3199263b1e9f1913dbc91efb4af559e8e4d3d31"; + tarball = "http://registry.npmjs.org/semver/-/semver-2.0.10.tgz"; + } + { + name = "semver"; + spec = "~2.0.8"; + version = "2.0.10"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "e3199263b1e9f1913dbc91efb4af559e8e4d3d31"; + tarball = "http://registry.npmjs.org/semver/-/semver-2.0.10.tgz"; + } + { + name = "send"; + spec = "*"; + version = "0.1.3"; + topLevel = false; + dependencies = [ + { name = "debug"; spec = "*"; } + { name = "mime"; spec = "~1.2.9"; } + { name = "fresh"; spec = "0.1.0"; } + { name = "range-parser"; spec = "0.0.4"; } + ]; + patchLatest = false; + sha1 = "a7875daa6802d31e2ce32fdad98d3664c51ecea3"; + tarball = "http://registry.npmjs.org/send/-/send-0.1.3.tgz"; + } + { + name = "send"; + spec = "0.1.0"; + version = "0.1.0"; + topLevel = false; + dependencies = [ + { name = "debug"; spec = "*"; } + { name = "mime"; spec = "1.2.6"; } + { name = "fresh"; spec = "0.1.0"; } + { name = "range-parser"; spec = "0.0.4"; } + ]; + patchLatest = false; + sha1 = "cfb08ebd3cec9b7fc1a37d9ff9e875a971cf4640"; + tarball = "http://registry.npmjs.org/send/-/send-0.1.0.tgz"; + } + { + name = "send"; + spec = "0.1.3"; + version = "0.1.3"; + topLevel = false; + dependencies = [ + { name = "debug"; spec = "*"; } + { name = "mime"; spec = "~1.2.9"; } + { name = "fresh"; spec = "0.1.0"; } + { name = "range-parser"; spec = "0.0.4"; } + ]; + patchLatest = false; + sha1 = "a7875daa6802d31e2ce32fdad98d3664c51ecea3"; + tarball = "http://registry.npmjs.org/send/-/send-0.1.3.tgz"; + } + { + name = "sequence"; + spec = ">= 2.2.1"; + version = "2.2.1"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "7f5617895d44351c0a047e764467690490a16b03"; + tarball = "http://registry.npmjs.org/sequence/-/sequence-2.2.1.tgz"; + } + { + name = "sha"; + spec = "~1.0.1"; + version = "1.0.1"; + topLevel = false; + dependencies = [ + { name = "graceful-fs"; spec = "1.2"; } + ]; + patchLatest = false; + sha1 = "9b87a92113103e7406f7e7ef00006f3fa1975122"; + tarball = "http://registry.npmjs.org/sha/-/sha-1.0.1.tgz"; + } + { + name = "shelljs"; + spec = "0.1.x"; + version = "0.1.4"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "dfbbe78d56c3c0168d2fb79e10ecd1dbcb07ec0e"; + tarball = "http://registry.npmjs.org/shelljs/-/shelljs-0.1.4.tgz"; + } + { + name = "should"; + spec = "*"; + version = "1.2.2"; + topLevel = true; + dependencies = [ + ]; + patchLatest = false; + sha1 = "0f03f775066d9ea2632690c917b12824fcc1d582"; + tarball = "http://registry.npmjs.org/should/-/should-1.2.2.tgz"; + } + { + name = "sigmund"; + spec = "~1.0.0"; + version = "1.0.0"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "66a2b3a749ae8b5fb89efd4fcc01dc94fbe02296"; + tarball = "http://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"; + } + { + name = "sliced"; + spec = "0.0.3"; + version = "0.0.3"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "4f0bac2171eb17162c3ba6df81f5cf040f7c7e50"; + tarball = "http://registry.npmjs.org/sliced/-/sliced-0.0.3.tgz"; + } + { + name = "sliced"; + spec = "0.0.4"; + version = "0.0.4"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "34f89a6db1f31fa525f5a570f5bcf877cf0955ee"; + tarball = "http://registry.npmjs.org/sliced/-/sliced-0.0.4.tgz"; + } + { + name = "slide"; + spec = "~1.1.3"; + version = "1.1.4"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "2b23f1949b369ed61d22bd6570ff0320302fc8df"; + tarball = "http://registry.npmjs.org/slide/-/slide-1.1.4.tgz"; + } + { + name = "slide"; + spec = "~1.1.4"; + version = "1.1.4"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "2b23f1949b369ed61d22bd6570ff0320302fc8df"; + tarball = "http://registry.npmjs.org/slide/-/slide-1.1.4.tgz"; + } + { + name = "smartdc"; + spec = "*"; + version = "7.0.0"; + topLevel = true; + dependencies = [ + { name = "assert-plus"; spec = "0.1.2"; } + { name = "lru-cache"; spec = "2.2.0"; } + { name = "nopt"; spec = "2.0.0"; } + { name = "restify"; spec = "2.4.1"; } + { name = "bunyan"; spec = "0.21.1"; } + { name = "clone"; spec = "0.1.6"; } + { name = "smartdc-auth"; spec = "1.0.0"; } + ]; + patchLatest = false; + sha1 = "367ce274e10e3400e19ec62697f9b5ecb3f25c39"; + tarball = "http://registry.npmjs.org/smartdc/-/smartdc-7.0.0.tgz"; + } + { + name = "smartdc-auth"; + spec = "1.0.0"; + version = "1.0.0"; + topLevel = false; + dependencies = [ + { name = "assert-plus"; spec = "0.1.2"; } + { name = "clone"; spec = "0.1.5"; } + { name = "ssh-agent"; spec = "0.2.1"; } + { name = "once"; spec = "1.1.1"; } + { name = "vasync"; spec = "1.3.3"; } + ]; + patchLatest = false; + sha1 = "9b8569b914f25da53816fe158f80b6571470f270"; + tarball = "http://registry.npmjs.org/smartdc-auth/-/smartdc-auth-1.0.0.tgz"; + } + { + name = "sntp"; + spec = "0.1.x"; + version = "0.1.4"; + topLevel = false; + dependencies = [ + { name = "hoek"; spec = "0.7.x"; } + ]; + patchLatest = false; + sha1 = "5ef481b951a7b29affdf4afd7f26838fc1120f84"; + tarball = "http://registry.npmjs.org/sntp/-/sntp-0.1.4.tgz"; + } + { + name = "sntp"; + spec = "0.2.x"; + version = "0.2.4"; + topLevel = false; + dependencies = [ + { name = "hoek"; spec = "0.9.x"; } + ]; + patchLatest = false; + sha1 = "fb885f18b0f3aad189f824862536bceeec750900"; + tarball = "http://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz"; + } + { + name = "sockjs"; + spec = "*"; + version = "0.3.7"; + topLevel = true; + dependencies = [ + { name = "node-uuid"; spec = "1.3.3"; } + { name = "faye-websocket"; spec = "0.4.4"; } + ]; + patchLatest = false; + sha1 = "2950e0586d8a9d3044958a831ade68db197749cb"; + tarball = "http://registry.npmjs.org/sockjs/-/sockjs-0.3.7.tgz"; + } + { + name = "source-map"; + spec = "*"; + version = "0.1.25"; + topLevel = true; + dependencies = [ + { name = "amdefine"; spec = ">=0.0.4"; } + ]; + patchLatest = false; + sha1 = "5851545c1f4a40243829065c20e6f40b023fba1a"; + tarball = "http://registry.npmjs.org/source-map/-/source-map-0.1.25.tgz"; + } + { + name = "source-map"; + spec = "~0.1.7"; + version = "0.1.25"; + topLevel = false; + dependencies = [ + { name = "amdefine"; spec = ">=0.0.4"; } + ]; + patchLatest = false; + sha1 = "5851545c1f4a40243829065c20e6f40b023fba1a"; + tarball = "http://registry.npmjs.org/source-map/-/source-map-0.1.25.tgz"; + } + { + name = "spdy"; + spec = "1.7.1"; + version = "1.7.1"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "4fde77e602b20c4ecc39ee8619373dd9bf669152"; + tarball = "http://registry.npmjs.org/spdy/-/spdy-1.7.1.tgz"; + } + { + name = "ssh-agent"; + spec = "0.2.1"; + version = "0.2.1"; + topLevel = false; + dependencies = [ + { name = "ctype"; spec = "0.5.0"; } + { name = "posix-getopt"; spec = "1.0.0"; } + ]; + patchLatest = false; + sha1 = "3044e9eaeca88a9e6971dd7deb19bdcc20012929"; + tarball = "http://registry.npmjs.org/ssh-agent/-/ssh-agent-0.2.1.tgz"; + } + { + name = "stack-trace"; + spec = "0.0.x"; + version = "0.0.6"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "1e719bd6a2629ff09c189e17a9ef902a94fc5db0"; + tarball = "http://registry.npmjs.org/stack-trace/-/stack-trace-0.0.6.tgz"; + } + { + name = "stream-counter"; + spec = "~0.1.0"; + version = "0.1.0"; + topLevel = false; + dependencies = [ + { name = "readable-stream"; spec = "~1.0.2"; } + ]; + patchLatest = false; + sha1 = "a035e429361fb57f361606e17fcd8a8b9677327b"; + tarball = "http://registry.npmjs.org/stream-counter/-/stream-counter-0.1.0.tgz"; + } + { + name = "stream-splitter-transform"; + spec = "*"; + version = "0.0.3"; + topLevel = true; + dependencies = [ + { name = "buffertools"; spec = ">=1.1.1 <2.0.0"; } + ]; + patchLatest = false; + sha1 = "5ccd3bd497ffee4c2fc7c1cc9d7b697b54c42eef"; + tarball = "http://registry.npmjs.org/stream-splitter-transform/-/stream-splitter-transform-0.0.3.tgz"; + } + { + name = "stylus"; + spec = "*"; + version = "0.34.1"; + topLevel = true; + dependencies = [ + { name = "cssom"; spec = "0.2.x"; } + { name = "mkdirp"; spec = "0.3.x"; } + { name = "debug"; spec = "*"; } + ]; + patchLatest = false; + sha1 = "937d8502a3be4e617d5ad493f204c70a93d95b14"; + tarball = "http://registry.npmjs.org/stylus/-/stylus-0.34.1.tgz"; + } + { + name = "stylus"; + spec = "0.27.2"; + version = "0.27.2"; + topLevel = false; + dependencies = [ + { name = "cssom"; spec = "0.2.x"; } + { name = "mkdirp"; spec = "0.3.x"; } + { name = "debug"; spec = "*"; } + ]; + patchLatest = false; + sha1 = "1121f7f8cd152b0f8a4aa6a24a9adea10c825117"; + tarball = "http://registry.npmjs.org/stylus/-/stylus-0.27.2.tgz"; + } + { + name = "superagent"; + spec = "0.15.1"; + version = "0.15.1"; + topLevel = false; + dependencies = [ + { name = "qs"; spec = "0.6.5"; } + { name = "formidable"; spec = "1.0.9"; } + { name = "mime"; spec = "1.2.5"; } + { name = "emitter-component"; spec = "1.0.0"; } + { name = "methods"; spec = "0.0.1"; } + { name = "cookiejar"; spec = "1.3.0"; } + { name = "debug"; spec = "~0.7.2"; } + ]; + patchLatest = false; + sha1 = "f0df9954c2b90f29e4ae54ad308e4a2b432cc56a"; + tarball = "http://registry.npmjs.org/superagent/-/superagent-0.15.1.tgz"; + } + { + name = "supertest"; + spec = "*"; + version = "0.7.1"; + topLevel = true; + dependencies = [ + { name = "superagent"; spec = "0.15.1"; } + { name = "methods"; spec = "0.0.1"; } + ]; + patchLatest = false; + sha1 = "349a65a8bfb5207250658f71761279ad3a671d88"; + tarball = "http://registry.npmjs.org/supertest/-/supertest-0.7.1.tgz"; + } + { + name = "swig"; + spec = "*"; + version = "0.14.0"; + topLevel = true; + dependencies = [ + { name = "underscore"; spec = ">=1.1.7"; } + ]; + patchLatest = false; + sha1 = "544bfb3bd837608873eed6a72c672a28cb1f1b3f"; + tarball = "http://registry.npmjs.org/swig/-/swig-0.14.0.tgz"; + } + { + name = "sylvester"; + spec = ">= 0.0.12"; + version = "0.0.21"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "2987b1ce2bd2f38b0dce2a34388884bfa4400ea7"; + tarball = "http://registry.npmjs.org/sylvester/-/sylvester-0.0.21.tgz"; + } + { + name = "sylvester"; + spec = ">= 0.0.8"; + version = "0.0.21"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "2987b1ce2bd2f38b0dce2a34388884bfa4400ea7"; + tarball = "http://registry.npmjs.org/sylvester/-/sylvester-0.0.21.tgz"; + } + { + name = "tar"; + spec = "0"; + version = "0.1.17"; + topLevel = false; + dependencies = [ + { name = "inherits"; spec = "1.x"; } + { name = "block-stream"; spec = "*"; } + { name = "fstream"; spec = "~0.1.8"; } + ]; + patchLatest = false; + sha1 = "408c8a95deb8e78a65b59b1a51a333183a32badc"; + tarball = "http://registry.npmjs.org/tar/-/tar-0.1.17.tgz"; + } + { + name = "tar"; + spec = "~0.1.17"; + version = "0.1.17"; + topLevel = false; + dependencies = [ + { name = "inherits"; spec = "1.x"; } + { name = "block-stream"; spec = "*"; } + { name = "fstream"; spec = "~0.1.8"; } + ]; + patchLatest = false; + sha1 = "408c8a95deb8e78a65b59b1a51a333183a32badc"; + tarball = "http://registry.npmjs.org/tar/-/tar-0.1.17.tgz"; + } + { + name = "temp"; + spec = "*"; + version = "0.5.1"; + topLevel = true; + dependencies = [ + { name = "rimraf"; spec = "~2.1.4"; } + ]; + patchLatest = false; + sha1 = "77ab19c79aa7b593cbe4fac2441768cad987b8df"; + tarball = "http://registry.npmjs.org/temp/-/temp-0.5.1.tgz"; + } + { + name = "timespan"; + spec = "2.0.1"; + version = "2.0.1"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "479b45875937e14d0f4be1625f2abd08d801f68a"; + tarball = "http://registry.npmjs.org/timespan/-/timespan-2.0.1.tgz"; + } + { + name = "timezone"; + spec = "*"; + version = "0.0.22"; + topLevel = true; + dependencies = [ + ]; + patchLatest = false; + sha1 = "933c3d1950224957a349183e124147dd99e182f5"; + tarball = "http://registry.npmjs.org/timezone/-/timezone-0.0.22.tgz"; + } + { + name = "transformers"; + spec = "2.0.1"; + version = "2.0.1"; + topLevel = false; + dependencies = [ + { name = "promise"; spec = "~2.0"; } + { name = "css"; spec = "~1.0.8"; } + { name = "uglify-js"; spec = "~2.2.5"; } + ]; + patchLatest = false; + sha1 = "352131dfceb93a7532dc7535a4f142510435a394"; + tarball = "http://registry.npmjs.org/transformers/-/transformers-2.0.1.tgz"; + } + { + name = "tunnel-agent"; + spec = "~0.2.0"; + version = "0.2.0"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "6853c2afb1b2109e45629e492bde35f459ea69e8"; + tarball = "http://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.2.0.tgz"; + } + { + name = "tunnel-agent"; + spec = "~0.3.0"; + version = "0.3.0"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "ad681b68f5321ad2827c4cfb1b7d5df2cfe942ee"; + tarball = "http://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.3.0.tgz"; + } + { + name = "uglify-js"; + spec = "2.3.6"; + version = "2.3.6"; + topLevel = false; + dependencies = [ + { name = "async"; spec = "~0.2.6"; } + { name = "source-map"; spec = "~0.1.7"; } + { name = "optimist"; spec = "~0.3.5"; } + ]; + patchLatest = false; + sha1 = "fa0984770b428b7a9b2a8058f46355d14fef211a"; + tarball = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.3.6.tgz"; + } + { + name = "uglify-js"; + spec = "~2.2.5"; + version = "2.2.5"; + topLevel = false; + dependencies = [ + { name = "source-map"; spec = "~0.1.7"; } + { name = "optimist"; spec = "~0.3.5"; } + ]; + patchLatest = false; + sha1 = "a6e02a70d839792b9780488b7b8b184c095c99c7"; + tarball = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.2.5.tgz"; + } + { + name = "uglify-js"; + spec = "~2.3.6"; + version = "2.3.6"; + topLevel = false; + dependencies = [ + { name = "async"; spec = "~0.2.6"; } + { name = "source-map"; spec = "~0.1.7"; } + { name = "optimist"; spec = "~0.3.5"; } + ]; + patchLatest = false; + sha1 = "fa0984770b428b7a9b2a8058f46355d14fef211a"; + tarball = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.3.6.tgz"; + } + { + name = "uid-number"; + spec = "0"; + version = "0.0.3"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "cefb0fa138d8d8098da71a40a0d04a8327d6e1cc"; + tarball = "http://registry.npmjs.org/uid-number/-/uid-number-0.0.3.tgz"; + } + { + name = "uid2"; + spec = "0.0.2"; + version = "0.0.2"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "107fb155c82c1136620797ed4c88cf2b08f6aab8"; + tarball = "http://registry.npmjs.org/uid2/-/uid2-0.0.2.tgz"; + } + { + name = "underscore"; + spec = "*"; + version = "1.5.1"; + topLevel = true; + dependencies = [ + ]; + patchLatest = false; + sha1 = "d2bde817d176ffade894ab71458e682a14b86dc9"; + tarball = "http://registry.npmjs.org/underscore/-/underscore-1.5.1.tgz"; + } + { + name = "underscore"; + spec = "1.4.x"; + version = "1.4.4"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "61a6a32010622afa07963bf325203cf12239d604"; + tarball = "http://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz"; + } + { + name = "underscore"; + spec = ">=1.1.7"; + version = "1.5.1"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "d2bde817d176ffade894ab71458e682a14b86dc9"; + tarball = "http://registry.npmjs.org/underscore/-/underscore-1.5.1.tgz"; + } + { + name = "underscore"; + spec = ">=1.4.3"; + version = "1.5.1"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "d2bde817d176ffade894ab71458e682a14b86dc9"; + tarball = "http://registry.npmjs.org/underscore/-/underscore-1.5.1.tgz"; + } + { + name = "underscore"; + spec = "~1.4.3"; + version = "1.4.4"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "61a6a32010622afa07963bf325203cf12239d604"; + tarball = "http://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz"; + } + { + name = "underscore.string"; + spec = "~2.3.1"; + version = "2.3.2"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "c10835dc04c2677cd49e1d77d26c0d3b22cc5709"; + tarball = "http://registry.npmjs.org/underscore.string/-/underscore.string-2.3.2.tgz"; + } + { + name = "util"; + spec = ">= 0.4.9"; + version = "0.4.9"; + topLevel = false; + dependencies = [ + { name = "events.node"; spec = ">= 0.4.0"; } + ]; + patchLatest = false; + sha1 = "d95d5830d2328ec17dee3c80bfc50c33562b75a3"; + tarball = "http://registry.npmjs.org/util/-/util-0.4.9.tgz"; + } + { + name = "utile"; + spec = "0.1.7"; + version = "0.1.7"; + topLevel = false; + dependencies = [ + { name = "async"; spec = "0.1.x"; } + { name = "deep-equal"; spec = "*"; } + { name = "i"; spec = "0.3.x"; } + { name = "mkdirp"; spec = "0.x.x"; } + { name = "ncp"; spec = "0.2.x"; } + { name = "rimraf"; spec = "1.x.x"; } + ]; + patchLatest = false; + sha1 = "55db180d54475339fd6dd9e2d14a4c0b52624b69"; + tarball = "http://registry.npmjs.org/utile/-/utile-0.1.7.tgz"; + } + { + name = "utile"; + spec = "0.1.x"; + version = "0.1.7"; + topLevel = false; + dependencies = [ + { name = "async"; spec = "0.1.x"; } + { name = "deep-equal"; spec = "*"; } + { name = "i"; spec = "0.3.x"; } + { name = "mkdirp"; spec = "0.x.x"; } + { name = "ncp"; spec = "0.2.x"; } + { name = "rimraf"; spec = "1.x.x"; } + ]; + patchLatest = false; + sha1 = "55db180d54475339fd6dd9e2d14a4c0b52624b69"; + tarball = "http://registry.npmjs.org/utile/-/utile-0.1.7.tgz"; + } + { + name = "vasync"; + spec = "1.3.3"; + version = "1.3.3"; + topLevel = false; + dependencies = [ + { name = "jsprim"; spec = "0.3.0"; } + { name = "verror"; spec = "1.1.0"; } + ]; + patchLatest = false; + sha1 = "84917680717020b67e043902e63bc143174c8728"; + tarball = "http://registry.npmjs.org/vasync/-/vasync-1.3.3.tgz"; + } + { + name = "verror"; + spec = "1.1.0"; + version = "1.1.0"; + topLevel = false; + dependencies = [ + { name = "extsprintf"; spec = "1.0.0"; } + ]; + patchLatest = false; + sha1 = "2a4b4eb14a207051e75a6f94ee51315bf173a1b0"; + tarball = "http://registry.npmjs.org/verror/-/verror-1.1.0.tgz"; + } + { + name = "verror"; + spec = "1.3.3"; + version = "1.3.3"; + topLevel = false; + dependencies = [ + { name = "extsprintf"; spec = "1.0.0"; } + ]; + patchLatest = false; + sha1 = "8a6a4ac3a8c774b6f687fece49bdffd78552e2cd"; + tarball = "http://registry.npmjs.org/verror/-/verror-1.3.3.tgz"; + } + { + name = "verror"; + spec = "1.3.6"; + version = "1.3.6"; + topLevel = false; + dependencies = [ + { name = "extsprintf"; spec = "1.0.2"; } + ]; + patchLatest = false; + sha1 = "cff5df12946d297d2baaefaa2689e25be01c005c"; + tarball = "http://registry.npmjs.org/verror/-/verror-1.3.6.tgz"; + } + { + name = "view-helpers"; + spec = "*"; + version = "0.1.2"; + topLevel = true; + dependencies = [ + ]; + patchLatest = false; + sha1 = "20643e9f50d00cf46da754dc934d791d4f6e3bb2"; + tarball = "http://registry.npmjs.org/view-helpers/-/view-helpers-0.1.2.tgz"; + } + { + name = "walk"; + spec = "*"; + version = "2.2.1"; + topLevel = true; + dependencies = [ + { name = "forEachAsync"; spec = "~2.2"; } + ]; + patchLatest = false; + sha1 = "5ada1f8e49e47d4b7445d8be7a2e1e631ab43016"; + tarball = "http://registry.npmjs.org/walk/-/walk-2.2.1.tgz"; + } + { + name = "watch"; + spec = "0.5.x"; + version = "0.5.1"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "50ea3a056358c98073e0bca59956de4afd20b213"; + tarball = "http://registry.npmjs.org/watch/-/watch-0.5.1.tgz"; + } + { + name = "watch"; + spec = "0.7.0"; + version = "0.7.0"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "3d6e715648af867ec7f1149302b526479e726856"; + tarball = "http://registry.npmjs.org/watch/-/watch-0.7.0.tgz"; + } + { + name = "websocket-driver"; + spec = ">=0.2.0"; + version = "0.2.2"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "998bc1855d8cd0d1e9aa8f8056b83b46ac3e81ef"; + tarball = "http://registry.npmjs.org/websocket-driver/-/websocket-driver-0.2.2.tgz"; + } + { + name = "which"; + spec = "1"; + version = "1.0.5"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "5630d6819dda692f1464462e7956cb42c0842739"; + tarball = "http://registry.npmjs.org/which/-/which-1.0.5.tgz"; + } + { + name = "winston"; + spec = "*"; + version = "0.7.2"; + topLevel = true; + dependencies = [ + { name = "async"; spec = "0.2.x"; } + { name = "colors"; spec = "0.6.x"; } + { name = "cycle"; spec = "1.0.x"; } + { name = "eyes"; spec = "0.1.x"; } + { name = "pkginfo"; spec = "0.3.x"; } + { name = "request"; spec = "2.16.x"; } + { name = "stack-trace"; spec = "0.0.x"; } + ]; + patchLatest = false; + sha1 = "2570ae1aa1d8a9401e8d5a88362e1cf936550ceb"; + tarball = "http://registry.npmjs.org/winston/-/winston-0.7.2.tgz"; + } + { + name = "winston"; + spec = "0.6.2"; + version = "0.6.2"; + topLevel = false; + dependencies = [ + { name = "async"; spec = "0.1.x"; } + { name = "colors"; spec = "0.x.x"; } + { name = "cycle"; spec = "1.0.x"; } + { name = "eyes"; spec = "0.1.x"; } + { name = "pkginfo"; spec = "0.2.x"; } + { name = "request"; spec = "2.9.x"; } + { name = "stack-trace"; spec = "0.0.x"; } + ]; + patchLatest = false; + sha1 = "4144fe2586cdc19a612bf8c035590132c9064bd2"; + tarball = "http://registry.npmjs.org/winston/-/winston-0.6.2.tgz"; + } + { + name = "winston"; + spec = "0.6.x"; + version = "0.6.2"; + topLevel = false; + dependencies = [ + { name = "async"; spec = "0.1.x"; } + { name = "colors"; spec = "0.x.x"; } + { name = "cycle"; spec = "1.0.x"; } + { name = "eyes"; spec = "0.1.x"; } + { name = "pkginfo"; spec = "0.2.x"; } + { name = "request"; spec = "2.9.x"; } + { name = "stack-trace"; spec = "0.0.x"; } + ]; + patchLatest = false; + sha1 = "4144fe2586cdc19a612bf8c035590132c9064bd2"; + tarball = "http://registry.npmjs.org/winston/-/winston-0.6.2.tgz"; + } + { + name = "winston"; + spec = "0.7.1"; + version = "0.7.1"; + topLevel = false; + dependencies = [ + { name = "async"; spec = "0.2.x"; } + { name = "colors"; spec = "0.6.x"; } + { name = "cycle"; spec = "1.0.x"; } + { name = "eyes"; spec = "0.1.x"; } + { name = "pkginfo"; spec = "0.3.x"; } + { name = "request"; spec = "2.16.x"; } + { name = "stack-trace"; spec = "0.0.x"; } + ]; + patchLatest = false; + sha1 = "e291ab24eddbf79ea40ff532619277a0d30b0eb3"; + tarball = "http://registry.npmjs.org/winston/-/winston-0.7.1.tgz"; + } + { + name = "with"; + spec = "~1.1.0"; + version = "1.1.0"; + topLevel = false; + dependencies = [ + { name = "uglify-js"; spec = "2.3.6"; } + ]; + patchLatest = false; + sha1 = "7f722ce4050ab55310777327b014194c544c66dd"; + tarball = "http://registry.npmjs.org/with/-/with-1.1.0.tgz"; + } + { + name = "wordwrap"; + spec = ">=0.0.1 <0.1.0"; + version = "0.0.2"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "b79669bb42ecb409f83d583cad52ca17eaa1643f"; + tarball = "http://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"; + } + { + name = "wordwrap"; + spec = "~0.0.2"; + version = "0.0.2"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "b79669bb42ecb409f83d583cad52ca17eaa1643f"; + tarball = "http://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"; + } + { + name = "wu"; + spec = "*"; + version = "0.1.8"; + topLevel = true; + dependencies = [ + ]; + patchLatest = false; + sha1 = "619bcdf64974a487894a25755ae095c5208b4a22"; + tarball = "http://registry.npmjs.org/wu/-/wu-0.1.8.tgz"; + } + { + name = "xml2js"; + spec = "0.2.4"; + version = "0.2.4"; + topLevel = false; + dependencies = [ + { name = "sax"; spec = ">=0.4.2"; } + ]; + patchLatest = false; + sha1 = "9a5b577fa1e6cdf8923d5e1372f7a3188436e44d"; + tarball = "http://registry.npmjs.org/xml2js/-/xml2js-0.2.4.tgz"; + } + { + name = "xml2js"; + spec = "0.2.x"; + version = "0.2.8"; + topLevel = false; + dependencies = [ + { name = "sax"; spec = "0.5.x"; } + ]; + patchLatest = false; + sha1 = "9b81690931631ff09d1957549faf54f4f980b3c2"; + tarball = "http://registry.npmjs.org/xml2js/-/xml2js-0.2.8.tgz"; + } + { + name = "xmlbuilder"; + spec = "*"; + version = "0.4.2"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "1776d65f3fdbad470a08d8604cdeb1c4e540ff83"; + tarball = "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-0.4.2.tgz"; } ] diff --git a/pkgs/top-level/node-packages.nix b/pkgs/top-level/node-packages.nix index a23b776d112..206dd1c87ce 100644 --- a/pkgs/top-level/node-packages.nix +++ b/pkgs/top-level/node-packages.nix @@ -7,23 +7,29 @@ let let all = pkgs.lib.fold (pkg: { top-level, full }: { top-level = top-level ++ pkgs.lib.optional pkg.topLevel { - name = pkg.baseName; - value = builtins.getAttr pkg.fullName self.full; + name = pkg.name; + value = builtins.getAttr pkg.spec (builtins.getAttr pkg.name self.full); }; - full = [ { - name = pkg.fullName; - value = pkgs.lib.makeOverridable buildNodePackage rec { - name = "${pkg.baseName}-${pkg.version}"; - src = (if pkg.patchLatest then patchLatest else fetchurl) { - url = "http://registry.npmjs.org/${pkg.baseName}/-/${name}.tgz"; - sha256 = pkg.hash; + full = full // builtins.listToAttrs [ { + inherit (pkg) name; + value = (if builtins.hasAttr pkg.name full + then builtins.getAttr pkg.name full + else {} + ) // builtins.listToAttrs [ { + name = pkg.spec; + value = pkgs.lib.makeOverridable buildNodePackage { + name = "${pkg.name}-${pkg.version}"; + src = (if pkg.patchLatest then patchLatest else fetchurl) { + url = pkg.tarball; + sha1 = pkg.sha1 or ""; + sha256 = pkg.sha256 or ""; + }; + deps = map (dep: builtins.getAttr dep.spec (builtins.getAttr dep.name self.full)) pkg.dependencies; }; - deps = map (dep: builtins.getAttr "${dep.name}-${dep.range}" self.full) pkg.dependencies; - buildInputs = if builtins.hasAttr name nativeDeps then builtins.getAttr name nativeDeps else []; - }; - } ] ++ full; - } ) { top-level = []; full = []; } generated; - in builtins.listToAttrs all.top-level // { full = builtins.listToAttrs all.full; }; + } ]; + } ]; + } ) { top-level = []; full = {}; } generated; + in builtins.listToAttrs all.top-level // { inherit (all) full; }; in { inherit importGeneratedPackages; From e4019400087ca6050c8c8587f1a4e4d1c8e74556 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 14 Jul 2013 21:05:29 +0200 Subject: [PATCH 457/798] haskell-abstract-deque: disable test suite to avoid bug in GHC 7.4.2 --- pkgs/development/libraries/haskell/abstract-deque/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/abstract-deque/default.nix b/pkgs/development/libraries/haskell/abstract-deque/default.nix index 6a97c6372e0..263cd049a3d 100644 --- a/pkgs/development/libraries/haskell/abstract-deque/default.nix +++ b/pkgs/development/libraries/haskell/abstract-deque/default.nix @@ -6,6 +6,7 @@ cabal.mkDerivation (self: { sha256 = "12g4y3j59nkjw9ja247m8ydhj6a033lzfbqkp4a5slrqdxfdlvyb"; buildDepends = [ HUnit random testFramework testFrameworkHunit ]; testDepends = [ HUnit random testFramework testFrameworkHunit ]; + doCheck = false; meta = { homepage = "https://github.com/rrnewton/haskell-lockfree-queue/wiki"; description = "Abstract, parameterized interface to mutable Deques"; From 07c3591ddb5cd2c979a7a6ed6fa7184f66a41bb4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 14 Jul 2013 20:19:41 +0200 Subject: [PATCH 458/798] haskell-SDL: update to version 0.6.5 --- pkgs/development/libraries/haskell/SDL/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/SDL/default.nix b/pkgs/development/libraries/haskell/SDL/default.nix index 62731657e82..2fd9c3e0fb6 100644 --- a/pkgs/development/libraries/haskell/SDL/default.nix +++ b/pkgs/development/libraries/haskell/SDL/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "SDL"; - version = "0.6.4"; - sha256 = "1zrfx2nw0k8lfkr6vnwsp5wr3yz62v0bq60p4sdzj7gm01bz92g0"; + version = "0.6.5"; + sha256 = "1vlf1bvp4cbgr31qk6aqikhgn9jbgj7lrvnjzv3ibykm1hhd6vdb"; extraLibraries = [ SDL ]; meta = { description = "Binding to libSDL"; From 26dd59b8b4cbf74965c4c11b78e2e5b0ca038d1d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 14 Jul 2013 20:19:41 +0200 Subject: [PATCH 459/798] haskell-acid-state: update to version 0.11.4 --- pkgs/development/libraries/haskell/acid-state/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/acid-state/default.nix b/pkgs/development/libraries/haskell/acid-state/default.nix index ed31aaed000..28d8def56cf 100644 --- a/pkgs/development/libraries/haskell/acid-state/default.nix +++ b/pkgs/development/libraries/haskell/acid-state/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "acid-state"; - version = "0.11.3"; - sha256 = "0808wcr2n9r3z94ljlzalzkfr7ri327vm5s8xif42n9dw600xi0j"; + version = "0.11.4"; + sha256 = "1z9jswg5c2wp9k2lfp0yx7mvw6iiyizm72s552lgjn8i3slq8481"; buildDepends = [ cereal extensibleExceptions filepath mtl network safecopy stm ]; From 1ae62db2e0acd4f83c98f3a05e8f0471d4a6572e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 14 Jul 2013 20:19:41 +0200 Subject: [PATCH 460/798] haskell-bindings-posix: update to version 1.2.3 --- pkgs/development/libraries/haskell/bindings-posix/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/haskell/bindings-posix/default.nix b/pkgs/development/libraries/haskell/bindings-posix/default.nix index 23994140d6c..1475be90039 100644 --- a/pkgs/development/libraries/haskell/bindings-posix/default.nix +++ b/pkgs/development/libraries/haskell/bindings-posix/default.nix @@ -1,10 +1,11 @@ -{ cabal, bindingsDSL }: +{ cabal, bindingsDSL, pthread }: cabal.mkDerivation (self: { pname = "bindings-posix"; version = "1.2.3"; sha256 = "0nj18lfpn8hmlaa7cmvdkjnk8fi2f6ysjbigkx7zbrpqnvbi63ba"; buildDepends = [ bindingsDSL ]; + extraLibraries = [ pthread ]; meta = { description = "Low level bindings to posix"; license = self.stdenv.lib.licenses.bsd3; From b193bd0db30b16bc96d6e9a582ea3ba1cdf51a9e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 14 Jul 2013 20:19:41 +0200 Subject: [PATCH 461/798] haskell-comonad: update to version 3.1 --- pkgs/development/libraries/haskell/comonad/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/comonad/default.nix b/pkgs/development/libraries/haskell/comonad/default.nix index 86a8a5c2c30..472e4e315c1 100644 --- a/pkgs/development/libraries/haskell/comonad/default.nix +++ b/pkgs/development/libraries/haskell/comonad/default.nix @@ -1,10 +1,10 @@ -{ cabal, doctest, filepath, semigroups, transformers }: +{ cabal, doctest, filepath, semigroups, tagged, transformers }: cabal.mkDerivation (self: { pname = "comonad"; - version = "3.0.3"; - sha256 = "1wngwa1cdww5c631dcil0c7mgkqx9bj7m5i63p7d9ymhpyx9sw2l"; - buildDepends = [ semigroups transformers ]; + version = "3.1"; + sha256 = "0sl9b3f1vwpjdvnrxv7b8n512w05pv4in6qx3l4sbksdp1zjvcyv"; + buildDepends = [ semigroups tagged transformers ]; testDepends = [ doctest filepath ]; meta = { homepage = "http://github.com/ekmett/comonad/"; From 3602951e6fecd6118822e67320f1350a4dc50c27 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 14 Jul 2013 20:19:41 +0200 Subject: [PATCH 462/798] haskell-comonads-fd: update to version 3.0.3 --- pkgs/development/libraries/haskell/comonads-fd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/comonads-fd/default.nix b/pkgs/development/libraries/haskell/comonads-fd/default.nix index 08032cb60ab..aac28ff0871 100644 --- a/pkgs/development/libraries/haskell/comonads-fd/default.nix +++ b/pkgs/development/libraries/haskell/comonads-fd/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "comonads-fd"; - version = "3.0.2"; - sha256 = "1gzgld895b11j556nc5pj7nbafx746b1z49bx4z38l9wq6qzbvqa"; + version = "3.0.3"; + sha256 = "06x545yq5xc3kphjipkgjrgrfvvkjpy0wji9d5fw44ca91nzglww"; buildDepends = [ comonad comonadTransformers mtl semigroups transformers ]; From 7923a212f70a716ae5b31b441df585c7f9f6b73a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 14 Jul 2013 20:19:41 +0200 Subject: [PATCH 463/798] haskell-monad-par-extras: update to version 0.3.3 --- .../libraries/haskell/monad-par-extras/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/monad-par-extras/default.nix b/pkgs/development/libraries/haskell/monad-par-extras/default.nix index fb877337221..6b9ca0e7553 100644 --- a/pkgs/development/libraries/haskell/monad-par-extras/default.nix +++ b/pkgs/development/libraries/haskell/monad-par-extras/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "monad-par-extras"; - version = "0.3.2"; - sha256 = "1k0j3n803z4lv5impz6xd1nzav35dl5f68nlw2ppgg1bbfpvdv6b"; + version = "0.3.3"; + sha256 = "0bl4bd6jzdc5zm20q1g67ppkfh6j6yn8fwj6msjayj621cck67p2"; buildDepends = [ abstractPar cereal deepseq mtl random transformers ]; From bdcc7b7d1822c5cebfc59f662211c1633c73f8b4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 14 Jul 2013 20:19:41 +0200 Subject: [PATCH 464/798] haskell-pipes-concurrency: update to version 1.2.1 --- .../libraries/haskell/pipes-concurrency/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/pipes-concurrency/default.nix b/pkgs/development/libraries/haskell/pipes-concurrency/default.nix index d931845f16e..970321bf286 100644 --- a/pkgs/development/libraries/haskell/pipes-concurrency/default.nix +++ b/pkgs/development/libraries/haskell/pipes-concurrency/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "pipes-concurrency"; - version = "1.2.0"; - sha256 = "058v9d3wf9n1d25rhdq5vj60p8mll5yv2zn2k1092bg7qisip1fq"; + version = "1.2.1"; + sha256 = "036cn6pafqpf2811iigablks3zk747bnzji9ykrgwhpja427vlbl"; buildDepends = [ pipes stm ]; meta = { description = "Concurrency for the pipes ecosystem"; From dca0df536458648bfec84841b4e99fec63842c6c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 14 Jul 2013 20:19:41 +0200 Subject: [PATCH 465/798] haskell-shelly: update to version 1.3.0.7 --- pkgs/development/libraries/haskell/shelly/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/shelly/default.nix b/pkgs/development/libraries/haskell/shelly/default.nix index 61342c09084..dc9367b4463 100644 --- a/pkgs/development/libraries/haskell/shelly/default.nix +++ b/pkgs/development/libraries/haskell/shelly/default.nix @@ -3,8 +3,8 @@ cabal.mkDerivation (self: { pname = "shelly"; - version = "1.3.0.6"; - sha256 = "0sm55f02cm89m8szhf9zb2jww86amzd6wdk44b3cqr7aza08clvj"; + version = "1.3.0.7"; + sha256 = "08ydsvgc8n0bvk5vcz3a3rpdbnranlbv8y84imkkh7i0p3nqyg2m"; buildDepends = [ mtl systemFileio systemFilepath text time unixCompat ]; From 0bdc4a1a94d2867ee040f6905fba592f337e2a21 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 14 Jul 2013 20:19:41 +0200 Subject: [PATCH 466/798] haskell-th-orphans: update to version 0.7 --- pkgs/development/libraries/haskell/th-orphans/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/th-orphans/default.nix b/pkgs/development/libraries/haskell/th-orphans/default.nix index da14adfe339..d7b7c42b6c8 100644 --- a/pkgs/development/libraries/haskell/th-orphans/default.nix +++ b/pkgs/development/libraries/haskell/th-orphans/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "th-orphans"; - version = "0.6"; - sha256 = "1ablf4c8vp9kzvr75ngl5yz3ip5klk6zmq7bcqcvks758b9c6qgj"; + version = "0.7"; + sha256 = "0fb0wkpvb8wc12gpgm90jfsgcm4p1wf8p0m5xjk64zkcjrdxjr80"; buildDepends = [ thLift ]; noHaddock = true; meta = { From 913685d0ac1d3f5f3dafdd983dd1025774299fa6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 14 Jul 2013 21:11:29 +0200 Subject: [PATCH 467/798] haskell-snap: jailbreak to fix build with recent versions of comonad --- pkgs/development/libraries/haskell/snap/snap.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/snap/snap.nix b/pkgs/development/libraries/haskell/snap/snap.nix index 80cdf575d70..966a298fd3b 100644 --- a/pkgs/development/libraries/haskell/snap/snap.nix +++ b/pkgs/development/libraries/haskell/snap/snap.nix @@ -19,6 +19,7 @@ cabal.mkDerivation (self: { snapCore snapServer stm syb text time transformers unorderedContainers vector vectorAlgorithms xmlhtml ]; + jailbreak = true; meta = { homepage = "http://snapframework.com/"; description = "Top-level package for the Snap Web Framework"; From b71c382f6fdb2d7f23c0729efa878d784ea0897e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 14 Jul 2013 21:22:57 +0200 Subject: [PATCH 468/798] haskell-bindings-posix: fix bogus change committed earlier --- pkgs/development/libraries/haskell/bindings-posix/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/bindings-posix/default.nix b/pkgs/development/libraries/haskell/bindings-posix/default.nix index 1475be90039..23994140d6c 100644 --- a/pkgs/development/libraries/haskell/bindings-posix/default.nix +++ b/pkgs/development/libraries/haskell/bindings-posix/default.nix @@ -1,11 +1,10 @@ -{ cabal, bindingsDSL, pthread }: +{ cabal, bindingsDSL }: cabal.mkDerivation (self: { pname = "bindings-posix"; version = "1.2.3"; sha256 = "0nj18lfpn8hmlaa7cmvdkjnk8fi2f6ysjbigkx7zbrpqnvbi63ba"; buildDepends = [ bindingsDSL ]; - extraLibraries = [ pthread ]; meta = { description = "Low level bindings to posix"; license = self.stdenv.lib.licenses.bsd3; From 2741391fda1d8081be600024636f592b1a840f59 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 14 Jul 2013 21:32:33 +0200 Subject: [PATCH 469/798] Partially revert commit 075796e0531506fa106be1d2f47a9c866b70b99c. The commit downgraded the german language dictionary from version 20030222-1 to 20120607 (and broke the build in the process). That change was probably not intended? --- pkgs/development/libraries/aspell/dictionaries.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/aspell/dictionaries.nix b/pkgs/development/libraries/aspell/dictionaries.nix index 100960ef8e8..bf7a9de9a2a 100644 --- a/pkgs/development/libraries/aspell/dictionaries.nix +++ b/pkgs/development/libraries/aspell/dictionaries.nix @@ -29,11 +29,11 @@ let in { de = buildDict { - shortName = "de-20120607"; + shortName = "de-20030222-1"; fullName = "German"; src = fetchurl { - url = https://www.j3e.de/ispell/igerman98/dict/igerman98-20120607.tar.bz2; - sha256 = "1m9jzxwrh0hwsrjs6l98v88miia45y643nbayzjjria2harq7yy5"; + url = mirror://gnu/aspell/dict/de/aspell6-de-20030222-1.tar.bz2; + sha256 = "01p92qj66cqb346gk7hjfynaap5sbcn85xz07kjfdq623ghr8v5s"; }; }; From 84d43394c691437b23c67c790b2d84f5686d0fe1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 14 Jul 2013 21:32:47 +0200 Subject: [PATCH 470/798] pkgs/development/libraries/aspell/dictionaries.nix: strip trailing whitespace --- .../libraries/aspell/dictionaries.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/aspell/dictionaries.nix b/pkgs/development/libraries/aspell/dictionaries.nix index bf7a9de9a2a..131da4112e8 100644 --- a/pkgs/development/libraries/aspell/dictionaries.nix +++ b/pkgs/development/libraries/aspell/dictionaries.nix @@ -36,7 +36,7 @@ in { sha256 = "01p92qj66cqb346gk7hjfynaap5sbcn85xz07kjfdq623ghr8v5s"; }; }; - + en = buildDict { shortName = "en-7.1-0"; fullName = "English"; @@ -45,7 +45,7 @@ in { sha256 = "02ldfiny4iakgfgy4sdrzjqdzi7l1rmb6y30lv31kfy5x31g77gz"; }; }; - + es = buildDict { shortName = "es-1.11-2"; fullName = "Spanish"; @@ -54,7 +54,7 @@ in { sha256 = "1k5g328ac1hdpp6fsg57d8md6i0aqcwlszp3gbmp5706wyhpydmd"; }; }; - + eo = buildDict { shortName = "eo-2.1.20000225a-2"; fullName = "Esperanto"; @@ -72,7 +72,7 @@ in { sha256 = "14ffy9mn5jqqpp437kannc3559bfdrpk7r36ljkzjalxa53i0hpr"; }; }; - + it = buildDict { shortName = "it-2.2_20050523-0"; fullName = "Italian"; @@ -81,7 +81,7 @@ in { sha256 = "1gdf7bc1a0kmxsmphdqq8pl01h667mjsj6hihy6kqy14k5qdq69v"; }; }; - + la = buildDict { shortName = "la-20020503-0"; fullName = "Latin"; @@ -90,7 +90,7 @@ in { sha256 = "1199inwi16dznzl087v4skn66fl7h555hi2palx6s1f3s54b11nl"; }; }; - + nl = buildDict { shortName = "nl-0.50-2"; fullName = "Dutch"; @@ -103,7 +103,7 @@ in { echo "add nl.rws" > $out/lib/aspell/nederlands.multi ''; }; - + pl = buildDict { shortName = "pl-6.0_20061121-0"; fullName = "Polish"; @@ -112,7 +112,7 @@ in { sha256 = "0kap4kh6bqbb22ypja1m5z3krc06vv4n0hakiiqmv20anzy42xq1"; }; }; - + ru = buildDict { shortName = "ru-0.99f7-1"; fullName = "Russian"; @@ -121,5 +121,5 @@ in { sha256 = "0ip6nq43hcr7vvzbv4lwwmlwgfa60hrhsldh9xy3zg2prv6bcaaw"; }; }; - + } From dc988c815b4aa703f20d8160dc1ca3a95338efc2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 14 Jul 2013 21:51:37 +0200 Subject: [PATCH 471/798] haskell-src-meta: jailbreak to fix build with recent versions of th-orphans --- pkgs/development/libraries/haskell/haskell-src-meta/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/haskell-src-meta/default.nix b/pkgs/development/libraries/haskell/haskell-src-meta/default.nix index 7b6ccb69633..98dfff8505a 100644 --- a/pkgs/development/libraries/haskell/haskell-src-meta/default.nix +++ b/pkgs/development/libraries/haskell/haskell-src-meta/default.nix @@ -5,6 +5,7 @@ cabal.mkDerivation (self: { version = "0.6.0.2"; sha256 = "1msqnsavghsc5bil3mm9swpi9a54pki4162jdfwwvlzvdmfvk9hp"; buildDepends = [ haskellSrcExts syb thOrphans uniplate ]; + jailbreak = true; meta = { description = "Parse source to template-haskell abstract syntax"; license = self.stdenv.lib.licenses.bsd3; From 206706503a7ebf99229888f3fae5d819cc23a9e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 10 Jul 2013 18:57:03 +0200 Subject: [PATCH 472/798] cromfs: update to 1.5.10.1. --- pkgs/tools/archivers/cromfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/archivers/cromfs/default.nix b/pkgs/tools/archivers/cromfs/default.nix index 3512d62223f..fdba02d12b7 100644 --- a/pkgs/tools/archivers/cromfs/default.nix +++ b/pkgs/tools/archivers/cromfs/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, fuse, perl }: stdenv.mkDerivation rec { - name = "cromfs-1.5.10"; + name = "cromfs-1.5.10.1"; src = fetchurl { url = "http://bisqwit.iki.fi/src/arch/${name}.tar.bz2"; - sha256 = "1w079zb5scv6bj919ndr0fkiirq2bkyjrnmwqrr9yzwbyinzg73j"; + sha256 = "0fg6vnbxr5jk4gqj31yqc9fj1gp3bj955qhxav28nvc6sbql7ac2"; }; patchPhase = ''sed -i 's@/bin/bash@/bin/sh@g' configure''; From 6a13cd01ac76465f7ce6397075ea8edeab434a74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 14 Jul 2013 22:27:16 +0200 Subject: [PATCH 473/798] libva: update (fix h264encode) --- pkgs/development/libraries/libva/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix index 5b35d2b24ad..6c13297b38c 100644 --- a/pkgs/development/libraries/libva/default.nix +++ b/pkgs/development/libraries/libva/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libX11, pkgconfig, libXext, mesa, libdrm, libXfixes }: stdenv.mkDerivation rec { - name = "libva-1.1.1"; + name = "libva-1.2.1"; src = fetchurl { url = "http://www.freedesktop.org/software/vaapi/releases/libva/${name}.tar.bz2"; - sha256 = "0kfdcrzcr82g15l0vvmm6rqr0f0604d4dgrza78gn6bfx7rppby0"; + sha1 = "f716a4cadd670b14f44a2e833f96a2c509956339"; }; buildInputs = [ libX11 libXext pkgconfig mesa libdrm libXfixes ]; From ec786d59d84e589b9d9124c16227829dbcc11409 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 14 Jul 2013 23:49:28 +0200 Subject: [PATCH 474/798] firefox-wrapper: remove the 'lowPrio' attribute that was accidentally added in an earlier commit --- 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 a656cdf1c41..4d273a7e3d9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7536,7 +7536,7 @@ let libpng = libpng.override { apngSupport = true; }; }; - firefoxWrapper = lowPrio (wrapFirefox { browser = firefoxPkgs.firefox; }); + firefoxWrapper = wrapFirefox { browser = firefoxPkgs.firefox; }; flac = callPackage ../applications/audio/flac { }; From a01ab33e03fce3b89f6a8fff343c96d7e8e0b34b Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 15 Jul 2013 01:10:20 +0200 Subject: [PATCH 475/798] chromium: Enable pulseaudio by default. If no config.pulseaudio is explicitely set to false, build with pulse support, because even if there is no pulse server available, chromium will fall back to using ALSA. And we definitely want to avoid that users have to build chromium for themselves just for the sake of having pulse support. Thanks to @devhell for actually helping me discovering this (I for myself do always rebuild Chromium, so I won't notice those kind of things). Signed-off-by: aszlig --- 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 4d273a7e3d9..f942843eef0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7181,7 +7181,7 @@ let chromium = lowPrio (callPackage ../applications/networking/browsers/chromium { channel = "stable"; gconf = gnome.GConf; - pulseSupport = config.pulseaudio or false; + pulseSupport = config.pulseaudio or true; }); chromiumBeta = lowPrio (chromium.override { channel = "beta"; }); From 8e9f501fd747ad4b8b395ffd52c6af018da2f5cf Mon Sep 17 00:00:00 2001 From: Russell O'Connor Date: Sun, 14 Jul 2013 23:38:20 -0400 Subject: [PATCH 476/798] Update tarsnap to version 1.0.34. --- pkgs/tools/backup/tarsnap/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/backup/tarsnap/default.nix b/pkgs/tools/backup/tarsnap/default.nix index bcf03356c68..052b1416e07 100644 --- a/pkgs/tools/backup/tarsnap/default.nix +++ b/pkgs/tools/backup/tarsnap/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, openssl, zlib, e2fsprogs }: stdenv.mkDerivation { - name = "tarsnap-1.0.33"; + name = "tarsnap-1.0.34"; src = fetchurl { - url = "https://www.tarsnap.com/download/tarsnap-autoconf-1.0.33.tgz"; - sha256 = "0z8bmra3xms9vcgvkiy9fy1j97192z6w7n658j6zr5cniid8438c"; + url = "https://www.tarsnap.com/download/tarsnap-autoconf-1.0.34.tgz"; + sha256 = "049q0mbz9i4m87n1r78zf62mcxd04wm49rjqpiy5yzy4z8m1gh0l"; }; buildInputs = [ openssl zlib e2fsprogs ]; From 3538f7c54933f5a6b4641fb72bba5ffc87df1479 Mon Sep 17 00:00:00 2001 From: Russell O'Connor Date: Sun, 14 Jul 2013 23:41:55 -0400 Subject: [PATCH 477/798] Update download link for ssreflect. --- pkgs/applications/science/logic/ssreflect/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/science/logic/ssreflect/default.nix b/pkgs/applications/science/logic/ssreflect/default.nix index ba831cc62f5..6377db9c895 100644 --- a/pkgs/applications/science/logic/ssreflect/default.nix +++ b/pkgs/applications/science/logic/ssreflect/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { inherit name; src = fetchurl { - url = "https://gforge.inria.fr/frs/download.php/31453/${name}-coq8.4.tar.gz"; + url = "http://ssr.msr-inria.inria.fr/FTP/${name}-coq8.4.tar.gz"; sha256 = "1ysx29xw09i86lq0d92z9cnyx133jfgq4qddy3501000fn7xwi7h"; }; From c1d9a58f0dbfb7e0be2fd6abcf146545dd1fd00e Mon Sep 17 00:00:00 2001 From: bbenoist Date: Mon, 15 Jul 2013 11:15:34 +0200 Subject: [PATCH 478/798] qtcreator: Update to version 2.8.0 See for more informations. --- pkgs/development/qtcreator/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/qtcreator/default.nix b/pkgs/development/qtcreator/default.nix index add0c08e95a..97f238302ec 100644 --- a/pkgs/development/qtcreator/default.nix +++ b/pkgs/development/qtcreator/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, qt48 }: let - baseVersion = "2.7"; - revision = "1"; + baseVersion = "2.8"; + revision = "0"; version = "${baseVersion}.${revision}"; qt4_for_qtcreator = qt48.override { developerBuild = true; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://download.qt-project.org/official_releases/qtcreator/${baseVersion}/${version}/qt-creator-${version}-src.tar.gz"; - sha256 = "04vn7y3dkk9vi1rsmsxby57mvc2h9n5q842hayq2mdlsax4qnhjv"; + sha256 = "7ac5d9a36c2f561f74d77378d4eae95a78c7752b323e1df924d6e895e99f45d2"; }; buildInputs = [ qt4_for_qtcreator ]; From 41932dd1357619c82249fc0b78a417262015a34a Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Mon, 15 Jul 2013 11:32:12 +0200 Subject: [PATCH 479/798] Do not make assumptions on the scheme name, but let xcodebuild decide about it --- pkgs/development/mobile/xcodeenv/build-app.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/mobile/xcodeenv/build-app.nix b/pkgs/development/mobile/xcodeenv/build-app.nix index ac6bbc7f282..ade629759f0 100644 --- a/pkgs/development/mobile/xcodeenv/build-app.nix +++ b/pkgs/development/mobile/xcodeenv/build-app.nix @@ -23,7 +23,6 @@ let # Set some default values here _target = if target == null then name else target; - _scheme = if scheme == null then name else scheme; _configuration = if configuration == null then @@ -75,7 +74,7 @@ stdenv.mkDerivation { ''} # Do the building - xcodebuild -target ${_target} -configuration ${_configuration} -scheme ${_scheme} -sdk ${_sdk} -arch ${_arch} ONLY_ACTIVE_ARCH=NO CONFIGURATION_TEMP_DIR=$TMPDIR CONFIGURATION_BUILD_DIR=$out ${if generateXCArchive then "archive" else ""} ${xcodeFlags} ${if release then ''"CODE_SIGN_IDENTITY=${codeSignIdentity}" PROVISIONING_PROFILE=$PROVISIONING_PROFILE OTHER_CODE_SIGN_FLAGS="--keychain $HOME/Library/Keychains/$keychainName"'' else ""} + xcodebuild -target ${_target} -configuration ${_configuration} ${stdenv.lib.optionalString (scheme != null) "-scheme ${scheme}"} -sdk ${_sdk} -arch ${_arch} ONLY_ACTIVE_ARCH=NO CONFIGURATION_TEMP_DIR=$TMPDIR CONFIGURATION_BUILD_DIR=$out ${if generateXCArchive then "archive" else ""} ${xcodeFlags} ${if release then ''"CODE_SIGN_IDENTITY=${codeSignIdentity}" PROVISIONING_PROFILE=$PROVISIONING_PROFILE OTHER_CODE_SIGN_FLAGS="--keychain $HOME/Library/Keychains/$keychainName"'' else ""} ${stdenv.lib.optionalString release '' ${stdenv.lib.optionalString generateIPA '' From 2cf1cbf2fe540e5805d768d2641ffa599f4d8f8a Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Mon, 15 Jul 2013 13:25:42 +0200 Subject: [PATCH 480/798] Added gridfs-stream node package + updated nodejs packages --- pkgs/top-level/node-packages-generated.nix | 69 +++++++++++++--------- pkgs/top-level/node-packages.json | 1 + 2 files changed, 41 insertions(+), 29 deletions(-) diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix index 536bb2ef944..5adb589d522 100644 --- a/pkgs/top-level/node-packages-generated.nix +++ b/pkgs/top-level/node-packages-generated.nix @@ -1697,6 +1697,17 @@ sha1 = "c9a206f6f5f4b94e1046dfaaccfe9e12d0ab8cef"; tarball = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.0.tgz"; } + { + name = "gridfs-stream"; + spec = "*"; + version = "0.4.0"; + topLevel = true; + dependencies = [ + ]; + patchLatest = false; + sha1 = "f76f791e0d1b22649e11beeacddf8e62bd89ca2a"; + tarball = "http://registry.npmjs.org/gridfs-stream/-/gridfs-stream-0.4.0.tgz"; + } { name = "growl"; spec = "1.5.x"; @@ -2753,14 +2764,14 @@ } { name = "mute-stream"; - spec = "~0.0.2"; - version = "0.0.3"; + spec = "~0.0.4"; + version = "0.0.4"; topLevel = false; dependencies = [ ]; patchLatest = false; - sha1 = "f09c090d333b3063f615cbbcca71b349893f0152"; - tarball = "http://registry.npmjs.org/mute-stream/-/mute-stream-0.0.3.tgz"; + sha1 = "a9219960a6d5d5d046597aee51252c6655f7177e"; + tarball = "http://registry.npmjs.org/mute-stream/-/mute-stream-0.0.4.tgz"; } { name = "mv"; @@ -3700,50 +3711,50 @@ { name = "read"; spec = "1"; - version = "1.0.4"; + version = "1.0.5"; topLevel = false; dependencies = [ - { name = "mute-stream"; spec = "~0.0.2"; } + { name = "mute-stream"; spec = "~0.0.4"; } ]; patchLatest = false; - sha1 = "c2374be81787fc8633602a1b98232569d52fc655"; - tarball = "http://registry.npmjs.org/read/-/read-1.0.4.tgz"; + sha1 = "007a3d169478aa710a491727e453effb92e76203"; + tarball = "http://registry.npmjs.org/read/-/read-1.0.5.tgz"; } { name = "read"; spec = "1.0.x"; - version = "1.0.4"; + version = "1.0.5"; topLevel = false; dependencies = [ - { name = "mute-stream"; spec = "~0.0.2"; } + { name = "mute-stream"; spec = "~0.0.4"; } ]; patchLatest = false; - sha1 = "c2374be81787fc8633602a1b98232569d52fc655"; - tarball = "http://registry.npmjs.org/read/-/read-1.0.4.tgz"; + sha1 = "007a3d169478aa710a491727e453effb92e76203"; + tarball = "http://registry.npmjs.org/read/-/read-1.0.5.tgz"; } { name = "read"; spec = "~1.0.1"; - version = "1.0.4"; + version = "1.0.5"; topLevel = false; dependencies = [ - { name = "mute-stream"; spec = "~0.0.2"; } + { name = "mute-stream"; spec = "~0.0.4"; } ]; patchLatest = false; - sha1 = "c2374be81787fc8633602a1b98232569d52fc655"; - tarball = "http://registry.npmjs.org/read/-/read-1.0.4.tgz"; + sha1 = "007a3d169478aa710a491727e453effb92e76203"; + tarball = "http://registry.npmjs.org/read/-/read-1.0.5.tgz"; } { name = "read"; spec = "~1.0.4"; - version = "1.0.4"; + version = "1.0.5"; topLevel = false; dependencies = [ - { name = "mute-stream"; spec = "~0.0.2"; } + { name = "mute-stream"; spec = "~0.0.4"; } ]; patchLatest = false; - sha1 = "c2374be81787fc8633602a1b98232569d52fc655"; - tarball = "http://registry.npmjs.org/read/-/read-1.0.4.tgz"; + sha1 = "007a3d169478aa710a491727e453effb92e76203"; + tarball = "http://registry.npmjs.org/read/-/read-1.0.5.tgz"; } { name = "read-installed"; @@ -4094,26 +4105,26 @@ { name = "rimraf"; spec = "2"; - version = "2.2.0"; + version = "2.2.1"; topLevel = false; dependencies = [ { name = "graceful-fs"; spec = "~1"; } ]; patchLatest = false; - sha1 = "70797542e81a935849443d7b69bec612ca74c96e"; - tarball = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.0.tgz"; + sha1 = "8f49c57874ce166b667fbfecac2cdf7f26d3d8a5"; + tarball = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.1.tgz"; } { name = "rimraf"; spec = "~2"; - version = "2.2.0"; + version = "2.2.1"; topLevel = false; dependencies = [ { name = "graceful-fs"; spec = "~1"; } ]; patchLatest = false; - sha1 = "70797542e81a935849443d7b69bec612ca74c96e"; - tarball = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.0.tgz"; + sha1 = "8f49c57874ce166b667fbfecac2cdf7f26d3d8a5"; + tarball = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.1.tgz"; } { name = "rimraf"; @@ -4130,14 +4141,14 @@ { name = "rimraf"; spec = "~2.2.0"; - version = "2.2.0"; + version = "2.2.1"; topLevel = false; dependencies = [ { name = "graceful-fs"; spec = "~1"; } ]; patchLatest = false; - sha1 = "70797542e81a935849443d7b69bec612ca74c96e"; - tarball = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.0.tgz"; + sha1 = "8f49c57874ce166b667fbfecac2cdf7f26d3d8a5"; + tarball = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.1.tgz"; } { name = "s3http"; diff --git a/pkgs/top-level/node-packages.json b/pkgs/top-level/node-packages.json index ac09384b1ee..08b4f36b482 100644 --- a/pkgs/top-level/node-packages.json +++ b/pkgs/top-level/node-packages.json @@ -61,4 +61,5 @@ , "i18next" , "stylus" , "npm" +, "gridfs-stream" ] From 59aca269757b21e241fe8f3ed3d2a7d31e430994 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 15 Jul 2013 12:28:45 +0200 Subject: [PATCH 481/798] * Use 'or'. --- pkgs/build-support/vm/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 66998b34130..987da558519 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -291,7 +291,7 @@ rec { args = ["-e" (vmRunCommand qemuCommandLinux)]; origArgs = attrs.args; origBuilder = attrs.builder; - QEMU_OPTS = "-m ${toString (if attrs ? memSize then attrs.memSize else 512)}"; + QEMU_OPTS = "-m ${toString (attrs.memSize or 512)}"; }); From 66b2ff107455bdd7d7cf27363770445c0371cd1a Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 15 Jul 2013 13:01:38 +0200 Subject: [PATCH 482/798] linux: Update to 3.4.53 --- 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 90df69dcf16..34a36bb276d 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix @@ -246,7 +246,7 @@ in import ./generic.nix ( rec { - version = "3.4.51"; + version = "3.4.53"; testing = false; preConfigure = '' @@ -255,7 +255,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "02msq95m2f73bw0y0sf2gsvg6yd7gfr6n1f2id77604mc6svb69s"; + sha256 = "1imrs9shy8gbiylz2rlm9l312r1z0clnky5l965113ciarz65qjz"; }; config = configWithPlatform stdenv.platform; From 46a2dfe96010feec3b8ad156c2062fdf1eea654e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 15 Jul 2013 14:28:49 +0200 Subject: [PATCH 483/798] Set the default Linux kernel to 3.4 3.4 is the most recent long-term stable branch, which will be maintained until October 2014 at least. Issue #501. --- 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 5122bce693f..535b29c2ea7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6549,7 +6549,7 @@ let # The current default kernel / kernel modules. linux = linuxPackages.kernel; - linuxPackages = linuxPackages_3_2; + linuxPackages = linuxPackages_3_4; # A function to build a manually-configured kernel linuxManualConfig = import ../os-specific/linux/kernel/manual-config.nix { From 93ff42ae9c33b2f507c766ac5b2398cfd287ef30 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Mon, 15 Jul 2013 14:48:34 +0200 Subject: [PATCH 484/798] dovecot: Add version 2.2.4 as attribute dovecot22 I also added a patch that makes dovecot search for plugins in /var/lib/dovecot/modules. This way, you can add plugins from several packages without running into circular dependencies. The module dir needs to be populated before the dovecot service is started, for example. This is currently not done in NixOS, so you need to implement your own service in order to get the plugins working. The module patch has not been added to the old 2.1.x package. --- .../mail/dovecot/2.2.x-module_dir.patch | 114 ++++++++++++++++++ pkgs/servers/mail/dovecot/2.2.x.nix | 41 +++++++ pkgs/top-level/all-packages.nix | 6 +- 3 files changed, 160 insertions(+), 1 deletion(-) create mode 100644 pkgs/servers/mail/dovecot/2.2.x-module_dir.patch create mode 100644 pkgs/servers/mail/dovecot/2.2.x.nix diff --git a/pkgs/servers/mail/dovecot/2.2.x-module_dir.patch b/pkgs/servers/mail/dovecot/2.2.x-module_dir.patch new file mode 100644 index 00000000000..cce63fe250c --- /dev/null +++ b/pkgs/servers/mail/dovecot/2.2.x-module_dir.patch @@ -0,0 +1,114 @@ +diff -ur dovecot-2.2.2-orig/src/auth/main.c dovecot-2.2.2/src/auth/main.c +--- dovecot-2.2.2-orig/src/auth/main.c 2013-03-13 15:26:46.000000000 +0100 ++++ dovecot-2.2.2/src/auth/main.c 2013-05-20 20:23:58.126024535 +0200 +@@ -193,7 +193,7 @@ + mod_set.debug = global_auth_settings->debug; + mod_set.filter_callback = auth_module_filter; + +- modules = module_dir_load(AUTH_MODULE_DIR, NULL, &mod_set); ++ modules = module_dir_load("/var/lib/dovecot/modules/auth", NULL, &mod_set); + module_dir_init(modules); + + if (!worker) +@@ -223,7 +223,7 @@ + mod_set.debug = global_auth_settings->debug; + mod_set.ignore_missing = TRUE; + +- modules = module_dir_load_missing(modules, AUTH_MODULE_DIR, names, ++ modules = module_dir_load_missing(modules, "/var/lib/dovecot/modules/auth", names, + &mod_set); + module_dir_init(modules); + } +diff -ur dovecot-2.2.2-orig/src/config/all-settings.c dovecot-2.2.2/src/config/all-settings.c +--- dovecot-2.2.2-orig/src/config/all-settings.c 2013-05-15 12:20:55.000000000 +0200 ++++ dovecot-2.2.2/src/config/all-settings.c 2013-05-21 00:31:46.624073562 +0200 +@@ -766,7 +766,7 @@ + .last_valid_gid = 0, + + .mail_plugins = "", +- .mail_plugin_dir = MODULEDIR, ++ .mail_plugin_dir = "/var/lib/dovecot/modules", + + .mail_log_prefix = "%s(%u): ", + +@@ -3274,7 +3274,7 @@ + .base_dir = PKG_RUNDIR, + .libexec_dir = PKG_LIBEXECDIR, + .mail_plugins = "", +- .mail_plugin_dir = MODULEDIR, ++ .mail_plugin_dir = "/var/lib/dovecot/modules", + .doveadm_socket_path = "doveadm-server", + .doveadm_worker_count = 0, + .doveadm_port = 0, +diff -ur dovecot-2.2.2-orig/src/config/config-parser.c dovecot-2.2.2/src/config/config-parser.c +--- dovecot-2.2.2-orig/src/config/config-parser.c 2013-02-04 22:05:42.000000000 +0100 ++++ dovecot-2.2.2/src/config/config-parser.c 2013-05-20 20:23:58.106024534 +0200 +@@ -990,7 +990,7 @@ + + memset(&mod_set, 0, sizeof(mod_set)); + mod_set.abi_version = DOVECOT_ABI_VERSION; +- modules = module_dir_load(CONFIG_MODULE_DIR, NULL, &mod_set); ++ modules = module_dir_load("/var/lib/dovecot/modules/settings", NULL, &mod_set); + module_dir_init(modules); + + i_array_init(&new_roots, 64); +diff -ur dovecot-2.2.2-orig/src/dict/main.c dovecot-2.2.2/src/dict/main.c +--- dovecot-2.2.2-orig/src/dict/main.c 2013-02-04 22:05:42.000000000 +0100 ++++ dovecot-2.2.2/src/dict/main.c 2013-05-20 20:23:58.101024534 +0200 +@@ -61,7 +61,7 @@ + mod_set.abi_version = DOVECOT_ABI_VERSION; + mod_set.require_init_funcs = TRUE; + +- modules = module_dir_load(DICT_MODULE_DIR, NULL, &mod_set); ++ modules = module_dir_load("/var/lib/dovecot/modules/dict", NULL, &mod_set); + module_dir_init(modules); + + /* Register only after loading modules. They may contain SQL drivers, +diff -ur dovecot-2.2.2-orig/src/doveadm/doveadm-settings.c dovecot-2.2.2/src/doveadm/doveadm-settings.c +--- dovecot-2.2.2-orig/src/doveadm/doveadm-settings.c 2013-04-07 19:13:06.000000000 +0200 ++++ dovecot-2.2.2/src/doveadm/doveadm-settings.c 2013-05-20 20:23:58.399024539 +0200 +@@ -76,7 +76,7 @@ + .base_dir = PKG_RUNDIR, + .libexec_dir = PKG_LIBEXECDIR, + .mail_plugins = "", +- .mail_plugin_dir = MODULEDIR, ++ .mail_plugin_dir = "/var/lib/dovecot/modules", + .doveadm_socket_path = "doveadm-server", + .doveadm_worker_count = 0, + .doveadm_port = 0, +diff -ur dovecot-2.2.2-orig/src/lib-fs/fs-api.c dovecot-2.2.2/src/lib-fs/fs-api.c +--- dovecot-2.2.2-orig/src/lib-fs/fs-api.c 2013-04-18 16:07:26.000000000 +0200 ++++ dovecot-2.2.2/src/lib-fs/fs-api.c 2013-05-20 20:23:58.099024534 +0200 +@@ -82,7 +82,7 @@ + mod_set.abi_version = DOVECOT_ABI_VERSION; + mod_set.ignore_missing = TRUE; + +- fs_modules = module_dir_load_missing(fs_modules, MODULE_DIR, ++ fs_modules = module_dir_load_missing(fs_modules, "/var/lib/dovecot/modules", + module_name, &mod_set); + module_dir_init(fs_modules); + +diff -ur dovecot-2.2.2-orig/src/lib-ssl-iostream/iostream-ssl.c dovecot-2.2.2/src/lib-ssl-iostream/iostream-ssl.c +--- dovecot-2.2.2-orig/src/lib-ssl-iostream/iostream-ssl.c 2013-04-09 22:45:19.000000000 +0200 ++++ dovecot-2.2.2/src/lib-ssl-iostream/iostream-ssl.c 2013-05-20 20:23:58.089024534 +0200 +@@ -28,7 +28,7 @@ + memset(&mod_set, 0, sizeof(mod_set)); + mod_set.abi_version = DOVECOT_ABI_VERSION; + mod_set.setting_name = ""; +- ssl_module = module_dir_load(MODULE_DIR, plugin_name, &mod_set); ++ ssl_module = module_dir_load("/var/lib/dovecot/modules", plugin_name, &mod_set); + + ssl_vfuncs = module_get_symbol(ssl_module, "ssl_vfuncs"); + if (ssl_vfuncs == NULL) { +diff -ur dovecot-2.2.2-orig/src/lib-storage/mail-storage-settings.c dovecot-2.2.2/src/lib-storage/mail-storage-settings.c +--- dovecot-2.2.2-orig/src/lib-storage/mail-storage-settings.c 2013-05-15 12:20:00.000000000 +0200 ++++ dovecot-2.2.2/src/lib-storage/mail-storage-settings.c 2013-05-20 20:23:57.858024531 +0200 +@@ -260,7 +260,7 @@ + .last_valid_gid = 0, + + .mail_plugins = "", +- .mail_plugin_dir = MODULEDIR, ++ .mail_plugin_dir = "/var/lib/dovecot/modules", + + .mail_log_prefix = "%s(%u): ", + diff --git a/pkgs/servers/mail/dovecot/2.2.x.nix b/pkgs/servers/mail/dovecot/2.2.x.nix new file mode 100644 index 00000000000..15c3b65b754 --- /dev/null +++ b/pkgs/servers/mail/dovecot/2.2.x.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchurl, perl, systemd, openssl, pam, bzip2, zlib, openldap +, inotifyTools }: + +stdenv.mkDerivation rec { + name = "dovecot-2.2.4"; + + buildInputs = [perl systemd openssl pam bzip2 zlib openldap inotifyTools]; + + src = fetchurl { + url = "http://dovecot.org/releases/2.2/${name}.tar.gz"; + sha256 = "1i5x7l03q854h4j210cpzair4vak95saccp9gb5p4xx7ndggm3q1"; + }; + + preConfigure = '' + substituteInPlace src/config/settings-get.pl --replace \ + "/usr/bin/env perl" "${perl}/bin/perl" + ''; + + patches = [ + # Make dovecot look for plugins in /var/lib/dovecot/modules + # so we can symlink plugins from several packages there + # The symlinking needs to be done in NixOS, as part of the + # dovecot service start-up + ./2.2.x-module_dir.patch + ]; + + configureFlags = [ + # It will hardcode this for /var/lib/dovecot. + # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=626211 + "--localstatedir=/var" + "--with-systemdsystemunitdir=$(out)/etc/systemd/system" + "--with-ldap" + ]; + + meta = { + homepage = "http://dovecot.org/"; + description = "Open source IMAP and POP3 email server written with security primarily in mind"; + maintainers = with stdenv.lib.maintainers; [viric simons rickynils]; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 535b29c2ea7..24492ca7d86 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5857,7 +5857,11 @@ let dictdWordnet = callPackage ../servers/dict/dictd-wordnet.nix {}; - dovecot = callPackage ../servers/mail/dovecot { }; + dovecot = dovecot21; + + dovecot21 = callPackage ../servers/mail/dovecot { }; + + dovecot22 = callPackage ../servers/mail/dovecot/2.2.x.nix { }; ejabberd = callPackage ../servers/xmpp/ejabberd { }; From 0dc36983e91996adea3d881989e79df684a95a36 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Mon, 15 Jul 2013 15:05:03 +0200 Subject: [PATCH 485/798] New package: opensmtpd, an SMTP server from the OpenBSD project. --- pkgs/servers/mail/opensmtpd/default.nix | 33 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/servers/mail/opensmtpd/default.nix diff --git a/pkgs/servers/mail/opensmtpd/default.nix b/pkgs/servers/mail/opensmtpd/default.nix new file mode 100644 index 00000000000..8f18cb46861 --- /dev/null +++ b/pkgs/servers/mail/opensmtpd/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl, libevent, zlib, openssl, db4, bison, pam }: + +stdenv.mkDerivation rec { + name = "opensmtpd-${version}"; + version = "201306271531p1"; + + buildInputs = [ libevent zlib openssl db4 bison pam ]; + + src = fetchurl { + url = "http://www.opensmtpd.org/archives/${name}.tar.gz"; + sha256 = "0b06vzv566nai9j506rl3cwkk5favqxg23hsn08490ynn23im0sc"; + }; + + configureFlags = [ + "--with-mantype=doc" + "--with-pam" + "--without-bsd-auth" + "--with-sock-dir=/run" + "--with-privsep-user=smtpd" + "--with-queue-user=smtpq" + ]; + + meta = { + homepage = "http://www.postfix.org/"; + description = '' + A free implementation of the server-side SMTP protocol as defined by + RFC 5321, with some additional standard extensions. + ''; + license = stdenv.lib.licenses.isc; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.rickynils ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 24492ca7d86..00f1d2463db 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5926,6 +5926,8 @@ let nginx = callPackage ../servers/http/nginx { }; + opensmtpd = callPackage ../servers/mail/opensmtpd { }; + petidomo = callPackage ../servers/mail/petidomo { }; popa3d = callPackage ../servers/mail/popa3d { }; From 56c5f338455cefa50e8b23cc307c1fdac9c77cf1 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Mon, 15 Jul 2013 15:15:35 +0200 Subject: [PATCH 486/798] New package: dovecot_pigeonhole, a sieve plugin for dovecot --- .../mail/dovecot-pigeonhole/default.nix | 35 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/servers/mail/dovecot-pigeonhole/default.nix diff --git a/pkgs/servers/mail/dovecot-pigeonhole/default.nix b/pkgs/servers/mail/dovecot-pigeonhole/default.nix new file mode 100644 index 00000000000..844219925b1 --- /dev/null +++ b/pkgs/servers/mail/dovecot-pigeonhole/default.nix @@ -0,0 +1,35 @@ +{stdenv, fetchurl, dovecot22, openssl}: + +stdenv.mkDerivation rec { + name = "dovecot-pigeonhole-${version}"; + version = "0.4.1"; + + src = fetchurl { + url = "http://www.rename-it.nl/dovecot/2.2/dovecot-2.2-pigeonhole-${version}.tar.gz"; + sha256 = "0vk9khwijl8qbjlm1q36a5dvpilrminp756n87c452kc3cfgc71n"; + }; + + buildInputs = [ dovecot22 openssl ]; + + preConfigure = '' + substituteInPlace src/managesieve/managesieve-settings.c --replace \ + ".executable = \"managesieve\"" \ + ".executable = \"$out/libexec/dovecot/managesieve\"" + substituteInPlace src/managesieve-login/managesieve-login-settings.c --replace \ + ".executable = \"managesieve-login\"" \ + ".executable = \"$out/libexec/dovecot/managesieve-login\"" + ''; + + configureFlags = [ + "--with-dovecot=${dovecot22}/lib/dovecot" + "--without-dovecot-install-dirs" + "--with-moduledir=$(out)/lib/dovecot" + ]; + + meta = with stdenv.lib; { + homepage = http://pigeonhole.dovecot.org/; + description = "A sieve plugin for the Dovecot IMAP server."; + license = licenses.lgpl21; + maintainers = [ maintainers.rickynils ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 00f1d2463db..48fe5e5be1a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5863,6 +5863,8 @@ let dovecot22 = callPackage ../servers/mail/dovecot/2.2.x.nix { }; + dovecot_pigeonhole = callPackage ../servers/mail/dovecot-pigeonhole { }; + ejabberd = callPackage ../servers/xmpp/ejabberd { }; elasticmq = callPackage ../servers/elasticmq { }; From 5dbe2627a212b5ddaf73e24e2fc329fb4c365604 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Mon, 15 Jul 2013 16:01:09 +0200 Subject: [PATCH 487/798] linux-3.9: upgrade to 3.9.10 (EOL) --- pkgs/os-specific/linux/kernel/linux-3.9.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.9.nix b/pkgs/os-specific/linux/kernel/linux-3.9.nix index c0441982dd3..b3909900c66 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.9.nix @@ -258,7 +258,7 @@ in import ./generic.nix ( rec { - version = "3.9.9"; + version = "3.9.10"; testing = false; preConfigure = '' @@ -267,7 +267,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "1zrw65m8kvxjkqfj708s418qdm87x0axjm0mr6c2zas5fnla981k"; + sha256 = "1c187jmdkz6nqfgf4sz9f4da6wzbn2mf99qcjr56nz8sr2zmk2wv"; }; config = configWithPlatform stdenv.platform; From c382681b1bbf3e81528f8136f8ac1092c164e35d Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Mon, 15 Jul 2013 17:03:55 +0200 Subject: [PATCH 488/798] nvidia binary driver: patch for linux 3.10 --- pkgs/os-specific/linux/nvidia-x11/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index b5d8abab241..c7fc5c44c22 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -8,14 +8,18 @@ with stdenv.lib; -let versionNumber = "319.32"; in +let versionNumber = "319.32"; + kernel310patch = fetchurl { + url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/nvidia-linux-3.10.patch?h=packages/nvidia"; + sha256 = "0nhzg6jdk9sf1vzj519gqi8a2n9xydhz2bcz472pss2cfgbc1ahb"; + }; -stdenv.mkDerivation { +in stdenv.mkDerivation { name = "nvidia-x11-${versionNumber}${optionalString (!libsOnly) "-${kernelDev.version}"}"; builder = ./builder.sh; - patches = [ ./version-test.patch ]; + patches = [ ./version-test.patch kernel310patch ]; src = if stdenv.system == "i686-linux" then From ebc424c3abfa72464c5f6777f2d522bf6d0f3790 Mon Sep 17 00:00:00 2001 From: bbenoist Date: Mon, 15 Jul 2013 16:32:42 +0200 Subject: [PATCH 489/798] cmake: Update to 2.8.11.2 The changelog is available at: http://www.cmake.org/files/v2.8/CMakeChangeLog-2.8.11 I had to create a new patch from scratch, that's why it contains a lot of differences. CMake developers has rewritten the files (Modules/Platform/Linux.cmake and Modules/Platform/UnixPaths.cmake) to comply to their coding style requirements and a lot of elements has switched from upper to lower case. Also, the previous patch partially consisted of commenting some instructions mixed with line removals whereas mine is directlty removing them in order to avoid useless evaluations and parsing in resulting files. --- .../tools/build-managers/cmake/default.nix | 4 +- .../build-managers/cmake/search-path.patch | 103 +++++++++--------- 2 files changed, 53 insertions(+), 54 deletions(-) diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index d66149a9509..fe8d92bafbf 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -7,7 +7,7 @@ with stdenv.lib; let os = stdenv.lib.optionalString; majorVersion = "2.8"; - minorVersion = "9"; + minorVersion = "11.2"; version = "${majorVersion}.${minorVersion}"; in @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}files/v${majorVersion}/cmake-${version}.tar.gz"; - sha256 = "1yg68ng732cfm5c0h91chqwhg06zdh45bybm353kd1myk5rwqgfw"; + sha256 = "0qh5dhd7ff08n2h569j7g9m92gb3bz14wvhwjhwl7lgx794cnamk"; }; patches = diff --git a/pkgs/development/tools/build-managers/cmake/search-path.patch b/pkgs/development/tools/build-managers/cmake/search-path.patch index ef8a9eef7c1..06f9d8ddca6 100644 --- a/pkgs/development/tools/build-managers/cmake/search-path.patch +++ b/pkgs/development/tools/build-managers/cmake/search-path.patch @@ -1,53 +1,54 @@ -diff -ru -x '*~' cmake-2.8.5-orig/Modules/Platform/Linux.cmake cmake-2.8.5/Modules/Platform/Linux.cmake ---- cmake-2.8.5-orig/Modules/Platform/Linux.cmake 2011-07-08 14:21:44.000000000 +0200 -+++ cmake-2.8.5/Modules/Platform/Linux.cmake 2011-07-21 19:45:00.000000000 +0200 -@@ -36,13 +36,13 @@ +diff -ru -x '*~' cmake-2.8.11.2-orig/Modules/Platform/Linux.cmake cmake-2.8.11.2/Modules/Platform/Linux.cmake +--- cmake-2.8.11.2-orig/Modules/Platform/Linux.cmake 2013-07-02 15:41:40.000000000 +0200 ++++ cmake-2.8.11.2/Modules/Platform/Linux.cmake 2013-07-15 11:43:30.557888066 +0200 +@@ -36,13 +36,8 @@ # checking the platform every time. This option is advanced enough # that only package maintainers should need to adjust it. They are # capable of providing a setting on the command line. -- IF(EXISTS "/etc/debian_version") -- SET(CMAKE_INSTALL_SO_NO_EXE 1 CACHE INTERNAL +- if(EXISTS "/etc/debian_version") +- set(CMAKE_INSTALL_SO_NO_EXE 1 CACHE INTERNAL - "Install .so files without execute permission.") -- ELSE(EXISTS "/etc/debian_version") -+ #IF(EXISTS "/etc/debian_version") -+ # SET(CMAKE_INSTALL_SO_NO_EXE 1 CACHE INTERNAL -+ # "Install .so files without execute permission.") -+ #ELSE(EXISTS "/etc/debian_version") - SET(CMAKE_INSTALL_SO_NO_EXE 0 CACHE INTERNAL - "Install .so files without execute permission.") -- ENDIF(EXISTS "/etc/debian_version") -+ #ENDIF(EXISTS "/etc/debian_version") - ENDIF(DEFINED CMAKE_INSTALL_SO_NO_EXE) +- else() +- set(CMAKE_INSTALL_SO_NO_EXE 0 CACHE INTERNAL +- "Install .so files without execute permission.") +- endif() ++ set(CMAKE_INSTALL_SO_NO_EXE 0 CACHE INTERNAL ++ "Install .so files without execute permission.") + endif() # Match multiarch library directory names. -@@ -52,6 +52,6 @@ +@@ -50,8 +45,3 @@ - # Debian has lib64 paths only for compatibility so they should not be - # searched. --IF(EXISTS "/etc/debian_version") -- SET_PROPERTY(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE) --ENDIF(EXISTS "/etc/debian_version") -+#IF(EXISTS "/etc/debian_version") -+# SET_PROPERTY(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE) -+#ENDIF(EXISTS "/etc/debian_version") -diff -ru -x '*~' cmake-2.8.5-orig/Modules/Platform/UnixPaths.cmake cmake-2.8.5/Modules/Platform/UnixPaths.cmake ---- cmake-2.8.5-orig/Modules/Platform/UnixPaths.cmake 2011-07-08 14:21:44.000000000 +0200 -+++ cmake-2.8.5/Modules/Platform/UnixPaths.cmake 2011-07-21 19:50:52.000000000 +0200 -@@ -33,55 +33,18 @@ + include(Platform/UnixPaths) + +-# Debian has lib64 paths only for compatibility so they should not be +-# searched. +-if(EXISTS "/etc/debian_version") +- set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE) +-endif() +diff -ru -x '*~' cmake-2.8.11.2-orig/Modules/Platform/UnixPaths.cmake cmake-2.8.11.2/Modules/Platform/UnixPaths.cmake +--- cmake-2.8.11.2-orig/Modules/Platform/UnixPaths.cmake 2013-07-02 15:41:40.000000000 +0200 ++++ cmake-2.8.11.2/Modules/Platform/UnixPaths.cmake 2013-07-15 11:42:02.949204549 +0200 +@@ -31,58 +31,13 @@ + + # List common installation prefixes. These will be used for all # search types. - LIST(APPEND CMAKE_SYSTEM_PREFIX_PATH - # Standard +-list(APPEND CMAKE_SYSTEM_PREFIX_PATH +- # Standard - /usr/local /usr / -- ++list(APPEND CMAKE_SYSTEM_PREFIX_PATH "@glibc@") + - # CMake install location - "${_CMAKE_INSTALL_DIR}" -- ++list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "@glibc@/lib") + - # Project install destination. - "${CMAKE_INSTALL_PREFIX}" - ) -- ++list(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES "@glibc@/include") + -# List common include file locations not under the common prefixes. --LIST(APPEND CMAKE_SYSTEM_INCLUDE_PATH +-list(APPEND CMAKE_SYSTEM_INCLUDE_PATH - # Windows API on Cygwin - /usr/include/w32api - @@ -56,11 +57,11 @@ diff -ru -x '*~' cmake-2.8.5-orig/Modules/Platform/UnixPaths.cmake cmake-2.8.5/M - - # Other - /usr/pkg/include -- /opt/csw/include /opt/include +- /opt/csw/include /opt/include - /usr/openwin/include - ) - --LIST(APPEND CMAKE_SYSTEM_LIBRARY_PATH +-list(APPEND CMAKE_SYSTEM_LIBRARY_PATH - # Windows API on Cygwin - /usr/lib/w32api - @@ -69,27 +70,25 @@ diff -ru -x '*~' cmake-2.8.5-orig/Modules/Platform/UnixPaths.cmake cmake-2.8.5/M - - # Other - /usr/pkg/lib -- /opt/csw/lib /opt/lib +- /opt/csw/lib /opt/lib - /usr/openwin/lib - ) - --LIST(APPEND CMAKE_SYSTEM_PROGRAM_PATH +-list(APPEND CMAKE_SYSTEM_PROGRAM_PATH - /usr/pkg/bin -+ "@glibc@" - ) - - LIST(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES +- ) +- +-list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES - /lib /usr/lib /usr/lib32 /usr/lib64 -+ "@glibc@/lib" - ) - - LIST(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES +- ) +- +-list(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES - /usr/include -+ "@glibc@/include" - ) - LIST(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES +- ) +-list(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES - /usr/include -+ "@glibc@/include" - ) +- ) ++list(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES "@glibc@/include") # Enable use of lib64 search path variants by default. + set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS TRUE) From 62bbba81734f43ded19650910ce31778802564ff Mon Sep 17 00:00:00 2001 From: Sergey Mironov Date: Tue, 16 Jul 2013 14:13:47 +0400 Subject: [PATCH 490/798] AVaRICE: translates between GDB's remote debug protocol and the AVR JTAG ICE protocol --- .../tools/misc/avarice/default.nix | 21 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/development/tools/misc/avarice/default.nix diff --git a/pkgs/development/tools/misc/avarice/default.nix b/pkgs/development/tools/misc/avarice/default.nix new file mode 100644 index 00000000000..d15c0bc59a8 --- /dev/null +++ b/pkgs/development/tools/misc/avarice/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, pkgconfig, perl, libusb }: + +stdenv.mkDerivation rec { + + name="avarice-2.13"; + + src = fetchurl { + url = "mirror://sourceforge/avarice/${name}.tar.bz2"; + sha256 = "0jhh1h1k5b41v2ycq8kn43nkrkh0b9l7xjmw38rak871g3z3hix1"; + }; + + buildInputs = [ pkgconfig perl libusb ]; + + meta = { + license = stdenv.lib.licenses.gpl2; + description = "AVaRICE translates between GDB's remote debug protocol and the AVR JTAG ICE protocol"; + homepage = http://sourceforge.net/projects/avarice/files/avarice/; + maintainers = [ stdenv.lib.maintainers.smironov ]; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f942843eef0..059d57c39d7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3281,6 +3281,8 @@ let avrdude = callPackage ../development/tools/misc/avrdude { }; + avarice = callPackage ../development/tools/misc/avarice { }; + bam = callPackage ../development/tools/build-managers/bam {}; binutils = callPackage ../development/tools/misc/binutils { From 4cc4ed6d2d0f9de630c8dedfca61de34af8e41e6 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 16 Jul 2013 13:44:43 +0200 Subject: [PATCH 491/798] linux-3.7: Remove It's EOL. --- pkgs/os-specific/linux/kernel/linux-3.7.nix | 280 -------------------- pkgs/top-level/all-packages.nix | 14 - 2 files changed, 294 deletions(-) delete mode 100644 pkgs/os-specific/linux/kernel/linux-3.7.nix diff --git a/pkgs/os-specific/linux/kernel/linux-3.7.nix b/pkgs/os-specific/linux/kernel/linux-3.7.nix deleted file mode 100644 index 2b31ec282ca..00000000000 --- a/pkgs/os-specific/linux/kernel/linux-3.7.nix +++ /dev/null @@ -1,280 +0,0 @@ -args @ { stdenv, fetchurl, extraConfig ? "" -, perl, mktemp, module_init_tools -, ... }: - -let - configWithPlatform = kernelPlatform : - '' - # Power management and debugging for powertop. - DEBUG_KERNEL y - PM_ADVANCED_DEBUG y - PM_RUNTIME y - TIMER_STATS y - USB_SUSPEND y - BACKTRACE_SELF_TEST n - CPU_NOTIFIER_ERROR_INJECT? n - DEBUG_DEVRES n - DEBUG_NX_TEST n - DEBUG_STACK_USAGE n - DEBUG_STACKOVERFLOW n - RCU_TORTURE_TEST n - SCHEDSTATS n - - # Support drivers that need external firmware. - STANDALONE n - - # Make /proc/config.gz available. - IKCONFIG_PROC y - - # Optimize with -O2, not -Os. - CC_OPTIMIZE_FOR_SIZE n - - # Enable the kernel's built-in memory tester. - MEMTEST y - - # Include the CFQ I/O scheduler in the kernel, rather than as a - # module, so that the initrd gets a good I/O scheduler. - IOSCHED_CFQ y - BLK_CGROUP y # required by CFQ - - # Enable NUMA. - NUMA? y - - # Disable some expensive (?) features. - FTRACE n - KPROBES n - PM_TRACE_RTC n - - # Enable various subsystems. - ACCESSIBILITY y # Accessibility support - AUXDISPLAY y # Auxiliary Display support - DONGLE y # Serial dongle support - HIPPI? y - MTD_COMPLEX_MAPPINGS y # needed for many devices - SCSI_LOWLEVEL y # enable lots of SCSI devices - SCSI_LOWLEVEL_PCMCIA y - SPI y # needed for many devices - SPI_MASTER y - WAN y - - # Networking options. - IP_PNP n - IPV6_PRIVACY y - NETFILTER_ADVANCED y - IP_VS_PROTO_TCP y - IP_VS_PROTO_UDP y - IP_VS_PROTO_ESP y - IP_VS_PROTO_AH y - IP_DCCP_CCID3 n # experimental - CLS_U32_PERF y - CLS_U32_MARK y - - # Wireless networking. - IPW2100_MONITOR y # support promiscuous mode - IPW2200_MONITOR? y # support promiscuous mode - HOSTAP_FIRMWARE y # Support downloading firmware images with Host AP driver - HOSTAP_FIRMWARE_NVRAM y - ATH9K_PCI y # Detect Atheros AR9xxx cards on PCI(e) bus - ATH9K_AHB y # Ditto, AHB bus - B43_PHY_HT y - BCMA_HOST_PCI y - CFG80211_WEXT y # Without it, ipw2200 drivers don't build - - # Some settings to make sure that fbcondecor works - in particular, - # disable tileblitting and the drivers that need it. - - # Enable various FB devices. - FB y - FB_EFI y - FB_NVIDIA_I2C y # Enable DDC Support - FB_RIVA_I2C y - FB_ATY_CT y # Mach64 CT/VT/GT/LT (incl. 3D RAGE) support - FB_ATY_GX y # Mach64 GX support - FB_SAVAGE_I2C y - FB_SAVAGE_ACCEL y - FB_SIS_300 y - FB_SIS_315 y - FB_3DFX_ACCEL y - FB_GEODE y - - # Video configuration - # Enable KMS for devices whose X.org driver supports it. - DRM_I915_KMS y - DRM_RADEON_KMS y - # Hybrid graphics support - VGA_SWITCHEROO y - - # Sound. - SND_AC97_POWER_SAVE y # AC97 Power-Saving Mode - SND_HDA_INPUT_BEEP y # Support digital beep via input layer - SND_USB_CAIAQ_INPUT y - PSS_MIXER y # Enable PSS mixer (Beethoven ADSP-16 and other compatible) - - # USB serial devices. - USB_SERIAL_GENERIC y # USB Generic Serial Driver - USB_SERIAL_KEYSPAN_MPR y # include firmware for various USB serial devices - USB_SERIAL_KEYSPAN_USA28 y - USB_SERIAL_KEYSPAN_USA28X y - USB_SERIAL_KEYSPAN_USA28XA y - USB_SERIAL_KEYSPAN_USA28XB y - USB_SERIAL_KEYSPAN_USA19 y - USB_SERIAL_KEYSPAN_USA18X y - USB_SERIAL_KEYSPAN_USA19W y - USB_SERIAL_KEYSPAN_USA19QW y - USB_SERIAL_KEYSPAN_USA19QI y - USB_SERIAL_KEYSPAN_USA49W y - USB_SERIAL_KEYSPAN_USA49WLC y - - # Filesystem options - in particular, enable extended attributes and - # ACLs for all filesystems that support them. - EXT2_FS_XATTR y # Ext2 extended attributes - EXT2_FS_POSIX_ACL y # Ext2 POSIX Access Control Lists - EXT2_FS_SECURITY y # Ext2 Security Labels - EXT2_FS_XIP y # Ext2 execute in place support - EXT4_FS_POSIX_ACL y - EXT4_FS_SECURITY y - REISERFS_FS_XATTR y - REISERFS_FS_POSIX_ACL y - REISERFS_FS_SECURITY y - JFS_POSIX_ACL y - JFS_SECURITY y - XFS_QUOTA y - XFS_POSIX_ACL y - XFS_RT y # XFS Realtime subvolume support - OCFS2_DEBUG_MASKLOG n - BTRFS_FS_POSIX_ACL y - UBIFS_FS_XATTR? y - UBIFS_FS_ADVANCED_COMPR y - NFSD_V2_ACL y - NFSD_V3 y - NFSD_V3_ACL y - NFSD_V4 y - NFS_FSCACHE y - CIFS_XATTR y - CIFS_POSIX y - CIFS_FSCACHE y - - # Security related features. - STRICT_DEVMEM y # Filter access to /dev/mem - SECURITY_SELINUX_BOOTPARAM_VALUE 0 # disable SELinux by default - - # Misc. options. - 8139TOO_8129 y - 8139TOO_PIO n # PIO is slower - AIC79XX_DEBUG_ENABLE n - AIC7XXX_DEBUG_ENABLE n - AIC94XX_DEBUG n - AUDIT_LOGINUID_IMMUTABLE y - B43_PCMCIA y - BLK_DEV_CMD640_ENHANCED y # CMD640 enhanced support - BLK_DEV_IDEACPI y # IDE ACPI support - BLK_DEV_INTEGRITY y - BSD_PROCESS_ACCT_V3 y - BT_HCIUART_BCSP y - BT_HCIUART_H4 y # UART (H4) protocol support - BT_HCIUART_LL y - BT_RFCOMM m - BT_RFCOMM_TTY y # RFCOMM TTY support - CRASH_DUMP n - DMAR? n # experimental - DVB_DYNAMIC_MINORS? y # we use udev - EFI_STUB y # EFI bootloader in the bzImage itself - FHANDLE y # used by systemd - FUSION y # Fusion MPT device support - IDE_GD_ATAPI y # ATAPI floppy support - IRDA_ULTRA y # Ultra (connectionless) protocol - JOYSTICK_IFORCE_232 y # I-Force Serial joysticks and wheels - JOYSTICK_IFORCE_USB y # I-Force USB joysticks and wheels - JOYSTICK_XPAD_FF y # X-Box gamepad rumble support - JOYSTICK_XPAD_LEDS y # LED Support for Xbox360 controller 'BigX' LED - LDM_PARTITION y # Windows Logical Disk Manager (Dynamic Disk) support - LEDS_TRIGGER_IDE_DISK y # LED IDE Disk Trigger - LOGIRUMBLEPAD2_FF y # Logitech Rumblepad 2 force feedback - LOGO n # not needed - MEDIA_ATTACH? y - MEGARAID_NEWGEN y - MICROCODE_AMD y - MODVERSIONS y - MOUSE_PS2_ELANTECH y # Elantech PS/2 protocol extension - MTRR_SANITIZER y - NET_FC y # Fibre Channel driver support - PPP_MULTILINK y # PPP multilink support - REGULATOR y # Voltage and Current Regulator Support - RC_DEVICES y # Enable IR devices - SCSI_LOGGING y # SCSI logging facility - SERIAL_8250 y # 8250/16550 and compatible serial support - SLIP_COMPRESSED y # CSLIP compressed headers - SLIP_SMART y - THERMAL_HWMON y # Hardware monitoring support - USB_DEBUG n - USB_EHCI_ROOT_HUB_TT y # Root Hub Transaction Translators - USB_EHCI_TT_NEWSCHED y # Improved transaction translator scheduling - X86_CHECK_BIOS_CORRUPTION y - X86_MCE y - XEN_DOM0 y - - # Linux Containers - RT_GROUP_SCHED? y - CGROUP_DEVICE? y - MEMCG? y - MEMCG_SWAP? y - DEVPTS_MULTIPLE_INSTANCES? y - - # Enable staging drivers. These are somewhat experimental, but - # they generally don't hurt. - STAGING y - - # PROC_EVENTS requires that the netlink connector is not built - # as a module. This is required by libcgroup's cgrulesengd. - CONNECTOR y - PROC_EVENTS y - - # Tracing - FTRACE y - FUNCTION_TRACER y - FTRACE_SYSCALLS y - SCHED_TRACER y - - # Devtmpfs support. - DEVTMPFS y - - # Media support - MEDIA_CAMERA_SUPPORT? y - MEDIA_RC_SUPPORT? y - MEDIA_USB_SUPPORT y - - # Easier debug of NFS issues - SUNRPC_DEBUG y - - ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""} - ${extraConfig} - ''; -in - -import ./generic.nix ( - - rec { - version = "3.7.10"; - testing = false; - - preConfigure = '' - substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' "" - ''; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "1l8b40z95ahc2v9babmhrbi8jn2bhwkapq0libq0z21iipqsya4v"; - }; - - config = configWithPlatform stdenv.platform; - configCross = configWithPlatform stdenv.cross.platform; - - features.iwlwifi = true; - features.efiBootStub = true; - features.needsCifsUtils = true; - features.canDisableNetfilterConntrackHelpers = true; - features.netfilterRPFilter = true; - } - - // removeAttrs args ["extraConfig"] -) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 48fe5e5be1a..38b1a230cc8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6371,19 +6371,6 @@ let ]; }; - linux_3_7 = makeOverridable (import ../os-specific/linux/kernel/linux-3.7.nix) { - inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; - kernelPatches = - [ - kernelPatches.sec_perm_2_6_24 - # kernelPatches.aufs3_7 - ] ++ lib.optionals (platform.kernelArch == "mips") - [ kernelPatches.mips_fpureg_emu - kernelPatches.mips_fpu_sigill - kernelPatches.mips_ext3_n32 - ]; - }; - linux_3_6_rpi = makeOverridable (import ../os-specific/linux/kernel/linux-rpi-3.6.nix) { inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; }; @@ -6548,7 +6535,6 @@ let linuxPackages_3_2_xen = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_2_xen linuxPackages_3_2_xen); linuxPackages_3_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_4 linuxPackages_3_4); linuxPackages_3_6_rpi = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_6_rpi linuxPackages_3_6_rpi); - linuxPackages_3_7 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_7 linuxPackages_3_7); linuxPackages_3_8 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_8 linuxPackages_3_8); linuxPackages_3_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_9 linuxPackages_3_9); linuxPackages_3_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_10 linuxPackages_3_10); From 01294254a03a271e9e52db09af4b568e4e8ad78a Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 16 Jul 2013 13:44:55 +0200 Subject: [PATCH 492/798] nix-generate-from-cpan: Handle META.json Fixes #761. --- maintainers/scripts/nix-generate-from-cpan.pl | 28 ++++++++++++------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/maintainers/scripts/nix-generate-from-cpan.pl b/maintainers/scripts/nix-generate-from-cpan.pl index 1eb6c51a16a..1d9f926ec55 100755 --- a/maintainers/scripts/nix-generate-from-cpan.pl +++ b/maintainers/scripts/nix-generate-from-cpan.pl @@ -51,15 +51,21 @@ print STDERR "unpacked to: $pkg_path\n"; my $meta; if (-e "$pkg_path/META.yml") { eval { - $meta = YAML::XS::LoadFile("$pkg_path/META.yml"); + $meta = YAML::XS::LoadFile("$pkg_path/META.yml"); }; if ($@) { - system("iconv -f windows-1252 -t utf-8 '$pkg_path/META.yml' > '$pkg_path/META.yml.tmp'"); - $meta = YAML::XS::LoadFile("$pkg_path/META.yml.tmp"); + system("iconv -f windows-1252 -t utf-8 '$pkg_path/META.yml' > '$pkg_path/META.yml.tmp'"); + $meta = YAML::XS::LoadFile("$pkg_path/META.yml.tmp"); } +} elsif (-e "$pkg_path/META.json") { + local $/; + open(my $fh, '<', "$pkg_path/META.json") or die; + $meta = decode_json(<$fh>); +} else { + warn "package has no META.yml or META.json\n"; } -print STDERR "metadata: ", encode_json($meta), "\n"; +print STDERR "metadata: ", encode_json($meta), "\n" if defined $meta; # Map a module to the attribute corresponding to its package # (e.g. HTML::HeadParser will be mapped to HTMLParser, because that @@ -120,11 +126,13 @@ my $homepage = $meta->{resources}->{homepage}; print STDERR "homepage: $homepage\n" if defined $homepage; my $description = $meta->{abstract}; -$description = uc(substr($description, 0, 1)) . substr($description, 1); # capitalise first letter -$description =~ s/\.$//; # remove period at the end -$description =~ s/\s*$//; -$description =~ s/^\s*//; -print STDERR "description: $description\n"; +if (defined $description) { + $description = uc(substr($description, 0, 1)) . substr($description, 1); # capitalise first letter + $description =~ s/\.$//; # remove period at the end + $description =~ s/\s*$//; + $description =~ s/^\s*//; + print STDERR "description: $description\n"; +} my $license = $meta->{license}; if (defined $license) { @@ -156,7 +164,7 @@ EOF print < Date: Tue, 16 Jul 2013 09:31:19 -0400 Subject: [PATCH 493/798] Revert "cmake: Update to 2.8.11.2" This breaks some packages (notably liblapack) due to a broken macro (CTEST_CUSTOM_POST_TEST). See NixOS/nixpkgs#762 This reverts commit ebc424c3abfa72464c5f6777f2d522bf6d0f3790. Signed-off-by: Shea Levy --- .../tools/build-managers/cmake/default.nix | 4 +- .../build-managers/cmake/search-path.patch | 103 +++++++++--------- 2 files changed, 54 insertions(+), 53 deletions(-) diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index fe8d92bafbf..d66149a9509 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -7,7 +7,7 @@ with stdenv.lib; let os = stdenv.lib.optionalString; majorVersion = "2.8"; - minorVersion = "11.2"; + minorVersion = "9"; version = "${majorVersion}.${minorVersion}"; in @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}files/v${majorVersion}/cmake-${version}.tar.gz"; - sha256 = "0qh5dhd7ff08n2h569j7g9m92gb3bz14wvhwjhwl7lgx794cnamk"; + sha256 = "1yg68ng732cfm5c0h91chqwhg06zdh45bybm353kd1myk5rwqgfw"; }; patches = diff --git a/pkgs/development/tools/build-managers/cmake/search-path.patch b/pkgs/development/tools/build-managers/cmake/search-path.patch index 06f9d8ddca6..ef8a9eef7c1 100644 --- a/pkgs/development/tools/build-managers/cmake/search-path.patch +++ b/pkgs/development/tools/build-managers/cmake/search-path.patch @@ -1,54 +1,53 @@ -diff -ru -x '*~' cmake-2.8.11.2-orig/Modules/Platform/Linux.cmake cmake-2.8.11.2/Modules/Platform/Linux.cmake ---- cmake-2.8.11.2-orig/Modules/Platform/Linux.cmake 2013-07-02 15:41:40.000000000 +0200 -+++ cmake-2.8.11.2/Modules/Platform/Linux.cmake 2013-07-15 11:43:30.557888066 +0200 -@@ -36,13 +36,8 @@ +diff -ru -x '*~' cmake-2.8.5-orig/Modules/Platform/Linux.cmake cmake-2.8.5/Modules/Platform/Linux.cmake +--- cmake-2.8.5-orig/Modules/Platform/Linux.cmake 2011-07-08 14:21:44.000000000 +0200 ++++ cmake-2.8.5/Modules/Platform/Linux.cmake 2011-07-21 19:45:00.000000000 +0200 +@@ -36,13 +36,13 @@ # checking the platform every time. This option is advanced enough # that only package maintainers should need to adjust it. They are # capable of providing a setting on the command line. -- if(EXISTS "/etc/debian_version") -- set(CMAKE_INSTALL_SO_NO_EXE 1 CACHE INTERNAL +- IF(EXISTS "/etc/debian_version") +- SET(CMAKE_INSTALL_SO_NO_EXE 1 CACHE INTERNAL - "Install .so files without execute permission.") -- else() -- set(CMAKE_INSTALL_SO_NO_EXE 0 CACHE INTERNAL -- "Install .so files without execute permission.") -- endif() -+ set(CMAKE_INSTALL_SO_NO_EXE 0 CACHE INTERNAL -+ "Install .so files without execute permission.") - endif() +- ELSE(EXISTS "/etc/debian_version") ++ #IF(EXISTS "/etc/debian_version") ++ # SET(CMAKE_INSTALL_SO_NO_EXE 1 CACHE INTERNAL ++ # "Install .so files without execute permission.") ++ #ELSE(EXISTS "/etc/debian_version") + SET(CMAKE_INSTALL_SO_NO_EXE 0 CACHE INTERNAL + "Install .so files without execute permission.") +- ENDIF(EXISTS "/etc/debian_version") ++ #ENDIF(EXISTS "/etc/debian_version") + ENDIF(DEFINED CMAKE_INSTALL_SO_NO_EXE) # Match multiarch library directory names. -@@ -50,8 +45,3 @@ +@@ -52,6 +52,6 @@ - include(Platform/UnixPaths) - --# Debian has lib64 paths only for compatibility so they should not be --# searched. --if(EXISTS "/etc/debian_version") -- set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE) --endif() -diff -ru -x '*~' cmake-2.8.11.2-orig/Modules/Platform/UnixPaths.cmake cmake-2.8.11.2/Modules/Platform/UnixPaths.cmake ---- cmake-2.8.11.2-orig/Modules/Platform/UnixPaths.cmake 2013-07-02 15:41:40.000000000 +0200 -+++ cmake-2.8.11.2/Modules/Platform/UnixPaths.cmake 2013-07-15 11:42:02.949204549 +0200 -@@ -31,58 +31,13 @@ - - # List common installation prefixes. These will be used for all + # Debian has lib64 paths only for compatibility so they should not be + # searched. +-IF(EXISTS "/etc/debian_version") +- SET_PROPERTY(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE) +-ENDIF(EXISTS "/etc/debian_version") ++#IF(EXISTS "/etc/debian_version") ++# SET_PROPERTY(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE) ++#ENDIF(EXISTS "/etc/debian_version") +diff -ru -x '*~' cmake-2.8.5-orig/Modules/Platform/UnixPaths.cmake cmake-2.8.5/Modules/Platform/UnixPaths.cmake +--- cmake-2.8.5-orig/Modules/Platform/UnixPaths.cmake 2011-07-08 14:21:44.000000000 +0200 ++++ cmake-2.8.5/Modules/Platform/UnixPaths.cmake 2011-07-21 19:50:52.000000000 +0200 +@@ -33,55 +33,18 @@ # search types. --list(APPEND CMAKE_SYSTEM_PREFIX_PATH -- # Standard + LIST(APPEND CMAKE_SYSTEM_PREFIX_PATH + # Standard - /usr/local /usr / -+list(APPEND CMAKE_SYSTEM_PREFIX_PATH "@glibc@") - +- - # CMake install location - "${_CMAKE_INSTALL_DIR}" -+list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "@glibc@/lib") - +- - # Project install destination. - "${CMAKE_INSTALL_PREFIX}" - ) -+list(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES "@glibc@/include") - +- -# List common include file locations not under the common prefixes. --list(APPEND CMAKE_SYSTEM_INCLUDE_PATH +-LIST(APPEND CMAKE_SYSTEM_INCLUDE_PATH - # Windows API on Cygwin - /usr/include/w32api - @@ -57,11 +56,11 @@ diff -ru -x '*~' cmake-2.8.11.2-orig/Modules/Platform/UnixPaths.cmake cmake-2.8. - - # Other - /usr/pkg/include -- /opt/csw/include /opt/include +- /opt/csw/include /opt/include - /usr/openwin/include - ) - --list(APPEND CMAKE_SYSTEM_LIBRARY_PATH +-LIST(APPEND CMAKE_SYSTEM_LIBRARY_PATH - # Windows API on Cygwin - /usr/lib/w32api - @@ -70,25 +69,27 @@ diff -ru -x '*~' cmake-2.8.11.2-orig/Modules/Platform/UnixPaths.cmake cmake-2.8. - - # Other - /usr/pkg/lib -- /opt/csw/lib /opt/lib +- /opt/csw/lib /opt/lib - /usr/openwin/lib - ) - --list(APPEND CMAKE_SYSTEM_PROGRAM_PATH +-LIST(APPEND CMAKE_SYSTEM_PROGRAM_PATH - /usr/pkg/bin -- ) -- --list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES ++ "@glibc@" + ) + + LIST(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES - /lib /usr/lib /usr/lib32 /usr/lib64 -- ) -- --list(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES ++ "@glibc@/lib" + ) + + LIST(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES - /usr/include -- ) --list(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES ++ "@glibc@/include" + ) + LIST(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES - /usr/include -- ) -+list(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES "@glibc@/include") ++ "@glibc@/include" + ) # Enable use of lib64 search path variants by default. - set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS TRUE) From f8d885344a2fa52be96785b8f0669d4b632eb34d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 16 Jul 2013 14:16:24 +0200 Subject: [PATCH 494/798] haskell-xmonad-contrib: update to version 0.11.2 --- pkgs/applications/window-managers/xmonad/xmonad-contrib.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix b/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix index 218e2126a15..5c00ddf0fd1 100644 --- a/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix +++ b/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "xmonad-contrib"; - version = "0.11.1"; - sha256 = "1356dn8ipw7fgn2xijppn69f64zg36gcxbw9qndxbbmml5gq0zrl"; + version = "0.11.2"; + sha256 = "0qlc732m6mhvx7g10r69hk5x460kjv2r04s91cnn5yfiia1qfpai"; buildDepends = [ extensibleExceptions mtl random utf8String X11 X11Xft xmonad ]; From 9518e1190a84bdc62ec7db9bf4e155139f254f85 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 16 Jul 2013 14:16:24 +0200 Subject: [PATCH 495/798] haskell-dual-tree: update to version 0.1.0.3 --- pkgs/development/libraries/haskell/dual-tree/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/dual-tree/default.nix b/pkgs/development/libraries/haskell/dual-tree/default.nix index 841fae96791..8500de5fcfb 100644 --- a/pkgs/development/libraries/haskell/dual-tree/default.nix +++ b/pkgs/development/libraries/haskell/dual-tree/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "dual-tree"; - version = "0.1.0.2"; - sha256 = "0ys50m8yjksxi33qyk6ql4ldpdzb0fvxqvywi3y46xi16w5yrkb0"; + version = "0.1.0.3"; + sha256 = "0k3p1lqhynlqvkbnrs5vn478c76qcn754n5pb17p5i4jcw94bm0n"; buildDepends = [ monoidExtras newtype semigroups ]; jailbreak = true; meta = { From 15555c457725a056ce6e48dfa1404aece9b3fd6c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 16 Jul 2013 14:16:24 +0200 Subject: [PATCH 496/798] haskell-happstack-hamlet: update to version 7.0.3 --- .../libraries/haskell/happstack/happstack-hamlet.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix b/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix index fad611798e9..c191c428780 100644 --- a/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix +++ b/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "happstack-hamlet"; - version = "7.0.2"; - sha256 = "0hsmvv5rggyl7sa4sp30zyr43k6zj7dlpd0mb916wzcqrnyxa34a"; + version = "7.0.3"; + sha256 = "0z4phykm2wxpdga47sdg76v7vmy32kav4nscizlkl648qjrx9k3r"; buildDepends = [ hamlet happstackServer text ]; meta = { homepage = "http://www.happstack.com/"; From 073667d20d67c2fda555947901ad051ec1832655 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 16 Jul 2013 14:16:24 +0200 Subject: [PATCH 497/798] haskell-happstack-server: update to version 7.3.0 --- .../libraries/haskell/happstack/happstack-server.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/happstack/happstack-server.nix b/pkgs/development/libraries/haskell/happstack/happstack-server.nix index b679ba453fd..f58e4ba2d3d 100644 --- a/pkgs/development/libraries/haskell/happstack/happstack-server.nix +++ b/pkgs/development/libraries/haskell/happstack/happstack-server.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "happstack-server"; - version = "7.1.7.1"; - sha256 = "1q897av0ynfh6jn4jhmmamkwda7zg36p4ncn9yic69calzvjpz72"; + version = "7.3.0"; + sha256 = "094q6m6a4cxwmmw9hin2pphiq8gi0y4ma4vkvqv7rwqnn3mf9n0q"; buildDepends = [ base64Bytestring blazeHtml extensibleExceptions filepath hslogger html monadControl mtl network parsec sendfile syb systemFilepath From e24f16aef617c603dae58e7d238b9fe2042430b0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 16 Jul 2013 14:16:24 +0200 Subject: [PATCH 498/798] haskell-random-source: update to version 0.3.0.6 --- pkgs/development/libraries/haskell/random-source/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/random-source/default.nix b/pkgs/development/libraries/haskell/random-source/default.nix index acc0285a59a..895a001d46f 100644 --- a/pkgs/development/libraries/haskell/random-source/default.nix +++ b/pkgs/development/libraries/haskell/random-source/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "random-source"; - version = "0.3.0.4"; - sha256 = "1gvx9r6vy36lx7fy537zdbnbhpmfxz88a7gh0aiyd2vi7bvnndxy"; + version = "0.3.0.6"; + sha256 = "0wsv41kpswqml04ym5bq2nan4i637f7h3fmvda2zy506xwxfrpzk"; buildDepends = [ flexibleDefaults mersenneRandomPure64 mtl mwcRandom random stateref syb thExtras From 752a1889d5f382b3cf918545550af401bdd620d9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 16 Jul 2013 14:16:24 +0200 Subject: [PATCH 499/798] haskell-snap: update to version 0.12.1 --- pkgs/development/libraries/haskell/snap/snap.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/snap/snap.nix b/pkgs/development/libraries/haskell/snap/snap.nix index 966a298fd3b..11ef315a523 100644 --- a/pkgs/development/libraries/haskell/snap/snap.nix +++ b/pkgs/development/libraries/haskell/snap/snap.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "snap"; - version = "0.12.0"; - sha256 = "0nccmbvhwrcfkz4771bhc210mh2ic0i93ks1752ndgk3007rkiff"; + version = "0.12.1"; + sha256 = "0mmmai257r3ssmy58v4c3hds0i0hwrww6r495j8yb2r90b31b1gg"; isLibrary = true; isExecutable = true; buildDepends = [ From 8663959559ad26b2a1feebf042821c3886ea3ede Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 16 Jul 2013 14:16:24 +0200 Subject: [PATCH 500/798] haskell-th-orphans: update to version 0.7.0.1 --- pkgs/development/libraries/haskell/th-orphans/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/th-orphans/default.nix b/pkgs/development/libraries/haskell/th-orphans/default.nix index d7b7c42b6c8..8fb51c77dbf 100644 --- a/pkgs/development/libraries/haskell/th-orphans/default.nix +++ b/pkgs/development/libraries/haskell/th-orphans/default.nix @@ -2,10 +2,9 @@ cabal.mkDerivation (self: { pname = "th-orphans"; - version = "0.7"; - sha256 = "0fb0wkpvb8wc12gpgm90jfsgcm4p1wf8p0m5xjk64zkcjrdxjr80"; + version = "0.7.0.1"; + sha256 = "19lfq2m7c6n2z8gz4n57wc92x5x5rkgv4chbfq7w4n531qya4bgr"; buildDepends = [ thLift ]; - noHaddock = true; meta = { description = "Orphan instances for TH datatypes"; license = self.stdenv.lib.licenses.bsd3; From 751c267649f05171b4bd29d849f6c0059bfa1cb8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 16 Jul 2013 14:16:24 +0200 Subject: [PATCH 501/798] haskell-unbound: update to version 0.4.2 --- pkgs/development/libraries/haskell/unbound/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/unbound/default.nix b/pkgs/development/libraries/haskell/unbound/default.nix index a90381202e1..df57bbbdac7 100644 --- a/pkgs/development/libraries/haskell/unbound/default.nix +++ b/pkgs/development/libraries/haskell/unbound/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "unbound"; - version = "0.4.1.1"; - sha256 = "0niv8mm4zjkndj0g32dgr32177dfp647hi32hqzwiis77vcfvdzb"; + version = "0.4.2"; + sha256 = "1bnnnv4rmzb0pw7i56nzr7k7pahr9rcmlfi4xkpsjhrxmizcfml9"; buildDepends = [ mtl RepLib transformers ]; meta = { homepage = "http://code.google.com/p/replib/"; From 1cbfea141cee6d83d390f6ebdcdda5ceb48e2928 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 16 Jul 2013 14:16:24 +0200 Subject: [PATCH 502/798] haskell-zeromq3-haskell: update to version 0.5 --- .../development/libraries/haskell/zeromq3-haskell/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/zeromq3-haskell/default.nix b/pkgs/development/libraries/haskell/zeromq3-haskell/default.nix index 3711c66b8ca..1240d4390a6 100644 --- a/pkgs/development/libraries/haskell/zeromq3-haskell/default.nix +++ b/pkgs/development/libraries/haskell/zeromq3-haskell/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "zeromq3-haskell"; - version = "0.4"; - sha256 = "0kwf4bzqp02vk78c9rphyamwbmvzff1z9hqp70dhfggm0q2d655s"; + version = "0.5"; + sha256 = "16qh3q5rshaxzl79aiivrysl3dhilnd2mw2p45ifgbgv87m277gq"; buildDepends = [ async MonadCatchIOTransformers semigroups transformers ]; From c428feb0c4ead2405718ae524c56a6c9b9bf11bc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 16 Jul 2013 15:28:58 +0200 Subject: [PATCH 503/798] haskell-gitit: jailbreak to support recent versions of happstack-server --- pkgs/development/libraries/haskell/gitit/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/gitit/default.nix b/pkgs/development/libraries/haskell/gitit/default.nix index 9213c534fa3..45c96e64012 100644 --- a/pkgs/development/libraries/haskell/gitit/default.nix +++ b/pkgs/development/libraries/haskell/gitit/default.nix @@ -18,6 +18,7 @@ cabal.mkDerivation (self: { safe SHA syb tagsoup text time url utf8String xhtml xml xssSanitize zlib ]; + jailbreak = true; meta = { homepage = "http://gitit.net"; description = "Wiki using happstack, git or darcs, and pandoc"; From 2c702a1d81259d4e7efef85ce2d800b9f1bc734e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Tue, 16 Jul 2013 19:40:45 +0200 Subject: [PATCH 504/798] avarice: set meta.platforms (make hydra build it) --- pkgs/development/tools/misc/avarice/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/misc/avarice/default.nix b/pkgs/development/tools/misc/avarice/default.nix index d15c0bc59a8..bc3785181a8 100644 --- a/pkgs/development/tools/misc/avarice/default.nix +++ b/pkgs/development/tools/misc/avarice/default.nix @@ -16,6 +16,7 @@ stdenv.mkDerivation rec { description = "AVaRICE translates between GDB's remote debug protocol and the AVR JTAG ICE protocol"; homepage = http://sourceforge.net/projects/avarice/files/avarice/; maintainers = [ stdenv.lib.maintainers.smironov ]; + platforms = stdenv.lib.platforms.linux; }; } From 8db7ff9b83de8fb93708e0ea2979c90a1eaae4a7 Mon Sep 17 00:00:00 2001 From: Baptist BENOIST Date: Mon, 24 Jun 2013 20:35:00 +0200 Subject: [PATCH 505/798] virtualbox: Comply with the Personal Use and Evaluation License The direct download was unfortunately not compliant with the VirtualBox Extension Pack's Personal Use and Evaluation License (PUEL) which stipulates that any end-user should fetch the binaries from the official Downloads page. See https://github.com/NixOS/nixpkgs/issues/672 and http://www.virtualbox.org/wiki/VirtualBox_PUEL for more info. --- .../virtualization/virtualbox/default.nix | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 6ca2c66a35a..264f1259fe5 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -30,10 +30,23 @@ let done ''; - extensionPack = fetchurl { - url = "http://download.virtualbox.org/virtualbox/${version}/Oracle_VM_VirtualBox_Extension_Pack-${version}.vbox-extpack"; + # See https://github.com/NixOS/nixpkgs/issues/672 for details + extpackRevision = "86644"; + extensionPack = requireFile rec { + name = "Oracle_VM_VirtualBox_Extension_Pack-${version}-${extpackRevision}.vbox-extpack"; # Has to be base16 because it's used as an input to VBoxExtPackHelperApp! sha256 = "5813cae72790de4893cadb839ffbd148290a44ec6913d901d84c9b3740ab1b1e"; + message = '' + In order to use the extension pack, you need to comply with the VirtualBox Personal Use + and Evaluation License (PUEL) by downloading the related binaries from: + + https://www.virtualbox.org/wiki/Downloads + + Once you have downloaded the file, please use the following command and re-run the + installation: + + nix-prefetch-url file://${name} + ''; }; in stdenv.mkDerivation { From 9a6d5bf9c655f3c90998f6926d7fb630913fc4d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 16 Jul 2013 22:26:28 +0200 Subject: [PATCH 506/798] Revert "libva: update (fix h264encode)" It breaks the latest vlc, and I don't need the new libva that much. http://hydra.nixos.org/build/5540612/nixlog/1/tail-reload This reverts commit 6a13cd01ac76465f7ce6397075ea8edeab434a74. --- pkgs/development/libraries/libva/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix index 6c13297b38c..5b35d2b24ad 100644 --- a/pkgs/development/libraries/libva/default.nix +++ b/pkgs/development/libraries/libva/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libX11, pkgconfig, libXext, mesa, libdrm, libXfixes }: stdenv.mkDerivation rec { - name = "libva-1.2.1"; + name = "libva-1.1.1"; src = fetchurl { url = "http://www.freedesktop.org/software/vaapi/releases/libva/${name}.tar.bz2"; - sha1 = "f716a4cadd670b14f44a2e833f96a2c509956339"; + sha256 = "0kfdcrzcr82g15l0vvmm6rqr0f0604d4dgrza78gn6bfx7rppby0"; }; buildInputs = [ libX11 libXext pkgconfig mesa libdrm libXfixes ]; From 8e8c3d665c59c25a5889e7007e66fbe7f40af628 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 16 Jul 2013 21:30:45 +0200 Subject: [PATCH 507/798] Remove KDE 4.7 It's obsolete. --- pkgs/desktops/kde-4.7/default.nix | 59 ---- .../files/kde-wallpapers-buildsystem.patch | 17 -- .../kde-4.7/files/polkit-install.patch | 12 - pkgs/desktops/kde-4.7/kde-baseapps/kate.nix | 10 - .../kde-4.7/kde-baseapps/kde-baseapps.nix | 10 - .../desktops/kde-4.7/kde-baseapps/konsole.nix | 11 - pkgs/desktops/kde-4.7/kde-package/4.7.4.nix | 273 ------------------ pkgs/desktops/kde-4.7/kde-package/default.nix | 127 -------- .../kde-4.7/kde-package/kde-manifest.sh | 145 ---------- .../kde-4.7/kde-package/kde-submodules.xslt | 22 -- pkgs/desktops/kde-4.7/kde-runtime.nix | 16 - pkgs/desktops/kde-4.7/kde-wallpapers.nix | 17 -- pkgs/desktops/kde-4.7/kde-workspace.nix | 36 --- .../kde-4.7/kdeaccessibility/jovie.nix | 9 - .../kde-4.7/kdeaccessibility/kaccessible.nix | 9 - .../kde-4.7/kdeaccessibility/kmag.nix | 9 - .../kde-4.7/kdeaccessibility/kmousetool.nix | 9 - .../kde-4.7/kdeaccessibility/kmouth.nix | 9 - pkgs/desktops/kde-4.7/kdeadmin/kcron.nix | 5 - pkgs/desktops/kde-4.7/kdeadmin/ksystemlog.nix | 5 - pkgs/desktops/kde-4.7/kdeadmin/kuser.nix | 5 - .../kdeadmin/system-config-printer-kde.nix | 33 --- .../kde-4.7/kdeartwork/ColorSchemes.nix | 11 - .../kde-4.7/kdeartwork/FindXscreensaver.cmake | 73 ----- .../kdeartwork/HighResolutionWallpapers.nix | 11 - .../kde-4.7/kdeartwork/IconThemes.nix | 13 - .../kde-4.7/kdeartwork/WeatherWallpapers.nix | 11 - pkgs/desktops/kde-4.7/kdeartwork/aurorae.nix | 7 - .../kde-4.7/kdeartwork/desktopthemes.nix | 11 - .../desktops/kde-4.7/kdeartwork/emoticons.nix | 11 - .../kde-4.7/kdeartwork/kscreensaver.nix | 15 - .../kde-4.7/kdeartwork/kwin-styles.nix | 9 - pkgs/desktops/kde-4.7/kdeartwork/sounds.nix | 11 - pkgs/desktops/kde-4.7/kdeartwork/styles.nix | 11 - .../kde-4.7/kdeartwork/wallpapers.nix | 11 - .../kde-4.7/kdebindings/pykde-purity.patch | 49 ---- .../kde-4.7/kdebindings/pykde4-new-sip.patch | 91 ------ pkgs/desktops/kde-4.7/kdebindings/pykde4.nix | 30 -- .../desktops/kde-4.7/kdebindings/smokegen.nix | 13 - pkgs/desktops/kde-4.7/kdebindings/smokeqt.nix | 12 - .../kde-4.7/kdeedu/FindLibfacile.cmake | 32 -- pkgs/desktops/kde-4.7/kdeedu/blinken.nix | 8 - pkgs/desktops/kde-4.7/kdeedu/cantor.nix | 8 - pkgs/desktops/kde-4.7/kdeedu/kalgebra.nix | 8 - .../kde-4.7/kdeedu/kalzium-feature-log.patch | 15 - pkgs/desktops/kde-4.7/kdeedu/kalzium.nix | 15 - pkgs/desktops/kde-4.7/kdeedu/kanagram.nix | 8 - pkgs/desktops/kde-4.7/kdeedu/kbruch.nix | 8 - pkgs/desktops/kde-4.7/kdeedu/kgeography.nix | 8 - pkgs/desktops/kde-4.7/kdeedu/khangman.nix | 8 - pkgs/desktops/kde-4.7/kdeedu/kig.nix | 12 - pkgs/desktops/kde-4.7/kdeedu/kiten.nix | 9 - pkgs/desktops/kde-4.7/kdeedu/klettres.nix | 9 - pkgs/desktops/kde-4.7/kdeedu/kmplot.nix | 12 - pkgs/desktops/kde-4.7/kdeedu/kstars.nix | 9 - pkgs/desktops/kde-4.7/kdeedu/ktouch.nix | 9 - pkgs/desktops/kde-4.7/kdeedu/kturtle.nix | 9 - pkgs/desktops/kde-4.7/kdeedu/kwordquiz.nix | 9 - pkgs/desktops/kde-4.7/kdeedu/libkdeedu.nix | 8 - pkgs/desktops/kde-4.7/kdeedu/marble.nix | 9 - pkgs/desktops/kde-4.7/kdeedu/parley.nix | 9 - pkgs/desktops/kde-4.7/kdeedu/rocs.nix | 14 - pkgs/desktops/kde-4.7/kdeedu/step.nix | 12 - pkgs/desktops/kde-4.7/kdegames.nix | 20 -- .../desktops/kde-4.7/kdegraphics/gwenview.nix | 15 - pkgs/desktops/kde-4.7/kdegraphics/kamera.nix | 10 - .../kde-4.7/kdegraphics/kcolorchooser.nix | 10 - .../kdegraphics-strigi-analyzer.nix | 10 - .../kdegraphics/kdegraphics-thumbnailers.nix | 10 - pkgs/desktops/kde-4.7/kdegraphics/kgamma.nix | 10 - .../kde-4.7/kdegraphics/kolourpaint.nix | 10 - pkgs/desktops/kde-4.7/kdegraphics/kruler.nix | 10 - .../kde-4.7/kdegraphics/ksaneplugin.nix | 10 - .../kde-4.7/kdegraphics/ksnapshot.nix | 10 - .../kde-4.7/kdegraphics/libkdcraw.nix | 10 - .../kde-4.7/kdegraphics/libkexiv2.nix | 10 - pkgs/desktops/kde-4.7/kdegraphics/libkipi.nix | 10 - .../desktops/kde-4.7/kdegraphics/libksane.nix | 10 - .../kde-4.7/kdegraphics/mobipocket.nix | 10 - pkgs/desktops/kde-4.7/kdegraphics/okular.nix | 12 - pkgs/desktops/kde-4.7/kdegraphics/svgpart.nix | 10 - pkgs/desktops/kde-4.7/kdelibs.nix | 38 --- pkgs/desktops/kde-4.7/kdemultimedia.nix | 17 -- .../kde-4.7/kdenetwork/FindmsiLBC.cmake | 19 -- .../kde-4.7/kdenetwork/filesharing.nix | 7 - .../kde-4.7/kdenetwork/kdenetwork.patch | 24 -- pkgs/desktops/kde-4.7/kdenetwork/kdnssd.nix | 7 - .../kde-4.7/kdenetwork/kfile-plugins.nix | 11 - pkgs/desktops/kde-4.7/kdenetwork/kget.nix | 13 - pkgs/desktops/kde-4.7/kdenetwork/kopete.nix | 21 -- pkgs/desktops/kde-4.7/kdenetwork/kppp.nix | 7 - pkgs/desktops/kde-4.7/kdenetwork/krdc.nix | 7 - pkgs/desktops/kde-4.7/kdenetwork/krfb.nix | 7 - pkgs/desktops/kde-4.7/kdepim-runtime.nix | 12 - pkgs/desktops/kde-4.7/kdepim.nix | 21 -- pkgs/desktops/kde-4.7/kdepimlibs.nix | 16 - pkgs/desktops/kde-4.7/kdeplasma-addons.nix | 20 -- pkgs/desktops/kde-4.7/kdesdk/cervisia.nix | 9 - .../kde-4.7/kdesdk/dolphin-plugins-git.nix | 10 - .../kde-4.7/kdesdk/dolphin-plugins-svn.nix | 10 - pkgs/desktops/kde-4.7/kdesdk/find-svn.patch | 59 ---- pkgs/desktops/kde-4.7/kdesdk/kapptemplate.nix | 9 - pkgs/desktops/kde-4.7/kdesdk/kcachegrind.nix | 9 - .../kde-4.7/kdesdk/kdeaccounts-plugin.nix | 9 - .../kde-4.7/kdesdk/kioslave-perldoc.nix | 11 - pkgs/desktops/kde-4.7/kdesdk/kioslave-svn.nix | 11 - pkgs/desktops/kde-4.7/kdesdk/kmtrace.nix | 11 - pkgs/desktops/kde-4.7/kdesdk/kompare.nix | 9 - pkgs/desktops/kde-4.7/kdesdk/kpartloader.nix | 9 - .../kde-4.7/kdesdk/kprofilemethod.nix | 9 - pkgs/desktops/kde-4.7/kdesdk/kstartperf.nix | 9 - pkgs/desktops/kde-4.7/kdesdk/kuiviewer.nix | 9 - pkgs/desktops/kde-4.7/kdesdk/lokalize.nix | 13 - pkgs/desktops/kde-4.7/kdesdk/okteta.nix | 11 - pkgs/desktops/kde-4.7/kdesdk/poxml.nix | 9 - pkgs/desktops/kde-4.7/kdesdk/scripts.nix | 9 - .../kde-4.7/kdesdk/strigi-analyzer.nix | 13 - pkgs/desktops/kde-4.7/kdesdk/umbrello.nix | 9 - pkgs/desktops/kde-4.7/kdetoys/amor.nix | 9 - pkgs/desktops/kde-4.7/kdetoys/kteatime.nix | 9 - pkgs/desktops/kde-4.7/kdetoys/ktux.nix | 9 - pkgs/desktops/kde-4.7/kdeutils/ark.nix | 9 - pkgs/desktops/kde-4.7/kdeutils/filelight.nix | 9 - pkgs/desktops/kde-4.7/kdeutils/kcalc.nix | 9 - .../desktops/kde-4.7/kdeutils/kcharselect.nix | 9 - pkgs/desktops/kde-4.7/kdeutils/kdf.nix | 9 - pkgs/desktops/kde-4.7/kdeutils/kfloppy.nix | 9 - pkgs/desktops/kde-4.7/kdeutils/kgpg.nix | 9 - .../kde-4.7/kdeutils/kremotecontrol.nix | 9 - pkgs/desktops/kde-4.7/kdeutils/ktimer.nix | 9 - pkgs/desktops/kde-4.7/kdeutils/kwallet.nix | 9 - .../kde-4.7/kdeutils/printer-applet.nix | 28 -- .../kde-4.7/kdeutils/superkaramba.nix | 11 - pkgs/desktops/kde-4.7/kdeutils/sweeper.nix | 9 - .../kde-4.7/kdewebdev/kfilereplace.nix | 10 - .../kde-4.7/kdewebdev/kimagemapeditor.nix | 10 - .../kde-4.7/kdewebdev/klinkstatus.nix | 12 - pkgs/desktops/kde-4.7/kdewebdev/kommander.nix | 9 - pkgs/desktops/kde-4.7/l10n/default.nix | 44 --- pkgs/desktops/kde-4.7/l10n/l10n-manifest.sh | 32 -- pkgs/desktops/kde-4.7/l10n/manifest-4.7.4.nix | 267 ----------------- pkgs/desktops/kde-4.7/oxygen-icons.nix | 15 - .../kde-4.7/support/akonadi/default.nix | 24 -- pkgs/top-level/all-packages.nix | 8 - 144 files changed, 2793 deletions(-) delete mode 100644 pkgs/desktops/kde-4.7/default.nix delete mode 100644 pkgs/desktops/kde-4.7/files/kde-wallpapers-buildsystem.patch delete mode 100644 pkgs/desktops/kde-4.7/files/polkit-install.patch delete mode 100644 pkgs/desktops/kde-4.7/kde-baseapps/kate.nix delete mode 100644 pkgs/desktops/kde-4.7/kde-baseapps/kde-baseapps.nix delete mode 100644 pkgs/desktops/kde-4.7/kde-baseapps/konsole.nix delete mode 100644 pkgs/desktops/kde-4.7/kde-package/4.7.4.nix delete mode 100644 pkgs/desktops/kde-4.7/kde-package/default.nix delete mode 100755 pkgs/desktops/kde-4.7/kde-package/kde-manifest.sh delete mode 100644 pkgs/desktops/kde-4.7/kde-package/kde-submodules.xslt delete mode 100644 pkgs/desktops/kde-4.7/kde-runtime.nix delete mode 100644 pkgs/desktops/kde-4.7/kde-wallpapers.nix delete mode 100644 pkgs/desktops/kde-4.7/kde-workspace.nix delete mode 100644 pkgs/desktops/kde-4.7/kdeaccessibility/jovie.nix delete mode 100644 pkgs/desktops/kde-4.7/kdeaccessibility/kaccessible.nix delete mode 100644 pkgs/desktops/kde-4.7/kdeaccessibility/kmag.nix delete mode 100644 pkgs/desktops/kde-4.7/kdeaccessibility/kmousetool.nix delete mode 100644 pkgs/desktops/kde-4.7/kdeaccessibility/kmouth.nix delete mode 100644 pkgs/desktops/kde-4.7/kdeadmin/kcron.nix delete mode 100644 pkgs/desktops/kde-4.7/kdeadmin/ksystemlog.nix delete mode 100644 pkgs/desktops/kde-4.7/kdeadmin/kuser.nix delete mode 100644 pkgs/desktops/kde-4.7/kdeadmin/system-config-printer-kde.nix delete mode 100644 pkgs/desktops/kde-4.7/kdeartwork/ColorSchemes.nix delete mode 100644 pkgs/desktops/kde-4.7/kdeartwork/FindXscreensaver.cmake delete mode 100644 pkgs/desktops/kde-4.7/kdeartwork/HighResolutionWallpapers.nix delete mode 100644 pkgs/desktops/kde-4.7/kdeartwork/IconThemes.nix delete mode 100644 pkgs/desktops/kde-4.7/kdeartwork/WeatherWallpapers.nix delete mode 100644 pkgs/desktops/kde-4.7/kdeartwork/aurorae.nix delete mode 100644 pkgs/desktops/kde-4.7/kdeartwork/desktopthemes.nix delete mode 100644 pkgs/desktops/kde-4.7/kdeartwork/emoticons.nix delete mode 100644 pkgs/desktops/kde-4.7/kdeartwork/kscreensaver.nix delete mode 100644 pkgs/desktops/kde-4.7/kdeartwork/kwin-styles.nix delete mode 100644 pkgs/desktops/kde-4.7/kdeartwork/sounds.nix delete mode 100644 pkgs/desktops/kde-4.7/kdeartwork/styles.nix delete mode 100644 pkgs/desktops/kde-4.7/kdeartwork/wallpapers.nix delete mode 100644 pkgs/desktops/kde-4.7/kdebindings/pykde-purity.patch delete mode 100644 pkgs/desktops/kde-4.7/kdebindings/pykde4-new-sip.patch delete mode 100644 pkgs/desktops/kde-4.7/kdebindings/pykde4.nix delete mode 100644 pkgs/desktops/kde-4.7/kdebindings/smokegen.nix delete mode 100644 pkgs/desktops/kde-4.7/kdebindings/smokeqt.nix delete mode 100644 pkgs/desktops/kde-4.7/kdeedu/FindLibfacile.cmake delete mode 100644 pkgs/desktops/kde-4.7/kdeedu/blinken.nix delete mode 100644 pkgs/desktops/kde-4.7/kdeedu/cantor.nix delete mode 100644 pkgs/desktops/kde-4.7/kdeedu/kalgebra.nix delete mode 100644 pkgs/desktops/kde-4.7/kdeedu/kalzium-feature-log.patch delete mode 100644 pkgs/desktops/kde-4.7/kdeedu/kalzium.nix delete mode 100644 pkgs/desktops/kde-4.7/kdeedu/kanagram.nix delete mode 100644 pkgs/desktops/kde-4.7/kdeedu/kbruch.nix delete mode 100644 pkgs/desktops/kde-4.7/kdeedu/kgeography.nix delete mode 100644 pkgs/desktops/kde-4.7/kdeedu/khangman.nix delete mode 100644 pkgs/desktops/kde-4.7/kdeedu/kig.nix delete mode 100644 pkgs/desktops/kde-4.7/kdeedu/kiten.nix delete mode 100644 pkgs/desktops/kde-4.7/kdeedu/klettres.nix delete mode 100644 pkgs/desktops/kde-4.7/kdeedu/kmplot.nix delete mode 100644 pkgs/desktops/kde-4.7/kdeedu/kstars.nix delete mode 100644 pkgs/desktops/kde-4.7/kdeedu/ktouch.nix delete mode 100644 pkgs/desktops/kde-4.7/kdeedu/kturtle.nix delete mode 100644 pkgs/desktops/kde-4.7/kdeedu/kwordquiz.nix delete mode 100644 pkgs/desktops/kde-4.7/kdeedu/libkdeedu.nix delete mode 100644 pkgs/desktops/kde-4.7/kdeedu/marble.nix delete mode 100644 pkgs/desktops/kde-4.7/kdeedu/parley.nix delete mode 100644 pkgs/desktops/kde-4.7/kdeedu/rocs.nix delete mode 100644 pkgs/desktops/kde-4.7/kdeedu/step.nix delete mode 100644 pkgs/desktops/kde-4.7/kdegames.nix delete mode 100644 pkgs/desktops/kde-4.7/kdegraphics/gwenview.nix delete mode 100644 pkgs/desktops/kde-4.7/kdegraphics/kamera.nix delete mode 100644 pkgs/desktops/kde-4.7/kdegraphics/kcolorchooser.nix delete mode 100644 pkgs/desktops/kde-4.7/kdegraphics/kdegraphics-strigi-analyzer.nix delete mode 100644 pkgs/desktops/kde-4.7/kdegraphics/kdegraphics-thumbnailers.nix delete mode 100644 pkgs/desktops/kde-4.7/kdegraphics/kgamma.nix delete mode 100644 pkgs/desktops/kde-4.7/kdegraphics/kolourpaint.nix delete mode 100644 pkgs/desktops/kde-4.7/kdegraphics/kruler.nix delete mode 100644 pkgs/desktops/kde-4.7/kdegraphics/ksaneplugin.nix delete mode 100644 pkgs/desktops/kde-4.7/kdegraphics/ksnapshot.nix delete mode 100644 pkgs/desktops/kde-4.7/kdegraphics/libkdcraw.nix delete mode 100644 pkgs/desktops/kde-4.7/kdegraphics/libkexiv2.nix delete mode 100644 pkgs/desktops/kde-4.7/kdegraphics/libkipi.nix delete mode 100644 pkgs/desktops/kde-4.7/kdegraphics/libksane.nix delete mode 100644 pkgs/desktops/kde-4.7/kdegraphics/mobipocket.nix delete mode 100644 pkgs/desktops/kde-4.7/kdegraphics/okular.nix delete mode 100644 pkgs/desktops/kde-4.7/kdegraphics/svgpart.nix delete mode 100644 pkgs/desktops/kde-4.7/kdelibs.nix delete mode 100644 pkgs/desktops/kde-4.7/kdemultimedia.nix delete mode 100644 pkgs/desktops/kde-4.7/kdenetwork/FindmsiLBC.cmake delete mode 100644 pkgs/desktops/kde-4.7/kdenetwork/filesharing.nix delete mode 100644 pkgs/desktops/kde-4.7/kdenetwork/kdenetwork.patch delete mode 100644 pkgs/desktops/kde-4.7/kdenetwork/kdnssd.nix delete mode 100644 pkgs/desktops/kde-4.7/kdenetwork/kfile-plugins.nix delete mode 100644 pkgs/desktops/kde-4.7/kdenetwork/kget.nix delete mode 100644 pkgs/desktops/kde-4.7/kdenetwork/kopete.nix delete mode 100644 pkgs/desktops/kde-4.7/kdenetwork/kppp.nix delete mode 100644 pkgs/desktops/kde-4.7/kdenetwork/krdc.nix delete mode 100644 pkgs/desktops/kde-4.7/kdenetwork/krfb.nix delete mode 100644 pkgs/desktops/kde-4.7/kdepim-runtime.nix delete mode 100644 pkgs/desktops/kde-4.7/kdepim.nix delete mode 100644 pkgs/desktops/kde-4.7/kdepimlibs.nix delete mode 100644 pkgs/desktops/kde-4.7/kdeplasma-addons.nix delete mode 100644 pkgs/desktops/kde-4.7/kdesdk/cervisia.nix delete mode 100644 pkgs/desktops/kde-4.7/kdesdk/dolphin-plugins-git.nix delete mode 100644 pkgs/desktops/kde-4.7/kdesdk/dolphin-plugins-svn.nix delete mode 100644 pkgs/desktops/kde-4.7/kdesdk/find-svn.patch delete mode 100644 pkgs/desktops/kde-4.7/kdesdk/kapptemplate.nix delete mode 100644 pkgs/desktops/kde-4.7/kdesdk/kcachegrind.nix delete mode 100644 pkgs/desktops/kde-4.7/kdesdk/kdeaccounts-plugin.nix delete mode 100644 pkgs/desktops/kde-4.7/kdesdk/kioslave-perldoc.nix delete mode 100644 pkgs/desktops/kde-4.7/kdesdk/kioslave-svn.nix delete mode 100644 pkgs/desktops/kde-4.7/kdesdk/kmtrace.nix delete mode 100644 pkgs/desktops/kde-4.7/kdesdk/kompare.nix delete mode 100644 pkgs/desktops/kde-4.7/kdesdk/kpartloader.nix delete mode 100644 pkgs/desktops/kde-4.7/kdesdk/kprofilemethod.nix delete mode 100644 pkgs/desktops/kde-4.7/kdesdk/kstartperf.nix delete mode 100644 pkgs/desktops/kde-4.7/kdesdk/kuiviewer.nix delete mode 100644 pkgs/desktops/kde-4.7/kdesdk/lokalize.nix delete mode 100644 pkgs/desktops/kde-4.7/kdesdk/okteta.nix delete mode 100644 pkgs/desktops/kde-4.7/kdesdk/poxml.nix delete mode 100644 pkgs/desktops/kde-4.7/kdesdk/scripts.nix delete mode 100644 pkgs/desktops/kde-4.7/kdesdk/strigi-analyzer.nix delete mode 100644 pkgs/desktops/kde-4.7/kdesdk/umbrello.nix delete mode 100644 pkgs/desktops/kde-4.7/kdetoys/amor.nix delete mode 100644 pkgs/desktops/kde-4.7/kdetoys/kteatime.nix delete mode 100644 pkgs/desktops/kde-4.7/kdetoys/ktux.nix delete mode 100644 pkgs/desktops/kde-4.7/kdeutils/ark.nix delete mode 100644 pkgs/desktops/kde-4.7/kdeutils/filelight.nix delete mode 100644 pkgs/desktops/kde-4.7/kdeutils/kcalc.nix delete mode 100644 pkgs/desktops/kde-4.7/kdeutils/kcharselect.nix delete mode 100644 pkgs/desktops/kde-4.7/kdeutils/kdf.nix delete mode 100644 pkgs/desktops/kde-4.7/kdeutils/kfloppy.nix delete mode 100644 pkgs/desktops/kde-4.7/kdeutils/kgpg.nix delete mode 100644 pkgs/desktops/kde-4.7/kdeutils/kremotecontrol.nix delete mode 100644 pkgs/desktops/kde-4.7/kdeutils/ktimer.nix delete mode 100644 pkgs/desktops/kde-4.7/kdeutils/kwallet.nix delete mode 100644 pkgs/desktops/kde-4.7/kdeutils/printer-applet.nix delete mode 100644 pkgs/desktops/kde-4.7/kdeutils/superkaramba.nix delete mode 100644 pkgs/desktops/kde-4.7/kdeutils/sweeper.nix delete mode 100644 pkgs/desktops/kde-4.7/kdewebdev/kfilereplace.nix delete mode 100644 pkgs/desktops/kde-4.7/kdewebdev/kimagemapeditor.nix delete mode 100644 pkgs/desktops/kde-4.7/kdewebdev/klinkstatus.nix delete mode 100644 pkgs/desktops/kde-4.7/kdewebdev/kommander.nix delete mode 100644 pkgs/desktops/kde-4.7/l10n/default.nix delete mode 100755 pkgs/desktops/kde-4.7/l10n/l10n-manifest.sh delete mode 100644 pkgs/desktops/kde-4.7/l10n/manifest-4.7.4.nix delete mode 100644 pkgs/desktops/kde-4.7/oxygen-icons.nix delete mode 100644 pkgs/desktops/kde-4.7/support/akonadi/default.nix diff --git a/pkgs/desktops/kde-4.7/default.nix b/pkgs/desktops/kde-4.7/default.nix deleted file mode 100644 index 428e1370635..00000000000 --- a/pkgs/desktops/kde-4.7/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ callPackage, callPackageOrig, stdenv, qt48 }: - -let - release = "4.7.4"; - - # Need callPackageOrig to avoid infinite cycle - kde = callPackageOrig ./kde-package { - inherit release ignoreList extraSubpkgs callPackage; - }; - - # The list of igored individual modules - ignoreList = { - # kdeadmin/strigi-analyzer has no real code - kdeadmin = [ "strigi-analyzer" ]; - # kdesdk/kioslave is splitted into kioslave-svn and kioslave-git - kdesdk = [ "kioslave" ]; - # Most of kdebindings do not compile due to a bug in the buildsystem - kdebindings = [ "kimono" "korundum" "kross-interpreters" "perlkde" "perlqt" - "qtruby" "qyoto" "smokekde" ]; - }; - - # Extra subpackages in the manifest format - extraSubpkgs = { - kdesdk = - [ - { - name = "kioslave-svn"; - sane = "kioslave_svn"; - subdir = "kioslave"; - } - { - name = "kioslave-perldoc"; - sane = "kioslave_perldoc"; - subdir = "kioslave"; - } - ]; - }; - -in - -kde.modules // kde.individual // -{ - inherit (kde) manifest modules individual splittedModuleList; - - akonadi = callPackage ./support/akonadi { }; - - qt4 = qt48; - - kdebase_workspace = kde.modules.kde_workspace; - - inherit release; - - full = stdenv.lib.attrValues kde.modules; - - l10n = callPackage ./l10n { - inherit release; - inherit (kde.manifest) stable; - }; -} diff --git a/pkgs/desktops/kde-4.7/files/kde-wallpapers-buildsystem.patch b/pkgs/desktops/kde-4.7/files/kde-wallpapers-buildsystem.patch deleted file mode 100644 index 378cdb64694..00000000000 --- a/pkgs/desktops/kde-4.7/files/kde-wallpapers-buildsystem.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3d3e247..f78db67 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,5 +1,10 @@ --find_package(KDE4 REQUIRED) --include(KDE4Defaults) -+project(kde-wallpapers NONE) -+if( WALLPAPER_INSTALL_DIR ) -+ message(STATUS "Installing wallpapers to user-supplied directory ${WALLPAPER_INSTALL_DIR}") -+else() -+ find_package(KDE4 REQUIRED) -+ include(KDE4Defaults) -+endif() - - install(DIRECTORY Air DESTINATION ${WALLPAPER_INSTALL_DIR} PATTERN .svn EXCLUDE) - diff --git a/pkgs/desktops/kde-4.7/files/polkit-install.patch b/pkgs/desktops/kde-4.7/files/polkit-install.patch deleted file mode 100644 index d2ecac663ec..00000000000 --- a/pkgs/desktops/kde-4.7/files/polkit-install.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru -x '*~' kdelibs-4.6.90-orig/kdecore/auth/ConfigureChecks.cmake kdelibs-4.6.90/kdecore/auth/ConfigureChecks.cmake ---- kdelibs-4.6.90-orig/kdecore/auth/ConfigureChecks.cmake 2011-05-20 22:24:54.000000000 +0200 -+++ kdelibs-4.6.90/kdecore/auth/ConfigureChecks.cmake 2011-07-12 14:03:00.000000000 +0200 -@@ -139,7 +139,7 @@ - ${CMAKE_INSTALL_PREFIX} _KDE4_AUTH_POLICY_FILES_INSTALL_DIR - ${POLKITQT-1_POLICY_FILES_INSTALL_DIR}) - -- set(KDE4_AUTH_POLICY_FILES_INSTALL_DIR ${_KDE4_AUTH_POLICY_FILES_INSTALL_DIR} CACHE STRING -+ set(KDE4_AUTH_POLICY_FILES_INSTALL_DIR "\${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions" CACHE STRING - "Where policy files generated by KAuth will be installed" FORCE) - elseif(KDE4_AUTH_BACKEND_NAME STREQUAL "FAKE") - set (KAUTH_COMPILING_FAKE_BACKEND TRUE) diff --git a/pkgs/desktops/kde-4.7/kde-baseapps/kate.nix b/pkgs/desktops/kde-4.7/kde-baseapps/kate.nix deleted file mode 100644 index 1ffbcf9ebf9..00000000000 --- a/pkgs/desktops/kde-4.7/kde-baseapps/kate.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "Kate, the KDE Advanced Text Editor, as well as KWrite"; - license = "GPLv2"; - }; -} diff --git a/pkgs/desktops/kde-4.7/kde-baseapps/kde-baseapps.nix b/pkgs/desktops/kde-4.7/kde-baseapps/kde-baseapps.nix deleted file mode 100644 index 45192e0c460..00000000000 --- a/pkgs/desktops/kde-4.7/kde-baseapps/kde-baseapps.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ kde, kdelibs, shared_desktop_ontologies, glib, htmlTidy }: - -kde { - buildInputs = [ kdelibs shared_desktop_ontologies glib htmlTidy ]; - - meta = { - description = "Base KDE applications, including the Dolphin file manager and Konqueror web browser"; - license = "GPLv2"; - }; -} diff --git a/pkgs/desktops/kde-4.7/kde-baseapps/konsole.nix b/pkgs/desktops/kde-4.7/kde-baseapps/konsole.nix deleted file mode 100644 index 87ac24972bd..00000000000 --- a/pkgs/desktops/kde-4.7/kde-baseapps/konsole.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ kde, kdelibs }: - -kde { - - buildInputs = [ kdelibs ]; - - meta = { - description = "Konsole, the KDE terminal emulator"; - license = "GPLv2"; - }; -} diff --git a/pkgs/desktops/kde-4.7/kde-package/4.7.4.nix b/pkgs/desktops/kde-4.7/kde-package/4.7.4.nix deleted file mode 100644 index 9a816b72cc6..00000000000 --- a/pkgs/desktops/kde-4.7/kde-package/4.7.4.nix +++ /dev/null @@ -1,273 +0,0 @@ -{stable=true; -hashes=builtins.listToAttrs[ - {name="blinken";value="16daqg0bbkci305qrcrvpv66cvshjfni5rf5gakblcn8qqlmwsi6";} - {name="cantor";value="0wgm0j9bl632bk94fi0hzp5s392xpyz0d524ahhi8q33bqkl06ra";} - {name="gwenview";value="1dhpb7q0myr9rl4bjsajq0kslvhxcddv1ddplqad63j619wk8gfj";} - {name="kalgebra";value="04g07syrk14kpr15f9kgfkkmkjgdvcwmrykmy56jwm8sfb6ncli9";} - {name="kalzium";value="0k25cinwp6yjp8q9irmwcb1ahf98ck3mw706jfpybpa7ds8ym5z1";} - {name="kamera";value="0airyhxzpnvpzag4w0q1h0pc1lwwplglki5max1mj5miaxg93r34";} - {name="kanagram";value="0271aq39dbs92rhc83m19pmm7rx5c573k27931sf3j3pw3x2q0nm";} - {name="kate";value="0pfddi7g99apqipnqv62i86ld11vl4igqv65xprqqf0a5a1413my";} - {name="kbruch";value="1dhhk55d3bs474l2w0xma89pq74gklq5faskrvd1lvvl853z3zib";} - {name="kcolorchooser";value="1gb861f1fy0fvmkg30l1gza998gyhjwj4gcyyv266wp5v7d01xda";} - {name="kdeaccessibility";value="12mvs1hy5ygnbbz14hg2fvs7mpvlamkfbz7g7kcvzp0fkjb524h3";} - {name="kdeadmin";value="16y73zpdgh72cf8yz8zn246i4d8nh4k6mbz9cbc4ggjblgjcn3pr";} - {name="kdeartwork";value="0vfz9mzpm8yy6fysmhcavd8l1fjcld36p0x9qymi4l072b7dkgyv";} - {name="kde-baseapps";value="075m3nn407di2mx8w5lv7va3ij0yd7yb575wmf05vfqr01xyhn8a";} - {name="kdegames";value="0c42wyk2mq3hz99zg4f9i2dbc9vyaa5l2301j0859pwvnp9zgafz";} - {name="kdegraphics-strigi-analyzer";value="1j7chf76mlwrq7z1dgm525f5srx1h30czm8dnw2f0yxfn18lvnl9";} - {name="kdegraphics-thumbnailers";value="1ny51jc8fm4gldrlmrfmslpfpn5pahlyws3jzaj6nkd3hdw3krnr";} - {name="kdelibs";value="0fdgl8qvpyb9pmb26b3yjfm9ib75mxayw75qm5kyzncmrvn427gy";} - {name="kdemultimedia";value="0a0vp1pq159lzgd0x817p9mf6al99w1dwnlyhs9zfpspgz8nw8y1";} - {name="kdenetwork";value="0zwqbyl5vw5nnzlilc4khlisjj1xjpziw9ahgvw8cbszscmv68b5";} - {name="kdepim";value="0s38qxks58dmwyi3fnvprpq5q9kr17v31n808j33d50rw62y398p";} - {name="kdepimlibs";value="0rpfkc0pxvfkaz8pb3yx21dm3ixw8gfrcdny1aqzbn3f7f8abhip";} - {name="kdepim-runtime";value="14p5bxrhqjnmz303hxlrdj4vxlmiv8j04qni33ljbgib0hnllva3";} - {name="kdeplasma-addons";value="068m2jpyprrscyk3f4nk9qix5smka5pq59sdwdan9996sh256py5";} - {name="kde-runtime";value="06nxv46s7ff5n3kmzq3mdc16b0ck0411lj0gf3scdyd85iqx06wd";} - {name="kdesdk";value="0v3gwml9rvqz96q8jk8myqvl6gjw3q37js2jn24yawli3sjjw552";} - {name="kdetoys";value="17fk1bmabgj9nz0m4j248f48m2xfscql43wmzkqnr7y6zghqfhfh";} - {name="kdeutils";value="0s1whgg59xnc6ny609s3vjzvpxak02f2y6v7zw72i808k03aal5v";} - {name="kde-wallpapers";value="133amrhhca4xi0gbmajcc6rw1c1ai5x29265fqp45588kyycbgvz";} - {name="kdewebdev";value="1nqp2j09nr3jhmfvjydwp86jz4nn5pxwcfi6ww9krfd1hyg4aqjc";} - {name="kde-workspace";value="1dj39nndpws9grinz287ypn5lj3zjh96gl4zhl7kp6z8f9mdqp0p";} - {name="kgamma";value="05vk5b40w0i75nx5lqn9qax10m604jkjxyxynm0i0b8gyksv78h9";} - {name="kgeography";value="1a49zqz8zb9kn7m4m5fsm5ibvn9m5pzq89isrd1yy9q7zlv3qfqc";} - {name="khangman";value="1bmzrc5jzbw9q9gxw9pzad37zj4h89rh3k4smycif6ky2jy72x6d";} - {name="kig";value="1s0mwnj2riam811l0nfk08ja43f0nibqaqchy2ff7627w22yr5m0";} - {name="kimono";value="1cbbchdj4x5sn6ldkmzrx5alhvgzgbprvyjpg1rcsfnyc6whp2p9";} - {name="kiten";value="13bcw1r39h0g75vwbyrsh8sb27vmqsbrmx2ay621ily4iy3jn5az";} - {name="klettres";value="1wczh41wq3w5ccy2yi4pqr3zk4v0wiy4slcn54a8bfi1b5s1267j";} - {name="kmplot";value="0dx5gnya008q7smf74fvygwfsa0hc2ajiznvdmf4qmm3s5bxpbrr";} - {name="kolourpaint";value="14zrh321av5f5i8a4bjj7xb1sqfcphzhc5qyg2w54cywaiswy8nx";} - {name="konsole";value="1wq2k8g6in86x72jzhz4ar8ba5lyjp0pia969wxa6b1vsj148ipy";} - {name="korundum";value="024daf05c9l83whcy0cfgxb3s24ci038kg1pnxlzz4z9sk39432r";} - {name="kross-interpreters";value="1kkg4w3id2g7nr89kjdgyy9hik75dnxlm6jmn3g8ilqdvw5ip1qx";} - {name="kruler";value="0wd805w2k1ask9l44z50jcd033zkbaxs3xd3w21qrwdvs52x8m41";} - {name="ksaneplugin";value="1rxpl6f5b0ld5ap6aag892rjd7r74szbzd6lqw8q8gzm6jmk34gq";} - {name="ksnapshot";value="0dn99b6qr4b4hc3c88m26axmb3jim836ig3mfgqpban9r7k15xci";} - {name="kstars";value="0zrw4rlfm5cwfbj884zn50sdp90zjg7inl9k2zj450dpvh7i6q3q";} - {name="ktouch";value="0vbzr69jbci058bcphf9i3fh40hwgrmcyj1n4gj90gwr4x2ha5hp";} - {name="kturtle";value="0mhg2b1jbywafnj93274yimvnaxivycqj98pvld3hppaq32f7vzp";} - {name="kwordquiz";value="0kfa83a91w8z39r55456i1vn85pb4dqrbav40sx5fhjb03iyrsdk";} - {name="libkdcraw";value="14y8ni9w441zx1k2fhcbnzpa1vcmpvk58mjdqrqvn8n630cy0hzn";} - {name="libkdeedu";value="1ga88g5s8mq1m8xwmhl09ylrnl8sw639cpah6wi8wwnqslj2zj0a";} - {name="libkexiv2";value="0w8mpjsiw2sr8ya7ffnvnprbsbi8ngpxrcxylgw617zcxpxky6ha";} - {name="libkipi";value="01fivyyg5jhnkn9r7bh96ygxvnh7a99h11wh228wk8nzx3i63lsc";} - {name="libksane";value="0bb26ajfmknxf4hdy513zx1q9j0hzrs0dr98vxmrwfxxbza67fbm";} - {name="marble";value="02yljp6lmqs753zkqpaz58zlrjjxydx9pizppzwjvjx8xk63b9z6";} - {name="mobipocket";value="0m08j4cdj2sr1xw3hi0zy651c2ap0q8y9s913r6ccm0f292n0856";} - {name="okular";value="03x1fgdnz0s17wj3pkdp77rqrbbb6ssgq0ly493pbi1x4lx768ib";} - {name="oxygen-icons";value="0ayx0y2swdcgz4wd1idkhm3gbixkn4mw89f1hrhrdvc6j7wdn2dj";} - {name="parley";value="0wgps4adiwaq3l471ig9j56vm7p2xf37779nlhfzavby622lyv8q";} - {name="perlkde";value="1psa8ca2ynmavhmbh5p8bgxiljiqj6figi3cmvkaa7ksnmg2p9a3";} - {name="perlqt";value="1v12vx46kmg9cgld7krphcqp97y0py1bc3s2gd6jbz5j48g1wznb";} - {name="pykde4";value="07c7rzi0rzafrh92m57ldz3v66v8996zqpgcqn351jfycwccg7pz";} - {name="qtruby";value="05j08dfqbqnj92k9n70x8yiiaxyk6p9sk3lwm8w8nhsxdciq8yny";} - {name="qyoto";value="1maq0c6qb618jiqrdfp4imq3x7x5rdgf80wbrsf8wmaz3iwg18jz";} - {name="rocs";value="0qqzfxas64jz95v8i0birbcp0azk01jx5ic6pny7szngwrms6k34";} - {name="smokegen";value="0rdaxss113l80gmzp71ngp1l07nn2ip5nhk0a3mmjkvd08i507i8";} - {name="smokekde";value="0cxd5y1i672wc295m2czvp5jry1lmvv88dkipd97368gxsqzd3q8";} - {name="smokeqt";value="0ll1q87y1sdmna4iac61cm6sn7imsfvcfq573cj7f5raqn08gbpf";} - {name="step";value="000a0hc45znshwrjsydrf05f5rwn7lmaiqbk65py827fgk67qkyb";} - {name="svgpart";value="056h2ynbl6ylfpf5a2l0qjasnicwx2yzizgd21pprzl9n7708zcw";} -]; -modules=[ -{ - module="kdegraphics"; - split=true; - pkgs=[ - { name="gwenview"; } - { name="kamera"; } - { name="kcolorchooser"; } - { name="kdegraphics-strigi-analyzer"; sane="kdegraphics_strigi_analyzer"; } - { name="kdegraphics-thumbnailers"; sane="kdegraphics_thumbnailers"; } - { name="kgamma"; } - { name="kolourpaint"; } - { name="kruler"; } - { name="ksaneplugin"; } - { name="ksnapshot"; } - { name="libkdcraw"; } - { name="libkexiv2"; } - { name="libkipi"; } - { name="libksane"; } - { name="mobipocket"; } - { name="okular"; } - { name="svgpart"; } - ]; -} -{ - module="kdeedu"; - split=true; - pkgs=[ - { name="blinken"; } - { name="cantor"; } - { name="kalgebra"; } - { name="kalzium"; } - { name="kanagram"; } - { name="kbruch"; } - { name="kgeography"; } - { name="khangman"; } - { name="kig"; } - { name="kiten"; } - { name="klettres"; } - { name="kmplot"; } - { name="kstars"; } - { name="ktouch"; } - { name="kturtle"; } - { name="kwordquiz"; } - { name="libkdeedu"; } - { name="marble"; } - { name="parley"; } - { name="rocs"; } - { name="step"; } - ]; -} -{ - module="kdebindings"; - split=true; - pkgs=[ - { name="kimono"; } - { name="korundum"; } - { name="kross-interpreters"; sane="kross_interpreters"; } - { name="perlkde"; } - { name="perlqt"; } - { name="pykde4"; } - { name="qtruby"; } - { name="qyoto"; } - { name="smokegen"; } - { name="smokekde"; } - { name="smokeqt"; } - ]; -} -{ - module="kde-baseapps"; -sane="kde_baseapps"; split=true; - pkgs=[ - { name="kate"; } - { name="kde-baseapps"; sane="kde_baseapps"; } - { name="konsole"; } - ]; -} -{ module="kdeaccessibility"; split=false; - pkgs=[ - { name="kaccessible"; } - { name="kmag"; } - { name="kmouth"; } - { name="kmousetool"; } - { name="jovie"; } - ]; - -} -{ module="kdeadmin"; split=false; - pkgs=[ - { name="strigi-analyzer"; sane="strigi_analyzer";} - { name="kuser"; } - { name="kcron"; } - { name="ksystemlog"; } - { name="system-config-printer-kde"; sane="system_config_printer_kde";} - ]; - -} -{ module="kdeartwork"; split=false; - pkgs=[ - { name="ColorSchemes"; } - { name="IconThemes"; } - { name="emoticons"; } - { name="kscreensaver"; } - { name="kwin-styles"; sane="kwin_styles";} - { name="sounds"; } - { name="styles"; } - { name="wallpapers"; } - { name="HighResolutionWallpapers"; } - { name="WeatherWallpapers"; } - { name="desktopthemes"; } - { name="aurorae"; } - ]; - -} -{ module="kdegames"; split=false;} -{ module="kdelibs"; split=false;} -{ module="kdemultimedia"; split=false;} -{ module="kdenetwork"; split=false; - pkgs=[ - { name="kfile-plugins"; sane="kfile_plugins";} - { name="kget"; } - { name="kopete"; } - { name="krdc"; } - { name="kppp"; } - { name="krfb"; } - { name="kdnssd"; } - { name="filesharing"; } - ]; - -} -{ module="kdepim"; split=false;} -{ module="kdepimlibs"; split=false;} -{ module="kdepim-runtime"; sane="kdepim_runtime"; split=false;} -{ module="kdeplasma-addons"; sane="kdeplasma_addons"; split=false;} -{ module="kde-runtime"; sane="kde_runtime"; split=false;} -{ module="kdesdk"; split=false; - pkgs=[ - { name="cervisia"; } - { name="lokalize"; } - { name="kdeaccounts-plugin"; sane="kdeaccounts_plugin";} - { name="dolphin-plugins-svn"; sane="dolphin_plugins_svn";subdir="dolphin-plugins/svn"; } - { name="dolphin-plugins-git"; sane="dolphin_plugins_git";subdir="dolphin-plugins/git"; } - { name="kcachegrind"; } - { name="kapptemplate"; } - { name="kpartloader"; } - { name="strigi-analyzer"; sane="strigi_analyzer";} - { name="kioslave"; } - { name="okteta"; } - { name="kmtrace"; } - { name="kompare"; } - { name="kprofilemethod"; } - { name="kstartperf"; } - { name="kuiviewer"; } - { name="poxml"; } - { name="scripts"; } - { name="umbrello"; } - ]; - -} -{ module="kdetoys"; split=false; - pkgs=[ - { name="kteatime"; } - { name="ktux"; } - { name="amor"; } - ]; - -} -{ module="kdeutils"; split=false; - pkgs=[ - { name="ark"; } - { name="kcalc"; } - { name="kremotecontrol"; } - { name="kdf"; } - { name="kfloppy"; } - { name="printer-applet"; sane="printer_applet";} - { name="filelight"; } - { name="kcharselect"; } - { name="kgpg"; } - { name="ktimer"; } - { name="kwallet"; } - { name="sweeper"; } - { name="superkaramba"; } - ]; - -} -{ module="kde-wallpapers"; sane="kde_wallpapers"; split=false;} -{ module="kdewebdev"; split=false; - pkgs=[ - { name="klinkstatus"; } - { name="kfilereplace"; } - { name="kimagemapeditor"; } - { name="kommander"; } - ]; - -} -{ module="kde-workspace"; sane="kde_workspace"; split=false;} -{ module="oxygen-icons"; sane="oxygen_icons"; split=false;} -]; -} diff --git a/pkgs/desktops/kde-4.7/kde-package/default.nix b/pkgs/desktops/kde-4.7/kde-package/default.nix deleted file mode 100644 index 38713de5820..00000000000 --- a/pkgs/desktops/kde-4.7/kde-package/default.nix +++ /dev/null @@ -1,127 +0,0 @@ -{ callPackage, runCommand, stdenv, fetchurl, qt4, cmake, automoc4 -, release, ignoreList, extraSubpkgs -}: - -let - inherit (stdenv.lib) filter fold; - inherit (builtins) getAttr hasAttr remoteAttrs listToAttrs tail head; -in -rec { - manifest = import (./. + "/${release}.nix"); - - # src attribute for $name tarball - kdesrc = name: fetchurl { - url = "mirror://kde/" + (if manifest.stable then "" else "un") - + "stable/${release}/src/${name}-${release}.tar.bz2"; - sha256 = getAttr name manifest.hashes; - }; - - # Default meta attribute - defMeta = { - homepage = http://www.kde.org; - inherit (qt4.meta) platforms maintainers; - }; - - # KDE package built from the whole tarball - # This function is used both for monolithic modules and modules which are - # released as individual tarballs - kdeMonoPkg = name: let n_ = name; in a@{meta, name ? n_, ...}: - stdenv.mkDerivation ({ - name = "${name}-${release}"; - src = kdesrc name; - meta = defMeta // meta; - enableParallelBuilding = true; - } // (removeAttrs a [ "meta" "name" ])); - - # kdeMonoPkg wrapper for modules splitted upstream compatible with combinePkgs - # API. - kdeSplittedPkg = module: {name, sane ? name}: kdeMonoPkg name; - - # Build subdirectory ${subdir} of tarball ${module}-${release}.tar.bz2 - kdeSubdirPkg = module: - {name, subdir ? name, sane ? name}: - let name_ = name; in - a@{cmakeFlags ? [], name ? name_, meta ? {}, ...}: - stdenv.mkDerivation ({ - name = "${name}-${release}"; - src = kdesrc module; - cmakeFlags = - [ "-DDISABLE_ALL_OPTIONAL_SUBDIRECTORIES=TRUE" - "-DBUILD_doc=TRUE" - "-DBUILD_${subdir}=TRUE" - ] ++ cmakeFlags; - meta = defMeta // meta; - enableParallelBuilding = true; - } // (removeAttrs a [ "meta" "name" "cmakeFlags" ])); - - # A KDE monolithic module - kdeMonoModule = name: path: callPackage path { kde = kdeMonoPkg name; }; - - # Combine packages in one module. - # Arguments: - # * pkgFun --- a function of the following signature: - # module: manifest_attrs: manual_attrs: derivation; - # * module --- name of the module - # * pkgs --- list of packages in manifest format - combinePkgs = pkgFun: module: pkgs: - let - f = p@{name, ...}: - callPackage (./.. + "/${module}/${name}.nix") { kde = pkgFun module p; }; - list = map f pkgs; - attrs = listToAttrs (map - ({name, sane ? name, ...}@p: { name = sane; value = f p; }) - pkgs); - in - runCommand "${module}-${release}" - ({passthru = attrs // { - propagatedUserEnvPackages = list; - projects = attrs; - };}) - '' - mkdir -pv $out/nix-support - echo "${toString list}" | tee $out/nix-support/propagated-user-env-packages - ''; - - # Given manifest module data, return the module - kdeModule = { module, sane ? module, split, pkgs ? [] }: - let - pkgs_ = filterPkgs module pkgs; - in - # Module is splitted by upstream - if split then combinePkgs kdeSplittedPkg module pkgs_ - # Monolithic module - else if pkgs == [] then kdeMonoModule module (./.. + "/${module}.nix") - # Module is splitted by us - else combinePkgs kdeSubdirPkg module pkgs_; - - # The same, as nameValuePair with sane name - kdeModuleNV = a@{ module, sane ? module, ... }: - { name = sane; value = kdeModule a; }; - - filterPkgs = module: (p: - removeNames (stdenv.lib.attrByPath [module] [] ignoreList) p - ++ (stdenv.lib.attrByPath [module] [] extraSubpkgs)); - - # Remove attrsets with x.name in subst. Optimized for empty subst. - removeNames = subst: big: - fold (s: out: filter (x: x.name != s) out) big subst; - - modules = listToAttrs (map kdeModuleNV manifest.modules); - - splittedModuleList = - let - splitted = filter (a: a ? pkgs) manifest.modules; - names = map ({module, sane ? module, ...}: sane) splitted; - in - map (m: m.projects) (stdenv.lib.attrVals names modules); - - individual = - stdenv.lib.zipAttrsWith - ( - name: list: - if tail list == [] - then head list - else abort "Multiple modules define ${name}" - ) - splittedModuleList; -} diff --git a/pkgs/desktops/kde-4.7/kde-package/kde-manifest.sh b/pkgs/desktops/kde-4.7/kde-package/kde-manifest.sh deleted file mode 100755 index 910394fb6a3..00000000000 --- a/pkgs/desktops/kde-4.7/kde-package/kde-manifest.sh +++ /dev/null @@ -1,145 +0,0 @@ -#! /bin/sh - -# Usage: download kde release to $dir, then run -# $0 $dir - -dir="$1" - -# Detect release number & whether it is a stable release -if [[ ! -d "${dir}" ]]; then - echo "${dir} is not a directory (or doesn't exist)!" >&2 - exit 1 -fi - -release=$(ls "${dir}"/kdelibs-*.tar.bz2 | \ - sed -e 's/.*kdelibs-//' -e 's/\.tar\.bz2//') - -if [[ ${release##*.} -gt 50 ]]; then - stable="false" -else - stable="true" -fi - -echo "Detected release ${release}" >&2 - -declare -A hash -declare -A modules -declare -a packages -declare -a top_level - -# xsltproc output declares -A module -if [[ ! -f kde_projects.xml ]]; then - curl -O -J http://projects.kde.org/kde_projects.xml -fi -eval `xsltproc kde-submodules.xslt kde_projects.xml` - -module[kde-baseapps]=kde-baseapps - -print_sane() { - echo "Called print_sane $1" >&2 - sane="${1//[^a-z0-9_]/_}" - if [[ "$sane" != "$1" ]]; then - echo "Sane version is $sane" >&2 - echo -n "sane=\"$sane\";" - fi -} - -for i in `cd "${dir}"; ls *-${release}.tar.bz2`; do - package=${i%-${release}.tar.bz2} - packages+=( "$package" ) - echo -n "${package}.. " >&2 - hash[$package]=$(nix-hash --type sha256 --flat --base32 "${dir}/${i}") - echo -n ${hash[$package]} >&2 - - if [ -n "${module[$package]}" ]; then - m="${module[$package]}" - echo " (${m})" >&2 - modules[$m]=1 - else - top_level+=( "$package" ) - echo " (top-level)" >&2 - fi - #nix-store --add-fixed sha256 "${dir}/${i}" >&2 -done - - -print_pkg_hash() { - echo " {name=\"${1}\";value=\"${hash[$1]}\";}" -} - -print_hashes(){ - echo "hashes=builtins.listToAttrs[" - for p in "${packages[@]}"; do print_pkg_hash "$p"; done - echo "];" -} - -print_split_module(){ - echo -n "$1:" >&2 - echo -e "{\n module=\"$1\";" - print_sane "$1" - echo " split=true;" - echo " pkgs=[" - for p in "${packages[@]}"; do - if [[ "${module[$p]}" == "$1" ]]; then - echo -n " { name=\"$p\"; " - print_sane "$p" - echo " }" - echo -n " $p" >&2 - fi - done - echo " ];" - echo "}" - echo >&2 -} - -print_mono_module(){ - echo -en "{ module=\"$1\"; " - print_sane "$1" - echo -n "$1 ... " >&2 - echo -n " split=false;" - cml="$1-$release/CMakeLists.txt" - tar -xf "${dir}/$1-${release}.tar.bz2" "$cml" - if grep '^[^#]*add_subdirectory' $cml >/dev/null; then - if grep '^[^#]*add_subdirectory' $cml | grep -v macro_optional_add_subdirectory >/dev/null; then - echo " is monolithic (has unconditionally added subdirs)" >&2 - else - subdirs=( `grep '^[^#]*add_subdirectory' $cml | - sed -e 's/[^#]*add_subdirectory *( *\(.*\) *)/\1/' | - grep -v '\(doc\|cmake\)'` ) - echo " seems splittable, subdirs: ${subdirs[*]}" >&2 - echo -e "\n pkgs=[" - for s in "${subdirs[@]}"; do - echo -en " {" - echo -n " name=\"${s//\//-}\"; " - print_sane "$s" - if [[ $s != "${s//\//-}" ]]; then - echo -n "subdir=\"$s\"; " - fi - echo "}" - done - echo -e " ];\n" - fi - else - echo " is monolithic (has no subdirs)" >&2 - fi - rm $cml - rmdir $1-$release - echo "}" -} - -print_modules(){ - echo "modules=[" - echo "Printing modules splitted by upstream" >&2 - for m in "${!modules[@]}"; do print_split_module "$m"; done - echo >&2 - echo "Printing modules not splitted by upstream (${top_level[*]})" >&2 - for m in "${top_level[@]}"; do print_mono_module "$m"; done - echo "];" -} - -echo "Writing ${release}.nix" >&2 -exec > "${release}.nix" -echo "{stable=${stable};" -print_hashes -print_modules -echo "}" diff --git a/pkgs/desktops/kde-4.7/kde-package/kde-submodules.xslt b/pkgs/desktops/kde-4.7/kde-package/kde-submodules.xslt deleted file mode 100644 index 952a05a9d27..00000000000 --- a/pkgs/desktops/kde-4.7/kde-package/kde-submodules.xslt +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - declare -A module - - - - module[" - - "]=" - - " - - - - - diff --git a/pkgs/desktops/kde-4.7/kde-runtime.nix b/pkgs/desktops/kde-4.7/kde-runtime.nix deleted file mode 100644 index b82ec2f6678..00000000000 --- a/pkgs/desktops/kde-4.7/kde-runtime.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ kde, kdelibs, shared_desktop_ontologies, bzip2, libssh, exiv2, attica -, libcanberra, virtuoso, samba, ntrack, libjpeg -}: - -kde { - buildInputs = - [ kdelibs shared_desktop_ontologies bzip2 libssh exiv2 attica - samba libcanberra ntrack libjpeg - ]; - - passthru.propagatedUserEnvPackages = [ virtuoso ]; - - meta = { - license = "LGPL"; - }; -} diff --git a/pkgs/desktops/kde-4.7/kde-wallpapers.nix b/pkgs/desktops/kde-4.7/kde-wallpapers.nix deleted file mode 100644 index 57f2b643aa4..00000000000 --- a/pkgs/desktops/kde-4.7/kde-wallpapers.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ kde, cmake }: - -kde { - nativeBuildInputs = [ cmake ]; - - patches = [ ./files/kde-wallpapers-buildsystem.patch ]; - - cmakeFlags = "-DWALLPAPER_INSTALL_DIR=share/wallpapers"; - - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = "29f4e8b24435ee8c64affdc6250f59ed9f78445118fe0a4e216d89969dd2006b"; - - meta = { - description = "Wallpapers for KDE"; - }; -} diff --git a/pkgs/desktops/kde-4.7/kde-workspace.nix b/pkgs/desktops/kde-4.7/kde-workspace.nix deleted file mode 100644 index 82730702989..00000000000 --- a/pkgs/desktops/kde-4.7/kde-workspace.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ kde, kdelibs, qimageblitz, libdbusmenu_qt, xorg, shared_desktop_ontologies -, lm_sensors, pciutils, libraw1394, libusb, libxklavier, python, libqalculate -, xkeyboard_config, kdepimlibs, pam, boost, gpsd, prison, akonadi -, pykde4, libjpeg, pkgconfig, libXft, libXxf86misc -}: - -kde { - - buildInputs = - [ kdelibs qimageblitz libdbusmenu_qt pykde4 libjpeg libXft libXxf86misc - xorg.libxkbfile xorg.libXcomposite xorg.libXScrnSaver xorg.libXtst - xorg.libXcomposite xorg.libXdamage xorg.libXau xorg.libXdmcp - xorg.libpthreadstubs - boost gpsd shared_desktop_ontologies lm_sensors pciutils libraw1394 - libusb python libqalculate kdepimlibs pam prison akonadi - ]; - - nativeBuildInputs = [ pkgconfig ]; - - preConfigure = - '' - # Fix incorrect path to kde4-config. - substituteInPlace startkde.cmake --replace '$bindir/kde4-config' ${kdelibs}/bin/kde4-config - - # Fix the path to the keyboard configuration files. - substituteInPlace kcontrol/keyboard/xkb_rules.cpp \ - --replace /usr/share/X11 ${xkeyboard_config}/etc/X11 - ''; - - enableParallelBuilding = false; - - meta = { - description = "KDE workspace components such as Plasma, Kwin and System Settings"; - license = "GPLv2"; - }; -} diff --git a/pkgs/desktops/kde-4.7/kdeaccessibility/jovie.nix b/pkgs/desktops/kde-4.7/kdeaccessibility/jovie.nix deleted file mode 100644 index d38c80c4c36..00000000000 --- a/pkgs/desktops/kde-4.7/kdeaccessibility/jovie.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs, speechd }: - -kde { - buildInputs = [ kdelibs speechd ]; - - meta = { - description = "Text-to-speech synthesis daemon"; - }; -} diff --git a/pkgs/desktops/kde-4.7/kdeaccessibility/kaccessible.nix b/pkgs/desktops/kde-4.7/kdeaccessibility/kaccessible.nix deleted file mode 100644 index 98fae7c983f..00000000000 --- a/pkgs/desktops/kde-4.7/kdeaccessibility/kaccessible.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs, speechd }: - -kde { - buildInputs = [ kdelibs speechd ]; - - meta = { - description = "Bridge that provides accessibility services to applications"; - }; -} diff --git a/pkgs/desktops/kde-4.7/kdeaccessibility/kmag.nix b/pkgs/desktops/kde-4.7/kdeaccessibility/kmag.nix deleted file mode 100644 index f3b27dacf67..00000000000 --- a/pkgs/desktops/kde-4.7/kdeaccessibility/kmag.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "Screen magnifier for KDE"; - }; -} diff --git a/pkgs/desktops/kde-4.7/kdeaccessibility/kmousetool.nix b/pkgs/desktops/kde-4.7/kdeaccessibility/kmousetool.nix deleted file mode 100644 index 8e0caa76ed9..00000000000 --- a/pkgs/desktops/kde-4.7/kdeaccessibility/kmousetool.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs, libXtst, libXt }: - -kde { - buildInputs = [ kdelibs libXtst libXt ]; - - meta = { - description = "A program that clicks the mouse for you"; - }; -} diff --git a/pkgs/desktops/kde-4.7/kdeaccessibility/kmouth.nix b/pkgs/desktops/kde-4.7/kdeaccessibility/kmouth.nix deleted file mode 100644 index 4159501967c..00000000000 --- a/pkgs/desktops/kde-4.7/kdeaccessibility/kmouth.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "A type-and-say front end for speech synthesizers"; - }; -} diff --git a/pkgs/desktops/kde-4.7/kdeadmin/kcron.nix b/pkgs/desktops/kde-4.7/kdeadmin/kcron.nix deleted file mode 100644 index bada0c1cb10..00000000000 --- a/pkgs/desktops/kde-4.7/kdeadmin/kcron.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; -} diff --git a/pkgs/desktops/kde-4.7/kdeadmin/ksystemlog.nix b/pkgs/desktops/kde-4.7/kdeadmin/ksystemlog.nix deleted file mode 100644 index bada0c1cb10..00000000000 --- a/pkgs/desktops/kde-4.7/kdeadmin/ksystemlog.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; -} diff --git a/pkgs/desktops/kde-4.7/kdeadmin/kuser.nix b/pkgs/desktops/kde-4.7/kdeadmin/kuser.nix deleted file mode 100644 index 571674a461a..00000000000 --- a/pkgs/desktops/kde-4.7/kdeadmin/kuser.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ kde, kdelibs, kdepimlibs }: - -kde { - buildInputs = [ kdelibs kdepimlibs ]; -} diff --git a/pkgs/desktops/kde-4.7/kdeadmin/system-config-printer-kde.nix b/pkgs/desktops/kde-4.7/kdeadmin/system-config-printer-kde.nix deleted file mode 100644 index 2c462f67c15..00000000000 --- a/pkgs/desktops/kde-4.7/kdeadmin/system-config-printer-kde.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ kde, pkgconfig, pythonPackages, sip, pycups, pygobject, system_config_printer, - kdelibs, kdepimlibs, pykde4, cups, nettools }: - -let s_c_p = system_config_printer.override { withGUI = false; }; in -kde { - buildInputs = [ kdelibs kdepimlibs pythonPackages.python pycups pykde4 sip - pygobject s_c_p ]; - - passthru = { system_config_printer = s_c_p; }; - - preConfigure = - '' - for i in system-config-printer-kde/cmake-modules/FindSystemConfigPrinter.py system-config-printer-kde/system-config-printer-kde.py; do - substituteInPlace $i \ - --replace /usr/share/system-config-printer ${s_c_p}/share/system-config-printer \ - --replace /usr/bin/cupstestppd ${cups}/bin/cupstestppd \ - --replace /bin/hostname ${nettools}/bin/hostname - done - ''; - - postInstall = - '' - # Bake the required Python path into the printer configuration program. - res= - for i in $(IFS=:; echo $PYTHONPATH); do res="$res''${res:+,} '$i'"; done - - sed -i $out/share/apps/system-config-printer-kde/system-config-printer-kde.py \ - -e "1 a import sys\nsys.path = [$res] + sys.path" - - mkdir -p $out/nix-support - echo ${pykde4} > $out/nix-support/propagated-user-env-packages - ''; -} diff --git a/pkgs/desktops/kde-4.7/kdeartwork/ColorSchemes.nix b/pkgs/desktops/kde-4.7/kdeartwork/ColorSchemes.nix deleted file mode 100644 index acccf66976f..00000000000 --- a/pkgs/desktops/kde-4.7/kdeartwork/ColorSchemes.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ kde, kdelibs }: - -kde { - name = "kde-color-schemes"; - - buildInputs = [ kdelibs ]; - - meta = { - description = "Additional KDE color schemes"; - }; -} diff --git a/pkgs/desktops/kde-4.7/kdeartwork/FindXscreensaver.cmake b/pkgs/desktops/kde-4.7/kdeartwork/FindXscreensaver.cmake deleted file mode 100644 index 499ed75268e..00000000000 --- a/pkgs/desktops/kde-4.7/kdeartwork/FindXscreensaver.cmake +++ /dev/null @@ -1,73 +0,0 @@ -#Macro to find xscreensaver directory - -# Copyright (c) 2006, Laurent Montel, -# -# Redistribution and use is allowed according to the terms of the BSD license. -# For details see the accompanying COPYING-CMAKE-SCRIPTS file. - -if (NOT XSCREENSAVER_FOUND) - FIND_PATH(XSCREENSAVER_DIR deco - HINTS - ${KDE4_INCLUDE_DIR} - PATHS - /usr - /usr/local - /opt/local - /usr/X11R6 - /opt/kde - /opt/kde3 - /usr/kde - /usr/local/kde - /usr/local/xscreensaver - /usr/openwin/lib/xscreensaver - /etc - PATH_SUFFIXES - lib${LIB_SUFFIX}/xscreensaver - lib${LIB_SUFFIX}/misc/xscreensaver - lib/xscreensaver - lib64/xscreensaver - lib/misc/xscreensaver - libexec/xscreensaver - bin/xscreensaver-hacks - hacks) - message(STATUS "XSCREENSAVER_DIR <${XSCREENSAVER_DIR}>") - - FIND_PATH(XSCREENSAVER_CONFIG_DIR deco.xml - PATHS - ${KDE4_INCLUDE_DIR} - /usr/ - /usr/local/ - /opt/local/ - /usr/X11R6/ - /opt/kde/ - /opt/kde3/ - /usr/kde/ - /usr/local/kde/ - /usr/openwin/lib/xscreensaver/ - /etc/ - PATH_SUFFIXES xscreensaver xscreensaver/config share/xscreensaver/config - ) - MESSAGE(STATUS "XSCREENSAVER_CONFIG_DIR :<${XSCREENSAVER_CONFIG_DIR}>") - -endif(NOT XSCREENSAVER_FOUND) - -#MESSAGE(STATUS "XSCREENSAVER_CONFIG_DIR :<${XSCREENSAVER_CONFIG_DIR}>") -#MESSAGE(STATUS "XSCREENSAVER_DIR :<${XSCREENSAVER_DIR}>") - -# Need to fix hack -if(XSCREENSAVER_DIR AND XSCREENSAVER_CONFIG_DIR) - set(XSCREENSAVER_FOUND TRUE) -endif(XSCREENSAVER_DIR AND XSCREENSAVER_CONFIG_DIR) - -if (XSCREENSAVER_FOUND) - if (NOT Xscreensaver_FIND_QUIETLY) - message(STATUS "Found XSCREENSAVER_CONFIG_DIR <${XSCREENSAVER_CONFIG_DIR}>") - endif (NOT Xscreensaver_FIND_QUIETLY) -else (XSCREENSAVER_FOUND) - if (Xscreensaver_FIND_REQUIRED) - message(FATAL_ERROR "XScreenSaver not found") - endif (Xscreensaver_FIND_REQUIRED) -endif (XSCREENSAVER_FOUND) - - -MARK_AS_ADVANCED(XSCREENSAVER_DIR XSCREENSAVER_CONFIG_DIR) diff --git a/pkgs/desktops/kde-4.7/kdeartwork/HighResolutionWallpapers.nix b/pkgs/desktops/kde-4.7/kdeartwork/HighResolutionWallpapers.nix deleted file mode 100644 index edffca1562e..00000000000 --- a/pkgs/desktops/kde-4.7/kdeartwork/HighResolutionWallpapers.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ kde, kdelibs }: - -kde rec { - name = "kde-wallpapers-high-resolution"; - - buildInputs = [ kdelibs ]; - - meta = { - description = "KDE wallpapers in high resolution"; - }; -} diff --git a/pkgs/desktops/kde-4.7/kdeartwork/IconThemes.nix b/pkgs/desktops/kde-4.7/kdeartwork/IconThemes.nix deleted file mode 100644 index 43071e8bd14..00000000000 --- a/pkgs/desktops/kde-4.7/kdeartwork/IconThemes.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ kde, kdelibs }: - -kde { - name = "kdeartwork-icon-themes"; - - # Sources contain primary and kdeclassic as well but they're not installed - - buildInputs = [ kdelibs ]; - - meta = { - description = "KDE nuvola and mono icon themes"; - }; -} diff --git a/pkgs/desktops/kde-4.7/kdeartwork/WeatherWallpapers.nix b/pkgs/desktops/kde-4.7/kdeartwork/WeatherWallpapers.nix deleted file mode 100644 index 947e5e17ab0..00000000000 --- a/pkgs/desktops/kde-4.7/kdeartwork/WeatherWallpapers.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ kde, kdelibs }: - -kde rec { - name = "kde-weather-wallpapers"; - - buildInputs = [ kdelibs ]; - - meta = { - description = "Additional KDE wallpapers (weather)"; - }; -} diff --git a/pkgs/desktops/kde-4.7/kdeartwork/aurorae.nix b/pkgs/desktops/kde-4.7/kdeartwork/aurorae.nix deleted file mode 100644 index 4bce95217cc..00000000000 --- a/pkgs/desktops/kde-4.7/kdeartwork/aurorae.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs }: - -kde { - name = "aurorae-themes"; - - buildInputs = [ kdelibs ]; -} diff --git a/pkgs/desktops/kde-4.7/kdeartwork/desktopthemes.nix b/pkgs/desktops/kde-4.7/kdeartwork/desktopthemes.nix deleted file mode 100644 index 93dd361af73..00000000000 --- a/pkgs/desktops/kde-4.7/kdeartwork/desktopthemes.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ kde, kdelibs }: - -kde { - name = "kde-desktop-themes"; - - buildInputs = [ kdelibs ]; - - meta = { - description = "Additional KDE desktop themes"; - }; -} diff --git a/pkgs/desktops/kde-4.7/kdeartwork/emoticons.nix b/pkgs/desktops/kde-4.7/kdeartwork/emoticons.nix deleted file mode 100644 index 5ef9f78a719..00000000000 --- a/pkgs/desktops/kde-4.7/kdeartwork/emoticons.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ kde, kdelibs }: - -kde { - name = "kde-emotion-icons"; - - buildInputs = [ kdelibs ]; - - meta = { - description = "Additional KDE emotion icons (smiles)"; - }; -} diff --git a/pkgs/desktops/kde-4.7/kdeartwork/kscreensaver.nix b/pkgs/desktops/kde-4.7/kdeartwork/kscreensaver.nix deleted file mode 100644 index 7028b9db228..00000000000 --- a/pkgs/desktops/kde-4.7/kdeartwork/kscreensaver.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ kde, kdelibs, xscreensaver, kde_workspace, eigen, libkexiv2, libXt, pkgconfig }: - -kde { - buildInputs = [ kdelibs xscreensaver kde_workspace eigen libkexiv2 libXt ]; - - nativeBuildInputs = [ pkgconfig ]; - - preConfigure = "cp -v ${./FindXscreensaver.cmake} cmake/modules/FindXscreensaver.cmake"; - - cmakeFlags = [ "-DBUILD_asciiquarium:BOOL=ON" ]; - - meta = { - description = "KDE screensavers"; - }; -} diff --git a/pkgs/desktops/kde-4.7/kdeartwork/kwin-styles.nix b/pkgs/desktops/kde-4.7/kdeartwork/kwin-styles.nix deleted file mode 100644 index b5d769b216d..00000000000 --- a/pkgs/desktops/kde-4.7/kdeartwork/kwin-styles.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs, kde_workspace }: - -kde { - buildInputs = [ kdelibs kde_workspace ]; - - meta = { - description = "Styles for KWin"; - }; -} diff --git a/pkgs/desktops/kde-4.7/kdeartwork/sounds.nix b/pkgs/desktops/kde-4.7/kdeartwork/sounds.nix deleted file mode 100644 index e98705da889..00000000000 --- a/pkgs/desktops/kde-4.7/kdeartwork/sounds.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ kde, kdelibs }: - -kde rec { - name = "kde-sounds"; - - buildInputs = [ kdelibs ]; - - meta = { - description = "New login/logout sounds"; - }; -} diff --git a/pkgs/desktops/kde-4.7/kdeartwork/styles.nix b/pkgs/desktops/kde-4.7/kdeartwork/styles.nix deleted file mode 100644 index 6a1306c3710..00000000000 --- a/pkgs/desktops/kde-4.7/kdeartwork/styles.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ kde, kdelibs }: - -kde rec { - name = "kde-style-phase"; - - buildInputs = [ kdelibs ]; - - meta = { - description = "Phase, a widget style for KDE"; - }; -} diff --git a/pkgs/desktops/kde-4.7/kdeartwork/wallpapers.nix b/pkgs/desktops/kde-4.7/kdeartwork/wallpapers.nix deleted file mode 100644 index 611c6a70f6b..00000000000 --- a/pkgs/desktops/kde-4.7/kdeartwork/wallpapers.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ kde, kdelibs }: - -kde rec { - name = "kde-wallpapers"; - - buildInputs = [ kdelibs ]; - - meta = { - description = "Additional KDE wallpapers"; - }; -} diff --git a/pkgs/desktops/kde-4.7/kdebindings/pykde-purity.patch b/pkgs/desktops/kde-4.7/kdebindings/pykde-purity.patch deleted file mode 100644 index dfc2c886bba..00000000000 --- a/pkgs/desktops/kde-4.7/kdebindings/pykde-purity.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index c853e38..5df3253 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -73,7 +73,7 @@ INCLUDE_DIRECTORIES( - ${QT_QTWEBKIT_INCLUDE_DIR} - ${KDE4_INCLUDE_DIR} - ${KDE4_INCLUDE_DIR}/solid -- ${KDE4_INCLUDE_DIR}/phonon -+ ${PHONON_INCLUDE_DIR}/phonon - ${KDE4_INCLUDE_DIR}/kio - ${KDE4_INCLUDE_DIR}/kdeprint - ${KDE4_INCLUDE_DIR}/kdeprint/lpr -@@ -232,7 +232,7 @@ _pkg_config = { - 'pykde_kde_sip_flags': '${_SIP_TAGS} ${_SIP_X} ${SIP_EXTRA_OPTIONS}', - 'pykde_mod_dir': '${PYTHON_SITE_PACKAGES_INSTALL_DIR}/PyKDE4', - 'pykde_modules': '${PYKDE_MODULES}', -- 'pykde_sip_dir': '${SIP_DEFAULT_SIP_DIR}/PyKDE4', -+ 'pykde_sip_dir': '${CMAKE_INSTALL_PREFIX}/share/sip/PyKDE4', - 'pykde_version': kde_version_hex, - 'pykde_version_str': '${KDE_VERSION}' - } -@@ -244,7 +244,7 @@ PYTHON_INSTALL(${CMAKE_CURRENT_BINARY_DIR}/pykdeconfig.py ${PYTHON_SITE_PACKAGES - - # Install the .sip files for anyone that wants to build bindings on top of PyKDE4. - # (Don't forget the / at the end of sip/.) --INSTALL(DIRECTORY sip/ DESTINATION ${SIP_DEFAULT_SIP_DIR}/PyKDE4 -+INSTALL(DIRECTORY sip/ DESTINATION ${CMAKE_INSTALL_PREFIX}/share/sip/PyKDE4 - PATTERN "*~" EXCLUDE # This sucks, why can't I just whitelist what I _do_ want? - PATTERN ".svn" EXCLUDE - PATTERN "*.in" EXCLUDE) -diff --git a/kpythonpluginfactory/CMakeLists.txt b/kpythonpluginfactory/CMakeLists.txt -index 41fa0fe..642d867 100644 ---- a/kpythonpluginfactory/CMakeLists.txt -+++ b/kpythonpluginfactory/CMakeLists.txt -@@ -3,7 +3,12 @@ - set(kpythonpluginfactory_SRCS - kpythonpluginfactory.cpp) - --GET_FILENAME_COMPONENT(LIB_PYTHON ${PYTHON_LIBRARY} NAME) -+option(HARDCODE_LIB_PYTHON_PATH "Whether the path to libpython.so should be hardcoded" OFF) -+if(HARDCODE_LIB_PYTHON_PATH) -+ get_filename_component(LIB_PYTHON ${PYTHON_LIBRARY} REALPATH) -+else(HARDCODE_LIB_PYTHON_PATH) -+ get_filename_component(LIB_PYTHON ${PYTHON_LIBRARY} NAME) -+endif(HARDCODE_LIB_PYTHON_PATH) - ADD_DEFINITIONS(-DLIB_PYTHON=\\"${LIB_PYTHON}\\") - ADD_DEFINITIONS(-DKDE_DEFAULT_DEBUG_AREA=15000) - diff --git a/pkgs/desktops/kde-4.7/kdebindings/pykde4-new-sip.patch b/pkgs/desktops/kde-4.7/kdebindings/pykde4-new-sip.patch deleted file mode 100644 index 96b3b887a8d..00000000000 --- a/pkgs/desktops/kde-4.7/kdebindings/pykde4-new-sip.patch +++ /dev/null @@ -1,91 +0,0 @@ -commit 017822bd0dfc83fe9a7a483ecc33f4aab839a3c6 -Author: Luca Beltrame -Date: Mon Oct 1 20:47:56 2012 +0200 - - Remove duplicated QVector definition, since it's in PyQt now. - Simon, if you have time, please review if everything is OK. - - CCMAIL: simon@simonzone.com - -diff --git a/sip/kdecore/typedefs.sip b/sip/kdecore/typedefs.sip -index 5a0a080..73dad01 100644 ---- a/sip/kdecore/typedefs.sip -+++ b/sip/kdecore/typedefs.sip -@@ -951,77 +951,3 @@ template - %End - }; - --%MappedType QVector --{ --%TypeHeaderCode --#include --%End -- --%ConvertFromTypeCode -- // Create the list. -- PyObject *l; -- -- if ((l = PyList_New(sipCpp->size())) == NULL) -- return NULL; -- -- // Set the list elements. -- for (int i = 0; i < sipCpp->size(); ++i) -- { -- int t = (sipCpp->at(i)); -- --#if PY_MAJOR_VERSION >= 3 -- PyObject *tobj = PyLong_FromLong(t); --#else -- PyObject *tobj = PyInt_FromLong(t); --#endif -- -- PyList_SET_ITEM(l, i, tobj); -- } -- -- return l; --%End -- --%ConvertToTypeCode -- // Check the type if that is all that is required. -- if (sipIsErr == NULL) -- { -- if (!PyList_Check(sipPy)) -- return 0; -- -- for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i) { -- PyObject *tobj = PyList_GET_ITEM(sipPy, i); --#if PY_MAJOR_VERSION >= 3 -- if (!PyNumber_Check(tobj)) --#else -- if (!PyInt_Check(tobj)) --#endif -- return 0; -- } -- return 1; -- } -- -- QVector *qv = new QVector; -- -- for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i) -- { -- PyObject *tobj = PyList_GET_ITEM(sipPy, i); -- #if PY_MAJOR_VERSION >= 3 -- int t = PyLong_AsLong (tobj); --#else -- int t = PyInt_AS_LONG (tobj); --#endif -- -- if (*sipIsErr) -- { -- delete qv; -- return 0; -- } -- -- qv->append(t); -- } -- -- *sipCppPtr = qv; -- -- return sipGetState(sipTransferObj); --%End --}; diff --git a/pkgs/desktops/kde-4.7/kdebindings/pykde4.nix b/pkgs/desktops/kde-4.7/kdebindings/pykde4.nix deleted file mode 100644 index 030f2fb430a..00000000000 --- a/pkgs/desktops/kde-4.7/kdebindings/pykde4.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ kde, kdelibs, python, sip, pyqt4, kdepimlibs, shared_desktop_ontologies, - boost, lndir }: - -let pydir = "lib/python${python.majorVersion}"; in - -kde { - buildInputs = [ python kdepimlibs shared_desktop_ontologies boost ]; - - propagatedBuildInputs = [ pyqt4 sip ]; - -#NIX_CFLAGS_COMPILE = "-I${phonon}/include/phonon"; - - patches = [ ./pykde-purity.patch ./pykde4-new-sip.patch ]; - - cmakeFlags = "-DHARDCODE_LIB_PYTHON_PATH=ON"; - - preConfigure = - '' - # Symlink PyQt into PyKDE. This is necessary because PyQt looks - # in its PyQt4/uic/widget-plugins directory for plugins, and KDE - # needs to install a plugin. - mkdir -pv $out/${pydir} - ${lndir}/bin/lndir ${pyqt4}/${pydir} $out/${pydir} - ''; - - meta = { - description = "Python bindings for KDE"; - kde.name = "pykde4"; - }; -} diff --git a/pkgs/desktops/kde-4.7/kdebindings/smokegen.nix b/pkgs/desktops/kde-4.7/kdebindings/smokegen.nix deleted file mode 100644 index 43f54b552e5..00000000000 --- a/pkgs/desktops/kde-4.7/kdebindings/smokegen.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ kde, qt4, cmake }: - -kde { - buildInputs = [ qt4 ]; - nativeBuildInputs = [ cmake ]; - - patchPhase = "sed -e /RPATH/d -i CMakeLists.txt"; - - meta = { - description = "C++ parser used to generate language bindings for Qt/KDE"; - license = "GPLv2"; - }; -} diff --git a/pkgs/desktops/kde-4.7/kdebindings/smokeqt.nix b/pkgs/desktops/kde-4.7/kdebindings/smokeqt.nix deleted file mode 100644 index 29e25093d11..00000000000 --- a/pkgs/desktops/kde-4.7/kdebindings/smokeqt.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ kde, qt4, cmake, phonon, qimageblitz, smokegen }: - -kde { - propagatedBuildInputs = [ qt4 phonon qimageblitz ]; - nativeBuildInputs = [ cmake ]; - propagatedNativeBuildInputs = [ smokegen ]; - - meta = { - description = "C++ parser used to generate language bindings for Qt/KDE"; - license = "GPLv2"; - }; -} diff --git a/pkgs/desktops/kde-4.7/kdeedu/FindLibfacile.cmake b/pkgs/desktops/kde-4.7/kdeedu/FindLibfacile.cmake deleted file mode 100644 index 617eb4b2467..00000000000 --- a/pkgs/desktops/kde-4.7/kdeedu/FindLibfacile.cmake +++ /dev/null @@ -1,32 +0,0 @@ -# - Try to find Libfacile -# Once done this will define -# -# LIBFACILE_FOUND - system has Libfacile -# LIBFACILE_INCLUDE_DIR - the Libfacile include directory -# LIBFACILE_LIBRARIES - Link these to use Libfacile -# -# Copyright (c) 2006, Carsten Niehaus, -# Copyright (c) 2006, Montel Laurent, -# Redistribution and use is allowed according to the terms of the BSD license. -# For details see the accompanying COPYING-CMAKE-SCRIPTS file. - - -find_package(OCaml) - -if( OCAML_FOUND ) - find_library(LIBFACILE_LIBRARIES NAMES facile.a - HINTS ${OCAMLC_DIR} - PATH_SUFFIXES facile ocaml/facile - ) - find_path(LIBFACILE_INCLUDE_DIR NAMES facile.cmi - HINTS ${OCAMLC_DIR} - PATH_SUFFIXES facile lib/ocaml/facile - ) -endif(OCAML_FOUND) - -include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(Libfacile DEFAULT_MSG LIBFACILE_INCLUDE_DIR - LIBFACILE_LIBRARIES OCAML_FOUND) - -# show the LIBFACILE_INCLUDE_DIR and LIBFACILE_LIBRARIES variables only in the advanced view -mark_as_advanced(LIBFACILE_INCLUDE_DIR LIBFACILE_LIBRARIES ) diff --git a/pkgs/desktops/kde-4.7/kdeedu/blinken.nix b/pkgs/desktops/kde-4.7/kdeedu/blinken.nix deleted file mode 100644 index cdf9728833c..00000000000 --- a/pkgs/desktops/kde-4.7/kdeedu/blinken.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ kde, kdelibs }: -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "Memory Enhancement Game"; - }; -} diff --git a/pkgs/desktops/kde-4.7/kdeedu/cantor.nix b/pkgs/desktops/kde-4.7/kdeedu/cantor.nix deleted file mode 100644 index 8b8bbc210c7..00000000000 --- a/pkgs/desktops/kde-4.7/kdeedu/cantor.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ kde, kdelibs, libspectre }: -kde { - buildInputs = [ kdelibs libspectre ]; - - meta = { - description = "KDE Frontend to Mathematical Software"; - }; -} diff --git a/pkgs/desktops/kde-4.7/kdeedu/kalgebra.nix b/pkgs/desktops/kde-4.7/kdeedu/kalgebra.nix deleted file mode 100644 index f1a190332cd..00000000000 --- a/pkgs/desktops/kde-4.7/kdeedu/kalgebra.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ kde, kdelibs, libkdeedu, readline }: -kde { - buildInputs = [ kdelibs libkdeedu readline ]; - - meta = { - description = "2D and 3D Graph Calculator"; - }; -} diff --git a/pkgs/desktops/kde-4.7/kdeedu/kalzium-feature-log.patch b/pkgs/desktops/kde-4.7/kdeedu/kalzium-feature-log.patch deleted file mode 100644 index 3c054e8d60a..00000000000 --- a/pkgs/desktops/kde-4.7/kdeedu/kalzium-feature-log.patch +++ /dev/null @@ -1,15 +0,0 @@ -commit d96c6e70400dcd4e3514065e607388b80f96d6a1 -Author: Yury G. Kudryashov -Date: Mon Aug 15 00:53:16 2011 +0400 - - Display feature log - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 132934c..eec6942 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -47,3 +47,4 @@ add_subdirectory(src) - add_subdirectory(data) - add_subdirectory(plasmoid) - add_subdirectory(libscience) -+macro_display_feature_log() diff --git a/pkgs/desktops/kde-4.7/kdeedu/kalzium.nix b/pkgs/desktops/kde-4.7/kdeedu/kalzium.nix deleted file mode 100644 index d7d9b403b1a..00000000000 --- a/pkgs/desktops/kde-4.7/kdeedu/kalzium.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ kde, kdelibs, facile, ocaml, eigen, openbabel, avogadro }: -kde { - buildInputs = [ kdelibs facile ocaml eigen openbabel avogadro ]; - - prePatch = '' - cp -v ${./FindLibfacile.cmake} cmake/modules/FindLibfacile.cmake - sed -e 's/\+facile/''${LIBFACILE_INCLUDE_DIR}/' -i src/CMakeOCamlInstructions.cmake - ''; - - patches = [ ./kalzium-feature-log.patch ]; - - meta = { - description = "Periodic Table of Elements"; - }; -} diff --git a/pkgs/desktops/kde-4.7/kdeedu/kanagram.nix b/pkgs/desktops/kde-4.7/kdeedu/kanagram.nix deleted file mode 100644 index 8759c96d78c..00000000000 --- a/pkgs/desktops/kde-4.7/kdeedu/kanagram.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ kde, kdelibs, libkdeedu }: -kde { - buildInputs = [ kdelibs libkdeedu ]; - - meta = { - description = "Letter Order Game"; - }; -} diff --git a/pkgs/desktops/kde-4.7/kdeedu/kbruch.nix b/pkgs/desktops/kde-4.7/kdeedu/kbruch.nix deleted file mode 100644 index dc50f1e85a3..00000000000 --- a/pkgs/desktops/kde-4.7/kdeedu/kbruch.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ kde, kdelibs }: -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "Practice Fractions"; - }; -} diff --git a/pkgs/desktops/kde-4.7/kdeedu/kgeography.nix b/pkgs/desktops/kde-4.7/kdeedu/kgeography.nix deleted file mode 100644 index bd8d27c8d6e..00000000000 --- a/pkgs/desktops/kde-4.7/kdeedu/kgeography.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ kde, kdelibs }: -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "Geography Trainer"; - }; -} diff --git a/pkgs/desktops/kde-4.7/kdeedu/khangman.nix b/pkgs/desktops/kde-4.7/kdeedu/khangman.nix deleted file mode 100644 index 997b50e906a..00000000000 --- a/pkgs/desktops/kde-4.7/kdeedu/khangman.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ kde, kdelibs, libkdeedu }: -kde { - buildInputs = [ kdelibs libkdeedu ]; - - meta = { - description = "KDE hangman game"; - }; -} diff --git a/pkgs/desktops/kde-4.7/kdeedu/kig.nix b/pkgs/desktops/kde-4.7/kdeedu/kig.nix deleted file mode 100644 index bd5ef67529c..00000000000 --- a/pkgs/desktops/kde-4.7/kdeedu/kig.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ kde, kdelibs, boost, python}: -kde { - buildInputs = [ kdelibs boost python ]; - - cmakeFlags = '' - -DBOOST_PYTHON_INCLUDES:PATH=${boost}/include;${python}/include/${python.libPrefix} - -DBOOST_PYTHON_LIBS=boost_python;${python.libPrefix} -DKIG_ENABLE_PYTHON_SCRIPTING=1 - ''; - meta = { - description = "KDE Interactive Geometry"; - }; -} diff --git a/pkgs/desktops/kde-4.7/kdeedu/kiten.nix b/pkgs/desktops/kde-4.7/kdeedu/kiten.nix deleted file mode 100644 index 939b7a9f77a..00000000000 --- a/pkgs/desktops/kde-4.7/kdeedu/kiten.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "Japanese Reference/Study Tool"; - }; -} diff --git a/pkgs/desktops/kde-4.7/kdeedu/klettres.nix b/pkgs/desktops/kde-4.7/kdeedu/klettres.nix deleted file mode 100644 index 7a0fa83078e..00000000000 --- a/pkgs/desktops/kde-4.7/kdeedu/klettres.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "A KDE alphabet tutorial"; - }; -} diff --git a/pkgs/desktops/kde-4.7/kdeedu/kmplot.nix b/pkgs/desktops/kde-4.7/kdeedu/kmplot.nix deleted file mode 100644 index 18458cf6f0b..00000000000 --- a/pkgs/desktops/kde-4.7/kdeedu/kmplot.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "A KDE mathematical function plotter"; - kde = { - name = "kmplot"; - }; - }; -} diff --git a/pkgs/desktops/kde-4.7/kdeedu/kstars.nix b/pkgs/desktops/kde-4.7/kdeedu/kstars.nix deleted file mode 100644 index 5b5a2d621de..00000000000 --- a/pkgs/desktops/kde-4.7/kdeedu/kstars.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs, eigen, xplanet, indilib }: - -kde { - buildInputs = [ kdelibs eigen xplanet indilib ]; - - meta = { - description = "A KDE graphical desktop planetarium"; - }; -} diff --git a/pkgs/desktops/kde-4.7/kdeedu/ktouch.nix b/pkgs/desktops/kde-4.7/kdeedu/ktouch.nix deleted file mode 100644 index 768be6f4367..00000000000 --- a/pkgs/desktops/kde-4.7/kdeedu/ktouch.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "Touch Typing Tutor"; - }; -} diff --git a/pkgs/desktops/kde-4.7/kdeedu/kturtle.nix b/pkgs/desktops/kde-4.7/kdeedu/kturtle.nix deleted file mode 100644 index 1e1922b1410..00000000000 --- a/pkgs/desktops/kde-4.7/kdeedu/kturtle.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "Educational Programming Environment"; - }; -} diff --git a/pkgs/desktops/kde-4.7/kdeedu/kwordquiz.nix b/pkgs/desktops/kde-4.7/kdeedu/kwordquiz.nix deleted file mode 100644 index 1b33ba2e469..00000000000 --- a/pkgs/desktops/kde-4.7/kdeedu/kwordquiz.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs, libkdeedu }: - -kde { - buildInputs = [ kdelibs libkdeedu ]; - - meta = { - description = "Flash Card Trainer"; - }; -} diff --git a/pkgs/desktops/kde-4.7/kdeedu/libkdeedu.nix b/pkgs/desktops/kde-4.7/kdeedu/libkdeedu.nix deleted file mode 100644 index def6c85fefe..00000000000 --- a/pkgs/desktops/kde-4.7/kdeedu/libkdeedu.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ kde, kdelibs }: -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "Libraries used by KDE Education applications"; - }; -} diff --git a/pkgs/desktops/kde-4.7/kdeedu/marble.nix b/pkgs/desktops/kde-4.7/kdeedu/marble.nix deleted file mode 100644 index 8bd86c91094..00000000000 --- a/pkgs/desktops/kde-4.7/kdeedu/marble.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs, gpsd }: - -kde { - buildInputs = [ kdelibs gpsd ]; - - meta = { - description = "Marble Virtual Globe"; - }; -} diff --git a/pkgs/desktops/kde-4.7/kdeedu/parley.nix b/pkgs/desktops/kde-4.7/kdeedu/parley.nix deleted file mode 100644 index eccd40a598f..00000000000 --- a/pkgs/desktops/kde-4.7/kdeedu/parley.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs, libkdeedu, libxml2, attica }: - -kde { - buildInputs = [ kdelibs libkdeedu libxml2 attica ]; - - meta = { - description = "Vocabulary Trainer"; - }; -} diff --git a/pkgs/desktops/kde-4.7/kdeedu/rocs.nix b/pkgs/desktops/kde-4.7/kdeedu/rocs.nix deleted file mode 100644 index 91976b84001..00000000000 --- a/pkgs/desktops/kde-4.7/kdeedu/rocs.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ kde, kdelibs, boost }: - -kde { - buildInputs = [ kdelibs (boost.override { enableExceptions = true; }) ]; - - NIX_CFLAGS_COMPILE = "-fexceptions"; - - meta = { - description = "A KDE graph theory viewer"; - kde = { - name = "rocs"; - }; - }; -} diff --git a/pkgs/desktops/kde-4.7/kdeedu/step.nix b/pkgs/desktops/kde-4.7/kdeedu/step.nix deleted file mode 100644 index fac9974baf1..00000000000 --- a/pkgs/desktops/kde-4.7/kdeedu/step.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ kde, kdelibs, gsl, libqalculate, eigen }: - -kde { - buildInputs = [ kdelibs gsl libqalculate eigen ]; - - meta = { - description = "A KDE interactive physical simulator"; - kde = { - name = "step"; - }; - }; -} diff --git a/pkgs/desktops/kde-4.7/kdegames.nix b/pkgs/desktops/kde-4.7/kdegames.nix deleted file mode 100644 index dfca49be12f..00000000000 --- a/pkgs/desktops/kde-4.7/kdegames.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ kde, kdelibs, qca2, twisted, pythonPackages, sip, makeWrapper, pykde4, - openal, libsndfile, qhull, sqlite, pkgconfig }: - -kde rec { - buildInputs = [ kdelibs qca2 pythonPackages.python pythonPackages.wrapPython - openal libsndfile qhull sqlite ] ++ pythonPath; - - pythonPath = [ pythonPackages.twisted pykde4 ]; - - nativeBuildInputs = [ pkgconfig ]; - - # TODO: ggz - - postInstall = "wrapPythonPrograms"; - - meta = { - description = "KDE Games"; - license = "GPL"; - }; -} diff --git a/pkgs/desktops/kde-4.7/kdegraphics/gwenview.nix b/pkgs/desktops/kde-4.7/kdegraphics/gwenview.nix deleted file mode 100644 index c03c82469e6..00000000000 --- a/pkgs/desktops/kde-4.7/kdegraphics/gwenview.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ kde, kdelibs, exiv2, shared_desktop_ontologies, kde_baseapps, libkipi -, libjpeg, pkgconfig }: - -kde { - - buildInputs = - [ kdelibs exiv2 shared_desktop_ontologies kde_baseapps libkipi libjpeg ]; - - nativeBuildInputs = [ pkgconfig ]; - - meta = { - description = "Gwenview, the KDE image viewer"; - license = "GPLv2"; - }; -} diff --git a/pkgs/desktops/kde-4.7/kdegraphics/kamera.nix b/pkgs/desktops/kde-4.7/kdegraphics/kamera.nix deleted file mode 100644 index 70904b17c23..00000000000 --- a/pkgs/desktops/kde-4.7/kdegraphics/kamera.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ kde, kdelibs, libgphoto2 }: - -kde { - buildInputs = [ kdelibs libgphoto2 ]; - - meta = { - description = "KDE camera interface library"; - license = "GPLv2"; - }; -} diff --git a/pkgs/desktops/kde-4.7/kdegraphics/kcolorchooser.nix b/pkgs/desktops/kde-4.7/kdegraphics/kcolorchooser.nix deleted file mode 100644 index 58528cb186b..00000000000 --- a/pkgs/desktops/kde-4.7/kdegraphics/kcolorchooser.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "A small utility to select a color"; - license = "GPLv2"; - }; -} diff --git a/pkgs/desktops/kde-4.7/kdegraphics/kdegraphics-strigi-analyzer.nix b/pkgs/desktops/kde-4.7/kdegraphics/kdegraphics-strigi-analyzer.nix deleted file mode 100644 index 6001a5f363d..00000000000 --- a/pkgs/desktops/kde-4.7/kdegraphics/kdegraphics-strigi-analyzer.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "Strigi analyzers for various graphics file formats"; - license = "GPLv2"; - }; -} diff --git a/pkgs/desktops/kde-4.7/kdegraphics/kdegraphics-thumbnailers.nix b/pkgs/desktops/kde-4.7/kdegraphics/kdegraphics-thumbnailers.nix deleted file mode 100644 index 55bf8309b2a..00000000000 --- a/pkgs/desktops/kde-4.7/kdegraphics/kdegraphics-thumbnailers.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ kde, kdelibs, libkexiv2, libkdcraw }: - -kde { - buildInputs = [ kdelibs libkexiv2 libkdcraw ]; - - meta = { - description = "Thumbnailers for various graphics file formats"; - license = "GPLv2"; - }; -} diff --git a/pkgs/desktops/kde-4.7/kdegraphics/kgamma.nix b/pkgs/desktops/kde-4.7/kdegraphics/kgamma.nix deleted file mode 100644 index 28d9252187e..00000000000 --- a/pkgs/desktops/kde-4.7/kdegraphics/kgamma.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ kde, kdelibs, libXxf86vm }: - -kde { - buildInputs = [ kdelibs libXxf86vm ]; - - meta = { - description = "KDE monitor calibration tool"; - license = "GPLv2"; - }; -} diff --git a/pkgs/desktops/kde-4.7/kdegraphics/kolourpaint.nix b/pkgs/desktops/kde-4.7/kdegraphics/kolourpaint.nix deleted file mode 100644 index 5276ec09f46..00000000000 --- a/pkgs/desktops/kde-4.7/kdegraphics/kolourpaint.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ kde, kdelibs, qimageblitz }: - -kde { - buildInputs = [ kdelibs qimageblitz ]; - - meta = { - description = "KDE paint program"; - license = "GPLv2"; - }; -} diff --git a/pkgs/desktops/kde-4.7/kdegraphics/kruler.nix b/pkgs/desktops/kde-4.7/kdegraphics/kruler.nix deleted file mode 100644 index c5c2c6e05d7..00000000000 --- a/pkgs/desktops/kde-4.7/kdegraphics/kruler.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "KDE screen ruler"; - license = "GPLv2"; - }; -} diff --git a/pkgs/desktops/kde-4.7/kdegraphics/ksaneplugin.nix b/pkgs/desktops/kde-4.7/kdegraphics/ksaneplugin.nix deleted file mode 100644 index 1381ed7dd26..00000000000 --- a/pkgs/desktops/kde-4.7/kdegraphics/ksaneplugin.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ kde, kdelibs, libksane }: - -kde { - buildInputs = [ kdelibs libksane ]; - - meta = { - description = "A KScan plugin that implements the scanning through libksane"; - license = "GPLv2"; - }; -} diff --git a/pkgs/desktops/kde-4.7/kdegraphics/ksnapshot.nix b/pkgs/desktops/kde-4.7/kdegraphics/ksnapshot.nix deleted file mode 100644 index f01a609e20d..00000000000 --- a/pkgs/desktops/kde-4.7/kdegraphics/ksnapshot.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ kde, kdelibs, libkipi }: - -kde { - buildInputs = [ kdelibs libkipi ]; - - meta = { - description = "KDE screenshot utility"; - license = "GPLv2"; - }; -} diff --git a/pkgs/desktops/kde-4.7/kdegraphics/libkdcraw.nix b/pkgs/desktops/kde-4.7/kdegraphics/libkdcraw.nix deleted file mode 100644 index 9810a98551e..00000000000 --- a/pkgs/desktops/kde-4.7/kdegraphics/libkdcraw.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ kde, kdelibs, libjpeg, lcms1 }: - -kde { - buildInputs = [ kdelibs libjpeg lcms1 ]; - - meta = { - description = "Library for decoding RAW images"; - license = "GPLv2"; - }; -} diff --git a/pkgs/desktops/kde-4.7/kdegraphics/libkexiv2.nix b/pkgs/desktops/kde-4.7/kdegraphics/libkexiv2.nix deleted file mode 100644 index 096b0a6e957..00000000000 --- a/pkgs/desktops/kde-4.7/kdegraphics/libkexiv2.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ kde, kdelibs, exiv2 }: - -kde { - buildInputs = [ kdelibs exiv2 ]; - - meta = { - description = "Exiv2 support library"; - license = "GPLv2"; - }; -} diff --git a/pkgs/desktops/kde-4.7/kdegraphics/libkipi.nix b/pkgs/desktops/kde-4.7/kdegraphics/libkipi.nix deleted file mode 100644 index 6b16265e7a3..00000000000 --- a/pkgs/desktops/kde-4.7/kdegraphics/libkipi.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "Interface library to kipi-plugins"; - license = "GPLv2"; - }; -} diff --git a/pkgs/desktops/kde-4.7/kdegraphics/libksane.nix b/pkgs/desktops/kde-4.7/kdegraphics/libksane.nix deleted file mode 100644 index b539eab3899..00000000000 --- a/pkgs/desktops/kde-4.7/kdegraphics/libksane.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ kde, kdelibs, saneBackends }: - -kde { - buildInputs = [ kdelibs saneBackends ]; - - meta = { - description = "An image scanning library that provides a QWidget that contains all the logic needed to interface a sacanner"; - license = "GPLv2"; - }; -} diff --git a/pkgs/desktops/kde-4.7/kdegraphics/mobipocket.nix b/pkgs/desktops/kde-4.7/kdegraphics/mobipocket.nix deleted file mode 100644 index 2c2ba3796a2..00000000000 --- a/pkgs/desktops/kde-4.7/kdegraphics/mobipocket.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ kde, kdelibs, okular }: - -kde { - buildInputs = [ kdelibs okular ]; - - meta = { - description = "A collection of plugins to handle mobipocket files"; - license = "GPLv2"; - }; -} diff --git a/pkgs/desktops/kde-4.7/kdegraphics/okular.nix b/pkgs/desktops/kde-4.7/kdegraphics/okular.nix deleted file mode 100644 index 0c5c7b49b17..00000000000 --- a/pkgs/desktops/kde-4.7/kdegraphics/okular.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ chmlib, djvulibre, ebook_tools, kde, kdelibs, libspectre, popplerQt4, qca2 -, qimageblitz, pkgconfig }: - -kde { - buildInputs = - [ chmlib djvulibre ebook_tools kdelibs libspectre popplerQt4 qca2 qimageblitz pkgconfig ]; - - meta = { - description = "Okular, the KDE document viewer"; - license = "GPLv2"; - }; -} diff --git a/pkgs/desktops/kde-4.7/kdegraphics/svgpart.nix b/pkgs/desktops/kde-4.7/kdegraphics/svgpart.nix deleted file mode 100644 index a344cc4b4b4..00000000000 --- a/pkgs/desktops/kde-4.7/kdegraphics/svgpart.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "SVG KPart"; - license = "GPLv2"; - }; -} diff --git a/pkgs/desktops/kde-4.7/kdelibs.nix b/pkgs/desktops/kde-4.7/kdelibs.nix deleted file mode 100644 index 41a648d1056..00000000000 --- a/pkgs/desktops/kde-4.7/kdelibs.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ kde, gcc, cmake, perl, aspell -, qt4, bzip2, pcre, fam, libxml2, libxslt, shared_mime_info, giflib, jasper -, openexr, avahi, kerberos, acl, attr, shared_desktop_ontologies, libXScrnSaver -, automoc4, strigi, soprano, qca2, attica, enchant, libdbusmenu_qt -, docbook_xml_dtd_42, docbook_xsl, polkit_qt_1 -, getopt, udev, herqq, phonon, libjpeg, xz -}: - -kde { - buildInputs = - [ acl attr attica avahi bzip2 enchant fam getopt giflib herqq jasper - libdbusmenu_qt libXScrnSaver libxslt pcre polkit_qt_1 qca2 - shared_desktop_ontologies xz udev libxml2 libjpeg kerberos aspell - ]; - - propagatedBuildInputs = [ qt4 soprano strigi phonon ]; - - propagatedNativeBuildInputs = [ automoc4 cmake perl shared_mime_info ]; - - # TODO: make sonnet plugins (dictionaries) really work. - # There are a few hardcoded paths. - # Let kdelibs find openexr - # Split plugins from libs? - - patches = [ ./files/polkit-install.patch ]; - - # cmake fails to find acl.h because of C++-style comment - # TODO: OpenEXR - cmakeFlags = [ - "-DDOCBOOKXML_CURRENTDTD_DIR=${docbook_xml_dtd_42}/xml/dtd/docbook" - "-DDOCBOOKXSL_DIR=${docbook_xsl}/xml/xsl/docbook" - ]; - - meta = { - description = "KDE libraries"; - license = "LGPL"; - }; -} diff --git a/pkgs/desktops/kde-4.7/kdemultimedia.nix b/pkgs/desktops/kde-4.7/kdemultimedia.nix deleted file mode 100644 index 4c3182dd9fe..00000000000 --- a/pkgs/desktops/kde-4.7/kdemultimedia.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ kde, alsaLib, libvorbis, taglib, flac, cdparanoia, lame, kdelibs, ffmpeg, - libmusicbrainz3, libtunepimp, pulseaudio }: - -kde { - - buildInputs = - # Note: kdemultimedia can use xine-lib, but it doesn't seem useful - # without the Phonon Xine backend. - [ kdelibs cdparanoia taglib libvorbis libmusicbrainz3 libtunepimp ffmpeg - flac lame pulseaudio - ]; - - meta = { - description = "KDE multimedia programs such as a movie player and volume utility"; - license = "GPL"; - }; -} diff --git a/pkgs/desktops/kde-4.7/kdenetwork/FindmsiLBC.cmake b/pkgs/desktops/kde-4.7/kdenetwork/FindmsiLBC.cmake deleted file mode 100644 index c40b0bed310..00000000000 --- a/pkgs/desktops/kde-4.7/kdenetwork/FindmsiLBC.cmake +++ /dev/null @@ -1,19 +0,0 @@ -# cmake macro to test msiLBC - -# Copyright (c) 2009-2010 Pali Rohár -# -# MSILBC_FOUND -# MSILBC_LIBRARY - -include ( FindPackageHandleStandardArgs ) - -if ( MSILBC_LIBRARY ) - set ( MSILBC_FOUND true ) - set ( msiLBC_FIND_QUIETLY true ) -else ( MSILBC_LIBRARY ) - find_library ( MSILBC_LIBRARY NAMES msilbc - PATH_SUFFIXES mediastreamer/plugins) -endif ( MSILBC_LIBRARY ) - -find_package_handle_standard_args ( msiLBC DEFAULT_MSG MSILBC_LIBRARY ) -mark_as_advanced ( MSILBC_LIBRARY ) diff --git a/pkgs/desktops/kde-4.7/kdenetwork/filesharing.nix b/pkgs/desktops/kde-4.7/kdenetwork/filesharing.nix deleted file mode 100644 index 2f32f4d6b2c..00000000000 --- a/pkgs/desktops/kde-4.7/kdenetwork/filesharing.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - patches = [ ./kdenetwork.patch ]; -} diff --git a/pkgs/desktops/kde-4.7/kdenetwork/kdenetwork.patch b/pkgs/desktops/kde-4.7/kdenetwork/kdenetwork.patch deleted file mode 100644 index ebadbfad9ba..00000000000 --- a/pkgs/desktops/kde-4.7/kdenetwork/kdenetwork.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -r -u kdenetwork-4.7.1.orig/CMakeLists.txt kdenetwork-4.7.1/CMakeLists.txt ---- kdenetwork-4.7.1.orig/CMakeLists.txt 2011-03-29 15:25:42.174521812 +0400 -+++ kdenetwork-4.7.1/CMakeLists.txt 2011-03-29 15:27:43.268140322 +0400 -@@ -28,7 +28,8 @@ - set(CMAKE_REQUIRED_INCLUDES ${KDEWIN_INCLUDES} ) - endif (WIN32) - --find_package(KdepimLibs REQUIRED) -+macro_optional_find_package(KdepimLibs) -+macro_log_feature(KDEPIMLIBS_FOUND "KDEPimLibs" "KDE pim-related libraries" "http://pim.kde.org.org/" FALSE "" "Required for Kopete") - # find_package(X11VidMode) not used at this time - - # NX support is not ready for KDE 4.2; disabled (uwolfer) -@@ -79,7 +80,9 @@ - macro_optional_add_subdirectory(kfile-plugins) - macro_optional_add_subdirectory(kget) - --macro_optional_add_subdirectory(kopete) -+if(KDEPIMLIBS_FOUND) -+ macro_optional_add_subdirectory(kopete) -+endif(KDEPIMLIBS_FOUND) - - if(Q_WS_X11) - macro_optional_add_subdirectory(krdc) diff --git a/pkgs/desktops/kde-4.7/kdenetwork/kdnssd.nix b/pkgs/desktops/kde-4.7/kdenetwork/kdnssd.nix deleted file mode 100644 index 2f32f4d6b2c..00000000000 --- a/pkgs/desktops/kde-4.7/kdenetwork/kdnssd.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - patches = [ ./kdenetwork.patch ]; -} diff --git a/pkgs/desktops/kde-4.7/kdenetwork/kfile-plugins.nix b/pkgs/desktops/kde-4.7/kdenetwork/kfile-plugins.nix deleted file mode 100644 index f90fd356079..00000000000 --- a/pkgs/desktops/kde-4.7/kdenetwork/kfile-plugins.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ kde, kdelibs, boost }: - -kde { - name = "strigi-analyzer-torrent"; - - buildInputs = [ kdelibs boost ]; - - preConfigure = "mv -v strigi-analyzer kfile-plugins"; - - patches = [ ./kdenetwork.patch ]; -} diff --git a/pkgs/desktops/kde-4.7/kdenetwork/kget.nix b/pkgs/desktops/kde-4.7/kdenetwork/kget.nix deleted file mode 100644 index 2381a2459e6..00000000000 --- a/pkgs/desktops/kde-4.7/kdenetwork/kget.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ kde, kdelibs, libktorrent, kde_workspace, kdepimlibs, sqlite -, shared_desktop_ontologies, kde_baseapps, gpgme, boost, libmms, qca2 }: - -kde { - buildInputs = - [ kdelibs libktorrent kde_workspace shared_desktop_ontologies kdepimlibs - kde_baseapps gpgme boost libmms qca2 sqlite - ]; - - KDEDIRS = libktorrent; - - patches = [ ./kdenetwork.patch ]; -} diff --git a/pkgs/desktops/kde-4.7/kdenetwork/kopete.nix b/pkgs/desktops/kde-4.7/kdenetwork/kopete.nix deleted file mode 100644 index 440e8595704..00000000000 --- a/pkgs/desktops/kde-4.7/kdenetwork/kopete.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ kde, kdelibs, speex, libmsn, libotr, kdepimlibs, qimageblitz, libktorrent, - jasper, libidn, mediastreamer, msilbc, pkgconfig, libxml2, libxslt, giflib, - libgadu, boost, qca2, gpgme, sqlite }: - -kde { - buildInputs = [ kdelibs speex libmsn libotr kdepimlibs qimageblitz libktorrent - jasper libidn mediastreamer msilbc libxml2 libxslt giflib libgadu boost qca2 - gpgme sqlite ]; - - nativeBuildInputs = [ pkgconfig ]; - - KDEDIRS = libktorrent; - - patchPhase = "cp -v ${./FindmsiLBC.cmake} kopete/cmake/modules/FindmsiLBC.cmake"; - - cmakeFlags = [ "-DBUILD_skypebuttons=TRUE" ]; - - meta = { - description = "A KDE multi-protocol IM client"; - }; -} diff --git a/pkgs/desktops/kde-4.7/kdenetwork/kppp.nix b/pkgs/desktops/kde-4.7/kdenetwork/kppp.nix deleted file mode 100644 index 2f32f4d6b2c..00000000000 --- a/pkgs/desktops/kde-4.7/kdenetwork/kppp.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - patches = [ ./kdenetwork.patch ]; -} diff --git a/pkgs/desktops/kde-4.7/kdenetwork/krdc.nix b/pkgs/desktops/kde-4.7/kdenetwork/krdc.nix deleted file mode 100644 index 40ef91d5433..00000000000 --- a/pkgs/desktops/kde-4.7/kdenetwork/krdc.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libvncserver, libjpeg }: - -kde { - buildInputs = [ kdelibs libvncserver libjpeg ]; - - patches = [ ./kdenetwork.patch ]; -} diff --git a/pkgs/desktops/kde-4.7/kdenetwork/krfb.nix b/pkgs/desktops/kde-4.7/kdenetwork/krfb.nix deleted file mode 100644 index 80013f430d3..00000000000 --- a/pkgs/desktops/kde-4.7/kdenetwork/krfb.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libvncserver, libXdamage, libXtst }: - -kde { - buildInputs = [ kdelibs libvncserver libXdamage libXtst]; - - patches = [ ./kdenetwork.patch ]; -} diff --git a/pkgs/desktops/kde-4.7/kdepim-runtime.nix b/pkgs/desktops/kde-4.7/kdepim-runtime.nix deleted file mode 100644 index ef637f3f075..00000000000 --- a/pkgs/desktops/kde-4.7/kdepim-runtime.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ kde, fetchurl, cmake, kdelibs, libxml2, libxslt, boost, kdepimlibs, akonadi -, shared_desktop_ontologies }: - -kde { - buildInputs = [ kdepimlibs akonadi boost shared_desktop_ontologies libxml2 - libxslt ]; - - meta = { - description = "KDE PIM runtime"; - license = "GPL"; - }; -} diff --git a/pkgs/desktops/kde-4.7/kdepim.nix b/pkgs/desktops/kde-4.7/kdepim.nix deleted file mode 100644 index 9b95d491a44..00000000000 --- a/pkgs/desktops/kde-4.7/kdepim.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ kde, boost, gpgme, libassuan, libxml2, libxslt, kdepimlibs, kdepim_runtime -, akonadi, shared_desktop_ontologies, cyrus_sasl, grantlee }: - -kde { - - buildInputs = - [ kdepimlibs boost akonadi shared_desktop_ontologies libxml2 - libxslt cyrus_sasl gpgme libassuan grantlee - ]; - - passthru.propagatedUserEnvPackages = [ akonadi kdepimlibs kdepim_runtime ]; - - meta = { - description = "KDE PIM tools"; - longDescription = '' - Contains various personal information management tools for KDE, such as an organizer. - ''; - license = "GPL"; - homepage = http://pim.kde.org; - }; -} diff --git a/pkgs/desktops/kde-4.7/kdepimlibs.nix b/pkgs/desktops/kde-4.7/kdepimlibs.nix deleted file mode 100644 index 736508eaf0f..00000000000 --- a/pkgs/desktops/kde-4.7/kdepimlibs.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ kde, boost, cyrus_sasl, gpgme, libical, openldap, shared_mime_info -, kdelibs, akonadi, shared_desktop_ontologies, libxml2, libxslt, prison }: - -kde { - buildInputs = - [ boost gpgme shared_desktop_ontologies libical libxml2 libxslt - openldap cyrus_sasl akonadi prison - ]; - - propagatedBuildInputs = [ kdelibs ]; - - meta = { - description = "KDE PIM libraries"; - license = "LGPL"; - }; -} diff --git a/pkgs/desktops/kde-4.7/kdeplasma-addons.nix b/pkgs/desktops/kde-4.7/kdeplasma-addons.nix deleted file mode 100644 index 30a32b465b6..00000000000 --- a/pkgs/desktops/kde-4.7/kdeplasma-addons.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ kde, kdelibs, marble, shared_desktop_ontologies, pkgconfig -, boost, eigen, kde_workspace, attica, python, qca2, qimageblitz -, kdepimlibs, libkexiv2, libqalculate, libXtst }: -# TODO: qwt, scim - -kde { - - KDEDIRS=marble; - - buildInputs = [ kdelibs boost eigen kde_workspace - attica python qca2 qimageblitz kdepimlibs - libqalculate libXtst shared_desktop_ontologies marble libkexiv2]; - - nativeBuildInputs = [ pkgconfig ]; - - meta = { - description = "KDE Plasma Addons"; - license = "GPL"; - }; -} diff --git a/pkgs/desktops/kde-4.7/kdesdk/cervisia.nix b/pkgs/desktops/kde-4.7/kdesdk/cervisia.nix deleted file mode 100644 index 1dabe46cd42..00000000000 --- a/pkgs/desktops/kde-4.7/kdesdk/cervisia.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "A KDE CVS frontend"; - }; -} diff --git a/pkgs/desktops/kde-4.7/kdesdk/dolphin-plugins-git.nix b/pkgs/desktops/kde-4.7/kdesdk/dolphin-plugins-git.nix deleted file mode 100644 index df4a0856c6b..00000000000 --- a/pkgs/desktops/kde-4.7/kdesdk/dolphin-plugins-git.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ kde, kdelibs, kde_baseapps }: - -kde { - # Needs kdebase for libkonq - buildInputs = [ kdelibs kde_baseapps ]; - - meta = { - description = "Git plugin for dolphin"; - }; -} diff --git a/pkgs/desktops/kde-4.7/kdesdk/dolphin-plugins-svn.nix b/pkgs/desktops/kde-4.7/kdesdk/dolphin-plugins-svn.nix deleted file mode 100644 index 8032b89ff54..00000000000 --- a/pkgs/desktops/kde-4.7/kdesdk/dolphin-plugins-svn.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ kde, kdelibs, kde_baseapps }: - -kde { - # Needs kdebase for libkonq - buildInputs = [ kdelibs kde_baseapps ]; - - meta = { - description = "Svn plugin for dolphin"; - }; -} diff --git a/pkgs/desktops/kde-4.7/kdesdk/find-svn.patch b/pkgs/desktops/kde-4.7/kdesdk/find-svn.patch deleted file mode 100644 index 61cb49b308f..00000000000 --- a/pkgs/desktops/kde-4.7/kdesdk/find-svn.patch +++ /dev/null @@ -1,59 +0,0 @@ -diff --git a/cmake/modules/FindSVN.cmake b/cmake/modules/FindSVN.cmake -index 59bcb96..2eac05d 100644 ---- a/cmake/modules/FindSVN.cmake -+++ b/cmake/modules/FindSVN.cmake -@@ -17,6 +17,9 @@ FIND_PROGRAM(SVNCONFIG_EXECUTABLE NAMES svn-config PATHS - FIND_PROGRAM(APRCONFIG_EXECUTABLE NAMES apr-1-config apr-config PATHS - /usr/local/apr/bin - ) -+find_program(APUCONFIG_EXECUTABLE NAMES apu-1-config apu-config PATHS -+ /usr/local/apr/bin -+) - - if(SVNCONFIG_EXECUTABLE) - -@@ -56,15 +59,9 @@ else(SVNCONFIG_EXECUTABLE) - set(SVN_INCLUDES ${SVN_INCLUDES} ${_INCLUDES}) - else(APRCONFIG_EXECUTABLE) - FIND_PATH(_INCLUDES apr_pools.h -- ${SVN_INCLUDES}/apr-0/ -- ${SVN_INCLUDES}/apr-1/ -- ${SVN_INCLUDES}/apr-1.0/ -- /usr/include/apr-0/ -- /usr/include/apr-1/ -- /usr/include/apr-1.0/ -- /usr/local/include/apr-0/ -- /usr/local/include/apr-1/ -- /usr/local/include/apr-1.0/ -+ HINTS ${SVN_INCLUDES} -+ PATHS /usr /usr/local -+ SUFFIXES apr-0 apr-1 apr-1.0 - ) - if(_INCLUDES) - set(SVN_INCLUDES ${SVN_INCLUDES} ${_INCLUDES}) -@@ -72,6 +69,25 @@ else(SVNCONFIG_EXECUTABLE) - set(SVN_FOUND FALSE) # no apr == can't compile! - endif(_INCLUDES) - endif(APRCONFIG_EXECUTABLE) -+ -+ # Use apu-config if it exists -+ if(APUCONFIG_EXECUTABLE) -+ EXEC_PROGRAM(${APUCONFIG_EXECUTABLE} ARGS --includes RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _INCLUDES) -+ string(REPLACE "-I" "" _INCLUDES ${_INCLUDES}) -+ string(REPLACE " " ";" _INCLUDES ${_INCLUDES}) -+ set(SVN_INCLUDES ${SVN_INCLUDES} ${_INCLUDES}) -+ else(APUCONFIG_EXECUTABLE) -+ FIND_PATH(_INCLUDES apu.h -+ HINTS ${SVN_INCLUDES} -+ PATHS /usr /usr/local -+ SUFFIXES apr-0 apr-1 apr-1.0 -+ ) -+ if(_INCLUDES) -+ set(SVN_INCLUDES ${SVN_INCLUDES} ${_INCLUDES}) -+ else(_INCLUDES) -+ set(SVN_FOUND FALSE) # no apr == can't compile! -+ endif(_INCLUDES) -+ endif(APUCONFIG_EXECUTABLE) - FIND_LIBRARY(SVN_LIBRARIES NAMES svn_client-1) - if(SVN_LIBRARIES) - FIND_LIBRARY(_LIBRARIES NAMES svn_subr-1) diff --git a/pkgs/desktops/kde-4.7/kdesdk/kapptemplate.nix b/pkgs/desktops/kde-4.7/kdesdk/kapptemplate.nix deleted file mode 100644 index 391536248dd..00000000000 --- a/pkgs/desktops/kde-4.7/kdesdk/kapptemplate.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "A KDE 4 project template generator"; - }; -} diff --git a/pkgs/desktops/kde-4.7/kdesdk/kcachegrind.nix b/pkgs/desktops/kde-4.7/kdesdk/kcachegrind.nix deleted file mode 100644 index 65d410cca48..00000000000 --- a/pkgs/desktops/kde-4.7/kdesdk/kcachegrind.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "KDE Frontend for Callgrind/Cachegrind"; - }; -} diff --git a/pkgs/desktops/kde-4.7/kdesdk/kdeaccounts-plugin.nix b/pkgs/desktops/kde-4.7/kdesdk/kdeaccounts-plugin.nix deleted file mode 100644 index 7e170ca2a2c..00000000000 --- a/pkgs/desktops/kde-4.7/kdesdk/kdeaccounts-plugin.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs, kdepimlibs }: - -kde { - buildInputs = [ kdelibs kdepimlibs ]; - - meta = { - description = "KDE accounts akonadi agent"; - }; -} diff --git a/pkgs/desktops/kde-4.7/kdesdk/kioslave-perldoc.nix b/pkgs/desktops/kde-4.7/kdesdk/kioslave-perldoc.nix deleted file mode 100644 index 6a10bdf7c4b..00000000000 --- a/pkgs/desktops/kde-4.7/kdesdk/kioslave-perldoc.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ kde, kdelibs, perl }: - -kde { - buildInputs = [ kdelibs perl ]; - - cmakeFlags = [ "-DBUILD_perldoc=ON" ]; - - meta = { - description = "perldoc: kioslave"; - }; -} diff --git a/pkgs/desktops/kde-4.7/kdesdk/kioslave-svn.nix b/pkgs/desktops/kde-4.7/kdesdk/kioslave-svn.nix deleted file mode 100644 index db0bd27094b..00000000000 --- a/pkgs/desktops/kde-4.7/kdesdk/kioslave-svn.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ kde, kdelibs, subversionClient, apr, aprutil }: - -kde { - buildInputs = [ kdelibs subversionClient apr aprutil ]; - - patches = [ ./find-svn.patch ]; - - meta = { - description = "Subversion kioslave"; - }; -} diff --git a/pkgs/desktops/kde-4.7/kdesdk/kmtrace.nix b/pkgs/desktops/kde-4.7/kdesdk/kmtrace.nix deleted file mode 100644 index d580f7fb691..00000000000 --- a/pkgs/desktops/kde-4.7/kdesdk/kmtrace.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ kde, kdelibs, gcc }: - -kde { - buildInputs = [ kdelibs ]; - - preConfigure = "export CMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH:${gcc}:${gcc.gcc}"; - - meta = { - description = "KDE mtrace-based malloc debugger"; - }; -} diff --git a/pkgs/desktops/kde-4.7/kdesdk/kompare.nix b/pkgs/desktops/kde-4.7/kdesdk/kompare.nix deleted file mode 100644 index 1ddb4b8ea5b..00000000000 --- a/pkgs/desktops/kde-4.7/kdesdk/kompare.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "A program to view the differences between files and optionally generate a diff"; - }; -} diff --git a/pkgs/desktops/kde-4.7/kdesdk/kpartloader.nix b/pkgs/desktops/kde-4.7/kdesdk/kpartloader.nix deleted file mode 100644 index e7790d33c90..00000000000 --- a/pkgs/desktops/kde-4.7/kdesdk/kpartloader.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "A test application for KParts"; - }; -} diff --git a/pkgs/desktops/kde-4.7/kdesdk/kprofilemethod.nix b/pkgs/desktops/kde-4.7/kdesdk/kprofilemethod.nix deleted file mode 100644 index 5a6693f2f5d..00000000000 --- a/pkgs/desktops/kde-4.7/kdesdk/kprofilemethod.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "A macro for profiling using QTime"; - }; -} diff --git a/pkgs/desktops/kde-4.7/kdesdk/kstartperf.nix b/pkgs/desktops/kde-4.7/kdesdk/kstartperf.nix deleted file mode 100644 index 0c8259cd31f..00000000000 --- a/pkgs/desktops/kde-4.7/kdesdk/kstartperf.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs, libtool }: - -kde { - buildInputs = [ kdelibs libtool ]; - - meta = { - description = "Measures start up time of a KDE application"; - }; -} diff --git a/pkgs/desktops/kde-4.7/kdesdk/kuiviewer.nix b/pkgs/desktops/kde-4.7/kdesdk/kuiviewer.nix deleted file mode 100644 index 7c5089dcd37..00000000000 --- a/pkgs/desktops/kde-4.7/kdesdk/kuiviewer.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "Displays Qt Designer's UI files"; - }; -} diff --git a/pkgs/desktops/kde-4.7/kdesdk/lokalize.nix b/pkgs/desktops/kde-4.7/kdesdk/lokalize.nix deleted file mode 100644 index 1565426eb1f..00000000000 --- a/pkgs/desktops/kde-4.7/kdesdk/lokalize.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ kde, kdelibs, hunspell }: - -kde { - buildInputs = [ kdelibs hunspell ]; - - meta = { - description = "KDE 4 Computer-aided translation system"; - longDescription = '' - Computer-aided translation system. - Do not translate what had already been translated. - ''; - }; -} diff --git a/pkgs/desktops/kde-4.7/kdesdk/okteta.nix b/pkgs/desktops/kde-4.7/kdesdk/okteta.nix deleted file mode 100644 index 1b53a0e03dc..00000000000 --- a/pkgs/desktops/kde-4.7/kdesdk/okteta.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ kde, kdelibs, qca2 }: - -kde { - buildInputs = [ kdelibs qca2 ]; - -# TODO: Look what does -DBUILD_mobile add - - meta = { - description = "KDE byte editor"; - }; -} diff --git a/pkgs/desktops/kde-4.7/kdesdk/poxml.nix b/pkgs/desktops/kde-4.7/kdesdk/poxml.nix deleted file mode 100644 index 1ab9ed49df5..00000000000 --- a/pkgs/desktops/kde-4.7/kdesdk/poxml.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs, antlr }: - -kde { - buildInputs = [ kdelibs antlr ]; - - meta = { - description = "Po<->xml tools"; - }; -} diff --git a/pkgs/desktops/kde-4.7/kdesdk/scripts.nix b/pkgs/desktops/kde-4.7/kdesdk/scripts.nix deleted file mode 100644 index df81145e5d6..00000000000 --- a/pkgs/desktops/kde-4.7/kdesdk/scripts.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "Various scripts to ease KDE development"; - }; -} diff --git a/pkgs/desktops/kde-4.7/kdesdk/strigi-analyzer.nix b/pkgs/desktops/kde-4.7/kdesdk/strigi-analyzer.nix deleted file mode 100644 index 0ad48c8cfde..00000000000 --- a/pkgs/desktops/kde-4.7/kdesdk/strigi-analyzer.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "Strigi analyzers for diff, po and ts"; - kde = { - name = "strigi-analyzer"; - module = "kdesdk"; - }; - }; -} diff --git a/pkgs/desktops/kde-4.7/kdesdk/umbrello.nix b/pkgs/desktops/kde-4.7/kdesdk/umbrello.nix deleted file mode 100644 index e83a2d9a901..00000000000 --- a/pkgs/desktops/kde-4.7/kdesdk/umbrello.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs, libxml2, libxslt, boost }: - -kde { - buildInputs = [ kdelibs libxml2 libxslt boost ]; - - meta = { - description = "Umbrello UML modeller"; - }; -} diff --git a/pkgs/desktops/kde-4.7/kdetoys/amor.nix b/pkgs/desktops/kde-4.7/kdetoys/amor.nix deleted file mode 100644 index 936d63d544a..00000000000 --- a/pkgs/desktops/kde-4.7/kdetoys/amor.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "KDE creature for your desktop"; - }; -} diff --git a/pkgs/desktops/kde-4.7/kdetoys/kteatime.nix b/pkgs/desktops/kde-4.7/kdetoys/kteatime.nix deleted file mode 100644 index dacf54def4b..00000000000 --- a/pkgs/desktops/kde-4.7/kdetoys/kteatime.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "KDE utility for making a fine cup of tea"; - }; -} diff --git a/pkgs/desktops/kde-4.7/kdetoys/ktux.nix b/pkgs/desktops/kde-4.7/kdetoys/ktux.nix deleted file mode 100644 index 108f9be7c72..00000000000 --- a/pkgs/desktops/kde-4.7/kdetoys/ktux.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs, kde_workspace }: - -kde { - buildInputs = [ kdelibs kde_workspace ]; - - meta = { - description = "Tux Screen Saver"; - }; -} diff --git a/pkgs/desktops/kde-4.7/kdeutils/ark.nix b/pkgs/desktops/kde-4.7/kdeutils/ark.nix deleted file mode 100644 index 7fbdaf586d6..00000000000 --- a/pkgs/desktops/kde-4.7/kdeutils/ark.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs, libarchive, bzip2, kde_baseapps }: - -kde { - buildInputs = [ kdelibs kde_baseapps libarchive bzip2 ]; - - meta = { - description = "KDE Archiving Tool"; - }; -} diff --git a/pkgs/desktops/kde-4.7/kdeutils/filelight.nix b/pkgs/desktops/kde-4.7/kdeutils/filelight.nix deleted file mode 100644 index 25ecabed27c..00000000000 --- a/pkgs/desktops/kde-4.7/kdeutils/filelight.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "Tool to visualise file and directory sizes"; - }; -} diff --git a/pkgs/desktops/kde-4.7/kdeutils/kcalc.nix b/pkgs/desktops/kde-4.7/kdeutils/kcalc.nix deleted file mode 100644 index 08b202e8f0e..00000000000 --- a/pkgs/desktops/kde-4.7/kdeutils/kcalc.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs, gmp }: - -kde { - buildInputs = [ kdelibs gmp ]; - - meta = { - description = "KDE Calculator"; - }; -} diff --git a/pkgs/desktops/kde-4.7/kdeutils/kcharselect.nix b/pkgs/desktops/kde-4.7/kdeutils/kcharselect.nix deleted file mode 100644 index d4c9c06f483..00000000000 --- a/pkgs/desktops/kde-4.7/kdeutils/kcharselect.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "KDE character selection utility"; - }; -} diff --git a/pkgs/desktops/kde-4.7/kdeutils/kdf.nix b/pkgs/desktops/kde-4.7/kdeutils/kdf.nix deleted file mode 100644 index 3f9da58d0a6..00000000000 --- a/pkgs/desktops/kde-4.7/kdeutils/kdf.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "KDE free disk space utility"; - }; -} diff --git a/pkgs/desktops/kde-4.7/kdeutils/kfloppy.nix b/pkgs/desktops/kde-4.7/kdeutils/kfloppy.nix deleted file mode 100644 index 2434a4fa671..00000000000 --- a/pkgs/desktops/kde-4.7/kdeutils/kfloppy.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "Floppy disk formatting utility"; - }; -} diff --git a/pkgs/desktops/kde-4.7/kdeutils/kgpg.nix b/pkgs/desktops/kde-4.7/kdeutils/kgpg.nix deleted file mode 100644 index f3b00a5b968..00000000000 --- a/pkgs/desktops/kde-4.7/kdeutils/kgpg.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs, kdepimlibs }: - -kde { - buildInputs = [ kdelibs kdepimlibs ]; - - meta = { - description = "Simple KDE GUI for GPG"; - }; -} diff --git a/pkgs/desktops/kde-4.7/kdeutils/kremotecontrol.nix b/pkgs/desktops/kde-4.7/kdeutils/kremotecontrol.nix deleted file mode 100644 index fef516e478d..00000000000 --- a/pkgs/desktops/kde-4.7/kdeutils/kremotecontrol.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs, kde_workspace, libXtst }: - -kde { - buildInputs = [ kdelibs kde_workspace libXtst ]; - - meta = { - description = "KDE remote control"; - }; -} diff --git a/pkgs/desktops/kde-4.7/kdeutils/ktimer.nix b/pkgs/desktops/kde-4.7/kdeutils/ktimer.nix deleted file mode 100644 index 5700977349e..00000000000 --- a/pkgs/desktops/kde-4.7/kdeutils/ktimer.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "KDE Timer"; - }; -} diff --git a/pkgs/desktops/kde-4.7/kdeutils/kwallet.nix b/pkgs/desktops/kde-4.7/kdeutils/kwallet.nix deleted file mode 100644 index 9ec0e6c0396..00000000000 --- a/pkgs/desktops/kde-4.7/kdeutils/kwallet.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "KDE Wallet (password storage) management tool"; - }; -} diff --git a/pkgs/desktops/kde-4.7/kdeutils/printer-applet.nix b/pkgs/desktops/kde-4.7/kdeutils/printer-applet.nix deleted file mode 100644 index 2d937b3a4db..00000000000 --- a/pkgs/desktops/kde-4.7/kdeutils/printer-applet.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ kde, kdelibs -, pythonPackages, sip, pyqt4, pykde4, pycups, rhpl, system_config_printer -, pythonDBus, makeWrapper }: - -let s_c_p = system_config_printer.override { withGUI = false; }; in - -kde rec { - buildInputs = [ kdelibs pythonPackages.python pythonPackages.wrapPython - ] ++ pythonPath; - - pythonPath = [ pyqt4 pykde4 pycups s_c_p ]; - - passthru.propagatedUserEnvPackages = [ s_c_p ]; - - postInstall = - '' - wrapPythonPrograms - - # ‘system-config-printer’ supplies some D-Bus policy that we need. - mkdir -p $out/nix-support - echo ${s_c_p} > $out/nix-support/propagated-user-env-packages - ''; - - meta = { - description = "KDE printer applet"; - longDescription = "Applet to view current print jobs and configure new printers"; - }; -} diff --git a/pkgs/desktops/kde-4.7/kdeutils/superkaramba.nix b/pkgs/desktops/kde-4.7/kdeutils/superkaramba.nix deleted file mode 100644 index 4dce768078b..00000000000 --- a/pkgs/desktops/kde-4.7/kdeutils/superkaramba.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ kde, kdelibs, qimageblitz }: - -kde { - buildInputs = [ kdelibs qimageblitz ]; - - cmakeFlags = [ "-DBUILD_icons=TRUE" "-DBUILD_plasma=TRUE" ]; - - meta = { - description = "A KDE Eye-candy Application"; - }; -} diff --git a/pkgs/desktops/kde-4.7/kdeutils/sweeper.nix b/pkgs/desktops/kde-4.7/kdeutils/sweeper.nix deleted file mode 100644 index 78d56c7df30..00000000000 --- a/pkgs/desktops/kde-4.7/kdeutils/sweeper.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "Helps clean unwanted traces the user leaves on the system"; - }; -} diff --git a/pkgs/desktops/kde-4.7/kdewebdev/kfilereplace.nix b/pkgs/desktops/kde-4.7/kdewebdev/kfilereplace.nix deleted file mode 100644 index c3f6129d7e5..00000000000 --- a/pkgs/desktops/kde-4.7/kdewebdev/kfilereplace.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ kde, kdelibs, libxml2, libxslt }: - -kde { - buildInputs = [ kdelibs libxml2 libxslt ]; - - meta = { - description = "Batch search and replace tool"; - homepage = http://www.kdewebdev.org; - }; -} diff --git a/pkgs/desktops/kde-4.7/kdewebdev/kimagemapeditor.nix b/pkgs/desktops/kde-4.7/kdewebdev/kimagemapeditor.nix deleted file mode 100644 index bececea7797..00000000000 --- a/pkgs/desktops/kde-4.7/kdewebdev/kimagemapeditor.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ kde, kdelibs, libxml2, libxslt }: - -kde { - buildInputs = [ kdelibs libxml2 libxslt ]; - - meta = { - description = "An HTML imagemap editor"; - homepage = http://www.nongnu.org/kimagemap/; - }; -} diff --git a/pkgs/desktops/kde-4.7/kdewebdev/klinkstatus.nix b/pkgs/desktops/kde-4.7/kdewebdev/klinkstatus.nix deleted file mode 100644 index 94adbb7fd6e..00000000000 --- a/pkgs/desktops/kde-4.7/kdewebdev/klinkstatus.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ kde, kdelibs, libxml2, libxslt, kdepimlibs -, boost, htmlTidy }: - -kde { - buildInputs = - [ kdelibs libxml2 libxslt kdepimlibs boost htmlTidy ]; - - meta = { - description = "A KDE link checker"; - homepage = http://klinkstatus.kdewebdev.org; - }; -} diff --git a/pkgs/desktops/kde-4.7/kdewebdev/kommander.nix b/pkgs/desktops/kde-4.7/kdewebdev/kommander.nix deleted file mode 100644 index 6a870e56303..00000000000 --- a/pkgs/desktops/kde-4.7/kdewebdev/kommander.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs, libxml2, libxslt }: - -kde { - buildInputs = [ kdelibs libxml2 libxslt ]; - - meta = { - description = "A graphical editor of scripted dialogs"; - }; -} diff --git a/pkgs/desktops/kde-4.7/l10n/default.nix b/pkgs/desktops/kde-4.7/l10n/default.nix deleted file mode 100644 index 69cfdcf8ab2..00000000000 --- a/pkgs/desktops/kde-4.7/l10n/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ stdenv, fetchurl, kdelibs, gettext, release, stable }: - -let - - inherit (stdenv.lib) attrByPath singleton; - - kdeL10nDerivation = - { lang, saneName, sha256 }: - - stdenv.mkDerivation rec { - name = "kde-l10n-${saneName}-${release}"; - - src = fetchurl { - url = "mirror://kde/${if stable then "" else "un"}stable/${release}/src/kde-l10n/kde-l10n-${lang}-${release}.tar.bz2"; - name = "${name}.tar.bz2"; - inherit sha256; - }; - - buildInputs = [ gettext kdelibs ]; - - cmakeFlags = "-Wno-dev"; - - meta = { - description = "KDE translation for ${lang}"; - license = "GPL"; - inherit (kdelibs.meta) maintainers platforms homepage; - }; - }; - - kdeL10nRelease = - builtins.listToAttrs ( - map ({lang, saneName, sha256}: - { - name = saneName; - value = kdeL10nDerivation { inherit lang saneName sha256; }; - } - ) (import (./manifest + "-${release}.nix")) - ); - -in -{ - inherit kdeL10nDerivation; - recurseForDerivations = true; -} // kdeL10nRelease diff --git a/pkgs/desktops/kde-4.7/l10n/l10n-manifest.sh b/pkgs/desktops/kde-4.7/l10n/l10n-manifest.sh deleted file mode 100755 index cc0eec20aaa..00000000000 --- a/pkgs/desktops/kde-4.7/l10n/l10n-manifest.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh - -# Usage: download kde-l10n to $dir, then run -# $0 $dir - -dir=$1 - -if [[ ! -d "${dir}" ]]; then - echo "${dir} is not a directory (or doesn't exist)!" >&2 - exit 1 -fi - -release=$(ls "${dir}"/kde-l10n-en_GB-*.tar.bz2 | \ - sed -e 's/.*en_GB-//' -e 's/\.tar\.bz2//') - -echo "Detected release ${release}" >&2 - -exec > "manifest-${release}.nix" -echo "[" -for i in `cd "${dir}"; ls kde-l10n-*-${release}.tar.bz2`; do - lang=${i%-${release}.tar.bz2} - lang=${lang#kde-l10n-} - echo -n "${lang}.. " >&2 - hash=$(nix-hash --type sha256 --flat --base32 "${dir}/${i}") - echo "{" - echo " lang = \"${lang}\";" - echo " saneName = \"$(echo $lang | sed s^@^_^g)\";" - echo " sha256 = \"${hash}\";" - echo "}" - echo $hash >&2 -done -echo "]" diff --git a/pkgs/desktops/kde-4.7/l10n/manifest-4.7.4.nix b/pkgs/desktops/kde-4.7/l10n/manifest-4.7.4.nix deleted file mode 100644 index a128ff8dc62..00000000000 --- a/pkgs/desktops/kde-4.7/l10n/manifest-4.7.4.nix +++ /dev/null @@ -1,267 +0,0 @@ -[ -{ - lang = "ar"; - saneName = "ar"; - sha256 = "1iw8x8k31jrgqc8nq276iwca1dgicz9vcx58rfbnk924dvqrflpv"; -} -{ - lang = "bg"; - saneName = "bg"; - sha256 = "07i4s6jkfkw59mr5n4256rzwy64y1c5wy957jbvnidqcrpzh1azf"; -} -{ - lang = "bs"; - saneName = "bs"; - sha256 = "080svc26zqf45wra6d6ljxzgs8f6gzl567wm73yp5qrgqnvyvxir"; -} -{ - lang = "ca"; - saneName = "ca"; - sha256 = "04fz56hsrpl6mxsbw5ja7armf8zbib542d7iv4p4c87xncib13qj"; -} -{ - lang = "ca@valencia"; - saneName = "ca_valencia"; - sha256 = "01mi1d6yz5w122bcjzp3r8g70pzil6216sv2y2dxaqjlxpdllklp"; -} -{ - lang = "cs"; - saneName = "cs"; - sha256 = "0l1rwx1k0vpkfc52divm5cnwxr05mwcl1sr84mi24s2ygs6rk8ib"; -} -{ - lang = "da"; - saneName = "da"; - sha256 = "1r2pzkvs1rc8hfzi5q0p6drvkl1ykq89bzi3k73i3fghx42qdxv6"; -} -{ - lang = "de"; - saneName = "de"; - sha256 = "100589wkw5rdcihk1nwl4i0bc30bq3b289n03q9lgf8zadflrrg9"; -} -{ - lang = "el"; - saneName = "el"; - sha256 = "0q41lpkf8srjxrrcnw9c7rkc83m4jw3r7z6s8x9rn0d5h2l36gv8"; -} -{ - lang = "en_GB"; - saneName = "en_GB"; - sha256 = "0mmvr3fh51r958myc18nxvl7d8hsm4wl70vmac3a3w47mr9aayqi"; -} -{ - lang = "es"; - saneName = "es"; - sha256 = "11k8svvnph9431maxdhzr334h7h11jk681fb2z1hb7i6cprmac9f"; -} -{ - lang = "et"; - saneName = "et"; - sha256 = "0pvjfkh93avkg9dii5byjh3kiqcgax9dfw97jmy6qccicgq6frvd"; -} -{ - lang = "eu"; - saneName = "eu"; - sha256 = "0gnnr7nyxjrzf632zs1k3j4bss3gm5qadfm2jki41y9q1f82vy99"; -} -{ - lang = "fi"; - saneName = "fi"; - sha256 = "0mfrmqn1yiqrgq79bgbb8799myv5h30g1gr83xja9g9y0lb645bs"; -} -{ - lang = "fr"; - saneName = "fr"; - sha256 = "03d6xbc7h9gslzvx1q7lcb8bfr5w8809jfb6cn4zv36in593wq85"; -} -{ - lang = "ga"; - saneName = "ga"; - sha256 = "13m7rdz2gd1cag2x6hfzyv8xj5777fly5f9pyhr28hrafyqc44l5"; -} -{ - lang = "gl"; - saneName = "gl"; - sha256 = "1ryimhlddxwaa40si3j0id37xm845ybsfkck0i7x2kmg87a55wcz"; -} -{ - lang = "he"; - saneName = "he"; - sha256 = "01v4vkbyhbsv64z7mnj129ss1rnr00n19iiza0ivjzsbzryhh3p2"; -} -{ - lang = "hr"; - saneName = "hr"; - sha256 = "0s2a4nc3z03xj8za426arwr1cjqqcd6pq82lc9q0kiv2fpxgagxw"; -} -{ - lang = "hu"; - saneName = "hu"; - sha256 = "0sv4fsnnnnpnf14s7fv83g9kzqq31gl0647cy523xkyxpdwhj9hp"; -} -{ - lang = "ia"; - saneName = "ia"; - sha256 = "0k9gzxiyplvk78nqk3kmqh74lani6iqciyighii1m0cvylq5sljz"; -} -{ - lang = "id"; - saneName = "id"; - sha256 = "16l4wif0qsmvpikagkhfyh98wdss4w0imixnzawadx0jq5mac6ga"; -} -{ - lang = "is"; - saneName = "is"; - sha256 = "1g5pan1iy2mx43z5gxvp07n3a9yrc56y4pya2r9g6wjnzcp0ynbj"; -} -{ - lang = "it"; - saneName = "it"; - sha256 = "0p0grhjx04khqmih8gmlpgjazr8asv7ql1gj965sjaf8a6z1h5ar"; -} -{ - lang = "ja"; - saneName = "ja"; - sha256 = "1f6ig8x3siqww4bwldpgncpyhlmkf6hbd6ahlvd5dqn6hqpknygx"; -} -{ - lang = "kk"; - saneName = "kk"; - sha256 = "0kyhr0b5g842dds59l3rcvyq3n12xx11svcqbqhiqqm3a8qki9vi"; -} -{ - lang = "km"; - saneName = "km"; - sha256 = "02ss6rxqf71n06a769l0xky30nhyqdhhsad9lmxs0dbbnxdcnixr"; -} -{ - lang = "kn"; - saneName = "kn"; - sha256 = "0rk193a27hvh63lfb7yy8g0wxb05kymyqnhdxcmai3wk2n53bi9y"; -} -{ - lang = "ko"; - saneName = "ko"; - sha256 = "0wyplpkkq6mdm5k7jxxppwgrm4rrb5mbhagszg1y460rcx7d5vcm"; -} -{ - lang = "lt"; - saneName = "lt"; - sha256 = "08767csx7sq02jkkrdl16jj7jprqc3qbsz7vdcwli3274qjkdk9s"; -} -{ - lang = "lv"; - saneName = "lv"; - sha256 = "0f4mxjsg2ipsj57ki26n870zxnk28z9ayblzgmv821xiawjaa4gc"; -} -{ - lang = "nb"; - saneName = "nb"; - sha256 = "1myb1b4p849nvb4q2n5hcy5fsfb4zdvhc5vkwa2giiy0pv230cmm"; -} -{ - lang = "nds"; - saneName = "nds"; - sha256 = "1vm6fjac0aaxls0rlgz4s804kbarj1rzyli50dzfcfqwngzkckxk"; -} -{ - lang = "nl"; - saneName = "nl"; - sha256 = "02v0cscngl7wfsl7yc2xr1a593qq064spgk1ynzad1rz1g98z212"; -} -{ - lang = "nn"; - saneName = "nn"; - sha256 = "01s1kfp5x036hcpyl87qzqjlmjwp8hda3qplnj3inihias2cnvb7"; -} -{ - lang = "pa"; - saneName = "pa"; - sha256 = "0al2lwvj23rp1plg2ykakbgw6qzxkkd5pd2nqdfnaif9xq9fp9db"; -} -{ - lang = "pl"; - saneName = "pl"; - sha256 = "08fffsaay01dnbs7bg3w325bknjcfbp3f1ryrdy2g7w2achyakls"; -} -{ - lang = "pt"; - saneName = "pt"; - sha256 = "03klc7q1h0xxc43vqw2m87n4wzxg140ql7mlzrjsrdnqgx2pvch4"; -} -{ - lang = "pt_BR"; - saneName = "pt_BR"; - sha256 = "1g4nd48fzfxam8zsi0imw57lhjm7i7qifqmy53s7pfr4cmq4fbw5"; -} -{ - lang = "ro"; - saneName = "ro"; - sha256 = "112pj6bi1bagafh89322mdj8ynmljv0ry7z2zss4ljfhqxxndc6b"; -} -{ - lang = "ru"; - saneName = "ru"; - sha256 = "1i4fx5mrz9910wkfgi885gjafcspnk8nyx7cimkvnp6y2xwpl733"; -} -{ - lang = "si"; - saneName = "si"; - sha256 = "0h77cqi9cmzni4mn7k91ar56b9ph8dlyagn29wd958hpkxwbdqiw"; -} -{ - lang = "sk"; - saneName = "sk"; - sha256 = "1q8bxlaah7afs12ni8xpjj6nlxjmxfpzabavm7ixqwnn4l732vyn"; -} -{ - lang = "sl"; - saneName = "sl"; - sha256 = "0508w2k4g7f9dm0ds28h5hhxd5qc4w16zxqskygrs6144567hb0c"; -} -{ - lang = "sr"; - saneName = "sr"; - sha256 = "0bvbzah338bh8vnn2ppakd8zb49vcc7d95ahyahrkqc4ls5z60sv"; -} -{ - lang = "sv"; - saneName = "sv"; - sha256 = "1glgb7shn3qlszayyc11wjhbc5g29agq2rlwf45drk2b5fi2m8bn"; -} -{ - lang = "th"; - saneName = "th"; - sha256 = "0g3pgrsb3d33295nw45y0a318yb4bvld46xvjsd3ay8hxpxrf4yy"; -} -{ - lang = "tr"; - saneName = "tr"; - sha256 = "02k1jakxwj5zp0z7x8yrjrl17syzv6rfyscal6af5bavjsx99kxp"; -} -{ - lang = "ug"; - saneName = "ug"; - sha256 = "0wq1jlxwz2avqzb9yqnck69qkfy3q7cq76i2jadbfdvwk06w44bi"; -} -{ - lang = "uk"; - saneName = "uk"; - sha256 = "0813bmgi9k3kx2k8rl8h1l9p6zcnabk36p7nm8v9vb4v7d52cyds"; -} -{ - lang = "wa"; - saneName = "wa"; - sha256 = "14slp0ybjbsm62misrp9qni5pzw4pzz3zznzc49z0a7yfni9i6av"; -} -{ - lang = "zh_CN"; - saneName = "zh_CN"; - sha256 = "18jfbz2h8jjby48hwjyrd9yn3k7xbp58g28psmlhsg2m3f8mr669"; -} -{ - lang = "zh_TW"; - saneName = "zh_TW"; - sha256 = "09mfspiy3ihg0n6paqhp0g1srl60sxrkxgha536624kbrbwp1jpq"; -} -] diff --git a/pkgs/desktops/kde-4.7/oxygen-icons.nix b/pkgs/desktops/kde-4.7/oxygen-icons.nix deleted file mode 100644 index 1f7572b4d8e..00000000000 --- a/pkgs/desktops/kde-4.7/oxygen-icons.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ kde, cmake }: - -kde { - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = "0c12c72bcf41cfaf03f85fc1ae27e44d8cecac3deb504ab1de4c30f4fc9e3cd0"; - - nativeBuildInputs = [ cmake ]; - - meta = { - description = "KDE Oxygen theme icons"; - longDescription = "Icons for KDE's default theme"; - license = "GPL"; - }; -} diff --git a/pkgs/desktops/kde-4.7/support/akonadi/default.nix b/pkgs/desktops/kde-4.7/support/akonadi/default.nix deleted file mode 100644 index cf515509602..00000000000 --- a/pkgs/desktops/kde-4.7/support/akonadi/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchurl, cmake, qt4, shared_mime_info, libxslt, boost, automoc4, soprano }: - -stdenv.mkDerivation rec { - name = "akonadi-1.6.1"; - - src = fetchurl { - url = "mirror://kde/stable/akonadi/src/${name}.tar.bz2"; - sha256 = "0r8sw7m1pwqc7qkaczm0r8adqi1wvlhdp32gy3q5p5plq50xhgra"; - }; - - buildInputs = [ qt4 soprano libxslt boost ]; - - nativeBuildInputs = [ cmake automoc4 shared_mime_info ]; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - description = "KDE PIM Storage Service"; - license = "LGPL"; - homepage = http://pim.kde.org/akonadi; - maintainers = [ maintainers.sander maintainers.urkud ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dcae246f521..b76813099f0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9105,14 +9105,6 @@ let kde4 = recurseIntoAttrs pkgs.kde48; - kde47 = kdePackagesFor (pkgs.kde47 // { - boost = boost149; - eigen = eigen2; - libotr = libotr_3_2; - libgphoto2 = libgphoto2_4; - libcanberra = libcanberra_kde; - }) ../desktops/kde-4.7; - kde48 = kdePackagesFor (pkgs.kde48 // { boost = boost149; eigen = eigen2; From 8ebf53ce4cf55da6a37450ddae63c1d7892d9925 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 16 Jul 2013 22:37:11 +0200 Subject: [PATCH 508/798] Indent properly --- pkgs/top-level/all-packages.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b76813099f0..49e75a26b70 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2354,12 +2354,14 @@ let binutilsCross = null; })); - gcc46_multi = if system == "x86_64-linux" then lowPrio ( + gcc46_multi = + if system == "x86_64-linux" then lowPrio ( wrapGCCWith (import ../build-support/gcc-wrapper) glibc_multi (gcc46.gcc.override { - stdenv = overrideGCC stdenv (wrapGCCWith (import ../build-support/gcc-wrapper) glibc_multi gcc.gcc); - profiledCompiler = false; - enableMultilib = true; - })) else throw "Multilib gcc not supported on ‘${system}’"; + stdenv = overrideGCC stdenv (wrapGCCWith (import ../build-support/gcc-wrapper) glibc_multi gcc.gcc); + profiledCompiler = false; + enableMultilib = true; + })) + else throw "Multilib gcc not supported on ‘${system}’"; gcc47_real = lowPrio (wrapGCC (callPackage ../development/compilers/gcc/4.7 { inherit noSysDirs; From 54166165a690bd01953ef2c1b8257a5774f890e7 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 16 Jul 2013 22:38:36 +0200 Subject: [PATCH 509/798] Remove some unused GCC builds --- pkgs/top-level/all-packages.nix | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 49e75a26b70..ef0b595d153 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2283,12 +2283,6 @@ let cross = assert crossSystem != null; crossSystem; }; - gcc43_multi = lowPrio (wrapGCCWith (import ../build-support/gcc-wrapper) glibc_multi (gcc43.gcc.override { - stdenv = overrideGCC stdenv (wrapGCCWith (import ../build-support/gcc-wrapper) glibc_multi gcc); - profiledCompiler = false; - enableMultilib = true; - })); - gcc44 = lowPrio (wrapGCC (makeOverridable (import ../development/compilers/gcc/4.4) { inherit fetchurl stdenv texinfo gmp mpfr /* ppl cloogppl */ gettext which noSysDirs; @@ -2314,17 +2308,6 @@ let else null; })); - # A non-stripped version of GCC. - gcc45_debug = lowPrio (wrapGCC (callPackage ../development/compilers/gcc/4.5 { - stripped = false; - - inherit noSysDirs; - - # bootstrapping a profiled compiler does not work in the sheevaplug: - # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43944 - profiledCompiler = !stdenv.system == "armv5tel-linux"; - })); - gcc46_real = lowPrio (wrapGCC (callPackage ../development/compilers/gcc/4.6 { inherit noSysDirs; From 20b4f0347e43c79340eb0b1fdde6c0f7d1f47def Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 16 Jul 2013 22:53:06 +0200 Subject: [PATCH 510/798] php: Update to 5.3.27, 5.4.17 CVE-2013-2110 --- pkgs/development/interpreters/php/5.3.nix | 6 +++--- pkgs/development/interpreters/php/5.4.nix | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/interpreters/php/5.3.nix b/pkgs/development/interpreters/php/5.3.nix index d879a611c2a..a84927a20f3 100644 --- a/pkgs/development/interpreters/php/5.3.nix +++ b/pkgs/development/interpreters/php/5.3.nix @@ -10,7 +10,7 @@ in composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in { - version = "5.3.25"; + version = "5.3.27"; name = "php-${version}"; @@ -217,8 +217,8 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) '' ); src = fetchurl { - url = "http://nl.php.net/get/php-${version}.tar.bz2/from/this/mirror"; - sha256 = "15dwks0823m0vc3qv58yxfvchwx9ydg5gjvjy8kpc5w3syras76m"; + url = "http://nl1.php.net/get/php-${version}.tar.bz2/from/this/mirror"; + sha256 = "11xj6v65m6l2lq2s2j5pq5l0iwjsnxmv1nad9hja50ivc8fb4bg1"; name = "php-${version}.tar.bz2"; }; diff --git a/pkgs/development/interpreters/php/5.4.nix b/pkgs/development/interpreters/php/5.4.nix index 6cb8c733601..327ee8063a1 100644 --- a/pkgs/development/interpreters/php/5.4.nix +++ b/pkgs/development/interpreters/php/5.4.nix @@ -9,7 +9,7 @@ in composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in { - version = "5.4.15"; + version = "5.4.17"; name = "php-${version}"; @@ -227,10 +227,10 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) src = fetchurl { urls = [ - "http://nl.php.net/get/php-${version}.tar.bz2/from/this/mirror" + "http://nl1.php.net/get/php-${version}.tar.bz2/from/this/mirror" "http://se1.php.net/get/php-${version}.tar.bz2/from/this/mirror" ]; - sha256 = "0dh159svdrakvm9nsyg3yyln7cqqzpxgs2163cqxplnc93d8a8id"; + sha256 = "1d3y69hvplaqif2fl5s1lwx0y0m55j8b8fwag6ngdld5hx9r6jfw"; name = "php-${version}.tar.bz2"; }; From b89cbe26a8e43a3cb5e6e863a6b82c35e8dca005 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 16 Jul 2013 20:33:28 -0400 Subject: [PATCH 511/798] Add tar nodePackage Signed-off-by: Shea Levy --- pkgs/top-level/node-packages-generated.nix | 44 ++++++++++++++-------- pkgs/top-level/node-packages.json | 1 + 2 files changed, 30 insertions(+), 15 deletions(-) diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix index 5adb589d522..f628e2513bc 100644 --- a/pkgs/top-level/node-packages-generated.nix +++ b/pkgs/top-level/node-packages-generated.nix @@ -2665,7 +2665,7 @@ { name = "mongoose"; spec = "*"; - version = "3.6.14"; + version = "3.6.15"; topLevel = true; dependencies = [ { name = "hooks"; spec = "0.2.1"; } @@ -2678,8 +2678,8 @@ { name = "regexp-clone"; spec = "0.0.1"; } ]; patchLatest = false; - sha1 = "acf28354ba4f792ded931ccd0dfe038a65757832"; - tarball = "http://registry.npmjs.org/mongoose/-/mongoose-3.6.14.tgz"; + sha1 = "272f1575da3b48ec31467abdf15baa61854ba5f1"; + tarball = "http://registry.npmjs.org/mongoose/-/mongoose-3.6.15.tgz"; } { name = "mongoose-schema-extend"; @@ -3155,7 +3155,7 @@ { name = "npm2nix"; spec = "*"; - version = "2.0.0"; + version = "2.0.1"; topLevel = true; dependencies = [ { name = "semver"; spec = ">=2.0.10 <3.0.0"; } @@ -3164,8 +3164,8 @@ { name = "npmconf"; spec = "0.1.1"; } ]; patchLatest = false; - sha1 = "9e1ff781524ee313bf64e3b5f390e90ced87ae6d"; - tarball = "http://registry.npmjs.org/npm2nix/-/npm2nix-2.0.0.tgz"; + sha1 = "bf50c8436339d309446582810ce0fff07f307d04"; + tarball = "http://registry.npmjs.org/npm2nix/-/npm2nix-2.0.1.tgz"; } { name = "npmconf"; @@ -4493,26 +4493,26 @@ { name = "source-map"; spec = "*"; - version = "0.1.25"; + version = "0.1.26"; topLevel = true; dependencies = [ { name = "amdefine"; spec = ">=0.0.4"; } ]; patchLatest = false; - sha1 = "5851545c1f4a40243829065c20e6f40b023fba1a"; - tarball = "http://registry.npmjs.org/source-map/-/source-map-0.1.25.tgz"; + sha1 = "4cce2dcb5fa02cfe1b4cf32cc83962b1b3997560"; + tarball = "http://registry.npmjs.org/source-map/-/source-map-0.1.26.tgz"; } { name = "source-map"; spec = "~0.1.7"; - version = "0.1.25"; + version = "0.1.26"; topLevel = false; dependencies = [ { name = "amdefine"; spec = ">=0.0.4"; } ]; patchLatest = false; - sha1 = "5851545c1f4a40243829065c20e6f40b023fba1a"; - tarball = "http://registry.npmjs.org/source-map/-/source-map-0.1.25.tgz"; + sha1 = "4cce2dcb5fa02cfe1b4cf32cc83962b1b3997560"; + tarball = "http://registry.npmjs.org/source-map/-/source-map-0.1.26.tgz"; } { name = "spdy"; @@ -4666,6 +4666,20 @@ sha1 = "2987b1ce2bd2f38b0dce2a34388884bfa4400ea7"; tarball = "http://registry.npmjs.org/sylvester/-/sylvester-0.0.21.tgz"; } + { + name = "tar"; + spec = "*"; + version = "0.1.17"; + topLevel = true; + dependencies = [ + { name = "inherits"; spec = "1.x"; } + { name = "block-stream"; spec = "*"; } + { name = "fstream"; spec = "~0.1.8"; } + ]; + patchLatest = false; + sha1 = "408c8a95deb8e78a65b59b1a51a333183a32badc"; + tarball = "http://registry.npmjs.org/tar/-/tar-0.1.17.tgz"; + } { name = "tar"; spec = "0"; @@ -4885,13 +4899,13 @@ { name = "underscore.string"; spec = "~2.3.1"; - version = "2.3.2"; + version = "2.3.3"; topLevel = false; dependencies = [ ]; patchLatest = false; - sha1 = "c10835dc04c2677cd49e1d77d26c0d3b22cc5709"; - tarball = "http://registry.npmjs.org/underscore.string/-/underscore.string-2.3.2.tgz"; + sha1 = "71c08bf6b428b1133f37e78fa3a21c82f7329b0d"; + tarball = "http://registry.npmjs.org/underscore.string/-/underscore.string-2.3.3.tgz"; } { name = "util"; diff --git a/pkgs/top-level/node-packages.json b/pkgs/top-level/node-packages.json index 08b4f36b482..06c8f541cc7 100644 --- a/pkgs/top-level/node-packages.json +++ b/pkgs/top-level/node-packages.json @@ -62,4 +62,5 @@ , "stylus" , "npm" , "gridfs-stream" +, "tar" ] From 0f096b70d09dfa14e345e2a75d4dbebef84d034a Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 17 Jul 2013 05:34:18 +0200 Subject: [PATCH 512/798] python-hetzner: Update to new version 0.4.0. This introduces the following changes: - Validate Robot's SSL server certificates. - Admin accounts can new be managed with the "admin" property of a server instance. - Better and fixed up error reporting. Signed-off-by: aszlig --- 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 741d2549258..b5c98051d41 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2128,12 +2128,12 @@ pythonPackages = python.modules // rec { hetzner = buildPythonPackage rec { name = "hetzner-${version}"; - version = "0.3.0"; + version = "0.4.0"; src = fetchurl { url = "https://github.com/RedMoonStudios/hetzner/archive/" + "v${version}.tar.gz"; - sha256 = "10ywn7jbrv86ippf3bpbf01a4jnalwkkd0k7kxc39a55mfbx5s7d"; + sha256 = "1dzmb4k83cc6dqvxrk2vxvrhgi4x45b6yzs5jvyfjhgl5daisv4b"; }; # not there yet, but coming soon. From 87444bc28181c663e02dc45e6f5b476a086db014 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 17 Jul 2013 08:16:24 +0200 Subject: [PATCH 513/798] fix tarball after 541661 --- pkgs/top-level/release-small.nix | 1 - pkgs/top-level/release.nix | 1 - 2 files changed, 2 deletions(-) diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix index 7743f4d0d27..f7fc9932f67 100644 --- a/pkgs/top-level/release-small.nix +++ b/pkgs/top-level/release-small.nix @@ -52,7 +52,6 @@ with (import ./release-lib.nix); gcc33 = linux; gcc34 = linux; gcc42 = linux; - gcc43_multi = ["x86_64-linux"]; gcc44 = linux; gcj44 = linux; ghdl = linux; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 8a711d56405..9734adc3497 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -115,7 +115,6 @@ let gcc33 = linux; gcc34 = linux; gcc42 = linux; - gcc43_multi = ["x86_64-linux"]; gcc44 = linux; gcj44 = linux; ghdl = linux; From b9729fb4d49f1efb8e39fee83c2f133d30415094 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 17 Jul 2013 10:49:25 +0200 Subject: [PATCH 514/798] python-hetzner: Update to new version 0.4.1. Small bugfix release, changes: - Don't include colons when generating passwords for admin logins. Signed-off-by: aszlig --- 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 b5c98051d41..b223d941196 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2128,12 +2128,12 @@ pythonPackages = python.modules // rec { hetzner = buildPythonPackage rec { name = "hetzner-${version}"; - version = "0.4.0"; + version = "0.4.1"; src = fetchurl { url = "https://github.com/RedMoonStudios/hetzner/archive/" + "v${version}.tar.gz"; - sha256 = "1dzmb4k83cc6dqvxrk2vxvrhgi4x45b6yzs5jvyfjhgl5daisv4b"; + sha256 = "1x48r3n818iyzyb0a5jpcrq1rgdrpj3549kcv76wgpw4f7hi0b76"; }; # not there yet, but coming soon. From eec9e56226019ca182d42ee2b97837e6bcf25619 Mon Sep 17 00:00:00 2001 From: Oliver Charles Date: Wed, 17 Jul 2013 10:02:19 +0100 Subject: [PATCH 515/798] perlPackages.AnyEvent: new expression --- pkgs/top-level/perl-packages.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 8a060381aa4..36c38b578d3 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -98,6 +98,14 @@ rec { propagatedBuildInputs = [ pkgs.pkgconfig pkgs.gtk2 pkgs.wxGTK ]; }; + AnyEvent = buildPerlPackage { + name = "AnyEvent-7.04"; + src = fetchurl { + url = mirror://cpan/authors/id/M/ML/MLEHMANN/AnyEvent-7.04.tar.gz; + sha256 = "6a9d94fa61c7f5dc515c834eb224dbc6ce4123da8fd5bfa0cf3815f3f3e908b2"; + }; + }; + AnyMoose = buildPerlPackage rec { name = "Any-Moose-0.10"; src = fetchurl { @@ -6866,10 +6874,6 @@ rec { sha256 = "0i1mg3ivxhx09x0w06k15izc92bknwqwh0ghpmhlq9s9iw12mmry"; }; propagatedBuildInputs = [ URI ]; - meta = { - description = "Unknown"; - license = "unknown"; - }; }; Throwable = buildPerlPackage rec { From 9f347eba61b2fca5ae5ece21fa74af5d3024bfb3 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 17 Jul 2013 11:10:21 +0200 Subject: [PATCH 516/798] nvidia-x11: Fix building on older kernels The 3.10 patch breaks building on 3.4 at least. --- pkgs/os-specific/linux/nvidia-x11/default.nix | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index c7fc5c44c22..e4e9a2c0205 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -8,18 +8,24 @@ with stdenv.lib; -let versionNumber = "319.32"; - kernel310patch = fetchurl { - url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/nvidia-linux-3.10.patch?h=packages/nvidia"; - sha256 = "0nhzg6jdk9sf1vzj519gqi8a2n9xydhz2bcz472pss2cfgbc1ahb"; - }; +let -in stdenv.mkDerivation { + versionNumber = "319.32"; + kernel310patch = fetchurl { + url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/nvidia-linux-3.10.patch?h=packages/nvidia"; + sha256 = "0nhzg6jdk9sf1vzj519gqi8a2n9xydhz2bcz472pss2cfgbc1ahb"; + }; + +in + +stdenv.mkDerivation { name = "nvidia-x11-${versionNumber}${optionalString (!libsOnly) "-${kernelDev.version}"}"; builder = ./builder.sh; - patches = [ ./version-test.patch kernel310patch ]; + patches = + [ ./version-test.patch ] + ++ optional (!versionOlder kernelDev.version "3.10") kernel310patch; src = if stdenv.system == "i686-linux" then From 329a70500595e17729931781f411ec8a9964ee3d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 17 Jul 2013 11:14:26 +0200 Subject: [PATCH 517/798] nvidia-x11: Fix the library-only build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also, introduce a function ‘versionAtLeast’ which is probably more natural than ‘versionOlder’. --- pkgs/lib/strings.nix | 4 ++++ pkgs/os-specific/linux/nvidia-x11/default.nix | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/lib/strings.nix b/pkgs/lib/strings.nix index ed668e2b927..024a9ac7d7a 100644 --- a/pkgs/lib/strings.nix +++ b/pkgs/lib/strings.nix @@ -163,6 +163,10 @@ rec { versionOlder = v1: v2: builtins.compareVersions v2 v1 == 1; + # Return true iff string v1 denotes a version equal to or newer than v2. + versionAtLeast = v1: v2: !versionOlder v1 v2; + + # Get the version of the specified derivation, as specified in its # ‘name’ attribute. getVersion = drv: (builtins.parseDrvName drv.name).version; diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index e4e9a2c0205..9e750629b82 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { patches = [ ./version-test.patch ] - ++ optional (!versionOlder kernelDev.version "3.10") kernel310patch; + ++ optional (!libsOnly && versionAtLeast kernelDev.version "3.10") kernel310patch; src = if stdenv.system == "i686-linux" then From ff5d030513365cc2e5f8530a217b1ccb0fb6076c Mon Sep 17 00:00:00 2001 From: Oliver Charles Date: Wed, 17 Jul 2013 10:31:19 +0100 Subject: [PATCH 518/798] perlPackages.DBIxSimple: new expression --- pkgs/top-level/perl-packages.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 36c38b578d3..7d77fc985d7 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2079,6 +2079,18 @@ rec { }; }; + DBIxSimple = buildPerlPackage { + name = "DBIx-Simple-1.35"; + src = fetchurl { + url = mirror://cpan/authors/id/J/JU/JUERD/DBIx-Simple-1.35.tar.gz; + sha256 = "445535b3dfab88140c7a0d2776b1e78f254dc7e9c81072d5a01afc95a5db499a"; + }; + propagatedBuildInputs = [ DBI ]; + meta = { + description = "Very complete easy-to-use OO interface to DBI"; + }; + }; + DevelCycle = buildPerlPackage { name = "Devel-Cycle-1.11"; src = fetchurl { From d7b5a1beb1a2f6de18a2f2122d1479327327c720 Mon Sep 17 00:00:00 2001 From: Oliver Charles Date: Wed, 17 Jul 2013 10:33:04 +0100 Subject: [PATCH 519/798] perlPackages.LogContextual & dependencies: new expressions --- pkgs/top-level/perl-packages.nix | 55 ++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 7d77fc985d7..f8c326b1c94 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2480,6 +2480,21 @@ rec { propagatedBuildInputs = [ ExceptionBase ]; }; + ExporterDeclare = buildPerlModule { + name = "Exporter-Declare-0.113"; + src = fetchurl { + url = mirror://cpan/authors/id/E/EX/EXODIST/Exporter-Declare-0.113.tar.gz; + sha256 = "724de5e982c8477df14a360c82233f9e0c26b4af9191647f750f5e465ea42dce"; + }; + buildInputs = [ FennecLite TestException ]; + propagatedBuildInputs = [ MetaBuilder aliased ]; + meta = { + homepage = http://open-exodus.net/projects/Exporter-Declare; + description = "Exporting done right"; + license = "perl"; + }; + }; + ExporterLite = buildPerlPackage { name = "Exporter-Lite-0.02"; src = fetchurl { @@ -2654,6 +2669,19 @@ rec { buildInputs = [ ]; }; + FennecLite = buildPerlModule { + name = "Fennec-Lite-0.004"; + src = fetchurl { + url = mirror://cpan/authors/id/E/EX/EXODIST/Fennec-Lite-0.004.tar.gz; + sha256 = "dce28e3932762c2ff92aa52d90405c06e898e81cb7b164ccae8966ae77f1dcab"; + }; + meta = { + homepage = http://open-exodus.net/projects/Fennec-Lite; + description = "Minimalist Fennec, the commonly used bits"; + license = "perl"; + }; + }; + FileChangeNotify = buildPerlModule rec { name = "File-ChangeNotify-0.20"; src = fetchurl { @@ -3812,6 +3840,20 @@ rec { }; }; + LogContextual = buildPerlPackage { + name = "Log-Contextual-0.005003"; + src = fetchurl { + url = mirror://cpan/authors/id/F/FR/FREW/Log-Contextual-0.005003.tar.gz; + sha256 = "8519ae92bd8685d003460f99151996e94f38c3c8f12b90634857558605d13719"; + }; + buildInputs = [ TestFatal ]; + propagatedBuildInputs = [ DataDumperConcise ExporterDeclare Moo ]; + meta = { + description = "Simple logging interface with a contextual log"; + license = "perl"; + }; + }; + LogDispatch = buildPerlPackage { name = "Log-Dispatch-2.39"; src = fetchurl { @@ -4051,6 +4093,19 @@ rec { }; }; + MetaBuilder = buildPerlModule { + name = "Meta-Builder-0.003"; + src = fetchurl { + url = mirror://cpan/authors/id/E/EX/EXODIST/Meta-Builder-0.003.tar.gz; + sha256 = "e7ac289b88d1662e87708d716877ac66a1a8414660996fe58c1db96d834a5375"; + }; + buildInputs = [ FennecLite TestException ]; + meta = { + description = "Tools for creating Meta objects to track custom metrics"; + license = "perl"; + }; + }; + MethodSignaturesSimple = buildPerlPackage { name = "Method-Signatures-Simple-1.07"; src = fetchurl { From 61d3429154f1d55aaa3255bf64074dee3c461bfe Mon Sep 17 00:00:00 2001 From: Oliver Charles Date: Wed, 17 Jul 2013 10:45:50 +0100 Subject: [PATCH 520/798] perlPackages.NetRabbitFoot & dependencies: new expressions --- pkgs/top-level/perl-packages.nix | 256 +++++++++++++++++++++++++++++++ 1 file changed, 256 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index f8c326b1c94..a66af2b4e96 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -106,6 +106,20 @@ rec { }; }; + AnyEventRabbitMQ = buildPerlPackage { + name = "AnyEvent-RabbitMQ-1.15"; + src = fetchurl { + url = mirror://cpan/authors/id/B/BO/BOBTFISH/AnyEvent-RabbitMQ-1.15.tar.gz; + sha256 = "fda292dfaae10f6d99aafc46831ce507153b58368e3eb2617bbb3f749605805a"; + }; + buildInputs = [ TestException ]; + propagatedBuildInputs = [ AnyEvent DevelGlobalDestruction FileShareDir ListMoreUtils NetAMQP Readonly namespaceclean ]; + meta = { + description = "An asynchronous and multi channel Perl AMQP client"; + license = "perl"; + }; + }; + AnyMoose = buildPerlPackage rec { name = "Any-Moose-0.10"; src = fetchurl { @@ -138,6 +152,21 @@ rec { propagatedBuildInputs = [LocaleMaketextSimple]; }; + AppCmd = buildPerlPackage { + name = "App-Cmd-0.320"; + src = fetchurl { + url = mirror://cpan/authors/id/R/RJ/RJBS/App-Cmd-0.320.tar.gz; + sha256 = "ca6174f634bbe5b73c5f5ad6e0f3b3385568934282f4e848da8e78025b2b185e"; + }; + buildInputs = [ TestFatal ]; + propagatedBuildInputs = [ CaptureTiny ClassLoad DataOptList GetoptLongDescriptive IOTieCombine StringRewritePrefix SubExporter SubInstall ]; + meta = { + homepage = https://github.com/rjbs/app-cmd; + description = "Write command line apps with less suffering"; + license = "perl"; + }; + }; + AppConfig = buildPerlPackage { name = "AppConfig-1.66"; src = fetchurl { @@ -241,6 +270,18 @@ rec { }; }; + autodie = buildPerlPackage { + name = "autodie-2.20"; + src = fetchurl { + url = mirror://cpan/authors/id/P/PJ/PJF/autodie-2.20.tar.gz; + sha256 = "346763c582cd8066b4e5d07e4013202f9f9296d32b42343e117dbfb13ea6e4f0"; + }; + meta = { + description = "Replace functions with ones that succeed or die with lexical scope"; + license = "perl"; + }; + }; + BerkeleyDB = import ../development/perl-modules/BerkeleyDB { inherit buildPerlPackage fetchurl; inherit (pkgs) db4; @@ -1328,6 +1369,15 @@ rec { propagatedBuildInputs = [ CGICookieXS ]; }; + Coro = buildPerlPackage { + name = "Coro-6.31"; + src = fetchurl { + url = mirror://cpan/authors/id/M/ML/MLEHMANN/Coro-6.31.tar.gz; + sha256 = "a73ace48d940b28e3dfb32d2f3507205d3ddfdc6610075ecc72e19476bb6de44"; + }; + propagatedBuildInputs = [ AnyEvent Guard CommonSense ]; + }; + CPANMeta = buildPerlPackage { name = "CPAN-Meta-2.120921"; src = fetchurl { @@ -2780,6 +2830,19 @@ rec { }; }; + Filepushd = buildPerlPackage { + name = "File-pushd-1.005"; + src = fetchurl { + url = mirror://cpan/authors/id/D/DA/DAGOLDEN/File-pushd-1.005.tar.gz; + sha256 = "50fdcc33e69a50bab1e32d1a7c96753938f6d95a06015e34e662958c58687842"; + }; + meta = { + homepage = https://metacpan.org/release/File-pushd; + description = "Change directory temporarily for a limited scope"; + license = "apache"; + }; + }; + FileRemove = buildPerlPackage rec { name = "File-Remove-1.42"; src = fetchurl { @@ -3021,6 +3084,14 @@ rec { buildInputs = [ DataUUID CryptCBC ]; }; + Guard = buildPerlPackage { + name = "Guard-1.022"; + src = fetchurl { + url = mirror://cpan/authors/id/M/ML/MLEHMANN/Guard-1.022.tar.gz; + sha256 = "0saq9949d13mdvpnls7mw1cy74lm4ncl7agbs7n2jl4sy6bvmw9m"; + }; + }; + HashFlatten = buildPerlPackage rec { name = "Hash-Flatten-1.19"; src = fetchurl { @@ -3502,6 +3573,19 @@ rec { }; }; + IOTieCombine = buildPerlPackage { + name = "IO-TieCombine-1.002"; + src = fetchurl { + url = mirror://cpan/authors/id/R/RJ/RJBS/IO-TieCombine-1.002.tar.gz; + sha256 = "fd4f59e82852fd8b868dd1642cb6ec9caf32a597803fdce2cbe8d580c3b41d44"; + }; + meta = { + homepage = https://github.com/rjbs/io-tiecombine; + description = "Produce tied (and other) separate but combined variables"; + license = "perl"; + }; + }; + IOTty = buildPerlPackage rec { name = "IO-Tty-1.10"; src = fetchurl { @@ -4395,6 +4479,21 @@ rec { propagatedBuildInputs = [ Moose ]; }; + MooseXAppCmd = buildPerlPackage { + name = "MooseX-App-Cmd-0.10"; + src = fetchurl { + url = mirror://cpan/authors/id/M/MJ/MJGARDNER/MooseX-App-Cmd-0.10.tar.gz; + sha256 = "6d2d8fdc4f3f7fa76dc82c10d71b099f1572c054a72f373e5a9fa6237e48634a"; + }; + buildInputs = [ MooseXConfigFromFile TestOutput YAML ]; + propagatedBuildInputs = [ AppCmd GetoptLongDescriptive Moose MooseXConfigFromFile MooseXGetopt MooseXHasOptions MooseXMarkAsMethods TestUseOk ]; + meta = { + homepage = http://metacpan.org/release/MooseX-App-Cmd; + description = "Mashes up MooseX::Getopt and App::Cmd"; + license = "perl"; + }; + }; + MooseXAttributeChained = buildPerlModule rec { name = "MooseX-Attribute-Chained-1.0.1"; src = fetchurl { @@ -4404,6 +4503,20 @@ rec { propagatedBuildInputs = [ Moose TryTiny ]; }; + MooseXAttributeHelpers = buildPerlPackage { + name = "MooseX-AttributeHelpers-0.23"; + src = fetchurl { + url = mirror://cpan/authors/id/D/DR/DROLSKY/MooseX-AttributeHelpers-0.23.tar.gz; + sha256 = "3f63f60d94d840a309d9137f78605e15f07c977fd15a4f4b55bd47b65ed52be1"; + }; + buildInputs = [ Moose TestException ]; + propagatedBuildInputs = [ Moose ]; + meta = { + description = "Extend your attribute interfaces (deprecated)"; + license = "perl"; + }; + }; + MooseXClone = buildPerlPackage { name = "MooseX-Clone-0.05"; src = fetchurl { @@ -4413,6 +4526,20 @@ rec { propagatedBuildInputs = [ DataVisitor HashUtilFieldHashCompat Moose namespaceclean TestUseOk ]; }; + MooseXConfigFromFile = buildPerlPackage { + name = "MooseX-ConfigFromFile-0.11"; + src = fetchurl { + url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-ConfigFromFile-0.11.tar.gz; + sha256 = "963e7dbb2bc7ca18995db903c64b0841c4e8d3877009bff5475125673c3b02b4"; + }; + buildInputs = [ Moose TestCheckDeps TestDeep TestFatal TestNoWarnings TestRequires TestWithoutModule ]; + propagatedBuildInputs = [ Moose MooseXTypes MooseXTypesPathTiny TryTiny namespaceautoclean ]; + meta = { + description = "An abstract Moose role for setting attributes from a configfile"; + license = "perl"; + }; + }; + MooseXDaemonize = buildPerlPackage { name = "MooseX-Daemonize-0.15"; src = fetchurl { @@ -4456,6 +4583,21 @@ rec { }; }; + MooseXHasOptions = buildPerlPackage { + name = "MooseX-Has-Options-0.003"; + src = fetchurl { + url = mirror://cpan/authors/id/P/PS/PSHANGOV/MooseX-Has-Options-0.003.tar.gz; + sha256 = "07c21cf8ed500b272020ff8da19f194728bb414e0012a2f0cc54ef2ef6222a68"; + }; + buildInputs = [ Moose TestMost namespaceautoclean ]; + propagatedBuildInputs = [ ClassLoad ListMoreUtils PackageStash StringRewritePrefix ]; + meta = { + homepage = https://github.com/pshangov/moosex-has-options; + description = "Succinct options for Moose"; + license = "perl"; + }; + }; + MooseXMarkAsMethods = buildPerlPackage { name = "MooseX-MarkAsMethods-0.15"; src = fetchurl { @@ -4697,6 +4839,36 @@ rec { }; }; + MooseXTypesPathTiny = buildPerlModule { + name = "MooseX-Types-Path-Tiny-0.006"; + src = fetchurl { + url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-Types-Path-Tiny-0.006.tar.gz; + sha256 = "0260c6fbbf84d411b145238ffd92a73f754bd92434448d9f78798fba0a2dfdd6"; + }; + buildInputs = [ Filepushd ModuleBuildTiny TestCheckDeps TestFatal ]; + propagatedBuildInputs = [ Moose MooseXTypes MooseXTypesStringlike PathTiny ]; + meta = { + homepage = https://github.com/karenetheridge/moosex-types-path-tiny; + description = "Path::Tiny types and coercions for Moose"; + license = "apache"; + }; + }; + + MooseXTypesStringlike = buildPerlPackage { + name = "MooseX-Types-Stringlike-0.001"; + src = fetchurl { + url = mirror://cpan/authors/id/D/DA/DAGOLDEN/MooseX-Types-Stringlike-0.001.tar.gz; + sha256 = "2ba71fff105d851ea6aee85bef5d6629726138a2b005b77a163a8bfb403cea03"; + }; + buildInputs = [ Moose ]; + propagatedBuildInputs = [ MooseXTypes ]; + meta = { + homepage = https://github.com/dagolden/moosex-types-stringlike; + description = "Moose type constraints for strings or string-like objects"; + license = "apache"; + }; + }; + MooseXTypesStructured = buildPerlPackage { name = "MooseX-Types-Structured-0.28"; src = fetchurl { @@ -4877,6 +5049,27 @@ rec { }; }; + NetAMQP = buildPerlPackage { + name = "Net-AMQP-0.06"; + src = fetchurl { + url = mirror://cpan/authors/id/C/CH/CHIPS/Net-AMQP-0.06.tar.gz; + sha256 = "0b2ba7de2cd7ddd5fe102a2e2ae7aeba21eaab1078bf3bfd3c5a722937256380"; + }; + buildInputs = [ TestDeep ]; + propagatedBuildInputs = [ ClassAccessor ClassDataInheritable XMLLibXML ]; + meta = { + description = "Advanced Message Queue Protocol (de)serialization and representation"; + license = "perl"; + }; + preConfigure = + '' + substituteInPlace META.json \ + '"Module::Build" : "0.40"' '"Module::Build" : "0.39"' + substituteInPlace META.yml \ + 'Module::Build: 0.40' 'Module::Build: 0.39' + ''; + }; + NetCoverArtArchive = buildPerlPackage { name = "Net-CoverArtArchive-1.02"; src = fetchurl { @@ -4957,6 +5150,20 @@ rec { }; }; + NetRabbitFoot = buildPerlPackage { + name = "Net-RabbitFoot-1.03"; + src = fetchurl { + url = mirror://cpan/authors/id/I/IK/IKUTA/Net-RabbitFoot-1.03.tar.gz; + sha256 = "0544b1914e7847b32b60a643abc6f0b1fdc6d4a816afd84bcd3eee0c28b001ac"; + }; + buildInputs = [ TestException ]; + propagatedBuildInputs = [ AnyEventRabbitMQ ConfigAny Coro JSONXS ListMoreUtils Moose MooseXAppCmd MooseXAttributeHelpers MooseXConfigFromFile ]; + meta = { + description = "An Asynchronous and multi channel Perl AMQP client"; + license = "perl"; + }; + }; + NetServer = buildPerlPackage { name = "Net-Server-2.007"; src = fetchurl { @@ -5227,6 +5434,29 @@ rec { }; }; + PathTiny = buildPerlPackage { + name = "Path-Tiny-0.026"; + src = fetchurl { + url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Path-Tiny-0.026.tar.gz; + sha256 = "e79ee187bbf7fdef387886a8c929bd0a1171fb54db1984d79f4e04d90f733cc6"; + }; + buildInputs = [ DevelHide Filepushd TestDeep TestFailWarnings TestFatal perl ]; + propagatedBuildInputs = [ autodie ]; + meta = { + homepage = https://metacpan.org/release/Path-Tiny; + description = "File path utility"; + license = "apache"; + }; + preConfigure = + '' + substituteInPlace lib/Path/Tiny.pm --replace 'use File::Spec 3.40' \ + 'use File::Spec 3.39' + ''; + # This appears to be currently failing tests, though I don't know why. + # -- ocharles + doCheck = false; + }; + Perl5lib = buildPerlPackage rec { name = "perl5lib-1.02"; src = fetchurl { @@ -6364,6 +6594,20 @@ rec { propagatedBuildInputs = [ SubUplevel ]; }; + TestFailWarnings = buildPerlPackage { + name = "Test-FailWarnings-0.005"; + src = fetchurl { + url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Test-FailWarnings-0.005.tar.gz; + sha256 = "014f909e6c171f77b811139c49c1dca9d0f1e2d1c41b5dca332b6b55b3eb0b4e"; + }; + buildInputs = [ CaptureTiny ]; + meta = { + homepage = https://metacpan.org/release/Test-FailWarnings; + description = "Add test failures if warnings are caught"; + license = "apache"; + }; + }; + TestFatal = buildPerlPackage { name = "Test-Fatal-0.010"; src = fetchurl { @@ -6686,6 +6930,18 @@ rec { }; }; + TestWithoutModule = buildPerlPackage { + name = "Test-Without-Module-0.17"; + src = fetchurl { + url = mirror://cpan/authors/id/C/CO/CORION/Test-Without-Module-0.17.tar.gz; + sha256 = "a691b0bf6d92dedbacfd547551021389ebc79c51937de2b914e792457da56ff7"; + }; + meta = { + description = "Test fallback behaviour in absence of modules"; + license = "perl"; + }; + }; + TestWWWMechanize = buildPerlPackage { name = "Test-WWW-Mechanize-1.44"; src = fetchurl { From 97b64665f5f9a1b58bdda4a18d60f2115f3d6bf8 Mon Sep 17 00:00:00 2001 From: Gergely Risko Date: Wed, 17 Jul 2013 12:16:47 +0200 Subject: [PATCH 521/798] Use fetchgit for vanitygen instead of fetchurl, github changed something --- pkgs/applications/misc/vanitygen/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/vanitygen/default.nix b/pkgs/applications/misc/vanitygen/default.nix index 1aa3f57ecca..c68767290ee 100644 --- a/pkgs/applications/misc/vanitygen/default.nix +++ b/pkgs/applications/misc/vanitygen/default.nix @@ -1,13 +1,13 @@ -{ fetchurl, stdenv, openssl, pcre }: +{ fetchgit, stdenv, openssl, pcre }: stdenv.mkDerivation rec { version = "0.21"; name = "vanitygen-${version}"; - src = fetchurl { - name = "vanitygen-${version}.tar.gz"; - url = "https://github.com/samr7/vanitygen/tarball/0.21"; - sha256 = "1lj0gi08lg0pcby5pbpi08ysynzy24qa1n1065112shkpasi0kxv"; + src = fetchgit { + url = "https://github.com/samr7/vanitygen"; + rev = "refs/tags/${version}"; + sha256 = "1vzfv74hhiyrrpvjca8paydx1ashgbgn5plzrx4swyzxy1xkamah"; }; buildInputs = [ openssl pcre ]; From ca0936f17f447e29e3653249ae0758967d11b972 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 17 Jul 2013 12:47:15 +0200 Subject: [PATCH 522/798] apache-httpd: Update to 2.2.25 CVE-2013-1896, CVE-2013-1862. --- pkgs/servers/http/apache-httpd/2.2.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/apache-httpd/2.2.nix b/pkgs/servers/http/apache-httpd/2.2.nix index 23454d048b7..e9b1dba22e1 100644 --- a/pkgs/servers/http/apache-httpd/2.2.nix +++ b/pkgs/servers/http/apache-httpd/2.2.nix @@ -12,12 +12,12 @@ assert ldapSupport -> aprutil.ldapSupport && openldap != null; assert mpm == "prefork" || mpm == "worker" || mpm == "event"; stdenv.mkDerivation rec { - version = "2.2.24"; + version = "2.2.25"; name = "apache-httpd-${version}"; src = fetchurl { url = "mirror://apache/httpd/httpd-${version}.tar.bz2"; - sha1 = "f73bce14832ec40c1aae68f4f8c367cab2266241"; + sha1 = "e34222d1a8de38825397a1c70949bcc5836a1236"; }; buildInputs = [perl apr aprutil pcre] ++ From 3a9c3b9b41ab3e30e5f0250e8c243401ba57e70a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 17 Jul 2013 11:45:17 +0200 Subject: [PATCH 523/798] haskell-MonadRandom: update to version 0.1.10 --- pkgs/development/libraries/haskell/MonadRandom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/MonadRandom/default.nix b/pkgs/development/libraries/haskell/MonadRandom/default.nix index 738b69f2832..2dead8de40d 100644 --- a/pkgs/development/libraries/haskell/MonadRandom/default.nix +++ b/pkgs/development/libraries/haskell/MonadRandom/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "MonadRandom"; - version = "0.1.9"; - sha256 = "1n947650xlz47rj6y6ik2mknyr9smwragjr5akccinmfm1krg6lz"; + version = "0.1.10"; + sha256 = "0acx8vm43pd3wn5gp4rx9h24y08fcdy4bpack1sd0pxx2wmhi5qs"; buildDepends = [ mtl random transformers ]; meta = { description = "Random-number generation monad"; From 49818d17dac39db1703801bba016e7ca3845aaa2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 17 Jul 2013 11:45:17 +0200 Subject: [PATCH 524/798] haskell-active: update to version 0.1.0.6 --- pkgs/development/libraries/haskell/active/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/active/default.nix b/pkgs/development/libraries/haskell/active/default.nix index 209341e22e7..c51663a9d09 100644 --- a/pkgs/development/libraries/haskell/active/default.nix +++ b/pkgs/development/libraries/haskell/active/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "active"; - version = "0.1.0.4"; - sha256 = "0f4bgx7l9vx2kywl87zpxpjbfix79lp8chf6xzfpmh4wrbmfgi1s"; + version = "0.1.0.6"; + sha256 = "0hh52hkmma4lxfv3gj7x23cwx8v6wd1cm9hblvhzhylxk8dyl5m7"; buildDepends = [ newtype semigroupoids semigroups vectorSpace ]; testDepends = [ newtype QuickCheck semigroupoids semigroups vectorSpace From b24d3e5b790023ac15256ff2cd9b28443795f28a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 17 Jul 2013 11:45:17 +0200 Subject: [PATCH 525/798] haskell-dimensional-tf: update to version 0.2 --- pkgs/development/libraries/haskell/dimensional-tf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/dimensional-tf/default.nix b/pkgs/development/libraries/haskell/dimensional-tf/default.nix index 70995ecb3ce..d28de6c67a0 100644 --- a/pkgs/development/libraries/haskell/dimensional-tf/default.nix +++ b/pkgs/development/libraries/haskell/dimensional-tf/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "dimensional-tf"; - version = "0.1.1"; - sha256 = "0hhp2nx8xyk5ms3mzg1d3jhzm1b0bxz7aijxqasrxjq9p04jr2ci"; + version = "0.2"; + sha256 = "0j23iamgcm7wy6y7i7diq5nnaimpsz0vvb1yrmyh0qz792d60fw1"; buildDepends = [ numtypeTf time ]; meta = { homepage = "http://dimensional.googlecode.com/"; From c2f14b02ed4511d227c9ed46c0954e5bf5ce44a6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 17 Jul 2013 11:45:17 +0200 Subject: [PATCH 526/798] haskell-dimensional: update to version 0.12.1 --- pkgs/development/libraries/haskell/dimensional/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/dimensional/default.nix b/pkgs/development/libraries/haskell/dimensional/default.nix index e820df4f0ba..154b7ea0628 100644 --- a/pkgs/development/libraries/haskell/dimensional/default.nix +++ b/pkgs/development/libraries/haskell/dimensional/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "dimensional"; - version = "0.12"; - sha256 = "1bk52wxmgcm34b516npy1ynrzqajgkshd8vfjm44vjcjvfrlf3bc"; + version = "0.12.1"; + sha256 = "176mvnd570xskjs6ky1wax9adzzrm9j6ai0fc4hy2z4097ydcgwm"; buildDepends = [ numtype time ]; meta = { homepage = "http://dimensional.googlecode.com/"; From b7962135db1a082dda07f48b30a0b610b00d56c9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 17 Jul 2013 11:45:17 +0200 Subject: [PATCH 527/798] haskell-numtype-tf: update to version 0.1.1 --- pkgs/development/libraries/haskell/numtype-tf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/numtype-tf/default.nix b/pkgs/development/libraries/haskell/numtype-tf/default.nix index 76f57daca38..ad7f2d98660 100644 --- a/pkgs/development/libraries/haskell/numtype-tf/default.nix +++ b/pkgs/development/libraries/haskell/numtype-tf/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "numtype-tf"; - version = "0.1"; - sha256 = "1hvnqgjg7yifxdsji9v0wqwbp4syhdc97pa3nrn4p96g7kmvw25v"; + version = "0.1.1"; + sha256 = "0aj24jlfcv4rsa0zfglsfgq9f0kxln32drypp66652ycffz3ip9a"; meta = { homepage = "http://dimensional.googlecode.com/"; description = "Type-level (low cardinality) integers, implemented using type families"; From 8db3aac875d54f19a4b82d74f45e99ba8db3c201 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 17 Jul 2013 11:45:17 +0200 Subject: [PATCH 528/798] haskell-numtype: update to version 1.0.1 --- pkgs/development/libraries/haskell/numtype/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/numtype/default.nix b/pkgs/development/libraries/haskell/numtype/default.nix index be90f003f7f..d35f763d32e 100644 --- a/pkgs/development/libraries/haskell/numtype/default.nix +++ b/pkgs/development/libraries/haskell/numtype/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "numtype"; - version = "1.0"; - sha256 = "2606e81d7bcef0ba76b1e6ffc8d513c36fef5fefaab3bdd02da18761ec504e1f"; + version = "1.0.1"; + sha256 = "130qchi9dplpg7pxf4pz7nz4mnprngw16mizqycp5pdlawbcp5js"; meta = { homepage = "http://dimensional.googlecode.com/"; description = "Type-level (low cardinality) integers"; From ccc6de3f77d511432543c086efbfa6300d8a24cc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 17 Jul 2013 11:45:17 +0200 Subject: [PATCH 529/798] haskell-semigroupoids: update to version 3.1 --- pkgs/development/libraries/haskell/semigroupoids/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/semigroupoids/default.nix b/pkgs/development/libraries/haskell/semigroupoids/default.nix index f8b535824cf..aa7176f7e16 100644 --- a/pkgs/development/libraries/haskell/semigroupoids/default.nix +++ b/pkgs/development/libraries/haskell/semigroupoids/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "semigroupoids"; - version = "3.0.3"; - sha256 = "0hxg3q4bx6lmccxx9hrgb1yvnvcgb5vcaw4xv1fgdcbrydjfgfrm"; + version = "3.1"; + sha256 = "02147y0nnvyc9ykvjbbxa9gzmkk9kgpsmx40ahwnjk9igjkbyp9g"; buildDepends = [ comonad contravariant semigroups transformers ]; meta = { homepage = "http://github.com/ekmett/semigroupoids"; From 09583c0f4eafe84a4736c88da3d137a8c7b25f18 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 17 Jul 2013 11:45:17 +0200 Subject: [PATCH 530/798] haskell-hlint: update to version 1.8.48 --- 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 f8e7492184d..c0510b40b85 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.47"; - sha256 = "0ljqkqjn0b3j9la1i51k0019pirg4j8ap5v5b01ch7lj3jqzr85f"; + version = "1.8.48"; + sha256 = "1fysjs0vq3kafk12mb16xgq1svl5gcd3hxn86g5ncg6zb810fclf"; isLibrary = true; isExecutable = true; buildDepends = [ From dea87788f8b7e4be4b24b65b974c1f5d81fc17e5 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 17 Jul 2013 13:59:31 +0200 Subject: [PATCH 531/798] Make KDE 4.10 the default --- 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 ef0b595d153..654ab935eba 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9088,7 +9088,7 @@ let gnome = recurseIntoAttrs gnome2; - kde4 = recurseIntoAttrs pkgs.kde48; + kde4 = recurseIntoAttrs pkgs.kde410; kde48 = kdePackagesFor (pkgs.kde48 // { boost = boost149; From dfd621745a235d810d2c8d5d83dae8121951c5a6 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 17 Jul 2013 14:06:24 +0200 Subject: [PATCH 532/798] Remove KDE 4.10.4 --- pkgs/desktops/kde-4.10/kde-package/4.10.4.nix | 399 ------------------ 1 file changed, 399 deletions(-) delete mode 100644 pkgs/desktops/kde-4.10/kde-package/4.10.4.nix diff --git a/pkgs/desktops/kde-4.10/kde-package/4.10.4.nix b/pkgs/desktops/kde-4.10/kde-package/4.10.4.nix deleted file mode 100644 index a2dafe03f58..00000000000 --- a/pkgs/desktops/kde-4.10/kde-package/4.10.4.nix +++ /dev/null @@ -1,399 +0,0 @@ -{stable=true; -hashes=builtins.listToAttrs[ - {name="analitza";value="1ikja551kp2i4x6mw64i12yf84vx0g5rfmqcq93lj2z4gii17nlq";} - {name="ark";value="06ymghs1rflhij7skw3hnk2w8kjmmaigh31raq690vbnpa9w8isb";} - {name="audiocd-kio";value="1pxza8v5gb34hzbky5jwm2fw3b4bynpzcrggw6vvhnb0gqrfm7x6";} - {name="blinken";value="12rl2jl91mkvls7lh38hxxc8qfrw9lq56syb2k5v81x0gxzgz7gx";} - {name="bomber";value="13qi8q3jyk9dn2pnljrgh00qp5k4dimdfj5z8r6gb05cvzn1g5zw";} - {name="bovo";value="1j180rm5wr1yy2wn76g3s6v7hl54rhahna32lll8dv9srrpqry12";} - {name="cantor";value="1406bkky7pglck0vad9id02w5gyfcva9slmy5gb06iwi9rcvl13y";} - {name="dragon";value="1zc14x60rcmgiim5wlss0pva1mc89r00xasic55zkb9w1xl2ymrd";} - {name="ffmpegthumbs";value="03hyypzdaf1v7hczbmhnkw3fc1va1mfmhl3kdzm40cak2wf3fd89";} - {name="filelight";value="0snjk95jmw3f5v21jwld8ywxpa65zayq9n9bsryipg5i7swa9ylk";} - {name="granatier";value="0qsxgs11caccz695a7lcrhrm3awdm390fa1hmxs6ijrfj9wx3qkf";} - {name="gwenview";value="0b00cvgh1f6abj9ijg32yk1l8mfb0ph5iwqnbwj86z95v0i9kwhl";} - {name="jovie";value="0g07d9zdfjpscc8y4nhfsy869iy2h4vin7inlfk59jih4zbh2yss";} - {name="juk";value="01nxn50nxdkg87fljiz7y6s02wxbbbifv84p8hp1rswi5mx929a4";} - {name="kaccessible";value="0biygax3c5hcqhfgmggn3gbg4skhr75bix8swdj1mp8ypbk7cwn5";} - {name="kactivities";value="07f38qxbd1ads5v912759da6b6hxq9jhiphjlq7ja04130h5425l";} - {name="kajongg";value="0mp329yqxjvi4rzfam0dxjx0gacpgvzcnd5dbbw43f0bdi28r6xg";} - {name="kalgebra";value="139n44rvxdhph1bpvj8x83d4qslhjqwxpw09pj76qskdda0bw1ga";} - {name="kalzium";value="0j5dhaffvi825jbgr4vbi3k4ykk7ha8gv2sas1garqfrqbc30p7n";} - {name="kamera";value="06ny4af8071bd22kgvfx0vw37arvzmv0vimci17glp1v37qfafl5";} - {name="kanagram";value="1nzchi9sjphkh1rsg42jfn2xia9fcjcwihkgan01wd82hrim34bd";} - {name="kapman";value="1hgifdlzhrxabn4ywpxmwqikfms8ihnjz0dwbrfwdji84aij9kxf";} - {name="kate";value="0m9j7a42vzkdzhcd7hhvswyi7rwvicnb9wjs5ff01lg7zdnbyqxx";} - {name="katomic";value="1fj06n77krwyxvjmqwbhfsmi6vii36smifrpzd0yd1f0g3yihiaf";} - {name="kblackbox";value="1irnlwagxsik35n6zkdg6vqvydvhka3yq6p3najdav1hbs7liav6";} - {name="kblocks";value="0b5n3sil6llnryfns5cff07ckids65pz99swkkcgpalpqvhg5xva";} - {name="kbounce";value="0mqaxkgnylirrcip70b330q56c4j31pb2f7c5j65gvzxlk7n1kh9";} - {name="kbreakout";value="1c4ycncf21br0ywdbx91gia62k5kkrgnaj38qclfljhzqx83pr3q";} - {name="kbruch";value="143wfqjpnwcd51zr14mgn2ak38szbr24k1phv5lmlc3whgz7q15v";} - {name="kcalc";value="18jcr6mzasrbs4zbilxhqdsb03965bzm30f74clh5czsyv8s5129";} - {name="kcharselect";value="0hj9ax570qpgkj666qab6bdnz0irzlzynsq28dw64sdmjcxs28k4";} - {name="kcolorchooser";value="00pr0sgq8s008lc0a22nmavsqap8dk00y6wd56a8zv2fpnrys5gn";} - {name="kdeadmin";value="1m5svs6wq393i2ja2z8vivbiw05z41r8nq07j0qypcgzm8a801ks";} - {name="kdeartwork";value="1ax5m70zb8jfil2llia5ph8ykz3xm1xnz0irp5ivp69hixnrrp09";} - {name="kde-baseapps";value="067a2s8kw26yjsm8lmn9xg3nw80yyfbkz2x96pj4qx1qxv4qviil";} - {name="kde-base-artwork";value="0rjxk5qbr15vi4vrd2x9ypqpbam3jbgiylzgk3bx5v367ldrrsbs";} - {name="kdegraphics-mobipocket";value="0fky12546bywjng8vab4nr7ih3zrmskp6kz49hqqbhpcxrnlihpf";} - {name="kdegraphics-strigi-analyzer";value="0g2zf9fmn6720j29pxsq9hw424p1p1pgz4smz1gb8casfrpc2mqa";} - {name="kdegraphics-thumbnailers";value="19nplbwhv0mdg6iawwm8vbmincccyabq9k8ywd8icr8vgj4ikvd4";} - {name="kdelibs";value="08249hp7q8ck1sgihia1idxllp7qb85xw9xv21snhccgdv3p1rd1";} - {name="kdenetwork";value="1fm9f7nln3735frlcrqvwpg10b31dgr4gf6xiyq068sixh4cv0g6";} - {name="kdepim";value="0v9mp548nbqvd03krq6z1djsvr5a6p21bz5dspqy6kp6xymblwzz";} - {name="kdepimlibs";value="09p60h7m41495664ijab33dc5n64spynnjqay1allx0mcldqnapq";} - {name="kdepim-runtime";value="1d47byk057jdgyvzjyhv7px39dl6qcg26i5r12p3q8y2lslnz5wr";} - {name="kdeplasma-addons";value="001yfb324wb7fpi57dz6rnnbjrip9n14bxa7yv20fpq8i6ngv8hl";} - {name="kde-runtime";value="065jhs3ajg3c6k25g5cwbxpp6wxmrd6qg0aza3lxfm87fb1v255n";} - {name="kdesdk";value="1bvmfaddvpgh5kx4nv4c3z33bka6m7wlsw1nzyip9gw1ghac6a2s";} - {name="kdetoys";value="1frkz6k7q99y2nn0j2xw00zsq4dbsmwyvq7jbh7y4wyzanbyxh0f";} - {name="kde-wallpapers";value="0gspx1xld9da4ppcgr20rvkbhy3jh4yqjzfvhsfi1qhh61jgfcks";} - {name="kdewebdev";value="178sq7r584qlkphzwdqhkjaq2h87vjjghq3ialmahzsas3qihkbs";} - {name="kde-workspace";value="1l927wa1qlj0vcahqb0h8vx23fyg9nwv07lmacb7igpv56ccgfam";} - {name="kdf";value="18b623q0p3sh5y69i6likknh90h85imgr2glddsjz4p38f575kis";} - {name="kdiamond";value="0smq3333k5qiny3663yj9h8j0smgybjxr0qpf2m139amr45qcyn4";} - {name="kfloppy";value="0xv1nsnv105b9dr2vdlns1vwq25963fgl130lhg31dafkiyn3ivr";} - {name="kfourinline";value="0d721glmhjp9dr6y60gv299jnjf96n8rkws759kizlq2x3ggn1gx";} - {name="kgamma";value="1hmw7pbsxclws57saha7s253172b61lvqxcqp2vpgvdgjdrraik5";} - {name="kgeography";value="1vnrm7rva467z582qppqryz0671b1bcmgxcxlc2f223kp9g0k8d5";} - {name="kgoldrunner";value="1d2sl02c2ys6vnxxy1rh9lsz3aj5rlzjmpx39dbvap5qqjsan58b";} - {name="kgpg";value="0k1ni2xb4p5p5r8vmnpxm77jqa4176apy7047dxc3w3v0qgqvj9n";} - {name="khangman";value="0bq0bdrx761fyaxfv43sfq68hfcwzhvagxm66jzk4wzd6pb1m6ky";} - {name="kig";value="0jmax8a357iqa3nggpmpbzk9vdnisdmilyqxgkrd1n43cs4cbc9h";} - {name="kigo";value="029xn39sxp2dpj8isq1gmis1858iya0bc758jy8d1rq4c046zmxj";} - {name="killbots";value="0arvfbzsax61nn3hz8nk82l3in802866fqsxhz2zrwh03dbrl30i";} - {name="kimono";value="1ic2xbgd8xwadrvc7qfq1ihkpnh4dx2pjrm5zbjgycyfvsmvl6sh";} - {name="kiriki";value="1dp1dp8s4r4501ldn0v5phkk3fj2kfrncz6h4pfylx27lhpbjbn0";} - {name="kiten";value="0jd17nvk6vqniqs8rzmzsnc5hr05i3fwmmvf44g35gpqmr88kb5b";} - {name="kjumpingcube";value="0z6a8iaprdaqpif054a6glbgcgwaxm2w4i1r9077k91nnsnwrmp3";} - {name="klettres";value="10jc56ll0cgaqkb2xf1gh0k75l90al046syj2q2dqsnaa7lazxp7";} - {name="klickety";value="0afb8llrx30zajsy2k0i22xf8ll9lrlmwzrqn4qq7s9wxzwy291v";} - {name="klines";value="0mkwb4d60zxalv0asw4qnvml6jf153ghzqcxgbac40nhzl2abdyz";} - {name="kmag";value="0pjq6nax82x3ldknld25xrx4adc2i7jcy0x4l343m83f5c79xyn6";} - {name="kmahjongg";value="1sx8yplpc70z1vdp9j1shmhc8cqbwmshdhl23hxpl1jydd36q1wj";} - {name="kmines";value="0qpcnp0hfhwybqfxgqvbwhin8lb50gca2kwvms10cayqmjafj9j8";} - {name="kmix";value="1k67gygq1j13p8nxk50n9q01yfkrv0safvxrbq5f70yvka1jdyj7";} - {name="kmousetool";value="17sylfp5zicq36c812jy9h6s4qprwwad05zbbj9701ax40iwrvlr";} - {name="kmouth";value="1bpqq919rzcaaqxp3md4w1lrhf5mxfjp07z5v7ii8mgji8wrq1g5";} - {name="kmplot";value="0dhdpx79klqc5xb9h4dcgriqivppcrw2ib2piqbqs882mi3pdzx2";} - {name="knavalbattle";value="07x4vh2h0d62kwwai5j0d6a2zf615y4mp3iacp5rz8j9pdkhqn52";} - {name="knetwalk";value="151cj33kfyjf5xxgw0q00l5jbvx5kb893y2mv9ydc9xmwgcd4szz";} - {name="kolf";value="1ibrf01vzpr5dyy2hjb6jq6i9hk7w4kw1iffkyh6w5z40nphs2dx";} - {name="kollision";value="1fgs793v36j27z76ik50wz466r3wrga5pq8ibqy3cinvh7blk7cb";} - {name="kolourpaint";value="1wxja4xd3jhxib2vpa5289f80hfcd2idpvzz4ap71ca0bzkvknq3";} - {name="konquest";value="0aga5yzv5jqbgzp6dp11mgjvfjzrs4csaa5pppwbld81573vldmp";} - {name="konsole";value="0kvv4ccc76swxzsw3z7dis8lbmnf6mbzj4b0n9l4zcmmw2iphvd4";} - {name="korundum";value="03djf01c6rm76dzswnlccwr81p5qyzccv2zxmbycclp8lp6w4vgg";} - {name="kpat";value="1vlyya0yiizrd9c1d4pl1dn6nw7g14rzvwhny12qls7ssrj40zzc";} - {name="kremotecontrol";value="0i6jz6m2a2ff97hkqpjy2qhdagx82jwcsnafl2cv0kddszxdabni";} - {name="kreversi";value="0ci6aampxq6l6sc8m8gxqrzhws56fbhp2xil0qzgab93xn7mmp1c";} - {name="kross-interpreters";value="1iypzm9rwszw1walylq6fa16s4hw84zqpyvmd7aik2dz59fmmvlx";} - {name="kruler";value="0841j4001v7497xa6nzdlprnhx8whp0rq24z2yblqnjf1wi5d07y";} - {name="ksaneplugin";value="10x1shs2cfa4331qymwafpm3hm45n3aqrhiriyl7vsnk1cc2agin";} - {name="kscd";value="0ih7zwyvrgsfd4sqj1g5m5hv71sqdzfhmfn6p3crdnnssbvnfhzd";} - {name="kshisen";value="1pxqz390mr066kni1gxa0jay00mgm1r0dmxydrg6mbfyw4qqw554";} - {name="ksirk";value="0rf5hj19bfc8mgm810rwvj1173nk93npgbsd17vsj1rqskdi57zy";} - {name="ksnakeduel";value="0q02nbcl71h6kqs3mdgq51g4y66p5p62mm70j55cfwjq70i8abbw";} - {name="ksnapshot";value="1rlq34j5ay3vyp1vpxxfpzyap26dcwg4ii10ql5bl28z2m1xv8ba";} - {name="kspaceduel";value="1nhxcmrn42gfkifxfikldha9045ffq5xzbb95wwvwp478jcqi4xk";} - {name="ksquares";value="06kxr8v70ygk2bwcvnfp4l4kjj3yhm5f5wgmzfww8h7kxg87lhg7";} - {name="kstars";value="0hhi2vfvv5dzr82gg2p34nsclis0hswkgvh9q21zg2nj2g4byblh";} - {name="ksudoku";value="1jglf83shv3p3kn71i0lbga9mil54cs2m4xr0dd113961c2fnylf";} - {name="ktimer";value="0kqavcxrxly15az0h0yn8cn6mksvka12yc8fywr029drnr70hs0i";} - {name="ktouch";value="1b8612a6pcsaamdq9hpkxr71vvmd0mxrnb0hl8iy05q61cv71i0b";} - {name="ktuberling";value="1zqzs86ricqwvj6ragxj4rxhddr92a34z8jwdp7qqqjdafzq57c8";} - {name="kturtle";value="0nslszpkacbdwsq8l2phzls5qbfm76r32yiynnd35qjfh94dpilf";} - {name="kubrick";value="1qlysx8kvz6r80rm0szq7pk007d57ddv77qy7d3gmpijwa9giybj";} - {name="kwallet";value="1pw7wgfjfa553kdc8z91amg18zhr5c51nhklr7kpqgp1yj0hwp6a";} - {name="kwordquiz";value="016l2yv461w6liqnkszprlr22nyyy7wi9f3fqblqq5xbps8wr6b4";} - {name="libkcddb";value="0qjdxxwj0hw6ykya6npfq2kp21sspwxf79pklz3w7q3gnl98rlbb";} - {name="libkcompactdisc";value="1jql8hqsb5jl73c22ssv0ddmhipjpgqxhwnyw362djdxifvrybhi";} - {name="libkdcraw";value="0w9h9a69wz7m0hg486jcw7vxkzrr3nfjkgqgr40i3cmxpnnjjvp9";} - {name="libkdeedu";value="0ai6vr33wcphimgbznmi8arh9fa9xpcpkjq8hq07svdgmbxjd44m";} - {name="libkdegames";value="0ifpxwpfh79gh5qs8wl0i951kab3ppmri0h99hi0idj96xhkznpf";} - {name="libkexiv2";value="1w9k4c38ziyfnh9byjszg6aw1mbjii06ladgiwx1q397layd7qhx";} - {name="libkipi";value="1a4kqhsvpcly6mlr9w8g8gb2wyyrfbi89pwb3i1ky3w9wxk87pi4";} - {name="libkmahjongg";value="1rr5z04af5kswcn6pjpd9ryp1zwp3znhwb97xgvppni88cwawyff";} - {name="libksane";value="1sv0ba5p0m8d621vykhayblk6lsys4c80474b7d7vgh9xbcxhhgc";} - {name="lskat";value="0bimy8wng95mpkssssmfm2779qyjsw5f1i9wh695k0jq6j25dscy";} - {name="marble";value="1z90p25fgvwg35pxap1yd3k2i2qrsv9d2057lixv03ymbj0l93aq";} - {name="mplayerthumbs";value="1m83pglqgi6dwbbnm4djybki11f2s6q2lhbqa6v1kq12133fhkc4";} - {name="nepomuk-core";value="14sfvizfwnarcidmj74v1rsix85sn9hvs6wm4xnyv7d4xw7mgqv3";} - {name="nepomuk-widgets";value="02wm1ghsf8mxv24y1d1b5j4nq8jwi6dwlbzlqdl2hhjqxfc60sxw";} - {name="okular";value="15aydihdfd5hzkgchxi2xpfy96bm90jcn07lmmp5xcdng3jj520h";} - {name="oxygen-icons";value="0rwdp44nkigs0v449l90mjw7ngs21a0jx17biascjhq1kxrh0vmp";} - {name="pairs";value="009qpwhy64xfad4ch4l4dh5dn5cj9g9jg0b3384k6wjvx6k61fqq";} - {name="palapeli";value="0g03r8f1z2jxyh2hl6l21s292240d2dbcqi0lndjyfsz322i55wc";} - {name="parley";value="1xn5na30xabzp8lhbmq5ajv08rl1s7zsn08ffwd2vq8ac1nwi0k6";} - {name="perlkde";value="0088hbqdjqdfyf1pqksppbq1xzpgc49rqsnpgjikgdh9nqssnipd";} - {name="perlqt";value="1jgiicjknkfiavnq9jw2mdmsqbqb4ch5caxfhx1v6azj4s95ldpj";} - {name="picmi";value="0ckfcmbivkbkl9akb20ih2k4sz221ygqi51wmir3p5ryvk2dlq2a";} - {name="print-manager";value="0wszjqf42c3mb8c9iq5ngjz21424zjl9j0g3pwgdfj0i8iv1lcd2";} - {name="pykde4";value="18j9fh1w3n9yrrzgsq3pqj2pi53wp58kbwkfwb3hn3a2ksw569qb";} - {name="qtruby";value="0zc0if1c8c0ddfm2f6w4zp6dizxqd3z6dnr1iwydw7mdac205j38";} - {name="qyoto";value="1cgkpr68wh5rq3kbkv0zjylmyfg1ld4qh8r5azrq25y4qiisxmax";} - {name="rocs";value="1ak19mjsniwqzybjawigqg8a04kpv6jhx53mkvlm3wjdnsxi1jis";} - {name="smokegen";value="09liqidf5a862l6a4cz4wghhmfsjay647q2q3h17s8iwwid7k373";} - {name="smokekde";value="1xl56ygpc0ca7smxiagm7ch45w6m415i9nbzin08i4p017vvx0df";} - {name="smokeqt";value="0rk31vd45xraihhb3nmx0mkynlq3wwvdsn0460jfi30m72zpmkyc";} - {name="step";value="00vxnybi6q7lw6w22gmd5jmai8ysgyh9sy1cnn6jj4difn1x8zcr";} - {name="superkaramba";value="1rkbrifkvhl2zajr96kk63lc3r5s43acfih6m499hgwxg8g9z0cf";} - {name="svgpart";value="0892krp78wq731wdr5ipsgx10w45xsrr8jx00qyjsci7qsmpfz4w";} - {name="sweeper";value="1i151jzqabfs72c8rl5hh401nmwp9abpa6nfq3m8qyh4d8gn0fig";} -]; -modules=[ -{ - module="kdemultimedia"; - split=true; - pkgs=[ - { name="audiocd-kio"; sane="audiocd_kio"; } - { name="dragon"; } - { name="ffmpegthumbs"; } - { name="juk"; } - { name="kmix"; } - { name="kscd"; } - { name="libkcddb"; } - { name="libkcompactdisc"; } - { name="mplayerthumbs"; } - ]; -} -{ - module="kdegraphics"; - split=true; - pkgs=[ - { name="gwenview"; } - { name="kamera"; } - { name="kcolorchooser"; } - { name="kdegraphics-mobipocket"; sane="kdegraphics_mobipocket"; } - { name="kdegraphics-strigi-analyzer"; sane="kdegraphics_strigi_analyzer"; } - { name="kdegraphics-thumbnailers"; sane="kdegraphics_thumbnailers"; } - { name="kgamma"; } - { name="kolourpaint"; } - { name="kruler"; } - { name="ksaneplugin"; } - { name="ksnapshot"; } - { name="libkdcraw"; } - { name="libkexiv2"; } - { name="libkipi"; } - { name="libksane"; } - { name="okular"; } - { name="svgpart"; } - ]; -} -{ - module="kdelibs"; - split=true; - pkgs=[ - { name="kdelibs"; } - { name="nepomuk-core"; sane="nepomuk_core"; } - { name="nepomuk-widgets"; sane="nepomuk_widgets"; } - ]; -} -{ - module="kdeutils"; - split=true; - pkgs=[ - { name="ark"; } - { name="filelight"; } - { name="kcalc"; } - { name="kcharselect"; } - { name="kdf"; } - { name="kfloppy"; } - { name="kgpg"; } - { name="kremotecontrol"; } - { name="ktimer"; } - { name="kwallet"; } - { name="print-manager"; sane="print_manager"; } - { name="superkaramba"; } - { name="sweeper"; } - ]; -} -{ - module="applications"; - split=true; - pkgs=[ - { name="kate"; } - { name="konsole"; } - ]; -} -{ - module="kdegames"; - split=true; - pkgs=[ - { name="bomber"; } - { name="bovo"; } - { name="granatier"; } - { name="kajongg"; } - { name="kapman"; } - { name="katomic"; } - { name="kblackbox"; } - { name="kblocks"; } - { name="kbounce"; } - { name="kbreakout"; } - { name="kdiamond"; } - { name="kfourinline"; } - { name="kgoldrunner"; } - { name="kigo"; } - { name="killbots"; } - { name="kiriki"; } - { name="kjumpingcube"; } - { name="klickety"; } - { name="klines"; } - { name="kmahjongg"; } - { name="kmines"; } - { name="knavalbattle"; } - { name="knetwalk"; } - { name="kolf"; } - { name="kollision"; } - { name="konquest"; } - { name="kpat"; } - { name="kreversi"; } - { name="kshisen"; } - { name="ksirk"; } - { name="ksnakeduel"; } - { name="kspaceduel"; } - { name="ksquares"; } - { name="ksudoku"; } - { name="ktuberling"; } - { name="kubrick"; } - { name="libkdegames"; } - { name="libkmahjongg"; } - { name="lskat"; } - { name="palapeli"; } - { name="picmi"; } - ]; -} -{ - module="kdeedu"; - split=true; - pkgs=[ - { name="analitza"; } - { name="blinken"; } - { name="cantor"; } - { name="kalgebra"; } - { name="kalzium"; } - { name="kanagram"; } - { name="kbruch"; } - { name="kgeography"; } - { name="khangman"; } - { name="kig"; } - { name="kiten"; } - { name="klettres"; } - { name="kmplot"; } - { name="kstars"; } - { name="ktouch"; } - { name="kturtle"; } - { name="kwordquiz"; } - { name="libkdeedu"; } - { name="marble"; } - { name="pairs"; } - { name="parley"; } - { name="rocs"; } - { name="step"; } - ]; -} -{ - module="kdebindings"; - split=true; - pkgs=[ - { name="kimono"; } - { name="korundum"; } - { name="kross-interpreters"; sane="kross_interpreters"; } - { name="perlkde"; } - { name="perlqt"; } - { name="pykde4"; } - { name="qtruby"; } - { name="qyoto"; } - { name="smokegen"; } - { name="smokekde"; } - { name="smokeqt"; } - ]; -} -{ - module="kdeaccessibility"; - split=true; - pkgs=[ - { name="jovie"; } - { name="kaccessible"; } - { name="kmag"; } - { name="kmousetool"; } - { name="kmouth"; } - ]; -} -{ - module="kde-baseapps"; -sane="kde_baseapps"; split=true; - pkgs=[ - { name="kde-baseapps"; sane="kde_baseapps"; } - ]; -} -{ module="kactivities"; split=false;} -{ module="kdeadmin"; split=false; - pkgs=[ - { name="strigi-analyzer"; sane="strigi_analyzer";} - { name="kuser"; } - { name="kcron"; } - { name="ksystemlog"; } - ]; - -} -{ module="kdeartwork"; split=false; - pkgs=[ - { name="ColorSchemes"; } - { name="IconThemes"; } - { name="emoticons"; } - { name="kscreensaver"; } - { name="kwin-styles"; sane="kwin_styles";} - { name="sounds"; } - { name="styles"; } - { name="wallpapers"; } - { name="HighResolutionWallpapers"; } - { name="WeatherWallpapers"; } - { name="desktopthemes"; } - ]; - -} -{ module="kde-base-artwork"; sane="kde_base_artwork"; split=false;} -{ module="kdenetwork"; split=false; - pkgs=[ - { name="kfile-plugins"; sane="kfile_plugins";} - { name="kget"; } - { name="kopete"; } - { name="krdc"; } - { name="kppp"; } - { name="krfb"; } - { name="kdnssd"; } - { name="filesharing"; } - ]; - -} -{ module="kdepim"; split=false;} -{ module="kdepimlibs"; split=false;} -{ module="kdepim-runtime"; sane="kdepim_runtime"; split=false;} -{ module="kdeplasma-addons"; sane="kdeplasma_addons"; split=false;} -{ module="kde-runtime"; sane="kde_runtime"; split=false;} -#had to add fake pkgs to kdesdk to get it to be treated like a split module -{ module="kdesdk"; split=false; pkgs = [{ name="fake"; }]; } -{ module="kdetoys"; split=false; - pkgs=[ - { name="kteatime"; } - { name="ktux"; } - { name="amor"; } - ]; - -} -{ module="kde-wallpapers"; sane="kde_wallpapers"; split=false;} -{ module="kdewebdev"; split=false; - pkgs=[ - { name="klinkstatus"; } - { name="kfilereplace"; } - { name="kimagemapeditor"; } - { name="kommander"; } - ]; - -} -{ module="kde-workspace"; sane="kde_workspace"; split=false;} -{ module="oxygen-icons"; sane="oxygen_icons"; split=false;} -]; -} From 66021f9cd8b3076dc1d6d4be705850c32a2fe8d4 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 17 Jul 2013 14:54:47 +0200 Subject: [PATCH 533/798] Fix kdenetwork --- .../kdenetwork/kdenetwork-filesharing.nix | 2 -- .../kdenetwork-strigi-analyzers.nix | 4 +--- .../kde-4.10/kdenetwork/kdenetwork.patch | 24 ------------------- pkgs/desktops/kde-4.10/kdenetwork/kdnssd.nix | 2 -- pkgs/desktops/kde-4.10/kdenetwork/kget.nix | 11 ++++----- pkgs/desktops/kde-4.10/kdenetwork/kppp.nix | 2 -- pkgs/desktops/kde-4.10/kdenetwork/krdc.nix | 3 --- pkgs/desktops/kde-4.10/kdenetwork/krfb.nix | 6 ++--- 8 files changed, 7 insertions(+), 47 deletions(-) delete mode 100644 pkgs/desktops/kde-4.10/kdenetwork/kdenetwork.patch diff --git a/pkgs/desktops/kde-4.10/kdenetwork/kdenetwork-filesharing.nix b/pkgs/desktops/kde-4.10/kdenetwork/kdenetwork-filesharing.nix index 2f32f4d6b2c..bada0c1cb10 100644 --- a/pkgs/desktops/kde-4.10/kdenetwork/kdenetwork-filesharing.nix +++ b/pkgs/desktops/kde-4.10/kdenetwork/kdenetwork-filesharing.nix @@ -2,6 +2,4 @@ kde { buildInputs = [ kdelibs ]; - - patches = [ ./kdenetwork.patch ]; } diff --git a/pkgs/desktops/kde-4.10/kdenetwork/kdenetwork-strigi-analyzers.nix b/pkgs/desktops/kde-4.10/kdenetwork/kdenetwork-strigi-analyzers.nix index f90fd356079..ac28edb8dd9 100644 --- a/pkgs/desktops/kde-4.10/kdenetwork/kdenetwork-strigi-analyzers.nix +++ b/pkgs/desktops/kde-4.10/kdenetwork/kdenetwork-strigi-analyzers.nix @@ -5,7 +5,5 @@ kde { buildInputs = [ kdelibs boost ]; - preConfigure = "mv -v strigi-analyzer kfile-plugins"; - - patches = [ ./kdenetwork.patch ]; + #preConfigure = "mv -v kdenetwork-strigi-analyzers kfile-plugins"; } diff --git a/pkgs/desktops/kde-4.10/kdenetwork/kdenetwork.patch b/pkgs/desktops/kde-4.10/kdenetwork/kdenetwork.patch deleted file mode 100644 index ebadbfad9ba..00000000000 --- a/pkgs/desktops/kde-4.10/kdenetwork/kdenetwork.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -r -u kdenetwork-4.7.1.orig/CMakeLists.txt kdenetwork-4.7.1/CMakeLists.txt ---- kdenetwork-4.7.1.orig/CMakeLists.txt 2011-03-29 15:25:42.174521812 +0400 -+++ kdenetwork-4.7.1/CMakeLists.txt 2011-03-29 15:27:43.268140322 +0400 -@@ -28,7 +28,8 @@ - set(CMAKE_REQUIRED_INCLUDES ${KDEWIN_INCLUDES} ) - endif (WIN32) - --find_package(KdepimLibs REQUIRED) -+macro_optional_find_package(KdepimLibs) -+macro_log_feature(KDEPIMLIBS_FOUND "KDEPimLibs" "KDE pim-related libraries" "http://pim.kde.org.org/" FALSE "" "Required for Kopete") - # find_package(X11VidMode) not used at this time - - # NX support is not ready for KDE 4.2; disabled (uwolfer) -@@ -79,7 +80,9 @@ - macro_optional_add_subdirectory(kfile-plugins) - macro_optional_add_subdirectory(kget) - --macro_optional_add_subdirectory(kopete) -+if(KDEPIMLIBS_FOUND) -+ macro_optional_add_subdirectory(kopete) -+endif(KDEPIMLIBS_FOUND) - - if(Q_WS_X11) - macro_optional_add_subdirectory(krdc) diff --git a/pkgs/desktops/kde-4.10/kdenetwork/kdnssd.nix b/pkgs/desktops/kde-4.10/kdenetwork/kdnssd.nix index 2f32f4d6b2c..bada0c1cb10 100644 --- a/pkgs/desktops/kde-4.10/kdenetwork/kdnssd.nix +++ b/pkgs/desktops/kde-4.10/kdenetwork/kdnssd.nix @@ -2,6 +2,4 @@ kde { buildInputs = [ kdelibs ]; - - patches = [ ./kdenetwork.patch ]; } diff --git a/pkgs/desktops/kde-4.10/kdenetwork/kget.nix b/pkgs/desktops/kde-4.10/kdenetwork/kget.nix index 25028ef974e..d5f38096a42 100644 --- a/pkgs/desktops/kde-4.10/kdenetwork/kget.nix +++ b/pkgs/desktops/kde-4.10/kdenetwork/kget.nix @@ -4,14 +4,11 @@ kde { buildInputs = [ kdelibs libktorrent -#kde_workspace -shared_desktop_ontologies -#kdepimlibs -# kde_baseapps -gpgme boost libmms qca2 sqlite + kde_workspace + shared_desktop_ontologies + # kde_baseapps + gpgme boost libmms qca2 sqlite ]; KDEDIRS = libktorrent; - - patches = [ ./kdenetwork.patch ]; } diff --git a/pkgs/desktops/kde-4.10/kdenetwork/kppp.nix b/pkgs/desktops/kde-4.10/kdenetwork/kppp.nix index 2f32f4d6b2c..bada0c1cb10 100644 --- a/pkgs/desktops/kde-4.10/kdenetwork/kppp.nix +++ b/pkgs/desktops/kde-4.10/kdenetwork/kppp.nix @@ -2,6 +2,4 @@ kde { buildInputs = [ kdelibs ]; - - patches = [ ./kdenetwork.patch ]; } diff --git a/pkgs/desktops/kde-4.10/kdenetwork/krdc.nix b/pkgs/desktops/kde-4.10/kdenetwork/krdc.nix index 1f3ba36aaa1..1b7405f1006 100644 --- a/pkgs/desktops/kde-4.10/kdenetwork/krdc.nix +++ b/pkgs/desktops/kde-4.10/kdenetwork/krdc.nix @@ -1,8 +1,5 @@ { kde, kdelibs, libvncserver, libjpeg }: kde { - buildInputs = [ kdelibs libvncserver libjpeg ]; - - patches = [ ./kdenetwork.patch ]; } diff --git a/pkgs/desktops/kde-4.10/kdenetwork/krfb.nix b/pkgs/desktops/kde-4.10/kdenetwork/krfb.nix index 80013f430d3..b6c36ea9c15 100644 --- a/pkgs/desktops/kde-4.10/kdenetwork/krfb.nix +++ b/pkgs/desktops/kde-4.10/kdenetwork/krfb.nix @@ -1,7 +1,5 @@ -{ kde, kdelibs, libvncserver, libXdamage, libXtst }: +{ kde, kdelibs, libvncserver, libXdamage, libXtst, libjpeg }: kde { - buildInputs = [ kdelibs libvncserver libXdamage libXtst]; - - patches = [ ./kdenetwork.patch ]; + buildInputs = [ kdelibs libvncserver libXdamage libXtst libjpeg ]; } From 7ffb3a4ba5b36133808e603a769900a77e4962b2 Mon Sep 17 00:00:00 2001 From: Song Wenwu Date: Thu, 18 Jul 2013 00:02:53 +0800 Subject: [PATCH 534/798] add herbstluftwm 0.5.2 --- .../window-managers/herbstluftwm/default.nix | 25 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/applications/window-managers/herbstluftwm/default.nix diff --git a/pkgs/applications/window-managers/herbstluftwm/default.nix b/pkgs/applications/window-managers/herbstluftwm/default.nix new file mode 100644 index 00000000000..3ce50a82915 --- /dev/null +++ b/pkgs/applications/window-managers/herbstluftwm/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, pkgconfig, glib, libX11, libXinerama }: + +stdenv.mkDerivation rec { + name = "herbstluftwm-0.5.2"; + + src = fetchurl { + url = "http://herbstluftwm.org/tarballs/${name}.tar.gz"; + sha256 = "15crb77gw8p1h721r3dcgn0m1n03qk0g81rrnaqw8p7hz44k6gf5"; + }; + + patchPhase = '' + sed -i -e "s:/usr/local:$\{out}:" \ + -e "s:/etc:$\{out}/etc:" \ + config.mk + ''; + + buildInputs = [ pkgconfig glib libX11 libXinerama ]; + + meta = { + description = "A manual tiling window manager for X"; + homepage = "http://herbstluftwm.org/"; + license = "BSD"; # Simplified BSD License + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ef0b595d153..b912ae4d2ee 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7704,6 +7704,8 @@ let hello = callPackage ../applications/misc/hello/ex-2 { }; + herbstluftwm = callPackage ../applications/window-managers/herbstluftwm { }; + hexedit = callPackage ../applications/editors/hexedit { }; hetznerNixOpsInstaller = From bc4c9312a5bb735e0c72345e4889bf41a3b07104 Mon Sep 17 00:00:00 2001 From: Karn Kallio Date: Wed, 17 Jul 2013 11:47:38 -0430 Subject: [PATCH 535/798] Add aldor. --- pkgs/development/compilers/aldor/default.nix | 52 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 54 insertions(+) create mode 100644 pkgs/development/compilers/aldor/default.nix diff --git a/pkgs/development/compilers/aldor/default.nix b/pkgs/development/compilers/aldor/default.nix new file mode 100644 index 00000000000..7d0fd7a39bb --- /dev/null +++ b/pkgs/development/compilers/aldor/default.nix @@ -0,0 +1,52 @@ +{ fetchgit, stdenv, gmp, which, flex, bison, makeWrapper }: + +stdenv.mkDerivation rec { + pname = "aldor"; + version = "1.1.0"; + name = "${pname}-${version}"; + gitRev = "a02b088c8d5d06f16c50a83ddee4019e962d6673"; + + src = fetchgit { + url = "https://github.com/pippijn/aldor"; + sha256 = "1zd343wq46f74yr30a5nrbv5n831z6wd24yqnrs7w17ccic69lny"; + rev = gitRev; + }; + + buildInputs = [ gmp which flex bison makeWrapper ]; + + installPhase = '' + for d in bin include lib ; + do + ensureDir $out/$d ; + cp -r build/$d $out/ ; + done + + for prog in aldor unicl zacc ; + do + wrapProgram $out/bin/$prog --set ALDORROOT $out \ + --prefix PATH : ${stdenv.gcc}/bin ; + done + ''; + + meta = with stdenv.lib ; { + description = "Aldor is a programming language with an expressive type system"; + + longDescription = '' + Aldor is a programming language with an expressive type system well-suited + for mathematical computing and which has been used to develop a number of + computer algebra libraries. Originally known as A#, Aldor was conceived as + an extension language for the Axiom system, but is now used more in other settings. + In Aldor, types and functions are first class values that can be constructed + and manipulated within programs. Pervasive support for dependent types allows + static checking of dynamic objects. What does this mean for a normal user? Aldor + solves many difficulties encountered in widely-used object-oriented programming + languages. It allows programs to use a natural style, combining the more attractive + and powerful properties of functional, object-oriented and aspect-oriented styles. + ''; + + homepage = http://www.aldor.org/; + license = licenses.asl20; + maintainers = [ ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 108424f87c7..a8b2370d1f5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2074,6 +2074,8 @@ let javaCup = callPackage ../development/libraries/java/cup { }; }; + aldor = callPackage ../development/compilers/aldor { }; + aspectj = callPackage ../development/compilers/aspectj { }; bigloo = callPackage ../development/compilers/bigloo { }; From 8807aab195c113128b53b368e63f6ad229b193ad Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 17 Jul 2013 19:07:51 +0200 Subject: [PATCH 536/798] haskell-Hipmunk: update to version 5.2.0.11 --- pkgs/development/libraries/haskell/Hipmunk/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/Hipmunk/default.nix b/pkgs/development/libraries/haskell/Hipmunk/default.nix index c07060cf197..7ee64f4254e 100644 --- a/pkgs/development/libraries/haskell/Hipmunk/default.nix +++ b/pkgs/development/libraries/haskell/Hipmunk/default.nix @@ -2,12 +2,9 @@ cabal.mkDerivation (self: { pname = "Hipmunk"; - version = "5.2.0.10"; - sha256 = "0kq6dlx1g7dra7nsfmrc13yvnl7wh00fadmgln9v2vyf0ww82x95"; + version = "5.2.0.11"; + sha256 = "0pcbwlq0njgj6dzh8h94gml63wv52f6l9hdas378lm7v8gbizxl7"; buildDepends = [ StateVar transformers ]; - patchPhase = '' - sed -i -e 's|containers.*,|containers,|' Hipmunk.cabal - ''; meta = { homepage = "http://patch-tag.com/r/felipe/hipmunk/home"; description = "A Haskell binding for Chipmunk"; From f1e8140966264c189390a2d7897d5cc20a7bd5c5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 17 Jul 2013 19:07:51 +0200 Subject: [PATCH 537/798] haskell-hackage-db: update to version 1.7 --- pkgs/development/libraries/haskell/hackage-db/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hackage-db/default.nix b/pkgs/development/libraries/haskell/hackage-db/default.nix index f3d029a5ea7..46e2913572e 100644 --- a/pkgs/development/libraries/haskell/hackage-db/default.nix +++ b/pkgs/development/libraries/haskell/hackage-db/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "hackage-db"; - version = "1.5"; - sha256 = "1m7f6vwgjzibk8rd14y6m62xv5969ns94a57sansi9d83q6rj9iv"; + version = "1.7"; + sha256 = "0mf22xxbcbjb7l4jahknp6s7lsfn43ib7z9m2jsg9py92vkacfp1"; buildDepends = [ Cabal filepath tar utf8String ]; meta = { homepage = "http://github.com/peti/hackage-db"; From 57ce3126d7fd2924c1ec2b2a36d727dea635453f Mon Sep 17 00:00:00 2001 From: Karn Kallio Date: Wed, 17 Jul 2013 13:07:03 -0430 Subject: [PATCH 538/798] kde-base-artwork: fix hash. --- pkgs/desktops/kde-4.10/kde-base-artwork.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/kde-4.10/kde-base-artwork.nix b/pkgs/desktops/kde-4.10/kde-base-artwork.nix index d953a830641..3f416cebddc 100644 --- a/pkgs/desktops/kde-4.10/kde-base-artwork.nix +++ b/pkgs/desktops/kde-4.10/kde-base-artwork.nix @@ -3,7 +3,7 @@ kde { outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "0mrd3w7rhsj0v92c8rh9zjxyifq7wyvwszksf2gyn53dzd06blk5"; + outputHash = "0mrd3w7rhsj0v92c8rh9zjxyifq7wyvwszksf2gyn53dzd06blk8"; buildInputs = [ kdelibs ]; From 074898e0dbd033a4f88977f866c54c5b7205a3aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Wed, 17 Jul 2013 01:53:30 +0200 Subject: [PATCH 539/798] apcupsd: new package apcupsd is a daemon for controlling APC UPSes. --- pkgs/servers/apcupsd/default.nix | 54 ++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 56 insertions(+) create mode 100644 pkgs/servers/apcupsd/default.nix diff --git a/pkgs/servers/apcupsd/default.nix b/pkgs/servers/apcupsd/default.nix new file mode 100644 index 00000000000..45688ee7fd9 --- /dev/null +++ b/pkgs/servers/apcupsd/default.nix @@ -0,0 +1,54 @@ +{ stdenv, fetchurl, pkgconfig, systemd, utillinux, coreutils, nettools, man +, enableCgiScripts ? true, gd +}: + +stdenv.mkDerivation rec { + pname = "apcupsd"; + name = "${pname}-3.14.10"; + + src = fetchurl { + url = "https://sourceforge/${pname}/${name}.tar.gz"; + sha256 = "0ci0xyg1hzj8lnmm3vxfsvgpb3wdgh1ii3gb8jgdxyqnk7nba1q7"; + }; + + buildInputs = [ pkgconfig utillinux man ] ++ stdenv.lib.optional enableCgiScripts gd; + + # ./configure ignores --prefix, so we must specify some paths manually + # There is no real reason for a bin/sbin split, so just use bin. + preConfigure = '' + export ac_cv_path_SHUTDOWN=${systemd}/sbin/shutdown + export ac_cv_path_WALL=${utillinux}/bin/wall + sed -i 's|/bin/cat|${coreutils}/bin/cat|' configure + export configureFlags="\ + --bindir=$out/bin \ + --sbindir=$out/bin \ + --sysconfdir=$out/etc/apcupsd \ + --mandir=$out/share/man \ + --with-halpolicydir=$out/share/halpolicy \ + --localstatedir=/var/ \ + --with-nologin=/etc \ + --with-log-dir=/var/log/apcupsd \ + --with-pwrfail-dir=/run/apcupsd \ + --with-lock-dir=/run/lock \ + --with-pid-dir=/run \ + --enable-usb \ + ${stdenv.lib.optionalString enableCgiScripts "--enable-cgi --with-cgi-bin=$out/libexec/cgi-bin"} + " + ''; + + postInstall = '' + for file in "$out"/etc/apcupsd/*; do + sed -i -e 's|^WALL=.*|WALL="${utillinux}/bin/wall"|g' \ + -e 's|^HOSTNAME=.*|HOSTNAME="${nettools}/bin/hostname"|g' \ + "$file" + done + ''; + + meta = with stdenv.lib; { + description = "A daemon for controlling APC UPSes"; + homepage = http://www.apcupsd.com/; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = [ maintainers.bjornfor ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a8b2370d1f5..2237430ce7d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5822,6 +5822,8 @@ let sslSupport = true; }); + apcupsd = callPackage ../servers/apcupsd { }; + sabnzbd = callPackage ../servers/sabnzbd { }; bind = callPackage ../servers/dns/bind { }; From dcd3dad3d92a5191c0ef9394b4dfa9b551f1fe0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Wed, 17 Jul 2013 21:10:56 +0200 Subject: [PATCH 540/798] apcupsd: fix download url --- pkgs/servers/apcupsd/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/apcupsd/default.nix b/pkgs/servers/apcupsd/default.nix index 45688ee7fd9..58b3df1b436 100644 --- a/pkgs/servers/apcupsd/default.nix +++ b/pkgs/servers/apcupsd/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { name = "${pname}-3.14.10"; src = fetchurl { - url = "https://sourceforge/${pname}/${name}.tar.gz"; + url = "mirror://sourceforge/${pname}/${name}.tar.gz"; sha256 = "0ci0xyg1hzj8lnmm3vxfsvgpb3wdgh1ii3gb8jgdxyqnk7nba1q7"; }; From a30c06de836908dd92d98760c08698aaafea2bce Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Wed, 17 Jul 2013 22:19:29 +0200 Subject: [PATCH 541/798] Add bitbucket_api and some of its dependencies --- pkgs/top-level/python-packages.nix | 92 ++++++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b223d941196..e532fe47337 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -457,6 +457,26 @@ pythonPackages = python.modules // rec { }; + bitbucket_api = buildPythonPackage rec { + name = "bitbucket-api-0.4.4"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/b/bitbucket-api/${name}.tar.gz"; + md5 = "6f3cee3586c4aad9c0b2e04fce9704fb"; + }; + + propagatedBuildInputs = [ requests_oauth2 nose sh ]; + + doCheck = false; + + meta = { + homepage = https://github.com/Sheeprider/BitBucket-api; + description = "Python library to interact with BitBucket REST API"; + license = pkgs.lib.licenses.mit; + }; + }; + + bitstring = buildPythonPackage rec { name = "bitstring-3.1.2"; @@ -3107,6 +3127,26 @@ pythonPackages = python.modules // rec { }; }); + + oauthlib = buildPythonPackage rec { + name = "oauthlib-0.5.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/o/oauthlib/${name}.tar.gz"; + md5 = "d12c507de33403ebdf290fbffdb98213"; + }; + + buildInputs = [ mock nose unittest2 ]; + + propagatedBuildInputs = [ pycrypto ]; + + meta = { + homepage = https://github.com/idan/oauthlib; + description = "A generic, spec-compliant, thorough implementation of the OAuth request-signing logic"; + }; + }; + + obfsproxy = buildPythonPackage ( rec { name = "obfsproxy-0.2.2"; src = fetchgit { @@ -4473,6 +4513,7 @@ pythonPackages = python.modules // rec { }; }; + requests = buildPythonPackage rec { name = "requests-1.2.0"; @@ -4488,6 +4529,40 @@ pythonPackages = python.modules // rec { }; + requests_oauthlib = buildPythonPackage rec { + name = "requests-oauthlib-0.3.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/r/requests-oauthlib/${name}.tar.gz"; + md5 = "35b3b750493c231145c39db0216813e7"; + }; + + propagatedBuildInputs = [ oauthlib requests ]; + + meta = { + description = "OAuthlib authentication support for Requests"; + homepage = https://github.com/requests/requests-oauthlib; + }; + }; + + + requests_oauth2 = buildPythonPackage rec { + name = "requests-oauth2-0.1.1"; + + src = fetchurl { + url = https://github.com/maraujop/requests-oauth2/archive/0.1.1.tar.gz; + sha256 = "1aij66qg9j5j4vzyh64nbg72y7pcafgjddxsi865racsay43xfqg"; + }; + + propagatedBuildInputs = [ requests_oauthlib ]; + + meta = { + description = "Python's Requests OAuth2 (Open Authentication) plugin"; + homepage = https://github.com/maraujop/requests-oauth2; + }; + }; + + reviewboard = buildPythonPackage rec { name = "ReviewBoard-1.6.16"; @@ -4752,6 +4827,23 @@ pythonPackages = python.modules // rec { }; + sh = buildPythonPackage rec { + name = "sh-1.08"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/s/sh/${name}.tar.gz"; + md5 = "4028bcba85daa0aef579ed24261e88a3"; + }; + + doCheck = false; + + meta = { + description = "Python subprocess interface"; + homepage = http://pypi.python.org/pypi/sh/; + }; + }; + + six = buildPythonPackage rec { name = "six-1.3.0"; From 30f54585d57fd143e65e189e9b1b6e4d67215702 Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Sat, 22 Jun 2013 15:05:32 +0200 Subject: [PATCH 542/798] Add stm32flash, flash program for stm32 bootloader. Signed-off-by: Moritz Ulrich --- .../tools/misc/stm32flash/default.nix | 26 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/tools/misc/stm32flash/default.nix diff --git a/pkgs/development/tools/misc/stm32flash/default.nix b/pkgs/development/tools/misc/stm32flash/default.nix new file mode 100644 index 00000000000..496288285c7 --- /dev/null +++ b/pkgs/development/tools/misc/stm32flash/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, unzip }: + +stdenv.mkDerivation { + name = "stm32flash-1.0"; + + src = fetchurl { + url = https://stm32flash.googlecode.com/files/stm32flash.tar.gz; + sha256 = "04k631g9lzvp9xr4sw51xpq1g542np61s1l8fpwx9rbsc8m5l0i6"; + }; + + buildInputs = []; + + installPhase = '' + # Manually copy, make install copies to /usr/local/bin + mkdir -pv $out/bin/ + cp stm32flash $out/bin/ + ''; + + meta = { + description = "Open source flash program for the STM32 ARM processors using the ST bootloader."; + homepage = https://code.google.com/p/stm32flash/; + license = "GPLv2"; + platforms = stdenv.lib.platforms.all; # Should work on all platforms + maintainers = [ stdenv.lib.maintainers.the-kenny ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2237430ce7d..de84f54a82d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3589,6 +3589,8 @@ let splint = callPackage ../development/tools/analysis/splint { }; + stm32flash = callPackage ../development/tools/misc/stm32flash { }; + strace = callPackage ../development/tools/misc/strace { }; swig = callPackage ../development/tools/misc/swig { }; From ad6fb1fb357ada55a410093fdb072e3d3f1bb45a Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Thu, 18 Jul 2013 00:04:21 +0200 Subject: [PATCH 543/798] Update btsync to 1.1.42. This upgrade is downward compatible down to 1.1.27 (same as prev. version in Nix). Signed-off-by: Moritz Ulrich --- 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 73b456dc9a5..a8c4a535258 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.33"; - sha256 = if stdenv.system == "x86_64-linux" then "1h3b84cbj6w28q591v6ydvmkgv9ydl0qknxjb3vaba0dym5gblvv" - else if stdenv.system == "i686-linux" then "1l7l6najsbqxb01wld54fzgsb122z5a2mlnv1r48sxq26cfwp6bk" + version = "1.1.42"; + sha256 = if stdenv.system == "x86_64-linux" then "07gcjzhhr8simkjjxhyzkvh3748ll81d742fz7j31nwdi34my8ri" + else if stdenv.system == "i686-linux" then "0awf5bfhb4dp4aydzrgdp3wqv1mz6ys1z45i0r1hbqszvf44xj7c" else throw "Bittorrent Sync for: ${stdenv.system} not supported!"; in stdenv.mkDerivation { From f142483de074f4bdb000e60aae1c89ef5244f0f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Tue, 16 Jul 2013 17:33:49 +0200 Subject: [PATCH 544/798] qemu: enable spice protocol support by default We already enable VNC and SDL support by default and adding spice only increases the closure size from 513 MB to 518 MB. Closure size: du -sch $(nix-store -qR ./result) --- pkgs/applications/virtualization/qemu/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 91050619e43..1a35b870192 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -2,7 +2,7 @@ , attr, libcap, vde2, alsaLib, texinfo, libuuid , sdlSupport ? true, SDL , vncSupport ? true, libjpeg, libpng -, spiceSupport ? false, spice, spice_protocol +, spiceSupport ? true, spice, spice_protocol , x86Only ? false }: From d26e46acd61997259a1e7f752821b9e95507c5c5 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Thu, 18 Jul 2013 03:55:22 +0300 Subject: [PATCH 545/798] golly: fix version to match tarball. this time for sure :) --- pkgs/applications/science/misc/golly/src-for-default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/science/misc/golly/src-for-default.nix b/pkgs/applications/science/misc/golly/src-for-default.nix index 331c63aa180..50d3d41a8ba 100644 --- a/pkgs/applications/science/misc/golly/src-for-default.nix +++ b/pkgs/applications/science/misc/golly/src-for-default.nix @@ -1,6 +1,6 @@ rec { version="2.4"; - name="golly-2.4-src"; + name="golly-2.4"; hash="06vajm019q4q4wfy6pc1669fbjqdb4jaxcc419bk0vzky40anl9w"; url="mirror://sourceforge/golly/golly-2.4-src.tar.gz"; advertisedUrl="http://downloads.sourceforge.net/project/golly/golly/golly-2.4/golly-2.4-src.tar.gz"; From 7889b82f32cb37d8e158a8b62d67d44970563a88 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Thu, 18 Jul 2013 08:21:41 +0200 Subject: [PATCH 546/798] updates for python packages: mccabe, pep8, flake8 --- pkgs/top-level/python-packages.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e532fe47337..7d26cdbc7a3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2603,11 +2603,11 @@ pythonPackages = python.modules // rec { mccabe = buildPythonPackage (rec { - name = "mccabe-0.2"; + name = "mccabe-0.2.1"; src = fetchurl { url = "http://pypi.python.org/packages/source/m/mccabe/${name}.tar.gz"; - md5 = "c1012c7c24081471f45aab864d4e3805"; + md5 = "5a3f3fa6a4bad126c88aaaa7dab682f5"; }; buildInputs = [ ]; @@ -3320,11 +3320,11 @@ pythonPackages = python.modules // rec { pep8 = buildPythonPackage rec { name = "pep8-${version}"; - version = "1.4.5"; + version = "1.4.6"; src = fetchurl { url = "http://pypi.python.org/packages/source/p/pep8/${name}.tar.gz"; - md5 = "055dbd22ac5669232fdba752612e9686"; + md5 = "a03bb494859e87b42601b61b1b043a0c"; }; #====================================================================== @@ -3823,11 +3823,11 @@ pythonPackages = python.modules // rec { }; pyflakes = buildPythonPackage rec { - name = "pyflakes-0.6.1"; + name = "pyflakes-0.7.3"; src = fetchurl { url = "http://pypi.python.org/packages/source/p/pyflakes/${name}.tar.gz"; - md5 = "00debd2280b962e915dfee552a675915"; + md5 = "ec94ac11cb110e6e72cca23c104b66b1"; }; buildInputs = [ unittest2 ]; From 181dc4032dcb0a72eebf5f2949f9f56227dbabc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Thu, 18 Jul 2013 03:12:41 +0200 Subject: [PATCH 547/798] Remove the old KQEMU accelerator module KQEMU was a linux kernel module for accelerating the QEMU virtual machine on x86 hardware. Since QEMU 0.11 (and up), there is no support for KQEMU any more, the focus is now on KVM. http://wiki.qemu.org/KQemu/Doc --- pkgs/os-specific/linux/kqemu/default.nix | 28 ------------------------ pkgs/top-level/all-packages.nix | 2 -- pkgs/top-level/release-python.nix | 1 - 3 files changed, 31 deletions(-) delete mode 100644 pkgs/os-specific/linux/kqemu/default.nix diff --git a/pkgs/os-specific/linux/kqemu/default.nix b/pkgs/os-specific/linux/kqemu/default.nix deleted file mode 100644 index 97b7c495bb3..00000000000 --- a/pkgs/os-specific/linux/kqemu/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, fetchurl, kernelDev, perl }: - -stdenv.mkDerivation rec { - name = "kqemu-1.4.0pre1-${kernelDev.version}"; - - src = fetchurl { - url = "http://www.nongnu.org/qemu/${name}.tar.gz"; - sha256 = "14dlmawn3gia1j401ag5si5k1a1vav7jpv86rl37p1hwmr7fihxs"; - }; - - buildInputs = [ perl ]; - - configureFlags = [ ''--PREFIX=$out'' ''--kernel-path=$(ls -d ${kernelDev}/lib/modules/*/build)'' ]; - - preConfigure = '' - sed -e '/#include/i#include ' -i kqemu-linux.c - - sed -e 's/memset/mymemset/g; s/memcpy/mymemcpy/g; s/void [*]my/static void *my/g' -i common/kernel.c - sed -e 's/`uname -r`/'"$(basename ${kernelDev}/lib/modules/*)"'/' -i install.sh - sed -e '/kernel_path=/akernel_path=$out$kernel_path' -i install.sh - sed -e '/depmod/d' -i install.sh - cat install.sh - ''; - - meta = { - description = "Kernel module for QEMU acceleration"; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index de84f54a82d..d85880ac439 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6473,8 +6473,6 @@ let wis_go7007 = callPackage ../os-specific/linux/wis-go7007 { }; - kqemu = callPackage ../os-specific/linux/kqemu { }; - klibc = callPackage ../os-specific/linux/klibc { linuxHeaders = glibc.kernelHeaders; }; diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix index 9cde018632f..2ed725e68ce 100644 --- a/pkgs/top-level/release-python.nix +++ b/pkgs/top-level/release-python.nix @@ -1093,7 +1093,6 @@ in iscsitarget = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; iwlwifi = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; klibc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - kqemu = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; ndiswrapper = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; nvidia_x11 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; nvidia_x11_legacy173 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; From d898762d8b0db968286ed515fd69243ea4a741ed Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 18 Jul 2013 11:05:08 +0200 Subject: [PATCH 548/798] unetbootin: update to version 585 --- pkgs/tools/cd-dvd/unetbootin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/cd-dvd/unetbootin/default.nix b/pkgs/tools/cd-dvd/unetbootin/default.nix index b1fd5a10c2b..0b97f03a9ad 100644 --- a/pkgs/tools/cd-dvd/unetbootin/default.nix +++ b/pkgs/tools/cd-dvd/unetbootin/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, makeWrapper, qt4, utillinux, coreutils, which, p7zip, mtools, syslinux }: -let version = "563"; in +let version = "585"; in stdenv.mkDerivation rec { name = "unetbootin-${version}"; src = fetchurl { url = "mirror://sourceforge/unetbootin/UNetbootin/${version}/unetbootin-source-${version}.tar.gz"; - sha256 = "1j4ka6rjf5akhcdb4pbfdrka9zflhch97b5i42zk1cf8hd6wx939"; + sha256 = "1jwwmh4bfrsy4clmnmk9y7h5cd9nh2z3bbm6qwd5p5aw0ich9vk3"; }; sourceRoot = "."; From 328774ab1fbb665d37acd83cc39da506015f5ecf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 18 Jul 2013 11:40:23 +0200 Subject: [PATCH 549/798] Updating qgis (1.8.0 & geos (3.3.8). I also add libspatialindex and libspatialite, to get the latest qgis building. --- pkgs/applications/misc/qgis/default.nix | 27 ++++++++----- pkgs/applications/misc/qgis/r14988.diff | 38 ------------------- pkgs/development/libraries/geos/default.nix | 16 +++----- .../libraries/libspatialindex/default.nix | 20 ++++++++++ .../libraries/libspatialite/default.nix | 23 +++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 6 files changed, 69 insertions(+), 59 deletions(-) delete mode 100644 pkgs/applications/misc/qgis/r14988.diff create mode 100644 pkgs/development/libraries/libspatialindex/default.nix create mode 100644 pkgs/development/libraries/libspatialite/default.nix diff --git a/pkgs/applications/misc/qgis/default.nix b/pkgs/applications/misc/qgis/default.nix index 834b3f0cfbe..d6711c82968 100644 --- a/pkgs/applications/misc/qgis/default.nix +++ b/pkgs/applications/misc/qgis/default.nix @@ -1,25 +1,32 @@ { stdenv, fetchurl, gdal, cmake, qt4, flex, bison, proj, geos, x11, sqlite, gsl, - pyqt4, qwt, fcgi, python }: + pyqt4, qwt, fcgi, python, libspatialindex, libspatialite }: stdenv.mkDerivation rec { - name = "qgis-1.6.0"; + name = "qgis-1.8.0"; buildInputs = [ gdal qt4 flex bison proj geos x11 sqlite gsl pyqt4 qwt - fcgi ]; + fcgi libspatialindex libspatialite ]; - nativeBuildInputs = [ cmake python]; + nativeBuildInputs = [ cmake python ]; - patches = [ ./r14988.diff ]; + enableParallelBuilding = true; + + # To handle the lack of 'local' RPATH; required, as they call one of + # their built binaries requiring their libs, in the build process. + preBuild = '' + export LD_LIBRARY_PATH=`pwd`/output/lib:$LD_LIBRARY_PATH + ''; src = fetchurl { url = "http://qgis.org/downloads/${name}.tar.bz2"; - sha256 = "0vlz1z3scj3k6nxf3hzfiq7k2773i6xvk6dvj4axs2f4njpnx7pr"; + sha256 = "1aq32ch61bqsvh39lmrxah1fmh18cd3nqyi1l0sn6ssa3kwf82vh"; }; meta = { - description = "user friendly Open Source Geographic Information System"; - homepage = ttp://www.qgis.org; - # you can choose one of the following licenses: - license = [ "GPL" ]; + description = "User friendly Open Source Geographic Information System"; + homepage = http://www.qgis.org; + license = "GPLv2+"; + platforms = with stdenv.lib.platforms; linux; + maintainers = with stdenv.lib.maintainers; [viric]; }; } diff --git a/pkgs/applications/misc/qgis/r14988.diff b/pkgs/applications/misc/qgis/r14988.diff deleted file mode 100644 index 95d55047e1d..00000000000 --- a/pkgs/applications/misc/qgis/r14988.diff +++ /dev/null @@ -1,38 +0,0 @@ -Index: qgis/python/core/conversions.sip -=================================================================== ---- qgis/python/core/conversions.sip (revision 14323) -+++ qgis/python/core/conversions.sip (revision 14988) -@@ -16,4 +16,5 @@ - - %Feature QSETINT_CONVERSION -+%Feature QSETTYPE_CONVERSION - - %ModuleHeaderCode -@@ -321,5 +322,5 @@ - %End - -- -+%If (QSETTYPE_CONVERSION) - template - %MappedType QSet -@@ -395,6 +396,5 @@ - - }; -- -- -+%End - - template -Index: qgis/python/CMakeLists.txt -=================================================================== ---- qgis/python/CMakeLists.txt (revision 14330) -+++ qgis/python/CMakeLists.txt (revision 14988) -@@ -44,4 +44,8 @@ - ENDIF(NOT PYQT4_VERSION_NUM LESS 263941) - -+IF(NOT PYQT4_VERSION_NUM LESS 264194) # 0x040802 -+ SET(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} QSETTYPE_CONVERSION) -+ENDIF(NOT PYQT4_VERSION_NUM LESS 264194) -+ - # core module - FILE(GLOB sip_files_core core/*.sip) diff --git a/pkgs/development/libraries/geos/default.nix b/pkgs/development/libraries/geos/default.nix index 734bde71338..56c3c3e7a2b 100644 --- a/pkgs/development/libraries/geos/default.nix +++ b/pkgs/development/libraries/geos/default.nix @@ -2,7 +2,7 @@ let inherit (composableDerivation) edf; in -composableDerivation.composableDerivation {} { +composableDerivation.composableDerivation {} rec { flags = # python and ruby untested @@ -10,20 +10,14 @@ composableDerivation.composableDerivation {} { # (if args.use_svn then ["libtool" "autoconf" "automake" "swig"] else []) # // edf { name = "ruby"; enable = { buildInputs = [ ruby ]; };} - name = "geos-3.2.2"; + name = "geos-3.3.8"; src = fetchurl { - url = http://download.osgeo.org/geos/geos-3.2.2.tar.bz2; - sha256 = "0711wcq46h7zgvp0bk4m60vmx1wal9db1q36mayf0vwk34hprpr4"; + url = "http://download.osgeo.org/geos/${name}.tar.bz2"; + sha256 = "0fshz8s9g610ycl4grrmcdcxb01aqpc6qac3x3jjik0vlz8x9v7b"; }; - # for development version. can be removed ? - #configurePhase = " - # [ -f configure ] || \\ - # LIBTOOLIZE=libtoolize ./autogen.sh - # [>{ automake --add-missing; autoconf; } - # unset configurePhase; configurePhase - #"; + enableParallelBuilding = true; meta = { description = "C++ port of the Java Topology Suite (JTS)"; diff --git a/pkgs/development/libraries/libspatialindex/default.nix b/pkgs/development/libraries/libspatialindex/default.nix new file mode 100644 index 00000000000..c48c5265fc4 --- /dev/null +++ b/pkgs/development/libraries/libspatialindex/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl }: + +let version = "1.8.1"; in + +stdenv.mkDerivation rec { + name = "libspatialindex-${version}"; + + src = fetchurl { + url = "http://download.osgeo.org/libspatialindex/spatialindex-src-${version}.tar.gz"; + sha256 = "1ay1kxn4baccd0cqx466v7fn8c8gcfbhlnd5mbdnd7s4aw0ix88j"; + }; + + enableParallelBuilding = true; + + meta = { + description = "Extensible spatial index library in C++"; + homepage = http://libspatialindex.github.io/; + license = "MIT"; + }; +} diff --git a/pkgs/development/libraries/libspatialite/default.nix b/pkgs/development/libraries/libspatialite/default.nix new file mode 100644 index 00000000000..d5b401b804f --- /dev/null +++ b/pkgs/development/libraries/libspatialite/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, sqlite, zlib, proj, geos }: + +stdenv.mkDerivation rec { + name = "libspatialite-4.1.1"; + + src = fetchurl { + url = "http://www.gaia-gis.it/gaia-sins/${name}.tar.gz"; + sha256 = "03wikddl60ly0yh8szrra1ng2iccsdzz645vkn6a7x2jz45a5084"; + }; + + buildInputs = [ sqlite zlib proj geos ]; + + configureFlags = "--disable-freexl"; + + enableParallelBuilding = true; + + meta = { + description = "Extensible spatial index library in C++"; + homepage = https://www.gaia-gis.it/fossil/libspatialite; + # They allow any of these + license = [ "GPLv2+" "LGPLv2+" "MPL1.1" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d85880ac439..2505f239a86 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4786,6 +4786,10 @@ let libstartup_notification = callPackage ../development/libraries/startup-notification { }; + libspatialindex = callPackage ../development/libraries/libspatialindex { }; + + libspatialite = callPackage ../development/libraries/libspatialite { }; + libtasn1 = callPackage ../development/libraries/libtasn1 { }; libtheora = callPackage ../development/libraries/libtheora { }; From 906097c1e8239fae5f96043fad84172f16d8f1d6 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 18 Jul 2013 10:51:34 -0400 Subject: [PATCH 550/798] Add uptime nodePackage (and update the rest) Signed-off-by: Shea Levy --- pkgs/top-level/node-packages-generated.nix | 63 ++++++++-------------- pkgs/top-level/node-packages.json | 1 + 2 files changed, 24 insertions(+), 40 deletions(-) diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix index f628e2513bc..142fc961685 100644 --- a/pkgs/top-level/node-packages-generated.nix +++ b/pkgs/top-level/node-packages-generated.nix @@ -1708,17 +1708,6 @@ sha1 = "f76f791e0d1b22649e11beeacddf8e62bd89ca2a"; tarball = "http://registry.npmjs.org/gridfs-stream/-/gridfs-stream-0.4.0.tgz"; } - { - name = "growl"; - spec = "1.5.x"; - version = "1.5.1"; - topLevel = false; - dependencies = [ - ]; - patchLatest = false; - sha1 = "1decd1f22a4b30dae7d363799ec624cf40cc0070"; - tarball = "http://registry.npmjs.org/growl/-/growl-1.5.1.tgz"; - } { name = "growl"; spec = "1.7.x"; @@ -2621,22 +2610,6 @@ sha1 = "95fc936622ce156b8b19ff8def466ac2f3a3f29e"; tarball = "http://registry.npmjs.org/mocha/-/mocha-1.12.0.tgz"; } - { - name = "mocha"; - spec = "~1.3.2"; - version = "1.3.2"; - topLevel = false; - dependencies = [ - { name = "commander"; spec = "0.6.1"; } - { name = "growl"; spec = "1.5.x"; } - { name = "jade"; spec = "0.26.3"; } - { name = "diff"; spec = "1.0.2"; } - { name = "debug"; spec = "*"; } - ]; - patchLatest = false; - sha1 = "ab97b4f1e5942b9fe4d4436b8bd9eeda0eb01e13"; - tarball = "http://registry.npmjs.org/mocha/-/mocha-1.3.2.tgz"; - } { name = "mongodb"; spec = "1.2.x"; @@ -2684,15 +2657,14 @@ { name = "mongoose-schema-extend"; spec = "*"; - version = "0.1.3"; + version = "0.1.4"; topLevel = true; dependencies = [ { name = "owl-deepcopy"; spec = "~0.0.1"; } - { name = "mocha"; spec = "~1.3.2"; } ]; patchLatest = false; - sha1 = "8ee39f48c7a0beb4aad555c25cbac59fe7bd6502"; - tarball = "http://registry.npmjs.org/mongoose-schema-extend/-/mongoose-schema-extend-0.1.3.tgz"; + sha1 = "9f61b2abba5352fcd3d7b1193ee4b4d9f2a83804"; + tarball = "http://registry.npmjs.org/mongoose-schema-extend/-/mongoose-schema-extend-0.1.4.tgz"; } { name = "monocle"; @@ -3001,14 +2973,14 @@ { name = "nopt"; spec = "2"; - version = "2.1.1"; + version = "2.1.2"; topLevel = false; dependencies = [ { name = "abbrev"; spec = "1"; } ]; patchLatest = false; - sha1 = "91eb7c4b017e7c00adcad1fd6d63944d0fdb75c1"; - tarball = "http://registry.npmjs.org/nopt/-/nopt-2.1.1.tgz"; + sha1 = "6cccd977b80132a07731d6e8ce58c2c8303cf9af"; + tarball = "http://registry.npmjs.org/nopt/-/nopt-2.1.2.tgz"; } { name = "nopt"; @@ -3025,14 +2997,14 @@ { name = "nopt"; spec = "~2.1.1"; - version = "2.1.1"; + version = "2.1.2"; topLevel = false; dependencies = [ { name = "abbrev"; spec = "1"; } ]; patchLatest = false; - sha1 = "91eb7c4b017e7c00adcad1fd6d63944d0fdb75c1"; - tarball = "http://registry.npmjs.org/nopt/-/nopt-2.1.1.tgz"; + sha1 = "6cccd977b80132a07731d6e8ce58c2c8303cf9af"; + tarball = "http://registry.npmjs.org/nopt/-/nopt-2.1.2.tgz"; } { name = "normalize-package-data"; @@ -4541,13 +4513,13 @@ { name = "stack-trace"; spec = "0.0.x"; - version = "0.0.6"; + version = "0.0.7"; topLevel = false; dependencies = [ ]; patchLatest = false; - sha1 = "1e719bd6a2629ff09c189e17a9ef902a94fc5db0"; - tarball = "http://registry.npmjs.org/stack-trace/-/stack-trace-0.0.6.tgz"; + sha1 = "c72e089744fc3659f508cdce3621af5634ec0fff"; + tarball = "http://registry.npmjs.org/stack-trace/-/stack-trace-0.0.7.tgz"; } { name = "stream-counter"; @@ -4907,6 +4879,17 @@ sha1 = "71c08bf6b428b1133f37e78fa3a21c82f7329b0d"; tarball = "http://registry.npmjs.org/underscore.string/-/underscore.string-2.3.3.tgz"; } + { + name = "uptime"; + spec = "*"; + version = "0.0.3"; + topLevel = true; + dependencies = [ + ]; + patchLatest = false; + sha1 = "bc94f617767813e2450e035aa6ba6468fa13a07d"; + tarball = "http://registry.npmjs.org/uptime/-/uptime-0.0.3.tgz"; + } { name = "util"; spec = ">= 0.4.9"; diff --git a/pkgs/top-level/node-packages.json b/pkgs/top-level/node-packages.json index 06c8f541cc7..e8533a39882 100644 --- a/pkgs/top-level/node-packages.json +++ b/pkgs/top-level/node-packages.json @@ -63,4 +63,5 @@ , "npm" , "gridfs-stream" , "tar" +, "uptime" ] From 4ac1973ec524139be2f4d3ba6139f6d423652ed7 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 18 Jul 2013 11:14:56 -0400 Subject: [PATCH 551/798] Update npm2nix Signed-off-by: Shea Levy --- pkgs/top-level/node-packages-generated.nix | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix index 142fc961685..736b726ea00 100644 --- a/pkgs/top-level/node-packages-generated.nix +++ b/pkgs/top-level/node-packages-generated.nix @@ -3127,17 +3127,18 @@ { name = "npm2nix"; spec = "*"; - version = "2.0.1"; + version = "3.0.0"; topLevel = true; dependencies = [ { name = "semver"; spec = ">=2.0.10 <3.0.0"; } { name = "argparse"; spec = "0.1.15"; } { name = "npm-registry-client"; spec = "0.2.27"; } { name = "npmconf"; spec = "0.1.1"; } + { name = "tar"; spec = "0.1.17"; } ]; patchLatest = false; - sha1 = "bf50c8436339d309446582810ce0fff07f307d04"; - tarball = "http://registry.npmjs.org/npm2nix/-/npm2nix-2.0.1.tgz"; + sha1 = "e7efdddb685c35239c8ad00d5af32a391b6bc4a8"; + tarball = "http://registry.npmjs.org/npm2nix/-/npm2nix-3.0.0.tgz"; } { name = "npmconf"; @@ -4666,6 +4667,20 @@ sha1 = "408c8a95deb8e78a65b59b1a51a333183a32badc"; tarball = "http://registry.npmjs.org/tar/-/tar-0.1.17.tgz"; } + { + name = "tar"; + spec = "0.1.17"; + version = "0.1.17"; + topLevel = false; + dependencies = [ + { name = "inherits"; spec = "1.x"; } + { name = "block-stream"; spec = "*"; } + { name = "fstream"; spec = "~0.1.8"; } + ]; + patchLatest = false; + sha1 = "408c8a95deb8e78a65b59b1a51a333183a32badc"; + tarball = "http://registry.npmjs.org/tar/-/tar-0.1.17.tgz"; + } { name = "tar"; spec = "~0.1.17"; From 870dd29077a2b0a65cbff68cf57dbc6e96ff4c89 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 18 Jul 2013 11:21:38 -0400 Subject: [PATCH 552/798] Update npm2nix, again (found a bug right away) Signed-off-by: Shea Levy --- pkgs/top-level/node-packages-generated.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix index 736b726ea00..3ba9413a8a9 100644 --- a/pkgs/top-level/node-packages-generated.nix +++ b/pkgs/top-level/node-packages-generated.nix @@ -3127,7 +3127,7 @@ { name = "npm2nix"; spec = "*"; - version = "3.0.0"; + version = "3.0.1"; topLevel = true; dependencies = [ { name = "semver"; spec = ">=2.0.10 <3.0.0"; } @@ -3137,8 +3137,8 @@ { name = "tar"; spec = "0.1.17"; } ]; patchLatest = false; - sha1 = "e7efdddb685c35239c8ad00d5af32a391b6bc4a8"; - tarball = "http://registry.npmjs.org/npm2nix/-/npm2nix-3.0.0.tgz"; + sha1 = "76ddefae0a2e82c769007d113f5e9c725fc9957b"; + tarball = "http://registry.npmjs.org/npm2nix/-/npm2nix-3.0.1.tgz"; } { name = "npmconf"; From 792e51e1ef2f09b16c21eab580b5fb78185867e4 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 18 Jul 2013 12:02:56 -0400 Subject: [PATCH 553/798] Yet anoterh npm2nix update Signed-off-by: Shea Levy --- pkgs/top-level/node-packages-generated.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix index 3ba9413a8a9..7696e0327c1 100644 --- a/pkgs/top-level/node-packages-generated.nix +++ b/pkgs/top-level/node-packages-generated.nix @@ -3127,7 +3127,7 @@ { name = "npm2nix"; spec = "*"; - version = "3.0.1"; + version = "3.0.3"; topLevel = true; dependencies = [ { name = "semver"; spec = ">=2.0.10 <3.0.0"; } @@ -3137,8 +3137,8 @@ { name = "tar"; spec = "0.1.17"; } ]; patchLatest = false; - sha1 = "76ddefae0a2e82c769007d113f5e9c725fc9957b"; - tarball = "http://registry.npmjs.org/npm2nix/-/npm2nix-3.0.1.tgz"; + sha1 = "425e47672a9088dbd00a325eda6b7b1e92a3190b"; + tarball = "http://registry.npmjs.org/npm2nix/-/npm2nix-3.0.3.tgz"; } { name = "npmconf"; From 3016640375bf8eb19234b3807701c13583f78af1 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 18 Jul 2013 12:09:27 -0400 Subject: [PATCH 554/798] Add the right uptime nodePackage Signed-off-by: Shea Levy --- pkgs/top-level/node-packages-generated.nix | 581 ++++++++++++++++++++- pkgs/top-level/node-packages.json | 2 +- 2 files changed, 571 insertions(+), 12 deletions(-) diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix index 7696e0327c1..37db5db9ed8 100644 --- a/pkgs/top-level/node-packages-generated.nix +++ b/pkgs/top-level/node-packages-generated.nix @@ -21,6 +21,29 @@ sha1 = "bd55ae5e413ba1722ee4caba1f6ea10414a59ecd"; tarball = "http://registry.npmjs.org/abbrev/-/abbrev-1.0.4.tgz"; } + { + name = "active-x-obfuscator"; + spec = "0.0.1"; + version = "0.0.1"; + topLevel = false; + dependencies = [ + { name = "zeparser"; spec = "0.0.5"; } + ]; + patchLatest = false; + sha1 = "089b89b37145ff1d9ec74af6530be5526cae1f1a"; + tarball = "http://registry.npmjs.org/active-x-obfuscator/-/active-x-obfuscator-0.0.1.tgz"; + } + { + name = "addressparser"; + spec = "~0.1"; + version = "0.1.3"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "9e9ab43d257e1ae784e1df5f580c9f5240f58874"; + tarball = "http://registry.npmjs.org/addressparser/-/addressparser-0.1.3.tgz"; + } { name = "amdefine"; spec = "*"; @@ -101,6 +124,19 @@ sha1 = "28a1f72c43113e763220e5708414301c8840f0a1"; tarball = "http://registry.npmjs.org/argparse/-/argparse-0.1.15.tgz"; } + { + name = "argparse"; + spec = "~ 0.1.11"; + version = "0.1.15"; + topLevel = false; + dependencies = [ + { name = "underscore"; spec = "~1.4.3"; } + { name = "underscore.string"; spec = "~2.3.1"; } + ]; + patchLatest = false; + sha1 = "28a1f72c43113e763220e5708414301c8840f0a1"; + tarball = "http://registry.npmjs.org/argparse/-/argparse-0.1.15.tgz"; + } { name = "asn1"; spec = "0.1.11"; @@ -146,6 +182,17 @@ sha1 = "df63060fbf3d33286a76aaf6d55a2986d9ff8619"; tarball = "http://registry.npmjs.org/async/-/async-0.2.9.tgz"; } + { + name = "async"; + spec = "0.1.22"; + version = "0.1.22"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "0fc1aaa088a0e3ef0ebe2d8831bab0dcf8845061"; + tarball = "http://registry.npmjs.org/async/-/async-0.1.22.tgz"; + } { name = "async"; spec = "0.1.x"; @@ -261,6 +308,17 @@ sha1 = "19b4e9f9fb75c122ad7bb1c6c376d6085d43ea09"; tarball = "http://registry.npmjs.org/backoff/-/backoff-2.1.0.tgz"; } + { + name = "base64id"; + spec = "0.1.0"; + version = "0.1.0"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "02ce0fdeee0cef4f40080e1e73e834f0b1bfce3f"; + tarball = "http://registry.npmjs.org/base64id/-/base64id-0.1.0.tgz"; + } { name = "bcrypt"; spec = "*"; @@ -594,6 +652,17 @@ sha1 = "6355d32cf1b04cdff6b484e5e711782b2f0c39be"; tarball = "http://registry.npmjs.org/coffee-script/-/coffee-script-1.6.3.tgz"; } + { + name = "coffee-script"; + spec = ">=1.2.0"; + version = "1.6.3"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "6355d32cf1b04cdff6b484e5e711782b2f0c39be"; + tarball = "http://registry.npmjs.org/coffee-script/-/coffee-script-1.6.3.tgz"; + } { name = "colors"; spec = "0.6.0-1"; @@ -673,6 +742,31 @@ sha1 = "fd5713bfa153c7d6cc599378a5ab4c45c535029e"; tarball = "http://registry.npmjs.org/commander/-/commander-1.2.0.tgz"; } + { + name = "commander"; + spec = "~0.6.1"; + version = "0.6.1"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "fa68a14f6a945d54dbbe50d8cdb3320e9e3b1a06"; + tarball = "http://registry.npmjs.org/commander/-/commander-0.6.1.tgz"; + } + { + name = "config"; + spec = "0.4.15"; + version = "0.4.15"; + topLevel = false; + dependencies = [ + { name = "js-yaml"; spec = "0.3.x"; } + { name = "coffee-script"; spec = ">=1.2.0"; } + { name = "vows"; spec = ">=0.5.13"; } + ]; + patchLatest = false; + sha1 = "d43ddf58b8df5637fdd1314fc816ccae7bfbcd18"; + tarball = "http://registry.npmjs.org/config/-/config-0.4.15.tgz"; + } { name = "config-chain"; spec = "~1.1.1"; @@ -707,6 +801,27 @@ sha1 = "139111b4b03f0533a524927a88a646ae467b2c02"; tarball = "http://registry.npmjs.org/connect/-/connect-2.7.5.tgz"; } + { + name = "connect"; + spec = "2.7.6"; + version = "2.7.6"; + topLevel = false; + dependencies = [ + { name = "qs"; spec = "0.5.1"; } + { name = "formidable"; spec = "1.0.11"; } + { name = "cookie-signature"; spec = "1.0.1"; } + { name = "buffer-crc32"; spec = "0.1.1"; } + { name = "cookie"; spec = "0.0.5"; } + { name = "send"; spec = "0.1.0"; } + { name = "bytes"; spec = "0.2.0"; } + { name = "fresh"; spec = "0.1.0"; } + { name = "pause"; spec = "0.0.1"; } + { name = "debug"; spec = "*"; } + ]; + patchLatest = false; + sha1 = "b83b68fa6f245c5020e2395472cc8322b0060738"; + tarball = "http://registry.npmjs.org/connect/-/connect-2.7.6.tgz"; + } { name = "connect"; spec = "2.8.4"; @@ -764,6 +879,17 @@ sha1 = "d8630f26d95a7f851f9956b1e8cc6732f3b6aa30"; tarball = "http://registry.npmjs.org/connect-flash/-/connect-flash-0.1.1.tgz"; } + { + name = "connect-flash"; + spec = "0.1.0"; + version = "0.1.0"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "82b381d61a12b651437df1c259c1f1c841239b88"; + tarball = "http://registry.npmjs.org/connect-flash/-/connect-flash-0.1.0.tgz"; + } { name = "connect-mongo"; spec = "*"; @@ -1079,6 +1205,17 @@ sha1 = "4ae73f1aee8d6fcf484f1a1ce77ce651d9b7f0c9"; tarball = "http://registry.npmjs.org/diff/-/diff-1.0.2.tgz"; } + { + name = "diff"; + spec = "~1.0.3"; + version = "1.0.5"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "664b6bdb113fb3a51ced79aff621badeed29a02c"; + tarball = "http://registry.npmjs.org/diff/-/diff-1.0.5.tgz"; + } { name = "director"; spec = "1.1.10"; @@ -1112,6 +1249,17 @@ sha1 = "478920f77bca6c1c1749d5e3edde4bd5966efda8"; tarball = "http://registry.npmjs.org/editor/-/editor-0.0.4.tgz"; } + { + name = "ejs"; + spec = "0.8.3"; + version = "0.8.3"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "db8aac47ff80a7df82b4c82c126fe8970870626f"; + tarball = "http://registry.npmjs.org/ejs/-/ejs-0.8.3.tgz"; + } { name = "emitter-component"; spec = "1.0.0"; @@ -1123,6 +1271,18 @@ sha1 = "f04dd18fc3dc3e9a74cbc0f310b088666e4c016f"; tarball = "http://registry.npmjs.org/emitter-component/-/emitter-component-1.0.0.tgz"; } + { + name = "encoding"; + spec = "~0.1"; + version = "0.1.6"; + topLevel = false; + dependencies = [ + { name = "iconv-lite"; spec = "0.2.7"; } + ]; + patchLatest = false; + sha1 = "fec66b6d1c6b8cc554aa78c05ece35bef11a913f"; + tarball = "http://registry.npmjs.org/encoding/-/encoding-0.1.6.tgz"; + } { name = "escape-html"; spec = "*"; @@ -1134,6 +1294,17 @@ sha1 = "fedcd79564444ddaf2bd85b22c9961b3a3a38bf5"; tarball = "http://registry.npmjs.org/escape-html/-/escape-html-1.0.0.tgz"; } + { + name = "esprima"; + spec = "~ 1.0.2"; + version = "1.0.3"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "7bdb544f95526d424808654d3b8fbe928650c0fe"; + tarball = "http://registry.npmjs.org/esprima/-/esprima-1.0.3.tgz"; + } { name = "event-stream"; spec = "~0.5"; @@ -1201,6 +1372,28 @@ sha1 = "9abf22017213a8f6f54a421ce22b8ec27b7def62"; tarball = "http://registry.npmjs.org/express/-/express-3.3.4.tgz"; } + { + name = "express"; + spec = "3.2.0"; + version = "3.2.0"; + topLevel = false; + dependencies = [ + { name = "connect"; spec = "2.7.6"; } + { name = "commander"; spec = "0.6.1"; } + { name = "range-parser"; spec = "0.0.4"; } + { name = "mkdirp"; spec = "~0.3.4"; } + { name = "cookie"; spec = "0.0.5"; } + { name = "buffer-crc32"; spec = "~0.2.1"; } + { name = "fresh"; spec = "0.1.0"; } + { name = "methods"; spec = "0.0.1"; } + { name = "send"; spec = "0.1.0"; } + { name = "cookie-signature"; spec = "1.0.1"; } + { name = "debug"; spec = "*"; } + ]; + patchLatest = false; + sha1 = "7b66d6c66b038038eedf452804222b3077374ae0"; + tarball = "http://registry.npmjs.org/express/-/express-3.2.0.tgz"; + } { name = "express"; spec = "~3.1.1"; @@ -1223,6 +1416,17 @@ sha1 = "52a02c8db8f22bbfa0d7478d847cd45161f985f7"; tarball = "http://registry.npmjs.org/express/-/express-3.1.2.tgz"; } + { + name = "express-partials"; + spec = "0.0.6"; + version = "0.0.6"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "b2664f15c636d5248e60fdbe29131c4440552eda"; + tarball = "http://registry.npmjs.org/express-partials/-/express-partials-0.0.6.tgz"; + } { name = "extend"; spec = "*"; @@ -1267,6 +1471,17 @@ sha1 = "62cf120234c683785d902348a800ef3e0cc20bc0"; tarball = "http://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz"; } + { + name = "eyes"; + spec = ">=0.1.6"; + version = "0.1.8"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "62cf120234c683785d902348a800ef3e0cc20bc0"; + tarball = "http://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz"; + } { name = "faye-websocket"; spec = "*"; @@ -1931,6 +2146,17 @@ sha1 = "9c5806d50d374d09ad76e13da4c6d7357e8c555b"; tarball = "http://registry.npmjs.org/i18next/-/i18next-1.6.8.tgz"; } + { + name = "iconv-lite"; + spec = "0.2.7"; + version = "0.2.7"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "45be2390d27af4b7613aac4ee4d957e3f4cbdb54"; + tarball = "http://registry.npmjs.org/iconv-lite/-/iconv-lite-0.2.7.tgz"; + } { name = "inherits"; spec = "1"; @@ -2076,6 +2302,30 @@ sha1 = "348a83baaec3b5fb9901c7efe7e64cdd1a8f46e2"; tarball = "http://registry.npmjs.org/jayschema/-/jayschema-0.1.5.tgz"; } + { + name = "js-yaml"; + spec = "0.3.x"; + version = "0.3.7"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "d739d8ee86461e54b354d6a7d7d1f2ad9a167f62"; + tarball = "http://registry.npmjs.org/js-yaml/-/js-yaml-0.3.7.tgz"; + } + { + name = "js-yaml"; + spec = "2.1.0"; + version = "2.1.0"; + topLevel = false; + dependencies = [ + { name = "argparse"; spec = "~ 0.1.11"; } + { name = "esprima"; spec = "~ 1.0.2"; } + ]; + patchLatest = false; + sha1 = "a55a6e4706b01d06326259a6f4bfc42e6ae38b1f"; + tarball = "http://registry.npmjs.org/js-yaml/-/js-yaml-2.1.0.tgz"; + } { name = "jshint"; spec = "*"; @@ -2303,6 +2553,19 @@ sha1 = "1cee12d5a9f28ed1ee37e9c332b8888e6b85412a"; tarball = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.3.0.tgz"; } + { + name = "mailcomposer"; + spec = ">= 0.1.27"; + version = "0.2.1"; + topLevel = false; + dependencies = [ + { name = "mimelib"; spec = "~0.2"; } + { name = "mime"; spec = "1.2.9"; } + ]; + patchLatest = false; + sha1 = "89e1326147fb2c222feb931b40e98b6be133f14a"; + tarball = "http://registry.npmjs.org/mailcomposer/-/mailcomposer-0.2.1.tgz"; + } { name = "methods"; spec = "0.0.1"; @@ -2391,6 +2654,19 @@ sha1 = "009cd40867bd35de521b3b966f04e2f8d4d13d09"; tarball = "http://registry.npmjs.org/mime/-/mime-1.2.9.tgz"; } + { + name = "mimelib"; + spec = "~0.2"; + version = "0.2.12"; + topLevel = false; + dependencies = [ + { name = "encoding"; spec = "~0.1"; } + { name = "addressparser"; spec = "~0.1"; } + ]; + patchLatest = false; + sha1 = "5dcbb99c7369e5d62d7e12e71fa334179aebd748"; + tarball = "http://registry.npmjs.org/mimelib/-/mimelib-0.2.12.tgz"; + } { name = "minimatch"; spec = "0"; @@ -2610,6 +2886,29 @@ sha1 = "95fc936622ce156b8b19ff8def466ac2f3a3f29e"; tarball = "http://registry.npmjs.org/mocha/-/mocha-1.12.0.tgz"; } + { + name = "moment"; + spec = "2.1.0"; + version = "2.1.0"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "1fd7b1134029a953c6ea371dbaee37598ac03567"; + tarball = "http://registry.npmjs.org/moment/-/moment-2.1.0.tgz"; + } + { + name = "mongodb"; + spec = "1.2.14"; + version = "1.2.14"; + topLevel = false; + dependencies = [ + { name = "bson"; spec = "0.1.8"; } + ]; + patchLatest = false; + sha1 = "269665552066437308d0942036646e6795c3a9a3"; + tarball = "http://registry.npmjs.org/mongodb/-/mongodb-1.2.14.tgz"; + } { name = "mongodb"; spec = "1.2.x"; @@ -2654,6 +2953,35 @@ sha1 = "272f1575da3b48ec31467abdf15baa61854ba5f1"; tarball = "http://registry.npmjs.org/mongoose/-/mongoose-3.6.15.tgz"; } + { + name = "mongoose"; + spec = "3.6.7"; + version = "3.6.7"; + topLevel = false; + dependencies = [ + { name = "hooks"; spec = "0.2.1"; } + { name = "mongodb"; spec = "1.2.14"; } + { name = "ms"; spec = "0.1.0"; } + { name = "sliced"; spec = "0.0.3"; } + { name = "muri"; spec = "0.3.1"; } + { name = "mpromise"; spec = "0.2.1"; } + { name = "mpath"; spec = "0.1.1"; } + ]; + patchLatest = false; + sha1 = "aa6c9f4dfb740c7721dbe734fbb97714e5ab0ebc"; + tarball = "http://registry.npmjs.org/mongoose/-/mongoose-3.6.7.tgz"; + } + { + name = "mongoose-lifecycle"; + spec = "1.0.0"; + version = "1.0.0"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "3bac3f3924a845d147784fc6558dee900b0151e2"; + tarball = "http://registry.npmjs.org/mongoose-lifecycle/-/mongoose-lifecycle-1.0.0.tgz"; + } { name = "mongoose-schema-extend"; spec = "*"; @@ -2822,6 +3150,18 @@ sha1 = "12ec7b4a9f3b4c894c31d8c4ec015925ba547eec"; tarball = "http://registry.npmjs.org/negotiator/-/negotiator-0.2.5.tgz"; } + { + name = "net-ping"; + spec = "1.1.7"; + version = "1.1.7"; + topLevel = false; + dependencies = [ + { name = "raw-socket"; spec = "*"; } + ]; + patchLatest = false; + sha1 = "49f5bca55a30a3726d69253557f231135a637075"; + tarball = "http://registry.npmjs.org/net-ping/-/net-ping-1.1.7.tgz"; + } { name = "nib"; spec = "0.5.0"; @@ -2904,6 +3244,31 @@ sha1 = "2b81f9c1b9cd3cc8fd56fe776744814e394d3427"; tarball = "http://registry.npmjs.org/node-gyp/-/node-gyp-0.10.6.tgz"; } + { + name = "node-uptime"; + spec = "https://github.com/fzaninotto/uptime/tarball/1c65756575f90f563a752e2a22892ba2981c79b7"; + version = "3.2.0"; + topLevel = true; + dependencies = [ + { name = "mongoose"; spec = "3.6.7"; } + { name = "mongoose-lifecycle"; spec = "1.0.0"; } + { name = "express"; spec = "3.2.0"; } + { name = "express-partials"; spec = "0.0.6"; } + { name = "connect-flash"; spec = "0.1.0"; } + { name = "ejs"; spec = "0.8.3"; } + { name = "config"; spec = "0.4.15"; } + { name = "async"; spec = "0.1.22"; } + { name = "socket.io"; spec = "0.9.14"; } + { name = "semver"; spec = "1.1.0"; } + { name = "moment"; spec = "2.1.0"; } + { name = "nodemailer"; spec = "0.3.35"; } + { name = "net-ping"; spec = "1.1.7"; } + { name = "js-yaml"; spec = "2.1.0"; } + ]; + patchLatest = false; + sha256 = "46424d7f9553ce7313cc09995ab11d237dd02257c29f260cfb38d2799e7c7746"; + tarball = "https://github.com/fzaninotto/uptime/tarball/1c65756575f90f563a752e2a22892ba2981c79b7"; + } { name = "node-uuid"; spec = "*"; @@ -2959,6 +3324,20 @@ sha1 = "07f9b2337572ff6275c775e1d48513f3a45d7a65"; tarball = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.4.0.tgz"; } + { + name = "nodemailer"; + spec = "0.3.35"; + version = "0.3.35"; + topLevel = false; + dependencies = [ + { name = "mailcomposer"; spec = ">= 0.1.27"; } + { name = "simplesmtp"; spec = ">= 0.1.22"; } + { name = "optimist"; spec = "*"; } + ]; + patchLatest = false; + sha1 = "4d38cdc0ad230bdf88cc27d1256ef49fcb422e19"; + tarball = "http://registry.npmjs.org/nodemailer/-/nodemailer-0.3.35.tgz"; + } { name = "nodemon"; spec = "*"; @@ -3355,6 +3734,17 @@ sha1 = "c90941ad59e4273328923074d2cf2e7cbc6ec0d9"; tarball = "http://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz"; } + { + name = "options"; + spec = ">=0.0.5"; + version = "0.0.5"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "9a3806378f316536d79038038ba90ccb724816c3"; + tarball = "http://registry.npmjs.org/options/-/options-0.0.5.tgz"; + } { name = "optparse"; spec = "*"; @@ -3530,6 +3920,17 @@ sha1 = "726411401039fe9b009eea86614295d5f3a54276"; tarball = "http://registry.npmjs.org/pkginfo/-/pkginfo-0.3.0.tgz"; } + { + name = "policyfile"; + spec = "0.0.4"; + version = "0.0.4"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "d6b82ead98ae79ebe228e2daf5903311ec982e4d"; + tarball = "http://registry.npmjs.org/policyfile/-/policyfile-0.0.4.tgz"; + } { name = "posix-getopt"; spec = "1.0.0"; @@ -3659,6 +4060,17 @@ sha1 = "294b268e4b0d4250f6dde19b3b8b34935dff14ef"; tarball = "http://registry.npmjs.org/qs/-/qs-0.6.5.tgz"; } + { + name = "rai"; + spec = "~0.1"; + version = "0.1.7"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "1b50f1dcb4a493a67ef7a0a8c72167d789df52a0"; + tarball = "http://registry.npmjs.org/rai/-/rai-0.1.7.tgz"; + } { name = "range-parser"; spec = "0.0.4"; @@ -3670,6 +4082,17 @@ sha1 = "c0427ffef51c10acba0782a46c9602e744ff620b"; tarball = "http://registry.npmjs.org/range-parser/-/range-parser-0.0.4.tgz"; } + { + name = "raw-socket"; + spec = "*"; + version = "1.2.0"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "586a3acba952922aff9e19ef3b9665aba1f6d152"; + tarball = "http://registry.npmjs.org/raw-socket/-/raw-socket-1.2.0.tgz"; + } { name = "rbytes"; spec = "*"; @@ -3820,6 +4243,17 @@ sha1 = "fa557fef4985ab3e3384fdc5be6e2541a0bb49af"; tarball = "http://registry.npmjs.org/redis/-/redis-0.7.2.tgz"; } + { + name = "redis"; + spec = "0.7.3"; + version = "0.7.3"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "ee57b7a44d25ec1594e44365d8165fa7d1d4811a"; + tarball = "http://registry.npmjs.org/redis/-/redis-0.7.3.tgz"; + } { name = "redis"; spec = ">= 0.6.6"; @@ -4170,6 +4604,17 @@ sha1 = "e3199263b1e9f1913dbc91efb4af559e8e4d3d31"; tarball = "http://registry.npmjs.org/semver/-/semver-2.0.10.tgz"; } + { + name = "semver"; + spec = "1.1.0"; + version = "1.1.0"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "da9b9c837e31550a7c928622bc2381de7dd7a53e"; + tarball = "http://registry.npmjs.org/semver/-/semver-1.1.0.tgz"; + } { name = "semver"; spec = "1.1.4"; @@ -4348,6 +4793,19 @@ sha1 = "66a2b3a749ae8b5fb89efd4fcc01dc94fbe02296"; tarball = "http://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"; } + { + name = "simplesmtp"; + spec = ">= 0.1.22"; + version = "0.3.4"; + topLevel = false; + dependencies = [ + { name = "rai"; spec = "~0.1"; } + { name = "xoauth2"; spec = "~0.1"; } + ]; + patchLatest = false; + sha1 = "fe8bfe63c2f96e0bbe54bd373a0dc0d09b594133"; + tarball = "http://registry.npmjs.org/simplesmtp/-/simplesmtp-0.3.4.tgz"; + } { name = "sliced"; spec = "0.0.3"; @@ -4450,6 +4908,36 @@ sha1 = "fb885f18b0f3aad189f824862536bceeec750900"; tarball = "http://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz"; } + { + name = "socket.io"; + spec = "0.9.14"; + version = "0.9.14"; + topLevel = false; + dependencies = [ + { name = "socket.io-client"; spec = "0.9.11"; } + { name = "policyfile"; spec = "0.0.4"; } + { name = "base64id"; spec = "0.1.0"; } + { name = "redis"; spec = "0.7.3"; } + ]; + patchLatest = false; + sha1 = "81af80ebf3ee8f7f6e71b1495db91f8fa53ff667"; + tarball = "http://registry.npmjs.org/socket.io/-/socket.io-0.9.14.tgz"; + } + { + name = "socket.io-client"; + spec = "0.9.11"; + version = "0.9.11"; + topLevel = false; + dependencies = [ + { name = "uglify-js"; spec = "1.2.5"; } + { name = "ws"; spec = "0.4.x"; } + { name = "xmlhttprequest"; spec = "1.4.2"; } + { name = "active-x-obfuscator"; spec = "0.0.1"; } + ]; + patchLatest = false; + sha1 = "94defc1b29e0d8a8fe958c1cf33300f68d8a19c7"; + tarball = "http://registry.npmjs.org/socket.io-client/-/socket.io-client-0.9.11.tgz"; + } { name = "sockjs"; spec = "*"; @@ -4729,6 +5217,17 @@ sha1 = "933c3d1950224957a349183e124147dd99e182f5"; tarball = "http://registry.npmjs.org/timezone/-/timezone-0.0.22.tgz"; } + { + name = "tinycolor"; + spec = "0.x"; + version = "0.0.1"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "320b5a52d83abb5978d81a3e887d4aefb15a6164"; + tarball = "http://registry.npmjs.org/tinycolor/-/tinycolor-0.0.1.tgz"; + } { name = "transformers"; spec = "2.0.1"; @@ -4765,6 +5264,17 @@ sha1 = "ad681b68f5321ad2827c4cfb1b7d5df2cfe942ee"; tarball = "http://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.3.0.tgz"; } + { + name = "uglify-js"; + spec = "1.2.5"; + version = "1.2.5"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "b542c2c76f78efb34b200b20177634330ff702b6"; + tarball = "http://registry.npmjs.org/uglify-js/-/uglify-js-1.2.5.tgz"; + } { name = "uglify-js"; spec = "2.3.6"; @@ -4894,17 +5404,6 @@ sha1 = "71c08bf6b428b1133f37e78fa3a21c82f7329b0d"; tarball = "http://registry.npmjs.org/underscore.string/-/underscore.string-2.3.3.tgz"; } - { - name = "uptime"; - spec = "*"; - version = "0.0.3"; - topLevel = true; - dependencies = [ - ]; - patchLatest = false; - sha1 = "bc94f617767813e2450e035aa6ba6468fa13a07d"; - tarball = "http://registry.npmjs.org/uptime/-/uptime-0.0.3.tgz"; - } { name = "util"; spec = ">= 0.4.9"; @@ -5011,6 +5510,19 @@ sha1 = "20643e9f50d00cf46da754dc934d791d4f6e3bb2"; tarball = "http://registry.npmjs.org/view-helpers/-/view-helpers-0.1.2.tgz"; } + { + name = "vows"; + spec = ">=0.5.13"; + version = "0.7.0"; + topLevel = false; + dependencies = [ + { name = "eyes"; spec = ">=0.1.6"; } + { name = "diff"; spec = "~1.0.3"; } + ]; + patchLatest = false; + sha1 = "dd0065f110ba0c0a6d63e844851c3208176d5867"; + tarball = "http://registry.npmjs.org/vows/-/vows-0.7.0.tgz"; + } { name = "walk"; spec = "*"; @@ -5173,6 +5685,20 @@ sha1 = "b79669bb42ecb409f83d583cad52ca17eaa1643f"; tarball = "http://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"; } + { + name = "ws"; + spec = "0.4.x"; + version = "0.4.27"; + topLevel = false; + dependencies = [ + { name = "commander"; spec = "~0.6.1"; } + { name = "tinycolor"; spec = "0.x"; } + { name = "options"; spec = ">=0.0.5"; } + ]; + patchLatest = false; + sha1 = "077d3a48b6e0b5a96f68f3b38a94ea1ec72c2555"; + tarball = "http://registry.npmjs.org/ws/-/ws-0.4.27.tgz"; + } { name = "wu"; spec = "*"; @@ -5219,4 +5745,37 @@ sha1 = "1776d65f3fdbad470a08d8604cdeb1c4e540ff83"; tarball = "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-0.4.2.tgz"; } + { + name = "xmlhttprequest"; + spec = "1.4.2"; + version = "1.4.2"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "01453a1d9bed1e8f172f6495bbf4c8c426321500"; + tarball = "http://registry.npmjs.org/xmlhttprequest/-/xmlhttprequest-1.4.2.tgz"; + } + { + name = "xoauth2"; + spec = "~0.1"; + version = "0.1.8"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "b916ff10ecfb54320f16f24a3e975120653ab0d2"; + tarball = "http://registry.npmjs.org/xoauth2/-/xoauth2-0.1.8.tgz"; + } + { + name = "zeparser"; + spec = "0.0.5"; + version = "0.0.5"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "03726561bc268f2e5444f54c665b7fd4a8c029e2"; + tarball = "http://registry.npmjs.org/zeparser/-/zeparser-0.0.5.tgz"; + } ] diff --git a/pkgs/top-level/node-packages.json b/pkgs/top-level/node-packages.json index e8533a39882..bf07faf3177 100644 --- a/pkgs/top-level/node-packages.json +++ b/pkgs/top-level/node-packages.json @@ -63,5 +63,5 @@ , "npm" , "gridfs-stream" , "tar" -, "uptime" +, { "node-uptime": "https://github.com/fzaninotto/uptime/tarball/1c65756575f90f563a752e2a22892ba2981c79b7" } ] From d4c52014e6a3f61a774d9ce012cc49433ab8da05 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Thu, 18 Jul 2013 20:20:45 +0300 Subject: [PATCH 555/798] Pinta: fix url --- pkgs/applications/graphics/pinta/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/pinta/default.nix b/pkgs/applications/graphics/pinta/default.nix index b845abacf7e..b54d73b4964 100644 --- a/pkgs/applications/graphics/pinta/default.nix +++ b/pkgs/applications/graphics/pinta/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "pinta-1.4"; src = fetchurl { - url = "https://github.com/PintaProject/pinta/tarball/3f7ccfa93d"; + url = "https://github.com/PintaProject/Pinta/tarball/3f7ccfa93d"; name = "pinta-1.4.tar.gz"; sha256 = "1kgb4gy5l6bd0akniwhiqqkvqayr5jgdsvn2pgg1038q9raafnpn"; }; From a0c3bc137b7505a698be038d0ae247fa1bfcd6a3 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Thu, 18 Jul 2013 20:37:32 +0300 Subject: [PATCH 556/798] JUnit: fix url --- pkgs/development/libraries/java/junit/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/java/junit/default.nix b/pkgs/development/libraries/java/junit/default.nix index ea9b1029efc..c1d713950b4 100644 --- a/pkgs/development/libraries/java/junit/default.nix +++ b/pkgs/development/libraries/java/junit/default.nix @@ -1,12 +1,13 @@ -{stdenv, fetchurl, unzip} : +{stdenv, fetchgit, unzip} : stdenv.mkDerivation { name = "junit-4.8.2"; builder = ./builder.sh; - src = fetchurl { - url = http://github.com/downloads/KentBeck/junit/junit4.8.2.zip; - sha256 = "01simvc3pmgp27p7vzavmsx5rphm6hqzwrqfkwllhf3812dcqxy6"; + src = fetchgit { + url = https://github.com/junit-team/junit.git; + rev = "refs/tags/r4.8.2"; + sha256 = "1w73l3x97kg8zmrp44xgvp3gr6sih0crm0dhhky6jiq915ba1dlh"; }; inherit unzip; From 6d3329dc317256cb80fac35275438398d66204e5 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Thu, 18 Jul 2013 20:42:04 +0300 Subject: [PATCH 557/798] rapcad: fix url --- pkgs/applications/graphics/rapcad/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/rapcad/default.nix b/pkgs/applications/graphics/rapcad/default.nix index e83824bd685..2ff82412409 100644 --- a/pkgs/applications/graphics/rapcad/default.nix +++ b/pkgs/applications/graphics/rapcad/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "rapcad-${version}"; src = fetchgit { - url = "git://git.rapcad.org/rapcad"; + url = "https://github.com/GilesBathgate/RapCAD.git"; rev = "refs/tags/v${version}"; sha256 = "37c7107dc4fcf8942a4ad35377c4e42e6aedfa35296e5fcf8d84882ae35087c7"; }; From 0c3b84c850e09faa2ef0d05ace89e96ba03ed2ec Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 18 Jul 2013 15:05:49 -0400 Subject: [PATCH 558/798] mongodb 2.4.5 Signed-off-by: Shea Levy --- pkgs/servers/nosql/mongodb/default.nix | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/pkgs/servers/nosql/mongodb/default.nix b/pkgs/servers/nosql/mongodb/default.nix index 612db162e5c..11dff324420 100644 --- a/pkgs/servers/nosql/mongodb/default.nix +++ b/pkgs/servers/nosql/mongodb/default.nix @@ -1,25 +1,15 @@ { stdenv, fetchurl, scons, boost, v8, gperftools, pcre, snappy }: -with stdenv.lib; - -let installerPatch = fetchurl { - url = "https://jira.mongodb.org/secure/attachment/18160/SConscript.client.patch"; - sha256 = "0n60fh2r8i7m6g113k0iw4adc8jv2by4ahrd780kxg47kzfgw06a"; - }; - -in -stdenv.mkDerivation rec { - name = "mongodb-2.4.3"; +let version = "2.4.5"; in stdenv.mkDerivation rec { + name = "mongodb-${version}"; src = fetchurl { - url = http://downloads.mongodb.org/src/mongodb-src-r2.4.3.tar.gz; - sha256 = "1k653xmwphdk88z2byz5fglr8xcsm8nw13prls1rx16qnc6h1pb1"; + url = "http://downloads.mongodb.org/src/mongodb-src-r${version}.tar.gz"; + sha256 = "01c7lb3jdr51gy7459vg5rg002xxg0mj79vlhy54n50kr31cnxmm"; }; nativeBuildInputs = [ scons boost v8 gperftools pcre snappy ]; - patches = [ installerPatch ]; - postPatch = '' substituteInPlace SConstruct \ --replace "Environment( BUILD_DIR" "Environment( ENV = os.environ, BUILD_DIR" \ From 6b0d6593e802732b3d65669c0ff99b458188bdd1 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 18 Jul 2013 15:13:42 -0400 Subject: [PATCH 559/798] Create a mkEnableOption function for an extremely common NixOS idiom Signed-off-by: Shea Levy --- pkgs/lib/options.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/lib/options.nix b/pkgs/lib/options.nix index 1fdf9ad8088..5c896d5714c 100644 --- a/pkgs/lib/options.nix +++ b/pkgs/lib/options.nix @@ -28,6 +28,13 @@ rec { # extraConfigs (list of possible configurations) }; + mkEnableOption = name: mkOption { + default = false; + example = true; + description = "Whether to enable ${name}"; + type = lib.types.bool; + }; + mapSubOptions = f: opt: if opt ? options then opt // { From 7f9e83f8cc20b4552a9fa00377e843ae75584a84 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 18 Jul 2013 21:37:59 +0200 Subject: [PATCH 560/798] dosfstools: update to version 3.0.21 --- pkgs/tools/filesystems/dosfstools/default.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/filesystems/dosfstools/default.nix b/pkgs/tools/filesystems/dosfstools/default.nix index b0ee47e23b5..a98def32835 100644 --- a/pkgs/tools/filesystems/dosfstools/default.nix +++ b/pkgs/tools/filesystems/dosfstools/default.nix @@ -1,14 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "dosfstools-3.0.11"; + name = "dosfstools-3.0.21"; src = fetchurl { - urls = [ - "http://www.daniel-baumann.ch/software/dosfstools/${name}.tar.bz2" - "http://pkgs.fedoraproject.org/repo/pkgs/dosfstools/${name}.tar.bz2/8d2211d5bd813164e20740e7c852aa06/${name}.tar.bz2" - ]; - sha256 = "1a6rzjy82f6579ywaln33g1wc7k8gbgjdss9q2q8daplac7pmcll"; + url = "http://daniel-baumann.ch/files/software/dosfstools/${name}.tar.xz"; + sha256 = "12c9ilcpknm7hg3czkc50azndd0yjdj4jjnvizhwqxy3g0gm2960"; }; makeFlags = "PREFIX=$(out)"; From b73021a475f7f2a2eac7946972241c30eeceaf1c Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 18 Jul 2013 15:44:48 -0400 Subject: [PATCH 561/798] buildNodePackage: Handle all node/coffee shebang possibilities Signed-off-by: Shea Levy --- pkgs/development/web/nodejs/build-node-package.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/web/nodejs/build-node-package.nix b/pkgs/development/web/nodejs/build-node-package.nix index 1e6d5cc6bca..415f2209597 100644 --- a/pkgs/development/web/nodejs/build-node-package.nix +++ b/pkgs/development/web/nodejs/build-node-package.nix @@ -42,8 +42,14 @@ stdenv.mkDerivation ({ mv node_modules $out/node_modules/${requireName} if [ -d "$out/node_modules/.bin" ]; then ln -sv node_modules/.bin $out/bin + node=`type -p node` + coffee=`type -p coffee || true` find -L $out/node_modules/.bin/* -type f -print0 | \ - xargs -0 sed --follow-symlinks -i 's@#!/usr/bin/env node@#!${nodejs}/bin/node@' + xargs -0 sed --follow-symlinks -i \ + -e 's@#!/usr/bin/env node@#!'"$node"'@' \ + -e 's@#!/usr/bin/env coffee@#!'"$coffee"'@' \ + -e 's@#!/.*/node@#!'"$node"'@' \ + -e 's@#!/.*/coffee@#!'"$coffee"'@' fi if [ -e "$out/node_modules/${requireName}/man" ]; then mkdir $out/share From d37795e572b49cb85b6c6494f32d20fe47c4ff7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 18 Jul 2013 21:47:27 +0200 Subject: [PATCH 562/798] Adding guifi-earth 0.2.1 That may have updated some node-packages. --- pkgs/top-level/node-packages-generated.nix | 91 ++++++++++++++++++++-- pkgs/top-level/node-packages.json | 1 + 2 files changed, 86 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix index 37db5db9ed8..31dd33a8059 100644 --- a/pkgs/top-level/node-packages-generated.nix +++ b/pkgs/top-level/node-packages-generated.nix @@ -240,28 +240,28 @@ { name = "aws-sdk"; spec = "*"; - version = "1.3.2"; + version = "1.4.0"; topLevel = true; dependencies = [ { name = "xml2js"; spec = "0.2.4"; } { name = "xmlbuilder"; spec = "*"; } ]; patchLatest = true; - sha1 = "23a6cca1eb4a3c50ac67fb354ec9a5725d31a1f4"; - tarball = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-1.3.2.tgz"; + sha1 = "57a3291994d2b2b484ebd39e1ecb216a05c1c60e"; + tarball = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-1.4.0.tgz"; } { name = "aws-sdk"; spec = ">=1.2.0 <2"; - version = "1.3.2"; + version = "1.4.0"; topLevel = false; dependencies = [ { name = "xml2js"; spec = "0.2.4"; } { name = "xmlbuilder"; spec = "*"; } ]; patchLatest = true; - sha1 = "23a6cca1eb4a3c50ac67fb354ec9a5725d31a1f4"; - tarball = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-1.3.2.tgz"; + sha1 = "57a3291994d2b2b484ebd39e1ecb216a05c1c60e"; + tarball = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-1.4.0.tgz"; } { name = "aws-sign"; @@ -652,6 +652,17 @@ sha1 = "6355d32cf1b04cdff6b484e5e711782b2f0c39be"; tarball = "http://registry.npmjs.org/coffee-script/-/coffee-script-1.6.3.tgz"; } + { + name = "coffee-script"; + spec = ">= 0.0.1"; + version = "1.6.3"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "6355d32cf1b04cdff6b484e5e711782b2f0c39be"; + tarball = "http://registry.npmjs.org/coffee-script/-/coffee-script-1.6.3.tgz"; + } { name = "coffee-script"; spec = ">=1.2.0"; @@ -1934,6 +1945,22 @@ sha1 = "de2d66136d002e112ba70f3f10c31cf7c350b2da"; tarball = "http://registry.npmjs.org/growl/-/growl-1.7.0.tgz"; } + { + name = "guifi-earth"; + spec = "https://github.com/jmendeth/guifi-earth/tarball/f3ee96835fd4fb0e3e12fadbd2cb782770d64854 "; + version = "0.2.1"; + topLevel = true; + dependencies = [ + { name = "coffee-script"; spec = ">= 0.0.1"; } + { name = "jade"; spec = ">= 0.0.1"; } + { name = "q"; spec = ">= 0.0.1"; } + { name = "xml2js"; spec = ">= 0.0.1"; } + { name = "msgpack"; spec = ">= 0.0.1"; } + ]; + patchLatest = false; + sha256 = "a51a5beef55c14c68630275d51cf66c44a4462d1b20c0f08aef6d88a62ca077c"; + tarball = "https://github.com/jmendeth/guifi-earth/tarball/f3ee96835fd4fb0e3e12fadbd2cb782770d64854"; + } { name = "gzippo"; spec = "*"; @@ -2291,6 +2318,24 @@ sha1 = "8f10d7977d8d79f2f6ff862a81b0513ccb25686c"; tarball = "http://registry.npmjs.org/jade/-/jade-0.26.3.tgz"; } + { + name = "jade"; + spec = ">= 0.0.1"; + version = "0.33.0"; + topLevel = false; + dependencies = [ + { name = "commander"; spec = "1.2.0"; } + { name = "mkdirp"; spec = "0.3.x"; } + { name = "transformers"; spec = "2.0.1"; } + { name = "character-parser"; spec = "1.0.2"; } + { name = "monocle"; spec = "0.1.48"; } + { name = "with"; spec = "~1.1.0"; } + { name = "constantinople"; spec = "~1.0.1"; } + ]; + patchLatest = false; + sha1 = "1b0bb45f9dd4ce57723605177713d80bccd4e429"; + tarball = "http://registry.npmjs.org/jade/-/jade-0.33.0.tgz"; + } { name = "jayschema"; spec = "*"; @@ -3051,6 +3096,17 @@ sha1 = "03edc348d613e66a56486cfdac53bcbe899cbd61"; tarball = "http://registry.npmjs.org/ms/-/ms-0.3.0.tgz"; } + { + name = "msgpack"; + spec = ">= 0.0.1"; + version = "0.1.8"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "cd5c0d2277bf1659a871209ddf59f57ad1124d68"; + tarball = "http://registry.npmjs.org/msgpack/-/msgpack-0.1.8.tgz"; + } { name = "muri"; spec = "0.3.1"; @@ -4005,6 +4061,17 @@ sha1 = "dbf8d752a7fe22fa7d58635689499610e9276ddc"; tarball = "http://registry.npmjs.org/ps-tree/-/ps-tree-0.0.3.tgz"; } + { + name = "q"; + spec = ">= 0.0.1"; + version = "0.9.6"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "5884b2154bdb3b6d5765e0fafddcb1506e133619"; + tarball = "http://registry.npmjs.org/q/-/q-0.9.6.tgz"; + } { name = "qs"; spec = "0.5.1"; @@ -5734,6 +5801,18 @@ sha1 = "9b81690931631ff09d1957549faf54f4f980b3c2"; tarball = "http://registry.npmjs.org/xml2js/-/xml2js-0.2.8.tgz"; } + { + name = "xml2js"; + spec = ">= 0.0.1"; + version = "0.2.8"; + topLevel = false; + dependencies = [ + { name = "sax"; spec = "0.5.x"; } + ]; + patchLatest = false; + sha1 = "9b81690931631ff09d1957549faf54f4f980b3c2"; + tarball = "http://registry.npmjs.org/xml2js/-/xml2js-0.2.8.tgz"; + } { name = "xmlbuilder"; spec = "*"; diff --git a/pkgs/top-level/node-packages.json b/pkgs/top-level/node-packages.json index bf07faf3177..d58967b0b39 100644 --- a/pkgs/top-level/node-packages.json +++ b/pkgs/top-level/node-packages.json @@ -64,4 +64,5 @@ , "gridfs-stream" , "tar" , { "node-uptime": "https://github.com/fzaninotto/uptime/tarball/1c65756575f90f563a752e2a22892ba2981c79b7" } +, { "guifi-earth": "https://github.com/jmendeth/guifi-earth/tarball/f3ee96835fd4fb0e3e12fadbd2cb782770d64854 " } ] From 67ce7f863ab1c3200df192719b0cdcd034ab45dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Fri, 19 Jul 2013 00:29:50 +0200 Subject: [PATCH 563/798] srecord: new package The SRecord package is a collection of powerful tools for manipulating EPROM load files. http://srecord.sourceforge.net/ --- .../tools/misc/srecord/default.nix | 20 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/development/tools/misc/srecord/default.nix diff --git a/pkgs/development/tools/misc/srecord/default.nix b/pkgs/development/tools/misc/srecord/default.nix new file mode 100644 index 00000000000..25140093f51 --- /dev/null +++ b/pkgs/development/tools/misc/srecord/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, boost, libtool, groff, ghostscript }: + +stdenv.mkDerivation rec { + name = "srecord-1.62"; + + src = fetchurl { + url = "mirror://sourceforge/srecord/${name}.tar.gz"; + sha256 = "0bfbmhsm9mbwiik3yrhm95q8bgx1k4mh2ai412k8zjyi8f5f3904"; + }; + + buildInputs = [ boost libtool groff ghostscript ]; + + meta = with stdenv.lib; { + description = "Collection of powerful tools for manipulating EPROM load files"; + homepage = http://srecord.sourceforge.net/; + license = licenses.gpl3Plus; + maintainers = [ maintainers.bjornfor ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2505f239a86..d1467985b9c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3220,6 +3220,8 @@ let guile_ncurses = callPackage ../development/guile-modules/guile-ncurses { }; + srecord = callPackage ../development/tools/misc/srecord { }; + windowssdk = ( import ../development/misc/windows-sdk { inherit fetchurl stdenv cabextract; From b5a59b66b1fc550bd816f3dc8d720a9d98ecd5d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Fri, 19 Jul 2013 00:53:06 +0200 Subject: [PATCH 564/798] msmtp: 1.4.30 -> 1.4.31 Also, set meta.platforms and fix meta.description (msmtp is not a MUA). --- pkgs/applications/networking/msmtp/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/msmtp/default.nix b/pkgs/applications/networking/msmtp/default.nix index bf0ca68177b..584fdcd170a 100644 --- a/pkgs/applications/networking/msmtp/default.nix +++ b/pkgs/applications/networking/msmtp/default.nix @@ -1,18 +1,20 @@ { stdenv, fetchurl, openssl, pkgconfig, gnutls, gsasl, libidn }: + stdenv.mkDerivation rec { - name = "msmtp-1.4.30"; + name = "msmtp-1.4.31"; src = fetchurl { url = "mirror://sourceforge/msmtp/${name}.tar.bz2"; - sha256 = "11lq82byx9xyfkf4nrcfjjfv5k8gk3bf8zlw0kml1qrndqlvjlpi"; + sha256 = "0pr29kb7qsz4q6yfw5wvmw1wm4axi8kc97qhhmp50bx2bylzjyi4"; }; buildInputs = [ openssl pkgconfig gnutls gsasl libidn ]; meta = { - description = "a MUA"; + description = "Simple and easy to use SMTP client with excellent sendmail compatibility"; homepage = "http://msmtp.sourceforge.net/"; license = stdenv.lib.licenses.gpl3; maintainers = [ stdenv.lib.maintainers.garbas ]; + platforms = stdenv.lib.platforms.linux; }; } From d7283abbbb79e014b523e343b008c799f7ed0bfb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Fri, 19 Jul 2013 01:22:29 +0200 Subject: [PATCH 565/798] gtypist: update to 2.9.3 and fix the patch --- pkgs/games/gtypist/default.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/games/gtypist/default.nix b/pkgs/games/gtypist/default.nix index f83e21eab7c..3dded927ba1 100644 --- a/pkgs/games/gtypist/default.nix +++ b/pkgs/games/gtypist/default.nix @@ -1,19 +1,16 @@ {stdenv, fetchurl, ncurses}: stdenv.mkDerivation { - name = "gtypist-2.9.1"; + name = "gtypist-2.9.3"; src = fetchurl { - url = "mirror://gnu/gtypist/gtypist-2.9.1.tar.xz"; - sha256 = "1yv209aih1ixbs477vzzk1xj013g6w32vi33g0hldfzvfxbl9y5s"; + url = "mirror://gnu/gtypist/gtypist-2.9.3.tar.xz"; + sha256 = "0srwa841caci69hzqb47xfbxxf7fvz3640qka083p72vm8z9hsxw"; }; buildInputs = [ncurses]; - patches = [ (fetchurl { - url = "http://projects.archlinux.org/svntogit/community.git/plain/trunk/ncurses.patch?h=packages/gtypist"; - sha256 = "14crgh21gghszwijxjvixpijqzsgn62wx6kz28zkjskdw0p5vij1"; - })]; + patchPhase = "sed -e 's#ncursesw/##' -i configure src/*"; meta = { homepage = http://www.gnu.org/software/gtypist; From 589d6ff51ceb564b0800e4a19c649af3673c7535 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Fri, 19 Jul 2013 07:28:43 +0300 Subject: [PATCH 566/798] vfdecrypt: fix source location --- pkgs/tools/misc/vfdecrypt/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/vfdecrypt/default.nix b/pkgs/tools/misc/vfdecrypt/default.nix index 5692aecebbf..de7ee27d704 100644 --- a/pkgs/tools/misc/vfdecrypt/default.nix +++ b/pkgs/tools/misc/vfdecrypt/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "vfdecrypt"; src = fetchgit { - url = git://github.com/dra1nerdrake/VFDecrypt.git; + url = git://github.com/drakealleg/VFDecrypt.git; rev = "4e2fa32816254907e82886b936afcae9859a876c"; sha256 = "0b945805f7f60bf48556c2db45c9ab26485fb05acbc6160a563d529b20cb56a3"; }; From 2422bef9f9b5359cf407a31ff22debc04892940d Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Fri, 19 Jul 2013 07:45:45 +0300 Subject: [PATCH 567/798] area53: fix source url --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7d26cdbc7a3..c6c9eb6ff98 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -296,7 +296,7 @@ pythonPackages = python.modules // rec { name = "area53-b2c9cdcabd"; src = fetchgit { - url = git://github.com/mariusv/Area53.git; + url = git://github.com/bigmlcom/Area53.git; rev = "b2c9cdcabd"; sha256 = "b0c12b8c48ed9180c7475fab18de50d63e1b517cfb46da4d2c66fc406fe902bc"; }; From b98fccf4866b0d1d40706fb4bbe1948e16996b10 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Fri, 19 Jul 2013 07:50:27 +0300 Subject: [PATCH 568/798] pyside-generatorrunner: fix version to match sources --- pkgs/development/python-modules/pyside/generatorrunner.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pyside/generatorrunner.nix b/pkgs/development/python-modules/pyside/generatorrunner.nix index afb258cec70..12ec5a7ef51 100644 --- a/pkgs/development/python-modules/pyside/generatorrunner.nix +++ b/pkgs/development/python-modules/pyside/generatorrunner.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, cmake, pysideApiextractor, python27Packages, qt4 }: stdenv.mkDerivation { - name = "pyside-generatorrunner-0.6.13-9-g567ca6e"; + name = "pyside-generatorrunner-0.6.15"; src = fetchgit { url = "git://github.com/PySide/Generatorrunner.git"; From 74491ea24b2a61ffa14466dddbabeda9993ae697 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Fri, 19 Jul 2013 08:25:00 +0300 Subject: [PATCH 569/798] boinc: fix url --- pkgs/applications/science/misc/boinc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/science/misc/boinc/default.nix b/pkgs/applications/science/misc/boinc/default.nix index 9d8bc705fa4..0bc5c3cb7c7 100644 --- a/pkgs/applications/science/misc/boinc/default.nix +++ b/pkgs/applications/science/misc/boinc/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { name = "boinc-7.0.44"; src = fetchgit { - url = "git://boinc.berkeley.edu/boinc.git"; + url = "git://boinc.berkeley.edu/boinc-v2.git"; rev = "7c449b1fb8a681ceb27d6895751b62a2b3adf0f2"; sha256 = "0hdramyl9nip3gadp7xiaz8ngyld15i93d8ai1nsd04bmrvdfqia"; }; From c22eff7505760b22464e5df0c098f1dbacee6f1a Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Fri, 19 Jul 2013 09:30:04 +0300 Subject: [PATCH 570/798] mopidy: fix broken fetchgit -> fetchurl --- pkgs/applications/audio/mopidy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix index a8c33329227..e31798a101b 100644 --- a/pkgs/applications/audio/mopidy/default.nix +++ b/pkgs/applications/audio/mopidy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, pythonPackages, pygobject, gst_python +{ stdenv, fetchurl, pythonPackages, pygobject, gst_python , gst_plugins_good, gst_plugins_base }: @@ -7,7 +7,7 @@ pythonPackages.buildPythonPackage rec { version = "0.14.2"; - src = fetchgit { + src = fetchurl { url = "https://github.com/mopidy/mopidy/archive/v${version}.tar.gz"; sha256 = "0fqx7lk9g61d744b951cwx0szqbyji58dhw2ravnq9785nkhi7i4"; }; From 8a357239ac6aa13932d4c42ee3da118bdd0a30bb Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Fri, 19 Jul 2013 13:07:12 +0200 Subject: [PATCH 571/798] libevent: Update to 2.0.21 --- pkgs/development/libraries/libevent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libevent/default.nix b/pkgs/development/libraries/libevent/default.nix index b2987689be7..a2a8403b498 100644 --- a/pkgs/development/libraries/libevent/default.nix +++ b/pkgs/development/libraries/libevent/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl}: -let version = "2.0.17"; in +let version = "2.0.21"; in stdenv.mkDerivation { name = "libevent-${version}"; src = fetchurl { url = "https://github.com/downloads/libevent/libevent/libevent-${version}-stable.tar.gz"; - sha256 = "51735d1241f9f6d2d6465d8abc76f7511764f6de7d81026120c629612296faa6"; + sha256 = "1xblymln9vihdmf1aqkp8chwvnhpdch3786bh30bj75slnl31992"; }; meta = { From 582e9a94e6821de09419bd3e92adc1b72bd9424f Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Fri, 19 Jul 2013 13:07:42 +0200 Subject: [PATCH 572/798] opensmtpd: Update to 201307151923p1 --- pkgs/servers/mail/opensmtpd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mail/opensmtpd/default.nix b/pkgs/servers/mail/opensmtpd/default.nix index 8f18cb46861..fc518e4f889 100644 --- a/pkgs/servers/mail/opensmtpd/default.nix +++ b/pkgs/servers/mail/opensmtpd/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "opensmtpd-${version}"; - version = "201306271531p1"; + version = "201307151923p1"; buildInputs = [ libevent zlib openssl db4 bison pam ]; src = fetchurl { url = "http://www.opensmtpd.org/archives/${name}.tar.gz"; - sha256 = "0b06vzv566nai9j506rl3cwkk5favqxg23hsn08490ynn23im0sc"; + sha256 = "0cggq60zzz5mgj093pmgwjp4bm6znnhyv6ibp1vhkba7cxjavr4g"; }; configureFlags = [ From 3c35daeebe147e2820c161f47fce191c3d370b60 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 19 Jul 2013 15:19:10 +0200 Subject: [PATCH 573/798] nixUnstable: Update to 1.6pre3166_15e5ac8 --- pkgs/tools/package-management/nix/unstable.nix | 6 +++--- pkgs/top-level/all-packages.nix | 3 --- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix index 73bed52654f..bab89a1145e 100644 --- a/pkgs/tools/package-management/nix/unstable.nix +++ b/pkgs/tools/package-management/nix/unstable.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "nix-1.5.3pre3141_1b6ee8f"; + name = "nix-1.6pre3166_15e5ac8"; src = fetchurl { - url = "http://hydra.nixos.org/build/5305802/download/5/${name}.tar.xz"; - sha256 = "834a0d23456331ac06b6117078f0b9bbeecbc8620d5f844b61455e3daac6ceb0"; + url = "http://hydra.nixos.org/build/5566779/download/5/${name}.tar.xz"; + sha256 = "c25209bb93ca6859df84f74bd16cb0daee9e6c9820139e9dab1d2848129a2558"; }; nativeBuildInputs = [ perl pkgconfig ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d1467985b9c..ded923ac511 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9592,13 +9592,10 @@ let stateDir = config.nix.stateDir or "/nix/var"; }; - nixUnstable = nixStable; - /* nixUnstable = callPackage ../tools/package-management/nix/unstable.nix { storeDir = config.nix.storeDir or "/nix/store"; stateDir = config.nix.stateDir or "/nix/var"; }; - */ nixops = callPackage ../tools/package-management/nixops { }; From b57cdc584a62feb0aded6fd98d98ee040de886cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 19 Jul 2013 16:20:27 +0200 Subject: [PATCH 574/798] Fixing evtest and updating to 1.31. The fetchgit wasn't a fixed-output, so on chroot, it couldn't connect. --- pkgs/applications/misc/evtest/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/evtest/default.nix b/pkgs/applications/misc/evtest/default.nix index 58b4f0d01bf..635775e75ac 100644 --- a/pkgs/applications/misc/evtest/default.nix +++ b/pkgs/applications/misc/evtest/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, autoconf, automake, pkgconfig, libxml2 }: stdenv.mkDerivation rec { - name = "evtest-1.30"; + name = "evtest-1.31"; preConfigure = "autoreconf -iv"; @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { src = fetchgit { url = "git://anongit.freedesktop.org/evtest"; - rev = "1a50f2479c4775e047f234a24d95dda82441bfbd"; + rev = "871371806017301373b8b0e5b7e8f168ce1ea13f"; + sha256 = "1hxldlldlrb9lnnybn839a97fpqd1cixbmci2wzgr0rzhjbwhcgp"; }; meta = with stdenv.lib; { From 4e94dafa4e0e2bbc1e0c2a0293c82d4e7e34f962 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 19 Jul 2013 16:33:42 +0200 Subject: [PATCH 575/798] nut: adding libtool enables nut-scanner --- pkgs/applications/misc/nut/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/nut/default.nix b/pkgs/applications/misc/nut/default.nix index 157ecc0ffd8..078ea7fcbd8 100644 --- a/pkgs/applications/misc/nut/default.nix +++ b/pkgs/applications/misc/nut/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, neon, libusb, openssl, udev, avahi, freeipmi }: +{ stdenv, fetchurl, pkgconfig, neon, libusb, openssl, udev, avahi, freeipmi +, libtool }: stdenv.mkDerivation rec { name = "nut-2.6.5"; @@ -8,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0gxrzsblx0jc4g9w0903ybwqbv1d79vq5hnks403fvnay4fgg3b1"; }; - buildInputs = [ neon libusb openssl udev avahi freeipmi ]; + buildInputs = [ neon libusb openssl udev avahi freeipmi libtool ]; nativeBuildInputs = [ pkgconfig ]; From aeef361b0d9ed426cb0262e28204687d75b696e4 Mon Sep 17 00:00:00 2001 From: Domen Kozar Date: Fri, 19 Jul 2013 19:42:11 +0200 Subject: [PATCH 576/798] netpbm: add tiff support --- pkgs/tools/graphics/netpbm/default.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/graphics/netpbm/default.nix b/pkgs/tools/graphics/netpbm/default.nix index 2af863e37bc..df65325b98d 100644 --- a/pkgs/tools/graphics/netpbm/default.nix +++ b/pkgs/tools/graphics/netpbm/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchsvn, pkgconfig, libjpeg, libpng, flex, zlib, perl, libxml2, makeWrapper, libX11 }: +{stdenv, fetchsvn, pkgconfig, libjpeg, libpng, flex, zlib, perl, libxml2, makeWrapper, libX11, libtiff }: let rev = 1742; in stdenv.mkDerivation { @@ -12,12 +12,19 @@ stdenv.mkDerivation { NIX_CFLAGS_COMPILE = "-fPIC"; # Gentoo adds this on every platform - buildInputs = [ pkgconfig flex zlib perl libpng libjpeg libxml2 makeWrapper libX11 ]; + buildInputs = [ pkgconfig flex zlib perl libpng libjpeg libxml2 makeWrapper libX11 libtiff ]; - configurePhase = "cp config.mk.in config.mk"; + configurePhase = '' + cp config.mk.in config.mk + substituteInPlace "config.mk" \ + --replace "TIFFLIB = NONE" "TIFFLIB = ${libtiff}/lib/libtiff.so" \ + --replace "TIFFHDR_DIR =" "TIFFHDR_DIR = ${libtiff}/include" \ + --replace "TIFFLIB_NEEDS_JPEG = Y" "TIFFLIB_NEEDS_JPEG = N" \ + --replace "TIFFLIB_NEEDS_Z = Y" "TIFFLIB_NEEDS_Z = N" + ''; preBuild = '' - export LDFLAGS=-lz + export LDFLAGS="-lz" substituteInPlace "pm_config.in.h" \ --subst-var-by "rgbPath1" "$out/lib/rgb.txt" \ --subst-var-by "rgbPath2" "/var/empty/rgb.txt" \ From fc8d1341f671ce3ceead3041b0eb72b53691ecb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ertugrul=20S=C3=B6ylemez?= Date: Fri, 19 Jul 2013 17:20:12 +0200 Subject: [PATCH 577/798] Maintainers: added ertes. --- pkgs/lib/maintainers.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/lib/maintainers.nix b/pkgs/lib/maintainers.nix index da4d13b354d..ab76e2018c0 100644 --- a/pkgs/lib/maintainers.nix +++ b/pkgs/lib/maintainers.nix @@ -19,6 +19,7 @@ chaoflow = "Florian Friesdorf "; coconnor = "Corey O'Connor "; eelco = "Eelco Dolstra "; + ertes = "Ertugrul Söylemez "; garbas = "Rok Garbas "; goibhniu = "Cillian de Róiste "; guibert = "David Guibert "; From 2519a869426bd0b69aef9d63002f47aec0a1b722 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ertugrul=20S=C3=B6ylemez?= Date: Fri, 19 Jul 2013 17:20:37 +0200 Subject: [PATCH 578/798] pari: Updated to 2.5.4, fixed GMP and readline support. --- .../science/math/pari/default.nix | 61 ++++++------------- 1 file changed, 18 insertions(+), 43 deletions(-) diff --git a/pkgs/applications/science/math/pari/default.nix b/pkgs/applications/science/math/pari/default.nix index 43291d792b7..5fda04fed4f 100644 --- a/pkgs/applications/science/math/pari/default.nix +++ b/pkgs/applications/science/math/pari/default.nix @@ -1,50 +1,25 @@ -x@{builderDefsPackage - , perl, zlib, gmp, readline - , ...}: -builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ - []; +{ stdenv, fetchurl, gmp, readline }: - buildInputs = map (n: builtins.getAttr n x) - (builtins.attrNames (builtins.removeAttrs x helperArgNames)); - sourceInfo = rec { - baseName="pari"; - version="2.5.0"; - name="${baseName}-${version}"; - url="http://pari.math.u-bordeaux.fr/pub/pari/unix/${name}.tar.gz"; - hash="18ipxj4hzj7s3fqz878fiypkzrkbjj8wvbygz9j8c3ya06q27jax"; - }; -in -rec { - src = a.fetchurl { - url = sourceInfo.url; - sha256 = sourceInfo.hash; +stdenv.mkDerivation rec { + name = "pari-2.5.4"; + + src = fetchurl { + url = "http://pari.math.u-bordeaux.fr/pub/pari/unix/${name}.tar.gz"; + sha256 = "0gpsj5n8d1gyl7nq2y915sscs3d334ryrv8qgjdwqf3cr95f2dwz"; }; - inherit (sourceInfo) name version; - inherit buildInputs; + buildInputs = [gmp readline]; + + configureScript = "./Configure"; + configureFlags = + "--with-gmp=${gmp} " + + "--with-readline=${readline}"; - /* doConfigure should be removed if not needed */ - phaseNames = ["doConfigure" "doMakeInstall"]; - configureCommand="./Configure"; - meta = { description = "Computer algebra system for high-performance number theory computations"; - maintainers = with a.lib.maintainers; - [ - raskin - ]; - platforms = with a.lib.platforms; - linux; - license = "GPLv2+"; - homepage = "http://pari.math.u-bordeaux.fr/"; + homepage = "http://pari.math.u-bordeaux.fr/"; + license = "GPLv2+"; + maintainers = with stdenv.lib.maintainers; [ertes raskin]; + platforms = stdenv.lib.platforms.linux; }; - passthru = { - updateInfo = { - downloadPage = "http://pari.math.u-bordeaux.fr/download.html"; - }; - }; -}) x - +} From 84ca773f9b72f755cc2261ba5c4a9fd73af6fe8d Mon Sep 17 00:00:00 2001 From: Marc Weber Date: Wed, 17 Jul 2013 01:12:05 +0200 Subject: [PATCH 579/798] use simpleDerivation for all Vim plugins --- pkgs/misc/vim-plugins/default.nix | 107 +++++++++++++----------------- 1 file changed, 45 insertions(+), 62 deletions(-) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index e8d9e9a11e4..6e337b8feef 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, python, cmake, vim, perl, ruby }: +{fetchurl, stdenv, python, cmake, vim, perl, ruby}: /* About Vim and plugins @@ -11,7 +11,7 @@ typical plugin files: plugin/P1.vim autoload/P1.vim ftplugin/xyz.vim - doc/plugin-documentation.txt + doc/plugin-documentation.txt (traditional documentation) README(.md) (nowadays thanks to github) Traditionally plugins were installed into ~/.vim/* so it was your task to keep track @@ -25,16 +25,16 @@ this to your .vimrc should make most plugins work: set rtp+=~/.nix-profile/vim-plugins/YouCompleteMe " or for p in ["YouCompleteMe"] | exec 'set rtp+=~/.nix-profile/vim-plugins/'.p | endfor -Its what -pathogen, vundle, vim-addon-manager (VAM) use. +Its what pathogen, vundle, vim-addon-manager (VAM) use. VAM's benefits: -- works around after/* directories if they are used in non ~/.vim locations - allows activating plugins at runtime, eg when you need them. (works around some au command hooks, eg required for TheNerdTree plugin) - VAM checkous out all sources (vim.sf.net, git, mercurial, ...) - runs :helptags on update/installation only. Obviously it cannot do that on store paths. +- it reads addon-info.json files which can declare dependencies by name + (without version) VAM is made up of - the code loading plugins @@ -63,31 +63,50 @@ How to install VAM? eg provide such a bash function: EOF } -IMHO having no plugins listed might be better than having outdated ones. +Marc Weber thinks that having no plugins listed might be better than having +outdated ones. So which plugins to add here according to what Marc Weber thinks is best? -complicated plugins requiring dependencies, such as YouCompleteMe. +Complicated plugins requiring dependencies, such as YouCompleteMe. Then its best to symlink ~/.nix-profile/vim-plugins/YouCompleteMe to ~/.vim/{vim-addons,bundle} or whatever plugin management solution you use. If you feel differently change the comments and proceed. */ -let vimHelptags = path: '' - ${vim}/bin/vim -N -u NONE -i NONE -n -e -s -c "helptags ${path}" +quit! -''; +# provide a function creating tag files for vim help documentation (doc/*.txt) +let vimHelpTags = '' + vimHelpTags(){ + if [ -d "$1/doc" ]; then + ${vim}/bin/vim -N -u NONE -i NONE -n -e -s -c "helptags $1/doc" +quit! + fi + } + ''; + + # install a simple standard vim plugin + simpleDerivation = a@{name, src, path, buildPhase ? "", ...} : stdenv.mkDerivation (a // { + inherit buildPhase; + + installPhase = '' + target=$out/vim-plugins/$path + ensureDir $out/vim-plugins + ls -l + cp -r . $target + ${vimHelpTags} + vimHelpTags $target + ''; + }); in { - #TODO :helptags should be run - vimAddonNix = { # github.com/MarcWeber/vim-addon-nix provides some additional support for # editing .nix files - # This is a placeholder, because I think you always should be using latest git version + # This is a placeholder, because I think you always should be using latest + # git version. It also depends on some additional plugins (see addon-info.json) }; YouCompleteMe = stdenv.mkDerivation { @@ -100,7 +119,6 @@ in configurePhase = ":"; buildPhase = '' - set -x target=$out/vim-plugins/YouCompleteMe mkdir -p $target cp -a ./ $target @@ -110,7 +128,8 @@ in cmake -G "Unix Makefiles" . $target/cpp -DPYTHON_LIBRARIES:PATH=${python}/lib/libpython2.7.so -DPYTHON_INCLUDE_DIR:PATH=${python}/include/python2.7 make -j -j''${NIX_BUILD_CORES} -l''${NIX_BUILD_CORES}} - ${vimHelptags "$out/vim-plugins/YouCompleteMe/doc"} + ${vimHelpTags} + vimHelpTags $target ''; # TODO: implement proper install phase rather than keeping everything in store @@ -126,52 +145,26 @@ in }; }; - syntastic = stdenv.mkDerivation { + syntastic = simpleDerivation { name = "vim-syntastic-3.0.0"; - src = fetchurl { url = "https://github.com/scrooloose/syntastic/archive/3.0.0.tar.gz"; sha256 = "0nf69wpa8qa7xcfvywy2khmazs4dn1i2nal9qwjh2bzrbwbbkdyl"; }; - - buildPhase = ""; - - installPhase = '' - mkdir -p "$out/vim-plugins" - cp -R autoload "$out/vim-plugins" - cp -R doc "$out/vim-plugins" - cp -R plugin "$out/vim-plugins" - cp -R syntax_checkers "$out/vim-plugins" - - ${vimHelptags "$out/vim-plugins/doc"} - ''; + path = "syntastic"; }; - coffeeScript = stdenv.mkDerivation { + coffeeScript = simpleDerivation { name = "vim-coffee-script-v002"; - src = fetchurl { url = "https://github.com/vim-scripts/vim-coffee-script/archive/v002.tar.gz"; sha256 = "1xln6i6jbbihcyp5bsdylr2146y41hmp2xf7wi001g2ymj1zdsc0"; }; - - buildPhase = ""; - - installPhase = '' - mkdir -p "$out/vim-plugins" - cp -R after "$out/vim-plugins" - cp -R compiler "$out/vim-plugins" - cp -R doc "$out/vim-plugins" - cp -R ftdetect "$out/vim-plugins" - cp -R ftplugin "$out/vim-plugins" - cp -R indent "$out/vim-plugins" - cp -R syntax "$out/vim-plugins" - - ${vimHelptags "$out/vim-plugins/doc"} - ''; + path = "vim-coffee-script"; }; - commandT = stdenv.mkDerivation { + command_T = simpleDerivation { + name = "vim-command-t-1.4"; src = fetchurl { @@ -179,6 +172,8 @@ in sha256 = "1ka9hwx9n0vj1dd5qsd2l1wq0kriwl76jmmdjzh7zaf0p547v98s"; }; + path = "Command-T"; + buildInputs = [ perl ruby ]; buildPhase = '' @@ -187,18 +182,10 @@ in make popd ''; - - installPhase = '' - mkdir -p "$out/vim-plugins" - cp -R doc "$out/doc" - cp -R plugin "$out/vim-plugins" - cp -R ruby "$out/vim-plugins" - - ${vimHelptags "$out/vim-plugins/doc"} - ''; }; - xdebug = stdenv.mkDerivation { + xdebug = simpleDerivation { + name = "vim-xdebug-a4980fa65f7f159780593ee37c178281691ba2c4"; src = fetchurl { @@ -206,12 +193,8 @@ in sha256 = "1348gzp0zhc2wifvs5vmf92m9y8ik8ldnvy7bawsxahy8hmhiksk"; }; - installPhase = '' - mkdir -p "$out/vim-plugins" - cp -R plugin "$out/vim-plugins" - ''; + path = "xdebug"; postInstall = false; }; } - From b139a69f7c8d75331874327b5e3e2790168b3ea2 Mon Sep 17 00:00:00 2001 From: Domen Kozar Date: Fri, 19 Jul 2013 20:48:26 +0200 Subject: [PATCH 580/798] netpbm: set platforms --- pkgs/tools/graphics/netpbm/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/graphics/netpbm/default.nix b/pkgs/tools/graphics/netpbm/default.nix index df65325b98d..dc45ad7a841 100644 --- a/pkgs/tools/graphics/netpbm/default.nix +++ b/pkgs/tools/graphics/netpbm/default.nix @@ -58,5 +58,6 @@ stdenv.mkDerivation { homepage = http://netpbm.sourceforge.net/; description = "Toolkit for manipulation of graphic images"; license = "GPL,free"; + platforms = stdenv.lib.platforms.linux; }; } From 6e97ea6b0039d2a597cb7419f6c5cfdfd73bc0fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 19 Jul 2013 23:21:34 +0200 Subject: [PATCH 581/798] guix: update to 0.3 --- pkgs/tools/package-management/guix/default.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/package-management/guix/default.nix b/pkgs/tools/package-management/guix/default.nix index 37957235629..7c4a098cad8 100644 --- a/pkgs/tools/package-management/guix/default.nix +++ b/pkgs/tools/package-management/guix/default.nix @@ -15,11 +15,11 @@ let }; }; in stdenv.mkDerivation rec { - name = "guix-0.2"; + name = "guix-0.3"; src = fetchurl { url = "ftp://alpha.gnu.org/gnu/guix/${name}.tar.gz"; - sha256 = "140y0ywbgl6vxl4nwswz4vim2wwdiajxlksj24lnv40aw5hyvifr"; + sha256 = "0xpfdmlfkkpmgrb8lpaqs5wxx31m4jslajs6b9waz5wp91zk7fix"; }; configureFlags = @@ -33,11 +33,6 @@ in stdenv.mkDerivation rec { cp -v "${boot_guile.x86_64}" gnu/packages/bootstrap/x86_64-linux/guile-2.0.7.tar.xz ''; - preCheck = - # XXX: Skip this test (see commit 91fe0e20c7da2b706a1ac0e7b75235b6c1e6ed0a). - '' sed -i tests/guix-package.sh -e's/guix package --version/exit 0/' - ''; - nativeBuildInputs = [ pkgconfig ]; buildInputs = [ guile libgcrypt sqlite bzip2 ]; @@ -52,7 +47,7 @@ in stdenv.mkDerivation rec { In addition to standard package management features, Guix supports transactional upgrades and roll-backs, unprivileged package management, - per-user profiles, and garbage collection. + per-user profiles, and garbage collection. It provides Guile Scheme APIs, including high-level embedded domain-specific languages (EDSLs), to describe how packages are built @@ -67,6 +62,7 @@ in stdenv.mkDerivation rec { license = "GPLv3+"; maintainers = [ stdenv.lib.maintainers.ludo ]; + platforms = stdenv.lib.platforms.linux; homepage = http://www.gnu.org/software/guix; }; From f2f0674c5b8741cc9ae6eac682ef64c0e6f25c88 Mon Sep 17 00:00:00 2001 From: Alexander Foremny Date: Sat, 20 Jul 2013 10:56:51 +0200 Subject: [PATCH 582/798] Add haskell-qrencode --- .../libraries/haskell/qrencode/default.nix | 14 ++++++++++++++ pkgs/top-level/haskell-packages.nix | 4 ++++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/development/libraries/haskell/qrencode/default.nix diff --git a/pkgs/development/libraries/haskell/qrencode/default.nix b/pkgs/development/libraries/haskell/qrencode/default.nix new file mode 100644 index 00000000000..bd46bb9b415 --- /dev/null +++ b/pkgs/development/libraries/haskell/qrencode/default.nix @@ -0,0 +1,14 @@ +{ cabal, qrencode }: + +cabal.mkDerivation (self: { + pname = "haskell-qrencode"; + version = "1.0.4"; + sha256 = "1cq6fpz4vsx1kfnxnxnqz0pi5nzfg86s76vd0hcqvyqxnqbcd8hj"; + extraLibraries = [ qrencode ]; + meta = { + homepage = "https://github.com/jamessanders/haskell-qrencode"; + description = "Haskell bindings for libqrencode"; + 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 bd7959463f3..7d48176f72d 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1645,6 +1645,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); quickcheckIo = callPackage ../development/libraries/haskell/quickcheck-io {}; + qrencode = callPackage ../development/libraries/haskell/qrencode { + inherit (pkgs) qrencode; + }; + RangedSets = callPackage ../development/libraries/haskell/Ranged-sets {}; random_1_0_1_1 = callPackage ../development/libraries/haskell/random/1.0.1.1.nix {}; From 7f874ca558d09adb04310ea3b210ac9d69405848 Mon Sep 17 00:00:00 2001 From: Alexander Foremny Date: Fri, 19 Jul 2013 13:30:16 +0200 Subject: [PATCH 583/798] Add haskell-happstack-lite --- .../libraries/haskell/happstack/happstack-lite.nix | 14 ++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/libraries/haskell/happstack/happstack-lite.nix diff --git a/pkgs/development/libraries/haskell/happstack/happstack-lite.nix b/pkgs/development/libraries/haskell/happstack/happstack-lite.nix new file mode 100644 index 00000000000..46edfb8946a --- /dev/null +++ b/pkgs/development/libraries/haskell/happstack/happstack-lite.nix @@ -0,0 +1,14 @@ +{ cabal, happstackServer, mtl, text }: + +cabal.mkDerivation (self: { + pname = "happstack-lite"; + version = "7.3.1"; + sha256 = "0y8d0xv26szfjmkfqzak19zqjgv0w6rkc1rzrd2jkvsbchnwacjy"; + buildDepends = [ happstackServer mtl text ]; + meta = { + homepage = "http://www.happstack.com/"; + description = "Happstack minus the useless stuff"; + 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 bd7959463f3..dd9ed825e0c 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1083,6 +1083,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); happstackHamlet = callPackage ../development/libraries/haskell/happstack/happstack-hamlet.nix {}; + happstackLite = callPackage ../development/libraries/haskell/happstack/happstack-lite.nix {}; + hashable_1_1_2_5 = callPackage ../development/libraries/haskell/hashable/1.1.2.5.nix {}; hashable_1_2_0_10 = callPackage ../development/libraries/haskell/hashable/1.2.0.10.nix {}; hashable = self.hashable_1_2_0_10; From 8ea138d2121c008cb009fa0f34917ff560af182b Mon Sep 17 00:00:00 2001 From: Domen Kozar Date: Sat, 20 Jul 2013 12:45:33 +0200 Subject: [PATCH 584/798] add development version of speedtest-cli --- .../networking/speedtest-cli/default.nix | 26 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/tools/networking/speedtest-cli/default.nix diff --git a/pkgs/tools/networking/speedtest-cli/default.nix b/pkgs/tools/networking/speedtest-cli/default.nix new file mode 100644 index 00000000000..15ca99f47e9 --- /dev/null +++ b/pkgs/tools/networking/speedtest-cli/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchgit, pythonPackages }: + +stdenv.mkDerivation rec { + name = "speedtest-cli-dev"; + + src = fetchgit { + url = "https://github.com/sivel/speedtest-cli.git"; + rev = "fe0940c5744ebe74ca31ad44e6b181d82a89edab"; + sha256 = "0iywcmgqi58bhldcf8qn1nr7mihypi5fp9s13d4vqc7797xvb28k"; + }; + + buildInputs = [ pythonPackages.python ]; + + installPhase = '' + mkdir -p $out/bin + cp speedtest-cli $out/bin/ + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/sivel/speedtest-cli; + description = "Command line interface for testing internet bandwidth using speedtest.net"; + platforms = platforms.all; + license = licenses.asl20; + maintainers = [ maintainers.iElectric ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ded923ac511..7afc75b0a57 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3587,6 +3587,8 @@ let sparse = callPackage ../development/tools/analysis/sparse { }; + speedtest_cli = callPackage ../tools/networking/speedtest-cli { }; + spin = callPackage ../development/tools/analysis/spin { }; splint = callPackage ../development/tools/analysis/splint { }; From 1d59e54ebc58827053ff17b732ecea47d4eb24b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sat, 20 Jul 2013 21:36:18 +0200 Subject: [PATCH 585/798] apcupsd: fix hostname command patching The source has HOSTNAME=`hostname` (capture output of hostname command) but currently it is replaced with HOSTNAME="/path/to/hostname" (which is just a plain string). Fix it by substituting with HOSTNAME=`/path/to/hostname`. --- pkgs/servers/apcupsd/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/apcupsd/default.nix b/pkgs/servers/apcupsd/default.nix index 58b3df1b436..b8a8cbbfa1c 100644 --- a/pkgs/servers/apcupsd/default.nix +++ b/pkgs/servers/apcupsd/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { postInstall = '' for file in "$out"/etc/apcupsd/*; do sed -i -e 's|^WALL=.*|WALL="${utillinux}/bin/wall"|g' \ - -e 's|^HOSTNAME=.*|HOSTNAME="${nettools}/bin/hostname"|g' \ + -e 's|^HOSTNAME=.*|HOSTNAME=`${nettools}/bin/hostname`|g' \ "$file" done ''; From b513ea43e41df1d1feb9dac8cca21f6f56bcd0a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 17 Jul 2013 09:33:39 +0200 Subject: [PATCH 586/798] Enable blowfish/twoflish crypto in sheevaplug kernel --- pkgs/top-level/platforms.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/top-level/platforms.nix b/pkgs/top-level/platforms.nix index b2a12bf8b50..ec047efecb0 100644 --- a/pkgs/top-level/platforms.nix +++ b/pkgs/top-level/platforms.nix @@ -53,6 +53,11 @@ rec { # mv cesa requires this sw fallback, for mv-sha1 CRYPTO_SHA1 y + # Fast crypto + CRYPTO_TWOFISH y + CRYPTO_TWOFISH_COMMON y + CRYPTO_BLOWFISH y + CRYPTO_BLOWFISH_COMMON y IP_PNP y IP_PNP_DHCP y From a0893d472e0ef8335015fe8a710df2e348a9ba69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sat, 20 Jul 2013 23:15:37 +0200 Subject: [PATCH 587/798] Buidling cairo without gl on arm and mips Mesa didn't build for arm, and I don't think anyone with arm wants mesa now. And I needed cairo for rrdtool. --- pkgs/top-level/all-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7afc75b0a57..86d1059bda4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4219,7 +4219,8 @@ let pixman = callPackage ../development/libraries/pixman { }; cairo = callPackage ../development/libraries/cairo { - glSupport = config.cairo.gl or stdenv.isLinux; + glSupport = config.cairo.gl or (stdenv.isLinux && + !stdenv.isArm && !stdenv.isMips); }; cairo_1_12_2 = callPackage ../development/libraries/cairo/1.12.2.nix { }; cairomm = callPackage ../development/libraries/cairomm { }; From 9ff7e1380d6089905282e873a872e148876f44a5 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 18 Jul 2013 08:50:59 +0400 Subject: [PATCH 588/798] Add mi2ly MIDI to lilypond converter --- pkgs/applications/audio/mi2ly/default.nix | 38 +++++++++++++++++++ .../applications/audio/mi2ly/default.upstream | 3 ++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 43 insertions(+) create mode 100644 pkgs/applications/audio/mi2ly/default.nix create mode 100644 pkgs/applications/audio/mi2ly/default.upstream diff --git a/pkgs/applications/audio/mi2ly/default.nix b/pkgs/applications/audio/mi2ly/default.nix new file mode 100644 index 00000000000..1d736b06938 --- /dev/null +++ b/pkgs/applications/audio/mi2ly/default.nix @@ -0,0 +1,38 @@ +{stdenv, fetchurl}: +let + s = # Generated upstream information + rec { + baseName="mi2ly"; + version="0.12"; + name="${baseName}-${version}"; + hash="1b14zcwlvnxhjxr3ymyzg0mg4sbijkinzpxm641s859jxcgylmll"; + url="http://download.savannah.gnu.org/releases/mi2ly/mi2ly.0.12.tar.bz2"; + sha256="1b14zcwlvnxhjxr3ymyzg0mg4sbijkinzpxm641s859jxcgylmll"; + }; + buildInputs = [ + ]; +in +stdenv.mkDerivation { + inherit (s) name version; + inherit buildInputs; + src = fetchurl { + inherit (s) url sha256; + }; + + sourceRoot="."; + + buildPhase = "./cc"; + installPhase = '' + mkdir -p "$out"/{bin,share/doc/mi2ly} + cp mi2ly "$out/bin" + cp README Doc.txt COPYING Manual.txt "$out/share/doc/mi2ly" + ''; + + meta = { + inherit (s) version; + description = ''MIDI to Lilypond converter''; + license = stdenv.lib.licenses.gpl2Plus ; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/audio/mi2ly/default.upstream b/pkgs/applications/audio/mi2ly/default.upstream new file mode 100644 index 00000000000..131f0e3a71d --- /dev/null +++ b/pkgs/applications/audio/mi2ly/default.upstream @@ -0,0 +1,3 @@ +url http://download.savannah.gnu.org/releases/mi2ly/ +ensure_choice +version '.*/mi2ly[.]([0-9.]+)[.]tar.*' '\1' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 86d1059bda4..aee877b0ebc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7609,6 +7609,8 @@ let libquvi = callPackage ../applications/video/quvi/library.nix { }; + mi2ly = callPackage ../applications/audio/mi2ly {}; + praat = callPackage ../applications/audio/praat { }; quvi = callPackage ../applications/video/quvi/tool.nix { }; From 9230619ee760d17a8c8fd4cd1049b230ac2bddaa Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sat, 20 Jul 2013 13:01:41 +0200 Subject: [PATCH 589/798] haskell-mode: upgrade to 13.07 --- .../editors/emacs-modes/haskell/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/haskell/default.nix b/pkgs/applications/editors/emacs-modes/haskell/default.nix index 7e490f253d1..a1e52e1c301 100644 --- a/pkgs/applications/editors/emacs-modes/haskell/default.nix +++ b/pkgs/applications/editors/emacs-modes/haskell/default.nix @@ -1,15 +1,14 @@ -{ stdenv, fetchurl, emacs }: +{ stdenv, fetchurl, emacs, texinfo }: stdenv.mkDerivation rec { - name = "haskell-mode-2.9.1-102-g8d4b965"; + name = "haskell-mode-13.07"; src = fetchurl { - url = "https://github.com/haskell/haskell-mode/tarball/8d4b9651a69b62fcbedbac63de29a1e87ff0e97f"; - sha256 = "02sil43885xjbfqakrxkm7bjnjd930lx6845fc2rxmkq5plkq85a"; - name = "${name}.tar.gz"; + url = "https://github.com/haskell/haskell-mode/archive/v13.07.tar.gz"; + sha256 = "15c8ncj9mykkrizy1a8l94gq37s8hj13v3p5rgyaj9z0cwgl85kx"; }; - buildInputs = [emacs]; + buildInputs = [ emacs texinfo ]; installPhase = '' mkdir -p "$out/share/emacs/site-lisp" From a2b44374abb01b17607fd91a50448ce030f744bd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 21 Jul 2013 15:37:56 +0200 Subject: [PATCH 590/798] haskell-atomic-primops: update to version 0.4 --- pkgs/development/libraries/haskell/atomic-primops/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/atomic-primops/default.nix b/pkgs/development/libraries/haskell/atomic-primops/default.nix index 4645442a199..b542816f05b 100644 --- a/pkgs/development/libraries/haskell/atomic-primops/default.nix +++ b/pkgs/development/libraries/haskell/atomic-primops/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "atomic-primops"; - version = "0.2.2"; - sha256 = "1a3svsh96pl6915g70sf9zhqby0ahhifww6m13cn0zr4za32vl7n"; + version = "0.4"; + sha256 = "01sg0yn25fs0z7dmrvhyp3amay9l028xs570xhy6vvplrji1mxf0"; buildDepends = [ bitsAtomic Cabal primitive ]; meta = { homepage = "https://github.com/rrnewton/haskell-lockfree-queue/wiki"; From 16581965df0b2c92d5132673a8a81946522a391d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 21 Jul 2013 15:37:56 +0200 Subject: [PATCH 591/798] haskell-attoparsec-conduit: update to version 1.0.1.2 --- .../libraries/haskell/attoparsec-conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix b/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix index a08495db61b..68b08e50686 100644 --- a/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix +++ b/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix @@ -3,8 +3,8 @@ cabal.mkDerivation (self: { pname = "attoparsec-conduit"; - version = "1.0.1.1"; - sha256 = "0v6d5a720fksvgaysbhqfzsq9a9h0l37yw3dbskxljbdy66gqsh0"; + version = "1.0.1.2"; + sha256 = "1j05r7mvm83wgnka7asmwd1dj4ajkg548mryyhpr7dd53vn5lbx0"; buildDepends = [ attoparsec conduit text transformers ]; testDepends = [ attoparsec conduit hspec resourcet text ]; meta = { From 8740b48d862a3d739e0f261b7a4833c3f994eddc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 21 Jul 2013 15:37:56 +0200 Subject: [PATCH 592/798] haskell-classy-prelude: update to version 0.5.9 --- .../libraries/haskell/classy-prelude/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/classy-prelude/default.nix b/pkgs/development/libraries/haskell/classy-prelude/default.nix index 14695fd08f5..69acb897220 100644 --- a/pkgs/development/libraries/haskell/classy-prelude/default.nix +++ b/pkgs/development/libraries/haskell/classy-prelude/default.nix @@ -1,15 +1,15 @@ -{ cabal, basicPrelude, hashable, hspec, liftedBase, monadControl -, QuickCheck, systemFilepath, text, transformers +{ cabal, async, basicPrelude, deepseq, hashable, hspec, liftedBase +, monadControl, QuickCheck, systemFilepath, text, transformers , unorderedContainers, vector }: cabal.mkDerivation (self: { pname = "classy-prelude"; - version = "0.5.8"; - sha256 = "1yq2x3mfkasprmsx1gracjhih9l9x0dsq6pdf90khlcl11qh57ir"; + version = "0.5.9"; + sha256 = "1qqmip3ynqdxlwynm60wsn82dcyymcfql79k039iablanj4mic61"; buildDepends = [ - basicPrelude hashable liftedBase monadControl systemFilepath text - transformers unorderedContainers vector + async basicPrelude deepseq hashable liftedBase monadControl + systemFilepath text transformers unorderedContainers vector ]; testDepends = [ hspec QuickCheck transformers ]; meta = { From 1d8c4711f6ebfd1e594c63225cf026c96944633e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 21 Jul 2013 15:37:56 +0200 Subject: [PATCH 593/798] haskell-comonad-transformers: update to version 3.0.4 --- .../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 eb1a83c80e8..45b218a40f7 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.3"; - sha256 = "1q11xasl90z8sv9f7h77dxjsi2cwnjxqpaf0n5pvzn88nz9h6g66"; + version = "3.0.4"; + sha256 = "1jvg08vmi47p8ji1llci02lk675q93pm6dd8imqj6xjrq34g4x9a"; buildDepends = [ comonad contravariant distributive semigroupoids semigroups transformers From a98a96bffe0c5f2269e050ca1b9229bb03102719 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 21 Jul 2013 15:37:56 +0200 Subject: [PATCH 594/798] haskell-conduit: update to version 1.0.7.3 --- pkgs/development/libraries/haskell/conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/conduit/default.nix b/pkgs/development/libraries/haskell/conduit/default.nix index be94e811e8d..8c550065deb 100644 --- a/pkgs/development/libraries/haskell/conduit/default.nix +++ b/pkgs/development/libraries/haskell/conduit/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "conduit"; - version = "1.0.7.1"; - sha256 = "1j80kc1nwhsglh991rp9lfawlhr0kc8q8lzglfkda60f0nihiijy"; + version = "1.0.7.3"; + sha256 = "0ih3ymv5m3c66wr9xydc1dxgpvh5b92dyyc7v67li6n3w7dzi6fp"; buildDepends = [ liftedBase mmorph monadControl mtl resourcet text transformers transformersBase void From 8e736f12d45d634324e93b0f67dfcfe193eb2b19 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 21 Jul 2013 15:37:56 +0200 Subject: [PATCH 595/798] haskell-contravariant: update to version 0.4.3 --- 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 e1f5e2ae567..7978a4185af 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.1"; - sha256 = "0alzl47lqzw9fqjqxdfy40f1aynd8mc00b2h7fj2ch0zq82hm85q"; + version = "0.4.3"; + sha256 = "1hhcsy5bshi2yx8618wxa40gax5wfapnbgdmv1acgjyxb6vbmsp6"; buildDepends = [ tagged transformers transformersCompat ]; meta = { homepage = "http://github.com/ekmett/contravariant/"; From e1c3350da4f8313fb8575483fd49ede5fcee0cbb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 21 Jul 2013 15:37:56 +0200 Subject: [PATCH 596/798] haskell-shakespeare-css: update to version 1.0.6.2 --- .../development/libraries/haskell/shakespeare-css/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/shakespeare-css/default.nix b/pkgs/development/libraries/haskell/shakespeare-css/default.nix index 89a6a0970e8..df12c935d71 100644 --- a/pkgs/development/libraries/haskell/shakespeare-css/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-css/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "shakespeare-css"; - version = "1.0.6.1"; - sha256 = "1hzq7z7yhb80f4qqnjjky5kva0j1lk4jp4h50j822jyn9xn783vw"; + version = "1.0.6.2"; + sha256 = "1w29k0k5124vygydavb6a5szrv5a6n9qqhf1f27bkk86br55vnw6"; buildDepends = [ parsec shakespeare text transformers ]; testDepends = [ hspec HUnit shakespeare text ]; meta = { From fdf9b9784c810bb51c9d81e67e7c6352a1a3811d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 21 Jul 2013 15:37:56 +0200 Subject: [PATCH 597/798] haskell-shakespeare-js: update to version 1.1.4.1 --- pkgs/development/libraries/haskell/shakespeare-js/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/shakespeare-js/default.nix b/pkgs/development/libraries/haskell/shakespeare-js/default.nix index 802fc885137..917ea0c6cad 100644 --- a/pkgs/development/libraries/haskell/shakespeare-js/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-js/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "shakespeare-js"; - version = "1.1.4"; - sha256 = "05hnqpg1icf6akvchhiam8sd2xkfiyvbwq504gnys55rxgjabfy3"; + version = "1.1.4.1"; + sha256 = "1mvsdbc3c6vgdpdb4m8b2d28vrh79v64vb9wkpnvhfg0jn7kb5c0"; buildDepends = [ aeson shakespeare text ]; testDepends = [ aeson hspec HUnit shakespeare text ]; meta = { From f749af3daadfc73e87e104384fc17782cb94022b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 21 Jul 2013 15:37:56 +0200 Subject: [PATCH 598/798] haskell-shakespeare-text: update to version 1.0.0.6 --- .../libraries/haskell/shakespeare-text/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/shakespeare-text/default.nix b/pkgs/development/libraries/haskell/shakespeare-text/default.nix index d4cc135cc62..e2ff7ff27e1 100644 --- a/pkgs/development/libraries/haskell/shakespeare-text/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-text/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "shakespeare-text"; - version = "1.0.0.5"; - sha256 = "176yzx43sh0fnxpszn8kximd6i96yf2s374z55kvc1kspf7jk736"; + version = "1.0.0.6"; + sha256 = "1qlf51rpyzgnxdhyfs6g3vh8zq5vyq263qhm577w7rc9s4hjxk45"; buildDepends = [ shakespeare text ]; testDepends = [ hspec HUnit text ]; meta = { From 9102dbe6672eecfbf5bdd0d58b58d4857baa5755 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 21 Jul 2013 15:37:56 +0200 Subject: [PATCH 599/798] haskell-xml-conduit: update to version 1.1.0.5 --- 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 7a03815c183..98166f80d31 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.4"; - sha256 = "0mbn0xm3br4f645qk1cv09zjlrcws5qdn498iwm5lx4j2ygg9swa"; + version = "1.1.0.5"; + sha256 = "1ryiacx42hdh564zy6dj5vxxl2l8flfffmdw8shb32w3gp11fzmp"; buildDepends = [ attoparsec attoparsecConduit blazeBuilder blazeBuilderConduit blazeHtml blazeMarkup conduit dataDefault failure monadControl From 88da6b5d89b85ed95d06783b999181fb3904bc8a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 21 Jul 2013 15:37:57 +0200 Subject: [PATCH 600/798] haskell-xml-types: update to version 0.3.4 --- pkgs/development/libraries/haskell/xml-types/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/xml-types/default.nix b/pkgs/development/libraries/haskell/xml-types/default.nix index 48bd32b7c89..94a7d3f7dff 100644 --- a/pkgs/development/libraries/haskell/xml-types/default.nix +++ b/pkgs/development/libraries/haskell/xml-types/default.nix @@ -1,10 +1,10 @@ -{ cabal, text }: +{ cabal, deepseq, text }: cabal.mkDerivation (self: { pname = "xml-types"; - version = "0.3.3"; - sha256 = "0jvchgzmqsnc0dax73nh7wa7x6n07qnl4wr1d58v21rlbqcklgcn"; - buildDepends = [ text ]; + version = "0.3.4"; + sha256 = "1689ijr4xxh4shxxvd51wdkpc535kzv6liqg4m1prag96aq05r8y"; + buildDepends = [ deepseq text ]; meta = { homepage = "https://john-millikin.com/software/haskell-xml/"; description = "Basic types for representing XML"; From 8d835064525920eea95678484226b026c983fac6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 21 Jul 2013 15:37:57 +0200 Subject: [PATCH 601/798] haskell-yaml: update to version 0.8.4 --- pkgs/development/libraries/haskell/yaml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yaml/default.nix b/pkgs/development/libraries/haskell/yaml/default.nix index 1324a2137b1..ee8b28b94cb 100644 --- a/pkgs/development/libraries/haskell/yaml/default.nix +++ b/pkgs/development/libraries/haskell/yaml/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "yaml"; - version = "0.8.3"; - sha256 = "1lbf0dgc3qvcdiyzk8zkpkga7f7g4i2rxriwdvwbxx199xr4apx3"; + version = "0.8.4"; + sha256 = "0kdqhdiyy2mqc3rb3l7aaspalkj4z8jndyzhij8m06n43hfzbhhi"; buildDepends = [ aeson attoparsec conduit resourcet text transformers unorderedContainers vector From 7eea045b28bbf95e3814df4792402b62be3ee0e9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 21 Jul 2013 15:37:57 +0200 Subject: [PATCH 602/798] haskell-yesod-bin: update to version 1.2.2 --- pkgs/development/libraries/haskell/yesod-bin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-bin/default.nix b/pkgs/development/libraries/haskell/yesod-bin/default.nix index 1a88ccfd223..a7925e82b10 100644 --- a/pkgs/development/libraries/haskell/yesod-bin/default.nix +++ b/pkgs/development/libraries/haskell/yesod-bin/default.nix @@ -10,8 +10,8 @@ cabal.mkDerivation (self: { pname = "yesod-bin"; - version = "1.2.1"; - sha256 = "0qag1phagcdn1zq3kgxbxynqdy5grj8icifz896v0n6bzjsn102b"; + version = "1.2.2"; + sha256 = "03c53kgiqmjjihszmvqjgkcklq28mvyn4m2lhcbmqqzkkzyjb0rj"; isLibrary = false; isExecutable = true; buildDepends = [ From 38a2056f7042905efafcfa3044608006df89197f Mon Sep 17 00:00:00 2001 From: Aristid Breitkreuz Date: Tue, 9 Jul 2013 20:53:45 +0200 Subject: [PATCH 603/798] fix bug in perf-linux installation, oops --- pkgs/os-specific/linux/kernel/perf.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/perf.nix b/pkgs/os-specific/linux/kernel/perf.nix index 83de0effcec..04924f013a4 100644 --- a/pkgs/os-specific/linux/kernel/perf.nix +++ b/pkgs/os-specific/linux/kernel/perf.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { preConfigure = '' cd tools/perf sed -i s,/usr/include/elfutils,$elfutils/include/elfutils, Makefile - -f bash_completion && sed -i 's,^have perf,_have perf,' bash_completion + [ -f bash_completion ] && sed -i 's,^have perf,_have perf,' bash_completion export makeFlags="DESTDIR=$out $makeFlags" ''; From 147a6ae62fb0469b8c968958b7d50c65cf60c792 Mon Sep 17 00:00:00 2001 From: Aristid Breitkreuz Date: Sun, 21 Jul 2013 19:32:54 +0200 Subject: [PATCH 604/798] nvidia: also install useful nvidia-smi tool --- pkgs/os-specific/linux/nvidia-x11/builder.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh index c1e60a79082..28e2bd5642c 100755 --- a/pkgs/os-specific/linux/nvidia-x11/builder.sh +++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh @@ -74,7 +74,7 @@ installPhase() { # Install the programs. mkdir -p $out/bin - for i in nvidia-settings nvidia-xconfig; do + for i in nvidia-settings nvidia-smi nvidia-xconfig; do cp $i $out/bin/$i patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ --set-rpath $out/lib:$programPath:$glPath $out/bin/$i From 480f27b218a7a3ebe937b8f645eb132339302e75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 21 Jul 2013 20:58:26 +0200 Subject: [PATCH 605/798] apcupsd: use /run/nologin (instead of /etc/nologin) to prevent logins This is what systemd uses, see "man systemd-user-sessions.service". --- pkgs/servers/apcupsd/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/apcupsd/default.nix b/pkgs/servers/apcupsd/default.nix index b8a8cbbfa1c..877be1d74b8 100644 --- a/pkgs/servers/apcupsd/default.nix +++ b/pkgs/servers/apcupsd/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { --mandir=$out/share/man \ --with-halpolicydir=$out/share/halpolicy \ --localstatedir=/var/ \ - --with-nologin=/etc \ + --with-nologin=/run \ --with-log-dir=/var/log/apcupsd \ --with-pwrfail-dir=/run/apcupsd \ --with-lock-dir=/run/lock \ From f2601c5aded96a8e4ea25b23fcc4295e826cfbcd Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Sun, 14 Jul 2013 13:41:56 +1000 Subject: [PATCH 606/798] matplotlib: fix build on darwin * build with clangStdenv * update to 1.2.1 --- pkgs/top-level/python-packages.nix | 33 ++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9ae389d8e69..bf9746bbcd3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2581,23 +2581,38 @@ pythonPackages = python.modules // rec { }; - matplotlib = buildPythonPackage ( rec { - name = "matplotlib-1.1.0"; + # not sure if this is the best way to accomplish this -- needed to provide + # objective-c compiler on darwin + matplotlibStdenv = if stdenv.isDarwin + then pkgs.clangStdenv + else pkgs.stdenv; + + matplotlib = matplotlibStdenv.mkDerivation (rec { + name = "matplotlib-1.2.1"; + src = fetchurl { - url = "mirror://sourceforge/matplotlib/${name}.tar.gz"; - sha256 = "be37e1d86c65ecacae6683f8805e051e9904e5f2e02bf2b7a34262c46a6d06a7"; + url = "http://downloads.sourceforge.net/matplotlib/${name}.tar.gz"; + sha256 = "16x2ksdxx5p92v98qngh29hdz1bnqy77fhggbjq30pyqmrr8kqaj"; }; # error: invalid command 'test' doCheck = false; - propagatedBuildInputs = [ dateutil numpy pkgs.freetype pkgs.libpng pkgs.pkgconfig pkgs.tcl pkgs.tk pkgs.xlibs.libX11 ]; + buildInputs = [ python pkgs.which pkgs.ghostscript ]; - meta = { + propagatedBuildInputs = + [ dateutil numpy pkgs.freetype pkgs.libpng pkgs.pkgconfig pkgs.tcl + pkgs.tk pkgs.xlibs.libX11 ]; + + buildPhase = "python setup.py build"; + + installPhase = "python setup.py install --prefix=$out"; + + meta = with stdenv.lib; { description = "python plotting library, making publication quality plots"; - homepage = "http://matplotlib.sourceforge.net/"; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.simons ]; + homepage = "http://matplotlib.sourceforge.net/"; + maintainers = with maintainers; [ lovek323 simons ]; + platforms = platforms.unix; }; }); From 48e187836b180965a9855b99ef3409cc7294f2fa Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Mon, 22 Jul 2013 11:15:21 +0200 Subject: [PATCH 607/798] Added flatiron nodejs package + updated other nodejs packages --- pkgs/top-level/node-packages-generated.nix | 285 ++++++++++++++++++++- pkgs/top-level/node-packages.json | 1 + 2 files changed, 283 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix index 31dd33a8059..b64ffd37792 100644 --- a/pkgs/top-level/node-packages-generated.nix +++ b/pkgs/top-level/node-packages-generated.nix @@ -490,6 +490,17 @@ sha1 = "be3e5382fc02b6d6324956ac1af98aa98b08534c"; tarball = "http://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.1.tgz"; } + { + name = "buffer-equal"; + spec = "~0.0.0"; + version = "0.0.0"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "4a68196ac33522daa17ec99858b302a636b62cf1"; + tarball = "http://registry.npmjs.org/buffer-equal/-/buffer-equal-0.0.0.tgz"; + } { name = "buffertools"; spec = "*"; @@ -512,6 +523,18 @@ sha1 = "1071a5f40fe76c39d7a4fe2ea030324d09d6ec9d"; tarball = "http://registry.npmjs.org/buffertools/-/buffertools-1.1.1.tgz"; } + { + name = "bunker"; + spec = "0.1.X"; + version = "0.1.2"; + topLevel = false; + dependencies = [ + { name = "burrito"; spec = ">=0.2.5 <0.3"; } + ]; + patchLatest = false; + sha1 = "c88992464a8e2a6ede86930375f92b58077ef97c"; + tarball = "http://registry.npmjs.org/bunker/-/bunker-0.1.2.tgz"; + } { name = "bunyan"; spec = "0.21.1"; @@ -525,6 +548,19 @@ sha1 = "ea00a0d5223572e31e1e71efba2237cb1915942a"; tarball = "http://registry.npmjs.org/bunyan/-/bunyan-0.21.1.tgz"; } + { + name = "burrito"; + spec = ">=0.2.5 <0.3"; + version = "0.2.12"; + topLevel = false; + dependencies = [ + { name = "traverse"; spec = "~0.5.1"; } + { name = "uglify-js"; spec = "~1.1.1"; } + ]; + patchLatest = false; + sha1 = "d0d6e6ac81d5e99789c6fa4accb0b0031ea54f6b"; + tarball = "http://registry.npmjs.org/burrito/-/burrito-0.2.12.tgz"; + } { name = "bytes"; spec = "0.2.0"; @@ -547,6 +583,17 @@ sha1 = "55384d6afcf8c6b9dd483e8347646a790e4545e7"; tarball = "http://registry.npmjs.org/character-parser/-/character-parser-1.0.2.tgz"; } + { + name = "charm"; + spec = "0.1.x"; + version = "0.1.2"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "06c21eed1a1b06aeb67553cdc53e23274bac2296"; + tarball = "http://registry.npmjs.org/charm/-/charm-0.1.2.tgz"; + } { name = "child-process-close"; spec = "~0.1.1"; @@ -1194,6 +1241,28 @@ sha1 = "99679d3bbd047156fcd450d3d01eeb9068691e83"; tarball = "http://registry.npmjs.org/deep-equal/-/deep-equal-0.0.0.tgz"; } + { + name = "deep-equal"; + spec = "~0.0.0"; + version = "0.0.0"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "99679d3bbd047156fcd450d3d01eeb9068691e83"; + tarball = "http://registry.npmjs.org/deep-equal/-/deep-equal-0.0.0.tgz"; + } + { + name = "deep-is"; + spec = "0.1.x"; + version = "0.1.2"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "9ced65ea0bc0b09f42a6d79c1b1903f9d913cc18"; + tarball = "http://registry.npmjs.org/deep-is/-/deep-is-0.1.2.tgz"; + } { name = "delayed-stream"; spec = "0.0.5"; @@ -1227,6 +1296,20 @@ sha1 = "664b6bdb113fb3a51ced79aff621badeed29a02c"; tarball = "http://registry.npmjs.org/diff/-/diff-1.0.5.tgz"; } + { + name = "difflet"; + spec = "~0.2.0"; + version = "0.2.6"; + topLevel = false; + dependencies = [ + { name = "traverse"; spec = "0.6.x"; } + { name = "charm"; spec = "0.1.x"; } + { name = "deep-is"; spec = "0.1.x"; } + ]; + patchLatest = false; + sha1 = "ab23b31f5649b6faa8e3d2acbd334467365ca6fa"; + tarball = "http://registry.npmjs.org/difflet/-/difflet-0.2.6.tgz"; + } { name = "director"; spec = "1.1.10"; @@ -1516,6 +1599,22 @@ sha1 = "c14c5b3bf14d7417ffbfd990c0a7495cd9f337bc"; tarball = "http://registry.npmjs.org/faye-websocket/-/faye-websocket-0.4.4.tgz"; } + { + name = "flatiron"; + spec = "*"; + version = "0.3.8"; + topLevel = true; + dependencies = [ + { name = "broadway"; spec = "0.2.7"; } + { name = "optimist"; spec = "0.3.5"; } + { name = "prompt"; spec = "0.2.11"; } + { name = "director"; spec = "1.1.10"; } + { name = "pkginfo"; spec = "0.3.0"; } + ]; + patchLatest = false; + sha1 = "235d691f19154eff033610c12bcd51f304ff09c6"; + tarball = "http://registry.npmjs.org/flatiron/-/flatiron-0.3.8.tgz"; + } { name = "flatiron"; spec = "0.3.5"; @@ -2184,6 +2283,17 @@ sha1 = "45be2390d27af4b7613aac4ee4d957e3f4cbdb54"; tarball = "http://registry.npmjs.org/iconv-lite/-/iconv-lite-0.2.7.tgz"; } + { + name = "inherits"; + spec = "*"; + version = "2.0.0"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "76c81b3b1c10ddee3a60bf2c247162bc369f8ba8"; + tarball = "http://registry.npmjs.org/inherits/-/inherits-2.0.0.tgz"; + } { name = "inherits"; spec = "1"; @@ -2890,6 +3000,17 @@ sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7"; tarball = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz"; } + { + name = "mkdirp"; + spec = "~0.3"; + version = "0.3.5"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7"; + tarball = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz"; + } { name = "mkdirp"; spec = "~0.3.3"; @@ -3099,13 +3220,14 @@ { name = "msgpack"; spec = ">= 0.0.1"; - version = "0.1.8"; + version = "0.1.10"; topLevel = false; dependencies = [ + { name = "nodeunit"; spec = "https://github.com/godsflaw/nodeunit/tarball/master"; } ]; patchLatest = false; - sha1 = "cd5c0d2277bf1659a871209ddf59f57ad1124d68"; - tarball = "http://registry.npmjs.org/msgpack/-/msgpack-0.1.8.tgz"; + sha1 = "ebb2edea5ebc3616a2ce003d8d8ef73b52bf7318"; + tarball = "http://registry.npmjs.org/msgpack/-/msgpack-0.1.10.tgz"; } { name = "muri"; @@ -3405,6 +3527,18 @@ sha1 = "c0667a000f208dbf6a4dad08a5186595a9889590"; tarball = "http://registry.npmjs.org/nodemon/-/nodemon-0.7.8.tgz"; } + { + name = "nodeunit"; + spec = "https://github.com/godsflaw/nodeunit/tarball/master"; + version = "0.7.4"; + topLevel = false; + dependencies = [ + { name = "tap"; spec = ">=0.2.3"; } + ]; + patchLatest = false; + sha256 = "c79333b5b54ca3b9eb42e42d6ea48d261aa9e015c0ad9cf340abacb528d0ee3a"; + tarball = "https://github.com/godsflaw/nodeunit/tarball/master"; + } { name = "nopt"; spec = "2"; @@ -3429,6 +3563,18 @@ sha1 = "ca7416f20a5e3f9c3b86180f96295fa3d0b52e0d"; tarball = "http://registry.npmjs.org/nopt/-/nopt-2.0.0.tgz"; } + { + name = "nopt"; + spec = "~2"; + version = "2.1.2"; + topLevel = false; + dependencies = [ + { name = "abbrev"; spec = "1"; } + ]; + patchLatest = false; + sha1 = "6cccd977b80132a07731d6e8ce58c2c8303cf9af"; + tarball = "http://registry.npmjs.org/nopt/-/nopt-2.1.2.tgz"; + } { name = "nopt"; spec = "~2.1.1"; @@ -4010,6 +4156,22 @@ sha1 = "46648aa9d605af5d2e70c3024bf59436da02b80e"; tarball = "http://registry.npmjs.org/promise/-/promise-2.0.0.tgz"; } + { + name = "prompt"; + spec = "0.2.11"; + version = "0.2.11"; + topLevel = false; + dependencies = [ + { name = "pkginfo"; spec = "0.x.x"; } + { name = "read"; spec = "1.0.x"; } + { name = "revalidator"; spec = "0.1.x"; } + { name = "utile"; spec = "0.2.x"; } + { name = "winston"; spec = "0.6.x"; } + ]; + patchLatest = false; + sha1 = "26d455af4b7fac15291dfcdddf2400328c1fa446"; + tarball = "http://registry.npmjs.org/prompt/-/prompt-0.2.11.tgz"; + } { name = "prompt"; spec = "0.2.9"; @@ -4588,6 +4750,18 @@ sha1 = "8f49c57874ce166b667fbfecac2cdf7f26d3d8a5"; tarball = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.1.tgz"; } + { + name = "rimraf"; + spec = "2.x.x"; + version = "2.2.1"; + topLevel = false; + dependencies = [ + { name = "graceful-fs"; spec = "~1"; } + ]; + patchLatest = false; + sha1 = "8f49c57874ce166b667fbfecac2cdf7f26d3d8a5"; + tarball = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.1.tgz"; + } { name = "rimraf"; spec = "~2"; @@ -4624,6 +4798,18 @@ sha1 = "8f49c57874ce166b667fbfecac2cdf7f26d3d8a5"; tarball = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.1.tgz"; } + { + name = "runforcover"; + spec = "~0.0.2"; + version = "0.0.2"; + topLevel = false; + dependencies = [ + { name = "bunker"; spec = "0.1.X"; } + ]; + patchLatest = false; + sha1 = "344f057d8d45d33aebc6cc82204678f69c4857cc"; + tarball = "http://registry.npmjs.org/runforcover/-/runforcover-0.0.2.tgz"; + } { name = "s3http"; spec = "*"; @@ -4895,6 +5081,17 @@ sha1 = "34f89a6db1f31fa525f5a570f5bcf877cf0955ee"; tarball = "http://registry.npmjs.org/sliced/-/sliced-0.0.4.tgz"; } + { + name = "slide"; + spec = "*"; + version = "1.1.4"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "2b23f1949b369ed61d22bd6570ff0320302fc8df"; + tarball = "http://registry.npmjs.org/slide/-/slide-1.1.4.tgz"; + } { name = "slide"; spec = "~1.1.3"; @@ -5194,6 +5391,27 @@ sha1 = "2987b1ce2bd2f38b0dce2a34388884bfa4400ea7"; tarball = "http://registry.npmjs.org/sylvester/-/sylvester-0.0.21.tgz"; } + { + name = "tap"; + spec = ">=0.2.3"; + version = "0.4.3"; + topLevel = false; + dependencies = [ + { name = "inherits"; spec = "*"; } + { name = "yamlish"; spec = "*"; } + { name = "slide"; spec = "*"; } + { name = "runforcover"; spec = "~0.0.2"; } + { name = "nopt"; spec = "~2"; } + { name = "mkdirp"; spec = "~0.3"; } + { name = "difflet"; spec = "~0.2.0"; } + { name = "deep-equal"; spec = "~0.0.0"; } + { name = "buffer-equal"; spec = "~0.0.0"; } + { name = "glob"; spec = "~3.2.1"; } + ]; + patchLatest = false; + sha1 = "5ead7ede530658167fe28e3cdb9b0f96d3cf0c76"; + tarball = "http://registry.npmjs.org/tap/-/tap-0.4.3.tgz"; + } { name = "tar"; spec = "*"; @@ -5309,6 +5527,28 @@ sha1 = "352131dfceb93a7532dc7535a4f142510435a394"; tarball = "http://registry.npmjs.org/transformers/-/transformers-2.0.1.tgz"; } + { + name = "traverse"; + spec = "0.6.x"; + version = "0.6.3"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "a053ffa1b6179b9240ea16d74bfd604bd6b6e41b"; + tarball = "http://registry.npmjs.org/traverse/-/traverse-0.6.3.tgz"; + } + { + name = "traverse"; + spec = "~0.5.1"; + version = "0.5.2"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "e203c58d5f7f0e37db6e74c0acb929bb09b61d85"; + tarball = "http://registry.npmjs.org/traverse/-/traverse-0.5.2.tgz"; + } { name = "tunnel-agent"; spec = "~0.2.0"; @@ -5356,6 +5596,17 @@ sha1 = "fa0984770b428b7a9b2a8058f46355d14fef211a"; tarball = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.3.6.tgz"; } + { + name = "uglify-js"; + spec = "~1.1.1"; + version = "1.1.1"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "ee71a97c4cefd06a1a9b20437f34118982aa035b"; + tarball = "http://registry.npmjs.org/uglify-js/-/uglify-js-1.1.1.tgz"; + } { name = "uglify-js"; spec = "~2.2.5"; @@ -5517,6 +5768,23 @@ sha1 = "55db180d54475339fd6dd9e2d14a4c0b52624b69"; tarball = "http://registry.npmjs.org/utile/-/utile-0.1.7.tgz"; } + { + name = "utile"; + spec = "0.2.x"; + version = "0.2.0"; + topLevel = false; + dependencies = [ + { name = "async"; spec = "0.1.x"; } + { name = "deep-equal"; spec = "*"; } + { name = "i"; spec = "0.3.x"; } + { name = "mkdirp"; spec = "0.x.x"; } + { name = "ncp"; spec = "0.2.x"; } + { name = "rimraf"; spec = "2.x.x"; } + ]; + patchLatest = false; + sha1 = "91a2423ca2eb3322390e211ee3d71cf4fa193aea"; + tarball = "http://registry.npmjs.org/utile/-/utile-0.2.0.tgz"; + } { name = "vasync"; spec = "1.3.3"; @@ -5846,6 +6114,17 @@ sha1 = "b916ff10ecfb54320f16f24a3e975120653ab0d2"; tarball = "http://registry.npmjs.org/xoauth2/-/xoauth2-0.1.8.tgz"; } + { + name = "yamlish"; + spec = "*"; + version = "0.0.5"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "86c6c8e6b28b0827416dcc86f7419bba5610b57d"; + tarball = "http://registry.npmjs.org/yamlish/-/yamlish-0.0.5.tgz"; + } { name = "zeparser"; spec = "0.0.5"; diff --git a/pkgs/top-level/node-packages.json b/pkgs/top-level/node-packages.json index d58967b0b39..2bb095cf913 100644 --- a/pkgs/top-level/node-packages.json +++ b/pkgs/top-level/node-packages.json @@ -63,6 +63,7 @@ , "npm" , "gridfs-stream" , "tar" +, "flatiron" , { "node-uptime": "https://github.com/fzaninotto/uptime/tarball/1c65756575f90f563a752e2a22892ba2981c79b7" } , { "guifi-earth": "https://github.com/jmendeth/guifi-earth/tarball/f3ee96835fd4fb0e3e12fadbd2cb782770d64854 " } ] From a321f6f3027bde8df2dee8280f08e1e9b726666f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Mon, 22 Jul 2013 14:05:39 +0200 Subject: [PATCH 608/798] Oxygen-gtk: upgrade to 1.3.4 --- pkgs/misc/themes/gtk2/oxygen-gtk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/themes/gtk2/oxygen-gtk/default.nix b/pkgs/misc/themes/gtk2/oxygen-gtk/default.nix index 185532589c6..3a619220bcf 100644 --- a/pkgs/misc/themes/gtk2/oxygen-gtk/default.nix +++ b/pkgs/misc/themes/gtk2/oxygen-gtk/default.nix @@ -2,12 +2,12 @@ cmake, dbus_glib, glib, gtk, gdk_pixbuf, pkgconfig, xorg }: stdenv.mkDerivation rec { - version = "1.3.2.1"; + version = "1.3.4"; name = "oxygen-gtk2-${version}"; src = fetchurl { url = "mirror://kde/stable/oxygen-gtk2/${version}/src/${name}.tar.bz2"; - sha256 = "19l0dhjswvm7y99pvbd3qnz37k0p5y2slljy8mm4r8awjff3v4qi"; + sha256 = "02q46kq0hhrmzwbjngg31ydl2198ls5bxgnz2si4amdmqii1nlmj"; }; buildInputs = [ cmake dbus_glib glib gtk gdk_pixbuf From 3fa913d5ec035c2eedfc52e5753b355c22c2a745 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Mon, 22 Jul 2013 16:28:33 +0200 Subject: [PATCH 609/798] libspotify: Fix build for linux. For Linux, the phases was run in the wrong order. I've fixed that, but the package is still a complete mess that needs to be cleaned up. The linux and darwin builds should probably be separated into two different Nix expressions to avoid the current conditional mess. --- pkgs/development/libraries/libspotify/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/libspotify/default.nix b/pkgs/development/libraries/libspotify/default.nix index 86007920d0e..000112008a3 100644 --- a/pkgs/development/libraries/libspotify/default.nix +++ b/pkgs/development/libraries/libspotify/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, libspotify, alsaLib, readline, pkgconfig, apiKey, unzip }: +{ stdenv, fetchurl, libspotify, alsaLib, readline, pkgconfig, apiKey, unzip, gnused }: let version = "12.1.51"; in -if (stdenv.system == "x86_64-linux" && stdenv.system != "x86_64-darwin") +if (stdenv.system != "x86_64-linux" && stdenv.system != "x86_64-darwin") then throw "Check https://developer.spotify.com/technologies/libspotify/ for a tarball for your system and add it here" else stdenv.mkDerivation { name = "libspotify-${version}"; @@ -24,9 +24,10 @@ else stdenv.mkDerivation { # common buildPhase = "true"; # no patch or build phase for darwin - phases = [ "unpackPhase" "installPhase" ] - ++ stdenv.lib.optionals (stdenv.system == "x86_64-linux") - [ "patchPhase" "buildPhase" ]; + phases = + [ "unpackPhase" ] ++ + (stdenv.lib.optionals (stdenv.system == "x86_64-linux") [ "patchPhase" "buildPhase" ]) ++ + [ "installPhase" ]; installPhase = if (stdenv.system == "x86_64-linux") then "installPhase" else '' @@ -48,7 +49,7 @@ else stdenv.mkDerivation { installFlags = stdenv.lib.optionalString (stdenv.system == "x86_64-linux") "prefix=$(out)"; patchPhase = stdenv.lib.optionalString (stdenv.system == "x86_64-linux") - "sed -i 's/ldconfig//' Makefile"; + "${gnused}/bin/sed -i 's/ldconfig//' Makefile"; postInstall = stdenv.lib.optionalString (stdenv.system == "x86_64-linux") "mv -v share $out"; From b52621a5fe59ca22a2ced78d8041ff7138a1cbe6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 22 Jul 2013 16:25:02 +0200 Subject: [PATCH 610/798] ipsec-tools: update to version 0.8.1 --- pkgs/os-specific/linux/ipsec-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/ipsec-tools/default.nix b/pkgs/os-specific/linux/ipsec-tools/default.nix index 00676319b03..b28320c0625 100644 --- a/pkgs/os-specific/linux/ipsec-tools/default.nix +++ b/pkgs/os-specific/linux/ipsec-tools/default.nix @@ -7,11 +7,11 @@ # the time being. stdenv.mkDerivation rec { - name = "ipsec-tools-0.8.0"; + name = "ipsec-tools-0.8.1"; src = fetchurl { url = "mirror://sourceforge/ipsec-tools/${name}.tar.bz2"; - sha256 = "2359a24aa8eda9ca7043fc47950c8e6b7f58a07c5d5ad316aa7de2bc5e3a8717"; + sha256 = "1m1x2planqqxi0587g7d8xhy0gkyfaxs3ry4hhdh0bw46sxrajps"; }; buildInputs = [ readline openssl flex krb5 pam ]; From 22689567edb2bafe375560c568e90d727aea0a29 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Sun, 21 Jul 2013 02:14:16 +0000 Subject: [PATCH 611/798] apparmor: Update to kernel 3.4 series (the current default) --- pkgs/os-specific/linux/kernel/patches.nix | 7 +++++++ pkgs/top-level/all-packages.nix | 9 +++++++++ 2 files changed, 16 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 73146d8b67d..35f47b8e607 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -55,6 +55,13 @@ rec { features.apparmor = true; }; + apparmor_3_4 = rec { + version = "3.4"; + name = "apparmor-${version}"; + patch = makeAppArmorPatch { inherit apparmor version; }; + features.apparmor = true; + }; + sec_perm_2_6_24 = { name = "sec_perm-2.6.24"; patch = ./sec_perm-2.6.24.patch; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index aee877b0ebc..6020b4ae515 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6373,6 +6373,14 @@ let ]; }; + linux_3_4_apparmor = linux_3_4.override { + kernelPatches = [ kernelPatches.apparmor_3_4 ]; + extraConfig = '' + SECURITY_APPARMOR y + DEFAULT_SECURITY_APPARMOR y + ''; + }; + linux_3_6_rpi = makeOverridable (import ../os-specific/linux/kernel/linux-rpi-3.6.nix) { inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; }; @@ -6534,6 +6542,7 @@ let linuxPackages_3_2_apparmor = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_2_apparmor linuxPackages_3_2_apparmor); linuxPackages_3_2_xen = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_2_xen linuxPackages_3_2_xen); linuxPackages_3_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_4 linuxPackages_3_4); + linuxPackages_3_4_apparmor = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_4_apparmor linuxPackages_3_4_apparmor); linuxPackages_3_6_rpi = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_6_rpi linuxPackages_3_6_rpi); linuxPackages_3_8 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_8 linuxPackages_3_8); linuxPackages_3_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_9 linuxPackages_3_9); From 212a2a5c37c0578e62c339a27b45e682b6c4556b Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Mon, 22 Jul 2013 21:28:46 +0200 Subject: [PATCH 612/798] Fix junit --- pkgs/development/libraries/java/junit/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/java/junit/default.nix b/pkgs/development/libraries/java/junit/default.nix index c1d713950b4..7a6db1ad4b3 100644 --- a/pkgs/development/libraries/java/junit/default.nix +++ b/pkgs/development/libraries/java/junit/default.nix @@ -1,13 +1,12 @@ -{stdenv, fetchgit, unzip} : +{stdenv, fetchurl, unzip} : stdenv.mkDerivation { name = "junit-4.8.2"; builder = ./builder.sh; - src = fetchgit { - url = https://github.com/junit-team/junit.git; - rev = "refs/tags/r4.8.2"; - sha256 = "1w73l3x97kg8zmrp44xgvp3gr6sih0crm0dhhky6jiq915ba1dlh"; + src = fetchurl { + url = https://github.com/downloads/junit-team/junit/junit4.8.2.zip; + sha256 = "01simvc3pmgp27p7vzavmsx5rphm6hqzwrqfkwllhf3812dcqxy6"; }; inherit unzip; From af2a12755113d8c1e1464fbe20ead31389a66e32 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Mon, 22 Jul 2013 21:44:31 +0200 Subject: [PATCH 613/798] Add linux 3.2.48 with grsecurity patches --- pkgs/os-specific/linux/kernel/builder.sh | 2 +- pkgs/os-specific/linux/kernel/patches.nix | 9 +++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/builder.sh b/pkgs/os-specific/linux/kernel/builder.sh index 14d8108ba16..47c7a22c177 100644 --- a/pkgs/os-specific/linux/kernel/builder.sh +++ b/pkgs/os-specific/linux/kernel/builder.sh @@ -1,7 +1,7 @@ source $stdenv/setup -makeFlags="ARCH=$arch SHELL=/bin/sh" +makeFlags="ARCH=$arch SHELL=/bin/sh $makeFlags" if [ -n "$crossConfig" ]; then makeFlags="$makeFlags CROSS_COMPILE=$crossConfig-" fi diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 35f47b8e607..37c5f926e87 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -154,6 +154,15 @@ rec { patch = ./mips-ext3-n32.patch; }; + grsecurity_2_9_1_3_2_48 = + { name = "grsecurity-2.9.1-3.2.48"; + patch = + (fetchurl { + url = http://grsecurity.net/stable/grsecurity-2.9.1-3.2.48-201307212241.patch; + sha256 = "1llgrcd7ynxx60dn05bcbysd6a1091wwxkck4d15gvp71s9r6scm"; + }); + }; + guruplug_defconfig = { # Default configuration for the GuruPlug. From # . diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6020b4ae515..fab5abd9c49 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6348,6 +6348,10 @@ let ]; }; + linux_3_2_grsecurity = lib.overrideDerivation (linux_3_2.override (args: { + kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_2_9_1_3_2_48 ]; + })) (args: { makeFlags = "DISABLE_PAX_PLUGINS=y";}); + linux_3_2_apparmor = linux_3_2.override { kernelPatches = [ kernelPatches.apparmor_3_2 ]; extraConfig = '' From b1db03ece62c1a566187880092e0e1ec542944b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 22 Jul 2013 22:18:26 +0200 Subject: [PATCH 614/798] Updating go to 1.1.1 --- pkgs/development/compilers/go/1.1.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/go/1.1.nix b/pkgs/development/compilers/go/1.1.nix index 39c79e9a3de..01a8f1b6b18 100644 --- a/pkgs/development/compilers/go/1.1.nix +++ b/pkgs/development/compilers/go/1.1.nix @@ -7,11 +7,11 @@ let in stdenv.mkDerivation { - name = "go-1.1"; + name = "go-1.1.1"; src = fetchurl { - url = http://go.googlecode.com/files/go1.1.src.tar.gz; - sha1 = "a464704ebbbdd552a39b5f9429b059c117d165b3"; + url = http://go.googlecode.com/files/go1.1.1.src.tar.gz; + sha1 = "f365aed8183e487a48a66ace7bf36e5974dffbb3"; }; buildInputs = [ bison glibc bash makeWrapper ]; From bee4c41e13a9276db4f4a582234c670d74edfa1a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 23 Jul 2013 10:40:35 +0200 Subject: [PATCH 615/798] smartmontools: update drive database to the latest version --- pkgs/tools/system/smartmontools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/smartmontools/default.nix b/pkgs/tools/system/smartmontools/default.nix index 909b0d832f7..b901bd3b78e 100644 --- a/pkgs/tools/system/smartmontools/default.nix +++ b/pkgs/tools/system/smartmontools/default.nix @@ -2,8 +2,8 @@ let driverdb = fetchurl { - url = "http://smartmontools.svn.sourceforge.net/viewvc/smartmontools/trunk/smartmontools/drivedb.h?revision=3797"; - sha256 = "01ycm3vffxpfvfga9vp1d38jy3lqpkpxnxf78pidc8q1nn8bpdyz"; + url = "http://smartmontools.svn.sourceforge.net/viewvc/smartmontools/trunk/smartmontools/drivedb.h?revision=3812"; + sha256 = "1x22ammjwlb7p3cmd13shqq1payb7nr9pgfa9xifs19qyr77mrwp"; name = "smartmontools-drivedb.h"; }; in From 4dd9507b835fd0b8ff556a1c547601a9ac1857ae Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 23 Jul 2013 11:12:03 +0200 Subject: [PATCH 616/798] netpbm: Fix a truly random build failure Since "src" is a fetchsvn directory, the source is copied with "cp --no-preserve=timestamps" (see commit 6d928ab684327e0eeb1bf6cd889d57ca7127e8a7). So some source files might get a slightly different timestamp. Here, if lib/standard.ppmdfont gets a newer timestamp than the generated file lib/standardppmdfont.c, Make will try to rebuild the latter. But that fails because the ppmdcfont program doesn't exist (yet). Probably stdenv should ensure that every file has the same timestamp. --- pkgs/tools/graphics/netpbm/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/graphics/netpbm/default.nix b/pkgs/tools/graphics/netpbm/default.nix index dc45ad7a841..39e134ad906 100644 --- a/pkgs/tools/graphics/netpbm/default.nix +++ b/pkgs/tools/graphics/netpbm/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchsvn, pkgconfig, libjpeg, libpng, flex, zlib, perl, libxml2, makeWrapper, libX11, libtiff }: +{ stdenv, fetchsvn, pkgconfig, libjpeg, libpng, flex, zlib, perl, libxml2, makeWrapper, libX11, libtiff }: let rev = 1742; in stdenv.mkDerivation { @@ -29,8 +29,11 @@ stdenv.mkDerivation { --subst-var-by "rgbPath1" "$out/lib/rgb.txt" \ --subst-var-by "rgbPath2" "/var/empty/rgb.txt" \ --subst-var-by "rgbPath3" "/var/empty/rgb.txt" + touch lib/standardppmdfont.c ''; + enableParallelBuilding = true; + installPhase = '' make package pkgdir=$PWD/netpbmpkg # Pass answers to the script questions From 04a9e809d41225d40e7c311c8e67c6014a338fd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 22 Jul 2013 22:18:26 +0200 Subject: [PATCH 617/798] Updating go to 1.1.1 --- pkgs/tools/networking/network-manager-applet/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix index 7e86b576967..8670a5d1524 100644 --- a/pkgs/tools/networking/network-manager-applet/default.nix +++ b/pkgs/tools/networking/network-manager-applet/default.nix @@ -18,11 +18,13 @@ stdenv.mkDerivation rec { }; buildInputs = [ - gtk libglade networkmanager GConf libnotify libsecret dbus_glib - polkit isocodes makeWrapper udev libgnome_keyring + gtk libglade networkmanager libnotify libsecret dbus_glib + polkit isocodes makeWrapper udev ]; - nativeBuildInputs = [ intltool pkgconfig ]; + nativeBuildInputs = [ intltool pkgconfig]; + + propagatedBuildInputs = [ GConf libgnome_keyring ]; makeFlags = [ ''CFLAGS=-DMOBILE_BROADBAND_PROVIDER_INFO=\"${mobile_broadband_provider_info}/share/mobile-broadband-provider-info/serviceproviders.xml\"'' From a143c0bb107bf96458b0a55070f35a0d1ed60b57 Mon Sep 17 00:00:00 2001 From: Domen Kozar Date: Tue, 23 Jul 2013 11:19:07 +0200 Subject: [PATCH 618/798] networkmanagerapplet: add GConf libgnome_keyring to propagatedBuildInputs --- pkgs/tools/networking/network-manager-applet/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix index 8670a5d1524..c03e29ba381 100644 --- a/pkgs/tools/networking/network-manager-applet/default.nix +++ b/pkgs/tools/networking/network-manager-applet/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { polkit isocodes makeWrapper udev ]; - nativeBuildInputs = [ intltool pkgconfig]; + nativeBuildInputs = [ intltool pkgconfig ]; propagatedBuildInputs = [ GConf libgnome_keyring ]; From e491997a6b242945a0e2d8f8541c8d600aef3a4e Mon Sep 17 00:00:00 2001 From: Domen Kozar Date: Tue, 23 Jul 2013 11:21:38 +0200 Subject: [PATCH 619/798] python3: 3.3.1 -> 3.3.2 --- pkgs/development/interpreters/python/3.3/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/python/3.3/default.nix b/pkgs/development/interpreters/python/3.3/default.nix index 16973c6226e..84f4ec184aa 100644 --- a/pkgs/development/interpreters/python/3.3/default.nix +++ b/pkgs/development/interpreters/python/3.3/default.nix @@ -17,7 +17,7 @@ with stdenv.lib; let majorVersion = "3.3"; - version = "${majorVersion}.1"; + version = "${majorVersion}.2"; buildInputs = filter (p: p != null) [ zlib bzip2 gdbm sqlite db4 readline ncurses openssl tcl tk libX11 xproto @@ -28,8 +28,8 @@ stdenv.mkDerivation { inherit majorVersion version; src = fetchurl { - url = "http://www.python.org/ftp/python/3.3.1/Python-${version}.tar.bz2"; - sha256 = "0mm7nvdd85p6b26jwshy2dhicf0b06mb5lrl564i3c5q7jgs1vll"; + url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.bz2"; + sha256 = "16myvina7nakyyg7r5gnjyydk8bzar988vmxsw2k485w5gz04wpp"; }; preConfigure = '' From 2252bfe79fe196e33c0dd3f91ef4ed56c525dcce Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Tue, 23 Jul 2013 11:33:48 +0200 Subject: [PATCH 620/798] Added ironhorse nodejs package + updated other node packages --- pkgs/top-level/node-packages-generated.nix | 114 ++++++++++++--------- pkgs/top-level/node-packages.json | 1 + 2 files changed, 64 insertions(+), 51 deletions(-) diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix index b64ffd37792..564dff15ad7 100644 --- a/pkgs/top-level/node-packages-generated.nix +++ b/pkgs/top-level/node-packages-generated.nix @@ -1991,7 +1991,7 @@ } { name = "graceful-fs"; - spec = "~1.2"; + spec = "~1.2.0"; version = "1.2.3"; topLevel = false; dependencies = [ @@ -2002,14 +2002,14 @@ } { name = "graceful-fs"; - spec = "~1.2.0"; - version = "1.2.3"; + spec = "~2"; + version = "2.0.0"; topLevel = false; dependencies = [ ]; patchLatest = false; - sha1 = "15a4806a57547cb2d2dbf27f42e89a8c3451b364"; - tarball = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz"; + sha1 = "c9a206f6f5f4b94e1046dfaaccfe9e12d0ab8cef"; + tarball = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.0.tgz"; } { name = "graceful-fs"; @@ -2386,6 +2386,18 @@ sha1 = "7baf10535227e0878105a04e44b78f132475da6a"; tarball = "http://registry.npmjs.org/init-package-json/-/init-package-json-0.0.10.tgz"; } + { + name = "ironhorse"; + spec = "*"; + version = "0.0.2"; + topLevel = true; + dependencies = [ + { name = "winston"; spec = "*"; } + ]; + patchLatest = false; + sha1 = "9a8e27407ecfba7cd4d1d5886c7d97e65d44da9c"; + tarball = "http://registry.npmjs.org/ironhorse/-/ironhorse-0.0.2.tgz"; + } { name = "is-promise"; spec = "~1"; @@ -4384,47 +4396,47 @@ { name = "read-installed"; spec = "~0.2.2"; - version = "0.2.2"; + version = "0.2.3"; topLevel = false; dependencies = [ { name = "semver"; spec = "2"; } { name = "slide"; spec = "~1.1.3"; } { name = "read-package-json"; spec = "1"; } - { name = "graceful-fs"; spec = "~1.2.0"; } + { name = "graceful-fs"; spec = "~2"; } ]; patchLatest = false; - sha1 = "f570ac84fb29c75f16faa3940a8c1e602c8eecab"; - tarball = "http://registry.npmjs.org/read-installed/-/read-installed-0.2.2.tgz"; + sha1 = "234204b47f6a0eb82c662fc04f7b7c5f7e795239"; + tarball = "http://registry.npmjs.org/read-installed/-/read-installed-0.2.3.tgz"; } { name = "read-package-json"; spec = "1"; - version = "1.1.0"; + version = "1.1.1"; topLevel = false; dependencies = [ { name = "glob"; spec = "~3.2.1"; } { name = "lru-cache"; spec = "2"; } { name = "normalize-package-data"; spec = "~0.2"; } - { name = "graceful-fs"; spec = "~1.2"; } + { name = "graceful-fs"; spec = "2"; } ]; patchLatest = false; - sha1 = "6447ac4d10788c76d0682cf2086eaa809076aafc"; - tarball = "http://registry.npmjs.org/read-package-json/-/read-package-json-1.1.0.tgz"; + sha1 = "5d679b34ddf53ac3bc232aeb421f6b6857f925e5"; + tarball = "http://registry.npmjs.org/read-package-json/-/read-package-json-1.1.1.tgz"; } { name = "read-package-json"; spec = "~1.1.0"; - version = "1.1.0"; + version = "1.1.1"; topLevel = false; dependencies = [ { name = "glob"; spec = "~3.2.1"; } { name = "lru-cache"; spec = "2"; } { name = "normalize-package-data"; spec = "~0.2"; } - { name = "graceful-fs"; spec = "~1.2"; } + { name = "graceful-fs"; spec = "2"; } ]; patchLatest = false; - sha1 = "6447ac4d10788c76d0682cf2086eaa809076aafc"; - tarball = "http://registry.npmjs.org/read-package-json/-/read-package-json-1.1.0.tgz"; + sha1 = "5d679b34ddf53ac3bc232aeb421f6b6857f925e5"; + tarball = "http://registry.npmjs.org/read-package-json/-/read-package-json-1.1.1.tgz"; } { name = "readable-stream"; @@ -4521,7 +4533,7 @@ { name = "request"; spec = "2"; - version = "2.22.0"; + version = "2.23.0"; topLevel = false; dependencies = [ { name = "qs"; spec = "~0.6.0"; } @@ -4538,13 +4550,13 @@ { name = "form-data"; spec = "0.0.8"; } ]; patchLatest = false; - sha1 = "b883a769cc4a909571eb5004b344c43cf7e51592"; - tarball = "http://registry.npmjs.org/request/-/request-2.22.0.tgz"; + sha1 = "121742874bf40b3c149fe113b7a35847597fc885"; + tarball = "http://registry.npmjs.org/request/-/request-2.23.0.tgz"; } { name = "request"; spec = "2 >=2.14"; - version = "2.22.0"; + version = "2.23.0"; topLevel = false; dependencies = [ { name = "qs"; spec = "~0.6.0"; } @@ -4561,13 +4573,13 @@ { name = "form-data"; spec = "0.0.8"; } ]; patchLatest = false; - sha1 = "b883a769cc4a909571eb5004b344c43cf7e51592"; - tarball = "http://registry.npmjs.org/request/-/request-2.22.0.tgz"; + sha1 = "121742874bf40b3c149fe113b7a35847597fc885"; + tarball = "http://registry.npmjs.org/request/-/request-2.23.0.tgz"; } { name = "request"; spec = "2 >=2.20.0"; - version = "2.22.0"; + version = "2.23.0"; topLevel = false; dependencies = [ { name = "qs"; spec = "~0.6.0"; } @@ -4584,8 +4596,8 @@ { name = "form-data"; spec = "0.0.8"; } ]; patchLatest = false; - sha1 = "b883a769cc4a909571eb5004b344c43cf7e51592"; - tarball = "http://registry.npmjs.org/request/-/request-2.22.0.tgz"; + sha1 = "121742874bf40b3c149fe113b7a35847597fc885"; + tarball = "http://registry.npmjs.org/request/-/request-2.23.0.tgz"; } { name = "request"; @@ -4623,7 +4635,7 @@ { name = "request"; spec = "~2"; - version = "2.22.0"; + version = "2.23.0"; topLevel = false; dependencies = [ { name = "qs"; spec = "~0.6.0"; } @@ -4640,8 +4652,8 @@ { name = "form-data"; spec = "0.0.8"; } ]; patchLatest = false; - sha1 = "b883a769cc4a909571eb5004b344c43cf7e51592"; - tarball = "http://registry.npmjs.org/request/-/request-2.22.0.tgz"; + sha1 = "121742874bf40b3c149fe113b7a35847597fc885"; + tarball = "http://registry.npmjs.org/request/-/request-2.23.0.tgz"; } { name = "request"; @@ -4741,38 +4753,38 @@ { name = "rimraf"; spec = "2"; - version = "2.2.1"; + version = "2.2.2"; topLevel = false; dependencies = [ - { name = "graceful-fs"; spec = "~1"; } + { name = "graceful-fs"; spec = "~2"; } ]; patchLatest = false; - sha1 = "8f49c57874ce166b667fbfecac2cdf7f26d3d8a5"; - tarball = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.1.tgz"; + sha1 = "d99ec41dc646e55bf7a7a44a255c28bef33a8abf"; + tarball = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.2.tgz"; } { name = "rimraf"; spec = "2.x.x"; - version = "2.2.1"; + version = "2.2.2"; topLevel = false; dependencies = [ - { name = "graceful-fs"; spec = "~1"; } + { name = "graceful-fs"; spec = "~2"; } ]; patchLatest = false; - sha1 = "8f49c57874ce166b667fbfecac2cdf7f26d3d8a5"; - tarball = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.1.tgz"; + sha1 = "d99ec41dc646e55bf7a7a44a255c28bef33a8abf"; + tarball = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.2.tgz"; } { name = "rimraf"; spec = "~2"; - version = "2.2.1"; + version = "2.2.2"; topLevel = false; dependencies = [ - { name = "graceful-fs"; spec = "~1"; } + { name = "graceful-fs"; spec = "~2"; } ]; patchLatest = false; - sha1 = "8f49c57874ce166b667fbfecac2cdf7f26d3d8a5"; - tarball = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.1.tgz"; + sha1 = "d99ec41dc646e55bf7a7a44a255c28bef33a8abf"; + tarball = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.2.tgz"; } { name = "rimraf"; @@ -4789,14 +4801,14 @@ { name = "rimraf"; spec = "~2.2.0"; - version = "2.2.1"; + version = "2.2.2"; topLevel = false; dependencies = [ - { name = "graceful-fs"; spec = "~1"; } + { name = "graceful-fs"; spec = "~2"; } ]; patchLatest = false; - sha1 = "8f49c57874ce166b667fbfecac2cdf7f26d3d8a5"; - tarball = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.1.tgz"; + sha1 = "d99ec41dc646e55bf7a7a44a255c28bef33a8abf"; + tarball = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.2.tgz"; } { name = "runforcover"; @@ -5218,26 +5230,26 @@ { name = "source-map"; spec = "*"; - version = "0.1.26"; + version = "0.1.27"; topLevel = true; dependencies = [ { name = "amdefine"; spec = ">=0.0.4"; } ]; patchLatest = false; - sha1 = "4cce2dcb5fa02cfe1b4cf32cc83962b1b3997560"; - tarball = "http://registry.npmjs.org/source-map/-/source-map-0.1.26.tgz"; + sha1 = "f114e06a8b5c05cbc51aa1fa600e728162455eda"; + tarball = "http://registry.npmjs.org/source-map/-/source-map-0.1.27.tgz"; } { name = "source-map"; spec = "~0.1.7"; - version = "0.1.26"; + version = "0.1.27"; topLevel = false; dependencies = [ { name = "amdefine"; spec = ">=0.0.4"; } ]; patchLatest = false; - sha1 = "4cce2dcb5fa02cfe1b4cf32cc83962b1b3997560"; - tarball = "http://registry.npmjs.org/source-map/-/source-map-0.1.26.tgz"; + sha1 = "f114e06a8b5c05cbc51aa1fa600e728162455eda"; + tarball = "http://registry.npmjs.org/source-map/-/source-map-0.1.27.tgz"; } { name = "spdy"; diff --git a/pkgs/top-level/node-packages.json b/pkgs/top-level/node-packages.json index 2bb095cf913..3379321bb5f 100644 --- a/pkgs/top-level/node-packages.json +++ b/pkgs/top-level/node-packages.json @@ -64,6 +64,7 @@ , "gridfs-stream" , "tar" , "flatiron" +, "ironhorse" , { "node-uptime": "https://github.com/fzaninotto/uptime/tarball/1c65756575f90f563a752e2a22892ba2981c79b7" } , { "guifi-earth": "https://github.com/jmendeth/guifi-earth/tarball/f3ee96835fd4fb0e3e12fadbd2cb782770d64854 " } ] From bea0ac29d4325d6f534e167663c54bb21d695420 Mon Sep 17 00:00:00 2001 From: Domen Kozar Date: Tue, 23 Jul 2013 11:53:12 +0200 Subject: [PATCH 621/798] networkmanagerapplet: propagatedBuildInputs -> propagatedUserEnvPkgs --- pkgs/tools/networking/network-manager-applet/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix index c03e29ba381..cbae1a29de5 100644 --- a/pkgs/tools/networking/network-manager-applet/default.nix +++ b/pkgs/tools/networking/network-manager-applet/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, intltool, pkgconfig, gtk, libglade, networkmanager, GConf -, libnotify, libsecret, dbus_glib, polkit, isocodes, libgnome_keyring +, libnotify, libsecret, dbus_glib, polkit, isocodes, libgnome_keyring, gnome_keyring icon , mobile_broadband_provider_info, glib_networking, gsettings_desktop_schemas -, makeWrapper, networkmanager_openvpn, udev }: +, makeWrapper, networkmanager_openvpn, udev, hicolor_icon_theme }: let pn = "network-manager-applet"; @@ -19,12 +19,12 @@ stdenv.mkDerivation rec { buildInputs = [ gtk libglade networkmanager libnotify libsecret dbus_glib - polkit isocodes makeWrapper udev + polkit isocodes makeWrapper udev GConf ]; nativeBuildInputs = [ intltool pkgconfig ]; - propagatedBuildInputs = [ GConf libgnome_keyring ]; + propagatedUserEnvPkgs = [ GConf gnome_keyring hicolor_icon_theme ]; makeFlags = [ ''CFLAGS=-DMOBILE_BROADBAND_PROVIDER_INFO=\"${mobile_broadband_provider_info}/share/mobile-broadband-provider-info/serviceproviders.xml\"'' From e41fc2a67750d78c0aa7f6cb4482e5a1363daaab Mon Sep 17 00:00:00 2001 From: Domen Kozar Date: Tue, 23 Jul 2013 11:36:33 +0200 Subject: [PATCH 622/798] add python32 --- .../interpreters/python/3.2/default.nix | 82 +++++++++++++++++++ .../interpreters/python/3.2/setup-hook.sh | 15 ++++ pkgs/top-level/all-packages.nix | 1 + 3 files changed, 98 insertions(+) create mode 100644 pkgs/development/interpreters/python/3.2/default.nix create mode 100644 pkgs/development/interpreters/python/3.2/setup-hook.sh diff --git a/pkgs/development/interpreters/python/3.2/default.nix b/pkgs/development/interpreters/python/3.2/default.nix new file mode 100644 index 00000000000..b3f5a17b064 --- /dev/null +++ b/pkgs/development/interpreters/python/3.2/default.nix @@ -0,0 +1,82 @@ +{ stdenv, fetchurl +, bzip2 +, db4 +, gdbm +, libX11, xproto +, ncurses +, openssl +, readline +, sqlite +, tcl, tk +, zlib +}: + +assert readline != null -> ncurses != null; + +with stdenv.lib; + +let + majorVersion = "3.2"; + version = "${majorVersion}.5"; + + buildInputs = filter (p: p != null) [ + zlib bzip2 gdbm sqlite db4 readline ncurses openssl tcl tk libX11 xproto + ]; +in +stdenv.mkDerivation { + name = "python3-${version}"; + inherit majorVersion version; + + src = fetchurl { + url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.bz2"; + sha256 = "0pxs234g08v3lar09lvzxw4vqdpwkbqmvkv894j2w7aklskcjd6v"; + }; + + preConfigure = '' + for i in /usr /sw /opt /pkg; do # improve purity + substituteInPlace ./setup.py --replace $i /no-such-path + done + ${optionalString stdenv.isDarwin ''export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -msse2"''} + + configureFlagsArray=( --enable-shared --with-threads + CPPFLAGS="${concatStringsSep " " (map (p: "-I${p}/include") buildInputs)}" + LDFLAGS="${concatStringsSep " " (map (p: "-L${p}/lib") buildInputs)}" + LIBS="-lcrypt ${optionalString (ncurses != null) "-lncurses"}" + ) + ''; + + setupHook = ./setup-hook.sh; + + postInstall = '' + rm -rf "$out/lib/python${majorVersion}/test" + ''; + + passthru = { + zlibSupport = zlib != null; + sqliteSupport = sqlite != null; + db4Support = db4 != null; + readlineSupport = readline != null; + opensslSupport = openssl != null; + tkSupport = (tk != null) && (tcl != null) && (libX11 != null) && (xproto != null); + libPrefix = "python${majorVersion}m"; + }; + + enableParallelBuilding = true; + + meta = { + homepage = "http://python.org"; + description = "a high-level dynamically-typed programming language"; + longDescription = '' + Python is a remarkably powerful dynamic programming language that + is used in a wide variety of application domains. Some of its key + distinguishing features include: clear, readable syntax; strong + introspection capabilities; intuitive object orientation; natural + expression of procedural code; full modularity, supporting + hierarchical packages; exception-based error handling; and very + high level dynamic data types. + ''; + license = stdenv.lib.licenses.psfl; + platforms = stdenv.lib.platforms.all; + maintainers = with stdenv.lib.maintainers; [ simons chaoflow ]; + }; +} diff --git a/pkgs/development/interpreters/python/3.2/setup-hook.sh b/pkgs/development/interpreters/python/3.2/setup-hook.sh new file mode 100644 index 00000000000..e6fa34bf54b --- /dev/null +++ b/pkgs/development/interpreters/python/3.2/setup-hook.sh @@ -0,0 +1,15 @@ +addPythonPath() { + addToSearchPathWithCustomDelimiter : PYTHONPATH $1/lib/python3.2/site-packages +} + +toPythonPath() { + local paths="$1" + local result= + for i in $paths; do + p="$i/lib/python3.2/site-packages" + result="${result}${result:+:}$p" + done + echo $result +} + +envHooks=(${envHooks[@]} addPythonPath) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fab5abd9c49..aa8586d185c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3091,6 +3091,7 @@ let python3 = hiPrio (callPackage ../development/interpreters/python/3.3 { }); python33 = callPackage ../development/interpreters/python/3.3 { }; + python32 = callPackage ../development/interpreters/python/3.2 { }; python = python27; python26 = callPackage ../development/interpreters/python/2.6 { }; From 11eef4f79f15c1019c1254032cbde8855c5830e3 Mon Sep 17 00:00:00 2001 From: Domen Kozar Date: Tue, 23 Jul 2013 13:18:54 +0200 Subject: [PATCH 623/798] networkmanagerapplet: fix build --- pkgs/tools/networking/network-manager-applet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix index cbae1a29de5..ca951579548 100644 --- a/pkgs/tools/networking/network-manager-applet/default.nix +++ b/pkgs/tools/networking/network-manager-applet/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, intltool, pkgconfig, gtk, libglade, networkmanager, GConf -, libnotify, libsecret, dbus_glib, polkit, isocodes, libgnome_keyring, gnome_keyring icon +, libnotify, libsecret, dbus_glib, polkit, isocodes, libgnome_keyring, gnome_keyring , mobile_broadband_provider_info, glib_networking, gsettings_desktop_schemas , makeWrapper, networkmanager_openvpn, udev, hicolor_icon_theme }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk libglade networkmanager libnotify libsecret dbus_glib - polkit isocodes makeWrapper udev GConf + polkit isocodes makeWrapper udev GConf gnome_keyring ]; nativeBuildInputs = [ intltool pkgconfig ]; From b95e01dd88c42fc370d577eeb8ea881c410e34b1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 23 Jul 2013 10:51:47 +0200 Subject: [PATCH 624/798] haskell-monad-par: update to version 0.3.4.3 --- .../libraries/haskell/monad-par/{0.3.4.2.nix => 0.3.4.3.nix} | 4 ++-- pkgs/top-level/haskell-packages.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) rename pkgs/development/libraries/haskell/monad-par/{0.3.4.2.nix => 0.3.4.3.nix} (90%) diff --git a/pkgs/development/libraries/haskell/monad-par/0.3.4.2.nix b/pkgs/development/libraries/haskell/monad-par/0.3.4.3.nix similarity index 90% rename from pkgs/development/libraries/haskell/monad-par/0.3.4.2.nix rename to pkgs/development/libraries/haskell/monad-par/0.3.4.3.nix index ab875b34c36..22b9d359faf 100644 --- a/pkgs/development/libraries/haskell/monad-par/0.3.4.2.nix +++ b/pkgs/development/libraries/haskell/monad-par/0.3.4.3.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "monad-par"; - version = "0.3.4.2"; - sha256 = "1k10m4w2g92psahsvcyi98sc31wg5anijp46lbsipi2r2gxxc7bs"; + version = "0.3.4.3"; + sha256 = "1yf1s44r2mkqimi26g9y4zxqgs4yizfmigfx9mkfgbqsn2a8sff6"; buildDepends = [ abstractDeque abstractPar deepseq monadParExtras mtl mwcRandom parallel diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 879e2d61fdb..adc86c6d00c 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1407,8 +1407,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); monadLogger = callPackage ../development/libraries/haskell/monad-logger {}; monadPar_0_1_0_3 = callPackage ../development/libraries/haskell/monad-par/0.1.0.3.nix {}; - monadPar_0_3_4_2 = callPackage ../development/libraries/haskell/monad-par/0.3.4.2.nix {}; - monadPar = self.monadPar_0_3_4_2; + monadPar_0_3_4_3 = callPackage ../development/libraries/haskell/monad-par/0.3.4.3.nix {}; + monadPar = self.monadPar_0_3_4_3; monadParExtras = callPackage ../development/libraries/haskell/monad-par-extras {}; From 08c2f03b2920ba2ee30e3fc755c91d10ed7e323e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 23 Jul 2013 10:51:57 +0200 Subject: [PATCH 625/798] haskell-fast-logger: update to version 0.3.2 --- pkgs/development/libraries/haskell/fast-logger/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/fast-logger/default.nix b/pkgs/development/libraries/haskell/fast-logger/default.nix index c9544b2c1f6..b192c1e0c61 100644 --- a/pkgs/development/libraries/haskell/fast-logger/default.nix +++ b/pkgs/development/libraries/haskell/fast-logger/default.nix @@ -3,8 +3,8 @@ cabal.mkDerivation (self: { pname = "fast-logger"; - version = "0.3.1"; - sha256 = "0sjn3vad0fbchv1fhap71wfnihlwnfhk6p9h9hpnbr0i4b32f1ks"; + version = "0.3.2"; + sha256 = "0bx8yjg7bf18i7j7fnhidnms5a3v6hiwqqvr249fk03c86v20rla"; buildDepends = [ blazeBuilder dateCache filepath text unixTime ]; testDepends = [ hspec ]; meta = { From fad190185bfbb4d8bb2af3fcc1c77e6c7210f027 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 23 Jul 2013 10:51:57 +0200 Subject: [PATCH 626/798] haskell-fclabels: update to version 1.1.7 --- pkgs/development/libraries/haskell/fclabels/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/fclabels/default.nix b/pkgs/development/libraries/haskell/fclabels/default.nix index 0064a7f425a..e3c794d6d5e 100644 --- a/pkgs/development/libraries/haskell/fclabels/default.nix +++ b/pkgs/development/libraries/haskell/fclabels/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "fclabels"; - version = "1.1.6"; - sha256 = "0f5zqbqsm89lp1f7wrmcs8pn7hzbbl8id7xa6ny114bgxrfbrwpk"; + version = "1.1.7"; + sha256 = "0mk75fk3c4ilb2hmz972ymv1pkzxp6010mlma7hw1l13dfy0hy9v"; buildDepends = [ mtl transformers ]; meta = { homepage = "https://github.com/sebastiaanvisser/fclabels"; From 3f2d39e42166a4f5bb16f62063e2dd1b9ed8a5ea Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 23 Jul 2013 10:51:57 +0200 Subject: [PATCH 627/798] haskell-highlighting-kate: update to version 0.5.5 --- .../libraries/haskell/highlighting-kate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/highlighting-kate/default.nix b/pkgs/development/libraries/haskell/highlighting-kate/default.nix index f09e3efaeb4..e0cab385286 100644 --- a/pkgs/development/libraries/haskell/highlighting-kate/default.nix +++ b/pkgs/development/libraries/haskell/highlighting-kate/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "highlighting-kate"; - version = "0.5.4"; - sha256 = "0khwhhcjvhsh92b420bylx4c1ahpvk6c50s8y6bacfwfq71ydwmb"; + version = "0.5.5"; + sha256 = "0ypxlsfh9xdpnxp6j7wy7q7ymhmxfgwrqi4c08zwf8xy5sfvahs9"; isLibrary = true; isExecutable = true; buildDepends = [ blazeHtml filepath mtl parsec regexPcre ]; From ba95a91106cad8d44141da558648b32ed5bf2701 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 23 Jul 2013 10:51:57 +0200 Subject: [PATCH 628/798] haskell-postgresql-simple: update to version 0.3.4.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 888f992b159..1ae1737e4b2 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.3.2"; - sha256 = "1gh2ih1n6g17jry12g7nv344sfzrhfc1assslx0cjlsryhbz25lp"; + version = "0.3.4.0"; + sha256 = "1xqs5hpljsapgisr7q3yd8ir351196xrdrk51dsizvk4vcs85wgs"; buildDepends = [ attoparsec blazeBuilder blazeTextual postgresqlLibpq text time transformers vector From cf4c6a6949f6a65dd9f204181963e3380c8d256d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 23 Jul 2013 10:51:57 +0200 Subject: [PATCH 629/798] haskell-simple-sendfile: update to version 0.2.12 --- .../development/libraries/haskell/simple-sendfile/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/simple-sendfile/default.nix b/pkgs/development/libraries/haskell/simple-sendfile/default.nix index 9e8f638c65c..b8c527daf1a 100644 --- a/pkgs/development/libraries/haskell/simple-sendfile/default.nix +++ b/pkgs/development/libraries/haskell/simple-sendfile/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "simple-sendfile"; - version = "0.2.11"; - sha256 = "1q9m9lxv9jfkn6a1lf07jcl4li3n5996df1qrfkfjq2n0bvn4qfj"; + version = "0.2.12"; + sha256 = "019n82700fbhsqxgn1cwfqii27r436gljis7yl02zjnzy7xlvrha"; buildDepends = [ network ]; testDepends = [ conduit hspec HUnit network networkConduit ]; doCheck = false; From 57844acb420f441f37279a055f3f7664a19b398f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 23 Jul 2013 10:51:57 +0200 Subject: [PATCH 630/798] haskell-unix-time: update to version 0.1.10 --- pkgs/development/libraries/haskell/unix-time/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/unix-time/default.nix b/pkgs/development/libraries/haskell/unix-time/default.nix index c3e5ca14b23..691787e7f87 100644 --- a/pkgs/development/libraries/haskell/unix-time/default.nix +++ b/pkgs/development/libraries/haskell/unix-time/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "unix-time"; - version = "0.1.9"; - sha256 = "0z4761g7rkw771r9828h1l37pp3brrra9ihjg203h66jc1wlvb72"; + version = "0.1.10"; + sha256 = "0z8i02j295fi0y512bwhxfk2dr2s4i0xlgi80pnq680zdrahgwlf"; testDepends = [ doctest hspec QuickCheck time ]; meta = { description = "Unix time parser/formatter and utilities"; From 05ec96b00e2210207b9aae18d4db48e2fa558f80 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 23 Jul 2013 11:23:09 +0200 Subject: [PATCH 631/798] python-packages: cosmetic to fix syntax highlighting and trailing whitespace --- pkgs/top-level/python-packages.nix | 66 +++++++++++++++--------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9ae389d8e69..987e85ea8a6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -23,7 +23,7 @@ pythonPackages = python.modules // rec { wrapPython = pkgs.makeSetupHook { deps = pkgs.makeWrapper; substitutions.libPrefix = python.libPrefix; - } + } ../development/python-modules/generic/wrap.sh; # specials @@ -165,7 +165,7 @@ pythonPackages = python.modules // rec { pythonPackages.webtest ]; - propagatedBuildInputs = [ + propagatedBuildInputs = [ pkgs.makeWrapper pkgs.bacula pythonPackages.colander @@ -508,7 +508,7 @@ pythonPackages = python.modules // rec { propagatedBuildInputs = [ python.modules.curses pygments ]; doCheck = false; - + meta = { description = "UNKNOWN"; homepage = "UNKNOWN"; @@ -1124,7 +1124,7 @@ pythonPackages = python.modules // rec { buildInputs = [ paver ]; postInstall = '' - for prog in $out/bin/*; do + for prog in "$out/bin/"*; do wrapProgram "$prog" --prefix PYTHONPATH : "$PYTHONPATH" done ''; @@ -1154,7 +1154,7 @@ pythonPackages = python.modules // rec { }; propagatedBuildInputs = [ paramiko pycrypto ]; buildInputs = [ fudge nose ]; - }; + }; fudge = buildPythonPackage rec { name = "fudge-0.9.4"; @@ -1247,12 +1247,12 @@ pythonPackages = python.modules // rec { md5 = "967a04fcb2143b31b279c3013a778a2b"; }; - buildInputs = [ - docutils - virtualenv - webtest - zope_component - zope_interface + buildInputs = [ + docutils + virtualenv + webtest + zope_component + zope_interface ] ++ optional isPy26 unittest2; propagatedBuildInputs = [ @@ -1559,7 +1559,7 @@ pythonPackages = python.modules // rec { propagatedBuildInputs = with pkgs; [ pyGtkGlade libtorrentRasterbar twisted Mako chardet pyxdg pyopenssl ]; - + postInstall = '' cp -R deluge/data/share $out/share cp -R deluge/data/pixmaps $out/share/ @@ -2681,7 +2681,7 @@ pythonPackages = python.modules // rec { url = "${meta.homepage}/download/${name}.tar.gz"; sha256 = "1ddqni6d4kc8ypl6yig4nc00izvbk359sz6hykb9g0lfcpfqlngj"; }; - + buildInputs = [ pkgs.pyopenssl pyasn1 urwid pil lxml flask protobuf netlib ]; @@ -2689,7 +2689,7 @@ pythonPackages = python.modules // rec { doCheck = false; postInstall = '' - for prog in $out/bin/*; do + for prog in "$out/bin/"*; do wrapProgram "$prog" \ --prefix PYTHONPATH : "$PYTHONPATH" done @@ -2917,7 +2917,7 @@ pythonPackages = python.modules // rec { name = "${name}.tar.gz"; sha256 = "1y8lx2j1jrr93mqfb06zg1x5jm9lllw744sb61ib8dagw43nnq3v"; }; - + buildInputs = [ pkgs.pyopenssl pyasn1 ]; @@ -3529,7 +3529,7 @@ pythonPackages = python.modules // rec { homepage = https://github.com/Lokaltog/powerline; description = "The ultimate statusline/prompt utility."; license = with stdenv.lib.licenses; mit; - platforms = with stdenv.lib.platforms; all; + platforms = with stdenv.lib.platforms; all; }; }; @@ -4739,7 +4739,7 @@ pythonPackages = python.modules // rec { }; preInstall = '' - cp ${x_ignore_nofocus}/* . + cp "${x_ignore_nofocus}/"* . sed -i 's|dlopen(library,|dlopen("libX11.so.6",|' x_ignore_nofocus.c gcc -c -fPIC x_ignore_nofocus.c -o x_ignore_nofocus.o gcc -shared -Wl,-soname,x_ignore_nofocus.so -o x_ignore_nofocus.so x_ignore_nofocus.o @@ -6431,17 +6431,17 @@ pythonPackages = python.modules // rec { pyspotify = buildPythonPackage rec { name = "pyspotify-${version}"; - + version = "1.11"; - + src = fetchurl { url = "https://github.com/mopidy/pyspotify/archive/v1.11.tar.gz"; sha256 = "089ml6pqr3f2d15n70jpzbaqjp5pjgqlyv4algkxw92xscjw2izg"; }; - + buildInputs = [ pkgs.libspotify ] ++ stdenv.lib.optional stdenv.isDarwin pkgs.install_name_tool; - + # python zip complains about old timestamps preConfigure = '' find -print0 | xargs -0 touch @@ -6454,10 +6454,10 @@ pythonPackages = python.modules // rec { ${pkgs.libspotify}/lib/libspotify.dylib \ {} \; ''; - + # There are no tests doCheck = false; - + meta = with stdenv.lib; { homepage = http://pyspotify.mopidy.com; description = "A Python interface to Spotify’s online music streaming service"; @@ -6469,23 +6469,23 @@ pythonPackages = python.modules // rec { pykka = buildPythonPackage rec { name = "pykka-${version}"; - + version = "1.1.0"; - + src = fetchgit { url = "https://github.com/jodal/pykka.git"; rev = "refs/tags/v${version}"; sha256 = "0w6bcaqkzwmd9habszlgjkp3kkhkna08s9aivnmna5hddsghfqmz"; }; - + # python zip complains about old timestamps preConfigure = '' find -print0 | xargs -0 touch ''; - + # There are no tests doCheck = false; - + meta = { homepage = http://www.pykka.org; description = "A Python implementation of the actor model"; @@ -6495,23 +6495,23 @@ pythonPackages = python.modules // rec { ws4py = buildPythonPackage rec { name = "ws4py-${version}"; - + version = "git-20130303"; - + src = fetchgit { url = "https://github.com/Lawouach/WebSocket-for-Python.git"; rev = "ace276500ca7e4c357595e3773be151d37bcd6e2"; sha256 = "04m4m3ncn7g4rb81xg5n28imns7rsq8d2w98gjpaib6vlmyly3g1"; }; - + # python zip complains about old timestamps preConfigure = '' find -print0 | xargs -0 touch ''; - + # Tests depend on other packages doCheck = false; - + meta = { homepage = https://ws4py.readthedocs.org; description = "A WebSocket package for Python"; From ea3906c0f30ed184ba1de2bd2990e174ab187b19 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 23 Jul 2013 11:50:32 +0200 Subject: [PATCH 632/798] pylint: install emacs lisp files --- pkgs/top-level/python-packages.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 987e85ea8a6..6905e4033b6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4171,6 +4171,11 @@ pythonPackages = python.modules // rec { propagatedBuildInputs = [ logilab_astng ]; + postInstall = '' + mkdir -p $out/share/emacs/site-lisp + cp "elisp/"*.el $out/share/emacs/site-lisp/ + ''; + meta = { homepage = http://www.logilab.org/project/pylint; description = "A bug and style checker for Python"; From dc1d57e3d33d30154da774c212071b651e2583a7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 23 Jul 2013 11:50:47 +0200 Subject: [PATCH 633/798] ipython: update to version 0.13.2 --- pkgs/shells/ipython/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/ipython/default.nix b/pkgs/shells/ipython/default.nix index 84ca7f04e7e..f8fda4f051b 100644 --- a/pkgs/shells/ipython/default.nix +++ b/pkgs/shells/ipython/default.nix @@ -13,12 +13,12 @@ assert qtconsoleSupport == true -> pyqt4 != null; assert pylabQtSupport == true -> pyqt4 != null && sip != null; buildPythonPackage rec { - name = "ipython-0.13.1"; + name = "ipython-0.13.2"; namePrefix = ""; src = fetchurl { url = "http://pypi.python.org/packages/source/i/ipython/${name}.tar.gz"; - sha256 = "1h7q2zlyfn7si2vf6gnq2d0krkm1f5jy5nbi105by7zxqjai1grv"; + sha256 = "1sh0n47i1zxqmbzjv6iqc66c8pdk9spzgzchgmhqscgjvyhyxyqp"; }; propagatedBuildInputs = [ From 025995edafc2001d4c7cabbc2cd09d83b606b65e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 23 Jul 2013 11:56:01 +0200 Subject: [PATCH 634/798] haskell-fclabels: disable the Haddock documentation to fix the build https://github.com/sebastiaanvisser/fclabels/issues/20 --- pkgs/development/libraries/haskell/fclabels/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/fclabels/default.nix b/pkgs/development/libraries/haskell/fclabels/default.nix index e3c794d6d5e..ec63c287fe9 100644 --- a/pkgs/development/libraries/haskell/fclabels/default.nix +++ b/pkgs/development/libraries/haskell/fclabels/default.nix @@ -5,6 +5,7 @@ cabal.mkDerivation (self: { version = "1.1.7"; sha256 = "0mk75fk3c4ilb2hmz972ymv1pkzxp6010mlma7hw1l13dfy0hy9v"; buildDepends = [ mtl transformers ]; + noHaddock = true; meta = { homepage = "https://github.com/sebastiaanvisser/fclabels"; description = "First class accessor labels"; From 91c98e03c6a0290867fcc2aabe1d2d2940340eb6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 23 Jul 2013 15:45:34 +0200 Subject: [PATCH 635/798] haskell-fclabels: update to version 1.1.7.1 --- pkgs/development/libraries/haskell/fclabels/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/fclabels/default.nix b/pkgs/development/libraries/haskell/fclabels/default.nix index ec63c287fe9..71a3fe8d0c2 100644 --- a/pkgs/development/libraries/haskell/fclabels/default.nix +++ b/pkgs/development/libraries/haskell/fclabels/default.nix @@ -2,10 +2,9 @@ cabal.mkDerivation (self: { pname = "fclabels"; - version = "1.1.7"; - sha256 = "0mk75fk3c4ilb2hmz972ymv1pkzxp6010mlma7hw1l13dfy0hy9v"; + version = "1.1.7.1"; + sha256 = "1f34r3bzn1cbba8d5d1j3wxrlrrj5vf09hpgd6ppina91wyj4dyn"; buildDepends = [ mtl transformers ]; - noHaddock = true; meta = { homepage = "https://github.com/sebastiaanvisser/fclabels"; description = "First class accessor labels"; From 775fbbe46bec9ffba52dd89736cb99c91ccc45d3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 23 Jul 2013 15:45:34 +0200 Subject: [PATCH 636/798] haskell-yesod-platform: update to version 1.2.3 --- pkgs/development/libraries/haskell/yesod-platform/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-platform/default.nix b/pkgs/development/libraries/haskell/yesod-platform/default.nix index 20d45781631..3d900d94cda 100644 --- a/pkgs/development/libraries/haskell/yesod-platform/default.nix +++ b/pkgs/development/libraries/haskell/yesod-platform/default.nix @@ -29,8 +29,8 @@ cabal.mkDerivation (self: { pname = "yesod-platform"; - version = "1.2.2"; - sha256 = "18kgw094y3vzlpdn1rfrsrrqymhsw5y7kyrql3ghwgp0cm3fiks0"; + version = "1.2.3"; + sha256 = "16hp64gqgvpmlrwg6h8ldakw2n3x985cnv4pzmv9akjq27jq8rjl"; buildDepends = [ aeson ansiTerminal asn1Data asn1Types attoparsec attoparsecConduit authenticate base64Bytestring baseUnicodeSymbols blazeBuilder From 6c63a857861ef792ea77be6cf99c58df6dfb8289 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 23 Jul 2013 15:45:34 +0200 Subject: [PATCH 637/798] haskell-hlint: update to version 1.8.49 --- 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 c0510b40b85..fbef1f83226 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.48"; - sha256 = "1fysjs0vq3kafk12mb16xgq1svl5gcd3hxn86g5ncg6zb810fclf"; + version = "1.8.49"; + sha256 = "03i5nw2v2s4c5860vpqnvil2wrxblavjkbnrgi59jkmcbhl2h70f"; isLibrary = true; isExecutable = true; buildDepends = [ From aa88e7269dfaaa6baa034649d30e7daac5c96f40 Mon Sep 17 00:00:00 2001 From: Jonas Hoersch Date: Thu, 18 Apr 2013 01:44:12 +0200 Subject: [PATCH 638/798] Add quodlibet-2.5: GTK+Python based music player (close #481) --- pkgs/applications/audio/quodlibet/default.nix | 67 +++++++++++++++++++ .../quodlibet/quodlibet-package-plugins.patch | 18 +++++ pkgs/top-level/all-packages.nix | 4 ++ 3 files changed, 89 insertions(+) create mode 100644 pkgs/applications/audio/quodlibet/default.nix create mode 100644 pkgs/applications/audio/quodlibet/quodlibet-package-plugins.patch diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix new file mode 100644 index 00000000000..d9554d5f724 --- /dev/null +++ b/pkgs/applications/audio/quodlibet/default.nix @@ -0,0 +1,67 @@ +{ stdenv, fetchurl, python, buildPythonPackage, mutagen, pygtk, pygobject +, pythonDBus, gst_python, gst_plugins_base, gst_plugins_good, gst_plugins_ugly }: + +let version = "2.5"; in + +buildPythonPackage { + # call the package quodlibet and just quodlibet + name = "quodlibet-${version}"; + namePrefix = ""; + + # XXX, tests fail + doCheck = false; + + src = [ + (fetchurl { + url = "https://quodlibet.googlecode.com/files/quodlibet-${version}.tar.gz"; + sha256 = "0qrmlz7m1jpmriy8bgycjiwzbf3annznkn4x5k32yy9bylxa7lwb"; + }) + (fetchurl { + url = "https://quodlibet.googlecode.com/files/quodlibet-plugins-${version}.tar.gz"; + sha256 = "0kf2mkq2zk38626bn48gscvy6ir04f5b2z57ahlxlqy8imv2cjff"; + }) + ]; + + sourceRoot = "quodlibet-${version}"; + postUnpack = '' + # the patch searches for plugins in directory ../plugins + # so link the appropriate directory there + ln -sf quodlibet-plugins-${version} plugins + ''; + patches = [ ./quodlibet-package-plugins.patch ]; + + buildInputs = [ + gst_plugins_base gst_plugins_good gst_plugins_ugly + ]; + + propagatedBuildInputs = [ + mutagen pygtk pygobject pythonDBus gst_python + ]; + + postInstall = '' + # Wrap quodlibet so it finds the GStreamer plug-ins + wrapProgram "$out/bin/quodlibet" --prefix \ + GST_PLUGIN_PATH ":" \ + "${gst_plugins_base}/lib/gstreamer-0.10:${gst_plugins_good}/lib/gstreamer-0.10:${gst_plugins_ugly}/lib/gstreamer-0.10" + ''; + + meta = { + description = "Quod Libet is a GTK+-based audio player written in Python, using the Mutagen tagging library."; + + longDescription = '' + Quod Libet is a GTK+-based audio player written in Python, using + the Mutagen tagging library. It's designed around the idea that + you know how to organize your music better than we do. It lets + you make playlists based on regular expressions (don't worry, + regular searches work too). It lets you display and edit any + tags you want in the file. And it lets you do this for all the + file formats it supports. Quod Libet easily scales to libraries + of thousands (or even tens of thousands) of songs. It also + supports most of the features you expect from a modern media + player, like Unicode support, tag editing, Replay Gain, podcasts + & internet radio, and all major audio formats. + ''; + + homepage = http://code.google.com/p/quodlibet/; + }; +} diff --git a/pkgs/applications/audio/quodlibet/quodlibet-package-plugins.patch b/pkgs/applications/audio/quodlibet/quodlibet-package-plugins.patch new file mode 100644 index 00000000000..d518f857cf1 --- /dev/null +++ b/pkgs/applications/audio/quodlibet/quodlibet-package-plugins.patch @@ -0,0 +1,18 @@ +diff -Naur quodlibet-2.5.orig/setup.py quodlibet-2.5.new/setup.py +--- quodlibet-2.5.orig/setup.py 2012-12-19 08:47:41.000000000 +0000 ++++ quodlibet-2.5.new/setup.py 2013-04-22 19:27:07.152631051 +0000 +@@ -337,5 +338,14 @@ + } + } + }) ++ else: ++ from os.path import join ++ ++ data_files = [] ++ for type in ["playorder", "songsmenu", "editing", "events", "gstreamer"]: ++ data_files.append((join('quodlibet', 'plugins', type), ++ glob.glob(join('..', 'plugins', type, '*.py')))) ++ setup_kwargs.update({ 'data_files': data_files }); ++ + setup(**setup_kwargs) + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index aa8586d185c..b68c7ee17eb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8266,6 +8266,10 @@ let qtractor = callPackage ../applications/audio/qtractor { }; + quodlibet = callPackage ../applications/audio/quodlibet { + inherit (pythonPackages) mutagen; + }; + rakarrack = callPackage ../applications/audio/rakarrack { inherit (xorg) libXpm libXft; fltk = fltk13; From 949c4fe7585ebef7e862bf42af84882a6124e139 Mon Sep 17 00:00:00 2001 From: Domen Kozar Date: Tue, 23 Jul 2013 18:22:58 +0200 Subject: [PATCH 639/798] networkmanagerapplet: fix the build --- pkgs/tools/networking/network-manager-applet/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix index ca951579548..387ccfcaed4 100644 --- a/pkgs/tools/networking/network-manager-applet/default.nix +++ b/pkgs/tools/networking/network-manager-applet/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk libglade networkmanager libnotify libsecret dbus_glib - polkit isocodes makeWrapper udev GConf gnome_keyring + polkit isocodes makeWrapper udev GConf libgnome_keyring ]; nativeBuildInputs = [ intltool pkgconfig ]; From 52fe6943603ee39e41a0af9b7ff85c50953a87a6 Mon Sep 17 00:00:00 2001 From: Domen Kozar Date: Tue, 23 Jul 2013 18:51:20 +0200 Subject: [PATCH 640/798] networkmanager: we dont need networkmanager group anymore, just use at_console policy --- pkgs/tools/networking/network-manager/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index af35e3f71da..ce372d495b6 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -56,9 +56,6 @@ stdenv.mkDerivation rec { postInstall = '' mkdir -p $out/lib/NetworkManager - - # FIXME: Workaround until NixOS' dbus+systemd supports at_console policy - substituteInPlace $out/etc/dbus-1/system.d/org.freedesktop.NetworkManager.conf --replace 'at_console="true"' 'group="networkmanager"' ''; meta = with stdenv.lib; { From 4124741d436f9799b1e4b4d54113549bf57c9d07 Mon Sep 17 00:00:00 2001 From: Song Wenwu Date: Tue, 23 Jul 2013 09:42:11 +0800 Subject: [PATCH 641/798] gimp_2_8: update to 2.8.6, enable xpm support --- pkgs/applications/graphics/gimp/2.8.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/gimp/2.8.nix b/pkgs/applications/graphics/gimp/2.8.nix index b4c1fccf9dc..4e12e232081 100644 --- a/pkgs/applications/graphics/gimp/2.8.nix +++ b/pkgs/applications/graphics/gimp/2.8.nix @@ -4,18 +4,18 @@ , python, pygtk, libart_lgpl, libexif, gettext, xlibs }: stdenv.mkDerivation rec { - name = "gimp-2.8.4"; + name = "gimp-2.8.6"; src = fetchurl { url = "ftp://ftp.gimp.org/pub/gimp/v2.8/${name}.tar.bz2"; - md5 = "392592e8755d046317878d226145900f"; + md5 = "12b3fdf33d1f07ae79b412a9e38b9693"; }; buildInputs = [ pkgconfig intltool babl gegl gtk glib gdk_pixbuf pango cairo freetype fontconfig lcms libpng libjpeg poppler libtiff webkit libmng librsvg libwmf zlib libzip ghostscript aalib jasper - python pygtk libart_lgpl libexif gettext + python pygtk libart_lgpl libexif gettext xlibs.libXpm ]; passthru = { inherit gtk; }; # probably its a good idea to use the same gtk in plugins ? From 1386036457dc33812f520ae4f869e29c05acec47 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 23 Jul 2013 22:35:49 +0200 Subject: [PATCH 642/798] linux: Update to 3.4.54 --- 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 34a36bb276d..6dcd88a1f91 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix @@ -246,7 +246,7 @@ in import ./generic.nix ( rec { - version = "3.4.53"; + version = "3.4.54"; testing = false; preConfigure = '' @@ -255,7 +255,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "1imrs9shy8gbiylz2rlm9l312r1z0clnky5l965113ciarz65qjz"; + sha256 = "06gz0svm4ngn9iaq9hw5c63mi0613nlzh78dny2m6z00ivpbnk6i"; }; config = configWithPlatform stdenv.platform; From 626c4d5f5b6010487c69288c06419d7e35122238 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Tue, 23 Jul 2013 22:40:36 +0200 Subject: [PATCH 643/798] venus: new package --- pkgs/tools/misc/venus/default.nix | 50 +++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 54 insertions(+) create mode 100644 pkgs/tools/misc/venus/default.nix diff --git a/pkgs/tools/misc/venus/default.nix b/pkgs/tools/misc/venus/default.nix new file mode 100644 index 00000000000..b4f9732dec6 --- /dev/null +++ b/pkgs/tools/misc/venus/default.nix @@ -0,0 +1,50 @@ +{ stdenv, fetchurl, python, pythonPackages, libxslt, libxml2, makeWrapper }: + +let + rev = "9de21094a8cf565bdfcf75688e121a5ad1f5397b"; +in + +stdenv.mkDerivation rec { + name = "venus-${rev}"; + + src = fetchurl { + url = "https://github.com/rubys/venus/tarball/${rev}"; + name = "${name}.tar.bz"; + sha256 = "0lsc9d83grbi3iwm8ppaig4h9vbmd5h4vvz83lmpnyp7zqfka7dy"; + }; + + preConfigure = '' + substituteInPlace tests/test_spider.py \ + --replace "urllib.urlopen('http://127.0.0.1:%d/' % _PORT).read()" "" \ + --replace "[200,200,200,200,404]" "[200,200,200,404]" + substituteInPlace planet.py \ + --replace "#!/usr/bin/env python" "#!${python}/bin/python" + substituteInPlace tests/test_apply.py \ + --replace "'xsltproc" "'${libxslt}/bin/xsltproc" + substituteInPlace planet/shell/xslt.py \ + --replace "'xsltproc" "'${libxslt}/bin/xsltproc" + ''; + + doCheck = true; + checkPhase = "python runtests.py"; + + buildInputs = [ python python.modules.bsddb python.modules.ssl libxslt + libxml2 pythonPackages.genshi pythonPackages.lxml makeWrapper ]; + + installPhase = '' + mkdir -p $out/bin + cp -R ./* $out/ + ln -s $out/planet.py $out/bin/venus-planet + wrapProgram $out/planet.py \ + --prefix PYTHONPATH : $PYTHONPATH:${pythonPackages.lxml}/lib/${python.libPrefix}/site-packages:${pythonPackages.genshi}/lib/${python.libPrefix}/site-packages + python runtests.py + ''; + + meta = { + description = "Planet Venus is an awesome ‘river of news’ feed reader. It downloads news feeds published by web sites and aggregates their content together into a single combined feed, latest news first."; + homepage = "http://intertwingly.net/code/venus/docs/index.html"; + license = stdenv.lib.licenses.psfl; + platforms = stdenv.lib.platforms.all; + maintainers = [ stdenv.lib.maintainers.garbas ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b68c7ee17eb..25af46702ed 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1914,6 +1914,10 @@ let varnish = callPackage ../servers/varnish { }; + venus = callPackage ../tools/misc/venus { + python = python27; + }; + vlan = callPackage ../tools/networking/vlan { }; wakelan = callPackage ../tools/networking/wakelan { }; From a0bed10ab53da57bd713de11034442bab526441b Mon Sep 17 00:00:00 2001 From: Domen Kozar Date: Tue, 23 Jul 2013 22:41:27 +0200 Subject: [PATCH 644/798] WIP: pypy --- .../interpreters/pypy/2.0/default.nix | 89 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 91 insertions(+) create mode 100644 pkgs/development/interpreters/pypy/2.0/default.nix diff --git a/pkgs/development/interpreters/pypy/2.0/default.nix b/pkgs/development/interpreters/pypy/2.0/default.nix new file mode 100644 index 00000000000..f689ef9db21 --- /dev/null +++ b/pkgs/development/interpreters/pypy/2.0/default.nix @@ -0,0 +1,89 @@ +{ stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2, pkgconfig, libffi +, sqlite, openssl, ncurses, pythonFull }: + +assert zlibSupport -> zlib != null; + +let + + majorVersion = "2.0"; + version = "${majorVersion}.2"; + + src = fetchurl { + url = "https://bitbucket.org/pypy/pypy/downloads/pypy-${version}-src.tar.bz2"; + sha256 = "0g2cajs6m3yf0lak5f18ccs6j77cf5xvbm4h6y5l1qlqdc6wk48r"; + }; + + #patches = + # [ # Look in C_INCLUDE_PATH and LIBRARY_PATH for stuff. + # ./search-path.patch + + # Python recompiles a Python if the mtime stored *in* the + # pyc/pyo file differs from the mtime of the source file. This + # doesn't work in Nix because Nix changes the mtime of files in + # the Nix store to 1. So treat that as a special case. + # ./nix-store-mtime.patch + + # patch python to put zero timestamp into pyc + # if DETERMINISTIC_BUILD env var is set + # ./deterministic-build.patch + # ]; + #''; + + install = '' + cd ./pypy/pypy/tool/release/ + ${pythonFull}/bin/python package.py ../../.. pypy-my-own-package-name + ''; + + buildInputs = + optional (stdenv ? gcc && stdenv.gcc.libc != null) stdenv.gcc.libc ++ + [ bzip2 openssl pkgconfig pythonFull libffi ncurses ] + ++ optional zlibSupport zlib; + + pypy = stdenv.mkDerivation rec { + name = "pypy-${version}"; + + inherit majorVersion version src buildInputs; + + C_INCLUDE_PATH = concatStringsSep ":" (map (p: "${p}/include") buildInputs); + LIBRARY_PATH = concatStringsSep ":" (map (p: "${p}/lib") buildInputs); + + preConfigure = '' + substituteInPlace Makefile \ + --replace "-Ojit" "-Ojit --batch" \ + --replace "pypy/goal/targetpypystandalone.py" "pypy/goal/targetpypystandalone.py --withmod-_minimal_curses" + + # we are using cpython and not pypy to do translation + substituteInPlace rpython/bin/rpython \ + --replace "/usr/bin/env pypy" "${pythonFull}/bin/python" + substituteInPlace pypy/goal/targetpypystandalone.py \ + --replace "/usr/bin/env pypy" "${pythonFull}/bin/python" + + # convince pypy to find nix ncurses + substituteInPlace pypy/module/_minimal_curses/fficurses.py \ + --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']" + + #substituteInPlace rpython/translator/platform/__init__.py \ + # --replace "return include_dirs" "return tuple(\"{expat}\", *include_dirs)" \ + # --replace "return library_dirs" "return tuple(\"{expat}\", *library_dirs)" + ''; + + passthru = { + inherit zlibSupport; + libPrefix = "pypy${majorVersion}"; + }; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = "http://pypy.org/"; + description = "PyPy is a fast, compliant alternative implementation of the Python language (2.7.3)"; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ iElectric ]; + }; + }; + +in pypy // { inherit modules; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b68c7ee17eb..c689386d357 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3099,6 +3099,8 @@ let libX11 = xlibs.libX11; }; + pypy = callPackage ../development/interpreters/pypy/2.0 { }; + pythonFull = python27Full; python26Full = callPackage ../development/interpreters/python/wrapper.nix { extraLibs = lib.attrValues python26.modules; From e52fc8f431ea0542a34b376e1e63a96681702d80 Mon Sep 17 00:00:00 2001 From: Domen Kozar Date: Tue, 23 Jul 2013 23:24:51 +0200 Subject: [PATCH 645/798] pypy: fix stdenv.lib removal --- pkgs/development/interpreters/pypy/2.0/default.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/development/interpreters/pypy/2.0/default.nix b/pkgs/development/interpreters/pypy/2.0/default.nix index f689ef9db21..711c27fabf2 100644 --- a/pkgs/development/interpreters/pypy/2.0/default.nix +++ b/pkgs/development/interpreters/pypy/2.0/default.nix @@ -35,18 +35,15 @@ let ''; buildInputs = - optional (stdenv ? gcc && stdenv.gcc.libc != null) stdenv.gcc.libc ++ + stdenv.lib.optional (stdenv ? gcc && stdenv.gcc.libc != null) stdenv.gcc.libc ++ [ bzip2 openssl pkgconfig pythonFull libffi ncurses ] - ++ optional zlibSupport zlib; + ++ stdenv.lib.optional zlibSupport zlib; pypy = stdenv.mkDerivation rec { name = "pypy-${version}"; inherit majorVersion version src buildInputs; - C_INCLUDE_PATH = concatStringsSep ":" (map (p: "${p}/include") buildInputs); - LIBRARY_PATH = concatStringsSep ":" (map (p: "${p}/lib") buildInputs); - preConfigure = '' substituteInPlace Makefile \ --replace "-Ojit" "-Ojit --batch" \ @@ -86,4 +83,4 @@ let }; }; -in pypy // { inherit modules; } +in pypy From b800c5d1f9b5493e28ba0d8a08ff01ed3c712e28 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Wed, 24 Jul 2013 09:58:00 +0200 Subject: [PATCH 646/798] python-genzshcomp-0.5.1 --- 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 6905e4033b6..3444045b147 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2051,11 +2051,11 @@ pythonPackages = python.modules // rec { genzshcomp = buildPythonPackage { - name = "genzshcomp-0.2.2"; + name = "genzshcomp-0.5.1"; src = fetchurl { - url = "http://pypi.python.org/packages/source/g/genzshcomp/genzshcomp-0.2.2.tar.gz"; - sha256 = "0bhiyx41kilvy04cgjbvjy2r4b6l7zz31fbrg3l6lvnqm26nihb0"; + url = "http://pypi.python.org/packages/source/g/genzshcomp/genzshcomp-0.5.1.tar.gz"; + md5 = "7a954f1835875002e9044fe55ed1b488"; }; buildInputs = [ pkgs.setuptools ] ++ (optional isPy26 argparse); From 58c08fdefbce5d81d3f429de1eadc096b8be7f8d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 24 Jul 2013 10:50:42 +0200 Subject: [PATCH 647/798] aldor: fix the sha256 hash (plus minor cosmetic changes) --- pkgs/development/compilers/aldor/default.nix | 21 +++++++++----------- 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/pkgs/development/compilers/aldor/default.nix b/pkgs/development/compilers/aldor/default.nix index 7d0fd7a39bb..25d1a2c25bc 100644 --- a/pkgs/development/compilers/aldor/default.nix +++ b/pkgs/development/compilers/aldor/default.nix @@ -1,15 +1,12 @@ { fetchgit, stdenv, gmp, which, flex, bison, makeWrapper }: -stdenv.mkDerivation rec { - pname = "aldor"; - version = "1.1.0"; - name = "${pname}-${version}"; - gitRev = "a02b088c8d5d06f16c50a83ddee4019e962d6673"; +stdenv.mkDerivation { + name = "aldor-1.1.0"; src = fetchgit { url = "https://github.com/pippijn/aldor"; - sha256 = "1zd343wq46f74yr30a5nrbv5n831z6wd24yqnrs7w17ccic69lny"; - rev = gitRev; + sha256 = "14xv3jl15ib2knsdz0bd7jx64zg1qrr33q5zcr8gli860ps8gkg3"; + rev = "a02b088c8d5d06f16c50a83ddee4019e962d6673"; }; buildInputs = [ gmp which flex bison makeWrapper ]; @@ -28,8 +25,10 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib ; { + meta = { + homepage = "http://www.aldor.org/"; description = "Aldor is a programming language with an expressive type system"; + license = stdenv.lib.licenses.asl20; longDescription = '' Aldor is a programming language with an expressive type system well-suited @@ -44,9 +43,7 @@ stdenv.mkDerivation rec { and powerful properties of functional, object-oriented and aspect-oriented styles. ''; - homepage = http://www.aldor.org/; - license = licenses.asl20; - maintainers = [ ]; - platforms = platforms.linux; + maintainers = [ stdenv.lib.maintainers.simons ]; + platforms = stdenv.lib.platforms.linux; }; } From 850f20567efbcacdee4615b4dbf74daaec8925ab Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Wed, 24 Jul 2013 12:27:06 +0200 Subject: [PATCH 648/798] Fix apg --- pkgs/tools/security/apg/apg.patch | 44 +++++++++++++++++++++++++++++ pkgs/tools/security/apg/default.nix | 6 ++-- 2 files changed, 46 insertions(+), 4 deletions(-) create mode 100644 pkgs/tools/security/apg/apg.patch diff --git a/pkgs/tools/security/apg/apg.patch b/pkgs/tools/security/apg/apg.patch new file mode 100644 index 00000000000..abc22647d52 --- /dev/null +++ b/pkgs/tools/security/apg/apg.patch @@ -0,0 +1,44 @@ +diff -rc apg-2.2.3/Makefile apg-2.2.3-new/Makefile +*** apg-2.2.3/Makefile 2003-08-07 17:40:30.000000000 +0200 +--- apg-2.2.3-new/Makefile 2013-07-24 12:25:31.159938436 +0200 +*************** +*** 113,131 **** + if test -x ./apg; then \ + ./mkinstalldirs ${INSTALL_PREFIX}${APG_BIN_DIR}; \ + ./mkinstalldirs ${INSTALL_PREFIX}${APG_MAN_DIR}; \ +! ./install-sh -c -m 0755 -o root -g ${FIND_GROUP} ./apg ${INSTALL_PREFIX}${APG_BIN_DIR}; \ + ./install-sh -c -m 0444 ./doc/man/apg.1 ${INSTALL_PREFIX}${APG_MAN_DIR}; \ + fi + if test -x ./apgd; then \ + ./mkinstalldirs ${INSTALL_PREFIX}${APGD_BIN_DIR}; \ + ./mkinstalldirs ${INSTALL_PREFIX}${APGD_MAN_DIR}; \ +! ./install-sh -c -m 0755 -o root -g ${FIND_GROUP} ./apgd ${INSTALL_PREFIX}${APGD_BIN_DIR}; \ + ./install-sh -c -m 0444 ./doc/man/apgd.8 ${INSTALL_PREFIX}${APGD_MAN_DIR}; \ + fi + if test -x ./apgbfm; then \ + ./mkinstalldirs ${INSTALL_PREFIX}${APG_BIN_DIR}; \ + ./mkinstalldirs ${INSTALL_PREFIX}${APG_MAN_DIR}; \ +! ./install-sh -c -m 0755 -o root -g ${FIND_GROUP} ./apgbfm ${INSTALL_PREFIX}${APG_BIN_DIR}; \ + ./install-sh -c -m 0444 ./doc/man/apgbfm.1 ${INSTALL_PREFIX}${APG_MAN_DIR}; \ + fi + +--- 113,131 ---- + if test -x ./apg; then \ + ./mkinstalldirs ${INSTALL_PREFIX}${APG_BIN_DIR}; \ + ./mkinstalldirs ${INSTALL_PREFIX}${APG_MAN_DIR}; \ +! ./install-sh -c -m 0755 ./apg ${INSTALL_PREFIX}${APG_BIN_DIR}; \ + ./install-sh -c -m 0444 ./doc/man/apg.1 ${INSTALL_PREFIX}${APG_MAN_DIR}; \ + fi + if test -x ./apgd; then \ + ./mkinstalldirs ${INSTALL_PREFIX}${APGD_BIN_DIR}; \ + ./mkinstalldirs ${INSTALL_PREFIX}${APGD_MAN_DIR}; \ +! ./install-sh -c -m 0755 ./apgd ${INSTALL_PREFIX}${APGD_BIN_DIR}; \ + ./install-sh -c -m 0444 ./doc/man/apgd.8 ${INSTALL_PREFIX}${APGD_MAN_DIR}; \ + fi + if test -x ./apgbfm; then \ + ./mkinstalldirs ${INSTALL_PREFIX}${APG_BIN_DIR}; \ + ./mkinstalldirs ${INSTALL_PREFIX}${APG_MAN_DIR}; \ +! ./install-sh -c -m 0755 ./apgbfm ${INSTALL_PREFIX}${APG_BIN_DIR}; \ + ./install-sh -c -m 0444 ./doc/man/apgbfm.1 ${INSTALL_PREFIX}${APG_MAN_DIR}; \ + fi + diff --git a/pkgs/tools/security/apg/default.nix b/pkgs/tools/security/apg/default.nix index 7eeb491374a..28f66e1e492 100644 --- a/pkgs/tools/security/apg/default.nix +++ b/pkgs/tools/security/apg/default.nix @@ -8,10 +8,8 @@ stdenv.mkDerivation rec { configurePhase = '' substituteInPlace Makefile --replace /usr/local "$out" ''; - preInstall = '' - export CHOWNPROG=true - export CHGRPPROG=true - ''; + + patches = [ ./apg.patch ]; meta = { description = "A tool set for random password generation."; From 63f9aed9ebe20b926f221997eb237cd96076fb5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Wed, 24 Jul 2013 14:36:00 +0200 Subject: [PATCH 649/798] minicom: 2.4 -> 2.6.2 This also fixes the annoying issue that minicom doesn't work out of the box: $ minicom minicom: there is no global configuration file /etc/minirc.dfl Ask your sysadmin to create one (with minicom -s). $ sudo minicom -s minicom: there is no global configuration file /etc/minirc.dfl Ask your sysadmin to create one (with minicom -s). minicom 2.4 basically refuses to enter setup unless /etc/minirc.dfl already exists. sudo touch /etc/minirc.dfl is enough to fix that though, but with this commit "sudo minicom -s" will work out of the box. --- pkgs/tools/misc/minicom/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/minicom/default.nix b/pkgs/tools/misc/minicom/default.nix index ef735bf4384..2ab1195020c 100644 --- a/pkgs/tools/misc/minicom/default.nix +++ b/pkgs/tools/misc/minicom/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ncurses }: stdenv.mkDerivation rec { - name = "minicom-2.4"; + name = "minicom-2.6.2"; src = fetchurl { - url = "http://alioth.debian.org/frs/download.php/3195/${name}.tar.gz"; - sha256 = "0j0ayimh3389pciqs60fsfafn87p9gnmmmqz15xq9fkkn10g4ykb"; + url = "http://alioth.debian.org/frs/download.php/file/3869/${name}.tar.gz"; + sha256 = "0s4ibk8scspm8a0raf5s4zgp9b82c4bn529rir9abzqlg5gj3kzk"; }; buildInputs = [ncurses]; From 18702109263391ab6b3fac70a5c7080ccd047804 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Wed, 24 Jul 2013 14:41:20 +0200 Subject: [PATCH 650/798] libvirt: Update to 1.1.0 --- pkgs/development/libraries/libvirt/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 6a6b693cbbe..e1e4a759e06 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -1,21 +1,21 @@ { stdenv, fetchurl, pkgconfig, libxml2, gnutls, devicemapper, perl, python -, iproute, iptables, readline, lvm2, utillinux, udev, libpciaccess, gettext -, libtasn1, ebtables, libgcrypt, yajl +, iproute, iptables, readline, lvm2, utillinux, udev, libpciaccess, gettext +, libtasn1, ebtables, libgcrypt, yajl, makeWrapper, pmutils }: -let version = "1.0.3"; in +let version = "1.1.0"; in stdenv.mkDerivation { name = "libvirt-${version}"; src = fetchurl { url = "http://libvirt.org/sources/libvirt-${version}.tar.gz"; - sha256 = "0mr727n0ygxk6y69srg3ahmjd7wligamw683x2snmz6wgk6llkzn"; + sha256 = "0a39cwvzwf79gv3zw5mwp9q9n792rr1m0rl9ji39bdgcjxb7d7nf"; }; buildInputs = [ pkgconfig libxml2 gnutls devicemapper perl python readline lvm2 - utillinux udev libpciaccess gettext libtasn1 libgcrypt yajl + utillinux udev libpciaccess gettext libtasn1 libgcrypt yajl makeWrapper ]; preConfigure = @@ -32,6 +32,8 @@ stdenv.mkDerivation { '' substituteInPlace $out/libexec/libvirt-guests.sh \ --replace "$out/bin" "${gettext}/bin" + wrapProgram $out/sbin/libvirtd \ + --prefix PATH : ${iptables}/sbin:${iproute}/sbin:${pmutils}/bin ''; enableParallelBuilding = true; From 3c60e2ec39b11353779518e39a1d4aad13193b99 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 24 Jul 2013 04:26:14 +0200 Subject: [PATCH 651/798] chromium: Add API keys for NixOS. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit As requested by some users, we finally have support for cloud sync, spelling, geolocation and a lot more of the services that require API keys from Google. Details about which services are involved can be found at: http://www.chromium.org/developers/how-tos/api-keys Thanks to Paweł Hajdan for giving us permission to distribute the API keys with our build of Chromium: > Note that the public Terms of Service do not allow distribution of the > API keys in any form. To make this work for you, on behalf of Google > Chrome Team I am providing you with: > Official permission to include Google API keys in your packages and to > distribute these packages. The remainder of the Terms of Service for > each API applies, but at this time you are not bound by the > requirement to only access the APIs for personal and development use, > and Additional quota for each API in an effort to adequately support > your users. As noted in the source: Those keys are for use in NixOS/nixpkgs ONLY! Signed-off-by: aszlig --- .../applications/networking/browsers/chromium/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 3f072b50994..e8973f1bd72 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -146,6 +146,14 @@ in stdenv.mkDerivation rec { linux_sandbox_path="${libExecPath}/${packageName}_sandbox"; linux_sandbox_chrome_path="${libExecPath}/${packageName}"; werror = ""; + + # Google API keys, see http://www.chromium.org/developers/how-tos/api-keys. + # Note: These are for NixOS/nixpkgs use ONLY. For your own distribution, + # please get your own set of keys. + google_api_key = "AIzaSyDGi15Zwl11UNe6Y-5XW_upsfyw31qwZPI"; + google_default_client_id = "404761575300.apps.googleusercontent.com"; + google_default_client_secret = "9rIFQjfnkykEmqb6FfjJQD1D"; + } // optionalAttrs proprietaryCodecs { # enable support for the H.264 codec proprietary_codecs = true; From 78bfe0ab5bbde7a642d02c2edb414790c0119bdc Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 24 Jul 2013 04:42:05 +0200 Subject: [PATCH 652/798] chromium: Update all channels to latest versions. So, chromium 30 entered the dev release channel, so the overview of the current versions is: stable: 28.0.1500.52 -> 28.0.1500.71 (builds fine, tested) beta: 28.0.1500.52 -> 29.0.1547.22 (builds fine, tested) dev: 29.0.1547.0 -> 30.0.1566.2 (builds fine, tested) Signed-off-by: aszlig --- .../networking/browsers/chromium/sources.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/sources.nix b/pkgs/applications/networking/browsers/chromium/sources.nix index 952ecf2a6f1..709e16e8005 100644 --- a/pkgs/applications/networking/browsers/chromium/sources.nix +++ b/pkgs/applications/networking/browsers/chromium/sources.nix @@ -1,18 +1,18 @@ # This file is autogenerated from update.sh in the same directory. { dev = { - version = "29.0.1547.0"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-29.0.1547.0.tar.xz"; - sha256 = "0ydinl0zrsm995rcpph4i56335nzhp1fqnlz39lg4vbjsshchh9x"; + version = "30.0.1566.2"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-30.0.1566.2.tar.xz"; + sha256 = "0hfpa46hivr3yxj80vhsdkb59zs0020whz95yb6gvwi7ql8p6lvh"; }; beta = { - version = "28.0.1500.52"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-28.0.1500.52.tar.xz"; - sha256 = "1d0q8lsvwqkaninmnyc8jjj0pnqxc5rr3lr3mgzj37avksxvyg3v"; + version = "29.0.1547.22"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-29.0.1547.22.tar.xz"; + sha256 = "1vaz1abhs0x5frkx3xcgcdpi1n0mmrijfh57kqz54mw7xjlh71vm"; }; stable = { - version = "28.0.1500.52"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-28.0.1500.52.tar.xz"; - sha256 = "1d0q8lsvwqkaninmnyc8jjj0pnqxc5rr3lr3mgzj37avksxvyg3v"; + version = "28.0.1500.71"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-28.0.1500.71.tar.xz"; + sha256 = "1w8hkbb17bwq9myhj7fig27pn50qlwdfrqs04xjvam4ah3w6qb0r"; }; } From f77de3953626f393ea0bead66dce65cb4a13ede3 Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 25 Jul 2013 01:02:15 +0200 Subject: [PATCH 653/798] chromium: Update dev channel to v30.0.1568.0. The sha256 has changed upstream for 30.0.1566.2 and in addition there is a new version available, so let's switch to the new version. Unfortunately the user namespaces sandbox patch doesn't apply anymore because of http://crbug.com/242290, so this adds a rebased version on top of the current trunk of Chromium. In order to build version 30, file is now needed as an additional build input, because it is used by gyp. Signed-off-by: aszlig --- .../networking/browsers/chromium/default.nix | 10 +- .../browsers/chromium/sandbox_userns_30.patch | 287 ++++++++++++++++++ .../networking/browsers/chromium/sources.nix | 6 +- 3 files changed, 298 insertions(+), 5 deletions(-) create mode 100644 pkgs/applications/networking/browsers/chromium/sandbox_userns_30.patch diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index e8973f1bd72..8188d5279a7 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -18,6 +18,9 @@ # optional dependencies , libgcrypt ? null # gnomeSupport || cupsSupport +# dependency for version 30 +, file + # package customization , channel ? "stable" , enableSELinux ? false, libselinux ? null @@ -87,7 +90,9 @@ let # user namespace sandbox patch userns_patch = if versionOlder sourceInfo.version "29.0.0.0" then ./sandbox_userns.patch - else ./sandbox_userns_29.patch; + else if versionOlder sourceInfo.version "30.0.0.0" + then ./sandbox_userns_29.patch + else ./sandbox_userns_30.patch; in stdenv.mkDerivation rec { name = "${packageName}-${version}"; @@ -115,7 +120,8 @@ in stdenv.mkDerivation rec { ++ optionals gnomeSupport [ gconf libgcrypt ] ++ optional enableSELinux libselinux ++ optional cupsSupport libgcrypt - ++ optional pulseSupport pulseaudio; + ++ optional pulseSupport pulseaudio + ++ optional (!versionOlder sourceInfo.version "30.0.0.0") file; opensslPatches = optional useOpenSSL openssl.patches; diff --git a/pkgs/applications/networking/browsers/chromium/sandbox_userns_30.patch b/pkgs/applications/networking/browsers/chromium/sandbox_userns_30.patch new file mode 100644 index 00000000000..ef1a08ee313 --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/sandbox_userns_30.patch @@ -0,0 +1,287 @@ +commit b9a1fa30eb3296b169f51ffa8ee05513c5c1dbae +Author: aszlig +Date: Thu May 16 14:17:56 2013 +0200 + + zygote: Add support for user namespaces on Linux. + + The implementation is done by patching the Zygote host to execute the sandbox + binary with CLONE_NEWUSER and setting the uid and gid mapping so that the child + process is using uid 0 and gid 0 which map to the current user of the parent. + Afterwards, the sandbox will continue as if it was called as a setuid binary. + + In addition, this adds new_user_namespace as an option in process_util in order + to set the UID and GID mapping correctly. The reason for this is that just + passing CLONE_NEWUSER to clone_flags doesn't help in LaunchProcess(), because + without setting the mappings exec*() will clear the process's capability sets. + + If the kernel doesn't support unprivileged user namespaces and the sandbox + binary doesn't have the setuid flag, the Zygote main process will run without a + sandbox. This is to mimic the behaviour if no SUID sandbox binary path is set. + + Signed-off-by: aszlig + +diff --git a/base/process/launch.h b/base/process/launch.h +index 45b1053..ce71418 100644 +--- a/base/process/launch.h ++++ b/base/process/launch.h +@@ -51,6 +51,7 @@ struct LaunchOptions { + new_process_group(false) + #if defined(OS_LINUX) + , clone_flags(0) ++ , new_user_namespace(false) + #endif // OS_LINUX + #if defined(OS_CHROMEOS) + , ctrl_terminal_fd(-1) +@@ -125,6 +126,9 @@ struct LaunchOptions { + #if defined(OS_LINUX) + // If non-zero, start the process using clone(), using flags as provided. + int clone_flags; ++ ++ // If true, start the process in a new user namespace. ++ bool new_user_namespace; + #endif // defined(OS_LINUX) + + #if defined(OS_CHROMEOS) +diff --git a/base/process/launch_posix.cc b/base/process/launch_posix.cc +index 336633c..4b50a5d 100644 +--- a/base/process/launch_posix.cc ++++ b/base/process/launch_posix.cc +@@ -36,6 +36,13 @@ + #include "base/threading/platform_thread.h" + #include "base/threading/thread_restrictions.h" + ++#if defined(OS_LINUX) ++#include ++#if !defined(CLONE_NEWUSER) ++#define CLONE_NEWUSER 0x10000000 ++#endif ++#endif ++ + #if defined(OS_CHROMEOS) + #include + #endif +@@ -395,8 +402,19 @@ bool LaunchProcess(const std::vector& argv, + + pid_t pid; + #if defined(OS_LINUX) +- if (options.clone_flags) { +- pid = syscall(__NR_clone, options.clone_flags, 0, 0, 0); ++ int map_pipe_fd[2]; ++ int flags = options.clone_flags; ++ ++ if (options.new_user_namespace) { ++ flags |= CLONE_NEWUSER; ++ if (pipe(map_pipe_fd) < 0) { ++ DPLOG(ERROR) << "user namespace pipe"; ++ return false; ++ } ++ } ++ ++ if (options.clone_flags || options.new_user_namespace) { ++ pid = syscall(__NR_clone, flags, 0, 0, 0); + } else + #endif + { +@@ -409,6 +427,21 @@ bool LaunchProcess(const std::vector& argv, + } else if (pid == 0) { + // Child process + ++#if defined(OS_LINUX) ++ if (options.new_user_namespace) { ++ // Close the write end of the pipe so we get an EOF when the parent closes ++ // the FD. This is to avoid race conditions when the UID/GID mappings are ++ // written _after_ execvp(). ++ close(map_pipe_fd[1]); ++ ++ char dummy; ++ if (HANDLE_EINTR(read(map_pipe_fd[0], &dummy, 1)) != 0) { ++ RAW_LOG(ERROR, "Unexpected input in uid/gid mapping pipe."); ++ _exit(127); ++ } ++ } ++#endif ++ + // DANGER: fork() rule: in the child, if you don't end up doing exec*(), + // you call _exit() instead of exit(). This is because _exit() does not + // call any previously-registered (in the parent) exit handlers, which +@@ -523,6 +556,40 @@ bool LaunchProcess(const std::vector& argv, + _exit(127); + } else { + // Parent process ++#if defined(OS_LINUX) ++ if (options.new_user_namespace) { ++ // We need to write UID/GID mapping here to map the current user outside ++ // the namespace to the root user inside the namespace in order to ++ // correctly "fool" the child process. ++ char buf[256]; ++ int map_fd, map_len; ++ ++ snprintf(buf, sizeof(buf), "/proc/%d/uid_map", pid); ++ map_fd = open(buf, O_RDWR); ++ DPCHECK(map_fd >= 0); ++ snprintf(buf, sizeof(buf), "0 %d 1", geteuid()); ++ map_len = strlen(buf); ++ if (write(map_fd, buf, map_len) != map_len) { ++ RAW_LOG(WARNING, "Can't write to uid_map."); ++ } ++ close(map_fd); ++ ++ snprintf(buf, sizeof(buf), "/proc/%d/gid_map", pid); ++ map_fd = open(buf, O_RDWR); ++ DPCHECK(map_fd >= 0); ++ snprintf(buf, sizeof(buf), "0 %d 1", getegid()); ++ map_len = strlen(buf); ++ if (write(map_fd, buf, map_len) != map_len) { ++ RAW_LOG(WARNING, "Can't write to gid_map."); ++ } ++ close(map_fd); ++ ++ // Close the pipe on the parent, so the child can continue doing the ++ // execvp() call. ++ close(map_pipe_fd[1]); ++ } ++#endif ++ + if (options.wait) { + // While this isn't strictly disk IO, waiting for another process to + // finish is the sort of thing ThreadRestrictions is trying to prevent. +diff --git a/content/browser/zygote_host/zygote_host_impl_linux.cc b/content/browser/zygote_host/zygote_host_impl_linux.cc +index bb84e62..bce0d18 100644 +--- a/content/browser/zygote_host/zygote_host_impl_linux.cc ++++ b/content/browser/zygote_host/zygote_host_impl_linux.cc +@@ -119,25 +119,31 @@ void ZygoteHostImpl::Init(const std::string& sandbox_cmd) { + + sandbox_binary_ = sandbox_cmd.c_str(); + +- // A non empty sandbox_cmd means we want a SUID sandbox. +- using_suid_sandbox_ = !sandbox_cmd.empty(); ++ bool userns_sandbox = false; ++ const std::vector cmd_line_unwrapped(cmd_line.argv()); + +- if (using_suid_sandbox_) { ++ if (!sandbox_cmd.empty()) { + struct stat st; + if (stat(sandbox_binary_.c_str(), &st) != 0) { + LOG(FATAL) << "The SUID sandbox helper binary is missing: " + << sandbox_binary_ << " Aborting now."; + } + +- if (access(sandbox_binary_.c_str(), X_OK) == 0 && +- (st.st_uid == 0) && +- (st.st_mode & S_ISUID) && +- (st.st_mode & S_IXOTH)) { ++ if (access(sandbox_binary_.c_str(), X_OK) == 0) { ++ using_suid_sandbox_ = true; ++ + cmd_line.PrependWrapper(sandbox_binary_); + + scoped_ptr + sandbox_client(sandbox::SetuidSandboxClient::Create()); + sandbox_client->SetupLaunchEnvironment(); ++ ++ if (!((st.st_uid == 0) && ++ (st.st_mode & S_ISUID) && ++ (st.st_mode & S_IXOTH))) { ++ userns_sandbox = true; ++ sandbox_client->SetNoSuid(); ++ } + } else { + LOG(FATAL) << "The SUID sandbox helper binary was found, but is not " + "configured correctly. Rather than run without sandboxing " +@@ -161,7 +167,19 @@ void ZygoteHostImpl::Init(const std::string& sandbox_cmd) { + base::ProcessHandle process = -1; + base::LaunchOptions options; + options.fds_to_remap = &fds_to_map; ++ if (userns_sandbox) ++ options.new_user_namespace = true; + base::LaunchProcess(cmd_line.argv(), options, &process); ++ ++ if (process == -1 && userns_sandbox) { ++ LOG(ERROR) << "User namespace sandbox failed to start, running without " ++ << "sandbox! You need at least kernel 3.8.0 with CONFIG_USER_NS " ++ << "enabled in order to use the sandbox without setuid bit."; ++ using_suid_sandbox_ = false; ++ options.new_user_namespace = false; ++ base::LaunchProcess(cmd_line_unwrapped, options, &process); ++ } ++ + CHECK(process != -1) << "Failed to launch zygote process"; + + if (using_suid_sandbox_) { +diff --git a/content/zygote/zygote_main_linux.cc b/content/zygote/zygote_main_linux.cc +index dcea4c0..c06b4ae 100644 +--- a/content/zygote/zygote_main_linux.cc ++++ b/content/zygote/zygote_main_linux.cc +@@ -398,6 +398,13 @@ static bool EnterSandbox(sandbox::SetuidSandboxClient* setuid_sandbox, + *has_started_new_init = true; + } + ++ // Don't set non-dumpable, as it causes trouble when the host tries to find ++ // the zygote process (XXX: Not quite sure why this happens with user ++ // namespaces). Fortunately, we also have the seccomp filter sandbox which ++ // should disallow the use of ptrace. ++ if (setuid_sandbox->IsNoSuid()) ++ return true; ++ + #if !defined(OS_OPENBSD) + // Previously, we required that the binary be non-readable. This causes the + // kernel to mark the process as non-dumpable at startup. The thinking was +diff --git a/sandbox/linux/suid/client/setuid_sandbox_client.cc b/sandbox/linux/suid/client/setuid_sandbox_client.cc +index 34231d4..36e3201 100644 +--- a/sandbox/linux/suid/client/setuid_sandbox_client.cc ++++ b/sandbox/linux/suid/client/setuid_sandbox_client.cc +@@ -166,6 +166,10 @@ bool SetuidSandboxClient::IsInNewNETNamespace() const { + return env_->HasVar(kSandboxNETNSEnvironmentVarName); + } + ++bool SetuidSandboxClient::IsNoSuid() const { ++ return env_->HasVar(kSandboxNoSuidVarName); ++} ++ + bool SetuidSandboxClient::IsSandboxed() const { + return sandboxed_; + } +@@ -175,5 +179,9 @@ void SetuidSandboxClient::SetupLaunchEnvironment() { + SetSandboxAPIEnvironmentVariable(env_); + } + ++void SetuidSandboxClient::SetNoSuid() { ++ env_->SetVar(kSandboxNoSuidVarName, "1"); ++} ++ + } // namespace sandbox + +diff --git a/sandbox/linux/suid/client/setuid_sandbox_client.h b/sandbox/linux/suid/client/setuid_sandbox_client.h +index a9f6536..2e8113a 100644 +--- a/sandbox/linux/suid/client/setuid_sandbox_client.h ++++ b/sandbox/linux/suid/client/setuid_sandbox_client.h +@@ -39,6 +39,8 @@ class SetuidSandboxClient { + bool IsInNewPIDNamespace() const; + // Did the setuid helper create a new network namespace ? + bool IsInNewNETNamespace() const; ++ // Is sandboxed without SUID binary ? ++ bool IsNoSuid() const; + // Are we done and fully sandboxed ? + bool IsSandboxed() const; + +@@ -46,6 +48,8 @@ class SetuidSandboxClient { + // helper. + void SetupLaunchEnvironment(); + ++ void SetNoSuid(); ++ + private: + // Holds the environment. Will never be NULL. + base::Environment* env_; +diff --git a/sandbox/linux/suid/common/sandbox.h b/sandbox/linux/suid/common/sandbox.h +index aad4ff8..bd710d5 100644 +--- a/sandbox/linux/suid/common/sandbox.h ++++ b/sandbox/linux/suid/common/sandbox.h +@@ -18,6 +18,7 @@ static const char kAdjustLowMemMarginSwitch[] = "--adjust-low-mem"; + + static const char kSandboxDescriptorEnvironmentVarName[] = "SBX_D"; + static const char kSandboxHelperPidEnvironmentVarName[] = "SBX_HELPER_PID"; ++static const char kSandboxNoSuidVarName[] = "SBX_NO_SUID"; + + static const long kSUIDSandboxApiNumber = 1; + static const char kSandboxEnvironmentApiRequest[] = "SBX_CHROME_API_RQ"; diff --git a/pkgs/applications/networking/browsers/chromium/sources.nix b/pkgs/applications/networking/browsers/chromium/sources.nix index 709e16e8005..47840ac3ebb 100644 --- a/pkgs/applications/networking/browsers/chromium/sources.nix +++ b/pkgs/applications/networking/browsers/chromium/sources.nix @@ -1,9 +1,9 @@ # This file is autogenerated from update.sh in the same directory. { dev = { - version = "30.0.1566.2"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-30.0.1566.2.tar.xz"; - sha256 = "0hfpa46hivr3yxj80vhsdkb59zs0020whz95yb6gvwi7ql8p6lvh"; + version = "30.0.1568.0"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-30.0.1568.0.tar.xz"; + sha256 = "0c30mbaj98ibyvg855zsqggy3mzhpwkaiw3x37na5hw6qabqizbf"; }; beta = { version = "29.0.1547.22"; From c067505c7d3aea7e5c922b1dbabaa6cdbf38592e Mon Sep 17 00:00:00 2001 From: Karn Kallio Date: Thu, 25 Jul 2013 10:05:49 +0200 Subject: [PATCH 654/798] aldor: fix the build --- pkgs/development/compilers/aldor/default.nix | 22 +++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/pkgs/development/compilers/aldor/default.nix b/pkgs/development/compilers/aldor/default.nix index 25d1a2c25bc..fcd0c9fd453 100644 --- a/pkgs/development/compilers/aldor/default.nix +++ b/pkgs/development/compilers/aldor/default.nix @@ -1,4 +1,5 @@ -{ fetchgit, stdenv, gmp, which, flex, bison, makeWrapper }: +{ fetchgit, stdenv, gmp, which, flex, bison, makeWrapper +, autoconf, automake, libtool, openjdk, perl }: stdenv.mkDerivation { name = "aldor-1.1.0"; @@ -6,21 +7,22 @@ stdenv.mkDerivation { src = fetchgit { url = "https://github.com/pippijn/aldor"; sha256 = "14xv3jl15ib2knsdz0bd7jx64zg1qrr33q5zcr8gli860ps8gkg3"; - rev = "a02b088c8d5d06f16c50a83ddee4019e962d6673"; + rev = "f7b95835cf709654744441ddb1c515bfc2bec998"; }; - buildInputs = [ gmp which flex bison makeWrapper ]; + buildInputs = [ gmp which flex bison makeWrapper autoconf automake libtool + openjdk perl ]; - installPhase = '' - for d in bin include lib ; - do - ensureDir $out/$d ; - cp -r build/$d $out/ ; - done + preConfigure = '' + cd aldor ; + ./autogen.sh ; + ''; - for prog in aldor unicl zacc ; + postInstall = '' + for prog in aldor unicl javagen ; do wrapProgram $out/bin/$prog --set ALDORROOT $out \ + --prefix PATH : ${openjdk}/bin \ --prefix PATH : ${stdenv.gcc}/bin ; done ''; From fa6314a955477d1865a730b304da8ba4441fe24d Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Thu, 25 Jul 2013 10:16:48 +0200 Subject: [PATCH 655/798] Add perl module HTML::FromANSI and its dependencies. Make Testuseok use the casing that comes out of nix-generate-from-cpan, to prevent needing to special-case it on next generations. --- pkgs/top-level/perl-packages.nix | 67 ++++++++++++++++++++++++-------- 1 file changed, 50 insertions(+), 17 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index a66af2b4e96..c20f4efd9fc 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -513,7 +513,7 @@ rec { url = "mirror://cpan/modules/by-module/Catalyst/${name}.tar.gz"; sha256 = "09mn0wjwfvnfi28y47g816nx50zdpvwvbxp0nrpsap0ir1m80wi3"; }; - buildInputs = [ TestWWWMechanizeCatalyst TestUseOk ]; + buildInputs = [ TestWWWMechanizeCatalyst Testuseok ]; propagatedBuildInputs = [ CatalystPluginAuthentication ClassAccessor CryptPasswdMD5 AuthenHtpasswd HTMLForm ]; }; @@ -715,7 +715,7 @@ rec { url = mirror://cpan/authors/id/G/GR/GRAF/Catalyst-Plugin-Cache-HTTP-0.001000.tar.gz; sha256 = "0v5iphbq4csc4r6wkvxnqlh97p8g0yhjky9qqmsdyqczn87agbba"; }; - buildInputs = [ CatalystRuntime TestUseOk TestWWWMechanizeCatalyst ]; + buildInputs = [ CatalystRuntime Testuseok TestWWWMechanizeCatalyst ]; propagatedBuildInputs = [ ClassAccessorFast HTTPMessage MROCompat ]; meta = { description = "HTTP/1.1 cache validators for Catalyst"; @@ -834,7 +834,7 @@ rec { url = "mirror://cpan/modules/by-module/Catalyst/${name}.tar.gz"; sha256 = "1c6k4x6az0fkany16zlyaqhlp7bcx922vl4qzd3z707vs6pc06rz"; }; - buildInputs = [ TestWWWMechanizeCatalyst TestUseOk ]; + buildInputs = [ TestWWWMechanizeCatalyst Testuseok ]; propagatedBuildInputs = [ CatalystRuntime TextCSV XMLSimple ]; }; @@ -1356,7 +1356,7 @@ rec { url = "mirror://cpan/authors/id/J/JR/JROCKWAY/${name}.tar.gz"; sha256 = "0gssillawjknqks81x7fg7w2x94bnyklgd8ry2pr1k6ifkjhwz46"; }; - buildInputs = [ TestException TestUseOk ]; + buildInputs = [ TestException Testuseok ]; }; CookieXS = buildPerlPackage rec { @@ -1485,7 +1485,7 @@ rec { url = mirror://cpan/authors/id/N/NU/NUFFIN/Crypt-Random-Source-0.07.tar.gz; sha256 = "0kxcqcpknh9hhfnpiymxrjg74yj7nfr7k4fgrfmd9s2cw9p9mqdv"; }; - buildInputs = [ TestUseOk TestException ]; + buildInputs = [ Testuseok TestException ]; propagatedBuildInputs = [ AnyMoose CaptureTiny ModuleFind namespaceclean SubExporter ]; meta = { homepage = http://search.cpan.org/dist/Crypt-Random-Source; @@ -2193,7 +2193,7 @@ rec { url = mirror://cpan/authors/id/F/FL/FLORA/Devel-PartialDump-0.15.tar.gz; sha256 = "0xm42030qlbimay5x72sjj0na43ciniai2xdcdx8zf191jw5dz7n"; }; - propagatedBuildInputs = [ Moose namespaceclean SubExporter TestUseOk TestWarn ]; + propagatedBuildInputs = [ Moose namespaceclean SubExporter Testuseok TestWarn ]; }; DevelStackTrace = buildPerlPackage { @@ -3131,7 +3131,7 @@ rec { url = mirror://cpan/authors/id/N/NU/NUFFIN/Hash-Util-FieldHash-Compat-0.03.tar.gz; sha256 = "0pmai98a89j82fjksfax87brmpimjn74kr7bl874lc1k40dfhx47"; }; - propagatedBuildInputs = [ TestUseOk ]; + propagatedBuildInputs = [ Testuseok ]; }; HeapFibonacci = buildPerlPackage { @@ -3151,6 +3151,17 @@ rec { buildInputs = [ pkgs.unzip ]; }; + HTMLFromANSI = buildPerlPackage { + name = "HTML-FromANSI-2.03"; + src = fetchurl { + url = mirror://cpan/authors/id/N/NU/NUFFIN/HTML-FromANSI-2.03.tar.gz; + sha256 = "21776345ed701b2c04c7b09380af943f9984cc7f99624087aea45db5fc09c359"; + }; + propagatedBuildInputs = [ HTMLParser TermVT102Boundless Testuseok ]; + meta = { + }; + }; + HTMLForm = buildPerlPackage { name = "HTML-Form-6.03"; src = fetchurl { @@ -4486,7 +4497,7 @@ rec { sha256 = "6d2d8fdc4f3f7fa76dc82c10d71b099f1572c054a72f373e5a9fa6237e48634a"; }; buildInputs = [ MooseXConfigFromFile TestOutput YAML ]; - propagatedBuildInputs = [ AppCmd GetoptLongDescriptive Moose MooseXConfigFromFile MooseXGetopt MooseXHasOptions MooseXMarkAsMethods TestUseOk ]; + propagatedBuildInputs = [ AppCmd GetoptLongDescriptive Moose MooseXConfigFromFile MooseXGetopt MooseXHasOptions MooseXMarkAsMethods Testuseok ]; meta = { homepage = http://metacpan.org/release/MooseX-App-Cmd; description = "Mashes up MooseX::Getopt and App::Cmd"; @@ -4523,7 +4534,7 @@ rec { url = mirror://cpan/authors/id/N/NU/NUFFIN/MooseX-Clone-0.05.tar.gz; sha256 = "11pbw3zdbcn54hrj6z74qisnmj9k4qliy6yjj9d71qndq3xg3x0f"; }; - propagatedBuildInputs = [ DataVisitor HashUtilFieldHashCompat Moose namespaceclean TestUseOk ]; + propagatedBuildInputs = [ DataVisitor HashUtilFieldHashCompat Moose namespaceclean Testuseok ]; }; MooseXConfigFromFile = buildPerlPackage { @@ -4702,7 +4713,7 @@ rec { url = mirror://cpan/authors/id/J/JR/JROCKWAY/MooseX-Runnable-0.03.tar.gz; sha256 = "1hl3pnldjlbyj6gm3bzwj827qp54di14hp4zhypmrmbg1lscfdwc"; }; - buildInputs = [ TestUseOk TestTableDriven ]; + buildInputs = [ Testuseok TestTableDriven ]; propagatedBuildInputs = [ ListMoreUtils Moose MooseXGetopt MooseXTypes MooseXTypesPathClass namespaceautoclean ParamsUtil ]; }; @@ -4754,7 +4765,7 @@ rec { url = "mirror://cpan/authors/id/F/FL/FLORA/${name}.tar.gz"; sha256 = "0sqmpf2kw25847fwrrwpcfhrq694bgs8jbix7qxp9qyjm769np6n"; }; - buildInputs = [ TestException TestUseOk ]; + buildInputs = [ TestException Testuseok ]; propagatedBuildInputs = [ ClassMOP Moose namespaceautoclean ]; }; @@ -4800,7 +4811,7 @@ rec { url = mirror://cpan/authors/id/I/IL/ILMARI/MooseX-Types-DateTime-0.08.tar.gz; sha256 = "0q0d1dd8737rc3k3jb22wvybf03hg3lp1iyda0ivkd8020cib996"; }; - propagatedBuildInputs = [ DateTime DateTimeLocale DateTimeTimeZone Moose MooseXTypes namespaceclean TestException TestUseOk ]; + propagatedBuildInputs = [ DateTime DateTimeLocale DateTimeTimeZone Moose MooseXTypes namespaceclean TestException Testuseok ]; }; MooseXTypesDateTimeMoreCoercions = buildPerlPackage { @@ -4809,7 +4820,7 @@ rec { url = mirror://cpan/authors/id/I/IL/ILMARI/MooseX-Types-DateTime-MoreCoercions-0.11.tar.gz; sha256 = "c746a9284b7db49ce9acb2fbce26629fa816e6636e883d2ed6c62e336cfc52cb"; }; - buildInputs = [ TestException TestUseOk ]; + buildInputs = [ TestException Testuseok ]; propagatedBuildInputs = [ DateTime DateTimeXEasy Moose MooseXTypes MooseXTypesDateTime TimeDurationParse namespaceclean ]; meta = { description = "Extensions to MooseX::Types::DateTime"; @@ -4890,7 +4901,7 @@ rec { url = mirror://cpan/authors/id/F/FL/FLORA/MooseX-Types-URI-0.03.tar.gz; sha256 = "056v08kzcd93h8l69iqdxbr05h85bgz6jvp6iwc0vv68dacr299s"; }; - propagatedBuildInputs = [ Moose MooseXTypes MooseXTypesPathClass namespaceclean TestUseOk URI URIFromHash ]; + propagatedBuildInputs = [ Moose MooseXTypes MooseXTypesPathClass namespaceclean Testuseok URI URIFromHash ]; }; Mouse = buildPerlPackage rec { @@ -6158,7 +6169,7 @@ rec { url = mirror://cpan/authors/id/B/BO/BOBTFISH/String-TT-0.03.tar.gz; sha256 = "1asjr79wqcl9wk96afxrm1yhpj8lk9bk8kyz78yi5ypr0h55yq7p"; }; - buildInputs = [ TestUseOk TestException TestTableDriven ]; + buildInputs = [ Testuseok TestException TestTableDriven ]; propagatedBuildInputs = [ PadWalker SubExporter TemplateToolkit ]; meta = { description = "Use TT to interpolate lexical variables"; @@ -6505,6 +6516,28 @@ rec { doCheck = false; }; + TermVT102 = buildPerlPackage { + name = "Term-VT102-0.91"; + src = fetchurl { + url = mirror://cpan/authors/id/A/AJ/AJWOOD/Term-VT102-0.91.tar.gz; + sha256 = "f954e0310941d45c0fc3eb4a40f5d3a00d68119e277d303a1e6af11ded6fbd94"; + }; + meta = { + }; + }; + + TermVT102Boundless = buildPerlPackage { + name = "Term-VT102-Boundless-0.04"; + src = fetchurl { + url = mirror://cpan/authors/id/N/NU/NUFFIN/Term-VT102-Boundless-0.04.tar.gz; + sha256 = "5bb88b5aecb44ebf56d3ac7240be80cd26def9dcf1ebeb4e77d9983dfc7a8f19"; + }; + propagatedBuildInputs = [ TermVT102 Testuseok ]; + meta = { + license = "unknown"; + }; + }; + TestAssert = buildPerlPackage { name = "Test-Assert-0.0504"; src = fetchurl { @@ -6903,7 +6936,7 @@ rec { }; }; - TestUseOk = buildPerlPackage { + Testuseok = buildPerlPackage { name = "Test-use-ok-0.11"; src = fetchurl { url = mirror://cpan/authors/id/A/AU/AUDREYT/Test-use-ok-0.11.tar.gz; @@ -7226,7 +7259,7 @@ rec { url = mirror://cpan/authors/id/N/NU/NUFFIN/Tie-ToObject-0.03.tar.gz; sha256 = "1x1smn1kw383xc5h9wajxk9dlx92bgrbf7gk4abga57y6120s6m3"; }; - propagatedBuildInputs = [TestUseOk]; + propagatedBuildInputs = [Testuseok]; }; TimeDate = buildPerlPackage { From aa0ecfa5ac78c56c303352f1f93c8496296bf7b5 Mon Sep 17 00:00:00 2001 From: Zef Hemel Date: Thu, 25 Jul 2013 10:21:22 +0200 Subject: [PATCH 656/798] Added httrack, website copier tool --- pkgs/tools/backup/httrack/default.nix | 19 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/tools/backup/httrack/default.nix diff --git a/pkgs/tools/backup/httrack/default.nix b/pkgs/tools/backup/httrack/default.nix new file mode 100644 index 00000000000..ecdf40be0a5 --- /dev/null +++ b/pkgs/tools/backup/httrack/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, zlib, openssl }: + +stdenv.mkDerivation rec { + version = "3.47.21"; + name = "httrack-${version}"; + + src = fetchurl { + url = "http://mirror.httrack.com/httrack-${version}.tar.gz"; + sha256 = "1jqw0zx74jpi0svivvqhja3ixcrfkh9sbi9fwfw83jga27bc1sp0"; + }; + + buildInputs = [ zlib openssl ]; + + meta = { + homepage = "http://www.httrack.com"; + description = "HTTrack is a free (GPL, libre/free software) and easy-to-use offline browser utility."; + license = "GPL"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 25af46702ed..239ece82111 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9869,4 +9869,6 @@ let dart = callPackage ../development/interpreters/dart { }; + httrack = callPackage ../tools/backup/httrack { }; + }; in pkgs From 2accfa17d31ac92fa561218f2a15db1d38926ce8 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Thu, 25 Jul 2013 10:53:18 +0200 Subject: [PATCH 657/798] Updated nodejs packages --- pkgs/top-level/node-packages-generated.nix | 374 +++++++++++++-------- 1 file changed, 228 insertions(+), 146 deletions(-) diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix index 564dff15ad7..f8238b52a65 100644 --- a/pkgs/top-level/node-packages-generated.nix +++ b/pkgs/top-level/node-packages-generated.nix @@ -237,31 +237,42 @@ sha1 = "df63060fbf3d33286a76aaf6d55a2986d9ff8619"; tarball = "http://registry.npmjs.org/async/-/async-0.2.9.tgz"; } + { + name = "async"; + spec = "~0.2.9"; + version = "0.2.9"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "df63060fbf3d33286a76aaf6d55a2986d9ff8619"; + tarball = "http://registry.npmjs.org/async/-/async-0.2.9.tgz"; + } { name = "aws-sdk"; spec = "*"; - version = "1.4.0"; + version = "1.4.1"; topLevel = true; dependencies = [ { name = "xml2js"; spec = "0.2.4"; } { name = "xmlbuilder"; spec = "*"; } ]; patchLatest = true; - sha1 = "57a3291994d2b2b484ebd39e1ecb216a05c1c60e"; - tarball = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-1.4.0.tgz"; + sha1 = "e429d77c09f94aa2e295b7e83678d818ae5621e9"; + tarball = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-1.4.1.tgz"; } { name = "aws-sdk"; spec = ">=1.2.0 <2"; - version = "1.4.0"; + version = "1.4.1"; topLevel = false; dependencies = [ { name = "xml2js"; spec = "0.2.4"; } { name = "xmlbuilder"; spec = "*"; } ]; patchLatest = true; - sha1 = "57a3291994d2b2b484ebd39e1ecb216a05c1c60e"; - tarball = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-1.4.0.tgz"; + sha1 = "e429d77c09f94aa2e295b7e83678d818ae5621e9"; + tarball = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-1.4.1.tgz"; } { name = "aws-sign"; @@ -356,14 +367,26 @@ { name = "block-stream"; spec = "*"; - version = "0.0.6"; + version = "0.0.7"; topLevel = false; dependencies = [ - { name = "inherits"; spec = "~1.0.0"; } + { name = "inherits"; spec = "~2.0.0"; } ]; patchLatest = false; - sha1 = "f7027aea2ecc357153fa3bad6caeaf25f391aa4f"; - tarball = "http://registry.npmjs.org/block-stream/-/block-stream-0.0.6.tgz"; + sha1 = "9088ab5ae1e861f4d81b176b4a8046080703deed"; + tarball = "http://registry.npmjs.org/block-stream/-/block-stream-0.0.7.tgz"; + } + { + name = "block-stream"; + spec = "0.0.7"; + version = "0.0.7"; + topLevel = false; + dependencies = [ + { name = "inherits"; spec = "~2.0.0"; } + ]; + patchLatest = false; + sha1 = "9088ab5ae1e861f4d81b176b4a8046080703deed"; + tarball = "http://registry.npmjs.org/block-stream/-/block-stream-0.0.7.tgz"; } { name = "boom"; @@ -677,16 +700,16 @@ } { name = "cmd-shim"; - spec = "~1.1.0"; - version = "1.1.0"; + spec = "~1.0.1"; + version = "1.0.1"; topLevel = false; dependencies = [ { name = "mkdirp"; spec = "~0.3.3"; } - { name = "graceful-fs"; spec = "1.2"; } + { name = "graceful-fs"; spec = "2"; } ]; patchLatest = false; - sha1 = "e69fe26e9a8b9040c7b61dc8ad6b04d7dbabe767"; - tarball = "http://registry.npmjs.org/cmd-shim/-/cmd-shim-1.1.0.tgz"; + sha1 = "75e917c2185240854718c686346770640083d7bc"; + tarball = "http://registry.npmjs.org/cmd-shim/-/cmd-shim-1.0.1.tgz"; } { name = "coffee-script"; @@ -1733,6 +1756,20 @@ sha1 = "db345a5378d86aeeb1ed5d553b869ac192d2f5ed"; tarball = "http://registry.npmjs.org/form-data/-/form-data-0.0.10.tgz"; } + { + name = "form-data"; + spec = "~0.1.0"; + version = "0.1.0"; + topLevel = false; + dependencies = [ + { name = "combined-stream"; spec = "~0.0.4"; } + { name = "mime"; spec = "~1.2.9"; } + { name = "async"; spec = "~0.2.9"; } + ]; + patchLatest = false; + sha1 = "d36b59baf9b292bb2e5034d7a6079b2bd1e9df83"; + tarball = "http://registry.npmjs.org/form-data/-/form-data-0.1.0.tgz"; + } { name = "formidable"; spec = "1.0.11"; @@ -1791,62 +1828,62 @@ { name = "fstream"; spec = "0"; - version = "0.1.23"; + version = "0.1.24"; topLevel = false; dependencies = [ { name = "rimraf"; spec = "2"; } { name = "mkdirp"; spec = "0.3"; } { name = "graceful-fs"; spec = "~2.0.0"; } - { name = "inherits"; spec = "~1.0.0"; } + { name = "inherits"; spec = "~2.0.0"; } ]; patchLatest = false; - sha1 = "e1ac8d0945a7f27789e71f00a6d86575d14fc4ec"; - tarball = "http://registry.npmjs.org/fstream/-/fstream-0.1.23.tgz"; + sha1 = "267fe9d034f46bc99f824789d38b987ad01be884"; + tarball = "http://registry.npmjs.org/fstream/-/fstream-0.1.24.tgz"; } { name = "fstream"; spec = "~0.1.17"; - version = "0.1.23"; + version = "0.1.24"; topLevel = false; dependencies = [ { name = "rimraf"; spec = "2"; } { name = "mkdirp"; spec = "0.3"; } { name = "graceful-fs"; spec = "~2.0.0"; } - { name = "inherits"; spec = "~1.0.0"; } + { name = "inherits"; spec = "~2.0.0"; } ]; patchLatest = false; - sha1 = "e1ac8d0945a7f27789e71f00a6d86575d14fc4ec"; - tarball = "http://registry.npmjs.org/fstream/-/fstream-0.1.23.tgz"; + sha1 = "267fe9d034f46bc99f824789d38b987ad01be884"; + tarball = "http://registry.npmjs.org/fstream/-/fstream-0.1.24.tgz"; } { name = "fstream"; spec = "~0.1.23"; - version = "0.1.23"; + version = "0.1.24"; topLevel = false; dependencies = [ { name = "rimraf"; spec = "2"; } { name = "mkdirp"; spec = "0.3"; } { name = "graceful-fs"; spec = "~2.0.0"; } - { name = "inherits"; spec = "~1.0.0"; } + { name = "inherits"; spec = "~2.0.0"; } ]; patchLatest = false; - sha1 = "e1ac8d0945a7f27789e71f00a6d86575d14fc4ec"; - tarball = "http://registry.npmjs.org/fstream/-/fstream-0.1.23.tgz"; + sha1 = "267fe9d034f46bc99f824789d38b987ad01be884"; + tarball = "http://registry.npmjs.org/fstream/-/fstream-0.1.24.tgz"; } { name = "fstream"; spec = "~0.1.8"; - version = "0.1.23"; + version = "0.1.24"; topLevel = false; dependencies = [ { name = "rimraf"; spec = "2"; } { name = "mkdirp"; spec = "0.3"; } { name = "graceful-fs"; spec = "~2.0.0"; } - { name = "inherits"; spec = "~1.0.0"; } + { name = "inherits"; spec = "~2.0.0"; } ]; patchLatest = false; - sha1 = "e1ac8d0945a7f27789e71f00a6d86575d14fc4ec"; - tarball = "http://registry.npmjs.org/fstream/-/fstream-0.1.23.tgz"; + sha1 = "267fe9d034f46bc99f824789d38b987ad01be884"; + tarball = "http://registry.npmjs.org/fstream/-/fstream-0.1.24.tgz"; } { name = "fstream-ignore"; @@ -1889,16 +1926,15 @@ { name = "glob"; spec = "3"; - version = "3.2.3"; + version = "3.2.6"; topLevel = false; dependencies = [ { name = "minimatch"; spec = "~0.2.11"; } - { name = "graceful-fs"; spec = "~2.0.0"; } { name = "inherits"; spec = "2"; } ]; patchLatest = false; - sha1 = "e313eeb249c7affaa5c475286b0e115b59839467"; - tarball = "http://registry.npmjs.org/glob/-/glob-3.2.3.tgz"; + sha1 = "28c805b47bc6c19ba3059cbdf079b98ff62442f2"; + tarball = "http://registry.npmjs.org/glob/-/glob-3.2.6.tgz"; } { name = "glob"; @@ -1917,55 +1953,41 @@ { name = "glob"; spec = ">= 3.1.4"; - version = "3.2.3"; + version = "3.2.6"; topLevel = false; dependencies = [ { name = "minimatch"; spec = "~0.2.11"; } - { name = "graceful-fs"; spec = "~2.0.0"; } { name = "inherits"; spec = "2"; } ]; patchLatest = false; - sha1 = "e313eeb249c7affaa5c475286b0e115b59839467"; - tarball = "http://registry.npmjs.org/glob/-/glob-3.2.3.tgz"; + sha1 = "28c805b47bc6c19ba3059cbdf079b98ff62442f2"; + tarball = "http://registry.npmjs.org/glob/-/glob-3.2.6.tgz"; } { name = "glob"; spec = "~3.2.1"; - version = "3.2.3"; + version = "3.2.6"; topLevel = false; dependencies = [ { name = "minimatch"; spec = "~0.2.11"; } - { name = "graceful-fs"; spec = "~2.0.0"; } { name = "inherits"; spec = "2"; } ]; patchLatest = false; - sha1 = "e313eeb249c7affaa5c475286b0e115b59839467"; - tarball = "http://registry.npmjs.org/glob/-/glob-3.2.3.tgz"; + sha1 = "28c805b47bc6c19ba3059cbdf079b98ff62442f2"; + tarball = "http://registry.npmjs.org/glob/-/glob-3.2.6.tgz"; } { name = "glob"; spec = "~3.2.3"; - version = "3.2.3"; + version = "3.2.6"; topLevel = false; dependencies = [ { name = "minimatch"; spec = "~0.2.11"; } - { name = "graceful-fs"; spec = "~2.0.0"; } { name = "inherits"; spec = "2"; } ]; patchLatest = false; - sha1 = "e313eeb249c7affaa5c475286b0e115b59839467"; - tarball = "http://registry.npmjs.org/glob/-/glob-3.2.3.tgz"; - } - { - name = "graceful-fs"; - spec = "1.2"; - version = "1.2.3"; - topLevel = false; - dependencies = [ - ]; - patchLatest = false; - sha1 = "15a4806a57547cb2d2dbf27f42e89a8c3451b364"; - tarball = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz"; + sha1 = "28c805b47bc6c19ba3059cbdf079b98ff62442f2"; + tarball = "http://registry.npmjs.org/glob/-/glob-3.2.6.tgz"; } { name = "graceful-fs"; @@ -2113,6 +2135,21 @@ sha1 = "3617958821f58311e4d7f6de291fca662b412ef4"; tarball = "http://registry.npmjs.org/hawk/-/hawk-0.13.1.tgz"; } + { + name = "hawk"; + spec = "~1.0.0"; + version = "1.0.0"; + topLevel = false; + dependencies = [ + { name = "hoek"; spec = "0.9.x"; } + { name = "boom"; spec = "0.4.x"; } + { name = "cryptiles"; spec = "0.2.x"; } + { name = "sntp"; spec = "0.2.x"; } + ]; + patchLatest = false; + sha1 = "b90bb169807285411da7ffcb8dd2598502d3b52d"; + tarball = "http://registry.npmjs.org/hawk/-/hawk-1.0.0.tgz"; + } { name = "hiredis"; spec = "*"; @@ -2338,6 +2375,17 @@ sha1 = "38e1975285bf1f7ba9c84da102bb12771322ac48"; tarball = "http://registry.npmjs.org/inherits/-/inherits-1.0.0.tgz"; } + { + name = "inherits"; + spec = "~2.0.0"; + version = "2.0.0"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "76c81b3b1c10ddee3a60bf2c247162bc369f8ba8"; + tarball = "http://registry.npmjs.org/inherits/-/inherits-2.0.0.tgz"; + } { name = "ini"; spec = "1"; @@ -2461,13 +2509,14 @@ { name = "jayschema"; spec = "*"; - version = "0.1.5"; + version = "0.2.0"; topLevel = true; dependencies = [ + { name = "when"; spec = "~2.2.1"; } ]; patchLatest = false; - sha1 = "348a83baaec3b5fb9901c7efe7e64cdd1a8f46e2"; - tarball = "http://registry.npmjs.org/jayschema/-/jayschema-0.1.5.tgz"; + sha1 = "ab250dd51224ef36ac8119ce143e0525300d99d4"; + tarball = "http://registry.npmjs.org/jayschema/-/jayschema-0.2.0.tgz"; } { name = "js-yaml"; @@ -2542,6 +2591,17 @@ sha1 = "77c271aaea54302e68efeaccb56abbf06a9b1a54"; tarball = "http://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-4.0.0.tgz"; } + { + name = "json-stringify-safe"; + spec = "~5.0.0"; + version = "5.0.0"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "156515f55e62ed4cd912ec13bfc79d5013dfd1e7"; + tarball = "http://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz"; + } { name = "jsontool"; spec = "*"; @@ -3366,14 +3426,14 @@ { name = "nijs"; spec = "*"; - version = "0.0.9"; + version = "0.0.10"; topLevel = true; dependencies = [ { name = "optparse"; spec = ">= 1.0.3"; } ]; patchLatest = false; - sha1 = "26f0165431664b3518c2576f78397f27054e03aa"; - tarball = "http://registry.npmjs.org/nijs/-/nijs-0.0.9.tgz"; + sha1 = "79d09c5c9a2f1f3e96708c9dc6b4547b89cf8177"; + tarball = "http://registry.npmjs.org/nijs/-/nijs-0.0.10.tgz"; } { name = "node-expat"; @@ -3589,7 +3649,7 @@ } { name = "nopt"; - spec = "~2.1.1"; + spec = "~2.1.2"; version = "2.1.2"; topLevel = false; dependencies = [ @@ -3602,20 +3662,20 @@ { name = "normalize-package-data"; spec = "~0.2"; - version = "0.2.0"; + version = "0.2.1"; topLevel = false; dependencies = [ { name = "semver"; spec = "2"; } { name = "github-url-from-git"; spec = "~1.1.1"; } ]; patchLatest = false; - sha1 = "b9349e2db3242912e6ab3d180823309b63a74a92"; - tarball = "http://registry.npmjs.org/normalize-package-data/-/normalize-package-data-0.2.0.tgz"; + sha1 = "6c13a4b7ab1bca0323265418d354666da2e5ad43"; + tarball = "http://registry.npmjs.org/normalize-package-data/-/normalize-package-data-0.2.1.tgz"; } { name = "npm"; spec = "*"; - version = "1.3.4"; + version = "1.3.5"; topLevel = true; dependencies = [ { name = "semver"; spec = "~2.0.8"; } @@ -3624,14 +3684,13 @@ { name = "abbrev"; spec = "~1.0.4"; } { name = "graceful-fs"; spec = "~2.0.0"; } { name = "minimatch"; spec = "~0.2.12"; } - { name = "nopt"; spec = "~2.1.1"; } + { name = "nopt"; spec = "~2.1.2"; } { name = "rimraf"; spec = "~2.2.0"; } { name = "request"; spec = "~2.21.0"; } { name = "which"; spec = "1"; } - { name = "tar"; spec = "~0.1.17"; } + { name = "tar"; spec = "~0.1.18"; } { name = "fstream"; spec = "~0.1.23"; } - { name = "block-stream"; spec = "*"; } - { name = "inherits"; spec = "1"; } + { name = "block-stream"; spec = "0.0.7"; } { name = "mkdirp"; spec = "~0.3.3"; } { name = "read"; spec = "~1.0.4"; } { name = "lru-cache"; spec = "~2.3.0"; } @@ -3651,18 +3710,18 @@ { name = "lockfile"; spec = "~0.4.0"; } { name = "retry"; spec = "~0.6.0"; } { name = "once"; spec = "~1.1.1"; } - { name = "npmconf"; spec = "~0.1.1"; } + { name = "npmconf"; spec = "~0.1.2"; } { name = "opener"; spec = "~1.3.0"; } { name = "chmodr"; spec = "~0.1.0"; } - { name = "cmd-shim"; spec = "~1.1.0"; } - { name = "sha"; spec = "~1.0.1"; } + { name = "cmd-shim"; spec = "~1.0.1"; } + { name = "sha"; spec = "~1.2.1"; } { name = "editor"; spec = "0.0.4"; } { name = "child-process-close"; spec = "~0.1.1"; } { name = "npm-user-validate"; spec = "0.0.3"; } ]; patchLatest = false; - sha1 = "1dacc91458f2197c362d774d2cbf111680f86ec2"; - tarball = "http://registry.npmjs.org/npm/-/npm-1.3.4.tgz"; + sha1 = "05d6c4d01d2bc3f1adf15948adf2f7110553f471"; + tarball = "http://registry.npmjs.org/npm/-/npm-1.3.5.tgz"; } { name = "npm-registry-client"; @@ -3754,12 +3813,12 @@ } { name = "npmconf"; - spec = "~0.1.1"; - version = "0.1.1"; + spec = "~0.1.2"; + version = "0.1.2"; topLevel = false; dependencies = [ { name = "config-chain"; spec = "~1.1.1"; } - { name = "inherits"; spec = "~1.0.0"; } + { name = "inherits"; spec = "~2.0.0"; } { name = "once"; spec = "~1.1.1"; } { name = "mkdirp"; spec = "~0.3.3"; } { name = "osenv"; spec = "0.0.3"; } @@ -3768,8 +3827,8 @@ { name = "ini"; spec = "~1.1.0"; } ]; patchLatest = false; - sha1 = "7a254182591ca22d77b2faecc0d17e0f9bdf25a1"; - tarball = "http://registry.npmjs.org/npmconf/-/npmconf-0.1.1.tgz"; + sha1 = "99af8122f0067802436a5b71dbf8c3539697e62c"; + tarball = "http://registry.npmjs.org/npmconf/-/npmconf-0.1.2.tgz"; } { name = "npmlog"; @@ -4438,6 +4497,17 @@ sha1 = "5d679b34ddf53ac3bc232aeb421f6b6857f925e5"; tarball = "http://registry.npmjs.org/read-package-json/-/read-package-json-1.1.1.tgz"; } + { + name = "readable-stream"; + spec = "1.0"; + version = "1.0.2"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "213ce36864fc1f0d4e98e03b9eb92c64042299d4"; + tarball = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.2.tgz"; + } { name = "readable-stream"; spec = "~1.0.2"; @@ -4533,71 +4603,71 @@ { name = "request"; spec = "2"; - version = "2.23.0"; + version = "2.25.0"; topLevel = false; dependencies = [ { name = "qs"; spec = "~0.6.0"; } - { name = "json-stringify-safe"; spec = "~4.0.0"; } + { name = "json-stringify-safe"; spec = "~5.0.0"; } { name = "forever-agent"; spec = "~0.5.0"; } { name = "tunnel-agent"; spec = "~0.3.0"; } { name = "http-signature"; spec = "~0.10.0"; } - { name = "hawk"; spec = "~0.13.0"; } + { name = "hawk"; spec = "~1.0.0"; } { name = "aws-sign"; spec = "~0.3.0"; } { name = "oauth-sign"; spec = "~0.3.0"; } { name = "cookie-jar"; spec = "~0.3.0"; } { name = "node-uuid"; spec = "~1.4.0"; } { name = "mime"; spec = "~1.2.9"; } - { name = "form-data"; spec = "0.0.8"; } + { name = "form-data"; spec = "~0.1.0"; } ]; patchLatest = false; - sha1 = "121742874bf40b3c149fe113b7a35847597fc885"; - tarball = "http://registry.npmjs.org/request/-/request-2.23.0.tgz"; + sha1 = "dac1673181887fe0b2ce6bd7e12f46d554a02ce9"; + tarball = "http://registry.npmjs.org/request/-/request-2.25.0.tgz"; } { name = "request"; spec = "2 >=2.14"; - version = "2.23.0"; + version = "2.25.0"; topLevel = false; dependencies = [ { name = "qs"; spec = "~0.6.0"; } - { name = "json-stringify-safe"; spec = "~4.0.0"; } + { name = "json-stringify-safe"; spec = "~5.0.0"; } { name = "forever-agent"; spec = "~0.5.0"; } { name = "tunnel-agent"; spec = "~0.3.0"; } { name = "http-signature"; spec = "~0.10.0"; } - { name = "hawk"; spec = "~0.13.0"; } + { name = "hawk"; spec = "~1.0.0"; } { name = "aws-sign"; spec = "~0.3.0"; } { name = "oauth-sign"; spec = "~0.3.0"; } { name = "cookie-jar"; spec = "~0.3.0"; } { name = "node-uuid"; spec = "~1.4.0"; } { name = "mime"; spec = "~1.2.9"; } - { name = "form-data"; spec = "0.0.8"; } + { name = "form-data"; spec = "~0.1.0"; } ]; patchLatest = false; - sha1 = "121742874bf40b3c149fe113b7a35847597fc885"; - tarball = "http://registry.npmjs.org/request/-/request-2.23.0.tgz"; + sha1 = "dac1673181887fe0b2ce6bd7e12f46d554a02ce9"; + tarball = "http://registry.npmjs.org/request/-/request-2.25.0.tgz"; } { name = "request"; spec = "2 >=2.20.0"; - version = "2.23.0"; + version = "2.25.0"; topLevel = false; dependencies = [ { name = "qs"; spec = "~0.6.0"; } - { name = "json-stringify-safe"; spec = "~4.0.0"; } + { name = "json-stringify-safe"; spec = "~5.0.0"; } { name = "forever-agent"; spec = "~0.5.0"; } { name = "tunnel-agent"; spec = "~0.3.0"; } { name = "http-signature"; spec = "~0.10.0"; } - { name = "hawk"; spec = "~0.13.0"; } + { name = "hawk"; spec = "~1.0.0"; } { name = "aws-sign"; spec = "~0.3.0"; } { name = "oauth-sign"; spec = "~0.3.0"; } { name = "cookie-jar"; spec = "~0.3.0"; } { name = "node-uuid"; spec = "~1.4.0"; } { name = "mime"; spec = "~1.2.9"; } - { name = "form-data"; spec = "0.0.8"; } + { name = "form-data"; spec = "~0.1.0"; } ]; patchLatest = false; - sha1 = "121742874bf40b3c149fe113b7a35847597fc885"; - tarball = "http://registry.npmjs.org/request/-/request-2.23.0.tgz"; + sha1 = "dac1673181887fe0b2ce6bd7e12f46d554a02ce9"; + tarball = "http://registry.npmjs.org/request/-/request-2.25.0.tgz"; } { name = "request"; @@ -4635,25 +4705,25 @@ { name = "request"; spec = "~2"; - version = "2.23.0"; + version = "2.25.0"; topLevel = false; dependencies = [ { name = "qs"; spec = "~0.6.0"; } - { name = "json-stringify-safe"; spec = "~4.0.0"; } + { name = "json-stringify-safe"; spec = "~5.0.0"; } { name = "forever-agent"; spec = "~0.5.0"; } { name = "tunnel-agent"; spec = "~0.3.0"; } { name = "http-signature"; spec = "~0.10.0"; } - { name = "hawk"; spec = "~0.13.0"; } + { name = "hawk"; spec = "~1.0.0"; } { name = "aws-sign"; spec = "~0.3.0"; } { name = "oauth-sign"; spec = "~0.3.0"; } { name = "cookie-jar"; spec = "~0.3.0"; } { name = "node-uuid"; spec = "~1.4.0"; } { name = "mime"; spec = "~1.2.9"; } - { name = "form-data"; spec = "0.0.8"; } + { name = "form-data"; spec = "~0.1.0"; } ]; patchLatest = false; - sha1 = "121742874bf40b3c149fe113b7a35847597fc885"; - tarball = "http://registry.npmjs.org/request/-/request-2.23.0.tgz"; + sha1 = "dac1673181887fe0b2ce6bd7e12f46d554a02ce9"; + tarball = "http://registry.npmjs.org/request/-/request-2.25.0.tgz"; } { name = "request"; @@ -4861,13 +4931,13 @@ { name = "semver"; spec = "*"; - version = "2.0.10"; + version = "2.0.11"; topLevel = true; dependencies = [ ]; patchLatest = false; - sha1 = "e3199263b1e9f1913dbc91efb4af559e8e4d3d31"; - tarball = "http://registry.npmjs.org/semver/-/semver-2.0.10.tgz"; + sha1 = "f51f07d03fa5af79beb537fc067a7e141786cced"; + tarball = "http://registry.npmjs.org/semver/-/semver-2.0.11.tgz"; } { name = "semver"; @@ -4894,68 +4964,68 @@ { name = "semver"; spec = "2"; - version = "2.0.10"; + version = "2.0.11"; topLevel = false; dependencies = [ ]; patchLatest = false; - sha1 = "e3199263b1e9f1913dbc91efb4af559e8e4d3d31"; - tarball = "http://registry.npmjs.org/semver/-/semver-2.0.10.tgz"; + sha1 = "f51f07d03fa5af79beb537fc067a7e141786cced"; + tarball = "http://registry.npmjs.org/semver/-/semver-2.0.11.tgz"; } { name = "semver"; spec = "2.x"; - version = "2.0.10"; + version = "2.0.11"; topLevel = false; dependencies = [ ]; patchLatest = false; - sha1 = "e3199263b1e9f1913dbc91efb4af559e8e4d3d31"; - tarball = "http://registry.npmjs.org/semver/-/semver-2.0.10.tgz"; + sha1 = "f51f07d03fa5af79beb537fc067a7e141786cced"; + tarball = "http://registry.npmjs.org/semver/-/semver-2.0.11.tgz"; } { name = "semver"; spec = ">=2.0.10 <3.0.0"; - version = "2.0.10"; + version = "2.0.11"; topLevel = false; dependencies = [ ]; patchLatest = false; - sha1 = "e3199263b1e9f1913dbc91efb4af559e8e4d3d31"; - tarball = "http://registry.npmjs.org/semver/-/semver-2.0.10.tgz"; + sha1 = "f51f07d03fa5af79beb537fc067a7e141786cced"; + tarball = "http://registry.npmjs.org/semver/-/semver-2.0.11.tgz"; } { name = "semver"; spec = "~2.0.5"; - version = "2.0.10"; + version = "2.0.11"; topLevel = false; dependencies = [ ]; patchLatest = false; - sha1 = "e3199263b1e9f1913dbc91efb4af559e8e4d3d31"; - tarball = "http://registry.npmjs.org/semver/-/semver-2.0.10.tgz"; + sha1 = "f51f07d03fa5af79beb537fc067a7e141786cced"; + tarball = "http://registry.npmjs.org/semver/-/semver-2.0.11.tgz"; } { name = "semver"; spec = "~2.0.7"; - version = "2.0.10"; + version = "2.0.11"; topLevel = false; dependencies = [ ]; patchLatest = false; - sha1 = "e3199263b1e9f1913dbc91efb4af559e8e4d3d31"; - tarball = "http://registry.npmjs.org/semver/-/semver-2.0.10.tgz"; + sha1 = "f51f07d03fa5af79beb537fc067a7e141786cced"; + tarball = "http://registry.npmjs.org/semver/-/semver-2.0.11.tgz"; } { name = "semver"; spec = "~2.0.8"; - version = "2.0.10"; + version = "2.0.11"; topLevel = false; dependencies = [ ]; patchLatest = false; - sha1 = "e3199263b1e9f1913dbc91efb4af559e8e4d3d31"; - tarball = "http://registry.npmjs.org/semver/-/semver-2.0.10.tgz"; + sha1 = "f51f07d03fa5af79beb537fc067a7e141786cced"; + tarball = "http://registry.npmjs.org/semver/-/semver-2.0.11.tgz"; } { name = "send"; @@ -5015,15 +5085,16 @@ } { name = "sha"; - spec = "~1.0.1"; - version = "1.0.1"; + spec = "~1.2.1"; + version = "1.2.1"; topLevel = false; dependencies = [ - { name = "graceful-fs"; spec = "1.2"; } + { name = "graceful-fs"; spec = "2"; } + { name = "readable-stream"; spec = "1.0"; } ]; patchLatest = false; - sha1 = "9b87a92113103e7406f7e7ef00006f3fa1975122"; - tarball = "http://registry.npmjs.org/sha/-/sha-1.0.1.tgz"; + sha1 = "30bd5f770852fa6ac2b110ab3698fd4840f7f1cd"; + tarball = "http://registry.npmjs.org/sha/-/sha-1.2.1.tgz"; } { name = "shelljs"; @@ -5427,30 +5498,30 @@ { name = "tar"; spec = "*"; - version = "0.1.17"; + version = "0.1.18"; topLevel = true; dependencies = [ - { name = "inherits"; spec = "1.x"; } + { name = "inherits"; spec = "2"; } { name = "block-stream"; spec = "*"; } { name = "fstream"; spec = "~0.1.8"; } ]; patchLatest = false; - sha1 = "408c8a95deb8e78a65b59b1a51a333183a32badc"; - tarball = "http://registry.npmjs.org/tar/-/tar-0.1.17.tgz"; + sha1 = "b76c3b23c5e90f9e3e344462f537047c695ba635"; + tarball = "http://registry.npmjs.org/tar/-/tar-0.1.18.tgz"; } { name = "tar"; spec = "0"; - version = "0.1.17"; + version = "0.1.18"; topLevel = false; dependencies = [ - { name = "inherits"; spec = "1.x"; } + { name = "inherits"; spec = "2"; } { name = "block-stream"; spec = "*"; } { name = "fstream"; spec = "~0.1.8"; } ]; patchLatest = false; - sha1 = "408c8a95deb8e78a65b59b1a51a333183a32badc"; - tarball = "http://registry.npmjs.org/tar/-/tar-0.1.17.tgz"; + sha1 = "b76c3b23c5e90f9e3e344462f537047c695ba635"; + tarball = "http://registry.npmjs.org/tar/-/tar-0.1.18.tgz"; } { name = "tar"; @@ -5468,17 +5539,17 @@ } { name = "tar"; - spec = "~0.1.17"; - version = "0.1.17"; + spec = "~0.1.18"; + version = "0.1.18"; topLevel = false; dependencies = [ - { name = "inherits"; spec = "1.x"; } + { name = "inherits"; spec = "2"; } { name = "block-stream"; spec = "*"; } { name = "fstream"; spec = "~0.1.8"; } ]; patchLatest = false; - sha1 = "408c8a95deb8e78a65b59b1a51a333183a32badc"; - tarball = "http://registry.npmjs.org/tar/-/tar-0.1.17.tgz"; + sha1 = "b76c3b23c5e90f9e3e344462f537047c695ba635"; + tarball = "http://registry.npmjs.org/tar/-/tar-0.1.18.tgz"; } { name = "temp"; @@ -5915,6 +5986,17 @@ sha1 = "998bc1855d8cd0d1e9aa8f8056b83b46ac3e81ef"; tarball = "http://registry.npmjs.org/websocket-driver/-/websocket-driver-0.2.2.tgz"; } + { + name = "when"; + spec = "~2.2.1"; + version = "2.2.1"; + topLevel = false; + dependencies = [ + ]; + patchLatest = false; + sha1 = "b1def994017350b8087f6e9a7596ab2833bdc712"; + tarball = "http://registry.npmjs.org/when/-/when-2.2.1.tgz"; + } { name = "which"; spec = "1"; From 9afc8bb1e08a83e6f1174ff72168a56ce6511aca Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Thu, 25 Jul 2013 11:35:51 +0200 Subject: [PATCH 658/798] Add colormake --- .../build-managers/colormake/default.nix | 20 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/development/tools/build-managers/colormake/default.nix diff --git a/pkgs/development/tools/build-managers/colormake/default.nix b/pkgs/development/tools/build-managers/colormake/default.nix new file mode 100644 index 00000000000..358390077bc --- /dev/null +++ b/pkgs/development/tools/build-managers/colormake/default.nix @@ -0,0 +1,20 @@ +{stdenv, fetchgit, perl}: + +stdenv.mkDerivation rec { + name = "colormake-${version}"; + version = "2.1.0"; + + buildInputs = [perl]; + + src = fetchgit { + url = https://github.com/pagekite/Colormake.git; + rev = "66544f40d"; + sha256 = "8e714c5540305d169989d9387dbac47b8b9fb2cfb424af7bcd412bfe684dc6d7"; + }; + + installPhase = '' + mkdir -p $out/bin + cp -fa colormake.pl colormake colormake-short clmake clmake-short $out/bin + ''; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 239ece82111..343b394ffe4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -615,6 +615,8 @@ let convertlit = callPackage ../tools/text/convertlit { }; + colormake = callPackage ../development/tools/build-managers/colormake { }; + cowsay = callPackage ../tools/misc/cowsay { }; cuetools = callPackage ../tools/cd-dvd/cuetools { }; From d568ff324a3b8144aeff30c7ed67c0eb52117725 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Thu, 25 Jul 2013 11:38:13 +0200 Subject: [PATCH 659/798] Add meta attribute to colormake. --- pkgs/development/tools/build-managers/colormake/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/build-managers/colormake/default.nix b/pkgs/development/tools/build-managers/colormake/default.nix index 358390077bc..9d62b4e187b 100644 --- a/pkgs/development/tools/build-managers/colormake/default.nix +++ b/pkgs/development/tools/build-managers/colormake/default.nix @@ -16,5 +16,9 @@ stdenv.mkDerivation rec { mkdir -p $out/bin cp -fa colormake.pl colormake colormake-short clmake clmake-short $out/bin ''; - + + meta = { + description = "A simple wrapper around make to colorize the output."; + license = "GPLv2"; + }; } From 7a6b6799d9583e61b93971e9f107085d4eb932a2 Mon Sep 17 00:00:00 2001 From: Domen Kozar Date: Thu, 25 Jul 2013 12:38:08 +0200 Subject: [PATCH 660/798] pypy: fix some tests, add install phase --- .../interpreters/pypy/2.0/default.nix | 62 +++++++++---------- 1 file changed, 28 insertions(+), 34 deletions(-) diff --git a/pkgs/development/interpreters/pypy/2.0/default.nix b/pkgs/development/interpreters/pypy/2.0/default.nix index 711c27fabf2..d903dab02c0 100644 --- a/pkgs/development/interpreters/pypy/2.0/default.nix +++ b/pkgs/development/interpreters/pypy/2.0/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2, pkgconfig, libffi -, sqlite, openssl, ncurses, pythonFull }: +, sqlite, openssl, ncurses, pythonFull, expat }: assert zlibSupport -> zlib != null; @@ -8,46 +8,24 @@ let majorVersion = "2.0"; version = "${majorVersion}.2"; - src = fetchurl { - url = "https://bitbucket.org/pypy/pypy/downloads/pypy-${version}-src.tar.bz2"; - sha256 = "0g2cajs6m3yf0lak5f18ccs6j77cf5xvbm4h6y5l1qlqdc6wk48r"; - }; - - #patches = - # [ # Look in C_INCLUDE_PATH and LIBRARY_PATH for stuff. - # ./search-path.patch - - # Python recompiles a Python if the mtime stored *in* the - # pyc/pyo file differs from the mtime of the source file. This - # doesn't work in Nix because Nix changes the mtime of files in - # the Nix store to 1. So treat that as a special case. - # ./nix-store-mtime.patch - - # patch python to put zero timestamp into pyc - # if DETERMINISTIC_BUILD env var is set - # ./deterministic-build.patch - # ]; - #''; - - install = '' - cd ./pypy/pypy/tool/release/ - ${pythonFull}/bin/python package.py ../../.. pypy-my-own-package-name - ''; - - buildInputs = - stdenv.lib.optional (stdenv ? gcc && stdenv.gcc.libc != null) stdenv.gcc.libc ++ - [ bzip2 openssl pkgconfig pythonFull libffi ncurses ] - ++ stdenv.lib.optional zlibSupport zlib; - pypy = stdenv.mkDerivation rec { name = "pypy-${version}"; - inherit majorVersion version src buildInputs; + inherit majorVersion version; + + src = fetchurl { + url = "https://bitbucket.org/pypy/pypy/downloads/pypy-${version}-src.tar.bz2"; + sha256 = "0g2cajs6m3yf0lak5f18ccs6j77cf5xvbm4h6y5l1qlqdc6wk48r"; + }; + + buildInputs = [ bzip2 openssl pkgconfig pythonFull libffi ncurses sqlite ] + ++ stdenv.lib.optional (stdenv ? gcc && stdenv.gcc.libc != null) stdenv.gcc.libc + ++ stdenv.lib.optional zlibSupport zlib; preConfigure = '' substituteInPlace Makefile \ --replace "-Ojit" "-Ojit --batch" \ - --replace "pypy/goal/targetpypystandalone.py" "pypy/goal/targetpypystandalone.py --withmod-_minimal_curses" + --replace "pypy/goal/targetpypystandalone.py" "pypy/goal/targetpypystandalone.py --withmod-_minimal_curses --withmod-unicodedata --withmod-thread --withmod-bz2" # we are using cpython and not pypy to do translation substituteInPlace rpython/bin/rpython \ @@ -67,6 +45,22 @@ let # --replace "return library_dirs" "return tuple(\"{expat}\", *library_dirs)" ''; + TERMINFO = "${ncurses}/share/terminfo/"; + + doCheck = true; + checkPhase = '' + export HOME="$TMPDIR" + ./pypy-c ./pypy/test_all.py --pypy=./pypy-c -k "not shutil" lib-python + ''; + + installPhase = '' + mkdir -p $out/bin + cp -R {include,lib_pypy,lib-python,pypy-c} $out/ + ln -s $out/pypy-c $out/bin/pypy + chmod +x $out/bin/pypy + # TODO: compile python files? + ''; + passthru = { inherit zlibSupport; libPrefix = "pypy${majorVersion}"; From 4c4f1ca3a53e62792de82dd7addcffc8a6792e2a Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Thu, 25 Jul 2013 12:42:36 +0200 Subject: [PATCH 661/798] python-plumbum-1.2.0 --- pkgs/top-level/python-packages.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3444045b147..1cd743e5122 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3473,6 +3473,17 @@ pythonPackages = python.modules // rec { }; }; + plumbum = buildPythonPackage rec { + name = "plumbum-1.2.0"; + + buildInputs = [ pythonPackages.six ]; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/plumbum/plumbum-1.2.0.tar.gz"; + md5 = "18b7f888dfaf62a48df937abffe07897"; + }; + }; + polib = buildPythonPackage rec { name = "polib-${version}"; From 7b4b03616ce72283547983316be375759d8fc26b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Thu, 25 Jul 2013 12:43:40 +0200 Subject: [PATCH 662/798] bmon: new package bmon is a ncurses network bandwidth monitor. Homepage: http://www.carisma.slowglass.com/~tgr/bmon/ --- pkgs/tools/misc/bmon/default.nix | 25 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/tools/misc/bmon/default.nix diff --git a/pkgs/tools/misc/bmon/default.nix b/pkgs/tools/misc/bmon/default.nix new file mode 100644 index 00000000000..29a6db4e6d2 --- /dev/null +++ b/pkgs/tools/misc/bmon/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, pkgconfig, ncurses, confuse, libnl }: + +stdenv.mkDerivation { + name = "bmon-3.1"; + + src = fetchurl { + url = http://www.carisma.slowglass.com/~tgr/bmon/files/bmon-3.1.tar.gz; + sha256 = "005ib7c3g3cva0rdwsgl6hfakxd5yp88sf4bjxb6iarcm3ax18ky"; + }; + + buildInputs = [ pkgconfig ncurses confuse libnl ]; + + meta = with stdenv.lib; { + description = "Network bandwidth monitor"; + homepage = http://www.carisma.slowglass.com/~tgr/bmon/; + # Neither the homepage nor the source archive has license info, but in the + # latest git version there is a LICENSE file that is the 2-clause BSD + # license. + # - https://github.com/tgraf/bmon/blob/master/LICENSE + # - http://opensource.org/licenses/BSD-2-Clause + license = licenses.bsd2; + platforms = platforms.linux; + maintainers = [ maintainers.bjornfor ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 343b394ffe4..6678b0abc23 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -503,6 +503,8 @@ let bfr = callPackage ../tools/misc/bfr { }; + bmon = callPackage ../tools/misc/bmon { }; + boomerang = callPackage ../development/tools/boomerang { }; bootchart = callPackage ../tools/system/bootchart { }; From 4e723ca53744ec2403f6b1a817e196d1f35e333b Mon Sep 17 00:00:00 2001 From: Russell O'Connor Date: Thu, 25 Jul 2013 06:49:25 -0400 Subject: [PATCH 663/798] Update tarsnap to version 1.0.35 --- pkgs/tools/backup/tarsnap/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/backup/tarsnap/default.nix b/pkgs/tools/backup/tarsnap/default.nix index 052b1416e07..ae432c6122a 100644 --- a/pkgs/tools/backup/tarsnap/default.nix +++ b/pkgs/tools/backup/tarsnap/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, openssl, zlib, e2fsprogs }: stdenv.mkDerivation { - name = "tarsnap-1.0.34"; + name = "tarsnap-1.0.35"; src = fetchurl { - url = "https://www.tarsnap.com/download/tarsnap-autoconf-1.0.34.tgz"; - sha256 = "049q0mbz9i4m87n1r78zf62mcxd04wm49rjqpiy5yzy4z8m1gh0l"; + url = "https://www.tarsnap.com/download/tarsnap-autoconf-1.0.35.tgz"; + sha256 = "16lc14rwrq84fz95j1g10vv0qki0qw73lzighidj5g23pib6g7vc"; }; buildInputs = [ openssl zlib e2fsprogs ]; From a8f11fcba5e296897388e1eb747749e4e7517ce7 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Thu, 25 Jul 2013 13:42:20 +0200 Subject: [PATCH 664/798] Update pypy build with sqlite and expat support. Fix the installPhase. --- .../development/interpreters/pypy/2.0/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/development/interpreters/pypy/2.0/default.nix b/pkgs/development/interpreters/pypy/2.0/default.nix index d903dab02c0..6be1b5a2b7d 100644 --- a/pkgs/development/interpreters/pypy/2.0/default.nix +++ b/pkgs/development/interpreters/pypy/2.0/default.nix @@ -18,10 +18,14 @@ let sha256 = "0g2cajs6m3yf0lak5f18ccs6j77cf5xvbm4h6y5l1qlqdc6wk48r"; }; - buildInputs = [ bzip2 openssl pkgconfig pythonFull libffi ncurses sqlite ] + buildInputs = [ bzip2 openssl pkgconfig pythonFull libffi ncurses expat sqlite ] ++ stdenv.lib.optional (stdenv ? gcc && stdenv.gcc.libc != null) stdenv.gcc.libc ++ stdenv.lib.optional zlibSupport zlib; + C_INCLUDE_PATH = stdenv.lib.concatStringsSep ":" (map (p: "${p}/include") buildInputs); + LIBRARY_PATH = stdenv.lib.concatStringsSep ":" (map (p: "${p}/lib") buildInputs); + LD_LIBRARY_PATH = LIBRARY_PATH; + preConfigure = '' substituteInPlace Makefile \ --replace "-Ojit" "-Ojit --batch" \ @@ -39,10 +43,6 @@ let --replace "ncurses/curses.h" "${ncurses}/include/curses.h" \ --replace "ncurses/term.h" "${ncurses}/include/term.h" \ --replace "libraries = ['curses']" "libraries = ['ncurses']" - - #substituteInPlace rpython/translator/platform/__init__.py \ - # --replace "return include_dirs" "return tuple(\"{expat}\", *include_dirs)" \ - # --replace "return library_dirs" "return tuple(\"{expat}\", *library_dirs)" ''; TERMINFO = "${ncurses}/share/terminfo/"; @@ -55,8 +55,9 @@ let installPhase = '' mkdir -p $out/bin - cp -R {include,lib_pypy,lib-python,pypy-c} $out/ - ln -s $out/pypy-c $out/bin/pypy + mkdir -p $out/pypy-c + cp -R {include,lib_pypy,lib-python,pypy-c} $out/pypy-c + ln -s $out/pypy-c/pypy-c $out/bin/pypy chmod +x $out/bin/pypy # TODO: compile python files? ''; From eb0b6f82414ee42fe93a363456271ee15486336f Mon Sep 17 00:00:00 2001 From: Domen Kozar Date: Thu, 25 Jul 2013 16:25:55 +0200 Subject: [PATCH 665/798] pypy: correctly skip tests --- pkgs/development/interpreters/pypy/2.0/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/pypy/2.0/default.nix b/pkgs/development/interpreters/pypy/2.0/default.nix index 6be1b5a2b7d..0f2a34336cf 100644 --- a/pkgs/development/interpreters/pypy/2.0/default.nix +++ b/pkgs/development/interpreters/pypy/2.0/default.nix @@ -50,7 +50,7 @@ let doCheck = true; checkPhase = '' export HOME="$TMPDIR" - ./pypy-c ./pypy/test_all.py --pypy=./pypy-c -k "not shutil" lib-python + ./pypy-c ./pypy/test_all.py --pypy=./pypy-c -m "not shutil" lib-python ''; installPhase = '' From b0a12396ef8c0b2b57abe64f2dd5ad35b8707a0d Mon Sep 17 00:00:00 2001 From: Domen Kozar Date: Thu, 25 Jul 2013 20:45:57 +0200 Subject: [PATCH 666/798] fix ignore param for tests --- pkgs/development/interpreters/pypy/2.0/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/pypy/2.0/default.nix b/pkgs/development/interpreters/pypy/2.0/default.nix index 0f2a34336cf..7522020582c 100644 --- a/pkgs/development/interpreters/pypy/2.0/default.nix +++ b/pkgs/development/interpreters/pypy/2.0/default.nix @@ -50,7 +50,7 @@ let doCheck = true; checkPhase = '' export HOME="$TMPDIR" - ./pypy-c ./pypy/test_all.py --pypy=./pypy-c -m "not shutil" lib-python + ./pypy-c ./pypy/test_all.py --pypy=./pypy-c --ignore lib-python/2.7/test/test_shutil.py lib-python ''; installPhase = '' From 6b495e9251edf626429d143f9fd209884926f44c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 25 Jul 2013 23:50:14 +0200 Subject: [PATCH 667/798] Add nixpkgs-lint This is a simple tool to scan Nixpkgs for violations of the packaging guidelines, such as multiple packages with the same name, packages that lack a description or license, and so on. To use: $ nix-env -i nixpkgs-lint $ cd .../nixpkgs $ nixpkgs-lint Current statistics: Number of packages: 8666 Number of missing maintainers: 3711 Number of missing licenses: 6159 Number of missing descriptions: 1337 Number of bad descriptions: 633 Number of name collisions: 277 --- maintainers/scripts/nixpkgs-lint.nix | 22 +++++ maintainers/scripts/nixpkgs-lint.pl | 115 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 139 insertions(+) create mode 100644 maintainers/scripts/nixpkgs-lint.nix create mode 100755 maintainers/scripts/nixpkgs-lint.pl diff --git a/maintainers/scripts/nixpkgs-lint.nix b/maintainers/scripts/nixpkgs-lint.nix new file mode 100644 index 00000000000..5eb7649d58d --- /dev/null +++ b/maintainers/scripts/nixpkgs-lint.nix @@ -0,0 +1,22 @@ +{ stdenv, makeWrapper, perl, perlPackages }: + +stdenv.mkDerivation { + name = "nixpkgs-lint-1"; + + buildInputs = [ makeWrapper perl perlPackages.XMLSimple ]; + + unpackPhase = "true"; + buildPhase = "true"; + + installPhase = + '' + mkdir -p $out/bin + cp ${./nixpkgs-lint.pl} $out/bin/nixpkgs-lint + wrapProgram $out/bin/nixpkgs-lint --set PERL5LIB $PERL5LIB + ''; + + meta = { + maintainers = [ stdenv.lib.maintainers.eelco ]; + description = "A utility for Nixpkgs contributors to check Nixpkgs for common errors"; + }; +} diff --git a/maintainers/scripts/nixpkgs-lint.pl b/maintainers/scripts/nixpkgs-lint.pl new file mode 100755 index 00000000000..0b1519ef15c --- /dev/null +++ b/maintainers/scripts/nixpkgs-lint.pl @@ -0,0 +1,115 @@ +#! /run/current-system/sw/bin/perl -w + +use strict; +use List::Util qw(min); +use XML::Simple qw(:strict); +use Data::Dumper; + +my $filter = "*"; + +my $xml = `nix-env -f . -qa '$filter' --xml --meta --drv-path`; + +my $info = XMLin($xml, KeyAttr => { 'item' => '+attrPath', 'meta' => 'name' }, ForceArray => 1, SuppressEmpty => '' ) or die "cannot parse XML output"; + +#print Dumper($info); + +my %pkgsByName; + +foreach my $attr (sort keys %{$info->{item}}) { + my $pkg = $info->{item}->{$attr}; + #print STDERR "attr = $attr, name = $pkg->{name}\n"; + $pkgsByName{$pkg->{name}} //= []; + push @{$pkgsByName{$pkg->{name}}}, $pkg; +} + +# Check meta information. +print "=== Package meta information ===\n\n"; +my $nrMissingMaintainers = 0; +my $nrMissingDescriptions = 0; +my $nrBadDescriptions = 0; +my $nrMissingLicenses = 0; + +foreach my $attr (sort keys %{$info->{item}}) { + my $pkg = $info->{item}->{$attr}; + + my $pkgName = $pkg->{name}; + $pkgName =~ s/-[0-9].*//; + + # Check the maintainers. + my @maintainers; + my $x = $pkg->{meta}->{maintainers}; + if (defined $x && $x->{type} eq "strings") { + @maintainers = map { $_->{value} } @{$x->{string}}; + } elsif (defined $x->{value}) { + @maintainers = ($x->{value}); + } + + if (scalar @maintainers == 0) { + print "$attr: Lacks a maintainer\n"; + $nrMissingMaintainers++; + } + + # Check the license. + if (!defined $pkg->{meta}->{license}) { + print "$attr: Lacks a license\n"; + $nrMissingLicenses++; + } + + # Check the description. + my $description = $pkg->{meta}->{description}->{value}; + if (!$description) { + print "$attr: Lacks a description\n"; + $nrMissingDescriptions++; + } else { + my $bad = 0; + if ($description =~ /^\s/) { + print "$attr: Description starts with whitespace\n"; + $bad = 1; + } + if ($description =~ /\s$/) { + print "$attr: Description ends with whitespace\n"; + $bad = 1; + } + if ($description =~ /\.$/) { + print "$attr: Description ends with a period\n"; + $bad = 1; + } + if (index(lc($description), lc($attr)) != -1) { + print "$attr: Description contains package name\n"; + $bad = 1; + } + $nrBadDescriptions++ if $bad; + } +} +print "\n"; + +# Find packages that have the same name. +print "=== Package name collisions ===\n\n"; + +my $nrCollisions = 0; +foreach my $name (sort keys %pkgsByName) { + my @pkgs = @{$pkgsByName{$name}}; + + # Filter attributes that are aliases of each other (e.g. yield the + # same derivation path). + my %drvsSeen; + @pkgs = grep { my $x = $drvsSeen{$_->{drvPath}}; $drvsSeen{$_->{drvPath}} = 1; !defined $x } @pkgs; + + # Filter packages that have a lower priority. + my $highest = min (map { $_->{priority} // 0 } @pkgs); + @pkgs = grep { ($_->{priority} // 0) == $highest } @pkgs; + + next if scalar @pkgs == 1; + + $nrCollisions++; + print "The following attributes evaluate to a package named ‘$name’:\n"; + print " ", join(", ", map { $_->{attrPath} } @pkgs), "\n\n"; +} + +print "=== Bottom line ===\n"; +print "Number of packages: ", scalar(keys %{$info->{item}}), "\n"; +print "Number of missing maintainers: $nrMissingMaintainers\n"; +print "Number of missing licenses: $nrMissingLicenses\n"; +print "Number of missing descriptions: $nrMissingDescriptions\n"; +print "Number of bad descriptions: $nrBadDescriptions\n"; +print "Number of name collisions: $nrCollisions\n"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bffffad649d..300c4bc23fe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -206,6 +206,8 @@ let nix-generate-from-cpan = callPackage ../../maintainers/scripts/nix-generate-from-cpan.nix { }; + nixpkgs-lint = callPackage ../../maintainers/scripts/nixpkgs-lint.nix { }; + ### STANDARD ENVIRONMENT From 1d0e666eed79af32ca77999232cac27b0abf7a69 Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 25 Jul 2013 17:38:10 +0200 Subject: [PATCH 668/798] python-hetzner: Update to new version 0.5.0. This introduces the following changes: - New subcommand "show" for hetznerctl which shows additional information about one or more servers. - Allow to get subnets of a specific server through the "subnets" attribute. - Allow te get IP addresses of a specific server through the "ips" attribute. Signed-off-by: aszlig --- 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 1cd743e5122..d08eaa23da5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2148,12 +2148,12 @@ pythonPackages = python.modules // rec { hetzner = buildPythonPackage rec { name = "hetzner-${version}"; - version = "0.4.1"; + version = "0.5.0"; src = fetchurl { url = "https://github.com/RedMoonStudios/hetzner/archive/" + "v${version}.tar.gz"; - sha256 = "1x48r3n818iyzyb0a5jpcrq1rgdrpj3549kcv76wgpw4f7hi0b76"; + sha256 = "0i8b2nx4mf87qn4zz7kz321cl1bxlvjdwm7yh8md5hrhqbya4jw5"; }; # not there yet, but coming soon. From 311c96ac0fd86762c68c5080dbb833cce2c239fb Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 26 Jul 2013 01:32:31 +0200 Subject: [PATCH 669/798] hetzner-nixops-installer: Remove package. This package now is in NixOps directly, so we don't need it here anymore. Signed-off-by: aszlig --- .../misc/hetzner-nixops-installer/default.nix | 108 ------------------ pkgs/top-level/all-packages.nix | 3 - 2 files changed, 111 deletions(-) delete mode 100644 pkgs/tools/misc/hetzner-nixops-installer/default.nix diff --git a/pkgs/tools/misc/hetzner-nixops-installer/default.nix b/pkgs/tools/misc/hetzner-nixops-installer/default.nix deleted file mode 100644 index 772f679b957..00000000000 --- a/pkgs/tools/misc/hetzner-nixops-installer/default.nix +++ /dev/null @@ -1,108 +0,0 @@ -{ stdenv, perl, gnutar, pathsFromGraph, nix, pythonPackages }: - -let - nixpart = pythonPackages.nixpart.override { - useNixUdev = false; - udevSoMajor = 0; - }; - - base = stdenv.mkDerivation { - name = "hetzner-nixops-base"; - - buildCommand = '' - ensureDir "$out/bin" - ln -s "${nix}"/bin/* "$out/bin/" - ln -s "${stdenv.shell}" "$out/bin/sh" - ''; - }; -in stdenv.mkDerivation { - name = "hetzner-nixops-installer"; - - exportReferencesGraph = [ - "refs-base" base - "refs-nixpart" nixpart - ]; - - buildCommand = '' - ensureDir "usr/bin" - - # Create the chroot wrappers for Nix - for path in "${nix}"/bin/*; do - base="$(basename "$path")" - wrapper="usr/bin/$base" - echo "#!/bin/sh" > "$wrapper" - echo "chroot /mnt \"$path\" \$@" >> "$wrapper" - chmod +x "$wrapper" - done - - # Only a symlink that is goint to be put into the Tar file. - ln -ns "${nixpart}/bin/nixpart" usr/bin/nixpart - - base_storepaths="$("${perl}/bin/perl" "${pathsFromGraph}" refs-base)" - base_registration="$(printRegistration=1 \ - "${perl}/bin/perl" "${pathsFromGraph}" refs-base)" - - ( # Don't use stdenv.shell here, we're NOT on NixOS! - echo "#!/bin/sh" - # Do not quote because we want to inline the paths! - echo 'mkdir -m 1777 -p "/mnt/nix/store"' - echo "cp -a" $base_storepaths "/mnt/nix/store/" - echo "chroot /mnt \"${base}/bin/nix-store\" --load-db <<'REGINFO'" - echo "$base_registration" - echo "REGINFO" - echo 'ln -sn "${stdenv.shell}" /mnt/bin/sh' - ) > "usr/bin/activate-remote" - chmod +x "usr/bin/activate-remote" - - full_storepaths="$("${perl}/bin/perl" "${pathsFromGraph}" refs-*)" - stripped_full_storepaths="$(echo "$full_storepaths" | sed 's|/*||')" - - # Reset timestamps to those of 'nix-store' to prevent annoying warnings. - find usr -exec touch -h -r "${nix}/bin/nix-store" {} + - - ( echo "#!${stdenv.shell}" - echo 'tarfile="$(mktemp)"' - echo 'trap "rm -f $tarfile" EXIT' - echo "lnum=\"\$(grep -m1 -an '^EXISTING_TAR${"\$"}' \"$out\")\"" - echo 'tail -n +$((''${lnum%%:*} + 1)) "'"$out"'" > "$tarfile"' - # As before, don't quote here! - echo '${gnutar}/bin/tar rf "$tarfile" -C /' $stripped_full_storepaths - echo 'cat "$tarfile"' - echo "exit 0" - echo EXISTING_TAR - tar c usr - ) > "$out" - chmod +x "$out" - ''; - - meta = { - description = "Basic Nix bootstrap installer for NixOps"; - longDescription = '' - It works like this: - - Preapare a base image with reference graph, which is to be copied over to - the mount point and contains wrappers for the system outside the mount - point. Those wrappers basically just chroot into the mountpoint path and - execute the corresponding counterparts over there. The base derivation - itself only contains everything necessary in order to get a Nix - bootstrapped, like Nix itself and a shell linked to /mnt/bin/sh. - - From outside the mountpoint, we just provide a small derivation which - contains a partitioner, an activate-remote and a script which is the - output of this derivation. In detail: - - $out: Creates a tarball of of the full closure of the base derivation and - its reference information, the partitioner and activate-remote. The - script outputs the tarball on stdout, so it's easy for NixOps to - pipe it to the remote system. - - activate-remote: Copies the base derivation into /mnt and registers it - with the Nix database. Afterwards, it creates the - mentioned chroot wrappers and puts them into /usr/bin - (remember, we're on a non-NixOS system here), together - with the partitioner. - ''; - platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.aszlig ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 300c4bc23fe..49b38074f35 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7749,9 +7749,6 @@ let hexedit = callPackage ../applications/editors/hexedit { }; - hetznerNixOpsInstaller = - callPackage ../tools/misc/hetzner-nixops-installer { }; - hipchat = callPackage_i686 ../applications/networking/instant-messengers/hipchat { }; homebank = callPackage ../applications/office/homebank { }; From 120e3fc16794b39482b4d88eaeabbd4d57837a58 Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 26 Jul 2013 06:14:07 +0200 Subject: [PATCH 670/798] chromium: Update beta and dev release channels. Introduces the following new versions: beta: 29.0.1547.22 -> 29.0.1547.32 (builds fine, tested) dev: 30.0.1568.0 -> 30.0.1573.2 (builds fine, tested) Signed-off-by: aszlig --- .../networking/browsers/chromium/sources.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/sources.nix b/pkgs/applications/networking/browsers/chromium/sources.nix index 47840ac3ebb..31d9ed10b4c 100644 --- a/pkgs/applications/networking/browsers/chromium/sources.nix +++ b/pkgs/applications/networking/browsers/chromium/sources.nix @@ -1,14 +1,14 @@ # This file is autogenerated from update.sh in the same directory. { dev = { - version = "30.0.1568.0"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-30.0.1568.0.tar.xz"; - sha256 = "0c30mbaj98ibyvg855zsqggy3mzhpwkaiw3x37na5hw6qabqizbf"; + version = "30.0.1573.2"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-30.0.1573.2.tar.xz"; + sha256 = "1pbph4jz0svaawk06zajq73x0xm73f9kdiflhad2709f4y23gzjz"; }; beta = { - version = "29.0.1547.22"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-29.0.1547.22.tar.xz"; - sha256 = "1vaz1abhs0x5frkx3xcgcdpi1n0mmrijfh57kqz54mw7xjlh71vm"; + version = "29.0.1547.32"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-29.0.1547.32.tar.xz"; + sha256 = "14p5s1xn15mdrlf87hv4y9kczw5r8s461a56kkdzb5xzyq25ph8w"; }; stable = { version = "28.0.1500.71"; From ac91adf4e36bdfd01cd3a1d24de4b7aa12281987 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Thu, 25 Jul 2013 12:02:02 +0200 Subject: [PATCH 671/798] linux-3.10: upgrade to 3.10.3 --- pkgs/os-specific/linux/kernel/linux-3.10.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.10.nix b/pkgs/os-specific/linux/kernel/linux-3.10.nix index c0242406075..dc7d6a1a9d9 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.10.nix @@ -259,7 +259,7 @@ in import ./generic.nix ( rec { - version = "3.10.1"; + version = "3.10.3"; testing = false; preConfigure = '' @@ -268,7 +268,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "1gqrafyzi381pbd4719g853hgi17q79nvzwdja2gk1d9jiq69f6s"; + sha256 = "195mlc628a9iyz57kibndzylgkz00cffkd982svi2fdfzxpxfm9r"; }; config = configWithPlatform stdenv.platform; From ef16799c9c54889d60774d4b811a95cdb6e821e7 Mon Sep 17 00:00:00 2001 From: Domen Kozar Date: Fri, 26 Jul 2013 11:03:25 +0200 Subject: [PATCH 672/798] pypy: try to fix remaining 4 tests --- pkgs/development/interpreters/pypy/2.0/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/pypy/2.0/default.nix b/pkgs/development/interpreters/pypy/2.0/default.nix index 7522020582c..614d3fdb378 100644 --- a/pkgs/development/interpreters/pypy/2.0/default.nix +++ b/pkgs/development/interpreters/pypy/2.0/default.nix @@ -45,12 +45,15 @@ let --replace "libraries = ['curses']" "libraries = ['ncurses']" ''; - TERMINFO = "${ncurses}/share/terminfo/"; doCheck = true; checkPhase = '' - export HOME="$TMPDIR" - ./pypy-c ./pypy/test_all.py --pypy=./pypy-c --ignore lib-python/2.7/test/test_shutil.py lib-python + export TERMINFO = "${ncurses}/share/terminfo/"; + export TERM = "xterm"; + export HOME = "$TMPDIR" + # disable shutils because it assumes gid 0 exists + # disable socket because it has two actual network tests that fail + ./pypy-c ./pypy/test_all.py --pypy=./pypy-c --ignore lib-python/2.7/test/test_shutil.py --ignore lib-python/2.7/test_socket.py lib-python ''; installPhase = '' From f6a60d664037278a629fdbc8912f037be2a20c8f Mon Sep 17 00:00:00 2001 From: Domen Kozar Date: Fri, 26 Jul 2013 13:18:08 +0200 Subject: [PATCH 673/798] calibre: upgrade to 0.9.11 (fixes #777) --- pkgs/applications/misc/calibre/default.nix | 24 +++++++++++----------- pkgs/top-level/python-packages.nix | 15 ++++++++++++++ 2 files changed, 27 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 23b5092cd4d..01060909f3d 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchurl, python, pyqt4, sip, popplerQt4, pkgconfig, libpng -, imagemagick, libjpeg, fontconfig, podofo, qt4, icu, sqlite -, pil, makeWrapper, unrar, chmlib, pythonPackages, xz, udisks, libusb1, libmtp +, imagemagick, libjpeg, fontconfig, podofo, qt48, icu, sqlite +, pil, makeWrapper, unrar, chmlib, pythonPackages, xz, libusb1, libmtp }: stdenv.mkDerivation rec { - name = "calibre-0.8.70"; - # 0.9.* versions won't build: https://bugs.launchpad.net/calibre/+bug/1094719 + name = "calibre-0.9.11"; + # 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 = "12avwp8r6cnrw6c32gmd2hksa9rszdb76zs6fcmr3n8r1wkwa71g"; + sha256 = "0jjs2cx222pbv4nrivlxag5fxa0v9m63x7arcll6xi173zdn4gg8"; }; inherit python; @@ -18,10 +18,10 @@ stdenv.mkDerivation rec { buildInputs = [ python pyqt4 sip popplerQt4 libpng imagemagick libjpeg - fontconfig podofo qt4 pil chmlib icu + fontconfig podofo qt48 pil chmlib icu pythonPackages.mechanize pythonPackages.lxml pythonPackages.dateutil - pythonPackages.cssutils pythonPackages.beautifulsoup - pythonPackages.sqlite3 sqlite udisks libusb1 libmtp + pythonPackages.cssutils pythonPackages.beautifulsoup pythonPackages.pillow + pythonPackages.sqlite3 pythonPackages.netifaces sqlite libusb1 libmtp ]; installPhase = '' @@ -46,11 +46,11 @@ stdenv.mkDerivation rec { done ''; - meta = { + meta = with stdenv.lib; { description = "Comprehensive e-book software"; homepage = http://calibre-ebook.com; - license = "GPLv3"; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + license = licenses.gpl3; + maintainers = with maintainers; [ viric iElectric ]; + platforms = platforms.linux; }; } diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d08eaa23da5..0ca03b1082c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2908,6 +2908,21 @@ pythonPackages = python.modules // rec { }; }; + netifaces = buildPythonPackage rec { + version = "0.8"; + name = "netifaces-${version}"; + + src = fetchurl { + url = "http://alastairs-place.net/projects/netifaces/${name}.tar.gz"; + sha256 = "1v5i39kx4yz1pwgjfbzi63w55l2z318zgmi9f77ybmmkil1i39sk"; + }; + + meta = { + homepage = http://alastairs-place.net/projects/netifaces/; + description = "Portable access to network interfaces from Python"; + }; + }; + netlib = buildPythonPackage rec { baseName = "netlib"; name = "${baseName}-${meta.version}"; From dbdde8b23184a77795d672380966ac8c95a028e1 Mon Sep 17 00:00:00 2001 From: Domen Kozar Date: Fri, 26 Jul 2013 14:36:53 +0200 Subject: [PATCH 674/798] pypy: currectly use bash --- pkgs/development/interpreters/pypy/2.0/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/pypy/2.0/default.nix b/pkgs/development/interpreters/pypy/2.0/default.nix index 614d3fdb378..07082cf012b 100644 --- a/pkgs/development/interpreters/pypy/2.0/default.nix +++ b/pkgs/development/interpreters/pypy/2.0/default.nix @@ -48,9 +48,9 @@ let doCheck = true; checkPhase = '' - export TERMINFO = "${ncurses}/share/terminfo/"; - export TERM = "xterm"; - export HOME = "$TMPDIR" + export TERMINFO="${ncurses}/share/terminfo/"; + export TERM="xterm"; + export HOME="$TMPDIR"; # disable shutils because it assumes gid 0 exists # disable socket because it has two actual network tests that fail ./pypy-c ./pypy/test_all.py --pypy=./pypy-c --ignore lib-python/2.7/test/test_shutil.py --ignore lib-python/2.7/test_socket.py lib-python From 60761e94b8ec58a096321776012f054badd45bcb Mon Sep 17 00:00:00 2001 From: Sergey Mironov Date: Fri, 26 Jul 2013 17:03:18 +0400 Subject: [PATCH 675/798] urxvt: Enable Gdk_pixbuf to be able to set custom icons/images --- pkgs/applications/misc/rxvt_unicode/default.nix | 5 +++-- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/rxvt_unicode/default.nix b/pkgs/applications/misc/rxvt_unicode/default.nix index d52fd178165..2afa6c08696 100644 --- a/pkgs/applications/misc/rxvt_unicode/default.nix +++ b/pkgs/applications/misc/rxvt_unicode/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, perlSupport, libX11, libXt, libXft, ncurses, perl, - fontconfig, freetype, pkgconfig, libXrender }: + fontconfig, freetype, pkgconfig, libXrender, gdkPixbufSupport, gdk_pixbuf }: let name = "rxvt-unicode"; @@ -19,7 +19,8 @@ stdenv.mkDerivation (rec { buildInputs = [ libX11 libXt libXft ncurses /* required to build the terminfo file */ fontconfig freetype pkgconfig libXrender ] - ++ stdenv.lib.optional perlSupport perl; + ++ stdenv.lib.optional perlSupport perl + ++ stdenv.lib.optional gdkPixbufSupport gdk_pixbuf; preConfigure = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f942843eef0..26d8be48862 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8289,6 +8289,7 @@ let # = urxvt rxvt_unicode = callPackage ../applications/misc/rxvt_unicode { perlSupport = true; + gdkPixbufSupport = true; }; sakura = callPackage ../applications/misc/sakura { From ef540f3df78bd0b77dc489264ba95cea4884b715 Mon Sep 17 00:00:00 2001 From: Domen Kozar Date: Fri, 26 Jul 2013 19:05:21 +0200 Subject: [PATCH 676/798] properly use & when ignoring tests --- pkgs/development/interpreters/pypy/2.0/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/pypy/2.0/default.nix b/pkgs/development/interpreters/pypy/2.0/default.nix index 07082cf012b..11e262f1716 100644 --- a/pkgs/development/interpreters/pypy/2.0/default.nix +++ b/pkgs/development/interpreters/pypy/2.0/default.nix @@ -53,7 +53,7 @@ let export HOME="$TMPDIR"; # disable shutils because it assumes gid 0 exists # disable socket because it has two actual network tests that fail - ./pypy-c ./pypy/test_all.py --pypy=./pypy-c --ignore lib-python/2.7/test/test_shutil.py --ignore lib-python/2.7/test_socket.py lib-python + ./pypy-c ./pypy/test_all.py --pypy=./pypy-c -k '-test_socket -test_shutil' lib-python ''; installPhase = '' From 49335abfd25b688ede92ca676a76dee1be741781 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 25 Jul 2013 10:29:22 +0200 Subject: [PATCH 677/798] haskell-git-annex: update to version 4.20130723 --- .../version-management/git-and-tools/git-annex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix index 78c33a24d34..e53f60c9be0 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix @@ -14,8 +14,8 @@ cabal.mkDerivation (self: { pname = "git-annex"; - version = "4.20130709"; - sha256 = "1xsv5wi0sipp71p7yw90cwd4spm4sr0kcqj47zyd19mgdyd80p9i"; + version = "4.20130723"; + sha256 = "1fc8kz4n2g4x9fzvdx4bz4d8gkbajdnqphldcglwl23g97vyrn6i"; isLibrary = false; isExecutable = true; buildDepends = [ From 88cb67fc889ef7b57fdd09b68b0962a3f26f61a1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 25 Jul 2013 10:29:22 +0200 Subject: [PATCH 678/798] haskell-dns: update to version 0.3.7 --- pkgs/development/libraries/haskell/dns/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/dns/default.nix b/pkgs/development/libraries/haskell/dns/default.nix index 0854f39efce..e6c18872ed3 100644 --- a/pkgs/development/libraries/haskell/dns/default.nix +++ b/pkgs/development/libraries/haskell/dns/default.nix @@ -1,15 +1,19 @@ { cabal, attoparsec, attoparsecConduit, binary, blazeBuilder -, conduit, iproute, mtl, network, networkConduit, random +, conduit, hspec, iproute, mtl, network, networkConduit, random }: cabal.mkDerivation (self: { pname = "dns"; - version = "0.3.6"; - sha256 = "0dpwy94id9rxxjpji47nazinm8i1ihm0606dmi5iqqhbl5h2jara"; + version = "0.3.7"; + sha256 = "1wly3h36j9gjyx6p2vzand5019m6rs0qkcf1h4q61igks65xs674"; buildDepends = [ attoparsec attoparsecConduit binary blazeBuilder conduit iproute mtl network networkConduit random ]; + testDepends = [ + attoparsec attoparsecConduit binary blazeBuilder conduit hspec + iproute mtl network networkConduit random + ]; meta = { description = "DNS library in Haskell"; license = self.stdenv.lib.licenses.bsd3; From 93b8532f17df91f1e348ca7aac2bf89b6e5a40fc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 25 Jul 2013 10:29:22 +0200 Subject: [PATCH 679/798] haskell-hinotify: update to version 0.3.6 --- pkgs/development/libraries/haskell/hinotify/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hinotify/default.nix b/pkgs/development/libraries/haskell/hinotify/default.nix index de1c0e12759..bd706339c02 100644 --- a/pkgs/development/libraries/haskell/hinotify/default.nix +++ b/pkgs/development/libraries/haskell/hinotify/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "hinotify"; - version = "0.3.5"; - sha256 = "00pzvqw2w3gbz8j4hiz8zxm7rki07g1iamjlbazz3kmpwcgjxi0l"; + version = "0.3.6"; + sha256 = "0vzn9z90z9zk7g9pvbrgm6xyb4b5x2dai1c70fvmdi3w4h2x17zw"; meta = { homepage = "https://github.com/kolmodin/hinotify.git"; description = "Haskell binding to inotify"; From 37e428f2293b116b8df55d9926145669c264d88f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 25 Jul 2013 10:29:22 +0200 Subject: [PATCH 680/798] haskell-splot: update to version 0.3.9 --- pkgs/development/tools/haskell/splot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/haskell/splot/default.nix b/pkgs/development/tools/haskell/splot/default.nix index 4bd47b8decd..f1b15a731d5 100644 --- a/pkgs/development/tools/haskell/splot/default.nix +++ b/pkgs/development/tools/haskell/splot/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "splot"; - version = "0.3.8"; - sha256 = "188v9c070wn6gr47k5q55gsiph0lj96d96bss76gz7znknfj9rm3"; + version = "0.3.9"; + sha256 = "039k6lgwdvpyc8w74zh98wxi1wj2jmin69jnwp7gnmv43kjpbgh5"; isLibrary = false; isExecutable = true; buildDepends = [ From b04d577dcb8bb8276ab43f85adf0ad7303387a1b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 26 Jul 2013 10:28:03 +0200 Subject: [PATCH 681/798] haskell-language-java: update to version 0.2.5 --- .../development/libraries/haskell/language-java/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/language-java/default.nix b/pkgs/development/libraries/haskell/language-java/default.nix index 5464826788b..bf5cef0ddfd 100644 --- a/pkgs/development/libraries/haskell/language-java/default.nix +++ b/pkgs/development/libraries/haskell/language-java/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "language-java"; - version = "0.2.4"; - sha256 = "1fb36xq75mzmbsh25s0pscazvz6nvfy2mn1270653m7s3gdgcs5f"; + version = "0.2.5"; + sha256 = "1l3q156m3l3fawsrgj3fr16qxr0apwg2si410j0f5hsgfmkhdrm6"; buildDepends = [ cpphs parsec syb ]; testDepends = [ filepath HUnit mtl QuickCheck testFramework testFrameworkHunit @@ -14,7 +14,7 @@ cabal.mkDerivation (self: { buildTools = [ alex ]; doCheck = false; meta = { - homepage = "http://github.com/vincenthz/language-java"; + homepage = "http://github.com/jkoppel/language-java"; description = "Manipulating Java source: abstract syntax, lexer, parser, and pretty-printer"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; From 9d7cb9b593431e0f9abc440fd15fcf9823cbadb8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 26 Jul 2013 10:28:04 +0200 Subject: [PATCH 682/798] haskell-unix-process-conduit: update to version 0.2.1.1 --- .../libraries/haskell/unix-process-conduit/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/unix-process-conduit/default.nix b/pkgs/development/libraries/haskell/unix-process-conduit/default.nix index 6ee4304ac17..d12167ac428 100644 --- a/pkgs/development/libraries/haskell/unix-process-conduit/default.nix +++ b/pkgs/development/libraries/haskell/unix-process-conduit/default.nix @@ -1,10 +1,10 @@ -{ cabal, conduit, hspec, transformers }: +{ cabal, conduit, filepath, hspec, stm, time, transformers }: cabal.mkDerivation (self: { pname = "unix-process-conduit"; - version = "0.2.0.2"; - sha256 = "1n9ja7dlxhsxyglfzk397xdgvdny766y1isrb5d065srxprsj2g6"; - buildDepends = [ conduit transformers ]; + version = "0.2.1.1"; + sha256 = "038z99gzwqhig65zzb3hc9zisnvzslvvy86wjgx6wz90p6vbxzn4"; + buildDepends = [ conduit filepath stm time transformers ]; testDepends = [ conduit hspec transformers ]; meta = { homepage = "https://github.com/snoyberg/conduit"; From 5ff9c0c06720fde744e44219e5633213919d383e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 26 Jul 2013 10:35:30 +0200 Subject: [PATCH 683/798] haskell-dns: disable the test suite to fix the build The test suite assumes that it can read /etc/resolv.conf. --- pkgs/development/libraries/haskell/dns/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/dns/default.nix b/pkgs/development/libraries/haskell/dns/default.nix index e6c18872ed3..e4756eeb2dd 100644 --- a/pkgs/development/libraries/haskell/dns/default.nix +++ b/pkgs/development/libraries/haskell/dns/default.nix @@ -14,6 +14,7 @@ cabal.mkDerivation (self: { attoparsec attoparsecConduit binary blazeBuilder conduit hspec iproute mtl network networkConduit random ]; + doCheck = false; meta = { description = "DNS library in Haskell"; license = self.stdenv.lib.licenses.bsd3; From b9d933ba24f9ced5e163f72060cbc79cecfbc711 Mon Sep 17 00:00:00 2001 From: kikic Date: Mon, 10 Jun 2013 13:52:45 +0200 Subject: [PATCH 684/798] Added nose-cprof for profiling --- pkgs/top-level/python-packages.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0ca03b1082c..188116eb52b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3040,6 +3040,22 @@ pythonPackages = python.modules // rec { buildInputs = [ nose ]; }; + nose-cprof = buildPythonPackage rec { + name = "nose-cprof-0.1-0"; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/n/nose-cprof/${name}.tar.gz"; + md5 = "5db27c3b8f01915335ae6fc5fd3afd44"; + }; + + meta = { + description = "A python nose plugin to profile using cProfile rather than the default Hotshot profiler."; + }; + + buildInputs = [ nose ]; + }; + + notify = pkgs.stdenv.mkDerivation (rec { name = "python-notify-0.1.1"; From 8e3fa9f56a522f95b20a558a09a8866e0717a4b9 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Fri, 26 Jul 2013 20:35:20 +0200 Subject: [PATCH 685/798] waitress test fail for me --- pkgs/top-level/python-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 188116eb52b..d974ff902dc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5414,6 +5414,8 @@ pythonPackages = python.modules // rec { md5 = "7a3094d812c0dffb948d1334ef5fd56f"; }; + doCheck = false; + meta = { maintainers = [ stdenv.lib.maintainers.garbas From 0f98ddf8fd805616f0e6a4f777c9bd2aacb7abb8 Mon Sep 17 00:00:00 2001 From: Domen Kozar Date: Fri, 26 Jul 2013 23:09:50 +0200 Subject: [PATCH 686/798] Revert "networkmanager: we dont need networkmanager group anymore, just use at_console policy" This reverts commit 52fe6943603ee39e41a0af9b7ff85c50953a87a6. --- pkgs/tools/networking/network-manager/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index ce372d495b6..af35e3f71da 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -56,6 +56,9 @@ stdenv.mkDerivation rec { postInstall = '' mkdir -p $out/lib/NetworkManager + + # FIXME: Workaround until NixOS' dbus+systemd supports at_console policy + substituteInPlace $out/etc/dbus-1/system.d/org.freedesktop.NetworkManager.conf --replace 'at_console="true"' 'group="networkmanager"' ''; meta = with stdenv.lib; { From 51a6bee01233102ea49fefce51be876cc448e8c4 Mon Sep 17 00:00:00 2001 From: Domen Kozar Date: Fri, 26 Jul 2013 23:12:05 +0200 Subject: [PATCH 687/798] pypy: multiprocessing tests are failing, try with internal module --- pkgs/development/interpreters/pypy/2.0/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/pypy/2.0/default.nix b/pkgs/development/interpreters/pypy/2.0/default.nix index 11e262f1716..969746d3a34 100644 --- a/pkgs/development/interpreters/pypy/2.0/default.nix +++ b/pkgs/development/interpreters/pypy/2.0/default.nix @@ -29,7 +29,7 @@ let preConfigure = '' substituteInPlace Makefile \ --replace "-Ojit" "-Ojit --batch" \ - --replace "pypy/goal/targetpypystandalone.py" "pypy/goal/targetpypystandalone.py --withmod-_minimal_curses --withmod-unicodedata --withmod-thread --withmod-bz2" + --replace "pypy/goal/targetpypystandalone.py" "pypy/goal/targetpypystandalone.py --withmod-_minimal_curses --withmod-unicodedata --withmod-thread --withmod-bz2 --withmod-_multiprocessing" # we are using cpython and not pypy to do translation substituteInPlace rpython/bin/rpython \ From 082ea1414802a5f0434e3c4e3faa805319d68d69 Mon Sep 17 00:00:00 2001 From: Domen Kozar Date: Sat, 27 Jul 2013 01:02:57 +0200 Subject: [PATCH 688/798] virtualenv: upgrade to 1.10 --- 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 d974ff902dc..61740118983 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5366,10 +5366,10 @@ pythonPackages = python.modules // rec { }); virtualenv = buildPythonPackage rec { - name = "virtualenv-1.9.1"; + name = "virtualenv-1.10"; src = fetchurl { url = "http://pypi.python.org/packages/source/v/virtualenv/${name}.tar.gz"; - md5 = "07e09df0adfca0b2d487e39a4bf2270a"; + md5 = "9745c28256c70c76d36adb3767a00212"; }; patches = [ ../development/python-modules/virtualenv-change-prefix.patch ]; From 828b1de8f48b1bc9371c2bf787e0d333ccbee922 Mon Sep 17 00:00:00 2001 From: Alexander Foremny Date: Sat, 27 Jul 2013 10:21:14 +0200 Subject: [PATCH 689/798] Add jailbreak to Elm server --- pkgs/development/compilers/elm/elm-server.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/elm/elm-server.nix b/pkgs/development/compilers/elm/elm-server.nix index 1750213ac8a..bce0e933732 100644 --- a/pkgs/development/compilers/elm/elm-server.nix +++ b/pkgs/development/compilers/elm/elm-server.nix @@ -3,6 +3,7 @@ }: cabal.mkDerivation (self: { + jailbreak = true; pname = "elm-server"; version = "0.8"; sha256 = "0mnxayfg54f5mr27sd1zw3xrdijppgvrz2yzzmhp07qc1jiyfald"; From 30e9f13d81885289d4f492b9dc92c53d4b023956 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 27 Jul 2013 11:05:59 +0200 Subject: [PATCH 690/798] smartmontools: update to version 6.2 --- pkgs/tools/system/smartmontools/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/smartmontools/default.nix b/pkgs/tools/system/smartmontools/default.nix index b901bd3b78e..be34fc52c7a 100644 --- a/pkgs/tools/system/smartmontools/default.nix +++ b/pkgs/tools/system/smartmontools/default.nix @@ -8,15 +8,15 @@ let }; in stdenv.mkDerivation rec { - name = "smartmontools-6.1"; + name = "smartmontools-6.2"; src = fetchurl { url = "mirror://sourceforge/smartmontools/${name}.tar.gz"; - sha256 = "01yfv6hqsqandg6x8mnwa4g42hhqvc7dfxnfb3v849n8rj5kn059"; + sha256 = "0nq6jvfh8nqwfrvp6fb6qs2rdydi3i9xgpi7p7vb83xvg42ncvs8"; }; patchPhase = '' - cp ${driverdb} drivedb.h + : cp ${driverdb} drivedb.h sed -i -e 's@which which >/dev/null || exit 1@alias which="type -p"@' update-smart-drivedb.in ''; From 595937318ff72dda48ea58ec68a8d426542ba9fc Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Sat, 27 Jul 2013 12:06:45 +0200 Subject: [PATCH 691/798] update release-python.nix from python branch --- pkgs/top-level/release-python.nix | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix index 2ed725e68ce..e09c3a76ddc 100644 --- a/pkgs/top-level/release-python.nix +++ b/pkgs/top-level/release-python.nix @@ -1,13 +1,15 @@ /* - This file will be evaluated by hydra with a call like this: - hydra_eval_jobs --gc-roots-dir \ - /nix/var/nix/gcroots/per-user/hydra/hydra-roots --argstr \ - system i686-linux --argstr system x86_64-linux --arg \ - nixpkgs "{outPath = ./}" .... release.nix - - Hydra can be installed with "nix-env -i hydra". + test for example like this + $ nix-build pkgs/top-level/release-python.nix */ -with (import ./release-lib.nix); + +{ nixpkgs ? { outPath = (import ./all-packages.nix {}).lib.cleanSource ../..; revCount = 1234; shortRev = "abcdef"; } +, officialRelease ? false +, # The platforms for which we build Nixpkgs. + supportedSystems ? [ "x86_64-linux" "i686-linux" "x86_64-darwin" "x86_64-freebsd" "i686-freebsd" ] +}: + +with import ./release-lib.nix {inherit supportedSystems; }; let jobsForDerivations = attrset: pkgs.lib.attrsets.listToAttrs @@ -19,12 +21,13 @@ let (n: v: (v.type or null) == "derivation") attrset))); -in -{ - tarball = import ./make-tarball.nix; + jobs = + { -} // (mapTestOn rec { + # } // (mapTestOn ((packagesWithMetaPlatform pkgs) // rec { + + } // (mapTestOn rec { a2jmidid = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; aacskeys = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; @@ -1992,4 +1995,6 @@ in zsnes = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; zynaddsubfx = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; zziplib = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; -}) +}); + +in jobs From 5a0710b36ba7194d28e266c8aa184d7adf465bda Mon Sep 17 00:00:00 2001 From: Aristid Breitkreuz Date: Sat, 27 Jul 2013 17:43:17 +0200 Subject: [PATCH 692/798] pavucontrol 2.0 --- pkgs/applications/audio/pavucontrol/default.nix | 14 +++++++------- pkgs/top-level/all-packages.nix | 5 ++--- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/audio/pavucontrol/default.nix b/pkgs/applications/audio/pavucontrol/default.nix index a73744ebbe8..9e0b50b5c0d 100644 --- a/pkgs/applications/audio/pavucontrol/default.nix +++ b/pkgs/applications/audio/pavucontrol/default.nix @@ -1,18 +1,18 @@ -{ fetchurl, stdenv, pkgconfig, pulseaudio, gtkmm, libsigcxx -, libglademm, libcanberra, intltool, gettext }: +{ fetchurl, stdenv, pkgconfig, pulseaudio, gtkmm3 +, libcanberra_gtk3, intltool, gettext }: stdenv.mkDerivation rec { - name = "pavucontrol-1.0"; + name = "pavucontrol-2.0"; src = fetchurl { url = "http://freedesktop.org/software/pulseaudio/pavucontrol/${name}.tar.xz"; - sha256 = "1plcyrc7p6gqxjhxx2xh6162bkb29wixjrqrjnl9b8g3nrjjigix"; + sha256 = "02s775m1531sshwlbvfddk3pz8zjmwkv1sgzggn386ja3gc9vwi2"; }; - buildInputs = [ pkgconfig pulseaudio gtkmm libsigcxx libglademm libcanberra + buildInputs = [ pkgconfig pulseaudio gtkmm3 libcanberra_gtk3 intltool gettext ]; - configureFlags = "--disable-lynx --disable-gtk3"; + configureFlags = "--disable-lynx"; meta = { description = "PulseAudio Volume Control"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { easily control the volume of all clients, sinks, etc. ''; - homepage = http://0pointer.de/lennart/projects/pavucontrol/; + homepage = http://freedesktop.org/software/pulseaudio/pavucontrol/ ; license = "GPLv2+"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 760a84c48a2..eff36f43d6b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4433,6 +4433,7 @@ let libcaca = callPackage ../development/libraries/libcaca { }; libcanberra = callPackage ../development/libraries/libcanberra { }; + libcanberra_gtk3 = libcanberra.override { gtk = gtk3; }; libcanberra_kde = if (config.kde_runtime.libcanberraWithoutGTK or true) then libcanberra.override { gtk = null; } else libcanberra; @@ -8192,9 +8193,7 @@ let panotools = callPackage ../applications/graphics/panotools { }; - pavucontrol = callPackage ../applications/audio/pavucontrol { - inherit (gnome) libglademm; - }; + pavucontrol = callPackage ../applications/audio/pavucontrol { }; paraview = callPackage ../applications/graphics/paraview { }; From 93cdc526c3201135f46097d166563b610e1d2fad Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sat, 27 Jul 2013 13:23:35 -0400 Subject: [PATCH 693/798] buildNodePackages: Move /node_modules to /lib/node_modules to make nix profiles usable as an npm prefix Signed-off-by: Shea Levy --- .../web/nodejs/build-node-package.nix | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/development/web/nodejs/build-node-package.nix b/pkgs/development/web/nodejs/build-node-package.nix index 415f2209597..27e114ee40b 100644 --- a/pkgs/development/web/nodejs/build-node-package.nix +++ b/pkgs/development/web/nodejs/build-node-package.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation ({ runHook preConfigure mkdir node_modules ${stdenv.lib.concatStrings (map (dep: '' - ln -sv ${dep}/node_modules/${(builtins.parseDrvName dep.name).name} node_modules/ + ln -sv ${dep}/lib/node_modules/${(builtins.parseDrvName dep.name).name} node_modules/ '') deps)} export HOME=$(pwd) runHook postConfigure @@ -35,25 +35,25 @@ stdenv.mkDerivation ({ installPhase = '' runHook preInstall - mkdir -p $out/node_modules - mv node_modules/${requireName} $out/node_modules - mv node_modules/.bin $out/node_modules 2>/dev/null || true - rm -fR $out/node_modules/${requireName}/node_modules - mv node_modules $out/node_modules/${requireName} - if [ -d "$out/node_modules/.bin" ]; then + mkdir -p $out/lib/node_modules + mv node_modules/${requireName} $out/lib/node_modules + mv node_modules/.bin $out/lib/node_modules 2>/dev/null || true + rm -fR $out/lib/node_modules/${requireName}/node_modules + mv node_modules $out/lib/node_modules/${requireName} + if [ -d "$out/lib/node_modules/.bin" ]; then ln -sv node_modules/.bin $out/bin node=`type -p node` coffee=`type -p coffee || true` - find -L $out/node_modules/.bin/* -type f -print0 | \ + find -L $out/lib/node_modules/.bin/* -type f -print0 | \ xargs -0 sed --follow-symlinks -i \ -e 's@#!/usr/bin/env node@#!'"$node"'@' \ -e 's@#!/usr/bin/env coffee@#!'"$coffee"'@' \ -e 's@#!/.*/node@#!'"$node"'@' \ -e 's@#!/.*/coffee@#!'"$coffee"'@' fi - if [ -e "$out/node_modules/${requireName}/man" ]; then + if [ -e "$out/lib/node_modules/${requireName}/man" ]; then mkdir $out/share - ln -sv node_modules/${requireName}/man $out/share/man + ln -sv $out/lib/node_modules/${requireName}/man $out/share/man fi runHook postInstall ''; From 2762b0667dfd0fe7cb5828b9246094ed9815e80a Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sat, 27 Jul 2013 13:33:18 -0400 Subject: [PATCH 694/798] node-packages.nix: Actually use nativeDeps Wonder how long that's been broken... Signed-off-by: Shea Levy --- pkgs/top-level/node-packages.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/node-packages.nix b/pkgs/top-level/node-packages.nix index 206dd1c87ce..5719967c4c5 100644 --- a/pkgs/top-level/node-packages.nix +++ b/pkgs/top-level/node-packages.nix @@ -5,6 +5,15 @@ let importGeneratedPackages = generated: nativeDeps: self: let + nativeDepsList = { name, spec, ... }: + let + nameOr = if builtins.hasAttr name nativeDeps + then builtins.getAttr name nativeDeps + else {}; + depsOr = if builtins.hasAttr spec nameOr + then builtins.getAttr spec nameOr + else []; + in depsOr; all = pkgs.lib.fold (pkg: { top-level, full }: { top-level = top-level ++ pkgs.lib.optional pkg.topLevel { name = pkg.name; @@ -25,6 +34,7 @@ let sha256 = pkg.sha256 or ""; }; deps = map (dep: builtins.getAttr dep.spec (builtins.getAttr dep.name self.full)) pkg.dependencies; + buildInputs = nativeDepsList pkg; }; } ]; } ]; @@ -34,8 +44,8 @@ in { inherit importGeneratedPackages; nativeDeps = { - "node-expat-*" = [ pkgs.expat ]; - "rbytes-0.0.2" = [ pkgs.openssl ]; + "node-expat"."*" = [ pkgs.expat ]; + "rbytes"."0.0.2" = [ pkgs.openssl ]; }; buildNodePackage = import ../development/web/nodejs/build-node-package.nix { From b43d1c014ae676af24c045495baff960af926cc4 Mon Sep 17 00:00:00 2001 From: "Jason \\\"Don\\\" O'Conal" Date: Sun, 14 Jul 2013 07:30:18 +1000 Subject: [PATCH 695/798] sdcv: fix build on darwin (close #744) * add -lintl flag to NIX_CFLAGS_COMPILE --- pkgs/applications/misc/sdcv/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/sdcv/default.nix b/pkgs/applications/misc/sdcv/default.nix index 8ac4730de9a..3859d2c82ab 100644 --- a/pkgs/applications/misc/sdcv/default.nix +++ b/pkgs/applications/misc/sdcv/default.nix @@ -26,6 +26,7 @@ stdenv.mkDerivation rec { sed -i 's/guint32 page_size/size_t page_size/' src/lib/lib.cpp ''; - NIX_CFLAGS_COMPILE = "-D__GNU_LIBRARY__"; + NIX_CFLAGS_COMPILE = "-D__GNU_LIBRARY__" + + stdenv.lib.optionalString stdenv.isDarwin " -lintl"; } From 75dedeb8bdaae815bb85fb155655e7372cee9b68 Mon Sep 17 00:00:00 2001 From: "Jason \\\"Don\\\" O'Conal" Date: Sun, 14 Jul 2013 11:52:30 +1000 Subject: [PATCH 696/798] gtk2: fix build on darwin (close #749) * add xlibs.libXi to build inputs --- pkgs/development/libraries/gtk+/2.x.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk+/2.x.nix index 8c6e76726af..6debf2a807b 100644 --- a/pkgs/development/libraries/gtk+/2.x.nix +++ b/pkgs/development/libraries/gtk+/2.x.nix @@ -20,6 +20,8 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-I${cairo}/include/cairo" + stdenv.lib.optionalString (libintlOrEmpty != []) " -lintl"; + buildInputs = stdenv.lib.optional stdenv.isDarwin xlibs.libXi; + nativeBuildInputs = [ perl pkgconfig gettext ]; propagatedBuildInputs = with xlibs; with stdenv.lib; From 1fa3afeb9118200c8007b6bb06896cedfe6dce47 Mon Sep 17 00:00:00 2001 From: Sergey Mironov Date: Fri, 26 Jul 2013 18:15:22 +0400 Subject: [PATCH 697/798] wmctrl: command-line window-manipulation tool --- pkgs/tools/X11/wmctrl/default.nix | 20 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/tools/X11/wmctrl/default.nix diff --git a/pkgs/tools/X11/wmctrl/default.nix b/pkgs/tools/X11/wmctrl/default.nix new file mode 100644 index 00000000000..901eab0d1a6 --- /dev/null +++ b/pkgs/tools/X11/wmctrl/default.nix @@ -0,0 +1,20 @@ +{stdenv, fetchurl, libX11, glib, pkgconfig, libXmu }: + +stdenv.mkDerivation rec { + + name = "wmctrl-1.07"; + + src = fetchurl { + url = "http://tomas.styblo.name/wmctrl/dist/${name}.tar.gz"; + sha256 = "1afclc57b9017a73mfs9w7lbdvdipmf9q0xdk116f61gnvyix2np"; + }; + + buildInputs = [ libX11 libXmu glib pkgconfig ]; + + meta = { + homepage = http://tomas.styblo.name/wmctrl/; + description = "wmctrl is a UNIX/Linux command line tool to interact with an EWMH/NetWM compatible X Window Manager"; + license = "GPL"; + platforms = with stdenv.lib.platforms; all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 760a84c48a2..5a1f97a6953 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8648,6 +8648,8 @@ let wmname = callPackage ../applications/misc/wmname { }; + wmctrl = callPackage ../tools/X11/wmctrl { }; + # I'm keen on wmiimenu only >wmii-3.5 no longer has it... wmiimenu = import ../applications/window-managers/wmii31 { libixp = libixp_for_wmii; From 5b4e0207ba57e100c3cbd78b8ffe2884a1ff3097 Mon Sep 17 00:00:00 2001 From: Sergey Mironov Date: Sat, 27 Jul 2013 00:48:07 +0400 Subject: [PATCH 698/798] wmctrl: add command-line window-manipulation tool (close #781) --- pkgs/tools/X11/wmctrl/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/X11/wmctrl/default.nix b/pkgs/tools/X11/wmctrl/default.nix index 901eab0d1a6..f4705bdb0d4 100644 --- a/pkgs/tools/X11/wmctrl/default.nix +++ b/pkgs/tools/X11/wmctrl/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://tomas.styblo.name/wmctrl/; description = "wmctrl is a UNIX/Linux command line tool to interact with an EWMH/NetWM compatible X Window Manager"; - license = "GPL"; + license = stdenv.lib.licenses.gpl2; platforms = with stdenv.lib.platforms; all; }; } From b4105cfaff70e88058c179b0f9cac87af6e034fe Mon Sep 17 00:00:00 2001 From: "Jason \\\"Don\\\" O'Conal" Date: Sun, 14 Jul 2013 11:47:14 +1000 Subject: [PATCH 699/798] php53: fix build on darwin (close #748) * add empty unix.h header * build with kerberos * ensure the binary has no extension --- pkgs/development/interpreters/php-xdebug/default.nix | 3 +++ pkgs/development/interpreters/php/5.3.nix | 10 ++++++++-- pkgs/tools/networking/uwimap/default.nix | 10 ++++++++-- 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/pkgs/development/interpreters/php-xdebug/default.nix b/pkgs/development/interpreters/php-xdebug/default.nix index fe7bbb869da..99c5ad663af 100644 --- a/pkgs/development/interpreters/php-xdebug/default.nix +++ b/pkgs/development/interpreters/php-xdebug/default.nix @@ -14,6 +14,9 @@ stdenv.mkDerivation rec { configurePhase = '' phpize ./configure --prefix=$out + '' + stdenv.lib.optionalString stdenv.isDarwin '' + # looks for this file for some reason -- isn't needed + touch unix.h ''; buildPhase = '' diff --git a/pkgs/development/interpreters/php/5.3.nix b/pkgs/development/interpreters/php/5.3.nix index a84927a20f3..caa673b31a9 100644 --- a/pkgs/development/interpreters/php/5.3.nix +++ b/pkgs/development/interpreters/php/5.3.nix @@ -134,8 +134,11 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) }; imap = { - configureFlags = [ "--with-imap=${uwimap}" "--with-imap-ssl" ]; - buildInputs = [ uwimap openssl pam ]; + configureFlags = [ "--with-imap=${uwimap}" "--with-imap-ssl" ] + # uwimap builds with kerberos on darwin + ++ stdenv.lib.optional (stdenv.isDarwin) "--with-kerberos"; + buildInputs = [ uwimap openssl ] + ++ stdenv.lib.optional (!stdenv.isDarwin) pam; }; intl = { @@ -205,6 +208,9 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) [[ -z "$libxml2" ]] || export PATH=$PATH:$libxml2/bin ./configure --with-config-file-scan-dir=/etc --with-config-file-path=$out/etc --prefix=$out $configureFlags echo configurePhase end + '' + stdenv.lib.optionalString stdenv.isDarwin '' + # don't build php.dSYM as the php binary + sed -i 's/EXEEXT = \.dSYM/EXEEXT =/' Makefile ''; installPhase = '' diff --git a/pkgs/tools/networking/uwimap/default.nix b/pkgs/tools/networking/uwimap/default.nix index 5ffeb53dd29..54390d4f9ee 100644 --- a/pkgs/tools/networking/uwimap/default.nix +++ b/pkgs/tools/networking/uwimap/default.nix @@ -8,17 +8,23 @@ stdenv.mkDerivation { sha256 = "0a2a00hbakh0640r2wdpnwr8789z59wnk7rfsihh3j0vbhmmmqak"; }; - makeFlags = "lnp" # Linux with PAM modules + makeFlags = if stdenv.isDarwin + then "osx" + else "lnp" # Linux with PAM modules; # -fPIC is required to compile php with imap on x86_64 systems + stdenv.lib.optionalString stdenv.isx86_64 " EXTRACFLAGS=-fPIC"; - buildInputs = [ pam openssl ]; + buildInputs = [ openssl ] + ++ stdenv.lib.optional (!stdenv.isDarwin) pam; patchPhase = '' sed -i -e s,/usr/local/ssl,${openssl}, \ src/osdep/unix/Makefile ''; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin + "-I${openssl}/include/openssl"; + installPhase = '' mkdir -p $out/bin $out/lib $out/include cp c-client/*.h c-client/linkage.c $out/include From a0fbee619dbd220a65bbfd381dffa4b9354c65bd Mon Sep 17 00:00:00 2001 From: Domen Kozar Date: Sun, 28 Jul 2013 11:12:13 +0200 Subject: [PATCH 700/798] Jinja2: 2.6 -> 2.7, rename MarkupSafe to markupsafe --- pkgs/top-level/python-packages.nix | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 61740118983..1c439c93223 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2295,14 +2295,16 @@ pythonPackages = python.modules // rec { }; }); - jinja2 = buildPythonPackage { - name = "jinja2-2.6"; + jinja2 = buildPythonPackage rec { + name = "Jinja2-2.7"; src = fetchurl { - url = "http://pypi.python.org/packages/source/J/Jinja2/Jinja2-2.6.tar.gz"; - md5 = "1c49a8825c993bfdcf55bb36897d28a2"; + url = "http://pypi.python.org/packages/source/J/Jinja2/${name}.tar.gz"; + sha256 = "0kgsd7h27jl2jpqa1ks88h93z50bsg0yr7qkicqpxbl9s4c1aks7"; }; + propagatedBuildInputs = [ pythonPackages.markupsafe ]; + meta = { homepage = http://jinja.pocoo.org/; description = "Stand-alone template engine"; @@ -2517,8 +2519,8 @@ pythonPackages = python.modules // rec { md5 = "daf7cc50f997533b573f9b40193139a2"; }; - buildInputs = [ MarkupSafe nose ]; - propagatedBuildInputs = [ MarkupSafe ]; + buildInputs = [ markupsafe nose ]; + propagatedBuildInputs = [ markupsafe ]; meta = { description = "Super-fast templating language."; @@ -2529,8 +2531,8 @@ pythonPackages = python.modules // rec { }; - MarkupSafe = buildPythonPackage rec { - name = "MarkupSafe-0.15"; + markupsafe = buildPythonPackage rec { + name = "markupsafe-0.15"; src = fetchurl { url = "http://pypi.python.org/packages/source/M/MarkupSafe/${name}.tar.gz"; @@ -6367,7 +6369,7 @@ pythonPackages = python.modules // rec { md5 = "32749ffadfc40fea51075a7def32588b"; }; - buildInputs = [ routes MarkupSafe webob nose ]; + buildInputs = [ routes markupsafe webob nose ]; # TODO: failing tests https://bitbucket.org/bbangert/webhelpers/pull-request/1/fix-error-on-webob-123/diff doCheck = false; From f34a79ad358315f90778c304a379c4df4651487a Mon Sep 17 00:00:00 2001 From: Domen Kozar Date: Sun, 28 Jul 2013 11:31:41 +0200 Subject: [PATCH 701/798] nose: 1.2.1 -> 1.3.0 --- 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 1c439c93223..13fddeb8655 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2991,11 +2991,11 @@ pythonPackages = python.modules // rec { }); nose = buildPythonPackage rec { - name = "nose-1.2.1"; + name = "nose-1.3.0"; src = fetchurl { url = "http://pypi.python.org/packages/source/n/nose/${name}.tar.gz"; - md5 = "735e3f1ce8b07e70ee1b742a8a53585a"; + sha256 = "0q2j9zz39h3liwbp6lb94kl3sxb9z9rbwh5dzyccyxfy4lrwqqsf"; }; meta = { From 3ee369ce5ad14d7e830da0ebd6d370084401f9c8 Mon Sep 17 00:00:00 2001 From: Domen Kozar Date: Sun, 28 Jul 2013 12:30:11 +0200 Subject: [PATCH 702/798] sqlalchemy: 0.7.9 -> 0.7.10, apply patch to fix tests --- pkgs/top-level/python-packages.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 13fddeb8655..048ddee396e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5002,14 +5002,21 @@ pythonPackages = python.modules // rec { }); - sqlalchemy = buildPythonPackage { - name = "sqlalchemy-0.7.9"; + sqlalchemy = buildPythonPackage rec { + name = "sqlalchemy-${version}"; + version = "0.7.10"; src = fetchurl { - url = mirror://sourceforge/sqlalchemy/0.7.9/SQLAlchemy-0.7.9.tar.gz; - md5 = "c4852d586d95a59fbc9358f4467875d5"; + url = "http://pypi.python.org/packages/source/S/SQLAlchemy/SQLAlchemy-${version}.tar.gz"; + sha256 = "0rhxgr85xdhjn467qfs0dkyj8x46zxcv6ad3dfx3w14xbkb3kakp"; }; + patches = [ + # see https://groups.google.com/forum/#!searchin/sqlalchemy/module$20logging$20handlers/sqlalchemy/ukuGhmQ2p6g/2_dOpBEYdDYJ + # waiting for 0.7.11 release + ../development/python-modules/sqlalchemy-0.7.10-test-failures.patch + ]; + buildInputs = [ nose ]; propagatedBuildInputs = [ python.modules.sqlite3 ]; From 516377c0b6c61305f743ba02ea19214af49948ba Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 28 Jul 2013 13:50:00 +0200 Subject: [PATCH 703/798] bind: update to 9.9.3-p2 to fix CVE-2013-4854 --- pkgs/servers/dns/bind/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index 4d256f92626..6c4841dc8af 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, openssl, libtool, perl, libxml2 }: -let version = "9.9.3-P1"; in +let version = "9.9.3-P2"; in stdenv.mkDerivation rec { @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://ftp.isc.org/isc/bind9/${version}/${name}.tar.gz"; - sha256 = "0ddlvdxsyibm24v1wzbknywvalsrvl06gbvsrigpqc1vgkj25ahv"; + sha256 = "0y66ns28n3bcq8hp8srgpaxi9ix7myh2rlcsrr3qpwvkgdnb12jy"; }; patchPhase = '' From 386bef322d6e086883297b9e34d54ae206e005f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 28 Jul 2013 14:04:44 +0200 Subject: [PATCH 704/798] iftop: improve meta attributes - The description attribute is very long, so rename it to longDescription and add a short text in the description attribute. - Use licenses.gpl2Plus instead of free form text "GPLv2+". - Add platforms attribute so that hydra will build the package. --- pkgs/tools/networking/iftop/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/iftop/default.nix b/pkgs/tools/networking/iftop/default.nix index 3a9c0e10a78..a1f5026fb28 100644 --- a/pkgs/tools/networking/iftop/default.nix +++ b/pkgs/tools/networking/iftop/default.nix @@ -18,10 +18,15 @@ stdenv.mkDerivation rec { buildInputs = [ncurses libpcap]; - meta = { - description = "iftop does for network usage what top(1) does for CPU usage. It listens to network traffic on a named interface and displays a table of current bandwidth usage by pairs of hosts."; - - license = "GPLv2+"; + meta = with stdenv.lib; { + description = "Display bandwidth usage on a network interface"; + longDescription = '' + iftop does for network usage what top(1) does for CPU usage. It listens + to network traffic on a named interface and displays a table of current + bandwidth usage by pairs of hosts. + ''; + license = licenses.gpl2Plus; homepage = http://ex-parrot.com/pdw/iftop/; + platforms = platforms.linux; }; } From 7186fd3f7110823508a3c2342f6de04978f89377 Mon Sep 17 00:00:00 2001 From: Domen Kozar Date: Sun, 28 Jul 2013 15:56:38 +0200 Subject: [PATCH 705/798] pillow: 1.7.8 -> 2.1.0, add webp and tiff support --- pkgs/top-level/python-packages.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 048ddee396e..ba6155ffff1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3470,20 +3470,23 @@ pythonPackages = python.modules // rec { pillow = buildPythonPackage rec { - name = "Pillow-1.7.8"; + name = "Pillow-2.1.0"; src = fetchurl { url = "http://pypi.python.org/packages/source/P/Pillow/${name}.zip"; - md5 = "41d8688d4db72673069a6dc63b5289d6"; + md5 = "ec630d8ae15d4a3c4ae7b7efdeac8200"; }; - buildInputs = [ pkgs.freetype pkgs.libjpeg pkgs.unzip pkgs.zlib ]; + buildInputs = [ pkgs.freetype pkgs.libjpeg pkgs.unzip pkgs.zlib pkgs.libtiff pkgs.libwebp ]; + # NOTE: we use LCMS_ROOT as WEBP root since there is not other setting for webp. 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|^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 ;' ''; doCheck = true; From 8525695a72743ce694a91abfc011ecfaca9f32c6 Mon Sep 17 00:00:00 2001 From: Domen Kozar Date: Sun, 28 Jul 2013 17:13:19 +0200 Subject: [PATCH 706/798] sqlalchemy: add the patch so that things work, you know --- .../sqlalchemy-0.7.10-test-failures.patch | 62 +++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 pkgs/development/python-modules/sqlalchemy-0.7.10-test-failures.patch diff --git a/pkgs/development/python-modules/sqlalchemy-0.7.10-test-failures.patch b/pkgs/development/python-modules/sqlalchemy-0.7.10-test-failures.patch new file mode 100644 index 00000000000..cca4a202104 --- /dev/null +++ b/pkgs/development/python-modules/sqlalchemy-0.7.10-test-failures.patch @@ -0,0 +1,62 @@ +From abd9f52ade78c737571be69f21dba384be3edf4e Mon Sep 17 00:00:00 2001 +From: Mike Bayer +Date: Sat, 2 Mar 2013 16:24:50 -0500 +Subject: [PATCH] - Fixed an import of "logging" in test_execute which was not + working on some linux platforms. [ticket:2669] + +--- + doc/build/changelog/changelog_07.rst | 10 ++++++++++ + lib/sqlalchemy/__init__.py | 2 +- + test/engine/test_execute.py | 2 +- + 3 files changed, 12 insertions(+), 2 deletions(-) + +diff --git a/doc/build/changelog/changelog_07.rst b/doc/build/changelog/changelog_07.rst +index 416df5a..f07c9ec 100644 +--- a/doc/build/changelog/changelog_07.rst ++++ b/doc/build/changelog/changelog_07.rst +@@ -3,6 +3,16 @@ + 0.7 Changelog + ============== + ++.. changelog:: ++ :version: 0.7.11 ++ ++ .. change:: ++ :tags: bug, tests ++ :tickets: 2669 ++ :pullreq: 41 ++ ++ Fixed an import of "logging" in test_execute which was not ++ working on some linux platforms. + + .. changelog:: + :version: 0.7.10 +diff --git a/lib/sqlalchemy/__init__.py b/lib/sqlalchemy/__init__.py +index 9a21a70..6523ccb 100644 +--- a/lib/sqlalchemy/__init__.py ++++ b/lib/sqlalchemy/__init__.py +@@ -120,7 +120,7 @@ + __all__ = sorted(name for name, obj in locals().items() + if not (name.startswith('_') or inspect.ismodule(obj))) + +-__version__ = '0.7.10' ++__version__ = '0.7.11' + + del inspect, sys + +diff --git a/test/engine/test_execute.py b/test/engine/test_execute.py +index 69b94f1..a37f684 100644 +--- a/test/engine/test_execute.py ++++ b/test/engine/test_execute.py +@@ -9,7 +9,7 @@ + import sqlalchemy as tsa + from test.lib import testing, engines + from test.lib.engines import testing_engine +-import logging ++import logging.handlers + from sqlalchemy.dialects.oracle.zxjdbc import ReturningParam + from sqlalchemy.engine import base, default + from sqlalchemy.engine.base import Connection, Engine +-- +1.8.1.6 + From 5c66a46bc6f4cffd993763e0b80203ff4f5a8ba7 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 28 Jul 2013 11:46:40 -0400 Subject: [PATCH 707/798] buildNodePackage: Fix $out/bin symlink Signed-off-by: Shea Levy --- pkgs/development/web/nodejs/build-node-package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/web/nodejs/build-node-package.nix b/pkgs/development/web/nodejs/build-node-package.nix index 27e114ee40b..5c080ee315a 100644 --- a/pkgs/development/web/nodejs/build-node-package.nix +++ b/pkgs/development/web/nodejs/build-node-package.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation ({ rm -fR $out/lib/node_modules/${requireName}/node_modules mv node_modules $out/lib/node_modules/${requireName} if [ -d "$out/lib/node_modules/.bin" ]; then - ln -sv node_modules/.bin $out/bin + ln -sv $out/lib/node_modules/.bin $out/bin node=`type -p node` coffee=`type -p coffee || true` find -L $out/lib/node_modules/.bin/* -type f -print0 | \ From 5405636bb1479f98dd0e254724f2b3b28d887c4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 28 Jul 2013 22:06:00 +0200 Subject: [PATCH 708/798] Add recurseIntoAttrs for gnome3 So that we can search for gnome3.* packages like this: nix-env -qaP \* | grep gnome3 --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 713bfa45a02..19afc66ad57 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9127,10 +9127,10 @@ let inherit (pkgs) libsoup libwnck gtk_doc gnome_doc_utils; }; - gnome3 = callPackage ../desktops/gnome-3 { + gnome3 = recurseIntoAttrs (callPackage ../desktops/gnome-3 { callPackage = pkgs.newScope pkgs.gnome3; self = pkgs.gnome3; - }; + }); gnome = recurseIntoAttrs gnome2; From 2e57a1621921233ffe65255033b8eef27efba66b Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 28 Jul 2013 20:16:16 -0400 Subject: [PATCH 709/798] Linux 3.10.4 Signed-off-by: Shea Levy --- pkgs/os-specific/linux/kernel/linux-3.10.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.10.nix b/pkgs/os-specific/linux/kernel/linux-3.10.nix index dc7d6a1a9d9..7de8aa85392 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.10.nix @@ -259,7 +259,7 @@ in import ./generic.nix ( rec { - version = "3.10.3"; + version = "3.10.4"; testing = false; preConfigure = '' @@ -268,7 +268,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "195mlc628a9iyz57kibndzylgkz00cffkd982svi2fdfzxpxfm9r"; + sha256 = "1f0ynk37bhkllx2ahzp587yr8cvn809v2ad0sn7z92yv48vl4nly"; }; config = configWithPlatform stdenv.platform; From 7c23a254761e0929bcf90a24a7e3b277b0a463d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Mon, 29 Jul 2013 10:45:39 +0200 Subject: [PATCH 710/798] google-talk-plugin: Upgrade to 4.2.10 --- .../browsers/mozilla-plugins/google-talk-plugin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix index 110f9522030..4f7d3feb8ad 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix @@ -47,18 +47,18 @@ stdenv.mkDerivation rec { name = "google-talk-plugin-${version}"; # Use the following to determine the current upstream version: # curl -s http://dl.google.com/linux/talkplugin/deb/dists/stable/main/binary-amd64/Packages | sed -nr 's/^Version: *([^ ]+)-1$/\1/p' - version = "3.17.0.0"; + version = "4.2.1.0"; src = if stdenv.system == "x86_64-linux" then fetchurl { url = "${baseURL}/google-talkplugin_${version}-1_amd64.deb"; - sha256 = "1annx2zhxgn3wl468w7sk93k4xhmnx5bbdjr0d1ar7979hvrdl1x"; + sha256 = "1g7kpz2lzzz1gri5rd3isp7cfyls6gzwcw2kc8jgrgrixq9iixfd"; } else if stdenv.system == "i686-linux" then fetchurl { url = "${baseURL}/google-talkplugin_${version}-1_i386.deb"; - sha256 = "13fza920vg3qig2pnlr65mzcmmy3izla95zdpa3pk28qlfij0ryc"; + sha256 = "1z0zbblzlky9nyifxmnl49v4zafpqp3l08b9v1486sinm35rf58r"; } else throw "Google Talk does not support your platform."; From 2777f77f18b1c85d4539ca43d09257675a7bbfe8 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Mon, 29 Jul 2013 12:13:58 +0300 Subject: [PATCH 711/798] Soprano: revert clucene update because it isn't found by the build system --- 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 19afc66ad57..82fb66a8908 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5352,7 +5352,7 @@ let sofia_sip = callPackage ../development/libraries/sofia-sip { }; - soprano = callPackage ../development/libraries/soprano { clucene_core = clucene_core_2; }; + soprano = callPackage ../development/libraries/soprano { }; soqt = callPackage ../development/libraries/soqt { }; From 416bd743f086f77f0d0b31e0fcd9edbe80dd0e92 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 29 Jul 2013 10:49:04 +0200 Subject: [PATCH 712/798] haskell-language-java: update to version 0.2.5.1 --- pkgs/development/libraries/haskell/language-java/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/language-java/default.nix b/pkgs/development/libraries/haskell/language-java/default.nix index bf5cef0ddfd..aad46d4e017 100644 --- a/pkgs/development/libraries/haskell/language-java/default.nix +++ b/pkgs/development/libraries/haskell/language-java/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "language-java"; - version = "0.2.5"; - sha256 = "1l3q156m3l3fawsrgj3fr16qxr0apwg2si410j0f5hsgfmkhdrm6"; + version = "0.2.5.1"; + sha256 = "06jzski25840jk3775ia7nx11mjkyp9cmmb7y81djcndliblbyhc"; buildDepends = [ cpphs parsec syb ]; testDepends = [ filepath HUnit mtl QuickCheck testFramework testFrameworkHunit From b253eb0d593cb1041bd9c87ab03dbf72295c79d6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 29 Jul 2013 10:49:29 +0200 Subject: [PATCH 713/798] haskell-elm-server: re-generate expression with cabal2nix --- pkgs/development/compilers/elm/elm-server.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/elm/elm-server.nix b/pkgs/development/compilers/elm/elm-server.nix index bce0e933732..f86c6688eb8 100644 --- a/pkgs/development/compilers/elm/elm-server.nix +++ b/pkgs/development/compilers/elm/elm-server.nix @@ -3,7 +3,6 @@ }: cabal.mkDerivation (self: { - jailbreak = true; pname = "elm-server"; version = "0.8"; sha256 = "0mnxayfg54f5mr27sd1zw3xrdijppgvrz2yzzmhp07qc1jiyfald"; @@ -13,6 +12,7 @@ cabal.mkDerivation (self: { blazeHtml deepseq Elm filepath happstackServer HTTP mtl parsec transformers ]; + jailbreak = true; meta = { homepage = "http://elm-lang.org"; description = "The Elm language server"; From 5ec6cf37566107f01af013abbd100d8c9aa9ec75 Mon Sep 17 00:00:00 2001 From: Domen Kozar Date: Sat, 27 Jul 2013 20:51:54 +0200 Subject: [PATCH 714/798] add python3 support to pythonPackages --- .../interpreters/pypy/2.0/default.nix | 2 ++ .../interpreters/python/2.6/default.nix | 1 + .../interpreters/python/2.7/default.nix | 1 + .../interpreters/python/3.2/default.nix | 5 ++- .../interpreters/python/3.3/default.nix | 5 ++- .../interpreters/python/3.3/setup-hook.sh | 4 +-- .../python-modules/generic/default.nix | 2 +- .../python-modules/setuptools/default.nix | 24 ++++++++----- ...kip-sdist_with_utf8_encoded_filename.patch | 28 +++++++++++++++ pkgs/top-level/all-packages.nix | 14 ++++++++ pkgs/top-level/python-packages.nix | 34 +++++++++++-------- 11 files changed, 91 insertions(+), 29 deletions(-) create mode 100644 pkgs/development/python-modules/setuptools/distribute-skip-sdist_with_utf8_encoded_filename.patch diff --git a/pkgs/development/interpreters/pypy/2.0/default.nix b/pkgs/development/interpreters/pypy/2.0/default.nix index 969746d3a34..f3d1e4e9ade 100644 --- a/pkgs/development/interpreters/pypy/2.0/default.nix +++ b/pkgs/development/interpreters/pypy/2.0/default.nix @@ -59,6 +59,7 @@ let installPhase = '' mkdir -p $out/bin mkdir -p $out/pypy-c + # TODO: make libPrefix work cp -R {include,lib_pypy,lib-python,pypy-c} $out/pypy-c ln -s $out/pypy-c/pypy-c $out/bin/pypy chmod +x $out/bin/pypy @@ -68,6 +69,7 @@ let passthru = { inherit zlibSupport; libPrefix = "pypy${majorVersion}"; + executable = "pypy"; }; enableParallelBuilding = true; diff --git a/pkgs/development/interpreters/python/2.6/default.nix b/pkgs/development/interpreters/python/2.6/default.nix index f264e4179e7..61c997206c1 100644 --- a/pkgs/development/interpreters/python/2.6/default.nix +++ b/pkgs/development/interpreters/python/2.6/default.nix @@ -75,6 +75,7 @@ let passthru = { inherit zlibSupport; libPrefix = "python${majorVersion}"; + executable = "python2.6"; }; enableParallelBuilding = true; diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix index 76ef7399812..f5a39a3b242 100644 --- a/pkgs/development/interpreters/python/2.7/default.nix +++ b/pkgs/development/interpreters/python/2.7/default.nix @@ -85,6 +85,7 @@ let passthru = { inherit zlibSupport; libPrefix = "python${majorVersion}"; + executable = "python2.7"; }; enableParallelBuilding = true; diff --git a/pkgs/development/interpreters/python/3.2/default.nix b/pkgs/development/interpreters/python/3.2/default.nix index b3f5a17b064..4c858c99272 100644 --- a/pkgs/development/interpreters/python/3.2/default.nix +++ b/pkgs/development/interpreters/python/3.2/default.nix @@ -32,6 +32,8 @@ stdenv.mkDerivation { sha256 = "0pxs234g08v3lar09lvzxw4vqdpwkbqmvkv894j2w7aklskcjd6v"; }; + NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; + preConfigure = '' for i in /usr /sw /opt /pkg; do # improve purity substituteInPlace ./setup.py --replace $i /no-such-path @@ -58,7 +60,8 @@ stdenv.mkDerivation { readlineSupport = readline != null; opensslSupport = openssl != null; tkSupport = (tk != null) && (tcl != null) && (libX11 != null) && (xproto != null); - libPrefix = "python${majorVersion}m"; + libPrefix = "python${majorVersion}"; + executable = "python3.2m"; }; enableParallelBuilding = true; diff --git a/pkgs/development/interpreters/python/3.3/default.nix b/pkgs/development/interpreters/python/3.3/default.nix index 84f4ec184aa..7d3ede6594f 100644 --- a/pkgs/development/interpreters/python/3.3/default.nix +++ b/pkgs/development/interpreters/python/3.3/default.nix @@ -32,6 +32,8 @@ stdenv.mkDerivation { sha256 = "16myvina7nakyyg7r5gnjyydk8bzar988vmxsw2k485w5gz04wpp"; }; + NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; + preConfigure = '' for i in /usr /sw /opt /pkg; do # improve purity substituteInPlace ./setup.py --replace $i /no-such-path @@ -58,7 +60,8 @@ stdenv.mkDerivation { readlineSupport = readline != null; opensslSupport = openssl != null; tkSupport = (tk != null) && (tcl != null) && (libX11 != null) && (xproto != null); - libPrefix = "python${majorVersion}m"; + libPrefix = "python${majorVersion}"; + executable = "python3.3m"; }; enableParallelBuilding = true; diff --git a/pkgs/development/interpreters/python/3.3/setup-hook.sh b/pkgs/development/interpreters/python/3.3/setup-hook.sh index e6fa34bf54b..c272c87daf1 100644 --- a/pkgs/development/interpreters/python/3.3/setup-hook.sh +++ b/pkgs/development/interpreters/python/3.3/setup-hook.sh @@ -1,12 +1,12 @@ addPythonPath() { - addToSearchPathWithCustomDelimiter : PYTHONPATH $1/lib/python3.2/site-packages + addToSearchPathWithCustomDelimiter : PYTHONPATH $1/lib/python3.3/site-packages } toPythonPath() { local paths="$1" local result= for i in $paths; do - p="$i/lib/python3.2/site-packages" + p="$i/lib/python3.3/site-packages" result="${result}${result:+:}$p" done echo $result diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index d32c6818bb2..71b5c1952a0 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -33,7 +33,7 @@ , checkPhase ? '' runHook preCheck - python setup.py test + ${python}/bin/${python.executable} setup.py test runHook postCheck '' diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix index 92c39afc249..3dcaaca4c25 100644 --- a/pkgs/development/python-modules/setuptools/default.nix +++ b/pkgs/development/python-modules/setuptools/default.nix @@ -2,31 +2,37 @@ stdenv.mkDerivation rec { shortName = "setuptools-${version}"; - name = "python-${shortName}"; + name = "${python.executable}-${shortName}"; - version = "0.6c11"; + version = "0.9.8"; src = fetchurl { url = "http://pypi.python.org/packages/source/s/setuptools/${shortName}.tar.gz"; - sha256 = "1lx1hwxkhipyh206bgl90ddnfcnb68bzcvyawczbf833fadyl3v3"; + sha256 = "037b8x3fdhx8s6xafqndi3yr8x2vr42n1kzs7jxk6j9s9fd65gs2"; }; + patches = [ + # https://bitbucket.org/pypa/setuptools/issue/55/1-failure-lc_all-c-python33m-setuppy-test + ./distribute-skip-sdist_with_utf8_encoded_filename.patch + ]; + buildInputs = [ python wrapPython ]; - buildPhase = "python setup.py build --build-base $out"; + buildPhase = "${python}/bin/${python.executable} setup.py build --build-base $out"; installPhase = '' dst=$out/lib/${python.libPrefix}/site-packages mkdir -p $dst - PYTHONPATH=$dst:$PYTHONPATH - python setup.py install --prefix=$out + PYTHONPATH="$dst:$PYTHONPATH" + ${python}/bin/${python.executable} setup.py install --prefix=$out wrapPythonPrograms ''; - doCheck = false; # doesn't work with Python 2.7 - - checkPhase = "python setup.py test"; + doCheck = true; + checkPhase = '' + ${python}/bin/${python.executable} setup.py test + ''; meta = { description = "Utilities to facilitate the installation of Python packages"; diff --git a/pkgs/development/python-modules/setuptools/distribute-skip-sdist_with_utf8_encoded_filename.patch b/pkgs/development/python-modules/setuptools/distribute-skip-sdist_with_utf8_encoded_filename.patch new file mode 100644 index 00000000000..96a4f81ee58 --- /dev/null +++ b/pkgs/development/python-modules/setuptools/distribute-skip-sdist_with_utf8_encoded_filename.patch @@ -0,0 +1,28 @@ +diff -r f5ac515f062a setuptools/tests/test_sdist.py +--- a/setuptools/tests/test_sdist.py Fri Jul 26 09:52:26 2013 +0200 ++++ b/setuptools/tests/test_sdist.py Sat Jul 27 20:22:17 2013 +0200 +@@ -3,12 +3,14 @@ + + + import os ++import locale + import shutil + import sys + import tempfile + import unittest + import unicodedata + ++from setuptools.tests.py26compat import skipIf + from setuptools.compat import StringIO, unicode + from setuptools.command.sdist import sdist + from setuptools.command.egg_info import manifest_maker +@@ -318,6 +320,9 @@ + filename = filename.decode('latin-1') + self.assertFalse(filename in cmd.filelist.files) + ++ ++ @skipIf(sys.version_info >= (3,) and locale.getpreferredencoding() != 'UTF-8', ++ 'Unittest fails if locale is not utf-8 but the manifests is recorded correctly') + def test_sdist_with_utf8_encoded_filename(self): + # Test for #303. + dist = Distribution(SETUP_ATTRS) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 82fb66a8908..90102796ccb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5750,6 +5750,20 @@ let python = python26; }; + python3Packages = python33Packages; + + python33Packages = import ./python-packages.nix { + inherit pkgs; + inherit (lib) lowPrio; + python = python33; + }; + + python32Packages = import ./python-packages.nix { + inherit pkgs; + inherit (lib) lowPrio; + python = python32; + }; + python27Packages = recurseIntoAttrs (import ./python-packages.nix { inherit pkgs; inherit (lib) lowPrio; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ba6155ffff1..b5b64843faf 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5,8 +5,9 @@ isPy26 = python.majorVersion == "2.6"; isPy27 = python.majorVersion == "2.7"; optional = pkgs.lib.optional; optionals = pkgs.lib.optionals; +modules = python.modules or { readline = null; sqlite3 = null; curses = null; ssl = null; }; -pythonPackages = python.modules // rec { +pythonPackages = modules // rec { inherit python; inherit (pkgs) fetchurl fetchsvn fetchgit stdenv; @@ -444,8 +445,8 @@ pythonPackages = python.modules // rec { pythonPackages.mutagen pythonPackages.munkres pythonPackages.musicbrainzngs - python.modules.sqlite3 - python.modules.readline + modules.sqlite3 + modules.readline ]; meta = { @@ -506,7 +507,7 @@ pythonPackages = python.modules // rec { sha256 = "02dkmsmgy04l33nyw54rlxkjwff0yf3cy2kvdx8s5w344mqkkkv0"; }; - propagatedBuildInputs = [ python.modules.curses pygments ]; + propagatedBuildInputs = [ modules.curses pygments ]; doCheck = false; meta = { @@ -606,7 +607,7 @@ pythonPackages = python.modules // rec { # rev = "refs/tags/0.9.3"; # }; # - # propagatedBuildInputs = [ pythonPackages.argparse python.modules.ssl ]; + # propagatedBuildInputs = [ pythonPackages.argparse modules.ssl ]; # # doCheck = false; # @@ -2387,7 +2388,7 @@ pythonPackages = python.modules // rec { sha256 = "0xfaa6h8css3yhsmx5vcffizrz6mvmgm46q7449z3hq7g3793184"; }; - propagatedBuildInputs = [ python.modules.sqlite3 ]; + propagatedBuildInputs = [ modules.sqlite3 ]; doCheck = false; @@ -2754,7 +2755,7 @@ pythonPackages = python.modules // rec { buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ argparse jinja2 six python.modules.readline ] ++ + propagatedBuildInputs = [ argparse jinja2 six modules.readline ] ++ (optionals isPy26 [ importlib ordereddict ]); meta = { @@ -3273,7 +3274,7 @@ pythonPackages = python.modules // rec { }; buildInputs = [ nose ]; - propagatedBuildInputs = [ dateutil numpy pytz python.modules.sqlite3 ]; + propagatedBuildInputs = [ dateutil numpy pytz modules.sqlite3 ]; # Tests require networking to pass doCheck = false; @@ -4629,7 +4630,7 @@ pythonPackages = python.modules // rec { propagatedBuildInputs = [ recaptcha_client pytz memcached dateutil_1_5 paramiko flup pygments - djblets django_1_3 django_evolution pycrypto python.modules.sqlite3 + djblets django_1_3 django_evolution pycrypto modules.sqlite3 pysvn pil psycopg2 ]; }; @@ -5022,7 +5023,7 @@ pythonPackages = python.modules // rec { buildInputs = [ nose ]; - propagatedBuildInputs = [ python.modules.sqlite3 ]; + propagatedBuildInputs = [ modules.sqlite3 ]; meta = { homepage = http://www.sqlalchemy.org/; @@ -5201,7 +5202,7 @@ pythonPackages = python.modules // rec { PYTHON_EGG_CACHE = "`pwd`/.egg-cache"; - propagatedBuildInputs = [ genshi pkgs.setuptools python.modules.sqlite3 ]; + propagatedBuildInputs = [ genshi pkgs.setuptools modules.sqlite3 ]; meta = { description = "Enhanced wiki and issue tracking system for software development projects"; @@ -5384,9 +5385,12 @@ pythonPackages = python.modules // rec { md5 = "9745c28256c70c76d36adb3767a00212"; }; + inherit recursivePthLoader; + pythonPath = [ recursivePthLoader ]; + patches = [ ../development/python-modules/virtualenv-change-prefix.patch ]; - propagatedBuildInputs = [ python.modules.readline python.modules.sqlite3 ]; + propagatedBuildInputs = [ modules.readline modules.sqlite3 modules.curses ]; buildInputs = [ mock nose ]; @@ -5446,7 +5450,7 @@ pythonPackages = python.modules // rec { md5 = "11825b7074ba7043e157805e4e6e0f55"; }; - propagatedBuildInputs = [ nose python.modules.ssl ]; + propagatedBuildInputs = [ nose modules.ssl ]; meta = { description = "WSGI request and response object"; @@ -6237,7 +6241,7 @@ pythonPackages = python.modules // rec { }; buildInputs = [ pkgs.unzip unittest2 nose mock ]; - propagatedBuildInputs = [ python.modules.curses libarchive ]; + propagatedBuildInputs = [ modules.curses libarchive ]; # two tests fail doCheck = false; @@ -6478,7 +6482,7 @@ pythonPackages = python.modules // rec { sha256 = "1gj8i6j2i172cldqw98395235bn78ciagw6v17fgv01rmind3lag"; }; - buildInputs = [ django pkgs.pycairo ldap memcached python.modules.sqlite3 ]; + buildInputs = [ django pkgs.pycairo ldap memcached modules.sqlite3 ]; # error: invalid command 'test' doCheck = false; From 4993f07feecc5650f58713866cbec57fa4c4d0a0 Mon Sep 17 00:00:00 2001 From: Domen Kozar Date: Sun, 28 Jul 2013 11:23:57 +0200 Subject: [PATCH 715/798] python: include python version when prefixing python packages --- pkgs/development/python-modules/generic/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index 71b5c1952a0..cc80388e689 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -5,7 +5,7 @@ { python, setuptools, wrapPython, lib, offlineDistutils, recursivePthLoader }: -{ name, namePrefix ? "python-" +{ name, namePrefix ? python.libPrefix + "-" , buildInputs ? [] From 918e5efb99a790362c8aa8fc70edc39f2b284575 Mon Sep 17 00:00:00 2001 From: Domen Kozar Date: Mon, 29 Jul 2013 14:52:19 +0200 Subject: [PATCH 716/798] recurse into python33 and pypy packages --- .../interpreters/pypy/2.0/default.nix | 15 +++-- .../interpreters/python/3.2/default.nix | 2 + .../interpreters/python/3.3/default.nix | 2 + .../python-modules/generic/default.nix | 2 +- pkgs/top-level/all-packages.nix | 11 +++- pkgs/top-level/python-packages.nix | 61 ++++++++++--------- 6 files changed, 57 insertions(+), 36 deletions(-) diff --git a/pkgs/development/interpreters/pypy/2.0/default.nix b/pkgs/development/interpreters/pypy/2.0/default.nix index f3d1e4e9ade..2dd681239a6 100644 --- a/pkgs/development/interpreters/pypy/2.0/default.nix +++ b/pkgs/development/interpreters/pypy/2.0/default.nix @@ -7,6 +7,8 @@ let majorVersion = "2.0"; version = "${majorVersion}.2"; + pythonVersion = "2.7"; + libPrefix = "pypy${majorVersion}"; pypy = stdenv.mkDerivation rec { name = "pypy-${version}"; @@ -57,18 +59,21 @@ let ''; installPhase = '' - mkdir -p $out/bin - mkdir -p $out/pypy-c - # TODO: make libPrefix work + mkdir -p $out/{bin,include,lib,pypy-c} + cp -R {include,lib_pypy,lib-python,pypy-c} $out/pypy-c ln -s $out/pypy-c/pypy-c $out/bin/pypy chmod +x $out/bin/pypy + + # other packages expect to find stuff according to libPrefix + ln -s $out/pypy-c/include $out/include/${libPrefix} + ln -s $out/pypy-c/lib-python/${pythonVersion} $out/lib/${libPrefix} + # TODO: compile python files? ''; passthru = { - inherit zlibSupport; - libPrefix = "pypy${majorVersion}"; + inherit zlibSupport libPrefix; executable = "pypy"; }; diff --git a/pkgs/development/interpreters/python/3.2/default.nix b/pkgs/development/interpreters/python/3.2/default.nix index 4c858c99272..e09602e7381 100644 --- a/pkgs/development/interpreters/python/3.2/default.nix +++ b/pkgs/development/interpreters/python/3.2/default.nix @@ -51,6 +51,7 @@ stdenv.mkDerivation { postInstall = '' rm -rf "$out/lib/python${majorVersion}/test" + ln -s "$out/include/python${majorVersion}m" "$out/include/python${majorVersion}" ''; passthru = { @@ -62,6 +63,7 @@ stdenv.mkDerivation { tkSupport = (tk != null) && (tcl != null) && (libX11 != null) && (xproto != null); libPrefix = "python${majorVersion}"; executable = "python3.2m"; + is_py3k = true; }; enableParallelBuilding = true; diff --git a/pkgs/development/interpreters/python/3.3/default.nix b/pkgs/development/interpreters/python/3.3/default.nix index 7d3ede6594f..509249b7f24 100644 --- a/pkgs/development/interpreters/python/3.3/default.nix +++ b/pkgs/development/interpreters/python/3.3/default.nix @@ -51,6 +51,7 @@ stdenv.mkDerivation { postInstall = '' rm -rf "$out/lib/python${majorVersion}/test" + ln -s "$out/include/python${majorVersion}m" "$out/include/python${majorVersion}" ''; passthru = { @@ -62,6 +63,7 @@ stdenv.mkDerivation { tkSupport = (tk != null) && (tcl != null) && (libX11 != null) && (xproto != null); libPrefix = "python${majorVersion}"; executable = "python3.3m"; + is_py3k = true; }; enableParallelBuilding = true; diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index cc80388e689..6a7d5e5f3d5 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -55,7 +55,7 @@ python.stdenv.mkDerivation (attrs // { meta = { platforms = python.meta.platforms; } // meta // { - maintainers = (meta.maintainers or []) ++ [ lib.maintainers.chaoflow ]; + maintainers = (meta.maintainers or []) ++ [ lib.maintainers.chaoflow lib.maintainers.iElectric ]; }; # checkPhase after installPhase to run tests on installed packages diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 90102796ccb..43f0af27ab0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5736,6 +5736,7 @@ let ### DEVELOPMENT / PYTHON MODULES + # python function with default python interpreter buildPythonPackage = pythonPackages.buildPythonPackage; pythonPackages = python27Packages; @@ -5752,11 +5753,11 @@ let python3Packages = python33Packages; - python33Packages = import ./python-packages.nix { + python33Packages = recurseIntoAttrs (import ./python-packages.nix { inherit pkgs; inherit (lib) lowPrio; python = python33; - }; + }); python32Packages = import ./python-packages.nix { inherit pkgs; @@ -5770,6 +5771,12 @@ let python = python27; }); + pypyPackages = recurseIntoAttrs (import ./python-packages.nix { + inherit pkgs; + inherit (lib) lowPrio; + python = pypy; + }); + plone41Packages = recurseIntoAttrs (import ../development/web/plone/4.1.nix { inherit pkgs; pythonPackages = python26Packages; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b5b64843faf..d455a68e9b2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -302,8 +302,6 @@ pythonPackages = modules // rec { sha256 = "b0c12b8c48ed9180c7475fab18de50d63e1b517cfb46da4d2c66fc406fe902bc"; }; - installCommand = "python setup.py install --prefix=$out"; - # error: invalid command 'test' doCheck = false; @@ -501,10 +499,10 @@ pythonPackages = modules // rec { }; bpython = buildPythonPackage rec { - name = "bpython-0.11"; + name = "bpython-0.12"; src = fetchurl { - url = "http://www.bpython-interpreter.org/releases/bpython-0.11.tar.gz"; - sha256 = "02dkmsmgy04l33nyw54rlxkjwff0yf3cy2kvdx8s5w344mqkkkv0"; + url = "http://www.bpython-interpreter.org/releases/bpython-0.12.tar.gz"; + sha256 = "1ilf58qq7sazmcgg4f1wswbhcn2gb8qbbrpgm6gf0j2lbm60gabl"; }; propagatedBuildInputs = [ modules.curses pygments ]; @@ -1491,7 +1489,7 @@ pythonPackages = modules // rec { PYTHONPATH="${offlineDistutils}/lib/${python.libPrefix}/site-packages:$PYTHONPATH" export PYTHONPATH="$dst:$PYTHONPATH" - python setup.py install --prefix="$out" + ${python}/bin/${python.executable} setup.py install --prefix="$out" eapth="$out/lib/${python.libPrefix}"/site-packages/easy-install.pth if [ -e "$eapth" ]; then @@ -1692,7 +1690,7 @@ pythonPackages = modules // rec { buildPhase = "make build"; installCommand = '' - python setup.py install --prefix="$out" --root=/ --record="$out/lib/${python.libPrefix}/site-packages/dulwich/list.txt" --single-version-externally-managed + ${python}/bin/${python.executable} setup.py install --prefix="$out" --root=/ --record="$out/lib/${python.libPrefix}/site-packages/dulwich/list.txt" --single-version-externally-managed ''; # For some reason "python setup.py test" doesn't work with Python 2.6. @@ -2477,10 +2475,10 @@ pythonPackages = modules // rec { configurePhase = "cd python"; - buildPhase = "python setup.py build"; + buildPhase = "${python}/bin/${python.executable} setup.py build"; installPhase = '' - python setup.py install --prefix=$out + ${python}/bin/${python.executable} setup.py install --prefix=$out ''; meta = { @@ -2501,7 +2499,7 @@ pythonPackages = modules // rec { buildInputs = [ pkgs.swig pkgs.openssl ]; - buildPhase = "python setup.py build_ext --openssl=${pkgs.openssl}"; + buildPhase = "${python}/bin/${python.executable} setup.py build_ext --openssl=${pkgs.openssl}"; doCheck = false; # another test that depends on the network. @@ -3125,8 +3123,8 @@ pythonPackages = modules // rec { # TODO: add ATLAS=${pkgs.atlas} installCommand = '' export BLAS=${pkgs.blas} LAPACK=${pkgs.liblapack} - python setup.py build --fcompiler="gnu95" - python setup.py install --prefix=$out + ${python}/bin/${python.executable} setup.py build --fcompiler="gnu95" + ${python}/bin/${python.executable} setup.py install --prefix=$out ''; # error: invalid command 'test' @@ -3704,12 +3702,12 @@ pythonPackages = modules // rec { buildInputs = [ python pkgs.portaudio ]; buildPhase = if stdenv.isDarwin then '' - PORTAUDIO_PATH="${pkgs.portaudio}" python setup.py build --static-link + PORTAUDIO_PATH="${pkgs.portaudio}" ${python}/bin/${python.executable} setup.py build --static-link '' else '' - python setup.py build + ${python}/bin/${python.executable} setup.py build ''; - installPhase = "python setup.py install --prefix=$out"; + installPhase = "${python}/bin/${python.executable} setup.py install --prefix=$out"; meta = { description = "Python bindings for PortAudio"; @@ -3965,7 +3963,7 @@ pythonPackages = modules // rec { buildInputs = [ python ]; installPhase = '' - python setup.py install --prefix=$out + ${python}/bin/${python.executable} setup.py install --prefix=$out ''; meta = { @@ -3994,7 +3992,7 @@ pythonPackages = modules // rec { propagatedBuildInputs = [ urlgrabber ]; checkPhase = '' - python tests/baseclass.py -vv + ${python}/bin/${python.executable} tests/baseclass.py -vv ''; meta = { @@ -4072,7 +4070,7 @@ pythonPackages = modules // rec { propagatedBuildInputs = [ pkgs.parted ]; checkPhase = '' - python -m unittest discover -v + ${python}/bin/${python.executable} -m unittest discover -v ''; meta = { @@ -4744,8 +4742,8 @@ pythonPackages = modules // rec { # TODO: add ATLAS=${pkgs.atlas} installCommand = '' export BLAS=${pkgs.blas} LAPACK=${pkgs.liblapack} - python setup.py build --fcompiler="gnu95" - python setup.py install --prefix=$out + ${python}/bin/${python.executable} setup.py build --fcompiler="gnu95" + ${python}/bin/${python.executable} setup.py install --prefix=$out ''; meta = { @@ -5323,12 +5321,18 @@ pythonPackages = modules // rec { unittest2 = buildPythonPackage rec { - name = "unittest2-0.5.1"; + version = "0.5.1"; + name = "unittest2-${version}"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/u/unittest2/${name}.tar.gz"; - md5 = "a0af5cac92bbbfa0c3b0e99571390e0f"; - }; + src = if python.is_py3k or false + then fetchurl { + url = "http://pypi.python.org/packages/source/u/unittest2py3k/unittest2py3k-${version}.tar.gz"; + sha256 = "00yl6lskygcrddx5zspkhr0ibgvpknl4678kkm6s626539grq93q"; + } + else fetchurl { + url = "http://pypi.python.org/packages/source/u/unittest2/unittest2-${version}.tar.gz"; + md5 = "a0af5cac92bbbfa0c3b0e99571390e0f"; + }; meta = { description = "A backport of the new features added to the unittest testing framework in Python 2.7"; @@ -6104,13 +6108,14 @@ pythonPackages = modules // rec { zope_testing = buildPythonPackage rec { name = "zope.testing-${version}"; - version = "4.1.1"; + version = "4.1.2"; src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.testing/${name}.tar.gz"; - md5 = "2e3829841090d6adff718b8b73c87b6b"; + url = "http://pypi.python.org/packages/source/z/zope.testing/${name}.zip"; + md5 = "01c30c342c6a18002a762bd5d320a6e9"; }; + buildInputs = [ pkgs.unzip ]; propagatedBuildInputs = [ zope_interface zope_exceptions zope_location ]; meta = { From c5243b6e7d565bdc036046da2f80c5c8122957b7 Mon Sep 17 00:00:00 2001 From: Domen Kozar Date: Mon, 29 Jul 2013 16:38:29 +0200 Subject: [PATCH 717/798] python-markdown: 2.0.3 -> 2.3.1 --- 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 d455a68e9b2..982503b99d3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2565,12 +2565,12 @@ pythonPackages = modules // rec { }; markdown = buildPythonPackage rec { - version = "2.0.3"; + version = "2.3.1"; name = "markdown-${version}"; src = fetchurl { - url = "http://pypi.python.org/packages/source/M/Markdown/Markdown-2.0.3.tar.gz"; - md5 = "751e8055be2433dfd1a82e0fb1b12f13"; + url = "http://pypi.python.org/packages/source/M/Markdown/Markdown-${version}.tar.gz"; + sha256 = "147j9hznv2r187a86d28glmg3pckfrdp0nz9yh7s1aqpawwdkszz"; }; # error: invalid command 'test' From cc98ea4a84e8a8f88a42a161b52cfcbfda09949a Mon Sep 17 00:00:00 2001 From: Domen Kozar Date: Mon, 29 Jul 2013 17:10:40 +0200 Subject: [PATCH 718/798] numpy: 1.6.1 -> 1.7.1 --- 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 982503b99d3..9fc187f9302 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3109,11 +3109,11 @@ pythonPackages = modules // rec { }; numpy = buildPythonPackage ( rec { - name = "numpy-1.6.1"; + name = "numpy-1.7.1"; src = fetchurl { url = "mirror://sourceforge/numpy/${name}.tar.gz"; - sha256 = "1pawfmf7j7pd3mjzhmmw9hkglc2qdirrkvv29m5nsmpf2b3ip2vq"; + sha256 = "0jh832j439jj2b7m1z5a4rv5cpdn1yiw1r6gwrhdihw562d029am"; }; preConfigure = '' From eabf34703310a730d565066e1745d3beaaab9d2d Mon Sep 17 00:00:00 2001 From: Domen Kozar Date: Mon, 29 Jul 2013 17:48:49 +0200 Subject: [PATCH 719/798] simplejson: 2.1.3 -> 3.3.0 --- 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 9fc187f9302..d5e410b006a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4841,11 +4841,11 @@ pythonPackages = modules // rec { simplejson = buildPythonPackage (rec { - name = "simplejson-2.1.3"; + name = "simplejson-3.3.0"; src = fetchurl { url = "http://pypi.python.org/packages/source/s/simplejson/${name}.tar.gz"; - md5 = "58d9b1d8fa17ea4ce205cea088607e02"; + md5 = "0e29b393bceac8081fa4e93ff9f6a001"; }; meta = { From 19993fcbf8c649c16fed5b7cf9d81343c3bf3421 Mon Sep 17 00:00:00 2001 From: Domen Kozar Date: Mon, 29 Jul 2013 18:01:30 +0200 Subject: [PATCH 720/798] Logbook: 0.4.1 -> 0.4.2 --- 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 d5e410b006a..a1b237d545c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6631,12 +6631,12 @@ pythonPackages = modules // rec { Logbook = buildPythonPackage rec { name = "Logbook-${version}"; - version = "0.4.1"; + version = "0.4.2"; src = fetchurl { url = "https://pypi.python.org/packages/source/L/Logbook/${name}.tar.gz"; # md5 = "143cb15af4c4a784ca785a1546ad1b93"; - sha256 = "0iim9pcyl57c6z9i1kfw5nz92qrnpz2l0bz4lir2xrqi8m03q3d7"; + sha256 = "1g2pnhxh7m64qsrs0ifwcmpfk7gqjvrawd8z66i001rsdnq778v0"; }; meta = { From 662366e4f0e40a1d4b319936ba6dc64fe18b3cb7 Mon Sep 17 00:00:00 2001 From: Domen Kozar Date: Mon, 29 Jul 2013 18:48:54 +0200 Subject: [PATCH 721/798] zope_testrunner: 4.0.4 -> 4.4.1 --- pkgs/top-level/python-packages.nix | 60 +++++++++++++++++++++++++----- 1 file changed, 51 insertions(+), 9 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a1b237d545c..1376ad729e9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5078,11 +5078,11 @@ pythonPackages = modules // rec { subunit = buildPythonPackage rec { name = "subunit-${version}"; - version = "0.0.9"; + version = "0.0.13"; src = fetchurl { - url = "https://launchpad.net/subunit/trunk/0.0.9/+download/python-${name}.tar.gz"; - sha256 = "0g3bk8lfd52zjzg43h47h2kckchm3xyv1gcr85nca2i50rcrpj56"; + url = "https://launchpad.net/subunit/trunk/${version}/+download/python-${name}.tar.gz"; + sha256 = "0f3xni4z1hbmg4dqxak85ibpf9pajxn6qzw1xj79gwnr8xxb66zj"; }; propagatedBuildInputs = [ testtools ]; @@ -5157,13 +5157,15 @@ pythonPackages = modules // rec { testtools = buildPythonPackage rec { name = "testtools-${version}"; - version = "0.9.24"; + version = "0.9.32"; src = fetchurl { - url = "https://launchpad.net/testtools/0.9/0.9.24/+download/${name}.tar.gz"; - sha256 = "0mgkvd7c1aw34nlnz2nmll5k01aqhixxiikbs2nfyk3xfa4221x7"; + url = "https://pypi.python.org/packages/source/t/testtools/${name}.tar.gz"; + sha256 = "1smgk3y7xfzh5xk5wydb6n5lx4g5i6y4w8ajrdnskx1jqr67wyyq"; }; + propagatedBuildInputs = [ pythonPackages.python_mimeparse pythonPackages.extras ]; + meta = { description = "A set of extensions to the Python standard library's unit testing framework"; homepage = http://pypi.python.org/pypi/testtools; @@ -5172,6 +5174,46 @@ pythonPackages = modules // rec { }; + python_mimeparse = buildPythonPackage rec { + name = "python-mimeparse-${version}"; + version = "0.1.4"; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/python-mimeparse/${name}.tar.gz"; + sha256 = "1hyxg09kaj02ri0rmwjqi86wk4nd1akvv7n0dx77azz76wga4s9w"; + }; + + # error: invalid command 'test' + doCheck = false; + + meta = { + description = "A module provides basic functions for parsing mime-type names and matching them against a list of media-ranges."; + homepage = https://code.google.com/p/mimeparse/; + license = pkgs.lib.licenses.mit; + }; + }; + + + extras = buildPythonPackage rec { + name = "extras-${version}"; + version = "0.0.3"; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/e/extras/extras-${version}.tar.gz"; + sha256 = "1h7zx4dfyclalg0fqnfjijpn0f793a9mx8sy3b27gd31nr6dhq3s"; + }; + + # error: invalid command 'test' + doCheck = false; + + meta = { + description = "A module provides basic functions for parsing mime-type names and matching them against a list of media-ranges."; + homepage = https://code.google.com/p/mimeparse/; + license = pkgs.lib.licenses.mit; + }; + }; + + # TODO # py.error.EACCES: [Permission denied]: mkdir('/homeless-shelter',) # builder for `/nix/store/0czwg0n3pfkmpjphqv1jxfjlgkbziwsx-python-tox-1.4.3.drv' failed with exit code 1 @@ -6129,16 +6171,16 @@ pythonPackages = modules // rec { zope_testrunner = buildPythonPackage rec { name = "zope.testrunner-${version}"; - version = "4.0.4"; + version = "4.4.1"; src = fetchurl { url = "http://pypi.python.org/packages/source/z/zope.testrunner/${name}.zip"; - md5 = "cd648fc865a79aa0950e73342836dd4c"; + md5 = "1d689abad000419891494b30dd7d8190"; }; buildInputs = [ pkgs.unzip ]; - propagatedBuildInputs = [ subunit zope_interface zope_exceptions zope_testing ]; + propagatedBuildInputs = [ subunit zope_interface zope_exceptions zope_testing six ]; meta = { description = "A flexible test runner with layer support"; From 0f7a0411b2a9c67e7996d14e8732fbc1feea36b4 Mon Sep 17 00:00:00 2001 From: Domen Kozar Date: Mon, 29 Jul 2013 18:52:04 +0200 Subject: [PATCH 722/798] psycopg2: 2.0.13 -> 2.5.1 --- 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 1376ad729e9..d96555a2b84 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3624,14 +3624,14 @@ pythonPackages = modules // rec { psycopg2 = buildPythonPackage rec { - name = "psycopg2-2.0.13"; + name = "psycopg2-2.5.1"; # error: invalid command 'test' doCheck = false; src = fetchurl { - url = "http://initd.org/pub/software/psycopg/PSYCOPG-2-0/${name}.tar.gz"; - sha256 = "0arkaa1nbbd3pyn4l1bc75wi7nff3vxxh4s8sj5al5hv20p64pm1"; + url = "https://pypi.python.org/packages/source/p/psycopg2/psycopg2-2.5.1.tar.gz"; + sha256 = "1v7glzzzykbaqj7dhpr0qds9cf4maxmn7f5aazpqnbg0ly40r9v5"; }; propagatedBuildInputs = [ pkgs.postgresql ]; From 4f5960e20d8e91db40aadd5722bfeeaae054791f Mon Sep 17 00:00:00 2001 From: Domen Kozar Date: Mon, 29 Jul 2013 19:09:12 +0200 Subject: [PATCH 723/798] distutils2: remove the package, nothing depends on it and it's obsolete --- pkgs/top-level/python-packages.nix | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d96555a2b84..123607cb133 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1510,29 +1510,6 @@ pythonPackages = modules // rec { }; - distutils2 = buildPythonPackage rec { - name = "distutils2-${version}"; - version = "1.0a4"; - - src = fetchurl { - url = "http://pypi.python.org/packages/source/D/Distutils2/Distutils2-${version}.tar.gz"; - md5 = "52bc9dffb394970c27e02853ae3a3241"; - }; - - patchPhase = '' - sed -e "s#html.entities#htmlentitydefs#g" -i distutils2/pypi/simple.py - ''; - - doCheck = false; - - meta = { - description = "A Python Packaging Library"; - homepage = http://pypi.python.org/pypi/Distutils2; - license = "PSF"; - }; - }; - - distutils_extra = buildPythonPackage rec { name = "distutils-extra-2.26"; From 7458f29dc9515c51f86995528187b5182c37a14f Mon Sep 17 00:00:00 2001 From: Domen Kozar Date: Mon, 29 Jul 2013 19:31:58 +0200 Subject: [PATCH 724/798] don't wrap scripts in EGG-INFO/scripts since they are called from python --- pkgs/development/python-modules/generic/wrap.sh | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/generic/wrap.sh b/pkgs/development/python-modules/generic/wrap.sh index 6b02369927b..a7c839799b1 100644 --- a/pkgs/development/python-modules/generic/wrap.sh +++ b/pkgs/development/python-modules/generic/wrap.sh @@ -23,10 +23,13 @@ wrapPythonProgramsIn() { fi if head -n1 "$i" | grep -q /python; then - echo "wrapping \`$i'..." - wrapProgram "$i" \ - --prefix PYTHONPATH ":" $program_PYTHONPATH \ - --prefix PATH ":" $program_PATH + # dont wrap EGG-INFO scripts since they are called from python + if echo "$i" | grep -v EGG-INFO/scripts; then + echo "wrapping \`$i'..." + wrapProgram "$i" \ + --prefix PYTHONPATH ":" $program_PYTHONPATH \ + --prefix PATH ":" $program_PATH + fi fi done } From 0be7ef35bb7d9d11e2a9cc42fa62b4a3815feb99 Mon Sep 17 00:00:00 2001 From: Domen Kozar Date: Mon, 29 Jul 2013 21:16:35 +0200 Subject: [PATCH 725/798] gmvault: use logbook 0.4.2 --- pkgs/tools/networking/gmvault/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/networking/gmvault/default.nix b/pkgs/tools/networking/gmvault/default.nix index 1ea2b761fc8..8ab93948191 100644 --- a/pkgs/tools/networking/gmvault/default.nix +++ b/pkgs/tools/networking/gmvault/default.nix @@ -24,6 +24,7 @@ buildPythonPackage rec { patchPhase = '' cat ${startScript} > etc/scripts/gmvault chmod +x etc/scripts/gmvault + substituteInPlace setup.py --replace "Logbook==0.4.1" "Logbook==0.4.2" ''; meta = { From ae7adcb6e4365e008f01d3799b8488eb1badc406 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Mon, 29 Jul 2013 23:40:54 +0200 Subject: [PATCH 726/798] git: find global configs in /etc/ instead of /etc --- .../version-management/git-and-tools/git/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index fcd3b77889d..dd603e75562 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { # required to support pthread_cancel() NIX_LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s"; - makeFlags = "prefix=\${out} PERL_PATH=${perl}/bin/perl SHELL_PATH=${stdenv.shell} " + makeFlags = "prefix=\${out} sysconfdir=/etc/ PERL_PATH=${perl}/bin/perl SHELL_PATH=${stdenv.shell} " + (if pythonSupport then "PYTHON_PATH=${python}/bin/python" else "NO_PYTHON=1"); # FIXME: "make check" requires Sparse; the Makefile must be tweaked From 4c9ba428f9c08c000259a403b1bec5179d4f5428 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Tue, 30 Jul 2013 00:20:42 +0200 Subject: [PATCH 727/798] nose: remove failing test --- pkgs/top-level/python-packages.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 123607cb133..df20982067f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2980,6 +2980,10 @@ pythonPackages = modules // rec { buildInputs = [ coverage ]; + preCheck = '' + # see https://github.com/nose-devs/nose/issues/627 + rm functional_tests/test_multiprocessing/test_concurrent_shared.py + ''; doCheck = ! stdenv.isDarwin; }; From cd4b5e1a35863f7c79c47c8dc874b23b423f71f8 Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 29 Jul 2013 07:33:58 +0200 Subject: [PATCH 728/798] fillDiskWithDebs: Create fake start-stop-daemon. This is needed in order to prevent services from starting while populating the image with the contents of the .deb files. The procedure used here is exactly the same as used in debootstrap. Signed-off-by: aszlig --- pkgs/build-support/vm/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 987da558519..063341ce1d7 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -599,8 +599,17 @@ rec { debs="$debs /inst/$i"; done chroot=$(type -tP chroot) + + # Create a fake start-stop-daemon script, as done in debootstrap. + mv "/mnt/sbin/start-stop-daemon" "/mnt/sbin/start-stop-daemon.REAL" + echo "#!/bin/true" > "/mnt/sbin/start-stop-daemon" + chmod 755 "/mnt/sbin/start-stop-daemon" + PATH=/usr/bin:/bin:/usr/sbin:/sbin $chroot /mnt \ /usr/bin/dpkg --install --force-all $debs < /dev/null || true + + # Move the real start-stop-daemon back into its place. + mv "/mnt/sbin/start-stop-daemon.REAL" "/mnt/sbin/start-stop-daemon" done echo "running post-install script..." From b42eb45429a26cb900d8db2474a88058bf266e00 Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 29 Jul 2013 07:38:59 +0200 Subject: [PATCH 729/798] thttpd: New package, version 2.25b. We already have mini_httpd, but IMHO it is *too* minimal as in not very flexible in configuration (for example, I haven't found any runtime configuration for disabling logging), so that's why I decided to add thttpd, which serves quite well as an ad-hoc HTTPd. Signed-off-by: aszlig --- pkgs/servers/http/thttpd/default.nix | 27 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/servers/http/thttpd/default.nix diff --git a/pkgs/servers/http/thttpd/default.nix b/pkgs/servers/http/thttpd/default.nix new file mode 100644 index 00000000000..e03183cbe49 --- /dev/null +++ b/pkgs/servers/http/thttpd/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "thttpd-${version}"; + version = "2.25b"; + + src = fetchurl { + url = "http://acme.com/software/thttpd/${name}.tar.gz"; + sha256 = "0q13sfkh6amn5wk0ccbmxq3mnhlm8g5pnyk910fa5xngn449nw87"; + }; + + prePatch = '' + sed -i -e 's/getline/getlineX/' extras/htpasswd.c + ''; + + preInstall = '' + ensureDir "$out/man/man1" + sed -i -e 's/-o bin -g bin *//' Makefile + sed -i -e '/chgrp/d' extras/Makefile + ''; + + meta = { + description = "Tiny/turbo/throttling HTTP server"; + homepage = "http://www.acme.com/software/thttpd/"; + license = stdenv.lib.licenses.bsd2; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 43f0af27ab0..352d58393bc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6103,6 +6103,8 @@ let }); squid = squids.squid31; # has ipv6 support + thttpd = callPackage ../servers/http/thttpd { }; + tomcat5 = callPackage ../servers/http/tomcat/5.0.nix { }; tomcat6 = callPackage ../servers/http/tomcat/6.0.nix { }; From 69dccda3c003a167be151d5d264357cdb6e0aa33 Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 29 Jul 2013 17:57:06 +0200 Subject: [PATCH 730/798] VM builds: Update debian Wheezy image to v7.1. Wheezy has been released on June 15th and on all mirrors the SHA256 hash of Packages.bz2 has changed to reflect the new release, so let's update. Here is the release announcement from Debian: http://www.debian.org/News/2013/20130615 It also seems that the versioning scheme has changed in version 7.x, so they seem to have switched to a two digit versioning scheme. This means, that the attribute name "debian70..." should really be something like "debian7...", but I'm keeping the attribute as-is to not break references. Signed-off-by: aszlig --- pkgs/build-support/vm/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 063341ce1d7..dbab401d9ba 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -1403,22 +1403,22 @@ rec { }; debian70i386 = { - name = "debian-7.0.0-wheezy-i386"; - fullName = "Debian 7.0.0 Wheezy (i386)"; + name = "debian-7.1.0-wheezy-i386"; + fullName = "Debian 7.1.0 Wheezy (i386)"; packagesList = fetchurl { url = mirror://debian/dists/wheezy/main/binary-i386/Packages.bz2; - sha256 = "712939639e2cc82615c85bdf81edf31edef0fda003ac2b32998e438aee403ab8"; + sha256 = "c2751c48805b41c3eddd31cfe92ffa46df13a7d6ce7896b8dc5ce4b2f7f329c5"; }; urlPrefix = mirror://debian; packages = commonDebianPackages; }; debian70x86_64 = { - name = "debian-7.0.0-wheezy-amd64"; - fullName = "Debian 7.0.0 Wheezy (amd64)"; + name = "debian-7.1.0-wheezy-amd64"; + fullName = "Debian 7.1.0 Wheezy (amd64)"; packagesList = fetchurl { url = mirror://debian/dists/wheezy/main/binary-amd64/Packages.bz2; - sha256 = "e79132f7db6655013be1f75feb9812b071386525246d8639679b322487d2732a"; + sha256 = "9b15b4348cadbcf170c9e83d6fbcb64efac2b787ebdfef16ba21dd70dfca0001"; }; urlPrefix = mirror://debian; packages = commonDebianPackages; From 874019b3c4c1af32c5c2460c10b8776793670566 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Tue, 30 Jul 2013 09:26:35 +0200 Subject: [PATCH 731/798] limnoria: add git as dependency, otherwise build fails --- pkgs/top-level/python-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index df20982067f..8ad896af8ef 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2363,6 +2363,7 @@ pythonPackages = modules // rec { sha256 = "0xfaa6h8css3yhsmx5vcffizrz6mvmgm46q7449z3hq7g3793184"; }; + buildInputs = [ pkgs.git ]; propagatedBuildInputs = [ modules.sqlite3 ]; doCheck = false; From 31ff9d9c68eed92cecd69847ff67171eb50fb589 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Tue, 30 Jul 2013 09:35:36 +0200 Subject: [PATCH 732/798] Limnoria: update to 2013-06-01 Old build was hanging when building for python3, see http://hydra.nixos.org/build/5615679/log/raw --- 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 8ad896af8ef..befb8ab88e7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2358,9 +2358,9 @@ pythonPackages = modules // rec { name = "limnoria-20130327"; src = fetchurl { - url = https://pypi.python.org/packages/source/l/limnoria/limnoria-2013-03-27T16:32:26+0100.tar.gz; - name = "limnoria-2013-03-27.tar.gz"; - sha256 = "0xfaa6h8css3yhsmx5vcffizrz6mvmgm46q7449z3hq7g3793184"; + url = https://pypi.python.org/packages/source/l/limnoria/limnoria-2013-06-01T10:32:51+0200.tar.gz; + name = "limnoria-2013-06-01.tar.gz"; + sha256 = "1i8q9zzf43sr3n1q4h6h1z8nz31g4aa8dq94ywvfbh7hklmchq6n"; }; buildInputs = [ pkgs.git ]; From a0740092ce0f2be164151b6af29083147cf29163 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Tue, 30 Jul 2013 09:51:43 +0200 Subject: [PATCH 733/798] nose: run tests as noted in https://code.google.com/p/python-nose/issues/detail?id=387#c4 --- pkgs/top-level/python-packages.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index befb8ab88e7..c07129b8def 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2981,11 +2981,12 @@ pythonPackages = modules // rec { buildInputs = [ coverage ]; - preCheck = '' - # see https://github.com/nose-devs/nose/issues/627 - rm functional_tests/test_multiprocessing/test_concurrent_shared.py - ''; doCheck = ! stdenv.isDarwin; + checkPhase = if python.is_py3k or false then '' + ${python}/bin/${python.executable} setup.py build_tests + '' else "" + '' + ${python}/bin/${python.executable} selftest.py + ''; }; nose2 = if isPy26 then null else (buildPythonPackage rec { From 0668d54827f5b10541e018425f906937f035c8b5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 30 Jul 2013 11:39:51 +0200 Subject: [PATCH 734/798] python-packages.nix: unsubscribe myself from some Hydra mails --- pkgs/top-level/python-packages.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0162bae4fa2..bd2d5cca922 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2039,7 +2039,6 @@ pythonPackages = modules // rec { meta = { description = "automatically generated zsh completion function for Python's option parser modules"; license = "BSD"; - maintainers = [ stdenv.lib.maintainers.simons ]; }; }; @@ -2590,7 +2589,7 @@ pythonPackages = modules // rec { meta = with stdenv.lib; { description = "python plotting library, making publication quality plots"; homepage = "http://matplotlib.sourceforge.net/"; - maintainers = with maintainers; [ lovek323 simons ]; + maintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; }; }); @@ -3415,8 +3414,6 @@ pythonPackages = modules // rec { does it require C extensions to be compiled. It should work on any platform that supports the standard Python pty module. ''; - - maintainers = [ stdenv.lib.maintainers.simons ]; }; }; From 44731b5251cc5771cf4582ee3a2223c9379f0c4c Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Tue, 30 Jul 2013 12:03:03 +0200 Subject: [PATCH 735/798] Bump disnix,disnixos and dysnomia to latest development versions --- pkgs/tools/package-management/disnix/default.nix | 6 +++--- pkgs/tools/package-management/disnix/disnixos/default.nix | 6 +++--- pkgs/tools/package-management/disnix/dysnomia/default.nix | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/package-management/disnix/default.nix b/pkgs/tools/package-management/disnix/default.nix index e63de65410c..62a644e195a 100644 --- a/pkgs/tools/package-management/disnix/default.nix +++ b/pkgs/tools/package-management/disnix/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, dbus_glib, libxml2, libxslt, getopt, nixUnstable, libintlOrEmpty, libiconvOrEmpty }: stdenv.mkDerivation { - name = "disnix-0.3pre106668a42f982af4180d7657b47d8316862d4d1d"; + name = "disnix-0.3pre57b56b6b9d43b48ce72e4e47f6acfdb3b1cbe3ef"; src = fetchurl { - url = http://hydra.nixos.org/build/5430218/download/4/disnix-0.3pre106668a42f982af4180d7657b47d8316862d4d1d.tar.gz; - sha256 = "1cnrbw70gpkm9rg5a3j0kkbq0q0wrkc5hwqb614fvja20y52hld6"; + url = http://hydra.nixos.org/build/5576475/download/4/disnix-0.3pre57b56b6b9d43b48ce72e4e47f6acfdb3b1cbe3ef.tar.gz; + sha256 = "18sxs4c3a1sr2sldd6p7rmxg6541v1hsl987vzc7ij8mwkcnm1r0"; }; buildInputs = [ pkgconfig dbus_glib libxml2 libxslt getopt nixUnstable libintlOrEmpty libiconvOrEmpty ]; diff --git a/pkgs/tools/package-management/disnix/disnixos/default.nix b/pkgs/tools/package-management/disnix/disnixos/default.nix index 46422d010fa..80ac91b5489 100644 --- a/pkgs/tools/package-management/disnix/disnixos/default.nix +++ b/pkgs/tools/package-management/disnix/disnixos/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, disnix, socat, pkgconfig }: stdenv.mkDerivation { - name = "disnixos-0.2pre827a5b52b8a68b7c16a2d92898e6281c54e7b1ff"; + name = "disnixos-0.2pre77208b9bf296b2376bd95154b333db304b50bec0.tar.gz"; src = fetchurl { - url = http://hydra.nixos.org/build/5430738/download/3/disnixos-0.2pre827a5b52b8a68b7c16a2d92898e6281c54e7b1ff.tar.gz; - sha256 = "1alyzypli32whd371w9wfxcnq6by9zng88nysd3gy8nrvns8di7x"; + url = http://hydra.nixos.org/build/5578534/download/3/disnixos-0.2pre77208b9bf296b2376bd95154b333db304b50bec0.tar.gz; + sha256 = "0a9ah16rhq6kgknylq9dsv6mk8pp4vbahqls9hcg99ys9bn18d8z"; }; buildInputs = [ socat pkgconfig disnix ]; diff --git a/pkgs/tools/package-management/disnix/dysnomia/default.nix b/pkgs/tools/package-management/disnix/dysnomia/default.nix index d932d0fa8b2..de3690e3e20 100644 --- a/pkgs/tools/package-management/disnix/dysnomia/default.nix +++ b/pkgs/tools/package-management/disnix/dysnomia/default.nix @@ -16,10 +16,10 @@ assert enableSubversionRepository -> subversion != null; assert enableEjabberdDump -> ejabberd != null; stdenv.mkDerivation { - name = "dysnomia-0.3predff2da00e2d29d15feb2b6b42931232d691f7f03"; + name = "dysnomia-0.3pre7c81cc254a0f6966dd9ac55f945c458b45b3d428.tar.gz"; src = fetchurl { - url = http://hydra.nixos.org/build/5430159/download/1/dysnomia-0.3predff2da00e2d29d15feb2b6b42931232d691f7f03.tar.gz; - sha256 = "1y9qf14ygdgq2hjh1p6rf7hcgij02wv091s8wpsn36mrmc9zk6rf"; + url = http://hydra.nixos.org/build/5613342/download/1/dysnomia-0.3pre7c81cc254a0f6966dd9ac55f945c458b45b3d428.tar.gz; + sha256 = "0ll09vh94ygqkncq4ddb62s4c84n3pr5qy0gi1ywy0j30qk6zvsq"; }; preConfigure = if enableEjabberdDump then "export PATH=$PATH:${ejabberd}/sbin" else ""; From 74c52ac8ad9d5e7383de4a7f495d087f14ce51a7 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 30 Jul 2013 11:45:54 +0200 Subject: [PATCH 736/798] nixpkgs-lint: Add support for filtering by maintainer For instance, you can now say "nixpkgs-lint -m alice" to show only packages maintained by Alice. Also added command-line parsing. --- maintainers/scripts/nixpkgs-lint.pl | 58 ++++++++++++++++++++++------- 1 file changed, 45 insertions(+), 13 deletions(-) diff --git a/maintainers/scripts/nixpkgs-lint.pl b/maintainers/scripts/nixpkgs-lint.pl index 0b1519ef15c..c82cf75e3f8 100755 --- a/maintainers/scripts/nixpkgs-lint.pl +++ b/maintainers/scripts/nixpkgs-lint.pl @@ -3,25 +3,43 @@ use strict; use List::Util qw(min); use XML::Simple qw(:strict); -use Data::Dumper; +use Getopt::Long qw(:config gnu_getopt); +# Parse the command line. +my $path = ""; my $filter = "*"; +my $maintainer; -my $xml = `nix-env -f . -qa '$filter' --xml --meta --drv-path`; +sub showHelp { + print <’) + +Examples: + \$ nixpkgs-lint -f /my/nixpkgs -p firefox + \$ nixpkgs-lint -f /my/nixpkgs -m eelco +EOF + exit 0; +} + +GetOptions("package|p=s" => \$filter, + "maintainer|m=s" => \$maintainer, + "file|f=s" => \$path, + "help" => sub { showHelp() } + ) + or die("syntax: $0 ...\n"); + +# Evaluate Nixpkgs into an XML representation. +my $xml = `nix-env -f '$path' -qa '$filter' --xml --meta --drv-path`; +die "$0: evaluation of ‘$path’ failed\n" if $? != 0; my $info = XMLin($xml, KeyAttr => { 'item' => '+attrPath', 'meta' => 'name' }, ForceArray => 1, SuppressEmpty => '' ) or die "cannot parse XML output"; -#print Dumper($info); - -my %pkgsByName; - -foreach my $attr (sort keys %{$info->{item}}) { - my $pkg = $info->{item}->{$attr}; - #print STDERR "attr = $attr, name = $pkg->{name}\n"; - $pkgsByName{$pkg->{name}} //= []; - push @{$pkgsByName{$pkg->{name}}}, $pkg; -} - # Check meta information. print "=== Package meta information ===\n\n"; my $nrMissingMaintainers = 0; @@ -44,6 +62,11 @@ foreach my $attr (sort keys %{$info->{item}}) { @maintainers = ($x->{value}); } + if (defined $maintainer && scalar(grep { $_ =~ /$maintainer/i } @maintainers) == 0) { + delete $info->{item}->{$attr}; + next; + } + if (scalar @maintainers == 0) { print "$attr: Lacks a maintainer\n"; $nrMissingMaintainers++; @@ -86,6 +109,15 @@ print "\n"; # Find packages that have the same name. print "=== Package name collisions ===\n\n"; +my %pkgsByName; + +foreach my $attr (sort keys %{$info->{item}}) { + my $pkg = $info->{item}->{$attr}; + #print STDERR "attr = $attr, name = $pkg->{name}\n"; + $pkgsByName{$pkg->{name}} //= []; + push @{$pkgsByName{$pkg->{name}}}, $pkg; +} + my $nrCollisions = 0; foreach my $name (sort keys %pkgsByName) { my @pkgs = @{$pkgsByName{$name}}; From c7e680c5bd1754d6a93aec0151549d3b60384527 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Tue, 30 Jul 2013 12:19:57 +0200 Subject: [PATCH 737/798] Add fs-walk node package + updated other nodejs packages --- pkgs/top-level/node-packages-generated.nix | 169 ++++++++++++--------- pkgs/top-level/node-packages.json | 1 + 2 files changed, 99 insertions(+), 71 deletions(-) diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix index f8238b52a65..4d3ae03e19f 100644 --- a/pkgs/top-level/node-packages-generated.nix +++ b/pkgs/top-level/node-packages-generated.nix @@ -758,24 +758,24 @@ { name = "colors"; spec = "0.6.x"; - version = "0.6.0"; + version = "0.6.1"; topLevel = false; dependencies = [ ]; patchLatest = false; - sha1 = "07ec10d8ac4f5a2e78f8d820e3e7832b3b463cad"; - tarball = "http://registry.npmjs.org/colors/-/colors-0.6.0.tgz"; + sha1 = "59c7799f6c91e0e15802980a98ed138b3c78f4e9"; + tarball = "http://registry.npmjs.org/colors/-/colors-0.6.1.tgz"; } { name = "colors"; spec = "0.x.x"; - version = "0.6.0"; + version = "0.6.1"; topLevel = false; dependencies = [ ]; patchLatest = false; - sha1 = "07ec10d8ac4f5a2e78f8d820e3e7832b3b463cad"; - tarball = "http://registry.npmjs.org/colors/-/colors-0.6.0.tgz"; + sha1 = "59c7799f6c91e0e15802980a98ed138b3c78f4e9"; + tarball = "http://registry.npmjs.org/colors/-/colors-0.6.1.tgz"; } { name = "combined-stream"; @@ -823,6 +823,18 @@ sha1 = "fd5713bfa153c7d6cc599378a5ab4c45c535029e"; tarball = "http://registry.npmjs.org/commander/-/commander-1.2.0.tgz"; } + { + name = "commander"; + spec = "1.3.2"; + version = "1.3.2"; + topLevel = false; + dependencies = [ + { name = "keypress"; spec = "0.1.x"; } + ]; + patchLatest = false; + sha1 = "8a8f30ec670a6fdd64af52f1914b907d79ead5b5"; + tarball = "http://registry.npmjs.org/commander/-/commander-1.3.2.tgz"; + } { name = "commander"; spec = "~0.6.1"; @@ -1825,6 +1837,18 @@ sha1 = "03e4b0178424e4c2d5d19a54d8814cdc97934850"; tarball = "http://registry.npmjs.org/fresh/-/fresh-0.1.0.tgz"; } + { + name = "fs-walk"; + spec = "*"; + version = "0.0.1"; + topLevel = true; + dependencies = [ + { name = "async"; spec = "*"; } + ]; + patchLatest = false; + sha1 = "f7fc91c3ae1eead07c998bc5d0dd41f2dbebd335"; + tarball = "http://registry.npmjs.org/fs-walk/-/fs-walk-0.0.1.tgz"; + } { name = "fstream"; spec = "0"; @@ -2437,14 +2461,16 @@ { name = "ironhorse"; spec = "*"; - version = "0.0.2"; + version = "0.0.5"; topLevel = true; dependencies = [ { name = "winston"; spec = "*"; } + { name = "nconf"; spec = "*"; } + { name = "fs-walk"; spec = "*"; } ]; patchLatest = false; - sha1 = "9a8e27407ecfba7cd4d1d5886c7d97e65d44da9c"; - tarball = "http://registry.npmjs.org/ironhorse/-/ironhorse-0.0.2.tgz"; + sha1 = "d7b15b73e7da814b272e580243cc2239e7b021e6"; + tarball = "http://registry.npmjs.org/ironhorse/-/ironhorse-0.0.5.tgz"; } { name = "is-promise"; @@ -2460,20 +2486,20 @@ { name = "jade"; spec = "*"; - version = "0.33.0"; + version = "0.34.1"; topLevel = true; dependencies = [ - { name = "commander"; spec = "1.2.0"; } + { name = "commander"; spec = "1.3.2"; } { name = "mkdirp"; spec = "0.3.x"; } - { name = "transformers"; spec = "2.0.1"; } + { name = "transformers"; spec = "2.1.0"; } { name = "character-parser"; spec = "1.0.2"; } - { name = "monocle"; spec = "0.1.48"; } + { name = "monocle"; spec = "0.1.50"; } { name = "with"; spec = "~1.1.0"; } { name = "constantinople"; spec = "~1.0.1"; } ]; patchLatest = false; - sha1 = "1b0bb45f9dd4ce57723605177713d80bccd4e429"; - tarball = "http://registry.npmjs.org/jade/-/jade-0.33.0.tgz"; + sha1 = "6cb1f0928adfe9be7323d0b57e507e5c3c70f650"; + tarball = "http://registry.npmjs.org/jade/-/jade-0.34.1.tgz"; } { name = "jade"; @@ -2491,20 +2517,20 @@ { name = "jade"; spec = ">= 0.0.1"; - version = "0.33.0"; + version = "0.34.1"; topLevel = false; dependencies = [ - { name = "commander"; spec = "1.2.0"; } + { name = "commander"; spec = "1.3.2"; } { name = "mkdirp"; spec = "0.3.x"; } - { name = "transformers"; spec = "2.0.1"; } + { name = "transformers"; spec = "2.1.0"; } { name = "character-parser"; spec = "1.0.2"; } - { name = "monocle"; spec = "0.1.48"; } + { name = "monocle"; spec = "0.1.50"; } { name = "with"; spec = "~1.1.0"; } { name = "constantinople"; spec = "~1.0.1"; } ]; patchLatest = false; - sha1 = "1b0bb45f9dd4ce57723605177713d80bccd4e429"; - tarball = "http://registry.npmjs.org/jade/-/jade-0.33.0.tgz"; + sha1 = "6cb1f0928adfe9be7323d0b57e507e5c3c70f650"; + tarball = "http://registry.npmjs.org/jade/-/jade-0.34.1.tgz"; } { name = "jayschema"; @@ -2545,7 +2571,7 @@ { name = "jshint"; spec = "*"; - version = "2.1.4"; + version = "2.1.7"; topLevel = true; dependencies = [ { name = "shelljs"; spec = "0.1.x"; } @@ -2555,8 +2581,8 @@ { name = "console-browserify"; spec = "0.1.x"; } ]; patchLatest = false; - sha1 = "8d5be86628eea91c073c8700dd6e4c90afd9ab38"; - tarball = "http://registry.npmjs.org/jshint/-/jshint-2.1.4.tgz"; + sha1 = "11f4214333a0cd2df88057b88c4d751d0c0658a0"; + tarball = "http://registry.npmjs.org/jshint/-/jshint-2.1.7.tgz"; } { name = "json-schema"; @@ -2663,7 +2689,7 @@ { name = "knox"; spec = "*"; - version = "0.8.4"; + version = "0.8.5"; topLevel = true; dependencies = [ { name = "mime"; spec = "*"; } @@ -2672,8 +2698,8 @@ { name = "stream-counter"; spec = "~0.1.0"; } ]; patchLatest = false; - sha1 = "4e1e98e9942120c3e7fd36286ee4a249b00ac370"; - tarball = "http://registry.npmjs.org/knox/-/knox-0.8.4.tgz"; + sha1 = "86f227fcd22db2b7699106b9b6e5ce29fcbf78de"; + tarball = "http://registry.npmjs.org/knox/-/knox-0.8.5.tgz"; } { name = "kue"; @@ -2807,13 +2833,13 @@ { name = "mime"; spec = "*"; - version = "1.2.9"; + version = "1.2.10"; topLevel = false; dependencies = [ ]; patchLatest = false; - sha1 = "009cd40867bd35de521b3b966f04e2f8d4d13d09"; - tarball = "http://registry.npmjs.org/mime/-/mime-1.2.9.tgz"; + sha1 = "066380acbc3d78d4f4a51004d8988425dc68b9b1"; + tarball = "http://registry.npmjs.org/mime/-/mime-1.2.10.tgz"; } { name = "mime"; @@ -2851,35 +2877,35 @@ { name = "mime"; spec = "~1.2.2"; - version = "1.2.9"; + version = "1.2.10"; topLevel = false; dependencies = [ ]; patchLatest = false; - sha1 = "009cd40867bd35de521b3b966f04e2f8d4d13d09"; - tarball = "http://registry.npmjs.org/mime/-/mime-1.2.9.tgz"; + sha1 = "066380acbc3d78d4f4a51004d8988425dc68b9b1"; + tarball = "http://registry.npmjs.org/mime/-/mime-1.2.10.tgz"; } { name = "mime"; spec = "~1.2.7"; - version = "1.2.9"; + version = "1.2.10"; topLevel = false; dependencies = [ ]; patchLatest = false; - sha1 = "009cd40867bd35de521b3b966f04e2f8d4d13d09"; - tarball = "http://registry.npmjs.org/mime/-/mime-1.2.9.tgz"; + sha1 = "066380acbc3d78d4f4a51004d8988425dc68b9b1"; + tarball = "http://registry.npmjs.org/mime/-/mime-1.2.10.tgz"; } { name = "mime"; spec = "~1.2.9"; - version = "1.2.9"; + version = "1.2.10"; topLevel = false; dependencies = [ ]; patchLatest = false; - sha1 = "009cd40867bd35de521b3b966f04e2f8d4d13d09"; - tarball = "http://registry.npmjs.org/mime/-/mime-1.2.9.tgz"; + sha1 = "066380acbc3d78d4f4a51004d8988425dc68b9b1"; + tarball = "http://registry.npmjs.org/mime/-/mime-1.2.10.tgz"; } { name = "mimelib"; @@ -3234,15 +3260,15 @@ } { name = "monocle"; - spec = "0.1.48"; - version = "0.1.48"; + spec = "0.1.50"; + version = "0.1.50"; topLevel = false; dependencies = [ { name = "readdirp"; spec = "~0.2.3"; } ]; patchLatest = false; - sha1 = "b96730f5ca900fa75a56041eb6db10aad980a383"; - tarball = "http://registry.npmjs.org/monocle/-/monocle-0.1.48.tgz"; + sha1 = "9a7cbd0ccc10de95fd78a04b9beb2482ae4940b7"; + tarball = "http://registry.npmjs.org/monocle/-/monocle-0.1.50.tgz"; } { name = "mpath"; @@ -3292,14 +3318,14 @@ { name = "msgpack"; spec = ">= 0.0.1"; - version = "0.1.10"; + version = "0.1.11"; topLevel = false; dependencies = [ { name = "nodeunit"; spec = "https://github.com/godsflaw/nodeunit/tarball/master"; } ]; patchLatest = false; - sha1 = "ebb2edea5ebc3616a2ce003d8d8ef73b52bf7318"; - tarball = "http://registry.npmjs.org/msgpack/-/msgpack-0.1.10.tgz"; + sha1 = "203f7cfd1d1917fae196bbe01a701599f338cf0b"; + tarball = "http://registry.npmjs.org/msgpack/-/msgpack-0.1.11.tgz"; } { name = "muri"; @@ -3675,7 +3701,7 @@ { name = "npm"; spec = "*"; - version = "1.3.5"; + version = "1.3.6"; topLevel = true; dependencies = [ { name = "semver"; spec = "~2.0.8"; } @@ -3720,8 +3746,8 @@ { name = "npm-user-validate"; spec = "0.0.3"; } ]; patchLatest = false; - sha1 = "05d6c4d01d2bc3f1adf15948adf2f7110553f471"; - tarball = "http://registry.npmjs.org/npm/-/npm-1.3.5.tgz"; + sha1 = "7c317871955f8427529c78e9b1ec21239dcd222a"; + tarball = "http://registry.npmjs.org/npm/-/npm-1.3.6.tgz"; } { name = "npm-registry-client"; @@ -4931,13 +4957,13 @@ { name = "semver"; spec = "*"; - version = "2.0.11"; + version = "2.1.0"; topLevel = true; dependencies = [ ]; patchLatest = false; - sha1 = "f51f07d03fa5af79beb537fc067a7e141786cced"; - tarball = "http://registry.npmjs.org/semver/-/semver-2.0.11.tgz"; + sha1 = "64d135ad53ae000fef91190177620442bd996e03"; + tarball = "http://registry.npmjs.org/semver/-/semver-2.1.0.tgz"; } { name = "semver"; @@ -4964,35 +4990,35 @@ { name = "semver"; spec = "2"; - version = "2.0.11"; + version = "2.1.0"; topLevel = false; dependencies = [ ]; patchLatest = false; - sha1 = "f51f07d03fa5af79beb537fc067a7e141786cced"; - tarball = "http://registry.npmjs.org/semver/-/semver-2.0.11.tgz"; + sha1 = "64d135ad53ae000fef91190177620442bd996e03"; + tarball = "http://registry.npmjs.org/semver/-/semver-2.1.0.tgz"; } { name = "semver"; spec = "2.x"; - version = "2.0.11"; + version = "2.1.0"; topLevel = false; dependencies = [ ]; patchLatest = false; - sha1 = "f51f07d03fa5af79beb537fc067a7e141786cced"; - tarball = "http://registry.npmjs.org/semver/-/semver-2.0.11.tgz"; + sha1 = "64d135ad53ae000fef91190177620442bd996e03"; + tarball = "http://registry.npmjs.org/semver/-/semver-2.1.0.tgz"; } { name = "semver"; spec = ">=2.0.10 <3.0.0"; - version = "2.0.11"; + version = "2.1.0"; topLevel = false; dependencies = [ ]; patchLatest = false; - sha1 = "f51f07d03fa5af79beb537fc067a7e141786cced"; - tarball = "http://registry.npmjs.org/semver/-/semver-2.0.11.tgz"; + sha1 = "64d135ad53ae000fef91190177620442bd996e03"; + tarball = "http://registry.npmjs.org/semver/-/semver-2.1.0.tgz"; } { name = "semver"; @@ -5132,15 +5158,15 @@ { name = "simplesmtp"; spec = ">= 0.1.22"; - version = "0.3.4"; + version = "0.3.5"; topLevel = false; dependencies = [ { name = "rai"; spec = "~0.1"; } { name = "xoauth2"; spec = "~0.1"; } ]; patchLatest = false; - sha1 = "fe8bfe63c2f96e0bbe54bd373a0dc0d09b594133"; - tarball = "http://registry.npmjs.org/simplesmtp/-/simplesmtp-0.3.4.tgz"; + sha1 = "3f8d43e7885c926037ab3aa5026b563543a67e5b"; + tarball = "http://registry.npmjs.org/simplesmtp/-/simplesmtp-0.3.5.tgz"; } { name = "sliced"; @@ -5384,16 +5410,17 @@ { name = "stylus"; spec = "*"; - version = "0.34.1"; + version = "0.35.1"; topLevel = true; dependencies = [ { name = "cssom"; spec = "0.2.x"; } { name = "mkdirp"; spec = "0.3.x"; } { name = "debug"; spec = "*"; } + { name = "sax"; spec = "0.5.x"; } ]; patchLatest = false; - sha1 = "937d8502a3be4e617d5ad493f204c70a93d95b14"; - tarball = "http://registry.npmjs.org/stylus/-/stylus-0.34.1.tgz"; + sha1 = "ed4f4cf378c2f883b04633f01e5c76ffe976084f"; + tarball = "http://registry.npmjs.org/stylus/-/stylus-0.35.1.tgz"; } { name = "stylus"; @@ -5598,8 +5625,8 @@ } { name = "transformers"; - spec = "2.0.1"; - version = "2.0.1"; + spec = "2.1.0"; + version = "2.1.0"; topLevel = false; dependencies = [ { name = "promise"; spec = "~2.0"; } @@ -5607,8 +5634,8 @@ { name = "uglify-js"; spec = "~2.2.5"; } ]; patchLatest = false; - sha1 = "352131dfceb93a7532dc7535a4f142510435a394"; - tarball = "http://registry.npmjs.org/transformers/-/transformers-2.0.1.tgz"; + sha1 = "5d23cb35561dd85dc67fb8482309b47d53cce9a7"; + tarball = "http://registry.npmjs.org/transformers/-/transformers-2.1.0.tgz"; } { name = "traverse"; diff --git a/pkgs/top-level/node-packages.json b/pkgs/top-level/node-packages.json index 3379321bb5f..9107248a01a 100644 --- a/pkgs/top-level/node-packages.json +++ b/pkgs/top-level/node-packages.json @@ -65,6 +65,7 @@ , "tar" , "flatiron" , "ironhorse" +, "fs-walk" , { "node-uptime": "https://github.com/fzaninotto/uptime/tarball/1c65756575f90f563a752e2a22892ba2981c79b7" } , { "guifi-earth": "https://github.com/jmendeth/guifi-earth/tarball/f3ee96835fd4fb0e3e12fadbd2cb782770d64854 " } ] From c1fcb0c2e60743b5d052043c94f2d6934ec89b32 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Tue, 30 Jul 2013 13:00:05 +0200 Subject: [PATCH 738/798] Make the setup-hook work again now that nodejs modules reside in lib/node_modules --- pkgs/development/web/nodejs/setup-hook.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/web/nodejs/setup-hook.sh b/pkgs/development/web/nodejs/setup-hook.sh index c2888471044..41a9746ba42 100644 --- a/pkgs/development/web/nodejs/setup-hook.sh +++ b/pkgs/development/web/nodejs/setup-hook.sh @@ -1,5 +1,5 @@ addNodePath () { - addToSearchPath NODE_PATH $1/node_modules + addToSearchPath NODE_PATH $1/lib/node_modules } envHooks=(${envHooks[@]} addNodePath) From 97b8ac932d480f37104b0cc90efdeb5b1bb26cc2 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 30 Jul 2013 15:20:46 +0400 Subject: [PATCH 739/798] Adding Lush: Lisp Universal SHell --- .../development/interpreters/lush/default.nix | 32 +++++++++++++++++++ .../interpreters/lush/default.upstream | 3 ++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 37 insertions(+) create mode 100644 pkgs/development/interpreters/lush/default.nix create mode 100644 pkgs/development/interpreters/lush/default.upstream diff --git a/pkgs/development/interpreters/lush/default.nix b/pkgs/development/interpreters/lush/default.nix new file mode 100644 index 00000000000..63cf85bc506 --- /dev/null +++ b/pkgs/development/interpreters/lush/default.nix @@ -0,0 +1,32 @@ +{stdenv, fetchurl, libX11, xproto, indent, readline, gsl, freeglut, mesa, SDL +, blas, binutils, intltool, gettext, zlib}: +let + s = # Generated upstream information + rec { + baseName="lush"; + version="2.0.1"; + name="${baseName}-${version}"; + hash="02pkfn3nqdkm9fm44911dbcz0v3r0l53vygj8xigl6id5g3iwi4k"; + url="mirror://sourceforge/project/lush/lush2/lush-2.0.1.tar.gz"; + sha256="02pkfn3nqdkm9fm44911dbcz0v3r0l53vygj8xigl6id5g3iwi4k"; + }; + buildInputs = [ + libX11 xproto indent readline gsl freeglut mesa SDL blas binutils + intltool gettext zlib + ]; +in +stdenv.mkDerivation { + inherit (s) name version; + inherit buildInputs; + src = fetchurl { + inherit (s) url sha256; + }; + NIX_LDFLAGS=" -lz "; + meta = { + inherit (s) version; + description = ''Lisp Universal SHell''; + license = stdenv.lib.licenses.gpl2Plus ; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/development/interpreters/lush/default.upstream b/pkgs/development/interpreters/lush/default.upstream new file mode 100644 index 00000000000..6a3b3a8357c --- /dev/null +++ b/pkgs/development/interpreters/lush/default.upstream @@ -0,0 +1,3 @@ +url http://sourceforge.net/projects/lush/files/lush2/ +version_link '[.]tar[.]gz/download$' +SF_redirect diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 352d58393bc..2a4dab0f318 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3052,6 +3052,8 @@ let lua = lua5; }; + lush2 = callPackage ../development/interpreters/lush {}; + maude = callPackage ../development/interpreters/maude { }; octave = callPackage ../development/interpreters/octave { From 9acc0d4bc903a931ec1b01c9422d9941f9b60879 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 30 Jul 2013 15:51:01 +0400 Subject: [PATCH 740/798] Adding x-cape keyboard mapping helper --- pkgs/tools/X11/xcape/default.nix | 32 ++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/tools/X11/xcape/default.nix diff --git a/pkgs/tools/X11/xcape/default.nix b/pkgs/tools/X11/xcape/default.nix new file mode 100644 index 00000000000..adeec32b17c --- /dev/null +++ b/pkgs/tools/X11/xcape/default.nix @@ -0,0 +1,32 @@ +{stdenv, fetchurl, fetchgit, libX11, xproto, libXtst, xextproto, pkgconfig +, inputproto, libXi}: +let + s = rec { + baseName = "xcape"; + version = "git-2013-05-30"; + name = "${baseName}-${version}"; + }; + buildInputs = [ + libX11 libXtst xproto xextproto pkgconfig inputproto libXi + ]; +in +stdenv.mkDerivation { + inherit (s) name version; + inherit buildInputs; + src = fetchgit { + url = https://github.com/alols/xcape; + rev = "39aa08c5da354a8fe495eba8787a01957cfa5fcb"; + sha256 = "1yh0vbaj4c5lflxm3d4xrfaric1lp0gfcyzq33bqphpsba439bmg"; + }; + preConfigure = '' + makeFlags="$makeFlags PREFIX=$out" + ''; + meta = { + inherit (s) version; + description = ''A tool to have Escape and Control on a single key''; + license = stdenv.lib.licenses.gpl3 ; + inherit (s) url sha256; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2a4dab0f318..fb88748c157 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8745,6 +8745,8 @@ let xcalib = callPackage ../tools/X11/xcalib { }; + xcape = callPackage ../tools/X11/xcape { }; + xchainkeys = callPackage ../tools/X11/xchainkeys { }; xchat = callPackage ../applications/networking/irc/xchat { }; From 0a8b83fdd0f7fcb376d0ad766e2b4f096475e3c2 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 30 Jul 2013 16:02:39 +0400 Subject: [PATCH 741/798] Fix unneeded inherit --- pkgs/tools/X11/xcape/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/tools/X11/xcape/default.nix b/pkgs/tools/X11/xcape/default.nix index adeec32b17c..272f1ca0907 100644 --- a/pkgs/tools/X11/xcape/default.nix +++ b/pkgs/tools/X11/xcape/default.nix @@ -25,7 +25,6 @@ stdenv.mkDerivation { inherit (s) version; description = ''A tool to have Escape and Control on a single key''; license = stdenv.lib.licenses.gpl3 ; - inherit (s) url sha256; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; }; From f918e06988d3b4038530a72ca7e96f8cfe728984 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Tue, 30 Jul 2013 14:23:48 +0200 Subject: [PATCH 742/798] wine: upgrade to 1.6 + latest gecko/mono extensions --- pkgs/misc/emulators/wine/default.nix | 30 ++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/pkgs/misc/emulators/wine/default.nix b/pkgs/misc/emulators/wine/default.nix index 69bcea87f6a..4e6ef5af00d 100644 --- a/pkgs/misc/emulators/wine/default.nix +++ b/pkgs/misc/emulators/wine/default.nix @@ -6,18 +6,28 @@ assert stdenv.isLinux; assert stdenv.gcc.gcc != null; -stdenv.mkDerivation rec { - version = "1.5.31"; +let gecko = fetchurl { + url = "mirror://sourceforge/wine/wine_gecko-2.21-x86.msi"; + sha256 = "1n0zccnvchkg0m896sjx5psk4bxw9if32xyxib1rbfdasykay7zh"; + }; + + gecko64 = fetchurl { + url = "mirror://sourceforge/wine/wine_gecko-2.21-x86_64.msi"; + sha256 = "0grc86dkq90i59zw43hakh62ra1ajnk11m64667xjrlzi7f0ndxw"; + }; + + mono = fetchurl { + url = "mirror://sourceforge/wine/wine-mono-0.0.8.msi"; + sha256 = "00jl24qp7vh3hlqv7wsw1s529lr5p0ybif6s73jy85chqaxj7z1x"; + }; + +in stdenv.mkDerivation rec { + version = "1.6"; name = "wine-${version}"; src = fetchurl { url = "mirror://sourceforge/wine/${name}.tar.bz2"; - sha256 = "1hlj1r3xi1mbqblkiwrcphvvb8rd50qig25jhyid58qp3r2lf9a6"; - }; - - gecko = fetchurl { - url = "mirror://sourceforge/wine/wine_gecko-1.9-x86.msi"; - sha256 = "10p7djsf85xjk8rzg3hgw5fskrn8402y2aijy701xwm4hy9ga79g"; + sha256 = "1bj21d94i0mqvkmzxd4971232yniribk7q3fllf23ynbpppk1wg1"; }; buildInputs = [ @@ -44,6 +54,10 @@ stdenv.mkDerivation rec { postInstall = '' install -D ${gecko} $out/share/wine/gecko/${gecko.name} + '' + stdenv.lib.optionalString (stdenv.system == "x86_64-linux") '' + install -D ${gecko} $out/share/wine/gecko/${gecko64.name} + '' + '' + install -D ${mono} $out/share/wine/mono/${mono.name} wrapProgram $out/bin/wine --prefix LD_LIBRARY_PATH : ${stdenv.gcc.gcc}/lib ''; From ae90a7e8f3f43517be8090c0361b8ff268fb56db Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Tue, 30 Jul 2013 15:24:26 +0200 Subject: [PATCH 743/798] Added forever-monitor nodejs package --- pkgs/top-level/node-packages-generated.nix | 17 +++++++++++++++++ pkgs/top-level/node-packages.json | 1 + 2 files changed, 18 insertions(+) diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix index 4d3ae03e19f..3751aa6c4d3 100644 --- a/pkgs/top-level/node-packages-generated.nix +++ b/pkgs/top-level/node-packages-generated.nix @@ -1723,6 +1723,23 @@ sha1 = "0c1647a74f3af12d76a07a99490ade7c7249c8f0"; tarball = "http://registry.npmjs.org/forever-agent/-/forever-agent-0.5.0.tgz"; } + { + name = "forever-monitor"; + spec = "*"; + version = "1.2.2"; + topLevel = true; + dependencies = [ + { name = "broadway"; spec = "0.2.x"; } + { name = "minimatch"; spec = "0.0.x"; } + { name = "pkginfo"; spec = "0.x.x"; } + { name = "ps-tree"; spec = "0.0.x"; } + { name = "watch"; spec = "0.5.x"; } + { name = "utile"; spec = "0.1.x"; } + ]; + patchLatest = false; + sha1 = "c1ad6c6ab837a89fa2d47bb439727ca968235684"; + tarball = "http://registry.npmjs.org/forever-monitor/-/forever-monitor-1.2.2.tgz"; + } { name = "forever-monitor"; spec = "1.2.2"; diff --git a/pkgs/top-level/node-packages.json b/pkgs/top-level/node-packages.json index 9107248a01a..6cab338ae14 100644 --- a/pkgs/top-level/node-packages.json +++ b/pkgs/top-level/node-packages.json @@ -52,6 +52,7 @@ , "gzippo" , "walk" , "forever" +, "forever-monitor" , "kue" , "supertest" , "should" From 7c38b9d3bc0253214792a680cd652ccfbbba0305 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 30 Jul 2013 10:11:40 +0000 Subject: [PATCH 744/798] nixpkgs-lint: Fix priority check --- maintainers/scripts/nixpkgs-lint.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/maintainers/scripts/nixpkgs-lint.pl b/maintainers/scripts/nixpkgs-lint.pl index c82cf75e3f8..29ecb93c586 100755 --- a/maintainers/scripts/nixpkgs-lint.pl +++ b/maintainers/scripts/nixpkgs-lint.pl @@ -128,8 +128,8 @@ foreach my $name (sort keys %pkgsByName) { @pkgs = grep { my $x = $drvsSeen{$_->{drvPath}}; $drvsSeen{$_->{drvPath}} = 1; !defined $x } @pkgs; # Filter packages that have a lower priority. - my $highest = min (map { $_->{priority} // 0 } @pkgs); - @pkgs = grep { ($_->{priority} // 0) == $highest } @pkgs; + my $highest = min (map { $_->{meta}->{priority}->{value} // 0 } @pkgs); + @pkgs = grep { ($_->{meta}->{priority}->{value} // 0) == $highest } @pkgs; next if scalar @pkgs == 1; From 60355207c329e8f04baf574c6ee9bed960b3c240 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 30 Jul 2013 12:31:31 +0200 Subject: [PATCH 745/798] Fix some name collisions --- pkgs/top-level/all-packages.nix | 50 ++++++++++++++++----------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fb88748c157..8c3ec1d5fd5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4189,8 +4189,8 @@ let guileBindings = config.gnutls.guile or true; }; - gnutls_without_guile = gnutls.override { guileBindings = false; }; - gnutls2_without_guile = gnutls2.override { guileBindings = false; }; + gnutls_without_guile = lowPrio (gnutls.override { guileBindings = false; }); + gnutls2_without_guile = lowPrio (gnutls2.override { guileBindings = false; }); gpac = callPackage ../applications/video/gpac { }; @@ -5245,13 +5245,13 @@ let else stdenv; }; - qt48Full = callPackage ../development/libraries/qt-4.x/4.8 { + qt48Full = lowPrio (callPackage ../development/libraries/qt-4.x/4.8 { # GNOME dependencies are not used unless gtkStyle == true inherit (pkgs.gnome) libgnomeui GConf gnome_vfs; docs = true; demos = true; examples = true; - }; + }); qtscriptgenerator = callPackage ../development/libraries/qtscriptgenerator { }; @@ -5779,15 +5779,15 @@ let python = pypy; }); - plone41Packages = recurseIntoAttrs (import ../development/web/plone/4.1.nix { + plone41Packages = import ../development/web/plone/4.1.nix { inherit pkgs; pythonPackages = python26Packages; - }); + }; - plone42Packages = recurseIntoAttrs (import ../development/web/plone/4.2.nix { + plone42Packages = import ../development/web/plone/4.2.nix { inherit pkgs; pythonPackages = python26Packages; - }); + }; plone43Packages = recurseIntoAttrs (import ../development/web/plone/4.3.nix { inherit pkgs; @@ -6387,23 +6387,23 @@ let ]; }; - linux_3_2_grsecurity = lib.overrideDerivation (linux_3_2.override (args: { + linux_3_2_grsecurity = lowPrio (lib.overrideDerivation (linux_3_2.override (args: { kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_2_9_1_3_2_48 ]; - })) (args: { makeFlags = "DISABLE_PAX_PLUGINS=y";}); + })) (args: { makeFlags = "DISABLE_PAX_PLUGINS=y";})); - linux_3_2_apparmor = linux_3_2.override { + linux_3_2_apparmor = lowPrio (linux_3_2.override { kernelPatches = [ kernelPatches.apparmor_3_2 ]; extraConfig = '' SECURITY_APPARMOR y DEFAULT_SECURITY_APPARMOR y ''; - }; + }); - linux_3_2_xen = linux_3_2.override { + linux_3_2_xen = lowPrio (linux_3_2.override { extraConfig = '' XEN_DOM0 y ''; - }; + }); linux_3_4 = makeOverridable (import ../os-specific/linux/kernel/linux-3.4.nix) { inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; @@ -6416,13 +6416,13 @@ let ]; }; - linux_3_4_apparmor = linux_3_4.override { + linux_3_4_apparmor = lowPrio (linux_3_4.override { kernelPatches = [ kernelPatches.apparmor_3_4 ]; extraConfig = '' SECURITY_APPARMOR y DEFAULT_SECURITY_APPARMOR y ''; - }; + }); linux_3_6_rpi = makeOverridable (import ../os-specific/linux/kernel/linux-rpi-3.6.nix) { inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; @@ -6582,10 +6582,10 @@ let # Build the kernel modules for the some of the kernels. linuxPackages_3_0 = recurseIntoAttrs (linuxPackagesFor linux_3_0 linuxPackages_3_0); linuxPackages_3_2 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_2 linuxPackages_3_2); - linuxPackages_3_2_apparmor = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_2_apparmor linuxPackages_3_2_apparmor); - linuxPackages_3_2_xen = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_2_xen linuxPackages_3_2_xen); + linuxPackages_3_2_apparmor = linuxPackagesFor pkgs.linux_3_2_apparmor linuxPackages_3_2_apparmor; + linuxPackages_3_2_xen = linuxPackagesFor pkgs.linux_3_2_xen linuxPackages_3_2_xen; linuxPackages_3_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_4 linuxPackages_3_4); - linuxPackages_3_4_apparmor = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_4_apparmor linuxPackages_3_4_apparmor); + linuxPackages_3_4_apparmor = linuxPackagesFor pkgs.linux_3_4_apparmor linuxPackages_3_4_apparmor; linuxPackages_3_6_rpi = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_6_rpi linuxPackages_3_6_rpi); linuxPackages_3_8 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_8 linuxPackages_3_8); linuxPackages_3_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_9 linuxPackages_3_9); @@ -6624,7 +6624,7 @@ let linuxHeaders = glibc.kernelHeaders; }; - klibcShrunk = callPackage ../os-specific/linux/klibc/shrunk.nix { }; + klibcShrunk = lowPrio (callPackage ../os-specific/linux/klibc/shrunk.nix { }); kmod = callPackage ../os-specific/linux/kmod { }; @@ -7447,7 +7447,7 @@ let maudeMode = callPackage ../applications/editors/emacs-modes/maude { }; - notmuch = callPackage ../applications/networking/mailreaders/notmuch { }; + notmuch = lowPrio (callPackage ../applications/networking/mailreaders/notmuch { }); # This is usually a newer version of Org-Mode than that found in GNU Emacs, so # we want it to have higher precedence. @@ -8403,12 +8403,12 @@ let libpng = libpng12; }; - sndBase = builderDefsPackage (import ../applications/audio/snd) { + sndBase = lowPrio (builderDefsPackage (import ../applications/audio/snd) { inherit fetchurl stdenv stringsWithDeps lib fftw; inherit pkgconfig gmp gettext; inherit (xlibs) libXpm libX11; inherit gtk glib; - }; + }); snd = sndBase.passthru.function { inherit mesa libtool jackaudio alsaLib; @@ -8621,8 +8621,8 @@ let # so that we can use gccApple if we're building on darwin inherit stdenvAdapters gccApple; }; - vimLatest = vim_configurable.override { source = "latest"; }; - vimNox = vim_configurable.override { source = "vim-nox"; }; + vimLatest = lowPrio (vim_configurable.override { source = "latest"; }); + vimNox = lowPrio (vim_configurable.override { source = "vim-nox"; }); virtviewer = callPackage ../applications/virtualization/virt-viewer {}; virtmanager = callPackage ../applications/virtualization/virt-manager { From b509c78ea38fe74f93040bbf1c1408bd52f6d7a4 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 30 Jul 2013 10:33:10 +0000 Subject: [PATCH 746/798] webkitSVN: Remove It hasn't been updated in a long time. --- pkgs/development/libraries/webkit/svn.nix | 91 ----------------------- pkgs/top-level/all-packages.nix | 15 ---- pkgs/top-level/release-python.nix | 1 - 3 files changed, 107 deletions(-) delete mode 100644 pkgs/development/libraries/webkit/svn.nix diff --git a/pkgs/development/libraries/webkit/svn.nix b/pkgs/development/libraries/webkit/svn.nix deleted file mode 100644 index db6fe1ba55c..00000000000 --- a/pkgs/development/libraries/webkit/svn.nix +++ /dev/null @@ -1,91 +0,0 @@ -args : with args; -let - s = import ./src-for-default.nix; - version = lib.attrByPath ["version"] s.version args; -in -rec { - src = fetchurl { - url = s.url; - sha256 = s.hash; - }; - - buildInputs = [gtk glib atk cairo curl fontconfig freetype - gettext libjpeg libpng libtiff libxml2 libxslt pango - sqlite icu gperf bison flex autoconf automake libtool - perl intltool pkgconfig libsoup gtkdoc libXt libproxy - enchant python ruby which renderproto libXrender geoclue - ]; - - propagatedBuildInputs = [ - gstreamer gst_plugins_base gst_ffmpeg gst_plugins_good - ]; - - configureCommand = "./autogen.sh "; - configureFlags = [ - "--enable-3D-transforms" - "--enable-web-sockets" - "--enable-web-timing" - - # https://bugs.webkit.org/show_bug.cgi?id=55294 - "--enable-image-resizer" - - "--enable-geolocation" - - # Not implemented? - # "--enable-web-audio" - - "--enable-mathml" - - "--enable-wml" - - # https://bugs.webkit.org/show_bug.cgi?id=45110 - # "--enable-indexed-database" - - "--enable-xhtmlmp" - - # "--enable-input-speech" - - "--enable-file-writer" - "--enable-blob" - - # https://bugs.webkit.org/show_bug.cgi?id=59430 - # "--enable-directory-upload" - - # https://bugs.webkit.org/show_bug.cgi?id=58443 - # "--enable-file-system" - ]; - - /* doConfigure should be specified separately */ - phaseNames = ["setVars" /* "paranoidFixComments" */ "doConfigure" (doPatchShebangs ".") - "doReplaceUsrBin" "doMakeInstall" "doAddPrograms"]; - - setVars = fullDepEntry ('' - export NIX_LDFLAGS="$NIX_LDFLAGS -lXt" - '') ["minInit"]; - - doReplaceUsrBin = fullDepEntry ('' - for i in $(find . -name '*.pl') $(find . -name '*.pm'); do - sed -e 's@/usr/bin/gcc@gcc@' -i $i - done - '') ["minInit" "doUnpack"]; - - doAddPrograms = fullDepEntry ('' - mkdir -p $out/bin - for i in Programs/.libs/* Programs/*; do - cp $i $out/bin/webkit-program-$(basename $i) || true - done - '') ["minInit" "doMake" "defEnsureDir"]; - - paranoidFixComments = fullDepEntry ('' - sed -re 's@( |^)//.*@/* & */@' -i $(find . -name '*.c' -o -name '*.h') - '') ["minInit" "doUnpack"]; - - name = s.name; - meta = { - description = "WebKit - a fast and correct HTML renderer"; - maintainers = [stdenv.lib.maintainers.raskin]; - }; - passthru = { - inherit gstreamer gst_plugins_base gst_plugins_good gst_ffmpeg; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8c3ec1d5fd5..ecb859fff90 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5533,21 +5533,6 @@ let inherit gstreamer gst_plugins_base gst_ffmpeg gst_plugins_good; }; - webkitSVN = - builderDefsPackage ../development/libraries/webkit/svn.nix { - inherit (gnome) gtkdoc libsoup; - inherit gtk atk pango glib; - inherit freetype fontconfig gettext gperf curl - libjpeg libtiff libxml2 libxslt sqlite - icu cairo perl intltool automake libtool - pkgconfig autoconf bison libproxy enchant - python ruby which flex geoclue; - inherit gstreamer gst_plugins_base gst_ffmpeg - gst_plugins_good; - inherit (xlibs) libXt renderproto libXrender; - inherit libpng; - }; - wildmidi = callPackage ../development/libraries/wildmidi { }; wvstreams = callPackage ../development/libraries/wvstreams { }; diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix index e09c3a76ddc..770a434c8d7 100644 --- a/pkgs/top-level/release-python.nix +++ b/pkgs/top-level/release-python.nix @@ -1741,7 +1741,6 @@ let wdfs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; webkit = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; webkit_gtk2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - webkitSVN = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; weechat = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; welkin = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; wesnoth = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; From 7f48c7a447c377350d4873f8922a3dc527bfede5 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 30 Jul 2013 12:41:17 +0200 Subject: [PATCH 747/798] Fix a name collision between glibc and glibc217 --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ecb859fff90..85b40b8cff8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4015,8 +4015,6 @@ let glfw = callPackage ../development/libraries/glfw { }; - glibc = glibc217; - glibcCross = glibc217Cross; glibc213 = (callPackage ../development/libraries/glibc/2.13 { @@ -4040,7 +4038,7 @@ let inherit fetchgit; })); - glibc217 = callPackage ../development/libraries/glibc/2.17 { + glibc = callPackage ../development/libraries/glibc/2.17 { kernelHeaders = linuxHeaders; installLocales = config.glibc.locales or false; machHeaders = null; From 70d6623586f333dc5be144739d83d693c2ece427 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 30 Jul 2013 12:41:30 +0200 Subject: [PATCH 748/798] Fix a name collision between two distinct KDE wallpaper packages --- pkgs/desktops/kde-4.10/kdeartwork/wallpapers.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/kde-4.10/kdeartwork/wallpapers.nix b/pkgs/desktops/kde-4.10/kdeartwork/wallpapers.nix index 611c6a70f6b..7c9846fbf9e 100644 --- a/pkgs/desktops/kde-4.10/kdeartwork/wallpapers.nix +++ b/pkgs/desktops/kde-4.10/kdeartwork/wallpapers.nix @@ -1,7 +1,7 @@ { kde, kdelibs }: kde rec { - name = "kde-wallpapers"; + name = "kdeartwork-wallpapers"; buildInputs = [ kdelibs ]; From 3c462ded97a829bf436f6d693b6e687d08d18b1a Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 30 Jul 2013 12:59:30 +0200 Subject: [PATCH 749/798] linux: Update to 3.2.49, 3.4.55 --- pkgs/os-specific/linux/kernel/linux-3.2.nix | 4 ++-- pkgs/os-specific/linux/kernel/linux-3.4.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.2.nix b/pkgs/os-specific/linux/kernel/linux-3.2.nix index 36e97f15c2b..1e1e41a360a 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.2.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.2.nix @@ -240,7 +240,7 @@ in import ./generic.nix ( rec { - version = "3.2.48"; + version = "3.2.49"; modDirVersion = version; @@ -250,7 +250,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "1i24vpv2q8va4ywac970hjisi4jyra7ik99g9zv3bmxmm86k7nqk"; + sha256 = "06xiwcgk6hbcp6g1dpmxb95dzx94s29vzmh1pz4lsglcj1yfrkry"; }; config = configWithPlatform stdenv.platform; diff --git a/pkgs/os-specific/linux/kernel/linux-3.4.nix b/pkgs/os-specific/linux/kernel/linux-3.4.nix index 6dcd88a1f91..e02f9bd5b7b 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix @@ -246,7 +246,7 @@ in import ./generic.nix ( rec { - version = "3.4.54"; + version = "3.4.55"; testing = false; preConfigure = '' @@ -255,7 +255,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "06gz0svm4ngn9iaq9hw5c63mi0613nlzh78dny2m6z00ivpbnk6i"; + sha256 = "1sbb6qa2nb1zwihkdn51q5ac3kn7hrssabn5whx8965hga7yw1dx"; }; config = configWithPlatform stdenv.platform; From 394dc5da785ceb72f3556fe4496b520804120d6b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 30 Jul 2013 13:06:06 +0200 Subject: [PATCH 750/798] batman-adv: Disambiguate kernel versions --- pkgs/os-specific/linux/batman-adv/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/batman-adv/default.nix b/pkgs/os-specific/linux/batman-adv/default.nix index 693f0067701..e4b4d1104b0 100644 --- a/pkgs/os-specific/linux/batman-adv/default.nix +++ b/pkgs/os-specific/linux/batman-adv/default.nix @@ -1,10 +1,12 @@ -{stdenv, fetchurl, kernelDev }: +{ stdenv, fetchurl, kernelDev }: + +let base = "batman-adv-2013.2.0"; in stdenv.mkDerivation rec { - name = "batman-adv-2013.2.0"; + name = "${base}-${kernelDev.version}"; src = fetchurl { - url = "http://downloads.open-mesh.org/batman/releases/${name}/${name}.tar.gz"; + url = "http://downloads.open-mesh.org/batman/releases/${base}/${base}.tar.gz"; sha1 = "7d2aff2ad118cbc5452de43f7e9da8374521ec0e"; }; From 1e6b14e8a491dc067a5aae281a09fff7bc94085e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 30 Jul 2013 11:47:23 +0000 Subject: [PATCH 751/798] Make phpXdebug_5_3 low priority --- pkgs/top-level/all-packages.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 85b40b8cff8..36e8098d369 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3087,10 +3087,12 @@ let php_xcache = callPackage ../development/libraries/php-xcache { }; - phpXdebug_5_3 = callPackage ../development/interpreters/php-xdebug { + phpXdebug_5_3 = lowPrio (callPackage ../development/interpreters/php-xdebug { php = php53; - }; + }); + phpXdebug_5_4 = callPackage ../development/interpreters/php-xdebug { }; + phpXdebug = phpXdebug_5_4; picolisp = callPackage ../development/interpreters/picolisp {}; From f3a17b04e630336a0e86af98ae0328797b554312 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 30 Jul 2013 16:51:32 +0200 Subject: [PATCH 752/798] nixpkgs-lint: Warn against capitalised package names and missing versions --- maintainers/scripts/nixpkgs-lint.pl | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/maintainers/scripts/nixpkgs-lint.pl b/maintainers/scripts/nixpkgs-lint.pl index 29ecb93c586..baf2cbf8ba7 100755 --- a/maintainers/scripts/nixpkgs-lint.pl +++ b/maintainers/scripts/nixpkgs-lint.pl @@ -42,6 +42,7 @@ my $info = XMLin($xml, KeyAttr => { 'item' => '+attrPath', 'meta' => 'name' }, F # Check meta information. print "=== Package meta information ===\n\n"; +my $nrBadNames = 0; my $nrMissingMaintainers = 0; my $nrMissingDescriptions = 0; my $nrBadDescriptions = 0; @@ -51,7 +52,11 @@ foreach my $attr (sort keys %{$info->{item}}) { my $pkg = $info->{item}->{$attr}; my $pkgName = $pkg->{name}; - $pkgName =~ s/-[0-9].*//; + my $pkgVersion = ""; + if ($pkgName =~ /(.*)(-[0-9].*)$/) { + $pkgName = $1; + $pkgVersion = $2; + } # Check the maintainers. my @maintainers; @@ -72,6 +77,17 @@ foreach my $attr (sort keys %{$info->{item}}) { $nrMissingMaintainers++; } + # Package names should not be capitalised. + if ($pkgName =~ /^[A-Z]/) { + print "$attr: package name ‘$pkgName’ should not be capitalised\n"; + $nrBadNames++; + } + + if ($pkgVersion eq "") { + print "$attr: package has no version\n"; + $nrBadNames++; + } + # Check the license. if (!defined $pkg->{meta}->{license}) { print "$attr: Lacks a license\n"; @@ -104,6 +120,7 @@ foreach my $attr (sort keys %{$info->{item}}) { $nrBadDescriptions++ if $bad; } } + print "\n"; # Find packages that have the same name. @@ -140,6 +157,7 @@ foreach my $name (sort keys %pkgsByName) { print "=== Bottom line ===\n"; print "Number of packages: ", scalar(keys %{$info->{item}}), "\n"; +print "Number of bad names: $nrBadNames\n"; print "Number of missing maintainers: $nrMissingMaintainers\n"; print "Number of missing licenses: $nrMissingLicenses\n"; print "Number of missing descriptions: $nrMissingDescriptions\n"; From b92b8dce05d90554accad3b1a19add327b9d314b Mon Sep 17 00:00:00 2001 From: Zef Hemel Date: Tue, 30 Jul 2013 15:53:00 +0200 Subject: [PATCH 753/798] MicroGNUEmacs, a.k.a. MG --- pkgs/applications/editors/mg/configure.patch | 35 ++++++++++++++++++++ pkgs/applications/editors/mg/default.nix | 30 +++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 67 insertions(+) create mode 100644 pkgs/applications/editors/mg/configure.patch create mode 100644 pkgs/applications/editors/mg/default.nix diff --git a/pkgs/applications/editors/mg/configure.patch b/pkgs/applications/editors/mg/configure.patch new file mode 100644 index 00000000000..11105299eb4 --- /dev/null +++ b/pkgs/applications/editors/mg/configure.patch @@ -0,0 +1,35 @@ +--- configure.old 2013-07-30 19:42:51.000000000 +0200 ++++ configure 2013-07-30 19:47:26.000000000 +0200 +@@ -163,31 +163,7 @@ + echo 'Fails.' + fi + +- +-if [ ! -r /usr/include/term.h ]; then +- note 'term.h' +- if [ -r /usr/include/ncurses/term.h ]; then +- echo "Found in /usr/include/ncurses" +- extraflags="$extraflags -I/usr/include/ncurses" +- else +- for i in pkg local; do +- if [ -r /usr/$i/include/term.h ]; then +- echo "Found in /usr/$i/include" +- extralibs="$extralibs -L/usr/$i/lib" +- extraflags="$extraflags -I/usr/$i/include" +- break +- else +- false +- fi +- done || +- { +- echo 'Not found!' >&2 +- echo 'Do you have the ncurses devel package installed?' >&2 +- echo 'If you know where term.h is, please email the author!' >&2 +- exit 1 +- } +- fi +-fi ++extraflags="$extraflags $NIX_CFLAGS_COMPILE" + + note 'base and dirname' + if gcc_defines "__GLIBC__" || gcc_defines "__CYGWIN__" ; then diff --git a/pkgs/applications/editors/mg/default.nix b/pkgs/applications/editors/mg/default.nix new file mode 100644 index 00000000000..ce69b5c0b5a --- /dev/null +++ b/pkgs/applications/editors/mg/default.nix @@ -0,0 +1,30 @@ +{ fetchurl, stdenv, ncurses }: +stdenv.mkDerivation rec { + name = "mg-20110905"; + + src = fetchurl { + url = http://homepage.boetes.org/software/mg/mg-20110905.tar.gz; + sha256 = "0ac2c7wy5kkcflm7cmiqm5xhb5c4yfw3i33iln8civ1yd9z7vlqw"; + }; + + dontAddPrefix = true; + + patches = [ ./configure.patch ]; + patchFlags = "-p0"; + + installPhase = '' + mkdir -p $out/bin + cp mg $out/bin + mkdir -p $out/share/man/man1 + cp mg.1 $out/share/man/man1 + ''; + + buildInputs = [ ncurses ]; + + meta = { + homepage = http://homepage.boetes.org/software/mg/; + description = "mg is Micro GNU/emacs, this is a portable version of the mg maintained by the OpenBSD team."; + license = "public domain"; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 36e8098d369..c10e737ba97 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9889,5 +9889,7 @@ let dart = callPackage ../development/interpreters/dart { }; httrack = callPackage ../tools/backup/httrack { }; + + mg = callPackage ../applications/editors/mg { }; }; in pkgs From 7e0bd8d360615c92225ed89a66ded6507fbf9859 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Tue, 30 Jul 2013 21:30:34 +0200 Subject: [PATCH 754/798] offlineimap: remove python prefix from package name OfflineIMAP is primarily a program/tool, not a python module (although it installs a python module too, for those who want to poke at its internals). Now we can install it with "nix-env -i offlineimap" instead of "nix-env -i python2.7-offlineimap". --- pkgs/tools/networking/offlineimap/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/networking/offlineimap/default.nix b/pkgs/tools/networking/offlineimap/default.nix index 1b1aa768a25..a5b46ebbc3c 100644 --- a/pkgs/tools/networking/offlineimap/default.nix +++ b/pkgs/tools/networking/offlineimap/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { version = "6.5.5-rc2"; name = "offlineimap-${version}"; + namePrefix = ""; src = fetchurl { url = "https://github.com/OfflineIMAP/offlineimap/tarball/v${version}"; From 53ffc6e0ef395a2bd7651423d9783ad8184be1d0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 31 Jul 2013 10:52:15 +0200 Subject: [PATCH 755/798] Drop recurseIntoAttrs from python33Packages and pypyPackages. We cannot import the packages from all of these three packages sets into the global namespace, because they are indistinguishable. For example: $ nix-env -qaP \* | grep pylint pypyPackages.pylint pylint-0.26.0 python33Packages.pylint pylint-0.26.0 python27Packages.pylint pylint-0.26.0 When someone tries to install pylint by running "nix-env -i pylint", then it's impossible to tell which one of these three versions was chosen. I can think of two ways to remedy this problem with recurseIntoAttrs: 1) Bake the name of the Python interpreter into every package's name, i.e. offer "python27-pylint", "python33-pylint", and so on. 2) Ensure that all non-default package sets mark all their packages 'lowPrio' to unsure that the choice during installation is deterministic. --- pkgs/top-level/all-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c10e737ba97..8ecd352e72c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5740,11 +5740,11 @@ let python3Packages = python33Packages; - python33Packages = recurseIntoAttrs (import ./python-packages.nix { + python33Packages = import ./python-packages.nix { inherit pkgs; inherit (lib) lowPrio; python = python33; - }); + }; python32Packages = import ./python-packages.nix { inherit pkgs; @@ -5758,11 +5758,11 @@ let python = python27; }); - pypyPackages = recurseIntoAttrs (import ./python-packages.nix { + pypyPackages = import ./python-packages.nix { inherit pkgs; inherit (lib) lowPrio; python = pypy; - }); + }; plone41Packages = import ../development/web/plone/4.1.nix { inherit pkgs; From 67afed00d57bc34aa816fc667c6a92daf1f30893 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 31 Jul 2013 10:52:27 +0200 Subject: [PATCH 756/798] all-packages.nix: drop trailing whitespace --- 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 8ecd352e72c..f7ebd70ee81 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9889,7 +9889,7 @@ let dart = callPackage ../development/interpreters/dart { }; httrack = callPackage ../tools/backup/httrack { }; - + mg = callPackage ../applications/editors/mg { }; }; in pkgs From dc4f9a37bea3c20b028e41e2a6b102fb2fcf72ee Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 30 Jul 2013 11:33:19 +0200 Subject: [PATCH 757/798] haskell-cmdargs: update to version 0.10.5 --- pkgs/development/libraries/haskell/cmdargs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/cmdargs/default.nix b/pkgs/development/libraries/haskell/cmdargs/default.nix index e180863e133..1814ab99784 100644 --- a/pkgs/development/libraries/haskell/cmdargs/default.nix +++ b/pkgs/development/libraries/haskell/cmdargs/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "cmdargs"; - version = "0.10.4"; - sha256 = "0y8jmpm31z7dd02xa6b5i6gpdjb6pz4pg7m5wbqff7fhbipf0lk0"; + version = "0.10.5"; + sha256 = "013095w6xzkaj6c09vrkmf24gl07kc995c39yby5jdngpggdxc9h"; isLibrary = true; isExecutable = true; buildDepends = [ filepath transformers ]; From 34db77c302b721c07197ab99a72c70b2b212fdba Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 30 Jul 2013 11:33:19 +0200 Subject: [PATCH 758/798] haskell-feed: update to version 0.3.9 --- pkgs/development/libraries/haskell/feed/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/feed/default.nix b/pkgs/development/libraries/haskell/feed/default.nix index d15906e0be5..bafe23aed0c 100644 --- a/pkgs/development/libraries/haskell/feed/default.nix +++ b/pkgs/development/libraries/haskell/feed/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "feed"; - version = "0.3.8"; - sha256 = "1yvigcvb8cvxfa8vb2i11xkrylqw57jwzkaji6m1wp03k80zf576"; + version = "0.3.9"; + sha256 = "0waqy8ssmbfpqy21svvbnm0igrjxbgd2i093hbl5chim6yraapv2"; buildDepends = [ utf8String xml ]; meta = { description = "Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds."; From 5f960aac0f1d9d0b82735ddcb204c67414d51126 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 31 Jul 2013 11:08:34 +0200 Subject: [PATCH 759/798] haskell-haskell-src-meta: update to version 0.6.0.3 --- .../libraries/haskell/haskell-src-meta/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/haskell-src-meta/default.nix b/pkgs/development/libraries/haskell/haskell-src-meta/default.nix index 98dfff8505a..7c9e7694046 100644 --- a/pkgs/development/libraries/haskell/haskell-src-meta/default.nix +++ b/pkgs/development/libraries/haskell/haskell-src-meta/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "haskell-src-meta"; - version = "0.6.0.2"; - sha256 = "1msqnsavghsc5bil3mm9swpi9a54pki4162jdfwwvlzvdmfvk9hp"; + version = "0.6.0.3"; + sha256 = "1ag26pzppvqw9ch6jz1p0bhsld7fz0b01k7h9516hnmy215h7xai"; buildDepends = [ haskellSrcExts syb thOrphans uniplate ]; jailbreak = true; meta = { From ef659fa8c0cb1b36c7f267e64d472ee28b4a67ab Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 31 Jul 2013 11:08:34 +0200 Subject: [PATCH 760/798] haskell-unix-process-conduit: update to version 0.2.1.2 --- .../libraries/haskell/unix-process-conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/unix-process-conduit/default.nix b/pkgs/development/libraries/haskell/unix-process-conduit/default.nix index d12167ac428..8dc93c21363 100644 --- a/pkgs/development/libraries/haskell/unix-process-conduit/default.nix +++ b/pkgs/development/libraries/haskell/unix-process-conduit/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "unix-process-conduit"; - version = "0.2.1.1"; - sha256 = "038z99gzwqhig65zzb3hc9zisnvzslvvy86wjgx6wz90p6vbxzn4"; + version = "0.2.1.2"; + sha256 = "1gg1ynqd8hka5ynpmpsj8qw0lqsyg7l1m1py05iw3bd3cldwflx1"; buildDepends = [ conduit filepath stm time transformers ]; testDepends = [ conduit hspec transformers ]; meta = { From 332dd4854fac730ac8bddac010d17fa9d2cd45a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 31 Jul 2013 13:32:25 +0200 Subject: [PATCH 761/798] Move namePrefix="" python packages out of python-packges.nix It doesn't make sense to build tools/applications with three different python interpreter versions, so move them out of python modules list. Also reverts 53ffc6e0ef395a2bd7651423d9783ad8184be1d0. --- .../python-modules/pylint/default.nix | 23 +++++ .../python-modules/rbtools/default.nix | 13 +++ .../python-modules/setuptools/default.nix | 3 +- pkgs/tools/admin/awscli/default.nix | 18 ++++ pkgs/tools/video/vnc2flv/default.nix | 19 ++++ pkgs/top-level/all-packages.nix | 19 ++-- pkgs/top-level/python-packages.nix | 88 ++----------------- 7 files changed, 97 insertions(+), 86 deletions(-) create mode 100644 pkgs/development/python-modules/pylint/default.nix create mode 100644 pkgs/development/python-modules/rbtools/default.nix create mode 100644 pkgs/tools/admin/awscli/default.nix create mode 100644 pkgs/tools/video/vnc2flv/default.nix diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix new file mode 100644 index 00000000000..d45d724ae58 --- /dev/null +++ b/pkgs/development/python-modules/pylint/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, pythonPackages }: + +pythonPackages.buildPythonPackage rec { + name = "pylint-0.26.0"; + namePrefix = ""; + + src = fetchurl { + url = "http://download.logilab.org/pub/pylint/${name}.tar.gz"; + sha256 = "1mg1ywpj0klklv63s2hwn5xwxi3wfwgnyz9d4pz32hzb53azq835"; + }; + + propagatedBuildInputs = [ pythonPackages.logilab_astng ]; + + postInstall = '' + mkdir -p $out/share/emacs/site-lisp + cp "elisp/"*.el $out/share/emacs/site-lisp/ + ''; + + meta = { + homepage = http://www.logilab.org/project/pylint; + description = "A bug and style checker for Python"; + }; +} diff --git a/pkgs/development/python-modules/rbtools/default.nix b/pkgs/development/python-modules/rbtools/default.nix new file mode 100644 index 00000000000..7d82ef9adf2 --- /dev/null +++ b/pkgs/development/python-modules/rbtools/default.nix @@ -0,0 +1,13 @@ +{ stdenv, fetchurl, pythonPackages }: + +pythonPackages.buildPythonPackage rec { + name = "rbtools-0.4.1"; + namePrefix = ""; + + src = fetchurl { + url = "http://downloads.reviewboard.org/releases/RBTools/0.4/RBTools-0.4.1.tar.gz"; + sha256 = "1v0r7rfzrasj56s53mib51wl056g7ykh2y1c6dwv12r6hzqsycgv"; + }; + + propagatedBuildInputs = [ pythonPackages.setuptools ]; +} diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix index 3dcaaca4c25..d6ad28645c1 100644 --- a/pkgs/development/python-modules/setuptools/default.nix +++ b/pkgs/development/python-modules/setuptools/default.nix @@ -34,9 +34,10 @@ stdenv.mkDerivation rec { ${python}/bin/${python.executable} setup.py test ''; - meta = { + meta = with stdenv.lib; { description = "Utilities to facilitate the installation of Python packages"; homepage = http://pypi.python.org/pypi/setuptools; licenses = [ "PSF" "ZPL" ]; + platforms = platforms.all; }; } diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix new file mode 100644 index 00000000000..aa8361c737f --- /dev/null +++ b/pkgs/tools/admin/awscli/default.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl, pythonPackages }: + +pythonPackages.buildPythonPackage rec { + name = "awscli-${version}"; + version = "0.8.3"; + namePrefix = ""; + + src = fetchurl { + url = "https://github.com/aws/aws-cli/archive/${version}.tar.gz"; + sha256 = "0v7igh00zja560v8qz315g3m7x9six1hprrrb10cpp9sy8n58xnn"; + }; + + propagatedBuildInputs = [ + pythonPackages.argparse + pythonPackages.botocore + pythonPackages.colorama + ]; +} diff --git a/pkgs/tools/video/vnc2flv/default.nix b/pkgs/tools/video/vnc2flv/default.nix new file mode 100644 index 00000000000..f2f77bd84cd --- /dev/null +++ b/pkgs/tools/video/vnc2flv/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, pythonPackages }: + +pythonPackages.buildPythonPackage rec { + name = "vnc2flv-20100207"; + namePrefix = ""; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/v/vnc2flv/${name}.tar.gz"; + md5 = "8492e46496e187b49fe5569b5639804e"; + }; + + # error: invalid command 'test' + doCheck = false; + + meta = { + description = "Tool to record VNC sessions to Flash Video"; + homepage = http://www.unixuser.org/~euske/python/vnc2flv/; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f7ebd70ee81..5d06b8732bb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -421,6 +421,8 @@ let }; }; + awscli = callPackage ../tools/admin/awscli { }; + ec2_api_tools = callPackage ../tools/virtualization/ec2-api-tools { }; ec2_ami_tools = callPackage ../tools/virtualization/ec2-ami-tools { }; @@ -1825,6 +1827,8 @@ let inherit (gnome) scrollkeeper; }; + vnc2flv = callPackage ../tools/video/vnc2flv {}; + vncrec = builderDefsPackage ../tools/video/vncrec { inherit (xlibs) imake libX11 xproto gccmakedep libXt libXmu libXaw libXext xextproto libSM libICE libXpm @@ -5740,11 +5744,11 @@ let python3Packages = python33Packages; - python33Packages = import ./python-packages.nix { + python33Packages = recurseIntoAttrs (import ./python-packages.nix { inherit pkgs; inherit (lib) lowPrio; python = python33; - }; + }); python32Packages = import ./python-packages.nix { inherit pkgs; @@ -5758,11 +5762,11 @@ let python = python27; }); - pypyPackages = import ./python-packages.nix { + pypyPackages = recurseIntoAttrs (import ./python-packages.nix { inherit pkgs; inherit (lib) lowPrio; python = pypy; - }; + }); plone41Packages = import ../development/web/plone/4.1.nix { inherit pkgs; @@ -5807,6 +5811,8 @@ let pyGtkGlade = pythonPackages.pyGtkGlade; + pylint = callPackage ../development/python-modules/pylint { }; + pyopenssl = builderDefsPackage (import ../development/python-modules/pyopenssl) { inherit python openssl; }; @@ -5831,6 +5837,8 @@ let pyxml = callPackage ../development/python-modules/pyxml { }; + rbtools = callPackage ../development/python-modules/rbtools { }; + setuptools = pythonPackages.setuptools; wxPython = pythonPackages.wxPython; @@ -9308,7 +9316,8 @@ let spyder = callPackage ../applications/science/spyder { inherit (pythonPackages) pyflakes rope sphinx numpy scipy matplotlib; # recommended - inherit (pythonPackages) ipython pylint pep8; # optional + inherit (pythonPackages) ipython pep8; # optional + inherit pylint; }; stellarium = callPackage ../applications/science/astronomy/stellarium { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bd2d5cca922..d6bf93b394a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -341,24 +341,6 @@ pythonPackages = modules // rec { }; }); - - awscli = buildPythonPackage rec { - name = "awscli-0.8.3"; - namePrefix = ""; - - src = fetchurl { - url = https://github.com/aws/aws-cli/archive/0.8.3.tar.gz; - sha256 = "0v7igh00zja560v8qz315g3m7x9six1hprrrb10cpp9sy8n58xnn"; - }; - - propagatedBuildInputs = - [ pythonPackages.argparse - pythonPackages.botocore - pythonPackages.colorama - ]; - }; - - beautifulsoup = buildPythonPackage (rec { name = "beautifulsoup-3.2.1"; @@ -573,11 +555,12 @@ pythonPackages = modules // rec { botocore = buildPythonPackage rec { - name = "botocore-0.8.3"; + version = "0.13.1"; + name = "botocore-${version}"; src = fetchurl { - url = https://github.com/boto/botocore/archive/0.8.3.tar.gz; - sha256 = "0dbm2clrh7zs4brqqj3xssz3nymdg24ff2lww27s3wliirwqdiv1"; + url = "https://pypi.python.org/packages/source/b/botocore/${name}.tar.gz"; + sha256 = "192kxgw76b22zmk5mxjkij5rskibb9jfaggvpznzy3ggsgja7yy8"; }; propagatedBuildInputs = @@ -2294,11 +2277,11 @@ pythonPackages = modules // rec { jmespath = buildPythonPackage rec { - name = "jmespath-0.0.1"; + name = "jmespath-0.0.2"; src = fetchurl { - url = "https://github.com/boto/jmespath/archive/0.0.1.tar.gz"; - sha256 = "1a5d62qbgfjbaw8wgkfh78gairnpy6bbdsygwm1prqwap1kyq6ch"; + url = "https://github.com/boto/jmespath/archive/0.0.2.tar.gz"; + sha256 = "0wr1gq3gdyn3n21pvj62csdm095512zxd10gkg5ai1vvxh0mbn3r"; }; propagatedBuildInputs = [ ply ]; @@ -4167,8 +4150,7 @@ pythonPackages = modules // rec { }); ldap = buildPythonPackage rec { - name = "python-ldap-2.4.10"; - namePrefix = ""; + name = "ldap-2.4.10"; src = fetchurl { url = "http://pypi.python.org/packages/source/p/python-ldap/${name}.tar.gz"; @@ -4201,29 +4183,6 @@ pythonPackages = modules // rec { }); - pylint = buildPythonPackage rec { - name = "pylint-0.26.0"; - namePrefix = ""; - - src = fetchurl { - url = "http://download.logilab.org/pub/pylint/${name}.tar.gz"; - sha256 = "1mg1ywpj0klklv63s2hwn5xwxi3wfwgnyz9d4pz32hzb53azq835"; - }; - - propagatedBuildInputs = [ logilab_astng ]; - - postInstall = '' - mkdir -p $out/share/emacs/site-lisp - cp "elisp/"*.el $out/share/emacs/site-lisp/ - ''; - - meta = { - homepage = http://www.logilab.org/project/pylint; - description = "A bug and style checker for Python"; - }; - }; - - pymacs = pkgs.stdenv.mkDerivation rec { version = "v0.25"; name = "Pymacs-${version}"; @@ -4514,19 +4473,6 @@ pythonPackages = modules // rec { }); - RBTools = buildPythonPackage rec { - name = "rbtools-0.4.1"; - namePrefix = ""; - - src = fetchurl { - url = "http://downloads.reviewboard.org/releases/RBTools/0.4/RBTools-0.4.1.tar.gz"; - sha256 = "1v0r7rfzrasj56s53mib51wl056g7ykh2y1c6dwv12r6hzqsycgv"; - }; - - propagatedBuildInputs = [ setuptools ]; - }; - - recaptcha_client = buildPythonPackage rec { name = "recaptcha-client-1.0.6"; @@ -5445,24 +5391,6 @@ pythonPackages = modules // rec { }; }; - vnc2flv = buildPythonPackage rec { - name = "vnc2flv-20100207"; - namePrefix = ""; - - src = fetchurl { - url = "http://pypi.python.org/packages/source/v/vnc2flv/${name}.tar.gz"; - md5 = "8492e46496e187b49fe5569b5639804e"; - }; - - # error: invalid command 'test' - doCheck = false; - - meta = { - description = "Tool to record VNC sessions to Flash Video"; - homepage = http://www.unixuser.org/~euske/python/vnc2flv/; - }; - }; - waitress = buildPythonPackage rec { name = "waitress-0.8.5"; From 945c70202f71e452ad957a1e073d7b3269f9401c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 31 Jul 2013 14:19:48 +0200 Subject: [PATCH 762/798] qemu: Update to 1.5.2 --- 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 1a35b870192..e1ae4df4443 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -7,11 +7,11 @@ }: stdenv.mkDerivation rec { - name = "qemu-1.5.1"; + name = "qemu-1.5.2"; src = fetchurl { url = "http://wiki.qemu.org/download/${name}.tar.bz2"; - sha256 = "1s7316pgizpayr472la8p8a4vhv7ymmzd5qlbkmq6y9q5zpa25ac"; + sha256 = "0l52jwlxmwp9g3jpq0g7ix9dq4qgh46nd2h58lh47f0a35yi8qgn"; }; buildInputs = From 00e311e43878414a3c5f88cabd5a81cd8537c59f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 31 Jul 2013 14:31:04 +0200 Subject: [PATCH 763/798] qemu-kvm: Remove But install a qemu-kvm wrapper in qemu. --- .../virtualization/qemu/default.nix | 12 +++- pkgs/os-specific/linux/qemu-kvm/default.nix | 58 --------------- .../linux/qemu-kvm/fix-librt-check.patch | 72 ------------------- .../linux/qemu-kvm/fix-usb-passthrough.patch | 45 ------------ pkgs/top-level/all-packages.nix | 2 +- 5 files changed, 12 insertions(+), 177 deletions(-) delete mode 100644 pkgs/os-specific/linux/qemu-kvm/default.nix delete mode 100644 pkgs/os-specific/linux/qemu-kvm/fix-librt-check.patch delete mode 100644 pkgs/os-specific/linux/qemu-kvm/fix-usb-passthrough.patch diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index e1ae4df4443..3a6cdb6f8c6 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, python, zlib, pkgconfig, glib, ncurses, perl, pixman , attr, libcap, vde2, alsaLib, texinfo, libuuid +, makeWrapper , sdlSupport ? true, SDL , vncSupport ? true, libjpeg, libpng , spiceSupport ? true, spice, spice_protocol @@ -16,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ python zlib pkgconfig glib ncurses perl pixman attr libcap - vde2 alsaLib texinfo libuuid + vde2 alsaLib texinfo libuuid makeWrapper ] ++ stdenv.lib.optionals sdlSupport [ SDL ] ++ stdenv.lib.optionals vncSupport [ libjpeg libpng ] @@ -31,6 +32,15 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional spiceSupport "--enable-spice" ++ stdenv.lib.optional x86Only "--target-list=i386-softmmu,x86_64-softmmu"; + postInstall = + '' + # Add a ‘qemu-kvm’ wrapper for compatibility/convenience. + p="$out/bin/qemu-system-${if stdenv.system == "x86_64-linux" then "x86_64" else "i386"}" + if [ -e "$p" ]; then + makeWrapper "$p" $out/bin/qemu-kvm --add-flags "-enable-kvm" + fi + ''; + meta = { homepage = http://www.qemu.org/; description = "A generic and open source machine emulator and virtualizer"; diff --git a/pkgs/os-specific/linux/qemu-kvm/default.nix b/pkgs/os-specific/linux/qemu-kvm/default.nix deleted file mode 100644 index 2f93769d280..00000000000 --- a/pkgs/os-specific/linux/qemu-kvm/default.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ stdenv, fetchurl, attr, zlib, SDL, alsaLib, pkgconfig, pciutils, libuuid, vde2 -, libjpeg, libpng, ncurses, python, glib, libaio, mesa, perl, texinfo -, spice, spice_protocol, spiceSupport ? false }: - -assert stdenv.isLinux; - -let version = "1.2.0"; in - -stdenv.mkDerivation rec { - name = "qemu-kvm-${version}"; - - src = fetchurl { - url = "mirror://sourceforge/kvm/qemu-kvm/${version}/${name}.tar.gz"; - sha256 = "018vb5nmk2fsm143bs2bl2wirhasd4b10d7jchl32zik4inbk2p9"; - }; - - buildInputs = - [ attr zlib SDL alsaLib pkgconfig pciutils libuuid vde2 libjpeg libpng - ncurses python glib libaio mesa texinfo perl - ] ++ stdenv.lib.optionals spiceSupport [ spice_protocol spice ]; - - patches = [ ./fix-librt-check.patch ./fix-usb-passthrough.patch ]; - - postPatch = '' - patchShebangs . - sed '/qtest_add_func.*check_time/d' -i tests/rtc-test.c - '' # disable tests that meddle with system time, they seem to work bad, maybe due to newer glib - + stdenv.lib.optionalString spiceSupport '' - for i in configure spice-qemu-char.c ui/spice-input.c ui/spice-core.c ui/qemu-spice.h; do - substituteInPlace $i --replace '#include ' '#include ' - done - ''; - - configureFlags = - [ "--audio-drv-list=alsa" - "--smbd=smbd" # use `smbd' from $PATH - "--enable-docs" - "--python=${python}/bin/python" - ] ++ stdenv.lib.optional spiceSupport "--enable-spice"; - - postInstall = - '' - # Libvirt expects us to be called `qemu-kvm'. Otherwise it will - # set the domain type to "qemu" rather than "kvm", which can - # cause architecture selection to misbehave. - ln -sv $(cd $out/bin && echo qemu-system-*) $out/bin/qemu-kvm - ''; - - doCheck = true; - - enableParallelBuilding = true; - - meta = { - homepage = http://www.linux-kvm.org/; - description = "A full virtualization solution for Linux on x86 hardware containing virtualization extensions"; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/os-specific/linux/qemu-kvm/fix-librt-check.patch b/pkgs/os-specific/linux/qemu-kvm/fix-librt-check.patch deleted file mode 100644 index 57de288723e..00000000000 --- a/pkgs/os-specific/linux/qemu-kvm/fix-librt-check.patch +++ /dev/null @@ -1,72 +0,0 @@ -commit 8bacde8d86a09699207d85d4bab06162aed18dc4 -Author: Natanael Copa -Date: Wed Sep 12 09:06:51 2012 +0000 - - configure: properly check if -lrt and -lm is needed - - Fixes build against uClibc. - - uClibc provides 2 versions of clock_gettime(), one with realtime - support and one without (this is so you can avoid linking in -lrt - unless actually needed). This means that the clock_gettime() don't - need -lrt. We still need it for timer_create() so we check for this - function in addition. - - We also need check if -lm is needed for isnan(). - - Both -lm and -lrt are needed for libs_qga. - - Signed-off-by: Natanael Copa - Signed-off-by: Blue Swirl - -diff --git a/configure b/configure -index 7656c32..9ab13db 100755 ---- a/configure -+++ b/configure -@@ -2671,17 +2671,44 @@ fi - - - ########################################## -+# Do we need libm -+cat > $TMPC << EOF -+#include -+int main(void) { return isnan(sin(0.0)); } -+EOF -+if compile_prog "" "" ; then -+ : -+elif compile_prog "" "-lm" ; then -+ LIBS="-lm $LIBS" -+ libs_qga="-lm $libs_qga" -+else -+ echo -+ echo "Error: libm check failed" -+ echo -+ exit 1 -+fi -+ -+########################################## - # Do we need librt -+# uClibc provides 2 versions of clock_gettime(), one with realtime -+# support and one without. This means that the clock_gettime() don't -+# need -lrt. We still need it for timer_create() so we check for this -+# function in addition. - cat > $TMPC < - #include --int main(void) { return clock_gettime(CLOCK_REALTIME, NULL); } -+int main(void) { -+ timer_create(CLOCK_REALTIME, NULL, NULL); -+ return clock_gettime(CLOCK_REALTIME, NULL); -+} - EOF - - if compile_prog "" "" ; then - : --elif compile_prog "" "-lrt" ; then -+# we need pthread for static linking. use previous pthread test result -+elif compile_prog "" "-lrt $pthread_lib" ; then - LIBS="-lrt $LIBS" -+ libs_qga="-lrt $libs_qga" - fi - - if test "$darwin" != "yes" -a "$mingw32" != "yes" -a "$solaris" != yes -a \ diff --git a/pkgs/os-specific/linux/qemu-kvm/fix-usb-passthrough.patch b/pkgs/os-specific/linux/qemu-kvm/fix-usb-passthrough.patch deleted file mode 100644 index a73df310629..00000000000 --- a/pkgs/os-specific/linux/qemu-kvm/fix-usb-passthrough.patch +++ /dev/null @@ -1,45 +0,0 @@ -https://bugs.launchpad.net/qemu/+bug/1033727 - -From: Hans de Goede -Date: Wed, 12 Sep 2012 13:08:40 +0000 (+0200) -Subject: uhci: Don't queue up packets after one with the SPD flag set -X-Git-Tag: v1.3.0-rc0~483^2 -X-Git-Url: http://git.qemu.org/?p=qemu.git;a=commitdiff_plain;h=72a04d0c178f01908d74539230d9de64ffc6da19 -Bug-Debian: http://bugs.debian.org/683983 - -uhci: Don't queue up packets after one with the SPD flag set - -Don't queue up packets after a packet with the SPD (short packet detect) -flag set. Since we won't know if the packet will actually be short until it -has completed, and if it is short we should stop the queue. - -This fixes a miniature photoframe emulating a USB cdrom with the windows -software for it not working. - -Signed-off-by: Hans de Goede -Signed-off-by: Gerd Hoffmann ---- - -diff --git a/hw/usb/hcd-uhci.c b/hw/usb/hcd-uhci.c -index c7c8786..cdc8bc3 100644 ---- a/hw/usb/hcd-uhci.c -+++ b/hw/usb/hcd-uhci.c -@@ -1000,6 +1000,9 @@ static void uhci_fill_queue(UHCIState *s, UHCI_TD *td) - } - assert(ret == TD_RESULT_ASYNC_START); - assert(int_mask == 0); -+ if (ptd.ctrl & TD_CTRL_SPD) { -+ break; -+ } - plink = ptd.link; - } - } -@@ -1097,7 +1100,7 @@ static void uhci_process_frame(UHCIState *s) - - case TD_RESULT_ASYNC_START: - trace_usb_uhci_td_async(curr_qh & ~0xf, link & ~0xf); -- if (is_valid(td.link)) { -+ if (is_valid(td.link) && !(td.ctrl & TD_CTRL_SPD)) { - uhci_fill_queue(s, &td); - } - link = curr_qh ? qh.link : td.link; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5d06b8732bb..8c6eae1919e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6717,7 +6717,7 @@ let "procps-ng" = callPackage ../os-specific/linux/procps-ng { }; - qemu_kvm = callPackage ../os-specific/linux/qemu-kvm { }; + qemu_kvm = qemu.override { x86Only = true; }; firmwareLinuxNonfree = callPackage ../os-specific/linux/firmware/firmware-linux-nonfree { }; From b5fcb5b67d104bbde4bf6a6ac565c6548ca91d11 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 31 Jul 2013 14:35:53 +0200 Subject: [PATCH 764/798] Use the qemu-kvm wrapper --- pkgs/build-support/vm/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index dbab401d9ba..2821fc0a099 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -9,9 +9,9 @@ with pkgs; rec { - kvm = pkgs.qemu; + qemu = pkgs.qemu_kvm; - qemuProg = "${kvm}/bin/qemu-system-" + (if stdenv.system == "x86_64-linux" then "x86_64" else "i386"); + qemuProg = "${qemu}/bin/qemu-kvm"; modulesClosure = makeModulesClosure { @@ -188,7 +188,6 @@ rec { qemuCommandLinux = '' ${qemuProg} \ - -enable-kvm \ ${lib.optionalString (pkgs.stdenv.system == "x86_64-linux") "-cpu kvm64"} \ -nographic -no-reboot \ -virtfs local,path=/nix/store,security_model=none,mount_tag=store \ @@ -242,7 +241,7 @@ rec { createEmptyImage = {size, fullName}: '' mkdir $out diskImage=$out/disk-image.qcow2 - ${kvm}/bin/qemu-img create -f qcow2 $diskImage "${toString size}M" + ${qemu}/bin/qemu-img create -f qcow2 $diskImage "${toString size}M" mkdir $out/nix-support echo "${fullName}" > $out/nix-support/full-name @@ -362,7 +361,7 @@ rec { diskImage=$(pwd)/disk-image.qcow2 origImage=${attrs.diskImage} if test -d "$origImage"; then origImage="$origImage/disk-image.qcow2"; fi - ${kvm}/bin/qemu-img create -b "$origImage" -f qcow2 $diskImage + ${qemu}/bin/qemu-img create -b "$origImage" -f qcow2 $diskImage ''; /* Inside the VM, run the stdenv setup script normally, but at the @@ -459,7 +458,7 @@ rec { fi diskImage="$1" if ! test -e "$diskImage"; then - ${kvm}/bin/qemu-img create -b ${image}/disk-image.qcow2 -f qcow2 "$diskImage" + ${qemu}/bin/qemu-img create -b ${image}/disk-image.qcow2 -f qcow2 "$diskImage" fi export TMPDIR=$(mktemp -d) export out=/dummy From c8c817a3b45ce124b6e6376957ae599b622551ea Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 31 Jul 2013 14:50:42 +0200 Subject: [PATCH 765/798] qemu-kvm: Disambiguate --- pkgs/applications/virtualization/qemu/default.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 3a6cdb6f8c6..dcf5b4e5009 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -7,11 +7,13 @@ , x86Only ? false }: +let n = "qemu-1.5.2"; in + stdenv.mkDerivation rec { - name = "qemu-1.5.2"; + name = n + (if x86Only then "-x86-only" else ""); src = fetchurl { - url = "http://wiki.qemu.org/download/${name}.tar.bz2"; + url = "http://wiki.qemu.org/download/${n}.tar.bz2"; sha256 = "0l52jwlxmwp9g3jpq0g7ix9dq4qgh46nd2h58lh47f0a35yi8qgn"; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8c6eae1919e..d2b472dce83 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6717,7 +6717,7 @@ let "procps-ng" = callPackage ../os-specific/linux/procps-ng { }; - qemu_kvm = qemu.override { x86Only = true; }; + qemu_kvm = lowPrio (qemu.override { x86Only = true; }); firmwareLinuxNonfree = callPackage ../os-specific/linux/firmware/firmware-linux-nonfree { }; From ab7f2aea8e644d8391ea8a05fd5baa2f8b2eaa7d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 31 Jul 2013 15:02:23 +0200 Subject: [PATCH 766/798] apr: Update to 1.4.8 Also drop the accept4 hack because Linux 2.6.32 is now the minimal kernel version supported by Nixpkgs. --- pkgs/development/libraries/apr/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/apr/default.nix b/pkgs/development/libraries/apr/default.nix index 07a565596bb..1893a2c9413 100644 --- a/pkgs/development/libraries/apr/default.nix +++ b/pkgs/development/libraries/apr/default.nix @@ -5,21 +5,19 @@ let in stdenv.mkDerivation rec { - name = "apr-1.4.6"; + name = "apr-1.4.8"; src = fetchurl { url = "mirror://apache/apr/${name}.tar.bz2"; - md5 = "ffee70a111fd07372982b0550bbb14b7"; + md5 = "ce2ab01a0c3cdb71cf0a6326b8654f41"; }; patches = optionals stdenv.isDarwin [ ./darwin_fix_configure.patch ]; configureFlags = - # Don't use accept4 because it's only supported on Linux >= 2.6.28. - [ "apr_cv_accept4=no" ] # Including the Windows headers breaks unistd.h. # Based on ftp://sourceware.org/pub/cygwin/release/libapr1/libapr1-1.3.8-2-src.tar.bz2 - ++ stdenv.lib.optional (stdenv.system == "i686-cygwin") "ac_cv_header_windows_h=no"; + stdenv.lib.optional (stdenv.system == "i686-cygwin") "ac_cv_header_windows_h=no"; meta = { homepage = http://apr.apache.org/; From 32b036a4304c60b4084686ea8c2e41ad40c4b112 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 31 Jul 2013 15:02:54 +0200 Subject: [PATCH 767/798] apr-util: Update to 1.5.2 --- pkgs/development/libraries/apr-util/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/apr-util/default.nix b/pkgs/development/libraries/apr-util/default.nix index 5f6291127e9..8e49d398460 100644 --- a/pkgs/development/libraries/apr-util/default.nix +++ b/pkgs/development/libraries/apr-util/default.nix @@ -9,11 +9,11 @@ assert bdbSupport -> db4 != null; assert ldapSupport -> openldap != null; stdenv.mkDerivation rec { - name = "apr-util-1.5.1"; + name = "apr-util-1.5.2"; src = fetchurl { url = "mirror://apache/apr/${name}.tar.bz2"; - md5 = "9c1db8606e520f201c451ec9a0b095f6"; + md5 = "89c1348aa79e898d7c34a6206311c9c2"; }; configureFlags = '' From 537a71a51e6b16d18ba0c8e87ae2ec60f902228e Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Wed, 10 Jul 2013 16:18:18 +0200 Subject: [PATCH 768/798] openconnect and vpnc NetworkManager plugins added also openvpn plugin updated to the same version as NetworkManager --- .../network-manager-applet/default.nix | 17 +++++-- .../network-manager/openconnect.nix | 46 +++++++++++++++++++ .../networking/network-manager/openvpn.nix | 2 +- .../tools/networking/network-manager/pptp.nix | 4 +- .../tools/networking/network-manager/vpnc.nix | 46 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 6 files changed, 113 insertions(+), 6 deletions(-) create mode 100644 pkgs/tools/networking/network-manager/openconnect.nix create mode 100644 pkgs/tools/networking/network-manager/vpnc.nix diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix index 387ccfcaed4..69c7b77e3f9 100644 --- a/pkgs/tools/networking/network-manager-applet/default.nix +++ b/pkgs/tools/networking/network-manager-applet/default.nix @@ -1,7 +1,8 @@ { stdenv, fetchurl, intltool, pkgconfig, gtk, libglade, networkmanager, GConf , libnotify, libsecret, dbus_glib, polkit, isocodes, libgnome_keyring, gnome_keyring , mobile_broadband_provider_info, glib_networking, gsettings_desktop_schemas -, makeWrapper, networkmanager_openvpn, udev, hicolor_icon_theme }: +, makeWrapper, networkmanager_openvpn, networkmanager_vpnc +, networkmanager_openconnect, udev, hicolor_icon_theme }: let pn = "network-manager-applet"; @@ -31,8 +32,18 @@ stdenv.mkDerivation rec { ]; postInstall = '' - ln -s ${networkmanager_openvpn}/etc/NetworkManager $out/etc/NetworkManager - ln -s ${networkmanager_openvpn}/lib/* $out/lib + mkdir -p $out/etc/NetworkManager/VPN + ln -s ${networkmanager_openvpn}/etc/NetworkManager/VPN/nm-openvpn-service.name $out/etc/NetworkManager/VPN/nm-openvpn-service.name + ln -s ${networkmanager_vpnc}/etc/NetworkManager/VPN/nm-vpnc-service.name $out/etc/NetworkManager/VPN/nm-vpnc-service.name + ln -s ${networkmanager_openconnect}/etc/NetworkManager/VPN/nm-openconnect-service.name $out/etc/NetworkManager/VPN/nm-openconnect-service.name + mkdir -p $out/lib/NetworkManager + ln -s ${networkmanager_openvpn}/lib/NetworkManager/* $out/lib/NetworkManager/ + ln -s ${networkmanager_vpnc}/lib/NetworkManager/* $out/lib/NetworkManager/ + ln -s ${networkmanager_openconnect}/lib/NetworkManager/* $out/lib/NetworkManager/ + mkdir -p $out/libexec + ln -s ${networkmanager_openvpn}/libexec/* $out/libexec/ + ln -s ${networkmanager_vpnc}/libexec/* $out/libexec/ + ln -s ${networkmanager_openconnect}/libexec/* $out/libexec/ wrapProgram "$out/bin/nm-applet" \ --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules" \ --prefix XDG_DATA_DIRS : "${gsettings_desktop_schemas}/share:$out/share" \ diff --git a/pkgs/tools/networking/network-manager/openconnect.nix b/pkgs/tools/networking/network-manager/openconnect.nix new file mode 100644 index 00000000000..795f727599b --- /dev/null +++ b/pkgs/tools/networking/network-manager/openconnect.nix @@ -0,0 +1,46 @@ +{ stdenv, fetchurl, openconnect, intltool, pkgconfig, networkmanager +, withGnome ? true, gtk2, gconf, libgnome_keyring, procps, module_init_tools }: + +stdenv.mkDerivation rec { + name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; + pname = "NetworkManager-openconnect"; + version = networkmanager.version; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/0.9/${pname}-${version}.tar.xz"; + sha256 = "16sdgrabbh2y7j6g9ic9lm5z6sxn7iz3j0xininkiwnjgbsqf961"; + }; + + buildInputs = [ openconnect networkmanager ] + ++ stdenv.lib.optionals withGnome [ gtk2 libgnome_keyring gconf ]; + + nativeBuildInputs = [ intltool pkgconfig ]; + + configureFlags = [ + "${if withGnome then "--with-gnome --with-gtkver=2" else "--without-gnome"}" + "--disable-static" + ]; + + preConfigure = '' + substituteInPlace "configure" \ + --replace "/sbin/sysctl" "${procps}/sbin/sysctl" + substituteInPlace "src/nm-openconnect-service.c" \ + --replace "/sbin/openconnect" "${openconnect}/sbin/openconnect" \ + --replace "/sbin/modprobe" "${module_init_tools}/sbin/modprobe" + ''; + + postConfigure = '' + substituteInPlace "./auth-dialog/Makefile" \ + --replace "-Wstrict-prototypes" "" \ + --replace "-Werror" "" + substituteInPlace "properties/Makefile" \ + --replace "-Wstrict-prototypes" "" \ + --replace "-Werror" "" + ''; + + meta = { + description = "TODO"; + inherit (networkmanager.meta) maintainers platforms; + }; +} + diff --git a/pkgs/tools/networking/network-manager/openvpn.nix b/pkgs/tools/networking/network-manager/openvpn.nix index 9817a8cddd1..d49dcbbc92a 100644 --- a/pkgs/tools/networking/network-manager/openvpn.nix +++ b/pkgs/tools/networking/network-manager/openvpn.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; pname = "NetworkManager-openvpn"; - version = "0.9.8.0"; + version = networkmanager.version; src = fetchurl { url = "mirror://gnome/sources/${pname}/0.9/${pname}-${version}.tar.xz"; diff --git a/pkgs/tools/networking/network-manager/pptp.nix b/pkgs/tools/networking/network-manager/pptp.nix index a60199aab2d..41dda0086e4 100644 --- a/pkgs/tools/networking/network-manager/pptp.nix +++ b/pkgs/tools/networking/network-manager/pptp.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; pname = "NetworkManager-pptp"; - version = "0.9.8.0"; + version = networkmanager.version; src = fetchurl { url = "mirror://gnome/sources/${pname}/0.9/${pname}-${version}.tar.xz"; - sha256 = "1j4wczf0lv2c58pgdfxg2qsva5v0r1w99x6l1p78m56qc8a9il1l"; + sha256 = "7f46ea61376d13d03685eca3f26a26e0022f6e92e6f1fc356034ca9717eb6dac"; }; buildInputs = [ networkmanager pptp ppp ] diff --git a/pkgs/tools/networking/network-manager/vpnc.nix b/pkgs/tools/networking/network-manager/vpnc.nix new file mode 100644 index 00000000000..57ab5af5bcb --- /dev/null +++ b/pkgs/tools/networking/network-manager/vpnc.nix @@ -0,0 +1,46 @@ +{ stdenv, fetchurl, vpnc, intltool, pkgconfig, networkmanager +, withGnome ? true, gtk2, libgnome_keyring, procps, module_init_tools }: + +stdenv.mkDerivation rec { + name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; + pname = "NetworkManager-vpnc"; + version = networkmanager.version; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/0.9/${pname}-${version}.tar.xz"; + sha256 = "1hdigqfvsjlr1zr23lwmcsvcv1x74cqhfpwrd0j0zhhmjdb4ql74"; + }; + + buildInputs = [ vpnc networkmanager ] + ++ stdenv.lib.optionals withGnome [ gtk2 libgnome_keyring ]; + + nativeBuildInputs = [ intltool pkgconfig ]; + + configureFlags = [ + "${if withGnome then "--with-gnome --with-gtkver=2" else "--without-gnome"}" + "--disable-static" + ]; + + preConfigure = '' + substituteInPlace "configure" \ + --replace "/sbin/sysctl" "${procps}/sbin/sysctl" + substituteInPlace "src/nm-vpnc-service.c" \ + --replace "/sbin/vpnc" "${vpnc}/sbin/vpnc" \ + --replace "/sbin/modprobe" "${module_init_tools}/sbin/modprobe" + ''; + + postConfigure = '' + substituteInPlace "./auth-dialog/Makefile" \ + --replace "-Wstrict-prototypes" "" \ + --replace "-Werror" "" + substituteInPlace "properties/Makefile" \ + --replace "-Wstrict-prototypes" "" \ + --replace "-Werror" "" + ''; + + meta = { + description = "TODO"; + inherit (networkmanager.meta) maintainers platforms; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d2b472dce83..b1ff989ee68 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1331,6 +1331,10 @@ let networkmanager_pptp_gnome = networkmanager_pptp.override { withGnome = true; }; + networkmanager_vpnc = callPackage ../tools/networking/network-manager/vpnc.nix { }; + + networkmanager_openconnect = callPackage ../tools/networking/network-manager/openconnect.nix { gconf = gnome.GConf; }; + networkmanagerapplet = newScope gnome ../tools/networking/network-manager-applet { }; newsbeuter = callPackage ../applications/networking/feedreaders/newsbeuter { }; From 77063f3f7587fdd0551a8f584ad40f13409c363f Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Thu, 11 Jul 2013 08:49:31 +0200 Subject: [PATCH 769/798] adding description to networkmanager plugins --- pkgs/tools/networking/network-manager/openconnect.nix | 2 +- pkgs/tools/networking/network-manager/openvpn.nix | 2 +- pkgs/tools/networking/network-manager/vpnc.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/network-manager/openconnect.nix b/pkgs/tools/networking/network-manager/openconnect.nix index 795f727599b..ccb5badd903 100644 --- a/pkgs/tools/networking/network-manager/openconnect.nix +++ b/pkgs/tools/networking/network-manager/openconnect.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "TODO"; + description = "NetworkManager's OpenConnect plugin"; inherit (networkmanager.meta) maintainers platforms; }; } diff --git a/pkgs/tools/networking/network-manager/openvpn.nix b/pkgs/tools/networking/network-manager/openvpn.nix index d49dcbbc92a..c51bf09f99c 100644 --- a/pkgs/tools/networking/network-manager/openvpn.nix +++ b/pkgs/tools/networking/network-manager/openvpn.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "TODO"; + description = "NetworkManager's OpenVPN plugin"; inherit (networkmanager.meta) maintainers platforms; }; } diff --git a/pkgs/tools/networking/network-manager/vpnc.nix b/pkgs/tools/networking/network-manager/vpnc.nix index 57ab5af5bcb..683a7e76948 100644 --- a/pkgs/tools/networking/network-manager/vpnc.nix +++ b/pkgs/tools/networking/network-manager/vpnc.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "TODO"; + description = "NetworkManager's VPNC plugin"; inherit (networkmanager.meta) maintainers platforms; }; } From ab9be1b809c63b92c8ebb5723bf8f331c4bb9775 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Wed, 31 Jul 2013 16:00:57 +0200 Subject: [PATCH 770/798] Updated Android SDK to version 22.05, updated all plugins, and added mesa to the search path of the emulators to enable OpenGL acceleration --- pkgs/development/mobile/androidenv/addon.xml | 167 ++++++++++--- pkgs/development/mobile/androidenv/addons.nix | 16 +- .../mobile/androidenv/androidsdk.nix | 21 +- .../mobile/androidenv/build-tools.nix | 54 ++++ .../development/mobile/androidenv/default.nix | 12 +- .../mobile/androidenv/generate-platforms.sh | 4 +- .../mobile/androidenv/generate-platforms.xsl | 2 +- .../mobile/androidenv/generate-sysimages.sh | 2 +- .../mobile/androidenv/generate-sysimages.xsl | 2 +- .../mobile/androidenv/platform-tools.nix | 24 +- .../mobile/androidenv/platforms-linux.nix | 26 +- .../mobile/androidenv/platforms-macosx.nix | 26 +- .../{repository-7.xml => repository-8.xml} | 236 +++++++++++++----- .../development/mobile/androidenv/support.nix | 6 +- .../mobile/androidenv/sysimages.nix | 12 +- 15 files changed, 445 insertions(+), 165 deletions(-) create mode 100644 pkgs/development/mobile/androidenv/build-tools.nix rename pkgs/development/mobile/androidenv/{repository-7.xml => repository-8.xml} (85%) diff --git a/pkgs/development/mobile/androidenv/addon.xml b/pkgs/development/mobile/androidenv/addon.xml index fb5d324d778..635d0ae964f 100644 --- a/pkgs/development/mobile/androidenv/addon.xml +++ b/pkgs/development/mobile/androidenv/addon.xml @@ -731,13 +731,63 @@ August 15, 2011 - + google + Google Inc. + google_tv_addon + Google TV Addon + 13 + 1 + Android + Google TV, API 13 + http://developer.android.com/ + + + + 87721879 + b73f7c66011ac8180b44aa4e83b8d78c66ea9a09 + google_tv-13_r01.zip + + + + + + + google Google Inc. google_apis Google APIs Android + Google APIs 17 + 3 + + + com.google.android.maps + + + com.android.future.usb.accessory + + + com.google.android.media.effects + + + + + 137156978 + 8246f61d24f0408c8e7bc352a1e522b7e2b619ba + google_apis-17_r03.zip + + + + + + + + google + Google Inc. + google_apis + Google APIs + Android + Google APIs + 18 1 @@ -752,9 +802,9 @@ August 15, 2011 - 132568033 - 62cb086f11e15713878c8834d58ef1a2454c19a4 - google_apis-17_r01.zip + 147899839 + 5c0c24f04e6b65c61da83408b7aee79228c24a40 + google_apis-18_r01.zip @@ -763,8 +813,8 @@ August 15, 2011 - - 11 + + 18 Android android Android Support Library @@ -772,9 +822,27 @@ August 15, 2011 compatibility - 1264808 - d30d182d8e4c86bb4464c03a83ccffce7bc84ecd - support_r11.zip + 4438319 + bd67b4b8a6bac629f24c8aea75c3619a26d9a568 + support_r18.zip + + + + + + + + 2 + Android + android + Android Support Repository + Local Maven repository for Support Libraries + m2repository + + + 3705797 + c4284e4bf17a1e8bafc96a18de36984022d5a46a + android_m2repository_r02.zip @@ -782,6 +850,23 @@ August 15, 2011 + + google + Google Inc. + Google Repository + m2repository + 1 + Local Maven repository for Google Libraries + + + + 660833 + d9a20d960f0d9a8de61a9ced5fc6c2c605f6c6c0 + google_m2repository_r01.zip + + + + google Google Inc. @@ -807,14 +892,14 @@ August 15, 2011 Google Play APK Expansion Library play_apk_expansion market_apk_expansion - 2 + 3 Google Play APK Expansion library http://developer.android.com/guide/market/expansion-files.html - 111636 - 47fa8c691fcc8cf815e7ebbf140f12e94495f73b - market_apk_expansion-r02.zip + 110201 + 5305399dc1a56814e86b8459ce24871916f78b8c + market_apk_expansion-r03.zip @@ -825,34 +910,34 @@ August 15, 2011 Google Inc. Google Play services google_play_services - 4 + 9 Google Play Services client library and sample code https://developers.google.com/android/google-play-services/index - 3732458 - bbb3d11225fcf60a0bae75afa2c4737010468bf6 - google_play_services_2012110_r04.zip + 5125755 + 3e31fc0b982f938edf216afe9e532774db12607a + google_play_services_3159130_r09.zip - + google Google Inc. Google USB Driver usb_driver - 7 - USB Driver for Windows, revision 7 + 8 + USB Driver for Windows, revision 8 http://developer.android.com/ - 8681704 - 147c339fde22f98ae41b15349a8303d39a2cf6e5 - usb_driver_r07-windows.zip + 8682230 + 2b2f91098a984a865a70f0bd841a843fb54462fc + usb_driver_r08-windows.zip @@ -863,14 +948,14 @@ August 15, 2011 Google Play Billing Library play_billing market_billing - 3 + 4 Google Play Billing files and sample code http://developer.android.com/google/play/billing/index.html - 435718 - a133d454c992ef2a18e62fa810e8185f1be4b054 - play_billing_r03.zip + 437084 + 38fdae51dadb6d1e63e177adba3e4d96b751686e + play_billing_r04.zip @@ -881,14 +966,14 @@ August 15, 2011 Google Inc. Google AdMob Ads SDK admob_ads_sdk - 8 + 11 AdMob Ads SDK https://developers.google.com/mobile-ads-sdk/docs/ - 545547 - 031476aa5a491239d2624e8de8c9e46e40d93e3f - https://dl-ssl.google.com/googleadmobadssdk/googleadmobadssdkandroid-6.2.1.zip + 704512 + 0102859d9575baa0bf4fd5eb422af2ad0fe6cb82 + https://dl-ssl.google.com/googleadmobadssdk/googleadmobadssdkandroid-6.4.1.zip @@ -897,16 +982,16 @@ August 15, 2011 google Google Inc. - Google Analytics SDK - analytics_sdk - 2 - Analytics SDK - http://code.google.com/mobile/analytics/ + Google Analytics App Tracking SDK + analytics_sdk_v2 + 3 + Analytics App Tracking SDK + http://developers.google.com/analytics/devguides/collection/ - 53055 - 328bcdc6c241879ebb04d6edc6fec1052a171004 - https://dl.google.com/gaformobileapps/GoogleAnalyticsAndroid_1.4.2.zip + 211432 + dc14026bf0ce78315cb5dd00552607de0894de83 + https://dl.google.com/gaformobileapps/GoogleAnalyticsAndroid_2.0beta5.zip @@ -933,10 +1018,10 @@ August 15, 2011 google Google Inc. - Google Cloud Messaging for Android Library + [Deprecated] Google Cloud Messaging for Android Library gcm 3 - Google Cloud Messaging for Android library and sample code + GCM library has been moved to Google Play Services (com.google.android.gms.gcm) and this standalone version is no longer supported https://developers.google.com/android/gcm/index diff --git a/pkgs/development/mobile/androidenv/addons.nix b/pkgs/development/mobile/androidenv/addons.nix index f26db5c2cb7..651c84533f0 100644 --- a/pkgs/development/mobile/androidenv/addons.nix +++ b/pkgs/development/mobile/androidenv/addons.nix @@ -185,8 +185,20 @@ in google_apis_17 = buildGoogleApis { name = "google_apis-17"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/google_apis-17_r01.zip; - sha1 = "62cb086f11e15713878c8834d58ef1a2454c19a4"; + url = https://dl-ssl.google.com/android/repository/google_apis-17_r03.zip; + sha1 = "8246f61d24f0408c8e7bc352a1e522b7e2b619ba"; + }; + meta = { + description = "Android + Google APIs"; + + }; + }; + + google_apis_18 = buildGoogleApis { + name = "google_apis-18"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/google_apis-18_r01.zip; + sha1 = "5c0c24f04e6b65c61da83408b7aee79228c24a40"; }; meta = { description = "Android + Google APIs"; diff --git a/pkgs/development/mobile/androidenv/androidsdk.nix b/pkgs/development/mobile/androidenv/androidsdk.nix index e8e1f919fe4..98bf7ff2ee9 100644 --- a/pkgs/development/mobile/androidenv/androidsdk.nix +++ b/pkgs/development/mobile/androidenv/androidsdk.nix @@ -1,23 +1,23 @@ { stdenv, stdenv_32bit, fetchurl, unzip, makeWrapper -, platformTools, support, platforms, sysimages, addons +, platformTools, buildTools, support, platforms, sysimages, addons , zlib_32bit -, libX11_32bit, libxcb_32bit, libXau_32bit, libXdmcp_32bit, libXext_32bit -, libX11, libXext, libXrender, libxcb, libXau, libXdmcp +, libX11_32bit, libxcb_32bit, libXau_32bit, libXdmcp_32bit, libXext_32bit, mesa_32bit +, libX11, libXext, libXrender, libxcb, libXau, libXdmcp, mesa , freetype, fontconfig, gtk, atk }: {platformVersions, useGoogleAPIs}: stdenv.mkDerivation { - name = "android-sdk-21"; + name = "android-sdk-22.05"; src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl { - url = http://dl.google.com/android/android-sdk_r21-linux.tgz; - md5 = "7f8d73b629f808cdcfc9f9900bbd7580"; + url = http://dl.google.com/android/android-sdk_r22.0.5-linux.tgz; + md5 = "8201b10c21510f082c54f58a9bb082c8"; } else if stdenv.system == "x86_64-darwin" then fetchurl { - url = http://dl.google.com/android/android-sdk_r21-macosx.zip; - md5 = "67e46adca90dd18d7291443f6c15d6af"; + url = http://dl.google.com/android/android-sdk_r22.0.5-macosx.zip; + md5 = "94f3cbe896c332b94ee0408ae610a4b8"; } else throw "platform not ${stdenv.system} supported!"; @@ -61,14 +61,14 @@ stdenv.mkDerivation { for i in emulator emulator-arm emulator-mips emulator-x86 do wrapProgram `pwd`/$i \ - --prefix LD_LIBRARY_PATH : `pwd`/lib:${libX11_32bit}/lib:${libxcb_32bit}/lib:${libXau_32bit}/lib:${libXdmcp_32bit}/lib:${libXext_32bit}/lib + --prefix LD_LIBRARY_PATH : `pwd`/lib:${libX11_32bit}/lib:${libxcb_32bit}/lib:${libXau_32bit}/lib:${libXdmcp_32bit}/lib:${libXext_32bit}/lib:${mesa_32bit}/lib done ${stdenv.lib.optionalString (stdenv.system == "x86_64-linux") '' for i in emulator64-arm emulator64-mips emulator64-x86 do wrapProgram `pwd`/$i \ - --prefix LD_LIBRARY_PATH : `pwd`/lib:${libX11}/lib:${libxcb}/lib:${libXau}/lib:${libXdmcp}/lib:${libXext}/lib + --prefix LD_LIBRARY_PATH : `pwd`/lib:${libX11}/lib:${libxcb}/lib:${libXau}/lib:${libXdmcp}/lib:${libXext}/lib:${mesa}/lib done ''} ''} @@ -107,6 +107,7 @@ stdenv.mkDerivation { cd .. ln -s ${platformTools}/platform-tools + ln -s ${buildTools}/build-tools ln -s ${support}/support # Symlink required Google API add-ons diff --git a/pkgs/development/mobile/androidenv/build-tools.nix b/pkgs/development/mobile/androidenv/build-tools.nix new file mode 100644 index 00000000000..0d9cbc22080 --- /dev/null +++ b/pkgs/development/mobile/androidenv/build-tools.nix @@ -0,0 +1,54 @@ +{stdenv, stdenv_32bit, fetchurl, unzip, zlib_32bit}: + +stdenv.mkDerivation { + name = "android-build-tools-r18.0.1"; + src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") + then fetchurl { + url = https://dl-ssl.google.com/android/repository/build-tools_r18.0.1-linux.zip; + sha1 = "f11618492b0d2270c332325d45d752d3656a9640"; + } + else if stdenv.system == "x86_64-darwin" then fetchurl { + url = https://dl-ssl.google.com/android/repository/build-tools_r18.0.1-macosx.zip; + sha1 = "d84f5692fb44d60fc53e5b2507cebf9f24626902"; + } + else throw "System ${stdenv.system} not supported!"; + + buildCommand = '' + mkdir -p $out/build-tools + cd $out/build-tools + unzip $src + + ${stdenv.lib.optionalString (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") + '' + cd android-* + + # Patch the interpreter + for i in aapt aidl dexdump llvm-rs-cc + do + patchelf --set-interpreter ${stdenv_32bit.gcc.libc}/lib/ld-linux.so.2 $i + done + + # These binaries need to find libstdc++ and libgcc_s + for i in aidl libLLVM.so + do + patchelf --set-rpath ${stdenv_32bit.gcc.gcc}/lib $i + done + + # These binaries need to find libstdc++, libgcc_s and libraries in the current folder + for i in libbcc.so libbcinfo.so libclang.so llvm-rs-cc + do + patchelf --set-rpath ${stdenv_32bit.gcc.gcc}/lib:`pwd` $i + done + + # These binaries need to find libstdc++, libgcc_s, and zlib + for i in aapt dexdump + do + patchelf --set-rpath ${stdenv_32bit.gcc.gcc}/lib:${zlib_32bit}/lib $i + done + ''} + + patchShebangs . + ''; + + buildInputs = [ unzip ]; +} diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix index a76deb98b6e..2191a0953bf 100644 --- a/pkgs/development/mobile/androidenv/default.nix +++ b/pkgs/development/mobile/androidenv/default.nix @@ -3,10 +3,15 @@ rec { platformTools = import ./platform-tools.nix { inherit (pkgs) stdenv fetchurl unzip; - inherit (pkgs_i686) zlib ncurses; stdenv_32bit = pkgs_i686.stdenv; }; + buildTools = import ./build-tools.nix { + inherit (pkgs) stdenv fetchurl unzip; + stdenv_32bit = pkgs_i686.stdenv; + zlib_32bit = pkgs_i686.zlib; + }; + support = import ./support.nix { inherit (pkgs) stdenv fetchurl unzip; }; @@ -31,10 +36,10 @@ rec { androidsdk = import ./androidsdk.nix { inherit (pkgs) stdenv fetchurl unzip makeWrapper; - inherit (pkgs) freetype fontconfig gtk atk; + inherit (pkgs) freetype fontconfig gtk atk mesa; inherit (pkgs.xorg) libX11 libXext libXrender libxcb libXau libXdmcp; - inherit platformTools support platforms sysimages addons; + inherit platformTools buildTools support platforms sysimages addons; stdenv_32bit = pkgs_i686.stdenv; zlib_32bit = pkgs_i686.zlib; @@ -43,6 +48,7 @@ rec { libXau_32bit = pkgs_i686.xorg.libXau; libXdmcp_32bit = pkgs_i686.xorg.libXdmcp; libXext_32bit = pkgs_i686.xorg.libXext; + mesa_32bit = pkgs_i686.mesa; }; androidsdk_4_1 = androidsdk { diff --git a/pkgs/development/mobile/androidenv/generate-platforms.sh b/pkgs/development/mobile/androidenv/generate-platforms.sh index 983d8bde87b..8ac4ad328f4 100755 --- a/pkgs/development/mobile/androidenv/generate-platforms.sh +++ b/pkgs/development/mobile/androidenv/generate-platforms.sh @@ -1,4 +1,4 @@ #!/bin/sh -e -xsltproc --stringparam os linux generate-platforms.xsl repository-7.xml > platforms-linux.nix -xsltproc --stringparam os macosx generate-platforms.xsl repository-7.xml > platforms-macosx.nix +xsltproc --stringparam os linux generate-platforms.xsl repository-8.xml > platforms-linux.nix +xsltproc --stringparam os macosx generate-platforms.xsl repository-8.xml > platforms-macosx.nix diff --git a/pkgs/development/mobile/androidenv/generate-platforms.xsl b/pkgs/development/mobile/androidenv/generate-platforms.xsl index 1802ae63efe..249f044550b 100644 --- a/pkgs/development/mobile/androidenv/generate-platforms.xsl +++ b/pkgs/development/mobile/androidenv/generate-platforms.xsl @@ -1,7 +1,7 @@ + xmlns:sdk="http://schemas.android.com/sdk/android/repository/8"> diff --git a/pkgs/development/mobile/androidenv/generate-sysimages.sh b/pkgs/development/mobile/androidenv/generate-sysimages.sh index dc28c27f45f..ae4b4f35a37 100755 --- a/pkgs/development/mobile/androidenv/generate-sysimages.sh +++ b/pkgs/development/mobile/androidenv/generate-sysimages.sh @@ -1,3 +1,3 @@ #!/bin/sh -e -xsltproc generate-sysimages.xsl repository-7.xml > sysimages.nix +xsltproc generate-sysimages.xsl repository-8.xml > sysimages.nix diff --git a/pkgs/development/mobile/androidenv/generate-sysimages.xsl b/pkgs/development/mobile/androidenv/generate-sysimages.xsl index 1224ebbd4e8..6036595eb9a 100644 --- a/pkgs/development/mobile/androidenv/generate-sysimages.xsl +++ b/pkgs/development/mobile/androidenv/generate-sysimages.xsl @@ -2,7 +2,7 @@ + xmlns:sdk="http://schemas.android.com/sdk/android/repository/8"> diff --git a/pkgs/development/mobile/androidenv/platform-tools.nix b/pkgs/development/mobile/androidenv/platform-tools.nix index 55499608290..191521bb654 100644 --- a/pkgs/development/mobile/androidenv/platform-tools.nix +++ b/pkgs/development/mobile/androidenv/platform-tools.nix @@ -1,15 +1,15 @@ -{stdenv, stdenv_32bit, fetchurl, unzip, zlib, ncurses}: +{stdenv, stdenv_32bit, fetchurl, unzip}: stdenv.mkDerivation { - name = "android-platform-tools-r16"; + name = "android-platform-tools-r18.0.1"; src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl { - url = https://dl-ssl.google.com/android/repository/platform-tools_r16-linux.zip; - sha1 = "84d563ae5e324f223f335f11bf511bf6207c05fb"; + url = https://dl-ssl.google.com/android/repository/platform-tools_r18.0.1-linux.zip; + sha1 = "cf9bdbbaa34da37b59724f914dad907c2c74a387"; } else if stdenv.system == "x86_64-darwin" then fetchurl { - url = https://dl-ssl.google.com/android/repository/platform-tools_r16-macosx.zip; - sha1 = "fbb0f8d2786a83b8c3eb6df402e706e136db8fed"; + url = https://dl-ssl.google.com/android/repository/platform-tools_r18.0.1-macosx.zip; + sha1 = "cf9bdbbaa34da37b59724f914dad907c2c74a387"; } else throw "System ${stdenv.system} not supported!"; @@ -21,20 +21,12 @@ stdenv.mkDerivation { ${stdenv.lib.optionalString (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") '' - for i in aapt adb aidl dexdump fastboot llvm-rs-cc + for i in adb fastboot do patchelf --set-interpreter ${stdenv_32bit.gcc.libc}/lib/ld-linux.so.2 $i + patchelf --set-rpath ${stdenv_32bit.gcc.gcc}/lib $i done - - patchelf --set-rpath ${zlib}/lib:${stdenv_32bit.gcc.gcc}/lib aapt - patchelf --set-rpath ${ncurses}/lib:${stdenv_32bit.gcc.gcc}/lib adb - patchelf --set-rpath ${stdenv_32bit.gcc.gcc}/lib aidl - patchelf --set-rpath ${stdenv_32bit.gcc.gcc}/lib fastboot - patchelf --set-rpath ${zlib}/lib:${stdenv_32bit.gcc.gcc}/lib dexdump - patchelf --set-rpath ${stdenv_32bit.gcc.gcc}/lib llvm-rs-cc ''} - - patchShebangs . ''; buildInputs = [ unzip ]; diff --git a/pkgs/development/mobile/androidenv/platforms-linux.nix b/pkgs/development/mobile/androidenv/platforms-linux.nix index f544fcc08be..2ca937b5534 100644 --- a/pkgs/development/mobile/androidenv/platforms-linux.nix +++ b/pkgs/development/mobile/androidenv/platforms-linux.nix @@ -185,23 +185,35 @@ in platform_16 = buildPlatform { name = "android-platform-4.1.2"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/android-16_r03.zip; - sha1 = "80d9ffef58168f9bccd862830e2ee51f686b167e"; + url = https://dl-ssl.google.com/android/repository/android-16_r04.zip; + sha1 = "90b9157b8b45f966be97e11a22fba4591b96c2ee"; }; meta = { - description = "Android SDK Platform 4.1"; + description = "Android SDK Platform 4.1.2"; }; }; platform_17 = buildPlatform { - name = "android-platform-4.2"; + name = "android-platform-4.2.2"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/android-17_r01.zip; - sha1 = "c2e7c8c8db40e06b804ddb1725ac2c3555b55025"; + url = https://dl-ssl.google.com/android/repository/android-17_r02.zip; + sha1 = "c442c32c1b702173ab0929a74486e4f86fe528ec"; }; meta = { - description = "Android SDK Platform 4.2"; + description = "Android SDK Platform 4.2.2"; + + }; + }; + + platform_18 = buildPlatform { + name = "android-platform-4.3"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/android-18_r01.zip; + sha1 = "c24de91d6f296cf453701aef281609779fffb379"; + }; + meta = { + description = "Android SDK Platform 4.3"; }; }; diff --git a/pkgs/development/mobile/androidenv/platforms-macosx.nix b/pkgs/development/mobile/androidenv/platforms-macosx.nix index a1434bbe56c..c89cb9ed127 100644 --- a/pkgs/development/mobile/androidenv/platforms-macosx.nix +++ b/pkgs/development/mobile/androidenv/platforms-macosx.nix @@ -185,23 +185,35 @@ in platform_16 = buildPlatform { name = "android-platform-4.1.2"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/android-16_r03.zip; - sha1 = "80d9ffef58168f9bccd862830e2ee51f686b167e"; + url = https://dl-ssl.google.com/android/repository/android-16_r04.zip; + sha1 = "90b9157b8b45f966be97e11a22fba4591b96c2ee"; }; meta = { - description = "Android SDK Platform 4.1"; + description = "Android SDK Platform 4.1.2"; }; }; platform_17 = buildPlatform { - name = "android-platform-4.2"; + name = "android-platform-4.2.2"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/android-17_r01.zip; - sha1 = "c2e7c8c8db40e06b804ddb1725ac2c3555b55025"; + url = https://dl-ssl.google.com/android/repository/android-17_r02.zip; + sha1 = "c442c32c1b702173ab0929a74486e4f86fe528ec"; }; meta = { - description = "Android SDK Platform 4.2"; + description = "Android SDK Platform 4.2.2"; + + }; + }; + + platform_18 = buildPlatform { + name = "android-platform-4.3"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/android-18_r01.zip; + sha1 = "c24de91d6f296cf453701aef281609779fffb379"; + }; + meta = { + description = "Android SDK Platform 4.3"; }; }; diff --git a/pkgs/development/mobile/androidenv/repository-7.xml b/pkgs/development/mobile/androidenv/repository-8.xml similarity index 85% rename from pkgs/development/mobile/androidenv/repository-7.xml rename to pkgs/development/mobile/androidenv/repository-8.xml index 7bbbaf1e362..4e180ac4b3e 100644 --- a/pkgs/development/mobile/androidenv/repository-7.xml +++ b/pkgs/development/mobile/androidenv/repository-8.xml @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. --> - + Terms and Conditions @@ -570,33 +570,33 @@ November 13, 2012 - - 3 - Android SDK Platform 4.1 + + 4 + Android SDK Platform 4.1.2 4.1.2 16 - 20 + 21 - 8 + 9 1 - 47995505 - 80d9ffef58168f9bccd862830e2ee51f686b167e - android-16_r03.zip + 48005140 + 90b9157b8b45f966be97e11a22fba4591b96c2ee + android-16_r04.zip - - 1 - Android SDK Platform 4.2 - 4.2 + + 2 + Android SDK Platform 4.2.2 + 4.2.2 17 21 @@ -607,9 +607,32 @@ November 13, 2012 - 47886130 - c2e7c8c8db40e06b804ddb1725ac2c3555b55025 - android-17_r01.zip + 48057484 + c442c32c1b702173ab0929a74486e4f86fe528ec + android-17_r02.zip + + + + + + + + 1 + Android SDK Platform 4.3 + 4.3 + 18 + + 21 + + + 9 + 1 + + + + 48752456 + c24de91d6f296cf453701aef281609779fffb379 + android-18_r01.zip @@ -666,16 +689,32 @@ November 13, 2012 - - 1 - Android SDK Platform 4.2 + + 2 + Android SDK Platform 4.2.2 17 armeabi-v7a - 116831648 - 45b9344473e0a6d063c2b1fe58d8cd47d307905e - sysimg_armv7a-17_r01.zip + 116553808 + 1c321cda1af793b84d47d1a8d15f85444d265e3c + sysimg_armv7a-17_r02.zip + + + + + + + + 1 + Android SDK Platform 4.3 + 18 + armeabi-v7a + + + 125597583 + 5a9b8ac5b57dd0e3278f47deb5ee58e1db6f1f9e + sysimg_armv7a-18_r01.zip @@ -866,89 +905,134 @@ November 13, 2012 + + + 1 + 18 + + + 19897793 + 73e879ce46c04a6e63ad1a9107018b4782945007 + samples-18_r01.zip + + + + + - + - 16 + 18 + 0 + 1 - 11938435 - 0d6245b685c7d303cf4a054a3d373c4427b7ad01 - platform-tools_r16-windows.zip + 954769 + b40fea3ed72296dd42dd616a7abf536b8dace20d + platform-tools_r18.0.1-windows.zip - 12676089 - 84d563ae5e324f223f335f11bf511bf6207c05fb - platform-tools_r16-linux.zip + 1011194 + cf9bdbbaa34da37b59724f914dad907c2c74a387 + platform-tools_r18.0.1-linux.zip - 13147351 - fbb0f8d2786a83b8c3eb6df402e706e136db8fed - platform-tools_r16-macosx.zip + 971087 + 126325cbb55928c38acbb9c7bb5d9145d94fad56 + platform-tools_r18.0.1-macosx.zip - + - - + + - 21 + 17 + 0 + 0 - - 16 - - 98982670 - 57bbfadcedbef44fc322e5e037666393668cf3fe - tools_r21-windows.zip + 11004914 + 899897d327b0bad492d3a40d3db4d96119c15bc0 + build-tools_r17-windows.zip - 91495104 - 013b9c04407a9d73b8bf3c574327fbe870acd264 - tools_r21-linux.zip + 11696007 + 2c2872bc3806aabf16a12e3959c2183ddc866e6d + build-tools_r17-linux.zip - 65767130 - fcfa3a6932f2ed0d970a0ca959bb2b4972f7d46d - tools_r21-macosx.zip + 12208114 + 602ee709be9dbb8f179b1e4075148a57f9419930 + build-tools_r17-macosx.zip - + - - + + + + - 21 + 18 0 1 - 1 + + + + 15413527 + a6c2afd0b6289d589351956d2f5212b37014ca7d + build-tools_r18.0.1-windows.zip + + + 16627330 + f11618492b0d2270c332325d45d752d3656a9640 + build-tools_r18.0.1-linux.zip + + + 16633121 + d84f5692fb44d60fc53e5b2507cebf9f24626902 + build-tools_r18.0.1-macosx.zip + + + + + + + + + + + 22 + 0 + 5 - 16 + 18 - 98998088 - 1503aaf2c91cb07c0240a2db3af0de027941a4f6 - tools_r21.0.1_rc1-windows.zip + 113389691 + a3f450706b5374122f0edb76a4488462ba5171ca + tools_r22.0.5-windows.zip - 91510079 - 183670a7f9878d8d3693d5fcf32e1357b69f0fed - tools_r21.0.1_rc1-linux.zip + 105904090 + 06a3e1d66b9280cba49c7ba1893ea14beae072d2 + tools_r22.0.5-linux.zip - 65777178 - 109d4f287904875f067e021be3fd1f549e6afb67 - tools_r21.0.1_rc1-macosx.zip + 77191184 + 318947edef0ab46603eb7f4d21333ee4b4fa1ff3 + tools_r22.0.5-macosx.zip @@ -957,14 +1041,14 @@ November 13, 2012 - + 1 - 17 + 18 - 171564393 - fb988cdd2beaac0dd47dc630821ccc30557c67e5 - docs-17_r01.zip + 142332266 + 83632d157781d31f2a8e52acad5c4c5d0f307cba + docs-18_r01.zip @@ -1027,4 +1111,18 @@ November 13, 2012 + + + + 1 + 18 + + + 20226735 + 8b49fdf7433f4881a2bfb559b5dd05d8ec65fb78 + sources-18_r01.zip + + + + diff --git a/pkgs/development/mobile/androidenv/support.nix b/pkgs/development/mobile/androidenv/support.nix index 2e9690de7a2..ca1988527e2 100644 --- a/pkgs/development/mobile/androidenv/support.nix +++ b/pkgs/development/mobile/androidenv/support.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, unzip}: stdenv.mkDerivation { - name = "android-support-r11"; + name = "android-support-r18"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/support_r11.zip; - sha1 = "d30d182d8e4c86bb4464c03a83ccffce7bc84ecd"; + url = https://dl-ssl.google.com/android/repository/support_r18.zip; + sha1 = "bd67b4b8a6bac629f24c8aea75c3619a26d9a568"; }; buildCommand = '' diff --git a/pkgs/development/mobile/androidenv/sysimages.nix b/pkgs/development/mobile/androidenv/sysimages.nix index b35b4298983..71a97126935 100644 --- a/pkgs/development/mobile/androidenv/sysimages.nix +++ b/pkgs/development/mobile/androidenv/sysimages.nix @@ -41,8 +41,16 @@ in sysimg_17 = buildSystemImage { name = "armeabi-v7a-17"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/sysimg_armv7a-17_r01.zip; - sha1 = "45b9344473e0a6d063c2b1fe58d8cd47d307905e"; + url = https://dl-ssl.google.com/android/repository/sysimg_armv7a-17_r02.zip; + sha1 = "1c321cda1af793b84d47d1a8d15f85444d265e3c"; + }; + }; + + sysimg_18 = buildSystemImage { + name = "armeabi-v7a-18"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/sysimg_armv7a-18_r01.zip; + sha1 = "5a9b8ac5b57dd0e3278f47deb5ee58e1db6f1f9e"; }; }; From c324091a77d1ed04c13058a1655bb12a2f2271bd Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Wed, 31 Jul 2013 16:14:47 +0200 Subject: [PATCH 771/798] Fixed incorrect platform-tools sha1 value --- pkgs/development/mobile/androidenv/platform-tools.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/mobile/androidenv/platform-tools.nix b/pkgs/development/mobile/androidenv/platform-tools.nix index 191521bb654..bf263741bdd 100644 --- a/pkgs/development/mobile/androidenv/platform-tools.nix +++ b/pkgs/development/mobile/androidenv/platform-tools.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { } else if stdenv.system == "x86_64-darwin" then fetchurl { url = https://dl-ssl.google.com/android/repository/platform-tools_r18.0.1-macosx.zip; - sha1 = "cf9bdbbaa34da37b59724f914dad907c2c74a387"; + sha1 = "126325cbb55928c38acbb9c7bb5d9145d94fad56"; } else throw "System ${stdenv.system} not supported!"; From afbc5cd5e90087713d8191c2ea0740ed1fbaa557 Mon Sep 17 00:00:00 2001 From: Joachim Schiele Date: Wed, 31 Jul 2013 15:20:23 +0000 Subject: [PATCH 772/798] added dhex, a nice ncurses based hex editor for the shell --- pkgs/applications/editors/dhex/default.nix | 32 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/applications/editors/dhex/default.nix diff --git a/pkgs/applications/editors/dhex/default.nix b/pkgs/applications/editors/dhex/default.nix new file mode 100644 index 00000000000..45b7de900e2 --- /dev/null +++ b/pkgs/applications/editors/dhex/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, ncurses }: + +stdenv.mkDerivation rec { + name = "dhex-${version}"; + version = "0.68"; + + src = fetchurl { + url = "http://www.dettus.net/dhex/dhex_${version}.tar.gz"; + sha256 = "126c34745b48a07448cfe36fe5913d37ec562ad72d3f732b99bd40f761f4da08"; + }; + + buildInputs = [ ncurses ]; + + installPhase = '' + ensureDir $out/bin + ensureDir $out/share/man/man1 + ensureDir $out/share/man/man5 + + cp dhex $out/bin + cp dhex.1 $out/share/man/man1 + cp dhexrc.5 $out/share/man/man5 + cp dhex_markers.5 $out/share/man/man5 + cp dhex_searchlog.5 $out/share/man/man5 + ''; + + meta = { + description = "A themeable hex editor with diff mode"; + homepage = http://www.dettus.net/dhex/; + license = stdenv.lib.licenses.gpl2; + maintainers = with stdenv.lib.maintainers; [qknight]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 19afc66ad57..1af2257b986 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3852,6 +3852,8 @@ let dbus_libs = dbus.libs; dbus_daemon = dbus.daemon; + dhex = callPackage ../applications/editors/dhex { }; + dclib = callPackage ../development/libraries/dclib { }; directfb = callPackage ../development/libraries/directfb { }; From 1c8b4c8950961658b80e767c8d9feed10a366c72 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Wed, 31 Jul 2013 18:56:27 +0200 Subject: [PATCH 773/798] Now x86 and mips images from external repositories are supported + added GPU option to the emulate function --- .../mobile/androidenv/androidsdk.nix | 30 ++-- .../mobile/androidenv/build-app.nix | 6 +- .../development/mobile/androidenv/default.nix | 1 + .../mobile/androidenv/emulate-app.nix | 13 +- .../androidenv/generate-sysimages-others.xsl | 21 +++ .../mobile/androidenv/generate-sysimages.sh | 25 +++- .../mobile/androidenv/generate-sysimages.xsl | 18 +-- .../mobile/androidenv/sys-img-mips.xml | 132 +++++++++++++++++ .../mobile/androidenv/sys-img-x86.xml | 139 ++++++++++++++++++ .../mobile/androidenv/sysimages.nix | 73 +++++++-- 10 files changed, 412 insertions(+), 46 deletions(-) create mode 100644 pkgs/development/mobile/androidenv/generate-sysimages-others.xsl create mode 100644 pkgs/development/mobile/androidenv/sys-img-mips.xml create mode 100644 pkgs/development/mobile/androidenv/sys-img-x86.xml diff --git a/pkgs/development/mobile/androidenv/androidsdk.nix b/pkgs/development/mobile/androidenv/androidsdk.nix index 98bf7ff2ee9..34cc07adf35 100644 --- a/pkgs/development/mobile/androidenv/androidsdk.nix +++ b/pkgs/development/mobile/androidenv/androidsdk.nix @@ -5,7 +5,7 @@ , libX11, libXext, libXrender, libxcb, libXau, libXdmcp, mesa , freetype, fontconfig, gtk, atk }: -{platformVersions, useGoogleAPIs}: +{platformVersions, abiVersions, useGoogleAPIs}: stdenv.mkDerivation { name = "android-sdk-22.05"; @@ -148,19 +148,21 @@ stdenv.mkDerivation { mkdir -p system-images cd system-images - ${stdenv.lib.concatMapStrings (platformVersion: - if (builtins.hasAttr ("sysimg_"+platformVersion) sysimages) then - let - sysimg = builtins.getAttr ("sysimg_"+platformVersion) sysimages; - in - '' - mkdir -p android-${platformVersion} - cd android-${platformVersion} - ln -s ${sysimg}/* - cd .. - '' - else "" - ) platformVersions} + ${stdenv.lib.concatMapStrings (abiVersion: + stdenv.lib.concatMapStrings (platformVersion: + if (builtins.hasAttr ("sysimg_" + abiVersion + "_" + platformVersion) sysimages) then + let + sysimg = builtins.getAttr ("sysimg_" + abiVersion + "_" + platformVersion) sysimages; + in + '' + mkdir -p android-${platformVersion} + cd android-${platformVersion} + ln -s ${sysimg}/* + cd .. + '' + else "" + ) platformVersions + ) abiVersions} # Create wrappers to the most important tools and platform tools so that we can run them if the SDK is in our PATH diff --git a/pkgs/development/mobile/androidenv/build-app.nix b/pkgs/development/mobile/androidenv/build-app.nix index 8b770ede0fc..b5aa82cced7 100644 --- a/pkgs/development/mobile/androidenv/build-app.nix +++ b/pkgs/development/mobile/androidenv/build-app.nix @@ -1,5 +1,5 @@ { stdenv, androidsdk, jdk, ant }: -{ name, src, platformVersions ? [ "8" ], useGoogleAPIs ? false +{ name, src, platformVersions ? [ "8" ], abiVersions ? [ "armeabi-v7a" ], useGoogleAPIs ? false , release ? false, keyStore ? null, keyAlias ? null, keyStorePassword ? null, keyAliasPassword ? null }: @@ -10,7 +10,9 @@ let else if stdenv.system == "x86_64-darwin" then "macosx" else throw "Platform: ${stdenv.system} is not supported!"; - androidsdkComposition = androidsdk { inherit platformVersions useGoogleAPIs; }; + androidsdkComposition = androidsdk { + inherit platformVersions abiVersions useGoogleAPIs; + }; in stdenv.mkDerivation { name = stdenv.lib.replaceChars [" "] [""] name; diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix index 2191a0953bf..d7d8d92a66e 100644 --- a/pkgs/development/mobile/androidenv/default.nix +++ b/pkgs/development/mobile/androidenv/default.nix @@ -53,6 +53,7 @@ rec { androidsdk_4_1 = androidsdk { platformVersions = [ "16" ]; + abiVersions = [ "armeabi-v7a" ]; useGoogleAPIs = true; }; diff --git a/pkgs/development/mobile/androidenv/emulate-app.nix b/pkgs/development/mobile/androidenv/emulate-app.nix index 3cbe5723806..97d73bffded 100644 --- a/pkgs/development/mobile/androidenv/emulate-app.nix +++ b/pkgs/development/mobile/androidenv/emulate-app.nix @@ -1,8 +1,12 @@ {stdenv, androidsdk}: -{name, app, platformVersion ? "8", useGoogleAPIs ? false, package, activity}: +{name, app, platformVersion ? "8", abiVersion ? "armeabi-v7a", useGoogleAPIs ? false, enableGPU ? false, package, activity}: let - androidsdkComposition = androidsdk { inherit useGoogleAPIs; platformVersions = [ platformVersion ]; }; + androidsdkComposition = androidsdk { + inherit useGoogleAPIs; + platformVersions = [ platformVersion ]; + abiVersions = [ abiVersion ]; + }; in stdenv.mkDerivation { inherit name; @@ -48,6 +52,11 @@ stdenv.mkDerivation { # Create a virtual android device ${androidsdkComposition}/libexec/android-sdk-*/tools/android create avd -n device -t ${if useGoogleAPIs then "'Google Inc.:Google APIs:"+platformVersion+"'" else "android-"+platformVersion} + # Enable GPU acceleration + ${stdenv.lib.optionalString enableGPU '' + echo "hw.gpu.enabled=yes" >> $ANDROID_SDK_HOME/.android/avd/device.avd/config.ini + ''} + # Launch the emulator ${androidsdkComposition}/libexec/android-sdk-*/tools/emulator -avd device -no-boot-anim -port $port & diff --git a/pkgs/development/mobile/androidenv/generate-sysimages-others.xsl b/pkgs/development/mobile/androidenv/generate-sysimages-others.xsl new file mode 100644 index 00000000000..31ab72add36 --- /dev/null +++ b/pkgs/development/mobile/androidenv/generate-sysimages-others.xsl @@ -0,0 +1,21 @@ + + + + + + + + + + sysimg__ = buildSystemImage { + name = "-"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/sys-img//; + sha1 = ""; + }; + }; + + + diff --git a/pkgs/development/mobile/androidenv/generate-sysimages.sh b/pkgs/development/mobile/androidenv/generate-sysimages.sh index ae4b4f35a37..90b1e04c229 100755 --- a/pkgs/development/mobile/androidenv/generate-sysimages.sh +++ b/pkgs/development/mobile/androidenv/generate-sysimages.sh @@ -1,3 +1,26 @@ #!/bin/sh -e -xsltproc generate-sysimages.xsl repository-8.xml > sysimages.nix +cat > sysimages.nix << "EOF" +{stdenv, fetchurl, unzip}: + +let + buildSystemImage = args: + stdenv.mkDerivation (args // { + buildInputs = [ unzip ]; + buildCommand = '' + mkdir -p $out + cd $out + unzip $src + ''; + }); +in +{ +EOF + +xsltproc generate-sysimages.xsl repository-8.xml >> sysimages.nix +xsltproc --stringparam abi x86 generate-sysimages-others.xsl sys-img-x86.xml >> sysimages.nix +xsltproc --stringparam abi mips generate-sysimages-others.xsl sys-img-mips.xml >> sysimages.nix + +cat >> sysimages.nix << "EOF" +} +EOF diff --git a/pkgs/development/mobile/androidenv/generate-sysimages.xsl b/pkgs/development/mobile/androidenv/generate-sysimages.xsl index 6036595eb9a..be9947d536a 100644 --- a/pkgs/development/mobile/androidenv/generate-sysimages.xsl +++ b/pkgs/development/mobile/androidenv/generate-sysimages.xsl @@ -7,22 +7,8 @@ -{stdenv, fetchurl, unzip}: - -let - buildSystemImage = args: - stdenv.mkDerivation (args // { - buildInputs = [ unzip ]; - buildCommand = '' - mkdir -p $out - cd $out - unzip $src - ''; - }); -in -{ - sysimg_ = buildSystemImage { + sysimg__ = buildSystemImage { name = "-"; src = fetchurl { url = https://dl-ssl.google.com/android/repository/; @@ -30,7 +16,5 @@ in }; }; -} - diff --git a/pkgs/development/mobile/androidenv/sys-img-mips.xml b/pkgs/development/mobile/androidenv/sys-img-mips.xml new file mode 100644 index 00000000000..c839d283f4e --- /dev/null +++ b/pkgs/development/mobile/androidenv/sys-img-mips.xml @@ -0,0 +1,132 @@ + + + + + + + + + + 1 + Android 4.0.4 + 15 + mips + + + + 117503178 + a753bb4a6783124dad726c500ce9aec9d2c1b2d9 + sysimg_mips-15_r01.zip + + + + + + 4 + + Android 4.1.2 + 16 + mips + + + + 122482530 + 67943c54fb3943943ffeb05fdd39c0b753681f6e + sysimg_mips-16_r04.zip + + + + + + 1 + + Android 4.2.1 + 17 + mips + + + + 131781761 + f0c6e153bd584c29e51b5c9723cfbf30f996a05d + sysimg_mips-17_r01.zip + + + + + diff --git a/pkgs/development/mobile/androidenv/sys-img-x86.xml b/pkgs/development/mobile/androidenv/sys-img-x86.xml new file mode 100644 index 00000000000..f0e8347f6db --- /dev/null +++ b/pkgs/development/mobile/androidenv/sys-img-x86.xml @@ -0,0 +1,139 @@ + + + + + + + + + + + Android SDK Platform 2.3.7 + 2 + 10 + x86 + + + + 55463895 + 34e2436f69606cdfe35d3ef9112f0c64e3ff021d + sysimg_x86-10_r02.zip + + + + + + Android SDK Platform 4.0.4 + 1 + 15 + x86 + + + + 112619605 + d540325952e0f097509622b9e685737584b83e40 + sysimg_x86-15_r01.zip + + + + + + Android SDK Platform 4.1.1 + 1 + 16 + x86 + + + + 131840348 + 9d35bcaa4f9b40443941f32b8a50337f413c021a + sysimg_x86-16_r01.zip + + + + + + Android SDK Platform 4.2 + 1 + 17 + x86 + + + + 138799122 + ddb3313e8dcd07926003f7b828eafea1115ea35b + sysimg_x86-17_r01.zip + + + + + diff --git a/pkgs/development/mobile/androidenv/sysimages.nix b/pkgs/development/mobile/androidenv/sysimages.nix index 71a97126935..bc78ea11e6f 100644 --- a/pkgs/development/mobile/androidenv/sysimages.nix +++ b/pkgs/development/mobile/androidenv/sysimages.nix @@ -1,9 +1,8 @@ - {stdenv, fetchurl, unzip}: let buildSystemImage = args: - stdenv.mkDerivation (args // { + stdenv.mkDerivation (args // { buildInputs = [ unzip ]; buildCommand = '' mkdir -p $out @@ -13,8 +12,8 @@ let }); in { - - sysimg_14 = buildSystemImage { + + sysimg_armeabi-v7a_14 = buildSystemImage { name = "armeabi-v7a-14"; src = fetchurl { url = https://dl-ssl.google.com/android/repository/sysimg_armv7a-14_r02.zip; @@ -22,7 +21,7 @@ in }; }; - sysimg_15 = buildSystemImage { + sysimg_armeabi-v7a_15 = buildSystemImage { name = "armeabi-v7a-15"; src = fetchurl { url = https://dl-ssl.google.com/android/repository/sysimg_armv7a-15_r02.zip; @@ -30,7 +29,7 @@ in }; }; - sysimg_16 = buildSystemImage { + sysimg_armeabi-v7a_16 = buildSystemImage { name = "armeabi-v7a-16"; src = fetchurl { url = https://dl-ssl.google.com/android/repository/sysimg_armv7a-16_r03.zip; @@ -38,7 +37,7 @@ in }; }; - sysimg_17 = buildSystemImage { + sysimg_armeabi-v7a_17 = buildSystemImage { name = "armeabi-v7a-17"; src = fetchurl { url = https://dl-ssl.google.com/android/repository/sysimg_armv7a-17_r02.zip; @@ -46,7 +45,7 @@ in }; }; - sysimg_18 = buildSystemImage { + sysimg_armeabi-v7a_18 = buildSystemImage { name = "armeabi-v7a-18"; src = fetchurl { url = https://dl-ssl.google.com/android/repository/sysimg_armv7a-18_r01.zip; @@ -54,5 +53,59 @@ in }; }; -} - \ No newline at end of file + sysimg_x86_10 = buildSystemImage { + name = "x86-10"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/sys-img/x86/sysimg_x86-10_r02.zip; + sha1 = "34e2436f69606cdfe35d3ef9112f0c64e3ff021d"; + }; + }; + + sysimg_x86_15 = buildSystemImage { + name = "x86-15"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/sys-img/x86/sysimg_x86-15_r01.zip; + sha1 = "d540325952e0f097509622b9e685737584b83e40"; + }; + }; + + sysimg_x86_16 = buildSystemImage { + name = "x86-16"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/sys-img/x86/sysimg_x86-16_r01.zip; + sha1 = "9d35bcaa4f9b40443941f32b8a50337f413c021a"; + }; + }; + + sysimg_x86_17 = buildSystemImage { + name = "x86-17"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/sys-img/x86/sysimg_x86-17_r01.zip; + sha1 = "ddb3313e8dcd07926003f7b828eafea1115ea35b"; + }; + }; + + sysimg_mips_15 = buildSystemImage { + name = "mips-15"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/sys-img/mips/sysimg_mips-15_r01.zip; + sha1 = "a753bb4a6783124dad726c500ce9aec9d2c1b2d9"; + }; + }; + + sysimg_mips_16 = buildSystemImage { + name = "mips-16"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/sys-img/mips/sysimg_mips-16_r04.zip; + sha1 = "67943c54fb3943943ffeb05fdd39c0b753681f6e"; + }; + }; + + sysimg_mips_17 = buildSystemImage { + name = "mips-17"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/sys-img/mips/sysimg_mips-17_r01.zip; + sha1 = "f0c6e153bd584c29e51b5c9723cfbf30f996a05d"; + }; + }; + } From 2238a233523b8608dd607fe9d6460e58144d55c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Wed, 31 Jul 2013 21:54:09 +0200 Subject: [PATCH 774/798] wicd: wrapper env vars prefix -> postfix Change PATH=$PATH:deps to PATH=deps:$PATH in the wicd wrappers, because the latter is more deterministic; it prevents possibly wrong versions of dependencies to sneak in from the environment. Do the same for PYTHONPATH. --- pkgs/tools/networking/wicd/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/networking/wicd/default.nix b/pkgs/tools/networking/wicd/default.nix index 47e417ffd8a..524c93d218a 100644 --- a/pkgs/tools/networking/wicd/default.nix +++ b/pkgs/tools/networking/wicd/default.nix @@ -33,14 +33,14 @@ stdenv.mkDerivation rec { substituteInPlace in/scripts=wicd.in --subst-var-by TEMPLATE-DEFAULT $out/share/other/dhclient.conf.template.default - sed -i "2iexport PATH=\$PATH\$\{PATH:+:\}${python}/bin:${wpa_supplicant}/sbin:${dhcpcd}/sbin:${dhcp}/sbin:${wirelesstools}/sbin:${nettools}/sbin:${nettools}/bin:${iputils}/bin:${openresolv}/sbin:${iproute}/sbin" in/scripts=wicd.in - sed -i "3iexport PYTHONPATH=\$PYTHONPATH\$\{PYTHONPATH:+:\}$(toPythonPath $out):$(toPythonPath ${pygobject}):$(toPythonPath ${pythonDBus})" in/scripts=wicd.in - sed -i "2iexport PATH=\$PATH\$\{PATH:+:\}${python}/bin" in/scripts=wicd-client.in - sed -i "3iexport PYTHONPATH=\$PYTHONPATH\$\{PYTHONPATH:+:\}$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pygobject})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${pythonDBus})" in/scripts=wicd-client.in - sed -i "2iexport PATH=\$PATH\$\{PATH:+:\}${python}/bin" in/scripts=wicd-gtk.in - sed -i "3iexport PYTHONPATH=\$PYTHONPATH\$\{PYTHONPATH:+:\}$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pygobject})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${pythonDBus})" in/scripts=wicd-gtk.in - sed -i "2iexport PATH=\$PATH\$\{PATH:+:\}${python}/bin" in/scripts=wicd-cli.in - sed -i "3iexport PYTHONPATH=\$PYTHONPATH\$\{PYTHONPATH:+:\}$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pycairo}):$(toPythonPath ${pythonDBus})" in/scripts=wicd-cli.in + sed -i "2iexport PATH=${python}/bin:${wpa_supplicant}/sbin:${dhcpcd}/sbin:${dhcp}/sbin:${wirelesstools}/sbin:${nettools}/sbin:${nettools}/bin:${iputils}/bin:${openresolv}/sbin:${iproute}/sbin\$\{PATH:+:\}\$PATH" in/scripts=wicd.in + sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pygobject}):$(toPythonPath ${pythonDBus})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd.in + sed -i "2iexport PATH=${python}/bin\$\{PATH:+:\}\$PATH" in/scripts=wicd-client.in + sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pygobject})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${pythonDBus})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-client.in + sed -i "2iexport PATH=${python}/bin\$\{PATH:+:\}\$PATH" in/scripts=wicd-gtk.in + sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pygobject})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${pythonDBus})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-gtk.in + sed -i "2iexport PATH=${python}/bin\$\{PATH:+:\}\$PATH" in/scripts=wicd-cli.in + sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pycairo}):$(toPythonPath ${pythonDBus})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-cli.in rm po/ast.po ''; From dccbdcf52091fe1ceff19912342896b9f94ff064 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 31 Jul 2013 16:54:29 +0200 Subject: [PATCH 775/798] linux: Don't put the kernel version in meta --- pkgs/os-specific/linux/kernel/generic.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index 50469eb5383..85f916de1a3 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation { passthru = { inherit version modDirVersion kernelPatches; # Combine the `features' attribute sets of all the kernel patches. - features = lib.fold (x: y: (if x ? features then x.features else {}) // y) features kernelPatches; + features = lib.fold (x: y: (x.features or {}) // y) features kernelPatches; }; builder = ./builder.sh; @@ -133,7 +133,6 @@ stdenv.mkDerivation { " (with patches: " + lib.concatStrings (lib.intersperse ", " (map (x: x.name) kernelPatches)) + ")"); - inherit version; license = "GPLv2"; homepage = http://www.kernel.org/; maintainers = [ From 7ce325f3e042b4072298021868aa3bd8c72997e4 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 31 Jul 2013 23:56:48 +0200 Subject: [PATCH 776/798] Unify the Linux kernel configurations Having N different copies of the NixOS kernel configuration is bad because these copies tend to diverge. For instance, our 3.10 config lacked some modules that were enabled in older configs, probably because the 3.10 config had been copied off an earlier version of some older kernel config. So now there is a single kernel config in common-config.nix. It has a few conditionals to deal with new/removed kernel options, but otherwise it's pretty straightforward. Also, a lot of cut&paste boilerplate between the kernel Nix expressions is gone (such as preConfigure). --- pkgs/os-specific/linux/kernel/builder.sh | 10 +- .../linux/kernel/common-config.nix | 288 +++++++++++++++++ pkgs/os-specific/linux/kernel/generic.nix | 20 +- pkgs/os-specific/linux/kernel/linux-3.0.nix | 258 +-------------- pkgs/os-specific/linux/kernel/linux-3.10.nix | 297 +----------------- pkgs/os-specific/linux/kernel/linux-3.2.nix | 269 +--------------- pkgs/os-specific/linux/kernel/linux-3.4.nix | 280 +---------------- pkgs/os-specific/linux/kernel/linux-3.8.nix | 293 +---------------- pkgs/os-specific/linux/kernel/linux-3.9.nix | 296 +---------------- .../linux/kernel/linux-rpi-3.6.nix | 51 +-- pkgs/top-level/all-packages.nix | 10 +- 11 files changed, 390 insertions(+), 1682 deletions(-) create mode 100644 pkgs/os-specific/linux/kernel/common-config.nix diff --git a/pkgs/os-specific/linux/kernel/builder.sh b/pkgs/os-specific/linux/kernel/builder.sh index 47c7a22c177..bea53e9c4dd 100644 --- a/pkgs/os-specific/linux/kernel/builder.sh +++ b/pkgs/os-specific/linux/kernel/builder.sh @@ -10,19 +10,20 @@ postPatch() { # Makefiles are full of /bin/pwd, /bin/false, /bin/bash, etc. # Patch these away, assuming the tools are in $PATH. for mf in $(find -name Makefile); do - echo "stripping FHS paths in \`$mf'..." - sed -i "$mf" -e 's|/usr/bin/||g ; s|/bin/||g' + echo "stripping FHS paths in \`$mf'..." + sed -i "$mf" -e 's|/usr/bin/||g ; s|/bin/||g' done } configurePhase() { if test -n "$preConfigure"; then - eval "$preConfigure"; + eval "$preConfigure" fi export INSTALL_PATH=$out export INSTALL_MOD_PATH=$out + substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' "" # Set our own localversion, if specified. rm -f localversion* @@ -30,7 +31,6 @@ configurePhase() { echo "$localVersion" > localversion-nix fi - # Patch kconfig to print "###" after every question so that # generate-config.pl can answer them. sed -e '/fflush(stdout);/i\printf("###");' -i scripts/kconfig/conf.c @@ -112,7 +112,7 @@ installPhase() { if test "$dontStrip" = "1"; then # copy any debugging info that can be found - cp --parents -rv `find -name \*.debug -o -name debug.a` \ + cp --parents -rv `find -name \*.debug -o -name debug.a` \ "$out/lib/modules/$version/build" fi diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix new file mode 100644 index 00000000000..4b19cd2aa2a --- /dev/null +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -0,0 +1,288 @@ +{ stdenv, version, kernelPlatform, extraConfig }: + +with stdenv.lib; + +'' + # Power management and debugging. + DEBUG_KERNEL y + PM_ADVANCED_DEBUG y + PM_RUNTIME y + TIMER_STATS y + ${optionalString (versionOlder version "3.10") '' + USB_SUSPEND y + ''} + BACKTRACE_SELF_TEST n + CPU_NOTIFIER_ERROR_INJECT? n + DEBUG_DEVRES n + DEBUG_NX_TEST n + DEBUG_STACK_USAGE n + DEBUG_STACKOVERFLOW n + RCU_TORTURE_TEST n + SCHEDSTATS n + + # Support drivers that need external firmware. + STANDALONE n + + # Make /proc/config.gz available. + IKCONFIG_PROC y + + # Optimize with -O2, not -Os. + CC_OPTIMIZE_FOR_SIZE n + + # Enable the kernel's built-in memory tester. + MEMTEST y + + # Include the CFQ I/O scheduler in the kernel, rather than as a + # module, so that the initrd gets a good I/O scheduler. + IOSCHED_CFQ y + BLK_CGROUP y # required by CFQ + + # Enable NUMA. + NUMA? y + + # Disable some expensive (?) features. + FTRACE n + KPROBES n + PM_TRACE_RTC n + + # Enable various subsystems. + ACCESSIBILITY y # Accessibility support + AUXDISPLAY y # Auxiliary Display support + DONGLE y # Serial dongle support + HIPPI y + MTD_COMPLEX_MAPPINGS y # needed for many devices + ${optionalString (versionOlder version "3.2") '' + NET_POCKET y # enable pocket and portable adapters + ''} + SCSI_LOWLEVEL y # enable lots of SCSI devices + SCSI_LOWLEVEL_PCMCIA y + SPI y # needed for many devices + SPI_MASTER y + WAN y + + # Networking options. + IP_PNP n + IPV6_PRIVACY y + NETFILTER_ADVANCED y + IP_VS_PROTO_TCP y + IP_VS_PROTO_UDP y + IP_VS_PROTO_ESP y + IP_VS_PROTO_AH y + IP_DCCP_CCID3 n # experimental + CLS_U32_PERF y + CLS_U32_MARK y + + # Wireless networking. + CFG80211_WEXT y # Without it, ipw2200 drivers don't build + IPW2100_MONITOR y # support promiscuous mode + IPW2200_MONITOR y # support promiscuous mode + HOSTAP_FIRMWARE y # Support downloading firmware images with Host AP driver + HOSTAP_FIRMWARE_NVRAM y + ATH9K_PCI y # Detect Atheros AR9xxx cards on PCI(e) bus + ATH9K_AHB y # Ditto, AHB bus + ${optionalString (versionAtLeast version "3.2") '' + B43_PHY_HT y + ''} + BCMA_HOST_PCI y + + # Some settings to make sure that fbcondecor works - in particular, + # disable tileblitting and the drivers that need it. + + # Enable various FB devices. + FB y + FB_EFI y + FB_NVIDIA_I2C y # Enable DDC Support + FB_RIVA_I2C y + FB_ATY_CT y # Mach64 CT/VT/GT/LT (incl. 3D RAGE) support + FB_ATY_GX y # Mach64 GX support + FB_SAVAGE_I2C y + FB_SAVAGE_ACCEL y + FB_SIS_300 y + FB_SIS_315 y + FB_3DFX_ACCEL y + FB_GEODE y + + # Video configuration. + # Enable KMS for devices whose X.org driver supports it. + DRM_I915_KMS y + ${optionalString (versionOlder version "3.9") '' + DRM_RADEON_KMS y + ''} + # Hybrid graphics support + VGA_SWITCHEROO y + + # Sound. + SND_AC97_POWER_SAVE y # AC97 Power-Saving Mode + SND_HDA_INPUT_BEEP y # Support digital beep via input layer + SND_USB_CAIAQ_INPUT y + PSS_MIXER y # Enable PSS mixer (Beethoven ADSP-16 and other compatible) + + # USB serial devices. + USB_SERIAL_GENERIC y # USB Generic Serial Driver + USB_SERIAL_KEYSPAN_MPR y # include firmware for various USB serial devices + USB_SERIAL_KEYSPAN_USA28 y + USB_SERIAL_KEYSPAN_USA28X y + USB_SERIAL_KEYSPAN_USA28XA y + USB_SERIAL_KEYSPAN_USA28XB y + USB_SERIAL_KEYSPAN_USA19 y + USB_SERIAL_KEYSPAN_USA18X y + USB_SERIAL_KEYSPAN_USA19W y + USB_SERIAL_KEYSPAN_USA19QW y + USB_SERIAL_KEYSPAN_USA19QI y + USB_SERIAL_KEYSPAN_USA49W y + USB_SERIAL_KEYSPAN_USA49WLC y + + # Filesystem options - in particular, enable extended attributes and + # ACLs for all filesystems that support them. + EXT2_FS_XATTR y + EXT2_FS_POSIX_ACL y + EXT2_FS_SECURITY y # Ext2 Security Labels + EXT2_FS_XIP y # Ext2 execute in place support + EXT4_FS_POSIX_ACL y + EXT4_FS_SECURITY y + REISERFS_FS_XATTR y + REISERFS_FS_POSIX_ACL y + REISERFS_FS_SECURITY y + JFS_POSIX_ACL y + JFS_SECURITY y + XFS_QUOTA y + XFS_POSIX_ACL y + XFS_RT y # XFS Realtime subvolume support + OCFS2_DEBUG_MASKLOG n + BTRFS_FS_POSIX_ACL y + UBIFS_FS_XATTR? y + UBIFS_FS_ADVANCED_COMPR y + NFSD_V2_ACL y + NFSD_V3 y + NFSD_V3_ACL y + NFSD_V4 y + NFS_FSCACHE y + CIFS_XATTR y + CIFS_POSIX y + CIFS_FSCACHE y + + # Security related features. + STRICT_DEVMEM y # Filter access to /dev/mem + SECURITY_SELINUX_BOOTPARAM_VALUE 0 # disable SELinux by default + + # Misc. options. + 8139TOO_8129 y + 8139TOO_PIO n # PIO is slower + AIC79XX_DEBUG_ENABLE n + AIC7XXX_DEBUG_ENABLE n + AIC94XX_DEBUG n + ${optionalString (versionAtLeast version "3.3") '' + AUDIT_LOGINUID_IMMUTABLE y + ''} + B43_PCMCIA y + BLK_DEV_CMD640_ENHANCED y # CMD640 enhanced support + BLK_DEV_IDEACPI y # IDE ACPI support + BLK_DEV_INTEGRITY y + BSD_PROCESS_ACCT_V3 y + BT_HCIUART_BCSP y + BT_HCIUART_H4 y # UART (H4) protocol support + BT_HCIUART_LL y + BT_RFCOMM_TTY? y # RFCOMM TTY support + CRASH_DUMP n + ${optionalString (versionOlder version "3.1") '' + DMAR? n # experimental + ''} + DVB_DYNAMIC_MINORS? y # we use udev + ${optionalString (versionAtLeast version "3.3") '' + EFI_STUB y # EFI bootloader in the bzImage itself + ''} + FHANDLE y # used by systemd + FUSION y # Fusion MPT device support + IDE_GD_ATAPI y # ATAPI floppy support + IRDA_ULTRA y # Ultra (connectionless) protocol + JOYSTICK_IFORCE_232 y # I-Force Serial joysticks and wheels + JOYSTICK_IFORCE_USB y # I-Force USB joysticks and wheels + JOYSTICK_XPAD_FF y # X-Box gamepad rumble support + JOYSTICK_XPAD_LEDS y # LED Support for Xbox360 controller 'BigX' LED + LDM_PARTITION y # Windows Logical Disk Manager (Dynamic Disk) support + LEDS_TRIGGER_IDE_DISK y # LED IDE Disk Trigger + LOGIRUMBLEPAD2_FF y # Logitech Rumblepad 2 force feedback + LOGO n # not needed + MEDIA_ATTACH y + MEGARAID_NEWGEN y + MICROCODE_AMD y + MODVERSIONS y + MOUSE_PS2_ELANTECH y # Elantech PS/2 protocol extension + MTRR_SANITIZER y + NET_FC y # Fibre Channel driver support + PPP_MULTILINK y # PPP multilink support + REGULATOR y # Voltage and Current Regulator Support + ${optionalString (versionAtLeast version "3.6") '' + RC_DEVICES? y # Enable IR devices + ''} + SCSI_LOGGING y # SCSI logging facility + SERIAL_8250 y # 8250/16550 and compatible serial support + SLIP_COMPRESSED y # CSLIP compressed headers + SLIP_SMART y + THERMAL_HWMON y # Hardware monitoring support + USB_DEBUG n + USB_EHCI_ROOT_HUB_TT y # Root Hub Transaction Translators + USB_EHCI_TT_NEWSCHED y # Improved transaction translator scheduling + X86_CHECK_BIOS_CORRUPTION y + X86_MCE y + + # Linux containers. + RT_GROUP_SCHED? y + CGROUP_DEVICE? y + ${if versionAtLeast version "3.6" then '' + MEMCG y + MEMCG_SWAP y + '' else '' + CGROUP_MEM_RES_CTLR y + CGROUP_MEM_RES_CTLR_SWAP y + ''} + DEVPTS_MULTIPLE_INSTANCES y + + # Enable staging drivers. These are somewhat experimental, but + # they generally don't hurt. + STAGING y + + # PROC_EVENTS requires that the netlink connector is not built + # as a module. This is required by libcgroup's cgrulesengd. + CONNECTOR y + PROC_EVENTS y + + # Tracing. + FTRACE y + FUNCTION_TRACER y + FTRACE_SYSCALLS y + SCHED_TRACER y + + # Devtmpfs support. + DEVTMPFS y + + # Easier debugging of NFS issues. + ${optionalString (versionAtLeast version "3.4") '' + SUNRPC_DEBUG y + ''} + + # Virtualisation. + XEN_DOM0? y + + # Media support. + ${optionalString (versionAtLeast version "3.6") '' + MEDIA_DIGITAL_TV_SUPPORT y + MEDIA_CAMERA_SUPPORT y + MEDIA_RC_SUPPORT y + ''} + ${optionalString (versionAtLeast version "3.7") '' + MEDIA_USB_SUPPORT y + ''} + + # Our initrd init uses shebang scripts, so can't be modular. + ${optionalString (versionAtLeast version "3.10") '' + BINFMT_SCRIPT y + ''} + + # Enable the 9P cache to speed up NixOS VM tests. + 9P_FSCACHE y + 9P_FS_POSIX_ACL y + + ${kernelPlatform.kernelExtraConfig or ""} + ${extraConfig} +'' diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index 85f916de1a3..ad243ae5b7c 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, mktemp, module_init_tools +{ stdenv, fetchurl, perl, mktemp, module_init_tools, bc , # The kernel source tarball. src @@ -6,15 +6,12 @@ , # The kernel version. version +, # Overrides to the kernel config. + extraConfig ? "" + , # The version number used for the module directory modDirVersion ? version -, # The kernel configuration. - config - -, # The kernel configuration when cross building. - configCross ? {} - , # An attribute set whose attributes express the availability of # certain features in this kernel. E.g. `{iwlwifi = true;}' # indicates a kernel that provides Intel wireless support. Used in @@ -40,7 +37,6 @@ # we force building the target asked: bzImage/zImage/uImage/... postBuild ? "make $makeFlags $kernelTarget; make $makeFlags -C scripts unifdef" -, extraNativeBuildInputs ? [] , ... }: @@ -59,6 +55,12 @@ let map ({extraConfig ? "", ...}: extraConfig) kernelPatches; in lib.concatStringsSep "\n" ([baseConfig] ++ configFromPatches); + configWithPlatform = kernelPlatform: + import ./common-config.nix { inherit stdenv version kernelPlatform extraConfig; }; + + config = configWithPlatform stdenv.platform; + configCross = configWithPlatform stdenv.cross.platform; + in stdenv.mkDerivation { @@ -85,7 +87,7 @@ stdenv.mkDerivation { # For UML and non-PC, just ignore all options that don't apply (We are lazy). ignoreConfigErrors = stdenv.platform.name != "pc"; - nativeBuildInputs = [ perl mktemp ] ++ extraNativeBuildInputs; + nativeBuildInputs = [ perl mktemp bc ]; buildInputs = lib.optional (stdenv.platform.uboot != null) (ubootChooser stdenv.platform.uboot); diff --git a/pkgs/os-specific/linux/kernel/linux-3.0.nix b/pkgs/os-specific/linux/kernel/linux-3.0.nix index 9f1a36db7dd..48197ae14ca 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.0.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.0.nix @@ -1,252 +1,12 @@ -args @ { stdenv, fetchurl, extraConfig ? "" -, perl, mktemp, module_init_tools -, ... }: +{ stdenv, fetchurl, ... } @ args: -let - configWithPlatform = kernelPlatform : - '' - # Power management and debugging for powertop. - DEBUG_KERNEL y - PM_ADVANCED_DEBUG y - PM_RUNTIME y - TIMER_STATS y - USB_SUSPEND y - BACKTRACE_SELF_TEST n - CPU_NOTIFIER_ERROR_INJECT n - DEBUG_DEVRES n - DEBUG_NX_TEST n - DEBUG_STACK_USAGE n - DEBUG_STACKOVERFLOW n - RCU_TORTURE_TEST n - SCHEDSTATS n +import ./generic.nix (args // rec { + version = "3.0.88"; - # Support drivers that need external firmware. - STANDALONE n + src = fetchurl { + url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; + sha256 = "1icfkbn9a5cpwiax1xklvpqyjcvqij3dwib009fipp53z4pn5bz4"; + }; - # Make /proc/config.gz available. - IKCONFIG_PROC y - - # Optimize with -O2, not -Os. - CC_OPTIMIZE_FOR_SIZE n - - # Enable the kernel's built-in memory tester. - MEMTEST y - - # Include the CFQ I/O scheduler in the kernel, rather than as a - # module, so that the initrd gets a good I/O scheduler. - IOSCHED_CFQ y - BLK_CGROUP y # required by CFQ - - # Disable some expensive (?) features. - FTRACE n - KPROBES n - NUMA? n - PM_TRACE_RTC n - - # Enable various subsystems. - ACCESSIBILITY y # Accessibility support - AUXDISPLAY y # Auxiliary Display support - DONGLE y # Serial dongle support - HIPPI y - MTD_COMPLEX_MAPPINGS y # needed for many devices - NET_POCKET y # enable pocket and portable adapters - SCSI_LOWLEVEL y # enable lots of SCSI devices - SCSI_LOWLEVEL_PCMCIA y - SPI y # needed for many devices - SPI_MASTER y - WAN y - - # Networking options. - IP_PNP n - IPV6_PRIVACY y - NETFILTER_ADVANCED y - IP_VS_PROTO_TCP y - IP_VS_PROTO_UDP y - IP_VS_PROTO_ESP y - IP_VS_PROTO_AH y - IP_DCCP_CCID3 n # experimental - CLS_U32_PERF y - CLS_U32_MARK y - - # Wireless networking. - IPW2100_MONITOR y # support promiscuous mode - IPW2200_MONITOR y # support promiscuous mode - HOSTAP_FIRMWARE y # Support downloading firmware images with Host AP driver - HOSTAP_FIRMWARE_NVRAM y - ATH9K_PCI y # Detect Atheros AR9xxx cards on PCI(e) bus - ATH9K_AHB y # Ditto, AHB bus - - # Some settings to make sure that fbcondecor works - in particular, - # disable tileblitting and the drivers that need it. - - # Enable various FB devices. - FB y - FB_EFI y - FB_NVIDIA_I2C y # Enable DDC Support - FB_RIVA_I2C y - FB_ATY_CT y # Mach64 CT/VT/GT/LT (incl. 3D RAGE) support - FB_ATY_GX y # Mach64 GX support - FB_SAVAGE_I2C y - FB_SAVAGE_ACCEL y - FB_SIS_300 y - FB_SIS_315 y - FB_3DFX_ACCEL y - FB_GEODE y - - # Video configuration - # Enable KMS for devices whose X.org driver supports it. - DRM_I915_KMS y - DRM_RADEON_KMS y - # Hybrid graphics support - VGA_SWITCHEROO y - - # Sound. - SND_AC97_POWER_SAVE y # AC97 Power-Saving Mode - SND_HDA_INPUT_BEEP y # Support digital beep via input layer - SND_USB_CAIAQ_INPUT y - PSS_MIXER y # Enable PSS mixer (Beethoven ADSP-16 and other compatible) - - # USB serial devices. - USB_SERIAL_GENERIC y # USB Generic Serial Driver - USB_SERIAL_KEYSPAN_MPR y # include firmware for various USB serial devices - USB_SERIAL_KEYSPAN_USA28 y - USB_SERIAL_KEYSPAN_USA28X y - USB_SERIAL_KEYSPAN_USA28XA y - USB_SERIAL_KEYSPAN_USA28XB y - USB_SERIAL_KEYSPAN_USA19 y - USB_SERIAL_KEYSPAN_USA18X y - USB_SERIAL_KEYSPAN_USA19W y - USB_SERIAL_KEYSPAN_USA19QW y - USB_SERIAL_KEYSPAN_USA19QI y - USB_SERIAL_KEYSPAN_USA49W y - USB_SERIAL_KEYSPAN_USA49WLC y - - # Filesystem options - in particular, enable extended attributes and - # ACLs for all filesystems that support them. - EXT2_FS_XATTR y # Ext2 extended attributes - EXT2_FS_POSIX_ACL y # Ext2 POSIX Access Control Lists - EXT2_FS_SECURITY y # Ext2 Security Labels - EXT2_FS_XIP y # Ext2 execute in place support - EXT4_FS_POSIX_ACL y - EXT4_FS_SECURITY y - REISERFS_FS_XATTR y - REISERFS_FS_POSIX_ACL y - REISERFS_FS_SECURITY y - JFS_POSIX_ACL y - JFS_SECURITY y - XFS_QUOTA y - XFS_POSIX_ACL y - XFS_RT y # XFS Realtime subvolume support - OCFS2_DEBUG_MASKLOG n - BTRFS_FS_POSIX_ACL y - UBIFS_FS_XATTR y - UBIFS_FS_ADVANCED_COMPR y - NFSD_V2_ACL y - NFSD_V3 y - NFSD_V3_ACL y - NFSD_V4 y - CIFS_XATTR y - CIFS_POSIX y - - # Security related features. - STRICT_DEVMEM y # Filter access to /dev/mem - SECURITY_SELINUX_BOOTPARAM_VALUE 0 # disable SELinux by default - - # Misc. options. - 8139TOO_8129 y - 8139TOO_PIO n # PIO is slower - AIC79XX_DEBUG_ENABLE n - AIC7XXX_DEBUG_ENABLE n - AIC94XX_DEBUG n - B43_PCMCIA y - BLK_DEV_CMD640_ENHANCED y # CMD640 enhanced support - BLK_DEV_IDEACPI y # IDE ACPI support - BLK_DEV_INTEGRITY y - BSD_PROCESS_ACCT_V3 y - BT_HCIUART_BCSP y - BT_HCIUART_H4 y # UART (H4) protocol support - BT_HCIUART_LL y - BT_L2CAP y - BT_SCO y # audio support - BT_RFCOMM m - BT_RFCOMM_TTY y # RFCOMM TTY support - CRASH_DUMP n - DMAR? n # experimental - DVB_DYNAMIC_MINORS y # we use udev - FHANDLE y # used by systemd - FUSION y # Fusion MPT device support - IDE_GD_ATAPI y # ATAPI floppy support - IRDA_ULTRA y # Ultra (connectionless) protocol - JOYSTICK_IFORCE_232 y # I-Force Serial joysticks and wheels - JOYSTICK_IFORCE_USB y # I-Force USB joysticks and wheels - JOYSTICK_XPAD_FF y # X-Box gamepad rumble support - JOYSTICK_XPAD_LEDS y # LED Support for Xbox360 controller 'BigX' LED - LDM_PARTITION y # Windows Logical Disk Manager (Dynamic Disk) support - LEDS_TRIGGER_IDE_DISK y # LED IDE Disk Trigger - LOGIRUMBLEPAD2_FF y # Logitech Rumblepad 2 force feedback - LOGO n # not needed - MEDIA_ATTACH y - MEGARAID_NEWGEN y - MICROCODE_AMD y - MODVERSIONS y - MOUSE_PS2_ELANTECH y # Elantech PS/2 protocol extension - MTRR_SANITIZER y - NET_FC y # Fibre Channel driver support - PPP_MULTILINK y # PPP multilink support - REGULATOR y # Voltage and Current Regulator Support - SCSI_LOGGING y # SCSI logging facility - SERIAL_8250 y # 8250/16550 and compatible serial support - SLIP_COMPRESSED y # CSLIP compressed headers - SLIP_SMART y - THERMAL_HWMON y # Hardware monitoring support - USB_DEBUG n - USB_EHCI_ROOT_HUB_TT y # Root Hub Transaction Translators - X86_CHECK_BIOS_CORRUPTION y - X86_MCE y - - # Linux Containers - RT_GROUP_SCHED? y - CGROUP_DEVICE? y - CGROUP_MEM_RES_CTLR? y - CGROUP_MEM_RES_CTLR_SWAP? y - DEVPTS_MULTIPLE_INSTANCES? y - - # Enable staging drivers. These are somewhat experimental, but - # they generally don't hurt. - STAGING y - - # PROC_EVENTS requires that the netlink connector is not built - # as a module. This is required by libcgroup's cgrulesengd. - CONNECTOR y - PROC_EVENTS y - - # Devtmpfs support. - DEVTMPFS y - - ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""} - ${extraConfig} - ''; -in - -import ./generic.nix ( - - rec { - version = "3.0.80"; - - preConfigure = '' - substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' "" - ''; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0f3md117bh8n5izkhjd2jp096jqmwz6wpxn7rf8x2x9cz4jz0cqx"; - }; - - config = configWithPlatform stdenv.platform; - configCross = configWithPlatform stdenv.cross.platform; - - features.iwlwifi = true; - } - - // removeAttrs args ["extraConfig"] -) + features.iwlwifi = true; +}) diff --git a/pkgs/os-specific/linux/kernel/linux-3.10.nix b/pkgs/os-specific/linux/kernel/linux-3.10.nix index 7de8aa85392..4b5e4d001a6 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.10.nix @@ -1,287 +1,16 @@ -args @ { stdenv, fetchurl, extraConfig ? "" -, perl, mktemp, module_init_tools, bc -, ... }: +{ stdenv, fetchurl, ... } @ args: -let - configWithPlatform = kernelPlatform : - '' - # Power management and debugging for powertop. - DEBUG_KERNEL y - PM_ADVANCED_DEBUG y - PM_RUNTIME y - TIMER_STATS y - BACKTRACE_SELF_TEST n - CPU_NOTIFIER_ERROR_INJECT? n - DEBUG_DEVRES n - DEBUG_NX_TEST n - DEBUG_STACK_USAGE n - DEBUG_STACKOVERFLOW n - RCU_TORTURE_TEST n - SCHEDSTATS n +import ./generic.nix (args // rec { + version = "3.10.4"; - # Support drivers that need external firmware. - STANDALONE n + src = fetchurl { + url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; + sha256 = "1f0ynk37bhkllx2ahzp587yr8cvn809v2ad0sn7z92yv48vl4nly"; + }; - # Make /proc/config.gz available. - IKCONFIG_PROC y - - # Optimize with -O2, not -Os. - CC_OPTIMIZE_FOR_SIZE n - - # Enable the kernel's built-in memory tester. - MEMTEST y - - # Include the CFQ I/O scheduler in the kernel, rather than as a - # module, so that the initrd gets a good I/O scheduler. - IOSCHED_CFQ y - BLK_CGROUP y # required by CFQ - - # Enable NUMA. - NUMA? y - - # Disable some expensive (?) features. - FTRACE n - KPROBES n - PM_TRACE_RTC n - - # Enable various subsystems. - ACCESSIBILITY y # Accessibility support - AUXDISPLAY y # Auxiliary Display support - DONGLE y # Serial dongle support - HIPPI? y - MTD_COMPLEX_MAPPINGS y # needed for many devices - SCSI_LOWLEVEL y # enable lots of SCSI devices - SCSI_LOWLEVEL_PCMCIA y - SPI y # needed for many devices - SPI_MASTER y - WAN y - - # Networking options. - IP_PNP n - IPV6_PRIVACY y - NETFILTER_ADVANCED y - IP_VS_PROTO_TCP y - IP_VS_PROTO_UDP y - IP_VS_PROTO_ESP y - IP_VS_PROTO_AH y - IP_DCCP_CCID3 n # experimental - CLS_U32_PERF y - CLS_U32_MARK y - - # Wireless networking. - IPW2100_MONITOR y # support promiscuous mode - IPW2200_MONITOR? y # support promiscuous mode - HOSTAP_FIRMWARE y # Support downloading firmware images with Host AP driver - HOSTAP_FIRMWARE_NVRAM y - ATH9K_PCI y # Detect Atheros AR9xxx cards on PCI(e) bus - ATH9K_AHB y # Ditto, AHB bus - B43_PHY_HT y - BCMA_HOST_PCI y - CFG80211_WEXT y # Without it, ipw2200 drivers don't build - - # Some settings to make sure that fbcondecor works - in particular, - # disable tileblitting and the drivers that need it. - - # Enable various FB devices. - FB y - FB_EFI y - FB_NVIDIA_I2C y # Enable DDC Support - FB_RIVA_I2C y - FB_ATY_CT y # Mach64 CT/VT/GT/LT (incl. 3D RAGE) support - FB_ATY_GX y # Mach64 GX support - FB_SAVAGE_I2C y - FB_SAVAGE_ACCEL y - FB_SIS_300 y - FB_SIS_315 y - FB_3DFX_ACCEL y - FB_GEODE y - - # Video configuration - # Enable KMS for devices whose X.org driver supports it. - DRM_I915_KMS y - DRM_RADEON_KMS? y - # Hybrid graphics support - VGA_SWITCHEROO y - - # Sound. - SND_AC97_POWER_SAVE y # AC97 Power-Saving Mode - SND_HDA_INPUT_BEEP y # Support digital beep via input layer - SND_USB_CAIAQ_INPUT y - PSS_MIXER y # Enable PSS mixer (Beethoven ADSP-16 and other compatible) - - # USB serial devices. - USB_SERIAL_GENERIC y # USB Generic Serial Driver - USB_SERIAL_KEYSPAN_MPR y # include firmware for various USB serial devices - USB_SERIAL_KEYSPAN_USA28 y - USB_SERIAL_KEYSPAN_USA28X y - USB_SERIAL_KEYSPAN_USA28XA y - USB_SERIAL_KEYSPAN_USA28XB y - USB_SERIAL_KEYSPAN_USA19 y - USB_SERIAL_KEYSPAN_USA18X y - USB_SERIAL_KEYSPAN_USA19W y - USB_SERIAL_KEYSPAN_USA19QW y - USB_SERIAL_KEYSPAN_USA19QI y - USB_SERIAL_KEYSPAN_USA49W y - USB_SERIAL_KEYSPAN_USA49WLC y - - # Filesystem options - in particular, enable extended attributes and - # ACLs for all filesystems that support them. - EXT2_FS_XATTR y # Ext2 extended attributes - EXT2_FS_POSIX_ACL y # Ext2 POSIX Access Control Lists - EXT2_FS_SECURITY y # Ext2 Security Labels - EXT2_FS_XIP y # Ext2 execute in place support - EXT4_FS_POSIX_ACL y - EXT4_FS_SECURITY y - REISERFS_FS_XATTR y - REISERFS_FS_POSIX_ACL y - REISERFS_FS_SECURITY y - JFS_POSIX_ACL y - JFS_SECURITY y - XFS_QUOTA y - XFS_POSIX_ACL y - XFS_RT y # XFS Realtime subvolume support - OCFS2_DEBUG_MASKLOG n - BTRFS_FS_POSIX_ACL y - UBIFS_FS_XATTR? y - UBIFS_FS_ADVANCED_COMPR y - NFSD_V2_ACL y - NFSD_V3 y - NFSD_V3_ACL y - NFSD_V4 y - NFS_FSCACHE y - CIFS_XATTR y - CIFS_POSIX y - CIFS_FSCACHE y - - # Security related features. - STRICT_DEVMEM y # Filter access to /dev/mem - SECURITY_SELINUX_BOOTPARAM_VALUE 0 # disable SELinux by default - - # Misc. options. - 8139TOO_8129 y - 8139TOO_PIO n # PIO is slower - AIC79XX_DEBUG_ENABLE n - AIC7XXX_DEBUG_ENABLE n - AIC94XX_DEBUG n - AUDIT_LOGINUID_IMMUTABLE y - B43_PCMCIA y - BLK_DEV_CMD640_ENHANCED y # CMD640 enhanced support - BLK_DEV_IDEACPI y # IDE ACPI support - BLK_DEV_INTEGRITY y - BSD_PROCESS_ACCT_V3 y - BT_HCIUART_BCSP y - BT_HCIUART_H4 y # UART (H4) protocol support - BT_HCIUART_LL y - BT_RFCOMM m - BT_RFCOMM_TTY y # RFCOMM TTY support - CRASH_DUMP n - DMAR? n # experimental - DVB_DYNAMIC_MINORS? y # we use udev - EFI_STUB y # EFI bootloader in the bzImage itself - FHANDLE y # used by systemd - FUSION y # Fusion MPT device support - IDE_GD_ATAPI y # ATAPI floppy support - IRDA_ULTRA y # Ultra (connectionless) protocol - JOYSTICK_IFORCE_232 y # I-Force Serial joysticks and wheels - JOYSTICK_IFORCE_USB y # I-Force USB joysticks and wheels - JOYSTICK_XPAD_FF y # X-Box gamepad rumble support - JOYSTICK_XPAD_LEDS y # LED Support for Xbox360 controller 'BigX' LED - LDM_PARTITION y # Windows Logical Disk Manager (Dynamic Disk) support - LEDS_TRIGGER_IDE_DISK y # LED IDE Disk Trigger - LOGIRUMBLEPAD2_FF y # Logitech Rumblepad 2 force feedback - LOGO n # not needed - MEDIA_ATTACH? y - MEGARAID_NEWGEN y - MICROCODE_AMD y - MODVERSIONS y - MOUSE_PS2_ELANTECH y # Elantech PS/2 protocol extension - MTRR_SANITIZER y - NET_FC y # Fibre Channel driver support - PPP_MULTILINK y # PPP multilink support - REGULATOR y # Voltage and Current Regulator Support - RC_DEVICES y # Enable IR devices - SCSI_LOGGING y # SCSI logging facility - SERIAL_8250 y # 8250/16550 and compatible serial support - SLIP_COMPRESSED y # CSLIP compressed headers - SLIP_SMART y - THERMAL_HWMON y # Hardware monitoring support - USB_DEBUG n - USB_EHCI_ROOT_HUB_TT y # Root Hub Transaction Translators - USB_EHCI_TT_NEWSCHED y # Improved transaction translator scheduling - X86_CHECK_BIOS_CORRUPTION y - X86_MCE y - - # Linux Containers - RT_GROUP_SCHED? y - CGROUP_DEVICE? y - MEMCG? y - MEMCG_SWAP? y - DEVPTS_MULTIPLE_INSTANCES? y - - # Enable staging drivers. These are somewhat experimental, but - # they generally don't hurt. - STAGING y - - # PROC_EVENTS requires that the netlink connector is not built - # as a module. This is required by libcgroup's cgrulesengd. - CONNECTOR y - PROC_EVENTS y - - # Tracing - FTRACE y - FUNCTION_TRACER y - FTRACE_SYSCALLS y - SCHED_TRACER y - - # Devtmpfs support. - DEVTMPFS y - - # Media support - MEDIA_CAMERA_SUPPORT? y - MEDIA_RC_SUPPORT? y - MEDIA_USB_SUPPORT y - - # Easier debug of NFS issues - SUNRPC_DEBUG y - - # Our initrd init uses shebang scripts, so can't be modular - BINFMT_SCRIPT y - - # Enable the 9P cache to speed up NixOS VM tests. - 9P_FSCACHE y - 9P_FS_POSIX_ACL y - - ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""} - ${extraConfig} - ''; -in - -import ./generic.nix ( - - rec { - version = "3.10.4"; - testing = false; - - preConfigure = '' - substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' "" - ''; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "1f0ynk37bhkllx2ahzp587yr8cvn809v2ad0sn7z92yv48vl4nly"; - }; - - config = configWithPlatform stdenv.platform; - configCross = configWithPlatform stdenv.cross.platform; - - features.iwlwifi = true; - features.efiBootStub = true; - features.needsCifsUtils = true; - features.canDisableNetfilterConntrackHelpers = true; - features.netfilterRPFilter = true; - - extraNativeBuildInputs = [bc]; - } - - // removeAttrs args ["extraConfig"] -) + features.iwlwifi = true; + features.efiBootStub = true; + features.needsCifsUtils = true; + features.canDisableNetfilterConntrackHelpers = true; + features.netfilterRPFilter = true; +}) diff --git a/pkgs/os-specific/linux/kernel/linux-3.2.nix b/pkgs/os-specific/linux/kernel/linux-3.2.nix index 1e1e41a360a..9b1d1bcf6c1 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.2.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.2.nix @@ -1,263 +1,12 @@ -args @ { stdenv, fetchurl, extraConfig ? "" -, perl, mktemp, module_init_tools -, ... }: +{ stdenv, fetchurl, ... } @ args: -let - configWithPlatform = kernelPlatform : - '' - # Power management and debugging for powertop. - DEBUG_KERNEL y - PM_ADVANCED_DEBUG y - PM_RUNTIME y - TIMER_STATS y - USB_SUSPEND y - BACKTRACE_SELF_TEST n - CPU_NOTIFIER_ERROR_INJECT n - DEBUG_DEVRES n - DEBUG_NX_TEST n - DEBUG_STACK_USAGE n - DEBUG_STACKOVERFLOW n - RCU_TORTURE_TEST n - SCHEDSTATS n +import ./generic.nix (args // rec { + version = "3.2.49"; - # Support drivers that need external firmware. - STANDALONE n + src = fetchurl { + url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; + sha256 = "06xiwcgk6hbcp6g1dpmxb95dzx94s29vzmh1pz4lsglcj1yfrkry"; + }; - # Make /proc/config.gz available. - IKCONFIG_PROC y - - # Optimize with -O2, not -Os. - CC_OPTIMIZE_FOR_SIZE n - - # Enable the kernel's built-in memory tester. - MEMTEST y - - # Include the CFQ I/O scheduler in the kernel, rather than as a - # module, so that the initrd gets a good I/O scheduler. - IOSCHED_CFQ y - BLK_CGROUP y # required by CFQ - - # Enable NUMA. - NUMA? y - - # Disable some expensive (?) features. - FTRACE n - KPROBES n - PM_TRACE_RTC n - - # Enable various subsystems. - ACCESSIBILITY y # Accessibility support - AUXDISPLAY y # Auxiliary Display support - DONGLE y # Serial dongle support - HIPPI? y - MTD_COMPLEX_MAPPINGS y # needed for many devices - SCSI_LOWLEVEL y # enable lots of SCSI devices - SCSI_LOWLEVEL_PCMCIA y - SPI y # needed for many devices - SPI_MASTER y - WAN y - - # Networking options. - IP_PNP n - IPV6_PRIVACY y - NETFILTER_ADVANCED y - IP_VS_PROTO_TCP y - IP_VS_PROTO_UDP y - IP_VS_PROTO_ESP y - IP_VS_PROTO_AH y - IP_DCCP_CCID3 n # experimental - CLS_U32_PERF y - CLS_U32_MARK y - - # Wireless networking. - IPW2100_MONITOR y # support promiscuous mode - IPW2200_MONITOR y # support promiscuous mode - HOSTAP_FIRMWARE y # Support downloading firmware images with Host AP driver - HOSTAP_FIRMWARE_NVRAM y - ATH9K_PCI y # Detect Atheros AR9xxx cards on PCI(e) bus - ATH9K_AHB y # Ditto, AHB bus - - # Some settings to make sure that fbcondecor works - in particular, - # disable tileblitting and the drivers that need it. - - # Enable various FB devices. - FB y - FB_EFI y - FB_NVIDIA_I2C y # Enable DDC Support - FB_RIVA_I2C y - FB_ATY_CT y # Mach64 CT/VT/GT/LT (incl. 3D RAGE) support - FB_ATY_GX y # Mach64 GX support - FB_SAVAGE_I2C y - FB_SAVAGE_ACCEL y - FB_SIS_300 y - FB_SIS_315 y - FB_3DFX_ACCEL y - FB_GEODE y - - # Video configuration - # Enable KMS for devices whose X.org driver supports it. - DRM_I915_KMS y - DRM_RADEON_KMS y - # Hybrid graphics support - VGA_SWITCHEROO y - - # Sound. - SND_AC97_POWER_SAVE y # AC97 Power-Saving Mode - SND_HDA_INPUT_BEEP y # Support digital beep via input layer - SND_USB_CAIAQ_INPUT y - PSS_MIXER y # Enable PSS mixer (Beethoven ADSP-16 and other compatible) - - # USB serial devices. - USB_SERIAL_GENERIC y # USB Generic Serial Driver - USB_SERIAL_KEYSPAN_MPR y # include firmware for various USB serial devices - USB_SERIAL_KEYSPAN_USA28 y - USB_SERIAL_KEYSPAN_USA28X y - USB_SERIAL_KEYSPAN_USA28XA y - USB_SERIAL_KEYSPAN_USA28XB y - USB_SERIAL_KEYSPAN_USA19 y - USB_SERIAL_KEYSPAN_USA18X y - USB_SERIAL_KEYSPAN_USA19W y - USB_SERIAL_KEYSPAN_USA19QW y - USB_SERIAL_KEYSPAN_USA19QI y - USB_SERIAL_KEYSPAN_USA49W y - USB_SERIAL_KEYSPAN_USA49WLC y - - # Filesystem options - in particular, enable extended attributes and - # ACLs for all filesystems that support them. - EXT2_FS_XATTR y # Ext2 extended attributes - EXT2_FS_POSIX_ACL y # Ext2 POSIX Access Control Lists - EXT2_FS_SECURITY y # Ext2 Security Labels - EXT2_FS_XIP y # Ext2 execute in place support - EXT4_FS_POSIX_ACL y - EXT4_FS_SECURITY y - REISERFS_FS_XATTR y - REISERFS_FS_POSIX_ACL y - REISERFS_FS_SECURITY y - JFS_POSIX_ACL y - JFS_SECURITY y - XFS_QUOTA y - XFS_POSIX_ACL y - XFS_RT y # XFS Realtime subvolume support - OCFS2_DEBUG_MASKLOG n - BTRFS_FS_POSIX_ACL y - UBIFS_FS_XATTR y - UBIFS_FS_ADVANCED_COMPR y - NFSD_V2_ACL y - NFSD_V3 y - NFSD_V3_ACL y - NFSD_V4 y - NFS_FSCACHE y - CIFS_XATTR y - CIFS_POSIX y - CIFS_FSCACHE y - - # Security related features. - STRICT_DEVMEM y # Filter access to /dev/mem - SECURITY_SELINUX_BOOTPARAM_VALUE 0 # disable SELinux by default - - # Misc. options. - 8139TOO_8129 y - 8139TOO_PIO n # PIO is slower - AIC79XX_DEBUG_ENABLE n - AIC7XXX_DEBUG_ENABLE n - AIC94XX_DEBUG n - B43_PCMCIA y - BLK_DEV_CMD640_ENHANCED y # CMD640 enhanced support - BLK_DEV_IDEACPI y # IDE ACPI support - BLK_DEV_INTEGRITY y - BSD_PROCESS_ACCT_V3 y - BT_HCIUART_BCSP y - BT_HCIUART_H4 y # UART (H4) protocol support - BT_HCIUART_LL y - BT_L2CAP y - BT_SCO y # audio support - BT_RFCOMM m - BT_RFCOMM_TTY y # RFCOMM TTY support - CRASH_DUMP n - DMAR? n # experimental - DVB_DYNAMIC_MINORS y # we use udev - FHANDLE y # used by systemd - FUSION y # Fusion MPT device support - IDE_GD_ATAPI y # ATAPI floppy support - IRDA_ULTRA y # Ultra (connectionless) protocol - JOYSTICK_IFORCE_232 y # I-Force Serial joysticks and wheels - JOYSTICK_IFORCE_USB y # I-Force USB joysticks and wheels - JOYSTICK_XPAD_FF y # X-Box gamepad rumble support - JOYSTICK_XPAD_LEDS y # LED Support for Xbox360 controller 'BigX' LED - LDM_PARTITION y # Windows Logical Disk Manager (Dynamic Disk) support - LEDS_TRIGGER_IDE_DISK y # LED IDE Disk Trigger - LOGIRUMBLEPAD2_FF y # Logitech Rumblepad 2 force feedback - LOGO n # not needed - MEDIA_ATTACH y - MEGARAID_NEWGEN y - MICROCODE_AMD y - MODVERSIONS y - MOUSE_PS2_ELANTECH y # Elantech PS/2 protocol extension - MTRR_SANITIZER y - NET_FC y # Fibre Channel driver support - PPP_MULTILINK y # PPP multilink support - REGULATOR y # Voltage and Current Regulator Support - SCSI_LOGGING y # SCSI logging facility - SERIAL_8250 y # 8250/16550 and compatible serial support - SLIP_COMPRESSED y # CSLIP compressed headers - SLIP_SMART y - THERMAL_HWMON y # Hardware monitoring support - USB_DEBUG n - USB_EHCI_ROOT_HUB_TT y # Root Hub Transaction Translators - X86_CHECK_BIOS_CORRUPTION y - X86_MCE y - - # Linux Containers - RT_GROUP_SCHED? y - CGROUP_DEVICE? y - CGROUP_MEM_RES_CTLR? y - CGROUP_MEM_RES_CTLR_SWAP? y - DEVPTS_MULTIPLE_INSTANCES? y - - # Enable staging drivers. These are somewhat experimental, but - # they generally don't hurt. - STAGING y - - # PROC_EVENTS requires that the netlink connector is not built - # as a module. This is required by libcgroup's cgrulesengd. - CONNECTOR y - PROC_EVENTS y - - # Tracing - FTRACE y - FUNCTION_TRACER y - FTRACE_SYSCALLS y - SCHED_TRACER y - - # Devtmpfs support. - DEVTMPFS y - - ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""} - ${extraConfig} - ''; -in - -import ./generic.nix ( - - rec { - version = "3.2.49"; - - modDirVersion = version; - - preConfigure = '' - substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' "" - ''; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "06xiwcgk6hbcp6g1dpmxb95dzx94s29vzmh1pz4lsglcj1yfrkry"; - }; - - config = configWithPlatform stdenv.platform; - configCross = configWithPlatform stdenv.cross.platform; - - features.iwlwifi = true; - } - - // removeAttrs args ["extraConfig"] -) + features.iwlwifi = true; +}) diff --git a/pkgs/os-specific/linux/kernel/linux-3.4.nix b/pkgs/os-specific/linux/kernel/linux-3.4.nix index e02f9bd5b7b..2cb37987ff4 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix @@ -1,271 +1,15 @@ -args @ { stdenv, fetchurl, extraConfig ? "" -, perl, mktemp, module_init_tools -, ... }: +{ stdenv, fetchurl, ... } @ args: -let - configWithPlatform = kernelPlatform : - '' - # Power management and debugging for powertop. - DEBUG_KERNEL y - PM_ADVANCED_DEBUG y - PM_RUNTIME y - TIMER_STATS y - USB_SUSPEND y - BACKTRACE_SELF_TEST n - CPU_NOTIFIER_ERROR_INJECT? n - DEBUG_DEVRES n - DEBUG_NX_TEST n - DEBUG_STACK_USAGE n - DEBUG_STACKOVERFLOW n - RCU_TORTURE_TEST n - SCHEDSTATS n +import ./generic.nix (args // rec { + version = "3.4.55"; - # Support drivers that need external firmware. - STANDALONE n + src = fetchurl { + url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; + sha256 = "1sbb6qa2nb1zwihkdn51q5ac3kn7hrssabn5whx8965hga7yw1dx"; + }; - # Make /proc/config.gz available. - IKCONFIG_PROC y - - # Optimize with -O2, not -Os. - CC_OPTIMIZE_FOR_SIZE n - - # Enable the kernel's built-in memory tester. - MEMTEST y - - # Include the CFQ I/O scheduler in the kernel, rather than as a - # module, so that the initrd gets a good I/O scheduler. - IOSCHED_CFQ y - BLK_CGROUP y # required by CFQ - - # Enable NUMA. - NUMA? y - - # Disable some expensive (?) features. - FTRACE n - KPROBES n - PM_TRACE_RTC n - - # Enable various subsystems. - ACCESSIBILITY y # Accessibility support - AUXDISPLAY y # Auxiliary Display support - DONGLE y # Serial dongle support - HIPPI? y - MTD_COMPLEX_MAPPINGS y # needed for many devices - SCSI_LOWLEVEL y # enable lots of SCSI devices - SCSI_LOWLEVEL_PCMCIA y - SPI y # needed for many devices - SPI_MASTER y - WAN y - - # Networking options. - IP_PNP n - IPV6_PRIVACY y - NETFILTER_ADVANCED y - IP_VS_PROTO_TCP y - IP_VS_PROTO_UDP y - IP_VS_PROTO_ESP y - IP_VS_PROTO_AH y - IP_DCCP_CCID3 n # experimental - CLS_U32_PERF y - CLS_U32_MARK y - - # Wireless networking. - IPW2100_MONITOR y # support promiscuous mode - IPW2200_MONITOR y # support promiscuous mode - HOSTAP_FIRMWARE y # Support downloading firmware images with Host AP driver - HOSTAP_FIRMWARE_NVRAM y - ATH9K_PCI y # Detect Atheros AR9xxx cards on PCI(e) bus - ATH9K_AHB y # Ditto, AHB bus - B43_PHY_HT y - BCMA_HOST_PCI y - - # Some settings to make sure that fbcondecor works - in particular, - # disable tileblitting and the drivers that need it. - - # Enable various FB devices. - FB y - FB_EFI y - FB_NVIDIA_I2C y # Enable DDC Support - FB_RIVA_I2C y - FB_ATY_CT y # Mach64 CT/VT/GT/LT (incl. 3D RAGE) support - FB_ATY_GX y # Mach64 GX support - FB_SAVAGE_I2C y - FB_SAVAGE_ACCEL y - FB_SIS_300 y - FB_SIS_315 y - FB_3DFX_ACCEL y - FB_GEODE y - - # Video configuration - # Enable KMS for devices whose X.org driver supports it. - DRM_I915_KMS y - DRM_RADEON_KMS y - # Hybrid graphics support - VGA_SWITCHEROO y - - # Sound. - SND_AC97_POWER_SAVE y # AC97 Power-Saving Mode - SND_HDA_INPUT_BEEP y # Support digital beep via input layer - SND_USB_CAIAQ_INPUT y - PSS_MIXER y # Enable PSS mixer (Beethoven ADSP-16 and other compatible) - - # USB serial devices. - USB_SERIAL_GENERIC y # USB Generic Serial Driver - USB_SERIAL_KEYSPAN_MPR y # include firmware for various USB serial devices - USB_SERIAL_KEYSPAN_USA28 y - USB_SERIAL_KEYSPAN_USA28X y - USB_SERIAL_KEYSPAN_USA28XA y - USB_SERIAL_KEYSPAN_USA28XB y - USB_SERIAL_KEYSPAN_USA19 y - USB_SERIAL_KEYSPAN_USA18X y - USB_SERIAL_KEYSPAN_USA19W y - USB_SERIAL_KEYSPAN_USA19QW y - USB_SERIAL_KEYSPAN_USA19QI y - USB_SERIAL_KEYSPAN_USA49W y - USB_SERIAL_KEYSPAN_USA49WLC y - - # Filesystem options - in particular, enable extended attributes and - # ACLs for all filesystems that support them. - EXT2_FS_XATTR y # Ext2 extended attributes - EXT2_FS_POSIX_ACL y # Ext2 POSIX Access Control Lists - EXT2_FS_SECURITY y # Ext2 Security Labels - EXT2_FS_XIP y # Ext2 execute in place support - EXT4_FS_POSIX_ACL y - EXT4_FS_SECURITY y - REISERFS_FS_XATTR y - REISERFS_FS_POSIX_ACL y - REISERFS_FS_SECURITY y - JFS_POSIX_ACL y - JFS_SECURITY y - XFS_QUOTA y - XFS_POSIX_ACL y - XFS_RT y # XFS Realtime subvolume support - OCFS2_DEBUG_MASKLOG n - BTRFS_FS_POSIX_ACL y - UBIFS_FS_XATTR y - UBIFS_FS_ADVANCED_COMPR y - NFSD_V2_ACL y - NFSD_V3 y - NFSD_V3_ACL y - NFSD_V4 y - NFS_FSCACHE y - CIFS_XATTR y - CIFS_POSIX y - CIFS_FSCACHE y - - # Security related features. - STRICT_DEVMEM y # Filter access to /dev/mem - SECURITY_SELINUX_BOOTPARAM_VALUE 0 # disable SELinux by default - - # Misc. options. - 8139TOO_8129 y - 8139TOO_PIO n # PIO is slower - AIC79XX_DEBUG_ENABLE n - AIC7XXX_DEBUG_ENABLE n - AIC94XX_DEBUG n - AUDIT_LOGINUID_IMMUTABLE y - B43_PCMCIA y - BLK_DEV_CMD640_ENHANCED y # CMD640 enhanced support - BLK_DEV_IDEACPI y # IDE ACPI support - BLK_DEV_INTEGRITY y - BSD_PROCESS_ACCT_V3 y - BT_HCIUART_BCSP y - BT_HCIUART_H4 y # UART (H4) protocol support - BT_HCIUART_LL y - BT_RFCOMM m - BT_RFCOMM_TTY y # RFCOMM TTY support - CRASH_DUMP n - DMAR? n # experimental - DVB_DYNAMIC_MINORS y # we use udev - EFI_STUB y # EFI bootloader in the bzImage itself - FHANDLE y # used by systemd - FUSION y # Fusion MPT device support - IDE_GD_ATAPI y # ATAPI floppy support - IRDA_ULTRA y # Ultra (connectionless) protocol - JOYSTICK_IFORCE_232 y # I-Force Serial joysticks and wheels - JOYSTICK_IFORCE_USB y # I-Force USB joysticks and wheels - JOYSTICK_XPAD_FF y # X-Box gamepad rumble support - JOYSTICK_XPAD_LEDS y # LED Support for Xbox360 controller 'BigX' LED - LDM_PARTITION y # Windows Logical Disk Manager (Dynamic Disk) support - LEDS_TRIGGER_IDE_DISK y # LED IDE Disk Trigger - LOGIRUMBLEPAD2_FF y # Logitech Rumblepad 2 force feedback - LOGO n # not needed - MEDIA_ATTACH y - MEGARAID_NEWGEN y - MICROCODE_AMD y - MODVERSIONS y - MOUSE_PS2_ELANTECH y # Elantech PS/2 protocol extension - MTRR_SANITIZER y - NET_FC y # Fibre Channel driver support - PPP_MULTILINK y # PPP multilink support - REGULATOR y # Voltage and Current Regulator Support - SCSI_LOGGING y # SCSI logging facility - SERIAL_8250 y # 8250/16550 and compatible serial support - SLIP_COMPRESSED y # CSLIP compressed headers - SLIP_SMART y - THERMAL_HWMON y # Hardware monitoring support - USB_DEBUG n - USB_EHCI_ROOT_HUB_TT y # Root Hub Transaction Translators - USB_EHCI_TT_NEWSCHED y # Improved transaction translator scheduling - X86_CHECK_BIOS_CORRUPTION y - X86_MCE y - - # Linux Containers - RT_GROUP_SCHED? y - CGROUP_DEVICE? y - CGROUP_MEM_RES_CTLR? y - CGROUP_MEM_RES_CTLR_SWAP? y - DEVPTS_MULTIPLE_INSTANCES? y - - # Enable staging drivers. These are somewhat experimental, but - # they generally don't hurt. - STAGING y - - # PROC_EVENTS requires that the netlink connector is not built - # as a module. This is required by libcgroup's cgrulesengd. - CONNECTOR y - PROC_EVENTS y - - # Tracing - FTRACE y - FUNCTION_TRACER y - FTRACE_SYSCALLS y - SCHED_TRACER y - - # Devtmpfs support. - DEVTMPFS y - - # Easier debug of NFS issues - SUNRPC_DEBUG y - - ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""} - ${extraConfig} - ''; -in - -import ./generic.nix ( - - rec { - version = "3.4.55"; - testing = false; - - preConfigure = '' - substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' "" - ''; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "1sbb6qa2nb1zwihkdn51q5ac3kn7hrssabn5whx8965hga7yw1dx"; - }; - - config = configWithPlatform stdenv.platform; - configCross = configWithPlatform stdenv.cross.platform; - - features.iwlwifi = true; - features.efiBootStub = true; - features.needsCifsUtils = true; - features.netfilterRPFilter = true; - } - - // removeAttrs args ["extraConfig"] -) + features.iwlwifi = true; + features.efiBootStub = true; + features.needsCifsUtils = true; + features.netfilterRPFilter = true; +}) diff --git a/pkgs/os-specific/linux/kernel/linux-3.8.nix b/pkgs/os-specific/linux/kernel/linux-3.8.nix index 1516f97521d..f455f4ee7f8 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.8.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.8.nix @@ -1,283 +1,16 @@ -args @ { stdenv, fetchurl, extraConfig ? "" -, perl, mktemp, module_init_tools -, ... }: +{ stdenv, fetchurl, ... } @ args: -let - configWithPlatform = kernelPlatform : - '' - # Power management and debugging for powertop. - DEBUG_KERNEL y - PM_ADVANCED_DEBUG y - PM_RUNTIME y - TIMER_STATS y - USB_SUSPEND y - BACKTRACE_SELF_TEST n - CPU_NOTIFIER_ERROR_INJECT? n - DEBUG_DEVRES n - DEBUG_NX_TEST n - DEBUG_STACK_USAGE n - DEBUG_STACKOVERFLOW n - RCU_TORTURE_TEST n - SCHEDSTATS n +import ./generic.nix (args // rec { + version = "3.8.13"; - # Support drivers that need external firmware. - STANDALONE n + src = fetchurl { + url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; + sha256 = "0pznsj89020fjl8dhcyf7r5bh95b27727gs0ri9has4i2z63blbw"; + }; - # Make /proc/config.gz available. - IKCONFIG_PROC y - - # Optimize with -O2, not -Os. - CC_OPTIMIZE_FOR_SIZE n - - # Enable the kernel's built-in memory tester. - MEMTEST y - - # Include the CFQ I/O scheduler in the kernel, rather than as a - # module, so that the initrd gets a good I/O scheduler. - IOSCHED_CFQ y - BLK_CGROUP y # required by CFQ - - # Enable NUMA. - NUMA? y - - # Disable some expensive (?) features. - FTRACE n - KPROBES n - PM_TRACE_RTC n - - # Enable various subsystems. - ACCESSIBILITY y # Accessibility support - AUXDISPLAY y # Auxiliary Display support - DONGLE y # Serial dongle support - HIPPI? y - MTD_COMPLEX_MAPPINGS y # needed for many devices - SCSI_LOWLEVEL y # enable lots of SCSI devices - SCSI_LOWLEVEL_PCMCIA y - SPI y # needed for many devices - SPI_MASTER y - WAN y - - # Networking options. - IP_PNP n - IPV6_PRIVACY y - NETFILTER_ADVANCED y - IP_VS_PROTO_TCP y - IP_VS_PROTO_UDP y - IP_VS_PROTO_ESP y - IP_VS_PROTO_AH y - IP_DCCP_CCID3 n # experimental - CLS_U32_PERF y - CLS_U32_MARK y - - # Wireless networking. - IPW2100_MONITOR y # support promiscuous mode - IPW2200_MONITOR? y # support promiscuous mode - HOSTAP_FIRMWARE y # Support downloading firmware images with Host AP driver - HOSTAP_FIRMWARE_NVRAM y - ATH9K_PCI y # Detect Atheros AR9xxx cards on PCI(e) bus - ATH9K_AHB y # Ditto, AHB bus - B43_PHY_HT y - BCMA_HOST_PCI y - CFG80211_WEXT y # Without it, ipw2200 drivers don't build - - # Some settings to make sure that fbcondecor works - in particular, - # disable tileblitting and the drivers that need it. - - # Enable various FB devices. - FB y - FB_EFI y - FB_NVIDIA_I2C y # Enable DDC Support - FB_RIVA_I2C y - FB_ATY_CT y # Mach64 CT/VT/GT/LT (incl. 3D RAGE) support - FB_ATY_GX y # Mach64 GX support - FB_SAVAGE_I2C y - FB_SAVAGE_ACCEL y - FB_SIS_300 y - FB_SIS_315 y - FB_3DFX_ACCEL y - FB_GEODE y - - # Video configuration - # Enable KMS for devices whose X.org driver supports it. - DRM_I915_KMS y - DRM_RADEON_KMS y - # Hybrid graphics support - VGA_SWITCHEROO y - - # Sound. - SND_AC97_POWER_SAVE y # AC97 Power-Saving Mode - SND_HDA_INPUT_BEEP y # Support digital beep via input layer - SND_USB_CAIAQ_INPUT y - PSS_MIXER y # Enable PSS mixer (Beethoven ADSP-16 and other compatible) - - # USB serial devices. - USB_SERIAL_GENERIC y # USB Generic Serial Driver - USB_SERIAL_KEYSPAN_MPR y # include firmware for various USB serial devices - USB_SERIAL_KEYSPAN_USA28 y - USB_SERIAL_KEYSPAN_USA28X y - USB_SERIAL_KEYSPAN_USA28XA y - USB_SERIAL_KEYSPAN_USA28XB y - USB_SERIAL_KEYSPAN_USA19 y - USB_SERIAL_KEYSPAN_USA18X y - USB_SERIAL_KEYSPAN_USA19W y - USB_SERIAL_KEYSPAN_USA19QW y - USB_SERIAL_KEYSPAN_USA19QI y - USB_SERIAL_KEYSPAN_USA49W y - USB_SERIAL_KEYSPAN_USA49WLC y - - # Filesystem options - in particular, enable extended attributes and - # ACLs for all filesystems that support them. - EXT2_FS_XATTR y # Ext2 extended attributes - EXT2_FS_POSIX_ACL y # Ext2 POSIX Access Control Lists - EXT2_FS_SECURITY y # Ext2 Security Labels - EXT2_FS_XIP y # Ext2 execute in place support - EXT4_FS_POSIX_ACL y - EXT4_FS_SECURITY y - REISERFS_FS_XATTR y - REISERFS_FS_POSIX_ACL y - REISERFS_FS_SECURITY y - JFS_POSIX_ACL y - JFS_SECURITY y - XFS_QUOTA y - XFS_POSIX_ACL y - XFS_RT y # XFS Realtime subvolume support - OCFS2_DEBUG_MASKLOG n - BTRFS_FS_POSIX_ACL y - UBIFS_FS_XATTR? y - UBIFS_FS_ADVANCED_COMPR y - NFSD_V2_ACL y - NFSD_V3 y - NFSD_V3_ACL y - NFSD_V4 y - NFS_FSCACHE y - CIFS_XATTR y - CIFS_POSIX y - CIFS_FSCACHE y - - # Security related features. - STRICT_DEVMEM y # Filter access to /dev/mem - SECURITY_SELINUX_BOOTPARAM_VALUE 0 # disable SELinux by default - - # Misc. options. - 8139TOO_8129 y - 8139TOO_PIO n # PIO is slower - AIC79XX_DEBUG_ENABLE n - AIC7XXX_DEBUG_ENABLE n - AIC94XX_DEBUG n - AUDIT_LOGINUID_IMMUTABLE y - B43_PCMCIA y - BLK_DEV_CMD640_ENHANCED y # CMD640 enhanced support - BLK_DEV_IDEACPI y # IDE ACPI support - BLK_DEV_INTEGRITY y - BSD_PROCESS_ACCT_V3 y - BT_HCIUART_BCSP y - BT_HCIUART_H4 y # UART (H4) protocol support - BT_HCIUART_LL y - BT_RFCOMM m - BT_RFCOMM_TTY y # RFCOMM TTY support - CRASH_DUMP n - DMAR? n # experimental - DVB_DYNAMIC_MINORS? y # we use udev - EFI_STUB y # EFI bootloader in the bzImage itself - FHANDLE y # used by systemd - FUSION y # Fusion MPT device support - IDE_GD_ATAPI y # ATAPI floppy support - IRDA_ULTRA y # Ultra (connectionless) protocol - JOYSTICK_IFORCE_232 y # I-Force Serial joysticks and wheels - JOYSTICK_IFORCE_USB y # I-Force USB joysticks and wheels - JOYSTICK_XPAD_FF y # X-Box gamepad rumble support - JOYSTICK_XPAD_LEDS y # LED Support for Xbox360 controller 'BigX' LED - LDM_PARTITION y # Windows Logical Disk Manager (Dynamic Disk) support - LEDS_TRIGGER_IDE_DISK y # LED IDE Disk Trigger - LOGIRUMBLEPAD2_FF y # Logitech Rumblepad 2 force feedback - LOGO n # not needed - MEDIA_ATTACH? y - MEGARAID_NEWGEN y - MICROCODE_AMD y - MODVERSIONS y - MOUSE_PS2_ELANTECH y # Elantech PS/2 protocol extension - MTRR_SANITIZER y - NET_FC y # Fibre Channel driver support - PPP_MULTILINK y # PPP multilink support - REGULATOR y # Voltage and Current Regulator Support - RC_DEVICES y # Enable IR devices - SCSI_LOGGING y # SCSI logging facility - SERIAL_8250 y # 8250/16550 and compatible serial support - SLIP_COMPRESSED y # CSLIP compressed headers - SLIP_SMART y - THERMAL_HWMON y # Hardware monitoring support - USB_DEBUG n - USB_EHCI_ROOT_HUB_TT y # Root Hub Transaction Translators - USB_EHCI_TT_NEWSCHED y # Improved transaction translator scheduling - X86_CHECK_BIOS_CORRUPTION y - X86_MCE y - XEN_DOM0 y - - # Linux Containers - RT_GROUP_SCHED? y - CGROUP_DEVICE? y - MEMCG? y - MEMCG_SWAP? y - DEVPTS_MULTIPLE_INSTANCES? y - - # Enable staging drivers. These are somewhat experimental, but - # they generally don't hurt. - STAGING y - - # PROC_EVENTS requires that the netlink connector is not built - # as a module. This is required by libcgroup's cgrulesengd. - CONNECTOR y - PROC_EVENTS y - - # Tracing - FTRACE y - FUNCTION_TRACER y - FTRACE_SYSCALLS y - SCHED_TRACER y - - # Devtmpfs support. - DEVTMPFS y - - # Media support - MEDIA_SUPPORT y - MEDIA_DIGITAL_TV_SUPPORT y - - MEDIA_CAMERA_SUPPORT? y - MEDIA_RC_SUPPORT? y - MEDIA_USB_SUPPORT y - - # Easier debug of NFS issues - SUNRPC_DEBUG y - - ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""} - ${extraConfig} - ''; -in - -import ./generic.nix ( - - rec { - version = "3.8.13"; - testing = false; - - preConfigure = '' - substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' "" - ''; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "0pznsj89020fjl8dhcyf7r5bh95b27727gs0ri9has4i2z63blbw"; - }; - - config = configWithPlatform stdenv.platform; - configCross = configWithPlatform stdenv.cross.platform; - - features.iwlwifi = true; - features.efiBootStub = true; - features.needsCifsUtils = true; - features.canDisableNetfilterConntrackHelpers = true; - features.netfilterRPFilter = true; - } - - // removeAttrs args ["extraConfig"] -) + features.iwlwifi = true; + features.efiBootStub = true; + features.needsCifsUtils = true; + features.canDisableNetfilterConntrackHelpers = true; + features.netfilterRPFilter = true; +}) diff --git a/pkgs/os-specific/linux/kernel/linux-3.9.nix b/pkgs/os-specific/linux/kernel/linux-3.9.nix index b3909900c66..51bcf35b3fe 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.9.nix @@ -1,286 +1,16 @@ -args @ { stdenv, fetchurl, extraConfig ? "" -, perl, mktemp, module_init_tools, bc -, ... }: +{ stdenv, fetchurl, ... } @ args: -let - configWithPlatform = kernelPlatform : - '' - # Power management and debugging for powertop. - DEBUG_KERNEL y - PM_ADVANCED_DEBUG y - PM_RUNTIME y - TIMER_STATS y - USB_SUSPEND y - BACKTRACE_SELF_TEST n - CPU_NOTIFIER_ERROR_INJECT? n - DEBUG_DEVRES n - DEBUG_NX_TEST n - DEBUG_STACK_USAGE n - DEBUG_STACKOVERFLOW n - RCU_TORTURE_TEST n - SCHEDSTATS n +import ./generic.nix (args // rec { + version = "3.9.11"; - # Support drivers that need external firmware. - STANDALONE n + src = fetchurl { + url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; + sha256 = "0d5j7kg1ifzwipicbi4g26plzbzn1rlvgj1hs4zip6sxj8ifbffl"; + }; - # Make /proc/config.gz available. - IKCONFIG_PROC y - - # Optimize with -O2, not -Os. - CC_OPTIMIZE_FOR_SIZE n - - # Enable the kernel's built-in memory tester. - MEMTEST y - - # Include the CFQ I/O scheduler in the kernel, rather than as a - # module, so that the initrd gets a good I/O scheduler. - IOSCHED_CFQ y - BLK_CGROUP y # required by CFQ - - # Enable NUMA. - NUMA? y - - # Disable some expensive (?) features. - FTRACE n - KPROBES n - PM_TRACE_RTC n - - # Enable various subsystems. - ACCESSIBILITY y # Accessibility support - AUXDISPLAY y # Auxiliary Display support - DONGLE y # Serial dongle support - HIPPI? y - MTD_COMPLEX_MAPPINGS y # needed for many devices - SCSI_LOWLEVEL y # enable lots of SCSI devices - SCSI_LOWLEVEL_PCMCIA y - SPI y # needed for many devices - SPI_MASTER y - WAN y - - # Networking options. - IP_PNP n - IPV6_PRIVACY y - NETFILTER_ADVANCED y - IP_VS_PROTO_TCP y - IP_VS_PROTO_UDP y - IP_VS_PROTO_ESP y - IP_VS_PROTO_AH y - IP_DCCP_CCID3 n # experimental - CLS_U32_PERF y - CLS_U32_MARK y - - # Wireless networking. - IPW2100_MONITOR y # support promiscuous mode - IPW2200_MONITOR? y # support promiscuous mode - HOSTAP_FIRMWARE y # Support downloading firmware images with Host AP driver - HOSTAP_FIRMWARE_NVRAM y - ATH9K_PCI y # Detect Atheros AR9xxx cards on PCI(e) bus - ATH9K_AHB y # Ditto, AHB bus - B43_PHY_HT y - BCMA_HOST_PCI y - CFG80211_WEXT y # Without it, ipw2200 drivers don't build - - # Some settings to make sure that fbcondecor works - in particular, - # disable tileblitting and the drivers that need it. - - # Enable various FB devices. - FB y - FB_EFI y - FB_NVIDIA_I2C y # Enable DDC Support - FB_RIVA_I2C y - FB_ATY_CT y # Mach64 CT/VT/GT/LT (incl. 3D RAGE) support - FB_ATY_GX y # Mach64 GX support - FB_SAVAGE_I2C y - FB_SAVAGE_ACCEL y - FB_SIS_300 y - FB_SIS_315 y - FB_3DFX_ACCEL y - FB_GEODE y - - # Video configuration - # Enable KMS for devices whose X.org driver supports it. - DRM_I915_KMS y - DRM_RADEON_KMS? y - # Hybrid graphics support - VGA_SWITCHEROO y - - # Sound. - SND_AC97_POWER_SAVE y # AC97 Power-Saving Mode - SND_HDA_INPUT_BEEP y # Support digital beep via input layer - SND_USB_CAIAQ_INPUT y - PSS_MIXER y # Enable PSS mixer (Beethoven ADSP-16 and other compatible) - - # USB serial devices. - USB_SERIAL_GENERIC y # USB Generic Serial Driver - USB_SERIAL_KEYSPAN_MPR y # include firmware for various USB serial devices - USB_SERIAL_KEYSPAN_USA28 y - USB_SERIAL_KEYSPAN_USA28X y - USB_SERIAL_KEYSPAN_USA28XA y - USB_SERIAL_KEYSPAN_USA28XB y - USB_SERIAL_KEYSPAN_USA19 y - USB_SERIAL_KEYSPAN_USA18X y - USB_SERIAL_KEYSPAN_USA19W y - USB_SERIAL_KEYSPAN_USA19QW y - USB_SERIAL_KEYSPAN_USA19QI y - USB_SERIAL_KEYSPAN_USA49W y - USB_SERIAL_KEYSPAN_USA49WLC y - - # Filesystem options - in particular, enable extended attributes and - # ACLs for all filesystems that support them. - EXT2_FS_XATTR y # Ext2 extended attributes - EXT2_FS_POSIX_ACL y # Ext2 POSIX Access Control Lists - EXT2_FS_SECURITY y # Ext2 Security Labels - EXT2_FS_XIP y # Ext2 execute in place support - EXT4_FS_POSIX_ACL y - EXT4_FS_SECURITY y - REISERFS_FS_XATTR y - REISERFS_FS_POSIX_ACL y - REISERFS_FS_SECURITY y - JFS_POSIX_ACL y - JFS_SECURITY y - XFS_QUOTA y - XFS_POSIX_ACL y - XFS_RT y # XFS Realtime subvolume support - OCFS2_DEBUG_MASKLOG n - BTRFS_FS_POSIX_ACL y - UBIFS_FS_XATTR? y - UBIFS_FS_ADVANCED_COMPR y - NFSD_V2_ACL y - NFSD_V3 y - NFSD_V3_ACL y - NFSD_V4 y - NFS_FSCACHE y - CIFS_XATTR y - CIFS_POSIX y - CIFS_FSCACHE y - - # Security related features. - STRICT_DEVMEM y # Filter access to /dev/mem - SECURITY_SELINUX_BOOTPARAM_VALUE 0 # disable SELinux by default - - # Misc. options. - 8139TOO_8129 y - 8139TOO_PIO n # PIO is slower - AIC79XX_DEBUG_ENABLE n - AIC7XXX_DEBUG_ENABLE n - AIC94XX_DEBUG n - AUDIT_LOGINUID_IMMUTABLE y - B43_PCMCIA y - BLK_DEV_CMD640_ENHANCED y # CMD640 enhanced support - BLK_DEV_IDEACPI y # IDE ACPI support - BLK_DEV_INTEGRITY y - BSD_PROCESS_ACCT_V3 y - BT_HCIUART_BCSP y - BT_HCIUART_H4 y # UART (H4) protocol support - BT_HCIUART_LL y - BT_RFCOMM m - BT_RFCOMM_TTY y # RFCOMM TTY support - CRASH_DUMP n - DMAR? n # experimental - DVB_DYNAMIC_MINORS? y # we use udev - EFI_STUB y # EFI bootloader in the bzImage itself - FHANDLE y # used by systemd - FUSION y # Fusion MPT device support - IDE_GD_ATAPI y # ATAPI floppy support - IRDA_ULTRA y # Ultra (connectionless) protocol - JOYSTICK_IFORCE_232 y # I-Force Serial joysticks and wheels - JOYSTICK_IFORCE_USB y # I-Force USB joysticks and wheels - JOYSTICK_XPAD_FF y # X-Box gamepad rumble support - JOYSTICK_XPAD_LEDS y # LED Support for Xbox360 controller 'BigX' LED - LDM_PARTITION y # Windows Logical Disk Manager (Dynamic Disk) support - LEDS_TRIGGER_IDE_DISK y # LED IDE Disk Trigger - LOGIRUMBLEPAD2_FF y # Logitech Rumblepad 2 force feedback - LOGO n # not needed - MEDIA_ATTACH? y - MEGARAID_NEWGEN y - MICROCODE_AMD y - MODVERSIONS y - MOUSE_PS2_ELANTECH y # Elantech PS/2 protocol extension - MTRR_SANITIZER y - NET_FC y # Fibre Channel driver support - PPP_MULTILINK y # PPP multilink support - REGULATOR y # Voltage and Current Regulator Support - RC_DEVICES y # Enable IR devices - SCSI_LOGGING y # SCSI logging facility - SERIAL_8250 y # 8250/16550 and compatible serial support - SLIP_COMPRESSED y # CSLIP compressed headers - SLIP_SMART y - THERMAL_HWMON y # Hardware monitoring support - USB_DEBUG n - USB_EHCI_ROOT_HUB_TT y # Root Hub Transaction Translators - USB_EHCI_TT_NEWSCHED y # Improved transaction translator scheduling - X86_CHECK_BIOS_CORRUPTION y - X86_MCE y - XEN_DOM0 y - - # Linux Containers - RT_GROUP_SCHED? y - CGROUP_DEVICE? y - MEMCG? y - MEMCG_SWAP? y - DEVPTS_MULTIPLE_INSTANCES? y - - # Enable staging drivers. These are somewhat experimental, but - # they generally don't hurt. - STAGING y - - # PROC_EVENTS requires that the netlink connector is not built - # as a module. This is required by libcgroup's cgrulesengd. - CONNECTOR y - PROC_EVENTS y - - # Tracing - FTRACE y - FUNCTION_TRACER y - FTRACE_SYSCALLS y - SCHED_TRACER y - - # Devtmpfs support. - DEVTMPFS y - - # Media support - MEDIA_CAMERA_SUPPORT? y - MEDIA_RC_SUPPORT? y - MEDIA_USB_SUPPORT y - - # Easier debug of NFS issues - SUNRPC_DEBUG y - - # Enable the 9P cache to speed up NixOS VM tests. - 9P_FSCACHE y - 9P_FS_POSIX_ACL y - - ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""} - ${extraConfig} - ''; -in - -import ./generic.nix ( - - rec { - version = "3.9.10"; - testing = false; - - preConfigure = '' - substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' "" - ''; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "1c187jmdkz6nqfgf4sz9f4da6wzbn2mf99qcjr56nz8sr2zmk2wv"; - }; - - config = configWithPlatform stdenv.platform; - configCross = configWithPlatform stdenv.cross.platform; - - features.iwlwifi = true; - features.efiBootStub = true; - features.needsCifsUtils = true; - features.canDisableNetfilterConntrackHelpers = true; - features.netfilterRPFilter = true; - - extraNativeBuildInputs = [bc]; - } - - // removeAttrs args ["extraConfig"] -) + features.iwlwifi = true; + features.efiBootStub = true; + features.needsCifsUtils = true; + features.canDisableNetfilterConntrackHelpers = true; + features.netfilterRPFilter = true; +}) 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 cf88544abd5..319c2ba42b4 100644 --- a/pkgs/os-specific/linux/kernel/linux-rpi-3.6.nix +++ b/pkgs/os-specific/linux/kernel/linux-rpi-3.6.nix @@ -1,44 +1,17 @@ -args @ { - stdenv, fetchurl, extraConfig ? "" , perl, mktemp, module_init_tools, ... -}: +{ stdenv, fetchurl, ... } @ args: -let - configWithPlatform = kernelPlatform : - '' - ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""} - ${extraConfig} - ''; +let rev = "91a3be5b2b"; in - rev = "91a3be5b2b"; -in +import ./generic.nix (args // rec { + version = "3.6.y-${rev}"; -import ./generic.nix ( + src = fetchurl { + url = "https://api.github.com/repos/raspberrypi/linux/tarball/${rev}"; + name = "linux-raspberrypi-${version}.tar.gz"; + sha256 = "04370b1da7610622372940decdc13ddbba2a58c9da3c3bd3e7df930a399f140d"; + }; - rec { - version = "3.6.y-${rev}"; - testing = false; + features.iwlwifi = true; - preConfigure = '' - substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' "" - ''; - - src = fetchurl { - url = "https://api.github.com/repos/raspberrypi/linux/tarball/${rev}"; - name = "linux-raspberrypi-${version}.tar.gz"; - sha256 = "04370b1da7610622372940decdc13ddbba2a58c9da3c3bd3e7df930a399f140d"; - }; - - config = configWithPlatform stdenv.platform; - configCross = configWithPlatform stdenv.cross.platform; - - features.iwlwifi = true; - #features.efiBootStub = true; - #features.needsCifsUtils = true; - #features.canDisableNetfilterConntrackHelpers = true; - #features.netfilterRPFilter = true; - - extraMeta.platforms = []; - } - - // removeAttrs args ["extraConfig"] -) + extraMeta.platforms = []; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 54f4dbf72ab..8e599a83a11 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6370,7 +6370,7 @@ let kernelPatches = callPackage ../os-specific/linux/kernel/patches.nix { }; linux_3_0 = makeOverridable (import ../os-specific/linux/kernel/linux-3.0.nix) { - inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; + inherit fetchurl stdenv perl mktemp bc module_init_tools ubootChooser; kernelPatches = [ kernelPatches.sec_perm_2_6_24 # kernelPatches.aufs3_0 @@ -6378,7 +6378,7 @@ let }; linux_3_2 = makeOverridable (import ../os-specific/linux/kernel/linux-3.2.nix) { - inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; + inherit fetchurl stdenv perl mktemp bc module_init_tools ubootChooser; kernelPatches = [ kernelPatches.sec_perm_2_6_24 # kernelPatches.aufs3_2 @@ -6405,7 +6405,7 @@ let }); linux_3_4 = makeOverridable (import ../os-specific/linux/kernel/linux-3.4.nix) { - inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; + inherit fetchurl stdenv perl mktemp bc module_init_tools ubootChooser; kernelPatches = [ kernelPatches.sec_perm_2_6_24 # kernelPatches.aufs3_4 @@ -6424,11 +6424,11 @@ let }); linux_3_6_rpi = makeOverridable (import ../os-specific/linux/kernel/linux-rpi-3.6.nix) { - inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; + inherit fetchurl stdenv perl mktemp bc module_init_tools ubootChooser; }; linux_3_8 = makeOverridable (import ../os-specific/linux/kernel/linux-3.8.nix) { - inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; + inherit fetchurl stdenv perl mktemp bc module_init_tools ubootChooser; kernelPatches = [ kernelPatches.sec_perm_2_6_24 From e1a7be4294f2bac112fa918a2cbf1dd5f0956c6c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 1 Aug 2013 00:02:00 +0200 Subject: [PATCH 777/798] iwlwifi4965ucodeV1: Remove This is verrrry obsolete. --- .../firmware/iwlwifi-4965-ucode/default.nix | 36 ------------------- pkgs/top-level/all-packages.nix | 8 +---- 2 files changed, 1 insertion(+), 43 deletions(-) delete mode 100644 pkgs/os-specific/linux/firmware/iwlwifi-4965-ucode/default.nix diff --git a/pkgs/os-specific/linux/firmware/iwlwifi-4965-ucode/default.nix b/pkgs/os-specific/linux/firmware/iwlwifi-4965-ucode/default.nix deleted file mode 100644 index 266c7795d23..00000000000 --- a/pkgs/os-specific/linux/firmware/iwlwifi-4965-ucode/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{stdenv, fetchurl}: - -stdenv.mkDerivation rec { - name = "iwlwifi-4965-ucode-228.57.1.21"; - - src = fetchurl { - url = "wireless.kernel.org/en/users/Drivers/iwlegacy?action=AttachFile&do=get&target=${name}.tgz"; - name = "${name}.tgz"; - sha256 = "1rry0kpzszxk60h5gb94advzi009010xb332iyvfpaiwbj6aiyas"; - }; - - buildPhase = "true"; - - installPhase = '' - mkdir -p "$out" - chmod -x * - cp * "$out" - - # The driver expects the `-1' in the file name. - cd "$out" - ln -s iwlwifi-4965.ucode iwlwifi-4965-1.ucode - ''; - - meta = { - description = "Firmware for the Intel 4965ABG wireless card"; - - longDescription = '' - This package provides version 2 of the Intel wireless card - firmware, for Linux up to 2.6.26. It contains the - `iwlwifi-4965-1.ucode' file, which is loaded by the `iw4965' - driver found in recent kernels. - ''; - - homepage = http://intellinuxwireless.org/; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8e599a83a11..f3ced7dbc39 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6313,8 +6313,6 @@ let iwlwifi3945ucode = callPackage ../os-specific/linux/firmware/iwlwifi-3945-ucode { }; - iwlwifi4965ucodeV1 = callPackage ../os-specific/linux/firmware/iwlwifi-4965-ucode { }; - iwlwifi4965ucodeV2 = callPackage ../os-specific/linux/firmware/iwlwifi-4965-ucode/version-2.nix { }; iwlwifi5000ucode = callPackage ../os-specific/linux/firmware/iwlwifi-5000-ucode { }; @@ -6510,11 +6508,7 @@ let iwlwifi = callPackage ../os-specific/linux/iwlwifi { }; - iwlwifi4965ucode = - if builtins.compareVersions self.kernel.version "2.6.27" == 0 - || builtins.compareVersions self.kernel.version "2.6.27" == 1 - then iwlwifi4965ucodeV2 - else iwlwifi4965ucodeV1; + iwlwifi4965ucode = iwlwifi4965ucodeV2; atheros = callPackage ../os-specific/linux/atheros/0.9.4.nix { }; From bc8186be1e02f7f63916a8d158890f9e21a0773b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 1 Aug 2013 00:08:44 +0200 Subject: [PATCH 778/798] linux: Disable /dev/kmem See e.g. https://wiki.ubuntu.com/Security/Features#A.2BAC8-dev.2BAC8-kmem_disabled --- pkgs/os-specific/linux/kernel/common-config.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 4b19cd2aa2a..2e64dae23fe 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -163,7 +163,8 @@ with stdenv.lib; # Security related features. STRICT_DEVMEM y # Filter access to /dev/mem - SECURITY_SELINUX_BOOTPARAM_VALUE 0 # disable SELinux by default + SECURITY_SELINUX_BOOTPARAM_VALUE 0 # Disable SELinux by default + DEVKMEM n # Disable /dev/kmem # Misc. options. 8139TOO_8129 y From 956d71f8432f9f7b073aaf19d51cf6e3d02ed691 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 1 Aug 2013 00:14:07 +0200 Subject: [PATCH 779/798] linux: Remove some unused patches --- .../linux/kernel/guruplug-defconfig.patch | 2714 ----------------- .../linux/kernel/guruplug-mach-type.patch | 15 - pkgs/os-specific/linux/kernel/patches.nix | 15 - 3 files changed, 2744 deletions(-) delete mode 100644 pkgs/os-specific/linux/kernel/guruplug-defconfig.patch delete mode 100644 pkgs/os-specific/linux/kernel/guruplug-mach-type.patch diff --git a/pkgs/os-specific/linux/kernel/guruplug-defconfig.patch b/pkgs/os-specific/linux/kernel/guruplug-defconfig.patch deleted file mode 100644 index add982951ad..00000000000 --- a/pkgs/os-specific/linux/kernel/guruplug-defconfig.patch +++ /dev/null @@ -1,2714 +0,0 @@ -From 4b82fc0ee759b81c92d33ba4e3dd7bd5f66cc0d6 Mon Sep 17 00:00:00 2001 -From: Siddarth Gore -Date: Mon, 29 Mar 2010 11:00:06 +0530 -Subject: [PATCH] Initial defconfig - -Signed-off-by: Siddarth Gore ---- - arch/arm/configs/guruplug_defconfig | 2694 +++++++++++++++++++++++++++++++++++ - 1 files changed, 2694 insertions(+), 0 deletions(-) - create mode 100644 arch/arm/configs/guruplug_defconfig - -diff --git a/arch/arm/configs/guruplug_defconfig b/arch/arm/configs/guruplug_defconfig -new file mode 100644 -index 0000000..5c164ce ---- /dev/null -+++ b/arch/arm/configs/guruplug_defconfig -@@ -0,0 +1,2694 @@ -+# -+# Automatically generated make config: don't edit -+# Linux kernel version: 2.6.33.2 -+# Thu Apr 22 14:31:17 2010 -+# -+CONFIG_ARM=y -+CONFIG_SYS_SUPPORTS_APM_EMULATION=y -+CONFIG_GENERIC_GPIO=y -+CONFIG_GENERIC_TIME=y -+CONFIG_GENERIC_CLOCKEVENTS=y -+CONFIG_GENERIC_HARDIRQS=y -+CONFIG_STACKTRACE_SUPPORT=y -+CONFIG_HAVE_LATENCYTOP_SUPPORT=y -+CONFIG_LOCKDEP_SUPPORT=y -+CONFIG_TRACE_IRQFLAGS_SUPPORT=y -+CONFIG_HARDIRQS_SW_RESEND=y -+CONFIG_GENERIC_IRQ_PROBE=y -+CONFIG_RWSEM_GENERIC_SPINLOCK=y -+CONFIG_GENERIC_HWEIGHT=y -+CONFIG_GENERIC_CALIBRATE_DELAY=y -+CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y -+CONFIG_VECTORS_BASE=0xffff0000 -+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" -+CONFIG_CONSTRUCTORS=y -+ -+# -+# General setup -+# -+CONFIG_EXPERIMENTAL=y -+CONFIG_BROKEN_ON_SMP=y -+CONFIG_LOCK_KERNEL=y -+CONFIG_INIT_ENV_ARG_LIMIT=32 -+CONFIG_LOCALVERSION="" -+CONFIG_LOCALVERSION_AUTO=y -+CONFIG_HAVE_KERNEL_GZIP=y -+CONFIG_HAVE_KERNEL_LZO=y -+CONFIG_KERNEL_GZIP=y -+# CONFIG_KERNEL_BZIP2 is not set -+# CONFIG_KERNEL_LZMA is not set -+# CONFIG_KERNEL_LZO is not set -+CONFIG_SWAP=y -+CONFIG_SYSVIPC=y -+CONFIG_SYSVIPC_SYSCTL=y -+# CONFIG_POSIX_MQUEUE is not set -+# CONFIG_BSD_PROCESS_ACCT is not set -+# CONFIG_TASKSTATS is not set -+# CONFIG_AUDIT is not set -+ -+# -+# RCU Subsystem -+# -+CONFIG_TREE_RCU=y -+# CONFIG_TREE_PREEMPT_RCU is not set -+# CONFIG_TINY_RCU is not set -+# CONFIG_RCU_TRACE is not set -+CONFIG_RCU_FANOUT=32 -+# CONFIG_RCU_FANOUT_EXACT is not set -+# CONFIG_TREE_RCU_TRACE is not set -+CONFIG_IKCONFIG=y -+CONFIG_IKCONFIG_PROC=y -+CONFIG_LOG_BUF_SHIFT=19 -+# CONFIG_GROUP_SCHED is not set -+# CONFIG_CGROUPS is not set -+# CONFIG_SYSFS_DEPRECATED_V2 is not set -+# CONFIG_RELAY is not set -+CONFIG_NAMESPACES=y -+# CONFIG_UTS_NS is not set -+# CONFIG_IPC_NS is not set -+# CONFIG_USER_NS is not set -+# CONFIG_PID_NS is not set -+# CONFIG_NET_NS is not set -+CONFIG_BLK_DEV_INITRD=y -+CONFIG_INITRAMFS_SOURCE="" -+CONFIG_RD_GZIP=y -+CONFIG_RD_BZIP2=y -+CONFIG_RD_LZMA=y -+CONFIG_RD_LZO=y -+CONFIG_CC_OPTIMIZE_FOR_SIZE=y -+CONFIG_SYSCTL=y -+CONFIG_ANON_INODES=y -+# CONFIG_EMBEDDED is not set -+CONFIG_UID16=y -+CONFIG_SYSCTL_SYSCALL=y -+CONFIG_KALLSYMS=y -+# CONFIG_KALLSYMS_ALL is not set -+# CONFIG_KALLSYMS_EXTRA_PASS is not set -+CONFIG_HOTPLUG=y -+CONFIG_PRINTK=y -+CONFIG_BUG=y -+CONFIG_ELF_CORE=y -+CONFIG_BASE_FULL=y -+CONFIG_FUTEX=y -+CONFIG_EPOLL=y -+CONFIG_SIGNALFD=y -+CONFIG_TIMERFD=y -+CONFIG_EVENTFD=y -+CONFIG_SHMEM=y -+CONFIG_AIO=y -+ -+# -+# Kernel Performance Events And Counters -+# -+CONFIG_VM_EVENT_COUNTERS=y -+CONFIG_PCI_QUIRKS=y -+CONFIG_SLUB_DEBUG=y -+CONFIG_COMPAT_BRK=y -+# CONFIG_SLAB is not set -+CONFIG_SLUB=y -+# CONFIG_SLOB is not set -+CONFIG_PROFILING=y -+CONFIG_OPROFILE=y -+CONFIG_HAVE_OPROFILE=y -+CONFIG_KPROBES=y -+CONFIG_KRETPROBES=y -+CONFIG_HAVE_KPROBES=y -+CONFIG_HAVE_KRETPROBES=y -+ -+# -+# GCOV-based kernel profiling -+# -+# CONFIG_GCOV_KERNEL is not set -+CONFIG_SLOW_WORK=y -+# CONFIG_SLOW_WORK_DEBUG is not set -+CONFIG_HAVE_GENERIC_DMA_COHERENT=y -+CONFIG_SLABINFO=y -+CONFIG_RT_MUTEXES=y -+CONFIG_BASE_SMALL=0 -+CONFIG_MODULES=y -+# CONFIG_MODULE_FORCE_LOAD is not set -+CONFIG_MODULE_UNLOAD=y -+# CONFIG_MODULE_FORCE_UNLOAD is not set -+# CONFIG_MODVERSIONS is not set -+# CONFIG_MODULE_SRCVERSION_ALL is not set -+CONFIG_BLOCK=y -+CONFIG_LBDAF=y -+# CONFIG_BLK_DEV_BSG is not set -+# CONFIG_BLK_DEV_INTEGRITY is not set -+ -+# -+# IO Schedulers -+# -+CONFIG_IOSCHED_NOOP=y -+CONFIG_IOSCHED_DEADLINE=y -+CONFIG_IOSCHED_CFQ=y -+# CONFIG_DEFAULT_DEADLINE is not set -+CONFIG_DEFAULT_CFQ=y -+# CONFIG_DEFAULT_NOOP is not set -+CONFIG_DEFAULT_IOSCHED="cfq" -+# CONFIG_INLINE_SPIN_TRYLOCK is not set -+# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set -+# CONFIG_INLINE_SPIN_LOCK is not set -+# CONFIG_INLINE_SPIN_LOCK_BH is not set -+# CONFIG_INLINE_SPIN_LOCK_IRQ is not set -+# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set -+# CONFIG_INLINE_SPIN_UNLOCK is not set -+# CONFIG_INLINE_SPIN_UNLOCK_BH is not set -+# CONFIG_INLINE_SPIN_UNLOCK_IRQ is not set -+# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set -+# CONFIG_INLINE_READ_TRYLOCK is not set -+# CONFIG_INLINE_READ_LOCK is not set -+# CONFIG_INLINE_READ_LOCK_BH is not set -+# CONFIG_INLINE_READ_LOCK_IRQ is not set -+# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set -+# CONFIG_INLINE_READ_UNLOCK is not set -+# CONFIG_INLINE_READ_UNLOCK_BH is not set -+# CONFIG_INLINE_READ_UNLOCK_IRQ is not set -+# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set -+# CONFIG_INLINE_WRITE_TRYLOCK is not set -+# CONFIG_INLINE_WRITE_LOCK is not set -+# CONFIG_INLINE_WRITE_LOCK_BH is not set -+# CONFIG_INLINE_WRITE_LOCK_IRQ is not set -+# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set -+# CONFIG_INLINE_WRITE_UNLOCK is not set -+# CONFIG_INLINE_WRITE_UNLOCK_BH is not set -+# CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set -+# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set -+# CONFIG_MUTEX_SPIN_ON_OWNER is not set -+CONFIG_FREEZER=y -+ -+# -+# System Type -+# -+CONFIG_MMU=y -+# CONFIG_ARCH_AAEC2000 is not set -+# CONFIG_ARCH_INTEGRATOR is not set -+# CONFIG_ARCH_REALVIEW is not set -+# CONFIG_ARCH_VERSATILE is not set -+# CONFIG_ARCH_AT91 is not set -+# CONFIG_ARCH_CLPS711X is not set -+# CONFIG_ARCH_GEMINI is not set -+# CONFIG_ARCH_EBSA110 is not set -+# CONFIG_ARCH_EP93XX is not set -+# CONFIG_ARCH_FOOTBRIDGE is not set -+# CONFIG_ARCH_MXC is not set -+# CONFIG_ARCH_STMP3XXX is not set -+# CONFIG_ARCH_NETX is not set -+# CONFIG_ARCH_H720X is not set -+# CONFIG_ARCH_NOMADIK is not set -+# CONFIG_ARCH_IOP13XX is not set -+# CONFIG_ARCH_IOP32X is not set -+# CONFIG_ARCH_IOP33X is not set -+# CONFIG_ARCH_IXP23XX is not set -+# CONFIG_ARCH_IXP2000 is not set -+# CONFIG_ARCH_IXP4XX is not set -+# CONFIG_ARCH_L7200 is not set -+# CONFIG_ARCH_DOVE is not set -+CONFIG_ARCH_KIRKWOOD=y -+# CONFIG_ARCH_LOKI is not set -+# CONFIG_ARCH_MV78XX0 is not set -+# CONFIG_ARCH_ORION5X is not set -+# CONFIG_ARCH_MMP is not set -+# CONFIG_ARCH_KS8695 is not set -+# CONFIG_ARCH_NS9XXX is not set -+# CONFIG_ARCH_W90X900 is not set -+# CONFIG_ARCH_PNX4008 is not set -+# CONFIG_ARCH_PXA is not set -+# CONFIG_ARCH_MSM is not set -+# CONFIG_ARCH_RPC is not set -+# CONFIG_ARCH_SA1100 is not set -+# CONFIG_ARCH_S3C2410 is not set -+# CONFIG_ARCH_S3C64XX is not set -+# CONFIG_ARCH_S5PC1XX is not set -+# CONFIG_ARCH_SHARK is not set -+# CONFIG_ARCH_LH7A40X is not set -+# CONFIG_ARCH_U300 is not set -+# CONFIG_ARCH_DAVINCI is not set -+# CONFIG_ARCH_OMAP is not set -+# CONFIG_ARCH_BCMRING is not set -+# CONFIG_ARCH_U8500 is not set -+ -+# -+# Marvell Kirkwood Implementations -+# -+CONFIG_MACH_DB88F6281_BP=y -+CONFIG_MACH_RD88F6192_NAS=y -+CONFIG_MACH_RD88F6281=y -+# CONFIG_MACH_MV88F6281GTW_GE is not set -+CONFIG_MACH_SHEEVAPLUG=y -+CONFIG_MACH_GURUPLUG=y -+CONFIG_MACH_TS219=y -+CONFIG_MACH_TS41X=y -+CONFIG_MACH_OPENRD_BASE=y -+# CONFIG_MACH_NETSPACE_V2 is not set -+CONFIG_PLAT_ORION=y -+ -+# -+# Processor Type -+# -+CONFIG_CPU_FEROCEON=y -+# CONFIG_CPU_FEROCEON_OLD_ID is not set -+CONFIG_CPU_32v5=y -+CONFIG_CPU_ABRT_EV5T=y -+CONFIG_CPU_PABRT_LEGACY=y -+CONFIG_CPU_CACHE_VIVT=y -+CONFIG_CPU_COPY_FEROCEON=y -+CONFIG_CPU_TLB_FEROCEON=y -+CONFIG_CPU_CP15=y -+CONFIG_CPU_CP15_MMU=y -+ -+# -+# Processor Features -+# -+CONFIG_ARM_THUMB=y -+# CONFIG_CPU_ICACHE_DISABLE is not set -+# CONFIG_CPU_DCACHE_DISABLE is not set -+CONFIG_OUTER_CACHE=y -+CONFIG_CACHE_FEROCEON_L2=y -+# CONFIG_CACHE_FEROCEON_L2_WRITETHROUGH is not set -+CONFIG_ARM_L1_CACHE_SHIFT=5 -+ -+# -+# Bus support -+# -+CONFIG_PCI=y -+CONFIG_PCI_SYSCALL=y -+# CONFIG_ARCH_SUPPORTS_MSI is not set -+CONFIG_PCI_LEGACY=y -+# CONFIG_PCI_DEBUG is not set -+# CONFIG_PCI_STUB is not set -+# CONFIG_PCI_IOV is not set -+# CONFIG_PCCARD is not set -+ -+# -+# Kernel Features -+# -+CONFIG_TICK_ONESHOT=y -+CONFIG_NO_HZ=y -+CONFIG_HIGH_RES_TIMERS=y -+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y -+CONFIG_VMSPLIT_3G=y -+# CONFIG_VMSPLIT_2G is not set -+# CONFIG_VMSPLIT_1G is not set -+CONFIG_PAGE_OFFSET=0xC0000000 -+# CONFIG_PREEMPT_NONE is not set -+# CONFIG_PREEMPT_VOLUNTARY is not set -+CONFIG_PREEMPT=y -+CONFIG_HZ=100 -+CONFIG_AEABI=y -+# CONFIG_OABI_COMPAT is not set -+# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set -+# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set -+# CONFIG_HIGHMEM is not set -+CONFIG_SELECT_MEMORY_MODEL=y -+CONFIG_FLATMEM_MANUAL=y -+# CONFIG_DISCONTIGMEM_MANUAL is not set -+# CONFIG_SPARSEMEM_MANUAL is not set -+CONFIG_FLATMEM=y -+CONFIG_FLAT_NODE_MEM_MAP=y -+CONFIG_PAGEFLAGS_EXTENDED=y -+CONFIG_SPLIT_PTLOCK_CPUS=999999 -+# CONFIG_PHYS_ADDR_T_64BIT is not set -+CONFIG_ZONE_DMA_FLAG=0 -+CONFIG_VIRT_TO_BUS=y -+# CONFIG_KSM is not set -+CONFIG_DEFAULT_MMAP_MIN_ADDR=32768 -+CONFIG_ALIGNMENT_TRAP=y -+CONFIG_UACCESS_WITH_MEMCPY=y -+ -+# -+# Boot options -+# -+CONFIG_ZBOOT_ROM_TEXT=0x0 -+CONFIG_ZBOOT_ROM_BSS=0x0 -+CONFIG_CMDLINE="" -+# CONFIG_XIP_KERNEL is not set -+# CONFIG_KEXEC is not set -+ -+# -+# CPU Power Management -+# -+CONFIG_CPU_IDLE=y -+CONFIG_CPU_IDLE_GOV_LADDER=y -+CONFIG_CPU_IDLE_GOV_MENU=y -+ -+# -+# Floating point emulation -+# -+ -+# -+# At least one emulation must be selected -+# -+# CONFIG_VFP is not set -+ -+# -+# Userspace binary formats -+# -+CONFIG_BINFMT_ELF=y -+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set -+CONFIG_HAVE_AOUT=y -+# CONFIG_BINFMT_AOUT is not set -+# CONFIG_BINFMT_MISC is not set -+ -+# -+# Power management options -+# -+CONFIG_PM=y -+# CONFIG_PM_DEBUG is not set -+CONFIG_PM_SLEEP=y -+CONFIG_SUSPEND=y -+CONFIG_SUSPEND_FREEZER=y -+# CONFIG_APM_EMULATION is not set -+# CONFIG_PM_RUNTIME is not set -+CONFIG_ARCH_SUSPEND_POSSIBLE=y -+CONFIG_NET=y -+ -+# -+# Networking options -+# -+CONFIG_PACKET=y -+CONFIG_PACKET_MMAP=y -+CONFIG_UNIX=y -+CONFIG_XFRM=y -+CONFIG_XFRM_USER=m -+# CONFIG_XFRM_SUB_POLICY is not set -+# CONFIG_XFRM_MIGRATE is not set -+# CONFIG_XFRM_STATISTICS is not set -+CONFIG_XFRM_IPCOMP=m -+CONFIG_NET_KEY=m -+# CONFIG_NET_KEY_MIGRATE is not set -+CONFIG_INET=y -+CONFIG_IP_MULTICAST=y -+CONFIG_IP_ADVANCED_ROUTER=y -+CONFIG_ASK_IP_FIB_HASH=y -+# CONFIG_IP_FIB_TRIE is not set -+CONFIG_IP_FIB_HASH=y -+# CONFIG_IP_MULTIPLE_TABLES is not set -+# CONFIG_IP_ROUTE_MULTIPATH is not set -+# CONFIG_IP_ROUTE_VERBOSE is not set -+CONFIG_IP_PNP=y -+CONFIG_IP_PNP_DHCP=y -+CONFIG_IP_PNP_BOOTP=y -+# CONFIG_IP_PNP_RARP is not set -+CONFIG_NET_IPIP=m -+CONFIG_NET_IPGRE=m -+# CONFIG_NET_IPGRE_BROADCAST is not set -+# CONFIG_IP_MROUTE is not set -+# CONFIG_ARPD is not set -+CONFIG_SYN_COOKIES=y -+CONFIG_INET_AH=m -+CONFIG_INET_ESP=m -+CONFIG_INET_IPCOMP=m -+CONFIG_INET_XFRM_TUNNEL=m -+CONFIG_INET_TUNNEL=m -+CONFIG_INET_XFRM_MODE_TRANSPORT=m -+CONFIG_INET_XFRM_MODE_TUNNEL=m -+CONFIG_INET_XFRM_MODE_BEET=m -+CONFIG_INET_LRO=y -+CONFIG_INET_DIAG=y -+CONFIG_INET_TCP_DIAG=y -+# CONFIG_TCP_CONG_ADVANCED is not set -+CONFIG_TCP_CONG_CUBIC=y -+CONFIG_DEFAULT_TCP_CONG="cubic" -+# CONFIG_TCP_MD5SIG is not set -+CONFIG_IPV6=m -+# CONFIG_IPV6_PRIVACY is not set -+# CONFIG_IPV6_ROUTER_PREF is not set -+# CONFIG_IPV6_OPTIMISTIC_DAD is not set -+CONFIG_INET6_AH=m -+CONFIG_INET6_ESP=m -+CONFIG_INET6_IPCOMP=m -+# CONFIG_IPV6_MIP6 is not set -+CONFIG_INET6_XFRM_TUNNEL=m -+CONFIG_INET6_TUNNEL=m -+CONFIG_INET6_XFRM_MODE_TRANSPORT=m -+CONFIG_INET6_XFRM_MODE_TUNNEL=m -+CONFIG_INET6_XFRM_MODE_BEET=m -+# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set -+CONFIG_IPV6_SIT=m -+# CONFIG_IPV6_SIT_6RD is not set -+CONFIG_IPV6_NDISC_NODETYPE=y -+# CONFIG_IPV6_TUNNEL is not set -+# CONFIG_IPV6_MULTIPLE_TABLES is not set -+# CONFIG_IPV6_MROUTE is not set -+# CONFIG_NETWORK_SECMARK is not set -+CONFIG_NETFILTER=y -+# CONFIG_NETFILTER_DEBUG is not set -+CONFIG_NETFILTER_ADVANCED=y -+CONFIG_BRIDGE_NETFILTER=y -+ -+# -+# Core Netfilter Configuration -+# -+CONFIG_NETFILTER_NETLINK=m -+# CONFIG_NETFILTER_NETLINK_QUEUE is not set -+CONFIG_NETFILTER_NETLINK_LOG=m -+CONFIG_NF_CONNTRACK=m -+CONFIG_NF_CT_ACCT=y -+CONFIG_NF_CONNTRACK_MARK=y -+# CONFIG_NF_CONNTRACK_EVENTS is not set -+CONFIG_NF_CT_PROTO_DCCP=m -+CONFIG_NF_CT_PROTO_GRE=m -+CONFIG_NF_CT_PROTO_SCTP=m -+CONFIG_NF_CT_PROTO_UDPLITE=m -+CONFIG_NF_CONNTRACK_AMANDA=m -+CONFIG_NF_CONNTRACK_FTP=m -+CONFIG_NF_CONNTRACK_H323=m -+CONFIG_NF_CONNTRACK_IRC=m -+CONFIG_NF_CONNTRACK_NETBIOS_NS=m -+CONFIG_NF_CONNTRACK_PPTP=m -+CONFIG_NF_CONNTRACK_SANE=m -+CONFIG_NF_CONNTRACK_SIP=m -+CONFIG_NF_CONNTRACK_TFTP=m -+# CONFIG_NF_CT_NETLINK is not set -+CONFIG_NETFILTER_TPROXY=m -+CONFIG_NETFILTER_XTABLES=m -+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m -+# CONFIG_NETFILTER_XT_TARGET_CONNMARK is not set -+CONFIG_NETFILTER_XT_TARGET_DSCP=m -+CONFIG_NETFILTER_XT_TARGET_HL=m -+CONFIG_NETFILTER_XT_TARGET_LED=m -+CONFIG_NETFILTER_XT_TARGET_MARK=m -+CONFIG_NETFILTER_XT_TARGET_NFLOG=m -+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m -+CONFIG_NETFILTER_XT_TARGET_NOTRACK=m -+CONFIG_NETFILTER_XT_TARGET_RATEEST=m -+CONFIG_NETFILTER_XT_TARGET_TPROXY=m -+CONFIG_NETFILTER_XT_TARGET_TRACE=m -+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m -+CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m -+CONFIG_NETFILTER_XT_MATCH_CLUSTER=m -+CONFIG_NETFILTER_XT_MATCH_COMMENT=m -+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m -+CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m -+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m -+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m -+CONFIG_NETFILTER_XT_MATCH_DCCP=m -+CONFIG_NETFILTER_XT_MATCH_DSCP=m -+CONFIG_NETFILTER_XT_MATCH_ESP=m -+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m -+CONFIG_NETFILTER_XT_MATCH_HELPER=m -+CONFIG_NETFILTER_XT_MATCH_HL=m -+CONFIG_NETFILTER_XT_MATCH_IPRANGE=m -+CONFIG_NETFILTER_XT_MATCH_LENGTH=m -+CONFIG_NETFILTER_XT_MATCH_LIMIT=m -+CONFIG_NETFILTER_XT_MATCH_MAC=m -+CONFIG_NETFILTER_XT_MATCH_MARK=m -+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m -+CONFIG_NETFILTER_XT_MATCH_OWNER=m -+CONFIG_NETFILTER_XT_MATCH_POLICY=m -+# CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set -+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m -+CONFIG_NETFILTER_XT_MATCH_QUOTA=m -+CONFIG_NETFILTER_XT_MATCH_RATEEST=m -+CONFIG_NETFILTER_XT_MATCH_REALM=m -+CONFIG_NETFILTER_XT_MATCH_RECENT=m -+CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT=y -+CONFIG_NETFILTER_XT_MATCH_SCTP=m -+CONFIG_NETFILTER_XT_MATCH_SOCKET=m -+CONFIG_NETFILTER_XT_MATCH_STATE=m -+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m -+CONFIG_NETFILTER_XT_MATCH_STRING=m -+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m -+CONFIG_NETFILTER_XT_MATCH_TIME=m -+CONFIG_NETFILTER_XT_MATCH_U32=m -+CONFIG_NETFILTER_XT_MATCH_OSF=m -+# CONFIG_IP_VS is not set -+ -+# -+# IP: Netfilter Configuration -+# -+CONFIG_NF_DEFRAG_IPV4=m -+CONFIG_NF_CONNTRACK_IPV4=m -+CONFIG_NF_CONNTRACK_PROC_COMPAT=y -+# CONFIG_IP_NF_QUEUE is not set -+CONFIG_IP_NF_IPTABLES=m -+CONFIG_IP_NF_MATCH_ADDRTYPE=m -+CONFIG_IP_NF_MATCH_AH=m -+CONFIG_IP_NF_MATCH_ECN=m -+CONFIG_IP_NF_MATCH_TTL=m -+CONFIG_IP_NF_FILTER=m -+CONFIG_IP_NF_TARGET_REJECT=m -+CONFIG_IP_NF_TARGET_LOG=m -+CONFIG_IP_NF_TARGET_ULOG=m -+CONFIG_NF_NAT=m -+CONFIG_NF_NAT_NEEDED=y -+CONFIG_IP_NF_TARGET_MASQUERADE=m -+CONFIG_IP_NF_TARGET_NETMAP=m -+CONFIG_IP_NF_TARGET_REDIRECT=m -+CONFIG_NF_NAT_SNMP_BASIC=m -+CONFIG_NF_NAT_PROTO_DCCP=m -+CONFIG_NF_NAT_PROTO_GRE=m -+CONFIG_NF_NAT_PROTO_UDPLITE=m -+CONFIG_NF_NAT_PROTO_SCTP=m -+CONFIG_NF_NAT_FTP=m -+CONFIG_NF_NAT_IRC=m -+CONFIG_NF_NAT_TFTP=m -+CONFIG_NF_NAT_AMANDA=m -+CONFIG_NF_NAT_PPTP=m -+CONFIG_NF_NAT_H323=m -+CONFIG_NF_NAT_SIP=m -+CONFIG_IP_NF_MANGLE=m -+# CONFIG_IP_NF_TARGET_CLUSTERIP is not set -+CONFIG_IP_NF_TARGET_ECN=m -+CONFIG_IP_NF_TARGET_TTL=m -+CONFIG_IP_NF_RAW=m -+CONFIG_IP_NF_ARPTABLES=m -+CONFIG_IP_NF_ARPFILTER=m -+CONFIG_IP_NF_ARP_MANGLE=m -+ -+# -+# IPv6: Netfilter Configuration -+# -+CONFIG_NF_CONNTRACK_IPV6=m -+# CONFIG_IP6_NF_QUEUE is not set -+CONFIG_IP6_NF_IPTABLES=m -+CONFIG_IP6_NF_MATCH_AH=m -+CONFIG_IP6_NF_MATCH_EUI64=m -+CONFIG_IP6_NF_MATCH_FRAG=m -+CONFIG_IP6_NF_MATCH_OPTS=m -+CONFIG_IP6_NF_MATCH_HL=m -+CONFIG_IP6_NF_MATCH_IPV6HEADER=m -+CONFIG_IP6_NF_MATCH_MH=m -+CONFIG_IP6_NF_MATCH_RT=m -+CONFIG_IP6_NF_TARGET_HL=m -+CONFIG_IP6_NF_TARGET_LOG=m -+CONFIG_IP6_NF_FILTER=m -+CONFIG_IP6_NF_TARGET_REJECT=m -+CONFIG_IP6_NF_MANGLE=m -+CONFIG_IP6_NF_RAW=m -+CONFIG_BRIDGE_NF_EBTABLES=m -+CONFIG_BRIDGE_EBT_BROUTE=m -+CONFIG_BRIDGE_EBT_T_FILTER=m -+CONFIG_BRIDGE_EBT_T_NAT=m -+CONFIG_BRIDGE_EBT_802_3=m -+CONFIG_BRIDGE_EBT_AMONG=m -+CONFIG_BRIDGE_EBT_ARP=m -+CONFIG_BRIDGE_EBT_IP=m -+CONFIG_BRIDGE_EBT_IP6=m -+CONFIG_BRIDGE_EBT_LIMIT=m -+CONFIG_BRIDGE_EBT_MARK=m -+CONFIG_BRIDGE_EBT_PKTTYPE=m -+CONFIG_BRIDGE_EBT_STP=m -+CONFIG_BRIDGE_EBT_VLAN=m -+CONFIG_BRIDGE_EBT_ARPREPLY=m -+CONFIG_BRIDGE_EBT_DNAT=m -+CONFIG_BRIDGE_EBT_MARK_T=m -+CONFIG_BRIDGE_EBT_REDIRECT=m -+CONFIG_BRIDGE_EBT_SNAT=m -+CONFIG_BRIDGE_EBT_LOG=m -+CONFIG_BRIDGE_EBT_ULOG=m -+CONFIG_BRIDGE_EBT_NFLOG=m -+# CONFIG_IP_DCCP is not set -+# CONFIG_IP_SCTP is not set -+# CONFIG_RDS is not set -+# CONFIG_TIPC is not set -+# CONFIG_ATM is not set -+CONFIG_STP=m -+CONFIG_BRIDGE=m -+CONFIG_NET_DSA=y -+# CONFIG_NET_DSA_TAG_DSA is not set -+CONFIG_NET_DSA_TAG_EDSA=y -+# CONFIG_NET_DSA_TAG_TRAILER is not set -+CONFIG_NET_DSA_MV88E6XXX=y -+# CONFIG_NET_DSA_MV88E6060 is not set -+# CONFIG_NET_DSA_MV88E6XXX_NEED_PPU is not set -+# CONFIG_NET_DSA_MV88E6131 is not set -+CONFIG_NET_DSA_MV88E6123_61_65=y -+CONFIG_VLAN_8021Q=m -+# CONFIG_VLAN_8021Q_GVRP is not set -+# CONFIG_DECNET is not set -+CONFIG_LLC=m -+# CONFIG_LLC2 is not set -+# CONFIG_IPX is not set -+CONFIG_ATALK=m -+CONFIG_DEV_APPLETALK=m -+# CONFIG_IPDDP is not set -+# CONFIG_X25 is not set -+# CONFIG_LAPB is not set -+# CONFIG_ECONET is not set -+# CONFIG_WAN_ROUTER is not set -+# CONFIG_PHONET is not set -+# CONFIG_IEEE802154 is not set -+CONFIG_NET_SCHED=y -+ -+# -+# Queueing/Scheduling -+# -+CONFIG_NET_SCH_CBQ=m -+CONFIG_NET_SCH_HTB=m -+CONFIG_NET_SCH_HFSC=m -+CONFIG_NET_SCH_PRIO=m -+CONFIG_NET_SCH_MULTIQ=m -+CONFIG_NET_SCH_RED=m -+CONFIG_NET_SCH_SFQ=m -+CONFIG_NET_SCH_TEQL=m -+CONFIG_NET_SCH_TBF=m -+CONFIG_NET_SCH_GRED=m -+CONFIG_NET_SCH_DSMARK=m -+CONFIG_NET_SCH_NETEM=m -+CONFIG_NET_SCH_DRR=m -+# CONFIG_NET_SCH_INGRESS is not set -+ -+# -+# Classification -+# -+CONFIG_NET_CLS=y -+CONFIG_NET_CLS_BASIC=m -+CONFIG_NET_CLS_TCINDEX=m -+CONFIG_NET_CLS_ROUTE4=m -+CONFIG_NET_CLS_ROUTE=y -+CONFIG_NET_CLS_FW=m -+CONFIG_NET_CLS_U32=m -+CONFIG_CLS_U32_PERF=y -+CONFIG_CLS_U32_MARK=y -+CONFIG_NET_CLS_RSVP=m -+CONFIG_NET_CLS_RSVP6=m -+CONFIG_NET_CLS_FLOW=m -+CONFIG_NET_EMATCH=y -+CONFIG_NET_EMATCH_STACK=32 -+CONFIG_NET_EMATCH_CMP=m -+CONFIG_NET_EMATCH_NBYTE=m -+CONFIG_NET_EMATCH_U32=m -+CONFIG_NET_EMATCH_META=m -+CONFIG_NET_EMATCH_TEXT=m -+CONFIG_NET_CLS_ACT=y -+# CONFIG_NET_ACT_POLICE is not set -+# CONFIG_NET_ACT_GACT is not set -+# CONFIG_NET_ACT_MIRRED is not set -+# CONFIG_NET_ACT_IPT is not set -+# CONFIG_NET_ACT_NAT is not set -+# CONFIG_NET_ACT_PEDIT is not set -+# CONFIG_NET_ACT_SIMP is not set -+# CONFIG_NET_ACT_SKBEDIT is not set -+# CONFIG_NET_CLS_IND is not set -+CONFIG_NET_SCH_FIFO=y -+# CONFIG_DCB is not set -+ -+# -+# Network testing -+# -+CONFIG_NET_PKTGEN=m -+# CONFIG_NET_TCPPROBE is not set -+# CONFIG_HAMRADIO is not set -+# CONFIG_CAN is not set -+# CONFIG_IRDA is not set -+CONFIG_BT=m -+CONFIG_BT_L2CAP=m -+CONFIG_BT_SCO=m -+CONFIG_BT_RFCOMM=m -+CONFIG_BT_RFCOMM_TTY=y -+CONFIG_BT_BNEP=m -+# CONFIG_BT_BNEP_MC_FILTER is not set -+# CONFIG_BT_BNEP_PROTO_FILTER is not set -+CONFIG_BT_HIDP=m -+ -+# -+# Bluetooth device drivers -+# -+CONFIG_BT_HCIBTUSB=m -+CONFIG_BT_HCIBTSDIO=m -+# CONFIG_BT_HCIUART is not set -+CONFIG_BT_HCIBCM203X=m -+CONFIG_BT_HCIBPA10X=m -+CONFIG_BT_HCIBFUSB=m -+CONFIG_BT_HCIVHCI=m -+CONFIG_BT_MRVL=m -+CONFIG_BT_MRVL_SDIO=m -+# CONFIG_BT_ATH3K is not set -+# CONFIG_AF_RXRPC is not set -+CONFIG_WIRELESS=y -+CONFIG_WIRELESS_EXT=y -+CONFIG_WEXT_CORE=y -+CONFIG_WEXT_PROC=y -+CONFIG_WEXT_SPY=y -+CONFIG_CFG80211=y -+# CONFIG_NL80211_TESTMODE is not set -+# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set -+# CONFIG_CFG80211_REG_DEBUG is not set -+CONFIG_CFG80211_DEFAULT_PS=y -+# CONFIG_CFG80211_DEBUGFS is not set -+CONFIG_WIRELESS_OLD_REGULATORY=y -+CONFIG_CFG80211_WEXT=y -+CONFIG_WIRELESS_EXT_SYSFS=y -+CONFIG_LIB80211=y -+# CONFIG_LIB80211_DEBUG is not set -+CONFIG_MAC80211=y -+CONFIG_MAC80211_RC_MINSTREL=y -+# CONFIG_MAC80211_RC_DEFAULT_PID is not set -+CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y -+CONFIG_MAC80211_RC_DEFAULT="minstrel" -+# CONFIG_MAC80211_MESH is not set -+# CONFIG_MAC80211_LEDS is not set -+# CONFIG_MAC80211_DEBUGFS is not set -+# CONFIG_MAC80211_DEBUG_MENU is not set -+# CONFIG_WIMAX is not set -+# CONFIG_RFKILL is not set -+# CONFIG_NET_9P is not set -+ -+# -+# Device Drivers -+# -+ -+# -+# Generic Driver Options -+# -+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -+# CONFIG_DEVTMPFS is not set -+CONFIG_STANDALONE=y -+CONFIG_PREVENT_FIRMWARE_BUILD=y -+CONFIG_FW_LOADER=y -+CONFIG_FIRMWARE_IN_KERNEL=y -+CONFIG_EXTRA_FIRMWARE="" -+# CONFIG_DEBUG_DRIVER is not set -+# CONFIG_DEBUG_DEVRES is not set -+# CONFIG_SYS_HYPERVISOR is not set -+# CONFIG_CONNECTOR is not set -+CONFIG_MTD=y -+# CONFIG_MTD_DEBUG is not set -+# CONFIG_MTD_TESTS is not set -+# CONFIG_MTD_CONCAT is not set -+CONFIG_MTD_PARTITIONS=y -+# CONFIG_MTD_REDBOOT_PARTS is not set -+CONFIG_MTD_CMDLINE_PARTS=y -+# CONFIG_MTD_AFS_PARTS is not set -+# CONFIG_MTD_AR7_PARTS is not set -+ -+# -+# User Modules And Translation Layers -+# -+CONFIG_MTD_CHAR=y -+CONFIG_MTD_BLKDEVS=y -+CONFIG_MTD_BLOCK=y -+# CONFIG_FTL is not set -+# CONFIG_NFTL is not set -+# CONFIG_INFTL is not set -+# CONFIG_RFD_FTL is not set -+# CONFIG_SSFDC is not set -+# CONFIG_MTD_OOPS is not set -+ -+# -+# RAM/ROM/Flash chip drivers -+# -+CONFIG_MTD_CFI=y -+CONFIG_MTD_JEDECPROBE=y -+CONFIG_MTD_GEN_PROBE=y -+CONFIG_MTD_CFI_ADV_OPTIONS=y -+CONFIG_MTD_CFI_NOSWAP=y -+# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set -+# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set -+CONFIG_MTD_CFI_GEOMETRY=y -+CONFIG_MTD_MAP_BANK_WIDTH_1=y -+CONFIG_MTD_MAP_BANK_WIDTH_2=y -+# CONFIG_MTD_MAP_BANK_WIDTH_4 is not set -+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set -+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set -+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set -+CONFIG_MTD_CFI_I1=y -+CONFIG_MTD_CFI_I2=y -+# CONFIG_MTD_CFI_I4 is not set -+# CONFIG_MTD_CFI_I8 is not set -+# CONFIG_MTD_OTP is not set -+CONFIG_MTD_CFI_INTELEXT=y -+# CONFIG_MTD_CFI_AMDSTD is not set -+CONFIG_MTD_CFI_STAA=y -+CONFIG_MTD_CFI_UTIL=y -+# CONFIG_MTD_RAM is not set -+# CONFIG_MTD_ROM is not set -+# CONFIG_MTD_ABSENT is not set -+ -+# -+# Mapping drivers for chip access -+# -+# CONFIG_MTD_COMPLEX_MAPPINGS is not set -+CONFIG_MTD_PHYSMAP=y -+# CONFIG_MTD_PHYSMAP_COMPAT is not set -+# CONFIG_MTD_ARM_INTEGRATOR is not set -+# CONFIG_MTD_IMPA7 is not set -+# CONFIG_MTD_INTEL_VR_NOR is not set -+# CONFIG_MTD_PLATRAM is not set -+ -+# -+# Self-contained MTD device drivers -+# -+# CONFIG_MTD_PMC551 is not set -+# CONFIG_MTD_DATAFLASH is not set -+CONFIG_MTD_M25P80=y -+CONFIG_M25PXX_USE_FAST_READ=y -+# CONFIG_MTD_SST25L is not set -+# CONFIG_MTD_SLRAM is not set -+# CONFIG_MTD_PHRAM is not set -+# CONFIG_MTD_MTDRAM is not set -+# CONFIG_MTD_BLOCK2MTD is not set -+ -+# -+# Disk-On-Chip Device Drivers -+# -+# CONFIG_MTD_DOC2000 is not set -+# CONFIG_MTD_DOC2001 is not set -+# CONFIG_MTD_DOC2001PLUS is not set -+CONFIG_MTD_NAND=y -+# CONFIG_MTD_NAND_VERIFY_WRITE is not set -+# CONFIG_MTD_NAND_ECC_SMC is not set -+# CONFIG_MTD_NAND_MUSEUM_IDS is not set -+# CONFIG_MTD_NAND_GPIO is not set -+CONFIG_MTD_NAND_IDS=y -+# CONFIG_MTD_NAND_DISKONCHIP is not set -+# CONFIG_MTD_NAND_CAFE is not set -+# CONFIG_MTD_NAND_NANDSIM is not set -+# CONFIG_MTD_NAND_PLATFORM is not set -+# CONFIG_MTD_ALAUDA is not set -+CONFIG_MTD_NAND_ORION=y -+# CONFIG_MTD_ONENAND is not set -+ -+# -+# LPDDR flash memory drivers -+# -+# CONFIG_MTD_LPDDR is not set -+ -+# -+# UBI - Unsorted block images -+# -+CONFIG_MTD_UBI=y -+CONFIG_MTD_UBI_WL_THRESHOLD=4096 -+CONFIG_MTD_UBI_BEB_RESERVE=1 -+# CONFIG_MTD_UBI_GLUEBI is not set -+ -+# -+# UBI debugging options -+# -+# CONFIG_MTD_UBI_DEBUG is not set -+# CONFIG_PARPORT is not set -+CONFIG_BLK_DEV=y -+# CONFIG_BLK_CPQ_DA is not set -+# CONFIG_BLK_CPQ_CISS_DA is not set -+# CONFIG_BLK_DEV_DAC960 is not set -+# CONFIG_BLK_DEV_UMEM is not set -+# CONFIG_BLK_DEV_COW_COMMON is not set -+CONFIG_BLK_DEV_LOOP=y -+# CONFIG_BLK_DEV_CRYPTOLOOP is not set -+ -+# -+# DRBD disabled because PROC_FS, INET or CONNECTOR not selected -+# -+# CONFIG_BLK_DEV_NBD is not set -+# CONFIG_BLK_DEV_SX8 is not set -+# CONFIG_BLK_DEV_UB is not set -+CONFIG_BLK_DEV_RAM=y -+CONFIG_BLK_DEV_RAM_COUNT=16 -+CONFIG_BLK_DEV_RAM_SIZE=8192 -+# CONFIG_BLK_DEV_XIP is not set -+# CONFIG_CDROM_PKTCDVD is not set -+CONFIG_ATA_OVER_ETH=m -+# CONFIG_MG_DISK is not set -+# CONFIG_MISC_DEVICES is not set -+CONFIG_EEPROM_93CX6=m -+CONFIG_HAVE_IDE=y -+# CONFIG_IDE is not set -+ -+# -+# SCSI device support -+# -+# CONFIG_RAID_ATTRS is not set -+CONFIG_SCSI=y -+CONFIG_SCSI_DMA=y -+# CONFIG_SCSI_TGT is not set -+# CONFIG_SCSI_NETLINK is not set -+# CONFIG_SCSI_PROC_FS is not set -+ -+# -+# SCSI support type (disk, tape, CD-ROM) -+# -+CONFIG_BLK_DEV_SD=y -+# CONFIG_CHR_DEV_ST is not set -+# CONFIG_CHR_DEV_OSST is not set -+CONFIG_BLK_DEV_SR=m -+# CONFIG_BLK_DEV_SR_VENDOR is not set -+CONFIG_CHR_DEV_SG=y -+# CONFIG_CHR_DEV_SCH is not set -+CONFIG_SCSI_MULTI_LUN=y -+# CONFIG_SCSI_CONSTANTS is not set -+# CONFIG_SCSI_LOGGING is not set -+# CONFIG_SCSI_SCAN_ASYNC is not set -+CONFIG_SCSI_WAIT_SCAN=m -+ -+# -+# SCSI Transports -+# -+# CONFIG_SCSI_SPI_ATTRS is not set -+# CONFIG_SCSI_FC_ATTRS is not set -+# CONFIG_SCSI_ISCSI_ATTRS is not set -+# CONFIG_SCSI_SAS_LIBSAS is not set -+# CONFIG_SCSI_SRP_ATTRS is not set -+CONFIG_SCSI_LOWLEVEL=y -+# CONFIG_ISCSI_TCP is not set -+# CONFIG_SCSI_BNX2_ISCSI is not set -+# CONFIG_BE2ISCSI is not set -+# CONFIG_BLK_DEV_3W_XXXX_RAID is not set -+# CONFIG_SCSI_HPSA is not set -+# CONFIG_SCSI_3W_9XXX is not set -+# CONFIG_SCSI_3W_SAS is not set -+# CONFIG_SCSI_ACARD is not set -+# CONFIG_SCSI_AACRAID is not set -+# CONFIG_SCSI_AIC7XXX is not set -+# CONFIG_SCSI_AIC7XXX_OLD is not set -+# CONFIG_SCSI_AIC79XX is not set -+# CONFIG_SCSI_AIC94XX is not set -+# CONFIG_SCSI_MVSAS is not set -+# CONFIG_SCSI_DPT_I2O is not set -+# CONFIG_SCSI_ADVANSYS is not set -+# CONFIG_SCSI_ARCMSR is not set -+# CONFIG_MEGARAID_NEWGEN is not set -+# CONFIG_MEGARAID_LEGACY is not set -+# CONFIG_MEGARAID_SAS is not set -+# CONFIG_SCSI_MPT2SAS is not set -+# CONFIG_SCSI_HPTIOP is not set -+# CONFIG_LIBFC is not set -+# CONFIG_LIBFCOE is not set -+# CONFIG_FCOE is not set -+# CONFIG_SCSI_DMX3191D is not set -+# CONFIG_SCSI_FUTURE_DOMAIN is not set -+# CONFIG_SCSI_IPS is not set -+# CONFIG_SCSI_INITIO is not set -+# CONFIG_SCSI_INIA100 is not set -+# CONFIG_SCSI_STEX is not set -+# CONFIG_SCSI_SYM53C8XX_2 is not set -+# CONFIG_SCSI_IPR is not set -+# CONFIG_SCSI_QLOGIC_1280 is not set -+# CONFIG_SCSI_QLA_FC is not set -+# CONFIG_SCSI_QLA_ISCSI is not set -+# CONFIG_SCSI_LPFC is not set -+# CONFIG_SCSI_DC395x is not set -+# CONFIG_SCSI_DC390T is not set -+# CONFIG_SCSI_NSP32 is not set -+# CONFIG_SCSI_DEBUG is not set -+# CONFIG_SCSI_PMCRAID is not set -+# CONFIG_SCSI_PM8001 is not set -+# CONFIG_SCSI_SRP is not set -+# CONFIG_SCSI_BFA_FC is not set -+# CONFIG_SCSI_DH is not set -+# CONFIG_SCSI_OSD_INITIATOR is not set -+CONFIG_ATA=y -+# CONFIG_ATA_NONSTANDARD is not set -+CONFIG_ATA_VERBOSE_ERROR=y -+CONFIG_SATA_PMP=y -+# CONFIG_SATA_AHCI is not set -+# CONFIG_SATA_SIL24 is not set -+CONFIG_ATA_SFF=y -+# CONFIG_SATA_SVW is not set -+# CONFIG_ATA_PIIX is not set -+CONFIG_SATA_MV=m -+# CONFIG_SATA_NV is not set -+# CONFIG_PDC_ADMA is not set -+# CONFIG_SATA_QSTOR is not set -+# CONFIG_SATA_PROMISE is not set -+# CONFIG_SATA_SX4 is not set -+# CONFIG_SATA_SIL is not set -+# CONFIG_SATA_SIS is not set -+# CONFIG_SATA_ULI is not set -+# CONFIG_SATA_VIA is not set -+# CONFIG_SATA_VITESSE is not set -+# CONFIG_SATA_INIC162X is not set -+# CONFIG_PATA_ALI is not set -+# CONFIG_PATA_AMD is not set -+# CONFIG_PATA_ARTOP is not set -+# CONFIG_PATA_ATP867X is not set -+# CONFIG_PATA_ATIIXP is not set -+# CONFIG_PATA_CMD640_PCI is not set -+# CONFIG_PATA_CMD64X is not set -+# CONFIG_PATA_CS5520 is not set -+# CONFIG_PATA_CS5530 is not set -+# CONFIG_PATA_CYPRESS is not set -+# CONFIG_PATA_EFAR is not set -+# CONFIG_ATA_GENERIC is not set -+# CONFIG_PATA_HPT366 is not set -+# CONFIG_PATA_HPT37X is not set -+# CONFIG_PATA_HPT3X2N is not set -+# CONFIG_PATA_HPT3X3 is not set -+# CONFIG_PATA_IT821X is not set -+# CONFIG_PATA_IT8213 is not set -+# CONFIG_PATA_JMICRON is not set -+# CONFIG_PATA_TRIFLEX is not set -+# CONFIG_PATA_MARVELL is not set -+# CONFIG_PATA_MPIIX is not set -+# CONFIG_PATA_OLDPIIX is not set -+# CONFIG_PATA_NETCELL is not set -+# CONFIG_PATA_NINJA32 is not set -+# CONFIG_PATA_NS87410 is not set -+# CONFIG_PATA_NS87415 is not set -+# CONFIG_PATA_OPTI is not set -+# CONFIG_PATA_OPTIDMA is not set -+# CONFIG_PATA_PDC2027X is not set -+# CONFIG_PATA_PDC_OLD is not set -+# CONFIG_PATA_RADISYS is not set -+# CONFIG_PATA_RDC is not set -+# CONFIG_PATA_RZ1000 is not set -+# CONFIG_PATA_SC1200 is not set -+# CONFIG_PATA_SERVERWORKS is not set -+# CONFIG_PATA_SIL680 is not set -+# CONFIG_PATA_SIS is not set -+# CONFIG_PATA_TOSHIBA is not set -+# CONFIG_PATA_VIA is not set -+# CONFIG_PATA_WINBOND is not set -+# CONFIG_PATA_SCH is not set -+CONFIG_MD=y -+CONFIG_BLK_DEV_MD=m -+CONFIG_MD_LINEAR=m -+CONFIG_MD_RAID0=m -+CONFIG_MD_RAID1=m -+CONFIG_MD_RAID10=m -+CONFIG_MD_RAID456=m -+CONFIG_MD_RAID6_PQ=m -+# CONFIG_ASYNC_RAID6_TEST is not set -+# CONFIG_MD_MULTIPATH is not set -+# CONFIG_MD_FAULTY is not set -+CONFIG_BLK_DEV_DM=m -+# CONFIG_DM_DEBUG is not set -+CONFIG_DM_CRYPT=m -+CONFIG_DM_SNAPSHOT=m -+CONFIG_DM_MIRROR=m -+# CONFIG_DM_LOG_USERSPACE is not set -+CONFIG_DM_ZERO=m -+CONFIG_DM_MULTIPATH=m -+# CONFIG_DM_MULTIPATH_QL is not set -+# CONFIG_DM_MULTIPATH_ST is not set -+# CONFIG_DM_DELAY is not set -+# CONFIG_DM_UEVENT is not set -+# CONFIG_FUSION is not set -+ -+# -+# IEEE 1394 (FireWire) support -+# -+ -+# -+# You can enable one or both FireWire driver stacks. -+# -+ -+# -+# The newer stack is recommended. -+# -+# CONFIG_FIREWIRE is not set -+# CONFIG_IEEE1394 is not set -+# CONFIG_I2O is not set -+CONFIG_NETDEVICES=y -+# CONFIG_IFB is not set -+# CONFIG_DUMMY is not set -+# CONFIG_BONDING is not set -+# CONFIG_MACVLAN is not set -+# CONFIG_EQUALIZER is not set -+CONFIG_TUN=m -+# CONFIG_VETH is not set -+# CONFIG_ARCNET is not set -+CONFIG_PHYLIB=y -+ -+# -+# MII PHY device drivers -+# -+CONFIG_MARVELL_PHY=y -+# CONFIG_DAVICOM_PHY is not set -+# CONFIG_QSEMI_PHY is not set -+# CONFIG_LXT_PHY is not set -+# CONFIG_CICADA_PHY is not set -+# CONFIG_VITESSE_PHY is not set -+# CONFIG_SMSC_PHY is not set -+# CONFIG_BROADCOM_PHY is not set -+# CONFIG_ICPLUS_PHY is not set -+# CONFIG_REALTEK_PHY is not set -+# CONFIG_NATIONAL_PHY is not set -+# CONFIG_STE10XP is not set -+# CONFIG_LSI_ET1011C_PHY is not set -+# CONFIG_FIXED_PHY is not set -+# CONFIG_MDIO_BITBANG is not set -+CONFIG_NET_ETHERNET=y -+CONFIG_MII=y -+# CONFIG_AX88796 is not set -+# CONFIG_HAPPYMEAL is not set -+# CONFIG_SUNGEM is not set -+# CONFIG_CASSINI is not set -+# CONFIG_NET_VENDOR_3COM is not set -+# CONFIG_SMC91X is not set -+# CONFIG_DM9000 is not set -+# CONFIG_ENC28J60 is not set -+# CONFIG_ETHOC is not set -+# CONFIG_SMC911X is not set -+# CONFIG_SMSC911X is not set -+# CONFIG_DNET is not set -+# CONFIG_NET_TULIP is not set -+# CONFIG_HP100 is not set -+# CONFIG_IBM_NEW_EMAC_ZMII is not set -+# CONFIG_IBM_NEW_EMAC_RGMII is not set -+# CONFIG_IBM_NEW_EMAC_TAH is not set -+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set -+# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set -+# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set -+# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set -+CONFIG_NET_PCI=y -+# CONFIG_PCNET32 is not set -+# CONFIG_AMD8111_ETH is not set -+# CONFIG_ADAPTEC_STARFIRE is not set -+# CONFIG_B44 is not set -+# CONFIG_FORCEDETH is not set -+# CONFIG_E100 is not set -+# CONFIG_FEALNX is not set -+# CONFIG_NATSEMI is not set -+# CONFIG_NE2K_PCI is not set -+# CONFIG_8139CP is not set -+# CONFIG_8139TOO is not set -+# CONFIG_R6040 is not set -+# CONFIG_SIS900 is not set -+# CONFIG_EPIC100 is not set -+# CONFIG_SMSC9420 is not set -+# CONFIG_SUNDANCE is not set -+# CONFIG_TLAN is not set -+# CONFIG_KS8842 is not set -+# CONFIG_KS8851 is not set -+# CONFIG_KS8851_MLL is not set -+# CONFIG_VIA_RHINE is not set -+# CONFIG_SC92031 is not set -+# CONFIG_ATL2 is not set -+CONFIG_NETDEV_1000=y -+# CONFIG_ACENIC is not set -+# CONFIG_DL2K is not set -+# CONFIG_E1000 is not set -+# CONFIG_E1000E is not set -+# CONFIG_IP1000 is not set -+# CONFIG_IGB is not set -+# CONFIG_IGBVF is not set -+# CONFIG_NS83820 is not set -+# CONFIG_HAMACHI is not set -+# CONFIG_YELLOWFIN is not set -+# CONFIG_R8169 is not set -+# CONFIG_SIS190 is not set -+# CONFIG_SKGE is not set -+# CONFIG_SKY2 is not set -+# CONFIG_VIA_VELOCITY is not set -+# CONFIG_TIGON3 is not set -+# CONFIG_BNX2 is not set -+# CONFIG_CNIC is not set -+CONFIG_MV643XX_ETH=y -+# CONFIG_QLA3XXX is not set -+# CONFIG_ATL1 is not set -+# CONFIG_ATL1E is not set -+# CONFIG_ATL1C is not set -+# CONFIG_JME is not set -+# CONFIG_NETDEV_10000 is not set -+# CONFIG_TR is not set -+CONFIG_WLAN=y -+# CONFIG_LIBERTAS_THINFIRM is not set -+CONFIG_LIBERTAS_UAP=m -+# CONFIG_ATMEL is not set -+# CONFIG_AT76C50X_USB is not set -+# CONFIG_PRISM54 is not set -+# CONFIG_USB_ZD1201 is not set -+CONFIG_USB_NET_RNDIS_WLAN=m -+# CONFIG_RTL8180 is not set -+CONFIG_RTL8187=m -+# CONFIG_ADM8211 is not set -+# CONFIG_MAC80211_HWSIM is not set -+# CONFIG_MWL8K is not set -+# CONFIG_ATH_COMMON is not set -+# CONFIG_B43 is not set -+# CONFIG_B43LEGACY is not set -+# CONFIG_HOSTAP is not set -+# CONFIG_IPW2100 is not set -+# CONFIG_IPW2200 is not set -+# CONFIG_IWLWIFI is not set -+# CONFIG_IWM is not set -+CONFIG_LIBERTAS=m -+# CONFIG_LIBERTAS_USB is not set -+CONFIG_LIBERTAS_SDIO=m -+# CONFIG_LIBERTAS_SPI is not set -+# CONFIG_LIBERTAS_DEBUG is not set -+# CONFIG_HERMES is not set -+# CONFIG_P54_COMMON is not set -+# CONFIG_RT2X00 is not set -+# CONFIG_WL12XX is not set -+# CONFIG_ZD1211RW is not set -+ -+# -+# Enable WiMAX (Networking options) to see the WiMAX drivers -+# -+ -+# -+# USB Network Adapters -+# -+CONFIG_USB_CATC=m -+CONFIG_USB_KAWETH=m -+CONFIG_USB_PEGASUS=m -+CONFIG_USB_RTL8150=m -+CONFIG_USB_USBNET=m -+CONFIG_USB_NET_AX8817X=m -+CONFIG_USB_NET_CDCETHER=m -+# CONFIG_USB_NET_CDC_EEM is not set -+CONFIG_USB_NET_DM9601=m -+# CONFIG_USB_NET_SMSC95XX is not set -+# CONFIG_USB_NET_GL620A is not set -+CONFIG_USB_NET_NET1080=m -+# CONFIG_USB_NET_PLUSB is not set -+# CONFIG_USB_NET_MCS7830 is not set -+CONFIG_USB_NET_RNDIS_HOST=m -+CONFIG_USB_NET_CDC_SUBSET=m -+# CONFIG_USB_ALI_M5632 is not set -+# CONFIG_USB_AN2720 is not set -+CONFIG_USB_BELKIN=y -+CONFIG_USB_ARMLINUX=y -+# CONFIG_USB_EPSON2888 is not set -+# CONFIG_USB_KC2190 is not set -+CONFIG_USB_NET_ZAURUS=m -+# CONFIG_USB_NET_INT51X1 is not set -+# CONFIG_WAN is not set -+# CONFIG_FDDI is not set -+# CONFIG_HIPPI is not set -+CONFIG_PPP=m -+CONFIG_PPP_MULTILINK=y -+CONFIG_PPP_FILTER=y -+CONFIG_PPP_ASYNC=m -+CONFIG_PPP_SYNC_TTY=m -+CONFIG_PPP_DEFLATE=m -+CONFIG_PPP_BSDCOMP=m -+CONFIG_PPP_MPPE=m -+CONFIG_PPPOE=m -+CONFIG_PPPOL2TP=m -+# CONFIG_SLIP is not set -+CONFIG_SLHC=m -+# CONFIG_NET_FC is not set -+# CONFIG_NETCONSOLE is not set -+# CONFIG_NETPOLL is not set -+# CONFIG_NET_POLL_CONTROLLER is not set -+# CONFIG_VMXNET3 is not set -+# CONFIG_ISDN is not set -+# CONFIG_PHONE is not set -+ -+# -+# Input device support -+# -+CONFIG_INPUT=y -+# CONFIG_INPUT_FF_MEMLESS is not set -+# CONFIG_INPUT_POLLDEV is not set -+# CONFIG_INPUT_SPARSEKMAP is not set -+ -+# -+# Userland interfaces -+# -+CONFIG_INPUT_MOUSEDEV=y -+CONFIG_INPUT_MOUSEDEV_PSAUX=y -+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 -+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 -+# CONFIG_INPUT_JOYDEV is not set -+CONFIG_INPUT_EVDEV=y -+# CONFIG_INPUT_EVBUG is not set -+ -+# -+# Input Device Drivers -+# -+CONFIG_INPUT_KEYBOARD=y -+# CONFIG_KEYBOARD_ADP5588 is not set -+CONFIG_KEYBOARD_ATKBD=y -+# CONFIG_QT2160 is not set -+# CONFIG_KEYBOARD_LKKBD is not set -+CONFIG_KEYBOARD_GPIO=y -+# CONFIG_KEYBOARD_MATRIX is not set -+# CONFIG_KEYBOARD_LM8323 is not set -+# CONFIG_KEYBOARD_MAX7359 is not set -+# CONFIG_KEYBOARD_NEWTON is not set -+# CONFIG_KEYBOARD_OPENCORES is not set -+# CONFIG_KEYBOARD_STOWAWAY is not set -+# CONFIG_KEYBOARD_SUNKBD is not set -+# CONFIG_KEYBOARD_XTKBD is not set -+# CONFIG_INPUT_MOUSE is not set -+# CONFIG_INPUT_JOYSTICK is not set -+# CONFIG_INPUT_TABLET is not set -+# CONFIG_INPUT_TOUCHSCREEN is not set -+# CONFIG_INPUT_MISC is not set -+ -+# -+# Hardware I/O ports -+# -+CONFIG_SERIO=y -+CONFIG_SERIO_SERPORT=y -+# CONFIG_SERIO_PCIPS2 is not set -+CONFIG_SERIO_LIBPS2=y -+# CONFIG_SERIO_RAW is not set -+# CONFIG_SERIO_ALTERA_PS2 is not set -+# CONFIG_GAMEPORT is not set -+ -+# -+# Character devices -+# -+CONFIG_VT=y -+CONFIG_CONSOLE_TRANSLATIONS=y -+CONFIG_VT_CONSOLE=y -+CONFIG_HW_CONSOLE=y -+# CONFIG_VT_HW_CONSOLE_BINDING is not set -+# CONFIG_DEVKMEM is not set -+# CONFIG_SERIAL_NONSTANDARD is not set -+# CONFIG_NOZOMI is not set -+ -+# -+# Serial drivers -+# -+CONFIG_SERIAL_8250=y -+CONFIG_SERIAL_8250_CONSOLE=y -+CONFIG_SERIAL_8250_PCI=y -+CONFIG_SERIAL_8250_NR_UARTS=4 -+CONFIG_SERIAL_8250_RUNTIME_UARTS=2 -+# CONFIG_SERIAL_8250_EXTENDED is not set -+ -+# -+# Non-8250 serial port support -+# -+# CONFIG_SERIAL_MAX3100 is not set -+CONFIG_SERIAL_CORE=y -+CONFIG_SERIAL_CORE_CONSOLE=y -+# CONFIG_SERIAL_JSM is not set -+CONFIG_UNIX98_PTYS=y -+# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set -+CONFIG_LEGACY_PTYS=y -+CONFIG_LEGACY_PTY_COUNT=16 -+# CONFIG_IPMI_HANDLER is not set -+# CONFIG_HW_RANDOM is not set -+# CONFIG_R3964 is not set -+# CONFIG_APPLICOM is not set -+# CONFIG_RAW_DRIVER is not set -+# CONFIG_TCG_TPM is not set -+CONFIG_DEVPORT=y -+CONFIG_I2C=y -+CONFIG_I2C_BOARDINFO=y -+CONFIG_I2C_COMPAT=y -+CONFIG_I2C_CHARDEV=y -+CONFIG_I2C_HELPER_AUTO=y -+CONFIG_I2C_ALGOBIT=m -+ -+# -+# I2C Hardware Bus support -+# -+ -+# -+# PC SMBus host controller drivers -+# -+# CONFIG_I2C_ALI1535 is not set -+# CONFIG_I2C_ALI1563 is not set -+# CONFIG_I2C_ALI15X3 is not set -+# CONFIG_I2C_AMD756 is not set -+# CONFIG_I2C_AMD8111 is not set -+# CONFIG_I2C_I801 is not set -+# CONFIG_I2C_ISCH is not set -+# CONFIG_I2C_PIIX4 is not set -+# CONFIG_I2C_NFORCE2 is not set -+# CONFIG_I2C_SIS5595 is not set -+# CONFIG_I2C_SIS630 is not set -+# CONFIG_I2C_SIS96X is not set -+# CONFIG_I2C_VIA is not set -+# CONFIG_I2C_VIAPRO is not set -+ -+# -+# I2C system bus drivers (mostly embedded / system-on-chip) -+# -+# CONFIG_I2C_GPIO is not set -+CONFIG_I2C_MV64XXX=y -+# CONFIG_I2C_OCORES is not set -+# CONFIG_I2C_SIMTEC is not set -+ -+# -+# External I2C/SMBus adapter drivers -+# -+# CONFIG_I2C_PARPORT_LIGHT is not set -+# CONFIG_I2C_TAOS_EVM is not set -+# CONFIG_I2C_TINY_USB is not set -+ -+# -+# Other I2C/SMBus bus drivers -+# -+# CONFIG_I2C_PCA_PLATFORM is not set -+# CONFIG_I2C_STUB is not set -+ -+# -+# Miscellaneous I2C Chip support -+# -+# CONFIG_SENSORS_TSL2550 is not set -+# CONFIG_I2C_DEBUG_CORE is not set -+# CONFIG_I2C_DEBUG_ALGO is not set -+# CONFIG_I2C_DEBUG_BUS is not set -+# CONFIG_I2C_DEBUG_CHIP is not set -+CONFIG_SPI=y -+# CONFIG_SPI_DEBUG is not set -+CONFIG_SPI_MASTER=y -+ -+# -+# SPI Master Controller Drivers -+# -+# CONFIG_SPI_BITBANG is not set -+# CONFIG_SPI_GPIO is not set -+CONFIG_SPI_ORION=y -+# CONFIG_SPI_XILINX is not set -+# CONFIG_SPI_DESIGNWARE is not set -+ -+# -+# SPI Protocol Masters -+# -+# CONFIG_SPI_SPIDEV is not set -+# CONFIG_SPI_TLE62X0 is not set -+ -+# -+# PPS support -+# -+# CONFIG_PPS is not set -+CONFIG_ARCH_REQUIRE_GPIOLIB=y -+CONFIG_GPIOLIB=y -+# CONFIG_DEBUG_GPIO is not set -+# CONFIG_GPIO_SYSFS is not set -+ -+# -+# Memory mapped GPIO expanders: -+# -+ -+# -+# I2C GPIO expanders: -+# -+# CONFIG_GPIO_MAX732X is not set -+# CONFIG_GPIO_PCA953X is not set -+# CONFIG_GPIO_PCF857X is not set -+# CONFIG_GPIO_ADP5588 is not set -+ -+# -+# PCI GPIO expanders: -+# -+# CONFIG_GPIO_CS5535 is not set -+# CONFIG_GPIO_BT8XX is not set -+# CONFIG_GPIO_LANGWELL is not set -+ -+# -+# SPI GPIO expanders: -+# -+# CONFIG_GPIO_MAX7301 is not set -+# CONFIG_GPIO_MCP23S08 is not set -+# CONFIG_GPIO_MC33880 is not set -+ -+# -+# AC97 GPIO expanders: -+# -+# CONFIG_W1 is not set -+# CONFIG_POWER_SUPPLY is not set -+# CONFIG_HWMON is not set -+# CONFIG_THERMAL is not set -+CONFIG_WATCHDOG=y -+# CONFIG_WATCHDOG_NOWAYOUT is not set -+ -+# -+# Watchdog Device Drivers -+# -+CONFIG_SOFT_WATCHDOG=m -+CONFIG_ORION_WATCHDOG=m -+# CONFIG_ALIM7101_WDT is not set -+ -+# -+# PCI-based Watchdog Cards -+# -+# CONFIG_PCIPCWATCHDOG is not set -+# CONFIG_WDTPCI is not set -+ -+# -+# USB-based Watchdog Cards -+# -+# CONFIG_USBPCWATCHDOG is not set -+CONFIG_SSB_POSSIBLE=y -+ -+# -+# Sonics Silicon Backplane -+# -+# CONFIG_SSB is not set -+ -+# -+# Multifunction device drivers -+# -+# CONFIG_MFD_CORE is not set -+# CONFIG_MFD_SM501 is not set -+# CONFIG_MFD_ASIC3 is not set -+# CONFIG_HTC_EGPIO is not set -+# CONFIG_HTC_PASIC3 is not set -+# CONFIG_TPS65010 is not set -+# CONFIG_TWL4030_CORE is not set -+# CONFIG_MFD_TMIO is not set -+# CONFIG_MFD_TC6393XB is not set -+# CONFIG_PMIC_DA903X is not set -+# CONFIG_PMIC_ADP5520 is not set -+# CONFIG_MFD_WM8400 is not set -+# CONFIG_MFD_WM831X is not set -+# CONFIG_MFD_WM8350_I2C is not set -+# CONFIG_MFD_PCF50633 is not set -+# CONFIG_MFD_MC13783 is not set -+# CONFIG_AB3100_CORE is not set -+# CONFIG_EZX_PCAP is not set -+# CONFIG_MFD_88PM8607 is not set -+# CONFIG_AB4500_CORE is not set -+# CONFIG_REGULATOR is not set -+CONFIG_MEDIA_SUPPORT=m -+ -+# -+# Multimedia core support -+# -+CONFIG_VIDEO_DEV=m -+CONFIG_VIDEO_V4L2_COMMON=m -+CONFIG_VIDEO_ALLOW_V4L1=y -+CONFIG_VIDEO_V4L1_COMPAT=y -+CONFIG_DVB_CORE=m -+CONFIG_VIDEO_MEDIA=m -+ -+# -+# Multimedia drivers -+# -+CONFIG_IR_CORE=m -+CONFIG_VIDEO_IR=m -+CONFIG_MEDIA_ATTACH=y -+CONFIG_MEDIA_TUNER=m -+CONFIG_MEDIA_TUNER_CUSTOMISE=y -+CONFIG_MEDIA_TUNER_SIMPLE=m -+CONFIG_MEDIA_TUNER_TDA8290=m -+CONFIG_MEDIA_TUNER_TDA827X=m -+CONFIG_MEDIA_TUNER_TDA18271=m -+CONFIG_MEDIA_TUNER_TDA9887=m -+CONFIG_MEDIA_TUNER_TEA5761=m -+CONFIG_MEDIA_TUNER_TEA5767=m -+CONFIG_MEDIA_TUNER_MT20XX=m -+CONFIG_MEDIA_TUNER_MT2060=m -+CONFIG_MEDIA_TUNER_MT2266=m -+CONFIG_MEDIA_TUNER_MT2131=m -+CONFIG_MEDIA_TUNER_QT1010=m -+CONFIG_MEDIA_TUNER_XC2028=m -+CONFIG_MEDIA_TUNER_XC5000=m -+CONFIG_MEDIA_TUNER_MXL5005S=m -+CONFIG_MEDIA_TUNER_MXL5007T=m -+CONFIG_MEDIA_TUNER_MC44S803=m -+CONFIG_MEDIA_TUNER_MAX2165=m -+CONFIG_VIDEO_V4L2=m -+CONFIG_VIDEO_V4L1=m -+CONFIG_VIDEOBUF_GEN=m -+CONFIG_VIDEOBUF_VMALLOC=m -+CONFIG_VIDEOBUF_DVB=m -+CONFIG_VIDEO_TVEEPROM=m -+CONFIG_VIDEO_TUNER=m -+CONFIG_VIDEO_CAPTURE_DRIVERS=y -+# CONFIG_VIDEO_ADV_DEBUG is not set -+# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set -+CONFIG_VIDEO_HELPER_CHIPS_AUTO=y -+CONFIG_VIDEO_IR_I2C=m -+CONFIG_VIDEO_MSP3400=m -+CONFIG_VIDEO_CS53L32A=m -+CONFIG_VIDEO_M52790=m -+CONFIG_VIDEO_WM8775=m -+CONFIG_VIDEO_WM8739=m -+CONFIG_VIDEO_VP27SMPX=m -+CONFIG_VIDEO_MT9V011=m -+CONFIG_VIDEO_SAA711X=m -+CONFIG_VIDEO_SAA717X=m -+CONFIG_VIDEO_TVP5150=m -+CONFIG_VIDEO_CX25840=m -+CONFIG_VIDEO_CX2341X=m -+CONFIG_VIDEO_SAA7127=m -+CONFIG_VIDEO_UPD64031A=m -+CONFIG_VIDEO_UPD64083=m -+# CONFIG_VIDEO_VIVI is not set -+# CONFIG_VIDEO_BT848 is not set -+# CONFIG_VIDEO_CPIA is not set -+# CONFIG_VIDEO_CPIA2 is not set -+# CONFIG_VIDEO_SAA5246A is not set -+# CONFIG_VIDEO_SAA5249 is not set -+# CONFIG_VIDEO_STRADIS is not set -+# CONFIG_VIDEO_ZORAN is not set -+# CONFIG_VIDEO_SAA7134 is not set -+# CONFIG_VIDEO_MXB is not set -+# CONFIG_VIDEO_HEXIUM_ORION is not set -+# CONFIG_VIDEO_HEXIUM_GEMINI is not set -+# CONFIG_VIDEO_CX88 is not set -+# CONFIG_VIDEO_CX23885 is not set -+# CONFIG_VIDEO_AU0828 is not set -+CONFIG_VIDEO_IVTV=m -+# CONFIG_VIDEO_FB_IVTV is not set -+# CONFIG_VIDEO_CX18 is not set -+# CONFIG_VIDEO_SAA7164 is not set -+# CONFIG_VIDEO_CAFE_CCIC is not set -+# CONFIG_SOC_CAMERA is not set -+CONFIG_V4L_USB_DRIVERS=y -+CONFIG_USB_VIDEO_CLASS=m -+CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y -+CONFIG_USB_GSPCA=m -+CONFIG_USB_M5602=m -+CONFIG_USB_STV06XX=m -+CONFIG_USB_GL860=m -+CONFIG_USB_GSPCA_CONEX=m -+CONFIG_USB_GSPCA_ETOMS=m -+CONFIG_USB_GSPCA_FINEPIX=m -+CONFIG_USB_GSPCA_JEILINJ=m -+CONFIG_USB_GSPCA_MARS=m -+CONFIG_USB_GSPCA_MR97310A=m -+CONFIG_USB_GSPCA_OV519=m -+CONFIG_USB_GSPCA_OV534=m -+CONFIG_USB_GSPCA_PAC207=m -+CONFIG_USB_GSPCA_PAC7302=m -+CONFIG_USB_GSPCA_PAC7311=m -+CONFIG_USB_GSPCA_SN9C20X=m -+# CONFIG_USB_GSPCA_SN9C20X_EVDEV is not set -+CONFIG_USB_GSPCA_SONIXB=m -+CONFIG_USB_GSPCA_SONIXJ=m -+CONFIG_USB_GSPCA_SPCA500=m -+CONFIG_USB_GSPCA_SPCA501=m -+CONFIG_USB_GSPCA_SPCA505=m -+CONFIG_USB_GSPCA_SPCA506=m -+CONFIG_USB_GSPCA_SPCA508=m -+CONFIG_USB_GSPCA_SPCA561=m -+CONFIG_USB_GSPCA_SQ905=m -+CONFIG_USB_GSPCA_SQ905C=m -+CONFIG_USB_GSPCA_STK014=m -+CONFIG_USB_GSPCA_STV0680=m -+CONFIG_USB_GSPCA_SUNPLUS=m -+CONFIG_USB_GSPCA_T613=m -+CONFIG_USB_GSPCA_TV8532=m -+CONFIG_USB_GSPCA_VC032X=m -+CONFIG_USB_GSPCA_ZC3XX=m -+CONFIG_VIDEO_PVRUSB2=m -+CONFIG_VIDEO_PVRUSB2_SYSFS=y -+CONFIG_VIDEO_PVRUSB2_DVB=y -+# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set -+# CONFIG_VIDEO_HDPVR is not set -+CONFIG_VIDEO_EM28XX=m -+CONFIG_VIDEO_EM28XX_ALSA=m -+CONFIG_VIDEO_EM28XX_DVB=m -+# CONFIG_VIDEO_CX231XX is not set -+# CONFIG_VIDEO_USBVISION is not set -+CONFIG_VIDEO_USBVIDEO=m -+# CONFIG_USB_VICAM is not set -+CONFIG_USB_IBMCAM=m -+# CONFIG_USB_KONICAWC is not set -+# CONFIG_USB_QUICKCAM_MESSENGER is not set -+# CONFIG_USB_ET61X251 is not set -+# CONFIG_VIDEO_OVCAMCHIP is not set -+# CONFIG_USB_OV511 is not set -+# CONFIG_USB_SE401 is not set -+# CONFIG_USB_SN9C102 is not set -+# CONFIG_USB_STV680 is not set -+# CONFIG_USB_ZC0301 is not set -+# CONFIG_USB_PWC is not set -+CONFIG_USB_PWC_INPUT_EVDEV=y -+# CONFIG_USB_ZR364XX is not set -+# CONFIG_USB_STKWEBCAM is not set -+# CONFIG_USB_S2255 is not set -+# CONFIG_RADIO_ADAPTERS is not set -+CONFIG_DVB_MAX_ADAPTERS=8 -+# CONFIG_DVB_DYNAMIC_MINORS is not set -+CONFIG_DVB_CAPTURE_DRIVERS=y -+ -+# -+# Supported SAA7146 based PCI Adapters -+# -+# CONFIG_TTPCI_EEPROM is not set -+# CONFIG_DVB_AV7110 is not set -+# CONFIG_DVB_BUDGET_CORE is not set -+ -+# -+# Supported USB Adapters -+# -+# CONFIG_DVB_USB is not set -+# CONFIG_DVB_TTUSB_BUDGET is not set -+# CONFIG_DVB_TTUSB_DEC is not set -+# CONFIG_SMS_SIANO_MDTV is not set -+ -+# -+# Supported FlexCopII (B2C2) Adapters -+# -+# CONFIG_DVB_B2C2_FLEXCOP is not set -+ -+# -+# Supported BT878 Adapters -+# -+ -+# -+# Supported Pluto2 Adapters -+# -+# CONFIG_DVB_PLUTO2 is not set -+ -+# -+# Supported SDMC DM1105 Adapters -+# -+# CONFIG_DVB_DM1105 is not set -+ -+# -+# Supported Earthsoft PT1 Adapters -+# -+# CONFIG_DVB_PT1 is not set -+ -+# -+# Supported Mantis Adapters -+# -+# CONFIG_MANTIS_CORE is not set -+ -+# -+# Supported DVB Frontends -+# -+# CONFIG_DVB_FE_CUSTOMISE is not set -+CONFIG_DVB_ZL10353=m -+CONFIG_DVB_TDA10048=m -+CONFIG_DVB_TDA10023=m -+CONFIG_DVB_LGDT330X=m -+CONFIG_DVB_S5H1409=m -+CONFIG_DVB_S5H1411=m -+# CONFIG_DAB is not set -+ -+# -+# Graphics support -+# -+CONFIG_VGA_ARB=y -+# CONFIG_DRM is not set -+# CONFIG_VGASTATE is not set -+# CONFIG_VIDEO_OUTPUT_CONTROL is not set -+CONFIG_FB=m -+# CONFIG_FIRMWARE_EDID is not set -+# CONFIG_FB_DDC is not set -+# CONFIG_FB_BOOT_VESA_SUPPORT is not set -+# CONFIG_FB_CFB_FILLRECT is not set -+# CONFIG_FB_CFB_COPYAREA is not set -+# CONFIG_FB_CFB_IMAGEBLIT is not set -+# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set -+# CONFIG_FB_SYS_FILLRECT is not set -+# CONFIG_FB_SYS_COPYAREA is not set -+# CONFIG_FB_SYS_IMAGEBLIT is not set -+# CONFIG_FB_FOREIGN_ENDIAN is not set -+# CONFIG_FB_SYS_FOPS is not set -+# CONFIG_FB_SVGALIB is not set -+# CONFIG_FB_MACMODES is not set -+# CONFIG_FB_BACKLIGHT is not set -+# CONFIG_FB_MODE_HELPERS is not set -+# CONFIG_FB_TILEBLITTING is not set -+ -+# -+# Frame buffer hardware drivers -+# -+# CONFIG_FB_CIRRUS is not set -+# CONFIG_FB_PM2 is not set -+# CONFIG_FB_CYBER2000 is not set -+# CONFIG_FB_S1D13XXX is not set -+# CONFIG_FB_NVIDIA is not set -+# CONFIG_FB_RIVA is not set -+# CONFIG_FB_MATROX is not set -+# CONFIG_FB_RADEON is not set -+# CONFIG_FB_ATY128 is not set -+# CONFIG_FB_ATY is not set -+# CONFIG_FB_S3 is not set -+# CONFIG_FB_SAVAGE is not set -+# CONFIG_FB_SIS is not set -+# CONFIG_FB_VIA is not set -+# CONFIG_FB_NEOMAGIC is not set -+# CONFIG_FB_KYRO is not set -+# CONFIG_FB_3DFX is not set -+# CONFIG_FB_VOODOO1 is not set -+# CONFIG_FB_VT8623 is not set -+# CONFIG_FB_TRIDENT is not set -+# CONFIG_FB_ARK is not set -+# CONFIG_FB_PM3 is not set -+# CONFIG_FB_CARMINE is not set -+# CONFIG_FB_VIRTUAL is not set -+# CONFIG_FB_METRONOME is not set -+# CONFIG_FB_MB862XX is not set -+# CONFIG_FB_BROADSHEET is not set -+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set -+ -+# -+# Display device support -+# -+# CONFIG_DISPLAY_SUPPORT is not set -+ -+# -+# Console display driver support -+# -+# CONFIG_VGA_CONSOLE is not set -+CONFIG_DUMMY_CONSOLE=y -+CONFIG_FRAMEBUFFER_CONSOLE=m -+# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set -+# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set -+# CONFIG_FONTS is not set -+CONFIG_FONT_8x8=y -+CONFIG_FONT_8x16=y -+# CONFIG_LOGO is not set -+CONFIG_SOUND=m -+# CONFIG_SOUND_OSS_CORE is not set -+CONFIG_SND=m -+CONFIG_SND_TIMER=m -+CONFIG_SND_PCM=m -+CONFIG_SND_HWDEP=m -+CONFIG_SND_RAWMIDI=m -+CONFIG_SND_SEQUENCER=m -+# CONFIG_SND_SEQ_DUMMY is not set -+# CONFIG_SND_MIXER_OSS is not set -+# CONFIG_SND_PCM_OSS is not set -+# CONFIG_SND_SEQUENCER_OSS is not set -+CONFIG_SND_HRTIMER=m -+CONFIG_SND_SEQ_HRTIMER_DEFAULT=y -+# CONFIG_SND_DYNAMIC_MINORS is not set -+CONFIG_SND_SUPPORT_OLD_API=y -+CONFIG_SND_VERBOSE_PROCFS=y -+# CONFIG_SND_VERBOSE_PRINTK is not set -+# CONFIG_SND_DEBUG is not set -+CONFIG_SND_RAWMIDI_SEQ=m -+# CONFIG_SND_OPL3_LIB_SEQ is not set -+# CONFIG_SND_OPL4_LIB_SEQ is not set -+# CONFIG_SND_SBAWE_SEQ is not set -+# CONFIG_SND_EMU10K1_SEQ is not set -+CONFIG_SND_DRIVERS=y -+# CONFIG_SND_DUMMY is not set -+# CONFIG_SND_VIRMIDI is not set -+# CONFIG_SND_MTPAV is not set -+# CONFIG_SND_SERIAL_U16550 is not set -+# CONFIG_SND_MPU401 is not set -+# CONFIG_SND_PCI is not set -+CONFIG_SND_ARM=y -+CONFIG_SND_SPI=y -+CONFIG_SND_USB=y -+CONFIG_SND_USB_AUDIO=m -+CONFIG_SND_USB_CAIAQ=m -+# CONFIG_SND_USB_CAIAQ_INPUT is not set -+# CONFIG_SND_SOC is not set -+# CONFIG_SOUND_PRIME is not set -+CONFIG_HID_SUPPORT=y -+CONFIG_HID=y -+# CONFIG_HIDRAW is not set -+ -+# -+# USB Input Devices -+# -+CONFIG_USB_HID=y -+# CONFIG_HID_PID is not set -+CONFIG_USB_HIDDEV=y -+ -+# -+# Special HID drivers -+# -+CONFIG_HID_A4TECH=y -+CONFIG_HID_APPLE=y -+CONFIG_HID_BELKIN=y -+CONFIG_HID_CHERRY=y -+CONFIG_HID_CHICONY=y -+CONFIG_HID_CYPRESS=y -+CONFIG_HID_DRAGONRISE=y -+# CONFIG_DRAGONRISE_FF is not set -+CONFIG_HID_EZKEY=y -+CONFIG_HID_KYE=y -+CONFIG_HID_GYRATION=y -+CONFIG_HID_TWINHAN=y -+CONFIG_HID_KENSINGTON=y -+CONFIG_HID_LOGITECH=y -+# CONFIG_LOGITECH_FF is not set -+# CONFIG_LOGIRUMBLEPAD2_FF is not set -+CONFIG_HID_MICROSOFT=y -+CONFIG_HID_MONTEREY=y -+CONFIG_HID_NTRIG=y -+CONFIG_HID_PANTHERLORD=y -+# CONFIG_PANTHERLORD_FF is not set -+CONFIG_HID_PETALYNX=y -+CONFIG_HID_SAMSUNG=y -+CONFIG_HID_SONY=y -+CONFIG_HID_SUNPLUS=y -+CONFIG_HID_GREENASIA=y -+# CONFIG_GREENASIA_FF is not set -+CONFIG_HID_SMARTJOYPLUS=y -+# CONFIG_SMARTJOYPLUS_FF is not set -+CONFIG_HID_TOPSEED=y -+CONFIG_HID_THRUSTMASTER=y -+# CONFIG_THRUSTMASTER_FF is not set -+CONFIG_HID_WACOM=m -+CONFIG_HID_ZEROPLUS=y -+# CONFIG_ZEROPLUS_FF is not set -+CONFIG_USB_SUPPORT=y -+CONFIG_USB_ARCH_HAS_HCD=y -+CONFIG_USB_ARCH_HAS_OHCI=y -+CONFIG_USB_ARCH_HAS_EHCI=y -+CONFIG_USB=y -+# CONFIG_USB_DEBUG is not set -+# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set -+ -+# -+# Miscellaneous USB options -+# -+CONFIG_USB_DEVICEFS=y -+CONFIG_USB_DEVICE_CLASS=y -+# CONFIG_USB_DYNAMIC_MINORS is not set -+CONFIG_USB_SUSPEND=y -+# CONFIG_USB_OTG is not set -+# CONFIG_USB_MON is not set -+# CONFIG_USB_WUSB is not set -+# CONFIG_USB_WUSB_CBAF is not set -+ -+# -+# USB Host Controller Drivers -+# -+# CONFIG_USB_C67X00_HCD is not set -+# CONFIG_USB_XHCI_HCD is not set -+CONFIG_USB_EHCI_HCD=y -+CONFIG_USB_EHCI_ROOT_HUB_TT=y -+CONFIG_USB_EHCI_TT_NEWSCHED=y -+# CONFIG_USB_OXU210HP_HCD is not set -+# CONFIG_USB_ISP116X_HCD is not set -+# CONFIG_USB_ISP1760_HCD is not set -+# CONFIG_USB_ISP1362_HCD is not set -+# CONFIG_USB_OHCI_HCD is not set -+# CONFIG_USB_UHCI_HCD is not set -+# CONFIG_USB_SL811_HCD is not set -+# CONFIG_USB_R8A66597_HCD is not set -+# CONFIG_USB_WHCI_HCD is not set -+# CONFIG_USB_HWA_HCD is not set -+# CONFIG_USB_MUSB_HDRC is not set -+ -+# -+# USB Device Class drivers -+# -+CONFIG_USB_ACM=m -+CONFIG_USB_PRINTER=m -+CONFIG_USB_WDM=m -+# CONFIG_USB_TMC is not set -+ -+# -+# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may -+# -+ -+# -+# also be needed; see USB_STORAGE Help for more info -+# -+CONFIG_USB_STORAGE=y -+# CONFIG_USB_STORAGE_DEBUG is not set -+CONFIG_USB_STORAGE_DATAFAB=y -+CONFIG_USB_STORAGE_FREECOM=y -+# CONFIG_USB_STORAGE_ISD200 is not set -+# CONFIG_USB_STORAGE_USBAT is not set -+CONFIG_USB_STORAGE_SDDR09=y -+CONFIG_USB_STORAGE_SDDR55=y -+CONFIG_USB_STORAGE_JUMPSHOT=y -+# CONFIG_USB_STORAGE_ALAUDA is not set -+# CONFIG_USB_STORAGE_ONETOUCH is not set -+# CONFIG_USB_STORAGE_KARMA is not set -+# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set -+# CONFIG_USB_LIBUSUAL is not set -+ -+# -+# USB Imaging devices -+# -+# CONFIG_USB_MDC800 is not set -+# CONFIG_USB_MICROTEK is not set -+ -+# -+# USB port drivers -+# -+CONFIG_USB_SERIAL=m -+CONFIG_USB_EZUSB=y -+CONFIG_USB_SERIAL_GENERIC=y -+CONFIG_USB_SERIAL_AIRCABLE=m -+CONFIG_USB_SERIAL_ARK3116=m -+CONFIG_USB_SERIAL_BELKIN=m -+CONFIG_USB_SERIAL_CH341=m -+CONFIG_USB_SERIAL_WHITEHEAT=m -+CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m -+CONFIG_USB_SERIAL_CP210X=m -+CONFIG_USB_SERIAL_CYPRESS_M8=m -+CONFIG_USB_SERIAL_EMPEG=m -+CONFIG_USB_SERIAL_FTDI_SIO=m -+CONFIG_USB_SERIAL_FUNSOFT=m -+CONFIG_USB_SERIAL_VISOR=m -+CONFIG_USB_SERIAL_IPAQ=m -+CONFIG_USB_SERIAL_IR=m -+CONFIG_USB_SERIAL_EDGEPORT=m -+CONFIG_USB_SERIAL_EDGEPORT_TI=m -+CONFIG_USB_SERIAL_GARMIN=m -+CONFIG_USB_SERIAL_IPW=m -+CONFIG_USB_SERIAL_IUU=m -+CONFIG_USB_SERIAL_KEYSPAN_PDA=m -+CONFIG_USB_SERIAL_KEYSPAN=m -+# CONFIG_USB_SERIAL_KEYSPAN_MPR is not set -+# CONFIG_USB_SERIAL_KEYSPAN_USA28 is not set -+# CONFIG_USB_SERIAL_KEYSPAN_USA28X is not set -+# CONFIG_USB_SERIAL_KEYSPAN_USA28XA is not set -+# CONFIG_USB_SERIAL_KEYSPAN_USA28XB is not set -+# CONFIG_USB_SERIAL_KEYSPAN_USA19 is not set -+# CONFIG_USB_SERIAL_KEYSPAN_USA18X is not set -+# CONFIG_USB_SERIAL_KEYSPAN_USA19W is not set -+# CONFIG_USB_SERIAL_KEYSPAN_USA19QW is not set -+# CONFIG_USB_SERIAL_KEYSPAN_USA19QI is not set -+# CONFIG_USB_SERIAL_KEYSPAN_USA49W is not set -+# CONFIG_USB_SERIAL_KEYSPAN_USA49WLC is not set -+CONFIG_USB_SERIAL_KLSI=m -+CONFIG_USB_SERIAL_KOBIL_SCT=m -+CONFIG_USB_SERIAL_MCT_U232=m -+CONFIG_USB_SERIAL_MOS7720=m -+CONFIG_USB_SERIAL_MOS7840=m -+CONFIG_USB_SERIAL_MOTOROLA=m -+CONFIG_USB_SERIAL_NAVMAN=m -+CONFIG_USB_SERIAL_PL2303=m -+CONFIG_USB_SERIAL_OTI6858=m -+CONFIG_USB_SERIAL_QUALCOMM=m -+CONFIG_USB_SERIAL_SPCP8X5=m -+CONFIG_USB_SERIAL_HP4X=m -+CONFIG_USB_SERIAL_SAFE=m -+# CONFIG_USB_SERIAL_SAFE_PADDED is not set -+CONFIG_USB_SERIAL_SIEMENS_MPI=m -+CONFIG_USB_SERIAL_SIERRAWIRELESS=m -+CONFIG_USB_SERIAL_SYMBOL=m -+CONFIG_USB_SERIAL_TI=m -+CONFIG_USB_SERIAL_CYBERJACK=m -+CONFIG_USB_SERIAL_XIRCOM=m -+CONFIG_USB_SERIAL_OPTION=m -+CONFIG_USB_SERIAL_OMNINET=m -+CONFIG_USB_SERIAL_OPTICON=m -+CONFIG_USB_SERIAL_DEBUG=m -+ -+# -+# USB Miscellaneous drivers -+# -+CONFIG_USB_EMI62=m -+CONFIG_USB_EMI26=m -+# CONFIG_USB_ADUTUX is not set -+# CONFIG_USB_SEVSEG is not set -+# CONFIG_USB_RIO500 is not set -+# CONFIG_USB_LEGOTOWER is not set -+# CONFIG_USB_LCD is not set -+# CONFIG_USB_BERRY_CHARGE is not set -+# CONFIG_USB_LED is not set -+# CONFIG_USB_CYPRESS_CY7C63 is not set -+# CONFIG_USB_CYTHERM is not set -+# CONFIG_USB_IDMOUSE is not set -+# CONFIG_USB_FTDI_ELAN is not set -+# CONFIG_USB_APPLEDISPLAY is not set -+CONFIG_USB_SISUSBVGA=m -+CONFIG_USB_SISUSBVGA_CON=y -+# CONFIG_USB_LD is not set -+# CONFIG_USB_TRANCEVIBRATOR is not set -+# CONFIG_USB_IOWARRIOR is not set -+# CONFIG_USB_TEST is not set -+# CONFIG_USB_ISIGHTFW is not set -+# CONFIG_USB_VST is not set -+# CONFIG_USB_GADGET is not set -+ -+# -+# OTG and related infrastructure -+# -+# CONFIG_USB_GPIO_VBUS is not set -+# CONFIG_USB_ULPI is not set -+# CONFIG_NOP_USB_XCEIV is not set -+# CONFIG_UWB is not set -+CONFIG_MMC=y -+# CONFIG_MMC_DEBUG is not set -+# CONFIG_MMC_UNSAFE_RESUME is not set -+ -+# -+# MMC/SD/SDIO Card Drivers -+# -+CONFIG_MMC_BLOCK=y -+CONFIG_MMC_BLOCK_BOUNCE=y -+CONFIG_SDIO_UART=y -+# CONFIG_MMC_TEST is not set -+ -+# -+# MMC/SD/SDIO Host Controller Drivers -+# -+CONFIG_MMC_SDHCI=y -+# CONFIG_MMC_SDHCI_PCI is not set -+CONFIG_MMC_SDHCI_PLTFM=y -+# CONFIG_MMC_AT91 is not set -+# CONFIG_MMC_ATMELMCI is not set -+# CONFIG_MMC_TIFM_SD is not set -+CONFIG_MMC_MVSDIO=y -+# CONFIG_MMC_SPI is not set -+# CONFIG_MMC_CB710 is not set -+# CONFIG_MMC_VIA_SDMMC is not set -+# CONFIG_MEMSTICK is not set -+CONFIG_NEW_LEDS=y -+CONFIG_LEDS_CLASS=y -+ -+# -+# LED drivers -+# -+# CONFIG_LEDS_PCA9532 is not set -+CONFIG_LEDS_GPIO=y -+CONFIG_LEDS_GPIO_PLATFORM=y -+# CONFIG_LEDS_LP3944 is not set -+# CONFIG_LEDS_PCA955X is not set -+# CONFIG_LEDS_DAC124S085 is not set -+# CONFIG_LEDS_BD2802 is not set -+# CONFIG_LEDS_LT3593 is not set -+ -+# -+# LED Triggers -+# -+CONFIG_LEDS_TRIGGERS=y -+CONFIG_LEDS_TRIGGER_TIMER=y -+CONFIG_LEDS_TRIGGER_HEARTBEAT=y -+# CONFIG_LEDS_TRIGGER_BACKLIGHT is not set -+CONFIG_LEDS_TRIGGER_GPIO=m -+CONFIG_LEDS_TRIGGER_DEFAULT_ON=y -+ -+# -+# iptables trigger is under Netfilter config (LED target) -+# -+# CONFIG_ACCESSIBILITY is not set -+# CONFIG_INFINIBAND is not set -+CONFIG_RTC_LIB=y -+CONFIG_RTC_CLASS=y -+CONFIG_RTC_HCTOSYS=y -+CONFIG_RTC_HCTOSYS_DEVICE="rtc0" -+# CONFIG_RTC_DEBUG is not set -+ -+# -+# RTC interfaces -+# -+CONFIG_RTC_INTF_SYSFS=y -+CONFIG_RTC_INTF_PROC=y -+CONFIG_RTC_INTF_DEV=y -+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set -+# CONFIG_RTC_DRV_TEST is not set -+ -+# -+# I2C RTC drivers -+# -+# CONFIG_RTC_DRV_DS1307 is not set -+# CONFIG_RTC_DRV_DS1374 is not set -+# CONFIG_RTC_DRV_DS1672 is not set -+# CONFIG_RTC_DRV_MAX6900 is not set -+# CONFIG_RTC_DRV_RS5C372 is not set -+# CONFIG_RTC_DRV_ISL1208 is not set -+# CONFIG_RTC_DRV_X1205 is not set -+# CONFIG_RTC_DRV_PCF8563 is not set -+# CONFIG_RTC_DRV_PCF8583 is not set -+# CONFIG_RTC_DRV_M41T80 is not set -+# CONFIG_RTC_DRV_BQ32K is not set -+CONFIG_RTC_DRV_S35390A=y -+# CONFIG_RTC_DRV_FM3130 is not set -+# CONFIG_RTC_DRV_RX8581 is not set -+# CONFIG_RTC_DRV_RX8025 is not set -+ -+# -+# SPI RTC drivers -+# -+# CONFIG_RTC_DRV_M41T94 is not set -+# CONFIG_RTC_DRV_DS1305 is not set -+# CONFIG_RTC_DRV_DS1390 is not set -+# CONFIG_RTC_DRV_MAX6902 is not set -+# CONFIG_RTC_DRV_R9701 is not set -+# CONFIG_RTC_DRV_RS5C348 is not set -+# CONFIG_RTC_DRV_DS3234 is not set -+# CONFIG_RTC_DRV_PCF2123 is not set -+ -+# -+# Platform RTC drivers -+# -+# CONFIG_RTC_DRV_CMOS is not set -+# CONFIG_RTC_DRV_DS1286 is not set -+# CONFIG_RTC_DRV_DS1511 is not set -+# CONFIG_RTC_DRV_DS1553 is not set -+# CONFIG_RTC_DRV_DS1742 is not set -+# CONFIG_RTC_DRV_STK17TA8 is not set -+# CONFIG_RTC_DRV_M48T86 is not set -+# CONFIG_RTC_DRV_M48T35 is not set -+# CONFIG_RTC_DRV_M48T59 is not set -+# CONFIG_RTC_DRV_MSM6242 is not set -+# CONFIG_RTC_DRV_BQ4802 is not set -+# CONFIG_RTC_DRV_RP5C01 is not set -+# CONFIG_RTC_DRV_V3020 is not set -+ -+# -+# on-CPU RTC drivers -+# -+CONFIG_RTC_DRV_MV=y -+CONFIG_DMADEVICES=y -+ -+# -+# DMA Devices -+# -+CONFIG_MV_XOR=y -+CONFIG_DMA_ENGINE=y -+ -+# -+# DMA Clients -+# -+# CONFIG_NET_DMA is not set -+# CONFIG_ASYNC_TX_DMA is not set -+# CONFIG_DMATEST is not set -+# CONFIG_AUXDISPLAY is not set -+# CONFIG_UIO is not set -+ -+# -+# TI VLYNQ -+# -+# CONFIG_STAGING is not set -+ -+# -+# File systems -+# -+CONFIG_EXT2_FS=y -+# CONFIG_EXT2_FS_XATTR is not set -+# CONFIG_EXT2_FS_XIP is not set -+CONFIG_EXT3_FS=y -+# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set -+CONFIG_EXT3_FS_XATTR=y -+CONFIG_EXT3_FS_POSIX_ACL=y -+# CONFIG_EXT3_FS_SECURITY is not set -+CONFIG_EXT4_FS=y -+CONFIG_EXT4_FS_XATTR=y -+CONFIG_EXT4_FS_POSIX_ACL=y -+# CONFIG_EXT4_FS_SECURITY is not set -+# CONFIG_EXT4_DEBUG is not set -+CONFIG_JBD=y -+# CONFIG_JBD_DEBUG is not set -+CONFIG_JBD2=y -+# CONFIG_JBD2_DEBUG is not set -+CONFIG_FS_MBCACHE=y -+CONFIG_REISERFS_FS=m -+# CONFIG_REISERFS_CHECK is not set -+# CONFIG_REISERFS_PROC_INFO is not set -+# CONFIG_REISERFS_FS_XATTR is not set -+CONFIG_JFS_FS=y -+CONFIG_JFS_POSIX_ACL=y -+# CONFIG_JFS_SECURITY is not set -+# CONFIG_JFS_DEBUG is not set -+# CONFIG_JFS_STATISTICS is not set -+CONFIG_FS_POSIX_ACL=y -+CONFIG_XFS_FS=m -+# CONFIG_XFS_QUOTA is not set -+CONFIG_XFS_POSIX_ACL=y -+# CONFIG_XFS_RT is not set -+# CONFIG_XFS_DEBUG is not set -+# CONFIG_GFS2_FS is not set -+# CONFIG_OCFS2_FS is not set -+CONFIG_BTRFS_FS=m -+# CONFIG_BTRFS_FS_POSIX_ACL is not set -+# CONFIG_NILFS2_FS is not set -+CONFIG_FILE_LOCKING=y -+CONFIG_FSNOTIFY=y -+CONFIG_DNOTIFY=y -+CONFIG_INOTIFY=y -+CONFIG_INOTIFY_USER=y -+# CONFIG_QUOTA is not set -+CONFIG_AUTOFS_FS=m -+CONFIG_AUTOFS4_FS=m -+CONFIG_FUSE_FS=m -+# CONFIG_CUSE is not set -+ -+# -+# Caches -+# -+# CONFIG_FSCACHE is not set -+ -+# -+# CD-ROM/DVD Filesystems -+# -+CONFIG_ISO9660_FS=m -+CONFIG_JOLIET=y -+# CONFIG_ZISOFS is not set -+CONFIG_UDF_FS=m -+CONFIG_UDF_NLS=y -+ -+# -+# DOS/FAT/NT Filesystems -+# -+CONFIG_FAT_FS=y -+CONFIG_MSDOS_FS=y -+CONFIG_VFAT_FS=y -+CONFIG_FAT_DEFAULT_CODEPAGE=437 -+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" -+CONFIG_NTFS_FS=m -+# CONFIG_NTFS_DEBUG is not set -+# CONFIG_NTFS_RW is not set -+ -+# -+# Pseudo filesystems -+# -+CONFIG_PROC_FS=y -+CONFIG_PROC_SYSCTL=y -+CONFIG_PROC_PAGE_MONITOR=y -+CONFIG_SYSFS=y -+CONFIG_TMPFS=y -+# CONFIG_TMPFS_POSIX_ACL is not set -+# CONFIG_HUGETLB_PAGE is not set -+# CONFIG_CONFIGFS_FS is not set -+CONFIG_MISC_FILESYSTEMS=y -+# CONFIG_ADFS_FS is not set -+# CONFIG_AFFS_FS is not set -+CONFIG_HFS_FS=m -+CONFIG_HFSPLUS_FS=m -+# CONFIG_BEFS_FS is not set -+# CONFIG_BFS_FS is not set -+# CONFIG_EFS_FS is not set -+CONFIG_JFFS2_FS=y -+CONFIG_JFFS2_FS_DEBUG=0 -+CONFIG_JFFS2_FS_WRITEBUFFER=y -+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set -+# CONFIG_JFFS2_SUMMARY is not set -+# CONFIG_JFFS2_FS_XATTR is not set -+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set -+CONFIG_JFFS2_ZLIB=y -+# CONFIG_JFFS2_LZO is not set -+CONFIG_JFFS2_RTIME=y -+# CONFIG_JFFS2_RUBIN is not set -+CONFIG_UBIFS_FS=y -+# CONFIG_UBIFS_FS_XATTR is not set -+# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set -+CONFIG_UBIFS_FS_LZO=y -+CONFIG_UBIFS_FS_ZLIB=y -+# CONFIG_UBIFS_FS_DEBUG is not set -+CONFIG_CRAMFS=y -+# CONFIG_SQUASHFS is not set -+# CONFIG_VXFS_FS is not set -+# CONFIG_MINIX_FS is not set -+# CONFIG_OMFS_FS is not set -+# CONFIG_HPFS_FS is not set -+# CONFIG_QNX4FS_FS is not set -+# CONFIG_ROMFS_FS is not set -+# CONFIG_SYSV_FS is not set -+# CONFIG_UFS_FS is not set -+CONFIG_NETWORK_FILESYSTEMS=y -+CONFIG_NFS_FS=y -+CONFIG_NFS_V3=y -+# CONFIG_NFS_V3_ACL is not set -+CONFIG_NFS_V4=y -+# CONFIG_NFS_V4_1 is not set -+CONFIG_ROOT_NFS=y -+CONFIG_NFSD=m -+CONFIG_NFSD_V3=y -+# CONFIG_NFSD_V3_ACL is not set -+CONFIG_NFSD_V4=y -+CONFIG_LOCKD=y -+CONFIG_LOCKD_V4=y -+CONFIG_EXPORTFS=m -+CONFIG_NFS_COMMON=y -+CONFIG_SUNRPC=y -+CONFIG_SUNRPC_GSS=y -+CONFIG_RPCSEC_GSS_KRB5=y -+# CONFIG_RPCSEC_GSS_SPKM3 is not set -+# CONFIG_SMB_FS is not set -+CONFIG_CIFS=m -+# CONFIG_CIFS_STATS is not set -+# CONFIG_CIFS_WEAK_PW_HASH is not set -+CONFIG_CIFS_XATTR=y -+CONFIG_CIFS_POSIX=y -+# CONFIG_CIFS_DEBUG2 is not set -+# CONFIG_CIFS_EXPERIMENTAL is not set -+# CONFIG_NCP_FS is not set -+# CONFIG_CODA_FS is not set -+# CONFIG_AFS_FS is not set -+ -+# -+# Partition Types -+# -+CONFIG_PARTITION_ADVANCED=y -+# CONFIG_ACORN_PARTITION is not set -+# CONFIG_OSF_PARTITION is not set -+# CONFIG_AMIGA_PARTITION is not set -+# CONFIG_ATARI_PARTITION is not set -+CONFIG_MAC_PARTITION=y -+CONFIG_MSDOS_PARTITION=y -+# CONFIG_BSD_DISKLABEL is not set -+# CONFIG_MINIX_SUBPARTITION is not set -+# CONFIG_SOLARIS_X86_PARTITION is not set -+# CONFIG_UNIXWARE_DISKLABEL is not set -+# CONFIG_LDM_PARTITION is not set -+# CONFIG_SGI_PARTITION is not set -+# CONFIG_ULTRIX_PARTITION is not set -+# CONFIG_SUN_PARTITION is not set -+# CONFIG_KARMA_PARTITION is not set -+CONFIG_EFI_PARTITION=y -+# CONFIG_SYSV68_PARTITION is not set -+CONFIG_NLS=y -+CONFIG_NLS_DEFAULT="iso8859-1" -+CONFIG_NLS_CODEPAGE_437=y -+# CONFIG_NLS_CODEPAGE_737 is not set -+# CONFIG_NLS_CODEPAGE_775 is not set -+CONFIG_NLS_CODEPAGE_850=y -+# CONFIG_NLS_CODEPAGE_852 is not set -+# CONFIG_NLS_CODEPAGE_855 is not set -+# CONFIG_NLS_CODEPAGE_857 is not set -+# CONFIG_NLS_CODEPAGE_860 is not set -+# CONFIG_NLS_CODEPAGE_861 is not set -+# CONFIG_NLS_CODEPAGE_862 is not set -+# CONFIG_NLS_CODEPAGE_863 is not set -+# CONFIG_NLS_CODEPAGE_864 is not set -+# CONFIG_NLS_CODEPAGE_865 is not set -+# CONFIG_NLS_CODEPAGE_866 is not set -+# CONFIG_NLS_CODEPAGE_869 is not set -+# CONFIG_NLS_CODEPAGE_936 is not set -+# CONFIG_NLS_CODEPAGE_950 is not set -+# CONFIG_NLS_CODEPAGE_932 is not set -+# CONFIG_NLS_CODEPAGE_949 is not set -+# CONFIG_NLS_CODEPAGE_874 is not set -+# CONFIG_NLS_ISO8859_8 is not set -+# CONFIG_NLS_CODEPAGE_1250 is not set -+# CONFIG_NLS_CODEPAGE_1251 is not set -+# CONFIG_NLS_ASCII is not set -+CONFIG_NLS_ISO8859_1=y -+CONFIG_NLS_ISO8859_2=y -+# CONFIG_NLS_ISO8859_3 is not set -+# CONFIG_NLS_ISO8859_4 is not set -+# CONFIG_NLS_ISO8859_5 is not set -+# CONFIG_NLS_ISO8859_6 is not set -+# CONFIG_NLS_ISO8859_7 is not set -+# CONFIG_NLS_ISO8859_9 is not set -+# CONFIG_NLS_ISO8859_13 is not set -+# CONFIG_NLS_ISO8859_14 is not set -+# CONFIG_NLS_ISO8859_15 is not set -+# CONFIG_NLS_KOI8_R is not set -+# CONFIG_NLS_KOI8_U is not set -+CONFIG_NLS_UTF8=y -+# CONFIG_DLM is not set -+ -+# -+# Kernel hacking -+# -+# CONFIG_PRINTK_TIME is not set -+CONFIG_ENABLE_WARN_DEPRECATED=y -+CONFIG_ENABLE_MUST_CHECK=y -+CONFIG_FRAME_WARN=1024 -+CONFIG_MAGIC_SYSRQ=y -+# CONFIG_STRIP_ASM_SYMS is not set -+# CONFIG_UNUSED_SYMBOLS is not set -+CONFIG_DEBUG_FS=y -+# CONFIG_HEADERS_CHECK is not set -+CONFIG_DEBUG_KERNEL=y -+# CONFIG_DEBUG_SHIRQ is not set -+CONFIG_DETECT_SOFTLOCKUP=y -+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set -+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 -+CONFIG_DETECT_HUNG_TASK=y -+# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set -+CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 -+CONFIG_SCHED_DEBUG=y -+# CONFIG_SCHEDSTATS is not set -+CONFIG_TIMER_STATS=y -+# CONFIG_DEBUG_OBJECTS is not set -+# CONFIG_SLUB_DEBUG_ON is not set -+# CONFIG_SLUB_STATS is not set -+# CONFIG_DEBUG_KMEMLEAK is not set -+CONFIG_DEBUG_PREEMPT=y -+# CONFIG_DEBUG_RT_MUTEXES is not set -+# CONFIG_RT_MUTEX_TESTER is not set -+# CONFIG_DEBUG_SPINLOCK is not set -+# CONFIG_DEBUG_MUTEXES is not set -+# CONFIG_DEBUG_LOCK_ALLOC is not set -+# CONFIG_PROVE_LOCKING is not set -+# CONFIG_LOCK_STAT is not set -+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set -+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set -+# CONFIG_DEBUG_KOBJECT is not set -+CONFIG_DEBUG_BUGVERBOSE=y -+# CONFIG_DEBUG_INFO is not set -+# CONFIG_DEBUG_VM is not set -+# CONFIG_DEBUG_WRITECOUNT is not set -+CONFIG_DEBUG_MEMORY_INIT=y -+# CONFIG_DEBUG_LIST is not set -+# CONFIG_DEBUG_SG is not set -+# CONFIG_DEBUG_NOTIFIERS is not set -+# CONFIG_DEBUG_CREDENTIALS is not set -+# CONFIG_BOOT_PRINTK_DELAY is not set -+# CONFIG_RCU_TORTURE_TEST is not set -+# CONFIG_RCU_CPU_STALL_DETECTOR is not set -+# CONFIG_KPROBES_SANITY_TEST is not set -+# CONFIG_BACKTRACE_SELF_TEST is not set -+# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set -+# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set -+# CONFIG_LKDTM is not set -+# CONFIG_FAULT_INJECTION is not set -+# CONFIG_LATENCYTOP is not set -+CONFIG_SYSCTL_SYSCALL_CHECK=y -+# CONFIG_PAGE_POISONING is not set -+CONFIG_HAVE_FUNCTION_TRACER=y -+CONFIG_RING_BUFFER=y -+CONFIG_RING_BUFFER_ALLOW_SWAP=y -+CONFIG_TRACING_SUPPORT=y -+CONFIG_FTRACE=y -+# CONFIG_FUNCTION_TRACER is not set -+# CONFIG_IRQSOFF_TRACER is not set -+# CONFIG_PREEMPT_TRACER is not set -+# CONFIG_SCHED_TRACER is not set -+# CONFIG_ENABLE_DEFAULT_TRACERS is not set -+# CONFIG_BOOT_TRACER is not set -+CONFIG_BRANCH_PROFILE_NONE=y -+# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set -+# CONFIG_PROFILE_ALL_BRANCHES is not set -+# CONFIG_STACK_TRACER is not set -+# CONFIG_KMEMTRACE is not set -+# CONFIG_WORKQUEUE_TRACER is not set -+# CONFIG_BLK_DEV_IO_TRACE is not set -+# CONFIG_RING_BUFFER_BENCHMARK is not set -+# CONFIG_DYNAMIC_DEBUG is not set -+# CONFIG_SAMPLES is not set -+CONFIG_HAVE_ARCH_KGDB=y -+# CONFIG_KGDB is not set -+CONFIG_ARM_UNWIND=y -+CONFIG_DEBUG_USER=y -+# CONFIG_DEBUG_ERRORS is not set -+# CONFIG_DEBUG_STACK_USAGE is not set -+# CONFIG_DEBUG_LL is not set -+# CONFIG_OC_ETM is not set -+ -+# -+# Security options -+# -+# CONFIG_KEYS is not set -+# CONFIG_SECURITY is not set -+# CONFIG_SECURITYFS is not set -+# CONFIG_DEFAULT_SECURITY_SELINUX is not set -+# CONFIG_DEFAULT_SECURITY_SMACK is not set -+# CONFIG_DEFAULT_SECURITY_TOMOYO is not set -+CONFIG_DEFAULT_SECURITY_DAC=y -+CONFIG_DEFAULT_SECURITY="" -+CONFIG_XOR_BLOCKS=m -+CONFIG_ASYNC_CORE=m -+CONFIG_ASYNC_MEMCPY=m -+CONFIG_ASYNC_XOR=m -+CONFIG_ASYNC_PQ=m -+CONFIG_ASYNC_RAID6_RECOV=m -+CONFIG_CRYPTO=y -+ -+# -+# Crypto core or helper -+# -+CONFIG_CRYPTO_FIPS=y -+CONFIG_CRYPTO_ALGAPI=y -+CONFIG_CRYPTO_ALGAPI2=y -+CONFIG_CRYPTO_AEAD=m -+CONFIG_CRYPTO_AEAD2=y -+CONFIG_CRYPTO_BLKCIPHER=y -+CONFIG_CRYPTO_BLKCIPHER2=y -+CONFIG_CRYPTO_HASH=y -+CONFIG_CRYPTO_HASH2=y -+CONFIG_CRYPTO_RNG=m -+CONFIG_CRYPTO_RNG2=y -+CONFIG_CRYPTO_PCOMP=y -+CONFIG_CRYPTO_MANAGER=y -+CONFIG_CRYPTO_MANAGER2=y -+CONFIG_CRYPTO_GF128MUL=m -+CONFIG_CRYPTO_NULL=m -+CONFIG_CRYPTO_WORKQUEUE=y -+CONFIG_CRYPTO_CRYPTD=m -+CONFIG_CRYPTO_AUTHENC=m -+CONFIG_CRYPTO_TEST=m -+ -+# -+# Authenticated Encryption with Associated Data -+# -+CONFIG_CRYPTO_CCM=m -+CONFIG_CRYPTO_GCM=m -+CONFIG_CRYPTO_SEQIV=m -+ -+# -+# Block modes -+# -+CONFIG_CRYPTO_CBC=y -+CONFIG_CRYPTO_CTR=m -+CONFIG_CRYPTO_CTS=m -+CONFIG_CRYPTO_ECB=y -+CONFIG_CRYPTO_LRW=m -+CONFIG_CRYPTO_PCBC=m -+CONFIG_CRYPTO_XTS=m -+ -+# -+# Hash modes -+# -+CONFIG_CRYPTO_HMAC=m -+CONFIG_CRYPTO_XCBC=m -+CONFIG_CRYPTO_VMAC=m -+ -+# -+# Digest -+# -+CONFIG_CRYPTO_CRC32C=y -+CONFIG_CRYPTO_GHASH=m -+CONFIG_CRYPTO_MD4=m -+CONFIG_CRYPTO_MD5=y -+CONFIG_CRYPTO_MICHAEL_MIC=m -+CONFIG_CRYPTO_RMD128=m -+CONFIG_CRYPTO_RMD160=m -+CONFIG_CRYPTO_RMD256=m -+CONFIG_CRYPTO_RMD320=m -+CONFIG_CRYPTO_SHA1=m -+CONFIG_CRYPTO_SHA256=m -+CONFIG_CRYPTO_SHA512=m -+CONFIG_CRYPTO_TGR192=m -+CONFIG_CRYPTO_WP512=m -+ -+# -+# Ciphers -+# -+CONFIG_CRYPTO_AES=y -+CONFIG_CRYPTO_ANUBIS=m -+CONFIG_CRYPTO_ARC4=y -+CONFIG_CRYPTO_BLOWFISH=m -+CONFIG_CRYPTO_CAMELLIA=m -+CONFIG_CRYPTO_CAST5=m -+CONFIG_CRYPTO_CAST6=m -+CONFIG_CRYPTO_DES=y -+CONFIG_CRYPTO_FCRYPT=m -+CONFIG_CRYPTO_KHAZAD=m -+CONFIG_CRYPTO_SALSA20=m -+CONFIG_CRYPTO_SEED=m -+CONFIG_CRYPTO_SERPENT=m -+CONFIG_CRYPTO_TEA=m -+CONFIG_CRYPTO_TWOFISH=m -+CONFIG_CRYPTO_TWOFISH_COMMON=m -+ -+# -+# Compression -+# -+CONFIG_CRYPTO_DEFLATE=y -+CONFIG_CRYPTO_ZLIB=m -+CONFIG_CRYPTO_LZO=y -+ -+# -+# Random Number Generation -+# -+CONFIG_CRYPTO_ANSI_CPRNG=m -+CONFIG_CRYPTO_HW=y -+CONFIG_CRYPTO_DEV_MV_CESA=m -+# CONFIG_CRYPTO_DEV_HIFN_795X is not set -+# CONFIG_BINARY_PRINTF is not set -+ -+# -+# Library routines -+# -+CONFIG_BITREVERSE=y -+CONFIG_GENERIC_FIND_LAST_BIT=y -+CONFIG_CRC_CCITT=y -+CONFIG_CRC16=y -+# CONFIG_CRC_T10DIF is not set -+CONFIG_CRC_ITU_T=m -+CONFIG_CRC32=y -+# CONFIG_CRC7 is not set -+CONFIG_LIBCRC32C=y -+CONFIG_ZLIB_INFLATE=y -+CONFIG_ZLIB_DEFLATE=y -+CONFIG_LZO_COMPRESS=y -+CONFIG_LZO_DECOMPRESS=y -+CONFIG_DECOMPRESS_GZIP=y -+CONFIG_DECOMPRESS_BZIP2=y -+CONFIG_DECOMPRESS_LZMA=y -+CONFIG_DECOMPRESS_LZO=y -+CONFIG_TEXTSEARCH=y -+CONFIG_TEXTSEARCH_KMP=m -+CONFIG_TEXTSEARCH_BM=m -+CONFIG_TEXTSEARCH_FSM=m -+CONFIG_HAS_IOMEM=y -+CONFIG_HAS_IOPORT=y -+CONFIG_HAS_DMA=y -+CONFIG_NLATTR=y --- -1.6.0.3 - diff --git a/pkgs/os-specific/linux/kernel/guruplug-mach-type.patch b/pkgs/os-specific/linux/kernel/guruplug-mach-type.patch deleted file mode 100644 index bfcbcf44aa4..00000000000 --- a/pkgs/os-specific/linux/kernel/guruplug-mach-type.patch +++ /dev/null @@ -1,15 +0,0 @@ -The GuruPlug's u-boot is configured with the wrong `arch_number', so -change Linux so that it matches u-boot's expectations. See -. - ---- linux-2.6.35.3/arch/arm/tools/mach-types 2010-08-20 20:55:55.000000000 +0200 -+++ linux-2.6.35.3/arch/arm/tools/mach-types 2010-09-13 22:49:41.000000000 +0200 -@@ -2643,7 +2643,7 @@ rfp43 MACH_RFP43 RFP43 2655 - sk86r0301 MACH_SK86R0301 SK86R0301 2656 - ctpxa MACH_CTPXA CTPXA 2657 - epb_arm9_a MACH_EPB_ARM9_A EPB_ARM9_A 2658 --guruplug MACH_GURUPLUG GURUPLUG 2659 -+guruplug MACH_GURUPLUG GURUPLUG 2601 - spear310 MACH_SPEAR310 SPEAR310 2660 - spear320 MACH_SPEAR320 SPEAR320 2661 - robotx MACH_ROBOTX ROBOTX 2662 diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 37c5f926e87..d9bd6f2c934 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -163,19 +163,4 @@ rec { }); }; - guruplug_defconfig = - { # Default configuration for the GuruPlug. From - # . - name = "guruplug-defconfig"; - patch = ./guruplug-defconfig.patch; - }; - - guruplug_arch_number = - { # Hack to match the `arch_number' of the U-Boot that ships with the - # GuruPlug. This is only needed when using this specific U-Boot - # binary. See - # . - name = "guruplug-arch-number"; - patch = ./guruplug-mach-type.patch; - }; } From ff99631753002a8e4c8125d50d1e1eb53e0a0b28 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 1 Aug 2013 00:15:31 +0200 Subject: [PATCH 780/798] linux: Remove CIFS timeout patch We longer use CIFS in the VM tests so we don't need this anymore. --- .../linux/kernel/cifs-timeout-2.6.38.patch | 13 ------------- pkgs/os-specific/linux/kernel/patches.nix | 8 -------- pkgs/top-level/all-packages.nix | 1 - 3 files changed, 22 deletions(-) delete mode 100644 pkgs/os-specific/linux/kernel/cifs-timeout-2.6.38.patch diff --git a/pkgs/os-specific/linux/kernel/cifs-timeout-2.6.38.patch b/pkgs/os-specific/linux/kernel/cifs-timeout-2.6.38.patch deleted file mode 100644 index 8168ffb5a1a..00000000000 --- a/pkgs/os-specific/linux/kernel/cifs-timeout-2.6.38.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- /tmp/linux-2.6.32.14/fs/cifs/transport.c 2011-03-27 20:37:20.000000000 +0200 -+++ linux-2.6.32.14/fs/cifs/transport.c 2011-04-01 11:07:17.700305670 +0200 -@@ -182,8 +182,8 @@ - after the retries we will kill the socket and - reconnect which may clear the network problem. - */ -- if ((i >= 14) || (!server->noblocksnd && (i > 2))) { -- cERROR(1, "sends on sock %p stuck for 15 seconds", -+ if ((i >= 119) || (!server->noblocksnd && (i > 2))) { -+ cERROR(1, "sends on sock %p stuck for 119 seconds", - ssocket); - rc = -EAGAIN; - break; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index d9bd6f2c934..42f1be071f9 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -125,14 +125,6 @@ rec { features.aufs3 = true; }; - # Increase the timeout on CIFS requests from 15 to 120 seconds to - # make CIFS more resilient to high load on the CIFS server. - cifs_timeout_2_6_38 = - { name = "cifs-timeout"; - patch = ./cifs-timeout-2.6.38.patch; - features.cifsTimeout = true; - }; - no_xsave = { name = "no-xsave"; patch = ./no-xsave.patch; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f3ced7dbc39..bc212974836 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6380,7 +6380,6 @@ let kernelPatches = [ kernelPatches.sec_perm_2_6_24 # kernelPatches.aufs3_2 - kernelPatches.cifs_timeout_2_6_38 ]; }; From b976e00ff27068d73d4e7bb891956c42e5220de6 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 1 Aug 2013 00:16:45 +0200 Subject: [PATCH 781/798] linux: Remove obsolete AUFS 3.7 patch --- pkgs/os-specific/linux/kernel/patches.nix | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 42f1be071f9..7bd8c6f94ed 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -110,21 +110,6 @@ rec { features.aufs3 = true; }; - # not officially released yet, but 3.x seems to work fine - aufs3_7 = rec { - name = "aufs3.7"; - version = "3.x.20121210"; - utilRev = "91af15f977d12e02165759620005f6ce1a4d7602"; - utilHash = "dda4df89828dcf0e4012d88b4aa3eda8c30af69d6530ff5fedc2411de872c996"; - patch = makeAufs3StandalonePatch { - inherit version; - rev = "8d24d728c7eb54dd624bccd8e87afa826670142c"; - sha256 = "02dcb46e02b2a6b90c1601b5747614276074488c9308625c3a52ab74cad997a5"; - }; - features.aufsBase = true; - features.aufs3 = true; - }; - no_xsave = { name = "no-xsave"; patch = ./no-xsave.patch; From c564d012f8237b5d667a7bebfd782efff9a78ec5 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 1 Aug 2013 00:20:20 +0200 Subject: [PATCH 782/798] Style fix --- pkgs/os-specific/linux/kernel/patches.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 7bd8c6f94ed..c77785167cc 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -133,11 +133,10 @@ rec { grsecurity_2_9_1_3_2_48 = { name = "grsecurity-2.9.1-3.2.48"; - patch = - (fetchurl { - url = http://grsecurity.net/stable/grsecurity-2.9.1-3.2.48-201307212241.patch; - sha256 = "1llgrcd7ynxx60dn05bcbysd6a1091wwxkck4d15gvp71s9r6scm"; - }); + patch = fetchurl { + url = http://grsecurity.net/stable/grsecurity-2.9.1-3.2.48-201307212241.patch; + sha256 = "1llgrcd7ynxx60dn05bcbysd6a1091wwxkck4d15gvp71s9r6scm"; + }; }; } From f2f00c56e4e54e6df6393035b73796ab5d8cc48a Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 1 Aug 2013 00:38:54 +0200 Subject: [PATCH 783/798] linux: Enable stack protector This may prevent exploitation of buffer overflows. --- pkgs/os-specific/linux/kernel/common-config.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 2e64dae23fe..83417787f0d 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -165,6 +165,7 @@ with stdenv.lib; STRICT_DEVMEM y # Filter access to /dev/mem SECURITY_SELINUX_BOOTPARAM_VALUE 0 # Disable SELinux by default DEVKMEM n # Disable /dev/kmem + CC_STACKPROTECTOR y # Detect buffer overflows on the stack # Misc. options. 8139TOO_8129 y From d1de0e2d6db53134b142c692bed538fe6db18631 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 1 Aug 2013 00:50:48 +0200 Subject: [PATCH 784/798] linux: Enable detection of hung tasks --- pkgs/os-specific/linux/kernel/common-config.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 83417787f0d..cc9be98c838 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -19,6 +19,7 @@ with stdenv.lib; DEBUG_STACKOVERFLOW n RCU_TORTURE_TEST n SCHEDSTATS n + DETECT_HUNG_TASK y # Support drivers that need external firmware. STANDALONE n From 14ca9c0bf1480ded542ceb64e754b630294eaba7 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 1 Aug 2013 01:39:59 +0200 Subject: [PATCH 785/798] linux: Include "NixOS" in "uname -v" --- pkgs/os-specific/linux/kernel/builder.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/builder.sh b/pkgs/os-specific/linux/kernel/builder.sh index bea53e9c4dd..621237fa9a3 100644 --- a/pkgs/os-specific/linux/kernel/builder.sh +++ b/pkgs/os-specific/linux/kernel/builder.sh @@ -1,7 +1,7 @@ source $stdenv/setup -makeFlags="ARCH=$arch SHELL=/bin/sh $makeFlags" +makeFlags="ARCH=$arch SHELL=/bin/sh KBUILD_BUILD_VERSION=1-NixOS $makeFlags" if [ -n "$crossConfig" ]; then makeFlags="$makeFlags CROSS_COMPILE=$crossConfig-" fi From 77dd343e1e729a19cc471992515b6538130d46f0 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Thu, 1 Aug 2013 11:21:54 +0200 Subject: [PATCH 786/798] - System images are not required for building. Disabling them makes building faster. - Make ant flags configurable --- pkgs/development/mobile/androidenv/build-app.nix | 7 ++++--- pkgs/development/mobile/androidenv/default.nix | 6 ++++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/development/mobile/androidenv/build-app.nix b/pkgs/development/mobile/androidenv/build-app.nix index b5aa82cced7..2792d364f15 100644 --- a/pkgs/development/mobile/androidenv/build-app.nix +++ b/pkgs/development/mobile/androidenv/build-app.nix @@ -1,5 +1,5 @@ { stdenv, androidsdk, jdk, ant }: -{ name, src, platformVersions ? [ "8" ], abiVersions ? [ "armeabi-v7a" ], useGoogleAPIs ? false +{ name, src, platformVersions ? [ "8" ], useGoogleAPIs ? false, antFlags ? "" , release ? false, keyStore ? null, keyAlias ? null, keyStorePassword ? null, keyAliasPassword ? null }: @@ -11,7 +11,8 @@ let else throw "Platform: ${stdenv.system} is not supported!"; androidsdkComposition = androidsdk { - inherit platformVersions abiVersions useGoogleAPIs; + inherit platformVersions useGoogleAPIs; + abiVersions = []; }; in stdenv.mkDerivation { @@ -34,7 +35,7 @@ stdenv.mkDerivation { ''} export ANDROID_SDK_HOME=`pwd` # Key files cannot be stored in the user's home directory. This overrides it. - ant ${if release then "release" else "debug"} + ant ${antFlags} ${if release then "release" else "debug"} ''; installPhase = '' diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix index d7d8d92a66e..6e410d4c5db 100644 --- a/pkgs/development/mobile/androidenv/default.nix +++ b/pkgs/development/mobile/androidenv/default.nix @@ -57,6 +57,12 @@ rec { useGoogleAPIs = true; }; + androidsdk_4_2 = androidsdk { + platformVersions = [ "17" ]; + abiVersions = [ "armeabi-v7a" ]; + useGoogleAPIs = true; + }; + buildApp = import ./build-app.nix { inherit (pkgs) stdenv jdk ant; inherit androidsdk; From c81e70fc305b8714101479bb884da0c60cdd7d69 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Thu, 1 Aug 2013 11:32:57 +0200 Subject: [PATCH 787/798] Shut up annoying question to configure hardware profiles --- pkgs/development/mobile/androidenv/emulate-app.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/mobile/androidenv/emulate-app.nix b/pkgs/development/mobile/androidenv/emulate-app.nix index 97d73bffded..eb39d854d1f 100644 --- a/pkgs/development/mobile/androidenv/emulate-app.nix +++ b/pkgs/development/mobile/androidenv/emulate-app.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation { export ANDROID_SERIAL="emulator-$port" # Create a virtual android device - ${androidsdkComposition}/libexec/android-sdk-*/tools/android create avd -n device -t ${if useGoogleAPIs then "'Google Inc.:Google APIs:"+platformVersion+"'" else "android-"+platformVersion} + yes "" | ${androidsdkComposition}/libexec/android-sdk-*/tools/android create avd -n device -t ${if useGoogleAPIs then "'Google Inc.:Google APIs:"+platformVersion+"'" else "android-"+platformVersion} # Enable GPU acceleration ${stdenv.lib.optionalString enableGPU '' From 9a2b9ba6b30ed233851f1941030e06f07b3fae9a Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Thu, 1 Aug 2013 12:43:33 +0200 Subject: [PATCH 788/798] Turn LD_LIBRARY_PATH into a suffix to allow NVIDIA's OpenGL driver to be used --- pkgs/development/mobile/androidenv/androidsdk.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/mobile/androidenv/androidsdk.nix b/pkgs/development/mobile/androidenv/androidsdk.nix index 34cc07adf35..1573de63e09 100644 --- a/pkgs/development/mobile/androidenv/androidsdk.nix +++ b/pkgs/development/mobile/androidenv/androidsdk.nix @@ -61,14 +61,14 @@ stdenv.mkDerivation { for i in emulator emulator-arm emulator-mips emulator-x86 do wrapProgram `pwd`/$i \ - --prefix LD_LIBRARY_PATH : `pwd`/lib:${libX11_32bit}/lib:${libxcb_32bit}/lib:${libXau_32bit}/lib:${libXdmcp_32bit}/lib:${libXext_32bit}/lib:${mesa_32bit}/lib + --suffix LD_LIBRARY_PATH : `pwd`/lib:${libX11_32bit}/lib:${libxcb_32bit}/lib:${libXau_32bit}/lib:${libXdmcp_32bit}/lib:${libXext_32bit}/lib:${mesa_32bit}/lib done ${stdenv.lib.optionalString (stdenv.system == "x86_64-linux") '' for i in emulator64-arm emulator64-mips emulator64-x86 do wrapProgram `pwd`/$i \ - --prefix LD_LIBRARY_PATH : `pwd`/lib:${libX11}/lib:${libxcb}/lib:${libXau}/lib:${libXdmcp}/lib:${libXext}/lib:${mesa}/lib + --suffix LD_LIBRARY_PATH : `pwd`/lib:${libX11}/lib:${libxcb}/lib:${libXau}/lib:${libXdmcp}/lib:${libXext}/lib:${mesa}/lib done ''} ''} From f155a35d7d8562b1da40a7e0b4265829d54455bd Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 1 Aug 2013 14:01:59 +0200 Subject: [PATCH 789/798] Move kernelExtraConfig to common-config.nix (for x86) It's bad to have the kernel config scattered across two places. (This should also be done for the other architectures.) Also, restore Xen and KVM guest support in Linux 3.10. --- pkgs/os-specific/linux/kernel/common-config.nix | 15 +++++++++++++++ pkgs/top-level/platforms.nix | 13 ------------- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index cc9be98c838..0c3aca17e4e 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -265,7 +265,22 @@ with stdenv.lib; ''} # Virtualisation. + PARAVIRT y + ${if versionAtLeast version "3.10" then '' + HYPERVISOR_GUEST y + '' else '' + PARAVIRT_GUEST y + ''} + KVM_GUEST y + ${optionalString (versionOlder version "3.7") '' + KVM_CLOCK y + ''} + XEN y XEN_DOM0? y + KSM y + ${optionalString (!stdenv.is64bit) '' + HIGHMEM64G? y # We need 64 GB (PAE) support for Xen guest support. + ''} # Media support. ${optionalString (versionAtLeast version "3.6") '' diff --git a/pkgs/top-level/platforms.nix b/pkgs/top-level/platforms.nix index ec047efecb0..d6408286581 100644 --- a/pkgs/top-level/platforms.nix +++ b/pkgs/top-level/platforms.nix @@ -10,19 +10,6 @@ rec { # Currently ignored - it should be set according to 'system' once it is # not ignored. This is for stdenv-updates. kernelArch = "i386"; - kernelExtraConfig = - '' - # Virtualisation (KVM, Xen...). - HYPERVISOR_GUEST? y #3.10 version of the paravirt options - PARAVIRT_GUEST? y #Doesn't exist in 3.10 - KVM_CLOCK? y #Part of KVM_GUEST since linux 3.7 - KVM_GUEST? y #Doesn't exist in 3.10 - XEN? y #Doesn't exist in 3.10 - KSM y - - # We need 64 GB (PAE) support for Xen guest support. - HIGHMEM64G? y - ''; }; pc_simplekernel = pc // { From d077851b7d4c3728811237d6d105b6f9622ae244 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 1 Aug 2013 14:30:18 +0200 Subject: [PATCH 790/798] VM builds: Use the default kernel --- pkgs/build-support/vm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 2821fc0a099..b0911fd99c3 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -1,5 +1,5 @@ { pkgs -, kernel ? pkgs.linux_3_9 +, kernel ? pkgs.linux , img ? "bzImage" , rootModules ? [ "virtio_pci" "virtio_blk" "virtio_balloon" "ext4" "unix" "9p" "9pnet_virtio" ] @@ -114,14 +114,14 @@ rec { echo "mounting Nix store..." mkdir -p /fs/nix/store - mount -t 9p store /fs/nix/store -o trans=virtio,version=9p2000.L,msize=262144,cache=fscache + mount -t 9p store /fs/nix/store -o trans=virtio,version=9p2000.L,msize=262144,cache=loose mkdir -p /fs/tmp mount -t tmpfs -o "mode=755" none /fs/tmp echo "mounting host's temporary directory..." mkdir -p /fs/tmp/xchg - mount -t 9p xchg /fs/tmp/xchg -o trans=virtio,version=9p2000.L,msize=262144,cache=fscache + mount -t 9p xchg /fs/tmp/xchg -o trans=virtio,version=9p2000.L,msize=262144,cache=loose mkdir -p /fs/proc mount -t proc none /fs/proc From 4342a32debf7d3961581e500b7e445e7ca466c33 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 1 Aug 2013 14:35:04 +0200 Subject: [PATCH 791/798] VM builds: Reduce kernel verbosity --- pkgs/build-support/vm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index b0911fd99c3..5f9381cd00c 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -91,8 +91,8 @@ rec { esac done + echo "loading kernel modules..." for i in $(cat ${modulesClosure}/insmod-list); do - echo "loading module $(basename $i .ko)" insmod $i done @@ -133,7 +133,7 @@ rec { ln -sf /proc/mounts /fs/etc/mtab echo "127.0.0.1 localhost" > /fs/etc/hosts - echo "Now running: $command" + echo "starting stage 2 ($command)" test -n "$command" set +e @@ -195,7 +195,7 @@ rec { -drive file=$diskImage,if=virtio,cache=writeback,werror=report \ -kernel ${kernel}/${img} \ -initrd ${initrd}/initrd \ - -append "console=ttyS0 panic=1 command=${stage2Init} out=$out mountDisk=$mountDisk" \ + -append "console=ttyS0 panic=1 command=${stage2Init} out=$out mountDisk=$mountDisk loglevel=4" \ $QEMU_OPTS ''; From 4ec1f8b68aa4902fb577a988d25c712245be7cf1 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 1 Aug 2013 16:26:02 +0200 Subject: [PATCH 792/798] git: Update to 1.8.3.4 --- .../version-management/git-and-tools/git/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index dd603e75562..074bcd6c289 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -10,7 +10,7 @@ let - version = "1.8.3.2"; + version = "1.8.3.4"; svn = subversionClient.override { perlBindings = true; }; @@ -21,7 +21,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://git-core.googlecode.com/files/git-${version}.tar.gz"; - sha256 = "0mfylhcdrh8prxkbs0gc877rmra2ks48bchg4hhaf2vpw9hpdf63"; + sha256 = "1nfr4hgqs3b6k9wanqcix0wlw71q61h5irxiavlspd4jvzrcv8nz"; }; patches = [ ./docbook2texi.patch ./symlinks-in-bin.patch ]; From 80a82a2858fd767384d974798b36f0555618fca1 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 1 Aug 2013 16:36:54 +0200 Subject: [PATCH 793/798] git: Install git-subtree --- .../version-management/git-and-tools/git/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 074bcd6c289..c22b358189d 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -50,6 +50,13 @@ stdenv.mkDerivation { chmod +x $1 } + # Install git-subtree. + pushd contrib/subtree + make + make install install-doc + popd + rm -rf contrib/subtree + # Install contrib stuff. mkdir -p $out/share/git mv contrib $out/share/git/ From 65ad55c425ddd3f6dea06f1b6a1c51e076179965 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 1 Aug 2013 16:37:36 +0200 Subject: [PATCH 794/798] git-subtree: Remove This package is obsolete because it's now part of git (see https://github.com/apenwarr/git-subtree/blob/master/THIS-REPO-IS-OBSOLETE). --- .../git-and-tools/default.nix | 4 --- .../git-and-tools/git-subtree/default.nix | 27 ------------------- 2 files changed, 31 deletions(-) delete mode 100644 pkgs/applications/version-management/git-and-tools/git-subtree/default.nix diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 69aeba92fd8..b5b3d4044c5 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -89,9 +89,5 @@ rec { svn2git_kde = callPackage ./svn2git-kde { }; - gitSubtree = import ./git-subtree { - inherit stdenv fetchurl git asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt; - }; - darcsToGit = callPackage ./darcs-to-git { }; } diff --git a/pkgs/applications/version-management/git-and-tools/git-subtree/default.nix b/pkgs/applications/version-management/git-and-tools/git-subtree/default.nix deleted file mode 100644 index dd00572b150..00000000000 --- a/pkgs/applications/version-management/git-and-tools/git-subtree/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ stdenv, fetchurl, git, asciidoc, xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt }: - -stdenv.mkDerivation { - name = "git-subtree-0.4-2-g2793ee6"; - - src = fetchurl { - url = "http://github.com/apenwarr/git-subtree/tarball/2793ee6ba6da57d97e9c313741041f7eb2e88974"; - sha256 = "33fdba315cf8846f45dff7622c1099c386db960c7b43d5d8fbb382fd4d1acff6"; - name = "git-subtree-0.4-2-g2793ee6.tar.gz"; - }; - - buildInputs = [ git asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt ]; - - configurePhase = "export prefix=$out"; - - buildPhase = "true"; - - installPhase = "make install prefix=$out gitdir=$out/bin"; - - meta= { - description = "experimental alternative to the git-submodule command"; - homepage = http://github.com/apenwarr/git-subtree; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.gnu; - maintainers = [ stdenv.lib.maintainers.simons ]; - }; -} From 35333935d6a620177bfe8e02aad836b830175be8 Mon Sep 17 00:00:00 2001 From: Evan Danaher Date: Thu, 1 Aug 2013 20:12:44 +0200 Subject: [PATCH 795/798] Add simple hsetroot package. --- pkgs/tools/X11/hsetroot/default.nix | 19 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/tools/X11/hsetroot/default.nix diff --git a/pkgs/tools/X11/hsetroot/default.nix b/pkgs/tools/X11/hsetroot/default.nix new file mode 100644 index 00000000000..96241bd02cd --- /dev/null +++ b/pkgs/tools/X11/hsetroot/default.nix @@ -0,0 +1,19 @@ +{stdenv, fetchurl, imlib2, libX11, libXext }: + +stdenv.mkDerivation { + name = "hsetroot-1.0.2"; + + # The primary download site seems to no longer exist; use Gentoo's mirror for now. + src = fetchurl { + url = "http://mirror.datapipe.net/gentoo/distfiles/hsetroot-1.0.2.tar.gz"; + sha256 = "d6712d330b31122c077bfc712ec4e213abe1fe71ab24b9150ae2774ca3154fd7"; + }; + + buildInputs = [ imlib2 libX11 libXext ]; + + meta = { + description = "hsetroot allows you to compose wallpapers ('root pixmaps') for X"; + homepage = http://thegraveyard.org/hsetroot.html; + license = "GPLv2+"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bc212974836..5f71de14653 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9153,6 +9153,8 @@ let gnome = recurseIntoAttrs gnome2; + hsetroot = callPackage ../tools/X11/hsetroot { }; + kde4 = recurseIntoAttrs pkgs.kde410; kde48 = kdePackagesFor (pkgs.kde48 // { From bfbbb12e353bcd367acfc9bfde6b9bb22f55f34d Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Fri, 2 Aug 2013 09:39:20 +0400 Subject: [PATCH 796/798] Adding CL-Launch. CL-Launch is a wrapper for unified launching of various Lisp implementations --- .../tools/misc/cl-launch/default.nix | 34 +++++++++++++++++++ .../tools/misc/cl-launch/default.upstream | 2 ++ pkgs/lib/licenses.nix | 6 ++++ pkgs/top-level/all-packages.nix | 2 ++ 4 files changed, 44 insertions(+) create mode 100644 pkgs/development/tools/misc/cl-launch/default.nix create mode 100644 pkgs/development/tools/misc/cl-launch/default.upstream diff --git a/pkgs/development/tools/misc/cl-launch/default.nix b/pkgs/development/tools/misc/cl-launch/default.nix new file mode 100644 index 00000000000..63c585b00a9 --- /dev/null +++ b/pkgs/development/tools/misc/cl-launch/default.nix @@ -0,0 +1,34 @@ +{stdenv, fetchurl}: +let + s = # Generated upstream information + rec { + baseName="cl-launch"; + version="3.21.1"; + name="${baseName}-${version}"; + hash="1241lyn2a3ry06ii9zlns0cj462bi7rih41vlbbmra1chj4c21ij"; + url="http://common-lisp.net/project/xcvb/cl-launch/cl-launch-3.21.1.tar.gz"; + sha256="1241lyn2a3ry06ii9zlns0cj462bi7rih41vlbbmra1chj4c21ij"; + }; + buildInputs = [ + ]; +in +stdenv.mkDerivation { + inherit (s) name version; + inherit buildInputs; + src = fetchurl { + inherit (s) url sha256; + }; + + preConfigure = '' + export makeFlags="$makeFlags PREFIX='$out'" + mkdir -p "$out/bin" + ''; + + meta = { + inherit (s) version; + description = ''Common Lisp launcher script''; + license = stdenv.lib.licenses.llgpl21 ; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/development/tools/misc/cl-launch/default.upstream b/pkgs/development/tools/misc/cl-launch/default.upstream new file mode 100644 index 00000000000..1ff5daca02c --- /dev/null +++ b/pkgs/development/tools/misc/cl-launch/default.upstream @@ -0,0 +1,2 @@ +url http://common-lisp.net/project/xcvb/cl-launch/ +version_link '.-[0-9].*[0-9][.]tar[.].*' diff --git a/pkgs/lib/licenses.nix b/pkgs/lib/licenses.nix index 0dcdff0bee4..fcf7420e425 100644 --- a/pkgs/lib/licenses.nix +++ b/pkgs/lib/licenses.nix @@ -148,6 +148,12 @@ url = http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html; }; + llgpl21 = { + shortName = "LLGPLv2.1"; + fullName = "Lisp LGPL; GNU Lesser General Public License version 2.1 with Franz Inc. preamble for clarification of LGPL terms in context of Lisp"; + url = http://opensource.franz.com/preamble.html; + }; + lgpl3 = { shortName = "LGPLv3"; fullName = "GNU Lesser General Public License version 3 only"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bc212974836..808def18abd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3360,6 +3360,8 @@ let chromedriver = callPackage ../development/tools/selenium/chromedriver { gconf = gnome.GConf; }; + "cl-launch" = callPackage ../development/tools/misc/cl-launch {}; + complexity = callPackage ../development/tools/misc/complexity { }; ctags = callPackage ../development/tools/misc/ctags { }; From 1362d479cbc13517d160a9a5e2a821aab94f23cf Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 2 Aug 2013 07:33:20 +0200 Subject: [PATCH 797/798] nixpart: Update to bugfix version 0.4.1. Contains the following fix: - Fix mounting btrfs when mount_only (-m) is used. I would like to update blivet as well, but at the moment it breaks for nixpart, so let's retry later when we're at 0.5.x or even 1.x :-) Signed-off-by: aszlig --- pkgs/tools/filesystems/nixpart/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/nixpart/default.nix b/pkgs/tools/filesystems/nixpart/default.nix index 36972573b35..2cd40bb0867 100644 --- a/pkgs/tools/filesystems/nixpart/default.nix +++ b/pkgs/tools/filesystems/nixpart/default.nix @@ -9,11 +9,11 @@ let }; in buildPythonPackage rec { name = "nixpart-${version}"; - version = "0.4.0"; + version = "0.4.1"; src = fetchurl { url = "https://github.com/aszlig/nixpart/archive/v${version}.tar.gz"; - sha256 = "1kgiyqh7gndr0zs3qgi6r0dpy5p71d32c2k9kbd8pjf2xyyb6fk6"; + sha256 = "0avwd8p47xy9cydlbjxk8pj8q75zyl68gw2w6fnkk78dcb1a3swp"; }; propagatedBuildInputs = [ (blivet.override blivetOverrides) ]; From 9b9fa35ebd30a9b86c6124be31fb1244a4207ead Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 2 Aug 2013 10:49:39 +0200 Subject: [PATCH 798/798] blivet: Update sha256, as it changed upstream. The sha256 was magically changed upstream with the same contents but different timestamps, so let's update it. Thanks to @rbvermaa for noticing. Signed-off-by: aszlig --- pkgs/development/python-modules/blivet/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/blivet/default.nix b/pkgs/development/python-modules/blivet/default.nix index 564b89347b5..403bb264892 100644 --- a/pkgs/development/python-modules/blivet/default.nix +++ b/pkgs/development/python-modules/blivet/default.nix @@ -18,7 +18,7 @@ in buildPythonPackage rec { src = fetchurl { url = "https://git.fedorahosted.org/cgit/blivet.git/snapshot/" + "${name}.tar.bz2"; - sha256 = "0b28q539657mqif0mn5dfqcpqv7gbyszg83gf2fv6z7q6206rnx5"; + sha256 = "1k3mws2q0ryb7422mml6idmaasz2i2v6ngyvg6d976dx090qnmci"; }; postPatch = ''