From f3536a0dcbff3ebf7020c46508926b2a4486e0ec Mon Sep 17 00:00:00 2001 From: Roelof Wobben Date: Mon, 2 Dec 2013 09:24:08 +0100 Subject: [PATCH 001/152] broken translation files --- .../cinnamon/cinnamon-translations.nix | 29 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/desktops/cinnamon/cinnamon-translations.nix diff --git a/pkgs/desktops/cinnamon/cinnamon-translations.nix b/pkgs/desktops/cinnamon/cinnamon-translations.nix new file mode 100644 index 00000000000..09e656943ad --- /dev/null +++ b/pkgs/desktops/cinnamon/cinnamon-translations.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl}: + +stdenv.mkDerivation rec { + name = "cinnamon-translations"; + version="2.0.3"; + + src = fetchurl { + url = "http://github.com/linuxmint/cinnamon-translations/archive/${version}.tar.gz"; + sha256 = "07w3v118xrfp8r4dkbdiyd1vr9ah7f3bm2zw9wag9s8l8x0zfxgc"; + }; + + + installPhase = + '' + mkdir -pv $out/usr/share/cinnamon/locale + cp -Rp mo-export/* $out/usr/share/cinnamon/locale/ + ''; + + meta = { + homepage = "http://cinnamon.linuxmint.com"; + description = "Translations files for the Cinnamon desktop" ; + + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.roelof ]; + }; +} + + + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ac304ad462b..31d4426ba66 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9575,6 +9575,10 @@ let ### DESKTOP ENVIRONMENTS + + cinnamon = recurseIntoAttrs { + cjs = callPackage ../desktops/cinnamon/cinnamon-translations.nix { }; + }; enlightenment = callPackage ../desktops/enlightenment { }; From 28d24ea4ebc68fe9d890ba41694549a5268fc234 Mon Sep 17 00:00:00 2001 From: Roelof Wobben Date: Mon, 2 Dec 2013 13:25:38 +0100 Subject: [PATCH 002/152] cinnamon-transalations working --- pkgs/desktops/cinnamon/cinnamon-translations.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/cinnamon/cinnamon-translations.nix b/pkgs/desktops/cinnamon/cinnamon-translations.nix index 09e656943ad..2d396947b89 100644 --- a/pkgs/desktops/cinnamon/cinnamon-translations.nix +++ b/pkgs/desktops/cinnamon/cinnamon-translations.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -pv $out/usr/share/cinnamon/locale - cp -Rp mo-export/* $out/usr/share/cinnamon/locale/ + cp -av mo-export/* $out/usr/share/cinnamon/locale/ ''; meta = { From a12367d991f7d04af743a92b216c281d9fafa383 Mon Sep 17 00:00:00 2001 From: Roelof Wobben Date: Mon, 2 Dec 2013 13:29:45 +0100 Subject: [PATCH 003/152] changed wrong name in all-packages --- 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 31d4426ba66..9237f1736a8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9577,7 +9577,7 @@ let ### DESKTOP ENVIRONMENTS cinnamon = recurseIntoAttrs { - cjs = callPackage ../desktops/cinnamon/cinnamon-translations.nix { }; + cinnamon-translations = callPackage ../desktops/cinnamon/cinnamon-translations.nix { }; }; enlightenment = callPackage ../desktops/enlightenment { }; From f9bb59271225c038874ab20cf24536410bcc02cc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 2 Dec 2013 19:55:50 +0100 Subject: [PATCH 004/152] Re-instate the "hydraPlatforms = []" setting accidentally overwritten earlier. --- pkgs/development/libraries/haskell/accelerate-cuda/default.nix | 2 +- .../libraries/haskell/accelerate-examples/default.nix | 2 +- pkgs/development/libraries/haskell/accelerate-fft/default.nix | 2 +- pkgs/development/libraries/haskell/cuda/default.nix | 2 +- pkgs/development/libraries/haskell/cufft/default.nix | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/accelerate-cuda/default.nix b/pkgs/development/libraries/haskell/accelerate-cuda/default.nix index de4a47b1d7e..90b1ce05b0a 100644 --- a/pkgs/development/libraries/haskell/accelerate-cuda/default.nix +++ b/pkgs/development/libraries/haskell/accelerate-cuda/default.nix @@ -17,7 +17,7 @@ cabal.mkDerivation (self: { homepage = "https://github.com/AccelerateHS/accelerate-cuda/"; description = "Accelerate backend for NVIDIA GPUs"; license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; + hydraPlatforms = self.stdenv.lib.platforms.none; maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/accelerate-examples/default.nix b/pkgs/development/libraries/haskell/accelerate-examples/default.nix index 761f890d7e4..3c519dc1f77 100644 --- a/pkgs/development/libraries/haskell/accelerate-examples/default.nix +++ b/pkgs/development/libraries/haskell/accelerate-examples/default.nix @@ -24,7 +24,7 @@ cabal.mkDerivation (self: { homepage = "https://github.com/AccelerateHS/accelerate-examples"; description = "Examples using the Accelerate library"; license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; + hydraPlatforms = self.stdenv.lib.platforms.none; maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/accelerate-fft/default.nix b/pkgs/development/libraries/haskell/accelerate-fft/default.nix index cf041dd5e4a..e6fe73df7fc 100644 --- a/pkgs/development/libraries/haskell/accelerate-fft/default.nix +++ b/pkgs/development/libraries/haskell/accelerate-fft/default.nix @@ -9,6 +9,6 @@ cabal.mkDerivation (self: { homepage = "https://github.com/AccelerateHS/accelerate-fft"; description = "FFT using the Accelerate library"; license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/cuda/default.nix b/pkgs/development/libraries/haskell/cuda/default.nix index a53a1bda6a4..e3de1782abb 100644 --- a/pkgs/development/libraries/haskell/cuda/default.nix +++ b/pkgs/development/libraries/haskell/cuda/default.nix @@ -34,7 +34,7 @@ cabal.mkDerivation (self: { homepage = "https://github.com/tmcdonell/cuda"; description = "FFI binding to the CUDA interface for programming NVIDIA GPUs"; license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; + hydraPlatforms = self.stdenv.lib.platforms.none; maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/cufft/default.nix b/pkgs/development/libraries/haskell/cufft/default.nix index 76039f06548..a2bcafc3886 100644 --- a/pkgs/development/libraries/haskell/cufft/default.nix +++ b/pkgs/development/libraries/haskell/cufft/default.nix @@ -10,6 +10,6 @@ cabal.mkDerivation (self: { homepage = "http://github.com/robeverest/cufft"; description = "Haskell bindings for the CUFFT library"; license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) From a22e8fd6c0038831f3ff4b0dffe7d6285f1f8aa5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 2 Dec 2013 19:58:29 +0100 Subject: [PATCH 005/152] haskell-HDBC-odbc: re-generate with cabal2nix --- pkgs/development/libraries/haskell/HDBC/HDBC-odbc.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/haskell/HDBC/HDBC-odbc.nix b/pkgs/development/libraries/haskell/HDBC/HDBC-odbc.nix index ae08eb8940b..16df77a939e 100644 --- a/pkgs/development/libraries/haskell/HDBC/HDBC-odbc.nix +++ b/pkgs/development/libraries/haskell/HDBC/HDBC-odbc.nix @@ -8,7 +8,7 @@ cabal.mkDerivation (self: { isExecutable = true; buildDepends = [ HDBC mtl time utf8String ]; extraLibraries = [ odbc ]; - noHaddock = true; # Haddocks currently fail to build + noHaddock = true; meta = { homepage = "https://github.com/hdbc/hdbc-odbc"; description = "ODBC driver for HDBC"; From fc4d3254f8d761536a1ce708e276317c826d3f2f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 2 Dec 2013 19:58:49 +0100 Subject: [PATCH 006/152] haskell-scientific: re-generate with cabal2nix --- pkgs/development/libraries/haskell/scientific/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/haskell/scientific/default.nix b/pkgs/development/libraries/haskell/scientific/default.nix index c52784826ac..42d1c4b8612 100644 --- a/pkgs/development/libraries/haskell/scientific/default.nix +++ b/pkgs/development/libraries/haskell/scientific/default.nix @@ -8,6 +8,7 @@ cabal.mkDerivation (self: { sha256 = "1x3c8z1d7nhr1z5dlbs60pxfrgclfbwjhrkpvr0jnz0fpy2m9x5r"; buildDepends = [ deepseq hashable text ]; testDepends = [ smallcheck tasty tastySmallcheck text ]; + doCheck = false; meta = { homepage = "https://github.com/basvandijk/scientific"; description = "Arbitrary-precision floating-point numbers represented using scientific notation"; @@ -15,5 +16,4 @@ cabal.mkDerivation (self: { platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.ocharles ]; }; - doCheck = false; }) From 159649aeb46981b66d4f896f2260804398465c03 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 2 Dec 2013 20:02:04 +0100 Subject: [PATCH 007/152] haskell-codec-image-devil: re-generate with cabal2nix --- .../libraries/haskell/codec-image-devil/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/codec-image-devil/default.nix b/pkgs/development/libraries/haskell/codec-image-devil/default.nix index fc8631f07a6..1ee26a80d0b 100644 --- a/pkgs/development/libraries/haskell/codec-image-devil/default.nix +++ b/pkgs/development/libraries/haskell/codec-image-devil/default.nix @@ -4,10 +4,9 @@ cabal.mkDerivation (self: { pname = "Codec-Image-DevIL"; version = "0.2.3"; sha256 = "1kv3hns9f0bhfb723nj9szyz3zfqpvy02azzsiymzjz4ajhqmrsz"; - buildDepends = [ libdevil ]; + extraLibraries = [ libdevil ]; meta = { - homepage = "http://hackage.haskell.org/package/Codec-Image-DevIL"; - description = "Simple FFI interface to the DevIL image library"; + description = "An FFI interface to the DevIL library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; }; From 6e83b3c284a319c4b9b78a07033b4d77e00f130c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 2 Dec 2013 20:24:58 +0100 Subject: [PATCH 008/152] Re-generate cuda-related expressions with recent version of cabal2nix. --- pkgs/development/libraries/haskell/accelerate-cuda/default.nix | 1 + .../libraries/haskell/accelerate-examples/default.nix | 1 + pkgs/development/libraries/haskell/accelerate-fft/default.nix | 1 + pkgs/development/libraries/haskell/cuda/default.nix | 1 + pkgs/development/libraries/haskell/cufft/default.nix | 1 + 5 files changed, 5 insertions(+) diff --git a/pkgs/development/libraries/haskell/accelerate-cuda/default.nix b/pkgs/development/libraries/haskell/accelerate-cuda/default.nix index 90b1ce05b0a..129c0a81570 100644 --- a/pkgs/development/libraries/haskell/accelerate-cuda/default.nix +++ b/pkgs/development/libraries/haskell/accelerate-cuda/default.nix @@ -17,6 +17,7 @@ cabal.mkDerivation (self: { homepage = "https://github.com/AccelerateHS/accelerate-cuda/"; description = "Accelerate backend for NVIDIA GPUs"; license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; hydraPlatforms = self.stdenv.lib.platforms.none; maintainers = [ self.stdenv.lib.maintainers.andres ]; }; diff --git a/pkgs/development/libraries/haskell/accelerate-examples/default.nix b/pkgs/development/libraries/haskell/accelerate-examples/default.nix index 3c519dc1f77..963a55d2942 100644 --- a/pkgs/development/libraries/haskell/accelerate-examples/default.nix +++ b/pkgs/development/libraries/haskell/accelerate-examples/default.nix @@ -24,6 +24,7 @@ cabal.mkDerivation (self: { homepage = "https://github.com/AccelerateHS/accelerate-examples"; description = "Examples using the Accelerate library"; license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; hydraPlatforms = self.stdenv.lib.platforms.none; maintainers = [ self.stdenv.lib.maintainers.andres ]; }; diff --git a/pkgs/development/libraries/haskell/accelerate-fft/default.nix b/pkgs/development/libraries/haskell/accelerate-fft/default.nix index e6fe73df7fc..7869b986709 100644 --- a/pkgs/development/libraries/haskell/accelerate-fft/default.nix +++ b/pkgs/development/libraries/haskell/accelerate-fft/default.nix @@ -9,6 +9,7 @@ cabal.mkDerivation (self: { homepage = "https://github.com/AccelerateHS/accelerate-fft"; description = "FFT using the Accelerate library"; license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/cuda/default.nix b/pkgs/development/libraries/haskell/cuda/default.nix index e3de1782abb..e6ac9ee99ef 100644 --- a/pkgs/development/libraries/haskell/cuda/default.nix +++ b/pkgs/development/libraries/haskell/cuda/default.nix @@ -34,6 +34,7 @@ cabal.mkDerivation (self: { homepage = "https://github.com/tmcdonell/cuda"; description = "FFI binding to the CUDA interface for programming NVIDIA GPUs"; license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; hydraPlatforms = self.stdenv.lib.platforms.none; maintainers = [ self.stdenv.lib.maintainers.andres ]; }; diff --git a/pkgs/development/libraries/haskell/cufft/default.nix b/pkgs/development/libraries/haskell/cufft/default.nix index a2bcafc3886..5caec834139 100644 --- a/pkgs/development/libraries/haskell/cufft/default.nix +++ b/pkgs/development/libraries/haskell/cufft/default.nix @@ -10,6 +10,7 @@ cabal.mkDerivation (self: { homepage = "http://github.com/robeverest/cufft"; description = "Haskell bindings for the CUFFT library"; license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; hydraPlatforms = self.stdenv.lib.platforms.none; }; }) From a0ba2671151ce42f4a15a2e0f9d7aae4689e0569 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Mon, 2 Dec 2013 21:35:44 +0100 Subject: [PATCH 009/152] libvirt: Update to 1.2.0 --- pkgs/development/libraries/libvirt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 40fbbc94afd..c34934400d0 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -4,14 +4,14 @@ , dnsmasq }: -let version = "1.1.4"; in +let version = "1.2.0"; in stdenv.mkDerivation { name = "libvirt-${version}"; src = fetchurl { url = "http://libvirt.org/sources/libvirt-${version}.tar.gz"; - sha256 = "13yr9g1dk1bzzlm9h93kmavncyg6svjv3rjrv43ccl3sc37za42r"; + sha256 = "1p9dn96j8qqp20lr0kvc7zyjjcpgsa9k41slyk2jmnv1g2p7ird8"; }; buildInputs = From 35e47a4a476ab9487f9640970d8ddca9b163dcd3 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 2 Dec 2013 20:27:53 -0500 Subject: [PATCH 010/152] Update android sdks Signed-off-by: Shea Levy --- pkgs/development/mobile/androidenv/addon.xml | 377 ++++++++++++++---- pkgs/development/mobile/androidenv/addons.nix | 16 +- .../mobile/androidenv/androidsdk.nix | 14 +- .../mobile/androidenv/build-tools.nix | 10 +- .../mobile/androidenv/platform-tools.nix | 10 +- .../mobile/androidenv/platforms-linux.nix | 12 + .../mobile/androidenv/platforms-macosx.nix | 12 + .../mobile/androidenv/repository-8.xml | 180 +++++++-- .../mobile/androidenv/sysimages.nix | 8 + 9 files changed, 514 insertions(+), 125 deletions(-) diff --git a/pkgs/development/mobile/androidenv/addon.xml b/pkgs/development/mobile/androidenv/addon.xml index 2020f48b1d2..aee3c847e93 100644 --- a/pkgs/development/mobile/androidenv/addon.xml +++ b/pkgs/development/mobile/androidenv/addon.xml @@ -319,7 +319,152 @@ This is the Google TV Add-on for the Android Software Development Kit License Ag August 15, 2011 - + + + This is an early Sneak Peek of the GDK that is subject to change. Please stay tuned for the full Developer Preview coming soon. + +Terms and Conditions + +This is the Glass Development Kit License Agreement. + +1. Introduction + +1.1 The Glass Development Kit (referred to in this License Agreement as the "GDK" and specifically including the Android system files, packaged APIs, and GDK library files, if and when they are made available) is licensed to you subject to the terms of this License Agreement. This License Agreement forms a legally binding contract between you and Google in relation to your use of the GDK. + +1.2 "Glass" means Glass devices and the Glass software stack for use on Glass devices. + + +1.3 "Android" means the Android software stack for devices, as made available under the Android Open Source Project, which is located at the following URL: http://source.android.com/, as updated from time to time. + +1.4 "Google" means Google Inc., a Delaware corporation with principal place of business at 1600 Amphitheatre Parkway, Mountain View, CA 94043, United States. + +2. Accepting this License Agreement + +2.1 In order to use the GDK, you must first agree to this License Agreement. You may not use the GDK if you do not accept this License Agreement. + +2.2 By clicking to accept, you hereby agree to the terms of this License Agreement. + +2.3 You may not use the GDK and may not accept the License Agreement if you are a person barred from receiving the GDK under the laws of the United States or other countries including the country in which you are resident or from which you use the GDK. + +2.4 If you are agreeing to be bound by this License Agreement on behalf of your employer or other entity, you represent and warrant that you have full legal authority to bind your employer or such entity to this License Agreement. If you do not have the requisite authority, you may not accept the License Agreement or use the GDK on behalf of your employer or other entity. + +3. GDK License from Google + +3.1 Subject to the terms of this License Agreement, Google grants you a limited, worldwide, royalty-free, non-assignable and non-exclusive license to use the GDK solely to develop applications to run on the Glass platform for Glass devices. + +3.2 You agree that Google or third parties own all legal right, title and interest in and to the GDK, including any Intellectual Property Rights that subsist in the GDK. "Intellectual Property Rights" means any and all rights under patent law, copyright law, trade secret law, trademark law, and any and all other proprietary rights. Google reserves all rights not expressly granted to you. + +3.3 You may not use the GDK for any purpose not expressly permitted by this License Agreement. Except to the extent required by applicable third party licenses, you may not: (a) copy (except for backup purposes), modify, adapt, redistribute, decompile, reverse engineer, disassemble, or create derivative works of the GDK or any part of the GDK; or (b) load any part of the GDK onto a mobile handset or wearable computing device or any other hardware device except a Glass device personal computer, combine any part of the GDK with other software, or distribute any software or device incorporating a part of the GDK. + +3.4 You agree that you will not take any actions that may cause or result in the fragmentation of Glass, including but not limited to distributing, participating in the creation of, or promoting in any way a software development kit derived from the GDK. + +3.5 Use, reproduction and distribution of components of the GDK licensed under an open source software license are governed solely by the terms of that open source software license and not this License Agreement. + +3.6 You agree that the form and nature of the GDK that Google provides may change without prior notice to you and that future versions of the GDK may be incompatible with applications developed on previous versions of the GDK. You agree that Google may stop (permanently or temporarily) providing the GDK (or any features within the GDK) to you or to users generally at Google's sole discretion, without prior notice to you. + +3.7 Nothing in this License Agreement gives you a right to use any of Google's trade names, trademarks, service marks, logos, domain names, or other distinctive brand features. + +3.8 You agree that you will not remove, obscure, or alter any proprietary rights notices (including copyright and trademark notices) that may be affixed to or contained within the GDK. + + +3.9 Your use of any Android system files, packaged APIs, or other components of the GDK which are part of the Android Software Development Kit is subject to the terms of the Android Software Development Kit License Agreement located at http://developer.android.com/sdk/terms.html. These terms are hereby incorporated by reference into this License Agreement. + +4. Use of the GDK by You + +4.1 Google agrees that it obtains no right, title or interest from you (or your licensors) under this License Agreement in or to any software applications that you develop using the GDK, including any intellectual property rights that subsist in those applications. + +4.2 You agree to use the GDK and write applications only for purposes that are permitted by (a) this License Agreement, (b) the Glass Platform Developer Policies (located at https://developers.google.com/glass/policies, and hereby incorporated into this License Agreement by reference), and (c) any applicable law, regulation or generally accepted practices or guidelines in the relevant jurisdictions (including any laws regarding the export of data or software to and from the United States or other relevant countries). + +4.3 You agree that if you use the GDK to develop applications for general public users, you will protect the privacy and legal rights of those users. If the users provide you with user names, passwords, or other login information or personal information, you must make the users aware that the information will be available to your application, and you must provide legally adequate privacy notice and protection for those users. If your application stores personal or sensitive information provided by users, it must do so securely. If the user provides your application with Google Account information, your application may only use that information to access the user's Google Account when, and for the limited purposes for which, the user has given you permission to do so. + +4.4 You agree that you will not engage in any activity with the GDK, including the development or distribution of an application, that interferes with, disrupts, damages, or accesses in an unauthorized manner the servers, networks, or other properties or services of any third party including, but not limited to, Google. + +4.5 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any data, content, or resources that you create, transmit or display through Glass and/or applications for Glass, and for the consequences of your actions (including any loss or damage which Google may suffer) by doing so. + +4.6 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any breach of your obligations under this License Agreement, any applicable third party contract or Terms of Service, or any applicable law or regulation, and for the consequences (including any loss or damage which Google or any third party may suffer) of any such breach. + + +4.7 The GDK is in development, and your testing and feedback are an important part of the development process. By using the GDK, you acknowledge that implementation of some features are still under development and that you should not rely on the GDK, Glass devices, Glass system software, Google Mirror API, or Glass services having the full functionality of a stable release. + +5. Your Developer Credentials + +5.1 You agree that you are responsible for maintaining the confidentiality of any developer credentials that may be issued to you by Google or which you may choose yourself and that you will be solely responsible for all applications that are developed under your developer credentials. + +6. Privacy and Information + + +6.1 In order to continually innovate and improve the GDK, Google may collect certain usage statistics from the software including but not limited to a unique identifier, associated IP address, version number of the software, and information on which tools and/or services in the GDK are being used and how they are being used. Before any of this information is collected, the GDK will notify you and seek your consent. If you withhold consent, the information will not be collected. + +6.2 The data collected is examined in the aggregate to improve the GDK and is maintained in accordance with Google's Privacy Policy. + +7. Third Party Applications + +7.1 If you use the GDK to run applications developed by a third party or that access data, content or resources provided by a third party, you agree that Google is not responsible for those applications, data, content, or resources. You understand that all data, content or resources which you may access through such third party applications are the sole responsibility of the person from which they originated and that Google is not liable for any loss or damage that you may experience as a result of the use or access of any of those third party applications, data, content, or resources. + +7.2 You should be aware the data, content, and resources presented to you through such a third party application may be protected by intellectual property rights which are owned by the providers (or by other persons or companies on their behalf). You may not modify, rent, lease, loan, sell, distribute or create derivative works based on these data, content, or resources (either in whole or in part) unless you have been specifically given permission to do so by the relevant owners. + +7.3 You acknowledge that your use of such third party applications, data, content, or resources may be subject to separate terms between you and the relevant third party. In that case, this License Agreement does not affect your legal relationship with these third parties. + +8. Using Google APIs + +8.1 Google APIs + +8.1.1 If you use any API to retrieve data from Google, you acknowledge that the data may be protected by intellectual property rights which are owned by Google or those parties that provide the data (or by other persons or companies on their behalf). Your use of any such API may be subject to additional Terms of Service. You may not modify, rent, lease, loan, sell, distribute or create derivative works based on this data (either in whole or in part) unless allowed by the relevant Terms of Service. + +8.1.2 If you use any API to retrieve a user's data from Google, you acknowledge and agree that you shall retrieve data only with the user's explicit consent and only when, and for the limited purposes for which, the user has given you permission to do so. + +9. Terminating this License Agreement + +9.1 This License Agreement will continue to apply until terminated by either you or Google as set out below. + +9.2 If you want to terminate this License Agreement, you may do so by ceasing your use of the GDK and any relevant developer credentials. + +9.3 Google may at any time, terminate this License Agreement with you if: +(A) you have breached any provision of this License Agreement; or +(B) Google is required to do so by law; or +(C) the partner with whom Google offered certain parts of GDK (such as APIs) to you has terminated its relationship with Google or ceased to offer certain parts of the GDK to you; or +(D) Google decides to no longer provide the GDK or certain parts of the GDK to users in the country in which you are resident or from which you use the service, or the provision of the GDK or certain GDK services to you by Google is, in Google's sole discretion, no longer commercially viable. + +9.4 When this License Agreement comes to an end, all of the legal rights, obligations and liabilities that you and Google have benefited from, been subject to (or which have accrued over time whilst this License Agreement has been in force) or which are expressed to continue indefinitely, shall be unaffected by this cessation, and the provisions of paragraph 14.7 shall continue to apply to such rights, obligations and liabilities indefinitely. + +10. DISCLAIMER OF WARRANTIES + +10.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT YOUR USE OF THE GDK IS AT YOUR SOLE RISK AND THAT THE GDK IS PROVIDED "AS IS" AND "AS AVAILABLE" WITHOUT WARRANTY OF ANY KIND FROM GOOGLE. + +10.2 YOUR USE OF THE GDK AND ANY MATERIAL DOWNLOADED OR OTHERWISE OBTAINED THROUGH THE USE OF THE GDK IS AT YOUR OWN DISCRETION AND RISK AND YOU ARE SOLELY RESPONSIBLE FOR ANY DAMAGE TO YOUR COMPUTER SYSTEM OR OTHER DEVICE OR LOSS OF DATA THAT RESULTS FROM SUCH USE. + +10.3 GOOGLE FURTHER EXPRESSLY DISCLAIMS ALL WARRANTIES AND CONDITIONS OF ANY KIND, WHETHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO THE IMPLIED WARRANTIES AND CONDITIONS OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. + +11. LIMITATION OF LIABILITY + +11.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT GOOGLE, ITS SUBSIDIARIES AND AFFILIATES, AND ITS LICENSORS SHALL NOT BE LIABLE TO YOU UNDER ANY THEORY OF LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, CONSEQUENTIAL OR EXEMPLARY DAMAGES THAT MAY BE INCURRED BY YOU, INCLUDING ANY LOSS OF DATA, WHETHER OR NOT GOOGLE OR ITS REPRESENTATIVES HAVE BEEN ADVISED OF OR SHOULD HAVE BEEN AWARE OF THE POSSIBILITY OF ANY SUCH LOSSES ARISING. + +12. Indemnification + +12.1 To the maximum extent permitted by law, you agree to defend, indemnify and hold harmless Google, its affiliates and their respective directors, officers, employees and agents from and against any and all claims, actions, suits or proceedings, as well as any and all losses, liabilities, damages, costs and expenses (including reasonable attorneys fees) arising out of or accruing from (a) your use of the GDK, (b) any application you develop on the GDK that infringes any copyright, trademark, trade secret, trade dress, patent or other intellectual property right of any person or defames any person or violates their rights of publicity or privacy, and (c) any non-compliance by you with this License Agreement. + +13. Changes to the License Agreement + +13.1 Google may make changes to the License Agreement as it distributes new versions of the GDK. When these changes are made, Google will make a new version of the License Agreement available on the website where the GDK is made available. + +14. General Legal Terms + +14.1 This License Agreement constitutes the whole legal agreement between you and Google and governs your use of the GDK (excluding any services which Google may provide to you under a separate written agreement), and completely replaces any prior agreements between you and Google in relation to the GDK. + +14.2 You agree that if Google does not exercise or enforce any legal right or remedy which is contained in this License Agreement (or which Google has the benefit of under any applicable law), this will not be taken to be a formal waiver of Google's rights and that those rights or remedies will still be available to Google. + +14.3 If any court of law, having the jurisdiction to decide on this matter, rules that any provision of this License Agreement is invalid, then that provision will be removed from this License Agreement without affecting the rest of this License Agreement. The remaining provisions of this License Agreement will continue to be valid and enforceable. + +14.4 You acknowledge and agree that each member of the group of companies of which Google is the parent shall be third party beneficiaries to this License Agreement and that such other companies shall be entitled to directly enforce, and rely upon, any provision of this License Agreement that confers a benefit on (or rights in favor of) them. Other than this, no other person or company shall be third party beneficiaries to this License Agreement. + +14.5 EXPORT RESTRICTIONS. THE GDK IS SUBJECT TO UNITED STATES EXPORT LAWS AND REGULATIONS. YOU MUST COMPLY WITH ALL DOMESTIC AND INTERNATIONAL EXPORT LAWS AND REGULATIONS THAT APPLY TO THE GDK. THESE LAWS INCLUDE RESTRICTIONS ON DESTINATIONS, END USERS AND END USE. + +14.6 The rights granted in this License Agreement may not be assigned or transferred by either you or Google without the prior written approval of the other party. Neither you nor Google shall be permitted to delegate their responsibilities or obligations under this License Agreement without the prior written approval of the other party. + +14.7 This License Agreement, and your relationship with Google under this License Agreement, shall be governed by the laws of the State of California without regard to its conflict of laws provisions. You and Google agree to submit to the exclusive jurisdiction of the courts located within the county of Santa Clara, California to resolve any legal matter arising from this License Agreement. Notwithstanding this, you agree that Google shall still be allowed to apply for injunctive remedies (or an equivalent type of urgent legal relief) in any jurisdiction. + +November 19, 2013 + @@ -708,6 +853,97 @@ August 15, 2011 + + + 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 + 3 + + + com.google.android.maps + + + com.android.future.usb.accessory + + + com.google.android.media.effects + + + + + 143149689 + 147bce09c1163edc17194f3db496ec1086fcf965 + google_apis-18_r03.zip + + + + + + + + google + Google Inc. + google_apis + Google APIs + Android + Google APIs + 19 + 1 + + + com.google.android.maps + + + com.android.future.usb.accessory + + + com.google.android.media.effects + + + + + 150689239 + 6c530a8318446e4da1e3ab7d2abd154bc493bc5a + google_apis-19_r01.zip + + + + + + @@ -750,71 +986,40 @@ August 15, 2011 - - - 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 - 2 - - - com.google.android.maps - - - com.android.future.usb.accessory - - - com.google.android.media.effects - - + google_gdk + Glass Development Kit Sneak Peek + 15 + 01 + Sneak peek of the Glass Development Kit + https://developers.google.com/glass/gdk/ + - - 142778022 - 40f2a6a6d6227dadd82cfe0f9783bd4c6bdb29c2 - google_apis-18_r02.zip + + 281839 + a3c7317fb2fe8a0dfc06828a5aabc457372b82a7 + https://dl-ssl.google.com/glass/xe11/google-gdk.zip - + + + com.google.android.glass + APIs for Google Glass Development Kit Sneak Peek. + + + - - 18 + + 19 Android android Android Support Library @@ -822,17 +1027,17 @@ August 15, 2011 compatibility - 4438319 - bd67b4b8a6bac629f24c8aea75c3619a26d9a568 - support_r18.zip + 4905998 + 54b8661595856a08f032d41bb139f375a7609308 + support_r19.zip - - 2 + + 3 Android android Android Support Repository @@ -840,9 +1045,9 @@ August 15, 2011 m2repository - 3705797 - c4284e4bf17a1e8bafc96a18de36984022d5a46a - android_m2repository_r02.zip + 6282146 + db4650f817f1507211ec6186d2d9e72074e6df12 + android_m2repository_r03.zip @@ -855,14 +1060,14 @@ August 15, 2011 Google Inc. Google Repository m2repository - 2 + 4 Local Maven repository for Google Libraries - 2043649 - f518e0170e84a6bccbadb8a043989cc61f4c37aa - google_m2repository_r02.zip + 3891592 + c418daafd203a8cb4899d49bd321da83b927586e + google_m2repository_r04.zip @@ -908,17 +1113,35 @@ August 15, 2011 google Google Inc. - Google Play services - google_play_services - 11 - Google Play Services client library and sample code + Google Play services for Froyo + google_play_services_froyo + 12 + Google Play services client library and sample code https://developers.google.com/android/google-play-services/index - 5265306 - 00851350c55b016bef202700f643f246fb0c24ea - google_play_services_3264130_r11.zip + 5265389 + 92558dbc380bba3d55d0ec181167fb05ce7c79d9 + google_play_services_3265130_r12.zip + + + + + + google + Google Inc. + Google Play services + google_play_services + 13 + Google Play services client library and sample code + https://developers.google.com/android/google-play-services/index + + + + 7958511 + 1be94e8f767616e862f0088ab673e1980a6022c4 + google_play_services_4030530_r13.zip @@ -948,14 +1171,14 @@ August 15, 2011 Google Play Billing Library play_billing market_billing - 4 + 5 Google Play Billing files and sample code http://developer.android.com/google/play/billing/index.html - 437084 - 38fdae51dadb6d1e63e177adba3e4d96b751686e - play_billing_r04.zip + 436654 + bd2ac5ce7127070ac3229003eb69cfb806628ac9 + play_billing_r05.zip diff --git a/pkgs/development/mobile/androidenv/addons.nix b/pkgs/development/mobile/androidenv/addons.nix index 2fd66420cf6..8aacde4eee7 100644 --- a/pkgs/development/mobile/androidenv/addons.nix +++ b/pkgs/development/mobile/androidenv/addons.nix @@ -197,8 +197,20 @@ in google_apis_18 = buildGoogleApis { name = "google_apis-18"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/google_apis-18_r02.zip; - sha1 = "40f2a6a6d6227dadd82cfe0f9783bd4c6bdb29c2"; + url = https://dl-ssl.google.com/android/repository/google_apis-18_r03.zip; + sha1 = "147bce09c1163edc17194f3db496ec1086fcf965"; + }; + meta = { + description = "Android + Google APIs"; + + }; + }; + + google_apis_19 = buildGoogleApis { + name = "google_apis-19"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/google_apis-19_r01.zip; + sha1 = "6c530a8318446e4da1e3ab7d2abd154bc493bc5a"; }; meta = { description = "Android + Google APIs"; diff --git a/pkgs/development/mobile/androidenv/androidsdk.nix b/pkgs/development/mobile/androidenv/androidsdk.nix index 0b5f69ed3e2..f1bbdc35bcd 100644 --- a/pkgs/development/mobile/androidenv/androidsdk.nix +++ b/pkgs/development/mobile/androidenv/androidsdk.nix @@ -8,16 +8,16 @@ {platformVersions, abiVersions, useGoogleAPIs}: stdenv.mkDerivation { - name = "android-sdk-22.2"; + name = "android-sdk-22.3"; src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl { - url = http://dl.google.com/android/android-sdk_r22.2-linux.tgz; - md5 = "2a3776839e823ba9acb7a87a3fe26e02"; + url = http://dl.google.com/android/android-sdk_r22.3-linux.tgz; + md5 = "6ae581a906d6420ad67176dff25a31cc"; } else if stdenv.system == "x86_64-darwin" then fetchurl { - url = http://dl.google.com/android/android-sdk_r22.2-macosx.zip; - md5 = "9dfef6404e2f842c433073796aed8b7d"; + url = http://dl.google.com/android/android-sdk_r22.3-macosx.zip; + md5 = "ecde88ca1f05955826697848fcb4a9e7"; } else throw "platform not ${stdenv.system} supported!"; @@ -132,7 +132,7 @@ stdenv.mkDerivation { let googleApis = builtins.getAttr ("google_apis_"+platformVersion) addons; in - "ln -s ${googleApis}/* addon-google_apis-${platformVersion}" + "ln -s ${googleApis}/* addon-google_apis-${platformVersion}\n" else "") platformVersions else ""} @@ -148,7 +148,7 @@ stdenv.mkDerivation { let platform = builtins.getAttr ("platform_"+platformVersion) platforms; in - "ln -s ${platform}/* android-${platformVersion}" + "ln -s ${platform}/* android-${platformVersion}\n" else "" ) platformVersions} diff --git a/pkgs/development/mobile/androidenv/build-tools.nix b/pkgs/development/mobile/androidenv/build-tools.nix index 58bf3549361..ebcde6a8a2d 100644 --- a/pkgs/development/mobile/androidenv/build-tools.nix +++ b/pkgs/development/mobile/androidenv/build-tools.nix @@ -1,15 +1,15 @@ {stdenv, stdenv_32bit, fetchurl, unzip, zlib_32bit}: stdenv.mkDerivation { - name = "android-build-tools-r18.1.0"; + name = "android-build-tools-r19"; src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl { - url = https://dl-ssl.google.com/android/repository/build-tools_r18.1-linux.zip; - sha1 = "f314a0599e51397f0886fe888b50dd98f2f050d8"; + url = https://dl-ssl.google.com/android/repository/build-tools_r19-linux.zip; + sha1 = "55c1a6cf632e7d346f0002b275ec41fd3137fd83"; } else if stdenv.system == "x86_64-darwin" then fetchurl { - url = https://dl-ssl.google.com/android/repository/build-tools_r18.1-macosx.zip; - sha1 = "16ddb299b8b43063e5bb3387ec17147c5053dfd8"; + url = https://dl-ssl.google.com/android/repository/build-tools_r19-macosx.zip; + sha1 = "86ec1c12db1bc446b7bcaefc5cc14eb361044e90"; } else throw "System ${stdenv.system} not supported!"; diff --git a/pkgs/development/mobile/androidenv/platform-tools.nix b/pkgs/development/mobile/androidenv/platform-tools.nix index bf263741bdd..a7a2661bd37 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}: stdenv.mkDerivation { - name = "android-platform-tools-r18.0.1"; + name = "android-platform-tools-r19"; src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl { - url = https://dl-ssl.google.com/android/repository/platform-tools_r18.0.1-linux.zip; - sha1 = "cf9bdbbaa34da37b59724f914dad907c2c74a387"; + url = https://dl-ssl.google.com/android/repository/platform-tools_r19-linux.zip; + sha1 = "66ee37daf8a2a8f1aa8939ccd4093658e30aa49b"; } 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 = "126325cbb55928c38acbb9c7bb5d9145d94fad56"; + url = https://dl-ssl.google.com/android/repository/platform-tools_r19-macosx.zip; + sha1 = "69af30f488163dfc3da8cef1bb6cc7e8a6df5681"; } else throw "System ${stdenv.system} not supported!"; diff --git a/pkgs/development/mobile/androidenv/platforms-linux.nix b/pkgs/development/mobile/androidenv/platforms-linux.nix index 5db90ffef1c..f9f5a2d50f4 100644 --- a/pkgs/development/mobile/androidenv/platforms-linux.nix +++ b/pkgs/development/mobile/androidenv/platforms-linux.nix @@ -218,5 +218,17 @@ in }; }; + platform_19 = buildPlatform { + name = "android-platform-4.4"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/android-19_r01.zip; + sha1 = "96281811998272dce46e8285d15fce444a3d5a96"; + }; + meta = { + description = "Android SDK Platform 4.4"; + + }; + }; + } \ No newline at end of file diff --git a/pkgs/development/mobile/androidenv/platforms-macosx.nix b/pkgs/development/mobile/androidenv/platforms-macosx.nix index c5ddf714cdf..a95561d3e85 100644 --- a/pkgs/development/mobile/androidenv/platforms-macosx.nix +++ b/pkgs/development/mobile/androidenv/platforms-macosx.nix @@ -218,5 +218,17 @@ in }; }; + platform_19 = buildPlatform { + name = "android-platform-4.4"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/android-19_r01.zip; + sha1 = "96281811998272dce46e8285d15fce444a3d5a96"; + }; + meta = { + description = "Android SDK Platform 4.4"; + + }; + }; + } \ No newline at end of file diff --git a/pkgs/development/mobile/androidenv/repository-8.xml b/pkgs/development/mobile/androidenv/repository-8.xml index 79795aa4939..46ae8aa9a7c 100644 --- a/pkgs/development/mobile/androidenv/repository-8.xml +++ b/pkgs/development/mobile/androidenv/repository-8.xml @@ -638,6 +638,30 @@ November 13, 2012 + + + 1 + Android SDK Platform 4.4 + 4.4 + 19 + + 22 + + + 10 + 1 + + + + 59279956 + 96281811998272dce46e8285d15fce444a3d5a96 + android-19_r01.zip + + + + + + @@ -720,6 +744,23 @@ November 13, 2012 + + + 1 + Android SDK Platform 4.4 + 19 + armeabi-v7a + + + 155838103 + 12dd1187dfd953b1ffcef5067d94578590f9e600 + sysimg_armv7a-19_r01.zip + + + + + + @@ -919,30 +960,44 @@ November 13, 2012 + + + 1 + 19 + + + 20697510 + c2007694b5e5ad6737f647db8160155d5258cb7f + samples-19_r01.zip + + + + + - + - 18 + 19 0 - 1 + 0 - 954769 - b40fea3ed72296dd42dd616a7abf536b8dace20d - platform-tools_r18.0.1-windows.zip + 1116358 + 755dcb5b5b72bbca90dd055eec4c8d0b1fce7cfd + platform-tools_r19-windows.zip - 1011194 - cf9bdbbaa34da37b59724f914dad907c2c74a387 - platform-tools_r18.0.1-linux.zip + 1172749 + 66ee37daf8a2a8f1aa8939ccd4093658e30aa49b + platform-tools_r19-linux.zip - 971087 - 126325cbb55928c38acbb9c7bb5d9145d94fad56 - platform-tools_r18.0.1-macosx.zip + 1120849 + 69af30f488163dfc3da8cef1bb6cc7e8a6df5681 + platform-tools_r19-macosx.zip @@ -1033,33 +1088,86 @@ November 13, 2012 + + + + 18 + 1 + 1 + + + + 19660000 + c4605066e2f851387ea70bc1442b1968bd7b4a15 + build-tools_r18.1.1-windows.zip + + + 20229760 + 68c9acbfc0cec2d51b19efaed39831a17055d998 + build-tools_r18.1.1-linux.zip + + + 20452157 + a9d9d37f6ddf859e57abc78802a77aaa166e48d4 + build-tools_r18.1.1-macosx.zip + + + + + + + + + 19 + 0 + 0 + + + + 20611447 + 6edf505c20f5ece9c48fa0aff9a90488f9654d52 + build-tools_r19-windows.zip + + + 21339943 + 55c1a6cf632e7d346f0002b275ec41fd3137fd83 + build-tools_r19-linux.zip + + + 21441270 + 86ec1c12db1bc446b7bcaefc5cc14eb361044e90 + build-tools_r19-macosx.zip + + + + + - + 22 - 2 - 0 + 3 18 - 108669997 - c4231cd769ef9d1b6ae69202a1a0d0f783f04ea7 - tools_r22.2-windows.zip + 108726734 + 1cdc825c9a84ccf69b4a6386076a881d962dd7a9 + tools_r22.3-windows.zip - 101168674 - a11febd30023ed2590bca4c2d7b1dc2b0cfcd715 - tools_r22.2-linux.zip + 101224750 + f76251916a23cb3d85e579f01cc6711a334f9064 + tools_r22.3-linux.zip - 74822802 - 76896171d0c9ba91c875c8f13ac58cd2e50e9f28 - tools_r22.2-macosx.zip + 74859563 + 697d7f6fa44f02e6894d0eeb948ea97e3cdc8c3c + tools_r22.3-macosx.zip @@ -1068,14 +1176,14 @@ November 13, 2012 - + 1 - 18 + 19 - 142332266 - 83632d157781d31f2a8e52acad5c4c5d0f307cba - docs-18_r01.zip + 181765706 + 6c92bb045f75a2eabfbdc3e26ff64ce0a7a2b3fc + docs-19_r01.zip @@ -1152,4 +1260,18 @@ November 13, 2012 + + + + 1 + 19 + + + 21656670 + 91d9f5f4117723eecc4434b7de0e7f6295ea0508 + sources-19_r01.zip + + + + diff --git a/pkgs/development/mobile/androidenv/sysimages.nix b/pkgs/development/mobile/androidenv/sysimages.nix index 4c1f0a30907..bbbf3a4fc68 100644 --- a/pkgs/development/mobile/androidenv/sysimages.nix +++ b/pkgs/development/mobile/androidenv/sysimages.nix @@ -53,6 +53,14 @@ in }; }; + sysimg_armeabi-v7a_19 = buildSystemImage { + name = "armeabi-v7a-19"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/sysimg_armv7a-19_r01.zip; + sha1 = "12dd1187dfd953b1ffcef5067d94578590f9e600"; + }; + }; + sysimg_x86_10 = buildSystemImage { name = "x86-10"; src = fetchurl { From de529d6b4ba6ce90d42dc95c4d59ef55ac7e685e Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 21 Nov 2013 03:47:12 -0600 Subject: [PATCH 011/152] Upgrade opus from 1.0.2 -> 1.0.3 --- pkgs/development/libraries/libopus/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libopus/default.nix b/pkgs/development/libraries/libopus/default.nix index d08ae8ef72a..11f7a370efa 100644 --- a/pkgs/development/libraries/libopus/default.nix +++ b/pkgs/development/libraries/libopus/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, fixedPoint ? false }: stdenv.mkDerivation rec { - name = "libopus-1.0.2"; + name = "libopus-1.0.3"; src = fetchurl { - url = "http://downloads.xiph.org/releases/opus/opus-1.0.2.tar.gz"; - sha256 = "12npbkrcwvh3fl9l18cwrxwg269cg2j6j7876cc9q0axxvdmwqfs"; + url = "http://downloads.xiph.org/releases/opus/opus-1.0.3.tar.gz"; + sha256 = "175l7hv7d03c4iz60g185nqvwrabc39ksil0d7g07i6vjaf0h6hr"; }; configureFlags = stdenv.lib.optionalString fixedPoint "--enable-fixed-point"; From 4118e632e84cffb0c3f994d5e512890650447c0f Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 2 Dec 2013 19:48:20 -0600 Subject: [PATCH 012/152] Upgeade avahi to 0.6.31 Additionally, link compatability files for dns_sd.h and howl as these are needed to build mumble and potentially other avahi using derivations. --- pkgs/development/libraries/avahi/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/avahi/default.nix b/pkgs/development/libraries/avahi/default.nix index f4795286e09..0adc7d56357 100644 --- a/pkgs/development/libraries/avahi/default.nix +++ b/pkgs/development/libraries/avahi/default.nix @@ -7,11 +7,11 @@ assert qt4Support -> qt4 != null; stdenv.mkDerivation rec { - name = "avahi-0.6.30"; + name = "avahi-0.6.31"; src = fetchurl { url = "${meta.homepage}/download/${name}.tar.gz"; - sha256 = "07zzaxs81rbrfhj0rnq616c3j37f3g84dn7d4q3h5l1r4dn33r7r"; + sha256 = "0j5b5ld6bjyh3qhd2nw0jb84znq0wqai7fsrdzg7bpg24jdp2wl3"; }; patches = [ ./no-mkdir-localstatedir.patch ]; @@ -37,6 +37,13 @@ stdenv.mkDerivation rec { avahi-core/socket.c ''; + postInstall = '' + # Maintain compat for mdnsresponder and howl + ${if withLibdnssdCompat then "ln -s avahi-compat-libdns_sd/dns_sd.h $out/include/dns_sd.h" else ""} + ln -s avahi-compat-howl $out/include/howl + ln -s avahi-compat-howl.pc $out/lib/pkgconfig/howl.pc + ''; + meta = with stdenv.lib; { description = "mDNS/DNS-SD implementation"; homepage = http://avahi.org; From 7aa292a069e52e23682477c990199c87d1ad303f Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 21 Nov 2013 04:22:04 -0600 Subject: [PATCH 013/152] Properly configure mumble to build without the server and libopus --- pkgs/applications/networking/mumble/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index 0981ab39449..a0083700054 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, qt4, libvorbis, boost, speechd, protobuf, libsndfile, - avahi, dbus, libcap, pkgconfig, +{ stdenv, fetchurl, qt4, boost, speechd, protobuf, libsndfile, + speex, libopus, avahi, pkgconfig jackSupport ? false, jackaudio ? null }: @@ -18,16 +18,18 @@ stdenv.mkDerivation rec { ''; configurePhase = '' - qmake CONFIG+=no-g15 CONFIG+=no-update \ - CONFIG+=no-embed-qt-translations CONFIG+=no-ice \ + qmake CONFIG+=no-g15 CONFIG+=no-update CONFIG+=no-server \ + CONFIG+=no-embed-qt-translations CONFIG+=packaged \ + CONFIG+=bundled-celt CONFIG+=no-bundled-opus \ + CONFIG+=no-bundled-speex '' + stdenv.lib.optionalString jackSupport '' CONFIG+=no-oss CONFIG+=no-alsa CONFIG+=jackaudio ''; - buildInputs = [ qt4 libvorbis boost speechd protobuf libsndfile avahi dbus - libcap pkgconfig ] + buildInputs = [ qt4 boost speechd protobuf libsndfile speex + libopus avahi pkgconfig ] ++ (stdenv.lib.optional jackSupport jackaudio); installPhase = '' From ff1d97f3a48bc66441e09602803676d6e170ed46 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 21 Nov 2013 04:22:35 -0600 Subject: [PATCH 014/152] Add Build Script for Murmur --- .../applications/networking/mumble/murmur.nix | 30 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 6 ++++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/applications/networking/mumble/murmur.nix diff --git a/pkgs/applications/networking/mumble/murmur.nix b/pkgs/applications/networking/mumble/murmur.nix new file mode 100644 index 00000000000..b40632384c2 --- /dev/null +++ b/pkgs/applications/networking/mumble/murmur.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, qt4, boost, protobuf, avahi, libcap, pkgconfig }: + +stdenv.mkDerivation rec { + name = "murmur-" + version; + version = "1.2.4"; + + src = fetchurl { + url = "mirror://sourceforge/mumble/mumble-${version}.tar.gz"; + sha256 = "16wwj6gwcnyjlnzh7wk0l255ldxmbwx0wi652sdp20lsv61q7kx1"; + }; + + configurePhase = '' + qmake CONFIG+=no-client CONFIG+=no-ice CONFIG+=no-embed-qt + ''; + + buildInputs = [ qt4 boost protobuf avahi libcap pkgconfig ]; + + installPhase = '' + mkdir -p $out + cp -r ./release $out/bin + ''; + + meta = { + homepage = http://mumble.sourceforge.net/; + description = "Low-latency, high quality voice chat software"; + license = "BSD"; + platforms = with stdenv.lib.platforms; linux; + maintainers = with stdenv.lib.maintainers; [viric]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fe4f83ccb04..4e85ea8d52f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8454,6 +8454,12 @@ let jackSupport = config.mumble.jackSupport or false; }; + murmur = callPackage ../applications/networking/mumble/murmur.nix { + avahi = avahi.override { + withLibdnssdCompat = true; + }; + }; + mutt = callPackage ../applications/networking/mailreaders/mutt { }; ruby_gpgme = callPackage ../development/libraries/ruby_gpgme { From 4a1a28faebf809621a97b3fa0a198d401c1531f7 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 2 Dec 2013 21:41:40 -0500 Subject: [PATCH 015/152] Revert android build tools update https://code.google.com/p/android/issues/detail?id=61710 Signed-off-by: Shea Levy --- pkgs/development/mobile/androidenv/build-tools.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/mobile/androidenv/build-tools.nix b/pkgs/development/mobile/androidenv/build-tools.nix index ebcde6a8a2d..58bf3549361 100644 --- a/pkgs/development/mobile/androidenv/build-tools.nix +++ b/pkgs/development/mobile/androidenv/build-tools.nix @@ -1,15 +1,15 @@ {stdenv, stdenv_32bit, fetchurl, unzip, zlib_32bit}: stdenv.mkDerivation { - name = "android-build-tools-r19"; + name = "android-build-tools-r18.1.0"; src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl { - url = https://dl-ssl.google.com/android/repository/build-tools_r19-linux.zip; - sha1 = "55c1a6cf632e7d346f0002b275ec41fd3137fd83"; + url = https://dl-ssl.google.com/android/repository/build-tools_r18.1-linux.zip; + sha1 = "f314a0599e51397f0886fe888b50dd98f2f050d8"; } else if stdenv.system == "x86_64-darwin" then fetchurl { - url = https://dl-ssl.google.com/android/repository/build-tools_r19-macosx.zip; - sha1 = "86ec1c12db1bc446b7bcaefc5cc14eb361044e90"; + url = https://dl-ssl.google.com/android/repository/build-tools_r18.1-macosx.zip; + sha1 = "16ddb299b8b43063e5bb3387ec17147c5053dfd8"; } else throw "System ${stdenv.system} not supported!"; From b7aaa7ab78ce05695a4b94d547885aa1da42f22a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Tue, 3 Dec 2013 11:28:27 +0100 Subject: [PATCH 016/152] nagios-plugins: fix download URL (no longer available from sourceforge) --- pkgs/servers/monitoring/nagios/plugins/official/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/monitoring/nagios/plugins/official/default.nix b/pkgs/servers/monitoring/nagios/plugins/official/default.nix index 29eb7bbb7a0..29b1a1db5af 100644 --- a/pkgs/servers/monitoring/nagios/plugins/official/default.nix +++ b/pkgs/servers/monitoring/nagios/plugins/official/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "nagios-plugins-1.4.10"; src = fetchurl { - url = mirror://sourceforge/nagiosplug/nagios-plugins-1.4.10.tar.gz; + url = https://www.nagios-plugins.org/download/nagios-plugins-1.4.10.tar.gz; sha256 = "0vm7sjiygxbfc5vbsi1g0dakpvynfzi86fhqx4yxd61brn0g8ghr"; }; From 1a996759a5314d7bb3ceeec58bb50308e9d64135 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 3 Dec 2013 12:44:52 +0100 Subject: [PATCH 017/152] ess-mode: update to version 13.09 --- pkgs/applications/editors/emacs-modes/ess/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/ess/default.nix b/pkgs/applications/editors/emacs-modes/ess/default.nix index 4bd5148b950..a5b9cc184f3 100644 --- a/pkgs/applications/editors/emacs-modes/ess/default.nix +++ b/pkgs/applications/editors/emacs-modes/ess/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, emacs, texinfo }: -stdenv.mkDerivation { - name = "ess-13.05"; +stdenv.mkDerivation rec { + name = "ess-13.09"; src = fetchurl { - url = "http://ess.r-project.org/downloads/ess/ess-13.05.tgz"; - sha256 = "007rd8hg1aclr2i8178ym5c4bi7vgmwkp802v1mkgr85h50zlfdk"; + url = "http://ess.r-project.org/downloads/ess/${name}.tgz"; + sha256 = "1lki3vb6p7cw98zqq0gaia68flpqrjkd6dcl85fs0cc8qf55yqnh"; }; buildInputs = [ emacs texinfo ]; From bc3c49ce9bb98dae82f3999ea412f0e1794af9cc Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 3 Dec 2013 09:17:01 -0500 Subject: [PATCH 018/152] valgrind: Update to 3.9.0 --- .../tools/analysis/valgrind/default.nix | 43 +++++----- .../tools/analysis/valgrind/glibc-2.17.patch | 78 ------------------- 2 files changed, 18 insertions(+), 103 deletions(-) delete mode 100644 pkgs/development/tools/analysis/valgrind/glibc-2.17.patch diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix index 4592c1bb53f..97565bec98e 100644 --- a/pkgs/development/tools/analysis/valgrind/default.nix +++ b/pkgs/development/tools/analysis/valgrind/default.nix @@ -1,24 +1,33 @@ { stdenv, fetchurl, perl, gdb }: -stdenv.mkDerivation (rec { - name = "valgrind-3.8.1"; +stdenv.mkDerivation rec { + name = "valgrind-3.9.0"; src = fetchurl { url = "http://valgrind.org/downloads/${name}.tar.bz2"; - sha256 = "1nsqk70ry3221sd62s4f0njcrncppszs4xxjcak13lxyfq2y0fs7"; + sha256 = "1w6n5qvxy2ssbczcl1c2yd2ggjn3ipay2hvpn10laly2dfh73bz6"; }; - patches = [ ./glibc-2.17.patch ]; - # Perl is needed for `cg_annotate'. # GDB is needed to provide a sane default for `--db-command'. nativeBuildInputs = [ perl ]; buildInputs = stdenv.lib.optional (!stdenv.isDarwin) gdb; + enableParallelBuilding = true; + + patchPhase = + # Apple's GCC doesn't recognize `-arch' (as of version 4.2.1, build 5666). + '' + echo "getting rid of the \`-arch' GCC option..." + find -name Makefile\* -exec \ + sed -i {} -e's/DARWIN\(.*\)-arch [^ ]\+/DARWIN\1/g' \; + + sed -i coregrind/link_tool_exe_darwin.in \ + -e 's/^my \$archstr = .*/my $archstr = "x86_64";/g' + ''; + configureFlags = - if (stdenv.system == "x86_64-linux" || stdenv.system == "x86_64-darwin") - then [ "--enable-only64bit" ] - else []; + stdenv.lib.optional (stdenv.system == "x86_64-linux" || stdenv.system == "x86_64-darwin") "--enable-only64bit"; postInstall = '' for i in $out/lib/valgrind/*.supp; do @@ -43,23 +52,7 @@ stdenv.mkDerivation (rec { license = "GPLv2+"; - maintainers = with stdenv.lib.maintainers; [ eelco ]; + maintainers = [ stdenv.lib.maintainers.eelco ]; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; }; } - -// - -(if stdenv.isDarwin - then { - patchPhase = - # Apple's GCC doesn't recognize `-arch' (as of version 4.2.1, build 5666). - '' echo "getting rid of the \`-arch' GCC option..." - find -name Makefile\* -exec \ - sed -i {} -e's/DARWIN\(.*\)-arch [^ ]\+/DARWIN\1/g' \; - - sed -i coregrind/link_tool_exe_darwin.in \ - -e 's/^my \$archstr = .*/my $archstr = "x86_64";/g' - ''; - } - else {})) diff --git a/pkgs/development/tools/analysis/valgrind/glibc-2.17.patch b/pkgs/development/tools/analysis/valgrind/glibc-2.17.patch deleted file mode 100644 index bee1abe71f1..00000000000 --- a/pkgs/development/tools/analysis/valgrind/glibc-2.17.patch +++ /dev/null @@ -1,78 +0,0 @@ -commit 3781ac11ff374b3517011c1710ec517d52f25cd2 -Author: tom -Date: Mon Jan 14 09:48:49 2013 +0000 - - Accept glibc 2.17 as valid. - - - git-svn-id: svn://svn.valgrind.org/valgrind/trunk@13228 a5019735-40e9-0310-863c-91ae7b9d1cf9 - -diff --git a/configure.in b/configure.in -index e0fb12d..0f3b3df 100644 ---- a/configure.in -+++ b/configure.in -@@ -906,6 +906,13 @@ case "${GLIBC_VERSION}" in - DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" - DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" - ;; -+ 2.17) -+ AC_MSG_RESULT(2.17 family) -+ AC_DEFINE([GLIBC_2_17], 1, [Define to 1 if you're using glibc 2.17.x]) -+ DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" -+ ;; - darwin) - AC_MSG_RESULT(Darwin) - AC_DEFINE([DARWIN_LIBC], 1, [Define to 1 if you're using Darwin]) -@@ -919,7 +926,7 @@ case "${GLIBC_VERSION}" in - - *) - AC_MSG_RESULT([unsupported version ${GLIBC_VERSION}]) -- AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.16]) -+ AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.17]) - AC_MSG_ERROR([or Darwin libc]) - ;; - esac -diff -ur valgrind-3.8.1/config.h.in valgrind-3.8.1/config.h.in ---- valgrind-3.8.1/config.h.in 2013-01-16 17:15:33.531018561 +0100 -+++ valgrind-3.8.1/config.h.in 2013-01-16 17:19:21.000000000 +0100 -@@ -48,6 +48,9 @@ - /* Define to 1 if you're using glibc 2.16.x */ - #undef GLIBC_2_16 - -+/* Define to 1 if you're using glibc 2.17.x */ -+#undef GLIBC_2_17 -+ - /* Define to 1 if you're using glibc 2.2.x */ - #undef GLIBC_2_2 - -diff -ur valgrind-3.8.1/configure valgrind-3.8.1/configure ---- valgrind-3.8.1/configure 2013-01-16 17:15:33.563018480 +0100 -+++ valgrind-3.8.1/configure 2013-01-16 17:19:21.373643238 +0100 -@@ -6610,6 +6610,16 @@ - DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" - DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" - ;; -+ 2.17) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.17 family" >&5 -+$as_echo "2.17 family" >&6; } -+ -+$as_echo "#define GLIBC_2_17 1" >>confdefs.h -+ -+ DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" -+ ;; - darwin) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Darwin" >&5 - $as_echo "Darwin" >&6; } -@@ -6630,7 +6640,7 @@ - *) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported version ${GLIBC_VERSION}" >&5 - $as_echo "unsupported version ${GLIBC_VERSION}" >&6; } -- as_fn_error "Valgrind requires glibc version 2.2 - 2.16" "$LINENO" 5 -+ as_fn_error "Valgrind requires glibc version 2.2 - 2.17" "$LINENO" 5 - as_fn_error "or Darwin libc" "$LINENO" 5 - ;; - esac From 28722a265b30881de0501a04e2a79ea7318fbae4 Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Mon, 2 Dec 2013 21:50:14 +0000 Subject: [PATCH 019/152] sup: use specific version of mime types --- pkgs/top-level/all-packages.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 89e9e7a53e8..6eb44d42a88 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8491,11 +8491,12 @@ let cursesSupport = true; }; - inherit gettext highline iconv locale lockfile mime_types rmail_sup text - trollop unicode xapian_ruby which; + inherit gettext highline iconv locale lockfile rmail_sup + text trollop unicode xapian_ruby which; chronic = chronic_0_9_1; gpgme = ruby_gpgme; + mime_types = mime_types_1_25; ncursesw_sup = ruby_ncursesw_sup; rake = rake_10_1_0; }; From d937187808289d31e3a36f63e0242d59dd4df4dc Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Mon, 2 Dec 2013 21:53:53 +0000 Subject: [PATCH 020/152] sup: update to latest version, use better version number --- .../networking/mailreaders/sup/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/sup/default.nix b/pkgs/applications/networking/mailreaders/sup/default.nix index dd2837da40a..af019e32208 100644 --- a/pkgs/applications/networking/mailreaders/sup/default.nix +++ b/pkgs/applications/networking/mailreaders/sup/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl, ruby, rake, rubygems, makeWrapper, ncursesw_sup +{ stdenv, fetchgit, ruby, rake, rubygems, makeWrapper, ncursesw_sup , xapian_ruby, gpgme, libiconvOrEmpty, mime_types, chronic, trollop, lockfile , gettext, iconv, locale, text, highline, rmail_sup, unicode, gnupg, which }: stdenv.mkDerivation rec { - version = "f27661b1656ae1f0d28fd89595b5a16f268d8d3d"; + version = "20131130"; name = "sup-${version}"; meta = { @@ -16,9 +16,9 @@ stdenv.mkDerivation rec { dontStrip = true; - src = fetchurl { - url = "https://github.com/sup-heliotrope/sup/archive/${version}.tar.gz"; - sha256 = "08fxf1knji3260d0mrp86x6yayp43iq7kc5rfay3hga8i2sckdia"; + src = fetchgit { + url = git://github.com/sup-heliotrope/sup.git; + rev = "a5a1e39034204ac4b05c9171a71164712690b010"; }; buildInputs = From 04dd0bb5df018c6d296b16d730ea3c147d530914 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Tue, 3 Dec 2013 17:26:19 +0100 Subject: [PATCH 021/152] sup: fix chroot build By making fetchgit a fixed-output derivation. --- pkgs/applications/networking/mailreaders/sup/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/mailreaders/sup/default.nix b/pkgs/applications/networking/mailreaders/sup/default.nix index af019e32208..a8fb387e729 100644 --- a/pkgs/applications/networking/mailreaders/sup/default.nix +++ b/pkgs/applications/networking/mailreaders/sup/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { src = fetchgit { url = git://github.com/sup-heliotrope/sup.git; rev = "a5a1e39034204ac4b05c9171a71164712690b010"; + sha256 = "0w2w7dcif1ri1qq81csz7gj45rqd9z7hjd6x29awibybyyqyvj5s"; }; buildInputs = From 7809134e29c621d621f28f79c19744377d41b20b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 3 Dec 2013 11:35:57 -0500 Subject: [PATCH 022/152] postgresql: Fix shutdown Postgres was taking a long time to shutdown. This is because we were sending SIGINT to all processes, apparently confusing the autovacuum launcher. Instead it should only be sent to the main process (which takes care of shutting down the others). The downside is that systemd will also send the final SIGKILL only to the main process, so other processes in the cgroup may be left behind. There should be an option for this... --- nixos/modules/services/databases/postgresql.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix index d99ad2c9c7c..1563858887e 100644 --- a/nixos/modules/services/databases/postgresql.nix +++ b/nixos/modules/services/databases/postgresql.nix @@ -211,6 +211,7 @@ in # Shut down Postgres using SIGINT ("Fast Shutdown mode"). See # http://www.postgresql.org/docs/current/static/server-shutdown.html KillSignal = "SIGINT"; + KillMode = "process"; # FIXME: this may cause processes to be left behind in the cgroup even after the final SIGKILL # Give Postgres a decent amount of time to clean up after # receiving systemd's SIGINT. From 3b1f887d58d4b9fce95b0c87ad0240f9c4f22032 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 3 Dec 2013 14:40:19 -0500 Subject: [PATCH 023/152] Update node packages Signed-off-by: Shea Levy --- pkgs/top-level/node-packages-generated.nix | 1019 +++++++++++++------- 1 file changed, 671 insertions(+), 348 deletions(-) diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix index 33827fed3c0..9baf51c2d3d 100644 --- a/pkgs/top-level/node-packages-generated.nix +++ b/pkgs/top-level/node-packages-generated.nix @@ -15,7 +15,7 @@ (self.nativeDeps."CSSselect" or []); deps = [ self.by-version."CSSwhat"."0.4.1" - self.by-version."domutils"."1.2.1" + self.by-version."domutils"."1.2.2" ]; peerDependencies = [ ]; @@ -39,6 +39,24 @@ ]; passthru.names = [ "CSSwhat" ]; }; + by-spec."StringScanner"."~0.0.3" = + self.by-version."StringScanner"."0.0.3"; + by-version."StringScanner"."0.0.3" = lib.makeOverridable self.buildNodePackage { + name = "StringScanner-0.0.3"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/StringScanner/-/StringScanner-0.0.3.tgz"; + sha1 = "bf06ecfdc90046711f4e6175549243b78ceb38aa"; + }) + ]; + buildInputs = + (self.nativeDeps."StringScanner" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "StringScanner" ]; + }; by-spec."abbrev"."1" = self.by-version."abbrev"."1.0.4"; by-version."abbrev"."1.0.4" = lib.makeOverridable self.buildNodePackage { @@ -266,13 +284,13 @@ passthru.names = [ "ansicolors" ]; }; by-spec."apparatus".">= 0.0.4" = - self.by-version."apparatus"."0.0.7"; - by-version."apparatus"."0.0.7" = lib.makeOverridable self.buildNodePackage { - name = "apparatus-0.0.7"; + self.by-version."apparatus"."0.0.8"; + by-version."apparatus"."0.0.8" = lib.makeOverridable self.buildNodePackage { + name = "apparatus-0.0.8"; src = [ (fetchurl { - url = "http://registry.npmjs.org/apparatus/-/apparatus-0.0.7.tgz"; - sha1 = "033f355507b6851ebeb1bd9475ede23c802327fe"; + url = "http://registry.npmjs.org/apparatus/-/apparatus-0.0.8.tgz"; + sha1 = "14e8aeb84189208b7f8d77f09d9f0307778b079a"; }) ]; buildInputs = @@ -778,13 +796,13 @@ passthru.names = [ "boom" ]; }; by-spec."bower"."*" = - self.by-version."bower"."1.2.7"; - by-version."bower"."1.2.7" = lib.makeOverridable self.buildNodePackage { - name = "bower-1.2.7"; + self.by-version."bower"."1.2.8"; + by-version."bower"."1.2.8" = lib.makeOverridable self.buildNodePackage { + name = "bower-1.2.8"; src = [ (fetchurl { - url = "http://registry.npmjs.org/bower/-/bower-1.2.7.tgz"; - sha1 = "5b0505c8192bd61a752a7cf8b718d1b3054cd554"; + url = "http://registry.npmjs.org/bower/-/bower-1.2.8.tgz"; + sha1 = "f63c0804a267d5ffaf2fd3fd488367e73dce202f"; }) ]; buildInputs = @@ -800,6 +818,7 @@ self.by-version."cardinal"."0.4.2" self.by-version."chalk"."0.2.1" self.by-version."chmodr"."0.1.0" + self.by-version."decompress-zip"."0.0.3" self.by-version."fstream"."0.1.25" self.by-version."fstream-ignore"."0.0.7" self.by-version."glob"."3.2.7" @@ -818,25 +837,25 @@ self.by-version."request"."2.27.0" self.by-version."request-progress"."0.3.1" self.by-version."retry"."0.6.0" - self.by-version."rimraf"."2.2.2" + self.by-version."rimraf"."2.2.4" self.by-version."semver"."2.1.0" self.by-version."stringify-object"."0.1.7" self.by-version."sudo-block"."0.2.1" self.by-version."tar"."0.1.18" - self.by-version."tmp"."0.0.21" - self.by-version."unzip"."0.1.9" + self.by-version."tmp"."0.0.22" self.by-version."update-notifier"."0.1.7" self.by-version."which"."1.0.5" + self.by-version."p-throttler"."0.0.1" ]; peerDependencies = [ ]; passthru.names = [ "bower" ]; }; - "bower" = self.by-version."bower"."1.2.7"; + "bower" = self.by-version."bower"."1.2.8"; by-spec."bower".">=0.9.0" = - self.by-version."bower"."1.2.7"; + self.by-version."bower"."1.2.8"; by-spec."bower"."~1.2.0" = - self.by-version."bower"."1.2.7"; + self.by-version."bower"."1.2.8"; by-spec."bower-config"."~0.4.3" = self.by-version."bower-config"."0.4.5"; by-version."bower-config"."0.4.5" = lib.makeOverridable self.buildNodePackage { @@ -957,7 +976,7 @@ self.by-version."lru-cache"."2.3.1" self.by-version."request"."2.27.0" self.by-version."request-replay"."0.2.0" - self.by-version."rimraf"."2.2.2" + self.by-version."rimraf"."2.2.4" self.by-version."mkdirp"."0.3.5" ]; peerDependencies = [ @@ -987,8 +1006,31 @@ ]; passthru.names = [ "broadway" ]; }; + by-spec."broadway"."0.2.9" = + self.by-version."broadway"."0.2.9"; + by-version."broadway"."0.2.9" = lib.makeOverridable self.buildNodePackage { + name = "broadway-0.2.9"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/broadway/-/broadway-0.2.9.tgz"; + sha1 = "887008b2257f4171089de5cb9b656969b6c8c9e8"; + }) + ]; + buildInputs = + (self.nativeDeps."broadway" or []); + deps = [ + self.by-version."cliff"."0.1.8" + self.by-version."eventemitter2"."0.4.12" + self.by-version."nconf"."0.6.9" + self.by-version."winston"."0.7.2" + self.by-version."utile"."0.2.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "broadway" ]; + }; by-spec."broadway"."0.2.x" = - self.by-version."broadway"."0.2.7"; + self.by-version."broadway"."0.2.9"; by-spec."browserchannel"."*" = self.by-version."browserchannel"."1.0.8"; by-version."browserchannel"."1.0.8" = lib.makeOverridable self.buildNodePackage { @@ -1003,7 +1045,7 @@ (self.nativeDeps."browserchannel" or []); deps = [ self.by-version."hat"."0.0.3" - self.by-version."connect"."2.11.0" + self.by-version."connect"."2.11.2" self.by-version."request"."2.27.0" ]; peerDependencies = [ @@ -1217,6 +1259,8 @@ ]; passthru.names = [ "bytes" ]; }; + by-spec."bytes"."~0.2.1" = + self.by-version."bytes"."0.2.1"; by-spec."cardinal"."~0.4.0" = self.by-version."cardinal"."0.4.2"; by-version."cardinal"."0.4.2" = lib.makeOverridable self.buildNodePackage { @@ -1675,6 +1719,27 @@ }; by-spec."coffee-script"."~1.6" = self.by-version."coffee-script"."1.6.3"; + by-spec."coffee-script-redux"."git://github.com/michaelficarra/CoffeeScriptRedux.git#9895cd1641fdf3a2424e662ab7583726bb0e35b3" = + self.by-version."coffee-script-redux"."2.0.0-beta4"; + by-version."coffee-script-redux"."2.0.0-beta4" = lib.makeOverridable self.buildNodePackage { + name = "coffee-script-redux-2.0.0-beta4"; + src = [ + (fetchgit { + url = "git://github.com/michaelficarra/CoffeeScriptRedux.git"; + rev = "9895cd1641fdf3a2424e662ab7583726bb0e35b3"; + sha256 = "d70e659aa7cdb50a98959dec0e2a8c916200e31cb770f04faa2ae92a55d1e66d"; + }) + ]; + buildInputs = + (self.nativeDeps."coffee-script-redux" or []); + deps = [ + self.by-version."StringScanner"."0.0.3" + self.by-version."jedediah"."0.1.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "coffee-script-redux" ]; + }; by-spec."color"."~0.4.4" = self.by-version."color"."0.4.4"; by-version."color"."0.4.4" = lib.makeOverridable self.buildNodePackage { @@ -1984,7 +2049,7 @@ buildInputs = (self.nativeDeps."connect" or []); deps = [ - self.by-version."qs"."0.6.5" + self.by-version."qs"."0.6.6" self.by-version."mime"."1.2.11" self.by-version."formidable"."1.0.14" ]; @@ -2024,6 +2089,38 @@ ]; passthru.names = [ "connect" ]; }; + by-spec."connect"."2.11.2" = + self.by-version."connect"."2.11.2"; + by-version."connect"."2.11.2" = lib.makeOverridable self.buildNodePackage { + name = "connect-2.11.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/connect/-/connect-2.11.2.tgz"; + sha1 = "cd05c661f686dfe9bcd2e1220c85fe82848db010"; + }) + ]; + buildInputs = + (self.nativeDeps."connect" or []); + deps = [ + self.by-version."qs"."0.6.5" + self.by-version."cookie-signature"."1.0.1" + self.by-version."buffer-crc32"."0.2.1" + self.by-version."cookie"."0.1.0" + self.by-version."send"."0.1.4" + self.by-version."bytes"."0.2.1" + self.by-version."fresh"."0.2.0" + self.by-version."pause"."0.0.1" + self.by-version."uid2"."0.0.3" + self.by-version."debug"."0.7.4" + self.by-version."methods"."0.1.0" + self.by-version."raw-body"."1.1.2" + self.by-version."negotiator"."0.3.0" + self.by-version."multiparty"."2.2.0" + ]; + peerDependencies = [ + ]; + passthru.names = [ "connect" ]; + }; by-spec."connect"."2.3.x" = self.by-version."connect"."2.3.9"; by-version."connect"."2.3.9" = lib.makeOverridable self.buildNodePackage { @@ -2107,7 +2204,7 @@ passthru.names = [ "connect" ]; }; by-spec."connect"."~2" = - self.by-version."connect"."2.11.0"; + self.by-version."connect"."2.11.2"; by-spec."connect"."~2.8.4" = self.by-version."connect"."2.8.8"; by-version."connect"."2.8.8" = lib.makeOverridable self.buildNodePackage { @@ -2246,7 +2343,7 @@ buildInputs = (self.nativeDeps."constantinople" or []); deps = [ - self.by-version."uglify-js"."2.4.4" + self.by-version."uglify-js"."2.4.6" ]; peerDependencies = [ ]; @@ -2805,6 +2902,8 @@ ]; passthru.names = [ "debug" ]; }; + by-spec."debug".">= 0.7.3 < 1" = + self.by-version."debug"."0.7.4"; by-spec."debug"."~0.7.0" = self.by-version."debug"."0.7.4"; by-spec."debug"."~0.7.2" = @@ -2829,6 +2928,30 @@ ]; passthru.names = [ "debuglog" ]; }; + by-spec."decompress-zip"."~0.0.3" = + self.by-version."decompress-zip"."0.0.3"; + by-version."decompress-zip"."0.0.3" = lib.makeOverridable self.buildNodePackage { + name = "decompress-zip-0.0.3"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/decompress-zip/-/decompress-zip-0.0.3.tgz"; + sha1 = "14b174e5b6a528f0aa6c2e2157b7aa0152e7915a"; + }) + ]; + buildInputs = + (self.nativeDeps."decompress-zip" or []); + deps = [ + self.by-version."q"."0.9.7" + self.by-version."mkpath"."0.1.0" + self.by-version."binary"."0.3.0" + self.by-version."touch"."0.0.2" + self.by-version."readable-stream"."1.1.9" + self.by-version."nopt"."2.1.2" + ]; + peerDependencies = [ + ]; + passthru.names = [ "decompress-zip" ]; + }; by-spec."deep-eql"."0.1.3" = self.by-version."deep-eql"."0.1.3"; by-version."deep-eql"."0.1.3" = lib.makeOverridable self.buildNodePackage { @@ -2982,6 +3105,26 @@ ]; passthru.names = [ "director" ]; }; + by-spec."dkim-signer"."~0.1.0" = + self.by-version."dkim-signer"."0.1.0"; + by-version."dkim-signer"."0.1.0" = lib.makeOverridable self.buildNodePackage { + name = "dkim-signer-0.1.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/dkim-signer/-/dkim-signer-0.1.0.tgz"; + sha1 = "c57c29b238029fbb08622afc2729ad596bcb417b"; + }) + ]; + buildInputs = + (self.nativeDeps."dkim-signer" or []); + deps = [ + self.by-version."punycode"."1.2.3" + self.by-version."mimelib"."0.2.14" + ]; + peerDependencies = [ + ]; + passthru.names = [ "dkim-signer" ]; + }; by-spec."domelementtype"."1" = self.by-version."domelementtype"."1.1.1"; by-version."domelementtype"."1.1.1" = lib.makeOverridable self.buildNodePackage { @@ -3058,13 +3201,13 @@ passthru.names = [ "domutils" ]; }; by-spec."domutils"."1.2" = - self.by-version."domutils"."1.2.1"; - by-version."domutils"."1.2.1" = lib.makeOverridable self.buildNodePackage { - name = "domutils-1.2.1"; + self.by-version."domutils"."1.2.2"; + by-version."domutils"."1.2.2" = lib.makeOverridable self.buildNodePackage { + name = "domutils-1.2.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/domutils/-/domutils-1.2.1.tgz"; - sha1 = "6ced9837e63d2c3a06eb46d1150f0058a13178d1"; + url = "http://registry.npmjs.org/domutils/-/domutils-1.2.2.tgz"; + sha1 = "bd59d149cf2c034fec81a1ce063bc20fb572a2ab"; }) ]; buildInputs = @@ -3185,24 +3328,6 @@ ]; passthru.names = [ "encoding" ]; }; - by-spec."ent"."~0.1.0" = - self.by-version."ent"."0.1.0"; - by-version."ent"."0.1.0" = lib.makeOverridable self.buildNodePackage { - name = "ent-0.1.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/ent/-/ent-0.1.0.tgz"; - sha1 = "deb9cd7f3da25b1a94c248dbbdc91d0f0c094035"; - }) - ]; - buildInputs = - (self.nativeDeps."ent" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "ent" ]; - }; by-spec."entities"."0.x" = self.by-version."entities"."0.3.0"; by-version."entities"."0.3.0" = lib.makeOverridable self.buildNodePackage { @@ -3258,6 +3383,27 @@ passthru.names = [ "escape-html" ]; }; "escape-html" = self.by-version."escape-html"."1.0.0"; + by-spec."escodegen"."*" = + self.by-version."escodegen"."1.0.0"; + by-version."escodegen"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "escodegen-1.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/escodegen/-/escodegen-1.0.0.tgz"; + sha1 = "8428e45aec9f8d15ccd57859a83c34a91688fd2d"; + }) + ]; + buildInputs = + (self.nativeDeps."escodegen" or []); + deps = [ + self.by-version."esprima"."1.0.4" + self.by-version."estraverse"."1.4.0" + self.by-version."source-map"."0.1.31" + ]; + peerDependencies = [ + ]; + passthru.names = [ "escodegen" ]; + }; by-spec."escodegen"."0.0.23" = self.by-version."escodegen"."0.0.23"; by-version."escodegen"."0.0.23" = lib.makeOverridable self.buildNodePackage { @@ -3303,6 +3449,24 @@ self.by-version."esprima"."1.0.4"; by-spec."esprima"."~1.0.2" = self.by-version."esprima"."1.0.4"; + by-spec."estraverse"."*" = + self.by-version."estraverse"."1.5.0"; + by-version."estraverse"."1.5.0" = lib.makeOverridable self.buildNodePackage { + name = "estraverse-1.5.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/estraverse/-/estraverse-1.5.0.tgz"; + sha1 = "248ec3f0d4bf39a940109c92a05ceb56d59e53ee"; + }) + ]; + buildInputs = + (self.nativeDeps."estraverse" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "estraverse" ]; + }; by-spec."estraverse"."~0.0.4" = self.by-version."estraverse"."0.0.4"; by-version."estraverse"."0.0.4" = lib.makeOverridable self.buildNodePackage { @@ -3321,6 +3485,24 @@ ]; passthru.names = [ "estraverse" ]; }; + by-spec."estraverse"."~1.4.0" = + self.by-version."estraverse"."1.4.0"; + by-version."estraverse"."1.4.0" = lib.makeOverridable self.buildNodePackage { + name = "estraverse-1.4.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/estraverse/-/estraverse-1.4.0.tgz"; + sha1 = "c6e1ad13b3f1b389da32214f2debe4788382bfc6"; + }) + ]; + buildInputs = + (self.nativeDeps."estraverse" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "estraverse" ]; + }; by-spec."event-emitter"."~0.2.2" = self.by-version."event-emitter"."0.2.2"; by-version."event-emitter"."0.2.2" = lib.makeOverridable self.buildNodePackage { @@ -3377,6 +3559,24 @@ ]; passthru.names = [ "eventemitter2" ]; }; + by-spec."eventemitter2"."0.4.12" = + self.by-version."eventemitter2"."0.4.12"; + by-version."eventemitter2"."0.4.12" = lib.makeOverridable self.buildNodePackage { + name = "eventemitter2-0.4.12"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.12.tgz"; + sha1 = "6cf14249fdc8799be7416e871e73fd2bb89e35e0"; + }) + ]; + buildInputs = + (self.nativeDeps."eventemitter2" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "eventemitter2" ]; + }; by-spec."eventemitter2"."~0.4.11" = self.by-version."eventemitter2"."0.4.13"; by-version."eventemitter2"."0.4.13" = lib.makeOverridable self.buildNodePackage { @@ -3436,7 +3636,7 @@ self.by-version."node-swt"."0.1.1" self.by-version."node-wsfederation"."0.1.1" self.by-version."debug"."0.5.0" - self.by-version."express"."3.4.4" + self.by-version."express"."3.4.6" ]; peerDependencies = [ ]; @@ -3461,19 +3661,19 @@ passthru.names = [ "exit" ]; }; by-spec."express"."*" = - self.by-version."express"."3.4.4"; - by-version."express"."3.4.4" = lib.makeOverridable self.buildNodePackage { - name = "express-3.4.4"; + self.by-version."express"."3.4.6"; + by-version."express"."3.4.6" = lib.makeOverridable self.buildNodePackage { + name = "express-3.4.6"; src = [ (fetchurl { - url = "http://registry.npmjs.org/express/-/express-3.4.4.tgz"; - sha1 = "0b63ae626c96b71b78d13dfce079c10351635a86"; + url = "http://registry.npmjs.org/express/-/express-3.4.6.tgz"; + sha1 = "85b6004076f9004f806e9f49c90487d1f6f89c43"; }) ]; buildInputs = (self.nativeDeps."express" or []); deps = [ - self.by-version."connect"."2.11.0" + self.by-version."connect"."2.11.2" self.by-version."commander"."1.3.2" self.by-version."range-parser"."0.0.4" self.by-version."mkdirp"."0.3.5" @@ -3489,7 +3689,7 @@ ]; passthru.names = [ "express" ]; }; - "express" = self.by-version."express"."3.4.4"; + "express" = self.by-version."express"."3.4.6"; by-spec."express"."2.5.11" = self.by-version."express"."2.5.11"; by-version."express"."2.5.11" = lib.makeOverridable self.buildNodePackage { @@ -3543,8 +3743,35 @@ }; by-spec."express"."3.4.4" = self.by-version."express"."3.4.4"; + by-version."express"."3.4.4" = lib.makeOverridable self.buildNodePackage { + name = "express-3.4.4"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/express/-/express-3.4.4.tgz"; + sha1 = "0b63ae626c96b71b78d13dfce079c10351635a86"; + }) + ]; + buildInputs = + (self.nativeDeps."express" or []); + deps = [ + self.by-version."connect"."2.11.0" + self.by-version."commander"."1.3.2" + self.by-version."range-parser"."0.0.4" + self.by-version."mkdirp"."0.3.5" + self.by-version."cookie"."0.1.0" + self.by-version."buffer-crc32"."0.2.1" + self.by-version."fresh"."0.2.0" + self.by-version."methods"."0.1.0" + self.by-version."send"."0.1.4" + self.by-version."cookie-signature"."1.0.1" + self.by-version."debug"."0.7.4" + ]; + peerDependencies = [ + ]; + passthru.names = [ "express" ]; + }; by-spec."express"."3.x" = - self.by-version."express"."3.4.4"; + self.by-version."express"."3.4.6"; by-spec."express"."~3.1.1" = self.by-version."express"."3.1.2"; by-version."express"."3.1.2" = lib.makeOverridable self.buildNodePackage { @@ -3575,9 +3802,9 @@ passthru.names = [ "express" ]; }; by-spec."express"."~3.4" = - self.by-version."express"."3.4.4"; + self.by-version."express"."3.4.6"; by-spec."express"."~3.4.4" = - self.by-version."express"."3.4.4"; + self.by-version."express"."3.4.6"; by-spec."express-form"."*" = self.by-version."express-form"."0.10.1"; by-version."express-form"."0.10.1" = lib.makeOverridable self.buildNodePackage { @@ -3596,7 +3823,7 @@ self.by-version."async"."0.2.9" ]; peerDependencies = [ - self.by-version."express"."3.4.4" + self.by-version."express"."3.4.6" ]; passthru.names = [ "express-form" ]; }; @@ -3714,6 +3941,26 @@ by-spec."eyes".">=0.1.6" = self.by-version."eyes"."0.1.8"; by-spec."faye-websocket"."*" = + self.by-version."faye-websocket"."0.7.1"; + by-version."faye-websocket"."0.7.1" = lib.makeOverridable self.buildNodePackage { + name = "faye-websocket-0.7.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/faye-websocket/-/faye-websocket-0.7.1.tgz"; + sha1 = "72fe630d122333e0f36ac453f593ed70e1cb6baa"; + }) + ]; + buildInputs = + (self.nativeDeps."faye-websocket" or []); + deps = [ + self.by-version."websocket-driver"."0.3.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "faye-websocket" ]; + }; + "faye-websocket" = self.by-version."faye-websocket"."0.7.1"; + by-spec."faye-websocket"."0.7.0" = self.by-version."faye-websocket"."0.7.0"; by-version."faye-websocket"."0.7.0" = lib.makeOverridable self.buildNodePackage { name = "faye-websocket-0.7.0"; @@ -3726,15 +3973,12 @@ buildInputs = (self.nativeDeps."faye-websocket" or []); deps = [ - self.by-version."websocket-driver"."0.3.0" + self.by-version."websocket-driver"."0.3.1" ]; peerDependencies = [ ]; passthru.names = [ "faye-websocket" ]; }; - "faye-websocket" = self.by-version."faye-websocket"."0.7.0"; - by-spec."faye-websocket"."0.7.0" = - self.by-version."faye-websocket"."0.7.0"; by-spec."fileset"."0.1.x" = self.by-version."fileset"."0.1.5"; by-version."fileset"."0.1.5" = lib.makeOverridable self.buildNodePackage { @@ -3796,29 +4040,28 @@ by-spec."findup-sync"."~0.1.2" = self.by-version."findup-sync"."0.1.2"; by-spec."flatiron"."*" = - self.by-version."flatiron"."0.3.8"; - by-version."flatiron"."0.3.8" = lib.makeOverridable self.buildNodePackage { - name = "flatiron-0.3.8"; + self.by-version."flatiron"."0.3.9"; + by-version."flatiron"."0.3.9" = lib.makeOverridable self.buildNodePackage { + name = "flatiron-0.3.9"; src = [ (fetchurl { - url = "http://registry.npmjs.org/flatiron/-/flatiron-0.3.8.tgz"; - sha1 = "235d691f19154eff033610c12bcd51f304ff09c6"; + url = "http://registry.npmjs.org/flatiron/-/flatiron-0.3.9.tgz"; + sha1 = "e18cc2490e6a0f771c77afe75a1644645ec4a406"; }) ]; buildInputs = (self.nativeDeps."flatiron" or []); deps = [ - self.by-version."broadway"."0.2.7" - self.by-version."optimist"."0.3.5" + self.by-version."broadway"."0.2.9" + self.by-version."optimist"."0.6.0" self.by-version."prompt"."0.2.11" self.by-version."director"."1.1.10" - self.by-version."pkginfo"."0.3.0" ]; peerDependencies = [ ]; passthru.names = [ "flatiron" ]; }; - "flatiron" = self.by-version."flatiron"."0.3.8"; + "flatiron" = self.by-version."flatiron"."0.3.9"; by-spec."flatiron"."0.3.5" = self.by-version."flatiron"."0.3.5"; by-version."flatiron"."0.3.5" = lib.makeOverridable self.buildNodePackage { @@ -3960,7 +4203,7 @@ buildInputs = (self.nativeDeps."forever-monitor" or []); deps = [ - self.by-version."broadway"."0.2.7" + self.by-version."broadway"."0.2.9" self.by-version."minimatch"."0.2.12" self.by-version."pkginfo"."0.3.0" self.by-version."ps-tree"."0.0.3" @@ -3985,7 +4228,7 @@ buildInputs = (self.nativeDeps."forever-monitor" or []); deps = [ - self.by-version."broadway"."0.2.7" + self.by-version."broadway"."0.2.9" self.by-version."minimatch"."0.0.5" self.by-version."pkginfo"."0.3.0" self.by-version."ps-tree"."0.0.3" @@ -4187,7 +4430,7 @@ self.by-version."ncp"."0.4.2" self.by-version."mkdirp"."0.3.5" self.by-version."jsonfile"."1.0.1" - self.by-version."rimraf"."2.2.2" + self.by-version."rimraf"."2.2.4" ]; peerDependencies = [ ]; @@ -4247,7 +4490,7 @@ buildInputs = (self.nativeDeps."fstream" or []); deps = [ - self.by-version."rimraf"."2.2.2" + self.by-version."rimraf"."2.2.4" self.by-version."mkdirp"."0.3.5" self.by-version."graceful-fs"."2.0.1" self.by-version."inherits"."2.0.1" @@ -4258,8 +4501,6 @@ }; by-spec."fstream"."~0.1.17" = self.by-version."fstream"."0.1.25"; - by-spec."fstream"."~0.1.21" = - self.by-version."fstream"."0.1.25"; by-spec."fstream"."~0.1.22" = self.by-version."fstream"."0.1.25"; by-spec."fstream"."~0.1.23" = @@ -4696,7 +4937,7 @@ buildInputs = (self.nativeDeps."grunt-bower-task" or []); deps = [ - self.by-version."bower"."1.2.7" + self.by-version."bower"."1.2.8" self.by-version."lodash"."0.10.0" self.by-version."rimraf"."2.0.3" self.by-version."wrench"."1.4.4" @@ -4831,7 +5072,7 @@ buildInputs = (self.nativeDeps."grunt-contrib-uglify" or []); deps = [ - self.by-version."uglify-js"."2.4.4" + self.by-version."uglify-js"."2.4.6" self.by-version."grunt-lib-contrib"."0.6.1" ]; peerDependencies = [ @@ -4857,7 +5098,7 @@ ]; peerDependencies = [ self.by-version."grunt"."0.4.2" - self.by-version."karma"."0.10.6" + self.by-version."karma"."0.10.7" ]; passthru.names = [ "grunt-karma" ]; }; @@ -5093,6 +5334,24 @@ ]; passthru.names = [ "hawk" ]; }; + by-spec."he"."~0.3.6" = + self.by-version."he"."0.3.6"; + by-version."he"."0.3.6" = lib.makeOverridable self.buildNodePackage { + name = "he-0.3.6"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/he/-/he-0.3.6.tgz"; + sha1 = "9d7bc446e77963933301dd602d5731cb861135e0"; + }) + ]; + buildInputs = + (self.nativeDeps."he" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "he" ]; + }; by-spec."hipache"."*" = self.by-version."hipache"."0.2.4"; by-version."hipache"."0.2.4" = lib.makeOverridable self.buildNodePackage { @@ -5396,6 +5655,31 @@ passthru.names = [ "i18next" ]; }; "i18next" = self.by-version."i18next"."1.7.1"; + by-spec."ibrik"."~0.0.4" = + self.by-version."ibrik"."0.0.4"; + by-version."ibrik"."0.0.4" = lib.makeOverridable self.buildNodePackage { + name = "ibrik-0.0.4"; + src = [ + (self.patchSource fetchurl { + url = "http://registry.npmjs.org/ibrik/-/ibrik-0.0.4.tgz"; + sha1 = "1ce60747afe56ecee03cd1f6f0db30ce579961e4"; + }) + ]; + buildInputs = + (self.nativeDeps."ibrik" or []); + deps = [ + self.by-version."coffee-script-redux"."2.0.0-beta4" + self.by-version."istanbul"."0.1.46" + self.by-version."optimist"."0.6.0" + self.by-version."escodegen"."1.0.0" + self.by-version."mkdirp"."0.3.5" + self.by-version."which"."1.0.5" + self.by-version."estraverse"."1.5.0" + ]; + peerDependencies = [ + ]; + passthru.names = [ "ibrik" ]; + }; by-spec."iconv-lite"."~0.2.10" = self.by-version."iconv-lite"."0.2.11"; by-version."iconv-lite"."0.2.11" = lib.makeOverridable self.buildNodePackage { @@ -5606,10 +5890,10 @@ deps = [ self.by-version."underscore"."1.5.2" self.by-version."winston"."0.7.2" - self.by-version."nconf"."0.6.8" + self.by-version."nconf"."0.6.9" self.by-version."fs-walk"."0.0.1" self.by-version."async"."0.2.9" - self.by-version."express"."3.4.4" + self.by-version."express"."3.4.6" self.by-version."jade"."0.35.0" self.by-version."passport"."0.1.17" self.by-version."passport-http"."0.2.2" @@ -5663,13 +5947,13 @@ passthru.names = [ "isbinaryfile" ]; }; by-spec."istanbul"."*" = - self.by-version."istanbul"."0.1.45"; - by-version."istanbul"."0.1.45" = lib.makeOverridable self.buildNodePackage { - name = "istanbul-0.1.45"; + self.by-version."istanbul"."0.1.46"; + by-version."istanbul"."0.1.46" = lib.makeOverridable self.buildNodePackage { + name = "istanbul-0.1.46"; src = [ (fetchurl { - url = "http://registry.npmjs.org/istanbul/-/istanbul-0.1.45.tgz"; - sha1 = "905f360213d1aefbcb7bad6ef823015ce7d6f9fd"; + url = "http://registry.npmjs.org/istanbul/-/istanbul-0.1.46.tgz"; + sha1 = "cefeb1c787d125a6db23bd0f63b0eb9390b0b40d"; }) ]; buildInputs = @@ -5691,9 +5975,9 @@ ]; passthru.names = [ "istanbul" ]; }; - "istanbul" = self.by-version."istanbul"."0.1.45"; - by-spec."istanbul"."~0.1.41" = - self.by-version."istanbul"."0.1.45"; + "istanbul" = self.by-version."istanbul"."0.1.46"; + by-spec."istanbul"."~0.1.45" = + self.by-version."istanbul"."0.1.46"; by-spec."jade"."*" = self.by-version."jade"."0.35.0"; by-version."jade"."0.35.0" = lib.makeOverridable self.buildNodePackage { @@ -5782,6 +6066,24 @@ passthru.names = [ "jayschema" ]; }; "jayschema" = self.by-version."jayschema"."0.2.0"; + by-spec."jedediah"."~0.1.0" = + self.by-version."jedediah"."0.1.1"; + by-version."jedediah"."0.1.1" = lib.makeOverridable self.buildNodePackage { + name = "jedediah-0.1.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/jedediah/-/jedediah-0.1.1.tgz"; + sha1 = "51f33021ebec6847d844cb53bbc086ee38877f84"; + }) + ]; + buildInputs = + (self.nativeDeps."jedediah" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "jedediah" ]; + }; by-spec."js-yaml"."*" = self.by-version."js-yaml"."2.1.3"; by-version."js-yaml"."2.1.3" = lib.makeOverridable self.buildNodePackage { @@ -6056,20 +6358,20 @@ passthru.names = [ "junk" ]; }; by-spec."karma"."*" = - self.by-version."karma"."0.11.5"; - "karma" = self.by-version."karma"."0.11.5"; + self.by-version."karma"."0.11.7"; + "karma" = self.by-version."karma"."0.11.7"; by-spec."karma".">=0.9" = - self.by-version."karma"."0.11.5"; + self.by-version."karma"."0.11.7"; by-spec."karma".">=0.9.3" = - self.by-version."karma"."0.11.5"; + self.by-version."karma"."0.11.7"; by-spec."karma"."~0.10.0" = - self.by-version."karma"."0.10.6"; - by-version."karma"."0.10.6" = lib.makeOverridable self.buildNodePackage { - name = "karma-0.10.6"; + self.by-version."karma"."0.10.7"; + by-version."karma"."0.10.7" = lib.makeOverridable self.buildNodePackage { + name = "karma-0.10.7"; src = [ (fetchurl { - url = "http://registry.npmjs.org/karma/-/karma-0.10.6.tgz"; - sha1 = "6a1bcaa3317ae240564606ba6b9b22077fb50135"; + url = "http://registry.npmjs.org/karma/-/karma-0.10.7.tgz"; + sha1 = "de49e2323a187ecb688470c2ad3be6a30bc7c270"; }) ]; buildInputs = @@ -6099,7 +6401,7 @@ self.by-version."karma-coffee-preprocessor"."0.1.1" self.by-version."karma-html2js-preprocessor"."0.1.0" self.by-version."karma-chrome-launcher"."0.1.1" - self.by-version."karma-firefox-launcher"."0.1.1" + self.by-version."karma-firefox-launcher"."0.1.2" self.by-version."karma-phantomjs-launcher"."0.1.1" self.by-version."karma-script-launcher"."0.1.0" ]; @@ -6111,39 +6413,40 @@ by-spec."karma-coffee-preprocessor"."*" = self.by-version."karma-coffee-preprocessor"."0.1.1"; by-spec."karma-coverage"."*" = - self.by-version."karma-coverage"."0.1.2"; - by-version."karma-coverage"."0.1.2" = lib.makeOverridable self.buildNodePackage { - name = "karma-coverage-0.1.2"; + self.by-version."karma-coverage"."0.1.3"; + by-version."karma-coverage"."0.1.3" = lib.makeOverridable self.buildNodePackage { + name = "karma-coverage-0.1.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/karma-coverage/-/karma-coverage-0.1.2.tgz"; - sha1 = "d4d11483a8242613c5949ad825d52d3e6f647041"; + url = "http://registry.npmjs.org/karma-coverage/-/karma-coverage-0.1.3.tgz"; + sha1 = "4a936fa89a2c06c339ad953a10c6d25eb6794204"; }) ]; buildInputs = (self.nativeDeps."karma-coverage" or []); deps = [ - self.by-version."istanbul"."0.1.45" + self.by-version."istanbul"."0.1.46" + self.by-version."ibrik"."0.0.4" self.by-version."dateformat"."1.0.6-1.2.3" ]; peerDependencies = [ - self.by-version."karma"."0.11.5" + self.by-version."karma"."0.11.7" ]; passthru.names = [ "karma-coverage" ]; }; - "karma-coverage" = self.by-version."karma-coverage"."0.1.2"; + "karma-coverage" = self.by-version."karma-coverage"."0.1.3"; by-spec."karma-firefox-launcher"."*" = - self.by-version."karma-firefox-launcher"."0.1.1"; + self.by-version."karma-firefox-launcher"."0.1.2"; by-spec."karma-html2js-preprocessor"."*" = self.by-version."karma-html2js-preprocessor"."0.1.0"; by-spec."karma-jasmine"."*" = self.by-version."karma-jasmine"."0.1.3"; - by-version."karma"."0.11.5" = self.by-version."karma-jasmine"."0.1.3"; + by-version."karma"."0.11.7" = self.by-version."karma-jasmine"."0.1.3"; by-version."karma-requirejs"."0.2.0" = self.by-version."karma-jasmine"."0.1.3"; by-version."karma-coffee-preprocessor"."0.1.1" = self.by-version."karma-jasmine"."0.1.3"; by-version."karma-html2js-preprocessor"."0.1.0" = self.by-version."karma-jasmine"."0.1.3"; by-version."karma-chrome-launcher"."0.1.1" = self.by-version."karma-jasmine"."0.1.3"; - by-version."karma-firefox-launcher"."0.1.1" = self.by-version."karma-jasmine"."0.1.3"; + by-version."karma-firefox-launcher"."0.1.2" = self.by-version."karma-jasmine"."0.1.3"; by-version."karma-phantomjs-launcher"."0.1.1" = self.by-version."karma-jasmine"."0.1.3"; by-version."karma-script-launcher"."0.1.0" = self.by-version."karma-jasmine"."0.1.3"; by-version."karma-jasmine"."0.1.3" = lib.makeOverridable self.buildNodePackage { @@ -6154,8 +6457,8 @@ sha1 = "b7f3b87973ea8e9e1ebfa721188876c31c5fa3be"; }) (fetchurl { - url = "http://registry.npmjs.org/karma/-/karma-0.11.5.tgz"; - sha1 = "c0c0d3ea1f2f7fe3d399a902c2aa96a79d553c62"; + url = "http://registry.npmjs.org/karma/-/karma-0.11.7.tgz"; + sha1 = "86f44de1c44016e5af3492bceb6dea99799b18fb"; }) (fetchurl { url = "http://registry.npmjs.org/karma-requirejs/-/karma-requirejs-0.2.0.tgz"; @@ -6174,8 +6477,8 @@ sha1 = "9fc3410063cefc88e06043d233f839651a16a98c"; }) (fetchurl { - url = "http://registry.npmjs.org/karma-firefox-launcher/-/karma-firefox-launcher-0.1.1.tgz"; - sha1 = "fa6a9a87279b85c7fe48cda3717cafefb7b9fb4d"; + url = "http://registry.npmjs.org/karma-firefox-launcher/-/karma-firefox-launcher-0.1.2.tgz"; + sha1 = "bf451d98a80a3f3368514db693dfddb70786fd5f"; }) (fetchurl { url = "http://registry.npmjs.org/karma-phantomjs-launcher/-/karma-phantomjs-launcher-0.1.1.tgz"; @@ -6237,7 +6540,7 @@ self.by-version."xmlbuilder"."0.4.2" ]; peerDependencies = [ - self.by-version."karma"."0.11.5" + self.by-version."karma"."0.11.7" ]; passthru.names = [ "karma-junit-reporter" ]; }; @@ -6257,8 +6560,8 @@ deps = [ ]; peerDependencies = [ - self.by-version."karma"."0.11.5" - self.by-version."mocha"."1.14.0" + self.by-version."karma"."0.11.7" + self.by-version."mocha"."1.15.1" ]; passthru.names = [ "karma-mocha" ]; }; @@ -6269,13 +6572,13 @@ self.by-version."karma-requirejs"."0.2.0"; "karma-requirejs" = self.by-version."karma-requirejs"."0.2.0"; by-spec."karma-sauce-launcher"."*" = - self.by-version."karma-sauce-launcher"."0.1.2"; - by-version."karma-sauce-launcher"."0.1.2" = lib.makeOverridable self.buildNodePackage { - name = "karma-sauce-launcher-0.1.2"; + self.by-version."karma-sauce-launcher"."0.1.5"; + by-version."karma-sauce-launcher"."0.1.5" = lib.makeOverridable self.buildNodePackage { + name = "karma-sauce-launcher-0.1.5"; src = [ (fetchurl { - url = "http://registry.npmjs.org/karma-sauce-launcher/-/karma-sauce-launcher-0.1.2.tgz"; - sha1 = "ee5949489ef42f4da60d3c1101d9b727465b8612"; + url = "http://registry.npmjs.org/karma-sauce-launcher/-/karma-sauce-launcher-0.1.5.tgz"; + sha1 = "9e95e2b91556ff073105777c838e55d8b57db318"; }) ]; buildInputs = @@ -6284,13 +6587,14 @@ self.by-version."wd"."0.1.5" self.by-version."sauce-connect-launcher"."0.1.11" self.by-version."q"."0.9.7" + self.by-version."saucelabs"."0.1.1" ]; peerDependencies = [ - self.by-version."karma"."0.11.5" + self.by-version."karma"."0.11.7" ]; passthru.names = [ "karma-sauce-launcher" ]; }; - "karma-sauce-launcher" = self.by-version."karma-sauce-launcher"."0.1.2"; + "karma-sauce-launcher" = self.by-version."karma-sauce-launcher"."0.1.5"; by-spec."karma-script-launcher"."*" = self.by-version."karma-script-launcher"."0.1.0"; by-spec."keen.io"."0.0.3" = @@ -6386,13 +6690,13 @@ passthru.names = [ "keypress" ]; }; by-spec."knox"."*" = - self.by-version."knox"."0.8.7"; - by-version."knox"."0.8.7" = lib.makeOverridable self.buildNodePackage { - name = "knox-0.8.7"; + self.by-version."knox"."0.8.8"; + by-version."knox"."0.8.8" = lib.makeOverridable self.buildNodePackage { + name = "knox-0.8.8"; src = [ (fetchurl { - url = "http://registry.npmjs.org/knox/-/knox-0.8.7.tgz"; - sha1 = "a7d1360edb2eec129bfee95d49d302665760a448"; + url = "http://registry.npmjs.org/knox/-/knox-0.8.8.tgz"; + sha1 = "aeeadd22b0a4b1e4d858a15174af2da060ab6774"; }) ]; buildInputs = @@ -6407,7 +6711,7 @@ ]; passthru.names = [ "knox" ]; }; - "knox" = self.by-version."knox"."0.8.7"; + "knox" = self.by-version."knox"."0.8.8"; by-spec."kue"."*" = self.by-version."kue"."0.6.2"; by-version."kue"."0.6.2" = lib.makeOverridable self.buildNodePackage { @@ -6848,13 +7152,13 @@ by-spec."lru-cache"."~2.3.1" = self.by-version."lru-cache"."2.3.1"; by-spec."mailcomposer".">= 0.1.27" = - self.by-version."mailcomposer"."0.2.4"; - by-version."mailcomposer"."0.2.4" = lib.makeOverridable self.buildNodePackage { - name = "mailcomposer-0.2.4"; + self.by-version."mailcomposer"."0.2.6"; + by-version."mailcomposer"."0.2.6" = lib.makeOverridable self.buildNodePackage { + name = "mailcomposer-0.2.6"; src = [ (fetchurl { - url = "http://registry.npmjs.org/mailcomposer/-/mailcomposer-0.2.4.tgz"; - sha1 = "bdda60a5810a66305529ce002ff3f7f063692222"; + url = "http://registry.npmjs.org/mailcomposer/-/mailcomposer-0.2.6.tgz"; + sha1 = "fa785ae7505daeb7a11f7cecf2b374d7801d1b87"; }) ]; buildInputs = @@ -6862,32 +7166,14 @@ deps = [ self.by-version."mimelib"."0.2.14" self.by-version."mime"."1.2.9" - self.by-version."ent"."0.1.0" + self.by-version."he"."0.3.6" + self.by-version."punycode"."1.2.3" + self.by-version."dkim-signer"."0.1.0" ]; peerDependencies = [ ]; passthru.names = [ "mailcomposer" ]; }; - by-spec."match-stream"."~0.0.2" = - self.by-version."match-stream"."0.0.2"; - by-version."match-stream"."0.0.2" = lib.makeOverridable self.buildNodePackage { - name = "match-stream-0.0.2"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/match-stream/-/match-stream-0.0.2.tgz"; - sha1 = "99eb050093b34dffade421b9ac0b410a9cfa17cf"; - }) - ]; - buildInputs = - (self.nativeDeps."match-stream" or []); - deps = [ - self.by-version."buffers"."0.1.1" - self.by-version."readable-stream"."1.0.17" - ]; - peerDependencies = [ - ]; - passthru.names = [ "match-stream" ]; - }; by-spec."meat"."*" = self.by-version."meat"."0.2.5"; by-version."meat"."0.2.5" = lib.makeOverridable self.buildNodePackage { @@ -7222,14 +7508,32 @@ self.by-version."mkdirp"."0.3.5"; by-spec."mkdirp"."~0.3.5" = self.by-version."mkdirp"."0.3.5"; - by-spec."mocha"."*" = - self.by-version."mocha"."1.14.0"; - by-version."mocha"."1.14.0" = lib.makeOverridable self.buildNodePackage { - name = "mocha-1.14.0"; + by-spec."mkpath"."~0.1.0" = + self.by-version."mkpath"."0.1.0"; + by-version."mkpath"."0.1.0" = lib.makeOverridable self.buildNodePackage { + name = "mkpath-0.1.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/mocha/-/mocha-1.14.0.tgz"; - sha1 = "713db6dc5000191a9d0358195d0908790ecb6157"; + url = "http://registry.npmjs.org/mkpath/-/mkpath-0.1.0.tgz"; + sha1 = "7554a6f8d871834cc97b5462b122c4c124d6de91"; + }) + ]; + buildInputs = + (self.nativeDeps."mkpath" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "mkpath" ]; + }; + by-spec."mocha"."*" = + self.by-version."mocha"."1.15.1"; + by-version."mocha"."1.15.1" = lib.makeOverridable self.buildNodePackage { + name = "mocha-1.15.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/mocha/-/mocha-1.15.1.tgz"; + sha1 = "308c3268e16b0b1690d88335355c9d18d4664fc4"; }) ]; buildInputs = @@ -7247,15 +7551,15 @@ ]; passthru.names = [ "mocha" ]; }; - "mocha" = self.by-version."mocha"."1.14.0"; + "mocha" = self.by-version."mocha"."1.15.1"; by-spec."mocha-unfunk-reporter"."*" = - self.by-version."mocha-unfunk-reporter"."0.3.6"; - by-version."mocha-unfunk-reporter"."0.3.6" = lib.makeOverridable self.buildNodePackage { - name = "mocha-unfunk-reporter-0.3.6"; + self.by-version."mocha-unfunk-reporter"."0.3.7"; + by-version."mocha-unfunk-reporter"."0.3.7" = lib.makeOverridable self.buildNodePackage { + name = "mocha-unfunk-reporter-0.3.7"; src = [ (fetchurl { - url = "http://registry.npmjs.org/mocha-unfunk-reporter/-/mocha-unfunk-reporter-0.3.6.tgz"; - sha1 = "5dd07ee02a813c12eabaca8a062ae7a419cac718"; + url = "http://registry.npmjs.org/mocha-unfunk-reporter/-/mocha-unfunk-reporter-0.3.7.tgz"; + sha1 = "3d51ac1804dce71ecd471e4e7aa96ce2e9a6dfec"; }) ]; buildInputs = @@ -7268,7 +7572,7 @@ ]; passthru.names = [ "mocha-unfunk-reporter" ]; }; - "mocha-unfunk-reporter" = self.by-version."mocha-unfunk-reporter"."0.3.6"; + "mocha-unfunk-reporter" = self.by-version."mocha-unfunk-reporter"."0.3.7"; by-spec."moment"."2.1.0" = self.by-version."moment"."2.1.0"; by-version."moment"."2.1.0" = lib.makeOverridable self.buildNodePackage { @@ -7794,7 +8098,7 @@ (self.nativeDeps."natural" or []); deps = [ self.by-version."sylvester"."0.0.21" - self.by-version."apparatus"."0.0.7" + self.by-version."apparatus"."0.0.8" self.by-version."underscore"."1.5.2" ]; peerDependencies = [ @@ -7802,28 +8106,27 @@ passthru.names = [ "natural" ]; }; by-spec."nconf"."*" = - self.by-version."nconf"."0.6.8"; - by-version."nconf"."0.6.8" = lib.makeOverridable self.buildNodePackage { - name = "nconf-0.6.8"; + self.by-version."nconf"."0.6.9"; + by-version."nconf"."0.6.9" = lib.makeOverridable self.buildNodePackage { + name = "nconf-0.6.9"; src = [ (fetchurl { - url = "http://registry.npmjs.org/nconf/-/nconf-0.6.8.tgz"; - sha1 = "bb54b5f660eb3f44d8b2cdccaa5d60453973ffb0"; + url = "http://registry.npmjs.org/nconf/-/nconf-0.6.9.tgz"; + sha1 = "9570ef15ed6f9ae6b2b3c8d5e71b66d3193cd661"; }) ]; buildInputs = (self.nativeDeps."nconf" or []); deps = [ - self.by-version."async"."0.1.22" + self.by-version."async"."0.2.9" self.by-version."ini"."1.1.0" - self.by-version."optimist"."0.3.7" - self.by-version."pkginfo"."0.2.3" + self.by-version."optimist"."0.6.0" ]; peerDependencies = [ ]; passthru.names = [ "nconf" ]; }; - "nconf" = self.by-version."nconf"."0.6.8"; + "nconf" = self.by-version."nconf"."0.6.9"; by-spec."nconf"."0.6.7" = self.by-version."nconf"."0.6.7"; by-version."nconf"."0.6.7" = lib.makeOverridable self.buildNodePackage { @@ -7846,6 +8149,8 @@ ]; passthru.names = [ "nconf" ]; }; + by-spec."nconf"."0.6.9" = + self.by-version."nconf"."0.6.9"; by-spec."ncp"."0.2.x" = self.by-version."ncp"."0.2.7"; by-version."ncp"."0.2.7" = lib.makeOverridable self.buildNodePackage { @@ -7882,6 +8187,8 @@ ]; passthru.names = [ "ncp" ]; }; + by-spec."ncp"."0.4.x" = + self.by-version."ncp"."0.4.2"; by-spec."ncp"."~0.4.2" = self.by-version."ncp"."0.4.2"; by-spec."negotiator"."0.2.5" = @@ -8036,7 +8343,7 @@ self.by-version."npmlog"."0.0.6" self.by-version."osenv"."0.0.3" self.by-version."request"."2.27.0" - self.by-version."rimraf"."2.2.2" + self.by-version."rimraf"."2.2.4" self.by-version."semver"."2.2.1" self.by-version."tar"."0.1.18" self.by-version."which"."1.0.5" @@ -8062,7 +8369,7 @@ (self.nativeDeps."node-inspector" or []); deps = [ self.by-version."socket.io"."0.9.16" - self.by-version."express"."3.4.4" + self.by-version."express"."3.4.6" self.by-version."async"."0.2.9" self.by-version."glob"."3.2.7" self.by-version."rc"."0.3.2" @@ -8252,8 +8559,8 @@ buildInputs = (self.nativeDeps."nodemailer" or []); deps = [ - self.by-version."mailcomposer"."0.2.4" - self.by-version."simplesmtp"."0.3.15" + self.by-version."mailcomposer"."0.2.6" + self.by-version."simplesmtp"."0.3.16" self.by-version."optimist"."0.6.0" ]; peerDependencies = [ @@ -8261,13 +8568,13 @@ passthru.names = [ "nodemailer" ]; }; by-spec."nodemon"."*" = - self.by-version."nodemon"."0.9.7"; - by-version."nodemon"."0.9.7" = lib.makeOverridable self.buildNodePackage { - name = "nodemon-0.9.7"; + self.by-version."nodemon"."0.9.10"; + by-version."nodemon"."0.9.10" = lib.makeOverridable self.buildNodePackage { + name = "nodemon-0.9.10"; src = [ (fetchurl { - url = "http://registry.npmjs.org/nodemon/-/nodemon-0.9.7.tgz"; - sha1 = "bfce004cf399d6785809addaabd6821e20805bd6"; + url = "http://registry.npmjs.org/nodemon/-/nodemon-0.9.10.tgz"; + sha1 = "4faca02a4df262cda9334ef24bfadca14c5c3112"; }) ]; buildInputs = @@ -8279,7 +8586,7 @@ ]; passthru.names = [ "nodemon" ]; }; - "nodemon" = self.by-version."nodemon"."0.9.7"; + "nodemon" = self.by-version."nodemon"."0.9.10"; by-spec."nomnom"."1.6.x" = self.by-version."nomnom"."1.6.2"; by-version."nomnom"."1.6.2" = lib.makeOverridable self.buildNodePackage { @@ -8404,7 +8711,7 @@ self.by-version."graceful-fs"."2.0.1" self.by-version."minimatch"."0.2.12" self.by-version."nopt"."2.1.2" - self.by-version."rimraf"."2.2.2" + self.by-version."rimraf"."2.2.4" self.by-version."request"."2.27.0" self.by-version."which"."1.0.5" self.by-version."tar"."0.1.18" @@ -8466,7 +8773,7 @@ self.by-version."slide"."1.1.5" self.by-version."chownr"."0.0.1" self.by-version."mkdirp"."0.3.5" - self.by-version."rimraf"."2.2.2" + self.by-version."rimraf"."2.2.4" self.by-version."retry"."0.6.0" self.by-version."couch-login"."0.1.19" self.by-version."npmlog"."0.0.6" @@ -8494,7 +8801,7 @@ self.by-version."slide"."1.1.5" self.by-version."chownr"."0.0.1" self.by-version."mkdirp"."0.3.5" - self.by-version."rimraf"."2.2.2" + self.by-version."rimraf"."2.2.4" self.by-version."retry"."0.6.0" self.by-version."couch-login"."0.1.19" self.by-version."npmlog"."0.0.6" @@ -9021,24 +9328,6 @@ }; by-spec."osenv"."0.0.3" = self.by-version."osenv"."0.0.3"; - by-spec."over"."~0.0.5" = - self.by-version."over"."0.0.5"; - by-version."over"."0.0.5" = lib.makeOverridable self.buildNodePackage { - name = "over-0.0.5"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/over/-/over-0.0.5.tgz"; - sha1 = "f29852e70fd7e25f360e013a8ec44c82aedb5708"; - }) - ]; - buildInputs = - (self.nativeDeps."over" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "over" ]; - }; by-spec."owl-deepcopy"."*" = self.by-version."owl-deepcopy"."0.0.2"; by-version."owl-deepcopy"."0.0.2" = lib.makeOverridable self.buildNodePackage { @@ -9060,6 +9349,25 @@ "owl-deepcopy" = self.by-version."owl-deepcopy"."0.0.2"; by-spec."owl-deepcopy"."~0.0.1" = self.by-version."owl-deepcopy"."0.0.2"; + by-spec."p-throttler"."~0.0.1" = + self.by-version."p-throttler"."0.0.1"; + by-version."p-throttler"."0.0.1" = lib.makeOverridable self.buildNodePackage { + name = "p-throttler-0.0.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/p-throttler/-/p-throttler-0.0.1.tgz"; + sha1 = "c341e3589ec843852a035e6f88e6c1e96150029b"; + }) + ]; + buildInputs = + (self.nativeDeps."p-throttler" or []); + deps = [ + self.by-version."q"."0.9.7" + ]; + peerDependencies = [ + ]; + passthru.names = [ "p-throttler" ]; + }; by-spec."passport"."*" = self.by-version."passport"."0.1.17"; by-version."passport"."0.1.17" = lib.makeOverridable self.buildNodePackage { @@ -9167,7 +9475,7 @@ self.by-version."ncp"."0.4.2" self.by-version."npmconf"."0.0.24" self.by-version."mkdirp"."0.3.5" - self.by-version."rimraf"."2.2.2" + self.by-version."rimraf"."2.2.4" self.by-version."which"."1.0.5" ]; peerDependencies = [ @@ -9326,7 +9634,7 @@ self.by-version."pkginfo"."0.3.0" self.by-version."read"."1.0.5" self.by-version."revalidator"."0.1.5" - self.by-version."utile"."0.2.0" + self.by-version."utile"."0.2.1" self.by-version."winston"."0.6.2" ]; peerDependencies = [ @@ -9431,27 +9739,23 @@ ]; passthru.names = [ "ps-tree" ]; }; - by-spec."pullstream"."~0.4.0" = - self.by-version."pullstream"."0.4.0"; - by-version."pullstream"."0.4.0" = lib.makeOverridable self.buildNodePackage { - name = "pullstream-0.4.0"; + by-spec."punycode"."~1.2.3" = + self.by-version."punycode"."1.2.3"; + by-version."punycode"."1.2.3" = lib.makeOverridable self.buildNodePackage { + name = "punycode-1.2.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/pullstream/-/pullstream-0.4.0.tgz"; - sha1 = "919f15ef376433b331351f116565dc17c6fcda77"; + url = "http://registry.npmjs.org/punycode/-/punycode-1.2.3.tgz"; + sha1 = "b4e304471082d783c73b3bafabf2fd9b6a486266"; }) ]; buildInputs = - (self.nativeDeps."pullstream" or []); + (self.nativeDeps."punycode" or []); deps = [ - self.by-version."over"."0.0.5" - self.by-version."readable-stream"."1.0.17" - self.by-version."setimmediate"."1.0.1" - self.by-version."slice-stream"."0.0.0" ]; peerDependencies = [ ]; - passthru.names = [ "pullstream" ]; + passthru.names = [ "punycode" ]; }; by-spec."q"."0.9.x" = self.by-version."q"."0.9.7"; @@ -9572,7 +9876,23 @@ passthru.names = [ "qs" ]; }; by-spec."qs".">= 0.4.0" = - self.by-version."qs"."0.6.5"; + self.by-version."qs"."0.6.6"; + by-version."qs"."0.6.6" = lib.makeOverridable self.buildNodePackage { + name = "qs-0.6.6"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/qs/-/qs-0.6.6.tgz"; + sha1 = "6e015098ff51968b8a3c819001d5f2c89bc4b107"; + }) + ]; + buildInputs = + (self.nativeDeps."qs" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "qs" ]; + }; by-spec."qs"."~0.5.0" = self.by-version."qs"."0.5.6"; by-version."qs"."0.5.6" = lib.makeOverridable self.buildNodePackage { @@ -9594,7 +9914,7 @@ by-spec."qs"."~0.5.4" = self.by-version."qs"."0.5.6"; by-spec."qs"."~0.6.0" = - self.by-version."qs"."0.6.5"; + self.by-version."qs"."0.6.6"; by-spec."rai"."~0.1" = self.by-version."rai"."0.1.8"; by-version."rai"."0.1.8" = lib.makeOverridable self.buildNodePackage { @@ -9669,6 +9989,25 @@ ]; passthru.names = [ "raw-body" ]; }; + by-spec."raw-body"."1.1.2" = + self.by-version."raw-body"."1.1.2"; + by-version."raw-body"."1.1.2" = lib.makeOverridable self.buildNodePackage { + name = "raw-body-1.1.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/raw-body/-/raw-body-1.1.2.tgz"; + sha1 = "c74b3004dea5defd1696171106ac740ec31d62be"; + }) + ]; + buildInputs = + (self.nativeDeps."raw-body" or []); + deps = [ + self.by-version."bytes"."0.2.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "raw-body" ]; + }; by-spec."raw-socket"."*" = self.by-version."raw-socket"."1.2.2"; by-version."raw-socket"."1.2.2" = lib.makeOverridable self.buildNodePackage { @@ -9860,8 +10199,6 @@ ]; passthru.names = [ "readable-stream" ]; }; - by-spec."readable-stream"."~1.0.0" = - self.by-version."readable-stream"."1.0.17"; by-spec."readable-stream"."~1.0.2" = self.by-version."readable-stream"."1.0.17"; by-spec."readable-stream"."~1.1.8" = @@ -10090,7 +10427,7 @@ buildInputs = (self.nativeDeps."request" or []); deps = [ - self.by-version."qs"."0.6.5" + self.by-version."qs"."0.6.6" self.by-version."json-stringify-safe"."5.0.0" self.by-version."forever-agent"."0.5.0" self.by-version."tunnel-agent"."0.3.0" @@ -10206,7 +10543,7 @@ buildInputs = (self.nativeDeps."request" or []); deps = [ - self.by-version."qs"."0.6.5" + self.by-version."qs"."0.6.6" self.by-version."json-stringify-safe"."4.0.0" self.by-version."forever-agent"."0.5.0" self.by-version."tunnel-agent"."0.3.0" @@ -10236,7 +10573,7 @@ buildInputs = (self.nativeDeps."request" or []); deps = [ - self.by-version."qs"."0.6.5" + self.by-version."qs"."0.6.6" self.by-version."json-stringify-safe"."5.0.0" self.by-version."forever-agent"."0.5.0" self.by-version."tunnel-agent"."0.3.0" @@ -10441,13 +10778,13 @@ passthru.names = [ "rimraf" ]; }; by-spec."rimraf"."2" = - self.by-version."rimraf"."2.2.2"; - by-version."rimraf"."2.2.2" = lib.makeOverridable self.buildNodePackage { - name = "rimraf-2.2.2"; + self.by-version."rimraf"."2.2.4"; + by-version."rimraf"."2.2.4" = lib.makeOverridable self.buildNodePackage { + name = "rimraf-2.2.4"; src = [ (fetchurl { - url = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.2.tgz"; - sha1 = "d99ec41dc646e55bf7a7a44a255c28bef33a8abf"; + url = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.4.tgz"; + sha1 = "9f0b530f829f7b655a6e4d2fd8cf4c042336ef58"; }) ]; buildInputs = @@ -10460,9 +10797,9 @@ passthru.names = [ "rimraf" ]; }; by-spec."rimraf"."2.x.x" = - self.by-version."rimraf"."2.2.2"; + self.by-version."rimraf"."2.2.4"; by-spec."rimraf"."~2" = - self.by-version."rimraf"."2.2.2"; + self.by-version."rimraf"."2.2.4"; by-spec."rimraf"."~2.0.2" = self.by-version."rimraf"."2.0.3"; by-version."rimraf"."2.0.3" = lib.makeOverridable self.buildNodePackage { @@ -10506,9 +10843,9 @@ by-spec."rimraf"."~2.1.4" = self.by-version."rimraf"."2.1.4"; by-spec."rimraf"."~2.2.0" = - self.by-version."rimraf"."2.2.2"; + self.by-version."rimraf"."2.2.4"; by-spec."rimraf"."~2.2.2" = - self.by-version."rimraf"."2.2.2"; + self.by-version."rimraf"."2.2.4"; by-spec."s3http"."*" = self.by-version."s3http"."0.0.3"; by-version."s3http"."0.0.3" = lib.makeOverridable self.buildNodePackage { @@ -10557,6 +10894,24 @@ ]; passthru.names = [ "sauce-connect-launcher" ]; }; + by-spec."saucelabs"."~0.1.0" = + self.by-version."saucelabs"."0.1.1"; + by-version."saucelabs"."0.1.1" = lib.makeOverridable self.buildNodePackage { + name = "saucelabs-0.1.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/saucelabs/-/saucelabs-0.1.1.tgz"; + sha1 = "5e0ea1cf3d735d6ea15fde94b5bda6bc15d2c06d"; + }) + ]; + buildInputs = + (self.nativeDeps."saucelabs" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "saucelabs" ]; + }; by-spec."sax"."0.5.x" = self.by-version."sax"."0.5.5"; by-version."sax"."0.5.5" = lib.makeOverridable self.buildNodePackage { @@ -10789,24 +11144,6 @@ }; by-spec."sequence".">= 2.2.1" = self.by-version."sequence"."2.2.1"; - by-spec."setimmediate"."~1.0.1" = - self.by-version."setimmediate"."1.0.1"; - by-version."setimmediate"."1.0.1" = lib.makeOverridable self.buildNodePackage { - name = "setimmediate-1.0.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/setimmediate/-/setimmediate-1.0.1.tgz"; - sha1 = "a9ca56ccbd6a4c3334855f060abcdece5c42ebb7"; - }) - ]; - buildInputs = - (self.nativeDeps."setimmediate" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "setimmediate" ]; - }; by-spec."sha"."~1.2.1" = self.by-version."sha"."1.2.3"; by-version."sha"."1.2.3" = lib.makeOverridable self.buildNodePackage { @@ -10907,13 +11244,13 @@ by-spec."signals"."~1.0.0" = self.by-version."signals"."1.0.0"; by-spec."simplesmtp".">= 0.1.22" = - self.by-version."simplesmtp"."0.3.15"; - by-version."simplesmtp"."0.3.15" = lib.makeOverridable self.buildNodePackage { - name = "simplesmtp-0.3.15"; + self.by-version."simplesmtp"."0.3.16"; + by-version."simplesmtp"."0.3.16" = lib.makeOverridable self.buildNodePackage { + name = "simplesmtp-0.3.16"; src = [ (fetchurl { - url = "http://registry.npmjs.org/simplesmtp/-/simplesmtp-0.3.15.tgz"; - sha1 = "345da4c54a3c7f9a2cddfe9110672df2b432231d"; + url = "http://registry.npmjs.org/simplesmtp/-/simplesmtp-0.3.16.tgz"; + sha1 = "c82ab64b957a5f979b10b96787094e3612877814"; }) ]; buildInputs = @@ -10926,25 +11263,6 @@ ]; passthru.names = [ "simplesmtp" ]; }; - by-spec."slice-stream"."0.0.0" = - self.by-version."slice-stream"."0.0.0"; - by-version."slice-stream"."0.0.0" = lib.makeOverridable self.buildNodePackage { - name = "slice-stream-0.0.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/slice-stream/-/slice-stream-0.0.0.tgz"; - sha1 = "8183df87ad44ae0b48c0625134eac6e349747860"; - }) - ]; - buildInputs = - (self.nativeDeps."slice-stream" or []); - deps = [ - self.by-version."readable-stream"."1.0.17" - ]; - peerDependencies = [ - ]; - passthru.names = [ "slice-stream" ]; - }; by-spec."sliced"."0.0.3" = self.by-version."sliced"."0.0.3"; by-version."sliced"."0.0.3" = lib.makeOverridable self.buildNodePackage { @@ -11243,6 +11561,8 @@ self.by-version."source-map"."0.1.31"; by-spec."source-map".">= 0.1.2" = self.by-version."source-map"."0.1.31"; + by-spec."source-map"."~0.1.30" = + self.by-version."source-map"."0.1.31"; by-spec."source-map"."~0.1.7" = self.by-version."source-map"."0.1.31"; by-spec."spdy"."1.7.1" = @@ -11381,13 +11701,13 @@ passthru.names = [ "stream-counter" ]; }; by-spec."stream-splitter-transform"."*" = - self.by-version."stream-splitter-transform"."0.0.3"; - by-version."stream-splitter-transform"."0.0.3" = lib.makeOverridable self.buildNodePackage { - name = "stream-splitter-transform-0.0.3"; + self.by-version."stream-splitter-transform"."0.0.4"; + by-version."stream-splitter-transform"."0.0.4" = lib.makeOverridable self.buildNodePackage { + name = "stream-splitter-transform-0.0.4"; src = [ (fetchurl { - url = "http://registry.npmjs.org/stream-splitter-transform/-/stream-splitter-transform-0.0.3.tgz"; - sha1 = "5ccd3bd497ffee4c2fc7c1cc9d7b697b54c42eef"; + url = "http://registry.npmjs.org/stream-splitter-transform/-/stream-splitter-transform-0.0.4.tgz"; + sha1 = "0de54e94680633a8d703b252b20fa809ed99331c"; }) ]; buildInputs = @@ -11399,7 +11719,7 @@ ]; passthru.names = [ "stream-splitter-transform" ]; }; - "stream-splitter-transform" = self.by-version."stream-splitter-transform"."0.0.3"; + "stream-splitter-transform" = self.by-version."stream-splitter-transform"."0.0.4"; by-spec."streamsearch"."0.1.2" = self.by-version."streamsearch"."0.1.2"; by-version."streamsearch"."0.1.2" = lib.makeOverridable self.buildNodePackage { @@ -11474,13 +11794,13 @@ passthru.names = [ "strong-data-uri" ]; }; by-spec."stylus"."*" = - self.by-version."stylus"."0.40.3"; - by-version."stylus"."0.40.3" = lib.makeOverridable self.buildNodePackage { - name = "stylus-0.40.3"; + self.by-version."stylus"."0.41.0"; + by-version."stylus"."0.41.0" = lib.makeOverridable self.buildNodePackage { + name = "stylus-0.41.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/stylus/-/stylus-0.40.3.tgz"; - sha1 = "17e566274ebd6e56f23a8928fa38626c4260ded3"; + url = "http://registry.npmjs.org/stylus/-/stylus-0.41.0.tgz"; + sha1 = "b9609d5663c9624d11b28952f3e6b23cde10ac28"; }) ]; buildInputs = @@ -11495,7 +11815,7 @@ ]; passthru.names = [ "stylus" ]; }; - "stylus" = self.by-version."stylus"."0.40.3"; + "stylus" = self.by-version."stylus"."0.41.0"; by-spec."stylus"."0.27.2" = self.by-version."stylus"."0.27.2"; by-version."stylus"."0.27.2" = lib.makeOverridable self.buildNodePackage { @@ -11813,13 +12133,13 @@ passthru.names = [ "tinycolor" ]; }; by-spec."tmp"."~0.0.20" = - self.by-version."tmp"."0.0.21"; - by-version."tmp"."0.0.21" = lib.makeOverridable self.buildNodePackage { - name = "tmp-0.0.21"; + self.by-version."tmp"."0.0.22"; + by-version."tmp"."0.0.22" = lib.makeOverridable self.buildNodePackage { + name = "tmp-0.0.22"; src = [ (fetchurl { - url = "http://registry.npmjs.org/tmp/-/tmp-0.0.21.tgz"; - sha1 = "6d263fede6570dc4d4510ffcc2efc640223b1153"; + url = "http://registry.npmjs.org/tmp/-/tmp-0.0.22.tgz"; + sha1 = "92133c8a93785fbbd3971c9454561921d58283cd"; }) ]; buildInputs = @@ -11830,6 +12150,25 @@ ]; passthru.names = [ "tmp" ]; }; + by-spec."touch"."0.0.2" = + self.by-version."touch"."0.0.2"; + by-version."touch"."0.0.2" = lib.makeOverridable self.buildNodePackage { + name = "touch-0.0.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/touch/-/touch-0.0.2.tgz"; + sha1 = "a65a777795e5cbbe1299499bdc42281ffb21b5f4"; + }) + ]; + buildInputs = + (self.nativeDeps."touch" or []); + deps = [ + self.by-version."nopt"."1.0.10" + ]; + peerDependencies = [ + ]; + passthru.names = [ "touch" ]; + }; by-spec."traceback".">=0.3.0 && < 0.4" = self.by-version."traceback"."0.3.0"; by-version."traceback"."0.3.0" = lib.makeOverridable self.buildNodePackage { @@ -12059,13 +12398,13 @@ passthru.names = [ "uglify-js" ]; }; by-spec."uglify-js"."~2.4.0" = - self.by-version."uglify-js"."2.4.4"; - by-version."uglify-js"."2.4.4" = lib.makeOverridable self.buildNodePackage { - name = "uglify-js-2.4.4"; + self.by-version."uglify-js"."2.4.6"; + by-version."uglify-js"."2.4.6" = lib.makeOverridable self.buildNodePackage { + name = "uglify-js-2.4.6"; src = [ (fetchurl { - url = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.4.4.tgz"; - sha1 = "f629e1e46bbe0bf4cf7232c7919e66b25a8fc529"; + url = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.4.6.tgz"; + sha1 = "31766a4d822babf5f32c14096251ed9259298ad3"; }) ]; buildInputs = @@ -12252,7 +12591,7 @@ buildInputs = (self.nativeDeps."ungit" or []); deps = [ - self.by-version."express"."3.4.4" + self.by-version."express"."3.4.6" self.by-version."superagent"."0.15.7" self.by-version."lodash"."2.3.0" self.by-version."temp"."0.6.0" @@ -12285,30 +12624,6 @@ passthru.names = [ "ungit" ]; }; "ungit" = self.by-version."ungit"."0.6.0"; - by-spec."unzip"."~0.1.7" = - self.by-version."unzip"."0.1.9"; - by-version."unzip"."0.1.9" = lib.makeOverridable self.buildNodePackage { - name = "unzip-0.1.9"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/unzip/-/unzip-0.1.9.tgz"; - sha1 = "12ac4d05c0a19fc4546df4c50ae0a7f4706a9424"; - }) - ]; - buildInputs = - (self.nativeDeps."unzip" or []); - deps = [ - self.by-version."fstream"."0.1.25" - self.by-version."pullstream"."0.4.0" - self.by-version."binary"."0.3.0" - self.by-version."readable-stream"."1.0.17" - self.by-version."setimmediate"."1.0.1" - self.by-version."match-stream"."0.0.2" - ]; - peerDependencies = [ - ]; - passthru.names = [ "unzip" ]; - }; by-spec."update-notifier"."~0.1.3" = self.by-version."update-notifier"."0.1.7"; by-version."update-notifier"."0.1.7" = lib.makeOverridable self.buildNodePackage { @@ -12415,30 +12730,32 @@ }; by-spec."utile"."0.1.x" = self.by-version."utile"."0.1.7"; - by-spec."utile"."0.2.x" = - self.by-version."utile"."0.2.0"; - by-version."utile"."0.2.0" = lib.makeOverridable self.buildNodePackage { - name = "utile-0.2.0"; + by-spec."utile"."0.2.1" = + self.by-version."utile"."0.2.1"; + by-version."utile"."0.2.1" = lib.makeOverridable self.buildNodePackage { + name = "utile-0.2.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/utile/-/utile-0.2.0.tgz"; - sha1 = "91a2423ca2eb3322390e211ee3d71cf4fa193aea"; + url = "http://registry.npmjs.org/utile/-/utile-0.2.1.tgz"; + sha1 = "930c88e99098d6220834c356cbd9a770522d90d7"; }) ]; buildInputs = (self.nativeDeps."utile" or []); deps = [ - self.by-version."async"."0.1.22" + self.by-version."async"."0.2.9" self.by-version."deep-equal"."0.1.0" self.by-version."i"."0.3.2" self.by-version."mkdirp"."0.3.5" - self.by-version."ncp"."0.2.7" - self.by-version."rimraf"."2.2.2" + self.by-version."ncp"."0.4.2" + self.by-version."rimraf"."2.2.4" ]; peerDependencies = [ ]; passthru.names = [ "utile" ]; }; + by-spec."utile"."0.2.x" = + self.by-version."utile"."0.2.1"; by-spec."utile"."~0.1.7" = self.by-version."utile"."0.1.7"; by-spec."uuid"."1.4.1" = @@ -12711,7 +13028,7 @@ self.by-version."mkdirp"."0.3.5" self.by-version."npmconf"."0.1.6" self.by-version."phantomjs"."1.9.2-4" - self.by-version."tmp"."0.0.21" + self.by-version."tmp"."0.0.22" self.by-version."follow-redirects"."0.0.3" ]; peerDependencies = [ @@ -12720,13 +13037,13 @@ }; "webdrvr" = self.by-version."webdrvr"."2.37.0-1"; by-spec."websocket-driver".">=0.3.0" = - self.by-version."websocket-driver"."0.3.0"; - by-version."websocket-driver"."0.3.0" = lib.makeOverridable self.buildNodePackage { - name = "websocket-driver-0.3.0"; + self.by-version."websocket-driver"."0.3.1"; + by-version."websocket-driver"."0.3.1" = lib.makeOverridable self.buildNodePackage { + name = "websocket-driver-0.3.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/websocket-driver/-/websocket-driver-0.3.0.tgz"; - sha1 = "497b258c508b987249ab9b6f79f0c21dd3467c64"; + url = "http://registry.npmjs.org/websocket-driver/-/websocket-driver-0.3.1.tgz"; + sha1 = "25f86b4e7ca9d8f8136cd225ffcee71a3d2869cf"; }) ]; buildInputs = @@ -12737,6 +13054,8 @@ ]; passthru.names = [ "websocket-driver" ]; }; + by-spec."websocket-driver".">=0.3.1" = + self.by-version."websocket-driver"."0.3.1"; by-spec."when"."~2.2.1" = self.by-version."when"."2.2.1"; by-version."when"."2.2.1" = lib.makeOverridable self.buildNodePackage { @@ -12755,7 +13074,7 @@ ]; passthru.names = [ "when" ]; }; - by-spec."which"."1" = + by-spec."which"."*" = self.by-version."which"."1.0.5"; by-version."which"."1.0.5" = lib.makeOverridable self.buildNodePackage { name = "which-1.0.5"; @@ -12773,6 +13092,8 @@ ]; passthru.names = [ "which" ]; }; + by-spec."which"."1" = + self.by-version."which"."1.0.5"; by-spec."which"."1.0.x" = self.by-version."which"."1.0.5"; by-spec."which"."~1.0.5" = @@ -12875,6 +13196,8 @@ ]; passthru.names = [ "winston" ]; }; + by-spec."winston"."0.7.2" = + self.by-version."winston"."0.7.2"; by-spec."winston"."~0.7.2" = self.by-version."winston"."0.7.2"; by-spec."with"."~1.1.0" = @@ -13197,7 +13520,7 @@ deps = [ self.by-version."cheerio"."0.12.4" self.by-version."request"."2.25.0" - self.by-version."rimraf"."2.2.2" + self.by-version."rimraf"."2.2.4" self.by-version."tar"."0.1.18" self.by-version."diff"."1.0.7" self.by-version."mime"."1.2.11" @@ -13249,7 +13572,7 @@ ]; peerDependencies = [ self.by-version."grunt-cli"."0.1.11" - self.by-version."bower"."1.2.7" + self.by-version."bower"."1.2.8" ]; passthru.names = [ "yo" ]; }; From 07ce265406801170aa949de6d5196f8468a7dda0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 2 Dec 2013 20:41:51 +0100 Subject: [PATCH 024/152] alex: update to version 3.1.3 --- .../tools/parsing/alex/{3.1.2.nix => 3.1.3.nix} | 8 ++++---- pkgs/top-level/haskell-packages.nix | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) rename pkgs/development/tools/parsing/alex/{3.1.2.nix => 3.1.3.nix} (73%) diff --git a/pkgs/development/tools/parsing/alex/3.1.2.nix b/pkgs/development/tools/parsing/alex/3.1.3.nix similarity index 73% rename from pkgs/development/tools/parsing/alex/3.1.2.nix rename to pkgs/development/tools/parsing/alex/3.1.3.nix index f969f9b6591..8174d851a31 100644 --- a/pkgs/development/tools/parsing/alex/3.1.2.nix +++ b/pkgs/development/tools/parsing/alex/3.1.3.nix @@ -1,13 +1,13 @@ -{ cabal, perl, QuickCheck }: +{ cabal, happy, perl, QuickCheck }: cabal.mkDerivation (self: { pname = "alex"; - version = "3.1.2"; - sha256 = "0v8y6s9gwfk3cda6cpdl0n6vljmjbpnrdi3n93q41x24bhjyn50x"; + version = "3.1.3"; + sha256 = "14hajxpqb6va5mclp2k682bgw9sbmd372vw41kq5aq815bkschcd"; isLibrary = false; isExecutable = true; buildDepends = [ QuickCheck ]; - buildTools = [ perl ]; + buildTools = [ happy perl ]; meta = { homepage = "http://www.haskell.org/alex/"; description = "Alex is a tool for generating lexical analysers in Haskell"; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index c7ddad8895d..57614893ba9 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -175,7 +175,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x xhtml = self.xhtml_3000_2_1; zlib = self.zlib_0_5_4_1; cabalInstall = self.cabalInstall_1_18_0_2; - alex = self.alex_3_1_2; + alex = self.alex_3_1_3; haddock = self.haddock_2_13_2; happy = self.happy_1_19_1; primitive = self.primitive_0_5_1_0; # semi-official, but specified @@ -2462,8 +2462,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x alex_3_0_1 = callPackage ../development/tools/parsing/alex/3.0.1.nix {}; alex_3_0_2 = callPackage ../development/tools/parsing/alex/3.0.2.nix {}; alex_3_0_5 = callPackage ../development/tools/parsing/alex/3.0.5.nix {}; - alex_3_1_2 = callPackage ../development/tools/parsing/alex/3.1.2.nix {}; - alex = self.alex_3_1_2; + alex_3_1_3 = callPackage ../development/tools/parsing/alex/3.1.3.nix {}; + alex = self.alex_3_1_3; alexMeta = callPackage ../development/tools/haskell/alex-meta {}; From 64feb74f440aa33839f8483d3a45f8ea1ff5b71f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 2 Dec 2013 20:43:21 +0100 Subject: [PATCH 025/152] happy: update to version 1.19.2 --- .../tools/parsing/happy/{1.19.1.nix => 1.19.2.nix} | 4 ++-- pkgs/top-level/haskell-packages.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) rename pkgs/development/tools/parsing/happy/{1.19.1.nix => 1.19.2.nix} (83%) diff --git a/pkgs/development/tools/parsing/happy/1.19.1.nix b/pkgs/development/tools/parsing/happy/1.19.2.nix similarity index 83% rename from pkgs/development/tools/parsing/happy/1.19.1.nix rename to pkgs/development/tools/parsing/happy/1.19.2.nix index 3ca5add9e6b..eaf027b591d 100644 --- a/pkgs/development/tools/parsing/happy/1.19.1.nix +++ b/pkgs/development/tools/parsing/happy/1.19.2.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "happy"; - version = "1.19.1"; - sha256 = "0vhyv8pgj3cc31xx1vbdlhc01sfpl6xpzya79bvssnkian2n6yy2"; + version = "1.19.2"; + sha256 = "1m74dz83fs7gbcr040nhfx1xw3smjk24g5cp6a0wxvrmlh12yc66"; isLibrary = false; isExecutable = true; buildDepends = [ mtl ]; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 57614893ba9..0a5a336fcce 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -177,7 +177,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x cabalInstall = self.cabalInstall_1_18_0_2; alex = self.alex_3_1_3; haddock = self.haddock_2_13_2; - happy = self.happy_1_19_1; + happy = self.happy_1_19_2; primitive = self.primitive_0_5_1_0; # semi-official, but specified }; @@ -2493,8 +2493,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x happy_1_18_9 = callPackage ../development/tools/parsing/happy/1.18.9.nix {}; happy_1_18_10 = callPackage ../development/tools/parsing/happy/1.18.10.nix {}; happy_1_18_11 = callPackage ../development/tools/parsing/happy/1.18.11.nix {}; - happy_1_19_1 = callPackage ../development/tools/parsing/happy/1.19.1.nix {}; - happy = self.happy_1_19_1; + happy_1_19_2 = callPackage ../development/tools/parsing/happy/1.19.2.nix {}; + happy = self.happy_1_19_2; happyMeta = callPackage ../development/tools/haskell/happy-meta {}; From 01f13be7ae1b1a68ed1b70f56fcb16a4ba79986c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 2 Dec 2013 20:58:56 +0100 Subject: [PATCH 026/152] all-packages.nix: cosmetic, no functional change --- pkgs/top-level/all-packages.nix | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6eb44d42a88..7461f093de4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2734,20 +2734,20 @@ let # Current Haskell Platform: 2013.2.0.0 haskellPlatform = haskellPackages.haskellPlatform; - haskellPackages_ghc6104 = haskell.packages_ghc6104; - haskellPackages_ghc6121 = haskell.packages_ghc6121; - haskellPackages_ghc6122 = haskell.packages_ghc6122; - haskellPackages_ghc6123 = haskell.packages_ghc6123; - haskellPackages_ghc701 = haskell.packages_ghc701; - haskellPackages_ghc702 = haskell.packages_ghc702; - haskellPackages_ghc703 = haskell.packages_ghc703; - haskellPackages_ghc704 = haskell.packages_ghc704; - haskellPackages_ghc721 = haskell.packages_ghc721; - haskellPackages_ghc722 = haskell.packages_ghc722; - haskellPackages_ghc741 = haskell.packages_ghc741; - haskellPackages_ghc742 = haskell.packages_ghc742; - haskellPackages_ghc761 = haskell.packages_ghc761; - haskellPackages_ghc762 = haskell.packages_ghc762; + haskellPackages_ghc6104 = haskell.packages_ghc6104; + haskellPackages_ghc6121 = haskell.packages_ghc6121; + haskellPackages_ghc6122 = haskell.packages_ghc6122; + haskellPackages_ghc6123 = haskell.packages_ghc6123; + haskellPackages_ghc701 = haskell.packages_ghc701; + haskellPackages_ghc702 = haskell.packages_ghc702; + haskellPackages_ghc703 = haskell.packages_ghc703; + haskellPackages_ghc704 = haskell.packages_ghc704; + haskellPackages_ghc721 = haskell.packages_ghc721; + haskellPackages_ghc722 = haskell.packages_ghc722; + haskellPackages_ghc741 = haskell.packages_ghc741; + haskellPackages_ghc742 = haskell.packages_ghc742; + haskellPackages_ghc761 = haskell.packages_ghc761; + haskellPackages_ghc762 = haskell.packages_ghc762; # For the default version, we build profiling versions of the libraries, too. # The following three lines achieve that: the first two make Hydra build explicit # profiling and non-profiling versions; the final respects the user-configured @@ -2756,7 +2756,7 @@ let haskellPackages_ghc763_profiling = recurseIntoAttrs (haskell.packages_ghc763.profiling); haskellPackages_ghc763 = recurseIntoAttrs (haskell.packages_ghc763.highPrio); # Reasonably current HEAD snapshot. - haskellPackages_ghcHEAD = haskell.packages_ghcHEAD; + haskellPackages_ghcHEAD = haskell.packages_ghcHEAD; haxe = callPackage ../development/compilers/haxe { }; From e5e129a4d0366f80ddd7cf081b2017bcc8b0bfcd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 2 Dec 2013 21:24:11 +0100 Subject: [PATCH 027/152] Fix references to haskell-opengl 2.9.1.0. --- pkgs/top-level/haskell-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 0a5a336fcce..f23673097db 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1125,7 +1125,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x OpenGL = self.OpenGL_2_8_0_0; }; GLUT_2_5_0_1 = callPackage ../development/libraries/haskell/GLUT/2.5.0.1.nix { - OpenGL = self.OpenGL_2_9_0_1; + OpenGL = self.OpenGL_2_9_1_0; }; GLUT = self.GLUT_2_5_0_1; @@ -1650,7 +1650,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x OpenGL_2_4_0_2 = callPackage ../development/libraries/haskell/OpenGL/2.4.0.2.nix {}; OpenGL_2_6_0_1 = callPackage ../development/libraries/haskell/OpenGL/2.6.0.1.nix {}; OpenGL_2_8_0_0 = callPackage ../development/libraries/haskell/OpenGL/2.8.0.0.nix {}; - OpenGL_2_9_0_1 = callPackage ../development/libraries/haskell/OpenGL/2.9.1.0.nix {}; + OpenGL_2_9_1_0 = callPackage ../development/libraries/haskell/OpenGL/2.9.1.0.nix {}; OpenGL = self.OpenGL_2_9_1_0; OpenGLRaw_1_3_0_0 = callPackage ../development/libraries/haskell/OpenGLRaw/1.3.0.0.nix {}; From dc662dcaa211361a0ab8db1ad729b16c96e777f3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 2 Dec 2013 21:33:21 +0100 Subject: [PATCH 028/152] ghc-head: update to today's git snapshot and arbitrarily dub it version 7.7.20131202 --- pkgs/development/compilers/ghc/head.nix | 10 +++++----- pkgs/top-level/haskell-defaults.nix | 7 ++++++- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index e7483700ab0..f4f8be27367 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchurl, ghc, perl, gmp, ncurses }: +{ stdenv, fetchurl, ghc, perl, gmp, ncurses, happy, alex }: stdenv.mkDerivation rec { - version = "7.7.20130828"; + version = "7.7.20131202"; name = "ghc-${version}"; src = fetchurl { - url = "http://darcs.haskell.org/ghcBuilder/uploads/tn23/${name}-src.tar.bz2"; - sha256 = "180nkd77kz3mv4g7yq8ipx34p5q8k714l0z2527y49lghy118jzv"; + url = "http://cryp.to/${name}.tar.xz"; + sha256 = "1gnp5c3x7dbaz7s2yvkw2fmvqh5by2gpp0zlcyj8p2gv13gxi2cb"; }; - buildInputs = [ ghc perl gmp ncurses ]; + buildInputs = [ ghc perl gmp ncurses happy alex ]; enableParallelBuilding = true; diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index 16803155b65..3589be3c682 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -156,6 +156,7 @@ , extraPrefs ? (x : {}) , profExplicit ? false, profDefault ? false , modifyPrio ? lowPrio + , extraArgs ? {} } : import ./haskell-packages.nix { inherit pkgs newScope modifyPrio; @@ -164,7 +165,7 @@ enableLibraryProfiling = if profExplicit then profDefault else config.cabal.libraryProfiling or profDefault; - ghc = callPackage ghcPath { ghc = ghcBinary; }; + ghc = callPackage ghcPath ({ ghc = ghcBinary; } // extraArgs); }); defaultVersionPrioFun = @@ -331,6 +332,10 @@ packages { ghcPath = ../development/compilers/ghc/head.nix; ghcBinary = ghc742Binary; prefFun = ghcHEADPrefs; + extraArgs = { + happy = pkgs.haskellPackages.happy_1_19_2; + alex = pkgs.haskellPackages.alex_3_1_3; + }; }; } From 3dd9e512c285bb5c20dc04d4517d887b573bd3c9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 3 Dec 2013 21:57:39 +0100 Subject: [PATCH 029/152] haskell-packages.nix: cosmetic --- pkgs/top-level/haskell-packages.nix | 54 ++++++++++++++--------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index f23673097db..492c1759f38 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -267,33 +267,33 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x haskellPlatformArgs_2012_2_0_0 = self : { inherit (self) cabal ghc; - cgi = self.cgi_3001_1_7_4; # 7.4.1 ok - fgl = self.fgl_5_4_2_4; # 7.4.1 ok - GLUT = self.GLUT_2_1_2_1; # 7.4.1 ok - haskellSrc = self.haskellSrc_1_0_1_5; # 7.4.1 ok - html = self.html_1_0_1_2; # 7.4.1 ok - HTTP = self.HTTP_4000_2_3; # 7.4.1 ok - HUnit = self.HUnit_1_2_4_2; # 7.4.1 ok - mtl = self.mtl_2_1_1; # 7.4.1 ok - network = self.network_2_3_0_13; # 7.4.1 ok - OpenGL = self.OpenGL_2_2_3_1; # 7.4.1 ok - parallel = self.parallel_3_2_0_2; # 7.4.1 ok - parsec = self.parsec_3_1_2; # 7.4.1 ok - QuickCheck = self.QuickCheck_2_4_2; # 7.4.1 ok - random = self.random_1_0_1_1; # 7.4.1 ok - regexBase = self.regexBase_0_93_2; # 7.4.1 ok - regexCompat = self.regexCompat_0_95_1; # 7.4.1 ok - regexPosix = self.regexPosix_0_95_1; # 7.4.1 ok - stm = self.stm_2_3; # 7.4.1 ok - syb = self.syb_0_3_6_1; # 7.4.1 ok - text = self.text_0_11_2_0; # 7.4.1 ok - transformers = self.transformers_0_3_0_0; # 7.4.1 ok - xhtml = self.xhtml_3000_2_1; # 7.4.1 ok - zlib = self.zlib_0_5_3_3; # 7.4.1 ok - cabalInstall = self.cabalInstall_0_14_0; # 7.4.1 ok - alex = self.alex_3_0_1; # 7.4.1 ok - haddock = self.haddock_2_10_0; # 7.4.1 ok - happy = self.happy_1_18_9; # 7.4.1 ok + cgi = self.cgi_3001_1_7_4; + fgl = self.fgl_5_4_2_4; + GLUT = self.GLUT_2_1_2_1; + haskellSrc = self.haskellSrc_1_0_1_5; + html = self.html_1_0_1_2; + HTTP = self.HTTP_4000_2_3; + HUnit = self.HUnit_1_2_4_2; + mtl = self.mtl_2_1_1; + network = self.network_2_3_0_13; + OpenGL = self.OpenGL_2_2_3_1; + parallel = self.parallel_3_2_0_2; + parsec = self.parsec_3_1_2; + QuickCheck = self.QuickCheck_2_4_2; + random = self.random_1_0_1_1; + regexBase = self.regexBase_0_93_2; + regexCompat = self.regexCompat_0_95_1; + regexPosix = self.regexPosix_0_95_1; + stm = self.stm_2_3; + syb = self.syb_0_3_6_1; + text = self.text_0_11_2_0; + transformers = self.transformers_0_3_0_0; + xhtml = self.xhtml_3000_2_1; + zlib = self.zlib_0_5_3_3; + cabalInstall = self.cabalInstall_0_14_0; + alex = self.alex_3_0_1; + haddock = self.haddock_2_10_0; + happy = self.happy_1_18_9; }; haskellPlatform_2012_2_0_0 = From 7c6bc645bd7c230a4bcc75d9c9fa5e88faad64f8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 3 Dec 2013 21:59:54 +0100 Subject: [PATCH 030/152] haskell-GLUT: update to version 2.5.0.1 --- .../libraries/haskell/GLUT/{2.5.0.1.nix => 2.5.0.2.nix} | 4 ++-- pkgs/top-level/haskell-packages.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) rename pkgs/development/libraries/haskell/GLUT/{2.5.0.1.nix => 2.5.0.2.nix} (85%) diff --git a/pkgs/development/libraries/haskell/GLUT/2.5.0.1.nix b/pkgs/development/libraries/haskell/GLUT/2.5.0.2.nix similarity index 85% rename from pkgs/development/libraries/haskell/GLUT/2.5.0.1.nix rename to pkgs/development/libraries/haskell/GLUT/2.5.0.2.nix index f57cb34fb4a..da2c7f2b863 100644 --- a/pkgs/development/libraries/haskell/GLUT/2.5.0.1.nix +++ b/pkgs/development/libraries/haskell/GLUT/2.5.0.2.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "GLUT"; - version = "2.5.0.1"; - sha256 = "0f0bz64j7fxa0np8w53n51ri5m0pkwyc1kv7pvdnx02h181gl6l0"; + version = "2.5.0.2"; + sha256 = "0v6lwxn9karmym4fzd0hramcj86sb4wgiyqn47hmcg1dd1fsnhb5"; buildDepends = [ OpenGL OpenGLRaw ]; extraLibraries = [ freeglut libICE libSM libXi libXmu mesa ]; meta = { diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 492c1759f38..6c3788f0819 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -147,7 +147,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x caseInsensitive = self.caseInsensitive_1_1_0_1; cgi = self.cgi_3001_1_7_5; fgl = self.fgl_5_4_2_4; - GLUT = self.GLUT_2_5_0_1; + GLUT = self.GLUT_2_5_0_2; GLURaw = self.GLURaw_1_4_0_0; haskellSrc = self.haskellSrc_1_0_1_5; hashable = self.hashable_1_2_1_0; @@ -1124,7 +1124,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x GLUT_2_4_0_0 = callPackage ../development/libraries/haskell/GLUT/2.4.0.0.nix { OpenGL = self.OpenGL_2_8_0_0; }; - GLUT_2_5_0_1 = callPackage ../development/libraries/haskell/GLUT/2.5.0.1.nix { + GLUT_2_5_0_2 = callPackage ../development/libraries/haskell/GLUT/2.5.0.2.nix { OpenGL = self.OpenGL_2_9_1_0; }; GLUT = self.GLUT_2_5_0_1; From d0d8f88d9b385686b4ace869fddf821336d41c6c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 3 Dec 2013 22:01:15 +0100 Subject: [PATCH 031/152] haskell-packages.nix: disable transformers 0.3.0.0 when building with GHC 7.7 or later It's a core package now. --- pkgs/top-level/haskell-packages.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 6c3788f0819..266ad4f55ac 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -169,7 +169,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x stm = self.stm_2_4_2; syb = self.syb_0_4_1; text = self.text_0_11_3_1; - transformers = null; # this has become a core package in GHC 7.7 + transformers = self.transformers_0_3_0_0; # this has become a core package in GHC 7.7 unorderedContainers = self.unorderedContainers_0_2_3_3; vector = self.vector_0_10_9_1; xhtml = self.xhtml_3000_2_1; @@ -2179,7 +2179,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x tlsExtra = callPackage ../development/libraries/haskell/tls-extra {}; transformers_0_2_2_0 = callPackage ../development/libraries/haskell/transformers/0.2.2.0.nix {}; - transformers_0_3_0_0 = callPackage ../development/libraries/haskell/transformers/0.3.0.0.nix {}; + transformers_0_3_0_0 = if (pkgs.stdenv.lib.versionOlder ghc.version "7.7") then + (callPackage ../development/libraries/haskell/transformers/0.3.0.0.nix {}) else null; transformers = self.transformers_0_3_0_0; transformersBase = callPackage ../development/libraries/haskell/transformers-base {}; From f1633d5af90547f8927eecb61821eee640df9775 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 3 Dec 2013 22:02:24 +0100 Subject: [PATCH 032/152] haskell-packages.nix: update 'cgi' to version 3001.1.8.4 when building with GHC 7.7 or later Not that it helps much ... the package depends on MonadCatchIO-mtl, which is broken in the latest version of GHC. --- pkgs/top-level/haskell-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 266ad4f55ac..8698392c689 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -145,7 +145,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x async = self.async_2_0_1_4; attoparsec = self.attoparsec_0_10_4_0; caseInsensitive = self.caseInsensitive_1_1_0_1; - cgi = self.cgi_3001_1_7_5; + cgi = self.cgi_3001_1_8_4; fgl = self.fgl_5_4_2_4; GLUT = self.GLUT_2_5_0_2; GLURaw = self.GLURaw_1_4_0_0; From cf2fbb3502264bcf19ac53939f7fc401d79327d8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 3 Dec 2013 22:03:51 +0100 Subject: [PATCH 033/152] haskell-packages.nix: enable dynamic linking in GHC 7.7 or later The current snapshot requires shared libraries to be built (otherwise some packages won't build). I'm sure that's a mistake in the way it's configured that should be fixed. Anyway, enabling shared library support is an easy way out (and an interesting experiment). --- pkgs/top-level/haskell-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 8698392c689..6b7044d8729 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -60,8 +60,8 @@ { pkgs, newScope, ghc, prefFun, modifyPrio ? (x : x) , enableLibraryProfiling ? false -, enableSharedLibraries ? false -, enableSharedExecutables ? false +, enableSharedLibraries ? pkgs.stdenv.lib.versionOlder "7.7" ghc.version +, enableSharedExecutables ? pkgs.stdenv.lib.versionOlder "7.7" ghc.version , enableCheckPhase ? pkgs.stdenv.lib.versionOlder "7.4" ghc.version }: From e3c34c6b984cd39b3ee604537feb3233a4162a56 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 3 Dec 2013 22:04:21 +0100 Subject: [PATCH 034/152] cabal-install: jailbreak version 1.18.0.2 to fix the build with GHC 7.7 or later --- pkgs/tools/package-management/cabal-install/1.18.0.2.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/tools/package-management/cabal-install/1.18.0.2.nix b/pkgs/tools/package-management/cabal-install/1.18.0.2.nix index 9b56f60546c..3c1c6ddd133 100644 --- a/pkgs/tools/package-management/cabal-install/1.18.0.2.nix +++ b/pkgs/tools/package-management/cabal-install/1.18.0.2.nix @@ -20,6 +20,9 @@ cabal.mkDerivation (self: { mkdir $out/etc mv bash-completion $out/etc/bash_completion.d ''; + patchPhase = '' + sed -i -e 's|array .*,|array,|' cabal-install.cabal + ''; meta = { homepage = "http://www.haskell.org/cabal/"; description = "The command-line interface for Cabal and Hackage"; From eead1049e6d66c3dfedd8786bf426cc52b132323 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 3 Dec 2013 22:04:37 +0100 Subject: [PATCH 035/152] async: jailbreak version 2.0.1.4 to fix the build with GHC 7.7 or later --- pkgs/development/libraries/haskell/async/2.0.1.4.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/async/2.0.1.4.nix b/pkgs/development/libraries/haskell/async/2.0.1.4.nix index 5dd76b4d6e0..24fa64931a3 100644 --- a/pkgs/development/libraries/haskell/async/2.0.1.4.nix +++ b/pkgs/development/libraries/haskell/async/2.0.1.4.nix @@ -6,6 +6,7 @@ cabal.mkDerivation (self: { sha256 = "1hi40bjwpl65mz7zj0sgh16bp9dwafbm5ysi2q8fzwwq5l0zxpa1"; buildDepends = [ stm ]; testDepends = [ HUnit testFramework testFrameworkHunit ]; + jailbreak = true; meta = { homepage = "https://github.com/simonmar/async"; description = "Run IO operations asynchronously and wait for their results"; From fcc9ea7d4ce3be60575d875081e676f8ba40ef8c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 3 Dec 2013 22:07:30 +0100 Subject: [PATCH 036/152] haskell-network: update to version 2.4.2.1 --- .../libraries/haskell/network/{2.4.2.0.nix => 2.4.2.1.nix} | 4 ++-- pkgs/top-level/haskell-packages.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) rename pkgs/development/libraries/haskell/network/{2.4.2.0.nix => 2.4.2.1.nix} (85%) diff --git a/pkgs/development/libraries/haskell/network/2.4.2.0.nix b/pkgs/development/libraries/haskell/network/2.4.2.1.nix similarity index 85% rename from pkgs/development/libraries/haskell/network/2.4.2.0.nix rename to pkgs/development/libraries/haskell/network/2.4.2.1.nix index 2912138daf7..33a79a7eccf 100644 --- a/pkgs/development/libraries/haskell/network/2.4.2.0.nix +++ b/pkgs/development/libraries/haskell/network/2.4.2.1.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "network"; - version = "2.4.2.0"; - sha256 = "1v6iwww8xym0sr2593ri0aa6gcs6n2975fi9gaz9n7rizbqm88qs"; + version = "2.4.2.1"; + sha256 = "1rm8zlpy6738wxagk1xmlvawn807cd4xf2fn0hgjqj12scviz60p"; buildDepends = [ parsec ]; testDepends = [ HUnit testFramework testFrameworkHunit testFrameworkQuickcheck2 diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 6b7044d8729..b29d487c634 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -155,7 +155,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x HTTP = self.HTTP_4000_2_9; HUnit = self.HUnit_1_2_5_2; mtl = self.mtl_2_1_2; - network = self.network_2_4_2_0; + network = self.network_2_4_2_1; OpenGL = self.OpenGL_2_9_1_0; OpenGLRaw = self.OpenGLRaw_1_4_0_0; parallel = self.parallel_3_2_0_4; @@ -1600,8 +1600,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x network_2_3_0_13 = callPackage ../development/libraries/haskell/network/2.3.0.13.nix {}; network_2_3_1_0 = callPackage ../development/libraries/haskell/network/2.3.1.0.nix {}; network_2_4_1_2 = callPackage ../development/libraries/haskell/network/2.4.1.2.nix {}; - network_2_4_2_0 = callPackage ../development/libraries/haskell/network/2.4.2.0.nix {}; - network = self.network_2_4_2_0; + network_2_4_2_1 = callPackage ../development/libraries/haskell/network/2.4.2.1.nix {}; + network = self.network_2_4_2_1; networkConduit = callPackage ../development/libraries/haskell/network-conduit {}; networkConduitTls = callPackage ../development/libraries/haskell/network-conduit-tls {}; From a7bd862f0b2034156ba4b8e85af5af21d96e3016 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 3 Dec 2013 22:07:39 +0100 Subject: [PATCH 037/152] haskell-idris: update to version 0.9.10.1 --- pkgs/development/compilers/idris/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/idris/default.nix b/pkgs/development/compilers/idris/default.nix index 51f5759c5fe..4609dd0b442 100644 --- a/pkgs/development/compilers/idris/default.nix +++ b/pkgs/development/compilers/idris/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "idris"; - version = "0.9.10"; - sha256 = "0sbadjc4kj59f5240036pryxr4b6k6y2zkmszv99wq660mm7a3d3"; + version = "0.9.10.1"; + sha256 = "194gbpk8fy64maj9lcwj9hkbndc3287bh9mz2jm09vd11i23iyg1"; isLibrary = false; isExecutable = true; buildDepends = [ From 39ad23ba3593208a29c19cd1c8551f2b54b732c4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 3 Dec 2013 22:07:39 +0100 Subject: [PATCH 038/152] haskell-postgresql-libpq: update to version 0.8.2.5 --- .../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 53e6066f968..720f8e67629 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.4"; - sha256 = "1dqb4pnsvd6378rhmlhi151sin06wfm9sx12m3ir9x0j5ppb5sx6"; + version = "0.8.2.5"; + sha256 = "102sakvff53dald2s7pbf22m2rgv9761251hj7bwy125jssxcd15"; extraLibraries = [ postgresql ]; meta = { homepage = "http://github.com/lpsmith/postgresql-libpq"; From 7c6d83c550d7db73b5487d9ba1c32217b2c62ddf Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 3 Dec 2013 22:07:39 +0100 Subject: [PATCH 039/152] haskell-tasty: update to version 0.4.1.1 --- pkgs/development/libraries/haskell/tasty/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/tasty/default.nix b/pkgs/development/libraries/haskell/tasty/default.nix index 41fa16b916d..c2c05a68f07 100644 --- a/pkgs/development/libraries/haskell/tasty/default.nix +++ b/pkgs/development/libraries/haskell/tasty/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "tasty"; - version = "0.4.0.1"; - sha256 = "04nnjg04520lvjm8h2ma0ihm4bz6p0ppk445i8gmn82ixwan76h0"; + version = "0.4.1.1"; + sha256 = "09xha87ivkllczbf0vf2n8zjn1wa5g8v8j1h9ad3207r45ndzn0w"; buildDepends = [ ansiTerminal deepseq mtl optparseApplicative regexPosix stm tagged ]; From faa56cc80101da6dbfdb99e197f5e45b67b7a3d5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 3 Dec 2013 22:07:39 +0100 Subject: [PATCH 040/152] haskell-zeromq3-haskell: update to version 0.5.1 --- .../libraries/haskell/zeromq3-haskell/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/zeromq3-haskell/default.nix b/pkgs/development/libraries/haskell/zeromq3-haskell/default.nix index 1240d4390a6..a60bc457f85 100644 --- a/pkgs/development/libraries/haskell/zeromq3-haskell/default.nix +++ b/pkgs/development/libraries/haskell/zeromq3-haskell/default.nix @@ -4,13 +4,13 @@ cabal.mkDerivation (self: { pname = "zeromq3-haskell"; - version = "0.5"; - sha256 = "16qh3q5rshaxzl79aiivrysl3dhilnd2mw2p45ifgbgv87m277gq"; + version = "0.5.1"; + sha256 = "0jmdhs2apmcr3wf5r739gq9qqad59qj82h7qpdk3m4cc2a7djil0"; buildDepends = [ async MonadCatchIOTransformers semigroups transformers ]; testDepends = [ - ansiTerminal checkers MonadCatchIOTransformers QuickCheck + ansiTerminal async checkers MonadCatchIOTransformers QuickCheck transformers ]; extraLibraries = [ zeromq ]; From fd5f6e81f63ec6c32d3c26bf8d74990fdbd2090d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 3 Dec 2013 22:07:39 +0100 Subject: [PATCH 041/152] haskell-cabal2nix: update to version 1.56 --- pkgs/development/tools/haskell/cabal2nix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/haskell/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix index cc44268f3a3..fba8729ebbf 100644 --- a/pkgs/development/tools/haskell/cabal2nix/default.nix +++ b/pkgs/development/tools/haskell/cabal2nix/default.nix @@ -3,8 +3,8 @@ cabal.mkDerivation (self: { pname = "cabal2nix"; - version = "1.55"; - sha256 = "0rda8g595pr7vlhzyflw9kz6fw1iz76yimbl1zizgrnpnq3h11w3"; + version = "1.56"; + sha256 = "0sppg4ab62ql5hdd9cdhff4f5zy74si9h5rn3sqils0hwmxl86f8"; isLibrary = false; isExecutable = true; buildDepends = [ Cabal filepath hackageDb HTTP mtl regexPosix ]; From ad09a97845e869a8678446cc687359687cc49e4b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 3 Dec 2013 22:52:05 +0100 Subject: [PATCH 042/152] haskell-data-pprint: jailbreak to support GHC 7.7 or later --- pkgs/development/libraries/haskell/data-pprint/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/data-pprint/default.nix b/pkgs/development/libraries/haskell/data-pprint/default.nix index b78096a1835..08202a26b71 100644 --- a/pkgs/development/libraries/haskell/data-pprint/default.nix +++ b/pkgs/development/libraries/haskell/data-pprint/default.nix @@ -5,6 +5,7 @@ cabal.mkDerivation (self: { version = "0.2.3"; sha256 = "1ygbhn399d4hlrdjmg7gxbr5akydb78p6qa80rv7m6j0fsqzbf6y"; buildDepends = [ deepseq mtl parallel time ]; + jailbreak = true; meta = { description = "Prettyprint and compare Data values"; license = self.stdenv.lib.licenses.bsd3; From 3c181313e6ecac2229a09a82a694a809260c02b2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 4 Dec 2013 00:07:40 +0100 Subject: [PATCH 043/152] haskell-src-exts: drop obsolete version 1.13.5 --- .../{1.14.0.nix => default.nix} | 0 pkgs/top-level/haskell-packages.nix | 20 +++++-------------- 2 files changed, 5 insertions(+), 15 deletions(-) rename pkgs/development/libraries/haskell/haskell-src-exts/{1.14.0.nix => default.nix} (100%) diff --git a/pkgs/development/libraries/haskell/haskell-src-exts/1.14.0.nix b/pkgs/development/libraries/haskell/haskell-src-exts/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/haskell-src-exts/1.14.0.nix rename to pkgs/development/libraries/haskell/haskell-src-exts/default.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index b29d487c634..747ce660b51 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -874,9 +874,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x deepseqTh = callPackage ../development/libraries/haskell/deepseq-th {}; - derive = callPackage ../development/libraries/haskell/derive { - haskellSrcExts = self.haskellSrcExts_1_14_0; - }; + derive = callPackage ../development/libraries/haskell/derive {}; dependentMap = callPackage ../development/libraries/haskell/dependent-map {}; @@ -1191,9 +1189,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x haskellSrc_1_0_1_5 = callPackage ../development/libraries/haskell/haskell-src/1.0.1.5.nix {}; haskellSrc = self.haskellSrc_1_0_1_5; - haskellSrcExts_1_13_5 = callPackage ../development/libraries/haskell/haskell-src-exts/1.13.5.nix {}; - haskellSrcExts_1_14_0 = callPackage ../development/libraries/haskell/haskell-src-exts/1.14.0.nix {}; - haskellSrcExts = self.haskellSrcExts_1_14_0; + haskellSrcExts = callPackage ../development/libraries/haskell/haskell-src-exts {}; haskellSrcMeta = callPackage ../development/libraries/haskell/haskell-src-meta {}; @@ -1271,9 +1267,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x hoauth = callPackage ../development/libraries/haskell/hoauth {}; - hoogle = callPackage ../development/libraries/haskell/hoogle { - haskellSrcExts = self.haskellSrcExts_1_14_0; - }; + hoogle = callPackage ../development/libraries/haskell/hoogle {}; hopenssl = callPackage ../development/libraries/haskell/hopenssl {}; @@ -1992,9 +1986,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x strptime = callPackage ../development/libraries/haskell/strptime {}; - stylishHaskell = callPackage ../development/libraries/haskell/stylish-haskell { - haskellSrcExts = self.haskellSrcExts_1_14_0; - }; + stylishHaskell = callPackage ../development/libraries/haskell/stylish-haskell {}; syb_0_2_2 = callPackage ../development/libraries/haskell/syb/0.2.2.nix {}; syb_0_3 = callPackage ../development/libraries/haskell/syb/0.3.nix {}; @@ -2507,9 +2499,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x hdevtools = callPackage ../development/tools/haskell/hdevtools {}; - hlint = callPackage ../development/tools/haskell/hlint { - haskellSrcExts = self.haskellSrcExts_1_14_0; - }; + hlint = callPackage ../development/tools/haskell/hlint {}; hslogger = callPackage ../development/tools/haskell/hslogger {}; From 342e71ba921c6a2591f3d1d01e754959cc378b2a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 4 Dec 2013 00:15:24 +0100 Subject: [PATCH 044/152] haskell-src-exts: clean out the obsolete happy parser that's included in the distribution tarball --- pkgs/development/libraries/haskell/haskell-src-exts/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/haskell-src-exts/default.nix b/pkgs/development/libraries/haskell/haskell-src-exts/default.nix index 16595e33156..b044437e527 100644 --- a/pkgs/development/libraries/haskell/haskell-src-exts/default.nix +++ b/pkgs/development/libraries/haskell/haskell-src-exts/default.nix @@ -12,6 +12,7 @@ cabal.mkDerivation (self: { ]; buildTools = [ happy ]; doCheck = false; + preConfigure = "runhaskell Setup.hs clean"; meta = { homepage = "https://github.com/haskell-suite/haskell-src-exts"; description = "Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer"; From b0674055408d74292eddd241b3574b23e387cac2 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Tue, 26 Nov 2013 11:41:58 +0200 Subject: [PATCH 045/152] kde4.krename: update from 4.0.4 to 4.0.9 --- pkgs/applications/misc/krename/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/krename/default.nix b/pkgs/applications/misc/krename/default.nix index e5af706d41c..75d8e5ecb89 100644 --- a/pkgs/applications/misc/krename/default.nix +++ b/pkgs/applications/misc/krename/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, automoc4, kdelibs, taglib, exiv2, podofo, gettext, qt4, phonon }: stdenv.mkDerivation rec { - name = "krename-4.0.4"; + name = "krename-4.0.9"; src = fetchurl { url = "mirror://sourceforge/krename/${name}.tar.bz2"; - sha256 = "12qhclw1vbg5bv6619qd4408y8d1w26499gcr8gwhgfzk0v83hic"; + sha256 = "11bdg5vdcs393n0aibhm3jh3wxlk5kz78jhkwf7cj9086qkg9wds"; }; buildInputs = [ cmake automoc4 kdelibs taglib exiv2 podofo gettext qt4 phonon ]; From d5c1d33a23e58a3407e4e977af059c70ed015500 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Tue, 3 Dec 2013 09:43:29 +0200 Subject: [PATCH 046/152] clamav: update from 0.97.5 to 0.97.8, potentially fixes CVE-2013-2020, CVE-2013-2021 --- pkgs/tools/security/clamav/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/clamav/default.nix b/pkgs/tools/security/clamav/default.nix index ec00137b36f..858320004b8 100644 --- a/pkgs/tools/security/clamav/default.nix +++ b/pkgs/tools/security/clamav/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, zlib, bzip2, libiconv }: stdenv.mkDerivation rec { name = "clamav-${version}"; - version = "0.97.5"; + version = "0.97.8"; src = fetchurl { url = "mirror://sourceforge/clamav/clamav-${version}.tar.gz"; - sha256 = "039wm64wl2sx7k019g5ll5dkdlsq64fnd0ng0s00pjn8bqd5wv6v"; + sha256 = "04pwm8a84silnvgimn2wi2wgwdzwpskybx72mp10ni1dd7yvswnq"; }; buildInputs = [ zlib bzip2 libiconv ]; From 78f33605e5cd6507c04ff2c46966c386dea4469a Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 4 Dec 2013 03:22:35 +0200 Subject: [PATCH 047/152] kde4.quasselDaemon: update from 0.9.0 to 0.9.2, potentially fixes CVE-2013-4422 --- pkgs/applications/networking/irc/quassel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/irc/quassel/default.nix b/pkgs/applications/networking/irc/quassel/default.nix index 67ff1ca02c4..44792693b36 100644 --- a/pkgs/applications/networking/irc/quassel/default.nix +++ b/pkgs/applications/networking/irc/quassel/default.nix @@ -11,11 +11,11 @@ let in with stdenv; mkDerivation rec { - name = "quassel-0.9.0"; + name = "quassel-0.9.2"; src = fetchurl { url = "http://quassel-irc.org/pub/${name}.tar.bz2"; - sha256 = "09v0igjkzan3hllk47w39hkav6v1419vpxn2lfd8473kwdmf0grf"; + sha256 = "1h2kzi4pgfv3qmvhxix9fffdjixs3bsya0i5c18dkh894mh02kgh"; }; buildInputs = [ cmake qt4 ] From 9a67a50210aaf06b11862dfdfed1fb7acd16fbbe Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 4 Dec 2013 03:33:33 +0200 Subject: [PATCH 048/152] libinfinity: update from 0.5.3 to 0.5.4 --- pkgs/development/libraries/libinfinity/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libinfinity/default.nix b/pkgs/development/libraries/libinfinity/default.nix index b8a815e4a6f..c305239e6e2 100644 --- a/pkgs/development/libraries/libinfinity/default.nix +++ b/pkgs/development/libraries/libinfinity/default.nix @@ -11,10 +11,10 @@ let in stdenv.mkDerivation rec { - name = "libinfinity-0.5.3"; + name = "libinfinity-0.5.4"; src = fetchurl { url = "http://releases.0x539.de/libinfinity/${name}.tar.gz"; - sha256 = "04qa3ky2skhc9b5f9i9sc8hci3ykklqznmgy616yzs3n22bmax9j"; + sha256 = "1i7nj8qjay6amg455mwhhfqjvxnfyyql9y40a6a4a3ky170ly004"; }; buildInputs = [ pkgconfig glib libxml2 gsasl libidn gss ] From 135920b2ebde78a85f724117b69e41967061d623 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 4 Dec 2013 03:35:41 +0200 Subject: [PATCH 049/152] libtorrentRasterbar: update from 0.16.8 to 0.16.12 --- pkgs/development/libraries/libtorrent-rasterbar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libtorrent-rasterbar/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/default.nix index 517fbf2bd43..7c3e7ed69a9 100644 --- a/pkgs/development/libraries/libtorrent-rasterbar/default.nix +++ b/pkgs/development/libraries/libtorrent-rasterbar/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libtorrent-rasterbar-${version}"; - version = "0.16.8"; + version = "0.16.12"; src = fetchurl { url = "http://libtorrent.googlecode.com/files/${name}.tar.gz"; - sha256 = "01jxhyndqkc0qag22s5w0vs63hlp4rr4bca8k7fj37gky7w119c0"; + sha256 = "0s2nxhz4d93xcl6hchmfgi8hq7aw8mrkgixh5an7fbk4shswpcg8"; }; buildInputs = [ boost pkgconfig openssl zlib python ]; From a0c425144ef9ee3c5e2dfa1b43de1ed1b516938a Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 4 Dec 2013 03:39:08 +0200 Subject: [PATCH 050/152] libxmlxx: update from 2.30.0 to 2.30.1 --- pkgs/development/libraries/libxmlxx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libxmlxx/default.nix b/pkgs/development/libraries/libxmlxx/default.nix index 36c8073348d..37f03a1dfb6 100644 --- a/pkgs/development/libraries/libxmlxx/default.nix +++ b/pkgs/development/libraries/libxmlxx/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl , pkgconfig, libxml2, glibmm, perl }: stdenv.mkDerivation rec { - name = "libxml++-2.30.0"; + name = "libxml++-2.30.1"; src = fetchurl { url = "mirror://gnome/sources/libxml++/2.30/${name}.tar.bz2"; - sha256 = "1hgpw9lld0k6z34kxrapz8dxf3cbgnnhkx6himnvw9ax3qf7p5gk"; + sha256 = "02mrib11cjx5fshdr8p1biwvyl0xfkf86b6nh8ashwv590v0wgs3"; }; buildInputs = [ pkgconfig glibmm perl ]; From 1fba241e7d9048a70592e370a398d10112ea824f Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 4 Dec 2013 03:41:12 +0200 Subject: [PATCH 051/152] polipo: update from 1.0.4 to 1.0.4.1 --- pkgs/servers/polipo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/polipo/default.nix b/pkgs/servers/polipo/default.nix index 80865478746..3e49715b94d 100644 --- a/pkgs/servers/polipo/default.nix +++ b/pkgs/servers/polipo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "polipo-${version}"; - version = "1.0.4"; + version = "1.0.4.1"; src = fetchurl { url = "http://freehaven.net/~chrisd/polipo/${name}.tar.gz"; - sha256 = "0dh4kjj6vfb75nxv7q3y2kvxsq8cwrd8svsrypa810jln8x8lign"; + sha256 = "1ykwkyvmdw6fsaj2hc40971pkwf60hvi9c43whijim00qvgbyvwd"; }; buildInputs = [ texinfo ]; From ef4c8776b7bd6713ddfe946ed21f143fb019706f Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 4 Dec 2013 03:42:47 +0200 Subject: [PATCH 052/152] vidalia: update from 0.2.21 to 0.3.1 --- pkgs/tools/security/vidalia/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/vidalia/default.nix b/pkgs/tools/security/vidalia/default.nix index 6f34d61908e..845bbd81617 100644 --- a/pkgs/tools/security/vidalia/default.nix +++ b/pkgs/tools/security/vidalia/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "vidalia-${version}"; - version = "0.2.21"; + version = "0.3.1"; src = fetchurl { url = "https://www.torproject.org/dist/vidalia/${name}.tar.gz"; - sha256 = "1rqvvhdqgk6jqrd15invvc4r7p4nckd3b93hhr5dzpc1fxz8w064"; + sha256 = "1mw3wnlh18rj20qjv7jxjk3a8mf75p5wzv358qfs3sm3lqgd68qm"; }; buildInputs = [ cmake qt4 ]; From 1c3da8882d5c6e85a3dba29cf6e2371c74c0338b Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Wed, 4 Dec 2013 03:46:57 +0200 Subject: [PATCH 053/152] vidalia: generate documentation --- pkgs/tools/security/vidalia/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/vidalia/default.nix b/pkgs/tools/security/vidalia/default.nix index 845bbd81617..4d216bee0b6 100644 --- a/pkgs/tools/security/vidalia/default.nix +++ b/pkgs/tools/security/vidalia/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, qt4 }: +{ stdenv, fetchurl, cmake, qt4, doxygen }: stdenv.mkDerivation rec { name = "vidalia-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1mw3wnlh18rj20qjv7jxjk3a8mf75p5wzv358qfs3sm3lqgd68qm"; }; - buildInputs = [ cmake qt4 ]; + buildInputs = [ cmake qt4 doxygen ]; meta = with stdenv.lib; { homepage = https://www.torproject.org/projects/vidalia.html.en; From f25d2c2fd4f6590d0999d31a70bb9a6d87b577a0 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Wed, 4 Dec 2013 03:53:50 +0200 Subject: [PATCH 054/152] lshw: update to 2.17b --- pkgs/tools/system/lshw/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/lshw/default.nix b/pkgs/tools/system/lshw/default.nix index 930cb7b7bff..ccda9be9f03 100644 --- a/pkgs/tools/system/lshw/default.nix +++ b/pkgs/tools/system/lshw/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "lshw-${version}"; - version = "02.15b"; + version = "02.17b"; src = fetchurl { - url = http://ezix.org/software/files/lshw-B.02.15.tar.gz; - sha256 = "19im6yj1pmsbrwkvdmgshllhiw7jh6nzhr6dc777q1n99g3cw0gv"; + url = http://ezix.org/software/files/lshw-B.02.17.tar.gz; + sha256 = "1728b96gyjmrp31knzips9azn6wkfdp5k5dnbil7h7hgz99w177b"; }; buildInputs = [] ++ stdenv.lib.optional withGUI [ gtk pkgconfig sqlite ]; From d2799c16336fe7b9c10ba364aedf2edf25eef18d Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 4 Dec 2013 03:54:34 +0200 Subject: [PATCH 055/152] spring: update from 94.1 to 95.0 --- pkgs/games/spring/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/spring/default.nix b/pkgs/games/spring/default.nix index 109cb239d2b..99f80c1a5da 100644 --- a/pkgs/games/spring/default.nix +++ b/pkgs/games/spring/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "spring-${version}"; - version = "94.1"; + version = "95.0"; src = fetchurl { url = "mirror://sourceforge/springrts/spring_${version}_src.tar.lzma"; - sha256 = "19myqwpz4mi4zdlcv8318dps0ymmw7qpawhq1rgk73ycmaiyaaka"; + sha256 = "0g0jfbbxl1g8nasibw13yjnsgalnfn4s2ii5z4s8k87vla9apg1v"; }; buildInputs = [ cmake lzma boost libdevil zlib p7zip openal libvorbis freetype SDL From 29c3424c133ab9e76afe81582fc1128e6fdde5ef Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 4 Dec 2013 03:57:15 +0200 Subject: [PATCH 056/152] springLobby: update from 0.169 to 0.176 --- pkgs/games/spring/springlobby.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/spring/springlobby.nix b/pkgs/games/spring/springlobby.nix index b78fd7d7788..546f9a42965 100644 --- a/pkgs/games/spring/springlobby.nix +++ b/pkgs/games/spring/springlobby.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "springlobby-${version}"; - version = "0.169"; + version = "0.176"; src = fetchurl { url = "http://www.springlobby.info/tarballs/springlobby-${version}.tar.bz2"; - sha256 = "1wr8q2ha3wh718rr5rg7l6v404nf1rgkg4wkja77rfqy7r18zn7g"; + sha256 = "0a5pnd15rlvbkvnz2s0axy3i7m2jlrk91kjpwflnrcqlf42c2rk9"; }; buildInputs = [ cmake wxGTK openal pkgconfig curl gettext libtorrentRasterbar boost libpng libX11 ]; From 42a5c9d6373867cd89d390f2e044075f6c1e2abf Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Wed, 4 Dec 2013 04:25:05 +0200 Subject: [PATCH 057/152] spring-lobby: add extra dependencies --- pkgs/games/spring/springlobby.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/games/spring/springlobby.nix b/pkgs/games/spring/springlobby.nix index 546f9a42965..ac4869f7838 100644 --- a/pkgs/games/spring/springlobby.nix +++ b/pkgs/games/spring/springlobby.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, wxGTK, openal, pkgconfig, curl, libtorrentRasterbar, libpng, libX11 -, gettext, bash, gawk, boost}: +, gettext, bash, gawk, boost, libnotify, gtk, doxygen }: stdenv.mkDerivation rec { name = "springlobby-${version}"; @@ -10,7 +10,10 @@ stdenv.mkDerivation rec { sha256 = "0a5pnd15rlvbkvnz2s0axy3i7m2jlrk91kjpwflnrcqlf42c2rk9"; }; - buildInputs = [ cmake wxGTK openal pkgconfig curl gettext libtorrentRasterbar boost libpng libX11 ]; + buildInputs = [ + cmake wxGTK openal pkgconfig curl gettext libtorrentRasterbar boost libpng libX11 + libnotify gtk doxygen + ]; prePatch = '' substituteInPlace tools/regen_config_header.sh --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash" From 3837210feddf342c33f99de59dc4a95b36308af2 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 4 Dec 2013 04:25:26 +0200 Subject: [PATCH 058/152] privoxy: update from 3.0.12 to 3.0.21, potentially fixes CVE-2013-2503 --- pkgs/tools/networking/privoxy/default.nix | 8 +-- .../privoxy/disable-user-error.patch | 66 ------------------- 2 files changed, 3 insertions(+), 71 deletions(-) delete mode 100644 pkgs/tools/networking/privoxy/disable-user-error.patch diff --git a/pkgs/tools/networking/privoxy/default.nix b/pkgs/tools/networking/privoxy/default.nix index 8af67aed1d4..6fff52c63bd 100644 --- a/pkgs/tools/networking/privoxy/default.nix +++ b/pkgs/tools/networking/privoxy/default.nix @@ -1,17 +1,15 @@ {stdenv, fetchurl, autoconf, automake, zlib, pcre, w3m}: stdenv.mkDerivation { - name = "privoxy-3.0.12"; + name = "privoxy-3.0.21"; src = fetchurl { - url = mirror://sourceforge/ijbswa/Sources/3.0.12%20%28stable%29/privoxy-3.0.12-stable-src.tar.gz; - sha256 = "16ngim1p4pb4zk8h7js4zjw280fxqxamasfngixikp2ivmzxl469"; + url = mirror://sourceforge/ijbswa/Sources/3.0.21%20%28stable%29/privoxy-3.0.21-stable-src.tar.gz; + sha256 = "1f6xb7aa47p90c26vqaw74y6drs9gpnhxsgby3mx0awdjh0ydisy"; }; buildInputs = [automake autoconf zlib pcre w3m]; - patches = [./disable-user-error.patch]; - preConfigure = '' autoheader autoconf diff --git a/pkgs/tools/networking/privoxy/disable-user-error.patch b/pkgs/tools/networking/privoxy/disable-user-error.patch deleted file mode 100644 index c2576409c6d..00000000000 --- a/pkgs/tools/networking/privoxy/disable-user-error.patch +++ /dev/null @@ -1,66 +0,0 @@ -diff -rc privoxy-3.0.12-stable/configure.in privoxy-3.0.12-stable-new/configure.in -*** privoxy-3.0.12-stable/configure.in 2009-03-21 11:45:06.000000000 +0100 ---- privoxy-3.0.12-stable-new/configure.in 2009-10-05 15:39:53.683884809 +0200 -*************** -*** 652,659 **** - AC_PROG_AWK - - AC_CHECK_PROG(GDB,gdb,yes,no) -! AC_PATH_PROG(BGROUPS,groups,no,/bin:/usr/bin:/usr/local/bin) -! AC_PATH_PROG(ID,id,no,/bin:/usr/bin:/usr/local/bin) - AC_SUBST(ID) - AC_SUBST(BGROUPS) - ---- 652,659 ---- - AC_PROG_AWK - - AC_CHECK_PROG(GDB,gdb,yes,no) -! AC_PATH_PROG(BGROUPS,groups,no,$PATH) -! AC_PATH_PROG(ID,id,no,$PATH) - AC_SUBST(ID) - AC_SUBST(BGROUPS) - -*************** -*** 715,721 **** - if test $? -eq 0 ; then - USER=$with_user; - else -! AC_MSG_ERROR(There is no user '$with_user' on this system) - fi - fi - else ---- 715,721 ---- - if test $? -eq 0 ; then - USER=$with_user; - else -! AC_MSG_WARN(There is no user '$with_user' on this system) - fi - fi - else -*************** -*** 747,758 **** - # FIXME: this fails if valid group, but not first group - # listed. - if test "$with_group" != "`$BGROUPS $USER | sed 's/.*: //' 2>/dev/null |$AWK '{print $1}'`" ; then -! AC_MSG_ERROR(The given value '$withval' does not match group entry) - else - GROUP=$with_group; - fi - else -! AC_MSG_ERROR(There is no group entry for user '$USER') - fi - fi - else ---- 747,758 ---- - # FIXME: this fails if valid group, but not first group - # listed. - if test "$with_group" != "`$BGROUPS $USER | sed 's/.*: //' 2>/dev/null |$AWK '{print $1}'`" ; then -! AC_MSG_WARN(The given value '$withval' does not match group entry) - else - GROUP=$with_group; - fi - else -! AC_MSG_WARN(There is no group entry for user '$USER') - fi - fi - else From b0d281dd58851778adc507341eb3a367cb6b1395 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Wed, 4 Dec 2013 04:41:25 +0200 Subject: [PATCH 059/152] privoxy: update the build script, add documentation dependency --- pkgs/tools/networking/privoxy/default.nix | 15 +++++++++------ pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/networking/privoxy/default.nix b/pkgs/tools/networking/privoxy/default.nix index 6fff52c63bd..c6a57c238a4 100644 --- a/pkgs/tools/networking/privoxy/default.nix +++ b/pkgs/tools/networking/privoxy/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, autoconf, automake, zlib, pcre, w3m}: +{ stdenv, fetchurl, autoreconfHook, zlib, pcre, w3m, man }: stdenv.mkDerivation { name = "privoxy-3.0.21"; @@ -8,10 +8,13 @@ stdenv.mkDerivation { sha256 = "1f6xb7aa47p90c26vqaw74y6drs9gpnhxsgby3mx0awdjh0ydisy"; }; - buildInputs = [automake autoconf zlib pcre w3m]; + buildInputs = [ autoreconfHook zlib pcre w3m man ]; - preConfigure = '' - autoheader - autoconf - ''; + meta = with stdenv.lib; { + homepage = http://www.privoxy.org/; + description = "Non-caching web proxy with advanced filtering capabilities"; + license = licenses.gpl2; + platforms = platforms.all; + maintainers = [ maintainers.phreedom ]; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7461f093de4..e107812ef9a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1868,9 +1868,7 @@ let sitecopy = callPackage ../tools/networking/sitecopy { }; - privoxy = callPackage ../tools/networking/privoxy { - autoconf = autoconf213; - }; + privoxy = callPackage ../tools/networking/privoxy { }; tarsnap = callPackage ../tools/backup/tarsnap { }; From ae7be783a23befc2135e5e3896cca029a70ec779 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 4 Dec 2013 04:49:13 +0200 Subject: [PATCH 060/152] torcs: update from 1.3.2 to 1.3.5, potentially fixes CVE-2012-1189 --- pkgs/games/torcs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/torcs/default.nix b/pkgs/games/torcs/default.nix index 9f1fdedd577..47316177115 100644 --- a/pkgs/games/torcs/default.nix +++ b/pkgs/games/torcs/default.nix @@ -3,11 +3,11 @@ libXext, libSM, libICE, libXi, libXt, libXrender, libXxf86vm, libvorbis, libpng, zlib, bash }: stdenv.mkDerivation rec { - name = "torcs-1.3.2"; + name = "torcs-1.3.5"; src = fetchurl { url = "mirror://sourceforge/torcs/${name}.tar.bz2"; - sha256 = "0171ixhnd9cs8jkwa5awrxklfgyykcbc9m8270b8cw30lsx7qhp1"; + sha256 = "170ff98smkkv1sk4nbz9w0alhmmbr32djmgbc08lcfhf0lj2ni38"; }; patchPhase = '' From 22bd6c8efd9332305810f74dd46df7922d14d9fa Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 4 Dec 2013 04:57:26 +0200 Subject: [PATCH 061/152] varnish: update from 3.0.4 to 3.0.5, potentially fixes CVE-2013-4484 --- pkgs/servers/varnish/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix index 7c487961438..8ff26a38808 100644 --- a/pkgs/servers/varnish/default.nix +++ b/pkgs/servers/varnish/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pcre, libxslt, groff, ncurses, pkgconfig, readline }: stdenv.mkDerivation rec { - version = "3.0.4"; + version = "3.0.5"; name = "varnish-${version}"; src = fetchurl { url = "http://repo.varnish-cache.org/source/${name}.tar.gz"; - sha256 = "0y8gml06h3wjiasfqnk7f9wrfrlgx89qz04wz3fjn8knbk5lq12f"; + sha256 = "1dz2gazqczfzahh2n0aw71i5g9cpn5d98p9gj6ilqlkiqypxcbrh"; }; buildInputs = [ pcre libxslt groff ncurses pkgconfig readline ]; From 407c0be9355a8604f370dd682346a0f50b047188 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 4 Dec 2013 04:58:50 +0200 Subject: [PATCH 062/152] unixODBC: update from 2.3.1 to 2.3.2, potentially fixes CVE-2012-2657, CVE-2012-2658 --- pkgs/development/libraries/unixODBC/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/unixODBC/default.nix b/pkgs/development/libraries/unixODBC/default.nix index 74c822e2885..ef8dcdc5329 100644 --- a/pkgs/development/libraries/unixODBC/default.nix +++ b/pkgs/development/libraries/unixODBC/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "unixODBC-2.3.1"; + name = "unixODBC-2.3.2"; src = fetchurl { url = "ftp://ftp.unixodbc.org/pub/unixODBC/${name}.tar.gz"; - md5 = "86788d4006620fa1f171c13d07fdcaab"; + sha256 = "16jw5fq7wgfky6ak1h2j2pqx99jivsdl4q8aq6immpr55xs5jd4w"; }; configureFlags = "--disable-gui --sysconfdir=/etc"; } From b296f02449c6e9298f00b2e9a32ce168a2e6ade4 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 4 Dec 2013 05:00:42 +0200 Subject: [PATCH 063/152] squid: update from 3.1.15 to 3.1.23, potentially fixes CVE-2012-5643, CVE-2013-0189 --- pkgs/servers/squid/squids.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/squid/squids.nix b/pkgs/servers/squid/squids.nix index 22aba3e156f..a94c05d5627 100644 --- a/pkgs/servers/squid/squids.nix +++ b/pkgs/servers/squid/squids.nix @@ -22,10 +22,10 @@ rec { }; squid31 = squid30.merge { - name = "squid-3.1.15"; + name = "squid-3.1.23"; src = args.fetchurl { - url = http://www.squid-cache.org/Versions/v3/3.1/squid-3.1.15.tar.bz2; - sha256 = "1300f44dd4783697bacc262a7a9b32dbc9f550367fe82b70262864fdff715a35"; + url = http://www.squid-cache.org/Versions/v3/3.1/squid-3.1.23.tar.bz2; + sha256 = "13g4y0gg48xnlzrvpymb08gh25xi50y383faapkxws7i7v94305s"; }; }; From 5677898e9de405f2e2903f361bae25b942d8d804 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 4 Dec 2013 05:04:51 +0200 Subject: [PATCH 064/152] rsyslog: update from 7.2.6 to 7.2.7, potentially fixes CVE-2013-4758 --- pkgs/tools/system/rsyslog/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix index 3b5c0648384..c4e955056f4 100644 --- a/pkgs/tools/system/rsyslog/default.nix +++ b/pkgs/tools/system/rsyslog/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, eventlog, pkgconfig, libestr, libee, json_c, libuuid, zlib, gnutls}: stdenv.mkDerivation { - name = "rsyslog-7.2.6"; + name = "rsyslog-7.2.7"; src = fetchurl { - url = http://www.rsyslog.com/files/download/rsyslog/rsyslog-7.2.6.tar.gz; - sha256 = "19a5c60816ebce6c86468eb8c5fe1c4cc1febf23c9167ce59d2327fe5e047ed9"; + url = http://www.rsyslog.com/files/download/rsyslog/rsyslog-7.2.7.tar.gz; + sha256 = "0vgrbbklsvnwcy0m0kbxcj5lhpn2k9bsv0lh0vnyn6hc2hx56cs8"; }; buildInputs = [pkgconfig libestr libee json_c libuuid zlib gnutls]; From 13f98c6e40d61cab2c3cbbe486083ea805631dbb Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 4 Dec 2013 05:05:56 +0200 Subject: [PATCH 065/152] libestr: update from 0.1.4 to 0.1.9 --- pkgs/development/libraries/libestr/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libestr/default.nix b/pkgs/development/libraries/libestr/default.nix index 74d86667b5b..271311cf46c 100644 --- a/pkgs/development/libraries/libestr/default.nix +++ b/pkgs/development/libraries/libestr/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl }: stdenv.mkDerivation { - name = "libestr-0.1.4"; + name = "libestr-0.1.9"; src = fetchurl { - url = http://libestr.adiscon.com/files/download/libestr-0.1.4.tar.gz; - sha256 = "1qw5vqryawdm434l9ql3r160ap2f5mmp7b6pciac7qli62y0a2z3"; + url = http://libestr.adiscon.com/files/download/libestr-0.1.9.tar.gz; + sha256 = "06km9mlw5qq4aa7503l81d0qcghzl0n3lh0z41r1xjpa04nnwb42"; }; } From e72352761c999e0b67c998213c1dcbaf3c345beb Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 4 Dec 2013 05:07:47 +0200 Subject: [PATCH 066/152] tomcat6: update from 6.0.32 to 6.0.37, potentially fixes CVE-2012-0022, CVE-2012-2733, CVE-2012-3544, CVE-2012-3546, CVE-2012-4431, CVE-2012-4534, CVE-2012-5568, CVE-2012-5885, CVE-2012-5886, CVE-2012-5887, CVE-2013-2067 --- pkgs/servers/http/tomcat/6.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/tomcat/6.0.nix b/pkgs/servers/http/tomcat/6.0.nix index 79393a5d7cf..d8304ba4dbe 100644 --- a/pkgs/servers/http/tomcat/6.0.nix +++ b/pkgs/servers/http/tomcat/6.0.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl }: -let version = "6.0.32"; in +let version = "6.0.37"; in stdenv.mkDerivation rec { name = "apache-tomcat-${version}"; src = fetchurl { url = "mirror://apache/tomcat/tomcat-6/v${version}/bin/${name}.tar.gz"; - sha256 = "505e649d1ffcf746e66be8295c8244a2949349dedf678e9f2a659c4736968c5e"; + sha256 = "000v63amhbyp8nkw3a4pff1vm4nxri5n9j7rknhnqaxzab3sp49y"; }; installPhase = From 56c9ae9b1d65ea4dd1594b4d8417f7c1d21cbfe1 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 4 Dec 2013 05:10:30 +0200 Subject: [PATCH 067/152] rubygems: update from 1.8.17 to 1.8.25, potentially fixes CVE-2012-2125, CVE-2012-2126, CVE-2013-4287, CVE-2013-4363 --- pkgs/development/interpreters/ruby/rubygems.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/ruby/rubygems.nix b/pkgs/development/interpreters/ruby/rubygems.nix index 40a43e27453..22076d5ed9e 100644 --- a/pkgs/development/interpreters/ruby/rubygems.nix +++ b/pkgs/development/interpreters/ruby/rubygems.nix @@ -1,10 +1,10 @@ args : with args; rec { - version = "1.8.17"; + version = "1.8.25"; src = fetchurl { url = "http://production.cf.rubygems.org/rubygems/${name}.tgz"; - sha256 = "068sr55r8wiw55bpf93pp07871cbqhxk9cxma6arhd04j7n8ppph"; + sha256 = "1j0wiy829nsfrpdzr9xzs39jf1lga3f5b7773vxqfs3lz3fli4v4"; }; buildInputs = [ruby makeWrapper]; From 7b68782e8f57e93968401dffe8599f2c90492a91 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Wed, 4 Dec 2013 05:24:02 +0200 Subject: [PATCH 068/152] spring: add some of the missing dependencies --- pkgs/games/spring/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/games/spring/default.nix b/pkgs/games/spring/default.nix index 99f80c1a5da..70cffaa192e 100644 --- a/pkgs/games/spring/default.nix +++ b/pkgs/games/spring/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, cmake, lzma, boost, libdevil, zlib, p7zip , openal, libvorbis, glew, freetype, xlibs, SDL, mesa, binutils +, asciidoc, libxslt, docbook_xsl, curl , jdk ? null, python ? null , withAI ? true # support for AI Interfaces and Skirmish AIs }: @@ -14,7 +15,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ cmake lzma boost libdevil zlib p7zip openal libvorbis freetype SDL - xlibs.libX11 xlibs.libXcursor mesa glew ] + xlibs.libX11 xlibs.libXcursor mesa glew asciidoc libxslt docbook_xsl curl ] ++ stdenv.lib.optional withAI jdk ++ stdenv.lib.optional withAI python; From e3f69c5dcceb1998d461e23ff4d35da235de636b Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 4 Dec 2013 05:25:38 +0200 Subject: [PATCH 069/152] python33Packages.pycrypto: update from 2.6 to 2.6.1, potentially fixes CVE-2013-1445 --- pkgs/development/python-modules/pycrypto/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pycrypto/default.nix b/pkgs/development/python-modules/pycrypto/default.nix index 0ad1663da65..ec741ba247e 100644 --- a/pkgs/development/python-modules/pycrypto/default.nix +++ b/pkgs/development/python-modules/pycrypto/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, python, buildPythonPackage, gmp }: buildPythonPackage rec { - name = "pycrypto-2.6"; + name = "pycrypto-2.6.1"; namePrefix = ""; src = fetchurl { url = "http://pypi.python.org/packages/source/p/pycrypto/${name}.tar.gz"; - md5 = "88dad0a270d1fe83a39e0467a66a22bb"; + sha256 = "0g0ayql5b9mkjam8hym6zyg6bv77lbh66rv1fyvgqb17kfc1xkpj"; }; buildInputs = [ python gmp ]; From a830c0eb9d260ce158d0d404dd6de128d739919b Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 4 Dec 2013 05:26:34 +0200 Subject: [PATCH 070/152] pyopenssl: update from 0.13 to 0.13.1, potentially fixes CVE-2013-4314 --- pkgs/development/python-modules/pyopenssl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyopenssl/default.nix b/pkgs/development/python-modules/pyopenssl/default.nix index 1d4fe53117c..5f92e2cf202 100644 --- a/pkgs/development/python-modules/pyopenssl/default.nix +++ b/pkgs/development/python-modules/pyopenssl/default.nix @@ -2,7 +2,7 @@ a : let fetchurl = a.fetchurl; - version = a.lib.attrByPath ["version"] "0.13" a; + version = a.lib.attrByPath ["version"] "0.13.1" a; propagatedBuildInputs = with a; [ openssl python ]; @@ -10,7 +10,7 @@ in rec { src = fetchurl { url = "http://pypi.python.org/packages/source/p/pyOpenSSL/pyOpenSSL-${version}.tar.gz"; - sha256 = "21e12b03abaa0e04ecc8cd9c251598f71bae11c9f385304234e4ea5618c6163b"; + sha256 = "1nrg2kas0wsv65j8sia8zkkc6ir5i20lrhkfavjxzxhl0iqyq1ms"; }; inherit propagatedBuildInputs; From 03b15f94094322b3dd94a3c7ed96faff8010c932 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 4 Dec 2013 05:30:48 +0200 Subject: [PATCH 071/152] mongodb: update from 2.4.5 to 2.4.8, potentially fixes CVE-2013-2132 --- pkgs/servers/nosql/mongodb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nosql/mongodb/default.nix b/pkgs/servers/nosql/mongodb/default.nix index 11dff324420..6956271e992 100644 --- a/pkgs/servers/nosql/mongodb/default.nix +++ b/pkgs/servers/nosql/mongodb/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, scons, boost, v8, gperftools, pcre, snappy }: -let version = "2.4.5"; in stdenv.mkDerivation rec { +let version = "2.4.8"; in stdenv.mkDerivation rec { name = "mongodb-${version}"; src = fetchurl { url = "http://downloads.mongodb.org/src/mongodb-src-r${version}.tar.gz"; - sha256 = "01c7lb3jdr51gy7459vg5rg002xxg0mj79vlhy54n50kr31cnxmm"; + sha256 = "1p6gnharypglfp39halp72fig96fqjhakyy7m76a1prxwpjkqw7x"; }; nativeBuildInputs = [ scons boost v8 gperftools pcre snappy ]; From d1fc8ec8665b1ebfc81f39ef24ff8a99f40a0900 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 4 Dec 2013 05:39:21 +0200 Subject: [PATCH 072/152] libnetfilter_conntrack: update from 1.0.2 to 1.0.4, potentially fixes CVE-2012-2671 --- pkgs/development/libraries/libnetfilter_conntrack/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libnetfilter_conntrack/default.nix b/pkgs/development/libraries/libnetfilter_conntrack/default.nix index 8e689ed2568..14b50bb5118 100644 --- a/pkgs/development/libraries/libnetfilter_conntrack/default.nix +++ b/pkgs/development/libraries/libnetfilter_conntrack/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libnfnetlink, libmnl }: stdenv.mkDerivation rec { - name = "libnetfilter_conntrack-1.0.2"; + name = "libnetfilter_conntrack-1.0.4"; src = fetchurl { url = "http://netfilter.org/projects/libnetfilter_conntrack/files/${name}.tar.bz2"; - md5 = "447114b5d61bb9a9617ead3217c3d3ff"; + sha256 = "0zcwjav1qgr7ikmvfmy7g3nc7s1kj4j4939d18mpyha9mwy4mv6r"; }; buildInputs = [ pkgconfig libnfnetlink libmnl ]; From 99bf1945d1f3e235bd349f72623be468699624d8 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 4 Dec 2013 05:44:15 +0200 Subject: [PATCH 073/152] graphicsmagick: update from 1.3.13 to 1.3.18, potentially fixes CVE-2013-4589 --- pkgs/applications/graphics/graphicsmagick/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/graphicsmagick/default.nix b/pkgs/applications/graphics/graphicsmagick/default.nix index c02bc6024df..1f795a800ff 100644 --- a/pkgs/applications/graphics/graphicsmagick/default.nix +++ b/pkgs/applications/graphics/graphicsmagick/default.nix @@ -2,14 +2,14 @@ , libjpeg, libpng, libtiff, libxml2, zlib, libtool, xz , libX11}: -let version = "1.3.13"; in +let version = "1.3.18"; in stdenv.mkDerivation { name = "graphicsmagick-${version}"; src = fetchurl { url = "mirror://sourceforge/graphicsmagick/GraphicsMagick-${version}.tar.xz"; - sha256 = "08lgjvhvhw3by5h4kfpl7072dbvkcpsajy5f6izq69cv61vadqs5"; + sha256 = "1axh4j2jr3l92dan15b2nmx9da4l7i0rcz9b5bvfd4q742zfwj7x"; }; configureFlags = "--enable-shared"; From 92de25cb55468f489c152ef4ec46a91a0fa1f70e Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 4 Dec 2013 05:55:20 +0200 Subject: [PATCH 074/152] dropbear: update from 2013.58 to 2013.60, potentially fixes CVE-2013-4421, CVE-2013-4434 --- pkgs/tools/networking/dropbear/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/dropbear/default.nix b/pkgs/tools/networking/dropbear/default.nix index 1d51c4864a1..933267eff23 100644 --- a/pkgs/tools/networking/dropbear/default.nix +++ b/pkgs/tools/networking/dropbear/default.nix @@ -2,11 +2,11 @@ sftpPath ? "/var/run/current-system/sw/libexec/sftp-server" }: stdenv.mkDerivation rec { - name = "dropbear-2013.58"; + name = "dropbear-2013.60"; src = fetchurl { url = "http://matt.ucc.asn.au/dropbear/releases/${name}.tar.bz2"; - sha256 = "0m9fhabs78v35fhqmji5gkm66ahkyqbbdzmlmr9m7q8l3ndihrnq"; + sha256 = "1fw1hrcavfqjmsn34dhkrzh8w06yfqvfss2rkvvnxnad7d2m432c"; }; dontDisableStatic = enableStatic; From 1db5dd4ffb073ba3a38bb34318fd6f809f1a72d3 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 4 Dec 2013 05:56:17 +0200 Subject: [PATCH 075/152] chrony: update from 1.27 to 1.29, potentially fixes CVE-2012-4502, CVE-2012-4503 --- pkgs/tools/networking/chrony/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/chrony/default.nix b/pkgs/tools/networking/chrony/default.nix index d15559961f6..41552b85418 100644 --- a/pkgs/tools/networking/chrony/default.nix +++ b/pkgs/tools/networking/chrony/default.nix @@ -3,11 +3,11 @@ assert stdenv.isLinux -> libcap != null; stdenv.mkDerivation rec { - name = "chrony-1.27"; + name = "chrony-1.29"; src = fetchurl { url = "http://download.tuxfamily.org/chrony/${name}.tar.gz"; - sha256 = "17dfhcm5mrkg8ids0ajwscryr7fm7664kz10ygsa1ac047p3aj6l"; + sha256 = "16ykdb8pnqcr30pdsaa6rabvsin2n858fmkzd81anqq6p9rg11f6"; }; buildInputs = [ readline ] ++ stdenv.lib.optional stdenv.isLinux libcap; From 41333e134429f2833631c22e9e03f98c71bb0fa9 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Wed, 4 Dec 2013 06:11:41 +0200 Subject: [PATCH 076/152] chrony; fix installation --- pkgs/tools/networking/chrony/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/networking/chrony/default.nix b/pkgs/tools/networking/chrony/default.nix index 41552b85418..41eb1a8f77a 100644 --- a/pkgs/tools/networking/chrony/default.nix +++ b/pkgs/tools/networking/chrony/default.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation rec { buildInputs = [ readline ] ++ stdenv.lib.optional stdenv.isLinux libcap; + configureFlags = [ "--sysconfdir=\$(out)/etc" "--chronyvardir=\$(out)/var/lib/chrony" ]; + meta = with stdenv.lib; { description = "Sets your computer's clock from time servers on the Net"; homepage = "http://chrony.tuxfamily.org/"; From 090d51cb3747889de0ff7b532c5255d8e136cb67 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 4 Dec 2013 06:12:46 +0200 Subject: [PATCH 077/152] bogofilter: update from 1.1.6 to 1.1.7, potentially fixes CVE-2012-5468 --- pkgs/tools/misc/bogofilter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/bogofilter/default.nix b/pkgs/tools/misc/bogofilter/default.nix index f23bd8993cf..3d9287a9b8c 100644 --- a/pkgs/tools/misc/bogofilter/default.nix +++ b/pkgs/tools/misc/bogofilter/default.nix @@ -1,10 +1,10 @@ {fetchurl, stdenv, flex, bdb}: stdenv.mkDerivation rec { - name = "bogofilter-1.1.6"; + name = "bogofilter-1.1.7"; src = fetchurl { url = "mirror://sourceforge/bogofilter/${name}.tar.bz2"; - sha256 = "11pbhw6cc2yjdgl7nq771mrcv0z19al8jvassxnvbw4pvr5kzn9j"; + sha256 = "0ahi3pxv9v6yjjpfyr0x7fch4c4jdikshrcx86q0j8s2rhv94snm"; }; # FIXME: We would need `pax' as a "propagated build input" (for use From 3c51255820cdcf3fec37768fef61432bc5f25762 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 4 Dec 2013 06:19:08 +0200 Subject: [PATCH 078/152] mpd: update from 0.18.3 to 0.18.5 --- pkgs/servers/mpd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index 67a11e01651..3b0069b8118 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -27,10 +27,10 @@ let mkFlag = c: f: if c then "--enable-${f}" else "--disable-${f}"; in stdenv.mkDerivation rec { - name = "mpd-0.18.3"; + name = "mpd-0.18.5"; src = fetchurl { url = "http://www.musicpd.org/download/mpd/stable/${name}.tar.gz"; - sha256 = "177h23vqa59lm1fid883z9y5qn7kfb57yda6p44zva5hh85xczgh"; + sha256 = "1jhkpbwjmzicnkjl8nsfjdgsvqvkcdjm497rl081sy8mq1jzr80c"; }; buildInputs = [ pkgconfig glib ] From 03d64a90414957b121c28a2a918de5c0a9fa864a Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 4 Dec 2013 06:23:35 +0200 Subject: [PATCH 079/152] slock: update from 1.0 to 1.1 --- pkgs/misc/screensavers/slock/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/screensavers/slock/default.nix b/pkgs/misc/screensavers/slock/default.nix index b33ca25fb10..c88be58abb2 100644 --- a/pkgs/misc/screensavers/slock/default.nix +++ b/pkgs/misc/screensavers/slock/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchurl, xproto, libX11, libXext }: stdenv.mkDerivation rec { - name = "slock-1.0"; + name = "slock-1.1"; src = fetchurl { url = "http://dl.suckless.org/tools/${name}.tar.gz"; - sha256 = "b4e44ff1660f6f7eb270a0575d6ae1e0fbffcf0cdd96860a1695d57e89ae2df9"; + sha256 = "1r70s3npmp0nyrfdsxz8cw1i1z8n9phqdlw02wjphv341h3yajp0"; }; buildInputs = [ xproto libX11 libXext ]; installFlags = "DESTDIR=\${out} PREFIX="; From 027003079bb7525f0361397ed21e45447a6a2524 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 4 Dec 2013 06:25:05 +0200 Subject: [PATCH 080/152] libcue: update from 1.3.0 to 1.4.0 --- pkgs/development/libraries/libcue/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libcue/default.nix b/pkgs/development/libraries/libcue/default.nix index 9f5127905c2..b4cea379bba 100644 --- a/pkgs/development/libraries/libcue/default.nix +++ b/pkgs/development/libraries/libcue/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libcue-1.3.0"; + name = "libcue-1.4.0"; src = fetchurl { url = "mirror://sourceforge/libcue/${name}.tar.bz2"; - sha256 = "0gcd9maxh82fc0qah0q8xh74sch0px3n7c0qx0298n2qbk2mkn12"; + sha256 = "17kjd7rjz1bvfn44n3n2bjb7a1ywd0yc0g4sqp5ihf9b5bn7cwlb"; }; meta = { description = "A library to parse a cue sheet"; From 5a131711fe96d6ba411ec22f520ba262f5b9b098 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 4 Dec 2013 06:25:58 +0200 Subject: [PATCH 081/152] caps: update from 0.9.7 to 0.9.16 --- pkgs/applications/audio/caps/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/caps/default.nix b/pkgs/applications/audio/caps/default.nix index 81fb77c1c9a..49880f6c0f3 100644 --- a/pkgs/applications/audio/caps/default.nix +++ b/pkgs/applications/audio/caps/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { name = "caps-${version}"; - version = "0.9.7"; + version = "0.9.16"; src = fetchurl { url = "http://www.quitte.de/dsp/caps_${version}.tar.bz2"; - sha256 = "0ks98r3j404s9h88x50lj5lj4l64ijj29fz5i08iyq8jrb7r0zm0"; + sha256 = "117l04w2zwqak856lihmaxg6f22vlz71knpxy0axiyri0x82lbwv"; }; configurePhase = '' echo "PREFIX = $out" > defines.make From 8a875f54a40fa35aa3b0798e9a978da84cd6bb9c Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 4 Dec 2013 06:27:36 +0200 Subject: [PATCH 082/152] cantarell_fonts: update from 0.0.7 to 0.0.15 --- pkgs/data/fonts/cantarell-fonts/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/fonts/cantarell-fonts/default.nix b/pkgs/data/fonts/cantarell-fonts/default.nix index 70a8b2bc9f4..5c9903c9971 100644 --- a/pkgs/data/fonts/cantarell-fonts/default.nix +++ b/pkgs/data/fonts/cantarell-fonts/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation { - name = "cantarell-fonts-0.0.7"; + name = "cantarell-fonts-0.0.15"; src = fetchurl { - url = mirror://gnome/sources/cantarell-fonts/0.0/cantarell-fonts-0.0.7.tar.xz; - sha256 = "1410ywvi951ngmx58g339phzsaf1rgjja6i0xvg49r4ds90zh8ba"; + url = mirror://gnome/sources/cantarell-fonts/0.0/cantarell-fonts-0.0.15.tar.xz; + sha256 = "0zmwzzfjrlpkdjb475ann11m53a2idm76ydd2rw1hjmdr74dq72j"; }; meta = { From ded642275fc8352dd71ab546a5169c450f5ae923 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 4 Dec 2013 06:28:54 +0200 Subject: [PATCH 083/152] cln: update from 1.3.1 to 1.3.3 --- pkgs/development/libraries/cln/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/cln/default.nix b/pkgs/development/libraries/cln/default.nix index 66629b0561b..f536e746d0e 100644 --- a/pkgs/development/libraries/cln/default.nix +++ b/pkgs/development/libraries/cln/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, gmp }: stdenv.mkDerivation rec { - name = "cln-1.3.1"; + name = "cln-1.3.3"; src = fetchurl { url = "${meta.homepage}${name}.tar.bz2"; - sha256 = "1sd8jy5vnmww537zq6g6i586ffslm7fjliz04krv6scapgklq6ca"; + sha256 = "04i6kdjwm4cr5pa70pilifnpvsh430rrlapkgw1x8c5vxkijxz2p"; }; buildInputs = [ gmp ]; From 1b20cadd1d594d89a5f96422fe8b8bf6bbc4a659 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 4 Dec 2013 06:30:16 +0200 Subject: [PATCH 084/152] ebook_tools: update from 0.2.1 to 0.2.2 --- pkgs/tools/text/ebook-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/ebook-tools/default.nix b/pkgs/tools/text/ebook-tools/default.nix index abb766928d7..2fafec02d81 100644 --- a/pkgs/tools/text/ebook-tools/default.nix +++ b/pkgs/tools/text/ebook-tools/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, pkgconfig, libxml2, libzip }: stdenv.mkDerivation rec { - name = "ebook-tools-0.2.1"; + name = "ebook-tools-0.2.2"; src = fetchurl { url = "mirror://sourceforge/ebook-tools/${name}.tar.gz"; - sha256 = "0wgwdsd3jwwfg36jyr5j0wayqjli3ia80lxzk10byd4cmkywnhy2"; + sha256 = "1bi7wsz3p5slb43kj7lgb3r6lb91lvb6ldi556k4y50ix6b5khyb"; }; buildInputs = [ cmake pkgconfig libxml2 libzip ]; From 4566b55dae4987a436de34d541195f52c1312b15 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 4 Dec 2013 06:31:25 +0200 Subject: [PATCH 085/152] lensfun: update from 0.2.5 to 0.2.7 --- pkgs/development/libraries/lensfun/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/lensfun/default.nix b/pkgs/development/libraries/lensfun/default.nix index 6d54dc25e94..14e22000537 100644 --- a/pkgs/development/libraries/lensfun/default.nix +++ b/pkgs/development/libraries/lensfun/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, python, glib, zlib, libpng }: stdenv.mkDerivation rec { - name = "lensfun-0.2.5"; + name = "lensfun-0.2.7"; src = fetchurl { url = "http://download.berlios.de/lensfun/${name}.tar.bz2"; - sha256 = "11zvi3lk60iljync3a495h9la7makx6lf22fbvr4lwc933mrh562"; + sha256 = "0xv4h219zn0ldhhjnjc1q2bgpbfqzpd4b31gf9yyrwbapm3hgprx"; }; patchPhase = "sed -e 's@/usr/bin/python@${python}/bin/python@' -i configure"; From db20b093ea1347eb192688aadc45147ac98a0b85 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 4 Dec 2013 06:32:32 +0200 Subject: [PATCH 086/152] libgpod: update from 0.8.2 to 0.8.3 --- pkgs/development/libraries/libgpod/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libgpod/default.nix b/pkgs/development/libraries/libgpod/default.nix index 0ad46e2ed5f..6a1f28c96ff 100644 --- a/pkgs/development/libraries/libgpod/default.nix +++ b/pkgs/development/libraries/libgpod/default.nix @@ -3,10 +3,10 @@ libimobiledevice, python, pygobject, mutagen }: stdenv.mkDerivation rec { - name = "libgpod-0.8.2"; + name = "libgpod-0.8.3"; src = fetchurl { url = "mirror://sourceforge/gtkpod/${name}.tar.bz2"; - sha256 = "14m0amy56q4riwvcjszv04a9zp7l2xk8nx0vvhy94yqd0sqfjm00"; + sha256 = "0pcmgv1ra0ymv73mlj4qxzgyir026z9jpl5s5bkg35afs1cpk2k3"; }; preConfigure = "configureFlagsArray=( --with-udev-dir=$out/lib/udev )"; From bec4483d275d3244432e27b46413d8950f0f9dcd Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 4 Dec 2013 06:33:25 +0200 Subject: [PATCH 087/152] libofx: update from 0.9.4 to 0.9.9 --- pkgs/development/libraries/libofx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libofx/default.nix b/pkgs/development/libraries/libofx/default.nix index ba031cd927c..2dce6db1bf2 100644 --- a/pkgs/development/libraries/libofx/default.nix +++ b/pkgs/development/libraries/libofx/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, opensp, pkgconfig, libxml2, curl }: stdenv.mkDerivation rec { - name = "libofx-0.9.4"; + name = "libofx-0.9.9"; src = fetchurl { url = "mirror://sourceforge/libofx/${name}.tar.gz"; - sha256 = "1byvc1ar7s0nivi5cmycwlwh1y4xiad7ipfkgx57lbk7slgn8c4v"; + sha256 = "08vvfj1rq0drcdfchrgb5zp05a2xl3a5aapsfgj0gqy3rp2qivwl"; }; configureFlags = [ "--with-opensp-includes=${opensp}/include/OpenSP" ]; From 3a1225f8a1479ee67245def91b8c222b92a54a5e Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 4 Dec 2013 06:34:34 +0200 Subject: [PATCH 088/152] libsecret: update from 0.15 to 0.16 --- pkgs/development/libraries/libsecret/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libsecret/default.nix b/pkgs/development/libraries/libsecret/default.nix index 70c20caa88a..08ada463a54 100644 --- a/pkgs/development/libraries/libsecret/default.nix +++ b/pkgs/development/libraries/libsecret/default.nix @@ -2,12 +2,12 @@ intltool, gtk_doc, gobjectIntrospection, pkgconfig, libxslt, libgcrypt }: stdenv.mkDerivation rec { - version = "0.15"; + version = "0.16"; name = "libsecret-${version}"; src = fetchurl { url = "https://git.gnome.org/browse/libsecret/snapshot/libsecret-${version}.zip"; - sha256 = "088v1z7zbdi8b0779jads7q20x1gx6c4zmrj3q0vysc7a0k16i6k"; + sha256 = "1yf4zvzfa45wr5bqlh54g3bmd0lgcsa8hnhppa99czca0zj7bkks"; }; propagatedBuildInputs = [ glib dbus_libs ]; From 7c5e25ab1a2ed8e6f7e561ea6ded09ef075bfbed Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 4 Dec 2013 06:36:16 +0200 Subject: [PATCH 089/152] openbabel: update from 2.3.1 to 2.3.2 --- pkgs/development/libraries/openbabel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/openbabel/default.nix b/pkgs/development/libraries/openbabel/default.nix index e6df13eed34..03cfbc8fabd 100644 --- a/pkgs/development/libraries/openbabel/default.nix +++ b/pkgs/development/libraries/openbabel/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, cmake, zlib, libxml2, eigen, python, cairo, pkgconfig }: stdenv.mkDerivation rec { - name = "openbabel-2.3.1"; + name = "openbabel-2.3.2"; src = fetchurl { url = "mirror://sourceforge/openbabel/${name}.tar.gz"; - sha256 = "18yprqsk0fi1ri4fmvpx2ym6gx9fp3by681pl3jffpjqmz4qnbly"; + sha256 = "122if0jkm71ngd1b0dic8k567b3j2hcikbwnpxgchv5ag5ka5b2f"; }; # TODO : perl & python bindings; From 5378fd59488e0865173ac2794d8ab5e11718d354 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 4 Dec 2013 06:39:34 +0200 Subject: [PATCH 090/152] uni2ascii: update from 4.15 to 4.18 --- pkgs/tools/text/uni2ascii/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/uni2ascii/default.nix b/pkgs/tools/text/uni2ascii/default.nix index b4573118a49..0f54644eba5 100644 --- a/pkgs/tools/text/uni2ascii/default.nix +++ b/pkgs/tools/text/uni2ascii/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "uni2ascii-4.15"; + name = "uni2ascii-4.18"; src = fetchurl { url = "http://billposer.org/Software/Downloads/${name}.tar.gz"; - sha256 = "0vlwsqrzmdsb2mx0hbhmw1dvzy56jk8779hphnj6yxijryva6g2v"; + sha256 = "03lklnzr6ngs4wqiqa7rifd246f441gfvardbsaa5l6fn9pbn94y"; }; meta = { From 465c863fb236200a0a4a7b55b24f1d2f61dd5846 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 4 Dec 2013 06:40:44 +0200 Subject: [PATCH 091/152] jalv: update from 1.4.0 to 1.4.2 --- pkgs/applications/audio/jalv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/jalv/default.nix b/pkgs/applications/audio/jalv/default.nix index 5655c7d832b..fec9baa8695 100644 --- a/pkgs/applications/audio/jalv/default.nix +++ b/pkgs/applications/audio/jalv/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "jalv-${version}"; - version = "1.4.0"; + version = "1.4.2"; src = fetchurl { url = "http://download.drobilla.net/${name}.tar.bz2"; - sha256 = "1hq968fhiz86428krqhjl3vlw71bigc9bsfcv97zgvsjh0fh6qa0"; + sha256 = "132cq347xpa91d9m7nnmpla7gz4xg0njfw7kzwnp0gz172k0klp7"; }; buildInputs = [ From c80d5a9f113175e438ded9c865f8d6e4454464fc Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 4 Dec 2013 06:42:55 +0200 Subject: [PATCH 092/152] lv2: update from 1.4.0 to 1.6.0 --- pkgs/development/libraries/audio/lv2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/audio/lv2/default.nix b/pkgs/development/libraries/audio/lv2/default.nix index ce8ad3f9d52..bd6c64a9ee2 100644 --- a/pkgs/development/libraries/audio/lv2/default.nix +++ b/pkgs/development/libraries/audio/lv2/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "lv2-${version}"; - version = "1.4.0"; + version = "1.6.0"; src = fetchurl { url = "http://lv2plug.in/spec/${name}.tar.bz2"; - sha256 = "035hlfva2mij698nj3z1mz9g4mj4z5jx9axs6ww47jgyjcq38asz"; + sha256 = "0nxrkmcpsm4v25wp2l7lcw4n0823kbplilpv51fszf710qsn7k9v"; }; buildInputs = [ gtk libsndfile pkgconfig python ]; From 67f41be3dd902a2814c0c400e1542b7c4ed441b4 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 4 Dec 2013 06:44:19 +0200 Subject: [PATCH 093/152] keymon: update from 1.13 to 1.16 --- pkgs/applications/video/key-mon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/key-mon/default.nix b/pkgs/applications/video/key-mon/default.nix index 7d0256ae455..cb00ac81384 100644 --- a/pkgs/applications/video/key-mon/default.nix +++ b/pkgs/applications/video/key-mon/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { name = "key-mon-${version}"; - version = "1.13"; + version = "1.16"; namePrefix = ""; src = fetchurl { url = "http://key-mon.googlecode.com/files/${name}.tar.gz"; - sha256 = "02h7lcnyqwyqsycd1vlvl11ms81v0zmr9p0pfyl5gmzry9dj7imj"; + sha256 = "1pfki1fyh3q29sj6kq1chhi1h2v9ki6sp09qyww59rjraypvzsis"; }; propagatedBuildInputs = From 9a1643ff474573d127ba05c0f133d6e5a5d7f354 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 4 Dec 2013 06:45:22 +0200 Subject: [PATCH 094/152] drumkv1: update from 0.3.2 to 0.3.5 --- pkgs/applications/audio/drumkv1/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/drumkv1/default.nix b/pkgs/applications/audio/drumkv1/default.nix index 7fdd04ce96b..6cad0e01a4e 100644 --- a/pkgs/applications/audio/drumkv1/default.nix +++ b/pkgs/applications/audio/drumkv1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "drumkv1-${version}"; - version = "0.3.2"; + version = "0.3.5"; src = fetchurl { url = "mirror://sourceforge/drumkv1/${name}.tar.gz"; - sha256 = "0bafg06iavri9dmg7hpz554kpqf1iv9crcdq46y4n4wyyxd7kajl"; + sha256 = "125aa1lmmwjdbzyv13yaax4n6ni7h7v7c7clmjaz7bglzay7xq5w"; }; buildInputs = [ jackaudio libsndfile lv2 qt4 ]; From 3f5e010117a47ccad89aac305d8bcc7e11adea21 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 4 Dec 2013 06:46:32 +0200 Subject: [PATCH 095/152] fluidsynth: update from 1.1.5 to 1.1.6 --- pkgs/applications/audio/fluidsynth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/fluidsynth/default.nix b/pkgs/applications/audio/fluidsynth/default.nix index b0c5a88cb1a..89e95f62cd5 100644 --- a/pkgs/applications/audio/fluidsynth/default.nix +++ b/pkgs/applications/audio/fluidsynth/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "fluidsynth-${version}"; - version = "1.1.5"; + version = "1.1.6"; src = fetchurl { url = "mirror://sourceforge/fluidsynth/${name}.tar.bz2"; - sha256 = "1x73a5rsyvfmh1j0484kzgnk251q61g1g2jdja673l8fizi0xd24"; + sha256 = "00gn93bx4cz9bfwf3a8xyj2by7w23nca4zxf09ll53kzpzglg2yj"; }; preBuild = stdenv.lib.optionalString stdenv.isDarwin '' From cd16faa25738e1fd885279b0707e6a842e5479c8 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Wed, 4 Dec 2013 06:48:29 +0200 Subject: [PATCH 096/152] fluidsynth: switch to cmake build system --- pkgs/applications/audio/fluidsynth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/fluidsynth/default.nix b/pkgs/applications/audio/fluidsynth/default.nix index 89e95f62cd5..d9998a9f814 100644 --- a/pkgs/applications/audio/fluidsynth/default.nix +++ b/pkgs/applications/audio/fluidsynth/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, alsaLib, glib, jackaudio, libsndfile, pkgconfig -, pulseaudio }: +, pulseaudio, cmake }: stdenv.mkDerivation rec { name = "fluidsynth-${version}"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-framework CoreAudio"; - buildInputs = [ glib libsndfile pkgconfig ] + buildInputs = [ cmake glib libsndfile pkgconfig ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ alsaLib pulseaudio jackaudio ]; meta = with stdenv.lib; { From 0a4855a337d70dd79a73b11ba579cdd64855c61f Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 4 Dec 2013 06:51:56 +0200 Subject: [PATCH 097/152] soprano: update from 2.9.3 to 2.9.4 --- 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 1447dd5346a..7736eab511e 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.3"; + name = "soprano-2.9.4"; src = fetchurl { url = "mirror://sourceforge/soprano/${name}.tar.bz2"; - sha256 = "08gb5d8bgy7vc6qd6r1kkmmc5rli67dlglpjqjlahpnvs26r1cwl"; + sha256 = "1rg0x7yg0a1cbnxz7kqk52580wla8jbnj4d4r3j7l7g7ajyny1k4"; }; patches = [ ./find-virtuoso.patch ]; From 7c19a2213fe578a73994455bff650eaf7c0a4d3b Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 4 Dec 2013 06:52:22 +0200 Subject: [PATCH 098/152] virtuoso: update from 6.1.6 to 6.1.7 --- pkgs/servers/sql/virtuoso/6.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/virtuoso/6.x.nix b/pkgs/servers/sql/virtuoso/6.x.nix index 9453b8d2cdb..83ad717c0d3 100644 --- a/pkgs/servers/sql/virtuoso/6.x.nix +++ b/pkgs/servers/sql/virtuoso/6.x.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libxml2, openssl, readline, gawk }: stdenv.mkDerivation rec { - name = "virtuoso-opensource-6.1.6"; + name = "virtuoso-opensource-6.1.7"; src = fetchurl { url = "mirror://sourceforge/virtuoso/${name}.tar.gz"; - sha256 = "0dx0lp7cngdchi0772hp93zzn6sdap7z8s3vay3mzb9xgf0sdgy6"; + sha256 = "0zxaf6i93jnh9lmgxxlb3jddp9ianil0szazfb6mrnqh13liwb68"; }; buildInputs = [ libxml2 openssl readline gawk ]; From 8298e450a79de04cd7c29be833042a4ac1794e39 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 4 Dec 2013 06:53:44 +0200 Subject: [PATCH 099/152] shared_mime_info: update from 1.1 to 1.2 --- pkgs/data/misc/shared-mime-info/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/shared-mime-info/default.nix b/pkgs/data/misc/shared-mime-info/default.nix index 1e424aca46b..134a6f5307e 100644 --- a/pkgs/data/misc/shared-mime-info/default.nix +++ b/pkgs/data/misc/shared-mime-info/default.nix @@ -2,11 +2,11 @@ , libxml2, glib}: stdenv.mkDerivation rec { - name = "shared-mime-info-1.1"; + name = "shared-mime-info-1.2"; src = fetchurl { url = "http://freedesktop.org/~hadess/${name}.tar.xz"; - sha256 = "0v70z5b6340jsjvdhf7brczpzq766wc1lsnjg9hc57ks2m5hjk8q"; + sha256 = "0y5vi0vr6rbhvfzcfg57cfskn362bpvcpca9cy598nmr87i6lld5"; }; buildInputs = [ From 56aa0d9e68a586cd86ecd53352c3f53b91006f3d Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 4 Dec 2013 06:56:04 +0200 Subject: [PATCH 100/152] giflib: update from 4.1.6 to 4.2.3 --- pkgs/development/libraries/giflib/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/giflib/default.nix b/pkgs/development/libraries/giflib/default.nix index 35d66b3647b..1dea43af676 100644 --- a/pkgs/development/libraries/giflib/default.nix +++ b/pkgs/development/libraries/giflib/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl}: stdenv.mkDerivation { - name = "giflib-4.1.6"; + name = "giflib-4.2.3"; src = fetchurl { - url = mirror://sourceforge/giflib/giflib-4.1.6.tar.bz2; - sha256 = "1v9b7ywz7qg8hli0s9vv1b8q9xxb2xvqq2mg1zpr73xwqpcwxhg1"; + url = mirror://sourceforge/giflib/giflib-4.2.3.tar.bz2; + sha256 = "0rmp7ipzk42r841bggd7bfqk4p8qsssbp4wcck4qnz7p4rkxbj0a"; }; } From ad14c262f25de076d4b7d9d180af9e0a22edbb1f Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 4 Dec 2013 06:56:57 +0200 Subject: [PATCH 101/152] avahi: update from 0.6.30 to 0.6.31 --- pkgs/development/libraries/avahi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/avahi/default.nix b/pkgs/development/libraries/avahi/default.nix index f4795286e09..a443da6c1f6 100644 --- a/pkgs/development/libraries/avahi/default.nix +++ b/pkgs/development/libraries/avahi/default.nix @@ -7,11 +7,11 @@ assert qt4Support -> qt4 != null; stdenv.mkDerivation rec { - name = "avahi-0.6.30"; + name = "avahi-0.6.31"; src = fetchurl { url = "${meta.homepage}/download/${name}.tar.gz"; - sha256 = "07zzaxs81rbrfhj0rnq616c3j37f3g84dn7d4q3h5l1r4dn33r7r"; + sha256 = "0j5b5ld6bjyh3qhd2nw0jb84znq0wqai7fsrdzg7bpg24jdp2wl3"; }; patches = [ ./no-mkdir-localstatedir.patch ]; From 83496b02b43390ef636aa6f5ecaf23cff348c03a Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 4 Dec 2013 06:58:25 +0200 Subject: [PATCH 102/152] grantlee: update from 0.3.0 to 0.4.0 --- pkgs/development/libraries/grantlee/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/grantlee/default.nix b/pkgs/development/libraries/grantlee/default.nix index 4fc7b681baa..bb2461a98a1 100644 --- a/pkgs/development/libraries/grantlee/default.nix +++ b/pkgs/development/libraries/grantlee/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, qt4, cmake }: stdenv.mkDerivation rec { - name = "grantlee-0.3.0"; + name = "grantlee-0.4.0"; # Upstream download server has country code firewall, so I made a mirror. src = fetchurl { @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { "http://downloads.grantlee.org/${name}.tar.gz" "http://www.loegria.net/grantlee/${name}.tar.gz" ]; - sha256 = "0c2zwaickp7han0zbxg78qrxv06jjfc4xyz2lmvl1xxmpv4vqzpv"; + sha256 = "0gqdckxx45qmyixyz5d7ipcqq2dw26r71m2fpsrlnh4j2c9di8hk"; }; buildInputs = [ cmake qt4 ]; From 86f7aec95059d8d3efba285cd51471a8aec2cb09 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 4 Dec 2013 08:26:13 +0200 Subject: [PATCH 103/152] phonon_backend_vlc: update from 0.5.0 to 0.7.0, potentially fixes CVE-2012-1775, CVE-2012-1776, CVE-2012-3377 --- pkgs/development/libraries/phonon-backend-vlc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/phonon-backend-vlc/default.nix b/pkgs/development/libraries/phonon-backend-vlc/default.nix index 257c80f0b11..39f444dd58f 100644 --- a/pkgs/development/libraries/phonon-backend-vlc/default.nix +++ b/pkgs/development/libraries/phonon-backend-vlc/default.nix @@ -2,7 +2,7 @@ let pname = "phonon-backend-vlc"; - v = "0.5.0"; + v = "0.7.0"; vlc_ = vlc.override { inherit qt4; }; #Force using the same qt version in @@ -11,7 +11,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://kde/stable/phonon/${pname}/${v}/src/${pname}-${v}.tar.xz"; - sha256 = "1233szd05ahaxyk1sjis374n90m40svfks2aq9jx3g3lxygzwmi2"; + sha256 = "1rhzc3d188l6ygxgfxwikscj71pyy0nchzikvkkq465r9ajavdgd"; }; nativeBuildInputs = [ cmake automoc4 xz ]; From 054516a0a761d0740dd08764fb96614aa7f1c886 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 4 Dec 2013 08:26:24 +0200 Subject: [PATCH 104/152] phonon_backend_gstreamer: update from 4.6.3 to 4.7.0 --- .../libraries/phonon-backend-gstreamer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/phonon-backend-gstreamer/default.nix b/pkgs/development/libraries/phonon-backend-gstreamer/default.nix index f297bd792c7..5644eb527c4 100644 --- a/pkgs/development/libraries/phonon-backend-gstreamer/default.nix +++ b/pkgs/development/libraries/phonon-backend-gstreamer/default.nix @@ -2,7 +2,7 @@ , gst_plugins_base }: let - version = "4.6.3"; + version = "4.7.0"; pname = "phonon-backend-gstreamer"; in @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://kde/stable/phonon/${pname}/${version}/src/${name}.tar.xz"; - sha256 = "0n5ggap1xzspq8x1j9bvnf7wqqh5495sysri7zyg42g32gqp7qjm"; + sha256 = "0zg7hnaywk9wpcvzgskx2334cgfz09ii77pvasrn00ikcqqnnxrs"; }; buildInputs = [ phonon qt4 gstreamer gst_plugins_base ]; From abc2a6950a7a843d23067f4204fb625ebd4ed6be Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 4 Dec 2013 08:35:07 +0200 Subject: [PATCH 105/152] gpgme: update from 1.4.1 to 1.4.3 --- pkgs/development/libraries/gpgme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix index 9b56344743d..ae3b53b4f44 100644 --- a/pkgs/development/libraries/gpgme/default.nix +++ b/pkgs/development/libraries/gpgme/default.nix @@ -11,11 +11,11 @@ let "${gnupg}/bin/gpg2"; in stdenv.mkDerivation rec { - name = "gpgme-1.4.1"; + name = "gpgme-1.4.3"; src = fetchurl { url = "ftp://ftp.gnupg.org/gcrypt/gpgme/${name}.tar.bz2"; - sha1 = "d6110763e7459214fd72705e87ebc682e3b5815e"; + sha256 = "15h429h6pd67iiv580bjmwbkadpxsdppw0xrqpcm4dvm24jc271d"; }; propagatedBuildInputs = [ libgpgerror glib libassuan pth ]; From 883022f6256e6f4f7e5af6f865564cabdfdf5e11 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 4 Dec 2013 08:39:22 +0200 Subject: [PATCH 106/152] libusb1: update from 1.0.16 to 1.0.17 --- pkgs/development/libraries/libusb1/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libusb1/default.nix b/pkgs/development/libraries/libusb1/default.nix index 9a6a303fe32..f06eacb67a9 100644 --- a/pkgs/development/libraries/libusb1/default.nix +++ b/pkgs/development/libraries/libusb1/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, udev }: stdenv.mkDerivation rec { - name = "libusb-1.0.16"; + name = "libusb-1.0.17"; src = fetchurl { - url = "mirror://sourceforge/libusbx/libusbx-1.0.16.tar.bz2"; - sha256 = "105m9jvjr3vrriyg0mwmyf7qla4l71iwwnymrsk3sy9dazwmqcsv"; + url = "mirror://sourceforge/libusbx/libusbx-1.0.17.tar.bz2"; + sha256 = "1f25a773x9x5n48a0mcigyk77ay0hkiz6y6bi4588wzf7wn8svw7"; }; buildInputs = [ pkgconfig ]; From 3f1c26b8257201dde5fda0e7381bcf4ad7422d09 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 4 Dec 2013 08:41:18 +0200 Subject: [PATCH 107/152] gpsd: update from 2.95 to 3.10 --- pkgs/servers/gpsd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/gpsd/default.nix b/pkgs/servers/gpsd/default.nix index 25051167ca5..4536cb94de7 100644 --- a/pkgs/servers/gpsd/default.nix +++ b/pkgs/servers/gpsd/default.nix @@ -4,11 +4,11 @@ , libxslt, xmlto, gpsdUser ? "gpsd" }: stdenv.mkDerivation rec { - name = "gpsd-2.95"; + name = "gpsd-3.10"; src = fetchurl { url = "http://download.berlios.de/gpsd/${name}.tar.gz"; - sha256 = "1bjhyjg561kwp6zc2wg58njdvpnsj5yaa2slz8g3ga1176jl68w3"; + sha256 = "10sqhg4x7hb4vnpq5dnhg62vb5nb3dmqqnbhwjrj5kx7n63jw4h4"; }; nativeBuildInputs = [ makeWrapper pkgconfig docbook_xml_dtd_412 docbook_xsl From ecfb89101cd46aded0301b3f9983e90f2b758d34 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 4 Dec 2013 08:42:34 +0200 Subject: [PATCH 108/152] eigen: update from 3.1.2 to 3.2.0 --- pkgs/development/libraries/eigen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/eigen/default.nix b/pkgs/development/libraries/eigen/default.nix index 5653eec6d41..8a1cca4bdd4 100644 --- a/pkgs/development/libraries/eigen/default.nix +++ b/pkgs/development/libraries/eigen/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, cmake}: let - v = "3.1.2"; + v = "3.2.0"; in stdenv.mkDerivation { name = "eigen-${v}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://bitbucket.org/eigen/eigen/get/${v}.tar.bz2"; name = "eigen-${v}.tar.bz2"; - sha256 = "1hywvbn4a8f96fjn3cvd6nxzh5jvh05s1r263d9vqlgn25dxrzay"; + sha256 = "1dpshkcqjz3ckad56mkk1agbnlq0rk2d0wv14zwjg4lk1nb7h7q1"; }; nativeBuildInputs = [ cmake ]; From 3ac7543bc81e948428c0d84f92f9f204abf1b79a Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 4 Dec 2013 08:42:50 +0200 Subject: [PATCH 109/152] eigen2: update from 2.0.16 to 2.0.17 --- pkgs/development/libraries/eigen/2.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/eigen/2.0.nix b/pkgs/development/libraries/eigen/2.0.nix index 9cf0a3c350c..6317dfe5887 100644 --- a/pkgs/development/libraries/eigen/2.0.nix +++ b/pkgs/development/libraries/eigen/2.0.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, cmake}: let - v = "2.0.16"; + v = "2.0.17"; in stdenv.mkDerivation { name = "eigen-${v}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://bitbucket.org/eigen/eigen/get/${v}.tar.bz2"; name = "eigen-${v}.tar.bz2"; - sha256 = "1akcb4g5hvc664gfc6sxb6f6jrm55fgks6017wg0smyvmm6k09v0"; + sha256 = "0q4ry2pmdb9lvm0g92wi6s6qng3m9q73n5flwbkfcz1nxmbfhmbj"; }; nativeBuildInputs = [ cmake ]; From ed616385cf8d1d12e65bd60b54a59671e67e15e9 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Wed, 4 Dec 2013 13:57:36 +0200 Subject: [PATCH 110/152] heimdal: update from 1.5.2 to 1.5.3 --- pkgs/development/libraries/kerberos/heimdal.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix index b0a5ecedcc6..d4728273d34 100644 --- a/pkgs/development/libraries/kerberos/heimdal.nix +++ b/pkgs/development/libraries/kerberos/heimdal.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, openldap, readline, db4, openssl, cyrus_sasl, sqlite} : stdenv.mkDerivation rec { - name = "heimdal-1.5.2"; + name = "heimdal-1.5.3"; src = fetchurl { urls = [ "http://www.h5l.org/dist/src/${name}.tar.gz" "http://ftp.pdc.kth.se/pub/heimdal/src/${name}.tar.gz" ]; - sha256 = "22603f282f31173533b939d289f3374258aa1ccccbe51ee088d7568d321279ec"; + sha256 = "19gypf9vzfrs2bw231qljfl4cqc1riyg0ai0xmm1nd1wngnpphma"; }; ## ugly, X should be made an option From 60ced497f68221595f5a49568affa9b63e1e1a93 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Wed, 4 Dec 2013 01:54:46 +0100 Subject: [PATCH 111/152] linux: Update to 3.2.53 --- pkgs/os-specific/linux/kernel/linux-3.2.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.2.nix b/pkgs/os-specific/linux/kernel/linux-3.2.nix index ae065499c65..cef3e899a3e 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.2.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.2.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.2.52"; + version = "3.2.53"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "1wpr5xs6vg0xjlzrlbkv7bjvv34psw57crkdh4lybghi4rgrmkzl"; + sha256 = "1fvg76g3ixyz8spzzmw5gdfr0ni9wzi2g745vphknnd9a9rgwjdm"; }; features.iwlwifi = true; From 61adb5962cee47ae4b7a94aae12f0ef1df481cdc Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Wed, 4 Dec 2013 01:58:50 +0100 Subject: [PATCH 112/152] grsecurity: Update to 3.0-3.2.53-201312021727 and 3.0-3.12.2-201312021733 --- pkgs/os-specific/linux/kernel/patches.nix | 20 ++++++++++---------- pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 128c42533c6..b55312fe560 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -124,25 +124,25 @@ rec { }; - grsecurity_3_0_3_2_52 = - { name = "grsecurity-3.0-3.2.52"; + grsecurity_3_0_3_2_53 = + { name = "grsecurity-3.0-3.2.53"; patch = fetchurl { - url = https://grsecurity.net/stable/grsecurity-3.0-3.2.52-201311261307.patch; - sha256 = "1zmzgjpbq90q2w3yl3dgdc79qan7qkh5w6g3y3nvzr6ww6jl8hqw"; + url = https://grsecurity.net/stable/grsecurity-3.0-3.2.53-201312021727.patch; + sha256 = "1ifndcbpz552d0n2dgb38di8lhqd4x2msshdbdx33jlfdl7mk6x4"; }; features.grsecurity = true; - # The grsec kernel patch seems to include the apparmor patches as of 3.0-3.2.52 + # The grsec kernel patch seems to include the apparmor patches as of 3.0-3.2.53 features.apparmor = true; }; - grsecurity_3_0_3_12_1 = - { name = "grsecurity-3.0-3.12.1"; + grsecurity_3_0_3_12_2 = + { name = "grsecurity-3.0-3.12.2"; patch = fetchurl { - url = https://grsecurity.net/test/grsecurity-3.0-3.12.1-201311261309.patch; - sha256 = "129q740m2iivc4i9a465lvzcph9gxlivxzg2p9dsi7c136p42mdz"; + url = https://grsecurity.net/test/grsecurity-3.0-3.12.2-201312021733.patch; + sha256 = "0xcsq6778rk9afg3078d772iflz7p4ahvr6wdq5c4s3jyssam783"; }; features.grsecurity = true; - # The grsec kernel patch seems to include the apparmor patches as of 3.0-3.12.1 + # The grsec kernel patch seems to include the apparmor patches as of 3.0-3.12.2 features.apparmor = true; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e107812ef9a..7d96fd22512 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6696,11 +6696,11 @@ let # config options you need (e.g. by overriding extraConfig). See list of options here: # https://en.wikibooks.org/wiki/Grsecurity/Appendix/Grsecurity_and_PaX_Configuration_Options linux_3_2_grsecurity = lowPrio (lib.overrideDerivation (linux_3_2.override (args: { - kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_2_52 kernelPatches.grsec_path ]; + kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_2_53 kernelPatches.grsec_path ]; })) (args: grsecurityOverrider args)); linux_3_12_grsecurity = lowPrio (lib.overrideDerivation (linux_3_12.override (args: { - kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_12_1 kernelPatches.grsec_path ]; + kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_12_2 kernelPatches.grsec_path ]; })) (args: grsecurityOverrider args)); linux_3_2_apparmor = lowPrio (linux_3_2.override { From 389bdaec0285930b12db3b96d8bf14ff63b06661 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Wed, 4 Dec 2013 16:55:08 +0200 Subject: [PATCH 113/152] KDE411.Akonadi: update to 1.11.0 --- pkgs/desktops/kde-4.11/support/akonadi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/kde-4.11/support/akonadi/default.nix b/pkgs/desktops/kde-4.11/support/akonadi/default.nix index af27b683f25..d51996e3bc1 100644 --- a/pkgs/desktops/kde-4.11/support/akonadi/default.nix +++ b/pkgs/desktops/kde-4.11/support/akonadi/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, qt4, shared_mime_info, libxslt, boost, automoc4, soprano, sqlite }: stdenv.mkDerivation rec { - name = "akonadi-1.10.2"; + name = "akonadi-1.11.0"; src = fetchurl { url = "mirror://kde/stable/akonadi/src/${name}.tar.bz2"; - sha256 = "1jij7vmrxg4kzqcq4ci73q3m3927bym5xb34kvmpq3h7p1d0vmgk"; + sha256 = "0k96i8xq3xkm5rrxrj3zqgppcmqbzcpc918xnx0p54jkkm85gchc"; }; buildInputs = [ qt4 soprano libxslt boost sqlite ]; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { description = "KDE PIM Storage Service"; license = "LGPL"; homepage = http://pim.kde.org/akonadi; - maintainers = [ maintainers.sander maintainers.urkud ]; + maintainers = [ maintainers.sander maintainers.urkud maintainers.phreedom ]; platforms = platforms.linux; }; } From 7d6fec63c6b3953fb8de2c6a18e9f8c2c8c6c02b Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Wed, 4 Dec 2013 16:56:05 +0200 Subject: [PATCH 114/152] giflib: fix documentation --- pkgs/development/libraries/giflib/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/giflib/default.nix b/pkgs/development/libraries/giflib/default.nix index 1dea43af676..cc782546a48 100644 --- a/pkgs/development/libraries/giflib/default.nix +++ b/pkgs/development/libraries/giflib/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{stdenv, fetchurl, xmlto, docbook_xml_dtd_412, docbook_xsl, libxml2 }: stdenv.mkDerivation { name = "giflib-4.2.3"; @@ -6,5 +6,7 @@ stdenv.mkDerivation { url = mirror://sourceforge/giflib/giflib-4.2.3.tar.bz2; sha256 = "0rmp7ipzk42r841bggd7bfqk4p8qsssbp4wcck4qnz7p4rkxbj0a"; }; + + buildInputs = [ xmlto docbook_xml_dtd_412 docbook_xsl libxml2 ]; } From 92dc41142ab7a4fdc229803bcfeca813f5a936aa Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Wed, 4 Dec 2013 16:56:39 +0200 Subject: [PATCH 115/152] phonon: update to 4.7.0 --- pkgs/development/libraries/phonon/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/phonon/default.nix b/pkgs/development/libraries/phonon/default.nix index bd74b937276..ce5adc4b0a5 100644 --- a/pkgs/development/libraries/phonon/default.nix +++ b/pkgs/development/libraries/phonon/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchurl, cmake, automoc4, qt4, pulseaudio }: let - v = "4.6.0"; + v = "4.7.0"; in stdenv.mkDerivation rec { name = "phonon-${v}"; src = fetchurl { - url = "mirror://kde/stable/phonon/${v}/src/${name}.tar.xz"; - sha256 = "2915e7a37c92a0a8237b9e6d2ef67ba8b005ee3529d03991cd3d137f039ba3c4"; + url = "mirror://kde/stable/phonon/${v}/${name}.tar.xz"; + sha256 = "1sxrnwm16dxy32xmrqf26762wmbqing1zx8i4vlvzgzvd9xy39ac"; }; buildInputs = [ qt4 pulseaudio ]; From 41f0e6ad9203a1859996e53323321a758c1fc7c4 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Wed, 4 Dec 2013 16:57:36 +0200 Subject: [PATCH 116/152] KDE-4.11: update to 4.11.4 --- pkgs/desktops/kde-4.11/default.nix | 2 +- pkgs/desktops/kde-4.11/kde-package/4.11.4.nix | 444 ++++++++++++++++++ .../kde-4.11/l10n/manifest-4.11.4.nix | 272 +++++++++++ 3 files changed, 717 insertions(+), 1 deletion(-) create mode 100644 pkgs/desktops/kde-4.11/kde-package/4.11.4.nix create mode 100644 pkgs/desktops/kde-4.11/l10n/manifest-4.11.4.nix diff --git a/pkgs/desktops/kde-4.11/default.nix b/pkgs/desktops/kde-4.11/default.nix index d3840120a65..ef0f871b5a8 100644 --- a/pkgs/desktops/kde-4.11/default.nix +++ b/pkgs/desktops/kde-4.11/default.nix @@ -1,4 +1,4 @@ -{ callPackage, callPackageOrig, stdenv, qt48, release ? "4.11.2" }: +{ callPackage, callPackageOrig, stdenv, qt48, release ? "4.11.4" }: let # Need callPackageOrig to avoid infinite cycle diff --git a/pkgs/desktops/kde-4.11/kde-package/4.11.4.nix b/pkgs/desktops/kde-4.11/kde-package/4.11.4.nix new file mode 100644 index 00000000000..17fe253dff4 --- /dev/null +++ b/pkgs/desktops/kde-4.11/kde-package/4.11.4.nix @@ -0,0 +1,444 @@ +{stable=true; +hashes=builtins.listToAttrs[ + {name="amor";value="1ljcsrvd2pdy0swvlc0rpjh39bvash5qwszx0lpc9v083jg9cwym";} + {name="analitza";value="1h2bcllpzlkbgxi72g8g143zk06kywgy00rcn5mypsy35b3ka70d";} + {name="ark";value="0q1g5kab6147pdw1mdwr2rkmggrg1x3plw9y0bny1xfvdlkmm1aq";} + {name="audiocd-kio";value="05a56m059awii6gk60dphb3hwi9zq5gd38i0gdx2fq9ns8a5k1qd";} + {name="blinken";value="0fhfy2yvpgcfjdjqq85ws2vddhbv0ljp5gda3x7i7lv730vmhvcq";} + {name="bomber";value="1bgpvd3kib6p7vwkkw9al1qd2mcxl8rv2lzw30d3a0mjka0a31x8";} + {name="bovo";value="0yb1fds74c803l932nmhs00gxqa80rcmnx5js43r60xjca8i97bf";} + {name="cantor";value="154dxff6yki487hy4xy301swm2j9wiv9ql6fhm399cr54yx595ix";} + {name="cervisia";value="1v2h0awmlnvjzyaaqkix4mzv3i63qf21y65nxxfvhzv29imqbx29";} + {name="dolphin-plugins";value="0jpmc93w8z1mg5cxxppqzkkr9mz5lsd1nsaflvmpyyrgvf81x2d7";} + {name="dragon";value="0q2b6f36yaqlbrpjq5h89d8igi270fxipbhj7dy8f31jbyiyrqk1";} + {name="ffmpegthumbs";value="175r16jk0sps6144a5d1yan3m6fyargcpa5pk05g3j6fm9z5il6n";} + {name="filelight";value="1wgzpcq11znw7gxqf6dv0zhiyyljax9cjglsg7hldrpmpcv36ry2";} + {name="granatier";value="1830bp4wb2dsqrh5wlw5si5k9aihv2sgv76flpksdywzgp35nsp6";} + {name="gwenview";value="02i8zkb93ribn2kb2f9yqr2ldgr5qzc9lsfw4iyzjbnsdssww0y5";} + {name="jovie";value="1qi602477f796wf27b9arhkl4lxcwl3zdr3d5ma38x1zqy422zcx";} + {name="juk";value="195wa7qzhadal8pqy98lsxivjkazms9bg5vig89q281p5gf675rj";} + {name="kaccessible";value="0mj1zfrkq14yi1sxg3xyq234rfq8ykjmalkbn4a1fb5prvr4x9zp";} + {name="kactivities";value="0xhmmam62pgw1f2sdgp7yhf8pxpblcaf1jrclfr0h3pjigghvixi";} + {name="kajongg";value="1ag5xs842923y347k92x2phbj6rjmzfpy8wxsqhkygw5bi12n7sd";} + {name="kalgebra";value="1c66ad47m94lb2qrn3cas8g194sri79xzx8dzprj7avc3659n3jh";} + {name="kalzium";value="0li8dip02hr22p0xrnhqlgjqrqmanyv48cpfd2q6q9hjhqjasf85";} + {name="kamera";value="0dcpypb1xzwn2qj2bfcz0dr2ck3falhqa5cgv0sa1lkizndsr9gw";} + {name="kanagram";value="1gmk1ncw8sappzz5hr5im4n23fiy628k9wjrf2fhdlrfin1qwhrn";} + {name="kapman";value="0pnxnql2vc88rjbgz2zmacwxv8nipfdqlaldllnnx0nzzv8y5fky";} + {name="kapptemplate";value="19n4dsdnsk0rm7xci43jmxxczf699nbslk5sqgx7ymrhqwjad647";} + {name="kate";value="137r2snggr4lckqdpck9m9lxa97ldhdqm5y1hs7gfnpnhkjhb1nm";} + {name="katomic";value="12096dnqyz41sf94w0ywpmwj1w5idrk7mbi0k18qjgbm9rqmapc7";} + {name="kblackbox";value="1qjp86lvbjy1chxik3v5m6c90wp86qa8vvpxiz87yryb3zzzrhmc";} + {name="kblocks";value="0vwmv5m2zhdagc5vhdvp8jkfnq3r6ls02a5r5k6m2vl5n5a9mi9k";} + {name="kbounce";value="1cy7lmx1viqwf62mpi137wsx2haqclgxccsdp5gk8xa3s9r9s08d";} + {name="kbreakout";value="1zf6bpdyq5qzzz2xgmprcfkx7jdg153skb24vr44x137sj8mhmb9";} + {name="kbruch";value="07w1isaddxs2vv5c92nskwfybh78naqgc84wzrfcand3h6bl1s6y";} + {name="kcachegrind";value="08c17i6mk50n7nw9b5n7hc6kgxr6k30lr79jxyh96q861ynlhsqm";} + {name="kcalc";value="0lj33rxcj4zb4bmdhz4gwmmakj8kz66bf97rdid4r82cdd1hyjj8";} + {name="kcharselect";value="1ghpnwv47yybviygrz3adjzrkmdwnl0qbljm41d0s6x5583p1dvd";} + {name="kcolorchooser";value="0951nnc3xlp45qh2im91xhnl7w241667bnpnr6xk4p9pn9h979ys";} + {name="kcron";value="1rlfyxqg15r7naqbcwgma7z2vwd6dn95fr4sr3pb460bk9pbpgvi";} + {name="kdeartwork";value="0rpipr6zvywr6fipz8m0bw7iik9vrxslbnnfjy7rf45ywkbz7rnz";} + {name="kde-baseapps";value="15j335pnswjmwcgcgsdxpkmdw6a6pskkk290j9h8pjrcf1fnwbfn";} + {name="kde-base-artwork";value="0ics2inh6vc5k06rfgx8nw3xr782s5r9fj9w2xvd4ynj87mswr0l";} + {name="kde-dev-scripts";value="0fkk70c1q7icsds4b99kk4bwxhldy8m7k829d2n659vi3mn0pw98";} + {name="kde-dev-utils";value="016899rkw5imqlr1n25jzyl7bm6pg7hfdc13i81ghglfwrzqcwsv";} + {name="kdegraphics-mobipocket";value="1x0h9hli509a7fqwy8zvccw8cnxfmaw1grnf6c8iy4fzjik1kimv";} + {name="kdegraphics-strigi-analyzer";value="1qpiydbqxs6xvwdad6w5k2kjx22ldy3lz3fl3afahgi038a246a1";} + {name="kdegraphics-thumbnailers";value="18pn0r7s334jy93ln42r0ny52nynlrbqxr65z1gqfxxh6bmf1z67";} + {name="kdelibs";value="1v9d0r5a07fsyrnrikwgwvh64p1gqx3ch2makl55qqqyzyg16lnx";} + {name="kdenetwork-filesharing";value="1y5n2bvx3p5zcr1615avzlcj2jwjw9g3ah6na99anyk14j1x8pnr";} + {name="kdenetwork-strigi-analyzers";value="1zymkbs4hd9lxck8fylbdkvlcfdm37g3a42gnfi7pcyqc7mv8az9";} + {name="kdepim";value="1rk35yzf0pm6bmnx4fjd2mw6wrn1fvllnqqrg5s2afz6v4shc9b4";} + {name="kdepimlibs";value="1lc5ly08drsaa198il44cbnbwrpzk9ci6nwks2gc8p93rrqd4siv";} + {name="kdepim-runtime";value="0bxjh2xcp46xnsk71zv22as7qyz393ri5mvshg2nam1jfs3fw38r";} + {name="kdeplasma-addons";value="1zdya555q7ljpabsggw23l008fy1q5sjpaphcr9jb4ycyhk879fc";} + {name="kde-runtime";value="05nd0ir5x6i2lkh4xhkmdvqs5rfy2bcj6ib6a9nd1v6j2v6h90dj";} + {name="kdesdk-kioslaves";value="0bdzm70gw64yab3wi35xri6nkkx4vf5b20r3056z6gys932wzfnp";} + {name="kdesdk-strigi-analyzers";value="026swm6mq4dzsq5a38kd6ijwm18gvwqq87k58z8yxc8xwj12cf4d";} + {name="kdesdk-thumbnailers";value="1zpakq07zgv1z6imfzpin180nyda1wdaiqjvd8wdl61c444byagp";} + {name="kde-wallpapers";value="0mrdgjqyw0l960f6gr6ggjgdw9fhnkv9xl5pf6sxla6jfz3w28lc";} + {name="kdewebdev";value="1zk4nnllan06l712scs5pxsy1awb962h1i5l4sf91d9plczdldli";} + {name="kde-workspace";value="0vzi0xy17n1r24gflcxfc8ld2qkg77k8isbz94zi9q56qpm0lhhk";} + {name="kdf";value="0sagjckmnlfh3mbfrvwxgcmngay6nc3wl3wf5jc5agyhpnac55wb";} + {name="kdiamond";value="17xkadf2ycsrd35j83gh2awmf9a5sm814cyz18pcgwjrp6k95dkg";} + {name="kdnssd";value="0vwqj5dzzjm4i780d3glnqkl5adn388y48nwazr4dz3kz1ay43hb";} + {name="kfloppy";value="0nybxrvki28j01bwdas9ys7m6a549190mai4s5sfnsz1sz3h0glh";} + {name="kfourinline";value="043xl0dby94b1v7hbnpsahd5ihgrzp3616zcf7af0icjmwxyqk8w";} + {name="kgamma";value="1l1j81zxl2v063wwbvalbvpsjbiq4zvpqfhpfrnp8gsp7s1sn0y9";} + {name="kgeography";value="1da95fq7437wiqy77v15k7b9y32d627ghfn16dbfpn1gl2srl6md";} + {name="kget";value="0g0yx6mkmz97j7kv9a5y8n4aqrrnr05k42d5jql74s0f1c32f8cr";} + {name="kgoldrunner";value="0dy0hx9ksfwyhsz160jlzks5m9y75nffgg53j4bcrzfakhbjiqfx";} + {name="kgpg";value="0qh8l99gpk71mag6zy86wjhm9mswy4sx7glxrwbbcqz67zag7ky3";} + {name="khangman";value="0452a4di9kbh36spvfaa66sgwfdrj6838h7h7k1g9bay9i7zw1vq";} + {name="kig";value="1yf8x2r1qmarqpsqzraf8xxamlgpynhdrl1afl74ay4npngc3dlp";} + {name="kigo";value="04jbhy55yb72nqsy9cblj813z33zddbmxv6fgxr8i2avr378d79c";} + {name="killbots";value="0sqislgqb8lkqq1gshx7m499nvwwcl5wfn5b6bpvg12azshzffs8";} + {name="kimono";value="0bjk8nq4avh0df1i5yz4y6ibgaas7503827dwf8klzns17if54mq";} + {name="kiriki";value="0209cjsiz8db4nlb9n77zdj25bi71xfl75b7l2wd64pgwlp4k0f6";} + {name="kiten";value="0hb0d5rcwl68vr0ca2vkqxmjx1iz6xjddyxd7fshggv1jbpybcy7";} + {name="kjumpingcube";value="0qxaagxg5cd12jjx4sm7mhh2x5xrgl5vsj0h7400x61j3wbr8npb";} + {name="klettres";value="04a5vy0qw70lm9wsh6qs3lvbadsa8d3blba9c7xxyxhy8l7zmp0h";} + {name="klickety";value="05csnzkb9c396b6gp3iij8m5cjgw68hw8bxqg6sv4gj66iyrymbr";} + {name="klines";value="09cl1cyc2mjqsf4p9ws749v2gpailj6kww2wph1iz4l3sgnavi1p";} + {name="kmag";value="0mna9a46140qa3y3p19gpif83qik4jgl3705mm8s06qh6ryan753";} + {name="kmahjongg";value="0k38vq5r4hr3pfqd37bvb08h7xm54l4kljgyfy3wrx565mq7n5xh";} + {name="kmines";value="04fwfsnj1a1cfr6c3h8cq9anvi4nh4kr5xbcc9l74zvmnnl8j1cw";} + {name="kmix";value="0wqiqgvf1hyinymwn5crqsa3bd7xv934qniyp8pwhlxk1k2ix6x0";} + {name="kmousetool";value="1g643dm8111jk4zq7smlp6hdz42qcmsar2v7y9c9i2a1169r5n1z";} + {name="kmouth";value="1ccibpnw09qm6r9nfb2jchrjwg8i5k3shq6g41i80sgpja6ir8h8";} + {name="kmplot";value="0kx3ccznqydqyc50sn27b6dswwyalhdhxrd789ac9xx6gpn1vcid";} + {name="knavalbattle";value="1lm4393jl45f90zbyvsznln4n7qccl3qw8a1d984ghmqvnx576jr";} + {name="knetwalk";value="0v91z2sd3pyrwsqwxhwz4rhm6lc3lr2y8kkpbyqmf8sf4pchfnkl";} + {name="kolf";value="00s9p9pxkd3insjs0fxnqcnhycy27wm5isyp4bnaa11i79i4zl3g";} + {name="kollision";value="0sf5pzrk10ad6x86wvbmf61jmnpb29hzc21z6l84cbq8iwqpms6x";} + {name="kolourpaint";value="1icagd88zvp138dr9l2g5cp7cisry0jmja5qh8mxpidk3ax94d7s";} + {name="kompare";value="02y3rlr4v5p6x9x2i0h39x0g1fql893hhyizb05ici2a61ddbs94";} + {name="konquest";value="0dg183wmz8b551g3j5rnd591y2sb8ksi0a3cnf8jm8wf3fwfa3zd";} + {name="konsole";value="15n68fihdi6fc0hgrk36q668x653y3z8zqfb5zzawpgd2pmnfkma";} + {name="kopete";value="1658mlfxaxl67zwd7gl0z83jnp8a8lwgvknxgpaa1nyyn2ygflkv";} + {name="korundum";value="1r0dk8hb54wwqk464rwaz3160mc32i7f06ar7k5cg4n9wkqrn9bk";} + {name="kpat";value="082kldxd0pnwdcayaww6dkal0imfnsnwdbcsdlcapzjp51i978q6";} + {name="kppp";value="1adsa7x8i8xc51a6k9fkqwkrv3rz0iwg1xkjfagslgm8s4iac8ki";} + {name="krdc";value="1ddvf4ls6mwmljg5szwqcwn3lsvvpx3pgrx7f0ml5hiymw87mhrr";} + {name="kremotecontrol";value="18imhmss3f5azcj4qnrx4jib2y0xx7rdjd4a6s4h8pqmigln6bin";} + {name="kreversi";value="0qhfpr7j7v8349kj0avk6qrsaiqj5q8bc4pf58abfsgv205gp3rj";} + {name="krfb";value="00z2hrbsfg461dky454xf8ipjp9phfxm8pb6kk0lzakkfzh59zzl";} + {name="kross-interpreters";value="1pz5isyb69cal9qyrhih7s5k6p2l2wwk5qiwczhc3h0ynmk2wssv";} + {name="kruler";value="03d48bv94l9ff7nli7k5q16xl92b38ih90v1bgxkq8pxl7gq493i";} + {name="ksaneplugin";value="0vwzkxqbha1qy6z965s8r1w183ipjz6vqfcxndjdrarzs7mw9ans";} + {name="kscd";value="1ari082m0bhn8ws8wl2kps94s7vhxkrmhlzpzggvl6fssa5fssya";} + {name="kshisen";value="18pliigc2wg1iypf9r8imqp5ih35vbdd4fac7fsac9mzmdvr8pib";} + {name="ksirk";value="1is01dzsd2x6m6vn71i552q0z3qshhgfmlqkvl9g3vsjlz9a811j";} + {name="ksnakeduel";value="0bnaxvzgf7bml483xdvpv1axfi39gxpbykcj8p4vcmkyaqlg9xc6";} + {name="ksnapshot";value="11s5ika5fbh9rhkfbpg9qiyrbd698z17aqqi44qmwn7w7hmd51si";} + {name="kspaceduel";value="058x1j3nv5g77zjkvkzwr0nwfy43gyaqc180mk8xidkzk6w8ncdf";} + {name="ksquares";value="1si68d370k69dd70dvc5s3ny0q3lm1qp0xkyrlzphvfr9ivyb6dj";} + {name="kstars";value="0dxdqgbayh2mdqdjx88prsm5bplsj73xy6zjz4lml99pqz5h24wa";} + {name="ksudoku";value="1b3csnl43i5xfwxnc10qb8aypx8ci5x6lia9qwppcv9w0gqqpmdn";} + {name="ksystemlog";value="1spkyqn0ywi0nbbrcmnkmh88z6525ppshw9wnrzm2ncs9ypsy45s";} + {name="kteatime";value="00nwbw5509g0iz80bg1jljj07kwl9z8zxkvq27qkzx1h0bm9593n";} + {name="ktimer";value="0v9pfbd2hbp7wa01y13845360p7r2bdzpf9h2vc4xb9nifzva9gj";} + {name="ktouch";value="11shkrmw1cbn19j4k167d4qjanh5b6jdqhp65dn24zxbs9prk1y9";} + {name="ktuberling";value="0axx1slrk7142gm9sc61amixzabphdfp2m6zkdw4zi67ly2w15vf";} + {name="kturtle";value="1cm6g8n2qy779cgmvfxvmg49fssrggd1hr87pz1xakd2xkz2qbid";} + {name="ktux";value="039ip37bw0bxc7haz3a9b5ks9hy4k0nyyrqq7n6wdhkg0m4ji5l1";} + {name="kubrick";value="1fmr7w7f8p54892icbvmhd439adg5b04ddfln9ky34akbw8jiap7";} + {name="kuser";value="14dszc4nxgmsm1q6cigh18b97ds4ixsfqp1l717lj39makz7r6jd";} + {name="kwallet";value="1s2w3zqbaml3i3p0s3znka7kwcwib76p0zpfbfzjaxzgxwmb4nwm";} + {name="kwordquiz";value="1a6chbc4hpybxa7w50jlasp5nzrz9z4qk766cxflpf532s6mv9yl";} + {name="libkcddb";value="0h7kg4wnjn2j1wjm758jyf0qiwllzm39zxwkvyd4r744ra88ym6a";} + {name="libkcompactdisc";value="18nwbjgviyqd6pvaq4l7hsihask54knfwsk6z4rpk25ln74ls7rs";} + {name="libkdcraw";value="1b7yzv25dp55mqkj8ap3qy97ddhdagbsfv8kanswln33k8phjvn7";} + {name="libkdeedu";value="1y2iwivgqsg1bb34bif99pa58cqlamfv727h8p69b5r3x0kj1mkk";} + {name="libkdegames";value="0k29wf6zcqvpf9xzrxbizn4pi8mijq8rbr01vck9wx8glj3306gj";} + {name="libkexiv2";value="048rx25n64fyyms9wjdsnlngh5j7650gzxpszf683jgf70x9paj5";} + {name="libkipi";value="0i8k2x68n88v0jwp0yqwbgx6n13vrspb66p3dckwkh4nfsrmnpwn";} + {name="libkmahjongg";value="0b5gfqqk0jjkbhdvh55njlci1k18icijq8a0m987x92dlhyn6hf2";} + {name="libksane";value="13ghwcssd6zp731lcqa3z8q974g5sv48nlp38crpni83jz7wqyl8";} + {name="lokalize";value="1i09brs8v71xhyn3fw69asfvz95gw5iblrnqzf1iybh858fz3sg8";} + {name="lskat";value="11754yxbabhps0w521rzcsqjpkxdk53ikqjchhr91syiymf556as";} + {name="marble";value="07d6hgb65r6aa9h4ikxnssfiq5a0qqbvlq68mp9qib7hhl38qrcx";} + {name="mplayerthumbs";value="1z7f4ibs8jms61kary73p0v4myxsxsag299zp1h3ldfbfshv73yv";} + {name="nepomuk-core";value="08cqvw42zzq981vs9gdix5jjsfgn2i4x0hi7q5ajd2rqyjxngh3s";} + {name="nepomuk-widgets";value="0ncvza1zlk203q57741rx1cj6gqy009ygqpcnlnfbd6xpqyphqq7";} + {name="okteta";value="0b1y8r6fa8dy3xjyiyzj4iy4shwgqff4lv9hrw2dvm3knfvjiyzz";} + {name="okular";value="0wlk1rwgif1qbk7f2v26bgg27vhbjfr4pgbdvncmms43839n9zqq";} + {name="oxygen-icons";value="1w5yn2xyp5kadg5rf2zxb88apgj13c055if3fj5w70mxir1z8nzq";} + {name="pairs";value="00ygnr0r064z33z19mirz79b9dj0wfk6yp38n2rmj1z2568pq9gq";} + {name="palapeli";value="0gbp50aph2ckjj6bw7f5p2xfxw6x8qnypk45c4ys2bfj3xs3kzp9";} + {name="parley";value="0s1iv864ijrlp9wcj13lvy68133dq7spvrmf2xnspn98ba7dydc0";} + {name="perlkde";value="131dipnns5rmncrxh7wmpqxnwxkvnh11rhb7dx76gc9mvgr6k3kg";} + {name="perlqt";value="1rkjv0xmn7v8mgmlfvzfa5ix18xl62hcbgrjg800hrvj43cj7ixj";} + {name="picmi";value="18im6q18zsahx4y75d21ihnmpn00ml8y99xgcwf061jknf3l9rfa";} + {name="poxml";value="0l9zarf51p10hqdnfzks4q7vhm1lkjh1cyi3bqn097jncsv3c0pi";} + {name="print-manager";value="1csnbl0q50g7b0yc681pgf88vvw7f4vzqpq493nn1n6gr8i46l6v";} + {name="pykde4";value="0mwvs209d75s3smsb9wbvcp5n94a9rxh8nvh8d1wyvlkn60kfpr5";} + {name="qtruby";value="1d89h83is86szy4bqa9rb9xcc3iwjgl3kxldcy64cls44cif9vkx";} + {name="qyoto";value="063m9a8b7qc1hxii2w3zyf69b84129zppbrxm83i4q4s0v5y63in";} + {name="rocs";value="02f9cnzkq18fiblih384v3ngaps9lhgqjmzqv2k8k09bxm6pyiz5";} + {name="smokegen";value="17bgshfmxa8iyp65fss3g74wdjdy4rnq7wsf223ls38jk6fjnkmi";} + {name="smokekde";value="0dl24czf5rspgqwm5i8f0a6y911alirnz2vdjywa2j2nimi690il";} + {name="smokeqt";value="1j0qpqr5zjffr8hfkyav50jpxj8xj8n9jk24gahvjnkk9wpyqbjc";} + {name="step";value="1xz074h5hwmacf4v4ca2m580h1sppvvgcwbym142vr55pd3yd2f3";} + {name="superkaramba";value="16xijicbqj771mdy9l91ml8ikm0qjs9ykj8nz6az2xzw6q8izz2g";} + {name="svgpart";value="1d6si3w4kpbxgzyi044cr1ch9b0jrl23fyzabdzxgb2qkcfxifng";} + {name="sweeper";value="1snjprdkzgf80z6waclhibzwcky6k4qam9bkgfd9lkaf9hba5x88";} + {name="umbrello";value="08h82pizkkgqqdgfs2jinwzjb6bc2nr4zyh50fkr0bk0xlspp87f";} +]; +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="kdenetwork"; + split=true; + pkgs=[ + { name="kdenetwork-filesharing"; sane="kdenetwork_filesharing"; } + { name="kdenetwork-strigi-analyzers"; sane="kdenetwork_strigi_analyzers"; } + { name="kdnssd"; } + { name="kget"; } + { name="kopete"; } + { name="kppp"; } + { name="krdc"; } + { name="krfb"; } + ]; +} +{ + 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="kdetoys"; + split=true; + pkgs=[ + { name="amor"; } + { name="kteatime"; } + { name="ktux"; } + ]; +} +{ + module="kdesdk"; + split=true; + pkgs=[ + { name="cervisia"; } + { name="dolphin-plugins"; sane="dolphin_plugins"; } + { name="kapptemplate"; } + { name="kcachegrind"; } + { name="kde-dev-scripts"; sane="kde_dev_scripts"; } + { name="kde-dev-utils"; sane="kde_dev_utils"; } + { name="kdesdk-kioslaves"; sane="kdesdk_kioslaves"; } + { name="kdesdk-strigi-analyzers"; sane="kdesdk_strigi_analyzers"; } + { name="kdesdk-thumbnailers"; sane="kdesdk_thumbnailers"; } + { name="kompare"; } + { name="lokalize"; } + { name="okteta"; } + { name="poxml"; } + { name="umbrello"; } + ]; +} +{ + 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="kdeadmin"; + split=true; + pkgs=[ + { name="kcron"; } + { name="ksystemlog"; } + { name="kuser"; } + ]; +} +{ + 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="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="kdelibs"; split=false;} +{ 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="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.11/l10n/manifest-4.11.4.nix b/pkgs/desktops/kde-4.11/l10n/manifest-4.11.4.nix new file mode 100644 index 00000000000..711ba9a7f3e --- /dev/null +++ b/pkgs/desktops/kde-4.11/l10n/manifest-4.11.4.nix @@ -0,0 +1,272 @@ +[ +{ + lang = "ar"; + saneName = "ar"; + sha256 = "11dzsk6kvqpvpi77414hyis5s0kp4l0xplyyhvkp28shnbzx3cab"; +} +{ + lang = "bg"; + saneName = "bg"; + sha256 = "0f4j7s31gw9g183wsxh27dvqkckhrlh1yr4dmd6cjiabpnk5avr5"; +} +{ + lang = "bs"; + saneName = "bs"; + sha256 = "09f8dayah2gb4j70pljih8rvk6fiprfvmagii72ymfjw5p609msh"; +} +{ + lang = "ca"; + saneName = "ca"; + sha256 = "08jlsy3ak9c5jbwan5wsq4y66sz6pam5mym1hmjfwp1dzknd8lxn"; +} +{ + lang = "ca@valencia"; + saneName = "ca_valencia"; + sha256 = "0lwk1qf6xnvxd6lmdif9126i4bna7cwk8dj0dd3s2qm4613gyjdz"; +} +{ + lang = "cs"; + saneName = "cs"; + sha256 = "16lm4k45rrxvc228bjzl57a39aybkh6kizm960znkfg8dslxvhnr"; +} +{ + lang = "da"; + saneName = "da"; + sha256 = "1z0mkh7sqsblhar3fjind0m63mlx817fhw1r9f0jrijkwmv163cx"; +} +{ + lang = "de"; + saneName = "de"; + sha256 = "15611y569bk17ss62ic56ai6lwpqhg9apsqcnkdlh1iwk2wkzg8x"; +} +{ + lang = "el"; + saneName = "el"; + sha256 = "1p75mfw2rs9qb0m2zybscrv2jhj7aq8w5a1rxs3hrddr2wc2k0g1"; +} +{ + lang = "en_GB"; + saneName = "en_GB"; + sha256 = "0zj9qn2k160184x9lypxyl6d5r8drxz585lagsvd7l0ckx3maqxn"; +} +{ + lang = "es"; + saneName = "es"; + sha256 = "0bc11cxjf8672mch30asn34pnn53a3xhz9wb4jly9bxy3bjs93m6"; +} +{ + lang = "et"; + saneName = "et"; + sha256 = "1l1h1q65qsmrzgcvralpdmmmnpricbiyc5bhrd1valvgvwys2rj2"; +} +{ + lang = "eu"; + saneName = "eu"; + sha256 = "1wsgvmacix0vd7qr029lsgnksw3hnx57aczigcf7m5dy1mi2jk1j"; +} +{ + lang = "fa"; + saneName = "fa"; + sha256 = "1j7f32wsbnpzdhfki9wnb18mq26la61f6ksmad33cikq3pwn1qvf"; +} +{ + lang = "fi"; + saneName = "fi"; + sha256 = "1l5cvnbkgv9kxn2b67ycmkyqkdpjzq3a8ggsmn4397bj9vlplcdy"; +} +{ + lang = "fr"; + saneName = "fr"; + sha256 = "1lnayg8j76gzhxl21x5z92q3g8gc791c4hlgr3ifg54s8rknbbf6"; +} +{ + lang = "ga"; + saneName = "ga"; + sha256 = "0z8ncf32qpp9538kb5l41qhvk0c05j168x5q72cfliigs77m9jya"; +} +{ + lang = "gl"; + saneName = "gl"; + sha256 = "10pjjkp4nhlrjlv38w3srl5x3fi8713qsbp4i92bksas6p1n6pnw"; +} +{ + lang = "he"; + saneName = "he"; + sha256 = "1d4094ql7nzw5gvhgvdw9j8pacpnlbq76j9670wj5z5mxaggm5n4"; +} +{ + lang = "hi"; + saneName = "hi"; + sha256 = "18s7h8bldkhl55akglmdaq1kx1z8171g96ysxvljy3aqnv400cpd"; +} +{ + lang = "hr"; + saneName = "hr"; + sha256 = "14insp30nb18dva5rpd1mgixhbm6rrkbbs7wl796jqzxlxin1bbg"; +} +{ + lang = "hu"; + saneName = "hu"; + sha256 = "02mwbsg8cvnrqizcggpsq6r9hp26z4r5sg62iksknl4fahzi9jwa"; +} +{ + lang = "ia"; + saneName = "ia"; + sha256 = "0w3yncz364rd7jby39cqmmswh5p7i7hn08yfn038pj9k2wvg3nli"; +} +{ + lang = "is"; + saneName = "is"; + sha256 = "09ja8vnl8ykh9j0wdrmlwhjj71dsl0kl1mlsbi0c95dphbj58m0q"; +} +{ + lang = "it"; + saneName = "it"; + sha256 = "145r6lcf7mbnfv0kk0kxmd7aq80y5dlkxpp2fy31rigpkz8syiaz"; +} +{ + lang = "ja"; + saneName = "ja"; + sha256 = "1s11lqac8j1qbp0fq67zq7jss7j60pwgprjki73s77icir5sijpv"; +} +{ + lang = "kk"; + saneName = "kk"; + sha256 = "1y27ax3viixbhh6yrib9k4px0y4aj6fzpnyxd9j6yibh4gmkxa49"; +} +{ + lang = "km"; + saneName = "km"; + sha256 = "08nb4fv4hafxyhdxsdf29yh3nv5c0hb3ar0329xlw5kvkvfckgza"; +} +{ + lang = "ko"; + saneName = "ko"; + sha256 = "1qzzbphcjl506wha4i9drzc0hrlrc4cicmw37vl1hylbkw7lfrdf"; +} +{ + lang = "lt"; + saneName = "lt"; + sha256 = "1rqjv25y8s0g5mr47fasybcfvw36i9z41l8gpi3rdvv52b4s0n4c"; +} +{ + lang = "lv"; + saneName = "lv"; + sha256 = "1cfdvbq40fk9f6xqz27bzy4shrh0i7sqbaf3l54f0zpgnqmk6c8a"; +} +{ + lang = "mr"; + saneName = "mr"; + sha256 = "1jz355nz34f15gic4hl09qdd648gjl3ybinbf5kpy0nj5d052lwj"; +} +{ + lang = "nb"; + saneName = "nb"; + sha256 = "1v1f42cipx39i9as0k2arb51a4qizh65vdld35dlkfxnkkwl5gb2"; +} +{ + lang = "nds"; + saneName = "nds"; + sha256 = "1mwrwwclds1fkwgak1fl148qpxblkk5jxbnjfl7lgc2a28c4w4y8"; +} +{ + lang = "nl"; + saneName = "nl"; + sha256 = "0x9jqq4jbf6664m201pjf0bk5m7kziqpc59ai6n3amq7ihg5zbyj"; +} +{ + lang = "nn"; + saneName = "nn"; + sha256 = "1x8hr1sb36jnw9g897dww3c72hqrxhpjgnzm6x8xcqjb93rrjqnz"; +} +{ + lang = "pa"; + saneName = "pa"; + sha256 = "1lvdz8hi5y6sia6il8x47k607dl11abmgpa07gvplv5g6gshm27q"; +} +{ + lang = "pl"; + saneName = "pl"; + sha256 = "0pnzdz0ms85cqjd2aav2cm1w5rb3v0q96nz7b70dz9mnyxrnjiha"; +} +{ + lang = "pt"; + saneName = "pt"; + sha256 = "1jgadk819ws6zcvkqrvjyx7kn0sgsdvmg15hi03mn4nijf8mzzlb"; +} +{ + lang = "pt_BR"; + saneName = "pt_BR"; + sha256 = "06yyrv21g0fyvisj45r9iqiclydj0y5lb4bkykd28f0g6nrcjlzv"; +} +{ + lang = "ro"; + saneName = "ro"; + sha256 = "040fnm9rmj156mn033axx6isa9fvaskw5dqzh40mjchqz4bgw6vx"; +} +{ + lang = "ru"; + saneName = "ru"; + sha256 = "1p5glmm7a495b1avv9n9y1im04z8nxps13pf0crvzdwplkiin8id"; +} +{ + lang = "sk"; + saneName = "sk"; + sha256 = "19d10b807kg50jq03xgc84dksfcfmp1vimqjbfd53qgdxdfxa9c0"; +} +{ + lang = "sl"; + saneName = "sl"; + sha256 = "1lpgyar5hq39463dsgwlmym5rgivyqyipls8l0km6sy24kmh43g6"; +} +{ + lang = "sr"; + saneName = "sr"; + sha256 = "0600x4vgflbyg0vr97vqpd405j311780d983xrf22awbyqg3hiqa"; +} +{ + lang = "sv"; + saneName = "sv"; + sha256 = "1zi3s9g4nykxrrpqm2fq8didip1jzv8iyscrg7fc8mls7ikz51bp"; +} +{ + lang = "tg"; + saneName = "tg"; + sha256 = "15zm9p0g4qrb2wz761gvpd05yz2pz8lpcsmdqx8lclvlqr58xl8v"; +} +{ + lang = "tr"; + saneName = "tr"; + sha256 = "039jmlljc3fdynsa27whmx50jb8jx3x7k1l6xdrijdk4j43j047p"; +} +{ + lang = "ug"; + saneName = "ug"; + sha256 = "05krj1b7z1rirr7141pyaxssnbgf74v8bcxhb2m9yb944nx2z1wx"; +} +{ + lang = "uk"; + saneName = "uk"; + sha256 = "19bkp5hsxd5zfgdwyc6bx1425phd8d9kd43xin13cdcikdq5nh6z"; +} +{ + lang = "vi"; + saneName = "vi"; + sha256 = "1fy0v0zd8mq59f3wlpn855ff8q8x6yy8a17vjnwfw69qmar0x4g8"; +} +{ + lang = "wa"; + saneName = "wa"; + sha256 = "0h8kycdjg8cglb7sn5m4v8djwb4smhzmws2khr309nv4930vqf14"; +} +{ + lang = "zh_CN"; + saneName = "zh_CN"; + sha256 = "0aaybsbbf19js8bxmj7kqqjnqp68fzkqdrbhjlh5c1jdxqvlr2w8"; +} +{ + lang = "zh_TW"; + saneName = "zh_TW"; + sha256 = "1xgndbjqhgw5pnws8qbb4xvrcnbr96m275hrhd3rb99q5xd4br20"; +} +] From 614544b4393f19a75d84ad04885b522f3a215858 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 4 Dec 2013 18:26:48 +0100 Subject: [PATCH 117/152] haskell-src: clean out the obsolete happy parser that's included in the distribution tarball --- pkgs/development/libraries/haskell/haskell-src/1.0.1.5.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/haskell-src/1.0.1.5.nix b/pkgs/development/libraries/haskell/haskell-src/1.0.1.5.nix index 1dbbbec550a..cfaabe7f6b0 100644 --- a/pkgs/development/libraries/haskell/haskell-src/1.0.1.5.nix +++ b/pkgs/development/libraries/haskell/haskell-src/1.0.1.5.nix @@ -6,6 +6,7 @@ cabal.mkDerivation (self: { sha256 = "1ay3i2sbrp0pzg6fagg8gqrwq5lcnm5jb5sr11frbk274a82cdwz"; buildDepends = [ syb ]; buildTools = [ happy ]; + preConfigure = "runhaskell Setup.hs clean"; meta = { description = "Support for manipulating Haskell source code"; license = self.stdenv.lib.licenses.bsd3; From ad90f2f0b88bbd7eaf624d9898489cd538cdb29d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 4 Dec 2013 21:04:30 +0100 Subject: [PATCH 118/152] Adding ffmpeg 2.x --- pkgs/development/libraries/ffmpeg/2.x.nix | 104 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 5 ++ 2 files changed, 109 insertions(+) create mode 100644 pkgs/development/libraries/ffmpeg/2.x.nix diff --git a/pkgs/development/libraries/ffmpeg/2.x.nix b/pkgs/development/libraries/ffmpeg/2.x.nix new file mode 100644 index 00000000000..475da7c4c64 --- /dev/null +++ b/pkgs/development/libraries/ffmpeg/2.x.nix @@ -0,0 +1,104 @@ +{ stdenv, fetchurl, pkgconfig, yasm, zlib, bzip2, alsaLib, texinfo, perl +, mp3Support ? true, lame ? null +, speexSupport ? true, speex ? null +, theoraSupport ? true, libtheora ? null +, vorbisSupport ? true, libvorbis ? null +, vpxSupport ? false, libvpx ? null +, x264Support ? true, x264 ? null +, xvidSupport ? true, xvidcore ? null +, opusSupport ? true, libopus ? null +, vdpauSupport ? true, libvdpau ? null +, vaapiSupport ? true, libva ? null +, faacSupport ? false, faac ? null +, dc1394Support ? false, libdc1394 ? null +, x11grabSupport ? false, libXext ? null, libXfixes ? null +, playSupport ? true, SDL ? null +, freetypeSupport ? true, freetype ? null, fontconfig ? null +}: + +assert speexSupport -> speex != null; +assert theoraSupport -> libtheora != null; +assert vorbisSupport -> libvorbis != null; +assert vpxSupport -> libvpx != null; +assert x264Support -> x264 != null; +assert xvidSupport -> xvidcore != null; +assert opusSupport -> libopus != null; +assert vdpauSupport -> libvdpau != null; +assert vaapiSupport -> libva != null; +assert faacSupport -> faac != null; +assert x11grabSupport -> libXext != null && libXfixes != null; +assert playSupport -> SDL != null; +assert freetypeSupport -> freetype != null; + +stdenv.mkDerivation rec { + name = "ffmpeg-2.1.1"; + + src = fetchurl { + url = "http://www.ffmpeg.org/releases/${name}.tar.bz2"; + sha256 = "1qnspbpwa6cflsb6mkm84ay4nfx60ism6d7lgvnasidck9dmxydy"; + }; + + # `--enable-gpl' (as well as the `postproc' and `swscale') mean that + # the resulting library is GPL'ed, so it can only be used in GPL'ed + # applications. + configureFlags = [ + "--enable-gpl" + "--enable-postproc" + "--enable-swscale" + "--enable-shared" + "--enable-avresample" + "--enable-runtime-cpudetect" + ] + ++ stdenv.lib.optional mp3Support "--enable-libmp3lame" + ++ stdenv.lib.optional speexSupport "--enable-libspeex" + ++ stdenv.lib.optional theoraSupport "--enable-libtheora" + ++ stdenv.lib.optional vorbisSupport "--enable-libvorbis" + ++ stdenv.lib.optional vpxSupport "--enable-libvpx" + ++ stdenv.lib.optional x264Support "--enable-libx264" + ++ stdenv.lib.optional xvidSupport "--enable-libxvid" + ++ stdenv.lib.optional opusSupport "--enable-libopus" + ++ stdenv.lib.optional vdpauSupport "--enable-vdpau" + ++ stdenv.lib.optional faacSupport "--enable-libfaac --enable-nonfree" + ++ stdenv.lib.optional dc1394Support "--enable-libdc1394" + ++ stdenv.lib.optional x11grabSupport "--enable-x11grab" + ++ stdenv.lib.optional playSupport "--enable-ffplay" + ++ stdenv.lib.optional freetypeSupport "--enable-libfreetype --enable-fontconfig"; + + buildInputs = [ pkgconfig lame yasm zlib bzip2 alsaLib texinfo perl ] + ++ stdenv.lib.optional mp3Support lame + ++ stdenv.lib.optional speexSupport speex + ++ stdenv.lib.optional theoraSupport libtheora + ++ stdenv.lib.optional vorbisSupport libvorbis + ++ stdenv.lib.optional vpxSupport libvpx + ++ stdenv.lib.optional x264Support x264 + ++ stdenv.lib.optional xvidSupport xvidcore + ++ stdenv.lib.optional opusSupport libopus + ++ stdenv.lib.optional vdpauSupport libvdpau + ++ stdenv.lib.optional vaapiSupport libva + ++ stdenv.lib.optional faacSupport faac + ++ stdenv.lib.optional dc1394Support libdc1394 + ++ stdenv.lib.optionals x11grabSupport [ libXext libXfixes ] + ++ stdenv.lib.optional playSupport SDL + ++ stdenv.lib.optionals freetypeSupport [ freetype fontconfig ]; + + enableParallelBuilding = true; + + crossAttrs = { + dontSetConfigureCross = true; + configureFlags = configureFlags ++ [ + "--cross-prefix=${stdenv.cross.config}-" + "--enable-cross-compile" + "--target_os=linux" + "--arch=${stdenv.cross.arch}" + ]; + }; + + passthru = { + inherit vdpauSupport; + }; + + meta = { + homepage = http://www.ffmpeg.org/; + description = "A complete, cross-platform solution to record, convert and stream audio and video"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e107812ef9a..34f5bc58e43 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4114,6 +4114,11 @@ let texinfo = texinfo5; }; + ffmpeg_2 = callPackage ../development/libraries/ffmpeg/2.x.nix { + vpxSupport = !stdenv.isMips; + texinfo = texinfo5; + }; + ffms = callPackage ../development/libraries/ffms { }; fftw = callPackage ../development/libraries/fftw { From 9c60834b23a5beb497167fd3b5075258031a5f4e Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 5 Dec 2013 02:22:47 +0100 Subject: [PATCH 119/152] Adding support for Portuguese language for Aspell --- pkgs/development/libraries/aspell/dictionaries.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/libraries/aspell/dictionaries.nix b/pkgs/development/libraries/aspell/dictionaries.nix index 0f27705160f..6500e602e85 100644 --- a/pkgs/development/libraries/aspell/dictionaries.nix +++ b/pkgs/development/libraries/aspell/dictionaries.nix @@ -140,6 +140,15 @@ in { }; }; + pt = buildDict { + shortName = "pt-0.50-1"; + fullName = "Portuguese"; + src = fetchurl { + url = mirror://gnu/aspell/dict/pt/aspell-pt-0.50-1.tar.bz2; + sha256 = "07xzlnxxzadqsapng29p2gdwj0bijv10wpjnqlwzmkxnx6fxzkcy"; + }; + }; + ru = buildDict { shortName = "ru-0.99f7-1"; fullName = "Russian"; From 1d7108d5f53aa276180c404d10d30b63770c0d75 Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Thu, 5 Dec 2013 04:11:35 +0000 Subject: [PATCH 120/152] drush: add expression --- pkgs/development/tools/misc/drush/default.nix | 38 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/tools/misc/drush/default.nix diff --git a/pkgs/development/tools/misc/drush/default.nix b/pkgs/development/tools/misc/drush/default.nix new file mode 100644 index 00000000000..cb534d511ea --- /dev/null +++ b/pkgs/development/tools/misc/drush/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchurl, php, which, makeWrapper, bash, coreutils, ncurses }: + +stdenv.mkDerivation rec { + name = "drush-6.1.0"; + + meta = with stdenv.lib; { + description = "Command-line shell and Unix scripting interface for Drupal"; + homepage = http://github.com/drush-ops/drush; + license = licenses.gpl2; + maintainers = with maintainers; [ lovek323 ]; + platforms = platforms.all; + }; + + src = fetchurl { + url = https://github.com/drush-ops/drush/archive/6.1.0.tar.gz; + sha256 = "1jgnc4jjyapyn04iczvcz92ic0vq8d1w8xi55ismqyy5cxhqj6bp"; + }; + + consoleTable = fetchurl { + url = http://download.pear.php.net/package/Console_Table-1.1.3.tgz; + sha256 = "07gbjd7m1fj5dmavr0z20vkqwx1cz2522sj9022p257jifj1yl76"; + }; + + buildInputs = [ php which makeWrapper ]; + + installPhase = '' + # install libraries + cd lib + tar -xf ${consoleTable} + cd .. + + mkdir -p "$out" + cp -r . "$out/src" + mkdir "$out/bin" + wrapProgram "$out/src/drush" --prefix PATH : "${which}/bin:${php}/bin:${bash}/bin:${coreutils}/bin:${ncurses}/bin" + ln -s "$out/src/drush" "$out/bin/drush" + ''; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e107812ef9a..9256df568de 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3597,6 +3597,8 @@ let doxygen_gui = callPackage ../development/tools/documentation/doxygen { }; + drush = callPackage ../development/tools/misc/drush { }; + eggdbus = callPackage ../development/tools/misc/eggdbus { }; elfutils = callPackage ../development/tools/misc/elfutils { }; From 610532ac6a9c652c54dcbe1ef558ddd726fc969b Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Thu, 5 Dec 2013 07:42:48 +0200 Subject: [PATCH 121/152] Revert "fluidsynth: switch to cmake build system" which causes mpd and calf to fail to detect fluidsynth. This reverts commit cd16faa25738e1fd885279b0707e6a842e5479c8. --- pkgs/applications/audio/fluidsynth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/fluidsynth/default.nix b/pkgs/applications/audio/fluidsynth/default.nix index d9998a9f814..89e95f62cd5 100644 --- a/pkgs/applications/audio/fluidsynth/default.nix +++ b/pkgs/applications/audio/fluidsynth/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, alsaLib, glib, jackaudio, libsndfile, pkgconfig -, pulseaudio, cmake }: +, pulseaudio }: stdenv.mkDerivation rec { name = "fluidsynth-${version}"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-framework CoreAudio"; - buildInputs = [ cmake glib libsndfile pkgconfig ] + buildInputs = [ glib libsndfile pkgconfig ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ alsaLib pulseaudio jackaudio ]; meta = with stdenv.lib; { From 3c1fb8271843528e58843ee3aea2db6ce82f21b8 Mon Sep 17 00:00:00 2001 From: Roelof Wobben Date: Thu, 5 Dec 2013 09:14:25 +0100 Subject: [PATCH 122/152] added gnome-menus-3 --- pkgs/desktops/cinnamon/gnome-menus.nix | 24 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 6 ++++++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/desktops/cinnamon/gnome-menus.nix diff --git a/pkgs/desktops/cinnamon/gnome-menus.nix b/pkgs/desktops/cinnamon/gnome-menus.nix new file mode 100644 index 00000000000..fe332355626 --- /dev/null +++ b/pkgs/desktops/cinnamon/gnome-menus.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, intltool, pkgconfig, glib}: +let + version = "3.10.1"; +in +stdenv.mkDerivation { + name = "gnome-menus-${version}"; + + src = fetchurl { + url = "http://ftp.gnome.org/pub/gnome/sources/gnome-menus/3.10/gnome-menus-3.10.1.tar.xz"; + sha256 = "0wcacs1vk3pld8wvrwq7fdrm11i56nrajkrp6j1da6jc4yx0m5a6"; + }; + + + preBuild = "patchShebangs ./scripts"; + + buildInputs=[ intltool pkgconfig glib ]; + + meta = { + homepage = "http://www.gnome.org"; + description = "Gnome menu specification " ; + + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ac304ad462b..71bd2dc615c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9576,6 +9576,12 @@ let ### DESKTOP ENVIRONMENTS + cinnamon = recurseIntoAttrs rec{ + callPackage=pkgs.newScope pkgs.cinnamon; + inherit (gnome3) gnome_common ; + gnome_menus = callPackage ../desktops/cinnamon/gnome-menus.nix { } ; + }; + enlightenment = callPackage ../desktops/enlightenment { }; e17 = recurseIntoAttrs ( From e5b0867492dad10e331ff622780f0e4d2fe5f7bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 5 Dec 2013 10:40:27 +0100 Subject: [PATCH 123/152] Updating zathura to 0.2.6 --- pkgs/applications/misc/zathura/core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix index f3431f9480f..00e1e6cd28a 100644 --- a/pkgs/applications/misc/zathura/core/default.nix +++ b/pkgs/applications/misc/zathura/core/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, gtk, girara, gettext, docutils, file, makeWrapper }: stdenv.mkDerivation rec { - version = "0.2.5"; + version = "0.2.6"; name = "zathura-core-${version}"; src = fetchurl { url = "http://pwmt.org/projects/zathura/download/zathura-${version}.tar.gz"; - sha256 = "1lw9q0x4b7x6z86hwgs93f8srimd0sj8fwg91185f63yz9g800fr"; + sha1 = "d84878388969d523027a1661f49fd29638bd460b"; }; buildInputs = [ pkgconfig file gtk girara gettext makeWrapper ]; From 82fefa0de84c20a8c32ad7324174d44d9868aa0a Mon Sep 17 00:00:00 2001 From: Sergey Mironov Date: Thu, 5 Dec 2013 14:39:25 +0400 Subject: [PATCH 124/152] yandex-disk: fix bash-completion, add long description bashCompletion created 'have1' file in the current directory occasionally. this patch fixes it. --- pkgs/tools/filesystems/yandex-disk/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/filesystems/yandex-disk/default.nix b/pkgs/tools/filesystems/yandex-disk/default.nix index 31b1471fb7f..24dbae08fab 100644 --- a/pkgs/tools/filesystems/yandex-disk/default.nix +++ b/pkgs/tools/filesystems/yandex-disk/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { cp -r -t $out/share usr/share/* cp -r -t $out/etc etc/* - sed -i 's@have@${which}/bin/which >/dev/null 2>&1@' \ + sed -i 's@have@${which}/bin/which >/dev/null 2>\&1@' \ $out/etc/bash_completion.d/yandex-disk-completion.bash ${patchelf}/bin/patchelf \ @@ -49,6 +49,15 @@ stdenv.mkDerivation rec { maintainers = with stdenv.lib.maintainers; [smironov]; platforms = ["i686-linux" "x86_64-linux"]; license = stdenv.lib.licenses.unfree; + longDescription = '' + Yandex.Disk console client for Linux lets you manage files on Disk without + using a window interface or programs that support WebDAV. The advantages + of the console client compared to a WebDAV connection: + * low system resource requirements; + * faster file reading and writing speeds; + * faster syncing with Disk's server; + * no need to be constantly connected to work with files. + ''; }; } From a286f65a93b1e764608a61ddf41d6dfafb4e49f0 Mon Sep 17 00:00:00 2001 From: Arvin Moezzi Date: Thu, 5 Dec 2013 14:47:54 +0100 Subject: [PATCH 125/152] fix: syntax error in networking/mumble --- pkgs/applications/networking/mumble/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index a0083700054..8ed7c8d64d4 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, qt4, boost, speechd, protobuf, libsndfile, - speex, libopus, avahi, pkgconfig + speex, libopus, avahi, pkgconfig, jackSupport ? false, jackaudio ? null }: From 9bda7275ceadb6aa436f6fa2db361b43cedad1c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Cad=C3=A9?= Date: Thu, 5 Dec 2013 16:20:32 +0100 Subject: [PATCH 126/152] added OCaml package ocamlsdl --- .../ocaml-modules/ocamlsdl/default.nix | 27 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/ocaml-modules/ocamlsdl/default.nix diff --git a/pkgs/development/ocaml-modules/ocamlsdl/default.nix b/pkgs/development/ocaml-modules/ocamlsdl/default.nix new file mode 100644 index 00000000000..6361dbd9ae6 --- /dev/null +++ b/pkgs/development/ocaml-modules/ocamlsdl/default.nix @@ -0,0 +1,27 @@ +{stdenv, fetchurl, ocaml, pkgconfig, findlib, SDL, SDL_image, SDL_mixer, SDL_ttf, SDL_gfx, lablgl }: + +let + ocaml_version = (builtins.parseDrvName ocaml.name).version; + pname = "ocamlsdl"; + version = "0.9.1"; +in + +stdenv.mkDerivation { + name = "${pname}-${version}"; + + src = fetchurl { + url = "http://downloads.sourceforge.net/project/ocamlsdl/OCamlSDL/ocamlsdl-0.9.1/ocamlsdl-0.9.1.tar.gz"; + sha256 = "abfb295b263dc11e97fffdd88ea1a28b46df8cc2b196777093e4fe7f509e4f8f"; + }; + + buildInputs = [ocaml pkgconfig findlib SDL SDL_image SDL_mixer SDL_ttf SDL_gfx lablgl]; + + propagatedBuildInputs = [ SDL SDL_image SDL_mixer SDL_ttf SDL_gfx pkgconfig ]; + createFindlibDestdir = true; + + meta = { + homepage = http://ocamlsdl.sourceforge.net/; + description = "OCaml bindings for SDL 1.2"; + license = "LGPL 2.1"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ab734240924..90b1b6435c1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2979,6 +2979,8 @@ let ocaml_react = callPackage ../development/ocaml-modules/react { }; + ocamlsdl= callPackage ../development/ocaml-modules/ocamlsdl { }; + ocaml_sqlite3 = callPackage ../development/ocaml-modules/sqlite3 { }; ocaml_ssl = callPackage ../development/ocaml-modules/ssl { }; From bb9caf40ddaa68fb53ded80b493b6d145b492af1 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 5 Dec 2013 10:21:06 -0500 Subject: [PATCH 127/152] Linux 3.12.3 Signed-off-by: Shea Levy --- pkgs/os-specific/linux/kernel/linux-3.12.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.12.nix b/pkgs/os-specific/linux/kernel/linux-3.12.nix index 4b1709b310c..df5f596dc74 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.12.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.12.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.12.2"; + version = "3.12.3"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "19kjhvg65z6l21srghjmlfyrwr0pswbkb02nd095v45lkyi3kwyk"; + sha256 = "b649c759646a630893c98855fb7e9e87e954105e3acac7b81ca85b1161572713"; }; features.iwlwifi = true; From fc9772a270f82cd3adf4ad88c90ca92b0b2de2a6 Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Thu, 5 Dec 2013 16:20:31 +0000 Subject: [PATCH 128/152] openttd: update from 1.3.2 to 1.3.3 --- pkgs/games/openttd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/openttd/default.nix b/pkgs/games/openttd/default.nix index bf9f6d1060e..6b385bc2e56 100644 --- a/pkgs/games/openttd/default.nix +++ b/pkgs/games/openttd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "openttd-${version}"; - version = "1.3.2"; + version = "1.3.3"; src = fetchurl { url = "http://binaries.openttd.org/releases/${version}/${name}-source.tar.xz"; - sha256 = "02r7xfq9a5x1y2wpdhqyczaj48z0qan33hs4i2liahsg1k6w1vzn"; + sha256 = "0pfagqw8i1c6zrzarlwivrcac8b8ai1inam9qc01hj3h04nfv4b9"; }; buildInputs = [ SDL libpng pkgconfig xz zlib freetype fontconfig ]; From b4c5a6f15f2e3744017ddeb6888d86522ae133f5 Mon Sep 17 00:00:00 2001 From: Tomasz Kontusz Date: Thu, 5 Dec 2013 23:29:23 +0100 Subject: [PATCH 129/152] Rename quassel packages --- pkgs/applications/networking/irc/quassel/default.nix | 8 ++++++-- pkgs/top-level/all-packages.nix | 6 ++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/irc/quassel/default.nix b/pkgs/applications/networking/irc/quassel/default.nix index 44792693b36..9066bfb6c4c 100644 --- a/pkgs/applications/networking/irc/quassel/default.nix +++ b/pkgs/applications/networking/irc/quassel/default.nix @@ -4,6 +4,7 @@ , withKDE ? stdenv.isLinux # enable KDE integration , ssl ? true # enable SSL support , previews ? false # enable webpage previews on hovering over URLs +, tag ? "" # tag added to the package name , stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon }: let @@ -11,13 +12,16 @@ let in with stdenv; mkDerivation rec { - name = "quassel-0.9.2"; + version = "0.9.2"; + name = "quassel${tag}-${version}"; src = fetchurl { - url = "http://quassel-irc.org/pub/${name}.tar.bz2"; + url = "http://quassel-irc.org/pub/quassel-${version}.tar.bz2"; sha256 = "1h2kzi4pgfv3qmvhxix9fffdjixs3bsya0i5c18dkh894mh02kgh"; }; + enableParallelBuilding = true; + buildInputs = [ cmake qt4 ] ++ lib.optional withKDE kdelibs ++ lib.optional withKDE automoc4 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e107812ef9a..5151ef5c160 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9709,14 +9709,16 @@ let quassel = callPackage ../applications/networking/irc/quassel { }; - quasselDaemon = appendToName "daemon" (self.quassel.override { + quasselDaemon = (self.quassel.override { monolithic = false; daemon = true; + tag = "-daemon"; }); - quasselClient = appendToName "client" (self.quassel.override { + quasselClient = (self.quassel.override { monolithic = false; client = true; + tag = "-client"; }); rekonq = callPackage ../applications/networking/browsers/rekonq { }; From 46e1f71e2d17f02c1378ac42e49a60038ffc79d4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 6 Dec 2013 12:02:24 +0100 Subject: [PATCH 130/152] haskell-defaults.nix: ghc-head builds 'cabal-install' using its internal version of Cabal, which is newer or equal to the latest release --- pkgs/top-level/haskell-defaults.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index 3589be3c682..19fcb98c82d 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -19,6 +19,8 @@ self : self.haskellPlatformArgs_future self // { haskellPlatform = null; extensibleExceptions = self.extensibleExceptions_0_1_1_4; + cabalInstall_1_18_0_2 = self.cabalInstall_1_18_0_2.override { Cabal = null; }; + cabalInstall = self.cabalInstall_1_18_0_2.override { Cabal = null; }; }; ghc763Prefs = From 5588f25a15d07805b94bd003d6cc133cf77b9012 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 6 Dec 2013 08:34:44 -0500 Subject: [PATCH 131/152] hg 2.8.1 Signed-off-by: Shea Levy --- pkgs/applications/version-management/mercurial/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 669aa5713a0..ce843369804 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -2,7 +2,7 @@ , guiSupport ? false, tk ? null, curses }: let - name = "mercurial-2.6.1"; + name = "mercurial-2.8.1"; in stdenv.mkDerivation { @@ -10,7 +10,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://mercurial.selenic.com/release/${name}.tar.gz"; - sha256 = "0r4fg269xnqgacc82ppm3wxl9wwvvgwz8z6zi1iai4gx76iklhdn"; + sha256 = "0riksf6p07yxfq1xlraqhl8cacsgb1gg7si185mlbdknrh2a4ffj"; }; inherit python; # pass it so that the same version can be used in hg2git From ba2b36a1d77da26a74ef6be68f185a3019f5126a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Cad=C3=A9?= Date: Fri, 6 Dec 2013 15:16:58 +0100 Subject: [PATCH 132/152] Add ocaml packages for version 4.01.0 --- 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 90b1b6435c1..b93096f91fd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3009,6 +3009,7 @@ let ocamlPackages_3_11_2 = mkOcamlPackages ocaml_3_11_2 pkgs.ocamlPackages_3_11_2; ocamlPackages_3_12_1 = mkOcamlPackages ocaml_3_12_1 pkgs.ocamlPackages_3_12_1; ocamlPackages_4_00_1 = mkOcamlPackages ocaml_4_00_1 pkgs.ocamlPackages_4_00_1; + ocamlPackages_4_01_0 = mkOcamlPackages ocaml_4_01_0 pkgs.ocamlPackages_4_01_0; ocaml_make = callPackage ../development/ocaml-modules/ocamlmake { }; From d643418edddaa2dcebb3be9a9292e90d722bfe9e Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Thu, 5 Dec 2013 13:27:06 +0200 Subject: [PATCH 133/152] wgetpaste: update from 2.20 to 2.23 --- pkgs/tools/text/wgetpaste/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/wgetpaste/default.nix b/pkgs/tools/text/wgetpaste/default.nix index a47eb2ddf9f..7635e042499 100644 --- a/pkgs/tools/text/wgetpaste/default.nix +++ b/pkgs/tools/text/wgetpaste/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, wget, bash, coreutils}: stdenv.mkDerivation rec { - version = "2.20"; + version = "2.23"; name = "wgetpaste-${version}"; src = fetchurl { url = "http://wgetpaste.zlin.dk/${name}.tar.bz2"; - sha256 = "7a53836d02e07cefc3c2978bb129a037fa1e1222ba0e275c4e818230a6d6fb9e"; + sha256 = "1xam745f5pmqi16br72a866117hnmcfwjyvsw1jhg3npbdnm9x6n"; }; # currently zsh-autocompletion support is not installed From ab98496d0b9afc38cfeed2ff3c6521cecd8bd6a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Fri, 6 Dec 2013 19:03:43 +0100 Subject: [PATCH 134/152] Revert "gpsd: update from 2.95 to 3.10" This update broke gpsd because the download url changed and trying to get version 3.10 from the old url returns an error document with a timestamp resulting in new hashes on every build. And more importantly, gpsd 3.10 switched to the scons build system, so even if the download url was correct it will fail to build until the expression is updated. This reverts commit 3f1c26b8257201dde5fda0e7381bcf4ad7422d09. --- pkgs/servers/gpsd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/gpsd/default.nix b/pkgs/servers/gpsd/default.nix index 4536cb94de7..25051167ca5 100644 --- a/pkgs/servers/gpsd/default.nix +++ b/pkgs/servers/gpsd/default.nix @@ -4,11 +4,11 @@ , libxslt, xmlto, gpsdUser ? "gpsd" }: stdenv.mkDerivation rec { - name = "gpsd-3.10"; + name = "gpsd-2.95"; src = fetchurl { url = "http://download.berlios.de/gpsd/${name}.tar.gz"; - sha256 = "10sqhg4x7hb4vnpq5dnhg62vb5nb3dmqqnbhwjrj5kx7n63jw4h4"; + sha256 = "1bjhyjg561kwp6zc2wg58njdvpnsj5yaa2slz8g3ga1176jl68w3"; }; nativeBuildInputs = [ makeWrapper pkgconfig docbook_xml_dtd_412 docbook_xsl From 87e87bd56c5d11848ce3a771ed3b5e9d2976629b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 6 Dec 2013 19:26:28 +0100 Subject: [PATCH 135/152] alsa: set meta.platform for ALSA-related packages to Linux --- pkgs/os-specific/linux/alsa-lib/default.nix | 59 ++++++++++--------- pkgs/os-specific/linux/alsa-oss/default.nix | 3 +- pkgs/os-specific/linux/alsa-utils/default.nix | 3 +- 3 files changed, 34 insertions(+), 31 deletions(-) diff --git a/pkgs/os-specific/linux/alsa-lib/default.nix b/pkgs/os-specific/linux/alsa-lib/default.nix index 239c70d515d..8ad77c6b99e 100644 --- a/pkgs/os-specific/linux/alsa-lib/default.nix +++ b/pkgs/os-specific/linux/alsa-lib/default.nix @@ -11,35 +11,6 @@ stdenv.mkDerivation rec { sha256 = "068d8c92122hwca5jzhrjp4a131995adlb1d79zgrm7gwy9x63k9"; }; - configureFlags = "--disable-xmlto"; - - # Fix pcm.h file in order to prevent some compilation bugs - # 2: see http://stackoverflow.com/questions/3103400/how-to-overcome-u-int8-t-vs-uint8-t-issue-efficiently - postPatch = '' - sed -i -e 's|//int snd_pcm_mixer_element(snd_pcm_t \*pcm, snd_mixer_t \*mixer, snd_mixer_elem_t \*\*elem);|/\*int snd_pcm_mixer_element(snd_pcm_t \*pcm, snd_mixer_t \*mixer, snd_mixer_elem_t \*\*elem);\*/|' include/pcm.h - - - sed -i -e '1i#include ' include/pcm.h - sed -i -e 's/u_int\([0-9]*\)_t/uint\1_t/g' include/pcm.h - ''; - - crossAttrs = { - patchPhase = '' - sed -i s/extern/static/g include/iatomic.h - ''; - }; - - meta = { - description = "ALSA, the Advanced Linux Sound Architecture libraries"; - - longDescription = '' - The Advanced Linux Sound Architecture (ALSA) provides audio and - MIDI functionality to the Linux-based operating system. - ''; - - homepage = http://www.alsa-project.org/; - }; - patches = [ /* allow specifying alternatives alsa plugin locations using export ALSA_PLUGIN_DIRS=$(nix-build -A alsaPlugins)/lib/alsa-lib @@ -53,4 +24,34 @@ stdenv.mkDerivation rec { on mips, because lacks some symbols atomic_add/atomic_sub */ ./mips-atomic.patch ]; + + # Fix pcm.h file in order to prevent some compilation bugs + # 2: see http://stackoverflow.com/questions/3103400/how-to-overcome-u-int8-t-vs-uint8-t-issue-efficiently + postPatch = '' + sed -i -e 's|//int snd_pcm_mixer_element(snd_pcm_t \*pcm, snd_mixer_t \*mixer, snd_mixer_elem_t \*\*elem);|/\*int snd_pcm_mixer_element(snd_pcm_t \*pcm, snd_mixer_t \*mixer, snd_mixer_elem_t \*\*elem);\*/|' include/pcm.h + + + sed -i -e '1i#include ' include/pcm.h + sed -i -e 's/u_int\([0-9]*\)_t/uint\1_t/g' include/pcm.h + ''; + + configureFlags = "--disable-xmlto"; + + crossAttrs = { + patchPhase = '' + sed -i s/extern/static/g include/iatomic.h + ''; + }; + + meta = { + homepage = http://www.alsa-project.org/; + description = "ALSA, the Advanced Linux Sound Architecture libraries"; + + longDescription = '' + The Advanced Linux Sound Architecture (ALSA) provides audio and + MIDI functionality to the Linux-based operating system. + ''; + + platforms = stdenv.lib.platforms.linux; + }; } diff --git a/pkgs/os-specific/linux/alsa-oss/default.nix b/pkgs/os-specific/linux/alsa-oss/default.nix index 98bf4374b4f..904c56665d1 100644 --- a/pkgs/os-specific/linux/alsa-oss/default.nix +++ b/pkgs/os-specific/linux/alsa-oss/default.nix @@ -21,6 +21,7 @@ stdenv.mkDerivation rec { ''; meta = { + homepage = http://www.alsa-project.org/; description = "ALSA, the Advanced Linux Sound Architecture alsa-oss emulation"; longDescription = '' @@ -28,6 +29,6 @@ stdenv.mkDerivation rec { MIDI functionality to the Linux-based operating system. ''; - homepage = http://www.alsa-project.org/; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/alsa-utils/default.nix b/pkgs/os-specific/linux/alsa-utils/default.nix index 3eafe8bbfe5..484ecd06bb0 100644 --- a/pkgs/os-specific/linux/alsa-utils/default.nix +++ b/pkgs/os-specific/linux/alsa-utils/default.nix @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { ''; meta = { + homepage = http://www.alsa-project.org/; description = "ALSA, the Advanced Linux Sound Architecture utils"; longDescription = '' @@ -30,6 +31,6 @@ stdenv.mkDerivation rec { MIDI functionality to the Linux-based operating system. ''; - homepage = http://www.alsa-project.org/; + platforms = stdenv.lib.platforms.linux; }; } From 125bf9e488c29ec4843dce9b0ea71ab58d99bb78 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 6 Dec 2013 19:29:22 +0100 Subject: [PATCH 136/152] aescrypt: limit meta.hydraPlatforms to Linux Builds on other platforms such as FreeBSD fail. --- pkgs/tools/misc/aescrypt/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/misc/aescrypt/default.nix b/pkgs/tools/misc/aescrypt/default.nix index bec0840490d..f39e466c78f 100644 --- a/pkgs/tools/misc/aescrypt/default.nix +++ b/pkgs/tools/misc/aescrypt/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchurl, libiconvOrEmpty }: - + stdenv.mkDerivation rec { version = "3.0.9"; name = "aescrypt-${version}"; - + src = fetchurl { url = "http://www.aescrypt.com/download/v3/linux/${name}.tgz"; sha256 = "3f3590f9b7e50039611ba9c0cf1cae1b188a44bd39cfc41553db7ec5709c0882"; @@ -18,17 +18,17 @@ stdenv.mkDerivation rec { cp aescrypt $out/bin cp aescrypt_keygen $out/bin ''; - + buildInputs = [ libiconvOrEmpty ]; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-liconv"; - + meta = with stdenv.lib; { - description = "A file encryption util that uses the industry standard Advanced Encryption Standard (AES) to easily and securely encrypt files"; + description = "encrypt files with Advanced Encryption Standard (AES)"; homepage = http://www.aescrypt.com/; license = licenses.gpl2; maintainers = with maintainers; [ lovek323 qknight ]; platforms = stdenv.lib.platforms.all; + hydraPlatforms = stdenv.lib.platforms.linux; }; } - From 65d33fda9577491ce3b3e8d7db9953b5dd5a72d4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 6 Dec 2013 19:31:03 +0100 Subject: [PATCH 137/152] aterm: mark version 2.8 as broken --- pkgs/development/libraries/aterm/2.8.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/aterm/2.8.nix b/pkgs/development/libraries/aterm/2.8.nix index 6d4b13f165a..a153443a54e 100644 --- a/pkgs/development/libraries/aterm/2.8.nix +++ b/pkgs/development/libraries/aterm/2.8.nix @@ -31,5 +31,6 @@ stdenv.mkDerivation { description = "Library for manipulation of term data structures in C"; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; maintainers = stdenv.lib.maintainers.eelco; + broken = true; }; } From f0d3e92b33b192549b685d21d45574a75db4ff65 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 6 Dec 2013 19:32:34 +0100 Subject: [PATCH 138/152] atool: have Hydra build this tool only on Linux --- pkgs/tools/archivers/atool/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/tools/archivers/atool/default.nix b/pkgs/tools/archivers/atool/default.nix index f041f2050ea..1db7a7a42eb 100644 --- a/pkgs/tools/archivers/atool/default.nix +++ b/pkgs/tools/archivers/atool/default.nix @@ -12,7 +12,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.nongnu.org/atool; description = "Archive command line helper"; - platforms = stdenv.lib.platforms.all; + hydraPlatforms = stdenv.lib.platforms.linux; }; } - From 3814415be4cf7e420cde4be8ba958ce0e3ba1b2a Mon Sep 17 00:00:00 2001 From: Andrew Morsillo Date: Sun, 24 Nov 2013 21:29:37 -0500 Subject: [PATCH 139/152] Add robomongo, a GUI for exploring mongodb data and building queries. --- pkgs/applications/misc/robomongo/default.nix | 24 ++++++++++ .../misc/robomongo/robomongo.patch | 48 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 74 insertions(+) create mode 100644 pkgs/applications/misc/robomongo/default.nix create mode 100644 pkgs/applications/misc/robomongo/robomongo.patch diff --git a/pkgs/applications/misc/robomongo/default.nix b/pkgs/applications/misc/robomongo/default.nix new file mode 100644 index 00000000000..c36d9254670 --- /dev/null +++ b/pkgs/applications/misc/robomongo/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, qt5, openssl, boost, cmake, scons, python, pcre, bzip2 }: + +stdenv.mkDerivation { + name = "robomongo-0.8.3"; + + src = fetchurl { + url = https://github.com/paralect/robomongo/archive/v0.8.3.tar.gz; + sha256 = "1x8vpmqvjscjcw30hf0i5vsrg3rldlwx6z52i1hymlck2jfzkank"; + }; + + patches = [ ./robomongo.patch ]; + + NIX_CFLAGS_COMPILE = "-fno-stack-protector"; + + buildInputs = [ cmake boost scons qt5 openssl python pcre bzip2 ]; + + meta = { + homepage = "http://robomongo.org/"; + description = "Query GUI for mongodb"; + platforms = stdenv.lib.platforms.unix; + license = stdenv.lib.licenses.gpl3; + maintainers = [ stdenv.lib.maintainers.amorsillo ]; + }; +} diff --git a/pkgs/applications/misc/robomongo/robomongo.patch b/pkgs/applications/misc/robomongo/robomongo.patch new file mode 100644 index 00000000000..2305ca732ea --- /dev/null +++ b/pkgs/applications/misc/robomongo/robomongo.patch @@ -0,0 +1,48 @@ +Remove check for QT_NO_STYLE_GTK to avoid building with QCleanlooksStyle which results in error due to missing QCleanlooksStyle +Ensure environment is preserved for scons build -- scons clears the env but we want to keep the nix build environment +Fix typo in cmakelists +diff -rupN robomongo-0.8.3/CMakeLists.txt robomongo-0.8.3-patched/CMakeLists.txt +--- robomongo-0.8.3/CMakeLists.txt 2013-10-01 10:55:00.000000000 -0400 ++++ robomongo-0.8.3-patched/CMakeLists.txt 2013-12-06 12:22:06.070659856 -0500 +@@ -133,7 +133,7 @@ ELSE() + ENDIF() + + ##################################DEFAULT VALUES########################################## +-IF(NOT CMAKE_INSTALL_PREFIX}) ++IF(NOT CMAKE_INSTALL_PREFIX) + SET(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/install") + ENDIF() + +diff -rupN robomongo-0.8.3/src/robomongo/gui/AppStyle.h robomongo-0.8.3-patched/src/robomongo/gui/AppStyle.h +--- robomongo-0.8.3/src/robomongo/gui/AppStyle.h 2013-10-01 10:55:00.000000000 -0400 ++++ robomongo-0.8.3-patched/src/robomongo/gui/AppStyle.h 2013-12-06 12:20:57.417297186 -0500 +@@ -8,13 +8,8 @@ + #include + typedef QProxyStyle OsStyle; + #elif defined OS_LINUX +- #if !defined(QT_NO_STYLE_GTK) +- #include +- typedef QProxyStyle OsStyle; +- #else +- #include +- typedef QCleanlooksStyle OsStyle; +- #endif ++ #include ++ typedef QProxyStyle OsStyle; + #endif + + namespace Robomongo + +diff -rupN robomongo-0.8.3/src/third-party/mongodb/SConstruct robomongo-0.8.3-patched/src/third-party/mongodb/SConstruct +--- robomongo-0.8.3/src/third-party/mongodb/SConstruct 2013-10-01 10:55:00.000000000 -0400 ++++ robomongo-0.8.3-patched/src/third-party/mongodb/SConstruct 2013-12-06 12:21:45.705255731 -0500 +@@ -283,7 +283,8 @@ usePCH = has_option( "usePCH" ) + + justClientLib = (COMMAND_LINE_TARGETS == ['mongoclient']) + +-env = Environment( BUILD_DIR=variantDir, ++env = Environment( ENV=os.environ, ++ BUILD_DIR=variantDir, + CLIENT_ARCHIVE='${CLIENT_DIST_BASENAME}${DIST_ARCHIVE_SUFFIX}', + CLIENT_DIST_BASENAME=get_option('client-dist-basename'), + CLIENT_LICENSE='#distsrc/client/LICENSE.txt', diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3725b78270f..9c3504ffd01 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10184,6 +10184,8 @@ let inherit (pythonPackages) pexpect paramiko; }; + robomongo = callPackage ../applications/misc/robomongo { }; + opkg = callPackage ../tools/package-management/opkg { }; pgadmin = callPackage ../applications/misc/pgadmin { }; From a520b9cfa022eae7014404c5401496c1fc13e030 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 6 Dec 2013 20:49:43 +0100 Subject: [PATCH 140/152] Fix the ultrastardx makefile (the hard way). --- pkgs/games/ultrastardx/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/games/ultrastardx/default.nix b/pkgs/games/ultrastardx/default.nix index 710d14cb86c..a77ee7049a2 100644 --- a/pkgs/games/ultrastardx/default.nix +++ b/pkgs/games/ultrastardx/default.nix @@ -16,6 +16,8 @@ stdenv.mkDerivation rec { # I even do a trick on lib/lib64 for libgcc, that I expect it will work. preBuild = '' export NIX_LDFLAGS="$NIX_LDFLAGS -rpath ${SDL}/lib -rpath ${SDL_image}/lib -rpath ${libpng}/lib -rpath ${freetype}/lib -rpath ${portaudio}/lib -rpath ${ffmpeg}/lib -rpath ${zlib}/lib -rpath ${sqlite}/lib -rpath ${libX11}/lib -rpath ${pcre}/lib -rpath ${stdenv.gcc.gcc}/lib64 -rpath ${stdenv.gcc.gcc}/lib" + + sed -i 414,424d Makefile ''; # dlopened libgcc requires the rpath not to be shrinked From 142298495e4639ec9e193a8d6543bcc63526a2fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sat, 7 Dec 2013 00:07:04 +0100 Subject: [PATCH 141/152] Fixing the Ultrastardx build. Not tested if it works and how. --- pkgs/development/libraries/ffmpeg/0.6.nix | 77 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 5 ++ 2 files changed, 82 insertions(+) create mode 100644 pkgs/development/libraries/ffmpeg/0.6.nix diff --git a/pkgs/development/libraries/ffmpeg/0.6.nix b/pkgs/development/libraries/ffmpeg/0.6.nix new file mode 100644 index 00000000000..053843d5313 --- /dev/null +++ b/pkgs/development/libraries/ffmpeg/0.6.nix @@ -0,0 +1,77 @@ +{ stdenv, fetchurl, pkgconfig, yasm +, mp3Support ? true, lame ? null +, speexSupport ? true, speex ? null +, theoraSupport ? true, libtheora ? null +, vorbisSupport ? true, libvorbis ? null +, vpxSupport ? false, libvpx ? null +, x264Support ? true, x264 ? null +, xvidSupport ? true, xvidcore ? null +, vdpauSupport ? true, libvdpau ? null +, faacSupport ? false, faac ? null +}: + +assert speexSupport -> speex != null; +assert theoraSupport -> libtheora != null; +assert vorbisSupport -> libvorbis != null; +assert vpxSupport -> libvpx != null; +assert x264Support -> x264 != null; +assert xvidSupport -> xvidcore != null; +assert vdpauSupport -> libvdpau != null; +assert faacSupport -> faac != null; + +stdenv.mkDerivation rec { + name = "ffmpeg-0.6.7"; + + src = fetchurl { + url = "http://www.ffmpeg.org/releases/${name}.tar.bz2"; + sha256 = "13l78gv2qhyw05bl9s6wkmykzsn4p04bb69a849a5c4hiffwz837"; + }; + + # `--enable-gpl' (as well as the `postproc' and `swscale') mean that + # the resulting library is GPL'ed, so it can only be used in GPL'ed + # applications. + configureFlags = [ + "--enable-gpl" + "--enable-postproc" + "--enable-swscale" + "--disable-ffserver" + "--disable-ffplay" + "--enable-shared" + "--enable-runtime-cpudetect" + ] + ++ stdenv.lib.optional mp3Support "--enable-libmp3lame" + ++ stdenv.lib.optional speexSupport "--enable-libspeex" + ++ stdenv.lib.optional theoraSupport "--enable-libtheora" + ++ stdenv.lib.optional vorbisSupport "--enable-libvorbis" + ++ stdenv.lib.optional vpxSupport "--enable-libvpx" + ++ stdenv.lib.optional x264Support "--enable-libx264" + ++ stdenv.lib.optional xvidSupport "--enable-libxvid" + ++ stdenv.lib.optional vdpauSupport "--enable-vdpau" + ++ stdenv.lib.optional faacSupport "--enable-libfaac --enable-nonfree"; + + buildInputs = [ pkgconfig lame yasm ] + ++ stdenv.lib.optional mp3Support lame + ++ stdenv.lib.optional speexSupport speex + ++ stdenv.lib.optional theoraSupport libtheora + ++ stdenv.lib.optional vorbisSupport libvorbis + ++ stdenv.lib.optional vpxSupport libvpx + ++ stdenv.lib.optional x264Support x264 + ++ stdenv.lib.optional xvidSupport xvidcore + ++ stdenv.lib.optional vdpauSupport libvdpau + ++ stdenv.lib.optional faacSupport faac; + + crossAttrs = { + dontSetConfigureCross = true; + configureFlags = configureFlags ++ [ + "--cross-prefix=${stdenv.cross.config}-" + "--enable-cross-compile" + "--target_os=linux" + "--arch=${stdenv.cross.arch}" + ]; + }; + + meta = { + homepage = http://www.ffmpeg.org/; + description = "A complete, cross-platform solution to record, convert and stream audio and video"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9c3504ffd01..b545062494a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4109,6 +4109,10 @@ let else stdenv; }; + ffmpeg_0_6 = callPackage ../development/libraries/ffmpeg/0.6.nix { + vpxSupport = !stdenv.isMips; + }; + ffmpeg_0_6_90 = callPackage ../development/libraries/ffmpeg/0.6.90.nix { vpxSupport = !stdenv.isMips; }; @@ -9530,6 +9534,7 @@ let ultimatestunts = callPackage ../games/ultimatestunts { }; ultrastardx = callPackage ../games/ultrastardx { + ffmpeg = ffmpeg_0_6; lua = lua5; }; From 2079bfdc58c50acccb02c0a491a31a452cd2e24d Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 2 Dec 2013 10:40:22 -0600 Subject: [PATCH 142/152] Fix ntrack for latest libnl release --- pkgs/development/libraries/ntrack/default.nix | 7 ++++++- pkgs/development/libraries/ntrack/libnl-fix.patch | 11 +++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/ntrack/libnl-fix.patch diff --git a/pkgs/development/libraries/ntrack/default.nix b/pkgs/development/libraries/ntrack/default.nix index 13ab00e41be..b7460778474 100644 --- a/pkgs/development/libraries/ntrack/default.nix +++ b/pkgs/development/libraries/ntrack/default.nix @@ -18,7 +18,12 @@ stdenv.mkDerivation rec { configureFlags = "--without-gobject CFLAGS=--std=gnu99"; - patchPhase = ''sed -e "s@/usr\(/lib/ntrack/modules/\)@$out&@" -i common/ntrack.c''; + # Remove this patch after version 016 + patches = [ ./libnl-fix.patch ]; + + postPatch = '' + sed -e "s@/usr\(/lib/ntrack/modules/\)@$out&@" -i common/ntrack.c + ''; meta = { description = "Network Connectivity Tracking library for Desktop Applications"; diff --git a/pkgs/development/libraries/ntrack/libnl-fix.patch b/pkgs/development/libraries/ntrack/libnl-fix.patch new file mode 100644 index 00000000000..806a0178ec8 --- /dev/null +++ b/pkgs/development/libraries/ntrack/libnl-fix.patch @@ -0,0 +1,11 @@ +--- ./modules/ntrack-libnl.c.orig 2013-12-02 11:31:54.749215448 -0600 ++++ ./modules/ntrack-libnl.c 2013-12-02 11:34:46.597684553 -0600 +@@ -530,7 +530,7 @@ + op_default_route_disappeared ((struct _ntrack_monitor_arch*) self, nl_info); + } else if (nl_info->topmost_route && topmost_route) { + int diff_bits; +- if ((diff_bits = (route_obj_ops.oo_id_attrs | ROUTE_ATTR_OIF ++ if ((diff_bits = (nl_object_get_id_attrs(OBJ_CAST(topmost_route)) | ROUTE_ATTR_OIF + | ROUTE_ATTR_GATEWAY) & + nl_object_diff (OBJ_CAST (nl_info->topmost_route), + OBJ_CAST (topmost_route)))) { From fa6e689dcb4c3da22cbbabaf916a5ab4535001e4 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sat, 7 Dec 2013 12:36:31 +0400 Subject: [PATCH 143/152] Use fresh libnl for ntrack --- 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 6f0ef099287..a1950122904 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5341,9 +5341,7 @@ let includeTools = true; }; - ntrack = callPackage ../development/libraries/ntrack { - libnl = libnl_3_2_19; - }; + ntrack = callPackage ../development/libraries/ntrack { }; ode = builderDefsPackage (import ../development/libraries/ode) { }; From 7f62dd42f3f44f2af8ff026c96ce91d15e1d594b Mon Sep 17 00:00:00 2001 From: Roelof Wobben Date: Sat, 7 Dec 2013 10:09:25 +0100 Subject: [PATCH 144/152] give gnome-menus a better place --- .../core/gnome-menus/default .nix} | 0 pkgs/desktops/gnome-3/default.nix | 2 ++ pkgs/top-level/all-packages.nix | 6 ------ 3 files changed, 2 insertions(+), 6 deletions(-) rename pkgs/desktops/{cinnamon/gnome-menus.nix => gnome-3/core/gnome-menus/default .nix} (100%) diff --git a/pkgs/desktops/cinnamon/gnome-menus.nix b/pkgs/desktops/gnome-3/core/gnome-menus/default .nix similarity index 100% rename from pkgs/desktops/cinnamon/gnome-menus.nix rename to pkgs/desktops/gnome-3/core/gnome-menus/default .nix diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index 8af6d65420a..13fca9f0ab0 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -24,6 +24,8 @@ rec { gnome_icon_theme = callPackage ./core/gnome-icon-theme { }; + gnome-menus = callPackage ../core/gnome-menus{ } ; + gnome_keyring = callPackage ./core/gnome-keyring { }; libgnome_keyring = callPackage ./core/libgnome-keyring { }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 71bd2dc615c..ac304ad462b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9576,12 +9576,6 @@ let ### DESKTOP ENVIRONMENTS - cinnamon = recurseIntoAttrs rec{ - callPackage=pkgs.newScope pkgs.cinnamon; - inherit (gnome3) gnome_common ; - gnome_menus = callPackage ../desktops/cinnamon/gnome-menus.nix { } ; - }; - enlightenment = callPackage ../desktops/enlightenment { }; e17 = recurseIntoAttrs ( From ca26e75a7350c5b1bb32419d4f4438e4bd477fd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sat, 7 Dec 2013 12:03:50 +0100 Subject: [PATCH 145/152] nixos/avahi-service: small documentation update --- nixos/modules/services/networking/avahi-daemon.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/avahi-daemon.nix b/nixos/modules/services/networking/avahi-daemon.nix index effd1a62bd9..2256de89630 100644 --- a/nixos/modules/services/networking/avahi-daemon.nix +++ b/nixos/modules/services/networking/avahi-daemon.nix @@ -51,7 +51,10 @@ in hostName = mkOption { type = types.str; - description = ''Host name advertised on the LAN.''; + description = '' + Host name advertised on the LAN. If not set, avahi will use the value + of config.networking.hostName. + ''; }; browseDomains = mkOption { From 6b1a3bffd093b53ceff44ea029a8dd70b3ac0ea5 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sat, 7 Dec 2013 12:57:15 +0200 Subject: [PATCH 146/152] xplanet: update from 1.2.2 to 1.3.0 --- pkgs/applications/science/astronomy/xplanet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/astronomy/xplanet/default.nix b/pkgs/applications/science/astronomy/xplanet/default.nix index 816119a3b92..071942b5b0e 100644 --- a/pkgs/applications/science/astronomy/xplanet/default.nix +++ b/pkgs/applications/science/astronomy/xplanet/default.nix @@ -2,11 +2,11 @@ , libjpeg, netpbm}: stdenv.mkDerivation rec { - name = "xplanet-1.2.2"; + name = "xplanet-1.3.0"; src = fetchurl { url = "mirror://sourceforge/xplanet/${name}.tar.gz"; - sha256 = "1jnkrly9njkibxqbg5im4pq9cqjzwmki6jzd318dvlfmnicqr3vg"; + sha256 = "0hml2v228wi2r61m1pgka7h96rl92b6apk0iigm62miyp4mp9ys4"; }; buildInputs = [ pkgconfig freetype pango libpng libtiff giflib libjpeg netpbm ]; From 2ce67ca947aa8621c4839a469db31c25286ac38a Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sat, 7 Dec 2013 13:10:57 +0200 Subject: [PATCH 147/152] giflib: update from 4.2.3 to 5.0.5 --- pkgs/development/libraries/giflib/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/giflib/default.nix b/pkgs/development/libraries/giflib/default.nix index cc782546a48..4dc8132805c 100644 --- a/pkgs/development/libraries/giflib/default.nix +++ b/pkgs/development/libraries/giflib/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, xmlto, docbook_xml_dtd_412, docbook_xsl, libxml2 }: stdenv.mkDerivation { - name = "giflib-4.2.3"; + name = "giflib-5.0.5"; src = fetchurl { - url = mirror://sourceforge/giflib/giflib-4.2.3.tar.bz2; - sha256 = "0rmp7ipzk42r841bggd7bfqk4p8qsssbp4wcck4qnz7p4rkxbj0a"; + url = mirror://sourceforge/giflib/giflib-5.0.5.tar.bz2; + sha256 = "02c6pwll9pzw5fhg5gccx2ws56d70ylfryk21nv5lqhwdcv8lvb0"; }; buildInputs = [ xmlto docbook_xml_dtd_412 docbook_xsl libxml2 ]; From 1f5d28001eca42c7d7f5705a57ddce99f4187b00 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Sat, 7 Dec 2013 13:12:31 +0200 Subject: [PATCH 148/152] xplanet: fix build against giflib 5.* --- .../science/astronomy/xplanet/default.nix | 2 + .../science/astronomy/xplanet/giflib.patch | 130 ++++++++++++++++++ 2 files changed, 132 insertions(+) create mode 100644 pkgs/applications/science/astronomy/xplanet/giflib.patch diff --git a/pkgs/applications/science/astronomy/xplanet/default.nix b/pkgs/applications/science/astronomy/xplanet/default.nix index 071942b5b0e..bdb93c99226 100644 --- a/pkgs/applications/science/astronomy/xplanet/default.nix +++ b/pkgs/applications/science/astronomy/xplanet/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig freetype pango libpng libtiff giflib libjpeg netpbm ]; + patches = [ ./giflib.patch ]; + meta = { description = "Renders an image of the earth or other planets into the X root window"; homepage = http://xplanet.sourceforge.net; diff --git a/pkgs/applications/science/astronomy/xplanet/giflib.patch b/pkgs/applications/science/astronomy/xplanet/giflib.patch new file mode 100644 index 00000000000..aaf024198fb --- /dev/null +++ b/pkgs/applications/science/astronomy/xplanet/giflib.patch @@ -0,0 +1,130 @@ +diff -wbBur xplanet-1.3.0/src/libimage/gif.c /home/sergej/tmp/BUILD/staging-i686/sergej/build/xplanet/src/xplanet-1.3.0/src/libimage/gif.c +--- xplanet-1.3.0/src/libimage/gif.c 2006-03-26 01:50:51.000000000 +0300 ++++ /home/sergej/tmp/BUILD/staging-i686/sergej/build/xplanet/src/xplanet-1.3.0/src/libimage/gif.c 2013-07-30 18:21:17.412474692 +0400 +@@ -20,7 +20,7 @@ + + #include + #include +- ++#define FALSE 0 + #include + + /* +@@ -42,11 +42,11 @@ + int color_index; + unsigned char *ptr = NULL; + +- infile = DGifOpenFileName(filename); ++ infile = DGifOpenFileName(filename, NULL); + + if (infile == NULL) + { +- PrintGifError(); ++ printf("%s\n", GifErrorString(GIF_ERROR)); + return(0); + } + +@@ -54,7 +54,7 @@ + { + if (DGifGetRecordType(infile, &record_type) == GIF_ERROR) + { +- PrintGifError(); ++ printf("%s\n", GifErrorString(GIF_ERROR)); + return(0); + } + +@@ -63,7 +63,7 @@ + case IMAGE_DESC_RECORD_TYPE: + if (DGifGetImageDesc(infile) == GIF_ERROR) + { +- PrintGifError(); ++ printf("%s\n", GifErrorString(GIF_ERROR)); + return(0); + } + +@@ -107,14 +107,14 @@ + GifByteType *ext; + if (DGifGetExtension(infile, &ext_code, &ext) == GIF_ERROR) + { +- PrintGifError(); ++ printf("%s\n", GifErrorString(GIF_ERROR)); + return(0); + } + while (ext != NULL) + { + if (DGifGetExtensionNext(infile, &ext) == GIF_ERROR) + { +- PrintGifError(); ++ printf("%s\n", GifErrorString(GIF_ERROR)); + return(0); + } + } +@@ -178,7 +178,7 @@ + return(0); + } + +- colormap = MakeMapObject(colormap_size, NULL); ++ colormap = GifMakeMapObject(colormap_size, NULL); + + for (i = 0; i < width * height; i++) + { +@@ -187,10 +187,10 @@ + blue[i] = (GifByteType) rgb[3*i+2]; + } + +- if (QuantizeBuffer(width, height, &colormap_size, red, green, blue, ++ if (GifQuantizeBuffer(width, height, &colormap_size, red, green, blue, + buffer, colormap->Colors) == GIF_ERROR) + { +- PrintGifError(); ++ printf("%s\n", GifErrorString(GIF_ERROR)); + return(0); + } + +@@ -198,24 +198,24 @@ + free(green); + free(blue); + +- outfile = EGifOpenFileName((char *) filename, FALSE); ++ outfile = EGifOpenFileName((char *) filename, FALSE, NULL); + if (outfile == NULL) + { +- PrintGifError(); ++ printf("%s\n", GifErrorString(GIF_ERROR)); + return(0); + } + + if (EGifPutScreenDesc(outfile, width, height, colormap_size, 0, colormap) + == GIF_ERROR) + { +- PrintGifError(); ++ printf("%s\n", GifErrorString(GIF_ERROR)); + return(0); + } + + if (EGifPutImageDesc(outfile, 0, 0, width, height, FALSE, NULL) + == GIF_ERROR) + { +- PrintGifError(); ++ printf("%s\n", GifErrorString(GIF_ERROR)); + return(0); + } + +@@ -224,7 +224,7 @@ + { + if (EGifPutLine(outfile, ptr, width) == GIF_ERROR) + { +- PrintGifError(); ++ printf("%s\n", GifErrorString(GIF_ERROR)); + return(0); + } + ptr += width; +@@ -233,7 +233,7 @@ + EGifSpew(outfile); + + if (EGifCloseFile(outfile) == GIF_ERROR) +- PrintGifError(); ++ printf("%s\n", GifErrorString(GIF_ERROR)); + + free(buffer); + From e12695ba8568f0893bd49ab194d8645676cd1603 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sat, 7 Dec 2013 12:24:18 +0100 Subject: [PATCH 149/152] Fixing ultrastardx linking with lua. Now it fails to start to me, due to some alsa problems. --- pkgs/games/ultrastardx/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/ultrastardx/default.nix b/pkgs/games/ultrastardx/default.nix index a77ee7049a2..dbae3e16724 100644 --- a/pkgs/games/ultrastardx/default.nix +++ b/pkgs/games/ultrastardx/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { # The fpc is not properly wrapped to add -rpath. I add this manually. # I even do a trick on lib/lib64 for libgcc, that I expect it will work. preBuild = '' - export NIX_LDFLAGS="$NIX_LDFLAGS -rpath ${SDL}/lib -rpath ${SDL_image}/lib -rpath ${libpng}/lib -rpath ${freetype}/lib -rpath ${portaudio}/lib -rpath ${ffmpeg}/lib -rpath ${zlib}/lib -rpath ${sqlite}/lib -rpath ${libX11}/lib -rpath ${pcre}/lib -rpath ${stdenv.gcc.gcc}/lib64 -rpath ${stdenv.gcc.gcc}/lib" + export NIX_LDFLAGS="$NIX_LDFLAGS -rpath ${SDL}/lib -rpath ${SDL_image}/lib -rpath ${libpng}/lib -rpath ${freetype}/lib -rpath ${portaudio}/lib -rpath ${ffmpeg}/lib -rpath ${zlib}/lib -rpath ${sqlite}/lib -rpath ${libX11}/lib -rpath ${pcre}/lib -rpath ${lua}/lib -rpath ${stdenv.gcc.gcc}/lib64 -rpath ${stdenv.gcc.gcc}/lib" sed -i 414,424d Makefile ''; From 8c5c4eab54b6b9054ec7cf619e2678e00ff47d08 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Sat, 7 Dec 2013 14:32:57 +0200 Subject: [PATCH 150/152] libgdiplus: fix build against giflib 5.* --- .../libraries/libgdiplus/default.nix | 3 + .../libraries/libgdiplus/giflib.patch | 117 ++++++++++++++++++ 2 files changed, 120 insertions(+) create mode 100644 pkgs/development/libraries/libgdiplus/giflib.patch diff --git a/pkgs/development/libraries/libgdiplus/default.nix b/pkgs/development/libraries/libgdiplus/default.nix index 3b1e5ba0b77..56bc72acff0 100644 --- a/pkgs/development/libraries/libgdiplus/default.nix +++ b/pkgs/development/libraries/libgdiplus/default.nix @@ -10,11 +10,14 @@ stdenv.mkDerivation rec { sha256 = "0klnbly2q0yx5p0l5z8da9lhqsjj9xqj06kdw2v7rnms4z1vdpkd"; }; + NIX_LDFLAGS = "-lgif"; + patches = [ (fetchurl { url = "https://raw.github.com/MagicGroup/MagicSpecLib/master/libgdiplus/libgdiplus-2.10.1-libpng15.patch"; sha256 = "130r0jm065pjvbz5dkx96w37vj1wqc8fakmi2znribs14g0bl65f"; }) + ./giflib.patch ]; patchFlags = "-p0"; diff --git a/pkgs/development/libraries/libgdiplus/giflib.patch b/pkgs/development/libraries/libgdiplus/giflib.patch new file mode 100644 index 00000000000..b1135f47f3a --- /dev/null +++ b/pkgs/development/libraries/libgdiplus/giflib.patch @@ -0,0 +1,117 @@ +diff --git a/src/gifcodec.c b/src/gifcodec.c +index 8dee0eb..564beed 100644 +--- src/gifcodec.c ++++ src/gifcodec.c +@@ -39,8 +39,10 @@ GUID gdip_gif_image_format_guid = {0xb96b3cb0U, 0x0728U, 0x11d3U, {0x9d, 0x7b, 0 + + #include "gifcodec.h" + ++#if GIFLIB_MAJOR < 5 + /* giflib declares this incorrectly as EgifOpen */ + extern GifFileType *EGifOpen(void *userData, OutputFunc writeFunc); ++#endif + + /* Data structure used for callback */ + typedef struct +@@ -105,7 +107,7 @@ gdip_gif_inputfunc (GifFileType *gif, GifByteType *data, int len) + */ + + static int +-AddExtensionBlockMono(SavedImage *New, int Len, BYTE ExtData[]) ++AddExtensionBlockMono(SavedImage *New, int Len, int func, BYTE ExtData[]) + { + ExtensionBlock *ep; + +@@ -129,7 +131,7 @@ AddExtensionBlockMono(SavedImage *New, int Len, BYTE ExtData[]) + + if (ExtData) { + memcpy(ep->Bytes, ExtData, Len); +- ep->Function = New->Function; ++ ep->Function = func; + } + + return (GIF_OK); +@@ -232,20 +234,20 @@ DGifSlurpMono(GifFileType * GifFile, SavedImage *TrailingExtensions) + } + + case EXTENSION_RECORD_TYPE: { +- if (DGifGetExtension(GifFile, &temp_save.Function, &ExtData) == GIF_ERROR) { ++ int func; ++ if (DGifGetExtension(GifFile, &func, &ExtData) == GIF_ERROR) { + return (GIF_ERROR); + } + + while (ExtData != NULL) { + /* Create an extension block with our data */ +- if (AddExtensionBlockMono(&temp_save, ExtData[0], &ExtData[1]) == GIF_ERROR) { ++ if (AddExtensionBlockMono(&temp_save, func, ExtData[0], &ExtData[1]) == GIF_ERROR) { + return (GIF_ERROR); + } + + if (DGifGetExtensionNext(GifFile, &ExtData) == GIF_ERROR) { + return (GIF_ERROR); + } +- temp_save.Function = 0; + } + break; + } +@@ -303,12 +305,19 @@ gdip_load_gif_image (void *stream, GpImage **image, BOOL from_file) + result = NULL; + loop_counter = FALSE; + ++#if GIFLIB_MAJOR < 5 + if (from_file) { + gif = DGifOpen(stream, &gdip_gif_fileinputfunc); + } else { + gif = DGifOpen (stream, &gdip_gif_inputfunc); + } +- ++#else ++ if (from_file) ++ gif = DGifOpen(stream, &gdip_gif_fileinputfunc, NULL); ++ else ++ gif = DGifOpen(stream, &gdip_gif_inputfunc, NULL); ++#endif ++ + if (gif == NULL) { + goto error; + } +@@ -660,11 +669,22 @@ gdip_save_gif_image (void *stream, GpImage *image, BOOL from_file) + return InvalidParameter; + } + ++#if GIFLIB_MAJOR < 5 + if (from_file) { + fp = EGifOpenFileName (stream, 0); + } else { + fp = EGifOpen (stream, gdip_gif_outputfunc); + } ++#else ++ if (from_file) ++ fp = EGifOpenFileName (stream, 0, NULL); ++ else ++ fp = EGifOpen (stream, gdip_gif_outputfunc, NULL); ++#define MakeMapObject GifMakeMapObject ++#define FreeMapObject GifFreeMapObject ++#define QuantizeBuffer GifQuantizeBuffer ++#define BitSize GifBitSize ++#endif + + if (!fp) { + return FileNotFound; +@@ -848,8 +868,15 @@ gdip_save_gif_image (void *stream, GpImage *image, BOOL from_file) + Buffer[0] = 1; + Buffer[1] = ptr[0]; + Buffer[2] = ptr[1]; ++#if GIFLIB_MAJOR < 5 + EGifPutExtensionFirst(fp, APPLICATION_EXT_FUNC_CODE, 11, "NETSCAPE2.0"); + EGifPutExtensionLast(fp, APPLICATION_EXT_FUNC_CODE, 3, Buffer); ++#else ++ EGifPutExtensionLeader(fp, APPLICATION_EXT_FUNC_CODE); ++ EGifPutExtensionBlock(fp, 11, "NETSCAPE2.0"); ++ EGifPutExtensionBlock(fp, 3, Buffer); ++ EGifPutExtensionTrailer(fp); ++#endif + } + } + From 1beca247079ac0c79a5b9ca49e0fc0731ae6ea45 Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sat, 7 Dec 2013 14:39:52 +0200 Subject: [PATCH 151/152] sxiv: update from 1.1 to 1.1.1 --- pkgs/applications/graphics/sxiv/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/sxiv/default.nix b/pkgs/applications/graphics/sxiv/default.nix index 26d910943ef..8500fa9faba 100644 --- a/pkgs/applications/graphics/sxiv/default.nix +++ b/pkgs/applications/graphics/sxiv/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, libX11, imlib2, giflib }: stdenv.mkDerivation { - name = "sxiv-1.1"; + name = "sxiv-1.1.1"; src = fetchurl { - url = "https://github.com/muennich/sxiv/archive/v1.1.tar.gz"; + url = "https://github.com/muennich/sxiv/archive/v1.1.1.tar.gz"; name = "sxiv-1.1.tar.gz"; - sha256 = "0gsqwa1yacsig7ycjrw0sjyrsa9mynfzzbwm1vp2bgk4s9hb08kx"; + sha256 = "07r8125xa8d5q71ql71s4i1dx4swy8hypxh2s5h7z2jnn5y9nmih"; }; buildInputs = [ libX11 imlib2 giflib ]; From 50493458bd0b4f3051cf200e165c007efe7dbade Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 7 Dec 2013 14:04:50 +0100 Subject: [PATCH 152/152] gnome3.gnome-menus: fix file path, add maintainer Also some whitespace nitpicks. --- lib/maintainers.nix | 1 + .../core/gnome-menus/{default .nix => default.nix} | 9 ++++----- pkgs/desktops/gnome-3/default.nix | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) rename pkgs/desktops/gnome-3/core/gnome-menus/{default .nix => default.nix} (81%) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 0418337b217..285197e381d 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -49,6 +49,7 @@ rickynils = "Rickard Nilsson "; rob = "Rob Vermaas "; roconnor = "Russell O'Connor "; + roelof = "Roelof Wobben "; sander = "Sander van der Burg "; shlevy = "Shea Levy "; simons = "Peter Simons "; diff --git a/pkgs/desktops/gnome-3/core/gnome-menus/default .nix b/pkgs/desktops/gnome-3/core/gnome-menus/default.nix similarity index 81% rename from pkgs/desktops/gnome-3/core/gnome-menus/default .nix rename to pkgs/desktops/gnome-3/core/gnome-menus/default.nix index fe332355626..a8e77a32bdc 100644 --- a/pkgs/desktops/gnome-3/core/gnome-menus/default .nix +++ b/pkgs/desktops/gnome-3/core/gnome-menus/default.nix @@ -1,23 +1,22 @@ -{ stdenv, fetchurl, intltool, pkgconfig, glib}: +{ stdenv, fetchurl, intltool, pkgconfig, glib }: let version = "3.10.1"; in stdenv.mkDerivation { name = "gnome-menus-${version}"; - + src = fetchurl { url = "http://ftp.gnome.org/pub/gnome/sources/gnome-menus/3.10/gnome-menus-3.10.1.tar.xz"; sha256 = "0wcacs1vk3pld8wvrwq7fdrm11i56nrajkrp6j1da6jc4yx0m5a6"; }; - - + preBuild = "patchShebangs ./scripts"; buildInputs=[ intltool pkgconfig glib ]; meta = { homepage = "http://www.gnome.org"; - description = "Gnome menu specification " ; + description = "Gnome menu specification"; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index 13fca9f0ab0..48f37f6ba9d 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -24,7 +24,7 @@ rec { gnome_icon_theme = callPackage ./core/gnome-icon-theme { }; - gnome-menus = callPackage ../core/gnome-menus{ } ; + gnome-menus = callPackage ./core/gnome-menus { }; gnome_keyring = callPackage ./core/gnome-keyring { }; libgnome_keyring = callPackage ./core/libgnome-keyring { };