diff --git a/.gitignore b/.gitignore index d43399383a0963a116d42400184fb1d92879b502..16aaf68b70b389e88547733c989a1fd202411ae5 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,5 @@ result-* /doc/manual.html /doc/manual.pdf .version-suffix + +.DS_Store \ No newline at end of file diff --git a/doc/contributing.xml b/doc/contributing.xml new file mode 100644 index 0000000000000000000000000000000000000000..bcea404baee0a7206344f6b9429156fedfdba4ad --- /dev/null +++ b/doc/contributing.xml @@ -0,0 +1,21 @@ + + +Contributing + +If you make modifications to the manual, it's important to build the manual before contributing: + + + + $ git clone git://github.com/NixOS/nixpkgs.git + + $ cd nixpkgs/pkgs/top-level + + $ nix-build -A tarball release.nix + + Inside the built derivation you shall see manual/index.html file. + + + + diff --git a/doc/manual.xml b/doc/manual.xml index d2c07859b2814682589da8699d242dc8bde13b1f..145e3e12dd9262098917aa86924c94c153b509eb 100644 --- a/doc/manual.xml +++ b/doc/manual.xml @@ -32,6 +32,7 @@ + diff --git a/doc/meta.xml b/doc/meta.xml index 6c8e458509a7dba96d4f56301ee8a972bb8248a4..eb644b3b0ee238d3eb0bb6843f6261c17dc31e74 100644 --- a/doc/meta.xml +++ b/doc/meta.xml @@ -17,7 +17,9 @@ meta = { It is fully customizable. ''; homepage = http://www.gnu.org/software/hello/manual/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; + maintainers = [ stdenv.lib.maintainers.eelco ]; + platforms = stdenv.lib.platforms.all; }; @@ -31,16 +33,42 @@ the package. The value of a meta-attribute must a string. command-line using nix-env: -$ nix-env -qa hello --meta --xml -<?xml version='1.0' encoding='utf-8'?> -<items> - <item attrPath="hello" name="hello-2.3" system="i686-linux"> - <meta name="description" value="A program that produces a familiar, friendly greeting" /> - <meta name="homepage" value="http://www.gnu.org/software/hello/manual/" /> - <meta name="license" value="GPLv3+" /> - <meta name="longDescription" value="GNU Hello is a program that prints &quot;Hello, world!&quot; when you run it.&#xA;It is fully customizable.&#xA;" /> - </item> -</items> +$ nix-env -qa hello --meta --json +{ + "hello": { + "meta": { + "description": "A program that produces a familiar, friendly greeting", + "homepage": "http://www.gnu.org/software/hello/manual/", + "license": { + "fullName": "GNU General Public License version 3 or later", + "shortName": "GPLv3+", + "url": "http://www.fsf.org/licensing/licenses/gpl.html" + }, + "longDescription": "GNU Hello is a program that prints \"Hello, world!\" when you run it.\nIt is fully customizable.\n", + "maintainers": [ + "Ludovic Court\u00e8s <ludo@gnu.org>" + ], + "platforms": [ + "i686-linux", + "x86_64-linux", + "armv5tel-linux", + "armv7l-linux", + "mips64el-linux", + "x86_64-darwin", + "i686-cygwin", + "i686-freebsd", + "x86_64-freebsd", + "i686-openbsd", + "x86_64-openbsd" + ], + "position": "/home/user/dev/nixpkgs/pkgs/applications/misc/hello/ex-2/default.nix:14" + }, + "name": "hello-2.9", + "system": "x86_64-linux" + } +} + + nix-env knows about the @@ -92,20 +120,23 @@ interpretation: license - The license for the package. See below for the - allowed values. + The license for the package. One from attribute set defined in + + nixpkgs/lib/licenses.nix. + Example: + stdenv.lib.licenses.gpl3. + See details in , maintainers A list of names and e-mail addresses of the - maintainers of this Nix expression, e.g. ["Alice - <alice@example.org>" "Bob <bob@example.com>"]. If - you are the maintainer of multiple packages, you may want to add + maintainers of this Nix expression. If + you would like to be a maintainer of a package, you may want to add yourself to pkgs/lib/maintainers.nix - and write something like [stdenv.lib.maintainers.alice - stdenv.lib.maintainers.bob]. + xlink:href="https://github.com/NixOS/nixpkgs/blob/master/lib/maintainers.nix">nixpkgs/lib/maintainers.nix + and write something like [ stdenv.lib.maintainers.alice + stdenv.lib.maintainers.bob ]. @@ -121,29 +152,25 @@ interpretation: platforms The list of Nix platform types on which the - package is supported. If this attribute is set, the package will - refuse to build, and won’t show up in nix-env - -qa output, on any platform not listed - here. An example is: + package is supported. Hydra builds packages according to the + platform specified. If no platform is specified, the package does + not have prebuilt binaries. An example is: -meta.platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; - - - The set lib.platforms defines various common - lists of platforms types, so it’s more typical to write: - - -meta.platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; +meta.platforms = stdenv.lib.platforms.linux; + Attribute Set stdenv.lib.platforms in + + nixpkgs/lib/platforms.nix defines various common + lists of platforms types. hydraPlatforms The list of Nix platform types for which the Hydra - instance at hydra.nixos.org should build the + instance at hydra.nixos.org will build the package. (Hydra is the Nix-based continuous build system.) It defaults to the value of meta.platforms. Thus, the only reason to set meta.hydraPlatforms is @@ -176,80 +203,23 @@ meta.hydraPlatforms = [];
Licenses -This is just a first attempt at standardising the license -attribute. - -The meta.license attribute must be one of the -following: +The meta.license attribute should preferrably contain +a value from stdenv.lib.licenses defined in + +nixpkgs/lib/licenses.nix, +or in-place license description of the same format if the license is +unlikely to be useful in another expression. +A few generic options are available, although it's typically better +to indicate the specific license: - - GPL - GNU General Public License; version not - specified. - - - - GPLv2 - GNU General Public License, version - 2. - - - - GPLv2+ - GNU General Public License, version - 2 or higher. - - - - GPLv3 - GNU General Public License, version - 3. - - - - GPLv3+ - GNU General Public License, version - 3 or higher. - - - - bsd - Catch-all for licenses that are essentially - similar to the - original BSD license with the advertising clause removed, - i.e. permissive non-copyleft free software licenses. This - includes the X11 - (“MIT”) License. - - - - perl5 - The Perl 5 license (Artistic License, version 1 - and GPL, version 1 or later). - - free Catch-all for free software licenses not listed above. - - free-copyleft - Catch-all for free, copyleft software licenses not - listed above. - - - - free-non-copyleft - Catch-all for free, non-copyleft software licenses - not listed above. - - unfree-redistributable Unfree package that can be redistributed in binary diff --git a/doc/quick-start.xml b/doc/quick-start.xml index 49c674052b95d42d6d9695ae9cbde0eb1e3aadce..0f11a906d77124c4412b396bc971fce1a5eb390c 100644 --- a/doc/quick-start.xml +++ b/doc/quick-start.xml @@ -155,9 +155,10 @@ $ git add pkgs/development/libraries/libfoo/default.nix - You can use nix-prefetch-url + You can use nix-prefetch-url (or similar nix-prefetch-git, etc) url to get the SHA-256 hash of - source distributions. + source distributions. There are similar commands as nix-prefetch-git and + nix-prefetch-hg available in nix-prefetch-scripts package. @@ -221,17 +222,10 @@ $ nix-env -f . -iA libfoo - Optionally commit the new package, or send a patch to + Optionally commit the new package and open a pull request, or send a patch to nix-dev@cs.uu.nl. - - If you want the TU Delft build farm to build binaries of the - package and make them available in the nixpkgs - channel, add it to pkgs/top-level/release.nix. - diff --git a/lib/licenses.nix b/lib/licenses.nix index ed6a54db550dd37e4c0deee7cc2d4e0c9c3c2952..29144264ddd203d8a7cf6ad013b9f5a8d8720e80 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -1,25 +1,24 @@ -{ - /* License identifiers loosely based on: http://fedoraproject.org/wiki/Licensing +let + spdx = lic: lic // { + url = "http://spdx.org/licenses/${lic.shortName}"; + }; +in + +rec { + /* License identifiers from spdx.org where possible. * If you cannot find your license here, then look for a similar license or * add it to this list. The URL mentioned above is a good source for inspiration. */ - artistic2 = { - shortName = "Artistic 2.0"; - fullName = "Artistic 2.0"; - url = "http://opensource.org/licenses/artistic-license-2.0.php"; - }; - - agpl3 = { - shortName = "AGPLv3"; - fullName = "GNU Affero General Public License version 3 only"; - url = https://www.gnu.org/licenses/agpl.html; + agpl3 = spdx { + shortName = "AGPL-3.0"; + fullName = "GNU Affero General Public License v3.0"; }; agpl3Plus = { - shortName = "AGPLv3+"; - fullName = "GNU Affero General Public License version 3 or later"; - url = https://www.gnu.org/licenses/agpl.html; + shortName = "AGPL-3.0+"; + fullName = "GNU Affero General Public License v3.0 or later"; + inherit (agpl3) url; }; amd = { @@ -28,204 +27,198 @@ url = http://developer.amd.com/amd-license-agreement/; };# - apsl20 = { - shortName = "APSL 2.0"; + apsl20 = spdx { + shortName = "APSL-2.0"; fullName = "Apple Public Source License 2.0"; - url = http://opensource.org/licenses/APSL-2.0; }; - asl20 = { - shortName = "ASL2.0"; - fullName = "Apache Software License 2.0"; - url = http://www.apache.org/licenses/LICENSE-2.0; + artistic2 = spdx { + shortName = "Artistic-2.0"; + fullName = "Artistic License 2.0"; + }; + + asl20 = spdx { + shortName = "Apache-2.0"; + fullName = "Apache License 2.0"; }; - boost = { - shortName = "boost"; - fullName = "Boost Software License"; - url = http://www.boost.org/LICENSE_1_0.txt; + boost = spdx { + shortName = "BSL-1.0"; + fullName = "Boost Software License 1.0"; }; - bsd2 = { - shortName = "BSD-2"; - fullName = "BSD license (2 clause)"; - url = http://opensource.org/licenses/BSD-2-Clause; + bsd2 = spdx { + shortName = "BSD-2-Clause"; + fullName = ''BSD 2-clause "Simplified" License''; }; - bsd3 = { - shortName = "BSD-3"; - fullName = "BSD license (3 clause)"; - url = http://opensource.org/licenses/BSD-3-Clause; + bsd3 = spdx { + shortName = "BSD-3-Clause"; + fullName = ''BSD 3-clause "New" or "Revised" License''; }; - bsdOriginal = { - shortName = "BSD-original"; - fullName = "Original BSD license with advertising clause"; - url = https://fedoraproject.org/wiki/Licensing/BSD; + bsdOriginal = spdx { + shortName = "BSD-4-Clause"; + fullName = ''BSD 4-clause "Original" or "Old" License''; }; - cc-by-30 = { - shortName = "CC BY 3.0"; + cc-by-30 = spdx { + shortName = "CC-BY-3.0"; fullName = "Creative Commons Attribution 3.0"; - url = http://creativecommons.org/licenses/by/3.0; }; - cddl = { - shortName = "CDDL"; - fullName = "Common Development Distribution License "; - url = http://www.opensolaris.org/os/licensing/cddllicense.txt; + cddl = spdx { + shortName = "CDDL-1.0"; + fullName = "Common Development and Distribution License 1.0"; + }; + + cecill-c = spdx { + shortName = "CECILL-C"; + fullName = "CeCILL-C Free Software License Agreement"; }; - cpl10 = { - shortName = "CPL 1.0"; - fullName = "Common Public License version 1.0"; - url = http://www.eclipse.org/legal/cpl-v10.html; + cpl10 = spdx { + shortName = "CPL-1.0"; + fullName = "Common Public License 1.0"; }; - epl10 = { - shortName = "EPL 1.0"; - fullName = "Eclipse Public License version 1.0"; - url = http://www.eclipse.org/legal/epl-v10.html; + epl10 = spdx { + shortName = "EPL-1.0"; + fullName = "Eclipse Public License 1.0"; }; free = "free"; - gpl2 = { - shortName = "GPLv2"; - fullName = "GNU General Public License version 2"; - url = http://www.gnu.org/licenses/old-licenses/gpl-2.0.html; + gpl2 = spdx { + shortName = "GPL-2.0"; + fullName = "GNU General Public License v2.0 only"; }; gpl2Oss = { - shortName = "GPLv2+OSS"; + shortName = "GPL-2.0-with-OSS"; fullName = "GNU General Public License version 2 only (with OSI approved licenses linking exception)"; url = http://www.mysql.com/about/legal/licensing/foss-exception; }; - gpl2Plus = { - shortName = "GPLv2+"; - fullName = "GNU General Public License version 2 or later"; - url = http://www.gnu.org/licenses/old-licenses/gpl-2.0.html; + gpl2Plus = spdx { + shortName = "GPL-2.0+"; + fullName = "GNU General Public License v2.0 or later"; }; - gpl3 = { - shortName = "GPLv3"; - fullName = "GNU General Public License version 3 only"; - url = http://www.fsf.org/licensing/licenses/gpl.html; + gpl3 = spdx { + shortName = "GPL-3.0"; + fullName = "GNU General Public License v3.0 only"; }; - gpl3Plus = { - shortName = "GPLv3+"; - fullName = "GNU General Public License version 3 or later"; - url = http://www.fsf.org/licensing/licenses/gpl.html; + gpl3Plus = spdx { + shortName = "GPL-3.0+"; + fullName = "GNU General Public License v3.0 or later"; }; gpl3ClasspathPlus = { - shortName = "GPLv3+classpath+"; - fullName = "GNU General Public License version 3 or later (with Classpath exception)"; + shortName = "GPL-3.0+-with-classpath-exception"; + fullName = "GNU General Public License v3.0 or later (with Classpath exception)"; url = https://fedoraproject.org/wiki/Licensing/GPL_Classpath_Exception; }; - isc = { - shortName = "ISC"; - fullName = "Internet Systems Consortium License"; - url = http://www.opensource.org/licenses/ISC; + inria = { + shortName = "INRIA-NCLA"; + fullName = "INRIA Non-Commercial License Agreement"; + url = "http://compcert.inria.fr/doc/LICENSE"; + }; + + ipa = spdx { + shortName = "IPA"; + fullName = "IPA Font License"; }; - ipa = { - shortName = "IPA 1.0"; - fullName = "IPA Font License v1.0"; - url = http://ipafont.ipa.go.jp/ipafont/; + ipl10 = spdx { + shortName = "IPL-1.0"; + fullName = "IBM Public License v1.0"; }; - ipl10 = { - shortName = "IPL 1.0"; - fullName = "IBM Public License Version 1.0"; - url = http://www.ibm.com/developerworks/opensource/library/os-i18n2/os-ipl.html; + isc = spdx { + shortName = "ISC"; + fullName = "ISC License"; }; - ijg = { - shortName = "IJG"; - fullName = "Independent JPEG Group License"; - url = https://fedoraproject.org/wiki/Licensing/IJG; + lgpl2 = spdx { + shortName = "LGPL-2.0"; + fullName = "GNU Library General Public License v2 only"; }; - libtiff = { - shortName = "libtiff"; - fullName = "libtiff license"; - url = https://fedoraproject.org/wiki/Licensing/libtiff; + lgpl2Plus = spdx { + shortName = "LGPL-2.0+"; + fullName = "GNU Library General Public License v2 or later"; }; - lgpl2 = { - shortName = "LGPLv2"; - fullName = "GNU Library General Public License version 2"; - url = http://www.gnu.org/licenses/old-licenses/lgpl-2.0.html; + lgpl21 = spdx { + shortName = "LGPL-2.1"; + fullName = "GNU Library General Public License v2.1 only"; }; - lgpl2Plus = { - shortName = "LGPLv2+"; - fullName = "GNU Library General Public License version 2 or later"; - url = http://www.gnu.org/licenses/old-licenses/lgpl-2.0.html; + lgpl21Plus = spdx { + shortName = "LGPL-2.1+"; + fullName = "GNU Library General Public License v2.1 or later"; }; - lgpl21 = { - shortName = "LGPLv2.1"; - fullName = "GNU Lesser General Public License version 2.1"; - url = http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html; + lgpl3 = spdx { + shortName = "LGPL-3.0"; + fullName = "GNU Lesser General Public License v3.0 only"; }; - lgpl21Plus = { - shortName = "LGPLv2.1+"; - fullName = "GNU Lesser General Public License version 2.1 or later"; - url = http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html; + lgpl3Plus = spdx { + shortName = "LGPL-3.0+"; + fullName = "GNU Lesser General Public License v3.0 or later"; + }; + + libtiff = { + shortName = "libtiff"; + fullName = "libtiff license"; + url = https://fedoraproject.org/wiki/Licensing/libtiff; }; llgpl21 = { - shortName = "LLGPLv2.1"; + shortName = "LLGPL-2.1"; fullName = "Lisp LGPL; GNU Lesser General Public License version 2.1 with Franz Inc. preamble for clarification of LGPL terms in context of Lisp"; url = http://opensource.franz.com/preamble.html; }; - lgpl3 = { - shortName = "LGPLv3"; - fullName = "GNU Lesser General Public License version 3 only"; - url = http://www.fsf.org/licensing/licenses/lgpl.html; + mit = spdx { + shortName = "MIT"; + fullName = "MIT License"; }; - lgpl3Plus = { - shortName = "LGPLv3+"; - fullName = "GNU Lesser General Public License version 3 or later"; - url = http://www.fsf.org/licensing/licenses/lgpl.html; + mpl11 = spdx { + shortName = "MPL-1.1"; + fullName = "Mozilla Public License 1.1"; }; - mit = { - shortName = "MIT"; - fullName = "MIT/X11 license"; - url = http://www.opensource.org/licenses/mit-license.php; + mpl20 = spdx { + shortName = "MPL-2.0"; + fullName = "Mozilla Public License 2.0"; }; - mpl11 = { - shortName = "MPL1.1"; - fullName = "Mozilla Public License version 1.1"; - url = http://www.mozilla.org/MPL/MPL-1.1.html; + msrla = { + shortName = "MSR-LA"; + fullName = "Microsoft Research License Agreement"; + url = "http://research.microsoft.com/en-us/projects/pex/msr-la.txt"; }; - mpl20 = { - shortName = "MPL2.0"; - fullName = "Mozilla Public License version 2.0"; - url = https://www.mozilla.org/MPL/2.0; + ofl = spdx { + shortName = "OFL-1.1"; + fullName = "SIL Open Font License 1.1"; }; - ofl = { - shortName = "OFL"; - fullName = "SIL Open Font License"; - url = "http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&id=OFL_web"; + openssl = spdx { + shortName = "OpenSSL"; + fullName = "OpenSSL License"; }; - openssl = { - shortName = "openssl"; - fullName = "OpenSSL license"; - url = http://www.openssl.org/source/license.html; + psfl = spdx { + shortName = "Python-2.0"; + fullName = "Python Software Foundation License version 2"; + #url = http://docs.python.org/license.html; }; publicDomain = { @@ -233,10 +226,9 @@ fullname = "Public Domain"; }; - psfl = { - shortName = "PSFL"; - fullName = "Python Software Foundation License"; - url = http://docs.python.org/license.html; + sleepycat = spdx { + shortName = "Sleepycat"; + fullName = "Sleepycat License"; }; tcltk = { @@ -257,45 +249,20 @@ url = https://fedoraproject.org/wiki/Licensing:Wadalab?rd=Licensing/Wadalab; }; - zlib = { - shortName = "zlib"; - fullName = "zlib license"; - url = http://www.gzip.org/zlib/zlib_license.html; + zlib = spdx { + shortName = "Zlib"; + fullName = "zlib License"; }; - zpt20 = { - shortName = "ZPT2.0"; + zpt20 = spdx { # FIXME: why zpt* instead of zpl* + shortName = "ZPL-2.0"; fullName = "Zope Public License 2.0"; - url = "http://old.zope.org/Resources/License/ZPL-2.0"; }; - zpt21 = { - shortName = "ZPT2.1"; + zpt21 = spdx { + shortName = "ZPL-2.1"; fullName = "Zope Public License 2.1"; - url = "http://old.zope.org/Resources/License/ZPL-2.1"; - }; - - sleepycat = { - shortName = "Sleepycat"; - fullName = "Sleepycat Public License"; - url = "https://en.wikipedia.org/wiki/Sleepycat_License"; - }; - - cecill-c = { - shortName = "CeCILL-C"; - fullName = "CEA CNRS INRIA Logiciel Libre"; - url = "http://www.cecill.info/licences.en.html"; }; - msrla = { - shortName = "MSR-LA"; - fullName = "Microsoft Research License Agreement"; - url = "http://research.microsoft.com/en-us/projects/pex/msr-la.txt"; - }; - - inria = { - shortName = "INRIA-NCLA"; - fullName = "INRIA Non-Commercial License Agreement"; - url = "http://compcert.inria.fr/doc/LICENSE"; - }; } + diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 6110b74933b3d70a5d1e736fda6d07eabaab8788..b1c3f6bcdd2394f5ef2849d72cbaee9c3aed5175 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -33,6 +33,7 @@ coconnor = "Corey O'Connor "; coroa = "Jonas Hörsch "; cstrahan = "Charles Strahan "; + DamienCassou = "Damien Cassou "; ederoyd46 = "Matthew Brown "; edwtjo = "Edward Tjörnhammar "; eelco = "Eelco Dolstra "; @@ -45,6 +46,7 @@ goibhniu = "Cillian de Róiste "; guibert = "David Guibert "; hinton = "Tom Hinton "; + hrdinka = "Christoph Hrdinka "; ianwookim = "Ian-Woo Kim "; iElectric = "Domen Kozar "; iyzsong = "Song Wenwu "; @@ -62,9 +64,11 @@ madjar = "Georges Dubus "; marcweber = "Marc Weber "; matejc = "Matej Cotman "; + meisternu = "Matt Miemiec "; modulistic = "Pablo Costa "; mornfall = "Petr Ročkai "; msackman = "Matthew Sackman "; + notthemessiah = "Brian Cohen "; ocharles = "Oliver Charles "; offline = "Jaka Hudoklin "; orbitz = "Malcolm Matalka "; @@ -89,8 +93,10 @@ sander = "Sander van der Burg "; shlevy = "Shea Levy "; simons = "Peter Simons "; + skeidel = "Sven Keidel "; smironov = "Sergey Mironov "; sprock = "Roger Mason "; + tailhook = "Paul Colomiets "; thammers = "Tobias Hammerschmidt "; the-kenny = "Moritz Ulrich "; thoughtpolice = "Austin Seipp "; @@ -106,6 +112,7 @@ winden = "Antonio Vargas Gonzalez "; wizeman = "Ricardo M. Correia "; wjlroe = "William Roe "; + wkennington = "William A. Kennington III "; wmertens = "Wout Mertens "; z77z = "Marco Maggesi "; zef = "Zef Hemel "; diff --git a/lib/platforms.nix b/lib/platforms.nix index 76df389deacdbf931f5188ba6bedfcc144a398ed..44a56b659c7230482d94c182503c09945efeda63 100644 --- a/lib/platforms.nix +++ b/lib/platforms.nix @@ -11,6 +11,6 @@ rec { unix = linux ++ darwin ++ freebsd ++ openbsd; all = linux ++ darwin ++ cygwin ++ freebsd ++ openbsd; none = []; - allBut = platform: lists.filter (x: platform != x) all; + allBut = platforms: lists.filter (x: !(builtins.elem x platforms)) all; mesaPlatforms = ["i686-linux" "x86_64-linux" "x86_64-darwin" "armv5tel-linux" "armv6l-linux"]; } diff --git a/maintainers/scripts/sort-attrs.str b/maintainers/scripts/sort-attrs.str deleted file mode 100644 index b67b6ee2a57b5e03443c8954af26959085fe9a38..0000000000000000000000000000000000000000 --- a/maintainers/scripts/sort-attrs.str +++ /dev/null @@ -1,146 +0,0 @@ -/* Tool to sort attribute sets. Primarily useful for keeping - all-packages.nix tidy. - - To compile: - - $ strc -i ../../maintainers/scripts/sort-attrs.str -la stratego-lib - - Typical invocation: - - $ sglr -m -p ~/Dev/nix/src/libexpr/nix.tbl -i all-packages.nix \ - | implode-asfix --lex \ - | ../../maintainers/scripts/sort-attrs \ - | asfix-yield -*/ - -module sort-attrs - -imports - libstratego-lib - libstratego-sglr - - -strategies - - no-wsp = !appl(prod([], cf(opt(layout())), no-attrs()), []) - - -rules - - list-sep(s): [] -> [] - list-sep(s): [x | xs] -> [[x | before] | [split | after]] - where - xs => (before, split, after) - list-sep(s): [x | xs] -> [[x | xs]] - where - xs - - list-sep-end(s): xs -> [ (before, [split]) | after] - where - xs => (before, split, after) - list-sep-end(s): xs -> [xs] - where - xs - - - sort-attrs: - appl(p@prod(_, _, attrs([term(cons("Attrs"))])), - [ lit("{") - , ws1 - , appl(p2@list(cf(iter-star(sort("Bind")))), attrs) - , ws2 - , lit("}") - ] - ) -> - appl(p, [lit("{"), , appl(p2, attrs'), ws2, lit("}")]) - where - "found it"; - [ws1 | attrs] => withWSP; - withWSP => groups; - groups; - [x''' | xs'] - where - x => (x', starts); - [x' | xs] => [x'' | xs']; - <[] <+ \x -> ["\n\n\n" | x]\ > starts => starts'; - (starts', x'') => x''' - \ })> groups => attrs'; - "did it" - - - attach-wsp: [a, b | cs] -> [(a, b) | cs] - attach-wsp: [] -> [] - - -strategies - - starts-section = - ?x@(appl(prod([cf(layout())], cf(opt(layout())), no-attrs()), cs), attr); - cs; - !x - -rules - - - sortable-section = ?[s]; !s; explode-string; not(fetch({x: ?x; !(x, 97); geq})) - - - remove-section-start: - (appl(prod([cf(layout())], cf(opt(layout())), no-attrs()), cs), attr) -> - ((appl(prod([cf(layout())], cf(opt(layout())), no-attrs()), cs'), attr), starts) - where - !cs; - list-sep-end(?10); // separate into lines, keeping the \n - map(implode-string); - partition(where(is-substring(!"###"))) => (starts, rest); - rest => cs' - - - regularise-empty-lines: - (appl(prod([cf(layout())], cf(opt(layout())), no-attrs()), cs), attr) -> - (appl(prod([cf(layout())], cf(opt(layout())), no-attrs()), cs''), attr) - where - // separate into lines, keeping the \n - // last whitespace is significant, keep - cs => (init, last); - init => cs'; // remove whitespace-only lines - [ "\n\n", cs', last] => cs'' // add one empty line - - /* Dirty hack: *do* keep the first empty line following a non-empty line. !!! order matters */ - regularise-empty-lines': [] -> [] - - regularise-empty-lines': [x, y | xs] -> [x, y | xs] - where - x; - y - - regularise-empty-lines': [x | xs] -> [x | xs] - where x - - regularise-empty-lines': [x | xs] -> xs - where x - - - prepend-layout: - (text, (appl(prod([cf(layout())], cf(opt(layout())), no-attrs()), cs), attr)) -> - (appl(prod([cf(layout())], cf(opt(layout())), no-attrs()), cs''), attr) - where - cs => cs'; - ( text, cs') => cs'' - - - compare-attrs: - x@ - ( (_, appl(p1@prod(_, _, attrs([term(cons("Bind"))])), [id1 | xs1])) - , (_, appl(p2@prod(_, _, attrs([term(cons("Bind"))])), [id2 | xs2])) - ) - -> x - where - (id1, id2) - - -strategies - - main = io-wrap( - oncetd(sort-attrs) - ) diff --git a/nixos/doc/manual/README b/nixos/doc/manual/README new file mode 100644 index 0000000000000000000000000000000000000000..587f6275197ae281200172cb5703877758bd6e0b --- /dev/null +++ b/nixos/doc/manual/README @@ -0,0 +1,12 @@ +To build the manual, you need Nix installed on your system (no need +for NixOS). To install Nix, follow the instructions at + + https://nixos.org/nix/download.html + +When you have Nix on your system, in the root directory of the project +(i.e., `nixpkgs`), run: + + nix-build nixos/release.nix -A manual.x86_64-linux + +When this command successfully finishes, it will tell you where the +manual got generated. diff --git a/nixos/doc/manual/configuration.xml b/nixos/doc/manual/configuration.xml index 98686a19f1eb0099e15d29edee338efdb17d3eca..051f0fb8c1e0aca47d6940a801170814ae94ed0c 100644 --- a/nixos/doc/manual/configuration.xml +++ b/nixos/doc/manual/configuration.xml @@ -1036,21 +1036,22 @@ users.extraUsers.alice = { createHome = true; home = "/home/alice"; description = "Alice Foobar"; - extraGroups = [ "wheel" ]; + extraGroups = [ "wheel" "networkmanager" ]; useDefaultShell = true; openssh.authorizedKeys.keys = [ "ssh-dss AAAAB3Nza... alice@foobar" ]; }; Note that alice is a member of the -wheel group, which allows her to use -sudo to execute commands as -root. Also note the SSH public key that allows -remote logins with the corresponding private key. Users created in -this way do not have a password by default, so they cannot log in via -mechanisms that require a password. However, you can use the -passwd program to set a password, which is retained -across invocations of nixos-rebuild. +wheel and networkmanager groups, +which allows her to use sudo to execute commands as +root and to configure the network, respectively. +Also note the SSH public key that allows remote logins with the +corresponding private key. Users created in this way do not have a +password by default, so they cannot log in via mechanisms that require +a password. However, you can use the passwd program +to set a password, which is retained across invocations of +nixos-rebuild. A user ID (uid) is assigned automatically. You can also specify a uid manually by adding @@ -1277,6 +1278,28 @@ services.xserver.synaptics.twoFingerScroll = true;
Networking +
NetworkManager + +To facilitate network configuration, some desktop environments +use NetworkManager. You can enable NetworkManager by setting: + + +services.networkmanager.enable = true; + + +Some desktop managers (e.g., GNOME) enable NetworkManager +automatically for you. + +All users that should have permission to change network settings +must belong to the networkmanager group. + +services.networkmanager and +services.wireless can not be enabled at the same time: +you can still connect to the wireless networks using +NetworkManager. + +
+
Secure shell access Secure shell (SSH) access to your machine can be enabled by @@ -1399,6 +1422,11 @@ always allowed.)
Wireless networks +For a desktop installation using NetworkManager (e.g., GNOME), +you just have to make sure the user is in the +networkmanager group and you can skip the rest of this +section on wireless networks. + NixOS will start wpa_supplicant for you if you enable this setting: diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix index a79a77f40df13e27dfb27cea90ed2c6850c18394..55533a05b066e9f0b9ea403990f1536bce542029 100644 --- a/nixos/doc/manual/default.nix +++ b/nixos/doc/manual/default.nix @@ -1,5 +1,6 @@ { pkgs, options, version, revision }: +with pkgs; with pkgs.lib; let @@ -22,7 +23,7 @@ let optionsXML = builtins.toFile "options.xml" (builtins.unsafeDiscardStringContext (builtins.toXML options'')); - optionsDocBook = pkgs.runCommand "options-db.xml" {} '' + optionsDocBook = runCommand "options-db.xml" {} '' if grep /nixpkgs/nixos/modules ${optionsXML}; then echo "The manual appears to depend on the location of Nixpkgs, which is bad" echo "since this prevents sharing via the NixOS channel. This is typically" @@ -30,7 +31,7 @@ let echo "for hints about the offending path)." exit 1 fi - ${pkgs.libxslt}/bin/xsltproc \ + ${libxslt}/bin/xsltproc \ --stringparam revision '${revision}' \ -o $out ${./options-to-docbook.xsl} ${optionsXML} ''; @@ -38,12 +39,12 @@ let in rec { # Generate the NixOS manual. - manual = pkgs.stdenv.mkDerivation { + manual = stdenv.mkDerivation { name = "nixos-manual"; sources = sourceFilesBySuffices ./. [".xml"]; - buildInputs = [ pkgs.libxml2 pkgs.libxslt ]; + buildInputs = [ libxml2 libxslt ]; xsltFlags = '' --param section.autolabel 1 @@ -62,19 +63,19 @@ in rec { # Check the validity of the manual sources. xmllint --noout --nonet --xinclude --noxincludenode \ - --relaxng ${pkgs.docbook5}/xml/rng/docbook/docbook.rng \ + --relaxng ${docbook5}/xml/rng/docbook/docbook.rng \ manual.xml # Generate the HTML manual. dst=$out/share/doc/nixos - ensureDir $dst + mkdir -p $dst xsltproc $xsltFlags --nonet --xinclude \ --output $dst/manual.html \ - ${pkgs.docbook5_xsl}/xml/xsl/docbook/xhtml/docbook.xsl \ + ${docbook5_xsl}/xml/xsl/docbook/xhtml/docbook.xsl \ ./manual.xml mkdir -p $dst/images/callouts - cp ${pkgs.docbook5_xsl}/xml/xsl/docbook/images/callouts/*.gif $dst/images/callouts/ + cp ${docbook5_xsl}/xml/xsl/docbook/images/callouts/*.gif $dst/images/callouts/ cp ${./style.css} $dst/style.css @@ -86,13 +87,39 @@ in rec { meta.description = "The NixOS manual in HTML format"; }; + manualPDF = stdenv.mkDerivation { + name = "nixos-manual-pdf"; + + sources = sourceFilesBySuffices ./. [".xml"]; + + buildInputs = [ libxml2 libxslt dblatex tetex ]; + + buildCommand = '' + # TeX needs a writable font cache. + export VARTEXFONTS=$TMPDIR/texfonts + + ln -s $sources/*.xml . # */ + ln -s ${optionsDocBook} options-db.xml + echo "${version}" > version + + dst=$out/share/doc/nixos + mkdir -p $dst + xmllint --xinclude manual.xml | dblatex -o $dst/manual.pdf - \ + -P doc.collab.show=0 \ + -P latex.output.revhistory=0 + + mkdir -p $out/nix-support + echo "doc-pdf manual $dst/manual.pdf" >> $out/nix-support/hydra-build-products + ''; # */ + }; + # Generate the NixOS manpages. - manpages = pkgs.stdenv.mkDerivation { + manpages = stdenv.mkDerivation { name = "nixos-manpages"; sources = sourceFilesBySuffices ./. [".xml"]; - buildInputs = [ pkgs.libxml2 pkgs.libxslt ]; + buildInputs = [ libxml2 libxslt ]; buildCommand = '' ln -s $sources/*.xml . # */ @@ -100,7 +127,7 @@ in rec { # Check the validity of the manual sources. xmllint --noout --nonet --xinclude --noxincludenode \ - --relaxng ${pkgs.docbook5}/xml/rng/docbook/docbook.rng \ + --relaxng ${docbook5}/xml/rng/docbook/docbook.rng \ ./man-pages.xml # Generate manpages. @@ -109,7 +136,7 @@ in rec { --param man.output.in.separate.dir 1 \ --param man.output.base.dir "'$out/share/man/'" \ --param man.endnotes.are.numbered 0 \ - ${pkgs.docbook5_xsl}/xml/xsl/docbook/manpages/docbook.xsl \ + ${docbook5_xsl}/xml/xsl/docbook/manpages/docbook.xsl \ ./man-pages.xml ''; }; diff --git a/nixos/doc/manual/installation.xml b/nixos/doc/manual/installation.xml index 3da5e30097714dd917f7c3cea3d65c80122089d6..4cbfcc229fa43b76cc4d5082724383615df396f0 100644 --- a/nixos/doc/manual/installation.xml +++ b/nixos/doc/manual/installation.xml @@ -320,7 +320,10 @@ changes: You should boot the live CD in UEFI mode (consult your - specific hardware's documentation for instructions). + specific hardware's documentation for instructions). You may find + the rEFInd + boot manager useful. Instead of fdisk, you should use @@ -335,6 +338,11 @@ changes: should do this automatically for new configurations when booted in UEFI mode. + + After having mounted your installation partition to + /mnt, you must mount the boot partition + to /mnt/boot. + You may want to look at the options starting with and diff --git a/nixos/doc/manual/manual.xml b/nixos/doc/manual/manual.xml index 8d7c28dee7336b58756e74b0f69f770edba54d35..f51a04cdf25bef81c68f49c976478c398af0b2fd 100644 --- a/nixos/doc/manual/manual.xml +++ b/nixos/doc/manual/manual.xml @@ -7,25 +7,6 @@ NixOS Manual Version - - - Eelco - Dolstra - - - - - - Nicolas - Pierron - - - - - 2007-2013 - Eelco Dolstra - - diff --git a/nixos/doc/manual/options-to-docbook.xsl b/nixos/doc/manual/options-to-docbook.xsl index bb65a49217f025a4c802314e14931ed7971f33d7..e81a1dc356e1860feb9878bce2f93c6701626732 100644 --- a/nixos/doc/manual/options-to-docbook.xsl +++ b/nixos/doc/manual/options-to-docbook.xsl @@ -202,4 +202,10 @@ + + + λ + + + diff --git a/nixos/lib/make-iso9660-image.sh b/nixos/lib/make-iso9660-image.sh index 89b681ed2cd5bc1708f48d16af9bc6c6204761bc..675b5bb35148ed867678b2edae8fe776d6c6b122 100644 --- a/nixos/lib/make-iso9660-image.sh +++ b/nixos/lib/make-iso9660-image.sh @@ -78,7 +78,7 @@ done cat pathlist | sed -e 's/=\(.*\)=\(.*\)=/\\=\1=\2\\=/' | tee pathlist.safer -ensureDir $out/iso +mkdir -p $out/iso genCommand="genisoimage -iso-level 4 -r -J $bootFlags -hide-rr-moved -graft-points -path-list pathlist.safer ${volumeID:+-V $volumeID}" if test -z "$compressImage"; then $genCommand -o $out/iso/$isoName @@ -87,5 +87,5 @@ else fi -ensureDir $out/nix-support +mkdir -p $out/nix-support echo $system > $out/nix-support/system diff --git a/nixos/lib/make-system-tarball.sh b/nixos/lib/make-system-tarball.sh index aadd0f6428c8442ad29e57bae8e07cdbf6e99188..096d96ac1c810de33ff59269ff4b61ac7173360d 100644 --- a/nixos/lib/make-system-tarball.sh +++ b/nixos/lib/make-system-tarball.sh @@ -48,11 +48,11 @@ for ((n = 0; n < ${#objects[*]}; n++)); do fi done -ensureDir $out/tarball +mkdir -p $out/tarball tar cvJf $out/tarball/$fileName.tar.xz * -ensureDir $out/nix-support +mkdir -p $out/nix-support echo $system > $out/nix-support/system echo "file system-tarball $out/tarball/$fileName.tar.xz" > $out/nix-support/hydra-build-products diff --git a/nixos/lib/testing.nix b/nixos/lib/testing.nix index 063b9bf6c7af3b89d253acf9358bd93c19a5f80a..0e23fc5d187d32b6f64c7c00ee2e0868476cbade 100644 --- a/nixos/lib/testing.nix +++ b/nixos/lib/testing.nix @@ -117,7 +117,7 @@ rec { report = releaseTools.gcovReport { coverageRuns = [ test ]; }; - in (if makeCoverageReport then report else test) // { inherit driver test; }; + in (if makeCoverageReport then report else test) // { inherit nodes driver test; }; runInMachine = diff --git a/nixos/modules/config/ldap.nix b/nixos/modules/config/ldap.nix index 7fcb1aaf63dddfc9b5221ddf41218dc88521e39a..1a01533c585b1d559be929ca8a769fef79f99281 100644 --- a/nixos/modules/config/ldap.nix +++ b/nixos/modules/config/ldap.nix @@ -217,9 +217,7 @@ in systemd.services = mkIf cfg.daemon.enable { nslcd = { - wantedBy = [ "nss-user-lookup.target" ]; - before = [ "nss-user-lookup.target" ]; - after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; preStart = '' mkdir -p /run/nslcd diff --git a/nixos/modules/config/pulseaudio.nix b/nixos/modules/config/pulseaudio.nix index 67e536f4fd93db9e29b4e02f20f07f6e1b12694d..96593885e5b7361c7e91fba3c98546904c2e1087 100644 --- a/nixos/modules/config/pulseaudio.nix +++ b/nixos/modules/config/pulseaudio.nix @@ -80,12 +80,12 @@ in { package = mkOption { type = types.package; - default = pulseaudio; - example = literalExample "pulseaudio.override { jackaudioSupport = true; }"; + default = pulseaudioFull; + example = literalExample "pulseaudioFull"; description = '' - The PulseAudio derivation to use. This can be used to enable - features (such as JACK support) that are not enabled in the - default PulseAudio in Nixpkgs. + The PulseAudio derivation to use. This can be used to disable + features (such as JACK support, Bluetooth) that are enabled in the + pulseaudioFull package in Nixpkgs. ''; }; diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix index 28c42d64f6fb9045f7ea7bf589c2d5eca2751a1f..d43fa22038180e4cc820f6907cfc31e541fe9df7 100644 --- a/nixos/modules/installer/cd-dvd/iso-image.nix +++ b/nixos/modules/installer/cd-dvd/iso-image.nix @@ -179,7 +179,6 @@ in fileSystems."/" = { fsType = "tmpfs"; - device = "none"; options = "mode=0755"; }; @@ -192,6 +191,8 @@ in noCheck = true; }; + # In stage 1, mount a tmpfs on top of /nix/store (the squashfs + # image) to make this a live CD. fileSystems."/nix/.ro-store" = { fsType = "squashfs"; device = "/iso/nix-store.squashfs"; @@ -201,23 +202,20 @@ in fileSystems."/nix/.rw-store" = { fsType = "tmpfs"; - device = "none"; options = "mode=0755"; neededForBoot = true; }; + fileSystems."/nix/store" = + { fsType = "unionfs-fuse"; + device = "unionfs"; + options = "allow_other,cow,nonempty,chroot=/mnt-root,max_files=32768,hide_meta_files,dirs=/nix/.rw-store=rw:/nix/.ro-store=ro"; + }; + boot.initrd.availableKernelModules = [ "squashfs" "iso9660" ]; boot.initrd.kernelModules = [ "loop" ]; - # In stage 1, mount a tmpfs on top of /nix/store (the squashfs - # image) to make this a live CD. - boot.initrd.postMountCommands = - '' - mkdir -p $targetRoot/nix/store - unionfs -o allow_other,cow,nonempty,chroot=$targetRoot,max_files=32768 /nix/.rw-store=RW:/nix/.ro-store=RO $targetRoot/nix/store - ''; - # Closures to be copied to the Nix store on the CD, namely the init # script and the top-level system configuration directory. isoImage.storeContents = @@ -313,8 +311,8 @@ in ''; # Add vfat support to the initrd to enable people to copy the - # contents of the CD to a bootable USB stick. Need unionfs-fuse for union mounts - boot.initrd.supportedFilesystems = [ "vfat" "unionfs-fuse" ]; + # contents of the CD to a bootable USB stick. + boot.initrd.supportedFilesystems = [ "vfat" ]; }; diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index a71f5152bd15ef36796d12efc0943922dc35e18f..8a459ce5e889967b12ff2a309c1bed945d826186 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -137,6 +137,9 @@ gitolite = 127; znc = 128; polipo = 129; + mopidy = 130; + unifi = 131; + gdm = 132; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -248,6 +251,10 @@ firebird = 127; znc = 128; polipo = 129; + mopidy = 130; + docker = 131; + gdm = 132; + tss = 133; # When adding a gid, make sure it doesn't match an existing uid. And don't use gids above 399! diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 68971551d89eaf4dd1c74b9f36c826f794ca74e6..d90c56f2412ad9ad73691702ea7866c3f0ad9b74 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -50,6 +50,7 @@ ./programs/bash/bash.nix ./programs/bash/command-not-found.nix ./programs/blcr.nix + ./programs/dconf.nix ./programs/environment.nix ./programs/info.nix ./programs/screen.nix @@ -79,6 +80,7 @@ ./services/audio/alsa.nix ./services/audio/fuppes.nix ./services/audio/mpd.nix + ./services/audio/mopidy.nix ./services/backup/almir.nix ./services/backup/bacula.nix ./services/backup/mysql-backup.nix @@ -124,6 +126,7 @@ ./services/hardware/pcscd.nix ./services/hardware/pommed.nix ./services/hardware/sane.nix + ./services/hardware/tcsd.nix ./services/hardware/thinkfan.nix ./services/hardware/udev.nix ./services/hardware/udisks2.nix @@ -134,6 +137,7 @@ ./services/logging/logstash.nix ./services/logging/rsyslogd.nix ./services/logging/syslogd.nix + ./services/logging/syslog-ng.nix ./services/mail/dovecot.nix ./services/mail/freepops.nix ./services/mail/mail.nix @@ -232,6 +236,7 @@ ./services/networking/teamspeak3.nix ./services/networking/tftpd.nix ./services/networking/unbound.nix + ./services/networking/unifi.nix ./services/networking/vsftpd.nix ./services/networking/wakeonlan.nix ./services/networking/websockify.nix @@ -276,6 +281,7 @@ ./services/x11/desktop-managers/default.nix ./services/x11/display-managers/auto.nix ./services/x11/display-managers/default.nix + ./services/x11/display-managers/gdm.nix ./services/x11/display-managers/kdm.nix ./services/x11/display-managers/lightdm.nix ./services/x11/display-managers/slim.nix @@ -287,6 +293,7 @@ #./services/x11/window-managers/compiz.nix ./services/x11/window-managers/default.nix ./services/x11/window-managers/icewm.nix + ./services/x11/window-managers/bspwm.nix ./services/x11/window-managers/metacity.nix ./services/x11/window-managers/none.nix ./services/x11/window-managers/twm.nix @@ -296,6 +303,7 @@ ./services/x11/xserver.nix ./system/activation/activation-script.nix ./system/activation/top-level.nix + ./system/boot/emergency-mode.nix ./system/boot/kernel.nix ./system/boot/kexec.nix ./system/boot/loader/efi.nix @@ -311,15 +319,17 @@ ./system/boot/stage-1.nix ./system/boot/stage-2.nix ./system/boot/systemd.nix + ./system/boot/tmp.nix ./system/etc/etc.nix ./system/upstart/upstart.nix ./tasks/cpu-freq.nix ./tasks/encrypted-devices.nix + ./tasks/filesystems.nix ./tasks/filesystems/btrfs.nix + ./tasks/filesystems/cifs.nix ./tasks/filesystems/ext.nix ./tasks/filesystems/f2fs.nix ./tasks/filesystems/nfs.nix - ./tasks/filesystems.nix ./tasks/filesystems/reiserfs.nix ./tasks/filesystems/unionfs-fuse.nix ./tasks/filesystems/vfat.nix @@ -334,6 +344,7 @@ ./testing/service-runner.nix ./virtualisation/container-config.nix ./virtualisation/containers.nix + ./virtualisation/docker.nix ./virtualisation/libvirtd.nix #./virtualisation/nova.nix ./virtualisation/virtualbox-guest.nix diff --git a/nixos/modules/profiles/base.nix b/nixos/modules/profiles/base.nix index 562419b3facb04b53a7ab5f7f0a4ac429a95fe11..6f9e3002f2990e075b811643619729a0983b731e 100644 --- a/nixos/modules/profiles/base.nix +++ b/nixos/modules/profiles/base.nix @@ -7,7 +7,6 @@ # Include some utilities that are useful for installing or repairing # the system. environment.systemPackages = [ - pkgs.subversion # for nixos-checkout pkgs.w3m # needed for the manual anyway pkgs.testdisk # useful for repairing boot problems pkgs.mssys # for writing Microsoft boot sectors / MBRs diff --git a/nixos/modules/programs/dconf.nix b/nixos/modules/programs/dconf.nix new file mode 100644 index 0000000000000000000000000000000000000000..1b7e20799819a6cf1ec9ec996011748bd5d514df --- /dev/null +++ b/nixos/modules/programs/dconf.nix @@ -0,0 +1,34 @@ +{ config, lib, ... }: + +let + inherit (lib) mkOption mkIf types mapAttrsToList; + cfg = config.programs.dconf; + + mkDconfProfile = name: path: + { source = path; target = "dconf/profile/${name}"; }; + +in +{ + ###### interface + + options = { + programs.dconf = { + + profiles = mkOption { + type = types.attrsOf types.path; + default = {}; + description = "Set of dconf profile files."; + internal = true; + }; + + }; + }; + + ###### implementation + + config = mkIf (cfg.profiles != {}) { + environment.etc = + (mapAttrsToList mkDconfProfile cfg.profiles); + }; + +} diff --git a/nixos/modules/security/ca.nix b/nixos/modules/security/ca.nix index dd4b0c529e5ddde5c21ed1441789cbec3b5decab..8e653cd42847add67ba022dd874a4ba6114eb302 100644 --- a/nixos/modules/security/ca.nix +++ b/nixos/modules/security/ca.nix @@ -13,8 +13,9 @@ with lib; ]; environment.sessionVariables = - { OPENSSL_X509_CERT_FILE = "/etc/ssl/certs/ca-bundle.crt"; - CURL_CA_BUNDLE = "/etc/ssl/certs/ca-bundle.crt"; + { SSL_CERT_FILE = "/etc/ssl/certs/ca-bundle.crt"; + # FIXME: unneeded - remove eventually. + OPENSSL_X509_CERT_FILE = "/etc/ssl/certs/ca-bundle.crt"; GIT_SSL_CAINFO = "/etc/ssl/certs/ca-bundle.crt"; }; diff --git a/nixos/modules/security/rngd.nix b/nixos/modules/security/rngd.nix index c31e57e6f6f8f954c94327893f6e950297a6cf5a..4d8fabc7696e2bc3623f95cc183d08cfe4f72a53 100644 --- a/nixos/modules/security/rngd.nix +++ b/nixos/modules/security/rngd.nix @@ -30,7 +30,8 @@ with lib; description = "Hardware RNG Entropy Gatherer Daemon"; - serviceConfig.ExecStart = "${pkgs.rng_tools}/sbin/rngd -f"; + serviceConfig.ExecStart = "${pkgs.rng_tools}/sbin/rngd -f -v" + + (if config.services.tcsd.enable then " --no-tpm=1" else ""); restartTriggers = [ pkgs.rng_tools ]; }; diff --git a/nixos/modules/services/amqp/activemq/default.nix b/nixos/modules/services/amqp/activemq/default.nix index f731900070e4c576bc78d9946583f5c91b41e4fb..261f97617664476aeea44ea26d6fcf59ccd88b5b 100644 --- a/nixos/modules/services/amqp/activemq/default.nix +++ b/nixos/modules/services/amqp/activemq/default.nix @@ -12,7 +12,7 @@ let phases = [ "installPhase" ]; buildInputs = [ jdk ]; installPhase = '' - ensureDir $out/lib + mkdir -p $out/lib source ${activemq}/lib/classpath.env export CLASSPATH ln -s "${./ActiveMQBroker.java}" ActiveMQBroker.java diff --git a/nixos/modules/services/amqp/rabbitmq.nix b/nixos/modules/services/amqp/rabbitmq.nix index bef15fb64b7f234b223a064365555c6638aa3d81..a930098bfeec9abb3d6f93a7f983ff6d6bb29f4b 100644 --- a/nixos/modules/services/amqp/rabbitmq.nix +++ b/nixos/modules/services/amqp/rabbitmq.nix @@ -4,6 +4,8 @@ with lib; let cfg = config.services.rabbitmq; + config_file = pkgs.writeText "rabbitmq.config" cfg.config; + config_file_wo_suffix = builtins.substring 0 ((builtins.stringLength config_file) - 7) config_file; in { ###### interface @@ -31,7 +33,6 @@ in { ''; }; - dataDir = mkOption { type = types.path; default = "/var/lib/rabbitmq"; @@ -40,6 +41,30 @@ in { ''; }; + cookie = mkOption { + default = ""; + type = types.str; + description = '' + Erlang cookie is a string of arbitrary length which must + be the same for several nodes to be allowed to communicate. + Leave empty to generate automatically. + ''; + }; + + config = mkOption { + default = ""; + type = types.str; + description = '' + Verbatim configuration file contents. + See http://www.rabbitmq.com/configure.htm + ''; + }; + + plugins = mkOption { + default = []; + type = types.listOf types.str; + description = "The names of plugins to enable"; + }; }; }; @@ -69,7 +94,10 @@ in { RABBITMQ_NODE_IP_ADDRESS = cfg.listenAddress; RABBITMQ_SERVER_START_ARGS = "-rabbit error_logger tty -rabbit sasl_error_logger false"; SYS_PREFIX = ""; - }; + RABBITMQ_ENABLED_PLUGINS_FILE = pkgs.writeText "enabled_plugins" '' + [ ${concatStringsSep "," cfg.plugins} ]. + ''; + } // optionalAttrs (cfg.config != "") { RABBITMQ_CONFIG_FILE = config_file_wo_suffix; }; serviceConfig = { ExecStart = "${pkgs.rabbitmq_server}/sbin/rabbitmq-server"; @@ -81,6 +109,15 @@ in { preStart = '' mkdir -p ${cfg.dataDir} && chmod 0700 ${cfg.dataDir} if [ "$(id -u)" = 0 ]; then chown rabbitmq:rabbitmq ${cfg.dataDir}; fi + + ${optionalString (cfg.cookie != "") '' + echo -n ${cfg.cookie} > ${cfg.dataDir}/.erlang.cookie + chmod 400 ${cfg.dataDir}/.erlang.cookie + chown rabbitmq:rabbitmq ${cfg.dataDir}/.erlang.cookie + ''} + + mkdir -p /var/log/rabbitmq && chmod 0700 /var/log/rabbitmq + chown rabbitmq:rabbitmq /var/log/rabbitmq ''; }; diff --git a/nixos/modules/services/audio/mopidy.nix b/nixos/modules/services/audio/mopidy.nix new file mode 100644 index 0000000000000000000000000000000000000000..5b865cf4c1be4f793d26733d5cdf98ece434d303 --- /dev/null +++ b/nixos/modules/services/audio/mopidy.nix @@ -0,0 +1,118 @@ +{ config, lib, pkgs, ... }: + +with pkgs; +with lib; + +let + + uid = config.ids.uids.mopidy; + gid = config.ids.gids.mopidy; + cfg = config.services.mopidy; + + mopidyConf = writeText "mopidy.conf" cfg.configuration; + + mopidyLauncher = stdenv.mkDerivation { + name = "mopidy-launcher"; + phases = [ "installPhase" ]; + buildInputs = [ makeWrapper python ]; + installPhase = '' + mkdir -p $out/bin + ln -s ${mopidy}/bin/mopidy $out/bin/mopidy + wrapProgram $out/bin/mopidy \ + --prefix PYTHONPATH : \ + "${concatStringsSep ":" (map (p: "$(toPythonPath ${p})") cfg.extensionPackages)}" + ''; + }; + +in { + + options = { + + services.mopidy = { + + enable = mkOption { + default = false; + type = types.bool; + description = '' + Whether to enable Mopidy, a music player daemon. + ''; + }; + + dataDir = mkOption { + default = "/var/lib/mopidy"; + type = types.str; + description = '' + The directory where Mopidy stores its state. + ''; + }; + + extensionPackages = mkOption { + default = []; + type = types.listOf types.package; + example = [ mopidy-spotify ]; + description = '' + Mopidy extensions that should be loaded by the service. + ''; + }; + + configuration = mkOption { + type = types.lines; + description = '' + The configuration that Mopidy should use. + ''; + }; + + extraConfigFiles = mkOption { + default = []; + type = types.listOf types.str; + description = '' + Extra config file read by Mopidy when the service starts. + Later files in the list overrides earlier configuration. + ''; + }; + + }; + + }; + + + ###### implementation + + config = mkIf cfg.enable { + + systemd.services.mopidy = { + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" "sound.target" ]; + description = "mopidy music player daemon"; + preStart = "mkdir -p ${cfg.dataDir} && chown -R mopidy:mopidy ${cfg.dataDir}"; + serviceConfig = { + ExecStart = "${mopidyLauncher}/bin/mopidy --config ${concatStringsSep ":" ([mopidyConf] ++ cfg.extraConfigFiles)}"; + User = "mopidy"; + PermissionsStartOnly = true; + }; + }; + + systemd.services.mopidy-scan = { + description = "mopidy local files scanner"; + preStart = "mkdir -p ${cfg.dataDir} && chown -R mopidy:mopidy ${cfg.dataDir}"; + serviceConfig = { + ExecStart = "${mopidyLauncher}/bin/mopidy --config ${concatStringsSep ":" ([mopidyConf] ++ cfg.extraConfigFiles)} local scan"; + User = "mopidy"; + PermissionsStartOnly = true; + Type = "oneshot"; + }; + }; + + users.extraUsers.mopidy = { + inherit uid; + group = "mopidy"; + extraGroups = [ "audio" ]; + description = "Mopidy daemon user"; + home = "${cfg.dataDir}"; + }; + + users.extraGroups.mopidy.gid = gid; + + }; + +} diff --git a/nixos/modules/services/desktops/gnome3/at-spi2-core.nix b/nixos/modules/services/desktops/gnome3/at-spi2-core.nix index 615f272e7b9aac12fe4fcf31f8364e12a6dc9ab2..6e4c59f4bb37f123721252adac16175452121165 100644 --- a/nixos/modules/services/desktops/gnome3/at-spi2-core.nix +++ b/nixos/modules/services/desktops/gnome3/at-spi2-core.nix @@ -4,9 +4,6 @@ with lib; -let - gnome3 = config.environment.gnome3.packageSet; -in { ###### interface @@ -33,9 +30,9 @@ in config = mkIf config.services.gnome3.at-spi2-core.enable { - environment.systemPackages = [ gnome3.at_spi2_core ]; + environment.systemPackages = [ pkgs.at_spi2_core ]; - services.dbus.packages = [ gnome3.at_spi2_core ]; + services.dbus.packages = [ pkgs.at_spi2_core ]; }; diff --git a/nixos/modules/services/hardware/acpid.nix b/nixos/modules/services/hardware/acpid.nix index b87899e45983c6d5425e6a80f75d8a51e0f100d4..a20b1a1ee3ad8ddb69572410fab2e04e39ab1d0a 100644 --- a/nixos/modules/services/hardware/acpid.nix +++ b/nixos/modules/services/hardware/acpid.nix @@ -6,7 +6,7 @@ let acpiConfDir = pkgs.runCommand "acpi-events" {} '' - ensureDir $out + mkdir -p $out ${ # Generate a configuration file for each event. (You can't have # multiple events in one config file...) diff --git a/nixos/modules/services/hardware/tcsd.nix b/nixos/modules/services/hardware/tcsd.nix new file mode 100644 index 0000000000000000000000000000000000000000..26b2c884b8f106e3b62d5462e62d19399711c257 --- /dev/null +++ b/nixos/modules/services/hardware/tcsd.nix @@ -0,0 +1,139 @@ +# tcsd daemon. + +{ config, pkgs, ... }: + +with pkgs.lib; +let + + cfg = config.services.tcsd; + + tcsdConf = pkgs.writeText "tcsd.conf" '' + port = 30003 + num_threads = 10 + system_ps_file = ${cfg.stateDir}/system.data + # This is the log of each individual measurement done by the system. + # By re-calculating the PCR registers based on this information, even + # finer details about the measured environment can be inferred than + # what is available directly from the PCR registers. + firmware_log_file = /sys/kernel/security/tpm0/binary_bios_measurements + kernel_log_file = /sys/kernel/security/ima/binary_runtime_measurements + #firmware_pcrs = 0,1,2,3,4,5,6,7 + #kernel_pcrs = 10,11 + platform_cred = ${cfg.platformCred} + conformance_cred = ${cfg.conformanceCred} + endorsement_cred = ${cfg.endorsementCred} + #remote_ops = create_key,random + #host_platform_class = server_12 + #all_platform_classes = pc_11,pc_12,mobile_12 + ''; + +in +{ + + ###### interface + + options = { + + services.tcsd = { + + enable = mkOption { + default = false; + type = types.bool; + description = '' + Whether to enable tcsd, a Trusted Computing management service + that provides TCG Software Stack (TSS). The tcsd daemon is + the only portal to the Trusted Platform Module (TPM), a hardware + chip on the motherboard. + ''; + }; + + user = mkOption { + default = "tss"; + type = types.string; + description = "User account under which tcsd runs."; + }; + + group = mkOption { + default = "tss"; + type = types.string; + description = "Group account under which tcsd runs."; + }; + + stateDir = mkOption { + default = "/var/lib/tpm"; + type = types.path; + description = '' + The location of the system persistent storage file. + The system persistent storage file holds keys and data across + restarts of the TCSD and system reboots. + ''; + }; + + platformCred = mkOption { + default = "${cfg.stateDir}/platform.cert"; + type = types.path; + description = '' + Path to the platform credential for your TPM. Your TPM + manufacturer may have provided you with a set of credentials + (certificates) that should be used when creating identities + using your TPM. When a user of your TPM makes an identity, + this credential will be encrypted as part of that process. + See the 1.1b TPM Main specification section 9.3 for information + on this process. ''; + }; + + conformanceCred = mkOption { + default = "${cfg.stateDir}/conformance.cert"; + type = types.path; + description = '' + Path to the conformance credential for your TPM. + See also the platformCred option''; + }; + + endorsementCred = mkOption { + default = "${cfg.stateDir}/endorsement.cert"; + type = types.path; + description = '' + Path to the endorsement credential for your TPM. + See also the platformCred option''; + }; + }; + + }; + + ###### implementation + + config = mkIf cfg.enable { + + environment.systemPackages = [ pkgs.trousers ]; + +# system.activationScripts.tcsd = +# '' +# chown ${cfg.user}:${cfg.group} ${tcsdConf} +# ''; + + systemd.services.tcsd = { + description = "TCSD"; + after = [ "systemd-udev-settle.service" ]; + wantedBy = [ "multi-user.target" ]; + path = [ pkgs.trousers ]; + preStart = + '' + mkdir -m 0700 -p ${cfg.stateDir} + chown -R ${cfg.user}:${cfg.group} ${cfg.stateDir} + ''; + serviceConfig.ExecStart = "${pkgs.trousers}/sbin/tcsd -f -c ${tcsdConf}"; + }; + + users.extraUsers = optionalAttrs (cfg.user == "tss") (singleton + { name = "tss"; + group = "tss"; + uid = config.ids.uids.nginx; + }); + + users.extraGroups = optionalAttrs (cfg.group == "tss") (singleton + { name = "tss"; + gid = config.ids.gids.nginx; + }); + }; +} diff --git a/nixos/modules/services/logging/logrotate.nix b/nixos/modules/services/logging/logrotate.nix index 804f9a0847ffe5bd1bd8beee57b0039f03b375e8..6887ab1e8052297d37da65f20bba66d1ce4a21e1 100644 --- a/nixos/modules/services/logging/logrotate.nix +++ b/nixos/modules/services/logging/logrotate.nix @@ -8,10 +8,6 @@ let configFile = pkgs.writeText "logrotate.conf" cfg.config; - cronJob = '' - 5 * * * * root ${pkgs.logrotate}/sbin/logrotate ${configFile} - ''; - in { options = { @@ -33,6 +29,16 @@ in }; config = mkIf cfg.enable { - services.cron.systemCronJobs = [ cronJob ]; + systemd.services.logrotate = { + description = "Logrotate Service"; + wantedBy = [ "multi-user.target" ]; + startAt = "*-*-* *:05:00"; + + serviceConfig.Restart = "no"; + serviceConfig.User = "root"; + script = '' + exec ${pkgs.logrotate}/sbin/logrotate ${configFile} + ''; + }; }; } diff --git a/nixos/modules/services/logging/logstash.nix b/nixos/modules/services/logging/logstash.nix index c92c81135704026aeb451fefbe13c97c7e642745..802dd454878b376f64f546c562f7b980b12d199b 100644 --- a/nixos/modules/services/logging/logstash.nix +++ b/nixos/modules/services/logging/logstash.nix @@ -69,9 +69,9 @@ in systemd.services.logstash = with pkgs; { description = "Logstash Daemon"; wantedBy = [ "multi-user.target" ]; - + environment = { JAVA_HOME = jre; }; serviceConfig = { - ExecStart = "${jre}/bin/java -jar ${logstash} agent -f ${writeText "logstash.conf" '' + ExecStart = "${logstash}/bin/logstash agent -f ${writeText "logstash.conf" '' input { ${cfg.inputConfig} } diff --git a/nixos/modules/services/logging/syslog-ng.nix b/nixos/modules/services/logging/syslog-ng.nix new file mode 100644 index 0000000000000000000000000000000000000000..8b892a33bb7df6649e4ab232898ccb80b556edc4 --- /dev/null +++ b/nixos/modules/services/logging/syslog-ng.nix @@ -0,0 +1,83 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + + cfg = config.services.syslog-ng; + + syslogngConfig = pkgs.writeText "syslog-ng.conf" '' + @version: 3.5 + @include "scl.conf" + ${cfg.extraConfig} + ''; + + ctrlSocket = "/run/syslog-ng/syslog-ng.ctl"; + pidFile = "/run/syslog-ng/syslog-ng.pid"; + persistFile = "/var/syslog-ng/syslog-ng.persist"; + + syslogngOptions = [ + "--foreground" + "--module-path=${concatStringsSep ":" (["${pkgs.syslogng}/lib/syslog-ng"] ++ cfg.extraModulePaths)}" + "--cfgfile=${syslogngConfig}" + "--control=${ctrlSocket}" + "--persist-file=${persistFile}" + "--pidfile=${pidFile}" + ]; + +in { + + options = { + + services.syslog-ng = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + Whether to enable the syslog-ng daemon. + ''; + }; + serviceName = mkOption { + type = types.str; + default = "syslog-ng"; + description = '' + The name of the systemd service that runs syslog-ng. Set this to + syslog if you want journald to automatically + forward all logs to syslog-ng. + ''; + }; + extraModulePaths = mkOption { + type = types.listOf types.str; + default = []; + example = [ "${pkgs.syslogng_incubator}/lib/syslog-ng" ]; + description = '' + A list of paths that should be included in syslog-ng's + --module-path option. They should usually + end in /lib/syslog-ng + ''; + }; + extraConfig = mkOption { + type = types.lines; + default = ""; + description = '' + Configuration added to the end of syslog-ng.conf. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + systemd.services."${cfg.serviceName}" = { + wantedBy = [ "multi-user.target" ]; + preStart = "mkdir -p /{var,run}/syslog-ng"; + serviceConfig = { + Type = "notify"; + Sockets = "syslog.socket"; + StandardOutput = "null"; + Restart = "on-failure"; + ExecStart = "${pkgs.syslogng}/sbin/syslog-ng ${concatStringsSep " " syslogngOptions}"; + }; + }; + }; + +} diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index 1ebd3c3643df4b766ffb181b7b7ae9bb7aa3bce9..c98c0511b566232483aefe4b43c7f51473c1b30f 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -22,14 +22,11 @@ let nixConf = let - # Tricky: if we're using a chroot for builds, then we need - # /bin/sh in the chroot (our own compromise to purity). - # However, since /bin/sh is a symlink to some path in the - # Nix store, which furthermore has runtime dependencies on - # other paths in the store, we need the closure of /bin/sh - # in `build-chroot-dirs' - otherwise any builder that uses - # /bin/sh won't work. - binshDeps = pkgs.writeReferencesToFile config.system.build.binsh; + # If we're using a chroot for builds, then provide /bin/sh in + # the chroot as a bind-mount to bash. This means we also need to + # include the entire closure of bash. + sh = pkgs.stdenv.shell; + binshDeps = pkgs.writeReferencesToFile sh; in pkgs.runCommand "nix.conf" {extraOptions = cfg.extraOptions; } '' extraPaths=$(for i in $(cat ${binshDeps}); do if test -d $i; then echo $i; fi; done) @@ -40,7 +37,7 @@ let build-users-group = nixbld build-max-jobs = ${toString (cfg.maxJobs)} build-use-chroot = ${if cfg.useChroot then "true" else "false"} - build-chroot-dirs = ${toString cfg.chrootDirs} $(echo $extraPaths) + build-chroot-dirs = ${toString cfg.chrootDirs} /bin/sh=${sh} $(echo $extraPaths) binary-caches = ${toString cfg.binaryCaches} trusted-binary-caches = ${toString cfg.trustedBinaryCaches} $extraOptions @@ -253,8 +250,6 @@ in config = { - nix.chrootDirs = [ "/bin" ]; - environment.etc."nix/nix.conf".source = nixConf; # List of machines for distributed Nix builds in the format diff --git a/nixos/modules/services/misc/nix-ssh-serve.nix b/nixos/modules/services/misc/nix-ssh-serve.nix index 80e7961b1f82ed770ccadc7a118c3817d6770f5d..d70bd855c7ff9fa959b48576a39911598639a9b8 100644 --- a/nixos/modules/services/misc/nix-ssh-serve.nix +++ b/nixos/modules/services/misc/nix-ssh-serve.nix @@ -1,32 +1,35 @@ { config, lib, pkgs, ... }: -let - serveOnly = pkgs.writeScript "nix-store-serve" '' - #!${pkgs.stdenv.shell} - if [ "$SSH_ORIGINAL_COMMAND" != "nix-store --serve" ]; then - echo 'Error: You are only allowed to run `nix-store --serve'\'''!' >&2 - exit 1 - fi - exec /run/current-system/sw/bin/nix-store --serve - ''; - - inherit (lib) mkIf mkOption types; -in { +with lib; + +{ options = { + nix.sshServe = { + enable = mkOption { - description = "Whether to enable serving the nix store over ssh."; - default = false; type = types.bool; + default = false; + description = "Whether to enable serving the Nix store as a binary cache via SSH."; + }; + + keys = mkOption { + type = types.listOf types.str; + default = []; + example = [ "ssh-dss AAAAB3NzaC1k... alice@example.org" ]; + description = "A list of SSH public keys allowed to access the binary cache via SSH."; }; + }; + }; config = mkIf config.nix.sshServe.enable { + users.extraUsers.nix-ssh = { - description = "User for running nix-store --serve."; + description = "Nix SSH substituter user"; uid = config.ids.uids.nix-ssh; - shell = pkgs.stdenv.shell; + useDefaultShell = true; }; services.openssh.enable = true; @@ -38,8 +41,11 @@ in { PermitTTY no PermitTunnel no X11Forwarding no - ForceCommand ${serveOnly} + ForceCommand ${config.nix.package}/bin/nix-store --serve Match All ''; + + users.extraUsers.nix-ssh.openssh.authorizedKeys.keys = config.nix.sshServe.keys; + }; } diff --git a/nixos/modules/services/monitoring/munin.nix b/nixos/modules/services/monitoring/munin.nix index 966c2eca282a5f4debb53ecc870a62d75e7b2b3f..21840bc67e8f977e30961b86aa07e0c7a161da9b 100644 --- a/nixos/modules/services/monitoring/munin.nix +++ b/nixos/modules/services/monitoring/munin.nix @@ -189,19 +189,18 @@ in wantedBy = [ "multi-user.target" ]; path = [ pkgs.munin ]; environment.MUNIN_PLUGSTATE = "/var/run/munin"; + preStart = '' + echo "updating munin plugins..." + + mkdir -p /etc/munin/plugins + rm -rf /etc/munin/plugins/* + PATH="/run/current-system/sw/bin:/run/current-system/sw/sbin" ${pkgs.munin}/sbin/munin-node-configure --shell --families contrib,auto,manual --config ${nodeConf} --libdir=${muninPlugins} --servicedir=/etc/munin/plugins 2>/dev/null | ${pkgs.bash}/bin/bash + ''; serviceConfig = { ExecStart = "${pkgs.munin}/sbin/munin-node --config ${nodeConf} --servicedir /etc/munin/plugins/"; }; }; - system.activationScripts.munin-node = '' - echo "updating munin plugins..." - - mkdir -p /etc/munin/plugins - rm -rf /etc/munin/plugins/* - PATH="/run/current-system/sw/bin:/run/current-system/sw/sbin" ${pkgs.munin}/sbin/munin-node-configure --shell --families contrib,auto,manual --config ${nodeConf} --libdir=${muninPlugins} --servicedir=/etc/munin/plugins 2>/dev/null | ${pkgs.bash}/bin/bash - ''; - }) (mkIf cronCfg.enable { services.cron.systemCronJobs = [ diff --git a/nixos/modules/services/monitoring/nagios.nix b/nixos/modules/services/monitoring/nagios.nix index 97d153153a55d050221a6530753a71edc9013f63..c1f7ba0eca74a728f1d45caefb87bf5f1af437d5 100644 --- a/nixos/modules/services/monitoring/nagios.nix +++ b/nixos/modules/services/monitoring/nagios.nix @@ -12,7 +12,7 @@ let nagiosObjectDefs = cfg.objectDefs; nagiosObjectDefsDir = pkgs.runCommand "nagios-objects" {inherit nagiosObjectDefs;} - "ensureDir $out; ln -s $nagiosObjectDefs $out/"; + "mkdir -p $out; ln -s $nagiosObjectDefs $out/"; nagiosCfgFile = pkgs.writeText "nagios.cfg" '' diff --git a/nixos/modules/services/monitoring/systemhealth.nix b/nixos/modules/services/monitoring/systemhealth.nix index b0e59595e1337256aedb6f74f9b180b9cf6284a6..20d1dadd3bf2a0f8f3d863f5a0f27a2c836f94f5 100644 --- a/nixos/modules/services/monitoring/systemhealth.nix +++ b/nixos/modules/services/monitoring/systemhealth.nix @@ -13,7 +13,7 @@ let }; buildInputs = [ python ]; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin # Make it work for kernels 3.x, not so different than 2.6 sed -i 's/2\.6/4.0/' system_health.py cp system_health.py $out/bin diff --git a/nixos/modules/services/network-filesystems/openafs-client/default.nix b/nixos/modules/services/network-filesystems/openafs-client/default.nix index 23ab39eb05f3ee8abd6c3036198b82180d6962c7..0297da9e865faf42d52b1c0670d55bdaf10b944b 100644 --- a/nixos/modules/services/network-filesystems/openafs-client/default.nix +++ b/nixos/modules/services/network-filesystems/openafs-client/default.nix @@ -11,7 +11,7 @@ let }; afsConfig = pkgs.runCommand "afsconfig" {} '' - ensureDir $out + mkdir -p $out echo ${cfg.cellName} > $out/ThisCell cp ${cellServDB} $out/CellServDB echo "/afs:${cfg.cacheDirectory}:${cfg.cacheSize}" > $out/cacheinfo diff --git a/nixos/modules/services/networking/ircd-hybrid/builder.sh b/nixos/modules/services/networking/ircd-hybrid/builder.sh index b8cb836db95e5ee455debc8146d4262a89389d9e..f2c92878a4dc43dd432b15b5147c488e9e331161 100644 --- a/nixos/modules/services/networking/ircd-hybrid/builder.sh +++ b/nixos/modules/services/networking/ircd-hybrid/builder.sh @@ -3,7 +3,7 @@ source $stdenv/setup doSub() { local src=$1 local dst=$2 - ensureDir $(dirname $dst) + mkdir -p $(dirname $dst) substituteAll $src $dst } @@ -28,4 +28,4 @@ for i in $substFiles; do fi done -ensureDir $out/bin +mkdir -p $out/bin diff --git a/nixos/modules/services/networking/ssh/lshd.nix b/nixos/modules/services/networking/ssh/lshd.nix index fca30a1fe49c13baf28ac312b6798a229c0514fe..81e523fd2a51ab394561dad1e59ce8bee75d4108 100644 --- a/nixos/modules/services/networking/ssh/lshd.nix +++ b/nixos/modules/services/networking/ssh/lshd.nix @@ -99,7 +99,6 @@ in }; subsystems = mkOption { - default = [ ["sftp" "${pkgs.lsh}/sbin/sftp-server"] ]; description = '' List of subsystem-path pairs, where the head of the pair denotes the subsystem name, and the tail denotes the path to @@ -116,6 +115,8 @@ in config = mkIf cfg.enable { + services.lshd.subsystems = [ ["sftp" "${pkgs.lsh}/sbin/sftp-server"] ]; + jobs.lshd = { description = "GNU lshd SSH2 daemon"; diff --git a/nixos/modules/services/networking/unifi.nix b/nixos/modules/services/networking/unifi.nix new file mode 100644 index 0000000000000000000000000000000000000000..634f760328f714163e7a2cb1824456d69db623e4 --- /dev/null +++ b/nixos/modules/services/networking/unifi.nix @@ -0,0 +1,88 @@ +{ config, lib, pkgs, ... }: +with lib; +let + cfg = config.services.unifi; + stateDir = "/var/lib/unifi"; + cmd = "@${pkgs.icedtea7_jre}/bin/java java -jar ${stateDir}/lib/ace.jar"; +in +{ + + options = { + + services.unifi.enable = mkOption { + type = types.uniq types.bool; + default = false; + description = '' + Whether or not to enable the unifi controller service. + ''; + }; + + }; + + config = mkIf cfg.enable { + + users.extraUsers.unifi = { + uid = config.ids.uids.unifi; + description = "UniFi controller daemon user"; + home = "${stateDir}"; + }; + + # We must create the binary directories as bind mounts instead of symlinks + # This is because the controller resolves all symlinks to absolute paths + # to be used as the working directory. + systemd.mounts = map ({ what, where }: { + bindsTo = [ "unifi.service" ]; + requiredBy = [ "unifi.service" ]; + before = [ "unifi.service" ]; + options = "bind"; + what = what; + where = where; + }) [ + { + what = "${pkgs.unifi}/dl"; + where = "${stateDir}/dl"; + } + { + what = "${pkgs.unifi}/lib"; + where = "${stateDir}/lib"; + } + { + what = "${pkgs.mongodb}/bin"; + where = "${stateDir}/bin"; + } + ]; + + systemd.services.unifi = { + description = "UniFi controller daemon"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + + preStart = '' + # Ensure privacy of state + chown unifi "${stateDir}" + chmod 0700 "${stateDir}" + + # Create the volatile webapps + mkdir -p "${stateDir}/webapps" + chown unifi "${stateDir}/webapps" + ln -s "${pkgs.unifi}/webapps/ROOT.war" "${stateDir}/webapps/ROOT.war" + ''; + + postStop = '' + rm "${stateDir}/webapps/ROOT.war" + ''; + + serviceConfig = { + Type = "simple"; + ExecStart = "${cmd} start"; + ExecStop = "${cmd} stop"; + User = "unifi"; + PermissionsStartOnly = true; + UMask = "0077"; + WorkingDirectory = "${stateDir}"; + }; + }; + + }; + +} diff --git a/nixos/modules/services/networking/znc.nix b/nixos/modules/services/networking/znc.nix index a40fd924741bff5086034ac5ef0b80cda693dd36..4d53cd0750fb79ae5831394b764524aec5369e72 100644 --- a/nixos/modules/services/networking/znc.nix +++ b/nixos/modules/services/networking/znc.nix @@ -20,6 +20,11 @@ let "; + modules = pkgs.buildEnv { + name = "znc-modules"; + paths = cfg.modulePackages; + }; + confOptions = { ... }: { options = { modules = mkOption { @@ -31,6 +36,15 @@ let ''; }; + userModules = mkOption { + type = types.listOf types.string; + default = [ ]; + example = [ "fish" "push" ]; + description = '' + A list of user modules to include in the `znc.conf` file. + ''; + }; + userName = mkOption { default = defaultUserName; example = "johntron"; @@ -63,9 +77,9 @@ let }; port = mkOption { - default = "5000"; - example = "5000"; - type = types.string; + default = 5000; + example = 5000; + type = types.int; description = '' Specifies the port on which to listen. ''; @@ -80,6 +94,13 @@ let ''; }; + extraZncConf = mkOption { + default = ""; + type = types.lines; + description = '' + Extra config to `znc.conf` file + ''; + }; }; }; @@ -104,7 +125,7 @@ let AllowWeb = true IPv4 = true IPv6 = false - Port = ${if confOpts.useSSL then "+" else ""}${confOpts.port} + Port = ${if confOpts.useSSL then "+" else ""}${toString confOpts.port} SSL = ${if confOpts.useSSL then "true" else "false"} @@ -128,9 +149,11 @@ let QuitMsg = Quit RealName = ${confOpts.nick} TimestampFormat = [%H:%M:%S] + ${concatMapStrings (n: "LoadModule = ${n}\n") confOpts.userModules} ${confOpts.passBlock} + ${confOpts.extraZncConf} ''; zncConfFile = pkgs.writeTextFile { @@ -168,9 +191,9 @@ in }; dataDir = mkOption { - default = "/home/${cfg.user}/.znc"; - example = "/home/john/.znc"; - type = types.string; + default = "/var/lib/znc/"; + example = "/home/john/.znc/"; + type = types.path; description = '' The data directory. Used for configuration files and modules. ''; @@ -179,7 +202,7 @@ in zncConf = mkOption { default = ""; example = "See: http://wiki.znc.in/Configuration"; - type = types.string; + type = types.lines; description = '' The contents of the `znc.conf` file to use when creating it. If specified, `confOptions` will be ignored, and this value, as-is, will be used. @@ -201,6 +224,15 @@ in ''; options = confOptions; }; + + modulePackages = mkOption { + type = types.listOf types.package; + default = [ ]; + example = [ pkgs.zncModules.fish pkgs.zncModules.push ]; + description = '' + A list of global znc module packages to add to znc. + ''; + }; mutable = mkOption { default = false; @@ -218,9 +250,9 @@ in }; extraFlags = mkOption { - default = ""; - example = "--debug"; - type = types.string; + default = [ ]; + example = [ "--debug" ]; + type = types.listOf types.str; description = '' Extra flags to use when executing znc command. ''; @@ -233,25 +265,22 @@ in config = mkIf cfg.enable { - systemd.services."znc-${cfg.user}" = { - description = "ZNC Server of ${cfg.user}."; + systemd.services.znc = { + description = "ZNC Server"; wantedBy = [ "multi-user.target" ]; after = [ "network.service" ]; - path = [ pkgs.znc ]; serviceConfig = { - User = "${cfg.user}"; + User = cfg.user; Restart = "always"; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; ExecStop = "${pkgs.coreutils}/bin/kill -INT $MAINPID"; }; preStart = '' - ${pkgs.coreutils}/bin/mkdir -p ${cfg.dataDir} - ${pkgs.coreutils}/bin/chown ${cfg.user} ${cfg.dataDir} -R ${pkgs.coreutils}/bin/mkdir -p ${cfg.dataDir}/configs # If mutable, regenerate conf file every time. ${optionalString (!cfg.mutable) '' - ${pkgs.coreutils}/echo "znc-${cfg.user} is set to be system-managed. Now deleting old znc.conf file to be regenerated." + ${pkgs.coreutils}/echo "znc is set to be system-managed. Now deleting old znc.conf file to be regenerated." ${pkgs.coreutils}/rm -f ${cfg.dataDir}/configs/znc.conf ''} @@ -259,7 +288,7 @@ in if [[ ! -f ${cfg.dataDir}/configs/znc.conf ]]; then ${pkgs.coreutils}/bin/echo "No znc.conf file found in ${cfg.dataDir}. Creating one now." ${if (!cfg.mutable) - then "${pkgs.coreutils}/bin/ln --force -s ${zncConfFile} ${cfg.dataDir}/configs/znc.conf" + then "${pkgs.coreutils}/bin/ln --force -s ${zncConfFile} ${cfg.dataDir}/.znc/configs/znc.conf" else '' ${pkgs.coreutils}/bin/cp --no-clobber ${zncConfFile} ${cfg.dataDir}/configs/znc.conf ${pkgs.coreutils}/bin/chmod u+rw ${cfg.dataDir}/configs/znc.conf @@ -269,10 +298,14 @@ in if [[ ! -f ${cfg.dataDir}/znc.pem ]]; then ${pkgs.coreutils}/bin/echo "No znc.pem file found in ${cfg.dataDir}. Creating one now." - ${pkgs.znc}/bin/znc --makepem + ${pkgs.znc}/bin/znc --makepem --datadir ${cfg.dataDir} fi + + # Symlink modules + rm ${cfg.dataDir}/modules || true + ln -fs ${modules}/lib/znc ${cfg.dataDir}/modules ''; - script = "${pkgs.znc}/bin/znc --foreground --datadir ${cfg.dataDir} ${cfg.extraFlags}"; + script = "${pkgs.znc}/bin/znc --foreground --datadir ${cfg.dataDir} ${toString cfg.extraFlags}"; }; users.extraUsers = optional (cfg.user == defaultUser) @@ -280,6 +313,7 @@ in description = "ZNC server daemon owner"; group = defaultUser; uid = config.ids.uids.znc; + home = cfg.dataDir; createHome = true; createUser = true; }; diff --git a/nixos/modules/services/search/elasticsearch.nix b/nixos/modules/services/search/elasticsearch.nix index eeae11dc4ff3df322adcd13eebc946e446431a71..b74ef4370d763410f51db644561cd28819474933 100644 --- a/nixos/modules/services/search/elasticsearch.nix +++ b/nixos/modules/services/search/elasticsearch.nix @@ -21,6 +21,11 @@ let ]; }; + esPlugins = pkgs.buildEnv { + name = "elasticsearch-plugins"; + paths = cfg.plugins; + }; + in { ###### interface @@ -101,6 +106,12 @@ in { example = [ "-Djava.net.preferIPv4Stack=true" ]; }; + plugins = mkOption { + description = "Extra elasticsearch plugins"; + default = []; + type = types.listOf types.package; + }; + }; ###### implementation @@ -119,6 +130,10 @@ in { preStart = '' mkdir -m 0700 -p ${cfg.dataDir} if [ "$(id -u)" = 0 ]; then chown -R elasticsearch ${cfg.dataDir}; fi + + # Install plugins + rm ${cfg.dataDir}/plugins || true + ln -s ${esPlugins}/plugins ${cfg.dataDir}/plugins ''; }; diff --git a/nixos/modules/services/security/fail2ban.nix b/nixos/modules/services/security/fail2ban.nix index af54501663797a8f868560f83490b8c07ef411e0..3758652ebddfd374c07d0d2ce8115470e886f33c 100644 --- a/nixos/modules/services/security/fail2ban.nix +++ b/nixos/modules/services/security/fail2ban.nix @@ -25,12 +25,17 @@ in options = { services.fail2ban = { + enable = mkOption { + default = false; + type = types.bool; + description = "Whether to enable the fail2ban service."; + }; daemonConfig = mkOption { default = '' [Definition] - loglevel = 3 + loglevel = INFO logtarget = SYSLOG socket = /run/fail2ban/fail2ban.sock pidfile = /run/fail2ban/fail2ban.pid @@ -80,7 +85,7 @@ in ###### implementation - config = { + config = mkIf cfg.enable { environment.systemPackages = [ pkgs.fail2ban ]; @@ -101,12 +106,13 @@ in preStart = '' mkdir -p /run/fail2ban -m 0755 + mkdir -p /var/lib/fail2ban ''; serviceConfig = { ExecStart = "${pkgs.fail2ban}/bin/fail2ban-server -f"; ReadOnlyDirectories = "/"; - ReadWriteDirectories = "/run /var/tmp"; + ReadWriteDirectories = "/run /var/tmp /var/lib"; CapabilityBoundingSet = "CAP_DAC_READ_SEARCH CAP_NET_ADMIN CAP_NET_RAW"; }; @@ -131,15 +137,14 @@ in bantime = 600 findtime = 600 maxretry = 3 - backend = auto - ''; + backend = systemd + ''; # Block SSH if there are too many failing connection attempts. services.fail2ban.jails.ssh-iptables = '' filter = sshd action = iptables[name=SSH, port=ssh, protocol=tcp] - logpath = /var/log/warn maxretry = 5 ''; diff --git a/nixos/modules/services/system/dbus.nix b/nixos/modules/services/system/dbus.nix index 8d02a6404ac150e49630d2e6646078cc7573cc1f..928f16c94489052ab29d5082b454ac8bd5c2ed42 100644 --- a/nixos/modules/services/system/dbus.nix +++ b/nixos/modules/services/system/dbus.nix @@ -14,7 +14,7 @@ let name = "dbus-conf"; preferLocalBuild = true; buildCommand = '' - ensureDir $out + mkdir -p $out cp -v ${pkgs.dbus.daemon}/etc/dbus-1/system.conf $out/system.conf diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix index 6d0416fbb1559826d3c0e2a93241ba70c8a1a7e8..78f3cf2b7e495179680e430480af813042df3ada 100644 --- a/nixos/modules/services/web-servers/apache-httpd/default.nix +++ b/nixos/modules/services/web-servers/apache-httpd/default.nix @@ -80,7 +80,7 @@ let # !!! should be in lib writeTextInDir = name: text: - pkgs.runCommand name {inherit text;} "ensureDir $out; echo -n \"$text\" > $out/$name"; + pkgs.runCommand name {inherit text;} "mkdir -p $out; echo -n \"$text\" > $out/$name"; enableSSL = any (vhost: vhost.enableSSL) allHosts; @@ -194,7 +194,7 @@ let ) null ([ cfg ] ++ subservices); documentRoot = if maybeDocumentRoot != null then maybeDocumentRoot else - pkgs.runCommand "empty" {} "ensureDir $out"; + pkgs.runCommand "empty" {} "mkdir -p $out"; documentRootConf = '' DocumentRoot "${documentRoot}" @@ -387,7 +387,7 @@ let ''; - enablePHP = any (svc: svc.enablePHP) allSubservices; + enablePHP = mainCfg.enablePHP || any (svc: svc.enablePHP) allSubservices; # Generate the PHP configuration file. Should probably be factored @@ -531,6 +531,12 @@ in ''; }; + enablePHP = mkOption { + type = types.bool; + default = false; + description = "Whether to enable the PHP module."; + }; + phpOptions = mkOption { type = types.lines; default = ""; diff --git a/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix b/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix index fa65ec0ef700aefe3e30be0d78330c501fc4e9bd..aa9aec87f0c4e0706181db9c2b55185b88bf7a07 100644 --- a/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix +++ b/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix @@ -92,7 +92,7 @@ let installPhase = '' - ensureDir $out + mkdir -p $out cp -r * $out cp ${mediawikiConfig} $out/LocalSettings.php sed -i \ @@ -106,7 +106,7 @@ let mediawikiScripts = pkgs.runCommand "mediawiki-${config.id}-scripts" { buildInputs = [ pkgs.makeWrapper ]; } '' - ensureDir $out/bin + mkdir -p $out/bin for i in changePassword.php createAndPromote.php userOptions.php edit.php nukePage.php update.php; do makeWrapper ${php}/bin/php $out/bin/mediawiki-${config.id}-$(basename $i .php) \ --add-flags ${mediawikiRoot}/maintenance/$i diff --git a/nixos/modules/services/web-servers/apache-httpd/mercurial.nix b/nixos/modules/services/web-servers/apache-httpd/mercurial.nix index 1d4303b75b35e4ec7981fe50a582dbe3fcc8a11e..6dd91be00a73f6acc29dd27b418551c23a0192c6 100644 --- a/nixos/modules/services/web-servers/apache-httpd/mercurial.nix +++ b/nixos/modules/services/web-servers/apache-httpd/mercurial.nix @@ -9,7 +9,7 @@ let cgi = pkgs.stdenv.mkDerivation { name = "mercurial-cgi"; buildCommand = '' - ensureDir $out + mkdir -p $out cp -v ${mercurial}/share/cgi-bin/hgweb.cgi $out sed -i "s|/path/to/repo/or/config|$out/hgweb.config|" $out/hgweb.cgi echo " diff --git a/nixos/modules/services/web-servers/apache-httpd/tomcat-connector.nix b/nixos/modules/services/web-servers/apache-httpd/tomcat-connector.nix index b2cd53ae55cd0d8b6c7d70aa07d8972209c91495..a883bb2b3433a4da44df0659474d680e7e121d56 100644 --- a/nixos/modules/services/web-servers/apache-httpd/tomcat-connector.nix +++ b/nixos/modules/services/web-servers/apache-httpd/tomcat-connector.nix @@ -29,6 +29,14 @@ ${extraWorkersProperties} ''; in { + + options = { + extraWorkersProperties = lib.mkOption { + default = ""; + description = "Additional configuration for the workers.properties file."; + }; + }; + extraModules = [ { name = "jk"; path = "${pkgs.tomcat_connectors}/modules/mod_jk.so"; } ]; diff --git a/nixos/modules/services/web-servers/lighttpd/cgit.nix b/nixos/modules/services/web-servers/lighttpd/cgit.nix index dbff565bd8a32bd03e0a98d7ee76e0edb9585462..d4663781fd8455e8ab771c1f309eb1b378787a36 100644 --- a/nixos/modules/services/web-servers/lighttpd/cgit.nix +++ b/nixos/modules/services/web-servers/lighttpd/cgit.nix @@ -29,7 +29,7 @@ in cache-size=1000 scan-path=/srv/git ''; - type = types.string; + type = types.lines; description = '' Verbatim contents of the cgit runtime configuration file. Documentation (with cgitrc example file) is available in "man cgitrc". Or online: diff --git a/nixos/modules/services/web-servers/lighttpd/default.nix b/nixos/modules/services/web-servers/lighttpd/default.nix index 3ba934c72bf86cc90cf99a982c3bbea9bd128a9e..fc9487ab4859ef68456f3c5bd10613d8ffe14cfd 100644 --- a/nixos/modules/services/web-servers/lighttpd/default.nix +++ b/nixos/modules/services/web-servers/lighttpd/default.nix @@ -9,9 +9,9 @@ let cfg = config.services.lighttpd; needModRedirect = cfg.gitweb.enable; - needModAlias = cfg.cgit.enable or cfg.gitweb.enable; - needModSetenv = cfg.cgit.enable or cfg.gitweb.enable; - needModCgi = cfg.cgit.enable or cfg.gitweb.enable; + needModAlias = cfg.cgit.enable || cfg.gitweb.enable; + needModSetenv = cfg.cgit.enable || cfg.gitweb.enable; + needModCgi = cfg.cgit.enable || cfg.gitweb.enable; needModStatus = cfg.mod_status; needModUserdir = cfg.mod_userdir; @@ -102,7 +102,7 @@ in document-root = mkOption { default = "/srv/www"; - type = types.str; + type = types.path; description = '' Document-root of the web server. Must be readable by the "lighttpd" user. ''; @@ -128,7 +128,7 @@ in configText = mkOption { default = ""; - type = types.string; + type = types.lines; example = ''...verbatim config file contents...''; description = '' Overridable config file contents to use for lighttpd. By default, use @@ -138,7 +138,7 @@ in extraConfig = mkOption { default = ""; - type = types.string; + type = types.lines; description = '' These configuration lines will be appended to the generated lighttpd config file. Note that this mechanism does not work when the manual diff --git a/nixos/modules/services/web-servers/lighttpd/gitweb.nix b/nixos/modules/services/web-servers/lighttpd/gitweb.nix index d49278be09a87fb50d48a591b8bf7fd8e68d45ec..c407a1d8977819216175901ff7f3e52f1c50ba5e 100644 --- a/nixos/modules/services/web-servers/lighttpd/gitweb.nix +++ b/nixos/modules/services/web-servers/lighttpd/gitweb.nix @@ -25,7 +25,7 @@ in projectroot = mkOption { default = "/srv/git"; - type = types.str; + type = types.path; description = '' Path to git projects (bare repositories) that should be served by gitweb. Must not end with a slash. @@ -34,7 +34,7 @@ in extraConfig = mkOption { default = ""; - type = types.str; + type = types.lines; description = '' Verbatim configuration text appended to the generated gitweb.conf file. ''; diff --git a/nixos/modules/services/web-servers/tomcat.nix b/nixos/modules/services/web-servers/tomcat.nix index 1de3d40165e90cf90b9820621fc4152da2ce1ea1..c2f464014ae63e24354f94b088f107f5633b3525 100644 --- a/nixos/modules/services/web-servers/tomcat.nix +++ b/nixos/modules/services/web-servers/tomcat.nix @@ -77,6 +77,11 @@ in description = "Whether to enable logging per virtual host."; }; + jdk = mkOption { + default = pkgs.jdk; + description = "Which JDK to use."; + }; + axis2 = { enable = mkOption { @@ -332,13 +337,13 @@ in ''; script = '' - ${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh ${cfg.user} -c 'CATALINA_BASE=${cfg.baseDir} JAVA_HOME=${pkgs.jdk} JAVA_OPTS="${cfg.javaOpts}" CATALINA_OPTS="${cfg.catalinaOpts}" ${tomcat}/bin/startup.sh' + ${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh ${cfg.user} -c 'CATALINA_BASE=${cfg.baseDir} JAVA_HOME=${cfg.jdk} JAVA_OPTS="${cfg.javaOpts}" CATALINA_OPTS="${cfg.catalinaOpts}" ${tomcat}/bin/startup.sh' ''; postStop = '' echo "Stopping tomcat..." - CATALINA_BASE=${cfg.baseDir} JAVA_HOME=${pkgs.jdk} ${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh ${cfg.user} -c ${tomcat}/bin/shutdown.sh + CATALINA_BASE=${cfg.baseDir} JAVA_HOME=${cfg.jdk} ${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh ${cfg.user} -c ${tomcat}/bin/shutdown.sh ''; }; diff --git a/nixos/modules/services/x11/desktop-managers/default.nix b/nixos/modules/services/x11/desktop-managers/default.nix index 991c68471a67f465f842cbc913576ae6b1bb407d..c62beca60d8480f71eafd25a472e8067e0e67733 100644 --- a/nixos/modules/services/x11/desktop-managers/default.nix +++ b/nixos/modules/services/x11/desktop-managers/default.nix @@ -17,7 +17,10 @@ in # Note: the order in which desktop manager modules are imported here # determines the default: later modules (if enabled) are preferred. # E.g., if KDE is enabled, it supersedes xterm. - imports = [ ./none.nix ./xterm.nix ./xfce.nix ./kde4.nix ./e17.nix ./e18.nix ./gnome3.nix ./xbmc.nix ]; + imports = [ + ./none.nix ./xterm.nix ./xfce.nix ./kde4.nix + ./e17.nix ./e18.nix ./gnome3.nix ./xbmc.nix + ]; options = { diff --git a/nixos/modules/services/x11/desktop-managers/e18.nix b/nixos/modules/services/x11/desktop-managers/e18.nix index e59b7f4268379ee737d00da6bdb22d9b7619fc0d..faafd21b07dda1537c9ee0277da8bebefa728621 100644 --- a/nixos/modules/services/x11/desktop-managers/e18.nix +++ b/nixos/modules/services/x11/desktop-managers/e18.nix @@ -1,11 +1,12 @@ -{ config, pkgs, ... }: +{ config, pkgs, lib, ... }: -with pkgs.lib; +with lib; let xcfg = config.services.xserver; cfg = xcfg.desktopManager.e18; + e18_enlightenment = pkgs.e18.enlightenment.override { set_freqset_setuid = true; }; in @@ -23,18 +24,20 @@ in config = mkIf (xcfg.enable && cfg.enable) { environment.systemPackages = [ - pkgs.e18.efl pkgs.e18.evas pkgs.e18.emotion pkgs.e18.elementary pkgs.e18.enlightenment + pkgs.e18.efl pkgs.e18.evas pkgs.e18.emotion pkgs.e18.elementary e18_enlightenment pkgs.e18.terminology pkgs.e18.econnman ]; services.xserver.desktopManager.session = [ { name = "E18"; start = '' - ${pkgs.e18.enlightenment}/bin/enlightenment_start + ${e18_enlightenment}/bin/enlightenment_start waitPID=$! ''; }]; + security.setuidPrograms = [ "e18_freqset" ]; + }; } diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix new file mode 100644 index 0000000000000000000000000000000000000000..9d14fc2e137c92c449cfd2ec7997a8a9b173f64f --- /dev/null +++ b/nixos/modules/services/x11/display-managers/gdm.nix @@ -0,0 +1,151 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.services.xserver.displayManager; + gdm = pkgs.gnome3_12.gdm; # gdm 3.10 not supported + gnome3 = config.environment.gnome3.packageSet; + +in + +{ + + ###### interface + + options = { + + services.xserver.displayManager.gdm = { + + enable = mkOption { + type = types.bool; + default = false; + example = true; + description = '' + Whether to enable GDM as the display manager. + GDM is very experimental and may render system unusable. + ''; + }; + + }; + + }; + + + ###### implementation + + config = mkIf cfg.gdm.enable { + + services.xserver.displayManager.slim.enable = false; + + users.extraUsers.gdm = + { name = "gdm"; + uid = config.ids.uids.gdm; + group = "gdm"; + home = "/run/gdm"; + description = "GDM user"; + }; + + users.extraGroups.gdm.gid = config.ids.gids.gdm; + + services.xserver.displayManager.job = + { + environment = { + GDM_X_SERVER = "${cfg.xserverBin} ${cfg.xserverArgs}"; + GDM_SESSIONS_DIR = "${cfg.session.desktops}"; + XDG_CONFIG_DIRS = "${gnome3.gnome_settings_daemon}/etc/xdg"; + }; + execCmd = "exec ${gdm}/sbin/gdm"; + }; + + # Because sd_login_monitor_new requires /run/systemd/machines + systemd.services.display-manager.wants = [ "systemd-machined.service" ]; + systemd.services.display-manager.after = [ "systemd-machined.service" ]; + + systemd.services.display-manager.path = [ gnome3.gnome_shell gnome3.caribou ]; + + services.dbus.packages = [ gdm ]; + + programs.dconf.profiles.gdm = "${gdm}/share/dconf/profile/gdm"; + + # GDM LFS PAM modules, adapted somehow to NixOS + security.pam.services = { + gdm-launch-environment.text = '' + auth required pam_succeed_if.so audit quiet_success user = gdm + auth optional pam_permit.so + + account required pam_succeed_if.so audit quiet_success user = gdm + account sufficient pam_unix.so + + password required pam_deny.so + + session required pam_succeed_if.so audit quiet_success user = gdm + session required pam_env.so envfile=${config.system.build.pamEnvironment} + session optional ${pkgs.systemd}/lib/security/pam_systemd.so + session optional pam_keyinit.so force revoke + session optional pam_permit.so + ''; + + gdm.text = '' + auth requisite pam_nologin.so + auth required pam_env.so + + auth required pam_succeed_if.so uid >= 1000 quiet + auth optional ${gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so + auth sufficient pam_unix.so nullok likeauth + auth required pam_deny.so + + account sufficient pam_unix.so + + password requisite pam_unix.so nullok sha512 + + session required pam_env.so envfile=${config.system.build.pamEnvironment} + session required pam_unix.so + session required pam_loginuid.so + session optional ${pkgs.systemd}/lib/security/pam_systemd.so + session optional ${gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so auto_start + ''; + + gdm-password.text = '' + auth requisite pam_nologin.so + auth required pam_env.so envfile=${config.system.build.pamEnvironment} + + auth required pam_succeed_if.so uid >= 1000 quiet + auth optional ${gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so + auth sufficient pam_unix.so nullok likeauth + auth required pam_deny.so + + account sufficient pam_unix.so + + password requisite pam_unix.so nullok sha512 + + session required pam_env.so envfile=${config.system.build.pamEnvironment} + session required pam_unix.so + session required pam_loginuid.so + session optional ${pkgs.systemd}/lib/security/pam_systemd.so + session optional ${gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so auto_start + ''; + + gdm-autologin.text = '' + auth requisite pam_nologin.so + + auth required pam_succeed_if.so uid >= 1000 quiet + auth required pam_permit.so + + account sufficient pam_unix.so + + password requisite pam_unix.so nullok sha512 + + session optional pam_keyinit.so revoke + session required pam_env.so envfile=${config.system.build.pamEnvironment} + session required pam_unix.so + session required pam_loginuid.so + session optional ${pkgs.systemd}/lib/security/pam_systemd.so + ''; + + }; + + }; + +} diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix index d459c59b0483c0ad668a2054fa81b7e00c256fba..f8ce06738fee8a8c27e27a2313c984aa1973a3eb 100644 --- a/nixos/modules/services/x11/display-managers/lightdm.nix +++ b/nixos/modules/services/x11/display-managers/lightdm.nix @@ -26,7 +26,7 @@ let buildInputs = [ pkgs.makeWrapper ]; buildCommand = '' - ensureDir $out/gtk-3.0/ + mkdir -p $out/gtk-3.0/ # This wrapper ensures that we actually get fonts makeWrapper ${pkgs.lightdm_gtk_greeter}/sbin/lightdm-gtk-greeter \ diff --git a/nixos/modules/services/x11/display-managers/slim.nix b/nixos/modules/services/x11/display-managers/slim.nix index 48feb12d044c1e9692bfd5b12877d23250eb4213..9ee4e0dc7cb0616ad0f9cb499186d655545c4de5 100644 --- a/nixos/modules/services/x11/display-managers/slim.nix +++ b/nixos/modules/services/x11/display-managers/slim.nix @@ -27,7 +27,7 @@ let unpackedTheme = pkgs.stdenv.mkDerivation { name = "slim-theme"; buildCommand = '' - ensureDir $out + mkdir -p $out cd $out unpackFile ${cfg.theme} ln -s * default diff --git a/nixos/modules/services/x11/hardware/synaptics.nix b/nixos/modules/services/x11/hardware/synaptics.nix index f2227a34a20c050b0013f1dedff2f4c55457c2bb..f5b394b6d98b2b5cb4e69cfd6630065e268135ca 100644 --- a/nixos/modules/services/x11/hardware/synaptics.nix +++ b/nixos/modules/services/x11/hardware/synaptics.nix @@ -41,16 +41,19 @@ in { }; accelFactor = mkOption { + type = types.nullOr types.string; default = "0.001"; description = "Cursor acceleration (how fast speed increases from minSpeed to maxSpeed)."; }; minSpeed = mkOption { + type = types.nullOr types.string; default = "0.6"; description = "Cursor speed factor for precision finger motion."; }; maxSpeed = mkOption { + type = types.nullOr types.string; default = "1.0"; description = "Cursor speed factor for highest-speed finger motion."; }; @@ -120,9 +123,9 @@ in { MatchIsTouchpad "on" ${optionalString (cfg.dev != null) ''MatchDevicePath "${cfg.dev}"''} Driver "synaptics" - Option "MinSpeed" "${cfg.minSpeed}" - Option "MaxSpeed" "${cfg.maxSpeed}" - Option "AccelFactor" "${cfg.accelFactor}" + ${optionalString (cfg.minSpeed != null) ''Option "MinSpeed" "${cfg.minSpeed}"''} + ${optionalString (cfg.maxSpeed != null) ''Option "MaxSpeed" "${cfg.maxSpeed}"''} + ${optionalString (cfg.accelFactor != null) ''Option "AccelFactor" "${cfg.accelFactor}"''} ${optionalString cfg.tapButtons tapConfig} Option "ClickFinger1" "${builtins.elemAt cfg.buttonsMap 0}" Option "ClickFinger2" "${builtins.elemAt cfg.buttonsMap 1}" diff --git a/nixos/modules/services/x11/window-managers/bspwm.nix b/nixos/modules/services/x11/window-managers/bspwm.nix new file mode 100644 index 0000000000000000000000000000000000000000..d234a432e9a9f61f14b94f40a467a2311f4ff2cc --- /dev/null +++ b/nixos/modules/services/x11/window-managers/bspwm.nix @@ -0,0 +1,29 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.xserver.windowManager.bspwm; +in + +{ + options = { + services.xserver.windowManager.bspwm.enable = mkOption { + type = types.bool; + default = false; + example = true; + description = "Enable the bspwm window manager."; + }; + }; + + config = mkIf cfg.enable { + services.xserver.windowManager.session = singleton { + name = "bspwm"; + start = " + ${pkgs.sxhkd}/bin/sxhkd & + ${pkgs.bspwm}/bin/bspwm + "; + }; + environment.systemPackages = [ pkgs.bspwm ]; + }; +} diff --git a/nixos/modules/services/x11/window-managers/default.nix b/nixos/modules/services/x11/window-managers/default.nix index f27ba366141317936035d95a46145d58329003bc..45a4e947e0aaba6d1d94b51e36b3992ab4646236 100644 --- a/nixos/modules/services/x11/window-managers/default.nix +++ b/nixos/modules/services/x11/window-managers/default.nix @@ -17,6 +17,7 @@ in ./xmonad.nix ./i3.nix ./herbstluftwm.nix + ./bspwm.nix ]; options = { diff --git a/nixos/modules/system/boot/emergency-mode.nix b/nixos/modules/system/boot/emergency-mode.nix new file mode 100644 index 0000000000000000000000000000000000000000..9cdab84161925f033c2cfacce6e84b05ffdc9c81 --- /dev/null +++ b/nixos/modules/system/boot/emergency-mode.nix @@ -0,0 +1,37 @@ +{ config, lib, ... }: + +with lib; + +{ + + ###### interface + + options = { + + systemd.enableEmergencyMode = mkOption { + default = true; + type = types.bool; + description = '' + Whether to enable emergency mode, which is an + sulogin shell started on the console if + mounting a filesystem fails. Since some machines (like EC2 + instances) have no console of any kind, emergency mode doesn't + make sense, and it's better to continue with the boot insofar + as possible. + ''; + }; + + }; + + ###### implementation + + config = { + + systemd.additionalUpstreamSystemUnits = optionals + config.systemd.enableEmergencyMode [ + "emergency.target" "emergency.service" + ]; + + }; + +} \ No newline at end of file diff --git a/nixos/modules/system/boot/modprobe.nix b/nixos/modules/system/boot/modprobe.nix index 7b214cd1e1f54faeae1106e91a72de9cce363315..652eb046f50a785756292389f535a37258ae254e 100644 --- a/nixos/modules/system/boot/modprobe.nix +++ b/nixos/modules/system/boot/modprobe.nix @@ -68,20 +68,15 @@ with lib; config = mkIf (!config.boot.isContainer) { - environment.etc = [ - { source = "${pkgs.kmod-blacklist-ubuntu}/modprobe.conf"; - target = "modprobe.d/ubuntu.conf"; - } - { source = pkgs.writeText "modprobe.conf" - '' - ${flip concatMapStrings config.boot.blacklistedKernelModules (name: '' - blacklist ${name} - '')} - ${config.boot.extraModprobeConfig} - ''; - target = "modprobe.d/nixos.conf"; - } - ]; + environment.etc."modprobe.d/ubuntu.conf".source = "${pkgs.kmod-blacklist-ubuntu}/modprobe.conf"; + + environment.etc."modprobe.d/nixos.conf".text = + '' + ${flip concatMapStrings config.boot.blacklistedKernelModules (name: '' + blacklist ${name} + '')} + ${config.boot.extraModprobeConfig} + ''; environment.systemPackages = [ config.system.sbin.modprobe pkgs.kmod ]; diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh index 7adb932aba7f5cc597691c279213b06262f210b8..73fc6ce543cf2d7ec78c4abf7cdc099267fd0b62 100644 --- a/nixos/modules/system/boot/stage-1-init.sh +++ b/nixos/modules/system/boot/stage-1-init.sh @@ -4,7 +4,8 @@ targetRoot=/mnt-root console=tty1 export LD_LIBRARY_PATH=@extraUtils@/lib -export PATH=@extraUtils@/bin:@extraUtils@/sbin +export PATH=@extraUtils@/bin +ln -s @extraUtils@/bin /bin fail() { @@ -193,6 +194,9 @@ checkFS() { # Don't check ROM filesystems. if [ "$fsType" = iso9660 -o "$fsType" = udf ]; then return 0; fi + # Don't check resilient COWs as they validate the fs structures at mount time + if [ "$fsType" = btrfs -o "$fsType" = zfs ]; then return 0; fi + # If we couldn't figure out the FS type, then skip fsck. if [ "$fsType" = auto ]; then echo 'cannot check filesystem with type "auto"!' @@ -262,6 +266,13 @@ mountFS() { checkFS "$device" "$fsType" + # Create backing directories for unionfs-fuse. + if [ "$fsType" = unionfs-fuse ]; then + for i in $(IFS=:; echo ${options##*,dirs=}); do + mkdir -m 0700 -p /mnt-root"${i%=*}" + done + fi + echo "mounting $device on $mountPoint..." mkdir -p "/mnt-root$mountPoint" || true diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index b6249b6c0915827398561795c7f1e73366fe125b..6a069c5d0540f730010ff366ed7c1c2383496b88 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -23,22 +23,6 @@ let }; - needsCifsUtils = kernelPackages.kernel ? features - && kernelPackages.kernel.features ? needsCifsUtils - && kernelPackages.kernel.features.needsCifsUtils - && any (fs: fs.fsType == "cifs") fileSystems; - - busybox = - if needsCifsUtils - then pkgs.busybox.override { - extraConfig = '' - CONFIG_FEATURE_MOUNT_CIFS n - CONFIG_FEATURE_MOUNT_HELPERS y - ''; - } - else pkgs.busybox; - - # Some additional utilities needed in stage 1, like mount, lvm, fsck # etc. We don't want to bring in all of those packages, so we just # copy what we need. Instead of using statically linked binaries, @@ -51,6 +35,7 @@ let } '' mkdir -p $out/bin $out/lib + ln -s $out/bin $out/sbin # Copy what we need from Glibc. cp -pv ${pkgs.glibc}/lib/ld*.so.? $out/lib @@ -62,11 +47,10 @@ let cp -pv ${pkgs.gcc.gcc}/lib*/libgcc_s.so.* $out/lib # Copy BusyBox. - cp -rvd ${busybox}/{bin,sbin} $out/ - chmod -R u+w $out + cp -pvd ${pkgs.busybox}/bin/* ${pkgs.busybox}/sbin/* $out/bin/ # Copy some utillinux stuff. - cp -v ${pkgs.utillinux}/sbin/blkid $out/bin + cp -vf ${pkgs.utillinux}/sbin/blkid $out/bin cp -pdv ${pkgs.utillinux}/lib/libblkid*.so.* $out/lib cp -pdv ${pkgs.utillinux}/lib/libuuid*.so.* $out/lib @@ -89,12 +73,7 @@ let # Copy modprobe. cp -v ${pkgs.kmod}/bin/kmod $out/bin/ - ln -s kmod $out/bin/modprobe - - # Maybe copy cifs utils - ${optionalString needsCifsUtils '' - cp -v ${pkgs.cifs_utils}/sbin/mount.cifs $out/bin - ''} + ln -sf kmod $out/bin/modprobe ${config.boot.initrd.extraUtilsCommands} @@ -140,7 +119,7 @@ let udevRules = pkgs.stdenv.mkDerivation { name = "udev-rules"; buildCommand = '' - ensureDir $out + mkdir -p $out echo 'ENV{LD_LIBRARY_PATH}="${extraUtils}/lib"' > $out/00-env.rules @@ -313,6 +292,13 @@ in example = "xz"; }; + boot.initrd.supportedFilesystems = mkOption { + default = [ ]; + example = [ "btrfs" ]; + type = types.listOf types.string; + description = "Names of supported filesystem types in the initial ramdisk."; + }; + fileSystems = mkOption { options.neededForBoot = mkOption { default = false; @@ -347,5 +333,7 @@ in # Prevent systemd from waiting for the /dev/root symlink. systemd.units."dev-root.device".text = ""; + boot.initrd.supportedFilesystems = map (fs: fs.fsType) fileSystems; + }; } diff --git a/nixos/modules/system/boot/stage-2-init.sh b/nixos/modules/system/boot/stage-2-init.sh index eff2fb583babbfe2692e22608d53daf9d5f71917..fcefdfa88a36746e8847489f4c3e1a983e59f45d 100644 --- a/nixos/modules/system/boot/stage-2-init.sh +++ b/nixos/modules/system/boot/stage-2-init.sh @@ -29,7 +29,7 @@ setPath "@path@" # Normally, stage 1 mounts the root filesystem read/writable. # However, in some environments, stage 2 is executed directly, and the # root is read-only. So make it writable here. -mount -n -o remount,rw / +mount -n -o remount,rw none / # Likewise, stage 1 mounts /proc, /dev and /sys, so if we don't have a @@ -98,12 +98,6 @@ mkdir -m 0755 -p /etc/nixos rm -rf /var/run /var/lock rm -f /etc/{group,passwd,shadow}.lock -if test -n "@cleanTmpDir@"; then - echo -n "cleaning \`/tmp'..." - find /tmp -maxdepth 1 -mindepth 1 -print0 | xargs -0r rm -rf --one-file-system - echo " done" -fi - # Also get rid of temporary GC roots. rm -rf /nix/var/nix/gcroots/tmp /nix/var/nix/temproots @@ -186,4 +180,4 @@ echo "starting systemd..." PATH=/run/current-system/systemd/lib/systemd \ MODULE_DIR=/run/booted-system/kernel-modules/lib/modules \ LOCALE_ARCHIVE=/run/current-system/sw/lib/locale/locale-archive \ - exec systemd --log-target=journal # --log-level=debug --log-target=console --crash-shell + exec systemd diff --git a/nixos/modules/system/boot/stage-2.nix b/nixos/modules/system/boot/stage-2.nix index f53c3b8b8e70fa463d9f76aeb5c8bf1919bcce47..6155bb37cc5214fad05267d0c6739402d450c1f5 100644 --- a/nixos/modules/system/boot/stage-2.nix +++ b/nixos/modules/system/boot/stage-2.nix @@ -17,7 +17,7 @@ let src = ./stage-2-init.sh; shellDebug = "${pkgs.bashInteractive}/bin/bash"; isExecutable = true; - inherit (config.boot) devShmSize runSize cleanTmpDir; + inherit (config.boot) devShmSize runSize; inherit (config.nix) readOnlyStore; inherit (config.networking) useHostResolvConf; ttyGid = config.ids.gids.tty; @@ -26,8 +26,7 @@ let pkgs.utillinux pkgs.sysvtools pkgs.openresolv - ] ++ (optional config.boot.cleanTmpDir pkgs.findutils) - ++ optional config.nix.readOnlyStore readonlyMountpoint; + ] ++ optional config.nix.readOnlyStore readonlyMountpoint; postBootCommands = pkgs.writeText "local-cmds" '' ${config.boot.postBootCommands} @@ -81,15 +80,6 @@ in ''; }; - # FIXME: should replace this with something that uses systemd-tmpfiles. - cleanTmpDir = mkOption { - type = types.bool; - default = false; - description = '' - Whether to delete all files in /tmp during boot. - ''; - }; - }; }; diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index 14caa5d360d594fb49cae0826eaade63534d01ad..455c40693b0059e6412f2c701973e12b490acc08 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -162,10 +162,7 @@ let "systemd-sysctl.service" ] - ++ optionals cfg.enableEmergencyMode [ - "emergency.target" - "emergency.service" - ]; + ++ cfg.additionalUpstreamSystemUnits; upstreamSystemWants = [ #"basic.target.wants" @@ -317,7 +314,9 @@ let '' [Service] ${let env = cfg.globalEnvironment // def.environment; - in concatMapStrings (n: "Environment=\"${n}=${getAttr n env}\"\n") (attrNames env)} + in concatMapStrings (n: + let s = "Environment=\"${n}=${getAttr n env}\"\n"; + in if stringLength s >= 2048 then throw "The value of the environment variable ‘${n}’ in systemd service ‘${name}.service’ is too long." else s) (attrNames env)} ${if def.reloadIfChanged then '' X-ReloadIfChanged=true '' else if !def.restartIfChanged then '' @@ -635,19 +634,6 @@ in ''; }; - systemd.enableEmergencyMode = mkOption { - default = true; - type = types.bool; - description = '' - Whether to enable emergency mode, which is an - sulogin shell started on the console if - mounting a filesystem fails. Since some machines (like EC2 - instances) have no console of any kind, emergency mode doesn't - make sense, and it's better to continue with the boot insofar - as possible. - ''; - }; - systemd.tmpfiles.rules = mkOption { type = types.listOf types.str; default = []; @@ -690,6 +676,15 @@ in description = "Definition of systemd per-user socket units."; }; + systemd.additionalUpstreamSystemUnits = mkOption { + default = [ ]; + type = types.listOf types.str; + example = [ "debug-shell.service" "systemd-quotacheck.service" ]; + description = '' + Additional units shipped with systemd that shall be enabled. + ''; + }; + }; diff --git a/nixos/modules/system/boot/tmp.nix b/nixos/modules/system/boot/tmp.nix new file mode 100644 index 0000000000000000000000000000000000000000..5bf5e2eb2ec583beaae887752599b5670bfe040a --- /dev/null +++ b/nixos/modules/system/boot/tmp.nix @@ -0,0 +1,39 @@ +{ config, lib, ... }: + +with lib; + +{ + + ###### interface + + options = { + + boot.cleanTmpDir = mkOption { + type = types.bool; + default = false; + description = '' + Whether to delete all files in /tmp during boot. + ''; + }; + + boot.tmpOnTmpfs = mkOption { + type = types.bool; + default = false; + description = '' + Whether to mount a tmpfs on /tmp during boot. + ''; + }; + + }; + + ###### implementation + + config = { + + systemd.additionalUpstreamSystemUnits = optional config.boot.tmpOnTmpfs "tmp.mount"; + + systemd.tmpfiles.rules = optional config.boot.cleanTmpDir "D! /tmp 1777 root root"; + + }; + +} \ No newline at end of file diff --git a/nixos/modules/system/etc/etc.nix b/nixos/modules/system/etc/etc.nix index 22d55a9e246c705c1eaa5fda1ff25b7851f4af26..b57b03bcf962e48cd56d64f0ebdfd593aa90f5aa 100644 --- a/nixos/modules/system/etc/etc.nix +++ b/nixos/modules/system/etc/etc.nix @@ -132,7 +132,7 @@ in '' # Set up the statically computed bits of /etc. echo "setting up /etc..." - ${pkgs.perl}/bin/perl ${./setup-etc.pl} ${etc}/etc + ${pkgs.perl}/bin/perl -I${pkgs.perlPackages.FileSlurp}/lib/perl5/site_perl ${./setup-etc.pl} ${etc}/etc ''; }; diff --git a/nixos/modules/system/etc/setup-etc.pl b/nixos/modules/system/etc/setup-etc.pl index 8ba9a370b27ab9679c92a5849cdc0a458c1b5bbf..d7e15eccefcdf8938697bb3710f67c4f254f9f23 100644 --- a/nixos/modules/system/etc/setup-etc.pl +++ b/nixos/modules/system/etc/setup-etc.pl @@ -3,6 +3,7 @@ use File::Find; use File::Copy; use File::Path; use File::Basename; +use File::Slurp; my $etc = $ARGV[0] or die; my $static = "/etc/static"; @@ -46,35 +47,55 @@ sub cleanup { find(\&cleanup, "/etc"); +# Use /etc/.clean to keep track of copied files. +my @oldCopied = read_file("/etc/.clean", chomp => 1, err_mode => 'quiet'); +open CLEAN, ">>/etc/.clean"; + + # For every file in the etc tree, create a corresponding symlink in # /etc to /etc/static. The indirection through /etc/static is to make # switching to a new configuration somewhat more atomic. +my %created; +my @copied; + sub link { my $fn = substr $File::Find::name, length($etc) + 1 or next; my $target = "/etc/$fn"; File::Path::make_path(dirname $target); + $created{$fn} = 1; if (-e "$_.mode") { - open MODE, "<$_.mode"; - my $mode = ; chomp $mode; - close MODE; + my $mode = read_file("$_.mode"); chomp $mode; if ($mode eq "direct-symlink") { atomicSymlink readlink("$static/$fn"), $target or warn; } else { - open UID, "<$_.uid"; - my $uid = ; chomp $uid; - close UID; - open GID, "<$_.gid"; - my $gid = ; chomp $gid; - close GID; - + my $uid = read_file("$_.uid"); chomp $uid; + my $gid = read_file("$_.gid"); chomp $gid; copy "$static/$fn", "$target.tmp" or warn; chown int($uid), int($gid), "$target.tmp" or warn; chmod oct($mode), "$target.tmp" or warn; rename "$target.tmp", $target or warn; } + push @copied, $fn; + print CLEAN "$fn\n"; } elsif (-l "$_") { atomicSymlink "$static/$fn", $target or warn; } } find(\&link, $etc); + + +# Delete files that were copied in a previous version but not in the +# current. +foreach my $fn (@oldCopied) { + if (!defined $created{$fn}) { + $fn = "/etc/$fn"; + print STDERR "removing obsolete file ‘$fn’...\n"; + unlink "$fn"; + } +} + + +# Rewrite /etc/.clean. +close CLEAN; +write_file("/etc/.clean", map { "$_\n" } @copied); diff --git a/nixos/modules/tasks/filesystems.nix b/nixos/modules/tasks/filesystems.nix index d350bc1b5d0ed24c18577a8285531432872d857b..64a20034f3cc6b764c344c798757877a6f1a3fc9 100644 --- a/nixos/modules/tasks/filesystems.nix +++ b/nixos/modules/tasks/filesystems.nix @@ -9,7 +9,7 @@ let prioOption = prio: optionalString (prio !=null) " pri=${toString prio}"; - fileSystemOpts = { name, ... }: { + fileSystemOpts = { name, config, ... }: { options = { @@ -68,6 +68,7 @@ let config = { mountPoint = mkDefault name; + device = mkIf (config.fsType == "tmpfs") (mkDefault config.fsType); }; }; @@ -124,13 +125,6 @@ in description = "Names of supported filesystem types."; }; - boot.initrd.supportedFilesystems = mkOption { - default = [ ]; - example = [ "btrfs" ]; - type = types.listOf types.string; - description = "Names of supported filesystem types in the initial ramdisk."; - }; - }; @@ -140,15 +134,11 @@ in boot.supportedFilesystems = map (fs: fs.fsType) fileSystems; - boot.initrd.supportedFilesystems = - map (fs: fs.fsType) - (filter (fs: fs.mountPoint == "/" || fs.neededForBoot) fileSystems); - # Add the mount helpers to the system path so that `mount' can find them. system.fsPackages = [ pkgs.dosfstools ]; environment.systemPackages = - [ pkgs.ntfs3g pkgs.cifs_utils pkgs.fuse ] + [ pkgs.ntfs3g pkgs.fuse ] ++ config.system.fsPackages; environment.etc.fstab.text = @@ -157,7 +147,9 @@ in # Filesystems. ${flip concatMapStrings fileSystems (fs: - (if fs.device != null then fs.device else "/dev/disk/by-label/${fs.label}") + (if fs.device != null then fs.device + else if fs.label != null then "/dev/disk/by-label/${fs.label}" + else throw "No device specified for mount point ‘${fs.mountPoint}’.") + " " + fs.mountPoint + " " + fs.fsType + " " + fs.options diff --git a/nixos/modules/tasks/filesystems/cifs.nix b/nixos/modules/tasks/filesystems/cifs.nix new file mode 100644 index 0000000000000000000000000000000000000000..c60f175db841ab650aef76380dda477acc004ef7 --- /dev/null +++ b/nixos/modules/tasks/filesystems/cifs.nix @@ -0,0 +1,25 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + inInitrd = any (fs: fs == "cifs") config.boot.initrd.supportedFilesystems; + +in + +{ + config = { + + system.fsPackages = [ pkgs.cifs_utils ]; + + boot.initrd.availableKernelModules = mkIf inInitrd + [ "cifs" "nls_utf8" "hmac" "md4" "ecb" "des_generic" "sha256" ]; + + boot.initrd.extraUtilsCommands = mkIf inInitrd + '' + cp -v ${pkgs.cifs_utils}/sbin/mount.cifs $out/bin + ''; + + }; +} diff --git a/nixos/modules/tasks/filesystems/unionfs-fuse.nix b/nixos/modules/tasks/filesystems/unionfs-fuse.nix index 5b7777180568f786a0dd8150ca396783de0b2eca..fe195e0db0b64dc09c40c0c8aef755e554374dbb 100644 --- a/nixos/modules/tasks/filesystems/unionfs-fuse.nix +++ b/nixos/modules/tasks/filesystems/unionfs-fuse.nix @@ -2,14 +2,21 @@ { config = lib.mkMerge [ + (lib.mkIf (lib.any (fs: fs == "unionfs-fuse") config.boot.initrd.supportedFilesystems) { boot.initrd.kernelModules = [ "fuse" ]; - + boot.initrd.extraUtilsCommands = '' cp -v ${pkgs.fuse}/lib/libfuse* $out/lib + cp -v ${pkgs.fuse}/sbin/mount.fuse $out/bin cp -v ${pkgs.unionfs-fuse}/bin/unionfs $out/bin + substitute ${pkgs.unionfs-fuse}/sbin/mount.unionfs-fuse $out/bin/mount.unionfs-fuse \ + --replace '${pkgs.bash}/bin/bash' /bin/sh \ + --replace '${pkgs.fuse}/sbin' /bin \ + --replace '${pkgs.unionfs-fuse}/bin' /bin + chmod +x $out/bin/mount.unionfs-fuse ''; - + boot.initrd.postDeviceCommands = '' # Hacky!!! fuse hard-codes the path to mount mkdir -p /nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-${pkgs.utillinux.name}/bin @@ -17,8 +24,10 @@ ln -s $(which umount) /nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-${pkgs.utillinux.name}/bin ''; }) + (lib.mkIf (lib.any (fs: fs == "unionfs-fuse") config.boot.supportedFilesystems) { system.fsPackages = [ pkgs.unionfs-fuse ]; }) + ]; } diff --git a/nixos/modules/tasks/trackpoint.nix b/nixos/modules/tasks/trackpoint.nix index 4be2c3eb4c4794d2d87f6e0fd4699ec823b6183a..d1c6f8ac15657bc0b1f5018559a7c4222270d773 100644 --- a/nixos/modules/tasks/trackpoint.nix +++ b/nixos/modules/tasks/trackpoint.nix @@ -46,21 +46,15 @@ with lib; config = mkIf config.hardware.trackpoint.enable { - jobs.trackpoint = - { description = "Initialize trackpoint"; - - startOn = "started udev"; - - task = true; - - script = '' - echo -n ${toString config.hardware.trackpoint.sensitivity} \ - > /sys/devices/platform/i8042/serio1/sensitivity - echo -n ${toString config.hardware.trackpoint.speed} \ - > /sys/devices/platform/i8042/serio1/speed - ''; - }; - + services.udev.extraRules = + '' + ACTION=="add|change", SUBSYSTEM=="input", ATTR{name}=="TPPS/2 IBM TrackPoint", ATTR{device/speed}="${toString config.hardware.trackpoint.speed}", ATTR{device/sensitivity}="${toString config.hardware.trackpoint.sensitivity}" + ''; + + system.activationScripts.trackpoint = + '' + ${config.systemd.package}/bin/udevadm trigger --attr-match=name="TPPS/2 IBM TrackPoint" + ''; }; } diff --git a/nixos/modules/tasks/tty-backgrounds-combine.sh b/nixos/modules/tasks/tty-backgrounds-combine.sh index 1e0d8758a6ee3d2cef72ebbcc1cb0e80ed594129..55c3a1ebfa8abb3cde12a8f9a676dab82a81d7c1 100644 --- a/nixos/modules/tasks/tty-backgrounds-combine.sh +++ b/nixos/modules/tasks/tty-backgrounds-combine.sh @@ -3,7 +3,7 @@ source $stdenv/setup ttys=($ttys) themes=($themes) -ensureDir $out +mkdir -p $out defaultName=$(cd $default && ls | grep -v default) echo $defaultName diff --git a/nixos/modules/testing/test-instrumentation.nix b/nixos/modules/testing/test-instrumentation.nix index 9100a433cd63269f6e1fe8d5f9fbe5f576026a4b..54a376c9560eee6618026bd0b2701a9bf904ebc0 100644 --- a/nixos/modules/testing/test-instrumentation.nix +++ b/nixos/modules/testing/test-instrumentation.nix @@ -66,13 +66,22 @@ let kernel = config.boot.kernelPackages.kernel; in # Panic if an error occurs in stage 1 (rather than waiting for # user intervention). boot.kernelParams = - [ "console=tty1" "console=ttyS0" "panic=1" "boot.panic_on_fail" ]; + [ "console=ttyS0" "panic=1" "boot.panic_on_fail" ]; # `xwininfo' is used by the test driver to query open windows. environment.systemPackages = [ pkgs.xorg.xwininfo ]; # Log everything to the serial console. - services.journald.console = "/dev/console"; + services.journald.extraConfig = + '' + ForwardToConsole=yes + MaxLevelConsole=debug + ''; + + # Don't clobber the console with duplicate systemd messages. + systemd.extraConfig = "ShowStatus=no"; + + boot.consoleLogLevel = 7; # Prevent tests from accessing the Internet. networking.defaultGateway = mkOverride 150 ""; @@ -88,6 +97,9 @@ let kernel = config.boot.kernelPackages.kernel; in networking.usePredictableInterfaceNames = false; + # Make it easy to log in as root when running the test interactively. + security.initialRootPassword = mkDefault ""; + }; } diff --git a/nixos/modules/virtualisation/amazon-image.nix b/nixos/modules/virtualisation/amazon-image.nix index 7d6109f212acf14be61e3db7971bf36be3d0f6cc..e129e496fe36973e5d109785fd0aa6a8e6a44a9b 100644 --- a/nixos/modules/virtualisation/amazon-image.nix +++ b/nixos/modules/virtualisation/amazon-image.nix @@ -172,7 +172,7 @@ in boot.initrd.extraUtilsCommands = '' # We need swapon in the initrd. - cp ${pkgs.utillinux}/sbin/swapon $out/bin + cp --remove-destination ${pkgs.utillinux}/sbin/swapon $out/bin ''; # Don't put old configurations in the GRUB menu. The user has no diff --git a/nixos/modules/virtualisation/docker.nix b/nixos/modules/virtualisation/docker.nix new file mode 100644 index 0000000000000000000000000000000000000000..a0aa613532698004fe3b97bf3078d1aee8c5a32c --- /dev/null +++ b/nixos/modules/virtualisation/docker.nix @@ -0,0 +1,109 @@ +# Systemd services for docker. + +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.virtualisation.docker; + +in + +{ + ###### interface + + options.virtualisation.docker = { + enable = + mkOption { + type = types.bool; + default = false; + description = + '' + This option enables docker, a daemon that manages + linux containers. Users in the "docker" group can interact with + the daemon (e.g. to start or stop containers) using the + docker command line tool. + ''; + }; + socketActivation = + mkOption { + type = types.bool; + default = false; + description = + '' + This option enables docker with socket activation. I.e. docker will + start when first called by client. + + Note: This is false by default because systemd lower than 214 that + nixos uses so far, doesn't support SocketGroup option, so socket + created by docker has root group now. This will likely be changed + in future. So set this option explicitly to false if you wish. + ''; + }; + extraOptions = + mkOption { + type = types.str; + default = ""; + description = + '' + The extra command-line options to pass to + docker daemon. + ''; + }; + + + }; + + ###### implementation + + config = mkIf cfg.enable (mkMerge [ + { environment.systemPackages = [ pkgs.docker ]; + } + (mkIf cfg.socketActivation { + + systemd.services.docker = { + description = "Docker Application Container Engine"; + after = [ "network.target" "docker.socket" ]; + requires = [ "docker.socket" ]; + serviceConfig = { + ExecStart = "${pkgs.docker}/bin/docker --daemon=true --host=fd:// --group=docker ${cfg.extraOptions}"; + # I'm not sure if that limits aren't too high, but it's what + # goes in config bundled with docker itself + LimitNOFILE = 1048576; + LimitNPROC = 1048576; + }; + }; + + systemd.sockets.docker = { + description = "Docker Socket for the API"; + wantedBy = [ "sockets.target" ]; + socketConfig = { + ListenStream = "/var/run/docker.sock"; + SocketMode = "0660"; + SocketUser = "root"; + SocketGroup = "docker"; + }; + }; + }) + (mkIf (!cfg.socketActivation) { + + systemd.services.docker = { + description = "Docker Application Container Engine"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + serviceConfig = { + ExecStart = "${pkgs.docker}/bin/docker --daemon=true --group=docker ${cfg.extraOptions}"; + # I'm not sure if that limits aren't too high, but it's what + # goes in config bundled with docker itself + LimitNOFILE = 1048576; + LimitNPROC = 1048576; + }; + + # Presumably some containers are running we don't want to interrupt + restartIfChanged = false; + }; + }) + ]); + +} diff --git a/nixos/modules/virtualisation/ec2-data.nix b/nixos/modules/virtualisation/ec2-data.nix index 246d3506531720814f11d25a13e1197c9dd530a7..93a83a3e42af4dfda0dba2218833e414adcf1ee3 100644 --- a/nixos/modules/virtualisation/ec2-data.nix +++ b/nixos/modules/virtualisation/ec2-data.nix @@ -22,21 +22,22 @@ with lib; systemd.services."fetch-ec2-data" = { description = "Fetch EC2 Data"; - wantedBy = [ "multi-user.target" ]; + wantedBy = [ "multi-user.target" "sshd.service" ]; before = [ "sshd.service" ]; - after = [ "network.target" ]; + wants = [ "ip-up.target" ]; + after = [ "ip-up.target" ]; - path = [ pkgs.curl pkgs.iproute ]; + path = [ pkgs.wget pkgs.iproute ]; script = '' ip route del blackhole 169.254.169.254/32 || true - curl="curl --retry 3 --retry-delay 0 --fail" + wget="wget -q --retry-connrefused -O -" echo "setting host name..." ${optionalString (config.networking.hostName == "") '' - ${pkgs.nettools}/bin/hostname $($curl http://169.254.169.254/1.0/meta-data/hostname) + ${pkgs.nettools}/bin/hostname $($wget http://169.254.169.254/1.0/meta-data/hostname) ''} # Don't download the SSH key if it has already been injected @@ -44,7 +45,7 @@ with lib; if ! [ -e /root/.ssh/authorized_keys ]; then echo "obtaining SSH key..." mkdir -p /root/.ssh - $curl -o /root/key.pub http://169.254.169.254/1.0/meta-data/public-keys/0/openssh-key + $wget http://169.254.169.254/1.0/meta-data/public-keys/0/openssh-key > /root/key.pub if [ $? -eq 0 -a -e /root/key.pub ]; then if ! grep -q -f /root/key.pub /root/.ssh/authorized_keys; then cat /root/key.pub >> /root/.ssh/authorized_keys @@ -58,7 +59,7 @@ with lib; # Extract the intended SSH host key for this machine from # the supplied user data, if available. Otherwise sshd will # generate one normally. - $curl http://169.254.169.254/2011-01-01/user-data > /root/user-data || true + $wget http://169.254.169.254/2011-01-01/user-data > /root/user-data || true key="$(sed 's/|/\n/g; s/SSH_HOST_DSA_KEY://; t; d' /root/user-data)" key_pub="$(sed 's/SSH_HOST_DSA_KEY_PUB://; t; d' /root/user-data)" if [ -n "$key" -a -n "$key_pub" -a ! -e /etc/ssh/ssh_host_dsa_key ]; then diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix index 9a4d11d550a1326aa538a2a02324e8a6e0dd3a8e..697423ac60bee8eff0bed4923402fc1476841cd8 100644 --- a/nixos/modules/virtualisation/google-compute-image.nix +++ b/nixos/modules/virtualisation/google-compute-image.nix @@ -121,19 +121,6 @@ in networking.usePredictableInterfaceNames = false; - systemd.services.wait-metadata-online = { - description = "Wait for GCE metadata server to become reachable"; - wantedBy = [ "network-online.target" ]; - before = [ "network-online.target" ]; - path = [ pkgs.netcat ]; - script = '' - # wait for the metadata server to become available for up to 60 seconds - for counter in {1..30}; do sleep 2 && nc -vzw 2 metadata 80 && break; done - ''; - serviceConfig.Type = "oneshot"; - serviceConfig.RemainAfterExit = true; - }; - systemd.services.fetch-ssh-keys = { description = "Fetch host keys and authorized_keys for root user"; @@ -142,14 +129,15 @@ in after = [ "network-online.target" ]; wants = [ "network-online.target" ]; - path = [ pkgs.curl ]; + path = [ pkgs.wget ]; script = '' + wget="wget --retry-connrefused -t 6 --waitretry=10" # Don't download the SSH key if it has already been downloaded if ! [ -e /root/.ssh/authorized_keys ]; then echo "obtaining SSH key..." mkdir -p /root/.ssh - curl -o /root/authorized-keys-metadata http://metadata/0.1/meta-data/authorized-keys + $wget -O /root/authorized-keys-metadata http://metadata/0.1/meta-data/authorized-keys if [ $? -eq 0 -a -e /root/authorized-keys-metadata ]; then cat /root/authorized-keys-metadata | cut -d: -f2- > /root/key.pub if ! grep -q -f /root/key.pub /root/.ssh/authorized_keys; then @@ -162,7 +150,7 @@ in fi echo "obtaining SSH private host key..." - curl -o /root/ssh_host_ecdsa_key --retry-max-time 60 http://metadata/0.1/meta-data/attributes/ssh_host_ecdsa_key + $wget -O /root/ssh_host_ecdsa_key http://metadata/0.1/meta-data/attributes/ssh_host_ecdsa_key if [ $? -eq 0 -a -e /root/ssh_host_ecdsa_key ]; then mv -f /root/ssh_host_ecdsa_key /etc/ssh/ssh_host_ecdsa_key echo "downloaded ssh_host_ecdsa_key" @@ -170,7 +158,7 @@ in fi echo "obtaining SSH public host key..." - curl -o /root/ssh_host_ecdsa_key.pub --retry-max-time 60 http://metadata/0.1/meta-data/attributes/ssh_host_ecdsa_key_pub + $wget -O /root/ssh_host_ecdsa_key.pub http://metadata/0.1/meta-data/attributes/ssh_host_ecdsa_key_pub if [ $? -eq 0 -a -e /root/ssh_host_ecdsa_key.pub ]; then mv -f /root/ssh_host_ecdsa_key.pub /etc/ssh/ssh_host_ecdsa_key.pub echo "downloaded ssh_host_ecdsa_key.pub" @@ -179,7 +167,7 @@ in ''; serviceConfig.Type = "oneshot"; serviceConfig.RemainAfterExit = true; + serviceConfig.StandardError = "journal+console"; + serviceConfig.StandardOutput = "journal+console"; }; - - } diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index bccf6583e47d735efd4958ad799bcc59a472b883..58386ce5cf5657888d4576f974467b29516b07c9 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -275,12 +275,10 @@ in boot.loader.grub.device = mkVMOverride "/dev/vda"; - boot.initrd.supportedFilesystems = optional cfg.writableStore "unionfs-fuse"; - boot.initrd.extraUtilsCommands = '' # We need mke2fs in the initrd. - cp ${pkgs.e2fsprogs}/sbin/mke2fs $out/bin + cp -f ${pkgs.e2fsprogs}/sbin/mke2fs $out/bin ''; boot.initrd.postDeviceCommands = @@ -303,20 +301,6 @@ in chmod 1777 $targetRoot/tmp mkdir -p $targetRoot/boot - ${optionalString cfg.writableStore '' - mkdir -p /unionfs-chroot/ro-store - mount --rbind $targetRoot/nix/store /unionfs-chroot/ro-store - - mkdir /unionfs-chroot/rw-store - ${if cfg.writableStoreUseTmpfs then '' - mount -t tmpfs -o "mode=755" none /unionfs-chroot/rw-store - '' else '' - mkdir $targetRoot/.nix-rw-store - mount --bind $targetRoot/.nix-rw-store /unionfs-chroot/rw-store - ''} - - unionfs -o allow_other,cow,nonempty,chroot=/unionfs-chroot,max_files=32768,hide_meta_files /rw-store=RW:/ro-store=RO $targetRoot/nix/store - ''} ''; # After booting, register the closure of the paths in @@ -343,12 +327,13 @@ in # configuration, where the regular value for the `fileSystems' # attribute should be disregarded for the purpose of building a VM # test image (since those filesystems don't exist in the VM). - fileSystems = mkVMOverride + fileSystems = mkVMOverride ( { "/".device = "/dev/vda"; - "/nix/store" = + ${if cfg.writableStore then "/nix/.ro-store" else "/nix/store"} = { device = "store"; fsType = "9p"; options = "trans=virtio,version=9p2000.L,msize=1048576,cache=loose"; + neededForBoot = true; }; "/tmp/xchg" = { device = "xchg"; @@ -362,6 +347,18 @@ in options = "trans=virtio,version=9p2000.L,msize=1048576"; neededForBoot = true; }; + } // optionalAttrs cfg.writableStore + { "/nix/store" = + { fsType = "unionfs-fuse"; + device = "unionfs"; + options = "allow_other,cow,nonempty,chroot=/mnt-root,max_files=32768,hide_meta_files,dirs=/nix/.rw-store=rw:/nix/.ro-store=ro"; + }; + } // optionalAttrs (cfg.writableStore && cfg.writableStoreUseTmpfs) + { "/nix/.rw-store" = + { fsType = "tmpfs"; + options = "mode=0755"; + neededForBoot = true; + }; } // optionalAttrs cfg.useBootLoader { "/boot" = { device = "/dev/disk/by-label/boot"; @@ -369,7 +366,7 @@ in options = "ro"; noCheck = true; # fsck fails on a r/o filesystem }; - }; + }); swapDevices = mkVMOverride [ ]; boot.initrd.luks.devices = mkVMOverride []; @@ -379,7 +376,7 @@ in system.build.vm = pkgs.runCommand "nixos-vm" { preferLocalBuild = true; } '' - ensureDir $out/bin + mkdir -p $out/bin ln -s ${config.system.build.toplevel} $out/system ln -s ${pkgs.writeScript "run-nixos-vm" startVM} $out/bin/run-${vmName}-vm ''; diff --git a/nixos/modules/virtualisation/virtualbox-image.nix b/nixos/modules/virtualisation/virtualbox-image.nix index 2e30f4c62f97c35c366b8976fcbe2d7ecdad7b1e..106b269d9e1fb23defd142017f1f5e4f043e0790 100644 --- a/nixos/modules/virtualisation/virtualbox-image.nix +++ b/nixos/modules/virtualisation/virtualbox-image.nix @@ -2,112 +2,132 @@ with lib; -{ - system.build.virtualBoxImage = - pkgs.vmTools.runInLinuxVM ( - pkgs.runCommand "virtualbox-image" - { memSize = 768; - preVM = - '' - mkdir $out - diskImage=$out/image - ${pkgs.vmTools.qemu}/bin/qemu-img create -f raw $diskImage "10G" - mv closure xchg/ - ''; - postVM = - '' - echo "creating VirtualBox disk image..." - ${pkgs.vmTools.qemu}/bin/qemu-img convert -f raw -O vdi $diskImage $out/disk.vdi - rm $diskImage - ''; - buildInputs = [ pkgs.utillinux pkgs.perl ]; - exportReferencesGraph = - [ "closure" config.system.build.toplevel ]; - } - '' - # Create a single / partition. - ${pkgs.parted}/sbin/parted /dev/vda mklabel msdos - ${pkgs.parted}/sbin/parted /dev/vda -- mkpart primary ext2 1M -1s - . /sys/class/block/vda1/uevent - mknod /dev/vda1 b $MAJOR $MINOR - - # Create an empty filesystem and mount it. - ${pkgs.e2fsprogs}/sbin/mkfs.ext4 -L nixos /dev/vda1 - ${pkgs.e2fsprogs}/sbin/tune2fs -c 0 -i 0 /dev/vda1 - mkdir /mnt - mount /dev/vda1 /mnt - - # The initrd expects these directories to exist. - mkdir /mnt/dev /mnt/proc /mnt/sys - mount --bind /proc /mnt/proc - mount --bind /dev /mnt/dev - mount --bind /sys /mnt/sys - - # Copy all paths in the closure to the filesystem. - storePaths=$(perl ${pkgs.pathsFromGraph} /tmp/xchg/closure) - - echo "filling Nix store..." - mkdir -p /mnt/nix/store - set -f - cp -prd $storePaths /mnt/nix/store/ - - mkdir -p /mnt/etc/nix - echo 'build-users-group = ' > /mnt/etc/nix/nix.conf - - # Register the paths in the Nix database. - printRegistration=1 perl ${pkgs.pathsFromGraph} /tmp/xchg/closure | \ - chroot /mnt ${config.nix.package}/bin/nix-store --load-db - - # Create the system profile to allow nixos-rebuild to work. - chroot /mnt ${config.nix.package}/bin/nix-env \ - -p /nix/var/nix/profiles/system --set ${config.system.build.toplevel} - - # `nixos-rebuild' requires an /etc/NIXOS. - mkdir -p /mnt/etc/nixos - touch /mnt/etc/NIXOS - - # `switch-to-configuration' requires a /bin/sh - mkdir -p /mnt/bin - ln -s ${config.system.build.binsh}/bin/sh /mnt/bin/sh - - # Generate the GRUB menu. - ln -s vda /dev/sda - chroot /mnt ${config.system.build.toplevel}/bin/switch-to-configuration boot - - umount /mnt/proc /mnt/dev /mnt/sys - umount /mnt - '' - ); - - system.build.virtualBoxOVA = pkgs.runCommand "virtualbox-ova" - { buildInputs = [ pkgs.linuxPackages.virtualbox ]; - vmName = "NixOS ${config.system.nixosVersion} (${pkgs.stdenv.system})"; - fileName = "nixos-${config.system.nixosVersion}-${pkgs.stdenv.system}.ova"; - } - '' - echo "creating VirtualBox VM..." - export HOME=$PWD - VBoxManage createvm --name "$vmName" --register \ - --ostype ${if pkgs.stdenv.system == "x86_64-linux" then "Linux26_64" else "Linux26"} - VBoxManage modifyvm "$vmName" \ - --memory 1536 --acpi on --vram 10 \ - --nictype1 virtio --nic1 nat \ - --audiocontroller ac97 --audio alsa \ - --rtcuseutc on \ - --usb on --mouse usbtablet - VBoxManage storagectl "$vmName" --name SATA --add sata --portcount 4 --bootable on --hostiocache on - VBoxManage storageattach "$vmName" --storagectl SATA --port 0 --device 0 --type hdd \ - --medium ${config.system.build.virtualBoxImage}/disk.vdi - - echo "exporting VirtualBox VM..." - mkdir -p $out - VBoxManage export "$vmName" --output "$out/$fileName" - ''; - - fileSystems."/".device = "/dev/disk/by-label/nixos"; - - boot.loader.grub.version = 2; - boot.loader.grub.device = "/dev/sda"; - - services.virtualbox.enable = true; +let + + cfg = config.virtualbox; + +in { + + options = { + virtualbox = { + baseImageSize = mkOption { + type = types.str; + default = "10G"; + description = '' + The size of the VirtualBox base image. The size string should be on + a format the qemu-img command accepts. + ''; + }; + }; + }; + + config = { + system.build.virtualBoxImage = + pkgs.vmTools.runInLinuxVM ( + pkgs.runCommand "virtualbox-image" + { memSize = 768; + preVM = + '' + mkdir $out + diskImage=$out/image + ${pkgs.vmTools.qemu}/bin/qemu-img create -f raw $diskImage "${cfg.baseImageSize}" + mv closure xchg/ + ''; + postVM = + '' + echo "creating VirtualBox disk image..." + ${pkgs.vmTools.qemu}/bin/qemu-img convert -f raw -O vdi $diskImage $out/disk.vdi + rm $diskImage + ''; + buildInputs = [ pkgs.utillinux pkgs.perl ]; + exportReferencesGraph = + [ "closure" config.system.build.toplevel ]; + } + '' + # Create a single / partition. + ${pkgs.parted}/sbin/parted /dev/vda mklabel msdos + ${pkgs.parted}/sbin/parted /dev/vda -- mkpart primary ext2 1M -1s + . /sys/class/block/vda1/uevent + mknod /dev/vda1 b $MAJOR $MINOR + + # Create an empty filesystem and mount it. + ${pkgs.e2fsprogs}/sbin/mkfs.ext4 -L nixos /dev/vda1 + ${pkgs.e2fsprogs}/sbin/tune2fs -c 0 -i 0 /dev/vda1 + mkdir /mnt + mount /dev/vda1 /mnt + + # The initrd expects these directories to exist. + mkdir /mnt/dev /mnt/proc /mnt/sys + mount --bind /proc /mnt/proc + mount --bind /dev /mnt/dev + mount --bind /sys /mnt/sys + + # Copy all paths in the closure to the filesystem. + storePaths=$(perl ${pkgs.pathsFromGraph} /tmp/xchg/closure) + + echo "filling Nix store..." + mkdir -p /mnt/nix/store + set -f + cp -prd $storePaths /mnt/nix/store/ + + mkdir -p /mnt/etc/nix + echo 'build-users-group = ' > /mnt/etc/nix/nix.conf + + # Register the paths in the Nix database. + printRegistration=1 perl ${pkgs.pathsFromGraph} /tmp/xchg/closure | \ + chroot /mnt ${config.nix.package}/bin/nix-store --load-db + + # Create the system profile to allow nixos-rebuild to work. + chroot /mnt ${config.nix.package}/bin/nix-env \ + -p /nix/var/nix/profiles/system --set ${config.system.build.toplevel} + + # `nixos-rebuild' requires an /etc/NIXOS. + mkdir -p /mnt/etc/nixos + touch /mnt/etc/NIXOS + + # `switch-to-configuration' requires a /bin/sh + mkdir -p /mnt/bin + ln -s ${config.system.build.binsh}/bin/sh /mnt/bin/sh + + # Generate the GRUB menu. + ln -s vda /dev/sda + chroot /mnt ${config.system.build.toplevel}/bin/switch-to-configuration boot + + umount /mnt/proc /mnt/dev /mnt/sys + umount /mnt + '' + ); + + system.build.virtualBoxOVA = pkgs.runCommand "virtualbox-ova" + { buildInputs = [ pkgs.linuxPackages.virtualbox ]; + vmName = "NixOS ${config.system.nixosVersion} (${pkgs.stdenv.system})"; + fileName = "nixos-${config.system.nixosVersion}-${pkgs.stdenv.system}.ova"; + } + '' + echo "creating VirtualBox VM..." + export HOME=$PWD + VBoxManage createvm --name "$vmName" --register \ + --ostype ${if pkgs.stdenv.system == "x86_64-linux" then "Linux26_64" else "Linux26"} + VBoxManage modifyvm "$vmName" \ + --memory 1536 --acpi on --vram 10 \ + --nictype1 virtio --nic1 nat \ + --audiocontroller ac97 --audio alsa \ + --rtcuseutc on \ + --usb on --mouse usbtablet + VBoxManage storagectl "$vmName" --name SATA --add sata --portcount 4 --bootable on --hostiocache on + VBoxManage storageattach "$vmName" --storagectl SATA --port 0 --device 0 --type hdd \ + --medium ${config.system.build.virtualBoxImage}/disk.vdi + + echo "exporting VirtualBox VM..." + mkdir -p $out + VBoxManage export "$vmName" --output "$out/$fileName" + ''; + + fileSystems."/".device = "/dev/disk/by-label/nixos"; + + boot.loader.grub.version = 2; + boot.loader.grub.device = "/dev/sda"; + + services.virtualbox.enable = true; + }; } diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index f59f71b0d6f841a4c1d1370774f1aafde255c6f1..dae3b9210a86097078b3f7ffa7e30c565a3b13d7 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -42,8 +42,8 @@ in rec { (all nixos.iso_graphical) (all nixos.ova) - # (all nixos.tests.efi-installer.simple) - (all nixos.tests.containers) + #(all nixos.tests.efi-installer.simple) + #(all nixos.tests.containers) (all nixos.tests.firefox) (all nixos.tests.firewall) (all nixos.tests.gnome3) diff --git a/nixos/release.nix b/nixos/release.nix index 8a8b77de5a5b05e1479a742ce15c383ca4925289..ed413d3e928f071de2c2c6e5bc4f3b3ab87e34b5 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -113,6 +113,7 @@ in rec { manual = forAllSystems (system: (builtins.getAttr system iso_minimal).config.system.build.manual.manual); + manualPDF = iso_minimal.x86_64-linux.config.system.build.manual.manualPDF; manpages = forAllSystems (system: (builtins.getAttr system iso_minimal).config.system.build.manual.manpages); diff --git a/nixos/tests/containers.nix b/nixos/tests/containers.nix index f7dc8eb491d6a174b4a4248954f10d7b2c34ed8f..a582e23fda025bd8fa384daf4407217180206645 100644 --- a/nixos/tests/containers.nix +++ b/nixos/tests/containers.nix @@ -35,7 +35,7 @@ import ./make-test.nix { # multi-user.target, we should now be able to access it. my $ip = $machine->succeed("nixos-container show-ip webserver"); chomp $ip; - $machine->succeed("ping -c1 $ip"); + #$machine->succeed("ping -c1 $ip"); # FIXME $machine->succeed("curl --fail http://$ip/ > /dev/null"); # Stop the container. diff --git a/nixos/tests/ipv6.nix b/nixos/tests/ipv6.nix index af6fec6bfbf5a238102c4ea3c69e4fe25637e38b..017511ea45c61abe96f7df2a325c8a4429db21a1 100644 --- a/nixos/tests/ipv6.nix +++ b/nixos/tests/ipv6.nix @@ -37,6 +37,7 @@ import ./make-test.nix { $client->waitForUnit("network.target"); $server->waitForUnit("network.target"); + $server->waitForUnit("httpd.service"); # Wait until the given interface has a non-tentative address of # the desired scope (i.e. has completed Duplicate Address diff --git a/nixos/tests/misc.nix b/nixos/tests/misc.nix index c03db6c433530fb8ab7b4d657ec01fdf797a4308..e1830d95b41f057fbabbe239520bc6418ae468f8 100644 --- a/nixos/tests/misc.nix +++ b/nixos/tests/misc.nix @@ -12,8 +12,7 @@ import ./make-test.nix { services.nixosManual.enable = mkOverride 0 true; systemd.tmpfiles.rules = [ "d /tmp 1777 root root 10d" ]; fileSystems = mkVMOverride { "/tmp2" = - { device = "none"; - fsType = "tmpfs"; + { fsType = "tmpfs"; options = "mode=1777,noauto"; }; }; diff --git a/pkgs/applications/audio/a2jmidid/default.nix b/pkgs/applications/audio/a2jmidid/default.nix index c5e35d8867c867988db76f463b914d0d43e04f75..38192311ccfa75dc322de201120cfde959106c0d 100644 --- a/pkgs/applications/audio/a2jmidid/default.nix +++ b/pkgs/applications/audio/a2jmidid/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, dbus, jackaudio, pkgconfig, python }: +{ stdenv, fetchurl, alsaLib, dbus, jack2, pkgconfig, python }: stdenv.mkDerivation rec { name = "a2jmidid-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0pzm0qk5ilqhwz74pydg1jwrds27vm47185dakdrxidb5bv3b5ia"; }; - buildInputs = [ alsaLib dbus jackaudio pkgconfig python ]; + buildInputs = [ alsaLib dbus jack2 pkgconfig python ]; configurePhase = "python waf configure --prefix=$out"; diff --git a/pkgs/applications/audio/abcde/default.nix b/pkgs/applications/audio/abcde/default.nix index 031b0fe93b5976b08c9cb5aa68b0ed6d7b83cc9a..1978fcf187497409d5eb026524818329c52b4eb7 100644 --- a/pkgs/applications/audio/abcde/default.nix +++ b/pkgs/applications/audio/abcde/default.nix @@ -61,7 +61,7 @@ in meta = { homepage = "http://lly.org/~rcw/abcde/page/"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; description = "Command-line audio CD ripper"; longDescription = '' diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix index 88bc7399c65e2aeb77cdd505896cdb15efb701ac..62b88cbe0775e2ddc46af8b86c36807f74354eae 100644 --- a/pkgs/applications/audio/ardour/default.nix +++ b/pkgs/applications/audio/ardour/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit, alsaLib, aubio, boost, cairomm, curl, fftw -, fftwSinglePrec, flac, glibc, glibmm, gtk, gtkmm, jackaudio +, fftwSinglePrec, flac, glibc, glibmm, gtk, gtkmm, jack2 , libgnomecanvas, libgnomecanvasmm, liblo, libmad, libogg, librdf , librdf_raptor, librdf_rasqal, libsamplerate, libsigcxx, libsndfile , libusb, libuuid, libxml2, libxslt, lilv, lv2, makeWrapper, pango @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ alsaLib aubio boost cairomm curl fftw fftwSinglePrec flac glibc - glibmm gtk gtkmm jackaudio libgnomecanvas libgnomecanvasmm liblo + glibmm gtk gtkmm jack2 libgnomecanvas libgnomecanvasmm liblo libmad libogg librdf librdf_raptor librdf_rasqal libsamplerate libsigcxx libsndfile libusb libuuid libxml2 libxslt lilv lv2 makeWrapper pango perl pkgconfig python serd sord sratom suil @@ -47,6 +47,21 @@ stdenv.mkDerivation rec { mkdir -pv $out/gtk2/engines cp build/libs/clearlooks-newer/libclearlooks.so $out/gtk2/engines/ wrapProgram $out/bin/ardour3 --prefix GTK_PATH : $out/gtk2 + + # Install desktop file + mkdir -p "$out/share/applications" + cat > "$out/share/applications/ardour.desktop" << EOF + [Desktop Entry] + Name=Ardour 3 + GenericName=Digital Audio Workstation + Comment=Multitrack harddisk recorder + Exec=$out/bin/ardour3 + Icon=$out/share/ardour3/icons/ardour_icon_256px.png + Terminal=false + Type=Application + X-MultipleArgs=false + Categories=GTK;Audio;AudioVideoEditing;AudioVideo;Video; + EOF ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index 890497b0c99290fa1d10eb499dfed4277b4ae2f5..7308d84e098407749dbc8a7df1b0dc5b3d335b82 100644 --- a/pkgs/applications/audio/audacity/default.nix +++ b/pkgs/applications/audio/audacity/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = { description = "Sound editor with graphical UI"; homepage = http://audacity.sourceforge.net; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = with stdenv.lib.platforms; linux; maintainers = with stdenv.lib.maintainers; [ the-kenny ]; }; diff --git a/pkgs/applications/audio/aumix/default.nix b/pkgs/applications/audio/aumix/default.nix index 1e19a3ac5c39de5a5a6ec64a4043244c90251136..41edd51e5f26a731acbd2bda0346d04bc3ecb465 100644 --- a/pkgs/applications/audio/aumix/default.nix +++ b/pkgs/applications/audio/aumix/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { the command line or a script. ''; homepage = http://www.jpj.net/~trevor/aumix.html; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/audio/bristol/default.nix b/pkgs/applications/audio/bristol/default.nix index 5eb4f0c4e9f156dcaaa5618d53f3a103312cbd67..b27ac0586025f3c737d249d0770d5f8ff9148171 100644 --- a/pkgs/applications/audio/bristol/default.nix +++ b/pkgs/applications/audio/bristol/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, jackaudio, pkgconfig, pulseaudio, xlibs }: +{ stdenv, fetchurl, alsaLib, jack2, pkgconfig, pulseaudio, xlibs }: stdenv.mkDerivation rec { name = "bristol-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - alsaLib jackaudio pkgconfig pulseaudio xlibs.libX11 xlibs.libXext + alsaLib jack2 pkgconfig pulseaudio xlibs.libX11 xlibs.libXext xlibs.xproto ]; diff --git a/pkgs/applications/audio/calf/default.nix b/pkgs/applications/audio/calf/default.nix index 6ed4b7cce98b1ea8ee9fad92c8b957e9a981556f..efab9202025d5f82f40a8df5d6ac38d4a081cb00 100644 --- a/pkgs/applications/audio/calf/default.nix +++ b/pkgs/applications/audio/calf/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cairo, expat, fftwSinglePrec, fluidsynth, glib -, gtk, jackaudio, ladspaH , libglade, lv2, pkgconfig }: +, gtk, jack2, ladspaH , libglade, lv2, pkgconfig }: stdenv.mkDerivation rec { name = "calf-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - cairo expat fftwSinglePrec fluidsynth glib gtk jackaudio ladspaH + cairo expat fftwSinglePrec fluidsynth glib gtk jack2 ladspaH libglade lv2 pkgconfig ]; diff --git a/pkgs/applications/audio/cd-discid/default.nix b/pkgs/applications/audio/cd-discid/default.nix index c67830a94e77aea9a0f27189101e7e2983906c31..1646f944a8304c2c4b1c40f03156b8f784ee22f4 100644 --- a/pkgs/applications/audio/cd-discid/default.nix +++ b/pkgs/applications/audio/cd-discid/default.nix @@ -19,7 +19,7 @@ in meta = { homepage = http://lly.org/~rcw/cd-discid/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; description = "cd-discid, a command-line utility to retrieve a disc's CDDB ID"; longDescription = '' diff --git a/pkgs/applications/audio/distrho/default.nix b/pkgs/applications/audio/distrho/default.nix index 809a02e1c7a50d5b2a31dafebd3d0ec825e12de2..aa3a76c3af139bc2d35e150f702c7bfd4d1891ba 100644 --- a/pkgs/applications/audio/distrho/default.nix +++ b/pkgs/applications/audio/distrho/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, alsaLib, fftwSinglePrec, freetype, jackaudio +{ stdenv, fetchgit, alsaLib, fftwSinglePrec, freetype, jack2 , libxslt, lv2, pkgconfig, premake3, xlibs }: let @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; buildInputs = [ - alsaLib fftwSinglePrec freetype jackaudio pkgconfig premake3 + alsaLib fftwSinglePrec freetype jack2 pkgconfig premake3 xlibs.libX11 xlibs.libXcomposite xlibs.libXcursor xlibs.libXext xlibs.libXinerama xlibs.libXrender ]; diff --git a/pkgs/applications/audio/drumkv1/default.nix b/pkgs/applications/audio/drumkv1/default.nix index ab8027e23711d0850f4804f1b5b670a71c676d81..775cf5ca606c8d1165bdc1b833064c332caee12f 100644 --- a/pkgs/applications/audio/drumkv1/default.nix +++ b/pkgs/applications/audio/drumkv1/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchurl, jackaudio, libsndfile, lv2, qt4 }: +{ stdenv, fetchurl, jack2, libsndfile, lv2, qt4 }: stdenv.mkDerivation rec { name = "drumkv1-${version}"; - version = "0.4.2"; + version = "0.5.0"; src = fetchurl { url = "mirror://sourceforge/drumkv1/${name}.tar.gz"; - sha256 = "18rvfgblynlmklk25azmppibn1bdjid97hipa323gnzmxgq0rfjq"; + sha256 = "16bjkp22hfpmzj5di98dddzslavgvhw5z7pgjzmjqz9dxvbqwq1k"; }; - buildInputs = [ jackaudio libsndfile lv2 qt4 ]; + buildInputs = [ jack2 libsndfile lv2 qt4 ]; meta = with stdenv.lib; { description = "An old-school drum-kit sampler synthesizer with stereo fx"; diff --git a/pkgs/applications/audio/espeak/default.nix b/pkgs/applications/audio/espeak/default.nix index e1cf5fee1cc7dc42c70f86ee2b900ed7f6deb45e..0faf4841c71b326de1dbdcb41a55043a576371d2 100644 --- a/pkgs/applications/audio/espeak/default.nix +++ b/pkgs/applications/audio/espeak/default.nix @@ -1,10 +1,11 @@ -{stdenv, fetchurl, unzip, portaudio }: +{ stdenv, fetchurl, unzip, portaudio }: + +stdenv.mkDerivation rec { + name = "espeak-1.48.04"; -stdenv.mkDerivation { - name = "espeak-1.46.02"; src = fetchurl { - url = mirror://sourceforge/espeak/espeak-1.46.02-source.zip; - sha256 = "1fjlv5fm0gzvr5wzy1dp4nspw04k0bqv3jymha2p2qfjbfifp2zg"; + url = "mirror://sourceforge/espeak/${name}-source.zip"; + sha256 = "0n86gwh9pw0jqqpdz7mxggllfr8k0r7pc67ayy7w5z6z79kig6mz"; }; buildInputs = [ unzip portaudio ]; @@ -21,9 +22,10 @@ stdenv.mkDerivation { makeFlags="PREFIX=$out DATADIR=$out/share/espeak-data" ''; - meta = { + meta = with stdenv.lib; { description = "Compact open source software speech synthesizer"; homepage = http://espeak.sourceforge.net/; - license = "GPLv3+"; + license = licenses.gpl3Plus; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/audio/espeak/edit.nix b/pkgs/applications/audio/espeak/edit.nix index eb34335721f04d3ead35634450e504f947f2bcbb..524a95bcca0690c1d289aaf0c33a8bd0ba7734e1 100644 --- a/pkgs/applications/audio/espeak/edit.nix +++ b/pkgs/applications/audio/espeak/edit.nix @@ -1,31 +1,57 @@ -{stdenv, fetchurl, unzip, portaudio, wxGTK}: +{ stdenv, fetchurl, pkgconfig, unzip, portaudio, wxGTK, sox }: + +stdenv.mkDerivation rec { + name = "espeakedit-1.48.03"; -stdenv.mkDerivation { - name = "espeakedit-1.46.02"; src = fetchurl { - url = mirror://sourceforge/espeak/espeakedit-1.46.02.zip; - sha256 = "1cc5r89sn8zz7b8wj4grx9xb7aqyi0ybj0li9hpy7hd67r56kqkl"; + url = "mirror://sourceforge/espeak/${name}.zip"; + sha256 = "0x8s7vpb7rw5x37yjzy1f98m4f2csdg89libb74fm36gn8ly0hli"; }; - buildInputs = [ unzip portaudio wxGTK ]; + buildInputs = [ pkgconfig unzip portaudio wxGTK ]; + + # TODO: + # Uhm, seems like espeakedit still wants espeak-data/ in $HOME, even thought + # it should use $espeak/share/espeak-data. Have to contact upstream to get + # this fixed. + # + # Workaround: + # cp -r $(nix-build -A espeak)/share/espeak-data ~ + # chmod +w ~/espeak-data + + patches = [ + ./espeakedit-fix-makefile.patch + ./espeakedit-configurable-sox-path.patch + ./espeakedit-configurable-path-espeak-data.patch + ]; - patchPhase = if portaudio.api_version == 19 then '' + postPatch = '' + # Disable -Wall flag because it's noisy + sed -i "s/-Wall//g" src/Makefile + + # Fixup paths (file names from above espeak-configurable* patches) + for file in src/compiledata.cpp src/readclause.cpp src/speech.h; do + sed -e "s|@sox@|${sox}/bin/sox|" \ + -e "s|@prefix@|$out|" \ + -i "$file" + done + '' + stdenv.lib.optionalString (portaudio.api_version == 19) '' cp src/portaudio19.h src/portaudio.h - '' else ""; + ''; buildPhase = '' - cd src - gcc -o espeakedit *.cpp `wx-config --cxxflags --libs` + make -C src ''; installPhase = '' - ensureDir $out/bin - cp espeakedit $out/bin + mkdir -p "$out/bin" + cp src/espeakedit "$out/bin" ''; - meta = { + meta = with stdenv.lib; { description = "Phoneme editor for espeak"; homepage = http://espeak.sourceforge.net/; - license = "GPLv3+"; + license = licenses.gpl3Plus; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/audio/espeak/espeakedit-configurable-path-espeak-data.patch b/pkgs/applications/audio/espeak/espeakedit-configurable-path-espeak-data.patch new file mode 100644 index 0000000000000000000000000000000000000000..e5c761a11b354eb7e6cef631ed0e1278ea1e0ed3 --- /dev/null +++ b/pkgs/applications/audio/espeak/espeakedit-configurable-path-espeak-data.patch @@ -0,0 +1,15 @@ +Don't hardcode /usr, use @prefix@. + +Author: Bjørn Forsman +diff -uNr espeakedit-1.48.03.orig/src/speech.h espeakedit-1.48.03/src/speech.h +--- espeakedit-1.48.03.orig/src/speech.h 2014-03-04 17:48:12.000000000 +0100 ++++ espeakedit-1.48.03/src/speech.h 2014-07-22 18:21:40.860790719 +0200 +@@ -58,7 +58,7 @@ + + // will look for espeak_data directory here, and also in user's home directory + #ifndef PATH_ESPEAK_DATA +- #define PATH_ESPEAK_DATA "/usr/share/espeak-data" ++ #define PATH_ESPEAK_DATA "@prefix@/share/espeak-data" + #endif + + typedef unsigned short USHORT; diff --git a/pkgs/applications/audio/espeak/espeakedit-configurable-sox-path.patch b/pkgs/applications/audio/espeak/espeakedit-configurable-sox-path.patch new file mode 100644 index 0000000000000000000000000000000000000000..1c5dfc21941af6a3361f8e79264f4e8cfb20ec5d --- /dev/null +++ b/pkgs/applications/audio/espeak/espeakedit-configurable-sox-path.patch @@ -0,0 +1,27 @@ +Make the path to 'sox' configurable by marking it '@sox@' (easy to match with sed). + +Author: Bjørn Forsman +diff -uNr espeakedit-1.48.03.orig/src/compiledata.cpp espeakedit-1.48.03/src/compiledata.cpp +--- espeakedit-1.48.03.orig/src/compiledata.cpp 2014-03-04 17:48:11.000000000 +0100 ++++ espeakedit-1.48.03/src/compiledata.cpp 2014-07-22 16:38:50.261388452 +0200 +@@ -1884,7 +1884,7 @@ + fname2 = msg; + } + +- sprintf(command,"sox \"%s%s.wav\" -r %d -c1 -t wav %s\n",path_source,fname2,samplerate_native, fname_temp); ++ sprintf(command,"@sox@ \"%s%s.wav\" -r %d -c1 -t wav %s\n",path_source,fname2,samplerate_native, fname_temp); + if(system(command) != 0) + { + failed = 1; +diff -uNr espeakedit-1.48.03.orig/src/readclause.cpp espeakedit-1.48.03/src/readclause.cpp +--- espeakedit-1.48.03.orig/src/readclause.cpp 2014-03-04 17:48:11.000000000 +0100 ++++ espeakedit-1.48.03/src/readclause.cpp 2014-07-22 16:38:37.190440504 +0200 +@@ -892,7 +892,7 @@ + if((fd_temp = mkstemp(fname_temp)) >= 0) + { + close(fd_temp); +- sprintf(command,"sox \"%s\" -r %d -c1 -t wav %s\n", fname, samplerate, fname_temp); ++ sprintf(command,"@sox@ \"%s\" -r %d -c1 -t wav %s\n", fname, samplerate, fname_temp); + if(system(command) == 0) + { + fname = fname_temp; diff --git a/pkgs/applications/audio/espeak/espeakedit-fix-makefile.patch b/pkgs/applications/audio/espeak/espeakedit-fix-makefile.patch new file mode 100644 index 0000000000000000000000000000000000000000..9f8a65d2b0ca60e9377d1d28128766145a9a1b97 --- /dev/null +++ b/pkgs/applications/audio/espeak/espeakedit-fix-makefile.patch @@ -0,0 +1,26 @@ +Fix broken Makefile: + +* fix syntax error (missing '\' to continue line): + Makefile:19: *** recipe commences before first target. Stop. +* Get portaudio library flags from pkg-config (to get -Lpath/to/portaudio/lib etc.) + +Author: Bjørn Forsman +diff -uNr espeakedit-1.48.03.orig/src/Makefile espeakedit-1.48.03/src/Makefile +--- espeakedit-1.48.03.orig/src/Makefile 2013-03-13 15:52:02.000000000 +0100 ++++ espeakedit-1.48.03/src/Makefile 2014-07-22 15:34:17.524114822 +0200 +@@ -12,12 +12,11 @@ + + WX_LIBS = -pthread `wx-config --libs` + +-LIBS=-lstdc++ -lportaudio ++LIBS=-lstdc++ `pkg-config --libs portaudio-2.0` + #LIBS=-lstdc++ /usr/lib/x86_64-linux-gnu/libportaudio.so.2 + +-CPPFLAGS = -Wall -g -fexceptions `wx-config --cflags` +- -I/usr/include/wx-2.8 \ +- -DGTK_NO_CHECK_CASTS -D__WXGTK__ -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES ++CPPFLAGS = -Wall -g -fexceptions `wx-config --cflags` \ ++ -DGTK_NO_CHECK_CASTS -D__WXGTK__ -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES \ + -D_LARGEFILE_SOURCE=1 -DNO_GCC_PRAGMA -D_ESPEAKEDIT + + CXXFLAGS = -O2 -Wall -fexceptions `wx-config --cflags` \ diff --git a/pkgs/applications/audio/flac/default.nix b/pkgs/applications/audio/flac/default.nix index 1c8dc56de61c3f372637589c169e76cae3f430cb..fe4b43539d440ad3692c04d0046aa78f04b019b0 100644 --- a/pkgs/applications/audio/flac/default.nix +++ b/pkgs/applications/audio/flac/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ libogg ]; - doCheck = true; # takes lots of time but will be run rarely (small build-time closure) + #doCheck = true; # takes lots of time meta = with stdenv.lib; { homepage = http://xiph.org/flac/; diff --git a/pkgs/applications/audio/fluidsynth/default.nix b/pkgs/applications/audio/fluidsynth/default.nix index 89e95f62cd5f26627b077c75c8fdfa3c1fcc4266..8cba482194e55e1c9b343b214119bd844031b52f 100644 --- a/pkgs/applications/audio/fluidsynth/default.nix +++ b/pkgs/applications/audio/fluidsynth/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, glib, jackaudio, libsndfile, pkgconfig +{ stdenv, fetchurl, alsaLib, glib, jack2, libsndfile, pkgconfig , pulseaudio }: stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { "-framework CoreAudio"; buildInputs = [ glib libsndfile pkgconfig ] - ++ stdenv.lib.optionals (!stdenv.isDarwin) [ alsaLib pulseaudio jackaudio ]; + ++ stdenv.lib.optionals (!stdenv.isDarwin) [ alsaLib pulseaudio jack2 ]; meta = with stdenv.lib; { description = "Real-time software synthesizer based on the SoundFont 2 specifications"; diff --git a/pkgs/applications/audio/gmu/default.nix b/pkgs/applications/audio/gmu/default.nix index e75be3e2c2befa830a538a5b299b83acbf032a62..f23ba66a3b514703d24b032ca165a5ef071eb833 100644 --- a/pkgs/applications/audio/gmu/default.nix +++ b/pkgs/applications/audio/gmu/default.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://wejp.k.vu/projects/gmu; description = "Open source music player for portable gaming consoles and handhelds"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/applications/audio/gpodder/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..19b61ebc76d4e229334d85d33f14675fb2ce1908 --- /dev/null +++ b/pkgs/applications/audio/gpodder/default.nix @@ -0,0 +1,45 @@ +{ pkgs, stdenv, fetchurl, python, buildPythonPackage, pythonPackages, mygpoclient, intltool, + ipodSupport ? true, libgpod, gpodderHome ? "", gpodderDownloadDir ? "" }: + +with pkgs.lib; + +let + inherit (pythonPackages) coverage feedparser minimock sqlite3 dbus pygtk eyeD3; + +in buildPythonPackage rec { + name = "gpodder-3.7.0"; + + src = fetchurl { + url = "http://gpodder.org/src/${name}.tar.gz"; + sha256 = "fa90ef4bdd3fd9eef95404f7f43f70912ae3ab4f8d24078484a2f3e11b14dc47"; + }; + + buildInputs = [ coverage feedparser minimock sqlite3 mygpoclient intltool ]; + + propagatedBuildInputs = [ feedparser dbus mygpoclient sqlite3 pygtk eyeD3 ] + ++ stdenv.lib.optional ipodSupport libgpod; + + postPatch = "sed -ie 's/PYTHONPATH=src/PYTHONPATH=\$(PYTHONPATH):src/' makefile"; + + checkPhase = "make unittest"; + + preFixup = '' + wrapProgram $out/bin/gpodder \ + ${optionalString (gpodderHome != "") "--set GPODDER_HOME ${gpodderHome}"} \ + ${optionalString (gpodderDownloadDir != "") "--set GPODDER_DOWNLOAD_DIR ${gpodderDownloadDir}"} + ''; + + installPhase = "DESTDIR=/ PREFIX=$out make install"; + + meta = { + description = "A podcatcher written in python"; + longDescription = '' + gPodder downloads and manages free audio and video content (podcasts) + for you. Listen directly on your computer or on your mobile devices. + ''; + homepage = "http://gpodder.org/"; + license = "GPLv3"; + platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + maintainers = [ stdenv.lib.maintainers.skeidel ]; + }; +} diff --git a/pkgs/applications/audio/gtkpod/default.nix b/pkgs/applications/audio/gtkpod/default.nix index 90e27c12ce3b5b8829cbc3578cbea85abfaa9995..80a7cf52cd8d0674994fc866163e0270c870a3a0 100644 --- a/pkgs/applications/audio/gtkpod/default.nix +++ b/pkgs/applications/audio/gtkpod/default.nix @@ -1,25 +1,43 @@ -{ stdenv, fetchurl, pkgconfig, libgpod, gtk, glib, gettext, perl, perlXMLParser -, libglade, flex, libid3tag, libvorbis, intltool }: +{ stdenv, fetchurl, pkgconfig, makeWrapper, intltool, libgpod, curl, flac, + gnome3_12, gtk3, glib, gettext, perl, perlXMLParser , libglade, flex, libid3tag, + libvorbis, hicolor_icon_theme, gdk_pixbuf }: -stdenv.mkDerivation { - name = "gtkpod-1.0.0"; +let + gnome = gnome3_12; + +in stdenv.mkDerivation rec { + version = "2.1.4"; + name = "gtkpod-${version}"; src = fetchurl { - url = mirror://sourceforge/gtkpod/gtkpod-1.0.0.tar.gz; - sha256 = "04jzybs55c27kyp7r9c58prcq0q4ssvj5iggva857f49s1ar826q"; + url = "mirror://sourceforge/gtkpod/${name}.tar.gz"; + sha256 = "ba12b35f3f24a155b68f0ffdaf4d3c5c7d1b8df04843a53306e1c83fc811dfaa"; }; - buildInputs = [ pkgconfig libgpod gettext perl perlXMLParser gtk libglade flex - libid3tag libvorbis intltool ]; + propagatedUserEnvPkgs = [ gnome.gnome_themes_standard ]; + + buildInputs = [ pkgconfig makeWrapper intltool curl gettext perl perlXMLParser + flex libgpod libid3tag flac libvorbis gtk3 gdk_pixbuf libglade gnome.anjuta + gnome.gdl gnome.gnome_icon_theme_symbolic gnome.gnome_icon_theme + hicolor_icon_theme ]; patchPhase = '' sed -i 's/which/type -P/' scripts/*.sh ''; - meta = { + preFixup = '' + wrapProgram "$out/bin/gtkpod" \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" + ''; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { description = "GTK Manager for an Apple ipod"; homepage = http://gtkpod.sourceforge.net; - license = "GPLv2+"; - platforms = with stdenv.lib.platforms; linux; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = [ maintainers.skeidel ]; }; } diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix index 44b0e9ef0d796436115ccebad7c85b3b21aff599..777c0ddb2e35e54592d3151e5898c44e37e08c05 100644 --- a/pkgs/applications/audio/guitarix/default.nix +++ b/pkgs/applications/audio/guitarix/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, avahi, boost, fftw, gettext, glib, glibmm, gtk -, gtkmm, intltool, jackaudio, ladspaH, librdf, libsndfile, lv2 +, gtkmm, intltool, jack2, ladspaH, librdf, libsndfile, lv2 , pkgconfig, python }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - avahi boost fftw gettext glib glibmm gtk gtkmm intltool jackaudio + avahi boost fftw gettext glib glibmm gtk gtkmm intltool jack2 ladspaH librdf libsndfile lv2 pkgconfig python ]; diff --git a/pkgs/applications/audio/hydrogen/default.nix b/pkgs/applications/audio/hydrogen/default.nix index 74ff2a3407c483e54ee4abce124c854e040a16c8..10f15f5882cbd23b5458c313b663de61b70410fa 100644 --- a/pkgs/applications/audio/hydrogen/default.nix +++ b/pkgs/applications/audio/hydrogen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, boost, glib, jackaudio, ladspaPlugins +{ stdenv, fetchurl, alsaLib, boost, glib, jack2, ladspaPlugins , libarchive, liblrdf , libsndfile, pkgconfig, qt4, scons, subversion }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - alsaLib boost glib jackaudio ladspaPlugins libarchive liblrdf + alsaLib boost glib jack2 ladspaPlugins libarchive liblrdf libsndfile pkgconfig qt4 scons subversion ]; diff --git a/pkgs/applications/audio/id3v2/default.nix b/pkgs/applications/audio/id3v2/default.nix index a7835f020d14b1d4097f6a58d16e0f5c845e50e6..b96872c7ef0c304c4a4335833508b909bc5a85f3 100644 --- a/pkgs/applications/audio/id3v2/default.nix +++ b/pkgs/applications/audio/id3v2/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation rec { meta = { description = "A command line editor for id3v2 tags"; homepage = http://id3v2.sourceforge.net/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/applications/audio/ingen/default.nix b/pkgs/applications/audio/ingen/default.nix index 73138cc269d0428ea127df38ba5bb9059b14400e..ac46ff6140c19c123f7ec56be49b590e0620bf20 100644 --- a/pkgs/applications/audio/ingen/default.nix +++ b/pkgs/applications/audio/ingen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchsvn, boost, ganv, glibmm, gtk, gtkmm, jackaudio, lilv +{ stdenv, fetchsvn, boost, ganv, glibmm, gtk, gtkmm, jack2, lilv , lv2, pkgconfig, python, raul, serd, sord, sratom, suil }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - boost ganv glibmm gtk gtkmm jackaudio lilv lv2 pkgconfig python + boost ganv glibmm gtk gtkmm jack2 lilv lv2 pkgconfig python raul serd sord sratom suil ]; diff --git a/pkgs/applications/audio/jack-capture/default.nix b/pkgs/applications/audio/jack-capture/default.nix index 3b8f0f652a8b87e4b54d2db157bbd2f2b6bd9f4d..2e6f6b0dd828ea79c148b3236691043329b650cb 100644 --- a/pkgs/applications/audio/jack-capture/default.nix +++ b/pkgs/applications/audio/jack-capture/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jackaudio, libsndfile, pkgconfig }: +{ stdenv, fetchurl, jack2, libsndfile, pkgconfig }: stdenv.mkDerivation rec { name = "jack_capture-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0sk7b92my1v1g7rhkpl1c608rb0rdb28m9zqfll95kflxajd16zv"; }; - buildInputs = [ jackaudio libsndfile pkgconfig ]; + buildInputs = [ jack2 libsndfile pkgconfig ]; buildPhase = "PREFIX=$out make jack_capture"; diff --git a/pkgs/applications/audio/jack-oscrolloscope/default.nix b/pkgs/applications/audio/jack-oscrolloscope/default.nix index dbceb0a336c5cb76fee55dde9d5cc2dca8afdb41..7b4d12a5b877ce555af6acd14db7547793f2286b 100644 --- a/pkgs/applications/audio/jack-oscrolloscope/default.nix +++ b/pkgs/applications/audio/jack-oscrolloscope/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, SDL, jackaudio, mesa, pkgconfig }: +{ stdenv, fetchurl, SDL, jack2, mesa, pkgconfig }: stdenv.mkDerivation rec { name = "jack_oscrolloscope-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1pl55in0sj7h5r06n1v91im7d18pplvhbjhjm1fdl39zwnyxiash"; }; - buildInputs = [ SDL jackaudio mesa pkgconfig ]; + buildInputs = [ SDL jack2 mesa pkgconfig ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/applications/audio/jack-rack/default.nix b/pkgs/applications/audio/jack-rack/default.nix index 1d1128e663d33ff60973bbe64eb568947f5aac04..8ac47c570dfbe3639d016faf7ddd16f3c5e81553 100644 --- a/pkgs/applications/audio/jack-rack/default.nix +++ b/pkgs/applications/audio/jack-rack/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, pkgconfig, jackaudio, ladspaH, gtk, alsaLib, libxml2, librdf }: +{ stdenv, fetchurl, pkgconfig, jack2, ladspaH, gtk, alsaLib, libxml2, librdf }: stdenv.mkDerivation rec { name = "jack-rack-1.4.7"; src = fetchurl { url = "mirror://sourceforge/jack-rack/${name}.tar.bz2"; sha256 = "1lmibx9gicagcpcisacj6qhq6i08lkl5x8szysjqvbgpxl9qg045"; }; - buildInputs = [ pkgconfig jackaudio ladspaH gtk alsaLib libxml2 librdf ]; + buildInputs = [ pkgconfig jack2 ladspaH gtk alsaLib libxml2 librdf ]; meta = { description = ''An effects "rack" for the JACK low latency audio API''; diff --git a/pkgs/applications/audio/jackmeter/default.nix b/pkgs/applications/audio/jackmeter/default.nix index 98fcb8943af69f8f586b8496ab8e86fed890c457..74d98184d9dd7a28c32892f3359104abc4ffb68c 100644 --- a/pkgs/applications/audio/jackmeter/default.nix +++ b/pkgs/applications/audio/jackmeter/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jackaudio, pkgconfig }: +{ stdenv, fetchurl, jack2, pkgconfig }: stdenv.mkDerivation rec { name = "jackmeter-0.4"; @@ -8,12 +8,12 @@ stdenv.mkDerivation rec { sha256 = "1cnvgx3jv0yvxlqy0l9k285zgvazmh5k8m4l7lxckjfm5bn6hm1r"; }; - buildInputs = [ jackaudio pkgconfig ]; + buildInputs = [ jack2 pkgconfig ]; meta = { description = "Console jack loudness meter"; homepage = http://www.aelius.com/njh/jackmeter/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.marcweber ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/applications/audio/jalv/default.nix b/pkgs/applications/audio/jalv/default.nix index 2baf69cef4fdf89133ebc6ce1c4f166f634bcdeb..70ef5bdec5cb319b8641203bc4bcee9144b66242 100644 --- a/pkgs/applications/audio/jalv/default.nix +++ b/pkgs/applications/audio/jalv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gtk, jackaudio, lilv, lv2, pkgconfig, python +{ stdenv, fetchurl, gtk, jack2, lilv, lv2, pkgconfig, python , serd, sord , sratom, suil }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - gtk jackaudio lilv lv2 pkgconfig python serd sord sratom suil + gtk jack2 lilv lv2 pkgconfig python serd sord sratom suil ]; configurePhase = "python waf configure --prefix=$out"; diff --git a/pkgs/applications/audio/lash/default.nix b/pkgs/applications/audio/lash/default.nix index ad52e7b2d85c5d737b7650a399d6a0a785a84028..e42babf13ef837ebc4ee7160f61b40ec5279b368 100644 --- a/pkgs/applications/audio/lash/default.nix +++ b/pkgs/applications/audio/lash/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, gtk, jackaudio, libuuid, libxml2 +{ stdenv, fetchurl, alsaLib, gtk, jack2, libuuid, libxml2 , makeWrapper, pkgconfig, readline }: assert libuuid != null; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { # http://permalink.gmane.org/gmane.linux.redhat.fedora.extras.cvs/822346 patches = [ ./socket.patch ./gcc-47.patch ]; - buildInputs = [ alsaLib gtk jackaudio libuuid libxml2 makeWrapper + buildInputs = [ alsaLib gtk jack2 libuuid libxml2 makeWrapper pkgconfig readline ]; postInstall = '' diff --git a/pkgs/applications/audio/lastwatch/default.nix b/pkgs/applications/audio/lastwatch/default.nix index c09d397eefa38a946bee4289a7d8b5669f118de8..2cffb0ebacf4a5b9e3a50819d19ff9a48dc48be1 100644 --- a/pkgs/applications/audio/lastwatch/default.nix +++ b/pkgs/applications/audio/lastwatch/default.nix @@ -23,5 +23,6 @@ pythonPackages.buildPythonPackage rec { homepage = "https://github.com/aszlig/LastWatch"; description = "An inotify-based last.fm audio scrobbler"; license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/audio/lingot/default.nix b/pkgs/applications/audio/lingot/default.nix index 4b8ba4dbc242e7bd1eb9d4915ace68ecf65173cb..4b07c84b0be8c8e76fe438d47b389bef59cd0cee 100644 --- a/pkgs/applications/audio/lingot/default.nix +++ b/pkgs/applications/audio/lingot/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { meta = { description = "Not a Guitar-Only tuner"; homepage = http://www.nongnu.org/lingot/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = with stdenv.lib.platforms; linux; maintainers = with stdenv.lib.maintainers; [viric]; }; diff --git a/pkgs/applications/audio/linuxsampler/default.nix b/pkgs/applications/audio/linuxsampler/default.nix index 1408a1775ee59e7e4a80b7dddd8788b301c7f7ab..2c4b26543ebb354a26ba004cf86519aae9c57b38 100644 --- a/pkgs/applications/audio/linuxsampler/default.nix +++ b/pkgs/applications/audio/linuxsampler/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchsvn, alsaLib, asio, autoconf, automake, bison -, jackaudio, libgig, libsndfile, libtool, lv2, pkgconfig }: +, jack2, libgig, libsndfile, libtool, lv2, pkgconfig }: stdenv.mkDerivation rec { name = "linuxsampler-svn-${version}"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; buildInputs = [ - alsaLib asio autoconf automake bison jackaudio libgig libsndfile + alsaLib asio autoconf automake bison jack2 libgig libsndfile libtool lv2 pkgconfig ]; diff --git a/pkgs/applications/audio/lmms/default.nix b/pkgs/applications/audio/lmms/default.nix index 5195ddd42a139044f59c734c0dc90b03107ae888..dd0649811bbbc9bd21aa5ae57cec8fd77934dd26 100644 --- a/pkgs/applications/audio/lmms/default.nix +++ b/pkgs/applications/audio/lmms/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, SDL, alsaLib, cmake, fftwSinglePrec, jackaudio, libogg -, libsamplerate, libsndfile, pkgconfig, pulseaudio, qt4 +{ stdenv, fetchurl, SDL, alsaLib, cmake, fftwSinglePrec, jack2, libogg +, libsamplerate, libsndfile, pkgconfig, pulseaudio, qt4, freetype }: stdenv.mkDerivation rec { @@ -12,10 +12,15 @@ stdenv.mkDerivation rec { }; buildInputs = [ - SDL alsaLib cmake fftwSinglePrec jackaudio libogg libsamplerate + SDL alsaLib cmake fftwSinglePrec jack2 libogg libsamplerate libsndfile pkgconfig pulseaudio qt4 ]; + # work around broken build system of 0.4.* + NIX_CFLAGS_COMPILE = "-I${freetype}/include/freetype2"; + + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "Linux MultiMedia Studio"; homepage = "http://lmms.sourceforge.net"; diff --git a/pkgs/applications/audio/mhwaveedit/default.nix b/pkgs/applications/audio/mhwaveedit/default.nix index a8287b10a298208fb894f3d0f271dc63318496d5..a1e81be3cb37ec86a85d8c534cb5052cdecb24d3 100644 --- a/pkgs/applications/audio/mhwaveedit/default.nix +++ b/pkgs/applications/audio/mhwaveedit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, SDL , alsaLib, gtk, jackaudio, ladspaH +{ stdenv, fetchurl, SDL , alsaLib, gtk, jack2, ladspaH , ladspaPlugins, libsamplerate, libsndfile, pkgconfig, pulseaudio }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; buildInputs = - [ SDL alsaLib gtk jackaudio ladspaH libsamplerate libsndfile + [ SDL alsaLib gtk jack2 ladspaH libsamplerate libsndfile pkgconfig pulseaudio ]; diff --git a/pkgs/applications/audio/mikmod/default.nix b/pkgs/applications/audio/mikmod/default.nix index a86e09278c3cbef05ecce3d8654beae19eb7056f..f38ff4697313464e88e27d5fc94a9b8a8a7d02de 100644 --- a/pkgs/applications/audio/mikmod/default.nix +++ b/pkgs/applications/audio/mikmod/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = { description = "Tracker music player for the terminal"; homepage = http://mikmod.shlomifish.org/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [ viric ]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/audio/milkytracker/default.nix b/pkgs/applications/audio/milkytracker/default.nix index 965c941113c39320d257f37f4fe9eb7c7bc98734..eadbaabcf56043bf6dffeb5c5e35ca57e119f3fd 100644 --- a/pkgs/applications/audio/milkytracker/default.nix +++ b/pkgs/applications/audio/milkytracker/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, SDL, alsaLib, autoconf, automake, jackaudio, perl +{ stdenv, fetchurl, SDL, alsaLib, autoconf, automake, jack2, perl , zlib, zziplib }: @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { export CPATH=${zlib}/lib ''; - buildInputs = [ SDL alsaLib autoconf automake jackaudio perl zlib zziplib ]; + buildInputs = [ SDL alsaLib autoconf automake jack2 perl zlib zziplib ]; meta = { description = "Music tracker application, similar to Fasttracker II."; diff --git a/pkgs/applications/audio/mixxx/default.nix b/pkgs/applications/audio/mixxx/default.nix index b76eecc9e4ad3c1c46f206a5ed8078537edc22d9..e3422d4ba06945e3a0f5045b8408570bf5d51e5a 100644 --- a/pkgs/applications/audio/mixxx/default.nix +++ b/pkgs/applications/audio/mixxx/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { buildPhase = '' runHook preBuild - ensureDir "$out" + mkdir -p "$out" scons \ -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES \ $sconsFlags "prefix=$out" diff --git a/pkgs/applications/audio/moc/default.nix b/pkgs/applications/audio/moc/default.nix index c5a33796ca52a3bd07f654454930f48bb8c4f93f..e5264f5c3d2f9ef9119900d16a5cd7046e99780b 100644 --- a/pkgs/applications/audio/moc/default.nix +++ b/pkgs/applications/audio/moc/default.nix @@ -1,4 +1,7 @@ -{ stdenv, fetchurl, ncurses, pkgconfig, alsaLib, flac, libmad, speex, ffmpeg, libvorbis, mpc, libsndfile, jackaudio, db, libmodplug, timidity, libid3tag, libtool }: +{ stdenv, fetchurl, ncurses, pkgconfig, alsaLib, flac, libmad, speex, ffmpeg +, libvorbis, mpc, libsndfile, jack2, db, libmodplug, timidity, libid3tag +, libtool +}: stdenv.mkDerivation rec { name = "moc-${version}"; @@ -11,7 +14,10 @@ stdenv.mkDerivation rec { configurePhase = "./configure prefix=$out"; - buildInputs = [ ncurses pkgconfig alsaLib flac libmad speex ffmpeg libvorbis mpc libsndfile jackaudio db libmodplug timidity libid3tag libtool ]; + buildInputs = [ + ncurses pkgconfig alsaLib flac libmad speex ffmpeg libvorbis + mpc libsndfile jack2 db libmodplug timidity libid3tag libtool + ]; meta = { description = "MOC (music on console) is a console audio player for LINUX/UNIX designed to be powerful and easy to use."; diff --git a/pkgs/applications/audio/mopidy-moped/default.nix b/pkgs/applications/audio/mopidy-moped/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..8e3489a912233e7839a8a2769c4483b5624cb849 --- /dev/null +++ b/pkgs/applications/audio/mopidy-moped/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, pythonPackages, mopidy }: + +pythonPackages.buildPythonPackage rec { + name = "mopidy-moped-${version}"; + + version = "0.3.1"; + + src = fetchurl { + url = "https://github.com/martijnboland/moped/archive/v${version}.tar.gz"; + sha256 = "0sjp8vr4yfyjx233gamhg0p67zjnlpc9yq3szbw897igsh23j2yr"; + }; + + propagatedBuildInputs = [ mopidy ]; + + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://github.com/martijnboland/moped; + description = "A web client for Mopidy"; + license = licenses.mit; + maintainers = [ maintainers.rickynils ]; + hydraPlatforms = []; + }; +} diff --git a/pkgs/applications/audio/mopidy-spotify/default.nix b/pkgs/applications/audio/mopidy-spotify/default.nix index 5c78ef6ba14cb667daea04f5c54a34e982960061..6223ffb0d81f709b2415b594b982efedafdaa2d3 100644 --- a/pkgs/applications/audio/mopidy-spotify/default.nix +++ b/pkgs/applications/audio/mopidy-spotify/default.nix @@ -3,11 +3,11 @@ pythonPackages.buildPythonPackage rec { name = "mopidy-spotify-${version}"; - version = "1.1.3"; + version = "1.2.0"; src = fetchurl { url = "https://github.com/mopidy/mopidy-spotify/archive/v${version}.tar.gz"; - sha256 = "09s6841qb24nrmlc2izb8vxbgv185ddra6ndskrsw907hfli2kl6"; + sha256 = "1fgxakylsx0nggis11v6bxfy8h3dl1n1v86liyfcj0xazb1mx69m"; }; propagatedBuildInputs = [ mopidy pythonPackages.pyspotify ]; diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix index 65487bac8232575179e90aec5502a18f5c1b548f..10c7c1751ff8b54fdb010e6513e58d00fe41809b 100644 --- a/pkgs/applications/audio/mopidy/default.nix +++ b/pkgs/applications/audio/mopidy/default.nix @@ -5,15 +5,15 @@ pythonPackages.buildPythonPackage rec { name = "mopidy-${version}"; - version = "0.18.3"; + version = "0.19.0"; src = fetchurl { url = "https://github.com/mopidy/mopidy/archive/v${version}.tar.gz"; - sha256 = "0b8ss6qjzj1pawd8469i5310ily3rad0ashfy87vdyj6xdyfyp0q"; + sha256 = "10cnc1bipr0brk7478201cgm71lp5bci3qiaadyxv9hhcn0nmn9b"; }; propagatedBuildInputs = with pythonPackages; [ - gst_python pygobject pykka cherrypy ws4py gst_plugins_base gst_plugins_good + gst_python pygobject pykka tornado gst_plugins_base gst_plugins_good ]; # There are no tests diff --git a/pkgs/applications/audio/mp3info/default.nix b/pkgs/applications/audio/mp3info/default.nix index d5a8138a50014870de011d4fef2a56be7982c144..0f33726eaeed239c5d1694a48c3754b5aa64f227 100644 --- a/pkgs/applications/audio/mp3info/default.nix +++ b/pkgs/applications/audio/mp3info/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { homepage = http://www.ibiblio.org/mp3info/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/applications/audio/mpc/default.nix b/pkgs/applications/audio/mpc/default.nix index ae6d9e0c7e6041acb4d821970041d61419ffe419..54ae5476efddb8cd259522a909f330fd77e51e00 100755 --- a/pkgs/applications/audio/mpc/default.nix +++ b/pkgs/applications/audio/mpc/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { description = "A minimalist command line interface to MPD"; homepage = http://www.musicpd.org/clients/mpc/; - license = "GPL2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.algorith ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/applications/audio/mpc123/default.nix b/pkgs/applications/audio/mpc123/default.nix index 2f00638961c3d5ca9595333954af867ee6932f02..cd4343b1beb4a3507dd953ff8fa8145001c2cdcb 100644 --- a/pkgs/applications/audio/mpc123/default.nix +++ b/pkgs/applications/audio/mpc123/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { description = "mpc123, a Musepack (.mpc) audio player"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ ]; platforms = stdenv.lib.platforms.gnu; # arbitrary choice diff --git a/pkgs/applications/audio/mpg321/default.nix b/pkgs/applications/audio/mpg321/default.nix index ffec1a5736c3ff3a8c9510fdbe5d62d38aa449e0..e58397350cb1e8f81b1e454eac2f2ed21ae10913 100644 --- a/pkgs/applications/audio/mpg321/default.nix +++ b/pkgs/applications/audio/mpg321/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "mpg321, a command-line MP3 player"; homepage = http://mpg321.sourceforge.net/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ ]; platforms = stdenv.lib.platforms.gnu; }; diff --git a/pkgs/applications/audio/ncmpc/default.nix b/pkgs/applications/audio/ncmpc/default.nix index 937a030f3e537e51f88e92790af963536767f4ea..94fa50a88836a27785d632dc110530b2d67891a2 100755 --- a/pkgs/applications/audio/ncmpc/default.nix +++ b/pkgs/applications/audio/ncmpc/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, glib, ncurses, mpd_clientlib, libintlOrEmpty }: stdenv.mkDerivation rec { - version = "0.22"; + version = "0.23"; name = "ncmpc-${version}"; src = fetchurl { url = "http://www.musicpd.org/download/ncmpc/0/ncmpc-${version}.tar.xz"; - sha256 = "a8d65f12653d9ce8bc4493aa1c5de09359c25bf3a22498d2ae797e7d41422211"; + sha256 = "d7b30cefaf5c74a5d8ab18ab8275e0102ae12e8ee6d6f8144f8e4cc9a97b5de4"; }; buildInputs = [ pkgconfig glib ncurses mpd_clientlib ] diff --git a/pkgs/applications/audio/pavucontrol/default.nix b/pkgs/applications/audio/pavucontrol/default.nix index 02a27bedb67f3f747212878f68636330687455a3..ca08624e98f3641f437773aab40c984ba2427743 100644 --- a/pkgs/applications/audio/pavucontrol/default.nix +++ b/pkgs/applications/audio/pavucontrol/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { homepage = http://freedesktop.org/software/pulseaudio/pavucontrol/ ; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ ]; platforms = stdenv.lib.platforms.gnu; # arbitrary choice diff --git a/pkgs/applications/audio/petrifoo/default.nix b/pkgs/applications/audio/petrifoo/default.nix index 2e53a22bff3b4d805e9d14606d129aa0052e205e..152ee442761e834e90003ab21f360d8904908265 100644 --- a/pkgs/applications/audio/petrifoo/default.nix +++ b/pkgs/applications/audio/petrifoo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, alsaLib, cmake, gtk, jackaudio, libgnomecanvas +{ stdenv, fetchgit, alsaLib, cmake, gtk, jack2, libgnomecanvas , libpthreadstubs, libsamplerate, libsndfile, libtool, libxml2 , pkgconfig }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = - [ alsaLib cmake gtk jackaudio libgnomecanvas libpthreadstubs + [ alsaLib cmake gtk jack2 libgnomecanvas libpthreadstubs libsamplerate libsndfile libtool libxml2 pkgconfig ]; diff --git a/pkgs/applications/audio/praat/default.nix b/pkgs/applications/audio/praat/default.nix index b8a283125fc468ec79168df251ee4d1e30cd020f..86c68d087b7724d43ab746d7beec695902352572 100644 --- a/pkgs/applications/audio/praat/default.nix +++ b/pkgs/applications/audio/praat/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { ''; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin cp praat $out/bin ''; @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = { description = "Doing phonetics by computer"; homepage = http://www.fon.hum.uva.nl/praat/; - license = "GPLv2+"; # Has some 3rd-party code in it though + license = stdenv.lib.licenses.gpl2Plus; # Has some 3rd-party code in it though platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/audio/projectm/default.nix b/pkgs/applications/audio/projectm/default.nix index 2dd251ddd5bdea7dfcc736032c15e810aaa34238..508b6743cc396ee1ccca54e528f3075fb91035d9 100644 --- a/pkgs/applications/audio/projectm/default.nix +++ b/pkgs/applications/audio/projectm/default.nix @@ -2,7 +2,7 @@ , glew, ftgl, ttf_bitstream_vera , withQt ? true, qt4 , withLibvisual ? false, libvisual, SDL -, withJack ? false, jackaudio +, withJack ? false, jack2 , withPulseAudio ? true, pulseaudio }: @@ -45,7 +45,7 @@ stdenv.mkDerivation { [ glew ftgl ] ++ optional withQt qt4 ++ optionals withLibvisual [ libvisual SDL ] - ++ optional withJack jackaudio + ++ optional withJack jack2 ++ optional withPulseAudio pulseaudio ; } diff --git a/pkgs/applications/audio/puredata/default.nix b/pkgs/applications/audio/puredata/default.nix index d0394b72eddc8ea7cbaf1532025d89b59a8f61e6..9abca0cb0141e382f794ec68981abd5eaf963960 100644 --- a/pkgs/applications/audio/puredata/default.nix +++ b/pkgs/applications/audio/puredata/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, autoreconfHook, gettext, makeWrapper -, alsaLib, jackaudio, tk +, alsaLib, jack2, tk }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook gettext makeWrapper ]; - buildInputs = [ alsaLib jackaudio ]; + buildInputs = [ alsaLib jack2 ]; configureFlags = '' --enable-alsa diff --git a/pkgs/applications/audio/qjackctl/default.nix b/pkgs/applications/audio/qjackctl/default.nix index dcb2a1b48e6069f94aa504d3ed230d67d3350515..ba875255d4a0e6a2ca2ced32e3714df92067c5a2 100644 --- a/pkgs/applications/audio/qjackctl/default.nix +++ b/pkgs/applications/audio/qjackctl/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchurl, qt4, alsaLib, jackaudio, dbus }: +{ stdenv, fetchurl, qt4, alsaLib, jack2, dbus }: stdenv.mkDerivation rec { - version = "0.3.10"; + version = "0.3.11"; name = "qjackctl-${version}"; # some dependencies such as killall have to be installed additionally src = fetchurl { url = "mirror://sourceforge/qjackctl/${name}.tar.gz"; - sha256 = "0ch14y3p0x5ss28cpnqcxp42zb2w07d3l1n2sbrkgiz58iy97paw"; + sha256 = "1wjzrgx3n2asyxk6cnfcm34msaw84qvsqy08bd4qnghrgpl96hwl"; }; - buildInputs = [ qt4 alsaLib jackaudio dbus ]; + buildInputs = [ qt4 alsaLib jack2 dbus ]; configureFlags = "--enable-jack-version"; diff --git a/pkgs/applications/audio/qsynth/default.nix b/pkgs/applications/audio/qsynth/default.nix index 05e6da223dad04f19ebaaf6bcd36e04b868674fd..a5d0e7e621e25de4f725703fb88cba22419b2707 100644 --- a/pkgs/applications/audio/qsynth/default.nix +++ b/pkgs/applications/audio/qsynth/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, fluidsynth, jackaudio, qt4 }: +{ stdenv, fetchurl, alsaLib, fluidsynth, jack2, qt4 }: stdenv.mkDerivation rec { name = "qsynth-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0wmq61cq93x2l00xwr871373mj3dwamz1dg6v62x7s8m1612ndrw"; }; - buildInputs = [ alsaLib fluidsynth jackaudio qt4 ]; + buildInputs = [ alsaLib fluidsynth jack2 qt4 ]; meta = with stdenv.lib; { description = "Fluidsynth GUI"; diff --git a/pkgs/applications/audio/qtractor/default.nix b/pkgs/applications/audio/qtractor/default.nix index a15cf2550407fa730f83263de280db8e4b3f424c..4177dbeeb0cb142a1f7ef06e48c241906dc3ee1a 100644 --- a/pkgs/applications/audio/qtractor/default.nix +++ b/pkgs/applications/audio/qtractor/default.nix @@ -1,18 +1,18 @@ -{ alsaLib, autoconf, automake, dssi, fetchurl, gtk, jackaudio +{ alsaLib, autoconf, automake, dssi, fetchurl, gtk, jack2 , ladspaH, ladspaPlugins, liblo, libmad, libsamplerate, libsndfile , libtool, libvorbis, pkgconfig, qt4, rubberband, stdenv }: stdenv.mkDerivation rec { - version = "0.6.1"; + version = "0.6.2"; name = "qtractor-${version}"; src = fetchurl { url = "mirror://sourceforge/qtractor/${name}.tar.gz"; - sha256 = "09lyz1pn2dadr1ii2msyv3n13kq3mbgpcwcyfm0brm01c2fnh6wc"; + sha256 = "08cr4lgm8bkkmsvfljszcqij3i52n989s7ncrbrn17n61rmgf8yw"; }; buildInputs = - [ alsaLib autoconf automake dssi gtk jackaudio ladspaH + [ alsaLib autoconf automake dssi gtk jack2 ladspaH ladspaPlugins liblo libmad libsamplerate libsndfile libtool libvorbis pkgconfig qt4 rubberband ]; diff --git a/pkgs/applications/audio/rakarrack/default.nix b/pkgs/applications/audio/rakarrack/default.nix index ba84fe5eaec2509775fbcc19d88157997f884140..257a9967a5b01a15f20629823fb10c784f22881c 100644 --- a/pkgs/applications/audio/rakarrack/default.nix +++ b/pkgs/applications/audio/rakarrack/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, alsaUtils, fltk, jackaudio, libXft, +{ stdenv, fetchurl, alsaLib, alsaUtils, fltk, jack2, libXft, libXpm, libjpeg, libpng, libsamplerate, libsndfile, zlib }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { patches = [ ./fltk-path.patch ]; - buildInputs = [ alsaLib alsaUtils fltk jackaudio libXft libXpm libjpeg + buildInputs = [ alsaLib alsaUtils fltk jack2 libXft libXpm libjpeg libpng libsamplerate libsndfile zlib ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/audio/samplv1/default.nix b/pkgs/applications/audio/samplv1/default.nix index c201536ed347fcec6d79d4bc277cee5443b888c7..0cbdfa6973db3fa816b2fbbbcb178767dc59c23d 100644 --- a/pkgs/applications/audio/samplv1/default.nix +++ b/pkgs/applications/audio/samplv1/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchurl, jackaudio, libsndfile, lv2, qt4 }: +{ stdenv, fetchurl, jack2, libsndfile, lv2, qt4 }: stdenv.mkDerivation rec { name = "samplv1-${version}"; - version = "0.4.2"; + version = "0.5.0"; src = fetchurl { url = "mirror://sourceforge/samplv1/${name}.tar.gz"; - sha256 = "1vr6jbqnsgdq3v2h1ndp4pirnil3119dqwlq0k0kdscmcskvb9j4"; + sha256 = "02mm5y1yzklvs5bpxl86y3dqcg7migfybmin8llk91pws6rl9b41"; }; - buildInputs = [ jackaudio libsndfile lv2 qt4 ]; + buildInputs = [ jack2 libsndfile lv2 qt4 ]; meta = with stdenv.lib; { description = "An old-school all-digital polyphonic sampler synthesizer with stereo fx"; diff --git a/pkgs/applications/audio/seq24/default.nix b/pkgs/applications/audio/seq24/default.nix index 9f168f54eafdd2a1266f783bbeefd43e92b954c9..10376e02f4330f78571a73f5879e0bf64f71ffcc 100644 --- a/pkgs/applications/audio/seq24/default.nix +++ b/pkgs/applications/audio/seq24/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, gtkmm, jackaudio, pkgconfig }: +{ stdenv, fetchurl, alsaLib, gtkmm, jack2, pkgconfig }: stdenv.mkDerivation rec { name = "seq24-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "07n80zj95i80vjmsflnlbqx5vv90qmp5f6a0zap8d30849l4y258"; }; - buildInputs = [ alsaLib gtkmm jackaudio pkgconfig ]; + buildInputs = [ alsaLib gtkmm jack2 pkgconfig ]; meta = with stdenv.lib; { description = "minimal loop based midi sequencer"; diff --git a/pkgs/applications/audio/setbfree/default.nix b/pkgs/applications/audio/setbfree/default.nix index 0d5b69297538217a3e45861df0dac9a767e93840..5119c384cf6a8c5c0443f4bbb689b779f4dbf0f7 100644 --- a/pkgs/applications/audio/setbfree/default.nix +++ b/pkgs/applications/audio/setbfree/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, freetype, ftgl, jackaudio, libX11, lv2 +{ stdenv, fetchurl, alsaLib, freetype, ftgl, jack2, libX11, lv2 , mesa, pkgconfig, ttf_bitstream_vera }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; buildInputs = [ - alsaLib freetype ftgl jackaudio libX11 lv2 mesa pkgconfig + alsaLib freetype ftgl jack2 libX11 lv2 mesa pkgconfig ttf_bitstream_vera ]; diff --git a/pkgs/applications/audio/sonic-visualiser/default.nix b/pkgs/applications/audio/sonic-visualiser/default.nix index 7704397e6d0a7622a75dbd0c4fb3b311eadc495f..42c390620427b0c0486a899dda61107ca7a42cb7 100644 --- a/pkgs/applications/audio/sonic-visualiser/default.nix +++ b/pkgs/applications/audio/sonic-visualiser/default.nix @@ -1,6 +1,6 @@ # TODO add plugins having various licenses, see http://www.vamp-plugins.org/download.html -{ stdenv, fetchurl, alsaLib, bzip2, fftw, jackaudio, libX11, liblo +{ stdenv, fetchurl, alsaLib, bzip2, fftw, jack2, libX11, liblo , libmad, libogg, librdf, librdf_raptor, librdf_rasqal, libsamplerate , libsndfile, pkgconfig, pulseaudio, qt5, redland , rubberband, serd, sord, vampSDK @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { sord pkgconfig # optional - jackaudio + jack2 # portaudio pulseaudio libmad diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index 59bea8fc19448efbe4ed29436a36b143db1e2cc3..59b82d155da9ff22cd42ebd87e265570519d6fa5 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -8,14 +8,14 @@ assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; let version = if stdenv.system == "i686-linux" then "0.9.4.183.g644e24e.428" - else "0.9.10.17.g4129e1c.78"; + else "0.9.11.27.g2b1a638.81"; qt4webkit = if stdenv.system == "i686-linux" then fetchurl { name = "libqtwebkit4_2.3.2_i386.deb"; url = http://ie.archive.ubuntu.com/ubuntu/pool/main/q/qtwebkit-source/libqtwebkit4_2.3.2-0ubuntu7_i386.deb; - sha256 = "0hi6cwx2b2cwa4nv5phqqw526lc8p9x7kjkcza9x47ny3npw2924"; + sha256 = "0q4abhczx91ma57fjss0gn8j6nkfbfsbsh6kxhykzj88dih2s8rn"; } else fetchurl { @@ -73,7 +73,7 @@ stdenv.mkDerivation { else if stdenv.system == "x86_64-linux" then fetchurl { url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client_${version}-1_amd64.deb"; - sha256 = "1a4vn2ij3nghnc0fq3nsyb95gwhaw4zabdq6jd52hxz8iv31pn1z"; + sha256 = "0yfljiw01kssj3qaz8m0ppgrpjs6xrhzlr2wccp64bsnmin7g4sg"; } else throw "Spotify not supported on this platform."; @@ -149,7 +149,7 @@ stdenv.mkDerivation { meta = { homepage = https://www.spotify.com/; description = "Spotify for Linux allows you to play music from the Spotify music service"; - license = "unfree"; + license = stdenv.lib.licenses.unfree; maintainers = [ stdenv.lib.maintainers.eelco ]; }; } diff --git a/pkgs/applications/audio/synthv1/default.nix b/pkgs/applications/audio/synthv1/default.nix index d1c2230cf16da81cc570b00892b40062d1728e07..c6c464b9ad7024e82fcc84f78d0ea41b95d79d58 100644 --- a/pkgs/applications/audio/synthv1/default.nix +++ b/pkgs/applications/audio/synthv1/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchurl, qt4, jackaudio, lv2 }: +{ stdenv, fetchurl, qt4, jack2, lv2 }: stdenv.mkDerivation rec { name = "synthv1-${version}"; - version = "0.4.2"; + version = "0.5.0"; src = fetchurl { url = "mirror://sourceforge/synthv1/${name}.tar.gz"; - sha256 = "1r4fszbzwd0yfcch0mcsmh7781zw1317hiljn85w79721fs2m8hc"; + sha256 = "011kjccrdwb62rpck5gb8h4kvvm8rk6n77lj78ykxz4pxip5hf14"; }; - buildInputs = [ qt4 jackaudio lv2 ]; + buildInputs = [ qt4 jack2 lv2 ]; meta = with stdenv.lib; { description = "An old-school 4-oscillator subtractive polyphonic synthesizer with stereo fx"; diff --git a/pkgs/applications/audio/vimpc/default.nix b/pkgs/applications/audio/vimpc/default.nix new file mode 100755 index 0000000000000000000000000000000000000000..3e365cae8e944770cd4d959914b521b7775a0c36 --- /dev/null +++ b/pkgs/applications/audio/vimpc/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl, autoconf, automake, mpd_clientlib, ncurses, pcre, pkgconfig, taglib }: + +stdenv.mkDerivation rec { + version = "0.09.0"; + name = "vimpc-${version}"; + + src = fetchurl { + url = "https://github.com/boysetsfrog/vimpc/archive/v${version}.tar.gz"; + sha256 = "13eb229a5e9eee491765ee89f7fe6a38140a41a01434b117da3869d725c15706"; + }; + + buildInputs = [ autoconf + automake + mpd_clientlib + ncurses + pcre + pkgconfig + taglib + ]; + + preConfigure = "./autogen.sh"; + + postInstall = '' + mkdir -p $out/etc + cp doc/vimpcrc.example $out/etc + ''; + + meta = { + description = "A vi/vim inspired client for the Music Player Daemon (mpd)."; + homepage = https://github.com/boysetsfrog/vimpc; + license = "GPL3"; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/audio/vmpk/default.nix b/pkgs/applications/audio/vmpk/default.nix index 7fffa77b5a399d19833c69c687df120d67933feb..9a75fa5f383134ad4dad691044b178daf6bfe57e 100644 --- a/pkgs/applications/audio/vmpk/default.nix +++ b/pkgs/applications/audio/vmpk/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, pkgconfig -, qt4, jackaudio +, qt4, jack2 }: let @@ -22,5 +22,5 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ qt4 jackaudio ]; + buildInputs = [ qt4 jack2 ]; } diff --git a/pkgs/applications/audio/vorbis-tools/default.nix b/pkgs/applications/audio/vorbis-tools/default.nix index 5db7cc30cf8ca2992f7ed05abbba229cc7d97100..e4e5b7ff81a3d8b2e8b7bb34191dc1fe052c716b 100644 --- a/pkgs/applications/audio/vorbis-tools/default.nix +++ b/pkgs/applications/audio/vorbis-tools/default.nix @@ -16,6 +16,6 @@ stdenv.mkDerivation { files, notably the `ogg123' player and the `oggenc' encoder. ''; homepage = http://xiph.org/vorbis/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/applications/audio/xsynth-dssi/default.nix b/pkgs/applications/audio/xsynth-dssi/default.nix index 0cfbfb4c9bd16006739d17bebcc6bdb1c14cfcb4..85e7235400b29f31e2a7270565ca86c67ea485cf 100644 --- a/pkgs/applications/audio/xsynth-dssi/default.nix +++ b/pkgs/applications/audio/xsynth-dssi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, autoconf, automake, dssi, gtk, jackaudio, +{ stdenv, fetchurl, alsaLib, autoconf, automake, dssi, gtk, jack2, ladspaH, ladspaPlugins, liblo, pkgconfig }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "00nwv2pqjbmxqdc6xdm0cljq6z05lv4y6bibmhz1kih9lm0lklnk"; }; - buildInputs = [ alsaLib autoconf automake dssi gtk jackaudio ladspaH + buildInputs = [ alsaLib autoconf automake dssi gtk jack2 ladspaH ladspaPlugins liblo pkgconfig ]; installPhase = '' diff --git a/pkgs/applications/audio/yoshimi/default.nix b/pkgs/applications/audio/yoshimi/default.nix index df0b98cdd9e49287062ffb2857b1b00b2b785080..91142691055bb9c4a0e8027e4089e5f3fbd2c8b8 100644 --- a/pkgs/applications/audio/yoshimi/default.nix +++ b/pkgs/applications/audio/yoshimi/default.nix @@ -1,20 +1,20 @@ { stdenv, fetchurl, alsaLib, boost, cairo, cmake, fftwSinglePrec, fltk -, jackaudio, libsndfile, mesa, minixml, pkgconfig, zlib +, jack2, libsndfile, mesa, minixml, pkgconfig, zlib }: assert stdenv ? glibc; stdenv.mkDerivation rec { name = "yoshimi-${version}"; - version = "1.2.0"; + version = "1.2.2"; src = fetchurl { url = "mirror://sourceforge/yoshimi/${name}.tar.bz2"; - sha256 = "0p4v39kxxzzfvaazzxarx54i164ghpfxq0ljkavlgr8fnix5v3mx"; + sha256 = "1w23ral1qrbg9gqx833giqmchx7952f18yaa52aya9shsdlla83c"; }; buildInputs = [ - alsaLib boost cairo fftwSinglePrec fltk jackaudio libsndfile mesa + alsaLib boost cairo fftwSinglePrec fltk jack2 libsndfile mesa minixml zlib ]; diff --git a/pkgs/applications/audio/zynaddsubfx/default.nix b/pkgs/applications/audio/zynaddsubfx/default.nix index cd30b5b308471cdeb2b9aba5385bb08ed0e5ebbf..a5aa7d5c8d95d83f0357cd3138194324a331b486 100644 --- a/pkgs/applications/audio/zynaddsubfx/default.nix +++ b/pkgs/applications/audio/zynaddsubfx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, cmake, jackaudio, fftw, fltk13, minixml +{ stdenv, fetchurl, alsaLib, cmake, jack2, fftw, fltk13, minixml , pkgconfig, zlib }: @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0kgmwyh4rhyqdfrdzhbzjjk2hzggkp9c4aac6sy3xv6cc1b5jjxq"; }; - buildInputs = [ alsaLib jackaudio fftw fltk13 minixml zlib ]; + buildInputs = [ alsaLib jack2 fftw fltk13 minixml zlib ]; nativeBuildInputs = [ cmake pkgconfig ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/display-managers/slim/default.nix b/pkgs/applications/display-managers/slim/default.nix index 26500939db8147085926c7a0c72fb60ba7f01db0..42d2c777aea209a7687a75bbe3cf1b3d84008210 100644 --- a/pkgs/applications/display-managers/slim/default.nix +++ b/pkgs/applications/display-managers/slim/default.nix @@ -24,6 +24,8 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DUSE_PAM=1" ]; + NIX_CFLAGS_COMPILE = "-I${freetype}/include/freetype"; + enableParallelBuilding = true; buildInputs = diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index 725b4520e6998041209e583a35e995b852694153..51844f641794f8bb6607466d59e419c87951f554 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -43,8 +43,8 @@ in stdenv.mkDerivation rec { phases = [ "installPhase" ]; installPhase = '' - ensureDir $out/share/atom - ensureDir $out/bin + mkdir -p $out/share/atom + mkdir -p $out/bin tar -C $out/share/atom -xvf $src patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ $out/share/atom/atom diff --git a/pkgs/applications/editors/bvi/default.nix b/pkgs/applications/editors/bvi/default.nix index 84b810bf46025fc39e60f9114303827ec3f2ff6b..e598fa19c5ea82d91f975d5278591a957a83dc29 100644 --- a/pkgs/applications/editors/bvi/default.nix +++ b/pkgs/applications/editors/bvi/default.nix @@ -13,6 +13,6 @@ stdenv.mkDerivation { meta = { description = "Hex editor with vim style keybindings"; homepage = http://bvi.sourceforge.net/download.html; - license = "GPL2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/applications/editors/dhex/default.nix b/pkgs/applications/editors/dhex/default.nix index 45b7de900e26f347a56671cf638e8ea185f808b7..7a0e9e59d7e58a9a249343e53e171f0dbc97aaaf 100644 --- a/pkgs/applications/editors/dhex/default.nix +++ b/pkgs/applications/editors/dhex/default.nix @@ -12,9 +12,9 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses ]; installPhase = '' - ensureDir $out/bin - ensureDir $out/share/man/man1 - ensureDir $out/share/man/man5 + mkdir -p $out/bin + mkdir -p $out/share/man/man1 + mkdir -p $out/share/man/man5 cp dhex $out/bin cp dhex.1 $out/share/man/man1 diff --git a/pkgs/applications/editors/ed/default.nix b/pkgs/applications/editors/ed/default.nix index 88b539d29f5f000a2a3640d42da17e63914ce2e2..d3e9a4c4679437d376bdb16f3d044f5da7650433 100644 --- a/pkgs/applications/editors/ed/default.nix +++ b/pkgs/applications/editors/ed/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { full-screen editors such as GNU Emacs or GNU Moe. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; homepage = http://www.gnu.org/software/ed/; diff --git a/pkgs/applications/editors/emacs-23/builder.sh b/pkgs/applications/editors/emacs-23/builder.sh deleted file mode 100644 index d04e7a4fdd3ff59c8860238ecc8908e6c3d122a5..0000000000000000000000000000000000000000 --- a/pkgs/applications/editors/emacs-23/builder.sh +++ /dev/null @@ -1,34 +0,0 @@ -source $stdenv/setup - -# This hook is supposed to be run on Linux. It patches the proper locations of -# the crt{1,i,n}.o files into the build to ensure that Emacs is linked with -# *our* versions, not the ones found in the system, as it would do by default. -# On other platforms, this appears to be unnecessary. -preConfigure() { - case "${system}" in - x86_64-linux) glibclibdir=lib64 ;; - i686-linux) glibclibdir=lib ;; - *) return; - esac - - libc=$(cat ${NIX_GCC}/nix-support/orig-libc) - echo "libc: $libc" - - for i in src/s/*.h src/m/*.h; do - substituteInPlace $i \ - --replace /usr/${glibclibdir}/crt1.o $libc/${glibclibdir}/crt1.o \ - --replace /usr/${glibclibdir}/crti.o $libc/${glibclibdir}/crti.o \ - --replace /usr/${glibclibdir}/crtn.o $libc/${glibclibdir}/crtn.o \ - --replace /usr/lib/crt1.o $libc/${glibclibdir}/crt1.o \ - --replace /usr/lib/crti.o $libc/${glibclibdir}/crti.o \ - --replace /usr/lib/crtn.o $libc/${glibclibdir}/crtn.o - done - - for i in Makefile.in ./src/Makefile.in ./lib-src/Makefile.in ./leim/Makefile.in; do - substituteInPlace $i --replace /bin/pwd pwd - done -} - -preBuild="make bootstrap" - -genericBuild diff --git a/pkgs/applications/editors/emacs-23/default.nix b/pkgs/applications/editors/emacs-23/default.nix deleted file mode 100644 index ab5c8e49e7f1942652a6978a2c17671b1d3aae65..0000000000000000000000000000000000000000 --- a/pkgs/applications/editors/emacs-23/default.nix +++ /dev/null @@ -1,72 +0,0 @@ -{ stdenv, fetchurl, ncurses, x11, libXaw, libXpm, Xaw3d -, pkgconfig, gtk, libXft, dbus, libpng, libjpeg, libungif -, libtiff, librsvg, texinfo, gconf -}: - -assert (gtk != null) -> (pkgconfig != null); -assert (libXft != null) -> libpng != null; # probably a bug -assert stdenv.isDarwin -> libXaw != null; # fails to link otherwise - -stdenv.mkDerivation rec { - name = "emacs-23.4"; - - builder = ./builder.sh; - - src = fetchurl { - url = "mirror://gnu/emacs/${name}.tar.bz2"; - sha256 = "1fc8x5p38qihg7l6z2b1hjc534lnjb8gqpwgywlwg5s3csg6ymr6"; - }; - - buildInputs = - [ ncurses x11 texinfo libXaw Xaw3d libXpm libpng libjpeg libungif - libtiff librsvg libXft gconf - ] - ++ stdenv.lib.optionals (gtk != null) [ gtk pkgconfig ] - ++ stdenv.lib.optional stdenv.isLinux dbus; - - configureFlags = - stdenv.lib.optionals (gtk != null) [ "--with-x-toolkit=gtk" "--with-xft"] - - # On NixOS, help Emacs find `crt*.o'. - ++ stdenv.lib.optional (stdenv ? glibc) - [ "--with-crt-dir=${stdenv.glibc}/lib" ]; - - postInstall = '' - cat >$out/share/emacs/site-lisp/site-start.el <addr <= (unsigned long)my_edata + && my_size <= sectp->size)) + unexec_error ("my_edata is not in section %s", SECT_DATA); +- if (!unexec_write (sectp->offset, (void *) sectp->addr, my_size)) ++ if (!unexec_write (sectp->offset, (void *) sectp->addr, sectp->size)) + unexec_error ("cannot write section %s", SECT_DATA); + if (!unexec_copy (sectp->offset + my_size, old_file_offset + my_size, + sectp->size - my_size)) +@@ -880,6 +880,27 @@ + if (!unexec_write (header_offset, sectp, sizeof (struct section))) + unexec_error ("cannot write section %.16s's header", sectp->sectname); + } ++ else if (strncmp (sectp->sectname, "__bss", 5) == 0 ++ || strncmp (sectp->sectname, "__pu_bss", 8) == 0) ++ { ++ sectp->flags = S_REGULAR; ++ ++ /* These sections are produced by GCC 4.6+. ++ ++ FIXME: We possibly ought to clear uninitialized local ++ variables in statically linked libraries like for ++ SECT_BSS (__bss) above, but setting up the markers we ++ need in lastfile.c would be rather messy. See ++ darwin_output_aligned_bss () in gcc/config/darwin.c for ++ the root of the problem, keeping in mind that the ++ sections are numbered by their alignment in GCC 4.6, but ++ by log2(alignment) in GCC 4.7. */ ++ ++ if (!unexec_write (sectp->offset, (void *) sectp->addr, sectp->size)) ++ unexec_error ("cannot copy section %.16s", sectp->sectname); ++ if (!unexec_write (header_offset, sectp, sizeof (struct section))) ++ unexec_error ("cannot write section %.16s's header", sectp->sectname); ++ } + else if (strncmp (sectp->sectname, "__la_symbol_ptr", 16) == 0 + || strncmp (sectp->sectname, "__nl_symbol_ptr", 16) == 0 + || strncmp (sectp->sectname, "__got", 16) == 0 +@@ -891,6 +912,7 @@ + || strncmp (sectp->sectname, "__program_vars", 16) == 0 + || strncmp (sectp->sectname, "__mod_init_func", 16) == 0 + || strncmp (sectp->sectname, "__mod_term_func", 16) == 0 ++ || strncmp (sectp->sectname, "__static_data", 16) == 0 + || strncmp (sectp->sectname, "__objc_", 7) == 0) + { + if (!unexec_copy (sectp->offset, old_file_offset, sectp->size)) diff --git a/pkgs/applications/editors/emacs-24/default.nix b/pkgs/applications/editors/emacs-24/default.nix index 6ecee37d21e12622dbe71b31b11763c902aeba80..329fa3a5626e6b1cac26654df78b7a5aec8c8dc9 100644 --- a/pkgs/applications/editors/emacs-24/default.nix +++ b/pkgs/applications/editors/emacs-24/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, ncurses, x11, libXaw, libXpm, Xaw3d , pkgconfig, gtk, libXft, dbus, libpng, libjpeg, libungif -, libtiff, librsvg, texinfo, gconf, libxml2, imagemagick, gnutls +, libtiff, librsvg, texinfo, gconf, libxml2, imagemagick, openssl , alsaLib, cairo , withX ? !stdenv.isDarwin, withGTK ? true }: @@ -18,13 +18,15 @@ stdenv.mkDerivation rec { sha256 = "1385qzs3bsa52s5rcncbrkxlydkw0ajzrvfxgv8rws5fx512kakh"; }; + patches = [ ./darwin-new-sections.patch ]; + buildInputs = - [ ncurses gconf libxml2 gnutls alsaLib pkgconfig texinfo ] + [ ncurses gconf libxml2 openssl alsaLib pkgconfig texinfo ] ++ stdenv.lib.optional stdenv.isLinux dbus ++ stdenv.lib.optionals withX [ x11 libXaw Xaw3d libXpm libpng libjpeg libungif libtiff librsvg libXft - imagemagick gtk ] - ++ stdenv.lib.optional stdenv.isDarwin cairo; + imagemagick gtk gconf ] + ++ stdenv.lib.optional (stdenv.isDarwin && withX) cairo; configureFlags = ( if withX && withGTK then diff --git a/pkgs/applications/editors/emacs-24/macport.nix b/pkgs/applications/editors/emacs-24/macport.nix index 4c599916d94788ab905c657e70d542ec279d4ffd..d9b32351040b7e8906f3f99c3272d98a4cf0f15a 100644 --- a/pkgs/applications/editors/emacs-24/macport.nix +++ b/pkgs/applications/editors/emacs-24/macport.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { sha256 = "194y341zrpjp75mc3099kjc0inr1d379wwsnav257bwsc967h8yx"; }; + patches = [ ./darwin-new-sections.patch ]; + buildInputs = [ ncurses pkgconfig texinfo libxml2 gnutls ]; postUnpack = '' @@ -53,16 +55,13 @@ stdenv.mkDerivation rec { postInstall = '' cat >$out/share/emacs/site-lisp/site-start.el < $out/zed/zed-bin + cp $NWPATH/nw.pak $out/zed/ + cp nw/zed-linux $out/zed/zed + chmod +x $out/zed/zed* + cp Zed.desktop.tmpl Zed.svg Zed.png $out/zed + rm $out/zed/app.nw + ''; + + postFixup = '' + patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" $out/zed/zed-bin + patchelf --set-rpath "${rpath_env}/lib:${rpath_env}/lib64" $out/zed/zed-bin + + mkdir -p $out/lib + ln -s ${udev}/lib/libudev.so.1 $out/lib/libudev.so.0 + + wrapProgram $out/zed/zed-bin \ + --prefix LD_LIBRARY_PATH : $out/lib \ + --prefix NODE_PATH : ${node_env}/lib/node_modules + ''; + }; + + zed_script = writeScript "zed.sh" '' + if [[ $1 == http://* ]] || [[ $1 == https://* ]]; then + PROJECT=$1 + elif [ "" != "$1" ]; then + PROJECT=$(readlink -f $1) + fi + ${zed}/zed/zed-bin $PROJECT + ''; + +in stdenv.mkDerivation rec { + inherit name version; + + src = zed; + + installPhase = '' + mkdir -p $out/bin + ln -s ${zed_script} $out/bin/zed + ''; + + meta = { + description = "Zed is a fully offline-capable, open source, keyboard-focused, text and code editor for power users"; + license = stdenv.lib.licenses.mit; + homepage = http://zedapp.org/; + maintainers = [ stdenv.lib.maintainers.matejc ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/editors/zed/node.nix b/pkgs/applications/editors/zed/node.nix new file mode 100644 index 0000000000000000000000000000000000000000..b4a7cec4269caa7d093f4cb547e9857b679d243a --- /dev/null +++ b/pkgs/applications/editors/zed/node.nix @@ -0,0 +1,634 @@ +{ self, fetchurl, fetchgit ? null, lib }: + +{ + by-spec."asn1"."0.1.11" = + self.by-version."asn1"."0.1.11"; + by-version."asn1"."0.1.11" = lib.makeOverridable self.buildNodePackage { + name = "node-asn1-0.1.11"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"; + name = "asn1-0.1.11.tgz"; + sha1 = "559be18376d08a4ec4dbe80877d27818639b2df7"; + }) + ]; + buildInputs = + (self.nativeDeps."asn1" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "asn1" ]; + }; + by-spec."assert-plus"."0.1.2" = + self.by-version."assert-plus"."0.1.2"; + by-version."assert-plus"."0.1.2" = lib.makeOverridable self.buildNodePackage { + name = "node-assert-plus-0.1.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/assert-plus/-/assert-plus-0.1.2.tgz"; + name = "assert-plus-0.1.2.tgz"; + sha1 = "d93ffdbb67ac5507779be316a7d65146417beef8"; + }) + ]; + buildInputs = + (self.nativeDeps."assert-plus" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "assert-plus" ]; + }; + by-spec."async"."~0.9.0" = + self.by-version."async"."0.9.0"; + by-version."async"."0.9.0" = lib.makeOverridable self.buildNodePackage { + name = "node-async-0.9.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/async/-/async-0.9.0.tgz"; + name = "async-0.9.0.tgz"; + sha1 = "ac3613b1da9bed1b47510bb4651b8931e47146c7"; + }) + ]; + buildInputs = + (self.nativeDeps."async" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "async" ]; + }; + by-spec."aws-sign2"."~0.5.0" = + self.by-version."aws-sign2"."0.5.0"; + by-version."aws-sign2"."0.5.0" = lib.makeOverridable self.buildNodePackage { + name = "node-aws-sign2-0.5.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"; + name = "aws-sign2-0.5.0.tgz"; + sha1 = "c57103f7a17fc037f02d7c2e64b602ea223f7d63"; + }) + ]; + buildInputs = + (self.nativeDeps."aws-sign2" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "aws-sign2" ]; + }; + by-spec."block-stream"."*" = + self.by-version."block-stream"."0.0.7"; + by-version."block-stream"."0.0.7" = lib.makeOverridable self.buildNodePackage { + name = "node-block-stream-0.0.7"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/block-stream/-/block-stream-0.0.7.tgz"; + name = "block-stream-0.0.7.tgz"; + sha1 = "9088ab5ae1e861f4d81b176b4a8046080703deed"; + }) + ]; + buildInputs = + (self.nativeDeps."block-stream" or []); + deps = [ + self.by-version."inherits"."2.0.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "block-stream" ]; + }; + by-spec."boom"."0.4.x" = + self.by-version."boom"."0.4.2"; + by-version."boom"."0.4.2" = lib.makeOverridable self.buildNodePackage { + name = "node-boom-0.4.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/boom/-/boom-0.4.2.tgz"; + name = "boom-0.4.2.tgz"; + sha1 = "7a636e9ded4efcefb19cef4947a3c67dfaee911b"; + }) + ]; + buildInputs = + (self.nativeDeps."boom" or []); + deps = [ + self.by-version."hoek"."0.9.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "boom" ]; + }; + by-spec."combined-stream"."~0.0.4" = + self.by-version."combined-stream"."0.0.5"; + by-version."combined-stream"."0.0.5" = lib.makeOverridable self.buildNodePackage { + name = "node-combined-stream-0.0.5"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/combined-stream/-/combined-stream-0.0.5.tgz"; + name = "combined-stream-0.0.5.tgz"; + sha1 = "29ed76e5c9aad07c4acf9ca3d32601cce28697a2"; + }) + ]; + buildInputs = + (self.nativeDeps."combined-stream" or []); + deps = [ + self.by-version."delayed-stream"."0.0.5" + ]; + peerDependencies = [ + ]; + passthru.names = [ "combined-stream" ]; + }; + by-spec."cryptiles"."0.2.x" = + self.by-version."cryptiles"."0.2.2"; + by-version."cryptiles"."0.2.2" = lib.makeOverridable self.buildNodePackage { + name = "node-cryptiles-0.2.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz"; + name = "cryptiles-0.2.2.tgz"; + sha1 = "ed91ff1f17ad13d3748288594f8a48a0d26f325c"; + }) + ]; + buildInputs = + (self.nativeDeps."cryptiles" or []); + deps = [ + self.by-version."boom"."0.4.2" + ]; + peerDependencies = [ + ]; + passthru.names = [ "cryptiles" ]; + }; + by-spec."ctype"."0.5.2" = + self.by-version."ctype"."0.5.2"; + by-version."ctype"."0.5.2" = lib.makeOverridable self.buildNodePackage { + name = "node-ctype-0.5.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/ctype/-/ctype-0.5.2.tgz"; + name = "ctype-0.5.2.tgz"; + sha1 = "fe8091d468a373a0b0c9ff8bbfb3425c00973a1d"; + }) + ]; + buildInputs = + (self.nativeDeps."ctype" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "ctype" ]; + }; + by-spec."delayed-stream"."0.0.5" = + self.by-version."delayed-stream"."0.0.5"; + by-version."delayed-stream"."0.0.5" = lib.makeOverridable self.buildNodePackage { + name = "node-delayed-stream-0.0.5"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"; + name = "delayed-stream-0.0.5.tgz"; + sha1 = "d4b1f43a93e8296dfe02694f4680bc37a313c73f"; + }) + ]; + buildInputs = + (self.nativeDeps."delayed-stream" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "delayed-stream" ]; + }; + by-spec."forever-agent"."~0.5.0" = + self.by-version."forever-agent"."0.5.2"; + by-version."forever-agent"."0.5.2" = lib.makeOverridable self.buildNodePackage { + name = "node-forever-agent-0.5.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"; + name = "forever-agent-0.5.2.tgz"; + sha1 = "6d0e09c4921f94a27f63d3b49c5feff1ea4c5130"; + }) + ]; + buildInputs = + (self.nativeDeps."forever-agent" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "forever-agent" ]; + }; + by-spec."form-data"."~0.1.0" = + self.by-version."form-data"."0.1.4"; + by-version."form-data"."0.1.4" = lib.makeOverridable self.buildNodePackage { + name = "node-form-data-0.1.4"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz"; + name = "form-data-0.1.4.tgz"; + sha1 = "91abd788aba9702b1aabfa8bc01031a2ac9e3b12"; + }) + ]; + buildInputs = + (self.nativeDeps."form-data" or []); + deps = [ + self.by-version."combined-stream"."0.0.5" + self.by-version."mime"."1.2.11" + self.by-version."async"."0.9.0" + ]; + peerDependencies = [ + ]; + passthru.names = [ "form-data" ]; + }; + by-spec."fstream"."~0.1.28" = + self.by-version."fstream"."0.1.29"; + by-version."fstream"."0.1.29" = lib.makeOverridable self.buildNodePackage { + name = "node-fstream-0.1.29"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/fstream/-/fstream-0.1.29.tgz"; + name = "fstream-0.1.29.tgz"; + sha1 = "34d04023ebc91a9df47bd31ab97e4704b4db413f"; + }) + ]; + buildInputs = + (self.nativeDeps."fstream" or []); + deps = [ + self.by-version."graceful-fs"."3.0.2" + self.by-version."inherits"."2.0.1" + self.by-version."mkdirp"."0.3.5" + self.by-version."rimraf"."2.2.8" + ]; + peerDependencies = [ + ]; + passthru.names = [ "fstream" ]; + }; + by-spec."graceful-fs"."~3.0.2" = + self.by-version."graceful-fs"."3.0.2"; + by-version."graceful-fs"."3.0.2" = lib.makeOverridable self.buildNodePackage { + name = "node-graceful-fs-3.0.2"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.2.tgz"; + name = "graceful-fs-3.0.2.tgz"; + sha1 = "2cb5bf7f742bea8ad47c754caeee032b7e71a577"; + }) + ]; + buildInputs = + (self.nativeDeps."graceful-fs" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "graceful-fs" ]; + }; + by-spec."hawk"."~1.0.0" = + self.by-version."hawk"."1.0.0"; + by-version."hawk"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "node-hawk-1.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/hawk/-/hawk-1.0.0.tgz"; + name = "hawk-1.0.0.tgz"; + sha1 = "b90bb169807285411da7ffcb8dd2598502d3b52d"; + }) + ]; + buildInputs = + (self.nativeDeps."hawk" or []); + deps = [ + self.by-version."hoek"."0.9.1" + self.by-version."boom"."0.4.2" + self.by-version."cryptiles"."0.2.2" + self.by-version."sntp"."0.2.4" + ]; + peerDependencies = [ + ]; + passthru.names = [ "hawk" ]; + }; + by-spec."hoek"."0.9.x" = + self.by-version."hoek"."0.9.1"; + by-version."hoek"."0.9.1" = lib.makeOverridable self.buildNodePackage { + name = "node-hoek-0.9.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"; + name = "hoek-0.9.1.tgz"; + sha1 = "3d322462badf07716ea7eb85baf88079cddce505"; + }) + ]; + buildInputs = + (self.nativeDeps."hoek" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "hoek" ]; + }; + by-spec."http-signature"."~0.10.0" = + self.by-version."http-signature"."0.10.0"; + by-version."http-signature"."0.10.0" = lib.makeOverridable self.buildNodePackage { + name = "node-http-signature-0.10.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/http-signature/-/http-signature-0.10.0.tgz"; + name = "http-signature-0.10.0.tgz"; + sha1 = "1494e4f5000a83c0f11bcc12d6007c530cb99582"; + }) + ]; + buildInputs = + (self.nativeDeps."http-signature" or []); + deps = [ + self.by-version."assert-plus"."0.1.2" + self.by-version."asn1"."0.1.11" + self.by-version."ctype"."0.5.2" + ]; + peerDependencies = [ + ]; + passthru.names = [ "http-signature" ]; + }; + by-spec."inherits"."2" = + self.by-version."inherits"."2.0.1"; + by-version."inherits"."2.0.1" = lib.makeOverridable self.buildNodePackage { + name = "node-inherits-2.0.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"; + name = "inherits-2.0.1.tgz"; + sha1 = "b17d08d326b4423e568eff719f91b0b1cbdf69f1"; + }) + ]; + buildInputs = + (self.nativeDeps."inherits" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "inherits" ]; + }; + by-spec."inherits"."~2.0.0" = + self.by-version."inherits"."2.0.1"; + by-spec."json-stringify-safe"."~5.0.0" = + self.by-version."json-stringify-safe"."5.0.0"; + by-version."json-stringify-safe"."5.0.0" = lib.makeOverridable self.buildNodePackage { + name = "node-json-stringify-safe-5.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz"; + name = "json-stringify-safe-5.0.0.tgz"; + sha1 = "4c1f228b5050837eba9d21f50c2e6e320624566e"; + }) + ]; + buildInputs = + (self.nativeDeps."json-stringify-safe" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "json-stringify-safe" ]; + }; + by-spec."mime"."~1.2.11" = + self.by-version."mime"."1.2.11"; + by-version."mime"."1.2.11" = lib.makeOverridable self.buildNodePackage { + name = "node-mime-1.2.11"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/mime/-/mime-1.2.11.tgz"; + name = "mime-1.2.11.tgz"; + sha1 = "58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10"; + }) + ]; + buildInputs = + (self.nativeDeps."mime" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "mime" ]; + }; + by-spec."mime"."~1.2.9" = + self.by-version."mime"."1.2.11"; + by-spec."mkdirp"."0.3" = + self.by-version."mkdirp"."0.3.5"; + by-version."mkdirp"."0.3.5" = lib.makeOverridable self.buildNodePackage { + name = "node-mkdirp-0.3.5"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz"; + name = "mkdirp-0.3.5.tgz"; + sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7"; + }) + ]; + buildInputs = + (self.nativeDeps."mkdirp" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "mkdirp" ]; + }; + by-spec."node-uuid"."~1.4.0" = + self.by-version."node-uuid"."1.4.1"; + by-version."node-uuid"."1.4.1" = lib.makeOverridable self.buildNodePackage { + name = "node-node-uuid-1.4.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.4.1.tgz"; + name = "node-uuid-1.4.1.tgz"; + sha1 = "39aef510e5889a3dca9c895b506c73aae1bac048"; + }) + ]; + buildInputs = + (self.nativeDeps."node-uuid" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "node-uuid" ]; + }; + by-spec."oauth-sign"."~0.3.0" = + self.by-version."oauth-sign"."0.3.0"; + by-version."oauth-sign"."0.3.0" = lib.makeOverridable self.buildNodePackage { + name = "node-oauth-sign-0.3.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.3.0.tgz"; + name = "oauth-sign-0.3.0.tgz"; + sha1 = "cb540f93bb2b22a7d5941691a288d60e8ea9386e"; + }) + ]; + buildInputs = + (self.nativeDeps."oauth-sign" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "oauth-sign" ]; + }; + by-spec."punycode".">=0.2.0" = + self.by-version."punycode"."1.3.0"; + by-version."punycode"."1.3.0" = lib.makeOverridable self.buildNodePackage { + name = "node-punycode-1.3.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/punycode/-/punycode-1.3.0.tgz"; + name = "punycode-1.3.0.tgz"; + sha1 = "7f5009ef539b9444be5c7a19abd2c3ca49e1731c"; + }) + ]; + buildInputs = + (self.nativeDeps."punycode" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "punycode" ]; + }; + by-spec."qs"."~0.6.0" = + self.by-version."qs"."0.6.6"; + by-version."qs"."0.6.6" = lib.makeOverridable self.buildNodePackage { + name = "node-qs-0.6.6"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/qs/-/qs-0.6.6.tgz"; + name = "qs-0.6.6.tgz"; + sha1 = "6e015098ff51968b8a3c819001d5f2c89bc4b107"; + }) + ]; + buildInputs = + (self.nativeDeps."qs" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "qs" ]; + }; + by-spec."request"."~2.34.0" = + self.by-version."request"."2.34.0"; + by-version."request"."2.34.0" = lib.makeOverridable self.buildNodePackage { + name = "node-request-2.34.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/request/-/request-2.34.0.tgz"; + name = "request-2.34.0.tgz"; + sha1 = "b5d8b9526add4a2d4629f4d417124573996445ae"; + }) + ]; + buildInputs = + (self.nativeDeps."request" or []); + deps = [ + self.by-version."qs"."0.6.6" + self.by-version."json-stringify-safe"."5.0.0" + self.by-version."forever-agent"."0.5.2" + self.by-version."node-uuid"."1.4.1" + self.by-version."mime"."1.2.11" + self.by-version."tough-cookie"."0.12.1" + self.by-version."form-data"."0.1.4" + self.by-version."tunnel-agent"."0.3.0" + self.by-version."http-signature"."0.10.0" + self.by-version."oauth-sign"."0.3.0" + self.by-version."hawk"."1.0.0" + self.by-version."aws-sign2"."0.5.0" + ]; + peerDependencies = [ + ]; + passthru.names = [ "request" ]; + }; + "request" = self.by-version."request"."2.34.0"; + by-spec."rimraf"."2" = + self.by-version."rimraf"."2.2.8"; + by-version."rimraf"."2.2.8" = lib.makeOverridable self.buildNodePackage { + name = "rimraf-2.2.8"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"; + name = "rimraf-2.2.8.tgz"; + sha1 = "e439be2aaee327321952730f99a8929e4fc50582"; + }) + ]; + buildInputs = + (self.nativeDeps."rimraf" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "rimraf" ]; + }; + by-spec."sntp"."0.2.x" = + self.by-version."sntp"."0.2.4"; + by-version."sntp"."0.2.4" = lib.makeOverridable self.buildNodePackage { + name = "node-sntp-0.2.4"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz"; + name = "sntp-0.2.4.tgz"; + sha1 = "fb885f18b0f3aad189f824862536bceeec750900"; + }) + ]; + buildInputs = + (self.nativeDeps."sntp" or []); + deps = [ + self.by-version."hoek"."0.9.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "sntp" ]; + }; + by-spec."tar"."~0.1.19" = + self.by-version."tar"."0.1.20"; + by-version."tar"."0.1.20" = lib.makeOverridable self.buildNodePackage { + name = "node-tar-0.1.20"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/tar/-/tar-0.1.20.tgz"; + name = "tar-0.1.20.tgz"; + sha1 = "42940bae5b5f22c74483699126f9f3f27449cb13"; + }) + ]; + buildInputs = + (self.nativeDeps."tar" or []); + deps = [ + self.by-version."block-stream"."0.0.7" + self.by-version."fstream"."0.1.29" + self.by-version."inherits"."2.0.1" + ]; + peerDependencies = [ + ]; + passthru.names = [ "tar" ]; + }; + "tar" = self.by-version."tar"."0.1.20"; + by-spec."tough-cookie".">=0.12.0" = + self.by-version."tough-cookie"."0.12.1"; + by-version."tough-cookie"."0.12.1" = lib.makeOverridable self.buildNodePackage { + name = "node-tough-cookie-0.12.1"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/tough-cookie/-/tough-cookie-0.12.1.tgz"; + name = "tough-cookie-0.12.1.tgz"; + sha1 = "8220c7e21abd5b13d96804254bd5a81ebf2c7d62"; + }) + ]; + buildInputs = + (self.nativeDeps."tough-cookie" or []); + deps = [ + self.by-version."punycode"."1.3.0" + ]; + peerDependencies = [ + ]; + passthru.names = [ "tough-cookie" ]; + }; + by-spec."tunnel-agent"."~0.3.0" = + self.by-version."tunnel-agent"."0.3.0"; + by-version."tunnel-agent"."0.3.0" = lib.makeOverridable self.buildNodePackage { + name = "node-tunnel-agent-0.3.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.3.0.tgz"; + name = "tunnel-agent-0.3.0.tgz"; + sha1 = "ad681b68f5321ad2827c4cfb1b7d5df2cfe942ee"; + }) + ]; + buildInputs = + (self.nativeDeps."tunnel-agent" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "tunnel-agent" ]; + }; +} diff --git a/pkgs/applications/editors/zile/default.nix b/pkgs/applications/editors/zile/default.nix index 4166bc1e9e3eae776c866929d94430f1ceed45f2..32d30cd474508e13448df3daee88d0ef8dcc1006 100644 --- a/pkgs/applications/editors/zile/default.nix +++ b/pkgs/applications/editors/zile/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/zile/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ ]; }; diff --git a/pkgs/applications/graphics/alchemy/default.nix b/pkgs/applications/graphics/alchemy/default.nix index ee8543f7039a2c0848df3dd6163bc99c23ae81f0..263c411a8dbf6f5783d223870d64f864df141eea 100644 --- a/pkgs/applications/graphics/alchemy/default.nix +++ b/pkgs/applications/graphics/alchemy/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { }; installPhase = '' - ensureDir $out/bin $out/share + mkdir -p $out/bin $out/share cp -a . $out/share/alchemy cat >> $out/bin/alchemy << EOF #!/bin/sh diff --git a/pkgs/applications/graphics/autopanosiftc/default.nix b/pkgs/applications/graphics/autopanosiftc/default.nix index be3cfc5935c77344aaa202268fc66c5a6ca529f6..6d26dafae6230bf65f650dd7bb46dca5e5e54d58 100644 --- a/pkgs/applications/graphics/autopanosiftc/default.nix +++ b/pkgs/applications/graphics/autopanosiftc/default.nix @@ -13,6 +13,6 @@ stdenv.mkDerivation { meta = { homepage = http://hugin.sourceforge.net/; description = "Implementation in C of the autopano-sift algorithm for automatically stitching panoramas"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/applications/graphics/comical/default.nix b/pkgs/applications/graphics/comical/default.nix index 68910e67e25a0ee87a4f1a104e88248ac7011b4a..2796a5535a03f2c06723155d55427713722c9d01 100644 --- a/pkgs/applications/graphics/comical/default.nix +++ b/pkgs/applications/graphics/comical/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "Viewer of CBR and CBZ files, often used to store scanned comics"; homepage = http://comical.sourceforge.net/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/graphics/djview/default.nix b/pkgs/applications/graphics/djview/default.nix index f832513a82419b0c2004646ab0f30aeb086149bb..4ded807cb29a616442c108be81580a0c605dfc42 100644 --- a/pkgs/applications/graphics/djview/default.nix +++ b/pkgs/applications/graphics/djview/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://djvu.sourceforge.net/djview4.html; description = "A new portable DjVu viewer and browser plugin"; - license = "GPL2"; + license = stdenv.lib.licenses.gpl2; inherit (qt4.meta) platforms; maintainers = [ stdenv.lib.maintainers.urkud ]; }; diff --git a/pkgs/applications/graphics/freecad/cmake.patch b/pkgs/applications/graphics/freecad/cmake.patch deleted file mode 100644 index 62efaf1e29dc97128be5cd47ea8d8b82f560c638..0000000000000000000000000000000000000000 --- a/pkgs/applications/graphics/freecad/cmake.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff -urN freecad-0.13.1830.old/cMake/FreeCadMacros.cmake freecad-0.13.1830/cMake/FreeCadMacros.cmake ---- freecad-0.13.1830.old/cMake/FreeCadMacros.cmake 2013-02-02 18:09:17.000000000 +0100 -+++ freecad-0.13.1830/cMake/FreeCadMacros.cmake 2014-04-20 10:52:17.293599913 +0200 -@@ -201,7 +201,7 @@ - #endmacro(fc_add_resources) - - MACRO (fc_add_resources outfiles ) -- QT4_EXTRACT_OPTIONS(rcc_files rcc_options ${ARGN}) -+ QT4_EXTRACT_OPTIONS(rcc_files rcc_options rcc_target ${ARGN}) - - FOREACH (it ${rcc_files}) - GET_FILENAME_COMPONENT(outfilename ${it} NAME_WE) -diff -urN freecad-0.13.1830.old/CMakeLists.txt freecad-0.13.1830/CMakeLists.txt ---- freecad-0.13.1830.old/CMakeLists.txt 2013-02-02 18:09:17.000000000 +0100 -+++ freecad-0.13.1830/CMakeLists.txt 2014-04-20 10:28:41.782536753 +0200 -@@ -314,14 +314,14 @@ - macro(fc_wrap_cpp outfiles ) - # get include dirs - QT4_GET_MOC_FLAGS(moc_flags) -- QT4_EXTRACT_OPTIONS(moc_files moc_options ${ARGN}) -+ QT4_EXTRACT_OPTIONS(moc_files moc_options moc_target ${ARGN}) - # fixes bug 0000585: bug with boost 1.48 - SET(moc_options ${moc_options} -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED) - - foreach(it ${moc_files}) - get_filename_component(it ${it} ABSOLUTE) - QT4_MAKE_OUTPUT_FILE(${it} moc_ cpp outfile) -- QT4_CREATE_MOC_COMMAND(${it} ${outfile} "${moc_flags}" "${moc_options}") -+ QT4_CREATE_MOC_COMMAND(${it} ${outfile} "${moc_flags}" "${moc_options}" "") - set(${outfiles} ${${outfiles}} ${outfile}) - add_file_dependencies(${it} ${outfile}) - endforeach(it) diff --git a/pkgs/applications/graphics/freecad/default.nix b/pkgs/applications/graphics/freecad/default.nix index 770a7ee8212bd18f8679ab9f75d14cd8f8a26dc1..a7665177046b061485d6e4fd5195e40fba3f837b 100644 --- a/pkgs/applications/graphics/freecad/default.nix +++ b/pkgs/applications/graphics/freecad/default.nix @@ -1,19 +1,19 @@ { stdenv, fetchurl, cmake, coin3d, xercesc, ode, eigen, qt4, opencascade, gts -, boost, zlib, python, swig, gfortran, soqt, libf2c , pyqt4, makeWrapper -, matplotlib, pycollada }: +, boost, zlib, python, swig, gfortran, soqt, libf2c, makeWrapper +, matplotlib, pycollada, pyside, pysideShiboken }: stdenv.mkDerivation rec { name = "freecad-${version}"; - version = "0.13.1830"; + version = "0.14.3702"; src = fetchurl { url = "mirror://sourceforge/free-cad/${name}.tar.gz"; - sha256 = "04rgww5y32asn4sx5j4wh79ggvb479pq56xfcfj6gkg44mid23jm"; + sha256 = "1jcx7d3mp2wxkd20qdvr4vlf7h5wb0jgab9dl63sicdz88swy97f"; }; buildInputs = [ cmake coin3d xercesc ode eigen qt4 opencascade gts boost - zlib python swig gfortran soqt libf2c pyqt4 makeWrapper matplotlib - pycollada + zlib python swig gfortran soqt libf2c makeWrapper matplotlib + pycollada pyside pysideShiboken ]; enableParallelBuilding = true; @@ -28,13 +28,13 @@ stdenv.mkDerivation rec { --set COIN_GL_NO_CURRENT_CONTEXT_CHECK 1 ''; - patches = [ ./pythonpath.patch ./cmake.patch ]; + patches = [ ./pythonpath.patch ]; - meta = { - homepage = http://free-cad.sourceforge.net/; - license = [ "GPLv2+" "LGPLv2+" ]; + meta = with stdenv.lib; { description = "General purpose Open Source 3D CAD/MCAD/CAx/CAE/PLM modeler"; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + homepage = http://www.freecadweb.org/; + license = licenses.lgpl2Plus; + maintainers = [ maintainers.viric ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/graphics/gcolor2/default.nix b/pkgs/applications/graphics/gcolor2/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..0af750ec989e7df54ffa8e559ee452c338a91697 --- /dev/null +++ b/pkgs/applications/graphics/gcolor2/default.nix @@ -0,0 +1,31 @@ +{stdenv, fetchurl, gtk, perl, perlXMLParser, pkgconfig } : + +let version = "0.4"; in +stdenv.mkDerivation { + name = "gcolor2-${version}"; + arch = if stdenv.system == "x86_64-linux" then "amd64" else "386"; + + src = fetchurl { + url = "mirror://sourceforge/project/gcolor2/gcolor2/${version}/gcolor2-${version}.tar.bz2"; + sha1 = "e410a52dcff3d5c6c3d448b68a026d04ccd744be"; + + }; + + preConfigure = '' + sed -i 's/\[:space:\]/[&]/g' configure + ''; + + # from https://github.com/PhantomX/slackbuilds/tree/master/gcolor2/patches + patches = if stdenv.system == "x86_64-linux" then + [ ./gcolor2-amd64.patch ] else + [ ]; + +buildInputs = [ gtk perl perlXMLParser pkgconfig ]; + + meta = { + description = "Simple GTK+2 color selector"; + homepage = http://gcolor2.sourceforge.net/; + license = stdenv.lib.licenses.gpl2Plus; + maintainers = with stdenv.lib.maintainers; [ notthemessiah ]; + }; +} diff --git a/pkgs/applications/graphics/gcolor2/gcolor2-amd64.patch b/pkgs/applications/graphics/gcolor2/gcolor2-amd64.patch new file mode 100644 index 0000000000000000000000000000000000000000..cd06a8315f9844d89d622bededfbd3845e4b4d38 --- /dev/null +++ b/pkgs/applications/graphics/gcolor2/gcolor2-amd64.patch @@ -0,0 +1,46 @@ +diff --exclude-from=/home/dang/bin/scripts/diffrc -up -ruN gcolor2-0.4.orig/src/callbacks.c gcolor2-0.4/src/callbacks.c +--- gcolor2-0.4.orig/src/callbacks.c 2005-07-12 14:06:12.000000000 -0400 ++++ gcolor2-0.4/src/callbacks.c 2007-02-17 19:19:38.000000000 -0500 +@@ -4,6 +4,9 @@ + + #include + #include ++#include ++#include ++#include + + #include "callbacks.h" + #include "interface.h" +@@ -172,6 +175,9 @@ void on_copy_color_to_clipboard_activate + gtk_clipboard_set_text (cb, hex, strlen (hex)); + } + ++void add_rgb_file (gchar *filename, gchar *type); ++gchar* get_system_file (void); ++ + void on_show_system_colors_activate (GtkMenuItem *menuitem, gpointer user_data) + { + if (gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (menuitem))) +@@ -266,6 +272,8 @@ void on_save_button_clicked (GtkButton * + gtk_widget_destroy (savedialog); + } + ++void add_list_color (gchar *spec, gchar *name, gchar *type, gboolean is_new_color); ++ + void add_color_to_treeview () + { + GtkTreeView *treeview; +diff --exclude-from=/home/dang/bin/scripts/diffrc -up -ruN gcolor2-0.4.orig/src/main.c gcolor2-0.4/src/main.c +--- gcolor2-0.4.orig/src/main.c 2005-07-11 10:55:49.000000000 -0400 ++++ gcolor2-0.4/src/main.c 2007-02-17 19:18:23.000000000 -0500 +@@ -4,6 +4,10 @@ + + #include + #include ++#include ++#include ++#include ++#include + + #include "interface.h" + #include "support.h" diff --git a/pkgs/applications/graphics/geeqie/default.nix b/pkgs/applications/graphics/geeqie/default.nix index 44ca66ac5b9d996379fbeb64b7a2b49701c95e7f..b170b784aaa482e379fd0d544e35f4961c4e5d84 100644 --- a/pkgs/applications/graphics/geeqie/default.nix +++ b/pkgs/applications/graphics/geeqie/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { initially based on GQview. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://geeqie.sourceforge.net; diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index 3810006103df74bd86342ce37885d8ac5c02ec0f..7139bc71f3c1496aeabbe80ed7c0473da4c22b2d 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -236,7 +236,7 @@ rec { homepage = http://lensfun.sebastiankraft.net/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; platforms = stdenv.lib.platforms.gnu; }; diff --git a/pkgs/applications/graphics/giv/default.nix b/pkgs/applications/graphics/giv/default.nix index 8b2c45398d9ecbf650e8429d319a707701ec5764..2e9d55a3f3f221dd5bf4770fb88a60b83d593211 100644 --- a/pkgs/applications/graphics/giv/default.nix +++ b/pkgs/applications/graphics/giv/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { description = "Cross platform image and hierarchical vector viewer based"; homepage = http://giv.sourceforge.net/giv/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/graphics/gocr/default.nix b/pkgs/applications/graphics/gocr/default.nix index 15a8ab713dba3add826eb2fb5859721b9ac5e252..919b9fcc4c3c4912234a3027cb4009b740e52005 100644 --- a/pkgs/applications/graphics/gocr/default.nix +++ b/pkgs/applications/graphics/gocr/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://jocr.sourceforge.net/"; description = "GPL Optical Character Recognition"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.simons ]; diff --git a/pkgs/applications/graphics/graphicsmagick/1.3.7.nix b/pkgs/applications/graphics/graphicsmagick/1.3.7.nix index 291d61d5f6f596fb46dfc0f0ab4ce819f0fbb8a8..8b780647dfae955a9f2985580f80f7e2184befbc 100644 --- a/pkgs/applications/graphics/graphicsmagick/1.3.7.nix +++ b/pkgs/applications/graphics/graphicsmagick/1.3.7.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { configureFlags = "--enable-shared"; buildInputs = - [ bzip2 freetype ghostscript graphviz libjpeg libpng libtiff libX11 libxml2 + [ libpng bzip2 freetype ghostscript graphviz libjpeg libtiff libX11 libxml2 zlib libtool ]; diff --git a/pkgs/applications/graphics/hoodle/default.nix b/pkgs/applications/graphics/hoodle/default.nix index 8223b2c5ad90bafb44c1d7ee93714931bb738eb4..79966a2698fc14c589eac18b7e2002ae3bb535b2 100644 --- a/pkgs/applications/graphics/hoodle/default.nix +++ b/pkgs/applications/graphics/hoodle/default.nix @@ -16,6 +16,6 @@ cabal.mkDerivation (self: { description = "Executable for hoodle"; license = self.stdenv.lib.licenses.gpl3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.ianwookim ]; + maintainers = with self.stdenv.lib.maintainers; [ ianwookim ]; }; }) diff --git a/pkgs/applications/graphics/hugin/default.nix b/pkgs/applications/graphics/hugin/default.nix index a9ff7ef25c32a8c385119875c0c5416ef9d25dd4..88912cbda55dca97aeaed2dc7fa1340f0dbffd30 100644 --- a/pkgs/applications/graphics/hugin/default.nix +++ b/pkgs/applications/graphics/hugin/default.nix @@ -1,25 +1,37 @@ -{stdenv, fetchurl, panotools, cmake, wxGTK, libtiff, libpng, openexr, boost -, pkgconfig, exiv2, gettext, ilmbase, enblendenfuse, autopanosiftc, mesa -, freeglut, glew, libXmu, libXi, tclap }: +{ stdenv, cmake, fetchurl, gnumake, pkgconfig +, boost, gettext, tclap, wxGTK +, freeglut, glew, libXi, libXmu, mesa +, autopanosiftc, enblendenfuse, exiv2, ilmbase, lensfun, libpng, libtiff +, openexr, panotools, perlPackages +}: stdenv.mkDerivation rec { - name = "hugin-2011.4.0"; + name = "hugin-2013.0.0"; src = fetchurl { url = "mirror://sourceforge/hugin/${name}.tar.bz2"; - sha256 = "1bnxljgqxzfdz14l7y29wzi52x1a38mghsjavnr28fr4vfmqwjrf"; + sha256 = "1mgbvg09xvf0zcm9jfv5lb65nd292l86ffa23yp4pzm6izaiwkj8"; }; NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR"; -#NIX_LDFLAGS = "-lrt"; + buildInputs = [ boost gettext tclap wxGTK + freeglut glew libXi libXmu mesa + exiv2 ilmbase lensfun libtiff libpng openexr panotools + ]; - buildInputs = [ panotools wxGTK libtiff libpng openexr boost tclap - exiv2 gettext ilmbase mesa freeglut glew libXmu libXi ]; + # disable installation of the python scripting interface + cmakeFlags = [ "-DBUILD_HSI:BOOl=OFF" ]; nativeBuildInputs = [ cmake pkgconfig ]; - propagatedUserEnvPackages = [ enblendenfuse autopanosiftc ]; + enableParallelBuilding = true; + + # commandline tools needed by the hugin batch processor + # you may have to tell hugin (in the preferences) where these binaries reside + propagatedUserEnvPackages = [ autopanosiftc enblendenfuse gnumake + perlPackages.ImageExifTool + ]; postInstall = '' mkdir -p "$out/nix-support" @@ -29,7 +41,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://hugin.sourceforge.net/; description = "Toolkit for stitching photographs and assembling panoramas, together with an easy to use graphical front end"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index 478a0ff7e50cd4d280b262100b77c7c6cbd28ab2..38ceefa452302779eb1649daed16d529b254ff1f 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -4,18 +4,17 @@ , gsl, python, pyxml, lxml, poppler, imagemagick, libwpg }: stdenv.mkDerivation rec { - name = "inkscape-0.48.4"; + name = "inkscape-0.48.5"; src = fetchurl { url = "mirror://sourceforge/inkscape/${name}.tar.bz2"; - sha256 = "17aiibgdwjqpjc38f0yr2sdlgwngg5ac9srlybjcx9aspf6ashc7"; + sha256 = "0sfr7a1vr1066rrkkqbqvcqs3gawalj68ralnhd6k87jz62fcv1b"; }; patches = [ ./configure-python-libs.patch ]; - postPatch = '' - patch -p0 < ${./spuriouscomma.patch} - ''; + postPatch = stdenv.lib.optionalString doCheck + ''sed -i 's:#include "../../src:#include "src:' src/cxxtests.cpp''; propagatedBuildInputs = [ # Python is used at run-time to execute scripts, e.g., those from @@ -31,12 +30,17 @@ stdenv.mkDerivation rec { configureFlags = "--with-python"; + enableParallelBuilding = true; + doCheck = true; + checkFlags = "-j1"; + postInstall = '' # Make sure PyXML modules can be found at run-time. for i in "$out/bin/"* do wrapProgram "$i" --prefix PYTHONPATH : \ - "$(toPythonPath ${pyxml}):$(toPythonPath ${lxml})" || \ + "$(toPythonPath ${pyxml}):$(toPythonPath ${lxml})" \ + --prefix PATH : ${python}/bin || \ exit 2 done rm $out/share/icons/hicolor/icon-theme.cache @@ -44,9 +48,11 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = "-lX11"; - meta = { + meta = with stdenv.lib; { license = "GPL"; homepage = http://www.inkscape.org; + description = "Vector graphics editor"; + platforms = platforms.all; longDescription = '' Inkscape is a feature-rich vector graphics editor that edits files in the W3C SVG (Scalable Vector Graphics) file format. diff --git a/pkgs/applications/graphics/inkscape/spuriouscomma.patch b/pkgs/applications/graphics/inkscape/spuriouscomma.patch deleted file mode 100644 index bc538068f9e3dec56d6ae9e4fa35ed51c9f7e7d0..0000000000000000000000000000000000000000 --- a/pkgs/applications/graphics/inkscape/spuriouscomma.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/widgets/desktop-widget.h~ 2011-07-08 13:25:09.000000000 -0500 -+++ src/widgets/desktop-widget.h 2013-02-15 16:04:45.806910365 -0600 -@@ -239,7 +239,7 @@ - private: - GtkWidget *tool_toolbox; - GtkWidget *aux_toolbox; -- GtkWidget *commands_toolbox,; -+ GtkWidget *commands_toolbox; - GtkWidget *snap_toolbox; - - static void init(SPDesktopWidget *widget); diff --git a/pkgs/applications/graphics/ipe/default.nix b/pkgs/applications/graphics/ipe/default.nix index df50dd5bd793befb1e95a5ca441899e4f10e1553..53df14f8704f264c9f2200203a08c61793d2e556 100644 --- a/pkgs/applications/graphics/ipe/default.nix +++ b/pkgs/applications/graphics/ipe/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = { description = "An editor for drawing figures"; homepage = http://ipe7.sourceforge.net; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; longDescription = '' Ipe is an extensible drawing editor for creating figures in PDF and Postscript format. It supports making small figures for inclusion into LaTeX-documents diff --git a/pkgs/applications/graphics/luminance-hdr/default.nix b/pkgs/applications/graphics/luminance-hdr/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..7558b0aef4b6c8990148c35cf40e8faf2ca83f18 --- /dev/null +++ b/pkgs/applications/graphics/luminance-hdr/default.nix @@ -0,0 +1,26 @@ +{ stdenv, cmake, fetchurl, pkgconfig, qt5, boost, exiv2, fftwFloat, gsl +, ilmbase, lcms2, libraw, libtiff, openexr +}: + +stdenv.mkDerivation rec { + name = "luminance-hdr-2.4.0"; + + src = fetchurl { + url = "mirror://sourceforge/qtpfsgui/${name}.tar.bz2"; + sha256 = "00fldbcizrx8jcnjgq74n3zmbm27dxzl96fxa7q49689mfnlw08l"; + }; + + NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR"; + + buildInputs = [ qt5 boost exiv2 fftwFloat gsl ilmbase lcms2 libraw libtiff openexr ]; + + nativeBuildInputs = [ cmake pkgconfig ]; + + meta = with stdenv.lib; { + homepage = http://qtpfsgui.sourceforge.net/; + description = "A complete open source solution for HDR photography"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = [ maintainers.hrdinka ]; + }; +} diff --git a/pkgs/applications/graphics/mcomix/default.nix b/pkgs/applications/graphics/mcomix/default.nix index 7629c57a2b861a39c8358d1873acdd7e9bdf653a..cc1fe8c3a220f795c534d3124afd84762aa8c391 100644 --- a/pkgs/applications/graphics/mcomix/default.nix +++ b/pkgs/applications/graphics/mcomix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, buildPythonPackage, pygtk, pil }: +{ stdenv, fetchurl, buildPythonPackage, pygtk, pil, python27Packages }: buildPythonPackage rec { namePrefix = ""; @@ -11,7 +11,7 @@ buildPythonPackage rec { doCheck = false; - pythonPath = [ pygtk pil ]; + pythonPath = [ pygtk pil python27Packages.sqlite3 ]; meta = { description = "Image viewer designed to handle comic books"; @@ -29,6 +29,6 @@ buildPythonPackage rec { homepage = http://mcomix.sourceforge.net/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/applications/graphics/meshlab/default.nix b/pkgs/applications/graphics/meshlab/default.nix index 4e2075ff47148d264e0b4e097066d186717b96b0..9352ae092be4c0d5ea997dba623c6b9a90352fb0 100644 --- a/pkgs/applications/graphics/meshlab/default.nix +++ b/pkgs/applications/graphics/meshlab/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { meta = { description = "System for the processing and editing of unstructured 3D triangular meshes"; homepage = http://meshlab.sourceforge.net/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/graphics/minidjvu/default.nix b/pkgs/applications/graphics/minidjvu/default.nix index e3c6deddb2954bee36fdb4e283e5671f4efa4aa7..e354837f4b871d76487eda2e6675187939405959 100644 --- a/pkgs/applications/graphics/minidjvu/default.nix +++ b/pkgs/applications/graphics/minidjvu/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = { homepage = http://djvu.sourceforge.net/djview4.html; description = "Black-and-white djvu page encoder and decoder that use interpage information"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.viric ]; }; } diff --git a/pkgs/applications/graphics/mirage/default.nix b/pkgs/applications/graphics/mirage/default.nix index def22804bb65366ef536f021510308b67127d44f..20f7460f7a16e3295a26d29737a2e827ad938548 100644 --- a/pkgs/applications/graphics/mirage/default.nix +++ b/pkgs/applications/graphics/mirage/default.nix @@ -24,6 +24,6 @@ buildPythonPackage rec { homepage = http://mirageiv.sourceforge.net/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/applications/graphics/ocrad/default.nix b/pkgs/applications/graphics/ocrad/default.nix index 482b57d03d2d955bf4f8a0b01722b04260e0873f..4c20a41061ae8a1858944cd21ced90cca024489a 100644 --- a/pkgs/applications/graphics/ocrad/default.nix +++ b/pkgs/applications/graphics/ocrad/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { backend to other programs. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ ]; platforms = stdenv.lib.platforms.gnu; # arbitrary choice diff --git a/pkgs/applications/graphics/openimageio/default.nix b/pkgs/applications/graphics/openimageio/default.nix index f63f41a8ed105f97a38e59f8ad629de926f48463..d0a1fb38e0c32e5e6604cdb71306f41f5013d970 100644 --- a/pkgs/applications/graphics/openimageio/default.nix +++ b/pkgs/applications/graphics/openimageio/default.nix @@ -4,26 +4,26 @@ stdenv.mkDerivation rec { name = "oiio-${version}"; - version = "1.3.12"; + version = "1.4"; src = fetchurl { - url = "https://github.com/OpenImageIO/oiio/archive/Release-${version}.zip"; - sha256 = "114jx4pcqhzdchzpxbwrfzqmnxr2bm8cw13g4akz1hg8pvr1dhsb"; + url = "https://github.com/OpenImageIO/oiio/archive/RB-${version}.zip"; + sha256 = "0ldj3hwpz363l1zyzf6c62wc5d2cpbiszlpjvv5w6rrsx2ddbbn1"; }; buildInputs = [ boost cmake ilmbase libjpeg libpng libtiff opencolorio openexr unzip ]; - configurePhase = ""; + cmakeFlags = [ + "-DUSE_PYTHON=OFF" + ]; buildPhase = '' make ILMBASE_HOME=${ilmbase} OPENEXR_HOME=${openexr} USE_PYTHON=0 \ INSTALLDIR=$out dist_dir= ''; - installPhase = ":"; - meta = with stdenv.lib; { homepage = http://www.openimageio.org; description = "A library and tools for reading and writing images"; diff --git a/pkgs/applications/graphics/panotools/default.nix b/pkgs/applications/graphics/panotools/default.nix index 17e1b2e8b1466874b5270029ecd46159136a1fe9..8e5204ac63827320b26f4e75dfb12164c7c5d426 100644 --- a/pkgs/applications/graphics/panotools/default.nix +++ b/pkgs/applications/graphics/panotools/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://panotools.sourceforge.net/; description = "Free software suite for authoring and displaying virtual reality panoramas"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.gnu; # arbitrary choice }; diff --git a/pkgs/applications/graphics/pinta/default.nix b/pkgs/applications/graphics/pinta/default.nix index b54d73b4964f8109a5e73a0fe219637b7b89279d..6958c94f7e18e16359ee74fe07920b4459057cd4 100644 --- a/pkgs/applications/graphics/pinta/default.nix +++ b/pkgs/applications/graphics/pinta/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation { meta = { homepage = http://www.pinta-project.com/; description = "Drawing/editing program modeled after Paint.NET"; - license = "MIT"; + license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/graphics/potrace/default.nix b/pkgs/applications/graphics/potrace/default.nix index 365f88b19b4cabc4196d026ec824ab110cb12e73..f58fe0e28c1de3aa932757731ddaf1bd6d52d0cd 100644 --- a/pkgs/applications/graphics/potrace/default.nix +++ b/pkgs/applications/graphics/potrace/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation { description = "A tool for tracing a bitmap, which means, transforming a bitmap into a smooth, scalable image"; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.pSub ]; - license = "GPL2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/applications/graphics/qtpfsgui/default.nix b/pkgs/applications/graphics/qtpfsgui/default.nix index 95d7acca36c5aa8f8e27a87c701b9395a92a1b4b..cd8c76dc42cffbb5e879bf2138c8acf3fe8056e1 100644 --- a/pkgs/applications/graphics/qtpfsgui/default.nix +++ b/pkgs/applications/graphics/qtpfsgui/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { aims to provide a workflow for high dynamic range (HDR) imaging. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; platforms = stdenv.lib.platforms.gnu; diff --git a/pkgs/applications/graphics/sane/backends.nix b/pkgs/applications/graphics/sane/backends.nix index 3d95dcd81ee84a5f401b15f48dc884e1b8f195b7..28d2f1e200b270b6f99a0b72b73610354cdfb5b7 100644 --- a/pkgs/applications/graphics/sane/backends.nix +++ b/pkgs/applications/graphics/sane/backends.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.sane-project.org/"; description = "Scanner Access Now Easy"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.simons ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/graphics/sane/frontends.nix b/pkgs/applications/graphics/sane/frontends.nix index 9e73a08e0967c1e62feab62e567322538864de11..a0f6e5bac509f264985ac412f1b8591d11cab6b7 100644 --- a/pkgs/applications/graphics/sane/frontends.nix +++ b/pkgs/applications/graphics/sane/frontends.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.sane-project.org/"; description = "Scanner Access Now Easy"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.simons ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/graphics/sane/xsane.nix b/pkgs/applications/graphics/sane/xsane.nix index 7b1ffb1f2be4019b904389eb4148072ed43dde32..221a4340dce2ed89dcc7fa654a9a15608a675461 100644 --- a/pkgs/applications/graphics/sane/xsane.nix +++ b/pkgs/applications/graphics/sane/xsane.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.sane-project.org/; description = "Graphical scanning frontend for sane"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric simons]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/graphics/smartdeblur/default.nix b/pkgs/applications/graphics/smartdeblur/default.nix index 83f3c751029877940abdb298233025778d1296d2..083fde359029a607ae152d02c6dee6cd1b68c1ca 100644 --- a/pkgs/applications/graphics/smartdeblur/default.nix +++ b/pkgs/applications/graphics/smartdeblur/default.nix @@ -25,9 +25,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/Y-Vladimir/SmartDeblur"; description = "Tool for restoring blurry and defocused images"; - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [ viric ]; platforms = with stdenv.lib.platforms; linux; }; } - diff --git a/pkgs/applications/graphics/sxiv/default.nix b/pkgs/applications/graphics/sxiv/default.nix index 8500fa9faba2379ac942e357f46a35e357c56a1b..30513577d04b944bcfd1df50f9f33b44eaf29cdb 100644 --- a/pkgs/applications/graphics/sxiv/default.nix +++ b/pkgs/applications/graphics/sxiv/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = { description = "Simple X Image Viewer"; homepage = "https://github.com/muennich/sxiv"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/graphics/tesseract/default.nix b/pkgs/applications/graphics/tesseract/default.nix index e67d202dcae64f8852fb91c36b07bc22b33500ff..eaf6dd4ba24839f69134c2077fe8f7ba4d4dc277 100644 --- a/pkgs/applications/graphics/tesseract/default.nix +++ b/pkgs/applications/graphics/tesseract/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { meta = { description = "OCR engine"; homepage = http://code.google.com/p/tesseract-ocr/; - license = "Apache2.0"; + license = stdenv.lib.licenses.asl20; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/graphics/ufraw/default.nix b/pkgs/applications/graphics/ufraw/default.nix index 070244d67d2c071de9a34a7c3d24466e6a9d39d3..783832abd0036b45afae6c9484f237f14270ba7b 100644 --- a/pkgs/applications/graphics/ufraw/default.nix +++ b/pkgs/applications/graphics/ufraw/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { the camera's tone curves. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ ]; platforms = stdenv.lib.platforms.gnu; # needs GTK+ diff --git a/pkgs/applications/graphics/viewnior/default.nix b/pkgs/applications/graphics/viewnior/default.nix index aa09fb705f1c0edc36d754391c95edb9c10d9616..dd8e01298ff49a42bb4d68eafdf6c162dac8f7f3 100644 --- a/pkgs/applications/graphics/viewnior/default.nix +++ b/pkgs/applications/graphics/viewnior/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { in mind (follows Gnome HIG2). ''; - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3; homepage = http://xsisqox.github.com/Viewnior; diff --git a/pkgs/applications/graphics/xaos/default.nix b/pkgs/applications/graphics/xaos/default.nix index cddbc212c190b9a2642f36c6245f2dae4babfb97..8387b3486d4d72ebfdd03dafb2a3f291fbc103d7 100644 --- a/pkgs/applications/graphics/xaos/default.nix +++ b/pkgs/applications/graphics/xaos/default.nix @@ -1,10 +1,10 @@ -a : -let +a : +let fetchurl = a.fetchurl; - version = a.lib.attrByPath ["version"] "3.6" a; + version = a.lib.attrByPath ["version"] "3.6" a; buildInputs = with a; [ - aalib gsl libpng libX11 xproto libXext xextproto + aalib gsl libpng libX11 xproto libXext xextproto libXt zlib gettext intltool perl ]; in @@ -24,11 +24,11 @@ rec { sed -e s@/usr/@"$out/"@g -i configure $(find . -name 'Makefile*') mkdir -p $out/share/locale '') ["doUnpack" "minInit" "defEnsureDir"]; - + name = "xaos-" + version; meta = { homepage = http://xaos.sourceforge.net/; description = "XaoS - fractal viewer"; - license = "GPLv2+"; + license = a.stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/applications/inferno/default.nix b/pkgs/applications/inferno/default.nix index 6a1a3be27dd54a87a80d2a9362ce75b4c9aec26f..c5a40fcbf5b323b10bc96f211dd4e99d9ce4f153 100644 --- a/pkgs/applications/inferno/default.nix +++ b/pkgs/applications/inferno/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { description = "A compact distributed operating system for building cross-platform distributed systems"; homepage = "http://inferno-os.org/"; license = stdenv.lib.licenses.gpl2; - maintainer = [ "Chris Double " ]; + maintainers = [ "Chris Double " ]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/applications/misc/abook/default.nix b/pkgs/applications/misc/abook/default.nix index 3d187d92f5c6f6d89caa3cf5ec54127fc3a151a9..77e48e49dd89eb8d7660bb4d0cf48e470399cf89 100644 --- a/pkgs/applications/misc/abook/default.nix +++ b/pkgs/applications/misc/abook/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://abook.sourceforge.net/"; description = "Text-based addressbook program designed to use with mutt mail client"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.edwtjo ]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/misc/adobe-reader/default.nix b/pkgs/applications/misc/adobe-reader/default.nix index a186f5f5ee0da1471c90aa213071935428011080..85bc89f775598f382ec0e1a448e31c8ca5c32068 100644 --- a/pkgs/applications/misc/adobe-reader/default.nix +++ b/pkgs/applications/misc/adobe-reader/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation { meta = { description = "Adobe Reader, a viewer for PDF documents"; homepage = http://www.adobe.com/products/reader; - license = "unfree"; + license = stdenv.lib.licenses.unfree; }; } diff --git a/pkgs/applications/misc/audio/sox/default.nix b/pkgs/applications/misc/audio/sox/default.nix index 570699fb619e3384563b60a43aeccee3c08242d2..0663937c4795edf70d91536394873ba4e7ce3418 100644 --- a/pkgs/applications/misc/audio/sox/default.nix +++ b/pkgs/applications/misc/audio/sox/default.nix @@ -1,13 +1,14 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl , enableAlsa ? true, alsaLib ? null , enableLibao ? true, libao ? null , enableLame ? false, lame ? null , enableLibmad ? true, libmad ? null , enableLibogg ? true, libogg ? null, libvorbis ? null }: -let - inherit (stdenv.lib) optional optionals; -in stdenv.mkDerivation rec { + +with stdenv.lib; + +stdenv.mkDerivation rec { name = "sox-14.4.1"; src = fetchurl { @@ -16,21 +17,17 @@ in stdenv.mkDerivation rec { }; buildInputs = - (optional enableAlsa alsaLib) ++ - (optional enableLibao libao) ++ - (optional enableLame lame) ++ - (optional enableLibmad libmad) ++ - (optionals enableLibogg [ libogg libvorbis ]); + optional (enableAlsa && stdenv.isLinux) alsaLib ++ + optional enableLibao libao ++ + optional enableLame lame ++ + optional enableLibmad libmad ++ + optionals enableLibogg [ libogg libvorbis ]; meta = { description = "Sample Rate Converter for audio"; homepage = http://www.mega-nerd.com/SRC/index.html; - maintainers = [stdenv.lib.maintainers.marcweber stdenv.lib.maintainers.shlevy]; - # you can choose one of the following licenses: - license = [ - "GPL" - # http://www.mega-nerd.com/SRC/libsamplerate-cul.pdf - "libsamplerate Commercial Use License" - ]; + maintainers = [ lib.maintainers.marcweber lib.maintainers.shlevy ]; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/applications/misc/audio/soxr/default.nix b/pkgs/applications/misc/audio/soxr/default.nix index a8dd26ab6095d17de051ebba78c470e6740afa29..73cdbb37616a8a07497e7fbfad744c4b42f02200 100644 --- a/pkgs/applications/misc/audio/soxr/default.nix +++ b/pkgs/applications/misc/audio/soxr/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { meta = { description = "An audio resampling library"; homepage = http://soxr.sourceforge.net; - license = "LGPLv2.1+"; + license = stdenv.lib.licenses.lgpl21Plus; }; } diff --git a/pkgs/applications/misc/bibletime/default.nix b/pkgs/applications/misc/bibletime/default.nix index cdaeb49f14c665c88e1973ba1ef28b32c5ba78b9..41184d6e9492014ebaf0fd1c01c2b2f9dbbf3f8b 100644 --- a/pkgs/applications/misc/bibletime/default.nix +++ b/pkgs/applications/misc/bibletime/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { - version = "2.9.2"; + version = "2.10.1"; name = "bibletime-${version}"; src = fetchurl { - url = "mirror://sourceforge/bibletime/${name}.tar.bz2"; - sha256 = "1j4kc24qvhqlbqspczmkxvw09mnvgg9m4zs1y9f68505kd0pfg1r"; + url = "mirror://sourceforge/bibletime/${name}.tar.xz"; + sha256 = "14fayy5h1ffjxin669q56fflxn4ij1irgn60cygwx2y02cwxbll6"; }; prePatch = '' @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { description = "A Qt4 Bible study tool"; homepage = http://www.bibletime.info/; platforms = stdenv.lib.platforms.linux; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.piotr ]; }; } diff --git a/pkgs/applications/misc/bitcoin/default.nix b/pkgs/applications/misc/bitcoin/default.nix index 118b56c55b0794937559b4db1b98288fc0cf7399..1a25a233c0ded4e7f8b70c978966dc13226f3aa8 100644 --- a/pkgs/applications/misc/bitcoin/default.nix +++ b/pkgs/applications/misc/bitcoin/default.nix @@ -44,6 +44,6 @@ stdenv.mkDerivation rec { ''; homepage = "http://www.bitcoin.org/"; maintainers = [ stdenv.lib.maintainers.roconnor ]; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index c6a6fa7861ca1fb7a8734b7d4001ce023f96b1e1..79f91a1df41899aa1fce0d9a0ac8a2d6e085b758 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -1,8 +1,9 @@ -{ stdenv, lib, fetchurl, SDL, boost, cmake, ffmpeg, gettext, glew +{ stdenv, lib, fetchurl, fetchpatch, SDL, boost, cmake, ffmpeg, gettext, glew , ilmbase, libXi, libjpeg, libpng, libsamplerate, libsndfile , libtiff, mesa, openal, opencolorio, openexr, openimageio, openjpeg, python , zlib, fftw -, jackaudioSupport ? false, jackaudio +, jackaudioSupport ? false, jack2 +, cudaSupport ? false, cudatoolkit6 }: with lib; @@ -12,20 +13,29 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://download.blender.org/source/${name}.tar.gz"; - sha256 = "18pzcnrs4rcb6mf6aqr9xj2r05v8aay8daj31395ljfzw667zakx"; + sha256 = "12aqdrpl86xjk2xdwj2nbfcmdzyv61n443gw6j2japffm1kmlz8x"; }; buildInputs = [ SDL boost cmake ffmpeg gettext glew ilmbase libXi libjpeg libpng libsamplerate libsndfile libtiff mesa openal opencolorio openexr openimageio /* openjpeg */ python zlib fftw - ] ++ optional jackaudioSupport jackaudio; + ] + ++ optional jackaudioSupport jack2 + ++ optional cudaSupport cudatoolkit6; postUnpack = '' substituteInPlace */doc/manpage/blender.1.py --replace /usr/bin/python ${python}/bin/python3 ''; + patches = [(fetchpatch { # fix parallel builds + url = "https://developer.blender.org/D619?download=true"; + sha256 = "18h4fqsbpwxzqz7qby18lrrbzqnyd5xnann3xcac5wddwv5wjb0f"; + name = "D619.diff"; + })]; + patchFlags = "-p0"; + cmakeFlags = [ "-DOPENEXR_INC=${openexr}/include/OpenEXR" "-DWITH_OPENCOLLADA=OFF" @@ -38,7 +48,8 @@ stdenv.mkDerivation rec { "-DPYTHON_INCLUDE_DIR=${python}/include/python${python.majorVersion}m" "-DPYTHON_VERSION=${python.majorVersion}" ] - ++ optional jackaudioSupport "-DWITH_JACK=ON"; + ++ optional jackaudioSupport "-DWITH_JACK=ON" + ++ optional cudaSupport "-DWITH_CYCLES_CUDA_BINARIES=ON"; NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR -I${python}/include/${python.libPrefix}m"; diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 95f28d9058a0cc84d0aa2148a2ac6b3d12a2cd27..3d814bf6a30488a6cf3ca86b0e961a41364df490 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "calibre-1.45.0"; + name = "calibre-1.48.0"; src = fetchurl { url = "mirror://sourceforge/calibre/${name}.tar.xz"; - sha256 = "0g9fzpkjvi0h7h5azk3v425l8gxd8zidcz3nrzlg26hgvbkzpm20"; + sha256 = "0wplmf3p4s5zwn9ri8ry18bx7k3pw1c1ngrc4msf7i8icq7hj177"; }; inherit python; diff --git a/pkgs/applications/misc/camlistore/default.nix b/pkgs/applications/misc/camlistore/default.nix index 80d8dd801a9bef1f2e6cf8e42e71f637ac32355f..56131425ab4b2f016f0b6f7e1efd71c8497e278e 100644 --- a/pkgs/applications/misc/camlistore/default.nix +++ b/pkgs/applications/misc/camlistore/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin cp bin/* $out/bin ''; diff --git a/pkgs/applications/misc/d4x/default.nix b/pkgs/applications/misc/d4x/default.nix index 4eb4c441c99d931d62b8f30697907383e2e16c80..d6ca3939d137e4f727064f6a4f10ceb5c8cc884f 100644 --- a/pkgs/applications/misc/d4x/default.nix +++ b/pkgs/applications/misc/d4x/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation { meta = { description = "Graphical download manager"; homepage = http://www.krasu.ru/soft/chuchelo/; - license = "Artistic"; + license = "perl"; }; } diff --git a/pkgs/applications/misc/dmenu/default.nix b/pkgs/applications/misc/dmenu/default.nix index 3fecddcb316cf903370ef85ee8688a88283f417a..1ba3ee5268f7a0f2051044f7dca5ff63e3dcaa9f 100644 --- a/pkgs/applications/misc/dmenu/default.nix +++ b/pkgs/applications/misc/dmenu/default.nix @@ -28,9 +28,8 @@ stdenv.mkDerivation rec { meta = { description = "a generic, highly customizable, and efficient menu for the X Window System"; homepage = http://tools.suckless.org/dmenu; - license = "MIT"; + license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; all; }; } - diff --git a/pkgs/applications/misc/dunst/default.nix b/pkgs/applications/misc/dunst/default.nix index 1b61d75ddf2e2711b4662729666b1d89508c35a7..039b4ac688bfc22cd654c731b9aaa78b23d2565f 100644 --- a/pkgs/applications/misc/dunst/default.nix +++ b/pkgs/applications/misc/dunst/default.nix @@ -1,18 +1,15 @@ -{ stdenv, fetchgit, coreutils , unzip, which, pkgconfig , dbus +{ stdenv, fetchurl, coreutils , unzip, which, pkgconfig , dbus , freetype, xdg_utils , libXext, glib, pango , cairo, libX11, libnotify , libxdg_basedir , libXScrnSaver, xproto, libXinerama , perl, gdk_pixbuf }: stdenv.mkDerivation rec { - rev = "6a3a855b48a3db64821d1cf8a91c5ee2815a2b2d"; - name = "dunst-0-${stdenv.lib.strings.substring 0 7 rev}"; + name = "dunst-1.1.0"; + version = "1.1.0"; - # 1.0.0 release doesn't include 100% CPU fix - # https://github.com/knopwob/dunst/issues/98 - src = fetchgit { - inherit rev; - url = "https://github.com/knopwob/dunst.git"; - sha256 = "0m7yki16d72xm9n2m2fjszd8phqpn5b95q894cz75pmd0sv1j6bj"; + src = fetchurl { + url = "https://github.com/knopwob/dunst/archive/v${version}.tar.gz"; + sha256 = "0x95f57s0a96c4lifxdpf73v706iggwmdw8742mabbjnxq55l1qs"; }; patchPhase = '' @@ -26,7 +23,7 @@ stdenv.mkDerivation rec { libXScrnSaver xproto libXinerama perl]; buildPhase = '' - export VERSION=${rev}; + export VERSION=${version}; export PREFIX=$out; make dunst; ''; diff --git a/pkgs/applications/misc/epdfview/default.nix b/pkgs/applications/misc/epdfview/default.nix index 6941e8df626a658d214f0e04b17f03b809a9f48f..d79162289c3c71d2344c73642ee96f6c0c7ba1da 100644 --- a/pkgs/applications/misc/epdfview/default.nix +++ b/pkgs/applications/misc/epdfview/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { GTK+ libraries. The aim of ePDFView is to make a simple PDF document viewer, in the lines of Evince but without using the Gnome libraries. ''; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ astsmtl ]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/misc/evopedia/default.nix b/pkgs/applications/misc/evopedia/default.nix index b070b629282c35d832a29a25cc5a02d83d0d1809..5ad82c9239c82eff55350e4fb45bd915d39bd9c0 100644 --- a/pkgs/applications/misc/evopedia/default.nix +++ b/pkgs/applications/misc/evopedia/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "Offline Wikipedia Viewer"; homepage = http://www.evopedia.info; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/misc/evtest/default.nix b/pkgs/applications/misc/evtest/default.nix index f2dadd2e5e8b1b4db54485fb088f1aecae400d30..638f254364e847b603543897f3c4b63ce87cd712 100644 --- a/pkgs/applications/misc/evtest/default.nix +++ b/pkgs/applications/misc/evtest/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Simple tool for input event debugging"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; }; diff --git a/pkgs/applications/misc/freicoin/default.nix b/pkgs/applications/misc/freicoin/default.nix index 33d8585bb2dd686babe13180123f051aab215425..65265fc07a5a8f8746832926fa14185686145f26 100644 --- a/pkgs/applications/misc/freicoin/default.nix +++ b/pkgs/applications/misc/freicoin/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "Peer-to-peer currency with demurrage fee"; homepage = "http://freicoi.in/"; - license = "MIT"; + license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/misc/girara/default.nix b/pkgs/applications/misc/girara/default.nix index 4db4e4b109162ad595d6aa7e002ce8536c703db2..b25d347ec873bfe7b9d02bc2b7b82e51bb04eb96 100644 --- a/pkgs/applications/misc/girara/default.nix +++ b/pkgs/applications/misc/girara/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, gtk, gettext }: stdenv.mkDerivation rec { - name = "girara-0.2.0"; + name = "girara-0.2.2"; src = fetchurl { url = "http://pwmt.org/projects/girara/download/${name}.tar.gz"; - sha256 = "0k8p5sgazqw7r78ssqh8bm2hn98xjml5w76l9awa66yq0k5m8jyi"; + sha256 = "0lv6wqhx2avdxj6yx111jfs4j32r0xzmmkhy7pgzxpf73kgxz0k3"; }; buildInputs = [ pkgconfig gtk gettext ]; diff --git a/pkgs/applications/misc/gkrellm/default.nix b/pkgs/applications/misc/gkrellm/default.nix index 3b8f8b1cc680fabe0e44dfc0bd5172a8d0e1b280..81f74847c2f0120b35b0a1d5e0d7e712d55076cb 100644 --- a/pkgs/applications/misc/gkrellm/default.nix +++ b/pkgs/applications/misc/gkrellm/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ''; homepage = http://members.dslextreme.com/users/billw/gkrellm/gkrellm.html; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/applications/misc/gksu/default.nix b/pkgs/applications/misc/gksu/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..61fd44925b71dd9baf07fef76a71d01a31ce859a --- /dev/null +++ b/pkgs/applications/misc/gksu/default.nix @@ -0,0 +1,48 @@ +{ stdenv, fetchurl, pkgconfig, makeWrapper, gtk, gnome3, libgksu, + intltool, libstartup_notification, gtk_doc +}: + +stdenv.mkDerivation rec { + version = "2.0.2"; + pname = "gksu"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "http://people.debian.org/~kov/gksu/${name}.tar.gz"; + sha256 = "0npfanlh28daapkg25q4fncxd89rjhvid5fwzjaw324x0g53vpm1"; + }; + + patches = [ + # https://savannah.nongnu.org/bugs/index.php?36127 + ./gksu-2.0.2-glib-2.31.patch + ]; + + postPatch = '' + sed -i -e 's|/usr/bin/x-terminal-emulator|-l gnome-terminal|g' gksu.desktop + ''; + + configureFlags = "--disable-nautilus-extension"; + + buildInputs = [ + pkgconfig makeWrapper gtk gnome3.gconf intltool + libstartup_notification gnome3.libgnome_keyring gtk_doc + ]; + + propagatedBuildInputs = [ + libgksu + ]; + + meta = { + description = "A graphical frontend for libgksu"; + longDescription = '' + GKSu is a library that provides a Gtk+ frontend to su and sudo. + It supports login shells and preserving environment when acting as + a su frontend. It is useful to menu items or other graphical + programs that need to ask a user's password to run another program + as another user. + ''; + homepage = "http://www.nongnu.org/gksu/"; + license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.romildo ]; + }; +} diff --git a/pkgs/applications/misc/gksu/gksu-2.0.2-glib-2.31.patch b/pkgs/applications/misc/gksu/gksu-2.0.2-glib-2.31.patch new file mode 100644 index 0000000000000000000000000000000000000000..fd711a321acf990fe52beb838cf0ab73a4e12978 --- /dev/null +++ b/pkgs/applications/misc/gksu/gksu-2.0.2-glib-2.31.patch @@ -0,0 +1,29 @@ +From 10c7e67e11a56e2fe1acf9b085772bc995d35bc0 Mon Sep 17 00:00:00 2001 +From: Alexandre Rostovtsev +Date: Sat, 7 Apr 2012 17:57:36 -0400 +Subject: [PATCH] Fix glib includes for building with >=glib-2.31 + +glib-2.31 and newer no longer allow most glib subheaders to be included +directly. + +https://savannah.nongnu.org/bugs/index.php?36127 +--- + nautilus-gksu/libnautilus-gksu.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/nautilus-gksu/libnautilus-gksu.c b/nautilus-gksu/libnautilus-gksu.c +index 8e44d29..4acf3f8 100644 +--- a/nautilus-gksu/libnautilus-gksu.c ++++ b/nautilus-gksu/libnautilus-gksu.c +@@ -5,7 +5,7 @@ + #include + #include + +-#include ++#include + #include + #include + #include +-- +1.7.8.5 + diff --git a/pkgs/applications/misc/googleearth/default.nix b/pkgs/applications/misc/googleearth/default.nix index 08b868bca9263475f3cccdc149bbb3997be2fb57..ea577beb59294d6d255b48495def2bd3bd509b5c 100644 --- a/pkgs/applications/misc/googleearth/default.nix +++ b/pkgs/applications/misc/googleearth/default.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation { meta = { description = "A world sphere viewer"; homepage = http://earth.google.com; - license = "unfree"; + license = stdenv.lib.licenses.unfree; maintainers = [ stdenv.lib.maintainers.viric ]; }; } diff --git a/pkgs/applications/misc/gpsbabel/default.nix b/pkgs/applications/misc/gpsbabel/default.nix index 29d5b1ee7cc80fbe40144b0832c8fa294542a827..bf44f91056d7537e17aa9f7b42ead1e188549551 100644 --- a/pkgs/applications/misc/gpsbabel/default.nix +++ b/pkgs/applications/misc/gpsbabel/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation { homepage = http://www.gpsbabel.org/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; platforms = stdenv.lib.platforms.gnu; # arbitrary choice diff --git a/pkgs/applications/misc/gpscorrelate/default.nix b/pkgs/applications/misc/gpscorrelate/default.nix index 141476a6b4060991a8156ae28174180cfe4390f0..9a59329871e62923fafe3efac3f57943737a709f 100644 --- a/pkgs/applications/misc/gpscorrelate/default.nix +++ b/pkgs/applications/misc/gpscorrelate/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { one takes the GPS data in a different format. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://freefoote.dview.net/linux_gpscorr.html; }; diff --git a/pkgs/applications/misc/grip/default.nix b/pkgs/applications/misc/grip/default.nix index 0c2b957bc7ca4b150ae5bc5b75c12fab6687f640..39621536e688eb3f2832ca8b4bcdce5532574a8a 100644 --- a/pkgs/applications/misc/grip/default.nix +++ b/pkgs/applications/misc/grip/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { description = "GTK+-based audio CD player/ripper"; homepage = "http://nostatic.org/grip"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.marcweber stdenv.lib.maintainers.simons ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/misc/gv/default.nix b/pkgs/applications/misc/gv/default.nix index efd9cf263e7cfd440e5aea6c4de05a3bf8ae9939..4867bef1f719ba2d3883a5c1f109135defe19ba5 100644 --- a/pkgs/applications/misc/gv/default.nix +++ b/pkgs/applications/misc/gv/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { interface for the Ghostscript interpreter. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ ]; platforms = stdenv.lib.platforms.gnu; # arbitrary choice }; diff --git a/pkgs/applications/misc/hello/ex-2/default.nix b/pkgs/applications/misc/hello/ex-2/default.nix index d3ade1ab8505d82f1171ef1a3483145b296ff51b..71c9777ff9b7ded7434363d9c9fbcf9570020d0e 100644 --- a/pkgs/applications/misc/hello/ex-2/default.nix +++ b/pkgs/applications/misc/hello/ex-2/default.nix @@ -17,8 +17,7 @@ stdenv.mkDerivation rec { It is fully customizable. ''; homepage = http://www.gnu.org/software/hello/manual/; - license = "GPLv3+"; - + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/applications/misc/htmldoc/default.nix b/pkgs/applications/misc/htmldoc/default.nix index befa8d25210081a48b8816cca1b66e2052821453..e8274418ae16938aee987b75e98a8549edd8e3c5 100644 --- a/pkgs/applications/misc/htmldoc/default.nix +++ b/pkgs/applications/misc/htmldoc/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.htmldoc.org/; description = "Converts HTML files to indexed HTML, PS or PDF"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ viric ]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix index b347f971ee0f724ac9fcccba33dd9940c3d107f8..fab492d5c099a66b5acb0f9e0a589c215e7d66b0 100644 --- a/pkgs/applications/misc/ikiwiki/default.nix +++ b/pkgs/applications/misc/ikiwiki/default.nix @@ -83,7 +83,7 @@ stdenv.mkDerivation { meta = { description = "Wiki compiler, storing pages and history in a RCS"; homepage = "http://ikiwiki.info/"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.simons ]; diff --git a/pkgs/applications/misc/jigdo/default.nix b/pkgs/applications/misc/jigdo/default.nix index fe4c0287fdd2b787c1ac96caeedf2577788a1bec..d722367d1b49c195630c2d9f552d9cb95ace48d6 100644 --- a/pkgs/applications/misc/jigdo/default.nix +++ b/pkgs/applications/misc/jigdo/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation { meta = { description = "Download utility that can fetch files from several sources simultaneously"; homepage = http://atterer.net/jigdo/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/applications/misc/kde-wacomtablet/default.nix b/pkgs/applications/misc/kde-wacomtablet/default.nix index 3e652c717ec43e9cfb57489d6ebbccd60ffac308..ee93f57eafcd4994cd26d9b35de737146980f45b 100644 --- a/pkgs/applications/misc/kde-wacomtablet/default.nix +++ b/pkgs/applications/misc/kde-wacomtablet/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, kdelibs, gettext, xf86_input_wacom }: stdenv.mkDerivation rec { - name = "wacomtablet-2.0"; + name = "wacomtablet-2.0.2"; src = fetchurl { - url = "http://kde-apps.org/CONTENT/content-files/114856-wacomtablet-2.0.tar.bz2"; - sha256 = "1vqdmkfl0awsjxl6p8bihz198hlc75d3zn7xwwryc674l76s25ax"; + url = "http://kde-apps.org/CONTENT/content-files/114856-wacomtablet-2.0.2.tar.xz"; + sha256 = "13k5f5xpka5cbgl24a3j9khqcmp96x1vhynn9v558ag6dg9ch2hw"; }; buildInputs = [ kdelibs xf86_input_wacom ]; diff --git a/pkgs/applications/misc/keepass/default.nix b/pkgs/applications/misc/keepass/default.nix index 0098e626b4242e4d240a89d98b3479c20d963b79..89f794850d276baf010ea5454556307a652bd5fe 100644 --- a/pkgs/applications/misc/keepass/default.nix +++ b/pkgs/applications/misc/keepass/default.nix @@ -24,12 +24,12 @@ stdenv.mkDerivation rec { installPhase = '' - ensureDir "$out/bin" + mkdir -p "$out/bin" echo "${mono}/bin/mono $out/KeePass.exe" > $out/bin/keepass chmod +x $out/bin/keepass echo $out cp -r ./* $out/ - ensureDir "$out/share/applications" + mkdir -p "$out/share/applications" cp ${desktopItem}/share/applications/* $out/share/applications ''; diff --git a/pkgs/applications/misc/librecad/2.0.nix b/pkgs/applications/misc/librecad/2.0.nix index 2f140db93973271e430524ddfb5be7d166344dbc..8b7a9a40c872950bcc5afb4ed9ebe34a4f60652e 100644 --- a/pkgs/applications/misc/librecad/2.0.nix +++ b/pkgs/applications/misc/librecad/2.0.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { ''; installPhase = '' - ensureDir $out/bin $out/share + mkdir -p $out/bin $out/share cp -R unix/librecad $out/bin cp -R unix/resources $out/share/librecad ''; @@ -33,7 +33,7 @@ stdenv.mkDerivation { description = "A 2D CAD package based upon Qt"; homepage = http://librecad.org; repositories.git = git://github.com/LibreCAD/LibreCAD.git; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/misc/librecad/default.nix b/pkgs/applications/misc/librecad/default.nix index b225519f4868c84084d38a75e3f1bde257738dcf..b2960e9f47d438e065ea291848d422f5f77c3527 100644 --- a/pkgs/applications/misc/librecad/default.nix +++ b/pkgs/applications/misc/librecad/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { configurePhase = "qmake PREFIX=$out"; installPhase = '' - ensureDir $out/bin $out/share + mkdir -p $out/bin $out/share cp -R unix/librecad $out/bin cp -R unix/resources $out/share/librecad ''; @@ -27,7 +27,7 @@ stdenv.mkDerivation { meta = { description = "A 2D CAD package based upon Qt"; homepage = http://librecad.org; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/misc/llpp/default.nix b/pkgs/applications/misc/llpp/default.nix index 81ca87af7076388d7e39d6ea1854bcea58ca9770..e04898fba29fc7ea501d29b831c5aa20037ff08a 100644 --- a/pkgs/applications/misc/llpp/default.nix +++ b/pkgs/applications/misc/llpp/default.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation { ccopt="-O" ccopt="$ccopt -I ${jbig2dec}/include" ccopt="$ccopt -I ${libjpeg}/include" - ccopt="$ccopt -I ${freetype}/include" + ccopt="$ccopt -I ${freetype}/include/freetype2" ccopt="$ccopt -I ${openjpeg}/include" ccopt="$ccopt -I ${zlib}/include" ccopt="$ccopt -I ${mupdf}/include" - ccopt="$ccopt -include ${freetype}/include/ft2build.h" + ccopt="$ccopt -include ft2build.h" ccopt="$ccopt -D_GNU_SOURCE" cclib="$cclib -lmupdf" diff --git a/pkgs/applications/misc/lyx/default.nix b/pkgs/applications/misc/lyx/default.nix index 1ea4f06c9273a757c4f5d16ba0ed301556aa2703..36b2f84aab54896c9165d25ec865a68b753d1422 100644 --- a/pkgs/applications/misc/lyx/default.nix +++ b/pkgs/applications/misc/lyx/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = { description = "WYSIWYM frontend for LaTeX, DocBook"; homepage = "http://www.lyx.org"; - license = "GPL2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.vcunat ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/applications/misc/makeself/default.nix b/pkgs/applications/misc/makeself/default.nix index e433b83cdeb5767ac928cbfaf46696dad44458c5..3ba0faef96821581b53d17fc5694997f860d0e5d 100644 --- a/pkgs/applications/misc/makeself/default.nix +++ b/pkgs/applications/misc/makeself/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { homepage = http://megastep.org/makeself; description = "Utility to create self-extracting packages"; license = licenses.gpl2; - maintainer = maintainers.wmertens; + maintainers = [ maintainers.wmertens ]; platforms = platforms.all; }; } diff --git a/pkgs/applications/misc/merkaartor/default.nix b/pkgs/applications/misc/merkaartor/default.nix index e6636415b5ef39bae0fa7037222534ed1def10da..932e5bb483003d1c52739288781d902a4c18a188 100644 --- a/pkgs/applications/misc/merkaartor/default.nix +++ b/pkgs/applications/misc/merkaartor/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "An openstreetmap editor"; homepage = http://merkaartor.org/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric urkud]; inherit (qt4.meta) platforms; }; diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index a56460827f50f201dc1f37f67faf2ff6ada814a9..aa7c14634d13a950b2e20ee8dff52dbe1040b5a1 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { homepage = http://mupdf.com/; repositories.git = git://git.ghostscript.com/mupdf.git; description = "Lightweight PDF viewer and toolkit written in portable C"; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [ viric ]; platforms = with stdenv.lib.platforms; linux; inherit version; diff --git a/pkgs/applications/misc/navipowm/default.nix b/pkgs/applications/misc/navipowm/default.nix index a526774d48ecf0685986c59009e5d444df5ecb2c..6d990831a369b822755067c5a5dbe1f0774b3448 100644 --- a/pkgs/applications/misc/navipowm/default.nix +++ b/pkgs/applications/misc/navipowm/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://navipowm.sourceforge.net/; description = "Car navigation system"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ viric ]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/misc/navit/default.nix b/pkgs/applications/misc/navit/default.nix index ef1e777f55fd17167da330a121f442fbbf425e2c..1be39c66642172613ab674ddb503aa4d8bfa3083 100644 --- a/pkgs/applications/misc/navit/default.nix +++ b/pkgs/applications/misc/navit/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.navit-project.org/; description = "Car navigation system with routing engine using OSM maps"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ viric ]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/misc/nc-indicators/default.nix b/pkgs/applications/misc/nc-indicators/default.nix index 026485c771b36cde861dae50aff49d4ccb293ad8..3198333cce2534a0ca480e24edf6d54dd6032184 100644 --- a/pkgs/applications/misc/nc-indicators/default.nix +++ b/pkgs/applications/misc/nc-indicators/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "nc-indicators"; - version = "0.2"; - sha256 = "0z3h0d3cl0xapysq5sh1rnbp8fg8adlq0x3i4ql9xin9in29q27q"; + version = "0.3"; + sha256 = "0w5nddirsib9vz96dpan9bgdg1mag9gaz7w7ix51l44ls9r8yn3m"; isLibrary = false; isExecutable = true; buildDepends = [ attoparsec gtk hflags lens pipes stm ]; diff --git a/pkgs/applications/misc/openjump/default.nix b/pkgs/applications/misc/openjump/default.nix index 74f657ee02a787c3b3a37f9836713449dc14868d..8a68bd7ccfb9788f9dcf281f8d51f95a0b16f120 100644 --- a/pkgs/applications/misc/openjump/default.nix +++ b/pkgs/applications/misc/openjump/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { meta = { description = "open source Geographic Information System (GIS) written in the Java programming language"; homepage = http://www.openjump.org/index.html; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [stdenv.lib.maintainers.marcweber]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/applications/misc/qgis/default.nix b/pkgs/applications/misc/qgis/default.nix index d6711c82968e317690690788f6ef2c393cc5c0fb..cc26a74802b4478d509b5fe2987ee760bf874a95 100644 --- a/pkgs/applications/misc/qgis/default.nix +++ b/pkgs/applications/misc/qgis/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "User friendly Open Source Geographic Information System"; homepage = http://www.qgis.org; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = with stdenv.lib.platforms; linux; maintainers = with stdenv.lib.maintainers; [viric]; }; diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix index 88d6e7a7cf94a04c2ff70557f38b6484c2e00087..abf55aa22b9743218fac844fa65d93436766ef9a 100644 --- a/pkgs/applications/misc/redshift/default.nix +++ b/pkgs/applications/misc/redshift/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { temperature transitions smoothly from night to daytime temperature to allow your eyes to slowly adapt. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; homepage = "http://jonls.dk/redshift"; platforms = platforms.linux; maintainers = maintainers.mornfall; diff --git a/pkgs/applications/misc/robomongo/default.nix b/pkgs/applications/misc/robomongo/default.nix index c36d9254670a3b4bde7337aea9d3768fc2c50571..ab8a803b7cb48410f76544ea010a5cbc98fb8c10 100644 --- a/pkgs/applications/misc/robomongo/default.nix +++ b/pkgs/applications/misc/robomongo/default.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation { platforms = stdenv.lib.platforms.unix; license = stdenv.lib.licenses.gpl3; maintainers = [ stdenv.lib.maintainers.amorsillo ]; + broken = true; }; } diff --git a/pkgs/applications/misc/sakura/default.nix b/pkgs/applications/misc/sakura/default.nix index e1492a4769140d12beadd4a7d2abeed03710a231..151b8a077d5d6e16ecdf4b5947d2d35aa748fb31 100644 --- a/pkgs/applications/misc/sakura/default.nix +++ b/pkgs/applications/misc/sakura/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { terminals in one window and adds a contextual menu with some basic options. No more no less. ''; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ astsmtl ]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/misc/st/default.nix b/pkgs/applications/misc/st/default.nix index 9c57fbd19a7707aedc562792f5258f2b5b9c034d..1dcdf78456d2a5c7be83cd3b20d0eb983c1215b8 100644 --- a/pkgs/applications/misc/st/default.nix +++ b/pkgs/applications/misc/st/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://st.suckless.org/; - license = "MIT"; + license = stdenv.lib.licenses.mit; maintainers = with maintainers; [viric]; platforms = with platforms; linux; }; diff --git a/pkgs/applications/misc/stardict/stardict.nix b/pkgs/applications/misc/stardict/stardict.nix index 9eb3e112342147616bc1531c9bcdd46ba3bb07ca..1ca8ec045d612a21bed103ce09c182eedfdcddb5 100644 --- a/pkgs/applications/misc/stardict/stardict.nix +++ b/pkgs/applications/misc/stardict/stardict.nix @@ -39,8 +39,7 @@ stdenv.mkDerivation rec { meta = { description = "stardict"; homepage = "A international dictionary supporting fuzzy and glob style matching"; - license = "LGPL3"; + license = stdenv.lib.licenses.lgpl3; maintainers = with stdenv.lib.maintainers; [qknight]; }; } - diff --git a/pkgs/applications/misc/surf/default.nix b/pkgs/applications/misc/surf/default.nix index 651cfcca40673360e22d8daeaa74e171d0fa9abf..983fbde0c459383ce0bfcd1339da78688da982f3 100644 --- a/pkgs/applications/misc/surf/default.nix +++ b/pkgs/applications/misc/surf/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { surf to another URI by setting its XProperties. ''; homepage = http://surf.suckless.org; - license = "MIT"; + license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix index 834b514148b62d18dcfaf37902a52566b47de323..8d914c262212cf3ae14a1f62a4178be68f1671c1 100644 --- a/pkgs/applications/misc/synergy/default.nix +++ b/pkgs/applications/misc/synergy/default.nix @@ -6,11 +6,11 @@ assert stdenv.isLinux -> cryptopp != null; with stdenv.lib; stdenv.mkDerivation rec { - name = "synergy-1.4.17"; + name = "synergy-1.5.0"; src = fetchurl { - url = "http://fossfiles.com/synergy/${name}-r2055-Source.tar.gz"; - sha256 = "1mwaapvq9vsm0rdpq99fyzcw6wbp83rg6cylcqcgjjd21c6y9iwm"; + url = "http://synergy-project.org/files/packages/synergy-1.5.0-r2278-Source.tar.gz"; + sha256 = "097hk9v01lwzs7ly6ynadxmjh7ad68l5si7w4qmjn6z7l8b61gv6"; }; patches = optional stdenv.isLinux ./cryptopp.patch; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { # http://synergy-foss.org/spit/issues/details/3317/ installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin cp ../bin/synergyc $out/bin cp ../bin/synergys $out/bin cp ../bin/synergyd $out/bin diff --git a/pkgs/applications/misc/tangogps/default.nix b/pkgs/applications/misc/tangogps/default.nix index 609849166d1610a7318c61d31040d431dfb9abb9..aa1df2c9d1a6c57d3d40b4ae9055291a41e181e8 100644 --- a/pkgs/applications/misc/tangogps/default.nix +++ b/pkgs/applications/misc/tangogps/default.nix @@ -38,6 +38,6 @@ stdenv.mkDerivation rec { #homepage = http://www.tangogps.org/; # no longer valid, I couldn't find any other - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/applications/misc/taskjuggler/default.nix b/pkgs/applications/misc/taskjuggler/default.nix index 77acc511fe4206aab79844e2e1d1387118deb84d..e1e04771460315796025cdf4ca5fd60c3935fc37 100644 --- a/pkgs/applications/misc/taskjuggler/default.nix +++ b/pkgs/applications/misc/taskjuggler/default.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.taskjuggler.org"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; description = "Project management tool"; longDescription = '' TaskJuggler is a modern and powerful, Open Source project management diff --git a/pkgs/applications/misc/vanitygen/default.nix b/pkgs/applications/misc/vanitygen/default.nix index e16767d4c261287045c1a56d9bf66de7202eccfa..6be2dc394cc45cf47d5b8f56133b5c9f5617f3c7 100644 --- a/pkgs/applications/misc/vanitygen/default.nix +++ b/pkgs/applications/misc/vanitygen/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ openssl pcre ]; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin cp vanitygen $out/bin cp keyconv $out/bin/vanitygen-keyconv ''; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { and will run about 30% faster. ''; homepage = "https://github.com/samr7/vanitygen"; - license = "AGPLv3"; + license = stdenv.lib.licenses.agpl3; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/applications/misc/viking/default.nix b/pkgs/applications/misc/viking/default.nix index 70ac055db098d04548586a3bcd977c851fb829bd..6508b12e1de8f84478d8a0d226c44ccbe36a57fb 100644 --- a/pkgs/applications/misc/viking/default.nix +++ b/pkgs/applications/misc/viking/default.nix @@ -38,6 +38,6 @@ stdenv.mkDerivation { homepage = http://viking.sourceforge.net/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/applications/misc/wmname/default.nix b/pkgs/applications/misc/wmname/default.nix index 417d4a5ae68350c88a0844f73244247493876a57..0f71a53075f9ac0e6abc9cac955f68a973a93630 100644 --- a/pkgs/applications/misc/wmname/default.nix +++ b/pkgs/applications/misc/wmname/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { meta = { description = "Prints or set the window manager name property of the root window"; homepage = "http://tools.suckless.org/wmname"; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/applications/misc/xcruiser/default.nix b/pkgs/applications/misc/xcruiser/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..15202a1e90c62afe19be7fd60e25ed417924446d --- /dev/null +++ b/pkgs/applications/misc/xcruiser/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, gccmakedep, xlibs }: + +stdenv.mkDerivation { + name = "xcruiser-0.30"; + + src = fetchurl { + url = mirror://sourceforge/xcruiser/xcruiser/xcruiser-0.30/xcruiser-0.30.tar.gz; + sha256 = "1r8whva38xizqdh7jmn6wcmfmsndc67pkw22wzfzr6rq0vf6hywi"; + }; + + buildInputs = with xlibs; [ gccmakedep imake libXt libXaw libXpm libXext ]; + + configurePhase = "xmkmf -a"; + + preBuild = '' + makeFlagsArray=( BINDIR=$out/bin XAPPLOADDIR=$out/etc/X11/app-defaults) + ''; + + meta = with stdenv.lib; + { description = "Filesystem visualization utility"; + longDescription = '' + XCruiser, formerly known as XCruise, is a filesystem visualization utility. + It constructs a virtually 3-D formed universe from a directory + tree and allows you to "cruise" within a visualized filesystem. + ''; + homepage = http://xcruiser.sourceforge.net/; + license = licenses.gpl2; + maintainers = with maintainers; [ emery ]; + }; +} diff --git a/pkgs/applications/misc/xfe/default.nix b/pkgs/applications/misc/xfe/default.nix index 9b1385d9d6ad157057d7af58e05c17a7b0b42d4a..d09a899b897f4cb3ebdc87515f32c0af6accfa10 100644 --- a/pkgs/applications/misc/xfe/default.nix +++ b/pkgs/applications/misc/xfe/default.nix @@ -24,8 +24,8 @@ stdenv.mkDerivation rec { Xfe aims to be the filemanager of choice for all the Unix addicts! ''; homepage = "http://sourceforge.net/projects/xfe/"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.bbenoist ]; - platforms = stdenv.lib.platforms.mesaPlatforms; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/misc/xfontsel/default.nix b/pkgs/applications/misc/xfontsel/default.nix index 215ea75105f87f61612f1bd813cf18a3f96ddafd..9bf23885c1755066d6256efb63cdfcdc0035b1ab 100644 --- a/pkgs/applications/misc/xfontsel/default.nix +++ b/pkgs/applications/misc/xfontsel/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.x.org/; description = "Allows testing the fonts available in an X server"; - licesnse = "free"; + license = "free"; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/misc/xlsfonts/default.nix b/pkgs/applications/misc/xlsfonts/default.nix index 71d0a39296e9a7c51b550eef3bd68d34291b158b..d142af486b51c23f4302dcf3722050e948c8dcaa 100644 --- a/pkgs/applications/misc/xlsfonts/default.nix +++ b/pkgs/applications/misc/xlsfonts/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.x.org/; description = "Lists the fonts available in the X server"; - licesnse = "free"; + license = "free"; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/misc/xmobar/default.nix b/pkgs/applications/misc/xmobar/default.nix index 7bd405f90a035338e8b2e0a063424bf6c88c2de3..8d73dfebb188bbaecc4421afa3fa7835387f813d 100644 --- a/pkgs/applications/misc/xmobar/default.nix +++ b/pkgs/applications/misc/xmobar/default.nix @@ -23,7 +23,6 @@ cabal.mkDerivation (self: { homepage = "http://xmobar.org"; description = "A Minimalistic Text Based Status Bar"; license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + platforms = self.stdenv.lib.platforms.linux; }; }) diff --git a/pkgs/applications/misc/xneur/default.nix b/pkgs/applications/misc/xneur/default.nix index 4f6e3342f588d213e17cf867fcb1bdca989e4400..cc08436fa0331c4354752d42155f43894c560248 100644 --- a/pkgs/applications/misc/xneur/default.nix +++ b/pkgs/applications/misc/xneur/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = { description = "Utility for switching between keyboard layouts"; homepage = http://xneur.ru; - license = "GPL2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.raskin ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix index 933882c940bbce0a8e16305120a98673cf7b5b88..5f44f79ebcddb89b87ae3d9963889089362da2b7 100644 --- a/pkgs/applications/misc/zathura/core/default.nix +++ b/pkgs/applications/misc/zathura/core/default.nix @@ -1,23 +1,16 @@ { stdenv, fetchurl, pkgconfig, gtk, girara, gettext, docutils, file, makeWrapper, zathura_icon }: stdenv.mkDerivation rec { - version = "0.2.7"; + version = "0.2.9"; name = "zathura-core-${version}"; src = fetchurl { url = "http://pwmt.org/projects/zathura/download/zathura-${version}.tar.gz"; - sha256 = "ef43be7705612937d095bfbe719a03503bf7e45493ea9409cb43a45cf96f0daf"; + sha256 = "17z05skjk95115ajp6459k1djadza1w8kck7jn1qnd697r01s1rc"; }; buildInputs = [ pkgconfig file gtk girara gettext makeWrapper ]; - # Bug in zathura build system: we should remove empty manfiles in order them - # to be compiled properly - preBuild = '' - rm zathura.1 - rm zathurarc.5 - ''; - makeFlags = [ "PREFIX=$(out)" "RSTTOMAN=${docutils}/bin/rst2man.py" "VERBOSE=1" ]; postInstall = '' diff --git a/pkgs/applications/networking/bittorrentsync/default.nix b/pkgs/applications/networking/bittorrentsync/default.nix index abb94a32bd7151f69630e39650db8ef612631005..989ceb235b0277db80e931fc7aef3e829476b2c7 100644 --- a/pkgs/applications/networking/bittorrentsync/default.nix +++ b/pkgs/applications/networking/bittorrentsync/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { buildInputs = [ patchelf ]; installPhase = '' - ensureDir "$out/bin/" + mkdir -p "$out/bin/" cp -r "btsync" "$out/bin/" patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix index d425c3f073847776e2474da80fb164f1b2eb13c5..ffc23a9d968df4e45c32b97a4c00bce30c734b02 100644 --- a/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/pkgs/applications/networking/browsers/chromium/browser.nix @@ -8,7 +8,7 @@ mkChromiumDerivation (base: rec { buildTargets = [ "mksnapshot" "chrome" ]; installPhase = '' - ensureDir "$libExecPath" + mkdir -p "$libExecPath" cp -v "$buildPath/"*.pak "$libExecPath/" cp -v "$buildPath/icudtl.dat" "$libExecPath/" cp -vLR "$buildPath/locales" "$buildPath/resources" "$libExecPath/" diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 3aac5f9b17ae49b853e66a46fdd590d90fd844cc..311257952712aaca3e1d0bb7d9c11279d499b64a 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -79,7 +79,7 @@ let }; opusWithCustomModes = libopus.override { - withCustomModes = !versionOlder source.version "35.0.0.0"; + withCustomModes = true; }; defaultDependencies = [ @@ -132,19 +132,13 @@ let find -iname '*.gyp*' \( -type f -o -type l \) \ -exec sed -i -e 's|<(DEPTH)|'"$(pwd)"'|g' {} + \ -exec chmod u+w {} + - '' + optionalString (!versionOlder source.version "37.0.0.0") '' - python third_party/libaddressinput/chromium/tools/update-strings.py ''; - postPatch = let - toPatch = if versionOlder source.version "36.0.0.0" - then "content/browser/browser_main_loop.cc" - else "sandbox/linux/suid/client/setuid_sandbox_client.cc"; - in '' + postPatch = '' sed -i -e '/base::FilePath exe_dir/,/^ *} *$/c \ sandbox_binary = base::FilePath(getenv("CHROMIUM_SANDBOX_BINARY_PATH")); - ' ${toPatch} - '' + optionalString (!versionOlder source.version "36.0.0.0") '' + ' sandbox/linux/suid/client/setuid_sandbox_client.cc + sed -i -e '/module_path *=.*libexif.so/ { s|= [^;]*|= base::FilePath().AppendASCII("${libexif}/lib/libexif.so")| }' chrome/utility/media_galleries/image_metadata_extractor.cc @@ -165,6 +159,7 @@ let use_cups = cupsSupport; linux_sandbox_chrome_path="${libExecPath}/${packageName}"; werror = ""; + clang = false; # FIXME: In version 37, omnibox.mojom.js doesn't seem to be generated. use_mojo = versionOlder source.version "37.0.0.0"; diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 44fd3c69e537fce59189a4e4bfd5996b9861d4d8..4dfdca882bc8c415c73abe5e8df53698164f153a 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -67,7 +67,7 @@ in stdenv.mkDerivation { browserBinary = "${chromium.browser}/libexec/chromium/chromium"; sandboxBinary = "${chromium.sandbox}/bin/chromium-sandbox"; in '' - ensureDir "$out/bin" "$out/share/applications" + mkdir -p "$out/bin" "$out/share/applications" ln -s "${chromium.browser}/share" "$out/share" makeWrapper "${browserBinary}" "$out/bin/chromium" \ diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix index f760b06fe24be6fceb61be535c188fe3c6995b1f..e0c45f91075108aff1ff413ac069687f6394f179 100644 --- a/pkgs/applications/networking/browsers/chromium/plugins.nix +++ b/pkgs/applications/networking/browsers/chromium/plugins.nix @@ -22,7 +22,7 @@ let else if source.channel == "stable" then "chrome" else "chrome-${source.channel}"; in '' - ensureDir plugins + mkdir -p plugins ar p "$src" data.tar.lzma | tar xJ -C plugins --strip-components=4 \ ./opt/google/${chan}/PepperFlash \ ./opt/google/${chan}/libpdf.so @@ -53,7 +53,7 @@ let pdfInfo = "#${pdfName}#${pdfDescription};${pdfMimeTypes}"; in '' install -vD libpdf.so "$pdf/lib/libpdf.so" - ensureDir "$pdf/nix-support" + mkdir -p "$pdf/nix-support" echo "--register-pepper-plugins='$pdf/lib/libpdf.so${pdfInfo}'" \ > "$pdf/nix-support/chromium-flags" @@ -63,7 +63,7 @@ let install -vD PepperFlash/libpepflashplayer.so \ "$flash/lib/libpepflashplayer.so" - ensureDir "$flash/nix-support" + mkdir -p "$flash/nix-support" echo "--ppapi-flash-path='$flash/lib/libpepflashplayer.so'" \ "--ppapi-flash-version=$flashVersion" \ > "$flash/nix-support/chromium-flags" diff --git a/pkgs/applications/networking/browsers/chromium/source/angle_build_37.patch b/pkgs/applications/networking/browsers/chromium/source/angle_build_37.patch deleted file mode 100644 index a3e8c91174a4b1af1e3bc01c4a0a7c2a66d633e3..0000000000000000000000000000000000000000 --- a/pkgs/applications/networking/browsers/chromium/source/angle_build_37.patch +++ /dev/null @@ -1,347 +0,0 @@ -commit 9c4b24a52e0ff478aa170d33e26c44acd8c68be3 -Author: Jamie Madill -Date: Thu Jun 12 13:41:17 2014 -0400 - - Use commit_id.py on Windows, and handle missing git. - - This allows us to delete the Windows batch file. - - Changes the commit_id script to take the working directory so that it - can be called from a different working directory than the angle - repository is in. - - Renames the generated commit header to angle_commit.h. This is being - written to the shared generated code directory for the entire build, - and "commit.h" is insufficiently unique. - - BUG=angle:669 - - Change-Id: I35e80411a7e8ba1e02ce3f6a4fc54ed4dbc918f3 - Reviewed-on: https://chromium-review.googlesource.com/202048 - Reviewed-by: Geoff Lang - Tested-by: Jamie Madill - [Removed and/or fixed up Windows specific hunks] - Signed-off-by: aszlig - -diff --git a/generate_projects b/generate_projects -index 6743254..8175277 100644 ---- a/generate_projects -+++ b/generate_projects -@@ -34,6 +34,7 @@ if __name__ == '__main__': - gyp_cmd += ' -D angle_build_tests=' + ('1' if build_tests else '0') - gyp_cmd += ' -D angle_build_samples=' + ('1' if build_samples else '0') - gyp_cmd += ' -D release_symbols=' + ('true' if release_symbols else 'false') -+ gyp_cmd += ' -D angle_use_commit_id=0' - gyp_cmd += ' ' + os.path.join(script_dir, 'all.gyp') - - print 'Generating projects to ' + generation_dir + ' from gyp files...' -diff --git a/projects/build/all.sln b/projects/build/all.sln -index 1aa0796..5862edd 100644 ---- a/projects/build/all.sln -+++ b/projects/build/all.sln -@@ -3,11 +3,11 @@ Microsoft Visual Studio Solution File, Format Version 11.00 - Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "All", "All.vcxproj", "{D048EF6F-5312-AF41-8D8A-DB22CD8634E6}" - ProjectSection(ProjectDependencies) = postProject - {63FB0B97-D1D9-5158-8E85-7F5B1E403817} = {63FB0B97-D1D9-5158-8E85-7F5B1E403817} -- {3B7F5656-177F-52EE-26B3-D6A75368D0A9} = {3B7F5656-177F-52EE-26B3-D6A75368D0A9} - {C7BAF548-697D-2DCB-9DF3-9D1506A7B444} = {C7BAF548-697D-2DCB-9DF3-9D1506A7B444} - {276D20F5-2943-414C-0FF6-21F4723A5CF6} = {276D20F5-2943-414C-0FF6-21F4723A5CF6} - {C15697F6-5057-016E-BD29-422971875679} = {C15697F6-5057-016E-BD29-422971875679} - {19386E01-D811-FA3B-9F1E-122BB0C0E9F5} = {19386E01-D811-FA3B-9F1E-122BB0C0E9F5} -+ {3B7F5656-177F-52EE-26B3-D6A75368D0A9} = {3B7F5656-177F-52EE-26B3-D6A75368D0A9} - {22DC02D5-1598-943C-13E1-82185B469F81} = {22DC02D5-1598-943C-13E1-82185B469F81} - {7FBD6F69-B9A4-69F1-A12B-8DACB3F8CD81} = {7FBD6F69-B9A4-69F1-A12B-8DACB3F8CD81} - {FBAEE4F6-562A-588F-01F9-72DCABB3B061} = {FBAEE4F6-562A-588F-01F9-72DCABB3B061} -@@ -30,9 +30,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "All", "All.vcxproj", "{D048 - EndProjectSection - EndProject - Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "commit_id", "..\src\commit_id.vcxproj", "{3B7F5656-177F-52EE-26B3-D6A75368D0A9}" -- ProjectSection(ProjectDependencies) = postProject -- {63FB0B97-D1D9-5158-8E85-7F5B1E403817} = {63FB0B97-D1D9-5158-8E85-7F5B1E403817} -- EndProjectSection - EndProject - Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "copy_compiler_dll", "..\src\copy_compiler_dll.vcxproj", "{22DC02D5-1598-943C-13E1-82185B469F81}" - ProjectSection(ProjectDependencies) = postProject -@@ -68,7 +65,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libEGL", "..\src\libEGL.vcx - ProjectSection(ProjectDependencies) = postProject - {7FBD6F69-B9A4-69F1-A12B-8DACB3F8CD81} = {7FBD6F69-B9A4-69F1-A12B-8DACB3F8CD81} - {3B7F5656-177F-52EE-26B3-D6A75368D0A9} = {3B7F5656-177F-52EE-26B3-D6A75368D0A9} -- {63FB0B97-D1D9-5158-8E85-7F5B1E403817} = {63FB0B97-D1D9-5158-8E85-7F5B1E403817} - EndProjectSection - EndProject - Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGLESv2", "..\src\libGLESv2.vcxproj", "{7FBD6F69-B9A4-69F1-A12B-8DACB3F8CD81}" -diff --git a/projects/samples/samples.sln b/projects/samples/samples.sln -index 53cec34..b927860 100644 ---- a/projects/samples/samples.sln -+++ b/projects/samples/samples.sln -@@ -1,9 +1,6 @@ - Microsoft Visual Studio Solution File, Format Version 11.00 - # Visual C++ Express 2010 - Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "commit_id", "..\src\commit_id.vcxproj", "{3B7F5656-177F-52EE-26B3-D6A75368D0A9}" -- ProjectSection(ProjectDependencies) = postProject -- {63FB0B97-D1D9-5158-8E85-7F5B1E403817} = {63FB0B97-D1D9-5158-8E85-7F5B1E403817} -- EndProjectSection - EndProject - Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "copy_compiler_dll", "..\src\copy_compiler_dll.vcxproj", "{22DC02D5-1598-943C-13E1-82185B469F81}" - ProjectSection(ProjectDependencies) = postProject -@@ -39,7 +36,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libEGL", "..\src\libEGL.vcx - ProjectSection(ProjectDependencies) = postProject - {7FBD6F69-B9A4-69F1-A12B-8DACB3F8CD81} = {7FBD6F69-B9A4-69F1-A12B-8DACB3F8CD81} - {3B7F5656-177F-52EE-26B3-D6A75368D0A9} = {3B7F5656-177F-52EE-26B3-D6A75368D0A9} -- {63FB0B97-D1D9-5158-8E85-7F5B1E403817} = {63FB0B97-D1D9-5158-8E85-7F5B1E403817} - EndProjectSection - EndProject - Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGLESv2", "..\src\libGLESv2.vcxproj", "{7FBD6F69-B9A4-69F1-A12B-8DACB3F8CD81}" -diff --git a/projects/src/angle.sln b/projects/src/angle.sln -index 0d6ec65..cdf9f53 100644 ---- a/projects/src/angle.sln -+++ b/projects/src/angle.sln -@@ -1,9 +1,6 @@ - Microsoft Visual Studio Solution File, Format Version 11.00 - # Visual C++ Express 2010 - Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "commit_id", "commit_id.vcxproj", "{3B7F5656-177F-52EE-26B3-D6A75368D0A9}" -- ProjectSection(ProjectDependencies) = postProject -- {63FB0B97-D1D9-5158-8E85-7F5B1E403817} = {63FB0B97-D1D9-5158-8E85-7F5B1E403817} -- EndProjectSection - EndProject - Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "copy_compiler_dll", "copy_compiler_dll.vcxproj", "{22DC02D5-1598-943C-13E1-82185B469F81}" - ProjectSection(ProjectDependencies) = postProject -@@ -16,7 +13,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libEGL", "libEGL.vcxproj", - ProjectSection(ProjectDependencies) = postProject - {7FBD6F69-B9A4-69F1-A12B-8DACB3F8CD81} = {7FBD6F69-B9A4-69F1-A12B-8DACB3F8CD81} - {3B7F5656-177F-52EE-26B3-D6A75368D0A9} = {3B7F5656-177F-52EE-26B3-D6A75368D0A9} -- {63FB0B97-D1D9-5158-8E85-7F5B1E403817} = {63FB0B97-D1D9-5158-8E85-7F5B1E403817} - EndProjectSection - EndProject - Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGLESv2", "libGLESv2.vcxproj", "{7FBD6F69-B9A4-69F1-A12B-8DACB3F8CD81}" -diff --git a/src/angle.gypi b/src/angle.gypi -index 5339369..ef16749 100644 ---- a/src/angle.gypi -+++ b/src/angle.gypi -@@ -7,6 +7,12 @@ - { - 'angle_code': 1, - 'angle_post_build_script%': 0, -+ 'angle_gen_path': '<(SHARED_INTERMEDIATE_DIR)/angle', -+ 'angle_id_script_base': 'commit_id.py', -+ 'angle_id_script': '<(angle_gen_path)/<(angle_id_script_base)', -+ 'angle_id_header_base': 'commit.h', -+ 'angle_id_header': '<(angle_gen_path)/id/<(angle_id_header_base)', -+ 'angle_use_commit_id%': ' (checks if git is present) -+# Usage: commit_id.py gen (generates commit id) - -+def grab_output(command, cwd): -+ return sp.Popen(command, stdout=sp.PIPE, shell=True, cwd=cwd).communicate()[0].strip() -+ -+operation = sys.argv[1] -+cwd = sys.argv[2] -+ -+if operation == 'check': -+ index_path = os.path.join(cwd, '.git', 'index') -+ if os.path.exists(index_path): -+ print("1") -+ else: -+ print("0") -+ sys.exit(0) -+ -+output_file = sys.argv[3] - commit_id_size = 12 - - try: -- commit_id = grab_output('git', 'rev-parse', '--short=%d' % commit_id_size, 'HEAD') -- commit_date = grab_output('git', 'show', '-s', '--format=%ci', 'HEAD') -+ commit_id = grab_output('git rev-parse --short=%d HEAD' % commit_id_size, cwd) -+ commit_date = grab_output('git show -s --format=%ci HEAD', cwd) - except: - commit_id = 'invalid-hash' - commit_date = 'invalid-date' - --hfile = open(sys.argv[1], 'w') -+hfile = open(output_file, 'w') - - hfile.write('#define ANGLE_COMMIT_HASH "%s"\n' % commit_id) - hfile.write('#define ANGLE_COMMIT_HASH_SIZE %d\n' % commit_id_size) -diff --git a/src/common/version.h b/src/common/version.h -index b9781d7..d9148d1 100644 ---- a/src/common/version.h -+++ b/src/common/version.h -@@ -1,4 +1,4 @@ --#include "commit.h" -+#include "id/commit.h" - - #define ANGLE_MAJOR_VERSION 2 - #define ANGLE_MINOR_VERSION 1 -diff --git a/src/libGLESv2/ProgramBinary.cpp b/src/libGLESv2/ProgramBinary.cpp -index 8525ffb..e3ffa47 100644 ---- a/src/libGLESv2/ProgramBinary.cpp -+++ b/src/libGLESv2/ProgramBinary.cpp -@@ -1018,6 +1018,9 @@ bool ProgramBinary::linkVaryings(InfoLog &infoLog, FragmentShader *fragmentShade - - bool ProgramBinary::load(InfoLog &infoLog, const void *binary, GLsizei length) - { -+#ifdef ANGLE_DISABLE_PROGRAM_BINARY_LOAD -+ return false; -+#else - BinaryInputStream stream(binary, length); - - int format = stream.readInt(); -@@ -1260,6 +1263,7 @@ bool ProgramBinary::load(InfoLog &infoLog, const void *binary, GLsizei length) - initializeUniformStorage(); - - return true; -+#endif // #ifdef ANGLE_DISABLE_PROGRAM_BINARY_LOAD - } - - bool ProgramBinary::save(void* binary, GLsizei bufSize, GLsizei *length) diff --git a/pkgs/applications/networking/browsers/chromium/source/default.nix b/pkgs/applications/networking/browsers/chromium/source/default.nix index 6a6b299ee51189c45de15b086b6a28d6b0ab9304..d7ccc412fa4f5c9c27aa63949a9576add30fb796 100644 --- a/pkgs/applications/networking/browsers/chromium/source/default.nix +++ b/pkgs/applications/networking/browsers/chromium/source/default.nix @@ -22,9 +22,7 @@ stdenv.mkDerivation { prePatch = "patchShebangs ."; - patches = if (versionOlder version "36.0.0.0") - then singleton ./sandbox_userns_31.patch - else singleton ./sandbox_userns_36.patch; + patches = singleton ./sandbox_userns_36.patch; postPatch = '' sed -i -r \ @@ -32,19 +30,18 @@ stdenv.mkDerivation { -e 's|/bin/echo|echo|' \ -e "/python_arch/s/: *'[^']*'/: '""'/" \ build/common.gypi chrome/chrome_tests.gypi + '' + optionalString (versionOlder version "38.0.0.0") '' sed -i -e '/not RunGN/,+1d' -e '/import.*depot/d' build/gyp_chromium sed -i -e 's|/usr/bin/gcc|gcc|' \ third_party/WebKit/Source/build/scripts/scripts.gypi \ third_party/WebKit/Source/build/scripts/preprocessor.pm '' + optionalString useOpenSSL '' cat $opensslPatches | patch -p1 -d third_party/openssl/openssl - '' + optionalString (!versionOlder version "37.0.0.0") '' - patch -p1 -d third_party/angle < "${./angle_build_37.patch}" ''; outputs = [ "out" "sandbox" "bundled" "main" ]; installPhase = '' - ensureDir "$out" "$sandbox" "$bundled" "$main" + mkdir -p "$out" "$sandbox" "$bundled" "$main" header "copying browser main sources to $main" find . -mindepth 1 -maxdepth 1 \ diff --git a/pkgs/applications/networking/browsers/chromium/source/sandbox_userns_31.patch b/pkgs/applications/networking/browsers/chromium/source/sandbox_userns_31.patch deleted file mode 100644 index 490c1a9cebe921e5d17fb3020269054a7f85f6c0..0000000000000000000000000000000000000000 --- a/pkgs/applications/networking/browsers/chromium/source/sandbox_userns_31.patch +++ /dev/null @@ -1,297 +0,0 @@ -commit ff4e8b4af04c58fc4c58ee7ed108aefcdc26a960 -Author: aszlig -Date: Thu May 16 14:17:56 2013 +0200 - - zygote: Add support for user namespaces on Linux. - - The implementation is done by patching the Zygote host to execute the sandbox - binary with CLONE_NEWUSER and setting the uid and gid mapping so that the child - process is using uid 0 and gid 0 which map to the current user of the parent. - Afterwards, the sandbox will continue as if it was called as a setuid binary. - - In addition, this adds new_user_namespace as an option in process_util in order - to set the UID and GID mapping correctly. The reason for this is that just - passing CLONE_NEWUSER to clone_flags doesn't help in LaunchProcess(), because - without setting the mappings exec*() will clear the process's capability sets. - - If the kernel doesn't support unprivileged user namespaces and the sandbox - binary doesn't have the setuid flag, the Zygote main process will run without a - sandbox. This is to mimic the behaviour if no SUID sandbox binary path is set. - - Signed-off-by: aszlig - -diff --git a/base/process/launch.cc b/base/process/launch.cc -index 1329a5a..ec28fdf 100644 ---- a/base/process/launch.cc -+++ b/base/process/launch.cc -@@ -24,6 +24,7 @@ LaunchOptions::LaunchOptions() - new_process_group(false) - #if defined(OS_LINUX) - , clone_flags(0) -+ , new_user_namespace(false) - #endif // OS_LINUX - #if defined(OS_CHROMEOS) - , ctrl_terminal_fd(-1) -diff --git a/base/process/launch.h b/base/process/launch.h -index ac2df5e..34a3851 100644 ---- a/base/process/launch.h -+++ b/base/process/launch.h -@@ -100,6 +100,9 @@ struct BASE_EXPORT LaunchOptions { - #if defined(OS_LINUX) - // If non-zero, start the process using clone(), using flags as provided. - int clone_flags; -+ -+ // If true, start the process in a new user namespace. -+ bool new_user_namespace; - #endif // defined(OS_LINUX) - - #if defined(OS_CHROMEOS) -diff --git a/base/process/launch_posix.cc b/base/process/launch_posix.cc -index de6286d..9333494 100644 ---- a/base/process/launch_posix.cc -+++ b/base/process/launch_posix.cc -@@ -37,6 +37,13 @@ - #include "base/threading/platform_thread.h" - #include "base/threading/thread_restrictions.h" - -+#if defined(OS_LINUX) -+#include -+#if !defined(CLONE_NEWUSER) -+#define CLONE_NEWUSER 0x10000000 -+#endif -+#endif -+ - #if defined(OS_CHROMEOS) - #include - #endif -@@ -294,13 +301,23 @@ bool LaunchProcess(const std::vector& argv, - - pid_t pid; - #if defined(OS_LINUX) -- if (options.clone_flags) { -+ int map_pipe_fd[2]; -+ int flags = options.clone_flags; -+ -+ if (options.new_user_namespace) { -+ flags |= CLONE_NEWUSER; -+ if (pipe(map_pipe_fd) < 0) { -+ DPLOG(ERROR) << "user namespace pipe"; -+ return false; -+ } -+ } -+ -+ if (options.clone_flags || options.new_user_namespace) { - // Signal handling in this function assumes the creation of a new - // process, so we check that a thread is not being created by mistake - // and that signal handling follows the process-creation rules. -- RAW_CHECK( -- !(options.clone_flags & (CLONE_SIGHAND | CLONE_THREAD | CLONE_VM))); -- pid = syscall(__NR_clone, options.clone_flags, 0, 0, 0); -+ RAW_CHECK(!(flags & (CLONE_SIGHAND | CLONE_THREAD | CLONE_VM))); -+ pid = syscall(__NR_clone, flags, 0, 0, 0); - } else - #endif - { -@@ -318,6 +335,21 @@ bool LaunchProcess(const std::vector& argv, - } else if (pid == 0) { - // Child process - -+#if defined(OS_LINUX) -+ if (options.new_user_namespace) { -+ // Close the write end of the pipe so we get an EOF when the parent closes -+ // the FD. This is to avoid race conditions when the UID/GID mappings are -+ // written _after_ execvp(). -+ close(map_pipe_fd[1]); -+ -+ char dummy; -+ if (HANDLE_EINTR(read(map_pipe_fd[0], &dummy, 1)) != 0) { -+ RAW_LOG(ERROR, "Unexpected input in uid/gid mapping pipe."); -+ _exit(127); -+ } -+ } -+#endif -+ - // DANGER: fork() rule: in the child, if you don't end up doing exec*(), - // you call _exit() instead of exit(). This is because _exit() does not - // call any previously-registered (in the parent) exit handlers, which -@@ -433,6 +465,40 @@ bool LaunchProcess(const std::vector& argv, - _exit(127); - } else { - // Parent process -+#if defined(OS_LINUX) -+ if (options.new_user_namespace) { -+ // We need to write UID/GID mapping here to map the current user outside -+ // the namespace to the root user inside the namespace in order to -+ // correctly "fool" the child process. -+ char buf[256]; -+ int map_fd, map_len; -+ -+ snprintf(buf, sizeof(buf), "/proc/%d/uid_map", pid); -+ map_fd = open(buf, O_RDWR); -+ DPCHECK(map_fd >= 0); -+ snprintf(buf, sizeof(buf), "0 %d 1", geteuid()); -+ map_len = strlen(buf); -+ if (write(map_fd, buf, map_len) != map_len) { -+ RAW_LOG(WARNING, "Can't write to uid_map."); -+ } -+ close(map_fd); -+ -+ snprintf(buf, sizeof(buf), "/proc/%d/gid_map", pid); -+ map_fd = open(buf, O_RDWR); -+ DPCHECK(map_fd >= 0); -+ snprintf(buf, sizeof(buf), "0 %d 1", getegid()); -+ map_len = strlen(buf); -+ if (write(map_fd, buf, map_len) != map_len) { -+ RAW_LOG(WARNING, "Can't write to gid_map."); -+ } -+ close(map_fd); -+ -+ // Close the pipe on the parent, so the child can continue doing the -+ // execvp() call. -+ close(map_pipe_fd[1]); -+ } -+#endif -+ - if (options.wait) { - // While this isn't strictly disk IO, waiting for another process to - // finish is the sort of thing ThreadRestrictions is trying to prevent. -diff --git a/content/browser/zygote_host/zygote_host_impl_linux.cc b/content/browser/zygote_host/zygote_host_impl_linux.cc -index fea43b5..95cbe07 100644 ---- a/content/browser/zygote_host/zygote_host_impl_linux.cc -+++ b/content/browser/zygote_host/zygote_host_impl_linux.cc -@@ -121,25 +121,31 @@ void ZygoteHostImpl::Init(const std::string& sandbox_cmd) { - - sandbox_binary_ = sandbox_cmd.c_str(); - -- // A non empty sandbox_cmd means we want a SUID sandbox. -- using_suid_sandbox_ = !sandbox_cmd.empty(); -+ bool userns_sandbox = false; -+ const std::vector cmd_line_unwrapped(cmd_line.argv()); - -- if (using_suid_sandbox_) { -+ if (!sandbox_cmd.empty()) { - struct stat st; - if (stat(sandbox_binary_.c_str(), &st) != 0) { - LOG(FATAL) << "The SUID sandbox helper binary is missing: " - << sandbox_binary_ << " Aborting now."; - } - -- if (access(sandbox_binary_.c_str(), X_OK) == 0 && -- (st.st_uid == 0) && -- (st.st_mode & S_ISUID) && -- (st.st_mode & S_IXOTH)) { -+ if (access(sandbox_binary_.c_str(), X_OK) == 0) { -+ using_suid_sandbox_ = true; -+ - cmd_line.PrependWrapper(sandbox_binary_); - - scoped_ptr - sandbox_client(sandbox::SetuidSandboxClient::Create()); - sandbox_client->SetupLaunchEnvironment(); -+ -+ if (!((st.st_uid == 0) && -+ (st.st_mode & S_ISUID) && -+ (st.st_mode & S_IXOTH))) { -+ userns_sandbox = true; -+ sandbox_client->SetNoSuid(); -+ } - } else { - LOG(FATAL) << "The SUID sandbox helper binary was found, but is not " - "configured correctly. Rather than run without sandboxing " -@@ -163,7 +169,19 @@ void ZygoteHostImpl::Init(const std::string& sandbox_cmd) { - base::ProcessHandle process = -1; - base::LaunchOptions options; - options.fds_to_remap = &fds_to_map; -+ if (userns_sandbox) -+ options.new_user_namespace = true; - base::LaunchProcess(cmd_line.argv(), options, &process); -+ -+ if (process == -1 && userns_sandbox) { -+ LOG(ERROR) << "User namespace sandbox failed to start, running without " -+ << "sandbox! You need at least kernel 3.8.0 with CONFIG_USER_NS " -+ << "enabled in order to use the sandbox without setuid bit."; -+ using_suid_sandbox_ = false; -+ options.new_user_namespace = false; -+ base::LaunchProcess(cmd_line_unwrapped, options, &process); -+ } -+ - CHECK(process != -1) << "Failed to launch zygote process"; - - if (using_suid_sandbox_) { -diff --git a/content/zygote/zygote_main_linux.cc b/content/zygote/zygote_main_linux.cc -index 567b305..1089233 100644 ---- a/content/zygote/zygote_main_linux.cc -+++ b/content/zygote/zygote_main_linux.cc -@@ -426,6 +426,13 @@ static bool EnterSuidSandbox(LinuxSandbox* linux_sandbox, - *has_started_new_init = true; - } - -+ // Don't set non-dumpable, as it causes trouble when the host tries to find -+ // the zygote process (XXX: Not quite sure why this happens with user -+ // namespaces). Fortunately, we also have the seccomp filter sandbox which -+ // should disallow the use of ptrace. -+ if (setuid_sandbox->IsNoSuid()) -+ return true; -+ - #if !defined(OS_OPENBSD) - // Previously, we required that the binary be non-readable. This causes the - // kernel to mark the process as non-dumpable at startup. The thinking was -diff --git a/sandbox/linux/suid/client/setuid_sandbox_client.cc b/sandbox/linux/suid/client/setuid_sandbox_client.cc -index 34231d4..36e3201 100644 ---- a/sandbox/linux/suid/client/setuid_sandbox_client.cc -+++ b/sandbox/linux/suid/client/setuid_sandbox_client.cc -@@ -166,6 +166,10 @@ bool SetuidSandboxClient::IsInNewNETNamespace() const { - return env_->HasVar(kSandboxNETNSEnvironmentVarName); - } - -+bool SetuidSandboxClient::IsNoSuid() const { -+ return env_->HasVar(kSandboxNoSuidVarName); -+} -+ - bool SetuidSandboxClient::IsSandboxed() const { - return sandboxed_; - } -@@ -175,5 +179,9 @@ void SetuidSandboxClient::SetupLaunchEnvironment() { - SetSandboxAPIEnvironmentVariable(env_); - } - -+void SetuidSandboxClient::SetNoSuid() { -+ env_->SetVar(kSandboxNoSuidVarName, "1"); -+} -+ - } // namespace sandbox - -diff --git a/sandbox/linux/suid/client/setuid_sandbox_client.h b/sandbox/linux/suid/client/setuid_sandbox_client.h -index a9f6536..2e8113a 100644 ---- a/sandbox/linux/suid/client/setuid_sandbox_client.h -+++ b/sandbox/linux/suid/client/setuid_sandbox_client.h -@@ -39,6 +39,8 @@ class SetuidSandboxClient { - bool IsInNewPIDNamespace() const; - // Did the setuid helper create a new network namespace ? - bool IsInNewNETNamespace() const; -+ // Is sandboxed without SUID binary ? -+ bool IsNoSuid() const; - // Are we done and fully sandboxed ? - bool IsSandboxed() const; - -@@ -46,6 +48,8 @@ class SetuidSandboxClient { - // helper. - void SetupLaunchEnvironment(); - -+ void SetNoSuid(); -+ - private: - // Holds the environment. Will never be NULL. - base::Environment* env_; -diff --git a/sandbox/linux/suid/common/sandbox.h b/sandbox/linux/suid/common/sandbox.h -index aad4ff8..bd710d5 100644 ---- a/sandbox/linux/suid/common/sandbox.h -+++ b/sandbox/linux/suid/common/sandbox.h -@@ -18,6 +18,7 @@ static const char kAdjustLowMemMarginSwitch[] = "--adjust-low-mem"; - - static const char kSandboxDescriptorEnvironmentVarName[] = "SBX_D"; - static const char kSandboxHelperPidEnvironmentVarName[] = "SBX_HELPER_PID"; -+static const char kSandboxNoSuidVarName[] = "SBX_NO_SUID"; - - static const long kSUIDSandboxApiNumber = 1; - static const char kSandboxEnvironmentApiRequest[] = "SBX_CHROME_API_RQ"; diff --git a/pkgs/applications/networking/browsers/chromium/source/sources.nix b/pkgs/applications/networking/browsers/chromium/source/sources.nix index 965328d43a4a0d8b1bfba90cfc49beb15f723876..4a610827913f599d6e9b7f22220fceeb915a3859 100644 --- a/pkgs/applications/networking/browsers/chromium/source/sources.nix +++ b/pkgs/applications/networking/browsers/chromium/source/sources.nix @@ -1,21 +1,21 @@ # This file is autogenerated from update.sh in the parent directory. { dev = { - version = "37.0.2054.3"; - sha256 = "1sly1fb9wh10m36crikahn7wgsq7j090jaga4l8zk4kihzprcnj2"; - sha256bin32 = "0242ypzgzskkmsw3iyirxzlm1gbng94lv723ffcr018grq9yg4gs"; - sha256bin64 = "17kzb7k0vn96wa6a4xfx05885li1qjg8bp6y3ngs2i0wws9ypfd9"; + version = "38.0.2107.3"; + sha256 = "0zb1mj3xgvvs5ijix4b52vj9dlymqkipn8srfzvhwl7g4hx5ss3v"; + sha256bin32 = "12lvvmg3bqacb0qw72bwlxm2m57s39mz2810agngdgzv0hd835cv"; + sha256bin64 = "1vw36s8nlvdsl8pjbh4gny00kvcizn1i2lznzqzysicz2rz7ncrh"; }; beta = { - version = "36.0.1985.84"; - sha256 = "02hhqx5m4hxmnf8l3a2ah9k39bpz35sll6gv89vz27vdgb6mza0j"; - sha256bin32 = "1jjxzknyiw6d5p0bcb7c9d0siffg55wmm34lq1phz1jlqq6hz6zy"; - sha256bin64 = "1jr9a386arfmd8rskns9bmlczzr3xzcw9ykv7xf23iz86qqp723r"; + version = "37.0.2062.58"; + sha256 = "0jck4s6nrizj9wmifsjviin9ifnviihs21fi05wzljyfnbgc4byl"; + sha256bin32 = "1cm1r8bqy66gvdhbrgn9pdc11i72dca96ab5j3m3349p6728jbgk"; + sha256bin64 = "0cpb189pn5jiplldkgy8lfbcwvfik66kjjf6y2i708xa5ggfpwfi"; }; stable = { - version = "35.0.1916.153"; - sha256 = "03p7wmlvbrgd8m94344z4azkhrffwrr5c76dm8c4jcxs0x1yn318"; - sha256bin32 = "0xm34xwdai8ns6bkq5dshh4izls70rwgvya23md4vxq6iv78sykn"; - sha256bin64 = "1x2cm1i8v8d69856b42anms33clv63adzpqy58in6i9vba13swif"; + version = "36.0.1985.125"; + sha256 = "08shkm89qzzdlrjg0rg5qiszbk6ziginsicyxqyk353y76jx10hp"; + sha256bin32 = "1ahazz56k127xncgl1lzwsmydbh0vcxq0hzrb9cm9zzdkzqjzg03"; + sha256bin64 = "0qx5316cd8l9g8w389aqi5m3csmr5s8hs7sivlk02mbs0jzi8ppc"; }; } diff --git a/pkgs/applications/networking/browsers/elinks/default.nix b/pkgs/applications/networking/browsers/elinks/default.nix index 61db2656a409319bab78fa923008611e4cf3b082..0e4fd4db1ba8a84e378ac142ac40957f78ff8e4a 100644 --- a/pkgs/applications/networking/browsers/elinks/default.nix +++ b/pkgs/applications/networking/browsers/elinks/default.nix @@ -43,6 +43,6 @@ stdenv.mkDerivation rec { meta = { description = "Full-featured text-mode web browser"; homepage = http://elinks.or.cz; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index b8e3124f18583aef740d26b14c00ed8ca78f6613..969ced923b3d51743e09f456fb7bee7dfe1bbe81 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -38,184 +38,186 @@ }: let - version = "30.0"; + version = "31.0"; sources = [ - { locale = "ach"; arch = "linux-i686"; sha256 = "44d2fc9d491b6c001e35cff6e5f1c38c8561d24f8fe2dfb4d79365bcabe965ea"; } - { locale = "ach"; arch = "linux-x86_64"; sha256 = "e9fb52a3b82a1434b7fa3bae606749819672c96ce8678c51f1fdbc68520e26bf"; } - { locale = "af"; arch = "linux-i686"; sha256 = "bfce74c891ea370ce4e0fe43d578c3c0050d2655fff7372806ed6be338b2c438"; } - { locale = "af"; arch = "linux-x86_64"; sha256 = "18408a9c3f3b8c4d9f8cfe067ac23ddcdd3d3a7a22892ba8d74de5679a064db6"; } - { locale = "an"; arch = "linux-i686"; sha256 = "601efbf7944408ba1ac35831eaa92c4910cd904bfadc32895ff8d756c70ae934"; } - { locale = "an"; arch = "linux-x86_64"; sha256 = "0ba4c272ebac9ecafe5dbfb7fbba1cd2790d126f5b1756ab9a323c94b644df0b"; } - { locale = "ar"; arch = "linux-i686"; sha256 = "23ea3168aea75b044fa217b78b01a2dc8c9dd92171d726c4a78c23cffc474469"; } - { locale = "ar"; arch = "linux-x86_64"; sha256 = "dae2c1634e17b8c3e276e4c758c4d4c3b1b0d6006adac8e420c13b6f09a6cf53"; } - { locale = "as"; arch = "linux-i686"; sha256 = "7d36bd4589556374822f2ab5dd102d557257b5e0b529d1c963f96e9ab6a08850"; } - { locale = "as"; arch = "linux-x86_64"; sha256 = "c13ccf3546bafcfeb41c33762e41af249306d4bcfd3ad7fc957db481372be0dc"; } - { locale = "ast"; arch = "linux-i686"; sha256 = "853310674d7011956d760883af15b8e343250f8fc3acb3067e0f5a3d978c06ff"; } - { locale = "ast"; arch = "linux-x86_64"; sha256 = "2b938081e8672ed5ae16c40c6300e585a26f54da278726f48b98f3ca3e065662"; } - { locale = "be"; arch = "linux-i686"; sha256 = "b9acce210f2adf188ba9a3d92774a846a263baa5e076bb9452b89ca5609d6ac8"; } - { locale = "be"; arch = "linux-x86_64"; sha256 = "dd2a33ee1ed8c848454b6e64a0c1527f193d070e4d867c4f13fa84f39c9bfecd"; } - { locale = "bg"; arch = "linux-i686"; sha256 = "ee060cd395ef28bbad4be74aa42e2a51e7ad866183d139bffbcc7634dc94d738"; } - { locale = "bg"; arch = "linux-x86_64"; sha256 = "11a5dd807083da8c3132d9d6518dc674642418eff1fccf68e451ac67b90f141a"; } - { locale = "bn-BD"; arch = "linux-i686"; sha256 = "339d286f7f8f469bb6f9f85a8b21a745ecc42717dc91c21c7db88822e9be661a"; } - { locale = "bn-BD"; arch = "linux-x86_64"; sha256 = "fc3f06743a84a7684e43cd4efedb02a126dd119f6141da49c6120f1bbcdf9392"; } - { locale = "bn-IN"; arch = "linux-i686"; sha256 = "c585982368f258a8a728f782c37428311f0b6a6512231c077a439dd93645c3a2"; } - { locale = "bn-IN"; arch = "linux-x86_64"; sha256 = "00b9af4425050ec42b4a45a3c4a16700edcc66297331b601950fb81421ef8eb4"; } - { locale = "br"; arch = "linux-i686"; sha256 = "b86d944592f16f5f0e558106e3464248e3d686f45527a40fb64aaa79d9f73422"; } - { locale = "br"; arch = "linux-x86_64"; sha256 = "b894c12508f0b0a892154ea61fb2bb01947929041a63518f7c405ed976cc4d3f"; } - { locale = "bs"; arch = "linux-i686"; sha256 = "f7da0fead608f63c4a5be92fed9e0109fbe7288948d15dde05e10bba80b47743"; } - { locale = "bs"; arch = "linux-x86_64"; sha256 = "1cb090f9b16bcae95055377bc14a531697c480ad50e3a098dbd572770924d558"; } - { locale = "ca"; arch = "linux-i686"; sha256 = "0b36330715f8909e1515c535a06f4e3fdd7660de11b3424b4ce88f336561935f"; } - { locale = "ca"; arch = "linux-x86_64"; sha256 = "c6e9e545d09e589fd5fbfd2c6482a5ef366c470e294823b3ba05c5e728bca2c2"; } - { locale = "cs"; arch = "linux-i686"; sha256 = "ff1ca239be0e99b923c63c5bbc425dd2989bc40dbdc82dd731d7173fd539406a"; } - { locale = "cs"; arch = "linux-x86_64"; sha256 = "fe8472d6a4bf9fcda3caef51449fc3e20e1fbadbb772b330a012ffa7219afae3"; } - { locale = "csb"; arch = "linux-i686"; sha256 = "db1b7dbc7b0cd564a04b3a37827e8d77277cd7ba6a59403c45115d34e637f463"; } - { locale = "csb"; arch = "linux-x86_64"; sha256 = "023dd75e02f41a2ce9991fb40a8a46767f1a10da876a390035a084c5b97bd9d2"; } - { locale = "cy"; arch = "linux-i686"; sha256 = "9a6ac60099b03bdeb71c1a7739dafeff4b1682ffc43997191196e1f590421afa"; } - { locale = "cy"; arch = "linux-x86_64"; sha256 = "a5f2030fb08c0dd6dff95310209ed7c6ee613680dd500f00e30e26c547f9c249"; } - { locale = "da"; arch = "linux-i686"; sha256 = "99a893ac19b0ca28177c8957d7296e6deef9ddb36a6b5b17823cb1e6fc9ec683"; } - { locale = "da"; arch = "linux-x86_64"; sha256 = "69f29e795f203fe47e22daf1259c2ecfb39c362babefbbccb31405f4632f236b"; } - { locale = "de"; arch = "linux-i686"; sha256 = "925aac0800ce63a88fadc945da40b00ed6dde327637821518a372d7affb6e450"; } - { locale = "de"; arch = "linux-x86_64"; sha256 = "d86c5d2102a95ff5a6e580a1ca7af25c2f470211182ef70e988b29b195be6dd4"; } - { locale = "el"; arch = "linux-i686"; sha256 = "af07fac82dea32d33bd6bc440e2a645eb160d196cf0d4883b878d3d2c584f81a"; } - { locale = "el"; arch = "linux-x86_64"; sha256 = "fcc96c25422837f19f9ff6cde02c81c4a5a3b7c8e6809b90c8761519571db1f6"; } - { locale = "en-GB"; arch = "linux-i686"; sha256 = "758f7bb669743d6067e416c26f43806b16ddd16511a6818373e70960cbbd7151"; } - { locale = "en-GB"; arch = "linux-x86_64"; sha256 = "d46ba3d642bf43fca46dfb29efb5d08a15f114eb9facc868e86c31f7c9c98014"; } - { locale = "en-US"; arch = "linux-i686"; sha256 = "4bca44a1ba94bf5616f7ea650e37cd3e5a719546def9e4a08ee88aedbc3a4db6"; } - { locale = "en-US"; arch = "linux-x86_64"; sha256 = "3303cc600153d0198dace9826b6883aa510d4e380aa985b092b1da67ad865625"; } - { locale = "en-ZA"; arch = "linux-i686"; sha256 = "13736870573863aab644bf2be2219fe4b5c6bde4bd79b84f22e12d39e7cda6e0"; } - { locale = "en-ZA"; arch = "linux-x86_64"; sha256 = "7e88fa9f355f6787d38e75d86d5b592a1a2cec208255f276887f53a12beb9e97"; } - { locale = "eo"; arch = "linux-i686"; sha256 = "ae4446e223c0169dd0b56db58760fdb323a2bec8135e45c79d385d895b64cee8"; } - { locale = "eo"; arch = "linux-x86_64"; sha256 = "202f61dd8e5506594ae70bbee9150d86c8037887f8345871dc5c1c9e498b1d66"; } - { locale = "es-AR"; arch = "linux-i686"; sha256 = "8fb276ed26fd46fceb029fbade706cb6e55d2958f03400ec1290784c533888c4"; } - { locale = "es-AR"; arch = "linux-x86_64"; sha256 = "78130525d30d7c592bb63d7cedf3ab5db804d457c4d127d90b93d94501ad7b3c"; } - { locale = "es-CL"; arch = "linux-i686"; sha256 = "ef6bf393a681f4a08031eeda61bba3614ebfab222fed43f9f8b21cfa8eb3862e"; } - { locale = "es-CL"; arch = "linux-x86_64"; sha256 = "e56224bca0ebfab9eedecafafd792e48cb67e3f8741c4d5a94c8f74f634cecf6"; } - { locale = "es-ES"; arch = "linux-i686"; sha256 = "9e007e6aa0f8aa3d1fac5dc13e98f81c23e6ff1e574545c021f8f7feeff86ce2"; } - { locale = "es-ES"; arch = "linux-x86_64"; sha256 = "d4ff94f46fd086300992a30a1c4a8aa97ad7164d6cd26e82b20b5d0680b38169"; } - { locale = "es-MX"; arch = "linux-i686"; sha256 = "9db42a0557838b23ac4937adfec407804e624e679e9ffd6da739d17cdfbaab78"; } - { locale = "es-MX"; arch = "linux-x86_64"; sha256 = "d42d619d6da78d0bbcb32b0a93a2eaa623eadb3a5af43e5b8b14400e6e969779"; } - { locale = "et"; arch = "linux-i686"; sha256 = "5947822f3f02bd4ba530ad978de1a9d237981e3abdf1598e44095c650794d1ff"; } - { locale = "et"; arch = "linux-x86_64"; sha256 = "7521a4db287bb928f50b64817f3631e96ea4cead81b1a84ab7c3b930b3450e86"; } - { locale = "eu"; arch = "linux-i686"; sha256 = "44095e98e74205fa012a2c0c636de3fe9cfb79d5729abf15214c1e7734946014"; } - { locale = "eu"; arch = "linux-x86_64"; sha256 = "2032dfbc82a9aca1a2f4cf67e6089400bf305d13906f048c5c9b906a7201a9fb"; } - { locale = "fa"; arch = "linux-i686"; sha256 = "469b8008287c93e152e762e82fb61644384c1e2631a6c45033503652daed09b1"; } - { locale = "fa"; arch = "linux-x86_64"; sha256 = "61ea0d8941d22083f918d014d56a613788d1f4f549e5a62d50a1f9071439a36f"; } - { locale = "ff"; arch = "linux-i686"; sha256 = "81a0083e5e4136e3ab3e6db0e2adcedfae7572722655a9cb8b9ca388c6057342"; } - { locale = "ff"; arch = "linux-x86_64"; sha256 = "0efe16da918288754a3af816d72448a73690eb71b110cf3ff0586ee7505b9735"; } - { locale = "fi"; arch = "linux-i686"; sha256 = "a0ee069e7c3100b921aab7c54c5d32741df4e058f52cb7f42acb2643bd534b30"; } - { locale = "fi"; arch = "linux-x86_64"; sha256 = "55c84d504603d648e7d72a2fb8badb0bc9148cb376bb0cc6054f091867cb2613"; } - { locale = "fr"; arch = "linux-i686"; sha256 = "9c9abea13db23ef5ef8c9a3ccb5a0702b44a8db2402f43f01a478eb61e7ddf34"; } - { locale = "fr"; arch = "linux-x86_64"; sha256 = "ce26fc67cbc2031880ffa3529a59ca4122016258ab1c023e23247c26308b6a3e"; } - { locale = "fy-NL"; arch = "linux-i686"; sha256 = "4a734880ed65a207d98630647a341644df4f68149c50ce5e683bb21b5c27f2c6"; } - { locale = "fy-NL"; arch = "linux-x86_64"; sha256 = "bace955c686456d7894ca7bc1cf854eb158d6183050318efc73768e232c9a413"; } - { locale = "ga-IE"; arch = "linux-i686"; sha256 = "4801f40ebd820b8f229cfcd04a04351fcee9f78268af1c9863089ef6c64d736a"; } - { locale = "ga-IE"; arch = "linux-x86_64"; sha256 = "c417c0182e6f706473bc4b7cf8c14aec96f96e21c17b8593b71ff38c97f7e9d2"; } - { locale = "gd"; arch = "linux-i686"; sha256 = "15a9d316d472d2918eff0c6f02600e40a8f62d7ef53ab14c57537fdda0b5257a"; } - { locale = "gd"; arch = "linux-x86_64"; sha256 = "8fcdcf093148222865a905586774dae5d805ef22c01afadeaabe3f0c7b315dba"; } - { locale = "gl"; arch = "linux-i686"; sha256 = "83b0ccfe7cf7166899d17b2c9b1ea8effda9cf02024698f8db8f943a388bb3dc"; } - { locale = "gl"; arch = "linux-x86_64"; sha256 = "550026595e6e59405b5869183af056ba5a60a303270f1a176ef25e3db1c70289"; } - { locale = "gu-IN"; arch = "linux-i686"; sha256 = "7e7dc86fa805808931ba57455b99c9273a4b0aa60998affce3c4b06f0ae7fc70"; } - { locale = "gu-IN"; arch = "linux-x86_64"; sha256 = "e0f35d7fe7875785e3749131cf86c5cbea5cbd7b3abd2c2c69f5f8376d3e53d7"; } - { locale = "he"; arch = "linux-i686"; sha256 = "5c200c8da3209c2120a8576c30ab609331b52807d0640daaa1a70f665c776969"; } - { locale = "he"; arch = "linux-x86_64"; sha256 = "6923a64d1ac5453453f148d38f116faca41be5b1d0a13d4f128bb73db67cb8e2"; } - { locale = "hi-IN"; arch = "linux-i686"; sha256 = "6a7e5d06169d6dd87e505012604c93a28440156a3f81e6fe24d567f9c2b2a919"; } - { locale = "hi-IN"; arch = "linux-x86_64"; sha256 = "56801593b9dd5ecefed8d7eaf438879dd23006ffff9a31c543861259dedf8263"; } - { locale = "hr"; arch = "linux-i686"; sha256 = "4573cd0269639d122496bcaf842d8c741f4d54e8f57d0690b97d8e7e86ee7e74"; } - { locale = "hr"; arch = "linux-x86_64"; sha256 = "753984384829229601fbe55d0b6615f3432fdf9babe908fb642f6ac79c749727"; } - { locale = "hu"; arch = "linux-i686"; sha256 = "c330478e6e77eff117bce58e17661b83a30308f0a680f648fbf06d1c00f3883c"; } - { locale = "hu"; arch = "linux-x86_64"; sha256 = "9d118ba236aa7a9b517278c375aa4e4fa65f85c71b8bea9c41702f6ae7b815cb"; } - { locale = "hy-AM"; arch = "linux-i686"; sha256 = "48c1691073b6ede77f5c5d5ae07af7372f17b9f52fd92950c2cca0a01b3b340e"; } - { locale = "hy-AM"; arch = "linux-x86_64"; sha256 = "beda26cefeeeeee59ea52fdd28e1e3025ca4cc3124541fc6825100a61eb398d8"; } - { locale = "id"; arch = "linux-i686"; sha256 = "8cf6d0bc2d4bcc68a5ddc935c3bd6ed19a63284dc3227e849be729645a6171d4"; } - { locale = "id"; arch = "linux-x86_64"; sha256 = "8be5900b83840871ffb6faba08fea9b35f9f396cae08b228c68e333719fb819f"; } - { locale = "is"; arch = "linux-i686"; sha256 = "7c167389105063b84d507b09c689fa18bf854fd695010c8273b9711b21a24034"; } - { locale = "is"; arch = "linux-x86_64"; sha256 = "c79321c83c9e654f6eaf96ddf5d24f279d517fbf35dfdf923acf026124919598"; } - { locale = "it"; arch = "linux-i686"; sha256 = "a3eb17e0eda3cbf8ffbbd1ecd1716929ac87a801f060dd8ed5291298667775a9"; } - { locale = "it"; arch = "linux-x86_64"; sha256 = "3742453f0748911b393fed804e5827f014cc595a9df4516438dfa163d5050411"; } - { locale = "ja"; arch = "linux-i686"; sha256 = "fa030c64e04766ae5200370586c08b2f25627343586cd8a0486e583f345c466e"; } - { locale = "ja"; arch = "linux-x86_64"; sha256 = "fddeae03ffdfef0f6cc999807e001ea931c15b1833da48655bcb5845f1e017a3"; } - { locale = "kk"; arch = "linux-i686"; sha256 = "39d94b10fa751faf7423e5d43cd07ef4485ff26e21e47d106d2268058e2f33d9"; } - { locale = "kk"; arch = "linux-x86_64"; sha256 = "1dc7138dd5c08088479c5e7e8054d7ed640504860a0043ecea2c8b0c9c1892f9"; } - { locale = "km"; arch = "linux-i686"; sha256 = "0d12a305de4a63fc6c6394bd4044f44ca3626cbc41ca9ef1adad6d5041f6f1fd"; } - { locale = "km"; arch = "linux-x86_64"; sha256 = "7710091695dd100b7f33585fce58c54fec462a96540a7d791f1935088f21fadf"; } - { locale = "kn"; arch = "linux-i686"; sha256 = "b039e6a1114522ccae10b89ab794a222966fbf0914513b3c14f05c082a78b922"; } - { locale = "kn"; arch = "linux-x86_64"; sha256 = "cf82965b25d3990a57d861d688f1bd69e5b069fe281937274060ebe36ddbb8a6"; } - { locale = "ko"; arch = "linux-i686"; sha256 = "8b9378d39d7b42852c2bb537b0e85312760c343e6485826ed949ab4617293025"; } - { locale = "ko"; arch = "linux-x86_64"; sha256 = "4b946a0cbedad2b8d0c3598c04eeb058cea05d6d7e6388e4cfa3146a40f7c449"; } - { locale = "ku"; arch = "linux-i686"; sha256 = "11950c4a54c6a165e924fb6e68bcc46d63b5fddfcd2561c58a0ce401c0146d36"; } - { locale = "ku"; arch = "linux-x86_64"; sha256 = "37a07a4e059580c31433b419bcd61d928ad1db7e607cf8443378472d54b61b78"; } - { locale = "lij"; arch = "linux-i686"; sha256 = "c0efca49f31800a3773b0d05add56b195d1cbea287108803bb1ef5249a0dc94f"; } - { locale = "lij"; arch = "linux-x86_64"; sha256 = "6e4b2d8c5e9942bc469f722110ba310b2ccdc4dda6e3baee93ae54012ae658a2"; } - { locale = "lt"; arch = "linux-i686"; sha256 = "acde9010aa815f6645868b03f3d68d9a24c450ed830f063e2846ac1219ee628b"; } - { locale = "lt"; arch = "linux-x86_64"; sha256 = "c2491cd3e5d11c302d7ec3191d646e2073c46f69966fc382901a93d16fb0c902"; } - { locale = "lv"; arch = "linux-i686"; sha256 = "7411de62c4d8c01c8bb15b3f2dfc2e2ed17755e2f9856ead8e5e0fd05971ffd5"; } - { locale = "lv"; arch = "linux-x86_64"; sha256 = "e8e57e629396eb180e0041a50ae98ecb2292f514d423423748e4d4cebc54fb59"; } - { locale = "mai"; arch = "linux-i686"; sha256 = "26a053e48f4e6f04e4856a0dcb26e577a6ddb99afc883786d9c260d57e5e4a6d"; } - { locale = "mai"; arch = "linux-x86_64"; sha256 = "86be2c736aa5ccf926d44f24afdb2d40c28444b5bd6cf090f9a847199b38b492"; } - { locale = "mk"; arch = "linux-i686"; sha256 = "dcf7759bcde70158298ad9e2434e37d4e8240e00589a83dd8dbba53c35466a58"; } - { locale = "mk"; arch = "linux-x86_64"; sha256 = "056297d6404794a8da78aeceb620b0ebbcb38a693ee1079cc02e4d0411e40ec3"; } - { locale = "ml"; arch = "linux-i686"; sha256 = "2d632b3a5b60f18955906adca80b7ac7af3bfa39d03afd308efd1136cfc8971d"; } - { locale = "ml"; arch = "linux-x86_64"; sha256 = "b54a9d47cadeae4f92d22a362ca887a18a16ef64500149ac8eb9355dbbe5971b"; } - { locale = "mr"; arch = "linux-i686"; sha256 = "e66b22488bf2c772fa6d29cf43f3e9c1aa2a1a867620a1144af8cb92c2647651"; } - { locale = "mr"; arch = "linux-x86_64"; sha256 = "da982205e9b659dd66ab05ca815324642bed2117e668e67ad620bb2d87c5d1c8"; } - { locale = "ms"; arch = "linux-i686"; sha256 = "ad39ffa6d6d765c1e983d885f5d139a28e481d536068d517b4807137fa8d3036"; } - { locale = "ms"; arch = "linux-x86_64"; sha256 = "fb1b6ed5e2e7247beb69f3d0ad937f76ce7c1107ccdad742ff5085d4b3a8da98"; } - { locale = "nb-NO"; arch = "linux-i686"; sha256 = "5220da4627863f9fa1c11886e9c19c315547afafa96c98b22a1a4359c75f1056"; } - { locale = "nb-NO"; arch = "linux-x86_64"; sha256 = "5f9d60faadc7b76b010cd9cf35922b1881377b535e8afc5d9b974651156df866"; } - { locale = "nl"; arch = "linux-i686"; sha256 = "357b28841ea861b8297a4986460d1d265b27202c37bb296dcc69224f9b07fc51"; } - { locale = "nl"; arch = "linux-x86_64"; sha256 = "9a8505da2fe045ab6c2a2277d2d043374a26f106a5966b00f42e22fb26cf929a"; } - { locale = "nn-NO"; arch = "linux-i686"; sha256 = "f115bb50d1e052584caf7363db875ae222ee37449fa151e2f313c157a6274d76"; } - { locale = "nn-NO"; arch = "linux-x86_64"; sha256 = "2e7829a8a20c946bddce13b7b3d1b3600f90d90d2438f3eb69188d47203b264d"; } - { locale = "or"; arch = "linux-i686"; sha256 = "9ad48bdf2b7f1deedb05bdcc49740d5075ebf6ec228d82a7ed455c6bb36d7cb0"; } - { locale = "or"; arch = "linux-x86_64"; sha256 = "a007bc73fb1ea7765016e9faebac2c4f5e0111a45b3d75d1e55f4de8931796a2"; } - { locale = "pa-IN"; arch = "linux-i686"; sha256 = "8a38d2b1516ed4b58e36d266cd25a5bd10548f9e412076c9b4f1f27256c98c2a"; } - { locale = "pa-IN"; arch = "linux-x86_64"; sha256 = "664fa562261532d0f6bad10b84e15d47b69073768c2d12986c8d776eb1af8ddd"; } - { locale = "pl"; arch = "linux-i686"; sha256 = "3bb8963f1e3dcdb22cc55feebb2583fefd6f3760f4e6f2cc754174079d4ca07f"; } - { locale = "pl"; arch = "linux-x86_64"; sha256 = "710f1d86d2974d6ad3c63ebc0873518fd59f218ba07b27d06fb75c83af2c632e"; } - { locale = "pt-BR"; arch = "linux-i686"; sha256 = "cd2fafbd2291bad8481c4086db3c2973a7869b28a5e68a5ff199079814c6b3fc"; } - { locale = "pt-BR"; arch = "linux-x86_64"; sha256 = "f0ba5dc2366757841afb9c9f7799c40667304c36efe7da284202e8e7a45aa1fc"; } - { locale = "pt-PT"; arch = "linux-i686"; sha256 = "051af14810ad0cee4487757833f1f5b4a6f6f903f3cecf00d00410c1324d9ce4"; } - { locale = "pt-PT"; arch = "linux-x86_64"; sha256 = "82102b33dc1989bc3aa49da3915baf7e4012afe6e4bd7f80a301dfe847f3dbbe"; } - { locale = "rm"; arch = "linux-i686"; sha256 = "02051668e46d98f4e2e5becc3192f6173dfdf3a48cc82264c5821be06c5e12a0"; } - { locale = "rm"; arch = "linux-x86_64"; sha256 = "9600c1d272785b946058ffac9e57a8b1701d065f24fa940ad22e4b5aec2efad9"; } - { locale = "ro"; arch = "linux-i686"; sha256 = "7f17cbd3041396135eee08eac597c8c6a936e5a33d67d2b5de8ae157a56719ad"; } - { locale = "ro"; arch = "linux-x86_64"; sha256 = "ba1de85abe53a7d66f6311d6a202d91f86e871bace168cf60a759ab0e17eccdb"; } - { locale = "ru"; arch = "linux-i686"; sha256 = "9dcd0c2b5671fc5849b01f2932504a7217fca9a4b4eca8e9b6ff8f5a146517e2"; } - { locale = "ru"; arch = "linux-x86_64"; sha256 = "725214900968e4e648d3d13635bf72d34910eb31a30b83a3e7ba9c5c4085c2d7"; } - { locale = "si"; arch = "linux-i686"; sha256 = "d22ed75aa727351efcdba1cffe8e24ff305943c9a3072cac08b004677cf6a028"; } - { locale = "si"; arch = "linux-x86_64"; sha256 = "89d60c682413949a6dad4b7fd49cc4508c4e067fe5847c5f21d5e25a953f195f"; } - { locale = "sk"; arch = "linux-i686"; sha256 = "4ecbc58df00eaf4fafb1c33a93493bdd3e544562a67c60e2d4d93da90d369261"; } - { locale = "sk"; arch = "linux-x86_64"; sha256 = "75baa2c5153e282e2671d6222b7fc8c3b9cfc2b9ee0a595a4451fd314a928fb4"; } - { locale = "sl"; arch = "linux-i686"; sha256 = "53e2ae3525d0bd2005a86bf7ed3f27ca66906ddfceb85a738bd60e46ba2df773"; } - { locale = "sl"; arch = "linux-x86_64"; sha256 = "2dcc5592a49767dc3f2a7d40387bb550fd36724419ff567f9d107e32b2cf2d6d"; } - { locale = "son"; arch = "linux-i686"; sha256 = "d3b7372c59b21d0393768197517b3666ab78705b04a6e84a3345da031bad3776"; } - { locale = "son"; arch = "linux-x86_64"; sha256 = "fc017e7a18701880c7a54c23a0f77a6521aae17880dbc562e2b37167ba918fa0"; } - { locale = "sq"; arch = "linux-i686"; sha256 = "7f9c9100c559ebfbfff35adc694199079930f4bf9f1f6a820c0e17d80ea0e12b"; } - { locale = "sq"; arch = "linux-x86_64"; sha256 = "0f3fcddabab8263eb4c238942c45c0b5efc20c169948da24c56ed401a85209dc"; } - { locale = "sr"; arch = "linux-i686"; sha256 = "6281e2f849b3c530ff383cfd4cdc4ab06115362c3d57ba8133a9f799af08e815"; } - { locale = "sr"; arch = "linux-x86_64"; sha256 = "368ca83faa5ef3640f71d977916614369ebac1622681e828b75e9abf6ebeb425"; } - { locale = "sv-SE"; arch = "linux-i686"; sha256 = "9f77f497fc3e8c585bd546c0bb95c92f9f37d683e092c0762b3fe0022b6d39b5"; } - { locale = "sv-SE"; arch = "linux-x86_64"; sha256 = "0aa21764f0ca58591e3cfebba75196edd51a8fdbadb738f036994178c9612a67"; } - { locale = "ta"; arch = "linux-i686"; sha256 = "463ce70405d84945c201cca56c84171e097e6a0420d38cd453a0836fad82f09c"; } - { locale = "ta"; arch = "linux-x86_64"; sha256 = "db7e78bc1f4bcb573474806d19324eca58f42008fb0b0fa856f701f1430aeefd"; } - { locale = "te"; arch = "linux-i686"; sha256 = "18643daf675f8ef9785a0039d012c3a8ce96f4d228426651c5f09c292cbfb335"; } - { locale = "te"; arch = "linux-x86_64"; sha256 = "d9f8a260fc47b608fd523c61e9c6981776997f4b7fc247e794be32d177abfbc0"; } - { locale = "th"; arch = "linux-i686"; sha256 = "e03b80d55d2a545ab3219c5e88ed6b7d6974945e32321a2fc96039a6996638f6"; } - { locale = "th"; arch = "linux-x86_64"; sha256 = "0416fd2b7e7ddde59a101fcba8258622a83b739effb327984fa8405e634c2121"; } - { locale = "tr"; arch = "linux-i686"; sha256 = "75a49ce141c9a04254185b62af72c7e8c214e19e5257ff308b294aee6ac49a28"; } - { locale = "tr"; arch = "linux-x86_64"; sha256 = "0845a554b299b848d35894144d3ba5c7e0b808bcc9b2732e904463258ca73cb7"; } - { locale = "uk"; arch = "linux-i686"; sha256 = "a89f58c0f20a3ff7e609f572a4786f06b48886b7e2d303824417f42af49c8df2"; } - { locale = "uk"; arch = "linux-x86_64"; sha256 = "b45768588aaf80917c8ad40d62835cc96c3dadf97715234e66542b96eeb8db8e"; } - { locale = "vi"; arch = "linux-i686"; sha256 = "3fc35e59ecbbdf1b76b5b66e962a60eb724d9514d622879108725bcf7881fd1e"; } - { locale = "vi"; arch = "linux-x86_64"; sha256 = "88116edeeecbfe1ac03af0da26aff84bc3aa5ba00574e899ec08e0d68243f509"; } - { locale = "xh"; arch = "linux-i686"; sha256 = "a3afd3ac14049c72a9be28fb9a0849e4d3c5c2f13cb160c480988c4231679329"; } - { locale = "xh"; arch = "linux-x86_64"; sha256 = "569587e9cc4cd99899d2939367d56f2e4e9ae333b583064a648f05a8b0b58e2c"; } - { locale = "zh-CN"; arch = "linux-i686"; sha256 = "358e44998142e56356b839a51dff97fe85e6293424bd0c148decf61f01b6125b"; } - { locale = "zh-CN"; arch = "linux-x86_64"; sha256 = "7b5a84dbbe361a775aaadad8fd328e24f6cf2e336297f1d5906f51ff5d3dfae7"; } - { locale = "zh-TW"; arch = "linux-i686"; sha256 = "cf2cb9bed37dffe178a524ef5fe983e0e8b18f17c999e98474ae13e012da54da"; } - { locale = "zh-TW"; arch = "linux-x86_64"; sha256 = "aa0f1c5fb96dc4585e70fbcc291c6842be25e5d59be8bf39e8dc0232e9f1a76c"; } - { locale = "zu"; arch = "linux-i686"; sha256 = "775f6507ae8d6c2ef6e29e6b4d00453dcf9a0c9651eb9da482c78b5ebe64f2cd"; } - { locale = "zu"; arch = "linux-x86_64"; sha256 = "603510372a52497a8e41468dbc193afa25b0615f504f4548201deb89f27bd354"; } + { locale = "ach"; arch = "linux-i686"; sha256 = "8372c1227b75486e297fd914bac530a45b22b789e627638e010d4c25337f350f"; } + { locale = "ach"; arch = "linux-x86_64"; sha256 = "e01412aa570a462a3bb1ba851cd7133014b3299c0ad349c15534edc35c6d6397"; } + { locale = "af"; arch = "linux-i686"; sha256 = "e75bd2d41de60483ed1eadcf03d9cd57146210ff9fdfe04e984404ce4bca29f7"; } + { locale = "af"; arch = "linux-x86_64"; sha256 = "32697271215a0e63b7d0b25398d27772da5d53e88d020df24f170ebc341e5394"; } + { locale = "an"; arch = "linux-i686"; sha256 = "3a590702183a86283e4de415eefdeed6f95f1e5d48c64456c4d6db8f84dcfb68"; } + { locale = "an"; arch = "linux-x86_64"; sha256 = "98d35a6a2f0875a9723ed9511f3bea65f58da3196db3f75aaf7420d45bde33ad"; } + { locale = "ar"; arch = "linux-i686"; sha256 = "e632f104442b725cf8e0e25c9a924b166289e1fab601a70aee0a81394632423c"; } + { locale = "ar"; arch = "linux-x86_64"; sha256 = "603a054ceb36645881f52042e556572252e898bfa78cec04811e65f27b9db026"; } + { locale = "as"; arch = "linux-i686"; sha256 = "05e64b9113f450bfbfa1b99c9580dbb2442af35d6cc20dec0c7af379dd5d37db"; } + { locale = "as"; arch = "linux-x86_64"; sha256 = "85b57a101afd0c4aae040bb1f3523ddda3079d46ac8abe9cad826939fd274353"; } + { locale = "ast"; arch = "linux-i686"; sha256 = "5df5eb0db623b42d9a2c9be58807ec66f43a26dd1365d44202d4b0db50d6a6f0"; } + { locale = "ast"; arch = "linux-x86_64"; sha256 = "6faac3f3637bd68d6c20c73dd84c554afdaa136c4e142c26eb8142b7ab00895f"; } + { locale = "be"; arch = "linux-i686"; sha256 = "4a87051df26ddb3fd2cf7c2beabc2d403cbc4d2f2e7e0802fb11566722171b57"; } + { locale = "be"; arch = "linux-x86_64"; sha256 = "8194b851ed7f9559b78f63711df598ed094783eb2cc288fbd1e880d53118dde5"; } + { locale = "bg"; arch = "linux-i686"; sha256 = "f6f903529d3276d1aa55968d4978fe5977d45076db0ee99d87199d59a9441ad5"; } + { locale = "bg"; arch = "linux-x86_64"; sha256 = "bce34ee8ec314db0f7abfeddf491d15642dcedea125dc9bb7d7dda3915054940"; } + { locale = "bn-BD"; arch = "linux-i686"; sha256 = "9bd0e37ddf9a222263ca90308245e2078f45d754d8a2b0bc1e4dea13a5e7b581"; } + { locale = "bn-BD"; arch = "linux-x86_64"; sha256 = "debb3a9983e4219b6632cdfd09d04ab95314ba4e0bd7ff36fd89f0a748d25cdd"; } + { locale = "bn-IN"; arch = "linux-i686"; sha256 = "ea2c9d29f4a3dfe8e0f146979c47ccba835b81cb1f1ed6e95124a837918590fa"; } + { locale = "bn-IN"; arch = "linux-x86_64"; sha256 = "b2bf8e36ac1ca1afeae463bf95a289db7cf2d2fa303083ab405497cca2993b57"; } + { locale = "br"; arch = "linux-i686"; sha256 = "b4b9d2828e5387a65d0f63b2149400626cd47fc81b97b912eda11b3fe31d4604"; } + { locale = "br"; arch = "linux-x86_64"; sha256 = "c3af78f1215ffc1e9b6c193ba87d17e2f08e1a24856ee68aabf95b3ee7804ea9"; } + { locale = "bs"; arch = "linux-i686"; sha256 = "7930f10d5d43e4504b9f347bcb2a2ef451be4418cee86c199b3e98c38587a20d"; } + { locale = "bs"; arch = "linux-x86_64"; sha256 = "ee31279d2acf7286c9a59c99e68fdd1692b96247585230df20ea2bea5ee30ba2"; } + { locale = "ca"; arch = "linux-i686"; sha256 = "f22f7964180ad27a122e56f070c6a2a0e3b044fe15ec5046b04db03877a3b7c7"; } + { locale = "ca"; arch = "linux-x86_64"; sha256 = "84e8675f9613d1a8a49a760ee46d4625b88092cfc542e6b750384d0d5a0a465f"; } + { locale = "cs"; arch = "linux-i686"; sha256 = "bed550a83c763a8147ef862cca7ca36106bfc5b34ea81f008c94886b86a3dde2"; } + { locale = "cs"; arch = "linux-x86_64"; sha256 = "8bf76f388c6286a1b91cf460325b98c2dd08842031288617d9141b1368b5f62c"; } + { locale = "csb"; arch = "linux-i686"; sha256 = "2420bf49ff3429b3f186b17555b8b3250d44579b5ff7ce616914af646b5996be"; } + { locale = "csb"; arch = "linux-x86_64"; sha256 = "a0ee304a61b12ec1dd3caf5d876acbd9d2ad4443f9b96e73ecc1de8a1e16206f"; } + { locale = "cy"; arch = "linux-i686"; sha256 = "603a66c237e95534d2dbd004e7fd77b69d5b99b73cba797c7825aaca6d849c61"; } + { locale = "cy"; arch = "linux-x86_64"; sha256 = "69f68c024d6e9999b5a846d12c5a61ca63d962f6bd21737769d1fe5519916dad"; } + { locale = "da"; arch = "linux-i686"; sha256 = "da8ed391e8ae9729cf2af35700aff3f6900af208fee9eab6a6bd0fcb303abd09"; } + { locale = "da"; arch = "linux-x86_64"; sha256 = "7e3cc63eb61289e1006f683581345caaffe3ae39f7a636ff4f451b1e77a8ffb6"; } + { locale = "de"; arch = "linux-i686"; sha256 = "f191e74047cdddd43fa72242b1dce15a28160f62b4b8eae08ad117f4b27d6e0f"; } + { locale = "de"; arch = "linux-x86_64"; sha256 = "a81165d446cab525645ca2b18ef28cf253c6ee6267086d692a3904c79f7e5be0"; } + { locale = "el"; arch = "linux-i686"; sha256 = "eb0757aafd2a1c4bb9abeab01a3960d3ac21b92879f8dc7d24f485a43d305957"; } + { locale = "el"; arch = "linux-x86_64"; sha256 = "900f64bad286393f6d96f0ff00c6e78ae6cce998046cf506e2b3ec7a7b8e76c0"; } + { locale = "en-GB"; arch = "linux-i686"; sha256 = "99284b229b7bfcc44cce3ebeee523e49bd5d9c7d860345ad3e242af4f9848683"; } + { locale = "en-GB"; arch = "linux-x86_64"; sha256 = "9a4e003441556422375d4bede21da27a03d31b5ec452ff467abcfffdfe363f4a"; } + { locale = "en-US"; arch = "linux-i686"; sha256 = "13b4297db52ef851b38f292eba2b2136e4c2f1453e004012fe8b1fbcf000abce"; } + { locale = "en-US"; arch = "linux-x86_64"; sha256 = "ce87f081c4867b9968a2695341001854aa6c1f4f19073d13f54f333cfed236fc"; } + { locale = "en-ZA"; arch = "linux-i686"; sha256 = "849584baf4c6dd330bf9c798e3e8923004a3a381642d4f684b5de3fb5b4fd895"; } + { locale = "en-ZA"; arch = "linux-x86_64"; sha256 = "635d0cb43a2b5f7f0401f961fd88fc0d6735223ad421ec0ef92a4ee16b29727f"; } + { locale = "eo"; arch = "linux-i686"; sha256 = "91da9571212dc82f5d7140e4de073189018f7f895a3b263a4f8840401b4b10bb"; } + { locale = "eo"; arch = "linux-x86_64"; sha256 = "77f39ab0168efe9070ecd881dbd2884fe5f35eeea17a63ad8d957398f6eef40d"; } + { locale = "es-AR"; arch = "linux-i686"; sha256 = "f4ec6f07e67195981c12b5cbc3a6289a6e9d29539014c034039bd498a40f9301"; } + { locale = "es-AR"; arch = "linux-x86_64"; sha256 = "3f24135fd1a6fd2207bf1d80fc79cb34536b109e195e43a3a13eba0b68548c0e"; } + { locale = "es-CL"; arch = "linux-i686"; sha256 = "de3672a512473cc6edc48bb775bc9a405d0c9effccdb0cd46af5ce2593d67613"; } + { locale = "es-CL"; arch = "linux-x86_64"; sha256 = "770134c2bd8bc9f2e629e355b8e3b0949f67dd2ecd1b3a1d513bff364e53b734"; } + { locale = "es-ES"; arch = "linux-i686"; sha256 = "4eeb5854427cde599468b90af70ae3e04eb9aff5132659f6e1ddb2f859f0be74"; } + { locale = "es-ES"; arch = "linux-x86_64"; sha256 = "eb91e2e9b80cab85e6ab75e78a9b206a18bb647ffb247c0d5ed324ee219dccd9"; } + { locale = "es-MX"; arch = "linux-i686"; sha256 = "0aa0c85a51a50adb9eca5e5a1eda0ca11ddc15ad12b2d930ebe769f10d535433"; } + { locale = "es-MX"; arch = "linux-x86_64"; sha256 = "3f340072c80c95283b17e797bf4fdbde9d1de55b5f10f1c9e8193f8426c6157d"; } + { locale = "et"; arch = "linux-i686"; sha256 = "4719961e58e755ea2d9b94ff7439e1f9e858b0dacbd8631f98fadebca36c72a1"; } + { locale = "et"; arch = "linux-x86_64"; sha256 = "70aa1a76414c50b00fc85be87a07b936c7f60d83037f13716862e8491ec8d609"; } + { locale = "eu"; arch = "linux-i686"; sha256 = "ea450d11b0cd3b4381797bf6ca48d74fb18d661864eccb365bc2d51b872b101a"; } + { locale = "eu"; arch = "linux-x86_64"; sha256 = "d543e7fdd4c27875d30a1d527219e257296c6010e80dc0d5529722aa82cc666f"; } + { locale = "fa"; arch = "linux-i686"; sha256 = "4b8aaf0d27f10474c6ec4eeec1418ffb08338475c5433199ac2db79aab5273b2"; } + { locale = "fa"; arch = "linux-x86_64"; sha256 = "df10d71c7a762696ee682ca705052b15031dc7e84aa396f67fa26463e3dcd353"; } + { locale = "ff"; arch = "linux-i686"; sha256 = "acdfec7656b48e5502692c408cd8c7543add80181130bdd2e0ec66ac44219a06"; } + { locale = "ff"; arch = "linux-x86_64"; sha256 = "a9a0041cba2f80b09a2f22da6f1e9bfdfc1cbf0f5c324a427a1758174901fc27"; } + { locale = "fi"; arch = "linux-i686"; sha256 = "304e90020134af5564d5c90c5d9fee6264aa871e82419408f5b0e9d97f8f8ff1"; } + { locale = "fi"; arch = "linux-x86_64"; sha256 = "bfb86547ea4e0a5650a152070a7651a7f63b0df366fa4aed7f890033332e64a5"; } + { locale = "fr"; arch = "linux-i686"; sha256 = "1ccef0f95df1571b9e378d97122303982f93251bd3ed70d0af93babc3459bad2"; } + { locale = "fr"; arch = "linux-x86_64"; sha256 = "93ffcc3bbba8b7e0941fe674f6a67ed378e75b37c3e52debbef2434ea75f2b09"; } + { locale = "fy-NL"; arch = "linux-i686"; sha256 = "20ae7baa888fdcb467388313fa51104f8ba77ca31b2bcd731e2d65a46ff75c3f"; } + { locale = "fy-NL"; arch = "linux-x86_64"; sha256 = "33a028be0c63dc892efc93bd03375c8c4f9be38acb96a2bc516300c204086b3d"; } + { locale = "ga-IE"; arch = "linux-i686"; sha256 = "ddf134c692d321744bd787b7833ccc9b06ef130865c8f8ee816d35ff55c344a7"; } + { locale = "ga-IE"; arch = "linux-x86_64"; sha256 = "e76e18b18a7468ee6a550e837abf04b79833ae084210f723d0781f2b81e3077e"; } + { locale = "gd"; arch = "linux-i686"; sha256 = "3c361e322be79ffaec9a382aacf3b9cc90f03fa664e35e283cd8572e66d3b8b0"; } + { locale = "gd"; arch = "linux-x86_64"; sha256 = "5e95305321ff373d9cc6eee522dbd5ee948e6c298f2fb38d655965ec1de448e0"; } + { locale = "gl"; arch = "linux-i686"; sha256 = "99b9dbf38f50f5385072d72d14684e980aead6125c4c91cfa8e69bd5c7f1aa0e"; } + { locale = "gl"; arch = "linux-x86_64"; sha256 = "372bf1395f96be3b41d05630267354f7a6c0706e90f5e21320ab5ebd5d411d41"; } + { locale = "gu-IN"; arch = "linux-i686"; sha256 = "0b8429553052c8e23d3aaf1210d53b51fac2250d1d526311a22757ebd85ca54f"; } + { locale = "gu-IN"; arch = "linux-x86_64"; sha256 = "da6a7d7292965a0c1eaf58564d9bf85192719831208e8762d06c7082ee9824d7"; } + { locale = "he"; arch = "linux-i686"; sha256 = "78ac97da0515eb5a94455dcbf4cbd9a8d1ddbf03d4b8d29bad7b9e8fdbf5ef12"; } + { locale = "he"; arch = "linux-x86_64"; sha256 = "c0d853c639cfa7b14ce10ee50776f3aebf0c84807bb59d9ec6e0e20554ae8ed2"; } + { locale = "hi-IN"; arch = "linux-i686"; sha256 = "82376fe3005c56d2e895e1ffa0e9233f3885700117a73d1c49d67d742e324752"; } + { locale = "hi-IN"; arch = "linux-x86_64"; sha256 = "0ed6234fa9c5d449437d133c83f572ceca3dd82df6cbee8573c9f137c50bcf9c"; } + { locale = "hr"; arch = "linux-i686"; sha256 = "10ff3539c27dc49763fe322e9540878d421bdf590d9a307fecc6c158472889c3"; } + { locale = "hr"; arch = "linux-x86_64"; sha256 = "f97d7e3b290b0fc6a9116198da7fc7eb32895da74a3ad572d29577e14ab12f20"; } + { locale = "hsb"; arch = "linux-i686"; sha256 = "bba1a949823e70d1b5f4a0bec27437b6fc11638fa67b2ca286a833a0d44f5ef8"; } + { locale = "hsb"; arch = "linux-x86_64"; sha256 = "5efaf3ec7f7b5d94df17d2fe0d5877a35442d33ccbf141fcf30e11351f9b4000"; } + { locale = "hu"; arch = "linux-i686"; sha256 = "88a86463f2a47e38886cd2e8b470702623c772086b71d55e61de80e1c1be4fb3"; } + { locale = "hu"; arch = "linux-x86_64"; sha256 = "967ff3bb62c8dbc93a25f75bec73803428b3fe5024841d3e2d97e444c1d27304"; } + { locale = "hy-AM"; arch = "linux-i686"; sha256 = "4bac63a8b8fea36c3dab794dff933972f9adff7f91a7d3957d4edc3c60534016"; } + { locale = "hy-AM"; arch = "linux-x86_64"; sha256 = "9c26a2438462429f96b2d8bb8c4566b1b1f7d03200ed68aaca4eb6602342c33c"; } + { locale = "id"; arch = "linux-i686"; sha256 = "e36cd7195d5cd21afd97f31a5108af5999ade8a97f92db3e00067f3cfc31cd72"; } + { locale = "id"; arch = "linux-x86_64"; sha256 = "191e47625a6764670bfbab673989e5b2e6ad45ad1c3a0544a129afe8cb963171"; } + { locale = "is"; arch = "linux-i686"; sha256 = "c839d21d4e16b05bd9aa995ff2124b6b8418ca1405a8f3bfc70fb65b5710488b"; } + { locale = "is"; arch = "linux-x86_64"; sha256 = "16d8df9867e6a13a2be7408f459e2c67d449a47105cf9709e4a743abed8229a9"; } + { locale = "it"; arch = "linux-i686"; sha256 = "7f9c3909cda97d9a40f2630af4f11e6dd8e29f45ab949348123c4334f6aee8fe"; } + { locale = "it"; arch = "linux-x86_64"; sha256 = "52f95491dbf4ee9a1f2ee552feb8a30b8196b6747064e45d5a98d0fecfa11f67"; } + { locale = "ja"; arch = "linux-i686"; sha256 = "6586fd1d792feea4e98442736f06eab15d7de526667db6a3ce7de1afac9fdaec"; } + { locale = "ja"; arch = "linux-x86_64"; sha256 = "0ef883bdf3d415a5795bd613af05b16a406b3af3415ac1c1ebc646dd76f76467"; } + { locale = "kk"; arch = "linux-i686"; sha256 = "39167c7ee9f0e9b62308fcaba0f061bda0eaac9d3bb707c6556f71085c7ddd54"; } + { locale = "kk"; arch = "linux-x86_64"; sha256 = "ec2c9ae1f5daba1e3b0c8a4f24737b0968bc818748b682418f02983e25302703"; } + { locale = "km"; arch = "linux-i686"; sha256 = "797747aa402ad42b6addd04d69995b0ea5c628da71f2cce15c8e612d15461189"; } + { locale = "km"; arch = "linux-x86_64"; sha256 = "fd75e5fbba75dd8a6cdafdb1c4983bfd4336f300df559518d3fff0e6e7e482d6"; } + { locale = "kn"; arch = "linux-i686"; sha256 = "fada07e5679bcf174078e0c596cd121301f72c307401922e5772c6fa79eeedbe"; } + { locale = "kn"; arch = "linux-x86_64"; sha256 = "d9cbb3dc02e3db54ea691dc09c882fcd65fd99bb1d0250e29e3d0a37df72179b"; } + { locale = "ko"; arch = "linux-i686"; sha256 = "22bd8b1dec10117579a267d5bb9b10f460c27c9419305aa1cc4456b09fcd7df5"; } + { locale = "ko"; arch = "linux-x86_64"; sha256 = "0e9da5e79ebb149a62606e002202b70908d329a26c213df35480962fb05a9f7c"; } + { locale = "ku"; arch = "linux-i686"; sha256 = "e5f55ab5112ca3a137c4df37460304ff7e33471e3e95e2709ace1cb32ef88084"; } + { locale = "ku"; arch = "linux-x86_64"; sha256 = "224385ae3a9da1fbbbc0d309eba0de6f64e29da4de29299cb1c778cb5a57c968"; } + { locale = "lij"; arch = "linux-i686"; sha256 = "e39f5edc61e25f490dcae7ea4fdc91033f5e868cbcaf848180c40bd920455f17"; } + { locale = "lij"; arch = "linux-x86_64"; sha256 = "f6e9725f368ce4df3be078a1ad268a29cfeba01e5606de85fbe2e375b3a5e263"; } + { locale = "lt"; arch = "linux-i686"; sha256 = "46b2c694c60540ded3d3f6cb504bc5b7a709cc0940ff6b3223f05d7b8e1f7309"; } + { locale = "lt"; arch = "linux-x86_64"; sha256 = "51d10f5c63e377b0f9e46d7ee12ea8552b8df57d6e8d9334555b7fbab617c8a4"; } + { locale = "lv"; arch = "linux-i686"; sha256 = "8e224c3efcca9864255332b7f7c089c0c04b0eb2dfe60cd04d7dd6a61d807852"; } + { locale = "lv"; arch = "linux-x86_64"; sha256 = "e53090be92e7557be5d38aed25ac0a2fb1006d15bb38d61141473f4b38c6e26c"; } + { locale = "mai"; arch = "linux-i686"; sha256 = "479795f542d17476bb721d3e7c7fef565617528016085976a63b9e5864b4dd31"; } + { locale = "mai"; arch = "linux-x86_64"; sha256 = "8daa2882e27a19894ded43885e868dd7203f506cb1bd25ede1d36328fffbbe0d"; } + { locale = "mk"; arch = "linux-i686"; sha256 = "78f6fa53d5fda46fbe54b9978acaa75faaf094d2d3b8e464539609253da07c52"; } + { locale = "mk"; arch = "linux-x86_64"; sha256 = "47a147a93dc7d1e683a57f0d7ddd7fbe3d944145932e0773be8dab6a7a0b4b01"; } + { locale = "ml"; arch = "linux-i686"; sha256 = "6ac6a36596db8bf675df76abc629fc99ff019455f8c08842668a08cb40b67e9a"; } + { locale = "ml"; arch = "linux-x86_64"; sha256 = "c4d4bed760c429c5db1d5c42682127794f81e20182aed0fc37f4c9aaf7bc582c"; } + { locale = "mr"; arch = "linux-i686"; sha256 = "a2fc483f2aca2cbb7bdff42e4b27b711fdf27f46bee707d1c6d664c391c95def"; } + { locale = "mr"; arch = "linux-x86_64"; sha256 = "5209926b3130b8b75d933287872af62ac752fc9e3fc170b540a2f0bc49d97bdf"; } + { locale = "ms"; arch = "linux-i686"; sha256 = "926944ef9a3807b3379bba4b2fff05d8c2776cc4e3239b0b2bd2e5424151e6ee"; } + { locale = "ms"; arch = "linux-x86_64"; sha256 = "20cf8557fa41119febc99bbc6de10ea7e97d3c1abc2245241db862ca8a735db1"; } + { locale = "nb-NO"; arch = "linux-i686"; sha256 = "5a2778d9e93ae4371ad29737904aaecacf494855b45e5e79cfe773410f6600f6"; } + { locale = "nb-NO"; arch = "linux-x86_64"; sha256 = "8cfe4c778ee258dcd511990fd71eefcda46ab73c4448705e3815c5c371ee6ea1"; } + { locale = "nl"; arch = "linux-i686"; sha256 = "350efbbaeb3ef9eee16a398ce482c2a3790f5b85dda6177857d7448de03af9e1"; } + { locale = "nl"; arch = "linux-x86_64"; sha256 = "6d1310f7e2ebe5fc846f966bfa930a2bf3cd0877260de40b01496cb860630c37"; } + { locale = "nn-NO"; arch = "linux-i686"; sha256 = "6447690e509ec0d1306bbfa484df82e62dd5909603b43440443c28bf2f489f24"; } + { locale = "nn-NO"; arch = "linux-x86_64"; sha256 = "6e71ad4fe85b02f8745e6b3b39a6f69f13fff45fd555704747d1f59fcf64447a"; } + { locale = "or"; arch = "linux-i686"; sha256 = "71866d15af41df9d98716544d25d8fc2069a9a8f92cdd8180731e3b3fb3c3492"; } + { locale = "or"; arch = "linux-x86_64"; sha256 = "22ace7c20948526f1011e16581c870a919c4d8002bd0c3210ae8f702d1f8a03f"; } + { locale = "pa-IN"; arch = "linux-i686"; sha256 = "12eabc66d39bd767c129c1a1777a6a13812efa0bc3df430dd7940908f53094ec"; } + { locale = "pa-IN"; arch = "linux-x86_64"; sha256 = "54501bca85e231e9fab0aa894a6e566966fdbd172fc45888d97eb828e248d105"; } + { locale = "pl"; arch = "linux-i686"; sha256 = "e16acf44c5ab2ee708ba0f74301106a5fc0c36cd65ebd302043af09803f30138"; } + { locale = "pl"; arch = "linux-x86_64"; sha256 = "a1532684d5d0e9e2091a5d42202dc6b49ee8c21df14600f0772e1f0f53f6d638"; } + { locale = "pt-BR"; arch = "linux-i686"; sha256 = "9827bfda689b01e795d4ddf7ab1169e25cc1728175af74e8a08fa3e8ef40e40c"; } + { locale = "pt-BR"; arch = "linux-x86_64"; sha256 = "bfe02180011d564fe8deff4d3f3f8e3a6bfde05469738b5b2f8849a2ee485ba8"; } + { locale = "pt-PT"; arch = "linux-i686"; sha256 = "83fcda599d09946da8a968d903fa12b93502a23337f019d3217cc80f81607fe7"; } + { locale = "pt-PT"; arch = "linux-x86_64"; sha256 = "533050be56e6dbf06a5631a5b7a7db2da4f5514f224cb787600671c79c020379"; } + { locale = "rm"; arch = "linux-i686"; sha256 = "62906af16b8e179be3015f6be9cf4b9481fcc506044c053373f9bc2e315729fa"; } + { locale = "rm"; arch = "linux-x86_64"; sha256 = "f968ed9ba8ed43d0d52b02db23b2badf6e6a2544d105f23d6b09b80a07a28ee3"; } + { locale = "ro"; arch = "linux-i686"; sha256 = "503fc4cf0de24ff5b1658d09264f8bb3b131c678f61c554ddf1006633ff2d336"; } + { locale = "ro"; arch = "linux-x86_64"; sha256 = "514625ffbf4af4519a7671896f2f2797a1b17057dea356f7c17fa52a17736358"; } + { locale = "ru"; arch = "linux-i686"; sha256 = "01521832ab38fd46751578691b82c0283d9c7a68459ab7225328afa285699b01"; } + { locale = "ru"; arch = "linux-x86_64"; sha256 = "16b780ed767ff0537ec4619453d8cd3ebdcf124704d03d1741b5501007078dee"; } + { locale = "si"; arch = "linux-i686"; sha256 = "35ee6cded95ea13c8c480a46ffc9398f50d172aff2030611d6713b04ddc1c54d"; } + { locale = "si"; arch = "linux-x86_64"; sha256 = "c4ad9cec257bacffbcf3b4c84c63ec52e1ce830754b5be0b622a44ab223919ad"; } + { locale = "sk"; arch = "linux-i686"; sha256 = "53a6bc5aebe5edf4bad34e163a54a3bed30a7c74ff883463caf057793ac3f58e"; } + { locale = "sk"; arch = "linux-x86_64"; sha256 = "5110806bb3f02317b542bb79ce34c6bffeef68982807a5e53614958fb9adc779"; } + { locale = "sl"; arch = "linux-i686"; sha256 = "3a58652b394fc2ffe1abcc1e89596f3e9357a2455cda8a0c76a44ff20331ada2"; } + { locale = "sl"; arch = "linux-x86_64"; sha256 = "fb733f327080e5b4e2ae079a5cdbdb645fde1c9388368c13fcc6af4d3d91da7a"; } + { locale = "son"; arch = "linux-i686"; sha256 = "56a262e4411404e94747312858ae1e7ca99ea48171361f03cdc660f8b0da0da2"; } + { locale = "son"; arch = "linux-x86_64"; sha256 = "db77a5cab885f96efcbaae8e9f284ad30ab78aae1a405a5f1c2ac7d4d2e43498"; } + { locale = "sq"; arch = "linux-i686"; sha256 = "fde7c85f09997ab3f7918072a9577f8d70947c5fafcc70782d684759146941bd"; } + { locale = "sq"; arch = "linux-x86_64"; sha256 = "9865054be5d0a3913e4fa16aafdacd345607955b1d733d978033a2825d926c32"; } + { locale = "sr"; arch = "linux-i686"; sha256 = "87f9f7d46a211b9205df5258f551b7c42264fdb81c70f836a37b3d5a821c4c03"; } + { locale = "sr"; arch = "linux-x86_64"; sha256 = "ed03914c382efdec2f218e87e8efdd2b761e16ad0cc2a646b02050f27503161b"; } + { locale = "sv-SE"; arch = "linux-i686"; sha256 = "1e28e39ac45177607a2ff3c71d3317b8b777679bc9e8dad2236991f05c6823ca"; } + { locale = "sv-SE"; arch = "linux-x86_64"; sha256 = "81c2fdc5ec9f338b1dc3cd5d2e8dd62cf106c4cf759826be8eb7f3f3f550c49e"; } + { locale = "ta"; arch = "linux-i686"; sha256 = "8e27ba1c8079745a93bebf6f7e4dbfa9ffc32b91d6dfa12975497466f3ec1550"; } + { locale = "ta"; arch = "linux-x86_64"; sha256 = "c244aeff11608d6f1a8513045ab53d4909af02915761b15ff34ddbbc9995dcbe"; } + { locale = "te"; arch = "linux-i686"; sha256 = "32e404eeeebeb521d909cc64fe1ba3c0b40130f7a4b4ae742a48ba61e8b668d4"; } + { locale = "te"; arch = "linux-x86_64"; sha256 = "83b5cefddc6308050c24d9fb30818fa1fb3c1d4ba9a2de9d8fc99878b01855b4"; } + { locale = "th"; arch = "linux-i686"; sha256 = "009cb39521635c1c89717b3d526a59c05e7ab82082ec31f0fd482800f01d3e8b"; } + { locale = "th"; arch = "linux-x86_64"; sha256 = "1fe31902ef44e7049e9efa4774098c00d3ecad0a4c4f585716cb4bec158e3b88"; } + { locale = "tr"; arch = "linux-i686"; sha256 = "e54ee04479b9891420af6fc1d639da121b677660a5bf1dfd8565792c9e1cdbdf"; } + { locale = "tr"; arch = "linux-x86_64"; sha256 = "bdfae1142a7714a0be9bd24b02582a9ab9913c17d130cf0b2928deb657f8bebc"; } + { locale = "uk"; arch = "linux-i686"; sha256 = "b2d6b518e86c3bae1068f7a6d7cdc975f3b0f99e514c5d3d18dbe5e62d15dbce"; } + { locale = "uk"; arch = "linux-x86_64"; sha256 = "71bd0518b69c911dbb21297cd676ed66231a3b7bc59090a9f6a85d6882263277"; } + { locale = "vi"; arch = "linux-i686"; sha256 = "390fb219da7169d69a7aca1df883750d56bf34f0f7b6b49781d6f3c6b8962962"; } + { locale = "vi"; arch = "linux-x86_64"; sha256 = "1c5af9f646ced5533223bca6dd36f364c0ca9d3f02ba93797aa8b091144cf7e2"; } + { locale = "xh"; arch = "linux-i686"; sha256 = "5d0d04c7c84ffc51b11f99205ae767954b78d98c3a2d18bfcceca1cb292fcd9a"; } + { locale = "xh"; arch = "linux-x86_64"; sha256 = "5fafe2b375ee0935da52ec9037c4f515d1be5cf783548215d289a300e06bb9de"; } + { locale = "zh-CN"; arch = "linux-i686"; sha256 = "1361b7cfc08d4d000107a244ec2a163ab27616b1d1db13917f34acc4d4167d34"; } + { locale = "zh-CN"; arch = "linux-x86_64"; sha256 = "66aa04a7b5240df285afd37608c816b7c09cb365c6d0cd5aa4dbe8a7be61d824"; } + { locale = "zh-TW"; arch = "linux-i686"; sha256 = "c0e3d9b584ba10e2a67a904253b2d93ab3546465e69619f932b566ad6b04a003"; } + { locale = "zh-TW"; arch = "linux-x86_64"; sha256 = "6a24f9f3631bc0bcc15de6a124c0f7dbcee6d0099e2f0b0622a18e54c04620a9"; } + { locale = "zu"; arch = "linux-i686"; sha256 = "7fa59f6ee26d48f992015b0bb667a0c230cea854eafa67d7c4e51d38e1a267d3"; } + { locale = "zu"; arch = "linux-x86_64"; sha256 = "4af969f1e0d0703e83d903fc2a30739ae2ab42cc3a24219be8bfd152490970c5"; } ]; arch = if stdenv.system == "i686-linux" diff --git a/pkgs/applications/networking/browsers/firefox/3.6.nix b/pkgs/applications/networking/browsers/firefox/3.6.nix deleted file mode 100644 index c430bb7089a8cd426c28f9a3efc3f202836b71a5..0000000000000000000000000000000000000000 --- a/pkgs/applications/networking/browsers/firefox/3.6.nix +++ /dev/null @@ -1,155 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL -, libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs -, freetype, fontconfig, file, alsaLib, nspr, nss, libnotify - -, # If you want the resulting program to call itself "Firefox" instead - # of "Shiretoko" or whatever, enable this option. However, those - # binaries may not be distributed without permission from the - # Mozilla Foundation, see - # http://www.mozilla.org/foundation/trademarks/. - enableOfficialBranding ? false -}: - -rec { - - firefoxVersion = "3.6.27"; - - xulVersion = "1.9.2.27"; # this attribute is used by other packages - - - src = fetchurl { - url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"; - sha1 = "dd472a10e4ef5b017f00074d0325be13e832d610"; - }; - - - commonConfigureFlags = - [ "--enable-optimize" - "--disable-debug" - "--enable-strip" - "--with-system-jpeg" - "--with-system-zlib" - "--with-system-bz2" - "--with-system-nspr" - "--with-system-nss" - # "--with-system-png" # <-- "--with-system-png won't work because the system's libpng doesn't have APNG support" - "--enable-system-cairo" - #"--enable-system-sqlite" # <-- this seems to be discouraged - "--disable-crashreporter" - "--disable-tests" - "--disable-necko-wifi" # maybe we want to enable this at some point - ]; - - xulrunner = stdenv.mkDerivation { - name = "xulrunner-${xulVersion}"; - - inherit src; - - patches = [ - # Loongson2f related patches: - ./xulrunner-chromium-mips.patch - ./xulrunner-mips-n32.patch - ./xulrunner-1.9.2_beta4-mips-bus-error.patch - - # Fix building on GCC 4.6. - ./gcc-4.6.patch - ]; - - buildInputs = - [ pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2 - python dbus dbus_glib pango freetype fontconfig xlibs.libXi - xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file - alsaLib nspr nss libnotify xlibs.pixman - ]; - - preConfigure = if stdenv.isMips then '' - export ac_cv_thread_keyword=no - '' else ""; - - configureFlags = - [ "--enable-application=xulrunner" - "--disable-javaxpcom" - ] ++ commonConfigureFlags; - - # !!! Temporary hack. - preBuild = '' - export NIX_ENFORCE_PURITY= - ''; - - installFlags = "SKIP_GRE_REGISTRATION=1"; - - postInstall = '' - # Fix some references to /bin paths in the Xulrunner shell script. - substituteInPlace $out/bin/xulrunner \ - --replace /bin/pwd "$(type -tP pwd)" \ - --replace /bin/ls "$(type -tP ls)" - - # Fix run-mozilla.sh search - libDir=$(cd $out/lib && ls -d xulrunner-[0-9]*) - echo libDir: $libDir - test -n "$libDir" - cd $out/bin - mv xulrunner ../lib/$libDir/ - - for i in $out/lib/$libDir/*; do - file $i; - if file $i | grep executable &>/dev/null; then - ln -s $i $out/bin - fi; - done; - rm -f $out/bin/run-mozilla.sh - ''; # */ - - enableParallelBuilding = true; - - meta = { - description = "Mozilla Firefox XUL runner"; - homepage = http://www.mozilla.org/firefox/; - }; - - passthru = { inherit gtk; version = xulVersion; }; - }; - - - firefox = stdenv.mkDerivation rec { - name = "firefox-${firefoxVersion}"; - - inherit src; - - buildInputs = - [ pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2 python - dbus dbus_glib pango freetype fontconfig alsaLib nspr nss libnotify - xlibs.pixman - ]; - - propagatedBuildInputs = [xulrunner]; - - configureFlags = - [ "--enable-application=browser" - "--with-libxul-sdk=${xulrunner}/lib/xulrunner-devel-${xulrunner.version}" - ] - ++ commonConfigureFlags - ++ stdenv.lib.optional enableOfficialBranding "--enable-official-branding"; - - postInstall = '' - libDir=$(cd $out/lib && ls -d firefox-[0-9]*) - test -n "$libDir" - - ln -s ${xulrunner}/lib/xulrunner-${xulrunner.version} $out/lib/$libDir/xulrunner - - # Register extensions etc. !!! is this needed anymore? - echo "running firefox -register..." - $out/bin/firefox -register - ''; # */ - - meta = { - description = "Mozilla Firefox - the browser, reloaded"; - homepage = http://www.mozilla.org/firefox/; - }; - - passthru = { - inherit gtk xulrunner nspr; - isFirefox3Like = true; - }; - }; -} diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index 1e2c3e2cfb194a41846043876f57016312dcfc07..ad2ea75bd704f43c38dd492ebed52cc80267ddee 100644 --- a/pkgs/applications/networking/browsers/firefox/default.nix +++ b/pkgs/applications/networking/browsers/firefox/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL -, libjpeg, libpng, zlib, dbus, dbus_glib, bzip2, xlibs +{ lib, stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL +, libjpeg, zlib, dbus, dbus_glib, bzip2, xlibs , freetype, fontconfig, file, alsaLib, nspr, nss, libnotify , yasm, mesa, sqlite, unzip, makeWrapper, pysqlite , hunspell, libevent, libstartup_notification, libvpx @@ -15,27 +15,38 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null; -rec { - - firefoxVersion = "30.0"; - - xulVersion = "30.0"; # this attribute is used by other packages +let version = "31.0"; in +stdenv.mkDerivation rec { + name = "firefox-${version}"; src = fetchurl { - url = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"; - sha1 = "bll9hxf31gvg9db6gxgmq25qsjif3p11"; + url = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${version}/source/firefox-${version}.source.tar.bz2"; + sha1 = "a6c3e25ee3aeb7da42db2aaeb50a385d63532beb"; }; - commonConfigureFlags = - [ "--with-system-jpeg" + buildInputs = + [ pkgconfig gtk perl zip libIDL libjpeg zlib bzip2 + python dbus dbus_glib pango freetype fontconfig xlibs.libXi + xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file + alsaLib nspr nss libnotify xlibs.pixman yasm mesa + xlibs.libXScrnSaver xlibs.scrnsaverproto pysqlite + xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper + hunspell libevent libstartup_notification libvpx cairo + gstreamer gst_plugins_base icu + ]; + + configureFlags = + [ "--enable-application=browser" + "--disable-javaxpcom" + "--with-system-jpeg" "--with-system-zlib" "--with-system-bz2" "--with-system-nspr" "--with-system-nss" "--with-system-libevent" "--with-system-libvpx" - "--with-system-png" + # "--with-system-png" # needs APNG support # "--with-system-icu" # causes ‘ar: invalid option -- 'L'’ in Firefox 28.0 "--enable-system-ffi" "--enable-system-hunspell" @@ -52,160 +63,45 @@ rec { "--disable-installer" "--disable-updater" "--disable-pulseaudio" - ] ++ (if debugBuild then [ "--enable-debug" "--enable-profiling"] - else [ "--disable-debug" "--enable-release" - "--enable-optimize" "--enable-strip" ]); - - - xulrunner = stdenv.mkDerivation rec { - name = "xulrunner-${xulVersion}"; - - inherit src; - - buildInputs = - [ pkgconfig libpng gtk perl zip libIDL libjpeg zlib bzip2 - python dbus dbus_glib pango freetype fontconfig xlibs.libXi - xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file - alsaLib nspr nss libnotify xlibs.pixman yasm mesa - xlibs.libXScrnSaver xlibs.scrnsaverproto pysqlite - xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper - hunspell libevent libstartup_notification libvpx cairo - gstreamer gst_plugins_base icu - ]; - - configureFlags = - [ "--enable-application=xulrunner" - "--disable-javaxpcom" - ] ++ commonConfigureFlags; - - #enableParallelBuilding = true; # cf. https://github.com/NixOS/nixpkgs/pull/1699#issuecomment-35196282 - - preConfigure = - '' - export NIX_LDFLAGS="$NIX_LDFLAGS -L$out/lib/xulrunner-${xulVersion}" - - mkdir ../objdir - cd ../objdir - configureScript=../mozilla-release/configure - ''; # */ - - #installFlags = "SKIP_GRE_REGISTRATION=1"; + ] + ++ (if debugBuild then [ "--enable-debug" "--enable-profiling"] + else [ "--disable-debug" "--enable-release" + "--enable-optimize" "--enable-strip" ]) + ++ lib.optional enableOfficialBranding "--enable-official-branding"; + + enableParallelBuilding = true; + + preConfigure = + '' + mkdir ../objdir + cd ../objdir + configureScript=../mozilla-release/configure + ''; - preInstall = '' - # The following is needed for startup cache creation on grsecurity kernels + preInstall = + '' + # The following is needed for startup cache creation on grsecurity kernels. paxmark m ../objdir/dist/bin/xpcshell ''; - postInstall = '' - # Fix run-mozilla.sh search - libDir=$(cd $out/lib && ls -d xulrunner-[0-9]*) - echo libDir: $libDir - test -n "$libDir" - cd $out/bin - rm xulrunner - - for i in $out/lib/$libDir/*; do - file $i; - if file $i | grep executable &>/dev/null; then - echo -e '#! /bin/sh\nexec "'"$i"'" "$@"' > "$out/bin/$(basename "$i")"; - chmod a+x "$out/bin/$(basename "$i")"; - fi; - done - for i in $out/lib/$libDir/*.so; do - patchelf --set-rpath "$(patchelf --print-rpath "$i"):$out/lib/$libDir" $i || true - done - + postInstall = + '' # For grsecurity kernels - paxmark m $out/lib/$libDir/{plugin-container,xulrunner} - - for i in $out/lib/$libDir/{plugin-container,xulrunner,xulrunner-stub}; do - wrapProgram $i --prefix LD_LIBRARY_PATH ':' "$out/lib/$libDir" - done - - rm -f $out/bin/run-mozilla.sh - ''; # */ + paxmark m $out/lib/*/{plugin-container,xulrunner} - meta = { - description = "Mozilla Firefox XUL runner"; - homepage = http://www.mozilla.com/en-US/firefox/; - }; + # Remove SDK cruft. FIXME: move to a separate output? + rm -rf $out/share/idl $out/include $out/lib/firefox-devel-* + ''; - passthru = { inherit gtk; version = xulVersion; }; + meta = { + description = "Mozilla Firefox - the browser, reloaded"; + homepage = http://www.mozilla.com/en-US/firefox/; + maintainers = with lib.maintainers; [ eelco wizeman ]; + platforms = lib.platforms.linux; }; - - firefox = stdenv.mkDerivation rec { - name = "firefox-${firefoxVersion}"; - - inherit src; - - enableParallelBuilding = true; - - buildInputs = - [ pkgconfig libpng gtk perl zip libIDL libjpeg zlib bzip2 python - dbus dbus_glib pango freetype fontconfig alsaLib nspr nss libnotify - xlibs.pixman yasm mesa sqlite file unzip pysqlite - hunspell libevent libstartup_notification libvpx cairo - gstreamer gst_plugins_base icu - ]; - - patches = [ - ./disable-reporter.patch # fixes "search box not working when built on xulrunner" - ./xpidl.patch - ]; - - propagatedBuildInputs = [xulrunner]; - - configureFlags = - [ "--enable-application=browser" - "--with-libxul-sdk=${xulrunner}/lib/xulrunner-devel-${xulrunner.version}" - "--enable-chrome-format=jar" - ] - ++ commonConfigureFlags - ++ stdenv.lib.optional enableOfficialBranding "--enable-official-branding"; - - makeFlags = [ - "SYSTEM_LIBXUL=1" - ]; - - # Because preConfigure runs configure from a subdirectory. - configureScript = "../configure"; - - preConfigure = - '' - # Hack to work around make's idea of -lbz2 dependency - find . -name Makefile.in -execdir sed -i '{}' -e '1ivpath %.so ${ - stdenv.lib.concatStringsSep ":" - (map (s : s + "/lib") (buildInputs ++ [stdenv.gcc.libc])) - }' ';' - - # Building directly in the main source directory is not allowed. - mkdir obj_dir - cd obj_dir - ''; - - postInstall = - '' - ln -s ${xulrunner}/lib/xulrunner-${xulrunner.version} $(echo $out/lib/firefox-*)/xulrunner - cd "$out/lib/"firefox-* - rm firefox - echo -e '#!${stdenv.shell}\nexec ${xulrunner}/bin/xulrunner "'"$PWD"'/application.ini" "$@"' > firefox - chmod a+x firefox - - # Put chrome.manifest etc. in the right place. - mv browser/* . - rmdir browser - ''; # */ - - meta = { - description = "Mozilla Firefox - the browser, reloaded"; - homepage = http://www.mozilla.com/en-US/firefox/; - maintainers = with stdenv.lib.maintainers; [ eelco wizeman ]; - }; - - passthru = { - inherit gtk xulrunner nspr; - isFirefox3Like = true; - }; + passthru = { + inherit gtk nspr version; + isFirefox3Like = true; }; } diff --git a/pkgs/applications/networking/browsers/firefox/disable-reporter.patch b/pkgs/applications/networking/browsers/firefox/disable-reporter.patch deleted file mode 100644 index 0a71a7210f2a7478a1834af06824d5b0b5d6de61..0000000000000000000000000000000000000000 --- a/pkgs/applications/networking/browsers/firefox/disable-reporter.patch +++ /dev/null @@ -1,20 +0,0 @@ -# from: -# - https://www.linuxquestions.org/questions/linux-from-scratch-13/blfs-xulrunner-firefox-21-0-and-search-4175462532/ -# - http://www.mail-archive.com/blfs-support@linuxfromscratch.org/msg17359.html - ---- mozilla-release/browser/base/content/browser.js.orig 2013-05-11 16:19:21.000000000 -0300 -+++ mozilla-release/browser/base/content/browser.js 2013-06-07 00:39:16.114862388 -0300 -@@ -3559,10 +3559,12 @@ - */ - recordSearchInHealthReport: function (engine, source) { - #ifdef MOZ_SERVICES_HEALTHREPORT -- let reporter = Cc["@mozilla.org/datareporting/service;1"] -+ /*let reporter = Cc["@mozilla.org/datareporting/service;1"] - .getService() - .wrappedJSObject - .healthReporter; -+ */ -+ return; - - // This can happen if the FHR component of the data reporting service is - // disabled. This is controlled by a pref that most will never use. diff --git a/pkgs/applications/networking/browsers/firefox/gcc-4.6.patch b/pkgs/applications/networking/browsers/firefox/gcc-4.6.patch deleted file mode 100644 index f5f685951ef4dca4c8bd5e4939cd9502e64811f2..0000000000000000000000000000000000000000 --- a/pkgs/applications/networking/browsers/firefox/gcc-4.6.patch +++ /dev/null @@ -1,13 +0,0 @@ -https://346825.bugs.gentoo.org/attachment.cgi?id=270163 - ---- a/gfx/ots/src/os2.cc -+++ b/gfx/ots/src/os2.cc -@@ -2,6 +2,8 @@ - // Use of this source code is governed by a BSD-style license that can be - // found in the LICENSE file. - -+#include -+ - #include "os2.h" - - #include "head.h" diff --git a/pkgs/applications/networking/browsers/firefox/xpidl.patch b/pkgs/applications/networking/browsers/firefox/xpidl.patch deleted file mode 100644 index e6a6b4d826466046b9458e821626a9b3dd76a8e8..0000000000000000000000000000000000000000 --- a/pkgs/applications/networking/browsers/firefox/xpidl.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- mozilla-release/python/mozbuild/mozbuild/backend/recursivemake.py 2013-12-05 08:07:53.000000000 -0800 -+++ mozilla-release_1/python/mozbuild/mozbuild/backend/recursivemake.py 2013-12-12 23:38:39.697318563 -0800 -@@ -421,7 +421,7 @@ - def _handle_idl_manager(self, manager): - build_files = self._purge_manifests['xpidl'] - -- for p in ('Makefile', 'backend.mk', '.deps/.mkdir.done', -+ for p in ('Makefile.in', 'Makefile', 'backend.mk', '.deps/.mkdir.done', - 'xpt/.mkdir.done'): - build_files.add(p) - diff --git a/pkgs/applications/networking/browsers/firefox/xulrunner-1.9.2_beta4-mips-bus-error.patch b/pkgs/applications/networking/browsers/firefox/xulrunner-1.9.2_beta4-mips-bus-error.patch deleted file mode 100644 index 54799397f6f8cd94cfbc44e4fb72e6657eeb546c..0000000000000000000000000000000000000000 --- a/pkgs/applications/networking/browsers/firefox/xulrunner-1.9.2_beta4-mips-bus-error.patch +++ /dev/null @@ -1,26 +0,0 @@ -http://www.gentoo-cn.org/gitweb/?p=loongson.git;a=blob;f=net-libs/xulrunner/files/xulrunner-1.9.2_beta4-mips-bus-error.patch;h=2bf51d77054796ffaf4f4d903dd8560bf96b7844;hb=HEAD - ---- ./xpcom/glue/nsTArray.h.orig 2009-04-26 01:21:58.000000000 +0800 -+++ ./xpcom/glue/nsTArray.h 2009-04-26 01:21:33.000000000 +0800 -@@ -168,6 +168,7 @@ - - // The array's elements (prefixed with a Header). This pointer is never - // null. If the array is empty, then this will point to sEmptyHdr. -+ void *padding; - Header *mHdr; - }; - -diff --git a/layout/svg/base/src/nsSVGGlyphFrame.cpp b/layout/svg/base/src/nsSVGGlyphFrame.cpp -index 6d452d0..3ce4193 100644 ---- a/layout/svg/base/src/nsSVGGlyphFrame.cpp -+++ b/layout/svg/base/src/nsSVGGlyphFrame.cpp -@@ -169,8 +169,8 @@ private: - PRBool SetupForDirectTextRun(gfxContext *aContext, float aScale); - void SetupFor(gfxContext *aContext, float aScale); - -- nsSVGGlyphFrame *mSource; - nsAutoTArray mPositions; -+ nsSVGGlyphFrame *mSource; - gfxMatrix mInitialMatrix; - // Textrun advance width from start to mCurrentChar, in appunits - gfxFloat mCurrentAdvance; diff --git a/pkgs/applications/networking/browsers/firefox/xulrunner-chromium-mips.patch b/pkgs/applications/networking/browsers/firefox/xulrunner-chromium-mips.patch deleted file mode 100644 index d309f5fb6e8064fbd3ad6bed4d255e05c1a12a40..0000000000000000000000000000000000000000 --- a/pkgs/applications/networking/browsers/firefox/xulrunner-chromium-mips.patch +++ /dev/null @@ -1,207 +0,0 @@ -http://gentoo-overlays.zugaina.org/loongson/portage/net-libs/xulrunner/files/xulrunner-chromium-mips.patch - -diff --git a/ipc/chromium/src/base/atomicops.h b/ipc/chromium/src/base/atomicops.h -index 87df918..363bf63 100644 ---- a/ipc/chromium/src/base/atomicops.h -+++ b/ipc/chromium/src/base/atomicops.h -@@ -132,6 +132,8 @@ Atomic64 Release_Load(volatile const Atomic64* ptr); - #include "base/atomicops_internals_x86_gcc.h" - #elif defined(COMPILER_GCC) && defined(ARCH_CPU_ARM_FAMILY) - #include "base/atomicops_internals_arm_gcc.h" -+#elif defined(COMPILER_GCC) && defined(ARCH_CPU_MIPS_FAMILY) -+#include "base/atomicops_internals_mips_gcc.h" - #else - #error "Atomic operations are not supported on your platform" - #endif -diff --git a/ipc/chromium/src/base/atomicops_internals_mips_gcc.h b/ipc/chromium/src/base/atomicops_internals_mips_gcc.h -new file mode 100644 -index 0000000..d1b87ee ---- /dev/null -+++ b/ipc/chromium/src/base/atomicops_internals_mips_gcc.h -@@ -0,0 +1,160 @@ -+// Copyright (c) 2010 Zhang, Le -+// Use of this source code is governed by GPLv2. -+ -+// This file is an internal atomic implementation, use base/atomicops.h instead. -+ -+#ifndef BASE_ATOMICOPS_INTERNALS_MIPS_GCC_H_ -+#define BASE_ATOMICOPS_INTERNALS_MIPS_GCC_H_ -+ -+#define ATOMICOPS_COMPILER_BARRIER() __asm__ __volatile__("" : : : "memory") -+ -+namespace base { -+namespace subtle { -+ -+// 32-bit low-level operations on any platform. -+ -+inline Atomic32 NoBarrier_CompareAndSwap(volatile Atomic32* ptr, -+ Atomic32 old_value, -+ Atomic32 new_value) { -+ Atomic32 prev; -+ __asm__ __volatile__( -+ " .set push \n" -+ " .set noat \n" -+ " .set mips3 \n" -+ "1: ll %0, %2 \n" -+ " bne %0, %z3, 2f \n" -+ " .set mips0 \n" -+ " move $1, %z4 \n" -+ " .set mips3 \n" -+ " sc $1, %1 \n" -+ " beqz $1, 3f \n" -+ "2: \n" -+ " .subsection 2 \n" -+ "3: b 1b \n" -+ " .previous \n" -+ " .set pop \n" -+ : "=&r" (prev), "=R" (*ptr) -+ : "R" (*ptr), "Jr" (old_value), "Jr" (new_value) -+ : "memory"); -+ return prev; -+} -+ -+inline Atomic32 NoBarrier_AtomicExchange(volatile Atomic32* ptr, -+ Atomic32 new_value) { -+ unsigned int ret_value; -+ unsigned long dummy; -+ -+ __asm__ __volatile__(" .set mips3 \n" -+ "1: ll %0, %3 # xchg_u32 \n" -+ " .set mips0 \n" -+ " move %2, %z4 \n" -+ " .set mips3 \n" -+ " sc %2, %1 \n" -+ " beqz %2, 2f \n" -+ " .subsection 2 \n" -+ "2: b 1b \n" -+ " .previous \n" -+ " .set mips0 \n" -+ : "=&r" (ret_value), "=m" (*ptr), "=&r" (dummy) -+ : "R" (*ptr), "Jr" (new_value) -+ : "memory"); -+ -+ return ret_value; // Now it's the previous value. -+} -+ -+inline Atomic32 NoBarrier_AtomicIncrement(volatile Atomic32* ptr, -+ Atomic32 increment) { -+ Atomic32 temp, result; -+ __asm__ __volatile__( -+ " .set mips3 \n" -+ "1: ll %1, %2 # atomic_add_return \n" -+ " addu %0, %1, %3 \n" -+ " sc %0, %2 \n" -+ " beqz %0, 2f \n" -+ " addu %0, %1, %3 \n" -+ " .subsection 2 \n" -+ "2: b 1b \n" -+ " .previous \n" -+ " .set mips0 \n" -+ : "=&r" (result), "=&r" (temp), "=m" (*ptr) -+ : "Ir" (increment), "m" (*ptr) -+ : "memory"); -+ return result; -+} -+ -+inline Atomic32 Barrier_AtomicIncrement(volatile Atomic32* ptr, -+ Atomic32 increment) { -+ Atomic32 temp, result; -+ __asm__ __volatile__( -+ " .set mips3 \n" -+ "1: ll %1, %2 # atomic_add_return \n" -+ " addu %0, %1, %3 \n" -+ " sc %0, %2 \n" -+ " beqz %0, 2f \n" -+ " addu %0, %1, %3 \n" -+ " .subsection 2 \n" -+ "2: b 1b \n" -+ " .previous \n" -+ " .set mips0 \n" -+ : "=&r" (result), "=&r" (temp), "=m" (*ptr) -+ : "Ir" (increment), "m" (*ptr) -+ : "memory"); -+ __asm__ __volatile__("sync" : : : "memory"); -+ return result; -+} -+ -+inline Atomic32 Acquire_CompareAndSwap(volatile Atomic32* ptr, -+ Atomic32 old_value, -+ Atomic32 new_value) { -+ Atomic32 x = NoBarrier_CompareAndSwap(ptr, old_value, new_value); -+ __asm__ __volatile__("sync" : : : "memory"); -+ return x; -+} -+ -+inline Atomic32 Release_CompareAndSwap(volatile Atomic32* ptr, -+ Atomic32 old_value, -+ Atomic32 new_value) { -+ return NoBarrier_CompareAndSwap(ptr, old_value, new_value); -+} -+ -+inline void NoBarrier_Store(volatile Atomic32* ptr, Atomic32 value) { -+ *ptr = value; -+} -+ -+inline void MemoryBarrier() { -+ __asm__ __volatile__("sync" : : : "memory"); -+} -+ -+inline void Acquire_Store(volatile Atomic32* ptr, Atomic32 value) { -+ *ptr = value; -+ __asm__ __volatile__("sync" : : : "memory"); -+} -+ -+inline void Release_Store(volatile Atomic32* ptr, Atomic32 value) { -+ ATOMICOPS_COMPILER_BARRIER(); -+ *ptr = value; // An x86 store acts as a release barrier. -+ // See comments in Atomic64 version of Release_Store(), below. -+} -+ -+inline Atomic32 NoBarrier_Load(volatile const Atomic32* ptr) { -+ return *ptr; -+} -+ -+inline Atomic32 Acquire_Load(volatile const Atomic32* ptr) { -+ Atomic32 value = *ptr; // An x86 load acts as a acquire barrier. -+ // See comments in Atomic64 version of Release_Store(), below. -+ ATOMICOPS_COMPILER_BARRIER(); -+ return value; -+} -+ -+inline Atomic32 Release_Load(volatile const Atomic32* ptr) { -+ MemoryBarrier(); -+ return *ptr; -+} -+ -+} // namespace base::subtle -+} // namespace base -+ -+#undef ATOMICOPS_COMPILER_BARRIER -+ -+#endif // BASE_ATOMICOPS_INTERNALS_MIPS_GCC_H_ -diff --git a/ipc/chromium/src/base/debug_util_posix.cc b/ipc/chromium/src/base/debug_util_posix.cc -index f7c58b4..50fb41d 100644 ---- a/ipc/chromium/src/base/debug_util_posix.cc -+++ b/ipc/chromium/src/base/debug_util_posix.cc -@@ -108,7 +108,7 @@ bool DebugUtil::BeingDebugged() { - - // static - void DebugUtil::BreakDebugger() { --#if !defined(ARCH_CPU_ARM_FAMILY) -+#if !defined(ARCH_CPU_ARM_FAMILY) && !defined(ARCH_CPU_MIPS_FAMILY) - asm ("int3"); - #endif - } -diff --git a/ipc/chromium/src/build/build_config.h b/ipc/chromium/src/build/build_config.h -index 36f83e7..128bbc7 100644 ---- a/ipc/chromium/src/build/build_config.h -+++ b/ipc/chromium/src/build/build_config.h -@@ -57,6 +57,8 @@ - #define ARCH_CPU_ARMEL 1 - #define ARCH_CPU_32_BITS 1 - #define WCHAR_T_IS_UNSIGNED 1 -+#elif defined(__MIPSEL__) -+#define ARCH_CPU_MIPS_FAMILY 1 - #else - #error Please add support for your architecture in build/build_config.h - #endif diff --git a/pkgs/applications/networking/browsers/firefox/xulrunner-mips-n32.patch b/pkgs/applications/networking/browsers/firefox/xulrunner-mips-n32.patch deleted file mode 100644 index 8be51035260770ef80aa896a1fc229ba31a5366b..0000000000000000000000000000000000000000 --- a/pkgs/applications/networking/browsers/firefox/xulrunner-mips-n32.patch +++ /dev/null @@ -1,764 +0,0 @@ -http://gentoo-overlays.zugaina.org/loongson/portage/net-libs/xulrunner/files/xulrunner-mips-n32.patch - -From 1aa3577cf7e79b574bd2cff058ea00221194869b Mon Sep 17 00:00:00 2001 -From: Zhang Le -Date: Thu, 12 Mar 2009 02:24:34 +0800 -Subject: [PATCH 2/2] xulrunner mips n32 ABI patch - -Signed-off-by: Zhang Le ---- - xpcom/reflect/xptcall/src/md/unix/Makefile.in | 5 + - .../xptcall/src/md/unix/xptcinvoke_asm_mips64.s | 159 ++++++++++++++ - .../xptcall/src/md/unix/xptcinvoke_mips64.cpp | 173 ++++++++++++++++ - .../xptcall/src/md/unix/xptcstubs_asm_mips64.s | 149 +++++++++++++ - .../xptcall/src/md/unix/xptcstubs_mips64.cpp | 218 ++++++++++++++++++++ - 5 files changed, 704 insertions(+), 0 deletions(-) - create mode 100644 xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_mips64.s - create mode 100644 xpcom/reflect/xptcall/src/md/unix/xptcinvoke_mips64.cpp - create mode 100644 xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_mips64.s - create mode 100644 xpcom/reflect/xptcall/src/md/unix/xptcstubs_mips64.cpp - -diff --git a/xpcom/reflect/xptcall/src/md/unix/Makefile.in b/xpcom/reflect/xptcall/src/md/unix/Makefile.in -index 524174e..63586cf 100644 ---- a/xpcom/reflect/xptcall/src/md/unix/Makefile.in -+++ b/xpcom/reflect/xptcall/src/md/unix/Makefile.in -@@ -274,8 +274,13 @@ endif - - ifeq ($(OS_ARCH),Linux) - ifneq (,$(findstring mips, $(OS_TEST))) -+ifneq (,$(findstring mips64, $(OS_TEST))) -+CPPSRCS := xptcinvoke_mips64.cpp xptcstubs_mips64.cpp -+ASFILES := xptcinvoke_asm_mips64.s xptcstubs_asm_mips64.s -+else - CPPSRCS := xptcinvoke_mips.cpp xptcstubs_mips.cpp - ASFILES := xptcinvoke_asm_mips.s xptcstubs_asm_mips.s -+endif - ASFLAGS += -I$(DIST)/include -x assembler-with-cpp - endif - endif -diff --git a/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_mips64.s b/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_mips64.s -new file mode 100644 -index 0000000..f146ad8 ---- /dev/null -+++ b/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_mips64.s -@@ -0,0 +1,159 @@ -+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -+/* ***** BEGIN LICENSE BLOCK ***** -+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1 -+ * -+ * The contents of this file are subject to the Mozilla Public License Version -+ * 1.1 (the "License"); you may not use this file except in compliance with -+ * the License. You may obtain a copy of the License at -+ * http://www.mozilla.org/MPL/ -+ * -+ * Software distributed under the License is distributed on an "AS IS" basis, -+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -+ * for the specific language governing rights and limitations under the -+ * License. -+ * -+ * The Original Code is mozilla.org code. -+ * -+ * The Initial Developer of the Original Code is -+ * Netscape Communications Corporation. -+ * Portions created by the Initial Developer are Copyright (C) 1998 -+ * the Initial Developer. All Rights Reserved. -+ * -+ * Contributor(s): -+ * ZHANG Le -+ * -+ * Alternatively, the contents of this file may be used under the terms of -+ * either of the GNU General Public License Version 2 or later (the "GPL"), -+ * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -+ * in which case the provisions of the GPL or the LGPL are applicable instead -+ * of those above. If you wish to allow use of your version of this file only -+ * under the terms of either the GPL or the LGPL, and not to allow others to -+ * use your version of this file under the terms of the MPL, indicate your -+ * decision by deleting the provisions above and replace them with the notice -+ * and other provisions required by the GPL or the LGPL. If you do not delete -+ * the provisions above, a recipient may use your version of this file under -+ * the terms of any one of the MPL, the GPL or the LGPL. -+ * -+ * ***** END LICENSE BLOCK ***** */ -+#include -+#include -+ -+.text -+.globl invoke_count_words -+.globl invoke_copy_to_stack -+ -+LOCALSZ=7 # a0, a1, a2, a3, s0, ra, gp -+FRAMESZ=(((NARGSAVE+LOCALSZ)*SZREG)+ALSZ)&ALMASK -+ -+RAOFF=FRAMESZ-(1*SZREG) -+A0OFF=FRAMESZ-(2*SZREG) -+A1OFF=FRAMESZ-(3*SZREG) -+A2OFF=FRAMESZ-(4*SZREG) -+A3OFF=FRAMESZ-(5*SZREG) -+S0OFF=FRAMESZ-(6*SZREG) -+GPOFF=FRAMESZ-(7*SZREG) -+ -+# -+# _NS_InvokeByIndex_P(that, methodIndex, paramCount, params) -+# a0 a1 a2 a3 -+ -+NESTED(_NS_InvokeByIndex_P, FRAMESZ, ra) -+ PTR_SUBU sp, FRAMESZ -+ SETUP_GP64(GPOFF, _NS_InvokeByIndex_P) -+ -+ REG_S ra, RAOFF(sp) -+ REG_S a0, A0OFF(sp) -+ REG_S a1, A1OFF(sp) -+ REG_S a2, A2OFF(sp) -+ REG_S a3, A3OFF(sp) -+ REG_S s0, S0OFF(sp) -+ -+ # invoke_count_words(paramCount, params) -+ move a0, a2 -+ move a1, a3 -+ jal invoke_count_words -+ -+ # invoke_copy_to_stack(PRUint32* d, PRUint32 paramCount, -+ # nsXPTCVariant* s, PRUint32 *reg) -+ -+ REG_L a1, A2OFF(sp) # a1 - paramCount -+ REG_L a2, A3OFF(sp) # a2 - params -+ -+ # save sp before we copy the params to the stack -+ move t0, sp -+ -+ # assume full size of 16 bytes per param to be safe -+ sll v0, 4 # 16 bytes * num params -+ subu sp, sp, v0 # make room -+ move a0, sp # a0 - param stack address -+ -+ # create temporary stack space to write int and fp regs -+ subu sp, 64 # 64 = 8 regs of 8 bytes -+ move a3, sp -+ -+ # save the old sp and save the arg stack -+ subu sp, sp, 16 -+ REG_S t0, 0(sp) -+ REG_S a0, 8(sp) -+ -+ # copy the param into the stack areas -+ jal invoke_copy_to_stack -+ -+ REG_L t3, 8(sp) # get previous a0 -+ REG_L sp, 0(sp) # get orig sp back -+ -+ REG_L a0, A0OFF(sp) # a0 - that -+ REG_L a1, A1OFF(sp) # a1 - methodIndex -+ -+ # t1 = methodIndex * pow(2, PTRLOG) -+ # (use shift instead of mult) -+ sll t1, a1, PTRLOG -+ -+ # calculate the function we need to jump to, -+ # which must then be saved in t9 -+ lw t9, 0(a0) -+ addu t9, t9, t1 -+#if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */ -+ lw t9, (t9) -+#else /* not G++ V3 ABI */ -+ lw t9, 2*PTRSIZE(t9) -+#endif /* G++ V3 ABI */ -+ -+ # get register save area from invoke_copy_to_stack -+ subu t1, t3, 64 -+ -+ # a1..a7 and f13..f19 should now be set to what -+ # invoke_copy_to_stack told us. skip a0 and f12 -+ # because that's the "this" pointer -+ -+ REG_L a1, 0(t1) -+ REG_L a2, 8(t1) -+ REG_L a3, 16(t1) -+ REG_L a4, 24(t1) -+ REG_L a5, 32(t1) -+ REG_L a6, 40(t1) -+ REG_L a7, 48(t1) -+ -+ l.d $f13, 0(t1) -+ l.d $f14, 8(t1) -+ l.d $f15, 16(t1) -+ l.d $f16, 24(t1) -+ l.d $f17, 32(t1) -+ l.d $f18, 40(t1) -+ l.d $f19, 48(t1) -+ -+ # save away our stack pointer and create -+ # the stack pointer for the function -+ move s0, sp -+ move sp, t3 -+ -+ jalr t9 -+ -+ move sp, s0 -+ -+ RESTORE_GP64 -+ REG_L ra, RAOFF(sp) -+ REG_L s0, S0OFF(sp) -+ PTR_ADDU sp, FRAMESZ -+ j ra -+.end _NS_InvokeByIndex_P -diff --git a/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_mips64.cpp b/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_mips64.cpp -new file mode 100644 -index 0000000..d1d1a7d ---- /dev/null -+++ b/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_mips64.cpp -@@ -0,0 +1,173 @@ -+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -+/* ***** BEGIN LICENSE BLOCK ***** -+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1 -+ * -+ * The contents of this file are subject to the Mozilla Public License Version -+ * 1.1 (the "License"); you may not use this file except in compliance with -+ * the License. You may obtain a copy of the License at -+ * http://www.mozilla.org/MPL/ -+ * -+ * Software distributed under the License is distributed on an "AS IS" basis, -+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -+ * for the specific language governing rights and limitations under the -+ * License. -+ * -+ * The Original Code is mozilla.org code. -+ * -+ * The Initial Developer of the Original Code is -+ * Netscape Communications Corporation. -+ * Portions created by the Initial Developer are Copyright (C) 1998 -+ * the Initial Developer. All Rights Reserved. -+ * -+ * Contributor(s): -+ * ZHANG Le -+ * -+ * Alternatively, the contents of this file may be used under the terms of -+ * either of the GNU General Public License Version 2 or later (the "GPL"), -+ * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -+ * in which case the provisions of the GPL or the LGPL are applicable instead -+ * of those above. If you wish to allow use of your version of this file only -+ * under the terms of either the GPL or the LGPL, and not to allow others to -+ * use your version of this file under the terms of the MPL, indicate your -+ * decision by deleting the provisions above and replace them with the notice -+ * and other provisions required by the GPL or the LGPL. If you do not delete -+ * the provisions above, a recipient may use your version of this file under -+ * the terms of any one of the MPL, the GPL or the LGPL. -+ * -+ * ***** END LICENSE BLOCK ***** */ -+ -+/* Platform specific code to invoke XPCOM methods on native objects */ -+ -+#include "xptcprivate.h" -+ -+#if (_MIPS_SIM != _ABIN32) -+#error "This code is for MIPS N32 only" -+#endif -+ -+extern "C" uint32 -+invoke_count_words(PRUint32 paramCount, nsXPTCVariant* s) -+{ -+ return paramCount; -+} -+ -+extern "C" void -+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, -+ nsXPTCVariant* s, PRUint64 *regs) -+{ -+#define N_ARG_REGS 7 /* 8 regs minus 1 for "this" ptr */ -+ -+ for (PRUint32 i = 0; i < paramCount; i++, s++) -+ { -+ if (s->IsPtrData()) { -+ if (i < N_ARG_REGS) -+ regs[i] = (PRUint64)s->ptr; -+ else -+ *d++ = (PRUint64)s->ptr; -+ continue; -+ } -+ switch (s->type) { -+ // -+ // signed types first -+ // -+ case nsXPTType::T_I8: -+ if (i < N_ARG_REGS) -+ ((PRInt64*)regs)[i] = s->val.i8; -+ else -+ *d++ = s->val.i8; -+ break; -+ case nsXPTType::T_I16: -+ if (i < N_ARG_REGS) -+ ((PRInt64*)regs)[i] = s->val.i16; -+ else -+ *d++ = s->val.i16; -+ break; -+ case nsXPTType::T_I32: -+ if (i < N_ARG_REGS) -+ ((PRInt64*)regs)[i] = s->val.i32; -+ else -+ *d++ = s->val.i32; -+ break; -+ case nsXPTType::T_I64: -+ if (i < N_ARG_REGS) -+ ((PRInt64*)regs)[i] = s->val.i64; -+ else -+ *d++ = s->val.i64; -+ break; -+ // -+ // unsigned types next -+ // -+ case nsXPTType::T_U8: -+ if (i < N_ARG_REGS) -+ regs[i] = s->val.u8; -+ else -+ *d++ = s->val.u8; -+ break; -+ case nsXPTType::T_U16: -+ if (i < N_ARG_REGS) -+ regs[i] = s->val.u16; -+ else -+ *d++ = s->val.u16; -+ break; -+ case nsXPTType::T_U32: -+ if (i < N_ARG_REGS) -+ regs[i] = s->val.u32; -+ else -+ *d++ = s->val.u32; -+ break; -+ case nsXPTType::T_U64: -+ if (i < N_ARG_REGS) -+ regs[i] = s->val.u64; -+ else -+ *d++ = s->val.u64; -+ break; -+ case nsXPTType::T_FLOAT: -+ if (i < N_ARG_REGS) -+ *(float*)®s[i] = s->val.f; -+ else -+ *(float*)d++ = s->val.f; -+ break; -+ case nsXPTType::T_DOUBLE: -+ if (i < N_ARG_REGS) -+ *(double*)®s[i] = s->val.d; -+ else -+ *(double*)d++ = s->val.d; -+ break; -+ case nsXPTType::T_BOOL: -+ if (i < N_ARG_REGS) -+ regs[i] = s->val.b; -+ else -+ *d++ = s->val.b; -+ break; -+ case nsXPTType::T_CHAR: -+ if (i < N_ARG_REGS) -+ regs[i] = s->val.c; -+ else -+ *d++ = s->val.c; -+ break; -+ case nsXPTType::T_WCHAR: -+ if (i < N_ARG_REGS) -+ regs[i] = s->val.wc; -+ else -+ *d++ = s->val.wc; -+ break; -+ default: -+ // all the others are plain pointer types -+ if (i < N_ARG_REGS) -+ regs[i] = (PRUint64)s->val.p; -+ else -+ *d++ = (PRUint64)s->val.p; -+ break; -+ } -+ } -+} -+ -+extern "C" nsresult _NS_InvokeByIndex_P(nsISupports* that, PRUint32 methodIndex, -+ PRUint32 paramCount, -+ nsXPTCVariant* params); -+ -+EXPORT_XPCOM_API(nsresult) -+NS_InvokeByIndex_P(nsISupports* that, PRUint32 methodIndex, -+ PRUint32 paramCount, nsXPTCVariant* params) -+{ -+ return _NS_InvokeByIndex_P(that, methodIndex, paramCount, params); -+} -diff --git a/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_mips64.s b/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_mips64.s -new file mode 100644 -index 0000000..dfee24b ---- /dev/null -+++ b/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_mips64.s -@@ -0,0 +1,149 @@ -+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -+/* ***** BEGIN LICENSE BLOCK ***** -+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1 -+ * -+ * The contents of this file are subject to the Mozilla Public License Version -+ * 1.1 (the "License"); you may not use this file except in compliance with -+ * the License. You may obtain a copy of the License at -+ * http://www.mozilla.org/MPL/ -+ * -+ * Software distributed under the License is distributed on an "AS IS" basis, -+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -+ * for the specific language governing rights and limitations under the -+ * License. -+ * -+ * The Original Code is mozilla.org code. -+ * -+ * The Initial Developer of the Original Code is -+ * Netscape Communications Corporation. -+ * Portions created by the Initial Developer are Copyright (C) 1998 -+ * the Initial Developer. All Rights Reserved. -+ * -+ * Contributor(s): -+ * ZHANG Le -+ * -+ * Alternatively, the contents of this file may be used under the terms of -+ * either of the GNU General Public License Version 2 or later (the "GPL"), -+ * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -+ * in which case the provisions of the GPL or the LGPL are applicable instead -+ * of those above. If you wish to allow use of your version of this file only -+ * under the terms of either the GPL or the LGPL, and not to allow others to -+ * use your version of this file under the terms of the MPL, indicate your -+ * decision by deleting the provisions above and replace them with the notice -+ * and other provisions required by the GPL or the LGPL. If you do not delete -+ * the provisions above, a recipient may use your version of this file under -+ * the terms of any one of the MPL, the GPL or the LGPL. -+ * -+ * ***** END LICENSE BLOCK ***** */ -+#include -+#include -+ -+LOCALSZ=16 -+FRAMESZ=(((NARGSAVE+LOCALSZ)*SZREG)+ALSZ)&ALMASK -+ -+A1OFF=FRAMESZ-(9*SZREG) -+A2OFF=FRAMESZ-(8*SZREG) -+A3OFF=FRAMESZ-(7*SZREG) -+A4OFF=FRAMESZ-(6*SZREG) -+A5OFF=FRAMESZ-(5*SZREG) -+A6OFF=FRAMESZ-(4*SZREG) -+A7OFF=FRAMESZ-(3*SZREG) -+GPOFF=FRAMESZ-(2*SZREG) -+RAOFF=FRAMESZ-(1*SZREG) -+ -+F13OFF=FRAMESZ-(16*SZREG) -+F14OFF=FRAMESZ-(15*SZREG) -+F15OFF=FRAMESZ-(14*SZREG) -+F16OFF=FRAMESZ-(13*SZREG) -+F17OFF=FRAMESZ-(12*SZREG) -+F18OFF=FRAMESZ-(11*SZREG) -+F19OFF=FRAMESZ-(10*SZREG) -+ -+#define SENTINEL_ENTRY(n) /* defined in cpp file, not here */ -+ -+#if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */ -+#define STUB_ENTRY(x) \ -+ .if x < 10; \ -+ MAKE_STUB(x, _ZN14nsXPTCStubBase5Stub ##x ##Ev); \ -+ .elseif x < 100; \ -+ MAKE_STUB(x, _ZN14nsXPTCStubBase6Stub ##x ##Ev); \ -+ .elseif x < 1000; \ -+ MAKE_STUB(x, _ZN14nsXPTCStubBase7Stub ##x ##Ev); \ -+ .else; \ -+ .err; \ -+ .endif -+#else /* not G++ V3 ABI */ -+#define STUB_ENTRY(x) \ -+ MAKE_STUB(x, Stub ##x ##__14nsXPTCStubBase) -+#endif /* G++ V3 ABI */ -+ -+#define MAKE_STUB(x, name) \ -+ .globl name; \ -+ .type name,@function; \ -+ .aent name,0; \ -+name:; \ -+ PTR_SUBU sp,FRAMESZ; \ -+ SETUP_GP64(GPOFF, name); \ -+ li t0,x; \ -+ b sharedstub; \ -+ -+# -+# open a dummy frame for the function entries -+# -+ .text -+ .align 2 -+ .type dummy,@function -+ .ent dummy, 0 -+dummy: -+ .frame sp, FRAMESZ, ra -+ .mask 0x90000FF0, RAOFF-FRAMESZ -+ .fmask 0x000FF000, F19OFF-FRAMESZ -+ -+#include "xptcstubsdef.inc" -+ -+sharedstub: -+ -+ REG_S a1, A1OFF(sp) -+ REG_S a2, A2OFF(sp) -+ REG_S a3, A3OFF(sp) -+ REG_S a4, A4OFF(sp) -+ REG_S a5, A5OFF(sp) -+ REG_S a6, A6OFF(sp) -+ REG_S a7, A7OFF(sp) -+ REG_S ra, RAOFF(sp) -+ -+ s.d $f13, F13OFF(sp) -+ s.d $f14, F14OFF(sp) -+ s.d $f15, F15OFF(sp) -+ s.d $f16, F16OFF(sp) -+ s.d $f17, F17OFF(sp) -+ s.d $f18, F18OFF(sp) -+ s.d $f19, F19OFF(sp) -+ -+ # t0 is methodIndex -+ move a1, t0 -+ -+ # a2 is stack address where extra function params -+ # are stored that do not fit in registers -+ move a2, sp -+ addi a2, FRAMESZ -+ -+ # a3 is stack address of a1..a7 -+ move a3, sp -+ addi a3, A1OFF -+ -+ # a4 is stack address of f13..f19 -+ move a4, sp -+ addi a4, F13OFF -+ -+ # PrepareAndDispatch(that, methodIndex, args, gprArgs, fpArgs) -+ # a0 a1 a2 a3 a4 -+ # -+ jal PrepareAndDispatch -+ -+ REG_L ra, RAOFF(sp) -+ RESTORE_GP64 -+ -+ PTR_ADDU sp, FRAMESZ -+ j ra -+ END(dummy) -diff --git a/xpcom/reflect/xptcall/src/md/unix/xptcstubs_mips64.cpp b/xpcom/reflect/xptcall/src/md/unix/xptcstubs_mips64.cpp -new file mode 100644 -index 0000000..c404065 ---- /dev/null -+++ b/xpcom/reflect/xptcall/src/md/unix/xptcstubs_mips64.cpp -@@ -0,0 +1,218 @@ -+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -+/* ***** BEGIN LICENSE BLOCK ***** -+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1 -+ * -+ * The contents of this file are subject to the Mozilla Public License Version -+ * 1.1 (the "License"); you may not use this file except in compliance with -+ * the License. You may obtain a copy of the License at -+ * http://www.mozilla.org/MPL/ -+ * -+ * Software distributed under the License is distributed on an "AS IS" basis, -+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -+ * for the specific language governing rights and limitations under the -+ * License. -+ * -+ * The Original Code is mozilla.org code. -+ * -+ * The Initial Developer of the Original Code is -+ * Netscape Communications Corporation. -+ * Portions created by the Initial Developer are Copyright (C) 1999 -+ * the Initial Developer. All Rights Reserved. -+ * -+ * Contributor(s): -+ * ZHANG Le -+ * -+ * Alternatively, the contents of this file may be used under the terms of -+ * either of the GNU General Public License Version 2 or later (the "GPL"), -+ * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -+ * in which case the provisions of the GPL or the LGPL are applicable instead -+ * of those above. If you wish to allow use of your version of this file only -+ * under the terms of either the GPL or the LGPL, and not to allow others to -+ * use your version of this file under the terms of the MPL, indicate your -+ * decision by deleting the provisions above and replace them with the notice -+ * and other provisions required by the GPL or the LGPL. If you do not delete -+ * the provisions above, a recipient may use your version of this file under -+ * the terms of any one of the MPL, the GPL or the LGPL. -+ * -+ * ***** END LICENSE BLOCK ***** */ -+ -+#include "xptcprivate.h" -+#include "xptiprivate.h" -+ -+#if (_MIPS_SIM != _ABIN32) -+#error "This code is for MIPS N32 only" -+#endif -+ -+/* -+ * This is for MIPS N32 ABI -+ * -+ * When we're called, the "gp" registers are stored in gprData and -+ * the "fp" registers are stored in fprData. There are 8 regs -+ * available which coorespond to the first 7 parameters of the -+ * function and the "this" pointer. If there are additional parms, -+ * they are stored on the stack at address "args". -+ * -+ */ -+extern "C" nsresult -+PrepareAndDispatch(nsXPTCStubBase* self, PRUint32 methodIndex, PRUint64* args, -+ PRUint64 *gprData, double *fprData) -+{ -+#define PARAM_BUFFER_COUNT 16 -+#define PARAM_GPR_COUNT 7 -+#define PARAM_FPR_COUNT 7 -+ -+ nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT]; -+ nsXPTCMiniVariant* dispatchParams = NULL; -+ const nsXPTMethodInfo* info; -+ PRUint8 paramCount; -+ PRUint8 i; -+ nsresult result = NS_ERROR_FAILURE; -+ -+ NS_ASSERTION(self,"no self"); -+ -+ self->mEntry->GetMethodInfo(PRUint16(methodIndex), &info); -+ NS_ASSERTION(info,"no method info"); -+ -+ paramCount = info->GetParamCount(); -+ -+ // setup variant array pointer -+ if(paramCount > PARAM_BUFFER_COUNT) -+ dispatchParams = new nsXPTCMiniVariant[paramCount]; -+ else -+ dispatchParams = paramBuffer; -+ NS_ASSERTION(dispatchParams,"no place for params"); -+ -+ PRUint64* ap = args; -+ PRUint32 iCount = 0; -+ for(i = 0; i < paramCount; i++) -+ { -+ const nsXPTParamInfo& param = info->GetParam(i); -+ const nsXPTType& type = param.GetType(); -+ nsXPTCMiniVariant* dp = &dispatchParams[i]; -+ -+ if(param.IsOut() || !type.IsArithmetic()) -+ { -+ if (iCount < PARAM_GPR_COUNT) -+ dp->val.p = (void*)gprData[iCount++]; -+ else -+ dp->val.p = (void*)*ap++; -+ continue; -+ } -+ // else -+ switch(type) -+ { -+ case nsXPTType::T_I8: -+ if (iCount < PARAM_GPR_COUNT) -+ dp->val.i8 = (PRInt8)gprData[iCount++]; -+ else -+ dp->val.i8 = (PRInt8)*ap++; -+ break; -+ -+ case nsXPTType::T_I16: -+ if (iCount < PARAM_GPR_COUNT) -+ dp->val.i16 = (PRInt16)gprData[iCount++]; -+ else -+ dp->val.i16 = (PRInt16)*ap++; -+ break; -+ -+ case nsXPTType::T_I32: -+ if (iCount < PARAM_GPR_COUNT) -+ dp->val.i32 = (PRInt32)gprData[iCount++]; -+ else -+ dp->val.i32 = (PRInt32)*ap++; -+ break; -+ -+ case nsXPTType::T_I64: -+ if (iCount < PARAM_GPR_COUNT) -+ dp->val.i64 = (PRInt64)gprData[iCount++]; -+ else -+ dp->val.i64 = (PRInt64)*ap++; -+ break; -+ -+ case nsXPTType::T_U8: -+ if (iCount < PARAM_GPR_COUNT) -+ dp->val.u8 = (PRUint8)gprData[iCount++]; -+ else -+ dp->val.u8 = (PRUint8)*ap++; -+ break; -+ -+ case nsXPTType::T_U16: -+ if (iCount < PARAM_GPR_COUNT) -+ dp->val.u16 = (PRUint16)gprData[iCount++]; -+ else -+ dp->val.u16 = (PRUint16)*ap++; -+ break; -+ -+ case nsXPTType::T_U32: -+ if (iCount < PARAM_GPR_COUNT) -+ dp->val.u32 = (PRUint32)gprData[iCount++]; -+ else -+ dp->val.u32 = (PRUint32)*ap++; -+ break; -+ -+ case nsXPTType::T_U64: -+ if (iCount < PARAM_GPR_COUNT) -+ dp->val.u64 = (PRUint64)gprData[iCount++]; -+ else -+ dp->val.u64 = (PRUint64)*ap++; -+ break; -+ -+ case nsXPTType::T_FLOAT: -+ if (iCount < PARAM_FPR_COUNT) -+ dp->val.f = (double)fprData[iCount++]; -+ else -+ dp->val.f = *((double*)ap++); -+ break; -+ -+ case nsXPTType::T_DOUBLE: -+ if (iCount < PARAM_FPR_COUNT) -+ dp->val.d = (double)fprData[iCount++]; -+ else -+ dp->val.d = *((double*)ap++); -+ break; -+ -+ case nsXPTType::T_BOOL: -+ if (iCount < PARAM_GPR_COUNT) -+ dp->val.b = (PRBool)gprData[iCount++]; -+ else -+ dp->val.b = (PRBool)*ap++; -+ break; -+ -+ case nsXPTType::T_CHAR: -+ if (iCount < PARAM_GPR_COUNT) -+ dp->val.c = (char)gprData[iCount++]; -+ else -+ dp->val.c = (char)*ap++; -+ break; -+ -+ case nsXPTType::T_WCHAR: -+ if (iCount < PARAM_GPR_COUNT) -+ dp->val.wc = (wchar_t)gprData[iCount++]; -+ else -+ dp->val.wc = (wchar_t)*ap++; -+ break; -+ -+ default: -+ NS_ASSERTION(0, "bad type"); -+ break; -+ } -+ } -+ -+ result = self->mOuter->CallMethod((PRUint16)methodIndex, info, dispatchParams); -+ -+ if(dispatchParams != paramBuffer) -+ delete [] dispatchParams; -+ -+ return result; -+} -+ -+#define STUB_ENTRY(n) /* defined in the assembly file */ -+ -+#define SENTINEL_ENTRY(n) \ -+nsresult nsXPTCStubBase::Sentinel##n() \ -+{ \ -+ NS_ASSERTION(0,"nsXPTCStubBase::Sentinel called"); \ -+ return NS_ERROR_NOT_IMPLEMENTED; \ -+} -+ -+#include "xptcstubsdef.inc" --- -1.6.2 - diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix index 617d307b78355806daf0d6567fc49b7b67cc8e11..d39dfe3582e9871c3ce226c7ed23d33597863aca 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix @@ -89,6 +89,6 @@ stdenv.mkDerivation { description = "Adobe Flash Player browser plugin"; homepage = http://www.adobe.com/products/flashplayer/; maintainers = with stdenv.lib.maintainers; [ wizeman ]; - license = "unfree"; + license = stdenv.lib.licenses.unfree; }; } diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/gecko-mediaplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/gecko-mediaplayer/default.nix index 44f191e54f1d1b762b229f5179b7651d604668b6..05e3a8bf613a685f5ebf60d7f4358b7434f03506 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/gecko-mediaplayer/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/gecko-mediaplayer/default.nix @@ -10,12 +10,12 @@ stdenv.mkDerivation rec { sha256 = "913fd39e70c564cb210c2544a88869f9d1a448184421f000b14b2bc5ba718b49"; }; - buildInputs = [ pkgconfig glib dbus dbus_glib browser x11 GConf browser.xulrunner gmtk ]; + buildInputs = [ pkgconfig glib dbus dbus_glib browser x11 GConf browser gmtk ]; # !!! fix this preBuild = '' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$(echo ${browser.xulrunner}/include/xulrunner-*) -I${browser.nspr}/include/nspr" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$(echo ${browser}/include/xulrunner-*) -I${browser.nspr}/include/nspr" echo $NIX_CFLAGS_COMPILE ''; @@ -31,6 +31,7 @@ stdenv.mkDerivation rec { meta = { description = "A browser plugin that uses GNOME MPlayer to play media in a browser"; homepage = http://kdekorte.googlepages.com/gecko-mediaplayer; + broken = true; }; } diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix index e1bc4e977f6a061772d040c5f38a33d3efb66e0e..afe0600d6f7e550258fbe9a2aec111c639494ec2 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix @@ -109,7 +109,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.google.com/chat/video/; - license = "unfree"; + license = stdenv.lib.licenses.unfree; maintainers = [ stdenv.lib.maintainers.eelco ]; }; } diff --git a/pkgs/applications/networking/browsers/netsurf/default.nix b/pkgs/applications/networking/browsers/netsurf/default.nix index cf01a3c6d5f598d112174643ed16c857830a14a1..07184bfd9f2cf6746e742f8852c14c8ea584b3f3 100644 --- a/pkgs/applications/networking/browsers/netsurf/default.nix +++ b/pkgs/applications/networking/browsers/netsurf/default.nix @@ -42,7 +42,7 @@ rec { meta = { description = "HTML5 compliant parsing library, written in C"; homepage = http://www.netsurf-browser.org/projects/hubbub/; - license = "MIT"; + license = stdenv.lib.licenses.mit; maintainers = [lib.maintainers.marcweber]; platforms = lib.platforms.linux; }; @@ -63,7 +63,7 @@ rec { meta = { description = "implementation of the W3C DOM, written in C"; homepage = http://www.netsurf-browser.org/projects/hubbub/; - license = "MIT"; + license = stdenv.lib.licenses.mit; maintainers = [lib.maintainers.marcweber]; platforms = lib.platforms.linux; }; diff --git a/pkgs/applications/networking/browsers/netsurf/libCSS.nix b/pkgs/applications/networking/browsers/netsurf/libCSS.nix index 7ad39ee4ec9ccbab7f3c0b08f9b0f6838d0b9b42..ede053aeca3fef5337e0a3c089d18353ba680784 100644 --- a/pkgs/applications/networking/browsers/netsurf/libCSS.nix +++ b/pkgs/applications/networking/browsers/netsurf/libCSS.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = { description = "libCSS is a CSS parser and selection engine, written in C"; # used by netsurf homepage = http://www.netsurf-browser.org/projects/libcss/; - license = "MIT"; + license = stdenv.lib.licenses.mit; maintainers = [args.lib.maintainers.marcweber]; platforms = args.lib.platforms.linux; }; diff --git a/pkgs/applications/networking/browsers/netsurf/libParserUtils.nix b/pkgs/applications/networking/browsers/netsurf/libParserUtils.nix index fec93c39ab9de8e16a7be5b1be589d1215c8fa0d..32bede76e432d3c37aeb5744f96ecfb743c40cab 100644 --- a/pkgs/applications/networking/browsers/netsurf/libParserUtils.nix +++ b/pkgs/applications/networking/browsers/netsurf/libParserUtils.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = { description = "LibParserUtils is a library for building efficient parsers, written in C"; homepage = http://www.netsurf-browser.org/projects/libparserutils/; - license = "MIT"; + license = stdenv.lib.licenses.mit; maintainers = [args.lib.maintainers.marcweber]; platforms = args.lib.platforms.linux; broken = true; diff --git a/pkgs/applications/networking/browsers/netsurf/libnsbmp.nix b/pkgs/applications/networking/browsers/netsurf/libnsbmp.nix index 462d532cb9c4f19f3617446ccfa86bbf90a23036..d370002543ce8588e074d68d1d62dab282ed2309 100644 --- a/pkgs/applications/networking/browsers/netsurf/libnsbmp.nix +++ b/pkgs/applications/networking/browsers/netsurf/libnsbmp.nix @@ -13,8 +13,9 @@ stdenv.mkDerivation { meta = { description = "Libnsbmp is a decoding library for BMP and ICO image file formats"; # used by netsurf homepage = http://www.netsurf-browser.org/projects/libnsbmp/; - license = "MIT"; + license = stdenv.lib.licenses.mit; maintainers = [args.lib.maintainers.marcweber]; platforms = args.lib.platforms.linux; + broken = true; }; } diff --git a/pkgs/applications/networking/browsers/netsurf/libnsgif.nix b/pkgs/applications/networking/browsers/netsurf/libnsgif.nix index 5894e5c1c0335fa7596fcfe76d5dea170c67e050..a4502d2354deb7e2c6656510e48314c440ba00d0 100644 --- a/pkgs/applications/networking/browsers/netsurf/libnsgif.nix +++ b/pkgs/applications/networking/browsers/netsurf/libnsgif.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = { description = "Libnsbmp is a decoding library for gif image file formats"; # used by netsurf homepage = http://www.netsurf-browser.org/projects/libnsgif/; - license = "MIT"; + license = stdenv.lib.licenses.mit; maintainers = [args.lib.maintainers.marcweber]; platforms = args.lib.platforms.linux; broken = true; diff --git a/pkgs/applications/networking/browsers/netsurf/libsvgtiny.nix b/pkgs/applications/networking/browsers/netsurf/libsvgtiny.nix index a90e6fa193cd894ea5f66c2c81e357b1488783c6..300e9965092d1b2a541eb38a340da15dac0a61ba 100644 --- a/pkgs/applications/networking/browsers/netsurf/libsvgtiny.nix +++ b/pkgs/applications/networking/browsers/netsurf/libsvgtiny.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = { description = "implementation of SVG Tiny, written in C"; homepage = http://www.netsurf-browser.org/projects/libsvgtiny/; - license = "MIT"; + license = stdenv.lib.licenses.mit; maintainers = [args.lib.maintainers.marcweber]; platforms = args.lib.platforms.linux; }; diff --git a/pkgs/applications/networking/browsers/netsurf/libwapcaplet.nix b/pkgs/applications/networking/browsers/netsurf/libwapcaplet.nix index c4e4a60fbd689497f0fc090e5ada9cbc9342696b..8d19d1c1ef24d38f3c042915a9681ae6099bea59 100644 --- a/pkgs/applications/networking/browsers/netsurf/libwapcaplet.nix +++ b/pkgs/applications/networking/browsers/netsurf/libwapcaplet.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = { description = "LibWapcaplet is a string internment library, written in C"; homepage = http://www.netsurf-browser.org/projects/libwapcaplet/; - license = "MIT"; + license = stdenv.lib.licenses.mit; maintainers = [args.lib.maintainers.marcweber]; platforms = args.lib.platforms.linux; }; diff --git a/pkgs/applications/networking/cluster/mesos/darwin.patch b/pkgs/applications/networking/cluster/mesos/darwin.patch new file mode 100644 index 0000000000000000000000000000000000000000..118129f1723298c7ea9f2c236041601ede87885a --- /dev/null +++ b/pkgs/applications/networking/cluster/mesos/darwin.patch @@ -0,0 +1,80 @@ +diff --git a/configure.ac b/configure.ac +index 1ebd196..a49d7d4 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -463,11 +463,6 @@ __EOF__ + fi + + # Determine linker flags for Java if not set. +- if test "$OS_NAME" = "darwin"; then +- dir="$JAVA_HOME/jre/lib/server" +- JAVA_TEST_LDFLAGS="-framework JavaVM" +- JAVA_JVM_LIBRARY=$dir/libjvm.dylib +- elif test "$OS_NAME" = "linux"; then + for arch in amd64 i386; do + dir="$JAVA_HOME/jre/lib/$arch/server" + if test -e "$dir"; then +@@ -477,7 +472,6 @@ __EOF__ + break; + fi + done +- fi + + if test -z "$JAVA_TEST_LDFLAGS"; then + AC_MSG_ERROR([failed to determine linker flags for using Java \ +@@ -488,26 +482,6 @@ __EOF__ + # flags as necessary (provided JAVA_CPPFLAGS was not set). + AC_MSG_CHECKING([whether or not we can build with JNI]) + if test -z "$JAVA_CPPFLAGS"; then +- if test "$OS_NAME" = "darwin"; then +- while true; do # Loop until sucessful (via break) or exhausted options. +- m4_foreach([java_cppflags], +- [["-I$JAVA_HOME/include -I$JAVA_HOME/include/$OS_NAME"], +- ["-I/System/Library/Frameworks/JavaVM.framework/Headers"]], +- [JAVA_CPPFLAGS=java_cppflags +- TRY_LINK_JNI([break])]) +- # Exhausted options. +- AC_MSG_ERROR([failed to build with JNI +- ------------------------------------------------------------------- +- It appears we were unable to compile against the JNI. This is most +- likely due to one of the following issues: +- 1. You do not have a JDK installed on your system. +- 2. All JDKs installed on your system have deprecated JNI headers. +- It is advised to install OpenJDK on your system, as the JDK that +- ships with OS X has deprecated JNI headers. +- ------------------------------------------------------------------- +- ]) +- done +- else + while true; do # Loop until sucessful (via break) or exhausted options. + m4_foreach([java_cppflags], + [["-I$JAVA_HOME/include -I$JAVA_HOME/include/$OS_NAME"]], +@@ -516,7 +490,6 @@ __EOF__ + # Exhausted options. + AC_MSG_ERROR([failed to build with JNI]) + done +- fi + else + TRY_LINK_JNI([], [AC_MSG_ERROR([failed to build with JNI])]) + fi +@@ -760,20 +733,6 @@ libcurl is required for mesos to build. + if test "x$with_cxx11" = "xyes"; then + AX_CXX_COMPILE_STDCXX_11([noext], [mandatory]) + +- case "$host_os" in +- darwin* ) +- # If we're using clang, we need to pass -stdlib=libc++ too. +- if test "x$CLANG" = "xyes"; then +- CXXFLAGS="$CXXFLAGS -stdlib=libc++" +- fi +- +- # GTEST on OSX needs its own tr1 tuple. +- # TODO(dhamon): Update to gmock 1.7 and pass GTEST_LANG_CXX11 when in +- # c++11 mode. +- CXXFLAGS="$CXXFLAGS -DGTEST_USE_OWN_TR1_TUPLE=1" +- ;; +- esac +- + # Also pass the flags to 3rdparty libraries. + CONFIGURE_ARGS="$CONFIGURE_ARGS CXXFLAGS='$CXXFLAGS'" + fi diff --git a/pkgs/applications/networking/cluster/mesos/default.nix b/pkgs/applications/networking/cluster/mesos/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..4329308ba04d2f2ccd7e54a6684d81c57d6951d1 --- /dev/null +++ b/pkgs/applications/networking/cluster/mesos/default.nix @@ -0,0 +1,107 @@ +{ stdenv, lib, makeWrapper, fetchurl, fetchzip, curl, sasl, openssh, autoconf +, automake, libtool, unzip, gnutar, jdk, maven, python, wrapPython +, setuptools, distutils-cfg, boto, pythonProtobuf +}: + +let version = "0.19.1"; +in stdenv.mkDerivation { + dontDisableStatic = true; + + name = "mesos-${version}"; + + src = fetchurl { + url = "http://www.apache.org/dist/mesos/${version}/mesos-${version}.tar.gz"; + sha256 = "12li5xqfcw3124qg3h2cji3yhrc7gbx91lj45zfliicwgjkbmyf1"; + }; + + patches = [ ./darwin.patch ]; + + buildInputs = [ + makeWrapper autoconf automake libtool curl sasl jdk maven + python wrapPython boto distutils-cfg + ]; + + propagatedBuildInputs = [ + pythonProtobuf + ]; + + mavenRepo = import ./mesos-deps.nix { inherit stdenv curl; }; + + preConfigure = '' + export MAVEN_OPTS="-Dmaven.repo.local=$(pwd)/.m2" + ln -s $mavenRepo .m2 + + substituteInPlace src/launcher/fetcher.cpp \ + --replace '"tar' '"${gnutar}/bin/tar' \ + --replace '"unzip' '"${unzip}/bin/unzip' + + substituteInPlace src/cli/mesos-scp \ + --replace "'scp " "'${openssh}/bin/scp " + ''; + + configureFlags = [ + "--sbindir=\${out}/bin" + "--with-python-headers=${python}/include" + "--with-webui" + "--with-java-home=${jdk}" + "--with-java-headers=${jdk}/include" + "--with-included-zookeeper" + ]; + + postInstall = '' + rm -rf $out/var + rm $out/bin/*.sh + + ensureDir $out/share/java + cp src/java/target/mesos-*.jar $out/share/java + + shopt -s extglob + MESOS_NATIVE_JAVA_LIBRARY=$(echo $out/lib/libmesos.*(so|dylib)) + shopt -u extglob + + ensureDir $out/nix-support + touch $out/nix-support/setup-hook + echo "export MESOS_NATIVE_JAVA_LIBRARY=$MESOS_NATIVE_JAVA_LIBRARY" >> $out/nix-support/setup-hook + echo "export MESOS_NATIVE_LIBRARY=$MESOS_NATIVE_JAVA_LIBRARY" >> $out/nix-support/setup-hook + + # Inspired by: pkgs/development/python-modules/generic/default.nix + ensureDir "$out/lib/${python.libPrefix}"/site-packages + export PYTHONPATH="$out/lib/${python.libPrefix}/site-packages:$PYTHONPATH" + ${python}/bin/${python.executable} src/python/setup.py install \ + --install-lib=$out/lib/${python.libPrefix}/site-packages \ + --old-and-unmanageable \ + --prefix="$out" + rm -f "$out/lib/${python.libPrefix}"/site-packages/site.py* + ''; + + postFixup = '' + if test -e $out/nix-support/propagated-build-inputs; then + ln -s $out/nix-support/propagated-build-inputs $out/nix-support/propagated-user-env-packages + fi + + for inputsfile in propagated-build-inputs propagated-native-build-inputs; do + if test -e $out/nix-support/$inputsfile; then + createBuildInputsPth $inputsfile "$(cat $out/nix-support/$inputsfile)" + fi + done + + # wrap the python programs + declare -A pythonPathsSeen=() + program_PYTHONPATH="$out/libexec/mesos/python" + program_PATH="" + _addToPythonPath "$out" + for prog in mesos-cat mesos-ps mesos-scp mesos-tail; do + wrapProgram "$out/bin/$prog" \ + --prefix PYTHONPATH ":" $program_PYTHONPATH + true + done + ''; + + meta = with lib; { + homepage = "http://mesos.apache.org"; + license = licenses.asl20; + description = "A cluster manager that provides efficient resource isolation and sharing across distributed applications, or frameworks"; + maintainers = with maintainers; [ cstrahan ]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/applications/networking/cluster/mesos/fetch-mesos-deps.sh b/pkgs/applications/networking/cluster/mesos/fetch-mesos-deps.sh new file mode 100644 index 0000000000000000000000000000000000000000..c58c9f2e3d6d15eeb3291f32bce21f2a9ec6b51a --- /dev/null +++ b/pkgs/applications/networking/cluster/mesos/fetch-mesos-deps.sh @@ -0,0 +1,1242 @@ +source $stdenv/setup +header "fetching Apache Mesos maven repo" + +function fetchArtifact { + repoPath="$1" + url="http://repo.maven.apache.org/maven2/$repoPath" + mkdir -p $(dirname $out/$repoPath) + curl --fail --location --insecure --retry 3 --max-redirs 20 "$url" --output "$out/$repoPath" +} + +fetchArtifact antlr/antlr/2.7.2/antlr-2.7.2.jar +fetchArtifact antlr/antlr/2.7.2/antlr-2.7.2.jar.sha1 +fetchArtifact antlr/antlr/2.7.2/antlr-2.7.2.pom +fetchArtifact antlr/antlr/2.7.2/antlr-2.7.2.pom.sha1 +fetchArtifact asm/asm/3.2/asm-3.2.pom +fetchArtifact asm/asm/3.2/asm-3.2.pom.sha1 +fetchArtifact asm/asm/3.3.1/asm-3.3.1.jar +fetchArtifact asm/asm/3.3.1/asm-3.3.1.jar.sha1 +fetchArtifact asm/asm/3.3.1/asm-3.3.1.pom +fetchArtifact asm/asm/3.3.1/asm-3.3.1.pom.sha1 +fetchArtifact asm/asm-analysis/3.2/asm-analysis-3.2.jar +fetchArtifact asm/asm-analysis/3.2/asm-analysis-3.2.jar.sha1 +fetchArtifact asm/asm-analysis/3.2/asm-analysis-3.2.pom +fetchArtifact asm/asm-analysis/3.2/asm-analysis-3.2.pom.sha1 +fetchArtifact asm/asm-commons/3.2/asm-commons-3.2.pom +fetchArtifact asm/asm-commons/3.2/asm-commons-3.2.pom.sha1 +fetchArtifact asm/asm-commons/3.3.1/asm-commons-3.3.1.jar +fetchArtifact asm/asm-commons/3.3.1/asm-commons-3.3.1.jar.sha1 +fetchArtifact asm/asm-commons/3.3.1/asm-commons-3.3.1.pom +fetchArtifact asm/asm-commons/3.3.1/asm-commons-3.3.1.pom.sha1 +fetchArtifact asm/asm-parent/3.2/asm-parent-3.2.pom +fetchArtifact asm/asm-parent/3.2/asm-parent-3.2.pom.sha1 +fetchArtifact asm/asm-parent/3.3.1/asm-parent-3.3.1.pom +fetchArtifact asm/asm-parent/3.3.1/asm-parent-3.3.1.pom.sha1 +fetchArtifact asm/asm-tree/3.2/asm-tree-3.2.pom +fetchArtifact asm/asm-tree/3.2/asm-tree-3.2.pom.sha1 +fetchArtifact asm/asm-tree/3.3.1/asm-tree-3.3.1.jar +fetchArtifact asm/asm-tree/3.3.1/asm-tree-3.3.1.jar.sha1 +fetchArtifact asm/asm-tree/3.3.1/asm-tree-3.3.1.pom +fetchArtifact asm/asm-tree/3.3.1/asm-tree-3.3.1.pom.sha1 +fetchArtifact asm/asm-util/3.2/asm-util-3.2.jar +fetchArtifact asm/asm-util/3.2/asm-util-3.2.jar.sha1 +fetchArtifact asm/asm-util/3.2/asm-util-3.2.pom +fetchArtifact asm/asm-util/3.2/asm-util-3.2.pom.sha1 +fetchArtifact avalon-framework/avalon-framework/4.1.3/avalon-framework-4.1.3.pom +fetchArtifact avalon-framework/avalon-framework/4.1.3/avalon-framework-4.1.3.pom.sha1 +fetchArtifact backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.jar +fetchArtifact backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.jar.sha1 +fetchArtifact backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.pom +fetchArtifact backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.pom.sha1 +fetchArtifact classworlds/classworlds/1.1/classworlds-1.1.pom +fetchArtifact classworlds/classworlds/1.1/classworlds-1.1.pom.sha1 +fetchArtifact classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.pom +fetchArtifact classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.pom.sha1 +fetchArtifact com/google/code/findbugs/jsr305/1.3.9/jsr305-1.3.9.jar +fetchArtifact com/google/code/findbugs/jsr305/1.3.9/jsr305-1.3.9.jar.sha1 +fetchArtifact com/google/code/findbugs/jsr305/1.3.9/jsr305-1.3.9.pom +fetchArtifact com/google/code/findbugs/jsr305/1.3.9/jsr305-1.3.9.pom.sha1 +fetchArtifact com/google/collections/google-collections/1.0/google-collections-1.0.pom +fetchArtifact com/google/collections/google-collections/1.0/google-collections-1.0.pom.sha1 +fetchArtifact com/google/google/1/google-1.pom +fetchArtifact com/google/google/1/google-1.pom.sha1 +fetchArtifact com/google/guava/guava/11.0.2/guava-11.0.2.jar +fetchArtifact com/google/guava/guava/11.0.2/guava-11.0.2.jar.sha1 +fetchArtifact com/google/guava/guava/11.0.2/guava-11.0.2.pom +fetchArtifact com/google/guava/guava/11.0.2/guava-11.0.2.pom.sha1 +fetchArtifact com/google/guava/guava-parent/11.0.2/guava-parent-11.0.2.pom +fetchArtifact com/google/guava/guava-parent/11.0.2/guava-parent-11.0.2.pom.sha1 +fetchArtifact com/google/protobuf/protobuf-java/2.5.0/protobuf-java-2.5.0.jar +fetchArtifact com/google/protobuf/protobuf-java/2.5.0/protobuf-java-2.5.0.jar.sha1 +fetchArtifact com/google/protobuf/protobuf-java/2.5.0/protobuf-java-2.5.0.pom +fetchArtifact com/google/protobuf/protobuf-java/2.5.0/protobuf-java-2.5.0.pom.sha1 +fetchArtifact com/jcraft/jsch/0.1.44-1/jsch-0.1.44-1.jar +fetchArtifact com/jcraft/jsch/0.1.44-1/jsch-0.1.44-1.jar.sha1 +fetchArtifact com/jcraft/jsch/0.1.44-1/jsch-0.1.44-1.pom +fetchArtifact com/jcraft/jsch/0.1.44-1/jsch-0.1.44-1.pom.sha1 +fetchArtifact com/thoughtworks/qdox/qdox/1.12/qdox-1.12.jar +fetchArtifact com/thoughtworks/qdox/qdox/1.12/qdox-1.12.jar.sha1 +fetchArtifact com/thoughtworks/qdox/qdox/1.12/qdox-1.12.pom +fetchArtifact com/thoughtworks/qdox/qdox/1.12/qdox-1.12.pom.sha1 +fetchArtifact commons-beanutils/commons-beanutils/1.6/commons-beanutils-1.6.pom +fetchArtifact commons-beanutils/commons-beanutils/1.6/commons-beanutils-1.6.pom.sha1 +fetchArtifact commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar +fetchArtifact commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar.sha1 +fetchArtifact commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.pom +fetchArtifact commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.pom.sha1 +fetchArtifact commons-chain/commons-chain/1.1/commons-chain-1.1.jar +fetchArtifact commons-chain/commons-chain/1.1/commons-chain-1.1.jar.sha1 +fetchArtifact commons-chain/commons-chain/1.1/commons-chain-1.1.pom +fetchArtifact commons-chain/commons-chain/1.1/commons-chain-1.1.pom.sha1 +fetchArtifact commons-cli/commons-cli/1.0/commons-cli-1.0.jar +fetchArtifact commons-cli/commons-cli/1.0/commons-cli-1.0.jar.sha1 +fetchArtifact commons-cli/commons-cli/1.0/commons-cli-1.0.pom +fetchArtifact commons-cli/commons-cli/1.0/commons-cli-1.0.pom.sha1 +fetchArtifact commons-codec/commons-codec/1.2/commons-codec-1.2.jar +fetchArtifact commons-codec/commons-codec/1.2/commons-codec-1.2.jar.sha1 +fetchArtifact commons-codec/commons-codec/1.2/commons-codec-1.2.pom +fetchArtifact commons-codec/commons-codec/1.2/commons-codec-1.2.pom.sha1 +fetchArtifact commons-codec/commons-codec/1.3/commons-codec-1.3.jar +fetchArtifact commons-codec/commons-codec/1.3/commons-codec-1.3.jar.sha1 +fetchArtifact commons-codec/commons-codec/1.3/commons-codec-1.3.pom +fetchArtifact commons-codec/commons-codec/1.3/commons-codec-1.3.pom.sha1 +fetchArtifact commons-collections/commons-collections/2.0/commons-collections-2.0.pom +fetchArtifact commons-collections/commons-collections/2.0/commons-collections-2.0.pom.sha1 +fetchArtifact commons-collections/commons-collections/2.1/commons-collections-2.1.pom +fetchArtifact commons-collections/commons-collections/2.1/commons-collections-2.1.pom.sha1 +fetchArtifact commons-collections/commons-collections/3.1/commons-collections-3.1.jar +fetchArtifact commons-collections/commons-collections/3.1/commons-collections-3.1.jar.sha1 +fetchArtifact commons-collections/commons-collections/3.1/commons-collections-3.1.pom +fetchArtifact commons-collections/commons-collections/3.1/commons-collections-3.1.pom.sha1 +fetchArtifact commons-collections/commons-collections/3.2/commons-collections-3.2.jar +fetchArtifact commons-collections/commons-collections/3.2/commons-collections-3.2.jar.sha1 +fetchArtifact commons-collections/commons-collections/3.2/commons-collections-3.2.pom +fetchArtifact commons-collections/commons-collections/3.2/commons-collections-3.2.pom.sha1 +fetchArtifact commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar +fetchArtifact commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar.sha1 +fetchArtifact commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.pom +fetchArtifact commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.pom.sha1 +fetchArtifact commons-digester/commons-digester/1.6/commons-digester-1.6.jar +fetchArtifact commons-digester/commons-digester/1.6/commons-digester-1.6.jar.sha1 +fetchArtifact commons-digester/commons-digester/1.6/commons-digester-1.6.pom +fetchArtifact commons-digester/commons-digester/1.6/commons-digester-1.6.pom.sha1 +fetchArtifact commons-digester/commons-digester/1.8/commons-digester-1.8.jar +fetchArtifact commons-digester/commons-digester/1.8/commons-digester-1.8.jar.sha1 +fetchArtifact commons-digester/commons-digester/1.8/commons-digester-1.8.pom +fetchArtifact commons-digester/commons-digester/1.8/commons-digester-1.8.pom.sha1 +fetchArtifact commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar +fetchArtifact commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar.sha1 +fetchArtifact commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.pom +fetchArtifact commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.pom.sha1 +fetchArtifact commons-io/commons-io/1.3.2/commons-io-1.3.2.jar +fetchArtifact commons-io/commons-io/1.3.2/commons-io-1.3.2.jar.sha1 +fetchArtifact commons-io/commons-io/1.3.2/commons-io-1.3.2.pom +fetchArtifact commons-io/commons-io/1.3.2/commons-io-1.3.2.pom.sha1 +fetchArtifact commons-io/commons-io/1.4/commons-io-1.4.jar +fetchArtifact commons-io/commons-io/1.4/commons-io-1.4.jar.sha1 +fetchArtifact commons-io/commons-io/1.4/commons-io-1.4.pom +fetchArtifact commons-io/commons-io/1.4/commons-io-1.4.pom.sha1 +fetchArtifact commons-lang/commons-lang/2.1/commons-lang-2.1.jar +fetchArtifact commons-lang/commons-lang/2.1/commons-lang-2.1.jar.sha1 +fetchArtifact commons-lang/commons-lang/2.1/commons-lang-2.1.pom +fetchArtifact commons-lang/commons-lang/2.1/commons-lang-2.1.pom.sha1 +fetchArtifact commons-lang/commons-lang/2.4/commons-lang-2.4.jar +fetchArtifact commons-lang/commons-lang/2.4/commons-lang-2.4.jar.sha1 +fetchArtifact commons-lang/commons-lang/2.4/commons-lang-2.4.pom +fetchArtifact commons-lang/commons-lang/2.4/commons-lang-2.4.pom.sha1 +fetchArtifact commons-lang/commons-lang/2.5/commons-lang-2.5.jar +fetchArtifact commons-lang/commons-lang/2.5/commons-lang-2.5.jar.sha1 +fetchArtifact commons-lang/commons-lang/2.5/commons-lang-2.5.pom +fetchArtifact commons-lang/commons-lang/2.5/commons-lang-2.5.pom.sha1 +fetchArtifact commons-lang/commons-lang/2.6/commons-lang-2.6.jar +fetchArtifact commons-lang/commons-lang/2.6/commons-lang-2.6.jar.sha1 +fetchArtifact commons-lang/commons-lang/2.6/commons-lang-2.6.pom +fetchArtifact commons-lang/commons-lang/2.6/commons-lang-2.6.pom.sha1 +fetchArtifact commons-logging/commons-logging/1.0/commons-logging-1.0.pom +fetchArtifact commons-logging/commons-logging/1.0/commons-logging-1.0.pom.sha1 +fetchArtifact commons-logging/commons-logging/1.0.3/commons-logging-1.0.3.pom +fetchArtifact commons-logging/commons-logging/1.0.3/commons-logging-1.0.3.pom.sha1 +fetchArtifact commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar +fetchArtifact commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar.sha1 +fetchArtifact commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.pom +fetchArtifact commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.pom.sha1 +fetchArtifact commons-logging/commons-logging/1.1/commons-logging-1.1.pom +fetchArtifact commons-logging/commons-logging/1.1/commons-logging-1.1.pom.sha1 +fetchArtifact commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar +fetchArtifact commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar.sha1 +fetchArtifact commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.pom +fetchArtifact commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.pom.sha1 +fetchArtifact commons-logging/commons-logging-api/1.1/commons-logging-api-1.1.pom +fetchArtifact commons-logging/commons-logging-api/1.1/commons-logging-api-1.1.pom.sha1 +fetchArtifact commons-validator/commons-validator/1.2.0/commons-validator-1.2.0.jar +fetchArtifact commons-validator/commons-validator/1.2.0/commons-validator-1.2.0.jar.sha1 +fetchArtifact commons-validator/commons-validator/1.2.0/commons-validator-1.2.0.pom +fetchArtifact commons-validator/commons-validator/1.2.0/commons-validator-1.2.0.pom.sha1 +fetchArtifact commons-validator/commons-validator/1.3.1/commons-validator-1.3.1.jar +fetchArtifact commons-validator/commons-validator/1.3.1/commons-validator-1.3.1.jar.sha1 +fetchArtifact commons-validator/commons-validator/1.3.1/commons-validator-1.3.1.pom +fetchArtifact commons-validator/commons-validator/1.3.1/commons-validator-1.3.1.pom.sha1 +fetchArtifact dom4j/dom4j/1.1/dom4j-1.1.jar +fetchArtifact dom4j/dom4j/1.1/dom4j-1.1.jar.sha1 +fetchArtifact dom4j/dom4j/1.1/dom4j-1.1.pom +fetchArtifact dom4j/dom4j/1.1/dom4j-1.1.pom.sha1 +fetchArtifact doxia/doxia-sink-api/1.0-alpha-4/doxia-sink-api-1.0-alpha-4.pom +fetchArtifact doxia/doxia-sink-api/1.0-alpha-4/doxia-sink-api-1.0-alpha-4.pom.sha1 +fetchArtifact javax/servlet/servlet-api/2.3/servlet-api-2.3.pom +fetchArtifact javax/servlet/servlet-api/2.3/servlet-api-2.3.pom.sha1 +fetchArtifact javax/servlet/servlet-api/2.5/servlet-api-2.5.jar +fetchArtifact javax/servlet/servlet-api/2.5/servlet-api-2.5.jar.sha1 +fetchArtifact javax/servlet/servlet-api/2.5/servlet-api-2.5.pom +fetchArtifact javax/servlet/servlet-api/2.5/servlet-api-2.5.pom.sha1 +fetchArtifact junit/junit/3.8.1/junit-3.8.1.jar +fetchArtifact junit/junit/3.8.1/junit-3.8.1.jar.sha1 +fetchArtifact junit/junit/3.8.1/junit-3.8.1.pom +fetchArtifact junit/junit/3.8.1/junit-3.8.1.pom.sha1 +fetchArtifact junit/junit/3.8.2/junit-3.8.2.pom +fetchArtifact junit/junit/3.8.2/junit-3.8.2.pom.sha1 +fetchArtifact junit/junit/4.10/junit-4.10.pom +fetchArtifact junit/junit/4.10/junit-4.10.pom.sha1 +fetchArtifact log4j/log4j/1.2.12/log4j-1.2.12.pom +fetchArtifact log4j/log4j/1.2.12/log4j-1.2.12.pom.sha1 +fetchArtifact log4j/log4j/1.2.14/log4j-1.2.14.jar +fetchArtifact log4j/log4j/1.2.14/log4j-1.2.14.jar.sha1 +fetchArtifact log4j/log4j/1.2.14/log4j-1.2.14.pom +fetchArtifact log4j/log4j/1.2.14/log4j-1.2.14.pom.sha1 +fetchArtifact logkit/logkit/1.0.1/logkit-1.0.1.pom +fetchArtifact logkit/logkit/1.0.1/logkit-1.0.1.pom.sha1 +fetchArtifact org/apache/apache/10/apache-10.pom +fetchArtifact org/apache/apache/10/apache-10.pom.sha1 +fetchArtifact org/apache/apache/11/apache-11.pom +fetchArtifact org/apache/apache/11/apache-11.pom.sha1 +fetchArtifact org/apache/apache/13/apache-13.pom +fetchArtifact org/apache/apache/13/apache-13.pom.sha1 +fetchArtifact org/apache/apache/2/apache-2.pom +fetchArtifact org/apache/apache/2/apache-2.pom.sha1 +fetchArtifact org/apache/apache/3/apache-3.pom +fetchArtifact org/apache/apache/3/apache-3.pom.sha1 +fetchArtifact org/apache/apache/4/apache-4.pom +fetchArtifact org/apache/apache/4/apache-4.pom.sha1 +fetchArtifact org/apache/apache/5/apache-5.pom +fetchArtifact org/apache/apache/5/apache-5.pom.sha1 +fetchArtifact org/apache/apache/6/apache-6.pom +fetchArtifact org/apache/apache/6/apache-6.pom.sha1 +fetchArtifact org/apache/apache/7/apache-7.pom +fetchArtifact org/apache/apache/7/apache-7.pom.sha1 +fetchArtifact org/apache/apache/9/apache-9.pom +fetchArtifact org/apache/apache/9/apache-9.pom.sha1 +fetchArtifact org/apache/apache-jar-resource-bundle/1.4/apache-jar-resource-bundle-1.4.jar +fetchArtifact org/apache/apache-jar-resource-bundle/1.4/apache-jar-resource-bundle-1.4.jar.sha1 +fetchArtifact org/apache/commons/commons-parent/12/commons-parent-12.pom +fetchArtifact org/apache/commons/commons-parent/12/commons-parent-12.pom.sha1 +fetchArtifact org/apache/commons/commons-parent/17/commons-parent-17.pom +fetchArtifact org/apache/commons/commons-parent/17/commons-parent-17.pom.sha1 +fetchArtifact org/apache/commons/commons-parent/3/commons-parent-3.pom +fetchArtifact org/apache/commons/commons-parent/3/commons-parent-3.pom.sha1 +fetchArtifact org/apache/commons/commons-parent/5/commons-parent-5.pom +fetchArtifact org/apache/commons/commons-parent/5/commons-parent-5.pom.sha1 +fetchArtifact org/apache/commons/commons-parent/7/commons-parent-7.pom +fetchArtifact org/apache/commons/commons-parent/7/commons-parent-7.pom.sha1 +fetchArtifact org/apache/commons/commons-parent/9/commons-parent-9.pom +fetchArtifact org/apache/commons/commons-parent/9/commons-parent-9.pom.sha1 +fetchArtifact org/apache/httpcomponents/httpclient/4.0.2/httpclient-4.0.2.jar +fetchArtifact org/apache/httpcomponents/httpclient/4.0.2/httpclient-4.0.2.jar.sha1 +fetchArtifact org/apache/httpcomponents/httpclient/4.0.2/httpclient-4.0.2.pom +fetchArtifact org/apache/httpcomponents/httpclient/4.0.2/httpclient-4.0.2.pom.sha1 +fetchArtifact org/apache/httpcomponents/httpcomponents-client/4.0.2/httpcomponents-client-4.0.2.pom +fetchArtifact org/apache/httpcomponents/httpcomponents-client/4.0.2/httpcomponents-client-4.0.2.pom.sha1 +fetchArtifact org/apache/httpcomponents/httpcomponents-core/4.0.1/httpcomponents-core-4.0.1.pom +fetchArtifact org/apache/httpcomponents/httpcomponents-core/4.0.1/httpcomponents-core-4.0.1.pom.sha1 +fetchArtifact org/apache/httpcomponents/httpcore/4.0.1/httpcore-4.0.1.jar +fetchArtifact org/apache/httpcomponents/httpcore/4.0.1/httpcore-4.0.1.jar.sha1 +fetchArtifact org/apache/httpcomponents/httpcore/4.0.1/httpcore-4.0.1.pom +fetchArtifact org/apache/httpcomponents/httpcore/4.0.1/httpcore-4.0.1.pom.sha1 +fetchArtifact org/apache/httpcomponents/project/4.0/project-4.0.pom +fetchArtifact org/apache/httpcomponents/project/4.0/project-4.0.pom.sha1 +fetchArtifact org/apache/httpcomponents/project/4.1/project-4.1.pom +fetchArtifact org/apache/httpcomponents/project/4.1/project-4.1.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia/1.0/doxia-1.0.pom +fetchArtifact org/apache/maven/doxia/doxia/1.0/doxia-1.0.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia/1.0-alpha-10/doxia-1.0-alpha-10.pom +fetchArtifact org/apache/maven/doxia/doxia/1.0-alpha-10/doxia-1.0-alpha-10.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia/1.0-alpha-7/doxia-1.0-alpha-7.pom +fetchArtifact org/apache/maven/doxia/doxia/1.0-alpha-7/doxia-1.0-alpha-7.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia/1.2/doxia-1.2.pom +fetchArtifact org/apache/maven/doxia/doxia/1.2/doxia-1.2.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia/1.3/doxia-1.3.pom +fetchArtifact org/apache/maven/doxia/doxia/1.3/doxia-1.3.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-core/1.0/doxia-core-1.0.jar +fetchArtifact org/apache/maven/doxia/doxia-core/1.0/doxia-core-1.0.jar.sha1 +fetchArtifact org/apache/maven/doxia/doxia-core/1.0/doxia-core-1.0.pom +fetchArtifact org/apache/maven/doxia/doxia-core/1.0/doxia-core-1.0.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-core/1.3/doxia-core-1.3.jar +fetchArtifact org/apache/maven/doxia/doxia-core/1.3/doxia-core-1.3.jar.sha1 +fetchArtifact org/apache/maven/doxia/doxia-core/1.3/doxia-core-1.3.pom +fetchArtifact org/apache/maven/doxia/doxia-core/1.3/doxia-core-1.3.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.0/doxia-decoration-model-1.0.jar +fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.0/doxia-decoration-model-1.0.jar.sha1 +fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.0/doxia-decoration-model-1.0.pom +fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.0/doxia-decoration-model-1.0.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.2/doxia-decoration-model-1.2.pom +fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.2/doxia-decoration-model-1.2.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.3/doxia-decoration-model-1.3.jar +fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.3/doxia-decoration-model-1.3.jar.sha1 +fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.3/doxia-decoration-model-1.3.pom +fetchArtifact org/apache/maven/doxia/doxia-decoration-model/1.3/doxia-decoration-model-1.3.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-logging-api/1.2/doxia-logging-api-1.2.pom +fetchArtifact org/apache/maven/doxia/doxia-logging-api/1.2/doxia-logging-api-1.2.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-logging-api/1.3/doxia-logging-api-1.3.jar +fetchArtifact org/apache/maven/doxia/doxia-logging-api/1.3/doxia-logging-api-1.3.jar.sha1 +fetchArtifact org/apache/maven/doxia/doxia-logging-api/1.3/doxia-logging-api-1.3.pom +fetchArtifact org/apache/maven/doxia/doxia-logging-api/1.3/doxia-logging-api-1.3.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.0/doxia-module-apt-1.0.jar +fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.0/doxia-module-apt-1.0.jar.sha1 +fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.0/doxia-module-apt-1.0.pom +fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.0/doxia-module-apt-1.0.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.3/doxia-module-apt-1.3.jar +fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.3/doxia-module-apt-1.3.jar.sha1 +fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.3/doxia-module-apt-1.3.pom +fetchArtifact org/apache/maven/doxia/doxia-module-apt/1.3/doxia-module-apt-1.3.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.0/doxia-module-fml-1.0.jar +fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.0/doxia-module-fml-1.0.jar.sha1 +fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.0/doxia-module-fml-1.0.pom +fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.0/doxia-module-fml-1.0.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.3/doxia-module-fml-1.3.jar +fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.3/doxia-module-fml-1.3.jar.sha1 +fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.3/doxia-module-fml-1.3.pom +fetchArtifact org/apache/maven/doxia/doxia-module-fml/1.3/doxia-module-fml-1.3.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.0/doxia-module-xdoc-1.0.jar +fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.0/doxia-module-xdoc-1.0.jar.sha1 +fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.0/doxia-module-xdoc-1.0.pom +fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.0/doxia-module-xdoc-1.0.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.3/doxia-module-xdoc-1.3.jar +fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.3/doxia-module-xdoc-1.3.jar.sha1 +fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.3/doxia-module-xdoc-1.3.pom +fetchArtifact org/apache/maven/doxia/doxia-module-xdoc/1.3/doxia-module-xdoc-1.3.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.0/doxia-module-xhtml-1.0.jar +fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.0/doxia-module-xhtml-1.0.jar.sha1 +fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.0/doxia-module-xhtml-1.0.pom +fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.0/doxia-module-xhtml-1.0.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.3/doxia-module-xhtml-1.3.jar +fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.3/doxia-module-xhtml-1.3.jar.sha1 +fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.3/doxia-module-xhtml-1.3.pom +fetchArtifact org/apache/maven/doxia/doxia-module-xhtml/1.3/doxia-module-xhtml-1.3.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-modules/1.0/doxia-modules-1.0.pom +fetchArtifact org/apache/maven/doxia/doxia-modules/1.0/doxia-modules-1.0.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-modules/1.3/doxia-modules-1.3.pom +fetchArtifact org/apache/maven/doxia/doxia-modules/1.3/doxia-modules-1.3.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0/doxia-sink-api-1.0.jar +fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0/doxia-sink-api-1.0.jar.sha1 +fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0/doxia-sink-api-1.0.pom +fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0/doxia-sink-api-1.0.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0-alpha-10/doxia-sink-api-1.0-alpha-10.pom +fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0-alpha-10/doxia-sink-api-1.0-alpha-10.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7.jar +fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7.jar.sha1 +fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7.pom +fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.3/doxia-sink-api-1.3.jar +fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.3/doxia-sink-api-1.3.jar.sha1 +fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.3/doxia-sink-api-1.3.pom +fetchArtifact org/apache/maven/doxia/doxia-sink-api/1.3/doxia-sink-api-1.3.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.0/doxia-site-renderer-1.0.jar +fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.0/doxia-site-renderer-1.0.jar.sha1 +fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.0/doxia-site-renderer-1.0.pom +fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.0/doxia-site-renderer-1.0.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.3/doxia-site-renderer-1.3.jar +fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.3/doxia-site-renderer-1.3.jar.sha1 +fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.3/doxia-site-renderer-1.3.pom +fetchArtifact org/apache/maven/doxia/doxia-site-renderer/1.3/doxia-site-renderer-1.3.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-sitetools/1.0/doxia-sitetools-1.0.pom +fetchArtifact org/apache/maven/doxia/doxia-sitetools/1.0/doxia-sitetools-1.0.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-sitetools/1.2/doxia-sitetools-1.2.pom +fetchArtifact org/apache/maven/doxia/doxia-sitetools/1.2/doxia-sitetools-1.2.pom.sha1 +fetchArtifact org/apache/maven/doxia/doxia-sitetools/1.3/doxia-sitetools-1.3.pom +fetchArtifact org/apache/maven/doxia/doxia-sitetools/1.3/doxia-sitetools-1.3.pom.sha1 +fetchArtifact org/apache/maven/maven/2.0/maven-2.0.pom +fetchArtifact org/apache/maven/maven/2.0/maven-2.0.pom.sha1 +fetchArtifact org/apache/maven/maven/2.0.1/maven-2.0.1.pom +fetchArtifact org/apache/maven/maven/2.0.1/maven-2.0.1.pom.sha1 +fetchArtifact org/apache/maven/maven/2.0.2/maven-2.0.2.pom +fetchArtifact org/apache/maven/maven/2.0.2/maven-2.0.2.pom.sha1 +fetchArtifact org/apache/maven/maven/2.0.5/maven-2.0.5.pom +fetchArtifact org/apache/maven/maven/2.0.5/maven-2.0.5.pom.sha1 +fetchArtifact org/apache/maven/maven/2.0.6/maven-2.0.6.pom +fetchArtifact org/apache/maven/maven/2.0.6/maven-2.0.6.pom.sha1 +fetchArtifact org/apache/maven/maven/2.0.8/maven-2.0.8.pom +fetchArtifact org/apache/maven/maven/2.0.8/maven-2.0.8.pom.sha1 +fetchArtifact org/apache/maven/maven/2.0.9/maven-2.0.9.pom +fetchArtifact org/apache/maven/maven/2.0.9/maven-2.0.9.pom.sha1 +fetchArtifact org/apache/maven/maven/2.2.0/maven-2.2.0.pom +fetchArtifact org/apache/maven/maven/2.2.0/maven-2.2.0.pom.sha1 +fetchArtifact org/apache/maven/maven/2.2.1/maven-2.2.1.pom +fetchArtifact org/apache/maven/maven/2.2.1/maven-2.2.1.pom.sha1 +fetchArtifact org/apache/maven/maven/3.0/maven-3.0.pom +fetchArtifact org/apache/maven/maven/3.0/maven-3.0.pom.sha1 +fetchArtifact org/apache/maven/maven-aether-provider/3.0/maven-aether-provider-3.0.pom +fetchArtifact org/apache/maven/maven-aether-provider/3.0/maven-aether-provider-3.0.pom.sha1 +fetchArtifact org/apache/maven/maven-archiver/2.3/maven-archiver-2.3.jar +fetchArtifact org/apache/maven/maven-archiver/2.3/maven-archiver-2.3.jar.sha1 +fetchArtifact org/apache/maven/maven-archiver/2.3/maven-archiver-2.3.pom +fetchArtifact org/apache/maven/maven-archiver/2.3/maven-archiver-2.3.pom.sha1 +fetchArtifact org/apache/maven/maven-archiver/2.4.1/maven-archiver-2.4.1.jar +fetchArtifact org/apache/maven/maven-archiver/2.4.1/maven-archiver-2.4.1.jar.sha1 +fetchArtifact org/apache/maven/maven-archiver/2.4.1/maven-archiver-2.4.1.pom +fetchArtifact org/apache/maven/maven-archiver/2.4.1/maven-archiver-2.4.1.pom.sha1 +fetchArtifact org/apache/maven/maven-archiver/2.4.2/maven-archiver-2.4.2.jar +fetchArtifact org/apache/maven/maven-archiver/2.4.2/maven-archiver-2.4.2.jar.sha1 +fetchArtifact org/apache/maven/maven-archiver/2.4.2/maven-archiver-2.4.2.pom +fetchArtifact org/apache/maven/maven-archiver/2.4.2/maven-archiver-2.4.2.pom.sha1 +fetchArtifact org/apache/maven/maven-archiver/2.5/maven-archiver-2.5.jar +fetchArtifact org/apache/maven/maven-archiver/2.5/maven-archiver-2.5.jar.sha1 +fetchArtifact org/apache/maven/maven-archiver/2.5/maven-archiver-2.5.pom +fetchArtifact org/apache/maven/maven-archiver/2.5/maven-archiver-2.5.pom.sha1 +fetchArtifact org/apache/maven/maven-artifact/2.0/maven-artifact-2.0.pom +fetchArtifact org/apache/maven/maven-artifact/2.0/maven-artifact-2.0.pom.sha1 +fetchArtifact org/apache/maven/maven-artifact/2.0.2/maven-artifact-2.0.2.pom +fetchArtifact org/apache/maven/maven-artifact/2.0.2/maven-artifact-2.0.2.pom.sha1 +fetchArtifact org/apache/maven/maven-artifact/2.0.5/maven-artifact-2.0.5.pom +fetchArtifact org/apache/maven/maven-artifact/2.0.5/maven-artifact-2.0.5.pom.sha1 +fetchArtifact org/apache/maven/maven-artifact/2.0.6/maven-artifact-2.0.6.pom +fetchArtifact org/apache/maven/maven-artifact/2.0.6/maven-artifact-2.0.6.pom.sha1 +fetchArtifact org/apache/maven/maven-artifact/2.0.8/maven-artifact-2.0.8.pom +fetchArtifact org/apache/maven/maven-artifact/2.0.8/maven-artifact-2.0.8.pom.sha1 +fetchArtifact org/apache/maven/maven-artifact/2.0.9/maven-artifact-2.0.9.pom +fetchArtifact org/apache/maven/maven-artifact/2.0.9/maven-artifact-2.0.9.pom.sha1 +fetchArtifact org/apache/maven/maven-artifact/2.2.0/maven-artifact-2.2.0.pom +fetchArtifact org/apache/maven/maven-artifact/2.2.0/maven-artifact-2.2.0.pom.sha1 +fetchArtifact org/apache/maven/maven-artifact/2.2.1/maven-artifact-2.2.1.pom +fetchArtifact org/apache/maven/maven-artifact/2.2.1/maven-artifact-2.2.1.pom.sha1 +fetchArtifact org/apache/maven/maven-artifact/3.0/maven-artifact-3.0.pom +fetchArtifact org/apache/maven/maven-artifact/3.0/maven-artifact-3.0.pom.sha1 +fetchArtifact org/apache/maven/maven-artifact-manager/2.0/maven-artifact-manager-2.0.pom +fetchArtifact org/apache/maven/maven-artifact-manager/2.0/maven-artifact-manager-2.0.pom.sha1 +fetchArtifact org/apache/maven/maven-artifact-manager/2.0.2/maven-artifact-manager-2.0.2.pom +fetchArtifact org/apache/maven/maven-artifact-manager/2.0.2/maven-artifact-manager-2.0.2.pom.sha1 +fetchArtifact org/apache/maven/maven-artifact-manager/2.0.5/maven-artifact-manager-2.0.5.pom +fetchArtifact org/apache/maven/maven-artifact-manager/2.0.5/maven-artifact-manager-2.0.5.pom.sha1 +fetchArtifact org/apache/maven/maven-artifact-manager/2.0.6/maven-artifact-manager-2.0.6.pom +fetchArtifact org/apache/maven/maven-artifact-manager/2.0.6/maven-artifact-manager-2.0.6.pom.sha1 +fetchArtifact org/apache/maven/maven-artifact-manager/2.0.8/maven-artifact-manager-2.0.8.pom +fetchArtifact org/apache/maven/maven-artifact-manager/2.0.8/maven-artifact-manager-2.0.8.pom.sha1 +fetchArtifact org/apache/maven/maven-artifact-manager/2.0.9/maven-artifact-manager-2.0.9.pom +fetchArtifact org/apache/maven/maven-artifact-manager/2.0.9/maven-artifact-manager-2.0.9.pom.sha1 +fetchArtifact org/apache/maven/maven-artifact-manager/2.2.0/maven-artifact-manager-2.2.0.pom +fetchArtifact org/apache/maven/maven-artifact-manager/2.2.0/maven-artifact-manager-2.2.0.pom.sha1 +fetchArtifact org/apache/maven/maven-compat/3.0/maven-compat-3.0.pom +fetchArtifact org/apache/maven/maven-compat/3.0/maven-compat-3.0.pom.sha1 +fetchArtifact org/apache/maven/maven-core/2.0/maven-core-2.0.pom +fetchArtifact org/apache/maven/maven-core/2.0/maven-core-2.0.pom.sha1 +fetchArtifact org/apache/maven/maven-core/2.0.6/maven-core-2.0.6.pom +fetchArtifact org/apache/maven/maven-core/2.0.6/maven-core-2.0.6.pom.sha1 +fetchArtifact org/apache/maven/maven-core/2.0.9/maven-core-2.0.9.pom +fetchArtifact org/apache/maven/maven-core/2.0.9/maven-core-2.0.9.pom.sha1 +fetchArtifact org/apache/maven/maven-core/3.0/maven-core-3.0.pom +fetchArtifact org/apache/maven/maven-core/3.0/maven-core-3.0.pom.sha1 +fetchArtifact org/apache/maven/maven-error-diagnostics/2.0/maven-error-diagnostics-2.0.pom +fetchArtifact org/apache/maven/maven-error-diagnostics/2.0/maven-error-diagnostics-2.0.pom.sha1 +fetchArtifact org/apache/maven/maven-error-diagnostics/2.0.6/maven-error-diagnostics-2.0.6.pom +fetchArtifact org/apache/maven/maven-error-diagnostics/2.0.6/maven-error-diagnostics-2.0.6.pom.sha1 +fetchArtifact org/apache/maven/maven-error-diagnostics/2.0.9/maven-error-diagnostics-2.0.9.pom +fetchArtifact org/apache/maven/maven-error-diagnostics/2.0.9/maven-error-diagnostics-2.0.9.pom.sha1 +fetchArtifact org/apache/maven/maven-model/2.0/maven-model-2.0.pom +fetchArtifact org/apache/maven/maven-model/2.0/maven-model-2.0.pom.sha1 +fetchArtifact org/apache/maven/maven-model/2.0.5/maven-model-2.0.5.pom +fetchArtifact org/apache/maven/maven-model/2.0.5/maven-model-2.0.5.pom.sha1 +fetchArtifact org/apache/maven/maven-model/2.0.6/maven-model-2.0.6.pom +fetchArtifact org/apache/maven/maven-model/2.0.6/maven-model-2.0.6.pom.sha1 +fetchArtifact org/apache/maven/maven-model/2.0.8/maven-model-2.0.8.pom +fetchArtifact org/apache/maven/maven-model/2.0.8/maven-model-2.0.8.pom.sha1 +fetchArtifact org/apache/maven/maven-model/2.0.9/maven-model-2.0.9.pom +fetchArtifact org/apache/maven/maven-model/2.0.9/maven-model-2.0.9.pom.sha1 +fetchArtifact org/apache/maven/maven-model/2.2.0/maven-model-2.2.0.pom +fetchArtifact org/apache/maven/maven-model/2.2.0/maven-model-2.2.0.pom.sha1 +fetchArtifact org/apache/maven/maven-model/2.2.1/maven-model-2.2.1.pom +fetchArtifact org/apache/maven/maven-model/2.2.1/maven-model-2.2.1.pom.sha1 +fetchArtifact org/apache/maven/maven-model/3.0/maven-model-3.0.pom +fetchArtifact org/apache/maven/maven-model/3.0/maven-model-3.0.pom.sha1 +fetchArtifact org/apache/maven/maven-model-builder/3.0/maven-model-builder-3.0.pom +fetchArtifact org/apache/maven/maven-model-builder/3.0/maven-model-builder-3.0.pom.sha1 +fetchArtifact org/apache/maven/maven-monitor/2.0/maven-monitor-2.0.pom +fetchArtifact org/apache/maven/maven-monitor/2.0/maven-monitor-2.0.pom.sha1 +fetchArtifact org/apache/maven/maven-monitor/2.0.6/maven-monitor-2.0.6.pom +fetchArtifact org/apache/maven/maven-monitor/2.0.6/maven-monitor-2.0.6.pom.sha1 +fetchArtifact org/apache/maven/maven-monitor/2.0.9/maven-monitor-2.0.9.pom +fetchArtifact org/apache/maven/maven-monitor/2.0.9/maven-monitor-2.0.9.pom.sha1 +fetchArtifact org/apache/maven/maven-parent/10/maven-parent-10.pom +fetchArtifact org/apache/maven/maven-parent/10/maven-parent-10.pom.sha1 +fetchArtifact org/apache/maven/maven-parent/11/maven-parent-11.pom +fetchArtifact org/apache/maven/maven-parent/11/maven-parent-11.pom.sha1 +fetchArtifact org/apache/maven/maven-parent/13/maven-parent-13.pom +fetchArtifact org/apache/maven/maven-parent/13/maven-parent-13.pom.sha1 +fetchArtifact org/apache/maven/maven-parent/15/maven-parent-15.pom +fetchArtifact org/apache/maven/maven-parent/15/maven-parent-15.pom.sha1 +fetchArtifact org/apache/maven/maven-parent/16/maven-parent-16.pom +fetchArtifact org/apache/maven/maven-parent/16/maven-parent-16.pom.sha1 +fetchArtifact org/apache/maven/maven-parent/19/maven-parent-19.pom +fetchArtifact org/apache/maven/maven-parent/19/maven-parent-19.pom.sha1 +fetchArtifact org/apache/maven/maven-parent/20/maven-parent-20.pom +fetchArtifact org/apache/maven/maven-parent/20/maven-parent-20.pom.sha1 +fetchArtifact org/apache/maven/maven-parent/21/maven-parent-21.pom +fetchArtifact org/apache/maven/maven-parent/21/maven-parent-21.pom.sha1 +fetchArtifact org/apache/maven/maven-parent/23/maven-parent-23.pom +fetchArtifact org/apache/maven/maven-parent/23/maven-parent-23.pom.sha1 +fetchArtifact org/apache/maven/maven-parent/5/maven-parent-5.pom +fetchArtifact org/apache/maven/maven-parent/5/maven-parent-5.pom.sha1 +fetchArtifact org/apache/maven/maven-parent/6/maven-parent-6.pom +fetchArtifact org/apache/maven/maven-parent/6/maven-parent-6.pom.sha1 +fetchArtifact org/apache/maven/maven-parent/7/maven-parent-7.pom +fetchArtifact org/apache/maven/maven-parent/7/maven-parent-7.pom.sha1 +fetchArtifact org/apache/maven/maven-parent/8/maven-parent-8.pom +fetchArtifact org/apache/maven/maven-parent/8/maven-parent-8.pom.sha1 +fetchArtifact org/apache/maven/maven-parent/9/maven-parent-9.pom +fetchArtifact org/apache/maven/maven-parent/9/maven-parent-9.pom.sha1 +fetchArtifact org/apache/maven/maven-plugin-api/2.0/maven-plugin-api-2.0.pom +fetchArtifact org/apache/maven/maven-plugin-api/2.0/maven-plugin-api-2.0.pom.sha1 +fetchArtifact org/apache/maven/maven-plugin-api/2.0.1/maven-plugin-api-2.0.1.pom +fetchArtifact org/apache/maven/maven-plugin-api/2.0.1/maven-plugin-api-2.0.1.pom.sha1 +fetchArtifact org/apache/maven/maven-plugin-api/2.0.6/maven-plugin-api-2.0.6.pom +fetchArtifact org/apache/maven/maven-plugin-api/2.0.6/maven-plugin-api-2.0.6.pom.sha1 +fetchArtifact org/apache/maven/maven-plugin-api/2.0.8/maven-plugin-api-2.0.8.pom +fetchArtifact org/apache/maven/maven-plugin-api/2.0.8/maven-plugin-api-2.0.8.pom.sha1 +fetchArtifact org/apache/maven/maven-plugin-api/2.0.9/maven-plugin-api-2.0.9.pom +fetchArtifact org/apache/maven/maven-plugin-api/2.0.9/maven-plugin-api-2.0.9.pom.sha1 +fetchArtifact org/apache/maven/maven-plugin-api/2.2.1/maven-plugin-api-2.2.1.pom +fetchArtifact org/apache/maven/maven-plugin-api/2.2.1/maven-plugin-api-2.2.1.pom.sha1 +fetchArtifact org/apache/maven/maven-plugin-api/3.0/maven-plugin-api-3.0.pom +fetchArtifact org/apache/maven/maven-plugin-api/3.0/maven-plugin-api-3.0.pom.sha1 +fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0/maven-plugin-descriptor-2.0.pom +fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0/maven-plugin-descriptor-2.0.pom.sha1 +fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0.6/maven-plugin-descriptor-2.0.6.pom +fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0.6/maven-plugin-descriptor-2.0.6.pom.sha1 +fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0.9/maven-plugin-descriptor-2.0.9.pom +fetchArtifact org/apache/maven/maven-plugin-descriptor/2.0.9/maven-plugin-descriptor-2.0.9.pom.sha1 +fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0/maven-plugin-parameter-documenter-2.0.pom +fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0/maven-plugin-parameter-documenter-2.0.pom.sha1 +fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0.6/maven-plugin-parameter-documenter-2.0.6.pom +fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0.6/maven-plugin-parameter-documenter-2.0.6.pom.sha1 +fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0.9/maven-plugin-parameter-documenter-2.0.9.pom +fetchArtifact org/apache/maven/maven-plugin-parameter-documenter/2.0.9/maven-plugin-parameter-documenter-2.0.9.pom.sha1 +fetchArtifact org/apache/maven/maven-plugin-registry/2.0/maven-plugin-registry-2.0.pom +fetchArtifact org/apache/maven/maven-plugin-registry/2.0/maven-plugin-registry-2.0.pom.sha1 +fetchArtifact org/apache/maven/maven-plugin-registry/2.0.6/maven-plugin-registry-2.0.6.pom +fetchArtifact org/apache/maven/maven-plugin-registry/2.0.6/maven-plugin-registry-2.0.6.pom.sha1 +fetchArtifact org/apache/maven/maven-plugin-registry/2.0.8/maven-plugin-registry-2.0.8.pom +fetchArtifact org/apache/maven/maven-plugin-registry/2.0.8/maven-plugin-registry-2.0.8.pom.sha1 +fetchArtifact org/apache/maven/maven-plugin-registry/2.0.9/maven-plugin-registry-2.0.9.pom +fetchArtifact org/apache/maven/maven-plugin-registry/2.0.9/maven-plugin-registry-2.0.9.pom.sha1 +fetchArtifact org/apache/maven/maven-plugin-registry/2.2.0/maven-plugin-registry-2.2.0.pom +fetchArtifact org/apache/maven/maven-plugin-registry/2.2.0/maven-plugin-registry-2.2.0.pom.sha1 +fetchArtifact org/apache/maven/maven-profile/2.0/maven-profile-2.0.pom +fetchArtifact org/apache/maven/maven-profile/2.0/maven-profile-2.0.pom.sha1 +fetchArtifact org/apache/maven/maven-profile/2.0.5/maven-profile-2.0.5.pom +fetchArtifact org/apache/maven/maven-profile/2.0.5/maven-profile-2.0.5.pom.sha1 +fetchArtifact org/apache/maven/maven-profile/2.0.6/maven-profile-2.0.6.pom +fetchArtifact org/apache/maven/maven-profile/2.0.6/maven-profile-2.0.6.pom.sha1 +fetchArtifact org/apache/maven/maven-profile/2.0.8/maven-profile-2.0.8.pom +fetchArtifact org/apache/maven/maven-profile/2.0.8/maven-profile-2.0.8.pom.sha1 +fetchArtifact org/apache/maven/maven-profile/2.0.9/maven-profile-2.0.9.pom +fetchArtifact org/apache/maven/maven-profile/2.0.9/maven-profile-2.0.9.pom.sha1 +fetchArtifact org/apache/maven/maven-profile/2.2.0/maven-profile-2.2.0.pom +fetchArtifact org/apache/maven/maven-profile/2.2.0/maven-profile-2.2.0.pom.sha1 +fetchArtifact org/apache/maven/maven-project/2.0/maven-project-2.0.pom +fetchArtifact org/apache/maven/maven-project/2.0/maven-project-2.0.pom.sha1 +fetchArtifact org/apache/maven/maven-project/2.0.5/maven-project-2.0.5.pom +fetchArtifact org/apache/maven/maven-project/2.0.5/maven-project-2.0.5.pom.sha1 +fetchArtifact org/apache/maven/maven-project/2.0.6/maven-project-2.0.6.pom +fetchArtifact org/apache/maven/maven-project/2.0.6/maven-project-2.0.6.pom.sha1 +fetchArtifact org/apache/maven/maven-project/2.0.8/maven-project-2.0.8.pom +fetchArtifact org/apache/maven/maven-project/2.0.8/maven-project-2.0.8.pom.sha1 +fetchArtifact org/apache/maven/maven-project/2.0.9/maven-project-2.0.9.pom +fetchArtifact org/apache/maven/maven-project/2.0.9/maven-project-2.0.9.pom.sha1 +fetchArtifact org/apache/maven/maven-project/2.2.0/maven-project-2.2.0.pom +fetchArtifact org/apache/maven/maven-project/2.2.0/maven-project-2.2.0.pom.sha1 +fetchArtifact org/apache/maven/maven-repository-metadata/2.0/maven-repository-metadata-2.0.pom +fetchArtifact org/apache/maven/maven-repository-metadata/2.0/maven-repository-metadata-2.0.pom.sha1 +fetchArtifact org/apache/maven/maven-repository-metadata/2.0.2/maven-repository-metadata-2.0.2.pom +fetchArtifact org/apache/maven/maven-repository-metadata/2.0.2/maven-repository-metadata-2.0.2.pom.sha1 +fetchArtifact org/apache/maven/maven-repository-metadata/2.0.5/maven-repository-metadata-2.0.5.pom +fetchArtifact org/apache/maven/maven-repository-metadata/2.0.5/maven-repository-metadata-2.0.5.pom.sha1 +fetchArtifact org/apache/maven/maven-repository-metadata/2.0.6/maven-repository-metadata-2.0.6.pom +fetchArtifact org/apache/maven/maven-repository-metadata/2.0.6/maven-repository-metadata-2.0.6.pom.sha1 +fetchArtifact org/apache/maven/maven-repository-metadata/2.0.8/maven-repository-metadata-2.0.8.pom +fetchArtifact org/apache/maven/maven-repository-metadata/2.0.8/maven-repository-metadata-2.0.8.pom.sha1 +fetchArtifact org/apache/maven/maven-repository-metadata/2.0.9/maven-repository-metadata-2.0.9.pom +fetchArtifact org/apache/maven/maven-repository-metadata/2.0.9/maven-repository-metadata-2.0.9.pom.sha1 +fetchArtifact org/apache/maven/maven-repository-metadata/2.2.0/maven-repository-metadata-2.2.0.pom +fetchArtifact org/apache/maven/maven-repository-metadata/2.2.0/maven-repository-metadata-2.2.0.pom.sha1 +fetchArtifact org/apache/maven/maven-repository-metadata/3.0/maven-repository-metadata-3.0.pom +fetchArtifact org/apache/maven/maven-repository-metadata/3.0/maven-repository-metadata-3.0.pom.sha1 +fetchArtifact org/apache/maven/maven-settings/2.0/maven-settings-2.0.pom +fetchArtifact org/apache/maven/maven-settings/2.0/maven-settings-2.0.pom.sha1 +fetchArtifact org/apache/maven/maven-settings/2.0.5/maven-settings-2.0.5.pom +fetchArtifact org/apache/maven/maven-settings/2.0.5/maven-settings-2.0.5.pom.sha1 +fetchArtifact org/apache/maven/maven-settings/2.0.6/maven-settings-2.0.6.pom +fetchArtifact org/apache/maven/maven-settings/2.0.6/maven-settings-2.0.6.pom.sha1 +fetchArtifact org/apache/maven/maven-settings/2.0.8/maven-settings-2.0.8.pom +fetchArtifact org/apache/maven/maven-settings/2.0.8/maven-settings-2.0.8.pom.sha1 +fetchArtifact org/apache/maven/maven-settings/2.0.9/maven-settings-2.0.9.pom +fetchArtifact org/apache/maven/maven-settings/2.0.9/maven-settings-2.0.9.pom.sha1 +fetchArtifact org/apache/maven/maven-settings/2.2.0/maven-settings-2.2.0.pom +fetchArtifact org/apache/maven/maven-settings/2.2.0/maven-settings-2.2.0.pom.sha1 +fetchArtifact org/apache/maven/maven-settings/3.0/maven-settings-3.0.pom +fetchArtifact org/apache/maven/maven-settings/3.0/maven-settings-3.0.pom.sha1 +fetchArtifact org/apache/maven/maven-settings-builder/3.0/maven-settings-builder-3.0.pom +fetchArtifact org/apache/maven/maven-settings-builder/3.0/maven-settings-builder-3.0.pom.sha1 +fetchArtifact org/apache/maven/maven-toolchain/1.0/maven-toolchain-1.0.pom +fetchArtifact org/apache/maven/maven-toolchain/1.0/maven-toolchain-1.0.pom.sha1 +fetchArtifact org/apache/maven/maven-toolchain/2.0.9/maven-toolchain-2.0.9.pom +fetchArtifact org/apache/maven/maven-toolchain/2.0.9/maven-toolchain-2.0.9.pom.sha1 +fetchArtifact org/apache/maven/plugins/maven-clean-plugin/2.5/maven-clean-plugin-2.5.jar +fetchArtifact org/apache/maven/plugins/maven-clean-plugin/2.5/maven-clean-plugin-2.5.jar.sha1 +fetchArtifact org/apache/maven/plugins/maven-clean-plugin/2.5/maven-clean-plugin-2.5.pom +fetchArtifact org/apache/maven/plugins/maven-clean-plugin/2.5/maven-clean-plugin-2.5.pom.sha1 +fetchArtifact org/apache/maven/plugins/maven-compiler-plugin/2.5.1/maven-compiler-plugin-2.5.1.jar +fetchArtifact org/apache/maven/plugins/maven-compiler-plugin/2.5.1/maven-compiler-plugin-2.5.1.jar.sha1 +fetchArtifact org/apache/maven/plugins/maven-compiler-plugin/2.5.1/maven-compiler-plugin-2.5.1.pom +fetchArtifact org/apache/maven/plugins/maven-compiler-plugin/2.5.1/maven-compiler-plugin-2.5.1.pom.sha1 +fetchArtifact org/apache/maven/plugins/maven-dependency-plugin/2.8/maven-dependency-plugin-2.8.jar +fetchArtifact org/apache/maven/plugins/maven-dependency-plugin/2.8/maven-dependency-plugin-2.8.jar.sha1 +fetchArtifact org/apache/maven/plugins/maven-dependency-plugin/2.8/maven-dependency-plugin-2.8.pom +fetchArtifact org/apache/maven/plugins/maven-dependency-plugin/2.8/maven-dependency-plugin-2.8.pom.sha1 +fetchArtifact org/apache/maven/plugins/maven-gpg-plugin/1.4/maven-gpg-plugin-1.4.jar +fetchArtifact org/apache/maven/plugins/maven-gpg-plugin/1.4/maven-gpg-plugin-1.4.jar.sha1 +fetchArtifact org/apache/maven/plugins/maven-gpg-plugin/1.4/maven-gpg-plugin-1.4.pom +fetchArtifact org/apache/maven/plugins/maven-gpg-plugin/1.4/maven-gpg-plugin-1.4.pom.sha1 +fetchArtifact org/apache/maven/plugins/maven-jar-plugin/2.4/maven-jar-plugin-2.4.jar +fetchArtifact org/apache/maven/plugins/maven-jar-plugin/2.4/maven-jar-plugin-2.4.jar.sha1 +fetchArtifact org/apache/maven/plugins/maven-jar-plugin/2.4/maven-jar-plugin-2.4.pom +fetchArtifact org/apache/maven/plugins/maven-jar-plugin/2.4/maven-jar-plugin-2.4.pom.sha1 +fetchArtifact org/apache/maven/plugins/maven-javadoc-plugin/2.8.1/maven-javadoc-plugin-2.8.1.jar +fetchArtifact org/apache/maven/plugins/maven-javadoc-plugin/2.8.1/maven-javadoc-plugin-2.8.1.jar.sha1 +fetchArtifact org/apache/maven/plugins/maven-javadoc-plugin/2.8.1/maven-javadoc-plugin-2.8.1.pom +fetchArtifact org/apache/maven/plugins/maven-javadoc-plugin/2.8.1/maven-javadoc-plugin-2.8.1.pom.sha1 +fetchArtifact org/apache/maven/plugins/maven-plugins/18/maven-plugins-18.pom +fetchArtifact org/apache/maven/plugins/maven-plugins/18/maven-plugins-18.pom.sha1 +fetchArtifact org/apache/maven/plugins/maven-plugins/19/maven-plugins-19.pom +fetchArtifact org/apache/maven/plugins/maven-plugins/19/maven-plugins-19.pom.sha1 +fetchArtifact org/apache/maven/plugins/maven-plugins/22/maven-plugins-22.pom +fetchArtifact org/apache/maven/plugins/maven-plugins/22/maven-plugins-22.pom.sha1 +fetchArtifact org/apache/maven/plugins/maven-plugins/24/maven-plugins-24.pom +fetchArtifact org/apache/maven/plugins/maven-plugins/24/maven-plugins-24.pom.sha1 +fetchArtifact org/apache/maven/plugins/maven-remote-resources-plugin/1.3/maven-remote-resources-plugin-1.3.jar +fetchArtifact org/apache/maven/plugins/maven-remote-resources-plugin/1.3/maven-remote-resources-plugin-1.3.jar.sha1 +fetchArtifact org/apache/maven/plugins/maven-remote-resources-plugin/1.3/maven-remote-resources-plugin-1.3.pom +fetchArtifact org/apache/maven/plugins/maven-remote-resources-plugin/1.3/maven-remote-resources-plugin-1.3.pom.sha1 +fetchArtifact org/apache/maven/plugins/maven-resources-plugin/2.5/maven-resources-plugin-2.5.jar +fetchArtifact org/apache/maven/plugins/maven-resources-plugin/2.5/maven-resources-plugin-2.5.jar.sha1 +fetchArtifact org/apache/maven/plugins/maven-resources-plugin/2.5/maven-resources-plugin-2.5.pom +fetchArtifact org/apache/maven/plugins/maven-resources-plugin/2.5/maven-resources-plugin-2.5.pom.sha1 +fetchArtifact org/apache/maven/plugins/maven-shade-plugin/2.2/maven-shade-plugin-2.2.jar +fetchArtifact org/apache/maven/plugins/maven-shade-plugin/2.2/maven-shade-plugin-2.2.jar.sha1 +fetchArtifact org/apache/maven/plugins/maven-shade-plugin/2.2/maven-shade-plugin-2.2.pom +fetchArtifact org/apache/maven/plugins/maven-shade-plugin/2.2/maven-shade-plugin-2.2.pom.sha1 +fetchArtifact org/apache/maven/plugins/maven-site-plugin/3.1/maven-site-plugin-3.1.jar +fetchArtifact org/apache/maven/plugins/maven-site-plugin/3.1/maven-site-plugin-3.1.jar.sha1 +fetchArtifact org/apache/maven/plugins/maven-site-plugin/3.1/maven-site-plugin-3.1.pom +fetchArtifact org/apache/maven/plugins/maven-site-plugin/3.1/maven-site-plugin-3.1.pom.sha1 +fetchArtifact org/apache/maven/plugins/maven-source-plugin/2.1.2/maven-source-plugin-2.1.2.jar +fetchArtifact org/apache/maven/plugins/maven-source-plugin/2.1.2/maven-source-plugin-2.1.2.jar.sha1 +fetchArtifact org/apache/maven/plugins/maven-source-plugin/2.1.2/maven-source-plugin-2.1.2.pom +fetchArtifact org/apache/maven/plugins/maven-source-plugin/2.1.2/maven-source-plugin-2.1.2.pom.sha1 +fetchArtifact org/apache/maven/plugins/maven-surefire-plugin/2.12/maven-surefire-plugin-2.12.jar +fetchArtifact org/apache/maven/plugins/maven-surefire-plugin/2.12/maven-surefire-plugin-2.12.jar.sha1 +fetchArtifact org/apache/maven/plugins/maven-surefire-plugin/2.12/maven-surefire-plugin-2.12.pom +fetchArtifact org/apache/maven/plugins/maven-surefire-plugin/2.12/maven-surefire-plugin-2.12.pom.sha1 +fetchArtifact org/apache/maven/reporting/maven-reporting/2.0/maven-reporting-2.0.pom +fetchArtifact org/apache/maven/reporting/maven-reporting/2.0/maven-reporting-2.0.pom.sha1 +fetchArtifact org/apache/maven/reporting/maven-reporting/2.0.6/maven-reporting-2.0.6.pom +fetchArtifact org/apache/maven/reporting/maven-reporting/2.0.6/maven-reporting-2.0.6.pom.sha1 +fetchArtifact org/apache/maven/reporting/maven-reporting/2.0.9/maven-reporting-2.0.9.pom +fetchArtifact org/apache/maven/reporting/maven-reporting/2.0.9/maven-reporting-2.0.9.pom.sha1 +fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0/maven-reporting-api-2.0.pom +fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0/maven-reporting-api-2.0.pom.sha1 +fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.6/maven-reporting-api-2.0.6.jar +fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.6/maven-reporting-api-2.0.6.jar.sha1 +fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.6/maven-reporting-api-2.0.6.pom +fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.6/maven-reporting-api-2.0.6.pom.sha1 +fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.9/maven-reporting-api-2.0.9.jar +fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.9/maven-reporting-api-2.0.9.jar.sha1 +fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.9/maven-reporting-api-2.0.9.pom +fetchArtifact org/apache/maven/reporting/maven-reporting-api/2.0.9/maven-reporting-api-2.0.9.pom.sha1 +fetchArtifact org/apache/maven/reporting/maven-reporting-api/3.0/maven-reporting-api-3.0.jar +fetchArtifact org/apache/maven/reporting/maven-reporting-api/3.0/maven-reporting-api-3.0.jar.sha1 +fetchArtifact org/apache/maven/reporting/maven-reporting-api/3.0/maven-reporting-api-3.0.pom +fetchArtifact org/apache/maven/reporting/maven-reporting-api/3.0/maven-reporting-api-3.0.pom.sha1 +fetchArtifact org/apache/maven/reporting/maven-reporting-exec/1.0.2/maven-reporting-exec-1.0.2.jar +fetchArtifact org/apache/maven/reporting/maven-reporting-exec/1.0.2/maven-reporting-exec-1.0.2.jar.sha1 +fetchArtifact org/apache/maven/reporting/maven-reporting-exec/1.0.2/maven-reporting-exec-1.0.2.pom +fetchArtifact org/apache/maven/reporting/maven-reporting-exec/1.0.2/maven-reporting-exec-1.0.2.pom.sha1 +fetchArtifact org/apache/maven/reporting/maven-reporting-impl/2.0.5/maven-reporting-impl-2.0.5.jar +fetchArtifact org/apache/maven/reporting/maven-reporting-impl/2.0.5/maven-reporting-impl-2.0.5.jar.sha1 +fetchArtifact org/apache/maven/reporting/maven-reporting-impl/2.0.5/maven-reporting-impl-2.0.5.pom +fetchArtifact org/apache/maven/reporting/maven-reporting-impl/2.0.5/maven-reporting-impl-2.0.5.pom.sha1 +fetchArtifact org/apache/maven/shared/file-management/1.2.1/file-management-1.2.1.jar +fetchArtifact org/apache/maven/shared/file-management/1.2.1/file-management-1.2.1.jar.sha1 +fetchArtifact org/apache/maven/shared/file-management/1.2.1/file-management-1.2.1.pom +fetchArtifact org/apache/maven/shared/file-management/1.2.1/file-management-1.2.1.pom.sha1 +fetchArtifact org/apache/maven/shared/maven-artifact-resolver/1.0/maven-artifact-resolver-1.0.jar +fetchArtifact org/apache/maven/shared/maven-artifact-resolver/1.0/maven-artifact-resolver-1.0.jar.sha1 +fetchArtifact org/apache/maven/shared/maven-artifact-resolver/1.0/maven-artifact-resolver-1.0.pom +fetchArtifact org/apache/maven/shared/maven-artifact-resolver/1.0/maven-artifact-resolver-1.0.pom.sha1 +fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.0/maven-common-artifact-filters-1.0.jar +fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.0/maven-common-artifact-filters-1.0.jar.sha1 +fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.0/maven-common-artifact-filters-1.0.pom +fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.0/maven-common-artifact-filters-1.0.pom.sha1 +fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.3/maven-common-artifact-filters-1.3.jar +fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.3/maven-common-artifact-filters-1.3.jar.sha1 +fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.3/maven-common-artifact-filters-1.3.pom +fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.3/maven-common-artifact-filters-1.3.pom.sha1 +fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.4/maven-common-artifact-filters-1.4.jar +fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.4/maven-common-artifact-filters-1.4.jar.sha1 +fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.4/maven-common-artifact-filters-1.4.pom +fetchArtifact org/apache/maven/shared/maven-common-artifact-filters/1.4/maven-common-artifact-filters-1.4.pom.sha1 +fetchArtifact org/apache/maven/shared/maven-dependency-analyzer/1.4/maven-dependency-analyzer-1.4.jar +fetchArtifact org/apache/maven/shared/maven-dependency-analyzer/1.4/maven-dependency-analyzer-1.4.jar.sha1 +fetchArtifact org/apache/maven/shared/maven-dependency-analyzer/1.4/maven-dependency-analyzer-1.4.pom +fetchArtifact org/apache/maven/shared/maven-dependency-analyzer/1.4/maven-dependency-analyzer-1.4.pom.sha1 +fetchArtifact org/apache/maven/shared/maven-dependency-tree/2.1/maven-dependency-tree-2.1.jar +fetchArtifact org/apache/maven/shared/maven-dependency-tree/2.1/maven-dependency-tree-2.1.jar.sha1 +fetchArtifact org/apache/maven/shared/maven-dependency-tree/2.1/maven-dependency-tree-2.1.pom +fetchArtifact org/apache/maven/shared/maven-dependency-tree/2.1/maven-dependency-tree-2.1.pom.sha1 +fetchArtifact org/apache/maven/shared/maven-doxia-tools/1.0.2/maven-doxia-tools-1.0.2.jar +fetchArtifact org/apache/maven/shared/maven-doxia-tools/1.0.2/maven-doxia-tools-1.0.2.jar.sha1 +fetchArtifact org/apache/maven/shared/maven-doxia-tools/1.0.2/maven-doxia-tools-1.0.2.pom +fetchArtifact org/apache/maven/shared/maven-doxia-tools/1.0.2/maven-doxia-tools-1.0.2.pom.sha1 +fetchArtifact org/apache/maven/shared/maven-doxia-tools/1.4/maven-doxia-tools-1.4.jar +fetchArtifact org/apache/maven/shared/maven-doxia-tools/1.4/maven-doxia-tools-1.4.jar.sha1 +fetchArtifact org/apache/maven/shared/maven-doxia-tools/1.4/maven-doxia-tools-1.4.pom +fetchArtifact org/apache/maven/shared/maven-doxia-tools/1.4/maven-doxia-tools-1.4.pom.sha1 +fetchArtifact org/apache/maven/shared/maven-filtering/1.0/maven-filtering-1.0.jar +fetchArtifact org/apache/maven/shared/maven-filtering/1.0/maven-filtering-1.0.jar.sha1 +fetchArtifact org/apache/maven/shared/maven-filtering/1.0/maven-filtering-1.0.pom +fetchArtifact org/apache/maven/shared/maven-filtering/1.0/maven-filtering-1.0.pom.sha1 +fetchArtifact org/apache/maven/shared/maven-invoker/2.0.11/maven-invoker-2.0.11.jar +fetchArtifact org/apache/maven/shared/maven-invoker/2.0.11/maven-invoker-2.0.11.jar.sha1 +fetchArtifact org/apache/maven/shared/maven-invoker/2.0.11/maven-invoker-2.0.11.pom +fetchArtifact org/apache/maven/shared/maven-invoker/2.0.11/maven-invoker-2.0.11.pom.sha1 +fetchArtifact org/apache/maven/shared/maven-invoker/2.0.9/maven-invoker-2.0.9.jar +fetchArtifact org/apache/maven/shared/maven-invoker/2.0.9/maven-invoker-2.0.9.jar.sha1 +fetchArtifact org/apache/maven/shared/maven-invoker/2.0.9/maven-invoker-2.0.9.pom +fetchArtifact org/apache/maven/shared/maven-invoker/2.0.9/maven-invoker-2.0.9.pom.sha1 +fetchArtifact org/apache/maven/shared/maven-plugin-testing-harness/1.1/maven-plugin-testing-harness-1.1.jar +fetchArtifact org/apache/maven/shared/maven-plugin-testing-harness/1.1/maven-plugin-testing-harness-1.1.jar.sha1 +fetchArtifact org/apache/maven/shared/maven-plugin-testing-harness/1.1/maven-plugin-testing-harness-1.1.pom +fetchArtifact org/apache/maven/shared/maven-plugin-testing-harness/1.1/maven-plugin-testing-harness-1.1.pom.sha1 +fetchArtifact org/apache/maven/shared/maven-shared-components/10/maven-shared-components-10.pom +fetchArtifact org/apache/maven/shared/maven-shared-components/10/maven-shared-components-10.pom.sha1 +fetchArtifact org/apache/maven/shared/maven-shared-components/11/maven-shared-components-11.pom +fetchArtifact org/apache/maven/shared/maven-shared-components/11/maven-shared-components-11.pom.sha1 +fetchArtifact org/apache/maven/shared/maven-shared-components/12/maven-shared-components-12.pom +fetchArtifact org/apache/maven/shared/maven-shared-components/12/maven-shared-components-12.pom.sha1 +fetchArtifact org/apache/maven/shared/maven-shared-components/15/maven-shared-components-15.pom +fetchArtifact org/apache/maven/shared/maven-shared-components/15/maven-shared-components-15.pom.sha1 +fetchArtifact org/apache/maven/shared/maven-shared-components/16/maven-shared-components-16.pom +fetchArtifact org/apache/maven/shared/maven-shared-components/16/maven-shared-components-16.pom.sha1 +fetchArtifact org/apache/maven/shared/maven-shared-components/17/maven-shared-components-17.pom +fetchArtifact org/apache/maven/shared/maven-shared-components/17/maven-shared-components-17.pom.sha1 +fetchArtifact org/apache/maven/shared/maven-shared-components/19/maven-shared-components-19.pom +fetchArtifact org/apache/maven/shared/maven-shared-components/19/maven-shared-components-19.pom.sha1 +fetchArtifact org/apache/maven/shared/maven-shared-components/7/maven-shared-components-7.pom +fetchArtifact org/apache/maven/shared/maven-shared-components/7/maven-shared-components-7.pom.sha1 +fetchArtifact org/apache/maven/shared/maven-shared-components/8/maven-shared-components-8.pom +fetchArtifact org/apache/maven/shared/maven-shared-components/8/maven-shared-components-8.pom.sha1 +fetchArtifact org/apache/maven/shared/maven-shared-components/9/maven-shared-components-9.pom +fetchArtifact org/apache/maven/shared/maven-shared-components/9/maven-shared-components-9.pom.sha1 +fetchArtifact org/apache/maven/shared/maven-shared-io/1.1/maven-shared-io-1.1.jar +fetchArtifact org/apache/maven/shared/maven-shared-io/1.1/maven-shared-io-1.1.jar.sha1 +fetchArtifact org/apache/maven/shared/maven-shared-io/1.1/maven-shared-io-1.1.pom +fetchArtifact org/apache/maven/shared/maven-shared-io/1.1/maven-shared-io-1.1.pom.sha1 +fetchArtifact org/apache/maven/surefire/maven-surefire-common/2.12/maven-surefire-common-2.12.jar +fetchArtifact org/apache/maven/surefire/maven-surefire-common/2.12/maven-surefire-common-2.12.jar.sha1 +fetchArtifact org/apache/maven/surefire/maven-surefire-common/2.12/maven-surefire-common-2.12.pom +fetchArtifact org/apache/maven/surefire/maven-surefire-common/2.12/maven-surefire-common-2.12.pom.sha1 +fetchArtifact org/apache/maven/surefire/surefire/2.12/surefire-2.12.pom +fetchArtifact org/apache/maven/surefire/surefire/2.12/surefire-2.12.pom.sha1 +fetchArtifact org/apache/maven/surefire/surefire-api/2.12/surefire-api-2.12.jar +fetchArtifact org/apache/maven/surefire/surefire-api/2.12/surefire-api-2.12.jar.sha1 +fetchArtifact org/apache/maven/surefire/surefire-api/2.12/surefire-api-2.12.pom +fetchArtifact org/apache/maven/surefire/surefire-api/2.12/surefire-api-2.12.pom.sha1 +fetchArtifact org/apache/maven/surefire/surefire-booter/2.12/surefire-booter-2.12.jar +fetchArtifact org/apache/maven/surefire/surefire-booter/2.12/surefire-booter-2.12.jar.sha1 +fetchArtifact org/apache/maven/surefire/surefire-booter/2.12/surefire-booter-2.12.pom +fetchArtifact org/apache/maven/surefire/surefire-booter/2.12/surefire-booter-2.12.pom.sha1 +fetchArtifact org/apache/maven/wagon/wagon/1.0/wagon-1.0.pom +fetchArtifact org/apache/maven/wagon/wagon/1.0/wagon-1.0.pom.sha1 +fetchArtifact org/apache/maven/wagon/wagon/1.0-alpha-6/wagon-1.0-alpha-6.pom +fetchArtifact org/apache/maven/wagon/wagon/1.0-alpha-6/wagon-1.0-alpha-6.pom.sha1 +fetchArtifact org/apache/maven/wagon/wagon/1.0-beta-6/wagon-1.0-beta-6.pom +fetchArtifact org/apache/maven/wagon/wagon/1.0-beta-6/wagon-1.0-beta-6.pom.sha1 +fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0/wagon-provider-api-1.0.pom +fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0/wagon-provider-api-1.0.pom.sha1 +fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.pom +fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.pom.sha1 +fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0-beta-6/wagon-provider-api-1.0-beta-6.pom +fetchArtifact org/apache/maven/wagon/wagon-provider-api/1.0-beta-6/wagon-provider-api-1.0-beta-6.pom.sha1 +fetchArtifact org/apache/maven/wagon/wagon-providers/1.0/wagon-providers-1.0.pom +fetchArtifact org/apache/maven/wagon/wagon-providers/1.0/wagon-providers-1.0.pom.sha1 +fetchArtifact org/apache/maven/wagon/wagon-ssh/1.0/wagon-ssh-1.0.jar +fetchArtifact org/apache/maven/wagon/wagon-ssh/1.0/wagon-ssh-1.0.jar.sha1 +fetchArtifact org/apache/maven/wagon/wagon-ssh/1.0/wagon-ssh-1.0.pom +fetchArtifact org/apache/maven/wagon/wagon-ssh/1.0/wagon-ssh-1.0.pom.sha1 +fetchArtifact org/apache/maven/wagon/wagon-ssh-common/1.0/wagon-ssh-common-1.0.jar +fetchArtifact org/apache/maven/wagon/wagon-ssh-common/1.0/wagon-ssh-common-1.0.jar.sha1 +fetchArtifact org/apache/maven/wagon/wagon-ssh-common/1.0/wagon-ssh-common-1.0.pom +fetchArtifact org/apache/maven/wagon/wagon-ssh-common/1.0/wagon-ssh-common-1.0.pom.sha1 +fetchArtifact org/apache/struts/struts-core/1.3.8/struts-core-1.3.8.jar +fetchArtifact org/apache/struts/struts-core/1.3.8/struts-core-1.3.8.jar.sha1 +fetchArtifact org/apache/struts/struts-core/1.3.8/struts-core-1.3.8.pom +fetchArtifact org/apache/struts/struts-core/1.3.8/struts-core-1.3.8.pom.sha1 +fetchArtifact org/apache/struts/struts-master/4/struts-master-4.pom +fetchArtifact org/apache/struts/struts-master/4/struts-master-4.pom.sha1 +fetchArtifact org/apache/struts/struts-parent/1.3.8/struts-parent-1.3.8.pom +fetchArtifact org/apache/struts/struts-parent/1.3.8/struts-parent-1.3.8.pom.sha1 +fetchArtifact org/apache/struts/struts-taglib/1.3.8/struts-taglib-1.3.8.jar +fetchArtifact org/apache/struts/struts-taglib/1.3.8/struts-taglib-1.3.8.jar.sha1 +fetchArtifact org/apache/struts/struts-taglib/1.3.8/struts-taglib-1.3.8.pom +fetchArtifact org/apache/struts/struts-taglib/1.3.8/struts-taglib-1.3.8.pom.sha1 +fetchArtifact org/apache/struts/struts-tiles/1.3.8/struts-tiles-1.3.8.jar +fetchArtifact org/apache/struts/struts-tiles/1.3.8/struts-tiles-1.3.8.jar.sha1 +fetchArtifact org/apache/struts/struts-tiles/1.3.8/struts-tiles-1.3.8.pom +fetchArtifact org/apache/struts/struts-tiles/1.3.8/struts-tiles-1.3.8.pom.sha1 +fetchArtifact org/apache/velocity/velocity/1.5/velocity-1.5.jar +fetchArtifact org/apache/velocity/velocity/1.5/velocity-1.5.jar.sha1 +fetchArtifact org/apache/velocity/velocity/1.5/velocity-1.5.pom +fetchArtifact org/apache/velocity/velocity/1.5/velocity-1.5.pom.sha1 +fetchArtifact org/apache/velocity/velocity/1.6.2/velocity-1.6.2.pom +fetchArtifact org/apache/velocity/velocity/1.6.2/velocity-1.6.2.pom.sha1 +fetchArtifact org/apache/velocity/velocity/1.7/velocity-1.7.jar +fetchArtifact org/apache/velocity/velocity/1.7/velocity-1.7.jar.sha1 +fetchArtifact org/apache/velocity/velocity/1.7/velocity-1.7.pom +fetchArtifact org/apache/velocity/velocity/1.7/velocity-1.7.pom.sha1 +fetchArtifact org/apache/velocity/velocity-tools/2.0/velocity-tools-2.0.jar +fetchArtifact org/apache/velocity/velocity-tools/2.0/velocity-tools-2.0.jar.sha1 +fetchArtifact org/apache/velocity/velocity-tools/2.0/velocity-tools-2.0.pom +fetchArtifact org/apache/velocity/velocity-tools/2.0/velocity-tools-2.0.pom.sha1 +fetchArtifact org/apache/xbean/xbean/3.4/xbean-3.4.pom +fetchArtifact org/apache/xbean/xbean/3.4/xbean-3.4.pom.sha1 +fetchArtifact org/apache/xbean/xbean-reflect/3.4/xbean-reflect-3.4.pom +fetchArtifact org/apache/xbean/xbean-reflect/3.4/xbean-reflect-3.4.pom.sha1 +fetchArtifact org/beanshell/beanshell/2.0b4/beanshell-2.0b4.pom +fetchArtifact org/beanshell/beanshell/2.0b4/beanshell-2.0b4.pom.sha1 +fetchArtifact org/beanshell/bsh/2.0b4/bsh-2.0b4.jar +fetchArtifact org/beanshell/bsh/2.0b4/bsh-2.0b4.jar.sha1 +fetchArtifact org/beanshell/bsh/2.0b4/bsh-2.0b4.pom +fetchArtifact org/beanshell/bsh/2.0b4/bsh-2.0b4.pom.sha1 +fetchArtifact org/codehaus/codehaus-parent/4/codehaus-parent-4.pom +fetchArtifact org/codehaus/codehaus-parent/4/codehaus-parent-4.pom.sha1 +fetchArtifact org/codehaus/mojo/build-helper-maven-plugin/1.8/build-helper-maven-plugin-1.8.jar +fetchArtifact org/codehaus/mojo/build-helper-maven-plugin/1.8/build-helper-maven-plugin-1.8.jar.sha1 +fetchArtifact org/codehaus/mojo/build-helper-maven-plugin/1.8/build-helper-maven-plugin-1.8.pom +fetchArtifact org/codehaus/mojo/build-helper-maven-plugin/1.8/build-helper-maven-plugin-1.8.pom.sha1 +fetchArtifact org/codehaus/mojo/mojo-parent/30/mojo-parent-30.pom +fetchArtifact org/codehaus/mojo/mojo-parent/30/mojo-parent-30.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus/1.0.10/plexus-1.0.10.pom +fetchArtifact org/codehaus/plexus/plexus/1.0.10/plexus-1.0.10.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus/1.0.11/plexus-1.0.11.pom +fetchArtifact org/codehaus/plexus/plexus/1.0.11/plexus-1.0.11.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus/1.0.12/plexus-1.0.12.pom +fetchArtifact org/codehaus/plexus/plexus/1.0.12/plexus-1.0.12.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus/1.0.4/plexus-1.0.4.pom +fetchArtifact org/codehaus/plexus/plexus/1.0.4/plexus-1.0.4.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus/1.0.5/plexus-1.0.5.pom +fetchArtifact org/codehaus/plexus/plexus/1.0.5/plexus-1.0.5.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus/1.0.8/plexus-1.0.8.pom +fetchArtifact org/codehaus/plexus/plexus/1.0.8/plexus-1.0.8.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus/1.0.9/plexus-1.0.9.pom +fetchArtifact org/codehaus/plexus/plexus/1.0.9/plexus-1.0.9.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus/2.0.2/plexus-2.0.2.pom +fetchArtifact org/codehaus/plexus/plexus/2.0.2/plexus-2.0.2.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus/2.0.3/plexus-2.0.3.pom +fetchArtifact org/codehaus/plexus/plexus/2.0.3/plexus-2.0.3.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus/2.0.5/plexus-2.0.5.pom +fetchArtifact org/codehaus/plexus/plexus/2.0.5/plexus-2.0.5.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus/2.0.6/plexus-2.0.6.pom +fetchArtifact org/codehaus/plexus/plexus/2.0.6/plexus-2.0.6.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus/2.0.7/plexus-2.0.7.pom +fetchArtifact org/codehaus/plexus/plexus/2.0.7/plexus-2.0.7.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus/3.0.1/plexus-3.0.1.pom +fetchArtifact org/codehaus/plexus/plexus/3.0.1/plexus-3.0.1.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus/3.1/plexus-3.1.pom +fetchArtifact org/codehaus/plexus/plexus/3.1/plexus-3.1.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus/3.2/plexus-3.2.pom +fetchArtifact org/codehaus/plexus/plexus/3.2/plexus-3.2.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus/3.3/plexus-3.3.pom +fetchArtifact org/codehaus/plexus/plexus/3.3/plexus-3.3.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus/3.3.1/plexus-3.3.1.pom +fetchArtifact org/codehaus/plexus/plexus/3.3.1/plexus-3.3.1.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-archiver/1.0/plexus-archiver-1.0.jar +fetchArtifact org/codehaus/plexus/plexus-archiver/1.0/plexus-archiver-1.0.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-archiver/1.0/plexus-archiver-1.0.pom +fetchArtifact org/codehaus/plexus/plexus-archiver/1.0/plexus-archiver-1.0.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-archiver/1.0-alpha-7/plexus-archiver-1.0-alpha-7.jar +fetchArtifact org/codehaus/plexus/plexus-archiver/1.0-alpha-7/plexus-archiver-1.0-alpha-7.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-archiver/1.0-alpha-7/plexus-archiver-1.0-alpha-7.pom +fetchArtifact org/codehaus/plexus/plexus-archiver/1.0-alpha-7/plexus-archiver-1.0-alpha-7.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-archiver/1.0-alpha-9/plexus-archiver-1.0-alpha-9.jar +fetchArtifact org/codehaus/plexus/plexus-archiver/1.0-alpha-9/plexus-archiver-1.0-alpha-9.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-archiver/1.0-alpha-9/plexus-archiver-1.0-alpha-9.pom +fetchArtifact org/codehaus/plexus/plexus-archiver/1.0-alpha-9/plexus-archiver-1.0-alpha-9.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-archiver/2.0.1/plexus-archiver-2.0.1.pom +fetchArtifact org/codehaus/plexus/plexus-archiver/2.0.1/plexus-archiver-2.0.1.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-archiver/2.1/plexus-archiver-2.1.jar +fetchArtifact org/codehaus/plexus/plexus-archiver/2.1/plexus-archiver-2.1.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-archiver/2.1/plexus-archiver-2.1.pom +fetchArtifact org/codehaus/plexus/plexus-archiver/2.1/plexus-archiver-2.1.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-archiver/2.3/plexus-archiver-2.3.jar +fetchArtifact org/codehaus/plexus/plexus-archiver/2.3/plexus-archiver-2.3.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-archiver/2.3/plexus-archiver-2.3.pom +fetchArtifact org/codehaus/plexus/plexus-archiver/2.3/plexus-archiver-2.3.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-classworlds/1.2-alpha-6/plexus-classworlds-1.2-alpha-6.pom +fetchArtifact org/codehaus/plexus/plexus-classworlds/1.2-alpha-6/plexus-classworlds-1.2-alpha-6.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-classworlds/1.2-alpha-7/plexus-classworlds-1.2-alpha-7.pom +fetchArtifact org/codehaus/plexus/plexus-classworlds/1.2-alpha-7/plexus-classworlds-1.2-alpha-7.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-classworlds/1.2-alpha-9/plexus-classworlds-1.2-alpha-9.pom +fetchArtifact org/codehaus/plexus/plexus-classworlds/1.2-alpha-9/plexus-classworlds-1.2-alpha-9.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-classworlds/2.2.2/plexus-classworlds-2.2.2.pom +fetchArtifact org/codehaus/plexus/plexus-classworlds/2.2.2/plexus-classworlds-2.2.2.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-classworlds/2.2.3/plexus-classworlds-2.2.3.pom +fetchArtifact org/codehaus/plexus/plexus-classworlds/2.2.3/plexus-classworlds-2.2.3.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-compiler/1.9.1/plexus-compiler-1.9.1.pom +fetchArtifact org/codehaus/plexus/plexus-compiler/1.9.1/plexus-compiler-1.9.1.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-compiler-api/1.9.1/plexus-compiler-api-1.9.1.jar +fetchArtifact org/codehaus/plexus/plexus-compiler-api/1.9.1/plexus-compiler-api-1.9.1.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-compiler-api/1.9.1/plexus-compiler-api-1.9.1.pom +fetchArtifact org/codehaus/plexus/plexus-compiler-api/1.9.1/plexus-compiler-api-1.9.1.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-compiler-javac/1.9.1/plexus-compiler-javac-1.9.1.jar +fetchArtifact org/codehaus/plexus/plexus-compiler-javac/1.9.1/plexus-compiler-javac-1.9.1.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-compiler-javac/1.9.1/plexus-compiler-javac-1.9.1.pom +fetchArtifact org/codehaus/plexus/plexus-compiler-javac/1.9.1/plexus-compiler-javac-1.9.1.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-compiler-manager/1.9.1/plexus-compiler-manager-1.9.1.jar +fetchArtifact org/codehaus/plexus/plexus-compiler-manager/1.9.1/plexus-compiler-manager-1.9.1.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-compiler-manager/1.9.1/plexus-compiler-manager-1.9.1.pom +fetchArtifact org/codehaus/plexus/plexus-compiler-manager/1.9.1/plexus-compiler-manager-1.9.1.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-compilers/1.9.1/plexus-compilers-1.9.1.pom +fetchArtifact org/codehaus/plexus/plexus-compilers/1.9.1/plexus-compilers-1.9.1.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-component-annotations/1.5.4/plexus-component-annotations-1.5.4.pom +fetchArtifact org/codehaus/plexus/plexus-component-annotations/1.5.4/plexus-component-annotations-1.5.4.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-component-annotations/1.5.5/plexus-component-annotations-1.5.5.jar +fetchArtifact org/codehaus/plexus/plexus-component-annotations/1.5.5/plexus-component-annotations-1.5.5.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-component-annotations/1.5.5/plexus-component-annotations-1.5.5.pom +fetchArtifact org/codehaus/plexus/plexus-component-annotations/1.5.5/plexus-component-annotations-1.5.5.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-component-api/1.0-alpha-15/plexus-component-api-1.0-alpha-15.pom +fetchArtifact org/codehaus/plexus/plexus-component-api/1.0-alpha-15/plexus-component-api-1.0-alpha-15.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-component-api/1.0-alpha-16/plexus-component-api-1.0-alpha-16.pom +fetchArtifact org/codehaus/plexus/plexus-component-api/1.0-alpha-16/plexus-component-api-1.0-alpha-16.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-components/1.1.12/plexus-components-1.1.12.pom +fetchArtifact org/codehaus/plexus/plexus-components/1.1.12/plexus-components-1.1.12.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-components/1.1.14/plexus-components-1.1.14.pom +fetchArtifact org/codehaus/plexus/plexus-components/1.1.14/plexus-components-1.1.14.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-components/1.1.15/plexus-components-1.1.15.pom +fetchArtifact org/codehaus/plexus/plexus-components/1.1.15/plexus-components-1.1.15.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-components/1.1.17/plexus-components-1.1.17.pom +fetchArtifact org/codehaus/plexus/plexus-components/1.1.17/plexus-components-1.1.17.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-components/1.1.18/plexus-components-1.1.18.pom +fetchArtifact org/codehaus/plexus/plexus-components/1.1.18/plexus-components-1.1.18.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-components/1.1.19/plexus-components-1.1.19.pom +fetchArtifact org/codehaus/plexus/plexus-components/1.1.19/plexus-components-1.1.19.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-components/1.1.20/plexus-components-1.1.20.pom +fetchArtifact org/codehaus/plexus/plexus-components/1.1.20/plexus-components-1.1.20.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-components/1.1.6/plexus-components-1.1.6.pom +fetchArtifact org/codehaus/plexus/plexus-components/1.1.6/plexus-components-1.1.6.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-components/1.1.9/plexus-components-1.1.9.pom +fetchArtifact org/codehaus/plexus/plexus-components/1.1.9/plexus-components-1.1.9.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-components/1.2/plexus-components-1.2.pom +fetchArtifact org/codehaus/plexus/plexus-components/1.2/plexus-components-1.2.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-components/1.3/plexus-components-1.3.pom +fetchArtifact org/codehaus/plexus/plexus-components/1.3/plexus-components-1.3.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-15/plexus-container-default-1.0-alpha-15.pom +fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-15/plexus-container-default-1.0-alpha-15.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-20/plexus-container-default-1.0-alpha-20.pom +fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-20/plexus-container-default-1.0-alpha-20.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.pom +fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-8/plexus-container-default-1.0-alpha-8.pom +fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-8/plexus-container-default-1.0-alpha-8.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.pom +fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1.pom +fetchArtifact org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-container-default/1.5.5/plexus-container-default-1.5.5.pom +fetchArtifact org/codehaus/plexus/plexus-container-default/1.5.5/plexus-container-default-1.5.5.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-15/plexus-containers-1.0-alpha-15.pom +fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-15/plexus-containers-1.0-alpha-15.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-16/plexus-containers-1.0-alpha-16.pom +fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-16/plexus-containers-1.0-alpha-16.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-20/plexus-containers-1.0-alpha-20.pom +fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-20/plexus-containers-1.0-alpha-20.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-30/plexus-containers-1.0-alpha-30.pom +fetchArtifact org/codehaus/plexus/plexus-containers/1.0-alpha-30/plexus-containers-1.0-alpha-30.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-containers/1.0.3/plexus-containers-1.0.3.pom +fetchArtifact org/codehaus/plexus/plexus-containers/1.0.3/plexus-containers-1.0.3.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-containers/1.5.4/plexus-containers-1.5.4.pom +fetchArtifact org/codehaus/plexus/plexus-containers/1.5.4/plexus-containers-1.5.4.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-containers/1.5.5/plexus-containers-1.5.5.pom +fetchArtifact org/codehaus/plexus/plexus-containers/1.5.5/plexus-containers-1.5.5.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-i18n/1.0-beta-7/plexus-i18n-1.0-beta-7.jar +fetchArtifact org/codehaus/plexus/plexus-i18n/1.0-beta-7/plexus-i18n-1.0-beta-7.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-i18n/1.0-beta-7/plexus-i18n-1.0-beta-7.pom +fetchArtifact org/codehaus/plexus/plexus-i18n/1.0-beta-7/plexus-i18n-1.0-beta-7.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-interactivity/1.0-alpha-6/plexus-interactivity-1.0-alpha-6.pom +fetchArtifact org/codehaus/plexus/plexus-interactivity/1.0-alpha-6/plexus-interactivity-1.0-alpha-6.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-4/plexus-interactivity-api-1.0-alpha-4.jar +fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-4/plexus-interactivity-api-1.0-alpha-4.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-4/plexus-interactivity-api-1.0-alpha-4.pom +fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-4/plexus-interactivity-api-1.0-alpha-4.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-6/plexus-interactivity-api-1.0-alpha-6.jar +fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-6/plexus-interactivity-api-1.0-alpha-6.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-6/plexus-interactivity-api-1.0-alpha-6.pom +fetchArtifact org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-6/plexus-interactivity-api-1.0-alpha-6.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-interpolation/1.11/plexus-interpolation-1.11.pom +fetchArtifact org/codehaus/plexus/plexus-interpolation/1.11/plexus-interpolation-1.11.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-interpolation/1.12/plexus-interpolation-1.12.jar +fetchArtifact org/codehaus/plexus/plexus-interpolation/1.12/plexus-interpolation-1.12.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-interpolation/1.12/plexus-interpolation-1.12.pom +fetchArtifact org/codehaus/plexus/plexus-interpolation/1.12/plexus-interpolation-1.12.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-interpolation/1.13/plexus-interpolation-1.13.jar +fetchArtifact org/codehaus/plexus/plexus-interpolation/1.13/plexus-interpolation-1.13.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-interpolation/1.13/plexus-interpolation-1.13.pom +fetchArtifact org/codehaus/plexus/plexus-interpolation/1.13/plexus-interpolation-1.13.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-interpolation/1.14/plexus-interpolation-1.14.jar +fetchArtifact org/codehaus/plexus/plexus-interpolation/1.14/plexus-interpolation-1.14.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-interpolation/1.14/plexus-interpolation-1.14.pom +fetchArtifact org/codehaus/plexus/plexus-interpolation/1.14/plexus-interpolation-1.14.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-interpolation/1.15/plexus-interpolation-1.15.jar +fetchArtifact org/codehaus/plexus/plexus-interpolation/1.15/plexus-interpolation-1.15.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-interpolation/1.15/plexus-interpolation-1.15.pom +fetchArtifact org/codehaus/plexus/plexus-interpolation/1.15/plexus-interpolation-1.15.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-io/1.0/plexus-io-1.0.jar +fetchArtifact org/codehaus/plexus/plexus-io/1.0/plexus-io-1.0.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-io/1.0/plexus-io-1.0.pom +fetchArtifact org/codehaus/plexus/plexus-io/1.0/plexus-io-1.0.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-io/1.0-alpha-1/plexus-io-1.0-alpha-1.jar +fetchArtifact org/codehaus/plexus/plexus-io/1.0-alpha-1/plexus-io-1.0-alpha-1.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-io/1.0-alpha-1/plexus-io-1.0-alpha-1.pom +fetchArtifact org/codehaus/plexus/plexus-io/1.0-alpha-1/plexus-io-1.0-alpha-1.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-io/2.0.1/plexus-io-2.0.1.pom +fetchArtifact org/codehaus/plexus/plexus-io/2.0.1/plexus-io-2.0.1.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-io/2.0.2/plexus-io-2.0.2.jar +fetchArtifact org/codehaus/plexus/plexus-io/2.0.2/plexus-io-2.0.2.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-io/2.0.2/plexus-io-2.0.2.pom +fetchArtifact org/codehaus/plexus/plexus-io/2.0.2/plexus-io-2.0.2.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-io/2.0.6/plexus-io-2.0.6.jar +fetchArtifact org/codehaus/plexus/plexus-io/2.0.6/plexus-io-2.0.6.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-io/2.0.6/plexus-io-2.0.6.pom +fetchArtifact org/codehaus/plexus/plexus-io/2.0.6/plexus-io-2.0.6.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-resources/1.0-alpha-5/plexus-resources-1.0-alpha-5.jar +fetchArtifact org/codehaus/plexus/plexus-resources/1.0-alpha-5/plexus-resources-1.0-alpha-5.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-resources/1.0-alpha-5/plexus-resources-1.0-alpha-5.pom +fetchArtifact org/codehaus/plexus/plexus-resources/1.0-alpha-5/plexus-resources-1.0-alpha-5.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4.pom +fetchArtifact org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.pom +fetchArtifact org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.pom +fetchArtifact org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/1.3/plexus-utils-1.3.pom +fetchArtifact org/codehaus/plexus/plexus-utils/1.3/plexus-utils-1.3.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/1.4/plexus-utils-1.4.pom +fetchArtifact org/codehaus/plexus/plexus-utils/1.4/plexus-utils-1.4.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/1.4.1/plexus-utils-1.4.1.pom +fetchArtifact org/codehaus/plexus/plexus-utils/1.4.1/plexus-utils-1.4.1.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/1.4.2/plexus-utils-1.4.2.pom +fetchArtifact org/codehaus/plexus/plexus-utils/1.4.2/plexus-utils-1.4.2.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.pom +fetchArtifact org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/1.4.6/plexus-utils-1.4.6.pom +fetchArtifact org/codehaus/plexus/plexus-utils/1.4.6/plexus-utils-1.4.6.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/1.4.9/plexus-utils-1.4.9.pom +fetchArtifact org/codehaus/plexus/plexus-utils/1.4.9/plexus-utils-1.4.9.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/1.5.1/plexus-utils-1.5.1.pom +fetchArtifact org/codehaus/plexus/plexus-utils/1.5.1/plexus-utils-1.5.1.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/1.5.10/plexus-utils-1.5.10.jar +fetchArtifact org/codehaus/plexus/plexus-utils/1.5.10/plexus-utils-1.5.10.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/1.5.10/plexus-utils-1.5.10.pom +fetchArtifact org/codehaus/plexus/plexus-utils/1.5.10/plexus-utils-1.5.10.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/1.5.12/plexus-utils-1.5.12.jar +fetchArtifact org/codehaus/plexus/plexus-utils/1.5.12/plexus-utils-1.5.12.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/1.5.12/plexus-utils-1.5.12.pom +fetchArtifact org/codehaus/plexus/plexus-utils/1.5.12/plexus-utils-1.5.12.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/1.5.15/plexus-utils-1.5.15.pom +fetchArtifact org/codehaus/plexus/plexus-utils/1.5.15/plexus-utils-1.5.15.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/1.5.5/plexus-utils-1.5.5.pom +fetchArtifact org/codehaus/plexus/plexus-utils/1.5.5/plexus-utils-1.5.5.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/1.5.6/plexus-utils-1.5.6.pom +fetchArtifact org/codehaus/plexus/plexus-utils/1.5.6/plexus-utils-1.5.6.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/1.5.7/plexus-utils-1.5.7.pom +fetchArtifact org/codehaus/plexus/plexus-utils/1.5.7/plexus-utils-1.5.7.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/1.5.8/plexus-utils-1.5.8.jar +fetchArtifact org/codehaus/plexus/plexus-utils/1.5.8/plexus-utils-1.5.8.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/1.5.8/plexus-utils-1.5.8.pom +fetchArtifact org/codehaus/plexus/plexus-utils/1.5.8/plexus-utils-1.5.8.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/2.0.4/plexus-utils-2.0.4.pom +fetchArtifact org/codehaus/plexus/plexus-utils/2.0.4/plexus-utils-2.0.4.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/2.0.5/plexus-utils-2.0.5.jar +fetchArtifact org/codehaus/plexus/plexus-utils/2.0.5/plexus-utils-2.0.5.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/2.0.5/plexus-utils-2.0.5.pom +fetchArtifact org/codehaus/plexus/plexus-utils/2.0.5/plexus-utils-2.0.5.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/2.1/plexus-utils-2.1.pom +fetchArtifact org/codehaus/plexus/plexus-utils/2.1/plexus-utils-2.1.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/3.0/plexus-utils-3.0.jar +fetchArtifact org/codehaus/plexus/plexus-utils/3.0/plexus-utils-3.0.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/3.0/plexus-utils-3.0.pom +fetchArtifact org/codehaus/plexus/plexus-utils/3.0/plexus-utils-3.0.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/3.0.10/plexus-utils-3.0.10.pom +fetchArtifact org/codehaus/plexus/plexus-utils/3.0.10/plexus-utils-3.0.10.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/3.0.15/plexus-utils-3.0.15.jar +fetchArtifact org/codehaus/plexus/plexus-utils/3.0.15/plexus-utils-3.0.15.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/3.0.15/plexus-utils-3.0.15.pom +fetchArtifact org/codehaus/plexus/plexus-utils/3.0.15/plexus-utils-3.0.15.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/3.0.8/plexus-utils-3.0.8.pom +fetchArtifact org/codehaus/plexus/plexus-utils/3.0.8/plexus-utils-3.0.8.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/3.0.9/plexus-utils-3.0.9.jar +fetchArtifact org/codehaus/plexus/plexus-utils/3.0.9/plexus-utils-3.0.9.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-utils/3.0.9/plexus-utils-3.0.9.pom +fetchArtifact org/codehaus/plexus/plexus-utils/3.0.9/plexus-utils-3.0.9.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-velocity/1.1.7/plexus-velocity-1.1.7.jar +fetchArtifact org/codehaus/plexus/plexus-velocity/1.1.7/plexus-velocity-1.1.7.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-velocity/1.1.7/plexus-velocity-1.1.7.pom +fetchArtifact org/codehaus/plexus/plexus-velocity/1.1.7/plexus-velocity-1.1.7.pom.sha1 +fetchArtifact org/codehaus/plexus/plexus-velocity/1.1.8/plexus-velocity-1.1.8.jar +fetchArtifact org/codehaus/plexus/plexus-velocity/1.1.8/plexus-velocity-1.1.8.jar.sha1 +fetchArtifact org/codehaus/plexus/plexus-velocity/1.1.8/plexus-velocity-1.1.8.pom +fetchArtifact org/codehaus/plexus/plexus-velocity/1.1.8/plexus-velocity-1.1.8.pom.sha1 +fetchArtifact org/eclipse/aether/aether/0.9.0.M2/aether-0.9.0.M2.pom +fetchArtifact org/eclipse/aether/aether/0.9.0.M2/aether-0.9.0.M2.pom.sha1 +fetchArtifact org/eclipse/aether/aether-util/0.9.0.M2/aether-util-0.9.0.M2.jar +fetchArtifact org/eclipse/aether/aether-util/0.9.0.M2/aether-util-0.9.0.M2.jar.sha1 +fetchArtifact org/eclipse/aether/aether-util/0.9.0.M2/aether-util-0.9.0.M2.pom +fetchArtifact org/eclipse/aether/aether-util/0.9.0.M2/aether-util-0.9.0.M2.pom.sha1 +fetchArtifact org/eclipse/jetty/jetty-parent/14/jetty-parent-14.pom +fetchArtifact org/eclipse/jetty/jetty-parent/14/jetty-parent-14.pom.sha1 +fetchArtifact org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar +fetchArtifact org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar.sha1 +fetchArtifact org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.pom +fetchArtifact org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.pom.sha1 +fetchArtifact org/hamcrest/hamcrest-parent/1.1/hamcrest-parent-1.1.pom +fetchArtifact org/hamcrest/hamcrest-parent/1.1/hamcrest-parent-1.1.pom.sha1 +fetchArtifact org/jdom/jdom/1.1/jdom-1.1.jar +fetchArtifact org/jdom/jdom/1.1/jdom-1.1.jar.sha1 +fetchArtifact org/jdom/jdom/1.1/jdom-1.1.pom +fetchArtifact org/jdom/jdom/1.1/jdom-1.1.pom.sha1 +fetchArtifact org/mockito/mockito-core/1.8.5/mockito-core-1.8.5.jar +fetchArtifact org/mockito/mockito-core/1.8.5/mockito-core-1.8.5.jar.sha1 +fetchArtifact org/mockito/mockito-core/1.8.5/mockito-core-1.8.5.pom +fetchArtifact org/mockito/mockito-core/1.8.5/mockito-core-1.8.5.pom.sha1 +fetchArtifact org/mortbay/jetty/jetty/6.1.25/jetty-6.1.25.jar +fetchArtifact org/mortbay/jetty/jetty/6.1.25/jetty-6.1.25.jar.sha1 +fetchArtifact org/mortbay/jetty/jetty/6.1.25/jetty-6.1.25.pom +fetchArtifact org/mortbay/jetty/jetty/6.1.25/jetty-6.1.25.pom.sha1 +fetchArtifact org/mortbay/jetty/jetty-parent/10/jetty-parent-10.pom +fetchArtifact org/mortbay/jetty/jetty-parent/10/jetty-parent-10.pom.sha1 +fetchArtifact org/mortbay/jetty/jetty-parent/7/jetty-parent-7.pom +fetchArtifact org/mortbay/jetty/jetty-parent/7/jetty-parent-7.pom.sha1 +fetchArtifact org/mortbay/jetty/jetty-util/6.1.25/jetty-util-6.1.25.jar +fetchArtifact org/mortbay/jetty/jetty-util/6.1.25/jetty-util-6.1.25.jar.sha1 +fetchArtifact org/mortbay/jetty/jetty-util/6.1.25/jetty-util-6.1.25.pom +fetchArtifact org/mortbay/jetty/jetty-util/6.1.25/jetty-util-6.1.25.pom.sha1 +fetchArtifact org/mortbay/jetty/project/6.1.25/project-6.1.25.pom +fetchArtifact org/mortbay/jetty/project/6.1.25/project-6.1.25.pom.sha1 +fetchArtifact org/mortbay/jetty/servlet-api/2.5-20081211/servlet-api-2.5-20081211.jar +fetchArtifact org/mortbay/jetty/servlet-api/2.5-20081211/servlet-api-2.5-20081211.jar.sha1 +fetchArtifact org/mortbay/jetty/servlet-api/2.5-20081211/servlet-api-2.5-20081211.pom +fetchArtifact org/mortbay/jetty/servlet-api/2.5-20081211/servlet-api-2.5-20081211.pom.sha1 +fetchArtifact org/objenesis/objenesis/1.0/objenesis-1.0.jar +fetchArtifact org/objenesis/objenesis/1.0/objenesis-1.0.jar.sha1 +fetchArtifact org/objenesis/objenesis/1.0/objenesis-1.0.pom +fetchArtifact org/objenesis/objenesis/1.0/objenesis-1.0.pom.sha1 +fetchArtifact org/sonatype/aether/aether-api/1.7/aether-api-1.7.pom +fetchArtifact org/sonatype/aether/aether-api/1.7/aether-api-1.7.pom.sha1 +fetchArtifact org/sonatype/aether/aether-impl/1.7/aether-impl-1.7.pom +fetchArtifact org/sonatype/aether/aether-impl/1.7/aether-impl-1.7.pom.sha1 +fetchArtifact org/sonatype/aether/aether-parent/1.7/aether-parent-1.7.pom +fetchArtifact org/sonatype/aether/aether-parent/1.7/aether-parent-1.7.pom.sha1 +fetchArtifact org/sonatype/aether/aether-spi/1.7/aether-spi-1.7.pom +fetchArtifact org/sonatype/aether/aether-spi/1.7/aether-spi-1.7.pom.sha1 +fetchArtifact org/sonatype/aether/aether-util/1.7/aether-util-1.7.jar +fetchArtifact org/sonatype/aether/aether-util/1.7/aether-util-1.7.jar.sha1 +fetchArtifact org/sonatype/aether/aether-util/1.7/aether-util-1.7.pom +fetchArtifact org/sonatype/aether/aether-util/1.7/aether-util-1.7.pom.sha1 +fetchArtifact org/sonatype/forge/forge-parent/10/forge-parent-10.pom +fetchArtifact org/sonatype/forge/forge-parent/10/forge-parent-10.pom.sha1 +fetchArtifact org/sonatype/forge/forge-parent/3/forge-parent-3.pom +fetchArtifact org/sonatype/forge/forge-parent/3/forge-parent-3.pom.sha1 +fetchArtifact org/sonatype/forge/forge-parent/4/forge-parent-4.pom +fetchArtifact org/sonatype/forge/forge-parent/4/forge-parent-4.pom.sha1 +fetchArtifact org/sonatype/forge/forge-parent/5/forge-parent-5.pom +fetchArtifact org/sonatype/forge/forge-parent/5/forge-parent-5.pom.sha1 +fetchArtifact org/sonatype/forge/forge-parent/6/forge-parent-6.pom +fetchArtifact org/sonatype/forge/forge-parent/6/forge-parent-6.pom.sha1 +fetchArtifact org/sonatype/oss/oss-parent/6/oss-parent-6.pom +fetchArtifact org/sonatype/oss/oss-parent/6/oss-parent-6.pom.sha1 +fetchArtifact org/sonatype/oss/oss-parent/7/oss-parent-7.pom +fetchArtifact org/sonatype/oss/oss-parent/7/oss-parent-7.pom.sha1 +fetchArtifact org/sonatype/plexus/plexus-build-api/0.0.4/plexus-build-api-0.0.4.jar +fetchArtifact org/sonatype/plexus/plexus-build-api/0.0.4/plexus-build-api-0.0.4.jar.sha1 +fetchArtifact org/sonatype/plexus/plexus-build-api/0.0.4/plexus-build-api-0.0.4.pom +fetchArtifact org/sonatype/plexus/plexus-build-api/0.0.4/plexus-build-api-0.0.4.pom.sha1 +fetchArtifact org/sonatype/plexus/plexus-cipher/1.4/plexus-cipher-1.4.jar +fetchArtifact org/sonatype/plexus/plexus-cipher/1.4/plexus-cipher-1.4.jar.sha1 +fetchArtifact org/sonatype/plexus/plexus-cipher/1.4/plexus-cipher-1.4.pom +fetchArtifact org/sonatype/plexus/plexus-cipher/1.4/plexus-cipher-1.4.pom.sha1 +fetchArtifact org/sonatype/plexus/plexus-sec-dispatcher/1.3/plexus-sec-dispatcher-1.3.jar +fetchArtifact org/sonatype/plexus/plexus-sec-dispatcher/1.3/plexus-sec-dispatcher-1.3.jar.sha1 +fetchArtifact org/sonatype/plexus/plexus-sec-dispatcher/1.3/plexus-sec-dispatcher-1.3.pom +fetchArtifact org/sonatype/plexus/plexus-sec-dispatcher/1.3/plexus-sec-dispatcher-1.3.pom.sha1 +fetchArtifact org/sonatype/sisu/inject/guice-bean/1.4.2/guice-bean-1.4.2.pom +fetchArtifact org/sonatype/sisu/inject/guice-bean/1.4.2/guice-bean-1.4.2.pom.sha1 +fetchArtifact org/sonatype/sisu/inject/guice-plexus/1.4.2/guice-plexus-1.4.2.pom +fetchArtifact org/sonatype/sisu/inject/guice-plexus/1.4.2/guice-plexus-1.4.2.pom.sha1 +fetchArtifact org/sonatype/sisu/sisu-guice/2.1.7/sisu-guice-2.1.7-noaop.jar +fetchArtifact org/sonatype/sisu/sisu-guice/2.1.7/sisu-guice-2.1.7-noaop.jar.sha1 +fetchArtifact org/sonatype/sisu/sisu-guice/2.1.7/sisu-guice-2.1.7.pom +fetchArtifact org/sonatype/sisu/sisu-guice/2.1.7/sisu-guice-2.1.7.pom.sha1 +fetchArtifact org/sonatype/sisu/sisu-inject/1.4.2/sisu-inject-1.4.2.pom +fetchArtifact org/sonatype/sisu/sisu-inject/1.4.2/sisu-inject-1.4.2.pom.sha1 +fetchArtifact org/sonatype/sisu/sisu-inject-bean/1.4.2/sisu-inject-bean-1.4.2.jar +fetchArtifact org/sonatype/sisu/sisu-inject-bean/1.4.2/sisu-inject-bean-1.4.2.jar.sha1 +fetchArtifact org/sonatype/sisu/sisu-inject-bean/1.4.2/sisu-inject-bean-1.4.2.pom +fetchArtifact org/sonatype/sisu/sisu-inject-bean/1.4.2/sisu-inject-bean-1.4.2.pom.sha1 +fetchArtifact org/sonatype/sisu/sisu-inject-plexus/1.4.2/sisu-inject-plexus-1.4.2.pom +fetchArtifact org/sonatype/sisu/sisu-inject-plexus/1.4.2/sisu-inject-plexus-1.4.2.pom.sha1 +fetchArtifact org/sonatype/sisu/sisu-parent/1.4.2/sisu-parent-1.4.2.pom +fetchArtifact org/sonatype/sisu/sisu-parent/1.4.2/sisu-parent-1.4.2.pom.sha1 +fetchArtifact org/sonatype/spice/spice-parent/10/spice-parent-10.pom +fetchArtifact org/sonatype/spice/spice-parent/10/spice-parent-10.pom.sha1 +fetchArtifact org/sonatype/spice/spice-parent/12/spice-parent-12.pom +fetchArtifact org/sonatype/spice/spice-parent/12/spice-parent-12.pom.sha1 +fetchArtifact org/sonatype/spice/spice-parent/16/spice-parent-16.pom +fetchArtifact org/sonatype/spice/spice-parent/16/spice-parent-16.pom.sha1 +fetchArtifact org/sonatype/spice/spice-parent/17/spice-parent-17.pom +fetchArtifact org/sonatype/spice/spice-parent/17/spice-parent-17.pom.sha1 +fetchArtifact org/vafer/jdependency/0.7/jdependency-0.7.jar +fetchArtifact org/vafer/jdependency/0.7/jdependency-0.7.jar.sha1 +fetchArtifact org/vafer/jdependency/0.7/jdependency-0.7.pom +fetchArtifact org/vafer/jdependency/0.7/jdependency-0.7.pom.sha1 +fetchArtifact oro/oro/2.0.8/oro-2.0.8.jar +fetchArtifact oro/oro/2.0.8/oro-2.0.8.jar.sha1 +fetchArtifact oro/oro/2.0.8/oro-2.0.8.pom +fetchArtifact oro/oro/2.0.8/oro-2.0.8.pom.sha1 +fetchArtifact sslext/sslext/1.2-0/sslext-1.2-0.jar +fetchArtifact sslext/sslext/1.2-0/sslext-1.2-0.jar.sha1 +fetchArtifact sslext/sslext/1.2-0/sslext-1.2-0.pom +fetchArtifact sslext/sslext/1.2-0/sslext-1.2-0.pom.sha1 +fetchArtifact velocity/velocity/1.5/velocity-1.5.jar +fetchArtifact velocity/velocity/1.5/velocity-1.5.jar.sha1 +fetchArtifact velocity/velocity/1.5/velocity-1.5.pom +fetchArtifact velocity/velocity/1.5/velocity-1.5.pom.sha1 +fetchArtifact xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar +fetchArtifact xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar.sha1 +fetchArtifact xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.pom +fetchArtifact xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.pom.sha1 +fetchArtifact xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar +fetchArtifact xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar.sha1 +fetchArtifact xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.pom +fetchArtifact xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.pom.sha1 +fetchArtifact xml-apis/xml-apis/1.3.04/xml-apis-1.3.04.jar +fetchArtifact xml-apis/xml-apis/1.3.04/xml-apis-1.3.04.jar.sha1 +fetchArtifact xml-apis/xml-apis/1.3.04/xml-apis-1.3.04.pom +fetchArtifact xml-apis/xml-apis/1.3.04/xml-apis-1.3.04.pom.sha1 +fetchArtifact xml-apis/xml-apis/2.0.2/xml-apis-2.0.2.pom +fetchArtifact xml-apis/xml-apis/2.0.2/xml-apis-2.0.2.pom.sha1 + +stopNest diff --git a/pkgs/applications/networking/cluster/mesos/mesos-deps.nix b/pkgs/applications/networking/cluster/mesos/mesos-deps.nix new file mode 100644 index 0000000000000000000000000000000000000000..7f60dab2defc3685edcc5e25e66ee92b9d744922 --- /dev/null +++ b/pkgs/applications/networking/cluster/mesos/mesos-deps.nix @@ -0,0 +1,18 @@ +{stdenv, curl}: + +stdenv.mkDerivation { + name = "mesos-maven-deps"; + builder = ./fetch-mesos-deps.sh; + + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "03qjq481ly5ajynlr9iqvrjra5fvv2jz4wp2f3in5vnxa61inrrk"; + + buildInputs = [ curl ]; + + # We borrow these environment variables from the caller to allow + # easy proxy configuration. This is impure, but a fixed-output + # derivation like fetchurl is allowed to do so since its result is + # by definition pure. + impureEnvVars = ["http_proxy" "https_proxy" "ftp_proxy" "all_proxy" "no_proxy"]; +} diff --git a/pkgs/applications/networking/dropbox-cli/default.nix b/pkgs/applications/networking/dropbox-cli/default.nix index 5262c121bb28b81c51f6001e91af59711552f106..51f3ae2ac8d9e967edabd9bfb55a915806e9b8f8 100644 --- a/pkgs/applications/networking/dropbox-cli/default.nix +++ b/pkgs/applications/networking/dropbox-cli/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { phases = "unpackPhase installPhase"; installPhase = '' - ensureDir "$out/bin/" "$out/share/applications" + mkdir -p "$out/bin/" "$out/share/applications" cp data/dropbox.desktop "$out/share/applications" substitute "dropbox.in" "$out/bin/dropbox" \ --replace '@PACKAGE_VERSION@' ${version} \ diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index 62dce4c421271d7ac9bb3818e8c8b2b70f65f3b7..55b7bd7486b4d2543d38169c3420198f3f4cf510 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -70,9 +70,9 @@ in stdenv.mkDerivation { ''; installPhase = '' - ensureDir "$out/${appdir}" + mkdir -p "$out/${appdir}" cp -r ".dropbox-dist/"* "$out/${appdir}/" - ensureDir "$out/bin" + mkdir -p "$out/bin" ln -s "$out/${appdir}/dropbox" "$out/bin/dropbox" patchelf --set-interpreter ${stdenv.glibc}/lib/${interpreter} \ @@ -83,7 +83,7 @@ in stdenv.mkDerivation { find "$out/${appdir}" -type f -a -perm +0100 \ -print -exec patchelf --force-rpath --set-rpath "$RPATH" {} \; - ensureDir "$out/share/applications" + mkdir -p "$out/share/applications" cp "${desktopItem}/share/applications/"* $out/share/applications ''; diff --git a/pkgs/applications/networking/ids/daq/default.nix b/pkgs/applications/networking/ids/daq/default.nix index 92175bb23e9c9b1c06b95798728537ad212f6bf8..36571809a3708dec449b52d6e42b19676a799338 100644 --- a/pkgs/applications/networking/ids/daq/default.nix +++ b/pkgs/applications/networking/ids/daq/default.nix @@ -14,6 +14,6 @@ stdenv.mkDerivation rec { meta = { description = "Data AcQuisition library (DAQ), for packet I/O"; homepage = http://www.snort.org; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/applications/networking/ids/snort/default.nix b/pkgs/applications/networking/ids/snort/default.nix index b674f3a83fb29f74080d451b977737ce575422fa..858e99c245bad3f0b1a217144a5b58b2c31a91c3 100644 --- a/pkgs/applications/networking/ids/snort/default.nix +++ b/pkgs/applications/networking/ids/snort/default.nix @@ -14,6 +14,6 @@ stdenv.mkDerivation rec { meta = { description = "Snort is an open source network intrusion prevention and detection system (IDS/IPS)"; homepage = http://www.snort.org; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix index 457d3441b3ab77fa238ced1713814cc8046d62da..ec614bf4b8c1e5b17905f6f16e811cb431992af0 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.bitlbee.org/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; platforms = stdenv.lib.platforms.gnu; # arbitrary choice diff --git a/pkgs/applications/networking/instant-messengers/centerim/default.nix b/pkgs/applications/networking/instant-messengers/centerim/default.nix index d746d54974afe8ed0d27b96fb3ee81de1cc7dba2..54e2d813be8acb9406ebde89a7e30942c7129e13 100644 --- a/pkgs/applications/networking/instant-messengers/centerim/default.nix +++ b/pkgs/applications/networking/instant-messengers/centerim/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.centerim.org/; description = "Fork of CenterICQ, a curses instant messaging program"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/applications/networking/instant-messengers/ekiga/autofoo.patch b/pkgs/applications/networking/instant-messengers/ekiga/autofoo.patch new file mode 100644 index 0000000000000000000000000000000000000000..d15e8b6ccfd4ce31a3baaf8361c1ef9ca144a78c --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/ekiga/autofoo.patch @@ -0,0 +1,11 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -4,7 +4,7 @@ + AC_PREREQ([2.53]) + AC_CONFIG_MACRO_DIR([m4]) + AC_CONFIG_SRCDIR(src/ekiga.cpp) +-AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz tar-ustar]) ++AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz tar-ustar subdir-objects]) + + AM_MAINTAINER_MODE([enable]) + AC_CONFIG_HEADERS([config.h]) diff --git a/pkgs/applications/networking/instant-messengers/ekiga/boost.patch b/pkgs/applications/networking/instant-messengers/ekiga/boost.patch new file mode 100644 index 0000000000000000000000000000000000000000..9dad3d94f04bf15ce33b3968882c6a401f384afb --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/ekiga/boost.patch @@ -0,0 +1,31 @@ +--- a/m4/ax_boost_base.m4 ++++ b/m4/ax_boost_base.m4 +@@ -33,7 +33,7 @@ + # and this notice are preserved. This file is offered as-is, without any + # warranty. + +-#serial 20 ++#serial 22 + + AC_DEFUN([AX_BOOST_BASE], + [ +@@ -91,9 +91,17 @@ if test "x$want_boost" = "xyes"; then + dnl are found, e.g. when only header-only libraries are installed! + libsubdirs="lib" + ax_arch=`uname -m` +- if test $ax_arch = x86_64 -o $ax_arch = ppc64 -o $ax_arch = s390x -o $ax_arch = sparc64; then ++ case $ax_arch in ++ x86_64|ppc64|s390x|sparc64|aarch64) + libsubdirs="lib64 lib lib64" +- fi ++ ;; ++ esac ++ ++ dnl allow for real multi-arch paths e.g. /usr/lib/x86_64-linux-gnu. Give ++ dnl them priority over the other paths since, if libs are found there, they ++ dnl are almost assuredly the ones desired. ++ AC_REQUIRE([AC_CANONICAL_HOST]) ++ libsubdirs="lib/${host_cpu}-${host_os} $libsubdirs" + + dnl first we check the system location for boost libraries + dnl this location ist chosen if boost libraries are installed with the --layout=system option diff --git a/pkgs/applications/networking/instant-messengers/ekiga/default.nix b/pkgs/applications/networking/instant-messengers/ekiga/default.nix index 9de14cae6f0f61d9d1b198759bd4d52f68a7efcc..07730a8c0ee144fbac4c4bc9dc2ac3f6ff778934 100644 --- a/pkgs/applications/networking/instant-messengers/ekiga/default.nix +++ b/pkgs/applications/networking/instant-messengers/ekiga/default.nix @@ -1,71 +1,55 @@ -x@{builderDefsPackage - , cyrus_sasl, gettext, openldap, ptlib, opal, GConf, libXv, rarian, intltool - , perl, perlXMLParser, evolution_data_server, gnome_doc_utils, avahi - , libsigcxx, gtk, dbus_glib, libnotify, libXext, xextproto, automake - , autoconf, pkgconfig, libxml2, videoproto, unixODBC, db, nspr, nss, zlib - , libXrandr, randrproto, which, libxslt, libtasn1, gmp, nettle - , ...}: -builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ - []; +{ stdenv, fetchurl, cyrus_sasl, gettext, openldap, ptlib, opal, libXv, rarian, intltool +, perl, perlXMLParser, evolution_data_server, gnome_doc_utils, avahi, autoreconfHook +, libsigcxx, gtk, dbus_glib, libnotify, libXext, xextproto, gnome3, boost, libsecret +, pkgconfig, libxml2, videoproto, unixODBC, db, nspr, nss, zlib, hicolor_icon_theme +, libXrandr, randrproto, which, libxslt, libtasn1, gmp, nettle, sqlite, makeWrapper }: - buildInputs = map (n: builtins.getAttr n x) - (builtins.attrNames (builtins.removeAttrs x helperArgNames)); - sourceInfo = rec { - baseName="ekiga"; - baseVersion="3.2"; - patchlevel="7"; - version="${baseVersion}.${patchlevel}"; - name="${baseName}-${version}"; - url="mirror://gnome/sources/${baseName}/${baseVersion}/${name}.tar.bz2"; - hash="13zxwfqhp7pisadx0hq50qwnj6d8r4dldvbs1ngydbwfnq4i6npj"; - }; -in -rec { - src = a.fetchurl { - url = sourceInfo.url; - sha256 = sourceInfo.hash; +stdenv.mkDerivation rec { + name = "ekiga-4.0.1"; + + src = fetchurl { + url = "mirror://gnome/sources/ekiga/4.0/${name}.tar.xz"; + sha256 = "5f4f491c9496cf65ba057a9345d6bb0278f4eca07bcda5baeecf50bfcd9a4a3b"; }; - inherit (sourceInfo) name version; - inherit buildInputs; + buildInputs = [ cyrus_sasl gettext openldap ptlib opal libXv rarian intltool + perl perlXMLParser evolution_data_server gnome_doc_utils avahi + libsigcxx gtk dbus_glib libnotify libXext xextproto sqlite + gnome3.libsoup + hicolor_icon_theme gnome3.gnome_icon_theme boost autoreconfHook + pkgconfig libxml2 videoproto unixODBC db nspr nss zlib libsecret + libXrandr randrproto which libxslt libtasn1 gmp nettle makeWrapper ]; + + preAutoreconf = '' + substituteInPlace configure.ac --replace AM_GCONF_SOURCE_2 "" + ''; - /* doConfigure should be removed if not needed */ - phaseNames = ["setVars" "doConfigure" "doMakeInstall"]; configureFlags = [ "--with-ldap-dir=${openldap}" "--with-libsasl2-dir=${cyrus_sasl}" + "--with-boost-libdir=${boost}/lib" + "--disable-gconf" ]; - setVars = a.noDepEntry ('' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${opal}/include/opal" - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$(echo ${evolution_data_server}/include/evolution-*)" - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${libxml2}/include/libxml2" - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${GConf}/include/gconf/2" + enableParallelBuilding = true; - export NIX_LDFLAGS="$NIX_LDFLAGS -lopal" - for i in ${evolution_data_server}/lib/lib*.so; do - file="$(basename "$i" .so)" - bn="''${file#lib}" - export NIX_LDFLAGS="$NIX_LDFLAGS -l$bn" - done - ''); + patches = [ ./autofoo.patch ./boost.patch ]; - meta = { + postInstall = '' + wrapProgram "$out"/bin/ekiga \ + --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" + ''; + + meta = with stdenv.lib; { description = "Ekiga SIP client"; - maintainers = with a.lib.maintainers; - [ - raskin - ]; - platforms = with a.lib.platforms; - linux; + maintainers = [ maintainers.raskin ]; + platforms = platforms.linux; }; + passthru = { updateInfo = { downloadPage = "mirror://gnome/sources/ekiga"; }; }; -}) x +} diff --git a/pkgs/applications/networking/instant-messengers/gtmess/default.nix b/pkgs/applications/networking/instant-messengers/gtmess/default.nix index 68973b4e47f54a586ed3b22aa2f7ded2532a7680..64021c93bc83ca615b2319abb7cccb68bb69b202 100644 --- a/pkgs/applications/networking/instant-messengers/gtmess/default.nix +++ b/pkgs/applications/networking/instant-messengers/gtmess/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { meta = { description = "Console MSN Messenger client for Linux and other unix systems"; homepage = http://gtmess.sourceforge.net/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/applications/networking/instant-messengers/kadu/default.nix b/pkgs/applications/networking/instant-messengers/kadu/default.nix index 4e176ec56dcba40129cf2f552da4b07e0df87afa..a74460c3e39b6c2f5c5ac3054f03ace9a32d2ca9 100644 --- a/pkgs/applications/networking/instant-messengers/kadu/default.nix +++ b/pkgs/applications/networking/instant-messengers/kadu/default.nix @@ -15,6 +15,10 @@ stdenv.mkDerivation { configureFlags = "CPPFLAGS=-DQT_NO_DEBUG"; + preConfigure = '' + export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${phonon}/lib64/pkgconfig:${phonon}/lib32/pkgconfig" + ''; + cmakeFlags = "-DENABLE_AUTODOWNLOAD=OFF -DBUILD_DESCRIPTION='NixOS' -DCMAKE_BUILD_TYPE=Release"; prePatch = '' @@ -34,7 +38,7 @@ stdenv.mkDerivation { meta = { description = "An instant-messenger client for the gadu-gadu network (most popular polish IM network)"; homepage = http://www.kadu.net/w/English:Main_Page; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.piotr ]; }; diff --git a/pkgs/applications/networking/instant-messengers/linphone/default.nix b/pkgs/applications/networking/instant-messengers/linphone/default.nix index c3af0ad0e3406b7cc145455c1b2ae3b0ed5e0452..be12c7e8e2ae206ac105473390046adc91536283 100644 --- a/pkgs/applications/networking/instant-messengers/linphone/default.nix +++ b/pkgs/applications/networking/instant-messengers/linphone/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.linphone.org/; description = "Open Source video SIP softphone"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.gnu; }; } diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix index cf42dd5700ba863efaf9bf7151fd80adb4d0dd0d..7cbc38ea0dc0d60622a30d2dc91e52ba38859b2b 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix @@ -14,6 +14,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.cypherpunks.ca/otr; description = "Plugin for Pidgin 2.x which implements OTR Messaging"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/skype4pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/skype4pidgin/default.nix index 544aa06877ad275cb16a7aa0c2f32a0655be0719..a83589bf75e059203942e5a842bcaa8b97875454 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/skype4pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/skype4pidgin/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildPhase = "make libskype.so libskype_dbus.so"; installPhase = '' - ensureDir $out/pixmaps/pidgin/protocols/{16,22,48} $out/bin $out/lib/pidgin + mkdir -p $out/pixmaps/pidgin/protocols/{16,22,48} $out/bin $out/lib/pidgin cp icons/16/skypeout.png $out/pixmaps/pidgin/protocols/16 cp icons/22/skypeout.png $out/pixmaps/pidgin/protocols/22 cp icons/48/skypeout.png $out/pixmaps/pidgin/protocols/48 @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = { homepage = https://github.com/novas0x2a/skype4pidgin; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; description = "Plugin to use a running skype account through pidgin"; }; } diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix index b87db662f45e2b9e12fbc4a334fa6f3cb755d91e..348802fe16eb7a99d91d3ab36c9af20d0d89526d 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix @@ -24,6 +24,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://tox.dhs.org/; description = "Tox plugin for Pidgin / libpurple"; - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3; }; } diff --git a/pkgs/applications/networking/instant-messengers/sflphone/default.nix b/pkgs/applications/networking/instant-messengers/sflphone/default.nix index a31a682abf88978e651f5ac1be0c4765edd79a37..fb14782ef9f61004615ee4d9c2876b70be9846a7 100644 --- a/pkgs/applications/networking/instant-messengers/sflphone/default.nix +++ b/pkgs/applications/networking/instant-messengers/sflphone/default.nix @@ -14,7 +14,7 @@ let meta = { homepage = http://sflphone.org/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; description = "Free software enterprise-class softphone for GNU/Linux"; platforms = with stdenv.lib.platforms; linux; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/pkgs/applications/networking/instant-messengers/silc-client/default.nix b/pkgs/applications/networking/instant-messengers/silc-client/default.nix index a4035604168f3e4b07d0e45ad273f8c148ad5d32..4ce098e6ca46531b63134e6589fd2f85028734eb 100644 --- a/pkgs/applications/networking/instant-messengers/silc-client/default.nix +++ b/pkgs/applications/networking/instant-messengers/silc-client/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { meta = { homepage = http://silcnet.org/; description = "Secure Internet Live Conferencing server"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/networking/instant-messengers/skype-call-recorder/default.nix b/pkgs/applications/networking/instant-messengers/skype-call-recorder/default.nix index 2fa82e1251bc783e05d7bce4735740852c83ebe1..713aa8f03744c6238dc365e1c8d3fd5ed94004b2 100644 --- a/pkgs/applications/networking/instant-messengers/skype-call-recorder/default.nix +++ b/pkgs/applications/networking/instant-messengers/skype-call-recorder/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = { homepage = http://atdot.ch/scr/; description = "Open source tool to record your Skype calls on Linux"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = with stdenv.lib.platforms; linux; maintainers = with stdenv.lib.maintainers; [viric]; }; diff --git a/pkgs/applications/networking/instant-messengers/skype/default.nix b/pkgs/applications/networking/instant-messengers/skype/default.nix index f1ac10639344346bade60c4c424d6e23a8a4f9bf..32755306cc76f5c01164417b55acf7056675b76b 100644 --- a/pkgs/applications/networking/instant-messengers/skype/default.nix +++ b/pkgs/applications/networking/instant-messengers/skype/default.nix @@ -66,6 +66,6 @@ stdenv.mkDerivation rec { meta = { description = "A proprietary voice-over-IP (VoIP) client"; homepage = http://www.skype.com/; - license = "unfree"; + license = stdenv.lib.licenses.unfree; }; } diff --git a/pkgs/applications/networking/instant-messengers/telegram-cli/default.nix b/pkgs/applications/networking/instant-messengers/telegram-cli/default.nix index 51639f6050dcde4f176d5e039978aa13a99e8813..b0302ba8e0bf2014189dd7579423d972a6b65bad 100644 --- a/pkgs/applications/networking/instant-messengers/telegram-cli/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram-cli/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { description = "Command-line interface for Telegram messenger"; homepage = https://telegram.org/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix index 8a945bc7e2d004c9d61c0c2e79ee70be3164db72..e8e76c10ea5ecb6a79105e44bfb3b2cdc41f7ff7 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix @@ -1,20 +1,24 @@ -{ stdenv, fetchurl, pkgconfig, libxslt, telepathy_glib, libxml2, dbus_glib +{ stdenv, fetchurl, pkgconfig, libxslt, telepathy_glib, libxml2, dbus_glib, dbus_daemon , sqlite, libsoup, libnice, gnutls }: stdenv.mkDerivation rec { - name = "telepathy-gabble-0.17.2"; + name = "telepathy-gabble-0.18.2"; src = fetchurl { url = "${meta.homepage}/releases/telepathy-gabble/${name}.tar.gz"; - sha256 = "137sslbgh0326lmwihcr2ybljgq9mzsx5wnciilpx884si22wpk8"; + sha256 = "00ag32ccbj0hmy41rb0fg9gp40m7zbq45r4yijnyslk2mpkvg7c9"; }; nativeBuildInputs = [ pkgconfig libxslt ]; - buildInputs = [ libxml2 dbus_glib sqlite libsoup libnice telepathy_glib gnutls ]; + buildInputs = [ libxml2 dbus_glib sqlite libsoup libnice telepathy_glib gnutls ] + ++ stdenv.lib.optional doCheck dbus_daemon; configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-bundle.crt"; - meta = { + enableParallelBuilding = true; + doCheck = true; + + meta = with stdenv.lib; { homepage = http://telepathy.freedesktop.org; description = "Jabber/XMPP connection manager for the Telepathy framework"; platforms = stdenv.lib.platforms.gnu; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix index a8142fc1e5cfe766c404fae0442e97c980860ccf..b463ff2f2307848b8f62dd550c92da9d527e9533 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix @@ -1,20 +1,29 @@ -{ stdenv, fetchurl, pkgconfig, telepathy_glib, libxslt, makeWrapper }: +{ stdenv, fetchurl, pkgconfig, telepathy_glib, libxslt, makeWrapper, upower }: stdenv.mkDerivation rec { - name = "${pname}-5.16.0"; + name = "${pname}-5.16.2"; pname = "telepathy-mission-control"; src = fetchurl { url = "http://telepathy.freedesktop.org/releases/${pname}/${name}.tar.gz"; - sha256 = "1l61w6j04mbrjsbcfrlc0safh9nlsjnj0z6lszal64r9bhkcghzd"; + sha256 = "1sk8f9jfaxgbsniz0n5hmrcwvxla3x8axjcnjbppg7nidk9gijrx"; }; - buildInputs = [ telepathy_glib makeWrapper ]; + buildInputs = [ telepathy_glib makeWrapper upower ]; # ToDo: optional stuff missing nativeBuildInputs = [ pkgconfig libxslt ]; + doCheck = true; + preFixup = '' wrapProgram "$out/libexec/mission-control-5" \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" ''; + + meta = with stdenv.lib; { + description = "An account manager and channel dispatcher for the Telepathy framework"; + homepage = http://telepathy.freedesktop.org/wiki/; + license = licenses.lgpl21; + platforms = platforms.unix; + }; } diff --git a/pkgs/applications/networking/instant-messengers/toxic/default.nix b/pkgs/applications/networking/instant-messengers/toxic/default.nix index ded2bbf92500e5330e26529a6976d51cc776fe99..b3e1ff74cfa5c2bb8c748556c542d721fb6b93bb 100644 --- a/pkgs/applications/networking/instant-messengers/toxic/default.nix +++ b/pkgs/applications/networking/instant-messengers/toxic/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchurl, autoconf, libtool, automake, libsodium, ncurses -, libtoxcore, pkgconfig }: +, libtoxcore, openal, libvpx, freealut, libconfig, pkgconfig }: let - version = "b308e19e6b"; - date = "20140224"; + version = "7566aa9d26"; + date = "20140728"; in stdenv.mkDerivation rec { name = "toxic-${date}-${version}"; @@ -11,29 +11,20 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/Tox/toxic/tarball/${version}"; name = "${name}.tar.gz"; - sha256 = "0fgkvnpy3dl2h378h796z9md0zg05b3174fgx17b919av6j9x4ma"; + sha256 = "13vns0qc0hxhab6rpz0irnzgv42mp3v1nrbwm90iymhf4xkc9nwa"; }; - preConfigure = '' - autoreconf -i - ''; + makeFlags = [ "-Cbuild" "VERSION=${version}" ]; + installFlags = [ "PREFIX=$(out)" ]; - NIX_LDFLAGS = "-lsodium"; - - configureFlags = [ - "--with-libtoxcore-headers=${libtoxcore}/include" - "--with-libtoxcore-libs=${libtoxcore}/lib" - "--with-libsodium-headers=${libtoxcore}/include" - "--with-libsodium-libs=${libtoxcore}/lib" + buildInputs = [ + autoconf libtool automake libtoxcore libsodium ncurses openal libvpx + freealut libconfig pkgconfig ]; - buildInputs = [ autoconf libtool automake libtoxcore libsodium ncurses pkgconfig ]; - - doCheck = true; - meta = { description = "Reference CLI for Tox"; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [ viric ]; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/applications/networking/instant-messengers/twinkle/default.nix b/pkgs/applications/networking/instant-messengers/twinkle/default.nix index 0824210c4b56c55db718bd84ec4fbc7c58a48b55..060c844980bb26d58ad1664b5e5c545a756ab7ff 100644 --- a/pkgs/applications/networking/instant-messengers/twinkle/default.nix +++ b/pkgs/applications/networking/instant-messengers/twinkle/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, commoncpp2, ccrtp, openssl, boost , libsndfile, libxml2, libjpeg, readline, qt3, perl, file , alsaLib, speex, libzrtpcpp, xorg }: - + stdenv.mkDerivation { name = "twinkle-1.4.2"; @@ -20,7 +20,7 @@ stdenv.mkDerivation { speex libzrtpcpp xorg.libX11 xorg.libXaw xorg.libICE xorg.libXext ]; - meta = { + meta = { homepage = http://www.xs4all.nl/~mfnboer/twinkle/index.html; license = "GPL"; maintainers = [ stdenv.lib.maintainers.marcweber ]; diff --git a/pkgs/applications/networking/instant-messengers/utox/default.nix b/pkgs/applications/networking/instant-messengers/utox/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..823df5c27a28f52c3d6bc5e3d3fd300575324519 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/utox/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, pkgconfig, libtoxcore, dbus, libvpx, libX11, openal, freetype, libv4l +, libXrender, fontconfig, libXext, libXft }: + + +stdenv.mkDerivation rec { + name = "utox-dev"; + + src = fetchFromGitHub { + owner = "notsecure"; + repo = "uTox"; + rev = "d70f9bfb4ff8a156ec35803da6226b0ac8c47961"; + sha256 = "10cvsg0phv0jsrdl3zkk339c4bzn3xc82q1x90h6gcnrbg4vzmp0"; + }; + + buildInputs = [ pkgconfig libtoxcore dbus libvpx libX11 openal freetype + libv4l libXrender fontconfig libXext libXft ]; + + doCheck = false; + + makeFlags = "DESTDIR=$(out)"; + + meta = with stdenv.lib; { + description = "Lightweight Tox client"; + license = licenses.gpl3; + maintainers = with stdenv.lib.maintainers; [ iElectric ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/applications/networking/iptraf/default.nix b/pkgs/applications/networking/iptraf/default.nix index f0a6dbbe7e77dd0e7e6f775601336e0e33f15900..db1f2011f113ebc8f84aa6f6e1adf6fb0509bada 100644 --- a/pkgs/applications/networking/iptraf/default.nix +++ b/pkgs/applications/networking/iptraf/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://iptraf.seul.org/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; description = "Console-based network statistics utility for Linux"; }; } diff --git a/pkgs/applications/networking/irc/ii/default.nix b/pkgs/applications/networking/irc/ii/default.nix index 537897c13b4a7c1df8a5da825a1280f4f41b867c..224f639cc150242d5479b585aa643f6ff4a3a89e 100644 --- a/pkgs/applications/networking/irc/ii/default.nix +++ b/pkgs/applications/networking/irc/ii/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://tools.suckless.org/ii/; - license = "MIT"; + license = stdenv.lib.licenses.mit; description = "Irc it, simple FIFO based irc client"; }; } diff --git a/pkgs/applications/networking/irc/irssi/fish/default.nix b/pkgs/applications/networking/irc/irssi/fish/default.nix index 98d5afa0ba9f0f98ce933fa0d3be48bf17784b6e..64e3d216ac08f3f36026ef8ddccb938ec2b781e7 100644 --- a/pkgs/applications/networking/irc/irssi/fish/default.nix +++ b/pkgs/applications/networking/irc/irssi/fish/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; installPhase = '' - ensureDir $out/lib/irssi/modules + mkdir -p $out/lib/irssi/modules cp src/.libs/libfish.so $out/lib/irssi/modules ''; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { homepage = https://github.com/falsovsky/FiSH-irssi; - license = "unfree"; # I can't find any mention of license + license = stdenv.lib.licenses.unfree; # I can't find any mention of license maintainers = with stdenv.lib.maintainers; [viric]; }; } diff --git a/pkgs/applications/networking/irc/irssi/otr/default.nix b/pkgs/applications/networking/irc/irssi/otr/default.nix index 988320dd61fc7ef009201d09770edcba0baea8b7..4841aa8070e0a26525c2c9182f6861497a970240 100644 --- a/pkgs/applications/networking/irc/irssi/otr/default.nix +++ b/pkgs/applications/networking/irc/irssi/otr/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { meta = { homepage = https://github.com/cryptodotis/irssi-otr; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/applications/networking/irc/quassel/default.nix b/pkgs/applications/networking/irc/quassel/default.nix index 2a5be53619d7887bb92af28e60aea8eff7e5c33d..ba3d7b8c368aeb2d6933a9eb4d6e3364bdbdbe3c 100644 --- a/pkgs/applications/networking/irc/quassel/default.nix +++ b/pkgs/applications/networking/irc/quassel/default.nix @@ -40,10 +40,15 @@ in with stdenv; mkDerivation rec { ++ edf ssl "WITH_OPENSSL" ++ edf previews "WITH_WEBKIT" ; - preFixup = '' - wrapProgram "$out/bin/quasselclient" \ - --prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules" - ''; + preFixup = + lib.optionalString client '' + wrapProgram "$out/bin/quasselclient" \ + --prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules" + '' + + lib.optionalString monolithic '' + wrapProgram "$out/bin/quassel" \ + --prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules" + ''; meta = with stdenv.lib; { homepage = http://quassel-irc.org/; @@ -55,10 +60,9 @@ in with stdenv; mkDerivation rec { combination of screen and a text-based IRC client such as WeeChat, but graphical (based on Qt4/KDE4). ''; - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3; maintainers = [ maintainers.phreedom ]; repositories.git = https://github.com/quassel/quassel.git; inherit (qt4.meta) platforms; }; } - diff --git a/pkgs/applications/networking/irc/weechat/devel.nix b/pkgs/applications/networking/irc/weechat/devel.nix index 25cc8dd7660326580673301bad9df2929ca68ce2..34ca4b4d7c6ea06b6c6deb68caa9b1f93861e284 100644 --- a/pkgs/applications/networking/irc/weechat/devel.nix +++ b/pkgs/applications/networking/irc/weechat/devel.nix @@ -3,14 +3,14 @@ , pythonPackages, cacert, cmake, makeWrapper }: stdenv.mkDerivation rec { - rev = "70d2b0ad8eb7854932d24c007a05b8627f751205"; + rev = "124b2668fe4e97e3926caea85ed2c9f7082c4df9"; version = "1.0-rev${rev}"; name = "weechat-${version}"; src = fetchgit { inherit rev; url = "git://github.com/weechat/weechat.git"; - sha256 = "1k7kcrq46anq87r14sq3vrhij8acn6id7zxyhn0qnjj2wqgrjp5i"; + sha256 = "1xl5scyrxmyqaycpalhl3j50s65w2gjdm43vahd618yyykdffr8b"; }; buildInputs = diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix index dbd5a41afd342700a1485d5277ec0289ca8694fe..9c397f27c46f65d6bc86b9644852b456b2e50598 100644 --- a/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -55,9 +55,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A small but very powerful text-based mail client"; homepage = http://www.mutt.org; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = platforms.unix; maintainers = with maintainers; [ the-kenny ]; }; } - diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index 3c7cfde231ab360c32ddb649eb234f9529407e81..7a1eddfa86907b5af1bd2d3d419d458582f94f4c 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "notmuch-0.17"; + name = "notmuch-0.18.1"; src = fetchurl { url = "http://notmuchmail.org/releases/${name}.tar.gz"; - sha256 = "15dypk2damyvxgfc8dy6iiky1ayxnj5samd4v300pi9nwpky05fj"; + sha256 = "1pdp9l7yv71d3fjb30qyccva8h03hvg88q4a00yi50v2j70kvmgj"; }; buildInputs = [ bash emacs gdb glib gmime gnupg pkgconfig talloc xapian ]; diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix index 13facc90690134b899f08cbd7e7a5a3663a0edf5..15acd5af8dfd4633e6c8f43682da0e84b687e001 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix @@ -38,118 +38,118 @@ }: let - version = "24.6.0"; + version = "31.0"; sources = [ - { locale = "id"; arch = "linux-i686"; sha256 = "e19f6f5b8f19178350ec68386afd2ab7e5900b8c1fdb7bf81928fedcfcea5cbe"; } - { locale = "id"; arch = "linux-x86_64"; sha256 = "ece7445451150b2776f5debc818e288b9037dac1f2da9c7f7db584b6d2b73d34"; } - { locale = "he"; arch = "linux-i686"; sha256 = "0ff30ffc7ffe087056b0e72d66d2bc264c1060e3abb65e0c4d53d976855f436f"; } - { locale = "he"; arch = "linux-x86_64"; sha256 = "dd41d433644f7790ace1f246ec6703c060456260716710fc4318ca834ecd758b"; } - { locale = "el"; arch = "linux-i686"; sha256 = "eb6d53c00a6cd912279b56c5322d65b94fdd2a021c9ea2c854f664e476ae89e2"; } - { locale = "el"; arch = "linux-x86_64"; sha256 = "b0fdf2dc2de7ba5296f69694908aef4954b24b4c3092bddbec8995bf838bb817"; } - { locale = "tr"; arch = "linux-i686"; sha256 = "71f4f7738540445dc64399368bb63bf48ede79f055d6647ba9ed4d274040d623"; } - { locale = "tr"; arch = "linux-x86_64"; sha256 = "2be714b598bf8f1a3c6c9a13141d370c4d29bfec3e4053eb6f1c8a6a7988a96b"; } - { locale = "ast"; arch = "linux-i686"; sha256 = "8b2c3b83f4f88e33ac31b07dfb64e83fd1b2cce9ad877c8bb5715a0e6299ce6f"; } - { locale = "ast"; arch = "linux-x86_64"; sha256 = "93cd2c5c6c2ac05af3bb55a723bf3f02234d55064b5ea7cba6289bd07cca7647"; } - { locale = "nl"; arch = "linux-i686"; sha256 = "2f11b85055fa21b4e2677b92fef34a769ed56bdbd877fefb86599edb5dd39932"; } - { locale = "nl"; arch = "linux-x86_64"; sha256 = "d47057633c0ec5e785a723c45c5b8b0168e3d3fabe4aaedb4ca1adbff29a4dcd"; } - { locale = "bn-BD"; arch = "linux-i686"; sha256 = "902274548b7308e75c465f71912a7d1e5539e92420ffa17c80a2ac20d02d8630"; } - { locale = "bn-BD"; arch = "linux-x86_64"; sha256 = "044494d6bfc07b9cbeaa325dab3c1f0c5e554a05f1a050d960c39fbe093d9482"; } - { locale = "eu"; arch = "linux-i686"; sha256 = "e453a06a64c35ed81e661c67fbd4241a7c5494b1f3d2bf5ace7543798feb338c"; } - { locale = "eu"; arch = "linux-x86_64"; sha256 = "e8006f0e89153424c809de41ec1a714b91011b5a2a9601c1893a6ff30dcbd2ac"; } - { locale = "fr"; arch = "linux-i686"; sha256 = "fed414783f8e9bba5be6d4cb90ef04f274aabab34f3b4351a329d5c5ae7ae8f0"; } - { locale = "fr"; arch = "linux-x86_64"; sha256 = "e8f0203bf90bc30c89380c417921139f7b92ef1d38b3d95d292acee3be4e93c3"; } - { locale = "br"; arch = "linux-i686"; sha256 = "0948d002df401b9aaedbf8e3277ce312edeb635baa57b1bdf5de87cc13dd36cb"; } - { locale = "br"; arch = "linux-x86_64"; sha256 = "733e09671f00c693e13a726fa597b4705822e693ddce8a0494c57fde1de3cb56"; } - { locale = "pa-IN"; arch = "linux-i686"; sha256 = "c160c17e4b9b0e3d579a01b5973d142c711d4f87b03fd542d073d816ced9a9c9"; } - { locale = "pa-IN"; arch = "linux-x86_64"; sha256 = "0c281e6430a233aca5c6130e907e08c7d05aed8851214063546aff5a5df82232"; } - { locale = "gd"; arch = "linux-i686"; sha256 = "5d85eb78f01e1d52e733d4abf8d33281ec2c4adf9a9c65f50c6d6e2b6acf3d1d"; } - { locale = "gd"; arch = "linux-x86_64"; sha256 = "a7bb71bb08ccfc01f8e91b47b6ee0ac4592976e964454304da493e0582d262d1"; } - { locale = "bg"; arch = "linux-i686"; sha256 = "a63e060eac9efb27b4166e05ff6a035afd51cd29d45ddf69e5226e08441ac53c"; } - { locale = "bg"; arch = "linux-x86_64"; sha256 = "8a5f45352e180e984c7f1bc37f0e7602cbc6085a3dcdcac2d74f493941fd9f0e"; } - { locale = "sv-SE"; arch = "linux-i686"; sha256 = "ef70e1ff3ff3ce2fd9ecbe62ed010c06e63b410b843cdc3aa3c93fda2bf56708"; } - { locale = "sv-SE"; arch = "linux-x86_64"; sha256 = "af33cba52556057abf17df0e92c11ecbf39382bbf92c66b137113e5503ae170b"; } - { locale = "ja"; arch = "linux-i686"; sha256 = "f87eac6641ebccf018c76275adcba03976b9c62b9fa51533ec67ab0d2a5a91b9"; } - { locale = "ja"; arch = "linux-x86_64"; sha256 = "009b53f10bd785a799026dab028fbb7fa46c154569eba98db2673af12f6c19c4"; } - { locale = "pt-BR"; arch = "linux-i686"; sha256 = "ae2243346546cc2c768a9c24fc296013a45459637ab65477537f9d08d5ae193c"; } - { locale = "pt-BR"; arch = "linux-x86_64"; sha256 = "5cb2af1ec854e12b91bdf7f2fe88b56bfb45bf7144cf5cc3f0e307259d767a43"; } - { locale = "is"; arch = "linux-i686"; sha256 = "bf3a2e4efd86b1e73ac38ef3dc880ce2cee3102d2844b17ebf31aa6528040a92"; } - { locale = "is"; arch = "linux-x86_64"; sha256 = "d36f8d321d2952310dcb19a288f36f6496ca24e7f49fb483882c270c1c96571d"; } - { locale = "es-AR"; arch = "linux-i686"; sha256 = "e05f63d1f978029169a91719551b6e399be0e0d37310921168904d188e41f50d"; } - { locale = "es-AR"; arch = "linux-x86_64"; sha256 = "b8025a7a724a0d98c4f706e7ce59aae8c0f7bcd0082733ce6bee73a1d243feef"; } - { locale = "nn-NO"; arch = "linux-i686"; sha256 = "26ded9a3ebea58bcf80ca47759d4fdb86fe91aea8dcf56afdbaf7a32d548ee66"; } - { locale = "nn-NO"; arch = "linux-x86_64"; sha256 = "fd8321d5d6adaae042651d911df6ef587afda19ee82bdcfce98814144282b54d"; } - { locale = "sr"; arch = "linux-i686"; sha256 = "94b94517072901f34ab28b6cf3a2fd8852867f147ab4b47f34f7d9ae16fbd603"; } - { locale = "sr"; arch = "linux-x86_64"; sha256 = "e38f493ea1b8c0b183bad2f2627eb166e75e875a62b33704f50f8f831fd552ec"; } - { locale = "si"; arch = "linux-i686"; sha256 = "319ae8256ecf3d7623195e474040fffffff230cd612571872a38b52b608c0507"; } - { locale = "si"; arch = "linux-x86_64"; sha256 = "f776b8a9efad41f5c2f8770452a0bd053a3ba9ed4b74da3e3f24214c69e9779e"; } - { locale = "ro"; arch = "linux-i686"; sha256 = "f6aea954d3ba2334411a7ce9e7e1da926b0039935c5db3a5480f0fbda583b849"; } - { locale = "ro"; arch = "linux-x86_64"; sha256 = "9fef811764441b2b16e408808f4608e17cd21175cf45774162b3bce8b8612491"; } - { locale = "it"; arch = "linux-i686"; sha256 = "71df4de89a1eff632339dbaf48ce41182f7a20f7e55a223f6816ef86d3465443"; } - { locale = "it"; arch = "linux-x86_64"; sha256 = "076332c97a5c854b2313bd9f2138a6660d8e04fbddc3f8beb89acf071efd4c86"; } - { locale = "pl"; arch = "linux-i686"; sha256 = "1a45f7d1d8817f6c724dff556886edc3f2d0ee62ff45bea8d6b7ef63f7f92928"; } - { locale = "pl"; arch = "linux-x86_64"; sha256 = "8aa25320126052c9ebc3496e8731224e30fbd45ee2679f4d87f7f2050a01c312"; } - { locale = "sk"; arch = "linux-i686"; sha256 = "83a31a94eeb95e28612eeb1e696ed387b6793da350efda439de11833e0ea1173"; } - { locale = "sk"; arch = "linux-x86_64"; sha256 = "8c1647f8bfb210f7da8aa164777ef412bf3d4459ce53c95ee2211b4b5df440dc"; } - { locale = "vi"; arch = "linux-i686"; sha256 = "e5bb99de119fd6496674fb9cc8432f146e684afc652dec2861108d1ef20b49d7"; } - { locale = "vi"; arch = "linux-x86_64"; sha256 = "f35e62031154a32da68ea3d6960da8807f0de7ade7071526fafd6ace48c88976"; } - { locale = "rm"; arch = "linux-i686"; sha256 = "0826595dddc981b64d4f1a59cd71411c34ccd0aeac182925709abeedff8461fc"; } - { locale = "rm"; arch = "linux-x86_64"; sha256 = "b5b8d30251fc482861518e1c86001aa5eca6b53a65e14a8c6ff9e61eaf651044"; } - { locale = "ar"; arch = "linux-i686"; sha256 = "a9b2138cacc983142353ec09a5c4226fc731501da4c0200cc86026e6b28ca10c"; } - { locale = "ar"; arch = "linux-x86_64"; sha256 = "6c9a2ce8a8d3b4815475827caf89a3fee8371c422aa6c4984bb03f56728b682c"; } - { locale = "es-ES"; arch = "linux-i686"; sha256 = "813260cf5ab06e55c563e015e0172ce0192ccdd894a352ef6d4f439252032619"; } - { locale = "es-ES"; arch = "linux-x86_64"; sha256 = "c879fe62db6952f91c51ec7c172bc67d5351f55e99ab6df5cdd8639206f3444a"; } - { locale = "fi"; arch = "linux-i686"; sha256 = "33888c19b7e5e57155748d7372ad2b0e61f522ee96913f8846c754c3361fcb4a"; } - { locale = "fi"; arch = "linux-x86_64"; sha256 = "d5487588cf07cbd2b02b1c566b6515d087cf8fe9d528890b1dd5a0de53ab1d8c"; } - { locale = "hu"; arch = "linux-i686"; sha256 = "72b3a36269de70bd627589bad817e7702a4c83fff9b460e4f787486fa4bf15c7"; } - { locale = "hu"; arch = "linux-x86_64"; sha256 = "d458ed4b62f65ce7c3787930549cbee42842ae87a846e5d1565c1881b3bc17e8"; } - { locale = "zh-CN"; arch = "linux-i686"; sha256 = "3155a71e847020b2806f6b31acbaa702ccf20f8bd805c2aedb0c9c415f75b88f"; } - { locale = "zh-CN"; arch = "linux-x86_64"; sha256 = "b56beb864d247685cd9ba6820e5a8a143be28ff95440e38670c8963d2c769738"; } - { locale = "uk"; arch = "linux-i686"; sha256 = "74b7059580a4f389278b1059d80308101ffcfd0a738c6d614e56560ce116db34"; } - { locale = "uk"; arch = "linux-x86_64"; sha256 = "a351421c230f6629de0125a30767ff10d541264f6249f6fa2568eae76189398f"; } - { locale = "ko"; arch = "linux-i686"; sha256 = "d26ba336a555276c36f9a003df9bc3e0df1c40dd4da7062d1cd8b3a6cba6d52c"; } - { locale = "ko"; arch = "linux-x86_64"; sha256 = "078e5878f823b2d19568af8bda095e6ab46097a680b209bae9242d7658377abf"; } - { locale = "cs"; arch = "linux-i686"; sha256 = "c9aaab25dabdba0708459a82882b926155b475314d72463633af10c27d9e5dfb"; } - { locale = "cs"; arch = "linux-x86_64"; sha256 = "9a9fc61875f0427c26107b96ee3a6f7d71717c0d4aa6e41cc7b1b56bff2131e7"; } - { locale = "be"; arch = "linux-i686"; sha256 = "afc862a2a1054f08cffa0ec4facb2e9098fb042f7e4dab85c2ace7f30a384426"; } - { locale = "be"; arch = "linux-x86_64"; sha256 = "50353005857df556840fab0b18e8784dc18cbcdc5c45f4fc1f68f6b78b58048c"; } - { locale = "ru"; arch = "linux-i686"; sha256 = "4876fcda18fd01b51f392a56085ebfcb97cefd69355666f42d58ffe53b9eb8e9"; } - { locale = "ru"; arch = "linux-x86_64"; sha256 = "ef90a31aa408c6c86f3103d7bc82e3e8b5ac7bc9956d431ef46e1f44156b7dbf"; } - { locale = "ta-LK"; arch = "linux-i686"; sha256 = "ee4a961e76e63a79d08118e2355e37b1b2a1e0260613532ac6dc7c9a9e86caf1"; } - { locale = "ta-LK"; arch = "linux-x86_64"; sha256 = "9a1233c0ee7a72f8b1c071a6cd507d870d34bd64c71f7f960c00cf2e840ea5b1"; } - { locale = "zh-TW"; arch = "linux-i686"; sha256 = "00bf471763ca98d7c7e0243f5bbc75230b6cf8cea9c5dab17464c47544d102de"; } - { locale = "zh-TW"; arch = "linux-x86_64"; sha256 = "61e474bd0c930b9d6bcc553a87c07e415e1fe037dd033a6a97f9137d4fc73f49"; } - { locale = "de"; arch = "linux-i686"; sha256 = "e93520901aa59938e1c51c9943225dded88c668a91da6660de9f41714114ac8b"; } - { locale = "de"; arch = "linux-x86_64"; sha256 = "008156ddb73f4eb91d801d8bc35685e517328b5e5f13a4ed39873df471d01c67"; } - { locale = "nb-NO"; arch = "linux-i686"; sha256 = "20b3b10e12238238737fa0da3dce5e2fdff1161594b415c5872dd7416001482b"; } - { locale = "nb-NO"; arch = "linux-x86_64"; sha256 = "79f854469ac1a6fb0768934dc20ebc511a01904c71f321ed31ebe400ab88f4d8"; } - { locale = "fy-NL"; arch = "linux-i686"; sha256 = "61cec7fef6e75ecd7d459e973b258c5b62af0dbfd175b7000484594e63ead2e4"; } - { locale = "fy-NL"; arch = "linux-x86_64"; sha256 = "83b3761bfd949e3890c7006ba9610e858fab25815cd6e2f3f293ca707086a78c"; } - { locale = "sq"; arch = "linux-i686"; sha256 = "f36321189ed80130b9e4a3a6e387531c48745f4c109f35afe928cf2d44e1b424"; } - { locale = "sq"; arch = "linux-x86_64"; sha256 = "81da71b2ce832788213ed60f801fd79e61205a98c44e9082a35f2195af314de8"; } - { locale = "ga-IE"; arch = "linux-i686"; sha256 = "b759d93d78964eb8b9ce5aaad37d652fa425cfb5d6049f58a31c2492e3aa475d"; } - { locale = "ga-IE"; arch = "linux-x86_64"; sha256 = "62b32a8a4e7455c42bbf8cc5029919a64ca2ff61e06f535dd628a8dd612a15d9"; } - { locale = "da"; arch = "linux-i686"; sha256 = "4ad6ede882e973b37627105812619d2e8c804d50d496d96f68554bf75ca093fe"; } - { locale = "da"; arch = "linux-x86_64"; sha256 = "9fd6ce0edef1a8c8eb7d811afa39600a2c946f9ed87610a9e98a971d4cf31b08"; } - { locale = "hr"; arch = "linux-i686"; sha256 = "35254ef736865d1a7c368e62c9cba68fa64b7f017aca4d9569aeb18b5f559717"; } - { locale = "hr"; arch = "linux-x86_64"; sha256 = "6ff8a5b4ebfb9217b37afdfc4d5cab01f1ce66387010d2105a51bed486eea52c"; } - { locale = "ca"; arch = "linux-i686"; sha256 = "eb4af3ff107f6827d0288bd68486b8eef174c5dc6e9b5313099d99b2e695db0d"; } - { locale = "ca"; arch = "linux-x86_64"; sha256 = "80a6bf800a53af0cc9445c632546ce7cefcf5bd819e6e5e35e662330d58d757c"; } - { locale = "en-US"; arch = "linux-i686"; sha256 = "ba35f578095f79582341e988ce7c5e07f489833f7a309756c80caf4f56367987"; } - { locale = "en-US"; arch = "linux-x86_64"; sha256 = "09c193e865e90b6d2c547c17d10add7d43e8b89b630a8a490323d4ed391c924d"; } - { locale = "pt-PT"; arch = "linux-i686"; sha256 = "57610296c564291a8432fdb9215bcfbab6f09792c47e5606c1619bb203c7f5de"; } - { locale = "pt-PT"; arch = "linux-x86_64"; sha256 = "c702acf69957ffd1c4774f42d4f28dc239a4c5bcf6e003c236952167bf9e7e9f"; } - { locale = "gl"; arch = "linux-i686"; sha256 = "56ae2d38af2988791163e6b118c781d55e2c545097aa5afccc72998705312888"; } - { locale = "gl"; arch = "linux-x86_64"; sha256 = "c5386f149831aa2f48b65391f31f8f2e0a9c3b7a8bcaae67420a5819e80315ec"; } - { locale = "lt"; arch = "linux-i686"; sha256 = "8409401c0b87be071d081c03eb34e3338cb62e80669045f5d268f8da60d96bce"; } - { locale = "lt"; arch = "linux-x86_64"; sha256 = "4f93e9b0688e30586b3d372944ae5579f7249220733d6045e6bca3830e7f121a"; } - { locale = "en-GB"; arch = "linux-i686"; sha256 = "ae1608b9e15862f82d15c5acbcd9f65775efc4368588bc685ebff523ff93e2d6"; } - { locale = "en-GB"; arch = "linux-x86_64"; sha256 = "2466f020209de610f429315e0b090b43cf42c9ce540c6bc51e7ad11f5a3449f5"; } - { locale = "sl"; arch = "linux-i686"; sha256 = "76cbcf31388cbe72ebbf3fa3be66a0cfe20cd572febf062f3a58a9c50313aa03"; } - { locale = "sl"; arch = "linux-x86_64"; sha256 = "e4aa9dd8bb21f3d79ce5f9cfc907fc8a355fef349dcdec30403d534bf3cfbdf6"; } - { locale = "et"; arch = "linux-i686"; sha256 = "06561fa96d5166bfbe8eb492ebc08b3d2a768a8a7a251b357dec89ad33f3825e"; } - { locale = "et"; arch = "linux-x86_64"; sha256 = "85e663261cc6722c25dd36e1c0a15b7a82a3a6aaca54191effe8ea09ccb8c43e"; } - { locale = "hy-AM"; arch = "linux-i686"; sha256 = "d80f116d39e48b42a767fbda5b6e765be4bc3d210cf95d80bb014606785be3e6"; } - { locale = "hy-AM"; arch = "linux-x86_64"; sha256 = "c2e124736d63581a3034e60fe3d40bfef9458a712853ab5c8c5d391a9d3af6a9"; } + { locale = "nn-NO"; arch = "linux-i686"; sha256 = "a1e9954236de1d0581342fbb894b721528bc51a208d3bbedd4d8defbcc1cb50f"; } + { locale = "nn-NO"; arch = "linux-x86_64"; sha256 = "0fe9c22ad8cf575813ae8e476d985a3b951174df5beda67fd98e261f831252aa"; } + { locale = "lt"; arch = "linux-i686"; sha256 = "35fb5c44bc3ed25beec4f6172c44f75426579f27bd2302361870615bb1f62194"; } + { locale = "lt"; arch = "linux-x86_64"; sha256 = "3b04ffd5e1640c0138e5dab63a1059bd0342fff9f44547c6b34fbe6da810f911"; } + { locale = "ta-LK"; arch = "linux-i686"; sha256 = "2e8a1b96820216fda11c234d80a74d7326b49d7ac3f595f646aa10dccde61940"; } + { locale = "ta-LK"; arch = "linux-x86_64"; sha256 = "006f25951b4ac90b8d8d32491d260900dfcfb24c10cd4a10dbadf3840b4bcd4e"; } + { locale = "bn-BD"; arch = "linux-i686"; sha256 = "839e95de15a4e0287cfe36d70e07d1d40a1708016f615244a84553794ac76b4c"; } + { locale = "bn-BD"; arch = "linux-x86_64"; sha256 = "592a353df70c368c3c9855ead6d3b68433e7ebaaf42169108b9e74a83517230b"; } + { locale = "de"; arch = "linux-i686"; sha256 = "890bc1ee046ebf67079bd39ecb761a78fbf8cee8f72b32958ad18a0c3184b23b"; } + { locale = "de"; arch = "linux-x86_64"; sha256 = "7b52dfc2cea5bedae2ccfe11b0ec2d66edb81b76c2272c60f4bb247970384c9f"; } + { locale = "rm"; arch = "linux-i686"; sha256 = "6ab1e46650ff296719e498a1b9e5dad5c2f32e6be9d6fec12d1ab917a5f76872"; } + { locale = "rm"; arch = "linux-x86_64"; sha256 = "fdb170e3f546de759ef8a8aa85f6c3bf5152e121739cc27797c3065f4f85c183"; } + { locale = "nl"; arch = "linux-i686"; sha256 = "208be79ce95d45f4f69d8bf53d4e2f457410653a81117b4bd4d42bf14a1485dc"; } + { locale = "nl"; arch = "linux-x86_64"; sha256 = "2e562f9f59457d484ccfb1beb0129e2ca3ba4e5cbf5c955a65480836dc2e6567"; } + { locale = "sv-SE"; arch = "linux-i686"; sha256 = "07c7836bac31fa835c244dbe5eff19bad5dc5a9339cb8a94bd07d88f8590c867"; } + { locale = "sv-SE"; arch = "linux-x86_64"; sha256 = "7124de1e3cff7a5c17506f8e175aab1aaf96d4c9fd57824d6c0af110f47b1fbc"; } + { locale = "fy-NL"; arch = "linux-i686"; sha256 = "5d4e7f1f82b53161e84abf45f4a7210f0304399efed2df621c2e24cd5f1e1db0"; } + { locale = "fy-NL"; arch = "linux-x86_64"; sha256 = "814798f7dd066228ae73ce6bfdf430db4f0c4e905ce8a6670c73f894865dbf4e"; } + { locale = "si"; arch = "linux-i686"; sha256 = "35727d874cdeca69e18cedc109b6c3540c8dbb7450b2158cb1209cf00272cc38"; } + { locale = "si"; arch = "linux-x86_64"; sha256 = "0aa2232adc0e06c0a841a11155c2cd8f317b2f12b0e02c239ebe6150ad3bc278"; } + { locale = "vi"; arch = "linux-i686"; sha256 = "b45871e531b18a35f60240dc0417e5a9f08f8c9e3ea762a36e938425505df8b0"; } + { locale = "vi"; arch = "linux-x86_64"; sha256 = "a32dd96a41ed33a81c240c60c3538db45c1c4357ceaf37c8482a378a526c5454"; } + { locale = "br"; arch = "linux-i686"; sha256 = "3162753876da622895175afb60cd89be1ee343a10a45f9ac3feb3b306e161838"; } + { locale = "br"; arch = "linux-x86_64"; sha256 = "7c8d26a07d239f18f94f14696036974317ac1186072ba4482c315d02dcb97e5f"; } + { locale = "da"; arch = "linux-i686"; sha256 = "8cfaf98f3702b418bfd7692373b9f6e99a4b06e47a75a2df602e98d8f6acf761"; } + { locale = "da"; arch = "linux-x86_64"; sha256 = "6bd9ab36402f3391abc2e96f8786e16407736cf04d524e562736ac47279e2a26"; } + { locale = "fi"; arch = "linux-i686"; sha256 = "0a3e7c130197d4abcbf4d37eef51a946c11cf72707686f8c7a0caa9cc21e75c8"; } + { locale = "fi"; arch = "linux-x86_64"; sha256 = "8d4003960a8a7a496662b59834118c8712443761b867e5f54f3bf4a683715d22"; } + { locale = "he"; arch = "linux-i686"; sha256 = "5db77f9d117071feeddb5eadf74ea6332ccf9abaa441ba4d7b0a5f0f3781452d"; } + { locale = "he"; arch = "linux-x86_64"; sha256 = "46995a9f269f0385fc9ac9d31ee65d84e79ac81bd61892adaeb1afff991bcc82"; } + { locale = "zh-CN"; arch = "linux-i686"; sha256 = "73071beb9caa24aaac8eec9cfb01f7e333dc6ac438ab36e7f5afa7d850dbeb8e"; } + { locale = "zh-CN"; arch = "linux-x86_64"; sha256 = "a17cc26a51bbcff44837d74bdb35ba0ae10def6f4b536c4a67e9169221bd0afb"; } + { locale = "gl"; arch = "linux-i686"; sha256 = "4782b1f56c1f5fb1f802385d693a96b5013503e97e4d73e43fb90c3331aec839"; } + { locale = "gl"; arch = "linux-x86_64"; sha256 = "dbba59d0c697e6dc05bc2b554eed2c6040642cb1246a4119cd7c37b0451c6d4e"; } + { locale = "sl"; arch = "linux-i686"; sha256 = "b37a5eaf187d1c026990f55a3e993594a49bb689f1643d2f944c7f3c7cfd6819"; } + { locale = "sl"; arch = "linux-x86_64"; sha256 = "629132c5cc5f937fb504542662bb8aa7570eee1ae648087dbfb0c6dedadfa53c"; } + { locale = "cs"; arch = "linux-i686"; sha256 = "89e818736957569f91f7f329118b09a27b072c6d7c89f601eb02cd1d870c4088"; } + { locale = "cs"; arch = "linux-x86_64"; sha256 = "6a3a358227972a0eb60b1b531f322ebb2e604805bfb50b55d88cb8447b443105"; } + { locale = "ca"; arch = "linux-i686"; sha256 = "794b1e0be4bd6f8facebe3aa44f66a139a660d4fe75891f463adb5d7da7b32cb"; } + { locale = "ca"; arch = "linux-x86_64"; sha256 = "81b51a607844b229d026d9acec4ea1739c365a890857871260b6eca92a176e04"; } + { locale = "ar"; arch = "linux-i686"; sha256 = "924c5c47c76fc09f5a46176ef1a6e3466d783b8a4c08a5e660a03e0e84459116"; } + { locale = "ar"; arch = "linux-x86_64"; sha256 = "c46c2285a6f1c825e52ea6cd7dda31d6f67be15668ecf71883c55c9fa21a3fd5"; } + { locale = "tr"; arch = "linux-i686"; sha256 = "58a53bf3ad217b36beb9795f34349cfa3f10b7a39044f024c547be31b033ee28"; } + { locale = "tr"; arch = "linux-x86_64"; sha256 = "21d1f89810a284818c0a73e8abd5b51a9ea58b7db2b9bf6dd5e0119f4bfc13a3"; } + { locale = "ru"; arch = "linux-i686"; sha256 = "67cb3d38230d24c2a7615468ae2465e6f768904e3735ce31833dcba7b98023c5"; } + { locale = "ru"; arch = "linux-x86_64"; sha256 = "9e6b5351e96b9b2c57ce04fddaf9656adf84bc2a961a8ca614cec2f830d4e2a7"; } + { locale = "uk"; arch = "linux-i686"; sha256 = "80d0a09d93362f7eff9c7a20025080207a14c43e56b132c3962dd1d795d2a85c"; } + { locale = "uk"; arch = "linux-x86_64"; sha256 = "07d92405612e1000bc0b401481e94548877511ce224f19b23aa4fa192f21d489"; } + { locale = "fr"; arch = "linux-i686"; sha256 = "0d70e52c8dc5bf6f13c8ea2a5762cb94534ec54548c792ae181febc3d23c01cb"; } + { locale = "fr"; arch = "linux-x86_64"; sha256 = "2962de1886753b81684360ffbf97afa4d4371662a6f467ebc369e225d335745d"; } + { locale = "hr"; arch = "linux-i686"; sha256 = "6eacb202078be4de4a86c3fc957dbf482e32ab28805d719aa5d0d7f4fd832f48"; } + { locale = "hr"; arch = "linux-x86_64"; sha256 = "83ed10b7d9d74a28f9982a9d11840522f214ccb53ed599f9fce6ae26bd9d2298"; } + { locale = "el"; arch = "linux-i686"; sha256 = "227140594d1e12f2edf4e942327a8c64ab922796f7bda324eead8a299a6082ab"; } + { locale = "el"; arch = "linux-x86_64"; sha256 = "bc219c6795389fbdf20c4a84a61c350f376374285eff9aaedbc4893fdcbbdc24"; } + { locale = "et"; arch = "linux-i686"; sha256 = "4ac7de0edc1d2b084f38058f8c55e8c2fad0782a1f7f7ac69af5c6f28e2a71f9"; } + { locale = "et"; arch = "linux-x86_64"; sha256 = "cf026ebca03f6eb59b81073f754b9989f2023bb61d8dfaacbb28da3372abf43b"; } + { locale = "it"; arch = "linux-i686"; sha256 = "001f67664b02736aa757fa99ec00c8df023ead8f94113d1040092057031c4557"; } + { locale = "it"; arch = "linux-x86_64"; sha256 = "39fdd81738e0cea77c0f860f0e5253416daa6bd13f1e9feab4c6a52c6dd981f9"; } + { locale = "ja"; arch = "linux-i686"; sha256 = "0a5a830078e0774e81154f07055613d4b6dd6875be4ac976ac70883cfa0ed9cc"; } + { locale = "ja"; arch = "linux-x86_64"; sha256 = "a33890be6ac154862b7b80f864990b3bbad2db8adbf1d26bf2cd61b175db673e"; } + { locale = "bg"; arch = "linux-i686"; sha256 = "6f837f1c640c46dd99c4ab691ec6964e40b6d931830d4da604d4329c6d1ecde2"; } + { locale = "bg"; arch = "linux-x86_64"; sha256 = "a37294fbf0b358e5b9619aa36a20f92fc637a6b0697b8d607b958d256ce81225"; } + { locale = "nb-NO"; arch = "linux-i686"; sha256 = "2bbb5800b9a6d03545ca3dfc8f99f9f30c11e474ea360481f1f7e9610b0a87b0"; } + { locale = "nb-NO"; arch = "linux-x86_64"; sha256 = "e2a68f359f48a19437605b581bf9a8cf911feabfb2b15ec3724c60d1cbfe15ec"; } + { locale = "es-ES"; arch = "linux-i686"; sha256 = "976fbb88b1c75dc402b9eea76aef4d8a0886ee76bcf65d798a6ae8234b2b297a"; } + { locale = "es-ES"; arch = "linux-x86_64"; sha256 = "190679f7638b3697b236d971014f0da938aa2d664afb93e7f4d1c0fb51bfb46e"; } + { locale = "ro"; arch = "linux-i686"; sha256 = "530b19e48b0e49047746b2f5dd486cfb19930b1064478c465ce2acb21eac66ba"; } + { locale = "ro"; arch = "linux-x86_64"; sha256 = "0fe30abe10b4c97aef9ee40550205e0f269c5cfe76c08a36c8cf886a5af78558"; } + { locale = "en-GB"; arch = "linux-i686"; sha256 = "3f2d2784e3aa75cbd3ca0579d660b50b31e488253e52fedbfefc7c5448803967"; } + { locale = "en-GB"; arch = "linux-x86_64"; sha256 = "83e64293ed8d1ecf509e2617a71fed9583e4d4c3de3ae5b50175ad8c0f8322ae"; } + { locale = "gd"; arch = "linux-i686"; sha256 = "aa282b17eeeb185734f33d2ed9f287958d8a48ed82653d197426e3e3091ecba3"; } + { locale = "gd"; arch = "linux-x86_64"; sha256 = "c17db84f0cfd5525e4b8a08e300cabbbcd2bc45f59eb886e180eef0f8c4e45ef"; } + { locale = "be"; arch = "linux-i686"; sha256 = "909ae64789280db1a07b3b57dfa1a5d337fecd3bd59bacd3bab2eb72dbecb04f"; } + { locale = "be"; arch = "linux-x86_64"; sha256 = "9021a15bda3d4947e1ed6ee6666a252e3541b020d8d7eb58e854e426719f8d6d"; } + { locale = "pl"; arch = "linux-i686"; sha256 = "a3536d7e8bb429d562e7731fea8675dc9d442ca8e59cc72eb1b404da12d1d53a"; } + { locale = "pl"; arch = "linux-x86_64"; sha256 = "99cb049415e4837e615e1946409d1fd62966ae8eb843d89dfb61a6675b5b363f"; } + { locale = "pa-IN"; arch = "linux-i686"; sha256 = "06a17ca2ee8f44098252f24dae17589f32c80bd35e127a093c18161751a581fc"; } + { locale = "pa-IN"; arch = "linux-x86_64"; sha256 = "b8537b39f3e1242e3ed705ff919b01eb89ac72cf7c15ef0c44d258069c8ea317"; } + { locale = "ko"; arch = "linux-i686"; sha256 = "f2f1e9babb37f79121034f9b8cbc90fbf9f0fa1c152a7f0d7162aff6f6e33f1a"; } + { locale = "ko"; arch = "linux-x86_64"; sha256 = "60bc6bd468c820066e00f8108e0912df57a941b4150c06797a7958ec684c4969"; } + { locale = "sq"; arch = "linux-i686"; sha256 = "a88591a1850b56c68dd75b4ecff79a32d46dcb42f788d66bb46d45cd0f0d5672"; } + { locale = "sq"; arch = "linux-x86_64"; sha256 = "2bb7656dde363f3c3d3c8c8b4dbdb306f7e618491c917bc7c1b6e6f41d30fbf0"; } + { locale = "id"; arch = "linux-i686"; sha256 = "b396c752f7652e5ee31d6bec4bfb70b2d86438d966051f91e4d7a77ce5a924dc"; } + { locale = "id"; arch = "linux-x86_64"; sha256 = "1f0595e6953b0b6aa09577f180897760f8f85ba15e00e6ae3b12105c705cdac4"; } + { locale = "sk"; arch = "linux-i686"; sha256 = "4d3a4d283705889759dcb321e4b700896b132634005590e546bf6744e6187260"; } + { locale = "sk"; arch = "linux-x86_64"; sha256 = "456252e7bb5f29ef3c76afb2df0f406fcf93ef1c6df56d0f209bb85e91c8acce"; } + { locale = "en-US"; arch = "linux-i686"; sha256 = "ee93df33057576bd55bc80b71aeec7c6f487028f0fe52f679614811be5c71bae"; } + { locale = "en-US"; arch = "linux-x86_64"; sha256 = "7f7189250d76f970bfc1879b2ac6fe2d42bdcf3a652614fa4e080dcc636bbd4c"; } + { locale = "sr"; arch = "linux-i686"; sha256 = "cb389bd9712def87c06ffab3fc50b8fa58c773c6725fd0e0befec3e2ac957ef5"; } + { locale = "sr"; arch = "linux-x86_64"; sha256 = "8f9bf916357e7385dec5de9e4d58f6dfbe3c7fc6d2b66298304c3630189833e6"; } + { locale = "zh-TW"; arch = "linux-i686"; sha256 = "f89251f74b85c22a9f7b97b844a118e498698e205f733f1fb0d7a98787f973ee"; } + { locale = "zh-TW"; arch = "linux-x86_64"; sha256 = "019a15e1e83b6810de6a4d64deb3eba1a9c2a0c6f1c382582e356445e40d5bda"; } + { locale = "es-AR"; arch = "linux-i686"; sha256 = "ae1d03ddf4b424edc59e08c65a9fb20107311289e4faf8f06f14bc471b00d35f"; } + { locale = "es-AR"; arch = "linux-x86_64"; sha256 = "a19dce910ba5be35c0fd51be50bd96be3b3db84587f749ed9a108a14a3b732b7"; } + { locale = "ast"; arch = "linux-i686"; sha256 = "8cb4cb6a99955209026224a4cbbcab7b37b0b9fc38147eeaa439631be7750c08"; } + { locale = "ast"; arch = "linux-x86_64"; sha256 = "4520a3ae24cc7056eb87d48280999c2c3da6aa76b9182c291512dc80363efb27"; } + { locale = "ga-IE"; arch = "linux-i686"; sha256 = "8803a9477f6ac963bdacfd82f6e6b8aabb217fa6c39b311645e461f38cda3757"; } + { locale = "ga-IE"; arch = "linux-x86_64"; sha256 = "c8eae521293986be6d626302d91abbb88a12855565fd41c3614f7a5d7534f0cd"; } + { locale = "pt-BR"; arch = "linux-i686"; sha256 = "9ea7f173533757c99a9c2dfdceab5cc58e583f929a2e7db95184823a00319a0a"; } + { locale = "pt-BR"; arch = "linux-x86_64"; sha256 = "6b9775f8142273d118870887da2728da4732609395897513739df7b352a4989c"; } + { locale = "is"; arch = "linux-i686"; sha256 = "bcaeea579405f015fcdb78e16cfd92e4c0895614c5966a1a7049a4fe310b1c46"; } + { locale = "is"; arch = "linux-x86_64"; sha256 = "7de3a89ece968819fcd7f438aaa2f5762f9d936b20fb3c364467ac123b24182e"; } + { locale = "eu"; arch = "linux-i686"; sha256 = "af7f04ef648264f56dcb62e7e473586f3c5b13d3ecd2918278962f335dda7966"; } + { locale = "eu"; arch = "linux-x86_64"; sha256 = "8477854792552b471e4eb11f71c79b14544cf438e795feae3082c0f3a31e0c8a"; } + { locale = "hu"; arch = "linux-i686"; sha256 = "21db7e27557670796db9282174e7da04afe3a0c89b31e042f7bbd3992e4e08be"; } + { locale = "hu"; arch = "linux-x86_64"; sha256 = "8f05b160d346b45308ba0c7dbe531bce043f22abffd2a4d1200628669a3b4aa0"; } + { locale = "hy-AM"; arch = "linux-i686"; sha256 = "5e77c23bdb52dba7b663b574520972e2b78588e5143922c1e1837c0e0bd71a86"; } + { locale = "hy-AM"; arch = "linux-x86_64"; sha256 = "35e663dad586cce929baa1ec501b149ff586df15a687eb41a8cc619c542a625c"; } + { locale = "pt-PT"; arch = "linux-i686"; sha256 = "211322939ab3b4bfc3e6f0548356c9479db5deb687e1e2232f527462017dcd2d"; } + { locale = "pt-PT"; arch = "linux-x86_64"; sha256 = "0d50802a6fd7d9256591076c267759d39af91f680025b03ec6925e21c20494e4"; } ]; arch = if stdenv.system == "i686-linux" diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 85dab3777ba9f53b0b07fd4bd3d2d655c8b2cb63..c0c11ff1f1c390d800fddf0f3cf232f6f41f580d 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -1,9 +1,10 @@ -{ stdenv, fetchurl, pkgconfig, gtk, perl, python, zip, unzip -, libIDL, dbus_glib, bzip2, alsaLib, nspr, yasm, mesa, nss -, libnotify, cairo, pixman, fontconfig -, libjpeg -, pythonPackages - +{ stdenv, fetchurl, pkgconfig, m4, gtk, pango, perl, python, zip, libIDL +, libjpeg, libpng, zlib, dbus, dbus_glib, bzip2, xlibs +, freetype, fontconfig, file, alsaLib, nspr, nss, libnotify +, yasm, mesa, sqlite, unzip, makeWrapper, pysqlite +, hunspell, libevent, libstartup_notification, libvpx +, cairo, gstreamer, gst_plugins_base, icu +, debugBuild ? false , # If you want the resulting program to call itself "Thunderbird" # instead of "Shredder", enable this option. However, those # binaries may not be distributed without permission from the @@ -12,59 +13,75 @@ enableOfficialBranding ? false }: -let version = "17.0.11"; in -let verName = "${version}esr"; in +let version = "31.0"; in +let verName = "${version}"; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "thunderbird-${verName}"; src = fetchurl { url = "ftp://ftp.mozilla.org/pub/thunderbird/releases/${verName}/source/thunderbird-${verName}.source.tar.bz2"; - sha256 = "1m2lph8x82kgxqzlyaxr1l1x7s4qnqfzfnqck4b777914mrv1mdp"; + sha1 = "0fe6666fddd4db82ec2e389f30c5ea11d4f72be5"; }; - #enableParallelBuilding = true; - - buildInputs = - [ pkgconfig perl python zip unzip bzip2 gtk dbus_glib alsaLib libIDL nspr - libnotify cairo pixman fontconfig yasm mesa nss - libjpeg pythonPackages.sqlite3 - ]; + buildInputs = # from firefox30Pkgs.xulrunner, but without gstreamer and libvpx + [ pkgconfig libpng gtk perl zip libIDL libjpeg zlib bzip2 + python dbus dbus_glib pango freetype fontconfig xlibs.libXi + xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file + alsaLib nspr nss libnotify xlibs.pixman yasm mesa + xlibs.libXScrnSaver xlibs.scrnsaverproto pysqlite + xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper + hunspell libevent libstartup_notification cairo icu + ] ++ [ m4 ]; - configureFlags = - [ "--enable-application=mail" - "--enable-optimize" - "--with-pthreads" - "--disable-debug" - "--enable-strip" - "--with-pthreads" + configureFlags = [ "--enable-application=mail" ] + # from firefox30Pkgs.commonConfigureFlags, but without gstreamer and libvpx + ++ [ "--with-system-jpeg" - #"--with-system-png" "--with-system-zlib" "--with-system-bz2" "--with-system-nspr" "--with-system-nss" - # Broken: https://bugzilla.mozilla.org/show_bug.cgi?id=722975 - #"--enable-system-cairo" + "--with-system-libevent" + #"--with-system-libvpx" + "--with-system-png" + "--with-system-icu" + "--enable-system-ffi" + "--enable-system-hunspell" + "--enable-system-pixman" + "--enable-system-sqlite" + "--enable-system-cairo" + "--disable-gstreamer" + "--enable-startup-notification" + # "--enable-content-sandbox" # available since 26.0, but not much info available + # "--enable-content-sandbox-reporter" # keeping disabled for now "--disable-crashreporter" - "--disable-necko-wifi" - "--disable-webm" "--disable-tests" - "--enable-calendar" - "--disable-ogg" + "--disable-necko-wifi" # maybe we want to enable this at some point + "--disable-installer" + "--disable-updater" + "--disable-pulseaudio" + ] ++ (if debugBuild then [ "--enable-debug" "--enable-profiling"] + else [ "--disable-debug" "--enable-release" + "--enable-optimize" "--enable-strip" ]) + ++ [ + "--disable-javaxpcom" + "--enable-stdcxx-compat" # Avoid dependency on libstdc++ 4.7 ] ++ stdenv.lib.optional enableOfficialBranding "--enable-official-branding"; - # The Thunderbird Makefiles refer to the variables LIBXUL_DIST, - # prefix, and PREFIX in some places where they are not set. In - # particular, there are some linker flags like - # `-rpath-link=$(LIBXUL_DIST)/bin'. Since this expands to - # `-rpath-link=/bin', the build fails due to the purity checks in - # the ld wrapper. So disable the purity check for now. - preBuild = "NIX_ENFORCE_PURITY=0"; + configurePhase = '' + patchShebangs . + + echo '${stdenv.lib.concatMapStrings (s : "ac_add_options ${s}\n") configureFlags}' > .mozconfig + echo "ac_add_options --prefix='$out'" >> .mozconfig + echo "mk_add_options MOZ_MAKE_FLAGS='-j$NIX_BUILD_CORES'" >> .mozconfig + + make ${makeFlags} configure + ''; - # This doesn't work: - #makeFlags = "LIBXUL_DIST=$(out) prefix=$(out) PREFIX=$(out)"; + makeFlags = "-f client.mk"; + buildFlags = "build"; postInstall = '' @@ -84,7 +101,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - description = "Mozilla Thunderbird, a full-featured email client"; + description = "A full-featured e-mail client"; homepage = http://www.mozilla.org/thunderbird/; license = # Official branding implies thunderbird name and logo cannot be reuse, diff --git a/pkgs/applications/networking/msmtp/default.nix b/pkgs/applications/networking/msmtp/default.nix index 584fdcd170a7e3d6cd97f94f93ecb3b5bf1d26c9..2b42a275d8c71f7ec7355b9a588692e6e5f425b2 100644 --- a/pkgs/applications/networking/msmtp/default.nix +++ b/pkgs/applications/networking/msmtp/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, openssl, pkgconfig, gnutls, gsasl, libidn }: stdenv.mkDerivation rec { - name = "msmtp-1.4.31"; + name = "msmtp-1.4.32"; src = fetchurl { url = "mirror://sourceforge/msmtp/${name}.tar.bz2"; - sha256 = "0pr29kb7qsz4q6yfw5wvmw1wm4axi8kc97qhhmp50bx2bylzjyi4"; + sha256 = "122z38pv4q03w3mbnhrhg4w85a51258sfdg2ips0b6cgwz3wbw1b"; }; buildInputs = [ openssl pkgconfig gnutls gsasl libidn ]; diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index b2b2e37fd663a7c3f83f81b77f1a468d13660a73..7b9396ff5ffbd614e96fedf61bdd9bab331f01a4 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, qt4, boost, protobuf, libsndfile , speex, libopus, avahi, pkgconfig , jackSupport ? false -, jackaudio ? null +, jack2 ? null , speechdSupport ? false , speechd ? null }: -assert jackSupport -> jackaudio != null; +assert jackSupport -> jack2 != null; assert speechdSupport -> speechd != null; let @@ -15,11 +15,11 @@ let in stdenv.mkDerivation rec { name = "mumble-" + version; - version = "1.2.6"; + version = "1.2.7"; src = fetchurl { url = "mirror://sourceforge/mumble/${name}.tar.gz"; - sha256 = "1zxnbwbd81p7lvscghlpkad8kynh9gbf1nhc092sp64pp37xwv47"; + sha256 = "0zjqkkdkcvgmqic6np87hj6b6f851lkzyd6y3cqj6zzacjvps31d"; }; patches = optional jackSupport ./mumble-jack-support.patch; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { buildInputs = [ qt4 boost protobuf libsndfile speex libopus avahi pkgconfig ] - ++ (optional jackSupport jackaudio) + ++ (optional jackSupport jack2) ++ (optional speechdSupport speechd); installPhase = '' diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix index caad542ebac4b1e925f1625f69a0ea35df352d4c..e38d5188dc2fb44a3f13b41c70ca05c400ecf733 100644 --- a/pkgs/applications/networking/newsreaders/liferea/default.nix +++ b/pkgs/applications/networking/newsreaders/liferea/default.nix @@ -6,14 +6,14 @@ }: let pname = "liferea"; - version = "1.10.9"; + version = "1.10.10"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${name}.tar.bz2"; - sha256 = "0s6rg30xwdxzh2r1n4m9ns4pbq0p428h4nh72bcrcf9m0mdcg0ai"; + sha256 = "0y01lhw0fn5m0j9ykz8x7i0wchjqbxp33cvvprsfxfwzz4x31jm4"; }; buildInputs = with gst_all_1; [ diff --git a/pkgs/applications/networking/p2p/freenet/default.nix b/pkgs/applications/networking/p2p/freenet/default.nix index 4c74c2c32de0a8444a94c83dd22aedde0038d528..4e7057116773f9a390ccfa4b568e038984854d2b 100644 --- a/pkgs/applications/networking/p2p/freenet/default.nix +++ b/pkgs/applications/networking/p2p/freenet/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { buildPhase = "ant package-only"; installPhase = '' - ensureDir $out/share/freenet $out/bin + mkdir -p $out/share/freenet $out/bin cp lib/bcprov.jar $out/share/freenet cp lib/freenet/freenet-ext.jar $out/share/freenet cp dist/freenet.jar $out/share/freenet @@ -50,7 +50,7 @@ stdenv.mkDerivation { meta = { description = "Decentralised and censorship-resistant network"; homepage = https://freenetproject.org/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/applications/networking/p2p/gnunet/default.nix b/pkgs/applications/networking/p2p/gnunet/default.nix index bcd0eb503f60b6973fd871529fec77278a1146f5..6c28840f7e5f206c8159269c869d703c1f040404 100644 --- a/pkgs/applications/networking/p2p/gnunet/default.nix +++ b/pkgs/applications/networking/p2p/gnunet/default.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { homepage = http://gnunet.org/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [ ludo viric ]; platforms = stdenv.lib.platforms.gnu; diff --git a/pkgs/applications/networking/p2p/gnunet/svn.nix b/pkgs/applications/networking/p2p/gnunet/svn.nix index ed6c348706b97943bb7e0cd166443018df6547c8..25a51b3c9365fbaf4c37e13652a6b87096aac142 100644 --- a/pkgs/applications/networking/p2p/gnunet/svn.nix +++ b/pkgs/applications/networking/p2p/gnunet/svn.nix @@ -85,7 +85,7 @@ stdenv.mkDerivation rec { homepage = http://gnunet.org/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [ ludo viric ]; platforms = stdenv.lib.platforms.gnu; diff --git a/pkgs/applications/networking/p2p/tribler/default.nix b/pkgs/applications/networking/p2p/tribler/default.nix index 5fa19c71d9a18b5ed91bd517ecca565350d91741..5bc228f9a6b9e15c7f5995692fd5440296ed9ea5 100644 --- a/pkgs/applications/networking/p2p/tribler/default.nix +++ b/pkgs/applications/networking/p2p/tribler/default.nix @@ -44,6 +44,6 @@ stdenv.mkDerivation { meta = { homepage = http://www.tribler.org/; description = "A completely decentralised P2P filesharing client based on the Bittorrent protocol"; - license = "LGPLv2.1"; + license = stdenv.lib.licenses.lgpl21; }; } diff --git a/pkgs/applications/networking/pjsip/default.nix b/pkgs/applications/networking/pjsip/default.nix index 558394199f457d93ec7f5126eb9d831f998b5cb0..4d08e1cc60a1403c09c9c82d3226caeabead4dc4 100644 --- a/pkgs/applications/networking/pjsip/default.nix +++ b/pkgs/applications/networking/pjsip/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "SIP stack and media stack for presence, im, and multimedia communication"; homepage = http://pjsip.org/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/networking/remote/freerdp/unstable.nix b/pkgs/applications/networking/remote/freerdp/unstable.nix index 6c133e9dbb4964109d5bfc1129614fc02303d31c..a8388b4829af2e3b1bb8177f1f9ae440ac7d10af 100644 --- a/pkgs/applications/networking/remote/freerdp/unstable.nix +++ b/pkgs/applications/networking/remote/freerdp/unstable.nix @@ -70,6 +70,8 @@ stdenv.mkDerivation rec { homepage = http://www.freerdp.com/; license = "free-non-copyleft"; + + broken = true; # fails to build }; } diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix index 24bc20af6528c5e51e461307cd8791aa19fe3f0e..8fb929d53e10d619697d3c3d3699c152bef47679 100644 --- a/pkgs/applications/networking/remote/remmina/default.nix +++ b/pkgs/applications/networking/remote/remmina/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; homepage = "http://remmina.sourceforge.net/"; description = "Remmina is a remote desktop client written in GTK+"; maintainers = []; diff --git a/pkgs/applications/networking/remote/ssvnc/default.nix b/pkgs/applications/networking/remote/ssvnc/default.nix index 619925354f0665c18997ab9e132723b1d90a1bea..f142395aa57bc066cc71d0b3845985f5d445e321 100644 --- a/pkgs/applications/networking/remote/ssvnc/default.nix +++ b/pkgs/applications/networking/remote/ssvnc/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { description = "VNC viewer that adds encryption security to VNC connections"; homepage = "http://www.karlrunge.com/x11vnc/ssvnc.html"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.edwtjo ]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/networking/remote/teamviewer/8.nix b/pkgs/applications/networking/remote/teamviewer/8.nix index 440eb90390ae8820c8156fecb94d14e6b1b9a7b9..459ae9fab82b35995c983599748467fc96588620 100644 --- a/pkgs/applications/networking/remote/teamviewer/8.nix +++ b/pkgs/applications/networking/remote/teamviewer/8.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation { meta = { homepage = "http://www.teamviewer.com"; - license = "unfree"; + license = stdenv.lib.licenses.unfree; description = "Desktop sharing application, providing remote support and online meetings"; }; } diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix index 6802782bcb5d9097bd99f4e1dacf0829adb35781..65ddd7305c832350c0efdd5f93ad5075f290c7d2 100644 --- a/pkgs/applications/networking/remote/teamviewer/default.nix +++ b/pkgs/applications/networking/remote/teamviewer/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation { meta = { homepage = "http://www.teamviewer.com"; - license = "unfree"; + license = stdenv.lib.licenses.unfree; description = "Desktop sharing application, providing remote support and online meetings"; }; } diff --git a/pkgs/applications/networking/sniffers/etherape/default.nix b/pkgs/applications/networking/sniffers/etherape/default.nix index a51f65cbccb09d28ed73c4d10fd16d9cd255d980..f5104665562d95c8d609c4218f476d3b03c427dc 100644 --- a/pkgs/applications/networking/sniffers/etherape/default.nix +++ b/pkgs/applications/networking/sniffers/etherape/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://etherape.sourceforge.net/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/applications/networking/spideroak/default.nix b/pkgs/applications/networking/spideroak/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..403630e25e55cb1e7997c7eb6b89084f0afa9e9c --- /dev/null +++ b/pkgs/applications/networking/spideroak/default.nix @@ -0,0 +1,62 @@ +{ stdenv, fetchurl, makeWrapper, glib +, fontconfig, patchelf, libXext, libX11 +, freetype, libXrender +}: + +let + arch = if stdenv.system == "x86_64-linux" then "x86_64" + else if stdenv.system == "i686-linux" then "i386" + else throw "Spideroak client for: ${stdenv.system} not supported!"; + + interpreter = if stdenv.system == "x86_64-linux" then "ld-linux-x86-64.so.2" + else if stdenv.system == "i686-linux" then "ld-linux.so.2" + else throw "Spideroak client for: ${stdenv.system} not supported!"; + + sha256 = if stdenv.system == "x86_64-linux" then "0ax5ij3fwq3q9agf7qkw2zg53fcd82llg734pq3swzpn3z1ajs38" + else if stdenv.system == "i686-linux" then "18hvgx8bvd2khnqfn434gd4mflv0w5y8kvim72rvya2kwxsyf3i1" + else throw "Spideroak client for: ${stdenv.system} not supported!"; + + ldpath = stdenv.lib.makeSearchPath "lib" [ + glib fontconfig libXext libX11 freetype libXrender + ]; + + version = "5.1.6"; + +in stdenv.mkDerivation { + name = "spideroak-${version}"; + + src = fetchurl { + name = "spideroak-${version}-${arch}"; + url = "https://spideroak.com/getbuild?platform=slackware&arch=${arch}&version=${version}"; + inherit sha256; + }; + + sourceRoot = "."; + + unpackCmd = "tar -xzf $curSrc"; + + installPhase = '' + ensureDir "$out" + cp -r "./"* "$out" + ensureDir "$out/bin" + rm "$out/usr/bin/SpiderOak" + + patchelf --set-interpreter ${stdenv.glibc}/lib/${interpreter} \ + "$out/opt/SpiderOak/lib/SpiderOak" + + RPATH=$out/opt/SpiderOak/lib:${ldpath} + makeWrapper $out/opt/SpiderOak/lib/SpiderOak $out/bin/spideroak --set LD_LIBRARY_PATH $RPATH \ + --set QT_PLUGIN_PATH $out/opt/SpiderOak/lib/plugins/ \ + --set SpiderOak_EXEC_SCRIPT $out/bin/spideroak + ''; + + buildInputs = [ patchelf makeWrapper ]; + + meta = { + homepage = "https://spideroak.com"; + description = "Secure online backup and sychronization"; + license = stdenv.lib.licenses.unfree; + maintainers = with stdenv.lib.maintainers; [ amorsillo ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/networking/sync/unison/default.nix b/pkgs/applications/networking/sync/unison/default.nix index 744c8c01efa5e48945fe5f949332d26abed928e7..4ac5e8300ca8cb02dc810e9f1b0e3c2af2b88703 100644 --- a/pkgs/applications/networking/sync/unison/default.nix +++ b/pkgs/applications/networking/sync/unison/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation (rec { meta = { homepage = http://www.cis.upenn.edu/~bcpierce/unison/; description = "Bidirectional file synchronizer"; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 8f169180dd5e49c10c935876d4c33c40ede9be4c..226b7f6d097bce7385405ea559264b6334385c0a 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ''; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin cp -r ./bin $out ''; diff --git a/pkgs/applications/networking/vnstat/default.nix b/pkgs/applications/networking/vnstat/default.nix index 57afefd7dcdd1c8e013195a4b3af67e52536297f..6d4306044a41df21b10bba08c69b24270650ed19 100644 --- a/pkgs/applications/networking/vnstat/default.nix +++ b/pkgs/applications/networking/vnstat/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://humdi.net/vnstat/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; description = "Console-based network statistics utility for Linux"; }; } diff --git a/pkgs/applications/networking/yafc/default.nix b/pkgs/applications/networking/yafc/default.nix index 752a7824e6f0520272dcf417ad81d42d5c24ea40..2e60b9aa3228c12094b2c9a48b8cc1323d0b0460 100644 --- a/pkgs/applications/networking/yafc/default.nix +++ b/pkgs/applications/networking/yafc/default.nix @@ -13,6 +13,6 @@ stdenv.mkDerivation rec { description = "ftp/sftp client with readline, autocompletion and bookmarks"; homepage = http://www.yafc-ftp.com; maintainers = [ stdenv.lib.maintainers.page ]; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/applications/office/eventlist/default.nix b/pkgs/applications/office/eventlist/default.nix index f126d6bfba659a6382ee48bc541cbc7247c9501f..c260220aad4d75649b8187109e56294e5cd02a73 100644 --- a/pkgs/applications/office/eventlist/default.nix +++ b/pkgs/applications/office/eventlist/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { Incidences can be filtered, added, edited, deleted via context menu. ''; homepage = "http://kde-look.org/content/show.php/Eventlist?content=107779"; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; }; } diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix index ee0475d45ec0443193fb7ad4291bd38d8a9931d5..9c255f493d3f835e1932d6b9ade88eb089a5366d 100644 --- a/pkgs/applications/office/gnucash/default.nix +++ b/pkgs/applications/office/gnucash/default.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { accounting principles to ensure balanced books and accurate reports. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://www.gnucash.org/; diff --git a/pkgs/applications/office/gnumeric/default.nix b/pkgs/applications/office/gnumeric/default.nix index 014aa5bf0fd2f1d88a2c61ca8d65b7652e6c83a6..2b2fd87cf430fc6f1e0fae99a8d0301d717512c9 100644 --- a/pkgs/applications/office/gnumeric/default.nix +++ b/pkgs/applications/office/gnumeric/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "The GNOME Office Spreadsheet"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://projects.gnome.org/gnumeric/; platforms = platforms.linux; maintainers = [ maintainers.vcunat ]; diff --git a/pkgs/applications/office/hledger-interest/default.nix b/pkgs/applications/office/hledger-interest/default.nix index 9c0672e2ee0c54f7c007d6efc98e491e7e408828..2cff99dcc278ac94ab328fdb1f8deeb997860313 100644 --- a/pkgs/applications/office/hledger-interest/default.nix +++ b/pkgs/applications/office/hledger-interest/default.nix @@ -14,9 +14,6 @@ cabal.mkDerivation (self: { description = "computes interest for a given account"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = with self.stdenv.lib.maintainers; [ simons ]; }; }) diff --git a/pkgs/applications/office/hledger-irr/default.nix b/pkgs/applications/office/hledger-irr/default.nix index e7ca2a6462b1bd326887a0dcb9bd16a790618585..e6a7b2a72c29fef6b6181a0ca2d4a53f6f2b0017 100644 --- a/pkgs/applications/office/hledger-irr/default.nix +++ b/pkgs/applications/office/hledger-irr/default.nix @@ -13,6 +13,6 @@ cabal.mkDerivation (self: { description = "computes the internal rate of return of an investment"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.simons ]; + maintainers = with self.stdenv.lib.maintainers; [ simons ]; }; }) diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix index 5e5c98e826019ed4c0668f8044ca510c547801a8..007e093378da8fbf797be37bb55ffa7b7ec445af 100644 --- a/pkgs/applications/office/homebank/default.nix +++ b/pkgs/applications/office/homebank/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = { description = "Free, easy, personal accounting for everyone"; homepage = http://homebank.free.fr/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/office/impressive/default.nix b/pkgs/applications/office/impressive/default.nix index de6517923b6e3f990719c338c94a4b3751566eab..fad2167fb7ac1c857ff0184c3acdf44af0f9bfac 100644 --- a/pkgs/applications/office/impressive/default.nix +++ b/pkgs/applications/office/impressive/default.nix @@ -71,7 +71,7 @@ in homepage = http://impressive.sourceforge.net/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.ludo ]; platforms = stdenv.lib.platforms.mesaPlatforms; diff --git a/pkgs/applications/office/keepnote/default.nix b/pkgs/applications/office/keepnote/default.nix index 419d761b09598f404e99d176241e17c49353590a..409da36b26400514dd7d1e8c8852270a10e1095a 100644 --- a/pkgs/applications/office/keepnote/default.nix +++ b/pkgs/applications/office/keepnote/default.nix @@ -17,6 +17,6 @@ buildPythonPackage { meta = { description = "Note taking application"; homepage = http://rasm.ods.org/keepnote; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index b1cbc6fd54f566f6b14dbdb7234a22b43cf1f6df..41cf1ebc33dfe3dd1001dfc641152cf8471caea9 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -14,28 +14,30 @@ , autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr , libwpg, dbus_glib, glibc, qt4, kde4, clucene_core, libcdr, lcms, vigra , unixODBC, mdds, saneBackends, mythes, libexttextcat, libvisio -, fontsConf, pkgconfig, libzip, bluez5, libtool, maven, libe-book_00 -, libmwaw_02, libatomic_ops, graphite2, harfbuzz +, fontsConf, pkgconfig, libzip, bluez5, libtool, maven +, libatomic_ops, graphite2, harfbuzz +, librevenge, libe-book, libmwaw, glm, glew , langs ? [ "en-US" "en-GB" "ca" "ru" "eo" "fr" "nl" "de" "sl" ] }: let langsSpaces = stdenv.lib.concatStringsSep " " langs; major = "4"; - minor = "2"; - patch = "5"; - tweak = "2"; + minor = "3"; + patch = "0"; + tweak = "4"; subdir = "${major}.${minor}.${patch}"; version = "${subdir}${if tweak == "" then "" else "."}${tweak}"; # doesn't exist in srcs + # 0.8 version is in 0.7.0 tarball libixion = stdenv.mkDerivation rec { - version = "0.5.0"; + version = "0.7.0"; name = "libixion-${version}"; src = fetchurl { url = "http://kohei.us/files/ixion/src/${name}.tar.bz2"; - sha256 = "010k33bfkckx28r4rdk5mkd0mmayy5ng9ja0j0zg0z237gcfgrzb"; + sha256 = "10amvz7fzr1kcy3svfspkdykmspqgpjdmk44cyr406wi7v4lwnf9"; }; configureFlags = "--with-boost=${boost}"; @@ -43,12 +45,24 @@ let buildInputs = [ boost mdds pkgconfig ]; }; - fetchThirdParty = {name, md5, brief}: fetchurl { + fetchThirdParty = {name, md5, brief, subDir ? ""}: fetchurl { inherit name md5; url = if brief then - "http://dev-www.libreoffice.org/src/${name}" + "http://dev-www.libreoffice.org/src/${subDir}${name}" else - "http://dev-www.libreoffice.org/src/${md5}-${name}"; + "http://dev-www.libreoffice.org/src/${subDir}${md5}-${name}"; + }; + + # Can't find Boost inside LO build + liborcus = stdenv.mkDerivation rec { + name = "liborcus-0.7.0"; + src = fetchThirdParty (stdenv.lib.findFirst + (x: x.name == "${name}.tar.bz2") + ("Error: update liborcus version inside LO expression") + (import ./libreoffice-srcs.nix)); + configureFlags = "--with-boost=${boost}"; + + buildInputs = [ boost mdds pkgconfig zlib libixion ]; }; fetchSrc = {name, sha256}: fetchurl { @@ -65,14 +79,14 @@ let translations = fetchSrc { name = "translations"; - sha256 = "0nv47r043w151687ks06w786h8azi8gylxma9c7qyjbdj6cdb2ly"; + sha256 = "1l445284mih0c7d6v3ps1piy5pbjvisyrjjvlrqizvwxqm7bxpr1"; }; # TODO: dictionaries help = fetchSrc { name = "help"; - sha256 = "1kbkdngq39gfq2804v6vnllax4gqs25zlfk6y561iiipld1ncc5v"; + sha256 = "0avsc11d4nmycsxvadr0xcd8z9506sjcc89hgmliqlmhmw48ax7y"; }; }; @@ -82,7 +96,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - sha256 = "4bf7898d7d0ba918a8f6668eff0904a549e5a2de837854716e6d996f121817d5"; + sha256 = "1r605nwjdq20qd96chqic1bjkw7y36wmpg2lzzvv5sz6gw12rzi8"; }; # Openoffice will open libcups dynamically, so we link it directly @@ -111,7 +125,6 @@ stdenv.mkDerivation rec { -e 's,! */usr/bin/python,!${python3}/bin/${python3.executable},' -e 's,! */usr/bin/env python,!${python3}/bin/${python3.executable},' #sed -i 's,ANT_OPTS+="\(.*\)",ANT_OPTS+=\1,' apache-commons/java/*/makefile.mk - patch -Np1 -i ${./ooxmlexport.diff}; ''; QT4DIR = qt4; @@ -131,6 +144,13 @@ stdenv.mkDerivation rec { touch solenv/inc/target.mk ''; + # fetch_Download_item tries to interpret the name as a variable name + # Let it do so… + postConfigure = '' + sed -e '1ilibreoffice-translations-${version}.tar.xz=libreoffice-translations-${version}.tar.xz' -i Makefile + sed -e '1ilibreoffice-help-${version}.tar.xz=libreoffice-help-${version}.tar.xz' -i Makefile + ''; + makeFlags = "SHELL=${bash}/bin/bash"; enableParallelBuilding = true; @@ -190,7 +210,6 @@ stdenv.mkDerivation rec { "--enable-epm" "--with-jdk-home=${jdk}/lib/openjdk" "--with-ant-home=${ant}/lib/ant" - "--without-afms" "--without-fonts" "--without-myspell-dicts" "--without-ppds" @@ -207,7 +226,6 @@ stdenv.mkDerivation rec { "--without-system-libodfgen" "--without-system-libabw" "--without-system-firebird" - "--without-system-orcus" "--without-system-liblangtag" "--without-system-libmspub" ]; @@ -228,14 +246,16 @@ stdenv.mkDerivation rec { neon nspr nss openldap openssl ORBit2 pam perl pkgconfigUpstream poppler python3 sablotron saneBackends tcsh unzip vigra which zip zlib mdds bluez5 glibc libixion - libxshmfence libe-book_00 libmwaw_02 libatomic_ops graphite2 harfbuzz + libxshmfence libatomic_ops graphite2 harfbuzz + librevenge libe-book libmwaw glm glew + liborcus ]; meta = with stdenv.lib; { description = "LibreOffice is a comprehensive, professional-quality productivity suite, a variant of openoffice.org"; homepage = http://libreoffice.org/; license = licenses.lgpl3; - maintainers = [ maintainers.viric ]; + maintainers = [ maintainers.viric maintainers.raskin ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix index cceb1a49e42933b5afd73dd7908f3797293b2930..4e7dacfe0a967e540ebc69a3b1b27b1b7d754079 100644 --- a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix +++ b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix @@ -1,82 +1,17 @@ [ { - name = "libabw-0.0.2.tar.bz2"; - md5 = "40fa48e03b1e28ae0325cc34b35bc46d"; + name = "libabw-0.1.0.tar.bz2"; + md5 = "9317e967c8fa8ff50e049744c4b33c87"; brief = true; } { - name = "libcdr-0.0.15.tar.bz2"; - md5 = "fbcd8619fc6646f41d527c1329102998"; - brief = true; -} -{ - name = "libe-book-0.0.3.tar.bz2"; - md5 = "2f1ceaf2ac8752ed278e175447d9b978"; - brief = true; -} -{ - name = "libetonyek-0.0.4.tar.bz2"; - md5 = "3c50bc60394d1f2675fbf9bd22581363"; - brief = true; -} -{ - name = "libfreehand-0.0.0.tar.bz2"; - md5 = "496dd00028afcc19f896b01394769043"; - brief = true; -} -{ - name = "libmspub-0.0.6.tar.bz2"; - md5 = "1120705cd0f0d9bd5506360bf57b6c2e"; - brief = true; -} -{ - name = "libmwaw-0.2.0.tar.bz2"; - md5 = "d794625f156a9fb1c53b3f8a8aa13b5e"; - brief = true; -} -{ - name = "libodfgen-0.0.4.tar.bz2"; - md5 = "e5483d1f0b71e64c367c1194b54b0f53"; - brief = true; -} -{ - name = "libvisio-0.0.31.tar.bz2"; - md5 = "82628333418f101a20cd21f980cf9f40"; - brief = true; -} -{ - name = "Firebird-2.5.2.26540-0.tar.bz2"; - md5 = "21154d2004e025c8a3666625b0357bb5"; - brief = true; -} -{ - name = "harfbuzz-0.9.23.tar.bz2"; - md5 = "a4a9b548577e2ee22f0887937da5fd6c"; - brief = true; -} -{ - name = "libatomic_ops-7_2d.zip"; - md5 = "c0b86562d5aa40761a87134f83e6adcf"; - brief = true; -} -{ - name = "libeot-0.01.tar.bz2"; - md5 = "aa24f5dd2a2992f4a116aa72af817548"; - brief = true; -} -{ - name = "language-subtag-registry-2014-03-27.tar.bz2"; - md5 = "504af523f5d1a5590bbeb6a4b55e8a97"; - brief = true; -} -{ - name = "Adobe-Core35_AFMs-314.tar.gz"; - md5 = "1756c4fa6c616ae15973c104cd8cb256"; + name = "commons-codec-1.6-src.tar.gz"; + md5 = "2e482c7567908d334785ce7d69ddfff7"; brief = false; } { - name = "commons-codec-1.6-src.tar.gz"; - md5 = "2e482c7567908d334785ce7d69ddfff7"; + name = "commons-codec-1.9-src.zip"; + md5 = "048751f3271906db5126ab76870444c4"; brief = false; } { @@ -90,13 +25,28 @@ brief = false; } { - name = "commons-logging-1.1.1-src.tar.gz"; - md5 = "3c219630e4302863a9a83d0efde889db"; + name = "commons-lang3-3.3.1-src.tar.gz"; + md5 = "8ab049135b2d15313da5d9f0656894a1"; brief = false; } { - name = "boost_1_54_0.tar.bz2"; - md5 = "15cb8c0803064faef0c4ddf5bc5ca279"; + name = "commons-logging-1.1.3-src.tar.gz"; + md5 = "e8e197d628436490886d17cffa108fe3"; + brief = false; +} +{ + name = "apr-1.4.8.tar.gz"; + md5 = "eff9d741b0999a9bbab96862dd2a2a3d"; + brief = true; +} +{ + name = "apr-util-1.5.3.tar.gz"; + md5 = "71a11d037240b292f824ba1eb537b4e3"; + brief = true; +} +{ + name = "boost_1_55_0.tar.bz2"; + md5 = "d6eef4b4cacb2183f2bf265a5a03a354"; brief = false; } { @@ -109,6 +59,11 @@ md5 = "f101a9e88b783337b20b2e26dfd26d5f"; brief = false; } +{ + name = "libcdr-0.1.0.tar.bz2"; + md5 = "0e2f56934c8872ec4a254cd4bb1d7cf6"; + brief = true; +} { name = "clucene-core-2.3.3.4.tar.gz"; md5 = "48d647fbd8ef8889e5a7f422c1bfda94"; @@ -119,6 +74,16 @@ md5 = "22f8a85daf4a012180322e1f52a7563b"; brief = false; } +{ + name = "CoinMP-1.7.6.tgz"; + md5 = "1cce53bf4b40ae29790d2c5c9f8b1129"; + brief = true; +} +{ + name = "collada2gltf-master-cb1d97788a.tar.bz2"; + md5 = "4b87018f7fff1d054939d19920b751a0"; + brief = false; +} { name = "cppunit-1.13.1.tar.gz"; md5 = "ac4781e01619be13461bb2d562b94a7b"; @@ -130,20 +95,35 @@ brief = false; } { - name = "curl-7.33.0.tar.bz2"; - md5 = "57409d6bf0bd97053b8378dbe0cadcef"; - brief = false; + name = "curl-7.36.0.tar.bz2"; + md5 = "e6d1f9d1b59da5062109ffe14e0569a4"; + brief = true; +} +{ + name = "libe-book-0.1.1.tar.bz2"; + md5 = "c25a881d21abc5b4da19205db513cc22"; + brief = true; } { name = "epm-3.7.tar.gz"; md5 = "3ade8cfe7e59ca8e65052644fed9fca4"; brief = false; } +{ + name = "libetonyek-0.1.1.tar.bz2"; + md5 = "805f941b06448212a988cb65f0691a7a"; + brief = true; +} { name = "expat-2.1.0.tar.gz"; md5 = "dd7dab7a5fea97d2a6a43f511449b7cd"; brief = false; } +{ + name = "Firebird-2.5.2.26540-0.tar.bz2"; + md5 = "21154d2004e025c8a3666625b0357bb5"; + brief = true; +} { name = "fontconfig-2.8.0.tar.gz"; md5 = "77e15a92006ddc2adbb06f840d591c0e"; @@ -160,8 +140,8 @@ brief = false; } { - name = "dejavu-fonts-ttf-2.33.zip"; - md5 = "f872f4ac066433d8ff92f5e316b36ff9"; + name = "dejavu-fonts-ttf-2.34.zip"; + md5 = "a4e565e220b5de082c23995e256e3c12"; brief = false; } { @@ -170,8 +150,8 @@ brief = false; } { - name = "liberation-fonts-ttf-1.07.3.tar.gz"; - md5 = "b3174b11c2b6a341f5c99b31088bd67b"; + name = "liberation-fonts-ttf-1.07.4.tar.gz"; + md5 = "134d8262145fc793c6af494dcace3e71"; brief = false; } { @@ -204,16 +184,36 @@ md5 = "1e9ddfe25ac9577da709d7b2ea36f939"; brief = false; } +{ + name = "libfreehand-0.1.0.tar.bz2"; + md5 = "5f029fef73e42a2c2ae4524a7513f97d"; + brief = true; +} { name = "freetype-2.4.8.tar.bz2"; md5 = "dbf2caca1d3afd410a29217a9809d397"; brief = false; } { - name = "graphite2-1.2.3.tgz"; - md5 = "7042305e4208af4c2d5249d814ccce58"; + name = "glew-1.10.0.zip"; + md5 = "594eb47b4b1210e25438d51825404d5a"; brief = false; } +{ + name = "glm-0.9.4.6-libreoffice.zip"; + md5 = "bae83fa5dc7f081768daace6e199adc3"; + brief = false; +} +{ + name = "graphite2-1.2.4.tgz"; + md5 = "2ef839348fe28e3b923bf8cced440227"; + brief = true; +} +{ + name = "harfbuzz-0.9.23.tar.bz2"; + md5 = "a4a9b548577e2ee22f0887937da5fd6c"; + brief = true; +} { name = "hsqldb_1_8_0.zip"; md5 = "17410483b5b5f267aa18b7e00b65e6e0"; @@ -230,8 +230,8 @@ brief = false; } { - name = "icu4c-52_1-src.tgz"; - md5 = "9e96ed4c1d99c0d14ac03c140f9f346c"; + name = "icu4c-53_1-src.tgz"; + md5 = "b73baa6fbdfef197608d1f69300919b9"; brief = false; } { @@ -290,9 +290,14 @@ brief = false; } { - name = "jpegsrc.v8d.tar.gz"; - md5 = "52654eb3b2e60c35731ea8fc87f1bd29"; - brief = false; + name = "jpegsrc.v9a.tar.gz"; + md5 = "3353992aecaee1805ef4109aadd433e7"; + brief = true; +} +{ + name = "language-subtag-registry-2014-04-10.tar.bz2"; + md5 = "49c94710f7858b1969d74ff72e6aac84"; + brief = true; } { name = "JLanguageTool-1.7.0.tar.bz2"; @@ -300,15 +305,31 @@ brief = false; } { - name = "lcms2-2.4.tar.gz"; - md5 = "861ef15fa0bc018f9ddc932c4ad8b6dd"; - brief = false; + name = "lcms2-2.6.tar.gz"; + md5 = "f4c08d38ceade4a664ebff7228910a33"; + brief = true; +} +{ + name = "libatomic_ops-7_2d.zip"; + md5 = "c0b86562d5aa40761a87134f83e6adcf"; + brief = true; +} +{ + name = "libeot-0.01.tar.bz2"; + md5 = "aa24f5dd2a2992f4a116aa72af817548"; + brief = true; } { name = "libexttextcat-3.4.3.tar.bz2"; md5 = "ae330b9493bd4503ac390106ff6060d7"; brief = false; } +{ + name = "libgltf-0.0.0.tar.bz2"; + md5 = "3d9ea1f2828c46f8ba94b88a87b3326d"; + brief = false; + subDir = "libgltf/"; +} { name = "liblangtag-0.5.1.tar.bz2"; md5 = "36271d3fa0d9dec1632029b6d7aac925"; @@ -344,6 +365,16 @@ md5 = "aa5ca9d1ed1082890835afab26400a39"; brief = false; } +{ + name = "libmspub-0.1.1.tar.bz2"; + md5 = "1d489c4932109e72495b1df8b69e5f11"; + brief = true; +} +{ + name = "libmwaw-0.3.1.tar.bz2"; + md5 = "6f1ac4a0e24131c422e1e91f07718fb6"; + brief = true; +} { name = "mysql-connector-c++-1.1.0.tar.gz"; md5 = "0981bda6548a8c8233ffce2b6e4b2a23"; @@ -364,19 +395,29 @@ md5 = "06beb053e257d9e22641339c905c6eba"; brief = false; } +{ + name = "libodfgen-0.1.1.tar.bz2"; + md5 = "c22c83c17cda0754382ada4e116594b7"; + brief = true; +} +{ + name = "OpenCOLLADA-master-6509aa13af.tar.bz2"; + md5 = "4ca8a6ef0afeefc864e9ef21b9f14bd6"; + brief = true; +} { name = "openldap-2.4.31.tgz"; md5 = "804c6cb5698db30b75ad0ff1c25baefd"; brief = false; } { - name = "openssl-1.0.1e.tar.gz"; - md5 = "66bf6f10f060d561929de96f9dfe5b8c"; + name = "openssl-1.0.1h.tar.gz"; + md5 = "8d6d684a9430d5cc98a62a5d8fbda8cf"; brief = false; } { - name = "liborcus-0.5.1.tar.bz2"; - md5 = "ea2acaf140ae40a87a952caa75184f4d"; + name = "liborcus-0.7.0.tar.bz2"; + md5 = "7681383be6ce489d84c1c74f4e7f9643"; brief = false; } { @@ -385,9 +426,9 @@ brief = false; } { - name = "libpng-1.5.10.tar.gz"; - md5 = "9e5d864bce8f06751bbd99962ecf4aad"; - brief = false; + name = "libpng-1.5.18.tar.gz"; + md5 = "5266905cef49d1224437465ad4d67fd9"; + brief = true; } { name = "poppler-0.22.5.tar.gz"; @@ -400,9 +441,9 @@ brief = false; } { - name = "Python-3.3.3.tar.bz2"; - md5 = "f3ebe34d4d8695bf889279b54673e10c"; - brief = false; + name = "Python-3.3.5.tgz"; + md5 = "803a75927f8f241ca78633890c798021"; + brief = true; } { name = "raptor2-2.0.9.tar.gz"; @@ -419,11 +460,21 @@ md5 = "32f8e1417a64d3c6f2c727f9053f55ea"; brief = false; } +{ + name = "librevenge-0.0.1.tar.bz2"; + md5 = "69c367c6b0a360411965a1c409a0b6c1"; + brief = true; +} { name = "rhino1_5R5.zip"; md5 = "798b2ffdc8bcfe7bca2cf92b62caf685"; brief = false; } +{ + name = "serf-1.2.1.tar.bz2"; + md5 = "4f8e76c9c6567aee1d66aba49f76a58b"; + brief = true; +} { name = "swingExSrc.zip"; md5 = "35c94d2df8893241173de1d16b6034c0"; @@ -440,19 +491,24 @@ brief = false; } { - name = "libwpd-0.9.9.tar.bz2"; - md5 = "a3dcac551fae5ebbec16e844810828c4"; - brief = false; + name = "libvisio-0.1.0.tar.bz2"; + md5 = "931588332ba44682c9cd5eefbd358ab4"; + brief = true; } { - name = "libwpg-0.2.2.tar.bz2"; - md5 = "b85436266b2ac91d351ab5684b181151"; - brief = false; + name = "libwpd-0.10.0.tar.bz2"; + md5 = "0773d79a1f240ef9f4f20242b13c5bb7"; + brief = true; } { - name = "libwps-0.2.9.tar.bz2"; - md5 = "46eb0e7f213ad61bd5dee0c494132cb0"; - brief = false; + name = "libwpg-0.3.0.tar.bz2"; + md5 = "17da9770cb8b317b7633f9807b32b71a"; + brief = true; +} +{ + name = "libwps-0.3.0.tar.bz2"; + md5 = "d4d77d08b9048bae3b8ec8df11f80efd"; + brief = true; } { name = "xsltml_2.1.2.zip"; @@ -460,8 +516,8 @@ brief = false; } { - name = "zlib-1.2.7.tar.bz2"; - md5 = "2ab442d169156f34c379c968f3f482dd"; - brief = false; + name = "zlib-1.2.8.tar.gz"; + md5 = "44d667c142d7cda120332623eab69f40"; + brief = true; } ] diff --git a/pkgs/applications/office/libreoffice/ooxmlexport.diff b/pkgs/applications/office/libreoffice/ooxmlexport.diff deleted file mode 100644 index 9c1d44612e269b6e6c957e3f984c3717e09f8e12..0000000000000000000000000000000000000000 --- a/pkgs/applications/office/libreoffice/ooxmlexport.diff +++ /dev/null @@ -1,31 +0,0 @@ ---- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 2014-06-12 12:25:19.000000000 +0400 -+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 2014-06-12 12:25:20.000000000 +0400 -@@ -547,17 +547,17 @@ - getRun(xParagraph, 5, " After."); - } - --DECLARE_OOXMLEXPORT_TEST(test1Table1Page, "1-table-1-page.docx") --{ -- // 2 problem for this document after export: -- // - invalid sectPr inserted at the beginning of the page -- // - font of empty cell is not preserved, leading to change in rows height -- uno::Reference xModel(mxComponent, uno::UNO_QUERY); -- uno::Reference xTextViewCursorSupplier(xModel->getCurrentController(), uno::UNO_QUERY); -- uno::Reference xCursor(xTextViewCursorSupplier->getViewCursor(), uno::UNO_QUERY); -- xCursor->jumpToLastPage(); -- CPPUNIT_ASSERT_EQUAL(sal_Int16(1), xCursor->getPage()); --} -+/// DECLARE_OOXMLEXPORT_TEST(test1Table1Page, "1-table-1-page.docx") -+/// { -+/// // 2 problem for this document after export: -+/// // - invalid sectPr inserted at the beginning of the page -+/// // - font of empty cell is not preserved, leading to change in rows height -+/// uno::Reference xModel(mxComponent, uno::UNO_QUERY); -+/// uno::Reference xTextViewCursorSupplier(xModel->getCurrentController(), uno::UNO_QUERY); -+/// uno::Reference xCursor(xTextViewCursorSupplier->getViewCursor(), uno::UNO_QUERY); -+/// xCursor->jumpToLastPage(); -+/// CPPUNIT_ASSERT_EQUAL(sal_Int16(1), xCursor->getPage()); -+/// } - - DECLARE_OOXMLEXPORT_TEST(testTextFrames, "textframes.odt") - { diff --git a/pkgs/applications/office/mmex/default.nix b/pkgs/applications/office/mmex/default.nix index d56f4bed0ce9ecba76ef082d6e90d203e185798b..2940569ef6597c7e74fb32e134c0cdde40581c8d 100644 --- a/pkgs/applications/office/mmex/default.nix +++ b/pkgs/applications/office/mmex/default.nix @@ -28,7 +28,7 @@ in meta = { description = "Easy-to-use personal finance software"; homepage = http://www.codelathe.com/mmex; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/office/scribus/default.nix b/pkgs/applications/office/scribus/default.nix index 250ce163e4f51d9153873815b2755cdcf8c1d7f6..4026031de08419c379b99a3d6798f6d6b168c2db 100644 --- a/pkgs/applications/office/scribus/default.nix +++ b/pkgs/applications/office/scribus/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { platforms = stdenv.lib.platforms.linux; description = "Desktop Publishing (DTP) and Layout program for Linux"; homepage = http://www.scribus.net; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix index f0f7d801d8fd1b8b544cb2dee22a92b30b419835..b6636cef6418868d4530bb32ab452dfe1c9e56dc 100644 --- a/pkgs/applications/office/zotero/default.nix +++ b/pkgs/applications/office/zotero/default.nix @@ -23,10 +23,10 @@ stdenv.mkDerivation { inherit bash xulrunner; installPhase = '' - ensureDir "$out/libexec/zotero" + mkdir -p "$out/libexec/zotero" cp -vR * "$out/libexec/zotero/" - ensureDir "$out/bin" + mkdir -p "$out/bin" substituteAll "${./zotero.sh}" "$out/bin/zotero" chmod +x "$out/bin/zotero" ''; diff --git a/pkgs/applications/science/astronomy/gravit/default.nix b/pkgs/applications/science/astronomy/gravit/default.nix index a2cc07b0a61c053f93b0d66fb3b0af0166b1872c..696890f95f1e6eca3a0702fa60fe490656b5025d 100644 --- a/pkgs/applications/science/astronomy/gravit/default.nix +++ b/pkgs/applications/science/astronomy/gravit/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://gravit.slowchop.com"; description = "A beautiful OpenGL-based gravity simulator"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; longDescription = '' Gravit is a gravity simulator which runs under Linux, Windows and diff --git a/pkgs/applications/science/biology/arb/default.nix b/pkgs/applications/science/biology/arb/default.nix index 279091f21bd24665a78a91085bac5abcfa7d4d49..2f622e94057b722536ec9026eba8deb7cb4e9d10 100644 --- a/pkgs/applications/science/biology/arb/default.nix +++ b/pkgs/applications/science/biology/arb/default.nix @@ -81,5 +81,6 @@ stdenv.mkDerivation { pkgMaintainer = "http://BioLib.open-bio.org/"; homepage = http://www.arb-home.de/; priority = "10"; # because it includes binaries of clustal etc. + broken = true; }; } diff --git a/pkgs/applications/science/biology/plink/default.nix b/pkgs/applications/science/biology/plink/default.nix index fa6dcaa82ede794560dbb8a61133582d76f863db..009e12aa02f0f9d6bdf83129e58659229c0ec75e 100644 --- a/pkgs/applications/science/biology/plink/default.nix +++ b/pkgs/applications/science/biology/plink/default.nix @@ -18,7 +18,8 @@ stdenv.mkDerivation { meta = { description = "Whole genome association toolkit"; homepage = "http://pngu.mgh.harvard.edu/~purcell/plink/"; - license = "GNUv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.all; + broken = true; }; } diff --git a/pkgs/applications/science/electronics/archimedes/default.nix b/pkgs/applications/science/electronics/archimedes/default.nix index 142519c30ed5593333d6f798a96f50c259a02db6..a6a5f68755a46b0f118ab494464dde6592c3c574 100644 --- a/pkgs/applications/science/electronics/archimedes/default.nix +++ b/pkgs/applications/science/electronics/archimedes/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = { description = "GNU package for semiconductor device simulations"; homepage = http://www.gnu.org/software/archimedes; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/applications/science/electronics/caneda/default.nix b/pkgs/applications/science/electronics/caneda/default.nix index d135fb094345758eca02b8f908ed9455b57effda..404ffc5010b4ebf2a5ca69b24b23a0160f2c29bc 100644 --- a/pkgs/applications/science/electronics/caneda/default.nix +++ b/pkgs/applications/science/electronics/caneda/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = { description = "Open source EDA software focused on easy of use and portability"; homepage = http://caneda.tuxfamily.org; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/science/electronics/gtkwave/default.nix b/pkgs/applications/science/electronics/gtkwave/default.nix index 0bc6b60e721053b2fcbc16b0e9ece4324bba5537..c761f6196424baee07171167f6abb9ca132f66f7 100644 --- a/pkgs/applications/science/electronics/gtkwave/default.nix +++ b/pkgs/applications/science/electronics/gtkwave/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { description = "Wave viewer for Unix and Win32"; homepage = http://gtkwave.sourceforge.net; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix index 0e81616a006952c10d3a35682839b944d45b1e9d..1fc97abef92753e0423f89535afcab2c58dbcdbd 100644 --- a/pkgs/applications/science/electronics/kicad/default.nix +++ b/pkgs/applications/science/electronics/kicad/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = { description = "Free Software EDA Suite"; homepage = "http://www.kicad-pcb.org/"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/science/electronics/qucs/default.nix b/pkgs/applications/science/electronics/qucs/default.nix index e434c97db2b0b1564074d460dd427f2061807700..dd3eaecc7441fe91c05f5b75175354950929e9f3 100644 --- a/pkgs/applications/science/electronics/qucs/default.nix +++ b/pkgs/applications/science/electronics/qucs/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "Integrated circuit simulator"; homepage = http://qucs.sourceforge.net; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/science/electronics/tkgate/1.x.nix b/pkgs/applications/science/electronics/tkgate/1.x.nix index 1feac0b31c175fc59f0b2f525c7b13bdaf33b02a..30e882a7f38e7ee7da9d9b06c057b4b28437bd7e 100644 --- a/pkgs/applications/science/electronics/tkgate/1.x.nix +++ b/pkgs/applications/science/electronics/tkgate/1.x.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = { description = "Event driven digital circuit simulator with a TCL/TK-based graphical editor"; homepage = "http://www.tkgate.org/"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.simons ]; hydraPlatforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/applications/science/electronics/tkgate/2.x.nix b/pkgs/applications/science/electronics/tkgate/2.x.nix index 25c6a309cf377f7db3b7a5440ae745200ea92cca..108986ddefe4b3e269105321c99240802e1a4897 100644 --- a/pkgs/applications/science/electronics/tkgate/2.x.nix +++ b/pkgs/applications/science/electronics/tkgate/2.x.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = { description = "Event driven digital circuit simulator with a TCL/TK-based graphical editor"; homepage = "http://www.tkgate.org/"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; broken = true; }; } diff --git a/pkgs/applications/science/electronics/verilog/default.nix b/pkgs/applications/science/electronics/verilog/default.nix index f2c9d2e646f0550f3470b0cc448b28ed002fa774..e68d2a4ab91a52f70f890fb6faf2bbd623827b8e 100644 --- a/pkgs/applications/science/electronics/verilog/default.nix +++ b/pkgs/applications/science/electronics/verilog/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { description = "Icarus Verilog compiler"; repositories.git = https://github.com/steveicarus/iverilog.git; homepage = http://www.icarus.com; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [winden]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/science/electronics/xoscope/default.nix b/pkgs/applications/science/electronics/xoscope/default.nix index 54aae9e7d3bfcd35af303ed3efe793f937b70c87..df7d053d93bd7294b967711a736de496a3ffe458 100644 --- a/pkgs/applications/science/electronics/xoscope/default.nix +++ b/pkgs/applications/science/electronics/xoscope/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "Oscilloscope through the sound card"; homepage = http://xoscope.sourceforge.net; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/science/geometry/tetgen/default.nix b/pkgs/applications/science/geometry/tetgen/default.nix index d14fa08bbb5770d57ae617cff0c3a514447f328c..ddfb92def95893bf1786ae114f6492d298a9d8aa 100644 --- a/pkgs/applications/science/geometry/tetgen/default.nix +++ b/pkgs/applications/science/geometry/tetgen/default.nix @@ -16,6 +16,6 @@ stdenv.mkDerivation rec { meta = { description = "Quality Tetrahedral Mesh Generator and 3D Delaunay Triangulator"; homepage = "http://tetgen.org/"; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/applications/science/logic/coq/HEAD.nix b/pkgs/applications/science/logic/coq/HEAD.nix new file mode 100644 index 0000000000000000000000000000000000000000..c103b8b476978b644789cb58745625a55c42f207 --- /dev/null +++ b/pkgs/applications/science/logic/coq/HEAD.nix @@ -0,0 +1,57 @@ +# - coqide compilation can be disabled by setting lablgtk to null; + +{stdenv, fetchgit, pkgconfig, ocaml, findlib, camlp5, ncurses, lablgtk ? null}: + +let + version = "8.5pre-fff9e2f7"; + buildIde = lablgtk != null; + ideFlags = if buildIde then "-lablgtkdir ${lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else ""; + idePath = if buildIde then '' + CAML_LD_LIBRARY_PATH=${lablgtk}/lib/ocaml/3.12.1/site-lib/stublibs + '' else ""; +in + +stdenv.mkDerivation { + name = "coq-${version}"; + + src = fetchgit { + url = git://scm.gforge.inria.fr/coq/coq.git; + rev = "21994cc4c617582f4f94577c1c582a7b51b7770b"; + sha256 = "12kadlmyh9bspn9kds36pwrq77d0widrk5q43wyrgb8y9zrnyz61"; + }; + + buildInputs = [ pkgconfig ocaml findlib camlp5 ncurses lablgtk ]; + + postPatch = '' + UNAME=$(type -tp uname) + RM=$(type -tp rm) + substituteInPlace configure --replace "/bin/uname" "$UNAME" + substituteInPlace tools/beautify-archive --replace "/bin/rm" "$RM" + ''; + + preConfigure = '' + buildFlagsArray=(${idePath}) + configureFlagsArray=( + -opt + ${ideFlags} + ) + ''; + + prefixKey = "-prefix "; + + buildFlags = "revision coq coqide"; + + meta = { + description = "Coq proof assistant"; + longDescription = '' + Coq is a formal proof management system. It provides a formal language + to write mathematical definitions, executable algorithms and theorems + together with an environment for semi-interactive development of + machine-checked proofs. + ''; + homepage = "http://coq.inria.fr"; + license = "LGPL"; + maintainers = with stdenv.lib.maintainers; [ roconnor thoughtpolice ]; + platforms = stdenv.lib.platforms.unix; + }; +} diff --git a/pkgs/applications/science/logic/iprover/default.nix b/pkgs/applications/science/logic/iprover/default.nix index 2fb9678b8329f43fb21c7d2900db6b87134ac528..e03b33fa43ccf23b7955306ddbac28233abd1292 100644 --- a/pkgs/applications/science/logic/iprover/default.nix +++ b/pkgs/applications/science/logic/iprover/default.nix @@ -2,9 +2,9 @@ x@{builderDefsPackage , ocaml, eprover , ...}: builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ []; buildInputs = map (n: builtins.getAttr n x) @@ -38,7 +38,7 @@ rec { echo -e "#! /bin/sh\\n$out/bin/iproveropt --clausifier \"${eprover}/bin/eprover\" --clausifier_options \" --tstp-format --silent --cnf \" \"\$@\"" > "$out"/bin/iprover chmod a+x "$out"/bin/iprover '') ["defEnsureDir" "minInit" "doMake"]; - + meta = { description = "An automated first-order logic theorem prover"; maintainers = with a.lib.maintainers; @@ -47,7 +47,8 @@ rec { ]; platforms = with a.lib.platforms; linux; - license = "GPLv3"; + license = with a.lib.licenses; + gpl3; }; passthru = { updateInfo = { @@ -55,4 +56,3 @@ rec { }; }; }) x - diff --git a/pkgs/applications/science/logic/leo2/default.nix b/pkgs/applications/science/logic/leo2/default.nix index 913171827af12a44ccacb901731fcccee5ffe33d..8f673eb0f15a658ce40825c8d5d1273dd614a89b 100644 --- a/pkgs/applications/science/logic/leo2/default.nix +++ b/pkgs/applications/science/logic/leo2/default.nix @@ -1,5 +1,5 @@ x@{builderDefsPackage - , ocaml, eprover + , ocaml, eprover, zlib , ...}: builderDefsPackage (a : @@ -11,16 +11,16 @@ let (builtins.attrNames (builtins.removeAttrs x helperArgNames)); sourceInfo = rec { baseName="leo2"; - version="1.2.8"; + version = "1.6.2"; name="${baseName}_v${version}"; - url="http://www.ags.uni-sb.de/~leo/${name}.tgz"; - hash="d46a94f5991623386eb9061cfb0d748e258359a8c690fded173d45303e0e9e3a"; + url="page.mi.fu-berlin.de/cbenzmueller/leo/leo2_v${version}.tgz"; + hash="d46a94f5991623386eb9061cfb0d748e258359a8c690fded173d35303e0e9e3a"; }; in rec { src = a.fetchurl { url = sourceInfo.url; - sha256 = sourceInfo.hash; + sha256 = "1wjpmizb181iygnd18lx7p77fwaci2clgzs5ix5j51cc8f3pazmv"; }; name = "${sourceInfo.baseName}-${sourceInfo.version}"; @@ -43,6 +43,10 @@ rec { echo -e "e = ${eprover}/bin/eprover\\nepclextract = ${eprover}/bin/epclextract" > "$out/etc/leoatprc" '') ["minInit" "doMake" "defEnsureDir"]; + makeFlags = [ + "SHELL=${a.stdenv.shell}" + ]; + meta = { description = "A high-performance typed higher order prover"; maintainers = with a.lib.maintainers; @@ -52,11 +56,9 @@ rec { platforms = with a.lib.platforms; linux; license = "BSD"; - }; - passthru = { - updateInfo = { - downloadPage = "http://www.ags.uni-sb.de/~leo/download.html"; - }; + inherit (sourceInfo) version; + homepage = "http://page.mi.fu-berlin.de/cbenzmueller/leo/"; + downloadPage = "http://page.mi.fu-berlin.de/cbenzmueller/leo/download.html"; }; }) x diff --git a/pkgs/applications/science/logic/leo2/default.upstream b/pkgs/applications/science/logic/leo2/default.upstream new file mode 100644 index 0000000000000000000000000000000000000000..52b8ed1cdaa23a21e7f3e49fd78aa996f59ea9b4 --- /dev/null +++ b/pkgs/applications/science/logic/leo2/default.upstream @@ -0,0 +1,6 @@ +url http://page.mi.fu-berlin.de/cbenzmueller/leo/download.html +version_link '[.]tgz' +version '.*_v([0-9.]+)[.][a-z0-9]+$' '\1' +do_overwrite () { + do_overwrite_just_version +} diff --git a/pkgs/applications/science/logic/logisim/default.nix b/pkgs/applications/science/logic/logisim/default.nix index ab46efa9a9612273d7e256d16c4f5af1042c9c50..c71ed73a99250b84852bd37424cc593445113b28 100644 --- a/pkgs/applications/science/logic/logisim/default.nix +++ b/pkgs/applications/science/logic/logisim/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation { meta = { homepage = "http://ozark.hendrix.edu/~burch/logisim"; description = "Educational tool for designing and simulating digital logic circuits"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/applications/science/logic/matita/130312.nix b/pkgs/applications/science/logic/matita/130312.nix index f77e9d34a2a8816a8f806393f6250fd1e97dff56..9e98c8db394763fc51e1adafe237bfc4001b3bab 100644 --- a/pkgs/applications/science/logic/matita/130312.nix +++ b/pkgs/applications/science/logic/matita/130312.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation { meta = { homepage = http://matita.cs.unibo.it/; description = "Matita is an experimental, interactive theorem prover"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.roconnor ]; }; } diff --git a/pkgs/applications/science/logic/matita/default.nix b/pkgs/applications/science/logic/matita/default.nix index 0713ff09e92990b6e7bc3e256075210fb7deed19..f601f97de62ef1530de609d00247fdde141a9b34 100644 --- a/pkgs/applications/science/logic/matita/default.nix +++ b/pkgs/applications/science/logic/matita/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation { meta = { homepage = http://matita.cs.unibo.it/; description = "Matita is an experimental, interactive theorem prover"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.roconnor ]; }; } diff --git a/pkgs/applications/science/logic/minisat/default.nix b/pkgs/applications/science/logic/minisat/default.nix index 1f29b3aa1a112c41b48f78a0910556ef5b726420..e91ff67fc9cce6df9b9130ce64f8fe784a9bf165 100644 --- a/pkgs/applications/science/logic/minisat/default.nix +++ b/pkgs/applications/science/logic/minisat/default.nix @@ -2,9 +2,9 @@ x@{builderDefsPackage , zlib , ...}: builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ []; buildInputs = map (n: builtins.getAttr n x) @@ -36,7 +36,7 @@ rec { setVars = a.fullDepEntry ('' export MROOT=$PWD/../ '') ["doUnpack"]; - + meta = { description = "A compact and readable SAT-solver"; maintainers = with a.lib.maintainers; @@ -45,7 +45,7 @@ rec { ]; platforms = with a.lib.platforms; linux; - license = "MIT"; + license = a.stdenv.lib.licenses.mit; homepage = "http://minisat.se/"; }; passthru = { @@ -54,4 +54,3 @@ rec { }; }; }) x - diff --git a/pkgs/applications/science/logic/opensmt/default.nix b/pkgs/applications/science/logic/opensmt/default.nix index 430537fd57ff488f7c112541ea3ca1f24ed48771..62e11651175f20d958ee84f79187b1bd8d747f27 100644 --- a/pkgs/applications/science/logic/opensmt/default.nix +++ b/pkgs/applications/science/logic/opensmt/default.nix @@ -3,9 +3,9 @@ x@{builderDefsPackage , gmpxx, flex, bison , ...}: builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ []; buildInputs = map (n: builtins.getAttr n x) @@ -30,17 +30,14 @@ rec { /* doConfigure should be removed if not needed */ phaseNames = ["doAutotools" "doConfigure" "doMakeInstall"]; - + meta = { description = "A satisfiability modulo theory (SMT) solver"; - maintainers = with a.lib.maintainers; - [ - raskin - ]; - platforms = with a.lib.platforms; - linux; - license = "GPLv3"; + maintainers = [ a.lib.maintainers.raskin ]; + platforms = a.lib.platforms.linux; + license = a.stdenv.lib.licenses.gpl3; homepage = "http://code.google.com/p/opensmt/"; + broken = true; }; passthru = { updateInfo = { @@ -48,4 +45,3 @@ rec { }; }; }) x - diff --git a/pkgs/applications/science/logic/picosat/default.nix b/pkgs/applications/science/logic/picosat/default.nix index 970daf739fca84348141f13411206ff019310b7f..6c2cce0ea4b10d4689182c55dea944496c5dc8d9 100644 --- a/pkgs/applications/science/logic/picosat/default.nix +++ b/pkgs/applications/science/logic/picosat/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://fmv.jku.at/picosat/; description = "SAT solver with proof and core support"; - license = "MIT"; + license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.roconnor ]; }; } diff --git a/pkgs/applications/science/logic/twelf/default.nix b/pkgs/applications/science/logic/twelf/default.nix index 1079c3783218b3c2a867cfc1bcda97670350e50f..c6c7e4d9c1a719230740636234fca4f2e9bd9223 100644 --- a/pkgs/applications/science/logic/twelf/default.nix +++ b/pkgs/applications/science/logic/twelf/default.nix @@ -17,15 +17,15 @@ stdenv.mkDerivation rec { ''; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin rsync -av bin/* $out/bin/ - ensureDir $out/share/emacs/site-lisp/twelf/ + mkdir -p $out/share/emacs/site-lisp/twelf/ rsync -av emacs/ $out/share/emacs/site-lisp/twelf/ - ensureDir $out/share/twelf/examples + mkdir -p $out/share/twelf/examples rsync -av examples/ $out/share/twelf/examples/ - ensureDir $out/share/twelf/vim + mkdir -p $out/share/twelf/vim rsync -av vim/ $out/share/twelf/vim/ ''; diff --git a/pkgs/applications/science/math/content/default.nix b/pkgs/applications/science/math/content/default.nix index 87c047c299573fefab45d13e992db1ff4e53f1b7..177efd667a394f787a2cd01aa52f20b405734230 100644 --- a/pkgs/applications/science/math/content/default.nix +++ b/pkgs/applications/science/math/content/default.nix @@ -93,5 +93,6 @@ rec { a.lib.maintainers.raskin ]; platforms = a.lib.platforms.linux; + broken = true; }; } diff --git a/pkgs/applications/science/math/eukleides/default.nix b/pkgs/applications/science/math/eukleides/default.nix index 55ea4c6216c6036b9b662c36456f72c6eb342395..fdf5c1bd831531effe17072e5f50f4127310c274 100644 --- a/pkgs/applications/science/math/eukleides/default.nix +++ b/pkgs/applications/science/math/eukleides/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = { description = "Geometry Drawing Language"; homepage = "http://www.eukleides.org/"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; longDescription = '' Eukleides is a computer language devoted to elementary plane diff --git a/pkgs/applications/science/math/gap/default.nix b/pkgs/applications/science/math/gap/default.nix index f76640567f60d27f9150c9a6947489152344c909..0700251c3a826f3193768510becbc33c98176c18 100644 --- a/pkgs/applications/science/math/gap/default.nix +++ b/pkgs/applications/science/math/gap/default.nix @@ -1,10 +1,10 @@ x@{builderDefsPackage - , pari ? null + , pari ? null , ...}: builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ []; buildInputs = map (n: builtins.getAttr n x) @@ -38,20 +38,20 @@ rec { phaseNames = ["doConfigure" "doMake" "doDeploy"]; doDeploy = a.fullDepEntry '' - ensureDir "$out/bin" "$out/share/gap/" + mkdir -p "$out/bin" "$out/share/gap/" cp -r . "$out/share/gap/build-dir" tar xf "${pkgSrc}" -C "$out/share/gap/build-dir/pkg" - ${if a.pari != null then - ''sed -e '2iexport PATH=$PATH:${pari}/bin' -i "$out/share/gap/build-dir/bin/gap.sh" '' + ${if a.pari != null then + ''sed -e '2iexport PATH=$PATH:${pari}/bin' -i "$out/share/gap/build-dir/bin/gap.sh" '' else ""} - sed -e "/GAP_DIR=/aGAP_DIR='$out/share/gap/build-dir/'" -i "$out/share/gap/build-dir/bin/gap.sh" + sed -e "/GAP_DIR=/aGAP_DIR='$out/share/gap/build-dir/'" -i "$out/share/gap/build-dir/bin/gap.sh" ln -s "$out/share/gap/build-dir/bin/gap.sh" "$out/bin" '' ["doMake" "minInit" "defEnsureDir"]; - + meta = { description = "Computational discrete algebra system"; maintainers = with a.lib.maintainers; @@ -60,8 +60,8 @@ rec { ]; platforms = with a.lib.platforms; linux; - license = "GPLv2"; + license = with a.lib.licenses; + gpl2; homepage = "http://gap-system.org/"; }; }) x - diff --git a/pkgs/applications/science/math/mathematica/default.nix b/pkgs/applications/science/math/mathematica/default.nix index 997080ee303cd235ccf749b76bba890425feada7..d4d352c95bbb0914dec7eb38cea961e3ce477a5e 100644 --- a/pkgs/applications/science/math/mathematica/default.nix +++ b/pkgs/applications/science/math/mathematica/default.nix @@ -119,6 +119,6 @@ stdenv.mkDerivation rec { meta = { description = "Wolfram Mathematica computational software system"; homepage = "http://www.wolfram.com/mathematica/"; - license = "unfree"; + license = stdenv.lib.licenses.unfree; }; } diff --git a/pkgs/applications/science/math/maxima/default.nix b/pkgs/applications/science/math/maxima/default.nix index 7123b476f3560ef5047ccceb0b2da0523ad707a7..096796a859d00ef5de8b5ab54a9feb9e8c663715 100644 --- a/pkgs/applications/science/math/maxima/default.nix +++ b/pkgs/applications/science/math/maxima/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation { meta = { description = "Maxima computer algebra system"; homepage = "http://maxima.sourceforge.net"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; longDescription = '' Maxima is a fairly complete computer algebra system written in diff --git a/pkgs/applications/science/math/singular/default.nix b/pkgs/applications/science/math/singular/default.nix index 5c5dfae8200f7501a58db1b9c2b6b195c3514b69..1afb510e9948c2b04a2e77112b7e8dbb72692c9a 100644 --- a/pkgs/applications/science/math/singular/default.nix +++ b/pkgs/applications/science/math/singular/default.nix @@ -3,9 +3,9 @@ x@{builderDefsPackage , coreutils , ...}: builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ []; buildInputs = map (n: builtins.getAttr n x) @@ -38,9 +38,9 @@ rec { rm -rf "$out/LIB" cp -r Singular/LIB "$out" mkdir -p "$out/bin" - ln -s "$out"/*/Singular "$out/bin" + ln -s "$out/"*/Singular "$out/bin" '') ["minInit" "defEnsureDir"]; - + meta = { description = "A CAS for polynomial computations"; maintainers = with a.lib.maintainers; @@ -49,7 +49,7 @@ rec { ]; platforms = with a.lib.platforms; linux; - license = "GPLv3"; # Or GPLv2 at your option - but not GPLv4 + license = a.stdenv.lib.licenses.gpl3; # Or GPLv2 at your option - but not GPLv4 homepage = "http://www.singular.uni-kl.de/index.php"; }; passthru = { @@ -58,4 +58,3 @@ rec { }; }; }) x - diff --git a/pkgs/applications/science/math/sloane/default.nix b/pkgs/applications/science/math/sloane/default.nix index 72c2028e63c97c8c1a322a48aec13effd9f57e07..b3bde7874cab6c36952cf63340da1b3d0628ed78 100644 --- a/pkgs/applications/science/math/sloane/default.nix +++ b/pkgs/applications/science/math/sloane/default.nix @@ -1,18 +1,18 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, ansiTerminal, filepath, HTTP, network, optparseApplicative -, terminalSize, text, time, zlib +{ cabal, ansiTerminal, cereal, downloadCurl, filepath, HTTP +, network, optparseApplicative, terminalSize, text, zlib }: cabal.mkDerivation (self: { pname = "sloane"; - version = "1.8.2"; - sha256 = "0kdznrvyrax1gihqxxw36jfbmjri808ii827fa71v2ijlm416hk1"; + version = "1.9.1"; + sha256 = "0scnvir7il8ldy3g846xmrdkk2rxnlsiyqak0jvcarf2qi251x5i"; isLibrary = false; isExecutable = true; buildDepends = [ - ansiTerminal filepath HTTP network optparseApplicative terminalSize - text time zlib + ansiTerminal cereal downloadCurl filepath HTTP network + optparseApplicative terminalSize text zlib ]; postInstall = '' mkdir -p $out/share/man/man1 diff --git a/pkgs/applications/science/math/weka/default.nix b/pkgs/applications/science/math/weka/default.nix index 8471c46c8d75d6d5e3335b4a4cd740d5d7d6b8cd..66609fa5834154e3f53b92bcc393ac3b5a747ad1 100644 --- a/pkgs/applications/science/math/weka/default.nix +++ b/pkgs/applications/science/math/weka/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation { meta = { homepage = "http://www.cs.waikato.ac.nz/ml/weka/"; description = "Collection of machine learning algorithms for data mining tasks"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/applications/science/math/wxmaxima/default.nix b/pkgs/applications/science/math/wxmaxima/default.nix index 01be4ba7e6c6376ecab0b53bdcea6c91d975a545..75448b6965cdafe3a1ad7da26cf6c65f95cb8243 100644 --- a/pkgs/applications/science/math/wxmaxima/default.nix +++ b/pkgs/applications/science/math/wxmaxima/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { meta = { description = "Cross platform GUI for the computer algebra system Maxima"; - license = "GPL2"; + license = stdenv.lib.licenses.gpl2; homepage = http://wxmaxima.sourceforge.net; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.simons ]; diff --git a/pkgs/applications/science/math/yacas/default.nix b/pkgs/applications/science/math/yacas/default.nix index acc4740eb6b4d1694516c0e4ab07f59215f6b64f..2c9d63be1b4d47dd6dd96cac051c88b8f3551ad2 100644 --- a/pkgs/applications/science/math/yacas/default.nix +++ b/pkgs/applications/science/math/yacas/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = { description = "Easy to use, general purpose Computer Algebra System"; homepage = http://yacas.sourceforge.net/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; all; }; diff --git a/pkgs/applications/science/misc/boinc/default.nix b/pkgs/applications/science/misc/boinc/default.nix index f4b79c8d236fb9070cd9f2ca58538b16bbde61fb..7020de0bca88a48dac90c8f2edd51055280c9fb7 100644 --- a/pkgs/applications/science/misc/boinc/default.nix +++ b/pkgs/applications/science/misc/boinc/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { homepage = http://boinc.berkeley.edu/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; platforms = stdenv.lib.platforms.linux; # arbitrary choice }; diff --git a/pkgs/applications/science/misc/golly/default.nix b/pkgs/applications/science/misc/golly/default.nix index a380f05b0915f36a19d3a4cfe09bd7fc0b3e2b78..9d198cd5c7f807af1044456148784ba233003276 100644 --- a/pkgs/applications/science/misc/golly/default.nix +++ b/pkgs/applications/science/misc/golly/default.nix @@ -1,11 +1,11 @@ -x@{builderDefsPackage, +x@{builderDefsPackage, wxGTK, perl, python, zlib , ...}: builderDefsPackage -(a : -let +(a : +let s = import ./src-for-default.nix; - helperArgNames = ["builderDefsPackage"] ++ + helperArgNames = ["builderDefsPackage"] ++ []; buildInputs = map (n: builtins.getAttr n x) (builtins.attrNames (builtins.removeAttrs x helperArgNames)); @@ -26,7 +26,7 @@ rec { export NIX_LDFLAGS="$NIX_LDFLAGS -l$pythonLib" echo "Flags: $NIX_LDFLAGS" ''; - + meta = { description = "Cellular automata simulation program"; maintainers = with a.lib.maintainers; @@ -35,7 +35,7 @@ rec { ]; platforms = with a.lib.platforms; linux; - license = "GPLv2"; + license = with a.lib.licenses; + gpl2; }; }) x - diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index 53a045ac6f0ee11f9e0115c5d95611879c30ed5c..1227e76ac0c5ef3d18b3cdeb3ec45d99cb478837 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation rec { meta = { homepage = "http://root.cern.ch/drupal/"; description = "A data analysis framework"; - platforms = stdenv.lib.platforms.mesaPlatforms; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/science/misc/simgrid/default.nix b/pkgs/applications/science/misc/simgrid/default.nix index 5fdede1abcdf639e30c556be5fb5a858227d5a4d..29a7caf769bea9ddbf8149af4f344454fff1567f 100644 --- a/pkgs/applications/science/misc/simgrid/default.nix +++ b/pkgs/applications/science/misc/simgrid/default.nix @@ -1,20 +1,19 @@ -{ fetchurl, stdenv, cmake, perl, ruby }: +{ fetchurl, stdenv, cmake, perl, ruby, boost, lua5_1, graphviz, libsigcxx +, libunwind, elfutils +}: stdenv.mkDerivation rec { - name = "simgrid-3.5"; + version = "3.11.1"; + name = "simgrid-${version}"; src = fetchurl { - url = "https://gforge.inria.fr/frs/download.php/28017/${name}.tar.gz"; - sha256 = "1vd4pvrcyii1nfwyca3kpbwshbc965lfpn083zd8rigg6ydchq8y"; + url = "https://gforge.inria.fr/frs/download.php/33686/${name}.tar.gz"; + sha256 = "0mkrzxpf42lmn96khfl1791vram67r2nqsgmppd2yil889nyz5kp"; }; - /* FIXME: Ruby currently disabled because of this: - - Linking C shared library ../src/.libs/libsimgrid.so - ld: cannot find -lruby-1.8.7-p72 - - */ - buildInputs = [ cmake perl /* ruby */ ]; + buildInputs = [ cmake perl ruby boost lua5_1 graphviz libsigcxx libunwind + elfutils + ]; preConfigure = # Make it so that libsimgrid.so will be found when running programs from @@ -22,8 +21,17 @@ stdenv.mkDerivation rec { '' export LD_LIBRARY_PATH="$PWD/src/.libs" export cmakeFlags="-Dprefix=$out" - # Enable tracing. - export cmakeFlags="$cmakeFlags -Denable_tracing=on" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE + -isystem $(echo "${libsigcxx}/lib/"sigc++*/include) + -isystem $(echo "${libsigcxx}/include"/sigc++* ) + " + export CMAKE_PREFIX_PATH="$CMAKE_PREFIX_PATH:$(echo "${libsigcxx}/lib/"sigc++*)" + + # Enable more functionality. + export cmakeFlags="$cmakeFlags -Denable_tracing=on -Denable_jedule=on + -Denable_latency_bound_tracking=on -Denable_lua=on + -Denable_ns3=on -Denable_gtnets=on + " ''; makeFlags = "VERBOSE=1"; @@ -45,6 +53,7 @@ stdenv.mkDerivation rec { patchPhase = '' for i in "src/smpi/"* do + test -f "$i" && sed -i "$i" -e's|/bin/bash|/bin/sh|g' done @@ -71,7 +80,7 @@ stdenv.mkDerivation rec { homepage = http://simgrid.gforge.inria.fr/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ ]; platforms = stdenv.lib.platforms.gnu; # arbitrary choice diff --git a/pkgs/applications/science/misc/tulip/default.nix b/pkgs/applications/science/misc/tulip/default.nix index e58183a4f40b945641292efc2cfaadf1521d2f9b..da6e0cb2805d4a0efc01ece67a1fbe3edc373bc9 100644 --- a/pkgs/applications/science/misc/tulip/default.nix +++ b/pkgs/applications/science/misc/tulip/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { homepage = http://tulip.labri.fr/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ ]; platforms = stdenv.lib.platforms.gnu; # arbitrary choice diff --git a/pkgs/applications/search/doodle/default.nix b/pkgs/applications/search/doodle/default.nix index a6b3ac7ccfdfe1b86298fbf0a69f95891cc20d09..3a9df15057423af8680f80f9cbd682a9157a7228 100644 --- a/pkgs/applications/search/doodle/default.nix +++ b/pkgs/applications/search/doodle/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://grothoff.org/christian/doodle/; description = "Tool to quickly index and search documents on a computer"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/version-management/cvsps/default.nix b/pkgs/applications/version-management/cvsps/default.nix index 1be797fea9666a1a2e2b44a2efe95ea20025a5a5..9bc4401e06812d30e325321ed347c4429f50c58e 100644 --- a/pkgs/applications/version-management/cvsps/default.nix +++ b/pkgs/applications/version-management/cvsps/default.nix @@ -24,6 +24,6 @@ stdenv.mkDerivation rec { same time (using a single "cvs commit" command). ''; homepage = http://www.cobite.com/cvsps/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/applications/version-management/git-and-tools/git-bz/default.nix b/pkgs/applications/version-management/git-and-tools/git-bz/default.nix index 3a2270cf972d07a8dcbd9f362c5bb5aecab0b12a..4c4ff62901e5867b11d8719c15b71632ad370340 100644 --- a/pkgs/applications/version-management/git-and-tools/git-bz/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-bz/default.nix @@ -21,8 +21,8 @@ stdenv.mkDerivation { ''; installPhase = '' - ensureDir $out - ensureDir $out/bin + mkdir -p $out + mkdir -p $out/bin cp git-bz $out/bin wrapProgram $out/bin/git-bz \ --prefix PYTHONPATH : "$(toPythonPath $python):$(toPythonPath $pysqlite)" diff --git a/pkgs/applications/version-management/git-and-tools/github-backup/default.nix b/pkgs/applications/version-management/git-and-tools/github-backup/default.nix index f9d43037f6a12041124ad1f7a193d24179a8540e..ca329eddc66a840f3cfa07d16be2766763458b40 100644 --- a/pkgs/applications/version-management/git-and-tools/github-backup/default.nix +++ b/pkgs/applications/version-management/git-and-tools/github-backup/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "github-backup"; - version = "1.20140707"; - sha256 = "0c15gq91c36xza7yiimqvgk609p9xf9jlzy9683d9p9bx1khpadd"; + version = "1.20140721"; + sha256 = "0bnkfmgpk1iaaqck4ppn461fzk3s2761w2nxfrvw10gc934lhrxc"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -21,5 +21,7 @@ cabal.mkDerivation (self: { description = "backs up everything github knows about a repository, to the repository"; license = "GPL"; platforms = self.ghc.meta.platforms; + hydraPlatforms = self.stdenv.lib.platforms.none; + broken = true; }; }) diff --git a/pkgs/applications/version-management/git-and-tools/qgit/default.nix b/pkgs/applications/version-management/git-and-tools/qgit/default.nix index d92b49b9ef6c58b24b5dfdb7444f3ef5eaeb54cd..a7e6a62ce5f5eee3e1c1592f8b84a6a2dd824226 100644 --- a/pkgs/applications/version-management/git-and-tools/qgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/qgit/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "qgit-2.5"; meta = { - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; homepage = "http://libre.tibirna.org/projects/qgit/wiki/QGit"; description = "Graphical front-end to Git"; inherit (qt.meta) platforms; diff --git a/pkgs/applications/version-management/git-and-tools/qgit/qgit-git.nix b/pkgs/applications/version-management/git-and-tools/qgit/qgit-git.nix index c3b3469ca1ad18b3b684a419742869b685101d98..590e090de48c709c16b314e53dfac21d6b010d64 100644 --- a/pkgs/applications/version-management/git-and-tools/qgit/qgit-git.nix +++ b/pkgs/applications/version-management/git-and-tools/qgit/qgit-git.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "qgit-git"; meta = { - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; homepage = "http://digilander.libero.it/mcostalba/"; description = "Graphical front-end to Git"; }; diff --git a/pkgs/applications/version-management/git-and-tools/svn2git-kde/default.nix b/pkgs/applications/version-management/git-and-tools/svn2git-kde/default.nix index c44f2dbcbb6bd84993076211fc759cba54259919..94c819e711b5945af162075805fa74c74ffe9d06 100644 --- a/pkgs/applications/version-management/git-and-tools/svn2git-kde/default.nix +++ b/pkgs/applications/version-management/git-and-tools/svn2git-kde/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin cp svn-all-fast-export $out/bin ''; diff --git a/pkgs/applications/version-management/git-and-tools/topgit/default.nix b/pkgs/applications/version-management/git-and-tools/topgit/default.nix index 5290a12a54ac1830166ae878dda08d0b9e158e63..195f6f3a4635c7b99e818c0fe3cce32d977a9ede 100644 --- a/pkgs/applications/version-management/git-and-tools/topgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/topgit/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/greenrd/topgit"; description = "TopGit manages large amount of interdependent topic branches"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ marcweber ludo simons ]; }; diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix index 73b21728e16569c1ee858cd711ff42b6f1d45cee..29094f1efce4b9f4863b4ae8f6d2fcfa6f7c904a 100644 --- a/pkgs/applications/version-management/meld/default.nix +++ b/pkgs/applications/version-management/meld/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Visual diff and merge tool"; homepage = http://meld.sourceforge.net; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = platforms.linux; }; } diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 5fdafe8ac2aa5a1f0e93b183ad77423a003d7af7..8237a5517c7ee87f1e36e241a5100d8e61328d99 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -2,7 +2,8 @@ , guiSupport ? false, tk ? null, curses }: let - name = "mercurial-2.9.2"; + version = "3.1"; + name = "mercurial-${version}"; in stdenv.mkDerivation { @@ -10,7 +11,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://mercurial.selenic.com/release/${name}.tar.gz"; - sha256 = "0lwgncim4cy91ly8389h2bbhl4nbi8xjgp0kx37kgq8q2lx2nil6"; + sha256 = "1r6hdxka867lpsq2jq3vz662m3ywflg4yylayc9g0s9gmiww5pgi"; }; inherit python; # pass it so that the same version can be used in hg2git @@ -53,9 +54,11 @@ stdenv.mkDerivation { ''; meta = { + inherit version; description = "A fast, lightweight SCM system for very large distributed projects"; - homepage = "http://www.selenic.com/mercurial/"; - license = "GPLv2"; + homepage = "http://mercurial.selenic.com/"; + downloadPage = "http://mercurial.selenic.com/release/"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.eelco ]; }; } diff --git a/pkgs/applications/version-management/mr/default.nix b/pkgs/applications/version-management/mr/default.nix index e89cea6aadcea0ce59d5e140df4ee3dae4dcc05a..29fafc4db74cd4a7bc3f9b638231e6d37adca023 100644 --- a/pkgs/applications/version-management/mr/default.nix +++ b/pkgs/applications/version-management/mr/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { offline, so they can be retried when it comes back online. ''; homepage = http://joeyh.name/code/mr/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.antono ]; }; diff --git a/pkgs/applications/version-management/rapidsvn/default.nix b/pkgs/applications/version-management/rapidsvn/default.nix index 264340b48262625d78d972b6ac564067c7ec441c..843fe9ad3230d5aa21d6849c7cc4c0a1d3cf83e8 100644 --- a/pkgs/applications/version-management/rapidsvn/default.nix +++ b/pkgs/applications/version-management/rapidsvn/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = { description = "Multi-platform GUI front-end for the Subversion revision system"; homepage = http://rapidsvn.tigris.org/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.viric ]; }; } diff --git a/pkgs/applications/version-management/rcs/default.nix b/pkgs/applications/version-management/rcs/default.nix index 90bca9b07124cf4f8803e5ae917efba2ab035707..e71d23132acafaf95b93896a15d75125887d330a 100644 --- a/pkgs/applications/version-management/rcs/default.nix +++ b/pkgs/applications/version-management/rcs/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { documentation, graphics, papers, and form letters. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [ eelco simons ]; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index e699b82f2b0a996093b32faf321990cec76350d3..7526bb5f04370d7aa1952c71a513b924cf8671fd 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -17,13 +17,13 @@ assert javahlBindings -> jdk != null && perl != null; stdenv.mkDerivation rec { - version = "1.8.8"; + version = "1.8.9"; name = "subversion-${version}"; src = fetchurl { url = "mirror://apache/subversion/${name}.tar.bz2"; - sha256 = "1cqxwydjidyf59y4lgkxl7bra1sy28abqm2mi5971qjsv0f96s8m"; + sha1 = "424ee12708f39a126efd905886666083dcc4eeaf"; }; buildInputs = [ zlib apr aprutil sqlite ] @@ -73,6 +73,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + # Hack to build on Mac OS X. The system header files use C99-style + # comments, but Subversion passes -std=c90. + NIX_CFLAGS_COMPILE = "-std=c99"; + meta = { description = "A version control system intended to be a compelling replacement for CVS in the open source community"; homepage = http://subversion.apache.org/; diff --git a/pkgs/applications/version-management/tkcvs/default.nix b/pkgs/applications/version-management/tkcvs/default.nix index 569c442f9838f04973be4a9c9a167f431ca142a5..b3bfe8a22e68186f59cfc4c2d6c50f2f02987ef8 100644 --- a/pkgs/applications/version-management/tkcvs/default.nix +++ b/pkgs/applications/version-management/tkcvs/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation meta = { homepage = http://www.twobarleycorns.net/tkcvs.html; description = "TCL/TK GUI for cvs and subversion"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/applications/video/aegisub/default.nix b/pkgs/applications/video/aegisub/default.nix index 41b25401367c7ea2a62124a87bab5697ffe3e047..c06aa0a036cdad7a688c94229773f569b92d8050 100644 --- a/pkgs/applications/video/aegisub/default.nix +++ b/pkgs/applications/video/aegisub/default.nix @@ -22,11 +22,11 @@ assert portaudioSupport -> (portaudio != null); stdenv.mkDerivation rec { name = "aegisub-${version}"; - version = "3.1.3"; + version = "3.2.0"; src = fetchurl { url = "http://ftp.aegisub.org/pub/releases/${name}.tar.xz"; - sha256 = "0n2y5cggayr8246p2cvrz0ajlhhvmzcgsp7nljnm21jypk15pspg"; + sha256 = "0nciw5p1aq94qwz5j4vbc06fywdjhazgh4qs6qr9iqj3n94gvrfr"; }; nativeBuildInputs = [ intltool ]; diff --git a/pkgs/applications/video/avxsynth/default.nix b/pkgs/applications/video/avxsynth/default.nix index 70dcad49c9789041639ade00e095451f8558acdf..a9a2ec46397f00632a8152d0aee311aeb55f698e 100644 --- a/pkgs/applications/video/avxsynth/default.nix +++ b/pkgs/applications/video/avxsynth/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { homepage = https://github.com/avxsynth/avxsynth/wiki; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/video/bangarang/default.nix b/pkgs/applications/video/bangarang/default.nix index 1058243c0e08d74f70862f8a3b53542d02a1b2e6..f962b52dd627337fe623ea2a647958a2d2d36ecb 100644 --- a/pkgs/applications/video/bangarang/default.nix +++ b/pkgs/applications/video/bangarang/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { media collection management, playlists and statistics. ''; homepage = http://bangarangkde.wordpress.com/; - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3; maintainers = [ maintainers.phreedom maintainers.urkud ]; platforms = platforms.linux; }; diff --git a/pkgs/applications/video/cinelerra/default.nix b/pkgs/applications/video/cinelerra/default.nix index ce8bbde2ecd151ee77dfaa2777b5f3dd46201055..8287cb9121ea3c260498bf2a4be2deeee86c7690 100644 --- a/pkgs/applications/video/cinelerra/default.nix +++ b/pkgs/applications/video/cinelerra/default.nix @@ -44,6 +44,6 @@ stdenv.mkDerivation { description = "Video Editor"; homepage = http://www.cinelerra.org; maintainers = [ stdenv.lib.maintainers.marcweber ]; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/applications/video/coriander/default.nix b/pkgs/applications/video/coriander/default.nix index f4be54ae23ecc612ca4896a8166f0cce5a7fa903..e3c288534035641ed3e02d8939b76d5b59482066 100644 --- a/pkgs/applications/video/coriander/default.nix +++ b/pkgs/applications/video/coriander/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://damien.douxchamps.net/ieee1394/coriander/; description = "GUI for controlling a Digital Camera through the IEEE1394 bus"; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/video/dvb-apps/default.nix b/pkgs/applications/video/dvb-apps/default.nix index 74e3d58553a7b1d5bc04ddfce85eaa3762720f62..5e8e63564f4f8dd9c4415e95e13aae4e40ed7781 100644 --- a/pkgs/applications/video/dvb-apps/default.nix +++ b/pkgs/applications/video/dvb-apps/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation { description = "Linux DVB API applications and utilities"; homepage = http://linuxtv.org/; platforms = stdenv.lib.platforms.linux; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/applications/video/gnash/default.nix b/pkgs/applications/video/gnash/default.nix index 2e8b7e63cb82a02e3def2dbec4439eed305f7082..06122619066ad48e5f995ba451794e31de7ca3f6 100644 --- a/pkgs/applications/video/gnash/default.nix +++ b/pkgs/applications/video/gnash/default.nix @@ -114,7 +114,7 @@ stdenv.mkDerivation rec { supports most SWF v7 features and some SWF v8 and v9. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; platforms = stdenv.lib.platforms.gnu; diff --git a/pkgs/applications/video/kdenlive/default.nix b/pkgs/applications/video/kdenlive/default.nix index d7fab74e6cac92e618e8066d99e0cd3fb0903f69..8c51c4f35a3b96d4214bb684cd2ec76b407832e7 100644 --- a/pkgs/applications/video/kdenlive/default.nix +++ b/pkgs/applications/video/kdenlive/default.nix @@ -1,28 +1,36 @@ -{ stdenv, fetchurl, lib, cmake, qt4, perl, kdelibs, automoc4, phonon -, mlt, gettext , qimageblitz, qjson, shared_mime_info, soprano -, pkgconfig, shared_desktop_ontologies, libv4l }: +{ stdenv, fetchurl, frei0r, lib, cmake, qt4, perl, kdelibs, automoc4 +, phonon , makeWrapper, mlt, gettext , qimageblitz, qjson +, shared_mime_info, soprano, pkgconfig, shared_desktop_ontologies +, libv4l +}: stdenv.mkDerivation rec { name = "kdenlive-${version}"; - version = "0.9.6"; + version = "0.9.8"; src = fetchurl { url = "mirror://kde/stable/kdenlive/${version}/src/${name}.tar.bz2"; - sha256 = "1rw2cbzy5mabwijvryyzbhpgldn2zy5jy4j87hl4m1i8ah9lgi7x"; + sha256 = "17x5srgywcwlbpbs598jwwc62l8313n4dbqx3sdk7p6lyvwk3jln"; }; - buildInputs = - [ cmake qt4 perl kdelibs automoc4 phonon mlt gettext qimageblitz - qjson shared_mime_info soprano pkgconfig shared_desktop_ontologies libv4l - ]; + buildInputs = [ + automoc4 cmake frei0r gettext kdelibs libv4l makeWrapper mlt perl + phonon pkgconfig qimageblitz qjson qt4 shared_desktop_ontologies + shared_mime_info soprano + ]; enableParallelBuilding = true; + postInstall = '' + wrapProgram $out/bin/kdenlive --prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1 + wrapProgram $out/bin/kdenlive_render --prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1 + ''; + meta = { description = "Free and open source video editor"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://www.kdenlive.org/; - maintainers = with stdenv.lib.maintainers; [viric]; + maintainers = with stdenv.lib.maintainers; [ goibhniu viric ]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/applications/video/kino/default.nix b/pkgs/applications/video/kino/default.nix index 30e0bdfb197a5fdbf34ea1888f57a40c79d52204..16bd57bef34a6d21e241eb4ffe8306cc3b969d1b 100644 --- a/pkgs/applications/video/kino/default.nix +++ b/pkgs/applications/video/kino/default.nix @@ -87,6 +87,6 @@ stdenv.mkDerivation { meta = { description = "Kino is a non-linear DV editor for GNU/Linux"; homepage = http://www.kinodv.org/; - license = "GPL2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/applications/video/lxdvdrip/default.nix b/pkgs/applications/video/lxdvdrip/default.nix index 1b3acd2c2ff32774f5bd66ddd2b4299f8ec868be..6e7b874841fc9c519417442eeccac9ac525fd4f2 100644 --- a/pkgs/applications/video/lxdvdrip/default.nix +++ b/pkgs/applications/video/lxdvdrip/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation rec { meta = { description = "Command line tool to make a copy from a video DVD for private use"; homepage = http://sourceforge.net/projects/lxdvdrip; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/applications/video/makemkv/builder.sh b/pkgs/applications/video/makemkv/builder.sh index 0e1898a45564f4dd7965ed9cc32faf371144eff4..e4cfcf3d9068b0abc925a5820fd827b210a998c4 100644 --- a/pkgs/applications/video/makemkv/builder.sh +++ b/pkgs/applications/video/makemkv/builder.sh @@ -30,9 +30,9 @@ for i in ${bin} ; do ${i} done -ensureDir $out/bin -ensureDir $out/lib -ensureDir $out/share/MakeMKV +mkdir -p $out/bin +mkdir -p $out/lib +mkdir -p $out/share/MakeMKV cp ${lib} ${out}/lib cp ${bin} ${out}/bin cp makemkv-bin-${ver}/src/share/* $out/share/MakeMKV diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix index 43482bd976247f8c0f2841d79476cb668d13a219..bec9d85aefd8be536b8e7ee78e9396cc6a20b320 100644 --- a/pkgs/applications/video/makemkv/default.nix +++ b/pkgs/applications/video/makemkv/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { can always download the latest version from makemkv.com that will reset the expiration date. ''; - license = "unfree"; + license = stdenv.lib.licenses.unfree; homepage = http://makemkv.com; }; } diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix index 6d8780d6cf4833861c6c2d5146103d57568346bf..f3cef6db69f11d9835e2a0630bd854a84af7f283 100644 --- a/pkgs/applications/video/mplayer/default.nix +++ b/pkgs/applications/video/mplayer/default.nix @@ -15,7 +15,7 @@ , speexSupport ? true, speex ? null , theoraSupport ? true, libtheora ? null , x264Support ? false, x264 ? null -, jackaudioSupport ? false, jackaudio ? null +, jackaudioSupport ? false, jack2 ? null , pulseSupport ? false, pulseaudio ? null , bs2bSupport ? false, libbs2b ? null # For screenshots @@ -40,7 +40,7 @@ assert lameSupport -> lame != null; assert speexSupport -> speex != null; assert theoraSupport -> libtheora != null; assert x264Support -> x264 != null; -assert jackaudioSupport -> jackaudio != null; +assert jackaudioSupport -> jack2 != null; assert pulseSupport -> pulseaudio != null; assert bs2bSupport -> libbs2b != null; assert libpngSupport -> libpng != null; @@ -72,7 +72,7 @@ let cp -prv * $out ''; - meta.license = "unfree"; + meta.license = stdenv.lib.licenses.unfree; } else null; in @@ -109,7 +109,7 @@ stdenv.mkDerivation rec { ++ optional dvdnavSupport libdvdnav ++ optional bluraySupport libbluray ++ optional cddaSupport cdparanoia - ++ optional jackaudioSupport jackaudio + ++ optional jackaudioSupport jack2 ++ optionals amrSupport [ amrnb amrwb ] ++ optional x264Support x264 ++ optional pulseSupport pulseaudio diff --git a/pkgs/applications/video/mplayer2/default.nix b/pkgs/applications/video/mplayer2/default.nix index 74b74037e50e0a40bac7da396e516b7dead2a953..d8ada6372b10198ee6283fbbd581f40753a7aa6c 100644 --- a/pkgs/applications/video/mplayer2/default.nix +++ b/pkgs/applications/video/mplayer2/default.nix @@ -10,7 +10,7 @@ , bluraySupport ? true, libbluray ? null , speexSupport ? true, speex ? null , theoraSupport ? true, libtheora ? null -, jackaudioSupport ? false, jackaudio ? null +, jackaudioSupport ? false, jack2 ? null , pulseSupport ? true, pulseaudio ? null , bs2bSupport ? false, libbs2b ? null # For screenshots @@ -28,7 +28,7 @@ assert dvdnavSupport -> libdvdnav != null; assert bluraySupport -> libbluray != null; assert speexSupport -> speex != null; assert theoraSupport -> libtheora != null; -assert jackaudioSupport -> jackaudio != null; +assert jackaudioSupport -> jack2 != null; assert pulseSupport -> pulseaudio != null; assert bs2bSupport -> libbs2b != null; assert libpngSupport -> libpng != null; @@ -60,7 +60,7 @@ let cp -prv * $out ''; - meta.license = "unfree"; + meta.license = stdenv.lib.licenses.unfree; } else null; in @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { ++ optional xineramaSupport libXinerama ++ optionals dvdnavSupport [ libdvdnav libdvdnav.libdvdread ] ++ optional bluraySupport libbluray - ++ optional jackaudioSupport jackaudio + ++ optional jackaudioSupport jack2 ++ optional pulseSupport pulseaudio ++ optional screenSaverSupport libXScrnSaver ++ optional vdpauSupport libvdpau @@ -130,7 +130,7 @@ stdenv.mkDerivation rec { meta = { description = "A movie player that supports many video formats (MPlayer fork)"; homepage = "http://mplayer2.org"; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.viric ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index be796f8e0dea8f9d3110c9898e272e24c38ec493..4eec9afdbf3d6b358508a76835a04d99aaac1f09 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -14,7 +14,7 @@ , bluraySupport ? true, libbluray ? null , speexSupport ? true, speex ? null , theoraSupport ? true, libtheora ? null -, jackaudioSupport ? true, jackaudio ? null +, jackaudioSupport ? true, jack2 ? null , pulseSupport ? true, pulseaudio ? null , bs2bSupport ? false, libbs2b ? null # For screenshots @@ -36,7 +36,7 @@ assert dvdnavSupport -> libdvdnav != null; assert bluraySupport -> libbluray != null; assert speexSupport -> speex != null; assert theoraSupport -> libtheora != null; -assert jackaudioSupport -> jackaudio != null; +assert jackaudioSupport -> jack2 != null; assert pulseSupport -> pulseaudio != null; assert bs2bSupport -> libbs2b != null; assert libpngSupport -> libpng != null; @@ -57,11 +57,11 @@ in stdenv.mkDerivation rec { name = "mpv-${version}"; - version = "0.3.8"; + version = "0.4.1"; src = fetchurl { url = "https://github.com/mpv-player/mpv/archive/v${version}.tar.gz"; - sha256 = "0k77rq17mslpvvgr4mvkj9bd5s1yhsigwvzym8blr1brxkj9pk3b"; + sha256 = "0wqjyzw3kk854zj263k7jyykzfaz1g27z50aqrd26hylg8k135cn"; }; buildInputs = with stdenv.lib; @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { ++ optional dvdreadSupport libdvdread ++ optionals dvdnavSupport [ libdvdnav libdvdnav.libdvdread ] ++ optional bluraySupport libbluray - ++ optional jackaudioSupport jackaudio + ++ optional jackaudioSupport jack2 ++ optional pulseSupport pulseaudio ++ optional screenSaverSupport libXScrnSaver ++ optional vdpauSupport libvdpau diff --git a/pkgs/applications/video/ogmtools/default.nix b/pkgs/applications/video/ogmtools/default.nix index 11a16e3a79d2f9a645c270ed3667612b6b7d6349..82077e4d3ddde632f4111bf7bf036f298d616353 100644 --- a/pkgs/applications/video/ogmtools/default.nix +++ b/pkgs/applications/video/ogmtools/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { tool for extracting chapter information from DVD. ''; homepage = http://www.bunkus.org/videotools/ogmtools/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/applications/video/omxplayer/default.nix b/pkgs/applications/video/omxplayer/default.nix index b3880067cac4b0b96f135ca3754a3f6a761aad8a..3add2646ad9e02b873c3aa0b76735489e318c457 100644 --- a/pkgs/applications/video/omxplayer/default.nix +++ b/pkgs/applications/video/omxplayer/default.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { export INCLUDES="-I${raspberrypifw}/include/interface/vcos/pthreads -I${raspberrypifw}/include/interface/vmcs_host/linux/" ''; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin cp omxplayer.bin $out/bin ''; buildInputs = [ raspberrypifw ffmpeg pcre boostHeaders freetype zlib ]; @@ -79,6 +79,6 @@ stdenv.mkDerivation rec { meta = { homepage = https://github.com/huceke/omxplayer; description = "Commandline OMX player for the Raspberry Pi"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/applications/video/quvi/tool.nix b/pkgs/applications/video/quvi/tool.nix index 807e3954d6feae0cf05cd908b1a8017c5a27779b..29bb439dcf6641cfa3bfebd1a0099a52601ff8d7 100644 --- a/pkgs/applications/video/quvi/tool.nix +++ b/pkgs/applications/video/quvi/tool.nix @@ -17,9 +17,8 @@ stdenv.mkDerivation rec { meta = { description = "Web video downloader"; homepage = http://quvi.sf.net; - license = "LGPLv2.1+"; + license = stdenv.lib.licenses.lgpl21Plus; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.mornfall ]; }; } - diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..51baa32f61e87c910359adb62e58ca7233212bcd --- /dev/null +++ b/pkgs/applications/video/shotcut/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchurl, SDL, frei0r, gettext, makeWrapper, mlt, pkgconfig, qt5 }: + +stdenv.mkDerivation rec { + name = "shotcut-${version}"; + version = "14.08"; + + src = fetchurl { + url = "https://github.com/mltframework/shotcut/archive/v${version}.tar.gz"; + sha256 = "0klcvpgp2l6xcdjy1gg7a5s8mx0mm347zdf26q6kk685pldlvkyj"; + }; + + buildInputs = [ SDL frei0r gettext makeWrapper mlt pkgconfig qt5 ]; + + configurePhase = "qmake PREFIX=$out"; + + postInstall = '' + mkdir -p $out/share/shotcut + cp -r src/qml $out/share/shotcut/ + wrapProgram $out/bin/shotcut --prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1 + ''; + + meta = with stdenv.lib; { + description = "A free, open source, cross-platform video editor"; + longDescription = '' + An offical binary for Shotcut, which includes all the + dependencies pinned to specific versions, is provided on + http://shotcut.org. + + If you encounter problems with this version, please contact the + nixpkgs maintainer(s). If you wish to report any bugs upstream, + please use the official build from shotcut.org instead. + ''; + homepage = http://shotcut.org; + license = licenses.gpl3; + maintainers = [ maintainers.goibhniu ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/video/simplescreenrecorder/default.nix b/pkgs/applications/video/simplescreenrecorder/default.nix index 3251127c7a1917daa22b9c9dbd72f98feb4129ae..4c58262a5f10653e57a0e35e8d188eb090395495 100644 --- a/pkgs/applications/video/simplescreenrecorder/default.nix +++ b/pkgs/applications/video/simplescreenrecorder/default.nix @@ -1,18 +1,18 @@ -{ stdenv, fetchurl, alsaLib, ffmpeg, jackaudio, libX11, libXext +{ stdenv, fetchurl, alsaLib, ffmpeg, jack2, libX11, libXext , libXfixes, mesa, pkgconfig, pulseaudio, qt4 }: stdenv.mkDerivation rec { name = "simplescreenrecorder-${version}"; - version = "0.2.2"; + version = "0.3.0"; src = fetchurl { url = "https://github.com/MaartenBaert/ssr/archive/${version}.tar.gz"; - sha256 = "0k1r1ilpk05qmwpnld95zxxk57qvyaq2r9f4i3la7y0xh9bz1gls"; + sha256 = "0caal8jq47d56ld57cdf2lr1ji350v09j5chgvgxv2pbqmqga4p5"; }; buildInputs = [ - alsaLib ffmpeg jackaudio libX11 libXext libXfixes mesa pkgconfig + alsaLib ffmpeg jack2 libX11 libXext libXfixes mesa pkgconfig pulseaudio qt4 ]; diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index 2c5b53c596a6bdf6bd66b2c82f7bcd2199a98059..71db3d40a46fee7e7532a3694fc59514ad028fb3 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -3,7 +3,7 @@ , pkgconfig, dbus, fribidi, qt4, freefont_ttf, libebml, libmatroska , libvorbis, libtheora, speex, lua5, libgcrypt, libupnp , libcaca, pulseaudio, flac, schroedinger, libxml2, librsvg -, mpeg2dec, udev, gnutls, avahi, libcddb, jackaudio, SDL, SDL_image +, mpeg2dec, udev, gnutls, avahi, libcddb, jack2, SDL, SDL_image , libmtp, unzip, taglib, libkate, libtiger, libv4l, samba, liboggz , libass, libva, libdvbpsi, libdc1394, libraw1394, libopus , libvdpau @@ -11,18 +11,18 @@ stdenv.mkDerivation rec { name = "vlc-${version}"; - version = "2.1.4"; + version = "2.1.5"; src = fetchurl { url = "http://download.videolan.org/pub/videolan/vlc/${version}/${name}.tar.xz"; - sha256 = "1lymhbb2bns73qivdaqanhggjjhyc9fwfgf5ikhng0a74msnqmiy"; + sha256 = "0whzbn7ahn5maarcwl1yhk9lq10b0q0y9w5pjl9kh3frdjmncrbg"; }; buildInputs = [ xz bzip2 perl zlib a52dec libmad faad2 ffmpeg alsaLib libdvdnav libdvdnav.libdvdread libbluray dbus fribidi qt4 libvorbis libtheora speex lua5 libgcrypt libupnp libcaca pulseaudio flac schroedinger libxml2 librsvg mpeg2dec - udev gnutls avahi libcddb jackaudio SDL SDL_image libmtp unzip taglib + udev gnutls avahi libcddb jack2 SDL SDL_image libmtp unzip taglib libkate libtiger libv4l samba liboggz libass libdvbpsi libva xlibs.xlibs xlibs.libXv xlibs.libXvMC xlibs.libXpm xlibs.xcbutilkeysyms libdc1394 libraw1394 libopus libebml libmatroska libvdpau diff --git a/pkgs/applications/video/xvidcap/default.nix b/pkgs/applications/video/xvidcap/default.nix index 9d7f8a6ac992152d32f857ed09376bd8ab5a943c..83b5c778f866f944163eb9a7eda055b08d5855d8 100644 --- a/pkgs/applications/video/xvidcap/default.nix +++ b/pkgs/applications/video/xvidcap/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation { meta = { description = "screencast video catpuring tool"; homepage = http://xvidcap.sourceforge.net/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index d951fe124c9f97a98ed148bdcbadd19df5166c75..4a488a381abf06846dd31b0f5bb66d627809a0d0 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -3,24 +3,21 @@ btrfsProgs, iptables, bash}: stdenv.mkDerivation rec { name = "docker-${version}"; - version = "0.10.0"; + version = "1.1.2"; src = fetchurl { url = "https://github.com/dotcloud/docker/archive/v${version}.tar.gz"; - sha256 = "14gmx119hd3j0c6rbks2mm83hk46s5wnnyvj8rhn25h0yp39pm5q"; + sha256 = "1pa6k3gx940ap3r96xdry6apzkm0ymqra92b2mrp25b25264cqcy"; }; - phases = ["unpackPhase" "preBuild" "buildPhase" "installPhase"]; - buildInputs = [ makeWrapper go sqlite lxc iproute bridge_utils devicemapper btrfsProgs iptables ]; - preBuild = '' - patchShebangs ./hack - ''; + dontStrip = true; buildPhase = '' + patchShebangs ./hack export AUTO_GOPATH=1 - export DOCKER_GITCOMMIT="867b2a90c228f62cdcd44907ceef279a2d8f1ac5" + export DOCKER_GITCOMMIT="d84a070" ./hack/make.sh dynbinary ''; @@ -41,7 +38,7 @@ stdenv.mkDerivation rec { homepage = http://www.docker.io/; description = "An open source project to pack, ship and run any application as a lightweight container"; license = licenses.asl20; - maintainers = with maintainers; [ offline ]; + maintainers = with maintainers; [ offline tailhook ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/virtualization/virtinst/default.nix b/pkgs/applications/virtualization/virtinst/default.nix index 84600884e7b6866ca1a689be82460d7d7b5b178c..8e2da5c3b7644476adc007fb3959e3b45ed7869f 100644 --- a/pkgs/applications/virtualization/virtinst/default.nix +++ b/pkgs/applications/virtualization/virtinst/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://virt-manager.org; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [qknight]; description = "Command line tool which provides an easy way to provision operating systems into virtual machines"; }; diff --git a/pkgs/applications/virtualization/xen/default.nix b/pkgs/applications/virtualization/xen/default.nix index 5f149b05978731cf54cf2e3bdf148937161e525c..55ef8390148434df59758429bc2d258275a46e64 100644 --- a/pkgs/applications/virtualization/xen/default.nix +++ b/pkgs/applications/virtualization/xen/default.nix @@ -30,7 +30,7 @@ let } ]; -in +in stdenv.mkDerivation { name = "xen-${version}"; diff --git a/pkgs/applications/window-managers/awesome/3.4.nix b/pkgs/applications/window-managers/awesome/3.4.nix index b21f73ddc549b41e577862471efc8abf8d4ffe68..3db2bde6540de5e0ae491dae01a924b9eff0b4dc 100644 --- a/pkgs/applications/window-managers/awesome/3.4.nix +++ b/pkgs/applications/window-managers/awesome/3.4.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://awesome.naquadah.org/; description = "Highly configurable, dynamic window manager for X"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/window-managers/bar/default.nix b/pkgs/applications/window-managers/bar/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..a4b90a04133bcb2d4eb1a4342181d0ae0d6b327f --- /dev/null +++ b/pkgs/applications/window-managers/bar/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, git, perl, libxcb, libXinerama, xcbutil, xcbutilwm, xcbutilkeysyms }: + +stdenv.mkDerivation rec { + name = "bar-1.0"; + + + src = fetchurl { + url = "https://github.com/LemonBoy/bar/archive/v1.0.tar.gz"; + sha256 = "1n2vak2acs37sslxl250cnz9c3irif5z4s54wi9qjyxbfzr2h2nc"; + }; + + buildInputs = [ libxcb git perl libXinerama xcbutil xcbutilkeysyms xcbutilwm ]; + + prePatch = ''sed -i "s@/usr@$out@" Makefile''; + + meta = { + description = "A lightweight xcb based bar"; + homepage = "https://github.com/LemonBoy/bar"; + maintainers = stdenv.lib.maintainers.meisternu; + license = "Custom"; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/window-managers/bspwm/default.nix b/pkgs/applications/window-managers/bspwm/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..24789f37ba7eb81bbcbd273ce2170ecb7cdcd441 --- /dev/null +++ b/pkgs/applications/window-managers/bspwm/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, libxcb, libXinerama, sxhkd, xcbutil, xcbutilkeysyms, xcbutilwm }: + +stdenv.mkDerivation rec { + name = "bspwm-0.8.9"; + + + src = fetchurl { + url = "https://github.com/baskerville/bspwm/archive/0.8.9.tar.gz"; + sha256 = "750c76132914661d8d5edf7809e9b601977215d31e747dd780c60fd562913d55"; + }; + + buildInputs = [ libxcb libXinerama xcbutil xcbutilkeysyms xcbutilwm ]; + + buildPhase = '' + make PREFIX=$out + ''; + + installPhase = '' + make PREFIX=$out install + ''; + + meta = { + description = "A tiling window manager based on binary space partitioning"; + homepage = "http://github.com/baskerville/bspwm"; + maintainers = stdenv.lib.maintainers.meisternu; + license = "BSD"; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/window-managers/compiz/default.nix b/pkgs/applications/window-managers/compiz/default.nix index 02b7b9987bdb38d1c8a0a6215b11882567e6a1b9..b73d636aaa5885c05f489565dde571d6ecd51d48 100644 --- a/pkgs/applications/window-managers/compiz/default.nix +++ b/pkgs/applications/window-managers/compiz/default.nix @@ -15,11 +15,11 @@ let s = # Generated upstream information rec { baseName="compiz"; - version="0.9.10.0"; + version="0.9.11.2"; name="${baseName}-${version}"; - hash="0kvjib0ns02cikpsjq5hlf746yjx2gkfh373pvrb25lzv3rs1qax"; - url="https://launchpad.net/compiz/0.9.10/0.9.10.0/+download/compiz-0.9.10.0.tar.bz2"; - sha256="0kvjib0ns02cikpsjq5hlf746yjx2gkfh373pvrb25lzv3rs1qax"; + hash="1czk4snv9j9l7b587nwf2y305lkn112zspm7f9l7yfk7jmkx1hqy"; + url="https://launchpad.net/compiz/0.9.11/0.9.11.2/+download/compiz-0.9.11.2.tar.bz2"; + sha256="1czk4snv9j9l7b587nwf2y305lkn112zspm7f9l7yfk7jmkx1hqy"; }; buildInputs = [cmake pkgconfig libXrender renderproto gtk libwnck pango cairo diff --git a/pkgs/applications/window-managers/dwm/default.nix b/pkgs/applications/window-managers/dwm/default.nix index b69dd9d8a492860f87ad0f1f907e5fd046233fe5..626a0926a676bb89943b4acd4ec48bba6a7077ea 100644 --- a/pkgs/applications/window-managers/dwm/default.nix +++ b/pkgs/applications/window-managers/dwm/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = { homepage = "www.suckless.org"; description = "Dynamic window manager for X"; - license = "MIT"; + license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; all; }; diff --git a/pkgs/applications/window-managers/fvwm/default.nix b/pkgs/applications/window-managers/fvwm/default.nix index 33acd00027058607e5d8955d41bb948b74d7fe17..6830e3a1c01022f9fab507d30659f72c6927a334 100644 --- a/pkgs/applications/window-managers/fvwm/default.nix +++ b/pkgs/applications/window-managers/fvwm/default.nix @@ -20,7 +20,6 @@ stdenv.mkDerivation rec { meta = { homepage = "http://fvwm.org"; description = "A multiple large virtual desktop window manager"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } - diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix index 17a287f8aae2a34556f24183832a792bade83e03..b5869ccaf8d9b8c00f401ba66f9dcf629601b28b 100644 --- a/pkgs/applications/window-managers/i3/default.nix +++ b/pkgs/applications/window-managers/i3/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, which, pkgconfig, libxcb, xcbutilkeysyms, xcbutil, xcbutilwm, libstartup_notification, libX11, pcre, libev, yajl, - xcb-util-cursor, coreutils, perl, pango }: + xcb-util-cursor, coreutils, perl, pango, perlPackages, xdummy }: stdenv.mkDerivation rec { name = "i3-${version}"; @@ -11,13 +11,25 @@ stdenv.mkDerivation rec { sha256 = "0sqvd8yqf9vwqrrvbpbf8k93b3qfa3q9289m82xq15r31wlk8b2h"; }; - buildInputs = [ which pkgconfig libxcb xcbutilkeysyms xcbutil xcbutilwm - libstartup_notification libX11 pcre libev yajl xcb-util-cursor perl pango ]; + buildInputs = [ + which pkgconfig libxcb xcbutilkeysyms xcbutil xcbutilwm + libstartup_notification libX11 pcre libev yajl xcb-util-cursor perl pango + perlPackages.AnyEventI3 perlPackages.X11XCB perlPackages.IPCRun + perlPackages.ExtUtilsPkgConfig perlPackages.TestMore perlPackages.InlineC + ]; - patchPhase = '' + postPatch = '' patchShebangs . ''; + doCheck = stdenv.system == "x86_64-linux"; + + checkPhase = '' + ln -sf "${xdummy}/bin/xdummy" testcases/Xdummy + (cd testcases && perl complete-run.pl -p 1) + ! grep -q '^not ok' testcases/latest/complete-run.log + ''; + configurePhase = "makeFlags=PREFIX=$out"; meta = with stdenv.lib; { diff --git a/pkgs/applications/window-managers/i3/lock.nix b/pkgs/applications/window-managers/i3/lock.nix index c37ed0d85f2704a2dd09f46445bb7df928cd121b..5af4519af03aa6d81ff5631567e67481d143bbef 100644 --- a/pkgs/applications/window-managers/i3/lock.nix +++ b/pkgs/applications/window-managers/i3/lock.nix @@ -2,11 +2,11 @@ pam, libX11, libev, cairo, libxkbcommon, libxkbfile }: stdenv.mkDerivation rec { - name = "i3lock-2.5"; + name = "i3lock-2.6"; src = fetchurl { url = "http://i3wm.org/i3lock/${name}.tar.bz2"; - sha256 = "0xqdklvfcn2accwdbzsly7add0f3rh9sxjnahawas4zwwk4p49xc"; + sha256 = "0aj0an8fwv66jhda499r3xa00546cc9ja1dk8xpc6sy6xygqjbf0"; }; buildInputs = [ which pkgconfig libxcb xcbutilkeysyms xcbutilimage pam libX11 diff --git a/pkgs/applications/window-managers/matchbox/default.nix b/pkgs/applications/window-managers/matchbox/default.nix index ed2637eff6e51a563ad0c1d1539dc60672b2f1fe..08c1be9f963d4b79a338a2c704daa2057d1fe5c0 100644 --- a/pkgs/applications/window-managers/matchbox/default.nix +++ b/pkgs/applications/window-managers/matchbox/default.nix @@ -13,6 +13,6 @@ stdenv.mkDerivation rec { meta = { description = "X window manager for non-desktop embedded systems"; homepage = http://matchbox-project.org/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/applications/window-managers/openbox/default.nix b/pkgs/applications/window-managers/openbox/default.nix index 56a5f0e3e2cea4bf25c3e1e62df088d61c938bdc..fad5b8010ea4a5ca3a756b328f900e4172c104af 100644 --- a/pkgs/applications/window-managers/openbox/default.nix +++ b/pkgs/applications/window-managers/openbox/default.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation rec { meta = { description = "X window manager for non-desktop embedded systems"; homepage = http://openbox.org/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/applications/window-managers/ratpoison/default.nix b/pkgs/applications/window-managers/ratpoison/default.nix index d1419fc2225840e4325dba211f035fd98350ce43..65264c20db3593f508a0772292f0a5ae5c7bd576 100644 --- a/pkgs/applications/window-managers/ratpoison/default.nix +++ b/pkgs/applications/window-managers/ratpoison/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.nongnu.org/ratpoison/"; description = "Ratpoison, a simple mouse-free tiling window manager"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; longDescription = '' Ratpoison is a simple window manager with no fat library diff --git a/pkgs/applications/window-managers/sxhkd/default.nix b/pkgs/applications/window-managers/sxhkd/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..03563a4f8121254207725cf2810d6dd333ddeec4 --- /dev/null +++ b/pkgs/applications/window-managers/sxhkd/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, asciidoc, libxcb, xcbutil, xcbutilkeysyms, xcbutilwm }: + +stdenv.mkDerivation rec { + name = "sxhkd-0.5.4"; + + src = fetchurl { + url = "https://github.com/baskerville/sxhkd/archive/0.5.4.tar.gz"; + sha256 = "de95f97155319ded41ece9403ac9e9f18bfdd914a09f553ab09b331bbfe5d332"; + }; + + buildInputs = [ asciidoc libxcb xcbutil xcbutilkeysyms xcbutilwm ]; + + buildPhase = '' + make PREFIX=$out + ''; + + installPhase = '' + make PREFIX=$out install + ''; + + meta = { + description = "Simple X hotkey daemon"; + homepage = "http://github.com/baskerville/sxhkd"; + license = "BSD"; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/window-managers/trayer/default.nix b/pkgs/applications/window-managers/trayer/default.nix index 9b9017420c020accefa07edfdf5e595e78db8985..43a1d2b8e79ae96cdded56891f27af5e17f04a8c 100644 --- a/pkgs/applications/window-managers/trayer/default.nix +++ b/pkgs/applications/window-managers/trayer/default.nix @@ -1,26 +1,25 @@ -{ stdenv, fetchurl, pkgconfig, gdk_pixbuf, gtk, libXmu }: +{ stdenv, fetchFromGitHub, pkgconfig, gdk_pixbuf, gtk, libXmu }: stdenv.mkDerivation rec { - name = "trayer-1.1.5"; + name = "trayer-1.1.6"; buildInputs = [ pkgconfig gdk_pixbuf gtk libXmu ]; - src = fetchurl { - url = "https://github.com/sargon/trayer-srg/tarball/${name}"; - name = "${name}.tar.gz"; - sha256 = "98804500188c0bb99c7389ebea4b2e4dfffa2f3d06dc97e633b4934cf7c29757"; - }; + src = fetchFromGitHub { + owner = "sargon"; + repo = "trayer-srg"; + rev = name; + sha256 = "0mmya7a1qh3zyqgvcx5fz2lvr9n0ilr490l1j3z4myahi4snk2mg"; + }; makeFlags = [ "PREFIX=$(out)" ]; - meta = { + meta = with stdenv.lib; { homepage = http://github.com/sargon/trayer-srg; - - license = "bsd"; - + license = licenses.mit; description = "A lightweight GTK2-based systray for UNIX desktop"; - - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; + maintainer = with maintainers; [ pSub ]; }; } diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix index 4880029119eb694521e4202ae4efca91914cd004..73a6412afabcc6091070b44e497a66cc7910fe82 100644 --- a/pkgs/applications/window-managers/weston/default.nix +++ b/pkgs/applications/window-managers/weston/default.nix @@ -2,16 +2,17 @@ , cairo, libxcb, libXcursor, x11, udev, libdrm, mtdev , libjpeg, pam, autoconf, automake, libtool, dbus }: -let version = "1.4.0"; in +let version = "1.5.0"; in stdenv.mkDerivation rec { name = "weston-${version}"; src = fetchurl { url = "http://wayland.freedesktop.org/releases/${name}.tar.xz"; - sha256 = "0r7dz72ys9p3f697ajgmihkar2da36bnjna6yanb3kg9k2fk38kl"; + sha256 = "113nig2dmbgrjhi79k0zw77vicnx8vkaihawd0nsg6n79ah8nf06"; }; + #ToDo: libinput can be split away buildInputs = [ pkgconfig wayland mesa libxkbcommon cairo libxcb libXcursor x11 udev libdrm mtdev libjpeg pam dbus.libs diff --git a/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix b/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix index 48b0cf417f0863a11389ed66b0513a2332281fc5..086d80963d84338cbdf47d9f6699c3d1321cc07d 100644 --- a/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix +++ b/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix @@ -16,9 +16,6 @@ cabal.mkDerivation (self: { description = "Third party extensions for xmonad"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = with self.stdenv.lib.maintainers; [ simons ]; }; }) diff --git a/pkgs/applications/window-managers/xmonad/xmonad-extras.nix b/pkgs/applications/window-managers/xmonad/xmonad-extras.nix index b64cc244d651de31483b195959aa7ae21b84c774..87ee4994e45db199b4559582ba1cd3fbde1f3186 100644 --- a/pkgs/applications/window-managers/xmonad/xmonad-extras.nix +++ b/pkgs/applications/window-managers/xmonad/xmonad-extras.nix @@ -19,9 +19,6 @@ cabal.mkDerivation (self: { description = "Third party extensions for xmonad with wacky dependencies"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = with self.stdenv.lib.maintainers; [ simons ]; }; }) diff --git a/pkgs/build-support/cabal/default.nix b/pkgs/build-support/cabal/default.nix index 6c806c4bf1fb727eda81895f22428b869a23f14a..69423004d65fca582136f0feeed8f91e9d6dee9f 100644 --- a/pkgs/build-support/cabal/default.nix +++ b/pkgs/build-support/cabal/default.nix @@ -248,12 +248,12 @@ assert !enableStaticLibraries -> versionOlder "7.7" ghc.version; ./Setup copy - ensureDir $out/bin # necessary to get it added to PATH + mkdir -p $out/bin # necessary to get it added to PATH local confDir=$out/lib/ghc-${ghc.ghc.version}/package.conf.d local installedPkgConf=$confDir/${self.fname}.installedconf local pkgConf=$confDir/${self.fname}.conf - ensureDir $confDir + mkdir -p $confDir ./Setup register --gen-pkg-config=$pkgConf if test -f $pkgConf; then echo '[]' > $installedPkgConf @@ -265,7 +265,7 @@ assert !enableStaticLibraries -> versionOlder "7.7" ghc.version; fi ${optionalString (self.enableSharedExecutables && self.isExecutable && self.stdenv.isDarwin) '' - for exe in $out/bin/* ; do + for exe in "$out/bin/"* ; do install_name_tool -add_rpath \ $out/lib/${ghc.ghc.name}/${self.pname}-${self.version} $exe done diff --git a/pkgs/build-support/clang-wrapper/add-flags b/pkgs/build-support/clang-wrapper/add-flags index 3b0645471531c4a5e8acde3871e6a61098df5df4..7a9711290aa13c1af2876f8555a552841e2c337a 100644 --- a/pkgs/build-support/clang-wrapper/add-flags +++ b/pkgs/build-support/clang-wrapper/add-flags @@ -21,4 +21,4 @@ if test -e @out@/nix-support/libc-ldflags-before; then export NIX_LDFLAGS_BEFORE="$(cat @out@/nix-support/libc-ldflags-before) $NIX_LDFLAGS_BEFORE" fi -export NIX_CLANG_WRAPPER_FLAGS_SET=1 +export NIX_GCC_WRAPPER_FLAGS_SET=1 diff --git a/pkgs/build-support/clang-wrapper/clang-wrapper.sh b/pkgs/build-support/clang-wrapper/clang-wrapper.sh index b39aa2d721e89dddd432b12d1c33abe79bdf41d0..57715274f1e2e13713b5989c012dc11105360f45 100644 --- a/pkgs/build-support/clang-wrapper/clang-wrapper.sh +++ b/pkgs/build-support/clang-wrapper/clang-wrapper.sh @@ -1,10 +1,10 @@ #! @shell@ -e -if test -n "$NIX_CLANG_WRAPPER_START_HOOK"; then - source "$NIX_CLANG_WRAPPER_START_HOOK" +if test -n "$NIX_GCC_WRAPPER_START_HOOK"; then + source "$NIX_GCC_WRAPPER_START_HOOK" fi -if test -z "$NIX_CLANG_WRAPPER_FLAGS_SET"; then +if test -z "$NIX_GCC_WRAPPER_FLAGS_SET"; then source @out@/nix-support/add-flags.sh fi diff --git a/pkgs/build-support/clang-wrapper/default.nix b/pkgs/build-support/clang-wrapper/default.nix index 4b2a5a1182ea64f244861080299511f1150109c2..7a5d87127d90ff21b8943fad4b963e9595817ea8 100644 --- a/pkgs/build-support/clang-wrapper/default.nix +++ b/pkgs/build-support/clang-wrapper/default.nix @@ -29,8 +29,8 @@ stdenv.mkDerivation { builder = ./builder.sh; setupHook = ./setup-hook.sh; clangWrapper = ./clang-wrapper.sh; - ldWrapper = ./ld-wrapper.sh; - utils = ./utils.sh; + ldWrapper = ../gcc-wrapper/ld-wrapper.sh; + utils = ../gcc-wrapper/utils.sh; addFlags = ./add-flags; inherit nativeTools nativeLibc nativePrefix clang clangVersion libcxx; diff --git a/pkgs/build-support/clang-wrapper/ld-wrapper.sh b/pkgs/build-support/clang-wrapper/ld-wrapper.sh deleted file mode 100644 index ae45c62d460a76804746d58d1047b4eca77be717..0000000000000000000000000000000000000000 --- a/pkgs/build-support/clang-wrapper/ld-wrapper.sh +++ /dev/null @@ -1,164 +0,0 @@ -#! @shell@ -e - -if test -n "$NIX_LD_WRAPPER_START_HOOK"; then - source "$NIX_LD_WRAPPER_START_HOOK" -fi - -if test -z "$NIX_CLANG_WRAPPER_FLAGS_SET"; then - source @out@/nix-support/add-flags.sh -fi - -source @out@/nix-support/utils.sh - - -# Optionally filter out paths not refering to the store. -params=("$@") -if test "$NIX_ENFORCE_PURITY" = "1" -a -n "$NIX_STORE" \ - -a \( -z "$NIX_IGNORE_LD_THROUGH_CLANG" -o -z "$NIX_LDFLAGS_SET" \); then - rest=() - n=0 - while test $n -lt ${#params[*]}; do - p=${params[n]} - p2=${params[$((n+1))]} - if test "${p:0:3}" = "-L/" && badPath "${p:2}"; then - skip $p - elif test "$p" = "-L" && badPath "$p2"; then - n=$((n + 1)); skip $p2 - elif test "$p" = "-rpath" && badPath "$p2"; then - n=$((n + 1)); skip $p2 - elif test "$p" = "-dynamic-linker" && badPath "$p2"; then - n=$((n + 1)); skip $p2 - elif test "${p:0:1}" = "/" && badPath "$p"; then - # We cannot skip this; barf. - echo "impure path \`$p' used in link" >&2 - exit 1 - elif test "${p:0:9}" = "--sysroot"; then - # Our ld is not built with sysroot support (Can we fix that?) - : - else - rest=("${rest[@]}" "$p") - fi - n=$((n + 1)) - done - params=("${rest[@]}") -fi - - -extra=() -extraBefore=() - -if test -z "$NIX_LDFLAGS_SET"; then - extra=(${extra[@]} $NIX_LDFLAGS) - extraBefore=(${extraBefore[@]} $NIX_LDFLAGS_BEFORE) -fi - - -# Add all used dynamic libraries to the rpath. -if test "$NIX_DONT_SET_RPATH" != "1"; then - - libPath="" - addToLibPath() { - local path="$1" - if test "${path:0:1}" != "/"; then return 0; fi - case "$path" in - *..*|*./*|*/.*|*//*) - local path2 - if path2=$(readlink -f "$path"); then - path="$path2" - fi - ;; - esac - case $libPath in - *\ $path\ *) return 0 ;; - esac - libPath="$libPath $path " - } - - addToRPath() { - # If the path is not in the store, don't add it to the rpath. - # This typically happens for libraries in /tmp that are later - # copied to $out/lib. If not, we're screwed. - if test "${1:0:${#NIX_STORE}}" != "$NIX_STORE"; then return 0; fi - case $rpath in - *\ $1\ *) return 0 ;; - esac - rpath="$rpath $1 " - } - - libs="" - addToLibs() { - libs="$libs $1" - } - - rpath="" - - # First, find all -L... switches. - allParams=("${params[@]}" ${extra[@]}) - n=0 - while test $n -lt ${#allParams[*]}; do - p=${allParams[n]} - p2=${allParams[$((n+1))]} - if test "${p:0:3}" = "-L/"; then - addToLibPath ${p:2} - elif test "$p" = "-L"; then - addToLibPath ${p2} - n=$((n + 1)) - elif test "$p" = "-l"; then - addToLibs ${p2} - n=$((n + 1)) - elif test "${p:0:2}" = "-l"; then - addToLibs ${p:2} - elif test "$p" = "-dynamic-linker"; then - # Ignore the dynamic linker argument, or it - # will get into the next 'elif'. We don't want - # the dynamic linker path rpath to go always first. - n=$((n + 1)) - elif [[ "$p" =~ ^[^-].*\.so($|\.) ]]; then - # This is a direct reference to a shared library, so add - # its directory to the rpath. - path="$(dirname "$p")"; - addToRPath "${path}" - fi - n=$((n + 1)) - done - - # Second, for each directory in the library search path (-L...), - # see if it contains a dynamic library used by a -l... flag. If - # so, add the directory to the rpath. - # It's important to add the rpath in the order of -L..., so - # the link time chosen objects will be those of runtime linking. - - for i in $libPath; do - for j in $libs; do - if test -f "$i/lib$j.so"; then - addToRPath $i - break - fi - done - done - - - # Finally, add `-rpath' switches. - for i in $rpath; do - extra=(${extra[@]} -rpath $i) - done -fi - - -# Optionally print debug info. -if test "$NIX_DEBUG" = "1"; then - echo "original flags to @ld@:" >&2 - for i in "${params[@]}"; do - echo " $i" >&2 - done - echo "extra flags to @ld@:" >&2 - for i in ${extra[@]}; do - echo " $i" >&2 - done -fi - -if test -n "$NIX_LD_WRAPPER_EXEC_HOOK"; then - source "$NIX_LD_WRAPPER_EXEC_HOOK" -fi - -exec @ld@ ${extraBefore[@]} "${params[@]}" ${extra[@]} diff --git a/pkgs/build-support/clang-wrapper/utils.sh b/pkgs/build-support/clang-wrapper/utils.sh deleted file mode 100644 index 753b3772e9561b34920c5b8eadb41cd1ed55c5a5..0000000000000000000000000000000000000000 --- a/pkgs/build-support/clang-wrapper/utils.sh +++ /dev/null @@ -1,24 +0,0 @@ -skip () { - if test "$NIX_DEBUG" = "1"; then - echo "skipping impure path $1" >&2 - fi -} - - -# Checks whether a path is impure. E.g., `/lib/foo.so' is impure, but -# `/nix/store/.../lib/foo.so' isn't. -badPath() { - local p=$1 - - # Relative paths are okay (since they're presumably relative to - # the temporary build directory). - if test "${p:0:1}" != "/"; then return 1; fi - - # Otherwise, the path should refer to the store or some temporary - # directory (including the build directory). - test \ - "$p" != "/dev/null" -a \ - "${p:0:${#NIX_STORE}}" != "$NIX_STORE" -a \ - "${p:0:4}" != "/tmp" -a \ - "${p:0:${#NIX_BUILD_TOP}}" != "$NIX_BUILD_TOP" -} diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git index bd1d8b5c1af0a95d7aa852a21d2c4d314149499b..fcb0126278343ea92506057b8cfacf795f7638f1 100755 --- a/pkgs/build-support/fetchgit/nix-prefetch-git +++ b/pkgs/build-support/fetchgit/nix-prefetch-git @@ -226,6 +226,10 @@ clone_user_rev() { if test -z "$leaveDotGit"; then echo "removing \`.git'..." >&2 find $dir -name .git\* | xargs rm -rf + else + # The logs and index contain timestamps, and the hooks contain + # the nix path of git's bash + find $dir -name .git | xargs -I {} rm -rf {}/logs {}/index {}/hooks fi } diff --git a/pkgs/build-support/gcc-wrapper/gcc-wrapper.sh b/pkgs/build-support/gcc-wrapper/gcc-wrapper.sh index 2ad7783a442c492722fca0c1dc38122607adbf67..c53fd44207d0047563cc6b469cd4369907f441f3 100644 --- a/pkgs/build-support/gcc-wrapper/gcc-wrapper.sh +++ b/pkgs/build-support/gcc-wrapper/gcc-wrapper.sh @@ -77,6 +77,7 @@ if test "$NIX_ENFORCE_PURITY" = "1" -a -n "$NIX_STORE"; then n=$((n + 1)) done params=("${rest[@]}") + NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE --sysroot=/var/empty" fi diff --git a/pkgs/build-support/gcc-wrapper/ld-wrapper.sh b/pkgs/build-support/gcc-wrapper/ld-wrapper.sh index 74b6273848ede4e2ee32510d9489c088b6b648d2..822c4a03a218666ace65126c513104eea9ff94ae 100644 --- a/pkgs/build-support/gcc-wrapper/ld-wrapper.sh +++ b/pkgs/build-support/gcc-wrapper/ld-wrapper.sh @@ -32,6 +32,9 @@ if test "$NIX_ENFORCE_PURITY" = "1" -a -n "$NIX_STORE" \ # We cannot skip this; barf. echo "impure path \`$p' used in link" >&2 exit 1 + elif test "${p:0:9}" = "--sysroot"; then + # Our ld is not built with sysroot support (Can we fix that?) + : else rest=("${rest[@]}" "$p") fi @@ -45,10 +48,12 @@ extra=() extraBefore=() if test -z "$NIX_LDFLAGS_SET"; then - extra=(${extra[@]} $NIX_LDFLAGS) - extraBefore=(${extraBefore[@]} $NIX_LDFLAGS_BEFORE) + extra+=($NIX_LDFLAGS) + extraBefore+=($NIX_LDFLAGS_BEFORE) fi +extra+=($NIX_LDFLAGS_AFTER) + # Add all used dynamic libraries to the rpath. if test "$NIX_DONT_SET_RPATH" != "1"; then diff --git a/pkgs/build-support/kdewrapper/default.nix b/pkgs/build-support/kdewrapper/default.nix index 6dcf68a324a28cf9d64d2a02ca517f8eb837edab..64dfd7d0ca6b491692919a35795552e809f6aaa8 100644 --- a/pkgs/build-support/kdewrapper/default.nix +++ b/pkgs/build-support/kdewrapper/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { inherit libs; buildCommand = '' - ensureDir $out/bin + mkdir -p $out/bin KDEDIRS=${program} QT_PLUGIN_PATH=${program}/lib/qt4/plugins:${program}/lib/kde4/plugins diff --git a/pkgs/build-support/make-startupitem/default.nix b/pkgs/build-support/make-startupitem/default.nix index dc78b8a704e26b2a64610239c8d6370ae411867b..fad6f00d82116f60382263734a5d35ca32a1d342 100644 --- a/pkgs/build-support/make-startupitem/default.nix +++ b/pkgs/build-support/make-startupitem/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { priority = 5; buildCommand = '' - ensureDir $out/share/autostart + mkdir -p $out/share/autostart target=${name}.desktop cp ${package}/share/applications/${srcPrefix}${name}.desktop $target chmod +rw $target diff --git a/pkgs/build-support/release/debian-build.nix b/pkgs/build-support/release/debian-build.nix index 168b44ad74c753cc4f7abe54625b886c3c7d66e2..3adfe41031da5b7cf1e9f60bbf306ac506967805 100644 --- a/pkgs/build-support/release/debian-build.nix +++ b/pkgs/build-support/release/debian-build.nix @@ -60,8 +60,10 @@ vmTools.runInLinuxImage (stdenv.mkDerivation ( --provides="${concatStringsSep "," debProvides}" \ ${optionalString (src ? version) "--pkgversion=$(echo ${src.version} | tr _ -)"} \ ''${debMaintainer:+--maintainer="'$debMaintainer'"} \ + ''${debName:+--pkgname="'$debName'"} \ $checkInstallFlags \ - make install + -- \ + $SHELL -c "''${installCommand:-make install}" mkdir -p $out/debs find . -name "*.deb" -exec cp {} $out/debs \; diff --git a/pkgs/build-support/release/functions.sh b/pkgs/build-support/release/functions.sh index 9f2d03519c8c0ee5a34ed96bfd621e7a7005d38d..8ac67a196721474bd74d3b5c62d74a65bb35e361 100644 --- a/pkgs/build-support/release/functions.sh +++ b/pkgs/build-support/release/functions.sh @@ -9,6 +9,6 @@ findTarballs() { } propagateImageName() { - ensureDir $out/nix-support + mkdir -p $out/nix-support cat "$diskImage"/nix-support/full-name > $out/nix-support/full-name } diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 2994802c5e3ba1b7292a4d1629096b88286e6518..7a35577c69a301324e8ea9697458a47ab79b9d1e 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -1556,22 +1556,22 @@ rec { }; debian60i386 = { - name = "debian-6.0.9-squeeze-i386"; - fullName = "Debian 6.0.9 Squeeze (i386)"; + name = "debian-6.0.10-squeeze-i386"; + fullName = "Debian 6.0.10 Squeeze (i386)"; packagesList = fetchurl { url = mirror://debian/dists/squeeze/main/binary-i386/Packages.bz2; - sha256 = "1fb9afa9b2d007939e066c031fc60f6626b78105ce42fe8cdeab7124a0dbf477"; + sha256 = "c08899011a7a2b0df4da08f91eef3a80d112a247df988b1c966c9fb64c812392"; }; urlPrefix = mirror://debian; packages = commonDebianPackages; }; debian60x86_64 = { - name = "debian-6.0.9-squeeze-amd64"; - fullName = "Debian 6.0.9 Squeeze (amd64)"; + name = "debian-6.0.10-squeeze-amd64"; + fullName = "Debian 6.0.10 Squeeze (amd64)"; packagesList = fetchurl { url = mirror://debian/dists/squeeze/main/binary-amd64/Packages.bz2; - sha256 = "cee46e56f35342c17795d1923b6c7e545f626e8d568fd48f91d5e0eb92ea329e"; + sha256 = "3f2ebd5221b9a4bdf7224acf728a51a987c63d32df1bbc20a97f177d2f184045"; }; urlPrefix = mirror://debian; packages = commonDebianPackages; diff --git a/pkgs/build-support/vm/windows/bootstrap.nix b/pkgs/build-support/vm/windows/bootstrap.nix index e3b44d1b6ab7a1152536a86a99321d0e1ad5f34f..ebea819b19100092891e168707320d001a4afdd0 100644 --- a/pkgs/build-support/vm/windows/bootstrap.nix +++ b/pkgs/build-support/vm/windows/bootstrap.nix @@ -69,7 +69,7 @@ in rec { -b "${installedVM}/disk.img" \ -f qcow2 winvm.img ${runAndSuspend} - ensureDir "$out" + mkdir -p "$out" cp winvm.img "$out/disk.img" cp state.gz "$out/state.gz" ''; diff --git a/pkgs/build-support/vm/windows/install/default.nix b/pkgs/build-support/vm/windows/install/default.nix index 10690bf6b28778b1c4e0aac2dd7346ac1e3e30e8..fe8e8f61de029fac5b711b57ca9ea3b6e0a261a2 100644 --- a/pkgs/build-support/vm/windows/install/default.nix +++ b/pkgs/build-support/vm/windows/install/default.nix @@ -22,7 +22,7 @@ let cygwinSshKey = stdenv.mkDerivation { name = "snakeoil-ssh-cygwin"; buildCommand = '' - ensureDir "$out" + mkdir -p "$out" ${openssh}/bin/ssh-keygen -t ecdsa -f "$out/key" -N "" ''; }; @@ -65,7 +65,7 @@ in stdenv.mkDerivation { buildCommand = '' ${qemu}/bin/qemu-img create -f qcow2 winvm.img 2G ${installController} - ensureDir "$out" + mkdir -p "$out" cp winvm.img "$out/disk.img" ''; passthru = { diff --git a/pkgs/data/fonts/freefont-ttf/default.nix b/pkgs/data/fonts/freefont-ttf/default.nix index 92f617888921b5bba095692d8559b0f58b841b67..e1d9e1614f3868a0f5755f6d55cd80f94caf8fc3 100644 --- a/pkgs/data/fonts/freefont-ttf/default.nix +++ b/pkgs/data/fonts/freefont-ttf/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.gnu.org/software/freefont/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.all; maintainers = [ ]; diff --git a/pkgs/data/fonts/opensans-ttf/default.nix b/pkgs/data/fonts/opensans-ttf/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..2e0f3d5df2a70725321c0b8a382ce195d6bf68db --- /dev/null +++ b/pkgs/data/fonts/opensans-ttf/default.nix @@ -0,0 +1,34 @@ +{stdenv, fetchurl}: + +# adapted from https://aur.archlinux.org/packages/tt/ttf-opensans/PKGBUILD + +stdenv.mkDerivation rec { + name = "opensans-ttf-20140617"; + + src = fetchurl { + url = "https://hexchain.org/pub/archlinux/ttf-opensans/opensans.tar.gz"; + sha256 = "1ycn39dijhd3lffmafminrnfmymdig2jvc6i47bb42fx777q97q4"; + }; + + sourceRoot = "."; + + installPhase = '' + mkdir -p $out/share/fonts/truetype + cp *.ttf $out/share/fonts/truetype + ''; + + meta = { + description = "Open Sans fonts"; + + longDescription = '' + Open Sans is a humanist sans serif typeface designed by Steve Matteson, + Type Director of Ascender Corp. + ''; + + homepage = "http://en.wikipedia.org/wiki/Open_Sans"; + license = "Apache"; + + platforms = stdenv.lib.platforms.all; + maintainers = [ ]; + }; +} diff --git a/pkgs/data/fonts/source-code-pro/default.nix b/pkgs/data/fonts/source-code-pro/default.nix index d48fbed696c9cc7ac9c7cfff4d1b7ed7ef661ead..8fde0c6ef03fd3356248e738c92c13343a367def 100644 --- a/pkgs/data/fonts/source-code-pro/default.nix +++ b/pkgs/data/fonts/source-code-pro/default.nix @@ -22,7 +22,7 @@ rec { sha256 = sourceInfo.hash; }; - name = "${sourceInfo.name}-${sourceInfo.version}"; + name = "source-code-pro-${sourceInfo.version}"; inherit buildInputs; phaseNames = ["doUnpack" "installFonts"]; diff --git a/pkgs/data/fonts/source-han-sans/base.nix b/pkgs/data/fonts/source-han-sans/base.nix new file mode 100644 index 0000000000000000000000000000000000000000..d319f41f2e52a18403fb58f6e23351f8d254375c --- /dev/null +++ b/pkgs/data/fonts/source-han-sans/base.nix @@ -0,0 +1,26 @@ +{version ? "1.000", prefix, url, sha256, description}: + +{stdenv, fetchurl, unzip}: + +stdenv.mkDerivation rec { + inherit version; + name = "${prefix}-${version}"; + + src = fetchurl { + inherit url sha256; + }; + + buildInputs = [ unzip ]; + + installPhase = '' + mkdir -p $out/share/fonts/truetype + cp $( find . -name '*.otf' ) $out/share/fonts/truetype + ''; + + meta = { + inherit description; + + homepage = http://sourceforge.net/adobe/source-han-sans/; + license = stdenv.lib.licenses.asl20; + }; +} diff --git a/pkgs/data/fonts/source-han-sans/japanese.nix b/pkgs/data/fonts/source-han-sans/japanese.nix new file mode 100644 index 0000000000000000000000000000000000000000..4aacdbf62e246f948d482cdcbbaea0e45ac128ca --- /dev/null +++ b/pkgs/data/fonts/source-han-sans/japanese.nix @@ -0,0 +1,6 @@ +import ./base.nix { + prefix = "source-han-sans-japanese"; + url = "mirror://sourceforge/source-han-sans.adobe/SourceHanSansJP-1.000.zip"; + sha256 = "c5930036660bea22ffceaa9e2df765776494800d330a59be7936ab3c763c4c82"; + description = "Japanese subset of an open source Pan-CJK typeface"; +} \ No newline at end of file diff --git a/pkgs/data/fonts/source-han-sans/korean.nix b/pkgs/data/fonts/source-han-sans/korean.nix new file mode 100644 index 0000000000000000000000000000000000000000..cf3ecd9e12e2067d714ae6418170aaaf65d5fa8f --- /dev/null +++ b/pkgs/data/fonts/source-han-sans/korean.nix @@ -0,0 +1,6 @@ +import ./base.nix { + prefix = "source-han-sans-korean"; + url = "mirror://sourceforge/source-han-sans.adobe/SourceHanSansKR-1.000.zip"; + sha256 = "8eed4ad092fcf640e44f73ba510e0ed1c1cabf79776f68d02820734bbba21cf8"; + description = "Korean subset of an open source Pan-CJK typeface"; +} \ No newline at end of file diff --git a/pkgs/data/fonts/source-han-sans/simplified-chinese.nix b/pkgs/data/fonts/source-han-sans/simplified-chinese.nix new file mode 100644 index 0000000000000000000000000000000000000000..8e920455e4532b24a6168438f8354f3233dc5ff5 --- /dev/null +++ b/pkgs/data/fonts/source-han-sans/simplified-chinese.nix @@ -0,0 +1,6 @@ +import ./base.nix { + prefix = "source-han-sans-simplified-chinese"; + url = "mirror://sourceforge/source-han-sans.adobe/SourceHanSansCN-1.000.zip"; + sha256 = "88117aa8f8b4ab65d6f7a919a5e1b06d6c00f75b1abecccf120246536123754d"; + description = "Simplified Chinese subset of an open source Pan-CJK typeface"; +} \ No newline at end of file diff --git a/pkgs/data/fonts/source-han-sans/traditional-chinese.nix b/pkgs/data/fonts/source-han-sans/traditional-chinese.nix new file mode 100644 index 0000000000000000000000000000000000000000..b25db8a2515a89e9d1de1dd00c0b914e2e766d3b --- /dev/null +++ b/pkgs/data/fonts/source-han-sans/traditional-chinese.nix @@ -0,0 +1,6 @@ +import ./base.nix { + prefix = "source-han-sans-traditional-chinese"; + url = "mirror://sourceforge/source-han-sans.adobe/SourceHanSansTWHK-1.000.zip"; + sha256 = "2371a726757a51322243b1ed7a9fde562621b0813b5e6d6443e06847ad7bbd20"; + description = "Traditional Chinese subset of an open source Pan-CJK typeface"; +} \ No newline at end of file diff --git a/pkgs/data/fonts/source-sans-pro/default.nix b/pkgs/data/fonts/source-sans-pro/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..eccddc8f14c00cac1831fb3d4c56c63c78beb6eb --- /dev/null +++ b/pkgs/data/fonts/source-sans-pro/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, unzip }: + +stdenv.mkDerivation { + name = "source-sans-pro-1.050"; + src = fetchurl { + url = "mirror://sourceforge/sourcesans.adobe/SourceSansPro_FontsOnly-1.050.zip"; + sha256 = "002z7kx8jxp5pfrilqaxbwbr5yp9fl3zsp0imawmf5wqagpzayf3"; + }; + + buildInputs = [ unzip ]; + + phases = "unpackPhase installPhase"; + + installPhase = '' + mkdir -p $out/share/fonts/opentype + find . -name "*.otf" -exec cp {} $out/share/fonts/opentype \; + ''; + + meta = with stdenv.lib; { + homepage = http://sourceforge.net/adobe/sourcesans; + description = "A set of OpenType fonts designed by Adobe for UIs"; + license = licenses.ofl; + platforms = platforms.all; + maintainers = with maintainers; [ ttuegel ]; + }; +} diff --git a/pkgs/data/fonts/source-serif-pro/default.nix b/pkgs/data/fonts/source-serif-pro/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..00ebf22d469ffcace89abeb5f02460c8849d75e9 --- /dev/null +++ b/pkgs/data/fonts/source-serif-pro/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, unzip }: + +stdenv.mkDerivation { + name = "source-serif-pro-1.014"; + src = fetchurl { + url = "mirror://sourceforge/sourceserifpro.adobe/SourceSerifPro_FontsOnly-1.014.zip"; + sha256 = "1agack195jqq4g2hmga6f9nwg44garii1g3jpbrdlrwr97rwvqsh"; + }; + + buildInputs = [ unzip ]; + + phases = "unpackPhase installPhase"; + + installPhase = '' + mkdir -p $out/share/fonts/opentype + find . -name "*.otf" -exec cp {} $out/share/fonts/opentype \; + ''; + + meta = with stdenv.lib; { + homepage = http://sourceforge.net/adobe/sourceserifpro; + description = "A set of OpenType fonts to complement Source Sans Pro"; + license = licenses.ofl; + platforms = platforms.all; + maintainers = with maintainers; [ ttuegel ]; + }; +} + diff --git a/pkgs/data/misc/cacert/default.nix b/pkgs/data/misc/cacert/default.nix index ac5beaeee818f390213e7d1bdb3d637394475e76..0a2c43fc581241b4bedc4aedca10a79281976ffe 100644 --- a/pkgs/data/misc/cacert/default.nix +++ b/pkgs/data/misc/cacert/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "cacert-20131205"; + name = "cacert-20140715"; src = fetchurl { url = "http://tarballs.nixos.org/${name}.pem.bz2"; - sha256 = "049cm3nrhawkh9xpfjhgis6w58zji5ppi4d9yyjzrr7mpw0a34df"; + sha256 = "1l4j7z6ysnllx99isjzlc8zc34rbbgj4kzlg1y5sy9bgphc8cssl"; }; unpackPhase = "true"; diff --git a/pkgs/data/misc/miscfiles/default.nix b/pkgs/data/misc/miscfiles/default.nix index e216f4b0278d558917eaae9a68dc101758a95755..db4d13b890fdb7e3179702ba09068dc9aab96088 100644 --- a/pkgs/data/misc/miscfiles/default.nix +++ b/pkgs/data/misc/miscfiles/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.gnu.org/software/miscfiles/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; description = "Collection of files not of crucial importance for sysadmins"; }; } diff --git a/pkgs/data/misc/tzdata/default.nix b/pkgs/data/misc/tzdata/default.nix index 332c9de18373893c6eba978bb35837812284931b..90111cb52e190c11a1d261b884b59e1c6a7c0eb2 100644 --- a/pkgs/data/misc/tzdata/default.nix +++ b/pkgs/data/misc/tzdata/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ln -s . $out/share/zoneinfo/posix mv $out/share/zoneinfo-leaps $out/share/zoneinfo/right - ensureDir "$lib/include" + mkdir -p "$lib/include" cp tzfile.h "$lib/include/tzfile.h" ''; diff --git a/pkgs/desktops/e18/enlightenment.nix b/pkgs/desktops/e18/enlightenment.nix index fde939c146ae69d32867c5cd61a64bade303559b..c3cd585e525784b0da7379ab13edf7f2306bed27 100644 --- a/pkgs/desktops/e18/enlightenment.nix +++ b/pkgs/desktops/e18/enlightenment.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, e18, xlibs, libffi, pam, alsaLib, luajit }: +{ stdenv, fetchurl, pkgconfig, e18, xlibs, libffi, pam, alsaLib, luajit, bzip2, set_freqset_setuid ? false }: + stdenv.mkDerivation rec { name = "enlightenment-${version}"; version = "0.18.8"; @@ -6,10 +7,24 @@ stdenv.mkDerivation rec { url = "http://download.enlightenment.org/rel/apps/enlightenment/${name}.tar.gz"; sha256 = "1fsigbrknkwy909p1gqwxag1bar3p413s4f6fq3qnbsd6gjbvj8l"; }; - buildInputs = [ pkgconfig e18.efl e18.elementary xlibs.libxcb xlibs.xcbutilkeysyms xlibs.libXrandr libffi pam alsaLib luajit ]; + buildInputs = [ pkgconfig e18.efl e18.elementary xlibs.libxcb xlibs.xcbutilkeysyms xlibs.libXrandr libffi pam alsaLib luajit bzip2 ]; preConfigure = '' export NIX_CFLAGS_COMPILE="-I${e18.efl}/include/eo-1 -I${e18.efl}/include/ecore-imf-1 -I${e18.efl}/include/ethumb-client-1 -I${e18.efl}/include/ethumb-1 $NIX_CFLAGS_COMPILE" ''; + + # this is a hack and without this cpufreq module is not working: + # when set_freqset_setuid is true and "e18_freqset" is set in setuidPrograms (this is taken care of in e18 NixOS module), + # then this postInstall does the folowing: + # 1. moves the "freqset" binary to "e18_freqset", + # 2. linkes "e18_freqset" to enlightenment/bin so that, + # 3. setuidPrograms detects it and makes appropriate stuff to /var/setuid-wrappers/e18_freqset, + # 4. and finaly, linkes /var/setuid-wrappers/e18_freqset to original destination where enlightenment wants it + postInstall = if set_freqset_setuid then '' + export CPUFREQ_DIRPATH=`readlink -f $out/lib/enlightenment/modules/cpufreq/linux-gnu-*`; + mv $CPUFREQ_DIRPATH/freqset $CPUFREQ_DIRPATH/e18_freqset + ln -sv $CPUFREQ_DIRPATH/e18_freqset $out/bin/e18_freqset + ln -sv /var/setuid-wrappers/e18_freqset $CPUFREQ_DIRPATH/freqset + '' else ""; meta = { description = "The Compositing Window Manager and Desktop Shell"; homepage = http://enlightenment.org/; diff --git a/pkgs/desktops/gnome-2/desktop/vte/default.nix b/pkgs/desktops/gnome-2/desktop/vte/default.nix index 30c8bf07d418a82910fc8c049d129272cdcc87ab..5932caf9e97d21b420b0470a7c83efd88cfb60ed 100644 --- a/pkgs/desktops/gnome-2/desktop/vte/default.nix +++ b/pkgs/desktops/gnome-2/desktop/vte/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { character set conversion, as well as emulating any terminal known to the system's terminfo database. ''; - license = "LGPLv2"; + license = stdenv.lib.licenses.lgpl2; maintainers = with stdenv.lib.maintainers; [ astsmtl ]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/desktops/gnome-2/platform/gconfmm/default.nix b/pkgs/desktops/gnome-2/platform/gconfmm/default.nix index 371382b2607df06fd93da13f82d6716e2df0de5a..045f60e8b606052819994b28be753fbd9d36b91c 100644 --- a/pkgs/desktops/gnome-2/platform/gconfmm/default.nix +++ b/pkgs/desktops/gnome-2/platform/gconfmm/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "C++ wrappers for GConf"; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/desktops/gnome-2/platform/gtkglext/default.nix b/pkgs/desktops/gnome-2/platform/gtkglext/default.nix index 55f0e0ae1a3b6becc0ee9d359624628458306e06..ee08975b9daa81ec5c23689f2e7c392076b4e9ec 100644 --- a/pkgs/desktops/gnome-2/platform/gtkglext/default.nix +++ b/pkgs/desktops/gnome-2/platform/gtkglext/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { OpenGL drawing for standard and custom GTK+ widgets. ''; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ ]; }; diff --git a/pkgs/desktops/gnome-2/platform/gtkglextmm/default.nix b/pkgs/desktops/gnome-2/platform/gtkglextmm/default.nix index 46218c8f601bdf96b6e21d6f9f92b7fb55a45669..4ce51844a51e7e24d638596872015fbbe978a422 100644 --- a/pkgs/desktops/gnome-2/platform/gtkglextmm/default.nix +++ b/pkgs/desktops/gnome-2/platform/gtkglextmm/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "C++ wrappers for GtkGLExt"; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/3.10/core/at-spi2-atk/default.nix b/pkgs/desktops/gnome-3/3.10/core/at-spi2-atk/default.nix deleted file mode 100644 index fc0c4f2a6bc012b3e6ca4b2eba2e83fde57bae60..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/3.10/core/at-spi2-atk/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv, fetchurl, python, pkgconfig, popt, atk, libX11, libICE, xlibs, libXi -, intltool, dbus_glib, at_spi2_core, libSM }: - -stdenv.mkDerivation rec { - versionMajor = "2.12"; - versionMinor = "0"; - moduleName = "at-spi2-atk"; - name = "${moduleName}-${versionMajor}.${versionMinor}"; - - src = fetchurl { - url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz"; - sha256 = "0crn3k6qvn6fjvgm68dj5ska1ppfgmdkaia2db1jp0b9y74nfm1v"; - }; - - buildInputs = [ python pkgconfig popt atk libX11 libICE xlibs.libXtst libXi - intltool dbus_glib at_spi2_core libSM ]; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.10/core/caribou/default.nix b/pkgs/desktops/gnome-3/3.10/core/caribou/default.nix index 41a997c1f714bbe71ed29e8669fa914fd525901f..ba5dc7e7b90aa20c5f4efb556eb8c4c48dd41431 100644 --- a/pkgs/desktops/gnome-3/3.10/core/caribou/default.nix +++ b/pkgs/desktops/gnome-3/3.10/core/caribou/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, pkgconfig, gnome3, clutter, dbus, pythonPackages, libxml2 -, libxklavier, libXtst, gtk2, intltool, libxslt }: +, libxklavier, libXtst, gtk2, intltool, libxslt, at_spi2_core }: stdenv.mkDerivation rec { diff --git a/pkgs/desktops/gnome-3/3.10/core/dconf/default.nix b/pkgs/desktops/gnome-3/3.10/core/dconf/default.nix index a6236f1674403cbf45e5648593fb94f999b27f56..b284186fa8292d20e21b2396d13cb4fdee080196 100644 --- a/pkgs/desktops/gnome-3/3.10/core/dconf/default.nix +++ b/pkgs/desktops/gnome-3/3.10/core/dconf/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "dconf-${version}"; - version = "0.18.0"; + version = "0.20.0"; src = fetchurl { - url = "mirror://gnome/sources/dconf/0.18/${name}.tar.xz"; - sha256 = "0mf921pnkhs8xn1dr2wxfq277vjsbkpl9cccv0gaz4460z31p6qh"; + url = "mirror://gnome/sources/dconf/0.20/${name}.tar.xz"; + sha256 = "22c046a247d05ea65ad181e3aef4009c898a5531f76c0181f8ec0dfef83447d9"; }; buildInputs = [ vala libxslt pkgconfig glib dbus_glib gnome3.gtk libxml2 @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/action/show/Projects/dconf; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/3.10/core/evince/default.nix b/pkgs/desktops/gnome-3/3.10/core/evince/default.nix index 4b50840534cf5bbfc6dff11157084da98c364415..76cfacb0d776aa8b1184197ab465c6cdd91498d6 100644 --- a/pkgs/desktops/gnome-3/3.10/core/evince/default.nix +++ b/pkgs/desktops/gnome-3/3.10/core/evince/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { on the GNOME Desktop with a single simple application. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.vcunat ]; }; diff --git a/pkgs/desktops/gnome-3/3.10/core/folks/default.nix b/pkgs/desktops/gnome-3/3.10/core/folks/default.nix index 12518c634c4f0eb12f8650d37931849c0b6b3670..47b958002a39cdedf716de6c9d071ee438ce4413 100644 --- a/pkgs/desktops/gnome-3/3.10/core/folks/default.nix +++ b/pkgs/desktops/gnome-3/3.10/core/folks/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { homepage = https://wiki.gnome.org/Projects/Folks; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = with stdenv.lib.maintainers; [ lethalman ]; platforms = stdenv.lib.platforms.gnu; # arbitrary choice diff --git a/pkgs/desktops/gnome-3/3.10/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/3.10/core/gnome-shell/default.nix index d468e06d429fabba8da2f0e47965cf940d67801d..2b5ff4cc5a28232dd05336a304d01ce8d5551e2f 100644 --- a/pkgs/desktops/gnome-3/3.10/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome-3/3.10/core/gnome-shell/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, pkgconfig, gnome3, json_glib, libcroco, intltool, libsecret -, python, libsoup, polkit, clutter, networkmanager, docbook_xsl, docbook_xsl_ns +, python, libsoup, polkit, clutter, networkmanager, docbook_xsl, docbook_xsl_ns, at_spi2_core , libstartup_notification, telepathy_glib, telepathy_logger, libXtst, p11_kit, unzip , pulseaudio, libical, libtool, nss, gobjectIntrospection, gstreamer, makeWrapper , accountsservice, gdk_pixbuf, gdm, upower, ibus, networkmanagerapplet, librsvg }: diff --git a/pkgs/desktops/gnome-3/3.10/core/vte/default.nix b/pkgs/desktops/gnome-3/3.10/core/vte/default.nix index c916be6c9a725324f032b016aeb6bd3ef3f97511..b9ffcffafbdcb8a13a491e54efed17fedc3bb5e6 100644 --- a/pkgs/desktops/gnome-3/3.10/core/vte/default.nix +++ b/pkgs/desktops/gnome-3/3.10/core/vte/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { versionMajor = "0.35"; versionMinor = "90"; moduleName = "vte"; - + name = "${moduleName}-${versionMajor}.${versionMinor}"; src = fetchurl { diff --git a/pkgs/desktops/gnome-3/3.10/default.nix b/pkgs/desktops/gnome-3/3.10/default.nix index 4376493c95b03d7f57c86f23a03d30c1143f59fd..89e16490df9334ac784d2a152f0c85246dc3def1 100644 --- a/pkgs/desktops/gnome-3/3.10/default.nix +++ b/pkgs/desktops/gnome-3/3.10/default.nix @@ -10,10 +10,6 @@ rec { #### Core (http://ftp.acc.umu.se/pub/GNOME/core/) - at_spi2_atk = callPackage ./core/at-spi2-atk { }; - - at_spi2_core = callPackage ./core/at-spi2-core { }; - baobab = callPackage ./core/baobab { }; caribou = callPackage ./core/caribou { }; diff --git a/pkgs/desktops/gnome-3/3.10/misc/goffice/default.nix b/pkgs/desktops/gnome-3/3.10/misc/goffice/default.nix index 0390fc133687d787e73413494b8844ea985f8ea5..fd16d2d4985fbe8d929d28b4608e4c9d810cb88a 100644 --- a/pkgs/desktops/gnome-3/3.10/misc/goffice/default.nix +++ b/pkgs/desktops/gnome-3/3.10/misc/goffice/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { documents, undo/redo. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.gnu; }; diff --git a/pkgs/desktops/gnome-3/3.12/core/at-spi2-core/default.nix b/pkgs/desktops/gnome-3/3.12/core/at-spi2-core/default.nix deleted file mode 100644 index d60a0ff7480cdecc790e228f15eabbcc90ea8366..0000000000000000000000000000000000000000 --- a/pkgs/desktops/gnome-3/3.12/core/at-spi2-core/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ stdenv, fetchurl, python, pkgconfig, popt, intltool, dbus_glib -, libX11, xextproto, libSM, libICE, libXtst, libXi, gobjectIntrospection }: - -stdenv.mkDerivation (rec { - versionMajor = "2.12"; - versionMinor = "0"; - moduleName = "at-spi2-core"; - name = "${moduleName}-${versionMajor}.${versionMinor}"; - - src = fetchurl { - url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz"; - sha256 = "12gvsgdaxnxskndlhlmdkc50cfqgmzfc4n8la9944fz5k3fhwmfv"; - }; - - buildInputs = [ - python pkgconfig popt intltool dbus_glib - libX11 xextproto libSM libICE libXtst libXi - gobjectIntrospection - ]; - - # ToDo: on non-NixOS we create a symlink from there? - configureFlags = "--with-dbus-daemondir=/run/current-system/sw/bin/"; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; -} - // stdenv.lib.optionalAttrs stdenv.isDarwin { - NIX_LDFLAGS = "-lintl"; - } -) - diff --git a/pkgs/desktops/gnome-3/3.12/core/caribou/default.nix b/pkgs/desktops/gnome-3/3.12/core/caribou/default.nix index 4d2f390c0428935974815cfec9980a067f9e371a..3a6c3f0dd357344320f4a9837ea6ca569a47206b 100644 --- a/pkgs/desktops/gnome-3/3.12/core/caribou/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/caribou/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, pkgconfig, gnome3, clutter, dbus, pythonPackages, libxml2 -, libxklavier, libXtst, gtk2, intltool, libxslt }: +, libxklavier, libXtst, gtk2, intltool, libxslt, at_spi2_core }: stdenv.mkDerivation rec { diff --git a/pkgs/desktops/gnome-3/3.12/core/evince/default.nix b/pkgs/desktops/gnome-3/3.12/core/evince/default.nix index ca983258d956013bbe30ca3c45d77977ebb6350b..2a585d78f4e5aa6e53dac4229d371b5d59e8780c 100644 --- a/pkgs/desktops/gnome-3/3.12/core/evince/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/evince/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { on the GNOME Desktop with a single simple application. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.vcunat ]; }; diff --git a/pkgs/desktops/gnome-3/3.12/core/folks/default.nix b/pkgs/desktops/gnome-3/3.12/core/folks/default.nix index 12518c634c4f0eb12f8650d37931849c0b6b3670..47b958002a39cdedf716de6c9d071ee438ce4413 100644 --- a/pkgs/desktops/gnome-3/3.12/core/folks/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/folks/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { homepage = https://wiki.gnome.org/Projects/Folks; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = with stdenv.lib.maintainers; [ lethalman ]; platforms = stdenv.lib.platforms.gnu; # arbitrary choice diff --git a/pkgs/desktops/gnome-3/3.12/core/gdm/default.nix b/pkgs/desktops/gnome-3/3.12/core/gdm/default.nix index 4e9acc822e74fc2476b349b0de5ee5f4987a74fa..f5dc7639f3a5fd706b2d10f9291ed77ddacf60b9 100644 --- a/pkgs/desktops/gnome-3/3.12/core/gdm/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/gdm/default.nix @@ -1,5 +1,6 @@ -{ stdenv, fetchurl, pkgconfig, glib, itstool, libxml2, intltool, accountsservice, libX11 -, gtk, libcanberra_gtk3, pam, libtool, gobjectIntrospection, dconf }: +{ stdenv, fetchurl, pkgconfig, glib, itstool, libxml2, xorg, dbus +, intltool, accountsservice, libX11, gnome3, systemd, gnome_session +, gtk, libcanberra_gtk3, pam, libtool, gobjectIntrospection }: stdenv.mkDerivation rec { name = "gdm-3.12.2"; @@ -9,10 +10,33 @@ stdenv.mkDerivation rec { sha256 = "cc91fff5afd2a7c3e712c960a0b60744774167dcfc16f486372e1eb3c0aa1cc4"; }; - buildInputs = [ pkgconfig glib itstool libxml2 intltool accountsservice dconf - gobjectIntrospection libX11 gtk libcanberra_gtk3 pam libtool ]; + # Only needed to make it build + preConfigure = '' + substituteInPlace ./configure --replace "/usr/bin/X" "${xorg.xorgserver}/bin/X" + ''; + + configureFlags = [ "--localstatedir=/var" "--with-systemd=yes" + "--with-systemdsystemunitdir=$(out)/etc/systemd/system" ]; + + buildInputs = [ pkgconfig glib itstool libxml2 intltool + accountsservice gnome3.dconf systemd + gobjectIntrospection libX11 gtk + libcanberra_gtk3 pam libtool ]; + + enableParallelBuilding = true; + + preBuild = '' + substituteInPlace daemon/gdm-simple-slave.c --replace 'BINDIR "/gnome-session' '"${gnome_session}/bin/gnome-session' + substituteInPlace daemon/gdm-launch-environment.c --replace 'BINDIR "/dbus-launch' '"${dbus.tools}/bin/dbus-launch' + ''; + + # Disable Access Control because our X does not support FamilyServerInterpreted yet + patches = [ ./xserver_path.patch ./sessions_dir.patch ./disable_x_access_control.patch ./propagate_xdgconfigdirs.patch ]; meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Projects/GDM; + description = "A program that manages graphical display servers and handles graphical user logins"; platforms = platforms.linux; + maintainers = [ maintainers.lethalman ]; }; } diff --git a/pkgs/desktops/gnome-3/3.12/core/gdm/disable_x_access_control.patch b/pkgs/desktops/gnome-3/3.12/core/gdm/disable_x_access_control.patch new file mode 100644 index 0000000000000000000000000000000000000000..74d054f8c888c684ad78bdfa02c80499acc400be --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/core/gdm/disable_x_access_control.patch @@ -0,0 +1,18 @@ +diff --git a/daemon/gdm-slave.c b/daemon/gdm-slave.c +index 1afe48e..e3d1ec2 100644 +--- a/daemon/gdm-slave.c ++++ b/daemon/gdm-slave.c +@@ -291,9 +291,10 @@ gdm_slave_connect_to_x11_display (GdmSlave *slave) + + gdm_error_trap_push (); + +- for (i = 0; i < G_N_ELEMENTS (host_entries); i++) { ++ /*for (i = 0; i < G_N_ELEMENTS (host_entries); i++) { + XAddHost (slave->priv->server_display, &host_entries[i]); +- } ++ }*/ ++ XDisableAccessControl(slave->priv->server_display); + + XSync (slave->priv->server_display, False); + if (gdm_error_trap_pop ()) { + diff --git a/pkgs/desktops/gnome-3/3.12/core/gdm/propagate_xdgconfigdirs.patch b/pkgs/desktops/gnome-3/3.12/core/gdm/propagate_xdgconfigdirs.patch new file mode 100644 index 0000000000000000000000000000000000000000..20d7659c1e52eac5ea1444c27c7c4dec954aa081 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/core/gdm/propagate_xdgconfigdirs.patch @@ -0,0 +1,26 @@ +--- a/daemon/gdm-launch-environment.c 2014-08-03 12:05:39.380178964 +0200 ++++ b/daemon/gdm-launch-environment.c 2014-08-03 12:08:26.570182517 +0200 +@@ -224,6 +224,7 @@ + NULL + }; + char *system_data_dirs; ++ char *system_config_dirs; + int i; + + load_lang_config_file (LANG_CONFIG_FILE, +@@ -251,6 +252,15 @@ + system_data_dirs)); + g_free (system_data_dirs); + ++ system_config_dirs = g_strjoinv (":", (char **) g_get_system_config_dirs ()); ++ ++ g_hash_table_insert (hash, ++ g_strdup ("XDG_CONFIG_DIRS"), ++ g_strdup_printf ("%s", ++ system_config_dirs)); ++ g_free (system_config_dirs); ++ ++ + g_hash_table_insert (hash, g_strdup ("XAUTHORITY"), g_strdup (launch_environment->priv->x11_authority_file)); + + g_hash_table_insert (hash, g_strdup ("LOGNAME"), g_strdup (launch_environment->priv->user_name)); diff --git a/pkgs/desktops/gnome-3/3.12/core/gdm/sessions_dir.patch b/pkgs/desktops/gnome-3/3.12/core/gdm/sessions_dir.patch new file mode 100644 index 0000000000000000000000000000000000000000..b8fbad4d731d0e72631e7eefaf4510658c9866a6 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/core/gdm/sessions_dir.patch @@ -0,0 +1,17 @@ +diff --git a/daemon/gdm-session.c b/daemon/gdm-session.c +index f759d2d..d154716 100644 +--- a/daemon/gdm-session.c ++++ b/daemon/gdm-session.c +@@ -373,9 +373,12 @@ get_system_session_dirs (void) + #ifdef ENABLE_WAYLAND_SUPPORT + DATADIR "/wayland-sessions/", + #endif ++ NULL, + NULL + }; + ++ search_dirs[4] = getenv("GDM_SESSIONS_DIR") != NULL ? getenv("GDM_SESSIONS_DIR") : NULL; ++ + return search_dirs; + } + diff --git a/pkgs/desktops/gnome-3/3.12/core/gdm/xserver_path.patch b/pkgs/desktops/gnome-3/3.12/core/gdm/xserver_path.patch new file mode 100644 index 0000000000000000000000000000000000000000..412daee9f270768e9fc1d7495671a046d2d42cc9 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/core/gdm/xserver_path.patch @@ -0,0 +1,15 @@ +--- a/daemon/gdm-server.c 2014-07-30 23:00:17.786841724 +0200 ++++ b/daemon/gdm-server.c 2014-07-30 23:02:10.491239180 +0200 +@@ -322,7 +322,11 @@ + fallback: + #endif + +- server->priv->command = g_strdup_printf (X_SERVER X_SERVER_ARG_FORMAT, verbosity, debug_options); ++ if (g_getenv("GDM_X_SERVER") != NULL) { ++ server->priv->command = g_strdup (g_getenv("GDM_X_SERVER")); ++ } else { ++ server->priv->command = g_strdup_printf (X_SERVER X_SERVER_ARG_FORMAT, verbosity, debug_options); ++ } + } + + static gboolean diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-shell/default.nix index 2fb1e091aa0edde0cd6e03d21082e51905fdf9df..dbb19f77d21e5f942623907d9fbde1b66f81c8b2 100644 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/gnome-shell/default.nix @@ -1,6 +1,7 @@ { fetchurl, stdenv, pkgconfig, gnome3, json_glib, libcroco, intltool, libsecret -, python, libsoup, polkit, clutter, networkmanager, docbook_xsl, docbook_xsl_ns +, python, libsoup, polkit, clutter, networkmanager, docbook_xsl, docbook_xsl_ns, at_spi2_core , libstartup_notification, telepathy_glib, telepathy_logger, libXtst, p11_kit, unzip +, hicolor_icon_theme , pulseaudio, libical, libtool, nss, gobjectIntrospection, gstreamer, makeWrapper , accountsservice, gdk_pixbuf, gdm, upower, ibus, networkmanagerapplet, librsvg }: @@ -20,6 +21,7 @@ stdenv.mkDerivation rec { clutter networkmanager libstartup_notification telepathy_glib docbook_xsl docbook_xsl_ns libXtst p11_kit networkmanagerapplet gjs mutter pulseaudio caribou evolution_data_server libical libtool nss gobjectIntrospection gtk gstreamer makeWrapper gdm gnome_control_center + hicolor_icon_theme gnome_icon_theme gnome_icon_theme_symbolic at_spi2_core upower ibus gnome_session gnome_desktop telepathy_logger gnome3.gnome_settings_daemon ]; installFlags = [ "keysdir=$(out)/share/gnome-control-center/keybindings" ]; @@ -43,8 +45,6 @@ stdenv.mkDerivation rec { echo "${unzip}/bin" > $out/${passthru.mozillaPlugin}/extra-bin-path ''; - enableParallelBuilding = true; - passthru = { mozillaPlugin = "/lib/mozilla/plugins"; }; diff --git a/pkgs/desktops/gnome-3/3.12/core/libzapojit/default.nix b/pkgs/desktops/gnome-3/3.12/core/libzapojit/default.nix index 5e2559899b77dd9b2b0fe7170bbd53dc5295166a..5a8117528b68a762d1b0d63f3dca9c259c548b9f 100644 --- a/pkgs/desktops/gnome-3/3.12/core/libzapojit/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/libzapojit/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "libzapojit-0.0.3"; src = fetchurl { - url = "mirror://gnome/sources//3.10/${name}.tar.xz"; + url = "mirror://gnome/sources/libzapojit/0.0/${name}.tar.xz"; sha256 = "0zn3s7ryjc3k1abj4k55dr2na844l451nrg9s6cvnnhh569zj99x"; }; diff --git a/pkgs/desktops/gnome-3/3.12/core/vino/default.nix b/pkgs/desktops/gnome-3/3.12/core/vino/default.nix index 8580af9b8841d753b7a469c0d5492fc3cd8f1aca..1692b2c9c96fa2e15955b23b00b5c1aa93934b37 100644 --- a/pkgs/desktops/gnome-3/3.12/core/vino/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/vino/default.nix @@ -1,4 +1,5 @@ { stdenv, intltool, fetchurl, gtk3, glib, libsoup, pkgconfig, makeWrapper +, hicolor_icon_theme, gnome3 , libnotify, file, telepathy_glib, dbus_glib }: stdenv.mkDerivation rec { @@ -14,11 +15,12 @@ stdenv.mkDerivation rec { doCheck = true; buildInputs = [ gtk3 intltool glib libsoup pkgconfig libnotify + hicolor_icon_theme gnome3.gnome_icon_theme gnome3.gnome_icon_theme_symbolic dbus_glib telepathy_glib file makeWrapper ]; preFixup = '' wrapProgram "$out/libexec/vino-server" \ - --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" + --prefix XDG_DATA_DIRS : "$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.12/core/vte/default.nix b/pkgs/desktops/gnome-3/3.12/core/vte/default.nix index 70c860849e085d7eb073b50e73e479193078df94..41597e47fa54ed580899d368339f7a3238aea615 100644 --- a/pkgs/desktops/gnome-3/3.12/core/vte/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/vte/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { versionMajor = "0.36"; versionMinor = "2"; moduleName = "vte"; - + name = "${moduleName}-${versionMajor}.${versionMinor}"; src = fetchurl { diff --git a/pkgs/desktops/gnome-3/3.12/default.nix b/pkgs/desktops/gnome-3/3.12/default.nix index 1bb197338ec2843c773498d9532ab1f98e3b5455..ee1724e1e250685a079dfbd50afbde48b7147bb1 100644 --- a/pkgs/desktops/gnome-3/3.12/default.nix +++ b/pkgs/desktops/gnome-3/3.12/default.nix @@ -16,10 +16,6 @@ rec { #### Core (http://ftp.acc.umu.se/pub/GNOME/core/) - at_spi2_atk = callPackage ./core/at-spi2-atk { }; - - at_spi2_core = callPackage ./core/at-spi2-core { }; - baobab = callPackage ./core/baobab { }; caribou = callPackage ./core/caribou { }; @@ -215,6 +211,11 @@ rec { seahorse = callPackage ./apps/seahorse { }; +#### Dev http://ftp.gnome.org/pub/GNOME/devtools/ + + anjuta = callPackage ./devtools/anjuta { }; + + gdl = callPackage ./devtools/gdl { }; #### Misc -- other packages on http://ftp.gnome.org/pub/GNOME/sources/ @@ -226,6 +227,8 @@ rec { gitg = callPackage ./misc/gitg { }; + libgda = callPackage ./misc/libgda { }; + libgit2-glib = callPackage ./misc/libgit2-glib { }; libmediaart = callPackage ./misc/libmediaart { }; diff --git a/pkgs/desktops/gnome-3/3.12/devtools/anjuta/default.nix b/pkgs/desktops/gnome-3/3.12/devtools/anjuta/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..79bfd89525787b30576143944950d3dc5b374084 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/devtools/anjuta/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, flex, bison, libxml2, intltool, + itstool, python }: + +let + major = "3.13"; + minor = "1"; + +in stdenv.mkDerivation rec { + version = "${major}.${minor}"; + name = "anjuta-${version}"; + + src = fetchurl { + url = "mirror://gnome/sources/anjuta/${major}/${name}.tar.xz"; + sha256 = "71bdad9a0e427d9481858eec40b9c1facef4b551d732023cc18a50019df4b78b"; + }; + + enableParallelBuilding = true; + + buildInputs = [ pkgconfig flex bison gtk3 libxml2 gnome3.gjs gnome3.gdl + gnome3.libgda gnome3.gtksourceview intltool itstool python ]; + + meta = with stdenv.lib; { + description = "Software development studio"; + homepage = http://anjuta.org/; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.12/devtools/gdl/default.nix b/pkgs/desktops/gnome-3/3.12/devtools/gdl/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..1dae33cd4e910a6aba6c925408948b968e5ea2d2 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/devtools/gdl/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, pkgconfig, libxml2, gtk3, intltool }: + +let + major = "3.12"; + minor = "0"; + +in stdenv.mkDerivation rec { + version = "${major}.${minor}"; + name = "gdl-${version}"; + + src = fetchurl { + url = "https://download.gnome.org/sources/gdl/${major}/${name}.tar.xz"; + sha256 = "4770f959f31ed5e616fe623c284e8dd6136e49902d19b6e37938d34be4f6b88d"; + }; + + buildInputs = [ pkgconfig libxml2 gtk3 intltool ]; + + meta = with stdenv.lib; { + description = "Gnome docking library"; + homepage = https://developer.gnome.org/gdl/; + license = [ licenses.gpl2 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.12/misc/goffice/default.nix b/pkgs/desktops/gnome-3/3.12/misc/goffice/default.nix index 0390fc133687d787e73413494b8844ea985f8ea5..fd16d2d4985fbe8d929d28b4608e4c9d810cb88a 100644 --- a/pkgs/desktops/gnome-3/3.12/misc/goffice/default.nix +++ b/pkgs/desktops/gnome-3/3.12/misc/goffice/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { documents, undo/redo. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.gnu; }; diff --git a/pkgs/desktops/gnome-3/3.12/misc/libgda/default.nix b/pkgs/desktops/gnome-3/3.12/misc/libgda/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..3944644a453683c460104245c1ede0b08054ea99 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/misc/libgda/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gtk3 }: + +let + major = "5.2"; + minor = "2"; + +in stdenv.mkDerivation rec { + version = "${major}.${minor}"; + name = "libgda-${version}"; + + src = fetchurl { + url = "mirror://gnome/sources/libgda/${major}/${name}.tar.xz"; + sha256 = "c9b8b1c32f1011e47b73c5dcf36649aaef2f1edaa5f5d75be20d9caadc2bc3e4"; + }; + + configureFlags = [ + "--enable-gi-system-install=no" + ]; + + enableParallelBuilding = true; + + buildInputs = [ pkgconfig intltool itstool libxml2 gtk3 ]; + + meta = with stdenv.lib; { + description = "Database access library"; + homepage = http://www.gnome-db.org/; + license = [ licenses.lgpl2 licenses.gpl2 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/kde-4.12/applications/kate.nix b/pkgs/desktops/kde-4.12/applications/kate.nix index 63bfa12c4bb4357e15b956b4bbc6152f0d6b6a9a..e7a6476dd6df1a3fce3c4a83b22826e30676e1ca 100644 --- a/pkgs/desktops/kde-4.12/applications/kate.nix +++ b/pkgs/desktops/kde-4.12/applications/kate.nix @@ -1,4 +1,4 @@ -{ kde, kdelibs, kactivities, qjson, pyqt4, sip, python, pykde4}: +{ stdenv, kde, kdelibs, kactivities, qjson, pyqt4, sip, python, pykde4}: kde { @@ -6,6 +6,6 @@ kde { meta = { description = "Kate, the KDE Advanced Text Editor, as well as KWrite"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/desktops/kde-4.12/applications/konsole.nix b/pkgs/desktops/kde-4.12/applications/konsole.nix index 0db47fb2d7c4761501f2577c0a23d40165541cfc..bd4e9e58cd05c783eb8c8f9c1a22c80e938ded56 100644 --- a/pkgs/desktops/kde-4.12/applications/konsole.nix +++ b/pkgs/desktops/kde-4.12/applications/konsole.nix @@ -1,4 +1,4 @@ -{ kde, kdelibs, kde_baseapps }: +{ stdenv, kde, kdelibs, kde_baseapps }: kde { @@ -6,6 +6,6 @@ kde { meta = { description = "Konsole, the KDE terminal emulator"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/desktops/kde-4.12/kde-baseapps/kde-baseapps.nix b/pkgs/desktops/kde-4.12/kde-baseapps/kde-baseapps.nix index c2a256646786c872ea79b894559c7c176a95a837..a65f33e13de1dce4a35f88fdfe13c03b8bf1a038 100644 --- a/pkgs/desktops/kde-4.12/kde-baseapps/kde-baseapps.nix +++ b/pkgs/desktops/kde-4.12/kde-baseapps/kde-baseapps.nix @@ -1,4 +1,4 @@ -{ kde, kdelibs, htmlTidy, kactivities +{ stdenv, kde, kdelibs, htmlTidy, kactivities , nepomuk_core, nepomuk_widgets, libXt }: kde { @@ -6,6 +6,6 @@ kde { meta = { description = "Base KDE applications, including the Dolphin file manager and Konqueror web browser"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/desktops/kde-4.12/kde-workspace.nix b/pkgs/desktops/kde-4.12/kde-workspace.nix index 39e9c10a0fbe0ab442c5f48671931ffd77d1b82f..537beaac6ae65e51efcbe08e53f3729680c7a20b 100644 --- a/pkgs/desktops/kde-4.12/kde-workspace.nix +++ b/pkgs/desktops/kde-4.12/kde-workspace.nix @@ -1,4 +1,4 @@ -{ kde, kdelibs, qimageblitz, libdbusmenu_qt, xorg, lm_sensors +{ stdenv, kde, kdelibs, qimageblitz, libdbusmenu_qt, xorg, lm_sensors , pciutils, libraw1394, libusb1, python, libqalculate, akonadi , xkeyboard_config, kdepimlibs, pam, boost, gpsd, prison , libjpeg, pkgconfig, kactivities, qjson, udev, fetchurl @@ -15,7 +15,7 @@ kde { #todo: wayland, xmms, libusb isn't found buildInputs = - [ kdelibs qimageblitz libdbusmenu_qt xorg.libxcb xorg.xcbutilimage libjpeg + [ kdelibs qimageblitz libdbusmenu_qt xorg.libxcb xorg.xcbutilimage libjpeg xorg.xcbutilrenderutil xorg.xcbutilkeysyms xorg.libpthreadstubs xorg.libXdmcp xorg.libxkbfile xorg.libXcomposite xorg.libXtst xorg.libXdamage @@ -41,6 +41,6 @@ kde { meta = { description = "KDE workspace components such as Plasma, Kwin and System Settings"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/desktops/kde-4.12/kdebindings/smokegen.nix b/pkgs/desktops/kde-4.12/kdebindings/smokegen.nix index a80574ff67abe3114794ed1bae30d063bbc54c63..5708d0f96eb24a45a3bc544d1ab6363f70f17fbf 100644 --- a/pkgs/desktops/kde-4.12/kdebindings/smokegen.nix +++ b/pkgs/desktops/kde-4.12/kdebindings/smokegen.nix @@ -1,4 +1,4 @@ -{ kde, qt4, cmake }: +{ stdenv, kde, qt4, cmake }: kde { buildInputs = [ qt4 ]; @@ -8,6 +8,6 @@ kde { meta = { description = "C++ parser used to generate language bindings for Qt/KDE"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/desktops/kde-4.12/kdebindings/smokeqt.nix b/pkgs/desktops/kde-4.12/kdebindings/smokeqt.nix index 72b267e43c5ed145bc85459314fa59d29a509c3e..494bc85e646541d0c438563bbb9c974956780921 100644 --- a/pkgs/desktops/kde-4.12/kdebindings/smokeqt.nix +++ b/pkgs/desktops/kde-4.12/kdebindings/smokeqt.nix @@ -1,4 +1,4 @@ -{ kde, qt4, cmake, phonon, qimageblitz, smokegen }: +{ stdenv, kde, qt4, cmake, phonon, qimageblitz, smokegen }: kde { @@ -10,6 +10,6 @@ kde { meta = { description = "C++ parser used to generate language bindings for Qt/KDE"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/desktops/kde-4.12/kdegraphics/gwenview.nix b/pkgs/desktops/kde-4.12/kdegraphics/gwenview.nix index b6fd701ac1297bb947c4bfce5e628799093d4ebc..3ce9b3dcc78a92117cb8c32c7143f13fa222a73f 100644 --- a/pkgs/desktops/kde-4.12/kdegraphics/gwenview.nix +++ b/pkgs/desktops/kde-4.12/kdegraphics/gwenview.nix @@ -1,4 +1,4 @@ -{ kde, kdelibs, exiv2, kde_baseapps, libkipi, nepomuk_core +{ stdenv, kde, kdelibs, exiv2, kde_baseapps, libkipi, nepomuk_core , libjpeg, pkgconfig, kactivities, lcms2 }: kde { @@ -10,6 +10,6 @@ kde { meta = { description = "Gwenview, the KDE image viewer"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/desktops/kde-4.12/kdegraphics/kamera.nix b/pkgs/desktops/kde-4.12/kdegraphics/kamera.nix index 70904b17c232bde4eb5785a63d7a5095a5ad05d8..d9aa11c54afa4b879704e7d3cbbdc8118cd2005f 100644 --- a/pkgs/desktops/kde-4.12/kdegraphics/kamera.nix +++ b/pkgs/desktops/kde-4.12/kdegraphics/kamera.nix @@ -1,10 +1,10 @@ -{ kde, kdelibs, libgphoto2 }: +{ stdenv, kde, kdelibs, libgphoto2 }: kde { buildInputs = [ kdelibs libgphoto2 ]; meta = { description = "KDE camera interface library"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/desktops/kde-4.12/kdegraphics/kcolorchooser.nix b/pkgs/desktops/kde-4.12/kdegraphics/kcolorchooser.nix index 58528cb186bb2fe9fce4fc340ac06163b0ace657..e06c1b5d307c524a4c6b12749df5284da55e28c0 100644 --- a/pkgs/desktops/kde-4.12/kdegraphics/kcolorchooser.nix +++ b/pkgs/desktops/kde-4.12/kdegraphics/kcolorchooser.nix @@ -1,10 +1,10 @@ -{ kde, kdelibs }: +{ stdenv, kde, kdelibs }: kde { buildInputs = [ kdelibs ]; meta = { description = "A small utility to select a color"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/desktops/kde-4.12/kdegraphics/kdegraphics-mobipocket.nix b/pkgs/desktops/kde-4.12/kdegraphics/kdegraphics-mobipocket.nix index 2c2ba3796a2c357a7afe5e949e9eae1162c11a4b..e834762feb52d311fd6458c280d1e78e2f05f379 100644 --- a/pkgs/desktops/kde-4.12/kdegraphics/kdegraphics-mobipocket.nix +++ b/pkgs/desktops/kde-4.12/kdegraphics/kdegraphics-mobipocket.nix @@ -1,10 +1,10 @@ -{ kde, kdelibs, okular }: +{ stdenv, kde, kdelibs, okular }: kde { buildInputs = [ kdelibs okular ]; meta = { description = "A collection of plugins to handle mobipocket files"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/desktops/kde-4.12/kdegraphics/kdegraphics-strigi-analyzer.nix b/pkgs/desktops/kde-4.12/kdegraphics/kdegraphics-strigi-analyzer.nix index 35af39aa611da98e7c4caa01333a088ce3f6284d..d9d35808ac50fa6170f2056bfa8ecc09658ac489 100644 --- a/pkgs/desktops/kde-4.12/kdegraphics/kdegraphics-strigi-analyzer.nix +++ b/pkgs/desktops/kde-4.12/kdegraphics/kdegraphics-strigi-analyzer.nix @@ -1,10 +1,10 @@ -{ kde, kdelibs, libtiff }: +{ stdenv, kde, kdelibs, libtiff }: kde { buildInputs = [ kdelibs libtiff ]; meta = { description = "Strigi analyzers for various graphics file formats"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/desktops/kde-4.12/kdegraphics/kdegraphics-thumbnailers.nix b/pkgs/desktops/kde-4.12/kdegraphics/kdegraphics-thumbnailers.nix index 18c6534eb5c9a537ad797813ddd578a595bad021..d6207689512f9df13a18038d652cd94829fdb69c 100644 --- a/pkgs/desktops/kde-4.12/kdegraphics/kdegraphics-thumbnailers.nix +++ b/pkgs/desktops/kde-4.12/kdegraphics/kdegraphics-thumbnailers.nix @@ -1,4 +1,4 @@ -{ kde, kdelibs, libkexiv2, libkdcraw, pkgconfig }: +{ stdenv, kde, kdelibs, libkexiv2, libkdcraw, pkgconfig }: kde { @@ -8,6 +8,6 @@ kde { meta = { description = "Thumbnailers for various graphics file formats"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/desktops/kde-4.12/kdegraphics/kgamma.nix b/pkgs/desktops/kde-4.12/kdegraphics/kgamma.nix index 28d9252187e0ebf046a8333ad36501b2d0edc5f5..016312c199e530474a981bfb976b2c75e273016c 100644 --- a/pkgs/desktops/kde-4.12/kdegraphics/kgamma.nix +++ b/pkgs/desktops/kde-4.12/kdegraphics/kgamma.nix @@ -1,10 +1,10 @@ -{ kde, kdelibs, libXxf86vm }: +{ stdenv, kde, kdelibs, libXxf86vm }: kde { buildInputs = [ kdelibs libXxf86vm ]; meta = { description = "KDE monitor calibration tool"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/desktops/kde-4.12/kdegraphics/kolourpaint.nix b/pkgs/desktops/kde-4.12/kdegraphics/kolourpaint.nix index 5276ec09f462f464103f702b5caf17495522862f..ecf34e5ae9e545edcaaacb909dbca91a4f4a9bdf 100644 --- a/pkgs/desktops/kde-4.12/kdegraphics/kolourpaint.nix +++ b/pkgs/desktops/kde-4.12/kdegraphics/kolourpaint.nix @@ -1,10 +1,10 @@ -{ kde, kdelibs, qimageblitz }: +{ stdenv, kde, kdelibs, qimageblitz }: kde { buildInputs = [ kdelibs qimageblitz ]; meta = { description = "KDE paint program"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/desktops/kde-4.12/kdegraphics/kruler.nix b/pkgs/desktops/kde-4.12/kdegraphics/kruler.nix index c5c2c6e05d7c519fdceb654d351659de94c6cbbb..209331d9e83d646beab249d6a75934c895db448c 100644 --- a/pkgs/desktops/kde-4.12/kdegraphics/kruler.nix +++ b/pkgs/desktops/kde-4.12/kdegraphics/kruler.nix @@ -1,10 +1,10 @@ -{ kde, kdelibs }: +{ stdenv, kde, kdelibs }: kde { buildInputs = [ kdelibs ]; meta = { description = "KDE screen ruler"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/desktops/kde-4.12/kdegraphics/ksaneplugin.nix b/pkgs/desktops/kde-4.12/kdegraphics/ksaneplugin.nix index 1381ed7dd266577441c62aac4043da0c52cc7a7f..f541c4bdb4dfc40ad91b96039dd927e0880f4a5f 100644 --- a/pkgs/desktops/kde-4.12/kdegraphics/ksaneplugin.nix +++ b/pkgs/desktops/kde-4.12/kdegraphics/ksaneplugin.nix @@ -1,10 +1,10 @@ -{ kde, kdelibs, libksane }: +{ stdenv, kde, kdelibs, libksane }: kde { buildInputs = [ kdelibs libksane ]; meta = { description = "A KScan plugin that implements the scanning through libksane"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/desktops/kde-4.12/kdegraphics/ksnapshot.nix b/pkgs/desktops/kde-4.12/kdegraphics/ksnapshot.nix index f01a609e20de9d0af66f675a79cb1684cdd9bed1..a9897d270bb62a54bdb3dc1b3a755039f48f3473 100644 --- a/pkgs/desktops/kde-4.12/kdegraphics/ksnapshot.nix +++ b/pkgs/desktops/kde-4.12/kdegraphics/ksnapshot.nix @@ -1,10 +1,10 @@ -{ kde, kdelibs, libkipi }: +{ stdenv, kde, kdelibs, libkipi }: kde { buildInputs = [ kdelibs libkipi ]; meta = { description = "KDE screenshot utility"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/desktops/kde-4.12/kdegraphics/libkdcraw.nix b/pkgs/desktops/kde-4.12/kdegraphics/libkdcraw.nix index e7c01f98a8c80238f73d371eb7f55a3c8b5be16b..1d5c6e2fcb4af4b28521b8fb958de562e314a55c 100644 --- a/pkgs/desktops/kde-4.12/kdegraphics/libkdcraw.nix +++ b/pkgs/desktops/kde-4.12/kdegraphics/libkdcraw.nix @@ -1,4 +1,4 @@ -{ kde, kdelibs, pkgconfig, libraw, lcms2 }: +{ stdenv, kde, kdelibs, pkgconfig, libraw, lcms2 }: kde { @@ -8,6 +8,6 @@ kde { meta = { description = "Library for decoding RAW images"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/desktops/kde-4.12/kdegraphics/libkexiv2.nix b/pkgs/desktops/kde-4.12/kdegraphics/libkexiv2.nix index 096b0a6e957bf4273b5e105476e2f4dae4e32903..46ec45fad01a7b00283e9bb21d967b4403473721 100644 --- a/pkgs/desktops/kde-4.12/kdegraphics/libkexiv2.nix +++ b/pkgs/desktops/kde-4.12/kdegraphics/libkexiv2.nix @@ -1,10 +1,10 @@ -{ kde, kdelibs, exiv2 }: +{ stdenv, kde, kdelibs, exiv2 }: kde { buildInputs = [ kdelibs exiv2 ]; meta = { description = "Exiv2 support library"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/desktops/kde-4.12/kdegraphics/libkipi.nix b/pkgs/desktops/kde-4.12/kdegraphics/libkipi.nix index 6b16265e7a3e8fc45c1a34fdf9b4cde9e1968c26..65e6c52bd44f93527bb963a2dca3dbfa0368d06b 100644 --- a/pkgs/desktops/kde-4.12/kdegraphics/libkipi.nix +++ b/pkgs/desktops/kde-4.12/kdegraphics/libkipi.nix @@ -1,10 +1,10 @@ -{ kde, kdelibs }: +{ stdenv, kde, kdelibs }: kde { buildInputs = [ kdelibs ]; meta = { description = "Interface library to kipi-plugins"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/desktops/kde-4.12/kdegraphics/libksane.nix b/pkgs/desktops/kde-4.12/kdegraphics/libksane.nix index b539eab38992f806af2b6a6838f4b519c2809ecc..6c3543eef3704044da70a57c1ab684bb9bd81cc6 100644 --- a/pkgs/desktops/kde-4.12/kdegraphics/libksane.nix +++ b/pkgs/desktops/kde-4.12/kdegraphics/libksane.nix @@ -1,10 +1,10 @@ -{ kde, kdelibs, saneBackends }: +{ stdenv, kde, kdelibs, saneBackends }: kde { buildInputs = [ kdelibs saneBackends ]; meta = { description = "An image scanning library that provides a QWidget that contains all the logic needed to interface a sacanner"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/desktops/kde-4.12/kdegraphics/okular.nix b/pkgs/desktops/kde-4.12/kdegraphics/okular.nix index aca1691eace6ed93a35f70fb3d269136728fc1fa..092833388a78cbac50b80a74ad1c30d6d0f79d0a 100644 --- a/pkgs/desktops/kde-4.12/kdegraphics/okular.nix +++ b/pkgs/desktops/kde-4.12/kdegraphics/okular.nix @@ -1,4 +1,4 @@ -{ chmlib, djvulibre, ebook_tools, kde, kdelibs, libspectre, popplerQt4, qca2 +{ stdenv, chmlib, djvulibre, ebook_tools, kde, kdelibs, libspectre, popplerQt4, qca2 , qimageblitz, libtiff, kactivities, pkgconfig, libkexiv2 }: kde { @@ -12,6 +12,6 @@ kde { meta = { description = "Okular, the KDE document viewer"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/desktops/kde-4.12/kdegraphics/svgpart.nix b/pkgs/desktops/kde-4.12/kdegraphics/svgpart.nix index a344cc4b4b46395ee7978b81048b94f4bf2f9e5e..2fc0e373dbdfb674b972d3f022789f2579fb80f6 100644 --- a/pkgs/desktops/kde-4.12/kdegraphics/svgpart.nix +++ b/pkgs/desktops/kde-4.12/kdegraphics/svgpart.nix @@ -1,10 +1,10 @@ -{ kde, kdelibs }: +{ stdenv, kde, kdelibs }: kde { buildInputs = [ kdelibs ]; meta = { description = "SVG KPart"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/desktops/kde-4.12/kdelibs/nepomuk-core.nix b/pkgs/desktops/kde-4.12/kdelibs/nepomuk-core.nix index 7e29eebf3b792170a7b6f2c97af1c0622a043a0b..d90e1455ce99762455236c0f8fd3ce9ad67009e7 100644 --- a/pkgs/desktops/kde-4.12/kdelibs/nepomuk-core.nix +++ b/pkgs/desktops/kde-4.12/kdelibs/nepomuk-core.nix @@ -1,4 +1,4 @@ -{ kde, kdelibs, soprano, shared_desktop_ontologies, exiv2, ffmpeg, taglib, popplerQt4 +{ stdenv, kde, kdelibs, soprano, shared_desktop_ontologies, exiv2, ffmpeg, taglib, popplerQt4 , pkgconfig, doxygen, ebook_tools }: @@ -15,6 +15,6 @@ kde { meta = { description = "NEPOMUK core"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/desktops/kde-4.12/kdelibs/nepomuk-widgets.nix b/pkgs/desktops/kde-4.12/kdelibs/nepomuk-widgets.nix index 0d29a4f97de5713881c8756e944d5ca8b2b63da9..b0fc5ad8900d1a95701739c9229cdc71f7f0d95e 100644 --- a/pkgs/desktops/kde-4.12/kdelibs/nepomuk-widgets.nix +++ b/pkgs/desktops/kde-4.12/kdelibs/nepomuk-widgets.nix @@ -1,4 +1,4 @@ -{ kde, kdelibs, nepomuk_core }: +{ stdenv, kde, kdelibs, nepomuk_core }: kde { @@ -6,6 +6,6 @@ kde { meta = { description = "NEPOMUK Widgets"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/desktops/xfce/applications/mousepad.nix b/pkgs/desktops/xfce/applications/mousepad.nix index 5248d6567d24b16bdd2b87ad6f2c0ce2db88c5b5..1e1ef0cf8468bc9619d48854fdac255d46469c09 100644 --- a/pkgs/desktops/xfce/applications/mousepad.nix +++ b/pkgs/desktops/xfce/applications/mousepad.nix @@ -24,6 +24,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.xfce.org/; description = "A simple text editor for Xfce"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/desktops/xfce/applications/ristretto.nix b/pkgs/desktops/xfce/applications/ristretto.nix index a42e882710a74865f7357719e707fbe5e3325e54..64e3c34453ee8cc24eb3b137da3508bfbc240606 100644 --- a/pkgs/desktops/xfce/applications/ristretto.nix +++ b/pkgs/desktops/xfce/applications/ristretto.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://goodies.xfce.org/projects/applications/${p_name}"; description = "A fast and lightweight picture-viewer for the Xfce desktop environment"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.eelco ]; }; diff --git a/pkgs/desktops/xfce/applications/terminal.nix b/pkgs/desktops/xfce/applications/terminal.nix index d891ad98fdc5253b72ea54b1cbbead9a52dd698c..15d90be31314fb88b6c1e1f8297eae0bfead2940 100644 --- a/pkgs/desktops/xfce/applications/terminal.nix +++ b/pkgs/desktops/xfce/applications/terminal.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.xfce.org/projects/terminal; description = "A modern terminal emulator primarily for the Xfce desktop environment"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/desktops/xfce/applications/xfce4-mixer.nix b/pkgs/desktops/xfce/applications/xfce4-mixer.nix index 972442dc56bb7fd88430943ed8476e12352c33c2..2b0f729c0a35266c727a838dbe4dd75ae7173dfe 100644 --- a/pkgs/desktops/xfce/applications/xfce4-mixer.nix +++ b/pkgs/desktops/xfce/applications/xfce4-mixer.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.xfce.org/projects/xfce4-mixer; # referenced but inactive description = "A volume control application for the Xfce desktop environment"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.eelco ]; }; diff --git a/pkgs/desktops/xfce/applications/xfce4-notifyd.nix b/pkgs/desktops/xfce/applications/xfce4-notifyd.nix index d39778c9371732a80d7189b0ce0ffa5d36c638d3..a447812f9a785c14d9500cc3a5f8f81f10c5845c 100644 --- a/pkgs/desktops/xfce/applications/xfce4-notifyd.nix +++ b/pkgs/desktops/xfce/applications/xfce4-notifyd.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://goodies.xfce.org/projects/applications/${p_name}"; description = "Notification daemon for Xfce"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.eelco ]; }; diff --git a/pkgs/desktops/xfce/applications/xfce4-screenshooter.nix b/pkgs/desktops/xfce/applications/xfce4-screenshooter.nix index 6e0d9d3e7e714ab7fe83b866d64b447edaffc85d..8181b809c83fa1dc77058c0916c105974c7b8586 100644 --- a/pkgs/desktops/xfce/applications/xfce4-screenshooter.nix +++ b/pkgs/desktops/xfce/applications/xfce4-screenshooter.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://goodies.xfce.org/projects/applications/xfce4-screenshooter; description = "Xfce screenshooter"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/desktops/xfce/core/exo.nix b/pkgs/desktops/xfce/core/exo.nix index 3131ea679b01c397f5d4de5650d1949ec879b587..694db49f589eaa0660aa2e3e79dfc735d08a8639 100644 --- a/pkgs/desktops/xfce/core/exo.nix +++ b/pkgs/desktops/xfce/core/exo.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.xfce.org/projects/${p_name}"; description = "Application library for the Xfce desktop environment"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/desktops/xfce/core/garcon.nix b/pkgs/desktops/xfce/core/garcon.nix index 33b64cd878ed647376132b4e6a862b6fcf27868c..44f5a95224e49ad5754286b8a0946b4fa9e4a04e 100644 --- a/pkgs/desktops/xfce/core/garcon.nix +++ b/pkgs/desktops/xfce/core/garcon.nix @@ -16,6 +16,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.xfce.org/; description = "Xfce menu support library"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/desktops/xfce/core/gtk-xfce-engine.nix b/pkgs/desktops/xfce/core/gtk-xfce-engine.nix index 5004f2aaf4784fddca8d870ea6aebe6cc830c249..360e4a0a25036386b608fe4c59426a26523c5316 100644 --- a/pkgs/desktops/xfce/core/gtk-xfce-engine.nix +++ b/pkgs/desktops/xfce/core/gtk-xfce-engine.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.xfce.org/; description = "GTK+ theme engine for Xfce"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.eelco ]; }; diff --git a/pkgs/desktops/xfce/core/libxfce4ui.nix b/pkgs/desktops/xfce/core/libxfce4ui.nix index 5675c09fed81da4a9b1769d60a3a55aba0ef7b75..cb2975d8214f512a831a726c3f5245cd9c973702 100644 --- a/pkgs/desktops/xfce/core/libxfce4ui.nix +++ b/pkgs/desktops/xfce/core/libxfce4ui.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.xfce.org/; description = "Basic GUI library for Xfce"; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; }; } diff --git a/pkgs/desktops/xfce/core/libxfce4util.nix b/pkgs/desktops/xfce/core/libxfce4util.nix index 88874722b7d0318efa65114114a2dce95fe20602..8483aec7a46f52e53441332cfa191708c52ad719 100644 --- a/pkgs/desktops/xfce/core/libxfce4util.nix +++ b/pkgs/desktops/xfce/core/libxfce4util.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { p_name = "libxfce4util"; ver_maj = "4.10"; - ver_min = "0"; + ver_min = "1"; src = fetchurl { url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "13k0wwbbqvdmbj4xmk4nxdlgvrdgr5y6r3dk380mzfw053hzwy89"; + sha256 = "1fygyq9dywa989z1vb3d8hj4fg5ai75lcrngnf2s60jwf6nx2b78"; }; name = "${p_name}-${ver_maj}.${ver_min}"; diff --git a/pkgs/desktops/xfce/core/libxfcegui4.nix b/pkgs/desktops/xfce/core/libxfcegui4.nix index e30fcf223571b134b916f1686121cdb2be8370eb..32a320c779bf5fc4ceab1b8b0bcbabfd9609e949 100644 --- a/pkgs/desktops/xfce/core/libxfcegui4.nix +++ b/pkgs/desktops/xfce/core/libxfcegui4.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.xfce.org/; description = "Basic GUI library for Xfce"; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; }; } diff --git a/pkgs/desktops/xfce/core/thunar-archive-plugin.nix b/pkgs/desktops/xfce/core/thunar-archive-plugin.nix index 4776af3be3241b6a94cbe13c0e6adf5f5d2f0f6d..62a90578bd304470d7cc97eeeb2b19623035c5f7 100644 --- a/pkgs/desktops/xfce/core/thunar-archive-plugin.nix +++ b/pkgs/desktops/xfce/core/thunar-archive-plugin.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://foo-projects.org/~benny/projects/thunar-archive-plugin/; description = "The Thunar Archive Plugin allows you to create and extract archive files using the file context menus in the Thunar file manager"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.iElectric ]; }; diff --git a/pkgs/desktops/xfce/core/thunar-volman.nix b/pkgs/desktops/xfce/core/thunar-volman.nix index 94fc0e369e5cf2a65bd766a381f67750358576b8..5ce88921fa83eedfaa7784361e3a4fb4979a56ef 100644 --- a/pkgs/desktops/xfce/core/thunar-volman.nix +++ b/pkgs/desktops/xfce/core/thunar-volman.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://goodies.xfce.org/projects/thunar-plugins/thunar-volman; description = "Thunar extension for automatic management of removable drives and media"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.eelco ]; }; diff --git a/pkgs/desktops/xfce/core/thunar.nix b/pkgs/desktops/xfce/core/thunar.nix index 919d19a230259b361810a22127e9010b0ef3c371..fdf4211f099a46887fa071db09f1a7cd5b33b775 100644 --- a/pkgs/desktops/xfce/core/thunar.nix +++ b/pkgs/desktops/xfce/core/thunar.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://thunar.xfce.org/; description = "Xfce file manager"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.eelco ]; }; diff --git a/pkgs/desktops/xfce/core/tumbler.nix b/pkgs/desktops/xfce/core/tumbler.nix index 8988d072e2c8ace4c84d691b9a566ca213882888..fab6152c99a4fe51df8bb5d3024153aef89edcbc 100644 --- a/pkgs/desktops/xfce/core/tumbler.nix +++ b/pkgs/desktops/xfce/core/tumbler.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation rec { homepage = http://git.xfce.org/xfce/tumbler/; description = "A D-Bus thumbnailer service"; platforms = stdenv.lib.platforms.linux; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/desktops/xfce/core/xfce4-appfinder.nix b/pkgs/desktops/xfce/core/xfce4-appfinder.nix index b4c9c790ac1ba5b7e512ce8acad198ee3e77e541..01848d66696a175922343dfae836818cdc55622f 100644 --- a/pkgs/desktops/xfce/core/xfce4-appfinder.nix +++ b/pkgs/desktops/xfce/core/xfce4-appfinder.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { p_name = "xfce4-appfinder"; - ver_maj = "4.9"; # no 4.10 (stable) release yet - ver_min = "4"; + ver_maj = "4.10"; + ver_min = "1"; src = fetchurl { url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "12lgrbd1n50w9n8xkpai98s2aw8vmjasrgypc57sp0x0qafsqaxq"; + sha256 = "0xzbi1vvy724s7vljf4153h7s7zqqwg51bn9wirx4d33lzzp9vk5"; }; name = "${p_name}-${ver_maj}.${ver_min}"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://docs.xfce.org/xfce/xfce4-appfinder/; description = "Xfce application finder, a tool to locate and launch programs on your system"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.eelco ]; }; diff --git a/pkgs/desktops/xfce/core/xfce4-dev-tools.nix b/pkgs/desktops/xfce/core/xfce4-dev-tools.nix index e56eb3f0a7137ad8fb713597170a696261f00dd8..671f57faeb35c3e554abd6c98ea9ac43508dfd6b 100644 --- a/pkgs/desktops/xfce/core/xfce4-dev-tools.nix +++ b/pkgs/desktops/xfce/core/xfce4-dev-tools.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://foo-projects.org/~benny/projects/xfce4-dev-tools/; description = "Tools and M4 macros for Xfce4 developers"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/desktops/xfce/core/xfce4-panel.nix b/pkgs/desktops/xfce/core/xfce4-panel.nix index a5edb8dd560f6d453f27185e73d3b92ef0b65104..e654b2f7dfbe97f65eb2ba919027d92a40b87db7 100644 --- a/pkgs/desktops/xfce/core/xfce4-panel.nix +++ b/pkgs/desktops/xfce/core/xfce4-panel.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.xfce.org/projects/xfce4-panel; description = "Xfce panel"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.eelco ]; }; diff --git a/pkgs/desktops/xfce/core/xfce4-power-manager-brightness.patch b/pkgs/desktops/xfce/core/xfce4-power-manager-brightness.patch deleted file mode 100644 index 6b6f14fdae7827ef1afae2a0d14d8d631ad1fc31..0000000000000000000000000000000000000000 --- a/pkgs/desktops/xfce/core/xfce4-power-manager-brightness.patch +++ /dev/null @@ -1,307 +0,0 @@ -From 05d12e12596512f7a31d3cdb4845a69dc2d4c611 Mon Sep 17 00:00:00 2001 -From: Martin Matuska -Date: Tue, 23 Jul 2013 11:27:41 +0200 -Subject: Change brightness level from glong to gint32 - -The "Backlight" RandR property is a 32-bit integer. This means that the int32 (gint32) type should be used to represent brightness levels. The attached patch does nothing else than changing the brightness level representation from glong to gint32. This fixes the screen auto-dimming issue and brightness panel plugin issue. - -diff --git a/common/xfpm-brightness.c b/common/xfpm-brightness.c -index aa1ef33..f1524cb 100644 ---- a/common/xfpm-brightness.c -+++ b/common/xfpm-brightness.c -@@ -92,11 +92,11 @@ out: - } - - static gboolean --xfpm_brightness_xrandr_get_level (XfpmBrightness *brightness, RROutput output, long *current) -+xfpm_brightness_xrandr_get_level (XfpmBrightness *brightness, RROutput output, gint32 *current) - { - unsigned long nitems; - unsigned long bytes_after; -- long *prop; -+ gint32 *prop; - Atom actual_type; - int actual_format; - gboolean ret = FALSE; -@@ -124,7 +124,7 @@ xfpm_brightness_xrandr_get_level (XfpmBrightness *brightness, RROutput output, l - } - - static gboolean --xfpm_brightness_xrandr_set_level (XfpmBrightness *brightness, RROutput output, long level) -+xfpm_brightness_xrandr_set_level (XfpmBrightness *brightness, RROutput output, gint32 level) - { - gboolean ret = TRUE; - -@@ -137,7 +137,7 @@ xfpm_brightness_xrandr_set_level (XfpmBrightness *brightness, RROutput output, l - - if ( gdk_error_trap_pop () ) - { -- g_warning ("failed to XRRChangeOutputProperty for brightness %li", level); -+ g_warning ("failed to XRRChangeOutputProperty for brightness %d", level); - ret = FALSE; - } - -@@ -225,11 +225,11 @@ xfpm_brightness_setup_xrandr (XfpmBrightness *brightness) - } - - static gboolean --xfpm_brightness_xrand_up (XfpmBrightness *brightness, glong *new_level) -+xfpm_brightness_xrand_up (XfpmBrightness *brightness, gint32 *new_level) - { -- long hw_level; -+ gint32 hw_level; - gboolean ret = FALSE; -- long set_level; -+ gint32 set_level; - - ret = xfpm_brightness_xrandr_get_level (brightness, brightness->priv->output, &hw_level); - -@@ -250,14 +250,14 @@ xfpm_brightness_xrand_up (XfpmBrightness *brightness, glong *new_level) - - if ( !ret ) - { -- g_warning ("xfpm_brightness_xrand_up failed for %li", set_level); -+ g_warning ("xfpm_brightness_xrand_up failed for %d", set_level); - return FALSE; - } - - /* Nothing changed in the hardware*/ - if ( *new_level == hw_level ) - { -- g_warning ("xfpm_brightness_xrand_up did not change the hw level to %li", set_level); -+ g_warning ("xfpm_brightness_xrand_up did not change the hw level to %d", set_level); - return FALSE; - } - -@@ -265,11 +265,11 @@ xfpm_brightness_xrand_up (XfpmBrightness *brightness, glong *new_level) - } - - static gboolean --xfpm_brightness_xrand_down (XfpmBrightness *brightness, long *new_level) -+xfpm_brightness_xrand_down (XfpmBrightness *brightness, gint32 *new_level) - { -- long hw_level; -+ gint32 hw_level; - gboolean ret; -- long set_level; -+ gint32 set_level; - - ret = xfpm_brightness_xrandr_get_level (brightness, brightness->priv->output, &hw_level); - -@@ -290,14 +290,14 @@ xfpm_brightness_xrand_down (XfpmBrightness *brightness, long *new_level) - - if ( !ret ) - { -- g_warning ("xfpm_brightness_xrand_down failed for %li", set_level); -+ g_warning ("xfpm_brightness_xrand_down failed for %d", set_level); - return FALSE; - } - - /* Nothing changed in the hardware*/ - if ( *new_level == hw_level ) - { -- g_warning ("xfpm_brightness_xrand_down did not change the hw level to %li", set_level); -+ g_warning ("xfpm_brightness_xrand_down did not change the hw level to %d", set_level); - return FALSE; - } - -@@ -361,7 +361,7 @@ xfpm_brightness_setup_helper (XfpmBrightness *brightness) - } - - static gboolean --xfpm_brightness_helper_get_level (XfpmBrightness *brg, glong *level) -+xfpm_brightness_helper_get_level (XfpmBrightness *brg, gint32 *level) - { - int ret; - -@@ -406,11 +406,11 @@ out: - } - - static gboolean --xfpm_brightness_helper_up (XfpmBrightness *brightness, glong *new_level) -+xfpm_brightness_helper_up (XfpmBrightness *brightness, gint32 *new_level) - { -- glong hw_level; -+ gint32 hw_level; - gboolean ret = FALSE; -- gint set_level; -+ gint32 set_level; - - ret = xfpm_brightness_helper_get_level (brightness, &hw_level); - -@@ -446,11 +446,11 @@ xfpm_brightness_helper_up (XfpmBrightness *brightness, glong *new_level) - } - - static gboolean --xfpm_brightness_helper_down (XfpmBrightness *brightness, glong *new_level) -+xfpm_brightness_helper_down (XfpmBrightness *brightness, gint32 *new_level) - { -- glong hw_level; -+ gint32 hw_level; - gboolean ret; -- gint set_level; -+ gint32 set_level; - - ret = xfpm_brightness_helper_get_level (brightness, &hw_level); - -@@ -572,7 +572,7 @@ xfpm_brightness_setup (XfpmBrightness *brightness) - return FALSE; - } - --gboolean xfpm_brightness_up (XfpmBrightness *brightness, glong *new_level) -+gboolean xfpm_brightness_up (XfpmBrightness *brightness, gint32 *new_level) - { - gboolean ret = FALSE; - -@@ -589,7 +589,7 @@ gboolean xfpm_brightness_up (XfpmBrightness *brightness, glong *new_level) - return ret; - } - --gboolean xfpm_brightness_down (XfpmBrightness *brightness, glong *new_level) -+gboolean xfpm_brightness_down (XfpmBrightness *brightness, gint32 *new_level) - { - gboolean ret = FALSE; - -@@ -618,7 +618,7 @@ gint xfpm_brightness_get_max_level (XfpmBrightness *brightness) - return brightness->priv->max_level; - } - --gboolean xfpm_brightness_get_level (XfpmBrightness *brightness, glong *level) -+gboolean xfpm_brightness_get_level (XfpmBrightness *brightness, gint32 *level) - { - gboolean ret = FALSE; - -@@ -632,7 +632,7 @@ gboolean xfpm_brightness_get_level (XfpmBrightness *brightness, glong *level) - return ret; - } - --gboolean xfpm_brightness_set_level (XfpmBrightness *brightness, glong level) -+gboolean xfpm_brightness_set_level (XfpmBrightness *brightness, gint32 level) - { - gboolean ret = FALSE; - -diff --git a/common/xfpm-brightness.h b/common/xfpm-brightness.h -index 0c4e3ed..26b3dbe 100644 ---- a/common/xfpm-brightness.h -+++ b/common/xfpm-brightness.h -@@ -51,20 +51,20 @@ XfpmBrightness *xfpm_brightness_new (void); - gboolean xfpm_brightness_setup (XfpmBrightness *brightness); - - gboolean xfpm_brightness_up (XfpmBrightness *brightness, -- glong *new_level); -+ gint32 *new_level); - - gboolean xfpm_brightness_down (XfpmBrightness *brightness, -- glong *new_level); -+ gint32 *new_level); - - gboolean xfpm_brightness_has_hw (XfpmBrightness *brightness); - - gint xfpm_brightness_get_max_level (XfpmBrightness *brightness); - - gboolean xfpm_brightness_get_level (XfpmBrightness *brightness, -- glong *level); -+ gint32 *level); - - gboolean xfpm_brightness_set_level (XfpmBrightness *brightness, -- glong level); -+ gint32 level); - - gboolean xfpm_brightness_dim_down (XfpmBrightness *brightness); - -diff --git a/panel-plugins/brightness/brightness-button.c b/panel-plugins/brightness/brightness-button.c -index 6e60c29..bd466c9 100644 ---- a/panel-plugins/brightness/brightness-button.c -+++ b/panel-plugins/brightness/brightness-button.c -@@ -186,7 +186,7 @@ static gboolean - brightness_button_popup_win (GtkWidget *widget, GdkEvent *ev, guint32 ev_time) - { - gint x, y; -- glong current_level = 0; -+ gint32 current_level = 0; - GdkDisplay *display; - GdkScreen *screen; - BrightnessButton *button; -@@ -342,7 +342,7 @@ plus_clicked (GtkWidget *widget, BrightnessButton *button) - static void - range_value_changed (GtkWidget *widget, BrightnessButton *button) - { -- glong range_level, hw_level; -+ gint32 range_level, hw_level; - - range_level = (gint) gtk_range_get_value (GTK_RANGE (button->priv->range)); - -@@ -428,8 +428,8 @@ brightness_button_create_popup (BrightnessButton *button) - static void - brightness_button_up (BrightnessButton *button) - { -- glong level; -- glong max_level; -+ gint32 level; -+ gint32 max_level; - - xfpm_brightness_get_level (button->priv->brightness, &level); - max_level = xfpm_brightness_get_max_level (button->priv->brightness); -@@ -443,7 +443,7 @@ brightness_button_up (BrightnessButton *button) - static void - brightness_button_down (BrightnessButton *button) - { -- glong level; -+ gint32 level; - xfpm_brightness_get_level (button->priv->brightness, &level); - - if ( level != 0 ) -diff --git a/src/xfpm-backlight.c b/src/xfpm-backlight.c -index baeeb43..45c990f 100644 ---- a/src/xfpm-backlight.c -+++ b/src/xfpm-backlight.c -@@ -63,8 +63,8 @@ struct XfpmBacklightPrivate - gboolean has_hw; - gboolean on_battery; - -- glong last_level; -- glong max_level; -+ gint32 last_level; -+ gint32 max_level; - - gboolean dimmed; - gboolean block; -@@ -79,7 +79,7 @@ xfpm_backlight_dim_brightness (XfpmBacklight *backlight) - - if (xfpm_power_get_mode (backlight->priv->power) == XFPM_POWER_MODE_NORMAL ) - { -- glong dim_level; -+ gint32 dim_level; - - g_object_get (G_OBJECT (backlight->priv->conf), - backlight->priv->on_battery ? BRIGHTNESS_LEVEL_ON_BATTERY : BRIGHTNESS_LEVEL_ON_AC, &dim_level, -@@ -101,7 +101,7 @@ xfpm_backlight_dim_brightness (XfpmBacklight *backlight) - **/ - if (backlight->priv->last_level > dim_level) - { -- XFPM_DEBUG ("Current brightness level before dimming : %li, new %li", backlight->priv->last_level, dim_level); -+ XFPM_DEBUG ("Current brightness level before dimming : %d, new %d", backlight->priv->last_level, dim_level); - backlight->priv->dimmed = xfpm_brightness_set_level (backlight->priv->brightness, dim_level); - } - } -@@ -182,7 +182,7 @@ xfpm_backlight_reset_cb (EggIdletime *idle, XfpmBacklight *backlight) - { - if ( !backlight->priv->block) - { -- XFPM_DEBUG ("Alarm reset, setting level to %li", backlight->priv->last_level); -+ XFPM_DEBUG ("Alarm reset, setting level to %d", backlight->priv->last_level); - xfpm_brightness_set_level (backlight->priv->brightness, backlight->priv->last_level); - } - backlight->priv->dimmed = FALSE; -@@ -192,7 +192,7 @@ xfpm_backlight_reset_cb (EggIdletime *idle, XfpmBacklight *backlight) - static void - xfpm_backlight_button_pressed_cb (XfpmButton *button, XfpmButtonKey type, XfpmBacklight *backlight) - { -- glong level; -+ gint32 level; - gboolean ret = TRUE; - - gboolean enable_brightness, show_popup; --- -cgit v0.10.1 - diff --git a/pkgs/desktops/xfce/core/xfce4-power-manager.nix b/pkgs/desktops/xfce/core/xfce4-power-manager.nix index 7740af438d9cd3492c8ae522915ad5ac28502dce..81a0aebb75cebccbb39f66c6123aaef25fdf44db 100644 --- a/pkgs/desktops/xfce/core/xfce4-power-manager.nix +++ b/pkgs/desktops/xfce/core/xfce4-power-manager.nix @@ -1,30 +1,28 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk, dbus_glib, xfconf +{ stdenv, fetchurl, pkgconfig, intltool, gtk, dbus_glib, upower, xfconf , libxfce4ui, libxfce4util, libnotify, xfce4panel }: stdenv.mkDerivation rec { p_name = "xfce4-power-manager"; - ver_maj = "1.2"; + ver_maj = "1.3"; ver_min = "0"; src = fetchurl { url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "1sc4f4wci5yl3l9lk7vcsbwj6hdjshbxw9qm43s64jr882jriyyp"; + sha256 = "1q0mnj9hjqw4zpk7wqnfayy6zzbjbhzd1mcplfjik2h753gaxgh5"; }; name = "${p_name}-${ver_maj}.${ver_min}"; buildInputs = - [ pkgconfig intltool gtk dbus_glib xfconf libxfce4ui libxfce4util + [ pkgconfig intltool gtk dbus_glib upower xfconf libxfce4ui libxfce4util libnotify xfce4panel ]; preFixup = "rm $out/share/icons/hicolor/icon-theme.cache"; - patches = ./xfce4-power-manager-brightness.patch; - meta = { homepage = http://goodies.xfce.org/projects/applications/xfce4-power-manager; description = "A power manager for the Xfce Desktop Environment"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.eelco ]; }; diff --git a/pkgs/desktops/xfce/core/xfce4-session.nix b/pkgs/desktops/xfce/core/xfce4-session.nix index a419f076b6e0968dd81681de97ab03b7378d83ea..d965c296490e0f7deff8f5bb951a25db598c07db 100644 --- a/pkgs/desktops/xfce/core/xfce4-session.nix +++ b/pkgs/desktops/xfce/core/xfce4-session.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.xfce.org/projects/xfce4-session; description = "Session manager for Xfce"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.eelco ]; }; diff --git a/pkgs/desktops/xfce/core/xfce4-settings.nix b/pkgs/desktops/xfce/core/xfce4-settings.nix index 2e76b22510f929417ffe2b755f3a8b9394be41c8..ee5ae15fca1aa5be248f481ad3848f8add347b70 100644 --- a/pkgs/desktops/xfce/core/xfce4-settings.nix +++ b/pkgs/desktops/xfce/core/xfce4-settings.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.xfce.org/projects/xfce4-settings; description = "Settings manager for Xfce"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.eelco ]; }; diff --git a/pkgs/desktops/xfce/core/xfconf.nix b/pkgs/desktops/xfce/core/xfconf.nix index e608d45910693d9b088c14ba11815e3b5b4a32d6..9ed2be4a740256edf85ce256d903a22bc967c410 100644 --- a/pkgs/desktops/xfce/core/xfconf.nix +++ b/pkgs/desktops/xfce/core/xfconf.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://docs.xfce.org/xfce/xfconf/start; description = "Simple client-server configuration storage and query system for Xfce"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/desktops/xfce/core/xfdesktop.nix b/pkgs/desktops/xfce/core/xfdesktop.nix index 8067e1841caae1be15c7bd2ae886ad3a5dfa22ba..697ff2bfb8aee3a444c7d68d54ec05c8b06759b4 100644 --- a/pkgs/desktops/xfce/core/xfdesktop.nix +++ b/pkgs/desktops/xfce/core/xfdesktop.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.xfce.org/projects/xfdesktop; description = "Xfce desktop manager"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.eelco ]; }; diff --git a/pkgs/desktops/xfce/core/xfwm4.nix b/pkgs/desktops/xfce/core/xfwm4.nix index bb235911ba4ac68b8b9a0e2a0acd1c0699edddd9..4b190889c850f7155ed3355c3395089aeaa34c89 100644 --- a/pkgs/desktops/xfce/core/xfwm4.nix +++ b/pkgs/desktops/xfce/core/xfwm4.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.xfce.org/projects/xfwm4; description = "Window manager for Xfce"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.eelco ]; }; diff --git a/pkgs/development/compilers/adobe-flex-sdk/default.nix b/pkgs/development/compilers/adobe-flex-sdk/default.nix index fc4511d896e27807538e82a639960fc05bc6bf9e..69557019f15df2dffbc1307922214fd3dc615a1a 100644 --- a/pkgs/development/compilers/adobe-flex-sdk/default.nix +++ b/pkgs/development/compilers/adobe-flex-sdk/default.nix @@ -35,6 +35,6 @@ stdenv.mkDerivation rec { meta = { description = "Flex SDK for Adobe Flash / ActionScript"; homepage = "http://www.adobe.com/support/documentation/en/flex/3/releasenotes_flex3_sdk.html#installation"; - license = "MPLv1.1"; # Mozilla Public License Version 1.1 + license = stdenv.lib.licenses.mpl11; }; } diff --git a/pkgs/development/compilers/agda/2.3.2.2.nix b/pkgs/development/compilers/agda/2.3.2.2.nix deleted file mode 100644 index 5a1f00a995ced5d9286a87107c17b306381e4418..0000000000000000000000000000000000000000 --- a/pkgs/development/compilers/agda/2.3.2.2.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ cabal, alex, binary, deepseq, emacs, filepath, geniplate, happy -, hashable, hashtables, haskeline, haskellSrcExts, mtl, parallel -, QuickCheck, text, time, unorderedContainers, xhtml, zlib -}: - -cabal.mkDerivation (self: { - pname = "Agda"; - version = "2.3.2.2"; - sha256 = "0zr2rg2yvq6pqg69c6h7hqqpc5nj8prfhcvj5p2alkby0vs110qc"; - isLibrary = true; - isExecutable = true; - buildDepends = [ - binary deepseq filepath geniplate hashable hashtables haskeline - haskellSrcExts mtl parallel QuickCheck text time - unorderedContainers xhtml zlib - ]; - buildTools = [ alex emacs happy ]; - jailbreak = true; - postInstall = '' - $out/bin/agda-mode compile - ''; - meta = { - homepage = "http://wiki.portal.chalmers.se/agda/"; - description = "A dependently typed functional programming language and proof assistant"; - license = "unknown"; - platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; - }; -}) diff --git a/pkgs/development/compilers/agda/2.4.0.1.nix b/pkgs/development/compilers/agda/default.nix similarity index 85% rename from pkgs/development/compilers/agda/2.4.0.1.nix rename to pkgs/development/compilers/agda/default.nix index e472eb1c276b128dc4209ac555b3b309f6b92969..6705419add9b3ffa0fc817772623e96c50ee36a6 100644 --- a/pkgs/development/compilers/agda/2.4.0.1.nix +++ b/pkgs/development/compilers/agda/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, alex, binary, boxes, dataHash, deepseq, emacs, equivalence , filepath, geniplate, happy, hashable, hashtables, haskeline , haskellSrcExts, mtl, parallel, QuickCheck, STMonadTrans, strict @@ -6,8 +8,8 @@ cabal.mkDerivation (self: { pname = "Agda"; - version = "2.4.0.1"; - sha256 = "11my5k606zvra3w3m1wllc4dy5mfv4lr32fqd579vqcks6wpirjq"; + version = "2.4.0.2"; + sha256 = "13c4ipscnlnbv94k93yajrp32mwzikqa8rhc95h8pmqzhjgwyh8b"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/compilers/agda/stdlib-0.7.nix b/pkgs/development/compilers/agda/stdlib-0.7.nix deleted file mode 100644 index c07b3e7c7dd276e02a7b40777c0624cd06a2abf9..0000000000000000000000000000000000000000 --- a/pkgs/development/compilers/agda/stdlib-0.7.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ cabal, fetchurl, filemanip, Agda }: - -cabal.mkDerivation (self: { - pname = "Agda-stdlib"; - version = "0.7"; - - src = fetchurl { - url = "http://www.cse.chalmers.se/~nad/software/lib-0.7.tar.gz"; - sha256 = "1ynjgqk8hhnm6rbngy8fjsrd6i4phj2hlan9bk435bbywbl366k3"; - }; - - buildDepends = [ filemanip Agda ]; - - preConfigure = "cd ffi"; - - postInstall = '' - mkdir -p $out/share - cd .. - runhaskell GenerateEverything - agda -i . -i src Everything.agda - cp -pR src $out/share/agda - ''; - - meta = { - homepage = "http://wiki.portal.chalmers.se/agda/pmwiki.php?n=Libraries.StandardLibrary"; - description = "A standard library for use with the Agda compiler."; - license = "unknown"; - platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.jwiegley ]; - }; -}) \ No newline at end of file diff --git a/pkgs/development/compilers/agda/stdlib-0.8.nix b/pkgs/development/compilers/agda/stdlib.nix similarity index 100% rename from pkgs/development/compilers/agda/stdlib-0.8.nix rename to pkgs/development/compilers/agda/stdlib.nix diff --git a/pkgs/development/compilers/ats2/default.nix b/pkgs/development/compilers/ats2/default.nix index 1f6a8b6c6e08221f73458b5fd1d564f378b7f471..8c71138ab78e1a5c6ccf7e87cab33adba12e2708 100644 --- a/pkgs/development/compilers/ats2/default.nix +++ b/pkgs/development/compilers/ats2/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ats2-${version}"; - version = "0.0.7"; + version = "0.1.0"; src = fetchurl { url = "mirror://sourceforge/ats2-lang/ATS2-Postiats-${version}.tgz"; - sha256 = "1cv7caaf9fj6z3kln02ikkbmcy42324v39lzx3cf6qcsywwpm8fx"; + sha256 = "0i7b9v7xki9j2jjjpydz0gl33af94b4jjmk75b9w20bs003v8vd4"; }; buildInputs = [ gmp ]; diff --git a/pkgs/development/compilers/bigloo/default.nix b/pkgs/development/compilers/bigloo/default.nix index b7dcb806b0175fbea340430057cc20df9d79a841..16dfa580a1937dc43baab7c6771933ee6642be04 100644 --- a/pkgs/development/compilers/bigloo/default.nix +++ b/pkgs/development/compilers/bigloo/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www-sop.inria.fr/indes/fp/Bigloo/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; platforms = stdenv.lib.platforms.gnu; # arbitrary choice diff --git a/pkgs/development/compilers/chicken/default.nix b/pkgs/development/compilers/chicken/default.nix index ff9f5d3f7c2eef8aecb9228c6645e90530d32778..8fd99973cbc15d7abe40c81626ca6b6096daf56e 100644 --- a/pkgs/development/compilers/chicken/default.nix +++ b/pkgs/development/compilers/chicken/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { homepage = http://www.call-cc.org/; license = "BSD"; maintainers = with stdenv.lib.maintainers; [ the-kenny ]; - platforms = stdenv.lib.platforms.all; + platforms = with stdenv.lib.platforms; allBut darwin; description = "A portable compiler for the Scheme programming language"; longDescription = '' CHICKEN is a compiler for the Scheme programming language. diff --git a/pkgs/development/compilers/cryptol/1.8.x.nix b/pkgs/development/compilers/cryptol/1.8.x.nix index 42887b22ab07aa49a34b9d91cc3ff5d1e73b58d5..4cf00ad3806d28350ac8da9f0b81c587c0f28c90 100644 --- a/pkgs/development/compilers/cryptol/1.8.x.nix +++ b/pkgs/development/compilers/cryptol/1.8.x.nix @@ -111,5 +111,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.unfree; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }; } diff --git a/pkgs/development/compilers/epic/default.nix b/pkgs/development/compilers/epic/default.nix index af63829061015778c9f89d2b58d1fcabb17eca8d..6ea377387ec600cbf287c80296f6e0e6a15117aa 100644 --- a/pkgs/development/compilers/epic/default.nix +++ b/pkgs/development/compilers/epic/default.nix @@ -16,6 +16,7 @@ cabal.mkDerivation (self: { description = "Compiler for a simple functional language"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; + broken = true; }; }) diff --git a/pkgs/development/compilers/gcc/4.2-apple64/default.nix b/pkgs/development/compilers/gcc/4.2-apple64/default.nix index 229f68fd8411b6453c462d8e3ee14aefc8083986..b2444ebb9bffa4dc644fb8ef9d88d3dac2cd4fdf 100644 --- a/pkgs/development/compilers/gcc/4.2-apple64/default.nix +++ b/pkgs/development/compilers/gcc/4.2-apple64/default.nix @@ -44,4 +44,6 @@ stdenv.mkDerivation rec { langC = true; buildInputs = stdenv.lib.optionals langF77 [ gmp mpfr bison flex ]; + + #meta.broken = true; } diff --git a/pkgs/development/compilers/gcc/4.2/builder.sh b/pkgs/development/compilers/gcc/4.2/builder.sh deleted file mode 100644 index d749fc08d2a0649500824ab68dfbe3424053ecdd..0000000000000000000000000000000000000000 --- a/pkgs/development/compilers/gcc/4.2/builder.sh +++ /dev/null @@ -1,96 +0,0 @@ -source $stdenv/setup - - -export NIX_FIXINC_DUMMY=$NIX_BUILD_TOP/dummy -mkdir $NIX_FIXINC_DUMMY - - -# libstdc++ needs this; otherwise it will use /lib/cpp, which is a Bad -# Thing. -export CPP="gcc -E" - - -if test "$noSysDirs" = "1"; then - - if test -e $NIX_GCC/nix-support/orig-libc; then - - # Figure out what extra flags to pass to the gcc compilers - # being generated to make sure that they use our glibc. - extraCFlags="$(cat $NIX_GCC/nix-support/libc-cflags)" - extraLDFlags="$(cat $NIX_GCC/nix-support/libc-ldflags) $(cat $NIX_GCC/nix-support/libc-ldflags-before)" - - # Use *real* header files, otherwise a limits.h is generated - # that does not include Glibc's limits.h (notably missing - # SSIZE_MAX, which breaks the build). - export NIX_FIXINC_DUMMY=$(cat $NIX_GCC/nix-support/orig-libc)/include - - else - # Hack: support impure environments. - extraCFlags="-isystem /usr/include" - extraLDFlags="-L/usr/lib64 -L/usr/lib" - export NIX_FIXINC_DUMMY=/usr/include - fi - - extraCFlags="-g0 $extraCFlags" - extraLDFlags="--strip-debug $extraLDFlags" - - export NIX_EXTRA_CFLAGS=$extraCFlags - for i in $extraLDFlags; do - export NIX_EXTRA_LDFLAGS="$NIX_EXTRA_LDFLAGS -Wl,$i" - done - - makeFlagsArray=( \ - "${makeFlagsArray[@]}" \ - NATIVE_SYSTEM_HEADER_DIR="$NIX_FIXINC_DUMMY" \ - SYSTEM_HEADER_DIR="$NIX_FIXINC_DUMMY" \ - LIMITS_H_TEST=true \ - X_CFLAGS="$NIX_EXTRA_CFLAGS $NIX_EXTRA_LDFLAGS" \ - LDFLAGS="$NIX_EXTRA_CFLAGS $NIX_EXTRA_LDFLAGS" \ - LDFLAGS_FOR_TARGET="$NIX_EXTRA_CFLAGS $NIX_EXTRA_LDFLAGS" \ - ) -fi - - -preConfigure() { - # Perform the build in a different directory. - mkdir ../build - cd ../build - configureScript=../$sourceRoot/configure -} - - -postInstall() { - # Remove precompiled headers for now. They are very big and - # probably not very useful yet. - find $out/include -name "*.gch" -exec rm -rf {} \; -prune - - # Remove `fixincl' to prevent a retained dependency on the - # previous gcc. - rm -rf $out/libexec/gcc/*/*/install-tools - rm -rf $out/lib/gcc/*/*/install-tools - - # Get rid of some "fixed" header files - rm -rf $out/lib/gcc/*/*/include/root - - # Replace hard links for i686-pc-linux-gnu-gcc etc. with symlinks. - for i in $out/bin/*-gcc*; do - if cmp -s $out/bin/gcc $i; then - ln -sfn gcc $i - fi - done - - for i in $out/bin/*-c++* $out/bin/*-g++*; do - if cmp -s $out/bin/g++ $i; then - ln -sfn g++ $i - fi - done -} - - -if test -z "$profiledCompiler"; then - buildFlags="bootstrap $buildFlags" -else - buildFlags="profiledbootstrap $buildFlags" -fi - -genericBuild diff --git a/pkgs/development/compilers/gcc/4.2/default.nix b/pkgs/development/compilers/gcc/4.2/default.nix deleted file mode 100644 index 69cac159d4a5b5a06afba238a2456e24f98d7ed1..0000000000000000000000000000000000000000 --- a/pkgs/development/compilers/gcc/4.2/default.nix +++ /dev/null @@ -1,66 +0,0 @@ -{ stdenv, fetchurl, noSysDirs -, langC ? true, langCC ? true, langFortran ? false -, profiledCompiler ? false -, staticCompiler ? false -, gmp ? null -, mpfr ? null -, texinfo ? null -, name ? "gcc" -}: - -with stdenv.lib; - -let version = "4.2.4"; in - -stdenv.mkDerivation { - name = "${name}-${version}"; - - builder = ./builder.sh; - - src = - optional /*langC*/ true (fetchurl { - url = "mirror://gnu/gcc/gcc-${version}/gcc-core-${version}.tar.bz2"; - sha256 = "0cm5yzhqhgdfk03aayakmdj793sya42xkkqhslj7s2b697hygjfg"; - }) ++ - optional langCC (fetchurl { - url = "mirror://gnu/gcc/gcc-${version}/gcc-g++-${version}.tar.bz2"; - sha256 = "0gq8ikci0qqgck71qqlhfld6zkwn9179x6z15vdd9blkdig55nxg"; - }) ++ - optional langFortran (fetchurl { - url = "mirror://gnu/gcc/gcc-${version}/gcc-fortran-${version}.tar.bz2"; - sha256 = "013yqiqhdavgxzjryvylgf3lcnknmw89fx41jf2v4899srn0bhkg"; - }); - - patches = - [./pass-cxxcpp.patch ./siginfo_t.patch] - ++ optional noSysDirs [./no-sys-dirs.patch]; - - inherit noSysDirs profiledCompiler staticCompiler; - - buildInputs = [gmp mpfr texinfo]; - - configureFlags = " - --disable-multilib - --disable-libstdcxx-pch - --with-system-zlib - --enable-languages=${ - concatStrings (intersperse "," - ( optional langC "c" - ++ optional langCC "c++" - ++ optional langFortran "fortran" - ) - ) - } - ${if stdenv.isi686 then "--with-arch=i686" else ""} - "; - - NIX_EXTRA_LDFLAGS = if staticCompiler then "-static" else ""; - - passthru = { inherit langC langCC langFortran; }; - - meta = { - homepage = "http://gcc.gnu.org/"; - license = "GPL/LGPL"; - description = "GNU Compiler Collection, 4.2.x"; - }; -} diff --git a/pkgs/development/compilers/gcc/4.2/no-sys-dirs.patch b/pkgs/development/compilers/gcc/4.2/no-sys-dirs.patch deleted file mode 100644 index f1d429e274a0b37276cda046752477364c9b2c02..0000000000000000000000000000000000000000 --- a/pkgs/development/compilers/gcc/4.2/no-sys-dirs.patch +++ /dev/null @@ -1,139 +0,0 @@ -diff -rc gcc-4.2.0-orig/Makefile.in gcc-4.2.0/Makefile.in -*** gcc-4.2.0-orig/Makefile.in 2006-12-29 18:47:06.000000000 +0100 ---- gcc-4.2.0/Makefile.in 2007-05-20 21:06:42.000000000 +0200 -*************** -*** 364,369 **** ---- 364,377 ---- - @host_makefile_frag@ - ### - -+ CFLAGS += $(NIX_EXTRA_CFLAGS) -+ CPPFLAGS_FOR_TARGET += $(NIX_EXTRA_CFLAGS) -+ CXXFLAGS += $(NIX_EXTRA_CFLAGS) -+ LDFLAGS += $(NIX_EXTRA_LDFLAGS) -+ LDFLAGS_FOR_TARGET += $(NIX_EXTRA_LDFLAGS) -+ BOOT_CFLAGS += $(NIX_EXTRA_CFLAGS) -+ BOOT_LDFLAGS += $(NIX_EXTRA_LDFLAGS) -+ - # This is the list of directories that may be needed in RPATH_ENVVAR - # so that prorgams built for the target machine work. - TARGET_LIB_PATH = $(TARGET_LIB_PATH_libstdc++-v3)$(TARGET_LIB_PATH_libmudflap)$(TARGET_LIB_PATH_libssp)$(TARGET_LIB_PATH_libgomp)$(HOST_LIB_PATH_gcc) -diff -rc gcc-4.2.0-orig/gcc/Makefile.in gcc-4.2.0/gcc/Makefile.in -*** gcc-4.2.0-orig/gcc/Makefile.in 2007-03-12 05:40:09.000000000 +0100 ---- gcc-4.2.0/gcc/Makefile.in 2007-05-20 19:35:13.000000000 +0200 -*************** -*** 396,402 **** - MD5_H = $(srcdir)/../include/md5.h - - # Default native SYSTEM_HEADER_DIR, to be overridden by targets. -! NATIVE_SYSTEM_HEADER_DIR = /usr/include - # Default cross SYSTEM_HEADER_DIR, to be overridden by targets. - CROSS_SYSTEM_HEADER_DIR = @CROSS_SYSTEM_HEADER_DIR@ - ---- 396,406 ---- - MD5_H = $(srcdir)/../include/md5.h - - # Default native SYSTEM_HEADER_DIR, to be overridden by targets. -! # Nix: we override NATIVE_SYSTEM_HEADER_DIR in order to prevent -! # `fixinc' from fixing header files in /usr/include. However, -! # NATIVE_SYSTEM_HEADER_DIR must point to an existing directory, so set -! # it to some dummy directory. -! NATIVE_SYSTEM_HEADER_DIR = $(NIX_FIXINC_DUMMY) - # Default cross SYSTEM_HEADER_DIR, to be overridden by targets. - CROSS_SYSTEM_HEADER_DIR = @CROSS_SYSTEM_HEADER_DIR@ - -*************** -*** 3066,3072 **** - -DGPLUSPLUS_INCLUDE_DIR=\"$(gcc_gxx_include_dir)\" \ - -DGPLUSPLUS_TOOL_INCLUDE_DIR=\"$(gcc_gxx_include_dir)/$(target_noncanonical)\" \ - -DGPLUSPLUS_BACKWARD_INCLUDE_DIR=\"$(gcc_gxx_include_dir)/backward\" \ -! -DLOCAL_INCLUDE_DIR=\"$(local_includedir)\" \ - -DCROSS_INCLUDE_DIR=\"$(CROSS_SYSTEM_HEADER_DIR)\" \ - -DTOOL_INCLUDE_DIR=\"$(gcc_tooldir)/include\" \ - @TARGET_SYSTEM_ROOT_DEFINE@ ---- 3070,3076 ---- - -DGPLUSPLUS_INCLUDE_DIR=\"$(gcc_gxx_include_dir)\" \ - -DGPLUSPLUS_TOOL_INCLUDE_DIR=\"$(gcc_gxx_include_dir)/$(target_noncanonical)\" \ - -DGPLUSPLUS_BACKWARD_INCLUDE_DIR=\"$(gcc_gxx_include_dir)/backward\" \ -! -DLOCAL_INCLUDE_DIR=\"/no-such-dir\" \ - -DCROSS_INCLUDE_DIR=\"$(CROSS_SYSTEM_HEADER_DIR)\" \ - -DTOOL_INCLUDE_DIR=\"$(gcc_tooldir)/include\" \ - @TARGET_SYSTEM_ROOT_DEFINE@ -diff -rc gcc-4.2.0-orig/gcc/cppdefault.c gcc-4.2.0/gcc/cppdefault.c -*** gcc-4.2.0-orig/gcc/cppdefault.c 2006-01-20 22:00:03.000000000 +0100 ---- gcc-4.2.0/gcc/cppdefault.c 2007-05-20 17:16:44.000000000 +0200 -*************** -*** 41,46 **** ---- 41,50 ---- - # undef CROSS_INCLUDE_DIR - #endif - -+ #undef LOCAL_INCLUDE_DIR -+ #undef SYSTEM_INCLUDE_DIR -+ #undef STANDARD_INCLUDE_DIR -+ - const struct default_include cpp_include_defaults[] - #ifdef INCLUDE_DEFAULTS - = INCLUDE_DEFAULTS; -diff -rc gcc-4.2.0-orig/gcc/gcc.c gcc-4.2.0/gcc/gcc.c -*** gcc-4.2.0-orig/gcc/gcc.c 2007-03-05 21:37:05.000000000 +0100 ---- gcc-4.2.0/gcc/gcc.c 2007-05-20 17:49:48.000000000 +0200 -*************** -*** 1449,1458 **** - /* Default prefixes to attach to command names. */ - - #ifndef STANDARD_STARTFILE_PREFIX_1 -! #define STANDARD_STARTFILE_PREFIX_1 "/lib/" - #endif - #ifndef STANDARD_STARTFILE_PREFIX_2 -! #define STANDARD_STARTFILE_PREFIX_2 "/usr/lib/" - #endif - - #ifdef CROSS_COMPILE /* Don't use these prefixes for a cross compiler. */ ---- 1449,1458 ---- - /* Default prefixes to attach to command names. */ - - #ifndef STANDARD_STARTFILE_PREFIX_1 -! #define STANDARD_STARTFILE_PREFIX_1 "" - #endif - #ifndef STANDARD_STARTFILE_PREFIX_2 -! #define STANDARD_STARTFILE_PREFIX_2 "" - #endif - - #ifdef CROSS_COMPILE /* Don't use these prefixes for a cross compiler. */ -*************** -*** 1473,1480 **** - #endif - - static const char *const standard_exec_prefix = STANDARD_EXEC_PREFIX; -! static const char *const standard_exec_prefix_1 = "/usr/libexec/gcc/"; -! static const char *const standard_exec_prefix_2 = "/usr/lib/gcc/"; - static const char *md_exec_prefix = MD_EXEC_PREFIX; - - static const char *md_startfile_prefix = MD_STARTFILE_PREFIX; ---- 1473,1480 ---- - #endif - - static const char *const standard_exec_prefix = STANDARD_EXEC_PREFIX; -! static const char *const standard_exec_prefix_1 = "/no-such-path/"; -! static const char *const standard_exec_prefix_2 = "/no-such-path/"; - static const char *md_exec_prefix = MD_EXEC_PREFIX; - - static const char *md_startfile_prefix = MD_STARTFILE_PREFIX; -diff -rc gcc-4.2.0-orig/ltconfig gcc-4.2.0/ltconfig -*** gcc-4.2.0-orig/ltconfig 2007-02-14 18:08:35.000000000 +0100 ---- gcc-4.2.0/ltconfig 2007-05-20 22:16:24.000000000 +0200 -*************** -*** 2322,2327 **** ---- 2322,2332 ---- - # A language-specific compiler. - CC=$CC - -+ # Ugly hack to get libmudflap (and possibly other libraries) to build. -+ # Libtool filters out \`-B' flags when linking (why?), so the \`-B' flag -+ # to Glibc gets lost. Here we forcibly add it to any invocation. -+ CC="\$CC $NIX_EXTRA_CFLAGS $NIX_EXTRA_LDFLAGS" -+ - # Is the compiler the GNU C compiler? - with_gcc=$with_gcc - diff --git a/pkgs/development/compilers/gcc/4.2/pass-cxxcpp.patch b/pkgs/development/compilers/gcc/4.2/pass-cxxcpp.patch deleted file mode 100644 index 9b0676d4fdc95d710122ad3193f5aaf06938cb34..0000000000000000000000000000000000000000 --- a/pkgs/development/compilers/gcc/4.2/pass-cxxcpp.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -rc gcc-orig/Makefile.in gcc-4.1.1/Makefile.in -*** gcc-orig/Makefile.in Wed Jun 21 13:40:23 2006 ---- gcc-4.1.1/Makefile.in Wed Jun 21 14:19:44 2006 -*************** -*** 213,219 **** - RAW_CXX_TARGET_EXPORTS = \ - $(BASE_TARGET_EXPORTS) \ - CXX_FOR_TARGET="$(RAW_CXX_FOR_TARGET)"; export CXX_FOR_TARGET; \ -! CXX="$(RAW_CXX_FOR_TARGET)"; export CXX; - - NORMAL_TARGET_EXPORTS = \ - $(BASE_TARGET_EXPORTS) \ ---- 213,220 ---- - RAW_CXX_TARGET_EXPORTS = \ - $(BASE_TARGET_EXPORTS) \ - CXX_FOR_TARGET="$(RAW_CXX_FOR_TARGET)"; export CXX_FOR_TARGET; \ -! CXX="$(RAW_CXX_FOR_TARGET) $(CFLAGS_FOR_BUILD)"; export CXX; \ -! CXXCPP="$(RAW_CXX_FOR_TARGET) $(CFLAGS_FOR_BUILD) -E"; export CXXCPP; - - NORMAL_TARGET_EXPORTS = \ - $(BASE_TARGET_EXPORTS) \ diff --git a/pkgs/development/compilers/gcc/4.2/siginfo_t.patch b/pkgs/development/compilers/gcc/4.2/siginfo_t.patch deleted file mode 100644 index bfb9f975372833959b1d27a5b204814880766a6d..0000000000000000000000000000000000000000 --- a/pkgs/development/compilers/gcc/4.2/siginfo_t.patch +++ /dev/null @@ -1,15 +0,0 @@ -https://bbs.archlinux.org/viewtopic.php?id=144949 ---- a/gcc/config/i386/linux-unwind.h 2011-01-03 20:52:22.000000000 +0000 -+++ b/gcc/config/i386/linux-unwind.h 2012-07-06 12:23:51.562859470 +0100 -@@ -133,9 +133,9 @@ - { - struct rt_sigframe { - int sig; -- struct siginfo *pinfo; -+ siginfo_t *pinfo; - void *puc; -- struct siginfo info; -+ siginfo_t info; - struct ucontext uc; - } *rt_ = context->cfa; - /* The void * cast is necessary to avoid an aliasing warning. diff --git a/pkgs/development/compilers/gcc/4.3/default.nix b/pkgs/development/compilers/gcc/4.3/default.nix index 4446876ab1f84611b5434b96090f4d996caee832..45040c2f3753189c3fcca76d3156b319bfd3477c 100644 --- a/pkgs/development/compilers/gcc/4.3/default.nix +++ b/pkgs/development/compilers/gcc/4.3/default.nix @@ -173,7 +173,7 @@ stdenv.mkDerivation ({ meta = { homepage = "http://ghdl.free.fr/"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; description = "Complete VHDL simulator, using the GCC technology"; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/development/compilers/gcc/4.4/default.nix b/pkgs/development/compilers/gcc/4.4/default.nix index 99c342da780f706a29ff567d5ae31ee019967daa..be2f323fde1c94ce309950e8486b79aeccf8b6f3 100644 --- a/pkgs/development/compilers/gcc/4.4/default.nix +++ b/pkgs/development/compilers/gcc/4.4/default.nix @@ -251,7 +251,7 @@ stdenv.mkDerivation ({ meta = { homepage = http://gcc.gnu.org/; - license = "GPLv3+"; # runtime support libraries are typically LGPLv3+ + license = stdenv.lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ description = "GNU Compiler Collection, version ${version}"; longDescription = '' @@ -302,7 +302,7 @@ stdenv.mkDerivation ({ meta = { homepage = "http://ghdl.free.fr/"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; description = "Complete VHDL simulator, using the GCC technology (gcc ${version})"; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/development/compilers/gcc/4.5/default.nix b/pkgs/development/compilers/gcc/4.5/default.nix index 9713164711f16a3d1cf92ce6bd9bc19f952f0e6b..fbeea0768ad3b2f58462804c48cdc38b70d1278d 100644 --- a/pkgs/development/compilers/gcc/4.5/default.nix +++ b/pkgs/development/compilers/gcc/4.5/default.nix @@ -364,7 +364,7 @@ stdenv.mkDerivation ({ meta = { homepage = http://gcc.gnu.org/; - license = "GPLv3+"; # runtime support libraries are typically LGPLv3+ + license = stdenv.lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ description = "GNU Compiler Collection, version ${version}" + (if stripped then "" else " (with debugging info)"); @@ -432,7 +432,7 @@ stdenv.mkDerivation ({ meta = { homepage = "http://ghdl.free.fr/"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; description = "Complete VHDL simulator, using the GCC technology (gcc ${version})"; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/development/compilers/gcc/4.6/default.nix b/pkgs/development/compilers/gcc/4.6/default.nix index ef75cf71f581f3653a5fb2ce384d0326dc314185..8528be07729535a47942cc36152a148f108eed91 100644 --- a/pkgs/development/compilers/gcc/4.6/default.nix +++ b/pkgs/development/compilers/gcc/4.6/default.nix @@ -438,7 +438,7 @@ stdenv.mkDerivation ({ meta = { homepage = http://gcc.gnu.org/; - license = "GPLv3+"; # runtime support libraries are typically LGPLv3+ + license = stdenv.lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ description = "GNU Compiler Collection, version ${version}" + (if stripped then "" else " (with debugging info)"); @@ -501,7 +501,7 @@ stdenv.mkDerivation ({ meta = { homepage = "http://ghdl.free.fr/"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; description = "Complete VHDL simulator, using the GCC technology (gcc ${version})"; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/development/compilers/gcc/4.8/builder.sh b/pkgs/development/compilers/gcc/4.8/builder.sh index 7c9b9420ddaa04e8504d495b9371046caef42dd6..3d24d34a2f26a40f5c6bbe035f1bb3bc4b9b2a6a 100644 --- a/pkgs/development/compilers/gcc/4.8/builder.sh +++ b/pkgs/development/compilers/gcc/4.8/builder.sh @@ -109,13 +109,11 @@ if test "$noSysDirs" = "1"; then fi fi - # CFLAGS_FOR_TARGET are needed for the libstdc++ configure script to find # the startfiles. # FLAGS_FOR_TARGET are needed for the target libraries to receive the -Bxxx # for the startfiles. - makeFlagsArray=( \ - "${makeFlagsArray[@]}" \ + makeFlagsArray+=( \ NATIVE_SYSTEM_HEADER_DIR="$NIX_FIXINC_DUMMY" \ SYSTEM_HEADER_DIR="$NIX_FIXINC_DUMMY" \ CFLAGS_FOR_BUILD="$EXTRA_FLAGS $EXTRA_LDFLAGS" \ @@ -128,8 +126,7 @@ if test "$noSysDirs" = "1"; then ) if test -z "$targetConfig"; then - makeFlagsArray=( \ - "${makeFlagsArray[@]}" \ + makeFlagsArray+=( \ BOOT_CFLAGS="$EXTRA_FLAGS $EXTRA_LDFLAGS" \ BOOT_LDFLAGS="$EXTRA_TARGET_CFLAGS $EXTRA_TARGET_LDFLAGS" \ ) @@ -138,13 +135,11 @@ if test "$noSysDirs" = "1"; then if test -n "$targetConfig" -a "$crossStageStatic" == 1; then # We don't want the gcc build to assume there will be a libc providing # limits.h in this stagae - makeFlagsArray=( \ - "${makeFlagsArray[@]}" \ + makeFlagsArray+=( \ LIMITS_H_TEST=false \ ) else - makeFlagsArray=( \ - "${makeFlagsArray[@]}" \ + makeFlagsArray+=( \ LIMITS_H_TEST=true \ ) fi @@ -163,6 +158,7 @@ preConfigure() { # Patch to get armvt5el working: sed -i -e 's/ arm)/ arm*)/' newlib/configure.host fi + # Bug - they packaged zlib if test -d "zlib"; then # This breaks the build without-headers, which should build only @@ -189,8 +185,8 @@ preConfigure() { fi # Eval the preConfigure script from nix expression. - eval $providedPreConfigure; - env; + eval "$providedPreConfigure" + # Perform the build in a different directory. mkdir ../build cd ../build @@ -204,6 +200,15 @@ postConfigure() { } +preInstall() { + # Make ‘lib64’ a symlink to ‘lib’. + if [ -n "$is64bit" -a -z "$enableMultilib" ]; then + mkdir -p $out/lib + ln -s lib $out/lib64 + fi +} + + postInstall() { # Remove precompiled headers for now. They are very big and # probably not very useful yet. diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index 58732f1a0be22519483aa2d7a5dc9aef17bc4cc3..2fb8f9d73b5e5a0e01547245e50bd6d9eeca3582 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -67,7 +67,6 @@ let version = "4.8.3"; patches = [] ++ optional enableParallelBuilding ./parallel-bconfig.patch ++ optional (cross != null) ./libstdc++-target.patch - # ++ optional noSysDirs ./no-sys-dirs.patch # The GNAT Makefiles did not pay attention to CFLAGS_FOR_TARGET for its # target libraries and tools. ++ optional langAda ./gnat-cflags.patch @@ -304,14 +303,21 @@ stdenv.mkDerivation ({ "\"--with-host-libstdcxx=-Wl,-rpath,\$prefix/lib/amd64 -lstdc++\" \"--with-boot-ldflags=-L../prev-x86_64-pc-solaris2.11/libstdc++-v3/src/.libs\""} ); - ${stdenv.lib.optionalString (stdenv.isSunOS && stdenv.is64bit) - '' - export NIX_LDFLAGS=`echo $NIX_LDFLAGS | sed -e s~$prefix/lib~$prefix/lib/amd64~g` - export LDFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $LDFLAGS_FOR_TARGET" - export CXXFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CXXFLAGS_FOR_TARGET" - export CFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CFLAGS_FOR_TARGET" - ''} - ''; + '' + stdenv.lib.optionalString (stdenv.isSunOS && stdenv.is64bit) '' + export NIX_LDFLAGS=`echo $NIX_LDFLAGS | sed -e s~$prefix/lib~$prefix/lib/amd64~g` + export LDFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $LDFLAGS_FOR_TARGET" + export CXXFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CXXFLAGS_FOR_TARGET" + export CFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CFLAGS_FOR_TARGET" + '' + stdenv.lib.optionalString stdenv.isDarwin '' + if SDKROOT=$(/usr/bin/xcrun --show-sdk-path); then + configureFlagsArray+=(--with-native-system-header-dir=$SDKROOT/usr/include) + makeFlagsArray+=( \ + CFLAGS_FOR_BUILD=-F$SDKROOT/System/Library/Frameworks \ + CFLAGS_FOR_TARGET=-F$SDKROOT/System/Library/Frameworks \ + FLAGS_FOR_TARGET=-F$SDKROOT/System/Library/Frameworks \ + ) + fi + ''; dontDisableStatic = true; @@ -494,13 +500,15 @@ stdenv.mkDerivation ({ else null; passthru = - { inherit langC langCC langObjC langObjCpp langAda langFortran langVhdl langGo enableMultilib version; }; + { inherit langC langCC langObjC langObjCpp langAda langFortran langVhdl langGo version; }; + + inherit enableParallelBuilding enableMultilib; - inherit enableParallelBuilding; + inherit (stdenv) is64bit; meta = { homepage = http://gcc.gnu.org/; - license = "GPLv3+"; # runtime support libraries are typically LGPLv3+ + license = stdenv.lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ description = "GNU Compiler Collection, version ${version}" + (if stripped then "" else " (with debugging info)"); diff --git a/pkgs/development/compilers/gcc/4.8/no-sys-dirs.patch b/pkgs/development/compilers/gcc/4.8/no-sys-dirs.patch deleted file mode 100644 index 79901703cb8298fa9450cbd376d54688a5a1482c..0000000000000000000000000000000000000000 --- a/pkgs/development/compilers/gcc/4.8/no-sys-dirs.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff -ru gcc-4.3.1-orig/gcc/cppdefault.c gcc-4.3.1/gcc/cppdefault.c ---- gcc-4.3.1-orig/gcc/cppdefault.c 2007-07-26 10:37:01.000000000 +0200 -+++ gcc-4.3.1/gcc/cppdefault.c 2008-06-25 17:48:23.000000000 +0200 -@@ -41,6 +41,10 @@ - # undef CROSS_INCLUDE_DIR - #endif - -+#undef LOCAL_INCLUDE_DIR -+#undef SYSTEM_INCLUDE_DIR -+#undef STANDARD_INCLUDE_DIR -+ - const struct default_include cpp_include_defaults[] - #ifdef INCLUDE_DEFAULTS - = INCLUDE_DEFAULTS; -diff -ru gcc-4.3.1-orig/gcc/gcc.c gcc-4.3.1/gcc/gcc.c ---- gcc-4.3.1-orig/gcc/gcc.c 2008-03-02 23:55:19.000000000 +0100 -+++ gcc-4.3.1/gcc/gcc.c 2008-06-25 17:52:53.000000000 +0200 -@@ -1478,10 +1478,10 @@ - /* Default prefixes to attach to command names. */ - - #ifndef STANDARD_STARTFILE_PREFIX_1 --#define STANDARD_STARTFILE_PREFIX_1 "/lib/" -+#define STANDARD_STARTFILE_PREFIX_1 "" - #endif - #ifndef STANDARD_STARTFILE_PREFIX_2 --#define STANDARD_STARTFILE_PREFIX_2 "/usr/lib/" -+#define STANDARD_STARTFILE_PREFIX_2 "" - #endif - - #ifdef CROSS_DIRECTORY_STRUCTURE /* Don't use these prefixes for a cross compiler. */ ---- gcc-4.3.1-orig/gcc/Makefile.in 2008-05-11 20:54:15.000000000 +0200 -+++ gcc-4.3.1/gcc/Makefile.in 2008-06-25 17:48:23.000000000 +0200 -@@ -3277,7 +3281,7 @@ - -DGPLUSPLUS_INCLUDE_DIR=\"$(gcc_gxx_include_dir)\" \ - -DGPLUSPLUS_TOOL_INCLUDE_DIR=\"$(gcc_gxx_include_dir)/$(target_noncanonical)\" \ - -DGPLUSPLUS_BACKWARD_INCLUDE_DIR=\"$(gcc_gxx_include_dir)/backward\" \ -- -DLOCAL_INCLUDE_DIR=\"$(local_includedir)\" \ -+ -DLOCAL_INCLUDE_DIR=\"/no-such-dir\" \ - -DCROSS_INCLUDE_DIR=\"$(CROSS_SYSTEM_HEADER_DIR)\" \ - -DTOOL_INCLUDE_DIR=\"$(gcc_tooldir)/include\" \ - -DPREFIX=\"$(prefix)/\" \ diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index f00c42e421adeb06e5c932133c68f541aada8390..8b185d00bcc07a9679c9585f7a2c366b94afeccb 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -52,7 +52,7 @@ assert langGo -> langCC; with stdenv.lib; with builtins; -let version = "4.9.0"; +let version = "4.9.1"; # Whether building a cross-compiler for GNU/Hurd. crossGNU = cross != null && cross.config == "i586-pc-gnu"; @@ -209,7 +209,7 @@ stdenv.mkDerivation ({ src = fetchurl { url = "mirror://gnu/gcc/gcc-${version}/gcc-${version}.tar.bz2"; - sha256 = "0mqjxpw2klskls00lwx1k24pnyzm3whqxg3hk74c3sddgfllgc5r"; + sha256 = "0zki3ngi0gsidnmsp88mjl2868cc7cm5wm1vwqw6znja28d7hd6k"; }; inherit patches; @@ -495,7 +495,7 @@ stdenv.mkDerivation ({ meta = { homepage = http://gcc.gnu.org/; - license = "GPLv3+"; # runtime support libraries are typically LGPLv3+ + license = stdenv.lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ description = "GNU Compiler Collection, version ${version}" + (if stripped then "" else " (with debugging info)"); diff --git a/pkgs/development/compilers/ghdl/default.nix b/pkgs/development/compilers/ghdl/default.nix index cd33d3d79a705b49912517e1be1f2296bbf7ee6d..7b2e03f8d573c27f45d23fcc2f532c0b4056a0d9 100644 --- a/pkgs/development/compilers/ghdl/default.nix +++ b/pkgs/development/compilers/ghdl/default.nix @@ -34,14 +34,14 @@ stdenv.mkDerivation rec { ''; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin cp ghdl_mcode $out/bin - ensureDir $out/share/ghdl_mcode/translate + mkdir -p $out/share/ghdl_mcode/translate cp -R ../lib $out/share/ghdl_mcode/translate cp -R ../../libraries $out/share/ghdl_mcode - ensureDir $out/share/man/man1 + mkdir -p $out/share/man/man1 cp ../../doc/ghdl.1 $out/share/man/man1/ghdl_mcode.1 # Ghdl has some timestamps checks, storing file timestamps in '.cf' files. @@ -59,6 +59,6 @@ stdenv.mkDerivation rec { description = "Free VHDL simulator, mcode flavour"; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/development/compilers/gnatboot/default.nix b/pkgs/development/compilers/gnatboot/default.nix index 1de0c88a6bc7a9620ae7db9503ed28e543f027ed..3cab8379720e4726dba9a1b068ded5dd4ee23579 100644 --- a/pkgs/development/compilers/gnatboot/default.nix +++ b/pkgs/development/compilers/gnatboot/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation { meta = { homepage = http://gentoo.org; - license = "GPLv3+"; # runtime support libraries are typically LGPLv3+ + license = stdenv.lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ maintainers = [ stdenv.lib.maintainers.viric ]; diff --git a/pkgs/development/compilers/go/1.3.nix b/pkgs/development/compilers/go/1.3.nix index b9178d5e61c1ce12bf3b985831716e6cd161d5e8..fafa045e5621ba568f3debbc8cbe9d1db2043d6a 100644 --- a/pkgs/development/compilers/go/1.3.nix +++ b/pkgs/development/compilers/go/1.3.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation { # http://lists.science.uu.nl/pipermail/nix-dev/2013-October/011891.html # Fix for "libgcc_s.so.1 must be installed for pthread_cancel to work" # during tests: - export LD_LIBRARY_PATH="$(dirname $(echo ${stdenv.gcc.gcc}/lib*/libgcc_s.so))" + export LD_LIBRARY_PATH="$(dirname $(echo ${stdenv.gcc.gcc}/lib/libgcc_s.so))" mkdir -p "$out/bin" export GOROOT="$(pwd)/" diff --git a/pkgs/development/compilers/go/gox.nix b/pkgs/development/compilers/go/gox.nix index 705cb6e5c28fa640a575f80fdabc3826eb489688..da40b7570fe588c905c583cfaff5bd9d2e0fa35e 100644 --- a/pkgs/development/compilers/go/gox.nix +++ b/pkgs/development/compilers/go/gox.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ go ]; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin export GOPATH=$src go build -v -o $out/bin/gox github.com/mitchellh/gox ''; diff --git a/pkgs/development/compilers/gwt/2.4.0.nix b/pkgs/development/compilers/gwt/2.4.0.nix index 65208b062c2534a27aae0780d5b197872cddf116..f0dc9378c4f0c033b974494c08afe2c2baf06bb7 100644 --- a/pkgs/development/compilers/gwt/2.4.0.nix +++ b/pkgs/development/compilers/gwt/2.4.0.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { buildInputs = [ unzip ]; installPhase = '' - ensureDir $out + mkdir -p $out unzip $src mv gwt-2.4.0 $out/bin ''; diff --git a/pkgs/development/compilers/hhvm/default.nix b/pkgs/development/compilers/hhvm/default.nix index 1be650a544a05d81ecdbb1d10635e2e1c09d548a..d2f24390318508f203a83d8eb7aca75927d8e73d 100644 --- a/pkgs/development/compilers/hhvm/default.nix +++ b/pkgs/development/compilers/hhvm/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchgit, cmake, boost, libunwind, mariadb, libmemcached, pcre +{ stdenv, fetchgit, cmake, pkgconfig, boost, libunwind, mariadb, libmemcached, pcre , libevent, gd, curl, libxml2, icu, flex, bison, openssl, zlib, php, re2c , expat, libcap, oniguruma, libdwarf, libmcrypt, tbb, gperftools, glog , bzip2, openldap, readline, libelf, uwimap, binutils, cyrus_sasl, pam, libpng -, libxslt, ocaml +, libxslt, ocaml, freetype }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { }; buildInputs = - [ cmake boost libunwind mariadb libmemcached pcre libevent gd curl + [ cmake pkgconfig boost libunwind mariadb libmemcached pcre libevent gd curl libxml2 icu flex bison openssl zlib php expat libcap oniguruma libdwarf libmcrypt tbb gperftools bzip2 openldap readline libelf uwimap binutils cyrus_sasl pam glog libpng libxslt ocaml @@ -31,6 +31,9 @@ stdenv.mkDerivation rec { MYSQL_INCLUDE_DIR="${mariadb}/include/mysql"; MYSQL_DIR=mariadb; + # work around broken build system + NIX_CFLAGS_COMPILE = "-I${freetype}/include/freetype2"; + patchPhase = '' substituteInPlace hphp/util/generate-buildinfo.sh \ --replace /bin/bash ${stdenv.shell} diff --git a/pkgs/development/compilers/idris/default.nix b/pkgs/development/compilers/idris/default.nix index c2b6b0ac5acc70e930d41beb214eb7f3602ad3ab..f0b07f9d0fa3410aee713e7eb59eed519ad2e658 100644 --- a/pkgs/development/compilers/idris/default.nix +++ b/pkgs/development/compilers/idris/default.nix @@ -11,8 +11,8 @@ cabal.mkDerivation (self: { pname = "idris"; - version = "0.9.14"; - sha256 = "0kfzp89sass93p9zsxq616zfix7ipi1rmjqmcjixihi01k7c0b8b"; + version = "0.9.14.1"; + sha256 = "11x4f0hvd51m9rlf9r0i5xsjmc73kjsayny4xyv0wgb88v9v737b"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -26,6 +26,7 @@ cabal.mkDerivation (self: { buildTools = [ happy ]; extraLibraries = [ boehmgc gmp ]; configureFlags = "-fllvm -fgmp -fffi"; + jailbreak = true; meta = { homepage = "http://www.idris-lang.org/"; description = "Functional Programming Language with Dependent Types"; diff --git a/pkgs/development/compilers/ikarus/default.nix b/pkgs/development/compilers/ikarus/default.nix index 4c3845f9ee5620e703c7384118a1d6f86d444889..070f29e16f64fc81a7dd2de4bd34e14f6a5641f8 100644 --- a/pkgs/development/compilers/ikarus/default.nix +++ b/pkgs/development/compilers/ikarus/default.nix @@ -14,6 +14,6 @@ stdenv.mkDerivation rec { meta = { description = "Ikarus - a Scheme compiler, aiming at R6RS"; homepage = http://ikarus-scheme.org/; - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3; }; } diff --git a/pkgs/development/compilers/llvm/3.1/clang-include-paths.patch b/pkgs/development/compilers/llvm/3.1/clang-include-paths.patch deleted file mode 100644 index 5e7370718ab49068df7e57e5ade4cdbc72732066..0000000000000000000000000000000000000000 --- a/pkgs/development/compilers/llvm/3.1/clang-include-paths.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Naur clang-3.1.src-orig/lib/Driver/ToolChains.cpp clang-3.1.src/lib/Driver/ToolChains.cpp ---- clang-3.1.src-orig/lib/Driver/ToolChains.cpp 2012-05-11 20:16:02.000000000 -0400 -+++ clang-3.1.src/lib/Driver/ToolChains.cpp 2012-10-08 01:13:01.044083509 -0400 -@@ -2146,9 +2146,6 @@ - if (DriverArgs.hasArg(options::OPT_nostdinc)) - return; - -- if (!DriverArgs.hasArg(options::OPT_nostdlibinc)) -- addSystemInclude(DriverArgs, CC1Args, D.SysRoot + "/usr/local/include"); -- - if (!DriverArgs.hasArg(options::OPT_nobuiltininc)) { - llvm::sys::Path P(D.ResourceDir); - P.appendComponent("include"); -@@ -2264,6 +2261,7 @@ - return; - - // Check if libc++ has been enabled and provide its include paths if so. -+ // !!! Will need to modify this if/when nixpkgs uses libc++ - if (GetCXXStdlibType(DriverArgs) == ToolChain::CST_Libcxx) { - // libc++ is always installed at a fixed path on Linux currently. - addSystemInclude(DriverArgs, CC1Args, diff --git a/pkgs/development/compilers/llvm/3.1/clang-ld-flags.patch b/pkgs/development/compilers/llvm/3.1/clang-ld-flags.patch deleted file mode 100644 index ffa67b464eca7a95cb6114fad2711c924356c585..0000000000000000000000000000000000000000 --- a/pkgs/development/compilers/llvm/3.1/clang-ld-flags.patch +++ /dev/null @@ -1,57 +0,0 @@ -diff -Naur clang-3.1.src-orig/lib/Driver/ToolChains.cpp clang-3.1.src/lib/Driver/ToolChains.cpp ---- clang-3.1.src-orig/lib/Driver/ToolChains.cpp 2012-05-11 20:16:02.000000000 -0400 -+++ clang-3.1.src/lib/Driver/ToolChains.cpp 2012-10-08 01:22:53.458850737 -0400 -@@ -2077,16 +2077,6 @@ - addPathIfExists(LibPath + "/../" + Multilib, Paths); - } - } -- addPathIfExists(SysRoot + "/lib/" + MultiarchTriple, Paths); -- addPathIfExists(SysRoot + "/lib/../" + Multilib, Paths); -- addPathIfExists(SysRoot + "/usr/lib/" + MultiarchTriple, Paths); -- addPathIfExists(SysRoot + "/usr/lib/../" + Multilib, Paths); -- -- // Try walking via the GCC triple path in case of multiarch GCC -- // installations with strange symlinks. -- if (GCCInstallation.isValid()) -- addPathIfExists(SysRoot + "/usr/lib/" + GCCInstallation.getTriple().str() + -- "/../../" + Multilib, Paths); - - // Add the non-multilib suffixed paths (if potentially different). - if (GCCInstallation.isValid()) { -@@ -2100,8 +2090,6 @@ - addPathIfExists(LibPath, Paths); - } - } -- addPathIfExists(SysRoot + "/lib", Paths); -- addPathIfExists(SysRoot + "/usr/lib", Paths); - } - - bool Linux::HasNativeLLVMSupport() const { -diff -Naur clang-3.1.src-orig/lib/Driver/Tools.cpp clang-3.1.src/lib/Driver/Tools.cpp ---- clang-3.1.src-orig/lib/Driver/Tools.cpp 2012-04-18 17:32:25.000000000 -0400 -+++ clang-3.1.src/lib/Driver/Tools.cpp 2012-10-08 01:25:23.913501995 -0400 -@@ -5210,24 +5210,6 @@ - ToolChain.getArch() == llvm::Triple::thumb || - (!Args.hasArg(options::OPT_static) && - !Args.hasArg(options::OPT_shared))) { -- CmdArgs.push_back("-dynamic-linker"); -- if (ToolChain.getArch() == llvm::Triple::x86) -- CmdArgs.push_back("/lib/ld-linux.so.2"); -- else if (ToolChain.getArch() == llvm::Triple::arm || -- ToolChain.getArch() == llvm::Triple::thumb) -- CmdArgs.push_back("/lib/ld-linux.so.3"); -- else if (ToolChain.getArch() == llvm::Triple::mips || -- ToolChain.getArch() == llvm::Triple::mipsel) -- CmdArgs.push_back("/lib/ld.so.1"); -- else if (ToolChain.getArch() == llvm::Triple::mips64 || -- ToolChain.getArch() == llvm::Triple::mips64el) -- CmdArgs.push_back("/lib64/ld.so.1"); -- else if (ToolChain.getArch() == llvm::Triple::ppc) -- CmdArgs.push_back("/lib/ld.so.1"); -- else if (ToolChain.getArch() == llvm::Triple::ppc64) -- CmdArgs.push_back("/lib64/ld64.so.1"); -- else -- CmdArgs.push_back("/lib64/ld-linux-x86-64.so.2"); - } - - CmdArgs.push_back("-o"); diff --git a/pkgs/development/compilers/llvm/3.1/clang.nix b/pkgs/development/compilers/llvm/3.1/clang.nix deleted file mode 100644 index c152d2215d800368106b4181bb77179d613f2240..0000000000000000000000000000000000000000 --- a/pkgs/development/compilers/llvm/3.1/clang.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ stdenv, fetchurl, perl, groff, llvm, cmake }: - -let - version = "3.1"; - gccReal = if (stdenv.gcc.gcc or null) == null then stdenv.gcc else stdenv.gcc.gcc; -in - -stdenv.mkDerivation { - name = "clang-${version}"; - - buildInputs = [ perl llvm groff cmake ]; - - patches = stdenv.lib.optionals (stdenv.gcc.libc != null) - [ ./clang-include-paths.patch ./clang-ld-flags.patch ]; - - cmakeFlags = [ - "-DCLANG_PATH_TO_LLVM_BUILD=${llvm}" - "-DCMAKE_BUILD_TYPE=Release" - "-DLLVM_TARGETS_TO_BUILD=all" - "-DGCC_INSTALL_PREFIX=${gccReal}" - ] ++ stdenv.lib.optionals (stdenv.gcc.libc != null) [ - "-DC_INCLUDE_DIRS=${stdenv.gcc.libc}/include/" - ]; - - enableParallelBuilding = true; - - src = fetchurl { - url = "http://llvm.org/releases/${version}/clang-${version}.src.tar.gz"; - sha256 = "11m7sm9f8qcrayckfg3z91zb3fimilpm0f7azn7q7qnkvhay4qzz"; - }; - - passthru = { gcc = stdenv.gcc.gcc; }; - - meta = { - homepage = http://clang.llvm.org/; - description = "A C language family frontend for LLVM"; - license = "BSD"; - maintainers = with stdenv.lib.maintainers; [viric vlstill]; - platforms = with stdenv.lib.platforms; all; - }; -} - diff --git a/pkgs/development/compilers/llvm/3.1/default.nix b/pkgs/development/compilers/llvm/3.1/default.nix deleted file mode 100644 index 60837d58b2958b0e753c47b28878113d7daf1189..0000000000000000000000000000000000000000 --- a/pkgs/development/compilers/llvm/3.1/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv, fetchurl, perl, groff, cmake, python, binutils }: - -let version = "3.1"; in - -stdenv.mkDerivation { - name = "llvm-${version}"; - - src = fetchurl { - url = "http://llvm.org/releases/${version}/llvm-${version}.src.tar.gz"; - sha256 = "1ea05135197b5400c1f88d00ff280d775ce778f8f9ea042e25a1e1e734a4b9ab"; - }; - - buildInputs = [ perl groff cmake python ]; - - cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" - "-DLLVM_BINUTILS_INCDIR=${binutils}/include" - ]; - - enableParallelBuilding = true; - - meta = { - homepage = http://llvm.org/; - description = "Collection of modular and reusable compiler and toolchain technologies"; - license = "BSD"; - maintainers = with stdenv.lib.maintainers; [viric raskin vlstill]; - platforms = with stdenv.lib.platforms; all; - }; -} - diff --git a/pkgs/development/compilers/llvm/3.2/clang-purity.patch b/pkgs/development/compilers/llvm/3.2/clang-purity.patch deleted file mode 100644 index 18c70b56c540bdc8e9fe8a8f75ddbbd913810a9c..0000000000000000000000000000000000000000 --- a/pkgs/development/compilers/llvm/3.2/clang-purity.patch +++ /dev/null @@ -1,137 +0,0 @@ -diff -Naur clang-3.2.src-orig/lib/Driver/ToolChains.cpp clang-3.2.src/lib/Driver/ToolChains.cpp ---- clang-3.2.src-orig/lib/Driver/ToolChains.cpp 2012-12-16 10:59:27.000000000 -0500 -+++ clang-3.2.src/lib/Driver/ToolChains.cpp 2013-01-22 14:16:55.787547681 -0500 -@@ -2153,16 +2153,6 @@ - addPathIfExists(LibPath + "/../" + GCCTriple.str() + "/lib", Paths); - } - } -- addPathIfExists(SysRoot + "/lib/" + MultiarchTriple, Paths); -- addPathIfExists(SysRoot + "/lib/../" + Multilib, Paths); -- addPathIfExists(SysRoot + "/usr/lib/" + MultiarchTriple, Paths); -- addPathIfExists(SysRoot + "/usr/lib/../" + Multilib, Paths); -- -- // Try walking via the GCC triple path in case of multiarch GCC -- // installations with strange symlinks. -- if (GCCInstallation.isValid()) -- addPathIfExists(SysRoot + "/usr/lib/" + GCCInstallation.getTriple().str() + -- "/../../" + Multilib, Paths); - - // Add the non-multilib suffixed paths (if potentially different). - if (GCCInstallation.isValid()) { -@@ -2176,8 +2166,6 @@ - addPathIfExists(LibPath, Paths); - } - } -- addPathIfExists(SysRoot + "/lib", Paths); -- addPathIfExists(SysRoot + "/usr/lib", Paths); - } - - bool Linux::HasNativeLLVMSupport() const { -@@ -2228,9 +2216,6 @@ - if (DriverArgs.hasArg(options::OPT_nostdinc)) - return; - -- if (!DriverArgs.hasArg(options::OPT_nostdlibinc)) -- addSystemInclude(DriverArgs, CC1Args, D.SysRoot + "/usr/local/include"); -- - if (!DriverArgs.hasArg(options::OPT_nobuiltininc)) { - llvm::sys::Path P(D.ResourceDir); - P.appendComponent("include"); -@@ -2295,24 +2280,6 @@ - "/usr/include/powerpc64-linux-gnu" - }; - ArrayRef MultiarchIncludeDirs; -- if (getTriple().getArch() == llvm::Triple::x86_64) { -- MultiarchIncludeDirs = X86_64MultiarchIncludeDirs; -- } else if (getTriple().getArch() == llvm::Triple::x86) { -- MultiarchIncludeDirs = X86MultiarchIncludeDirs; -- } else if (getTriple().getArch() == llvm::Triple::arm) { -- if (getTriple().getEnvironment() == llvm::Triple::GNUEABIHF) -- MultiarchIncludeDirs = ARMHFMultiarchIncludeDirs; -- else -- MultiarchIncludeDirs = ARMMultiarchIncludeDirs; -- } else if (getTriple().getArch() == llvm::Triple::mips) { -- MultiarchIncludeDirs = MIPSMultiarchIncludeDirs; -- } else if (getTriple().getArch() == llvm::Triple::mipsel) { -- MultiarchIncludeDirs = MIPSELMultiarchIncludeDirs; -- } else if (getTriple().getArch() == llvm::Triple::ppc) { -- MultiarchIncludeDirs = PPCMultiarchIncludeDirs; -- } else if (getTriple().getArch() == llvm::Triple::ppc64) { -- MultiarchIncludeDirs = PPC64MultiarchIncludeDirs; -- } - for (ArrayRef::iterator I = MultiarchIncludeDirs.begin(), - E = MultiarchIncludeDirs.end(); - I != E; ++I) { -@@ -2324,13 +2291,6 @@ - - if (getTriple().getOS() == llvm::Triple::RTEMS) - return; -- -- // Add an include of '/include' directly. This isn't provided by default by -- // system GCCs, but is often used with cross-compiling GCCs, and harmless to -- // add even when Clang is acting as-if it were a system compiler. -- addExternCSystemInclude(DriverArgs, CC1Args, D.SysRoot + "/include"); -- -- addExternCSystemInclude(DriverArgs, CC1Args, D.SysRoot + "/usr/include"); - } - - /// \brief Helper to add the thre variant paths for a libstdc++ installation. -diff -Naur clang-3.2.src-orig/lib/Driver/Tools.cpp clang-3.2.src/lib/Driver/Tools.cpp ---- clang-3.2.src-orig/lib/Driver/Tools.cpp 2012-11-21 02:56:23.000000000 -0500 -+++ clang-3.2.src/lib/Driver/Tools.cpp 2013-01-22 14:24:37.167212186 -0500 -@@ -5972,34 +5972,6 @@ - ToolChain.getArch() == llvm::Triple::thumb || - (!Args.hasArg(options::OPT_static) && - !Args.hasArg(options::OPT_shared))) { -- CmdArgs.push_back("-dynamic-linker"); -- if (isAndroid) -- CmdArgs.push_back("/system/bin/linker"); -- else if (ToolChain.getArch() == llvm::Triple::x86) -- CmdArgs.push_back("/lib/ld-linux.so.2"); -- else if (ToolChain.getArch() == llvm::Triple::arm || -- ToolChain.getArch() == llvm::Triple::thumb) { -- if (ToolChain.getTriple().getEnvironment() == llvm::Triple::GNUEABIHF) -- CmdArgs.push_back("/lib/ld-linux-armhf.so.3"); -- else -- CmdArgs.push_back("/lib/ld-linux.so.3"); -- } -- else if (ToolChain.getArch() == llvm::Triple::mips || -- ToolChain.getArch() == llvm::Triple::mipsel) -- CmdArgs.push_back("/lib/ld.so.1"); -- else if (ToolChain.getArch() == llvm::Triple::mips64 || -- ToolChain.getArch() == llvm::Triple::mips64el) { -- if (hasMipsN32ABIArg(Args)) -- CmdArgs.push_back("/lib32/ld.so.1"); -- else -- CmdArgs.push_back("/lib64/ld.so.1"); -- } -- else if (ToolChain.getArch() == llvm::Triple::ppc) -- CmdArgs.push_back("/lib/ld.so.1"); -- else if (ToolChain.getArch() == llvm::Triple::ppc64) -- CmdArgs.push_back("/lib64/ld64.so.1"); -- else -- CmdArgs.push_back("/lib64/ld-linux-x86-64.so.2"); - } - - CmdArgs.push_back("-o"); -diff -Naur clang-3.2.src-orig/lib/Frontend/InitHeaderSearch.cpp clang-3.2.src/lib/Frontend/InitHeaderSearch.cpp ---- clang-3.2.src-orig/lib/Frontend/InitHeaderSearch.cpp 2012-10-24 12:19:39.000000000 -0400 -+++ clang-3.2.src/lib/Frontend/InitHeaderSearch.cpp 2013-01-22 14:20:32.803925775 -0500 -@@ -221,8 +221,6 @@ - case llvm::Triple::Bitrig: - break; - default: -- // FIXME: temporary hack: hard-coded paths. -- AddPath("/usr/local/include", System, true, false, false); - break; - } - } -@@ -330,8 +328,6 @@ - break; - } - -- if ( os != llvm::Triple::RTEMS ) -- AddPath("/usr/include", System, false, false, false); - } - - void InitHeaderSearch:: diff --git a/pkgs/development/compilers/llvm/3.2/clang.nix b/pkgs/development/compilers/llvm/3.2/clang.nix deleted file mode 100644 index b8e9f946773da3bdb996d13f71f5dd322d9f5d7d..0000000000000000000000000000000000000000 --- a/pkgs/development/compilers/llvm/3.2/clang.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv, fetchurl, perl, groff, llvm, cmake, libxml2 }: - -let - version = "3.2"; - gccReal = if (stdenv.gcc.gcc or null) == null then stdenv.gcc else stdenv.gcc.gcc; -in - -stdenv.mkDerivation { - name = "clang-${version}"; - - buildInputs = [ perl llvm groff cmake libxml2 ]; - - patches = stdenv.lib.optional (stdenv.gcc.libc != null) ./clang-purity.patch; - - cmakeFlags = [ - "-DCLANG_PATH_TO_LLVM_BUILD=${llvm}" - "-DCMAKE_BUILD_TYPE=Release" - "-DLLVM_TARGETS_TO_BUILD=all" - "-DGCC_INSTALL_PREFIX=${gccReal}" - ] ++ stdenv.lib.optionals (stdenv.gcc.libc != null) [ - "-DC_INCLUDE_DIRS=${stdenv.gcc.libc}/include/" - ]; - - enableParallelBuilding = true; - - src = fetchurl { - url = "http://llvm.org/releases/${version}/clang-${version}.src.tar.gz"; - sha256 = "0n2nzw3pw2v7fk67f2k2qyzd9wibvi3i5j7cjzz1csqgghzz1aia"; - }; - - passthru = { gcc = stdenv.gcc.gcc; }; - - meta = { - homepage = http://clang.llvm.org/; - description = "A C language family frontend for LLVM"; - license = "BSD"; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; all; - }; -} diff --git a/pkgs/development/compilers/llvm/3.2/default.nix b/pkgs/development/compilers/llvm/3.2/default.nix deleted file mode 100644 index c373f1c1a4a27c516cb30c64a2b427605b0f6955..0000000000000000000000000000000000000000 --- a/pkgs/development/compilers/llvm/3.2/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv, fetchurl, perl, groff, cmake, python, libffi, binutils }: - -let version = "3.2"; in - -stdenv.mkDerivation { - name = "llvm-${version}"; - - src = fetchurl { - url = "http://llvm.org/releases/${version}/llvm-${version}.src.tar.gz"; - sha256 = "0hv30v5l4fkgyijs56sr1pbrlzgd674pg143x7az2h37sb290l0j"; - }; - - patches = [ ./set_soname.patch ]; # http://llvm.org/bugs/show_bug.cgi?id=12334 - patchFlags = "-p0"; - - preConfigure = "patchShebangs ."; - - propagatedBuildInputs = [ libffi ]; - buildInputs = [ perl groff cmake python ]; # ToDo: polly, libc++; enable cxx11? - - # created binaries need to be run before installation... I coudn't find a better way - preBuild = ''export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:"`pwd`/lib''; - - cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" - "-DBUILD_SHARED_LIBS=ON" - "-DLLVM_BINUTILS_INCDIR=${binutils}/include" - ]; - - enableParallelBuilding = true; - #doCheck = true; # tests are broken, don't know why - - meta = { - homepage = http://llvm.org/; - description = "Collection of modular and reusable compiler and toolchain technologies"; - license = "BSD"; - maintainers = with stdenv.lib.maintainers; [viric raskin vlstill]; - platforms = with stdenv.lib.platforms; all; - }; -} diff --git a/pkgs/development/compilers/llvm/3.2/set_soname.patch b/pkgs/development/compilers/llvm/3.2/set_soname.patch deleted file mode 100644 index 69ba74dddad893a747ba06b9f623acaad763883a..0000000000000000000000000000000000000000 --- a/pkgs/development/compilers/llvm/3.2/set_soname.patch +++ /dev/null @@ -1,12 +0,0 @@ -https://bugs.gentoo.org/show_bug.cgi?id=409267 -http://llvm.org/bugs/show_bug.cgi?id=12334 ---- tools/llvm-shlib/Makefile.orig 2012-03-26 18:14:13.071797115 +0200 -+++ tools/llvm-shlib/Makefile 2012-03-26 17:31:12.491196254 +0200 -@@ -67,6 +67,7 @@ - # Include everything from the .a's into the shared library. - LLVMLibsOptions := -Wl,--whole-archive $(LLVMLibsOptions) \ - -Wl,--no-whole-archive -+ LLVMLibsOptions += -Wl,--soname,lib$(LIBRARYNAME)$(SHLIBEXT) - endif - - ifeq ($(HOST_OS),Linux) diff --git a/pkgs/development/compilers/llvm/3.4/clang.nix b/pkgs/development/compilers/llvm/3.4/clang.nix index 7fe94cbf8d888c3d368ffa91d54479a0312cc7e2..6ec3f7bf44a37e95f14fefa468a1bfbd1d4a8dae 100644 --- a/pkgs/development/compilers/llvm/3.4/clang.nix +++ b/pkgs/development/compilers/llvm/3.4/clang.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "clang-${version}"; unpackPhase = '' - unpackFile ${fetch "cfe" "1dvbkld0a1aqj6wcn0ia1wa8lwha30yfgq16j1r7akdka44z70xb"} + unpackFile ${fetch "cfe" "045wjnp5j8xd2zjhvldcllnwlnrwz3dafmlk412z804d5xvzb9jv"} mv cfe-${version}.src clang sourceRoot=$PWD/clang unpackFile ${clang-tools-extra_src} diff --git a/pkgs/development/compilers/llvm/3.4/default.nix b/pkgs/development/compilers/llvm/3.4/default.nix index 237c7f73d7f43eb8eff3ac606f4dc5da9a2dcdfd..ef4e8d4bbc5d30c7a6f7eb163d1f3c04c62bebbd 100644 --- a/pkgs/development/compilers/llvm/3.4/default.nix +++ b/pkgs/development/compilers/llvm/3.4/default.nix @@ -15,13 +15,13 @@ let self = { llvm = callPackage ./llvm.nix rec { - version = "3.4.1"; + version = "3.4.2"; fetch = fetch_v version; inherit compiler-rt_src; }; clang = callPackage ./clang.nix rec { - version = "3.4.1"; + version = "3.4.2"; fetch = fetch_v version; inherit clang-tools-extra_src; }; diff --git a/pkgs/development/compilers/llvm/3.4/dragonegg.nix b/pkgs/development/compilers/llvm/3.4/dragonegg.nix index 577533c2e528ee8003b9e5bfb8344d4bbfe69a2e..a34fa965f066b125cb37aa9d4834c6fe109d74d2 100644 --- a/pkgs/development/compilers/llvm/3.4/dragonegg.nix +++ b/pkgs/development/compilers/llvm/3.4/dragonegg.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://dragonegg.llvm.org/; description = "gcc plugin that replaces gcc's optimizers and code generators by those in LLVM"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric shlevy]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/development/compilers/llvm/3.4/llvm.nix b/pkgs/development/compilers/llvm/3.4/llvm.nix index 52617acad43fd867c696fb5b9a391fd4316c9fa4..fbc881fc8e02638c06411f3423eb0f5737baa21c 100644 --- a/pkgs/development/compilers/llvm/3.4/llvm.nix +++ b/pkgs/development/compilers/llvm/3.4/llvm.nix @@ -15,7 +15,7 @@ }: let - src = fetch "llvm" "0fprxrilnlwk9qv7f0kplxc7kd8mp4x781asssv2nfi4r9pbna3x"; + src = fetch "llvm" "1mzgy7r0dma0npi1qrbr1s5n4nbj1ipxgbiw0q671l4s0r3qs0qp"; in stdenv.mkDerivation rec { name = "llvm-${version}"; diff --git a/pkgs/development/compilers/mercury/default.nix b/pkgs/development/compilers/mercury/default.nix index 5ea922a371a71e4099d1e460c799c792d677b141..21af582c594bffa0344e1666a976244f77dfb8f9 100644 --- a/pkgs/development/compilers/mercury/default.nix +++ b/pkgs/development/compilers/mercury/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; preConfigure = '' - ensureDir $out/lib/mercury/cgi-bin ; + mkdir -p $out/lib/mercury/cgi-bin ; configureFlags="--enable-deep-profiler=$out/lib/mercury/cgi-bin"; ''; diff --git a/pkgs/development/compilers/mit-scheme/default.nix b/pkgs/development/compilers/mit-scheme/default.nix index 29950aa9e3dde4f001da9e666d702e3cab0b9c13..c025fc8073bb7e0792fe1a7c19062f765c8a18a1 100644 --- a/pkgs/development/compilers/mit-scheme/default.nix +++ b/pkgs/development/compilers/mit-scheme/default.nix @@ -78,12 +78,14 @@ stdenv.mkDerivation { homepage = http://www.gnu.org/software/mit-scheme/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; # Build fails on Cygwin and Darwin: # . platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.freebsd; + + broken = true; }; } diff --git a/pkgs/development/compilers/ocaml/3.11.2.nix b/pkgs/development/compilers/ocaml/3.11.2.nix index cffd7c3f54a4fa83216a3d4cc5cd4002b5d16ad3..64cf8a9f9f7b5cd9effc5ee0c2c6f8c9dc4229df 100644 --- a/pkgs/development/compilers/ocaml/3.11.2.nix +++ b/pkgs/development/compilers/ocaml/3.11.2.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { patch -p0 < ${./mips64.patch} ''; postBuild = '' - ensureDir $out/include + mkdir -p $out/include ln -sv $out/lib/ocaml/caml $out/include/caml ''; diff --git a/pkgs/development/compilers/opa/default.nix b/pkgs/development/compilers/opa/default.nix index 68413e3e25d1ece9775b7bdb4451006317ed9058..c25080229ffa4894fd18956b4474ac495cf8d8f9 100644 --- a/pkgs/development/compilers/opa/default.nix +++ b/pkgs/development/compilers/opa/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchurl, which, ocaml, perl, jdk , findlib, ocaml_ssl, openssl, cryptokit, camlzip, ulex , ocamlgraph, coreutils, zlib, ncurses, makeWrapper -, gcc, binutils, gnumake } : +, gcc, binutils, gnumake, nodejs, git } : stdenv.mkDerivation rec { pname = "opa"; - version = "962"; + version = "4308"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/MLstate/opalang/tarball/v${version}"; name = "opa-${version}.tar.gz"; - sha256 = "0g4kq2kxbld0iqlzb076b7g43d8fh4sfxam615z15mbk1jcvpf9l"; + sha256 = "1farii9474i14ack6bpqm1jihs6i8pvwky3a7q8v8pbnl4i6lb5g"; }; # Paths so the opa compiler code generation will use the same programs as were @@ -23,18 +23,27 @@ stdenv.mkDerivation rec { find . -type f -exec sed -i 's@/usr/bin/perl@${perl}/bin/perl@' {} \; ''; - patches = [ ./locate.patch ./libdir.patch ]; + patches = []; preConfigure = '' configureFlags="$configureFlags -prefix $out" + ( + cat ./compiler/buildinfos/buildInfos.ml.pre + ./compiler/buildinfos/generate_buildinfos.sh . --release --version ./compiler/buildinfos/version_major.txt + echo let opa_git_version = ${version} + echo 'let opa_git_sha = "xxxx"' + cat ./compiler/buildinfos/buildInfos.ml.post + )> ./compiler/buildinfos/buildInfos.ml ''; dontAddPrefix = true; - configureFlags = "-ocamlfind ${findlib}/bin/ocamlfind -openssl ${openssl}/lib"; + configureFlags = "-ocamlfind ${findlib}/bin/ocamlfind "; buildInputs = [ which ocaml perl jdk findlib ocaml_ssl openssl cryptokit camlzip ulex - ocamlgraph coreutils zlib ncurses makeWrapper gcc binutils gnumake ]; + ocamlgraph coreutils zlib ncurses makeWrapper gcc binutils gnumake + nodejs git + ]; postInstall = '' # Have compiler use same tools for code generation as used to build it. @@ -58,5 +67,14 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl3; maintainers = [ stdenv.lib.maintainers.kkallio ]; platforms = [ "x86_64-linux" ]; + # File "compiler/libqmlcompil/dbGen/schema_io.ml", line 199, characters 3-53: + # Error: Signature mismatch: + # ... + # The field `remove_edge_e' is required but not provided + # The field `remove_edge' is required but not provided + # The field `remove_vertex' is required but not provided + # Command exited with code 2. + # make: *** [node] Error 10 + broken = true; }; } diff --git a/pkgs/development/compilers/opencxx/default.nix b/pkgs/development/compilers/opencxx/default.nix deleted file mode 100644 index 54eda51353f920da111b2dbd8a54b48357345071..0000000000000000000000000000000000000000 --- a/pkgs/development/compilers/opencxx/default.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ stdenv, fetchurl, libtool, gcc, patches ? []}: - -stdenv.mkDerivation { - name = "opencxx-2.8"; - src = fetchurl { - url = mirror://sourceforge/opencxx/opencxx-2.8.tar.gz; - md5 = "0f71df82751fe8aba5122d6e0541c98a"; - }; - - buildInputs = [libtool]; - NIX_GCC = gcc; - - inherit patches; -} diff --git a/pkgs/development/compilers/opendylan/bin.nix b/pkgs/development/compilers/opendylan/bin.nix index bab8e66799b7a6566e7cf53f71458c8f4be7aced..19f8eab482cb00b164ef1db7e0dbb62116146004 100644 --- a/pkgs/development/compilers/opendylan/bin.nix +++ b/pkgs/development/compilers/opendylan/bin.nix @@ -36,6 +36,6 @@ stdenv.mkDerivation { meta = { homepage = http://opendylan.org; description = "Dylan is a multi-paradigm functional and object-oriented programming language."; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/development/compilers/opendylan/default.nix b/pkgs/development/compilers/opendylan/default.nix index b1ee1d000c4ccff22024a8be8dc416c4980ae7e4..e4bdcf7889bb755b5d18387ad8a948bb5c2e9869 100644 --- a/pkgs/development/compilers/opendylan/default.nix +++ b/pkgs/development/compilers/opendylan/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation { meta = { homepage = http://opendylan.org; description = "Dylan is a multi-paradigm functional and object-oriented programming language."; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/development/compilers/openjdk-darwin/default.nix b/pkgs/development/compilers/openjdk-darwin/default.nix index 68708726c8527c29a59406dcea7a05b83d2e3303..8d3cbef75d41f5a664f70f92fd95538d9d1dcc41 100644 --- a/pkgs/development/compilers/openjdk-darwin/default.nix +++ b/pkgs/development/compilers/openjdk-darwin/default.nix @@ -1,16 +1,18 @@ -{ stdenv, fetchurl, setJavaClassPath }: +{ stdenv, fetchurl, unzip, setJavaClassPath }: let jdk = stdenv.mkDerivation { - name = "openjdk6-b16-24_apr_2009-r1"; + name = "openjdk-7u60b30"; + # From https://github.com/alexkasko/openjdk-unofficial-builds src = fetchurl { - url = http://landonf.bikemonkey.org/static/soylatte/bsd-dist/openjdk6_darwin/openjdk6-b16-24_apr_2009-r1.tar.bz2; - sha256 = "14pbv6jjk95k7hbgiwyvjdjv8pccm7m8a130k0q7mjssf4qmpx1v"; + url = https://bitbucket.org/alexkasko/openjdk-unofficial-builds/downloads/openjdk-1.7.0-u60-unofficial-macosx-x86_64-bundle.zip; + sha256 = "af510a4d566712d82c17054bb39f91d98c69a85586e244c6123669a0bd4b7401"; }; + buildInputs = [ unzip ]; + installPhase = '' - mkdir -p $out - cp -vR * $out/ + mv */Contents/Home $out # jni.h expects jni_md.h to be in the header search path. ln -s $out/include/darwin/*_md.h $out/include/ diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix index 6fd7ad9d65b1502864ab1e2adfad3cc2a237ffa8..6a07c7af69e2f2d29e935769a5c3a6257686224a 100644 --- a/pkgs/development/compilers/openjdk/default.nix +++ b/pkgs/development/compilers/openjdk/default.nix @@ -165,7 +165,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://openjdk.java.net/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; description = "The open-source Java Development Kit"; maintainers = [ stdenv.lib.maintainers.eelco stdenv.lib.maintainers.shlevy ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix index 90a64ecd5217b0b840e3c897ee0916c21f0d6ddd..657d18070e966adf7662238a711c4824e04a2efb 100644 --- a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix +++ b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix @@ -180,6 +180,6 @@ let result = stdenv.mkDerivation rec { passthru.jre = result; # FIXME: use multiple outputs or return actual JRE package - meta.license = "unfree"; + meta.license = stdenv.lib.licenses.unfree; }; in result diff --git a/pkgs/development/compilers/oraclejdk/jdk6-linux.nix b/pkgs/development/compilers/oraclejdk/jdk6-linux.nix index 97ec6b56305c7442adc5644500fd7c3b68248cd3..9b384c5ae4608390160d9d0a589900b291ad9530 100644 --- a/pkgs/development/compilers/oraclejdk/jdk6-linux.nix +++ b/pkgs/development/compilers/oraclejdk/jdk6-linux.nix @@ -80,5 +80,5 @@ stdenv.mkDerivation { mozillaPlugin = if installjdk then "/jre/lib/${architecture}/plugins" else "/lib/${architecture}/plugins"; - meta.license = "unfree"; + meta.license = stdenv.lib.licenses.unfree; } diff --git a/pkgs/development/compilers/pakcs/default.nix b/pkgs/development/compilers/pakcs/default.nix index 60071a8f6fa9b28e87f7236960150ad4edd83b9c..f7c76d74aaeb61021ea3213222248c61e74d9d01 100644 --- a/pkgs/development/compilers/pakcs/default.nix +++ b/pkgs/development/compilers/pakcs/default.nix @@ -6,7 +6,7 @@ let fsrc = fetchurl { url = "http://www.informatik.uni-kiel.de/~pakcs/download/${fname}-src.tar.gz"; - sha256 = "0m9s6693svr57in8rhkvq9h2j0hiphki6jn0syzrzzs4ahb7i1gb"; + sha256 = "0f4rhaqss9vfinpdjchxq75g343hz322cv0admjnl4g5g568wk3x"; }; in @@ -54,13 +54,13 @@ stdenv.mkDerivation rec { export LC_ALL=en_US.UTF-8 # Set up link to cymake, which has been built already. - ensureDir bin/.local + mkdir -p bin/.local ln -s ${curryFront}/bin/cymake bin/.local/ ''; installPhase = '' # Prepare PAKCSHOME directory. - ensureDir $out/pakcs + mkdir -p $out/pakcs for d in bin curry2prolog currytools lib tools cpns include www examples docs ; do cp -r $d $out/pakcs ; done @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { (cd $out/pakcs/www ; make) # Install bin. - ensureDir $out/bin + mkdir -p $out/bin for b in makecurrycgi .makesavedstate pakcs parsecurry cleancurry \ addtypes cass currybrowse currycreatemake currydoc currytest \ dataToXml erd2curry ; do @@ -88,7 +88,7 @@ stdenv.mkDerivation rec { done # Place emacs lisp files in expected locations. - ensureDir $out/share/emacs/site-lisp/curry-pakcs + mkdir -p $out/share/emacs/site-lisp/curry-pakcs for e in "tools/emacs/"*.el ; do cp $e $out/share/emacs/site-lisp/curry-pakcs/ ; done @@ -118,5 +118,7 @@ stdenv.mkDerivation rec { maintainers = [ stdenv.lib.maintainers.kkallio ]; platforms = stdenv.lib.platforms.linux; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }; } diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rustc/0.11.nix similarity index 65% rename from pkgs/development/compilers/rust/default.nix rename to pkgs/development/compilers/rustc/0.11.nix index 2c27cf778a14116e8b6c0888db310a4a10289b37..1c3b09b0985a00902f0018350536e974d78873a2 100644 --- a/pkgs/development/compilers/rust/default.nix +++ b/pkgs/development/compilers/rustc/0.11.nix @@ -14,23 +14,25 @@ */ -with if stdenv.system == "i686-linux" then { - platform = "linux-i386"; - snapshot = "84339ea0f796ae468ef86797ef4587274bec19ea"; - target = "i686-unknown-linux-gnu"; -} else if stdenv.system == "x86_64-linux" then { - platform = "linux-x86_64"; - snapshot = "bd8a6bc1f28845b7f4b768f6bfa06e7fbdcfcaae"; - target = "x86_64-unknown-linux-gnu"; -} else if stdenv.system == "x86_64-darwin" then { - platform = "macos-x86_64"; - snapshot = "4a8c2e1b7634d73406bac32a1a97893ec3ed818d"; -} else {}; -let snapshotDate = "2014-06-21"; +with ((import ./common.nix) {inherit stdenv; version = "0.11.0"; }); + +let snapshot = if stdenv.system == "i686-linux" + then "84339ea0f796ae468ef86797ef4587274bec19ea" + else if stdenv.system == "x86_64-linux" + then "bd8a6bc1f28845b7f4b768f6bfa06e7fbdcfcaae" + else if stdenv.system == "i686-darwin" + then "3f25b2680efbab16ad074477a19d49dcce475977" + else if stdenv.system == "x86_64-darwin" + then "4a8c2e1b7634d73406bac32a1a97893ec3ed818d" + else abort "no-snapshot for platform ${stdenv.system}"; + snapshotDate = "2014-06-21"; snapshotRev = "db9af1d"; - snapshotName = "rust-stage0-${snapshotDate}-${snapshotRev}-${platform}-${snapshot}.tar.bz2"; in -stdenv.mkDerivation { - name = "rust-0.11.0"; + snapshotName = "rust-stage0-${snapshotDate}-${snapshotRev}-${platform}-${snapshot}.tar.bz2"; + +in stdenv.mkDerivation { + inherit name; + inherit version; + inherit meta; src = fetchurl { url = http://static.rust-lang.org/dist/rust-0.11.0.tar.gz; @@ -67,14 +69,4 @@ stdenv.mkDerivation { buildInputs = [ which file perl curl python27 makeWrapper ]; enableParallelBuilding = true; - - meta = with stdenv.lib; { - homepage = http://www.rust-lang.org/; - description = "A safe, concurrent, practical language"; - maintainers = with maintainers; [ madjar cstrahan ]; - license = map (builtins.getAttr "shortName") [ licenses.mit licenses.asl20 ]; - # platforms as per http://static.rust-lang.org/doc/master/tutorial.html#getting-started - platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; - }; } - diff --git a/pkgs/development/compilers/rustc/common.nix b/pkgs/development/compilers/rustc/common.nix new file mode 100644 index 0000000000000000000000000000000000000000..d766f22c6adb4dddd31dd60c5ec449237f7fc939 --- /dev/null +++ b/pkgs/development/compilers/rustc/common.nix @@ -0,0 +1,35 @@ +{stdenv, version}: + +{ + inherit version; + + platform = if stdenv.system == "i686-linux" + then "linux-i386" + else if stdenv.system == "x86_64-linux" + then "linux-x86_64" + else if stdenv.system == "i686-darwin" + then "macos-i386" + else if stdenv.system == "x86_64-darwin" + then "macos-x86_64" + else abort "no snapshot to boostrap for this platform (missing platform url suffix)"; + + target = if stdenv.system == "i686-linux" + then "i686-unknown-linux-gnu" + else if stdenv.system == "x86_64-linux" + then "x86_64-unknown-linux-gnu" + else if stdenv.system == "i686-darwin" + then "i686-apple-darwin" + else if stdenv.system == "x86_64-darwin" + then "x86_64-apple-darwin" + else abort "no snapshot to boostrap for this platform (missing target triple"; + + meta = with stdenv.lib; { + homepage = http://www.rust-lang.org/; + description = "A safe, concurrent, practical language"; + maintainers = with maintainers; [ madjar cstrahan ]; + license = map (builtins.getAttr "shortName") [ licenses.mit licenses.asl20 ]; + platforms = platforms.linux; + }; + + name = "rustc-${version}"; +} diff --git a/pkgs/development/compilers/rust/hardcode_paths.patch b/pkgs/development/compilers/rustc/hardcode_paths.patch similarity index 100% rename from pkgs/development/compilers/rust/hardcode_paths.patch rename to pkgs/development/compilers/rustc/hardcode_paths.patch diff --git a/pkgs/development/compilers/rustc/head.nix b/pkgs/development/compilers/rustc/head.nix new file mode 100644 index 0000000000000000000000000000000000000000..ad33906ae6e9ecb0bbc87d39abde4f791933eb15 --- /dev/null +++ b/pkgs/development/compilers/rustc/head.nix @@ -0,0 +1,73 @@ +{stdenv, fetchurl, fetchgit, which, file, perl, curl, python27, makeWrapper}: + +/* Rust's build process has a few quirks : + +- It requires some patched in llvm that haven't landed upstream, so it + compiles its own llvm. This might change in the future, so at some + point we may be able to switch to nix's llvm. + +- The Rust compiler is written is Rust, so it requires a bootstrap + compiler, which is downloaded during the build. To make the build + pure, we download it ourself before and put it where it is + expected. Once the language is stable (1.0) , we might want to + switch it to use nix's packaged rust compiler. + +*/ + +with ((import ./common.nix) {inherit stdenv; version = "0.12.0-pre-7a25cf3f3"; }); + +let snapshot = if stdenv.system == "i686-linux" + then "a5e1bb723020ac35173d49600e76b0935e257a6a" + else if stdenv.system == "x86_64-linux" + then "1a2407df17442d93d1c34c916269a345658045d7" + else if stdenv.system == "i686-darwin" + then "6648fa88e41ad7c0991a085366e36d56005873ca" + else if stdenv.system == "x86_64-darwin" + then "71b2d1dfd0abe1052908dc091e098ed22cf272c6" + else abort "no-snapshot for platform ${stdenv.system}"; + snapshotDate = "2014-07-17"; + snapshotRev = "9fc8394"; + snapshotName = "rust-stage0-${snapshotDate}-${snapshotRev}-${platform}-${snapshot}.tar.bz2"; + +in stdenv.mkDerivation { + inherit name; + inherit version; + inherit meta; + + src = fetchgit { + url = https://github.com/rust-lang/rust; + rev = "7a25cf3f30fa5fae2e868fa910ecc850f5e9ee65"; + sha256 = "1hx8vd4gn5plbdvr0zvdvqyw9x9r2vbmh112h2f5d2xxsf9p7rf1"; + }; + + # We need rust to build rust. If we don't provide it, configure will try to download it. + snapshot = stdenv.mkDerivation { + name = "rust-stage0"; + src = fetchurl { + url = "http://static.rust-lang.org/stage0-snapshots/${snapshotName}"; + sha1 = snapshot; + }; + dontStrip = true; + installPhase = '' + mkdir -p "$out" + cp -r bin "$out/bin" + '' + (if stdenv.isLinux then '' + patchelf --interpreter "${stdenv.glibc}/lib/${stdenv.gcc.dynamicLinker}" \ + --set-rpath "${stdenv.gcc.gcc}/lib/:${stdenv.gcc.gcc}/lib64/" \ + "$out/bin/rustc" + '' else ""); + }; + + configureFlags = [ "--enable-local-rust" "--local-rust-root=$snapshot" ]; + + # The compiler requires cc, so we patch the source to tell it where to find it + patches = [ ./hardcode_paths.patch ./local_stage0.patch ]; + postPatch = '' + substituteInPlace src/librustc/back/link.rs \ + --subst-var-by "ccPath" "${stdenv.gcc}/bin/cc" \ + --subst-var-by "arPath" "${stdenv.gcc.binutils}/bin/ar" + ''; + + buildInputs = [ which file perl curl python27 makeWrapper ]; + enableParallelBuilding = true; +} diff --git a/pkgs/development/compilers/rust/local_stage0.patch b/pkgs/development/compilers/rustc/local_stage0.patch similarity index 100% rename from pkgs/development/compilers/rust/local_stage0.patch rename to pkgs/development/compilers/rustc/local_stage0.patch diff --git a/pkgs/development/compilers/sbcl/bootstrap.nix b/pkgs/development/compilers/sbcl/bootstrap.nix index c3335ea6d22b15c9a09536bf75834cd9658e4cc7..015d7dd95da85dd70d698552d788b44753449161 100644 --- a/pkgs/development/compilers/sbcl/bootstrap.nix +++ b/pkgs/development/compilers/sbcl/bootstrap.nix @@ -15,9 +15,9 @@ stdenv.mkDerivation rec { }; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin cp -p src/runtime/sbcl $out/bin - ensureDir $out/share/sbcl + mkdir -p $out/share/sbcl cp -p output/sbcl.core $out/share/sbcl ''; diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index 579d5ec11eb9ccd3d860e12e738eb794d5dfc954..d3892d43d15e5d772490b31fb5ed730a08b5fb5c 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -5,11 +5,14 @@ stdenv.mkDerivation rec { version = "1.2.0"; src = fetchurl { - url = mirror://sourceforge/project/sbcl/sbcl/1.2.0/sbcl-1.2.0-source.tar.bz2; + url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2"; sha256 = "13k20sys1v4lvgis8cnbczww6zs93rw176vz07g4jx06418k53x2"; }; - buildInputs = [ sbclBootstrap ] ++ stdenv.lib.optional stdenv.isLinux clisp; + buildInputs = [ ] + ++ (stdenv.lib.optional stdenv.isDarwin sbclBootstrap) + ++ (stdenv.lib.optional stdenv.isLinux clisp) + ; patchPhase = '' echo '"${version}.nixos"' > version.lisp-expr @@ -48,7 +51,7 @@ stdenv.mkDerivation rec { preBuild = '' export INSTALL_ROOT=$out - ensureDir test-home + mkdir -p test-home export HOME=$PWD/test-home ''; @@ -70,5 +73,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.bsd3; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.all; + inherit version; + updateWalker = true; }; } diff --git a/pkgs/development/compilers/sbcl/default.upstream b/pkgs/development/compilers/sbcl/default.upstream deleted file mode 100644 index de69a2828c6136e58f3362b1239f8a8dadad6423..0000000000000000000000000000000000000000 --- a/pkgs/development/compilers/sbcl/default.upstream +++ /dev/null @@ -1,9 +0,0 @@ -name sbcl -target default.nix -url http://sf.net/projects/sbcl/files/sbcl/ -version_link '/sbcl/[0-9.]+/$' -link "source.tar.bz2" -version '.*/sbcl-([0-9.]+)-source.*' '\1' -redirect -process 'http://[a-z]+[.]dl[.]sourceforge[.]net/' 'mirror://sourceforge/' -process '[?].*' '' diff --git a/pkgs/development/compilers/smlnj/bootstrap.nix b/pkgs/development/compilers/smlnj/bootstrap.nix index 27fdf75cc25d74b578a6bba37e57a17c9d448cb8..39a1bbd0df35d5345f45ddf32e46ca5cde3272ce 100644 --- a/pkgs/development/compilers/smlnj/bootstrap.nix +++ b/pkgs/development/compilers/smlnj/bootstrap.nix @@ -22,10 +22,10 @@ stdenv.mkDerivation rec { ''; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin rsync -av bin/ $out/bin/ - ensureDir $out/lib + mkdir -p $out/lib rsync -av lib/ $out/lib/ ''; diff --git a/pkgs/development/compilers/stalin/default.nix b/pkgs/development/compilers/stalin/default.nix index b488308f5c4ea2a64d25df3f53014be375ffe24f..09045ee2c11e8c530f1becbc45955da5837cafc8 100644 --- a/pkgs/development/compilers/stalin/default.nix +++ b/pkgs/development/compilers/stalin/default.nix @@ -36,10 +36,10 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.ece.purdue.edu/~qobi/software.html; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; description = "Stalin, an optimizing Scheme compiler"; maintainers = [ ]; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice + platforms = ["i686-linux"]; # doesn't want to work on 64-bit platforms }; } diff --git a/pkgs/development/compilers/strategoxt/0.18.nix b/pkgs/development/compilers/strategoxt/0.18.nix index 7e58c561739f396f842671e2f59ecd42fd79d053..611586c5d9328ea2147049ddf946b14bc52de367 100644 --- a/pkgs/development/compilers/strategoxt/0.18.nix +++ b/pkgs/development/compilers/strategoxt/0.18.nix @@ -55,6 +55,7 @@ rec { meta = { homepage = http://strategoxt.org/; meta = "A language and toolset for program transformation"; + broken = true; }; }; @@ -104,6 +105,7 @@ rec { meta = { homepage = http://strategoxt.org/Stratego/TheDryad; meta = "A collection of tools for developing transformation systems for Java source and bytecode"; + broken = true; }; }; diff --git a/pkgs/development/compilers/tinycc/default.nix b/pkgs/development/compilers/tinycc/default.nix index 7ad7348925b5e1f6776bc510ddc377265da8501f..1e82e03f16c00582a191cd1c0c1304fd36414bca 100644 --- a/pkgs/development/compilers/tinycc/default.nix +++ b/pkgs/development/compilers/tinycc/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.tinycc.org/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; platforms = stdenv.lib.platforms.unix; maintainers = [ ]; diff --git a/pkgs/development/eclipse/ecj/default.nix b/pkgs/development/eclipse/ecj/default.nix index 786fcdba18a8bf6360a3a57d1ca0bd1af4c0a4c5..0f52e879863eef5451c0e00e2ac86e456c77bcae 100644 --- a/pkgs/development/eclipse/ecj/default.nix +++ b/pkgs/development/eclipse/ecj/default.nix @@ -54,6 +54,6 @@ stdenv.mkDerivation rec { # http://www.eclipse.org/legal/epl-v10.html (free software, copyleft) license = "EPLv1.0"; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; }; } diff --git a/pkgs/development/guile-modules/guile-cairo/default.nix b/pkgs/development/guile-modules/guile-cairo/default.nix index 6663e00c36ee769172e04603b205b8ee9a47470b..7617e5fb1cd95686eaf8a04e0bab8ca9e1a1a042 100644 --- a/pkgs/development/guile-modules/guile-cairo/default.nix +++ b/pkgs/development/guile-modules/guile-cairo/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { programming environment. ''; - license = "LGPLv3+"; + license = stdenv.lib.licenses.lgpl3Plus; homepage = http://home.gna.org/guile-cairo/; diff --git a/pkgs/development/guile-modules/guile-gnome/default.nix b/pkgs/development/guile-modules/guile-gnome/default.nix index 30480844a41464819116645aec28e89ba4920f2d..90012bb3ddd43b004ca1388a508545f123563f0c 100644 --- a/pkgs/development/guile-modules/guile-gnome/default.nix +++ b/pkgs/development/guile-modules/guile-gnome/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/guile-gnome/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; }; diff --git a/pkgs/development/guile-modules/guile-lib/default.nix b/pkgs/development/guile-modules/guile-lib/default.nix index 310c0e923805dd78d58a4664c2f1d85d273e3be9..2f77c273af7d619b3845f2fea2b68962801f420e 100644 --- a/pkgs/development/guile-modules/guile-lib/default.nix +++ b/pkgs/development/guile-modules/guile-lib/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.nongnu.org/guile-lib/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; platforms = stdenv.lib.platforms.gnu; # arbitrary choice diff --git a/pkgs/development/guile-modules/guile-ncurses/default.nix b/pkgs/development/guile-modules/guile-ncurses/default.nix index 1eca6b3a30256fe1f95169dd83e04b300e8bd610..175c656859e5a0a2bc0125e2ef7f5fb97d3c1035 100644 --- a/pkgs/development/guile-modules/guile-ncurses/default.nix +++ b/pkgs/development/guile-modules/guile-ncurses/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { form, panel, and menu. ''; - license = "LGPLv3+"; + license = stdenv.lib.licenses.lgpl3Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; platforms = stdenv.lib.platforms.gnu; # arbitrary choice diff --git a/pkgs/development/interpreters/angelscript/default.nix b/pkgs/development/interpreters/angelscript/default.nix index 871101ba03e019389fdedfdcd3da93fc14e91eb4..1167f121e624a0920797702c753d6e7143a9026a 100644 --- a/pkgs/development/interpreters/angelscript/default.nix +++ b/pkgs/development/interpreters/angelscript/default.nix @@ -11,10 +11,10 @@ let (builtins.attrNames (builtins.removeAttrs x helperArgNames)); sourceInfo = rec { baseName="angelscript"; - version = "2.29.0"; + version = "2.29.1"; name="${baseName}-${version}"; url="http://www.angelcode.com/angelscript/sdk/files/angelscript_${version}.zip"; - sha256 = "1g0bi8dx832s3911rr3jymnffaz3q7cnbzl53nmi6hwsr2kpc6mx"; + sha256 = "081a0wnn1hl0hjgrg0nz63ff7k7dgrwsgszka5i7623ny407fkl5"; }; in rec { diff --git a/pkgs/development/interpreters/erlang/R14.nix b/pkgs/development/interpreters/erlang/R14.nix index 4dd32cd806c39edf9238a216ce76566e26041a16..1fd101564a3b7c5208f81808781d85f69b897297 100644 --- a/pkgs/development/interpreters/erlang/R14.nix +++ b/pkgs/development/interpreters/erlang/R14.nix @@ -22,6 +22,20 @@ stdenv.mkDerivation { configureFlags = "--with-ssl=${openssl}"; + postInstall = let + manpages = fetchurl { + url = "http://www.erlang.org/download/otp_doc_man_R${version}.tar.gz"; + sha256 = "1nh7l7wilyyaxvlwkjxgm3cq7wpd90sk6vxhgpvg7hwai8g52545"; + }; + in '' + tar xf "${manpages}" -C "$out/lib/erlang" + for i in "$out"/lib/erlang/man/man[0-9]/*.[0-9]; do + prefix="''${i%/*}" + ensureDir "$out/share/man/''${prefix##*/}" + ln -s "$i" "$out/share/man/''${prefix##*/}/''${i##*/}erl" + done + ''; + # Some erlang bin/ scripts run sed and awk postFixup = '' wrapProgram $out/lib/erlang/bin/erl --prefix PATH ":" "${gnused}/bin/" diff --git a/pkgs/development/interpreters/erlang/R15.nix b/pkgs/development/interpreters/erlang/R15.nix index e0760db9f58b30571fd37cd730fa86046cab3110..e9c8380c35aec72b4357bf76e90cff66c284a2d5 100644 --- a/pkgs/development/interpreters/erlang/R15.nix +++ b/pkgs/development/interpreters/erlang/R15.nix @@ -28,6 +28,20 @@ stdenv.mkDerivation { configureFlags = "--with-ssl=${openssl}"; + postInstall = let + manpages = fetchurl { + url = "http://www.erlang.org/download/otp_doc_man_R${version}.tar.gz"; + sha256 = "0sqamzbd7qyz3klgl9vm1qvl0rhsfd1dx485pb0m2185qvw02nha"; + }; + in '' + tar xf "${manpages}" -C "$out/lib/erlang" + for i in "$out"/lib/erlang/man/man[0-9]/*.[0-9]; do + prefix="''${i%/*}" + ensureDir "$out/share/man/''${prefix##*/}" + ln -s "$i" "$out/share/man/''${prefix##*/}/''${i##*/}erl" + done + ''; + # Some erlang bin/ scripts run sed and awk postFixup = '' wrapProgram $out/lib/erlang/bin/erl --prefix PATH ":" "${gnused}/bin/" diff --git a/pkgs/development/interpreters/erlang/R16.nix b/pkgs/development/interpreters/erlang/R16.nix index eaf991ff5637fd637ad7524725ab352037f7bb7d..5945cdd8299dfcf06d3b52cc33c0f30423d2b610 100644 --- a/pkgs/development/interpreters/erlang/R16.nix +++ b/pkgs/development/interpreters/erlang/R16.nix @@ -8,10 +8,10 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "erlang-" + version; - version = "R16B03-1"; + version = "16B03-1"; src = fetchurl { - url = "http://www.erlang.org/download/otp_src_${version}.tar.gz"; + url = "http://www.erlang.org/download/otp_src_R${version}.tar.gz"; sha256 = "1rvyfh22g1fir1i4xn7v2md868wcmhajwhfsq97v7kn5kd2m7khp"; }; @@ -28,8 +28,19 @@ stdenv.mkDerivation rec { configureFlags= "--with-ssl=${openssl} ${optionalString stdenv.isDarwin "--enable-darwin-64bit"}"; - postInstall = '' + postInstall = let + manpages = fetchurl { + url = "http://www.erlang.org/download/otp_doc_man_R${version}.tar.gz"; + sha256 = "17f3k5j17rdsah18gywjngip6cbfgp6nb9di6il4pahmf9yvqc8g"; + }; + in '' ln -s $out/lib/erlang/lib/erl_interface*/bin/erl_call $out/bin/erl_call + tar xf "${manpages}" -C "$out/lib/erlang" + for i in "$out"/lib/erlang/man/man[0-9]/*.[0-9]; do + prefix="''${i%/*}" + ensureDir "$out/share/man/''${prefix##*/}" + ln -s "$i" "$out/share/man/''${prefix##*/}/''${i##*/}erl" + done ''; # Some erlang bin/ scripts run sed and awk diff --git a/pkgs/development/interpreters/erlang/R17.nix b/pkgs/development/interpreters/erlang/R17.nix index 5c59fddc1efc284312b07036fdcb5fa40e987ece..2aba55d36792b883c044af5a16ebd290afcb26dd 100644 --- a/pkgs/development/interpreters/erlang/R17.nix +++ b/pkgs/development/interpreters/erlang/R17.nix @@ -8,11 +8,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "erlang-" + version; - version = "17.0"; + version = "17.1"; src = fetchurl { url = "http://www.erlang.org/download/otp_src_${version}.tar.gz"; - sha256 = "1nyaka6238vh4kdgaynmg8hm5y5zj7hhyl1c971d2pjylsm2nzr9"; + sha256 = "0mn3p5rwvjfsxjnn1vrm0lxdq40wq9bmd9nibl6hqbfcnnrga1mq"; }; buildInputs = @@ -28,8 +28,19 @@ stdenv.mkDerivation rec { configureFlags= "--with-ssl=${openssl} ${optionalString stdenv.isDarwin "--enable-darwin-64bit"}"; - postInstall = '' + postInstall = let + manpages = fetchurl { + url = "http://www.erlang.org/download/otp_doc_man_${version}.tar.gz"; + sha256 = "1aza6hxhh7ag2frsa0hg6il6ancjrbazvgz7jc2p7qrmy5vh48sa"; + }; + in '' ln -s $out/lib/erlang/lib/erl_interface*/bin/erl_call $out/bin/erl_call + tar xf "${manpages}" -C "$out/lib/erlang" + for i in "$out"/lib/erlang/man/man[0-9]/*.[0-9]; do + prefix="''${i%/*}" + ensureDir "$out/share/man/''${prefix##*/}" + ln -s "$i" "$out/share/man/''${prefix##*/}/''${i##*/}erl" + done ''; # Some erlang bin/ scripts run sed and awk diff --git a/pkgs/development/interpreters/groovy/default.nix b/pkgs/development/interpreters/groovy/default.nix index 593cc61dc41073d63cf637b8b88fb98303b5a483..fdfb5d8ca30c8a2600690a66dce1375d00a9e7ee 100644 --- a/pkgs/development/interpreters/groovy/default.nix +++ b/pkgs/development/interpreters/groovy/default.nix @@ -3,11 +3,12 @@ # at runtime, need jdk stdenv.mkDerivation rec { - name = "groovy-1.7.1"; + name = "groovy-${version}"; + version = "2.3.6"; src = fetchurl { - url = "http://dist.groovy.codehaus.org/distributions/groovy-binary-1.7.1.zip"; - sha256 = "0a204f6835f07e6a079bd4761e70cd5e0c31ebc0c9eb293fda11dfb2d8bf137c"; + url = "http://dl.bintray.com/groovy/maven/groovy-binary-${version}.zip"; + sha256 = "0yvk6x1f68avl52zzwx9p3faiqr98rfps70vql05j6kd7syyp0ah"; }; installPhase = '' @@ -20,8 +21,10 @@ stdenv.mkDerivation rec { buildInputs = [ unzip ]; - meta = { + meta = with stdenv.lib; { description = "An agile dynamic language for the Java Platform"; homepage = http://groovy.codehaus.org/; + license = licenses.asl20; + maintainers = with maintainers; [ pSub ]; }; } diff --git a/pkgs/development/interpreters/guile/1.8.nix b/pkgs/development/interpreters/guile/1.8.nix index f44f71020b4c7ba12eb8138b035282504f6880e1..55f1b1840fa0aef4fd723130edfc0383c7db2b7a 100644 --- a/pkgs/development/interpreters/guile/1.8.nix +++ b/pkgs/development/interpreters/guile/1.8.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.gnu.org/software/guile/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; }; diff --git a/pkgs/development/interpreters/love/0.9.nix b/pkgs/development/interpreters/love/0.9.nix index 38fdcd2a0a6c78f008b607b03bb0e09d3a205653..f08d1d2ec7e087385c8b10a06538929e89d42886 100644 --- a/pkgs/development/interpreters/love/0.9.nix +++ b/pkgs/development/interpreters/love/0.9.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://love2d.org"; description = "A Lua-based 2D game engine/scripting language"; - license = "zlib"; + license = stdenv.lib.licenses.zlib; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.raskin ]; diff --git a/pkgs/development/interpreters/love/default.nix b/pkgs/development/interpreters/love/default.nix index 8e7914afb6169e8777b5d04486cc299ec5adf3e0..fc1f01cb3730c65a7cf62d151a9f04ccf3346786 100644 --- a/pkgs/development/interpreters/love/default.nix +++ b/pkgs/development/interpreters/love/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://love2d.org"; description = "A Lua-based 2D game engine/scripting language"; - license = "zlib"; + license = stdenv.lib.licenses.zlib; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.raskin ]; diff --git a/pkgs/development/interpreters/lua-4/default.nix b/pkgs/development/interpreters/lua-4/default.nix index 13f7964769cae254fcf1912c99cc4937cb7597a6..835b71f38bf68345b3536a4ec1b0f8b2e1208c5d 100644 --- a/pkgs/development/interpreters/lua-4/default.nix +++ b/pkgs/development/interpreters/lua-4/default.nix @@ -23,8 +23,7 @@ stdenv.mkDerivation { management with incremental garbage collection, making it ideal for configuration, scripting, and rapid prototyping. ''; - license = "MIT"; - platforms = stdenv.lib.platforms.unix; - maintainers = [ ]; + license = stdenv.lib.licenses.mit; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/interpreters/lua-5/5.0.3.nix b/pkgs/development/interpreters/lua-5/5.0.3.nix index eae2d82d5d0ab646de7f5c703feaa684c6fe66da..8a1d35a6c0782825418f8b2ea7908648d0c2105b 100644 --- a/pkgs/development/interpreters/lua-5/5.0.3.nix +++ b/pkgs/development/interpreters/lua-5/5.0.3.nix @@ -24,8 +24,6 @@ stdenv.mkDerivation { management with incremental garbage collection, making it ideal for configuration, scripting, and rapid prototyping. ''; - license = "MIT"; - platforms = stdenv.lib.platforms.unix; - maintainers = [ ]; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/development/interpreters/lua-5/5.1.nix b/pkgs/development/interpreters/lua-5/5.1.nix index 303ea1d74711267daab52da0099a83567ff1e726..1b05cb8f778004fd187654e0760ec757bd4921f1 100644 --- a/pkgs/development/interpreters/lua-5/5.1.nix +++ b/pkgs/development/interpreters/lua-5/5.1.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, readline, makeWrapper }: +{ stdenv, fetchurl, readline }: let dsoPatch = fetchurl { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sha256 = "2640fc56a795f29d28ef15e13c34a47e223960b0240e8cb0a82d9b0738695333"; }; - buildInputs = [ readline makeWrapper ]; + buildInputs = [ readline ]; patches = if stdenv.isDarwin then [ ./5.1.darwin.patch ] else [ dsoPatch ]; @@ -35,9 +35,6 @@ stdenv.mkDerivation rec { sed <"etc/lua.pc" >"$out/lib/pkgconfig/lua.pc" -e "s|^prefix=.*|prefix=$out|" mv "doc/"*.{gif,png,css,html} "$out/share/doc/lua/" rmdir $out/{share,lib}/lua/5.1 $out/{share,lib}/lua - wrapProgram $out/bin/lua \ - --set LUA_PATH '"$HOME/.nix-profile/lib/lua/5.1/?.lua;$HOME/.nix-profile/share/lua/5.1/?.lua"' \ - --set LUA_CPATH '"$HOME/.nix-profile/lib/lua/5.1/?.so;$HOME/.nix-profile/share/lua/5.1/?.so"' ''; meta = { @@ -51,8 +48,8 @@ stdenv.mkDerivation rec { management with incremental garbage collection, making it ideal for configuration, scripting, and rapid prototyping. ''; - license = "MIT"; - platforms = stdenv.lib.platforms.unix; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.simons ]; }; } diff --git a/pkgs/development/interpreters/lua-5/5.2.nix b/pkgs/development/interpreters/lua-5/5.2.nix index 3bcc85fb43427fae00faca2c76a6000ed0fb5509..ea44adb462c19d02fa6757e6dab958963b1b033a 100644 --- a/pkgs/development/interpreters/lua-5/5.2.nix +++ b/pkgs/development/interpreters/lua-5/5.2.nix @@ -96,8 +96,8 @@ stdenv.mkDerivation rec { management with incremental garbage collection, making it ideal for configuration, scripting, and rapid prototyping. ''; - license = "MIT"; - platforms = stdenv.lib.platforms.unix; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.simons ]; }; } diff --git a/pkgs/development/interpreters/lua-5/expat.nix b/pkgs/development/interpreters/lua-5/expat.nix index a2b42cb37c5313c04024a6df88e7544189d649b6..0dbbaf8a16143b5c3b50434de85adb02fc64c564 100644 --- a/pkgs/development/interpreters/lua-5/expat.nix +++ b/pkgs/development/interpreters/lua-5/expat.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://matthewwild.co.uk/projects/luaexpat"; - platforms = stdenv.lib.platforms.linux; + hydraPlatforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.flosse ]; }; } diff --git a/pkgs/development/interpreters/lua-5/filesystem.nix b/pkgs/development/interpreters/lua-5/filesystem.nix index a5da2c5ddd02ad81ca1a8cf2fdff8612ca3a68f7..0df5a6d37212789bf13732a3c5f924c9706c9671 100644 --- a/pkgs/development/interpreters/lua-5/filesystem.nix +++ b/pkgs/development/interpreters/lua-5/filesystem.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/keplerproject/luafilesystem"; - platforms = stdenv.lib.platforms.linux; + hydraPlatforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.flosse ]; }; } diff --git a/pkgs/development/interpreters/lua-5/sec.nix b/pkgs/development/interpreters/lua-5/sec.nix index 97e9f51ac1bfd0a4033a380a1e4df8b10a6d6b8b..33def9c51fd4af0710ff6b38d412e3404e7cf9f4 100644 --- a/pkgs/development/interpreters/lua-5/sec.nix +++ b/pkgs/development/interpreters/lua-5/sec.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/brunoos/luasec"; - platforms = stdenv.lib.platforms.linux; + hydraPlatforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.flosse ]; }; } diff --git a/pkgs/development/interpreters/lua-5/sockets.nix b/pkgs/development/interpreters/lua-5/sockets.nix index a3f9adb0901728c909906bf7bad1c4513e143ffb..9c6cea38170e47f4ebe9672c4f4adec8ba2119fa 100644 --- a/pkgs/development/interpreters/lua-5/sockets.nix +++ b/pkgs/development/interpreters/lua-5/sockets.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://w3.impa.br/~diego/software/luasocket/"; - platforms = stdenv.lib.platforms.linux; + hydraPlatforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.mornfall ]; }; } diff --git a/pkgs/development/interpreters/maude/default.nix b/pkgs/development/interpreters/maude/default.nix index 65badeae1dde59f604abfc8aa2d4d0d7ea44d6e8..e112a5ae43d4d69ee588cdcaf81bdc7f71c0f360 100644 --- a/pkgs/development/interpreters/maude/default.nix +++ b/pkgs/development/interpreters/maude/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://maude.cs.uiuc.edu/"; description = "Maude -- a high-level specification language"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; longDescription = '' Maude is a high-performance reflective language and system diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix index eb7e925561c8cc902f5dc4f4ed59d40c942358e4..1addccb4bf887e0be5bd45544ce8dde60ae35617 100644 --- a/pkgs/development/interpreters/octave/default.nix +++ b/pkgs/development/interpreters/octave/default.nix @@ -6,13 +6,13 @@ fftw, fftwSinglePrec, zlib, curl, qrupdate }: let - version = "3.8.0"; + version = "3.8.1"; in stdenv.mkDerivation rec { name = "octave-${version}"; src = fetchurl { url = "mirror://gnu/octave/${name}.tar.bz2"; - sha256 = "1yclb8p4mcx9xcjajyynxfnc5spw90lp44d84v56ksrlvp3314si"; + sha256 = "1gcvzbgyz98mxzy3gjkdbdiirafkl73l9ywml11j412amp92wxnn"; }; buildInputs = [ gfortran readline ncurses perl flex texinfo qhull libX11 @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://octave.org/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [viric raskin]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/development/interpreters/octave/hg.nix b/pkgs/development/interpreters/octave/hg.nix index f44efb943587642bcbd933e1224cbc7b9b05e92f..797fff584f6a40d9e120fd6905b5b9b6186052d7 100644 --- a/pkgs/development/interpreters/octave/hg.nix +++ b/pkgs/development/interpreters/octave/hg.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation ({ meta = { description = "High-level interactive language for numerical computations"; homepage = http://www.octave.org; - license = "GPL-3"; + license = stdenv.lib.licenses.gpl3; }; } // ( if config.octave.devVersion or false then { diff --git a/pkgs/development/interpreters/perl/5.16/default.nix b/pkgs/development/interpreters/perl/5.16/default.nix index bbd9e003b2c79fd8c2689a3b38391f412257880d..600884db5e67d5fd7b3a3be09ac22f752a1c28e9 100644 --- a/pkgs/development/interpreters/perl/5.16/default.nix +++ b/pkgs/development/interpreters/perl/5.16/default.nix @@ -64,29 +64,5 @@ stdenv.mkDerivation rec { setupHook = ./setup-hook.sh; - doCheck = !stdenv.isDarwin; - - # some network-related tests don't work, mostly probably due to our sandboxing - testsToSkip = '' - lib/Net/hostent.t \ - dist/IO/t/{io_multihomed.t,io_sock.t} \ - dist/Net-Ping/t/*.t \ - cpan/autodie/t/truncate.t \ - t/porting/{maintainers.t,regen.t} \ - cpan/Socket/t/get{name,addr}info.t \ - '' + optionalString stdenv.isFreeBSD '' - cpan/CPANPLUS/t/04_CPANPLUS-Module.t \ - cpan/CPANPLUS/t/20_CPANPLUS-Dist-MM.t \ - '' + " "; - - postPatch = optionalString (!stdenv.isDarwin) /* this failed on Darwin, no idea why */ '' - for test in ${testsToSkip}; do - echo "Removing test" $test - rm "$test" - pat=`echo "$test" | sed 's,/,\\\\/,g'` # just escape slashes - sed "/^$pat/d" -i MANIFEST - done - ''; - passthru.libPrefix = "lib/perl5/site_perl"; } diff --git a/pkgs/development/interpreters/php/5.3-freetype-dirs.patch b/pkgs/development/interpreters/php/5.3-freetype-dirs.patch new file mode 100644 index 0000000000000000000000000000000000000000..3b78f9b309bbcb1a4c326f65a0b4192609f8fcd6 --- /dev/null +++ b/pkgs/development/interpreters/php/5.3-freetype-dirs.patch @@ -0,0 +1,64 @@ +From a0955f351c7eb1022da7ae36970ffef3b00c8aff Mon Sep 17 00:00:00 2001 +From: Adam Harvey +Date: Sat, 7 Dec 2013 19:39:40 -0800 +Subject: [PATCH] Switch to using freetype-config for freetype detection. + +This fixes GD compilation against libfreetype 2.5.1 and later after they made +the rather interesting decision to change their include directory layout in a +point release. + +The original suggestion in the bug was to use pkg-config, but my inclination is +to use freetype-config instead: we should be able to get the same configuration +information without actually needing pkg-config installed, since pkg-config is +by no means guaranteed to exist on many Unices and distros, whereas +freetype-config should always be present if a libfreetype build environment is +installed. Let's try it out and see what happens. + +Fixes bug #64405 (Use freetype-config for determining freetype2 dir(s)). + +diff --git a/ext/gd/config.m4 b/ext/gd/config.m4 +index 0e35ece..732e14c 100644 +--- a/ext/gd/config.m4 ++++ b/ext/gd/config.m4 +@@ -193,30 +193,25 @@ AC_DEFUN([PHP_GD_FREETYPE2],[ + if test "$PHP_FREETYPE_DIR" != "no"; then + + for i in $PHP_FREETYPE_DIR /usr/local /usr; do +- if test -f "$i/include/freetype2/freetype/freetype.h"; then ++ if test -f "$i/bin/freetype-config"; then + FREETYPE2_DIR=$i +- FREETYPE2_INC_DIR=$i/include/freetype2 ++ FREETYPE2_CONFIG="$i/bin/freetype-config" + break + fi + done + + if test -z "$FREETYPE2_DIR"; then +- AC_MSG_ERROR([freetype.h not found.]) ++ AC_MSG_ERROR([freetype-config not found.]) + fi + +- PHP_CHECK_LIBRARY(freetype, FT_New_Face, +- [ +- PHP_ADD_LIBRARY_WITH_PATH(freetype, $FREETYPE2_DIR/$PHP_LIBDIR, GD_SHARED_LIBADD) +- PHP_ADD_INCLUDE($FREETYPE2_DIR/include) +- PHP_ADD_INCLUDE($FREETYPE2_INC_DIR) +- AC_DEFINE(USE_GD_IMGSTRTTF, 1, [ ]) +- AC_DEFINE(HAVE_LIBFREETYPE,1,[ ]) +- AC_DEFINE(ENABLE_GD_TTF,1,[ ]) +- ],[ +- AC_MSG_ERROR([Problem with freetype.(a|so). Please check config.log for more information.]) +- ],[ +- -L$FREETYPE2_DIR/$PHP_LIBDIR +- ]) ++ FREETYPE2_CFLAGS=`$FREETYPE2_CONFIG --cflags` ++ FREETYPE2_LIBS=`$FREETYPE2_CONFIG --libs` ++ ++ PHP_EVAL_INCLINE($FREETYPE2_CFLAGS) ++ PHP_EVAL_LIBLINE($FREETYPE2_LIBS, GD_SHARED_LIBADD) ++ AC_DEFINE(USE_GD_IMGSTRTTF, 1, [ ]) ++ AC_DEFINE(HAVE_LIBFREETYPE,1,[ ]) ++ AC_DEFINE(ENABLE_GD_TTF,1,[ ]) + else + AC_MSG_RESULT([If configure fails try --with-freetype-dir=]) + fi diff --git a/pkgs/development/interpreters/php/5.3.nix b/pkgs/development/interpreters/php/5.3.nix index 86782117097485d4800dbf9e14b604a7cea01bb4..ed5feeacf613bc8140049be01c68ebac095250fc 100644 --- a/pkgs/development/interpreters/php/5.3.nix +++ b/pkgs/development/interpreters/php/5.3.nix @@ -104,7 +104,6 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) gd = { configureFlags = [ "--with-gd=${gd}" - "--with-freetype-dir=${freetype}" "--with-png-dir=${libpng}" "--with-jpeg-dir=${libjpeg}" ]; @@ -241,6 +240,6 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) platforms = stdenv.lib.platforms.unix; }; - patches = [./fix.patch]; + patches = [ ./fix.patch ./5.3-freetype-dirs.patch ]; }) diff --git a/pkgs/development/interpreters/php/5.4.nix b/pkgs/development/interpreters/php/5.4.nix index c194c3aa8a07c456aeff6e5b8864e91801104024..bc5320ff77c0c3363d04350d05356d327243b23d 100644 --- a/pkgs/development/interpreters/php/5.4.nix +++ b/pkgs/development/interpreters/php/5.4.nix @@ -9,7 +9,7 @@ in composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in { - version = "5.4.30"; + version = "5.4.31"; name = "php-${version}"; @@ -243,7 +243,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) src = fetchurl { url = "http://www.php.net/distributions/php-${version}.tar.bz2"; - sha256 = "1rkc977b4k0y6qg5nf8729g5zpica31h1isyds6khmrdwi23df1j"; + sha256 = "0kci0yir923fc7dv7j9qrc10pj05v82jnxjxjbgrj7gx64a4k3jy"; }; meta = { diff --git a/pkgs/development/interpreters/python/2.6/default.nix b/pkgs/development/interpreters/python/2.6/default.nix index 940b667e86a88532c9c0219722d2da89439cc368..64e21b7556911783986538593bf0fc942b21407a 100644 --- a/pkgs/development/interpreters/python/2.6/default.nix +++ b/pkgs/development/interpreters/python/2.6/default.nix @@ -30,7 +30,7 @@ let buildInputs = optional (stdenv ? gcc && stdenv.gcc.libc != null) stdenv.gcc.libc ++ - [ bzip2 ] + [ bzip2 openssl ] ++ optional zlibSupport zlib; @@ -178,10 +178,7 @@ let deps = [ sqlite ]; }; - ssl = buildInternalPythonModule { - moduleName = "ssl"; - deps = [ openssl ]; - }; + ssl = null; tkinter = buildInternalPythonModule { moduleName = "tkinter"; diff --git a/pkgs/development/interpreters/renpy/default.nix b/pkgs/development/interpreters/renpy/default.nix index ccaa45c6c338b2dfcbb0cba19dd59248d9be1a96..4b5f3bd8b3bd732d3a49756f09820896300f19f7 100644 --- a/pkgs/development/interpreters/renpy/default.nix +++ b/pkgs/development/interpreters/renpy/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { meta = { description = "Ren'Py Visual Novel Engine"; homepage = "http://renpy.org/"; - license = "MIT"; + license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ iyzsong ]; }; diff --git a/pkgs/development/interpreters/supercollider/default.nix b/pkgs/development/interpreters/supercollider/default.nix index 97808f6faf131d57b05db9fdf2797cc17ed19688..a8c967b596786301b01a452f7f70d36789f08e16 100644 --- a/pkgs/development/interpreters/supercollider/default.nix +++ b/pkgs/development/interpreters/supercollider/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, pkgconfig -, jackaudio, libsndfile, fftw, curl +, jack2, libsndfile, fftw, curl , libXt, qt, readline , useSCEL ? false, emacs }: @@ -35,6 +35,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ - jackaudio libsndfile fftw curl libXt qt readline ] + jack2 libsndfile fftw curl libXt qt readline ] ++ optional useSCEL emacs; } diff --git a/pkgs/development/interpreters/xulrunner/default.nix b/pkgs/development/interpreters/xulrunner/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..47dea40eba22c3e491a35037c1bd04e5bc18baf2 --- /dev/null +++ b/pkgs/development/interpreters/xulrunner/default.nix @@ -0,0 +1,82 @@ +{ lib, stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL +, libjpeg, zlib, dbus, dbus_glib, bzip2, xlibs +, freetype, fontconfig, file, alsaLib, nspr, nss, libnotify +, yasm, mesa, sqlite, unzip, makeWrapper, pysqlite +, hunspell, libevent, libstartup_notification, libvpx +, cairo, gstreamer, gst_plugins_base, icu +, debugBuild ? false +}: + +assert stdenv.gcc ? libc && stdenv.gcc.libc != null; + +let version = "31.0"; in + +stdenv.mkDerivation rec { + name = "xulrunner-${version}"; + + src = fetchurl { + url = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${version}/source/firefox-${version}.source.tar.bz2"; + sha1 = "a6c3e25ee3aeb7da42db2aaeb50a385d63532beb"; + }; + + buildInputs = + [ pkgconfig gtk perl zip libIDL libjpeg zlib bzip2 + python dbus dbus_glib pango freetype fontconfig xlibs.libXi + xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file + alsaLib nspr nss libnotify xlibs.pixman yasm mesa + xlibs.libXScrnSaver xlibs.scrnsaverproto pysqlite + xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper + hunspell libevent libstartup_notification libvpx cairo + gstreamer gst_plugins_base icu + ]; + + configureFlags = + [ "--enable-application=xulrunner" + "--disable-javaxpcom" + "--with-system-jpeg" + "--with-system-zlib" + "--with-system-bz2" + "--with-system-nspr" + "--with-system-nss" + "--with-system-libevent" + "--with-system-libvpx" + # "--with-system-png" # needs APNG support + # "--with-system-icu" # causes ‘ar: invalid option -- 'L'’ in Firefox 28.0 + "--enable-system-ffi" + "--enable-system-hunspell" + "--enable-system-pixman" + "--enable-system-sqlite" + "--enable-system-cairo" + "--enable-gstreamer" + "--enable-startup-notification" + # "--enable-content-sandbox" # available since 26.0, but not much info available + # "--enable-content-sandbox-reporter" # keeping disabled for now + "--disable-crashreporter" + "--disable-tests" + "--disable-necko-wifi" # maybe we want to enable this at some point + "--disable-installer" + "--disable-updater" + "--disable-pulseaudio" + ] + ++ (if debugBuild then [ "--enable-debug" "--enable-profiling"] + else [ "--disable-debug" "--enable-release" + "--enable-optimize" "--enable-strip" ]); + + enableParallelBuilding = true; + + preConfigure = + '' + mkdir ../objdir + cd ../objdir + configureScript=../mozilla-release/configure + ''; + + meta = { + description = "Mozilla Firefox XUL runner"; + homepage = http://www.mozilla.com/en-US/firefox/; + maintainers = [ lib.maintainers.eelco ]; + platforms = lib.platforms.linux; + }; + + passthru = { inherit gtk version; }; +} diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix index 110bfc01520feeed3d4b280fb7d8b508d1116b5e..3f1fbfcd6a9cec9da88a5e1fdc76c418fa8a6f8c 100644 --- a/pkgs/development/libraries/SDL/default.nix +++ b/pkgs/development/libraries/SDL/default.nix @@ -72,6 +72,6 @@ stdenv.mkDerivation rec { description = "A cross-platform multimedia library"; homepage = http://www.libsdl.org/; maintainers = with maintainers; [ lovek323 ]; - platforms = platforms.unix; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/SDL2_gfx/default.nix b/pkgs/development/libraries/SDL2_gfx/default.nix index 693b7bf8fe19893c2fd13fde7bc066ac54b691cf..bc4b1a778fc24bb3fac607975d34a278f5def73e 100644 --- a/pkgs/development/libraries/SDL2_gfx/default.nix +++ b/pkgs/development/libraries/SDL2_gfx/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { ''; homepage = https://sourceforge.net/projects/sdlgfx/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ stdenv.lib.maintainers.bjg ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/SDL_gfx/default.nix b/pkgs/development/libraries/SDL_gfx/default.nix index 49f5fec1da3f73738069c557f1b26d6de642f1d1..3a7fa7072849ed09eb7cdf423705aa8c16d5d22e 100644 --- a/pkgs/development/libraries/SDL_gfx/default.nix +++ b/pkgs/development/libraries/SDL_gfx/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { ''; homepage = https://sourceforge.net/projects/sdlgfx/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ stdenv.lib.maintainers.bjg ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/SDL_image/default.nix b/pkgs/development/libraries/SDL_image/default.nix index a1d839504770890e98374bf7d12a7fdc572d5d69..2aa122a8fb28021372e5a861ebdec3476f63d75a 100644 --- a/pkgs/development/libraries/SDL_image/default.nix +++ b/pkgs/development/libraries/SDL_image/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation rec { description = "SDL image library"; homepage = http://www.libsdl.org/projects/SDL_image/; maintainers = with maintainers; [ lovek323 ]; - platforms = platforms.unix; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/SDL_mixer/default.nix b/pkgs/development/libraries/SDL_mixer/default.nix index f5b40daaf68cce4959fd66d8c2c49631fa40aef5..7aca033c147b71af843ca517a6cf1078f2571e92 100644 --- a/pkgs/development/libraries/SDL_mixer/default.nix +++ b/pkgs/development/libraries/SDL_mixer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, SDL, libogg, libvorbis, enableNativeMidi ? false }: +{ stdenv, fetchurl, SDL, libogg, libvorbis, enableNativeMidi ? false, fluidsynth ? null }: stdenv.mkDerivation rec { pname = "SDL_mixer"; @@ -10,9 +10,9 @@ stdenv.mkDerivation rec { sha256 = "0alrhqgm40p4c92s26mimg9cm1y7rzr6m0p49687jxd9g6130i0n"; }; - buildInputs = [SDL libogg libvorbis]; + buildInputs = [SDL libogg libvorbis fluidsynth]; - configureFlags = "--disable-music-ogg-shared" + stdenv.lib.optionalString enableNativeMidi "--enable-music-native-midi-gpl"; + configureFlags = "--disable-music-ogg-shared" + stdenv.lib.optionalString enableNativeMidi " --enable-music-native-midi-gpl"; postInstall = "ln -s $out/include/SDL/SDL_mixer.h $out/include/"; @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { description = "SDL multi-channel audio mixer library"; homepage = http://www.libsdl.org/projects/SDL_mixer/; maintainers = with maintainers; [ lovek323 ]; - platforms = platforms.unix; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/aacskeys/default.nix b/pkgs/development/libraries/aacskeys/default.nix index 088f2cc4b1e0092c571eb2feec6cf98ab164cea4..0b20d8a41ea1dafde5feaf1b8672dd0bbf1885ba 100644 --- a/pkgs/development/libraries/aacskeys/default.nix +++ b/pkgs/development/libraries/aacskeys/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { buildInputs = [openssl jdk premake3]; installPhase = '' - ensureDir $out/{bin,lib,share/${baseName}} + mkdir -p $out/{bin,lib,share/${baseName}} # Install lib install -Dm444 lib/linux/libaacskeys.so $out/lib diff --git a/pkgs/development/libraries/adns/default.nix b/pkgs/development/libraries/adns/default.nix index cbc4e0b8c89b636eecf9363a85e3c8e87d910f80..8c9c6a5b9ef90ac915f24b4c228cf896e9576f20 100644 --- a/pkgs/development/libraries/adns/default.nix +++ b/pkgs/development/libraries/adns/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = { homepage = "http://www.chiark.greenend.org.uk/~ian/adns/"; description = "Asynchronous DNS Resolver Library"; - license = "LGPL-v2"; + license = stdenv.lib.licenses.lgpl2; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.simons ]; diff --git a/pkgs/development/libraries/agg/default.nix b/pkgs/development/libraries/agg/default.nix index 59124f011dd4e4c42066f3a7aa6f267ee720ff0c..48e96aeea26cc6ef4025666be7111f095304f14c 100644 --- a/pkgs/development/libraries/agg/default.nix +++ b/pkgs/development/libraries/agg/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { of course, AGG can do much more than that. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://www.antigrain.com/; }; } diff --git a/pkgs/development/libraries/allegro/5-unstable.nix b/pkgs/development/libraries/allegro/5-unstable.nix index a277129c0a926185f53eaf2b60a22695911e7c19..d7a8708e5401e2fc91820ee6550e643b15da9534 100644 --- a/pkgs/development/libraries/allegro/5-unstable.nix +++ b/pkgs/development/libraries/allegro/5-unstable.nix @@ -15,10 +15,11 @@ let (builtins.attrNames (builtins.removeAttrs x helperArgNames)); sourceInfo = rec { baseName="allegro"; + folderSuffix = "-unstable"; version = "5.1.8"; name="${baseName}-${version}"; project="alleg"; - url="mirror://sourceforge/project/${project}/${baseName}/${version}/${name}.tar.gz"; + url="mirror://sourceforge/project/${project}/${baseName}${folderSuffix}/${version}/${name}.tar.gz"; hash="18fdppaqaf3g3rcqwhyvsmkzk3y14clz4l8cvmg4hvjgyf011f3i"; }; in diff --git a/pkgs/development/libraries/amrnb/default.nix b/pkgs/development/libraries/amrnb/default.nix index 7790f8e124b29f53619ab3dce6f65945db68df47..c5514acd1d439eeee7f677d774eb920fdc6ce0a1 100644 --- a/pkgs/development/libraries/amrnb/default.nix +++ b/pkgs/development/libraries/amrnb/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation { # The wrapper code is free, but not the libraries from 3gpp. # It's a source code reference implementation with patents and licenses on # some countries, not redistributable. - license = "unfree"; + license = stdenv.lib.licenses.unfree; }; } diff --git a/pkgs/development/libraries/amrwb/default.nix b/pkgs/development/libraries/amrwb/default.nix index fc8d0415c36b1062bcd47f6b11e2a9fec139c2dd..2b5da8de423ddb50a536651445f4d5375eefcc35 100644 --- a/pkgs/development/libraries/amrwb/default.nix +++ b/pkgs/development/libraries/amrwb/default.nix @@ -36,6 +36,6 @@ stdenv.mkDerivation { # The wrapper code is free, but not the libraries from 3gpp. # It's a source code reference implementation with patents and licenses on # some countries, not redistributable. - license = "unfree"; + license = stdenv.lib.licenses.unfree; }; } diff --git a/pkgs/development/libraries/apache-activemq/default.nix b/pkgs/development/libraries/apache-activemq/default.nix index d55ff9049eda4d078670ccb4a5f1d622da887860..2f2792dec1400845a7a87b25c53d0035662d00d1 100644 --- a/pkgs/development/libraries/apache-activemq/default.nix +++ b/pkgs/development/libraries/apache-activemq/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { phases = [ "unpackPhase" "installPhase" ]; installPhase = '' - ensureDir $out + mkdir -p $out mv * $out/ for j in `find $out/lib -name "*.jar"`; do cp="''${cp:+"$cp:"}$j"; diff --git a/pkgs/development/libraries/aspell/default.nix b/pkgs/development/libraries/aspell/default.nix index 6b054aaf44b1c8001e4b5174d83a921d1e3aab6c..734bcc0797ccb817dd2a2c6897cc27a7018c900e 100644 --- a/pkgs/development/libraries/aspell/default.nix +++ b/pkgs/development/libraries/aspell/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { description = "Spell checker for many languages"; homepage = http://aspell.net/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ ]; }; } diff --git a/pkgs/desktops/gnome-3/3.12/core/at-spi2-atk/default.nix b/pkgs/development/libraries/at-spi2-atk/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/3.12/core/at-spi2-atk/default.nix rename to pkgs/development/libraries/at-spi2-atk/default.nix diff --git a/pkgs/desktops/gnome-3/3.10/core/at-spi2-core/default.nix b/pkgs/development/libraries/at-spi2-core/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/3.10/core/at-spi2-core/default.nix rename to pkgs/development/libraries/at-spi2-core/default.nix diff --git a/pkgs/development/libraries/atk/default.nix b/pkgs/development/libraries/atk/default.nix index 2dca2a8e1ec54251a59605391d173971b82c96e1..ce7f92a203543d7cb6d58e41de84ae3d88d23ef9 100644 --- a/pkgs/development/libraries/atk/default.nix +++ b/pkgs/development/libraries/atk/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { homepage = http://library.gnome.org/devel/atk/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = with stdenv.lib.maintainers; [ raskin urkud ]; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; diff --git a/pkgs/development/libraries/aubio/default.nix b/pkgs/development/libraries/aubio/default.nix index 53ff657205298dc1a0b8548a80b980138ea4e4be..7a5351da10e0ef112946e4253e80080a3e3394a8 100644 --- a/pkgs/development/libraries/aubio/default.nix +++ b/pkgs/development/libraries/aubio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, fftw, jackaudio, libsamplerate +{ stdenv, fetchurl, alsaLib, fftw, jack2, libsamplerate , libsndfile, pkgconfig, python }: @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - alsaLib fftw jackaudio libsamplerate libsndfile pkgconfig python + alsaLib fftw jack2 libsamplerate libsndfile pkgconfig python ]; configurePhase = "python waf configure --prefix=$out"; diff --git a/pkgs/development/libraries/babl/0_0_22.nix b/pkgs/development/libraries/babl/0_0_22.nix index 2464a09f51aa1c453101e2bed049d02d0c84a007..3983816a8b4484a865edc95137e811332961c4a6 100644 --- a/pkgs/development/libraries/babl/0_0_22.nix +++ b/pkgs/development/libraries/babl/0_0_22.nix @@ -11,6 +11,6 @@ stdenv.mkDerivation { meta = { description = "Image pixel format conversion library"; homepage = http://gegl.org/babl/; - license = "GPL3"; + license = stdenv.lib.licenses.gpl3; }; } diff --git a/pkgs/development/libraries/babl/default.nix b/pkgs/development/libraries/babl/default.nix index 41280e87253d49095c4140d160cdd276a91c226c..473df8819c0a073fa55ae9fba7191ce37df92d94 100644 --- a/pkgs/development/libraries/babl/default.nix +++ b/pkgs/development/libraries/babl/default.nix @@ -11,6 +11,6 @@ stdenv.mkDerivation rec { meta = { description = "Image pixel format conversion library"; homepage = http://gegl.org/babl/; - license = "GPL3"; + license = stdenv.lib.licenses.gpl3; }; } diff --git a/pkgs/development/libraries/boost/1.55.nix b/pkgs/development/libraries/boost/1.55.nix index df29b2402f8d46eb644e26e604f10edaf64f57f6..bf355f7169c6be45590044fe1afd760e12c48b48 100644 --- a/pkgs/development/libraries/boost/1.55.nix +++ b/pkgs/development/libraries/boost/1.55.nix @@ -75,6 +75,7 @@ stdenv.mkDerivation { ./b2 -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat}/include -sEXPAT_LIBPATH=${expat}/lib --layout=${layout} variant=${variant} threading=${threading} link=${link} ${cflags} install${withToolset} rm $out/bin/bjam ln -s $out/bin/b2 $out/bin/bjam + rm -rf $out/share/boost-build/example ''; crossAttrs = rec { diff --git a/pkgs/development/libraries/buddy/default.nix b/pkgs/development/libraries/buddy/default.nix index 3cfa2a2502167993662f5a823077ced1a80fe8cb..d23b2f27c0783ad30f3ab3b41477c3e2db5e7e5d 100644 --- a/pkgs/development/libraries/buddy/default.nix +++ b/pkgs/development/libraries/buddy/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { description = "binary decision diagram package"; license = "as-is"; - platforms = stdenv.lib.platforms.allBut "i686-cygwin"; + platforms = with stdenv.lib.platforms; allBut cygwin; maintainers = [ stdenv.lib.maintainers.simons ]; }; } diff --git a/pkgs/development/libraries/bwidget/default.nix b/pkgs/development/libraries/bwidget/default.nix index 81f4f9a287ec1d524ae436b8e90fec7ce869f130..0d1913bc8e7a90dc5a23a10d38e7590c246d2bae 100644 --- a/pkgs/development/libraries/bwidget/default.nix +++ b/pkgs/development/libraries/bwidget/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { dontBuild = true; installPhase = '' - ensureDir "$out/lib/${passthru.libPrefix}" + mkdir -p "$out/lib/${passthru.libPrefix}" cp -R *.tcl lang images "$out/lib/${passthru.libPrefix}" ''; diff --git a/pkgs/development/libraries/caelum/default.nix b/pkgs/development/libraries/caelum/default.nix index 808310e326f032a3d8f9dad2dae959f32c10c74f..823eac14548561c36852777c7b1c4df916b30012 100644 --- a/pkgs/development/libraries/caelum/default.nix +++ b/pkgs/development/libraries/caelum/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "Add-on for the OGRE, aimed to render atmospheric effects"; homepage = http://code.google.com/p/caelum/; - license = "LGPLv2.1+"; + license = stdenv.lib.licenses.lgpl21Plus; broken = true; }; } diff --git a/pkgs/development/libraries/ccrtp/1.8.nix b/pkgs/development/libraries/ccrtp/1.8.nix index 78bf7a678ac77ea7a29c2c52fb7ff9244bf7c606..5105bd2987626aa062172bf22077f32ac17896ab 100644 --- a/pkgs/development/libraries/ccrtp/1.8.nix +++ b/pkgs/development/libraries/ccrtp/1.8.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { meta = { description = "GNU ccRTP is an implementation of RTP, the real-time transport protocol from the IETF"; homepage = "http://www.gnu.org/software/ccrtp/"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.marcweber ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/ccrtp/default.nix b/pkgs/development/libraries/ccrtp/default.nix index daf36e28919b060ec1d87e992d85bcbcfa5493f4..2111e1b4a55a61e2878a730976c1955c35a2eeb5 100644 --- a/pkgs/development/libraries/ccrtp/default.nix +++ b/pkgs/development/libraries/ccrtp/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = { description = "GNU ccRTP, an implementation of the IETF real-time transport protocol (RTP)"; homepage = http://www.gnu.org/software/ccrtp/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ marcweber ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/check/default.nix b/pkgs/development/libraries/check/default.nix index a0e1bcfa6121eef7bb3121a7b47d4b56296f7d1f..4e75cda0c2398238bcdd3cc2df6b4ff5f1be8cc5 100644 --- a/pkgs/development/libraries/check/default.nix +++ b/pkgs/development/libraries/check/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation { homepage = http://check.sourceforge.net/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; }; } diff --git a/pkgs/development/libraries/classads/default.nix b/pkgs/development/libraries/classads/default.nix index 909e8ba7bf26cbe359701d88f2fd1fc01a87cf55..6c673a7dc0287992b7900b47d873587423694dc2 100644 --- a/pkgs/development/libraries/classads/default.nix +++ b/pkgs/development/libraries/classads/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation { meta = { homepage = http://www.cs.wisc.edu/condor/classad/; description = "The Classified Advertisements library provides a generic means for matching resources"; - license = "Apache-2.0"; + license = stdenv.lib.licenses.asl20; }; } diff --git a/pkgs/development/libraries/cln/default.nix b/pkgs/development/libraries/cln/default.nix index f536e746d0e9bde882e342ecfc46e05757bed90b..982deb29ea8c0d754b8518242ca72f725c777ee8 100644 --- a/pkgs/development/libraries/cln/default.nix +++ b/pkgs/development/libraries/cln/default.nix @@ -14,6 +14,6 @@ stdenv.mkDerivation rec { description = "C/C++ library for numbers, a part of GiNaC"; homepage = http://www.ginac.de/CLN/; maintainers = [ stdenv.lib.maintainers.urkud ]; - platforms = stdenv.lib.platforms.allBut "i686-cygwin"; + platforms = with stdenv.lib.platforms; allBut cygwin; }; } diff --git a/pkgs/development/libraries/cloog-ppl/default.nix b/pkgs/development/libraries/cloog-ppl/default.nix index a6ebbf8dfdc0977204d960a3cdaa11add0105d2b..6f938680d7e1e3ac8266decdf70587df372388ac 100644 --- a/pkgs/development/libraries/cloog-ppl/default.nix +++ b/pkgs/development/libraries/cloog-ppl/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { # CLooG-PPL is actually a port of GLooG from PolyLib to PPL. homepage = http://www.cloog.org/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ ]; @@ -74,6 +74,6 @@ stdenv.mkDerivation rec { make[3]: *** [Box.lo] Error 1 */ - platforms = stdenv.lib.platforms.allBut "i686-cygwin"; + platforms = with stdenv.lib.platforms; allBut cygwin; }; } diff --git a/pkgs/development/libraries/cloog/default.nix b/pkgs/development/libraries/cloog/default.nix index c3878ef4b78961aefc371414377fd484e94d3a10..da4501285e1210c9d090c915567fe3b26ad67997 100644 --- a/pkgs/development/libraries/cloog/default.nix +++ b/pkgs/development/libraries/cloog/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { homepage = http://www.cloog.org/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.shlevy ]; @@ -58,6 +58,6 @@ stdenv.mkDerivation rec { make[3]: *** [Box.lo] Error 1 */ - platforms = stdenv.lib.platforms.allBut "i686-cygwin"; + platforms = with stdenv.lib.platforms; allBut cygwin; }; } diff --git a/pkgs/development/libraries/clutter-gst/default.nix b/pkgs/development/libraries/clutter-gst/default.nix index 8297dc9d5da385bfe8eb338c4e687b72821bacf5..59c64b0de9f7629de49b91a2001be61fbfa09b0c 100644 --- a/pkgs/development/libraries/clutter-gst/default.nix +++ b/pkgs/development/libraries/clutter-gst/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { homepage = http://www.clutter-project.org/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = with stdenv.lib.maintainers; [ lethalman ]; platforms = stdenv.lib.platforms.gnu; # arbitrary choice diff --git a/pkgs/development/libraries/clutter-gtk/0.10.8.nix b/pkgs/development/libraries/clutter-gtk/0.10.8.nix index 00a4edd2a9884e7b6c043ef259f6a4f80fd726d5..e5f5a455c899ff08b809dcd3e89f56ce41124712 100644 --- a/pkgs/development/libraries/clutter-gtk/0.10.8.nix +++ b/pkgs/development/libraries/clutter-gtk/0.10.8.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { homepage = http://www.clutter-project.org/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ ]; platforms = stdenv.lib.platforms.gnu; # arbitrary choice diff --git a/pkgs/development/libraries/clutter-gtk/default.nix b/pkgs/development/libraries/clutter-gtk/default.nix index 3614d149489d9a8751d64f650a510ddc1e065c2f..1d085222341a1bb24670b26dba1360ac4561995d 100644 --- a/pkgs/development/libraries/clutter-gtk/default.nix +++ b/pkgs/development/libraries/clutter-gtk/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { homepage = http://www.clutter-project.org/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = with stdenv.lib.maintainers; [ urkud ]; platforms = stdenv.lib.platforms.gnu; # arbitrary choice diff --git a/pkgs/development/libraries/clutter/1.18.nix b/pkgs/development/libraries/clutter/1.18.nix index 898c931f354aaa8d1246d5ffd9a9cbfc45d3907f..7a9d114ce8e3252ba5635a7908e7498f295589d2 100644 --- a/pkgs/development/libraries/clutter/1.18.nix +++ b/pkgs/development/libraries/clutter/1.18.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { specific needs. ''; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; homepage = http://www.clutter-project.org/; maintainers = with stdenv.lib.maintainers; [ urkud ]; diff --git a/pkgs/development/libraries/clutter/default.nix b/pkgs/development/libraries/clutter/default.nix index 808e67cd852b2df94c63f1e52c3a347709f18ec7..027b90d8e11c796f8ccf7e7d615959646e22e2b5 100644 --- a/pkgs/development/libraries/clutter/default.nix +++ b/pkgs/development/libraries/clutter/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { specific needs. ''; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; homepage = http://www.clutter-project.org/; maintainers = with stdenv.lib.maintainers; [ urkud ]; diff --git a/pkgs/development/libraries/coin3d/default.nix b/pkgs/development/libraries/coin3d/default.nix index f866b2299c1f364077d842ca1f6d85a03a03a9bd..034d7d658e17adb19c6ea1100f19edbdec66b1e8 100644 --- a/pkgs/development/libraries/coin3d/default.nix +++ b/pkgs/development/libraries/coin3d/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.coin3d.org/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; description = "High-level, retained-mode toolkit for effective 3D graphics development"; maintainers = [ stdenv.lib.maintainers.viric ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/commoncpp2/default.nix b/pkgs/development/libraries/commoncpp2/default.nix index 0b834a5ddb3263878a157f1cef25404b0e9cdda1..9dff8a6c50f69846891258463a4a88496884d709 100644 --- a/pkgs/development/libraries/commoncpp2/default.nix +++ b/pkgs/development/libraries/commoncpp2/default.nix @@ -31,10 +31,10 @@ stdenv.mkDerivation rec { ''; homepage = http://www.gnu.org/software/commoncpp/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.marcweber stdenv.lib.maintainers.ludo ]; - platforms = stdenv.lib.platforms.allBut "i686-freebsd"; + platforms = with stdenv.lib.platforms; allBut freebsd; }; } diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix index 47b6a3a7cffb25358f2b0f9127f7662dbf62ad01..b6aaa0c033293e477adc8512581f8417f77a4df4 100644 --- a/pkgs/development/libraries/dbus/default.nix +++ b/pkgs/development/libraries/dbus/default.nix @@ -3,8 +3,8 @@ , libX11, libICE, libSM, useX11 ? (stdenv.isLinux || stdenv.isDarwin) }: let - version = "1.8.4"; - sha256 = "1y0zcmd4jsf2gq5yymz9gcnwxijh0vxbmxz73q3l440is343vxiy"; + version = "1.8.6"; + sha256 = "0gyjxd0gfpjs3fq5bx6aljb5f3zxky5zsq0yfqr9ywbv03587vgd"; inherit (stdenv) lib; @@ -91,7 +91,7 @@ let stdenv.lib.optionalString (!stdenv.isDarwin) "-Wl,--as-needed " + "-ldbus-1"; - meta.platforms = stdenv.lib.platforms.all; + meta.platforms = with stdenv.lib.platforms; allBut darwin; }; daemon = tools; diff --git a/pkgs/development/libraries/dotconf/default.nix b/pkgs/development/libraries/dotconf/default.nix index 9a71393badde1172f3f7eac7a09c8e3862df486a..2c22af1684d365f6840de94f653e6e1e9af72f97 100644 --- a/pkgs/development/libraries/dotconf/default.nix +++ b/pkgs/development/libraries/dotconf/default.nix @@ -13,6 +13,6 @@ stdenv.mkDerivation rec { description = "A configuration parser library"; homepage = http://www.azzit.de/dotconf/; - license = "LGPLv21+"; + license = stdenv.lib.licenses.lgpl21Plus; }; } diff --git a/pkgs/development/libraries/dssi/default.nix b/pkgs/development/libraries/dssi/default.nix index 951278b4433f6ecba9eece56c96eea3cf148c578..ae276c6aa0aae8302bd3205c818d3ff48a3cf893 100644 --- a/pkgs/development/libraries/dssi/default.nix +++ b/pkgs/development/libraries/dssi/default.nix @@ -1,5 +1,5 @@ x@{builderDefsPackage - , ladspaH, jackaudio, liblo, alsaLib, qt4, libX11, libsndfile, libSM + , ladspaH, jack2, liblo, alsaLib, qt4, libX11, libsndfile, libSM , libsamplerate, libtool, autoconf, automake, xproto, libICE, pkgconfig , ...}: builderDefsPackage diff --git a/pkgs/development/libraries/epoxy/default.nix b/pkgs/development/libraries/epoxy/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..a1b0d87cdfdc49928e330f72b20bc5c7c4bd9813 --- /dev/null +++ b/pkgs/development/libraries/epoxy/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, autoconf, autogen, automake, gettext, libX11 +, mesa, pkgconfig, python, utilmacros +}: + +stdenv.mkDerivation rec { + name = "epoxy-${version}"; + version = "1.2"; + + src = fetchurl { + url = "https://github.com/anholt/libepoxy/archive/v${version}.tar.gz"; + sha256 = "1xp8g6b7xlbym2rj4vkbl6xpb7ijq7glpv656mc7k9b01x22ihs2"; + }; + + buildInputs = [ + autoconf autogen automake gettext libX11 mesa pkgconfig python + utilmacros + ]; + + configureScript = '' + ./autogen.sh --prefix="$out" + ''; + + meta = with stdenv.lib; { + description = "A library for handling OpenGL function pointer management"; + homepage = https://github.com/anholt/libepoxy; + license = licenses.mit; + maintainers = [ maintainers.goibhniu ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/exosip/3.x.nix b/pkgs/development/libraries/exosip/3.x.nix index 123b53783a680833a1875dacb7a409c58cb4139f..63afd22bcf88f7ac817a57e340e960fa043e5069 100644 --- a/pkgs/development/libraries/exosip/3.x.nix +++ b/pkgs/development/libraries/exosip/3.x.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ libosip openssl pkgconfig ]; meta = { - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; description = "Library that hides the complexity of using the SIP protocol"; }; } diff --git a/pkgs/development/libraries/exosip/default.nix b/pkgs/development/libraries/exosip/default.nix index fb13e0b8c6f5fe1ab86784d83979ebefb6b295dd..02349bc0267b4604c54a746c2c5e62333957f06a 100644 --- a/pkgs/development/libraries/exosip/default.nix +++ b/pkgs/development/libraries/exosip/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ libosip openssl pkgconfig ]; meta = { - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; description = "Library that hides the complexity of using the SIP protocol"; }; } diff --git a/pkgs/development/libraries/faad2/default.nix b/pkgs/development/libraries/faad2/default.nix index fc489f9eb665bf0735c0c47a867d1590a6e5cae9..99177578c779237ca78ef151541171a32501ce66 100644 --- a/pkgs/development/libraries/faad2/default.nix +++ b/pkgs/development/libraries/faad2/default.nix @@ -11,6 +11,6 @@ stdenv.mkDerivation { meta = { description = "An open source MPEG-4 and MPEG-2 AAC decoder"; homepage = http://www.audiocoding.com/faad2.html; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/development/libraries/farstream/default.nix b/pkgs/development/libraries/farstream/default.nix index bcc3821d5e2697ad8c6b3e4bd43485203e36f04e..eabb9789d79ae07829af32907e68eaf73733795b 100644 --- a/pkgs/development/libraries/farstream/default.nix +++ b/pkgs/development/libraries/farstream/default.nix @@ -4,10 +4,10 @@ }: stdenv.mkDerivation rec { - name = "farstream-0.2.3"; + name = "farstream-0.2.4"; src = fetchurl { url = "http://www.freedesktop.org/software/farstream/releases/farstream/${name}.tar.gz"; - sha256 = "15h4qv30ql3rnmlm4ac3h7rplvj7125z14fbfh1zrkajjaa3bxdz"; + sha256 = "0c5vlyiwb799wpby4g9vffiy0nf09gy2cr84ksfy3jwzsxf5n38j"; }; buildInputs = [ libnice python pygobject gupnp_igd libnice ]; diff --git a/pkgs/development/libraries/ffmpeg/0.10.nix b/pkgs/development/libraries/ffmpeg/0.10.nix index 99c823e7b29704062a45e19fa5e214acec89b992..8ffe2daebf6c4653cd67cb809bb6d649e7b5430b 100644 --- a/pkgs/development/libraries/ffmpeg/0.10.nix +++ b/pkgs/development/libraries/ffmpeg/0.10.nix @@ -21,11 +21,11 @@ assert vdpauSupport -> libvdpau != null; assert faacSupport -> faac != null; stdenv.mkDerivation rec { - name = "ffmpeg-0.10.12"; + name = "ffmpeg-0.10.14"; src = fetchurl { url = "http://www.ffmpeg.org/releases/${name}.tar.bz2"; - sha256 = "00nvm3iysn8zincpvv1abqrxqj1ky0322dh2j9csjw983358538i"; + sha256 = "1frkz3971zc2a60ras5ia26b2h8wbh017x1x80q8cfw0ycrpbxqy"; }; # `--enable-gpl' (as well as the `postproc' and `swscale') mean that diff --git a/pkgs/development/libraries/ffmpeg/0.6.90.nix b/pkgs/development/libraries/ffmpeg/0.6.90.nix index 79d7816d78227d4427cd8c518377d8c1f63e34ea..7455410d51acd42a361b6cdcfdc4bdac40ef761f 100644 --- a/pkgs/development/libraries/ffmpeg/0.6.90.nix +++ b/pkgs/development/libraries/ffmpeg/0.6.90.nix @@ -73,5 +73,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.ffmpeg.org/; description = "A complete, cross-platform solution to record, convert and stream audio and video"; + broken = true; }; } diff --git a/pkgs/development/libraries/ffmpeg/1.x.nix b/pkgs/development/libraries/ffmpeg/1.x.nix index c43cd329956522a7727561a07c2f9d4c9eff739e..a0dcf52dcce02127963510d7d978eb4c01f0cb7a 100644 --- a/pkgs/development/libraries/ffmpeg/1.x.nix +++ b/pkgs/development/libraries/ffmpeg/1.x.nix @@ -31,11 +31,11 @@ assert playSupport -> SDL != null; assert freetypeSupport -> freetype != null; stdenv.mkDerivation rec { - name = "ffmpeg-1.2.6"; + name = "ffmpeg-1.2.7"; src = fetchurl { url = "http://www.ffmpeg.org/releases/${name}.tar.bz2"; - sha256 = "174rf3g2pqaxa8rzg03qmy4cn2gsy0p2mk26y9yk5ksq6kg59m19"; + sha256 = "13nj5q5ad0kcrid8r5x6x8lqfhk8kms14pmncf6vbdbk6x45k6v6"; }; # `--enable-gpl' (as well as the `postproc' and `swscale') mean that diff --git a/pkgs/development/libraries/ffmpeg/2.x.nix b/pkgs/development/libraries/ffmpeg/2.x.nix index 847d561fbe4b83379cde4b3b19988bda8dbc3ae7..7a35ecca9a3b69f31a93f7c3a215123b56e95992 100644 --- a/pkgs/development/libraries/ffmpeg/2.x.nix +++ b/pkgs/development/libraries/ffmpeg/2.x.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "ffmpeg-2.2.2"; + name = "ffmpeg-2.3"; src = fetchurl { url = "http://www.ffmpeg.org/releases/${name}.tar.bz2"; - sha256 = "062jn47sm1ifwswcd3lx47nff62rgcwp84964q0v983issnrfax4"; + sha256 = "17l0bx95al6cjhz3pzfcbwg07sbfbwqbxg34zl5lhl89w9jbngbb"; }; subtitleSupport = config.ffmpeg.subtitle or true; @@ -101,5 +101,6 @@ stdenv.mkDerivation rec { homepage = http://www.ffmpeg.org/; description = "A complete, cross-platform solution to record, convert and stream audio and video"; license = if (fdkAACSupport || faacSupport) then stdenv.lib.licenses.unfree else stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/ffms/default.nix b/pkgs/development/libraries/ffms/default.nix index 92146c12e302db5c5661c298dae7675084c1634e..c394fd07028616027f30340c1103669be2ed0589 100644 --- a/pkgs/development/libraries/ffms/default.nix +++ b/pkgs/development/libraries/ffms/default.nix @@ -16,6 +16,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://code.google.com/p/ffmpegsource/; description = "Libav/ffmpeg based source library for easy frame accurate access"; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix index 89feb3df8d5a4cc57b6ca7705ed9498fd3513d61..f0c4da755673459d0c85257678290fb76e393263 100644 --- a/pkgs/development/libraries/fontconfig/default.nix +++ b/pkgs/development/libraries/fontconfig/default.nix @@ -8,18 +8,23 @@ stdenv.mkDerivation rec { sha256 = "0llraqw86jmw4vzv7inskp3xxm2gc64my08iwq5mzncgfdbfza4f"; }; - infinality_patch = with freetype.infinality; if useInfinality - then let subvers = "1"; + infinality_patch = + let subvers = "1"; in fetchurl { url = http://www.infinality.net/fedora/linux/zips/fontconfig-infinality-1-20130104_1.tar.bz2; sha256 = "1fm5xx0mx2243jrq5rxk4v0ajw2nawpj23399h710bx6hd1rviq7"; } - else null; + ; propagatedBuildInputs = [ freetype ]; buildInputs = [ pkgconfig expat ]; - configureFlags = "--sysconfdir=/etc --with-cache-dir=/var/cache/fontconfig --disable-docs --with-default-fonts="; + configureFlags = [ + "--sysconfdir=/etc" + "--with-cache-dir=/var/cache/fontconfig" + "--disable-docs" + "--with-default-fonts=" + ]; # We should find a better way to access the arch reliably. crossArch = stdenv.cross.arch or null; @@ -32,10 +37,12 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - # Don't try to write to /etc/fonts or /var/cache/fontconfig at install time. - installFlags = "sysconfdir=$(out)/etc RUN_FC_CACHE_TEST=false fc_cachedir=$(TMPDIR)/dummy"; + doCheck = true; - postInstall = stdenv.lib.optionalString freetype.infinality.useInfinality '' + # Don't try to write to /var/cache/fontconfig at install time. + installFlags = "sysconfdir=$(out)/etc fc_cachedir=$(TMPDIR)/dummy RUN_FC_CACHE_TEST=false"; + + postInstall = '' cd "$out/etc/fonts" && tar xvf ${infinality_patch} ''; diff --git a/pkgs/development/libraries/fox/default.nix b/pkgs/development/libraries/fox/default.nix index 87e47e1b046eaff4d3dd0b49078662b62ac8af34..63acc14521c6a2b91f8a8ce86881fcebbc537704 100644 --- a/pkgs/development/libraries/fox/default.nix +++ b/pkgs/development/libraries/fox/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { md5 = "b5897e9c664967f5042e57070037ff18"; }; - buildInputs = [ x11 libpng libjpeg libtiff zlib bzip2 libXcursor libXrandr libXft ]; + buildInputs = [ libpng x11 libjpeg libtiff zlib bzip2 libXcursor libXrandr libXft ]; doCheck = true; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { Current aims are to make FOX completely platform independent, and thus programs written against the FOX library will be only a compile away from running on a variety of platforms. ''; homepage = "http://fox-toolkit.org"; - license = "LGPLv3"; + license = stdenv.lib.licenses.lgpl3; maintainers = [ stdenv.lib.maintainers.bbenoist ]; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/libraries/fox/fox-1.6.nix b/pkgs/development/libraries/fox/fox-1.6.nix index 1d98627556306c730d3732c3b50bb0653b242678..2fe104e849fdfb5102bf8396058511150f8b8d8a 100644 --- a/pkgs/development/libraries/fox/fox-1.6.nix +++ b/pkgs/development/libraries/fox/fox-1.6.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { Current aims are to make FOX completely platform independent, and thus programs written against the FOX library will be only a compile away from running on a variety of platforms. ''; homepage = "http://fox-toolkit.org"; - license = "LGPLv3"; + license = stdenv.lib.licenses.lgpl3; maintainers = [ stdenv.lib.maintainers.bbenoist ]; platforms = stdenv.lib.platforms.mesaPlatforms; }; diff --git a/pkgs/development/libraries/freealut/default.nix b/pkgs/development/libraries/freealut/default.nix index 72d19875dec8b7bc9d0a3df7fa944d5ff7ab7a99..25ba89994e5dc890ce1496f9aba834af444b4cd5 100644 --- a/pkgs/development/libraries/freealut/default.nix +++ b/pkgs/development/libraries/freealut/default.nix @@ -1,10 +1,18 @@ -{stdenv, fetchurl, openal}: +{ stdenv, fetchurl, openal }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "freealut-1.1.0"; + src = fetchurl { - url = http://www.openal.org/openal_webstf/downloads/freealut-1.1.0.tar.gz; + url = "http://www.openal.org/openal_webstf/downloads/${name}.tar.gz"; sha256 = "0kzlil6112x2429nw6mycmif8y6bxr2cwjcvp18vh6s7g63ymlb0"; }; - buildInputs = [openal]; + + buildInputs = [ openal ]; + + meta = { + homepage = "http://openal.org/"; + description = "Free implementation of OpenAL's ALUT standard"; + license = stdenv.lib.licenses.lgpl2; + }; } diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix index 235d7e7237468693572292b9ae7bfa7092d2f017..a13e399ab0fea8fdd0e4b981a09a550954d117ba 100644 --- a/pkgs/development/libraries/freetype/default.nix +++ b/pkgs/development/libraries/freetype/default.nix @@ -1,57 +1,56 @@ -{ stdenv, fetchurl, gnumake +{ stdenv, fetchurl, fetchpatch, pkgconfig, which, zlib, bzip2, libpng, gnumake # FreeType supports sub-pixel rendering. This is patented by # Microsoft, so it is disabled by default. This option allows it to # be enabled. See http://www.freetype.org/patents.html. -, useEncumberedCode ? false -, useInfinality ? true +, glib/*passthru only*/ +, useEncumberedCode ? true }: -assert !(useEncumberedCode && useInfinality); # probably wouldn't make sense - let + version = "2.5.3"; - version = "2.4.12"; - + fetch_bohoomil = name: sha256: fetchpatch { + url = https://raw.githubusercontent.com/bohoomil/fontconfig-ultimate/8a155db28f264520596cc3e76eb44824bdb30f8e/01_freetype2-iu/ + name; + inherit sha256; + }; in - +with { inherit (stdenv.lib) optional optionalString; }; stdenv.mkDerivation rec { name = "freetype-${version}"; src = fetchurl { url = "mirror://sourceforge/freetype/${name}.tar.bz2"; - sha256 = "10akr2c37iv9y7fkgwp2szgwjyl2g6qmk9z1m596iaw9cr41g2m7"; + sha256 = "0pppcn73b5pwd7zdi9yfx16f5i93y18q7q4jmlkwmwrfsllqp160"; }; - infinality_patch = - if useInfinality then fetchurl { - url = http://www.infinality.net/fedora/linux/zips/freetype-infinality-2.4.12-20130514_01-x86_64.tar.bz2; - sha256 = "1lg2nzvxmwzwdfhxranw8iyflhr72cw9p11rkpgq1scxbp37668m"; - } else null; - - configureFlags = "--disable-static"; - - NIX_CFLAGS_COMPILE = with stdenv.lib; - " -fno-strict-aliasing" # from Gentoo, see https://bugzilla.redhat.com/show_bug.cgi?id=506840 - + optionalString useEncumberedCode " -DFT_CONFIG_OPTION_SUBPIXEL_RENDERING=1" - + optionalString useInfinality " -DTT_CONFIG_OPTION_SUBPIXEL_HINTING=1"; - patches = [ ./enable-validation.patch ] # from Gentoo - ++ stdenv.lib.optional useInfinality [ infinality_patch ]; - + ++ [ + (fetch_bohoomil "freetype-2.5.3-pkgconfig.patch" "1dpfdh8kmka3gzv14glz7l79i545zizah6wma937574v5z2iy3nn") + (fetch_bohoomil "fix_segfault_with_harfbuzz.diff" "1nx36inqrw717b86cla2miprdb3hii4vndw95k0jbbhfmax9k6fy") + ] + ++ optional useEncumberedCode + (fetch_bohoomil "infinality-2.5.3.patch" "0mxiybcb4wwbicrjiinh1b95rv543bh05sdqk1v0ipr3fxfrb47q") + ; + + propagatedBuildInputs = [ zlib bzip2 libpng ]; # needed when linking against freetype + # dependence on harfbuzz is looser than the reverse dependence + buildInputs = [ pkgconfig which ] + # FreeType requires GNU Make, which is not part of stdenv on FreeBSD. + ++ optional (!stdenv.isLinux) gnumake; + + # from Gentoo, see https://bugzilla.redhat.com/show_bug.cgi?id=506840 + NIX_CFLAGS_COMPILE = "-fno-strict-aliasing"; # The asm for armel is written with the 'asm' keyword. - CFLAGS = stdenv.lib.optionalString stdenv.isArm "-std=gnu99"; - - # FreeType requires GNU Make, which is not part of stdenv on FreeBSD. - buildInputs = stdenv.lib.optional (!stdenv.isLinux) gnumake; + CFLAGS = optionalString stdenv.isArm "-std=gnu99"; enableParallelBuilding = true; doCheck = true; - postInstall = - '' - ln -s freetype2/freetype $out/include/freetype - ''; + # compat hacks + postInstall = glib.flattenInclude + '' + ln -s . "$out"/include/freetype + ''; crossAttrs = { # Somehow it calls the unwrapped gcc, "i686-pc-linux-gnu-gcc", instead @@ -60,13 +59,11 @@ stdenv.mkDerivation rec { configureFlags = "--disable-static CC_BUILD=gcc"; }; - passthru.infinality.useInfinality = useInfinality; # for fontconfig - - meta = { + meta = with stdenv.lib; { description = "A font rendering engine"; homepage = http://www.freetype.org/; - license = if useEncumberedCode then "unfree" - else "GPLv2+"; # or the FreeType License (BSD + advertising clause) - platforms = stdenv.lib.platforms.all; + license = licenses.gpl2Plus; # or the FreeType License (BSD + advertising clause) + #ToDo: encumbered = useEncumberedCode; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/frei0r/default.nix b/pkgs/development/libraries/frei0r/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..2e3db4c2d73ac08bc3bebb0d426ecb49698095b2 --- /dev/null +++ b/pkgs/development/libraries/frei0r/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, autoconf, cairo, opencv, pkgconfig }: + +stdenv.mkDerivation rec { + name = "frei0r-plugins-${version}"; + version = "1.4"; + + src = fetchurl { + url = "https://files.dyne.org/.xsend.php?file=frei0r/releases/${name}.tar.gz"; + sha256 = "0mxyhdp1p1a3ga8170ijygb870zwbww1dgp3kdr1nd4zvsmzqw44"; + }; + + buildInputs = [ autoconf cairo opencv pkgconfig ]; + + meta = with stdenv.lib; { + homepage = http://frei0r.dyne.org; + description = "Minimalist, cross-platform, shared video plugins"; + license = licenses.gpl2; + maintainers = [ maintainers.goibhniu ]; + platforms = platforms.linux; + + }; +} diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index a641040187a8429718e32c4d1d4e38b6a661211f..7c78ca3ed6fb1ebac9f9a1b503dee746a39a2574 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -27,7 +27,7 @@ composableDerivation.composableDerivation {} (fixed: { meta = { description = "Translator library for raster geospatial data formats"; homepage = http://www.gdal.org/; - license = "X/MIT"; + license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.marcweber ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/gdbm/default.nix b/pkgs/development/libraries/gdbm/default.nix index 2ba49162e2f0cacc6ebb948bdcab22c2ccc13e45..1fd6c429dc02466e9603bd08471f113b3baa9087 100644 --- a/pkgs/development/libraries/gdbm/default.nix +++ b/pkgs/development/libraries/gdbm/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.gnu.org/software/gdbm/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.ludo ]; }; diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index 39be4720eb14ea4bad269c2cbde56af184138758..27e2cad062b93353646ea9139640cfd6c3752070 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -3,14 +3,14 @@ let ver_maj = "2.30"; - ver_min = "6"; + ver_min = "8"; in stdenv.mkDerivation rec { name = "gdk-pixbuf-${ver_maj}.${ver_min}"; src = fetchurl { url = "mirror://gnome/sources/gdk-pixbuf/${ver_maj}/${name}.tar.xz"; - sha256 = "0nkz19xlh60bf9bqylh98n8rynpjyx1nzp1gcr6zljgvmnj4yfa3"; + sha256 = "1gpqpskp4zzf7h35bp247jcvnk6rxc52r69pb11v8g8i2q386ls8"; }; setupHook = ./setup-hook.sh; diff --git a/pkgs/development/libraries/gdk-pixbuf/setup-hook.sh b/pkgs/development/libraries/gdk-pixbuf/setup-hook.sh index c983f9f6a612444688ab66914dd5928d18979b43..06e820633b84f60c1309e82aba8099e520e818c5 100644 --- a/pkgs/development/libraries/gdk-pixbuf/setup-hook.sh +++ b/pkgs/development/libraries/gdk-pixbuf/setup-hook.sh @@ -1,6 +1,6 @@ findGdkPixbufLoaders() { - if [ -z "$IN_NIX_SHELL" ]; then + if [ -n "$out" ] && [ -z "$IN_NIX_SHELL" ]; then # set pixbuf loaders.cache for this package diff --git a/pkgs/development/libraries/gdome2/default.nix b/pkgs/development/libraries/gdome2/default.nix index 415a98029cc6ec5fd33043c80d890dd3e2ba2872..516fb9329833988b51693b212e91feb7e998f143 100644 --- a/pkgs/development/libraries/gdome2/default.nix +++ b/pkgs/development/libraries/gdome2/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = { homepage = http://gdome2.cs.unibo.it/; description = "DOM C library developped for the Gnome project"; - license = "LGPLv2.1+"; + license = stdenv.lib.licenses.lgpl21Plus; maintainers = [ stdenv.lib.maintainers.roconnor ]; }; } diff --git a/pkgs/development/libraries/gegl/0_0_22.nix b/pkgs/development/libraries/gegl/0_0_22.nix index b2f2e85a1ea8bc075ea2111c2368dfde0e2d3b23..3f9a619ff6a13964d0d67a70000f43d07632727c 100644 --- a/pkgs/development/libraries/gegl/0_0_22.nix +++ b/pkgs/development/libraries/gegl/0_0_22.nix @@ -16,6 +16,6 @@ stdenv.mkDerivation { meta = { description = "Graph-based image processing framework"; homepage = http://www.gegl.org; - license = "GPL3"; + license = stdenv.lib.licenses.gpl3; }; } diff --git a/pkgs/development/libraries/gegl/default.nix b/pkgs/development/libraries/gegl/default.nix index 0649775ad216fa22b20ed5989cc19aaa9cee1d2d..a589d625273de6987c8cab51f7f72c0575937a1a 100644 --- a/pkgs/development/libraries/gegl/default.nix +++ b/pkgs/development/libraries/gegl/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { meta = { description = "Graph-based image processing framework"; homepage = http://www.gegl.org; - license = "GPL3"; + license = stdenv.lib.licenses.gpl3; }; } diff --git a/pkgs/development/libraries/geoclue/2.0.nix b/pkgs/development/libraries/geoclue/2.0.nix index 3932fa945c8cdc2f9bd0dce06c72e92cbe3e0e45..5ab9cb62443dd558ce51eb85eedf146eaec9e81f 100644 --- a/pkgs/development/libraries/geoclue/2.0.nix +++ b/pkgs/development/libraries/geoclue/2.0.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "geoclue-2.1.8"; + name = "geoclue-2.1.9"; src = fetchurl { url = "http://www.freedesktop.org/software/geoclue/releases/2.1/${name}.tar.xz"; - sha256 = "05h102110gsxxvmvllssfz7ldjpwrrb5sqg5rbpibys6iy4w1k6m"; + sha256 = "0aq9fqlvvc8jqbshp3mbcc1j5hq4fzjy8hd1yxcl6xrd0jkfw5ml"; }; buildInputs = diff --git a/pkgs/development/libraries/glib/darwin-compilation.patch b/pkgs/development/libraries/glib/darwin-compilation.patch new file mode 100644 index 0000000000000000000000000000000000000000..f215eef798af9b10fb3b04c27512dcb5d835c8d3 --- /dev/null +++ b/pkgs/development/libraries/glib/darwin-compilation.patch @@ -0,0 +1,24 @@ +Fix compilation on Mac OS X with gcc 4.8. + +diff -ru glib-2.40.0-orig/gio/gdummyfile.c glib-2.40.0/gio/gdummyfile.c +--- glib-2.40.0-orig/gio/gdummyfile.c 2014-02-03 18:40:41.000000000 +0100 ++++ glib-2.40.0/gio/gdummyfile.c 2014-07-15 10:58:31.000000000 +0200 +@@ -454,7 +454,8 @@ + result = g_malloc (escaped_string_end - escaped_string + 1); + + out = result; +- for (in = escaped_string; in < escaped_string_end; in++) ++ in = escaped_string; ++ for (; in < escaped_string_end; in++) + { + character = *in; + if (*in == '%') +@@ -551,6 +552,7 @@ + + decoded->scheme = g_malloc (p - uri); + out = decoded->scheme; +- for (in = uri; in < p - 1; in++) ++ in = uri; ++ for (; in < p - 1; in++) + *out++ = g_ascii_tolower (*in); + *out = 0; diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 9a592d4f9541a49cb363d74333dbcf1d2ab21a2a..f4157cdd8d0aed5f2208d94b83bd7dc1cc2706c9 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -2,7 +2,7 @@ , libiconvOrEmpty, libintlOrEmpty, zlib, libffi, pcre, libelf # this is just for tests (not in closure of any regular package) -, libxml2, tzdata, desktop_file_utils, shared_mime_info, doCheck ? false +, coreutils, dbus_daemon, libxml2, tzdata, desktop_file_utils, shared_mime_info, doCheck ? false }: with stdenv.lib; @@ -49,6 +49,8 @@ stdenv.mkDerivation rec { sha256 = "1d98mbqjmc34s8095lkw1j1bwvnnkw9581yfvjaikjvfjsaz29qd"; }; + patches = optional stdenv.isDarwin ./darwin-compilation.patch; + setupHook = ./setup-hook.sh; buildInputs = [ libelf ] @@ -67,18 +69,32 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin " -lintl" + optionalString stdenv.isSunOS " -DBSD_COMP"; + preBuild = optionalString stdenv.isDarwin + '' + export MACOSX_DEPLOYMENT_TARGET= + ''; + enableParallelBuilding = true; inherit doCheck; preCheck = optionalString doCheck # libgcc_s.so.1 must be installed for pthread_cancel to work # also point to the glib/.libs path - '' export LD_LIBRARY_PATH="$(dirname $(echo ${stdenv.gcc.gcc}/lib*/libgcc_s.so)):$NIX_BUILD_TOP/${name}/glib/.libs:$LD_LIBRARY_PATH" + '' export LD_LIBRARY_PATH="${stdenv.gcc.gcc}/lib:$NIX_BUILD_TOP/${name}/glib/.libs:$LD_LIBRARY_PATH" export TZDIR="${tzdata}/share/zoneinfo" export XDG_CACHE_HOME="$TMP" export XDG_RUNTIME_HOME="$TMP" export HOME="$TMP" export XDG_DATA_DIRS="${desktop_file_utils}/share:${shared_mime_info}/share" + export G_TEST_DBUS_DAEMON="${dbus_daemon}/bin/dbus-daemon" + + substituteInPlace gio/tests/desktop-files/home/applications/epiphany-weather-for-toronto-island-9c6a4e022b17686306243dada811d550d25eb1fb.desktop --replace "Exec=/bin/true" "Exec=${coreutils}/bin/true" + # Needs machine-id, comment the test + sed -e '/\/gdbus\/codegen-peer-to-peer/ s/^\/*/\/\//' -i gio/tests/gdbus-peer.c + # All gschemas fail to pass the test, upstream bug? + sed -e '/g_test_add_data_func/ s/^\/*/\/\//' -i gio/tests/gschema-compile.c + # Needed because of libtool wrappers + sed -e '/g_subprocess_launcher_set_environ (launcher, envp);/a g_subprocess_launcher_setenv (launcher, "PATH", g_getenv("PATH"), TRUE);' -i gio/tests/gsubprocess.c ''; postInstall = ''rm -rvf $out/share/gtk-doc''; diff --git a/pkgs/development/libraries/glibc/2.19/common.nix b/pkgs/development/libraries/glibc/2.19/common.nix index b153d91934b37db32a5cd7b35d18bb602f9d85ff..cd1ba747d7c672314f02286b045e2d22cb09ec7c 100644 --- a/pkgs/development/libraries/glibc/2.19/common.nix +++ b/pkgs/development/libraries/glibc/2.19/common.nix @@ -58,6 +58,8 @@ stdenv.mkDerivation ({ ./fix_path_attribute_in_getconf.patch ./fix-math.patch + + ./cve-2014-0475.patch ]; postPatch = '' @@ -179,7 +181,7 @@ stdenv.mkDerivation ({ most systems with the Linux kernel. ''; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; #platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/glibc/2.19/cve-2014-0475.patch b/pkgs/development/libraries/glibc/2.19/cve-2014-0475.patch new file mode 100644 index 0000000000000000000000000000000000000000..a4f983de8f6cfabdc15a0c4d239dc37f730950ff --- /dev/null +++ b/pkgs/development/libraries/glibc/2.19/cve-2014-0475.patch @@ -0,0 +1,170 @@ +Picked from upstream commits, but excluding changes to news and tests: +d183645616b0533 and 4e8f95a0df7c2 +Also see https://sourceware.org/bugzilla/show_bug.cgi?id=17137 + +diff --git a/locale/setlocale.c b/locale/setlocale.c +index 9458468..6455b8b 100644 +--- a/locale/setlocale.c ++++ b/locale/setlocale.c +@@ -272,6 +272,8 @@ setlocale (int category, const char *locale) + of entries of the form `CATEGORY=VALUE'. */ + const char *newnames[__LC_LAST]; + struct __locale_data *newdata[__LC_LAST]; ++ /* Copy of the locale argument, for in-place splitting. */ ++ char *locale_copy = NULL; + + /* Set all name pointers to the argument name. */ + for (category = 0; category < __LC_LAST; ++category) +@@ -281,7 +283,13 @@ setlocale (int category, const char *locale) + if (__glibc_unlikely (strchr (locale, ';') != NULL)) + { + /* This is a composite name. Make a copy and split it up. */ +- char *np = strdupa (locale); ++ locale_copy = strdup (locale); ++ if (__glibc_unlikely (locale_copy == NULL)) ++ { ++ __libc_rwlock_unlock (__libc_setlocale_lock); ++ return NULL; ++ } ++ char *np = locale_copy; + char *cp; + int cnt; + +@@ -299,6 +307,7 @@ setlocale (int category, const char *locale) + { + error_return: + __libc_rwlock_unlock (__libc_setlocale_lock); ++ free (locale_copy); + + /* Bogus category name. */ + ERROR_RETURN; +@@ -391,8 +400,9 @@ setlocale (int category, const char *locale) + /* Critical section left. */ + __libc_rwlock_unlock (__libc_setlocale_lock); + +- /* Free the resources (the locale path variable). */ ++ /* Free the resources. */ + free (locale_path); ++ free (locale_copy); + + return composite; + } +diff --git a/locale/findlocale.c b/locale/findlocale.c +index bbaf708..22e8b53 100644 +--- a/locale/findlocale.c ++++ b/locale/findlocale.c +@@ -17,6 +17,7 @@ + . */ + + #include ++#include + #include + #include + #include +@@ -57,6 +58,45 @@ struct loaded_l10nfile *_nl_locale_file_list[__LC_LAST]; + + const char _nl_default_locale_path[] attribute_hidden = LOCALEDIR; + ++/* Checks if the name is actually present, that is, not NULL and not ++ empty. */ ++static inline int ++name_present (const char *name) ++{ ++ return name != NULL && name[0] != '\0'; ++} ++ ++/* Checks that the locale name neither extremely long, nor contains a ++ ".." path component (to prevent directory traversal). */ ++static inline int ++valid_locale_name (const char *name) ++{ ++ /* Not set. */ ++ size_t namelen = strlen (name); ++ /* Name too long. The limit is arbitrary and prevents stack overflow ++ issues later. */ ++ if (__glibc_unlikely (namelen > 255)) ++ return 0; ++ /* Directory traversal attempt. */ ++ static const char slashdot[4] = {'/', '.', '.', '/'}; ++ if (__glibc_unlikely (memmem (name, namelen, ++ slashdot, sizeof (slashdot)) != NULL)) ++ return 0; ++ if (namelen == 2 && __glibc_unlikely (name[0] == '.' && name [1] == '.')) ++ return 0; ++ if (namelen >= 3 ++ && __glibc_unlikely (((name[0] == '.' ++ && name[1] == '.' ++ && name[2] == '/') ++ || (name[namelen - 3] == '/' ++ && name[namelen - 2] == '.' ++ && name[namelen - 1] == '.')))) ++ return 0; ++ /* If there is a slash in the name, it must start with one. */ ++ if (__glibc_unlikely (memchr (name, '/', namelen) != NULL) && name[0] != '/') ++ return 0; ++ return 1; ++} + + struct __locale_data * + internal_function +@@ -65,7 +105,7 @@ _nl_find_locale (const char *locale_path, size_t locale_path_len, + { + int mask; + /* Name of the locale for this category. */ +- char *loc_name; ++ char *loc_name = (char *) *name; + const char *language; + const char *modifier; + const char *territory; +@@ -73,31 +113,39 @@ _nl_find_locale (const char *locale_path, size_t locale_path_len, + const char *normalized_codeset; + struct loaded_l10nfile *locale_file; + +- if ((*name)[0] == '\0') ++ if (loc_name[0] == '\0') + { + /* The user decides which locale to use by setting environment + variables. */ +- *name = getenv ("LC_ALL"); +- if (*name == NULL || (*name)[0] == '\0') +- *name = getenv (_nl_category_names.str ++ loc_name = getenv ("LC_ALL"); ++ if (!name_present (loc_name)) ++ loc_name = getenv (_nl_category_names.str + + _nl_category_name_idxs[category]); +- if (*name == NULL || (*name)[0] == '\0') +- *name = getenv ("LANG"); ++ if (!name_present (loc_name)) ++ loc_name = getenv ("LANG"); ++ if (!name_present (loc_name)) ++ loc_name = (char *) _nl_C_name; + } + +- if (*name == NULL || (*name)[0] == '\0' +- || (__builtin_expect (__libc_enable_secure, 0) +- && strchr (*name, '/') != NULL)) +- *name = (char *) _nl_C_name; ++ /* We used to fall back to the C locale if the name contains a slash ++ character '/', but we now check for directory traversal in ++ valid_locale_name, so this is no longer necessary. */ + +- if (__builtin_expect (strcmp (*name, _nl_C_name), 1) == 0 +- || __builtin_expect (strcmp (*name, _nl_POSIX_name), 1) == 0) ++ if (__builtin_expect (strcmp (loc_name, _nl_C_name), 1) == 0 ++ || __builtin_expect (strcmp (loc_name, _nl_POSIX_name), 1) == 0) + { + /* We need not load anything. The needed data is contained in + the library itself. */ + *name = (char *) _nl_C_name; + return _nl_C[category]; + } ++ else if (!valid_locale_name (loc_name)) ++ { ++ __set_errno (EINVAL); ++ return NULL; ++ } ++ ++ *name = loc_name; + + /* We really have to load some data. First we try the archive, + but only if there was no LOCPATH environment variable specified. */ diff --git a/pkgs/development/libraries/glibmm/default.nix b/pkgs/development/libraries/glibmm/default.nix index 6801012e855386cd6cfb5cd6c5698954c36f3ec0..66fb0179489c19d97ee690eb2245572ebffa1876 100644 --- a/pkgs/development/libraries/glibmm/default.nix +++ b/pkgs/development/libraries/glibmm/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { homepage = http://gtkmm.org/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = with stdenv.lib.maintainers; [urkud raskin]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/glpk/default.nix b/pkgs/development/libraries/glpk/default.nix index eb653591005e4a9006766598dc78c0accd1085ad..2b1a5b571ef07c041f117be4ac7cf2b403aed15f 100644 --- a/pkgs/development/libraries/glpk/default.nix +++ b/pkgs/development/libraries/glpk/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.gnu.org/software/glpk/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.bjg ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/gmm/default.nix b/pkgs/development/libraries/gmm/default.nix index f87211195d52748d39121065c5ee802c19887d30..d79293eced14e4e33d49ee636c44a801f7a047f3 100644 --- a/pkgs/development/libraries/gmm/default.nix +++ b/pkgs/development/libraries/gmm/default.nix @@ -11,6 +11,6 @@ stdenv.mkDerivation { meta = { description = "Generic C++ template library for sparse, dense and skyline matrices"; homepage = http://home.gna.org/getfem/gmm_intro.html; - license = "LGLP2.1"; # or later + license = stdenv.lib.licenses.lgpl21Plus; }; } diff --git a/pkgs/development/libraries/gmp/4.3.2.nix b/pkgs/development/libraries/gmp/4.3.2.nix index f003979c701cf04575e5f65ca947223d62235004..d0559c46795b54dfde668b26dac75248583054b9 100644 --- a/pkgs/development/libraries/gmp/4.3.2.nix +++ b/pkgs/development/libraries/gmp/4.3.2.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { ''; homepage = http://gmplib.org/; - license = "LGPLv3+"; + license = stdenv.lib.licenses.lgpl3Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/gmp/5.0.5.nix b/pkgs/development/libraries/gmp/5.0.5.nix index 461187a509cd7a7cd8c9c587aa20f650df52ef3e..c96c830e2f7fa942df53f60af429268ece67b78a 100644 --- a/pkgs/development/libraries/gmp/5.0.5.nix +++ b/pkgs/development/libraries/gmp/5.0.5.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { ''; homepage = http://gmplib.org/; - license = "LGPLv3+"; + license = stdenv.lib.licenses.lgpl3Plus; maintainers = [ stdenv.lib.maintainers.ludo stdenv.lib.maintainers.simons ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/gnutls/3.1.nix b/pkgs/development/libraries/gnutls/3.1.nix index 89306540694b8811ab165764acf166ff5a3f3a75..6aea78a3ac52315e0151f594d89e880d8b913683 100644 --- a/pkgs/development/libraries/gnutls/3.1.nix +++ b/pkgs/development/libraries/gnutls/3.1.nix @@ -61,8 +61,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.gnu.org/software/gnutls/; - license = "LGPLv2.1+"; + license = stdenv.lib.licenses.lgpl21Plus; maintainers = [ stdenv.lib.maintainers.eelco ]; }; } - diff --git a/pkgs/development/libraries/gnutls/3.2.nix b/pkgs/development/libraries/gnutls/3.2.nix index ca9c003dfe74bb25402d18dace5b4fdca6edb53a..cd48e08a39c4e3e1cfd389c96b3d4a23382de68e 100644 --- a/pkgs/development/libraries/gnutls/3.2.nix +++ b/pkgs/development/libraries/gnutls/3.2.nix @@ -63,9 +63,8 @@ stdenv.mkDerivation rec { ''; homepage = http://www.gnu.org/software/gnutls/; - license = "LGPLv2.1+"; + license = stdenv.lib.licenses.lgpl21Plus; maintainers = [ stdenv.lib.maintainers.eelco ]; platforms = stdenv.lib.platforms.all; }; } - diff --git a/pkgs/development/libraries/gsasl/default.nix b/pkgs/development/libraries/gsasl/default.nix index 70b4ab8639d363d8595688c8a2993112152be300..383c1a7e223ae35a6b42aed2c7b57e8105a25f47 100644 --- a/pkgs/development/libraries/gsasl/default.nix +++ b/pkgs/development/libraries/gsasl/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.gnu.org/software/gsasl/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [ ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/gsl/default.nix b/pkgs/development/libraries/gsl/default.nix index 9631746691f83062933da02e693812394bc169e1..da4796fba89640037d4f0c3a65482ba292cf32e6 100644 --- a/pkgs/development/libraries/gsl/default.nix +++ b/pkgs/development/libraries/gsl/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "The GNU Scientific Library, a large numerical library"; homepage = http://www.gnu.org/software/gsl/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; longDescription = '' The GNU Scientific Library (GSL) is a numerical library for C diff --git a/pkgs/development/libraries/gss/default.nix b/pkgs/development/libraries/gss/default.nix index 4959a70ca631e598f61f1479f5ebd1868c23cbb4..207b82486981068ba8cef34e8307e5d8e08472b3 100644 --- a/pkgs/development/libraries/gss/default.nix +++ b/pkgs/development/libraries/gss/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.gnu.org/software/gss/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.bjg ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/gssdp/default.nix b/pkgs/development/libraries/gssdp/default.nix index 466406fbe793db1d9db14d636683b31733fd58c9..792b6d2e4dbc9ec5b5d98bb9ef87ea9a8c83a749 100644 --- a/pkgs/development/libraries/gssdp/default.nix +++ b/pkgs/development/libraries/gssdp/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = { description = "GObject-based API for handling resource discovery and announcement over SSDP"; homepage = http://www.gupnp.org/; - license = "LGPL v2"; + license = stdenv.lib.licenses.lgpl2; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/libraries/gstreamer/legacy/gnonlin/default.nix b/pkgs/development/libraries/gstreamer/legacy/gnonlin/default.nix index 820e8eb07c9e77be44c2377ebba63fec84a28133..ff26e727e9f3fd2807d1f5f09dd9db98a8076e15 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gnonlin/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gnonlin/default.nix @@ -16,6 +16,6 @@ stdenv.mkDerivation rec { meta = { homepage = "http://gstreamer.freedesktop.org/modules/gnonlin.html"; description = "http://gstreamer.freedesktop.org/modules/gnonlin.html"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-ffmpeg/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-ffmpeg/default.nix index 49c612f59e743b45e5942b03b6700bd69216dc9b..89b6e73e6b6d5073d101038959d269ab7115f8e3 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-ffmpeg/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-ffmpeg/default.nix @@ -24,6 +24,6 @@ stdenv.mkDerivation rec { meta = { homepage = "http://gstreamer.freedesktop.org/releases/gst-ffmpeg"; description = "GStreamer's plug-in using FFmpeg"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-bad/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-bad/default.nix index a433d717039f2fe40aa98418ae0a20e3800d5250..988d1bba258af8d72213d9c384faab6f2c515683 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-bad/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-bad/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; }; } diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix index a09f827976080ecda76c1baa4fc9317352debd03..a0cd0a4c646f8e3cfd5ff277e5b2a31d0b7c3075 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix @@ -35,6 +35,6 @@ stdenv.mkDerivation rec { maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; }; } diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix index 769de911fd6ab6bb01e1e156a34d1e04da1de1e4..e4411fcefbbd70bc341379cf44d267734590c806 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; }; } diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-python/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-python/default.nix index e960aa90421bc5287d5e5a2483f71709098bb13c..d01961f5cdeb72d742bb0e3ac3eddcba0603ad8f 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-python/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-python/default.nix @@ -24,7 +24,6 @@ stdenv.mkDerivation rec { description = "Python bindings for GStreamer"; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; }; } - diff --git a/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix index cadef680272835003a8703fb1da3a26f3bfa385f..f781c624cea1a0d81aade057846d819a7c6662f4 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix @@ -48,6 +48,6 @@ stdenv.mkDerivation rec { interface. ''; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; }; } diff --git a/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix b/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix index 1427ec866a9c866516262617fa769a433b118e67..97a4638170f9534e8039432cbd482eb36335d777 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "C++ bindings for the GStreamer streaming multimedia library"; homepage = http://www.gtkmm.org/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = "Philip Lykke Carlsen "; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/gstreamer/python/default.nix b/pkgs/development/libraries/gstreamer/python/default.nix index 9a526de05b1c4bc30fca0333fca5d10e1acac705..d20f06635da9cd11e02cf7aa400b8bcfe483e4b6 100644 --- a/pkgs/development/libraries/gstreamer/python/default.nix +++ b/pkgs/development/libraries/gstreamer/python/default.nix @@ -30,7 +30,6 @@ stdenv.mkDerivation rec { description = "Python bindings for GStreamer"; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; }; } - diff --git a/pkgs/development/libraries/gtest/default.nix b/pkgs/development/libraries/gtest/default.nix index 1e030d4d7ce02d28a96bed841b524a0871d3c9d6..a59e3d07cb445895bf5472791f1a53adbfe5cf79 100644 --- a/pkgs/development/libraries/gtest/default.nix +++ b/pkgs/development/libraries/gtest/default.nix @@ -21,6 +21,7 @@ stdenv.mkDerivation rec { mkdir -p $out/lib cp -v libgtest.a libgtest_main.a $out/lib cp -v -r ../include $out + cp -v -r ../src $out ''; meta = { diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk+/2.x.nix index c57179364a7c4e1daeaaef1ed2e8f3ee7a4f29cd..8812ea70c796f8c4c24dc73e6c30326b96cf3e07 100644 --- a/pkgs/development/libraries/gtk+/2.x.nix +++ b/pkgs/development/libraries/gtk+/2.x.nix @@ -8,11 +8,11 @@ assert xineramaSupport -> xlibs.libXinerama != null; assert cupsSupport -> cups != null; stdenv.mkDerivation rec { - name = "gtk+-2.24.23"; + name = "gtk+-2.24.24"; src = fetchurl { url = "mirror://gnome/sources/gtk+/2.24/${name}.tar.xz"; - sha256 = "0z2ic7fma1lmmv4ncgki3vadqp7d0qkj2d235impsplvgvi0d950"; + sha256 = "0v9xxpkypizy9k866rvqc36zvj4kj9p8nd1nxf9znay8k3hv5khj"; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index ef8f3e398832b752de9fe5a1683f8a06279a537b..09221502e363ede9821b209aa7cfebecc742d120 100644 --- a/pkgs/development/libraries/gtk+/3.x.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { homepage = http://www.gtk.org/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = with stdenv.lib.maintainers; [ urkud raskin vcunat]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/gtkdatabox/default.nix b/pkgs/development/libraries/gtkdatabox/default.nix index 43d0db9755a318d43ae8c685e2daecc4561a29ab..69a0341a6953aa9f2a79c409575cae04fd6f018a 100644 --- a/pkgs/development/libraries/gtkdatabox/default.nix +++ b/pkgs/development/libraries/gtkdatabox/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "Gtk+ widget for displaying large amounts of numerical data"; - license = "LGPLv2"; + license = stdenv.lib.licenses.lgpl2; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/gtkimageview/default.nix b/pkgs/development/libraries/gtkimageview/default.nix index 17dc5469910fde8aa13e6159356d204a689b8fee..6905adcd71e3ab1cc136b38e1a8a7c7c2caa9c21 100644 --- a/pkgs/development/libraries/gtkimageview/default.nix +++ b/pkgs/development/libraries/gtkimageview/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { interpolation; GIF animation support. ''; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ ]; }; diff --git a/pkgs/development/libraries/gtkmathview/default.nix b/pkgs/development/libraries/gtkmathview/default.nix index eaccf2fb08bc3c1828a8896dab15bae623d14709..2620d9cc120c8931f4464d0c04c45044ca8b12fd 100644 --- a/pkgs/development/libraries/gtkmathview/default.nix +++ b/pkgs/development/libraries/gtkmathview/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = { homepage = http://helm.cs.unibo.it/mml-widget/; description = "GtkMathView is a C++ rendering engine for MathML documents"; - license = "LGPLv3+"; + license = stdenv.lib.licenses.lgpl3Plus; maintainers = [ stdenv.lib.maintainers.roconnor ]; }; } diff --git a/pkgs/development/libraries/gtkmm/2.x.nix b/pkgs/development/libraries/gtkmm/2.x.nix index 0b59cbfc4892f1a2ad965e824d0677bb01b25e17..727e4b2185c00178b58bfa9724e4d56a571e6812 100644 --- a/pkgs/development/libraries/gtkmm/2.x.nix +++ b/pkgs/development/libraries/gtkmm/2.x.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { homepage = http://gtkmm.org/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = with stdenv.lib.maintainers; [ raskin vcunat ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/gtkmm/3.x.nix b/pkgs/development/libraries/gtkmm/3.x.nix index 600ea1a0278f285c588eba65aae40e66ef697d8c..47057b819e0bec4635ce828721661ceee7573269 100644 --- a/pkgs/development/libraries/gtkmm/3.x.nix +++ b/pkgs/development/libraries/gtkmm/3.x.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { homepage = http://gtkmm.org/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = with stdenv.lib.maintainers; [ raskin urkud vcunat ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/gts/default.nix b/pkgs/development/libraries/gts/default.nix index 7724bc5cc3ab24f00e71dab3c625c12b0b44ce2d..17ab80ce5868d321ebd801c2a28ded6c15626da7 100644 --- a/pkgs/development/libraries/gts/default.nix +++ b/pkgs/development/libraries/gts/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://gts.sourceforge.net/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; description = "GNU Triangulated Surface Library"; longDescription = '' diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index 2e596b17af3d521007880daf5f9edd4c60d3675f..8340660e392357c326da9e58ee9e86afe56c4cc0 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -8,11 +8,11 @@ # (icu is a ~30 MB dependency, the rest is very small in comparison) stdenv.mkDerivation rec { - name = "harfbuzz-0.9.28"; + name = "harfbuzz-0.9.33"; src = fetchurl { url = "http://www.freedesktop.org/software/harfbuzz/release/${name}.tar.bz2"; - sha256 = "0j70ppl2qrfx8yzdl8ki63wcxgrlhkyl31p1a6bhmbqqh32zfrx5"; + sha256 = "1iql2ghlndqgx9q6p098xf253rjz5rnrv5qniwgd1b5q0jzwa4yk"; }; configureFlags = [ diff --git a/pkgs/development/libraries/haskell/AC-Vector/default.nix b/pkgs/development/libraries/haskell/AC-Vector/default.nix index 4dd3e78652c3a717237b76334651b9d08ad076a9..6693daef619b4e3ec5d21ca786affa21093492d6 100644 --- a/pkgs/development/libraries/haskell/AC-Vector/default.nix +++ b/pkgs/development/libraries/haskell/AC-Vector/default.nix @@ -10,6 +10,5 @@ cabal.mkDerivation (self: { description = "Efficient geometric vectors and transformations"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/BlogLiterately/default.nix b/pkgs/development/libraries/haskell/BlogLiterately/default.nix index 9937b1029a6fb2dc74fdbf2d63702567a28b9c1c..5cb9fa07138a19213ef1211e6db6664c7ee8fe80 100644 --- a/pkgs/development/libraries/haskell/BlogLiterately/default.nix +++ b/pkgs/development/libraries/haskell/BlogLiterately/default.nix @@ -22,5 +22,7 @@ cabal.mkDerivation (self: { description = "A tool for posting Haskelly articles to blogs"; license = "GPL"; platforms = self.ghc.meta.platforms; + hydraPlatforms = self.stdenv.lib.platforms.none; + broken = true; }; }) diff --git a/pkgs/development/libraries/haskell/Boolean/default.nix b/pkgs/development/libraries/haskell/Boolean/default.nix index e07436c2256164de8e03d034df4bda86f48d4293..53eea4f738deb9eaf5a68043f6954f3f72a94cc9 100644 --- a/pkgs/development/libraries/haskell/Boolean/default.nix +++ b/pkgs/development/libraries/haskell/Boolean/default.nix @@ -10,6 +10,5 @@ cabal.mkDerivation (self: { description = "Generalized booleans and numbers"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/Cabal/1.14.0.nix b/pkgs/development/libraries/haskell/Cabal/1.14.0.nix index 45af5f985860d8918b135585edb62d504b0db72c..a905017472f6bbbc119c117a6525b2f5f2f136e3 100644 --- a/pkgs/development/libraries/haskell/Cabal/1.14.0.nix +++ b/pkgs/development/libraries/haskell/Cabal/1.14.0.nix @@ -18,9 +18,7 @@ cabal.mkDerivation (self: { description = "A framework for packaging Haskell software"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + hydraPlatforms = self.stdenv.lib.platforms.none; + maintainers = with self.stdenv.lib.maintainers; [ simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/Cabal/1.16.0.3.nix b/pkgs/development/libraries/haskell/Cabal/1.16.0.3.nix index be54e41eb20fe2f1943dbc6a1662d2257f07d010..7f8b0631fc6cd59b63fe7b0adeae5996de0d26e6 100644 --- a/pkgs/development/libraries/haskell/Cabal/1.16.0.3.nix +++ b/pkgs/development/libraries/haskell/Cabal/1.16.0.3.nix @@ -19,9 +19,7 @@ cabal.mkDerivation (self: { description = "A framework for packaging Haskell software"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + hydraPlatforms = self.stdenv.lib.platforms.none; + maintainers = with self.stdenv.lib.maintainers; [ simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/Cabal/1.18.1.3.nix b/pkgs/development/libraries/haskell/Cabal/1.18.1.3.nix index 8df99f7c900eda3ec6f3368d15531489cb3e2f4e..27673beb1a0749819598c2faf69e4846eacfb009 100644 --- a/pkgs/development/libraries/haskell/Cabal/1.18.1.3.nix +++ b/pkgs/development/libraries/haskell/Cabal/1.18.1.3.nix @@ -20,9 +20,7 @@ cabal.mkDerivation (self: { description = "A framework for packaging Haskell software"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + hydraPlatforms = self.stdenv.lib.platforms.none; + maintainers = with self.stdenv.lib.maintainers; [ simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/Cabal/1.20.0.1.nix b/pkgs/development/libraries/haskell/Cabal/1.20.0.2.nix similarity index 78% rename from pkgs/development/libraries/haskell/Cabal/1.20.0.1.nix rename to pkgs/development/libraries/haskell/Cabal/1.20.0.2.nix index 67faefb7a67bb3d2abf45c329aa47773df71d015..ac417de67a1695bda5dffc3e56b0ad8075b75cf7 100644 --- a/pkgs/development/libraries/haskell/Cabal/1.20.0.1.nix +++ b/pkgs/development/libraries/haskell/Cabal/1.20.0.2.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "Cabal"; - version = "1.20.0.1"; - sha256 = "0vcpw4rskqlg2swsxk93p77svb007qvpwlpj2ia55avpi4c3xf8m"; + version = "1.20.0.2"; + sha256 = "00mz24fj3qpq6rl3n3i73x6k0jzqix24k9izrlkzg07mpjcj4k93"; buildDepends = [ deepseq filepath time ]; testDepends = [ extensibleExceptions filepath HUnit QuickCheck regexPosix @@ -20,9 +20,6 @@ cabal.mkDerivation (self: { description = "A framework for packaging Haskell software"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = with self.stdenv.lib.maintainers; [ simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/Chart-cairo/default.nix b/pkgs/development/libraries/haskell/Chart-cairo/default.nix index eb0d5127c85569fefb7bd97c38d72299021dfef0..d2dea8158197c231b39fc0f17a513a24098dfeae 100644 --- a/pkgs/development/libraries/haskell/Chart-cairo/default.nix +++ b/pkgs/development/libraries/haskell/Chart-cairo/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "Chart-cairo"; - version = "1.2.3"; - sha256 = "1lbl1qvgm4yxslahlms6kzfrhh8s2fcdiwmvk1bs319k1fylia1b"; + version = "1.2.4"; + sha256 = "1ggqh3v14mwv9q1pmz3hbx7g1dvibfwl1vzvag92q7432q4pqm2z"; buildDepends = [ cairo Chart colour dataDefaultClass lens mtl operational time ]; diff --git a/pkgs/development/libraries/haskell/Chart-diagrams/default.nix b/pkgs/development/libraries/haskell/Chart-diagrams/default.nix index 34cbb5511ab2c242a15e0581a17a785d91e15db4..002b762fbac247b0dba9340fc91d623d93711142 100644 --- a/pkgs/development/libraries/haskell/Chart-diagrams/default.nix +++ b/pkgs/development/libraries/haskell/Chart-diagrams/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "Chart-diagrams"; - version = "1.2.3"; - sha256 = "08ps30vn9ljiyhgakwdbixn4csy504bsw3h5z9w1dxhn27wij772"; + version = "1.2.4"; + sha256 = "099frqvfjqqc7h3zr52saqyg37di0klr0y649afzxd7lj3d67mvw"; buildDepends = [ blazeSvg Chart colour dataDefaultClass diagramsCore diagramsLib diagramsPostscript diagramsSvg lens mtl operational SVGFonts text @@ -20,5 +20,6 @@ cabal.mkDerivation (self: { description = "Diagrams backend for Charts"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/Chart-gtk/default.nix b/pkgs/development/libraries/haskell/Chart-gtk/default.nix index 0b281026b185658d0a653e0dcf63838664b19ebd..9dbb3c8ae9a9ae9660a32ca4d19b145b01a54ad5 100644 --- a/pkgs/development/libraries/haskell/Chart-gtk/default.nix +++ b/pkgs/development/libraries/haskell/Chart-gtk/default.nix @@ -4,10 +4,9 @@ cabal.mkDerivation (self: { pname = "Chart-gtk"; - version = "1.2.3"; - sha256 = "0vl9nh48pa7sdrqh5a6smmfallf4mwzrvspc2v94cpnrcnickiyq"; + version = "1.2.4"; + sha256 = "16dfmkls341cmk13j1z3rw2wxdvxr5rqsv1ff4qjhjak9j7hkqjq"; buildDepends = [ cairo Chart ChartCairo colour gtk mtl time ]; - jailbreak = true; meta = { homepage = "https://github.com/timbod7/haskell-chart/wiki"; description = "Utility functions for using the chart library with GTK"; diff --git a/pkgs/development/libraries/haskell/Chart/default.nix b/pkgs/development/libraries/haskell/Chart/default.nix index fbadacf2e60a987c9ee9b9f828416e562d8938f1..d5696a562da43403945f75dbf64288ab03ce992f 100644 --- a/pkgs/development/libraries/haskell/Chart/default.nix +++ b/pkgs/development/libraries/haskell/Chart/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "Chart"; - version = "1.2.3"; - sha256 = "067bahxig5xyd6zasi74k86qb7bxvbs3shjn9fbslhyckxg50q1j"; + version = "1.2.4"; + sha256 = "0zizrkxsligvxs5x5r2j0pynf6ncjl4mgyzbh1zfqgnz29frylh7"; buildDepends = [ colour dataDefaultClass lens mtl operational time ]; @@ -15,6 +15,5 @@ cabal.mkDerivation (self: { description = "A library for generating 2D Charts and Plots"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/ChasingBottoms/default.nix b/pkgs/development/libraries/haskell/ChasingBottoms/default.nix index 34087a5836bb7461a7edb5b6e9da6a609cac9142..715793c7e9a70f5c72ac35a8eb30ba7af25a7171 100644 --- a/pkgs/development/libraries/haskell/ChasingBottoms/default.nix +++ b/pkgs/development/libraries/haskell/ChasingBottoms/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "ChasingBottoms"; - version = "1.3.0.7"; - sha256 = "0g1bx6d2mi27qsb4bxvby50g39fm56gyi2658fyjiq1gamy50ypa"; + version = "1.3.0.8"; + sha256 = "1f6jg4j17s3y7hcz9gp7cffa77p57xgzv15ng5ypcxpq603721dv"; isLibrary = true; isExecutable = true; buildDepends = [ mtl QuickCheck random syb ]; diff --git a/pkgs/development/libraries/haskell/ConfigFile/default.nix b/pkgs/development/libraries/haskell/ConfigFile/default.nix index d7a33dab28e54ef75b84c301dd64820f48142482..1de333a04d95dc5dc0e126a3a0db23cfacef7eab 100644 --- a/pkgs/development/libraries/haskell/ConfigFile/default.nix +++ b/pkgs/development/libraries/haskell/ConfigFile/default.nix @@ -14,6 +14,5 @@ cabal.mkDerivation (self: { description = "Configuration file reading & writing"; license = "LGPL"; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/CouchDB/default.nix b/pkgs/development/libraries/haskell/CouchDB/default.nix index a7035aa70338a57f133f962481814e08e14a7a1c..44a5d50edc5a96e30e4161af7b1d0c24e4ae595f 100644 --- a/pkgs/development/libraries/haskell/CouchDB/default.nix +++ b/pkgs/development/libraries/haskell/CouchDB/default.nix @@ -8,12 +8,12 @@ cabal.mkDerivation (self: { sha256 = "0a9g0iblfyqppcy1ni3ac8f3yv5km95bfblhwqlsk6khydi5ka98"; buildDepends = [ HTTP json mtl network utf8String ]; testDepends = [ HTTP HUnit json mtl network utf8String ]; + jailbreak = true; doCheck = false; meta = { homepage = "http://github.com/arjunguha/haskell-couchdb/"; description = "CouchDB interface"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/Crypto/default.nix b/pkgs/development/libraries/haskell/Crypto/default.nix index f2ee437d1af9a1300ea3440f07a584c31b8846d5..d9a494fe94e69dd795e647550afb43b444d3c487 100644 --- a/pkgs/development/libraries/haskell/Crypto/default.nix +++ b/pkgs/development/libraries/haskell/Crypto/default.nix @@ -13,6 +13,5 @@ cabal.mkDerivation (self: { description = "Collects together existing Haskell cryptographic functions into a package"; license = "unknown"; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/DAV/default.nix b/pkgs/development/libraries/haskell/DAV/default.nix index c75b82dcf15ddd771cb96f00500b4d7bb5bdbaa7..b8f6fbf3401dda0486f608bc5cd9812cfa72451f 100644 --- a/pkgs/development/libraries/haskell/DAV/default.nix +++ b/pkgs/development/libraries/haskell/DAV/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "DAV"; - version = "0.6.2"; - sha256 = "1alnjm0rfr7kwj6jax10bg8rcs8523n5dxyvw0mm65qykf78cprl"; + version = "0.8"; + sha256 = "0khjid5jaaf4c3xn9cbph8ay4ibqr7pg3b3w7d0kfvci90ksc08r"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/Diff/default.nix b/pkgs/development/libraries/haskell/Diff/default.nix index a556dc8958da7ecc8db6a582564070c80106ee93..478cb6d657abb79e4202fe353fcf23edced7f8a9 100644 --- a/pkgs/development/libraries/haskell/Diff/default.nix +++ b/pkgs/development/libraries/haskell/Diff/default.nix @@ -10,6 +10,5 @@ cabal.mkDerivation (self: { description = "O(ND) diff algorithm in haskell"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/EitherT/default.nix b/pkgs/development/libraries/haskell/EitherT/default.nix index 4e8074409c8d5f6884f1bee76e3098894cdc2036..66ccb6a8d4e9429bba5e37a855bbf3c6edab25fa 100644 --- a/pkgs/development/libraries/haskell/EitherT/default.nix +++ b/pkgs/development/libraries/haskell/EitherT/default.nix @@ -11,6 +11,6 @@ cabal.mkDerivation (self: { description = "EitherT monad transformer"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + maintainers = with self.stdenv.lib.maintainers; [ ocharles ]; }; }) diff --git a/pkgs/development/libraries/haskell/FerryCore/default.nix b/pkgs/development/libraries/haskell/FerryCore/default.nix index 6b1b71a22f1e09a6a7a896e9024f940f2b19b658..6f0405807fb78900169769f0ab76abfba0900143 100644 --- a/pkgs/development/libraries/haskell/FerryCore/default.nix +++ b/pkgs/development/libraries/haskell/FerryCore/default.nix @@ -11,6 +11,5 @@ cabal.mkDerivation (self: { description = "Ferry Core Components"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/GLFW/default.nix b/pkgs/development/libraries/haskell/GLFW/default.nix index 4abea15c51d7217767e21fe946c25285604593e2..fb554c95dfca38365c3c811459e1d991a3f0502c 100644 --- a/pkgs/development/libraries/haskell/GLFW/default.nix +++ b/pkgs/development/libraries/haskell/GLFW/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "GLFW"; - version = "0.5.2.0"; - sha256 = "06vps929dmk9yimfv7jj12m0p0bf4ih0ssf6rbcq2j6i9wbhpxq3"; + version = "0.5.2.2"; + sha256 = "0yqvfkg9p5h5bv3ak6b89am9kan9lbcq26kg1wk53xl6mz1aaijf"; buildDepends = [ OpenGL ]; extraLibraries = [ libX11 mesa ]; meta = { @@ -13,6 +13,5 @@ cabal.mkDerivation (self: { description = "A Haskell binding for GLFW"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/GLURaw/1.3.0.0.nix b/pkgs/development/libraries/haskell/GLURaw/1.3.0.0.nix index 16bd7641ad7292ba5a35a13e34a40c9ba38766c0..bf23628a71019fa0d833ad675cb2597596926072 100644 --- a/pkgs/development/libraries/haskell/GLURaw/1.3.0.0.nix +++ b/pkgs/development/libraries/haskell/GLURaw/1.3.0.0.nix @@ -13,6 +13,6 @@ cabal.mkDerivation (self: { description = "A raw binding for the OpenGL graphics system"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/GLURaw/1.4.0.1.nix b/pkgs/development/libraries/haskell/GLURaw/1.4.0.1.nix index 1241b88cb9911e06392a8c55bedbb3bc02617a6b..d389d7ecf046b56eadb243f3033c7cc33cdbf6e8 100644 --- a/pkgs/development/libraries/haskell/GLURaw/1.4.0.1.nix +++ b/pkgs/development/libraries/haskell/GLURaw/1.4.0.1.nix @@ -13,6 +13,5 @@ cabal.mkDerivation (self: { description = "A raw binding for the OpenGL graphics system"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/GLUT/2.1.1.2.nix b/pkgs/development/libraries/haskell/GLUT/2.1.1.2.nix index 1b3741fad0de16e7b13dd0c60a1e5a99a8bb816b..88a10caac094c0e56ee2e0c9c41e50a801bb76c1 100644 --- a/pkgs/development/libraries/haskell/GLUT/2.1.1.2.nix +++ b/pkgs/development/libraries/haskell/GLUT/2.1.1.2.nix @@ -13,6 +13,6 @@ cabal.mkDerivation (self: { description = "A binding for the OpenGL Utility Toolkit"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix b/pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix index c69c8b282a4a944675a5c0aa68e32cc41dbbdc5e..a9988a53328508e8cca854045c645b16654b366a 100644 --- a/pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix +++ b/pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix @@ -14,6 +14,6 @@ cabal.mkDerivation (self: { description = "A binding for the OpenGL Utility Toolkit"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/GLUT/2.1.2.2.nix b/pkgs/development/libraries/haskell/GLUT/2.1.2.2.nix index af1eac9e43d721bad218d01d5609ecaa92f49c40..c92565ca4afa0cc4216a7b262997fea4e3083740 100644 --- a/pkgs/development/libraries/haskell/GLUT/2.1.2.2.nix +++ b/pkgs/development/libraries/haskell/GLUT/2.1.2.2.nix @@ -14,6 +14,6 @@ cabal.mkDerivation (self: { description = "A binding for the OpenGL Utility Toolkit"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/GLUT/2.2.2.1.nix b/pkgs/development/libraries/haskell/GLUT/2.2.2.1.nix index c284ec40ad5cacf3ed632a267c138b9bf1f78529..0bac3e0d5dba5b6a670a183557661496d2c96544 100644 --- a/pkgs/development/libraries/haskell/GLUT/2.2.2.1.nix +++ b/pkgs/development/libraries/haskell/GLUT/2.2.2.1.nix @@ -15,6 +15,6 @@ cabal.mkDerivation (self: { description = "A binding for the OpenGL Utility Toolkit"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/GLUT/2.3.1.0.nix b/pkgs/development/libraries/haskell/GLUT/2.3.1.0.nix index e8bd96f755a3276690b3464bd9469042c6e8d70e..9402d56f687eb2ae7a1a2dc660f344e33d5b1a78 100644 --- a/pkgs/development/libraries/haskell/GLUT/2.3.1.0.nix +++ b/pkgs/development/libraries/haskell/GLUT/2.3.1.0.nix @@ -15,6 +15,6 @@ cabal.mkDerivation (self: { description = "A binding for the OpenGL Utility Toolkit"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/GLUT/2.4.0.0.nix b/pkgs/development/libraries/haskell/GLUT/2.4.0.0.nix index 22ac715557a4025d6344222a2a08ce688c4d710d..c28194d7adbe550cbaa3ab8754c67e162a1008c0 100644 --- a/pkgs/development/libraries/haskell/GLUT/2.4.0.0.nix +++ b/pkgs/development/libraries/haskell/GLUT/2.4.0.0.nix @@ -15,6 +15,6 @@ cabal.mkDerivation (self: { description = "A binding for the OpenGL Utility Toolkit"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/GLUT/2.5.1.1.nix b/pkgs/development/libraries/haskell/GLUT/2.5.1.1.nix index 592de68432ef165c480ab5dda1fa31ec001e808c..b2cce8565240e602e87303fda15e80cfb23d7412 100644 --- a/pkgs/development/libraries/haskell/GLUT/2.5.1.1.nix +++ b/pkgs/development/libraries/haskell/GLUT/2.5.1.1.nix @@ -15,6 +15,5 @@ cabal.mkDerivation (self: { description = "A binding for the OpenGL Utility Toolkit"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/GLUtil/default.nix b/pkgs/development/libraries/haskell/GLUtil/default.nix index 10ab2bf69e6cd0b6e6808955bcf3933ddf74aa66..ce4b41c93e0aa65e7a864c6e37d5aeeb5dcdc649 100644 --- a/pkgs/development/libraries/haskell/GLUtil/default.nix +++ b/pkgs/development/libraries/haskell/GLUtil/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "GLUtil"; - version = "0.7.5"; - sha256 = "1rbnq1nrs2b06ph60lh0yvygk82vvnm8c4d0anhjrqw9i58nd3iz"; + version = "0.8"; + sha256 = "00r9gmwsb9gx6bcc012rhz0z0hj3my8k1i0yjnaw0jmlqswm45h8"; buildDepends = [ cpphs JuicyPixels linear OpenGL OpenGLRaw transformers vector ]; diff --git a/pkgs/development/libraries/haskell/GlomeVec/default.nix b/pkgs/development/libraries/haskell/GlomeVec/default.nix index 9eefd570146bd17d2c3861d102a16048a1f85862..0223d6c6ae5cd191b9a1d5a6872f29c9b003d740 100644 --- a/pkgs/development/libraries/haskell/GlomeVec/default.nix +++ b/pkgs/development/libraries/haskell/GlomeVec/default.nix @@ -12,6 +12,5 @@ cabal.mkDerivation (self: { description = "Simple 3D vector library"; license = "GPL"; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/Graphalyze/default.nix b/pkgs/development/libraries/haskell/Graphalyze/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..974103e16c5a583face20abc1152c6105fb4e095 --- /dev/null +++ b/pkgs/development/libraries/haskell/Graphalyze/default.nix @@ -0,0 +1,19 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, bktrees, fgl, filepath, graphviz, pandoc, random, text +, time +}: + +cabal.mkDerivation (self: { + pname = "Graphalyze"; + version = "0.14.1.0"; + sha256 = "0pyrhpl06lsppr8ch21crinkax7fh0k18wfvgjinc8phkk6j5hz3"; + buildDepends = [ + bktrees fgl filepath graphviz pandoc random text time + ]; + meta = { + description = "Graph-Theoretic Analysis library"; + license = "unknown"; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/HDBC/HDBC-odbc.nix b/pkgs/development/libraries/haskell/HDBC/HDBC-odbc.nix index 0a95e90ef4b3af7e220326513aff9db51054d71f..cadf9e3e9c24669ddae75a3d5013b7bc1a9bad93 100644 --- a/pkgs/development/libraries/haskell/HDBC/HDBC-odbc.nix +++ b/pkgs/development/libraries/haskell/HDBC/HDBC-odbc.nix @@ -16,9 +16,6 @@ cabal.mkDerivation (self: { description = "ODBC driver for HDBC"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.ocharles - ]; + maintainers = with self.stdenv.lib.maintainers; [ ocharles ]; }; }) diff --git a/pkgs/development/libraries/haskell/HDBC/HDBC-postgresql.nix b/pkgs/development/libraries/haskell/HDBC/HDBC-postgresql.nix index 5ec440e9e348e64bc27dfe687066ba11270401f1..6b0df7e9d852c3a764448666ab99fc8b125cb73b 100644 --- a/pkgs/development/libraries/haskell/HDBC/HDBC-postgresql.nix +++ b/pkgs/development/libraries/haskell/HDBC/HDBC-postgresql.nix @@ -17,6 +17,5 @@ cabal.mkDerivation (self: { description = "PostgreSQL driver for HDBC"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/HDBC/HDBC-sqlite3.nix b/pkgs/development/libraries/haskell/HDBC/HDBC-sqlite3.nix index 14ed9499b137029743965720e1af613340743fe4..563cc38dac3a4605395e7da606bf7b45e9608eb2 100644 --- a/pkgs/development/libraries/haskell/HDBC/HDBC-sqlite3.nix +++ b/pkgs/development/libraries/haskell/HDBC/HDBC-sqlite3.nix @@ -15,6 +15,5 @@ cabal.mkDerivation (self: { description = "Sqlite v3 driver for HDBC"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/HDBC/HDBC.nix b/pkgs/development/libraries/haskell/HDBC/HDBC.nix index 97cb81415e283bce14ce9a4a1d50b5a0434879e5..fb83588546212a3dd3c22c3cb583ddc072eba364 100644 --- a/pkgs/development/libraries/haskell/HDBC/HDBC.nix +++ b/pkgs/development/libraries/haskell/HDBC/HDBC.nix @@ -14,6 +14,5 @@ cabal.mkDerivation (self: { description = "Haskell Database Connectivity"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/HFuse/default.nix b/pkgs/development/libraries/haskell/HFuse/default.nix index 04ebefd37fac56beeddd1dc24020fe3169e3c9cc..510ffd4acb9c58f56fd8337719fc59e48eb22ecd 100644 --- a/pkgs/development/libraries/haskell/HFuse/default.nix +++ b/pkgs/development/libraries/haskell/HFuse/default.nix @@ -4,8 +4,10 @@ cabal.mkDerivation (self: { pname = "HFuse"; - version = "0.2.4.2"; - sha256 = "043f5x807h1dajd0bvmhln9pjkviszx1279m298w711mrszapqrq"; + version = "0.2.4.3"; + sha256 = "1daka673mx0gsnsa04pxani7n4wp93hflzxs3imzy4sgb30p7l01"; + isLibrary = true; + isExecutable = true; extraLibraries = [ fuse ]; preConfigure = '' sed -i -e "s@ Extra-Lib-Dirs: /usr/local/lib@ Extra-Lib-Dirs: ${fuse}/lib@" HFuse.cabal diff --git a/pkgs/development/libraries/haskell/HList/default.nix b/pkgs/development/libraries/haskell/HList/default.nix index 5b971657484d57e7e2ae2b7d0c105ff4dd94801a..d2c88291fc2d59a5863b32bec3f97d624b7b6b41 100644 --- a/pkgs/development/libraries/haskell/HList/default.nix +++ b/pkgs/development/libraries/haskell/HList/default.nix @@ -16,6 +16,5 @@ cabal.mkDerivation (self: { description = "Heterogeneous lists"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/HStringTemplate/default.nix b/pkgs/development/libraries/haskell/HStringTemplate/default.nix index 46a6ec75c6a0fc14d06cc1ca98c326b9c120847f..23fd31b2b3d9e551100a7867375472b34c10a65b 100644 --- a/pkgs/development/libraries/haskell/HStringTemplate/default.nix +++ b/pkgs/development/libraries/haskell/HStringTemplate/default.nix @@ -16,6 +16,5 @@ cabal.mkDerivation (self: { description = "StringTemplate implementation in Haskell"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/HTTP/4000.0.6.nix b/pkgs/development/libraries/haskell/HTTP/4000.0.6.nix index 7eee53b85390fdae44422aaf64184f374f17266f..a41dd3c25dc45bd129f3c8d78a9aa99f3d0c6ea8 100644 --- a/pkgs/development/libraries/haskell/HTTP/4000.0.6.nix +++ b/pkgs/development/libraries/haskell/HTTP/4000.0.6.nix @@ -13,6 +13,6 @@ cabal.mkDerivation (self: { description = "A library for client-side HTTP"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/HTTP/4000.0.9.nix b/pkgs/development/libraries/haskell/HTTP/4000.0.9.nix index 022a9129522c2b010f83d9e5f9e23b0408f56835..e530452b08c3e831db8988bdf5a1229cd3990ea2 100644 --- a/pkgs/development/libraries/haskell/HTTP/4000.0.9.nix +++ b/pkgs/development/libraries/haskell/HTTP/4000.0.9.nix @@ -13,6 +13,6 @@ cabal.mkDerivation (self: { description = "A library for client-side HTTP"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/HTTP/4000.1.1.nix b/pkgs/development/libraries/haskell/HTTP/4000.1.1.nix index da0db5169af9b8209c7065877201b05e76b90a21..76356134589e68684c01b6a94ee7fee419eb53a5 100644 --- a/pkgs/development/libraries/haskell/HTTP/4000.1.1.nix +++ b/pkgs/development/libraries/haskell/HTTP/4000.1.1.nix @@ -13,6 +13,6 @@ cabal.mkDerivation (self: { description = "A library for client-side HTTP"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/HTTP/4000.1.2.nix b/pkgs/development/libraries/haskell/HTTP/4000.1.2.nix index 109746cff9758135613e32c360229715def3083b..344a86a0da88817f1ae04c383e5647b475654335 100644 --- a/pkgs/development/libraries/haskell/HTTP/4000.1.2.nix +++ b/pkgs/development/libraries/haskell/HTTP/4000.1.2.nix @@ -13,6 +13,6 @@ cabal.mkDerivation (self: { description = "A library for client-side HTTP"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.1.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.1.nix index 91b2428ee66e6f6249d040b86fa767bb89cad55e..c677bbf40db486a304f7a612c6b47bb310b1cca5 100644 --- a/pkgs/development/libraries/haskell/HTTP/4000.2.1.nix +++ b/pkgs/development/libraries/haskell/HTTP/4000.2.1.nix @@ -18,6 +18,6 @@ cabal.mkDerivation (self: { description = "A library for client-side HTTP"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.2.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.2.nix index 68d4e17f9c2fa6a317212a569ba6083be7d10764..c18fd35c8a08de5e842c63540cb3ac3d2493ec1b 100644 --- a/pkgs/development/libraries/haskell/HTTP/4000.2.2.nix +++ b/pkgs/development/libraries/haskell/HTTP/4000.2.2.nix @@ -18,6 +18,6 @@ cabal.mkDerivation (self: { description = "A library for client-side HTTP"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.3.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.3.nix index fc04221eaac4cdad49dd325c8e9df24dfd6240c5..86c4dc8fcc0178e36187100b523f340e9c572fa1 100644 --- a/pkgs/development/libraries/haskell/HTTP/4000.2.3.nix +++ b/pkgs/development/libraries/haskell/HTTP/4000.2.3.nix @@ -18,6 +18,6 @@ cabal.mkDerivation (self: { description = "A library for client-side HTTP"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.5.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.5.nix index dc85bffd6434298dab45abc9cbe292c09aa85cfa..54c8733c5840c1a36f739d4713b61d8aab78ff6f 100644 --- a/pkgs/development/libraries/haskell/HTTP/4000.2.5.nix +++ b/pkgs/development/libraries/haskell/HTTP/4000.2.5.nix @@ -20,6 +20,6 @@ cabal.mkDerivation (self: { description = "A library for client-side HTTP"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.8.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.8.nix index 32692c47c423dd7fabe592b3d256ec5843b39bda..d308d547c78ddd5448efa20d9b8d1375ebb0defb 100644 --- a/pkgs/development/libraries/haskell/HTTP/4000.2.8.nix +++ b/pkgs/development/libraries/haskell/HTTP/4000.2.8.nix @@ -21,6 +21,6 @@ cabal.mkDerivation (self: { description = "A library for client-side HTTP"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/HUnit-approx/default.nix b/pkgs/development/libraries/haskell/HUnit-approx/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..b507aa21cbb56c689bcee894e04b0dfac0c5be84 --- /dev/null +++ b/pkgs/development/libraries/haskell/HUnit-approx/default.nix @@ -0,0 +1,17 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, HUnit }: + +cabal.mkDerivation (self: { + pname = "HUnit-approx"; + version = "1.0"; + sha256 = "0svkjvcanjsi5bhn9b91jhig36np5imr3qyj6b1s5msm7wmlk3v1"; + buildDepends = [ HUnit ]; + testDepends = [ HUnit ]; + meta = { + homepage = "https://github.com/goldfirere/HUnit-approx"; + description = "Approximate equality for floating point numbers with HUnit"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/HUnit/1.2.0.3.nix b/pkgs/development/libraries/haskell/HUnit/1.2.0.3.nix index 2e317dddfc074283338505c8541df6e104c3c038..7bd199555d79ed6ca455b229f66d80b6bbb35347 100644 --- a/pkgs/development/libraries/haskell/HUnit/1.2.0.3.nix +++ b/pkgs/development/libraries/haskell/HUnit/1.2.0.3.nix @@ -11,6 +11,6 @@ cabal.mkDerivation (self: { description = "A unit testing framework for Haskell"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/HUnit/1.2.2.1.nix b/pkgs/development/libraries/haskell/HUnit/1.2.2.1.nix index 01ed60616e6bbca6c6c7865c232bd0df06023e67..e995adab83c8fef998a54ab103e8b715f7f635c4 100644 --- a/pkgs/development/libraries/haskell/HUnit/1.2.2.1.nix +++ b/pkgs/development/libraries/haskell/HUnit/1.2.2.1.nix @@ -13,6 +13,6 @@ cabal.mkDerivation (self: { description = "A unit testing framework for Haskell"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/HUnit/1.2.2.3.nix b/pkgs/development/libraries/haskell/HUnit/1.2.2.3.nix index 302e54fff723d3be3257205f5209d267396ca4f7..02757e9074c299c0e1d85a5b22f8e312908ebc7d 100644 --- a/pkgs/development/libraries/haskell/HUnit/1.2.2.3.nix +++ b/pkgs/development/libraries/haskell/HUnit/1.2.2.3.nix @@ -13,6 +13,6 @@ cabal.mkDerivation (self: { description = "A unit testing framework for Haskell"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/HUnit/1.2.4.2.nix b/pkgs/development/libraries/haskell/HUnit/1.2.4.2.nix index 05006588a5254c52f2cc199b7c46f7d243a9a7bd..13483375823faa2fa4e1c61d4cc58e77788d63fc 100644 --- a/pkgs/development/libraries/haskell/HUnit/1.2.4.2.nix +++ b/pkgs/development/libraries/haskell/HUnit/1.2.4.2.nix @@ -13,6 +13,6 @@ cabal.mkDerivation (self: { description = "A unit testing framework for Haskell"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/HUnit/1.2.4.3.nix b/pkgs/development/libraries/haskell/HUnit/1.2.4.3.nix index 9d299a9d36eaa1e5fab5228c8158c0721cc062df..6f866137945cd28e5037819741ef922bd7c7ea87 100644 --- a/pkgs/development/libraries/haskell/HUnit/1.2.4.3.nix +++ b/pkgs/development/libraries/haskell/HUnit/1.2.4.3.nix @@ -14,6 +14,6 @@ cabal.mkDerivation (self: { description = "A unit testing framework for Haskell"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/HUnit/1.2.5.1.nix b/pkgs/development/libraries/haskell/HUnit/1.2.5.1.nix index aafabf991e93ee2234ad4a67eb7d4ab9fad10e96..ae33779597bf37600aa561628155d3cb7b229a3e 100644 --- a/pkgs/development/libraries/haskell/HUnit/1.2.5.1.nix +++ b/pkgs/development/libraries/haskell/HUnit/1.2.5.1.nix @@ -12,6 +12,6 @@ cabal.mkDerivation (self: { description = "A unit testing framework for Haskell"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/HUnit/1.2.5.2.nix b/pkgs/development/libraries/haskell/HUnit/1.2.5.2.nix index 8883796942ba9d0a2cb6bb31f7d3e02306cf2d69..0ab6f152aeede955bfc5ab115b0386dc8744d6c4 100644 --- a/pkgs/development/libraries/haskell/HUnit/1.2.5.2.nix +++ b/pkgs/development/libraries/haskell/HUnit/1.2.5.2.nix @@ -12,6 +12,5 @@ cabal.mkDerivation (self: { description = "A unit testing framework for Haskell"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/HaTeX/default.nix b/pkgs/development/libraries/haskell/HaTeX/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..3712dda87eb81c34dc011b734584ab775155ee2c --- /dev/null +++ b/pkgs/development/libraries/haskell/HaTeX/default.nix @@ -0,0 +1,21 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, matrix, parsec, QuickCheck, tasty, tastyQuickcheck, text +, transformers, wlPprintExtras +}: + +cabal.mkDerivation (self: { + pname = "HaTeX"; + version = "3.13.1.0"; + sha256 = "1ciifdb7yd79lvwdcxj8dq98dfmm9pg25rx9rc2wjn2jnp8j85r7"; + buildDepends = [ + matrix parsec QuickCheck text transformers wlPprintExtras + ]; + testDepends = [ QuickCheck tasty tastyQuickcheck ]; + meta = { + homepage = "http://daniel-diaz.github.io/projects/hatex"; + description = "The Haskell LaTeX library"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/HaXml/default.nix b/pkgs/development/libraries/haskell/HaXml/default.nix index 54ec9d87d138d43dc9e832ed52d9d0d5482e80a7..4199ae4275b6118ac7a0d676765a778cbc556ff3 100644 --- a/pkgs/development/libraries/haskell/HaXml/default.nix +++ b/pkgs/development/libraries/haskell/HaXml/default.nix @@ -14,6 +14,5 @@ cabal.mkDerivation (self: { description = "Utilities for manipulating XML documents"; license = "LGPL"; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/HaskellForMaths/default.nix b/pkgs/development/libraries/haskell/HaskellForMaths/default.nix index 2d540e735814a2fa62732246a012747548f135cb..9bd9c9f4796a89a7665aff9d550cd8b67c4febe0 100644 --- a/pkgs/development/libraries/haskell/HaskellForMaths/default.nix +++ b/pkgs/development/libraries/haskell/HaskellForMaths/default.nix @@ -12,6 +12,5 @@ cabal.mkDerivation (self: { description = "Combinatorics, group theory, commutative algebra, non-commutative algebra"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/HsOpenSSL/default.nix b/pkgs/development/libraries/haskell/HsOpenSSL/default.nix index d8d4ee2ece124b669b84a89c37c7fb93f6fbe109..af38572464cb73acba3e2b2a62eebde6f9160e01 100644 --- a/pkgs/development/libraries/haskell/HsOpenSSL/default.nix +++ b/pkgs/development/libraries/haskell/HsOpenSSL/default.nix @@ -13,6 +13,5 @@ cabal.mkDerivation (self: { description = "Partial OpenSSL binding for Haskell"; license = self.stdenv.lib.licenses.publicDomain; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/HsSyck/0.51.nix b/pkgs/development/libraries/haskell/HsSyck/0.51.nix index 63c771af7a9341ff62fc24a3c3c0a71c4c46466e..1be5744b6a337afc25e1b6e8db048128ca63e894 100644 --- a/pkgs/development/libraries/haskell/HsSyck/0.51.nix +++ b/pkgs/development/libraries/haskell/HsSyck/0.51.nix @@ -11,5 +11,6 @@ cabal.mkDerivation (self: { description = "Fast, lightweight YAML loader and dumper"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/HsSyck/0.52.nix b/pkgs/development/libraries/haskell/HsSyck/0.52.nix index c430c7929ef4c7963ea841414cc94972ff49227b..b3d64e539e183dab142bb29ce884f212e1421099 100644 --- a/pkgs/development/libraries/haskell/HsSyck/0.52.nix +++ b/pkgs/development/libraries/haskell/HsSyck/0.52.nix @@ -11,6 +11,5 @@ cabal.mkDerivation (self: { description = "Fast, lightweight YAML loader and dumper"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/IORefCAS/default.nix b/pkgs/development/libraries/haskell/IORefCAS/default.nix index 8b673dc56beb163c4faad9f74d3acca7bc962e3d..980ab8c448cbb211bd7a1601daa6486233c32e40 100644 --- a/pkgs/development/libraries/haskell/IORefCAS/default.nix +++ b/pkgs/development/libraries/haskell/IORefCAS/default.nix @@ -13,6 +13,8 @@ cabal.mkDerivation (self: { description = "Atomic compare and swap for IORefs and STRefs"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + hydraPlatforms = self.stdenv.lib.platforms.none; + broken = true; maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/IOSpec/default.nix b/pkgs/development/libraries/haskell/IOSpec/default.nix index 6d9a542f9f169b30b50eda7fc2a79424e651da13..f9f95586b4554039b883003efc02ab5b3c63202b 100644 --- a/pkgs/development/libraries/haskell/IOSpec/default.nix +++ b/pkgs/development/libraries/haskell/IOSpec/default.nix @@ -11,6 +11,5 @@ cabal.mkDerivation (self: { description = "A pure specification of the IO monad"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/IfElse/default.nix b/pkgs/development/libraries/haskell/IfElse/default.nix index d2bef1cafa1b1cd3eee98c96905806c2131f3ee5..0f211b4cd509ed583e72068ca2d18668f32555fe 100644 --- a/pkgs/development/libraries/haskell/IfElse/default.nix +++ b/pkgs/development/libraries/haskell/IfElse/default.nix @@ -11,6 +11,5 @@ cabal.mkDerivation (self: { description = "Anaphoric and miscellaneous useful control-flow"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/IntervalMap/default.nix b/pkgs/development/libraries/haskell/IntervalMap/default.nix index 8df2f0815dbf3fff44c7f096eeab2934ee4990ba..774cbd8a19ea893e312334a1cced1616b05d4a81 100644 --- a/pkgs/development/libraries/haskell/IntervalMap/default.nix +++ b/pkgs/development/libraries/haskell/IntervalMap/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "IntervalMap"; - version = "0.3.0.2"; - sha256 = "14pbq5n2cn9gxjkmqpnbn7dx9963wp3sdbb180wm9l5xqi338s0l"; + version = "0.3.0.3"; + sha256 = "11lxsjq9nw9mmj5ga0x03d8rgcx2s85kzi17d9cm7m28mq4dqdag"; buildDepends = [ deepseq ]; testDepends = [ Cabal deepseq QuickCheck ]; meta = { @@ -13,6 +13,6 @@ cabal.mkDerivation (self: { description = "Maps from Intervals to values, with efficient search"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + maintainers = with self.stdenv.lib.maintainers; [ ocharles ]; }; }) diff --git a/pkgs/development/libraries/haskell/JuicyPixels/default.nix b/pkgs/development/libraries/haskell/JuicyPixels/default.nix index 36347cb4552879f97f256b0b74aa697ee6a8003a..fcd2689c54879b938ea28fa18885b79ec821ceb9 100644 --- a/pkgs/development/libraries/haskell/JuicyPixels/default.nix +++ b/pkgs/development/libraries/haskell/JuicyPixels/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "JuicyPixels"; - version = "3.1.5.2"; - sha256 = "0afw7kwyaqw2lwgrdc1mamz45vmqy471fgsyvn9rhla8znr3a9nq"; + version = "3.1.6.1"; + sha256 = "1v560y0l1zpznbpw8zgb2j6zlcwi8i207xgzggzzd3p0v2m8955c"; buildDepends = [ binary deepseq mtl primitive transformers vector zlib ]; @@ -16,6 +16,5 @@ cabal.mkDerivation (self: { description = "Picture loading/serialization (in png, jpeg, bitmap, gif, tiff and radiance)"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/ListLike/default.nix b/pkgs/development/libraries/haskell/ListLike/default.nix index bec9203c0eedddbffa296a2e71859eca26917eeb..1e99f819bcc6fecb344f1a1eaa35c0bc0ae15cf0 100644 --- a/pkgs/development/libraries/haskell/ListLike/default.nix +++ b/pkgs/development/libraries/haskell/ListLike/default.nix @@ -14,6 +14,5 @@ cabal.mkDerivation (self: { description = "Generic support for list-like structures"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/MFlow/default.nix b/pkgs/development/libraries/haskell/MFlow/default.nix index 4a8f7a91bbaba17ac4ae05951498918166559c58..a0e4b787ec99d69f19491580ec6ea34357ca16bb 100644 --- a/pkgs/development/libraries/haskell/MFlow/default.nix +++ b/pkgs/development/libraries/haskell/MFlow/default.nix @@ -2,26 +2,26 @@ { cabal, blazeHtml, blazeMarkup, caseInsensitive, clientsession , conduit, conduitExtra, cpphs, extensibleExceptions, httpTypes -, monadloc, mtl, parsec, random, RefSerialize, stm, TCache, text -, time, transformers, utf8String, vector, wai, warp, warpTls -, Workflow +, monadloc, mtl, parsec, pwstoreFast, random, RefSerialize +, resourcet, stm, TCache, text, time, transformers, utf8String +, vector, wai, waiExtra, warp, warpTls, Workflow }: cabal.mkDerivation (self: { pname = "MFlow"; - version = "0.4.5.4"; - sha256 = "1ih9ni14xmqvcfvayjkggmpmw3s9yzp17gf4xzygldmjcs35j4n3"; + version = "0.4.5.7"; + sha256 = "0faw082z8yyzf0k1vrgpqa8kvwb2zwmasy1p1vvj3a7lhhnlr20s"; buildDepends = [ blazeHtml blazeMarkup caseInsensitive clientsession conduit conduitExtra extensibleExceptions httpTypes monadloc mtl parsec - random RefSerialize stm TCache text time transformers utf8String - vector wai warp warpTls Workflow + pwstoreFast random RefSerialize resourcet stm TCache text time + transformers utf8String vector wai waiExtra warp warpTls Workflow ]; buildTools = [ cpphs ]; meta = { description = "stateful, RESTful web framework"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.tomberek ]; + maintainers = with self.stdenv.lib.maintainers; [ tomberek ]; }; }) diff --git a/pkgs/development/libraries/haskell/MaybeT/default.nix b/pkgs/development/libraries/haskell/MaybeT/default.nix index 069675c2e6a9a871a1734aea75d6bf2614a32bc8..012ce6249fcb9c3fc4987cbd0e611c673a61b29c 100644 --- a/pkgs/development/libraries/haskell/MaybeT/default.nix +++ b/pkgs/development/libraries/haskell/MaybeT/default.nix @@ -11,6 +11,5 @@ cabal.mkDerivation (self: { description = "MaybeT monad transformer"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/MemoTrie/default.nix b/pkgs/development/libraries/haskell/MemoTrie/default.nix index 15569acf0402cdc50cb3dfba1b1bf95e2d450495..3e7f1818039250e5c9b6f04fba9284de852aab38 100644 --- a/pkgs/development/libraries/haskell/MemoTrie/default.nix +++ b/pkgs/development/libraries/haskell/MemoTrie/default.nix @@ -12,6 +12,5 @@ cabal.mkDerivation (self: { description = "Trie-based memo functions"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/MissingH/default.nix b/pkgs/development/libraries/haskell/MissingH/default.nix index 0c8e7a699e58c53b24aee6a9dbaeca7ae3e29805..cb9b60d13c7a824804690b7bce4fc7f5de568c9a 100644 --- a/pkgs/development/libraries/haskell/MissingH/default.nix +++ b/pkgs/development/libraries/haskell/MissingH/default.nix @@ -21,6 +21,5 @@ cabal.mkDerivation (self: { description = "Large utility library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/MonadCatchIO-mtl/default.nix b/pkgs/development/libraries/haskell/MonadCatchIO-mtl/default.nix index eb5232fabcf3bcfb342d65a4b43090973ab1b3d5..11e97d72ea8caf2db0180641f0a213570ab09e86 100644 --- a/pkgs/development/libraries/haskell/MonadCatchIO-mtl/default.nix +++ b/pkgs/development/libraries/haskell/MonadCatchIO-mtl/default.nix @@ -13,6 +13,5 @@ cabal.mkDerivation (self: { description = "Monad-transformer version of the Control.Exception module"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/MonadCatchIO-transformers/default.nix b/pkgs/development/libraries/haskell/MonadCatchIO-transformers/default.nix index 9f928bea9de3b78ea4286c08539b4366a3ce8d8a..d4cbd7c09ba41567918fb02a8d010007a3a61ddf 100644 --- a/pkgs/development/libraries/haskell/MonadCatchIO-transformers/default.nix +++ b/pkgs/development/libraries/haskell/MonadCatchIO-transformers/default.nix @@ -12,6 +12,5 @@ cabal.mkDerivation (self: { description = "Monad-transformer compatible version of the Control.Exception module"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/MonadPrompt/default.nix b/pkgs/development/libraries/haskell/MonadPrompt/default.nix index 005af6b99f5956a2f22cc96f1000772ad024e355..3221cbe7f559c919039191ca6ccf203fe50fb3d9 100644 --- a/pkgs/development/libraries/haskell/MonadPrompt/default.nix +++ b/pkgs/development/libraries/haskell/MonadPrompt/default.nix @@ -11,6 +11,5 @@ cabal.mkDerivation (self: { description = "MonadPrompt, implementation & examples"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/MonadRandom/default.nix b/pkgs/development/libraries/haskell/MonadRandom/default.nix index 6ff8afc58f301fdfda23c9a3327afa7d95c119cc..fb2415fd6fa0b5155d032eca19f2e06b336185f5 100644 --- a/pkgs/development/libraries/haskell/MonadRandom/default.nix +++ b/pkgs/development/libraries/haskell/MonadRandom/default.nix @@ -11,6 +11,5 @@ cabal.mkDerivation (self: { description = "Random-number generation monad"; license = "unknown"; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/NumInstances/default.nix b/pkgs/development/libraries/haskell/NumInstances/default.nix index 2b3746d4973c815e3bbd6ae2849fdf10854cae64..e5b918a5ad555723d725e552100e106b34c088fe 100644 --- a/pkgs/development/libraries/haskell/NumInstances/default.nix +++ b/pkgs/development/libraries/haskell/NumInstances/default.nix @@ -11,6 +11,5 @@ cabal.mkDerivation (self: { description = "Instances of numeric classes for functions and tuples"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/ObjectName/default.nix b/pkgs/development/libraries/haskell/ObjectName/default.nix index bda33cee85a3ce5b3c562e1d696021e24750fcb9..785caabadd2ea22a06bf40b22fb40711aceeb9a5 100644 --- a/pkgs/development/libraries/haskell/ObjectName/default.nix +++ b/pkgs/development/libraries/haskell/ObjectName/default.nix @@ -11,6 +11,5 @@ cabal.mkDerivation (self: { description = "Explicitly handled object names"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/OneTuple/default.nix b/pkgs/development/libraries/haskell/OneTuple/default.nix index 9fcc2cbf2538f4fa96cdf651c2d2805963d537ef..b2af0024b5ccc09c87cb9c2b49139d3739f59b1a 100644 --- a/pkgs/development/libraries/haskell/OneTuple/default.nix +++ b/pkgs/development/libraries/haskell/OneTuple/default.nix @@ -10,6 +10,5 @@ cabal.mkDerivation (self: { description = "Singleton Tuple"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/OpenAL/default.nix b/pkgs/development/libraries/haskell/OpenAL/default.nix index e303d17715114606898226307a123e23db6efd4e..98aac94e01deee76e0e0f40ec256cc68caba8454 100644 --- a/pkgs/development/libraries/haskell/OpenAL/default.nix +++ b/pkgs/development/libraries/haskell/OpenAL/default.nix @@ -13,6 +13,5 @@ cabal.mkDerivation (self: { description = "A binding to the OpenAL cross-platform 3D audio API"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/OpenGL/2.2.1.1.nix b/pkgs/development/libraries/haskell/OpenGL/2.2.1.1.nix index 05de2f88b9775ec1931dba8353f5efc8351e3778..747720eba85caa331522d248f6f8a8512861efa2 100644 --- a/pkgs/development/libraries/haskell/OpenGL/2.2.1.1.nix +++ b/pkgs/development/libraries/haskell/OpenGL/2.2.1.1.nix @@ -12,6 +12,6 @@ cabal.mkDerivation (self: { description = "A binding for the OpenGL graphics system"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/OpenGL/2.2.3.0.nix b/pkgs/development/libraries/haskell/OpenGL/2.2.3.0.nix index 887b01afde9373a082df16b41130d5a298b81172..af01702b01b113d4ee30d7e66041b407deb7e297 100644 --- a/pkgs/development/libraries/haskell/OpenGL/2.2.3.0.nix +++ b/pkgs/development/libraries/haskell/OpenGL/2.2.3.0.nix @@ -12,6 +12,6 @@ cabal.mkDerivation (self: { description = "A binding for the OpenGL graphics system"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/OpenGL/2.2.3.1.nix b/pkgs/development/libraries/haskell/OpenGL/2.2.3.1.nix index a07fa3ec763d7c3b1adc920738299de948eb1c1b..fa3ae576bfae5550508f64c79d7645e7988dbabf 100644 --- a/pkgs/development/libraries/haskell/OpenGL/2.2.3.1.nix +++ b/pkgs/development/libraries/haskell/OpenGL/2.2.3.1.nix @@ -12,6 +12,6 @@ cabal.mkDerivation (self: { description = "A binding for the OpenGL graphics system"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/OpenGL/2.4.0.2.nix b/pkgs/development/libraries/haskell/OpenGL/2.4.0.2.nix index fecdfca2566b2c6612d5274d3bbd18ca5182254a..81e754e269f826089494c15df409a47896a98044 100644 --- a/pkgs/development/libraries/haskell/OpenGL/2.4.0.2.nix +++ b/pkgs/development/libraries/haskell/OpenGL/2.4.0.2.nix @@ -15,6 +15,6 @@ cabal.mkDerivation (self: { description = "A binding for the OpenGL graphics system"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/OpenGL/2.6.0.1.nix b/pkgs/development/libraries/haskell/OpenGL/2.6.0.1.nix index 0506cc608c1602362b82dc783bdcdba4bd08d1dc..a0ae3c84fad9232fdd140facfb196a2656bc45d9 100644 --- a/pkgs/development/libraries/haskell/OpenGL/2.6.0.1.nix +++ b/pkgs/development/libraries/haskell/OpenGL/2.6.0.1.nix @@ -15,6 +15,6 @@ cabal.mkDerivation (self: { description = "A binding for the OpenGL graphics system"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/OpenGL/2.8.0.0.nix b/pkgs/development/libraries/haskell/OpenGL/2.8.0.0.nix index a88cb3633396ff88477dec9026dd401175d2dbbc..ea1fdcc97115362b6c8e41a0692edf7b44bcb3cd 100644 --- a/pkgs/development/libraries/haskell/OpenGL/2.8.0.0.nix +++ b/pkgs/development/libraries/haskell/OpenGL/2.8.0.0.nix @@ -13,6 +13,6 @@ cabal.mkDerivation (self: { description = "A binding for the OpenGL graphics system"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/OpenGL/2.9.2.0.nix b/pkgs/development/libraries/haskell/OpenGL/2.9.2.0.nix index 01af37baaeb65f751b326baf79629f6043992b9f..f6767ab577c2965f585b4d1a6037a3499e2b89fc 100644 --- a/pkgs/development/libraries/haskell/OpenGL/2.9.2.0.nix +++ b/pkgs/development/libraries/haskell/OpenGL/2.9.2.0.nix @@ -13,6 +13,5 @@ cabal.mkDerivation (self: { description = "A binding for the OpenGL graphics system"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/OpenGLRaw/1.3.0.0.nix b/pkgs/development/libraries/haskell/OpenGLRaw/1.3.0.0.nix index ed604b6a1e2e3229f558b411b184dce67783ff3f..c3d8ce4988196688d735a987ee9612fdd1b2ab70 100644 --- a/pkgs/development/libraries/haskell/OpenGLRaw/1.3.0.0.nix +++ b/pkgs/development/libraries/haskell/OpenGLRaw/1.3.0.0.nix @@ -12,6 +12,6 @@ cabal.mkDerivation (self: { description = "A raw binding for the OpenGL graphics system"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/OpenGLRaw/1.4.0.0.nix b/pkgs/development/libraries/haskell/OpenGLRaw/1.4.0.0.nix index c32598e24b07433a4f61ae2edb87a25f36249b96..a2ffc9b4ad13cf05ecdf31e8b71bc5b002476235 100644 --- a/pkgs/development/libraries/haskell/OpenGLRaw/1.4.0.0.nix +++ b/pkgs/development/libraries/haskell/OpenGLRaw/1.4.0.0.nix @@ -12,6 +12,6 @@ cabal.mkDerivation (self: { description = "A raw binding for the OpenGL graphics system"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/OpenGLRaw/1.5.0.0.nix b/pkgs/development/libraries/haskell/OpenGLRaw/1.5.0.0.nix index fd0331a7311ef2f49408bfad8239f990542b6734..65466306fd80617c8a3e12f1127311e79aa1e365 100644 --- a/pkgs/development/libraries/haskell/OpenGLRaw/1.5.0.0.nix +++ b/pkgs/development/libraries/haskell/OpenGLRaw/1.5.0.0.nix @@ -12,6 +12,5 @@ cabal.mkDerivation (self: { description = "A raw binding for the OpenGL graphics system"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/PSQueue/default.nix b/pkgs/development/libraries/haskell/PSQueue/default.nix index 885b0380367d822a15546c61f018315d37cbbfa3..751dadebfa87aa9cce9b568612314279ab8f22cf 100644 --- a/pkgs/development/libraries/haskell/PSQueue/default.nix +++ b/pkgs/development/libraries/haskell/PSQueue/default.nix @@ -10,6 +10,5 @@ cabal.mkDerivation (self: { description = "Priority Search Queue"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/QuickCheck/1.2.0.0.nix b/pkgs/development/libraries/haskell/QuickCheck/1.2.0.0.nix index 2c0fb559a165cf7b545f55668612c563a43ef633..465fb510b50ebd072d1c1efa057eefd5246335bf 100644 --- a/pkgs/development/libraries/haskell/QuickCheck/1.2.0.0.nix +++ b/pkgs/development/libraries/haskell/QuickCheck/1.2.0.0.nix @@ -12,6 +12,6 @@ cabal.mkDerivation (self: { description = "Automatic testing of Haskell programs"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/QuickCheck/1.2.0.1.nix b/pkgs/development/libraries/haskell/QuickCheck/1.2.0.1.nix index 6fce5e94da5f766727a01e92ced6acbc3fff1ee9..ba16967249dbe237a9647edc80294acdb7a35dd0 100644 --- a/pkgs/development/libraries/haskell/QuickCheck/1.2.0.1.nix +++ b/pkgs/development/libraries/haskell/QuickCheck/1.2.0.1.nix @@ -12,6 +12,6 @@ cabal.mkDerivation (self: { description = "Automatic testing of Haskell programs"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/QuickCheck/2.1.1.1.nix b/pkgs/development/libraries/haskell/QuickCheck/2.1.1.1.nix index c7080090aee4faa4fcfb8abd12a6964a5d4a2686..373742a9755ab2bd531903fce6e6c2d7d5c00527 100644 --- a/pkgs/development/libraries/haskell/QuickCheck/2.1.1.1.nix +++ b/pkgs/development/libraries/haskell/QuickCheck/2.1.1.1.nix @@ -12,6 +12,6 @@ cabal.mkDerivation (self: { description = "Automatic testing of Haskell programs"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/QuickCheck/2.4.0.1.nix b/pkgs/development/libraries/haskell/QuickCheck/2.4.0.1.nix index 29944bb6852d3304c52c817558b0c861ed0efb47..3bee4ac9702625d36230c983cb33a78fdbed048f 100644 --- a/pkgs/development/libraries/haskell/QuickCheck/2.4.0.1.nix +++ b/pkgs/development/libraries/haskell/QuickCheck/2.4.0.1.nix @@ -12,6 +12,6 @@ cabal.mkDerivation (self: { description = "Automatic testing of Haskell programs"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/QuickCheck/2.4.1.1.nix b/pkgs/development/libraries/haskell/QuickCheck/2.4.1.1.nix index 43275b145be1251d80397b1d0de2a818cb110089..d936d4b37841c93c71aa7ced3d6a772d6c40da24 100644 --- a/pkgs/development/libraries/haskell/QuickCheck/2.4.1.1.nix +++ b/pkgs/development/libraries/haskell/QuickCheck/2.4.1.1.nix @@ -12,6 +12,6 @@ cabal.mkDerivation (self: { description = "Automatic testing of Haskell programs"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/QuickCheck/2.4.2.nix b/pkgs/development/libraries/haskell/QuickCheck/2.4.2.nix index 1196d5463f5be86df9104169009a57f9bebfa94e..58a04593c4948c480b1f6b0be69a5a314a75d1c9 100644 --- a/pkgs/development/libraries/haskell/QuickCheck/2.4.2.nix +++ b/pkgs/development/libraries/haskell/QuickCheck/2.4.2.nix @@ -12,6 +12,6 @@ cabal.mkDerivation (self: { description = "Automatic testing of Haskell programs"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/QuickCheck/2.5.1.1.nix b/pkgs/development/libraries/haskell/QuickCheck/2.5.1.1.nix index a31a5e5d585d033d97348027b92e28a7c34f7654..438c4cfff8dbf4c2b82f46225ad4d84b1f98eb82 100644 --- a/pkgs/development/libraries/haskell/QuickCheck/2.5.1.1.nix +++ b/pkgs/development/libraries/haskell/QuickCheck/2.5.1.1.nix @@ -12,6 +12,6 @@ cabal.mkDerivation (self: { description = "Automatic testing of Haskell programs"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/QuickCheck/2.6.nix b/pkgs/development/libraries/haskell/QuickCheck/2.6.nix index ff46b19063e54d8ee89e1a9cec9f1d478b02e444..0ed5683843583930d16a4c5ac5756a181f8fce4a 100644 --- a/pkgs/development/libraries/haskell/QuickCheck/2.6.nix +++ b/pkgs/development/libraries/haskell/QuickCheck/2.6.nix @@ -12,6 +12,6 @@ cabal.mkDerivation (self: { description = "Automatic testing of Haskell programs"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/QuickCheck/2.7.5.nix b/pkgs/development/libraries/haskell/QuickCheck/2.7.5.nix index 2ebd4d2bb0107160f55c6ae93f0c30834c35d988..26115cb8814a71c25a224822e7dd078740bc8698 100644 --- a/pkgs/development/libraries/haskell/QuickCheck/2.7.5.nix +++ b/pkgs/development/libraries/haskell/QuickCheck/2.7.5.nix @@ -14,6 +14,6 @@ cabal.mkDerivation (self: { description = "Automatic testing of Haskell programs"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/QuickCheck/2.7.6.nix b/pkgs/development/libraries/haskell/QuickCheck/2.7.6.nix index 60667b2afa014c02351b386b5b21b1cad190ea9c..3c623e9f0dd5158d75e2c6537e94b3aa4a21dfe3 100644 --- a/pkgs/development/libraries/haskell/QuickCheck/2.7.6.nix +++ b/pkgs/development/libraries/haskell/QuickCheck/2.7.6.nix @@ -14,6 +14,5 @@ cabal.mkDerivation (self: { description = "Automatic testing of Haskell programs"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/RSA/default.nix b/pkgs/development/libraries/haskell/RSA/default.nix index 60fb815aae2b93add450195462be6eeec64d9c15..61c2d0fb225e0dc77e87ee5f0cba10c3efb9f1a6 100644 --- a/pkgs/development/libraries/haskell/RSA/default.nix +++ b/pkgs/development/libraries/haskell/RSA/default.nix @@ -24,6 +24,5 @@ cabal.mkDerivation (self: { description = "Implementation of RSA, using the padding schemes of PKCS#1 v2.1."; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/Ranged-sets/default.nix b/pkgs/development/libraries/haskell/Ranged-sets/default.nix index b438964e3c54ce586691b1e978aa6409e1b43206..51296cb2a0e44cb4a59089898699770905edc6c9 100644 --- a/pkgs/development/libraries/haskell/Ranged-sets/default.nix +++ b/pkgs/development/libraries/haskell/Ranged-sets/default.nix @@ -12,6 +12,5 @@ cabal.mkDerivation (self: { description = "Ranged sets for Haskell"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/RefSerialize/default.nix b/pkgs/development/libraries/haskell/RefSerialize/default.nix index e1d0e4fd953ac7fb7a2cb75bfcd1cf3fe746fb6a..1307d4ae42e81c8517f3b2121dd6ae0fdc385ddc 100644 --- a/pkgs/development/libraries/haskell/RefSerialize/default.nix +++ b/pkgs/development/libraries/haskell/RefSerialize/default.nix @@ -11,6 +11,6 @@ cabal.mkDerivation (self: { description = "Write to and read from ByteStrings maintaining internal memory references"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.tomberek ]; + maintainers = with self.stdenv.lib.maintainers; [ tomberek ]; }; }) diff --git a/pkgs/development/libraries/haskell/RepLib/default.nix b/pkgs/development/libraries/haskell/RepLib/default.nix index bdbae968151573b2dc17a6c4dc13880592e481c1..f62f1b1392e2cf5405e6e550bc4b70c2e539e726 100644 --- a/pkgs/development/libraries/haskell/RepLib/default.nix +++ b/pkgs/development/libraries/haskell/RepLib/default.nix @@ -13,6 +13,5 @@ cabal.mkDerivation (self: { description = "Generic programming library with representation types"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/SDL-image/default.nix b/pkgs/development/libraries/haskell/SDL-image/default.nix index 22a17103c5dc24cfab1f81c39d93419f9bd71778..c744ca41cf99e926896d8c49a2e307d509bfc0d0 100644 --- a/pkgs/development/libraries/haskell/SDL-image/default.nix +++ b/pkgs/development/libraries/haskell/SDL-image/default.nix @@ -12,6 +12,6 @@ cabal.mkDerivation (self: { description = "Binding to libSDL_image"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/SDL-mixer/default.nix b/pkgs/development/libraries/haskell/SDL-mixer/default.nix index d4635565216b660a50b78d61d0d614ae8efe48ab..7ec8cecd92c374a4e435b5aa02648a957985d142 100644 --- a/pkgs/development/libraries/haskell/SDL-mixer/default.nix +++ b/pkgs/development/libraries/haskell/SDL-mixer/default.nix @@ -12,6 +12,6 @@ cabal.mkDerivation (self: { description = "Binding to libSDL_mixer"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/SDL-ttf/default.nix b/pkgs/development/libraries/haskell/SDL-ttf/default.nix index b835d5c565117056eb8c18299c0dce8d5e327e2f..77c3434216aacc00c3af17fd24f54ccd194f26a2 100644 --- a/pkgs/development/libraries/haskell/SDL-ttf/default.nix +++ b/pkgs/development/libraries/haskell/SDL-ttf/default.nix @@ -12,6 +12,6 @@ cabal.mkDerivation (self: { description = "Binding to libSDL_ttf"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/SDL/default.nix b/pkgs/development/libraries/haskell/SDL/default.nix index a42ee72559d26fe1e14491de16683e2858de327f..6eca4791fcfc5d3267eacf83b1bcf4118d8efa54 100644 --- a/pkgs/development/libraries/haskell/SDL/default.nix +++ b/pkgs/development/libraries/haskell/SDL/default.nix @@ -11,6 +11,7 @@ cabal.mkDerivation (self: { description = "Binding to libSDL"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; + broken = true; }; }) diff --git a/pkgs/development/libraries/haskell/SHA/default.nix b/pkgs/development/libraries/haskell/SHA/default.nix index b57065a36bbbf4349bee87a81d1dbffa4aaf158a..2a9c98ef67a480496b61949dd8767411233a3ef9 100644 --- a/pkgs/development/libraries/haskell/SHA/default.nix +++ b/pkgs/development/libraries/haskell/SHA/default.nix @@ -13,6 +13,5 @@ cabal.mkDerivation (self: { description = "Implementations of the SHA suite of message digest functions"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/SMTPClient/default.nix b/pkgs/development/libraries/haskell/SMTPClient/default.nix index 7bbb957cb12851ec1e8c7cf7601ba4a6445d0339..c070ab8dcaab0a4880e8e91f1321ea80036a74be 100644 --- a/pkgs/development/libraries/haskell/SMTPClient/default.nix +++ b/pkgs/development/libraries/haskell/SMTPClient/default.nix @@ -11,6 +11,5 @@ cabal.mkDerivation (self: { description = "A simple SMTP client library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/Shellac/Shellac.nix b/pkgs/development/libraries/haskell/Shellac/Shellac.nix index 902516ba6e6fdd8b3223e35af6570d98077747f2..1715d62b02ba9a345ed7086adcb5d18322ddf437 100644 --- a/pkgs/development/libraries/haskell/Shellac/Shellac.nix +++ b/pkgs/development/libraries/haskell/Shellac/Shellac.nix @@ -12,6 +12,5 @@ cabal.mkDerivation (self: { description = "A framework for creating shell envinronments"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/StateVar/default.nix b/pkgs/development/libraries/haskell/StateVar/default.nix index d0797aa2f48c4d2921df7a5afe6cdafbbc76ffe9..03d21bbba3ccd5bb1213e784bdc430cb6a7a5c64 100644 --- a/pkgs/development/libraries/haskell/StateVar/default.nix +++ b/pkgs/development/libraries/haskell/StateVar/default.nix @@ -11,6 +11,5 @@ cabal.mkDerivation (self: { description = "State variables"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/Stream/default.nix b/pkgs/development/libraries/haskell/Stream/default.nix index 2e774ee98c42abc40edb947ebb2588139648440a..3e1c1b7b32e3c03eddfaa7f935abce60c7bfd889 100644 --- a/pkgs/development/libraries/haskell/Stream/default.nix +++ b/pkgs/development/libraries/haskell/Stream/default.nix @@ -11,6 +11,5 @@ cabal.mkDerivation (self: { description = "A library for manipulating infinite lists"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/TCache/default.nix b/pkgs/development/libraries/haskell/TCache/default.nix index 5f281ecfb6596e015e9b59d3ae333fe260b6b33a..9c2638302a5618870c82f189448ad6f39901bda5 100644 --- a/pkgs/development/libraries/haskell/TCache/default.nix +++ b/pkgs/development/libraries/haskell/TCache/default.nix @@ -11,6 +11,6 @@ cabal.mkDerivation (self: { description = "A Transactional cache with user-defined persistence"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.tomberek ]; + maintainers = with self.stdenv.lib.maintainers; [ tomberek ]; }; }) diff --git a/pkgs/development/libraries/haskell/TableAlgebra/default.nix b/pkgs/development/libraries/haskell/TableAlgebra/default.nix index 5bcbe278481587717126cc46a195309a03ae6028..396f2366d153feffc179fd492070c32b3e7db6cd 100644 --- a/pkgs/development/libraries/haskell/TableAlgebra/default.nix +++ b/pkgs/development/libraries/haskell/TableAlgebra/default.nix @@ -11,6 +11,5 @@ cabal.mkDerivation (self: { description = "Ferry Table Algebra"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/Tensor/default.nix b/pkgs/development/libraries/haskell/Tensor/default.nix index bfcd2722b0143987705b0ba34867984539d320ca..55c110b75218e4b51aa6b0f74e58a5b5ed641747 100644 --- a/pkgs/development/libraries/haskell/Tensor/default.nix +++ b/pkgs/development/libraries/haskell/Tensor/default.nix @@ -11,6 +11,6 @@ cabal.mkDerivation (self: { description = "Tensor data types"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/TypeCompose/default.nix b/pkgs/development/libraries/haskell/TypeCompose/default.nix index 3d52abc656c2c5696484e7894d4d9f59d6bd483f..de5f41ab384bcb2036f7c368f2441dca65140f3c 100644 --- a/pkgs/development/libraries/haskell/TypeCompose/default.nix +++ b/pkgs/development/libraries/haskell/TypeCompose/default.nix @@ -11,6 +11,6 @@ cabal.mkDerivation (self: { description = "Type composition classes & instances"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.ianwookim ]; + maintainers = with self.stdenv.lib.maintainers; [ ianwookim ]; }; }) diff --git a/pkgs/development/libraries/haskell/Vec/default.nix b/pkgs/development/libraries/haskell/Vec/default.nix index bc4b7eb14542d6bbdce31e59e1f9d3872b31dbb8..eab20222769d2b3f8d0a008d38344a82f4a92386 100644 --- a/pkgs/development/libraries/haskell/Vec/default.nix +++ b/pkgs/development/libraries/haskell/Vec/default.nix @@ -4,13 +4,12 @@ cabal.mkDerivation (self: { pname = "Vec"; - version = "1.0.1"; - sha256 = "1v0v0ph881vynx8q8xwmn9da6qrd16g83q5i132nxys3ynl5s76m"; + version = "1.0.5"; + sha256 = "0hyk553pdn72zc1i82njz3md8ycmzfiwi799y08qr3fg0i8r88zm"; meta = { homepage = "http://github.net/sedillard/Vec"; description = "Fixed-length lists and low-dimensional linear algebra"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/Workflow/default.nix b/pkgs/development/libraries/haskell/Workflow/default.nix index 0dbbc1ef5db0eb880311cbcc4ba4562b99da3fee..7dd6f29857665593ec25880fd5bdbab96554f023 100644 --- a/pkgs/development/libraries/haskell/Workflow/default.nix +++ b/pkgs/development/libraries/haskell/Workflow/default.nix @@ -16,6 +16,6 @@ cabal.mkDerivation (self: { description = "Workflow patterns over a monad for thread state logging & recovery"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.tomberek ]; + maintainers = with self.stdenv.lib.maintainers; [ tomberek ]; }; }) diff --git a/pkgs/development/libraries/haskell/X11-xft/default.nix b/pkgs/development/libraries/haskell/X11-xft/default.nix index 4925014517c064157fb34508ecee26f4a8f8144b..df9ddb1e27788ae9cf55a0f0c28814a745c72bb6 100644 --- a/pkgs/development/libraries/haskell/X11-xft/default.nix +++ b/pkgs/development/libraries/haskell/X11-xft/default.nix @@ -15,6 +15,5 @@ cabal.mkDerivation (self: { description = "Bindings to the Xft, X Free Type interface library, and some Xrender parts"; license = "LGPL"; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/X11/default.nix b/pkgs/development/libraries/haskell/X11/default.nix index 7a8195c21be7d6901dda81c8f2e85ad902cc1098..fbd5e2c0c7b52d9c0cbbef98b93fdbaeba2cbfae 100644 --- a/pkgs/development/libraries/haskell/X11/default.nix +++ b/pkgs/development/libraries/haskell/X11/default.nix @@ -17,6 +17,5 @@ cabal.mkDerivation (self: { description = "A binding to the X11 graphics library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/abstract-deque/default.nix b/pkgs/development/libraries/haskell/abstract-deque/default.nix index 6102e2f403601b6a932bca336a88c9dc61e922ed..0bd1a7c593635eb00372d9e122d53fea5b5c0177 100644 --- a/pkgs/development/libraries/haskell/abstract-deque/default.nix +++ b/pkgs/development/libraries/haskell/abstract-deque/default.nix @@ -13,6 +13,5 @@ cabal.mkDerivation (self: { description = "Abstract, parameterized interface to mutable Deques"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/abstract-par/default.nix b/pkgs/development/libraries/haskell/abstract-par/default.nix index dd85395337949f23406d7cf729daf7ac277161ae..9c7319297eeabfa5300b300b79abf72d2435fa80 100644 --- a/pkgs/development/libraries/haskell/abstract-par/default.nix +++ b/pkgs/development/libraries/haskell/abstract-par/default.nix @@ -12,6 +12,5 @@ cabal.mkDerivation (self: { description = "Type classes generalizing the functionality of the 'monad-par' library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/accelerate-cuda/default.nix b/pkgs/development/libraries/haskell/accelerate-cuda/default.nix index 5ed99a644f7b6d32246abc6d3325eb07fc2fa14f..3bb444eec68278369745d99b341511ff5e36da7b 100644 --- a/pkgs/development/libraries/haskell/accelerate-cuda/default.nix +++ b/pkgs/development/libraries/haskell/accelerate-cuda/default.nix @@ -21,6 +21,5 @@ cabal.mkDerivation (self: { 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 cd1b03316397d6c7fcf62f3febc30c265db278e2..fcd4bb744dd271001c4ddac779740b5db0448292 100644 --- a/pkgs/development/libraries/haskell/accelerate-examples/default.nix +++ b/pkgs/development/libraries/haskell/accelerate-examples/default.nix @@ -28,6 +28,5 @@ cabal.mkDerivation (self: { 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-io/default.nix b/pkgs/development/libraries/haskell/accelerate-io/default.nix index 8d89d9e7ce0c923c85e92fd79c0898bf4ae2e3cc..b8131da6c08def0b5f5bf8151b8256b78f10c300 100644 --- a/pkgs/development/libraries/haskell/accelerate-io/default.nix +++ b/pkgs/development/libraries/haskell/accelerate-io/default.nix @@ -12,6 +12,8 @@ cabal.mkDerivation (self: { description = "Read and write Accelerate arrays in various formats"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + hydraPlatforms = self.stdenv.lib.platforms.none; + broken = true; maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/accelerate/default.nix b/pkgs/development/libraries/haskell/accelerate/default.nix index a32d5fed11c5efac70b303a5293b10f2aa57337a..5ab212a58a1a1051a4346975f2a4356e508f3ffd 100644 --- a/pkgs/development/libraries/haskell/accelerate/default.nix +++ b/pkgs/development/libraries/haskell/accelerate/default.nix @@ -15,6 +15,8 @@ cabal.mkDerivation (self: { description = "An embedded language for accelerated array processing"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + hydraPlatforms = self.stdenv.lib.platforms.none; + broken = true; maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/ad/default.nix b/pkgs/development/libraries/haskell/ad/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..d53d11385f4deb7cd869dc96f18ebc8e33940211 --- /dev/null +++ b/pkgs/development/libraries/haskell/ad/default.nix @@ -0,0 +1,21 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, comonad, dataReify, doctest, erf, filepath, free, mtl +, nats, reflection, tagged, transformers +}: + +cabal.mkDerivation (self: { + pname = "ad"; + version = "4.2.0.1"; + sha256 = "06vjllcrnr4dv5h3xkcy5zhnhyamp6b6jahpnh2y0i6mp2bdw0pz"; + buildDepends = [ + comonad dataReify erf free mtl nats reflection tagged transformers + ]; + testDepends = [ doctest filepath mtl ]; + meta = { + homepage = "http://github.com/ekmett/ad"; + description = "Automatic Differentiation"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/adjunctions/default.nix b/pkgs/development/libraries/haskell/adjunctions/default.nix index 5b9cb5703d623dd02383f961936b101fcfa9ba69..f02aa9df5dd0a6cc45957586caab467051fe6cee 100644 --- a/pkgs/development/libraries/haskell/adjunctions/default.nix +++ b/pkgs/development/libraries/haskell/adjunctions/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "adjunctions"; - version = "4.1.0.1"; - sha256 = "18p2pabid7dx96qcpd2ywv5mhjp55srhm5g013pn697jcxyq2xiv"; + version = "4.2"; + sha256 = "07r56r6kyd6wlcxxnsnnyv59pyc8s1gsy54kzwmk9yknks5rij9i"; buildDepends = [ comonad contravariant distributive free mtl profunctors semigroupoids semigroups tagged transformers void diff --git a/pkgs/development/libraries/haskell/aeson-utils/default.nix b/pkgs/development/libraries/haskell/aeson-utils/default.nix index b0329a4126f1adcfd39a5d27f691009ddebf1f59..db783c012bc380b492c9917ab08bc43cc502437f 100644 --- a/pkgs/development/libraries/haskell/aeson-utils/default.nix +++ b/pkgs/development/libraries/haskell/aeson-utils/default.nix @@ -7,6 +7,7 @@ cabal.mkDerivation (self: { version = "0.2.2.1"; sha256 = "0sj4kdcxcj2wnf3s109yxq8gghz976hkiqs19bjcp6qkzdf5w6sd"; buildDepends = [ aeson attoparsec scientific text ]; + jailbreak = true; meta = { description = "Utilities for working with Aeson"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/aeson/0.7.0.4.nix b/pkgs/development/libraries/haskell/aeson/0.7.0.4.nix index d6cdf9a0d2a2cabf7a52c164c0b9ee57fae2d06e..5dca4bc9062d0992a7ce287584653bb39262be3d 100644 --- a/pkgs/development/libraries/haskell/aeson/0.7.0.4.nix +++ b/pkgs/development/libraries/haskell/aeson/0.7.0.4.nix @@ -23,5 +23,6 @@ cabal.mkDerivation (self: { description = "Fast JSON parsing and encoding"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/aeson/0.7.0.6.nix b/pkgs/development/libraries/haskell/aeson/0.7.0.6.nix deleted file mode 100644 index 955248de5b311f09eb8eb4e5e856c2e4f7499d1c..0000000000000000000000000000000000000000 --- a/pkgs/development/libraries/haskell/aeson/0.7.0.6.nix +++ /dev/null @@ -1,28 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, attoparsec, blazeBuilder, deepseq, dlist, hashable, HUnit -, mtl, QuickCheck, scientific, syb, testFramework -, testFrameworkHunit, testFrameworkQuickcheck2, text, time -, unorderedContainers, vector -}: - -cabal.mkDerivation (self: { - pname = "aeson"; - version = "0.7.0.6"; - sha256 = "0vsf9msz9iv7xvsnys5c0kbkldb0pvhiai02vz50b0d1kdsk2mb4"; - buildDepends = [ - attoparsec blazeBuilder deepseq dlist hashable mtl scientific syb - text time unorderedContainers vector - ]; - testDepends = [ - attoparsec HUnit QuickCheck testFramework testFrameworkHunit - testFrameworkQuickcheck2 text time unorderedContainers vector - ]; - meta = { - homepage = "https://github.com/bos/aeson"; - description = "Fast JSON parsing and encoding"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/aeson/0.8.0.0.nix b/pkgs/development/libraries/haskell/aeson/0.8.0.0.nix index cfb256eb9b76a6a30df4ee7529b7298ac9529697..de9708f25461b7cc33f69a877367b3d7e686640c 100644 --- a/pkgs/development/libraries/haskell/aeson/0.8.0.0.nix +++ b/pkgs/development/libraries/haskell/aeson/0.8.0.0.nix @@ -23,6 +23,5 @@ cabal.mkDerivation (self: { description = "Fast JSON parsing and encoding"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/amqp/default.nix b/pkgs/development/libraries/haskell/amqp/default.nix index 2fefde3a8caabba6b888c552f378f7135fb88a35..3b9883dc04a348aaae9d865a7a5523dc6dfc931f 100644 --- a/pkgs/development/libraries/haskell/amqp/default.nix +++ b/pkgs/development/libraries/haskell/amqp/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "amqp"; - version = "0.9"; - sha256 = "10yacflzvf7y21yi6frs88gdbhf5g4j99ag8mwv6jrwfzwqszs5j"; + version = "0.10"; + sha256 = "0606grl2149phzqf0aww8264f9xaw4486ps5jw47ar57mcnxsml6"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/ansi-terminal/default.nix b/pkgs/development/libraries/haskell/ansi-terminal/default.nix index aeaae88f17fdcab37ad83fa4724061215e45acd5..ecacc374e43c2b47f7d40078e4e3d5545fa061b3 100644 --- a/pkgs/development/libraries/haskell/ansi-terminal/default.nix +++ b/pkgs/development/libraries/haskell/ansi-terminal/default.nix @@ -13,6 +13,5 @@ cabal.mkDerivation (self: { description = "Simple ANSI terminal support, with Windows compatibility"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/ansi-wl-pprint/default.nix b/pkgs/development/libraries/haskell/ansi-wl-pprint/default.nix index 5291fa8dc0f790544631d0ce6d40d80fb08cf4a2..d79f0bc979dc7f96ee746dc8c0168b2243cebac7 100644 --- a/pkgs/development/libraries/haskell/ansi-wl-pprint/default.nix +++ b/pkgs/development/libraries/haskell/ansi-wl-pprint/default.nix @@ -14,6 +14,5 @@ cabal.mkDerivation (self: { description = "The Wadler/Leijen Pretty Printer for colored ANSI terminal output"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/ariadne/default.nix b/pkgs/development/libraries/haskell/ariadne/default.nix index dc3acd668edf7424ab10402d424c049cac5c41c5..758d1a90d3b91c9a75e25cd89c20d38f0f635902 100644 --- a/pkgs/development/libraries/haskell/ariadne/default.nix +++ b/pkgs/development/libraries/haskell/ariadne/default.nix @@ -19,6 +19,6 @@ cabal.mkDerivation (self: { description = "Go-to-definition for Haskell"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + maintainers = with self.stdenv.lib.maintainers; [ ocharles ]; }; }) diff --git a/pkgs/development/libraries/haskell/arrows/default.nix b/pkgs/development/libraries/haskell/arrows/default.nix index e60c580347f4d57c90788560214fc574c17b76df..28c691c72122d3e48ba28ebf0d3ba51320d28467 100644 --- a/pkgs/development/libraries/haskell/arrows/default.nix +++ b/pkgs/development/libraries/haskell/arrows/default.nix @@ -12,6 +12,5 @@ cabal.mkDerivation (self: { description = "Arrow classes and transformers"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/asn1-data/default.nix b/pkgs/development/libraries/haskell/asn1-data/default.nix index 8b813fc02dcc43cbba0bc2c1906b137f68acd06a..f0b9945cd6269b81da10773ff4f8552e0515117a 100644 --- a/pkgs/development/libraries/haskell/asn1-data/default.nix +++ b/pkgs/development/libraries/haskell/asn1-data/default.nix @@ -14,6 +14,5 @@ cabal.mkDerivation (self: { description = "ASN1 data reader and writer in RAW, BER and DER forms"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/async/2.0.1.3.nix b/pkgs/development/libraries/haskell/async/2.0.1.3.nix index e63a201b1e05be8efe4ac945cc42e21dd540eee3..a60830309e78e99e2ef3f4bb1ad39a164125dc78 100644 --- a/pkgs/development/libraries/haskell/async/2.0.1.3.nix +++ b/pkgs/development/libraries/haskell/async/2.0.1.3.nix @@ -14,6 +14,6 @@ cabal.mkDerivation (self: { description = "Run IO operations asynchronously and wait for their results"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) 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 0813579c0b7b00e06c6c623afced3fbff87d7368..7a050defb4dc7cf961987e8e4402380aaca0cb08 100644 --- a/pkgs/development/libraries/haskell/async/2.0.1.4.nix +++ b/pkgs/development/libraries/haskell/async/2.0.1.4.nix @@ -14,6 +14,6 @@ cabal.mkDerivation (self: { description = "Run IO operations asynchronously and wait for their results"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/async/2.0.1.5.nix b/pkgs/development/libraries/haskell/async/2.0.1.5.nix index 7f3003de568c80bf3b05682e12c6e58d05c729d9..a4251e9e80b6a7a544eadaf9e68b9c7eb87a0f51 100644 --- a/pkgs/development/libraries/haskell/async/2.0.1.5.nix +++ b/pkgs/development/libraries/haskell/async/2.0.1.5.nix @@ -14,6 +14,5 @@ cabal.mkDerivation (self: { description = "Run IO operations asynchronously and wait for their results"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/atomic-primops/default.nix b/pkgs/development/libraries/haskell/atomic-primops/default.nix index 127ee2b326c2213b4910f7153dace289f7aed8ec..466a442909174642447241f0ddfd04ebbe771108 100644 --- a/pkgs/development/libraries/haskell/atomic-primops/default.nix +++ b/pkgs/development/libraries/haskell/atomic-primops/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "atomic-primops"; - version = "0.6.0.5"; - sha256 = "0xyvadhmhk2b6y6p52cfbjx1hs3zfcwfa5wx6cypaq4yi3csyl5k"; + version = "0.6.0.6"; + sha256 = "10i9s6d9951z9bf88w1vxcfb9z9axm2q4kf8wy6zd5gcc8hm7wcb"; buildDepends = [ primitive ]; meta = { homepage = "https://github.com/rrnewton/haskell-lockfree/wiki"; diff --git a/pkgs/development/libraries/haskell/attempt/default.nix b/pkgs/development/libraries/haskell/attempt/default.nix index 30fd30b35d1cca2761a4cb12fe5b888bff2a1112..3f95f14c35c05381cf324860a3a7bf8353d3e088 100644 --- a/pkgs/development/libraries/haskell/attempt/default.nix +++ b/pkgs/development/libraries/haskell/attempt/default.nix @@ -12,6 +12,5 @@ cabal.mkDerivation (self: { description = "Concrete data type for handling extensible exceptions as failures. (deprecated)"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix b/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix index 0f240f8d31ff5656e17f0f50118331cf08946021..b2e64f272fd422b3d6755361b8195dbe6bf2fa97 100644 --- a/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix +++ b/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix @@ -13,6 +13,5 @@ cabal.mkDerivation (self: { description = "Consume attoparsec parsers via conduit. (deprecated)"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/attoparsec-enumerator/default.nix b/pkgs/development/libraries/haskell/attoparsec-enumerator/default.nix index ceea762f7de1b6ca75c54d147535928dfc653f46..be5c1b4435a2f688fad933599062fc709c9029df 100644 --- a/pkgs/development/libraries/haskell/attoparsec-enumerator/default.nix +++ b/pkgs/development/libraries/haskell/attoparsec-enumerator/default.nix @@ -12,6 +12,5 @@ cabal.mkDerivation (self: { description = "Pass input from an enumerator to an Attoparsec parser"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/attoparsec/0.10.4.0.nix b/pkgs/development/libraries/haskell/attoparsec/0.10.4.0.nix index 235f0f2c8b759c41e6f97a874f8a3d9ae906fc20..f53b32d53650cfe343bbda4dcb343e13258785ed 100644 --- a/pkgs/development/libraries/haskell/attoparsec/0.10.4.0.nix +++ b/pkgs/development/libraries/haskell/attoparsec/0.10.4.0.nix @@ -17,6 +17,6 @@ cabal.mkDerivation (self: { description = "Fast combinator parsing for bytestrings and text"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/attoparsec/0.11.3.1.nix b/pkgs/development/libraries/haskell/attoparsec/0.11.3.1.nix index 8a1a341ceb25cb461bbce8e925f0cca1389b8ebb..ef61d8c79a1e91470f23d2f587c85d22be20e2d9 100644 --- a/pkgs/development/libraries/haskell/attoparsec/0.11.3.1.nix +++ b/pkgs/development/libraries/haskell/attoparsec/0.11.3.1.nix @@ -18,6 +18,6 @@ cabal.mkDerivation (self: { description = "Fast combinator parsing for bytestrings and text"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/attoparsec/0.11.3.4.nix b/pkgs/development/libraries/haskell/attoparsec/0.11.3.4.nix index ebb1f33f29e26f7ba2bf67464bd26bdfe19d8f18..e322f6de4ce04d3d0509824b53a53b2641e2667f 100644 --- a/pkgs/development/libraries/haskell/attoparsec/0.11.3.4.nix +++ b/pkgs/development/libraries/haskell/attoparsec/0.11.3.4.nix @@ -17,6 +17,6 @@ cabal.mkDerivation (self: { description = "Fast combinator parsing for bytestrings and text"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/attoparsec/0.12.1.0.nix b/pkgs/development/libraries/haskell/attoparsec/0.12.1.1.nix similarity index 80% rename from pkgs/development/libraries/haskell/attoparsec/0.12.1.0.nix rename to pkgs/development/libraries/haskell/attoparsec/0.12.1.1.nix index e17fd13741af68a5499a42d71e2c82e00ea2eafd..b8e2104f739009f627b1292c8d9af4221beaf871 100644 --- a/pkgs/development/libraries/haskell/attoparsec/0.12.1.0.nix +++ b/pkgs/development/libraries/haskell/attoparsec/0.12.1.1.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "attoparsec"; - version = "0.12.1.0"; - sha256 = "1y7sikk5hg9yj3mn21k026ni6lznsih0lx03rgdz4gmb6aqh54bn"; + version = "0.12.1.1"; + sha256 = "0whj2wscw9pdf6avnhnqiapsllh6228j4hifyfvr4v0w663plh7p"; buildDepends = [ deepseq scientific text ]; testDepends = [ deepseq QuickCheck scientific testFramework @@ -18,6 +18,5 @@ cabal.mkDerivation (self: { description = "Fast combinator parsing for bytestrings and text"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/authenticate-oauth/default.nix b/pkgs/development/libraries/haskell/authenticate-oauth/default.nix index 8f6c15bdd714a1ddd019d1aacee081f8e74c6a00..ae996df0d5bff63124e57e77a6fc6e42161a4b7a 100644 --- a/pkgs/development/libraries/haskell/authenticate-oauth/default.nix +++ b/pkgs/development/libraries/haskell/authenticate-oauth/default.nix @@ -18,6 +18,6 @@ cabal.mkDerivation (self: { description = "Library to authenticate with OAuth for Haskell web applications"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + maintainers = with self.stdenv.lib.maintainers; [ ocharles ]; }; }) diff --git a/pkgs/development/libraries/haskell/authenticate/default.nix b/pkgs/development/libraries/haskell/authenticate/default.nix index 381f9d81d0136ce0b8acbbd256f52b64c10ac1fe..3c22e1b9d698dcf89179e8e9635e012ae5943015 100644 --- a/pkgs/development/libraries/haskell/authenticate/default.nix +++ b/pkgs/development/libraries/haskell/authenticate/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "authenticate"; - version = "1.3.2.8"; - sha256 = "1ylijkj32li9nm4x16d66h6a74q07m4v3n2dqm67by548wfyh1j9"; + version = "1.3.2.9"; + sha256 = "09vg7m2sh3566q7jgi85djc5jrq2y06swlbj1fbym6yf4cmk8gdr"; buildDepends = [ aeson attoparsec blazeBuilder caseInsensitive conduit httpConduit httpTypes monadControl network resourcet tagstreamConduit text @@ -20,6 +20,5 @@ cabal.mkDerivation (self: { description = "Authentication methods for Haskell web applications"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/auto-update/default.nix b/pkgs/development/libraries/haskell/auto-update/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..b7c314f9ff9794ac7777c8ba60f49947160b39e9 --- /dev/null +++ b/pkgs/development/libraries/haskell/auto-update/default.nix @@ -0,0 +1,16 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, hspec }: + +cabal.mkDerivation (self: { + pname = "auto-update"; + version = "0.1.1.1"; + sha256 = "0ksclbh3d7p2511ji86ind8f6jrh58mz61mc441kfz51ippkdk59"; + testDepends = [ hspec ]; + meta = { + homepage = "https://github.com/yesodweb/wai"; + description = "Efficiently run periodic, on-demand actions"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/aws/default.nix b/pkgs/development/libraries/haskell/aws/default.nix index b50a61f9157f599bcf16bc79d14548cbd952fd7e..139e9e2b27e6c52a5193c20e8448836d080dcef3 100644 --- a/pkgs/development/libraries/haskell/aws/default.nix +++ b/pkgs/development/libraries/haskell/aws/default.nix @@ -3,20 +3,20 @@ { cabal, aeson, base16Bytestring, base64Bytestring, blazeBuilder , byteable, caseInsensitive, cereal, conduit, conduitExtra , cryptohash, dataDefault, filepath, httpConduit, httpTypes -, liftedBase, monadControl, mtl, resourcet, text, time +, liftedBase, monadControl, mtl, network, resourcet, text, time , transformers, unorderedContainers, utf8String, vector, xmlConduit }: cabal.mkDerivation (self: { pname = "aws"; - version = "0.9.1"; - sha256 = "1fp18j8my9v7d6z0d28bc1hjzrs9znf3c986950pfpv2bsiw7m6d"; + version = "0.9.3"; + sha256 = "11g8i6kfq7n1v5nvj8bkhrgsiyzfz0vwk4lh8sljnfd5pyjawx7h"; isLibrary = true; isExecutable = true; buildDepends = [ aeson base16Bytestring base64Bytestring blazeBuilder byteable caseInsensitive cereal conduit conduitExtra cryptohash dataDefault - filepath httpConduit httpTypes liftedBase monadControl mtl + filepath httpConduit httpTypes liftedBase monadControl mtl network resourcet text time transformers unorderedContainers utf8String vector xmlConduit ]; @@ -25,6 +25,6 @@ cabal.mkDerivation (self: { description = "Amazon Web Services (AWS) for Haskell"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + maintainers = with self.stdenv.lib.maintainers; [ ocharles ]; }; }) diff --git a/pkgs/development/libraries/haskell/base-prelude/default.nix b/pkgs/development/libraries/haskell/base-prelude/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..824576293f45d1dfddfc5327d1dcc1e1698e2770 --- /dev/null +++ b/pkgs/development/libraries/haskell/base-prelude/default.nix @@ -0,0 +1,15 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal }: + +cabal.mkDerivation (self: { + pname = "base-prelude"; + version = "0.1.3"; + sha256 = "07s5j538zxd0hlazqqbz4nwa82rcrmv25v7jr6nxafmgn83mkqhx"; + meta = { + homepage = "https://github.com/nikita-volkov/base-prelude"; + description = "The most complete prelude formed from only the \"base\" package"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/base-unicode-symbols/default.nix b/pkgs/development/libraries/haskell/base-unicode-symbols/default.nix index 679235a49b37f0683ca54c27e3a8ed867ebc6c3c..1e32a6e26e035a22840362cea15ce486d2707447 100644 --- a/pkgs/development/libraries/haskell/base-unicode-symbols/default.nix +++ b/pkgs/development/libraries/haskell/base-unicode-symbols/default.nix @@ -11,6 +11,5 @@ cabal.mkDerivation (self: { description = "Unicode alternatives for common functions and operators"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/base16-bytestring/default.nix b/pkgs/development/libraries/haskell/base16-bytestring/default.nix index 29dedfe95f9168de0df08db545df1bcbce8c821b..36f0bf6935ba9e5074f78cf3c21ebf229f925783 100644 --- a/pkgs/development/libraries/haskell/base16-bytestring/default.nix +++ b/pkgs/development/libraries/haskell/base16-bytestring/default.nix @@ -11,6 +11,5 @@ cabal.mkDerivation (self: { description = "Fast base16 (hex) encoding and decoding for ByteStrings"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/base64-bytestring/default.nix b/pkgs/development/libraries/haskell/base64-bytestring/default.nix index 6ab860e09ab7b4347385fbf339e096e5b88c8cd8..39c65dd525008a4fa5956881e183478227e539d1 100644 --- a/pkgs/development/libraries/haskell/base64-bytestring/default.nix +++ b/pkgs/development/libraries/haskell/base64-bytestring/default.nix @@ -18,6 +18,5 @@ cabal.mkDerivation (self: { description = "Fast base64 encoding and decoding for ByteStrings"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/base64-conduit/default.nix b/pkgs/development/libraries/haskell/base64-conduit/default.nix deleted file mode 100644 index a71d1282443670c608265ea96c4dbe64e66835ad..0000000000000000000000000000000000000000 --- a/pkgs/development/libraries/haskell/base64-conduit/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, base64Bytestring, conduit, hspec, QuickCheck, transformers -}: - -cabal.mkDerivation (self: { - pname = "base64-conduit"; - version = "1.0.0.1"; - sha256 = "07zhvn3fy60q04a5g5mzhkl17rap9jlh00vb4f6565bjha2k16g9"; - buildDepends = [ base64Bytestring conduit ]; - testDepends = [ - base64Bytestring conduit hspec QuickCheck transformers - ]; - meta = { - homepage = "http://github.com/snoyberg/conduit"; - description = "Base64-encode and decode streams of bytes. (deprecated)"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - }; -}) diff --git a/pkgs/development/libraries/haskell/base64-string/default.nix b/pkgs/development/libraries/haskell/base64-string/default.nix index f68c53d360166aa6650768e1eaf8ed7329b06b60..26ab4dc4924f9c6b2acd4a6fb156496f2a05ad0a 100644 --- a/pkgs/development/libraries/haskell/base64-string/default.nix +++ b/pkgs/development/libraries/haskell/base64-string/default.nix @@ -11,6 +11,5 @@ cabal.mkDerivation (self: { description = "Base64 implementation for String's"; license = "unknown"; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/benchpress/default.nix b/pkgs/development/libraries/haskell/benchpress/default.nix index d502e0919ccbd664119c62d9db17a876bb6ff60f..44e73f609f3abff1f303ee47d05b0d455a341809 100644 --- a/pkgs/development/libraries/haskell/benchpress/default.nix +++ b/pkgs/development/libraries/haskell/benchpress/default.nix @@ -13,6 +13,5 @@ cabal.mkDerivation (self: { description = "Micro-benchmarking with detailed statistics"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/bencoding/default.nix b/pkgs/development/libraries/haskell/bencoding/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..325343985ac88cc23cb4a878aeb1ba290d13e5b1 --- /dev/null +++ b/pkgs/development/libraries/haskell/bencoding/default.nix @@ -0,0 +1,17 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, attoparsec, deepseq, hspec, mtl, QuickCheck, text }: + +cabal.mkDerivation (self: { + pname = "bencoding"; + version = "0.4.3.0"; + sha256 = "0f6d3g88y7i4s5wa53771n0fbkbs4na8vpy51wk21b563smdcpcc"; + buildDepends = [ attoparsec deepseq mtl text ]; + testDepends = [ attoparsec hspec QuickCheck ]; + meta = { + homepage = "https://github.com/cobit/bencoding"; + description = "A library for encoding and decoding of BEncode data"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/bert/default.nix b/pkgs/development/libraries/haskell/bert/default.nix index 217966c1426ee7ad799760ca92b72764a9068fc2..a9521076bd73fabac70769401007c072995f1415 100644 --- a/pkgs/development/libraries/haskell/bert/default.nix +++ b/pkgs/development/libraries/haskell/bert/default.nix @@ -21,6 +21,6 @@ cabal.mkDerivation (self: { description = "BERT implementation"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + maintainers = with self.stdenv.lib.maintainers; [ ocharles ]; }; }) diff --git a/pkgs/development/libraries/haskell/bimap/default.nix b/pkgs/development/libraries/haskell/bimap/default.nix index 3550581d4d10e35458921a5fc3a9dc6a46a74ec8..4a9d4aa41bc6529f509b373350f8f09f8748cc45 100644 --- a/pkgs/development/libraries/haskell/bimap/default.nix +++ b/pkgs/development/libraries/haskell/bimap/default.nix @@ -11,6 +11,5 @@ cabal.mkDerivation (self: { description = "Bidirectional mapping between two key types"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/binary-conduit/default.nix b/pkgs/development/libraries/haskell/binary-conduit/default.nix index 6ee88b981bb25b167a19227479a1905eec69ee47..37774c1a16af3a77c1821c5445df72ffb0b33774 100644 --- a/pkgs/development/libraries/haskell/binary-conduit/default.nix +++ b/pkgs/development/libraries/haskell/binary-conduit/default.nix @@ -17,6 +17,6 @@ cabal.mkDerivation (self: { description = "data serialization/deserialization conduit library"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + maintainers = with self.stdenv.lib.maintainers; [ ocharles ]; }; }) diff --git a/pkgs/development/libraries/haskell/binary-shared/default.nix b/pkgs/development/libraries/haskell/binary-shared/default.nix index bf2d662a58935054d36dc3beed09f50cf22617ee..bfeef7c0cb628df6fc419ffff01bd4494a52127a 100644 --- a/pkgs/development/libraries/haskell/binary-shared/default.nix +++ b/pkgs/development/libraries/haskell/binary-shared/default.nix @@ -12,6 +12,5 @@ cabal.mkDerivation (self: { description = "Sharing for the binary package"; license = "GPL"; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/binary/0.6.1.0.nix b/pkgs/development/libraries/haskell/binary/0.6.1.0.nix index 6366ecf67602476be0b4e0ec34d5581994b4ef1d..06aca17cde3fd98fbaf3eefc9774ee06b05e07f8 100644 --- a/pkgs/development/libraries/haskell/binary/0.6.1.0.nix +++ b/pkgs/development/libraries/haskell/binary/0.6.1.0.nix @@ -11,5 +11,6 @@ cabal.mkDerivation (self: { description = "Binary serialisation for Haskell values using lazy ByteStrings"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/binary/0.7.2.1.nix b/pkgs/development/libraries/haskell/binary/0.7.2.1.nix index fbb640d5b41057123a2d2d0db04d690d2f301ab3..b8803868cd13ba9e357f86aed9ab540b3d788d0f 100644 --- a/pkgs/development/libraries/haskell/binary/0.7.2.1.nix +++ b/pkgs/development/libraries/haskell/binary/0.7.2.1.nix @@ -17,6 +17,5 @@ cabal.mkDerivation (self: { description = "Binary serialisation for Haskell values using lazy ByteStrings"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/bindings-GLFW/default.nix b/pkgs/development/libraries/haskell/bindings-GLFW/default.nix index 0ed43d795379eb60acec5b01ec41f922e8b311cb..08e14a782bf1c77ec0d0f4212c019e81f24a54d8 100644 --- a/pkgs/development/libraries/haskell/bindings-GLFW/default.nix +++ b/pkgs/development/libraries/haskell/bindings-GLFW/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "bindings-GLFW"; - version = "3.0.3.2"; - sha256 = "1w4y2ha5x678fiyan79jd59mjrkf4q25v8049sj20fbmabgdqla9"; + version = "3.0.3.3"; + sha256 = "0w6vqshlk0c4k4q81xw7kg4j62h3wpccpy8qbiq5ks69w7z13fy4"; buildDepends = [ bindingsDSL ]; testDepends = [ HUnit testFramework testFrameworkHunit ]; extraLibraries = [ diff --git a/pkgs/development/libraries/haskell/bitarray/default.nix b/pkgs/development/libraries/haskell/bitarray/default.nix index 2a01ea92a08ec7f6244839359cda49c68f2d1ed2..f063622e8defd2296ea7304be83511d0e1a2febe 100644 --- a/pkgs/development/libraries/haskell/bitarray/default.nix +++ b/pkgs/development/libraries/haskell/bitarray/default.nix @@ -4,13 +4,12 @@ cabal.mkDerivation (self: { pname = "bitarray"; - version = "0.0.1"; - sha256 = "01ijysisw70zaw70hx851axw48agfamdqj21rzzhdqd2ww6bwchb"; + version = "0.0.1.1"; + sha256 = "00nqd62cbh42qqqvcl6iv1i9kbv0f0mkiygv4j70wfh5cl86yzxj"; meta = { homepage = "http://code.haskell.org/~bkomuves/"; description = "Mutable and immutable bit arrays"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/bitmap/default.nix b/pkgs/development/libraries/haskell/bitmap/default.nix index 790b068b3d60d77b5206907147df199fa75dcbe1..74c78cab7060fe8805e5909506404910af5b4de0 100644 --- a/pkgs/development/libraries/haskell/bitmap/default.nix +++ b/pkgs/development/libraries/haskell/bitmap/default.nix @@ -11,6 +11,5 @@ cabal.mkDerivation (self: { description = "A library for handling and manipulating bitmaps (rectangular pixel arrays)"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/bits-atomic/default.nix b/pkgs/development/libraries/haskell/bits-atomic/default.nix index 4d5b0909b76e77fed409f6c8f9a0ace65e648e8b..f45c5a87de952d77b76a7be9a37d0add0146347b 100644 --- a/pkgs/development/libraries/haskell/bits-atomic/default.nix +++ b/pkgs/development/libraries/haskell/bits-atomic/default.nix @@ -12,6 +12,5 @@ cabal.mkDerivation (self: { description = "Atomic bit operations on memory locations for low-level synchronization"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/bktrees/default.nix b/pkgs/development/libraries/haskell/bktrees/default.nix index a070bb2b197a1ee7b2f0c95bc293795501ceb709..6797a2b950ac21207ff633bbc1cb9b2c22833657 100644 --- a/pkgs/development/libraries/haskell/bktrees/default.nix +++ b/pkgs/development/libraries/haskell/bktrees/default.nix @@ -10,6 +10,5 @@ cabal.mkDerivation (self: { description = "A set data structure with approximate searching"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix b/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix index 554328275f5d8d989e21f4824f7626f93db7a51a..02b7950a481e86ec19046e10fa3ee142c2772cab 100644 --- a/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix +++ b/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix @@ -13,6 +13,5 @@ cabal.mkDerivation (self: { description = "Convert streams of builders to streams of bytestrings. (deprecated)"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/blaze-builder-enumerator/default.nix b/pkgs/development/libraries/haskell/blaze-builder-enumerator/default.nix index 261935d5c23f0ef74add7eed3caef5300a9fb0ba..a32b89e2eb7a83fb1bd14e0c229a23a1053ce3fb 100644 --- a/pkgs/development/libraries/haskell/blaze-builder-enumerator/default.nix +++ b/pkgs/development/libraries/haskell/blaze-builder-enumerator/default.nix @@ -13,6 +13,5 @@ cabal.mkDerivation (self: { description = "Enumeratees for the incremental conversion of builders to bytestrings"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/blaze-builder/default.nix b/pkgs/development/libraries/haskell/blaze-builder/default.nix index 4672a3f34cf05d8299731fb4facf2111fbeca5a0..c031633c233168084bab0c2edef97e06812aa70b 100644 --- a/pkgs/development/libraries/haskell/blaze-builder/default.nix +++ b/pkgs/development/libraries/haskell/blaze-builder/default.nix @@ -12,6 +12,5 @@ cabal.mkDerivation (self: { description = "Efficient buffered output"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/blaze-html/default.nix b/pkgs/development/libraries/haskell/blaze-html/default.nix index c470f1f55ca69a465878ab4d129bf0bf62e4536c..e29b4c0252104ef6543ae26dd518fb98957ab6b3 100644 --- a/pkgs/development/libraries/haskell/blaze-html/default.nix +++ b/pkgs/development/libraries/haskell/blaze-html/default.nix @@ -18,6 +18,5 @@ cabal.mkDerivation (self: { description = "A blazingly fast HTML combinator library for Haskell"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/blaze-markup/default.nix b/pkgs/development/libraries/haskell/blaze-markup/default.nix index eecb8cef2725f6f47f3054373ae807b87e682e4f..d4b52d5443627621432cae5689ebbf7585d910ae 100644 --- a/pkgs/development/libraries/haskell/blaze-markup/default.nix +++ b/pkgs/development/libraries/haskell/blaze-markup/default.nix @@ -18,6 +18,5 @@ cabal.mkDerivation (self: { description = "A blazingly fast markup combinator library for Haskell"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/blaze-textual/default.nix b/pkgs/development/libraries/haskell/blaze-textual/default.nix index a6228000b121ad852972cb8296f8f8d6c8ea7090..b3f3334684d8de75c24c7b59cfdad4bfc404d45b 100644 --- a/pkgs/development/libraries/haskell/blaze-textual/default.nix +++ b/pkgs/development/libraries/haskell/blaze-textual/default.nix @@ -18,6 +18,5 @@ cabal.mkDerivation (self: { description = "Fast rendering of common datatypes"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/bloomfilter/default.nix b/pkgs/development/libraries/haskell/bloomfilter/default.nix index 6eae9a30da68e49e541f213f75bab920a77f686d..2494f08eaac34680be1669a389b780501c9d9f99 100644 --- a/pkgs/development/libraries/haskell/bloomfilter/default.nix +++ b/pkgs/development/libraries/haskell/bloomfilter/default.nix @@ -9,6 +9,10 @@ cabal.mkDerivation (self: { version = "2.0.0.0"; sha256 = "07fif8i5rinysli1mpi92k405kvw8va7w9v9w4wd5bylb87zy77f"; buildDepends = [ deepseq ]; + # https://github.com/bos/bloomfilter/pull/8 + preConfigure = '' + sed -i -e "s/0xffffffff/0x7fffffff/" Data/BloomFilter/Easy.hs + ''; testDepends = [ QuickCheck random testFramework testFrameworkQuickcheck2 ]; diff --git a/pkgs/development/libraries/haskell/bmp/default.nix b/pkgs/development/libraries/haskell/bmp/default.nix index 6d04a1ce6af86fa5d197c61f1da952ddb702000e..3147b139409f10c3a43421911167229d3b4d863a 100644 --- a/pkgs/development/libraries/haskell/bmp/default.nix +++ b/pkgs/development/libraries/haskell/bmp/default.nix @@ -12,6 +12,5 @@ cabal.mkDerivation (self: { description = "Read and write uncompressed BMP image files"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/bound/default.nix b/pkgs/development/libraries/haskell/bound/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..1b011386420331d28752829447afee37319bbb4e --- /dev/null +++ b/pkgs/development/libraries/haskell/bound/default.nix @@ -0,0 +1,24 @@ +{ cabal, bifunctors, binary, bytes, cereal, comonad, doctest +, filepath, hashable, hashableExtras, preludeExtras, profunctors +, transformers, vector +}: + +cabal.mkDerivation (self: { + pname = "bound"; + version = "1.0.3"; + sha256 = "0nfcxq87i9lzdkrg7g65cprn4rg9rhn9nyk2jpjh4c1rc7gdn0aq"; + buildDepends = [ + bifunctors binary bytes cereal comonad hashable hashableExtras + preludeExtras profunctors transformers + ]; + testDepends = [ + doctest filepath preludeExtras transformers vector + ]; + meta = { + homepage = "http://github.com/ekmett/bound/"; + description = "Making de Bruijn Succ Less"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/boundingboxes/0.1.1.nix b/pkgs/development/libraries/haskell/boundingboxes/0.1.1.nix index ed291fcbbc5d0dc9c8b895478571f5793e34e41c..205b05f30d89150dc30d58d74c15aed2ec63cca2 100644 --- a/pkgs/development/libraries/haskell/boundingboxes/0.1.1.nix +++ b/pkgs/development/libraries/haskell/boundingboxes/0.1.1.nix @@ -19,5 +19,6 @@ cabal.mkDerivation (self: { description = "The type for 2D bounding box"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/brainfuck/default.nix b/pkgs/development/libraries/haskell/brainfuck/default.nix index 9b0d2eb12bfdbb7d5a96a4b1338a8f54ae9f070d..3f7849efaf45532bd5eb358864201204eb63063b 100644 --- a/pkgs/development/libraries/haskell/brainfuck/default.nix +++ b/pkgs/development/libraries/haskell/brainfuck/default.nix @@ -13,6 +13,5 @@ cabal.mkDerivation (self: { description = "Brainfuck interpreter"; license = "GPL"; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/bson/default.nix b/pkgs/development/libraries/haskell/bson/default.nix index f46809f69155d7751528ebe3eae6f5a31f30165c..2bcace9da742a8c539cc605b8cdce80cd2d427a5 100644 --- a/pkgs/development/libraries/haskell/bson/default.nix +++ b/pkgs/development/libraries/haskell/bson/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "bson"; - version = "0.3"; - sha256 = "0787z6970lf93mgrsyqcilnkx5bynny88ag15z2f07l1rhva6ac4"; + version = "0.3.1"; + sha256 = "1kihsjws8sqb44gvilh1zxrqn2bml8gxq2bbanxqb7nr4ymwfkiv"; buildDepends = [ binary cryptohash dataBinaryIeee754 mtl network text time ]; @@ -17,10 +17,9 @@ cabal.mkDerivation (self: { ]; doCheck = false; meta = { - homepage = "http://github.com/selectel/bson-haskell"; + homepage = "http://github.com/mongodb-haskell/bson"; description = "BSON documents are JSON-like objects with a standard binary encoding"; license = "unknown"; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/bv/default.nix b/pkgs/development/libraries/haskell/bv/default.nix index a5583e5b3431750e8beda50ae79a8344c803ffed..4a2be6244e766eb942260b07e8d29fcd681dc2ad 100644 --- a/pkgs/development/libraries/haskell/bv/default.nix +++ b/pkgs/development/libraries/haskell/bv/default.nix @@ -13,5 +13,7 @@ cabal.mkDerivation (self: { description = "Bit-vector arithmetic library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + hydraPlatforms = self.stdenv.lib.platforms.none; + broken = true; }; }) diff --git a/pkgs/development/libraries/haskell/byteorder/default.nix b/pkgs/development/libraries/haskell/byteorder/default.nix index 99bfd6c21406a68f27607e17b4887200943d559b..123625233fca314b0945bcccca6345b2ce0b8c49 100644 --- a/pkgs/development/libraries/haskell/byteorder/default.nix +++ b/pkgs/development/libraries/haskell/byteorder/default.nix @@ -11,6 +11,5 @@ cabal.mkDerivation (self: { description = "Exposes the native endianness or byte ordering of the system"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/bytestring-lexing/default.nix b/pkgs/development/libraries/haskell/bytestring-lexing/default.nix index 0ac2f1c63a8de0411af96c3b5392a590f309e71e..bcc0f3d0a7684a03577bff18e4009fcff93dc2af 100644 --- a/pkgs/development/libraries/haskell/bytestring-lexing/default.nix +++ b/pkgs/development/libraries/haskell/bytestring-lexing/default.nix @@ -12,6 +12,5 @@ cabal.mkDerivation (self: { description = "Parse and produce literals efficiently from strict or lazy bytestrings"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/bytestring-mmap/default.nix b/pkgs/development/libraries/haskell/bytestring-mmap/default.nix index 4486ae8da454d459d73956a05c974bf41d18e2ad..1be3a48144cfecc7b082bb0d368c48959e47c4dc 100644 --- a/pkgs/development/libraries/haskell/bytestring-mmap/default.nix +++ b/pkgs/development/libraries/haskell/bytestring-mmap/default.nix @@ -11,6 +11,5 @@ cabal.mkDerivation (self: { description = "mmap support for strict ByteStrings"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/bytestring-nums/default.nix b/pkgs/development/libraries/haskell/bytestring-nums/default.nix index 400529b026a627fc4c0ae8b9ac14a11cc5109d5b..c311fbe1738857179ce1257e05f586240deee5e4 100644 --- a/pkgs/development/libraries/haskell/bytestring-nums/default.nix +++ b/pkgs/development/libraries/haskell/bytestring-nums/default.nix @@ -13,6 +13,5 @@ cabal.mkDerivation (self: { description = "Parse numeric literals from ByteStrings"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/bytestring-trie/default.nix b/pkgs/development/libraries/haskell/bytestring-trie/default.nix index b827c831ffa3f6f7c19a38294d5dfd1bf5008554..c8a4143e2178894bc5099d8a46d4b3760a48c556 100644 --- a/pkgs/development/libraries/haskell/bytestring-trie/default.nix +++ b/pkgs/development/libraries/haskell/bytestring-trie/default.nix @@ -12,6 +12,5 @@ cabal.mkDerivation (self: { description = "An efficient finite map from (byte)strings to values"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/c2hs/default.nix b/pkgs/development/libraries/haskell/c2hs/default.nix index bd86e705e7daad9687b57e132e006274d24f2deb..95ead17f01f5df575d84f5044978fe92707d0ab1 100644 --- a/pkgs/development/libraries/haskell/c2hs/default.nix +++ b/pkgs/development/libraries/haskell/c2hs/default.nix @@ -21,6 +21,5 @@ cabal.mkDerivation (self: { description = "C->Haskell FFI tool that gives some cross-language type safety"; license = self.stdenv.lib.licenses.gpl2; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/cabal-cargs/default.nix b/pkgs/development/libraries/haskell/cabal-cargs/default.nix index 4e891196a501ca90c7a264de417ff7cfb7ddc69b..85015f5d4acc915c1ad1f3af99cb1a56813d55bc 100644 --- a/pkgs/development/libraries/haskell/cabal-cargs/default.nix +++ b/pkgs/development/libraries/haskell/cabal-cargs/default.nix @@ -21,6 +21,6 @@ cabal.mkDerivation (self: { description = "A command line program for extracting compiler arguments from a cabal file"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.tomberek ]; + maintainers = with self.stdenv.lib.maintainers; [ tomberek ]; }; }) diff --git a/pkgs/development/libraries/haskell/cabal-file-th/default.nix b/pkgs/development/libraries/haskell/cabal-file-th/default.nix index 53a9794883a17a3ac2e1524f2ff4006ab6eef3b0..2b1dcdd6558322852286d0a716d20692e1cb06d4 100644 --- a/pkgs/development/libraries/haskell/cabal-file-th/default.nix +++ b/pkgs/development/libraries/haskell/cabal-file-th/default.nix @@ -12,6 +12,7 @@ cabal.mkDerivation (self: { description = "Template Haskell expressions for reading fields from a project's cabal file"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; + broken = true; }; }) diff --git a/pkgs/development/libraries/haskell/cabal-lenses/default.nix b/pkgs/development/libraries/haskell/cabal-lenses/default.nix index 79693a7139f6d603527c71e52151fd9f5865f5a6..a4ac5164e1f327abede9e7cafa73d8729cd8f068 100644 --- a/pkgs/development/libraries/haskell/cabal-lenses/default.nix +++ b/pkgs/development/libraries/haskell/cabal-lenses/default.nix @@ -4,10 +4,9 @@ cabal.mkDerivation (self: { pname = "cabal-lenses"; - version = "0.2"; - sha256 = "1wfr4rh7ba1hsvi0v7mzpab7fi5k93lz27v8qdfjqzkyybhjglv4"; + version = "0.3"; + sha256 = "13nx9cn81cx9cj7fk07akqvz4qkl49dlgb5wl5wanag6bafa6vhl"; buildDepends = [ Cabal lens unorderedContainers ]; - jailbreak = true; meta = { description = "Lenses and traversals for the Cabal library"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/cabal-macosx/default.nix b/pkgs/development/libraries/haskell/cabal-macosx/default.nix index 7eb36551017121cb55c95e77f2e2300fecbb0d74..f147fe4b2818707a408268df4081a0a734c1fd6e 100644 --- a/pkgs/development/libraries/haskell/cabal-macosx/default.nix +++ b/pkgs/development/libraries/haskell/cabal-macosx/default.nix @@ -15,6 +15,5 @@ cabal.mkDerivation (self: { description = "Cabal support for creating Mac OSX application bundles"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/cairo/default.nix b/pkgs/development/libraries/haskell/cairo/default.nix index b46b8508e9acab7781efdaa391d61b411272128b..b77e3166354315a362547e670ae6a5e3d8a251bd 100644 --- a/pkgs/development/libraries/haskell/cairo/default.nix +++ b/pkgs/development/libraries/haskell/cairo/default.nix @@ -1,14 +1,14 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, cairo, gtk2hsBuildtools, libc, mtl, pkgconfig, utf8String -, zlib +{ cabal, cairo, gtk2hsBuildtools, libc, mtl, pkgconfig, text +, utf8String, zlib }: cabal.mkDerivation (self: { pname = "cairo"; - version = "0.12.5.3"; - sha256 = "1g5wn7dzz8cc7my09igr284j96d795jlnmy1q2hhlvssfhwbbvg7"; - buildDepends = [ mtl utf8String ]; + version = "0.13.0.0"; + sha256 = "1sw1f50kmqln1mkvrr6g85b46dn0ipwnvyl13kxzhq5g581rra92"; + buildDepends = [ mtl text utf8String ]; buildTools = [ gtk2hsBuildtools ]; extraLibraries = [ cairo libc pkgconfig zlib ]; pkgconfigDepends = [ cairo ]; @@ -17,6 +17,5 @@ cabal.mkDerivation (self: { description = "Binding to the Cairo library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/case-insensitive/1.0.0.1.nix b/pkgs/development/libraries/haskell/case-insensitive/1.0.0.1.nix index 6e6cca30c9ab9036c876874d2c06298f8f10788d..d0b40e42d4876de8566c6d0fe65044bb16717bc2 100644 --- a/pkgs/development/libraries/haskell/case-insensitive/1.0.0.1.nix +++ b/pkgs/development/libraries/haskell/case-insensitive/1.0.0.1.nix @@ -16,5 +16,6 @@ cabal.mkDerivation (self: { description = "Case insensitive string comparison"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/case-insensitive/1.0.0.2.nix b/pkgs/development/libraries/haskell/case-insensitive/1.0.0.2.nix index ef1e11126017eb5a4dffd9acb70929f4ddd3ccb1..650c45ada96a36c9e6580dea7ea171889b4ea48a 100644 --- a/pkgs/development/libraries/haskell/case-insensitive/1.0.0.2.nix +++ b/pkgs/development/libraries/haskell/case-insensitive/1.0.0.2.nix @@ -15,5 +15,6 @@ cabal.mkDerivation (self: { description = "Case insensitive string comparison"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/case-insensitive/1.1.0.3.nix b/pkgs/development/libraries/haskell/case-insensitive/1.1.0.3.nix index 08340bbb97650053ae26330c4aaa0340d0809336..3f75b41bb630ba7e3d93184a1f9f4d59938eed73 100644 --- a/pkgs/development/libraries/haskell/case-insensitive/1.1.0.3.nix +++ b/pkgs/development/libraries/haskell/case-insensitive/1.1.0.3.nix @@ -15,5 +15,6 @@ cabal.mkDerivation (self: { description = "Case insensitive string comparison"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/cassava/default.nix b/pkgs/development/libraries/haskell/cassava/default.nix index ab93dc4419608ff3f900a1e9fed869e5d58f94af..c8cb347f10afc6a010595b4da5c9331e962ad04c 100644 --- a/pkgs/development/libraries/haskell/cassava/default.nix +++ b/pkgs/development/libraries/haskell/cassava/default.nix @@ -21,6 +21,6 @@ cabal.mkDerivation (self: { description = "A CSV parsing and encoding library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + maintainers = with self.stdenv.lib.maintainers; [ ocharles ]; }; }) diff --git a/pkgs/development/libraries/haskell/categories/default.nix b/pkgs/development/libraries/haskell/categories/default.nix index e8ff4f3e6a51f96c1b4c0cd7185c5aeb5efc10f8..0f923d3773806d29a5eeb6dd1b8d40e376381545 100644 --- a/pkgs/development/libraries/haskell/categories/default.nix +++ b/pkgs/development/libraries/haskell/categories/default.nix @@ -12,5 +12,7 @@ cabal.mkDerivation (self: { description = "Categories"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + hydraPlatforms = self.stdenv.lib.platforms.none; + broken = true; }; }) diff --git a/pkgs/development/libraries/haskell/cautious-file/default.nix b/pkgs/development/libraries/haskell/cautious-file/default.nix index ff13129c2cffdaf93340d1841c319e07756c89c1..e99557b79892426452bc372298a1b5ddcb863f5e 100644 --- a/pkgs/development/libraries/haskell/cautious-file/default.nix +++ b/pkgs/development/libraries/haskell/cautious-file/default.nix @@ -12,6 +12,5 @@ cabal.mkDerivation (self: { description = "Ways to write a file cautiously, to reduce the chances of problems such as data loss due to crashes or power failures"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/cereal/default.nix b/pkgs/development/libraries/haskell/cereal/default.nix index 99b77033a966778bb113754530bd10a9796b6040..af77f37abdb7d53abef4eb64b35f2264ad126325 100644 --- a/pkgs/development/libraries/haskell/cereal/default.nix +++ b/pkgs/development/libraries/haskell/cereal/default.nix @@ -10,6 +10,5 @@ cabal.mkDerivation (self: { description = "A binary serialization library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/certificate/default.nix b/pkgs/development/libraries/haskell/certificate/default.nix index 06363b8e3351b7f9424a5d95d103243e60e8a76a..5c5c82196ffac695a20b21d85be25f5316318da9 100644 --- a/pkgs/development/libraries/haskell/certificate/default.nix +++ b/pkgs/development/libraries/haskell/certificate/default.nix @@ -19,6 +19,5 @@ cabal.mkDerivation (self: { description = "Certificates and Key Reader/Writer"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/cgi/3001.1.7.1.nix b/pkgs/development/libraries/haskell/cgi/3001.1.7.1.nix index 0373daf9fa72eb7db2b72232af9da347dfa2baa5..068d1b7dadfaeafe8043109550252be105993f29 100644 --- a/pkgs/development/libraries/haskell/cgi/3001.1.7.1.nix +++ b/pkgs/development/libraries/haskell/cgi/3001.1.7.1.nix @@ -11,6 +11,6 @@ cabal.mkDerivation (self: { description = "A library for writing CGI programs"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/cgi/3001.1.7.2.nix b/pkgs/development/libraries/haskell/cgi/3001.1.7.2.nix index 16322e0f74c6517b7b5584608305a4bbff6fa323..c10fa2416f71ae32dd2ff874b625b1624b05d08b 100644 --- a/pkgs/development/libraries/haskell/cgi/3001.1.7.2.nix +++ b/pkgs/development/libraries/haskell/cgi/3001.1.7.2.nix @@ -11,6 +11,6 @@ cabal.mkDerivation (self: { description = "A library for writing CGI programs"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/cgi/3001.1.7.3.nix b/pkgs/development/libraries/haskell/cgi/3001.1.7.3.nix index 2d18660403366b353310c7a3a77bcf79da8f4b97..7cb7e77dd77822b9a47b248e8b37f07b30f60f01 100644 --- a/pkgs/development/libraries/haskell/cgi/3001.1.7.3.nix +++ b/pkgs/development/libraries/haskell/cgi/3001.1.7.3.nix @@ -12,6 +12,6 @@ cabal.mkDerivation (self: { description = "A library for writing CGI programs"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/cgi/3001.1.7.4.nix b/pkgs/development/libraries/haskell/cgi/3001.1.7.4.nix index 82ba74c14aa4e0278d5815daf64fe7f3238711da..6071ecc7597e0612d1f8713f69275a17cadcbff3 100644 --- a/pkgs/development/libraries/haskell/cgi/3001.1.7.4.nix +++ b/pkgs/development/libraries/haskell/cgi/3001.1.7.4.nix @@ -12,6 +12,6 @@ cabal.mkDerivation (self: { description = "A library for writing CGI programs"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/cgi/3001.1.7.5.nix b/pkgs/development/libraries/haskell/cgi/3001.1.7.5.nix index 2c9e4248e1ca1d91ee75754833c879113e97d8dd..c1c284ad70c812adc397b05ae8f8d91e97d7ea74 100644 --- a/pkgs/development/libraries/haskell/cgi/3001.1.7.5.nix +++ b/pkgs/development/libraries/haskell/cgi/3001.1.7.5.nix @@ -12,5 +12,6 @@ cabal.mkDerivation (self: { description = "A library for writing CGI programs"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/cgi/3001.1.8.5.nix b/pkgs/development/libraries/haskell/cgi/3001.1.8.5.nix index f01feb3edf690a172ad33745cb9359f01bc3f182..31d523717c5e345443988f4f2af12bed6dfdcd6e 100644 --- a/pkgs/development/libraries/haskell/cgi/3001.1.8.5.nix +++ b/pkgs/development/libraries/haskell/cgi/3001.1.8.5.nix @@ -12,6 +12,7 @@ cabal.mkDerivation (self: { description = "A library for writing CGI programs"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; + broken = true; }; }) diff --git a/pkgs/development/libraries/haskell/cgrep/default.nix b/pkgs/development/libraries/haskell/cgrep/default.nix index 5fae8ab3dfdd37b1d64508dc5df6c07e39549345..e19cac2b2ec3c6fa39e42e367f418825c4b211bb 100644 --- a/pkgs/development/libraries/haskell/cgrep/default.nix +++ b/pkgs/development/libraries/haskell/cgrep/default.nix @@ -1,18 +1,18 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, ansiTerminal, cmdargs, dlist, filepath, regexPosix, safe -, split, stm, stringsearch, unorderedContainers +{ cabal, ansiTerminal, cmdargs, dlist, either, filepath, mtl +, regexPosix, safe, split, stm, stringsearch, unorderedContainers }: cabal.mkDerivation (self: { pname = "cgrep"; - version = "6.4.3.1"; - sha256 = "0pqifapjgazz7wiydc775i4f6iixq8v87rzjgvvymdbdsn0sfa0r"; + version = "6.4.6"; + sha256 = "13plsh6411k273qllpkcrkakwxcdmw0p6arj0j3gdqa7bbxii99s"; isLibrary = false; isExecutable = true; buildDepends = [ - ansiTerminal cmdargs dlist filepath regexPosix safe split stm - stringsearch unorderedContainers + ansiTerminal cmdargs dlist either filepath mtl regexPosix safe + split stm stringsearch unorderedContainers ]; meta = { homepage = "http://awgn.github.io/cgrep/"; diff --git a/pkgs/development/libraries/haskell/citeproc-hs/default.nix b/pkgs/development/libraries/haskell/citeproc-hs/default.nix index ddda7015e47e3498cf9f6fb9e09569eaa31e5dad..bb95e920ef977587a9cb7dac84377355d5813dd7 100644 --- a/pkgs/development/libraries/haskell/citeproc-hs/default.nix +++ b/pkgs/development/libraries/haskell/citeproc-hs/default.nix @@ -18,6 +18,5 @@ cabal.mkDerivation (self: { description = "A Citation Style Language implementation in Haskell"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix b/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix index d6f67674db489a483e2e382f5a5cfaa492bd2b15..28e940f348963d7010976930b989a6906c56183c 100644 --- a/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix +++ b/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "classy-prelude-conduit"; - version = "0.9.2"; - sha256 = "07qdhha58yl1dq4mpbyrpjwzk2yhn8dbkg2qg2yaq1j780a6dwcv"; + version = "0.9.3"; + sha256 = "0wsl3mhczinxl6ij8dpv5001db740z4jq43l2gpzdylv6pmpldzr"; buildDepends = [ classyPrelude conduit conduitCombinators monadControl resourcet systemFileio transformers void diff --git a/pkgs/development/libraries/haskell/classy-prelude/default.nix b/pkgs/development/libraries/haskell/classy-prelude/default.nix index 273147fcc62f8ab549f9ee3edaae9df2bb484c9a..e45a6f256b9c7ce35b54a95fd8bd6c0e19f133aa 100644 --- a/pkgs/development/libraries/haskell/classy-prelude/default.nix +++ b/pkgs/development/libraries/haskell/classy-prelude/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "classy-prelude"; - version = "0.9.2"; - sha256 = "0n006ld2kifh2bmwgbzx282s7xxpcml9g433x132prcblw4axkgr"; + version = "0.9.3"; + sha256 = "06y6zx3mmqjnha5p7y7blzn77bij71kndw2bmi07wz4s4lj9xsiv"; buildDepends = [ basicPrelude chunkedData enclosedExceptions exceptions hashable liftedBase monoTraversable semigroups stm systemFilepath text time diff --git a/pkgs/development/libraries/haskell/clientsession/default.nix b/pkgs/development/libraries/haskell/clientsession/default.nix index 5066ad84d866f5a09d3bc11696b6909ad66fdc9b..30875e90062c725adcc33c235fd0eb04cad8605f 100644 --- a/pkgs/development/libraries/haskell/clientsession/default.nix +++ b/pkgs/development/libraries/haskell/clientsession/default.nix @@ -19,6 +19,5 @@ cabal.mkDerivation (self: { description = "Securely store session data in a client-side cookie"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/cmdargs/default.nix b/pkgs/development/libraries/haskell/cmdargs/default.nix index d58885f8226d879462a2c6a56c1ff3ececfc7248..829f7be4fba092390f779965c556a4110110c2a1 100644 --- a/pkgs/development/libraries/haskell/cmdargs/default.nix +++ b/pkgs/development/libraries/haskell/cmdargs/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "cmdargs"; - version = "0.10.7"; - sha256 = "0mhsj27vynilpmwxgdpb3r383rksrqs9ix15zl2xbhc95a815pfl"; + version = "0.10.9"; + sha256 = "12phn22iri2v65gbxzl580mikkj05rwx4sjn5c31f871wp0538my"; isLibrary = true; isExecutable = true; buildDepends = [ filepath transformers ]; @@ -14,6 +14,5 @@ cabal.mkDerivation (self: { description = "Command line argument processing"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/cmdlib/default.nix b/pkgs/development/libraries/haskell/cmdlib/default.nix index 9263f3da099cfb66657b002a0f4fdf660c8f66b9..2cfe86e2eabfb16742b302eeca30e5c807766eac 100644 --- a/pkgs/development/libraries/haskell/cmdlib/default.nix +++ b/pkgs/development/libraries/haskell/cmdlib/default.nix @@ -13,6 +13,5 @@ cabal.mkDerivation (self: { description = "a library for command line parsing & online help"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/cmdtheline/default.nix b/pkgs/development/libraries/haskell/cmdtheline/default.nix index 6e38361b822624f78bd7fe4e37437fa3f18f43fe..8943eacdd217c13fb4f46e5af02a5dc38f4d7670 100644 --- a/pkgs/development/libraries/haskell/cmdtheline/default.nix +++ b/pkgs/development/libraries/haskell/cmdtheline/default.nix @@ -17,5 +17,7 @@ cabal.mkDerivation (self: { description = "Declarative command-line option parsing and documentation library"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; + hydraPlatforms = self.stdenv.lib.platforms.none; + broken = true; }; }) diff --git a/pkgs/development/libraries/haskell/codec-image-devil/default.nix b/pkgs/development/libraries/haskell/codec-image-devil/default.nix index f1f3bd0a04bfc00c90c3102b281d7b71af5b071b..567e68b562de89a1c46d0f4e0f57ca95fea56531 100644 --- a/pkgs/development/libraries/haskell/codec-image-devil/default.nix +++ b/pkgs/development/libraries/haskell/codec-image-devil/default.nix @@ -11,5 +11,7 @@ cabal.mkDerivation (self: { description = "An FFI interface to the DevIL library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + hydraPlatforms = self.stdenv.lib.platforms.none; + broken = true; }; }) diff --git a/pkgs/development/libraries/haskell/colorize-haskell/default.nix b/pkgs/development/libraries/haskell/colorize-haskell/default.nix index dd46e7ef09f31cdec3a2fdfa3e0a0e77277b59a4..ad207329f2da5174d85bc4fc7c102bd6ee7dcb23 100644 --- a/pkgs/development/libraries/haskell/colorize-haskell/default.nix +++ b/pkgs/development/libraries/haskell/colorize-haskell/default.nix @@ -14,6 +14,5 @@ cabal.mkDerivation (self: { description = "Highligt Haskell source"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/colour/default.nix b/pkgs/development/libraries/haskell/colour/default.nix index c967bb65600af8283e045335bd65b82c74d9d82b..748e62b1d94a5a74c05266163a12db7e068a0d94 100644 --- a/pkgs/development/libraries/haskell/colour/default.nix +++ b/pkgs/development/libraries/haskell/colour/default.nix @@ -11,6 +11,5 @@ cabal.mkDerivation (self: { description = "A model for human colour/color perception"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/comonad-transformers/default.nix b/pkgs/development/libraries/haskell/comonad-transformers/default.nix index b27dc1ee6d79b2447b5855d77f083f0d4b4d89a3..f44f299522d9c6bb8b736d6c8aedb26382b2e5d2 100644 --- a/pkgs/development/libraries/haskell/comonad-transformers/default.nix +++ b/pkgs/development/libraries/haskell/comonad-transformers/default.nix @@ -13,6 +13,6 @@ cabal.mkDerivation (self: { description = "This package has been merged into comonad 4.0"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + maintainers = with self.stdenv.lib.maintainers; [ ocharles ]; }; }) diff --git a/pkgs/development/libraries/haskell/comonad/default.nix b/pkgs/development/libraries/haskell/comonad/default.nix index da9908175443292471e14a1eaccf5cf07e5b959c..36a0db0b9ccdb7ecdf5a8ff65e24923e1971f3bb 100644 --- a/pkgs/development/libraries/haskell/comonad/default.nix +++ b/pkgs/development/libraries/haskell/comonad/default.nix @@ -1,15 +1,16 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! { cabal, contravariant, distributive, doctest, filepath, semigroups -, tagged, transformers +, tagged, transformers, transformersCompat }: cabal.mkDerivation (self: { pname = "comonad"; - version = "4.2"; - sha256 = "161dgmjfff85sj6yijzgzyb4dvnn1zsm3q5q96qwypynj0am5sr7"; + version = "4.2.2"; + sha256 = "022fcy0ijwsdnjb1b1jrwy2ypzzbzvfgj9ns0c74hrsj08gjh8j8"; buildDepends = [ contravariant distributive semigroups tagged transformers + transformersCompat ]; testDepends = [ doctest filepath ]; meta = { diff --git a/pkgs/development/libraries/haskell/compact-string-fix/default.nix b/pkgs/development/libraries/haskell/compact-string-fix/default.nix index 421bc79893d76eff9b748cbc59cb4d6982f50036..a0a6959b4b1b365c1203ceddddc90da23d15d05b 100644 --- a/pkgs/development/libraries/haskell/compact-string-fix/default.nix +++ b/pkgs/development/libraries/haskell/compact-string-fix/default.nix @@ -11,6 +11,5 @@ cabal.mkDerivation (self: { description = "Same as compact-string except with a small fix so it builds on ghc-6.12"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/compdata/default.nix b/pkgs/development/libraries/haskell/compdata/default.nix index 6b569858c536b13d2f203555fd2c52d8175c1982..2e26d9ac781aa44cf296614c28fa826c19a2faf7 100644 --- a/pkgs/development/libraries/haskell/compdata/default.nix +++ b/pkgs/development/libraries/haskell/compdata/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "compdata"; - version = "0.8.1.2"; - sha256 = "1jhfhinkn6klh68rzl5skh1rianjycc6cfkrglsi17j60a723v9x"; + version = "0.8.1.3"; + sha256 = "0rnvw5bdypl6i2k1wnc727a17hapl4hs7n208h16ngk075841gpb"; buildDepends = [ deepseq derive mtl QuickCheck thExpandSyns transformers treeView ]; diff --git a/pkgs/development/libraries/haskell/concurrent-extra/default.nix b/pkgs/development/libraries/haskell/concurrent-extra/default.nix index 34bcfdea1a4882d4d49ed870fefe054033d73903..43230662fe0744147b07a5da4511fdff961fae85 100644 --- a/pkgs/development/libraries/haskell/concurrent-extra/default.nix +++ b/pkgs/development/libraries/haskell/concurrent-extra/default.nix @@ -18,5 +18,7 @@ cabal.mkDerivation (self: { description = "Extra concurrency primitives"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + hydraPlatforms = self.stdenv.lib.platforms.none; + broken = true; }; }) diff --git a/pkgs/development/libraries/haskell/conduit-combinators/default.nix b/pkgs/development/libraries/haskell/conduit-combinators/default.nix index c1396751f1086a4aef6beece077f2de53a286702..17598dda06bdb76ee8c03fb4f4aa3ceec670b8a1 100644 --- a/pkgs/development/libraries/haskell/conduit-combinators/default.nix +++ b/pkgs/development/libraries/haskell/conduit-combinators/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "conduit-combinators"; - version = "0.2.6.1"; - sha256 = "01q585fwfl7qw5yr7ry1zfwm0lbmizyidifk9jzxdfxppbccfxfc"; + version = "0.2.8.2"; + sha256 = "1x2g333ygiv4jvwx4lw579kwx1z5m80cqfqgzv0pi5xdxcagy1ha"; buildDepends = [ base16Bytestring base64Bytestring chunkedData conduit conduitExtra monadControl monoTraversable mwcRandom primitive resourcet diff --git a/pkgs/development/libraries/haskell/conduit-extra/default.nix b/pkgs/development/libraries/haskell/conduit-extra/default.nix index 5dc139d058f9515405f123988b4e312c85a064ba..87fc9f18e761bdffc6a15fb44ebda57f2781b110 100644 --- a/pkgs/development/libraries/haskell/conduit-extra/default.nix +++ b/pkgs/development/libraries/haskell/conduit-extra/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "conduit-extra"; - version = "1.1.2"; - sha256 = "1hglg491vgy6hjggi7067rjly3dlnr3byf6xlc20narzr25sxfxi"; + version = "1.1.3"; + sha256 = "1gzvplaxplqia23g6l8z42w0z10y33yz594lxdk82g4i7swaagix"; buildDepends = [ attoparsec blazeBuilder conduit filepath monadControl network primitive resourcet stm streamingCommons text transformers diff --git a/pkgs/development/libraries/haskell/conduit/default.nix b/pkgs/development/libraries/haskell/conduit/default.nix index 7d2375f4b3602a3fdb98c166d56bfa3441594ed2..f3c27ebae955ac9d9932b3f789b1f73d1553d9ce 100644 --- a/pkgs/development/libraries/haskell/conduit/default.nix +++ b/pkgs/development/libraries/haskell/conduit/default.nix @@ -21,6 +21,5 @@ cabal.mkDerivation (self: { description = "Streaming data processing library"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/constraints/default.nix b/pkgs/development/libraries/haskell/constraints/default.nix index 4ca94f8d2f2e1a2ad6b85b4c12ad41a7f66532ef..6681f3a85bb9c455e977408b32247d7b039625c9 100644 --- a/pkgs/development/libraries/haskell/constraints/default.nix +++ b/pkgs/development/libraries/haskell/constraints/default.nix @@ -12,6 +12,5 @@ cabal.mkDerivation (self: { description = "Constraint manipulation"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/continued-fractions/default.nix b/pkgs/development/libraries/haskell/continued-fractions/default.nix index 45c92acc0687abee759afcc3cf9a915dbfe8cc47..2ec057f6a96a9df0cb91179bf26558d07d9625b7 100644 --- a/pkgs/development/libraries/haskell/continued-fractions/default.nix +++ b/pkgs/development/libraries/haskell/continued-fractions/default.nix @@ -11,6 +11,5 @@ cabal.mkDerivation (self: { description = "Continued fractions"; license = self.stdenv.lib.licenses.publicDomain; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/contravariant/default.nix b/pkgs/development/libraries/haskell/contravariant/default.nix index b3c549ecef868a98b6077b42be0cfeb5e0dd0d7a..91a586e56b22f25674174f76f26475ed275c7911 100644 --- a/pkgs/development/libraries/haskell/contravariant/default.nix +++ b/pkgs/development/libraries/haskell/contravariant/default.nix @@ -1,12 +1,14 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, tagged, transformers, transformersCompat }: +{ cabal, semigroups, tagged, transformers, transformersCompat }: cabal.mkDerivation (self: { pname = "contravariant"; - version = "0.6"; - sha256 = "031kwn2hpw25p2q0bhfgby0ihxjbcyv6w0v0nsj2zygif9jkfrrh"; - buildDepends = [ tagged transformers transformersCompat ]; + version = "1.1"; + sha256 = "0j2q6gl9f8jgknjqr2qzzxkb4fl7m9n5zjavnzan2arlv4viznhh"; + buildDepends = [ + semigroups tagged transformers transformersCompat + ]; meta = { homepage = "http://github.com/ekmett/contravariant/"; description = "Contravariant functors"; diff --git a/pkgs/development/libraries/haskell/converge/default.nix b/pkgs/development/libraries/haskell/converge/default.nix index 83302876e4418a028f3c52d5ebfa22822bdf9ac9..63f7fa81c9df95df8bdf5a812e373c6850029841 100644 --- a/pkgs/development/libraries/haskell/converge/default.nix +++ b/pkgs/development/libraries/haskell/converge/default.nix @@ -11,6 +11,5 @@ cabal.mkDerivation (self: { description = "Limit operations for converging sequences"; license = self.stdenv.lib.licenses.publicDomain; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/convertible/1.0.11.1.nix b/pkgs/development/libraries/haskell/convertible/1.0.11.1.nix index cf65b0f936c5ba281bc5ed41499c4f53ad04f1ea..57423c1b71f07bab173280c93255e7cac6bbdaf5 100644 --- a/pkgs/development/libraries/haskell/convertible/1.0.11.1.nix +++ b/pkgs/development/libraries/haskell/convertible/1.0.11.1.nix @@ -14,6 +14,6 @@ cabal.mkDerivation (self: { description = "Typeclasses and instances for converting between types"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/convertible/1.1.0.0.nix b/pkgs/development/libraries/haskell/convertible/1.1.0.0.nix index ea8091426ee502e9540337389a2bc96c1278493e..fd8f6dac3a833618e05c2feb54ce1dfdcc523b2f 100644 --- a/pkgs/development/libraries/haskell/convertible/1.1.0.0.nix +++ b/pkgs/development/libraries/haskell/convertible/1.1.0.0.nix @@ -14,6 +14,5 @@ cabal.mkDerivation (self: { description = "Typeclasses and instances for converting between types"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/cookie/default.nix b/pkgs/development/libraries/haskell/cookie/default.nix index 6a35f3d5523804c885552f0ae519f5602b371712..108fb48f939b6f80d1a0d4baba1004914fbb84ba 100644 --- a/pkgs/development/libraries/haskell/cookie/default.nix +++ b/pkgs/development/libraries/haskell/cookie/default.nix @@ -1,17 +1,24 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, blazeBuilder, dataDefault, deepseq, text, time }: +{ cabal, blazeBuilder, dataDefault, deepseq, HUnit, QuickCheck +, testFramework, testFrameworkHunit, testFrameworkQuickcheck2, text +, time +}: cabal.mkDerivation (self: { pname = "cookie"; - version = "0.4.1.1"; - sha256 = "1w1nh7h4kc9pr9kpi8fkrqiih37mp3gcnxf42r01nciq4sh4yi3m"; + version = "0.4.1.3"; + sha256 = "184ymp1pbi49fm4jl9s04dfyrgdbc9vlmqahqha4yncppr5s1sdw"; buildDepends = [ blazeBuilder dataDefault deepseq text time ]; + testDepends = [ + blazeBuilder HUnit QuickCheck testFramework testFrameworkHunit + testFrameworkQuickcheck2 text time + ]; + doCheck = self.stdenv.lib.versionOlder "7.8" self.ghc.version; meta = { homepage = "http://github.com/snoyberg/cookie"; description = "HTTP cookie parsing and rendering"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/coroutine-object/default.nix b/pkgs/development/libraries/haskell/coroutine-object/default.nix index 63448e3a633e9d2104e12e2b93fb102bad8ca540..e3ba619c6aa38bcae4da6cd930b1279616c2f3ef 100644 --- a/pkgs/development/libraries/haskell/coroutine-object/default.nix +++ b/pkgs/development/libraries/haskell/coroutine-object/default.nix @@ -15,6 +15,6 @@ cabal.mkDerivation (self: { description = "Object-oriented programming realization using coroutine"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.ianwookim ]; + maintainers = with self.stdenv.lib.maintainers; [ ianwookim ]; }; }) diff --git a/pkgs/development/libraries/haskell/cprng-aes/default.nix b/pkgs/development/libraries/haskell/cprng-aes/default.nix index de3b33a07096075ca9ca6edf1233480a9d9cc434..64d15480ab87461ca5fd55ab5b465935516f9c2a 100644 --- a/pkgs/development/libraries/haskell/cprng-aes/default.nix +++ b/pkgs/development/libraries/haskell/cprng-aes/default.nix @@ -12,6 +12,5 @@ cabal.mkDerivation (self: { description = "Crypto Pseudo Random Number Generator using AES in counter mode"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/cpu/default.nix b/pkgs/development/libraries/haskell/cpu/default.nix index 5a8d702176573cb976d5adc85293ec665616add9..d10ecaa005933a97e719aa56e4cefbe3de55d287 100644 --- a/pkgs/development/libraries/haskell/cpu/default.nix +++ b/pkgs/development/libraries/haskell/cpu/default.nix @@ -13,6 +13,5 @@ cabal.mkDerivation (self: { description = "Cpu information and properties helpers"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/criterion/default.nix b/pkgs/development/libraries/haskell/criterion/default.nix index 35d6d74c73c8673135c6e131e3c990d9e32ea620..7cac43769f814dbbc0d7305d0fbc4105b55e00ed 100644 --- a/pkgs/development/libraries/haskell/criterion/default.nix +++ b/pkgs/development/libraries/haskell/criterion/default.nix @@ -1,23 +1,32 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, aeson, binary, deepseq, filepath, Glob, hastache, mtl -, mwcRandom, parsec, statistics, text, time, transformers, vector -, vectorAlgorithms +{ cabal, aeson, ansiWlPprint, binary, cassava, deepseq, either +, filepath, Glob, hastache, HUnit, mtl, mwcRandom +, optparseApplicative, parsec, QuickCheck, statistics +, testFramework, testFrameworkHunit, testFrameworkQuickcheck2, text +, time, transformers, vector, vectorAlgorithms }: cabal.mkDerivation (self: { pname = "criterion"; - version = "0.8.1.0"; - sha256 = "0yzrnma2whd4dnjiy4w24syxgnz1b5bflsi20hrbgd5rmx85k2zd"; + version = "1.0.0.2"; + sha256 = "1r30vcrplilj3silnrmn0r5m0df27icdsgd5hx35li9yrs862n95"; + isLibrary = true; + isExecutable = true; buildDepends = [ - aeson binary deepseq filepath Glob hastache mtl mwcRandom parsec - statistics text time transformers vector vectorAlgorithms + aeson ansiWlPprint binary cassava deepseq either filepath Glob + hastache mtl mwcRandom optparseApplicative parsec statistics text + time transformers vector vectorAlgorithms ]; + testDepends = [ + HUnit QuickCheck statistics testFramework testFrameworkHunit + testFrameworkQuickcheck2 vector + ]; + doCheck = false; meta = { - homepage = "https://github.com/bos/criterion"; + homepage = "http://www.serpentine.com/criterion"; description = "Robust, reliable performance measurement and analysis"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/crypto-api/default.nix b/pkgs/development/libraries/haskell/crypto-api/default.nix index 10bcb3d16b0a522de0c11633357b6995dd7d3ce2..7c1d6308131d3f7c0e20643fdf51e58381159e3e 100644 --- a/pkgs/development/libraries/haskell/crypto-api/default.nix +++ b/pkgs/development/libraries/haskell/crypto-api/default.nix @@ -12,6 +12,5 @@ cabal.mkDerivation (self: { description = "A generic interface for cryptographic operations"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/crypto-conduit/default.nix b/pkgs/development/libraries/haskell/crypto-conduit/default.nix index 63f6f119e5d9c67fac307eb015ff8d5982c7d5cb..b63f6a44108cad152d9261359adf5b06e4845f00 100644 --- a/pkgs/development/libraries/haskell/crypto-conduit/default.nix +++ b/pkgs/development/libraries/haskell/crypto-conduit/default.nix @@ -22,6 +22,5 @@ cabal.mkDerivation (self: { description = "Conduit interface for cryptographic operations (from crypto-api)"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix b/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix index e8eeed95aecf85c3b3ed1b72985ec33b9608a375..f8a51f4fa5b86e66f84ee33597f365a35d32c9ff 100644 --- a/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix +++ b/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix @@ -12,6 +12,5 @@ cabal.mkDerivation (self: { description = "Generic cryptography Public keys algorithm types"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/cryptocipher/default.nix b/pkgs/development/libraries/haskell/cryptocipher/default.nix index 29d2dd1b31d5d936e7542f797ac62347491fc757..6f9c05f544b0ef3b4d2ae1cc8f1c2f937961b42a 100644 --- a/pkgs/development/libraries/haskell/cryptocipher/default.nix +++ b/pkgs/development/libraries/haskell/cryptocipher/default.nix @@ -17,6 +17,5 @@ cabal.mkDerivation (self: { description = "Symmetrical block and stream ciphers"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/cryptohash/default.nix b/pkgs/development/libraries/haskell/cryptohash/default.nix index a1d6b32411c7151547282920b661ce4f4ae8bd13..5d143dfc9e823042cad115a098cfab188a24c5fb 100644 --- a/pkgs/development/libraries/haskell/cryptohash/default.nix +++ b/pkgs/development/libraries/haskell/cryptohash/default.nix @@ -17,6 +17,5 @@ cabal.mkDerivation (self: { description = "collection of crypto hashes, fast, pure and practical"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/css-text/default.nix b/pkgs/development/libraries/haskell/css-text/default.nix index ea5e823f14e175df7310e062fff070fbf2cc2681..dcc2146313dbdfc84e220065058100d59fc69705 100644 --- a/pkgs/development/libraries/haskell/css-text/default.nix +++ b/pkgs/development/libraries/haskell/css-text/default.nix @@ -13,6 +13,5 @@ cabal.mkDerivation (self: { description = "CSS parser and renderer"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/csv/default.nix b/pkgs/development/libraries/haskell/csv/default.nix index 70c469cdb1b4e0f79275c62c9238d3183bf7e4f6..e3908008aa7a4b8d4c13a905615606e4834b3074 100644 --- a/pkgs/development/libraries/haskell/csv/default.nix +++ b/pkgs/development/libraries/haskell/csv/default.nix @@ -11,6 +11,5 @@ cabal.mkDerivation (self: { description = "CSV loader and dumper"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/cuda/default.nix b/pkgs/development/libraries/haskell/cuda/default.nix index 3abc6443c6e38098b24ca2679d2779c0db48c2d5..c6daa8b5fdd5bd91d5c28e6ae9a7670f5fe7f8a6 100644 --- a/pkgs/development/libraries/haskell/cuda/default.nix +++ b/pkgs/development/libraries/haskell/cuda/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "cuda"; - version = "0.6.0.0"; - sha256 = "0zvyvk5yhwz7nl613yvfl32xnv9kgfdwbb0whyd6nrm663xa352y"; + version = "0.6.0.1"; + sha256 = "03wnkqgdvy6h2dqcmj0xlag3am3s3rjzhx0kqaq362mq365n9y51"; buildTools = [ c2hs ]; extraLibraries = [ cudatoolkit nvidia_x11 self.stdenv.gcc ]; doCheck = false; @@ -38,6 +38,5 @@ cabal.mkDerivation (self: { 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/curl/default.nix b/pkgs/development/libraries/haskell/curl/default.nix index 39a72e3fe978802a6168d72ba919e7e369ff88c7..82bdd707ea77acfd27cb6b34931c773559cb6975 100644 --- a/pkgs/development/libraries/haskell/curl/default.nix +++ b/pkgs/development/libraries/haskell/curl/default.nix @@ -11,6 +11,5 @@ cabal.mkDerivation (self: { description = "Haskell binding to libcurl"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/data-accessor/data-accessor-template.nix b/pkgs/development/libraries/haskell/data-accessor/data-accessor-template.nix index 9a6fd160ca82c2437a499cf7d724e7bc6c901ec5..5b3a54d7220b9e55a2ba88970ed7ad734a80bc51 100644 --- a/pkgs/development/libraries/haskell/data-accessor/data-accessor-template.nix +++ b/pkgs/development/libraries/haskell/data-accessor/data-accessor-template.nix @@ -12,6 +12,5 @@ cabal.mkDerivation (self: { description = "Utilities for accessing and manipulating fields of records"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/data-accessor/data-accessor.nix b/pkgs/development/libraries/haskell/data-accessor/data-accessor.nix index 4ea654e1eb534b9e47b668433645b02a43fef153..f80a8fc0fe8b1b6b41844ffde57be5430ee72b73 100644 --- a/pkgs/development/libraries/haskell/data-accessor/data-accessor.nix +++ b/pkgs/development/libraries/haskell/data-accessor/data-accessor.nix @@ -13,6 +13,5 @@ cabal.mkDerivation (self: { description = "Utilities for accessing and manipulating fields of records"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/data-binary-ieee754/default.nix b/pkgs/development/libraries/haskell/data-binary-ieee754/default.nix index 730bf84abb1d4877d0731cc98463d3f41bb9fd3f..8e11a9ef85d91868e0e7cd9b9f1ae2b5e621b091 100644 --- a/pkgs/development/libraries/haskell/data-binary-ieee754/default.nix +++ b/pkgs/development/libraries/haskell/data-binary-ieee754/default.nix @@ -12,6 +12,5 @@ cabal.mkDerivation (self: { description = "Parser/Serialiser for IEEE-754 floating-point values"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/data-default/default.nix b/pkgs/development/libraries/haskell/data-default/default.nix index 77d7d336fe5c8501bd9295286b65ce7f9305747f..549cb24a689adc1e5b49828306730824b4a099fe 100644 --- a/pkgs/development/libraries/haskell/data-default/default.nix +++ b/pkgs/development/libraries/haskell/data-default/default.nix @@ -18,6 +18,5 @@ cabal.mkDerivation (self: { description = "A class for types with a default value"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/data-fin/default.nix b/pkgs/development/libraries/haskell/data-fin/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..3c0d77e1a7a8030ccbb1ce47789b8ca2f8e370fb --- /dev/null +++ b/pkgs/development/libraries/haskell/data-fin/default.nix @@ -0,0 +1,22 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, lazysmallcheck, preludeSafeenum, QuickCheck, reflection +, smallcheck, tagged +}: + +cabal.mkDerivation (self: { + pname = "data-fin"; + version = "0.1.1.2"; + sha256 = "13qgqx3b01a8bm7jw7fkv7nyyzg2jkgg27zv2wp57g0nd5aw5hpn"; + buildDepends = [ + lazysmallcheck preludeSafeenum QuickCheck reflection smallcheck + tagged + ]; + jailbreak = true; + meta = { + homepage = "http://code.haskell.org/~wren/"; + description = "Finite totally ordered sets"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/data-inttrie/default.nix b/pkgs/development/libraries/haskell/data-inttrie/default.nix index 09cd0cb75d848377cf5c0039dc157732cfb72101..c9e3ddb3dde451f2a1c63599e40770f3bea4db57 100644 --- a/pkgs/development/libraries/haskell/data-inttrie/default.nix +++ b/pkgs/development/libraries/haskell/data-inttrie/default.nix @@ -11,6 +11,5 @@ cabal.mkDerivation (self: { description = "A lazy, infinite trie of integers"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/data-lens-template/default.nix b/pkgs/development/libraries/haskell/data-lens-template/default.nix index d167e8051cd416d14354a500550bdf4285c9c6da..923e11bf2e20f20fb5969045b19783afd6866257 100644 --- a/pkgs/development/libraries/haskell/data-lens-template/default.nix +++ b/pkgs/development/libraries/haskell/data-lens-template/default.nix @@ -12,5 +12,6 @@ cabal.mkDerivation (self: { description = "Utilities for Data.Lens"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/data-lens/default.nix b/pkgs/development/libraries/haskell/data-lens/default.nix index a880db50a1618ef0f1fdbd397e03d2df5b708f47..5fba0b4bde34ba304d8452bc5442ee6b715dd0f0 100644 --- a/pkgs/development/libraries/haskell/data-lens/default.nix +++ b/pkgs/development/libraries/haskell/data-lens/default.nix @@ -12,5 +12,7 @@ cabal.mkDerivation (self: { description = "Used to be Haskell 98 Lenses"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + hydraPlatforms = self.stdenv.lib.platforms.none; + broken = true; }; }) diff --git a/pkgs/development/libraries/haskell/data-memocombinators/default.nix b/pkgs/development/libraries/haskell/data-memocombinators/default.nix index a53e093a85cdfa647faf0f44709a9a7efd5c8a29..2588a396dc0b05f3e52e145cf3a9593c13e97b64 100644 --- a/pkgs/development/libraries/haskell/data-memocombinators/default.nix +++ b/pkgs/development/libraries/haskell/data-memocombinators/default.nix @@ -12,6 +12,5 @@ cabal.mkDerivation (self: { description = "Combinators for building memo tables"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/data-reify/default.nix b/pkgs/development/libraries/haskell/data-reify/default.nix index 666b92dbdb5261cc37f1444b8f6e14dbf390bc8f..00c2dc1b48ce04fca2ebde31af740cd2233cc17a 100644 --- a/pkgs/development/libraries/haskell/data-reify/default.nix +++ b/pkgs/development/libraries/haskell/data-reify/default.nix @@ -13,6 +13,5 @@ cabal.mkDerivation (self: { description = "Reify a recursive data structure into an explicit graph"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/dataenc/default.nix b/pkgs/development/libraries/haskell/dataenc/default.nix index 190baa101637f99a0aac71b19257771e4e9cba10..dcb0e97bdb25e7b0ae4d91d19069692ea89b97c0 100644 --- a/pkgs/development/libraries/haskell/dataenc/default.nix +++ b/pkgs/development/libraries/haskell/dataenc/default.nix @@ -14,6 +14,5 @@ cabal.mkDerivation (self: { description = "Data encoding library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/datetime/default.nix b/pkgs/development/libraries/haskell/datetime/default.nix index d2ed2532d2354defb29d9a5ab5825f3aa2f81e68..d337f4ee2272d3f209832e97792fa7dee1491249 100644 --- a/pkgs/development/libraries/haskell/datetime/default.nix +++ b/pkgs/development/libraries/haskell/datetime/default.nix @@ -12,6 +12,5 @@ cabal.mkDerivation (self: { description = "Utilities to make Data.Time.* easier to use."; license = "GPL"; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/dbmigrations/default.nix b/pkgs/development/libraries/haskell/dbmigrations/default.nix index e142d7b31728c9560b6282c09e0549c15b9a2d3b..7a97a76c6b2e75d886e91d1d4c89e33dc254cca8 100644 --- a/pkgs/development/libraries/haskell/dbmigrations/default.nix +++ b/pkgs/development/libraries/haskell/dbmigrations/default.nix @@ -19,6 +19,6 @@ cabal.mkDerivation (self: { description = "An implementation of relational database \"migrations\""; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + maintainers = with self.stdenv.lib.maintainers; [ ocharles ]; }; }) diff --git a/pkgs/development/libraries/haskell/deepseq-th/default.nix b/pkgs/development/libraries/haskell/deepseq-th/default.nix index efa3057291d6049acb9bfafde135bfc29abadfb9..1d34e12a844aa01f640459d2fa1083361495a605 100644 --- a/pkgs/development/libraries/haskell/deepseq-th/default.nix +++ b/pkgs/development/libraries/haskell/deepseq-th/default.nix @@ -14,6 +14,5 @@ cabal.mkDerivation (self: { description = "Template Haskell based deriver for optimised NFData instances"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/deepseq/1.1.0.0.nix b/pkgs/development/libraries/haskell/deepseq/1.1.0.0.nix index bc49aafd5cfaba973bfbea395170e143ae3b75d9..4d7a0b9b818a4bb59ed6d02bd6cf3fc472d8612c 100644 --- a/pkgs/development/libraries/haskell/deepseq/1.1.0.0.nix +++ b/pkgs/development/libraries/haskell/deepseq/1.1.0.0.nix @@ -10,6 +10,6 @@ cabal.mkDerivation (self: { description = "Fully evaluate data structures"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/deepseq/1.1.0.2.nix b/pkgs/development/libraries/haskell/deepseq/1.1.0.2.nix index e30a2e35cde65e327dd8475fc4d54eb7312195a1..7748ff96a8af07dd9021467844c29740e558891a 100644 --- a/pkgs/development/libraries/haskell/deepseq/1.1.0.2.nix +++ b/pkgs/development/libraries/haskell/deepseq/1.1.0.2.nix @@ -10,6 +10,6 @@ cabal.mkDerivation (self: { description = "Deep evaluation of data structures"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/deepseq/1.2.0.1.nix b/pkgs/development/libraries/haskell/deepseq/1.2.0.1.nix index 7a2d61de06919d2ec0c4dbe7f8743148e557ced4..340d7fb3bf22aec54052c32a517e20c484a2de29 100644 --- a/pkgs/development/libraries/haskell/deepseq/1.2.0.1.nix +++ b/pkgs/development/libraries/haskell/deepseq/1.2.0.1.nix @@ -10,6 +10,6 @@ cabal.mkDerivation (self: { description = "Deep evaluation of data structures"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/deepseq/1.3.0.2.nix b/pkgs/development/libraries/haskell/deepseq/1.3.0.2.nix index 1dd3e7f09ba9ca16129c1014ba5c98803adeaf03..99ce96c88466a927aebd629f3fb5280affb72d8d 100644 --- a/pkgs/development/libraries/haskell/deepseq/1.3.0.2.nix +++ b/pkgs/development/libraries/haskell/deepseq/1.3.0.2.nix @@ -10,6 +10,5 @@ cabal.mkDerivation (self: { description = "Deep evaluation of data structures"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/derive/default.nix b/pkgs/development/libraries/haskell/derive/default.nix index eb1b1ce316234bb06e4a801812a198507befcf73..dbad9c538a92936b16a7351f6084ecf6ef079691 100644 --- a/pkgs/development/libraries/haskell/derive/default.nix +++ b/pkgs/development/libraries/haskell/derive/default.nix @@ -16,6 +16,5 @@ cabal.mkDerivation (self: { description = "A program and library to derive instances for data types"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/derp/default.nix b/pkgs/development/libraries/haskell/derp/default.nix index 668ea96abbb36799d47ef68f15fae9addb6375e1..c14b43a4bc3a305cd29f4a8289462202af3ecd30 100644 --- a/pkgs/development/libraries/haskell/derp/default.nix +++ b/pkgs/development/libraries/haskell/derp/default.nix @@ -10,6 +10,5 @@ cabal.mkDerivation (self: { description = "Derivative Parsing"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/diagrams/cairo.nix b/pkgs/development/libraries/haskell/diagrams/cairo.nix index da842c656e19868ce8425f349b809e6de6cb4220..c0f678311b9a3f35209359d92702a4def5b64739 100644 --- a/pkgs/development/libraries/haskell/diagrams/cairo.nix +++ b/pkgs/development/libraries/haskell/diagrams/cairo.nix @@ -14,6 +14,7 @@ cabal.mkDerivation (self: { hashable JuicyPixels lens mtl optparseApplicative pango split statestack time transformers vector ]; + jailbreak = true; meta = { homepage = "http://projects.haskell.org/diagrams"; description = "Cairo backend for diagrams drawing EDSL"; diff --git a/pkgs/development/libraries/haskell/diagrams/postscript.nix b/pkgs/development/libraries/haskell/diagrams/postscript.nix index 1ded949e7cee0568afbfc84372ea6cb42da6e98f..6ecd2dd4a410509cd2dd4c0fb2041a1d75e800fe 100644 --- a/pkgs/development/libraries/haskell/diagrams/postscript.nix +++ b/pkgs/development/libraries/haskell/diagrams/postscript.nix @@ -18,5 +18,7 @@ cabal.mkDerivation (self: { description = "Postscript backend for diagrams drawing EDSL"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + hydraPlatforms = self.stdenv.lib.platforms.none; + broken = true; }; }) diff --git a/pkgs/development/libraries/haskell/diff3/default.nix b/pkgs/development/libraries/haskell/diff3/default.nix index f010f1a194a027f0cf10345600d275a31fc81920..d13b7af776b118fdbafc941271c833f146203239 100644 --- a/pkgs/development/libraries/haskell/diff3/default.nix +++ b/pkgs/development/libraries/haskell/diff3/default.nix @@ -16,6 +16,6 @@ cabal.mkDerivation (self: { description = "Perform a 3-way difference of documents"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + maintainers = with self.stdenv.lib.maintainers; [ ocharles ]; }; }) diff --git a/pkgs/development/libraries/haskell/digest/default.nix b/pkgs/development/libraries/haskell/digest/default.nix index 523c2e91c5b504bf5d623e3409702445c609fbef..6b1f2077ca693bc1fbedeafd0e279a8e8127b98e 100644 --- a/pkgs/development/libraries/haskell/digest/default.nix +++ b/pkgs/development/libraries/haskell/digest/default.nix @@ -11,6 +11,5 @@ cabal.mkDerivation (self: { description = "Various cryptographic hashes for bytestrings; CRC32 and Adler32 for now"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/digestive-functors-aeson/default.nix b/pkgs/development/libraries/haskell/digestive-functors-aeson/default.nix index 2613899d5973dc45d4c9c69d821ff13562bac1a2..924f8bb351d43381c61b7ae4575230109dcf03c9 100644 --- a/pkgs/development/libraries/haskell/digestive-functors-aeson/default.nix +++ b/pkgs/development/libraries/haskell/digestive-functors-aeson/default.nix @@ -12,11 +12,12 @@ cabal.mkDerivation (self: { testDepends = [ aeson digestiveFunctors HUnit mtl scientific tasty tastyHunit text ]; + jailbreak = true; meta = { homepage = "http://github.com/ocharles/digestive-functors-aeson"; description = "Run digestive-functors forms against JSON"; license = self.stdenv.lib.licenses.gpl3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + maintainers = with self.stdenv.lib.maintainers; [ ocharles ]; }; }) diff --git a/pkgs/development/libraries/haskell/digits/default.nix b/pkgs/development/libraries/haskell/digits/default.nix index 988c0016f514ce36b2cb119db1191954879ab756..16f4e665f933f34e69688c8993178877558fa167 100644 --- a/pkgs/development/libraries/haskell/digits/default.nix +++ b/pkgs/development/libraries/haskell/digits/default.nix @@ -11,6 +11,6 @@ cabal.mkDerivation (self: { description = "Converts integers to lists of digits and back"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + maintainers = with self.stdenv.lib.maintainers; [ ocharles ]; }; }) diff --git a/pkgs/development/libraries/haskell/dimensional/default.nix b/pkgs/development/libraries/haskell/dimensional/default.nix index 1450b7706ca0b95c37bb6a113f3dc9b7751acc40..3435bf57d5c56179adae1806970a86837541c45c 100644 --- a/pkgs/development/libraries/haskell/dimensional/default.nix +++ b/pkgs/development/libraries/haskell/dimensional/default.nix @@ -12,6 +12,5 @@ cabal.mkDerivation (self: { description = "Statically checked physical dimensions"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/directory-tree/default.nix b/pkgs/development/libraries/haskell/directory-tree/default.nix index 6a338274180137edac13397028156297915835ff..d4bff085005c9b37e85285529f3c5a5c51af098b 100644 --- a/pkgs/development/libraries/haskell/directory-tree/default.nix +++ b/pkgs/development/libraries/haskell/directory-tree/default.nix @@ -13,6 +13,5 @@ cabal.mkDerivation (self: { description = "A simple directory-like tree datatype, with useful IO functions"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/distributed-static/default.nix b/pkgs/development/libraries/haskell/distributed-static/default.nix index f1003927f385bb50741e45514843d7cd0fed90ae..8f7f61da8f69aa68bb4650aabad83e0256d78f80 100644 --- a/pkgs/development/libraries/haskell/distributed-static/default.nix +++ b/pkgs/development/libraries/haskell/distributed-static/default.nix @@ -12,6 +12,5 @@ cabal.mkDerivation (self: { description = "Compositional, type-safe, polymorphic static values and closures"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/djinn/default.nix b/pkgs/development/libraries/haskell/djinn/default.nix index fbe450df19a98b5923bf9cc206780b509829eeaa..12ff67c7f20d873bf28ca30e07a4592f3fd1865a 100644 --- a/pkgs/development/libraries/haskell/djinn/default.nix +++ b/pkgs/development/libraries/haskell/djinn/default.nix @@ -17,5 +17,7 @@ cabal.mkDerivation (self: { description = "Generate Haskell code from a type"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + hydraPlatforms = self.stdenv.lib.platforms.none; + broken = self.stdenv.lib.versionOlder "7.7" self.ghc.version; }; }) diff --git a/pkgs/development/libraries/haskell/dlist/default.nix b/pkgs/development/libraries/haskell/dlist/default.nix index 69e95efa7043041cae5f04f43e0aaf798e646229..bf0b73b45e60362f0bdd5e9c22b53bb8c3e3af6e 100644 --- a/pkgs/development/libraries/haskell/dlist/default.nix +++ b/pkgs/development/libraries/haskell/dlist/default.nix @@ -13,6 +13,5 @@ cabal.mkDerivation (self: { description = "Difference lists"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/dns/default.nix b/pkgs/development/libraries/haskell/dns/default.nix index 8da6475cfb6c1c6667cd5c0fdd0b85e6db22465d..113e1af46eed55e2521a7def1b137f9fe73377e4 100644 --- a/pkgs/development/libraries/haskell/dns/default.nix +++ b/pkgs/development/libraries/haskell/dns/default.nix @@ -1,20 +1,20 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! { cabal, attoparsec, binary, blazeBuilder, conduit, conduitExtra -, doctest, hspec, iproute, mtl, network, random, resourcet +, doctest, hspec, iproute, mtl, network, random, resourcet, word8 }: cabal.mkDerivation (self: { pname = "dns"; - version = "1.4.0"; - sha256 = "1r004wpq0z98f6n3rqqlkqmb799sdldj5087icksi6rxxr3plrs9"; + version = "1.4.3"; + sha256 = "15v24f338w71dn3cxrzwyg04hk3vxvrvswbv3nnf2ggjgg46yq3i"; buildDepends = [ attoparsec binary blazeBuilder conduit conduitExtra iproute mtl network random resourcet ]; testDepends = [ attoparsec binary blazeBuilder conduit conduitExtra doctest hspec - iproute mtl network random resourcet + iproute mtl network random resourcet word8 ]; testTarget = "spec"; meta = { diff --git a/pkgs/development/libraries/haskell/dom-selector/default.nix b/pkgs/development/libraries/haskell/dom-selector/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..b9806ca4dc7b5e0920f7e92c96d8ef0510ff68f4 --- /dev/null +++ b/pkgs/development/libraries/haskell/dom-selector/default.nix @@ -0,0 +1,24 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, blazeHtml, htmlConduit, parsec, QuickCheck, text, thLift +, xmlConduit +}: + +cabal.mkDerivation (self: { + pname = "dom-selector"; + version = "0.2.0.1"; + sha256 = "1nm3r79k4is5lh5fna4v710vhb0n5hpp3d21r0w6hmqizhdrkb22"; + buildDepends = [ + blazeHtml htmlConduit parsec QuickCheck text thLift xmlConduit + ]; + testDepends = [ + blazeHtml htmlConduit parsec QuickCheck text thLift xmlConduit + ]; + doCheck = false; + meta = { + homepage = "https://github.com/nebuta/"; + description = "DOM traversal by CSS selectors for xml-conduit package"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/dotgen/default.nix b/pkgs/development/libraries/haskell/dotgen/default.nix index 5e1037c4c5f53032a8b37bda8864a3aba92a8b88..f72b051be44ad6fad460ec4733331270a64d7ea9 100644 --- a/pkgs/development/libraries/haskell/dotgen/default.nix +++ b/pkgs/development/libraries/haskell/dotgen/default.nix @@ -12,6 +12,5 @@ cabal.mkDerivation (self: { description = "A simple interface for building .dot graph files."; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/double-conversion/default.nix b/pkgs/development/libraries/haskell/double-conversion/default.nix index 6d8bdee480f94f394b1bc922900ee77996d8fa75..8ad84ea38ebf257341a9a0de742a0eb67fa21873 100644 --- a/pkgs/development/libraries/haskell/double-conversion/default.nix +++ b/pkgs/development/libraries/haskell/double-conversion/default.nix @@ -13,6 +13,5 @@ cabal.mkDerivation (self: { description = "Fast conversion between double precision floating point and text"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/download-curl/default.nix b/pkgs/development/libraries/haskell/download-curl/default.nix index 054491704a34d1d5eedf0ef54be3925f2138a2a7..c30cbfec691e4e88aaaf85e144037b1c6a25aba6 100644 --- a/pkgs/development/libraries/haskell/download-curl/default.nix +++ b/pkgs/development/libraries/haskell/download-curl/default.nix @@ -13,6 +13,5 @@ cabal.mkDerivation (self: { description = "High-level file download based on URLs"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/download/default.nix b/pkgs/development/libraries/haskell/download/default.nix index 3428e8ea3623ead5c21beb0f80601e7962d8b48b..dc9ecd7145a4edae3d44bd627ab03001644f487a 100644 --- a/pkgs/development/libraries/haskell/download/default.nix +++ b/pkgs/development/libraries/haskell/download/default.nix @@ -12,6 +12,7 @@ cabal.mkDerivation (self: { description = "High-level file download based on URLs"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; + broken = true; }; }) diff --git a/pkgs/development/libraries/haskell/dstring/default.nix b/pkgs/development/libraries/haskell/dstring/default.nix index ee4cc6b48a439a7a219e93fee0021c47a0d311d2..eee03fd3fba1ca03d860defe80dd89322a98f3cd 100644 --- a/pkgs/development/libraries/haskell/dstring/default.nix +++ b/pkgs/development/libraries/haskell/dstring/default.nix @@ -12,6 +12,7 @@ cabal.mkDerivation (self: { description = "Difference strings"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; + broken = true; }; }) diff --git a/pkgs/development/libraries/haskell/easy-file/default.nix b/pkgs/development/libraries/haskell/easy-file/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..8ba73d74efee2f1b9135b0846d64fd8dde3744a3 --- /dev/null +++ b/pkgs/development/libraries/haskell/easy-file/default.nix @@ -0,0 +1,16 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, filepath, time }: + +cabal.mkDerivation (self: { + pname = "easy-file"; + version = "0.2.0"; + sha256 = "0v8skixq15rvyiyky1dcrfl9jrzkbi75vai8np11xy2kg7a8ym2a"; + buildDepends = [ filepath time ]; + meta = { + homepage = "http://github.com/kazu-yamamoto/easy-file"; + description = "Cross-platform File handling"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/edit-distance/default.nix b/pkgs/development/libraries/haskell/edit-distance/default.nix index b1ee00fd7a7152fd3110eba0848e19d26ad861e1..c68e32b78dfd9ad8e66788deafb240f4ac75157a 100644 --- a/pkgs/development/libraries/haskell/edit-distance/default.nix +++ b/pkgs/development/libraries/haskell/edit-distance/default.nix @@ -14,6 +14,5 @@ cabal.mkDerivation (self: { description = "Levenshtein and restricted Damerau-Levenshtein edit distances"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/editline/0.2.1.0.nix b/pkgs/development/libraries/haskell/editline/0.2.1.0.nix index 55b1e685d6dad4115f4ae947fa31aa8e8c250b7f..d36a2ee11f289115d3fe4df3d513006de1f3ca0c 100644 --- a/pkgs/development/libraries/haskell/editline/0.2.1.0.nix +++ b/pkgs/development/libraries/haskell/editline/0.2.1.0.nix @@ -12,5 +12,6 @@ cabal.mkDerivation (self: { description = "Bindings to the editline library (libedit)"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/editline/0.2.1.1.nix b/pkgs/development/libraries/haskell/editline/0.2.1.1.nix index efb41f546b22fc4867c3126ef38083cf97381c84..4458a067b1f4be829a1ae51ba017553c2c075451 100644 --- a/pkgs/development/libraries/haskell/editline/0.2.1.1.nix +++ b/pkgs/development/libraries/haskell/editline/0.2.1.1.nix @@ -12,5 +12,6 @@ cabal.mkDerivation (self: { description = "Bindings to the editline library (libedit)"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/ekg-carbon/default.nix b/pkgs/development/libraries/haskell/ekg-carbon/default.nix index 12c29f0d56e5858c6af90de1956e6082bfc95b8e..06daad669676ba2b4c19a8afd91b0189cf138f5d 100644 --- a/pkgs/development/libraries/haskell/ekg-carbon/default.nix +++ b/pkgs/development/libraries/haskell/ekg-carbon/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "ekg-carbon"; - version = "1.0.0"; - sha256 = "0zcnh74z0n0xxxr6r0j3kgpbfwli58y714k0mwwc2wxjgcv6xiyc"; + version = "1.0.1"; + sha256 = "1slaykn1a6f09dzn78v2aqw8snmidycvaw5cfyr4f0ndd88vi77d"; buildDepends = [ ekgCore network networkCarbon text time unorderedContainers vector ]; @@ -16,6 +16,6 @@ cabal.mkDerivation (self: { description = "An EKG backend to send statistics to Carbon (part of Graphite monitoring tools)"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + maintainers = with self.stdenv.lib.maintainers; [ ocharles ]; }; }) diff --git a/pkgs/development/libraries/haskell/ekg/default.nix b/pkgs/development/libraries/haskell/ekg/default.nix index beb92ef51fe75004931f68644a03d3eda3067a27..4b639df3b7d477099447293070ec2c828a3328ac 100644 --- a/pkgs/development/libraries/haskell/ekg/default.nix +++ b/pkgs/development/libraries/haskell/ekg/default.nix @@ -12,6 +12,7 @@ cabal.mkDerivation (self: { aeson ekgCore filepath network snapCore snapServer text time transformers unorderedContainers ]; + jailbreak = true; meta = { homepage = "https://github.com/tibbe/ekg"; description = "Remote monitoring of processes"; diff --git a/pkgs/development/libraries/haskell/email-validate/default.nix b/pkgs/development/libraries/haskell/email-validate/default.nix index 793184e210146e733e7d21e53aa59624140838f6..8f95b8ec67bc124fb33f9c57cbb0b63edc006d0e 100644 --- a/pkgs/development/libraries/haskell/email-validate/default.nix +++ b/pkgs/development/libraries/haskell/email-validate/default.nix @@ -18,6 +18,5 @@ cabal.mkDerivation (self: { description = "Validating an email address string against RFC 5322"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/engine-io-snap/default.nix b/pkgs/development/libraries/haskell/engine-io-snap/default.nix index 07ccb6c71520955086650a838269be749403309d..70c7a1c7d4f6422130969621eadd8a108b88a894 100644 --- a/pkgs/development/libraries/haskell/engine-io-snap/default.nix +++ b/pkgs/development/libraries/haskell/engine-io-snap/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "engine-io-snap"; - version = "1.0.0"; - sha256 = "152hz2b9zbmjpp517g6kp7fs7kbvyil28dp6djqjlmp9fqkgckap"; + version = "1.0.1"; + sha256 = "1hw3gmi23fdcgvz817b95bf23wa7qyg10axsnvan5qxr73pwp5iv"; buildDepends = [ attoparsecEnumerator engineIo snapCore unorderedContainers websockets websocketsSnap @@ -15,6 +15,6 @@ cabal.mkDerivation (self: { meta = { license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + maintainers = with self.stdenv.lib.maintainers; [ ocharles ]; }; }) diff --git a/pkgs/development/libraries/haskell/engine-io/default.nix b/pkgs/development/libraries/haskell/engine-io/default.nix index d9a48cd80dd058a9a8d2757a8d7398f474633751..82cb1240610de01cb2cff87cdb6c2ecda70512b6 100644 --- a/pkgs/development/libraries/haskell/engine-io/default.nix +++ b/pkgs/development/libraries/haskell/engine-io/default.nix @@ -7,17 +7,18 @@ cabal.mkDerivation (self: { pname = "engine-io"; - version = "1.0.1"; - sha256 = "1wwh9p08dnjhixlli2wibqvwprz8cc5m0c4m17a4klcawr7kb3r6"; + version = "1.1.0"; + sha256 = "0l2jwgzi22ky13k9kmqhn15zyxyg5gr167rkywb458n1si4jr3jh"; buildDepends = [ aeson async attoparsec base64Bytestring either monadLoops mwcRandom stm text transformers unorderedContainers vector websockets ]; + jailbreak = true; meta = { homepage = "http://github.com/ocharles/engine.io"; description = "A Haskell implementation of Engine.IO"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + maintainers = with self.stdenv.lib.maintainers; [ ocharles ]; }; }) diff --git a/pkgs/development/libraries/haskell/entropy/default.nix b/pkgs/development/libraries/haskell/entropy/default.nix index 46020b7c9113bfe1ad2938667ee952814f725b14..881a9cd9a0afd6af56af52f957945e32914f2e73 100644 --- a/pkgs/development/libraries/haskell/entropy/default.nix +++ b/pkgs/development/libraries/haskell/entropy/default.nix @@ -11,6 +11,5 @@ cabal.mkDerivation (self: { description = "A platform independent entropy source"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/enumerator/default.nix b/pkgs/development/libraries/haskell/enumerator/default.nix index 1418274271fd9dee39c4a1b34baddbd9c60b8027..d68222f6f7bf480bebbb2ab49efe6aec57d57c66 100644 --- a/pkgs/development/libraries/haskell/enumerator/default.nix +++ b/pkgs/development/libraries/haskell/enumerator/default.nix @@ -12,6 +12,5 @@ cabal.mkDerivation (self: { description = "Reliable, high-performance processing with left-fold enumerators"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/enummapset/default.nix b/pkgs/development/libraries/haskell/enummapset/default.nix index d5a0249e52899925f1dddb38a58c50b061a1c5cc..97833ea94650c1ca667f45ba3c96ddab42f87266 100644 --- a/pkgs/development/libraries/haskell/enummapset/default.nix +++ b/pkgs/development/libraries/haskell/enummapset/default.nix @@ -13,5 +13,7 @@ cabal.mkDerivation (self: { description = "IntMap and IntSet with Enum keys/elements"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + hydraPlatforms = self.stdenv.lib.platforms.none; + broken = true; }; }) diff --git a/pkgs/development/libraries/haskell/enumset/default.nix b/pkgs/development/libraries/haskell/enumset/default.nix index fefb424d495dc201f7d843ec76a5a2ef3c299daa..d563ce0424791e2ba0a006cf2906826d9c904a21 100644 --- a/pkgs/development/libraries/haskell/enumset/default.nix +++ b/pkgs/development/libraries/haskell/enumset/default.nix @@ -11,6 +11,6 @@ cabal.mkDerivation (self: { description = "Sets of enumeration values represented by machine words"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.ertes ]; + maintainers = with self.stdenv.lib.maintainers; [ ertes ]; }; }) diff --git a/pkgs/development/libraries/haskell/equivalence/default.nix b/pkgs/development/libraries/haskell/equivalence/0.2.3.nix similarity index 93% rename from pkgs/development/libraries/haskell/equivalence/default.nix rename to pkgs/development/libraries/haskell/equivalence/0.2.3.nix index 9344682122444a56626c2ebace1d78480e5e6db2..c21c0e1617030b953ced0a1471aab6409b07036a 100644 --- a/pkgs/development/libraries/haskell/equivalence/default.nix +++ b/pkgs/development/libraries/haskell/equivalence/0.2.3.nix @@ -18,5 +18,6 @@ cabal.mkDerivation (self: { description = "Maintaining an equivalence relation implemented as union-find using STT"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/equivalence/0.2.5.nix b/pkgs/development/libraries/haskell/equivalence/0.2.5.nix new file mode 100644 index 0000000000000000000000000000000000000000..38de239b821b605887c365fcd4409a677e27cb3b --- /dev/null +++ b/pkgs/development/libraries/haskell/equivalence/0.2.5.nix @@ -0,0 +1,22 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, mtl, QuickCheck, STMonadTrans, testFramework +, testFrameworkQuickcheck2 +}: + +cabal.mkDerivation (self: { + pname = "equivalence"; + version = "0.2.5"; + sha256 = "014r9v81r7nj5pynfk3wa4lm4hk04123fgxkhb9a945wi6d9m5h3"; + buildDepends = [ mtl STMonadTrans ]; + testDepends = [ + mtl QuickCheck STMonadTrans testFramework testFrameworkQuickcheck2 + ]; + doCheck = false; + meta = { + homepage = "https://bitbucket.org/paba/equivalence/"; + description = "Maintaining an equivalence relation implemented as union-find using STT"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/erf/default.nix b/pkgs/development/libraries/haskell/erf/default.nix index 6904bdadb96c2e8991d451d11868ea788554a209..431a9b99b33518095a2bbf48b20843cd018a5a13 100644 --- a/pkgs/development/libraries/haskell/erf/default.nix +++ b/pkgs/development/libraries/haskell/erf/default.nix @@ -10,6 +10,5 @@ cabal.mkDerivation (self: { description = "The error function, erf, and related functions"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/esqueleto/default.nix b/pkgs/development/libraries/haskell/esqueleto/default.nix index 09edb8c12148421dede7594ea83aa71fd779712f..637f32c39961d363b596377b0153bb42414a07aa 100644 --- a/pkgs/development/libraries/haskell/esqueleto/default.nix +++ b/pkgs/development/libraries/haskell/esqueleto/default.nix @@ -23,6 +23,6 @@ cabal.mkDerivation (self: { description = "Type-safe EDSL for SQL queries on persistent backends"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + maintainers = with self.stdenv.lib.maintainers; [ ocharles ]; }; }) diff --git a/pkgs/development/libraries/haskell/ex-pool/default.nix b/pkgs/development/libraries/haskell/ex-pool/default.nix index e3fc6cee6502e712915083029c6f212920db0d09..7c40662dd9800b66082e8a47b2fe30ed1e8db1b6 100644 --- a/pkgs/development/libraries/haskell/ex-pool/default.nix +++ b/pkgs/development/libraries/haskell/ex-pool/default.nix @@ -14,6 +14,6 @@ cabal.mkDerivation (self: { description = "Another fork of resource-pool, with a MonadIO and MonadCatch constraint"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + maintainers = with self.stdenv.lib.maintainers; [ ocharles ]; }; }) diff --git a/pkgs/development/libraries/haskell/exception-mtl/default.nix b/pkgs/development/libraries/haskell/exception-mtl/default.nix index c19a98771385efcb2c7081f618f0d978dbef28ea..d3d21aaf27a55ac8289b84f53ed41a8d89abfbb5 100644 --- a/pkgs/development/libraries/haskell/exception-mtl/default.nix +++ b/pkgs/development/libraries/haskell/exception-mtl/default.nix @@ -12,6 +12,5 @@ cabal.mkDerivation (self: { description = "Exception monad transformer instances for mtl2 classes"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/exception-transformers/default.nix b/pkgs/development/libraries/haskell/exception-transformers/default.nix index bedbb527ff3593f502eb34f9ced35b745c22cef6..e6c778e981d3f6ebd6486746a34da3e877fb45bc 100644 --- a/pkgs/development/libraries/haskell/exception-transformers/default.nix +++ b/pkgs/development/libraries/haskell/exception-transformers/default.nix @@ -13,6 +13,5 @@ cabal.mkDerivation (self: { description = "Type classes and monads for unchecked extensible exceptions"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/exceptions/default.nix b/pkgs/development/libraries/haskell/exceptions/default.nix index 1a56adb219cc57c3a4030e4b0868c415e4effea6..ef56c9909e1c3f8e12622e94236e7702a5587111 100644 --- a/pkgs/development/libraries/haskell/exceptions/default.nix +++ b/pkgs/development/libraries/haskell/exceptions/default.nix @@ -17,6 +17,6 @@ cabal.mkDerivation (self: { description = "Extensible optionally-pure exceptions"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + maintainers = with self.stdenv.lib.maintainers; [ ocharles ]; }; }) diff --git a/pkgs/development/libraries/haskell/executable-path/default.nix b/pkgs/development/libraries/haskell/executable-path/default.nix index 93df3c3814f67a9901174fdca24227d26545569d..c8ec138eb63c9dba0580f3b4e9fedc0c7a2334c4 100644 --- a/pkgs/development/libraries/haskell/executable-path/default.nix +++ b/pkgs/development/libraries/haskell/executable-path/default.nix @@ -12,6 +12,5 @@ cabal.mkDerivation (self: { description = "Finding out the full path of the executable"; license = self.stdenv.lib.licenses.publicDomain; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/explicit-exception/default.nix b/pkgs/development/libraries/haskell/explicit-exception/default.nix index 2cc0d456b17f2722776c7b0380cbda493cd47983..6c5c4f2b2ff8839cdd55ed1e288f7c4ca6c9661a 100644 --- a/pkgs/development/libraries/haskell/explicit-exception/default.nix +++ b/pkgs/development/libraries/haskell/explicit-exception/default.nix @@ -14,6 +14,5 @@ cabal.mkDerivation (self: { description = "Exceptions which are explicit in the type signature"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/extensible-effects/default.nix b/pkgs/development/libraries/haskell/extensible-effects/default.nix index 72167d2d3a7a35a7b97a5fa0badc17c14de6e428..0c743df4a162a1a047cf83eeb8807642444eeac1 100644 --- a/pkgs/development/libraries/haskell/extensible-effects/default.nix +++ b/pkgs/development/libraries/haskell/extensible-effects/default.nix @@ -19,6 +19,6 @@ cabal.mkDerivation (self: { description = "An Alternative to Monad Transformers"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + maintainers = with self.stdenv.lib.maintainers; [ ocharles ]; }; }) diff --git a/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.0.nix b/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.0.nix index 4f1cd630596a8e96d990469dde0316d46a90f55e..e9c1f352a0954a9ac5f36017d1ad2b9287e2c643 100644 --- a/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.0.nix +++ b/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.0.nix @@ -10,6 +10,6 @@ cabal.mkDerivation (self: { description = "Extensible exceptions"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.2.nix b/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.2.nix index 279118e13013c87fcacfe72e3a5289c645e82201..8003b47f64e12ac1ef59afa9eff4b50043a35fa1 100644 --- a/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.2.nix +++ b/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.2.nix @@ -10,6 +10,6 @@ cabal.mkDerivation (self: { description = "Extensible exceptions"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.3.nix b/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.3.nix index 9afa901de4fd2039e9f278243e76f194f23f6c5b..ee5abc006b67836ec55dfc1ecfe41bc5f11919be 100644 --- a/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.3.nix +++ b/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.3.nix @@ -10,6 +10,6 @@ cabal.mkDerivation (self: { description = "Extensible exceptions"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.4.nix b/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.4.nix index 2315d336ff9eb74f111d8a5413d071e898cc93ce..39969527a85a25965d2700dcc3d790dd5f61bef4 100644 --- a/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.4.nix +++ b/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.4.nix @@ -10,6 +10,5 @@ cabal.mkDerivation (self: { description = "Extensible exceptions"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/failure/default.nix b/pkgs/development/libraries/haskell/failure/default.nix index d8cd530075aa0e69cea3ac98a272b606aed95a82..86912a2e4457e3360d8b1851b02c2f73501f242a 100644 --- a/pkgs/development/libraries/haskell/failure/default.nix +++ b/pkgs/development/libraries/haskell/failure/default.nix @@ -13,6 +13,5 @@ cabal.mkDerivation (self: { description = "A simple type class for success/failure computations. (deprecated)"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/fast-logger/default.nix b/pkgs/development/libraries/haskell/fast-logger/default.nix index 6a1aa3dfb3c52775a3dc109a8001534f9ab4cbdb..b4e32fa2bb0ccf90ad7e06677b79ddda144ba4ea 100644 --- a/pkgs/development/libraries/haskell/fast-logger/default.nix +++ b/pkgs/development/libraries/haskell/fast-logger/default.nix @@ -1,17 +1,16 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, blazeBuilder, filepath, hspec, text }: +{ cabal, autoUpdate, blazeBuilder, filepath, hspec, text }: cabal.mkDerivation (self: { pname = "fast-logger"; - version = "2.1.5"; - sha256 = "12f7yad2f6q846rw2ji5fsx3d7qd8jdrnnzsbji5bpv00mvvsiza"; - buildDepends = [ blazeBuilder filepath text ]; + version = "2.2.0"; + sha256 = "02gc5f7vgwfdlhfawki4xxrl33lbdl05wh64qm3mb3h2dv1gnwrr"; + buildDepends = [ autoUpdate blazeBuilder filepath text ]; testDepends = [ hspec ]; meta = { description = "A fast logging system"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/fastcgi/default.nix b/pkgs/development/libraries/haskell/fastcgi/default.nix index c1faf9ce96b9b61f5f1f75a67af3e453af42f7bf..a41815250e1f376615f16f5682177b3a51851853 100644 --- a/pkgs/development/libraries/haskell/fastcgi/default.nix +++ b/pkgs/development/libraries/haskell/fastcgi/default.nix @@ -12,6 +12,7 @@ cabal.mkDerivation (self: { description = "A Haskell library for writing FastCGI programs"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.tomberek ]; + hydraPlatforms = self.stdenv.lib.platforms.none; + maintainers = with self.stdenv.lib.maintainers; [ tomberek ]; }; }) diff --git a/pkgs/development/libraries/haskell/fay-base/default.nix b/pkgs/development/libraries/haskell/fay-base/default.nix index 9dd38ecda4bef3a03c7b56b336774ed7ad747b15..78f6b104c942993fe3be1a1bd213a832d4717c94 100644 --- a/pkgs/development/libraries/haskell/fay-base/default.nix +++ b/pkgs/development/libraries/haskell/fay-base/default.nix @@ -4,14 +4,14 @@ cabal.mkDerivation (self: { pname = "fay-base"; - version = "0.19.1.2"; - sha256 = "0y2gpyh0gama6mz0rfvqdgpf7wfwx7r8k0cdfh60kjcxr029dx5i"; + version = "0.19.2"; + sha256 = "08iv3097h877hxbmpmar1p526famm5pb1djq3qwla3bkqrzxgmf4"; buildDepends = [ fay ]; meta = { homepage = "https://github.com/faylang/fay-base"; description = "The base package for Fay"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + maintainers = with self.stdenv.lib.maintainers; [ ocharles ]; }; }) diff --git a/pkgs/development/libraries/haskell/fay/default.nix b/pkgs/development/libraries/haskell/fay/default.nix index 10eafa70753f1f36b22a6bbd07ab05112ec2e48c..8c09bf444ee4180aae45174025ccefdfc03e188d 100644 --- a/pkgs/development/libraries/haskell/fay/default.nix +++ b/pkgs/development/libraries/haskell/fay/default.nix @@ -25,6 +25,6 @@ cabal.mkDerivation (self: { description = "A compiler for Fay, a Haskell subset that compiles to JavaScript"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + maintainers = with self.stdenv.lib.maintainers; [ ocharles ]; }; }) diff --git a/pkgs/development/libraries/haskell/fb/default.nix b/pkgs/development/libraries/haskell/fb/default.nix index 51a6ea84c50cb58f8e6ca9d225a7186ffe75e21a..37d243097324a2e826ac7fdd250bb2ceed640842 100644 --- a/pkgs/development/libraries/haskell/fb/default.nix +++ b/pkgs/development/libraries/haskell/fb/default.nix @@ -10,8 +10,8 @@ cabal.mkDerivation (self: { pname = "fb"; - version = "1.0.2"; - sha256 = "1xgldk690dpbmhzmjlngpbalmbs0xrc7265zc7frphpsbbw3cnqc"; + version = "1.0.4"; + sha256 = "1sp0x5p9l02i2ynvynazhgs5lqqwih997c2fyfp0xi24qsc7ilr2"; buildDepends = [ aeson attoparsec base16Bytestring base64Bytestring cereal conduit conduitExtra cryptoApi cryptohash cryptohashCryptoapi dataDefault diff --git a/pkgs/development/libraries/haskell/fclabels/default.nix b/pkgs/development/libraries/haskell/fclabels/default.nix index a7753f1a70da2250f83760f07e269dd15cc135f0..431a46504ee287c9c9ef04fbbd9bec145ad71aea 100644 --- a/pkgs/development/libraries/haskell/fclabels/default.nix +++ b/pkgs/development/libraries/haskell/fclabels/default.nix @@ -12,6 +12,5 @@ cabal.mkDerivation (self: { description = "First class accessor labels implemented as lenses"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/feed/default.nix b/pkgs/development/libraries/haskell/feed/default.nix index 3a5ec2ad1af4e4146dc826df54f5511d6ecef999..b7bc816b6d0338b40dee0eb5ae08320d3200ecf3 100644 --- a/pkgs/development/libraries/haskell/feed/default.nix +++ b/pkgs/development/libraries/haskell/feed/default.nix @@ -12,6 +12,5 @@ cabal.mkDerivation (self: { description = "Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds."; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/fgl-visualize/default.nix b/pkgs/development/libraries/haskell/fgl-visualize/default.nix index 1f31985d92861eed83628c95049e1ca4ca077127..ea11a67d3c9081c4801267534e1687f145a2adab 100644 --- a/pkgs/development/libraries/haskell/fgl-visualize/default.nix +++ b/pkgs/development/libraries/haskell/fgl-visualize/default.nix @@ -11,6 +11,5 @@ cabal.mkDerivation (self: { description = "Convert FGL graphs to dot (graphviz) files"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/fgl/5.4.2.2.nix b/pkgs/development/libraries/haskell/fgl/5.4.2.2.nix index dc7fc6e4457ddffe7b1923f3ada2bbf6a81fa8c7..61043f82f976dd6a0f18d397892efba83b53ce2d 100644 --- a/pkgs/development/libraries/haskell/fgl/5.4.2.2.nix +++ b/pkgs/development/libraries/haskell/fgl/5.4.2.2.nix @@ -12,6 +12,6 @@ cabal.mkDerivation (self: { description = "Martin Erwig's Functional Graph Library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/fgl/5.4.2.3.nix b/pkgs/development/libraries/haskell/fgl/5.4.2.3.nix index be83763d1d9d3b7bc392f48c39fb6c796e7486c7..1ecc9fb05e71e983dbc93c969d559f0f40f4c0e1 100644 --- a/pkgs/development/libraries/haskell/fgl/5.4.2.3.nix +++ b/pkgs/development/libraries/haskell/fgl/5.4.2.3.nix @@ -12,6 +12,6 @@ cabal.mkDerivation (self: { description = "Martin Erwig's Functional Graph Library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/fgl/5.4.2.4.nix b/pkgs/development/libraries/haskell/fgl/5.4.2.4.nix index 973fc415e0c7ebb7d5c3fec667002f8607519496..65596c350dea0216a527c607a1aa6cef7f5a423d 100644 --- a/pkgs/development/libraries/haskell/fgl/5.4.2.4.nix +++ b/pkgs/development/libraries/haskell/fgl/5.4.2.4.nix @@ -12,6 +12,6 @@ cabal.mkDerivation (self: { description = "Martin Erwig's Functional Graph Library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/fgl/5.5.0.0.nix b/pkgs/development/libraries/haskell/fgl/5.5.0.0.nix index 3bc1c39ba7cd0ee760ebeebac13f2ea776bd7347..4fd2a4d05971d4fad8a5b3bda7cb1371a81dd3fe 100644 --- a/pkgs/development/libraries/haskell/fgl/5.5.0.0.nix +++ b/pkgs/development/libraries/haskell/fgl/5.5.0.0.nix @@ -12,6 +12,6 @@ cabal.mkDerivation (self: { description = "Martin Erwig's Functional Graph Library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/fgl/5.5.0.1.nix b/pkgs/development/libraries/haskell/fgl/5.5.0.1.nix index 2e1bb2364b4aa3ddbb91b09c25135e952ea2d412..65a67528d01a4fbcec3ffcd9577856a9dde0f9dd 100644 --- a/pkgs/development/libraries/haskell/fgl/5.5.0.1.nix +++ b/pkgs/development/libraries/haskell/fgl/5.5.0.1.nix @@ -12,6 +12,5 @@ cabal.mkDerivation (self: { description = "Martin Erwig's Functional Graph Library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/file-embed/default.nix b/pkgs/development/libraries/haskell/file-embed/default.nix index 02eb043cc3a2d976e9e9973ea32af3f28b157caa..b9cd34552b2c59bfe99590577057e0034e4b40dc 100644 --- a/pkgs/development/libraries/haskell/file-embed/default.nix +++ b/pkgs/development/libraries/haskell/file-embed/default.nix @@ -13,6 +13,5 @@ cabal.mkDerivation (self: { description = "Use Template Haskell to embed file contents directly"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/filemanip/default.nix b/pkgs/development/libraries/haskell/filemanip/default.nix index 38fc115141bda0e00beb8059665b7442842b08f5..c07ba6c2c9078d23da6f3edc1b96bbe903b4213b 100644 --- a/pkgs/development/libraries/haskell/filemanip/default.nix +++ b/pkgs/development/libraries/haskell/filemanip/default.nix @@ -12,6 +12,6 @@ cabal.mkDerivation (self: { description = "Expressive file and directory manipulation for Haskell"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + maintainers = with self.stdenv.lib.maintainers; [ ocharles ]; }; }) diff --git a/pkgs/development/libraries/haskell/filepath/1.3.0.2.nix b/pkgs/development/libraries/haskell/filepath/1.3.0.2.nix deleted file mode 100644 index e8bca5c63cf30744aaedb38037508c02863f2358..0000000000000000000000000000000000000000 --- a/pkgs/development/libraries/haskell/filepath/1.3.0.2.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, QuickCheck, random }: - -cabal.mkDerivation (self: { - pname = "filepath"; - version = "1.3.0.2"; - sha256 = "0wvvz6cs5fh4f04a87b9s7xrnzypmnzzkn149p6xk8xi7gcvcpy2"; - testDepends = [ QuickCheck random ]; - meta = { - homepage = "http://www-users.cs.york.ac.uk/~ndm/filepath/"; - description = "Library for manipulating FilePaths in a cross platform way"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/filestore/default.nix b/pkgs/development/libraries/haskell/filestore/default.nix index fd33af07ee374fafe6b93154acd0c4969afe40b8..116875ecbdcf0b900a46020aa824e4e6a32c1753 100644 --- a/pkgs/development/libraries/haskell/filestore/default.nix +++ b/pkgs/development/libraries/haskell/filestore/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "filestore"; - version = "0.6.0.2"; - sha256 = "0dbn358gxg13lxlpqyczcn5g5kvzrz7lv17qsmr53hvmxz8mricr"; + version = "0.6.0.3"; + sha256 = "03qmv3cqp1fv7b7pdjdx12cb27bfjbwwjdhkcvkfq89qwk9wh1h0"; buildDepends = [ Diff filepath parsec split time utf8String xml ]; testDepends = [ Diff filepath HUnit mtl time ]; jailbreak = true; @@ -15,6 +15,5 @@ cabal.mkDerivation (self: { description = "Interface for versioning file stores"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/fingertree/default.nix b/pkgs/development/libraries/haskell/fingertree/default.nix index 4ea7f2ecd9e11b9d05eb354aaf969fe68c5c0595..321bb5cab8f84f0c96089a2d47944dcb2611b691 100644 --- a/pkgs/development/libraries/haskell/fingertree/default.nix +++ b/pkgs/development/libraries/haskell/fingertree/default.nix @@ -16,6 +16,5 @@ cabal.mkDerivation (self: { description = "Generic finger-tree structure, with example instances"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/flexible-defaults/default.nix b/pkgs/development/libraries/haskell/flexible-defaults/default.nix index d127225ffab8b2d1aa8ba7f671f0bf2b46534d78..1a20983a5a5037026afa0f84c9b5117bc739b963 100644 --- a/pkgs/development/libraries/haskell/flexible-defaults/default.nix +++ b/pkgs/development/libraries/haskell/flexible-defaults/default.nix @@ -12,6 +12,5 @@ cabal.mkDerivation (self: { description = "Generate default function implementations for complex type classes"; license = self.stdenv.lib.licenses.publicDomain; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/focus/default.nix b/pkgs/development/libraries/haskell/focus/default.nix index a2575734b4daba09d4969f9ee32abe89abd3d7a4..480d974e2b886d9aa8c4c1e8fb4b903176e37607 100644 --- a/pkgs/development/libraries/haskell/focus/default.nix +++ b/pkgs/development/libraries/haskell/focus/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "focus"; - version = "0.1.1"; - sha256 = "0x158zqxgm8ys4mxs94zl811qfdcb06jqy5h99qc63r7snwnixmd"; + version = "0.1.2"; + sha256 = "0j157nv668621i94iqg923bfg7594bpfn0q9scb62cik2yikc1p0"; buildDepends = [ lochTh placeholders ]; meta = { homepage = "https://github.com/nikita-volkov/focus"; diff --git a/pkgs/development/libraries/haskell/foldl/default.nix b/pkgs/development/libraries/haskell/foldl/default.nix index 5952e335f43cdb60b91c766dd31d9d9578d06fe4..7a942e97dc89fb70f1f469ba0c9ca088ce8f077e 100644 --- a/pkgs/development/libraries/haskell/foldl/default.nix +++ b/pkgs/development/libraries/haskell/foldl/default.nix @@ -11,6 +11,6 @@ cabal.mkDerivation (self: { description = "Composable, streaming, and efficient left folds"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + maintainers = with self.stdenv.lib.maintainers; [ ocharles ]; }; }) diff --git a/pkgs/development/libraries/haskell/folds/default.nix b/pkgs/development/libraries/haskell/folds/default.nix index 41a834dbd8454317cd132c0f935dccc4ee964b48..c274c774415fe7bab6b0a057d7ca3cd9561799da 100644 --- a/pkgs/development/libraries/haskell/folds/default.nix +++ b/pkgs/development/libraries/haskell/folds/default.nix @@ -1,20 +1,21 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, comonad, contravariant, deepseq, doctest, filepath, hlint -, lens, mtl, pointed, profunctors, reflection, semigroupoids -, semigroups, tagged, transformers, vector +{ cabal, comonad, contravariant, deepseq, doctest, filepath, lens +, mtl, pointed, profunctors, reflection, semigroupoids, semigroups +, tagged, transformers, vector }: cabal.mkDerivation (self: { pname = "folds"; - version = "0.6.1"; - sha256 = "13p4kyr48g917ib87n14qpqaka6isp73cwy7mvvsqgprj1fghyj1"; + version = "0.6.2"; + sha256 = "13zdmf7szdy9ka5dw0vgzbfmndm7w8fz7ryz5h2z5hsqg9am2qqa"; buildDepends = [ comonad contravariant lens pointed profunctors reflection semigroupoids tagged transformers vector ]; - testDepends = [ deepseq doctest filepath hlint mtl semigroups ]; - doCheck = false; + testDepends = [ deepseq doctest filepath mtl semigroups ]; + configureFlags = "-f-test-hlint"; + enableSplitObjs = false; meta = { homepage = "http://github.com/ekmett/folds"; description = "Beautiful Folding"; diff --git a/pkgs/development/libraries/haskell/free-game/1.0.5.nix b/pkgs/development/libraries/haskell/free-game/1.0.5.nix deleted file mode 100644 index 16ee51d139fc7e0ab153187eda9d9f9346e8cf0a..0000000000000000000000000000000000000000 --- a/pkgs/development/libraries/haskell/free-game/1.0.5.nix +++ /dev/null @@ -1,25 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, boundingboxes, colors, controlBool, filepath, free -, freetype2, GLFWB, hashable, JuicyPixels, JuicyPixelsUtil, lens -, linear, mtl, OpenGL, OpenGLRaw, random, reflection, transformers -, vector, void -}: - -cabal.mkDerivation (self: { - pname = "free-game"; - version = "1.0.5"; - sha256 = "048hmb4zbn67ycdwy7alhfakdyv405ck79bzrxv2ra6w1v5b3yvf"; - buildDepends = [ - boundingboxes colors controlBool filepath free freetype2 GLFWB - hashable JuicyPixels JuicyPixelsUtil lens linear mtl OpenGL - OpenGLRaw random reflection transformers vector void - ]; - jailbreak = true; - meta = { - homepage = "https://github.com/fumieval/free-game"; - description = "Create games for free"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - }; -}) diff --git a/pkgs/development/libraries/haskell/free-game/1.1.nix b/pkgs/development/libraries/haskell/free-game/default.nix similarity index 90% rename from pkgs/development/libraries/haskell/free-game/1.1.nix rename to pkgs/development/libraries/haskell/free-game/default.nix index 76139aa7e5d4ccd317049ce8be7bd1cfb2ebc955..d2a0f33892fdc2d80f34619d2da9689b59f019c2 100644 --- a/pkgs/development/libraries/haskell/free-game/1.1.nix +++ b/pkgs/development/libraries/haskell/free-game/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "free-game"; - version = "1.1"; - sha256 = "0id3vn2j44gd8krl5icacwxgx00h6r89yncjg10nyyb90rymvxzz"; + version = "1.1.78"; + sha256 = "11f3ib4nx0madbx58gscaqwc1k5mxw70klrq7z7lac9w61phkws6"; buildDepends = [ boundingboxes colors controlBool filepath free freetype2 GLFWB hashable JuicyPixels JuicyPixelsUtil lens linear mtl OpenGL diff --git a/pkgs/development/libraries/haskell/free/default.nix b/pkgs/development/libraries/haskell/free/default.nix index 8aea1b312a032a20225445bc6c6d108bc8b731e0..e516eb3613a03753117fab42fbc0119f1ba7e057 100644 --- a/pkgs/development/libraries/haskell/free/default.nix +++ b/pkgs/development/libraries/haskell/free/default.nix @@ -18,6 +18,6 @@ cabal.mkDerivation (self: { description = "Monads for free"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + maintainers = with self.stdenv.lib.maintainers; [ ocharles ]; }; }) diff --git a/pkgs/development/libraries/haskell/funcmp/default.nix b/pkgs/development/libraries/haskell/funcmp/default.nix index 1e0ee45de591f3ada86ca46b66c48f42caccaf26..16f41718d0b57a1c10c5ab9f64e387238d5bc67b 100644 --- a/pkgs/development/libraries/haskell/funcmp/default.nix +++ b/pkgs/development/libraries/haskell/funcmp/default.nix @@ -12,9 +12,6 @@ cabal.mkDerivation (self: { description = "Functional MetaPost"; license = "GPL"; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = with self.stdenv.lib.maintainers; [ simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/gamma/default.nix b/pkgs/development/libraries/haskell/gamma/default.nix index c2117bffa7edd586606c72432310b2580c5c0a99..2f55936fadf12bf56cd51408c40cc3171b4d1e58 100644 --- a/pkgs/development/libraries/haskell/gamma/default.nix +++ b/pkgs/development/libraries/haskell/gamma/default.nix @@ -12,6 +12,5 @@ cabal.mkDerivation (self: { description = "Gamma function and related functions"; license = self.stdenv.lib.licenses.publicDomain; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/gd/default.nix b/pkgs/development/libraries/haskell/gd/default.nix index bf4827800602fd5e81c76455c4dd179847dff28e..f2a534f47c855b01bc9796787cb66c67b0c067d7 100644 --- a/pkgs/development/libraries/haskell/gd/default.nix +++ b/pkgs/development/libraries/haskell/gd/default.nix @@ -13,6 +13,5 @@ cabal.mkDerivation (self: { description = "A Haskell binding to a subset of the GD graphics library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/gdiff/default.nix b/pkgs/development/libraries/haskell/gdiff/default.nix index 3d34f388fb31442e6db414864f5fef6b6536feaf..616b5eb337d36d1a8ec015ecb80392f57c613d58 100644 --- a/pkgs/development/libraries/haskell/gdiff/default.nix +++ b/pkgs/development/libraries/haskell/gdiff/default.nix @@ -4,12 +4,12 @@ cabal.mkDerivation (self: { pname = "gdiff"; - version = "1.0"; - sha256 = "35257b1090cf78f95d24c7a89920863c1d824652311fa5793693d7d06d96517b"; + version = "1.1"; + sha256 = "1d0d8f8bfw7ld6a1d5y6syzdha5qsm909mqzd5gfqcbi2wnh8aqc"; meta = { + homepage = "https://github.com/eelco/gdiff"; description = "Generic diff and patch"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/generic-aeson/default.nix b/pkgs/development/libraries/haskell/generic-aeson/default.nix index 209cbb7a52e34317d39a0e7d657737259f45c24c..9c18b511efc027afb7bb37da66d48230748af1de 100644 --- a/pkgs/development/libraries/haskell/generic-aeson/default.nix +++ b/pkgs/development/libraries/haskell/generic-aeson/default.nix @@ -1,17 +1,16 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, aeson, attoparsec, genericDeriving, HUnit, mtl, tagged -, text, vector +{ cabal, aeson, attoparsec, genericDeriving, mtl, tagged, text +, vector }: cabal.mkDerivation (self: { pname = "generic-aeson"; - version = "0.1.0.3"; - sha256 = "1svbjgd8g1ljximqb4pph9lvsswgvkj46jkqq8lzmh9ql385g2vp"; + version = "0.1.1.1"; + sha256 = "14jpma2p4dxmzpwd557igbg7xhgdzp9w9fm6dxa06sgfqxvb7ln1"; buildDepends = [ aeson attoparsec genericDeriving mtl tagged text vector ]; - testDepends = [ aeson attoparsec HUnit ]; meta = { description = "Derivation of Aeson instances using GHC generics"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/generic-deriving/default.nix b/pkgs/development/libraries/haskell/generic-deriving/default.nix index c1e3ee5caad5028f26fdc53ccd96f50eb5d82b22..4ec1f451788754c23977fd35de967fe7e00f1a6b 100644 --- a/pkgs/development/libraries/haskell/generic-deriving/default.nix +++ b/pkgs/development/libraries/haskell/generic-deriving/default.nix @@ -10,6 +10,5 @@ cabal.mkDerivation (self: { description = "Generic programming library for generalised deriving"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/generics-sop/default.nix b/pkgs/development/libraries/haskell/generics-sop/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..2fce6c66be5958e209fdd881a2c633c7c9df41e3 --- /dev/null +++ b/pkgs/development/libraries/haskell/generics-sop/default.nix @@ -0,0 +1,16 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, tagged }: + +cabal.mkDerivation (self: { + pname = "generics-sop"; + version = "0.1.0.2"; + sha256 = "01s3v3a29wdsps9vas8in2ks5p4d2arqp3qvmzqa7v2sz786xjra"; + buildDepends = [ tagged ]; + meta = { + description = "Generic Programming using True Sums of Products"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = with self.stdenv.lib.maintainers; [ ocharles ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/ghc-core/default.nix b/pkgs/development/libraries/haskell/ghc-core/default.nix index 60a2284fa7a5b2bbe1d6ae9a0b2c77672e9e65a2..ee92a45e87b6df9983dfe92d9880aa3d84928e60 100644 --- a/pkgs/development/libraries/haskell/ghc-core/default.nix +++ b/pkgs/development/libraries/haskell/ghc-core/default.nix @@ -14,6 +14,5 @@ cabal.mkDerivation (self: { description = "Display GHC's core and assembly output in a pager"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/ghc-events/default.nix b/pkgs/development/libraries/haskell/ghc-events/default.nix index 46dfa17063ab35e1cb54bf03c4df0078dbe6b962..580a21bd8c6c92f02af9d75301e842a72f14114e 100644 --- a/pkgs/development/libraries/haskell/ghc-events/default.nix +++ b/pkgs/development/libraries/haskell/ghc-events/default.nix @@ -16,6 +16,5 @@ cabal.mkDerivation (self: { description = "Library and tool for parsing .eventlog files from GHC"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/ghc-heap-view/default.nix b/pkgs/development/libraries/haskell/ghc-heap-view/default.nix index c32d3be53080dc6e2bbd0b742a939a620896b792..1df6885280c7d78e11d794d5b4f62f87bea7a411 100644 --- a/pkgs/development/libraries/haskell/ghc-heap-view/default.nix +++ b/pkgs/development/libraries/haskell/ghc-heap-view/default.nix @@ -8,7 +8,7 @@ cabal.mkDerivation (self: { sha256 = "1qi7f3phj2j63x1wd2cvk36945cxd84s12zs03hlrn49wzx2pf1n"; buildDepends = [ binary transformers ]; postInstall = '' - ensureDir "$out/share/ghci" + mkdir -p "$out/share/ghci" ln -s "$out/share/$pname-$version/ghci" "$out/share/ghci/$pname" ''; meta = { diff --git a/pkgs/development/libraries/haskell/ghc-mod/default.nix b/pkgs/development/libraries/haskell/ghc-mod/default.nix index b5ed78d7212fb68a695201151dfd96ff0a6d0858..a9c06e80f8af943b22d7dc9962e13cbb98707175 100644 --- a/pkgs/development/libraries/haskell/ghc-mod/default.nix +++ b/pkgs/development/libraries/haskell/ghc-mod/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "ghc-mod"; - version = "4.1.5"; - sha256 = "192v0h9nhi7xgvidyisn3rpr6kjpkibrm2b859b6a92gp0h37nnn"; + version = "4.1.6"; + sha256 = "093wafaizr2xf7vmzj6f3vs8ch0vpcmwlrja6af6hshgaj2d80qs"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -26,7 +26,7 @@ cabal.mkDerivation (self: { make rm Makefile cd .. - ensureDir "$out/share/emacs" + mkdir -p "$out/share/emacs" mv $pname-$version emacs/site-lisp mv $out/bin/ghc-mod $out/bin/.ghc-mod-wrapped cat - > $out/bin/ghc-mod <=.*|vector-algorithms|' -e 's|QuickCheck.*,|QuickCheck,|' sparse.cabal - ''; doCheck = false; meta = { homepage = "http://github.com/ekmett/sparse"; diff --git a/pkgs/development/libraries/haskell/split/0.1.4.3.nix b/pkgs/development/libraries/haskell/split/0.1.4.3.nix index d9a39e98436082ea7ae491560c8a54fcd0800e65..b30ce21e342a215dfe843381fb6f6317f0b841c0 100644 --- a/pkgs/development/libraries/haskell/split/0.1.4.3.nix +++ b/pkgs/development/libraries/haskell/split/0.1.4.3.nix @@ -11,5 +11,6 @@ cabal.mkDerivation (self: { description = "Combinator library for splitting lists"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/split/0.2.1.1.nix b/pkgs/development/libraries/haskell/split/0.2.1.1.nix index 13146b02bac4bcdf21c9728e6a55a532dbfac502..5dfcdf6de0cc57de36e980f5ebfbcca00d1c50c5 100644 --- a/pkgs/development/libraries/haskell/split/0.2.1.1.nix +++ b/pkgs/development/libraries/haskell/split/0.2.1.1.nix @@ -11,6 +11,6 @@ cabal.mkDerivation (self: { description = "Combinator library for splitting lists"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/split/0.2.2.nix b/pkgs/development/libraries/haskell/split/0.2.2.nix index fb7fce607d8060097ebe870951fd7635a40643bb..91a6b4cada3fbce7c0552007bfae6ce14f5989a7 100644 --- a/pkgs/development/libraries/haskell/split/0.2.2.nix +++ b/pkgs/development/libraries/haskell/split/0.2.2.nix @@ -12,6 +12,5 @@ cabal.mkDerivation (self: { description = "Combinator library for splitting lists"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/srcloc/default.nix b/pkgs/development/libraries/haskell/srcloc/default.nix index 5e4010920803277b22a5eb367a9b521f57f568d7..087871bbc53e43b2509ee846e5944db4eab8b998 100644 --- a/pkgs/development/libraries/haskell/srcloc/default.nix +++ b/pkgs/development/libraries/haskell/srcloc/default.nix @@ -11,6 +11,5 @@ cabal.mkDerivation (self: { description = "Data types for managing source code locations"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/stateref/default.nix b/pkgs/development/libraries/haskell/stateref/default.nix index 0534835c2b10cd76c527e39e89032ecd49a72261..b9651681351c5a541ad79d3cc0496d9f5b801234 100644 --- a/pkgs/development/libraries/haskell/stateref/default.nix +++ b/pkgs/development/libraries/haskell/stateref/default.nix @@ -12,6 +12,5 @@ cabal.mkDerivation (self: { description = "Abstraction for things that work like IORef"; license = self.stdenv.lib.licenses.publicDomain; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/statistics/default.nix b/pkgs/development/libraries/haskell/statistics/default.nix index 3d879f12b9d414df1fadfe718378ac9b1c760bcf..a24b9359aa482302364a4b23347ef86234c41602 100644 --- a/pkgs/development/libraries/haskell/statistics/default.nix +++ b/pkgs/development/libraries/haskell/statistics/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "statistics"; - version = "0.13.1.0"; - sha256 = "0y46fna0kqs8bsqbf3v1k9ppq3njd5kxf1qlvvmphydpi3x038nd"; + version = "0.13.2.1"; + sha256 = "0giibqpnjndnhvxqsr8ikcxxfhz3ws0mk3ckykq2sfwz7gkipvva"; buildDepends = [ aeson binary deepseq erf mathFunctions monadPar mwcRandom primitive vector vectorAlgorithms vectorBinaryInstances @@ -25,6 +25,5 @@ cabal.mkDerivation (self: { description = "A library of statistical types, data, and functions"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/stb-image/default.nix b/pkgs/development/libraries/haskell/stb-image/default.nix index e27c088483553f36ff3d842b825a7e12160fd030..d24b735ab76cbf8faade6d8158b17b99b150e2e6 100644 --- a/pkgs/development/libraries/haskell/stb-image/default.nix +++ b/pkgs/development/libraries/haskell/stb-image/default.nix @@ -12,6 +12,5 @@ cabal.mkDerivation (self: { description = "A wrapper around Sean Barrett's JPEG/PNG decoder"; license = self.stdenv.lib.licenses.publicDomain; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/stm-conduit/default.nix b/pkgs/development/libraries/haskell/stm-conduit/default.nix index 77d2771ed88d8acac7943ded91ae9e184f8100d7..cebb79c3344fab47c8504b289ec6f2572b13ce49 100644 --- a/pkgs/development/libraries/haskell/stm-conduit/default.nix +++ b/pkgs/development/libraries/haskell/stm-conduit/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "stm-conduit"; - version = "2.5.0"; - sha256 = "1pxs1ggyyjm4x06cirdcjaqzvz3964spv34fcf0q9ddhxm5kb30q"; + version = "2.5.1"; + sha256 = "08cnr92c442b1in46xcklni35597hbsggw97arq2f9w5sfir341q"; buildDepends = [ async cereal cerealConduit conduit conduitExtra liftedAsync liftedBase monadControl monadLoops resourcet stm stmChans diff --git a/pkgs/development/libraries/haskell/stm-containers/default.nix b/pkgs/development/libraries/haskell/stm-containers/default.nix index d93bd1a03a8acc21e464ac083718ec2190d0ff4b..91105712a6a4a4697be3a9a3086ff69668534d9b 100644 --- a/pkgs/development/libraries/haskell/stm-containers/default.nix +++ b/pkgs/development/libraries/haskell/stm-containers/default.nix @@ -1,17 +1,19 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, focus, free, hashable, HTF, lochTh, mtl, placeholders -, primitive, QuickCheck, unorderedContainers +{ cabal, basePrelude, focus, free, hashable, HTF, lochTh, mtl +, placeholders, primitive, QuickCheck, unorderedContainers }: cabal.mkDerivation (self: { pname = "stm-containers"; - version = "0.1.2"; - sha256 = "1rzxjspf0lzmviixnxv9f2wjxqhwv65fb1nws915ghs1sj774gab"; - buildDepends = [ focus hashable lochTh placeholders primitive ]; + version = "0.1.3"; + sha256 = "0ir2b6y1sqr0i68j0fqmwyysk7x9z18n84dbjppyjzzidcsrkar0"; + buildDepends = [ + basePrelude focus hashable lochTh placeholders primitive + ]; testDepends = [ - focus free hashable HTF lochTh mtl placeholders primitive - QuickCheck unorderedContainers + basePrelude focus free hashable HTF lochTh mtl placeholders + primitive QuickCheck unorderedContainers ]; doCheck = false; meta = { diff --git a/pkgs/development/libraries/haskell/stm/2.1.1.2.nix b/pkgs/development/libraries/haskell/stm/2.1.1.2.nix index 06d4bb209155f8472bac6c91e04c57dd07c2f93f..d69827bbb69d6046892b19cb8bf22f8b992df110 100644 --- a/pkgs/development/libraries/haskell/stm/2.1.1.2.nix +++ b/pkgs/development/libraries/haskell/stm/2.1.1.2.nix @@ -10,6 +10,6 @@ cabal.mkDerivation (self: { description = "Software Transactional Memory"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/stm/2.1.2.1.nix b/pkgs/development/libraries/haskell/stm/2.1.2.1.nix index c1569687888a77a3fae99570ed664cb290511d55..ab99000b7e7438fccfbcf8c05189477308cf0042 100644 --- a/pkgs/development/libraries/haskell/stm/2.1.2.1.nix +++ b/pkgs/development/libraries/haskell/stm/2.1.2.1.nix @@ -10,6 +10,6 @@ cabal.mkDerivation (self: { description = "Software Transactional Memory"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/stm/2.2.0.1.nix b/pkgs/development/libraries/haskell/stm/2.2.0.1.nix index e3a1893ba15e2c6371a77a7a5dd46c79f27e50e0..cfe7ff65871b91808b1e92dc6f7b8bdcc54e9eb5 100644 --- a/pkgs/development/libraries/haskell/stm/2.2.0.1.nix +++ b/pkgs/development/libraries/haskell/stm/2.2.0.1.nix @@ -10,6 +10,6 @@ cabal.mkDerivation (self: { description = "Software Transactional Memory"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/stm/2.3.nix b/pkgs/development/libraries/haskell/stm/2.3.nix index bfa9b7dcb6f9f28f69654dcf52e68e12f6712760..c5f62c9c8275e4857c711cc2c569774f2a33a0fc 100644 --- a/pkgs/development/libraries/haskell/stm/2.3.nix +++ b/pkgs/development/libraries/haskell/stm/2.3.nix @@ -10,6 +10,6 @@ cabal.mkDerivation (self: { description = "Software Transactional Memory"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/stm/2.4.2.nix b/pkgs/development/libraries/haskell/stm/2.4.2.nix index 7fc8b440935d005bbf9922e343aeea07b734eac8..f8cebde5d0b3543c80e7564cbed7d448390ee477 100644 --- a/pkgs/development/libraries/haskell/stm/2.4.2.nix +++ b/pkgs/development/libraries/haskell/stm/2.4.2.nix @@ -10,6 +10,6 @@ cabal.mkDerivation (self: { description = "Software Transactional Memory"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/stm/2.4.3.nix b/pkgs/development/libraries/haskell/stm/2.4.3.nix index 028ab05459770617b8dcbf288914e58b5a8de5bb..f6c7a7e7ce0e2fdc5cce66b9f1d677b8b37cd560 100644 --- a/pkgs/development/libraries/haskell/stm/2.4.3.nix +++ b/pkgs/development/libraries/haskell/stm/2.4.3.nix @@ -10,6 +10,5 @@ cabal.mkDerivation (self: { description = "Software Transactional Memory"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/stm/2.4.nix b/pkgs/development/libraries/haskell/stm/2.4.nix index 91fdea09202f54c7bb795baebacd7fed2928c9d5..6007e845e9b8fc3f7742034f9beafcd80462dc42 100644 --- a/pkgs/development/libraries/haskell/stm/2.4.nix +++ b/pkgs/development/libraries/haskell/stm/2.4.nix @@ -10,6 +10,6 @@ cabal.mkDerivation (self: { description = "Software Transactional Memory"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/storable-complex/default.nix b/pkgs/development/libraries/haskell/storable-complex/default.nix index 84073b8e223d1fc1c3b8f2e7fe7da1100cd257e1..59f5e647231773e0e26639360536766bb8ea6fe1 100644 --- a/pkgs/development/libraries/haskell/storable-complex/default.nix +++ b/pkgs/development/libraries/haskell/storable-complex/default.nix @@ -10,6 +10,5 @@ cabal.mkDerivation (self: { description = "Storable instance for Complex"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/storable-record/default.nix b/pkgs/development/libraries/haskell/storable-record/default.nix index f818545d2f804d804148dc72f757aedcb3e0ba4f..fc919b195e012d5d8bf296f35a42290f8d80c3df 100644 --- a/pkgs/development/libraries/haskell/storable-record/default.nix +++ b/pkgs/development/libraries/haskell/storable-record/default.nix @@ -15,6 +15,5 @@ cabal.mkDerivation (self: { description = "Elegant definition of Storable instances for records"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/streaming-commons/default.nix b/pkgs/development/libraries/haskell/streaming-commons/default.nix index 6e8aeb10ff7e048413dad45f4ae49dcbb7286834..4e6811593916cc5a001b079bacacac4c0a8ab916 100644 --- a/pkgs/development/libraries/haskell/streaming-commons/default.nix +++ b/pkgs/development/libraries/haskell/streaming-commons/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "streaming-commons"; - version = "0.1.4"; - sha256 = "0p18sha2xa583rn9jyhylcykgrvydrwnl47c2wxf1c1yswn45iz6"; + version = "0.1.4.1"; + sha256 = "0n5xm2j5hz0hbify0yanhcrkc3pni9s2c53h22alc7pcaimdmalc"; buildDepends = [ blazeBuilder network random stm text transformers zlib ]; diff --git a/pkgs/development/libraries/haskell/streamproc/default.nix b/pkgs/development/libraries/haskell/streamproc/default.nix index b1e03c3825099da564c3f06401ab3b3fa6cb43a5..cd338472635bc9809c3c90f0f0465caf0223f765 100644 --- a/pkgs/development/libraries/haskell/streamproc/default.nix +++ b/pkgs/development/libraries/haskell/streamproc/default.nix @@ -11,9 +11,6 @@ cabal.mkDerivation (self: { description = "Stream Processer Arrow"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = with self.stdenv.lib.maintainers; [ simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/strict/default.nix b/pkgs/development/libraries/haskell/strict/default.nix index c7d9e7c154ba4ee82c8511dead417d8852806810..6b4a157431e7321a0a17202f751fe52ad9a567a5 100644 --- a/pkgs/development/libraries/haskell/strict/default.nix +++ b/pkgs/development/libraries/haskell/strict/default.nix @@ -11,6 +11,5 @@ cabal.mkDerivation (self: { description = "Strict data types and String IO"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/strictConcurrency/default.nix b/pkgs/development/libraries/haskell/strictConcurrency/default.nix index ec6791e1dda5fb7d208994494906782e452d1263..b725597ac5f313a1fe6fe52691612a044695f6c4 100644 --- a/pkgs/development/libraries/haskell/strictConcurrency/default.nix +++ b/pkgs/development/libraries/haskell/strictConcurrency/default.nix @@ -12,6 +12,5 @@ cabal.mkDerivation (self: { description = "Strict concurrency abstractions"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/string-combinators/default.nix b/pkgs/development/libraries/haskell/string-combinators/default.nix index cbc40aec5645364cf607516446d904df9434aa4c..3f4e0edf140837c98a532173c7e1e156e38a8864 100644 --- a/pkgs/development/libraries/haskell/string-combinators/default.nix +++ b/pkgs/development/libraries/haskell/string-combinators/default.nix @@ -11,6 +11,5 @@ cabal.mkDerivation (self: { description = "Polymorphic functions to build and combine stringlike values"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/stringbuilder/default.nix b/pkgs/development/libraries/haskell/stringbuilder/default.nix index e75bc82159f4b4cbc422349d1d20f85c23d58948..49a8ddd509ab92918cc522d3e2c2f6eab904f0dc 100644 --- a/pkgs/development/libraries/haskell/stringbuilder/default.nix +++ b/pkgs/development/libraries/haskell/stringbuilder/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "stringbuilder"; - version = "0.4.0"; - sha256 = "0v0lpb13khpiygfdkyzzsf64anxjykwvjsrkds836whm1bv86lhl"; + version = "0.5.0"; + sha256 = "1ap95xphqnrhv64c2a137wqslkdmb2jjd9ldb17gs1pw48k8hrl9"; testDepends = [ hspec QuickCheck ]; meta = { description = "A writer monad for multi-line string literals"; diff --git a/pkgs/development/libraries/haskell/stringsearch/default.nix b/pkgs/development/libraries/haskell/stringsearch/default.nix index 709030bb2e74f88ade4fe0109976a099a74f3b11..02ed1a698a6364009fbcbd4af100a49dac6986de 100644 --- a/pkgs/development/libraries/haskell/stringsearch/default.nix +++ b/pkgs/development/libraries/haskell/stringsearch/default.nix @@ -11,6 +11,5 @@ cabal.mkDerivation (self: { description = "Fast searching, splitting and replacing of ByteStrings"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/stripe/default.nix b/pkgs/development/libraries/haskell/stripe/default.nix index 83846eef2a8f5f814388a2faf04a157b96f28dc1..796bf3726767add503473aec711f6b9b69be766f 100644 --- a/pkgs/development/libraries/haskell/stripe/default.nix +++ b/pkgs/development/libraries/haskell/stripe/default.nix @@ -12,11 +12,12 @@ cabal.mkDerivation (self: { aeson httpConduit httpTypes mtl text time unorderedContainers utf8String ]; + jailbreak = true; meta = { homepage = "https://github.com/michaelschade/hs-stripe"; description = "A Haskell implementation of the Stripe API"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + maintainers = with self.stdenv.lib.maintainers; [ ocharles ]; }; }) diff --git a/pkgs/development/libraries/haskell/stylish-haskell/default.nix b/pkgs/development/libraries/haskell/stylish-haskell/default.nix index 8fc02625bb86e7639fbc1a4fcc9b459f21247ae2..afa664a68f90dceb2db42fce9fd217aa00f5c06c 100644 --- a/pkgs/development/libraries/haskell/stylish-haskell/default.nix +++ b/pkgs/development/libraries/haskell/stylish-haskell/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "stylish-haskell"; - version = "0.5.10.0"; - sha256 = "12sba4bbc1qzicvavlbf4wqj7xs2pk0z3ha70xsvldszhyav9zj9"; + version = "0.5.10.1"; + sha256 = "1jd2dbi844cjs012gwr5idk1jmn860ff8hy1r1s6jndsm69awbba"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/svgcairo/default.nix b/pkgs/development/libraries/haskell/svgcairo/default.nix index 01c6e4d999f51ec87e2d24b71790dc3d2f8aa5eb..d5e033f094ddf6fa681b645a2dcd1d491dd2f368 100644 --- a/pkgs/development/libraries/haskell/svgcairo/default.nix +++ b/pkgs/development/libraries/haskell/svgcairo/default.nix @@ -1,12 +1,12 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, cairo, glib, gtk2hsBuildtools, libc, librsvg, mtl }: +{ cabal, cairo, glib, gtk2hsBuildtools, libc, librsvg, mtl, text }: cabal.mkDerivation (self: { pname = "svgcairo"; - version = "0.12.5.2"; - sha256 = "0l3903fzd5pk9wmxjdmx6vyym2r90b33hs6p2sfdks2lx352i94l"; - buildDepends = [ cairo glib mtl ]; + version = "0.13.0.0"; + sha256 = "1i93dhg2fpnk38lgbfpsl97xpfgifrl7xs5nny5vj4hi8ln76ih0"; + buildDepends = [ cairo glib mtl text ]; buildTools = [ gtk2hsBuildtools ]; extraLibraries = [ libc ]; pkgconfigDepends = [ librsvg ]; @@ -15,6 +15,5 @@ cabal.mkDerivation (self: { description = "Binding to the libsvg-cairo library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/syb/0.3.3.nix b/pkgs/development/libraries/haskell/syb/0.3.3.nix index c51e561fa2e8a255618773776206371785e478c2..967bc75e52215ac0843012e3fabd1f72aa357d11 100644 --- a/pkgs/development/libraries/haskell/syb/0.3.3.nix +++ b/pkgs/development/libraries/haskell/syb/0.3.3.nix @@ -11,6 +11,6 @@ cabal.mkDerivation (self: { description = "Scrap Your Boilerplate"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/syb/0.3.6.1.nix b/pkgs/development/libraries/haskell/syb/0.3.6.1.nix index 61bebdb27f260a9b441c7188b696b7ca4226d3ce..de9da0478892664ef12329061e6470cd73820afc 100644 --- a/pkgs/development/libraries/haskell/syb/0.3.6.1.nix +++ b/pkgs/development/libraries/haskell/syb/0.3.6.1.nix @@ -11,6 +11,6 @@ cabal.mkDerivation (self: { description = "Scrap Your Boilerplate"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/syb/0.3.7.nix b/pkgs/development/libraries/haskell/syb/0.3.7.nix index 1b22446ea6c878071f556ffc83d0255a5c43cdb7..72f883e5243223d7982253ec56572285d15aaee0 100644 --- a/pkgs/development/libraries/haskell/syb/0.3.7.nix +++ b/pkgs/development/libraries/haskell/syb/0.3.7.nix @@ -11,6 +11,6 @@ cabal.mkDerivation (self: { description = "Scrap Your Boilerplate"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/syb/0.3.nix b/pkgs/development/libraries/haskell/syb/0.3.nix index e24ec591a041752aee41be766c45ec5982678e8f..355fd3671e4109a1ead8c7ab5f6bcac021c7e1c7 100644 --- a/pkgs/development/libraries/haskell/syb/0.3.nix +++ b/pkgs/development/libraries/haskell/syb/0.3.nix @@ -11,6 +11,6 @@ cabal.mkDerivation (self: { description = "Scrap Your Boilerplate"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/syb/0.4.0.nix b/pkgs/development/libraries/haskell/syb/0.4.0.nix index c6322d397a4fc218670b0edb94a2b5a1dc2eba4c..1cc6747ed16e8d5dcce7ca178fd5096a86ebc798 100644 --- a/pkgs/development/libraries/haskell/syb/0.4.0.nix +++ b/pkgs/development/libraries/haskell/syb/0.4.0.nix @@ -12,6 +12,6 @@ cabal.mkDerivation (self: { description = "Scrap Your Boilerplate"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/syb/0.4.2.nix b/pkgs/development/libraries/haskell/syb/0.4.2.nix index 288cb0bc2f7d03afbac590f3f9922c5d2a46eda9..6900c051c01f272160ed0c5b13112f7b8b783070 100644 --- a/pkgs/development/libraries/haskell/syb/0.4.2.nix +++ b/pkgs/development/libraries/haskell/syb/0.4.2.nix @@ -13,6 +13,5 @@ cabal.mkDerivation (self: { description = "Scrap Your Boilerplate"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/syb/syb-with-class-instances-text.nix b/pkgs/development/libraries/haskell/syb/syb-with-class-instances-text.nix index 9477ba0f6fcdb4eb93ef6fd8f087eb3ebda9e3f4..c69b331941c05e741f7569c822e21109eb021925 100644 --- a/pkgs/development/libraries/haskell/syb/syb-with-class-instances-text.nix +++ b/pkgs/development/libraries/haskell/syb/syb-with-class-instances-text.nix @@ -11,6 +11,5 @@ cabal.mkDerivation (self: { description = "Scrap Your Boilerplate With Class Text instance"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/syb/syb-with-class.nix b/pkgs/development/libraries/haskell/syb/syb-with-class.nix index f97221f5150723d0dbed56c92bb8f024a0a59bc2..a6e802ac5c286c34cac7326f56e74a889884f293 100644 --- a/pkgs/development/libraries/haskell/syb/syb-with-class.nix +++ b/pkgs/development/libraries/haskell/syb/syb-with-class.nix @@ -10,6 +10,5 @@ cabal.mkDerivation (self: { description = "Scrap Your Boilerplate With Class"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/symbol/default.nix b/pkgs/development/libraries/haskell/symbol/default.nix index 7fd90f55d66ea65f4194b1a411552b5d45ab4a67..4451b2c3bdb487e34edb58786f480788457d8d48 100644 --- a/pkgs/development/libraries/haskell/symbol/default.nix +++ b/pkgs/development/libraries/haskell/symbol/default.nix @@ -13,6 +13,5 @@ cabal.mkDerivation (self: { description = "A 'Symbol' type for fast symbol comparison"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/system-fileio/default.nix b/pkgs/development/libraries/haskell/system-fileio/default.nix index ad66c0eb720f1c2593bea3a706768e996ddbacef..9853c4abd08d571f30810aa33f435b6b53e25073 100644 --- a/pkgs/development/libraries/haskell/system-fileio/default.nix +++ b/pkgs/development/libraries/haskell/system-fileio/default.nix @@ -16,6 +16,5 @@ cabal.mkDerivation (self: { description = "Consistent filesystem interaction across GHC versions"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/system-filepath/default.nix b/pkgs/development/libraries/haskell/system-filepath/default.nix index e064ebe73579f6da3bf02ce2ea181d97bc141ccc..4adf48d26e7ab94d8e5c3c43f97b2de5460e1ed1 100644 --- a/pkgs/development/libraries/haskell/system-filepath/default.nix +++ b/pkgs/development/libraries/haskell/system-filepath/default.nix @@ -14,6 +14,5 @@ cabal.mkDerivation (self: { description = "High-level, byte-based file and directory path manipulations"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/tabular/default.nix b/pkgs/development/libraries/haskell/tabular/default.nix index a2f4c9fe2707ff835e3abbaa2a5163f3c2f4a0f8..57f91bcd728a86a2fd5ae68f691710fe70134576 100644 --- a/pkgs/development/libraries/haskell/tabular/default.nix +++ b/pkgs/development/libraries/haskell/tabular/default.nix @@ -13,6 +13,5 @@ cabal.mkDerivation (self: { description = "Two-dimensional data tables with rendering functions"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/tagged/default.nix b/pkgs/development/libraries/haskell/tagged/default.nix index f0256e49f9bc72dcd6d1fbf78b8a2a85dcb4b85e..903eccdfed3cd60935416666bcba059725a69952 100644 --- a/pkgs/development/libraries/haskell/tagged/default.nix +++ b/pkgs/development/libraries/haskell/tagged/default.nix @@ -11,6 +11,5 @@ cabal.mkDerivation (self: { description = "Haskell 98 phantom types to avoid unsafely passing dummy arguments"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/taggy/default.nix b/pkgs/development/libraries/haskell/taggy/default.nix index 81bc5a2981aae0f3fcf009f7e17c45acba95a6c2..d94a3b27f2c3ce0701fd964e948d03d623434cfb 100644 --- a/pkgs/development/libraries/haskell/taggy/default.nix +++ b/pkgs/development/libraries/haskell/taggy/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "taggy"; - version = "0.1"; - sha256 = "0qqz5h706k96i7gl8vvn4c044cd5wj1zjlr6cnlxxpii0pyiiwh1"; + version = "0.1.2"; + sha256 = "0sj7da4yawfajyrd2gg2dxzgj5n99mdm5cz3bdhfipas4bb4216y"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/tagsoup/default.nix b/pkgs/development/libraries/haskell/tagsoup/default.nix index a235aa1dff6333e3889a997d393aef23f1d91c14..35d004445fc2e344f3c21fd5aeb89436f41c13b4 100644 --- a/pkgs/development/libraries/haskell/tagsoup/default.nix +++ b/pkgs/development/libraries/haskell/tagsoup/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "tagsoup"; - version = "0.13.1"; - sha256 = "0p1mwyjk2bvpavjm1kgdjnahj0q4nhynix3653s0i0kvhw70450k"; + version = "0.13.2"; + sha256 = "0q9r4vsdlib6dm0b387zg089b1410f0nspzigx2awqi2xqfsi0xz"; isLibrary = true; isExecutable = true; buildDepends = [ text ]; @@ -14,6 +14,5 @@ cabal.mkDerivation (self: { description = "Parsing and extracting information from (possibly malformed) HTML/XML documents"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/tar/default.nix b/pkgs/development/libraries/haskell/tar/default.nix index e863832ea08ce1aec8a466b8c97df978a7ea960c..be98c2041562f39a2b5c52332541c050e6bbb20d 100644 --- a/pkgs/development/libraries/haskell/tar/default.nix +++ b/pkgs/development/libraries/haskell/tar/default.nix @@ -12,6 +12,5 @@ cabal.mkDerivation (self: { description = "Reading, writing and manipulating \".tar\" archive files."; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/tasty-ant-xml/default.nix b/pkgs/development/libraries/haskell/tasty-ant-xml/default.nix index b892344dc7c3298a290413970e5a3c424c0cb2eb..9f8e59322b04265822550926e81936a74f6d63bd 100644 --- a/pkgs/development/libraries/haskell/tasty-ant-xml/default.nix +++ b/pkgs/development/libraries/haskell/tasty-ant-xml/default.nix @@ -16,6 +16,6 @@ cabal.mkDerivation (self: { description = "Render tasty output to XML for Jenkins"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + maintainers = with self.stdenv.lib.maintainers; [ ocharles ]; }; }) diff --git a/pkgs/development/libraries/haskell/tasty-golden/default.nix b/pkgs/development/libraries/haskell/tasty-golden/default.nix index ea81aa6bea5bdb220dcc5e0e23538b4df6d008fd..5f2efb3520f7a8c66d9c4ec2040fc2cb11d98eff 100644 --- a/pkgs/development/libraries/haskell/tasty-golden/default.nix +++ b/pkgs/development/libraries/haskell/tasty-golden/default.nix @@ -18,6 +18,6 @@ cabal.mkDerivation (self: { description = "Golden tests support for tasty"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + maintainers = with self.stdenv.lib.maintainers; [ ocharles ]; }; }) diff --git a/pkgs/development/libraries/haskell/tasty-hspec/default.nix b/pkgs/development/libraries/haskell/tasty-hspec/default.nix index aad94da7c5e9c8b9e454714a2612146432f36a02..8c3083d07fe99cd531e8d6edbd5e68d0464f486c 100644 --- a/pkgs/development/libraries/haskell/tasty-hspec/default.nix +++ b/pkgs/development/libraries/haskell/tasty-hspec/default.nix @@ -12,6 +12,6 @@ cabal.mkDerivation (self: { description = "Hspec support for the Tasty test framework"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + maintainers = with self.stdenv.lib.maintainers; [ ocharles ]; }; }) diff --git a/pkgs/development/libraries/haskell/tasty-hunit/default.nix b/pkgs/development/libraries/haskell/tasty-hunit/default.nix index 2492f673441d62bd48fdf330dd936123f1f73c21..c7e5b53548fa6e9a208e0e48ea544066338cb08f 100644 --- a/pkgs/development/libraries/haskell/tasty-hunit/default.nix +++ b/pkgs/development/libraries/haskell/tasty-hunit/default.nix @@ -11,6 +11,6 @@ cabal.mkDerivation (self: { description = "HUnit support for the Tasty test framework"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + maintainers = with self.stdenv.lib.maintainers; [ ocharles ]; }; }) diff --git a/pkgs/development/libraries/haskell/tasty-quickcheck/default.nix b/pkgs/development/libraries/haskell/tasty-quickcheck/default.nix index 8a5c1b5d79922babbe2e7c0b9ea1c0547ff37c69..f4af3a19097270bc4a1ca8d9cf54e5df1bb740fd 100644 --- a/pkgs/development/libraries/haskell/tasty-quickcheck/default.nix +++ b/pkgs/development/libraries/haskell/tasty-quickcheck/default.nix @@ -11,6 +11,6 @@ cabal.mkDerivation (self: { description = "QuickCheck support for the Tasty test framework"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + maintainers = with self.stdenv.lib.maintainers; [ ocharles ]; }; }) diff --git a/pkgs/development/libraries/haskell/tasty-rerun/default.nix b/pkgs/development/libraries/haskell/tasty-rerun/default.nix index 6893bccee425674cd9580fa46ea09710da2b0493..326392718bad312d4a790fb88996cf0041c2de35 100644 --- a/pkgs/development/libraries/haskell/tasty-rerun/default.nix +++ b/pkgs/development/libraries/haskell/tasty-rerun/default.nix @@ -17,6 +17,6 @@ cabal.mkDerivation (self: { description = "Run tests by filtering the test tree depending on the result of previous test runs"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + maintainers = with self.stdenv.lib.maintainers; [ ocharles ]; }; }) diff --git a/pkgs/development/libraries/haskell/tasty-smallcheck/default.nix b/pkgs/development/libraries/haskell/tasty-smallcheck/default.nix index 5df9ad4ee41041a96de33757739f001f28f10037..ea1a37d5e9b5a0e03b71390448170cde4be2362c 100644 --- a/pkgs/development/libraries/haskell/tasty-smallcheck/default.nix +++ b/pkgs/development/libraries/haskell/tasty-smallcheck/default.nix @@ -12,6 +12,6 @@ cabal.mkDerivation (self: { description = "SmallCheck support for the Tasty test framework"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + maintainers = with self.stdenv.lib.maintainers; [ ocharles ]; }; }) diff --git a/pkgs/development/libraries/haskell/tasty-th/default.nix b/pkgs/development/libraries/haskell/tasty-th/default.nix index 7c9bcbbce00d3634103c6cc7cb303c53ae34f75a..2679c57cff0741cea2ea24b08b1ad2b80b8c0ec3 100644 --- a/pkgs/development/libraries/haskell/tasty-th/default.nix +++ b/pkgs/development/libraries/haskell/tasty-th/default.nix @@ -12,6 +12,6 @@ cabal.mkDerivation (self: { description = "Automagically generate the HUnit- and Quickcheck-bulk-code using Template Haskell"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + maintainers = with self.stdenv.lib.maintainers; [ ocharles ]; }; }) diff --git a/pkgs/development/libraries/haskell/tasty/default.nix b/pkgs/development/libraries/haskell/tasty/default.nix index 661bc739e90b1b45d9f6a9fc40a6ad5335808429..6303320460fb793b70398915f1a1a2d76037d3e9 100644 --- a/pkgs/development/libraries/haskell/tasty/default.nix +++ b/pkgs/development/libraries/haskell/tasty/default.nix @@ -17,6 +17,6 @@ cabal.mkDerivation (self: { description = "Modern and extensible testing framework"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + maintainers = with self.stdenv.lib.maintainers; [ ocharles ]; }; }) diff --git a/pkgs/development/libraries/haskell/tcache-AWS/default.nix b/pkgs/development/libraries/haskell/tcache-AWS/default.nix index 37d7fef05afebcdf877467768fd8359895be13f8..5f1ae4938d1bc61d2de871aeffc729966b2134da 100644 --- a/pkgs/development/libraries/haskell/tcache-AWS/default.nix +++ b/pkgs/development/libraries/haskell/tcache-AWS/default.nix @@ -11,6 +11,6 @@ cabal.mkDerivation (self: { description = "tcache using Amazon Web Services as default persistence mechanism"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.tomberek ]; + maintainers = with self.stdenv.lib.maintainers; [ tomberek ]; }; }) diff --git a/pkgs/development/libraries/haskell/temporary/default.nix b/pkgs/development/libraries/haskell/temporary/default.nix index 3845fe791989050591264b635d0d013507e74121..8a048744636a4070a416dc1f31a0bc48dc69a2a4 100644 --- a/pkgs/development/libraries/haskell/temporary/default.nix +++ b/pkgs/development/libraries/haskell/temporary/default.nix @@ -13,6 +13,5 @@ cabal.mkDerivation (self: { description = "Portable temporary file and directory support for Windows and Unix, based on code from Cabal"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/terminfo/0.3.2.6.nix b/pkgs/development/libraries/haskell/terminfo/0.3.2.6.nix index 6f00bffc393441fc4127a3ec537867f512cdc5aa..6a065cb6e84514041bb89f9c0828bfa89c50c249 100644 --- a/pkgs/development/libraries/haskell/terminfo/0.3.2.6.nix +++ b/pkgs/development/libraries/haskell/terminfo/0.3.2.6.nix @@ -12,6 +12,6 @@ cabal.mkDerivation (self: { description = "Haskell bindings to the terminfo library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/terminfo/0.4.0.0.nix b/pkgs/development/libraries/haskell/terminfo/0.4.0.0.nix index d806680420dd5d55688720c3d79bad90396afd36..9bb59e14a1e6228e53a85a01d6941c801c0fa068 100644 --- a/pkgs/development/libraries/haskell/terminfo/0.4.0.0.nix +++ b/pkgs/development/libraries/haskell/terminfo/0.4.0.0.nix @@ -12,6 +12,5 @@ cabal.mkDerivation (self: { description = "Haskell bindings to the terminfo library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/test-framework-hunit/default.nix b/pkgs/development/libraries/haskell/test-framework-hunit/default.nix index a62d4cf115d403c128474acf41d1a478c83fc513..12919ec17b8beec10e436e0d7f38d9c084e8eaea 100644 --- a/pkgs/development/libraries/haskell/test-framework-hunit/default.nix +++ b/pkgs/development/libraries/haskell/test-framework-hunit/default.nix @@ -12,6 +12,5 @@ cabal.mkDerivation (self: { description = "HUnit support for the test-framework package"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/test-framework-quickcheck/default.nix b/pkgs/development/libraries/haskell/test-framework-quickcheck/default.nix index a328edfab3ec2214202475917ae2a3a0f1b4c2bb..5b822c2418c849708afaf1c1628dacb61e9b9b86 100644 --- a/pkgs/development/libraries/haskell/test-framework-quickcheck/default.nix +++ b/pkgs/development/libraries/haskell/test-framework-quickcheck/default.nix @@ -16,6 +16,5 @@ cabal.mkDerivation (self: { description = "QuickCheck support for the test-framework package"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/test-framework-quickcheck2/default.nix b/pkgs/development/libraries/haskell/test-framework-quickcheck2/default.nix index 70c2e0c36c9f159b2447f5a201a7a02bdbcd43bd..a012d8a047e24a9a849a88251f2b75570188fc79 100644 --- a/pkgs/development/libraries/haskell/test-framework-quickcheck2/default.nix +++ b/pkgs/development/libraries/haskell/test-framework-quickcheck2/default.nix @@ -15,6 +15,5 @@ cabal.mkDerivation (self: { description = "QuickCheck2 support for the test-framework package"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/test-framework-th/default.nix b/pkgs/development/libraries/haskell/test-framework-th/default.nix index a90c3117cd4d351d2ffd839b7cdf893ee4f213a2..21c719c538d8a5f62b640f8bd984ce10d9bbdd03 100644 --- a/pkgs/development/libraries/haskell/test-framework-th/default.nix +++ b/pkgs/development/libraries/haskell/test-framework-th/default.nix @@ -16,6 +16,5 @@ cabal.mkDerivation (self: { description = "Automagically generate the HUnit- and Quickcheck-bulk-code using Template Haskell"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/test-framework/default.nix b/pkgs/development/libraries/haskell/test-framework/default.nix index 4f204bb308de74976b8a7535c718529e8a80307f..e17ca346e7fad26adf488cdd6c387752467313ff 100644 --- a/pkgs/development/libraries/haskell/test-framework/default.nix +++ b/pkgs/development/libraries/haskell/test-framework/default.nix @@ -18,6 +18,5 @@ cabal.mkDerivation (self: { description = "Framework for running and organising tests, with HUnit and QuickCheck support"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/texmath/default.nix b/pkgs/development/libraries/haskell/texmath/default.nix index dac1add7cb967ddec51bbf8aa979eccf1983f083..725b029d463300ccd8451f4666405c389fb45497 100644 --- a/pkgs/development/libraries/haskell/texmath/default.nix +++ b/pkgs/development/libraries/haskell/texmath/default.nix @@ -14,6 +14,5 @@ cabal.mkDerivation (self: { description = "Conversion of LaTeX math formulas to MathML or OMML"; license = "GPL"; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/text/0.11.0.5.nix b/pkgs/development/libraries/haskell/text/0.11.0.5.nix index fbd0b62607f3a1c44625dfab004354d2b6e23ece..5f63f68cfe76ea8f41f027147830eed676cda017 100644 --- a/pkgs/development/libraries/haskell/text/0.11.0.5.nix +++ b/pkgs/development/libraries/haskell/text/0.11.0.5.nix @@ -13,6 +13,6 @@ cabal.mkDerivation (self: { description = "An efficient packed Unicode text type"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/text/0.11.0.6.nix b/pkgs/development/libraries/haskell/text/0.11.0.6.nix index eab5417a0a6249be45299540468cc77de528b0d8..c922db7e9597c80188bb3ca030e693c60629fc44 100644 --- a/pkgs/development/libraries/haskell/text/0.11.0.6.nix +++ b/pkgs/development/libraries/haskell/text/0.11.0.6.nix @@ -13,6 +13,6 @@ cabal.mkDerivation (self: { description = "An efficient packed Unicode text type"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/text/0.11.1.5.nix b/pkgs/development/libraries/haskell/text/0.11.1.5.nix index 52a935faa722cd8d866ff178e56293804b79f8e9..afaa25305a32ad4712796f4abd9f5b4c84ac57c2 100644 --- a/pkgs/development/libraries/haskell/text/0.11.1.5.nix +++ b/pkgs/development/libraries/haskell/text/0.11.1.5.nix @@ -13,6 +13,6 @@ cabal.mkDerivation (self: { description = "An efficient packed Unicode text type"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/text/0.11.2.0.nix b/pkgs/development/libraries/haskell/text/0.11.2.0.nix index 8ab44a1372d352ff1cff48b24e0d990e16fd4043..f465f4c2afc5af80db77aac0f1443da13457cf33 100644 --- a/pkgs/development/libraries/haskell/text/0.11.2.0.nix +++ b/pkgs/development/libraries/haskell/text/0.11.2.0.nix @@ -19,6 +19,6 @@ cabal.mkDerivation (self: { description = "An efficient packed Unicode text type"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/text/0.11.2.3.nix b/pkgs/development/libraries/haskell/text/0.11.2.3.nix index ac7b4714fdc293b17feb1a26f640ecdbef110151..05a0f899f93b52e4f6172f99b467e28831d0affa 100644 --- a/pkgs/development/libraries/haskell/text/0.11.2.3.nix +++ b/pkgs/development/libraries/haskell/text/0.11.2.3.nix @@ -19,6 +19,6 @@ cabal.mkDerivation (self: { description = "An efficient packed Unicode text type"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/text/0.11.3.1.nix b/pkgs/development/libraries/haskell/text/0.11.3.1.nix index 67f322e6990ffe4758bbc09f3c2eedea51c0c45f..6cbed7c1268d63e386c8d38e97b2a58d885a08f6 100644 --- a/pkgs/development/libraries/haskell/text/0.11.3.1.nix +++ b/pkgs/development/libraries/haskell/text/0.11.3.1.nix @@ -19,6 +19,6 @@ cabal.mkDerivation (self: { description = "An efficient packed Unicode text type"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/text/1.1.1.3.nix b/pkgs/development/libraries/haskell/text/1.1.1.3.nix index d130219667da512f48b593da62fc4340160aac41..7a61b4bbd3a36e21db39785375fedb7efc712bc2 100644 --- a/pkgs/development/libraries/haskell/text/1.1.1.3.nix +++ b/pkgs/development/libraries/haskell/text/1.1.1.3.nix @@ -19,6 +19,5 @@ cabal.mkDerivation (self: { description = "An efficient packed Unicode text type"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/th-desugar/default.nix b/pkgs/development/libraries/haskell/th-desugar/default.nix index c6493736001d2bfc46e1cb37bd588b0eeaf3f90a..94919bba6e4353557b54ebc5013aa7083c821bbc 100644 --- a/pkgs/development/libraries/haskell/th-desugar/default.nix +++ b/pkgs/development/libraries/haskell/th-desugar/default.nix @@ -8,11 +8,12 @@ cabal.mkDerivation (self: { sha256 = "16l0khjx2wppnm9spp6mg659m95hxjkzfv3pjw5ays3z6clhx8b9"; buildDepends = [ mtl syb ]; testDepends = [ hspec HUnit mtl syb ]; + doCheck = false; meta = { homepage = "http://www.cis.upenn.edu/~eir/packages/th-desugar"; description = "Functions to desugar Template Haskell"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + maintainers = with self.stdenv.lib.maintainers; [ ocharles ]; }; }) diff --git a/pkgs/development/libraries/haskell/th-extras/default.nix b/pkgs/development/libraries/haskell/th-extras/default.nix index 2bc598005f49af8fcf5ae21a4ff7744168b3ebae..285329912dfe157fb78c422371a037f73f20c34d 100644 --- a/pkgs/development/libraries/haskell/th-extras/default.nix +++ b/pkgs/development/libraries/haskell/th-extras/default.nix @@ -12,6 +12,5 @@ cabal.mkDerivation (self: { description = "A grab bag of functions for use with Template Haskell"; license = self.stdenv.lib.licenses.publicDomain; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/th-lift/default.nix b/pkgs/development/libraries/haskell/th-lift/default.nix index 9ca43633ead16c1b598f3284bd6659e52d401e26..a27360632b9ba9319f7e2bfe11e7511f8df1e775 100644 --- a/pkgs/development/libraries/haskell/th-lift/default.nix +++ b/pkgs/development/libraries/haskell/th-lift/default.nix @@ -10,6 +10,5 @@ cabal.mkDerivation (self: { description = "Derive Template Haskell's Lift class for datatypes"; license = "unknown"; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/thespian/default.nix b/pkgs/development/libraries/haskell/thespian/default.nix index 22861c4a9082580b4ad627570d3b59e1c4dd1c7c..8d10ea06ae5f089dac07b4cacf216760fcdff2e1 100644 --- a/pkgs/development/libraries/haskell/thespian/default.nix +++ b/pkgs/development/libraries/haskell/thespian/default.nix @@ -12,6 +12,5 @@ cabal.mkDerivation (self: { description = "Lightweight Erlang-style actors for Haskell"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/threadmanager/default.nix b/pkgs/development/libraries/haskell/threadmanager/default.nix index 320b750cb330b417ecb8daf5c52d1f9c60317ddc..92942a55e162847142103f6872888f7ea9898a39 100644 --- a/pkgs/development/libraries/haskell/threadmanager/default.nix +++ b/pkgs/development/libraries/haskell/threadmanager/default.nix @@ -10,6 +10,5 @@ cabal.mkDerivation (self: { description = "(deprecated in favor of 'threads') Simple thread management"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/threepenny-gui/default.nix b/pkgs/development/libraries/haskell/threepenny-gui/default.nix index d31c43538d31850377b0d86c94c636910f66eede..fad37db7c9c3b8f3a781adadb0efc6c45847e88d 100644 --- a/pkgs/development/libraries/haskell/threepenny-gui/default.nix +++ b/pkgs/development/libraries/haskell/threepenny-gui/default.nix @@ -19,11 +19,12 @@ cabal.mkDerivation (self: { time transformers unorderedContainers utf8String vault websockets websocketsSnap ]; + jailbreak = true; meta = { homepage = "http://www.haskell.org/haskellwiki/Threepenny-gui"; description = "GUI framework that uses the web browser as a display"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + maintainers = with self.stdenv.lib.maintainers; [ ocharles ]; }; }) diff --git a/pkgs/development/libraries/haskell/thyme/default.nix b/pkgs/development/libraries/haskell/thyme/default.nix index b646fe4d1559f659f8edeaea5d4f88a8fac656f3..187637011264ea96fff7ea956f0bf657d7b6bbe2 100644 --- a/pkgs/development/libraries/haskell/thyme/default.nix +++ b/pkgs/development/libraries/haskell/thyme/default.nix @@ -1,6 +1,6 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, aeson, attoparsec, Cabal, deepseq, filepath, mtl +{ cabal, aeson, attoparsec, Cabal, cpphs, deepseq, filepath, mtl , profunctors, QuickCheck, random, systemPosixRedirect, text, time , vector, vectorSpace, vectorThUnbox }: @@ -17,6 +17,7 @@ cabal.mkDerivation (self: { attoparsec Cabal filepath mtl profunctors QuickCheck random systemPosixRedirect text time vectorSpace ]; + buildTools = [ cpphs ]; doCheck = false; meta = { homepage = "https://github.com/liyang/thyme"; diff --git a/pkgs/development/libraries/haskell/time/1.1.2.4.nix b/pkgs/development/libraries/haskell/time/1.1.2.4.nix index b2fffb39cd3cd713b24be4c7375f6371474619d9..97bdaa852b58137e2ec3140851ef8135c28dfda1 100644 --- a/pkgs/development/libraries/haskell/time/1.1.2.4.nix +++ b/pkgs/development/libraries/haskell/time/1.1.2.4.nix @@ -11,6 +11,6 @@ cabal.mkDerivation (self: { description = "A time library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/time/1.4.2.nix b/pkgs/development/libraries/haskell/time/1.4.2.nix index ba986cf76abdb5f5861fac47832d95b3c7a68f8b..f838080ad3d9c1be46afc5415fe2248c2f738d4f 100644 --- a/pkgs/development/libraries/haskell/time/1.4.2.nix +++ b/pkgs/development/libraries/haskell/time/1.4.2.nix @@ -17,6 +17,5 @@ cabal.mkDerivation (self: { description = "A time library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/timezone-olson/default.nix b/pkgs/development/libraries/haskell/timezone-olson/default.nix index cfd4c7fa7f5909257a671e3e070930f36b8d7315..236cedc9c1fa98b775531d3a3486ce4de6421878 100644 --- a/pkgs/development/libraries/haskell/timezone-olson/default.nix +++ b/pkgs/development/libraries/haskell/timezone-olson/default.nix @@ -12,6 +12,6 @@ cabal.mkDerivation (self: { description = "A pure Haskell parser and renderer for binary Olson timezone files"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + maintainers = with self.stdenv.lib.maintainers; [ ocharles ]; }; }) diff --git a/pkgs/development/libraries/haskell/timezone-series/default.nix b/pkgs/development/libraries/haskell/timezone-series/default.nix index 2092c176de76f7e363943a739cb6e162e64a04bb..d12ae9aec05843f2d93322f857f43ff91bf3db77 100644 --- a/pkgs/development/libraries/haskell/timezone-series/default.nix +++ b/pkgs/development/libraries/haskell/timezone-series/default.nix @@ -12,6 +12,6 @@ cabal.mkDerivation (self: { description = "Enhanced timezone handling for Data.Time"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + maintainers = with self.stdenv.lib.maintainers; [ ocharles ]; }; }) diff --git a/pkgs/development/libraries/haskell/tls/1.1.5.nix b/pkgs/development/libraries/haskell/tls/1.1.5.nix index 747f2edfc43d4269700241454a614e778cd43f1c..ddb1651fd1008eda2cc3d6a5f05e7fd33ec78738 100644 --- a/pkgs/development/libraries/haskell/tls/1.1.5.nix +++ b/pkgs/development/libraries/haskell/tls/1.1.5.nix @@ -22,6 +22,6 @@ cabal.mkDerivation (self: { description = "TLS/SSL protocol native implementation (Server and Client)"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/tls/1.2.8.nix b/pkgs/development/libraries/haskell/tls/1.2.8.nix index 5c1098be62f3668196a6776ad5e3d311676522c7..22eb615a6571fc9a60581c2c45780782151cb177 100644 --- a/pkgs/development/libraries/haskell/tls/1.2.8.nix +++ b/pkgs/development/libraries/haskell/tls/1.2.8.nix @@ -28,6 +28,5 @@ cabal.mkDerivation (self: { description = "TLS/SSL protocol native implementation (Server and Client)"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/transformers-base/default.nix b/pkgs/development/libraries/haskell/transformers-base/default.nix index ec3f740b66e65c810923c992367aa80b037abd99..d7b9f53951c55b95bbc8ae1d45bb180f6053a347 100644 --- a/pkgs/development/libraries/haskell/transformers-base/default.nix +++ b/pkgs/development/libraries/haskell/transformers-base/default.nix @@ -1,17 +1,16 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, transformers }: +{ cabal, stm, transformers }: cabal.mkDerivation (self: { pname = "transformers-base"; - version = "0.4.2"; - sha256 = "030w5p209bam77z6grq6279qwvwip1ax7phrc5wanxrshiw8699m"; - buildDepends = [ transformers ]; + version = "0.4.3"; + sha256 = "0bklr7piiipnh99jnqx262pdyb9hzk852d6hzk5sqppvz5ndcf4y"; + buildDepends = [ stm transformers ]; meta = { homepage = "https://github.com/mvv/transformers-base"; description = "Lift computations from the bottom of a transformer stack"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/transformers-compat/0.3.3.nix b/pkgs/development/libraries/haskell/transformers-compat/0.3.3.nix index b16522891c0ae4e550f3fa7effc9d5574c9c6051..4ff5df9d1c546db1c1ca6bd7be635cdd801c73fb 100644 --- a/pkgs/development/libraries/haskell/transformers-compat/0.3.3.nix +++ b/pkgs/development/libraries/haskell/transformers-compat/0.3.3.nix @@ -12,5 +12,6 @@ cabal.mkDerivation (self: { description = "A small compatibility shim exposing the new types from transformers 0.3 and 0.4 to older Haskell platforms."; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/transformers-free/default.nix b/pkgs/development/libraries/haskell/transformers-free/default.nix index 929b41fdefe77a85513f8d19eb6b6c5a3700650d..c989d620f40c065e05033ea8333c068b771c7e28 100644 --- a/pkgs/development/libraries/haskell/transformers-free/default.nix +++ b/pkgs/development/libraries/haskell/transformers-free/default.nix @@ -11,6 +11,6 @@ cabal.mkDerivation (self: { description = "Free monad transformers"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.ianwookim ]; + maintainers = with self.stdenv.lib.maintainers; [ ianwookim ]; }; }) diff --git a/pkgs/development/libraries/haskell/transformers/0.2.2.0.nix b/pkgs/development/libraries/haskell/transformers/0.2.2.0.nix index 941de0d077d44700deb59a55079431803fc53942..cb3dd611ef36a991984b09b035631eb8b6879fb5 100644 --- a/pkgs/development/libraries/haskell/transformers/0.2.2.0.nix +++ b/pkgs/development/libraries/haskell/transformers/0.2.2.0.nix @@ -10,6 +10,6 @@ cabal.mkDerivation (self: { description = "Concrete functor and monad transformers"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/transformers/0.3.0.0.nix b/pkgs/development/libraries/haskell/transformers/0.3.0.0.nix index 8c994468dba7e6ce65f290ff0fcfb6243e8be19f..fe2b0f91ef9cf45bca93fbea03a0634c916848d2 100644 --- a/pkgs/development/libraries/haskell/transformers/0.3.0.0.nix +++ b/pkgs/development/libraries/haskell/transformers/0.3.0.0.nix @@ -10,6 +10,6 @@ cabal.mkDerivation (self: { description = "Concrete functor and monad transformers"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/transformers/0.4.1.0.nix b/pkgs/development/libraries/haskell/transformers/0.4.1.0.nix index 85fee8ad79fb5e0117f5da13a8205df3ec434507..d705040387bda31a0ead50b4178e87d2cd56b92a 100644 --- a/pkgs/development/libraries/haskell/transformers/0.4.1.0.nix +++ b/pkgs/development/libraries/haskell/transformers/0.4.1.0.nix @@ -11,6 +11,5 @@ cabal.mkDerivation (self: { description = "Concrete functor and monad transformers"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/traverse-with-class/default.nix b/pkgs/development/libraries/haskell/traverse-with-class/default.nix index f36be260c5504416741203f1b3c7b9488e7ad32f..50d5c61dd098f60e4e1254fe6dc32aa0991d66f0 100644 --- a/pkgs/development/libraries/haskell/traverse-with-class/default.nix +++ b/pkgs/development/libraries/haskell/traverse-with-class/default.nix @@ -11,6 +11,6 @@ cabal.mkDerivation (self: { description = "Generic applicative traversals"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + maintainers = with self.stdenv.lib.maintainers; [ ocharles ]; }; }) diff --git a/pkgs/development/libraries/haskell/trifecta/default.nix b/pkgs/development/libraries/haskell/trifecta/default.nix index 192164c3189e35d58b5011c9ed2d94650f543c0a..a73f47afb1c2d9c44b386bea10ac1e13190dde5e 100644 --- a/pkgs/development/libraries/haskell/trifecta/default.nix +++ b/pkgs/development/libraries/haskell/trifecta/default.nix @@ -2,20 +2,20 @@ { cabal, ansiTerminal, ansiWlPprint, blazeBuilder, blazeHtml , blazeMarkup, charset, comonad, deepseq, doctest, filepath -, fingertree, hashable, lens, mtl, parsers, reducers, semigroups -, transformers, unorderedContainers, utf8String +, fingertree, hashable, lens, mtl, parsers, QuickCheck, reducers +, semigroups, transformers, unorderedContainers, utf8String }: cabal.mkDerivation (self: { pname = "trifecta"; - version = "1.4.2"; - sha256 = "13kj1xz2bxixsqsrywdx3snl1hjkyv437ifwfrys1m4hnkv4aqai"; + version = "1.5.1"; + sha256 = "1fayr6sd9m84rqpcygacafn9vr9zva7rmkpvyzz0bf1p1z7i6b2n"; buildDepends = [ ansiTerminal ansiWlPprint blazeBuilder blazeHtml blazeMarkup charset comonad deepseq fingertree hashable lens mtl parsers reducers semigroups transformers unorderedContainers utf8String ]; - testDepends = [ doctest filepath ]; + testDepends = [ doctest filepath parsers QuickCheck ]; meta = { homepage = "http://github.com/ekmett/trifecta/"; description = "A modern parser combinator library with convenient diagnostics"; diff --git a/pkgs/development/libraries/haskell/tuple/default.nix b/pkgs/development/libraries/haskell/tuple/default.nix index 332e38305e7a85737c52e07f7e9c87401e592f1f..974c2fe140b8b0d648b17bd733f7112f12f3eac5 100644 --- a/pkgs/development/libraries/haskell/tuple/default.nix +++ b/pkgs/development/libraries/haskell/tuple/default.nix @@ -11,6 +11,5 @@ cabal.mkDerivation (self: { description = "Various functions on tuples"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/twitter-conduit/default.nix b/pkgs/development/libraries/haskell/twitter-conduit/default.nix index 11ca4f491a8826d52aced5d02d6c8f85bf7d79ca..bf2652fa792e2388746459f20a9458d77045f637 100644 --- a/pkgs/development/libraries/haskell/twitter-conduit/default.nix +++ b/pkgs/development/libraries/haskell/twitter-conduit/default.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "twitter-conduit"; - version = "0.0.5.2"; - sha256 = "0kcdf440fy998qy232mg8k9i97lwvgwzzv990a07m4hj771pp3fh"; + version = "0.0.5.5"; + sha256 = "13wk863xjlg8g62yhbq4aar7z77n0awh500l6v41fam99lihzxab"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -30,6 +30,6 @@ cabal.mkDerivation (self: { description = "Twitter API package with conduit interface and Streaming API support"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + maintainers = with self.stdenv.lib.maintainers; [ ocharles ]; }; }) diff --git a/pkgs/development/libraries/haskell/twitter-types/default.nix b/pkgs/development/libraries/haskell/twitter-types/default.nix index f87230271f13a435a661bd882d4908760025778b..1848211dc3e8276263ad0c50acffdd13042639c9 100644 --- a/pkgs/development/libraries/haskell/twitter-types/default.nix +++ b/pkgs/development/libraries/haskell/twitter-types/default.nix @@ -1,17 +1,17 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, aeson, attoparsec, httpTypes, HUnit, shakespeare +{ cabal, aeson, attoparsec, filepath, httpTypes, HUnit , testFramework, testFrameworkHunit, testFrameworkThPrime, text , unorderedContainers }: cabal.mkDerivation (self: { pname = "twitter-types"; - version = "0.3.20140620"; - sha256 = "02mwdgz1l1z5k5k78bjnnbabcr27xixli1gqk6rmqrarcylybvll"; + version = "0.4.20140809"; + sha256 = "0f32gjvpzcy5ld2j6mhsvaxaiyzyp5pvqjvmgawaiy78c3kxi8gh"; buildDepends = [ aeson httpTypes text unorderedContainers ]; testDepends = [ - aeson attoparsec httpTypes HUnit shakespeare testFramework + aeson attoparsec filepath httpTypes HUnit testFramework testFrameworkHunit testFrameworkThPrime text unorderedContainers ]; doCheck = false; @@ -20,6 +20,6 @@ cabal.mkDerivation (self: { description = "Twitter JSON parser and types"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + maintainers = with self.stdenv.lib.maintainers; [ ocharles ]; }; }) diff --git a/pkgs/development/libraries/haskell/type-eq/default.nix b/pkgs/development/libraries/haskell/type-eq/default.nix index 0a5de6fa9fcb84c2a4e4da0cd9f080ca73d50783..89b6398c5e065a3828ce1042b4b707145281bb79 100644 --- a/pkgs/development/libraries/haskell/type-eq/default.nix +++ b/pkgs/development/libraries/haskell/type-eq/default.nix @@ -12,6 +12,6 @@ cabal.mkDerivation (self: { description = "Type equality evidence you can carry around"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + maintainers = with self.stdenv.lib.maintainers; [ ocharles ]; }; }) diff --git a/pkgs/development/libraries/haskell/type-equality/default.nix b/pkgs/development/libraries/haskell/type-equality/default.nix index 2bcdc0e5897295ac79f86a1ebd80e6166bb2f76b..de5bc73873f29ff8d9310f1f4e668fbdfab16a09 100644 --- a/pkgs/development/libraries/haskell/type-equality/default.nix +++ b/pkgs/development/libraries/haskell/type-equality/default.nix @@ -11,6 +11,5 @@ cabal.mkDerivation (self: { description = "Type equality, coercion/cast and other operations"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/tz/default.nix b/pkgs/development/libraries/haskell/tz/default.nix index 3de1fafd5821504c24c166607fa094d23bfaec26..3f964f2ce3d1579e18e8333bf2063984ffad8733 100644 --- a/pkgs/development/libraries/haskell/tz/default.nix +++ b/pkgs/development/libraries/haskell/tz/default.nix @@ -7,12 +7,12 @@ cabal.mkDerivation (self: { pname = "tz"; - version = "0.0.0.6"; - sha256 = "0yn2c016fzqwbgdrqp5hjn95gzp4w3gqjgax1w6wkg97bksdlq27"; + version = "0.0.0.8"; + sha256 = "0rabdqwdj8hx17817zsfsih01agx7n3kja8s0axmm0drq22vlflv"; buildDepends = [ binary deepseq time tzdata vector ]; testDepends = [ bindingsPosix HUnit QuickCheck testFramework testFrameworkHunit - testFrameworkQuickcheck2 testFrameworkTh time tzdata + testFrameworkQuickcheck2 testFrameworkTh time tzdata vector ]; preConfigure = "export TZDIR=${pkgs_tzdata}/share/zoneinfo"; meta = { diff --git a/pkgs/development/libraries/haskell/tzdata/default.nix b/pkgs/development/libraries/haskell/tzdata/default.nix index b149a59489ab22fdaa8e7f35b80d8ea95e5acdca..ceae467924752ebf1c5e953f70afda4f3b104e1a 100644 --- a/pkgs/development/libraries/haskell/tzdata/default.nix +++ b/pkgs/development/libraries/haskell/tzdata/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "tzdata"; - version = "0.1.20140324.0"; - sha256 = "19cw8wag2d5jx9dxia3gr8qjr3bh77a2kp7ksyqp58xxmvmsqdn4"; + version = "0.1.20140612.0"; + sha256 = "03fd3jiw89c8zf2jdz0qps8sb8ipgmjqbbaq4y2aqczv36ha74gh"; buildDepends = [ vector ]; testDepends = [ filemanip filepath HUnit MissingH testFramework testFrameworkHunit diff --git a/pkgs/development/libraries/haskell/unbound/default.nix b/pkgs/development/libraries/haskell/unbound/default.nix index e8fc81254d11732ef137e79eb1320930ea99ddbd..41accd18586da0f32956e17f7ae4e8848806161d 100644 --- a/pkgs/development/libraries/haskell/unbound/default.nix +++ b/pkgs/development/libraries/haskell/unbound/default.nix @@ -12,6 +12,5 @@ cabal.mkDerivation (self: { description = "Generic support for programming with names and binders"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/unbounded-delays/default.nix b/pkgs/development/libraries/haskell/unbounded-delays/default.nix index af3dd417a995c4937ec73d61b4f7fb213cb9d832..f03aedad4fd3cede208980ebbd287d94be28d15b 100644 --- a/pkgs/development/libraries/haskell/unbounded-delays/default.nix +++ b/pkgs/development/libraries/haskell/unbounded-delays/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "unbounded-delays"; - version = "0.1.0.7"; - sha256 = "1nv50i90hgvcl51w7s8x1c1ylpzyrbvs2mz5zfn68lr1ix2lk879"; + version = "0.1.0.8"; + sha256 = "1jdlpg82kndz6g97bw8fb6sjyyvylrcrg982xnhgi36717f0pv40"; meta = { homepage = "https://github.com/basvandijk/unbounded-delays"; description = "Unbounded thread delays and timeouts"; diff --git a/pkgs/development/libraries/haskell/uniplate/default.nix b/pkgs/development/libraries/haskell/uniplate/default.nix index 17ab561e71de772fc8c57bc4be8a05b6b12b7e54..db85f4be78ebee5f4278715313e3cf91e84c4245 100644 --- a/pkgs/development/libraries/haskell/uniplate/default.nix +++ b/pkgs/development/libraries/haskell/uniplate/default.nix @@ -12,6 +12,5 @@ cabal.mkDerivation (self: { description = "Help writing simple, concise and fast generic operations"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/uniqueid/default.nix b/pkgs/development/libraries/haskell/uniqueid/default.nix index 076601b1f85c602b215b67fe5ec140c02a351d30..f9281247d532b9299c8ff18294675a861bb92473 100644 --- a/pkgs/development/libraries/haskell/uniqueid/default.nix +++ b/pkgs/development/libraries/haskell/uniqueid/default.nix @@ -11,6 +11,5 @@ cabal.mkDerivation (self: { description = "Splittable Unique Identifier Supply"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/units/default.nix b/pkgs/development/libraries/haskell/units/default.nix index 6508cc7edb74b20172feb6257a8a081aae34d56c..c5d5262750dba0051812f2d82b04bf9e2e45fbd4 100644 --- a/pkgs/development/libraries/haskell/units/default.nix +++ b/pkgs/development/libraries/haskell/units/default.nix @@ -1,12 +1,20 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, singletons }: +{ cabal, HUnitApprox, mtl, multimap, parsec, singletons, syb, tasty +, tastyHunit, thDesugar, vectorSpace +}: cabal.mkDerivation (self: { pname = "units"; - version = "2.0"; - sha256 = "1iv0pirhyp7crbkb008k14z57jl8c91r1sl8kqmb778xawb1hx52"; - buildDepends = [ singletons ]; + version = "2.1"; + sha256 = "1qrjc57j15ras0v43cpd7qhh9nzh9dbnkaik6s4c8aj8nkhgd8vs"; + buildDepends = [ + mtl multimap parsec singletons syb thDesugar vectorSpace + ]; + testDepends = [ + HUnitApprox mtl multimap parsec singletons syb tasty tastyHunit + thDesugar vectorSpace + ]; meta = { homepage = "http://www.cis.upenn.edu/~eir/packages/units"; description = "A domain-specific type system for dimensional analysis"; diff --git a/pkgs/development/libraries/haskell/unix-compat/default.nix b/pkgs/development/libraries/haskell/unix-compat/default.nix index 8d1657b7f1ab19ce8a6c4dd49a92110792c1c0bd..7ac3605e6fc77d4d622c1fd72c90e0475e9b3390 100644 --- a/pkgs/development/libraries/haskell/unix-compat/default.nix +++ b/pkgs/development/libraries/haskell/unix-compat/default.nix @@ -11,6 +11,5 @@ cabal.mkDerivation (self: { description = "Portable POSIX-compatibility layer"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/unix-time/default.nix b/pkgs/development/libraries/haskell/unix-time/default.nix index 1fc8fd24e25211dc5438f199505e8ccabaefb53a..60f0f21b292ae9de95fba0eb4ec9c1a9fccf5045 100644 --- a/pkgs/development/libraries/haskell/unix-time/default.nix +++ b/pkgs/development/libraries/haskell/unix-time/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "unix-time"; - version = "0.3.2"; - sha256 = "0bbzrm4hprqsljwscpfmnw3ipj809q7570alzn1qampijsbb4cds"; + version = "0.3.3"; + sha256 = "018wpr5d2kjv8syj97664sqh1v7ws1780qmlfxvrakj86z9k5i8x"; buildDepends = [ binary ]; testDepends = [ doctest hspec QuickCheck time ]; meta = { diff --git a/pkgs/development/libraries/haskell/unlambda/default.nix b/pkgs/development/libraries/haskell/unlambda/default.nix index ea4c0f8cd635a5b1109a12652e49217af3ab80e7..65419a22bb0e8a4a435716a1de3200969717868a 100644 --- a/pkgs/development/libraries/haskell/unlambda/default.nix +++ b/pkgs/development/libraries/haskell/unlambda/default.nix @@ -14,6 +14,5 @@ cabal.mkDerivation (self: { description = "Unlambda interpreter"; license = "GPL"; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/unordered-containers/0.2.3.0.nix b/pkgs/development/libraries/haskell/unordered-containers/0.2.3.0.nix index ccbf8c25e2d2eeeea87e1c80969bc41712e262dc..d7040ac611a328e18ee9fc83848af1b50c75a373 100644 --- a/pkgs/development/libraries/haskell/unordered-containers/0.2.3.0.nix +++ b/pkgs/development/libraries/haskell/unordered-containers/0.2.3.0.nix @@ -19,5 +19,6 @@ cabal.mkDerivation (self: { description = "Efficient hashing-based container types"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/unordered-containers/0.2.4.0.nix b/pkgs/development/libraries/haskell/unordered-containers/0.2.4.0.nix index 228e11ded3e9d066ecc3bd8c643d456d4e4fa690..9cb06b029e666cf9466f113491fa7cdc1583471a 100644 --- a/pkgs/development/libraries/haskell/unordered-containers/0.2.4.0.nix +++ b/pkgs/development/libraries/haskell/unordered-containers/0.2.4.0.nix @@ -19,5 +19,6 @@ cabal.mkDerivation (self: { description = "Efficient hashing-based container types"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/url/default.nix b/pkgs/development/libraries/haskell/url/default.nix index c71e39768ac3c054553ddfdc1cfcd7694225e22c..bfa7f807c53078cf3ea0f01083122c917c9a9b94 100644 --- a/pkgs/development/libraries/haskell/url/default.nix +++ b/pkgs/development/libraries/haskell/url/default.nix @@ -12,6 +12,5 @@ cabal.mkDerivation (self: { description = "A library for working with URLs"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/utf8-light/default.nix b/pkgs/development/libraries/haskell/utf8-light/default.nix index 85c87a670231c0299958470d35b77889be15375d..056fe5b372c877d02dbaba85e47ae1ce9b9a40b3 100644 --- a/pkgs/development/libraries/haskell/utf8-light/default.nix +++ b/pkgs/development/libraries/haskell/utf8-light/default.nix @@ -10,6 +10,5 @@ cabal.mkDerivation (self: { description = "Unicode"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/utility-ht/default.nix b/pkgs/development/libraries/haskell/utility-ht/default.nix index ee5e8de92b1e8603baacc85c3ca6b2c8e165801c..438b9c810d81018ce3e60190a6d2eb87c571e98c 100644 --- a/pkgs/development/libraries/haskell/utility-ht/default.nix +++ b/pkgs/development/libraries/haskell/utility-ht/default.nix @@ -11,6 +11,5 @@ cabal.mkDerivation (self: { description = "Various small helper functions for Lists, Maybes, Tuples, Functions"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/uu-parsinglib/default.nix b/pkgs/development/libraries/haskell/uu-parsinglib/default.nix index 9b601102d8a7674e2d24ad3773399d2021ea14f1..4053301420943d8525c92fa46570934cbb3aaea4 100644 --- a/pkgs/development/libraries/haskell/uu-parsinglib/default.nix +++ b/pkgs/development/libraries/haskell/uu-parsinglib/default.nix @@ -12,6 +12,5 @@ cabal.mkDerivation (self: { description = "Fast, online, error-correcting, monadic, applicative, merging, permuting, idiomatic parser combinators"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/uulib/default.nix b/pkgs/development/libraries/haskell/uulib/default.nix index ed92081d6cc421dd1cd841c16ceba86edb1ef1f3..9cfcac5f904e63f1dea1abd631fb2305e6106437 100644 --- a/pkgs/development/libraries/haskell/uulib/default.nix +++ b/pkgs/development/libraries/haskell/uulib/default.nix @@ -11,6 +11,5 @@ cabal.mkDerivation (self: { description = "Haskell Utrecht Tools Library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/vacuum-cairo/default.nix b/pkgs/development/libraries/haskell/vacuum-cairo/default.nix index b3579d34158727d4ab70888764d39a1cd8ec6f2f..43614d14a5fbbaa78be226da26de14cb2418e270 100644 --- a/pkgs/development/libraries/haskell/vacuum-cairo/default.nix +++ b/pkgs/development/libraries/haskell/vacuum-cairo/default.nix @@ -15,6 +15,5 @@ cabal.mkDerivation (self: { description = "Visualize live Haskell data structures using vacuum, graphviz and cairo"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/vacuum/default.nix b/pkgs/development/libraries/haskell/vacuum/default.nix index d9df682143fe0536dfa7ac5d15de3b4a60697ff2..31e265e92eefc1dbf8ade82ab37c53064663e2f0 100644 --- a/pkgs/development/libraries/haskell/vacuum/default.nix +++ b/pkgs/development/libraries/haskell/vacuum/default.nix @@ -12,6 +12,5 @@ cabal.mkDerivation (self: { description = "Graph representation of the GHC heap"; license = self.stdenv.lib.licenses.gpl3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/vault/default.nix b/pkgs/development/libraries/haskell/vault/default.nix index 4fad4a00363784cd1e97b8c57bba9833fbcc4a20..9eca4f672cb4154e984d645bb8312b15fd838d74 100644 --- a/pkgs/development/libraries/haskell/vault/default.nix +++ b/pkgs/development/libraries/haskell/vault/default.nix @@ -13,6 +13,5 @@ cabal.mkDerivation (self: { description = "a persistent store for values of arbitrary types"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/vcsgui/default.nix b/pkgs/development/libraries/haskell/vcsgui/default.nix index 0a8d8a4caada6b4798451cc10dbc1142a9872d64..31e5faa2cf8835411503edd6fd766d0e6504313a 100644 --- a/pkgs/development/libraries/haskell/vcsgui/default.nix +++ b/pkgs/development/libraries/haskell/vcsgui/default.nix @@ -13,6 +13,6 @@ cabal.mkDerivation (self: { homepage = "https://github.com/forste/haskellVCSGUI"; description = "GUI library for source code management systems"; license = "GPL"; - platforms = self.ghc.meta.platforms; + platforms = self.stdenv.lib.platforms.linux; }; }) diff --git a/pkgs/development/libraries/haskell/vector-algorithms/default.nix b/pkgs/development/libraries/haskell/vector-algorithms/default.nix index 00258e7f3f618fba8dd28469967fbb10063629f1..b13f6c09c80ad5761f524be50456f011d0b09031 100644 --- a/pkgs/development/libraries/haskell/vector-algorithms/default.nix +++ b/pkgs/development/libraries/haskell/vector-algorithms/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "vector-algorithms"; - version = "0.6.0.2"; - sha256 = "1gn2pvgvm9g0dajx2wv305fxwhkpdj9pybrwrm3j2frl4dnj7dcq"; + version = "0.6.0.3"; + sha256 = "1kz4b41y7swad6mbx0g3adc8lqma8pl3rnzah71cfdvb87gssbn4"; isLibrary = true; isExecutable = true; buildDepends = [ mtl mwcRandom primitive vector ]; @@ -15,6 +15,5 @@ cabal.mkDerivation (self: { description = "Efficient algorithms for vector arrays"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/vector-space/default.nix b/pkgs/development/libraries/haskell/vector-space/default.nix index 5eb4ed5ff2ab56f767fd36e93955c19214958a86..2eb7ca4831697b13a4e21aa5de0ecee0763ba1de 100644 --- a/pkgs/development/libraries/haskell/vector-space/default.nix +++ b/pkgs/development/libraries/haskell/vector-space/default.nix @@ -11,6 +11,5 @@ cabal.mkDerivation (self: { description = "Vector & affine spaces, linear maps, and derivatives"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/vector/0.10.0.1.nix b/pkgs/development/libraries/haskell/vector/0.10.0.1.nix index 8951bf64fe28f062ad8305b5247544b4ff715332..0f48fbecf063ad9ffcbcf2e67829be37c8b88575 100644 --- a/pkgs/development/libraries/haskell/vector/0.10.0.1.nix +++ b/pkgs/development/libraries/haskell/vector/0.10.0.1.nix @@ -12,6 +12,6 @@ cabal.mkDerivation (self: { description = "Efficient Arrays"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/vector/0.10.11.0.nix b/pkgs/development/libraries/haskell/vector/0.10.11.0.nix index 05ac573abb2d2bd3090959205159aa0ca2635ab6..e93160ff6d0e0049e60ec36310388a5a152b3533 100644 --- a/pkgs/development/libraries/haskell/vector/0.10.11.0.nix +++ b/pkgs/development/libraries/haskell/vector/0.10.11.0.nix @@ -12,6 +12,5 @@ cabal.mkDerivation (self: { description = "Efficient Arrays"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/vector/0.10.9.3.nix b/pkgs/development/libraries/haskell/vector/0.10.9.3.nix index 0ccaec71a86b26c35d5c00bb8700d708cdd2e928..d07f27bee31021cb9e9a7833321fcded6ce06f56 100644 --- a/pkgs/development/libraries/haskell/vector/0.10.9.3.nix +++ b/pkgs/development/libraries/haskell/vector/0.10.9.3.nix @@ -12,6 +12,6 @@ cabal.mkDerivation (self: { description = "Efficient Arrays"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/vinyl/default.nix b/pkgs/development/libraries/haskell/vinyl/default.nix index b0c57672e0d611cfc4eafdb2891a76ebaaf38a40..46ea723641ca9f1131ceb5e4bb2dfb8748b4a5c2 100644 --- a/pkgs/development/libraries/haskell/vinyl/default.nix +++ b/pkgs/development/libraries/haskell/vinyl/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "vinyl"; - version = "0.4.2"; - sha256 = "17vh5yv9dzw6zq1xw22k7mljpha0rcngbk5k0kynh7hyh6xy4zxz"; + version = "0.4.3"; + sha256 = "1npcpvr94l2gpk9z4y527raf2p3d6099m231vw0myci37ljnjgdf"; testDepends = [ doctest lens singletons ]; meta = { description = "Extensible Records"; diff --git a/pkgs/development/libraries/haskell/void/default.nix b/pkgs/development/libraries/haskell/void/default.nix index a14775aaeb856d206cc6e0ce8c24b3e1095929e9..f6cc8eaa4d930e1451ba7fefd16d391dbfb0eecc 100644 --- a/pkgs/development/libraries/haskell/void/default.nix +++ b/pkgs/development/libraries/haskell/void/default.nix @@ -12,6 +12,5 @@ cabal.mkDerivation (self: { description = "A Haskell 98 logically uninhabited data type"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/vty/4.7.5.nix b/pkgs/development/libraries/haskell/vty/4.7.5.nix index 36b6b78f65c0a6de1a38c363340b7af149e14ad3..1eccdd58fefcf9cfc4d13bc4c808cd8c2df25580 100644 --- a/pkgs/development/libraries/haskell/vty/4.7.5.nix +++ b/pkgs/development/libraries/haskell/vty/4.7.5.nix @@ -24,6 +24,6 @@ cabal.mkDerivation (self: { description = "A simple terminal UI library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/vty/5.1.1.nix b/pkgs/development/libraries/haskell/vty/5.1.4.nix similarity index 88% rename from pkgs/development/libraries/haskell/vty/5.1.1.nix rename to pkgs/development/libraries/haskell/vty/5.1.4.nix index 708eb9581c613a3a8a4f56b76443b22c372fbced..24d123d67cc87f23dd6253427ece3440a804ae32 100644 --- a/pkgs/development/libraries/haskell/vty/5.1.1.nix +++ b/pkgs/development/libraries/haskell/vty/5.1.4.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "vty"; - version = "5.1.1"; - sha256 = "043vrazb8w6ljq14i390cwcmavgmbnjbs6sl6w0yx8cwb4f7djr5"; + version = "5.1.4"; + sha256 = "157saacy6lp2ngl0dz9ri4ji1vj191d1239x1xykna8y618r0vqf"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -30,6 +30,5 @@ cabal.mkDerivation (self: { description = "A simple terminal UI library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/wai-app-static/default.nix b/pkgs/development/libraries/haskell/wai-app-static/default.nix index d22e57c576ad0c40def97ee4e1d2b71a3a4b8519..530f9828ae5f7beac65cce27ebaed583d77ed717 100644 --- a/pkgs/development/libraries/haskell/wai-app-static/default.nix +++ b/pkgs/development/libraries/haskell/wai-app-static/default.nix @@ -29,6 +29,5 @@ cabal.mkDerivation (self: { description = "WAI application for static serving"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/wai-extra/default.nix b/pkgs/development/libraries/haskell/wai-extra/default.nix index 76094cd0c0e93239dee6699e651e608a31695a01..6af43d459877c4f64952356438ce989ccac6a500 100644 --- a/pkgs/development/libraries/haskell/wai-extra/default.nix +++ b/pkgs/development/libraries/haskell/wai-extra/default.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "wai-extra"; - version = "3.0.1"; - sha256 = "1k6d9p93r7r95i5yi7mvhix94qigkzanqjq5qa6k7qfpnjj727id"; + version = "3.0.1.2"; + sha256 = "15v3mk7kbinvynsfxb95lwvg52wkpm3q9k5an8ak936ll3j2s14z"; buildDepends = [ ansiTerminal base64Bytestring blazeBuilder caseInsensitive dataDefaultClass deepseq fastLogger httpTypes liftedBase network @@ -27,6 +27,5 @@ cabal.mkDerivation (self: { description = "Provides some basic WAI handlers and middleware"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/wai-logger/default.nix b/pkgs/development/libraries/haskell/wai-logger/default.nix index b7c62845cb974da4c981c1e8bffcc93123a700b8..69e3d46472824673bb2e7c5815ee78effb65f2d5 100644 --- a/pkgs/development/libraries/haskell/wai-logger/default.nix +++ b/pkgs/development/libraries/haskell/wai-logger/default.nix @@ -1,23 +1,22 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, blazeBuilder, byteorder, caseInsensitive, doctest -, fastLogger, httpTypes, network, unixTime, wai, waiTest +{ cabal, autoUpdate, blazeBuilder, byteorder, caseInsensitive +, doctest, easyFile, fastLogger, httpTypes, network, unixTime, wai }: cabal.mkDerivation (self: { pname = "wai-logger"; - version = "2.1.1"; - sha256 = "1cdl5nglb8jghi0yndpabraihgh681m5q1j77wsxzckxisga73j8"; + version = "2.2.1"; + sha256 = "0210phkadr5ndpx6ppmygir0mxnpjffvccjb4lnpjnwy2ydf0lzy"; buildDepends = [ - blazeBuilder byteorder caseInsensitive fastLogger httpTypes network - unixTime wai + autoUpdate blazeBuilder byteorder caseInsensitive easyFile + fastLogger httpTypes network unixTime wai ]; - testDepends = [ doctest waiTest ]; + testDepends = [ doctest ]; doCheck = false; meta = { description = "A logging system for WAI"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/wai-websockets/default.nix b/pkgs/development/libraries/haskell/wai-websockets/default.nix index cb88d7ab6e69f33d6783a1bfc9c99247cb146e50..a60a6e9dda016cbcba6a65b7f02aa23b614f5058 100644 --- a/pkgs/development/libraries/haskell/wai-websockets/default.nix +++ b/pkgs/development/libraries/haskell/wai-websockets/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "wai-websockets"; - version = "3.0.0"; - sha256 = "0bpzkh9a5j0a282z4dj9dqnjsgd0g8gyvvp0xm0a53582zfhfi5s"; + version = "3.0.0.1"; + sha256 = "01rbwyx2ks6hdaw5qw7dibidyw4bh85s2gzqy4rhmxpdcnmxxmnz"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/wai/default.nix b/pkgs/development/libraries/haskell/wai/default.nix index 4a67a800109612b83b80cb72856d840887553665..1c63b4ce5964b278169562e19815e557ff1a99db 100644 --- a/pkgs/development/libraries/haskell/wai/default.nix +++ b/pkgs/development/libraries/haskell/wai/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "wai"; - version = "3.0.0.2"; - sha256 = "1zmpalgck8jns45wnlarw26kfw45ml0cp82kdqqpbckscxnr04r1"; + version = "3.0.1.1"; + sha256 = "04dka0mgqckzhvmz8m9gqvk5qq79g23q8wx40v42fwhkwwy7f8i0"; buildDepends = [ blazeBuilder httpTypes network text vault ]; testDepends = [ blazeBuilder hspec ]; meta = { @@ -13,6 +13,5 @@ cabal.mkDerivation (self: { description = "Web Application Interface"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix index 3065c52c0f9fd1858cf580c38f176c947b587a23..703a7cf907a6f2e89e994da084022a0b5aecb3a4 100644 --- a/pkgs/development/libraries/haskell/warp/default.nix +++ b/pkgs/development/libraries/haskell/warp/default.nix @@ -1,22 +1,22 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, async, blazeBuilder, caseInsensitive, doctest, hashable -, hspec, HTTP, httpDate, httpTypes, HUnit, liftedBase, network -, QuickCheck, simpleSendfile, streamingCommons, text, time +{ cabal, async, autoUpdate, blazeBuilder, caseInsensitive, doctest +, hashable, hspec, HTTP, httpDate, httpTypes, HUnit, liftedBase +, network, QuickCheck, simpleSendfile, streamingCommons, text, time , transformers, unixCompat, void, wai }: cabal.mkDerivation (self: { pname = "warp"; - version = "3.0.0.4"; - sha256 = "119yw4k11v2gq3z4gjr51i8z551cbbgwhkfnl9jr4ira06m6si2v"; + version = "3.0.0.7"; + sha256 = "16zsad273lz49lac00pwg701lyr70kv4cwmk258szhmnjvkcnbb7"; buildDepends = [ - blazeBuilder caseInsensitive hashable httpDate httpTypes network - simpleSendfile streamingCommons text unixCompat void wai + autoUpdate blazeBuilder caseInsensitive hashable httpDate httpTypes + network simpleSendfile streamingCommons text unixCompat void wai ]; testDepends = [ - async blazeBuilder caseInsensitive doctest hashable hspec HTTP - httpDate httpTypes HUnit liftedBase network QuickCheck + async autoUpdate blazeBuilder caseInsensitive doctest hashable + hspec HTTP httpDate httpTypes HUnit liftedBase network QuickCheck simpleSendfile streamingCommons text time transformers unixCompat void wai ]; @@ -26,6 +26,5 @@ cabal.mkDerivation (self: { description = "A fast, light-weight web server for WAI applications"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/web-routes-boomerang/default.nix b/pkgs/development/libraries/haskell/web-routes-boomerang/default.nix index 110ee086c9bedc37188ae1dc93921d8c7c8fe2b1..bed9467a9d25153689ed8837e49e9e163893ffe1 100644 --- a/pkgs/development/libraries/haskell/web-routes-boomerang/default.nix +++ b/pkgs/development/libraries/haskell/web-routes-boomerang/default.nix @@ -11,6 +11,6 @@ cabal.mkDerivation (self: { description = "Library for maintaining correctness and composability of URLs within an application"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + maintainers = with self.stdenv.lib.maintainers; [ ocharles ]; }; }) diff --git a/pkgs/development/libraries/haskell/web-routes/default.nix b/pkgs/development/libraries/haskell/web-routes/default.nix index 4eb4445d54d379c1612fb53f56e66c9c8b383d75..12f2212c8e358a7a7fc91220ebcf6319f8484db5 100644 --- a/pkgs/development/libraries/haskell/web-routes/default.nix +++ b/pkgs/development/libraries/haskell/web-routes/default.nix @@ -20,6 +20,6 @@ cabal.mkDerivation (self: { description = "Library for maintaining correctness and composability of URLs within an application"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + maintainers = with self.stdenv.lib.maintainers; [ ocharles ]; }; }) diff --git a/pkgs/development/libraries/haskell/webkit/default.nix b/pkgs/development/libraries/haskell/webkit/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..0d47aeb79551d0a917d0e9336219582a03048e3f --- /dev/null +++ b/pkgs/development/libraries/haskell/webkit/default.nix @@ -0,0 +1,20 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, cairo, glib, gtk, gtk2hsBuildtools, mtl, pango, text +, webkit +}: + +cabal.mkDerivation (self: { + pname = "webkit"; + version = "0.13.0.0"; + sha256 = "152rbb01fq9cxjxqm26s1qcv3nashzymkbjy52ql06y7s1n5i3q5"; + buildDepends = [ cairo glib gtk mtl pango text ]; + buildTools = [ gtk2hsBuildtools ]; + pkgconfigDepends = [ webkit ]; + meta = { + homepage = "http://projects.haskell.org/gtk2hs/"; + description = "Binding to the Webkit library"; + license = self.stdenv.lib.licenses.lgpl21; + platforms = self.stdenv.lib.platforms.linux; + }; +}) diff --git a/pkgs/development/libraries/haskell/websockets-snap/default.nix b/pkgs/development/libraries/haskell/websockets-snap/default.nix index 29fcc454112c31328ad5b3279b259938690625e1..bd68d64b757a836b9df70775e213b8263b247d94 100644 --- a/pkgs/development/libraries/haskell/websockets-snap/default.nix +++ b/pkgs/development/libraries/haskell/websockets-snap/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "websockets-snap"; - version = "0.8.2.1"; - sha256 = "13q1vrrcka91w9yad3jw1w68hp59n851hkn9a3hylw0cqs7008az"; + version = "0.8.2.2"; + sha256 = "1r5y5czpxrc06i7w3y3fa4dlqmxdypcc8yplg28cv4k3mkfa1hf4"; buildDepends = [ blazeBuilder enumerator ioStreams mtl snapCore snapServer websockets @@ -16,6 +16,6 @@ cabal.mkDerivation (self: { description = "Snap integration for the websockets library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + maintainers = with self.stdenv.lib.maintainers; [ ocharles ]; }; }) diff --git a/pkgs/development/libraries/haskell/websockets/default.nix b/pkgs/development/libraries/haskell/websockets/default.nix index 782b3bdfc757e5eb1f4419e59229f4ebceda2dfe..c74fad5f1a828858522f6647f8869ecf7af60d39 100644 --- a/pkgs/development/libraries/haskell/websockets/default.nix +++ b/pkgs/development/libraries/haskell/websockets/default.nix @@ -25,6 +25,6 @@ cabal.mkDerivation (self: { description = "A sensible and clean way to write WebSocket-capable servers in Haskell"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + maintainers = with self.stdenv.lib.maintainers; [ ocharles ]; }; }) diff --git a/pkgs/development/libraries/haskell/wl-pprint-text/default.nix b/pkgs/development/libraries/haskell/wl-pprint-text/default.nix index cb2d02d43dd4065748f57af477f388e086dc85cc..2d6d48d41aeea1a8a495ec4d61bce4dcd3814484 100644 --- a/pkgs/development/libraries/haskell/wl-pprint-text/default.nix +++ b/pkgs/development/libraries/haskell/wl-pprint-text/default.nix @@ -11,6 +11,5 @@ cabal.mkDerivation (self: { description = "A Wadler/Leijen Pretty Printer for Text values"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/wreq/default.nix b/pkgs/development/libraries/haskell/wreq/default.nix index 8e95e3c8238fdf54e733c871ee94250b207930f2..9772418173bca11ffd58f4465aeb0f6a239137c8 100644 --- a/pkgs/development/libraries/haskell/wreq/default.nix +++ b/pkgs/development/libraries/haskell/wreq/default.nix @@ -25,6 +25,6 @@ cabal.mkDerivation (self: { description = "An easy-to-use HTTP client library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + maintainers = with self.stdenv.lib.maintainers; [ ocharles ]; }; }) diff --git a/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix b/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix index 1362b423753bcf08d5b7754357c013ed93dbd7d1..f89d39ca5eddeaffcba7fa92a316aa6e54528a04 100644 --- a/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix +++ b/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix @@ -15,6 +15,5 @@ cabal.mkDerivation (self: { description = "helper tool for building wxHaskell"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/xdot/default.nix b/pkgs/development/libraries/haskell/xdot/default.nix index 6080afac5d56a134df5b0ccc28e7295b090ce52b..445577c2309aeeb27ea2d43eac18833a294ebba2 100644 --- a/pkgs/development/libraries/haskell/xdot/default.nix +++ b/pkgs/development/libraries/haskell/xdot/default.nix @@ -12,6 +12,5 @@ cabal.mkDerivation (self: { description = "Parse Graphviz xdot files and interactively view them using GTK and Cairo"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/xhtml/3000.2.0.1.nix b/pkgs/development/libraries/haskell/xhtml/3000.2.0.1.nix index d828ba1a57c95c3c2490000af3a8ae3139589fa0..3cb0238b82f34fde8d400acee773a1b000cd626a 100644 --- a/pkgs/development/libraries/haskell/xhtml/3000.2.0.1.nix +++ b/pkgs/development/libraries/haskell/xhtml/3000.2.0.1.nix @@ -10,6 +10,6 @@ cabal.mkDerivation (self: { description = "An XHTML combinator library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/xhtml/3000.2.0.4.nix b/pkgs/development/libraries/haskell/xhtml/3000.2.0.4.nix index 134c423eca1db3c59ae0c86d8b8e6b5a448b88f9..74b9fc5620c02513484576472c5eab4cac037d09 100644 --- a/pkgs/development/libraries/haskell/xhtml/3000.2.0.4.nix +++ b/pkgs/development/libraries/haskell/xhtml/3000.2.0.4.nix @@ -11,6 +11,6 @@ cabal.mkDerivation (self: { description = "An XHTML combinator library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/xhtml/3000.2.0.5.nix b/pkgs/development/libraries/haskell/xhtml/3000.2.0.5.nix index 2b375904ed05e63da3e10708ce00a85c9dca9ae6..065252d31b7650f835e650bf8cade25f9d33e027 100644 --- a/pkgs/development/libraries/haskell/xhtml/3000.2.0.5.nix +++ b/pkgs/development/libraries/haskell/xhtml/3000.2.0.5.nix @@ -11,6 +11,6 @@ cabal.mkDerivation (self: { description = "An XHTML combinator library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/xhtml/3000.2.1.nix b/pkgs/development/libraries/haskell/xhtml/3000.2.1.nix index 45304858b15c61c3127370c3e8595c6b041ee3da..be1e32afbe355c0e854b80d6bc06972c5ef0a01b 100644 --- a/pkgs/development/libraries/haskell/xhtml/3000.2.1.nix +++ b/pkgs/development/libraries/haskell/xhtml/3000.2.1.nix @@ -11,6 +11,5 @@ cabal.mkDerivation (self: { description = "An XHTML combinator library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/xml-conduit-writer/default.nix b/pkgs/development/libraries/haskell/xml-conduit-writer/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..fc0efcff226d02faa3cca00005dbbe816adac97f --- /dev/null +++ b/pkgs/development/libraries/haskell/xml-conduit-writer/default.nix @@ -0,0 +1,17 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, dlist, mtl, text, xmlConduit, xmlTypes }: + +cabal.mkDerivation (self: { + pname = "xml-conduit-writer"; + version = "0.1.1.1"; + sha256 = "1ibiqxjr63gb3v0h9fdfzm205sqjixb5vm5y6413yn4scbf7qm2b"; + buildDepends = [ dlist mtl text xmlConduit xmlTypes ]; + testDepends = [ text ]; + meta = { + homepage = "https://bitbucket.org/dpwiz/xml-conduit-writer"; + description = "Warm and fuzzy creation of XML documents"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/xml-conduit/default.nix b/pkgs/development/libraries/haskell/xml-conduit/default.nix index f46361a14514619383415fb312590d1f35df845e..3df8c163d63e4e594df41d7e0a2220b805b8e150 100644 --- a/pkgs/development/libraries/haskell/xml-conduit/default.nix +++ b/pkgs/development/libraries/haskell/xml-conduit/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "xml-conduit"; - version = "1.2.0.3"; - sha256 = "0bb4nc9nwq4z6vdsiqs0zk8k8yvmyxdrya5fz2h8z8ng66xaq4k1"; + version = "1.2.1"; + sha256 = "1bh0d2fqcdbx2dq5ybipf7ws59blrb8yd98z1rnbvv1fj9r0xw10"; buildDepends = [ attoparsec attoparsecConduit blazeBuilder blazeBuilderConduit blazeHtml blazeMarkup conduit conduitExtra dataDefault deepseq @@ -24,6 +24,5 @@ cabal.mkDerivation (self: { description = "Pure-Haskell utilities for dealing with XML with the conduit package"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/xml-html-conduit-lens/default.nix b/pkgs/development/libraries/haskell/xml-html-conduit-lens/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..b6fd82d622cce2c2d91cf92e244c476aac723f35 --- /dev/null +++ b/pkgs/development/libraries/haskell/xml-html-conduit-lens/default.nix @@ -0,0 +1,21 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, doctest, hspec, hspecExpectationsLens, htmlConduit, lens +, text, xmlConduit +}: + +cabal.mkDerivation (self: { + pname = "xml-html-conduit-lens"; + version = "0.3.2.0"; + sha256 = "150b772wkl2k8xcrcbqj3qhndjkl35qzwqdjbgs9mxp867aihiv0"; + buildDepends = [ htmlConduit lens text xmlConduit ]; + testDepends = [ + doctest hspec hspecExpectationsLens lens xmlConduit + ]; + meta = { + homepage = "https://github.com/supki/xml-html-conduit-lens#readme"; + description = "Optics for xml-conduit and html-conduit"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/xml-types/default.nix b/pkgs/development/libraries/haskell/xml-types/default.nix index e9cfd5e6b28e1562d8472a868443654c9ee7acd4..a673fa2eddd836de454346e49764b19842011812 100644 --- a/pkgs/development/libraries/haskell/xml-types/default.nix +++ b/pkgs/development/libraries/haskell/xml-types/default.nix @@ -12,6 +12,5 @@ cabal.mkDerivation (self: { description = "Basic types for representing XML"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/xml/default.nix b/pkgs/development/libraries/haskell/xml/default.nix index 3081f085509cb73f79903058ce2e41dcb3c45ed2..9066dc8b55342b9d335e138b0c3a0800ae3c8b16 100644 --- a/pkgs/development/libraries/haskell/xml/default.nix +++ b/pkgs/development/libraries/haskell/xml/default.nix @@ -12,6 +12,5 @@ cabal.mkDerivation (self: { description = "A simple XML library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/xorshift/default.nix b/pkgs/development/libraries/haskell/xorshift/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..7fe91aad0e704388be4b53f013074cdd8af88302 --- /dev/null +++ b/pkgs/development/libraries/haskell/xorshift/default.nix @@ -0,0 +1,15 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, random, time }: + +cabal.mkDerivation (self: { + pname = "xorshift"; + version = "2.0.1"; + sha256 = "1pgkcnsgir8ci3hm3s5w3lk5dy7219242g9njx9cxb1m1cz5v5rf"; + buildDepends = [ random time ]; + meta = { + description = "Haskell implementation of the xorshift random generator"; + license = "LGPL"; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/xournal-parser/default.nix b/pkgs/development/libraries/haskell/xournal-parser/default.nix index 68f10cc566b661aa69284be8f0ef4bd8b01527e1..906db96ba5c292e36ff875176b3776d1bbf59b24 100644 --- a/pkgs/development/libraries/haskell/xournal-parser/default.nix +++ b/pkgs/development/libraries/haskell/xournal-parser/default.nix @@ -19,6 +19,6 @@ cabal.mkDerivation (self: { description = "Xournal file parser"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.ianwookim ]; + maintainers = with self.stdenv.lib.maintainers; [ ianwookim ]; }; }) diff --git a/pkgs/development/libraries/haskell/xournal-types/default.nix b/pkgs/development/libraries/haskell/xournal-types/default.nix index 7d6eb7e6efb7204943e836e8769a4d2e7c1c7678..9f0be91114ab0673ab585b6b93c678ddcae4b5be 100644 --- a/pkgs/development/libraries/haskell/xournal-types/default.nix +++ b/pkgs/development/libraries/haskell/xournal-types/default.nix @@ -12,6 +12,6 @@ cabal.mkDerivation (self: { description = "Data types for programs for xournal file format"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.ianwookim ]; + maintainers = with self.stdenv.lib.maintainers; [ ianwookim ]; }; }) diff --git a/pkgs/development/libraries/haskell/xss-sanitize/default.nix b/pkgs/development/libraries/haskell/xss-sanitize/default.nix index 4c48eeeb0620c1ab23437e657c6b9223c45c1d69..c66b615eafbc61a1f039059af0e14935d10c0c08 100644 --- a/pkgs/development/libraries/haskell/xss-sanitize/default.nix +++ b/pkgs/development/libraries/haskell/xss-sanitize/default.nix @@ -19,6 +19,5 @@ cabal.mkDerivation (self: { description = "sanitize untrusted HTML to prevent XSS attacks"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/yaml-light/default.nix b/pkgs/development/libraries/haskell/yaml-light/default.nix index 26e698b1dbfe2638313d6296bb1111e8e15e4fde..460e2833d9921fd28b6cd8dda467ec2448f13b5d 100644 --- a/pkgs/development/libraries/haskell/yaml-light/default.nix +++ b/pkgs/development/libraries/haskell/yaml-light/default.nix @@ -11,6 +11,6 @@ cabal.mkDerivation (self: { description = "A light-weight wrapper with utility functions around HsSyck"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + maintainers = with self.stdenv.lib.maintainers; [ ocharles ]; }; }) diff --git a/pkgs/development/libraries/haskell/yaml/default.nix b/pkgs/development/libraries/haskell/yaml/default.nix index 88475a1e951ac58116a0c71c452c6542153af2b9..b5438fabc123ceed4115fe082852614764d4caea 100644 --- a/pkgs/development/libraries/haskell/yaml/default.nix +++ b/pkgs/development/libraries/haskell/yaml/default.nix @@ -23,6 +23,5 @@ cabal.mkDerivation (self: { description = "Support for parsing and rendering YAML documents"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/yap/default.nix b/pkgs/development/libraries/haskell/yap/default.nix index c7eb1f180e485b01b135ff942c2334767bad204b..a52a921ed649017482f4e2d92c8fe6ecb9b4597e 100644 --- a/pkgs/development/libraries/haskell/yap/default.nix +++ b/pkgs/development/libraries/haskell/yap/default.nix @@ -11,6 +11,5 @@ cabal.mkDerivation (self: { description = "yet another prelude - a simplistic refactoring with algebraic classes"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/yesod-auth/default.nix b/pkgs/development/libraries/haskell/yesod-auth/default.nix index b439d24afe6c769d89c0785e716dc3b575522369..2579946080f51c291cd6e8b47c2999080aa247da 100644 --- a/pkgs/development/libraries/haskell/yesod-auth/default.nix +++ b/pkgs/development/libraries/haskell/yesod-auth/default.nix @@ -12,8 +12,8 @@ cabal.mkDerivation (self: { pname = "yesod-auth"; - version = "1.3.1.1"; - sha256 = "0mw04v8gnhv9gnv7kv2v1x5df63zjdmi52r5bv1fzqay1s5b83ir"; + version = "1.3.4"; + sha256 = "138wnrs9bf6wl9r4mc1fhshxky7bc6anhgqnwljx4gzvzsd0vq0y"; buildDepends = [ aeson attoparsecConduit authenticate base16Bytestring base64Bytestring binary blazeBuilder blazeHtml blazeMarkup byteable @@ -28,6 +28,5 @@ cabal.mkDerivation (self: { description = "Authentication for Yesod"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/yesod-bin/default.nix b/pkgs/development/libraries/haskell/yesod-bin/default.nix index 4e02a157e342c6cd57d0912380e9ff38b15f3ff5..dbf98e1457b2a30aecf51918d8a968201a1fc94b 100644 --- a/pkgs/development/libraries/haskell/yesod-bin/default.nix +++ b/pkgs/development/libraries/haskell/yesod-bin/default.nix @@ -12,8 +12,8 @@ cabal.mkDerivation (self: { pname = "yesod-bin"; - version = "1.2.11"; - sha256 = "15bxl52ky0ihm7ak71g6cvb9bac4zvmb8sh74fbjkckmpgh8r3m2"; + version = "1.2.12.3"; + sha256 = "0pm7wwml2574fsimibhhb47s6fn19cdips4p419k7j8g62v4kfzx"; isLibrary = false; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix index 96995f24d31d992142686b7e3c553ca2318bb2e2..90d354a22cfff1dccdd439be71f37387d265088b 100644 --- a/pkgs/development/libraries/haskell/yesod-core/default.nix +++ b/pkgs/development/libraries/haskell/yesod-core/default.nix @@ -13,8 +13,8 @@ cabal.mkDerivation (self: { pname = "yesod-core"; - version = "1.2.17"; - sha256 = "199zj9yz5nmk4h2dwz4zlix3wf1z5fl9a8jg8cr4z6ldgskcfis1"; + version = "1.2.19"; + sha256 = "0dlvg8zpr1qyav3svqybsqsrmrl9n8s1kdzxf6zxa3pn582d48il"; buildDepends = [ aeson attoparsecConduit blazeBuilder blazeHtml blazeMarkup caseInsensitive cereal clientsession conduit conduitExtra cookie @@ -36,6 +36,5 @@ cabal.mkDerivation (self: { description = "Creation of type-safe, RESTful web applications"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/yesod-default/default.nix b/pkgs/development/libraries/haskell/yesod-default/default.nix index 578ec4f58a163542ce17367af6611a1a07aad5db..6a65dfefe216683dfb9a0ce32de9f55fd8052023 100644 --- a/pkgs/development/libraries/haskell/yesod-default/default.nix +++ b/pkgs/development/libraries/haskell/yesod-default/default.nix @@ -12,6 +12,5 @@ cabal.mkDerivation (self: { description = "Default config and main functions for your yesod application (deprecated)"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/yesod-form/default.nix b/pkgs/development/libraries/haskell/yesod-form/default.nix index 26f0735f723d0f7a75535ef99a597885fd36f397..2b994168d5ee9ce17e580316f12c383be6b196b7 100644 --- a/pkgs/development/libraries/haskell/yesod-form/default.nix +++ b/pkgs/development/libraries/haskell/yesod-form/default.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "yesod-form"; - version = "1.3.11"; - sha256 = "15c4qyvz1mn56pl9add865lm351wjhdhrbzm87py2jliglm905n0"; + version = "1.3.15"; + sha256 = "1cyz39892kxa3m3wx8a3sy4fkmhaljvz72r2jq8l5qn2hd0n5b69"; buildDepends = [ aeson attoparsec blazeBuilder blazeHtml blazeMarkup byteable dataDefault emailValidate hamlet network persistent resourcet @@ -23,6 +23,5 @@ cabal.mkDerivation (self: { description = "Form handling support for Yesod Web Framework"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/yesod-json/default.nix b/pkgs/development/libraries/haskell/yesod-json/default.nix index 53c5d2c7e859da5c761f712a96f9a57732682011..1964abe7dc8c0edfd10720e3f00e1fc3a5f32efa 100644 --- a/pkgs/development/libraries/haskell/yesod-json/default.nix +++ b/pkgs/development/libraries/haskell/yesod-json/default.nix @@ -12,6 +12,5 @@ cabal.mkDerivation (self: { description = "Generate content for Yesod using the aeson package. (deprecated)"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/yesod-persistent/default.nix b/pkgs/development/libraries/haskell/yesod-persistent/default.nix index ce13f78b31b466abe2f372e559486b0e0fbba741..64a2bd7730f74db607562697786f54a6f8458f75 100644 --- a/pkgs/development/libraries/haskell/yesod-persistent/default.nix +++ b/pkgs/development/libraries/haskell/yesod-persistent/default.nix @@ -22,6 +22,5 @@ cabal.mkDerivation (self: { description = "Some helpers for using Persistent from Yesod"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/yesod-routes/default.nix b/pkgs/development/libraries/haskell/yesod-routes/default.nix index f537a119a455a5b97f28e207d3ac66a46d601b9f..668cbfda1eb54409a2c86deb92eb4ac7678abea7 100644 --- a/pkgs/development/libraries/haskell/yesod-routes/default.nix +++ b/pkgs/development/libraries/haskell/yesod-routes/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "yesod-routes"; - version = "1.2.0.6"; - sha256 = "0hd2f2w9pb865fn9qijh3j73sc1x7gzd4c0q5mgjy9lh9hd4kzix"; + version = "1.2.0.7"; + sha256 = "00i2nysbhmxnq0dvfdjx6nhxy680ya38nx8gcgm13fv2xwdd2p6j"; buildDepends = [ pathPieces text vector ]; testDepends = [ hspec HUnit pathPieces text ]; meta = { @@ -13,6 +13,5 @@ cabal.mkDerivation (self: { description = "Efficient routing for Yesod"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/yesod-static/default.nix b/pkgs/development/libraries/haskell/yesod-static/default.nix index 7b118711ccedc6dfc4c898e1d9cd200651289a9c..5ad4a27b66fe584e5b730d81b6601505603f3381 100644 --- a/pkgs/development/libraries/haskell/yesod-static/default.nix +++ b/pkgs/development/libraries/haskell/yesod-static/default.nix @@ -33,6 +33,5 @@ cabal.mkDerivation (self: { description = "Static file serving subsite for Yesod Web Framework"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/yesod-test/default.nix b/pkgs/development/libraries/haskell/yesod-test/default.nix index 41f8f694ca15b2eef2e375aa253994653e21b303..9cc7a380f66a5a93089d3e52fd25807be986cf2f 100644 --- a/pkgs/development/libraries/haskell/yesod-test/default.nix +++ b/pkgs/development/libraries/haskell/yesod-test/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "yesod-test"; - version = "1.2.3.1"; - sha256 = "0q4w7q22d8hvsg939w686fb295v8cznnhqlfd1bh0v2lp9dih4ms"; + version = "1.2.5"; + sha256 = "0qk6qqigrqygczsnfrpg7psfz6gy5rqm9lfbhzaw64n4jklmzw3n"; buildDepends = [ attoparsec blazeBuilder blazeHtml blazeMarkup caseInsensitive cookie hspec htmlConduit httpTypes HUnit monadControl network diff --git a/pkgs/development/libraries/haskell/yesod/default.nix b/pkgs/development/libraries/haskell/yesod/default.nix index d43100901cce591a6086b71c186b39263847d3fa..07d4ac958e63317700e796ee244b28f50f420e43 100644 --- a/pkgs/development/libraries/haskell/yesod/default.nix +++ b/pkgs/development/libraries/haskell/yesod/default.nix @@ -24,6 +24,5 @@ cabal.mkDerivation (self: { description = "Creation of type-safe, RESTful web applications"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/yst/default.nix b/pkgs/development/libraries/haskell/yst/default.nix index 9597861c6fe774ccfc5b1b9e11c3d3809a3fbcbe..2dadfcbfd68692b5405c005f113f53021ed93abd 100644 --- a/pkgs/development/libraries/haskell/yst/default.nix +++ b/pkgs/development/libraries/haskell/yst/default.nix @@ -15,11 +15,11 @@ cabal.mkDerivation (self: { aeson csv filepath HDBC HDBCSqlite3 HStringTemplate pandoc parsec scientific split text time unorderedContainers xhtml yaml ]; + jailbreak = true; meta = { homepage = "http://github.com/jgm/yst"; description = "Builds a static website from templates and data in YAML or CSV files"; license = "GPL"; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/zeromq-haskell/default.nix b/pkgs/development/libraries/haskell/zeromq-haskell/default.nix index c7be4e280dc1047e5cb88b42235d4c12d2992efb..37528689a3878905dc6c54813f94c0cd959a8d0f 100644 --- a/pkgs/development/libraries/haskell/zeromq-haskell/default.nix +++ b/pkgs/development/libraries/haskell/zeromq-haskell/default.nix @@ -17,6 +17,5 @@ cabal.mkDerivation (self: { description = "Bindings to ZeroMQ 2.1.x"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/zip-archive/0.2.2.1.nix b/pkgs/development/libraries/haskell/zip-archive/0.2.2.1.nix index 422d81e6707dff4ca054a7ee85231134caae0246..67f2c2453b66b4e08dfa1f5b63bcc9db1679457a 100644 --- a/pkgs/development/libraries/haskell/zip-archive/0.2.2.1.nix +++ b/pkgs/development/libraries/haskell/zip-archive/0.2.2.1.nix @@ -16,6 +16,6 @@ cabal.mkDerivation (self: { description = "Library for creating and modifying zip archives"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/zip-archive/0.2.3.2.nix b/pkgs/development/libraries/haskell/zip-archive/0.2.3.4.nix similarity index 80% rename from pkgs/development/libraries/haskell/zip-archive/0.2.3.2.nix rename to pkgs/development/libraries/haskell/zip-archive/0.2.3.4.nix index 20795a15a9877a5c425ef50ad29b6d2b4bca1bce..a7732367710998838e347cd4825ed54b9724f96d 100644 --- a/pkgs/development/libraries/haskell/zip-archive/0.2.3.2.nix +++ b/pkgs/development/libraries/haskell/zip-archive/0.2.3.4.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "zip-archive"; - version = "0.2.3.2"; - sha256 = "1y69sk6jyw1klgpl6bcamq1i9wy1536hz9x4s9b8n375sbhj10f1"; + version = "0.2.3.4"; + sha256 = "1c589cpl1jax1r60b92az1800b67zrva3dndhv9hcxidlgyf46gp"; isLibrary = true; isExecutable = true; buildDepends = [ binary digest filepath mtl text time zlib ]; @@ -16,6 +16,5 @@ cabal.mkDerivation (self: { description = "Library for creating and modifying zip archives"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/zipper/default.nix b/pkgs/development/libraries/haskell/zipper/default.nix index 4c31b2c2d01c3471d694c5674b22c4fa41fc9648..f2db123aa1796ae2bfc4a5c9a0e16d16ceed2e14 100644 --- a/pkgs/development/libraries/haskell/zipper/default.nix +++ b/pkgs/development/libraries/haskell/zipper/default.nix @@ -12,6 +12,5 @@ cabal.mkDerivation (self: { description = "Generic zipper for families of recursive datatypes"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/zlib-bindings/default.nix b/pkgs/development/libraries/haskell/zlib-bindings/default.nix index 9dd91fa1f72c0237b16938b492a57033cf7c70dc..a14d685e96812f78c3801962d516b6874be2f3ac 100644 --- a/pkgs/development/libraries/haskell/zlib-bindings/default.nix +++ b/pkgs/development/libraries/haskell/zlib-bindings/default.nix @@ -13,6 +13,5 @@ cabal.mkDerivation (self: { description = "Low-level bindings to the zlib package. (deprecated)"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/zlib-conduit/default.nix b/pkgs/development/libraries/haskell/zlib-conduit/default.nix index 596dbdfb21ea9bd8edc6f9a65666896423af3490..3d91442022da04a465a184e67928b68abe1b37ad 100644 --- a/pkgs/development/libraries/haskell/zlib-conduit/default.nix +++ b/pkgs/development/libraries/haskell/zlib-conduit/default.nix @@ -13,6 +13,5 @@ cabal.mkDerivation (self: { description = "Streaming compression/decompression via conduits. (deprecated)"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/zlib-enum/default.nix b/pkgs/development/libraries/haskell/zlib-enum/default.nix index 928511be957f9f633ffafe00224cbc920d328084..4b133b4c05571b626b32e844c2eb9dfe65f2632d 100644 --- a/pkgs/development/libraries/haskell/zlib-enum/default.nix +++ b/pkgs/development/libraries/haskell/zlib-enum/default.nix @@ -14,6 +14,5 @@ cabal.mkDerivation (self: { description = "Enumerator interface for zlib compression"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/zlib/0.5.0.0.nix b/pkgs/development/libraries/haskell/zlib/0.5.0.0.nix index 6e44732abec2180edd03e04d225d95a87c71c6d5..b676048212937881d7c85f6b6caf3598ac8ab795 100644 --- a/pkgs/development/libraries/haskell/zlib/0.5.0.0.nix +++ b/pkgs/development/libraries/haskell/zlib/0.5.0.0.nix @@ -11,6 +11,6 @@ cabal.mkDerivation (self: { description = "Compression and decompression in the gzip and zlib formats"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/zlib/0.5.2.0.nix b/pkgs/development/libraries/haskell/zlib/0.5.2.0.nix index 190c2b0cc725fa999eecf8acff8853fc6c507e9b..f3669c97c0a8948d02a4ab5678a429b416277232 100644 --- a/pkgs/development/libraries/haskell/zlib/0.5.2.0.nix +++ b/pkgs/development/libraries/haskell/zlib/0.5.2.0.nix @@ -11,6 +11,6 @@ cabal.mkDerivation (self: { description = "Compression and decompression in the gzip and zlib formats"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/zlib/0.5.3.1.nix b/pkgs/development/libraries/haskell/zlib/0.5.3.1.nix index 73e6e42f7015c19a49f7f8c495b0c2bfbbb1aff2..1bed95bc2e82f2ba658f7cc8b648cac600223a04 100644 --- a/pkgs/development/libraries/haskell/zlib/0.5.3.1.nix +++ b/pkgs/development/libraries/haskell/zlib/0.5.3.1.nix @@ -11,6 +11,6 @@ cabal.mkDerivation (self: { description = "Compression and decompression in the gzip and zlib formats"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/zlib/0.5.3.3.nix b/pkgs/development/libraries/haskell/zlib/0.5.3.3.nix index 8902e9f75e399a15e0f2499498c122e3b65beded..5260b55a027716ff9927d221fdeb97a9abf617b5 100644 --- a/pkgs/development/libraries/haskell/zlib/0.5.3.3.nix +++ b/pkgs/development/libraries/haskell/zlib/0.5.3.3.nix @@ -12,6 +12,6 @@ cabal.mkDerivation (self: { description = "Compression and decompression in the gzip and zlib formats"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/zlib/0.5.4.0.nix b/pkgs/development/libraries/haskell/zlib/0.5.4.0.nix index cabb6875a0d5fb6a01e76ac07fa5e06827c6d4ba..8b13da93ce34439f0130ca050f87be4fed3ac0dd 100644 --- a/pkgs/development/libraries/haskell/zlib/0.5.4.0.nix +++ b/pkgs/development/libraries/haskell/zlib/0.5.4.0.nix @@ -11,6 +11,6 @@ cabal.mkDerivation (self: { description = "Compression and decompression in the gzip and zlib formats"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/zlib/0.5.4.1.nix b/pkgs/development/libraries/haskell/zlib/0.5.4.1.nix index 90c693376b9b6f4eb3e62fcb259db53e8d4cee83..28f69ad0a64ab685eddec497f4356895d16962cb 100644 --- a/pkgs/development/libraries/haskell/zlib/0.5.4.1.nix +++ b/pkgs/development/libraries/haskell/zlib/0.5.4.1.nix @@ -11,6 +11,5 @@ cabal.mkDerivation (self: { description = "Compression and decompression in the gzip and zlib formats"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/hawknl/default.nix b/pkgs/development/libraries/hawknl/default.nix index 78206de9f1417ad89c107e0db94ceb8e8005bc40..290f411cbf4924ff455d0247a571cbd41a06d44b 100644 --- a/pkgs/development/libraries/hawknl/default.nix +++ b/pkgs/development/libraries/hawknl/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation { meta = { homepage = http://hawksoft.com/hawknl/; description = "Free, open source, game oriented network API"; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; }; } diff --git a/pkgs/development/libraries/ibus/default.nix b/pkgs/development/libraries/ibus/default.nix index 905f11dfdc22750550ea3f5948c97221714537c9..6b426169a708e66e3056215938d23e44a6db842b 100644 --- a/pkgs/development/libraries/ibus/default.nix +++ b/pkgs/development/libraries/ibus/default.nix @@ -19,7 +19,10 @@ stdenv.mkDerivation rec { libnotify isocodes gobjectIntrospection ]; - preBuild = "patchShebangs ./scripts"; + preBuild = '' + patchShebangs ./scripts + substituteInPlace data/dconf/Makefile --replace "dconf update" "echo" + ''; preFixup = '' for f in "$out"/bin/*; do diff --git a/pkgs/development/libraries/icu/default.nix b/pkgs/development/libraries/icu/default.nix index 12628e4c53db785b1a2e0996ba32590ad6a31a2c..a029eab6f1218d0f651c1ed1cbe097deb7a41948 100644 --- a/pkgs/development/libraries/icu/default.nix +++ b/pkgs/development/libraries/icu/default.nix @@ -30,7 +30,8 @@ stdenv.mkDerivation { sed -i -e "s|/bin/sh|${stdenv.shell}|" configure ''; - configureFlags = "--disable-debug"; + configureFlags = "--disable-debug" + + stdenv.lib.optionalString stdenv.isDarwin " --enable-rpath"; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/iniparser/default.nix b/pkgs/development/libraries/iniparser/default.nix index 55c4dbff296050a272e9bbed99bfc97540690db9..99a256e48adfc61333cfc7745fffb9b3473971fc 100644 --- a/pkgs/development/libraries/iniparser/default.nix +++ b/pkgs/development/libraries/iniparser/default.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation rec{ meta = { homepage = http://ndevilla.free.fr/iniparser; description = "Free standalone ini file parsing library"; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/development/libraries/irrlicht/default.nix b/pkgs/development/libraries/irrlicht/default.nix index 760ad096fd0b653ecb7494f80855b4fd726159b6..ac67c17218f08712bca806547f1b2b99088715c8 100644 --- a/pkgs/development/libraries/irrlicht/default.nix +++ b/pkgs/development/libraries/irrlicht/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://irrlicht.sourceforge.net/; - license = "zlib"; + license = stdenv.lib.licenses.zlib; description = "Open source high performance realtime 3D engine written in C++"; }; } diff --git a/pkgs/development/libraries/isl/0.12.2.nix b/pkgs/development/libraries/isl/0.12.2.nix index 995cd0510b4c352f9f088d0b463c19be6c8abab9..f1da2c064092bcabf835ef92e9e74d0fa362bc69 100644 --- a/pkgs/development/libraries/isl/0.12.2.nix +++ b/pkgs/development/libraries/isl/0.12.2.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.kotnet.org/~skimo/isl/; - license = "LGPLv2.1"; + license = stdenv.lib.licenses.lgpl21; description = "A library for manipulating sets and relations of integer points bounded by linear constraints"; maintainers = [ stdenv.lib.maintainers.shlevy ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/isl/default.nix b/pkgs/development/libraries/isl/default.nix index 7711d4f170f95c51a9db47cd8ab0536d134cdc3a..7e08c8afe6f62cf93a9f1de8f5cfd10371ab5716 100644 --- a/pkgs/development/libraries/isl/default.nix +++ b/pkgs/development/libraries/isl/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.kotnet.org/~skimo/isl/; - license = "LGPLv2.1"; + license = stdenv.lib.licenses.lgpl21; description = "A library for manipulating sets and relations of integer points bounded by linear constraints"; maintainers = [ stdenv.lib.maintainers.shlevy ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/jansson/default.nix b/pkgs/development/libraries/jansson/default.nix index 3d4e5f260dce64374c2380b17b15ab9c3b8511a5..0f0fa3f775a19bfba2549dcce3f0fcb75dc37987 100644 --- a/pkgs/development/libraries/jansson/default.nix +++ b/pkgs/development/libraries/jansson/default.nix @@ -11,6 +11,6 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.digip.org/jansson/"; description = "C library for encoding, decoding and manipulating JSON data"; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/development/libraries/java/geoipjava/default.nix b/pkgs/development/libraries/java/geoipjava/default.nix index a924e2adfa6391e5ca587a3906499652cced2a25..5c83a0ba35798e82ef197607b9e8d8b0e10c21bd 100644 --- a/pkgs/development/libraries/java/geoipjava/default.nix +++ b/pkgs/development/libraries/java/geoipjava/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { ''; meta = { description = "GeoIP Java API"; - license = "LGPL2.1+"; + license = stdenv.lib.licenses.lgpl21Plus; maintainers = [ stdenv.lib.maintainers.sander ]; }; } diff --git a/pkgs/development/libraries/java/junit/default.nix b/pkgs/development/libraries/java/junit/default.nix index 888365f789f735abfb28a24d88e83964be85c89a..b398a7a114730e76102577dada7cd7fd0d21b82a 100644 --- a/pkgs/development/libraries/java/junit/default.nix +++ b/pkgs/development/libraries/java/junit/default.nix @@ -1,30 +1,23 @@ -{ stdenv, fetchurl }: +{ stdenv, antBuild, fetchgit, perl }: let - - junit = fetchurl { - url = http://search.maven.org/remotecontent?filepath=junit/junit/4.11/junit-4.11.jar; - sha256 = "1zh6klzv8w30dx7jg6pkhllk4587av4znflzhxz8x97c7rhf3a4h"; - }; - - hamcrest = fetchurl { - url = http://search.maven.org/remotecontent?filepath=org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar; - sha256 = "1sfqqi8p5957hs9yik44an3lwpv8ln2a6sh9gbgli4vkx68yzzb6"; + version = "4.11"; +in antBuild { + name = "junit-${version}"; + + # I think this is only used to generate the docs, and will likely disappear + # with the next release of junit since its build system completely changes. + buildInputs = [perl]; + + src = fetchgit { + url = "https://github.com/junit-team/junit.git"; + sha256 = "019azv0cfy2zs45c7g3r952gvjmikkq76p2ydr4q5252r0pzy9dr"; + rev = "c2e4d911fadfbd64444fb285342a8f1b72336169"; }; -in - -stdenv.mkDerivation { - name = "junit-4.11"; - - unpackPhase = "true"; - - installPhase = - '' - mkdir -p $out/share/java - ln -s ${junit} $out/share/java/junit.jar - ln -s ${hamcrest} $out/share/java/hamcrest-core.jar - ''; + antProperties = [ + { name = "version"; value = version; } + ]; meta = { homepage = http://www.junit.org/; diff --git a/pkgs/development/libraries/java/junixsocket/default.nix b/pkgs/development/libraries/java/junixsocket/default.nix index e49e626aa001835fd36ef42a3d628b4ee6a267c8..317ba601cfbda8f773c11ca58917388649047c9c 100644 --- a/pkgs/development/libraries/java/junixsocket/default.nix +++ b/pkgs/development/libraries/java/junixsocket/default.nix @@ -14,9 +14,6 @@ stdenv.mkDerivation rec { preConfigure = '' - substituteInPlace build.xml \ - --replace /usr/bin/ "" \ - --replace macosx darwin substituteInPlace src/main/org/newsclub/net/unix/NativeUnixSocketConfig.java \ --replace /opt/newsclub/lib-native $out/lib ''; @@ -25,7 +22,7 @@ stdenv.mkDerivation rec { ANT_ARGS = # Note that our OpenJDK on Darwin is currently 32-bit, so we have to build a 32-bit dylib. - (if stdenv.is64bit && !stdenv.isDarwin then [ "-Dskip32=true" ] else [ "-Dskip64=true" ]) + (if stdenv.is64bit then [ "-Dskip32=true" ] else [ "-Dskip64=true" ]) ++ [ "-Dgcc=cc" "-Dant.build.javac.source=1.6" ] ++ stdenv.lib.optional stdenv.isDarwin "-DisMac=true"; diff --git a/pkgs/development/libraries/java/libmatthew-java/default.nix b/pkgs/development/libraries/java/libmatthew-java/default.nix index 0b77de56987b65a039a42263005784aae5f6f052..3924b0cdc22486186bec32c7ff88a08c904aabf8 100644 --- a/pkgs/development/libraries/java/libmatthew-java/default.nix +++ b/pkgs/development/libraries/java/libmatthew-java/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "libmatthew-java-0.8"; src = fetchurl { - url = http://www.matthew.ath.cx/projects/java/libmatthew-java-0.8.tar.gz; + url = http://pkgs.fedoraproject.org/repo/pkgs/libmatthew-java/libmatthew-java-0.8.tar.gz/8455b8751083ce25c99c2840609271f5/libmatthew-java-0.8.tar.gz; sha256 = "1yldkhsdzm0a41a0i881bin2jklhp85y3ah245jd6fz3npcx7l85"; }; JAVA_HOME=jdk; diff --git a/pkgs/development/libraries/java/swt/default.nix b/pkgs/development/libraries/java/swt/default.nix index 59f31ac3139ae96451e7b31f43106cc29c9bac0a..f64edce7b4c1fd71624fb64fdaddeafcb525595a 100644 --- a/pkgs/development/libraries/java/swt/default.nix +++ b/pkgs/development/libraries/java/swt/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { # releases of SWT. So we just grab a binary release and extract # "src.zip" from that. src = fetchurl { - url = "http://eclipse.ialto.com/eclipse/downloads/drops/R-3.7.2-201202080800/swt-3.7.2-gtk-linux-x86.zip"; + url = "http://archive.eclipse.org/eclipse/downloads/drops/R-3.7.2-201202080800/swt-3.7.2-gtk-linux-x86.zip"; sha256 = "10si8kmc7c9qmbpzs76609wkfb784pln3qpmra73gb3fbk7z8caf"; }; diff --git a/pkgs/development/libraries/jbig2dec/default.nix b/pkgs/development/libraries/jbig2dec/default.nix index e15c5c8d179fd6e85c38cd8fd148716d129c6615..83d3149a50fd8d6df3c9ccc14417b776be41607d 100644 --- a/pkgs/development/libraries/jbig2dec/default.nix +++ b/pkgs/development/libraries/jbig2dec/default.nix @@ -11,6 +11,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://jbig2dec.sourceforge.net/; description = "Decoder implementation of the JBIG2 image compression format"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/development/libraries/judy/default.nix b/pkgs/development/libraries/judy/default.nix index 8c45adf4b570db81a9dee70b30396d11895f66c5..4199becb06d9cd0118cc5ece7173d992027fb9b8 100644 --- a/pkgs/development/libraries/judy/default.nix +++ b/pkgs/development/libraries/judy/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { meta = { homepage = http://judy.sourceforge.net/; - license = "LGPLv2.1+"; + license = stdenv.lib.licenses.lgpl21Plus; description = "State-of-the-art C library that implements a sparse dynamic array"; }; } diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix index 8f4138282f0f43477e26e79eb0654b53680c7133..d4285db1efb7f9dcd9a0dbfa97c884b69ac09835 100644 --- a/pkgs/development/libraries/kerberos/heimdal.nix +++ b/pkgs/development/libraries/kerberos/heimdal.nix @@ -24,4 +24,8 @@ stdenv.mkDerivation rec { ''; propagatedBuildInputs = [ readline db openssl openldap cyrus_sasl sqlite]; + + meta = { + platforms = stdenv.lib.platforms.linux; + }; } diff --git a/pkgs/development/libraries/lcms/default.nix b/pkgs/development/libraries/lcms/default.nix index 115da78de97963ecee020c8149ba69067e066dc3..c98a01f6f70f1c8413984415f62dc1ecde4d5ca3 100644 --- a/pkgs/development/libraries/lcms/default.nix +++ b/pkgs/development/libraries/lcms/default.nix @@ -11,6 +11,6 @@ stdenv.mkDerivation { meta = { description = "Color management engine"; homepage = http://www.littlecms.com/; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/development/libraries/lcms2/default.nix b/pkgs/development/libraries/lcms2/default.nix index 774cc7047e8ccbde923b58da3fbc493bf4cf831c..521118f31757b2ac6fb1fe38ebc7473f52559b31 100644 --- a/pkgs/development/libraries/lcms2/default.nix +++ b/pkgs/development/libraries/lcms2/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "Color management engine"; homepage = http://www.littlecms.com/; - license = "MIT"; + license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.urkud ]; }; diff --git a/pkgs/development/libraries/lensfun/default.nix b/pkgs/development/libraries/lensfun/default.nix index f1f1c7dd909254fa203bb2f00291d7c2fede6b12..94dfe871240384a0c83e350c47dcb6234f1d56b2 100644 --- a/pkgs/development/libraries/lensfun/default.nix +++ b/pkgs/development/libraries/lensfun/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { platforms = platforms.all; maintainers = [ maintainers.urkud ]; - license = "LGPL3"; + license = stdenv.lib.licenses.lgpl3; description = "An opensource database of photographic lenses and their characteristics"; homepage = http://lensfun.sourceforge.net/; }; diff --git a/pkgs/development/libraries/levmar/default.nix b/pkgs/development/libraries/levmar/default.nix index 3028ba7367cb413b057ab0706b598421dbaeff30..4e6dd6d5b0287332a0767b8afaf50f97f9641911 100644 --- a/pkgs/development/libraries/levmar/default.nix +++ b/pkgs/development/libraries/levmar/default.nix @@ -22,7 +22,6 @@ stdenv.mkDerivation rec { meta = { description = "ANSI C implementations of Levenberg-Marquardt, usable also from C++"; homepage = http://www.ics.forth.gr/~lourakis/levmar/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } - diff --git a/pkgs/development/libraries/libao/default.nix b/pkgs/development/libraries/libao/default.nix index 2fc03e0d67cc680fa0b876b4d9a7c035654a5dd5..401573378ee4e2fdec041f912d0b54d0ee6c70d2 100644 --- a/pkgs/development/libraries/libao/default.nix +++ b/pkgs/development/libraries/libao/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pulseaudio, alsaLib +{ lib, stdenv, fetchurl, pkgconfig, pulseaudio, alsaLib , usePulseAudio }: stdenv.mkDerivation { @@ -8,8 +8,9 @@ stdenv.mkDerivation { sha256 = "1m0v2y6bhr4iwsgdkc7b3y0qgpvpv1ifbxsy8n8ahsvjn6wmppi9"; }; - buildInputs = [ pkgconfig alsaLib ] ++ (if usePulseAudio then [ pulseaudio ] - else [ alsaLib ]); + buildInputs = + [ pkgconfig ] ++ + lib.optional stdenv.isLinux (if usePulseAudio then [ pulseaudio ] else [ alsaLib ]); meta = { longDescription = '' @@ -18,6 +19,6 @@ stdenv.mkDerivation { platforms. ''; homepage = http://xiph.org/ao/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/development/libraries/libassuan/default.nix b/pkgs/development/libraries/libassuan/default.nix index d9775c256104153c124f89d495e8c231034e324a..f5a3d92d3db1eb0f1fe39f5802ac6b37d632ef74 100644 --- a/pkgs/development/libraries/libassuan/default.nix +++ b/pkgs/development/libraries/libassuan/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; homepage = http://gnupg.org; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/libraries/libassuan/git.nix b/pkgs/development/libraries/libassuan/git.nix index 743528d926516f29d904ffaf68e98d06ed965c8e..7f77183c8432b26a0d32f06bafd59480d52483d7 100644 --- a/pkgs/development/libraries/libassuan/git.nix +++ b/pkgs/development/libraries/libassuan/git.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; homepage = http://gnupg.org; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/libraries/libassuan1/default.nix b/pkgs/development/libraries/libassuan1/default.nix index 9a161ec170f4b9d97ad91f3e3d86c06ea3dbabbd..2532cec0390031a024ee0a7c73019bc4cd4ee98a 100644 --- a/pkgs/development/libraries/libassuan1/default.nix +++ b/pkgs/development/libraries/libassuan1/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation rec { ''; homepage = http://gnupg.org; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; }; } diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix index b21f530478a33d845801e480abddf9e40588a37c..2f9e1786473e7ec2ddf9b0e695b5efbd93d92344 100644 --- a/pkgs/development/libraries/libav/default.nix +++ b/pkgs/development/libraries/libav/default.nix @@ -26,9 +26,9 @@ with { inherit (stdenv.lib) optional optionals; }; let result = { - libav_0_8 = libavFun "0.8.12" "0069zv9s0f4silzdyjac87g7a89jhh27sadd1zcr9xngxbvd93fr"; - libav_9 = libavFun "9.13" "1jp6vlza5srks1scgl000x9y1y0l88inrcby4yxv6n92rpv5vw1g"; - libav_10 = libavFun "10.1" "05cy1yq9rxarajs9gfdhkji8gmcpar125xi8lrx4cfplmp4lvq6m"; + libav_0_8 = libavFun "0.8.13" "1fr3rzykrlm1cla0csm9hqa3gcqp19hf5rgn70nyb9w92r67v685"; + libav_9 = libavFun "9.16" "18378gdgzqsxaacc9vl7ligwndbdvy95wbn50hs8xvdqn1rn916a"; + libav_10 = libavFun "10.3" "1fq83rc5534fjqjlhkw5i9k54dmyqn2pgvyillm6pws8rkn9yb5r"; }; libavFun = version : sha256 : stdenv.mkDerivation rec { @@ -105,7 +105,7 @@ let description = "A complete, cross-platform solution to record, convert and stream audio and video (fork of ffmpeg)"; license = with licenses; if enableUnfree then unfree #ToDo: redistributable or not? else if enableGPL then gpl2Plus else lgpl21Plus; - platforms = platforms.all; + platforms = platforms.linux; maintainers = [ maintainers.vcunat ]; }; }; # libavFun diff --git a/pkgs/development/libraries/libbsd/default.nix b/pkgs/development/libraries/libbsd/default.nix index 3c28b95c06672f51489ff0bb8acb8db85e767728..758f86e5f9a59183d886442da712fc30f394bec4 100644 --- a/pkgs/development/libraries/libbsd/default.nix +++ b/pkgs/development/libraries/libbsd/default.nix @@ -18,7 +18,6 @@ in stdenv.mkDerivation { meta = { description = "Common functions found on BSD systems"; homepage = http://libbsd.freedesktop.org/; - license = "BSD3"; + license = stdenv.lib.licenses.bsd3; }; } - diff --git a/pkgs/development/libraries/libc++/default.nix b/pkgs/development/libraries/libc++/default.nix index 70da4462486d386ecd142b628a7665a1f08605f6..32035709d8f9a4af5c08e9a6e3e4d0a0f8bc134c 100644 --- a/pkgs/development/libraries/libc++/default.nix +++ b/pkgs/development/libraries/libc++/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, fetchsvn, cmake, libcxxabi, python }: let - version = "3.4"; + version = "3.4.2"; in stdenv.mkDerivation rec { name = "libc++-${version}"; src = fetchurl { url = "http://llvm.org/releases/${version}/libcxx-${version}.src.tar.gz"; - sha256 = "1sqd5qhqj7qnn9zjxx9bv7ky4f7xgmh9sbgd53y1kszhg41217xx"; + sha256 = "0z3jdvgcq995khkpis5c5vaxhbmvbqjlalbhn09k6pgb5zp46rc2"; }; buildInputs = [ cmake libcxxabi python ]; @@ -26,6 +26,6 @@ in stdenv.mkDerivation rec { description = "A new implementation of the C++ standard library, targeting C++11"; license = "BSD"; maintainers = stdenv.lib.maintainers.shlevy; - platforms = stdenv.lib.platforms.all; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/libc++abi/default.nix b/pkgs/development/libraries/libc++abi/default.nix index 51d18a7b907f50edb9169eb5a58918cc82054830..8218cbb966f0a651c4c6176b80ce263b7997d3f1 100644 --- a/pkgs/development/libraries/libc++abi/default.nix +++ b/pkgs/development/libraries/libc++abi/default.nix @@ -34,6 +34,6 @@ in stdenv.mkDerivation { description = "A new implementation of low level support for a standard C++ library"; license = "BSD"; maintainers = stdenv.lib.maintainers.shlevy; - platforms = stdenv.lib.platforms.all; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/libcanberra/default.nix b/pkgs/development/libraries/libcanberra/default.nix index c05528450543062b26de5eabb83591dd054dc865..e69cd4ed2acc4da30f77b9c51392dde38cf98b8f 100644 --- a/pkgs/development/libraries/libcanberra/default.nix +++ b/pkgs/development/libraries/libcanberra/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { homepage = http://0pointer.de/lennart/projects/libcanberra/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ ]; platforms = stdenv.lib.platforms.gnu; # arbitrary choice diff --git a/pkgs/development/libraries/libcangjie/default.nix b/pkgs/development/libraries/libcangjie/default.nix index 34441d8fa7f803e6963c58661a0d78551b00f59c..d22ce9ae2bf1a2886c08fda664b435bc5419283b 100644 --- a/pkgs/development/libraries/libcangjie/default.nix +++ b/pkgs/development/libraries/libcangjie/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { libcangjie is a library implementing the Cangjie input method. ''; homepage = http://cangjians.github.io/projects/libcangjie/; - license = "LGPLv3+"; + license = stdenv.lib.licenses.lgpl3Plus; maintainers = [ stdenv.lib.maintainers.linquize ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/libcddb/default.nix b/pkgs/development/libraries/libcddb/default.nix index 8e4f8a36547a905322ef53f1c095836bdb47ddee..b9823cefd2d9566331ef5246414125c10a42efa2 100644 --- a/pkgs/development/libraries/libcddb/default.nix +++ b/pkgs/development/libraries/libcddb/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { meta = { description = "Libcddb is a C library to access data on a CDDB server (freedb.org)"; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; homepage = http://libcddb.sourceforge.net/; }; } diff --git a/pkgs/development/libraries/libcdio/0.82.nix b/pkgs/development/libraries/libcdio/0.82.nix index fc26fb9aca113994d6b958a27f0ac7c4274f3067..db4af40afbd4475f9891f590ebc0f90c41393174 100644 --- a/pkgs/development/libraries/libcdio/0.82.nix +++ b/pkgs/development/libraries/libcdio/0.82.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ISO-9660 filesystems (libiso9660), as well as utility programs such as an audio CD player and an extractor. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://www.gnu.org/software/libcdio/; }; } diff --git a/pkgs/development/libraries/libcdio/default.nix b/pkgs/development/libraries/libcdio/default.nix index 856d5124a3ff3edbb79fa92d4ffeecac9e7de266..ac7b428bfb00fee4fa828e3aafc6a03398c0ca63 100644 --- a/pkgs/development/libraries/libcdio/default.nix +++ b/pkgs/development/libraries/libcdio/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ISO-9660 filesystems (libiso9660), as well as utility programs such as an audio CD player and an extractor. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://www.gnu.org/software/libcdio/; }; } diff --git a/pkgs/development/libraries/libcdr/default.nix b/pkgs/development/libraries/libcdr/default.nix index 1da25527ef7ee8f07574f757bdc5a26edc4df497..23fafb44c81ead0fe81d44e358787180bc0108f4 100644 --- a/pkgs/development/libraries/libcdr/default.nix +++ b/pkgs/development/libraries/libcdr/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchurl, libwpg, libwpd, lcms, pkgconfig }: +{ stdenv, fetchurl, libwpg, libwpd, lcms, pkgconfig, librevenge, icu, boost }: stdenv.mkDerivation rec { - name = "libcdr-0.0.8"; + name = "libcdr-0.1.0"; src = fetchurl { - url = "http://dev-www.libreoffice.org/src/${name}.tar.xz"; - sha256 = "117a8gp29xs3kin6kaisb3frsx8dwrsjgs4wq4y5hjqprzy6lwz0"; + url = "http://dev-www.libreoffice.org/src/${name}.tar.bz2"; + sha256 = "1l4glkyyxhzqq6j9n9cc01sf1q7xx8dd97cl3bwj8w4fp06ihv7g"; }; - buildInputs = [ libwpg libwpd lcms ]; + buildInputs = [ libwpg libwpd lcms librevenge icu boost ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/libchamplain/0.6.nix b/pkgs/development/libraries/libchamplain/0.6.nix index 79c734dcad62f244e6cc0be376eb2efb8be0ca5c..a2b35a7265180d5069d3506b77eafb1c58dceed2 100644 --- a/pkgs/development/libraries/libchamplain/0.6.nix +++ b/pkgs/development/libraries/libchamplain/0.6.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://projects.gnome.org/libchamplain/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; description = "libchamplain, a C library providing a ClutterActor to display maps"; diff --git a/pkgs/development/libraries/libchamplain/default.nix b/pkgs/development/libraries/libchamplain/default.nix index 263b34701eedb374d221970caeb842622b1ea4b2..51b7f7e181d0027eb7632a023c964092e400fd77 100644 --- a/pkgs/development/libraries/libchamplain/default.nix +++ b/pkgs/development/libraries/libchamplain/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://projects.gnome.org/libchamplain/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; description = "libchamplain, a C library providing a ClutterActor to display maps"; diff --git a/pkgs/development/libraries/libchop/default.nix b/pkgs/development/libraries/libchop/default.nix index 1b16d361c6dc977a151452b72671882f8b79bea7..f0d7fbfbeb69cf876f64deeef9fd33b57ad07a27 100644 --- a/pkgs/development/libraries/libchop/default.nix +++ b/pkgs/development/libraries/libchop/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { ''; homepage = http://nongnu.org/libchop/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [ ludo viric ]; platforms = stdenv.lib.platforms.gnu; diff --git a/pkgs/development/libraries/libcue/default.nix b/pkgs/development/libraries/libcue/default.nix index b4cea379bbaef24b8047a28d1244dbf75d3e8e03..a5ff8d409b2f94b730db87526078f47a2a7180af 100644 --- a/pkgs/development/libraries/libcue/default.nix +++ b/pkgs/development/libraries/libcue/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { available. ''; homepage = http://sourceforge.net/projects/libcue/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ astsmtl ]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/development/libraries/libdaemon/default.nix b/pkgs/development/libraries/libdaemon/default.nix index 58c150a22d6e18c978b398cfe66afcf24821ae74..ba7e3e47ff7672dd459c29dd262e2fa98d15f89f 100644 --- a/pkgs/development/libraries/libdaemon/default.nix +++ b/pkgs/development/libraries/libdaemon/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { homepage = http://0pointer.de/lennart/projects/libdaemon/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; hydraPlatforms = stdenv.lib.platforms.linux; maintainers = [ ]; diff --git a/pkgs/development/libraries/libdc1394/default.nix b/pkgs/development/libraries/libdc1394/default.nix index f92bc58552431e4a2ab5a17f3f032e76fca78320..bc5f6a1d7a03f37f9d73643611563a0b7c7c0c5c 100644 --- a/pkgs/development/libraries/libdc1394/default.nix +++ b/pkgs/development/libraries/libdc1394/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://sourceforge.net/projects/libdc1394/; description = "Capture and control API for IIDC compliant cameras"; - license = "LGPLv2.1+"; + license = stdenv.lib.licenses.lgpl21Plus; maintainers = [ stdenv.lib.maintainers.viric ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/libdc1394avt/default.nix b/pkgs/development/libraries/libdc1394avt/default.nix index 69f66d7f5b7b103b3a01efe0a580578eee1a30f9..7565502cc1c163591fd302c1f170b30f00c92935 100644 --- a/pkgs/development/libraries/libdc1394avt/default.nix +++ b/pkgs/development/libraries/libdc1394avt/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.alliedvisiontec.com/us/products/software/linux/avt-fire4linux.html; description = "Capture and control API for IIDC cameras with AVT extensions"; - license = "LGPLv2.1+"; + license = stdenv.lib.licenses.lgpl21Plus; maintainers = [ stdenv.lib.maintainers.viric ]; platforms = stdenv.lib.platforms.linux; broken = true; diff --git a/pkgs/development/libraries/libdiscid/default.nix b/pkgs/development/libraries/libdiscid/default.nix index b8f79f2ae695cdea0008c760b4cc29a1bf472699..f9d1fc87870d089965cd803f771341653edd3a45 100644 --- a/pkgs/development/libraries/libdiscid/default.nix +++ b/pkgs/development/libraries/libdiscid/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { meta = { description = "A C library for creating MusicBrainz DiscIDs from audio CDs"; homepage = http://musicbrainz.org/doc/libdiscid; - license = "LGPL-2.1"; + license = stdenv.lib.licenses.lgpl21; }; } diff --git a/pkgs/development/libraries/libdivsufsort/default.nix b/pkgs/development/libraries/libdivsufsort/default.nix index 21ee2351c58f9a29204665d77afe4b69d26500ae..62c7d4322527ca80cf5eef28c8e8cc587e50ccea 100644 --- a/pkgs/development/libraries/libdivsufsort/default.nix +++ b/pkgs/development/libraries/libdivsufsort/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { meta = { homepage = http://code.google.com/p/libdivsufsort/; - license = "MIT"; + license = stdenv.lib.licenses.mit; description = "Library to construct the suffix array and the BW transformed string"; }; } diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index 69d09fe9fae4cc3ee872ee4f176faa5b9c1079a9..d7a6f8d544300dbdf98047cb84716ad56092aabd 100644 --- a/pkgs/development/libraries/libdrm/default.nix +++ b/pkgs/development/libraries/libdrm/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, udev }: stdenv.mkDerivation rec { - name = "libdrm-2.4.54"; + name = "libdrm-2.4.56"; src = fetchurl { url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2"; - sha256 = "1sg45y9yiz9yyp6dkyilqz8rhii9azgy53i2s4iia3p8zgmh2h6r"; + sha256 = "0c20wpfa94d8kww0f2xinmm4axsl4nhq921xj4i88yhpjbhbn3z2"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/libdvbpsi/default.nix b/pkgs/development/libraries/libdvbpsi/default.nix index d3ce7082621d9523e6ac1cd2030353513daeeea4..6af8e7a415e2cf17c1f4f4a343c4a842c9775810 100644 --- a/pkgs/development/libraries/libdvbpsi/default.nix +++ b/pkgs/development/libraries/libdvbpsi/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { description = "A simple library designed for decoding and generation of MPEG TS and DVB PSI tables according to standards ISO/IEC 13818 and ITU-T H.222.0"; homepage = http://www.videolan.org/developers/libdvbpsi.html ; platforms = stdenv.lib.platforms.linux; - license = "LGPLv2.1"; + license = stdenv.lib.licenses.lgpl21; }; } diff --git a/pkgs/development/libraries/libdwg/default.nix b/pkgs/development/libraries/libdwg/default.nix index a92a48bf75f9ad4fba10c254089261a96ce18056..a80c0677a3bdb12223cf84839c888968106c83e3 100644 --- a/pkgs/development/libraries/libdwg/default.nix +++ b/pkgs/development/libraries/libdwg/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { meta = { description = "library reading dwg files"; homepage = http://libdwg.sourceforge.net/en/; - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3; maintainers = [stdenv.lib.maintainers.marcweber]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/libeatmydata/default.nix b/pkgs/development/libraries/libeatmydata/default.nix index 6b3a16d1c0922e4326855f829294fef0dd6e1880..8d2d820a2301b43fcfe1d6d6b6f8a28d0515c5b7 100644 --- a/pkgs/development/libraries/libeatmydata/default.nix +++ b/pkgs/development/libraries/libeatmydata/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.flamingspork.com/projects/libeatmydata/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; description = "Small LD_PRELOAD library to disable fsync and friends"; }; } diff --git a/pkgs/development/libraries/libelf/default.nix b/pkgs/development/libraries/libelf/default.nix index ac52876f887ebefd8f7de59c101edd60799b0ec9..d9436456d0d4ee8d650a904575cd5a4eb8b73827 100644 --- a/pkgs/development/libraries/libelf/default.nix +++ b/pkgs/development/libraries/libelf/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation (rec { homepage = http://www.mr511.de/software/english.html; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; platforms = stdenv.lib.platforms.all; maintainers = [ ]; diff --git a/pkgs/development/libraries/libevdev/default.nix b/pkgs/development/libraries/libevdev/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..2776a3c0614c519963a8c20daf51c38ca96e1c9e --- /dev/null +++ b/pkgs/development/libraries/libevdev/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, python }: + +stdenv.mkDerivation rec { + name = "libevdev-1.2"; + + src = fetchurl { + url = "http://www.freedesktop.org/software/libevdev/${name}.tar.xz"; + sha256 = "0h54ym5rsmicl4gx7gcdaifpyndakbl38c5dcxgr27f0cy0635a1"; + }; + + buildInputs = [ python ]; + + meta = with stdenv.lib; { + description = "Wrapper library for evdev devices"; + homepage = http://www.freedesktop.org/software/libevdev/doc/latest/index.html; + license = licenses.mit; + platforms = platforms.linux; + maintainers = [ maintainers.amorsillo ]; + }; +} diff --git a/pkgs/development/libraries/libexif/default.nix b/pkgs/development/libraries/libexif/default.nix index 48c66cb6070618467aa949e002d992cbbe2d4bc2..4843b65c4d38ba0a9fef066a32cf6671a9a3925d 100644 --- a/pkgs/development/libraries/libexif/default.nix +++ b/pkgs/development/libraries/libexif/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://libexif.sourceforge.net/; description = "A library to read and manipulate EXIF data in digital photographs"; - license = "LGPL 2.1"; + license = stdenv.lib.licenses.lgpl21; }; } diff --git a/pkgs/development/libraries/libextractor/default.nix b/pkgs/development/libraries/libextractor/default.nix index 309816b65e5e6db14ce2b7b669606e3017fa685a..6df5ca683f1f012e19edd096a6ee0964ba07da13 100644 --- a/pkgs/development/libraries/libextractor/default.nix +++ b/pkgs/development/libraries/libextractor/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { additional MIME types are detected. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ ]; }; diff --git a/pkgs/development/libraries/libftdi/default.nix b/pkgs/development/libraries/libftdi/default.nix index ef7a67b7fcd427e9645a7d69a0f1244eaa9c7cda..6293632452ceaf74b725a83156fdba30aed3dfdb 100644 --- a/pkgs/development/libraries/libftdi/default.nix +++ b/pkgs/development/libraries/libftdi/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { meta = { description = "A library to talk to FTDI chips using libusb"; homepage = http://www.intra2net.com/en/developer/libftdi/; - license = "LGPLv2.1"; + license = stdenv.lib.licenses.lgpl21; }; } diff --git a/pkgs/development/libraries/libgadu/default.nix b/pkgs/development/libraries/libgadu/default.nix index 430560107702eef9b9ff222808af64b7892aa673..b039c84b2fb1962b7244307ef206d117882c97f4 100644 --- a/pkgs/development/libraries/libgadu/default.nix +++ b/pkgs/development/libraries/libgadu/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { description = "A library to deal with gadu-gadu protocol (most popular polish IM protocol)"; homepage = http://toxygen.net/libgadu/; platforms = stdenv.lib.platforms.linux; - license = "LGPLv2.1"; + license = stdenv.lib.licenses.lgpl21; }; } diff --git a/pkgs/development/libraries/libgcrypt/1.6.nix b/pkgs/development/libraries/libgcrypt/1.6.nix index 9dc8b8a23179761243a9c8cfc673607ff5c726ba..ced3b723b132c0eb51efec93c28bcd610e71c2a4 100644 --- a/pkgs/development/libraries/libgcrypt/1.6.nix +++ b/pkgs/development/libraries/libgcrypt/1.6.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { functions, random numbers and a lot of supporting functions. ''; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; homepage = https://www.gnu.org/software/libgcrypt/; repositories.git = git://git.gnupg.org/libgcrypt.git; diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix index c53b5479b7b22349093fbd0643b95c5c39517759..ba3de49ede8af99d406abc0f9d17b0ee3d646337 100644 --- a/pkgs/development/libraries/libgcrypt/default.nix +++ b/pkgs/development/libraries/libgcrypt/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation (rec { functions, random numbers and a lot of supporting functions. ''; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; homepage = http://gnupg.org/; platforms = stdenv.lib.platforms.all; @@ -38,4 +38,3 @@ stdenv.mkDerivation (rec { // stdenv.lib.optionalAttrs (stdenv.isFreeBSD && stdenv.isi686) { configureFlags = [ "--disable-aesni-support" ]; } ) - diff --git a/pkgs/development/libraries/libgeotiff/default.nix b/pkgs/development/libraries/libgeotiff/default.nix index 07e8d2869ce233353dd3bcb6977ea37a904bd834..d07aae3ab8074ea050f5206635e62fbd1ebd603c 100644 --- a/pkgs/development/libraries/libgeotiff/default.nix +++ b/pkgs/development/libraries/libgeotiff/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = { description = "Library implementing attempt to create a tiff based interchange format for georeferenced raster imagery"; homepage = http://www.remotesensing.org/geotiff/geotiff.html; - license = "X11"; + license = stdenv.lib.licenses.mit; maintainers = [stdenv.lib.maintainers.marcweber]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/libgksu/default.nix b/pkgs/development/libraries/libgksu/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..e3d64994fe2f4f58db2997fe530dd889188de688 --- /dev/null +++ b/pkgs/development/libraries/libgksu/default.nix @@ -0,0 +1,83 @@ +{ stdenv, fetchurl, pkgconfig, makeWrapper, gtk, gnome, gnome3, + libstartup_notification, libgtop, perl, perlXMLParser, autoconf, + automake, libtool, intltool, gtk_doc, docbook_xsl, xauth, sudo +}: + +stdenv.mkDerivation rec { + version = "2.0.12"; + pname = "libgksu"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "http://people.debian.org/~kov/gksu/${name}.tar.gz"; + sha256 = "1brz9j3nf7l2gd3a5grbp0s3nksmlrp6rxmgp5s6gjvxcb1wzy92"; + }; + + patches = [ + # Patches from the gentoo ebuild + + # Fix compilation on bsdc + ./libgksu-2.0.0-fbsd.patch + + # Fix wrong usage of LDFLAGS, gentoo bug #226837 + ./libgksu-2.0.7-libs.patch + + # Use po/LINGUAS + ./libgksu-2.0.7-polinguas.patch + + # Don't forkpty; gentoo bug #298289 + ./libgksu-2.0.12-revert-forkpty.patch + + # Make this gmake-3.82 compliant, gentoo bug #333961 + ./libgksu-2.0.12-fix-make-3.82.patch + + # Do not build test programs that are never executed; also fixes gentoo bug #367397 (underlinking issues). + ./libgksu-2.0.12-notests.patch + + # Fix automake-1.11.2 compatibility, gentoo bug #397411 + ./libgksu-2.0.12-automake-1.11.2.patch + ]; + + postPatch = '' + # gentoo bug #467026 + sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac + + # Fix some binary paths + sed -i -e 's|/usr/bin/xauth|${xauth}/bin/xauth|g' libgksu/gksu-run-helper.c libgksu/libgksu.c + sed -i -e 's|/usr/bin/sudo|${sudo}/bin/sudo|g' libgksu/libgksu.c + sed -i -e 's|/bin/su\([^d]\)|/var/setuid-wrappers/su\1|g' libgksu/libgksu.c + + touch NEWS README + ''; + + preConfigure = '' + intltoolize --force --copy --automake + autoreconf -vfi + ''; + + buildInputs = [ + pkgconfig makeWrapper gtk gnome.GConf libstartup_notification + gnome3.libgnome_keyring libgtop gnome.libglade perl perlXMLParser + autoconf automake libtool intltool gtk_doc docbook_xsl + ]; + + preFixup = '' + wrapProgram "$out/bin/gksu-properties" \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" + ''; + + enableParallelBuilding = true; + + meta = { + description = "A library for integration of su into applications"; + longDescription = '' + This library comes from the gksu program. It provides a simple API + to use su and sudo in programs that need to execute tasks as other + user. It provides X authentication facilities for running + programs in an X session. + ''; + homepage = "http://www.nongnu.org/gksu/"; + license = stdenv.lib.licenses.lgpl2; + maintainers = [ stdenv.lib.maintainers.romildo ]; + }; +} diff --git a/pkgs/development/libraries/libgksu/libgksu-2.0.0-fbsd.patch b/pkgs/development/libraries/libgksu/libgksu-2.0.0-fbsd.patch new file mode 100644 index 0000000000000000000000000000000000000000..5c007be5b4b4d95fe5e9770cd5cd0d1bbf7fd6a5 --- /dev/null +++ b/pkgs/development/libraries/libgksu/libgksu-2.0.0-fbsd.patch @@ -0,0 +1,60 @@ +diff --exclude-from=/home/dang/.diffrc -up -ruN libgksu-2.0.0.orig/libgksu/libgksu.c libgksu-2.0.0/libgksu/libgksu.c +--- libgksu-2.0.0.orig/libgksu/libgksu.c 2006-09-14 22:35:51.000000000 -0400 ++++ libgksu-2.0.0/libgksu/libgksu.c 2006-12-12 11:28:01.000000000 -0500 +@@ -23,7 +23,12 @@ + #include + #include + #include ++#ifdef __FreeBSD__ ++#include ++#include ++#else + #include ++#endif + #include + #include + #include +diff --exclude-from=/home/dang/.diffrc -up -ruN libgksu-2.0.0.orig/libgksu/Makefile.am libgksu-2.0.0/libgksu/Makefile.am +--- libgksu-2.0.0.orig/libgksu/Makefile.am 2006-09-14 22:35:52.000000000 -0400 ++++ libgksu-2.0.0/libgksu/Makefile.am 2006-12-12 11:28:01.000000000 -0500 +@@ -30,6 +30,6 @@ gksu_run_helper_SOURCES = gksu-run-helpe + noinst_PROGRAMS = test-gksu + test_gksu_SOURCES = test-gksu.c + test_gksu_LDADD = libgksu2.la +-test_gksu_LDFLAGS = `pkg-config --libs glib-2.0` ++test_gksu_LDFLAGS = `pkg-config --libs glib-2.0 gthread-2.0` + + EXTRA_DIST = libgksu.ver +diff --exclude-from=/home/dang/.diffrc -up -ruN libgksu-2.0.0.orig/libgksu/Makefile.in libgksu-2.0.0/libgksu/Makefile.in +--- libgksu-2.0.0.orig/libgksu/Makefile.in 2006-09-23 15:37:44.000000000 -0400 ++++ libgksu-2.0.0/libgksu/Makefile.in 2006-12-12 11:30:09.000000000 -0500 +@@ -283,7 +283,7 @@ gksu_run_helper_LDFLAGS = `pkg-config -- + gksu_run_helper_SOURCES = gksu-run-helper.c + test_gksu_SOURCES = test-gksu.c + test_gksu_LDADD = libgksu2.la +-test_gksu_LDFLAGS = `pkg-config --libs glib-2.0` ++test_gksu_LDFLAGS = `pkg-config --libs glib-2.0 gthread-2.0` + EXTRA_DIST = libgksu.ver + all: all-am + +diff --exclude-from=/home/dang/.diffrc -up -ruN libgksu-2.0.0.orig/libgksuui/Makefile.am libgksu-2.0.0/libgksuui/Makefile.am +--- libgksu-2.0.0.orig/libgksuui/Makefile.am 2006-09-14 22:35:31.000000000 -0400 ++++ libgksu-2.0.0/libgksuui/Makefile.am 2006-12-12 11:28:01.000000000 -0500 +@@ -12,4 +12,4 @@ includedir = ${prefix}/include/$(PACKAGE + noinst_PROGRAMS = test-gksuui + test_gksuui_SOURCES = test-gksuui.c + test_gksuui_LDADD = libgksuui1.0.la +-test_gksuui_LDFLAGS = `pkg-config --libs glib-2.0` ++test_gksuui_LDFLAGS = `pkg-config --libs glib-2.0 gthread-2.0` +diff --exclude-from=/home/dang/.diffrc -up -ruN libgksu-2.0.0.orig/libgksuui/Makefile.in libgksu-2.0.0/libgksuui/Makefile.in +--- libgksu-2.0.0.orig/libgksuui/Makefile.in 2006-09-23 15:37:44.000000000 -0400 ++++ libgksu-2.0.0/libgksuui/Makefile.in 2006-12-12 11:30:22.000000000 -0500 +@@ -250,7 +250,7 @@ libgksuui1_0_la_LDFLAGS = -Wl,-O1 `pkg-c + noinst_HEADERS = defines.h gksuui.h gksuui-dialog.h + test_gksuui_SOURCES = test-gksuui.c + test_gksuui_LDADD = libgksuui1.0.la +-test_gksuui_LDFLAGS = `pkg-config --libs glib-2.0` ++test_gksuui_LDFLAGS = `pkg-config --libs glib-2.0 gthread-2.0` + all: all-am + + .SUFFIXES: diff --git a/pkgs/development/libraries/libgksu/libgksu-2.0.12-automake-1.11.2.patch b/pkgs/development/libraries/libgksu/libgksu-2.0.12-automake-1.11.2.patch new file mode 100644 index 0000000000000000000000000000000000000000..0f22166fb8b7f8326696c0e2106de1599d31218e --- /dev/null +++ b/pkgs/development/libraries/libgksu/libgksu-2.0.12-automake-1.11.2.patch @@ -0,0 +1,25 @@ +Due to the following change, pkglib_PROGRAMS is invalid: + http://git.savannah.gnu.org/cgit/automake.git/commit/?id=9ca632642b006ac6b0fc4ce0ae5b34023faa8cbf + +https://savannah.nongnu.org/bugs/index.php?35241 +https://bugs.gentoo.org/show_bug.cgi?id=397411 + +--- + libgksu/Makefile.am | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libgksu/Makefile.am b/libgksu/Makefile.am +index 49362f9..3cb1090 100644 +--- a/libgksu/Makefile.am ++++ b/libgksu/Makefile.am +@@ -22,8 +22,8 @@ includedir = ${prefix}/include/${PACKAGE} + pkgconfigdir = ${libdir}/pkgconfig + pkgconfig_DATA = libgksu2.pc + +-pkglibdir = ${libdir}/${PACKAGE} +-pkglib_PROGRAMS = gksu-run-helper ++gksulibdir = ${libdir}/${PACKAGE} ++gksulib_PROGRAMS = gksu-run-helper + gksu_run_helper_LDADD = ${GLIB_LIBS} + gksu_run_helper_SOURCES = gksu-run-helper.c + diff --git a/pkgs/development/libraries/libgksu/libgksu-2.0.12-fix-make-3.82.patch b/pkgs/development/libraries/libgksu/libgksu-2.0.12-fix-make-3.82.patch new file mode 100644 index 0000000000000000000000000000000000000000..dd52b8247fa46d1a6ae705a5ed660c59287695d3 --- /dev/null +++ b/pkgs/development/libraries/libgksu/libgksu-2.0.12-fix-make-3.82.patch @@ -0,0 +1,19 @@ +--- libgksu/Makefile.am-orig 2010-08-22 16:11:19.872577459 -0500 ++++ libgksu/Makefile.am 2010-08-22 16:11:55.289599110 -0500 +@@ -17,11 +17,11 @@ + + if GCONF_SCHEMAS_INSTALL + install-data-local: +- if test -z "$(DESTDIR)" ; then \ +- for p in $(schemas_DATA) ; do \ +- GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$$p ; \ +- done \ +- fi ++ if test -z "$(DESTDIR)" ; then \ ++ for p in $(schemas_DATA) ; do \ ++ GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$$p ; \ ++ done \ ++ fi + else + install-data-local: + endif diff --git a/pkgs/development/libraries/libgksu/libgksu-2.0.12-notests.patch b/pkgs/development/libraries/libgksu/libgksu-2.0.12-notests.patch new file mode 100644 index 0000000000000000000000000000000000000000..3787ef6bfc13fa8090b8488ceab65597c9ca049f --- /dev/null +++ b/pkgs/development/libraries/libgksu/libgksu-2.0.12-notests.patch @@ -0,0 +1,26 @@ +Index: libgksu-2.0.12/libgksu/Makefile.am +=================================================================== +--- libgksu-2.0.12.orig/libgksu/Makefile.am ++++ libgksu-2.0.12/libgksu/Makefile.am +@@ -27,7 +27,7 @@ pkglib_PROGRAMS = gksu-run-helper + gksu_run_helper_LDFLAGS = `pkg-config --libs glib-2.0` + gksu_run_helper_SOURCES = gksu-run-helper.c + +-noinst_PROGRAMS = test-gksu ++EXTRA_PROGRAMS = test-gksu + test_gksu_SOURCES = test-gksu.c + test_gksu_LDADD = libgksu2.la + test_gksu_LDFLAGS = `pkg-config --libs glib-2.0` +Index: libgksu-2.0.12/libgksuui/Makefile.am +=================================================================== +--- libgksu-2.0.12.orig/libgksuui/Makefile.am ++++ libgksu-2.0.12/libgksuui/Makefile.am +@@ -9,7 +9,7 @@ libgksuui1_0_la_LDFLAGS = -Wl,-O1 `pkg-c + noinst_HEADERS = defines.h gksuui.h gksuui-dialog.h + includedir = ${prefix}/include/$(PACKAGE) + +-noinst_PROGRAMS = test-gksuui ++EXTRA_PROGRAMS = test-gksuui + test_gksuui_SOURCES = test-gksuui.c + test_gksuui_LDADD = libgksuui1.0.la + test_gksuui_LDFLAGS = `pkg-config --libs glib-2.0` diff --git a/pkgs/development/libraries/libgksu/libgksu-2.0.12-revert-forkpty.patch b/pkgs/development/libraries/libgksu/libgksu-2.0.12-revert-forkpty.patch new file mode 100644 index 0000000000000000000000000000000000000000..2c3a8cc786bb5405298bfd07696627cf57f87030 --- /dev/null +++ b/pkgs/development/libraries/libgksu/libgksu-2.0.12-revert-forkpty.patch @@ -0,0 +1,359 @@ +diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN libgksu-2.0.12.orig/libgksu/libgksu.c libgksu-2.0.12/libgksu/libgksu.c +--- libgksu-2.0.12.orig/libgksu/libgksu.c 2009-06-29 13:48:24.000000000 -0400 ++++ libgksu-2.0.12/libgksu/libgksu.c 2010-01-12 07:32:10.450657456 -0500 +@@ -1,7 +1,6 @@ + /* + * Gksu -- a library providing access to su functionality + * Copyright (C) 2004-2009 Gustavo Noronha Silva +- * Portions Copyright (C) 2009 VMware, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public +@@ -56,9 +55,6 @@ + static void + gksu_context_launch_complete (GksuContext *context); + +-static void +-read_line (int fd, gchar *buffer, int n); +- + GType + gksu_error_get_type (void) + { +@@ -2009,8 +2005,6 @@ gksu_su_fuller (GksuContext *context, + for (i = 0 ; cmd[i] != NULL ; i++) + g_free (cmd[i]); + g_free(cmd); +- +- _exit(1); + } + else if (pid == -1) + { +@@ -2125,10 +2119,10 @@ gksu_su_fuller (GksuContext *context, + /* drop the \n echoed on password entry if su did request + a password */ + if (password_needed) +- read_line (fdpty, buf, 255); ++ read (fdpty, buf, 255); + if (context->debug) + fprintf (stderr, "DEBUG (run:post-after-pass) buf: -%s-\n", buf); +- read_line (fdpty, buf, 255); ++ read (fdpty, buf, 255); + if (context->debug) + fprintf (stderr, "DEBUG (run:post-after-pass) buf: -%s-\n", buf); + } +@@ -2142,9 +2136,7 @@ gksu_su_fuller (GksuContext *context, + { + int retval = 0; + +- /* Red Hat's su shows the full path to su in its error messages. */ +- if (!strncmp (buf, "su:", 3) || +- !strncmp (buf, "/bin/su:", 7)) ++ if (!strncmp (buf, "su", 2)) + { + gchar **strings; + +@@ -2155,11 +2147,7 @@ gksu_su_fuller (GksuContext *context, + } + + strings = g_strsplit (buf, ":", 2); +- +- /* Red Hat and Fedora use 'incorrect password'. */ +- if (strings[1] && +- (g_str_has_prefix(strings[1], " Authentication failure") || +- g_str_has_prefix(strings[1], " incorrect password"))) ++ if (strings[1] && !strncmp (strings[1], " Authentication failure", 23)) + { + if (used_gnome_keyring) + g_set_error (error, gksu_quark, +@@ -2473,12 +2461,6 @@ gksu_sudo_fuller (GksuContext *context, + { + char **cmd; + char buffer[256] = {0}; +- char *child_stderr = NULL; +- /* This command is used to gain a token */ +- char *const verifycmd[] = +- { +- "/usr/bin/sudo", "-p", "GNOME_SUDO_PASS", "-v", NULL +- }; + int argcount = 8; + int i, j; + +@@ -2489,8 +2471,9 @@ gksu_sudo_fuller (GksuContext *context, + + pid_t pid; + int status; +- FILE *fdfile = NULL; +- int fdpty = -1; ++ FILE *infile, *outfile; ++ int parent_pipe[2]; /* For talking to the parent */ ++ int child_pipe[2]; /* For talking to the child */ + + context->sudo_mode = TRUE; + +@@ -2565,10 +2548,6 @@ gksu_sudo_fuller (GksuContext *context, + cmd[argcount] = g_strdup("-S"); + argcount++; + +- /* Make sudo noninteractive (we should already have a token) */ +- cmd[argcount] = g_strdup("-n"); +- argcount++; +- + /* Make sudo use next arg as prompt */ + cmd[argcount] = g_strdup("-p"); + argcount++; +@@ -2647,21 +2626,26 @@ gksu_sudo_fuller (GksuContext *context, + fprintf (stderr, "cmd[%d]: %s\n", i, cmd[i]); + } + +- pid = forkpty(&fdpty, NULL, NULL, NULL); +- if (pid == 0) ++ if ((pipe(parent_pipe)) == -1) + { +- // Child +- setsid(); // make us session leader +- +- execv(verifycmd[0], verifycmd); ++ g_set_error (error, gksu_quark, GKSU_ERROR_PIPE, ++ _("Error creating pipe: %s"), ++ strerror(errno)); ++ sudo_reset_xauth (context, xauth, xauth_env); ++ return FALSE; ++ } + +- g_set_error (error, gksu_quark, GKSU_ERROR_EXEC, +- _("Failed to exec new process: %s"), ++ if ((pipe(child_pipe)) == -1) ++ { ++ g_set_error (error, gksu_quark, GKSU_ERROR_PIPE, ++ _("Error creating pipe: %s"), + strerror(errno)); + sudo_reset_xauth (context, xauth, xauth_env); + return FALSE; + } +- else if (pid == -1) ++ ++ pid = fork(); ++ if (pid == -1) + { + g_set_error (error, gksu_quark, GKSU_ERROR_FORK, + _("Failed to fork new process: %s"), +@@ -2669,26 +2653,56 @@ gksu_sudo_fuller (GksuContext *context, + sudo_reset_xauth (context, xauth, xauth_env); + return FALSE; + } ++ else if (pid == 0) ++ { ++ // Child ++ setsid(); // make us session leader ++ close(child_pipe[1]); ++ dup2(child_pipe[0], STDIN_FILENO); ++ dup2(parent_pipe[1], STDERR_FILENO); + ++ execv(cmd[0], cmd); ++ ++ g_set_error (error, gksu_quark, GKSU_ERROR_EXEC, ++ _("Failed to exec new process: %s"), ++ strerror(errno)); ++ sudo_reset_xauth (context, xauth, xauth_env); ++ return FALSE; ++ } + else + { + gint counter = 0; + gchar *cmdline = NULL; +- struct termios tio; + + // Parent +- fdfile = fdopen(fdpty, "w+"); ++ close(parent_pipe[1]); + +- /* make sure we notice that ECHO is turned off, if it gets +- turned off */ +- tcgetattr (fdpty, &tio); +- for (counter = 0; (tio.c_lflag & ECHO) && counter < 15; counter++) +- { +- usleep (1000); +- tcgetattr (fdpty, &tio); +- } ++ infile = fdopen(parent_pipe[0], "r"); ++ if (!infile) ++ { ++ g_set_error (error, gksu_quark, GKSU_ERROR_PIPE, ++ _("Error opening pipe: %s"), ++ strerror(errno)); ++ sudo_reset_xauth (context, xauth, xauth_env); ++ return FALSE; ++ } + +- fcntl (fdpty, F_SETFL, O_NONBLOCK); ++ outfile = fdopen(child_pipe[1], "w"); ++ if (!outfile) ++ { ++ g_set_error (error, gksu_quark, GKSU_ERROR_PIPE, ++ _("Error opening pipe: %s"), ++ strerror(errno)); ++ sudo_reset_xauth (context, xauth, xauth_env); ++ return FALSE; ++ } ++ ++ /* ++ we are expecting to receive a GNOME_SUDO_PASS ++ if we don't there are two possibilities: an error ++ or a password is not needed ++ */ ++ fcntl (parent_pipe[0], F_SETFL, O_NONBLOCK); + + { /* no matter if we can read, since we're using + O_NONBLOCK; this is just to avoid the prompt +@@ -2697,11 +2711,11 @@ gksu_sudo_fuller (GksuContext *context, + struct timeval tv; + + FD_ZERO(&rfds); +- FD_SET(fdpty, &rfds); ++ FD_SET(parent_pipe[0], &rfds); + tv.tv_sec = 1; + tv.tv_usec = 0; + +- select (fdpty + 1, &rfds, NULL, NULL, &tv); ++ select (parent_pipe[0] + 1, &rfds, NULL, NULL, &tv); + } + + /* Try hard to find the prompt; it may happen that we're +@@ -2713,7 +2727,7 @@ gksu_sudo_fuller (GksuContext *context, + if (strncmp (buffer, "GNOME_SUDO_PASS", 15) == 0) + break; + +- read_line (fdpty, buffer, 256); ++ read_line (parent_pipe[0], buffer, 256); + + if (context->debug) + fprintf (stderr, "buffer: -%s-\n", buffer); +@@ -2747,17 +2761,18 @@ gksu_sudo_fuller (GksuContext *context, + + usleep (1000); + +- write (fdpty, password, strlen(password) + 1); +- write (fdpty, "\n", 1); ++ fprintf (outfile, "%s\n", password); ++ fclose (outfile); + + nullify_password (password); + +- fcntl(fdpty, F_SETFL, fcntl(fdpty, F_GETFL) & ~O_NONBLOCK); ++ /* turn NONBLOCK off */ ++ fcntl(parent_pipe[0], F_SETFL, fcntl(parent_pipe[0], F_GETFL) & ~O_NONBLOCK); + /* ignore the first newline that comes right after sudo receives + the password */ +- fgets (buffer, 255, fdfile); +- /* this is the status we are interested in */ +- fgets (buffer, 255, fdfile); ++ fgets (buffer, 255, infile); ++ /* this is the status we are interessted in */ ++ fgets (buffer, 255, infile); + } + else + { +@@ -2766,7 +2781,7 @@ gksu_sudo_fuller (GksuContext *context, + fprintf (stderr, "No password prompt found; we'll assume we don't need a password.\n"); + + /* turn NONBLOCK off, also if have no prompt */ +- fcntl(fdpty, F_SETFL, fcntl(fdpty, F_GETFL) & ~O_NONBLOCK); ++ fcntl(parent_pipe[0], F_SETFL, fcntl(parent_pipe[0], F_GETFL) & ~O_NONBLOCK); + + should_display = gconf_client_get_bool (context->gconf_client, + BASE_PATH "display-no-pass-info", NULL); +@@ -2785,9 +2800,14 @@ gksu_sudo_fuller (GksuContext *context, + fprintf (stderr, "%s", buffer); + } + +- if (g_str_has_prefix (buffer, "Sorry, try again.")) ++ if (!strcmp (buffer, "Sorry, try again.\n")) + g_set_error (error, gksu_quark, GKSU_ERROR_WRONGPASS, + _("Wrong password.")); ++ else if (!strncmp (buffer, "Sorry, user ", 12)) ++ g_set_error (error, gksu_quark, GKSU_ERROR_NOT_ALLOWED, ++ _("The underlying authorization mechanism (sudo) " ++ "does not allow you to run this program. Contact " ++ "the system administrator.")); + else + { + gchar *haystack = buffer; +@@ -2805,10 +2825,6 @@ gksu_sudo_fuller (GksuContext *context, + } + } + +- /* If we have an error, let's just stop sudo right there. */ +- if (error) +- close(fdpty); +- + cmdline = g_strdup("sudo"); + /* wait for the child process to end or become something other + than sudo */ +@@ -2825,23 +2841,17 @@ gksu_sudo_fuller (GksuContext *context, + if (context->sn_context) + gksu_context_launch_complete (context); + ++ while (read (parent_pipe[0], buffer, 255) > 0) ++ { ++ fprintf (stderr, "%s", buffer); ++ bzero(buffer, 256); ++ } ++ + /* if the process is still active waitpid() on it */ + if (pid_exited != pid) + waitpid(pid, &status, 0); + sudo_reset_xauth (context, xauth, xauth_env); + +- /* +- * Did token acquisition succeed? If so, spawn sudo in +- * non-interactive mode. It should either succeed or die +- * immediately if you're not allowed to run the command. +- */ +- if (WEXITSTATUS(status) == 0) +- { +- g_spawn_sync(NULL, cmd, NULL, 0, NULL, NULL, +- NULL, &child_stderr, &status, +- error); +- } +- + if (exit_status) + { + if (WIFEXITED(status)) { +@@ -2853,13 +2863,6 @@ gksu_sudo_fuller (GksuContext *context, + + if (WEXITSTATUS(status)) + { +- if (g_str_has_prefix(child_stderr, "Sorry, user ")) +- { +- g_set_error (error, gksu_quark, GKSU_ERROR_NOT_ALLOWED, +- _("The underlying authorization mechanism (sudo) " +- "does not allow you to run this program. Contact " +- "the system administrator.")); +- } + if(cmdline) + { + /* sudo already exec()ed something else, don't report +@@ -2868,7 +2871,6 @@ gksu_sudo_fuller (GksuContext *context, + if (!g_str_has_suffix (cmdline, "sudo")) + { + g_free (cmdline); +- g_free (child_stderr); + return FALSE; + } + g_free (cmdline); +@@ -2881,11 +2883,11 @@ gksu_sudo_fuller (GksuContext *context, + } + } + +- fprintf(stderr, child_stderr); +- g_free(child_stderr); +- + /* if error is set we have found an error condition */ +- return (error == NULL); ++ if (error) ++ return FALSE; ++ ++ return TRUE; + } + + /** diff --git a/pkgs/development/libraries/libgksu/libgksu-2.0.7-libs.patch b/pkgs/development/libraries/libgksu/libgksu-2.0.7-libs.patch new file mode 100644 index 0000000000000000000000000000000000000000..b9fb77f271473a6f01a3cd60cdb073f861259f87 --- /dev/null +++ b/pkgs/development/libraries/libgksu/libgksu-2.0.7-libs.patch @@ -0,0 +1,76 @@ +# https://savannah.nongnu.org/bugs/?25362 +# https://bugs.gentoo.org/show_bug.cgi?id=226837 +diff -Nura a/configure.ac b/configure.ac +--- a/configure.ac 2009-01-19 22:15:30.000000000 +0100 ++++ b/configure.ac 2009-01-19 22:18:10.000000000 +0100 +@@ -43,6 +43,9 @@ + PKG_CHECK_MODULES(LIBGKSU, [gtk+-2.0 >= 2.4.0, gconf-2.0, libstartup-notification-1.0, gnome-keyring-1, libgtop-2.0]) + PKG_CHECK_MODULES(GKSU_PROPERTIES, [gtk+-2.0 >= 2.4.0, gconf-2.0, libglade-2.0]) + ++PKG_CHECK_MODULES(GLIB, [glib-2.0 gthread-2.0]) ++PKG_CHECK_MODULES(GTK, [gtk+-2.0 gconf-2.0]) ++ + # Checks for library functions. + ALL_LINGUAS="ca cs da de es eu fr hu it ko lt pl pt_BR ro ru sk sv nb nl zh_CN" + +diff -Nura a/gksu-properties/Makefile.am b/gksu-properties/Makefile.am +--- a/gksu-properties/Makefile.am 2009-01-19 22:15:59.000000000 +0100 ++++ b/gksu-properties/Makefile.am 2009-01-19 22:19:13.000000000 +0100 +@@ -3,7 +3,7 @@ + AM_CPPFLAGS = -DLOCALEDIR=\"$(datadir)/locale\" -DDATA_DIR=\"$(datadir)\" -DPREFIX=\"$(prefix)\" + + bin_PROGRAMS = gksu-properties +-gksu_properties_LDFLAGS = ${GKSU_PROPERTIES_LIBS} ++gksu_properties_LDADD = ${GKSU_PROPERTIES_LIBS} + gksu_properties_SOURCES = gksu-properties.c + + gladedir = ${prefix}/share/${PACKAGE} +diff -Nura a/libgksu/Makefile.am b/libgksu/Makefile.am +--- a/libgksu/Makefile.am 2009-01-19 22:15:59.000000000 +0100 ++++ b/libgksu/Makefile.am 2009-01-19 22:18:25.000000000 +0100 +@@ -8,8 +8,8 @@ + # major -> breaks backward compatibility (changes to existing ABI) + # minor -> keeps compatibility (additions to the API) + # micro -> no change to the API/ABI +-libgksu2_la_LIBADD = ../libgksuui/libgksuui1.0.la +-libgksu2_la_LDFLAGS = -version-info 0:2:0 -Wl,-O1 -lutil ${LIBGKSU_LIBS} ++libgksu2_la_LIBADD = ../libgksuui/libgksuui1.0.la -lutil ${LIBGKSU_LIBS} ++libgksu2_la_LDFLAGS = -version-info 0:2:0 -Wl,-O1 + if USE_VERSION_SCRIPT + libgksu2_la_LDFLAGS += -Wl,--version-script=libgksu.ver + endif +@@ -24,12 +24,11 @@ + + pkglibdir = ${libdir}/${PACKAGE} + pkglib_PROGRAMS = gksu-run-helper +-gksu_run_helper_LDFLAGS = `pkg-config --libs glib-2.0` ++gksu_run_helper_LDADD = ${GLIB_LIBS} + gksu_run_helper_SOURCES = gksu-run-helper.c + + noinst_PROGRAMS = test-gksu + test_gksu_SOURCES = test-gksu.c +-test_gksu_LDADD = libgksu2.la +-test_gksu_LDFLAGS = `pkg-config --libs glib-2.0 gthread-2.0` ++test_gksu_LDADD = libgksu2.la ${GLIB_LIBS} + + EXTRA_DIST = libgksu.ver +diff -Nura a/libgksuui/Makefile.am b/libgksuui/Makefile.am +--- a/libgksuui/Makefile.am 2009-01-19 22:15:59.000000000 +0100 ++++ b/libgksuui/Makefile.am 2009-01-19 22:18:54.000000000 +0100 +@@ -4,12 +4,13 @@ + + noinst_LTLIBRARIES = libgksuui1.0.la + libgksuui1_0_la_SOURCES = gksuui-dialog.c +-libgksuui1_0_la_LDFLAGS = -Wl,-O1 `pkg-config --libs gtk+-2.0 gconf-2.0` ++libgksuui1_0_la_LDFLAGS = -Wl,-O1 ++libgksuui1_0_la_LIBADD = ${GTK_LIBS} + + noinst_HEADERS = defines.h gksuui.h gksuui-dialog.h + includedir = ${prefix}/include/$(PACKAGE) + + noinst_PROGRAMS = test-gksuui + test_gksuui_SOURCES = test-gksuui.c +-test_gksuui_LDADD = libgksuui1.0.la +-test_gksuui_LDFLAGS = `pkg-config --libs glib-2.0 gthread-2.0` ++test_gksuui_LDADD = libgksuui1.0.la ${GLIB_LIBS} ++ diff --git a/pkgs/development/libraries/libgksu/libgksu-2.0.7-polinguas.patch b/pkgs/development/libraries/libgksu/libgksu-2.0.7-polinguas.patch new file mode 100644 index 0000000000000000000000000000000000000000..e423af16b44ca6f360e95e77905d6b3dfbf49273 --- /dev/null +++ b/pkgs/development/libraries/libgksu/libgksu-2.0.7-polinguas.patch @@ -0,0 +1,40 @@ +# https://savannah.nongnu.org/bugs/?25360 +diff -Nura a/configure.ac b/configure.ac +--- a/configure.ac 2009-01-19 21:50:57.000000000 +0100 ++++ b/configure.ac 2009-01-19 21:53:21.000000000 +0100 +@@ -50,7 +50,7 @@ + GETTEXT_PACKAGE=AC_PACKAGE_NAME + AC_SUBST(GETTEXT_PACKAGE) + +-IT_PROG_INTLTOOL ++IT_PROG_INTLTOOL([0.35.5]) + AM_GLIB_GNU_GETTEXT + + ################################################## +diff -Nura a/po/LINGUAS b/po/LINGUAS +--- a/po/LINGUAS 1970-01-01 01:00:00.000000000 +0100 ++++ b/po/LINGUAS 2009-01-19 21:54:24.000000000 +0100 +@@ -0,0 +1,23 @@ ++# please keep this list sorted alphabetically ++# http://live.gnome.org/GnomeGoals/PoLinguas ++# ++ca ++cs ++da ++de ++es ++eu ++fr ++hu ++it ++ko ++lt ++pl ++pt_BR ++ro ++ru ++sk ++sv ++nb ++nl ++zh_CN diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix index 8ce9a10701ec534173b3348498486bfd4e977005..663bd944fb924fed6015f6d239c66f308ac79821 100644 --- a/pkgs/development/libraries/libgpg-error/default.nix +++ b/pkgs/development/libraries/libgpg-error/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation (rec { homepage = http://gnupg.org; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/libraries/libiconv/default.nix b/pkgs/development/libraries/libiconv/default.nix index b286dcfcd1999c31c854e7bfc8a94827bbd75e19..7b669cd780aeb8c163a39db1fd128585d573bb40 100644 --- a/pkgs/development/libraries/libiconv/default.nix +++ b/pkgs/development/libraries/libiconv/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.gnu.org/software/libiconv/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ ]; diff --git a/pkgs/development/libraries/libid3tag/default.nix b/pkgs/development/libraries/libid3tag/default.nix index cb54f17755cde02e9ea2b14c8f9c8b44f0087964..4cc2f65440ca9b6631286c36ff9327240d43d0c4 100644 --- a/pkgs/development/libraries/libid3tag/default.nix +++ b/pkgs/development/libraries/libid3tag/default.nix @@ -1,7 +1,10 @@ -{stdenv, fetchurl, zlib, gperf}: +{stdenv, fetchurl, writeText, zlib, gperf}: + +stdenv.mkDerivation rec { + version = "0.15.1b"; + + name = "libid3tag-${version}"; -stdenv.mkDerivation { - name = "libid3tag-0.15.1b"; src = fetchurl { url = mirror://sourceforge/mad/libid3tag-0.15.1b.tar.gz; sha256 = "63da4f6e7997278f8a3fef4c6a372d342f705051d1eeb6a46a86b03610e26151"; @@ -11,6 +14,14 @@ stdenv.mkDerivation { patches = [ ./debian-patches.patch ]; + postInstall = '' + mkdir -p $out/lib/pkgconfig + cp ${./id3tag.pc} $out/lib/pkgconfig/id3tag.pc + substituteInPlace $out/lib/pkgconfig/id3tag.pc \ + --subst-var-by out $out \ + --subst-var-by version "${version}" + ''; + meta = with stdenv.lib; { description = "ID3 tag manipulation library"; homepage = http://mad.sourceforge.net/; diff --git a/pkgs/development/libraries/libid3tag/id3tag.pc b/pkgs/development/libraries/libid3tag/id3tag.pc new file mode 100644 index 0000000000000000000000000000000000000000..854f1783cae5977cfe8c47cb2232122bcbdf2bd0 --- /dev/null +++ b/pkgs/development/libraries/libid3tag/id3tag.pc @@ -0,0 +1,11 @@ +prefix=@out@ +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +includedir=${exec_prefix}/include + +Name: libid3tag +Description: ID3 tag manipulation library +Version: @version@ + +Libs: -L${libdir} -lid3tag +Cflags: -I${includedir} diff --git a/pkgs/development/libraries/libidn/default.nix b/pkgs/development/libraries/libidn/default.nix index da8a7d50b67ec9dcc9c17d188f04259bb77ee408..802ee9e3e88f679a58069f7aeabbaf7e940d91b6 100644 --- a/pkgs/development/libraries/libidn/default.nix +++ b/pkgs/development/libraries/libidn/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { included. ''; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; platforms = stdenv.lib.platforms.all; maintainers = [ ]; }; diff --git a/pkgs/development/libraries/libinfinity/default.nix b/pkgs/development/libraries/libinfinity/default.nix index c7513b0a167fdd80e3c6330820698b5c24422c96..1a39e0941535ad893a3ba1cb530aff63a95a8389 100644 --- a/pkgs/development/libraries/libinfinity/default.nix +++ b/pkgs/development/libraries/libinfinity/default.nix @@ -37,9 +37,8 @@ in stdenv.mkDerivation rec { meta = { homepage = http://gobby.0x539.de/; description = "An implementation of the Infinote protocol written in GObject-based C"; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ stdenv.lib.maintainers.phreedom ]; }; } - diff --git a/pkgs/development/libraries/libiptcdata/default.nix b/pkgs/development/libraries/libiptcdata/default.nix index 1094a4e75919264211aeda893e286a729a3a9808..158962d3294059e5e5f4e942ed139b596f770bab 100644 --- a/pkgs/development/libraries/libiptcdata/default.nix +++ b/pkgs/development/libraries/libiptcdata/default.nix @@ -11,6 +11,6 @@ stdenv.mkDerivation rec { meta = { description = "Library for reading and writing the IPTC metadata in images and other files"; homepage = http://libiptcdata.sourceforge.net/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/development/libraries/liblo/default.nix b/pkgs/development/libraries/liblo/default.nix index a2235da408e31ec0cdefded728b7fa61a76e27aa..ab8c696a66c7ac37929d2966790f9e8cb97350f9 100644 --- a/pkgs/development/libraries/liblo/default.nix +++ b/pkgs/development/libraries/liblo/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = { description = "lightweight library to handle the sending and receiving of messages according to the Open Sound Control (OSC) protocol"; homepage = http://sourceforge.net/projects/liblo; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [stdenv.lib.maintainers.marcweber]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/liblockfile/default.nix b/pkgs/development/libraries/liblockfile/default.nix index f991fdc2f299c16cdbdf530d6cad82913f1cbb4b..e7e4cd6c75d9f74fc3b98685c0625f2c90864711 100644 --- a/pkgs/development/libraries/liblockfile/default.nix +++ b/pkgs/development/libraries/liblockfile/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "Shared library with NFS-safe locking functions"; homepage = http://packages.debian.org/unstable/libs/liblockfile1; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.bluescreen303 ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/libmatchbox/default.nix b/pkgs/development/libraries/libmatchbox/default.nix index b45b443f6dee8b9bdf45fffe9a7355bc925aede1..3870281773461c245c9b487e4d326a327554cd86 100644 --- a/pkgs/development/libraries/libmatchbox/default.nix +++ b/pkgs/development/libraries/libmatchbox/default.nix @@ -14,6 +14,6 @@ stdenv.mkDerivation rec { meta = { description = "Library of the matchbox X window manager"; homepage = http://matchbox-project.org/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/development/libraries/libmicrohttpd/default.nix b/pkgs/development/libraries/libmicrohttpd/default.nix index be1f3f2b4b9671ab2a37c420cdcb7c4a9d7c7084..959dca475732b8ae4a6788acea04f89ea72258f8 100644 --- a/pkgs/development/libraries/libmicrohttpd/default.nix +++ b/pkgs/development/libraries/libmicrohttpd/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { it easy to run an HTTP server as part of another application. ''; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; homepage = http://www.gnu.org/software/libmicrohttpd/; diff --git a/pkgs/development/libraries/libmnl/default.nix b/pkgs/development/libraries/libmnl/default.nix index fb6eacc366b051a8b5ee677f9e16bf2040d7fa17..94401c30a6ba8657770b508eb91dd6a22f6110fc 100644 --- a/pkgs/development/libraries/libmnl/default.nix +++ b/pkgs/development/libraries/libmnl/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { re-inventing the wheel. ''; homepage = http://netfilter.org/projects/libmnl/index.html; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/libmrss/default.nix b/pkgs/development/libraries/libmrss/default.nix index b1f7b0071c8568fa0c951cb9dc76570570fbf872..865330fdda7c2ecd9520bbf4e6fd174a00db0130 100644 --- a/pkgs/development/libraries/libmrss/default.nix +++ b/pkgs/development/libraries/libmrss/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { meta = { homepage = http://www.autistici.org/bakunin/libmrss/doc; description = "C library for parsing, writing and creating RSS/ATOM files or streams"; - license = "LGPLv2"; + license = stdenv.lib.licenses.lgpl2; platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.viric ]; diff --git a/pkgs/development/libraries/libmspack/default.nix b/pkgs/development/libraries/libmspack/default.nix index a49cd95822f67ed04ad08075ed3dd8bb9e4ed674..b78e583fa64093393bacd1b04f193f5520dee7f6 100644 --- a/pkgs/development/libraries/libmspack/default.nix +++ b/pkgs/development/libraries/libmspack/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = { description = "A de/compression library for various Microsoft formats"; homepage = http://www.cabextract.org.uk/libmspack; - license = "LGPL2"; + license = stdenv.lib.licenses.lgpl2; }; } diff --git a/pkgs/development/libraries/libmwaw/default.nix b/pkgs/development/libraries/libmwaw/default.nix index 0a7b76edab130bfa6fbdb8ab329cec067d250180..297d0a2f2ee644e7af3b6e0604c173449a197744 100644 --- a/pkgs/development/libraries/libmwaw/default.nix +++ b/pkgs/development/libraries/libmwaw/default.nix @@ -3,11 +3,10 @@ let s = # Generated upstream information rec { baseName="libmwaw"; - version="0.3.1"; + version="0.3.2"; name="${baseName}-${version}"; - hash="0fa6nf4pxl853xnh2kdjw1nk3w6i39diixiampml7g9qygbd0vqb"; - url="mirror://sourceforge/project/libmwaw/libmwaw/libmwaw-0.3.1/libmwaw-0.3.1.tar.xz"; - sha256="0fa6nf4pxl853xnh2kdjw1nk3w6i39diixiampml7g9qygbd0vqb"; + url="mirror://sourceforge/project/libmwaw/libmwaw/libmwaw-${version}/libmwaw-${version}.tar.bz2"; + sha256="0rzp2bbwyxdq1i9b2y5jz5b2ic7466l8ifgmz7lk8bsmqxbb0a0d"; }; buildInputs = [ boost pkgconfig cppunit zlib libwpg libwpd librevenge diff --git a/pkgs/development/libraries/libnetfilter_conntrack/default.nix b/pkgs/development/libraries/libnetfilter_conntrack/default.nix index 14b50bb51182b6f6d30888a7f2af8ca4a0eda0dc..da32903c94e788a7d9ea16f5158e2943cb1024b0 100644 --- a/pkgs/development/libraries/libnetfilter_conntrack/default.nix +++ b/pkgs/development/libraries/libnetfilter_conntrack/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { by conntrack-tools among many other applications ''; homepage = http://netfilter.org/projects/libnetfilter_conntrack/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/libnfnetlink/default.nix b/pkgs/development/libraries/libnfnetlink/default.nix index 3bb698e9bf631c9fcfd87a296f13a03b84e3cf15..c47076014c4386498504cc07b51fcba428cccc5f 100644 --- a/pkgs/development/libraries/libnfnetlink/default.nix +++ b/pkgs/development/libraries/libnfnetlink/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { It is only used by other netfilter.org projects, like the aforementioned ones. ''; homepage = http://www.netfilter.org/projects/libnfnetlink/index.html; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/libnih/default.nix b/pkgs/development/libraries/libnih/default.nix index aeb0792dacfa64c6eaa4d2deb1787611562b9187..ab6931c63ca3626eb89a5b4d59bd6e1ee73c1038 100644 --- a/pkgs/development/libraries/libnih/default.nix +++ b/pkgs/development/libraries/libnih/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { meta = { description = "A small library for C application development"; homepage = https://launchpad.net/libnih; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/development/libraries/libnm-qt/default.nix b/pkgs/development/libraries/libnm-qt/default.nix index 31afcae8e01acd825d92cfa30d9cccd7197bf85e..39e784fe89f31eab0d193dcd9bc7c5703b093f4b 100644 --- a/pkgs/development/libraries/libnm-qt/default.nix +++ b/pkgs/development/libraries/libnm-qt/default.nix @@ -2,7 +2,7 @@ let pname = "libnm-qt"; - version = "0.9.8.1"; + version = "0.9.8.2"; name = "${pname}-${version}"; in stdenv.mkDerivation { @@ -15,11 +15,13 @@ stdenv.mkDerivation { networkmanager ]; + cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" ]; + propagatedBuildInputs = [ libmm-qt ]; src = fetchurl { url = "mirror://kde/unstable/networkmanager-qt/${version}/src/${name}.tar.xz"; - sha256 = "cde8bed2beb57015cb5f6772c1fe0843aab299b9529578c5406ba7fe614af23d"; + sha256 = "118fa4732536677f889b2776ec45bd0c726f26abcb8e8b6f8dfcaee265475f33"; }; meta = with stdenv.lib; { @@ -27,6 +29,6 @@ stdenv.mkDerivation { description = "Qt wrapper for NetworkManager DBus API"; license = licenses.lgpl21; platforms = platforms.linux; - maintainer = [ maintainers.jgeerds ]; + maintainers = [ maintainers.jgeerds ]; }; } diff --git a/pkgs/development/libraries/libnxml/default.nix b/pkgs/development/libraries/libnxml/default.nix index b492a16a2055755c486f496eb8071a37df0079ed..f34c421a120aa18823962bec26b6d5ef457223b0 100644 --- a/pkgs/development/libraries/libnxml/default.nix +++ b/pkgs/development/libraries/libnxml/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = { homepage = http://www.autistici.org/bakunin/libnxml/; description = "C library for parsing, writing and creating XML 1.0 and 1.1 files or streams"; - license = "LGPLv2"; + license = stdenv.lib.licenses.lgpl2; platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.viric ]; diff --git a/pkgs/development/libraries/libotr/default.nix b/pkgs/development/libraries/libotr/default.nix index 0d5bdfcc9a75c1795253db33833440094576b2e6..3782dabc67bd0420f2df111ab0b4b3298f824e29 100644 --- a/pkgs/development/libraries/libotr/default.nix +++ b/pkgs/development/libraries/libotr/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.cypherpunks.ca/otr/"; repositories.git = git://git.code.sf.net/p/otr/libotr; - license = "LGPLv2.1"; + license = stdenv.lib.licenses.lgpl21; description = "Library for Off-The-Record Messaging"; }; } diff --git a/pkgs/development/libraries/libpaper/default.nix b/pkgs/development/libraries/libpaper/default.nix index 9505a6cf052fd2945d29a4c5b505eef92c77acce..ab8e03b89a07fc5435b5df4d3d1cfac160cf86fd 100644 --- a/pkgs/development/libraries/libpaper/default.nix +++ b/pkgs/development/libraries/libpaper/default.nix @@ -12,6 +12,6 @@ stdenv.mkDerivation rec { meta = { description = "Library for handling paper characteristics"; homepage = "http://packages.debian.org/unstable/source/libpaper"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/development/libraries/libpar2/default.nix b/pkgs/development/libraries/libpar2/default.nix index 85e8bad8906624594e2ad609f701e5f359700d7e..89d9a3de02f2103ece3f067fa2bc3228b028b5b8 100644 --- a/pkgs/development/libraries/libpar2/default.nix +++ b/pkgs/development/libraries/libpar2/default.nix @@ -1,18 +1,22 @@ { stdenv, fetchurl, pkgconfig, libsigcxx }: +let version = "0.4"; in + stdenv.mkDerivation rec { - name = "libpar2-0.2"; + name = "libpar2-${version}"; src = fetchurl { - url = "mirror://sourceforge/parchive/${name}.tar.gz"; - sha256 = "024r37wi01d1pfkk17l5lk0ci0cc0xhy5z050hzf3cbk1y2bykq7"; + url = "https://launchpad.net/libpar2/trunk/${version}/+download/${name}.tar.gz"; + sha256 = "1m4ncws1h03zq7zyqbaymvjzzbh1d3lc4wb1aksrdf0ync76yv9i"; }; buildInputs = [ pkgconfig libsigcxx ]; + patches = [ ./libpar2-0.4-external-verification.patch ]; + meta = { homepage = http://parchive.sourceforge.net/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; description = "A library for using Parchives (parity archive volume sets)"; }; } diff --git a/pkgs/development/libraries/libpar2/libpar2-0.4-external-verification.patch b/pkgs/development/libraries/libpar2/libpar2-0.4-external-verification.patch new file mode 100644 index 0000000000000000000000000000000000000000..74879c4fe9b8a114572d54c9f5b712f4fcb06086 --- /dev/null +++ b/pkgs/development/libraries/libpar2/libpar2-0.4-external-verification.patch @@ -0,0 +1,16 @@ +diff -aud -U 5 libpar2-0.4-original/par2repairer.h libpar2-0.4-patched/par2repairer.h +--- libpar2-0.4-original/par2repairer.h 2013-07-18 15:03:10.000000000 +0200 ++++ libpar2-0.4-patched/par2repairer.h 2014-08-06 15:52:59.000000000 +0200 +@@ -94,11 +94,11 @@ + // Perform a sliding window scan of the DiskFile looking for blocks of data that + // might belong to any of the source files (for which a verification packet was + // available). If a block of data might be from more than one source file, prefer + // the one specified by the "sourcefile" parameter. If the first data block + // found is for a different source file then "sourcefile" is changed accordingly. +- bool ScanDataFile(DiskFile *diskfile, // [in] The file being scanned ++ virtual bool ScanDataFile(DiskFile *diskfile, // [in] The file being scanned + Par2RepairerSourceFile* &sourcefile, // [in/out] The source file matched + MatchType &matchtype, // [out] The type of match + MD5Hash &hashfull, // [out] The full hash of the file + MD5Hash &hash16k, // [out] The hash of the first 16k + u32 &count); // [out] The number of blocks found diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix index 52aaeaf93a46dd2614853482f2c0c19bb954e503..1f04ae8fca54f43449af356a9a9f8c4b4b5b6afa 100644 --- a/pkgs/development/libraries/libpng/default.nix +++ b/pkgs/development/libraries/libpng/default.nix @@ -3,11 +3,11 @@ assert zlib != null; let - version = "1.6.10"; - sha256 = "0mjsfxc18478y1jxrs3snmx7mvckmghvki9gfhmhl49n1vyz00s0"; + version = "1.6.12"; + sha256 = "0pkcirbfzhqqsm3hr2alxprw5n22a836qk4df1jnns6jk79gcby3"; patch_src = fetchurl { url = "mirror://sourceforge/libpng-apng/libpng-${version}-apng.patch.gz"; - sha256 = "0512q27c26ajzqm2qzmmc7q1frj7cjylls2hxy3y3wg2r6ryizw8"; + sha256 = "0r2vmsc4cvxisjr7jqw2vjf66isb2fhs4nnssz3l3jgdangj8wz0"; }; whenPatched = stdenv.lib.optionalString apngSupport; diff --git a/pkgs/development/libraries/libqglviewer/default.nix b/pkgs/development/libraries/libqglviewer/default.nix index c968fd352eb85358c5acdd8087dd99f9515a795e..b389176b3da8ca85c2ece50372ec8bd24e220ffc 100644 --- a/pkgs/development/libraries/libqglviewer/default.nix +++ b/pkgs/development/libraries/libqglviewer/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { meta = { description = "trackball-based 3D viewer qt widget including many useful features"; homepage = http://artis.imag.fr/Members/Gilles.Debunne/QGLViewer/installUnix.html; - license = "GPL2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/development/libraries/librdf/default.nix b/pkgs/development/libraries/librdf/default.nix index 9b51f694ab3ec3be3300305476f21241826ebb90..58ff77480b63bbc08ed54eef526da6114d87ed7d 100644 --- a/pkgs/development/libraries/librdf/default.nix +++ b/pkgs/development/libraries/librdf/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = { description = "Lightweight RDF library with special support for LADSPA plugins"; homepage = http://sourceforge.net/projects/lrdf/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.marcweber ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/librsync/default.nix b/pkgs/development/libraries/librsync/default.nix index 41445b841435b705a22d38d145536d2b8fae2919..76daf7d748bf2112649ac0c46d39e266b73e9b31 100644 --- a/pkgs/development/libraries/librsync/default.nix +++ b/pkgs/development/libraries/librsync/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = { homepage = http://librsync.sourceforge.net/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; description = "Implementation of the rsync remote-delta algorithm"; }; } diff --git a/pkgs/development/libraries/libsamplerate/default.nix b/pkgs/development/libraries/libsamplerate/default.nix index 708d898930407cf24605e9e814bbcfd7c40835f5..85d51d0ad71e33974e160ef0166ab1ac8f9a0c8b 100644 --- a/pkgs/development/libraries/libsamplerate/default.nix +++ b/pkgs/development/libraries/libsamplerate/default.nix @@ -15,10 +15,14 @@ stdenv.mkDerivation rec { #--disable-fftw disable usage of FFTW #--disable-cpu-clip disable tricky cpu specific clipper - # need headers from the Carbon.framework in /System/Library/Frameworks to - # compile this on darwin -- not sure how to handle - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin - "-I/System/Library/Frameworks/Carbon.framework/Versions/A/Headers"; + postConfigure = stdenv.lib.optionalString stdenv.isDarwin + '' + # need headers from the Carbon.framework in /System/Library/Frameworks to + # compile this on darwin -- not sure how to handle + NIX_CFLAGS_COMPILE+=" -I$SDKROOT/System/Library/Frameworks/Carbon.framework/Versions/A/Headers" + + substituteInPlace examples/Makefile --replace "-fpascal-strings" "" + ''; meta = with stdenv.lib; { description = "Sample Rate Converter for audio"; diff --git a/pkgs/development/libraries/libsigsegv/default.nix b/pkgs/development/libraries/libsigsegv/default.nix index b0a726ed7f35b5c5814cc9b4eb27c088e00fbb7a..ae6299286a1783d5146766d7ad08148a69b7229f 100644 --- a/pkgs/development/libraries/libsigsegv/default.nix +++ b/pkgs/development/libraries/libsigsegv/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { more. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; }; diff --git a/pkgs/development/libraries/libsndfile/default.nix b/pkgs/development/libraries/libsndfile/default.nix index 8b0eeeb8e57249e0289777f3347093ab0f4f24cb..74140d5f335e22389682c75a7185ab2d2b8aa7fc 100644 --- a/pkgs/development/libraries/libsndfile/default.nix +++ b/pkgs/development/libraries/libsndfile/default.nix @@ -12,8 +12,13 @@ stdenv.mkDerivation rec { # need headers from the Carbon.framework in /System/Library/Frameworks to # compile this on darwin -- not sure how to handle - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin - "-I/System/Library/Frameworks/Carbon.framework/Versions/A/Headers"; + preConfigure = stdenv.lib.optionalString stdenv.isDarwin + '' + NIX_CFLAGS_COMPILE+=" -I$SDKROOT/System/Library/Frameworks/Carbon.framework/Versions/A/Headers" + ''; + + # Needed on Darwin. + NIX_CFLAGS_LINK = "-logg -lvorbis"; meta = with stdenv.lib; { description = "A C library for reading and writing files containing sampled sound"; diff --git a/pkgs/development/libraries/libspatialindex/default.nix b/pkgs/development/libraries/libspatialindex/default.nix index c48c5265fc48be4fec91aebe4b94c011e80a02b3..bd38c37a57b33e321cc2027da3b0ebd3727b92c8 100644 --- a/pkgs/development/libraries/libspatialindex/default.nix +++ b/pkgs/development/libraries/libspatialindex/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { meta = { description = "Extensible spatial index library in C++"; homepage = http://libspatialindex.github.io/; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/development/libraries/libspectre/default.nix b/pkgs/development/libraries/libspectre/default.nix index a819e0cef6f32b1fbfe30890fef11b063d0aaa20..7d46f9e32cef034022b5122fc31a4b9e0d3afc6f 100644 --- a/pkgs/development/libraries/libspectre/default.nix +++ b/pkgs/development/libraries/libspectre/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { handling and rendering Postscript documents. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/development/libraries/libtasn1/default.nix b/pkgs/development/libraries/libtasn1/default.nix index 5e069655afc30417d20a79eb2473254e14c917f2..bae22ef220fc18d2d5c8b7fc0a8d6d3b12594f91 100644 --- a/pkgs/development/libraries/libtasn1/default.nix +++ b/pkgs/development/libraries/libtasn1/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { portable, and only require an ANSI C89 platform. ''; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix index 2c99199664de692e2194cd4fcd3e59362f3b33a8..7ed9794011cdd483c251140df4b94ddb8cecad58 100644 --- a/pkgs/development/libraries/libtiff/default.nix +++ b/pkgs/development/libraries/libtiff/default.nix @@ -40,9 +40,10 @@ stdenv.mkDerivation rec { doCheck = true; - meta = { + meta = with stdenv.lib; { description = "Library and utilities for working with the TIFF image file format"; homepage = http://www.remotesensing.org/libtiff/; - license = "bsd"; + license = licenses.libtiff; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/default.nix index 81336aed8aad8a913a9d6f27ac991318f8f60016..6741838d33b613daf81a871e076bd66fb630936c 100644 --- a/pkgs/development/libraries/libtoxcore/default.nix +++ b/pkgs/development/libraries/libtoxcore/default.nix @@ -1,35 +1,50 @@ -{ stdenv, fetchurl, autoconf, libtool, automake, libsodium, ncurses -, libconfig, pkgconfig }: +{ stdenv, fetchurl, autoconf, libtool, automake, libsodium, ncurses, libopus +, libvpx, check, libconfig, pkgconfig }: let - version = "388b1229b"; - date = "20140220"; + version = "e1158be5a6"; + date = "20140728"; in stdenv.mkDerivation rec { name = "tox-core-${date}-${version}"; src = fetchurl { - url = "https://github.com/irungentoo/ProjectTox-Core/tarball/${version}"; + url = "https://github.com/irungentoo/toxcore/tarball/${version}"; name = "${name}.tar.gz"; - sha256 = "12vggiv0gyv8a2rd5qrv04b7yhfhxb7r0yh75gg5n4jdpcbhvgsd"; + sha256 = "1rsh1pbwvngsx5slmd6608b1zqs3jvq70bjr9zyziap9vxka3z1v"; }; + NIX_LDFLAGS = "-lgcc_s"; + + postPatch = '' + # within Nix chroot builds, localhost is unresolvable + sed -i -e '/DEFTESTCASE(addr_resolv_localhost)/d' \ + auto_tests/network_test.c + # takes WAAAY too long (~10 minutes) and would timeout + sed -i -e '/DEFTESTCASE[^(]*(many_clients\>/d' \ + auto_tests/tox_test.c + ''; + preConfigure = '' autoreconf -i ''; - configureFlags = [ "--with-libsodium-headers=${libsodium}/include" - "--with-libsodium-libs=${libsodium}/lib" - "--enable-ntox" ]; + configureFlags = [ + "--with-libsodium-headers=${libsodium}/include" + "--with-libsodium-libs=${libsodium}/lib" + "--enable-ntox" + ]; - buildInputs = [ autoconf libtool automake libsodium ncurses libconfig - pkgconfig ]; + buildInputs = [ + autoconf libtool automake libsodium ncurses libopus + libvpx check libconfig pkgconfig + ]; doCheck = true; meta = { description = "P2P FOSS instant messaging application aimed to replace Skype with crypto"; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [ viric ]; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/libraries/libunique/default.nix b/pkgs/development/libraries/libunique/default.nix index 125cb890008dda96871a819b503fae223421e747..f60043f18b17a7ce9c6d92e096db35ee7d1b189f 100644 --- a/pkgs/development/libraries/libunique/default.nix +++ b/pkgs/development/libraries/libunique/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://live.gnome.org/LibUnique; description = "A library for writing single instance applications"; - license = "LGPLv2.1"; + license = stdenv.lib.licenses.lgpl21; }; } diff --git a/pkgs/development/libraries/libunistring/default.nix b/pkgs/development/libraries/libunistring/default.nix index 9bc3cb7f90125167b2e2cd697abcad18c648aea1..b578d895c5f0da6133191a5e2b0c913092b63462 100644 --- a/pkgs/development/libraries/libunistring/default.nix +++ b/pkgs/development/libraries/libunistring/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation (rec { strings as internal in-memory representation. ''; - license = "LGPLv3+"; + license = stdenv.lib.licenses.lgpl3Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..bd1f926c9cbe9da08516054a147d34cb12d4f6fb --- /dev/null +++ b/pkgs/development/libraries/libuv/default.nix @@ -0,0 +1,103 @@ +{ stdenv, lib, fetchFromGitHub, autoconf, automake, libtool }: + +let + stable = "stable"; + unstable = "unstable"; + + meta = with lib; { + description = "A multi-platform support library with a focus on asynchronous I/O"; + homepage = https://github.com/joyent/libuv; + maintainers = with maintainers; [ cstrahan ]; + platforms = with platforms; linux ++ darwin; + }; + + mkName = stability: version: + if stability == stable + then "libuv-${version}" + else "libuv-${stability}-${version}"; + + mkSrc = version: sha256: fetchFromGitHub { + owner = "joyent"; + repo = "libuv"; + rev = "v${version}"; + inherit sha256; + }; + + # for versions < 0.11.6 + mkWithoutAutotools = stability: version: sha256: stdenv.mkDerivation { + name = mkName stability version; + src = mkSrc version sha256; + buildPhase = lib.optionalString stdenv.isDarwin '' + mkdir extrapath + ln -s /usr/sbin/dtrace extrapath/dtrace + export PATH=$PATH:`pwd`/extrapath + '' + '' + mkdir build + make builddir_name=build + + rm -r build/src + rm build/libuv.a + cp -r include build + + mkdir build/lib + mv build/libuv.* build/lib + + pushd build/lib + lib=$(basename libuv.*) + ext="''${lib##*.}" + mv $lib libuv.10.$ext + ln -s libuv.10.$ext libuv.$ext + popd + ''; + installPhase = '' + cp -r build $out + ''; + inherit meta; + }; + + # for versions > 0.11.6 + mkWithAutotools = stability: version: sha256: stdenv.mkDerivation { + name = mkName stability version; + src = mkSrc version sha256; + buildInputs = [ automake autoconf libtool ]; + preConfigure = '' + LIBTOOLIZE=libtoolize ./autogen.sh + ''; + inherit meta; + }; + + toVersion = with lib; name: + replaceChars ["_"] ["."] (removePrefix "v" name); + +in + + with lib; + + mapAttrs (v: h: mkWithoutAutotools stable (toVersion v) h) { + v0_10_27 = "0i00v216ha74xi374yhgmfrb4h84q2w4y1ync3y1qsngbm8irjhg"; + } + // + mapAttrs (v: h: mkWithAutotools unstable (toVersion v) h) { + # Versions >= 0.11.1 and < 0.11.6 do not build a dynamic library + v0_11_6 = "15h903hz6kn8j1lp1160ia7llx0ypa5ch8ygkwpmrm31p50ng8r4"; + v0_11_7 = "1l6hrz3g2c7qspy28inbrcd7byn2sncd42ncf4pr0ifpkkj083hh"; + v0_11_8 = "0aag2v7bfi7kksna0867srlqcjxn8m287bpl2j5k11d07m382zs1"; + v0_11_9 = "12ap0ix5ra24f30adgdr48l175vxfmh398mlilm8kdkld0dqfx24"; + v0_11_10 = "17mn9xbygc2jpqv4a068i57rcp585bmcalpb9jpyz1jf030lllyy"; + v0_11_11 = "1l06sznvd5nxzg3fqqb451g4fzygyb37apqyhyvbdb6dmklcm7xk"; + v0_11_12 = "1kwqd3wk06mffhglawx7b2g4yddkg5597aa5jyw2zhzwkz2z4a27"; + v0_11_13 = "0z30ljwgxbm120dy0i4knhj5zw6q7jcx5wi9v0v51ax6mhdgqy8a"; + v0_11_14 = "0bk1bchfkbyyry3d4ggv754w5fyj6qbivbd42ggcr0hq55h49iwg"; + v0_11_15 = "09qayz2k0337h7jbf8zs9lyxgp3ln0gq37r43wixfll7jjjkacvd"; + v0_11_16 = "06jrwwnliqadqgp7fn2093xxljiz8iwdyywh2yljyp4zk8r4vzis"; + v0_11_17 = "0i6nlxnlxwzpib0sp1191h9yymfvgwjwciiq9avcqljiklfg432r"; + v0_11_18 = "0jxrfxf4iq34fjgbwdrvi36hqzgph87928n4q4gchpahywf2pjxk"; + v0_11_19 = "16aw8jx571xxc6am4sbz17j2wb9pylv1svsmwxbczb3vd624vm32"; + v0_11_20 = "0r7cyzxysgcfl4h9xis050b7x8cvmrwzwh1rr545q53j0gjxvzvi"; + v0_11_21 = "0bxjzrlcs2f0va26i0ahvcpjbb0j66rq74smi95s6q73zl99n326"; + v0_11_22 = "0r6nfavsndm1dzinzzxndr2h75g33vigx21z3f7w2x7qwa8a8hpp"; + v0_11_23 = "01dlmpk8a4zvq6lm88bsfi7dzhl7xvma7q5ygi2x5ghdm4svki1m"; + v0_11_24 = "1hygn81iwbdshzrq603qm6k1r7pjflx9qqazmlb72c3vy1hq21c6"; + v0_11_25 = "1abszivlxf0sddwvcj3jywfsip5q9vz6axvn40qqyl8sjs80zcvj"; + v0_11_26 = "1pfjdwrxhqz1vqcdm42g3j45ghrb4yl7wsngvraclhgqicff1sc3"; + } diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix index 5b35d2b24ad4688a306fa6e37fec7db342e15461..e9b7ae4e46cdf7fd36314bbe9060bb0eb7c70557 100644 --- a/pkgs/development/libraries/libva/default.nix +++ b/pkgs/development/libraries/libva/default.nix @@ -1,20 +1,21 @@ -{ stdenv, fetchurl, libX11, pkgconfig, libXext, mesa, libdrm, libXfixes }: +{ stdenv, fetchurl, libX11, pkgconfig, libXext, mesa, libdrm, libXfixes, wayland, libffi }: stdenv.mkDerivation rec { - name = "libva-1.1.1"; + name = "libva-1.3.1"; src = fetchurl { url = "http://www.freedesktop.org/software/vaapi/releases/libva/${name}.tar.bz2"; - sha256 = "0kfdcrzcr82g15l0vvmm6rqr0f0604d4dgrza78gn6bfx7rppby0"; + sha256 = "15y27jdnfvf9krg4s3a1c29rn9pvyp43wckpwhd2rg4wrbqv32c7"; }; - buildInputs = [ libX11 libXext pkgconfig mesa libdrm libXfixes ]; + buildInputs = [ libX11 libXext pkgconfig mesa libdrm libXfixes wayland libffi ]; configureFlags = [ "--enable-glx" ]; - meta = { + meta = with stdenv.lib; { homepage = http://www.freedesktop.org/wiki/Software/vaapi; - license = "MIT"; + license = licenses.mit; description = "VAAPI library: Video Acceleration API"; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libvdpau/default.nix b/pkgs/development/libraries/libvdpau/default.nix index cc8b3f59529fcb6e8414d127f7197d67ff42a1d4..9d9528b75e4c1281c6b79b7b6b361338e7d8dfc0 100644 --- a/pkgs/development/libraries/libvdpau/default.nix +++ b/pkgs/development/libraries/libvdpau/default.nix @@ -1,22 +1,22 @@ -{ stdenv, fetchurl, pkgconfig, xlibs }: +{ stdenv, fetchurl, pkgconfig, xorg }: stdenv.mkDerivation rec { - name = "libvdpau-0.7"; + name = "libvdpau-0.8"; src = fetchurl { url = "http://people.freedesktop.org/~aplattner/vdpau/${name}.tar.gz"; - sha256 = "1q5wx6fmqg2iiw57wxwh5vv4yszqs4nlvlzhzdn9vig8gi30ip14"; + sha256 = "1v81875hppablq9gpsmvhnyl7z80zihx6arry758pvdbq4fd39vk"; }; - buildInputs = with xlibs; [ pkgconfig dri2proto libXext ]; + buildInputs = with xorg; [ pkgconfig dri2proto libXext ]; - propagatedBuildInputs = [ xlibs.libX11 ]; + propagatedBuildInputs = [ xorg.libX11 ]; configureFlags = stdenv.lib.optional stdenv.isDarwin [ "--build=x86_64" ]; - meta = { + meta = with stdenv.lib; { homepage = http://people.freedesktop.org/~aplattner/vdpau/; description = "Library to use the Video Decode and Presentation API for Unix (VDPAU)"; - license = "bsd"; + license = licenses.mit; }; } diff --git a/pkgs/development/libraries/libvisio/default.nix b/pkgs/development/libraries/libvisio/default.nix index 7d24fc9a8a66c0b5ab255415a9e5e19274704fb8..c015e7473bd96085928314fb8e661960b5c4825b 100644 --- a/pkgs/development/libraries/libvisio/default.nix +++ b/pkgs/development/libraries/libvisio/default.nix @@ -1,15 +1,17 @@ -{ stdenv, fetchurl, boost, libwpd, libwpg, pkgconfig, zlib }: +{ stdenv, fetchurl, boost, libwpd, libwpg, pkgconfig, zlib, gperf +, librevenge, libxml2, icu, perl +}: stdenv.mkDerivation rec { - name = "libvisio-0.0.19"; + name = "libvisio-0.1.0"; src = fetchurl { - url = "http://dev-www.libreoffice.org/src/${name}.tar.xz"; - sha256 = "1iqkz280mi066bdccyxagkqm41i270nx01cacvgjq2pflgd3njd1"; + url = "http://dev-www.libreoffice.org/src/${name}.tar.bz2"; + sha256 = "1vpb7nbk5qh6w3jz9rl9w8p25invcvj46parb9ld13h9777kyf0j"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ boost libwpd libwpg zlib ]; + buildInputs = [ boost libwpd libwpg zlib gperf librevenge libxml2 icu perl ]; configureFlags = "--disable-werror"; diff --git a/pkgs/development/libraries/libwpd/default.nix b/pkgs/development/libraries/libwpd/default.nix index 830890fad560d34f1cf4db05e11830cb0d36ccdc..df5917fb05cf9349412cf63176dae02083e9948f 100644 --- a/pkgs/development/libraries/libwpd/default.nix +++ b/pkgs/development/libraries/libwpd/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchurl, zlib, pkgconfig, glib, libgsf, libxml2 }: +{ stdenv, fetchurl, zlib, pkgconfig, glib, libgsf, libxml2, librevenge }: stdenv.mkDerivation rec { - name = "libwpd-0.9.9"; + name = "libwpd-0.10.0"; src = fetchurl { url = "mirror://sourceforge/libwpd/${name}.tar.xz"; - sha256 = "1cn2z89yzsz8k6xjl02jdfhm0pkarw3yxj9ijnz5dx7h1v5g87dr"; + sha256 = "0b6krzr6kxzm89g6bapn805kdayq70hn16n5b5wfs2lwrf0ag2wx"; }; - buildInputs = [ glib libgsf libxml2 zlib ]; + buildInputs = [ glib libgsf libxml2 zlib librevenge ]; nativeBuildInputs = [ pkgconfig ]; } diff --git a/pkgs/development/libraries/libwpg/default.nix b/pkgs/development/libraries/libwpg/default.nix index f71cc9654724a027fc93237090b48f6d3726de3b..0cb405d48375ae3a718b27059944c51e311becf8 100644 --- a/pkgs/development/libraries/libwpg/default.nix +++ b/pkgs/development/libraries/libwpg/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchurl, pkgconfig, libwpd, zlib }: +{ stdenv, fetchurl, pkgconfig, libwpd, zlib, librevenge }: stdenv.mkDerivation rec { - name = "libwpg-0.2.2"; + name = "libwpg-0.3.0"; src = fetchurl { url = "mirror://sourceforge/libwpg/${name}.tar.xz"; - sha256 = "1kd6d583s9162z023gh5jqrhkjsdig2bsfylw3g38xa4p5vzv6xl"; + sha256 = "097jx8a638fwwfrzf6v29r1yhc34rq9526py7wf0ck2z4fcr2w3g"; }; - buildInputs = [ libwpd zlib ]; + buildInputs = [ libwpd zlib librevenge ]; nativeBuildInputs = [ pkgconfig ]; meta = { diff --git a/pkgs/development/libraries/libxkbcommon/default.nix b/pkgs/development/libraries/libxkbcommon/default.nix index e7923f3df5bc413384f26394c178a71c483afbde..e5682219dba193c2d5bc091925052197e46133bd 100644 --- a/pkgs/development/libraries/libxkbcommon/default.nix +++ b/pkgs/development/libraries/libxkbcommon/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchurl, pkgconfig, yacc, flex, xkeyboard_config }: +{ stdenv, fetchurl, pkgconfig, yacc, flex, xkeyboard_config, libxcb }: stdenv.mkDerivation rec { - name = "libxkbcommon-0.3.1"; + name = "libxkbcommon-0.4.2"; src = fetchurl { url = "http://xkbcommon.org/download/${name}.tar.xz"; - sha256 = "13mk335r4dhi9qglzbp46ina1wz4qgcp8r7s06iq7j50pf0kb5ww"; + sha256 = "0mw9ljc5fbqbhnm884w7ns5pf6f2rqj9ww5xcaps9nzdgsq73z50"; }; - buildInputs = [ pkgconfig yacc flex xkeyboard_config ]; + buildInputs = [ pkgconfig yacc flex xkeyboard_config libxcb ]; configureFlags = '' --with-xkb-config-root=${xkeyboard_config}/etc/X11/xkb diff --git a/pkgs/development/libraries/libxmi/default.nix b/pkgs/development/libraries/libxmi/default.nix index ececdabb56cea921a2205008df2bc465ff165845..85f0dbddb0b8e355d0c15aace91a4e15258eb2b9 100644 --- a/pkgs/development/libraries/libxmi/default.nix +++ b/pkgs/development/libraries/libxmi/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { meta = { description = "GNU libxmi, a library for rasterizing 2-D vector graphics"; homepage = http://www.gnu.org/software/libxmi/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.gnu; # arbitrary choice maintainers = [ stdenv.lib.maintainers.ludo ]; }; diff --git a/pkgs/development/libraries/libxmlxx/default.nix b/pkgs/development/libraries/libxmlxx/default.nix index aebb81020b3a97bedb5981a26bb2738bd21448fd..61f519dfe51a60d87f8fd6bb23be3583d7d04673 100644 --- a/pkgs/development/libraries/libxmlxx/default.nix +++ b/pkgs/development/libraries/libxmlxx/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://libxmlplusplus.sourceforge.net/; description = "C++ wrapper for the libxml2 XML parser library"; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ stdenv.lib.maintainers.phreedom ]; }; } \ No newline at end of file diff --git a/pkgs/development/libraries/libyaml-cpp/0.3.x.nix b/pkgs/development/libraries/libyaml-cpp/0.3.x.nix index 4b0acd83fc39a2719d7905b1d06ad315de9343ef..f94ca128228d2400f62c5378357a59c36b00700e 100644 --- a/pkgs/development/libraries/libyaml-cpp/0.3.x.nix +++ b/pkgs/development/libraries/libyaml-cpp/0.3.x.nix @@ -13,6 +13,6 @@ stdenv.mkDerivation { meta = { homepage = http://code.google.com/p/yaml-cpp/; description = "A YAML parser and emitter for C++"; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/development/libraries/libyaml-cpp/default.nix b/pkgs/development/libraries/libyaml-cpp/default.nix index 09860522ef4193fac57aef4c91d132769ca20873..fb81dc425f1f4e5dd567ac3339a22eba9b2127b4 100644 --- a/pkgs/development/libraries/libyaml-cpp/default.nix +++ b/pkgs/development/libraries/libyaml-cpp/default.nix @@ -13,6 +13,6 @@ stdenv.mkDerivation { meta = { homepage = http://code.google.com/p/yaml-cpp/; description = "A YAML parser and emitter for C++"; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/development/libraries/libzrtpcpp/1.6.nix b/pkgs/development/libraries/libzrtpcpp/1.6.nix index 767314cdcae9fa12bb9917fd857742d2f46978cc..79d95e07bb81b0f206f9e47b88aca9afdcc7164d 100644 --- a/pkgs/development/libraries/libzrtpcpp/1.6.nix +++ b/pkgs/development/libraries/libzrtpcpp/1.6.nix @@ -13,8 +13,9 @@ stdenv.mkDerivation rec { meta = { description = "GNU RTP stack for the zrtp protocol developed by Phil Zimmermann"; homepage = "http://www.gnutelephony.org/index.php/GNU_ZRTP"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.marcweber ]; platforms = stdenv.lib.platforms.linux; + broken = true; }; } diff --git a/pkgs/development/libraries/libzrtpcpp/default.nix b/pkgs/development/libraries/libzrtpcpp/default.nix index b18aa6848bfef1fff4c9919604f03cab06c04a4b..9962efa7f1e6bd195b9e970b83be4fcda9f4cc7f 100644 --- a/pkgs/development/libraries/libzrtpcpp/default.nix +++ b/pkgs/development/libraries/libzrtpcpp/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { description = "GNU RTP stack for the zrtp protocol developed by Phil Zimmermann"; homepage = "http://www.gnutelephony.org/index.php/GNU_ZRTP"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.marcweber ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/lightning/default.nix b/pkgs/development/libraries/lightning/default.nix index 4ffbb9719cabf54199267ae563ba73c8801ead66..951627c81c2f35ac85376c6b29917ba0e149a3e2 100644 --- a/pkgs/development/libraries/lightning/default.nix +++ b/pkgs/development/libraries/lightning/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "lightning-2.0.4"; src = fetchurl { - url = "ftp://alpha.gnu.org/gnu/lightning/${name}.tar.gz"; + url = "ftp://ftp.gnu.org/gnu/lightning/${name}.tar.gz"; sha256 = "1lrckrx51d5hrv66bc99fd4b7g2wwn4vr304hwq3glfzhb8jqcdy"; }; @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { the MIPS and SPARC chips. ''; - license = "LGPLv3+"; + license = stdenv.lib.licenses.lgpl3Plus; }; } diff --git a/pkgs/development/libraries/log4cpp/default.nix b/pkgs/development/libraries/log4cpp/default.nix index 32424d546b44f8161d9be2ad9c55e61516d0e8e2..d4400d840c0b0a6c37fbc6f2184325f8a28d41a0 100644 --- a/pkgs/development/libraries/log4cpp/default.nix +++ b/pkgs/development/libraries/log4cpp/default.nix @@ -11,6 +11,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://log4cpp.sourceforge.net/; description = "A logging framework for C++ patterned after Apache log4j"; - license = "LGPLv2.1+"; + license = stdenv.lib.licenses.lgpl21Plus; }; } diff --git a/pkgs/development/libraries/lzo/default.nix b/pkgs/development/libraries/lzo/default.nix index f153c684629a9cff1ccce0368d54f10cd5c87a1b..7fa6194cbca6f5d9624ccf1630fd6cf5f4853b11 100644 --- a/pkgs/development/libraries/lzo/default.nix +++ b/pkgs/development/libraries/lzo/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.oberhumer.com/opensource/lzo; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.all; maintainers = [ ]; diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 215ee46e47c776f4bbb4ad8c87620311b59d6f13..bbad10898bf4dbfde171fa90c1bfeae2bc0e50a0 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -24,7 +24,7 @@ else */ let - version = "10.1.5"; + version = "10.2.5"; # this is the default search path for DRI drivers driverLink = "/run/opengl-driver" + stdenv.lib.optionalString stdenv.isi686 "-32"; in @@ -35,7 +35,7 @@ stdenv.mkDerivation { src = fetchurl { url = "ftp://ftp.freedesktop.org/pub/mesa/${version}/MesaLib-${version}.tar.bz2"; - sha256 = "1g2vy7zaamzs00xasiwg0d6cb5sclfd9v8jms14ll9bghg3mwv5w"; + sha256 = "039is15p8pkhf8m0yiyb72zybl63xb9ckqzcg3xwi8zlyw5ryidl"; }; prePatch = "patchShebangs ."; @@ -70,7 +70,7 @@ stdenv.mkDerivation { "--enable-glx-tls" "--enable-shared-glapi" "--enable-shared-gallium" "--enable-driglx-direct" # seems enabled anyway - "--enable-gallium-llvm" "--with-llvm-shared-libs" + "--enable-gallium-llvm" "--enable-llvm-shared-libs" "--enable-xa" # used in vmware driver "--enable-gles1" "--enable-gles2" "--enable-vdpau" diff --git a/pkgs/development/libraries/ming/default.nix b/pkgs/development/libraries/ming/default.nix index 9cfb8afa8ebaa897edfe6c0a10b6a958fff27cb9..f9632dca9d22cda5b1490956fc3b6fa474400c03 100644 --- a/pkgs/development/libraries/ming/default.nix +++ b/pkgs/development/libraries/ming/default.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation rec { homepage = http://www.libming.org/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; }; } diff --git a/pkgs/development/libraries/mlt/default.nix b/pkgs/development/libraries/mlt/default.nix index 1d21e03efa6c2c754fc2c36a3f5cbc43d6d2afb4..389e2385f98609f94b9b05eb723930f2889a789c 100644 --- a/pkgs/development/libraries/mlt/default.nix +++ b/pkgs/development/libraries/mlt/default.nix @@ -1,29 +1,39 @@ -{ stdenv, fetchurl, SDL, ffmpeg, libdv, libsamplerate, libvorbis -, libxml2 , pkgconfig, qt4, sox, gtk2 }: +{ stdenv, fetchurl, SDL, ffmpeg, frei0r, jack2, libdv, libsamplerate +, libvorbis, libxml2, makeWrapper, movit, pkgconfig, qt, sox +}: stdenv.mkDerivation rec { name = "mlt-${version}"; - version = "0.9.0"; + version = "0.9.2"; src = fetchurl { - url = "mirror://sourceforge/mlt/${name}.tar.gz"; - sha256 = "1j8wbkwpa6k5anyf4nvf71l8251d7clzj6v09jl3vvfakaf6l37j"; + url = "https://github.com/mltframework/mlt/archive/v${version}.tar.gz"; + sha256 = "0vk1i2yrny6dbip4aha25ibgv4m2rdhpxmz6a74q9wz1cgzbb766"; }; - buildInputs = - [ SDL ffmpeg libdv libsamplerate libvorbis libxml2 pkgconfig qt4 - sox # gtk2 /*optional*/ - ]; + buildInputs = [ + SDL ffmpeg frei0r jack2 libdv libsamplerate libvorbis libxml2 + makeWrapper movit pkgconfig qt sox + ]; # Mostly taken from: # http://www.kdenlive.org/user-manual/downloading-and-installing-kdenlive/installing-source/installing-mlt-rendering-engine - configureFlags = [ "--enable-gpl" "--enable-gpl3" "--avformat-swscale" ]; + configureFlags = [ + "--avformat-swscale" "--enable-gpl" "--enable-gpl" "--enable-gpl3" + "--enable-opengl" + ]; enableParallelBuilding = true; - meta = { - homepage = http://www.mltframework.org/; + postInstall = '' + wrapProgram $out/bin/melt --prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1 + ''; + + meta = with stdenv.lib; { description = "Open source multimedia framework, designed for television broadcasting"; - license = "GPLv3"; + homepage = http://www.mltframework.org/; + license = licenses.gpl3; + maintainers = [ maintainers.goibhniu ]; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/movit/default.nix b/pkgs/development/libraries/movit/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..bfd474c88e715f14c3fb3f180c4c91d42e33dd22 --- /dev/null +++ b/pkgs/development/libraries/movit/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, SDL, eigen, epoxy, fftw, gtest, pkgconfig }: + +stdenv.mkDerivation rec { + name = "movit-${version}"; + version = "1.1.1"; + + src = fetchurl { + url = "http://movit.sesse.net/${name}.tar.gz"; + sha256 = "1k3qbkxapcplpsx22xh4m4ccp9fhsjfcj3pjzbcnrc51103aklag"; + }; + + GTEST_DIR = "${gtest}"; + + propagatedBuildInputs = [ eigen epoxy ]; + + buildInputs = [ SDL fftw gtest pkgconfig ]; + + meta = with stdenv.lib; { + description = "High-performance, high-quality video filters for the GPU"; + homepage = http://movits.sesse.net; + license = licenses.gpl2Plus; + maintainers = [ maintainers.goibhniu ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/mpc/default.nix b/pkgs/development/libraries/mpc/default.nix index e5d212dc2690004043228276be96597857105059..652227d47e8576e75c9a650431513021d372a6fb 100644 --- a/pkgs/development/libraries/mpc/default.nix +++ b/pkgs/development/libraries/mpc/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; homepage = http://mpc.multiprecision.org/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.ludo ]; diff --git a/pkgs/development/libraries/mpfr/default.nix b/pkgs/development/libraries/mpfr/default.nix index 8e3281c862ae803be3dbdd5d16ba641513bd8c7f..e3fbaececb9b5e6b68a3ae910baec973febaf0f7 100644 --- a/pkgs/development/libraries/mpfr/default.nix +++ b/pkgs/development/libraries/mpfr/default.nix @@ -39,10 +39,9 @@ stdenv.mkDerivation rec { floating-point arithmetic (53-bit mantissa). ''; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; platforms = stdenv.lib.platforms.all; }; } - diff --git a/pkgs/development/libraries/mtdev/default.nix b/pkgs/development/libraries/mtdev/default.nix index f92fe373043540c85bc8019773a8b8dd7ca6834e..2363f33de0794788f18b59a355de3d058ae75f02 100644 --- a/pkgs/development/libraries/mtdev/default.nix +++ b/pkgs/development/libraries/mtdev/default.nix @@ -21,7 +21,6 @@ stdenv.mkDerivation rec { See the kernel documentation for further details. ''; - license = "MIT/X11"; + license = stdenv.lib.licenses.mit; }; } - diff --git a/pkgs/development/libraries/muparser/default.nix b/pkgs/development/libraries/muparser/default.nix index 3cc1c6ce43c5d647498ef6222d68483ed4f2dafb..9d9a524e86d0220c3c34b496d9544222d568a468 100644 --- a/pkgs/development/libraries/muparser/default.nix +++ b/pkgs/development/libraries/muparser/default.nix @@ -12,6 +12,6 @@ stdenv.mkDerivation { meta = { homepage = http://muparser.sourceforge.net; description = "An extensible high performance math expression parser library written in C++"; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/development/libraries/mygui/default.nix b/pkgs/development/libraries/mygui/default.nix index 0a2df00038470b5c4dc52495a049d0903ff7a794..4aecfa4b01af69b5386709ca1f41a0c71a2829ee 100644 --- a/pkgs/development/libraries/mygui/default.nix +++ b/pkgs/development/libraries/mygui/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://mygui.info/; description = "Library for creating GUIs for games and 3D applications"; - license = "LGPLv3+"; + license = stdenv.lib.licenses.lgpl3Plus; }; } diff --git a/pkgs/development/libraries/mygui/svn.nix b/pkgs/development/libraries/mygui/svn.nix index cc20550802edac74a9d1087bddd8fd6cdf72d772..15da5054291e7fd98cda9384e1c452c440a548a1 100644 --- a/pkgs/development/libraries/mygui/svn.nix +++ b/pkgs/development/libraries/mygui/svn.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://mygui.info/; description = "Library for creating GUIs for games and 3D applications"; - license = "LGPLv3+"; + license = stdenv.lib.licenses.lgpl3Plus; }; } diff --git a/pkgs/development/libraries/mysocketw/default.nix b/pkgs/development/libraries/mysocketw/default.nix index c1cada63abeedbda1227482ea3ed121670ba5820..379848b0cb087180705a217d2cda668fba160e7b 100644 --- a/pkgs/development/libraries/mysocketw/default.nix +++ b/pkgs/development/libraries/mysocketw/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "Cross platform (Linux/FreeBSD/Unix/Win32) streaming socket C++"; - license = "LGPLv2.1+"; + license = stdenv.lib.licenses.lgpl21Plus; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index 7b502822a180757cdc408a57071ebecd98ba9eee..87953c1158d5f4af1b6775a964463c02e11d33ce 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, unicode ? true}: +{ lib, stdenv, fetchurl, unicode ? true }: let /* C++ bindings fail to build on `i386-pc-solaris2.11' with GCC 3.4.3: @@ -10,7 +10,7 @@ let So disable them for now. */ cxx = !stdenv.isSunOS; in -stdenv.mkDerivation (rec { +stdenv.mkDerivation rec { name = "ncurses-5.9"; src = fetchurl { @@ -18,13 +18,7 @@ stdenv.mkDerivation (rec { sha256 = "0fsn7xis81za62afan0vvm38bvgzg5wfmv1m86flqcj0nj7jjilh"; }; - clangPatch = fetchurl { - # Patch referenced from https://github.com/Homebrew/homebrew-dupes/issues/43 - url = "http://lists.gnu.org/archive/html/bug-ncurses/2011-04/txtkWQqiQvcZe.txt"; - sha256 = "03lrwqvb0r2qgi8hz7ayd3g26d6xilr3c92j8li3b77kdc0w0rlv"; - }; - - patches = [ ./patch-ac ] ++ stdenv.lib.optional stdenv.isDarwin clangPatch; + patches = [ ./patch-ac ]; configureFlags = '' --with-shared --without-debug --enable-pc-files --enable-symlinks @@ -41,6 +35,8 @@ stdenv.mkDerivation (rec { export configureFlags="$configureFlags --includedir=$out/include" export PKG_CONFIG_LIBDIR="$out/lib/pkgconfig" mkdir -p "$PKG_CONFIG_LIBDIR" + '' + lib.optionalString stdenv.isDarwin '' + substituteInPlace configure --replace -no-cpp-precomp "" ''; selfNativeBuildInput = true; @@ -50,8 +46,8 @@ stdenv.mkDerivation (rec { preBuild = # On Darwin, we end up using the native `sed' during bootstrap, and it # fails to run this command, which isn't needed anyway. - stdenv.lib.optionalString (!stdenv.isDarwin) - ''sed -e "s@\([[:space:]]\)sh @\1''${SHELL} @" -i */Makefile Makefile''; + lib.optionalString (!stdenv.isDarwin) + ''sed -e "s@\([[:space:]]\)sh @\1''${SHELL} @" -i */Makefile Makefile''; # When building a wide-character (Unicode) build, create backward # compatibility links from the the "normal" libraries to the @@ -71,6 +67,8 @@ stdenv.mkDerivation (rec { ln -svf ncursesw5-config $out/bin/ncurses5-config '' else ""; + postFixup = lib.optionalString stdenv.isDarwin "rm $out/lib/*.so"; + meta = { description = "GNU Ncurses, a free software emulation of curses in SVR4 and more"; @@ -90,9 +88,9 @@ stdenv.mkDerivation (rec { homepage = http://www.gnu.org/software/ncurses/; - license = "X11"; + license = lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.ludo ]; - platforms = stdenv.lib.platforms.all; + maintainers = [ lib.maintainers.ludo ]; + platforms = lib.platforms.all; }; -} // ( if stdenv.isDarwin then { postFixup = "rm $out/lib/*.so"; } else { } ) ) +} diff --git a/pkgs/development/libraries/nettle/default.nix b/pkgs/development/libraries/nettle/default.nix index 4208402ab993f4b454d38f091500739dd15193fa..57d3732fa6dc905ca3d4581e75b1bbbfc3a71b93 100644 --- a/pkgs/development/libraries/nettle/default.nix +++ b/pkgs/development/libraries/nettle/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation (rec { I/O. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://www.lysator.liu.se/~nisse/nettle/; diff --git a/pkgs/development/libraries/newt/default.nix b/pkgs/development/libraries/newt/default.nix index d9369d59c7be28d962291f8d653fa4139c985664..f5f72c006c73e0b9f4738d143f377dcd17b8fbeb 100644 --- a/pkgs/development/libraries/newt/default.nix +++ b/pkgs/development/libraries/newt/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { homepage = https://fedorahosted.org/newt/; description = "Library for color text mode, widget based user interfaces"; - license = "LGPLv2"; + license = stdenv.lib.licenses.lgpl2; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.viric ]; }; diff --git a/pkgs/development/libraries/npth/default.nix b/pkgs/development/libraries/npth/default.nix index c9b685aa05b94a0cf929e0a1aeca3e643a4bff5f..4f87f2bc230f09cfd8f238d5b1c39e75ab62eeea 100644 --- a/pkgs/development/libraries/npth/default.nix +++ b/pkgs/development/libraries/npth/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { that this is a solid way to provide a co-routine based framework. ''; homepage = http://www.gnupg.org; - license = "LGPLv3"; + license = stdenv.lib.licenses.lgpl3; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index a8c12fe48569329d7711435cdab624367d465293..447030f5fccf67182042f73bcf2427afcd82eff9 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -11,11 +11,11 @@ let in stdenv.mkDerivation rec { name = "nss-${version}"; - version = "3.16.1"; + version = "3.16.3"; src = fetchurl { - url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_16_1_RTM/src/${name}.tar.gz"; - sha1 = "450a88dde8c7e4533507ac8340dbf94be28a759b"; + url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_16_3_RTM/src/${name}.tar.gz"; + sha256 = "657711ff7a4058043b69019a66f44101d0234eae2b6b80ab900439dbf02add60"; }; buildInputs = [ nspr perl zlib sqlite ]; diff --git a/pkgs/development/libraries/ogre/default.nix b/pkgs/development/libraries/ogre/default.nix index 6bb1916ed0fb682cc2fe77d1ee11964c6fb1e516..527bb25dce1885d162d6bc70ad15781c5535241d 100644 --- a/pkgs/development/libraries/ogre/default.nix +++ b/pkgs/development/libraries/ogre/default.nix @@ -37,6 +37,6 @@ stdenv.mkDerivation { homepage = http://www.ogre3d.org/; maintainers = [ stdenv.lib.maintainers.raskin ]; platforms = stdenv.lib.platforms.linux; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/development/libraries/ogrepaged/default.nix b/pkgs/development/libraries/ogrepaged/default.nix index f508637dfefb21c33cec251a71a464bb5d6a47b4..27193e045450bb0ac5a56c86b74a768e2c96a5e2 100644 --- a/pkgs/development/libraries/ogrepaged/default.nix +++ b/pkgs/development/libraries/ogrepaged/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { meta = { description = "Paged Geometry for Ogre3D"; homepage = http://code.google.com/p/ogre-paged/; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/development/libraries/opal/default.nix b/pkgs/development/libraries/opal/default.nix index 23615d6646d2ec02f88526e8c540ac1f1097cf35..1f59c0c24a02f3ca3371d20656feb9d05c2e396a 100644 --- a/pkgs/development/libraries/opal/default.nix +++ b/pkgs/development/libraries/opal/default.nix @@ -1,56 +1,36 @@ -x@{builderDefsPackage - , doxygen, pkgconfig, ptlib, srtp, libtheora, speex - , ffmpeg, x264, cyrus_sasl, openldap, openssl, expat, unixODBC - , ...}: -builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ - []; - - buildInputs = map (n: builtins.getAttr n x) - (builtins.attrNames (builtins.removeAttrs x helperArgNames)); - sourceInfo = rec { - baseName="opal"; - baseVersion="3.6"; - patchlevel="8"; - version="${baseVersion}.${patchlevel}"; - name="${baseName}-${version}"; - url="mirror://gnome/sources/${baseName}/${baseVersion}/${name}.tar.bz2"; - hash="0359wqmrxqajd94sw3q2dn6n6y3caggavwdcmzyn6maw7srspgwc"; - }; -in -rec { - src = a.fetchurl { - url = sourceInfo.url; - sha256 = sourceInfo.hash; +{ stdenv, fetchurl, pkgconfig, ptlib, srtp, libtheora, speex +, ffmpeg, x264, cyrus_sasl, openldap, openssl, expat, unixODBC }: + +stdenv.mkDerivation rec { + name = "opal-3.10.10"; + + src = fetchurl { + url = "mirror://gnome/sources/opal/3.10/${name}.tar.xz"; + sha256 = "f208985003461b2743575eccac13ad890b3e5baac35b68ddef17162460aff864"; }; - inherit (sourceInfo) name version; - inherit buildInputs; - - /* doConfigure should be removed if not needed */ - phaseNames = ["setVars" "doConfigure" "doMakeInstall"]; - configureFlags = [ - "--enable-h323" - ]; - setVars = a.noDepEntry ('' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -D__STDC_CONSTANT_MACROS=1" - ''); + buildInputs = [ pkgconfig ptlib srtp libtheora speex + ffmpeg x264 cyrus_sasl openldap openssl expat unixODBC ]; + propagatedBuildInputs = [ speex ]; + + configureFlags = [ "--enable-h323" ]; + + enableParallelBuilding = true; + + NIX_CFLAGS = "-D__STDC_CONSTANT_MACROS=1"; + + patches = [ ./disable-samples-ftbfs.diff ./libav9.patch ./libav10.patch ]; - meta = { + meta = with stdenv.lib; { description = "OPAL VoIP library"; - maintainers = with a.lib.maintainers; - [ - raskin - ]; - platforms = with a.lib.platforms; - linux; + maintainers = [ maintainers.raskin ]; + platforms = platforms.linux; }; + passthru = { updateInfo = { downloadPage = "http://ftp.gnome.org/pub/GNOME/sources/opal"; }; }; -}) x +} diff --git a/pkgs/development/libraries/opal/disable-samples-ftbfs.diff b/pkgs/development/libraries/opal/disable-samples-ftbfs.diff new file mode 100644 index 0000000000000000000000000000000000000000..1b07382160799ed8406c116f38c5f8418a5729a8 --- /dev/null +++ b/pkgs/development/libraries/opal/disable-samples-ftbfs.diff @@ -0,0 +1,14 @@ +Index: opal-3.10.4~dfsg/Makefile.in +=================================================================== +--- opal-3.10.4~dfsg.orig/Makefile.in 2012-02-22 10:08:36.000000000 +1100 ++++ opal-3.10.4~dfsg/Makefile.in 2012-03-08 08:32:44.000000000 +1100 +@@ -45,8 +45,7 @@ + samples/codectest \ + samples/callgen \ + samples/opalecho \ +- samples/faxopal \ +- samples/c_api ++ samples/faxopal + ifeq ($(OPAL_IVR),yes) + SUBDIRS += samples/opalmcu \ + samples/ivropal \ diff --git a/pkgs/development/libraries/opal/libav10.patch b/pkgs/development/libraries/opal/libav10.patch new file mode 100644 index 0000000000000000000000000000000000000000..3e02704f8998916c66276bc4cede4038c467208b --- /dev/null +++ b/pkgs/development/libraries/opal/libav10.patch @@ -0,0 +1,208 @@ +Description: Fix compilation against libav10 +Author: Reinhard Tartler +Bug-Debian: http://bugs.debian.org/739439 + +--- a/plugins/video/H.263-1998/h263-1998.cxx ++++ b/plugins/video/H.263-1998/h263-1998.cxx +@@ -94,7 +94,7 @@ static struct StdSizes { + { CIF16_WIDTH, CIF16_HEIGHT, PLUGINCODEC_CIF16_MPI }, + }; + +-static FFMPEGLibrary FFMPEGLibraryInstance(CODEC_ID_H263P); ++static FFMPEGLibrary FFMPEGLibraryInstance(AV_CODEC_ID_H263P); + + + ///////////////////////////////////////////////////////////////////////////// +@@ -203,7 +203,7 @@ H263_Base_EncoderContext::~H263_Base_Enc + PTRACE(4, m_prefix, "Encoder closed"); + } + +-bool H263_Base_EncoderContext::Init(CodecID codecId) ++bool H263_Base_EncoderContext::Init(AVCodecID codecId) + { + PTRACE(5, m_prefix, "Opening encoder"); + +@@ -589,7 +589,7 @@ void H263_RFC2190_EncoderContext::RTPCal + + bool H263_RFC2190_EncoderContext::Init() + { +- if (!H263_Base_EncoderContext::Init(CODEC_ID_H263)) ++ if (!H263_Base_EncoderContext::Init(AV_CODEC_ID_H263)) + return false; + + #if LIBAVCODEC_RTP_MODE +@@ -632,7 +632,7 @@ H263_RFC2429_EncoderContext::~H263_RFC24 + + bool H263_RFC2429_EncoderContext::Init() + { +- return H263_Base_EncoderContext::Init(CODEC_ID_H263P); ++ return H263_Base_EncoderContext::Init(AV_CODEC_ID_H263P); + } + + +@@ -656,7 +656,7 @@ H263_Base_DecoderContext::H263_Base_Deco + if (!FFMPEGLibraryInstance.Load()) + return; + +- if ((m_codec = FFMPEGLibraryInstance.AvcodecFindDecoder(CODEC_ID_H263)) == NULL) { ++ if ((m_codec = FFMPEGLibraryInstance.AvcodecFindDecoder(AV_CODEC_ID_H263)) == NULL) { + PTRACE(1, m_prefix, "Codec not found for decoder"); + return; + } +--- a/plugins/video/H.264/h264-x264.cxx ++++ b/plugins/video/H.264/h264-x264.cxx +@@ -105,7 +105,7 @@ static struct PluginCodec_information Li + + /////////////////////////////////////////////////////////////////////////////// + +-FFMPEGLibrary FFMPEGLibraryInstance(CODEC_ID_H264); ++FFMPEGLibrary FFMPEGLibraryInstance(AV_CODEC_ID_H264); + + PLUGINCODEC_CONTROL_LOG_FUNCTION_DEF + +@@ -1065,17 +1065,17 @@ class MyDecoder : public PluginCodecworkaround_bugs = FF_BUG_AUTODETECT; +- m_context->idct_algo = FF_IDCT_H264; ++ m_context->idct_algo = FF_IDCT_AUTO; + m_context->error_concealment = FF_EC_GUESS_MVS | FF_EC_DEBLOCK; + m_context->flags = CODEC_FLAG_INPUT_PRESERVED | CODEC_FLAG_EMU_EDGE; +- m_context->flags2 = CODEC_FLAG2_SKIP_RD | ++ m_context->flags2 = + #ifdef CODEC_FLAG2_DROP_FRAME_TIMECODE + CODEC_FLAG2_DROP_FRAME_TIMECODE | + #endif +--- a/plugins/video/MPEG4-ffmpeg/mpeg4.cxx ++++ b/plugins/video/MPEG4-ffmpeg/mpeg4.cxx +@@ -205,7 +205,7 @@ const static struct mpeg4_resolution { + { 0 } + }; + +-FFMPEGLibrary FFMPEGLibraryInstance(CODEC_ID_MPEG4); ++FFMPEGLibrary FFMPEGLibraryInstance(AV_CODEC_ID_MPEG4); + + + static bool mpeg4IsIframe (BYTE * frameBuffer, unsigned int frameLen ) +@@ -688,7 +688,7 @@ void MPEG4EncoderContext::ResizeEncoding + + bool MPEG4EncoderContext::OpenCodec() + { +- if((m_avcodec = FFMPEGLibraryInstance.AvcodecFindEncoder(CODEC_ID_MPEG4)) == NULL){ ++ if((m_avcodec = FFMPEGLibraryInstance.AvcodecFindEncoder(AV_CODEC_ID_MPEG4)) == NULL){ + PTRACE(1, "MPEG4", "Encoder not found"); + return false; + } +@@ -1390,7 +1390,7 @@ void MPEG4DecoderContext::ResizeDecoding + + bool MPEG4DecoderContext::OpenCodec() + { +- if ((m_avcodec = FFMPEGLibraryInstance.AvcodecFindDecoder(CODEC_ID_MPEG4)) == NULL) { ++ if ((m_avcodec = FFMPEGLibraryInstance.AvcodecFindDecoder(AV_CODEC_ID_MPEG4)) == NULL) { + PTRACE(1, "MPEG4", "Decoder not found for encoder"); + return false; + } +--- a/plugins/video/H.263-1998/h263-1998.h ++++ b/plugins/video/H.263-1998/h263-1998.h +@@ -115,7 +115,7 @@ class H263_Base_EncoderContext + virtual ~H263_Base_EncoderContext(); + + virtual bool Init() = 0; +- virtual bool Init(CodecID codecId); ++ virtual bool Init(AVCodecID codecId); + + virtual bool SetOptions(const char * const * options); + virtual void SetOption(const char * option, const char * value); +--- a/plugins/video/common/dyna.cxx ++++ b/plugins/video/common/dyna.cxx +@@ -217,14 +217,14 @@ static void logCallbackFFMPEG(void * avc + #endif + + +-FFMPEGLibrary::FFMPEGLibrary(CodecID codec) ++FFMPEGLibrary::FFMPEGLibrary(AVCodecID codec) + { + m_codec = codec; +- if (m_codec==CODEC_ID_H264) ++ if (m_codec==AV_CODEC_ID_H264) + snprintf( m_codecString, sizeof(m_codecString), "H264"); +- if (m_codec==CODEC_ID_H263P) ++ if (m_codec==AV_CODEC_ID_H263P) + snprintf( m_codecString, sizeof(m_codecString), "H263+"); +- if (m_codec==CODEC_ID_MPEG4) ++ if (m_codec==AV_CODEC_ID_MPEG4) + snprintf( m_codecString, sizeof(m_codecString), "MPEG4"); + m_isLoadedOK = false; + } +@@ -268,12 +268,12 @@ bool FFMPEGLibrary::Load() + return true; + } + +-AVCodec *FFMPEGLibrary::AvcodecFindEncoder(enum CodecID id) ++AVCodec *FFMPEGLibrary::AvcodecFindEncoder(enum AVCodecID id) + { + return avcodec_find_encoder(id); + } + +-AVCodec *FFMPEGLibrary::AvcodecFindDecoder(enum CodecID id) ++AVCodec *FFMPEGLibrary::AvcodecFindDecoder(enum AVCodecID id) + { + WaitAndSignal m(processLock); + +@@ -308,13 +308,18 @@ int FFMPEGLibrary::AvcodecClose(AVCodecC + return avcodec_close(ctx); + } + ++#undef FFMAX ++#define FFMAX(a,b) ((a) > (b) ? (a) : (b)) + int FFMPEGLibrary::AvcodecEncodeVideo(AVCodecContext *ctx, BYTE *buf, int buf_size, const AVFrame *pict) + { ++ AVPacket pkt = { 0 }; ++ int ret, got_output; + int res; + +- res = avcodec_encode_video(ctx, buf, buf_size, pict); ++ ret = avcodec_encode_video2(ctx, &pkt, pict, &got_output); + +- PTRACE(6, m_codecString, "DYNA\tEncoded into " << res << " bytes, max " << buf_size); ++ PTRACE(6, m_codecString, "DYNA\tEncoded into " << ret << " bytes, max " << buf_size); ++ memcpy(buf, pkt.data, FFMAX(pkt.size, buf_size)); + return res; + } + +--- a/plugins/video/common/dyna.h ++++ b/plugins/video/common/dyna.h +@@ -88,13 +88,13 @@ class DynaLink + class FFMPEGLibrary + { + public: +- FFMPEGLibrary(CodecID codec); ++ FFMPEGLibrary(AVCodecID codec); + ~FFMPEGLibrary(); + + bool Load(); + +- AVCodec *AvcodecFindEncoder(enum CodecID id); +- AVCodec *AvcodecFindDecoder(enum CodecID id); ++ AVCodec *AvcodecFindEncoder(enum AVCodecID id); ++ AVCodec *AvcodecFindDecoder(enum AVCodecID id); + AVCodecContext *AvcodecAllocContext(AVCodec*); + AVFrame *AvcodecAllocFrame(void); + int AvcodecOpen(AVCodecContext *ctx, AVCodec *codec); +@@ -117,7 +117,7 @@ class FFMPEGLibrary + DynaLink m_libAvcodec; + DynaLink m_libAvutil; + +- CodecID m_codec; ++ AVCodecID m_codec; + char m_codecString[32]; + + bool m_isLoadedOK; diff --git a/pkgs/development/libraries/opal/libav9.patch b/pkgs/development/libraries/opal/libav9.patch new file mode 100644 index 0000000000000000000000000000000000000000..f91a8c033fe357281023760a1259104e04d7a131 --- /dev/null +++ b/pkgs/development/libraries/opal/libav9.patch @@ -0,0 +1,543 @@ +Description: Backport changes for the libav 9 API + Also replace loading of libavcodec and libavutil via dlopen by linking against + it. +Author: Sebastian Ramacher +Bug-Debian: http://bugs.debian.org/720824 +Last-Update: 2013-09-12 + +--- a/plugins/video/H.263-1998/h263-1998.cxx ++++ b/plugins/video/H.263-1998/h263-1998.cxx +@@ -216,7 +216,7 @@ + return false; + } + +- m_context = FFMPEGLibraryInstance.AvcodecAllocContext(); ++ m_context = FFMPEGLibraryInstance.AvcodecAllocContext(m_codec); + if (m_context == NULL) { + PTRACE(1, m_prefix, "Failed to allocate context for encoder"); + return false; +@@ -312,6 +312,7 @@ + return; + } + ++#ifdef CODEC_FLAG_H263P_UMV + if (STRCMPI(option, H263_ANNEX_D) == 0) { + // Annex D: Unrestructed Motion Vectors + // Level 2+ +@@ -322,6 +323,7 @@ + m_context->flags &= ~CODEC_FLAG_H263P_UMV; + return; + } ++#endif + + #if 0 // DO NOT ENABLE THIS FLAG. FFMPEG IS NOT THREAD_SAFE WHEN THIS FLAG IS SET + if (STRCMPI(option, H263_ANNEX_F) == 0) { +@@ -356,6 +358,7 @@ + return; + } + ++#ifdef CODEC_FLAG_H263P_SLICE_STRUCT + if (STRCMPI(option, H263_ANNEX_K) == 0) { + // Annex K: Slice Structure + // does not work with eyeBeam +@@ -365,7 +368,9 @@ + m_context->flags &= ~CODEC_FLAG_H263P_SLICE_STRUCT; + return; + } ++#endif + ++#ifdef CODEC_FLAG_H263P_AIV + if (STRCMPI(option, H263_ANNEX_S) == 0) { + // Annex S: Alternative INTER VLC mode + // does not work with eyeBeam +@@ -375,6 +380,7 @@ + m_context->flags &= ~CODEC_FLAG_H263P_AIV; + return; + } ++#endif + + if (STRCMPI(option, PLUGINCODEC_MEDIA_PACKETIZATION) == 0 || + STRCMPI(option, PLUGINCODEC_MEDIA_PACKETIZATIONS) == 0) { +@@ -450,15 +456,6 @@ + PTRACE(5, m_prefix, "qmax set to " << m_context->qmax); + PTRACE(5, m_prefix, "payload size set to " << m_context->rtp_payload_size); + +- #define CODEC_TRACER_FLAG(tracer, flag) \ +- PTRACE(4, m_prefix, #flag " is " << ((m_context->flags & flag) ? "enabled" : "disabled")); +- CODEC_TRACER_FLAG(tracer, CODEC_FLAG_H263P_UMV); +- CODEC_TRACER_FLAG(tracer, CODEC_FLAG_OBMC); +- CODEC_TRACER_FLAG(tracer, CODEC_FLAG_AC_PRED); +- CODEC_TRACER_FLAG(tracer, CODEC_FLAG_H263P_SLICE_STRUCT) +- CODEC_TRACER_FLAG(tracer, CODEC_FLAG_LOOP_FILTER); +- CODEC_TRACER_FLAG(tracer, CODEC_FLAG_H263P_AIV); +- + return FFMPEGLibraryInstance.AvcodecOpen(m_context, m_codec) == 0; + } + +@@ -521,7 +518,7 @@ + + // Need to copy to local buffer to guarantee 16 byte alignment + memcpy(m_inputFrame->data[0], OPAL_VIDEO_FRAME_DATA_PTR(header), header->width*header->height*3/2); +- m_inputFrame->pict_type = (flags & PluginCodec_CoderForceIFrame) ? FF_I_TYPE : AV_PICTURE_TYPE_NONE; ++ m_inputFrame->pict_type = (flags & PluginCodec_CoderForceIFrame) ? AV_PICTURE_TYPE_I : AV_PICTURE_TYPE_NONE; + + /* + m_inputFrame->pts = (int64_t)srcRTP.GetTimestamp()*m_context->time_base.den/m_context->time_base.num/VIDEO_CLOCKRATE; +@@ -603,13 +600,19 @@ + m_context->rtp_callback = &H263_RFC2190_EncoderContext::RTPCallBack; + m_context->opaque = this; // used to separate out packets from different encode threads + ++#ifdef CODEC_FLAG_H263P_UMV + m_context->flags &= ~CODEC_FLAG_H263P_UMV; ++#endif + m_context->flags &= ~CODEC_FLAG_4MV; + #if LIBAVCODEC_RTP_MODE + m_context->flags &= ~CODEC_FLAG_H263P_AIC; + #endif ++#ifdef CODEC_FLAG_H263P_AIV + m_context->flags &= ~CODEC_FLAG_H263P_AIV; ++#endif ++#ifdef CODEC_FLAG_H263P_SLICE_STRUCT + m_context->flags &= ~CODEC_FLAG_H263P_SLICE_STRUCT; ++#endif + + return true; + } +@@ -658,7 +661,7 @@ + return; + } + +- m_context = FFMPEGLibraryInstance.AvcodecAllocContext(); ++ m_context = FFMPEGLibraryInstance.AvcodecAllocContext(m_codec); + if (m_context == NULL) { + PTRACE(1, m_prefix, "Failed to allocate context for decoder"); + return; +--- a/plugins/video/H.264/h264-x264.cxx ++++ b/plugins/video/H.264/h264-x264.cxx +@@ -48,6 +48,7 @@ + #include "shared/h264frame.h" + #include "shared/x264wrap.h" + ++#include + + #define MY_CODEC x264 // Name of codec (use C variable characters) + #define MY_CODEC_LOG "x264" +@@ -1067,18 +1068,17 @@ + if ((m_codec = FFMPEGLibraryInstance.AvcodecFindDecoder(CODEC_ID_H264)) == NULL) + return false; + +- if ((m_context = FFMPEGLibraryInstance.AvcodecAllocContext()) == NULL) ++ if ((m_context = FFMPEGLibraryInstance.AvcodecAllocContext(m_codec)) == NULL) + return false; + + m_context->workaround_bugs = FF_BUG_AUTODETECT; +- m_context->error_recognition = FF_ER_AGGRESSIVE; + m_context->idct_algo = FF_IDCT_H264; + m_context->error_concealment = FF_EC_GUESS_MVS | FF_EC_DEBLOCK; + m_context->flags = CODEC_FLAG_INPUT_PRESERVED | CODEC_FLAG_EMU_EDGE; +- m_context->flags2 = CODEC_FLAG2_BRDO | +- CODEC_FLAG2_MEMC_ONLY | ++ m_context->flags2 = CODEC_FLAG2_SKIP_RD | ++#ifdef CODEC_FLAG2_DROP_FRAME_TIMECODE + CODEC_FLAG2_DROP_FRAME_TIMECODE | +- CODEC_FLAG2_SKIP_RD | ++#endif + CODEC_FLAG2_CHUNKS; + + if ((m_picture = FFMPEGLibraryInstance.AvcodecAllocFrame()) == NULL) +--- a/plugins/video/MPEG4-ffmpeg/mpeg4.cxx ++++ b/plugins/video/MPEG4-ffmpeg/mpeg4.cxx +@@ -589,17 +589,14 @@ + m_avpicture->quality = m_videoQMin; + + #ifdef USE_ORIG +- m_avcontext->flags |= CODEC_FLAG_PART; // data partitioning + m_avcontext->flags |= CODEC_FLAG_4MV; // 4 motion vectors + #else + m_avcontext->max_b_frames=0; /*don't use b frames*/ + m_avcontext->flags|=CODEC_FLAG_AC_PRED; +- m_avcontext->flags|=CODEC_FLAG_H263P_UMV; + /*c->flags|=CODEC_FLAG_QPEL;*/ /*don't enable this one: this forces profile_level to advanced simple profile */ + m_avcontext->flags|=CODEC_FLAG_4MV; + m_avcontext->flags|=CODEC_FLAG_GMC; + m_avcontext->flags|=CODEC_FLAG_LOOP_FILTER; +- m_avcontext->flags|=CODEC_FLAG_H263P_SLICE_STRUCT; + #endif + m_avcontext->opaque = this; // for use in RTP callback + } +@@ -691,7 +688,12 @@ + + bool MPEG4EncoderContext::OpenCodec() + { +- m_avcontext = FFMPEGLibraryInstance.AvcodecAllocContext(); ++ if((m_avcodec = FFMPEGLibraryInstance.AvcodecFindEncoder(CODEC_ID_MPEG4)) == NULL){ ++ PTRACE(1, "MPEG4", "Encoder not found"); ++ return false; ++ } ++ ++ m_avcontext = FFMPEGLibraryInstance.AvcodecAllocContext(m_avcodec); + if (m_avcontext == NULL) { + PTRACE(1, "MPEG4", "Encoder failed to allocate context for encoder"); + return false; +@@ -703,11 +705,6 @@ + return false; + } + +- if((m_avcodec = FFMPEGLibraryInstance.AvcodecFindEncoder(CODEC_ID_MPEG4)) == NULL){ +- PTRACE(1, "MPEG4", "Encoder not found"); +- return false; +- } +- + #if PLUGINCODEC_TRACING + // debugging flags + if (PTRACE_CHECK(4)) { +@@ -804,7 +801,7 @@ + // Should the next frame be an I-Frame? + if ((flags & PluginCodec_CoderForceIFrame) || (m_frameNum == 0)) + { +- m_avpicture->pict_type = FF_I_TYPE; ++ m_avpicture->pict_type = AV_PICTURE_TYPE_I; + } + else // No IFrame requested, let avcodec decide what to do + { +@@ -1325,7 +1322,6 @@ + + void MPEG4DecoderContext::SetStaticDecodingParams() { + m_avcontext->flags |= CODEC_FLAG_4MV; +- m_avcontext->flags |= CODEC_FLAG_PART; + m_avcontext->workaround_bugs = 0; // no workaround for buggy implementations + } + +@@ -1399,7 +1395,7 @@ + return false; + } + +- m_avcontext = FFMPEGLibraryInstance.AvcodecAllocContext(); ++ m_avcontext = FFMPEGLibraryInstance.AvcodecAllocContext(m_avcodec); + if (m_avcontext == NULL) { + PTRACE(1, "MPEG4", "Decoder failed to allocate context"); + return false; +--- a/plugins/video/common/dyna.cxx ++++ b/plugins/video/common/dyna.cxx +@@ -38,6 +38,13 @@ + * Matthias Schneider (ma30002000@yahoo.de) + */ + #include "dyna.h" ++#include ++#include ++ ++extern "C" { ++#include ++#include ++} + + bool DynaLink::Open(const char *name) + { +@@ -228,101 +235,15 @@ + m_libAvutil.Close(); + } + +-#define CHECK_AVUTIL(name, func) \ +- (seperateLibAvutil ? \ +- m_libAvutil.GetFunction(name, (DynaLink::Function &)func) : \ +- m_libAvcodec.GetFunction(name, (DynaLink::Function &)func) \ +- ) \ +- +- + bool FFMPEGLibrary::Load() + { + WaitAndSignal m(processLock); + if (IsLoaded()) + return true; + +- bool seperateLibAvutil = false; +- +-#ifdef LIBAVCODEC_LIB_NAME +- if (m_libAvcodec.Open(LIBAVCODEC_LIB_NAME)) +- seperateLibAvutil = true; +- else +-#endif +- if (m_libAvcodec.Open("libavcodec")) +- seperateLibAvutil = false; +- else if (m_libAvcodec.Open("avcodec-" AV_STRINGIFY(LIBAVCODEC_VERSION_MAJOR))) +- seperateLibAvutil = true; +- else { +- PTRACE(1, m_codecString, "Failed to load FFMPEG libavcodec library"); +- return false; +- } +- +- if (seperateLibAvutil && +- !( +-#ifdef LIBAVUTIL_LIB_NAME +- m_libAvutil.Open(LIBAVUTIL_LIB_NAME) || +-#endif +- m_libAvutil.Open("libavutil") || +- m_libAvutil.Open("avutil-" AV_STRINGIFY(LIBAVUTIL_VERSION_MAJOR)) +- ) ) { +- PTRACE(1, m_codecString, "Failed to load FFMPEG libavutil library"); +- return false; +- } +- +- strcpy(m_libAvcodec.m_codecString, m_codecString); +- strcpy(m_libAvutil.m_codecString, m_codecString); +- +- if (!m_libAvcodec.GetFunction("avcodec_init", (DynaLink::Function &)Favcodec_init)) +- return false; +- +- if (!m_libAvcodec.GetFunction("av_init_packet", (DynaLink::Function &)Fav_init_packet)) +- return false; +- +- if (!m_libAvcodec.GetFunction("avcodec_register_all", (DynaLink::Function &)Favcodec_register_all)) +- return false; +- +- if (!m_libAvcodec.GetFunction("avcodec_find_encoder", (DynaLink::Function &)Favcodec_find_encoder)) +- return false; +- +- if (!m_libAvcodec.GetFunction("avcodec_find_decoder", (DynaLink::Function &)Favcodec_find_decoder)) +- return false; +- +- if (!m_libAvcodec.GetFunction("avcodec_alloc_context", (DynaLink::Function &)Favcodec_alloc_context)) +- return false; +- +- if (!m_libAvcodec.GetFunction("avcodec_alloc_frame", (DynaLink::Function &)Favcodec_alloc_frame)) +- return false; +- +- if (!m_libAvcodec.GetFunction("avcodec_open", (DynaLink::Function &)Favcodec_open)) +- return false; +- +- if (!m_libAvcodec.GetFunction("avcodec_close", (DynaLink::Function &)Favcodec_close)) +- return false; +- +- if (!m_libAvcodec.GetFunction("avcodec_encode_video", (DynaLink::Function &)Favcodec_encode_video)) +- return false; +- +- if (!m_libAvcodec.GetFunction("avcodec_decode_video2", (DynaLink::Function &)Favcodec_decode_video)) +- return false; +- +- if (!m_libAvcodec.GetFunction("avcodec_set_dimensions", (DynaLink::Function &)Favcodec_set_dimensions)) +- return false; +- +- if (!CHECK_AVUTIL("av_free", Favcodec_free)) +- return false; +- +- if(!m_libAvcodec.GetFunction("avcodec_version", (DynaLink::Function &)Favcodec_version)) +- return false; +- +- if (!CHECK_AVUTIL("av_log_set_level", FAv_log_set_level)) +- return false; +- +- if (!CHECK_AVUTIL("av_log_set_callback", FAv_log_set_callback)) +- return false; +- + // must be called before using avcodec lib + +- unsigned libVer = Favcodec_version(); ++ unsigned libVer = avcodec_version(); + if (libVer != LIBAVCODEC_VERSION_INT) { + PTRACE(2, m_codecString, "Warning: compiled against libavcodec headers from version " + << LIBAVCODEC_VERSION_MAJOR << '.' << LIBAVCODEC_VERSION_MINOR << '.' << LIBAVCODEC_VERSION_MICRO +@@ -334,8 +255,7 @@ + << (libVer >> 16) << ((libVer>>8) & 0xff) << (libVer & 0xff)); + } + +- Favcodec_init(); +- Favcodec_register_all (); ++ avcodec_register_all(); + + #if PLUGINCODEC_TRACING + AvLogSetLevel(AV_LOG_DEBUG); +@@ -350,49 +270,49 @@ + + AVCodec *FFMPEGLibrary::AvcodecFindEncoder(enum CodecID id) + { +- return Favcodec_find_encoder(id); ++ return avcodec_find_encoder(id); + } + + AVCodec *FFMPEGLibrary::AvcodecFindDecoder(enum CodecID id) + { + WaitAndSignal m(processLock); + +- return Favcodec_find_decoder(id); ++ return avcodec_find_decoder(id); + } + +-AVCodecContext *FFMPEGLibrary::AvcodecAllocContext(void) ++AVCodecContext *FFMPEGLibrary::AvcodecAllocContext(AVCodec *codec) + { + WaitAndSignal m(processLock); + +- return Favcodec_alloc_context(); ++ return avcodec_alloc_context3(codec); + } + + AVFrame *FFMPEGLibrary::AvcodecAllocFrame(void) + { + WaitAndSignal m(processLock); + +- return Favcodec_alloc_frame(); ++ return avcodec_alloc_frame(); + } + + int FFMPEGLibrary::AvcodecOpen(AVCodecContext *ctx, AVCodec *codec) + { + WaitAndSignal m(processLock); + +- return Favcodec_open(ctx, codec); ++ return avcodec_open2(ctx, codec, NULL); + } + + int FFMPEGLibrary::AvcodecClose(AVCodecContext *ctx) + { + WaitAndSignal m(processLock); + +- return Favcodec_close(ctx); ++ return avcodec_close(ctx); + } + + int FFMPEGLibrary::AvcodecEncodeVideo(AVCodecContext *ctx, BYTE *buf, int buf_size, const AVFrame *pict) + { + int res; + +- res = Favcodec_encode_video(ctx, buf, buf_size, pict); ++ res = avcodec_encode_video(ctx, buf, buf_size, pict); + + PTRACE(6, m_codecString, "DYNA\tEncoded into " << res << " bytes, max " << buf_size); + return res; +@@ -401,35 +321,35 @@ + int FFMPEGLibrary::AvcodecDecodeVideo(AVCodecContext *ctx, AVFrame *pict, int *got_picture_ptr, BYTE *buf, int buf_size) + { + AVPacket avpkt; +- Fav_init_packet(&avpkt); ++ av_init_packet(&avpkt); + avpkt.data = buf; + avpkt.size = buf_size; + +- return Favcodec_decode_video(ctx, pict, got_picture_ptr, &avpkt); ++ return avcodec_decode_video2(ctx, pict, got_picture_ptr, &avpkt); + } + + void FFMPEGLibrary::AvcodecFree(void * ptr) + { + WaitAndSignal m(processLock); + +- Favcodec_free(ptr); ++ av_free(ptr); + } + + void FFMPEGLibrary::AvSetDimensions(AVCodecContext *s, int width, int height) + { + WaitAndSignal m(processLock); + +- Favcodec_set_dimensions(s, width, height); ++ avcodec_set_dimensions(s, width, height); + } + + void FFMPEGLibrary::AvLogSetLevel(int level) + { +- FAv_log_set_level(level); ++ av_log_set_level(level); + } + + void FFMPEGLibrary::AvLogSetCallback(void (*callback)(void*, int, const char*, va_list)) + { +- FAv_log_set_callback(callback); ++ av_log_set_callback(callback); + } + + bool FFMPEGLibrary::IsLoaded() +--- a/plugins/video/common/dyna.h ++++ b/plugins/video/common/dyna.h +@@ -95,7 +95,7 @@ + + AVCodec *AvcodecFindEncoder(enum CodecID id); + AVCodec *AvcodecFindDecoder(enum CodecID id); +- AVCodecContext *AvcodecAllocContext(void); ++ AVCodecContext *AvcodecAllocContext(AVCodec*); + AVFrame *AvcodecAllocFrame(void); + int AvcodecOpen(AVCodecContext *ctx, AVCodec *codec); + int AvcodecClose(AVCodecContext *ctx); +@@ -120,26 +120,6 @@ + CodecID m_codec; + char m_codecString[32]; + +- void (*Favcodec_init)(void); +- void (*Fav_init_packet)(AVPacket *pkt); +- +- void (*Favcodec_register_all)(void); +- AVCodec *(*Favcodec_find_encoder)(enum CodecID id); +- AVCodec *(*Favcodec_find_decoder)(enum CodecID id); +- AVCodecContext *(*Favcodec_alloc_context)(void); +- AVFrame *(*Favcodec_alloc_frame)(void); +- int (*Favcodec_open)(AVCodecContext *ctx, AVCodec *codec); +- int (*Favcodec_close)(AVCodecContext *ctx); +- int (*Favcodec_encode_video)(AVCodecContext *ctx, BYTE *buf, int buf_size, const AVFrame *pict); +- int (*Favcodec_decode_video)(AVCodecContext *ctx, AVFrame *pict, int *got_picture_ptr, AVPacket *avpkt); +- unsigned (*Favcodec_version)(void); +- void (*Favcodec_set_dimensions)(AVCodecContext *ctx, int width, int height); +- +- void (*Favcodec_free)(void *); +- +- void (*FAv_log_set_level)(int level); +- void (*FAv_log_set_callback)(void (*callback)(void*, int, const char*, va_list)); +- + bool m_isLoadedOK; + }; + +--- a/plugins/video/common/ffmpeg.h ++++ b/plugins/video/common/ffmpeg.h +@@ -45,11 +45,13 @@ + + #include "platform.h" + +-#include "libavcodec/avcodec.h" ++extern "C" { ++#include + // AVPacket was declared in avformat.h before April 2009 + #if LIBAVCODEC_VERSION_INT <= AV_VERSION_INT(52, 25, 0) +-#include "libavformat/avformat.h" ++#include + #endif ++} + + #ifndef LIBAVCODEC_VERSION_INT + #error Libavcodec include is not correct +--- a/plugins/video/H.263-1998/Makefile.in ++++ b/plugins/video/H.263-1998/Makefile.in +@@ -34,8 +34,8 @@ + $(COMMONDIR)/mpi.cxx \ + $(COMMONDIR)/dyna.cxx + +-CFLAGS += @LIBAVCODEC_CFLAGS@ -I$(COMMONDIR) +-LIBS += @DL_LIBS@ ++CFLAGS += @LIBAVCODEC_CFLAGS@ @LIBAVUTIL_CFLAGS@ -I$(COMMONDIR) ++LIBS += @DL_LIBS@ @LIBAVCODEC_LIBS@ @LIBAVUTIL_LIBS@ + + HAVE_LIBAVCODEC_RTP_MODE=@HAVE_LIBAVCODEC_RTP_MODE@ + ifeq ($(HAVE_LIBAVCODEC_RTP_MODE),yes) +--- a/plugins/video/H.264/Makefile.in ++++ b/plugins/video/H.264/Makefile.in +@@ -34,8 +34,8 @@ + $(SHAREDDIR)/x264wrap.cxx \ + $(COMMONDIR)/dyna.cxx \ + +-CFLAGS += @LIBAVCODEC_CFLAGS@ -I$(COMMONDIR) -DLIB_DIR='"$(libdir)"' -DVC_PLUGIN_DIR='"@VC_PLUGIN_DIR@"' +-LIBS += @DL_LIBS@ ++CFLAGS += @LIBAVCODEC_CFLAGS@ @LIBAVUTIL_CFLAGS@ -I$(COMMONDIR) -DLIB_DIR='"$(libdir)"' -DVC_PLUGIN_DIR='"@VC_PLUGIN_DIR@"' ++LIBS += @DL_LIBS@ @LIBAVCODEC_LIBS@ @LIBAVUTIL_LIBS@ + + IS_H264_LICENSED:=@IS_H264_LICENSED@ + ifeq ($(IS_H264_LICENSED),yes) +--- a/plugins/video/MPEG4-ffmpeg/Makefile.in ++++ b/plugins/video/MPEG4-ffmpeg/Makefile.in +@@ -30,8 +30,8 @@ + SRCDIR := . + SRCS := mpeg4.cxx $(COMMONDIR)/dyna.cxx + +-CFLAGS += @LIBAVCODEC_CFLAGS@ -I$(COMMONDIR) +-LIBS += @DL_LIBS@ ++CFLAGS += @LIBAVCODEC_CFLAGS@ @LIBAVUTIL_CFLAGS@ -I$(COMMONDIR) ++LIBS += @DL_LIBS@ @LIBAVCODEC_LIBS@ @LIBAVUTIL_LIBS@ + + # Add LIBAVCODEC_SOURCE_DIR to the include path so we can #include + # Also add libavutil, so ffmpeg headers can #include "log.h". diff --git a/pkgs/development/libraries/openal-soft/default.nix b/pkgs/development/libraries/openal-soft/default.nix index b024b518b6903fcc9a43d6161b90de8d69e748ee..48f5bfc71e527439ad81531cc874df557c006229 100644 --- a/pkgs/development/libraries/openal-soft/default.nix +++ b/pkgs/development/libraries/openal-soft/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { meta = { description = "OpenAL alternative"; homepage = http://kcat.strangesoft.net/openal.html; - license = "GPL2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/development/libraries/openal/default.nix b/pkgs/development/libraries/openal/default.nix index 75d6033e1cc5fb652278129dec9db23129acca6d..b5e390eafa85d3ed3a0bea18d19d6a2ea1cb96aa 100644 --- a/pkgs/development/libraries/openal/default.nix +++ b/pkgs/development/libraries/openal/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { ''; homepage = http://www.openal.org/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/development/libraries/opencv/default.nix b/pkgs/development/libraries/opencv/default.nix index ea858417b2f810f90ceaa215053a6e5bd4600c94..7dafcfce9481c469f553fb06772980bfff90642b 100644 --- a/pkgs/development/libraries/opencv/default.nix +++ b/pkgs/development/libraries/opencv/default.nix @@ -1,5 +1,6 @@ -{ stdenv, fetchurl, cmake, gtk, libjpeg, libpng, libtiff, jasper, ffmpeg -, pkgconfig, gstreamer, xineLib, glib, python27, python27Packages }: +{ lib, stdenv, fetchurl, cmake, gtk, libjpeg, libpng, libtiff, jasper, ffmpeg +, pkgconfig, gstreamer, xineLib, glib, python27, python27Packages +, enableBloat ? false }: let v = "2.4.7"; in @@ -11,8 +12,9 @@ stdenv.mkDerivation rec { sha256 = "0hravl3yhyv4r4n7vb055d4qnp893q2hc0fcmmncfh7sbdrnr3f4"; }; - buildInputs = [ gtk glib libjpeg libpng libtiff jasper ffmpeg xineLib gstreamer - python27 python27Packages.numpy ]; + buildInputs = + [ libjpeg libpng libtiff ] + ++ lib.optionals enableBloat [ gtk glib jasper ffmpeg xineLib gstreamer python27 python27Packages.numpy ]; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 93f7cbe1a1f4869225cccb913e196201d5767b28..8c88df984f0591a789c587771fd27380c1d24078 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -2,7 +2,7 @@ , withCryptodev ? false, cryptodevHeaders }: let - name = "openssl-1.0.1h"; + name = "openssl-1.0.1i"; opensslCrossSystem = stdenv.lib.attrByPath [ "openssl" "system" ] (throw "openssl needs its platform name cross building" null) @@ -43,7 +43,7 @@ stdenv.mkDerivation { "http://www.openssl.org/source/${name}.tar.gz" "http://openssl.linux-mirror.org/source/${name}.tar.gz" ]; - sha256 = "14yhsgag5as7nhxnw7f0vklwjwa3pmn1i15nmp3f4qxa6sc8l74x"; + sha256 = "1izwv1wzqdw8aqnvb70jcqpqp0rvkcm22w5c1dm9l1kpr939y5rw"; }; patches = patchesCross false; @@ -65,7 +65,7 @@ stdenv.mkDerivation { makeFlags = "MANDIR=$(out)/share/man"; # Parallel building is broken in OpenSSL. - #enableParallelBuilding = true; + enableParallelBuilding = false; postInstall = '' diff --git a/pkgs/development/libraries/osip/3.nix b/pkgs/development/libraries/osip/3.nix index 2c1b148251c6e833b53845e1324940de854ea4d7..b485fa3e947bd306dc74160a2e1d4ec197dae49e 100644 --- a/pkgs/development/libraries/osip/3.nix +++ b/pkgs/development/libraries/osip/3.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { name = "libosip2-${version}"; meta = { - license = "LGPLv2.1+"; + license = stdenv.lib.licenses.lgpl21Plus; homepage = http://www.gnu.org/software/osip/; description = "The GNU oSIP library, an implementation of the Session Initiation Protocol (SIP)"; maintainers = with stdenv.lib.maintainers; [ raskin ]; diff --git a/pkgs/development/libraries/osip/default.nix b/pkgs/development/libraries/osip/default.nix index 3ec3dac221f2edc8cc516942e14e621ae9550ec2..cfa838f5a37011328564f4760bc7e467de5bd6f7 100644 --- a/pkgs/development/libraries/osip/default.nix +++ b/pkgs/development/libraries/osip/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { name = "libosip2-${version}"; meta = { - license = "LGPLv2.1+"; + license = stdenv.lib.licenses.lgpl21Plus; homepage = http://www.gnu.org/software/osip/; description = "The GNU oSIP library, an implementation of the Session Initiation Protocol (SIP)"; maintainers = with stdenv.lib.maintainers; [ raskin ]; diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index 1c62a64d006da25dd783db0e1d7b21008e9f4546..40b02c2afbb21988bc81f20e7a7edc5a87a0108d 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.pango.org/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = with stdenv.lib.maintainers; [ raskin urkud ]; hydraPlatforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; diff --git a/pkgs/development/libraries/pangox-compat/default.nix b/pkgs/development/libraries/pangox-compat/default.nix index 8518083b4d3592e6e8c0556a45d5ec79719d83b3..6d79587abcb55d2313b98ba3389420ac8756c3ee 100644 --- a/pkgs/development/libraries/pangox-compat/default.nix +++ b/pkgs/development/libraries/pangox-compat/default.nix @@ -14,6 +14,6 @@ stdenv.mkDerivation rec { description = "A compatibility library for pango>1.30.*"; homepage = http://www.pango.org/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; }; } diff --git a/pkgs/development/libraries/pcl/default.nix b/pkgs/development/libraries/pcl/default.nix index 1a3484c2ee5e19f9464f88a8130ced960babb290..b9943b44331865282cd7ef6211a284ec9f3822f9 100644 --- a/pkgs/development/libraries/pcl/default.nix +++ b/pkgs/development/libraries/pcl/default.nix @@ -18,5 +18,6 @@ stdenv.mkDerivation { license = "BSD"; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; + broken = true; }; } diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix index 7138c44da643afff7c5b54f7c45058bdacfd90c2..4cf6bd44dd3b80b62fcea4b400ffe171476e7f0f 100644 --- a/pkgs/development/libraries/pcre/default.nix +++ b/pkgs/development/libraries/pcre/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.pcre.org/"; description = "A library for Perl Compatible Regular Expressions"; - license = "BSD-3"; + license = stdenv.lib.licenses.bsd3; longDescription = '' The PCRE library is a set of functions that implement regular diff --git a/pkgs/development/libraries/phonon/default.nix b/pkgs/development/libraries/phonon/default.nix index 5948fd0ef2b73b930ceb1e2f1ab55b55531d811b..b29deae9260cb02a8a29c70e43135dcc6d97a9ef 100644 --- a/pkgs/development/libraries/phonon/default.nix +++ b/pkgs/development/libraries/phonon/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://phonon.kde.org/; description = "Multimedia API for Qt"; - license = "LGPLv2"; + license = stdenv.lib.licenses.lgpl2; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/pixman/default.nix b/pkgs/development/libraries/pixman/default.nix index cb76a1b615fe1f8d14fc8b8ff0a5a9cdaa272181..d93341b81ff6fc1695d2726f81969c3c34517a9c 100644 --- a/pkgs/development/libraries/pixman/default.nix +++ b/pkgs/development/libraries/pixman/default.nix @@ -1,22 +1,22 @@ -{ fetchurl, stdenv, pkgconfig, perl, withPNG ? true, libpng, glib /*just passthru*/ }: +{ fetchurl, stdenv, pkgconfig, perl, libpng, glib /*just passthru*/ }: stdenv.mkDerivation rec { - name = "pixman-0.32.4"; + name = "pixman-0.32.6"; src = fetchurl { url = "http://cairographics.org/releases/${name}.tar.gz"; - sha256 = "113ycngcssbrps217dyajq96hm9xghsfch82h14yffla1r1fviw0"; + sha256 = "0129g4zdrw5hif5783li7rzcr4vpbc2cfia91azxmsk0h0xx3zix"; }; nativeBuildInputs = [ pkgconfig perl ]; - buildInputs = stdenv.lib.optional withPNG [ libpng ]; # NOT in closure anyway + buildInputs = [ libpng ]; # NOT in closure anyway postInstall = glib.flattenInclude; meta = { homepage = http://pixman.org; description = "A low-level library for pixel manipulation"; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/development/libraries/plib/default.nix b/pkgs/development/libraries/plib/default.nix index 5e15a63735eea1330262a543c2471a4b5dae1f26..35262f797e973d578c01592e88c02c220fadcde8 100644 --- a/pkgs/development/libraries/plib/default.nix +++ b/pkgs/development/libraries/plib/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { GLUT, or FLTK instead of PLIB's 'PW' windowing library, you can. ''; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; homepage = http://plib.sourceforge.net/; }; diff --git a/pkgs/development/libraries/podofo/default.nix b/pkgs/development/libraries/podofo/default.nix index d6b604367fb4f62bd4742213ae176587551c64a7..b1464817a7014681ce83c0fa045cb26b6230aa31 100644 --- a/pkgs/development/libraries/podofo/default.nix +++ b/pkgs/development/libraries/podofo/default.nix @@ -1,12 +1,14 @@ -{stdenv, fetchurl, cmake, zlib, freetype, libjpeg, libtiff, fontconfig, -openssl, libpng, lua5}: +{ stdenv, fetchurl, cmake, zlib, freetype, libjpeg, libtiff, fontconfig +, openssl, libpng, lua5 }: stdenv.mkDerivation rec { name = "podofo-0.9.2"; + src = fetchurl { url = "mirror://sourceforge/podofo/${name}.tar.gz"; sha256 = "1wx3s0718rmhdzdwyi8hgpf2s92sk3hijy8f4glrmnjpiihr2la6"; }; + propagatedBuildInputs = [ zlib freetype libjpeg libtiff fontconfig openssl libpng ]; nativeBuildInputs = [ cmake ]; buildInputs = [ lua5 stdenv.gcc.libc ]; @@ -17,6 +19,15 @@ stdenv.mkDerivation rec { lua5.crossDrv stdenv.gccCross.libc ]; }; + # fix finding freetype-2.5 + preConfigure = '' + substituteInPlace ./CMakeLists.txt \ + --replace FREETYPE_INCLUDE_DIR FREETYPE_INCLUDE_DIRS \ + --replace 'FIND_PACKAGE(FREETYPE' 'FIND_PACKAGE(Freetype' + + rm ./cmake/modules/Find{FREETYPE,ZLIB,PkgConfig}.cmake + ''; + cmakeFlags = "-DPODOFO_BUILD_SHARED=ON -DPODOFO_BUILD_STATIC=OFF"; meta = { diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index b9412b37cbad0cd9a6469cfa88236a1b214ad3de..083c9bae6b5b8085fce28d588b492cac083db2c3 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -4,14 +4,14 @@ }: let - version = "0.24.5"; # even major numbers are stable - sha256 = "114zfm4771iq25wa4bsg4nc2gnr6waaj8936wd23r4hc2084jrd2"; + version = "0.26.3"; # even major numbers are stable + sha256 = "1ca2lrwvhxzq0g4blbvq099vyydfjyz839jki301p1jgazrimjw8"; qtcairo_patches = let qtcairo = fetchgit { # the version for poppler-0.24 url = "git://github.com/giddie/poppler-qt4-cairo-backend.git"; - rev = "c4578cde09834e0d70873f63b1c2a410f66bb4f9"; - sha256 = "07bs2phmp7f4mqrwqz2bgyw2gw7s00mwsm548bsikyz1cbj7fl93"; + rev = "7b9e1ea763b579e635ee7614b10970b9635841cf"; + sha256 = "0cdq0qw1sm6mxnrhmah4lfsd9wjlcdx86iyikwmjpwdmrkjk85r2"; }; in [ "${qtcairo}/0001-Cairo-backend-added-to-Qt4-wrapper.patch" "${qtcairo}/0002-Setting-default-Qt4-backend-to-Cairo.patch" @@ -49,7 +49,7 @@ let Poppler is a PDF rendering library based on the xpdf-3.0 code base. ''; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.all; }; } merge ]); # poppler_drv diff --git a/pkgs/development/libraries/portaudio/default.nix b/pkgs/development/libraries/portaudio/default.nix index f405e30433fbe4e7fde89baa46c99803675a5a91..46d5128140151816f2972fe4724a614965d1a6da 100644 --- a/pkgs/development/libraries/portaudio/default.nix +++ b/pkgs/development/libraries/portaudio/default.nix @@ -33,6 +33,9 @@ stdenv.mkDerivation rec { cp -r lib "$out" '' else '' make install + + # fixup .pc file to find alsa library + sed -i "s|-lasound|-L${alsaLib}/lib -lasound|" "$out/lib/pkgconfig/"*.pc ''; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/postgis/default.nix b/pkgs/development/libraries/postgis/default.nix index b4c8a7f17890e996135ee2a4b63161c42c8fccda..acf760f4f7994cb6476cc5f97a1d1e07ef173dfe 100644 --- a/pkgs/development/libraries/postgis/default.nix +++ b/pkgs/development/libraries/postgis/default.nix @@ -107,7 +107,7 @@ let meta = { description = "Geographic Objects for PostgreSQL"; homepage = "http://postgis.refractions.net"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [stdenv.lib.maintainers.marcweber]; platforms = stdenv.lib.platforms.linux; }; @@ -148,4 +148,3 @@ in rec { }); } - diff --git a/pkgs/development/libraries/ppl/default.nix b/pkgs/development/libraries/ppl/default.nix index e3b1444b8cb3d557d08c1e2f00c6fad63dbf2d0e..f93eee674ffcf7cf38b5d8721a7ae9073bc82741 100644 --- a/pkgs/development/libraries/ppl/default.nix +++ b/pkgs/development/libraries/ppl/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { homepage = http://bugseng.com/products/ppl/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ ]; }; diff --git a/pkgs/development/libraries/proj/default.nix b/pkgs/development/libraries/proj/default.nix index 6e3cc7cac55c9d43443adba767416a0016b6f7bc..17c05ada7a8476d3ca0569820a87ad1032adc4ec 100644 --- a/pkgs/development/libraries/proj/default.nix +++ b/pkgs/development/libraries/proj/default.nix @@ -11,6 +11,6 @@ stdenv.mkDerivation { meta = { description = "Cartographic Projections Library"; homepage = http://proj.maptools.org; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/development/libraries/ptlib/bison.patch b/pkgs/development/libraries/ptlib/bison.patch new file mode 100644 index 0000000000000000000000000000000000000000..58593470c2137ad427426718675a148dde5d918e --- /dev/null +++ b/pkgs/development/libraries/ptlib/bison.patch @@ -0,0 +1,2887 @@ +--- a/src/ptlib/common/getdate.tab.c (revision 0) ++++ b/src/ptlib/common/getdate.tab.c (revision 31087) +@@ -0,0 +1,2884 @@ ++/* A Bison parser, made by GNU Bison 2.7.12-4996. */ ++ ++/* Bison implementation for Yacc-like parsers in C ++ ++ Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc. ++ ++ This program is free software: you can redistribute it and/or modify ++ it under the terms of the GNU General Public License as published by ++ the Free Software Foundation, either version 3 of the License, or ++ (at your option) any later version. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program. If not, see . */ ++ ++/* As a special exception, you may create a larger work that contains ++ part or all of the Bison parser skeleton and distribute that work ++ under terms of your choice, so long as that work isn't itself a ++ parser generator using the skeleton or a modified version thereof ++ as a parser skeleton. Alternatively, if you modify or redistribute ++ the parser skeleton itself, you may (at your option) remove this ++ special exception, which will cause the skeleton and the resulting ++ Bison output files to be licensed under the GNU General Public ++ License without this special exception. ++ ++ This special exception was added by the Free Software Foundation in ++ version 2.2 of Bison. */ ++ ++/* C LALR(1) parser skeleton written by Richard Stallman, by ++ simplifying the original so-called "semantic" parser. */ ++ ++/* All symbols defined below should begin with yy or YY, to avoid ++ infringing on user name space. This should be done even for local ++ variables, as they might otherwise be expanded by user macros. ++ There are some unavoidable exceptions within include files to ++ define necessary library symbols; they are noted "INFRINGES ON ++ USER NAME SPACE" below. */ ++ ++/* Identify Bison output. */ ++#define YYBISON 1 ++ ++/* Bison version. */ ++#define YYBISON_VERSION "2.7.12-4996" ++ ++/* Skeleton name. */ ++#define YYSKELETON_NAME "yacc.c" ++ ++/* Pure parsers. */ ++#define YYPURE 1 ++ ++/* Push parsers. */ ++#define YYPUSH 0 ++ ++/* Pull parsers. */ ++#define YYPULL 1 ++ ++ ++ ++ ++/* Copy the first part of user declarations. */ ++/* Line 371 of yacc.c */ ++#line 1 "ptlib/common/getdate.y" ++ ++/* ++** Originally written by Steven M. Bellovin while ++** at the University of North Carolina at Chapel Hill. Later tweaked by ++** a couple of people on Usenet. Completely overhauled by Rich $alz ++** and Jim Berets in August, 1990; ++** ++** Major hack to coerce it into use with the Equivalence Portable ++** Windows Library. ++** ++** This grammar has 10 shift/reduce conflicts. ++** ++** This code is in the public domain and has no copyright. ++*/ ++/* SUPPRESS 287 on yaccpar_sccsid *//* Unused static variable */ ++/* SUPPRESS 288 on yyerrlab *//* Label unused */ ++ ++ ++#include ++#include ++#include ++#include ++ ++#ifndef EOF ++#include ++#endif ++ ++ ++#ifdef _WIN32 ++#ifdef _MSC_VER ++#pragma warning(disable:4131 4701 4996) ++#endif ++#define STDAPICALLTYPE __stdcall ++#define MSDOS ++#else ++#define STDAPICALLTYPE ++#endif ++ ++ ++extern int STDAPICALLTYPE PTimeGetChar(void * stream); ++extern void STDAPICALLTYPE PTimeUngetChar(void * stream, int c); ++int STDAPICALLTYPE PTimeGetDateOrder(); ++int STDAPICALLTYPE PTimeIsMonthName(const char *, int, int); ++int STDAPICALLTYPE PTimeIsDayName(const char *, int, int); ++ ++ ++#define EPOCH 1970 ++#define HOUR(x) ((time_t)(x) * 60) ++#define SECSPERDAY (24L * 60L * 60L) ++ ++ ++/* ++** An entry in the lexical lookup table. ++*/ ++typedef struct _TABLE { ++ char *name; ++ int type; ++ time_t value; ++} TABLE; ++ ++ ++/* ++** Daylight-savings mode: on, off, or not yet known. ++*/ ++typedef enum _DSTMODE { ++ DSTon, DSToff, DSTmaybe ++} DSTMODE; ++ ++/* ++** Meridian: am, pm, or 24-hour style. ++*/ ++typedef enum _MERIDIAN { ++ MERam, MERpm, MER24 ++} MERIDIAN; ++ ++ ++/* ++** Global variables. We could get rid of most of these by using a good ++** union as the yacc stack. (This routine was originally written before ++** yacc had the %union construct.) Maybe someday; right now we only use ++** the %union very rarely. ++*/ ++struct Variables { ++ void *yyInput; ++ DSTMODE yyDSTmode; ++ time_t yyDayOrdinal; ++ time_t yyDayNumber; ++ int yyHaveDate; ++ int yyHaveDay; ++ int yyHaveRel; ++ int yyHaveTime; ++ int yyHaveZone; ++ time_t yyTimezone; ++ time_t yyDay; ++ time_t yyHour; ++ time_t yyMinutes; ++ time_t yyMonth; ++ time_t yySeconds; ++ time_t yyYear; ++ MERIDIAN yyMeridian; ++ time_t yyRelMonth; ++ time_t yyRelSeconds; ++}; ++ ++#define VARIABLE ((struct Variables*)parseParam) ++ ++ ++#define YYPURE 1 ++#define YYLEX_PARAM VARIABLE ++#define YYPARSE_PARAM parseParam ++ ++#define yyparse PTime_yyparse ++#define yylex PTime_yylex ++#define yyerror PTime_yyerror ++ ++#define GCC_VERSION (__GNUC__ * 10000 \ ++ + __GNUC_MINOR__ * 100 \ ++ + __GNUC_PATCHLEVEL__) ++ ++static int yyparse(void *); ++static int yylex(); ++ ++#ifdef __GNUC__ ++static int yyerror(char const *msg); ++#else ++static void yyerror(char const *msg); ++#endif ++ ++ ++static void SetPossibleDate(struct Variables*, time_t, time_t, time_t); ++ ++ ++ ++/* Line 371 of yacc.c */ ++#line 202 "ptlib/common/getdate.tab.c" ++ ++# ifndef YY_NULL ++# if defined __cplusplus && 201103L <= __cplusplus ++# define YY_NULL nullptr ++# else ++# define YY_NULL 0 ++# endif ++# endif ++ ++/* Enabling verbose error messages. */ ++#ifdef YYERROR_VERBOSE ++# undef YYERROR_VERBOSE ++# define YYERROR_VERBOSE 1 ++#else ++# define YYERROR_VERBOSE 0 ++#endif ++ ++ ++/* Enabling traces. */ ++#ifndef YYDEBUG ++# define YYDEBUG 0 ++#endif ++#if YYDEBUG ++extern int yydebug; ++#endif ++ ++/* Tokens. */ ++#ifndef YYTOKENTYPE ++# define YYTOKENTYPE ++ /* Put the tokens into the symbol table, so that GDB and other debuggers ++ know about them. */ ++ enum yytokentype { ++ tAGO = 258, ++ tDAY = 259, ++ tDAYZONE = 260, ++ tID = 261, ++ tMERIDIAN = 262, ++ tMINUTE_UNIT = 263, ++ tMONTH = 264, ++ tMONTH_UNIT = 265, ++ tSNUMBER = 266, ++ tS4DIGITNUMBER = 267, ++ tUNUMBER = 268, ++ t4DIGITNUMBER = 269, ++ t6DIGITNUMBER = 270, ++ t8DIGITNUMBER = 271, ++ tSEC_UNIT = 272, ++ tZONE = 273, ++ tMILZONE = 274, ++ tRFC3339 = 275, ++ tDST = 276 ++ }; ++#endif ++ ++ ++#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED ++typedef union YYSTYPE ++{ ++/* Line 387 of yacc.c */ ++#line 137 "ptlib/common/getdate.y" ++ ++ time_t Number; ++ enum _MERIDIAN Meridian; ++ ++ ++/* Line 387 of yacc.c */ ++#line 269 "ptlib/common/getdate.tab.c" ++} YYSTYPE; ++# define YYSTYPE_IS_TRIVIAL 1 ++# define yystype YYSTYPE /* obsolescent; will be withdrawn */ ++# define YYSTYPE_IS_DECLARED 1 ++#endif ++ ++ ++#ifdef YYPARSE_PARAM ++#if defined __STDC__ || defined __cplusplus ++int yyparse (void *YYPARSE_PARAM); ++#else ++int yyparse (); ++#endif ++#else /* ! YYPARSE_PARAM */ ++#if defined __STDC__ || defined __cplusplus ++int yyparse (void); ++#else ++int yyparse (); ++#endif ++#endif /* ! YYPARSE_PARAM */ ++ ++ ++ ++/* Copy the second part of user declarations. */ ++ ++/* Line 390 of yacc.c */ ++#line 296 "ptlib/common/getdate.tab.c" ++ ++#ifdef short ++# undef short ++#endif ++ ++#ifdef YYTYPE_UINT8 ++typedef YYTYPE_UINT8 yytype_uint8; ++#else ++typedef unsigned char yytype_uint8; ++#endif ++ ++#ifdef YYTYPE_INT8 ++typedef YYTYPE_INT8 yytype_int8; ++#elif (defined __STDC__ || defined __C99__FUNC__ \ ++ || defined __cplusplus || defined _MSC_VER) ++typedef signed char yytype_int8; ++#else ++typedef short int yytype_int8; ++#endif ++ ++#ifdef YYTYPE_UINT16 ++typedef YYTYPE_UINT16 yytype_uint16; ++#else ++typedef unsigned short int yytype_uint16; ++#endif ++ ++#ifdef YYTYPE_INT16 ++typedef YYTYPE_INT16 yytype_int16; ++#else ++typedef short int yytype_int16; ++#endif ++ ++#ifndef YYSIZE_T ++# ifdef __SIZE_TYPE__ ++# define YYSIZE_T __SIZE_TYPE__ ++# elif defined size_t ++# define YYSIZE_T size_t ++# elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \ ++ || defined __cplusplus || defined _MSC_VER) ++# include /* INFRINGES ON USER NAME SPACE */ ++# define YYSIZE_T size_t ++# else ++# define YYSIZE_T unsigned int ++# endif ++#endif ++ ++#define YYSIZE_MAXIMUM ((YYSIZE_T) -1) ++ ++#ifndef YY_ ++# if defined YYENABLE_NLS && YYENABLE_NLS ++# if ENABLE_NLS ++# include /* INFRINGES ON USER NAME SPACE */ ++# define YY_(Msgid) dgettext ("bison-runtime", Msgid) ++# endif ++# endif ++# ifndef YY_ ++# define YY_(Msgid) Msgid ++# endif ++#endif ++ ++#ifndef __attribute__ ++/* This feature is available in gcc versions 2.5 and later. */ ++# if (! defined __GNUC__ || __GNUC__ < 2 \ ++ || (__GNUC__ == 2 && __GNUC_MINOR__ < 5)) ++# define __attribute__(Spec) /* empty */ ++# endif ++#endif ++ ++/* Suppress unused-variable warnings by "using" E. */ ++#if ! defined lint || defined __GNUC__ ++# define YYUSE(E) ((void) (E)) ++#else ++# define YYUSE(E) /* empty */ ++#endif ++ ++ ++/* Identity function, used to suppress warnings about constant conditions. */ ++#ifndef lint ++# define YYID(N) (N) ++#else ++#if (defined __STDC__ || defined __C99__FUNC__ \ ++ || defined __cplusplus || defined _MSC_VER) ++static int ++YYID (int yyi) ++#else ++static int ++YYID (yyi) ++ int yyi; ++#endif ++{ ++ return yyi; ++} ++#endif ++ ++#if ! defined yyoverflow || YYERROR_VERBOSE ++ ++/* The parser invokes alloca or malloc; define the necessary symbols. */ ++ ++# ifdef YYSTACK_USE_ALLOCA ++# if YYSTACK_USE_ALLOCA ++# ifdef __GNUC__ ++# define YYSTACK_ALLOC __builtin_alloca ++# elif defined __BUILTIN_VA_ARG_INCR ++# include /* INFRINGES ON USER NAME SPACE */ ++# elif defined _AIX ++# define YYSTACK_ALLOC __alloca ++# elif defined _MSC_VER ++# include /* INFRINGES ON USER NAME SPACE */ ++# define alloca _alloca ++# else ++# define YYSTACK_ALLOC alloca ++# if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \ ++ || defined __cplusplus || defined _MSC_VER) ++# include /* INFRINGES ON USER NAME SPACE */ ++ /* Use EXIT_SUCCESS as a witness for stdlib.h. */ ++# ifndef EXIT_SUCCESS ++# define EXIT_SUCCESS 0 ++# endif ++# endif ++# endif ++# endif ++# endif ++ ++# ifdef YYSTACK_ALLOC ++ /* Pacify GCC's `empty if-body' warning. */ ++# define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0)) ++# ifndef YYSTACK_ALLOC_MAXIMUM ++ /* The OS might guarantee only one guard page at the bottom of the stack, ++ and a page size can be as small as 4096 bytes. So we cannot safely ++ invoke alloca (N) if N exceeds 4096. Use a slightly smaller number ++ to allow for a few compiler-allocated temporary stack slots. */ ++# define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2006 */ ++# endif ++# else ++# define YYSTACK_ALLOC YYMALLOC ++# define YYSTACK_FREE YYFREE ++# ifndef YYSTACK_ALLOC_MAXIMUM ++# define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM ++# endif ++# if (defined __cplusplus && ! defined EXIT_SUCCESS \ ++ && ! ((defined YYMALLOC || defined malloc) \ ++ && (defined YYFREE || defined free))) ++# include /* INFRINGES ON USER NAME SPACE */ ++# ifndef EXIT_SUCCESS ++# define EXIT_SUCCESS 0 ++# endif ++# endif ++# ifndef YYMALLOC ++# define YYMALLOC malloc ++# if ! defined malloc && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \ ++ || defined __cplusplus || defined _MSC_VER) ++void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */ ++# endif ++# endif ++# ifndef YYFREE ++# define YYFREE free ++# if ! defined free && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \ ++ || defined __cplusplus || defined _MSC_VER) ++void free (void *); /* INFRINGES ON USER NAME SPACE */ ++# endif ++# endif ++# endif ++#endif /* ! defined yyoverflow || YYERROR_VERBOSE */ ++ ++ ++#if (! defined yyoverflow \ ++ && (! defined __cplusplus \ ++ || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL))) ++ ++/* A type that is properly aligned for any stack member. */ ++union yyalloc ++{ ++ yytype_int16 yyss_alloc; ++ YYSTYPE yyvs_alloc; ++}; ++ ++/* The size of the maximum gap between one aligned stack and the next. */ ++# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1) ++ ++/* The size of an array large to enough to hold all stacks, each with ++ N elements. */ ++# define YYSTACK_BYTES(N) \ ++ ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \ ++ + YYSTACK_GAP_MAXIMUM) ++ ++# define YYCOPY_NEEDED 1 ++ ++/* Relocate STACK from its old location to the new one. The ++ local variables YYSIZE and YYSTACKSIZE give the old and new number of ++ elements in the stack, and YYPTR gives the new location of the ++ stack. Advance YYPTR to a properly aligned location for the next ++ stack. */ ++# define YYSTACK_RELOCATE(Stack_alloc, Stack) \ ++ do \ ++ { \ ++ YYSIZE_T yynewbytes; \ ++ YYCOPY (&yyptr->Stack_alloc, Stack, yysize); \ ++ Stack = &yyptr->Stack_alloc; \ ++ yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \ ++ yyptr += yynewbytes / sizeof (*yyptr); \ ++ } \ ++ while (YYID (0)) ++ ++#endif ++ ++#if defined YYCOPY_NEEDED && YYCOPY_NEEDED ++/* Copy COUNT objects from SRC to DST. The source and destination do ++ not overlap. */ ++# ifndef YYCOPY ++# if defined __GNUC__ && 1 < __GNUC__ ++# define YYCOPY(Dst, Src, Count) \ ++ __builtin_memcpy (Dst, Src, (Count) * sizeof (*(Src))) ++# else ++# define YYCOPY(Dst, Src, Count) \ ++ do \ ++ { \ ++ YYSIZE_T yyi; \ ++ for (yyi = 0; yyi < (Count); yyi++) \ ++ (Dst)[yyi] = (Src)[yyi]; \ ++ } \ ++ while (YYID (0)) ++# endif ++# endif ++#endif /* !YYCOPY_NEEDED */ ++ ++/* YYFINAL -- State number of the termination state. */ ++#define YYFINAL 2 ++/* YYLAST -- Last index in YYTABLE. */ ++#define YYLAST 105 ++ ++/* YYNTOKENS -- Number of terminals. */ ++#define YYNTOKENS 25 ++/* YYNNTS -- Number of nonterminals. */ ++#define YYNNTS 12 ++/* YYNRULES -- Number of rules. */ ++#define YYNRULES 51 ++/* YYNRULES -- Number of states. */ ++#define YYNSTATES 63 ++ ++/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ ++#define YYUNDEFTOK 2 ++#define YYMAXUTOK 276 ++ ++#define YYTRANSLATE(YYX) \ ++ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) ++ ++/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX. */ ++static const yytype_uint8 yytranslate[] = ++{ ++ 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, ++ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ++ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ++ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ++ 2, 2, 2, 2, 23, 2, 2, 24, 2, 2, ++ 2, 2, 2, 2, 2, 2, 2, 2, 22, 2, ++ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ++ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ++ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ++ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ++ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ++ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ++ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ++ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ++ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ++ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ++ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ++ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ++ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ++ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ++ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ++ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ++ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ++ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ++ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, ++ 2, 2, 2, 2, 2, 2, 1, 2, 3, 4, ++ 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, ++ 15, 16, 17, 18, 19, 20, 21 ++}; ++ ++#if YYDEBUG ++/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in ++ YYRHS. */ ++static const yytype_uint8 yyprhs[] = ++{ ++ 0, 0, 3, 4, 7, 9, 11, 13, 15, 17, ++ 19, 22, 25, 28, 33, 38, 45, 52, 54, 56, ++ 59, 61, 63, 66, 69, 73, 79, 84, 86, 90, ++ 93, 98, 101, 105, 108, 110, 113, 116, 118, 121, ++ 124, 126, 129, 132, 134, 136, 138, 140, 142, 144, ++ 146, 147 ++}; ++ ++/* YYRHS -- A `-1'-separated list of the rules' RHS. */ ++static const yytype_int8 yyrhs[] = ++{ ++ 26, 0, -1, -1, 26, 27, -1, 28, -1, 29, ++ -1, 31, -1, 30, -1, 32, -1, 35, -1, 13, ++ 7, -1, 14, 12, -1, 15, 12, -1, 34, 22, ++ 34, 36, -1, 34, 22, 34, 12, -1, 34, 22, ++ 34, 22, 34, 36, -1, 34, 22, 34, 22, 34, ++ 12, -1, 18, -1, 5, -1, 18, 21, -1, 19, ++ -1, 4, -1, 4, 23, -1, 34, 4, -1, 34, ++ 24, 34, -1, 34, 24, 34, 24, 34, -1, 34, ++ 11, 11, 20, -1, 16, -1, 34, 9, 11, -1, ++ 9, 34, -1, 9, 34, 23, 34, -1, 34, 9, ++ -1, 34, 9, 34, -1, 33, 3, -1, 33, -1, ++ 34, 8, -1, 11, 8, -1, 8, -1, 11, 17, ++ -1, 34, 17, -1, 17, -1, 11, 10, -1, 34, ++ 10, -1, 10, -1, 13, -1, 14, -1, 15, -1, ++ 13, -1, 14, -1, 15, -1, -1, 7, -1 ++}; ++ ++/* YYRLINE[YYN] -- source line where rule number YYN was defined. */ ++static const yytype_uint16 yyrline[] = ++{ ++ 0, 153, 153, 154, 157, 160, 163, 166, 169, 172, ++ 175, 181, 189, 197, 203, 210, 216, 226, 230, 235, ++ 239, 249, 253, 257, 263, 266, 269, 273, 278, 282, ++ 289, 294, 301, 306, 310, 313, 316, 319, 322, 325, ++ 328, 331, 334, 337, 342, 345, 348, 353, 379, 390, ++ 407, 410 ++}; ++#endif ++ ++#if YYDEBUG || YYERROR_VERBOSE || 0 ++/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM. ++ First, the terminals, then, starting at YYNTOKENS, nonterminals. */ ++static const char *const yytname[] = ++{ ++ "$end", "error", "$undefined", "tAGO", "tDAY", "tDAYZONE", "tID", ++ "tMERIDIAN", "tMINUTE_UNIT", "tMONTH", "tMONTH_UNIT", "tSNUMBER", ++ "tS4DIGITNUMBER", "tUNUMBER", "t4DIGITNUMBER", "t6DIGITNUMBER", ++ "t8DIGITNUMBER", "tSEC_UNIT", "tZONE", "tMILZONE", "tRFC3339", "tDST", ++ "':'", "','", "'/'", "$accept", "spec", "item", "time", "zone", "day", ++ "date", "rel", "relunit", "unumber", "number", "o_merid", YY_NULL ++}; ++#endif ++ ++# ifdef YYPRINT ++/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to ++ token YYLEX-NUM. */ ++static const yytype_uint16 yytoknum[] = ++{ ++ 0, 256, 257, 258, 259, 260, 261, 262, 263, 264, ++ 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, ++ 275, 276, 58, 44, 47 ++}; ++# endif ++ ++/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ ++static const yytype_uint8 yyr1[] = ++{ ++ 0, 25, 26, 26, 27, 27, 27, 27, 27, 27, ++ 28, 28, 28, 28, 28, 28, 28, 29, 29, 29, ++ 29, 30, 30, 30, 31, 31, 31, 31, 31, 31, ++ 31, 31, 31, 32, 32, 33, 33, 33, 33, 33, ++ 33, 33, 33, 33, 34, 34, 34, 35, 35, 35, ++ 36, 36 ++}; ++ ++/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ ++static const yytype_uint8 yyr2[] = ++{ ++ 0, 2, 0, 2, 1, 1, 1, 1, 1, 1, ++ 2, 2, 2, 4, 4, 6, 6, 1, 1, 2, ++ 1, 1, 2, 2, 3, 5, 4, 1, 3, 2, ++ 4, 2, 3, 2, 1, 2, 2, 1, 2, 2, ++ 1, 2, 2, 1, 1, 1, 1, 1, 1, 1, ++ 0, 1 ++}; ++ ++/* YYDEFACT[STATE-NAME] -- Default reduction number in state STATE-NUM. ++ Performed when YYTABLE doesn't specify something else to do. Zero ++ means the default is an error. */ ++static const yytype_uint8 yydefact[] = ++{ ++ 2, 0, 1, 21, 18, 37, 0, 43, 0, 44, ++ 45, 46, 27, 40, 17, 20, 3, 4, 5, 7, ++ 6, 8, 34, 0, 9, 22, 44, 45, 46, 29, ++ 36, 41, 38, 10, 11, 12, 19, 33, 23, 35, ++ 31, 42, 0, 39, 0, 0, 0, 28, 32, 0, ++ 50, 24, 30, 26, 51, 14, 0, 13, 0, 50, ++ 25, 16, 15 ++}; ++ ++/* YYDEFGOTO[NTERM-NUM]. */ ++static const yytype_int8 yydefgoto[] = ++{ ++ -1, 1, 16, 17, 18, 19, 20, 21, 22, 23, ++ 24, 57 ++}; ++ ++/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing ++ STATE-NUM. */ ++#define YYPACT_NINF -27 ++static const yytype_int8 yypact[] = ++{ ++ -27, 49, -27, -10, -27, -27, -11, -27, 1, 10, ++ 69, 86, -27, -27, -9, -27, -27, -27, -27, -27, ++ -27, -27, 13, -3, -27, -27, -27, -27, -27, 8, ++ -27, -27, -27, -27, -27, -27, -27, -27, -27, -27, ++ 30, -27, 9, -27, -11, -11, -11, -27, -27, 12, ++ 15, 18, -27, -27, -27, -27, -11, -27, -11, 23, ++ -27, -27, -27 ++}; ++ ++/* YYPGOTO[NTERM-NUM]. */ ++static const yytype_int8 yypgoto[] = ++{ ++ -27, -27, -27, -27, -27, -27, -27, -27, -27, -6, ++ -27, -26 ++}; ++ ++/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If ++ positive, shift that token. If negative, reduce the rule which ++ number is the opposite. If YYTABLE_NINF, syntax error. */ ++#define YYTABLE_NINF -50 ++static const yytype_int8 yytable[] = ++{ ++ 29, 38, 26, 27, 28, 39, 40, 41, 42, 30, ++ -47, 31, 36, 25, 43, -47, 37, 33, 32, 44, ++ 49, 45, 54, -47, -47, -47, -47, 55, -47, -47, ++ 54, 46, 53, 62, 48, 61, 0, 56, 50, 51, ++ 52, 47, 58, 26, 27, 28, 0, 0, 0, 2, ++ 59, 0, 60, 3, 4, 0, 0, 5, 6, 7, ++ 8, 0, 9, 10, 11, 12, 13, 14, 15, -48, ++ 0, 0, 0, 0, -48, 0, 0, 0, 0, 0, ++ 0, 34, -48, -48, -48, -48, -49, -48, -48, 0, ++ 0, -49, 0, 0, 0, 0, 0, 0, 35, -49, ++ -49, -49, -49, 0, -49, -49 ++}; ++ ++#define yypact_value_is_default(Yystate) \ ++ (!!((Yystate) == (-27))) ++ ++#define yytable_value_is_error(Yytable_value) \ ++ YYID (0) ++ ++static const yytype_int8 yycheck[] = ++{ ++ 6, 4, 13, 14, 15, 8, 9, 10, 11, 8, ++ 0, 10, 21, 23, 17, 5, 3, 7, 17, 22, ++ 11, 24, 7, 13, 14, 15, 16, 12, 18, 19, ++ 7, 23, 20, 59, 40, 12, -1, 22, 44, 45, ++ 46, 11, 24, 13, 14, 15, -1, -1, -1, 0, ++ 56, -1, 58, 4, 5, -1, -1, 8, 9, 10, ++ 11, -1, 13, 14, 15, 16, 17, 18, 19, 0, ++ -1, -1, -1, -1, 5, -1, -1, -1, -1, -1, ++ -1, 12, 13, 14, 15, 16, 0, 18, 19, -1, ++ -1, 5, -1, -1, -1, -1, -1, -1, 12, 13, ++ 14, 15, 16, -1, 18, 19 ++}; ++ ++/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing ++ symbol of state STATE-NUM. */ ++static const yytype_uint8 yystos[] = ++{ ++ 0, 26, 0, 4, 5, 8, 9, 10, 11, 13, ++ 14, 15, 16, 17, 18, 19, 27, 28, 29, 30, ++ 31, 32, 33, 34, 35, 23, 13, 14, 15, 34, ++ 8, 10, 17, 7, 12, 12, 21, 3, 4, 8, ++ 9, 10, 11, 17, 22, 24, 23, 11, 34, 11, ++ 34, 34, 34, 20, 7, 12, 22, 36, 24, 34, ++ 34, 12, 36 ++}; ++ ++#define yyerrok (yyerrstatus = 0) ++#define yyclearin (yychar = YYEMPTY) ++#define YYEMPTY (-2) ++#define YYEOF 0 ++ ++#define YYACCEPT goto yyacceptlab ++#define YYABORT goto yyabortlab ++#define YYERROR goto yyerrorlab ++ ++ ++/* Like YYERROR except do call yyerror. This remains here temporarily ++ to ease the transition to the new meaning of YYERROR, for GCC. ++ Once GCC version 2 has supplanted version 1, this can go. However, ++ YYFAIL appears to be in use. Nevertheless, it is formally deprecated ++ in Bison 2.4.2's NEWS entry, where a plan to phase it out is ++ discussed. */ ++ ++#define YYFAIL goto yyerrlab ++#if defined YYFAIL ++ /* This is here to suppress warnings from the GCC cpp's ++ -Wunused-macros. Normally we don't worry about that warning, but ++ some users do, and we want to make it easy for users to remove ++ YYFAIL uses, which will produce warnings from Bison 2.5. */ ++#endif ++ ++#define YYRECOVERING() (!!yyerrstatus) ++ ++#define YYBACKUP(Token, Value) \ ++do \ ++ if (yychar == YYEMPTY) \ ++ { \ ++ yychar = (Token); \ ++ yylval = (Value); \ ++ YYPOPSTACK (yylen); \ ++ yystate = *yyssp; \ ++ goto yybackup; \ ++ } \ ++ else \ ++ { \ ++ yyerror (YY_("syntax error: cannot back up")); \ ++ YYERROR; \ ++ } \ ++while (YYID (0)) ++ ++/* Error token number */ ++#define YYTERROR 1 ++#define YYERRCODE 256 ++ ++ ++/* This macro is provided for backward compatibility. */ ++#ifndef YY_LOCATION_PRINT ++# define YY_LOCATION_PRINT(File, Loc) ((void) 0) ++#endif ++ ++ ++/* YYLEX -- calling `yylex' with the right arguments. */ ++#ifdef YYLEX_PARAM ++# define YYLEX yylex (&yylval, YYLEX_PARAM) ++#else ++# define YYLEX yylex (&yylval) ++#endif ++ ++/* Enable debugging if requested. */ ++#if YYDEBUG ++ ++# ifndef YYFPRINTF ++# include /* INFRINGES ON USER NAME SPACE */ ++# define YYFPRINTF fprintf ++# endif ++ ++# define YYDPRINTF(Args) \ ++do { \ ++ if (yydebug) \ ++ YYFPRINTF Args; \ ++} while (YYID (0)) ++ ++# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \ ++do { \ ++ if (yydebug) \ ++ { \ ++ YYFPRINTF (stderr, "%s ", Title); \ ++ yy_symbol_print (stderr, \ ++ Type, Value); \ ++ YYFPRINTF (stderr, "\n"); \ ++ } \ ++} while (YYID (0)) ++ ++ ++/*--------------------------------. ++| Print this symbol on YYOUTPUT. | ++`--------------------------------*/ ++ ++/*ARGSUSED*/ ++#if (defined __STDC__ || defined __C99__FUNC__ \ ++ || defined __cplusplus || defined _MSC_VER) ++static void ++yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep) ++#else ++static void ++yy_symbol_value_print (yyoutput, yytype, yyvaluep) ++ FILE *yyoutput; ++ int yytype; ++ YYSTYPE const * const yyvaluep; ++#endif ++{ ++ FILE *yyo = yyoutput; ++ YYUSE (yyo); ++ if (!yyvaluep) ++ return; ++# ifdef YYPRINT ++ if (yytype < YYNTOKENS) ++ YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep); ++# else ++ YYUSE (yyoutput); ++# endif ++ YYUSE (yytype); ++} ++ ++ ++/*--------------------------------. ++| Print this symbol on YYOUTPUT. | ++`--------------------------------*/ ++ ++#if (defined __STDC__ || defined __C99__FUNC__ \ ++ || defined __cplusplus || defined _MSC_VER) ++static void ++yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep) ++#else ++static void ++yy_symbol_print (yyoutput, yytype, yyvaluep) ++ FILE *yyoutput; ++ int yytype; ++ YYSTYPE const * const yyvaluep; ++#endif ++{ ++ if (yytype < YYNTOKENS) ++ YYFPRINTF (yyoutput, "token %s (", yytname[yytype]); ++ else ++ YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]); ++ ++ yy_symbol_value_print (yyoutput, yytype, yyvaluep); ++ YYFPRINTF (yyoutput, ")"); ++} ++ ++/*------------------------------------------------------------------. ++| yy_stack_print -- Print the state stack from its BOTTOM up to its | ++| TOP (included). | ++`------------------------------------------------------------------*/ ++ ++#if (defined __STDC__ || defined __C99__FUNC__ \ ++ || defined __cplusplus || defined _MSC_VER) ++static void ++yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop) ++#else ++static void ++yy_stack_print (yybottom, yytop) ++ yytype_int16 *yybottom; ++ yytype_int16 *yytop; ++#endif ++{ ++ YYFPRINTF (stderr, "Stack now"); ++ for (; yybottom <= yytop; yybottom++) ++ { ++ int yybot = *yybottom; ++ YYFPRINTF (stderr, " %d", yybot); ++ } ++ YYFPRINTF (stderr, "\n"); ++} ++ ++# define YY_STACK_PRINT(Bottom, Top) \ ++do { \ ++ if (yydebug) \ ++ yy_stack_print ((Bottom), (Top)); \ ++} while (YYID (0)) ++ ++ ++/*------------------------------------------------. ++| Report that the YYRULE is going to be reduced. | ++`------------------------------------------------*/ ++ ++#if (defined __STDC__ || defined __C99__FUNC__ \ ++ || defined __cplusplus || defined _MSC_VER) ++static void ++yy_reduce_print (YYSTYPE *yyvsp, int yyrule) ++#else ++static void ++yy_reduce_print (yyvsp, yyrule) ++ YYSTYPE *yyvsp; ++ int yyrule; ++#endif ++{ ++ int yynrhs = yyr2[yyrule]; ++ int yyi; ++ unsigned long int yylno = yyrline[yyrule]; ++ YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n", ++ yyrule - 1, yylno); ++ /* The symbols being reduced. */ ++ for (yyi = 0; yyi < yynrhs; yyi++) ++ { ++ YYFPRINTF (stderr, " $%d = ", yyi + 1); ++ yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi], ++ &(yyvsp[(yyi + 1) - (yynrhs)]) ++ ); ++ YYFPRINTF (stderr, "\n"); ++ } ++} ++ ++# define YY_REDUCE_PRINT(Rule) \ ++do { \ ++ if (yydebug) \ ++ yy_reduce_print (yyvsp, Rule); \ ++} while (YYID (0)) ++ ++/* Nonzero means print parse trace. It is left uninitialized so that ++ multiple parsers can coexist. */ ++int yydebug; ++#else /* !YYDEBUG */ ++# define YYDPRINTF(Args) ++# define YY_SYMBOL_PRINT(Title, Type, Value, Location) ++# define YY_STACK_PRINT(Bottom, Top) ++# define YY_REDUCE_PRINT(Rule) ++#endif /* !YYDEBUG */ ++ ++ ++/* YYINITDEPTH -- initial size of the parser's stacks. */ ++#ifndef YYINITDEPTH ++# define YYINITDEPTH 200 ++#endif ++ ++/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only ++ if the built-in stack extension method is used). ++ ++ Do not make this value too large; the results are undefined if ++ YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH) ++ evaluated with infinite-precision integer arithmetic. */ ++ ++#ifndef YYMAXDEPTH ++# define YYMAXDEPTH 10000 ++#endif ++ ++ ++#if YYERROR_VERBOSE ++ ++# ifndef yystrlen ++# if defined __GLIBC__ && defined _STRING_H ++# define yystrlen strlen ++# else ++/* Return the length of YYSTR. */ ++#if (defined __STDC__ || defined __C99__FUNC__ \ ++ || defined __cplusplus || defined _MSC_VER) ++static YYSIZE_T ++yystrlen (const char *yystr) ++#else ++static YYSIZE_T ++yystrlen (yystr) ++ const char *yystr; ++#endif ++{ ++ YYSIZE_T yylen; ++ for (yylen = 0; yystr[yylen]; yylen++) ++ continue; ++ return yylen; ++} ++# endif ++# endif ++ ++# ifndef yystpcpy ++# if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE ++# define yystpcpy stpcpy ++# else ++/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in ++ YYDEST. */ ++#if (defined __STDC__ || defined __C99__FUNC__ \ ++ || defined __cplusplus || defined _MSC_VER) ++static char * ++yystpcpy (char *yydest, const char *yysrc) ++#else ++static char * ++yystpcpy (yydest, yysrc) ++ char *yydest; ++ const char *yysrc; ++#endif ++{ ++ char *yyd = yydest; ++ const char *yys = yysrc; ++ ++ while ((*yyd++ = *yys++) != '\0') ++ continue; ++ ++ return yyd - 1; ++} ++# endif ++# endif ++ ++# ifndef yytnamerr ++/* Copy to YYRES the contents of YYSTR after stripping away unnecessary ++ quotes and backslashes, so that it's suitable for yyerror. The ++ heuristic is that double-quoting is unnecessary unless the string ++ contains an apostrophe, a comma, or backslash (other than ++ backslash-backslash). YYSTR is taken from yytname. If YYRES is ++ null, do not copy; instead, return the length of what the result ++ would have been. */ ++static YYSIZE_T ++yytnamerr (char *yyres, const char *yystr) ++{ ++ if (*yystr == '"') ++ { ++ YYSIZE_T yyn = 0; ++ char const *yyp = yystr; ++ ++ for (;;) ++ switch (*++yyp) ++ { ++ case '\'': ++ case ',': ++ goto do_not_strip_quotes; ++ ++ case '\\': ++ if (*++yyp != '\\') ++ goto do_not_strip_quotes; ++ /* Fall through. */ ++ default: ++ if (yyres) ++ yyres[yyn] = *yyp; ++ yyn++; ++ break; ++ ++ case '"': ++ if (yyres) ++ yyres[yyn] = '\0'; ++ return yyn; ++ } ++ do_not_strip_quotes: ; ++ } ++ ++ if (! yyres) ++ return yystrlen (yystr); ++ ++ return yystpcpy (yyres, yystr) - yyres; ++} ++# endif ++ ++/* Copy into *YYMSG, which is of size *YYMSG_ALLOC, an error message ++ about the unexpected token YYTOKEN for the state stack whose top is ++ YYSSP. ++ ++ Return 0 if *YYMSG was successfully written. Return 1 if *YYMSG is ++ not large enough to hold the message. In that case, also set ++ *YYMSG_ALLOC to the required number of bytes. Return 2 if the ++ required number of bytes is too large to store. */ ++static int ++yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg, ++ yytype_int16 *yyssp, int yytoken) ++{ ++ YYSIZE_T yysize0 = yytnamerr (YY_NULL, yytname[yytoken]); ++ YYSIZE_T yysize = yysize0; ++ enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 }; ++ /* Internationalized format string. */ ++ const char *yyformat = YY_NULL; ++ /* Arguments of yyformat. */ ++ char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM]; ++ /* Number of reported tokens (one for the "unexpected", one per ++ "expected"). */ ++ int yycount = 0; ++ ++ /* There are many possibilities here to consider: ++ - Assume YYFAIL is not used. It's too flawed to consider. See ++ ++ for details. YYERROR is fine as it does not invoke this ++ function. ++ - If this state is a consistent state with a default action, then ++ the only way this function was invoked is if the default action ++ is an error action. In that case, don't check for expected ++ tokens because there are none. ++ - The only way there can be no lookahead present (in yychar) is if ++ this state is a consistent state with a default action. Thus, ++ detecting the absence of a lookahead is sufficient to determine ++ that there is no unexpected or expected token to report. In that ++ case, just report a simple "syntax error". ++ - Don't assume there isn't a lookahead just because this state is a ++ consistent state with a default action. There might have been a ++ previous inconsistent state, consistent state with a non-default ++ action, or user semantic action that manipulated yychar. ++ - Of course, the expected token list depends on states to have ++ correct lookahead information, and it depends on the parser not ++ to perform extra reductions after fetching a lookahead from the ++ scanner and before detecting a syntax error. Thus, state merging ++ (from LALR or IELR) and default reductions corrupt the expected ++ token list. However, the list is correct for canonical LR with ++ one exception: it will still contain any token that will not be ++ accepted due to an error action in a later state. ++ */ ++ if (yytoken != YYEMPTY) ++ { ++ int yyn = yypact[*yyssp]; ++ yyarg[yycount++] = yytname[yytoken]; ++ if (!yypact_value_is_default (yyn)) ++ { ++ /* Start YYX at -YYN if negative to avoid negative indexes in ++ YYCHECK. In other words, skip the first -YYN actions for ++ this state because they are default actions. */ ++ int yyxbegin = yyn < 0 ? -yyn : 0; ++ /* Stay within bounds of both yycheck and yytname. */ ++ int yychecklim = YYLAST - yyn + 1; ++ int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS; ++ int yyx; ++ ++ for (yyx = yyxbegin; yyx < yyxend; ++yyx) ++ if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR ++ && !yytable_value_is_error (yytable[yyx + yyn])) ++ { ++ if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM) ++ { ++ yycount = 1; ++ yysize = yysize0; ++ break; ++ } ++ yyarg[yycount++] = yytname[yyx]; ++ { ++ YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULL, yytname[yyx]); ++ if (! (yysize <= yysize1 ++ && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) ++ return 2; ++ yysize = yysize1; ++ } ++ } ++ } ++ } ++ ++ switch (yycount) ++ { ++# define YYCASE_(N, S) \ ++ case N: \ ++ yyformat = S; \ ++ break ++ YYCASE_(0, YY_("syntax error")); ++ YYCASE_(1, YY_("syntax error, unexpected %s")); ++ YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s")); ++ YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s")); ++ YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s")); ++ YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s")); ++# undef YYCASE_ ++ } ++ ++ { ++ YYSIZE_T yysize1 = yysize + yystrlen (yyformat); ++ if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) ++ return 2; ++ yysize = yysize1; ++ } ++ ++ if (*yymsg_alloc < yysize) ++ { ++ *yymsg_alloc = 2 * yysize; ++ if (! (yysize <= *yymsg_alloc ++ && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM)) ++ *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM; ++ return 1; ++ } ++ ++ /* Avoid sprintf, as that infringes on the user's name space. ++ Don't have undefined behavior even if the translation ++ produced a string with the wrong number of "%s"s. */ ++ { ++ char *yyp = *yymsg; ++ int yyi = 0; ++ while ((*yyp = *yyformat) != '\0') ++ if (*yyp == '%' && yyformat[1] == 's' && yyi < yycount) ++ { ++ yyp += yytnamerr (yyp, yyarg[yyi++]); ++ yyformat += 2; ++ } ++ else ++ { ++ yyp++; ++ yyformat++; ++ } ++ } ++ return 0; ++} ++#endif /* YYERROR_VERBOSE */ ++ ++/*-----------------------------------------------. ++| Release the memory associated to this symbol. | ++`-----------------------------------------------*/ ++ ++/*ARGSUSED*/ ++#if (defined __STDC__ || defined __C99__FUNC__ \ ++ || defined __cplusplus || defined _MSC_VER) ++static void ++yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep) ++#else ++static void ++yydestruct (yymsg, yytype, yyvaluep) ++ const char *yymsg; ++ int yytype; ++ YYSTYPE *yyvaluep; ++#endif ++{ ++ YYUSE (yyvaluep); ++ ++ if (!yymsg) ++ yymsg = "Deleting"; ++ YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp); ++ ++ YYUSE (yytype); ++} ++ ++ ++ ++ ++/*----------. ++| yyparse. | ++`----------*/ ++ ++#ifdef YYPARSE_PARAM ++#if (defined __STDC__ || defined __C99__FUNC__ \ ++ || defined __cplusplus || defined _MSC_VER) ++int ++yyparse (void *YYPARSE_PARAM) ++#else ++int ++yyparse (YYPARSE_PARAM) ++ void *YYPARSE_PARAM; ++#endif ++#else /* ! YYPARSE_PARAM */ ++#if (defined __STDC__ || defined __C99__FUNC__ \ ++ || defined __cplusplus || defined _MSC_VER) ++int ++yyparse (void) ++#else ++int ++yyparse () ++ ++#endif ++#endif ++{ ++/* The lookahead symbol. */ ++int yychar; ++ ++ ++#if defined __GNUC__ && 407 <= __GNUC__ * 100 + __GNUC_MINOR__ ++/* Suppress an incorrect diagnostic about yylval being uninitialized. */ ++# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \ ++ _Pragma ("GCC diagnostic push") \ ++ _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")\ ++ _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"") ++# define YY_IGNORE_MAYBE_UNINITIALIZED_END \ ++ _Pragma ("GCC diagnostic pop") ++#else ++/* Default value used for initialization, for pacifying older GCCs ++ or non-GCC compilers. */ ++static YYSTYPE yyval_default; ++# define YY_INITIAL_VALUE(Value) = Value ++#endif ++#ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN ++# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN ++# define YY_IGNORE_MAYBE_UNINITIALIZED_END ++#endif ++#ifndef YY_INITIAL_VALUE ++# define YY_INITIAL_VALUE(Value) /* Nothing. */ ++#endif ++ ++/* The semantic value of the lookahead symbol. */ ++YYSTYPE yylval YY_INITIAL_VALUE(yyval_default); ++ ++ /* Number of syntax errors so far. */ ++ int yynerrs; ++ ++ int yystate; ++ /* Number of tokens to shift before error messages enabled. */ ++ int yyerrstatus; ++ ++ /* The stacks and their tools: ++ `yyss': related to states. ++ `yyvs': related to semantic values. ++ ++ Refer to the stacks through separate pointers, to allow yyoverflow ++ to reallocate them elsewhere. */ ++ ++ /* The state stack. */ ++ yytype_int16 yyssa[YYINITDEPTH]; ++ yytype_int16 *yyss; ++ yytype_int16 *yyssp; ++ ++ /* The semantic value stack. */ ++ YYSTYPE yyvsa[YYINITDEPTH]; ++ YYSTYPE *yyvs; ++ YYSTYPE *yyvsp; ++ ++ YYSIZE_T yystacksize; ++ ++ int yyn; ++ int yyresult; ++ /* Lookahead token as an internal (translated) token number. */ ++ int yytoken = 0; ++ /* The variables used to return semantic value and location from the ++ action routines. */ ++ YYSTYPE yyval; ++ ++#if YYERROR_VERBOSE ++ /* Buffer for error messages, and its allocated size. */ ++ char yymsgbuf[128]; ++ char *yymsg = yymsgbuf; ++ YYSIZE_T yymsg_alloc = sizeof yymsgbuf; ++#endif ++ ++#define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N)) ++ ++ /* The number of symbols on the RHS of the reduced rule. ++ Keep to zero when no symbol should be popped. */ ++ int yylen = 0; ++ ++ yyssp = yyss = yyssa; ++ yyvsp = yyvs = yyvsa; ++ yystacksize = YYINITDEPTH; ++ ++ YYDPRINTF ((stderr, "Starting parse\n")); ++ ++ yystate = 0; ++ yyerrstatus = 0; ++ yynerrs = 0; ++ yychar = YYEMPTY; /* Cause a token to be read. */ ++ goto yysetstate; ++ ++/*------------------------------------------------------------. ++| yynewstate -- Push a new state, which is found in yystate. | ++`------------------------------------------------------------*/ ++ yynewstate: ++ /* In all cases, when you get here, the value and location stacks ++ have just been pushed. So pushing a state here evens the stacks. */ ++ yyssp++; ++ ++ yysetstate: ++ *yyssp = yystate; ++ ++ if (yyss + yystacksize - 1 <= yyssp) ++ { ++ /* Get the current used size of the three stacks, in elements. */ ++ YYSIZE_T yysize = yyssp - yyss + 1; ++ ++#ifdef yyoverflow ++ { ++ /* Give user a chance to reallocate the stack. Use copies of ++ these so that the &'s don't force the real ones into ++ memory. */ ++ YYSTYPE *yyvs1 = yyvs; ++ yytype_int16 *yyss1 = yyss; ++ ++ /* Each stack pointer address is followed by the size of the ++ data in use in that stack, in bytes. This used to be a ++ conditional around just the two extra args, but that might ++ be undefined if yyoverflow is a macro. */ ++ yyoverflow (YY_("memory exhausted"), ++ &yyss1, yysize * sizeof (*yyssp), ++ &yyvs1, yysize * sizeof (*yyvsp), ++ &yystacksize); ++ ++ yyss = yyss1; ++ yyvs = yyvs1; ++ } ++#else /* no yyoverflow */ ++# ifndef YYSTACK_RELOCATE ++ goto yyexhaustedlab; ++# else ++ /* Extend the stack our own way. */ ++ if (YYMAXDEPTH <= yystacksize) ++ goto yyexhaustedlab; ++ yystacksize *= 2; ++ if (YYMAXDEPTH < yystacksize) ++ yystacksize = YYMAXDEPTH; ++ ++ { ++ yytype_int16 *yyss1 = yyss; ++ union yyalloc *yyptr = ++ (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize)); ++ if (! yyptr) ++ goto yyexhaustedlab; ++ YYSTACK_RELOCATE (yyss_alloc, yyss); ++ YYSTACK_RELOCATE (yyvs_alloc, yyvs); ++# undef YYSTACK_RELOCATE ++ if (yyss1 != yyssa) ++ YYSTACK_FREE (yyss1); ++ } ++# endif ++#endif /* no yyoverflow */ ++ ++ yyssp = yyss + yysize - 1; ++ yyvsp = yyvs + yysize - 1; ++ ++ YYDPRINTF ((stderr, "Stack size increased to %lu\n", ++ (unsigned long int) yystacksize)); ++ ++ if (yyss + yystacksize - 1 <= yyssp) ++ YYABORT; ++ } ++ ++ YYDPRINTF ((stderr, "Entering state %d\n", yystate)); ++ ++ if (yystate == YYFINAL) ++ YYACCEPT; ++ ++ goto yybackup; ++ ++/*-----------. ++| yybackup. | ++`-----------*/ ++yybackup: ++ ++ /* Do appropriate processing given the current state. Read a ++ lookahead token if we need one and don't already have one. */ ++ ++ /* First try to decide what to do without reference to lookahead token. */ ++ yyn = yypact[yystate]; ++ if (yypact_value_is_default (yyn)) ++ goto yydefault; ++ ++ /* Not known => get a lookahead token if don't already have one. */ ++ ++ /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol. */ ++ if (yychar == YYEMPTY) ++ { ++ YYDPRINTF ((stderr, "Reading a token: ")); ++ yychar = YYLEX; ++ } ++ ++ if (yychar <= YYEOF) ++ { ++ yychar = yytoken = YYEOF; ++ YYDPRINTF ((stderr, "Now at end of input.\n")); ++ } ++ else ++ { ++ yytoken = YYTRANSLATE (yychar); ++ YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc); ++ } ++ ++ /* If the proper action on seeing token YYTOKEN is to reduce or to ++ detect an error, take that action. */ ++ yyn += yytoken; ++ if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken) ++ goto yydefault; ++ yyn = yytable[yyn]; ++ if (yyn <= 0) ++ { ++ if (yytable_value_is_error (yyn)) ++ goto yyerrlab; ++ yyn = -yyn; ++ goto yyreduce; ++ } ++ ++ /* Count tokens shifted since error; after three, turn off error ++ status. */ ++ if (yyerrstatus) ++ yyerrstatus--; ++ ++ /* Shift the lookahead token. */ ++ YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc); ++ ++ /* Discard the shifted token. */ ++ yychar = YYEMPTY; ++ ++ yystate = yyn; ++ YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN ++ *++yyvsp = yylval; ++ YY_IGNORE_MAYBE_UNINITIALIZED_END ++ ++ goto yynewstate; ++ ++ ++/*-----------------------------------------------------------. ++| yydefault -- do the default action for the current state. | ++`-----------------------------------------------------------*/ ++yydefault: ++ yyn = yydefact[yystate]; ++ if (yyn == 0) ++ goto yyerrlab; ++ goto yyreduce; ++ ++ ++/*-----------------------------. ++| yyreduce -- Do a reduction. | ++`-----------------------------*/ ++yyreduce: ++ /* yyn is the number of a rule to reduce with. */ ++ yylen = yyr2[yyn]; ++ ++ /* If YYLEN is nonzero, implement the default value of the action: ++ `$$ = $1'. ++ ++ Otherwise, the following line sets YYVAL to garbage. ++ This behavior is undocumented and Bison ++ users should not rely upon it. Assigning to YYVAL ++ unconditionally makes the parser a bit smaller, and it avoids a ++ GCC warning that YYVAL may be used uninitialized. */ ++ yyval = yyvsp[1-yylen]; ++ ++ ++ YY_REDUCE_PRINT (yyn); ++ switch (yyn) ++ { ++ case 4: ++/* Line 1787 of yacc.c */ ++#line 157 "ptlib/common/getdate.y" ++ { ++ VARIABLE->yyHaveTime++; ++ } ++ break; ++ ++ case 5: ++/* Line 1787 of yacc.c */ ++#line 160 "ptlib/common/getdate.y" ++ { ++ VARIABLE->yyHaveZone++; ++ } ++ break; ++ ++ case 6: ++/* Line 1787 of yacc.c */ ++#line 163 "ptlib/common/getdate.y" ++ { ++ VARIABLE->yyHaveDate++; ++ } ++ break; ++ ++ case 7: ++/* Line 1787 of yacc.c */ ++#line 166 "ptlib/common/getdate.y" ++ { ++ VARIABLE->yyHaveDay++; ++ } ++ break; ++ ++ case 8: ++/* Line 1787 of yacc.c */ ++#line 169 "ptlib/common/getdate.y" ++ { ++ VARIABLE->yyHaveRel++; ++ } ++ break; ++ ++ case 10: ++/* Line 1787 of yacc.c */ ++#line 175 "ptlib/common/getdate.y" ++ { ++ VARIABLE->yyHour = (yyvsp[(1) - (2)].Number); ++ VARIABLE->yyMinutes = 0; ++ VARIABLE->yySeconds = 0; ++ VARIABLE->yyMeridian = (yyvsp[(2) - (2)].Meridian); ++ } ++ break; ++ ++ case 11: ++/* Line 1787 of yacc.c */ ++#line 181 "ptlib/common/getdate.y" ++ { ++ VARIABLE->yyHour = (yyvsp[(1) - (2)].Number)/100; ++ VARIABLE->yyMinutes = (yyvsp[(1) - (2)].Number)%100; ++ VARIABLE->yySeconds = 0; ++ VARIABLE->yyMeridian = MER24; ++ VARIABLE->yyDSTmode = DSToff; ++ VARIABLE->yyTimezone = - ((yyvsp[(2) - (2)].Number) % 100 + ((yyvsp[(2) - (2)].Number) / 100) * 60); ++ } ++ break; ++ ++ case 12: ++/* Line 1787 of yacc.c */ ++#line 189 "ptlib/common/getdate.y" ++ { ++ VARIABLE->yyHour = (yyvsp[(1) - (2)].Number)/10000; ++ VARIABLE->yyMinutes = ((yyvsp[(1) - (2)].Number)/100)%100; ++ VARIABLE->yySeconds = (yyvsp[(1) - (2)].Number) % 100; ++ VARIABLE->yyMeridian = MER24; ++ VARIABLE->yyDSTmode = DSToff; ++ VARIABLE->yyTimezone = - ((yyvsp[(2) - (2)].Number) % 100 + ((yyvsp[(2) - (2)].Number) / 100) * 60); ++ } ++ break; ++ ++ case 13: ++/* Line 1787 of yacc.c */ ++#line 197 "ptlib/common/getdate.y" ++ { ++ VARIABLE->yyHour = (yyvsp[(1) - (4)].Number); ++ VARIABLE->yyMinutes = (yyvsp[(3) - (4)].Number); ++ VARIABLE->yySeconds = 0; ++ VARIABLE->yyMeridian = (yyvsp[(4) - (4)].Meridian); ++ } ++ break; ++ ++ case 14: ++/* Line 1787 of yacc.c */ ++#line 203 "ptlib/common/getdate.y" ++ { ++ VARIABLE->yyHour = (yyvsp[(1) - (4)].Number); ++ VARIABLE->yyMinutes = (yyvsp[(3) - (4)].Number); ++ VARIABLE->yyMeridian = MER24; ++ VARIABLE->yyDSTmode = DSToff; ++ VARIABLE->yyTimezone = - ((yyvsp[(4) - (4)].Number) % 100 + ((yyvsp[(4) - (4)].Number) / 100) * 60); ++ } ++ break; ++ ++ case 15: ++/* Line 1787 of yacc.c */ ++#line 210 "ptlib/common/getdate.y" ++ { ++ VARIABLE->yyHour = (yyvsp[(1) - (6)].Number); ++ VARIABLE->yyMinutes = (yyvsp[(3) - (6)].Number); ++ VARIABLE->yySeconds = (yyvsp[(5) - (6)].Number); ++ VARIABLE->yyMeridian = (yyvsp[(6) - (6)].Meridian); ++ } ++ break; ++ ++ case 16: ++/* Line 1787 of yacc.c */ ++#line 216 "ptlib/common/getdate.y" ++ { ++ VARIABLE->yyHour = (yyvsp[(1) - (6)].Number); ++ VARIABLE->yyMinutes = (yyvsp[(3) - (6)].Number); ++ VARIABLE->yySeconds = (yyvsp[(5) - (6)].Number); ++ VARIABLE->yyMeridian = MER24; ++ VARIABLE->yyDSTmode = DSToff; ++ VARIABLE->yyTimezone = - ((yyvsp[(6) - (6)].Number) % 100 + ((yyvsp[(6) - (6)].Number) / 100) * 60); ++ } ++ break; ++ ++ case 17: ++/* Line 1787 of yacc.c */ ++#line 226 "ptlib/common/getdate.y" ++ { ++ VARIABLE->yyTimezone = (yyvsp[(1) - (1)].Number); ++ VARIABLE->yyDSTmode = DSToff; ++ } ++ break; ++ ++ case 18: ++/* Line 1787 of yacc.c */ ++#line 230 "ptlib/common/getdate.y" ++ { ++ VARIABLE->yyTimezone = (yyvsp[(1) - (1)].Number); ++ VARIABLE->yyDSTmode = DSTon; ++ } ++ break; ++ ++ case 19: ++/* Line 1787 of yacc.c */ ++#line 235 "ptlib/common/getdate.y" ++ { ++ VARIABLE->yyTimezone = (yyvsp[(1) - (2)].Number); ++ VARIABLE->yyDSTmode = DSTon; ++ } ++ break; ++ ++ case 20: ++/* Line 1787 of yacc.c */ ++#line 239 "ptlib/common/getdate.y" ++ { ++ if (VARIABLE->yyHaveTime > 0) { ++ VARIABLE->yyTimezone = (yyvsp[(1) - (1)].Number); ++ VARIABLE->yyDSTmode = DSToff; ++ } ++ else ++ VARIABLE->yyHaveZone--; ++ } ++ break; ++ ++ case 21: ++/* Line 1787 of yacc.c */ ++#line 249 "ptlib/common/getdate.y" ++ { ++ VARIABLE->yyDayOrdinal = 1; ++ VARIABLE->yyDayNumber = (yyvsp[(1) - (1)].Number); ++ } ++ break; ++ ++ case 22: ++/* Line 1787 of yacc.c */ ++#line 253 "ptlib/common/getdate.y" ++ { ++ VARIABLE->yyDayOrdinal = 1; ++ VARIABLE->yyDayNumber = (yyvsp[(1) - (2)].Number); ++ } ++ break; ++ ++ case 23: ++/* Line 1787 of yacc.c */ ++#line 257 "ptlib/common/getdate.y" ++ { ++ VARIABLE->yyDayOrdinal = (yyvsp[(1) - (2)].Number); ++ VARIABLE->yyDayNumber = (yyvsp[(2) - (2)].Number); ++ } ++ break; ++ ++ case 24: ++/* Line 1787 of yacc.c */ ++#line 263 "ptlib/common/getdate.y" ++ { ++ SetPossibleDate(VARIABLE, (yyvsp[(1) - (3)].Number), (yyvsp[(3) - (3)].Number), VARIABLE->yyYear); ++ } ++ break; ++ ++ case 25: ++/* Line 1787 of yacc.c */ ++#line 266 "ptlib/common/getdate.y" ++ { ++ SetPossibleDate(VARIABLE, (yyvsp[(1) - (5)].Number), (yyvsp[(3) - (5)].Number), (yyvsp[(5) - (5)].Number)); ++ } ++ break; ++ ++ case 26: ++/* Line 1787 of yacc.c */ ++#line 269 "ptlib/common/getdate.y" ++ { ++ /* ISO 8601 format. yyyy-mm-dd. */ ++ SetPossibleDate(VARIABLE, (yyvsp[(1) - (4)].Number), -(yyvsp[(2) - (4)].Number), -(yyvsp[(3) - (4)].Number)); ++ } ++ break; ++ ++ case 27: ++/* Line 1787 of yacc.c */ ++#line 273 "ptlib/common/getdate.y" ++ { ++ VARIABLE->yyDay= ((yyvsp[(1) - (1)].Number))%100; ++ VARIABLE->yyMonth= ((yyvsp[(1) - (1)].Number)/100)%100; ++ VARIABLE->yyYear = (yyvsp[(1) - (1)].Number)/10000; ++ } ++ break; ++ ++ case 28: ++/* Line 1787 of yacc.c */ ++#line 278 "ptlib/common/getdate.y" ++ { ++ /* e.g. 17-JUN-1992. */ ++ SetPossibleDate(VARIABLE, (yyvsp[(1) - (3)].Number), (yyvsp[(2) - (3)].Number), -(yyvsp[(3) - (3)].Number)); ++ } ++ break; ++ ++ case 29: ++/* Line 1787 of yacc.c */ ++#line 282 "ptlib/common/getdate.y" ++ { ++ VARIABLE->yyMonth = (yyvsp[(1) - (2)].Number); ++ if ((yyvsp[(2) - (2)].Number) > 31) ++ VARIABLE->yyYear = (yyvsp[(2) - (2)].Number); ++ else ++ VARIABLE->yyDay = (yyvsp[(2) - (2)].Number); ++ } ++ break; ++ ++ case 30: ++/* Line 1787 of yacc.c */ ++#line 289 "ptlib/common/getdate.y" ++ { ++ VARIABLE->yyMonth = (yyvsp[(1) - (4)].Number); ++ VARIABLE->yyDay = (yyvsp[(2) - (4)].Number); ++ VARIABLE->yyYear = (yyvsp[(4) - (4)].Number); ++ } ++ break; ++ ++ case 31: ++/* Line 1787 of yacc.c */ ++#line 294 "ptlib/common/getdate.y" ++ { ++ if ((yyvsp[(1) - (2)].Number) > 31) ++ VARIABLE->yyYear = (yyvsp[(1) - (2)].Number); ++ else ++ VARIABLE->yyDay = (yyvsp[(1) - (2)].Number); ++ VARIABLE->yyMonth = (yyvsp[(2) - (2)].Number); ++ } ++ break; ++ ++ case 32: ++/* Line 1787 of yacc.c */ ++#line 301 "ptlib/common/getdate.y" ++ { ++ SetPossibleDate(VARIABLE, (yyvsp[(1) - (3)].Number), (yyvsp[(2) - (3)].Number), (yyvsp[(3) - (3)].Number)); ++ } ++ break; ++ ++ case 33: ++/* Line 1787 of yacc.c */ ++#line 306 "ptlib/common/getdate.y" ++ { ++ VARIABLE->yyRelSeconds = -VARIABLE->yyRelSeconds; ++ VARIABLE->yyRelMonth = -VARIABLE->yyRelMonth; ++ } ++ break; ++ ++ case 35: ++/* Line 1787 of yacc.c */ ++#line 313 "ptlib/common/getdate.y" ++ { ++ VARIABLE->yyRelSeconds += (yyvsp[(1) - (2)].Number) * (yyvsp[(2) - (2)].Number) * 60L; ++ } ++ break; ++ ++ case 36: ++/* Line 1787 of yacc.c */ ++#line 316 "ptlib/common/getdate.y" ++ { ++ VARIABLE->yyRelSeconds += (yyvsp[(1) - (2)].Number) * (yyvsp[(2) - (2)].Number) * 60L; ++ } ++ break; ++ ++ case 37: ++/* Line 1787 of yacc.c */ ++#line 319 "ptlib/common/getdate.y" ++ { ++ VARIABLE->yyRelSeconds += (yyvsp[(1) - (1)].Number) * 60L; ++ } ++ break; ++ ++ case 38: ++/* Line 1787 of yacc.c */ ++#line 322 "ptlib/common/getdate.y" ++ { ++ VARIABLE->yyRelSeconds += (yyvsp[(1) - (2)].Number); ++ } ++ break; ++ ++ case 39: ++/* Line 1787 of yacc.c */ ++#line 325 "ptlib/common/getdate.y" ++ { ++ VARIABLE->yyRelSeconds += (yyvsp[(1) - (2)].Number); ++ } ++ break; ++ ++ case 40: ++/* Line 1787 of yacc.c */ ++#line 328 "ptlib/common/getdate.y" ++ { ++ VARIABLE->yyRelSeconds++; ++ } ++ break; ++ ++ case 41: ++/* Line 1787 of yacc.c */ ++#line 331 "ptlib/common/getdate.y" ++ { ++ VARIABLE->yyRelMonth += (yyvsp[(1) - (2)].Number) * (yyvsp[(2) - (2)].Number); ++ } ++ break; ++ ++ case 42: ++/* Line 1787 of yacc.c */ ++#line 334 "ptlib/common/getdate.y" ++ { ++ VARIABLE->yyRelMonth += (yyvsp[(1) - (2)].Number) * (yyvsp[(2) - (2)].Number); ++ } ++ break; ++ ++ case 43: ++/* Line 1787 of yacc.c */ ++#line 337 "ptlib/common/getdate.y" ++ { ++ VARIABLE->yyRelMonth += (yyvsp[(1) - (1)].Number); ++ } ++ break; ++ ++ case 44: ++/* Line 1787 of yacc.c */ ++#line 342 "ptlib/common/getdate.y" ++ { ++ (yyval.Number) = (yyvsp[(1) - (1)].Number); ++ } ++ break; ++ ++ case 45: ++/* Line 1787 of yacc.c */ ++#line 345 "ptlib/common/getdate.y" ++ { ++ (yyval.Number) = (yyvsp[(1) - (1)].Number); ++ } ++ break; ++ ++ case 46: ++/* Line 1787 of yacc.c */ ++#line 348 "ptlib/common/getdate.y" ++ { ++ (yyval.Number) = (yyvsp[(1) - (1)].Number); ++ } ++ break; ++ ++ case 47: ++/* Line 1787 of yacc.c */ ++#line 353 "ptlib/common/getdate.y" ++ { ++ if (VARIABLE->yyHaveTime && VARIABLE->yyHaveDate && !VARIABLE->yyHaveRel) ++ VARIABLE->yyYear = (yyvsp[(1) - (1)].Number); ++ else { ++ if((yyvsp[(1) - (1)].Number)>240000) { ++ VARIABLE->yyHaveDate++; ++ VARIABLE->yyDay= ((yyvsp[(1) - (1)].Number))%100; ++ VARIABLE->yyMonth= ((yyvsp[(1) - (1)].Number)/100)%100; ++ VARIABLE->yyYear = (yyvsp[(1) - (1)].Number)/10000; ++ } ++ else { ++ VARIABLE->yyHaveTime++; ++ if ((yyvsp[(1) - (1)].Number) < 10000) { ++ VARIABLE->yyHour = (yyvsp[(1) - (1)].Number) / 100; ++ VARIABLE->yyMinutes = (yyvsp[(1) - (1)].Number) % 100; ++ VARIABLE->yySeconds = 0; ++ } ++ else { ++ VARIABLE->yyHour = (yyvsp[(1) - (1)].Number)/10000; ++ VARIABLE->yyMinutes = ((yyvsp[(1) - (1)].Number)/100)%100; ++ VARIABLE->yySeconds = (yyvsp[(1) - (1)].Number) % 100; ++ } ++ VARIABLE->yyMeridian = MER24; ++ } ++ } ++ } ++ break; ++ ++ case 48: ++/* Line 1787 of yacc.c */ ++#line 379 "ptlib/common/getdate.y" ++ { ++ if (VARIABLE->yyHaveTime && VARIABLE->yyHaveDate && !VARIABLE->yyHaveRel) ++ VARIABLE->yyYear = (yyvsp[(1) - (1)].Number); ++ else { ++ VARIABLE->yyHaveTime++; ++ VARIABLE->yyHour = (yyvsp[(1) - (1)].Number)/100; ++ VARIABLE->yyMinutes = (yyvsp[(1) - (1)].Number)%100; ++ VARIABLE->yySeconds = 0; ++ VARIABLE->yyMeridian = MER24; ++ } ++ } ++ break; ++ ++ case 49: ++/* Line 1787 of yacc.c */ ++#line 390 "ptlib/common/getdate.y" ++ { ++ if (!VARIABLE->yyHaveDate && (yyvsp[(1) - (1)].Number)>240000) { ++ VARIABLE->yyHaveDate++; ++ VARIABLE->yyDay= ((yyvsp[(1) - (1)].Number))%100; ++ VARIABLE->yyMonth= ((yyvsp[(1) - (1)].Number)/100)%100; ++ VARIABLE->yyYear = (yyvsp[(1) - (1)].Number)/10000; ++ } ++ else if (!VARIABLE->yyHaveTime) { ++ VARIABLE->yyHaveTime++; ++ VARIABLE->yyHour = (yyvsp[(1) - (1)].Number)/10000; ++ VARIABLE->yyMinutes = ((yyvsp[(1) - (1)].Number)/100)%100; ++ VARIABLE->yySeconds = (yyvsp[(1) - (1)].Number) % 100; ++ VARIABLE->yyMeridian = MER24; ++ } ++ } ++ break; ++ ++ case 50: ++/* Line 1787 of yacc.c */ ++#line 407 "ptlib/common/getdate.y" ++ { ++ (yyval.Meridian) = MER24; ++ } ++ break; ++ ++ case 51: ++/* Line 1787 of yacc.c */ ++#line 410 "ptlib/common/getdate.y" ++ { ++ (yyval.Meridian) = (yyvsp[(1) - (1)].Meridian); ++ } ++ break; ++ ++ ++/* Line 1787 of yacc.c */ ++#line 2031 "ptlib/common/getdate.tab.c" ++ default: break; ++ } ++ /* User semantic actions sometimes alter yychar, and that requires ++ that yytoken be updated with the new translation. We take the ++ approach of translating immediately before every use of yytoken. ++ One alternative is translating here after every semantic action, ++ but that translation would be missed if the semantic action invokes ++ YYABORT, YYACCEPT, or YYERROR immediately after altering yychar or ++ if it invokes YYBACKUP. In the case of YYABORT or YYACCEPT, an ++ incorrect destructor might then be invoked immediately. In the ++ case of YYERROR or YYBACKUP, subsequent parser actions might lead ++ to an incorrect destructor call or verbose syntax error message ++ before the lookahead is translated. */ ++ YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); ++ ++ YYPOPSTACK (yylen); ++ yylen = 0; ++ YY_STACK_PRINT (yyss, yyssp); ++ ++ *++yyvsp = yyval; ++ ++ /* Now `shift' the result of the reduction. Determine what state ++ that goes to, based on the state we popped back to and the rule ++ number reduced by. */ ++ ++ yyn = yyr1[yyn]; ++ ++ yystate = yypgoto[yyn - YYNTOKENS] + *yyssp; ++ if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp) ++ yystate = yytable[yystate]; ++ else ++ yystate = yydefgoto[yyn - YYNTOKENS]; ++ ++ goto yynewstate; ++ ++ ++/*------------------------------------. ++| yyerrlab -- here on detecting error | ++`------------------------------------*/ ++yyerrlab: ++ /* Make sure we have latest lookahead translation. See comments at ++ user semantic actions for why this is necessary. */ ++ yytoken = yychar == YYEMPTY ? YYEMPTY : YYTRANSLATE (yychar); ++ ++ /* If not already recovering from an error, report this error. */ ++ if (!yyerrstatus) ++ { ++ ++yynerrs; ++#if ! YYERROR_VERBOSE ++ yyerror (YY_("syntax error")); ++#else ++# define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \ ++ yyssp, yytoken) ++ { ++ char const *yymsgp = YY_("syntax error"); ++ int yysyntax_error_status; ++ yysyntax_error_status = YYSYNTAX_ERROR; ++ if (yysyntax_error_status == 0) ++ yymsgp = yymsg; ++ else if (yysyntax_error_status == 1) ++ { ++ if (yymsg != yymsgbuf) ++ YYSTACK_FREE (yymsg); ++ yymsg = (char *) YYSTACK_ALLOC (yymsg_alloc); ++ if (!yymsg) ++ { ++ yymsg = yymsgbuf; ++ yymsg_alloc = sizeof yymsgbuf; ++ yysyntax_error_status = 2; ++ } ++ else ++ { ++ yysyntax_error_status = YYSYNTAX_ERROR; ++ yymsgp = yymsg; ++ } ++ } ++ yyerror (yymsgp); ++ if (yysyntax_error_status == 2) ++ goto yyexhaustedlab; ++ } ++# undef YYSYNTAX_ERROR ++#endif ++ } ++ ++ ++ ++ if (yyerrstatus == 3) ++ { ++ /* If just tried and failed to reuse lookahead token after an ++ error, discard it. */ ++ ++ if (yychar <= YYEOF) ++ { ++ /* Return failure if at end of input. */ ++ if (yychar == YYEOF) ++ YYABORT; ++ } ++ else ++ { ++ yydestruct ("Error: discarding", ++ yytoken, &yylval); ++ yychar = YYEMPTY; ++ } ++ } ++ ++ /* Else will try to reuse lookahead token after shifting the error ++ token. */ ++ goto yyerrlab1; ++ ++ ++/*---------------------------------------------------. ++| yyerrorlab -- error raised explicitly by YYERROR. | ++`---------------------------------------------------*/ ++yyerrorlab: ++ ++ /* Pacify compilers like GCC when the user code never invokes ++ YYERROR and the label yyerrorlab therefore never appears in user ++ code. */ ++ if (/*CONSTCOND*/ 0) ++ goto yyerrorlab; ++ ++ /* Do not reclaim the symbols of the rule which action triggered ++ this YYERROR. */ ++ YYPOPSTACK (yylen); ++ yylen = 0; ++ YY_STACK_PRINT (yyss, yyssp); ++ yystate = *yyssp; ++ goto yyerrlab1; ++ ++ ++/*-------------------------------------------------------------. ++| yyerrlab1 -- common code for both syntax error and YYERROR. | ++`-------------------------------------------------------------*/ ++yyerrlab1: ++ yyerrstatus = 3; /* Each real token shifted decrements this. */ ++ ++ for (;;) ++ { ++ yyn = yypact[yystate]; ++ if (!yypact_value_is_default (yyn)) ++ { ++ yyn += YYTERROR; ++ if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR) ++ { ++ yyn = yytable[yyn]; ++ if (0 < yyn) ++ break; ++ } ++ } ++ ++ /* Pop the current state because it cannot handle the error token. */ ++ if (yyssp == yyss) ++ YYABORT; ++ ++ ++ yydestruct ("Error: popping", ++ yystos[yystate], yyvsp); ++ YYPOPSTACK (1); ++ yystate = *yyssp; ++ YY_STACK_PRINT (yyss, yyssp); ++ } ++ ++ YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN ++ *++yyvsp = yylval; ++ YY_IGNORE_MAYBE_UNINITIALIZED_END ++ ++ ++ /* Shift the error token. */ ++ YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp); ++ ++ yystate = yyn; ++ goto yynewstate; ++ ++ ++/*-------------------------------------. ++| yyacceptlab -- YYACCEPT comes here. | ++`-------------------------------------*/ ++yyacceptlab: ++ yyresult = 0; ++ goto yyreturn; ++ ++/*-----------------------------------. ++| yyabortlab -- YYABORT comes here. | ++`-----------------------------------*/ ++yyabortlab: ++ yyresult = 1; ++ goto yyreturn; ++ ++#if !defined yyoverflow || YYERROR_VERBOSE ++/*-------------------------------------------------. ++| yyexhaustedlab -- memory exhaustion comes here. | ++`-------------------------------------------------*/ ++yyexhaustedlab: ++ yyerror (YY_("memory exhausted")); ++ yyresult = 2; ++ /* Fall through. */ ++#endif ++ ++yyreturn: ++ if (yychar != YYEMPTY) ++ { ++ /* Make sure we have latest lookahead translation. See comments at ++ user semantic actions for why this is necessary. */ ++ yytoken = YYTRANSLATE (yychar); ++ yydestruct ("Cleanup: discarding lookahead", ++ yytoken, &yylval); ++ } ++ /* Do not reclaim the symbols of the rule which action triggered ++ this YYABORT or YYACCEPT. */ ++ YYPOPSTACK (yylen); ++ YY_STACK_PRINT (yyss, yyssp); ++ while (yyssp != yyss) ++ { ++ yydestruct ("Cleanup: popping", ++ yystos[*yyssp], yyvsp); ++ YYPOPSTACK (1); ++ } ++#ifndef yyoverflow ++ if (yyss != yyssa) ++ YYSTACK_FREE (yyss); ++#endif ++#if YYERROR_VERBOSE ++ if (yymsg != yymsgbuf) ++ YYSTACK_FREE (yymsg); ++#endif ++ /* Make sure YYID is used. */ ++ return YYID (yyresult); ++} ++ ++ ++/* Line 2050 of yacc.c */ ++#line 415 "ptlib/common/getdate.y" ++ ++ ++/* Month and day table. */ ++static TABLE const MonthDayTable[] = { ++ { "january", tMONTH, 1 }, ++ { "february", tMONTH, 2 }, ++ { "march", tMONTH, 3 }, ++ { "april", tMONTH, 4 }, ++ { "may", tMONTH, 5 }, ++ { "june", tMONTH, 6 }, ++ { "july", tMONTH, 7 }, ++ { "august", tMONTH, 8 }, ++ { "september", tMONTH, 9 }, ++ { "sept", tMONTH, 9 }, ++ { "october", tMONTH, 10 }, ++ { "november", tMONTH, 11 }, ++ { "december", tMONTH, 12 }, ++ { "sunday", tDAY, 0 }, ++ { "monday", tDAY, 1 }, ++ { "tuesday", tDAY, 2 }, ++ { "tues", tDAY, 2 }, ++ { "wednesday", tDAY, 3 }, ++ { "wednes", tDAY, 3 }, ++ { "thursday", tDAY, 4 }, ++ { "thur", tDAY, 4 }, ++ { "thurs", tDAY, 4 }, ++ { "friday", tDAY, 5 }, ++ { "saturday", tDAY, 6 }, ++ { NULL } ++}; ++ ++/* Time units table. */ ++static TABLE const UnitsTable[] = { ++ { "year", tMONTH_UNIT, 12 }, ++ { "month", tMONTH_UNIT, 1 }, ++ { "fortnight", tMINUTE_UNIT, 14 * 24 * 60 }, ++ { "week", tMINUTE_UNIT, 7 * 24 * 60 }, ++ { "day", tMINUTE_UNIT, 1 * 24 * 60 }, ++ { "hour", tMINUTE_UNIT, 60 }, ++ { "minute", tMINUTE_UNIT, 1 }, ++ { "min", tMINUTE_UNIT, 1 }, ++ { "second", tSEC_UNIT, 1 }, ++ { "sec", tSEC_UNIT, 1 }, ++ { NULL } ++}; ++ ++/* Assorted relative-time words. */ ++static TABLE const OtherTable[] = { ++ { "tomorrow", tMINUTE_UNIT, 1 * 24 * 60 }, ++ { "yesterday", tMINUTE_UNIT, -1 * 24 * 60 }, ++ { "today", tMINUTE_UNIT, 0 }, ++ { "now", tMINUTE_UNIT, 0 }, ++ { "last", tUNUMBER, -1 }, ++ { "this", tMINUTE_UNIT, 0 }, ++ { "next", tUNUMBER, 2 }, ++ { "first", tUNUMBER, 1 }, ++/* { "second", tUNUMBER, 2 }, */ ++ { "third", tUNUMBER, 3 }, ++ { "fourth", tUNUMBER, 4 }, ++ { "fifth", tUNUMBER, 5 }, ++ { "sixth", tUNUMBER, 6 }, ++ { "seventh", tUNUMBER, 7 }, ++ { "eighth", tUNUMBER, 8 }, ++ { "ninth", tUNUMBER, 9 }, ++ { "tenth", tUNUMBER, 10 }, ++ { "eleventh", tUNUMBER, 11 }, ++ { "twelfth", tUNUMBER, 12 }, ++ { "ago", tAGO, 1 }, ++ { NULL } ++}; ++ ++/* The timezone table. */ ++/* Some of these are commented out because a time_t can't store a float. */ ++static TABLE const TimezoneTable[] = { ++ { "gmt", tZONE, HOUR( 0) }, /* Greenwich Mean */ ++ { "ut", tZONE, HOUR( 0) }, /* Universal (Coordinated) */ ++ { "utc", tZONE, HOUR( 0) }, ++ { "wet", tZONE, HOUR( 0) }, /* Western European */ ++ { "bst", tDAYZONE, HOUR( 0) }, /* British Summer */ ++ { "wat", tZONE, HOUR( 1) }, /* West Africa */ ++ { "at", tZONE, HOUR( 2) }, /* Azores */ ++#if 0 ++ /* For completeness. BST is also British Summer, and GST is ++ * also Guam Standard. */ ++ { "bst", tZONE, HOUR( 3) }, /* Brazil Standard */ ++ { "gst", tZONE, HOUR( 3) }, /* Greenland Standard */ ++#endif ++#if 0 ++ { "nft", tZONE, HOUR(3.5) }, /* Newfoundland */ ++ { "nst", tZONE, HOUR(3.5) }, /* Newfoundland Standard */ ++ { "ndt", tDAYZONE, HOUR(3.5) }, /* Newfoundland Daylight */ ++#endif ++ { "ast", tZONE, HOUR( 4) }, /* Atlantic Standard */ ++ { "adt", tDAYZONE, HOUR( 4) }, /* Atlantic Daylight */ ++ { "est", tZONE, HOUR( 5) }, /* Eastern Standard */ ++ { "edt", tDAYZONE, HOUR( 5) }, /* Eastern Daylight */ ++ { "cst", tZONE, HOUR( 6) }, /* Central Standard */ ++ { "cdt", tDAYZONE, HOUR( 6) }, /* Central Daylight */ ++ { "mst", tZONE, HOUR( 7) }, /* Mountain Standard */ ++ { "mdt", tDAYZONE, HOUR( 7) }, /* Mountain Daylight */ ++ { "pst", tZONE, HOUR( 8) }, /* Pacific Standard */ ++ { "pdt", tDAYZONE, HOUR( 8) }, /* Pacific Daylight */ ++ { "yst", tZONE, HOUR( 9) }, /* Yukon Standard */ ++ { "ydt", tDAYZONE, HOUR( 9) }, /* Yukon Daylight */ ++ { "hst", tZONE, HOUR(10) }, /* Hawaii Standard */ ++ { "hdt", tDAYZONE, HOUR(10) }, /* Hawaii Daylight */ ++ { "cat", tZONE, HOUR(10) }, /* Central Alaska */ ++ { "ahst", tZONE, HOUR(10) }, /* Alaska-Hawaii Standard */ ++ { "nt", tZONE, HOUR(11) }, /* Nome */ ++ { "idlw", tZONE, HOUR(12) }, /* International Date Line West */ ++ { "cet", tZONE, -HOUR(1) }, /* Central European */ ++ { "met", tZONE, -HOUR(1) }, /* Middle European */ ++ { "mewt", tZONE, -HOUR(1) }, /* Middle European Winter */ ++ { "mest", tDAYZONE, -HOUR(1) }, /* Middle European Summer */ ++ { "swt", tZONE, -HOUR(1) }, /* Swedish Winter */ ++ { "sst", tDAYZONE, -HOUR(1) }, /* Swedish Summer */ ++ { "fwt", tZONE, -HOUR(1) }, /* French Winter */ ++ { "fst", tDAYZONE, -HOUR(1) }, /* French Summer */ ++ { "eet", tZONE, -HOUR(2) }, /* Eastern Europe, USSR Zone 1 */ ++ { "bt", tZONE, -HOUR(3) }, /* Baghdad, USSR Zone 2 */ ++#if 0 ++ { "it", tZONE, -HOUR(3.5) },/* Iran */ ++#endif ++ { "zp4", tZONE, -HOUR(4) }, /* USSR Zone 3 */ ++ { "zp5", tZONE, -HOUR(5) }, /* USSR Zone 4 */ ++#if 0 ++ { "ist", tZONE, -HOUR(5.5) },/* Indian Standard */ ++#endif ++ { "zp6", tZONE, -HOUR(6) }, /* USSR Zone 5 */ ++#if 0 ++ /* For completeness. NST is also Newfoundland Stanard, and SST is ++ * also Swedish Summer. */ ++ { "nst", tZONE, -HOUR(6.5) },/* North Sumatra */ ++ { "sst", tZONE, -HOUR(7) }, /* South Sumatra, USSR Zone 6 */ ++#endif /* 0 */ ++ { "wast", tZONE, -HOUR(7) }, /* West Australian Standard */ ++ { "wadt", tDAYZONE, -HOUR(7) }, /* West Australian Daylight */ ++#if 0 ++ { "jt", tZONE, -HOUR(7.5) },/* Java (3pm in Cronusland!) */ ++#endif ++ { "cct", tZONE, -HOUR(8) }, /* China Coast, USSR Zone 7 */ ++ { "jst", tZONE, -HOUR(9) }, /* Japan Standard, USSR Zone 8 */ ++#if 0 ++ { "cast", tZONE, -HOUR(9.5) },/* Central Australian Standard */ ++ { "cadt", tDAYZONE, -HOUR(9.5) },/* Central Australian Daylight */ ++#endif ++ { "east", tZONE, -HOUR(10) }, /* Eastern Australian Standard */ ++ { "eadt", tDAYZONE, -HOUR(10) }, /* Eastern Australian Daylight */ ++ { "gst", tZONE, -HOUR(10) }, /* Guam Standard, USSR Zone 9 */ ++ { "nzt", tZONE, -HOUR(12) }, /* New Zealand */ ++ { "nzst", tZONE, -HOUR(12) }, /* New Zealand Standard */ ++ { "nzdt", tDAYZONE, -HOUR(12) }, /* New Zealand Daylight */ ++ { "idle", tZONE, -HOUR(12) }, /* International Date Line East */ ++ { NULL } ++}; ++ ++/* Military timezone table. */ ++static TABLE const MilitaryTable[] = { ++ { "a", tMILZONE, HOUR( 1) }, ++ { "b", tMILZONE, HOUR( 2) }, ++ { "c", tMILZONE, HOUR( 3) }, ++ { "d", tMILZONE, HOUR( 4) }, ++ { "e", tMILZONE, HOUR( 5) }, ++ { "f", tMILZONE, HOUR( 6) }, ++ { "g", tMILZONE, HOUR( 7) }, ++ { "h", tMILZONE, HOUR( 8) }, ++ { "i", tMILZONE, HOUR( 9) }, ++ { "k", tMILZONE, HOUR( 10) }, ++ { "l", tMILZONE, HOUR( 11) }, ++ { "m", tMILZONE, HOUR( 12) }, ++ { "n", tMILZONE, HOUR(- 1) }, ++ { "o", tMILZONE, HOUR(- 2) }, ++ { "p", tMILZONE, HOUR(- 3) }, ++ { "q", tMILZONE, HOUR(- 4) }, ++ { "r", tMILZONE, HOUR(- 5) }, ++ { "s", tMILZONE, HOUR(- 6) }, ++ { "t", tMILZONE, HOUR(- 7) }, ++ { "u", tMILZONE, HOUR(- 8) }, ++ { "v", tMILZONE, HOUR(- 9) }, ++ { "w", tMILZONE, HOUR(-10) }, ++ { "x", tMILZONE, HOUR(-11) }, ++ { "y", tMILZONE, HOUR(-12) }, ++ { "z", tZONE, HOUR( 0) }, /* Deliberately tZONE */ ++ { NULL } ++}; ++ ++static int LookupWord(char * buff, YYSTYPE * yylval, struct Variables * vars) ++{ ++ register char *p; ++ register char *q; ++ register const TABLE *tp; ++ int i; ++ int abbrev; ++ ++ /* Make it lowercase. */ ++ for (p = buff; *p != '\0'; p++) ++ *p = (char)tolower(*p); ++ ++ if (strcmp(buff, "am") == 0 || strcmp(buff, "a.m.") == 0) { ++ yylval->Meridian = MERam; ++ return tMERIDIAN; ++ } ++ if (strcmp(buff, "pm") == 0 || strcmp(buff, "p.m.") == 0) { ++ yylval->Meridian = MERpm; ++ return tMERIDIAN; ++ } ++ ++ /* See if we have an abbreviation for a month. */ ++ if (strlen(buff) == 3) ++ abbrev = 1; ++ else if (strlen(buff) == 4 && buff[3] == '.') { ++ abbrev = 1; ++ buff[3] = '\0'; ++ } ++ else ++ abbrev = 0; ++ ++ for (tp = MonthDayTable; tp->name; tp++) { ++ if (abbrev) { ++ if (strncmp(buff, tp->name, 3) == 0) { ++ yylval->Number = tp->value; ++ return tp->type; ++ } ++ } ++ else if (strcmp(buff, tp->name) == 0) { ++ yylval->Number = tp->value; ++ return tp->type; ++ } ++ } ++ ++ for (tp = TimezoneTable; tp->name; tp++) ++ if (strcmp(buff, tp->name) == 0) { ++ yylval->Number = tp->value; ++ return tp->type; ++ } ++ ++ if (strcmp(buff, "dst") == 0) ++ return tDST; ++ ++ for (tp = UnitsTable; tp->name; tp++) ++ if (strcmp(buff, tp->name) == 0) { ++ yylval->Number = tp->value; ++ return tp->type; ++ } ++ ++ /* Strip off any plural and try the units table again. */ ++ i = strlen(buff) - 1; ++ if (buff[i] == 's') { ++ buff[i] = '\0'; ++ for (tp = UnitsTable; tp->name; tp++) ++ if (strcmp(buff, tp->name) == 0) { ++ yylval->Number = tp->value; ++ return tp->type; ++ } ++ buff[i] = 's'; /* Put back for "this" in OtherTable. */ ++ } ++ ++ for (tp = OtherTable; tp->name; tp++) ++ if (strcmp(buff, tp->name) == 0) { ++ yylval->Number = tp->value; ++ return tp->type; ++ } ++ ++ /* Avoid confusion with 'T' in RFC3339 and 't' in Military timezones */ ++ if (!vars->yyHaveTime && strcmp(buff, "t") == 0) ++ return tRFC3339; ++ ++ /* Military timezones. */ ++ if (buff[1] == '\0' && isalpha(*buff)) { ++ for (tp = MilitaryTable; tp->name; tp++) ++ if (strcmp(buff, tp->name) == 0) { ++ yylval->Number = tp->value; ++ return tp->type; ++ } ++ } ++ ++ /* Drop out any periods and try the timezone table again. */ ++ for (i = 0, p = q = buff; *q; q++) ++ if (*q != '.') ++ *p++ = *q; ++ else ++ i++; ++ *p = '\0'; ++ if (i) ++ for (tp = TimezoneTable; tp->name; tp++) ++ if (strcmp(buff, tp->name) == 0) { ++ yylval->Number = tp->value; ++ return tp->type; ++ } ++ ++ for (i = 1; i <= 12; i++) ++ for (abbrev = 0; abbrev < 2; abbrev++) ++ if (PTimeIsMonthName(buff, i, abbrev)) { ++ yylval->Number = i; ++ return tMONTH; ++ } ++ ++ for (i = 1; i <= 7; i++) ++ for (abbrev = 0; abbrev < 2; abbrev++) ++ if (PTimeIsDayName(buff, i, abbrev)) { ++ yylval->Number = i; ++ return tDAY; ++ } ++ ++ return tID; ++} ++ ++ ++#ifdef _MSC_VER ++#pragma warning(disable:4211) ++#endif ++ ++#ifndef __GNUC__ ++static ++#endif ++int yylex(YYSTYPE * yylval, struct Variables * vars) ++{ ++ register char *p; ++ char buff[20]; ++ int Count; ++ int sign; ++ register int c = PTimeGetChar(vars->yyInput); ++ ++ while (c != EOF && c != '\0' && c != '\n') { ++ while (isspace(c)) ++ c = PTimeGetChar(vars->yyInput); ++ ++ if (isdigit(c) || c == '-' || c == '+') { ++ if (c == '-' || c == '+') { ++ sign = c == '-' ? -1 : 1; ++ if (!isdigit(c = PTimeGetChar(vars->yyInput))) ++ /* skip the '-' sign */ ++ continue; ++ } ++ else ++ sign = 0; ++ yylval->Number = 0; ++ Count = 0; /* Count number of digits */ ++ while (isdigit(c)) { ++ yylval->Number = 10 * yylval->Number + c - '0'; ++ c = PTimeGetChar(vars->yyInput); ++ Count++; ++ } ++ PTimeUngetChar(vars->yyInput, c); ++ if (sign < 0) ++ yylval->Number = -yylval->Number; ++ if (Count == 4) ++ return sign ? tS4DIGITNUMBER : t4DIGITNUMBER; ++ if (sign) ++ return tSNUMBER; ++ if (Count == 6) ++ return t6DIGITNUMBER; ++ if (Count == 8) ++ return t8DIGITNUMBER; ++ return tUNUMBER; ++ } ++ ++ if (isalpha(c)) { ++ for (p = buff; isalpha(c) || c == '.'; c = PTimeGetChar(vars->yyInput)) { ++ if (p < &buff[sizeof(buff)-1]) ++ *p++ = (char)c; ++ } ++ *p = '\0'; ++ PTimeUngetChar(vars->yyInput, c); ++ return LookupWord(buff, yylval, vars); ++ } ++ ++ if (c != '(') ++ return c; ++ ++ Count = 0; ++ do { ++ c = PTimeGetChar(vars->yyInput); ++ if (c == '\0' || c == EOF) ++ return c; ++ if (c == '(') ++ Count++; ++ else if (c == ')') ++ Count--; ++ } while (Count > 0); ++ } ++ ++ if (c == '\n') ++ PTimeUngetChar(vars->yyInput, c); ++ ++ return EOF; ++} ++ ++#ifdef _MSC_VER ++#pragma warning(default:4211) ++#endif ++ ++ ++static time_t ToSeconds(time_t Hours, time_t Minutes, time_t Seconds, ++ MERIDIAN Meridian) ++{ ++ if (Minutes < 0 || Minutes > 59 || Seconds < 0 || Seconds > 59) ++ return -1; ++ switch (Meridian) { ++ case MER24: ++ if (Hours < 0 || Hours > 23) ++ return -1; ++ return (Hours * 60L + Minutes) * 60L + Seconds; ++ case MERam: ++ if (Hours < 1 || Hours > 12) ++ return -1; ++ if (Hours == 12) ++ Hours = 0; ++ return (Hours * 60L + Minutes) * 60L + Seconds; ++ case MERpm: ++ if (Hours < 1 || Hours > 12) ++ return -1; ++ if (Hours == 12) ++ Hours = 0; ++ return ((Hours + 12) * 60L + Minutes) * 60L + Seconds; ++ } ++ ++ return -1; ++} ++ ++ ++static time_t Convert(time_t Month, time_t Day, time_t Year, ++ time_t Hours, time_t Minutes, time_t Seconds, ++ MERIDIAN Meridian, DSTMODE DSTmode, time_t yyTimezone) ++{ ++ static int DaysInMonth[12] = { ++ 31, 0, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 ++ }; ++ time_t tod; ++ time_t Julian; ++ int i; ++ ++ if (Year < 0) ++ Year = -Year; ++ if (Year < 70) ++ Year += 2000; ++ else if (Year < 100) ++ Year += 1900; ++ DaysInMonth[1] = Year % 4 == 0 && (Year % 100 != 0 || Year % 400 == 0) ++ ? 29 : 28; ++ /* Checking for 2038 bogusly assumes that time_t is 32 bits. But ++ I'm too lazy to try to check for time_t overflow in another way. */ ++ if (Year < EPOCH || Year > 2038 ++ || Month < 1 || Month > 12 ++ /* Lint fluff: "conversion from long may lose accuracy" */ ++ || Day < 1 || Day > DaysInMonth[(int)--Month]) ++ return -1; ++ ++ for (Julian = Day - 1, i = 0; i < Month; i++) ++ Julian += DaysInMonth[i]; ++ for (i = EPOCH; i < Year; i++) ++ Julian += 365 + (i % 4 == 0); ++ Julian *= SECSPERDAY; ++ Julian += yyTimezone * 60L; ++ if ((tod = ToSeconds(Hours, Minutes, Seconds, Meridian)) < 0) ++ return -1; ++ Julian += tod; ++ if (DSTmode == DSTon ++ || (DSTmode == DSTmaybe && localtime(&Julian)->tm_isdst)) ++ Julian -= 60 * 60; ++ return Julian; ++} ++ ++ ++static time_t DSTcorrect(time_t Start, time_t Future) ++{ ++ time_t StartDay; ++ time_t FutureDay; ++ ++ StartDay = (localtime(&Start)->tm_hour + 1) % 24; ++ FutureDay = (localtime(&Future)->tm_hour + 1) % 24; ++ return (Future - Start) + (StartDay - FutureDay) * 60L * 60L; ++} ++ ++ ++static time_t RelativeDate(time_t Start, time_t DayOrdinal, time_t DayNumber) ++{ ++ struct tm *tm; ++ time_t now; ++ ++ now = Start; ++ tm = localtime(&now); ++ now += SECSPERDAY * ((DayNumber - tm->tm_wday + 7) % 7); ++ now += 7 * SECSPERDAY * (DayOrdinal <= 0 ? DayOrdinal : DayOrdinal - 1); ++ return DSTcorrect(Start, now); ++} ++ ++ ++static time_t RelativeMonth(time_t Start, time_t RelMonth, time_t yyTimezone) ++{ ++ struct tm *tm; ++ time_t Month; ++ time_t Year; ++ ++ if (RelMonth == 0) ++ return 0; ++ tm = localtime(&Start); ++ Month = 12 * tm->tm_year + tm->tm_mon + RelMonth; ++ Year = Month / 12 + 1900; ++ Month = Month % 12 + 1; ++ return DSTcorrect(Start, ++ Convert(Month, (time_t)tm->tm_mday, Year, ++ (time_t)tm->tm_hour, (time_t)tm->tm_min, (time_t)tm->tm_sec, ++ MER24, DSTmaybe, yyTimezone)); ++} ++ ++ ++static void SetPossibleDate(struct Variables * var, ++ time_t possible_day, ++ time_t possible_month, ++ time_t possible_year) ++{ ++ int date_order; ++ ++ if (possible_day > 31) /* test for ymd */ ++ date_order = 2; ++ else if (possible_day > 12) /* test for dmy */ ++ date_order = 1; ++ else if (possible_month > 12) /* test for mdy */ ++ date_order = 0; ++ else ++ date_order = PTimeGetDateOrder(); ++ ++ switch (date_order) { ++ case 0 : ++ var->yyDay = possible_month; ++ var->yyMonth = possible_day; ++ var->yyYear = possible_year; ++ break; ++ case 1 : ++ var->yyDay = possible_day; ++ var->yyMonth = possible_month; ++ var->yyYear = possible_year; ++ break; ++ default : ++ var->yyDay = possible_year; ++ var->yyMonth = possible_month; ++ var->yyYear = possible_day; ++ } ++} ++ ++ ++time_t STDAPICALLTYPE PTimeParse(void * inputStream, struct tm * now, int timezone) ++{ ++ time_t Start; ++ struct Variables var; ++ ++ ++ var.yyInput = inputStream; ++ var.yyYear = now->tm_year + 1900; ++ var.yyMonth = now->tm_mon + 1; ++ var.yyDay = now->tm_mday; ++ var.yyTimezone = -timezone; ++ var.yyDSTmode = DSTmaybe; ++ var.yyHour = 0; ++ var.yyMinutes = 0; ++ var.yySeconds = 0; ++ var.yyMeridian = MER24; ++ var.yyRelSeconds = 0; ++ var.yyRelMonth = 0; ++ var.yyHaveDate = 0; ++ var.yyHaveDay = 0; ++ var.yyHaveRel = 0; ++ var.yyHaveTime = 0; ++ var.yyHaveZone = 0; ++ ++ yyparse(&var); ++ ++ if (var.yyHaveTime > 1 || var.yyHaveZone > 1 || ++ var.yyHaveDate > 1 || var.yyHaveDay > 1) ++ return -1; ++ ++ if (var.yyHaveTime == 0 && var.yyHaveZone == 0 && ++ var.yyHaveDate == 0 && var.yyHaveDay == 0 && var.yyHaveRel == 0) ++ return -1; ++ ++ if (var.yyHaveDate || var.yyHaveTime || var.yyHaveDay) { ++ Start = Convert(var.yyMonth, var.yyDay, var.yyYear, ++ var.yyHour, var.yyMinutes, var.yySeconds, ++ var.yyMeridian, var.yyDSTmode, var.yyTimezone); ++ if (Start < 0) ++ return -1; ++ } ++ else { ++ time(&Start); ++ if (!var.yyHaveRel) ++ Start -= ((now->tm_hour * 60L + now->tm_min) * 60L) + now->tm_sec; ++ } ++ ++ Start += var.yyRelSeconds; ++ Start += RelativeMonth(Start, var.yyRelMonth, var.yyTimezone); ++ ++ if (var.yyHaveDay && !var.yyHaveDate) ++ Start += RelativeDate(Start, var.yyDayOrdinal, var.yyDayNumber); ++ ++ /* Have to do *something* with a legitimate -1 so it's distinguishable ++ * from the error return value. (Alternately could set errno on error.) */ ++ return Start == -1 ? 0 : Start; ++} ++ ++ ++#ifdef _MSC_VER ++#pragma warning(disable:4028 4100 4211) ++#endif ++ ++#ifdef __GNUC__ ++int yyerror(const char * s) ++{ ++ return 0; ++} ++#else ++static void yyerror(const char * s) ++{ ++} ++#endif ++ ++#ifdef _MSC_VER ++#pragma warning(default:4028 4100 4211) ++#endif ++ ++ ++/* End of file ***************************************************************/ diff --git a/pkgs/development/libraries/ptlib/default.nix b/pkgs/development/libraries/ptlib/default.nix index be1e6fdb4a5866b3c0e957772a89e58e9d036bd0..9f9b188322fafa58125652ff1f4e79f10c223297 100644 --- a/pkgs/development/libraries/ptlib/default.nix +++ b/pkgs/development/libraries/ptlib/default.nix @@ -1,50 +1,31 @@ -x@{builderDefsPackage - , autoconf, automake, libtool, doxygen, pkgconfig, bison, flex, unixODBC - , openssl, openldap, cyrus_sasl, krb5, expat, SDL, libdv, libv4l, alsaLib - , ...}: -builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ - []; +{ stdenv, fetchurl, pkgconfig, bison, flex, unixODBC +, openssl, openldap, cyrus_sasl, krb5, expat, SDL, libdv, libv4l, alsaLib }: - buildInputs = map (n: builtins.getAttr n x) - (builtins.attrNames (builtins.removeAttrs x helperArgNames)); - sourceInfo = rec { - baseName="ptlib"; - baseVersion="2.6"; - patchlevel="7"; - version="${baseVersion}.${patchlevel}"; - name="${baseName}-${version}"; - url="mirror://gnome/sources/${baseName}/${baseVersion}/${name}.tar.bz2"; - hash="0zxrygl2ivbciqf97yd9n67ch9vd9gp236w96i6ia8fxzqjq5lkx"; - }; -in -rec { - src = a.fetchurl { - url = sourceInfo.url; - sha256 = sourceInfo.hash; +stdenv.mkDerivation rec { + name = "ptlib-2.10.10"; + + src = fetchurl { + url = "mirror://gnome/sources/ptlib/2.10/${name}.tar.xz"; + sha256 = "7fcaabe194cbd3bc0b370b951dffd19cfe7ea0298bfff6aecee948e97f3207e4"; }; - inherit (sourceInfo) name version; - inherit buildInputs; + buildInputs = [ pkgconfig bison flex unixODBC openssl openldap + cyrus_sasl krb5 expat SDL libdv libv4l alsaLib ]; - /* doConfigure should be removed if not needed */ - phaseNames = ["doConfigure" "doMakeInstall"]; + enableParallelBuilding = true; + + patches = [ ./bison.patch ]; - meta = { + meta = with stdenv.lib; { description = "Portable Tools from OPAL VoIP"; - maintainers = with a.lib.maintainers; - [ - raskin - ]; - platforms = with a.lib.platforms; - linux; + maintainers = [ maintainers.raskin ]; + platforms = platforms.linux; }; + passthru = { updateInfo = { downloadPage = "http://ftp.gnome.org/sources/ptlib/"; }; }; -}) x +} diff --git a/pkgs/development/libraries/qt-3/default.nix b/pkgs/development/libraries/qt-3/default.nix index 9b5cb0452d617a71da8aae402801571a96d2bbab..432b4358f7acabb07dcc694b8e78a381fca5d56a 100644 --- a/pkgs/development/libraries/qt-3/default.nix +++ b/pkgs/development/libraries/qt-3/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ which ]; - propagatedBuildInputs = [x11 libXft libXrender zlib libjpeg libpng]; + propagatedBuildInputs = [libpng x11 libXft libXrender zlib libjpeg]; configureFlags = " -v diff --git a/pkgs/development/libraries/qt-5/default.nix b/pkgs/development/libraries/qt-5/default.nix index d33c7e0329feafc5edac5aa53deca187dde66d78..fe290fd69fcf865e297e6542d6abfcb4cc1c277d 100644 --- a/pkgs/development/libraries/qt-5/default.nix +++ b/pkgs/development/libraries/qt-5/default.nix @@ -38,13 +38,16 @@ stdenv.mkDerivation rec { substituteInPlace configure --replace /bin/pwd pwd substituteInPlace qtbase/configure --replace /bin/pwd pwd substituteInPlace qtbase/src/corelib/global/global.pri --replace /bin/ls ${coreutils}/bin/ls + substituteInPlace qtbase/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp \ + --replace /usr/share/X11/locale ${libX11}/share/X11/locale \ + --replace /usr/lib/X11/locale ${libX11}/share/X11/locale sed -e 's@/\(usr\|opt\)/@/var/empty/@g' -i config.tests/*/*.test -i qtbase/mkspecs/*/*.conf ''; patches = [ ./glib-2.32.patch (substituteAll { - src = ./dlopen-absolute-paths.patch; + src = ./qt-5.2-dlopen-absolute-paths.patch; inherit cups icu libXfixes; glibc = stdenv.gcc.libc; openglDriver = if mesaSupported then mesa.driverLink else "/no-such-path"; diff --git a/pkgs/development/libraries/qt-5/dlopen-absolute-paths.patch b/pkgs/development/libraries/qt-5/qt-5.2-dlopen-absolute-paths.patch similarity index 100% rename from pkgs/development/libraries/qt-5/dlopen-absolute-paths.patch rename to pkgs/development/libraries/qt-5/qt-5.2-dlopen-absolute-paths.patch diff --git a/pkgs/development/libraries/qt-5/qt-5.3-dlopen-absolute-paths.patch b/pkgs/development/libraries/qt-5/qt-5.3-dlopen-absolute-paths.patch new file mode 100644 index 0000000000000000000000000000000000000000..66cf342c10768ceab7a077bd78598578e2e69c67 --- /dev/null +++ b/pkgs/development/libraries/qt-5/qt-5.3-dlopen-absolute-paths.patch @@ -0,0 +1,24 @@ +diff -ruN qt-everywhere-opensource-src-5.1.1-orig/qtbase/src/network/kernel/qhostinfo_unix.cpp qt-everywhere-opensource-src-5.1.1/qtbase/src/network/kernel/qhostinfo_unix.cpp +--- qt-everywhere-opensource-src-5.1.1-orig/qtbase/src/network/kernel/qhostinfo_unix.cpp 2013-08-25 20:03:35.000000000 +0200 ++++ qt-everywhere-opensource-src-5.1.1/qtbase/src/network/kernel/qhostinfo_unix.cpp 2013-09-25 17:43:14.047015411 +0200 +@@ -103,7 +103,7 @@ + if (!lib.load()) + #endif + { +- lib.setFileName(QLatin1String("resolv")); ++ lib.setFileName(QLatin1String("@glibc@/lib/libresolv")); + if (!lib.load()) + return; + } +diff -ruN qt-everywhere-opensource-src-5.1.1-orig/qtbase/src/plugins/platforms/xcb/qglxintegration.cpp qt-everywhere-opensource-src-5.1.1/qtbase/src/plugins/platforms/xcb/qglxintegration.cpp +--- qt-everywhere-opensource-src-5.1.1-orig/qtbase/src/plugins/platforms/xcb/qglxintegration.cpp 2013-08-25 20:03:35.000000000 +0200 ++++ qt-everywhere-opensource-src-5.1.1/qtbase/src/plugins/platforms/xcb/qglxintegration.cpp 2013-09-25 17:51:29.834674976 +0200 +@@ -379,7 +379,7 @@ + { + extern const QString qt_gl_library_name(); + // QLibrary lib(qt_gl_library_name()); +- QLibrary lib(QLatin1String("GL")); ++ QLibrary lib(QLatin1String("@openglDriver@/lib/libGL")); + glXGetProcAddressARB = (qt_glXGetProcAddressARB) lib.resolve("glXGetProcAddressARB"); + } + } diff --git a/pkgs/development/libraries/qt-5/qt-5.3.nix b/pkgs/development/libraries/qt-5/qt-5.3.nix new file mode 100644 index 0000000000000000000000000000000000000000..1722a1e52a19087efe1e0f83b47cf875d74886d3 --- /dev/null +++ b/pkgs/development/libraries/qt-5/qt-5.3.nix @@ -0,0 +1,165 @@ +{ stdenv, fetchurl, substituteAll, libXrender, libXext +, libXfixes, freetype, fontconfig, zlib, libjpeg, libpng +, mesaSupported, mesa, mesa_glu, openssl, dbus, cups, pkgconfig +, libtiff, glib, icu, mysql, postgresql, sqlite, perl, coreutils, libXi +, gdk_pixbuf, python, gdb, xlibs, libX11, libxcb, xcbutil, xcbutilimage +, xcbutilkeysyms, xcbutilwm,udev, libxml2, libxslt, pcre, libxkbcommon +, alsaLib, gstreamer, gst_plugins_base +, pulseaudio, bison, flex, gperf, ruby, libwebp +, flashplayerFix ? false +, gtkStyle ? false, libgnomeui, gtk, GConf, gnome_vfs +, buildDocs ? false +, buildExamples ? false +, buildTests ? false +, developerBuild ? false +}: + +with stdenv.lib; + +let + v_maj = "5.3"; + v_min = "0"; + ver = "${v_maj}.${v_min}"; +in + +stdenv.mkDerivation rec { + name = "qt-${ver}"; + + src = fetchurl { + url = "http://download.qt-project.org/official_releases/qt/" + + "${v_maj}/${ver}/single/qt-everywhere-opensource-src-${ver}.tar.gz"; + sha256 = "09gp19377zpqyfzk063b3pjz8gjm2x7xsj71bdpmnhs1scz0khcj"; + }; + + # The version property must be kept because it will be included into the QtSDK package name + version = ver; + + prePatch = '' + substituteInPlace configure --replace /bin/pwd pwd + substituteInPlace qtbase/configure --replace /bin/pwd pwd + substituteInPlace qtbase/src/corelib/global/global.pri --replace /bin/ls ${coreutils}/bin/ls + substituteInPlace qtbase/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp \ + --replace /usr/share/X11/locale ${libX11}/share/X11/locale \ + --replace /usr/lib/X11/locale ${libX11}/share/X11/locale + sed -e 's@/\(usr\|opt\)/@/var/empty/@g' -i config.tests/*/*.test -i qtbase/mkspecs/*/*.conf + ''; + + patches = + [ ./glib-2.32.patch + (substituteAll { + src = ./qt-5.3-dlopen-absolute-paths.patch; + inherit cups icu libXfixes; + glibc = stdenv.gcc.libc; + openglDriver = if mesaSupported then mesa.driverLink else "/no-such-path"; + }) + ] ++ optional gtkStyle (substituteAll { + src = ./dlopen-gtkstyle.patch; + # substituteAll ignores env vars starting with capital letter + gconf = GConf; + inherit gnome_vfs libgnomeui gtk; + }) + ++ optional flashplayerFix (substituteAll { + src = ./dlopen-webkit-nsplugin.patch; + inherit gtk gdk_pixbuf; + }); + + preConfigure = '' + export LD_LIBRARY_PATH="$PWD/qtbase/lib:$PWD/qtbase/plugins/platforms:$PWD/qttools/lib:$LD_LIBRARY_PATH" + export MAKEFLAGS=-j$NIX_BUILD_CORES + ''; + + prefixKey = "-prefix "; + + # -no-eglfs, -no-directfb, -no-linuxfb and -no-kms because of the current minimalist mesa + # TODO Remove obsolete and useless flags once the build will be totally mastered + configureFlags = '' + -verbose + -confirm-license + -opensource + + -release + -shared + -c++11 + ${optionalString developerBuild "-developer-build"} + -largefile + -accessibility + -rpath + -optimized-qmake + -strip + -reduce-relocations + -system-proxies + + -gui + -widgets + -opengl desktop + -qml-debug + -nis + -iconv + -icu + -pch + -glib + -xcb + -qpa xcb + -${optionalString (cups == null) "no-"}cups + + -no-eglfs + -no-directfb + -no-linuxfb + -no-kms + + -system-zlib + -system-libpng + -system-libjpeg + -system-xcb + -system-xkbcommon + -openssl-linked + -dbus-linked + + -system-sqlite + -${if mysql != null then "plugin" else "no"}-sql-mysql + -${if postgresql != null then "plugin" else "no"}-sql-psql + + -make libs + -make tools + -${optionalString (buildExamples == false) "no"}make examples + -${optionalString (buildTests == false) "no"}make tests + ''; + + propagatedBuildInputs = [ + xlibs.libXcomposite libX11 libxcb libXext libXrender libXi + fontconfig freetype openssl dbus.libs glib udev libxml2 libxslt pcre + zlib libjpeg libpng libtiff sqlite icu + libwebp alsaLib gstreamer gst_plugins_base pulseaudio + xcbutil xcbutilimage xcbutilkeysyms xcbutilwm libxkbcommon + ] + # Qt doesn't directly need GLU (just GL), but many apps use, it's small and + # doesn't remain a runtime-dep if not used + ++ optionals mesaSupported [ mesa mesa_glu ] + ++ optional (cups != null) cups + ++ optional (mysql != null) mysql + ++ optional (postgresql != null) postgresql; + + buildInputs = [ gdb bison flex gperf ruby ]; + + nativeBuildInputs = [ python perl pkgconfig ]; + + postInstall = + '' + ${optionalString buildDocs '' + make docs && make install_docs + ''} + + # Don't retain build-time dependencies like gdb and ruby. + sed '/QMAKE_DEFAULT_.*DIRS/ d' -i $out/mkspecs/qconfig.pri + ''; + + enableParallelBuilding = true; # often fails on Hydra, as well as qt4 + + meta = { + homepage = http://qt-project.org; + description = "A cross-platform application framework for C++"; + license = "GPL/LGPL"; + maintainers = [ maintainers.bbenoist maintainers.qknight ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/rabbitmq-java-client/default.nix b/pkgs/development/libraries/rabbitmq-java-client/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..2183aa83e20e035cba0d0f6e09a727db48657368 --- /dev/null +++ b/pkgs/development/libraries/rabbitmq-java-client/default.nix @@ -0,0 +1,30 @@ +{ fetchurl, stdenv, ant, jdk, jre, python, makeWrapper }: + +stdenv.mkDerivation rec { + name = "rabbitmq-java-client-3.3.4"; + + src = fetchurl { + url = "http://www.rabbitmq.com/releases/rabbitmq-java-client/v3.3.4/rabbitmq-java-client-3.3.4.tar.gz"; + sha256 = "03kspkgzzjsbq6f8yl2zj5m30qwgxv3l58hrbf6gcgxb5rpfk6sh"; + }; + + buildInputs = [ ant jdk python makeWrapper ]; + + buildPhase = "ant dist"; + + installPhase = '' + mkdir -p $out/bin $out/share/java + cp build/lib/*.jar lib/*.jar $out/share/java + + # There is a script in the source archive, but ours is cleaner + makeWrapper ${jre}/bin/java $out/bin/PerfTest \ + --add-flags "-Djava.awt.headless=true -cp $out/share/java/\* com.rabbitmq.examples.PerfTest" + ''; + + meta = with stdenv.lib; { + description = "RabbitMQ Java client library which allows Java code to interface to AMQP servers"; + homepage = http://www.rabbitmq.com/java-client.html; + license = [ "MPLv1.1" "GPLv2" ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/readline/no-arch_only-6.3.patch b/pkgs/development/libraries/readline/no-arch_only-6.3.patch new file mode 100644 index 0000000000000000000000000000000000000000..7c46dbad962a22ec4ef99fc00d13c709ea626dbb --- /dev/null +++ b/pkgs/development/libraries/readline/no-arch_only-6.3.patch @@ -0,0 +1,13 @@ +diff -ru -x '*~' readline-6.3-orig/support/shobj-conf readline-6.3/support/shobj-conf +--- support/shobj-conf 2014-02-24 03:06:29.000000000 +0100 ++++ support/shobj-conf 2014-07-22 11:18:52.000000000 +0200 +@@ -194,9 +194,6 @@ + # Darwin 8 == Mac OS X 10.4; Mac OS X 10.N == Darwin N+4 + *) + case "${host_os}" in +- darwin[89]*|darwin1[012]*) +- SHOBJ_ARCHFLAGS='-arch_only `/usr/bin/arch`' +- ;; + *) # Mac OS X 10.9 (Mavericks) and later + SHOBJ_ARCHFLAGS= + # for 32 and 64bit universal library diff --git a/pkgs/development/libraries/readline/no-arch_only.patch b/pkgs/development/libraries/readline/no-arch_only.patch new file mode 100644 index 0000000000000000000000000000000000000000..b23eab5d9d73cee962c00db0604da732328546ab --- /dev/null +++ b/pkgs/development/libraries/readline/no-arch_only.patch @@ -0,0 +1,14 @@ +diff -ru -x '*~' readline-6.2-orig/support/shobj-conf readline-6.2/support/shobj-conf +--- support/shobj-conf 2009-10-28 14:20:21.000000000 +0100 ++++ support/shobj-conf 2014-07-01 13:03:28.000000000 +0200 +@@ -168,8 +168,8 @@ + SHLIB_LIBVERSION='$(SHLIB_MAJOR)$(SHLIB_MINOR).$(SHLIB_LIBSUFF)' + SHLIB_LIBSUFF='dylib' + +- SHOBJ_LDFLAGS='-dynamiclib -dynamic -undefined dynamic_lookup -arch_only `/usr/bin/arch`' +- SHLIB_XLDFLAGS='-dynamiclib -arch_only `/usr/bin/arch` -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v' ++ SHOBJ_LDFLAGS='-dynamiclib -dynamic -undefined dynamic_lookup' ++ SHLIB_XLDFLAGS='-dynamiclib -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v' + + SHLIB_LIBS='-lncurses' # see if -lcurses works on MacOS X 10.1 + ;; diff --git a/pkgs/development/libraries/readline/readline6.3.nix b/pkgs/development/libraries/readline/readline6.3.nix index 2f99b9d7218336b0bf873e74f8704d68ff975a68..9f5c9f7b581327ae7ca24dc9524a2d6bf91d11d4 100644 --- a/pkgs/development/libraries/readline/readline6.3.nix +++ b/pkgs/development/libraries/readline/readline6.3.nix @@ -13,7 +13,9 @@ stdenv.mkDerivation (rec { patchFlags = "-p0"; patches = - [ ./link-against-ncurses.patch ]; + [ ./link-against-ncurses.patch + ./no-arch_only-6.3.patch + ]; meta = { description = "GNU Readline, a library for interactive line editing"; @@ -35,7 +37,7 @@ stdenv.mkDerivation (rec { homepage = http://savannah.gnu.org/projects/readline/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; }; diff --git a/pkgs/development/libraries/readline/readline6.nix b/pkgs/development/libraries/readline/readline6.nix index 0826e6c5f7cb1538b78b5a06d1f2063cfc4e3e24..0559113285c458f41a4f5e2896a4888af09c1a90 100644 --- a/pkgs/development/libraries/readline/readline6.nix +++ b/pkgs/development/libraries/readline/readline6.nix @@ -12,7 +12,9 @@ stdenv.mkDerivation (rec { patchFlags = "-p0"; patches = - [ ./link-against-ncurses.patch ] + [ ./link-against-ncurses.patch + ./no-arch_only.patch + ] ++ (let patch = nr: sha256: @@ -43,7 +45,7 @@ stdenv.mkDerivation (rec { homepage = http://savannah.gnu.org/projects/readline/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; }; diff --git a/pkgs/development/libraries/science/biology/biolib/default.nix b/pkgs/development/libraries/science/biology/biolib/default.nix index 4e4c3c5536160ba18a3d3e77afad3f32cc506677..0461e5ebcf543e698e2106ecbaa19abe1af537e6 100644 --- a/pkgs/development/libraries/science/biology/biolib/default.nix +++ b/pkgs/development/libraries/science/biology/biolib/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://biolib.open-bio.org/"; description = "BioLib"; - license = "GPL2"; + license = stdenv.lib.licenses.gpl2; longDescription = '' BioLib brings together a set of opensource libraries written in C/C++ and makes them available for major Bio* languages: diff --git a/pkgs/development/libraries/science/math/arpack/default.nix b/pkgs/development/libraries/science/math/arpack/default.nix index cd56287f6ca0d5a9815d8221bdee87c7d4263fb9..71f9ef2a2b6b4dd9e0837880a9704f03787e6d62 100644 --- a/pkgs/development/libraries/science/math/arpack/default.nix +++ b/pkgs/development/libraries/science/math/arpack/default.nix @@ -23,7 +23,9 @@ stdenv.mkDerivation { meta = { homepage = "http://forge.scilab.org/index.php/p/arpack-ng/"; description = "A collection of Fortran77 subroutines to solve large scale eigenvalue problems"; - platforms = stdenv.lib.platforms.all; + # Looks like OpenBLAS is not that easy to build + # there is a sgemm_itcopy undefined reference on 32-bit, for example + platforms = ["x86_64-linux"]; license = stdenv.lib.licenses.bsd3; maintainers = [ stdenv.lib.maintainers.ttuegel ]; }; diff --git a/pkgs/development/libraries/science/math/liblbfgs/default.nix b/pkgs/development/libraries/science/math/liblbfgs/default.nix index 63de26ee90c9e28122d6ca08fd5a5258edf215db..bb33eed61421dbf80243eda4d4eb92cecf069f49 100644 --- a/pkgs/development/libraries/science/math/liblbfgs/default.nix +++ b/pkgs/development/libraries/science/math/liblbfgs/default.nix @@ -11,6 +11,6 @@ stdenv.mkDerivation { meta = { description = "Library of Limited-memory Broyden-Fletcher-Goldfarb-Shanno (L-BFGS)"; homepage = http://www.chokkan.org/software/liblbfgs/; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix index 5ceedd674f533b8f416bcd614c7b69cfe3bee15e..6ea7333f6986e40cbdc954fc6c42797ad0b897d1 100644 --- a/pkgs/development/libraries/science/math/openblas/default.nix +++ b/pkgs/development/libraries/science/math/openblas/default.nix @@ -32,5 +32,6 @@ stdenv.mkDerivation rec { description = "Basic Linear Algebra Subprograms"; license = stdenv.lib.licenses.bsd3; homepage = "https://github.com/xianyi/OpenBLAS"; + platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/development/libraries/serf/default.nix b/pkgs/development/libraries/serf/default.nix index b511a841d1900991c3dfd55a5039d5b1858e59ce..409b5db01049bab903bcdc74816d74bf6f977794 100644 --- a/pkgs/development/libraries/serf/default.nix +++ b/pkgs/development/libraries/serf/default.nix @@ -1,25 +1,15 @@ -{stdenv, fetchurl, apr, scons, openssl, aprutil, zlib, krb5, pkgconfig}: -let - s = # Generated upstream information - rec { - baseName="serf"; - version="1.3.3"; - name="${baseName}-${version}"; - hash="0axdz1bbdrgvrsqmy1j0kx54y1hhhs6xmc1j7jz4fqr9fr0y1sh2"; - url="https://serf.googlecode.com/files/serf-1.3.3.tar.bz2"; - sha256="0axdz1bbdrgvrsqmy1j0kx54y1hhhs6xmc1j7jz4fqr9fr0y1sh2"; - }; - buildInputs = [ - apr scons openssl aprutil zlib krb5 pkgconfig - ]; -in -stdenv.mkDerivation { - inherit (s) name version; - inherit buildInputs; +{ stdenv, fetchurl, apr, scons, openssl, aprutil, zlib, krb5, pkgconfig }: + +stdenv.mkDerivation rec { + name = "serf-1.3.6"; + src = fetchurl { - inherit (s) url sha256; + url = "http://serf.googlecode.com/svn/src_releases/${name}.tar.bz2"; + sha256 = "1wk3cplazs8jznjc9ylpd63rrk9k2y05xa7zqx7psycr0gmpnqya"; }; + buildInputs = [ apr scons openssl aprutil zlib krb5 pkgconfig ]; + configurePhase = '' sed -e '/^env[.]Append(BUILDERS/ienv.Append(ENV={"PATH":os.environ["PATH"]})' -i SConstruct sed -e '/^env[.]Append(BUILDERS/ienv.Append(ENV={"NIX_CFLAGS_COMPILE":os.environ["NIX_CFLAGS_COMPILE"]})' -i SConstruct @@ -36,7 +26,6 @@ stdenv.mkDerivation { ''; meta = { - inherit (s) version; description = "HTTP client library based on APR"; license = stdenv.lib.licenses.asl20 ; maintainers = [stdenv.lib.maintainers.raskin]; diff --git a/pkgs/development/libraries/serf/default.upstream b/pkgs/development/libraries/serf/default.upstream deleted file mode 100644 index a081905759e24c39db7cb22068522440a59cdc6a..0000000000000000000000000000000000000000 --- a/pkgs/development/libraries/serf/default.upstream +++ /dev/null @@ -1,3 +0,0 @@ -url https://code.google.com/p/serf/downloads/list -version_link '[.]tar[.][a-z0-9]+$' -process 'code[.]google[.]com//' '' diff --git a/pkgs/development/libraries/smpeg/default.nix b/pkgs/development/libraries/smpeg/default.nix index 41a6b8501eca3cc3052c7cf01f47480f79924a7d..30c1f4937ecfe22b13e6e7fa353fd156a26b7046 100644 --- a/pkgs/development/libraries/smpeg/default.nix +++ b/pkgs/development/libraries/smpeg/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://icculus.org/smpeg/; description = "MPEG decoding library"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/development/libraries/snack/default.nix b/pkgs/development/libraries/snack/default.nix index 4e1187aa0f762d1531ceb9aa2b2ba1915c966f28..d7a0b11a8dabad09b1fec22c4df65ddb587f578f 100644 --- a/pkgs/development/libraries/snack/default.nix +++ b/pkgs/development/libraries/snack/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation { meta = { description = "The Snack Sound Toolkit (Tcl)"; homepage = http://www.speech.kth.se/snack/; - license = "GPL-2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/development/libraries/sodium/default.nix b/pkgs/development/libraries/sodium/default.nix index 93f2ff0de6b6df20b561436c4fb905e9bbc01f9a..be52725f2c8facdfaf24c50082041ecdf0ca61c0 100644 --- a/pkgs/development/libraries/sodium/default.nix +++ b/pkgs/development/libraries/sodium/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="sodium"; - version="0.5.0"; + version="0.6.1"; name="${baseName}-${version}"; - hash="1w7rrnsvhhzhywrr3nhlhppv4kqzdszz3dwy8jrsv8lrj5hs181w"; - url="http://download.dnscrypt.org/libsodium/releases/libsodium-0.5.0.tar.gz"; - sha256="1w7rrnsvhhzhywrr3nhlhppv4kqzdszz3dwy8jrsv8lrj5hs181w"; + hash="151nril3kzkpmy6khvqphk4zk15ri0dqv0isyyhz6n9nsbmzxk04"; + url="http://download.dnscrypt.org/libsodium/releases/libsodium-0.6.1.tar.gz"; + sha256="151nril3kzkpmy6khvqphk4zk15ri0dqv0isyyhz6n9nsbmzxk04"; }; buildInputs = [ ]; diff --git a/pkgs/development/libraries/soqt/default.nix b/pkgs/development/libraries/soqt/default.nix index 7d655ae122a099d8ceeaf3136b8c2ec0c52e0ca6..fdad4e21b0b683a3e419e4dca0993431b712ba5a 100644 --- a/pkgs/development/libraries/soqt/default.nix +++ b/pkgs/development/libraries/soqt/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.coin3d.org/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; description = "Glue between Coin high-level 3D visualization library and Qt"; maintainers = [ stdenv.lib.maintainers.viric ]; diff --git a/pkgs/development/libraries/speech-tools/default.nix b/pkgs/development/libraries/speech-tools/default.nix index 8874a672ead0b219886f1401d4baa4fd508f5132..48168ceb92ddcc7741b597de23a79533a878ccf7 100644 --- a/pkgs/development/libraries/speech-tools/default.nix +++ b/pkgs/development/libraries/speech-tools/default.nix @@ -47,6 +47,7 @@ rec { fixPaths = a.doPatchShebangs "$out/bin"; meta = { + broken = true; description = "Text-to-speech engine"; maintainers = with a.lib.maintainers; [ diff --git a/pkgs/development/libraries/speechd/default.nix b/pkgs/development/libraries/speechd/default.nix index 0e542b353f674eed26d8695cb186a540f18b57cb..5104532ea91e2aaa8233786108de8fca3bb52b6f 100644 --- a/pkgs/development/libraries/speechd/default.nix +++ b/pkgs/development/libraries/speechd/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { description = "Common interface to speech synthesis"; homepage = http://www.freebsoft.org/speechd; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/development/libraries/sword/default.nix b/pkgs/development/libraries/sword/default.nix index e6769285fc8128b21adb1dbf918cf7d3a17e70ed..28afdf85dfbcee14d7558c7e8fbc33a0d176655d 100644 --- a/pkgs/development/libraries/sword/default.nix +++ b/pkgs/development/libraries/sword/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { description = "A software framework that allows research manipulation of Biblical texts"; homepage = http://www.crosswire.org/sword/; platforms = stdenv.lib.platforms.linux; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.piotr stdenv.lib.maintainers.AndersonTorres ]; }; diff --git a/pkgs/development/libraries/talloc/default.nix b/pkgs/development/libraries/talloc/default.nix index 54db07d0de82e3f1477abb6f6ea0b1b8d9bb22d1..e04363326d01023add3a5ecf7813f9643dfae6cf 100644 --- a/pkgs/development/libraries/talloc/default.nix +++ b/pkgs/development/libraries/talloc/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "talloc is a hierarchical pool based memory allocator with destructors"; homepage = http://tdb.samba.org/; - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/libraries/tbb/default.nix b/pkgs/development/libraries/tbb/default.nix index b06dffa1202daddee778eead4154ca70f32a45b5..cb34edb4762d134830d5c3e091d200a7e48c4070 100644 --- a/pkgs/development/libraries/tbb/default.nix +++ b/pkgs/development/libraries/tbb/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = { description = "Intel Thread Building Blocks C++ Library"; homepage = "http://threadingbuildingblocks.org/"; - license = "LGPLv3+"; + license = stdenv.lib.licenses.lgpl3Plus; longDescription = '' Intel Threading Building Blocks offers a rich and complete approach to expressing parallelism in a C++ program. It is a library that helps you diff --git a/pkgs/development/libraries/tdb/default.nix b/pkgs/development/libraries/tdb/default.nix index 02a1008cda5d8e17ef3ce2aca568aacac25a449c..d0eb8987ea0896c5264447164cbe7a9b76d970a5 100644 --- a/pkgs/development/libraries/tdb/default.nix +++ b/pkgs/development/libraries/tdb/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; homepage = http://tdb.samba.org/; - license = "LGPLv3+"; + license = stdenv.lib.licenses.lgpl3Plus; maintainers = [ ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/telepathy/qt/cmake-2.8.12.diff b/pkgs/development/libraries/telepathy/qt/cmake-2.8.12.diff deleted file mode 100644 index f6e57c626c3049bdcb814071e1037b30aadf6954..0000000000000000000000000000000000000000 --- a/pkgs/development/libraries/telepathy/qt/cmake-2.8.12.diff +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/cmake/modules/FindQt.cmake b/cmake/modules/FindQt.cmake -index c2eac76..b3131f0 100644 ---- a/cmake/modules/FindQt.cmake -+++ b/cmake/modules/FindQt.cmake -@@ -74,10 +74,18 @@ ENDMACRO(QT_GET_MOC_FLAGS) - - MACRO(QT_CREATE_MOC_COMMAND infile outfile moc_flags moc_options) - IF(QT_VERSION_MAJOR MATCHES 4) -- QT4_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}") -+ IF(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607) -+ QT4_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}" "") -+ ELSE(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607) -+ QT4_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}") -+ ENDIF(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607) - ELSE(QT_VERSION_MAJOR MATCHES 4) - IF(QT_VERSION_MAJOR MATCHES 5) -- QT5_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}") -+ IF(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607) -+ QT5_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}" "") -+ ELSE(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607) -+ QT5_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}") -+ ENDIF(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607) - ENDIF(QT_VERSION_MAJOR MATCHES 5) - ENDIF(QT_VERSION_MAJOR MATCHES 4) - ENDMACRO(QT_CREATE_MOC_COMMAND) diff --git a/pkgs/development/libraries/telepathy/qt/default.nix b/pkgs/development/libraries/telepathy/qt/default.nix index f2e0d19456202c87bbe372877dc6d868b2aa04f8..4ec8c4befc69ed9492227e604b85a4056f1888ce 100644 --- a/pkgs/development/libraries/telepathy/qt/default.nix +++ b/pkgs/development/libraries/telepathy/qt/default.nix @@ -1,18 +1,25 @@ -{ stdenv, fetchurl, cmake, qt4, pkgconfig, python, libxslt, dbus_glib +{ stdenv, fetchurl, cmake, qt4, pkgconfig, python, libxslt, dbus_glib, dbus_daemon , telepathy_farstream, telepathy_glib, pythonDBus }: stdenv.mkDerivation rec { - name = "telepathy-qt-0.9.3"; + name = "telepathy-qt-0.9.4"; src = fetchurl { url = "http://telepathy.freedesktop.org/releases/telepathy-qt/${name}.tar.gz"; - sha256 = "1yabyhsikw828ns7cf6hvzbxdxh53na1ck0q7qsav1lvlyz5gzy0"; + sha256 = "1wk13rwpas1crj19xsbgl1c4qzri616xxa1hyhnykv4nkwxdpcgi"; }; + patches = [ ./farstream-0.2.diff ]; + nativeBuildInputs = [ cmake pkgconfig python libxslt ]; propagatedBuildInputs = [ qt4 dbus_glib telepathy_farstream telepathy_glib pythonDBus ]; - patches = [ ./cmake-2.8.12.diff ./farstream-0.2.diff ]; + + buildInputs = stdenv.lib.optional doCheck dbus_daemon; + preBuild = '' NIX_CFLAGS_COMPILE+=" `pkg-config --cflags dbus-glib-1`" ''; + + enableParallelBuilding = true; + doCheck = false; # giving up for now } diff --git a/pkgs/development/libraries/tokyo-cabinet/default.nix b/pkgs/development/libraries/tokyo-cabinet/default.nix index 82ce734d17358eebf49332c7cefca8d9fa7d6231..7741549666adf0cbfd141af9e2617e0bf8d3d461 100644 --- a/pkgs/development/libraries/tokyo-cabinet/default.nix +++ b/pkgs/development/libraries/tokyo-cabinet/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { robustness, supports 64-bit architecture. ''; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/tokyo-tyrant/default.nix b/pkgs/development/libraries/tokyo-tyrant/default.nix index ee742487e263aa3c07be2aba806a9c68430fbbf5..ccd619e8bc18f3e0c3383cf63af70d12184c1d9c 100644 --- a/pkgs/development/libraries/tokyo-tyrant/default.nix +++ b/pkgs/development/libraries/tokyo-tyrant/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { homepage = http://fallabs.com/tokyotyrant/; - license = "LGPLv2.1+"; + license = stdenv.lib.licenses.lgpl21Plus; platforms = stdenv.lib.platforms.gnu; # arbitrary choice maintainers = [ ]; diff --git a/pkgs/development/libraries/tsocks/default.nix b/pkgs/development/libraries/tsocks/default.nix index a0d607517ac3ba8bcce0415069e32fc402e7284e..bdc2b4da6e3eb27251e610a26b6ffe6771b65836 100644 --- a/pkgs/development/libraries/tsocks/default.nix +++ b/pkgs/development/libraries/tsocks/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Transparent SOCKS v4 proxying library"; homepage = http://tsocks.sourceforge.net/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ maintainers.phreedom ]; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/ucl/default.nix b/pkgs/development/libraries/ucl/default.nix index cef853698a8e24cb900f67edb7ed78339beb0088..05acc6f530859e48196feb9ff6add3bbfc10265d 100644 --- a/pkgs/development/libraries/ucl/default.nix +++ b/pkgs/development/libraries/ucl/default.nix @@ -10,6 +10,6 @@ stdenv.mkDerivation { meta = { homepage = http://www.oberhumer.com/opensource/ucl/; description = "Portable lossless data compression library"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/development/libraries/ucommon/default.nix b/pkgs/development/libraries/ucommon/default.nix index 2ec478d7a76c7a09b73c3dad5922145f738959c4..f3ac325b5a12606da7137db647638575e8d89669 100644 --- a/pkgs/development/libraries/ucommon/default.nix +++ b/pkgs/development/libraries/ucommon/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "GNU uCommon C++, C++ library to facilitate using C++ design patterns"; homepage = http://www.gnu.org/software/commoncpp/; - license = "LGPLv3+"; + license = stdenv.lib.licenses.lgpl3Plus; maintainers = with stdenv.lib.maintainers; [ viric ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/unixODBCDrivers/default.nix b/pkgs/development/libraries/unixODBCDrivers/default.nix index 11dc34176f533b44bfad30c5f38d3239b4136376..03769815a3e2551c997d070a942b33dc31ea2e5a 100644 --- a/pkgs/development/libraries/unixODBCDrivers/default.nix +++ b/pkgs/development/libraries/unixODBCDrivers/default.nix @@ -23,7 +23,7 @@ args : with args; meta = { description = "unix odbc driver for postgresql"; homepage = https://projects.commandprompt.com/public/odbcng; - license = "GPL2"; + license = stdenv.lib.licenses.gpl2; }; }; ini = ""; diff --git a/pkgs/development/libraries/vaapi-intel/default.nix b/pkgs/development/libraries/vaapi-intel/default.nix index f05c01bf58df90150ef709cc357e912943bb229d..2c553aeded3299099257cd6557c65d876c332cca 100644 --- a/pkgs/development/libraries/vaapi-intel/default.nix +++ b/pkgs/development/libraries/vaapi-intel/default.nix @@ -1,23 +1,27 @@ -{ stdenv, fetchurl, autoconf, automake, libtool, mesa, libva, libdrm, libX11, pkgconfig -, intelgen4asm }: +{ stdenv, fetchurl, pkgconfig, libdrm, libva, libX11, intel-gpu-tools, mesa_noglu, wayland, python, gnum4 }: stdenv.mkDerivation rec { - name = "libva-intel-driver-1.0.20"; + name = "libva-intel-driver-1.3.2"; src = fetchurl { url = "http://www.freedesktop.org/software/vaapi/releases/libva-intel-driver/${name}.tar.bz2"; - sha256 = "1jfl8909j3a3in6m8b5bx3dn7pzr8a1sw3sk4vzm7h3j2dkgpzhj"; + sha256 = "1l8897plk74zcik6snk7hb5s4ga0d2vypccfkh0bp1fb2775dn8i"; }; - buildInputs = [ pkgconfig libdrm libva libX11 ]; + prePatch = '' + sed -i 's,#!/usr/bin/env python,#!${python}/bin/python,' src/shaders/gpp.py + ''; + + buildInputs = [ pkgconfig libdrm libva libX11 intel-gpu-tools mesa_noglu wayland gnum4 ]; preConfigure = '' sed -i -e "s,LIBVA_DRIVERS_PATH=.*,LIBVA_DRIVERS_PATH=$out/lib/dri," configure ''; - meta = { + meta = with stdenv.lib; { homepage = http://cgit.freedesktop.org/vaapi/intel-driver/; - license = "MIT"; + license = licenses.mit; description = "Intel driver for the VAAPI library"; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/vaapi-vdpau/default.nix b/pkgs/development/libraries/vaapi-vdpau/default.nix index 9a81b840b35d8f6f2e92a446853a53ad96eaa837..9b28d0016ddbf42b53d5e9f988eed94936e7a60d 100644 --- a/pkgs/development/libraries/vaapi-vdpau/default.nix +++ b/pkgs/development/libraries/vaapi-vdpau/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://cgit.freedesktop.org/vaapi/vdpau-driver/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; description = "VDPAU driver for the VAAPI library"; }; } diff --git a/pkgs/development/libraries/vigra/default.nix b/pkgs/development/libraries/vigra/default.nix index 97251e15c49718e149a2de1e859f212972a71305..04bef5ef41c306ff5c86b6851097ec555cbe9d24 100644 --- a/pkgs/development/libraries/vigra/default.nix +++ b/pkgs/development/libraries/vigra/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { description = "Novel computer vision C++ library with customizable algorithms and data structures"; homepage = http://hci.iwr.uni-heidelberg.de/vigra; - license = "MIT"; + license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/development/libraries/vmime/default.nix b/pkgs/development/libraries/vmime/default.nix index c92df5a8bcb4e7d36ea4961cc50cfc5d2a6ab20d..846fc64a91e4b5572327bcfd82a16863e9176b49 100644 --- a/pkgs/development/libraries/vmime/default.nix +++ b/pkgs/development/libraries/vmime/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = { homepage = http://www.vmime.org/; description = "Free mail library for C++"; - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix index 58631e83217003cb3aba3ee4f32309f37bffee5c..ae9fac06eeec463c745a351c410b97987471b2ec 100644 --- a/pkgs/development/libraries/wayland/default.nix +++ b/pkgs/development/libraries/wayland/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, libffi, expat, pkgconfig, libxslt, docbook_xsl, doxygen }: -let version = "1.4.0"; in +let version = "1.5.0"; in stdenv.mkDerivation rec { name = "wayland-${version}"; src = fetchurl { url = "http://wayland.freedesktop.org/releases/${name}.tar.xz"; - sha256 = "0n2sbh4xg8xkcjhyi3f4vwcv89krdriyfs0rzdibdj5l2ngkpwqq"; + sha256 = "1da179livkkmfsds32yhh4zflxn9qs6av023702kx2w8mzly2s80"; }; buildInputs = [ pkgconfig libffi expat libxslt docbook_xsl doxygen ]; @@ -16,6 +16,6 @@ stdenv.mkDerivation rec { description = "Reference implementation of the wayland protocol"; homepage = http://wayland.freedesktop.org/; license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.all; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/wtk/default.nix b/pkgs/development/libraries/wtk/default.nix index c9e7fb4249d9ff71ce9aba04f2002674da23b675..1ff34d45ba33ec5a10694f4af272f13d9dbb44cb 100644 --- a/pkgs/development/libraries/wtk/default.nix +++ b/pkgs/development/libraries/wtk/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://java.sun.com/products/sjwtoolkit/download.html; description = "Sun Java Wireless Toolkit 2.5.2_01 for CLDC"; - license = "unfree"; + license = stdenv.lib.licenses.unfree; }; } diff --git a/pkgs/development/libraries/xapian/1.0.x.nix b/pkgs/development/libraries/xapian/1.0.x.nix index 57240eb733568e84adb48d4362dab663f0bff06f..b89900d2b05ee9240d5ff896d6a5da74a51f95bc 100644 --- a/pkgs/development/libraries/xapian/1.0.x.nix +++ b/pkgs/development/libraries/xapian/1.0.x.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = { description = "Xapian Probabilistic Information Retrieval library"; homepage = "http://xapian.org"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.chaoflow ]; }; } diff --git a/pkgs/development/libraries/xapian/bindings/1.0.x.nix b/pkgs/development/libraries/xapian/bindings/1.0.x.nix index b6bc94814e64396acb861403b79ed1b8572d681b..9ce5312f69abebd014438ebba087e7c13a83379a 100644 --- a/pkgs/development/libraries/xapian/bindings/1.0.x.nix +++ b/pkgs/development/libraries/xapian/bindings/1.0.x.nix @@ -68,7 +68,7 @@ composableDerivation.composableDerivation {} rec { meta = { description = "Bindings for the Xapian library"; homepage = xapian10.meta.homepage; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.chaoflow ]; }; } diff --git a/pkgs/development/libraries/xcb-util-cursor/default.nix b/pkgs/development/libraries/xcb-util-cursor/default.nix index a0e71724fb916781294f1173a7f09173f9e6bdef..984f192e4c9b5b55d9a88252145e066976e9dc7c 100644 --- a/pkgs/development/libraries/xcb-util-cursor/default.nix +++ b/pkgs/development/libraries/xcb-util-cursor/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { homepage = http://cgit.freedesktop.org/xcb/util-cursor; license = licenses.mit; maintainer = with maintainers; [ lovek323 ]; - platforms = platforms.unix; + platforms = platforms.linux; }; buildInputs = [ diff --git a/pkgs/development/libraries/xercesc/default.nix b/pkgs/development/libraries/xercesc/default.nix index 7ea79a629245f890b054ee2cd1c120d4db98eeb3..1c1426d969e82b3ad9f575e590f6c3ae50a9acd3 100644 --- a/pkgs/development/libraries/xercesc/default.nix +++ b/pkgs/development/libraries/xercesc/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://xerces.apache.org/xerces-c/; description = "Validating XML parser written in a portable subset of C++"; - license = "ASL2.0"; + license = stdenv.lib.licenses.asl20; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; }; } diff --git a/pkgs/development/libraries/xmlsec/default.nix b/pkgs/development/libraries/xmlsec/default.nix index afb23e4de3541f21143bff5a90c681c8dfacca16..80f4e2fc86049c3ddb77b008a9288bb4b12a882d 100644 --- a/pkgs/development/libraries/xmlsec/default.nix +++ b/pkgs/development/libraries/xmlsec/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.aleksey.com/xmlsec; description = "XML Security Library in C based on libxml2"; - license = "MIT"; + license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/yajl/default.nix b/pkgs/development/libraries/yajl/default.nix index afcbcafab11871ece3b119ad6dafe6f9bbffefae..079b457ab1fe299e38078edb6999fac635918102 100644 --- a/pkgs/development/libraries/yajl/default.nix +++ b/pkgs/development/libraries/yajl/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, ruby }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "yajl-2.0.4"; src = fetchurl { url = http://github.com/lloyd/yajl/tarball/2.0.4; - name = "yajl-2.0.1.tar.gz"; + name = "${name}.tar.gz"; sha256 = "0661bfi4hfvwg3z2pf51wqbf5qd5kfn0dk83v5s2xwhmry8rd6y1"; }; diff --git a/pkgs/development/misc/avr8-burn-omat/default.nix b/pkgs/development/misc/avr8-burn-omat/default.nix index f79483874f6bd317c5bc594b53c93830bcb8b45d..a0466091a5269740f224ae6410a9839ce6541ab2 100644 --- a/pkgs/development/misc/avr8-burn-omat/default.nix +++ b/pkgs/development/misc/avr8-burn-omat/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation { meta = { description = "GUI tool for avrdude"; homepage = http://avr8-burn-o-mat.brischalle.de/avr8_burn_o_mat_avrdude_gui_en.html; - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3; }; } diff --git a/pkgs/development/misc/intelgen4asm/default.nix b/pkgs/development/misc/intelgen4asm/default.nix deleted file mode 100644 index d0e2517cdd9e25bd0181967b5208e1e4b6b6d75a..0000000000000000000000000000000000000000 --- a/pkgs/development/misc/intelgen4asm/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv, fetchgit, autoconf, automake, libtool, bison, flex }: - -stdenv.mkDerivation rec { - name = "intel-g4asm-20110416"; - - src = fetchgit { - url = http://anongit.freedesktop.org/git/xorg/app/intel-gen4asm.git; - rev = "2450ff752642d116eb789a35393b9828133c7d31"; - sha256 = "a24c054a7c5ae335b72523fd2f51cae7f07a2885ef3c7a04d07a85e39f0c053f"; - }; - - buildInputs = [ autoconf automake libtool bison flex ]; - - preConfigure = "sh autogen.sh"; - - meta = { - homepage = http://cgit.freedesktop.org/xorg/app/intel-gen4asm/; - license = "MIT"; - description = "Program to compile an assembly language for the Intel 965 Express Chipset"; - }; -} diff --git a/pkgs/development/mobile/androidenv/androidsdk.nix b/pkgs/development/mobile/androidenv/androidsdk.nix index 1a2124754a20961b0f0668139d45a880898e6f89..3c9327f1c594d8d10566635dc15911515f30b919 100644 --- a/pkgs/development/mobile/androidenv/androidsdk.nix +++ b/pkgs/development/mobile/androidenv/androidsdk.nix @@ -178,7 +178,7 @@ stdenv.mkDerivation rec { # Create wrappers to the most important tools and platform tools so that we can run them if the SDK is in our PATH - ensureDir $out/bin + mkdir -p $out/bin for i in $out/libexec/android-sdk-*/tools/* do diff --git a/pkgs/development/mobile/titaniumenv/build-app.nix b/pkgs/development/mobile/titaniumenv/build-app.nix index 2443bfe9aed8d540bbd0ba14de464428df2170ed..fa959035a9e93d4c8098313e1d6eb69f6b9332ce 100644 --- a/pkgs/development/mobile/titaniumenv/build-app.nix +++ b/pkgs/development/mobile/titaniumenv/build-app.nix @@ -2,10 +2,12 @@ { name, src, target, androidPlatformVersions ? [ "8" ], androidAbiVersions ? [ "armeabi" "armeabi-v7a" ], tiVersion ? null , release ? false, androidKeyStore ? null, androidKeyAlias ? null, androidKeyStorePassword ? null , iosMobileProvisioningProfile ? null, iosCertificateName ? null, iosCertificate ? null, iosCertificatePassword ? null +, enableWirelessDistribution ? false, installURL ? null }: assert (release && target == "android") -> androidKeyStore != null && androidKeyAlias != null && androidKeyStorePassword != null; assert (release && target == "iphone") -> iosMobileProvisioningProfile != null && iosCertificateName != null && iosCertificate != null && iosCertificatePassword != null; +assert enableWirelessDistribution -> installURL != null; let androidsdkComposition = androidsdk { @@ -132,6 +134,15 @@ stdenv.mkDerivation { cp -av build/iphone/build/* $out mkdir -p $out/nix-support echo "file binary-dist \"$(echo $out/Release-iphoneos/*.ipa)\"" > $out/nix-support/hydra-build-products + + ${stdenv.lib.optionalString enableWirelessDistribution '' + appname=$(basename $out/Release-iphoneos/*.ipa .ipa) + bundleId=$(grep '[a-zA-Z0-9.]*' tiapp.xml | sed -e 's|||' -e 's|||' -e 's/ //g') + version=$(grep '[a-zA-Z0-9.]*' tiapp.xml | sed -e 's|||' -e 's|||' -e 's/ //g') + + sed -e "s|@INSTALL_URL@|${installURL}?bundleId=$bundleId\&version=$version\&title=$appname|" ${../xcodeenv/install.html.template} > $out/$appname.html + echo "doc install \"$out/$appname.html\"" >> $out/nix-support/hydra-build-products + ''} '' else if target == "iphone" then "" else throw "Target: ${target} is not supported!"} diff --git a/pkgs/development/mobile/titaniumenv/examples/default.nix b/pkgs/development/mobile/titaniumenv/examples/default.nix index e5b439364535795a14f6531876fe566286d3c6f4..d595db4081781e03fe0f13558e8ab897d4375b84 100644 --- a/pkgs/development/mobile/titaniumenv/examples/default.nix +++ b/pkgs/development/mobile/titaniumenv/examples/default.nix @@ -5,6 +5,7 @@ , rename ? false , newBundleId ? "com.example.kitchensink", iosMobileProvisioningProfile ? null, iosCertificate ? null, iosCertificateName ? "Example", iosCertificatePassword ? "" , allowUnfree ? false +, enableWirelessDistribution ? false, installURL ? null }: let @@ -90,6 +91,7 @@ rec { release = true; rename = true; inherit newBundleId iosMobileProvisioningProfile iosCertificate iosCertificateName iosCertificatePassword; + inherit enableWirelessDistribution installURL; }; } diff --git a/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix b/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix index 1725c826a52a3482496993376e02cacefa8eda4d..95372670969411e09ea4aa47581597373a7794b6 100644 --- a/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix +++ b/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix @@ -1,5 +1,6 @@ { titaniumenv, fetchgit, target, androidPlatformVersions ? [ "14" ], tiVersion ? "3.2.3.GA", release ? false , rename ? false, stdenv ? null, newBundleId ? null, iosMobileProvisioningProfile ? null, iosCertificate ? null, iosCertificateName ? null, iosCertificatePassword ? null +, enableWirelessDistribution ? false, installURL ? null }: assert rename -> (stdenv != null && newBundleId != null && iosMobileProvisioningProfile != null && iosCertificate != null && iosCertificateName != null && iosCertificatePassword != null); @@ -37,4 +38,5 @@ titaniumenv.buildApp { androidKeyStorePassword = "mykeystore"; inherit iosMobileProvisioningProfile iosCertificate iosCertificateName iosCertificatePassword; + inherit enableWirelessDistribution installURL; } diff --git a/pkgs/development/mobile/xcodeenv/build-app.nix b/pkgs/development/mobile/xcodeenv/build-app.nix index b5766c805522dc2c06262aef3ee02786b7c1c938..1b4940b0c3d9fa76ecf8834e7416230e8f255e30 100644 --- a/pkgs/development/mobile/xcodeenv/build-app.nix +++ b/pkgs/development/mobile/xcodeenv/build-app.nix @@ -15,9 +15,15 @@ , provisioningProfile ? null , generateIPA ? false , generateXCArchive ? false +, enableWirelessDistribution ? false +, installURL ? null +, bundleId ? null +, version ? null +, title ? null }: assert release -> codeSignIdentity != null && certificateFile != null && certificatePassword != null && provisioningProfile != null; +assert enableWirelessDistribution -> installURL != null && bundleId != null && version != null && title != null; let # Set some default values here @@ -84,6 +90,12 @@ stdenv.mkDerivation { # Add IPA to Hydra build products mkdir -p $out/nix-support echo "file binary-dist \"$(echo $out/*.ipa)\"" > $out/nix-support/hydra-build-products + + ${stdenv.lib.optionalString enableWirelessDistribution '' + appname=$(basename $out/*.ipa .ipa) + sed -e "s|@INSTALL_URL@|${installURL}?bundleId=${bundleId}\&version=${version}\&title=$appname|" ${./install.html.template} > $out/$appname.html + echo "doc install \"$out/$appname.html\"" >> $out/nix-support/hydra-build-products + ''} ''} # Delete our temp keychain diff --git a/pkgs/development/mobile/xcodeenv/install.html.template b/pkgs/development/mobile/xcodeenv/install.html.template new file mode 100644 index 0000000000000000000000000000000000000000..833b1994162c827d91d2f80b61f65ddc83fb2f2c --- /dev/null +++ b/pkgs/development/mobile/xcodeenv/install.html.template @@ -0,0 +1,25 @@ + + + + + Install IPA + + + + Go to the install page or wait a second + + + + diff --git a/pkgs/development/mobile/xcodeenv/simulate-app.nix b/pkgs/development/mobile/xcodeenv/simulate-app.nix index d25ef0f8e431c75c9c43beb31d6a721719f9431e..c999497d8c09b28b60828bb2776e57b92ad3d4b5 100644 --- a/pkgs/development/mobile/xcodeenv/simulate-app.nix +++ b/pkgs/development/mobile/xcodeenv/simulate-app.nix @@ -10,7 +10,7 @@ in stdenv.mkDerivation { name = stdenv.lib.replaceChars [" "] [""] name; buildCommand = '' - ensureDir $out/bin + mkdir -p $out/bin cat > $out/bin/run-test-simulator << "EOF" #! ${stdenv.shell} -e diff --git a/pkgs/development/mobile/xcodeenv/xcodewrapper.nix b/pkgs/development/mobile/xcodeenv/xcodewrapper.nix index 71e34ee5127d663d34f8a3f31f2f6d7466122143..fd375d6213c642b90e5aaae27ea36394ff97f822 100644 --- a/pkgs/development/mobile/xcodeenv/xcodewrapper.nix +++ b/pkgs/development/mobile/xcodeenv/xcodewrapper.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "xcode-wrapper-"+version; buildCommand = '' - ensureDir $out/bin + mkdir -p $out/bin cd $out/bin ln -s /usr/bin/xcode-select ln -s /usr/bin/xcodebuild diff --git a/pkgs/development/ocaml-modules/camlimages/default.nix b/pkgs/development/ocaml-modules/camlimages/default.nix index 21610f8f31036ef491583487b97645181a8d0164..ff344ef6f327ab8650d9a2be78ac6309530cc4d7 100644 --- a/pkgs/development/ocaml-modules/camlimages/default.nix +++ b/pkgs/development/ocaml-modules/camlimages/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation { meta = { homepage = http://cristal.inria.fr/camlimages; description = "Image manipulation library"; - license = "GnuGPLV2"; + license = stdenv.lib.licenses.gpl2; # maintainers = [ stdenv.lib.maintainers.roconnor ]; }; } diff --git a/pkgs/development/ocaml-modules/cryptgps/default.nix b/pkgs/development/ocaml-modules/cryptgps/default.nix index 7379a62d4244dbbcbe461e2daebb5ad0526b229a..8f18658b0f65165ccc8e34a5394e2ec422209ff3 100644 --- a/pkgs/development/ocaml-modules/cryptgps/default.nix +++ b/pkgs/development/ocaml-modules/cryptgps/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { i.e. this is not a binding to some C library, but the implementation itself. ''; - license = "MIT/X11"; + license = stdenv.lib.licenses.mit; platforms = ocaml.meta.platforms; maintainers = [ stdenv.lib.maintainers.z77z diff --git a/pkgs/development/ocaml-modules/expat/default.nix b/pkgs/development/ocaml-modules/expat/default.nix index b2702a5cade6f63a0ae05fd4cbc00d3809f7074d..f4837bd047f50dd11983d9ca0cc94ffd3d1f6c88 100644 --- a/pkgs/development/ocaml-modules/expat/default.nix +++ b/pkgs/development/ocaml-modules/expat/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation { meta = { homepage = http://www.xs4all.nl/~mmzeeman/ocaml/; description = "An ocaml wrapper for the Expat XML parsing library"; - license = "MIT/X11"; + license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.roconnor ]; }; } diff --git a/pkgs/development/ocaml-modules/gmetadom/default.nix b/pkgs/development/ocaml-modules/gmetadom/default.nix index 4d46bda243f3abc5de44139ca0d6e8b335e51f23..f1ec69143b0714fbb197e5b6e81cea5bc7e5fcc0 100644 --- a/pkgs/development/ocaml-modules/gmetadom/default.nix +++ b/pkgs/development/ocaml-modules/gmetadom/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { meta = { homepage = http://gmetadom.sourceforge.net/; description = "GMetaDOM is a collection of librares, each library providing a DOM implementation"; - license = "LGPLv2.1+"; + license = stdenv.lib.licenses.lgpl21Plus; maintainers = [ stdenv.lib.maintainers.roconnor ]; }; } diff --git a/pkgs/development/ocaml-modules/http/default.nix b/pkgs/development/ocaml-modules/http/default.nix index 46398d26114bc9a6368ecef2bce049a5c0ec3e75..8b611c65a41d6d5e90ef8c820207ac979e60e477 100644 --- a/pkgs/development/ocaml-modules/http/default.nix +++ b/pkgs/development/ocaml-modules/http/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { meta = { homepage = "http://upsilon.cc/~zack/hacking/software/ocaml-http/"; description = "do it yourself (OCaml) HTTP daemon"; - license = "LGPLv2"; + license = stdenv.lib.licenses.lgpl2; maintainers = [ stdenv.lib.maintainers.roconnor ]; }; } diff --git a/pkgs/development/ocaml-modules/lablgl/default.nix b/pkgs/development/ocaml-modules/lablgl/default.nix index 75c8d7ad2244f00a15c7d0741397513e03771f34..7cefe26746f872457a01db2bdd2471bf2d76e78a 100644 --- a/pkgs/development/ocaml-modules/lablgl/default.nix +++ b/pkgs/development/ocaml-modules/lablgl/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation { meta = { homepage = http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/lablgl.html; description = "OpenGL bindings for ocaml"; - license = "GnuGPLV2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.pSub ]; }; } diff --git a/pkgs/development/ocaml-modules/lablgtk/default.nix b/pkgs/development/ocaml-modules/lablgtk/default.nix index 392cf5c9772d673754bcb885592bdc1f9ec4e8e3..c2f50c4e5b83c4cd23902ee1d0b9b876043e65b0 100644 --- a/pkgs/development/ocaml-modules/lablgtk/default.nix +++ b/pkgs/development/ocaml-modules/lablgtk/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation (rec { ]; homepage = http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/lablgtk.html; description = "LablGTK is is an Objective Caml interface to gtk+"; - license = "LGPLv2.1+"; + license = stdenv.lib.licenses.lgpl21Plus; }; }) diff --git a/pkgs/development/ocaml-modules/lablgtkmathview/default.nix b/pkgs/development/ocaml-modules/lablgtkmathview/default.nix index 976910aae29aa1eb119b2ed85b6c8fca2fcef97b..333e86fa3fe9fc24f32b2b353c030dc2e1d18de5 100644 --- a/pkgs/development/ocaml-modules/lablgtkmathview/default.nix +++ b/pkgs/development/ocaml-modules/lablgtkmathview/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { meta = { homepage = http://helm.cs.unibo.it/mml-widget/; description = "OCaml bindings for gtkmathview"; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ stdenv.lib.maintainers.roconnor ]; }; } diff --git a/pkgs/development/ocaml-modules/mysql/default.nix b/pkgs/development/ocaml-modules/mysql/default.nix index ed70d1b9c3eed449250d57f0fe75d69da8ce6371..0ae60ab07e4a11f3cffb41219b3e83dc19fa74be 100644 --- a/pkgs/development/ocaml-modules/mysql/default.nix +++ b/pkgs/development/ocaml-modules/mysql/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation { meta = { homepage = http://ocaml-mysql.forge.ocamlcore.org; description = "Bindings for interacting with MySQL databases from ocaml"; - license = "LGPLv2.1+"; + license = stdenv.lib.licenses.lgpl21Plus; maintainers = [ stdenv.lib.maintainers.roconnor ]; }; } diff --git a/pkgs/development/ocaml-modules/ocaml-cairo/default.nix b/pkgs/development/ocaml-modules/ocaml-cairo/default.nix index 8f19847680b664c62206e3dd36d1126461ee47c2..94395f601aa4eb21bc076f47d03b714dbc82b519 100644 --- a/pkgs/development/ocaml-modules/ocaml-cairo/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-cairo/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation { meta = { homepage = http://cairographics.org/cairo-ocaml; description = "ocaml bindings for cairo library"; - license = "GnuGPLV2"; + license = stdenv.lib.licenses.gpl2; # maintainers = [ stdenv.lib.maintainers.roconnor ]; }; } diff --git a/pkgs/development/ocaml-modules/ocamlmake/default.nix b/pkgs/development/ocaml-modules/ocamlmake/default.nix index 0170119d94e0a00f6131713bf50bcc2a74faa708..3f91901d9b64b2165c4089b6c23ba82a78bda279 100644 --- a/pkgs/development/ocaml-modules/ocamlmake/default.nix +++ b/pkgs/development/ocaml-modules/ocamlmake/default.nix @@ -14,7 +14,7 @@ in stdenv.mkDerivation { }; installPhase = '' - ensureDir "$out/include/" + mkdir -p "$out/include/" cp OCamlMakefile "$out/include/" ''; diff --git a/pkgs/development/ocaml-modules/ocamlsdl/default.nix b/pkgs/development/ocaml-modules/ocamlsdl/default.nix index 6361dbd9ae640021adf36ee8419fd5fd467e5d8f..51af8d99d69bf747ec78e34ec920785d4568757a 100644 --- a/pkgs/development/ocaml-modules/ocamlsdl/default.nix +++ b/pkgs/development/ocaml-modules/ocamlsdl/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation { meta = { homepage = http://ocamlsdl.sourceforge.net/; description = "OCaml bindings for SDL 1.2"; - license = "LGPL 2.1"; + license = stdenv.lib.licenses.lgpl21; }; } diff --git a/pkgs/development/ocaml-modules/sqlite3/default.nix b/pkgs/development/ocaml-modules/sqlite3/default.nix index 63dc06634d716390e8d97e2a5a268797207ddedd..d92207cd20b1133e561f2d8643bd642f9ccb4930 100644 --- a/pkgs/development/ocaml-modules/sqlite3/default.nix +++ b/pkgs/development/ocaml-modules/sqlite3/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = { homepage = https://bitbucket.org/mmottl/sqlite3-ocaml; description = "OCaml bindings to the SQLite 3 database access library"; - license = "MIT/X11"; + license = stdenv.lib.licenses.mit; platforms = ocaml.meta.platforms; maintainers = [ stdenv.lib.maintainers.z77z diff --git a/pkgs/development/ocaml-modules/ulex/0.8/default.nix b/pkgs/development/ocaml-modules/ulex/0.8/default.nix index e996b6223b1ef023f5858939fde0a80388ddb52f..77ffa75289812a2ad2c55596458d753ab7803491 100644 --- a/pkgs/development/ocaml-modules/ulex/0.8/default.nix +++ b/pkgs/development/ocaml-modules/ulex/0.8/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { meta = { homepage = http://www.cduce.org/download.html; description = "ulex is a lexer generator for Unicode and OCaml"; - license = "MIT"; + license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.roconnor ]; }; } diff --git a/pkgs/development/ocaml-modules/ulex/default.nix b/pkgs/development/ocaml-modules/ulex/default.nix index 19beeec1ec548eb4dc542625b1b0ab12573e8fd0..72efaa0606d77c066508796949e33a271a51d749 100644 --- a/pkgs/development/ocaml-modules/ulex/default.nix +++ b/pkgs/development/ocaml-modules/ulex/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = { homepage = http://www.cduce.org/download.html; description = "ulex is a lexer generator for Unicode and OCaml"; - license = "MIT"; + license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.roconnor ]; }; } diff --git a/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix b/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix index 5d22970155b65c03c7b42a416fa388e3196e7b4e..93cef5d844cc8357d9f85f9bb4b6a76390b21340 100644 --- a/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix +++ b/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix @@ -21,6 +21,6 @@ buildPerlPackage rec { doCheck = !stdenv.isDarwin; meta = { - license = "perl5"; + license = "perl"; }; } diff --git a/pkgs/development/perl-modules/maatkit/default.nix b/pkgs/development/perl-modules/maatkit/default.nix index b30e2f12fc62a6ae6484f873b1732ecc6ee2798b..2b412d518c5c36bdd6ccf6920f5d0c0476cc2713 100644 --- a/pkgs/development/perl-modules/maatkit/default.nix +++ b/pkgs/development/perl-modules/maatkit/default.nix @@ -34,7 +34,7 @@ buildPerlPackage rec { In addition to MySQL, there is support for PostgreSQL, Memcached, and a growing variety of other databases and technologies. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://www.maatkit.org/; }; } diff --git a/pkgs/development/pharo/vm/default.nix b/pkgs/development/pharo/vm/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..7022206c5cc61b22e83606e0121b6083bc04baea --- /dev/null +++ b/pkgs/development/pharo/vm/default.nix @@ -0,0 +1,100 @@ +{ stdenv, fetchurl, cmake, bash, unzip, glibc, openssl, gcc, mesa, freetype, xlibs, alsaLib }: + +stdenv.mkDerivation rec { + name = "pharo-vm-core-i386-2014.06.25"; + system = "x86_32-linux"; + src = fetchurl { + url = http://files.pharo.org/vm/src/vm-unix-sources/pharo-vm-2014.06.25.tar.bz2; + md5 = "4d80d8169c2f2f0355c43ee90bbad23f"; + }; + + sources10Zip = fetchurl { + url = http://files.pharo.org/sources/PharoV10.sources.zip; + md5 = "3476222a0345a6f8f8b6093b5e3b30fb"; + }; + + sources20Zip = fetchurl { + url = http://files.pharo.org/sources/PharoV20.sources.zip; + md5 = "a145b0733f9d68d9ce6a76270b6b9ec8"; + }; + + sources30Zip = fetchurl { + url = http://files.pharo.org/sources/PharoV30.sources.zip; + md5 = "bb0a66b8968ef7d0da97ec86331f68c8"; + }; + + # Building + preConfigure = '' + cd build/ + ''; + resources = ./resources; + installPhase = '' + echo Current directory $(pwd) + echo Creating prefix "$prefix" + mkdir -p "$prefix/lib/pharo-vm" + + cd ../../results + + mv vm-display-null vm-display-null.so + mv vm-display-X11 vm-display-X11.so + mv vm-sound-null vm-sound-null.so + mv vm-sound-ALSA vm-sound-ALSA.so + mv pharo pharo-vm + + cp * "$prefix/lib/pharo-vm" + + cp -R "$resources/"* "$prefix/" + + mkdir $prefix/bin + + chmod u+w $prefix/bin + cat > $prefix/bin/pharo-vm-x < $prefix/bin/pharo-vm-nox < +Subject: Fix use of absolute paths in cmake files + +* build/directories.cmake +* build/CMakeLists.txt +* build/vm-sound-ALSA/CMakeLists.txt +* build/vm-sound-null/CMakeLists.txt +* build/vm-display-null/CMakeLists.txt +* build/vm-display-X11/CMakeLists.txt +--- a/build/CMakeLists.txt ++++ b/build/CMakeLists.txt +@@ -71,7 +71,7 @@ + list(APPEND LINKLIBS m) + list(APPEND LINKLIBS dl) + list(APPEND LINKLIBS pthread) +-set(EXECUTABLE_OUTPUT_PATH "/builds/workspace/Pharo-vm-unix-sources/cog/results") ++set(EXECUTABLE_OUTPUT_PATH "${CMAKE_SOURCE_DIR}/../results") + add_subdirectory("vm-display-null") + add_subdirectory("vm-display-X11") + add_subdirectory("vm-sound-ALSA") +--- a/build/directories.cmake ++++ b/build/directories.cmake +@@ -1,12 +1,12 @@ +-set(topDir "/builds/workspace/Pharo-vm-unix-sources/cog") +-set(buildDir "/builds/workspace/Pharo-vm-unix-sources/cog/build") ++set(topDir "${CMAKE_SOURCE_DIR}/..") ++set(buildDir "${CMAKE_SOURCE_DIR}/../build") + set(thirdpartyDir "${buildDir}/thirdParty") +-set(platformsDir "/builds/workspace/Pharo-vm-unix-sources/cog/platforms") +-set(srcDir "/builds/workspace/Pharo-vm-unix-sources/cog/src") ++set(platformsDir "${CMAKE_SOURCE_DIR}/../platforms") ++set(srcDir "${CMAKE_SOURCE_DIR}/../src") + set(srcPluginsDir "${srcDir}/plugins") + set(srcVMDir "${srcDir}/vm") + set(platformName "unix") + set(targetPlatform ${platformsDir}/${platformName}) + set(crossDir "${platformsDir}/Cross") + set(platformVMDir "${targetPlatform}/vm") +-set(outputDir "/builds/workspace/Pharo-vm-unix-sources/cog/results") ++set(outputDir "${CMAKE_SOURCE_DIR}/../results") +--- a/build/vm-display-X11/CMakeLists.txt ++++ b/build/vm-display-X11/CMakeLists.txt +@@ -11,7 +11,7 @@ + include_directories(${crossDir}/plugins/FilePlugin) + include_directories(${targetPlatform}/plugins/B3DAcceleratorPlugin) + include_directories(${crossDir}/plugins/B3DAcceleratorPlugin) +-set(LIBRARY_OUTPUT_PATH "/builds/workspace/Pharo-vm-unix-sources/cog/results") ++set(LIBRARY_OUTPUT_PATH "${CMAKE_SOURCE_DIR}/../results") + list(APPEND LINKLIBS SM) + list(APPEND LINKLIBS ICE) + list(APPEND LINKLIBS GL) +--- a/build/vm-display-null/CMakeLists.txt ++++ b/build/vm-display-null/CMakeLists.txt +@@ -11,7 +11,7 @@ + include_directories(${crossDir}/plugins/FilePlugin) + include_directories(${targetPlatform}/plugins/B3DAcceleratorPlugin) + include_directories(${crossDir}/plugins/B3DAcceleratorPlugin) +-set(LIBRARY_OUTPUT_PATH "/builds/workspace/Pharo-vm-unix-sources/cog/results") ++set(LIBRARY_OUTPUT_PATH "${CMAKE_SOURCE_DIR}/../results") + target_link_libraries(vm-display-null ${LINKLIBS}) + set_target_properties(vm-display-null PROPERTIES PREFIX "" SUFFIX "" + LINK_FLAGS -m32) +--- a/build/vm-sound-ALSA/CMakeLists.txt ++++ b/build/vm-sound-ALSA/CMakeLists.txt +@@ -11,7 +11,7 @@ + include_directories(${crossDir}/plugins/FilePlugin) + include_directories(${targetPlatform}/plugins/B3DAcceleratorPlugin) + include_directories(${crossDir}/plugins/B3DAcceleratorPlugin) +-set(LIBRARY_OUTPUT_PATH "/builds/workspace/Pharo-vm-unix-sources/cog/results") ++set(LIBRARY_OUTPUT_PATH "${CMAKE_SOURCE_DIR}/../results") + target_link_libraries(vm-sound-ALSA ${LINKLIBS}) + set_target_properties(vm-sound-ALSA PROPERTIES PREFIX "" SUFFIX "" + LINK_FLAGS -m32) +--- a/build/vm-sound-null/CMakeLists.txt ++++ b/build/vm-sound-null/CMakeLists.txt +@@ -11,7 +11,7 @@ + include_directories(${crossDir}/plugins/FilePlugin) + include_directories(${targetPlatform}/plugins/B3DAcceleratorPlugin) + include_directories(${crossDir}/plugins/B3DAcceleratorPlugin) +-set(LIBRARY_OUTPUT_PATH "/builds/workspace/Pharo-vm-unix-sources/cog/results") ++set(LIBRARY_OUTPUT_PATH "${CMAKE_SOURCE_DIR}/../results") + target_link_libraries(vm-sound-null ${LINKLIBS}) + set_target_properties(vm-sound-null PROPERTIES PREFIX "" SUFFIX "" + LINK_FLAGS -m32) diff --git a/pkgs/development/pharo/vm/patches/fix-executable-name.patch b/pkgs/development/pharo/vm/patches/fix-executable-name.patch new file mode 100644 index 0000000000000000000000000000000000000000..b32ed7a32d25059e208629e4ed38c9d71b12bdc7 --- /dev/null +++ b/pkgs/development/pharo/vm/patches/fix-executable-name.patch @@ -0,0 +1,14 @@ +Change the name of the executable file from Squeak to Pharo +--- a/platforms/unix/vm-display-X11/sqUnixX11.c ++++ b/platforms/unix/vm-display-X11/sqUnixX11.c +@@ -153,8 +153,8 @@ + /*** Variables -- X11 Related ***/ + + /* name of Squeak windows in Xrm and the WM */ +-#define xResClass "Squeak" +-#define xResName "squeak" ++#define xResClass "pharo-vm" ++#define xResName "Pharo" + + char *displayName= 0; /* name of display, or 0 for $DISPLAY */ + Display *stDisplay= null; /* Squeak display */ diff --git a/pkgs/development/pharo/vm/patches/pharo-is-not-squeak.patch b/pkgs/development/pharo/vm/patches/pharo-is-not-squeak.patch new file mode 100644 index 0000000000000000000000000000000000000000..c06916c96ee363f99070e10247f956aec19d4fc6 --- /dev/null +++ b/pkgs/development/pharo/vm/patches/pharo-is-not-squeak.patch @@ -0,0 +1,23 @@ +pharo --help must talk about Pharo and not about Squeak +--- a/platforms/unix/vm-display-X11/sqUnixX11.c ++++ b/platforms/unix/vm-display-X11/sqUnixX11.c +@@ -7075,8 +7075,8 @@ + printf(" -lazy go to sleep when main window unmapped\n"); + printf(" -mapdelbs map Delete key onto Backspace\n"); + printf(" -nointl disable international keyboard support\n"); +- printf(" -notitle disable the Squeak window title bar\n"); +- printf(" -title use t as the Squeak window title instead of the image name\n"); ++ printf(" -notitle disable the Pharo window title bar\n"); ++ printf(" -title use t as the Pharo window title instead of the image name\n"); + printf(" -ldtoms launch drop timeout milliseconds\n"); + printf(" -noxdnd disable X drag-and-drop protocol support\n"); + printf(" -optmod map Mod to the Option key\n"); +@@ -7095,7 +7095,7 @@ + static void display_printUsageNotes(void) + { + printf(" Using `unix:0' for may improve local display performance.\n"); +- printf(" -xshm only works when Squeak is running on the X server host.\n"); ++ printf(" -xshm only works when Pharo is running on the X server host.\n"); + } + + diff --git a/pkgs/development/pharo/vm/resources/share/applications/pharo-vm.desktop b/pkgs/development/pharo/vm/resources/share/applications/pharo-vm.desktop new file mode 100644 index 0000000000000000000000000000000000000000..9061ec9b8e505dc12c3e11ef5c93eed2af8622a8 --- /dev/null +++ b/pkgs/development/pharo/vm/resources/share/applications/pharo-vm.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Name=Pharo VM +GenericName=Pharo Virtual Machine +Exec=pharo-vm-x %F +Icon=pharo +Terminal=false +Type=Application +StartupNotify=false +Categories=Development; +MimeType=application/x-pharo-image; +NoDisplay=true diff --git a/pkgs/development/pharo/vm/resources/share/icons/hicolor/16x16/apps/pharo.png b/pkgs/development/pharo/vm/resources/share/icons/hicolor/16x16/apps/pharo.png new file mode 100644 index 0000000000000000000000000000000000000000..7910e17ebc49ab5b0f4404ca5afd661747589b19 Binary files /dev/null and b/pkgs/development/pharo/vm/resources/share/icons/hicolor/16x16/apps/pharo.png differ diff --git a/pkgs/development/pharo/vm/resources/share/icons/hicolor/256x256/apps/pharo.png b/pkgs/development/pharo/vm/resources/share/icons/hicolor/256x256/apps/pharo.png new file mode 100644 index 0000000000000000000000000000000000000000..f6e881417524fc9d4370786935675eb91d38949c Binary files /dev/null and b/pkgs/development/pharo/vm/resources/share/icons/hicolor/256x256/apps/pharo.png differ diff --git a/pkgs/development/pharo/vm/resources/share/icons/hicolor/32x32/apps/pharo.png b/pkgs/development/pharo/vm/resources/share/icons/hicolor/32x32/apps/pharo.png new file mode 100644 index 0000000000000000000000000000000000000000..ec8a5f95c6c4103616e68eb4186bbe36cea6e5f6 Binary files /dev/null and b/pkgs/development/pharo/vm/resources/share/icons/hicolor/32x32/apps/pharo.png differ diff --git a/pkgs/development/pharo/vm/resources/share/icons/hicolor/48x48/apps/pharo.png b/pkgs/development/pharo/vm/resources/share/icons/hicolor/48x48/apps/pharo.png new file mode 100644 index 0000000000000000000000000000000000000000..3f206cf8b18cf18ae1597a0472d3147f24c7d885 Binary files /dev/null and b/pkgs/development/pharo/vm/resources/share/icons/hicolor/48x48/apps/pharo.png differ diff --git a/pkgs/development/pharo/vm/resources/share/mime/packages/pharo-image.xml b/pkgs/development/pharo/vm/resources/share/mime/packages/pharo-image.xml new file mode 100644 index 0000000000000000000000000000000000000000..927514dd215bf702045b5861bcfed79eda515cd0 --- /dev/null +++ b/pkgs/development/pharo/vm/resources/share/mime/packages/pharo-image.xml @@ -0,0 +1,9 @@ + + + + Pharo image file + Fichier d'image Pharo + + + + diff --git a/pkgs/development/python-modules/dbus/default.nix b/pkgs/development/python-modules/dbus/default.nix index 32ef97bf29c534e8578e07a426dad1c53a380a1c..d88504379ed028a43d065ab8ed996d6ecf1b0267 100644 --- a/pkgs/development/python-modules/dbus/default.nix +++ b/pkgs/development/python-modules/dbus/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation rec { meta = { description = "Python DBus bindings"; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/development/python-modules/generic/wrap.sh b/pkgs/development/python-modules/generic/wrap.sh index 282aeca9ed1c998bec0631abc43fbe37f40db873..857f002cace96610e0eb3068e7ffac1281234524 100644 --- a/pkgs/development/python-modules/generic/wrap.sh +++ b/pkgs/development/python-modules/generic/wrap.sh @@ -26,6 +26,12 @@ wrapPythonProgramsIn() { # dont wrap EGG-INFO scripts since they are called from python if echo "$i" | grep -v EGG-INFO/scripts; then echo "wrapping \`$i'..." + sed -i "$i" -re '1 { + /^#!/!b; :r + /\\$/{N;b r} + /__future__|^ *(#.*)?$/{n;b r} + /^ *[^# ]/i import sys; sys.argv[0] = '"'$(basename "$i")'"' + }' wrapProgram "$i" \ --prefix PYTHONPATH ":" $program_PYTHONPATH \ --prefix PATH ":" $program_PATH diff --git a/pkgs/development/python-modules/mygpoclient/default.nix b/pkgs/development/python-modules/mygpoclient/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..d4461788381803b61560e4e1477c8cf071aa86b7 --- /dev/null +++ b/pkgs/development/python-modules/mygpoclient/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, python, buildPythonPackage, pythonPackages }: + +buildPythonPackage rec { + name = "mygpoclient-1.7"; + + src = fetchurl { + url = "https://thp.io/2010/mygpoclient/${name}.tar.gz"; + sha256 = "6a0b7b1fe2b046875456e14eda3e42430e493bf2251a64481cf4fd1a1e21a80e"; + }; + + buildInputs = [ pythonPackages.nose pythonPackages.minimock ]; + + checkPhase = "make test"; + + meta = { + description = "A gpodder.net client library"; + longDescription = '' + The mygpoclient library allows developers to utilize a Pythonic interface + to the gpodder.net web services. + ''; + homepage = "https://thp.io/2010/mygpoclient/"; + license = "GPLv3"; + platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + maintainers = [ stdenv.lib.maintainers.skeidel ]; + }; +} diff --git a/pkgs/development/python-modules/pygame/default.nix b/pkgs/development/python-modules/pygame/default.nix index a6efb8bdc2b366e3199971008c0f9b435b5e29e1..93fa70e44bcffc624e28c86776d14ae7e18a1192 100644 --- a/pkgs/development/python-modules/pygame/default.nix +++ b/pkgs/development/python-modules/pygame/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation { meta = { description = "Python library for games"; homepage = "http://www.pygame.org/"; - license = "LGPLv2.1+"; + license = stdenv.lib.licenses.lgpl21Plus; }; } diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix new file mode 100644 index 0000000000000000000000000000000000000000..2d2a2ed51511d393e2ceebe985bb822fc513f356 --- /dev/null +++ b/pkgs/development/python-modules/pyqt/5.x.nix @@ -0,0 +1,51 @@ +{ stdenv, fetchurl, python, pkgconfig, qt5, sip, pythonDBus, lndir, makeWrapper }: + +let + version = "5.3"; +in stdenv.mkDerivation { + name = "PyQt-${version}"; + + meta = with stdenv.lib; { + description = "Python bindings for Qt5"; + homepage = http://www.riverbankcomputing.co.uk; + license = licenses.gpl3; + platforms = platforms.mesaPlatforms; + maintainers = with maintainers; [ sander iyzsong ]; + }; + + src = fetchurl { + url = "mirror://sourceforge/pyqt/PyQt5/PyQt-${version}/PyQt-gpl-${version}.tar.gz"; + sha256 = "0xc1cc68fi989rfybibimhhi3mqn3b93n0p3jdqznzabgilcb1m2"; + }; + + buildInputs = [ python pkgconfig makeWrapper lndir qt5 ]; + + propagatedBuildInputs = [ sip ]; + + configurePhase = '' + mkdir -p $out + lndir ${pythonDBus} $out + + export PYTHONPATH=$PYTHONPATH:$out/lib/${python.libPrefix}/site-packages + + substituteInPlace configure.py \ + --replace 'install_dir=pydbusmoddir' "install_dir='$out/lib/${python.libPrefix}/site-packages/dbus/mainloop'" + + ${python.executable} configure.py -w \ + --confirm-license \ + --dbus=$out/include/dbus-1.0 \ + --no-qml-plugin \ + --bindir=$out/bin \ + --destdir=$out/lib/${python.libPrefix}/site-packages \ + --sipdir=$out/share/sip \ + --designer-plugindir=$out/plugins/designer + ''; + + postInstall = '' + for i in $out/bin/*; do + wrapProgram $i --prefix PYTHONPATH : "$PYTHONPATH" + done + ''; + + enableParallelBuilding = true; +} diff --git a/pkgs/development/python-modules/pyside/apiextractor.nix b/pkgs/development/python-modules/pyside/apiextractor.nix index 107bb08759fb60dc295f80729b21c5818bb9d37b..e3bcf059c1c24b3c366f85cf4b9e47161b0c6a75 100644 --- a/pkgs/development/python-modules/pyside/apiextractor.nix +++ b/pkgs/development/python-modules/pyside/apiextractor.nix @@ -1,12 +1,11 @@ -{ stdenv, fetchgit, cmake, libxml2, libxslt, python27Packages, qt4 }: +{ stdenv, fetchurl, cmake, libxml2, libxslt, python27Packages, qt4 }: stdenv.mkDerivation { - name = "pyside-apiextractor-0.10.7-6-gdcb1195"; + name = "pyside-apiextractor-0.10.10"; - src = fetchgit { - url = "git://github.com/PySide/Apiextractor.git"; - rev = "dcb11958cabe518630f9f2d2bebd9f8711c2b15b"; - sha256 = "d7b6cb16d11b6134de17a15635d0b5ad7460d31d7870cafe23a690141b9a2274"; + src = fetchurl { + url = "https://github.com/PySide/Apiextractor/archive/0.10.10.tar.gz"; + sha256 = "1zj8yrxy08iv1pk38djxw3faimm226w6wmi0gm32w4yczblylwz3"; }; enableParallelBuilding = true; diff --git a/pkgs/development/python-modules/pyside/default.nix b/pkgs/development/python-modules/pyside/default.nix index dc4f733a4cf0c992a397f8b9aeb48691a639c229..d274283594ab39afd66c9d824eec7ba651bfd4e2 100644 --- a/pkgs/development/python-modules/pyside/default.nix +++ b/pkgs/development/python-modules/pyside/default.nix @@ -1,12 +1,11 @@ -{ stdenv, fetchgit, cmake, pysideGeneratorrunner, pysideShiboken, qt4 }: +{ stdenv, fetchurl, cmake, pysideGeneratorrunner, pysideShiboken, qt4 }: stdenv.mkDerivation { - name = "pyside-1.0.9"; + name = "pyside-1.2.2"; - src = fetchgit { - url = "git://github.com/PySide/PySide.git"; - rev = "4e47b3284fd8715b68342e755cd06ba02b1df0de"; - sha256 = "1fd302e78c5dea8a9c312bd493c04240f2383517ee745d9df2b070f15f0ab515"; + src = fetchurl { + url = "http://download.qt-project.org/official_releases/pyside/pyside-qt4.8+1.2.2.tar.bz2"; + sha256 = "1qbahpcjwl8d7zvvnc18nxpk1lbifpvjk8pi24ifbvvqcdsdzad1"; }; enableParallelBuilding = true; diff --git a/pkgs/development/python-modules/pyside/generatorrunner.nix b/pkgs/development/python-modules/pyside/generatorrunner.nix index 12ec5a7ef51b4bee725810764514e3061b15cc7b..2423cbb0c2e430da6b3569d8e4bd65dbb64aae05 100644 --- a/pkgs/development/python-modules/pyside/generatorrunner.nix +++ b/pkgs/development/python-modules/pyside/generatorrunner.nix @@ -1,12 +1,11 @@ -{ stdenv, fetchgit, cmake, pysideApiextractor, python27Packages, qt4 }: +{ stdenv, fetchurl, cmake, pysideApiextractor, python27Packages, qt4 }: stdenv.mkDerivation { - name = "pyside-generatorrunner-0.6.15"; + name = "pyside-generatorrunner-0.6.16"; - src = fetchgit { - url = "git://github.com/PySide/Generatorrunner.git"; - rev = "567ca6effaecdf97b33d1d13eada23bafe0f7535"; - sha256 = "182aba79af9fc865337f4befc96faf3eaca1ab9bcb902a57e0a68af49f071c74"; + src = fetchurl { + url = "https://github.com/PySide/Generatorrunner/archive/0.6.16.tar.gz"; + sha256 = "0vzk3cp0pfbhd921r8f1xkcz96znla39dhj074k623x9k26lj2sj"; }; enableParallelBuilding = true; diff --git a/pkgs/development/python-modules/pyside/shiboken.nix b/pkgs/development/python-modules/pyside/shiboken.nix index d8ef2d7b52f19ce09a6af0b78cb2875b9be9bd18..5e266aba7d0d814c43a138f5dd28715384d0f4e0 100644 --- a/pkgs/development/python-modules/pyside/shiboken.nix +++ b/pkgs/development/python-modules/pyside/shiboken.nix @@ -1,12 +1,11 @@ -{ stdenv, fetchgit, cmake, pysideApiextractor, pysideGeneratorrunner, python27, python27Packages, qt4 }: +{ stdenv, fetchurl, cmake, pysideApiextractor, pysideGeneratorrunner, python27, python27Packages, qt4 }: stdenv.mkDerivation { - name = "pyside-shiboken-1.0.7-73-g9f110f8"; + name = "pyside-shiboken-1.2.2"; - src = fetchgit { - url = "git://github.com/PySide/Shiboken.git"; - rev = "9f110f83c213867e15b0141a802ebbf74f2ed9f7"; - sha256 = "4618ed113fb20840fd9acb7d08460eb257f630cbca6d61113c16549a6bb651cd"; + src = fetchurl { + url = "http://download.qt-project.org/official_releases/pyside/shiboken-1.2.2.tar.bz2"; + sha256 = "1i75ziljl7rgb88nf26hz6cm8jf5kbs9r33b1j8zs4z33z7vn9bn"; }; enableParallelBuilding = true; diff --git a/pkgs/development/python-modules/pyside/tools.nix b/pkgs/development/python-modules/pyside/tools.nix index a3153bed21775df8cd9ea423936fe3e1d7e6df97..b5ddec09c03e0a98a2214ddae82a505784d9d8f1 100644 --- a/pkgs/development/python-modules/pyside/tools.nix +++ b/pkgs/development/python-modules/pyside/tools.nix @@ -1,12 +1,11 @@ -{ stdenv, fetchgit, cmake, pyside, python27, qt4, pysideShiboken }: +{ stdenv, fetchurl, cmake, pyside, python27, qt4, pysideShiboken }: stdenv.mkDerivation { - name = "pyside-tools-0.2.13"; + name = "pyside-tools-0.2.15"; - src = fetchgit { - url = "git://github.com/PySide/Tools.git"; - rev = "23e0712360442e50f34be0d6e4651b8c4c806d47"; - sha256 = "68f059e4936fb8dfae6aa3a463db8c28adcb7bd050b29e8b6fef82431f72da07"; + src = fetchurl { + url = "https://github.com/PySide/Tools/archive/0.2.15.tar.gz"; + sha256 = "0x4z3aq7jgar74gxzwznl3agla9i1dcskw5gh11jnnwwn63ffzwa"; }; enableParallelBuilding = true; diff --git a/pkgs/development/python-modules/pyx/default.nix b/pkgs/development/python-modules/pyx/default.nix index 374158da810c8b81fe2b8032aebd5250dd2a0d5d..cc36680fcb0105bc94055526de1aa8b5db55f371 100644 --- a/pkgs/development/python-modules/pyx/default.nix +++ b/pkgs/development/python-modules/pyx/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { plots in publication-ready quality are built out of these primitives. ''; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; homepage = http://pyx.sourceforge.net/; }; } diff --git a/pkgs/development/python-modules/sip/4.16.nix b/pkgs/development/python-modules/sip/4.16.nix new file mode 100644 index 0000000000000000000000000000000000000000..aa1fb19843854f328e42463103020d04b139920e --- /dev/null +++ b/pkgs/development/python-modules/sip/4.16.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, python }: + +stdenv.mkDerivation rec { + name = "sip-4.16.1"; + + src = fetchurl { + url = "mirror://sourceforge/pyqt/sip/${name}/${name}.tar.gz"; + sha256 = "1hknl71ij924syc9ik9nk4z051q3n75y7w27q9i07awpd39sp7m4"; + }; + + configurePhase = '' + ${python.executable} ./configure.py \ + -d $out/lib/${python.libPrefix}/site-packages \ + -b $out/bin -e $out/include + ''; + + buildInputs = [ python ]; + + meta = with stdenv.lib; { + description = "Creates C++ bindings for Python modules"; + homepage = "http://www.riverbankcomputing.co.uk/"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ lovek323 sander urkud ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/qtcreator/default.nix b/pkgs/development/qtcreator/default.nix index 2b0410f0874e274de612cde35558cb336c323e9b..dec94a912e00aebb5656e3169e4d8e9732165b70 100644 --- a/pkgs/development/qtcreator/default.nix +++ b/pkgs/development/qtcreator/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qtLib, sdkBuild ? false }: +{ stdenv, fetchurl, qtLib, sdkBuild ? false, withDocumentation ? true }: with stdenv.lib; @@ -36,7 +36,25 @@ stdenv.mkDerivation rec { qmake -spec linux-g++ "QT_PRIVATE_HEADERS=${qtLib}/include" qtcreator.pro ''; - installFlags = "INSTALL_ROOT=$(out)"; + buildFlags = optionalString withDocumentation " docs"; + + installFlags = "INSTALL_ROOT=$(out)" + + optionalString withDocumentation " install_docs"; + + postInstall = '' + # Install desktop file + mkdir -p "$out/share/applications" + cat > "$out/share/applications/qtcreator.desktop" << __EOF__ + [Desktop Entry] + Exec=$out/bin/qtcreator + Name=Qt Creator + GenericName=Cross-platform IDE for Qt + Icon=QtProject-qtcreator.png + Terminal=false + Type=Application + Categories=Qt;Development;IDE; + __EOF__ + ''; meta = { description = "Cross-platform IDE tailored to the needs of Qt developers"; diff --git a/pkgs/development/tools/analysis/lcov/default.nix b/pkgs/development/tools/analysis/lcov/default.nix index 9ad34097d0b17daeef32873a21479f49775aac0b..89a17d28a1b955f43d860166c4ee7f910f65e997 100644 --- a/pkgs/development/tools/analysis/lcov/default.nix +++ b/pkgs/development/tools/analysis/lcov/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ''; homepage = http://ltp.sourceforge.net/coverage/lcov.php; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ maintainers.mornfall ]; platforms = platforms.all; diff --git a/pkgs/development/tools/analysis/radare/default.nix b/pkgs/development/tools/analysis/radare/default.nix index d549bd8fb19813ab11fdac79de2b283ea5efb597..2ab8c05ebf85a97eb1f9c987d3fc309eddae4117 100644 --- a/pkgs/development/tools/analysis/radare/default.nix +++ b/pkgs/development/tools/analysis/radare/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { description = "Free advanced command line hexadecimal editor"; homepage = http://radare.org/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; all; }; diff --git a/pkgs/development/tools/analysis/radare/ired.nix b/pkgs/development/tools/analysis/radare/ired.nix index f7fb810410dc9a7d4ebf9deedd90dbf50451db1a..a2d135d448417bc253699fdd9d7010d798852f62 100644 --- a/pkgs/development/tools/analysis/radare/ired.nix +++ b/pkgs/development/tools/analysis/radare/ired.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { description = "Interactive Raw Editor"; homepage = http://radare.org/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; all; }; diff --git a/pkgs/development/tools/analysis/sparse/default.nix b/pkgs/development/tools/analysis/sparse/default.nix index f860f05c36a8757e8dc3e20200afb98b56141afa..6d0e28f0ab20731a82ca96079fd526b46e8b4ac3 100644 --- a/pkgs/development/tools/analysis/sparse/default.nix +++ b/pkgs/development/tools/analysis/sparse/default.nix @@ -1,38 +1,25 @@ -{ fetchurl, stdenv, pkgconfig }: +{ fetchurl, stdenv, pkgconfig, libxml2, llvm }: stdenv.mkDerivation rec { - name = "sparse-0.4.4"; + name = "sparse-0.5.0"; src = fetchurl { - url = "mirror://kernel/software/devel/sparse/dist/${name}.tar.gz"; - sha256 = "5ad02110130fd8f8d82f2b030de5f2db6f924fd805593a5b8be8072a620414c6"; + url = "mirror://kernel/software/devel/sparse/dist/${name}.tar.xz"; + sha256 = "1mc86jc5xdrdmv17nqj2cam2yqygnj6ar1iqkwsx2y37ij8wy7wj"; }; preConfigure = '' - sed -i "Makefile" \ - -e "s|^PREFIX *=.*$|PREFIX = $out|g" + sed -i Makefile -e "s|^PREFIX=.*$|PREFIX=$out|g" ''; - buildInputs = [ pkgconfig ]; - + buildInputs = [ pkgconfig libxml2 llvm ]; doCheck = true; meta = { description = "Sparse, a semantic parser for C"; - - longDescription = '' - Sparse, the semantic parser, provides a compiler frontend - capable of parsing most of ANSI C as well as many GCC - extensions, and a collection of sample compiler backends, - including a static analyzer also called "sparse". Sparse - provides a set of annotations designed to convey semantic - information about types, such as what address space pointers - point to, or what locks a function acquires or releases. - ''; - - homepage = http://www.kernel.org/pub/software/devel/sparse/; - - # See http://www.opensource.org/licenses/osl.php . - license = "Open Software License v1.1"; + homepage = "https://git.kernel.org/cgit/devel/sparse/sparse.git/"; + license = stdenv.lib.licenses.mit; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; }; } diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix index a6ea2c2f59d4a68d6e001cf1cfc089a6abd967f5..5ffc287d114b299f038e35fd5d3c515ad611fc19 100644 --- a/pkgs/development/tools/analysis/valgrind/default.nix +++ b/pkgs/development/tools/analysis/valgrind/default.nix @@ -52,9 +52,9 @@ stdenv.mkDerivation rec { Valgrind to build new tools. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.eelco ]; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/tools/analysis/valkyrie/default.nix b/pkgs/development/tools/analysis/valkyrie/default.nix index 3a0879d6edfd527cb43389b8b61de1849320cfe1..76becca74cfff0f39f29655559a7ceaac514be3b 100644 --- a/pkgs/development/tools/analysis/valkyrie/default.nix +++ b/pkgs/development/tools/analysis/valkyrie/default.nix @@ -15,9 +15,8 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.valgrind.org/; description = "Qt4-based GUI for the Valgrind 3.6.x series"; - - license = "GPLv2"; - + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; + broken = true; }; } diff --git a/pkgs/development/tools/apktool/default.nix b/pkgs/development/tools/apktool/default.nix index a415ffd152d76daa4c57fb8ea20a685cbe7fd714..239416535755af7df4a3ea6ab465f597490649b6 100644 --- a/pkgs/development/tools/apktool/default.nix +++ b/pkgs/development/tools/apktool/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { installPhase = '' install -D apktool.jar "$out/libexec/apktool/apktool.jar" - ensureDir "$out/bin" + mkdir -p "$out/bin" makeWrapper "${jre}/bin/java" "$out/bin/apktool" \ --add-flags "-jar $out/libexec/apktool/apktool.jar" \ --prefix PATH : "${buildTools}/build-tools/android-4.3/" diff --git a/pkgs/development/tools/build-managers/buildbot-slave/default.nix b/pkgs/development/tools/build-managers/buildbot-slave/default.nix index f21be7cc48c7b4c8095e70393bebaee465c50e41..870664c252a523957bbd885685f162b7fce57772 100644 --- a/pkgs/development/tools/build-managers/buildbot-slave/default.nix +++ b/pkgs/development/tools/build-managers/buildbot-slave/default.nix @@ -34,7 +34,7 @@ buildPythonPackage (rec { meta = with stdenv.lib; { homepage = http://buildbot.net/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; description = "Continuous integration system that automates the build/test cycle"; diff --git a/pkgs/development/tools/build-managers/buildbot/default.nix b/pkgs/development/tools/build-managers/buildbot/default.nix index 2d7c63fdc7de9199a72d34b872d2364ae3cc39c6..ccbf74e528e2c7466a7bffa32a40770502f63b5b 100644 --- a/pkgs/development/tools/build-managers/buildbot/default.nix +++ b/pkgs/development/tools/build-managers/buildbot/default.nix @@ -52,7 +52,7 @@ buildPythonPackage (rec { meta = with stdenv.lib; { homepage = http://buildbot.net/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; # Of course, we don't really need that on NixOS. :-) description = "Continuous integration system that automates the build/test cycle"; diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 42277b22036b8bf3c58f0c423c98da25ced225ef..45dffe06676b20ef572349283cec18f7a2ee338f 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, replace, curl, expat, zlib, bzip2, libarchive +{ stdenv, fetchurl, fetchpatch, replace, curl, expat, zlib, bzip2, libarchive , useNcurses ? false, ncurses, useQt4 ? false, qt4 }: @@ -24,6 +24,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; patches = + [(fetchpatch { # see http://www.cmake.org/Bug/view.php?id=13959 + name = "FindFreetype-2.5.patch"; + url = "http://www.cmake.org/Bug/file_download.php?file_id=4660&type=bug"; + sha256 = "136z63ff83hnwd247cq4m8m8164pklzyl5i2csf5h6wd8p01pdkj"; + })] ++ # Don't search in non-Nix locations such as /usr, but do search in # Nixpkgs' Glibc. optional (stdenv ? glibc) ./search-path.patch ++ diff --git a/pkgs/development/tools/build-managers/cmake/setup-hook.sh b/pkgs/development/tools/build-managers/cmake/setup-hook.sh index abc0b070a7643d67a5d4ba482b585a5806ca8994..39052fea6cb53208e6a229916563ffac11a18cb5 100755 --- a/pkgs/development/tools/build-managers/cmake/setup-hook.sh +++ b/pkgs/development/tools/build-managers/cmake/setup-hook.sh @@ -47,7 +47,7 @@ cmakeConfigurePhase() { eval "$postConfigure" } -if [ -z "$dontUseCmakeConfigure" -a ! -v configurePhase ]; then +if [ -z "$dontUseCmakeConfigure" -a -z "$configurePhase" ]; then configurePhase=cmakeConfigurePhase fi diff --git a/pkgs/development/tools/build-managers/colormake/default.nix b/pkgs/development/tools/build-managers/colormake/default.nix index 25ef7ef0b246781f0a8afba5f0a2640fa7aad00a..edc901858b8338052d7b80cb5415ae6028f208de 100644 --- a/pkgs/development/tools/build-managers/colormake/default.nix +++ b/pkgs/development/tools/build-managers/colormake/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { meta = { description = "Simple wrapper around make to colorize the output"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/development/tools/build-managers/gnumake/3.81/default.nix b/pkgs/development/tools/build-managers/gnumake/3.81/default.nix index 56d2326c916ba6c70078deef728ba157a3281c06..2a8c80e7db2613ca8d950e26aea8dc4a664c5e0b 100644 --- a/pkgs/development/tools/build-managers/gnumake/3.81/default.nix +++ b/pkgs/development/tools/build-managers/gnumake/3.81/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation { homepage = http://www.gnu.org/software/make/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; }; } diff --git a/pkgs/development/tools/build-managers/gnumake/3.82/default.nix b/pkgs/development/tools/build-managers/gnumake/3.82/default.nix index 4f3c7defa4885df1408793229d12c0341da78e96..6b24df39be9a8daff53dc00c5e4276f31c45986f 100644 --- a/pkgs/development/tools/build-managers/gnumake/3.82/default.nix +++ b/pkgs/development/tools/build-managers/gnumake/3.82/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation { homepage = http://www.gnu.org/software/make/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/tools/build-managers/gnumake/4.0/default.nix b/pkgs/development/tools/build-managers/gnumake/4.0/default.nix index 6a76fa0302b6b517ae84c46f12dd011da2a927f5..2da17490abff40a8ef403254dc4d4d49ab3eb48d 100644 --- a/pkgs/development/tools/build-managers/gnumake/4.0/default.nix +++ b/pkgs/development/tools/build-managers/gnumake/4.0/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation { homepage = http://www.gnu.org/software/make/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index f8466e5aafda76e2c96698c45c2713c100255ea1..b7316fc17c4a9d8cc6035b278495ec5fd334515b 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation rec { build-by-convention behavior. ''; homepage = http://www.gradle.org/; - license = "ASL2.0"; + license = stdenv.lib.licenses.asl20; }; } diff --git a/pkgs/development/tools/build-managers/rebar/default.nix b/pkgs/development/tools/build-managers/rebar/default.nix index b57c4c263f56d6e48c612a0729744d3c7528c0bc..d10d9d6d1a3a6f4587cf18daa218a5bf5326c3e4 100644 --- a/pkgs/development/tools/build-managers/rebar/default.nix +++ b/pkgs/development/tools/build-managers/rebar/default.nix @@ -2,14 +2,14 @@ let - version = "2.3.0"; + version = "2.5.1"; in stdenv.mkDerivation { name = "rebar-${version}"; src = fetchurl { url = "https://github.com/rebar/rebar/archive/${version}.tar.gz"; - sha256 = "0g23ib96lalpmynx39fprlw08ivgyb7i6c6a8jvgqwr9jmd0nj06"; + sha256 = "1y9b0smw0g5q197xf4iklzmcf8ad6w52p6mwzpf7b0ib1nd89jw6"; }; buildInputs = [ erlang ]; diff --git a/pkgs/development/tools/build-managers/scons/default.nix b/pkgs/development/tools/build-managers/scons/default.nix index c6856dae565124cd07bb040988626d85436912ff..93f7699481c8807bbb564906cbbc1079830ff3cc 100644 --- a/pkgs/development/tools/build-managers/scons/default.nix +++ b/pkgs/development/tools/build-managers/scons/default.nix @@ -2,7 +2,7 @@ let name = "scons"; - version = "2.3.1"; + version = "2.3.2"; in stdenv.mkDerivation { @@ -10,7 +10,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://sourceforge/scons/${name}-${version}.tar.gz"; - sha256 = "00822ax62cfi2fvz9zhw80hl1273524d97xfycq4q276z1lb86h9"; + sha256 = "1m29lhwz7p6k4f8wc8qjpwa89058lzq3vrycgxbfc5cmbq6354zr"; }; buildInputs = [python makeWrapper]; @@ -28,7 +28,7 @@ stdenv.mkDerivation { meta = { homepage = "http://scons.org/"; description = "An improved, cross-platform substitute for Make"; - license = "MIT"; + license = stdenv.lib.licenses.mit; longDescription = '' SCons is an Open Source software construction tool. Think of SCons as an improved, cross-platform substitute for the classic diff --git a/pkgs/development/tools/documentation/doxygen/default.nix b/pkgs/development/tools/documentation/doxygen/default.nix index 9a8979aaa6cf06524a25cf5c9e94cc912b059977..54509178b1a16a5a2091f35f4a6414aabfb9f62c 100644 --- a/pkgs/development/tools/documentation/doxygen/default.nix +++ b/pkgs/development/tools/documentation/doxygen/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; meta = { - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = "http://doxygen.org/"; description = "Doxygen, a source code documentation generator tool"; diff --git a/pkgs/development/tools/documentation/haddock/2.10.0.nix b/pkgs/development/tools/documentation/haddock/2.10.0.nix index d3e48c619fac8be1fea240c0cfddccb7fa85ce59..af9a72058b29cc3d7352dace1a07a06a5af570c8 100644 --- a/pkgs/development/tools/documentation/haddock/2.10.0.nix +++ b/pkgs/development/tools/documentation/haddock/2.10.0.nix @@ -20,6 +20,7 @@ cabal.mkDerivation (self: { description = "A documentation-generation tool for Haskell libraries"; 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/tools/documentation/haddock/2.11.0.nix b/pkgs/development/tools/documentation/haddock/2.11.0.nix index 6a2cf668682b707c8fa89fc89e9e8001ff9ce233..d43e529585bab0985637e33ee3a21ed1fbac3c27 100644 --- a/pkgs/development/tools/documentation/haddock/2.11.0.nix +++ b/pkgs/development/tools/documentation/haddock/2.11.0.nix @@ -20,6 +20,7 @@ cabal.mkDerivation (self: { description = "A documentation-generation tool for Haskell libraries"; 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/tools/documentation/haddock/2.12.0.nix b/pkgs/development/tools/documentation/haddock/2.12.0.nix index 6d3f333962bc24d05fabdb806872f026c85b0876..b1249eee3278857b77556f5372c1318c4999870b 100644 --- a/pkgs/development/tools/documentation/haddock/2.12.0.nix +++ b/pkgs/development/tools/documentation/haddock/2.12.0.nix @@ -17,6 +17,6 @@ cabal.mkDerivation (self: { description = "A documentation-generation tool for Haskell libraries"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/tools/documentation/haddock/2.13.2.1.nix b/pkgs/development/tools/documentation/haddock/2.13.2.1.nix index 89a488fdd31fe645e739a3fa986c5b9494786e7c..749fee28571cb301621734fae9f0a6e603816715 100644 --- a/pkgs/development/tools/documentation/haddock/2.13.2.1.nix +++ b/pkgs/development/tools/documentation/haddock/2.13.2.1.nix @@ -20,6 +20,7 @@ cabal.mkDerivation (self: { description = "A documentation-generation tool for Haskell libraries"; 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/tools/documentation/haddock/2.13.2.nix b/pkgs/development/tools/documentation/haddock/2.13.2.nix index 6227f55888b4fc4c3c73d23390ff533f8e0a9d0e..aa5be90fbae2b47d55e817b6efa83a07adc19dfc 100644 --- a/pkgs/development/tools/documentation/haddock/2.13.2.nix +++ b/pkgs/development/tools/documentation/haddock/2.13.2.nix @@ -20,6 +20,7 @@ cabal.mkDerivation (self: { description = "A documentation-generation tool for Haskell libraries"; 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/tools/documentation/haddock/2.14.2.nix b/pkgs/development/tools/documentation/haddock/2.14.2.nix index 8838b6def42235ffd4d4fc39ff486d35873d5020..c8ef4299f560b5cee6e0f0758478604554ba0ce4 100644 --- a/pkgs/development/tools/documentation/haddock/2.14.2.nix +++ b/pkgs/development/tools/documentation/haddock/2.14.2.nix @@ -21,6 +21,7 @@ cabal.mkDerivation (self: { description = "A documentation-generation tool for Haskell libraries"; 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/tools/documentation/haddock/2.14.3.nix b/pkgs/development/tools/documentation/haddock/2.14.3.nix index 2ee55bebd014461fd8d5ced2bbe1abc2ff53a67b..a16994b1f2edbb36fbe470c79f7b7db32074274c 100644 --- a/pkgs/development/tools/documentation/haddock/2.14.3.nix +++ b/pkgs/development/tools/documentation/haddock/2.14.3.nix @@ -18,6 +18,6 @@ cabal.mkDerivation (self: { description = "A documentation-generation tool for Haskell libraries"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/tools/documentation/haddock/2.4.2.nix b/pkgs/development/tools/documentation/haddock/2.4.2.nix index 34af47f48db4c9445d13f3f2e480ac3a7af38bbb..6493302218f97ced9cf455a2abf4af2228986530 100644 --- a/pkgs/development/tools/documentation/haddock/2.4.2.nix +++ b/pkgs/development/tools/documentation/haddock/2.4.2.nix @@ -16,6 +16,6 @@ cabal.mkDerivation (self: { description = "A documentation-generation tool for Haskell libraries"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/tools/documentation/haddock/2.7.2.nix b/pkgs/development/tools/documentation/haddock/2.7.2.nix index fd31a96b2913df8d350659209e090dc19f551603..53178aca0a1887d821f09b9fe7cdf66c2be0af56 100644 --- a/pkgs/development/tools/documentation/haddock/2.7.2.nix +++ b/pkgs/development/tools/documentation/haddock/2.7.2.nix @@ -5,7 +5,7 @@ cabal.mkDerivation (self : { version = "2.7.2"; # Haskell Platform 2010.1.0.0 and 2010.2.0.0 name = self.fname; sha256 = "4eaaaf62785f0ba3d37ba356cfac4679faef91c0902d8cdbf42837cbe5daab82"; - extraBuildInputs = [alex happy makeWrapper]; + buildTools = [alex happy makeWrapper]; propagatedBuildInputs = [ghcPaths]; doCheck = false; @@ -18,6 +18,7 @@ cabal.mkDerivation (self : { description = "A documentation-generation tool for Haskell libraries"; 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/tools/documentation/haddock/2.9.2.nix b/pkgs/development/tools/documentation/haddock/2.9.2.nix index fcae14d789e9018fb085816f9280270115755c7e..2ed94ff072abeecc67f3dc22017dd717ebee8931 100644 --- a/pkgs/development/tools/documentation/haddock/2.9.2.nix +++ b/pkgs/development/tools/documentation/haddock/2.9.2.nix @@ -5,7 +5,7 @@ cabal.mkDerivation (self : { version = "2.9.2"; # Haskell Platform 2011.2.0.0 name = self.fname; sha256 = "189vvp173pqc69zgzqqx6vyhvsc13p1s86ql60rs1j5qlhh8ajg8"; - extraBuildInputs = [alex happy makeWrapper]; + buildTools = [alex happy makeWrapper]; propagatedBuildInputs = [ghcPaths xhtml]; doCheck = false; @@ -18,6 +18,7 @@ cabal.mkDerivation (self : { description = "A documentation-generation tool for Haskell libraries"; 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/tools/documentation/haddock/2.9.4.nix b/pkgs/development/tools/documentation/haddock/2.9.4.nix index dc7ab7f968b1dc2672910b7e254a52a9c8aa2c71..80d7c623c1e9e414bb0d60957a6060f76e3974f3 100644 --- a/pkgs/development/tools/documentation/haddock/2.9.4.nix +++ b/pkgs/development/tools/documentation/haddock/2.9.4.nix @@ -18,6 +18,6 @@ cabal.mkDerivation (self: { description = "A documentation-generation tool for Haskell libraries"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/tools/etcdctl/default.nix b/pkgs/development/tools/etcdctl/default.nix index a37ef26f5412cba598e96af26a26c6098d94c73e..5e6438d0f5ff1cc93e00464f525f2e1c6e2422a3 100644 --- a/pkgs/development/tools/etcdctl/default.nix +++ b/pkgs/development/tools/etcdctl/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin mv etcdctl $out/bin ''; diff --git a/pkgs/development/tools/gocode/default.nix b/pkgs/development/tools/gocode/default.nix index 6057c288cf6924570bea2ad6b277662099a80e6e..30e4b79ee38bfc26362b33d965a56954c81cc722 100644 --- a/pkgs/development/tools/gocode/default.nix +++ b/pkgs/development/tools/gocode/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { ''; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin mv gocode $out/bin ''; diff --git a/pkgs/development/tools/guile/g-wrap/default.nix b/pkgs/development/tools/guile/g-wrap/default.nix index 8698dc27b4011a6008f0bf7d14174d74c9f13235..74e967686f3e86dd5e8be3c50b94a0a38bf4711c 100644 --- a/pkgs/development/tools/guile/g-wrap/default.nix +++ b/pkgs/development/tools/guile/g-wrap/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { generating Guile wrappers for C functions. ''; homepage = http://www.nongnu.org/g-wrap/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; }; } diff --git a/pkgs/development/tools/haskell/BNFC-meta/default.nix b/pkgs/development/tools/haskell/BNFC-meta/default.nix deleted file mode 100644 index 3017bc7c7b91b98f16ece1c3ef9e6b1017e0a1b7..0000000000000000000000000000000000000000 --- a/pkgs/development/tools/haskell/BNFC-meta/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, alexMeta, happyMeta, haskellSrcMeta, syb }: - -cabal.mkDerivation (self: { - pname = "BNFC-meta"; - version = "0.4.0.1"; - sha256 = "0x31a25njbgd3r8shh7rrqa9qq66iqjhh82k538p9bd2hblg30ka"; - buildDepends = [ alexMeta happyMeta haskellSrcMeta syb ]; - meta = { - description = "Deriving Parsers and Quasi-Quoters from BNF Grammars"; - license = self.stdenv.lib.licenses.gpl2; - platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; - }; -}) diff --git a/pkgs/development/tools/haskell/HaRe/default.nix b/pkgs/development/tools/haskell/HaRe/default.nix deleted file mode 100644 index 377f3c6f08dea95c7c22d6908cb16c26c1eb0d70..0000000000000000000000000000000000000000 --- a/pkgs/development/tools/haskell/HaRe/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, deepseq, Diff, dualTree, filepath, ghcMod, ghcPaths -, ghcSybUtils, haskellTokenUtils, hslogger, hspec, HUnit -, monoidExtras, mtl, parsec, QuickCheck, rosezipper, semigroups -, silently, StrafunskiStrategyLib, stringbuilder, syb, syz, time -, transformers -}: - -cabal.mkDerivation (self: { - pname = "HaRe"; - version = "0.7.2.5"; - sha256 = "09v0z1r03bzazgjf26fv54q1jpmv14zyl6w9083xcf2cs3yy6vfh"; - isLibrary = true; - isExecutable = true; - buildDepends = [ - dualTree filepath ghcMod ghcPaths ghcSybUtils haskellTokenUtils - hslogger monoidExtras mtl parsec rosezipper semigroups - StrafunskiStrategyLib syb syz time transformers - ]; - testDepends = [ - deepseq Diff dualTree filepath ghcMod ghcPaths ghcSybUtils - haskellTokenUtils hslogger hspec HUnit monoidExtras mtl QuickCheck - rosezipper semigroups silently StrafunskiStrategyLib stringbuilder - syb syz time transformers - ]; - jailbreak = true; - meta = { - homepage = "https://github.com/RefactoringTools/HaRe/wiki"; - description = "the Haskell Refactorer"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; - }; -}) diff --git a/pkgs/development/tools/haskell/PastePipe/default.nix b/pkgs/development/tools/haskell/PastePipe/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..ce1c8a27c54e1a1ef36071b183c3b1017b2fe25e --- /dev/null +++ b/pkgs/development/tools/haskell/PastePipe/default.nix @@ -0,0 +1,19 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, cmdargs, HTTP, network }: + +cabal.mkDerivation (self: { + pname = "PastePipe"; + version = "1.5"; + sha256 = "1jqfk6d22vi0vrwx0whjkh4pxwagr4hmi79bid6bffn72c7ygm8f"; + isLibrary = true; + isExecutable = true; + buildDepends = [ cmdargs HTTP network ]; + meta = { + homepage = "http://github.com/creswick/pastepipe"; + description = "CLI for pasting to lpaste.net"; + license = "GPL"; + platforms = self.ghc.meta.platforms; + maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ]; + }; +}) diff --git a/pkgs/development/tools/haskell/SourceGraph/default.nix b/pkgs/development/tools/haskell/SourceGraph/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..abfd386c82aa1266acd299005eae431f0db3d909 --- /dev/null +++ b/pkgs/development/tools/haskell/SourceGraph/default.nix @@ -0,0 +1,22 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, Cabal, fgl, filepath, Graphalyze, graphviz, haskellSrcExts +, mtl, multiset, random +}: + +cabal.mkDerivation (self: { + pname = "SourceGraph"; + version = "0.7.0.6"; + sha256 = "03psglm6xyqvcgnbimidafy51kwpipk5q6s8ip5vhjm2d5makkhm"; + isLibrary = false; + isExecutable = true; + buildDepends = [ + Cabal fgl filepath Graphalyze graphviz haskellSrcExts mtl multiset + random + ]; + meta = { + description = "Static code analysis using graph-theoretic techniques"; + license = "GPL"; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/tools/haskell/alex-meta/default.nix b/pkgs/development/tools/haskell/alex-meta/default.nix deleted file mode 100644 index a8c2840923ba0ff8805892269ee0592266bdd1bb..0000000000000000000000000000000000000000 --- a/pkgs/development/tools/haskell/alex-meta/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, haskellSrcMeta, QuickCheck }: - -cabal.mkDerivation (self: { - pname = "alex-meta"; - version = "0.3.0.5"; - sha256 = "0f41q5l6z1dcpfx8rxacv4f544zcw7pgvq935mnzzha9fvsxqzk4"; - buildDepends = [ haskellSrcMeta QuickCheck ]; - meta = { - description = "Quasi-quoter for Alex lexers"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; - }; -}) diff --git a/pkgs/development/tools/haskell/cabal-bounds/default.nix b/pkgs/development/tools/haskell/cabal-bounds/default.nix index 44d4bcd8340a2d4ac20759172d045b5fcec3b1df..c8dc299e7d90db9d896024a42ebef4e4f0555f56 100644 --- a/pkgs/development/tools/haskell/cabal-bounds/default.nix +++ b/pkgs/development/tools/haskell/cabal-bounds/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "cabal-bounds"; - version = "0.7"; - sha256 = "1dz3bi33s2s0glsw248dxh76yj6qqlq2v2z7rys5js1mi6dicwa3"; + version = "0.8"; + sha256 = "0db5vy4qfjc2d27d4vk37gz9sdjgjlargndligmljf52s2g568r0"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -15,7 +15,6 @@ cabal.mkDerivation (self: { unorderedContainers ]; testDepends = [ filepath tasty tastyGolden ]; - jailbreak = true; doCheck = false; meta = { description = "A command line program for managing the bounds/versions of the dependencies in a cabal file"; diff --git a/pkgs/development/tools/haskell/cabal-delete/default.nix b/pkgs/development/tools/haskell/cabal-delete/default.nix index 65a7b4d3211a02639170b95d9d80473a642744b5..7de6c0e6f1c203cc7254d97722decc259e68a7ce 100644 --- a/pkgs/development/tools/haskell/cabal-delete/default.nix +++ b/pkgs/development/tools/haskell/cabal-delete/default.nix @@ -30,5 +30,7 @@ cabal.mkDerivation (self: { description = "Uninstall packages installed by cabal"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + hydraPlatforms = self.stdenv.lib.platforms.none; + broken = true; }; }) diff --git a/pkgs/development/tools/haskell/cabal-ghci/default.nix b/pkgs/development/tools/haskell/cabal-ghci/default.nix index 2fc2637840dab4b38bc272b26892ef64302ef4c5..389318978dac08bedc4d00cbc11eac4fc2ed9e42 100644 --- a/pkgs/development/tools/haskell/cabal-ghci/default.nix +++ b/pkgs/development/tools/haskell/cabal-ghci/default.nix @@ -14,6 +14,5 @@ cabal.mkDerivation (self: { description = "Set up ghci with options taken from a .cabal file"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/tools/haskell/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix index 04e9f1cfea18c2618604a010b73cfe03927e3ae7..978ebde7e293bded8493533da829ffc0cbefa428 100644 --- a/pkgs/development/tools/haskell/cabal2nix/default.nix +++ b/pkgs/development/tools/haskell/cabal2nix/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "cabal2nix"; - version = "1.66"; - sha256 = "1is72jfv6snz59jpmg7dfcinpi3q4kdiqchd7zf45rqrszd5h43p"; + version = "1.68"; + sha256 = "0w9ayvr3ljfxgi17yaayqvyxflbgf7b5245pc3m011lp3cfnj849"; isLibrary = false; isExecutable = true; buildDepends = [ Cabal filepath hackageDb HTTP mtl regexPosix ]; @@ -17,9 +17,6 @@ cabal.mkDerivation (self: { description = "Convert Cabal files into Nix build instructions"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = with self.stdenv.lib.maintainers; [ simons ]; }; }) diff --git a/pkgs/development/tools/haskell/codex/default.nix b/pkgs/development/tools/haskell/codex/default.nix index 475c6018697be645b676b354550cd9d40598fcbe..fac145b14c203ee94a0dd6acd3a39f4b6002c2a6 100644 --- a/pkgs/development/tools/haskell/codex/default.nix +++ b/pkgs/development/tools/haskell/codex/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "codex"; - version = "0.1.0.2"; - sha256 = "0dsc5dx5zcxf5wd2qf6gqzr8d613z1gkllmzzkbny3lxa512crsw"; + version = "0.1.0.3"; + sha256 = "0sbkri6y9f4wws120kbb93sv1z0z75hjw9pw5r3wadmmd0lygsn9"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/tools/haskell/happy-meta/default.nix b/pkgs/development/tools/haskell/happy-meta/default.nix index e7c143d7ace47daba331cec797cd048ca6a4f38f..dc5c1f203ba4e0a5fad80d2ad2f11d54ef7b624d 100644 --- a/pkgs/development/tools/haskell/happy-meta/default.nix +++ b/pkgs/development/tools/haskell/happy-meta/default.nix @@ -11,6 +11,7 @@ cabal.mkDerivation (self: { description = "Quasi-quoter for Happy parsers"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; + broken = true; }; }) diff --git a/pkgs/development/tools/haskell/haskdogs/default.nix b/pkgs/development/tools/haskell/haskdogs/default.nix index 06a6b04bb5908d382b7b242701f7cdad1367b522..27e4876ea09312151f3a04c00a030ac3830b69c9 100644 --- a/pkgs/development/tools/haskell/haskdogs/default.nix +++ b/pkgs/development/tools/haskell/haskdogs/default.nix @@ -14,6 +14,5 @@ cabal.mkDerivation (self: { description = "Generate ctags file for haskell project directory and it's deps"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/tools/haskell/hlint/default.nix b/pkgs/development/tools/haskell/hlint/default.nix index be3b7ef2930e53640c1b769a5840f55d6e783509..4fe5f01c3d18b4e72bb3e72be0a7e06d89b5001a 100644 --- a/pkgs/development/tools/haskell/hlint/default.nix +++ b/pkgs/development/tools/haskell/hlint/default.nix @@ -6,20 +6,18 @@ cabal.mkDerivation (self: { pname = "hlint"; - version = "1.9"; - sha256 = "1c8qpfrivsxx6raqnrz40li73hng4z0ygc1hl70qixbmsmv2a830"; + version = "1.9.3"; + sha256 = "1sdz981yq0amsw9q6hx0aqkd0ayrax5p77s3n3gz4bphpk37n09b"; isLibrary = true; isExecutable = true; buildDepends = [ cmdargs cpphs filepath haskellSrcExts hscolour transformers uniplate ]; - jailbreak = true; meta = { homepage = "http://community.haskell.org/~ndm/hlint/"; description = "Source code suggestions"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/tools/haskell/hp2any-manager/default.nix b/pkgs/development/tools/haskell/hp2any-manager/default.nix index 3bbf65bcf7a48ea78798cfa418f060415353131a..537550e989fb3f946f114e250351faf82cd9cfb6 100644 --- a/pkgs/development/tools/haskell/hp2any-manager/default.nix +++ b/pkgs/development/tools/haskell/hp2any-manager/default.nix @@ -19,5 +19,6 @@ cabal.mkDerivation (self: { description = "A utility to visualise and compare heap profiles"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/tools/haskell/hscolour/default.nix b/pkgs/development/tools/haskell/hscolour/default.nix index fa41d7fb35c8ae8a11cb3600e3424219963e0aa0..bb00ade3d4c2d4aa06edc231ac9e1d6460eb64b3 100644 --- a/pkgs/development/tools/haskell/hscolour/default.nix +++ b/pkgs/development/tools/haskell/hscolour/default.nix @@ -13,6 +13,5 @@ cabal.mkDerivation (self: { description = "Colourise Haskell code"; license = "GPL"; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/tools/haskell/hslogger/default.nix b/pkgs/development/tools/haskell/hslogger/default.nix index af8300bf91f5c0271d7eb3e3095e14c236aaef6e..43da5b21ca4e7a02fdd6609b7ee10595a8721142 100644 --- a/pkgs/development/tools/haskell/hslogger/default.nix +++ b/pkgs/development/tools/haskell/hslogger/default.nix @@ -14,6 +14,5 @@ cabal.mkDerivation (self: { description = "Versatile logging framework"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/tools/haskell/keter/default.nix b/pkgs/development/tools/haskell/keter/default.nix index 496ba1d3e48907fd08be9d00a943bc7d870f06ce..34bc45e7471644e25d2e7495a5d7b77fc070cb17 100644 --- a/pkgs/development/tools/haskell/keter/default.nix +++ b/pkgs/development/tools/haskell/keter/default.nix @@ -11,8 +11,8 @@ cabal.mkDerivation (self: { pname = "keter"; - version = "1.3.2"; - sha256 = "1vmn7aaljwg3gv6vbj9z5w2mffsls5d6mzs4rg9s3rh8khb14cr0"; + version = "1.3.3"; + sha256 = "1i4yjzqp8if0h88k8ga0dvqbrh57nvcr9dbfbj1sdw40pd74yb3i"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/tools/haskell/threadscope/default.nix b/pkgs/development/tools/haskell/threadscope/default.nix index d52b4dec70f40c4345fc8f18ddd84f430700e2cc..892faca8e8cd248c82a125f2a44e751d1a981e79 100644 --- a/pkgs/development/tools/haskell/threadscope/default.nix +++ b/pkgs/development/tools/haskell/threadscope/default.nix @@ -19,6 +19,7 @@ cabal.mkDerivation (self: { description = "A graphical tool for profiling parallel Haskell programs"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; + broken = true; }; }) diff --git a/pkgs/development/tools/haskell/uuagc/bootstrap.nix b/pkgs/development/tools/haskell/uuagc/bootstrap.nix index ddd4890261d133c6c47a6512a8fe183d498c2376..5e954c526c413ba998af5b919b658671eb6ecc27 100644 --- a/pkgs/development/tools/haskell/uuagc/bootstrap.nix +++ b/pkgs/development/tools/haskell/uuagc/bootstrap.nix @@ -14,6 +14,5 @@ cabal.mkDerivation (self: { description = "Attribute Grammar System of Universiteit Utrecht"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/tools/haskell/uuagc/cabal.nix b/pkgs/development/tools/haskell/uuagc/cabal.nix index 79c8f513b9b862c0b68cbbe31aec37522851ad24..1a735a2471e9707fa0c9cf26cf8e3b62109bea9e 100644 --- a/pkgs/development/tools/haskell/uuagc/cabal.nix +++ b/pkgs/development/tools/haskell/uuagc/cabal.nix @@ -12,6 +12,5 @@ cabal.mkDerivation (self: { description = "Cabal plugin for the Universiteit Utrecht Attribute Grammar System"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/tools/haskell/uuagc/default.nix b/pkgs/development/tools/haskell/uuagc/default.nix index 43cf0cafd22d2602b3ac3272e52b64d05e3db47d..230174dccbc6b96cb3c5fd0f6dc8f48f94134354 100644 --- a/pkgs/development/tools/haskell/uuagc/default.nix +++ b/pkgs/development/tools/haskell/uuagc/default.nix @@ -14,6 +14,5 @@ cabal.mkDerivation (self: { description = "Attribute Grammar System of Universiteit Utrecht"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/tools/java/fastjar/default.nix b/pkgs/development/tools/java/fastjar/default.nix index cfcd8564b4ccb4ef3d5c8da772f6733fa78f76e8..c8bb94412cad6cd3e1e1eb978cb3daedf88fab59 100644 --- a/pkgs/development/tools/java/fastjar/default.nix +++ b/pkgs/development/tools/java/fastjar/default.nix @@ -24,7 +24,7 @@ let version = "0.94"; in homepage = http://fastjar.sourceforge.net/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ ]; }; diff --git a/pkgs/development/tools/literate-programming/noweb/default.nix b/pkgs/development/tools/literate-programming/noweb/default.nix index 291bc29e1b70097e58f86b36e9d9da0e1e49c2d7..4f8691c40adb267e640c631b69341cebeac84880 100644 --- a/pkgs/development/tools/literate-programming/noweb/default.nix +++ b/pkgs/development/tools/literate-programming/noweb/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "10hdd6mrk26kyh4bnng4ah5h1pnanhsrhqa7qwqy6dyv3rng44y9"; }; preBuild = '' - ensureDir $out/lib/noweb + mkdir -p $out/lib/noweb cd src makeFlags="BIN=$out/bin LIB=$out/lib/noweb MAN=$out/share/man TEXINPUTS=$out/share/texmf/tex/latex" ''; diff --git a/pkgs/development/tools/misc/autobuild/default.nix b/pkgs/development/tools/misc/autobuild/default.nix index 88246e4bb6eb180c839b437e477cf3b03372d60e..b35ec4357c4f7a6028f478950805c7067c7c8779 100644 --- a/pkgs/development/tools/misc/autobuild/default.nix +++ b/pkgs/development/tools/misc/autobuild/default.nix @@ -34,6 +34,6 @@ stdenv.mkDerivation rec { ''; homepage = http://josefsson.org/autobuild/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/development/tools/misc/autoconf/2.13.nix b/pkgs/development/tools/misc/autoconf/2.13.nix index f6793e3aeec02368a994c69126b76c321394b52d..c3b44ca56863f6049586dd55a03651fc688cb175 100644 --- a/pkgs/development/tools/misc/autoconf/2.13.nix +++ b/pkgs/development/tools/misc/autoconf/2.13.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { can use, in the form of M4 macro calls. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/development/tools/misc/autoconf/default.nix b/pkgs/development/tools/misc/autoconf/default.nix index 08fcd95afb5e7e6e0159e14dbb8b329e53e5fa34..4dca332722bf3d94a0330b7bfe53c49744f1f8c9 100644 --- a/pkgs/development/tools/misc/autoconf/default.nix +++ b/pkgs/development/tools/misc/autoconf/default.nix @@ -14,7 +14,8 @@ stdenv.mkDerivation rec { # http://thread.gmane.org/gmane.comp.sysutils.autoconf.bugs/6822 for # details. # There are many test failures on `i386-pc-solaris2.11'. - doCheck = ((!stdenv.isCygwin) && (!stdenv.isSunOS)); + #doCheck = ((!stdenv.isCygwin) && (!stdenv.isSunOS)); + doCheck = false; # Don't fixup "#! /bin/sh" in Autoconf, otherwise it will use the # "fixed" path in generated files! @@ -41,7 +42,7 @@ stdenv.mkDerivation rec { can use, in the form of M4 macro calls. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; }; diff --git a/pkgs/development/tools/misc/automake/automake-1.11.x.nix b/pkgs/development/tools/misc/automake/automake-1.11.x.nix index 0af9877c935526c040bf9485c88e18c1a7f56d7e..2cd80eb4bac561d2f46c582b46d8f1b2322b6adc 100644 --- a/pkgs/development/tools/misc/automake/automake-1.11.x.nix +++ b/pkgs/development/tools/misc/automake/automake-1.11.x.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { Standards. Automake requires the use of Autoconf. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; }; diff --git a/pkgs/development/tools/misc/automake/automake-1.12.x.nix b/pkgs/development/tools/misc/automake/automake-1.12.x.nix index 269d423f2fab79180e0602fb583a0e5ee9ed9f98..6a93cdc78fdc99216d4800d387a57efe75fe6464 100644 --- a/pkgs/development/tools/misc/automake/automake-1.12.x.nix +++ b/pkgs/development/tools/misc/automake/automake-1.12.x.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { Standards. Automake requires the use of Autoconf. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; }; diff --git a/pkgs/development/tools/misc/automake/automake-1.13.x.nix b/pkgs/development/tools/misc/automake/automake-1.13.x.nix index 96a93e8d60b58969ea6c1ae8c5ab692c8e766ee5..d4369787f1b6e07a63ae5f22399f0fc76c08984f 100644 --- a/pkgs/development/tools/misc/automake/automake-1.13.x.nix +++ b/pkgs/development/tools/misc/automake/automake-1.13.x.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.gnu.org/software/automake/"; description = "GNU standard-compliant makefile generator"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; longDescription = '' GNU Automake is a tool for automatically generating diff --git a/pkgs/development/tools/misc/automake/automake-1.14.x.nix b/pkgs/development/tools/misc/automake/automake-1.14.x.nix index d20ea2c2e91cae4e7dd85a08688c4fbf23ee31e6..0c6ed42825a9d75618d3888a3e410f51fb6bf3ef 100644 --- a/pkgs/development/tools/misc/automake/automake-1.14.x.nix +++ b/pkgs/development/tools/misc/automake/automake-1.14.x.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.gnu.org/software/automake/"; description = "GNU standard-compliant makefile generator"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; longDescription = '' GNU Automake is a tool for automatically generating diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index 3caeee7287a1b5c351f4f5499f05058f2992f003..8d8fc5d464e89f3551a2f1e5f8e487567d4cf659 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/binutils/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; /* Give binutils a lower priority than gcc-wrapper to prevent a collision due to the ld/as wrappers/symlinks in the latter. */ diff --git a/pkgs/development/tools/misc/cbrowser/default.nix b/pkgs/development/tools/misc/cbrowser/default.nix index bf927db2793c4f21dd5234bb1bfe872e2fdd0463..2cc8e640631a62664a5bac492706174ea4b55260 100644 --- a/pkgs/development/tools/misc/cbrowser/default.nix +++ b/pkgs/development/tools/misc/cbrowser/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "Tcl/Tk GUI front-end to cscope"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://sourceforge.net/projects/cbrowser/; diff --git a/pkgs/development/tools/misc/cflow/default.nix b/pkgs/development/tools/misc/cflow/default.nix index d9be5802fa95ca756e6889da24e7a643553c50c5..53bc8ed78c8bc1a9196dc4045458e0b5ed605fe6 100644 --- a/pkgs/development/tools/misc/cflow/default.nix +++ b/pkgs/development/tools/misc/cflow/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { produced flowcharts in Emacs. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; homepage = http://www.gnu.org/software/cflow/; diff --git a/pkgs/development/tools/misc/cgdb/default.nix b/pkgs/development/tools/misc/cgdb/default.nix index d313d271afbbf51dd5a9cefd32a1374edb2744d6..09c9325d4ff27e717176dbff21b4918ddbcccce5 100644 --- a/pkgs/development/tools/misc/cgdb/default.nix +++ b/pkgs/development/tools/misc/cgdb/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { repositories.git = git://github.com/cgdb/cgdb.git; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = with stdenv.lib.platforms; linux ++ cygwin; maintainers = with stdenv.lib.maintainers; [ viric ]; diff --git a/pkgs/development/tools/misc/coccinelle/default.nix b/pkgs/development/tools/misc/coccinelle/default.nix index 122c256657f0a7360f668a7101c89bf7a5f9d11c..0bf5bbce692d3c6a500cfeb05eaa920a97409ac8 100644 --- a/pkgs/development/tools/misc/coccinelle/default.nix +++ b/pkgs/development/tools/misc/coccinelle/default.nix @@ -54,7 +54,7 @@ in stdenv.mkDerivation { ''; homepage = http://coccinelle.lip6.fr/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ ]; platforms = stdenv.lib.platforms.gnu; # arbitrary choice diff --git a/pkgs/development/tools/misc/complexity/default.nix b/pkgs/development/tools/misc/complexity/default.nix index cfdc35f1b34646ad906da1f86f6e7d1f3762f1a9..9f1eca0fa13c7fcb6c90dffdc3db68fec1a2811c 100644 --- a/pkgs/development/tools/misc/complexity/default.nix +++ b/pkgs/development/tools/misc/complexity/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { addresses several issues not considered in that scoring scheme. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; homepage = http://www.gnu.org/software/complexity/; diff --git a/pkgs/development/tools/misc/cpphs/default.nix b/pkgs/development/tools/misc/cpphs/default.nix index edd0a52f2c6f04767177a6fe3e57e4cfa1702af2..f3a724f30399bdd1193c7145e1149def08c18597 100644 --- a/pkgs/development/tools/misc/cpphs/default.nix +++ b/pkgs/development/tools/misc/cpphs/default.nix @@ -14,6 +14,5 @@ cabal.mkDerivation (self: { description = "A liberalised re-implementation of cpp, the C pre-processor"; license = "LGPL"; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/tools/misc/cppi/default.nix b/pkgs/development/tools/misc/cppi/default.nix index f9246df9e56714a21c8712ddc8d7efed477c68aa..500129c7c9de5f402857c85a3209b40b050ec7bc 100644 --- a/pkgs/development/tools/misc/cppi/default.nix +++ b/pkgs/development/tools/misc/cppi/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { to the level of nesting of that directive. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/tools/misc/ddd/default.nix b/pkgs/development/tools/misc/ddd/default.nix index 0a6895aff6b9ae38b9cf5f42a9438e4079e3b67d..91150255bdaa550909f27d05c66b8187b50eac80 100644 --- a/pkgs/development/tools/misc/ddd/default.nix +++ b/pkgs/development/tools/misc/ddd/default.nix @@ -13,6 +13,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.gnu.org/software/ddd; description = "Graphical front-end for command-line debuggers"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/development/tools/misc/dejagnu/default.nix b/pkgs/development/tools/misc/dejagnu/default.nix index 9e400cc5c62a3edfc8c4b8df3e77ce70639920a3..d3c2e7e63890b0edc64a843d96d27175156ce432 100644 --- a/pkgs/development/tools/misc/dejagnu/default.nix +++ b/pkgs/development/tools/misc/dejagnu/default.nix @@ -47,9 +47,9 @@ stdenv.mkDerivation rec { ''; homepage = http://www.gnu.org/software/dejagnu/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.all; + platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.ludo ]; }; } diff --git a/pkgs/development/tools/misc/dfu-programmer/default.nix b/pkgs/development/tools/misc/dfu-programmer/default.nix index 93dceb60f8d9ed80425ea43828c2b3b69f22b76f..2df687b8bc6b8af5bb04f2226ad5cc949be63773 100644 --- a/pkgs/development/tools/misc/dfu-programmer/default.nix +++ b/pkgs/development/tools/misc/dfu-programmer/default.nix @@ -1,21 +1,18 @@ -{ stdenv, fetchurl, libusb1 }: +{ stdenv, fetchurl, libusb }: let - version = "0.6.2"; + version = "0.7.0"; in stdenv.mkDerivation rec { name="dfu-programmer-${version}"; - buildInputs = [ libusb1 ]; + buildInputs = [ libusb ]; src = fetchurl { url = "mirror://sourceforge/dfu-programmer/${name}.tar.gz"; - sha256 = "0rdg4h5alpa3py3v3xgvn2vcgmnbj077am90jqj83nad89m9c801"; + sha256 = "17lglglk5xrqd2n0impg5bkq4j96qc51cw3kzcghzmzmn6fvg3gf"; }; - preConfigure = '' - substituteInPlace configure \ - --replace "/usr/include/libusb-1.0" "${libusb1}/include/libusb-1.0" - ''; + configureFlags = [ "--disable-libusb_1_0" ]; meta = with stdenv.lib; { license = licenses.gpl2; diff --git a/pkgs/development/tools/misc/distcc/masq.nix b/pkgs/development/tools/misc/distcc/masq.nix index 117480670c39f52aaccf9d579f5ce39be3238d4c..753c35b5d3a25fafb7f4beaa933bbdc8eb65442e 100644 --- a/pkgs/development/tools/misc/distcc/masq.nix +++ b/pkgs/development/tools/misc/distcc/masq.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { phases = [ "installPhase" ]; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin bin=${gccRaw}/bin diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index b3a86a03d97cfdb7a983db8c4cdbe19dbceb0da5..2b5ced78063314086f98d120467f08b41b26ed29 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/gdb/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; platforms = with platforms; linux ++ cygwin ++ darwin; maintainers = with maintainers; [ pierron ]; diff --git a/pkgs/development/tools/misc/gengetopt/default.nix b/pkgs/development/tools/misc/gengetopt/default.nix index d0efe4e62494982c5f5ddbc2e04b1eb9ed95f7b0..9926dd6cd33477936f30bb27ae7b8a47aaf1be2c 100644 --- a/pkgs/development/tools/misc/gengetopt/default.nix +++ b/pkgs/development/tools/misc/gengetopt/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/gengetopt/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/tools/misc/global/default.nix b/pkgs/development/tools/misc/global/default.nix index fdb5f72af83066da557cdcf19f653dcb1312b274..d6abf8d10bdb5acf6a68da545d4b8a3d9414ff9f 100644 --- a/pkgs/development/tools/misc/global/default.nix +++ b/pkgs/development/tools/misc/global/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { operating system like GNU and BSD. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; homepage = http://www.gnu.org/software/global/; diff --git a/pkgs/development/tools/misc/gnum4/default.nix b/pkgs/development/tools/misc/gnum4/default.nix index 75e8e2dfe4fd9e0555ba7a1f281cac858a1af20b..67688254a4072e6c02fa7b13b5d09701bf3ed1b0 100644 --- a/pkgs/development/tools/misc/gnum4/default.nix +++ b/pkgs/development/tools/misc/gnum4/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { compiler or as a macro processor in its own right. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; }; } diff --git a/pkgs/development/tools/misc/gob2/default.nix b/pkgs/development/tools/misc/gob2/default.nix index 2f35f96e93290cc40edf02eeb5bb4d6c8167ec88..a434e54bba9fa60997744a090fdd70f3421b55c7 100644 --- a/pkgs/development/tools/misc/gob2/default.nix +++ b/pkgs/development/tools/misc/gob2/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { meta = { description = "Preprocessor for making GObjects with inline C code"; homepage = http://www.jirka.org/gob.html; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/development/tools/misc/gperf/default.nix b/pkgs/development/tools/misc/gperf/default.nix index 478d2162b33790e168d152329fd7344ab3b1c4f7..e25998e542043f69e1e63a2a46b7b82a07ef7bc3 100644 --- a/pkgs/development/tools/misc/gperf/default.nix +++ b/pkgs/development/tools/misc/gperf/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { employed by gperf. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; homepage = http://www.gnu.org/software/gperf/; }; diff --git a/pkgs/development/tools/misc/grafana/default.nix b/pkgs/development/tools/misc/grafana/default.nix index 346c7fb6ad29f82417547d5a8a4cf2923b76eb54..b1566684cf0b2ec86874ef833e3bc0bffa25b9d5 100644 --- a/pkgs/development/tools/misc/grafana/default.nix +++ b/pkgs/development/tools/misc/grafana/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { phases = ["unpackPhase" "installPhase"]; installPhase = '' - ensureDir $out && cp -R * $out + mkdir -p $out && cp -R * $out ${optionalString (conf!=null) ''cp ${conf} $out/config.js''} ''; diff --git a/pkgs/development/tools/misc/gtkdialog/default.nix b/pkgs/development/tools/misc/gtkdialog/default.nix index b447cf918cf1696414792cb555069799939d14e4..cd8ad0d64cd74c3ab38d65e6340062b7f791350b 100644 --- a/pkgs/development/tools/misc/gtkdialog/default.nix +++ b/pkgs/development/tools/misc/gtkdialog/default.nix @@ -13,6 +13,6 @@ stdenv.mkDerivation { meta = { homepage = http://gtkdialog.googlecode.com/; description = "Small utility for fast and easy GUI building from many scripted and compiled languages"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/development/tools/misc/help2man/default.nix b/pkgs/development/tools/misc/help2man/default.nix index 2d60a06fb3e1d0191ad98ef736b9e7c3c837209b..23bd35c8739a44047fb75fdd4ba8c426f0b0adaf 100644 --- a/pkgs/development/tools/misc/help2man/default.nix +++ b/pkgs/development/tools/misc/help2man/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/help2man/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.gnu; # arbitrary choice maintainers = [ stdenv.lib.maintainers.ludo ]; }; diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix index caa277bfbf5f26ba351c734563185f3b08b8f2da..0940bcca191ad25fb297db8ba516768f0a11b11f 100644 --- a/pkgs/development/tools/misc/hydra/default.nix +++ b/pkgs/development/tools/misc/hydra/default.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation { meta = { description = "Hydra, the Nix-based continuous integration system"; homepage = http://nixos.org/hydra/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/tools/misc/indent/default.nix b/pkgs/development/tools/misc/indent/default.nix index 0c82c2cd2759473f6c9f3893ec06a76b831975d6..17714b7a9d45b141f57a09c44adb13421f18747b 100644 --- a/pkgs/development/tools/misc/indent/default.nix +++ b/pkgs/development/tools/misc/indent/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.gnu.org/software/indent/; description = "A source code reformatter"; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; }; } diff --git a/pkgs/development/tools/misc/inotify-tools/default.nix b/pkgs/development/tools/misc/inotify-tools/default.nix index 0465b6d90a895792b65c3bc3bc215394c9f1b39f..086f4b5fed33c5395fc4db97ac1b75797d91d2c3 100644 --- a/pkgs/development/tools/misc/inotify-tools/default.nix +++ b/pkgs/development/tools/misc/inotify-tools/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { meta = { homepage = http://sourceforge.net/projects/inotify-tools/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.marcweber ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/tools/misc/intel-gpu-tools/default.nix b/pkgs/development/tools/misc/intel-gpu-tools/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..14bfe74821de899be61619d97414f69b48fbfb5e --- /dev/null +++ b/pkgs/development/tools/misc/intel-gpu-tools/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, pkgconfig, libdrm, libpciaccess, cairo, dri2proto, udev, libX11, libXext, libXv, libXrandr, glib, bison }: + +stdenv.mkDerivation rec { + name = "intel-gpu-tools-1.7"; + + src = fetchurl { + url = "http://xorg.freedesktop.org/archive/individual/app/${name}.tar.bz2"; + sha256 = "0yi0024kr1xzglkkhyjpxr081bmwvdakb61az6wiidfrpd1j6q92"; + }; + + configureFlags = [ "--disable-tests" ]; + + buildInputs = [ pkgconfig libdrm libpciaccess cairo dri2proto udev libX11 libXext libXv libXrandr glib bison ]; + + meta = with stdenv.lib; { + homepage = https://01.org/linuxgraphics/; + description = "Tools for development and testing of the Intel DRM driver"; + license = licenses.mit; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/tools/misc/jscoverage/default.nix b/pkgs/development/tools/misc/jscoverage/default.nix index c7f790b7d50a55160dc41b60827416bb38d1b329..07ef5ffc082dd074597b3f25542a9a56cbd80668 100644 --- a/pkgs/development/tools/misc/jscoverage/default.nix +++ b/pkgs/development/tools/misc/jscoverage/default.nix @@ -42,6 +42,6 @@ stdenv.mkDerivation rec { ''; homepage = http://siliconforks.com/jscoverage/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/development/tools/misc/libtool/default.nix b/pkgs/development/tools/misc/libtool/default.nix index 78cd15e04bdb7499bde73d777c912959e5dd84c9..5eee9ead5d6367282cd783e6f38be92362ad1e47 100644 --- a/pkgs/development/tools/misc/libtool/default.nix +++ b/pkgs/development/tools/misc/libtool/default.nix @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/libtool/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/development/tools/misc/libtool/libtool2.nix b/pkgs/development/tools/misc/libtool/libtool2.nix index 4c3500c65a24ccfe07ab13635054210125a3c881..8b0a92c124458dd26ec22b310b149b8913911216 100644 --- a/pkgs/development/tools/misc/libtool/libtool2.nix +++ b/pkgs/development/tools/misc/libtool/libtool2.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation (rec { homepage = http://www.gnu.org/software/libtool/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; }; diff --git a/pkgs/development/tools/misc/lttng-tools/default.nix b/pkgs/development/tools/misc/lttng-tools/default.nix index 541385d8bec274e977c2893f0188fc1115edf9f1..5758500d86f99c9ad2ac86a65269acb9794a7a74 100644 --- a/pkgs/development/tools/misc/lttng-tools/default.nix +++ b/pkgs/development/tools/misc/lttng-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, popt, libuuid, liburcu, lttngUst, kmod }: +{ stdenv, fetchurl, popt, libuuid, liburcu, lttng-ust, kmod }: stdenv.mkDerivation rec { name = "lttng-tools-2.4.1"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1v9f7a3c2shwgn4g759bblgr27h9ql9sfq71r1mbkf8rd235g2jr"; }; - buildInputs = [ popt libuuid liburcu lttngUst ]; + buildInputs = [ popt libuuid liburcu lttng-ust ]; prePatch = '' sed -e "s|/sbin/modprobe|${kmod}/sbin/modprobe|g" \ diff --git a/pkgs/development/tools/misc/ninka/default.nix b/pkgs/development/tools/misc/ninka/default.nix index a5410204340816751e9dda6e80fc192ded24d3c3..dc7eb5cabfd0ce28e0958ed8984872472c10ab21 100644 --- a/pkgs/development/tools/misc/ninka/default.nix +++ b/pkgs/development/tools/misc/ninka/default.nix @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { meta = { description = "A sentence based license detector"; homepage = "http://ninka.turingmachine.org/"; - license = "AGPLv3+"; + license = stdenv.lib.licenses.agpl3Plus; }; } diff --git a/pkgs/development/tools/misc/opengrok/default.nix b/pkgs/development/tools/misc/opengrok/default.nix index 8f77b3d7283a431f50e0347c9b32b54d62ac6449..d38c862ecfb1e14aaef5e5601b0d3b994e61ecae 100644 --- a/pkgs/development/tools/misc/opengrok/default.nix +++ b/pkgs/development/tools/misc/opengrok/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ makeWrapper ]; installPhase = '' - ensureDir $out + mkdir -p $out cp -a * $out/ substituteInPlace $out/bin/OpenGrok --replace /bin/uname ${coreutils}/bin/uname wrapProgram $out/bin/OpenGrok \ diff --git a/pkgs/development/tools/misc/pmccabe/default.nix b/pkgs/development/tools/misc/pmccabe/default.nix index 10cf371f13a82c315080a214bb7cdaf5d56f653f..a71afd5d47299b7501c18dff19a7a5c443d57814 100644 --- a/pkgs/development/tools/misc/pmccabe/default.nix +++ b/pkgs/development/tools/misc/pmccabe/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "McCabe-style function complexity and line counting for C and C++"; homepage = http://www.parisc-linux.org/~bame/pmccabe/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; longDescription = '' pmccabe calculates McCabe-style cyclomatic complexity for C and diff --git a/pkgs/development/tools/misc/sloccount/default.nix b/pkgs/development/tools/misc/sloccount/default.nix index 9dc50abf3f73210637ed1d4a8afad9435bbfee0a..455305be7492221a0cca4c1789ea95e6f40d0b70 100644 --- a/pkgs/development/tools/misc/sloccount/default.nix +++ b/pkgs/development/tools/misc/sloccount/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { the Perl CPAN library using this tool suite. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://www.dwheeler.com/sloccount/; diff --git a/pkgs/development/tools/misc/stm32flash/default.nix b/pkgs/development/tools/misc/stm32flash/default.nix index 6b99a5755e42da3793b41d091340d78398ee879d..6b06bf385b3b818f6f707c35813748daf97a1ac7 100644 --- a/pkgs/development/tools/misc/stm32flash/default.nix +++ b/pkgs/development/tools/misc/stm32flash/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Open source flash program for the STM32 ARM processors using the ST bootloader"; homepage = https://code.google.com/p/stm32flash/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = platforms.all; # Should work on all platforms maintainers = [ maintainers.the-kenny ]; }; diff --git a/pkgs/development/tools/misc/sysbench/default.nix b/pkgs/development/tools/misc/sysbench/default.nix index e3acf620c73b43e131680e95ee4ca806404094ef..1b4cab361ce5228e44f3523b5957f087b9591722 100644 --- a/pkgs/development/tools/misc/sysbench/default.nix +++ b/pkgs/development/tools/misc/sysbench/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "Modular, cross-platform and multi-threaded benchmark tool"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/tools/misc/texi2html/default.nix b/pkgs/development/tools/misc/texi2html/default.nix index 7fa604e4af6595ac9799cde61abed503c08e0d1b..1f36a14fa9796d28d0551267ca8f6fff4345717b 100644 --- a/pkgs/development/tools/misc/texi2html/default.nix +++ b/pkgs/development/tools/misc/texi2html/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "Perl script which converts Texinfo source files to HTML output"; homepage = http://www.nongnu.org/texi2html/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [stdenv.lib.maintainers.marcweber]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/tools/misc/texinfo/4.13a.nix b/pkgs/development/tools/misc/texinfo/4.13a.nix index 9a41d2963424a8843c061995a082eaa4626c2d5d..5131d38141235fc5426b6dfa84282d4c0852d114 100644 --- a/pkgs/development/tools/misc/texinfo/4.13a.nix +++ b/pkgs/development/tools/misc/texinfo/4.13a.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { well-integrated with GNU Emacs. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; homepage = http://www.gnu.org/software/texinfo/; }; diff --git a/pkgs/development/tools/misc/uisp/default.nix b/pkgs/development/tools/misc/uisp/default.nix index 732d3ab92c15d848af89dac7ef7960885f0e61d5..234ff82b50a072dc73ba1dbf37428419e74bd2d6 100644 --- a/pkgs/development/tools/misc/uisp/default.nix +++ b/pkgs/development/tools/misc/uisp/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { meta = { description = "Tool for AVR microcontrollers which can interface to many hardware in-system programmers"; - license = "GPL-2"; + license = stdenv.lib.licenses.gpl2; homepage = http://savannah.nongnu.org/projects/uisp; }; } diff --git a/pkgs/development/tools/misc/usb-modeswitch/default.nix b/pkgs/development/tools/misc/usb-modeswitch/default.nix index 303cdf89a0507a443cfaee6a1209e344501790be..bba7ef7fad04ff20de7d249dad4027731560d03c 100644 --- a/pkgs/development/tools/misc/usb-modeswitch/default.nix +++ b/pkgs/development/tools/misc/usb-modeswitch/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig libusb1 ]; meta = { - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.marcweber ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/tools/misc/xxdiff/default.nix b/pkgs/development/tools/misc/xxdiff/default.nix index 36047210a9244df7924d252f039df2a2366ff109..1d7e6b330423cfcd3dc9d4f02f8905de91a17efe 100644 --- a/pkgs/development/tools/misc/xxdiff/default.nix +++ b/pkgs/development/tools/misc/xxdiff/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://furius.ca/xxdiff/"; description = "graphical file and directories comparator and merge tool"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; maintainers = []; diff --git a/pkgs/development/tools/node-webkit/default.nix b/pkgs/development/tools/node-webkit/default.nix index be125801bd50d3bfcbd4d07b3980ff9b83bb005b..1f101776064273d973b027fb92c8f5e037fd97e5 100644 --- a/pkgs/development/tools/node-webkit/default.nix +++ b/pkgs/development/tools/node-webkit/default.nix @@ -16,13 +16,13 @@ let in stdenv.mkDerivation rec { name = "node-webkit-${version}"; - version = "0.8.4"; + version = "0.9.2"; src = fetchurl { url = "https://s3.amazonaws.com/node-webkit/v${version}/node-webkit-v${version}-linux-${bits}.tar.gz"; sha256 = if bits == "x64" then - "91229edfb03349306c5ce101fdab2de55f7473cc7c36367e9611a0527d2ef591" else - "12axppynangh0q72swzqcmz2blncgm2dw9n489313ybnp2p42hnp"; + "04b9hgrxxnvrzyc7kmlabvrfbzj9d6lif7z69zgsbn3x25nxxd2n" else + "0icwdl564sbx27124js1l4whfld0n6nbysdd522frzk1759dzgri"; }; patchPhase = '' @@ -33,8 +33,8 @@ in stdenv.mkDerivation rec { installPhase = let LD_LIBRARY_PATH = "${nwEnv}/lib:${nwEnv}/lib64:$out/share/node-webkit"; in '' - ensureDir $out/bin - ensureDir $out/share/node-webkit + mkdir -p $out/bin + mkdir -p $out/share/node-webkit cp -R * $out/share/node-webkit ln -s ${udev}/lib/libudev.so $out/share/node-webkit/libudev.so.0 diff --git a/pkgs/development/tools/ocaml/deriving/default.nix b/pkgs/development/tools/ocaml/deriving/default.nix index d53f41b5da5cd016530a44a136bb843a090bb686..55bbf3748ea919f6f30ab5460da962a5b3404658 100644 --- a/pkgs/development/tools/ocaml/deriving/default.nix +++ b/pkgs/development/tools/ocaml/deriving/default.nix @@ -52,7 +52,7 @@ versionedDerivation "ocaml-deriving" version { # not all tests compile !? # (cd tests; make) - ensureDir $out/bin + mkdir -p $out/bin cp -a lib $out/ cp -a syntax $out diff --git a/pkgs/development/tools/ocaml/findlib/default.nix b/pkgs/development/tools/ocaml/findlib/default.nix index 18b03f5923bf75f73f9ba13596b72308785b2f8b..4c0176de7e8898231af3b02306c03467e921ef95 100644 --- a/pkgs/development/tools/ocaml/findlib/default.nix +++ b/pkgs/development/tools/ocaml/findlib/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation { meta = { homepage = http://projects.camlcity.org/projects/findlib.html; description = "O'Caml library manager"; - license = "MIT/X11"; + license = stdenv.lib.licenses.mit; platforms = ocaml.meta.platforms; maintainers = [ stdenv.lib.maintainers.z77z diff --git a/pkgs/development/tools/ocaml/merlin/default.nix b/pkgs/development/tools/ocaml/merlin/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..c0882439f5c5d8d97ade673cad1892b4578a153f --- /dev/null +++ b/pkgs/development/tools/ocaml/merlin/default.nix @@ -0,0 +1,21 @@ +{stdenv, fetchurl, ocaml, findlib, easy-format, biniou, yojson, menhir}: +stdenv.mkDerivation { + + name = "merlin-1.6"; + + src = fetchurl { + url = "https://github.com/the-lambda-church/merlin/archive/v1.6.tar.gz"; + sha256 = "0wq75hgffaszazrhkl0nfjxgx8bvazi2sjannd8q64hvax8hxzcy"; + }; + + buildInputs = [ ocaml findlib biniou yojson menhir easy-format ]; + + prefixKey = "--prefix "; + + meta = { + description = "An editor-independant tool to ease the developpement of programs in OCaml"; + homepage = "http://the-lambda-church.github.io/merlin/"; + license = stdenv.lib.licenses.mit; + }; +} + diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix index 5cea753dd9c3b90958a08274a03c1194fab6cca1..073de5137f857aceeeafc0f7d48bc79f9b985ee1 100644 --- a/pkgs/development/tools/packer/default.nix +++ b/pkgs/development/tools/packer/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { XC_ARCH=$(go env GOARCH) XC_OS=$(go env GOOS) - ensureDir $out/bin + mkdir -p $out/bin cd $src/src/github.com/mitchellh/packer gox \ diff --git a/pkgs/development/tools/parsing/Ebnf2ps/default.nix b/pkgs/development/tools/parsing/Ebnf2ps/default.nix index 5267849a9bc31015f4049184c25e0cff92a72b11..b3d4c125bb9e949ed896b378dfc5fdbc10d084a1 100644 --- a/pkgs/development/tools/parsing/Ebnf2ps/default.nix +++ b/pkgs/development/tools/parsing/Ebnf2ps/default.nix @@ -14,6 +14,5 @@ cabal.mkDerivation (self: { description = "Peter's Syntax Diagram Drawing Tool"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/tools/parsing/alex/2.3.1.nix b/pkgs/development/tools/parsing/alex/2.3.1.nix index b38979256c664d6e8af734d7413062a6af7f86e4..83138e2e0ffd90d18926f6c02461e6801e1b350e 100644 --- a/pkgs/development/tools/parsing/alex/2.3.1.nix +++ b/pkgs/development/tools/parsing/alex/2.3.1.nix @@ -14,6 +14,7 @@ cabal.mkDerivation (self: { description = "Alex is a tool for generating lexical analysers in Haskell"; 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/tools/parsing/alex/2.3.2.nix b/pkgs/development/tools/parsing/alex/2.3.2.nix index dc4a0261c4a9acc23895cc03d02701f4d3625200..0bc13d16017064a29240550a5985af78a250c333 100644 --- a/pkgs/development/tools/parsing/alex/2.3.2.nix +++ b/pkgs/development/tools/parsing/alex/2.3.2.nix @@ -14,6 +14,7 @@ cabal.mkDerivation (self: { description = "Alex is a tool for generating lexical analysers in Haskell"; 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/tools/parsing/alex/2.3.3.nix b/pkgs/development/tools/parsing/alex/2.3.3.nix index 146f784463e4a2b0776e1c5a0eec3f535b6dc19c..ccef30058c50ce51999cf2f3eb9ee590387f2730 100644 --- a/pkgs/development/tools/parsing/alex/2.3.3.nix +++ b/pkgs/development/tools/parsing/alex/2.3.3.nix @@ -14,6 +14,7 @@ cabal.mkDerivation (self: { description = "Alex is a tool for generating lexical analysers in Haskell"; 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/tools/parsing/alex/2.3.5.nix b/pkgs/development/tools/parsing/alex/2.3.5.nix index 65faf84aa2cb2fa210004d56e79b7afb7812a845..d8e7e759e76b0071cd8cded265481d25dc33ddd0 100644 --- a/pkgs/development/tools/parsing/alex/2.3.5.nix +++ b/pkgs/development/tools/parsing/alex/2.3.5.nix @@ -14,6 +14,7 @@ cabal.mkDerivation (self: { description = "Alex is a tool for generating lexical analysers in Haskell"; 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/tools/parsing/alex/3.0.1.nix b/pkgs/development/tools/parsing/alex/3.0.1.nix index 0433ca3addee55f3aa54ac2c0844e40d67d2e6f7..7dc18c63c915916e65b5a0bdbf5eb379cdc4c522 100644 --- a/pkgs/development/tools/parsing/alex/3.0.1.nix +++ b/pkgs/development/tools/parsing/alex/3.0.1.nix @@ -16,6 +16,6 @@ cabal.mkDerivation (self: { description = "Alex is a tool for generating lexical analysers in Haskell"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/tools/parsing/alex/3.0.2.nix b/pkgs/development/tools/parsing/alex/3.0.2.nix index c11a64cb2ec05b1adc563a178df80a9c328b9e3c..c18c5d89d1be0682d5155e7f60d5547e16d29da8 100644 --- a/pkgs/development/tools/parsing/alex/3.0.2.nix +++ b/pkgs/development/tools/parsing/alex/3.0.2.nix @@ -16,6 +16,6 @@ cabal.mkDerivation (self: { description = "Alex is a tool for generating lexical analysers in Haskell"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/tools/parsing/alex/3.0.5.nix b/pkgs/development/tools/parsing/alex/3.0.5.nix index c4458f7b8297ce638b1c2a338348567cf3b7e198..af32598ee4730335e24e3c53a15ca504c6a40d47 100644 --- a/pkgs/development/tools/parsing/alex/3.0.5.nix +++ b/pkgs/development/tools/parsing/alex/3.0.5.nix @@ -14,6 +14,7 @@ cabal.mkDerivation (self: { description = "Alex is a tool for generating lexical analysers in Haskell"; 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/tools/parsing/alex/3.1.3.nix b/pkgs/development/tools/parsing/alex/3.1.3.nix index b0f57d4d83340f7a4ef195778446fe2470c11fe2..172c90d96cc19e9760342502f8640de393c6f344 100644 --- a/pkgs/development/tools/parsing/alex/3.1.3.nix +++ b/pkgs/development/tools/parsing/alex/3.1.3.nix @@ -15,6 +15,5 @@ cabal.mkDerivation (self: { description = "Alex is a tool for generating lexical analysers in Haskell"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/tools/parsing/bison/2.x.nix b/pkgs/development/tools/parsing/bison/2.x.nix index 5660d51f060662a21587aca2a8be2d6fc9f88842..5bf5d7c2e8c64dce68db1a09f16aa180805cfa5e 100644 --- a/pkgs/development/tools/parsing/bison/2.x.nix +++ b/pkgs/development/tools/parsing/bison/2.x.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.gnu.org/software/bison/"; description = "GNU Bison, a Yacc-compatible parser generator"; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; longDescription = '' Bison is a general-purpose parser generator that converts an diff --git a/pkgs/development/tools/parsing/bison/3.x.nix b/pkgs/development/tools/parsing/bison/3.x.nix index 284223905f6493d36460d483a07c90b5c4d6a95c..5947f85343c49653fefcc8a4b57d5903482bd560 100644 --- a/pkgs/development/tools/parsing/bison/3.x.nix +++ b/pkgs/development/tools/parsing/bison/3.x.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.gnu.org/software/bison/"; description = "GNU Bison, a Yacc-compatible parser generator"; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; longDescription = '' Bison is a general-purpose parser generator that converts an diff --git a/pkgs/development/tools/parsing/happy/1.18.10.nix b/pkgs/development/tools/parsing/happy/1.18.10.nix index 0e3f730defd5e8360a1ed281c5357d0c5d4a2203..187fd3628e8350c6777d0ade8d5c13c0e4fd8bf7 100644 --- a/pkgs/development/tools/parsing/happy/1.18.10.nix +++ b/pkgs/development/tools/parsing/happy/1.18.10.nix @@ -15,6 +15,6 @@ cabal.mkDerivation (self: { description = "Happy is a parser generator for Haskell"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/tools/parsing/happy/1.18.4.nix b/pkgs/development/tools/parsing/happy/1.18.4.nix index 5ebac4303e7575e8593b894196f1a9dc6cfa9b40..c7e3f919568be2b6b4b2a01ca50b3e73dc4ed694 100644 --- a/pkgs/development/tools/parsing/happy/1.18.4.nix +++ b/pkgs/development/tools/parsing/happy/1.18.4.nix @@ -14,6 +14,6 @@ cabal.mkDerivation (self: { description = "Happy is a parser generator for Haskell"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/tools/parsing/happy/1.18.5.nix b/pkgs/development/tools/parsing/happy/1.18.5.nix index 7463a9f94a0aa7666d28bccfc6dd391feff19cfc..f66f2089351684f505905d7d97891bed2f67d696 100644 --- a/pkgs/development/tools/parsing/happy/1.18.5.nix +++ b/pkgs/development/tools/parsing/happy/1.18.5.nix @@ -14,6 +14,6 @@ cabal.mkDerivation (self: { description = "Happy is a parser generator for Haskell"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/tools/parsing/happy/1.18.6.nix b/pkgs/development/tools/parsing/happy/1.18.6.nix index 3a3795c90db681afc81e9696a81f6aa7f06aceae..7919908681e10ce0f8db7b04c12cdd37ded929af 100644 --- a/pkgs/development/tools/parsing/happy/1.18.6.nix +++ b/pkgs/development/tools/parsing/happy/1.18.6.nix @@ -14,6 +14,6 @@ cabal.mkDerivation (self: { description = "Happy is a parser generator for Haskell"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/tools/parsing/happy/1.18.9.nix b/pkgs/development/tools/parsing/happy/1.18.9.nix index 25e8dcb7b7e1025359921a362818fa7af8878c9d..4ad9bf546b5fc0051c286c22b9f6a3ac1cebd6a3 100644 --- a/pkgs/development/tools/parsing/happy/1.18.9.nix +++ b/pkgs/development/tools/parsing/happy/1.18.9.nix @@ -15,6 +15,6 @@ cabal.mkDerivation (self: { description = "Happy is a parser generator for Haskell"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/tools/parsing/happy/1.19.4.nix b/pkgs/development/tools/parsing/happy/1.19.4.nix index e7cd358fb827f439e6590b5b4c134c3525bc418b..979d4bc52e376c4ee021aaa70f0ad6d3a0031d32 100644 --- a/pkgs/development/tools/parsing/happy/1.19.4.nix +++ b/pkgs/development/tools/parsing/happy/1.19.4.nix @@ -15,6 +15,5 @@ cabal.mkDerivation (self: { description = "Happy is a parser generator for Haskell"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/tools/parsing/ragel/default.nix b/pkgs/development/tools/parsing/ragel/default.nix index 2dec606254b41dcba263e2035306ee60d202096e..247daacf1617a991bbd1b0483e51130158f0efcb 100644 --- a/pkgs/development/tools/parsing/ragel/default.nix +++ b/pkgs/development/tools/parsing/ragel/default.nix @@ -1,4 +1,4 @@ -{composableDerivation, fetchurl, transfig, texLive}: +{stdenv, composableDerivation, fetchurl, transfig, texLive}: let version = "6.3"; @@ -37,6 +37,6 @@ composableDerivation.composableDerivation {} { meta = { homepage = http://www.complang.org/ragel; description = "State machine compiler"; - license = "GPL-2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/development/tools/profiling/oprofile/default.nix b/pkgs/development/tools/profiling/oprofile/default.nix index ee4644239298f1984a637b65d4079d25f4641718..e301fe8431afcc5afe31daf242669a3ab586c194 100644 --- a/pkgs/development/tools/profiling/oprofile/default.nix +++ b/pkgs/development/tools/profiling/oprofile/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { is profiled: hardware and software interrupt handlers, kernel modules, the kernel, shared libraries, and applications. ''; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; homepage = http://oprofile.sourceforge.net/; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/tools/profiling/sysprof/default.nix b/pkgs/development/tools/profiling/sysprof/default.nix index b6750f8893735a411a33b0fed27df130835136dc..457a5d1dcaa52db40e1cf7495e13a1a703a2b017 100644 --- a/pkgs/development/tools/profiling/sysprof/default.nix +++ b/pkgs/development/tools/profiling/sysprof/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://sysprof.com/; description = "Sysprof, a system-wide profiler for Linux"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; longDescription = '' Sysprof is a sampling CPU profiler for Linux that uses the perf_event_open diff --git a/pkgs/development/tools/profiling/systemtap/default.nix b/pkgs/development/tools/profiling/systemtap/default.nix index 884091c1636cb67ccae58cdc31bd74461582727a..66dda8f43efdd6d78a06408813bdaea94c4f39e9 100644 --- a/pkgs/development/tools/profiling/systemtap/default.nix +++ b/pkgs/development/tools/profiling/systemtap/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { homepage = http://sourceware.org/systemtap/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/tools/pydb/default.nix b/pkgs/development/tools/pydb/default.nix index 23f0dea44535f51463b3f9f626a1f37cb29d2d66..baa816589cab37bf3bd9e335b043d3dcdbd14f44 100644 --- a/pkgs/development/tools/pydb/default.nix +++ b/pkgs/development/tools/pydb/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation { meta = { description = "Python debugger with GDB-like commands and Emacs bindings"; homepage = http://bashdb.sourceforge.net/pydb/; - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3; }; } diff --git a/pkgs/development/tools/watchman/default.nix b/pkgs/development/tools/watchman/default.nix index 90e31349e4f659ef2d536dc9985a2d913d9bd0f9..6db164131f7e3cd998b1cc4b1c3399d5a12eb2de 100644 --- a/pkgs/development/tools/watchman/default.nix +++ b/pkgs/development/tools/watchman/default.nix @@ -17,6 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ autoconf automake pcre ]; configureFlags = [ + "--enable-lenient" "--enable-conffile=${if confFile == null then "no" else confFile}" "--with-pcre=yes" ]; diff --git a/pkgs/development/tools/yuicompressor/default.nix b/pkgs/development/tools/yuicompressor/default.nix index 5dcc30811e22b34be8c1719e65a01f605aa5fab2..1a5485af541d94660c09101abbb2bea847a8863d 100644 --- a/pkgs/development/tools/yuicompressor/default.nix +++ b/pkgs/development/tools/yuicompressor/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { }; buildCommand = '' - ensureDir $out/lib + mkdir -p $out/lib ln -s $src $out/lib/yuicompressor.jar ''; } diff --git a/pkgs/development/web/nodejs/build-node-package.nix b/pkgs/development/web/nodejs/build-node-package.nix index 544634626b03e4104f5d7c363ba13c1011ce99e0..84b0da1674c4607dab9635e47cce9c5df3e86bb6 100644 --- a/pkgs/development/web/nodejs/build-node-package.nix +++ b/pkgs/development/web/nodejs/build-node-package.nix @@ -1,6 +1,6 @@ { stdenv, runCommand, nodejs, neededNatives}: -args @ { name, src, deps ? [], peerDependencies ? [], flags ? [], ... }: +args @ { name, src, deps ? [], peerDependencies ? [], flags ? [], preShellHook ? "", postShellHook ? "", ... }: with stdenv.lib; @@ -80,6 +80,16 @@ stdenv.mkDerivation ({ preFixup = concatStringsSep "\n" (map (src: '' find $out -type f -print0 | xargs -0 sed -i 's|${src}|${src.name}|g' '') src); + + shellHook = '' + ${preShellHook} + export PATH=${nodejs}/bin:$(pwd)/node_modules/.bin:$PATH + mkdir -p node_modules + ${concatStrings (concatMap (dep: map (name: '' + ln -sfv ${dep}/lib/node_modules/${name} node_modules/ + '') dep.names) deps)} + ${postShellHook} + ''; } // args // { # Run the node setup hook when this package is a build input propagatedNativeBuildInputs = (args.propagatedNativeBuildInputs or []) ++ [ nodejs ]; diff --git a/pkgs/games/0ad/default.nix b/pkgs/games/0ad/default.nix index efbd59dbbe3f014ac82b46c17009cfc63365ffa5..78b76f1ac3649ad8fb1d78b89b87da0a1945f6f9 100644 --- a/pkgs/games/0ad/default.nix +++ b/pkgs/games/0ad/default.nix @@ -1,4 +1,4 @@ -{ stdenv, stdenvType, callPackage, fetchurl, python27 +{ stdenv, callPackage, fetchurl, python27 , pkgconfig, spidermonkey_24, boost, icu, libxml2, libpng , libjpeg, zlib, curl, libogg, libvorbis, enet, miniupnpc , openalSoft, mesa, xproto, libX11, libXcursor, nspr, SDL @@ -16,8 +16,8 @@ let zeroadData = callPackage ./data.nix { inherit version releaseType; }; archForPremake = - if stdenv.lib.hasPrefix "x86_64-" stdenvType then "x64" else - if stdenv.lib.hasPrefix "i686-" stdenvType then "x32" else "ERROR"; + if stdenv.lib.hasPrefix "x86_64-" stdenv.system then "x64" else + if stdenv.lib.hasPrefix "i686-" stdenv.system then "x32" else "ERROR"; in stdenv.mkDerivation rec { @@ -116,5 +116,6 @@ stdenv.mkDerivation rec { homepage = "http://wildfiregames.com/0ad/"; license = [ "GPLv2" "LGPLv2.1" "MIT" "CC BY-SA 3.0" "zlib" ]; platforms = [ "x86_64-linux" "i686-linux" ]; + broken = true; }; } diff --git a/pkgs/games/Allure/default.nix b/pkgs/games/Allure/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..532ef092f09452529587ba3b5415e65dc423aeb9 --- /dev/null +++ b/pkgs/games/Allure/default.nix @@ -0,0 +1,19 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, enummapsetTh, filepath, LambdaHack, text }: + +cabal.mkDerivation (self: { + pname = "Allure"; + version = "0.4.99.0"; + sha256 = "1i4v1h4ynx4aap0nmf8qn2qx22wqfgypr83l7bh38fd4qibsvx3q"; + isLibrary = false; + isExecutable = true; + buildDepends = [ enummapsetTh filepath LambdaHack text ]; + testDepends = [ enummapsetTh filepath LambdaHack text ]; + meta = { + homepage = "http://allureofthestars.com"; + description = "Near-future Sci-Fi roguelike and tactical squad game"; + license = "unknown"; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/games/LambdaHack/default.nix b/pkgs/games/LambdaHack/default.nix index c52ce057df24b1811971b863bf438c18c7bf6754..eb4edf2b36a9f906f71267486e114260df144115 100644 --- a/pkgs/games/LambdaHack/default.nix +++ b/pkgs/games/LambdaHack/default.nix @@ -1,28 +1,33 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, assertFailure, binary, deepseq, enummapsetTh, filepath -, gtk, hashable, hsini, keys, miniutter, mtl, prettyShow, random -, stm, text, transformers, unorderedContainers, vector -, vectorBinaryInstances, zlib +{ cabal, assertFailure, async, binary, deepseq, enummapsetTh +, filepath, gtk, hashable, hsini, keys, miniutter, mtl, prettyShow +, random, stm, text, transformers, unorderedContainers, vector +, vectorBinaryInstances, x11, zlib }: cabal.mkDerivation (self: { pname = "LambdaHack"; - version = "0.2.12"; - sha256 = "0ics1z376qyagkzg58mqqw7cbkjpkik57l8570qmk589nkhck86n"; + version = "0.4.99.0"; + sha256 = "1mcz44akf706a0q1xr4h7hlf1gj60570bi8im6jpg73k728314cp"; isLibrary = true; isExecutable = true; buildDepends = [ - assertFailure binary deepseq enummapsetTh filepath gtk hashable + assertFailure async binary deepseq enummapsetTh filepath gtk + hashable hsini keys miniutter mtl prettyShow random stm text + transformers unorderedContainers vector vectorBinaryInstances zlib + ]; + testDepends = [ + assertFailure async binary deepseq enummapsetTh filepath hashable hsini keys miniutter mtl prettyShow random stm text transformers unorderedContainers vector vectorBinaryInstances zlib ]; - jailbreak = true; + pkgconfigDepends = [ gtk x11 ]; meta = { - homepage = "http://github.com/kosmikus/LambdaHack"; - description = "A roguelike game engine in early and active development"; + homepage = "http://github.com/LambdaHack/LambdaHack"; + description = "A game engine library for roguelike dungeon crawlers"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + maintainers = with self.stdenv.lib.maintainers; [ andres ]; }; }) diff --git a/pkgs/games/andyetitmoves/default.nix b/pkgs/games/andyetitmoves/default.nix index cf3f6e1563b8b95ae9e389458bccbd3a3e023ef6..ae04c57aa26d6cd75756b2b6655815da3f62ef61 100644 --- a/pkgs/games/andyetitmoves/default.nix +++ b/pkgs/games/andyetitmoves/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { phases = "unpackPhase installPhase"; installPhase = '' - ensureDir $out/{opt/andyetitmoves,bin} + mkdir -p $out/{opt/andyetitmoves,bin} cp -r * $out/opt/andyetitmoves/ fullPath=${stdenv.gcc.gcc}/lib64 @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { homepage = http://www.andyetitmoves.net/; - license = "unfree"; + license = stdenv.lib.licenses.unfree; maintainers = with stdenv.lib.maintainers; [bluescreen303]; }; diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix index 77891f438813e073ac830ac1b1045cb6d071e419..1925c73b2e4a67e96893ac9afe4ef124e04eb992 100644 --- a/pkgs/games/anki/default.nix +++ b/pkgs/games/anki/default.nix @@ -6,13 +6,13 @@ let py = pythonPackages; - version = "2.0.26"; + version = "2.0.28"; in stdenv.mkDerivation rec { name = "anki-${version}"; src = fetchurl { url = "http://ankisrs.net/download/mirror/${name}.tgz"; - sha256 = "0w1dn2v6mbyq4dfyjskx51qwfqy6jpskpg4v5pzrv30big274p4q"; + sha256 = "0dj33mlc23y982kcl4h0aganb4fy70rl28mpj2mbcfphykzkv05s"; }; pythonPath = [ pyqt4 py.pysqlite py.sqlalchemy py.pyaudio ] @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { * mastering long poems * even practicing guitar chords! ''; - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [ the-kenny ]; platforms = stdenv.lib.platforms.mesaPlatforms; }; diff --git a/pkgs/games/asc/default.nix b/pkgs/games/asc/default.nix index bf2fb1e89c21013cd7d601c0a99f82e6e4602ef0..93297171bcb8ca2cfe5ad5d82865d380583b5150 100644 --- a/pkgs/games/asc/default.nix +++ b/pkgs/games/asc/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { homepage = http://www.asc-hq.org/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/games/astromenace/default.nix b/pkgs/games/astromenace/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..a2897a795e84e687c986a1059bb3856ae0593a3a --- /dev/null +++ b/pkgs/games/astromenace/default.nix @@ -0,0 +1,36 @@ +{ fetchurl, stdenv, cmake, x11, mesa, SDL, openal, freealut, libogg, libvorbis }: + +stdenv.mkDerivation rec { + version = "1.3.2"; + name = "astromenace-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/openastromenace/astromenace-src-${version}.tar.bz2"; + sha256 = "1rkz6lwjcd5mwv72kf07ghvx6z46kf3xs250mjbmnmjpn7r5sxwv"; + }; + + buildInputs = [ cmake x11 mesa SDL openal freealut libogg libvorbis ]; + + buildPhase = '' + cmake ./ + make + ./AstroMenace --pack --rawdata=../RAW_VFS_DATA + ''; + installPhase = '' + mkdir -p $out/bin + cp AstroMenace $out + cp gamedata.vfs $out + cat > $out/bin/AstroMenace << EOF + #!/bin/bash + $out/AstroMenace --dir=$out + EOF + chmod 755 $out/bin/AstroMenace + ''; + + meta = { + description = "Hardcore 3D space shooter with spaceship upgrade possibilities."; + homepage = http://www.viewizard.com/; + license = stdenv.lib.licenses.gpl3; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/games/ball-and-paddle/default.nix b/pkgs/games/ball-and-paddle/default.nix index c923f089405268564b501d369515b7177cf7b56a..4a7eb9376da7d1538bfa9d362a2cf8b3da9c3e95 100644 --- a/pkgs/games/ball-and-paddle/default.nix +++ b/pkgs/games/ball-and-paddle/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { with Guile. Follow the example level sets and the documentation. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; homepage = http://www.gnu.org/software/ballandpaddle/; diff --git a/pkgs/games/banner/default.nix b/pkgs/games/banner/default.nix index 3bb17b3e02f90f2351d1baf08e7377109f8fa4da..b4e61b6d1d1f57c8ec09e0c3c3957d27601cf7ba 100644 --- a/pkgs/games/banner/default.nix +++ b/pkgs/games/banner/default.nix @@ -37,7 +37,7 @@ mkDerivation "banner-1.3.2" "0dc0ac0667b2e884a7f5ad3e467af68cd0fd5917f8c9aa19188 meta = { homepage = "http://shh.thathost.com/pub-unix/"; description = "print large banners to ASCII terminals"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; longDescription = '' An implementation of the traditional Unix-program used to display diff --git a/pkgs/games/bitsnbots/default.nix b/pkgs/games/bitsnbots/default.nix index 252f881c3752a8fbbf0cd7b2ded81ad45b7a81a4..57cd67fbb7baf2895d6dc756181a76b76577c041 100644 --- a/pkgs/games/bitsnbots/default.nix +++ b/pkgs/games/bitsnbots/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = { description = "Simple puzzle game with moving robots"; homepage = "http://moikmellah.org/blog/?page_id=19"; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/games/blackshadeselite/default.nix b/pkgs/games/blackshadeselite/default.nix index 0f4904bfed97ce5554204c9f94c95b316a764761..d7e2cf4894dd461eaa1218906df719b84bcd3286 100644 --- a/pkgs/games/blackshadeselite/default.nix +++ b/pkgs/games/blackshadeselite/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://home.gna.org/blackshadeselite/; description = "Fork of Black Shades"; - license = "GPLv2+"; # Says its gna.org project page + license = stdenv.lib.licenses.gpl2Plus; # Says its gna.org project page maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/games/btanks/default.nix b/pkgs/games/btanks/default.nix index 085c7c4082cb5b858f2d3b2ed1156330c5ae6778..46f5b3d018300d8d20e00046a0da82984af1b22e 100644 --- a/pkgs/games/btanks/default.nix +++ b/pkgs/games/btanks/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://sourceforge.net/projects/btanks/; description = "Fast 2d tank arcade game"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/games/bzflag/default.nix b/pkgs/games/bzflag/default.nix index ce3a0c8fa3c32d15fefee65b59f4b98da0ea6d57..0798173a64d20a349a7201bd110bac724dd84086 100644 --- a/pkgs/games/bzflag/default.nix +++ b/pkgs/games/bzflag/default.nix @@ -13,6 +13,6 @@ stdenv.mkDerivation rec { meta = { description = "Multiplayer 3D Tank game"; homepage = http://bzflag.org/; - license = "LGPLv2.1+"; + license = stdenv.lib.licenses.lgpl21Plus; }; } diff --git a/pkgs/games/crack-attack/default.nix b/pkgs/games/crack-attack/default.nix index 99bf2d41fd6924fb83ca06eb670091900dfe7cd6..538efebf8334bf0437b0e22b307a5bef31ef5bb7 100644 --- a/pkgs/games/crack-attack/default.nix +++ b/pkgs/games/crack-attack/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = { description = "A fast-paced puzzle game inspired by the classic Super NES title Tetris Attack!"; homepage = http://www.nongnu.org/crack-attack/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.piotr ]; }; diff --git a/pkgs/games/crafty/default.nix b/pkgs/games/crafty/default.nix index 54deae2ecfe1c028ec3308c3a6ba0a175744728a..0e2796df22d89c628849241943fa05e5d3194b17 100644 --- a/pkgs/games/crafty/default.nix +++ b/pkgs/games/crafty/default.nix @@ -621,10 +621,10 @@ stdenv.mkDerivation rec { else "make"; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin cp -p ./crafty $out/bin - ensureDir $out/share/crafty + mkdir -p $out/share/crafty cd $out/share/crafty $out/bin/crafty "books create ${startPgn} 60" @@ -635,7 +635,7 @@ stdenv.mkDerivation rec { $out/bin/crafty "book create enormous.pgn 60" rm -f *.001 enormous.pgn - ensureDir $out/share/crafty/TB + mkdir -p $out/share/crafty/TB ${stdenv.lib.fold (tb: acc: acc + "\nln -s " + toString tb diff --git a/pkgs/games/crawl/default.nix b/pkgs/games/crawl/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..6cb48d85f8526a5d0c725ca84f80b8f3785c84fb --- /dev/null +++ b/pkgs/games/crawl/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, sqlite, lua, which, zlib, pkgconfig, dejavu_fonts, + libpng, perl, SDL, SDL_image, ncurses, mesa}: + +stdenv.mkDerivation rec { + name = "crawl-0.14.1"; + src = fetchurl { + url = "http://downloads.sourceforge.net/project/crawl-ref/Stone%20Soup/0.14.1/stone_soup-0.14.1-nodeps.tar.xz"; + sha256 = "91726d0224b93ba26b5d4bd3762bc5aabe1f02974ea6c937be89dc6c6ab7a4dd"; + }; + + patches = [ ./makefile_fonts.patch ./makefile_sqlite.patch + ./makefile_rltiles.patch ./makefile_rltiles2.patch + ./makefile_misc.patch ./makefile_prefix.patch + ]; + + buildInputs = [stdenv pkgconfig lua zlib sqlite which libpng perl SDL + dejavu_fonts SDL_image ncurses mesa]; + + preBuild = "cd source"; + + makeFlags = "TILES=y"; + + inherit dejavu_fonts sqlite SDL_image SDL; +} diff --git a/pkgs/games/crawl/makefile_fonts.patch b/pkgs/games/crawl/makefile_fonts.patch new file mode 100644 index 0000000000000000000000000000000000000000..6c73407b65cd8b9a0a04175be7f452a0a072ba59 --- /dev/null +++ b/pkgs/games/crawl/makefile_fonts.patch @@ -0,0 +1,20 @@ +--- old/source/Makefile 2013-11-28 01:03:54.000000000 +0000 ++++ new/source/Makefile 2014-02-05 14:04:32.531838188 +0000 +@@ -880,7 +880,7 @@ + INSTALL_FONTS += $(PROPORTIONAL_FONT) + endif + else +- SYS_PROPORTIONAL_FONT = $(shell dir=/usr/share/fonts; [ -d $$dir ] && find $$dir -iname $(OUR_PROPORTIONAL_FONT)|head -n 1) ++ SYS_PROPORTIONAL_FONT = $(shell dir=${dejavu_fonts}/share/fonts; [ -d $$dir ] && find $$dir -iname $(OUR_PROPORTIONAL_FONT)|head -n 1) + ifeq (,$(SYS_PROPORTIONAL_FONT)) + SYS_PROPORTIONAL_FONT = $(shell dir=/usr/local/share/fonts ; [ -d $$dir ] && find $$dir -iname $(OUR_PROPORTIONAL_FONT)|head -n 1) + endif +@@ -903,7 +903,7 @@ + INSTALL_FONTS += $(MONOSPACED_FONT) + endif + else +- SYS_MONOSPACED_FONT = $(shell dir=/usr/share/fonts; [ -d $$dir ] && find $$dir -iname $(OUR_MONOSPACED_FONT)|head -n 1) ++ SYS_MONOSPACED_FONT = $(shell dir=${dejavu_fonts}/share/fonts; [ -d $$dir ] && find $$dir -iname $(OUR_MONOSPACED_FONT)|head -n 1) + ifeq (,$(SYS_MONOSPACED_FONT)) + SYS_MONOSPACED_FONT = $(shell dir=/usr/local/share/fonts; [ -d $$dir ] && find $$dir -iname $(OUR_MONOSPACED_FONT)|head -n 1) + endif diff --git a/pkgs/games/crawl/makefile_misc.patch b/pkgs/games/crawl/makefile_misc.patch new file mode 100644 index 0000000000000000000000000000000000000000..3849e79234b0a160c7610083e432ddc071d2004c --- /dev/null +++ b/pkgs/games/crawl/makefile_misc.patch @@ -0,0 +1,39 @@ +--- old/source/Makefile 2014-05-05 23:22:48.051952484 +0200 ++++ new/source/Makefile 2014-05-05 23:20:46.576617833 +0200 +@@ -71,6 +71,9 @@ + + GAME = crawl + ++ ++CFLAGS := $(NIX_CFLAGS_COMPILE) ++ + # Disable GNU Make implicit rules and variables. Leaving them enabled will slow + # down MinGW and Cygwin builds by a very VERY noticeable degree. Besides, we have + # _explicit_ rules defined for everything. So we don't need them. +@@ -979,7 +983,7 @@ + ifdef ANDROID + CFLAGS := $(CFOPTIMIZE) $(CFOTHERS) $(CFWARN) $(CFLAGS) + else +-CFLAGS := $(CFOPTIMIZE) $(CFOTHERS) $(CFWARN) ++CFLAGS := $(CFOPTIMIZE) $(CFOTHERS) $(CFWARN) $(CFLAGS) + endif + CFLAGS_L := $(CFOPTIMIZE_L) $(DEFINES_L) $(CFWARN_L) $(INCLUDES_L) $(CFOTHERS_L) + ALL_CFLAGS := $(CFLAGS) $(CFLAGS_L) +@@ -1392,7 +1396,7 @@ + $(RM) -r $(DOXYGEN_HTML_GEN) + + $(GAME): $(OBJECTS) $(EXTRA_OBJECTS) $(CONTRIB_LIBS) dat/dlua/tags.lua +- +$(QUIET_LINK)$(CXX) $(LDFLAGS) $(EXTRA_OBJECTS) $(OBJECTS) -o $(GAME) $(LIBS) ++ g++ $(LDFLAGS) $(EXTRA_OBJECTS) $(OBJECTS) -o $(GAME) $(LIBS) + + debug: all + debug-lite: all +@@ -1492,7 +1496,7 @@ + $(QUIET_GEN)util/gen-luatags.pl + + mi-enum.h: mon-info.h util/gen-mi-enum +- $(QUIET_GEN)util/gen-mi-enum ++ perl util/gen-mi-enum + + $(RLTILES)/dc-unrand.txt: art-data.h + diff --git a/pkgs/games/crawl/makefile_prefix.patch b/pkgs/games/crawl/makefile_prefix.patch new file mode 100644 index 0000000000000000000000000000000000000000..869d703b125d86631ec08f43b93b65069d4d1cf6 --- /dev/null +++ b/pkgs/games/crawl/makefile_prefix.patch @@ -0,0 +1,11 @@ +--- old/source/Makefile 2014-05-06 08:52:24.752163702 +0200 ++++ new/source/Makefile 2014-05-06 09:08:01.992018819 +0200 +@@ -344,7 +344,7 @@ + endif + + chroot_prefix := +-prefix := ++prefix := $(out) + + ifeq ($(patsubst %/local,%,$(patsubst %/,%,$(prefix))),/usr) + FHS := yes diff --git a/pkgs/games/crawl/makefile_rltiles.patch b/pkgs/games/crawl/makefile_rltiles.patch new file mode 100644 index 0000000000000000000000000000000000000000..e08859c989b3aba522994f6b8bc2a01f5847fd00 --- /dev/null +++ b/pkgs/games/crawl/makefile_rltiles.patch @@ -0,0 +1,21 @@ +--- old/source/rltiles/Makefile 2014-04-17 10:17:31.596400123 +0000 ++++ new/source/rltiles/Makefile 2014-04-17 14:36:07.263108690 +0000 +@@ -20,7 +20,8 @@ + + ifdef TILES + ifndef CONTRIB_SDL +- SDL_CFLAGS := $(shell sdl-config --cflags 2> /dev/null || echo "-I../contrib/install/$(ARCH)/include/SDL") ++ SDL_CFLAGS := $(shell sdl-config --cflags 2> /dev/null) ++ SDL_IMG_CFLAGS := $(shell pkg-config --cflags-only-I SDL_image 2> /dev/null) + SDL_LDFLAGS := $(shell sdl-config --libs 2> /dev/null && echo "-lSDL_image" || echo "../contrib/install/$(ARCH)/lib/libSDL.a ../contrib/install/$(ARCH)/lib/libSDLmain.a ../contrib/install/$(ARCH)/lib/libSDL_image.a") + else + SDL_CFLAGS := -I../contrib/install/$(ARCH)/include/SDL +@@ -35,7 +36,7 @@ + PNG_LIB := ../contrib/install/$(ARCH)/lib/libpng.a ../contrib/install/$(ARCH)/lib/libz.a + endif + +- CFLAGS += $(SDL_CFLAGS) $(PNG_INCLUDE) ++ CFLAGS += $(SDL_CFLAGS) $(SDL_IMG_CFLAGS) $(PNG_INCLUDE) -I$(SDL_image)/include -I$(SDL)/include + LDFLAGS += $(SDL_LDFLAGS) $(PNG_LIB) + + CFLAGS += -DUSE_TILE diff --git a/pkgs/games/crawl/makefile_rltiles2.patch b/pkgs/games/crawl/makefile_rltiles2.patch new file mode 100644 index 0000000000000000000000000000000000000000..2508ad0a54ca9728f073b787a37ee4634819cb83 --- /dev/null +++ b/pkgs/games/crawl/makefile_rltiles2.patch @@ -0,0 +1,10 @@ +--- old/source/rltiles/Makefile 2014-05-05 23:22:48.054952469 +0200 ++++ new/source/rltiles/Makefile 2014-05-05 22:45:07.742667726 +0200 +@@ -142,6 +128,6 @@ + $(QUIET_HOSTCXX)$(HOSTCXX) $(CFLAGS) -MMD -c $< -o $@ + + $(TILEGEN): $(OBJECTS) +- $(QUIET_HOSTLINK)$(HOSTCXX) $(OBJECTS) -o $@ $(LDFLAGS) ++ g++ $(OBJECTS) -o $@ $(LDFLAGS) + + .PHONY: all clean distclean diff --git a/pkgs/games/crawl/makefile_sdlimg.patch b/pkgs/games/crawl/makefile_sdlimg.patch new file mode 100644 index 0000000000000000000000000000000000000000..e6c7101de720e4a2871fb108e1d39ba893182cec --- /dev/null +++ b/pkgs/games/crawl/makefile_sdlimg.patch @@ -0,0 +1,19 @@ +--- old/source/Makefile 2014-04-14 13:00:22.331058910 +0000 ++++ new/source/Makefile 2014-04-14 13:02:11.102204544 +0000 +@@ -672,6 +672,7 @@ + FREETYPE_LDFLAGS := $(shell $(PKGCONFIG) freetype2 --libs-only-L) $(shell $(PKGCONFIG) freetype2 --libs-only-l) + + SDL_INCLUDE := $(shell $(PKGCONFIG) sdl --cflags-only-I) ++SDL_IMG_INCLUDE := $(shell $(PKGCONFIG) SDL_image --cflags-only-I) + SDL_CFLAGS := $(shell $(PKGCONFIG) sdl --cflags-only-other) + SDL_LDFLAGS := $(shell $(PKGCONFIG) sdl --libs-only-L) $(shell $(PKGCONFIG) sdl --libs-only-l) + +@@ -694,7 +695,7 @@ + endif + + DEFINES_L += $(PNG_CFLAGS) $(FREETYPE_CFLAGS) $(SDL_CFLAGS) +-INCLUDES_L += $(PNG_INCLUDE) $(FREETYPE_INCLUDE) $(SDL_INCLUDE) ++INCLUDES_L += $(PNG_INCLUDE) $(FREETYPE_INCLUDE) $(SDL_INCLUDE) $(SDL_IMG_INCLUDE) + + endif # TILES + diff --git a/pkgs/games/crawl/makefile_sqlite.patch b/pkgs/games/crawl/makefile_sqlite.patch new file mode 100644 index 0000000000000000000000000000000000000000..fbcb925d6088bc86308ff205b4dddb253fb59fef --- /dev/null +++ b/pkgs/games/crawl/makefile_sqlite.patch @@ -0,0 +1,11 @@ +--- old/source/Makefile 2014-04-14 12:46:35.401956673 +0000 ++++ new/source/Makefile 2014-04-14 12:47:12.757006254 +0000 +@@ -259,7 +259,7 @@ + LIBZ := contrib/install/$(ARCH)/lib/libz.a + + ifndef CROSSHOST +- SQLITE_INCLUDE_DIR := /usr/include ++ SQLITE_INCLUDE_DIR := ${sqlite}/include + else + # This is totally wrong, works only with some old-style setups, and + # on some architectures of Debian/new FHS multiarch -- excluding, for diff --git a/pkgs/games/crrcsim/default.nix b/pkgs/games/crrcsim/default.nix index 944b67041c26f6ef601a6da162b48f5393b27cb5..b50aa7040484b874293f9de97484242b541ce4aa 100644 --- a/pkgs/games/crrcsim/default.nix +++ b/pkgs/games/crrcsim/default.nix @@ -18,7 +18,6 @@ stdenv.mkDerivation rec { description = "A model-airplane flight simulator"; maintainers = with stdenv.lib.maintainers; [ raskin the-kenny ]; platforms = stdenv.lib.platforms.linux; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } - diff --git a/pkgs/games/dhewm3/default.nix b/pkgs/games/dhewm3/default.nix index 6036d7fabd558bd3c14e8b5bfb4f05af73e02d9e..f0d885c1f882dfab68508155477c1f2208a6f478 100644 --- a/pkgs/games/dhewm3/default.nix +++ b/pkgs/games/dhewm3/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = { homepage = https://github.com/dhewm/dhewm3; description = "Doom 3 port to SDL"; - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3; }; } diff --git a/pkgs/games/dwarf-fortress/df2014.nix b/pkgs/games/dwarf-fortress/df2014.nix new file mode 100644 index 0000000000000000000000000000000000000000..6a0d30ea89f4d4851f2a6f96b4091b62ca56709d --- /dev/null +++ b/pkgs/games/dwarf-fortress/df2014.nix @@ -0,0 +1,82 @@ +{ stdenv, fetchurl, SDL, SDL_image, SDL_ttf, gtk, glib, mesa, openal, glibc, libsndfile +, copyDataDirectory ? false }: + +assert stdenv.system == "i686-linux"; + +stdenv.mkDerivation rec { + name = "dwarf-fortress-0.40.05"; + + src = fetchurl { + url = "http://www.bay12games.com/dwarves/df_40_05_linux.tar.bz2"; + sha256 = "1b9nd33yz5a945v9jyqii1k4s71i701m2d0h7fw6f5g9p6nvx43s"; + }; + + phases = "unpackPhase patchPhase installPhase"; + + /* :TODO: Game options should be configurable by patching the default configuration files */ + + permission = ./df_permission; + + installPhase = '' + set -x + mkdir -p $out/bin + mkdir -p $out/share/df_linux + cp -r * $out/share/df_linux + cp $permission $out/share/df_linux/nix_permission + + patchelf --set-interpreter ${glibc}/lib/ld-linux.so.2 $out/share/df_linux/libs/Dwarf_Fortress + ln -s ${libsndfile}/lib/libsndfile.so $out/share/df_linux/libs/ + + cat > $out/bin/dwarf-fortress << EOF + #!${stdenv.shell} + export DF_DIR="\$HOME/.config/df_linux" + if [ -n "\$XDG_DATA_HOME" ] + then export DF_DIR="\$XDG_DATA_HOME/df_linux" + fi + + # Recreate a directory structure reflecting the original + # distribution in the user directory (for modding support) + ${if copyDataDirectory then '' + if [ ! -d "\$DF_DIR" ]; + then + mkdir -p \$DF_DIR + cp -r $out/share/df_linux/* \$DF_DIR/ + chmod -R u+rw \$DF_DIR/ + fi + '' else '' + # Link in the static stuff + mkdir -p \$DF_DIR + ln -sf $out/share/df_linux/libs \$DF_DIR/ + ln -sf $out/share/df_linux/raw \$DF_DIR/ + ln -sf $out/share/df_linux/df \$DF_DIR/ + + # Delete old data directory + rm -rf \$DF_DIR/data + + # Link in the static data directory + mkdir \$DF_DIR/data + for i in $out/share/df_linux/data/* + do + ln -s \$i \$DF_DIR/data/ + done + + # link in persistant data + mkdir -p \$DF_DIR/save + ln -s \$DF_DIR/save \$DF_DIR/data/ + ''} + + # now run Dwarf Fortress! + export LD_LIBRARY_PATH=\$DF_DIR/df_linux/libs/:${SDL}/lib:${SDL_image}/lib/:${SDL_ttf}/lib/:${gtk}/lib/:${glib}/lib/:${mesa}/lib/:${openal}/lib/ + \$DF_DIR/df "\$@" + EOF + + chmod +x $out/bin/dwarf-fortress + ''; + + meta = { + description = "control a dwarven outpost or an adventurer in a randomly generated, persistent world"; + homepage = http://www.bay12games.com/dwarves; + license = "unfree-redistributable"; + maintainers = [stdenv.lib.maintainers.roconnor]; + }; +} diff --git a/pkgs/games/dwarf-therapist/default.nix b/pkgs/games/dwarf-therapist/default.nix index 1a026132e525b6381c629bca89b94d6d98a9e531..8cc1b9933cdeb94df93f63f56b1138917701b890 100644 --- a/pkgs/games/dwarf-therapist/default.nix +++ b/pkgs/games/dwarf-therapist/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { meta = { description = "Tool to manage dwarves in in a running game of Dwarf Fortress"; maintainers = with stdenv.lib.maintainers; [ the-kenny ]; - license = "MIT"; + license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; hydraPlatforms = []; homepage = https://code.google.com/r/splintermind-attributes/; diff --git a/pkgs/games/egoboo/default.nix b/pkgs/games/egoboo/default.nix index 1f879393868f154eccb733146cef5410ed323d91..96ff52446ec4d70c31214c3cf59b19e98b83788d 100644 --- a/pkgs/games/egoboo/default.nix +++ b/pkgs/games/egoboo/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { description = "3D dungeon crawling adventure"; homepage = http://www.freedink.org/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; # I take it out of hydra as it does not work as well as I'd like # maintainers = [ stdenv.lib.maintainers.bjg ]; diff --git a/pkgs/games/exult/64bits.patch b/pkgs/games/exult/64bits.patch deleted file mode 100644 index 49c67cd2f05e845d40ff4041d685e74f53532b5d..0000000000000000000000000000000000000000 --- a/pkgs/games/exult/64bits.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -ru exult-1.2-orig/usecode/useval.cc exult-1.2/usecode/useval.cc ---- exult-1.2-orig/usecode/useval.cc 2004-05-23 07:07:11.000000000 +0200 -+++ exult-1.2/usecode/useval.cc 2008-06-25 17:27:15.000000000 +0200 -@@ -464,7 +464,7 @@ - if (buflen < 5) - return -1; - *ptr++ = type; -- Write4(ptr, (int)value.ptr); -+ Write4(ptr, 0); - break; - case string_type: - { -@@ -525,7 +525,7 @@ - case pointer_type: - if (buflen < 5) - return false; -- value.ptr = (Game_object*)Read4(ptr); //DON'T dereference this pointer! -+ value.ptr = 0; //DON'T dereference this pointer! - // Maybe add a new type "serialized_pointer" to prevent "accidents"? - return true; - case string_type: diff --git a/pkgs/games/exult/arch.patch b/pkgs/games/exult/arch.patch new file mode 100644 index 0000000000000000000000000000000000000000..70de34184a24d54515afb1ec779d36c1ce0833b3 --- /dev/null +++ b/pkgs/games/exult/arch.patch @@ -0,0 +1,123 @@ +diff -aur exult-1.4.9rc1.orig/desktop/exult.desktop exult-1.4.9rc1/desktop/exult.desktop +--- exult-1.4.9rc1.orig/desktop/exult.desktop 2008-07-11 05:41:06.000000000 +0600 ++++ exult-1.4.9rc1/desktop/exult.desktop 2012-05-19 13:15:30.616084585 +0600 +@@ -1,9 +1,8 @@ + [Desktop Entry] +-Encoding=UTF-8 + Name=Exult + Comment=Exult Ultima 7 Engine + Exec=exult +-Icon=exult.png ++Icon=exult + Terminal=false + Type=Application +-Categories=Application;Game;RolePlaying; ++Categories=Game;RolePlaying; +diff -aur exult-1.4.9rc1.orig/files/databuf.h exult-1.4.9rc1/files/databuf.h +--- exult-1.4.9rc1.orig/files/databuf.h 2010-03-10 09:07:05.000000000 +0500 ++++ exult-1.4.9rc1/files/databuf.h 2012-05-19 12:50:16.856076030 +0600 +@@ -18,6 +18,7 @@ + #define DATA_H + + #include ++#include + #include + #include + #include +diff -aur exult-1.4.9rc1.orig/files/U7obj.h exult-1.4.9rc1/files/U7obj.h +--- exult-1.4.9rc1.orig/files/U7obj.h 2010-02-25 07:52:07.000000000 +0500 ++++ exult-1.4.9rc1/files/U7obj.h 2012-05-19 12:50:35.916076137 +0600 +@@ -26,6 +26,7 @@ + #include + #include + #include ++#include + #include "common_types.h" + #include "utils.h" + +diff -aur exult-1.4.9rc1.orig/imagewin/manip.h exult-1.4.9rc1/imagewin/manip.h +--- exult-1.4.9rc1.orig/imagewin/manip.h 2010-08-29 20:26:00.000000000 +0600 ++++ exult-1.4.9rc1/imagewin/manip.h 2012-05-19 13:02:45.159413596 +0600 +@@ -319,7 +319,7 @@ + static uintD copy(uintS src) + { + unsigned int r, g, b; +- split_source(src,r,g,b); ++ ManipBaseSrc::split_source(src,r,g,b); + return ManipBaseDest::rgb(r,g,b); + } + static void copy(uintD& dest, uintS src) +diff -aur exult-1.4.9rc1.orig/istring.h exult-1.4.9rc1/istring.h +--- exult-1.4.9rc1.orig/istring.h 2005-06-07 15:55:39.000000000 +0600 ++++ exult-1.4.9rc1/istring.h 2012-05-19 13:01:14.886079750 +0600 +@@ -162,19 +162,19 @@ + + _Myt& operator+=(const _Myt& _Right) + { // append _Right +- append(_Right); ++ this->append(_Right); + return (*this); + } + + _Myt& operator+=(const _Elem *_Ptr) + { // append [_Ptr, ) +- append(_Ptr); ++ this->append(_Ptr); + return (*this); + } + + _Myt& operator+=(_Elem _Ch) + { // append 1 * _Ch +- append(static_cast(1), _Ch); ++ this->append(static_cast(1), _Ch); + return (*this); + } + +diff -aur exult-1.4.9rc1.orig/shapes/pngio.cc exult-1.4.9rc1/shapes/pngio.cc +--- exult-1.4.9rc1.orig/shapes/pngio.cc 2010-02-15 18:48:11.000000000 -0200 ++++ exult-1.4.9rc1/shapes/pngio.cc 2013-09-22 20:56:37.809763588 -0300 +@@ -26,6 +26,7 @@ + #ifdef HAVE_CONFIG_H + # include + #endif ++#include + + #ifdef HAVE_PNG_H + +@@ -79,7 +80,7 @@ + } + // Allocate info. structure. + png_infop info = png_create_info_struct(png); +- if (setjmp(png->jmpbuf)) // Handle errors. ++ if (setjmp(png_jmpbuf(png))) // Handle errors. + { + png_destroy_read_struct(&png, &info, 0); + fclose(fp); +@@ -208,7 +209,7 @@ + } + // Allocate info. structure. + png_infop info = png_create_info_struct(png); +- if (setjmp(png->jmpbuf)) // Handle errors. ++ if (setjmp(png_jmpbuf(png))) // Handle errors. + { + png_destroy_write_struct(&png, &info); + fclose(fp); +@@ -306,7 +307,7 @@ + } + // Allocate info. structure. + png_infop info = png_create_info_struct(png); +- if (setjmp(png->jmpbuf)) // Handle errors. ++ if (setjmp(png_jmpbuf(png))) // Handle errors. + { + png_destroy_read_struct(&png, &info, 0); + fclose(fp); +@@ -395,7 +396,7 @@ + } + // Allocate info. structure. + png_infop info = png_create_info_struct(png); +- if (setjmp(png->jmpbuf)) // Handle errors. ++ if (setjmp(png_jmpbuf(png))) // Handle errors. + { + png_destroy_write_struct(&png, &info); + fclose(fp); + diff --git a/pkgs/games/exult/default.nix b/pkgs/games/exult/default.nix index e784cc109f53e13a898ea45073c0d7cf03027362..a79b6f8d5d8da8b12731ab632cb8d41097d44328 100644 --- a/pkgs/games/exult/default.nix +++ b/pkgs/games/exult/default.nix @@ -1,56 +1,45 @@ -{stdenv, fetchurl, SDL, SDL_mixer, zlib, libpng, unzip}: +{ stdenv, fetchurl, pkgconfig, SDL, libogg, libvorbis, zlib, unzip }: let # Digital recordings of the music on an original Roland MT-32. So # we don't need actual MIDI playback capability. - musicFiles = - [ (fetchurl { - url = mirror://sourceforge/exult/U7MusicOGG_1of2.zip; - md5 = "7746d1a9164fd67509107797496553bf"; - }) - (fetchurl { - url = mirror://sourceforge/exult/U7MusicOGG_2of2.zip; - md5 = "cdae5956d7c52f35e90317913a660123"; - }) - ]; + audio = fetchurl { + url = mirror://sourceforge/exult/exult_audio.zip; + sha256 = "0s5wvgy9qja06v38g0qwzpaw76ff96vzd6gb1i3lb9k4hvx0xqbj"; + }; in -stdenv.mkDerivation { - name = "exult-1.2"; - +stdenv.mkDerivation rec { + name = "exult-1.4.9rc1"; + src = fetchurl { - url = mirror://sourceforge/exult/exult-1.2.tar.gz; - md5 = "0fc88dee74a91724d25373ba0a8670ba"; + url = "mirror://sourceforge/exult/${name}.tar.gz"; + sha256 = "0a03a2l3ji6h48n106d4w55l8v6lni1axniafnvvv5c5n3nz5bgd"; }; - # Patches for building on x86_64 and gcc 4.x. - patches = [ - (fetchurl { - url = "http://www.rocklinux.net/sources/package/stf/exult/exult-gcc4.patch"; - sha256 = "1jlikxcpsi3yfchan3jbyi66fcyr18m7kfmsa946lwh3kzckszm7"; - }) + configureFlags = "--disable-tools"; - # From http://sources.gentoo.org/viewcvs.py/*checkout*/gentoo-x86/games-engines/exult/files/exult-1.2-64bits.patch?rev=1.1 - ./64bits.patch - ]; + patches = + [ # Arch Linux patch set. + ./arch.patch + ]; + + buildInputs = [ pkgconfig SDL libogg libvorbis zlib unzip ]; - buildInputs = [SDL SDL_mixer zlib libpng unzip]; - - NIX_CFLAGS_COMPILE = "-I${SDL_mixer}/include/SDL"; + enableParallelBuilding = true; postInstall = '' mkdir -p $out/share/exult/music - for i in $musicFiles; do - unzip -o -d $out/share/exult/music $i - done - ''; - + unzip -o -d $out/share/exult ${audio} + chmod 644 $out/share/exult/*.flx + ''; # */ + meta = { homepage = http://exult.sourceforge.net/; description = "A reimplementation of the Ultima VII game engine"; - maintainers = [stdenv.lib.maintainers.eelco]; + maintainers = [ stdenv.lib.maintainers.eelco ]; }; } diff --git a/pkgs/games/freedink/default.nix b/pkgs/games/freedink/default.nix index a30ff7e2f871e9b2229434499a29a562ceab9f23..94451ef8930d182a863c8acbedafc4c043e66e51 100644 --- a/pkgs/games/freedink/default.nix +++ b/pkgs/games/freedink/default.nix @@ -43,7 +43,7 @@ in stdenv.mkDerivation rec { ''; homepage = http://www.freedink.org/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.bjg ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/games/gav/default.nix b/pkgs/games/gav/default.nix index d83358cd69d7c04505950b305df30ceb49801d88..d26dfc2401c0e71124714c3207e83f0ecaadce43 100644 --- a/pkgs/games/gav/default.nix +++ b/pkgs/games/gav/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation { meta = { description = "Remake of AV Arcade Volleyball"; homepage = http://gav.sourceforge.net/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/games/glestae/default.nix b/pkgs/games/glestae/default.nix index 89790bfacec5fe365ac5e9cac186c5d4cdd9c462..2fa9cd35f76afbd6321caf216854879cbe4232a7 100644 --- a/pkgs/games/glestae/default.nix +++ b/pkgs/games/glestae/default.nix @@ -40,14 +40,11 @@ rec { meta = { description = "A 3D RTS - fork of inactive Glest project"; - maintainers = with a.lib.maintainers; - [ - raskin - ]; - platforms = with a.lib.platforms; - linux; + maintainers = [ a.lib.maintainers.raskin ]; + platforms = a.lib.platforms.linux; # Note that some data seems to be under separate redistributable licenses license = a.lib.licenses.gpl2Plus; + broken = true; }; passthru = { updateInfo = { diff --git a/pkgs/games/gltron/default.nix b/pkgs/games/gltron/default.nix index b58654f1f4290a9a122eee16bc486db3f62f8a12..d925c8810bf3bea162581b46f486573b3e756eed 100644 --- a/pkgs/games/gltron/default.nix +++ b/pkgs/games/gltron/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.gltron.org/; description = "Game based on the movie Tron"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/games/gnuchess/default.nix b/pkgs/games/gnuchess/default.nix index 72270cc312a2aaffa3b8f1847ba7915e38bb4467..90a4a069c2ae6154c7130a8f74d82e95a993a77b 100644 --- a/pkgs/games/gnuchess/default.nix +++ b/pkgs/games/gnuchess/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="gnuchess"; - version="6.1.1"; + version="6.1.2"; name="${baseName}-${version}"; - hash="1jckpg1qi1vjr3pqs0dnip3rmn0mgklx63xflrpqiv3cx2qlz8kn"; - url="http://ftp.gnu.org/gnu/chess/gnuchess-6.1.1.tar.gz"; - sha256="1jckpg1qi1vjr3pqs0dnip3rmn0mgklx63xflrpqiv3cx2qlz8kn"; + hash="15k6w9gycp566i0pa7ccajj9v3pw1mz1v62g1ni7czgs3j7i588l"; + url="http://ftp.gnu.org/gnu/chess/gnuchess-6.1.2.tar.gz"; + sha256="15k6w9gycp566i0pa7ccajj9v3pw1mz1v62g1ni7czgs3j7i588l"; }; buildInputs = [ flex diff --git a/pkgs/games/gnugo/default.nix b/pkgs/games/gnugo/default.nix index 21c4195b28b83cb7e4c758f32c3d03d9efad87ce..3f1d52c5fc03e2f7128485f63fec8aa693a92abf 100644 --- a/pkgs/games/gnugo/default.nix +++ b/pkgs/games/gnugo/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { meta = { description = "GNU Go - A computer go player"; homepage = "http://http://www.gnu.org/software/gnugo/"; - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3; }; } diff --git a/pkgs/games/gsb/default.nix b/pkgs/games/gsb/default.nix index 52c3830c22a4e6a067ab8e77e73356000366afc3..757d3cf7681e9302450680a70a2331185f7a8771 100644 --- a/pkgs/games/gsb/default.nix +++ b/pkgs/games/gsb/default.nix @@ -32,8 +32,8 @@ stdenv.mkDerivation rec { + ":" + stdenv.gcc.gcc + "/lib64"; installPhase = '' - ensureDir $out/libexec/positech/GSB/ - ensureDir $out/bin + mkdir -p $out/libexec/positech/GSB/ + mkdir -p $out/bin patchelf \ --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ diff --git a/pkgs/games/icbm3d/default.nix b/pkgs/games/icbm3d/default.nix index ee792ef1e4d936caea58dfd2b3e282d66cf92556..7bdcc7afecd3f2ea119aa115a4c703591de012c0 100644 --- a/pkgs/games/icbm3d/default.nix +++ b/pkgs/games/icbm3d/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation { meta = { homepage = http://www.newbreedsoftware.com/icbm3d/; description = "3D vector-based clone of the atari game Missile Command"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/games/instead/default.nix b/pkgs/games/instead/default.nix index 6ab6b8d79d7b89e9734cf14ebbc12e4b3dcc3ebb..8668de26a199a34a39ec4981859c2b4a57b2bd8d 100644 --- a/pkgs/games/instead/default.nix +++ b/pkgs/games/instead/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { meta = { description = "Simple text adventure interpreter for Unix and Windows"; homepage = http://instead.syscall.ru/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/games/klavaro/default.nix b/pkgs/games/klavaro/default.nix index cbc445f621618d36c0626cf1356873692007324a..c7b40db5caff7899230d91b661daccc33862adcb 100644 --- a/pkgs/games/klavaro/default.nix +++ b/pkgs/games/klavaro/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "Just another free touch typing tutor program"; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/games/kobodeluxe/default.nix b/pkgs/games/kobodeluxe/default.nix index 70288e549a4ef5aafbe48f2c55492dab9aa72934..8fe7591cde0c5e02c5ae23851c821baf6841b541 100644 --- a/pkgs/games/kobodeluxe/default.nix +++ b/pkgs/games/kobodeluxe/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation { meta = { homepage = http://olofson.net/kobodl/; description = "Enhanced version of Akira Higuchi's game XKobo for Un*x systems with X11"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/games/liquidwar/default.nix b/pkgs/games/liquidwar/default.nix index 292aa2ff190445cb0c40161aeb4f56de902842bf..cd7478d99c8d794acf55ac393a8d081bcdfe399a 100644 --- a/pkgs/games/liquidwar/default.nix +++ b/pkgs/games/liquidwar/default.nix @@ -6,16 +6,16 @@ let expat gettext perl SDL SDL_image SDL_mixer SDL_ttf curl sqlite - libogg libvorbis - libXrender + libogg libvorbis csound + libXrender libcaca cunit ]; in rec { - name = "liquidwar6-0.0.13beta"; + name = "liquidwar6-${meta.version}"; src = a.fetchurl { url = "mirror://gnu/liquidwar6/${name}.tar.gz"; - sha256 = "1jjf7wzb8jf02hl3473vz1q74fhmxn0szbishgi1f1j6a7234wx2"; + sha256 = "1q58liqm5cgp494yjj6rfc2xj5b4gm8r8yvi46jzwqll353mabwl"; }; inherit buildInputs; @@ -35,5 +35,8 @@ rec { ]; platforms = with a.lib.platforms; linux; + homepage = "http://www.gnu.org/software/liquidwar6/"; + version = "0.4.3681"; + updateWalker=true; }; } diff --git a/pkgs/games/minecraft/default.nix b/pkgs/games/minecraft/default.nix index b4ec7eb311ffae08012d30139502b1979cdf3903..9f79dd70c6a0013865363fe6c25453ba9e115e6a 100644 --- a/pkgs/games/minecraft/default.nix +++ b/pkgs/games/minecraft/default.nix @@ -1,6 +1,8 @@ -{stdenv, fetchurl, jre, libX11, libXext, libXcursor, libXrandr, libXxf86vm +{ stdenv, fetchurl, jre, libX11, libXext, libXcursor, libXrandr, libXxf86vm , mesa, openal, alsaOss }: +assert jre ? architecture; + stdenv.mkDerivation { name = "minecraft-2013.07.01"; diff --git a/pkgs/games/minetest/default.nix b/pkgs/games/minetest/default.nix index f2ac737486c6f82469d5a1cb899a5984066a1a8f..f19596789cefc02b185bf7fff7d8ca22d36b5400 100644 --- a/pkgs/games/minetest/default.nix +++ b/pkgs/games/minetest/default.nix @@ -35,6 +35,6 @@ in stdenv.mkDerivation { meta = { homepage = "http://minetest.net/"; description = "Infinite-world block sandbox game"; - license = "LGPLv2.1+"; + license = stdenv.lib.licenses.lgpl21Plus; }; } diff --git a/pkgs/games/naev/default.nix b/pkgs/games/naev/default.nix index c2a7ee90a1f6f603b5afe0ca7d7e2ac3433e9dc4..580b27ab21d05b49e670169988916585014d4972 100644 --- a/pkgs/games/naev/default.nix +++ b/pkgs/games/naev/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { meta = { description = "2D action/rpg space game"; homepage = http://www.naev.org; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = stdenv.lib.platforms.linux; hydraPlatforms = []; diff --git a/pkgs/games/neverball/default.nix b/pkgs/games/neverball/default.nix index 1ebb4b69b6e111611006373ff715417cd321b787..2bec14a11c1b0ea8972a8acb8a40b815364bad32 100644 --- a/pkgs/games/neverball/default.nix +++ b/pkgs/games/neverball/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "19hdgdmv20y56xvbj4vk0zdmyaa8kv7df85advkchw7cdsgwlcga"; }; - buildInputs = [ SDL mesa libpng libjpeg SDL_ttf libvorbis gettext physfs]; + buildInputs = [ libpng SDL mesa libjpeg SDL_ttf libvorbis gettext physfs]; dontPatchElf = true; diff --git a/pkgs/games/njam/default.nix b/pkgs/games/njam/default.nix index 4062405407bd742f5504fe3a6874a63418ce78bd..88cfbe98851c8150eb269d7eeaef03219d9bc6d9 100644 --- a/pkgs/games/njam/default.nix +++ b/pkgs/games/njam/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://trackballs.sourceforge.net/; description = "Cross-platform pacman-like game"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/games/oilrush/default.nix b/pkgs/games/oilrush/default.nix index f62570dbd0897c013bc605b4d1c8c5416c8d17d1..49dbb7ba82b47579f83c578e0bbeec4ff2404bec 100644 --- a/pkgs/games/oilrush/default.nix +++ b/pkgs/games/oilrush/default.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation { of Tower Defense. ''; homepage = http://oilrush-game.com/; - license = "unfree"; + license = stdenv.lib.licenses.unfree; #maintainers = with stdenv.lib.maintainers; [ astsmtl ]; platforms = stdenv.lib.platforms.linux; hydraPlatforms = []; diff --git a/pkgs/games/openlierox/default.nix b/pkgs/games/openlierox/default.nix index 0c7e46ae07405df82fe12bdf18a6feb00b8a5941..2dc4dece75f382bce77b3e84e4be67829d8f8321 100644 --- a/pkgs/games/openlierox/default.nix +++ b/pkgs/games/openlierox/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { ''; installPhase = '' - ensureDir $out/bin $out/share/OpenLieroX + mkdir -p $out/bin $out/share/OpenLieroX cp bin/* $out/bin cp -R ../share/gamedir/* $out/share/OpenLieroX ''; @@ -34,6 +34,6 @@ stdenv.mkDerivation { meta = { homepage = http://openlierox.net; description = "Real-time game with Worms-like shooting"; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; }; } diff --git a/pkgs/games/openra/default.nix b/pkgs/games/openra/default.nix index 638d494131f2cc06ab3cd3f92805f5d269e9955c..35057a5de75ce3c0d5ae6f8a00ecbafaa8d00e3a 100644 --- a/pkgs/games/openra/default.nix +++ b/pkgs/games/openra/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl, mono, makeWrapper -, SDL2, freetype, openal, systemd +{ stdenv, fetchurl, mono, makeWrapper, lua +, SDL2, freetype, openal, systemd, pkgconfig }: let - version = "20131223"; + version = "20140608"; in stdenv.mkDerivation rec { name = "openra-${version}"; @@ -18,15 +18,17 @@ in stdenv.mkDerivation rec { src = fetchurl { name = "${name}.tar.gz"; url = "https://github.com/OpenRA/OpenRA/archive/release-${version}.tar.gz"; - sha256 = "1gfz6iiccajp86qc7xw5w843bng69k9zplvmipxxbspvr7byhw0c"; + sha256 = "0k7siysxb2nk7zzrl7vz1cwky4nla46ixzgxgc8rq6ilmlidh96b"; }; dontStrip = true; - nativeBuildInputs = [ mono makeWrapper ]; + buildInputs = [ lua ]; + nativeBuildInputs = [ mono makeWrapper lua pkgconfig ]; patchPhase = '' sed -i 's/^VERSION.*/VERSION = release-${version}/g' Makefile + substituteInPlace configure --replace /bin/bash "$shell" --replace /usr/local/lib "${lua}/lib" ''; preConfigure = '' @@ -35,10 +37,15 @@ in stdenv.mkDerivation rec { ''; postInstall = with stdenv.lib; let - runtime = makeLibraryPath [ SDL2 freetype openal systemd ]; + runtime = makeLibraryPath [ SDL2 freetype openal systemd lua ]; in '' - wrapProgram $out/bin/openra \ + wrapProgram $out/lib/openra/launch-game.sh \ --prefix PATH : "${mono}/bin" \ + --set PWD $out/lib/openra/ \ --prefix LD_LIBRARY_PATH : "${runtime}" + + mkdir -p $out/bin + echo "cd $out/lib/openra && $out/lib/openra/launch-game.sh" > $out/bin/openra + chmod +x $out/bin/openra ''; } diff --git a/pkgs/games/openttd/default.nix b/pkgs/games/openttd/default.nix index 09a7761326a6e8b354c4310dfefccf942fdbe434..1b6b7f26a41edae07428e73a3ae3ca2f1a6e2aae 100644 --- a/pkgs/games/openttd/default.nix +++ b/pkgs/games/openttd/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { - observe as spectators ''; homepage = http://www.openttd.org/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ jcumming the-kenny ]; }; diff --git a/pkgs/games/opentyrian/default.nix b/pkgs/games/opentyrian/default.nix index 6b9c48473673702552cb164189dc9be5ee87fdbd..cfae6a4bb3e8418eb41557ee94b33b39f40e9b2b 100644 --- a/pkgs/games/opentyrian/default.nix +++ b/pkgs/games/opentyrian/default.nix @@ -22,9 +22,9 @@ stdenv.mkDerivation rec { "; buildPhase = "make release"; installPhase = " - ensureDir $out/bin + mkdir -p $out/bin cp ./opentyrian $out/bin - ensureDir $out/share/opentyrian/data + mkdir -p $out/share/opentyrian/data unzip -j $data -d $out/share/opentyrian/data "; diff --git a/pkgs/games/openxcom/default.nix b/pkgs/games/openxcom/default.nix index 04d2f2ecb8b0f37cfe23d8740a3a25cf113116a9..19aff03dacaa8ab6214498627cb2c7a1d1d58751 100644 --- a/pkgs/games/openxcom/default.nix +++ b/pkgs/games/openxcom/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { repositories.git = https://github.com/SupSuper/OpenXcom.git; maintainers = [ stdenv.lib.maintainers.page ]; platforms = stdenv.lib.platforms.linux; - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3; }; } diff --git a/pkgs/games/pioneers/default.nix b/pkgs/games/pioneers/default.nix index 77e8ab3b92e2997f4793da6d654960243d894594..af9900cede536088b1d038eb7da193dcbb94c344 100644 --- a/pkgs/games/pioneers/default.nix +++ b/pkgs/games/pioneers/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://pio.sourceforge.net/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; description = "Addicting game based on The Settlers of Catan"; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/games/planetaryannihilation/default.nix b/pkgs/games/planetaryannihilation/default.nix index 009d07d4456cc03815926d5e7e03ddb8e03c25d1..7c58b4ca1e86597d2b95adba21ca94f6d5b47304 100755 --- a/pkgs/games/planetaryannihilation/default.nix +++ b/pkgs/games/planetaryannihilation/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { homepage = http://www.uberent.com/pa/; description = "next-generation RTS that takes the genre to a planetary scale"; - license = "unfree"; + license = stdenv.lib.licenses.unfree; platforms = platforms.linux; maintainers = [ maintainers.iElectric ]; }; diff --git a/pkgs/games/pong3d/default.nix b/pkgs/games/pong3d/default.nix index d5f9ca6ee23deb69e5227d71063f9c75015bc0f8..98cf0dbeed8da046e225880d2f64dc0b9e8b7f2b 100644 --- a/pkgs/games/pong3d/default.nix +++ b/pkgs/games/pong3d/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation { meta = { homepage = http://www.newbreedsoftware.com/3dpong/; description = "One or two player 3d sports game based on Pong from Atari"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/games/racer/default.nix b/pkgs/games/racer/default.nix index 8969b613cebb8cd5ba69041f56c17137c2f2f17f..06e43fd273f03a6bd2cd7ae474df48c61ebf2bcb 100644 --- a/pkgs/games/racer/default.nix +++ b/pkgs/games/racer/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { meta = { description = "Car racing game"; homepage = http://hippo.nipax.cz/download.en.php; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/games/rigsofrods/default.nix b/pkgs/games/rigsofrods/default.nix index 809bcc930d2451790320bcf33367cbec959d1b16..26c7e0a366773b1c1ea0352bd77458b12ff6af1c 100644 --- a/pkgs/games/rigsofrods/default.nix +++ b/pkgs/games/rigsofrods/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { meta = { description = "3D simulator game where you can drive, fly and sail various vehicles"; homepage = http://rigsofrods.sourceforge.net/; - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [viric raskin]; platforms = stdenv.lib.platforms.linux; hydraPlatforms = []; diff --git a/pkgs/games/rili/default.nix b/pkgs/games/rili/default.nix index 934213279fadb830675cf7e1465393bf0f9a2ba9..fbf47653af99b835f0ad99bf0702291cbcf2ed39 100644 --- a/pkgs/games/rili/default.nix +++ b/pkgs/games/rili/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = { homepage = http://ri-li.sourceforge.net; - license = "GPL2+"; + license = stdenv.lib.licenses.gpl2Plus; description = "A children's train game"; longDescription = '' Ri-li is an arcade game licensed under the GPL (General Public License). diff --git a/pkgs/games/scorched3d/default.nix b/pkgs/games/scorched3d/default.nix index 3848f22ed20450ff299c3cc47a3752154ce3a306..cf55bcd597e23d7e91bfef7b836ff8b99828fe3c 100644 --- a/pkgs/games/scorched3d/default.nix +++ b/pkgs/games/scorched3d/default.nix @@ -33,6 +33,6 @@ stdenv.mkDerivation { meta = { homepage = http://scorched3d.co.uk/; description = "3D Clone of the classic Scorched Earth"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/games/scummvm/default.nix b/pkgs/games/scummvm/default.nix index ca72ac506d78d661e9bacc663f481585b1406ef6..42fa98e372d135d2f10c1610c3ad90251bf53501 100644 --- a/pkgs/games/scummvm/default.nix +++ b/pkgs/games/scummvm/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, SDL, zlib, libmpeg2, libmad, libogg, libvorbis, flac, alsaLib }: stdenv.mkDerivation rec { - name = "scummvm-1.6.0"; + name = "scummvm-1.7.0"; src = fetchurl { url = "mirror://sourceforge/scummvm/${name}.tar.bz2"; - sha256 = "1i3ywpq8csi58gdibdn51329vlj800l2laaw0lw18fcgdbd60q1r"; + sha256 = "d9ff0e8cf911afa466d5456d28fef692a17d47ddecfd428bf2fef591237c2e66"; }; buildInputs = [ SDL zlib libmpeg2 libmad libogg libvorbis flac alsaLib ]; diff --git a/pkgs/games/simutrans/default.nix b/pkgs/games/simutrans/default.nix index 196561d1e3790f07930cbf75a8a8bde47fb62119..403fc88cb4adbfedce7764dcf7fb465f74552a55 100644 --- a/pkgs/games/simutrans/default.nix +++ b/pkgs/games/simutrans/default.nix @@ -94,7 +94,7 @@ let ''; homepage = http://www.simutrans.com/; - license = "Artistic"; + license = "perl"; maintainers = [ stdenv.lib.maintainers.kkallio ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/games/speed-dreams/default.nix b/pkgs/games/speed-dreams/default.nix index 7a78235bdff1fb8bd6d96cf639abc885ba932ee3..e6105eab95b9eee91bcbec4cdc4114ceed1969c8 100644 --- a/pkgs/games/speed-dreams/default.nix +++ b/pkgs/games/speed-dreams/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = { description = "Car racing game - TORCS fork with more experimental approach"; homepage = http://speed-dreams.sourceforge.net/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric raskin]; platforms = stdenv.lib.platforms.linux; hydraPlatforms = []; diff --git a/pkgs/games/steam/default.nix b/pkgs/games/steam/default.nix index 51149d4f26073b685a5981e1ba8b9c3cba65765c..c1273e9a20f2847f688faa340e198632bfdb4e9a 100644 --- a/pkgs/games/steam/default.nix +++ b/pkgs/games/steam/default.nix @@ -94,31 +94,28 @@ stdenv.mkDerivation rec { meta = { description = "A digital distribution platform"; homepage = http://store.steampowered.com/; - license = "unfree"; + license = stdenv.lib.licenses.unfree; }; } */ -{stdenv, fetchurl, dpkg}: +{stdenv, fetchurl}: stdenv.mkDerivation { - name = "steam-1.0.0.42"; + name = "steam-1.0.0.48"; src = fetchurl { - url = http://repo.steampowered.com/steam/pool/steam/s/steam/steam-launcher_1.0.0.42_all.deb; - sha256 = "1jyvk0h1z78sdpvl4hs1kdvr6z2kwamf09vjgjx1f6j04kgqrfbw"; + url = http://repo.steampowered.com/steam/pool/steam/s/steam/steam_1.0.0.48.tar.gz; + sha256 = "08y5qf75ssk4fnazyv2yz1c5zs7gjiwigaibv8yz1gbr290r0b52"; }; - buildInputs = [ dpkg ]; - unpackPhase = "true"; installPhase = '' - mkdir -p $out - dpkg -x $src $out - cp -av $out/usr/* $out - rm -Rf $out/usr + make DESTDIR=$out install + mv $out/usr/* $out #*/ + rmdir $out/usr ''; meta = { description = "A digital distribution platform"; homepage = http://store.steampowered.com/; - license = "unfree"; + license = stdenv.lib.licenses.unfree; }; } diff --git a/pkgs/games/stuntrally/default.nix b/pkgs/games/stuntrally/default.nix index 31fd25a5150f5919b1a881b49fe6985b70f095b1..7b258deef8a997fa22f0e78576b49727e53670a3 100644 --- a/pkgs/games/stuntrally/default.nix +++ b/pkgs/games/stuntrally/default.nix @@ -41,6 +41,6 @@ stdenv.mkDerivation rec { meta = { description = "Stunt Rally game with Track Editor, based on VDrift and OGRE"; homepage = http://code.google.com/p/vdrift-ogre/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; }; } diff --git a/pkgs/games/super-tux-kart/default.nix b/pkgs/games/super-tux-kart/default.nix index cd2698665f62851805bb373d37a6446f75bfa966..29d3b4e4557133fa7876de53255e4d81eb7f19e7 100644 --- a/pkgs/games/super-tux-kart/default.nix +++ b/pkgs/games/super-tux-kart/default.nix @@ -36,6 +36,6 @@ stdenv.mkDerivation rec { homepage = http://supertuxkart.sourceforge.net/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/games/super-tux/default.nix b/pkgs/games/super-tux/default.nix index 72a894b63afb6ee4e30997baf33e5a5e401ac154..c8e0d3f097ffe5f71ed899c0440df7b2d10c92f4 100644 --- a/pkgs/games/super-tux/default.nix +++ b/pkgs/games/super-tux/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation { homepage = http://supertux.lethargik.org/index.html; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/games/teetertorture/default.nix b/pkgs/games/teetertorture/default.nix index 18a911d563bd88df011ab213476f1154e06c593a..e5d9e5e97513fa0a911aeee2f5edf0580fbde309 100644 --- a/pkgs/games/teetertorture/default.nix +++ b/pkgs/games/teetertorture/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation { meta = { homepage = http://www.newbreedsoftware.com/teetertorture/; description = "Simple shooting game with your cannon is sitting atop a teeter totter"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/games/tennix/default.nix b/pkgs/games/tennix/default.nix index e06aec68b1a2edd16b19f09178bd4fd991549ae9..83b2c62870e5f0c1d278b118b17f911fee24b91a 100644 --- a/pkgs/games/tennix/default.nix +++ b/pkgs/games/tennix/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://icculus.org/tennix/; description = "Tennix 2009 World Tennis Championship Tour"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/games/the-butterfly-effect/default.nix b/pkgs/games/the-butterfly-effect/default.nix index 979fcd1a48c3dfbebf13f9454aef4fa5d7d2f15f..44d07cf3ffd57aa29efa4295cb79a27d8105b946 100644 --- a/pkgs/games/the-butterfly-effect/default.nix +++ b/pkgs/games/the-butterfly-effect/default.nix @@ -3,9 +3,9 @@ x@{builderDefsPackage ,fetchsvn , ...}: builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ ["fetchsvn"]; buildInputs = map (n: builtins.getAttr n x) @@ -54,7 +54,7 @@ rec { ]; platforms = with a.lib.platforms; linux; - license = "GPLv2"; + license = a.stdenv.lib.licenses.gpl2; }; passthru = { inherit srcDrv; @@ -63,4 +63,3 @@ rec { }; }; }) x - diff --git a/pkgs/games/tibia/default.nix b/pkgs/games/tibia/default.nix index 698653784a7e100eaa71f657c6b708cf09dc222b..a2355ba9d1e8a3c0ce9e345a77c3279e2873084e 100644 --- a/pkgs/games/tibia/default.nix +++ b/pkgs/games/tibia/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation { meta = { description = "Top-down MMORPG set in a fantasy world"; homepage = "http://tibia.com"; - license = "unfree"; + license = stdenv.lib.licenses.unfree; platforms = ["i686-linux"]; }; } diff --git a/pkgs/games/torcs/default.nix b/pkgs/games/torcs/default.nix index 473161771158371613a760169bb454cb7672d250..e6370d6e7c61af1f0dbe6dd82391db61c30cc906 100644 --- a/pkgs/games/torcs/default.nix +++ b/pkgs/games/torcs/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { description = "Car racing game"; homepage = http://torcs.sourceforge.net/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = stdenv.lib.platforms.linux; hydraPlatforms = []; diff --git a/pkgs/games/tremulous/default.nix b/pkgs/games/tremulous/default.nix index bef4b63b0cc8f5c59136e691656c56fe2f5653c6..5c175be8af06bf7f5151d3ce48f891d1e7bb260a 100644 --- a/pkgs/games/tremulous/default.nix +++ b/pkgs/games/tremulous/default.nix @@ -73,5 +73,6 @@ stdenv.mkDerivation rec { license = [ "GPLv2" ]; # media under cc by-sa 2.5 maintainers = with stdenv.lib.maintainers; [ astsmtl ]; platforms = with stdenv.lib.platforms; linux; + broken = true; }; } diff --git a/pkgs/games/trigger/default.nix b/pkgs/games/trigger/default.nix index 2a25c290b2d83bd4435843143b2c47edb40578b8..a5ae8ec8b6de5dd2aafad905adba9a6257c941e6 100644 --- a/pkgs/games/trigger/default.nix +++ b/pkgs/games/trigger/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = { description = "Rally"; homepage = http://trigger-rally.sourceforge.net/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/games/ufoai/default.nix b/pkgs/games/ufoai/default.nix index 2fef444328cd4082fc3eb16cf32e50ae76396e37..0d909e1c43c132e2b3010e71441ac3f5ea241e96 100644 --- a/pkgs/games/ufoai/default.nix +++ b/pkgs/games/ufoai/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://ufoai.org; description = "A squad-based tactical strategy game in the tradition of X-Com"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = stdenv.lib.platforms.linux; hydraPlatforms = []; diff --git a/pkgs/games/ultimatestunts/default.nix b/pkgs/games/ultimatestunts/default.nix index 4b1cab6531c789f7e4f3072ea3f01a52c0881c56..c90972db66ea3126fcdc84f29d3bb896bea7bfad 100644 --- a/pkgs/games/ultimatestunts/default.nix +++ b/pkgs/games/ultimatestunts/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.ultimatestunts.nl/; description = "Remake of the popular racing DOS-game Stunts"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/games/ultrastardx/default.nix b/pkgs/games/ultrastardx/default.nix index dbae3e16724783262d7179fcd9f43d31f52c9bb8..47fcd2dc4cf93d62070be0ee33fced2cf5c1db7c 100644 --- a/pkgs/games/ultrastardx/default.nix +++ b/pkgs/games/ultrastardx/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://ultrastardx.sourceforge.net/; description = "Free and open source karaoke game"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/games/uqm/default.nix b/pkgs/games/uqm/default.nix index 07055c41558564dbe482648dba2644a8f82d584d..9d233d383384914817d7152c10a896674eb6d796 100644 --- a/pkgs/games/uqm/default.nix +++ b/pkgs/games/uqm/default.nix @@ -102,7 +102,7 @@ in stdenv.mkDerivation rec { - to adapt the code so that people can more easily make their own spin-offs, thereby making zillions more people happy! ''; homepage = http://sc2.sourceforge.net/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = with maintainers; [ jcumming aszlig ]; }; } diff --git a/pkgs/games/vdrift/default.nix b/pkgs/games/vdrift/default.nix index af112c37af4fb9658911ec44217b3f41082f6ccd..bba7823f66302ae9af319b2ae07da1a79d34862d 100644 --- a/pkgs/games/vdrift/default.nix +++ b/pkgs/games/vdrift/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { description = "Car racing game"; homepage = http://vdrift.net/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = stdenv.lib.platforms.linux; hydraPlatforms = []; diff --git a/pkgs/games/vectoroids/default.nix b/pkgs/games/vectoroids/default.nix index 6f0fb48f0a5f93c4f7adac746d1ca4d5809d4950..f87633e299bddddaa7442e390a39ddbdb5d759a8 100644 --- a/pkgs/games/vectoroids/default.nix +++ b/pkgs/games/vectoroids/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation { meta = { homepage = http://www.newbreedsoftware.com/vectoroids/; description = "Clone of the classic arcade game Asteroids by Atari"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/games/vessel/default.nix b/pkgs/games/vessel/default.nix index 9b9dd6c1f43fb5e45117e7cd92b9858a04f02dbc..8a92490b6e0cb7d5aba9eb602d7637253dd03017 100644 --- a/pkgs/games/vessel/default.nix +++ b/pkgs/games/vessel/default.nix @@ -24,8 +24,8 @@ stdenv.mkDerivation rec { + ":" + stdenv.lib.makeLibraryPath [ SDL pulseaudio alsaLib ] ; installPhase = '' - ensureDir $out/libexec/strangeloop/vessel/ - ensureDir $out/bin + mkdir -p $out/libexec/strangeloop/vessel/ + mkdir -p $out/bin # allow scripting of the mojoinstaller gcc -fPIC -shared -o isatty.so $ld_preload diff --git a/pkgs/games/worldofgoo/default.nix b/pkgs/games/worldofgoo/default.nix index 13e7e487c8f0eb13016db83cc2454b5bb143cca1..c39ffb1de0585ed2a08dd708d285f302a0d7f837 100644 --- a/pkgs/games/worldofgoo/default.nix +++ b/pkgs/games/worldofgoo/default.nix @@ -50,8 +50,8 @@ stdenv.mkDerivation rec { + ":" + stdenv.gcc.gcc + "/lib64"; installPhase = '' - ensureDir $out/libexec/2dboy/WorldOfGoo/ - ensureDir $out/bin + mkdir -p $out/libexec/2dboy/WorldOfGoo/ + mkdir -p $out/bin patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" --set-rpath $libPath ./WorldOfGoo.bin64 diff --git a/pkgs/games/zod/default.nix b/pkgs/games/zod/default.nix index d9fcb47bcc36e26be76d0f2501f6756381f995ca..0b34487373460bd81db5e4f57e05fe847c83c4d5 100644 --- a/pkgs/games/zod/default.nix +++ b/pkgs/games/zod/default.nix @@ -39,6 +39,6 @@ stdenv.mkDerivation rec { meta = { description = "Multiplayer remake of ZED"; homepage = http://zod.sourceforge.net/; - license = "GPLv3+"; /* Says the web */ + license = stdenv.lib.licenses.gpl3Plus; /* Says the web */ }; } diff --git a/pkgs/misc/beep/default.nix b/pkgs/misc/beep/default.nix index 8f0830be1862517e761e4902b8d1a746cdb4c055..b5e4adfa0b91cfa173c2f16995b0bd20f09c9dcf 100644 --- a/pkgs/misc/beep/default.nix +++ b/pkgs/misc/beep/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation { meta = { description = "The advanced PC speaker beeper"; homepage = http://www.johnath.com/beep/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/misc/cups/pdf-filter.nix b/pkgs/misc/cups/pdf-filter.nix index 8a08eadc6a486ed19e522c0228d866e898b6650e..e99ad03212c2215dea006dc81aae3446c0954994 100644 --- a/pkgs/misc/cups/pdf-filter.nix +++ b/pkgs/misc/cups/pdf-filter.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { meta = { homepage = http://www.cups.org/; description = "Image and pdf filters for CUPS"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.urkud ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index fcec3bf267546b425e0187538927fee69dfa44fc..a4d2ca621a1c4f22bf017e1bb1b42bf9e9e9c9ec 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -56,11 +56,9 @@ stdenv.mkDerivation rec { '' + (stdenv.lib.optionalString withPlugin (let hplip_arch = - if builtins.currentSystem == "i686-linux" - then "x86_32" - else if builtins.currentSystem == "x86_64-linux" - then "x86_64" - else abort "Platform must be i686-linux or x86_64-linux!"; + if stdenv.system == "i686-linux" then "x86_32" + else if stdenv.system == "x86_64-linux" then "x86_64" + else abort "Platform must be i686-linux or x86_64-linux!"; in '' sh ${plugin} --noexec --keep diff --git a/pkgs/misc/emulators/VisualBoyAdvance/default.nix b/pkgs/misc/emulators/VisualBoyAdvance/default.nix index 942bf2c2184097259428c1b707dade942daf41a7..015c61e461e6331fb1281e807d742e24515ce314 100644 --- a/pkgs/misc/emulators/VisualBoyAdvance/default.nix +++ b/pkgs/misc/emulators/VisualBoyAdvance/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = { description = "A Game Boy/Game Boy Color/Game Boy Advance Emulator"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.sander ]; homepage = http://vba.ngemu.com; broken = true; diff --git a/pkgs/misc/emulators/bsod/default.nix b/pkgs/misc/emulators/bsod/default.nix index 181a89b666771d09e40aa75e0730433279371d3b..526ea25a04ed0bfdc71277fe6706142e3e909769 100644 --- a/pkgs/misc/emulators/bsod/default.nix +++ b/pkgs/misc/emulators/bsod/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { buildInputs = [ ncurses ]; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin cp bsod $out/bin ''; @@ -23,7 +23,7 @@ stdenv.mkDerivation { blue screen of death on the console. Errors and drivers causing the error are selected randomly from a large set of examples."; homepage = "http://www.vanheusden.com/bsod/"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.antono ]; }; diff --git a/pkgs/misc/emulators/dlx/default.nix b/pkgs/misc/emulators/dlx/default.nix index c23b60c29b308958d19ceb3c57fa36a95fa4e51e..60854f8550b85754d77c97d4f8037db85502490b 100644 --- a/pkgs/misc/emulators/dlx/default.nix +++ b/pkgs/misc/emulators/dlx/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation { meta = { homepage = "http://www.davidviner.com/dlx.php"; description = "DLX Simulator"; - license = "GPL-2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/misc/emulators/fakenes/default.nix b/pkgs/misc/emulators/fakenes/default.nix index e3c9dbc84e5d6ce02434f3fb14d6acaedd2a7983..5462f772703325190ee98623854997e52efbf8eb 100644 --- a/pkgs/misc/emulators/fakenes/default.nix +++ b/pkgs/misc/emulators/fakenes/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = { homepage = http://fakenes.sourceforge.net/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; description = "Portable Open Source NES Emulator"; }; } diff --git a/pkgs/misc/emulators/hatari/default.nix b/pkgs/misc/emulators/hatari/default.nix index 150b45dd727502f26db72e8e7b581bb77d33d64c..5c9138ed2e23fe2ad7b95b2b483739659eacde07 100644 --- a/pkgs/misc/emulators/hatari/default.nix +++ b/pkgs/misc/emulators/hatari/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://hatari.tuxfamily.org/"; description = "Atari ST/STE/TT/Falcon emulator"; - license = "GPLv2+"; - platforms = with stdenv.lib.platforms; all; + license = stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/misc/emulators/mednafen/default.nix b/pkgs/misc/emulators/mednafen/default.nix index 786ed21deccb12316dbe38888089ada39394ce8c..c7ef57357500d9564b185d68cf046b94207c9fe0 100644 --- a/pkgs/misc/emulators/mednafen/default.nix +++ b/pkgs/misc/emulators/mednafen/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig , libX11, mesa, freeglut -, jackaudio, libcdio, libsndfile, libsamplerate +, jack2, libcdio, libsndfile, libsamplerate , SDL, SDL_net, zlib }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; buildInputs = with stdenv.lib; - [ libX11 mesa freeglut jackaudio libcdio libsndfile libsamplerate SDL SDL_net zlib ]; + [ libX11 mesa freeglut jack2 libcdio libsndfile libsamplerate SDL SDL_net zlib ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/misc/emulators/mupen64plus/1.5.nix b/pkgs/misc/emulators/mupen64plus/1.5.nix index d67121fe430ac68694b865ccb89e092644c7f370..571e14347b496ce73b3ec8bbd035ac5a40efacd2 100644 --- a/pkgs/misc/emulators/mupen64plus/1.5.nix +++ b/pkgs/misc/emulators/mupen64plus/1.5.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { meta = { description = "A Nintendo 64 Emulator"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://code.google.com/p/mupen64plus; maintainers = [ stdenv.lib.maintainers.sander ]; }; diff --git a/pkgs/misc/emulators/mupen64plus/default.nix b/pkgs/misc/emulators/mupen64plus/default.nix index d67121fe430ac68694b865ccb89e092644c7f370..571e14347b496ce73b3ec8bbd035ac5a40efacd2 100644 --- a/pkgs/misc/emulators/mupen64plus/default.nix +++ b/pkgs/misc/emulators/mupen64plus/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { meta = { description = "A Nintendo 64 Emulator"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://code.google.com/p/mupen64plus; maintainers = [ stdenv.lib.maintainers.sander ]; }; diff --git a/pkgs/misc/emulators/ppsspp/bump-version-to-0.9.8.patch b/pkgs/misc/emulators/ppsspp/bump-version-to-0.9.8.patch deleted file mode 100644 index 5e474d6f7477331f9a3437f24b485b20b0d4027d..0000000000000000000000000000000000000000 --- a/pkgs/misc/emulators/ppsspp/bump-version-to-0.9.8.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 48f6bf352154511d5acddfe44dd241c6a9ed92d7 Mon Sep 17 00:00:00 2001 -From: Bhavin -Date: Tue, 6 May 2014 22:44:58 +0530 -Subject: [PATCH] Update vaersion to 0.9.8 - -It was 0.9.6 :( ---- - Qt/Settings.pri | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Qt/Settings.pri b/Qt/Settings.pri -index 8b4c1d7..67949f2 100644 ---- a/Qt/Settings.pri -+++ b/Qt/Settings.pri -@@ -1,4 +1,4 @@ --VERSION = 0.9.6 -+VERSION = 0.9.8 - DEFINES += USING_QT_UI USE_FFMPEG - unix:!qnx:!symbian:!mac: CONFIG += linux - maemo5|contains(MEEGO_EDITION,harmattan): CONFIG += maemo --- -1.9.3 diff --git a/pkgs/misc/emulators/ppsspp/default.nix b/pkgs/misc/emulators/ppsspp/default.nix index 975de0f52701757f13ef7ff5982868045a6d0a12..ced8e1344dad438535a39a24add630472329feaa 100644 --- a/pkgs/misc/emulators/ppsspp/default.nix +++ b/pkgs/misc/emulators/ppsspp/default.nix @@ -3,21 +3,18 @@ }: let - version = "0.9.8"; + version = "0.9.9"; fstat = x: fn: "-D" + fn + "=" + (if x then "ON" else "OFF"); in stdenv.mkDerivation { name = "PPSSPP-${version}"; src = fetchgit { url = "https://github.com/hrydgard/ppsspp.git"; - sha256 = "11sqhb2m3502dzbizahh1w2dl7jv3fipwxyrmryj8fyaqqw0i36q"; - rev = "cbc46be3f91cb8558fbb4b175b14e8e16cbf0243"; + sha256 = "1m7awac87wrwys22qwbr0589im1ilm0dv30wp945xg30793rivvj"; + rev = "b421e29391b34d997b2c99ce2bdc74a0df5bb472"; fetchSubmodules = true; }; - # Upstream forgot to bump a version in one file. - patches = [ ./bump-version-to-0.9.8.patch ]; - buildInputs = [ zlib libpng pkgconfig qt4 ] ++ (if withGamepads then [ SDL ] else [ ]); diff --git a/pkgs/misc/emulators/snes9x-gtk/default.nix b/pkgs/misc/emulators/snes9x-gtk/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..760821e36543f0670bdc0055eb3e360af27bf4e7 --- /dev/null +++ b/pkgs/misc/emulators/snes9x-gtk/default.nix @@ -0,0 +1,30 @@ +{stdenv, fetchurl, nasm, SDL, zlib, libpng, ncurses, mesa, intltool, gtk, pkgconfig, libxml2, x11, pulseaudio}: + +stdenv.mkDerivation rec { + name = "snes9x-gtk-${version}"; + version = "1.53"; + + src = fetchurl { + url = "http://files.ipherswipsite.com/snes9x/snes9x-${version}-src.tar.bz2"; + sha256 = "9f7c5d2d0fa3fe753611cf94e8879b73b8bb3c0eab97cdbcb6ab7376efa78dc3"; + }; + + buildInputs = [ nasm SDL zlib libpng ncurses mesa intltool gtk pkgconfig libxml2 x11 pulseaudio]; + + sourceRoot = "snes9x-${version}-src/gtk"; + + configureFlags = "--prefix=$out/ --with-opengl"; + + installPhase = '' + mkdir -p $out/bin + cp snes9x-gtk $out/bin + ''; + + meta = { + description = "a portable, freeware Super Nintendo Entertainment System (SNES) emulator"; + longDescription = "Snes9x is a portable, freeware Super Nintendo Entertainment System (SNES) emulator. It basically allows you to play most games designed for the SNES and Super Famicom Nintendo game systems on your PC or Workstation; which includes some real gems that were only ever released in Japan."; + license = stdenv.lib.licenses.lgpl2; + maintainers = [ stdenv.lib.maintainers.qknight ]; + homepage = http://www.snes9x.com/; + }; +} diff --git a/pkgs/misc/emulators/uae/default.nix b/pkgs/misc/emulators/uae/default.nix index 9f93c9957d6508c640fbbdc8114281c8fb6b36ab..0fa5a08d2dc8edad9b53863ca791c759813ed541 100644 --- a/pkgs/misc/emulators/uae/default.nix +++ b/pkgs/misc/emulators/uae/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { meta = { description = "Ultimate/Unix/Unusuable Amiga Emulator"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://www.amigaemulator.org; maintainers = [ stdenv.lib.maintainers.sander ]; }; diff --git a/pkgs/misc/emulators/vice/default.nix b/pkgs/misc/emulators/vice/default.nix index 8323ca082b7f62cdee77c198452c01c18a11f6c2..b869143ff1cc4389a3e2a67c69c601c006858bb4 100644 --- a/pkgs/misc/emulators/vice/default.nix +++ b/pkgs/misc/emulators/vice/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = { description = "Commodore 64, 128 and other emulators"; homepage = http://www.viceteam.org; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.sander ]; }; } diff --git a/pkgs/misc/emulators/wine/unstable.nix b/pkgs/misc/emulators/wine/unstable.nix index 0e19d6ab89327b7e0f5c4c29d784e76f6de37ed8..cd5c5a8b4790a490b8756d0b1c3437a33203c9bc 100644 --- a/pkgs/misc/emulators/wine/unstable.nix +++ b/pkgs/misc/emulators/wine/unstable.nix @@ -7,27 +7,27 @@ assert stdenv.isLinux; assert stdenv.gcc.gcc != null; let - version = "1.7.20"; + version = "1.7.23"; name = "wine-${version}"; src = fetchurl { url = "mirror://sourceforge/wine/${name}.tar.bz2"; - sha256 = "05azpxrl7364ckvkwy7aa2p0vb4qhbc6wcn2l8khqb92jq5inhww"; + sha256 = "012ww1yifayakw9n2m23sx83dc3i2xiq3bn5n9iprppdhwxpp76v"; }; gecko = fetchurl { - url = "mirror://sourceforge/wine/wine_gecko-2.21-x86.msi"; - sha256 = "1n0zccnvchkg0m896sjx5psk4bxw9if32xyxib1rbfdasykay7zh"; + url = "mirror://sourceforge/wine/wine_gecko-2.24-x86.msi"; + sha256 = "0b10f55q3sldlcywscdlw3kd7vl9izlazw7jx30y4rpahypaqf3f"; }; gecko64 = fetchurl { - url = "mirror://sourceforge/wine/wine_gecko-2.21-x86_64.msi"; - sha256 = "0grc86dkq90i59zw43hakh62ra1ajnk11m64667xjrlzi7f0ndxw"; + url = "mirror://sourceforge/wine/wine_gecko-2.24-x86_64.msi"; + sha256 = "1j4wdlhzvjrabzr9igcnx0ivm5mcb8kp7bwkpfpfsanbifk7sma7"; }; mono = fetchurl { - url = "mirror://sourceforge/wine/wine-mono-0.0.8.msi"; - sha256 = "00jl24qp7vh3hlqv7wsw1s529lr5p0ybif6s73jy85chqaxj7z1x"; + url = "mirror://sourceforge/wine/wine-mono-4.5.2.msi"; + sha256 = "1bgasysf3qacxgh5rlk7qlw47ar5zgd1k9gb22pihi5s87dlw4nr"; }; in stdenv.mkDerivation rec { diff --git a/pkgs/misc/emulators/wine/winetricks.nix b/pkgs/misc/emulators/wine/winetricks.nix index 3dd3d4bc7311ba4337bc9c590f0ea429c0bc72b3..8103ff9c43f3a9cb7ac22db7715daac22411b799 100644 --- a/pkgs/misc/emulators/wine/winetricks.nix +++ b/pkgs/misc/emulators/wine/winetricks.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "A script to install DLLs needed to work around problems in Wine"; - license = "LGPLv2.1"; + license = stdenv.lib.licenses.lgpl21; homepage = http://code.google.com/p/winetricks/; maintainers = with stdenv.lib.maintainers; [ the-kenny ]; }; diff --git a/pkgs/misc/emulators/wxmupen64plus/default.nix b/pkgs/misc/emulators/wxmupen64plus/default.nix index a85d0fb389e26d1857153fbee44e702a2d51087c..0366b9dd22cedfde634aa41ee5f023ae6aff3f87 100644 --- a/pkgs/misc/emulators/wxmupen64plus/default.nix +++ b/pkgs/misc/emulators/wxmupen64plus/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = { description = "GUI for the Mupen64Plus 2.0 emulator"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = https://bitbucket.org/auria/wxmupen64plus/wiki/Home; }; } diff --git a/pkgs/misc/emulators/zsnes/default.nix b/pkgs/misc/emulators/zsnes/default.nix index c3bced292005240f3e8584e439fa3e48e0c8e92f..bca81a4b6b3a7dab76c76b1901fc2cad0ca5ae9b 100644 --- a/pkgs/misc/emulators/zsnes/default.nix +++ b/pkgs/misc/emulators/zsnes/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { meta = { description = "A Super Nintendo Entertainment System Emulator"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.sander ]; homepage = http://www.zsnes.com; }; diff --git a/pkgs/misc/foldingathome/default.nix b/pkgs/misc/foldingathome/default.nix index ef8cb7d0a927fa8bba7e62cfcbba43b4a4270de6..945d6556837c6f592396aed4d4bf02fc2e83346d 100644 --- a/pkgs/misc/foldingathome/default.nix +++ b/pkgs/misc/foldingathome/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation { meta = { homepage = http://folding.stanford.edu/; description = "Folding@home distributed computing client"; - license = "unfree"; + license = stdenv.lib.licenses.unfree; }; } diff --git a/pkgs/misc/freestyle/default.nix b/pkgs/misc/freestyle/default.nix index fa2c36cf2c2885c01de26893009c5ba75baa7ac3..bb3520e300abb54d6ce54933d7599b83fe99df9c 100644 --- a/pkgs/misc/freestyle/default.nix +++ b/pkgs/misc/freestyle/default.nix @@ -48,6 +48,6 @@ stdenv.mkDerivation { meta = { description = "Non-Photorealistic Line Drawing rendering from 3D scenes"; homepage = http://freestyle.sourceforge.net; - license = "GPL2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix index 142c75aeb0fa4e5d059e96907fb63cd2434171c8..275b93e01b8b7f92d605dbea42aad7695c0f45df 100644 --- a/pkgs/misc/ghostscript/default.nix +++ b/pkgs/misc/ghostscript/default.nix @@ -23,7 +23,7 @@ let of output drivers for various file formats and printers. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.viric ]; diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix index 826924b8e8e2dd984aaea41689c0456f110c208b..4f9f071094bc0efd97e92fa5b9013b2cbff4bae9 100644 --- a/pkgs/misc/jackaudio/default.nix +++ b/pkgs/misc/jackaudio/default.nix @@ -5,7 +5,7 @@ assert firewireSupport -> ffado != null; stdenv.mkDerivation rec { - name = "jackdbus-${version}"; + name = "jack2-${version}"; version = "1.9.9.5"; src = fetchurl { diff --git a/pkgs/misc/jackaudio/jack1.nix b/pkgs/misc/jackaudio/jack1.nix index 540735ab8108555d460f1f9ab6d7c54db8ae15ab..d424452ecd580c1939bca3f032a4678fd2f343b4 100644 --- a/pkgs/misc/jackaudio/jack1.nix +++ b/pkgs/misc/jackaudio/jack1.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchurl, pkgconfig, alsaLib +{ stdenv, fetchurl, pkgconfig, alsaLib, db, libuuid , firewireSupport ? false, ffado ? null }: assert firewireSupport -> ffado != null; stdenv.mkDerivation rec { - name = "jack-${version}"; - version = "0.121.3"; + name = "jack1-${version}"; + version = "0.124.1"; src = fetchurl { url = "http://jackaudio.org/downloads/jack-audio-connection-kit-${version}.tar.gz"; - sha256 = "1ypa3gjwy4vmaskin0vczmmdwybckkl42wmkfabx3v5yx8yms2dp"; + sha256 = "1mk1wnx33anp6haxfjjkfhwbaknfblsvj35nxvz0hvspcmhdyhpb"; }; preBuild = "echo ok"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; buildInputs = - [ pkgconfig alsaLib + [ pkgconfig alsaLib db libuuid ] ++ (stdenv.lib.optional firewireSupport ffado); meta = { diff --git a/pkgs/misc/screensavers/xscreensaver/default.nix b/pkgs/misc/screensavers/xscreensaver/default.nix index 7afe895cb5c5997b0b9d0dc3ed4ecd1d725ad301..0479174981004ca7299224ba1a8f1f77a60091d3 100644 --- a/pkgs/misc/screensavers/xscreensaver/default.nix +++ b/pkgs/misc/screensavers/xscreensaver/default.nix @@ -40,6 +40,6 @@ stdenv.mkDerivation rec { homepage = "http://www.jwz.org/xscreensaver/"; description = "A set of screensavers"; maintainers = with stdenv.lib.maintainers; [ raskin urkud ]; - platforms = stdenv.lib.platforms.allBut "i686-cygwin"; + platforms = with stdenv.lib.platforms; allBut cygwin; }; } diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index d316d3a3cd3c83d86d82d42d4171ff172b27b287..87014a9c714434bd0eaf3bb87a0802e189695cbb 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, python, cmake, vim, perl, ruby, unzip, which, fetchgit, clang }: +{ fetchurl, bash, stdenv, python, cmake, vim, perl, ruby, unzip, which, fetchgit, clang }: /* About Vim and plugins @@ -89,7 +89,7 @@ let vimHelpTags = '' installPhase = '' target=$out/share/vim-plugins/${path} - ensureDir $out/share/vim-plugins + mkdir -p $out/share/vim-plugins cp -r . $target ${vimHelpTags} vimHelpTags $target @@ -111,11 +111,11 @@ in rec YouCompleteMe = stdenv.mkDerivation { src = fetchgit { url = "https://github.com/Valloric/YouCompleteMe.git"; - rev = "abfc3ee36adab11c0c0b9d086a164a69006fec79"; - sha256 = "1d25dp5kgqickl06hqvx4j3z51zblhsn3q3by2hayyj3g2zps4gm"; + rev = "67288080ea7057ea3111cb4c863484e3b150e738"; + sha256 = "1a3rwdl458z1yrp50jdwp629j4al0zld21n15sad28g51m8gw5ka"; }; - name = "youcompleteme-git-abfc3ee"; + name = "youcompleteme-git-6728808"; buildInputs = [ python cmake clang.clang ]; configurePhase = ":"; @@ -125,10 +125,12 @@ in rec mkdir -p $target cp -a ./ $target + mkdir $target/build cd $target/build - cmake -G "Unix Makefiles" . $target/cpp -DPYTHON_LIBRARIES:PATH=${python}/lib/libpython2.7.so -DPYTHON_INCLUDE_DIR:PATH=${python}/include/python2.7 -DUSE_CLANG_COMPLETER=ON -DUSE_SYSTEM_LIBCLANG=ON - make -j -j''${NIX_BUILD_CORES} -l''${NIX_BUILD_CORES}} + cmake -G "Unix Makefiles" . $target/third_party/ycmd/cpp -DPYTHON_LIBRARIES:PATH=${python}/lib/libpython2.7.so -DPYTHON_INCLUDE_DIR:PATH=${python}/include/python2.7 -DUSE_CLANG_COMPLETER=ON -DUSE_SYSTEM_LIBCLANG=ON + make ycm_support_libs -j''${NIX_BUILD_CORES} -l''${NIX_BUILD_CORES}} + ${bash}/bin/bash $target/install.sh --clang-completer ${vimHelpTags} vimHelpTags $target @@ -406,7 +408,7 @@ in rec }; unpackPhase = ":"; installPhase = '' - ensureDir $out/share/vim-plugins/vim-a + mkdir -p $out/share/vim-plugins/vim-a cp ${src} $out/share/vim-plugins/vim-a/a.vim ''; }; diff --git a/pkgs/os-specific/darwin/xcode/default.nix b/pkgs/os-specific/darwin/xcode/default.nix index 73585d59c0b3c8224babe258c549614aa05679f8..2a48590154e4acaebcaa12f18447581eb45d837e 100644 --- a/pkgs/os-specific/darwin/xcode/default.nix +++ b/pkgs/os-specific/darwin/xcode/default.nix @@ -31,12 +31,12 @@ in stdenv.mkDerivation rec { patches = optional (osxVersion == "10.9") ./gcc-fix-enum-attributes.patch; installPhase = '' - ensureDir "$out/share/sysroot" + mkdir -p "$out/share/sysroot" cp -a * "$out/share/sysroot/" ln -s "$out/share/sysroot/usr/lib" "$out/lib" ln -s "$out/share/sysroot/usr/include" "$out/include" - ensureDir "$toolchain" + mkdir -p "$toolchain" pushd "$toolchain" ${xpwn}/bin/hfsplus "$(dirs +1)/../main.hfs" extractall \ Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr \ diff --git a/pkgs/os-specific/gnu/default.nix b/pkgs/os-specific/gnu/default.nix index 27b1cdd3e8a83553f35c520026740feaeb24ea61..94bfec0a18ec9473592f0538becb010a9011e62d 100644 --- a/pkgs/os-specific/gnu/default.nix +++ b/pkgs/os-specific/gnu/default.nix @@ -82,7 +82,7 @@ let mig = callPackage ./mig { # Build natively, but force use of a 32-bit environment because we're # targeting `i586-pc-gnu'. - stdenv = (forceSystem "i686-linux").stdenv; + stdenv = (forceSystem "i686-linux" "i386").stdenv; }; # XXX: Use this one for its `.crossDrv'. Using the one above from diff --git a/pkgs/os-specific/gnu/hurd/default.nix b/pkgs/os-specific/gnu/hurd/default.nix index 0c9059a30085e8abb9756dca94bb7bc9a69d3536..4bdb6e132fbb07485d3e8801fa7234c8a3a5d5a7 100644 --- a/pkgs/os-specific/gnu/hurd/default.nix +++ b/pkgs/os-specific/gnu/hurd/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation ({ kernels (such as Linux). ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://www.gnu.org/software/hurd/; diff --git a/pkgs/os-specific/gnu/libpthread/default.nix b/pkgs/os-specific/gnu/libpthread/default.nix index 3eaa6336ec27806f32d6b7868ac6f5d77e6910af..4b16652ba05305381e369edd68c07209613a34cc 100644 --- a/pkgs/os-specific/gnu/libpthread/default.nix +++ b/pkgs/os-specific/gnu/libpthread/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation ({ meta = { description = "GNU Hurd's libpthread"; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; }; diff --git a/pkgs/os-specific/gnu/mach/default.nix b/pkgs/os-specific/gnu/mach/default.nix index 54c6429955bb524839b3cb4b84767c37c3d43380..6d2d20687bc6f40a61ceaa37192d96bdeff61095 100644 --- a/pkgs/os-specific/gnu/mach/default.nix +++ b/pkgs/os-specific/gnu/mach/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation ({ were added using glue code, i.e., a Linux emulation layer in Mach. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://www.gnu.org/software/hurd/microkernel/mach/gnumach.html; diff --git a/pkgs/os-specific/gnu/mig/default.nix b/pkgs/os-specific/gnu/mig/default.nix index 9ee188b0c8c6fac09963275074497d17f1cb19a9..34426b45d55e0a89c7901289df7b2b5cace41f59 100644 --- a/pkgs/os-specific/gnu/mig/default.nix +++ b/pkgs/os-specific/gnu/mig/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation { Mach-based inter-process communication. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://www.gnu.org/software/hurd/microkernel/mach/mig/gnu_mig.html; diff --git a/pkgs/os-specific/gnu/smbfs/default.nix b/pkgs/os-specific/gnu/smbfs/default.nix index 4897c0c0af8098d2ba2eb7123233ac35ebe627f5..6f3d719d816957ea62070e58de55befe3dc2f37c 100644 --- a/pkgs/os-specific/gnu/smbfs/default.nix +++ b/pkgs/os-specific/gnu/smbfs/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { homepage = http://www.nongnu.org/hurdextras/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; }; diff --git a/pkgs/os-specific/gnu/unionfs/default.nix b/pkgs/os-specific/gnu/unionfs/default.nix index 946e4c0c109c9036994e5d90f8d351a9841f745a..5e2f428130cde96c52397fce266e5800c923ba62 100644 --- a/pkgs/os-specific/gnu/unionfs/default.nix +++ b/pkgs/os-specific/gnu/unionfs/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/hurd/hurd/translator/unionfs.html; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; }; diff --git a/pkgs/os-specific/linux/acpi/default.nix b/pkgs/os-specific/linux/acpi/default.nix index a3400ee0823fc012eb7486c1862e0f693cb9fdb8..0fc7992251538e1a204e170ad621a3fbf359dc9d 100644 --- a/pkgs/os-specific/linux/acpi/default.nix +++ b/pkgs/os-specific/linux/acpi/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { battery and thermal information. ''; homepage = http://sourceforge.net/projects/acpiclient/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = platforms.linux; maintainers = maintainers.mornfall; }; diff --git a/pkgs/os-specific/linux/acpitool/default.nix b/pkgs/os-specific/linux/acpitool/default.nix index c7f96206eab458b5ed0b274eec7410b720d01b55..6fc3bbe7c08e22bd89ad59ea7c10f21c728323de 100644 --- a/pkgs/os-specific/linux/acpitool/default.nix +++ b/pkgs/os-specific/linux/acpitool/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = { description = "A small, convenient command-line ACPI client with a lot of features"; homepage = http://freeunix.dyndns.org:8000/site2/acpitool.shtml; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.guibert ]; }; } diff --git a/pkgs/os-specific/linux/afuse/default.nix b/pkgs/os-specific/linux/afuse/default.nix index 06af0c9228a6dff276c55e50f8ce15de397e945a..70c8f36105c7d44cd4ff1b2482c21b0ef29fab23 100644 --- a/pkgs/os-specific/linux/afuse/default.nix +++ b/pkgs/os-specific/linux/afuse/default.nix @@ -13,9 +13,8 @@ stdenv.mkDerivation { meta = { description = "Automounter in userspace"; homepage = http://sourceforge.net/projects/afuse; - license = "GPL-v2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.marcweber ]; platforms = stdenv.lib.platforms.linux; }; } - diff --git a/pkgs/os-specific/linux/alsa-lib/default.nix b/pkgs/os-specific/linux/alsa-lib/default.nix index 8ad77c6b99e0c0ab7c3c9674a16d72781ab2cade..f46e54448b9edb1a1134d049ab6eb436d1fb6574 100644 --- a/pkgs/os-specific/linux/alsa-lib/default.nix +++ b/pkgs/os-specific/linux/alsa-lib/default.nix @@ -1,14 +1,14 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "alsa-lib-1.0.27.2"; + name = "alsa-lib-1.0.28"; src = fetchurl { urls = [ "ftp://ftp.alsa-project.org/pub/lib/${name}.tar.bz2" "http://alsa.cybermirror.org/lib/${name}.tar.bz2" ]; - sha256 = "068d8c92122hwca5jzhrjp4a131995adlb1d79zgrm7gwy9x63k9"; + sha256 = "0vaafg5q1q1mqcsgin5v7xlmngl3cnbmg5a9xxw0xcz1vn2ln1rw"; }; patches = [ @@ -18,11 +18,6 @@ stdenv.mkDerivation rec { See http://thread.gmane.org/gmane.linux.distributions.nixos/3435 */ ./alsa-plugin-dirs.patch - - /* patch provided by larsc on irc. - it may be a compiler problem on mips; without this, alsa does not build - on mips, because lacks some symbols atomic_add/atomic_sub */ - ./mips-atomic.patch ]; # Fix pcm.h file in order to prevent some compilation bugs @@ -35,15 +30,13 @@ stdenv.mkDerivation rec { 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 = { + meta = with stdenv.lib; { homepage = http://www.alsa-project.org/; description = "ALSA, the Advanced Linux Sound Architecture libraries"; @@ -52,6 +45,7 @@ stdenv.mkDerivation rec { MIDI functionality to the Linux-based operating system. ''; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl3Plus; + platforms = platforms.linux; }; } diff --git a/pkgs/os-specific/linux/alsa-lib/mips-atomic.patch b/pkgs/os-specific/linux/alsa-lib/mips-atomic.patch deleted file mode 100644 index 3af7c5d4debf89fc000836bbde6438723d73d0f2..0000000000000000000000000000000000000000 --- a/pkgs/os-specific/linux/alsa-lib/mips-atomic.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff --git a/include/iatomic.h b/include/iatomic.h -index e92dbfd..364bc5c 100644 ---- a/include/iatomic.h -+++ b/include/iatomic.h -@@ -720,7 +720,7 @@ typedef struct { volatile int counter; } atomic_t; - * Atomically adds @i to @v. Note that the guaranteed useful range - * of an atomic_t is only 24 bits. - */ --extern __inline__ void atomic_add(int i, atomic_t * v) -+static __inline__ void atomic_add(int i, atomic_t * v) - { - unsigned long temp; - -@@ -744,7 +744,7 @@ extern __inline__ void atomic_add(int i, atomic_t * v) - * Atomically subtracts @i from @v. Note that the guaranteed - * useful range of an atomic_t is only 24 bits. - */ --extern __inline__ void atomic_sub(int i, atomic_t * v) -+static __inline__ void atomic_sub(int i, atomic_t * v) - { - unsigned long temp; - -@@ -763,7 +763,7 @@ extern __inline__ void atomic_sub(int i, atomic_t * v) - /* - * Same as above, but return the result value - */ --extern __inline__ int atomic_add_return(int i, atomic_t * v) -+static __inline__ int atomic_add_return(int i, atomic_t * v) - { - unsigned long temp, result; - -@@ -784,7 +784,7 @@ extern __inline__ int atomic_add_return(int i, atomic_t * v) - return result; - } - --extern __inline__ int atomic_sub_return(int i, atomic_t * v) -+static __inline__ int atomic_sub_return(int i, atomic_t * v) - { - unsigned long temp, result; diff --git a/pkgs/os-specific/linux/alsa-oss/default.nix b/pkgs/os-specific/linux/alsa-oss/default.nix index 904c56665d15e222d188187b427bd60ee4eb8e69..0d02daebe1d79d5ad828963e945fb4f2eae765a7 100644 --- a/pkgs/os-specific/linux/alsa-oss/default.nix +++ b/pkgs/os-specific/linux/alsa-oss/default.nix @@ -1,12 +1,14 @@ {stdenv, fetchurl, alsaLib, gettext, ncurses, libsamplerate}: stdenv.mkDerivation rec { - name = "alsa-oss-1.0.25"; + name = "alsa-oss-1.0.28"; src = fetchurl { - url = "ftp://ftp.alsa-project.org/pub/oss-lib/${name}.tar.bz2"; - # url = "http://alsa.cybermirror.org/oss-lib/${name}.tar.bz2"; - sha256 = "ed823b8e42599951d896c1709615d4cf7cb1cb3a7c55c75ccee82e24ccaf28e3"; + urls = [ + "ftp://ftp.alsa-project.org/pub/oss-lib/${name}.tar.bz2" + "http://alsa.cybermirror.org/oss-lib/${name}.tar.bz2" + ]; + sha256 = "1mbabiywxjjlvdh257j3a0v4vvy69mwwnvc3xlq7pg50i2m2rris"; }; buildInputs = [ alsaLib ncurses libsamplerate ]; diff --git a/pkgs/os-specific/linux/alsa-plugins/default.nix b/pkgs/os-specific/linux/alsa-plugins/default.nix index 84d67b96d17ff64f2b2bb9c6596d806f352482bb..0bb96c343df4f440adebe693950f5c6be7444eef 100644 --- a/pkgs/os-specific/linux/alsa-plugins/default.nix +++ b/pkgs/os-specific/linux/alsa-plugins/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, lib, pkgconfig, alsaLib, libogg, pulseaudio ? null, jackaudio ? null }: +{ stdenv, fetchurl, lib, pkgconfig, alsaLib, libogg, pulseaudio ? null, jack2 ? null }: stdenv.mkDerivation rec { name = "alsa-plugins-1.0.28"; @@ -11,16 +11,17 @@ stdenv.mkDerivation rec { sha256 = "081is33afhykb4ysll8s6gh0d6nm1cglslj9ck0disbyl3qqlvs2"; }; + # ToDo: a52, etc.? buildInputs = [ pkgconfig alsaLib libogg ] - ++ stdenv.lib.optional (pulseaudio != null) pulseaudio - ++ stdenv.lib.optional (jackaudio != null) jackaudio; + ++ lib.optional (pulseaudio != null) pulseaudio + ++ lib.optional (jack2 != null) jack2; - meta = { + meta = with lib; { description = "Various plugins for ALSA"; homepage = http://alsa-project.org/; - license = "GPL2.1"; - maintainers = [lib.maintainers.marcweber]; - platforms = lib.platforms.linux; + license = licenses.lgpl21; + maintainers = [maintainers.marcweber]; + platforms = platforms.linux; }; } diff --git a/pkgs/os-specific/linux/alsa-utils/default.nix b/pkgs/os-specific/linux/alsa-utils/default.nix index 6167696f336c7209ce0bdaf787a3e8f0b4cfd2fb..7ab4a9197868342112a54b298ca8b3694b49cf12 100644 --- a/pkgs/os-specific/linux/alsa-utils/default.nix +++ b/pkgs/os-specific/linux/alsa-utils/default.nix @@ -1,12 +1,14 @@ {stdenv, fetchurl, alsaLib, gettext, ncurses, libsamplerate}: stdenv.mkDerivation rec { - name = "alsa-utils-1.0.27.2"; + name = "alsa-utils-1.0.28"; src = fetchurl { - # url = "ftp://ftp.alsa-project.org/pub/utils/${name}.tar.bz2"; - url = "http://alsa.cybermirror.org/utils/${name}.tar.bz2"; - sha256 = "1sjjngnq50jv5ilwsb4zys6smifni3bd6fn28gbnhfrg14wsrgq2"; + urls = [ + "ftp://ftp.alsa-project.org/pub/utils/${name}.tar.bz2" + "http://alsa.cybermirror.org/utils/${name}.tar.bz2" + ]; + sha256 = "1k1ach1jv0bf71klj9sqaijnw9wjrjad0g5in6bpfnhjn24lrzzk"; }; buildInputs = [ alsaLib ncurses libsamplerate ]; diff --git a/pkgs/os-specific/linux/apparmor/default.nix b/pkgs/os-specific/linux/apparmor/default.nix index 12173e20f3f9e66d8798b29cb6b03bb93f43d925..8048419a93ba98a9b489e0e4780f77aef91d3503 100644 --- a/pkgs/os-specific/linux/apparmor/default.nix +++ b/pkgs/os-specific/linux/apparmor/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { make make check make install - ensureDir $out/lib/perl5/site_perl/ + mkdir -p $out/lib/perl5/site_perl/ cp swig/perl/LibAppArmor.pm $out/lib/perl5/site_perl/ cp swig/perl/LibAppArmor.bs $out/lib/perl5/site_perl/ # this is automatically copied elsewhere.... diff --git a/pkgs/os-specific/linux/audit/default.nix b/pkgs/os-specific/linux/audit/default.nix index a7ff782d69edf9ba2dfb97e96013b22e7692ad58..9de84e228c434b6df4d7e09a93f61f553e56ee0b 100644 --- a/pkgs/os-specific/linux/audit/default.nix +++ b/pkgs/os-specific/linux/audit/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "Audit Library"; homepage = "http://people.redhat.com/sgrubb/audit/"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/autofs/autofs-v5.nix b/pkgs/os-specific/linux/autofs/autofs-v5.nix index 81ead8d33d0ef63025fa16e01db3a7cf29285f16..5c5c2f026afdf1484aa78e68c6e1b7cbc1f795c5 100644 --- a/pkgs/os-specific/linux/autofs/autofs-v5.nix +++ b/pkgs/os-specific/linux/autofs/autofs-v5.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { meta = { description="Kernel based automounter"; homepage="http://www.linux-consulting.com/Amd_AutoFS/autofs.html"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; executables = [ "automount" ]; }; } diff --git a/pkgs/os-specific/linux/batman-adv/batctl.nix b/pkgs/os-specific/linux/batman-adv/batctl.nix index 88c7ffd93ee2009a3ea1071aba0cd853875a63de..6e57e7651c458edf0688d6b19f5bd2701bd77c27 100644 --- a/pkgs/os-specific/linux/batman-adv/batctl.nix +++ b/pkgs/os-specific/linux/batman-adv/batctl.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.open-mesh.org/projects/batman-adv/wiki/Wiki; description = "B.A.T.M.A.N. routing protocol in a linux kernel module for layer 2, control tool"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/os-specific/linux/batman-adv/default.nix b/pkgs/os-specific/linux/batman-adv/default.nix index 0b7b6a0cafb40b69250638db1fab05cdf80f0abb..fee955bcca21686ae8217f8b93cd178d71f81b60 100644 --- a/pkgs/os-specific/linux/batman-adv/default.nix +++ b/pkgs/os-specific/linux/batman-adv/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.open-mesh.org/projects/batman-adv/wiki/Wiki; description = "B.A.T.M.A.N. routing protocol in a linux kernel module for layer 2"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/os-specific/linux/bbswitch/default.nix b/pkgs/os-specific/linux/bbswitch/default.nix index e12c80e08864d2ba5a65657de9fb9fa3c71c114d..6c7d6d5330e280a81235bfee8f57afccc16effad 100644 --- a/pkgs/os-specific/linux/bbswitch/default.nix +++ b/pkgs/os-specific/linux/bbswitch/default.nix @@ -22,10 +22,10 @@ stdenv.mkDerivation { ''; installPhase = '' - ensureDir $out/lib/modules/${kernel.modDirVersion}/misc + mkdir -p $out/lib/modules/${kernel.modDirVersion}/misc cp bbswitch.ko $out/lib/modules/${kernel.modDirVersion}/misc - ensureDir $out/bin + mkdir -p $out/bin tee $out/bin/discrete_vga_poweroff << EOF #!/bin/sh diff --git a/pkgs/os-specific/linux/blcr/default.nix b/pkgs/os-specific/linux/blcr/default.nix index 0cc4e3741c262574a66004b010daee638583a312..43673c899b44a40649636e62b8b9dd98b759066c 100644 --- a/pkgs/os-specific/linux/blcr/default.nix +++ b/pkgs/os-specific/linux/blcr/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { meta = { description = "Berkeley Lab Checkpoint/Restart for Linux (BLCR)"; homepage = https://ftg.lbl.gov/projects/CheckpointRestart/; - license = "GPL2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ z77z diff --git a/pkgs/os-specific/linux/bluez/bluez5.nix b/pkgs/os-specific/linux/bluez/bluez5.nix index f9f5c185bbd053e3fce02aff275af55131c885e4..2a87611a6800929d09cd4a90a919b39ea6caede7 100644 --- a/pkgs/os-specific/linux/bluez/bluez5.nix +++ b/pkgs/os-specific/linux/bluez/bluez5.nix @@ -5,11 +5,11 @@ assert stdenv.isLinux; stdenv.mkDerivation rec { - name = "bluez-5.16"; + name = "bluez-5.22"; src = fetchurl { url = "mirror://kernel/linux/bluetooth/${name}.tar.xz"; - sha256 = "0qxivd64az3qziw82axj2ksilllxq4fnb6fdrnlxr6d74550kmf8"; + sha256 = "10h8p89jnhxhjw4x53j4r53i999qjaz82l5591q6q48qb98ndf78"; }; pythonPath = with pythonPackages; diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix index 7226acf0e5798eb480c624767cb939930f0178ae..98fedb2d3f4f480890f09a3b5a636f2d65dd4e5f 100644 --- a/pkgs/os-specific/linux/busybox/default.nix +++ b/pkgs/os-specific/linux/busybox/default.nix @@ -28,6 +28,10 @@ let nixConfig = '' CONFIG_PREFIX "$out" CONFIG_INSTALL_NO_USR y + + # Use the external mount.cifs program. + CONFIG_FEATURE_MOUNT_CIFS n + CONFIG_FEATURE_MOUNT_HELPERS y ''; staticConfig = stdenv.lib.optionalString enableStatic '' @@ -49,8 +53,8 @@ stdenv.mkDerivation rec { ${configParser} cat << EOF | parseconfig ${staticConfig} - ${extraConfig} ${nixConfig} + ${extraConfig} $extraCrossConfig EOF make oldconfig @@ -70,7 +74,7 @@ stdenv.mkDerivation rec { meta = { description = "Tiny versions of common UNIX utilities in a single small executable"; homepage = http://busybox.net/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/os-specific/linux/checkpolicy/default.nix b/pkgs/os-specific/linux/checkpolicy/default.nix index a718b3656c449ad7ef196befb57d1a0b7d2eedb4..2b80114fe4751c14655ca06fb364e05989a89903 100644 --- a/pkgs/os-specific/linux/checkpolicy/default.nix +++ b/pkgs/os-specific/linux/checkpolicy/default.nix @@ -12,7 +12,10 @@ stdenv.mkDerivation rec { buildInputs = [ libsepol libselinux bison flex ]; - preBuild = '' makeFlags="$makeFlags LEX=flex LIBDIR=${libsepol}/lib PREFIX=$out" ''; + preBuild = '' + makeFlags="$makeFlags LEX=flex LIBDIR=${libsepol}/lib PREFIX=$out" + sed -e 's@[.]o$@& ../lex.yy.o@' -i test/Makefile + ''; meta = with stdenv.lib; { description = "SELinux policy compiler"; diff --git a/pkgs/os-specific/linux/criu/default.nix b/pkgs/os-specific/linux/criu/default.nix index 8cb39927353c3df449e6ab9c16587b3c5da9228f..433cc2c81d7a706c5c4b841ceec03509a5e08c7e 100644 --- a/pkgs/os-specific/linux/criu/default.nix +++ b/pkgs/os-specific/linux/criu/default.nix @@ -1,21 +1,23 @@ -{ stdenv, fetchurl, protobuf, protobufc, asciidoc, xmlto, utillinux }: +{ stdenv, fetchurl, protobuf, protobufc, asciidoc +, xmlto, utillinux, docbook_xsl, libpaper }: stdenv.mkDerivation rec { name = "criu-${version}"; - version = "1.3-rc1"; + version = "1.3-rc2"; src = fetchurl { url = "http://download.openvz.org/criu/${name}.tar.bz2"; - sha256 = "00q3kyvaizg5x2zladj0mazmp69c9kg7nvlazcqf0w6bqp0y7sp0"; + sha256 = "1h9ii91aq8cja22j3520vg3qb3y9h6c064s4115s2ldylm8jmi0s"; }; enableParallelBuilding = true; - buildInputs = [ protobuf protobufc asciidoc xmlto ]; + buildInputs = [ protobuf protobufc asciidoc xmlto libpaper ]; patchPhase = '' chmod +w ./scripts/gen-offsets.sh substituteInPlace ./scripts/gen-offsets.sh --replace hexdump ${utillinux}/bin/hexdump substituteInPlace ./Documentation/Makefile --replace "2>/dev/null" "" + substituteInPlace ./Documentation/Makefile --replace "--skip-validation" "--skip-validation -x ${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl" ''; configurePhase = "make config PREFIX=$out"; diff --git a/pkgs/os-specific/linux/cryptodev/default.nix b/pkgs/os-specific/linux/cryptodev/default.nix index 022ea648fea36a883a3340178f9382ada37704f1..4ea9295ef4f99c6a9a81f2896c1db07d75189f1d 100644 --- a/pkgs/os-specific/linux/cryptodev/default.nix +++ b/pkgs/os-specific/linux/cryptodev/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { meta = { description = "Device that allows access to Linux kernel cryptographic drivers"; homepage = http://home.gna.org/cryptodev-linux/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/os-specific/linux/cryptsetup/default.nix b/pkgs/os-specific/linux/cryptsetup/default.nix index 0f4a1b6985ef3e5b1bf8fd5cf2232b61e2c8a178..d3a0b827ed10986cdb7673609e8804baf4a97c56 100644 --- a/pkgs/os-specific/linux/cryptsetup/default.nix +++ b/pkgs/os-specific/linux/cryptsetup/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://code.google.com/p/cryptsetup/; description = "LUKS for dm-crypt"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ viric chaoflow ]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/os-specific/linux/disk-indicator/default.nix b/pkgs/os-specific/linux/disk-indicator/default.nix index 57fc9390f61e1bb305e7a1eac7b62db985a75c92..b60232a9b75493cc7dbf509b1bfbdfc92fcd26aa 100644 --- a/pkgs/os-specific/linux/disk-indicator/default.nix +++ b/pkgs/os-specific/linux/disk-indicator/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { Small program for Linux that will turn your Scroll, Caps or Num Lock LED or LED on your ThinkPad laptop into a hard disk activity indicator. ''; - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/dstat/default.nix b/pkgs/os-specific/linux/dstat/default.nix index 138b4ff468f1f348b0a67469cb711b33f5abade5..c95532f13602dd6faa0477d13d2b1972739e9462 100644 --- a/pkgs/os-specific/linux/dstat/default.nix +++ b/pkgs/os-specific/linux/dstat/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://dag.wieers.com/home-made/dstat/; description = "Versatile resource statistics tool"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; maintainers = [ ]; }; diff --git a/pkgs/os-specific/linux/frandom/default.nix b/pkgs/os-specific/linux/frandom/default.nix index 419207882f83b17a14f9a8101d747a7ef55797ff..80ad483b3676549062a823d2da77510788f2ea81 100644 --- a/pkgs/os-specific/linux/frandom/default.nix +++ b/pkgs/os-specific/linux/frandom/default.nix @@ -20,10 +20,10 @@ stdenv.mkDerivation rec { installPhase = '' kernelVersion=${kernel.modDirVersion} - ensureDir $out/lib/modules/$kernelVersion/misc + mkdir -p $out/lib/modules/$kernelVersion/misc cp frandom.ko $out/lib/modules/$kernelVersion/misc - ensureDir $out/lib/udev/rules.d + mkdir -p $out/lib/udev/rules.d tee $out/lib/udev/rules.d/10-frandom.rules <<-EOF # # These are the rules for the frandom devices. In theory, we could let @@ -40,8 +40,7 @@ stdenv.mkDerivation rec { meta = { description = "A very fast random number generator kernel module"; homepage = http://frandom.sourceforge.net/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.bluescreen303 ]; }; } - diff --git a/pkgs/os-specific/linux/gogoclient/default.nix b/pkgs/os-specific/linux/gogoclient/default.nix index 09a449bbede94b89d628f6d65a08382efa16c95e..a627a8cbcc94d57884d9a3808790c24781325a7d 100644 --- a/pkgs/os-specific/linux/gogoclient/default.nix +++ b/pkgs/os-specific/linux/gogoclient/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { buildInputs = [openssl]; preFixup = '' - ensureDir $out/share/${name} + mkdir -p $out/share/${name} chmod 444 $out/bin/gogoc.conf mv $out/bin/gogoc.conf $out/share/${name}/gogoc.conf.sample rm $out/bin/gogoc.conf.sample diff --git a/pkgs/os-specific/linux/google-authenticator/default.nix b/pkgs/os-specific/linux/google-authenticator/default.nix index a9278f0c7ce0d9d676d2c25475a300e6a27857e6..0e38d94e1ede63f7dd1df6dd882f875aed6e6e7d 100644 --- a/pkgs/os-specific/linux/google-authenticator/default.nix +++ b/pkgs/os-specific/linux/google-authenticator/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { ''; installPhase = '' - ensureDir $out/bin $out/lib/security + mkdir -p $out/bin $out/lib/security cp pam_google_authenticator.so $out/lib/security cp google-authenticator $out/bin ''; @@ -23,6 +23,6 @@ stdenv.mkDerivation rec { meta = { homepage = https://code.google.com/p/google-authenticator/; description = "Two-step verification, with pam module"; - license = "ASL2.0"; + license = stdenv.lib.licenses.asl20; }; } diff --git a/pkgs/os-specific/linux/hibernate/default.nix b/pkgs/os-specific/linux/hibernate/default.nix index d0e77a3bb7002c1815f8dd5e77ac2d50b172b216..6c5dd330f658965cf082393d54c1289bfbbf2829 100644 --- a/pkgs/os-specific/linux/hibernate/default.nix +++ b/pkgs/os-specific/linux/hibernate/default.nix @@ -38,7 +38,7 @@ in it into "hibernation". It works both with Linux swsusp and Tux-on-Ice. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://www.tuxonice.net/; }; } diff --git a/pkgs/os-specific/linux/hwdata/default.nix b/pkgs/os-specific/linux/hwdata/default.nix index e701c91019df815725e33015470c6d89a329f0c6..325a44f97aa46b0836503a5281ea7a6e191711bf 100644 --- a/pkgs/os-specific/linux/hwdata/default.nix +++ b/pkgs/os-specific/linux/hwdata/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { meta = { homepage = "https://fedorahosted.org/hwdata/"; description = "Hardware Database, including Monitors, pci.ids, usb.ids, and video cards"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/i7z/default.nix b/pkgs/os-specific/linux/i7z/default.nix index 33ac05aef478acb1a30b515ed232b570fd6a1845..1fe1f48f4ef37eb159799aacde043c982372636f 100644 --- a/pkgs/os-specific/linux/i7z/default.nix +++ b/pkgs/os-specific/linux/i7z/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; installPhase = '' - ensureDir $out/sbin + mkdir -p $out/sbin make install prefix=$out install -Dm755 GUI/i7z_GUI $out/sbin/i7z-gui ''; @@ -29,8 +29,7 @@ stdenv.mkDerivation rec { description = "A better i7 (and now i3, i5) reporting tool for Linux"; homepage = http://code.google.com/p/i7z; repositories.git = https://github.com/ajaiantilal/i7z.git; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.bluescreen303 ]; }; } - diff --git a/pkgs/os-specific/linux/i810switch/default.nix b/pkgs/os-specific/linux/i810switch/default.nix index 63a056712ac36f40e9c7d677e81dd5e58b9ca8b0..00f27a43e65af5e9d505c9f137bf73216ea7d175 100644 --- a/pkgs/os-specific/linux/i810switch/default.nix +++ b/pkgs/os-specific/linux/i810switch/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation { meta = { description = "A utility for switching between the LCD and external VGA display on Intel graphics cards"; homepage = "http://www16.plala.or.jp/mano-a-mano/i810switch.html"; - license = "GPL2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/os-specific/linux/iomelt/default.nix b/pkgs/os-specific/linux/iomelt/default.nix index df267d304c1504f78667fd585109fdac6ebe9e98..fccf7b6b1cd1370d8f3af17219522cce9328adc4 100644 --- a/pkgs/os-specific/linux/iomelt/default.nix +++ b/pkgs/os-specific/linux/iomelt/default.nix @@ -9,8 +9,8 @@ in stdenv.mkDerivation { }; preBuild = '' - ensureDir $out/bin - ensureDir $out/share/man/man1 + mkdir -p $out/bin + mkdir -p $out/share/man/man1 substituteInPlace Makefile \ --replace /usr $out diff --git a/pkgs/os-specific/linux/jujuutils/default.nix b/pkgs/os-specific/linux/jujuutils/default.nix index 7c688943ea8214b7967b3ca64a07cb58fca7eebd..a47b59e9e5677baca4731362eab7f538f88e0463 100644 --- a/pkgs/os-specific/linux/jujuutils/default.nix +++ b/pkgs/os-specific/linux/jujuutils/default.nix @@ -13,6 +13,6 @@ stdenv.mkDerivation { meta = { homepage = "http://code.google.com/p/jujuutils/"; description = "Utilities around FireWire devices connected to a Linux computer"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/os-specific/linux/kernel/linux-3.10.nix b/pkgs/os-specific/linux/kernel/linux-3.10.nix index 9f8c73f6ea7f3f0cd652204262ba63d2c8a750da..26938b7157835cc5e1eb17ccea0a807f46da7651 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.10.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.10.48"; + version = "3.10.51"; extraMeta.branch = "3.10"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "14gz998vr9jb9blbk60phq3hwnl2yipd6fykkl5bd8gai5wph2l3"; + sha256 = "1z1sbk13f5njbmx7vi775i2pp79f6b5r39cp85yzz0byvn6lx885"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/linux-3.12.nix b/pkgs/os-specific/linux/kernel/linux-3.12.nix index de73ef26516777295aa35feefc0da21a35842e4a..291e43a98e586e294ff9ce734e8b17a149b36c6b 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.12.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.12.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.12.24"; + version = "3.12.26"; extraMeta.branch = "3.12"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "01y9sz90d4l12m3f7gjmnasck85c2dqx74hwyccw5jk04r5pm2mx"; + sha256 = "1gp6brk2ix30g8dznd5yv1fq7yx82295va6cn7lwv6jj9w287s6c"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/linux-3.14.nix b/pkgs/os-specific/linux/kernel/linux-3.14.nix index f252080bbacccbf6b06d5d931658507b4533cd99..2d53d06f755c09dc247dafc297f2cf09d7c0c894 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.14.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.14.12"; + version = "3.14.15"; extraMeta.branch = "3.14"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "1pzshv7cj87v5na7paqka9v8mbqn04q25r241fha56sm7ilxbnap"; + sha256 = "0wjws67s698zpjj0kd3sxakjvnls91kc6vvz0md4i0qg683ld790"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/linux-3.15.nix b/pkgs/os-specific/linux/kernel/linux-3.15.nix index 9fa77a7a38ef603b344180a58f3adfa2343850e9..b59baf9f669c6ee4dacd8e44635e8205f205e4e6 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.15.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.15.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.15.5"; + version = "3.15.8"; extraMeta.branch = "3.15"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "09j0ga3nc90fbfl9g3i8x9vp70hq7ddnnlbcazahrz4vn6mngqv2"; + sha256 = "012d793mg2lkxfs6rxqkl22p6899l620ssbsii1szfjhnynh1qjd"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/linux-3.16.nix b/pkgs/os-specific/linux/kernel/linux-3.16.nix new file mode 100644 index 0000000000000000000000000000000000000000..3a7e51a080e5cc969376c9eb1e2ea994462e9319 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-3.16.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl, ... } @ args: + +import ./generic.nix (args // rec { + version = "3.16"; + modDirVersion = "3.16.0"; + extraMeta.branch = "3.16"; + + src = fetchurl { + url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; + sha256 = "183p3pz2rfprbp5i4kwk90kjn90v40banwx8759jxnd74xwss4s8"; + }; + + features.iwlwifi = true; + features.efiBootStub = true; + features.needsCifsUtils = true; + features.canDisableNetfilterConntrackHelpers = true; + features.netfilterRPFilter = true; +} // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-3.4.nix b/pkgs/os-specific/linux/kernel/linux-3.4.nix index 455901932c2ed2e1dcc5027c889feaf484812cf4..6a232d6450b4036600dbc16a45352888cce48a0d 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.4.98"; + version = "3.4.101"; extraMeta.branch = "3.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0kkd6q80w4rh1sjdd4j5a2fmib4mjwhsf5fm555jl2w3zsy0kr45"; + sha256 = "1zmb3dzqjiwb9ckj0gqqvlpdvqrjw17z9sddzxyawfrag6xv24a7"; }; kernelPatches = args.kernelPatches ++ diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 30e2a37cb91b7654c5b69a262959dd73c57babeb..6d9baed7f2ddf8d08cdc2279ed6aed32ae46bc6b 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -198,7 +198,7 @@ let " (with patches: " + stdenv.lib.concatStrings (stdenv.lib.intersperse ", " (map (x: x.name) kernelPatches)) + ")"); - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; homepage = http://www.kernel.org/; repositories.git = https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git; maintainers = [ diff --git a/pkgs/os-specific/linux/kernel/perf.nix b/pkgs/os-specific/linux/kernel/perf.nix index a7337760b79e3934e03cc11446affe42cee74840..8b8f7e1e78db1d3c7c3819d9329e1978c1e6eaca 100644 --- a/pkgs/os-specific/linux/kernel/perf.nix +++ b/pkgs/os-specific/linux/kernel/perf.nix @@ -1,12 +1,12 @@ -{ stdenv, kernel, elfutils, python, perl, newt, slang, asciidoc, xmlto +{ lib, stdenv, kernel, elfutils, python, perl, newt, slang, asciidoc, xmlto , docbook_xsl, docbook_xml_dtd_45, libxslt, flex, bison, pkgconfig , withGtk ? false, gtk ? null }: +with lib; + assert withGtk -> gtk != null; +assert versionAtLeast kernel.version "3.12"; -let optionalString = stdenv.lib.optionalString; - versionOlder = stdenv.lib.versionOlder; -in stdenv.mkDerivation { name = "perf-linux-${kernel.version}"; diff --git a/pkgs/os-specific/linux/keyutils/default.nix b/pkgs/os-specific/linux/keyutils/default.nix index fc05fc234525384c2e6cfd1699991895de8a8fbb..d1eb38df6da20f03ebc5cfede0c434f556bdd474 100644 --- a/pkgs/os-specific/linux/keyutils/default.nix +++ b/pkgs/os-specific/linux/keyutils/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "keyutils-1.5.9"; - + src = fetchurl { url = "http://people.redhat.com/dhowells/keyutils/${name}.tar.bz2"; sha256 = "1bl3w03ygxhc0hz69klfdlwqn33jvzxl1zfl2jmnb2v85iawb8jd"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; installPhase = "make install DESTDIR=$out"; - + meta = with stdenv.lib; { homepage = http://people.redhat.com/dhowells/keyutils/; description = "Tools used to control the Linux kernel key management system"; diff --git a/pkgs/os-specific/linux/latencytop/default.nix b/pkgs/os-specific/linux/latencytop/default.nix index eb776dcb86d09bab69deb2ed0b9875e1f5ebc82c..163ac18905053c385c0b398d254a29b3870bc1ed 100644 --- a/pkgs/os-specific/linux/latencytop/default.nix +++ b/pkgs/os-specific/linux/latencytop/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://latencytop.org; description = "Tool to show kernel reports on latencies (LATENCYTOP option)"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.viric ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/os-specific/linux/ldm/default.nix b/pkgs/os-specific/linux/ldm/default.nix index 202831309f0ec16fedd2211caca6fe705f34513e..c5e94ed81e9a0f17fdce66f8a1ce9a11e56fd905 100644 --- a/pkgs/os-specific/linux/ldm/default.nix +++ b/pkgs/os-specific/linux/ldm/default.nix @@ -3,7 +3,7 @@ assert mountPath != ""; let - version = "v0.4.2"; + version = "0.5"; git = https://github.com/LemonBoy/ldm.git; in stdenv.mkDerivation rec { @@ -13,8 +13,8 @@ stdenv.mkDerivation rec { # contains important fixes for LVM setups. src = fetchgit { url = meta.repositories.git; - rev = "refs/tags/${version}"; - sha256 = "1fdm3l00csjyvz40py6wlsh8s441rbp4az3sc2i14ag7srh2yim8"; + rev = "refs/tags/v${version}"; + sha256 = "0kkby3a0xgh1lmkbzpsi4am2rqjv3ccgdpic99aw1c76y0ca837y"; }; buildInputs = [ udev utillinux ]; @@ -24,6 +24,8 @@ stdenv.mkDerivation rec { --replace "/mnt/" "${mountPath}" ''; + buildPhase = "make ldm"; + installPhase = '' mkdir -p $out/bin cp -v ldm $out/bin @@ -31,7 +33,7 @@ stdenv.mkDerivation rec { meta = { description = "A lightweight device mounter, with libudev as only dependency"; - license = "MIT"; + license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.the-kenny ]; diff --git a/pkgs/os-specific/linux/libcap-ng/default.nix b/pkgs/os-specific/linux/libcap-ng/default.nix index bbeb2851ea38d6df074d69df0a242b6c56bf9ba7..3670f06e5439d27540092715f781f55728d86fc7 100644 --- a/pkgs/os-specific/linux/libcap-ng/default.nix +++ b/pkgs/os-specific/linux/libcap-ng/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation rec { description = "Library for working with POSIX capabilities"; homepage = http://people.redhat.com/sgrubb/libcap-ng/; platforms = stdenv.lib.platforms.linux; - license = "LGPLv2.1"; + license = stdenv.lib.licenses.lgpl21; }; } diff --git a/pkgs/os-specific/linux/libsepol/default.nix b/pkgs/os-specific/linux/libsepol/default.nix index f878d28449641b8c40977d4d77a2099c326a0860..bb5dde9a61ed43dd31d274d00962012f5aaccba9 100644 --- a/pkgs/os-specific/linux/libsepol/default.nix +++ b/pkgs/os-specific/linux/libsepol/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { homepage = http://userspace.selinuxproject.org; platforms = platforms.linux; maintainers = [ maintainers.phreedom ]; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/os-specific/linux/lsiutil/default.nix b/pkgs/os-specific/linux/lsiutil/default.nix index 700455d5f8b957928768ba73d1b88335142f4847..93cab433c9c66f0c39d9670d8a511331be2e7d08 100644 --- a/pkgs/os-specific/linux/lsiutil/default.nix +++ b/pkgs/os-specific/linux/lsiutil/default.nix @@ -35,6 +35,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.lsi.com/; description = "LSI Logic Fusion MPT command line management tool"; - license = "unfree"; + license = stdenv.lib.licenses.unfree; }; } diff --git a/pkgs/os-specific/linux/mcelog/default.nix b/pkgs/os-specific/linux/mcelog/default.nix index 5c36bb09781277b3aabda8463f3b2d3dc5eabc94..463722d2c961dad32ea094ff0ee84d4393792327 100644 --- a/pkgs/os-specific/linux/mcelog/default.nix +++ b/pkgs/os-specific/linux/mcelog/default.nix @@ -26,7 +26,7 @@ in stdenv.mkDerivation { makeFlags = "prefix=$(out) etcprefix=$(out) DOCDIR=$(out)/share/doc"; preInstall = '' - ensureDir $out/share/doc + mkdir -p $out/share/doc ''; meta = { diff --git a/pkgs/os-specific/linux/microcode/converter.nix b/pkgs/os-specific/linux/microcode/converter.nix index 49babc6ca57b2df6765d027f5604b15a4a30cebf..da4d967721711604deb4384902242c1f30d4c305 100644 --- a/pkgs/os-specific/linux/microcode/converter.nix +++ b/pkgs/os-specific/linux/microcode/converter.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { ''; installPhase = '' - ensureDir "$out/bin" + mkdir -p "$out/bin" cp intel-microcode2ucode "$out/bin/" ''; diff --git a/pkgs/os-specific/linux/net-tools/default.nix b/pkgs/os-specific/linux/net-tools/default.nix index 9386b50969fd93b20a809cecdc069aed1b8fb2b4..76f4661ecfc1472f4c254edf04770f42774cd724 100644 --- a/pkgs/os-specific/linux/net-tools/default.nix +++ b/pkgs/os-specific/linux/net-tools/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.tazenda.demon.co.uk/phil/net-tools/; description = "A set of tools for controlling the network subsystem in Linux"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/netatop/default.nix b/pkgs/os-specific/linux/netatop/default.nix index a863ee8a4d04f0b8d7724a004def5b212e90a180..c77faa6a9e70329d480b4117a031ccc3706cbf81 100644 --- a/pkgs/os-specific/linux/netatop/default.nix +++ b/pkgs/os-specific/linux/netatop/default.nix @@ -22,14 +22,14 @@ stdenv.mkDerivation { ''; preInstall = '' - ensureDir $out/bin $out/sbin $out/share/man/man{4,8} - ensureDir $out/lib/modules/${kernel.modDirVersion}/extra + mkdir -p $out/bin $out/sbin $out/share/man/man{4,8} + mkdir -p $out/lib/modules/${kernel.modDirVersion}/extra ''; meta = { description = "Network monitoring module for atop"; homepage = http://www.atoptool.nl/downloadnetatop.php; - license = "GPL2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [viric]; }; diff --git a/pkgs/os-specific/linux/nfs-utils/default.nix b/pkgs/os-specific/linux/nfs-utils/default.nix index 42bacd41be0370f3b3bf4b34830c8a0e557e13ca..bb85acf4dcbde07e1c92eb68dbab431babc7f49c 100644 --- a/pkgs/os-specific/linux/nfs-utils/default.nix +++ b/pkgs/os-specific/linux/nfs-utils/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { ''; homepage = http://nfs.sourceforge.net/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.ludo ]; diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh index e107379363b86acc02a553cf0e1f5b11e40c715e..8aa538f20689d0b592c65e74f93bc6fc385cb701 100755 --- a/pkgs/os-specific/linux/nvidia-x11/builder.sh +++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh @@ -33,11 +33,9 @@ installPhase() { # Install libGL and friends. mkdir -p $out/lib/vendors - for f in \ - libcuda libGL libnvcuvid libnvidia-cfg libnvidia-compiler \ - libnvidia-encode libnvidia-glcore libnvidia-ml libnvidia-opencl \ - libnvidia-tls libOpenCL libnvidia-tls libvdpau_nvidia + for g in *.so.$versionNumber; do + f=$(basename $g .so.$versionNumber) cp -prd $f.* $out/lib/ ln -snf $f.so.$versionNumber $out/lib/$f.so ln -snf $f.so.$versionNumber $out/lib/$f.so.1 diff --git a/pkgs/os-specific/linux/nvidia-x11/legacy173.nix b/pkgs/os-specific/linux/nvidia-x11/legacy173.nix index d85c0c1a389f580cae85ce44f275b4986933d8c7..0014a5d2ee53515cab0594bf420313133a26bff5 100644 --- a/pkgs/os-specific/linux/nvidia-x11/legacy173.nix +++ b/pkgs/os-specific/linux/nvidia-x11/legacy173.nix @@ -39,6 +39,6 @@ stdenv.mkDerivation { meta = { homepage = http://www.nvidia.com/object/unix.html; description = "X.org driver and kernel module for Legacy NVIDIA graphics cards"; - license = "unfree"; + license = stdenv.lib.licenses.unfree; }; } diff --git a/pkgs/os-specific/linux/nvidia-x11/legacy304.nix b/pkgs/os-specific/linux/nvidia-x11/legacy304.nix index f9aa80fba836dadaa9bc74828865fee8d94ae891..9acaee797f0c70e57d68db92ccdc39361d5cb676 100644 --- a/pkgs/os-specific/linux/nvidia-x11/legacy304.nix +++ b/pkgs/os-specific/linux/nvidia-x11/legacy304.nix @@ -46,6 +46,6 @@ stdenv.mkDerivation { meta = { homepage = http://www.nvidia.com/object/unix.html; description = "X.org driver and kernel module for NVIDIA graphics cards"; - license = "unfree"; + license = stdenv.lib.licenses.unfree; }; } diff --git a/pkgs/os-specific/linux/open-iscsi/default.nix b/pkgs/os-specific/linux/open-iscsi/default.nix index e28593d02522873ad59ff5540893635d21209219..88ab08e6c3d2638e0dffcd995aafa23cd9e4a4be 100644 --- a/pkgs/os-specific/linux/open-iscsi/default.nix +++ b/pkgs/os-specific/linux/open-iscsi/default.nix @@ -20,7 +20,7 @@ in stdenv.mkDerivation { meta = { description = "A high performance, transport independent, multi-platform implementation of RFC3720"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://www.open-iscsi.org; broken = true; }; diff --git a/pkgs/os-specific/linux/otpw/default.nix b/pkgs/os-specific/linux/otpw/default.nix index fe5f938b75b34005553465a36e4829834eb956dd..27d0510a657a08c903812cbcc7f5aabce385308c 100644 --- a/pkgs/os-specific/linux/otpw/default.nix +++ b/pkgs/os-specific/linux/otpw/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { ''; installPhase = '' - ensureDir $out/bin $out/lib/security $out/share/man/man{1,8} + mkdir -p $out/bin $out/lib/security $out/share/man/man{1,8} cp pam_*.so $out/lib/security cp otpw-gen $out/bin cp *.1 $out/share/man/man1 @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.cl.cam.ac.uk/~mgk25/otpw.html; description = "A one-time password login package"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/os-specific/linux/pam_usb/default.nix b/pkgs/os-specific/linux/pam_usb/default.nix index b5672728b536c8307b4868fb40baa2b427231ef8..f5fdc5670871bf149cfccc8bd81873599186a411 100644 --- a/pkgs/os-specific/linux/pam_usb/default.nix +++ b/pkgs/os-specific/linux/pam_usb/default.nix @@ -43,6 +43,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://pamusb.org/; description = "Authentication using USB Flash Drives"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/os-specific/linux/pcmciautils/default.nix b/pkgs/os-specific/linux/pcmciautils/default.nix index b53c61c754ae279f6d3872d7887142d2704e8117..787b72fde4807f54af9b3df8d4e42588c9d90364 100644 --- a/pkgs/os-specific/linux/pcmciautils/default.nix +++ b/pkgs/os-specific/linux/pcmciautils/default.nix @@ -50,6 +50,6 @@ stdenv.mkDerivation rec { the PCMCIA subsystem to behave (almost) as every other hotpluggable bus system. "; - license = "GPL2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/os-specific/linux/pm-utils/default.nix b/pkgs/os-specific/linux/pm-utils/default.nix index e3b6168be9b5469bf076d02cec4f5e1edca927c1..4fb7fc8cb0b803006501c86d8ffdd597e9c33407 100644 --- a/pkgs/os-specific/linux/pm-utils/default.nix +++ b/pkgs/os-specific/linux/pm-utils/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://pm-utils.freedesktop.org/wiki/; description = "A small collection of scripts that handle suspend and resume on behalf of HAL"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/pmount/default.nix b/pkgs/os-specific/linux/pmount/default.nix index f966180a8b6901981c665e034c257f08e870a439..c1049d78f42ae7985a47890858c76b9383a2e908 100644 --- a/pkgs/os-specific/linux/pmount/default.nix +++ b/pkgs/os-specific/linux/pmount/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://pmount.alioth.debian.org/; description = "Mount removable devices as normal user"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/pmtools/default.nix b/pkgs/os-specific/linux/pmtools/default.nix index 13a6e87319edbfca1d2eb530d805ec6a75ae5c43..7fa32ce4c943ed1d7770c9d793fdb55cf42b66ff 100644 --- a/pkgs/os-specific/linux/pmtools/default.nix +++ b/pkgs/os-specific/linux/pmtools/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.lesswatts.org/projects/acpi/utilities.php; description = "Linux ACPI utilities"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.simons ]; diff --git a/pkgs/os-specific/linux/pommed/default.nix b/pkgs/os-specific/linux/pommed/default.nix index 89e9ff66342304130f3cd306a3207d1c28036a1d..b4b4569def4b6bbde48481d557ba48c925380478 100644 --- a/pkgs/os-specific/linux/pommed/default.nix +++ b/pkgs/os-specific/linux/pommed/default.nix @@ -74,6 +74,6 @@ stdenv.mkDerivation rec { meta = { description = "A tool to handle hotkeys on Apple laptop keyboards"; homepage = http://www.technologeek.org/projects/pommed/index.html; - license = "gplv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/os-specific/linux/powertop/default.nix b/pkgs/os-specific/linux/powertop/default.nix index 702ebc5d8284e94a0b5a163da9e60c1bd4a156dc..04ab624b86a4ee9531b53d37fc12dc978f6d8ae9 100644 --- a/pkgs/os-specific/linux/powertop/default.nix +++ b/pkgs/os-specific/linux/powertop/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = { description = "Analyze power consumption on Intel-based laptops"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.chaoflow ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/os-specific/linux/psmouse-alps/default.nix b/pkgs/os-specific/linux/psmouse-alps/default.nix index 65f1a5cf6c6144022a2b02a9773253d0a4e03533..9dd78f5885ada605083dc7c73d67aad535a9c1b2 100644 --- a/pkgs/os-specific/linux/psmouse-alps/default.nix +++ b/pkgs/os-specific/linux/psmouse-alps/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { meta = { description = "ALPS dlkm driver with all known touchpads"; homepage = http://www.dahetral.com/public-download/alps-psmouse-dlkm-for-3-2-and-3-5/view; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [viric]; }; diff --git a/pkgs/os-specific/linux/radeontools/default.nix b/pkgs/os-specific/linux/radeontools/default.nix index 4dbe7e54247a08333c026b1aef4f1a7ed7a55d48..92e00ffad3fa3593e2bc280640153639c80673d1 100644 --- a/pkgs/os-specific/linux/radeontools/default.nix +++ b/pkgs/os-specific/linux/radeontools/default.nix @@ -24,9 +24,9 @@ stdenv.mkDerivation { cp radeontool lightwatch.pl $out/bin ''; - meta = { + meta = { description = "Control the backlight and external video output of ATI Radeon Mobility graphics cards"; homepage = http://fdd.com/software/radeon/; - license = "ZLIB"; + license = stdenv.lib.licenses.zlib; }; } diff --git a/pkgs/os-specific/linux/rfkill/udev.nix b/pkgs/os-specific/linux/rfkill/udev.nix index 6cf6e4adfa074a789dfb91ea7c27f24eeeca78d7..054ed471eaafee13ecc760425a4a875aec608025 100644 --- a/pkgs/os-specific/linux/rfkill/udev.nix +++ b/pkgs/os-specific/linux/rfkill/udev.nix @@ -31,12 +31,12 @@ stdenv.mkDerivation { dontBuild = true; installPhase = '' - ensureDir "$out/etc/udev/rules.d/"; + mkdir -p "$out/etc/udev/rules.d/"; cat > "$out/etc/udev/rules.d/90-rfkill.rules" << EOF SUBSYSTEM=="rfkill", ATTR{type}=="wlan", RUN+="$out/bin/rfkill-hook.sh" EOF - ensureDir "$out/bin/"; + mkdir -p "$out/bin/"; cp ${./rfkill-hook.sh} "$out/bin/rfkill-hook.sh" chmod +x "$out/bin/rfkill-hook.sh"; ''; diff --git a/pkgs/os-specific/linux/setools/default.nix b/pkgs/os-specific/linux/setools/default.nix index c95d27005efb4e419cc7a7765b06533569264e8c..cc1363156dd74bbb963be2eef83276201f45a3a8 100644 --- a/pkgs/os-specific/linux/setools/default.nix +++ b/pkgs/os-specific/linux/setools/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "SELinux Tools"; homepage = "http://oss.tresys.com/projects/setools/"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix index 10a1d88f2347816f547e345d96ca6ba06d5accac..d5e2ed3ff940525988d1c92d529a07faea09e9b2 100644 --- a/pkgs/os-specific/linux/sysdig/default.nix +++ b/pkgs/os-specific/linux/sysdig/default.nix @@ -3,10 +3,10 @@ let inherit (stdenv.lib) optional optionalString; s = rec { baseName="sysdig"; - version="0.1.83"; + version="0.1.87"; name="${baseName}-${version}"; url="https://github.com/draios/sysdig/archive/${version}.tar.gz"; - sha256="0d4fw6vba78hqy8plhcq8lkdcxy1fizrr5aiszdsap7cvd0gls6r"; + sha256="0xfildaj8kzbngpza47zqm363i6q87m97a18qlmdisrxmz11s32b"; }; buildInputs = [ cmake zlib luajit @@ -38,5 +38,6 @@ stdenv.mkDerivation { license = licenses.gpl2; maintainers = [maintainers.raskin]; platforms = platforms.linux ++ platforms.darwin; + downloadPage = "https://github.com/draios/sysdig/releases"; }; } diff --git a/pkgs/os-specific/linux/sysdig/default.upstream b/pkgs/os-specific/linux/sysdig/default.upstream index 7071d9825007803b5733e22f03937f71be4d78cc..485de5741d7905ab42c10b74712b5894854eedf4 100644 --- a/pkgs/os-specific/linux/sysdig/default.upstream +++ b/pkgs/os-specific/linux/sysdig/default.upstream @@ -1,3 +1,8 @@ url https://github.com/draios/sysdig/releases ensure_choice version '.*/([0-9.]+)[.]tar[.].*' '\1' +do_overwrite () { + ensure_hash + set_var_value sha256 $CURRENT_HASH + set_var_value version $CURRENT_VERSION +} diff --git a/pkgs/os-specific/linux/sysstat/default.nix b/pkgs/os-specific/linux/sysstat/default.nix index 2b4888f89cdfe690146771c03027f4dcb141f6c9..ec504bd923578a875ee39e5d43b5964e1e2505f5 100644 --- a/pkgs/os-specific/linux/sysstat/default.nix +++ b/pkgs/os-specific/linux/sysstat/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://sebastien.godard.pagesperso-orange.fr/; description = "A collection of performance monitoring tools for Linux (such as sar, iostat and pidstat)"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.eelco ]; }; diff --git a/pkgs/os-specific/linux/tunctl/default.nix b/pkgs/os-specific/linux/tunctl/default.nix index 8ea3599ff19842862d74ab1f8c2117d17b0788a2..fe79c23dc440ab0f2980abadb3a40b49492a7e33 100644 --- a/pkgs/os-specific/linux/tunctl/default.nix +++ b/pkgs/os-specific/linux/tunctl/default.nix @@ -16,6 +16,6 @@ stdenv.mkDerivation { meta = { homepage = http://tunctl.sourceforge.net/; description = "Utility to set up and maintain TUN/TAP network interfaces"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/os-specific/linux/uclibc/default.nix b/pkgs/os-specific/linux/uclibc/default.nix index e7cce315e8c6bd944295b48d6275db10c32f32c4..a0df3d526f5910f36001405eace220be0359de13 100644 --- a/pkgs/os-specific/linux/uclibc/default.nix +++ b/pkgs/os-specific/linux/uclibc/default.nix @@ -96,6 +96,6 @@ stdenv.mkDerivation { meta = { homepage = http://www.uclibc.org/; description = "A small implementation of the C library"; - license = "LGPLv2"; + license = stdenv.lib.licenses.lgpl2; }; } diff --git a/pkgs/os-specific/linux/upower/default.nix b/pkgs/os-specific/linux/upower/default.nix index e9fa2b4adb1ad0959506c6f333dd7de4043f9004..605d3d7adc5e14d40156b61babb68d9f856aaff5 100644 --- a/pkgs/os-specific/linux/upower/default.nix +++ b/pkgs/os-specific/linux/upower/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, dbus, dbus_glib, dbus_tools, polkit +{ stdenv, fetchurl, fetchpatch, pkgconfig, glib, dbus, dbus_glib, dbus_tools, polkit , intltool, libxslt, docbook_xsl, udev, libusb1, pmutils , useSystemd ? true, systemd, gobjectIntrospection }: @@ -13,6 +13,20 @@ stdenv.mkDerivation rec { sha256 = "06wqhab2mn0j4biiwh7mn4kxbxnfnzjkxvhpgvnlpaz9m2q54cj3"; }; + patches = [ + (fetchpatch rec { + url = "http://anonscm.debian.org/gitweb/?p=pkg-utopia/upower.git;" + + "a=blob_plain;f=debian/patches/${name};hb=b424b2763fbbba95df8c6ab3feeb57d072a9ddf7"; + sha256 = "0iq991abrn745icyz6x0wyixrjli01vbmbd9lnwwgyil58h3z8sp"; + name = "no_deprecation_define.patch"; + }) + (fetchpatch { + url = "http://cgit.freedesktop.org/upower/patch/?id=22da1a0bc5943b683189418d8b0f766e91b2bdbe"; + sha256 = "0yfgg6pw4bwskannvdwjxr75lgdrjpxhsskwlzm0frp8v5jy4k4z"; + name = "clamp-battery-percentages.patch"; + }) + ]; + buildInputs = [ dbus_glib polkit intltool libxslt docbook_xsl udev libusb1 gobjectIntrospection ] ++ stdenv.lib.optional useSystemd systemd; diff --git a/pkgs/os-specific/linux/usermount/default.nix b/pkgs/os-specific/linux/usermount/default.nix index d2b3632d69ae6340f9e7b3599b37d7180b47243e..9bf8692d1ce92a1443ba2c39b58c0df2c8154ae3 100644 --- a/pkgs/os-specific/linux/usermount/default.nix +++ b/pkgs/os-specific/linux/usermount/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = { homepage = https://github.com/tom5760/usermount; description = "A simple tool to automatically mount removable drives using UDisks2 and D-Bus."; - license = "MIT"; + license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ the-kenny ]; }; diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix index cdc384f3ee8caa5cffd830b47264b8e8a14da9b3..1dd7c0c089faa1907ebbb506d25c764cece82a6d 100644 --- a/pkgs/os-specific/linux/util-linux/default.nix +++ b/pkgs/os-specific/linux/util-linux/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, zlib, ncurses ? null, perl ? null, pam }: stdenv.mkDerivation rec { - name = "util-linux-2.24.1"; + name = "util-linux-2.24.2"; src = fetchurl { url = "http://www.kernel.org/pub/linux/utils/util-linux/v2.24/${name}.tar.xz"; - sha256 = "0444xhfm9525v3aagyfbp38mp7xsw2fn9zg4ya713c7s5hivcpl3"; + sha256 = "1w0g8q5aj5pjdf8l52g0mxyvlk62f4dch51q9jm3hnqwgz0dchqj"; }; crossAttrs = { diff --git a/pkgs/os-specific/linux/x86info/default.nix b/pkgs/os-specific/linux/x86info/default.nix index 6cd2a431a605c5ccc1104f9f9fae08892ad86249..eaec63f98bfc806aca055e418a0c53a3f849df2d 100644 --- a/pkgs/os-specific/linux/x86info/default.nix +++ b/pkgs/os-specific/linux/x86info/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ pciutils python ]; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin cp x86info lsmsr $out/bin ''; diff --git a/pkgs/os-specific/linux/xf86-input-mtrack/default.nix b/pkgs/os-specific/linux/xf86-input-mtrack/default.nix index f84088a930285c655b0cb0ca6b184b89fa290f90..a4fd00e4911be585439c49b5a1d9bdc2e9c3226c 100644 --- a/pkgs/os-specific/linux/xf86-input-mtrack/default.nix +++ b/pkgs/os-specific/linux/xf86-input-mtrack/default.nix @@ -44,7 +44,6 @@ stdenv.mkDerivation { description = "An Xorg driver for multitouch trackpads"; - license = "gplv2"; + license = stdenv.lib.licenses.gpl2; }; } - diff --git a/pkgs/os-specific/linux/xf86-input-multitouch/default.nix b/pkgs/os-specific/linux/xf86-input-multitouch/default.nix index ae24e32a1577f05ccde1a454e632bfb02542968c..7abf6d7c8288fbf64a701e207334099ada15fe3f 100644 --- a/pkgs/os-specific/linux/xf86-input-multitouch/default.nix +++ b/pkgs/os-specific/linux/xf86-input-multitouch/default.nix @@ -45,7 +45,6 @@ stdenv.mkDerivation { description = "Brings multitouch gestures to the Linux desktop"; - license = "gplv2"; + license = stdenv.lib.licenses.gpl2; }; } - diff --git a/pkgs/os-specific/linux/xf86-input-wacom/default.nix b/pkgs/os-specific/linux/xf86-input-wacom/default.nix index e59fd695f780f1388e54cea4427156f5b821bd60..d4786037b5afff0a442254838bb44ccd7bc9769e 100644 --- a/pkgs/os-specific/linux/xf86-input-wacom/default.nix +++ b/pkgs/os-specific/linux/xf86-input-wacom/default.nix @@ -3,11 +3,11 @@ , ncurses, pkgconfig, randrproto, xorgserver, xproto, udev, libXinerama, pixman }: stdenv.mkDerivation rec { - name = "xf86-input-wacom-0.23.0"; + name = "xf86-input-wacom-0.25.0"; src = fetchurl { url = "mirror://sourceforge/linuxwacom/${name}.tar.bz2"; - sha256 = "13capyywk4k3z0va8dawvvdbyschwid0075ji67kyabz1y431h6v"; + sha256 = "06kwcxmgja0xwc5glzwmxm237bsv9fk52k2d6ffq4naqfzn2k31k"; }; buildInputs = [ inputproto libX11 libXext libXi libXrandr libXrender diff --git a/pkgs/os-specific/windows/jom/default.nix b/pkgs/os-specific/windows/jom/default.nix index 8f8477d1864a889c05ed9434f9eebb15659ecb49..4b118a5a7cdcccaff14436623cc11f675a1e2441 100644 --- a/pkgs/os-specific/windows/jom/default.nix +++ b/pkgs/os-specific/windows/jom/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation { meta = { homepage = http://qt-project.org/wiki/jom; description = "Clone of nmake supporting multiple independent commands in parallel"; - license = "GPLv2+"; # Explicitly, GPLv2 or GPLv3, but not later. + license = stdenv.lib.licenses.gpl2Plus; # Explicitly, GPLv2 or GPLv3, but not later. }; } diff --git a/pkgs/os-specific/windows/pthread-w32/default.nix b/pkgs/os-specific/windows/pthread-w32/default.nix index cd417eb9ad0973920b54db340d60c534f8b89ee6..dde4f5d73711da82b4e61612eaae4c44f6d584e0 100644 --- a/pkgs/os-specific/windows/pthread-w32/default.nix +++ b/pkgs/os-specific/windows/pthread-w32/default.nix @@ -56,6 +56,6 @@ stdenv.mkDerivation { homepage = http://sourceware.org/pthreads-win32/; - license = "LGPLv2.1+"; + license = stdenv.lib.licenses.lgpl21Plus; }; } diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix index da0ec89cbc66a91cbbc54c6a6a377fd7f417a3e7..09b091b323c847b4f50155ce880150bd82fdc059 100644 --- a/pkgs/servers/amqp/rabbitmq-server/default.nix +++ b/pkgs/servers/amqp/rabbitmq-server/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "rabbitmq-server-${version}"; - version = "3.2.4"; + version = "3.3.4"; src = fetchurl { url = "http://www.rabbitmq.com/releases/rabbitmq-server/v${version}/${name}.tar.gz"; - sha256 = "17rvqhzcb7rscp228vmgixk0rsqi42m820jzxj9g5wid6qmzjc59"; + sha256 = "13nnsn34b44mz8w4b69bcpxmq4daqnxzd0lppg0f138pcssha43l"; }; buildInputs = diff --git a/pkgs/servers/beanstalkd/default.nix b/pkgs/servers/beanstalkd/default.nix index 717ea6306cffcc8899dfe180157477cf1c619f5d..264e6ff749a50daf26d92d8d0daf40e3a1bb34a3 100644 --- a/pkgs/servers/beanstalkd/default.nix +++ b/pkgs/servers/beanstalkd/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "1.9"; + version = "1.10"; name = "beanstalkd-${version}"; installPhase=''make install "PREFIX=$out"''; src = fetchurl { url = "https://github.com/kr/beanstalkd/archive/v${version}.tar.gz"; - sha256 = "158e6d6090c0afac7ee17b9f22713506b3e870dc04a738517282e2e262afb9eb"; + sha256 = "0n9dlmiddcfl7i0f1lwfhqiwyvf26493fxfcmn8jm30nbqciwfwj"; }; meta = with stdenv.lib; { diff --git a/pkgs/servers/bird/default.nix b/pkgs/servers/bird/default.nix index 5e86d60871dfa79f734f55d995d036d5b6b478a9..585228af2b455332bc8688130b7d4c7aa8538be4 100644 --- a/pkgs/servers/bird/default.nix +++ b/pkgs/servers/bird/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = ""; homepage = http://bird.network.cz; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; }; } diff --git a/pkgs/servers/dict/dictd-wiktionary.nix b/pkgs/servers/dict/dictd-wiktionary.nix index 9e9c05d2f915aa1edf8583688246b55853aead44..370bfd39137a5c00c66d6ea11f987c16200bb1ba 100644 --- a/pkgs/servers/dict/dictd-wiktionary.nix +++ b/pkgs/servers/dict/dictd-wiktionary.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { builder = writeScript "wiktionary-builder.sh" '' source $stdenv/setup - ensureDir $out/share/dictd/ + mkdir -p $out/share/dictd/ cd $out/share/dictd export LOCALE_ARCHIVE=${glibcLocales}/lib/locale/locale-archive diff --git a/pkgs/servers/dict/dictd-wordnet.nix b/pkgs/servers/dict/dictd-wordnet.nix index 063868ddc6e89dc5e4ebac355e95f2f04e496d68..b6680e8b21c42884edd8811ad921bef09756d31d 100644 --- a/pkgs/servers/dict/dictd-wordnet.nix +++ b/pkgs/servers/dict/dictd-wordnet.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { builder = writeScript "builder.sh" '' . ${stdenv}/setup - ensureDir $out/share/dictd/ + mkdir -p $out/share/dictd/ cd $out/share/dictd for i in ${wordnet}/dict/data.*; do diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index db8db908d1ec5db494b91dad8be9d5f4905bff3e..921d8e907f19fda06a7af8763ab6d3a247644893 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -39,6 +39,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.isc; maintainers = with stdenv.lib.maintainers; [viric simons]; - platforms = with stdenv.lib.platforms; linux; + platforms = with stdenv.lib.platforms; unix; }; } diff --git a/pkgs/servers/elasticmq/default.nix b/pkgs/servers/elasticmq/default.nix index 3d0324775f8992c9cd9db369e973631e6a17d26b..0fec6a5fe0e9cfb7614812500e0234e8f972b031 100644 --- a/pkgs/servers/elasticmq/default.nix +++ b/pkgs/servers/elasticmq/default.nix @@ -34,6 +34,6 @@ stdenv.mkDerivation rec { $ELASTICMQ_DATA_PREFIX/conf/Default.scala. You can use the Default.scala included in the distribution as a template. ''; - license = "APLv2"; + license = stdenv.lib.licenses.asl20; }; } diff --git a/pkgs/servers/etcd/default.nix b/pkgs/servers/etcd/default.nix index 1fb21f2b8ab6bddb3b2d42f002db6446681e04c9..8b4903c8602284ff79814ac57b0a2e760c05db53 100644 --- a/pkgs/servers/etcd/default.nix +++ b/pkgs/servers/etcd/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin mv etcd $out/bin/etcd ''; diff --git a/pkgs/servers/fleet/default.nix b/pkgs/servers/fleet/default.nix index 627c1ff0cf90f95692f31237b5efc73ec87202d6..e3a53c85052eb27324f6b7f98746db7b4957170f 100644 --- a/pkgs/servers/fleet/default.nix +++ b/pkgs/servers/fleet/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin mv fleet $out/bin ''; diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index 7deab6584f8338831960faf28e188f7465164b82..e164c21ec78dfbcb9eefcd61416aaa64c937b806 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -14,12 +14,12 @@ assert sslSupport -> aprutil.sslSupport && openssl != null; assert ldapSupport -> aprutil.ldapSupport && openldap != null; stdenv.mkDerivation rec { - version = "2.4.9"; + version = "2.4.10"; name = "apache-httpd-${version}"; src = fetchurl { url = "mirror://apache/httpd/httpd-${version}.tar.bz2"; - sha256 = "00vnhki0rdwlhl4cjgvkq5vpf8szx2sdd3yi7bcg7jj7z86wk37p"; + sha256 = "0slwcqw9f7fnb3kyz27hlsgh8j4wiza4yzqyp6vhfpvl3an4sv0p"; }; buildInputs = [perl] ++ diff --git a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix index 2431c86ddb655cce95e7cfcba6c8a75a087b396e..07dff1cf5855c15cc2e900bb1c0f3010c6098cbb 100644 --- a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix +++ b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = { homepage = "http://code.google.com/p/modwsgi/"; description = "Host Python applications in Apache through the WSGI interface"; - license = "ASL2.0"; + license = stdenv.lib.licenses.asl20; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.simons ]; diff --git a/pkgs/servers/http/myserver/default.nix b/pkgs/servers/http/myserver/default.nix index 8c0118912f5de4ade9703a802882fca202a8c32d..3e1c94e79b4bc1f1004c41ed1227dae953b06515 100644 --- a/pkgs/servers/http/myserver/default.nix +++ b/pkgs/servers/http/myserver/default.nix @@ -1,53 +1,50 @@ -{ fetchurl, stdenv, libgcrypt, libevent, libidn, gnutls +{ lib, fetchurl, stdenv, libgcrypt, libevent, libidn, gnutls , libxml2, zlib, guile, texinfo, cppunit, psmisc }: let version = "0.11"; in - stdenv.mkDerivation (rec { - name = "myserver-${version}"; - src = fetchurl { - url = "mirror://gnu/myserver/${version}/${name}.tar.xz"; - sha256 = "02y3vv4hxpy5h710y79s8ipzshhc370gbz1wm85x0lnq5nqxj2ax"; - }; +stdenv.mkDerivation rec { + name = "myserver-${version}"; - patches = - [ ./disable-dns-lookup-in-chroot.patch ]; + src = fetchurl { + url = "mirror://gnu/myserver/${version}/${name}.tar.xz"; + sha256 = "02y3vv4hxpy5h710y79s8ipzshhc370gbz1wm85x0lnq5nqxj2ax"; + }; - buildInputs = - [ libgcrypt libevent libidn gnutls libxml2 zlib guile texinfo ] - ++ stdenv.lib.optional doCheck cppunit; + patches = + [ ./disable-dns-lookup-in-chroot.patch ]; - makeFlags = [ "V=1" ]; + buildInputs = + [ libgcrypt libevent libidn gnutls libxml2 zlib guile texinfo ] + ++ lib.optional doCheck cppunit; - doCheck = true; + makeFlags = [ "V=1" ]; - enableParallelBuilding = true; + doCheck = true; - meta = { - description = "GNU MyServer, a powerful and easy to configure web server"; + enableParallelBuilding = true; - longDescription = '' - GNU MyServer is a powerful and easy to configure web server. Its - multi-threaded architecture makes it extremely scalable and usable in - large scale sites as well as in small networks, it has a lot of - built-in features. Share your files in minutes! - ''; + # On GNU/Linux the `test_suite' process sometimes stays around, so + # forcefully terminate it. + postCheck = lib.optionalString stdenv.isLinux "${psmisc}/bin/killall test_suite || true"; - homepage = http://www.gnu.org/software/myserver/; + meta = { + description = "GNU MyServer, a powerful and easy to configure web server"; - license = "GPLv3+"; + longDescription = '' + GNU MyServer is a powerful and easy to configure web server. Its + multi-threaded architecture makes it extremely scalable and usable in + large scale sites as well as in small networks, it has a lot of + built-in features. Share your files in minutes! + ''; - maintainers = [ ]; + homepage = http://www.gnu.org/software/myserver/; - # libevent fails to build on Cygwin and Guile has troubles on Darwin. - platforms = stdenv.lib.platforms.gnu; - }; - } + license = lib.licenses.gpl3Plus; - // + # libevent fails to build on Cygwin and Guile has troubles on Darwin. + platforms = lib.platforms.gnu; - # On GNU/Linux the `test_suite' process sometimes stays around, so - # forcefully terminate it. - (if stdenv.isLinux - then { postCheck = "${psmisc}/bin/killall test_suite || true"; } - else { })) + broken = true; # needs patch for gets() + }; +} diff --git a/pkgs/servers/http/thttpd/default.nix b/pkgs/servers/http/thttpd/default.nix index e03183cbe49dde010aa754ef1a1fb5a5c3cb5fc4..0bb3d96b37b705dcffbc5fd932e0e93c17fc710f 100644 --- a/pkgs/servers/http/thttpd/default.nix +++ b/pkgs/servers/http/thttpd/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { ''; preInstall = '' - ensureDir "$out/man/man1" + mkdir -p "$out/man/man1" sed -i -e 's/-o bin -g bin *//' Makefile sed -i -e '/chgrp/d' extras/Makefile ''; diff --git a/pkgs/servers/mail/freepops/default.nix b/pkgs/servers/mail/freepops/default.nix index c80d0f04bda954f1c6a828c5bade02dea510331f..a96e4cb37c01d5a168a6c1c984eca0143b47987d 100644 --- a/pkgs/servers/mail/freepops/default.nix +++ b/pkgs/servers/mail/freepops/default.nix @@ -23,5 +23,6 @@ stdenv.mkDerivation { homepage = http://www.freepops.org/; platforms = with stdenv.lib.platforms; linux; maintainers = with stdenv.lib.maintainers; [ pierron ]; + broken = true; }; } diff --git a/pkgs/servers/mediatomb/default.nix b/pkgs/servers/mediatomb/default.nix index e531f6160ff324d04ae467365b4cbdc6b17e3ac9..d88e1dd9e141b73457b668621ebad5b9e1a8654a 100644 --- a/pkgs/servers/mediatomb/default.nix +++ b/pkgs/servers/mediatomb/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl , sqlite, expat, spidermonkey, taglib, libexif, curl, ffmpeg, file }: + stdenv.mkDerivation rec { name = "mediatomb-${version}"; @@ -18,9 +19,10 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://mediatomb.cc; - description = "UPnP MediaServer with a web user interface,"; + description = "UPnP MediaServer with a web user interface"; license = licenses.gpl2; maintainers = [ maintainers.phreedom ]; platforms = platforms.linux; + broken = true; }; } diff --git a/pkgs/servers/monitoring/seyren/default.nix b/pkgs/servers/monitoring/seyren/default.nix index 541c377c404950274d3542707720c32e19760267..e6e15129568723ab518f7eef35bef9f05fc96988 100644 --- a/pkgs/servers/monitoring/seyren/default.nix +++ b/pkgs/servers/monitoring/seyren/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ makeWrapper jre src ]; installPhase = '' - ensureDir "$out"/bin + mkdir -p "$out"/bin makeWrapper "${jre}/bin/java" "$out"/bin/seyren --add-flags "-jar $src" ''; diff --git a/pkgs/servers/mpd/clientlib.nix b/pkgs/servers/mpd/clientlib.nix index 40b4ff1f2d7203f09ffa647d1016930443797180..bbbe54b95fd9b9101c5284432a093e5089d98628 100644 --- a/pkgs/servers/mpd/clientlib.nix +++ b/pkgs/servers/mpd/clientlib.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "Client library for MPD (music player daemon)"; homepage = http://mpd.wikia.com/wiki/Music_Player_Daemon_Wiki; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = with stdenv.lib.platforms; unix; maintainers = [ stdenv.lib.maintainers.mornfall ]; }; diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index 38be02e76ef8b7385ec0a29cabae9fb206ad0530..c8a6434cac3e6d621a0e205ffb24be9f6b0758b2 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.11"; + name = "mpd-0.18.12"; src = fetchurl { url = "http://www.musicpd.org/download/mpd/stable/${name}.tar.gz"; - sha256 = "1j3jdwmxfnn4z1vjry2g54vcbrdrgi41nv3bf2i26xkgy5708icw"; + sha256 = "09qphjcpqcs2jn5d8ga1skhif2mj5qk1ix9li76z2gyq3lf0rpz6"; }; buildInputs = [ pkgconfig glib ] diff --git a/pkgs/servers/news/leafnode/default.nix b/pkgs/servers/news/leafnode/default.nix index 9da83fe891feb304c793d3b9e45e4ebff806f70a..56d402397ecd7ee23cb71405985eb98bde4dd176 100644 --- a/pkgs/servers/news/leafnode/default.nix +++ b/pkgs/servers/news/leafnode/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://leafnode.sourceforge.net/"; description = "Leafnode implements a store & forward NNTP proxy"; - license = "X11"; + license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/servers/nosql/influxdb/default.nix b/pkgs/servers/nosql/influxdb/default.nix index fa9c48c6ea928ea9fe98884b83456c4c52914f72..77852b6d2ed9ad70a433e683bf39d6e601201aa2 100644 --- a/pkgs/servers/nosql/influxdb/default.nix +++ b/pkgs/servers/nosql/influxdb/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { wrapProgram "$out/bin/influxdb" \ --prefix LD_LIBRARY_PATH : "${stdenv.gcc.gcc}/lib:${stdenv.gcc.gcc}/lib64" - ensureDir $out/share/influxdb + mkdir -p $out/share/influxdb cp -R admin scripts config.toml $out/share/influxdb ''; diff --git a/pkgs/servers/nosql/mongodb/default.nix b/pkgs/servers/nosql/mongodb/default.nix index 78792c3a4f7296c30fd2b41cd626db5a04db2574..aa9da965d1728be8ea046de2cafb0c3693672138 100644 --- a/pkgs/servers/nosql/mongodb/default.nix +++ b/pkgs/servers/nosql/mongodb/default.nix @@ -40,7 +40,7 @@ in stdenv.mkDerivation rec { meta = { description = "a scalable, high-performance, open source NoSQL database"; homepage = http://www.mongodb.org; - license = "AGPLv3"; + license = stdenv.lib.licenses.agpl3; maintainers = [ stdenv.lib.maintainers.bluescreen303 ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/servers/nosql/rethinkdb/default.nix b/pkgs/servers/nosql/rethinkdb/default.nix index 67dff3f6572e13dc9656957a52c75d03447053b5..3694547c2d99b5bb142e83a817f9f3c018e62fa8 100644 --- a/pkgs/servers/nosql/rethinkdb/default.nix +++ b/pkgs/servers/nosql/rethinkdb/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { and group by, and is easy to setup and learn. ''; homepage = http://www.rethinkdb.com; - license = "AGPLv3"; + license = stdenv.lib.licenses.agpl3; maintainers = [ stdenv.lib.maintainers.bluescreen303 ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/servers/nsq/default.nix b/pkgs/servers/nsq/default.nix index b1570d96c7b6a9bda76b3f4fb1b117f7aa12714b..4d32c3203c7d0a530054ecae2b4517529ab6ef6f 100644 --- a/pkgs/servers/nsq/default.nix +++ b/pkgs/servers/nsq/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin mv build/* $out/bin ''; diff --git a/pkgs/servers/pies/default.nix b/pkgs/servers/pies/default.nix index 898bfb711ffdd98cb8b9ca209ca1b7f4f5ba7862..958578138bc2905420e9366008eef63a2eb775c8 100644 --- a/pkgs/servers/pies/default.nix +++ b/pkgs/servers/pies/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { native utilities). Finally, it can replace the inetd utility! ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; homepage = http://www.gnu.org/software/pies/; diff --git a/pkgs/servers/prayer/default.nix b/pkgs/servers/prayer/default.nix index a398a3ccdf98c4956402038dba2abeb53f15ceee..781fca1c33d28cfed05b7c5a14f8e362afee9a28 100644 --- a/pkgs/servers/prayer/default.nix +++ b/pkgs/servers/prayer/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www-uxsup.csx.cam.ac.uk/~dpc22/prayer/; description = "Yet another Webmail interface for IMAP servers on Unix systems written in C"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index 35922b3c46f0ae5acb6d7233466f5f626b3e1ee2..0665222a9e0455d56bfabb59e1a65c85665c6ff4 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, gnum4, gdbm, libtool, glib, dbus, avahi , gconf, gtk, intltool, gettext, alsaLib, libsamplerate, libsndfile, speex , bluez, sbc, udev, libcap, json_c -, jackaudioSupport ? false, jackaudio ? null +, jackaudioSupport ? false, jack2 ? null , x11Support ? false, xlibs , useSystemd ? false, systemd ? null }: -assert jackaudioSupport -> jackaudio != null; +assert jackaudioSupport -> jack2 != null; stdenv.mkDerivation rec { name = "pulseaudio-5.0"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig gnum4 libtool intltool glib dbus avahi libsamplerate libsndfile speex json_c ] - ++ stdenv.lib.optional jackaudioSupport jackaudio + ++ stdenv.lib.optional jackaudioSupport jack2 ++ stdenv.lib.optionals x11Support [ xlibs.xlibs xlibs.libXtst xlibs.libXi ] ++ stdenv.lib.optional useSystemd systemd ++ stdenv.lib.optionals stdenv.isLinux [ alsaLib bluez sbc udev ]; diff --git a/pkgs/servers/radius/default.nix b/pkgs/servers/radius/default.nix index dcd577bb6cb76eefd55eaf90b54b86657133bf10..a8c991e12d3e49ba4cbca6e04d152fe6bdd5197d 100644 --- a/pkgs/servers/radius/default.nix +++ b/pkgs/servers/radius/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.gnu.org/software/radius/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.bjg ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/servers/search/elasticsearch/default.nix b/pkgs/servers/search/elasticsearch/default.nix index 765ed3ee8e9552e8401a157296cec3276888835c..569ec87c4cb042d9784f75d4ff5c14bc78f47c06 100644 --- a/pkgs/servers/search/elasticsearch/default.nix +++ b/pkgs/servers/search/elasticsearch/default.nix @@ -32,6 +32,7 @@ stdenv.mkDerivation rec { meta = { description = "Open Source, Distributed, RESTful Search Engine"; - license = "ASL2.0"; + license = stdenv.lib.licenses.asl20; + platforms = platforms.unix; }; } diff --git a/pkgs/servers/search/elasticsearch/plugins.nix b/pkgs/servers/search/elasticsearch/plugins.nix new file mode 100644 index 0000000000000000000000000000000000000000..c03a2feae5f2cb701284c7f1a5b6feb2a4a5b2f1 --- /dev/null +++ b/pkgs/servers/search/elasticsearch/plugins.nix @@ -0,0 +1,53 @@ +{ pkgs, stdenv, fetchurl, unzip, elasticsearch }: + +with pkgs.lib; + +let + esPlugin = a@{ + pluginName, + installPhase ? '' + mkdir -p $out + ES_HOME=$out ${elasticsearch}/bin/elasticsearch-plugin --install ${pluginName} --url file://$src + '', + ... + }: + stdenv.mkDerivation (a // { + inherit installPhase; + unpackPhase = "true"; + buildInputs = [ unzip ]; + meta = a.meta // { + platforms = elasticsearch.meta.platforms; + maintainers = (a.meta.maintainers or []) ++ [ maintainers.offline ]; + }; + }); +in { + elasticsearch_river_jdbc = esPlugin rec { + name = "elasticsearch-river-jdbc-${version}"; + pluginName = "jdbc"; + version = "1.2.1.1"; + src = fetchurl { + url = "http://xbib.org/repository/org/xbib/elasticsearch/plugin/elasticsearch-river-jdbc/${version}/${name}-plugin.zip"; + sha1 = "68e7e1fdf45d0e5852b21610a84740595223ea11"; + }; + meta = { + homepage = "https://github.com/jprante/elasticsearch-river-jdbc"; + description = "Plugin to fetch data from JDBC sources for indexing into Elasticsearch"; + license = licenses.asl20; + }; + }; + + elasticsearch_analisys_lemmagen = esPlugin rec { + name = "elasticsearch-analysis-lemmagen-${version}"; + pluginName = "elasticsearch-analysis-lemmagen"; + version = "0.1"; + src = fetchurl { + url = "https://github.com/vhyza/elasticsearch-analysis-lemmagen/releases/download/v${version}/${name}-plugin.zip"; + sha256 = "bf7bf5ce3ccdd3afecd0e18cd6fce1ef56f824e41f4ef50553ae598caa5c366d"; + }; + meta = { + homepage = "https://github.com/vhyza/elasticsearch-analysis-lemmagen"; + description = "LemmaGen Analysis plugin provides jLemmaGen lemmatizer as Elasticsearch token filter"; + license = licenses.asl20; + }; + }; +} diff --git a/pkgs/servers/serfdom/default.nix b/pkgs/servers/serfdom/default.nix index 40b41c8f9d396dbb851b02c9b7c4a1658a23141f..48e5f2cea2270d23b07a4b90ec2e9cb9e250d9d1 100644 --- a/pkgs/servers/serfdom/default.nix +++ b/pkgs/servers/serfdom/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, go, fetchurl, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }: stdenv.mkDerivation rec { - version = "0.6.2"; + version = "0.6.3"; name = "serfdom-${version}"; src = import ./deps.nix { @@ -16,12 +16,12 @@ stdenv.mkDerivation rec { ''; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin mv serf $out/bin/serf ''; meta = with stdenv.lib; { - description = "Serf is a service discovery and orchestration tool that is decentralized, highly available, and fault tolerant"; + description = "A service discovery and orchestration tool that is decentralized, highly available, and fault tolerant"; homepage = http://www.serfdom.io/; license = licenses.mpl20; maintainers = with maintainers; [ msackman cstrahan ]; diff --git a/pkgs/servers/serfdom/deps.nix b/pkgs/servers/serfdom/deps.nix index b933c60882444aee3af7b04cd0da1a7551012429..a4b4058a711e4e114a20a341f080c974f5ffb1ee 100644 --- a/pkgs/servers/serfdom/deps.nix +++ b/pkgs/servers/serfdom/deps.nix @@ -77,8 +77,8 @@ let src = fetchFromGitHub { owner = "hashicorp"; repo = "serf"; - rev = "4232a3f7b52f755084caf6b2cc2789efa2948555"; - sha256 = "1hxxqrjz08882d205ylakhvvwciahiqdzkwi2a7zwrmx6sxna7sr"; + rev = "5e0771b8d61bee28986087a246f7611d6bd4a87a"; + sha256 = "0ck77ji28bvm4ahzxyyi4sm17c3fxc16k0k5mihl1nlkgdd73m8y"; }; } { diff --git a/pkgs/servers/shellinabox/default.nix b/pkgs/servers/shellinabox/default.nix index acff3a84a31eb81f11c4f286118ad5aa23532798..2d827c737d8bca8c9c5dcdafd1b3a10aa2a2006d 100644 --- a/pkgs/servers/shellinabox/default.nix +++ b/pkgs/servers/shellinabox/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = { homepage = https://code.google.com/p/shellinabox; description = "Web based AJAX terminal emulator"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [stdenv.lib.maintainers.tomberek]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/servers/silc-server/default.nix b/pkgs/servers/silc-server/default.nix index 2afec801961cef953b79db0c96797cf7542d9672..fdb1dcbd1cf6103de622015058188c2bdeea0da7 100644 --- a/pkgs/servers/silc-server/default.nix +++ b/pkgs/servers/silc-server/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://silcnet.org/; description = "Secure Internet Live Conferencing server"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/servers/sip/sipwitch/default.nix b/pkgs/servers/sip/sipwitch/default.nix index 90e71f5e47addd5c8d0bb4e84d10a0f715420145..14cd91ee141886986aaec6c33893fc6a2966420b 100644 --- a/pkgs/servers/sip/sipwitch/default.nix +++ b/pkgs/servers/sip/sipwitch/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "Secure peer-to-peer VoIP server that uses the SIP protocol"; homepage = http://www.gnu.org/software/sipwitch/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [ viric ]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/servers/sql/mysql/5.5.x.nix b/pkgs/servers/sql/mysql/5.5.x.nix index 782019f8ee06985bd3fa41d2a9af243d0b041c74..7c31bd7c582826c39e1859f9a23857ed25209f15 100644 --- a/pkgs/servers/sql/mysql/5.5.x.nix +++ b/pkgs/servers/sql/mysql/5.5.x.nix @@ -11,6 +11,11 @@ stdenv.mkDerivation rec { md5 = "bf1d80c66d4822ec6036300399a33c03"; }; + preConfigure = stdenv.lib.optional stdenv.isDarwin '' + ln -s /bin/ps $TMPDIR/ps + export PATH=$PATH:$TMPDIR + ''; + buildInputs = [ cmake bison ncurses openssl readline zlib ] ++ stdenv.lib.optional stdenv.isDarwin perl; diff --git a/pkgs/servers/sql/postgresql/9.0.x.nix b/pkgs/servers/sql/postgresql/9.0.x.nix index 00c614021b61f078e9161e79a1c3510698c0234c..97e98217f8aa9d1561cb912221cd9fe7229b6d28 100644 --- a/pkgs/servers/sql/postgresql/9.0.x.nix +++ b/pkgs/servers/sql/postgresql/9.0.x.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, zlib, readline }: -let version = "9.0.17"; in +let version = "9.0.18"; in stdenv.mkDerivation rec { name = "postgresql-${version}"; src = fetchurl { url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; - sha256 = "d2f6d09cf941e7cbab6ee399f14080dbe822af58fda9fd132efb05c2b7d160ad"; + sha256 = "7c8a07d0ab78fe39522c6bb268a7b357f456d9d4796f57d7b43a004e4a9d3003"; }; buildInputs = [ zlib readline ]; diff --git a/pkgs/servers/sql/postgresql/9.1.x.nix b/pkgs/servers/sql/postgresql/9.1.x.nix index 8d714c6f5a6523af280f7eff1bcc1192003ea91b..92417dc730c7ee5b01b664443e50015db88df0a8 100644 --- a/pkgs/servers/sql/postgresql/9.1.x.nix +++ b/pkgs/servers/sql/postgresql/9.1.x.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, zlib, readline }: -let version = "9.1.13"; in +let version = "9.1.14"; in stdenv.mkDerivation rec { name = "postgresql-${version}"; src = fetchurl { url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; - sha256 = "9ee819574dfc8798a448dc23a99510d2d8924c2f8b49f8228cd77e4efc8a6621"; + sha256 = "d0647ce563d18ae02bf68c5dd646a4c75e8b45b3a4fada64d481371fdc16f522"; }; buildInputs = [ zlib readline ]; diff --git a/pkgs/servers/sql/postgresql/9.2.x.nix b/pkgs/servers/sql/postgresql/9.2.x.nix index 8b0ce0f7bb2628c5a24ade88f7c25c6f4a9fd933..e5dbdd034d3f3056fa7e7d510110a93b9fa41d80 100644 --- a/pkgs/servers/sql/postgresql/9.2.x.nix +++ b/pkgs/servers/sql/postgresql/9.2.x.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, zlib, readline }: -let version = "9.2.8"; in +let version = "9.2.9"; in stdenv.mkDerivation rec { name = "postgresql-${version}"; src = fetchurl { url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; - sha256 = "568ba482340219097475cce9ab744766889692ee7c9df886563e8292d66ed87c"; + sha256 = "94ec6d330f125b6fc725741293073b07d7d20cc3e7b8ed127bc3d14ad2370197"; }; buildInputs = [ zlib readline ]; diff --git a/pkgs/servers/sql/postgresql/9.3.x.nix b/pkgs/servers/sql/postgresql/9.3.x.nix index 50ea799099c2764ef2f7185447d9b7b69bfe084c..6c6ef132e8136e50909a6a7c0c58b671a39c68ed 100644 --- a/pkgs/servers/sql/postgresql/9.3.x.nix +++ b/pkgs/servers/sql/postgresql/9.3.x.nix @@ -2,14 +2,14 @@ with stdenv.lib; -let version = "9.3.4"; in +let version = "9.3.5"; in stdenv.mkDerivation rec { name = "postgresql-${version}"; src = fetchurl { url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; - sha256 = "9ee819574dfc8798a448dc23a99510d2d8924c2f8b49f8228cd77e4efc8a6621"; + sha256 = "14176ffb1f90a189e7626214365be08ea2bfc26f26994bafb4235be314b9b4b0"; }; buildInputs = [ zlib readline ] ++ optionals (!stdenv.isDarwin) [ libossp_uuid ]; diff --git a/pkgs/servers/squid/squids.nix b/pkgs/servers/squid/squids.nix index 642b713daaab95d63826163283f526cad0a7fb44..a6552738ea6d7dd3103899087979985930850f3e 100644 --- a/pkgs/servers/squid/squids.nix +++ b/pkgs/servers/squid/squids.nix @@ -16,7 +16,7 @@ rec { meta = { description = "http-proxy"; homepage = "http://www.squid-cache.org"; - license = "GPL2"; + license = stdenv.lib.licenses.gpl2; }; }; diff --git a/pkgs/servers/unfs3/default.nix b/pkgs/servers/unfs3/default.nix index 96073645cc1c661cf519cf631c1b2f68f279d9f3..ee566c32def5ea660fc87735cacdbadcc892ecd1 100644 --- a/pkgs/servers/unfs3/default.nix +++ b/pkgs/servers/unfs3/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { homepage = http://unfs3.sourceforge.net/; - license = "BSD"; # 3-clause BSD + license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.ludo ]; }; diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..8aa15ee9f82f596875fa7bd493c7ac171cc47464 --- /dev/null +++ b/pkgs/servers/unifi/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, unzip }: + +stdenv.mkDerivation rec { + name = "unifi-controller-${version}"; + version = "3.2.1"; + + src = fetchurl { + url = "http://dl.ubnt.com/unifi/${version}/UniFi.unix.zip"; + sha256 = "0x7s5k9wxkw0rcs4c2mdrmmjpcfmbh5pvvpj8brrwnkgx072n53c"; + }; + + buildInputs = [ unzip ]; + + doConfigure = false; + + buildPhase = '' + rm -rf bin conf readme.txt + ''; + + installPhase = '' + mkdir -p $out + cp -ar * $out + ''; + + meta = with stdenv.lib; { + homepage = http://www.ubnt.com/; + description = "Controller for Ubiquiti UniFi accesspoints"; + license = licenses.unfree; + platforms = platforms.unix; + maintainers = with maintainers; [ wkennington ]; + }; +} diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 1834dfd6a963e65cf65da67de0032ff449cacbb6..2f18a4e1020fb1f9f0be7d0fa2e70cee49f11ce1 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -530,11 +530,11 @@ let })) // {inherit xproto ;}; inputproto = (stdenv.mkDerivation ((if overrides ? inputproto then overrides.inputproto else x: x) { - name = "inputproto-2.3"; + name = "inputproto-2.3.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/proto/inputproto-2.3.tar.bz2; - sha256 = "0by3aa8i1gki6i904i34vlrymv5p8il05gr83sf8x7v9ys9v29kx"; + url = mirror://xorg/individual/proto/inputproto-2.3.1.tar.bz2; + sha256 = "1lf1jlxp0fc8h6fjdffhd084dqab94966l1zm3rwwsis0mifwiss"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; @@ -570,11 +570,11 @@ let })) // {inherit fontsproto xproto xtrans ;}; libICE = (stdenv.mkDerivation ((if overrides ? libICE then overrides.libICE else x: x) { - name = "libICE-1.0.8"; + name = "libICE-1.0.9"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/libICE-1.0.8.tar.bz2; - sha256 = "07mp13pb3s73kj7y490gnx619znzwk91mlf8kdw0rzq29ll93a94"; + url = mirror://xorg/individual/lib/libICE-1.0.9.tar.bz2; + sha256 = "00p2b6bsg6kcdbb39bv46339qcywxfl4hsrz8asm4hy6q7r34w4g"; }; buildInputs = [pkgconfig xproto xtrans ]; })) // {inherit xproto xtrans ;}; @@ -680,11 +680,11 @@ let })) // {inherit xproto ;}; libXext = (stdenv.mkDerivation ((if overrides ? libXext then overrides.libXext else x: x) { - name = "libXext-1.3.2"; + name = "libXext-1.3.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXext-1.3.2.tar.bz2; - sha256 = "1q1j0kjyhmy24wqr6mdkrrciffyqhmc8vn95za2w1ka6qrdhfagq"; + url = mirror://xorg/individual/lib/libXext-1.3.3.tar.bz2; + sha256 = "0dbfn5bznnrhqzvkrcmw4c44yvvpwdcsrvzxf4rk27r36b9x865m"; }; buildInputs = [pkgconfig libX11 xextproto xproto ]; })) // {inherit libX11 xextproto xproto ;}; @@ -710,21 +710,21 @@ let })) // {inherit libfontenc fontsproto freetype xproto xtrans zlib ;}; libXft = (stdenv.mkDerivation ((if overrides ? libXft then overrides.libXft else x: x) { - name = "libXft-2.3.1"; + name = "libXft-2.3.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/libXft-2.3.1.tar.bz2; - sha256 = "1gdv6559cdz1lfw73x7wsvax1fkvphmayrymprljhyyb5nwk5kkz"; + url = mirror://xorg/individual/lib/libXft-2.3.2.tar.bz2; + sha256 = "0k6wzi5rzs0d0n338ms8n8lfyhq914hw4yl2j7553wqxfqjci8zm"; }; buildInputs = [pkgconfig fontconfig freetype libX11 xproto libXrender ]; })) // {inherit fontconfig freetype libX11 xproto libXrender ;}; libXi = (stdenv.mkDerivation ((if overrides ? libXi then overrides.libXi else x: x) { - name = "libXi-1.7.2"; + name = "libXi-1.7.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXi-1.7.2.tar.bz2; - sha256 = "03mj9i6h0n8icjkx5a16wh1gyyhfiayj02ydc6sy4i9nqqfph96z"; + url = mirror://xorg/individual/lib/libXi-1.7.4.tar.bz2; + sha256 = "0i12lj973grlp9fa79v0vh9cahk3nf9csdjnf81iip0qcrlc5zrc"; }; buildInputs = [pkgconfig inputproto libX11 libXext xextproto libXfixes xproto ]; })) // {inherit inputproto libX11 libXext xextproto libXfixes xproto ;}; @@ -1210,11 +1210,11 @@ let })) // {inherit gperf m4 libxcb xproto ;}; xcbutilrenderutil = (stdenv.mkDerivation ((if overrides ? xcbutilrenderutil then overrides.xcbutilrenderutil else x: x) { - name = "xcb-util-renderutil-0.3.8"; + name = "xcb-util-renderutil-0.3.9"; builder = ./builder.sh; src = fetchurl { - url = http://xcb.freedesktop.org/dist/xcb-util-renderutil-0.3.8.tar.bz2; - sha256 = "0lkl9ij9b447c0br2qc5qsynjn09c4fdz7sd6yp7pyi8az2sb2cp"; + url = http://xcb.freedesktop.org/dist/xcb-util-renderutil-0.3.9.tar.bz2; + sha256 = "0nza1csdvvxbmk8vgv8vpmq7q8h05xrw3cfx9lwxd1hjzd47xsf6"; }; buildInputs = [pkgconfig gperf m4 libxcb xproto ]; })) // {inherit gperf m4 libxcb xproto ;}; @@ -1260,11 +1260,11 @@ let })) // {inherit libX11 ;}; xcursorgen = (stdenv.mkDerivation ((if overrides ? xcursorgen then overrides.xcursorgen else x: x) { - name = "xcursorgen-1.0.5"; + name = "xcursorgen-1.0.6"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/xcursorgen-1.0.5.tar.bz2; - sha256 = "10f5wk1326mm45gvgpf4m2p0j80fcd0i4c52zikahb91zah72wdw"; + url = mirror://xorg/individual/app/xcursorgen-1.0.6.tar.bz2; + sha256 = "0v7nncj3kaa8c0524j7ricdf4rvld5i7c3m6fj55l5zbah7r3j1i"; }; buildInputs = [pkgconfig libpng libX11 libXcursor ]; })) // {inherit libpng libX11 libXcursor ;}; @@ -1470,11 +1470,11 @@ let })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; xf86videoati = (stdenv.mkDerivation ((if overrides ? xf86videoati then overrides.xf86videoati else x: x) { - name = "xf86-video-ati-7.3.0"; + name = "xf86-video-ati-7.4.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-ati-7.3.0.tar.bz2; - sha256 = "1zj6401km2zgc32vhw7jfkaklsllsm9xpbs79zh9da8r94n0fz0h"; + url = mirror://xorg/individual/driver/xf86-video-ati-7.4.0.tar.bz2; + sha256 = "1nbnvxlyn75bcf23m39p7yw80kilgdxmjdvzgcs3walshnlhq8wn"; }; buildInputs = [pkgconfig fontsproto glamoregl libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; })) // {inherit fontsproto glamoregl libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;}; @@ -1580,11 +1580,11 @@ let })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;}; xf86videomodesetting = (stdenv.mkDerivation ((if overrides ? xf86videomodesetting then overrides.xf86videomodesetting else x: x) { - name = "xf86-video-modesetting-0.8.1"; + name = "xf86-video-modesetting-0.9.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-modesetting-0.8.1.tar.bz2; - sha256 = "1jhjhgji6169sj7489qahcnmi8cf7y22wvj8qsmrg537rgbxia1v"; + url = mirror://xorg/individual/driver/xf86-video-modesetting-0.9.0.tar.bz2; + sha256 = "0p6pjn5bnd2wr3lmas4b12zcq12d9ilvssga93fzlg90fdahikwh"; }; buildInputs = [pkgconfig fontsproto libdrm udev libpciaccess randrproto libX11 xextproto xorgserver xproto ]; })) // {inherit fontsproto libdrm udev libpciaccess randrproto libX11 xextproto xorgserver xproto ;}; @@ -1970,11 +1970,11 @@ let })) // {inherit ;}; xorgserver = (stdenv.mkDerivation ((if overrides ? xorgserver then overrides.xorgserver else x: x) { - name = "xorg-server-1.14.6"; + name = "xorg-server-1.14.7"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/xserver/xorg-server-1.14.6.tar.bz2; - sha256 = "0c57vp1z0p38dj5gfipkmlw6bvbz1mrr0sb3sbghdxxdyq4kzcz8"; + url = mirror://xorg/individual/xserver/xorg-server-1.14.7.tar.bz2; + sha256 = "07s54g9q1bry1050dsa7x6hy55yjvq9sxs6ks89pc8l6mnk6zxpw"; }; buildInputs = [pkgconfig renderproto libdrm openssl libX11 libXau libXaw libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt libXv ]; })) // {inherit renderproto libdrm openssl libX11 libXau libXaw libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt libXv ;}; diff --git a/pkgs/servers/x11/xorg/extra.list b/pkgs/servers/x11/xorg/extra.list index 3abfed675f83759a45b9835d247a43c15f459fee..2d105241c2d18e5e5acaff964cad0cfe9f7f1e9c 100644 --- a/pkgs/servers/x11/xorg/extra.list +++ b/pkgs/servers/x11/xorg/extra.list @@ -4,5 +4,5 @@ http://xcb.freedesktop.org/dist/xcb-proto-1.10.tar.bz2 http://xcb.freedesktop.org/dist/xcb-util-0.3.9.tar.bz2 http://xcb.freedesktop.org/dist/xcb-util-image-0.3.9.tar.bz2 http://xcb.freedesktop.org/dist/xcb-util-keysyms-0.3.9.tar.bz2 -http://xcb.freedesktop.org/dist/xcb-util-renderutil-0.3.8.tar.bz2 +http://xcb.freedesktop.org/dist/xcb-util-renderutil-0.3.9.tar.bz2 http://xcb.freedesktop.org/dist/xcb-util-wm-0.4.1.tar.bz2 diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index bb97eadef4628be3c1a352e4c3d61937f46ecdd3..e5aad4aea406bee8086f3677861e20e1cdcb5870 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -73,6 +73,10 @@ in ''; }; + libXfont = attrs: attrs // { + propagatedBuildInputs = [ args.freetype ]; # propagate link reqs. like bzip2 + }; + libXxf86vm = attrs: attrs // { preConfigure = setMalloc0ReturnsNullCrossCompiling; }; @@ -111,6 +115,10 @@ in libXft = attrs: attrs // { propagatedBuildInputs = [ xorg.libXrender args.freetype args.fontconfig ]; preConfigure = setMalloc0ReturnsNullCrossCompiling; + # the include files need ft2build.h, and Requires.private isn't enough for us + postInstall = '' + sed "/^Requires:/s/$/, freetype2/" -i "$out/lib/pkgconfig/xft.pc" + ''; }; libXext = attrs: attrs // { diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index e7b3a6f4ad60f26f8ac5d181d0aff44b6b37e512..417d12ddadc957533c02a9c59ab373b947b65200 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -48,14 +48,14 @@ mirror://xorg/X11R7.7/src/everything/font-winitzki-cyrillic-1.0.3.tar.bz2 mirror://xorg/X11R7.7/src/everything/font-xfree86-type1-1.0.4.tar.bz2 mirror://xorg/individual/proto/glproto-1.4.17.tar.bz2 mirror://xorg/individual/app/iceauth-1.0.6.tar.bz2 -mirror://xorg/individual/proto/inputproto-2.3.tar.bz2 +mirror://xorg/individual/proto/inputproto-2.3.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/kbproto-1.0.6.tar.bz2 mirror://xorg/X11R7.7/src/everything/libAppleWM-1.4.1.tar.bz2 mirror://xorg/individual/lib/libdmx-1.1.3.tar.bz2 mirror://xorg/individual/lib/libxshmfence-1.1.tar.bz2 mirror://xorg/individual/lib/libfontenc-1.1.2.tar.bz2 mirror://xorg/individual/lib/libFS-1.0.6.tar.bz2 -mirror://xorg/X11R7.7/src/everything/libICE-1.0.8.tar.bz2 +mirror://xorg/individual/lib/libICE-1.0.9.tar.bz2 mirror://xorg/individual/lib/libpciaccess-0.13.2.tar.bz2 mirror://xorg/individual/lib/libSM-1.2.2.tar.bz2 mirror://xorg/X11R7.7/src/everything/libWindowsWM-1.0.1.tar.bz2 @@ -66,11 +66,11 @@ mirror://xorg/individual/lib/libXcomposite-0.4.4.tar.bz2 mirror://xorg/individual/lib/libXcursor-1.1.14.tar.bz2 mirror://xorg/individual/lib/libXdamage-1.1.4.tar.bz2 mirror://xorg/X11R7.7/src/everything/libXdmcp-1.1.1.tar.bz2 -mirror://xorg/individual/lib/libXext-1.3.2.tar.bz2 +mirror://xorg/individual/lib/libXext-1.3.3.tar.bz2 mirror://xorg/individual/lib/libXfixes-5.0.1.tar.bz2 mirror://xorg/individual/lib/libXfont-1.4.8.tar.bz2 -mirror://xorg/X11R7.7/src/everything/libXft-2.3.1.tar.bz2 -mirror://xorg/individual/lib/libXi-1.7.2.tar.bz2 +mirror://xorg/individual/lib/libXft-2.3.2.tar.bz2 +mirror://xorg/individual/lib/libXi-1.7.4.tar.bz2 mirror://xorg/individual/lib/libXinerama-1.1.3.tar.bz2 mirror://xorg/X11R7.7/src/everything/libxkbfile-1.0.8.tar.bz2 mirror://xorg/individual/lib/libXmu-1.1.2.tar.bz2 @@ -106,7 +106,7 @@ mirror://xorg/individual/app/xbacklight-1.2.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/xbitmaps-1.1.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/xcmiscproto-1.2.2.tar.bz2 mirror://xorg/X11R7.7/src/everything/xcmsdb-1.0.4.tar.bz2 -mirror://xorg/X11R7.7/src/everything/xcursorgen-1.0.5.tar.bz2 +mirror://xorg/individual/app/xcursorgen-1.0.6.tar.bz2 mirror://xorg/individual/data/xcursor-themes-1.0.4.tar.bz2 mirror://xorg/individual/app/xdpyinfo-1.3.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/xdriinfo-1.0.4.tar.bz2 @@ -124,7 +124,7 @@ mirror://xorg/individual/driver/xf86-input-vmmouse-13.0.0.tar.bz2 mirror://xorg/individual/driver/xf86-input-void-1.4.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-ark-0.7.5.tar.bz2 mirror://xorg/individual/driver/xf86-video-ast-0.98.0.tar.bz2 -mirror://xorg/individual/driver/xf86-video-ati-7.3.0.tar.bz2 +mirror://xorg/individual/driver/xf86-video-ati-7.4.0.tar.bz2 mirror://xorg/individual/driver/glamor-egl-0.6.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-nouveau-1.0.10.tar.bz2 mirror://xorg/individual/driver/xf86-video-cirrus-1.5.2.tar.bz2 @@ -137,7 +137,7 @@ mirror://xorg/individual/driver/xf86-video-i128-1.3.6.tar.bz2 mirror://xorg/individual/driver/xf86-video-intel-2.21.15.tar.bz2 mirror://xorg/individual/driver/xf86-video-mach64-6.9.4.tar.bz2 mirror://xorg/individual/driver/xf86-video-mga-1.6.3.tar.bz2 -mirror://xorg/individual/driver/xf86-video-modesetting-0.8.1.tar.bz2 +mirror://xorg/individual/driver/xf86-video-modesetting-0.9.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-neomagic-1.2.8.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86-video-newport-0.2.4.tar.bz2 mirror://xorg/individual/driver/xf86-video-nv-2.1.20.tar.bz2 @@ -170,7 +170,7 @@ mirror://xorg/X11R7.7/src/everything/xlsatoms-1.1.1.tar.bz2 mirror://xorg/individual/app/xlsclients-1.1.3.tar.bz2 mirror://xorg/individual/app/xmodmap-1.0.8.tar.bz2 mirror://xorg/X11R7.7/src/everything/xorg-docs-1.7.tar.bz2 -mirror://xorg/individual/xserver/xorg-server-1.14.6.tar.bz2 +mirror://xorg/individual/xserver/xorg-server-1.14.7.tar.bz2 mirror://xorg/X11R7.7/src/everything/xorg-sgml-doctools-1.11.tar.bz2 mirror://xorg/X11R7.7/src/everything/xpr-1.0.4.tar.bz2 mirror://xorg/individual/app/xprop-1.2.2.tar.bz2 diff --git a/pkgs/servers/x11/xorg/xf86-video-intel-testing.nix b/pkgs/servers/x11/xorg/xf86-video-intel-testing.nix index 5877643fb1b14a31069df41e8e7662c7d30e8acb..bee394e996381ad7f805690ff92b6344d7932f05 100644 --- a/pkgs/servers/x11/xorg/xf86-video-intel-testing.nix +++ b/pkgs/servers/x11/xorg/xf86-video-intel-testing.nix @@ -3,11 +3,11 @@ with xorg; (stdenv.mkDerivation ({ - name = "xf86-video-intel-2.99.911"; + name = "xf86-video-intel-2.99.912"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-intel-2.99.911.tar.bz2; - sha256 = "1mkhfa10304xvs763dz1kj93zkmdidlfxhsy5j8ljkfc3d4nhyjf"; + url = mirror://xorg/individual/driver/xf86-video-intel-2.99.912.tar.bz2; + sha256 = "00cmvs5jxaqnl1pwqvj1rwir4kbvf5qfng89cjn4rwsr5m4zr3vw"; }; buildInputs = [pkgconfig dri2proto fontsproto glamoregl libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXcursor libXdamage libXext xextproto xf86driproto libXfixes libXinerama xorgserver xproto libXrandr libXrender libXtst libXvMC ]; })) // {inherit dri2proto fontsproto glamoregl libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXcursor libXdamage libXext xextproto xf86driproto libXfixes libXinerama xorgserver xproto libXrandr libXrender libXtst libXvMC ;} diff --git a/pkgs/servers/xmpp/ejabberd/default.nix b/pkgs/servers/xmpp/ejabberd/default.nix index f15705d4a1131e892fc919046bc35814bf571bf0..5868125c97f1f87718f6a0c337d901e635195ba4 100644 --- a/pkgs/servers/xmpp/ejabberd/default.nix +++ b/pkgs/servers/xmpp/ejabberd/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "Open-source XMPP application server written in Erlang"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; homepage = http://www.ejabberd.im; maintainers = [ lib.maintainers.sander ]; }; diff --git a/pkgs/servers/xmpp/openfire/default.nix b/pkgs/servers/xmpp/openfire/default.nix index 736517b53f19fc56e223f8863c19ae8ba7da056a..3fb89d7a222b0a72e8cd0f7c0cc1367fdbe8b24e 100644 --- a/pkgs/servers/xmpp/openfire/default.nix +++ b/pkgs/servers/xmpp/openfire/default.nix @@ -1,34 +1,25 @@ -{ stdenv, fetchurl, builderDefs, jre }: +{ stdenv, fetchurl, jre }: -with builderDefs; - let - version="3_6_3"; - localDefs = builderDefs.passthru.function (rec { - src = /* put a fetchurl here */ - fetchurl { - url = "http://www.igniterealtime.org/downloadServlet?filename=openfire/openfire_${version}.tar.gz"; - sha256 = "0ibzhmh9qw4lmx45ir1i280p30npgwnj7vrkl432kj3zi7hp79q2"; - }; +stdenv.mkDerivation rec { + name = "openfire-${version}"; + version = "3_6_3"; - buildInputs = [jre]; - configureFlags = []; + src = fetchurl { + url = "http://www.igniterealtime.org/downloadServlet?filename=openfire/openfire_${version}.tar.gz"; + sha256 = "0ibzhmh9qw4lmx45ir1i280p30npgwnj7vrkl432kj3zi7hp79q2"; + }; + + buildInputs = [ jre ]; + + installPhase = '' + sed -e 's@\(common_jvm_locations\)=.*@\1${jre}@' -i bin/openfire + cp -r . $out + rm -r $out/logs + mv $out/conf $out/conf.inst + ln -s /var/log/openfire $out/logs + ln -s /etc/openfire $out/conf + ''; - installPhase = fullDepEntry ('' - sed -e 's@\(common_jvm_locations\)=.*@\1${jre}@' -i bin/openfire - cp -r . $out - rm -r $out/logs - mv $out/conf $out/conf.inst - ln -s /var/log/openfire $out/logs - ln -s /etc/openfire $out/conf - '') - ["minInit" "doUnpack" "addInputs"]; - }); - in with localDefs; -stdenv.mkDerivation rec { - name = "openfire-"+version; - builder = writeScript (name + "-builder") - (textClosure localDefs - [ installPhase doForceShare doPropagate]); meta = { description = "XMPP server in Java"; }; diff --git a/pkgs/shells/bash/bash-4.2-patches.nix b/pkgs/shells/bash/bash-4.2-patches.nix index ac6e9e97f180be23d9b1acc90313f46fe07dfc83..567ec3c551cf32f2b021a682cb62709d4d177eec 100644 --- a/pkgs/shells/bash/bash-4.2-patches.nix +++ b/pkgs/shells/bash/bash-4.2-patches.nix @@ -46,4 +46,6 @@ patch: [ (patch "043" "0mswgjk3z80qm1mb93jmbql27nbczxk86cw5byf0m29y1y2869nw") (patch "044" "1rk6jywzfvg1crvhib1zk37rsps73minhr7l4vcb3vfdkin2vlqh") (patch "045" "0vcqn9rb26bahhrarbwhpa0ny0nrf4vyrzh97d44lfcxypqfzdyx") +(patch "046" "0vc1ngkxkamwr022ww3vjp9ww9c647az4pjn175c1v60d0xk5hcm") +(patch "047" "0ymgimqz65sx2izg1dvm1h5cc01arl3j9j5137212l1ls00r55y1") ] diff --git a/pkgs/shells/bash/default.nix b/pkgs/shells/bash/default.nix index 61f6478629dd07c923c0cf27b14207daa97f4bbc..6a6b8563a55500eeea21936118d732f34243af79 100644 --- a/pkgs/shells/bash/default.nix +++ b/pkgs/shells/bash/default.nix @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { Bash without modification. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.simons ]; }; diff --git a/pkgs/shells/rush/default.nix b/pkgs/shells/rush/default.nix index 4354a3cd0b3a1efaff9049c97a83af43eb7a2973..e9d0c61ee0812adb78def0619ad2f43122dd3f58 100644 --- a/pkgs/shells/rush/default.nix +++ b/pkgs/shells/rush/default.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0fh0gbbp0iiq3wbkf503xb40r8ljk42vyj9bnlflbz82d6ipy1rm"; }; + patches = [ ./gets.patch ]; + doCheck = true; meta = { @@ -28,7 +30,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.gnu.org/software/rush/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.bjg ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/shells/rush/gets.patch b/pkgs/shells/rush/gets.patch new file mode 100644 index 0000000000000000000000000000000000000000..94b1f5dd2f51a08aa29418e3c57a35e93d587d94 --- /dev/null +++ b/pkgs/shells/rush/gets.patch @@ -0,0 +1,13 @@ +--- rush-1.7/gnu/stdio.in.h.org 2010-06-13 19:14:59.000000000 +0200 ++++ rush-1.7/gnu/stdio.in.h 2013-12-30 14:29:55.000000000 +0100 +@@ -138,8 +138,10 @@ _GL_WARN_ON_USE (fflush, "fflush is not + /* It is very rare that the developer ever has full control of stdin, + so any use of gets warrants an unconditional warning. Assume it is + always declared, since it is required by C89. */ ++#if defined gets + #undef gets + _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); ++#endif + + #if @GNULIB_FOPEN@ + # if @REPLACE_FOPEN@ diff --git a/pkgs/stdenv/default.nix b/pkgs/stdenv/default.nix index a2723f5575c0606c63f1487ba4909fa9cb85caee..47d1fb6d9f759381aed7aa1f12e56fc4f1ba7392 100644 --- a/pkgs/stdenv/default.nix +++ b/pkgs/stdenv/default.nix @@ -5,14 +5,7 @@ # Posix utilities, the GNU C compiler, and so on. On other systems, # we use the native C library. - -# stdenvType exists to support multiple kinds of stdenvs on the same -# system, e.g., cygwin and mingw builds on i686-cygwin. Most people -# can ignore it. - -{ system, stdenvType ? system, allPackages ? import ../.., platform, config }: - -assert system != "i686-cygwin" -> system == stdenvType; +{ system, allPackages ? import ../.., platform, config }: rec { @@ -45,23 +38,16 @@ rec { stdenvLinux = (import ./linux { inherit system allPackages platform config;}).stdenvLinux; - # MinGW/MSYS standard environment. - stdenvMinGW = import ./mingw { - inherit system; - }; - - # Select the appropriate stdenv for the platform `system'. stdenv = - if stdenvType == "i686-linux" then stdenvLinux else - if stdenvType == "x86_64-linux" then stdenvLinux else - if stdenvType == "armv5tel-linux" then stdenvLinux else - if stdenvType == "armv6l-linux" then stdenvLinux else - if stdenvType == "armv7l-linux" then stdenvLinux else - if stdenvType == "mips64el-linux" then stdenvLinux else - if stdenvType == "powerpc-linux" then /* stdenvLinux */ stdenvNative else - if stdenvType == "i686-mingw" then stdenvMinGW else - if stdenvType == "x86_64-darwin" then stdenvNix else - if stdenvType == "x86_64-solaris" then stdenvNix else + if system == "i686-linux" then stdenvLinux else + if system == "x86_64-linux" then stdenvLinux else + if system == "armv5tel-linux" then stdenvLinux else + if system == "armv6l-linux" then stdenvLinux else + if system == "armv7l-linux" then stdenvLinux else + if system == "mips64el-linux" then stdenvLinux else + if system == "powerpc-linux" then /* stdenvLinux */ stdenvNative else + if system == "x86_64-darwin" then stdenvNix else + if system == "x86_64-solaris" then stdenvNix else stdenvNative; } diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index 6047ecf853c5e5ba9decc79672fd65e70aea235c..11731c1c1c105f5a4a6b061a7c0a83ef00b8ea76 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -29,6 +29,16 @@ let allowBroken = config.allowBroken or false || builtins.getEnv "NIXPKGS_ALLOW_BROKEN" == "1"; + forceEvalHelp = unfreeOrBroken: + assert (unfreeOrBroken == "Unfree" || unfreeOrBroken == "Broken"); + '' + You can set + { nixpkgs.config.allow${unfreeOrBroken} = true; } + in configuration.nix to override this. If you use Nix standalone, you can add + { allow${unfreeOrBroken} = true; } + to ~/.nixpkgs/config.nix. + ''; + unsafeGetAttrPos = builtins.unsafeGetAttrPos or (n: as: null); # The stdenv that we are producing. @@ -55,8 +65,6 @@ let propagatedUserEnvPkgs = [gcc] ++ lib.filter lib.isDerivation initialPath; - - __ignoreNulls = true; } // rec { @@ -78,15 +86,16 @@ let in if !allowUnfree && (let l = lib.lists.toList attrs.meta.license or []; in lib.lists.elem "unfree" l || lib.lists.elem "unfree-redistributable" l) && !(allowUnfreePredicate attrs) then throw '' - Package ‘${attrs.name}’ in ${pos'} has an unfree license, refusing to evaluate. You can set - { nixpkgs.config.allowUnfree = true; } - in configuration.nix to override this. If you use Nix standalone, you can add - { allowUnfree = true; } - to ~/.nixpkgs/config.nix.'' + Package ‘${attrs.name}’ in ${pos'} has an unfree license, refusing to evaluate. + ${forceEvalHelp "Unfree"}'' else if !allowBroken && attrs.meta.broken or false then - throw "you can't use package ‘${attrs.name}’ in ${pos'} because it has been marked as broken" + throw '' + Package ‘${attrs.name}’ in ${pos'} is marked as broken, refusing to evaluate. + ${forceEvalHelp "Broken"}'' else if !allowBroken && attrs.meta.platforms or null != null && !lib.lists.elem result.system attrs.meta.platforms then - throw "the package ‘${attrs.name}’ in ${pos'} is not supported on ‘${result.system}’" + throw '' + Package ‘${attrs.name}’ in ${pos'} is not supported on ‘${result.system}’, refusing to evaluate. + ${forceEvalHelp "Broken"}'' else lib.addPassthru (derivation ( (removeAttrs attrs ["meta" "passthru" "crossAttrs"]) @@ -103,6 +112,7 @@ let stdenv = result; system = result.system; userHook = config.stdenv.userHook or null; + __ignoreNulls = true; # Inputs built by the cross compiler. buildInputs = lib.optionals (crossConfig != null) (buildInputs ++ extraBuildInputs); diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index ce83b1f69610986033d776b71ea462cacfc5b5a3..c3b9033b49a6adc83c58bb6fa51be9aa9fd6d4b2 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -103,6 +103,7 @@ fi # Execute the pre-hook. export SHELL=@shell@ +export CONFIG_SHELL="$SHELL" if [ -z "$shell" ]; then export shell=@shell@; fi runHook preHook @@ -120,6 +121,7 @@ fi # Ensure that the given directories exists. ensureDir() { + echo "warning: ‘ensureDir’ is deprecated; use ‘mkdir’ instead" >&2 local dir for dir in "$@"; do if ! [ -x "$dir" ]; then mkdir -p "$dir"; fi diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-crosspi.nix b/pkgs/stdenv/linux/make-bootstrap-tools-crosspi.nix index 9ea63a46be3e9c9f8f8fe26d9b25f08d8616ed6b..3abffc4692698e306d64e345fa3c92dc0dfe9a78 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools-crosspi.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools-crosspi.nix @@ -116,7 +116,7 @@ rec { buildCommand = '' set -x - ensureDir $out/bin $out/lib $out/libexec + mkdir -p $out/bin $out/lib $out/libexec # Copy what we need of Glibc. cp -d ${glibc}/lib/ld-*.so* $out/lib diff --git a/pkgs/stdenv/mingw/builder.sh b/pkgs/stdenv/mingw/builder.sh deleted file mode 100755 index 5a9f9749a4f8f4fe0acb5a1ecc640f4631a6af15..0000000000000000000000000000000000000000 --- a/pkgs/stdenv/mingw/builder.sh +++ /dev/null @@ -1,18 +0,0 @@ -# the other stdenv could change the SHELL variable, -# so we have to remember its value. -origShell=$SHELL -origGcc=$GCC - -source $STDENV/setup - -mkdir $OUT - -SHELL=$origShell -GCC=$origGcc - -export NIX_BUILD_TOP=$(pwd) - -substitute "$SETUP" "$OUT/setup" \ - --subst-var INITIALPATH \ - --subst-var GCC \ - --subst-var SHELL diff --git a/pkgs/stdenv/mingw/cygpath/builder.sh b/pkgs/stdenv/mingw/cygpath/builder.sh deleted file mode 100755 index 3061900ee0c92ff35c310812ac2dad871dd1bf4e..0000000000000000000000000000000000000000 --- a/pkgs/stdenv/mingw/cygpath/builder.sh +++ /dev/null @@ -1,5 +0,0 @@ -source $stdenv/setup - -mkdir $out -result="$(cygpath --mixed $path)" -echo "\"$result\"" > $out/default.nix diff --git a/pkgs/stdenv/mingw/cygpath/default.nix b/pkgs/stdenv/mingw/cygpath/default.nix deleted file mode 100644 index a0554c1d41dee8ad4b189de37d0610abc47b9bbe..0000000000000000000000000000000000000000 --- a/pkgs/stdenv/mingw/cygpath/default.nix +++ /dev/null @@ -1,9 +0,0 @@ -{stdenv}: path : - -import ( - stdenv.mkDerivation { - name = "cygpath"; - builder = ./builder.sh; - inherit path; - } -) diff --git a/pkgs/stdenv/mingw/default-builder.sh b/pkgs/stdenv/mingw/default-builder.sh deleted file mode 100755 index 422699971ed6e4963160b48c8d29b44f5e92a073..0000000000000000000000000000000000000000 --- a/pkgs/stdenv/mingw/default-builder.sh +++ /dev/null @@ -1,2 +0,0 @@ -source $STDENV/setup -genericBuild diff --git a/pkgs/stdenv/mingw/default.nix b/pkgs/stdenv/mingw/default.nix deleted file mode 100644 index 947db5f10a89500a417d2a5a44b6bf438cf37fce..0000000000000000000000000000000000000000 --- a/pkgs/stdenv/mingw/default.nix +++ /dev/null @@ -1,233 +0,0 @@ -{system} : - -let { - body = - stdenvFinal; - - /** - * Initial standard environment based on native Cygwin tools. - * GCC is not required. - * Required (approx): bash, mkdir, gnu tar, curl. - */ - stdenvInit1 = - import ./simple-stdenv { - inherit system; - name = "stdenv-init1-mingw"; - shell = "/bin/bash.exe"; - path = ["/usr/bin" "/bin" "/usr/local/bin"]; - }; - - /** - * Initial standard environment based on MSYS tools. - */ - stdenvInit2 = - import ./simple-stdenv { - inherit system; - name = "stdenv-init2-mingw"; - shell = msysShell; - path = [(msys + "/bin")]; - }; - - /** - * Initial standard environment with the most basic MinGW packages. - */ - stdenvInit3 = - (import ./simple-stdenv) { - inherit system; - name = "stdenv-init3-mingw"; - shell = msysShell; - path = [ - (make + "/bin") - (tar + "/bin") - (binutils + "/bin") - (gccFull + "/bin") - (mingwRuntimeBin + "/bin") - (w32apiBin + "/bin") - (msys + "/bin") - ]; - - extraEnv = { - C_INCLUDE_PATH = mingwRuntimeBin + "/include" + ":" + w32apiBin + "/include"; - LIBRARY_PATH = mingwRuntimeBin + "/lib" + ":" + w32apiBin + "/lib"; - }; - }; - - /** - * Final standard environment, based on generic stdenv. - * It would be better to make the generic stdenv usable on - * MINGW (i.e. make all environment variables CAPS). - */ - stdenvFinal = - let { - body = - stdenv // mkDerivationFun // { - inherit fetchurl; - overrides.pkgconfig = pkgconfigBin; - }; - - shell = - msys + "/bin/sh.exe"; - - stdenv = - stdenvInit2.mkDerivation { - name = "stdenv-mingw"; - builder = ./builder.sh; - setup = ./setup.sh; - - /** - * binutils is on the path because it contains dlltool, which - * is invoked on the PATH by some packages. - */ - initialPath = [make tar binutils gccFull mingwRuntimeSrc w32apiSrc msys]; - gcc = gccFull; - shell = msysShell; - inherit curl; - isDarwin = false; - isMinGW = true; - }; - - mkDerivationFun = { - mkDerivation = attrs: - (derivation ( - (removeAttrs attrs ["meta"]) - // - { - builder = - if attrs ? realBuilder then attrs.realBuilder else shell; - args = - if attrs ? args then - attrs.args - else - ["-e"] ++ ( - if attrs ? builder then - [./fix-builder.sh attrs.builder] - else - [./fix-builder.sh ./default-builder.sh] - ); - inherit stdenv system; - C_INCLUDE_PATH = mingwRuntimeSrc + "/include" + ":" + w32apiSrc + "/include"; - CPLUS_INCLUDE_PATH = mingwRuntimeSrc + "/include" + ":" + w32apiSrc + "/include"; - LIBRARY_PATH = mingwRuntimeSrc + "/lib" + ":" + w32apiSrc + "/lib"; - }) - ) - // { meta = if attrs ? meta then attrs.meta else {}; }; - }; - }; - - /** - * fetchurl - */ - fetchurlInit1 = - import ../../build-support/fetchurl { - stdenv = stdenvInit1; - curl = - (import ./pkgs).curl { - stdenv = stdenvInit1; - }; - }; - - cygpath = - import ./cygpath { - stdenv = stdenvInit1; - }; - - /** - * Hack: we need the cygpath of the Cygwin chmod. - */ - fetchurl = - import ./fetchurl { - stdenv = stdenvInit2; - curl = curl + "/bin/curl.exe"; - chmod = cygpath "/usr/bin/chmod"; - }; - - /** - * MSYS, installed using stdenvInit1 - * - * @todo Maybe remove the make of msys? - */ - msys = - stdenvInit1.mkDerivation { - name = "msys-1.0.11"; - builder = ./msys-builder.sh; - src = - fetchurlInit1 { - url = ftp://ftp.strategoxt.org/pub/mingw/msys-1.0.11.tar.gz; - sha256 = "08qp4jk279i66q6ngksg58fx3cfv1r6p5n394h2kfrs56qs9zvz4"; - }; - }; - - msysShell = - msys + "/bin/sh.exe"; - - /** - * Binary packages, based on stdenvInit2 - */ - curl = - (import ./pkgs).curl { - stdenv = stdenvInit2; - }; - - gccFull = - (import ./pkgs).gccFull { - stdenv = stdenvInit2; - inherit fetchurl; - }; - - make = - (import ./pkgs).make { - stdenv = stdenvInit2; - inherit fetchurl; - }; - - tar = - (import ./pkgs).tar { - stdenv = stdenvInit2; - inherit fetchurl; - }; - - binutils = - (import ./pkgs).binutils { - stdenv = stdenvInit2; - inherit fetchurl; - }; - - mingwRuntimeBin = - (import ./pkgs).mingwRuntimeBin { - stdenv = stdenvInit2; - inherit fetchurl; - }; - - w32apiBin = - (import ./pkgs).w32apiBin { - stdenv = stdenvInit2; - inherit fetchurl; - }; - - pkgconfigBin = - (import ./pkgs).pkgconfigBin { - stdenv = stdenvInit3; - inherit fetchurl; - }; - - /** - * Source packages, based on stdenvInit3 - */ - mingwRuntimeSrc = - (import ./pkgs).mingwRuntimeSrc { - stdenv = stdenvInit3; - inherit fetchurl; - }; - - w32apiSrc = - (import ./pkgs).w32apiSrc { - stdenv = stdenvInit3; - inherit fetchurl; - }; - - replace = - (import ./pkgs).replace { - stdenv = stdenvInit3; - inherit fetchurl; - }; -} diff --git a/pkgs/stdenv/mingw/fetchurl/builder.sh b/pkgs/stdenv/mingw/fetchurl/builder.sh deleted file mode 100755 index e9f2669a097f66bba36688872eebc13c81bb1b81..0000000000000000000000000000000000000000 --- a/pkgs/stdenv/mingw/fetchurl/builder.sh +++ /dev/null @@ -1,34 +0,0 @@ -if test -z "$out"; then - stdenv="$STDENV" - url="$URL" - id="$ID" - outputHashAlgo="$OUTPUTHASHALGO" - outputHash="$OUTPUTHASH" - chmod=$CHMOD - curl=$CURL -fi - -source $stdenv/setup - -if test -z "$out"; then - out="$OUT" -fi - -header "downloading $out from $url" -$curl --fail --location --max-redirs 20 "$url" > "$out" - -if test "$NIX_OUTPUT_CHECKED" != "1"; then - if test "$outputHashAlgo" != "md5"; then - echo "hashes other than md5 are unsupported in Nix <= 0.7, upgrade to Nix 0.8" - exit 1 - fi - actual=$(md5sum -b "$out" | cut -c1-32) - if test "$actual" != "$id"; then - echo "hash is $actual, expected $id" - exit 1 - fi -fi - -$chmod a-x $out - -stopNest diff --git a/pkgs/stdenv/mingw/fetchurl/default.nix b/pkgs/stdenv/mingw/fetchurl/default.nix deleted file mode 100644 index b4d278b2686fdbe40d73875eb981e5b2aa3fdc12..0000000000000000000000000000000000000000 --- a/pkgs/stdenv/mingw/fetchurl/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{stdenv, curl, chmod}: - -{url, outputHash ? "", outputHashAlgo ? "", md5 ? "", sha1 ? "", sha256 ? ""}: - -assert (outputHash != "" && outputHashAlgo != "") - || md5 != "" || sha1 != "" || sha256 != ""; - -stdenv.mkDerivation { - name = baseNameOf (toString url); - builder = ./builder.sh; - - # Compatibility with Nix <= 0.7. - id = md5; - - # New-style output content requirements. - outputHashAlgo = if outputHashAlgo != "" then outputHashAlgo else - if sha256 != "" then "sha256" else if sha1 != "" then "sha1" else "md5"; - outputHash = if outputHash != "" then outputHash else - if sha256 != "" then sha256 else if sha1 != "" then sha1 else md5; - - inherit url chmod curl; - - # We borrow these environment variables from the caller to allow - # easy proxy configuration. This is impure, but a fixed-output - # derivation like fetchurl is allowed to do so since its result is - # by definition pure. - impureEnvVars = ["http_proxy" "https_proxy" "ftp_proxy" "all_proxy" "no_proxy"]; -} diff --git a/pkgs/stdenv/mingw/fix-builder.sh b/pkgs/stdenv/mingw/fix-builder.sh deleted file mode 100755 index 09d933bd17b2ca5a00afd5b9c96c26f5ae73900e..0000000000000000000000000000000000000000 --- a/pkgs/stdenv/mingw/fix-builder.sh +++ /dev/null @@ -1,23 +0,0 @@ -# Workaround MSYS shell problem - -if test -z "$out"; then - buildInputs=$BUILDINPUTS - buildUtilities=$BUILDUTILITIES - configureFlags=$CONFIGUREFLAGS - doCheck=$DOCHECK - doCoverageAnalysis=$DOCOVERAGEANALYSIS - dontInstall=$DONTINSTALL - dontLogThroughTee=$DONTLOGTHROUGHTEE - lcov=$LCOV - logPhases=$LOGPHASES - out=$OUT - patches=$PATCHES - propagatedBuildInputs=$PROPAGATEDBUILDINPUTS - stdenv=$STDENV - src=$SRC - srcs=$SRCS - succeedOnFailure=$SUCCEEDONFAILURE - system=$SYSTEM -fi - -source $@ diff --git a/pkgs/stdenv/mingw/msys-builder.sh b/pkgs/stdenv/mingw/msys-builder.sh deleted file mode 100644 index a801e7fbcab1be3583776f44b2807d1e7f5a9a1b..0000000000000000000000000000000000000000 --- a/pkgs/stdenv/mingw/msys-builder.sh +++ /dev/null @@ -1,15 +0,0 @@ -source $stdenv/setup - -mkdir $out -cd $out -tar zxvf $src - -# Make the Nix store available to MSYS. -# Hack: we are assuming that the stdenv is based on Cygwin. - -nixdir="$(cygpath --windows /nix)" -mkdir $out/nix -cat > $out/etc/fstab < "$NIX_BUILD_TOP/.times" - local -a times=($(cat "$NIX_BUILD_TOP/.times")) - # Print the following statistics: - # - user time for the shell - # - system time for the shell - # - user time for all child processes - # - system time for all child processes - echo "build time elapsed: " ${times[*]} - fi - - if test $exitCode != 0; then - runHook failureHook - - # If the builder had a non-zero exit code and - # $succeedOnFailure is set, create the file - # `$out/nix-support/failed' to signal failure, and exit - # normally. Otherwise, return the original exit code. - if test -n "$succeedOnFailure"; then - echo "build failed with exit code $exitCode (ignored)" - mkdir -p "$out/nix-support" - echo -n $exitCode > "$out/nix-support/failed" - exit 0 - fi - - else - runHook exitHook - fi - - exit $exitCode -} - -trap "exitHandler" EXIT - - -###################################################################### -# Helper functions that might be useful in setup hooks. - - -addToSearchPathWithCustomDelimiter() { - local delimiter=$1 - local varName=$2 - local dir=$3 - if [ -d "$dir" ]; then - eval export ${varName}=${!varName}${!varName:+$delimiter}${dir} - fi -} - -PATH_DELIMITER=':' - -addToSearchPath() { - addToSearchPathWithCustomDelimiter "${PATH_DELIMITER}" "$@" -} - - -###################################################################### -# Initialisation. - -set -e - -test -z $NIX_GCC && NIX_GCC=@GCC@ - - -# Wildcard expansions that don't match should expand to an empty list. -# This ensures that, for instance, "for i in *; do ...; done" does the -# right thing. -shopt -s nullglob - - -# Set up the initial path. -PATH= -for i in $NIX_GCC @INITIALPATH@; do - if test "$i" = /; then i=; fi - addToSearchPath PATH $i/bin -done - -# Hack: the /tmp of Cygwin is different from the /tmp in MSYS -if test -d $NIX_BUILD_TOP; then - echo "Nix build top already exists. Strange." -else - mkdir $NIX_BUILD_TOP - cd $NIX_BUILD_TOP -fi - -if test "$NIX_DEBUG" = "1"; then - echo "initial path: $PATH" -fi - - -# Execute the pre-hook. -export SHELL=@SHELL@ -if test -z "$shell"; then - export shell=@SHELL@ -fi - -# Check that the pre-hook initialised SHELL. -if test -z "$SHELL"; then echo "SHELL not set"; exit 1; fi - - -# Hack: run gcc's setup hook. -envHooks=() -if test -f $NIX_GCC/nix-support/setup-hook; then - source $NIX_GCC/nix-support/setup-hook -fi - - -# Ensure that the given directories exists. -ensureDir() { - local dir - for dir in "$@"; do - if ! test -x "$dir"; then mkdir -p "$dir"; fi - done -} - -installBin() { - mkdir -p $out/bin - cp "$@" $out/bin -} - - -# Allow the caller to augment buildInputs (it's not always possible to -# do this before the call to setup.sh, since the PATH is empty at that -# point; here we have a basic Unix environment). -runHook addInputsHook - - -# Recursively find all build inputs. -findInputs() { - local pkg=$1 - - case $pkgs in - *\ $pkg\ *) - return 0 - ;; - esac - - pkgs="$pkgs $pkg " - - if test -f $pkg/nix-support/setup-hook; then - source $pkg/nix-support/setup-hook - fi - - if test -f $pkg/nix-support/propagated-build-inputs; then - for i in $(cat $pkg/nix-support/propagated-build-inputs); do - findInputs $i - done - fi -} - -pkgs="" -for i in $buildInputs $propagatedBuildInputs; do - findInputs $i -done - - -# Set the relevant environment variables to point to the build inputs -# found above. -addToEnv() { - local pkg=$1 - - if test -d $1/bin; then - addToSearchPath _PATH $1/bin - fi - - # Run the package-specific hooks set by the setup-hook scripts. - for i in "${envHooks[@]}"; do - $i $pkg - done -} - -for i in $pkgs; do - addToEnv $i -done - - -# Add the output as an rpath. -if test "$NIX_NO_SELF_RPATH" != "1"; then - export NIX_LDFLAGS="-rpath $out/lib $NIX_LDFLAGS" - if test -n "$NIX_LIB64_IN_SELF_RPATH"; then - export NIX_LDFLAGS="-rpath $out/lib64 $NIX_LDFLAGS" - fi -fi - - -# Set the TZ (timezone) environment variable, otherwise commands like -# `date' will complain (e.g., `Tue Mar 9 10:01:47 Local time zone must -# be set--see zic manual page 2004'). -export TZ=UTC - - -# Set the prefix. This is generally $out, but it can be overriden, -# for instance if we just want to perform a test build/install to a -# temporary location and write a build report to $out. -if test -z "$prefix"; then - prefix="$out"; -fi - -if test "$useTempPrefix" = "1"; then - prefix="$NIX_BUILD_TOP/tmp_prefix"; -fi - - -PATH=$_PATH${_PATH:+:}$PATH -if test "$NIX_DEBUG" = "1"; then - echo "final path: $PATH" -fi - - -# Make GNU Make produce nested output. -export NIX_INDENT_MAKE=1 - - -###################################################################### -# Misc. helper functions. - - -stripDirs() { - local dirs="$1" - local stripFlags="$2" - local dirsNew= - - for d in ${dirs}; do - if test -d "$prefix/$d"; then - dirsNew="${dirsNew} $prefix/$d " - fi - done - dirs=${dirsNew} - - if test -n "${dirs}"; then - header "stripping (with flags $stripFlags) in $dirs" - find $dirs -type f -print0 | xargs -0 ${xargsFlags:--r} strip $stripFlags || true - stopNest - fi -} - - -###################################################################### -# Textual substitution functions. - - -substitute() { - local input="$1" - local output="$2" - - local -a params=("$@") - local -a args=() - - local n p pattern replacement varName - - for ((n = 2; n < ${#params[*]}; n += 1)); do - p=${params[$n]} - - if test "$p" = "--replace"; then - pattern="${params[$((n + 1))]}" - replacement="${params[$((n + 2))]}" - n=$((n + 2)) - fi - - if test "$p" = "--subst-var"; then - varName="${params[$((n + 1))]}" - pattern="@$varName@" - replacement="${!varName}" - n=$((n + 1)) - fi - - if test "$p" = "--subst-var-by"; then - pattern="@${params[$((n + 1))]}@" - replacement="${params[$((n + 2))]}" - n=$((n + 2)) - fi - - if test ${#args[@]} != 0; then - args[${#args[@]}]="-a" - fi - args[${#args[@]}]="$pattern" - args[${#args[@]}]="$replacement" - done - - replace-literal -e -s -- "${args[@]}" < "$input" > "$output".tmp - if test -x "$output"; then - chmod +x "$output".tmp - fi - mv -f "$output".tmp "$output" -} - - -substituteInPlace() { - local fileName="$1" - shift - substitute "$fileName" "$fileName" "$@" -} - - -substituteAll() { - local input="$1" - local output="$2" - - # Select all environment variables that start with a lowercase character. - for envVar in $(env | sed "s/^[^a-z].*//" | sed "s/^\([^=]*\)=.*/\1/"); do - if test "$NIX_DEBUG" = "1"; then - echo "$envVar -> ${!envVar}" - fi - args="$args --subst-var $envVar" - done - - substitute "$input" "$output" $args -} - - -###################################################################### -# What follows is the generic builder. - - -nestingLevel=0 - -startNest() { - nestingLevel=$(($nestingLevel + 1)) - echo -en "\e[$1p" -} - -stopNest() { - nestingLevel=$(($nestingLevel - 1)) - echo -en "\e[q" -} - -header() { - startNest "$2" - echo "$1" -} - -# Make sure that even when we exit abnormally, the original nesting -# level is properly restored. -closeNest() { - while test $nestingLevel -gt 0; do - stopNest - done -} - - -# This function is useful for debugging broken Nix builds. It dumps -# all environment variables to a file `env-vars' in the build -# directory. If the build fails and the `-K' option is used, you can -# then go to the build directory and source in `env-vars' to reproduce -# the environment used for building. -dumpVars() { - echo "Dumping env-vars to $NIX_BUILD_TOP/env-vars" - if test "$noDumpEnvVars" != "1"; then - export > "$NIX_BUILD_TOP/env-vars" - fi -} - - -# Utility function: return the base name of the given path, with the -# prefix `HASH-' removed, if present. -stripHash() { - strippedName=$(basename $1); - if echo "$strippedName" | grep -q '^[a-z0-9]\{32\}-'; then - strippedName=$(echo "$strippedName" | cut -c34-) - fi -} - - -unpackFile() { - curSrc="$1" - local cmd - - header "unpacking source archive $curSrc" 3 - - case "$curSrc" in - *.tar) - tar xvf $curSrc - ;; - *.tar.gz | *.tgz | *.tar.Z) - gzip -d < $curSrc | tar xvf - - ;; - *.tar.bz2 | *.tbz2) - bzip2 -d < $curSrc | tar xvf - - ;; - *.zip) - unzip $curSrc - ;; - *) - if test -d "$curSrc"; then - stripHash $curSrc - cp -prvd $curSrc $strippedName - else - if test -z "$unpackCmd"; then - echo "source archive $curSrc has unknown type" - exit 1 - fi - runHook unpackCmd - fi - ;; - esac - - stopNest -} - - -unpackPhase() { - runHook preUnpack - - if test -z "$srcs"; then - if test -z "$src"; then - echo 'variable $src or $srcs should point to the source' - exit 1 - fi - srcs="$src" - fi - - # To determine the source directory created by unpacking the - # source archives, we record the contents of the current - # directory, then look below which directory got added. Yeah, - # it's rather hacky. - local dirsBefore="" - for i in *; do - if test -d "$i"; then - dirsBefore="$dirsBefore $i " - fi - done - - # Unpack all source archives. - for i in $srcs; do - unpackFile $i - done - - # Find the source directory. - if test -n "$setSourceRoot"; then - runHook setSourceRoot - elif test -z "$sourceRoot"; then - sourceRoot= - for i in *; do - if test -d "$i"; then - case $dirsBefore in - *\ $i\ *) - ;; - *) - if test -n "$sourceRoot"; then - echo "unpacker produced multiple directories" - exit 1 - fi - sourceRoot="$i" - ;; - esac - fi - done - fi - - if test -z "$sourceRoot"; then - echo "unpacker appears to have produced no directories" - exit 1 - fi - - echo "source root is $sourceRoot" - - # By default, add write permission to the sources. This is often - # necessary when sources have been copied from other store - # locations. - if test "$dontMakeSourcesWritable" != 1; then - chmod -R u+w "$sourceRoot" - fi - - runHook postUnpack -} - - -patchPhase() { - runHook prePatch - - for i in $patches; do - header "applying patch $i" 3 - local uncompress=cat - case $i in - *.gz) - uncompress="gzip -d" - ;; - *.bz2) - uncompress="bzip2 -d" - ;; - esac - $uncompress < $i | patch ${patchFlags:--p1} - stopNest - done - - runHook postPatch -} - - -configurePhase() { - runHook preConfigure - - if test -z "$configureScript"; then - configureScript=./configure - if ! test -x $configureScript; then - echo "no configure script, doing nothing" - return - fi - fi - - if test -z "$dontAddPrefix"; then - configureFlags="${prefixKey:---prefix=}$prefix $configureFlags" - fi - - # Add --disable-dependency-tracking to speed up some builds. - if test -z "$dontAddDisableDepTrack"; then - if grep -q dependency-tracking $configureScript; then - configureFlags="--disable-dependency-tracking $configureFlags" - fi - fi - - # By default, disable static builds. - if test -z "$dontDisableStatic"; then - if grep -q enable-static $configureScript; then - configureFlags="--disable-static $configureFlags" - fi - fi - - echo "configure flags: $configureFlags ${configureFlagsArray[@]}" - $configureScript $configureFlags "${configureFlagsArray[@]}" - - runHook postConfigure -} - - -buildPhase() { - runHook preBuild - - if test -z "$makeFlags" && ! test -n "$makefile" -o -e "Makefile" -o -e "makefile" -o -e "GNUmakefile"; then - echo "no Makefile, doing nothing" - return - fi - - echo "make flags: $makeFlags ${makeFlagsArray[@]} $buildFlags ${buildFlagsArray[@]}" - make ${makefile:+-f $makefile} \ - $makeFlags "${makeFlagsArray[@]}" \ - $buildFlags "${buildFlagsArray[@]}" - - runHook postBuild -} - - -checkPhase() { - runHook preCheck - - echo "check flags: $makeFlags ${makeFlagsArray[@]} $checkFlags ${checkFlagsArray[@]}" - make ${makefile:+-f $makefile} \ - $makeFlags "${makeFlagsArray[@]}" \ - $checkFlags "${checkFlagsArray[@]}" ${checkTarget:-check} - - runHook postCheck -} - - -patchELF() { - # Patch all ELF executables and shared libraries. - header "patching ELF executables and libraries" - if test -e "$prefix"; then - find "$prefix" \( \ - \( -type f -a -name "*.so*" \) -o \ - \( -type f -a -perm +0100 \) \ - \) -print -exec patchelf --shrink-rpath {} \; - fi - stopNest -} - - -patchShebangs() { - # Rewrite all script interpreter file names (`#! /path') under the - # specified directory tree to paths found in $PATH. E.g., - # /bin/sh will be rewritten to /nix/store/-some-bash/bin/sh. - # Interpreters that are already in the store are left untouched. - header "patching script interpreter paths" - local dir="$1" - local f - for f in $(find "$dir" -type f -perm +0100); do - local oldPath=$(sed -ne '1 s,^#![ ]*\([^ ]*\).*$,\1,p' "$f") - if test -n "$oldPath" -a "${oldPath:0:${#NIX_STORE}}" != "$NIX_STORE"; then - local newPath=$(type -P $(basename $oldPath) || true) - if test -n "$newPath" -a "$newPath" != "$oldPath"; then - echo "$f: interpreter changed from $oldPath to $newPath" - sed -i -e "1 s,$oldPath,$newPath," "$f" - fi - fi - done - stopNest -} - - -installPhase() { - runHook preInstall - - mkdir -p "$prefix" - - installTargets=${installTargets:-install} - echo "install flags: $installTargets $makeFlags ${makeFlagsArray[@]} $installFlags ${installFlagsArray[@]}" - make ${makefile:+-f $makefile} $installTargets \ - $makeFlags "${makeFlagsArray[@]}" \ - $installFlags "${installFlagsArray[@]}" - - runHook postInstall -} - - -# The fixup phase performs generic, package-independent, Nix-related -# stuff, like running patchelf and setting the -# propagated-build-inputs. It should rarely be overriden. -fixupPhase() { - runHook preFixup - - # Put man/doc/info under $out/share. - forceShare=${forceShare:=man doc info} - if test -n "$forceShare"; then - for d in $forceShare; do - if test -d "$prefix/$d"; then - if test -d "$prefix/share/$d"; then - echo "both $d/ and share/$d/ exists!" - else - echo "fixing location of $d/ subdirectory" - mkdir -p $prefix/share - if test -w $prefix/share; then - mv -v $prefix/$d $prefix/share - ln -sv $prefix/share/$d $prefix/$d - fi - fi - fi - done; - fi - - # TODO: strip _only_ ELF executables, and return || fail here... - if test -z "$dontStrip"; then - stripDebugList=${stripDebugList:-lib lib64 libexec bin sbin} - if test -n "$stripDebugList"; then - stripDirs "$stripDebugList" "${stripDebugFlags:--S}" - fi - - stripAllList=${stripAllList:-} - if test -n "$stripAllList"; then - stripDirs "$stripAllList" "${stripAllFlags:--s}" - fi - fi - - if test "$havePatchELF" = 1 -a -z "$dontPatchELF"; then - patchELF "$prefix" - fi - - if test -z "$dontPatchShebangs"; then - patchShebangs "$prefix" - fi - - if test -n "$propagatedBuildInputs"; then - mkdir -p "$out/nix-support" - echo "$propagatedBuildInputs" > "$out/nix-support/propagated-build-inputs" - fi - - if test -n "$setupHook"; then - mkdir -p "$out/nix-support" - substituteAll "$setupHook" "$out/nix-support/setup-hook" - fi - - runHook postFixup -} - - -distPhase() { - runHook preDist - - echo "dist flags: $distFlags ${distFlagsArray[@]}" - make ${makefile:+-f $makefile} $distFlags "${distFlagsArray[@]}" ${distTarget:-dist} - - if test "$dontCopyDist" != 1; then - mkdir -p "$out/tarballs" - - # Note: don't quote $tarballs, since we explicitly permit - # wildcards in there. - cp -pvd ${tarballs:-*.tar.gz} $out/tarballs - fi - - runHook postDist -} - - -showPhaseHeader() { - local phase="$1" - case $phase in - unpackPhase) header "unpacking sources";; - patchPhase) header "patching sources";; - configurePhase) header "configuring";; - buildPhase) header "building";; - checkPhase) header "running tests";; - installPhase) header "installing";; - fixupPhase) header "post-installation fixup";; - *) header "$phase";; - esac -} - - -genericBuild() { - header "building $out" - - if test -n "$buildCommand"; then - eval "$buildCommand" - return - fi - - if test -z "$phases"; then - phases="$prePhases unpackPhase patchPhase $preConfigurePhases \ - configurePhase $preBuildPhases buildPhase checkPhase \ - $preInstallPhases installPhase $preFixupPhases fixupPhase \ - $preDistPhases distPhase $postPhases"; - fi - - for curPhase in $phases; do - if test "$curPhase" = buildPhase -a -n "$dontBuild"; then continue; fi - if test "$curPhase" = checkPhase -a -z "$doCheck"; then continue; fi - if test "$curPhase" = installPhase -a -n "$dontInstall"; then continue; fi - if test "$curPhase" = fixupPhase -a -n "$dontFixup"; then continue; fi - if test "$curPhase" = distPhase -a -z "$doDist"; then continue; fi - - showPhaseHeader "$curPhase" - dumpVars - - # Evaluate the variable named $curPhase if it exists, otherwise the - # function named $curPhase. - eval "${!curPhase:-$curPhase}" - - if test "$curPhase" = unpackPhase; then - cd "${sourceRoot:-.}" - fi - - stopNest - done - - stopNest -} - - - - -dumpVars diff --git a/pkgs/stdenv/mingw/simple-stdenv/builder.sh b/pkgs/stdenv/mingw/simple-stdenv/builder.sh deleted file mode 100644 index 0cbc13e4fab33222577213f10f002199534cf24c..0000000000000000000000000000000000000000 --- a/pkgs/stdenv/mingw/simple-stdenv/builder.sh +++ /dev/null @@ -1,80 +0,0 @@ -if test -z "$out"; then - out="$OUT" - initialPath="$INITIALPATH" - shell="$SHELL" -fi - -setupPath= -for i in $initialPath; do - setupPath=$setupPath${setupPath:+:}$i -done - -PATH=$setupPath -export PATH - -mkdir $out - -cat > $out/setup <> \$sedScript - sedArgs=("\${sedArgs[@]}" "-e" ) - fi - - if test "\$p" = "--subst-var"; then - varName=\${params[\$((n + 1))]} - n=\$((n + 1)) - echo "s^@\${varName}@^\${!varName}^g" >> \$sedScript - fi - - if test "\$p" = "--subst-var-by"; then - varName=\${params[\$((n + 1))]} - replacement=\${params[\$((n + 2))]} - n=\$((n + 2)) - echo "s^@\${varName}@^\$replacement^g" >> \$sedScript - fi - - done - - sed -f \$sedScript < "\$input" > "\$output".tmp - if test -x "\$output"; then - chmod +x "\$output".tmp - fi - mv -f "\$output".tmp "\$output" -} -EOF - -chmod +x $out/setup diff --git a/pkgs/stdenv/mingw/simple-stdenv/default.nix b/pkgs/stdenv/mingw/simple-stdenv/default.nix deleted file mode 100644 index 379cda0a598b7c000416acc42db41babff082d8e..0000000000000000000000000000000000000000 --- a/pkgs/stdenv/mingw/simple-stdenv/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ system -, name -, shell -, path -, extraEnv ? {} -, extraShellOptions ? [] -}: - -let { - body = - derivation ({ - inherit system name; - initialPath = path; - builder = shell; - args = extraShellOptions ++ ["-e" ./builder.sh]; - } // extraEnv) - - // { - mkDerivation = attrs: - derivation ((removeAttrs attrs ["meta"]) // { - builder = shell; - args = extraShellOptions ++ ["-e" ] ++ [attrs.builder]; # (if attrs ? builder then [attrs.builder] else [ ../fix-builder.sh ../default-builder.sh] ) ; - stdenv = body; - system = body.system; - } - - // extraEnv); - - inherit shell; - }; -} diff --git a/pkgs/stdenv/nix/default.nix b/pkgs/stdenv/nix/default.nix index 78e5b84a841e5cae3af65093d0d4d4771396500a..a496a819a6df0cf2fbca812db629fa31b78bc57a 100644 --- a/pkgs/stdenv/nix/default.nix +++ b/pkgs/stdenv/nix/default.nix @@ -7,16 +7,18 @@ import ../generic rec { '' export NIX_ENFORCE_PURITY=1 export NIX_IGNORE_LD_THROUGH_GCC=1 - - if [ "$system" = "i686-darwin" -o "$system" = "powerpc-darwin" -o "$system" = "x86_64-darwin" ]; then - export NIX_ENFORCE_PURITY= - export NIX_DONT_SET_RPATH=1 - export NIX_NO_SELF_RPATH=1 - dontFixLibtool=1 - stripAllFlags=" " # the Darwin "strip" command doesn't know "-s" - xargsFlags=" " - fi - ''; + '' + (if stdenv.isDarwin then '' + export NIX_ENFORCE_PURITY= + export NIX_DONT_SET_RPATH=1 + export NIX_NO_SELF_RPATH=1 + dontFixLibtool=1 + stripAllFlags=" " # the Darwin "strip" command doesn't know "-s" + xargsFlags=" " + export MACOSX_DEPLOYMENT_TARGET=10.6 + export SDKROOT=$(/usr/bin/xcrun --show-sdk-path 2> /dev/null || true) + export NIX_CFLAGS_COMPILE+=" --sysroot=/var/empty -idirafter $SDKROOT/usr/include -F$SDKROOT/System/Library/Frameworks -Wno-multichar -Wno-deprecated-declarations" + export NIX_LDFLAGS_AFTER+=" -L$SDKROOT/usr/lib" + '' else ""); initialPath = (import ../common-path.nix) {pkgs = pkgs;}; diff --git a/pkgs/tools/X11/autocutsel/default.nix b/pkgs/tools/X11/autocutsel/default.nix index 1fe3cb646ff44d55cf9c985caf1f61f6c9a90b2f..8506c9f38f3d98f3f2aaa3121b83bd517d4e0ba4 100644 --- a/pkgs/tools/X11/autocutsel/default.nix +++ b/pkgs/tools/X11/autocutsel/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { inherit version; homepage = "http://www.nongnu.org/autocutsel/"; description = "Tracks changes in the server's cutbuffer and CLIPBOARD selection"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = with stdenv.lib.platforms; all; updateWalker = true; }; diff --git a/pkgs/tools/X11/bgs/default.nix b/pkgs/tools/X11/bgs/default.nix index b2bdbe8aaeaf80a50a75f3f90f883a341c0ce289..00cf9a54fb7e297d0286ea4c9ad241612754d3b9 100644 --- a/pkgs/tools/X11/bgs/default.nix +++ b/pkgs/tools/X11/bgs/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "Extremely fast and small background setter for X"; - license = "MIT"; + license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [pSub]; }; diff --git a/pkgs/tools/X11/hsetroot/default.nix b/pkgs/tools/X11/hsetroot/default.nix index 96241bd02cdfe02d551505ad7e2bfa28b38357e2..d91f4bfdf652e5decdbcb33655e18595b4f392ce 100644 --- a/pkgs/tools/X11/hsetroot/default.nix +++ b/pkgs/tools/X11/hsetroot/default.nix @@ -14,6 +14,6 @@ stdenv.mkDerivation { meta = { description = "hsetroot allows you to compose wallpapers ('root pixmaps') for X"; homepage = http://thegraveyard.org/hsetroot.html; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/tools/X11/nitrogen/default.nix b/pkgs/tools/X11/nitrogen/default.nix index 182c058e1c12b949bbf2ba8a94312ab324b54ef7..dd8b496fe66e4b3449e387fe3287da560b78b15f 100644 --- a/pkgs/tools/X11/nitrogen/default.nix +++ b/pkgs/tools/X11/nitrogen/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { homepage = http://projects.l3ib.org/nitrogen/; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; - maintainer = [ stdenv.lib.maintainers.auntie ]; + maintainers = [ stdenv.lib.maintainers.auntie ]; }; } diff --git a/pkgs/tools/X11/winswitch/default.nix b/pkgs/tools/X11/winswitch/default.nix index 2db0d17217358a50a47fd2ebba3e6fada66b3d43..ad7ac7c64c827beef38c1619756a2fc3f613dcff 100644 --- a/pkgs/tools/X11/winswitch/default.nix +++ b/pkgs/tools/X11/winswitch/default.nix @@ -37,7 +37,7 @@ let doCheck = false; - meta.platforms = stdenv.lib.platforms.mesaPlatforms; + meta.platforms = stdenv.lib.platforms.linux; }; in stdenv.lib.overrideDerivation base (b: { postFixup = b.postFixup + '' diff --git a/pkgs/tools/X11/xbindkeys/default.nix b/pkgs/tools/X11/xbindkeys/default.nix index 57417fa772112aa1473854f438847740ac742aa6..0d63c190b054fa843b27238594a89e03b9825393 100644 --- a/pkgs/tools/X11/xbindkeys/default.nix +++ b/pkgs/tools/X11/xbindkeys/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = { homepage = http://www.nongnu.org/xbindkeys/xbindkeys.html; description = "Launch shell commands with your keyboard or your mouse under X Window"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/X11/xchainkeys/default.nix b/pkgs/tools/X11/xchainkeys/default.nix index 42e26825e330923d3ed9743929c5832bc2d1d2a4..eab21f2d2211d30081d3a506c4dd592ac1980dea 100644 --- a/pkgs/tools/X11/xchainkeys/default.nix +++ b/pkgs/tools/X11/xchainkeys/default.nix @@ -13,6 +13,6 @@ stdenv.mkDerivation rec { meta = { homepage = "https://code.google.com/p/xchainkeys/"; description = "A standalone X11 program to create chained key bindings"; - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3; }; } diff --git a/pkgs/tools/X11/xnee/default.nix b/pkgs/tools/X11/xnee/default.nix index ce439d22c21c55e7755de693edcf7c5b01291c2f..0e92021b62c91d102cdea69274257a694fd2d10a 100644 --- a/pkgs/tools/X11/xnee/default.nix +++ b/pkgs/tools/X11/xnee/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { "macros", retype a file. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; homepage = http://www.gnu.org/software/xnee/; diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index e6b2f78332d7479bfe70f3c162521ebbe6689689..688c0e12d9383dd4049c157aceaba2e2a463b67b 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -47,6 +47,6 @@ buildPythonPackage rec { meta = { homepage = http://xpra.org/; description = "Persistent remote applications for X"; - platforms = stdenv.lib.platforms.mesaPlatforms; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/X11/xtrace/default.nix b/pkgs/tools/X11/xtrace/default.nix index c9f41b68446a2efe2eda5c9741a5c694c3d14663..efc0647f5dbd3dda4d9623b702de4f8f2a0937d0 100644 --- a/pkgs/tools/X11/xtrace/default.nix +++ b/pkgs/tools/X11/xtrace/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = { homepage = http://xtrace.alioth.debian.org/; description = "xtrace, a tool to trace X11 protocol connections"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/admin/analog/default.nix b/pkgs/tools/admin/analog/default.nix index ec139e7240d3afaed5b81ae2812b9ade6dc26278..54dac32141fe2efe7dc3acd7891084e55965b61d 100644 --- a/pkgs/tools/admin/analog/default.nix +++ b/pkgs/tools/admin/analog/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { meta = { homepage = "http://www.analog.cx/"; - license = "GPL"; + license = stdenv.lib.licenses.gpl2; description = "Powerful tool to generate web server statistics"; maintainers = [ stdenv.lib.maintainers.simons ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/admin/gtk-vnc/default.nix b/pkgs/tools/admin/gtk-vnc/default.nix index 14822d8b6e9675d31976b66a88baea9d5937016f..c502cee5415a997a7bac54a824cdd5c2bd5021bd 100644 --- a/pkgs/tools/admin/gtk-vnc/default.nix +++ b/pkgs/tools/admin/gtk-vnc/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, gobjectIntrospection , python, gtk, pygtk, gnutls, cairo, libtool, glib, pkgconfig, libtasn1 -, libffi, cyrus_sasl, intltool, perl, perlPackages, firefoxPkgs, pulseaudio +, libffi, cyrus_sasl, intltool, perl, perlPackages, pulseaudio , kbproto, libX11, libXext, xextproto, pygobject, libgcrypt, gtk3, vala , pygobject3, libogg, enableGTK3 ? false }: diff --git a/pkgs/tools/admin/sec/default.nix b/pkgs/tools/admin/sec/default.nix index af634e3fd56cb260ea927cf412f4289bbb5ffb2f..d8c60c0ec3c8c9d73fc8d670d55e819a543d0537 100644 --- a/pkgs/tools/admin/sec/default.nix +++ b/pkgs/tools/admin/sec/default.nix @@ -1,11 +1,11 @@ { fetchurl, perl, stdenv }: stdenv.mkDerivation rec { - name = "sec-2.7.5"; + name = "sec-2.7.6"; src = fetchurl { url = "mirror://sourceforge/simple-evcorr/${name}.tar.gz"; - sha256 = "a21dcbb61aa99930f911b79e9412b875af12b08722a78295d210b896f23a0301"; + sha256 = "1lrssln55p3bmn3d2hl8c5l5ix32bn8065w1cgycwsf7r6fww51p"; }; buildInputs = [ perl ]; diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix index b2dedf4688d3ae45d63a202ab382d26b9db9d22c..3d5abd074d96b402ce88ddebdd2fb1a51be1f958 100644 --- a/pkgs/tools/admin/tigervnc/default.nix +++ b/pkgs/tools/admin/tigervnc/default.nix @@ -91,7 +91,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.tigervnc.org/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; description = "Fork of tightVNC, made in cooperation with VirtualGL"; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/tools/admin/tightvnc/default.nix b/pkgs/tools/admin/tightvnc/default.nix index 187d3345e6b3b05a8c6703287f02e1c17e21835d..acb8708ec14fdf591b349d85995770db326f1a72 100644 --- a/pkgs/tools/admin/tightvnc/default.nix +++ b/pkgs/tools/admin/tightvnc/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { builder = ./builder.sh; meta = { - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = "http://vnc-tight.sourceforge.net/"; description = "TightVNC is an improved version of VNC"; diff --git a/pkgs/tools/archivers/gnutar/default.nix b/pkgs/tools/archivers/gnutar/default.nix index 6428fbaa9dc49aeb3b49a70384a61dfc7102edf3..87324ac80a2462ebe924ae83935e47fac691471c 100644 --- a/pkgs/tools/archivers/gnutar/default.nix +++ b/pkgs/tools/archivers/gnutar/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { archives). ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/tools/archivers/p7zip/default.nix b/pkgs/tools/archivers/p7zip/default.nix index ff51b28f34bbbe7ebc6f89ca0445227df76a1c05..cd0cea13a14d7b9c013e1df7afab2a59c037d535 100644 --- a/pkgs/tools/archivers/p7zip/default.nix +++ b/pkgs/tools/archivers/p7zip/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://p7zip.sourceforge.net/; description = "A port of the 7-zip archiver"; - # license = "LGPLv2.1+"; + "unRAR restriction" + # license = stdenv.lib.licenses.lgpl21Plus; + "unRAR restriction" platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/archivers/sharutils/default.nix b/pkgs/tools/archivers/sharutils/default.nix index 273b394881b6d6e68377f823d7313416ce4e3d7c..afd734fbae04c4b4c246c13087cd9bde3e6547c3 100644 --- a/pkgs/tools/archivers/sharutils/default.nix +++ b/pkgs/tools/archivers/sharutils/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/sharutils/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/tools/archivers/zpaq/default.nix b/pkgs/tools/archivers/zpaq/default.nix index 718a80e1406af07395d320a2809a9f61ab76db06..1ed5866a692032e678e21bd48682347930212560 100644 --- a/pkgs/tools/archivers/zpaq/default.nix +++ b/pkgs/tools/archivers/zpaq/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="zpaq"; - version="652"; + version="655"; name="${baseName}-${version}"; - hash="16qdf0y8jwjp8ymbikz7jm2ldjmbcixvkyrvsx0zy3y7nyylcgky"; - url="http://mattmahoney.net/dc/zpaq652.zip"; - sha256="16qdf0y8jwjp8ymbikz7jm2ldjmbcixvkyrvsx0zy3y7nyylcgky"; + hash="09wjss6vbziwvfmcngb64xd2yih79z1ypgrn4ni7ag8cifx9257c"; + url="http://mattmahoney.net/dc/zpaq655.zip"; + sha256="09wjss6vbziwvfmcngb64xd2yih79z1ypgrn4ni7ag8cifx9257c"; }; buildInputs = [ unzip diff --git a/pkgs/tools/backup/btar/default.nix b/pkgs/tools/backup/btar/default.nix index 0258edb8a194797b7b5a6fa8abba7654ee2bfad5..89f577e93ad0fef48c79266964e75b9278670762 100644 --- a/pkgs/tools/backup/btar/default.nix +++ b/pkgs/tools/backup/btar/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "Tar-compatible block-based archiver"; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; homepage = http://viric.name/cgi-bin/btar; platforms = with stdenv.lib.platforms; all; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/pkgs/tools/backup/chunksync/default.nix b/pkgs/tools/backup/chunksync/default.nix index e51d6d6acea16224e7d1934a476f70f2eb0a2952..baa0d6170162bfec1ef7b8ca0992a14ffde9775c 100644 --- a/pkgs/tools/backup/chunksync/default.nix +++ b/pkgs/tools/backup/chunksync/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { description = "Space-efficient incremental backups of large files or block devices"; homepage = "http://chunksync.florz.de/"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/tools/backup/duplicity/default.nix index 8a9db4e5701fb1d3a3ba9f4bac414aa13d869d2f..45d6cb83739ab245c67af1c4cd34e0c5693415de 100644 --- a/pkgs/tools/backup/duplicity/default.nix +++ b/pkgs/tools/backup/duplicity/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { meta = { description = "Encrypted bandwidth-efficient backup using the rsync algorithm"; homepage = "http://www.nongnu.org/duplicity"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric simons]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/backup/httrack/default.nix b/pkgs/tools/backup/httrack/default.nix index be5e0ef4abcd9b706aa8cd544668e55605fced79..4df142afe3a571c95008a59cb012740db27ca507 100644 --- a/pkgs/tools/backup/httrack/default.nix +++ b/pkgs/tools/backup/httrack/default.nix @@ -14,6 +14,6 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.httrack.com"; description = "Easy-to-use offline browser utility"; - license = "GPL"; + license = stdenv.lib.licenses.gpl3; }; } diff --git a/pkgs/tools/backup/obnam/default.nix b/pkgs/tools/backup/obnam/default.nix index 854801a3edd2f60d08e98ac687ff6275fbe6b4c6..bf71f9397cb63dbe597c05e57d0799b18a1f6bf1 100644 --- a/pkgs/tools/backup/obnam/default.nix +++ b/pkgs/tools/backup/obnam/default.nix @@ -2,13 +2,13 @@ pythonPackages.buildPythonPackage rec { name = "obnam-${version}"; - version = "1.6.1"; + version = "1.8"; namePrefix = ""; src = fetchurl rec { url = "http://code.liw.fi/debian/pool/main/o/obnam/obnam_${version}.orig.tar.gz"; - sha256 = "0415njniqpy3xhvibpm82i9alrp2fw3lsnm15h7vqkkvgp8s5g39"; + sha256 = "0190yz65hfdq69xws4h1izxz59by0b437d7z1l4cf5ixkv16j17p"; }; buildInputs = [ pythonPackages.sphinx attr ]; diff --git a/pkgs/tools/backup/rdiff-backup/default.nix b/pkgs/tools/backup/rdiff-backup/default.nix index d58815f6d6ddb5402f0c88646afd2b9164e7356d..58affe10e4e1fee12b90f5f9288feae84d52ed39 100644 --- a/pkgs/tools/backup/rdiff-backup/default.nix +++ b/pkgs/tools/backup/rdiff-backup/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = { description = "backup system trying to combine best a mirror and an incremental backup system"; homepage = http://rdiff-backup.nongnu.org/; - license = "GPL-2"; + license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ the-kenny ]; }; } diff --git a/pkgs/tools/backup/rsnapshot/default.nix b/pkgs/tools/backup/rsnapshot/default.nix index 9b147d68230f75a2fa0041c2abba7cfd24c3276f..0bd19e2d6be8e70e52c920d9b8e7822ebb0d4086 100644 --- a/pkgs/tools/backup/rsnapshot/default.nix +++ b/pkgs/tools/backup/rsnapshot/default.nix @@ -33,6 +33,6 @@ stdenv.mkDerivation rec { meta = { description = "A filesystem snapshot utility for making backups of local and remote systems"; homepage = http://rsnapshot.org/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/tools/backup/store-backup/default.nix b/pkgs/tools/backup/store-backup/default.nix index e9b98fec7100cfd5fc940b7ac42bacc0a1ed99cf..c986adeafdcc7c96e1047303375add22265c903e 100644 --- a/pkgs/tools/backup/store-backup/default.nix +++ b/pkgs/tools/backup/store-backup/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { }; installPhase = '' - ensureDir $out/scripts + mkdir -p $out/scripts mv * $out mv $out/_ATTENTION_ $out/doc mv $out/{correct.sh,cron-storebackup} $out/scripts diff --git a/pkgs/tools/bluetooth/bluedevil/default.nix b/pkgs/tools/bluetooth/bluedevil/default.nix index b8b7510b882bf88b4aff193f41664b33979ddce2..e5a4f83ab0f87c6aaf0f1747063e8bb61026eb1a 100644 --- a/pkgs/tools/bluetooth/bluedevil/default.nix +++ b/pkgs/tools/bluetooth/bluedevil/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Bluetooth manager for KDE"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; inherit (kdelibs.meta) platforms; maintainers = [ maintainers.phreedom ]; }; diff --git a/pkgs/tools/cd-dvd/cdrkit/default.nix b/pkgs/tools/cd-dvd/cdrkit/default.nix index 0d44624786b6a74ee7daa5d0c53664e1f15c7fb4..bcf9ec2c0cc3ecdc72fbac9df86da085479295ac 100644 --- a/pkgs/tools/cd-dvd/cdrkit/default.nix +++ b/pkgs/tools/cd-dvd/cdrkit/default.nix @@ -36,6 +36,6 @@ stdenv.mkDerivation rec { ''; homepage = http://cdrkit.org/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/tools/cd-dvd/unetbootin/default.nix b/pkgs/tools/cd-dvd/unetbootin/default.nix index 39b7c8098582de7ff1b717758a612249ce19a0d6..516f07508072bf8816f934c54bc7650c4e2cac01 100644 --- a/pkgs/tools/cd-dvd/unetbootin/default.nix +++ b/pkgs/tools/cd-dvd/unetbootin/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation { meta = { homepage = http://unetbootin.sourceforge.net/; description = "A tool to create bootable live USB drives from ISO images"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/cd-dvd/vobcopy/default.nix b/pkgs/tools/cd-dvd/vobcopy/default.nix index fd0f131b8c2a8560cccc61b8e7019ba0bb2cfd81..f181ab71edfbe22d5be11f4b3fadf9865aa01292 100644 --- a/pkgs/tools/cd-dvd/vobcopy/default.nix +++ b/pkgs/tools/cd-dvd/vobcopy/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { description = "Copies DVD .vob files to harddisk, decrypting them on the way"; homepage = http://vobcopy.org/projects/c/c.shtml; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.bluescreen303 ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/tools/cd-dvd/xorriso/default.nix b/pkgs/tools/cd-dvd/xorriso/default.nix index 62a802ebab5fc974c7562da2bfa593a3bf4307b7..88cca66efb13ec23f615b1483e0136ecd6297351 100644 --- a/pkgs/tools/cd-dvd/xorriso/default.nix +++ b/pkgs/tools/cd-dvd/xorriso/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { filesystems. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; homepage = http://www.gnu.org/software/xorriso/; diff --git a/pkgs/tools/compression/gzip/default.nix b/pkgs/tools/compression/gzip/default.nix index b1d127635f6168e792199c43cb1d948a217cdef5..b7bf9c59f494fdcec2c69cfb7cb06b1f3bb52d97 100644 --- a/pkgs/tools/compression/gzip/default.nix +++ b/pkgs/tools/compression/gzip/default.nix @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { is just a bonus. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; }; } diff --git a/pkgs/tools/compression/lrzip/default.nix b/pkgs/tools/compression/lrzip/default.nix index 6fd1ae97d9608495089271a5b07d961bfc09f1be..51f61fcf239d71468f97d2068a8d111331c7f30e 100644 --- a/pkgs/tools/compression/lrzip/default.nix +++ b/pkgs/tools/compression/lrzip/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://ck.kolivas.org/apps/lrzip/; description = "The CK LRZIP compression program (LZMA + RZIP)"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; inherit version; }; } diff --git a/pkgs/tools/compression/rzip/default.nix b/pkgs/tools/compression/rzip/default.nix index 8c4547753aa3e92b148f3cfa7af15ab9c5f53bde..ca8d356abb3eab878439a89938afdf1ce340b6a1 100644 --- a/pkgs/tools/compression/rzip/default.nix +++ b/pkgs/tools/compression/rzip/default.nix @@ -11,6 +11,6 @@ stdenv.mkDerivation { meta = { homepage = http://rzip.samba.org/; description = "The RZIP compression program"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/tools/compression/upx/default.nix b/pkgs/tools/compression/upx/default.nix index 283b751cf26a744102dab0ff4ac19571c200a7fd..c012be7c56d4a08e21f60be690045e93a6c6ddcf 100644 --- a/pkgs/tools/compression/upx/default.nix +++ b/pkgs/tools/compression/upx/default.nix @@ -29,6 +29,6 @@ stdenv.mkDerivation { meta = { homepage = http://upx.sourceforge.net/; description = "The Ultimate Packer for eXecutables"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/tools/filesystems/archivemount/default.nix b/pkgs/tools/filesystems/archivemount/default.nix index 4c00252fc2a1ac3b2ce257692f89612d1e4d8c67..5a43aa52a0ec2368889962020a6ecac3159e99ba 100644 --- a/pkgs/tools/filesystems/archivemount/default.nix +++ b/pkgs/tools/filesystems/archivemount/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { meta = { description = "Gateway between FUSE and libarchive: allows mounting of cpio, .tar.gz, .tar.bz2 archives"; - license = "GPL2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.simons ]; diff --git a/pkgs/tools/filesystems/bindfs/default.nix b/pkgs/tools/filesystems/bindfs/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..7d79eefb122c1f0fee795f0963b3e67ea0bbb054 --- /dev/null +++ b/pkgs/tools/filesystems/bindfs/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, fuse, pkgconfig }: + +stdenv.mkDerivation rec { + version = "1.12.6"; + name = "bindfs-${version}"; + + src = fetchurl { + url = "http://bindfs.org/downloads/${name}.tar.gz"; + sha256 = "0s90n1n4rvpcg51ixr5wx8ixml1xnc7w28xlbnms34v19pzghm59"; + }; + + dontStrip = true; + + buildInputs = [ fuse pkgconfig ]; + + meta = { + description = "A FUSE filesystem for mounting a directory to another location"; + homepage = http://bindfs.org; + license = stdenv.lib.licenses.gpl2; + maintainers = with stdenv.lib.maintainers; [ lovek323 ]; + platforms = stdenv.lib.platforms.unix; + }; +} diff --git a/pkgs/tools/filesystems/chunkfs/default.nix b/pkgs/tools/filesystems/chunkfs/default.nix index c51837eef181330ed0c560bd92c5a78094e17969..d91525e348f76961616da26fdcfbce56ee481213 100644 --- a/pkgs/tools/filesystems/chunkfs/default.nix +++ b/pkgs/tools/filesystems/chunkfs/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { description = "(Un)ChunkFS is a pair of FUSE filesystems for viewing chunksync-style directory trees as a block device and vice versa."; homepage = "http://chunkfs.florz.de/"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/tools/filesystems/ciopfs/default.nix b/pkgs/tools/filesystems/ciopfs/default.nix index f944e591a12699c7dc189571ba63d7cef6256412..97548442ebae3de535eb853a360c76775ce97052 100644 --- a/pkgs/tools/filesystems/ciopfs/default.nix +++ b/pkgs/tools/filesystems/ciopfs/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.brain-dump.org/projects/ciopfs/; description = "A case-insensitive filesystem layered on top of any other filesystem"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/tools/filesystems/fsfs/default.nix b/pkgs/tools/filesystems/fsfs/default.nix index 0e72c45e31ad1cac1a715e3df1c0350f6b4e65db..75e5280d391d740b96b33c514875cd1fa912ecfa 100644 --- a/pkgs/tools/filesystems/fsfs/default.nix +++ b/pkgs/tools/filesystems/fsfs/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation { meta = { homepage = http://fsfs.sourceforge.net/; description = "Secure distributed file system in user space"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix index 1c843a6663604fcc27d731678fddfc2afa076870..69f3f7ef1efd99415697f7e6c07ac9f06635bfd7 100644 --- a/pkgs/tools/filesystems/glusterfs/default.nix +++ b/pkgs/tools/filesystems/glusterfs/default.nix @@ -4,10 +4,11 @@ let s = # Generated upstream information rec { baseName="glusterfs"; - version="3.5.0"; + version="3.5.2"; name="${baseName}-${version}"; - url="http://download.gluster.org/pub/gluster/glusterfs/3.5/3.5.0/glusterfs-3.5.0.tar.gz"; - sha256="0d9jlgxg19f2ajf5i4yw4f91n161rsi8fm95442ckci3xnz21zir"; + hash="1hvns9islr5jcy0r1cw5890ra246y12pl5nlhl3bvmhglrkv8n7g"; + url="http://download.gluster.org/pub/gluster/glusterfs/3.5/3.5.2/glusterfs-3.5.2.tar.gz"; + sha256="1hvns9islr5jcy0r1cw5890ra246y12pl5nlhl3bvmhglrkv8n7g"; }; buildInputs = [ fuse bison flex_2_5_35 openssl python ncurses readline diff --git a/pkgs/tools/filesystems/grive/default.nix b/pkgs/tools/filesystems/grive/default.nix index dce7757d23a2b7c972b576e101a1725bbed0e906..c6d2776f437a7eaf294cabf05b5430d331861b2e 100644 --- a/pkgs/tools/filesystems/grive/default.nix +++ b/pkgs/tools/filesystems/grive/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "an open source (experimental) Linux client for Google Drive"; homepage = https://github.com/Grive/grive; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/tools/filesystems/httpfs/default.nix b/pkgs/tools/filesystems/httpfs/default.nix index 6f68a798ede96381463b0d16b90f5891ab42d7e5..b0f7981ebb3cb589895d53287cdea82d757b3daa 100644 --- a/pkgs/tools/filesystems/httpfs/default.nix +++ b/pkgs/tools/filesystems/httpfs/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { homepage = http://httpfs.sourceforge.net/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; maintainers = [ ]; diff --git a/pkgs/tools/filesystems/mtdutils/default.nix b/pkgs/tools/filesystems/mtdutils/default.nix index 4cb09d53adcfe248849153cf483bdb23965a8f64..2a7d9672843dc23f0e139d3e6bf53fc2e73fb024 100644 --- a/pkgs/tools/filesystems/mtdutils/default.nix +++ b/pkgs/tools/filesystems/mtdutils/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = { description = "Tools for MTD filesystems"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://www.linux-mtd.infradead.org/; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/tools/filesystems/reiserfsprogs/default.nix b/pkgs/tools/filesystems/reiserfsprogs/default.nix index 2c14bc624ae34b53c76ce5d81a33c95d15db202a..0c5ec063b1aa29e9adb07efcc261970b452f3667 100644 --- a/pkgs/tools/filesystems/reiserfsprogs/default.nix +++ b/pkgs/tools/filesystems/reiserfsprogs/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.namesys.com/; description = "ReiserFS utilities"; - license = "GPL-2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/tools/filesystems/s3backer/default.nix b/pkgs/tools/filesystems/s3backer/default.nix index 3951a8d8bb79d7235af8122d228870cec19a52ab..89e49c9586c5937065bc0c1871eff1069b04d74c 100644 --- a/pkgs/tools/filesystems/s3backer/default.nix +++ b/pkgs/tools/filesystems/s3backer/default.nix @@ -13,6 +13,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://code.google.com/p/s3backer/; description = "FUSE-based single file backing store via Amazon S3"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/tools/filesystems/svnfs/default.nix b/pkgs/tools/filesystems/svnfs/default.nix index 4787ed77b5995fd6e805b6ec7d29ac37a3370571..b6a296e6bc7b269fd0bdf9e8ab6695308b605de5 100644 --- a/pkgs/tools/filesystems/svnfs/default.nix +++ b/pkgs/tools/filesystems/svnfs/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = { description = "SvnFs is a filesystem written using FUSE for accessing Subversion repositories"; homepage = http://www.jmadden.eu/index.php/svnfs/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [stdenv.lib.maintainers.marcweber]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/tools/filesystems/unionfs-fuse/default.nix b/pkgs/tools/filesystems/unionfs-fuse/default.nix index bff5aaf242ba9407b85848c1aea0bcd186623524..23340f88376b245eb1657904ba717cc81ed45727 100644 --- a/pkgs/tools/filesystems/unionfs-fuse/default.nix +++ b/pkgs/tools/filesystems/unionfs-fuse/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { # This must be done in preConfigure because the build process removes # helper from the source directory during the build. preConfigure = '' - ensureDir $out/sbin + mkdir -p $out/sbin cp -a mount.unionfs $out/sbin/mount.unionfs-fuse substituteInPlace $out/sbin/mount.unionfs-fuse --replace mount.fuse ${fuse}/sbin/mount.fuse substituteInPlace $out/sbin/mount.unionfs-fuse --replace unionfs $out/bin/unionfs diff --git a/pkgs/tools/graphics/barcode/default.nix b/pkgs/tools/graphics/barcode/default.nix index d43540a8b99d5119ffab0840483afe7e76c08a9d..60dc5a285da3783032364d791f8f40b0f9656ab5 100644 --- a/pkgs/tools/graphics/barcode/default.nix +++ b/pkgs/tools/graphics/barcode/default.nix @@ -34,8 +34,7 @@ rec { [ raskin ]; - platforms = with a.lib.platforms; - all; + platforms = with a.lib.platforms; allBut darwin; }; passthru = { updateInfo = { diff --git a/pkgs/tools/graphics/dcraw/default.nix b/pkgs/tools/graphics/dcraw/default.nix index ed9ac2da2d2a521eb0f04d995d87670dda39517a..72b50bd4e7735b748f985aecd7a975ae776734a5 100644 --- a/pkgs/tools/graphics/dcraw/default.nix +++ b/pkgs/tools/graphics/dcraw/default.nix @@ -1,14 +1,14 @@ -{stdenv, fetchurl, libjpeg, lcms, gettext, jasper }: +{stdenv, fetchurl, libjpeg, lcms2, gettext, jasper }: stdenv.mkDerivation rec { - name = "dcraw-9.20"; + name = "dcraw-9.22"; src = fetchurl { url = "http://www.cybercom.net/~dcoffin/dcraw/archive/${name}.tar.gz"; - sha256 = "151xpfmfd1ksjcnpmsnxry1mf2xpx9iaiy9sg1vxgm9i80lkkp5f"; + sha256 = "00dz85fr5r9k3nlwdbdi30fpqr8wihamzpyair7l7zk0vkrax402"; }; - buildInputs = [ libjpeg lcms gettext jasper ]; + buildInputs = [ libjpeg lcms2 gettext jasper ]; patchPhase = '' sed -i -e s@/usr/local@$out@ install @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { homepage = http://www.cybercom.net/~dcoffin/dcraw/; description = "Decoder for many camera raw picture formats"; license = "free"; - platforms = stdenv.lib.platforms.allBut "i686-cygwin"; + platforms = with stdenv.lib.platforms; allBut cygwin; maintainers = [ stdenv.lib.maintainers.urkud ]; }; } diff --git a/pkgs/tools/graphics/enblend-enfuse/default.nix b/pkgs/tools/graphics/enblend-enfuse/default.nix index b77d63d510df88220d6b2ac014e75c51595d7f94..6b65d3df0d3f5c3413f02b7b4f18060984c2c601 100644 --- a/pkgs/tools/graphics/enblend-enfuse/default.nix +++ b/pkgs/tools/graphics/enblend-enfuse/default.nix @@ -1,37 +1,24 @@ -{stdenv, fetchurl, libtiff, libpng, lcms, libxmi, boost, mesa, freeglut -, pkgconfig, perl, glew }: +{ stdenv, fetchurl +, boost, freeglut, glew, gsl, lcms2, libpng, libtiff, libxmi, mesa, vigra +, pkgconfig, perl }: stdenv.mkDerivation rec { - name = "enblend-enfuse-4.0"; + name = "enblend-enfuse-4.1.3"; src = fetchurl { url = "mirror://sourceforge/enblend/${name}.tar.gz"; - sha256 = "1i2kq842zrncpadarhcikg447abmh5r7a5js3mzg553ql3148am1"; + sha256 = "1b7r1nnwaind0344ckwggy0ghl0ipbk9jzylsxcjfl05rnasw00w"; }; - buildInputs = [ libtiff libpng lcms libxmi boost mesa freeglut glew ]; + buildInputs = [ boost freeglut glew gsl lcms2 libpng libtiff libxmi mesa vigra ]; nativeBuildInputs = [ perl pkgconfig ]; - patches = - let - prefix = "http://enblend.hg.sourceforge.net/hgweb/enblend/enblend/raw-diff"; - in map fetchurl [ - { - url = "${prefix}/9d9b5f3a97cd/src/vigra_impex/png.cxx"; - name = "ftbfs-libpng15.patch"; - sha256 = "1nqhbbgphwi087qpazngg04c1whc1p4fwq19fx36jrir96xywgzg"; - } - { - url = "${prefix}/101796703d73/src/vigra_impex/png.cxx"; - name = "ftbfs-libpng15.patch"; - sha256 = "14frqg4hab9ab6pdypkrmji43fmxjj918j7565rdwmifbm9i3005"; - } - ]; + enableParallelBuilding = true; meta = { homepage = http://enblend.sourceforge.net/; description = "Blends away the seams in a panoramic image mosaic using a multiresolution spline"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/tools/graphics/gifsicle/default.nix b/pkgs/tools/graphics/gifsicle/default.nix index debc340ee4ce810fa750f2e76e30284eb59e5a74..dc1a8b3abaee826a6f8fdd01226ad5fbf3b8961b 100644 --- a/pkgs/tools/graphics/gifsicle/default.nix +++ b/pkgs/tools/graphics/gifsicle/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation { meta = { description = "Command-line tool for creating, editing, and getting information about GIF images and animations"; homepage = http://www.lcdf.org/gifsicle/; - license = "GPL2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/tools/graphics/glmark2/default.nix b/pkgs/tools/graphics/glmark2/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..97fcd1addd01087f1fa9bbbb6f1945a6f1c525b1 --- /dev/null +++ b/pkgs/tools/graphics/glmark2/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl, pkgconfig, libjpeg, libpng12, xlibs, libX11, mesa, libdrm, python27 }: +stdenv.mkDerivation rec { + name = "glmark2-${version}"; + version = "2014.03"; + + src = fetchurl { + url = "https://launchpad.net/glmark2/trunk/${version}/+download/${name}.tar.gz"; + sha256 = "1dgn7ln115ivk13d1yagpj06lgllpv2jrr41kcnhdkhqz6m43vdx"; + }; + + buildInputs = [ + pkgconfig libjpeg libpng12 xlibs.libxcb libX11 mesa libdrm python27 + ]; + + buildPhase = '' + python ./waf configure --prefix=$out --with-flavors x11-gl,x11-glesv2 + python2 ./waf + ''; + + installPhase = '' + python2 ./waf install --destdir="$pkgdir/" + ''; + + meta = with stdenv.lib; { + description = "OpenGL (ES) 2.0 benchmark"; + homepage = https://launchpad.net/glmark2; + license = licenses.gpl3Plus; + longDescription = '' + glmark2 is a benchmark for OpenGL (ES) 2.0. It uses only the subset of + the OpenGL 2.0 API that is compatible with OpenGL ES 2.0. + ''; + platforms = platforms.linux; + maintainers = [ maintainers.wmertens ]; + }; +} + diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix index e0f9ce2a2bf76b5aa33eea2e0450b32d213ba397..f92c82e3d744a9a1aa801300a1610609f48697cc 100644 --- a/pkgs/tools/graphics/gnuplot/default.nix +++ b/pkgs/tools/graphics/gnuplot/default.nix @@ -1,45 +1,48 @@ -{ stdenv, fetchurl, zlib, gd, texinfo, makeWrapper, readline -, texLive ? null -, lua ? null +{ lib, stdenv, fetchurl, zlib, gd, texinfo4, makeWrapper, readline +, withTeXLive ? false, texLive +, withLua ? false, lua , emacs ? null , libX11 ? null , libXt ? null , libXpm ? null , libXaw ? null , aquaterm ? false -, wxGTK ? null +, withWxGTK ? false, wxGTK ? null , pango ? null , cairo ? null , pkgconfig ? null , fontconfig ? null , gnused ? null -, coreutils ? null }: +, coreutils ? null +, withQt ? false, qt4 }: assert libX11 != null -> (fontconfig != null && gnused != null && coreutils != null); let - withX = libX11 != null && !aquaterm; + withX = libX11 != null && !aquaterm && !stdenv.isDarwin; in stdenv.mkDerivation rec { - name = "gnuplot-4.6.3"; + name = "gnuplot-4.6.5"; src = fetchurl { url = "mirror://sourceforge/gnuplot/${name}.tar.gz"; - sha256 = "1xd7gqdhlk7k1p9yyqf9vkk811nadc7m4si0q3nb6cpv4pxglpyz"; + sha256 = "0bcsa5b33msddjs6mj0rhi81cs19h9p3ykixkkl70ifhqwqg0l75"; }; buildInputs = - [ zlib gd texinfo readline emacs lua texLive - pango cairo pkgconfig makeWrapper ] - ++ stdenv.lib.optionals withX [ libX11 libXpm libXt libXaw ] + [ zlib gd texinfo4 readline pango cairo pkgconfig makeWrapper ] + ++ lib.optional withTeXLive texLive + ++ lib.optional withLua lua + ++ lib.optionals withX [ libX11 libXpm libXt libXaw ] + ++ lib.optional withQt [ qt4 ] # compiling with wxGTK causes a malloc (double free) error on darwin - ++ stdenv.lib.optional (!stdenv.isDarwin) wxGTK; + ++ lib.optional (withWxGTK && !stdenv.isDarwin) wxGTK; configureFlags = (if withX then ["--with-x"] else ["--without-x"]) - ++ (if aquaterm then ["--with-aquaterm"] else ["--without-aquaterm"]) - ; + ++ (if withQt then ["--enable-qt"] else ["--disable-qt"]) + ++ (if aquaterm then ["--with-aquaterm"] else ["--without-aquaterm"]); - postInstall = stdenv.lib.optionalString withX '' + postInstall = lib.optionalString withX '' wrapProgram $out/bin/gnuplot \ --prefix PATH : '${gnused}/bin' \ --prefix PATH : '${coreutils}/bin' \ @@ -47,8 +50,8 @@ stdenv.mkDerivation rec { --run '. ${./set-gdfontpath-from-fontconfig.sh}' ''; - meta = with stdenv.lib; { - homepage = http://www.gnuplot.info; + meta = with lib; { + homepage = http://www.gnuplot.info/; description = "A portable command-line driven graphing utility for many platforms"; hydraPlatforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ lovek323 ]; diff --git a/pkgs/tools/graphics/icoutils/default.nix b/pkgs/tools/graphics/icoutils/default.nix index 10cd9adf2b3cfd43b497fb2641ea1cb944231545..94a613078a4785cbe6315c6ef8a4a877c5b92e61 100644 --- a/pkgs/tools/graphics/icoutils/default.nix +++ b/pkgs/tools/graphics/icoutils/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.nongnu.org/icoutils/; description = "Set of programs to deal with Microsoft Windows(R) icon and cursor files"; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/tools/graphics/mscgen/default.nix b/pkgs/tools/graphics/mscgen/default.nix index ed69327b752a4d1ecdb2bc7a34ac20a3f869ea5f..36a75743ed8a535de1a5bd63bae1e7d1c51014b0 100644 --- a/pkgs/tools/graphics/mscgen/default.nix +++ b/pkgs/tools/graphics/mscgen/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = { homepage = http://www.mcternan.me.uk/mscgen/; description = "Convert Message Sequence Chart descriptions into PNG, SVG, or EPS images"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; longDescription = '' Mscgen is a small program that parses Message Sequence Chart diff --git a/pkgs/tools/graphics/panomatic/default.nix b/pkgs/tools/graphics/panomatic/default.nix index 1a7c3317cf9f4ca2eebd4f61e4055d694a4a59e8..f14c16775f8d587a5cc14be35a78c072c438d45c 100644 --- a/pkgs/tools/graphics/panomatic/default.nix +++ b/pkgs/tools/graphics/panomatic/default.nix @@ -13,6 +13,6 @@ stdenv.mkDerivation { meta = { homepage = http://aorlinsk2.free.fr/panomatic/; description = "Tool that automates the creation of control points in Hugin"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/tools/graphics/ploticus/default.nix b/pkgs/tools/graphics/ploticus/default.nix index 857a86d57af1bf648e9caae87cefe4f68b1fdf07..92dce64dcfd46510d1e737005a7d1af1d485847a 100644 --- a/pkgs/tools/graphics/ploticus/default.nix +++ b/pkgs/tools/graphics/ploticus/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { statistical capabilities. It allows significant user control over colors, styles, options and details.''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://ploticus.sourceforge.net/; }; } diff --git a/pkgs/tools/graphics/plotutils/default.nix b/pkgs/tools/graphics/plotutils/default.nix index bb250b9d85233336e90de2386ec1414082faf159..ae0c4d197315e4a65f5cd66034658ae5d71662be 100644 --- a/pkgs/tools/graphics/plotutils/default.nix +++ b/pkgs/tools/graphics/plotutils/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/plotutils/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.marcweber stdenv.lib.maintainers.ludo diff --git a/pkgs/tools/graphics/pngcrush/default.nix b/pkgs/tools/graphics/pngcrush/default.nix index 2a4364164dd85e829ebce4da0f8c0e22f1eba99c..b27e5132804b771d344b12c9a8528576a930e329 100644 --- a/pkgs/tools/graphics/pngcrush/default.nix +++ b/pkgs/tools/graphics/pngcrush/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libpng }: stdenv.mkDerivation rec { - name = "pngcrush-1.7.73"; + name = "pngcrush-1.7.76"; src = fetchurl { url = "mirror://sourceforge/pmt/${name}-nolib.tar.xz"; - sha256 = "073y19af0sw36nw7draqw9zfd6n7q7b84kscy26s76fhj5x2gb0l"; + sha256 = "0jbv3ijc0nfhy6pkhv4dwbk2v488rwixd8rv1c7lfs59wblb44hv"; }; configurePhase = '' diff --git a/pkgs/tools/graphics/pngquant/default.nix b/pkgs/tools/graphics/pngquant/default.nix index 560352c481ea8fefb43dffee4054c6e5fdc31a0d..77cc898ef2adc96ecd5830e7020910c835834ae0 100644 --- a/pkgs/tools/graphics/pngquant/default.nix +++ b/pkgs/tools/graphics/pngquant/default.nix @@ -22,5 +22,6 @@ stdenv.mkDerivation rec { description = "pngquant converts 24/32-bit RGBA PNGs to 8-bit palette with alpha channel preserved"; platforms = platforms.all; license = licenses.bsd2; # Not exactly bsd2, but alike + broken = true; }; } diff --git a/pkgs/tools/graphics/pngtoico/default.nix b/pkgs/tools/graphics/pngtoico/default.nix index df1046cb750ffc91efda808387a4161c271931e8..fe01a9459ecb4e28ff19c6379bd36fe8c11e7104 100644 --- a/pkgs/tools/graphics/pngtoico/default.nix +++ b/pkgs/tools/graphics/pngtoico/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.kernel.org/pub/software/graphics/pngtoico/; description = "Small utility to convert a set of PNG images to Microsoft ICO format"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/tools/graphics/povray/default.nix b/pkgs/tools/graphics/povray/default.nix index 6272bdae780300bd9a9563f357be6af9ea32a682..b4a1d1a7d67ad7f9e10f40d616c9c5fd9abb6851 100644 --- a/pkgs/tools/graphics/povray/default.nix +++ b/pkgs/tools/graphics/povray/default.nix @@ -1,21 +1,39 @@ -{stdenv, fetchurl}: +{stdenv, fetchgit, autoconf, automake, boost149, zlib, libpng, libjpeg, libtiff}: +let boost = boost149; in stdenv.mkDerivation { - name = "povray-3.6"; + name = "povray-3.7"; - src = fetchurl { - url = http://www.povray.org/ftp/pub/povray/Old-Versions/Official-3.62/Unix/povray-3.6.tar.bz2; - sha256 = "4e8a7fecd44807343b6867e1f2440aa0e09613d6d69a7385ac48f4e5e7737a73"; + src = fetchgit { + url = "https://github.com/POV-Ray/povray.git"; + rev = "39ce8a24e50651904010dda15872d63be15d7c37"; + sha256 = "0d56631d9daacb8967ed359025f56acf0bd505d1d9e752859e8ff8656ae72d20"; }; + + buildInputs = [ autoconf automake boost zlib libpng libjpeg libtiff ]; + # the installPhase wants to put files into $HOME. I let it put the files # to $TMPDIR, so they don't get into the $out - patchPhase = '' - sed -i -e 's/^povconfuser.*/povconfuser=$(TMPDIR)\/povray/' Makefile.{am,in}; + postPatch = '' cd unix + ./prebuild.sh + cd .. + sed -i -e 's/^povconfuser.*/povconfuser=$(TMPDIR)\/povray/' Makefile.{am,in} + sed -i -e 's/^povuser.*/povuser=$(TMPDIR)\/.povray/' Makefile.{am,in} + sed -i -e 's/^povowner.*/povowner=nobody/' Makefile.{am,in} + sed -i -e 's/^povgroup.*/povgroup=nogroup/' Makefile.{am,in} + ''; + + configureFlags = "COMPILED_BY='nix' --with-boost-libdir=${boost}/lib --with-boost-includedir=${boost}/include"; + + preInstall = '' + mkdir "$TMP/bin" + for i in chown chgrp; do + echo '#!/bin/sh' >> "$TMP/bin/$i" + chmod +x "$TMP/bin/$i" + PATH="$TMP/bin:$PATH" + done ''; - # I didn't use configureFlags because I couldn't pass the quotes properly - # for the COMPILED_BY. - configurePhase = "./configure --prefix=$out COMPILED_BY=\"nix\""; meta = { homepage = http://www.povray.org/; diff --git a/pkgs/tools/graphics/pstoedit/default.nix b/pkgs/tools/graphics/pstoedit/default.nix index 62816705b8f08ad781b0eff5b111eb3ebebbaccf..d4e977128cfee6db825166a8dc2826cdb05d6f1a 100644 --- a/pkgs/tools/graphics/pstoedit/default.nix +++ b/pkgs/tools/graphics/pstoedit/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = { description = "translates PostScript and PDF graphics into other vector formats"; homepage = http://www.helga-glunz.homepage.t-online.de/pstoedit; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.marcweber ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/tools/inputmethods/fcitx/default.nix b/pkgs/tools/inputmethods/fcitx/default.nix index 747c4b44ac80d327b702f4ec93c163b1de785464..2795b0d4d871b89f5f15daae44cb3dbe7b06cd70 100644 --- a/pkgs/tools/inputmethods/fcitx/default.nix +++ b/pkgs/tools/inputmethods/fcitx/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://code.google.com/p/fcitx/"; description = "A Flexible Input Method Framework"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [iyzsong]; }; diff --git a/pkgs/tools/misc/aws-mturk-clt/default.nix b/pkgs/tools/misc/aws-mturk-clt/default.nix index f2fe1d959303c9ae88266735b605621d5d1d8711..d2d29aae785dc6e51a0fd0ac905d837566378316 100644 --- a/pkgs/tools/misc/aws-mturk-clt/default.nix +++ b/pkgs/tools/misc/aws-mturk-clt/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { homepage = https://requester.mturk.com/developer; description = "Command line tools for interacting with the Amazon Mechanical Turk"; - license = "unfree-redistributable"; + license = "unfree-redistributable"; # Amazon http://aws.amazon.com/asl/ longDescription = '' diff --git a/pkgs/tools/misc/bfr/default.nix b/pkgs/tools/misc/bfr/default.nix index 024798a84e3fefd0df2b6e171a6c9b6937d21876..78383f4185d5871ed73bd05761aa6aecd149128a 100644 --- a/pkgs/tools/misc/bfr/default.nix +++ b/pkgs/tools/misc/bfr/default.nix @@ -13,6 +13,6 @@ stdenv.mkDerivation { meta = { description = "general-purpose command-line pipe buffer"; homepage = http://www.glines.org/wiki/bfr; - license = "GPL2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/tools/misc/bogofilter/default.nix b/pkgs/tools/misc/bogofilter/default.nix index f7c121d825e29fcfd1bca7738bcbee584c545501..52d80a8812e02883ff32d33ad6e86032439ed755 100644 --- a/pkgs/tools/misc/bogofilter/default.nix +++ b/pkgs/tools/misc/bogofilter/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { classifications and corrections. It is based on a Bayesian filter. ''; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index b0dbb049cbf75f623a1c5253fff3455423a22dd7..8844fe9c57cc0c3c105ca160d0c987601decdb33 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -75,7 +75,7 @@ let operating system. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ ]; }; diff --git a/pkgs/tools/misc/cunit/default.nix b/pkgs/tools/misc/cunit/default.nix index 35e4c3ab4d481b0fa537ff4ddd6be07ce2144d8c..ac9685b83f5dadaf2ccc804de699adc013b3c49c 100644 --- a/pkgs/tools/misc/cunit/default.nix +++ b/pkgs/tools/misc/cunit/default.nix @@ -19,7 +19,6 @@ stdenv.mkDerivation rec { homepage = http://cunit.sourceforge.net/; - license = "lgpl"; + license = stdenv.lib.licenses.lgpl2; }; } - diff --git a/pkgs/tools/misc/debian-devscripts/default.nix b/pkgs/tools/misc/debian-devscripts/default.nix index ddf30f342d155aad54795f6f1eebcd9ad81edf81..49e158ea2d0499c5cfe9c3fdf1f5328ca0c96c88 100644 --- a/pkgs/tools/misc/debian-devscripts/default.nix +++ b/pkgs/tools/misc/debian-devscripts/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ''; meta = { description = ''Debian package maintenance scripts''; - license = "GPL (various)"; # Mix of public domain, Artistic+GPL, GPL1+, GPL2+, GPL3+, and GPL2-only... + license = "GPL (various)"; # Mix of public domain, Artistic+GPL, GPL1+, GPL2+, GPL3+, and GPL2-only... TODO maintainers = with stdenv.lib.maintainers; [raskin]; }; } diff --git a/pkgs/tools/misc/debootstrap/default.nix b/pkgs/tools/misc/debootstrap/default.nix index aac7855827ccceb49ac10240d1ea0a3c86ba74ec..16b1858e91dfb20b1a97d069fb58d1ade2d43311 100644 --- a/pkgs/tools/misc/debootstrap/default.nix +++ b/pkgs/tools/misc/debootstrap/default.nix @@ -20,7 +20,7 @@ let ]; # TODO install man installPhase = '' - ensureDir $out/sbin + mkdir -p $out/sbin ls -l t=$out/sbin/MAKEDEV cp MAKEDEV $t @@ -78,7 +78,7 @@ stdenv.mkDerivation { functions d=$out/share/debootstrap - ensureDir $out/{share/debootstrap,bin} + mkdir -p $out/{share/debootstrap,bin} ${fakeroot}/bin/fakeroot -- make devices.tar.gz MAKEDEV=${makedev}/sbin/MAKEDEV @@ -94,7 +94,7 @@ stdenv.mkDerivation { EOF chmod +x $out/bin/debootstrap - ensureDir $out/man/man8 + mkdir -p $out/man/man8 mv debootstrap.8 $out/man/man8 ''; @@ -105,7 +105,7 @@ stdenv.mkDerivation { meta = { description = "Tool to create a Debian system in a chroot"; homepage = http://packages.debian.org/de/lenny/debootstrap; # http://code.erisian.com.au/Wiki/debootstrap - license = "GPL-2"; # gentoo says so.. ? + license = stdenv.lib.licenses.gpl2; # gentoo says so.. ? maintainers = [ stdenv.lib.maintainers.marcweber ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/tools/misc/detox/default.nix b/pkgs/tools/misc/detox/default.nix index 435115ffc596f897888294e6d083cac8f77d3e1e..65a0047738bcafc08f74e17f926795772d331f15 100644 --- a/pkgs/tools/misc/detox/default.nix +++ b/pkgs/tools/misc/detox/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation { (or CP-1252) characters in them. ''; homepage = "http://detox.sourceforge.net/"; - license = "bsd"; + license = stdenv.lib.licenses.bsd3; }; } diff --git a/pkgs/tools/misc/emv/default.nix b/pkgs/tools/misc/emv/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..ee8b12ad89b5fa10c76d60f4560d96c4dac5b8d5 --- /dev/null +++ b/pkgs/tools/misc/emv/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "emv-${version}"; + version = "1.95"; + + src = fetchurl { + url = "http://www.i0i0.de/toolchest/emv"; + sha256 = "7e0e12afa45ef5ed8025e5f2c6deea0ff5f512644a721f7b1b95b63406a8f7ce"; + }; + + phases = [ "installPhase" ]; + + installPhase = '' + mkdir -pv $out/bin + cp $src $out/bin/emv + chmod +x $out/bin/emv + ''; + + meta = { + homepage = "http://www.i0i0.de/toolchest/emv"; + description = "Editor Move: Rename files with your favourite text editor"; + license = stdenv.lib.licenses.publicDomain; + }; +} diff --git a/pkgs/tools/misc/fasd/default.nix b/pkgs/tools/misc/fasd/default.nix index 77d1d58c30c211dad8e8cad89255f5285afaf104..1cbbb9720c9a02dcbd994815b304992f4dbe358a 100644 --- a/pkgs/tools/misc/fasd/default.nix +++ b/pkgs/tools/misc/fasd/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = { homepage = "https://github.com/clvv/fasd"; description = "quick command-line access to files and directories for POSIX shells"; - license = "free"; + license = "free"; # https://github.com/clvv/fasd/blob/master/LICENSE longDescription = '' Fasd is a command-line productivity booster. @@ -33,5 +33,3 @@ stdenv.mkDerivation { platforms = stdenv.lib.platforms.all; }; } - - diff --git a/pkgs/tools/misc/fdupes/default.nix b/pkgs/tools/misc/fdupes/default.nix index 14e6a2f6681f5c7d8dd37e085c9c48766a57c04f..41c479e414b377bfde889a62283db821548dafde 100644 --- a/pkgs/tools/misc/fdupes/default.nix +++ b/pkgs/tools/misc/fdupes/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { files within a set of directories. ''; homepage = http://code.google.com/p/fdupes/; - license = "MIT"; + license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.z77z diff --git a/pkgs/tools/misc/file/default.nix b/pkgs/tools/misc/file/default.nix index 8d6cbc1359bbec4af8309d8e6eb7fc7fdb52c3cb..015820916c74b9a7e7c648a9c05397ef6be32857 100644 --- a/pkgs/tools/misc/file/default.nix +++ b/pkgs/tools/misc/file/default.nix @@ -13,5 +13,6 @@ stdenv.mkDerivation rec { meta = { homepage = "http://darwinsys.com/file"; description = "A program that shows the type of files"; + platforms = with stdenv.lib.platforms; allBut darwin; }; } diff --git a/pkgs/tools/misc/fileschanged/default.nix b/pkgs/tools/misc/fileschanged/default.nix index d0a03f955a89a9af6bedf77bccbbded6b5eb484e..d6ae74e02b5e1a6f9a08bd106fca705de18d0acb 100644 --- a/pkgs/tools/misc/fileschanged/default.nix +++ b/pkgs/tools/misc/fileschanged/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.nongnu.org/fileschanged/"; description = "A command-line utility that reports when files have been altered"; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; longDescription = '' This utility is a client to FAM (File Alteration Monitor) servers diff --git a/pkgs/tools/misc/findutils/default.nix b/pkgs/tools/misc/findutils/default.nix index 88cb2c313c0aa2fcec324c53432ab6542e08ebeb..a6ea96b77db58f67657661fea48ed036aede2c43 100644 --- a/pkgs/tools/misc/findutils/default.nix +++ b/pkgs/tools/misc/findutils/default.nix @@ -38,6 +38,6 @@ stdenv.mkDerivation rec { * xargs - build and execute command lines from standard input. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; }; } diff --git a/pkgs/tools/misc/gbdfed/Makefile.patch b/pkgs/tools/misc/gbdfed/Makefile.patch new file mode 100644 index 0000000000000000000000000000000000000000..9c437deca07cc125e07310e3a461507ac1896d86 --- /dev/null +++ b/pkgs/tools/misc/gbdfed/Makefile.patch @@ -0,0 +1,15 @@ +diff --git "a/Makefile.in" "b/Makefile.in" +index b482958..472b8da 100644 +--- "a/Makefile.in" ++++ "b/Makefile.in" +@@ -27,9 +27,7 @@ MKINSTALLDIRS = ./mkinstalldirs + CC = @CC@ + CFLAGS = @XX_CFLAGS@ @CFLAGS@ + +-DEFINES = @DEFINES@ -DG_DISABLE_DEPRECATED \ +- -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED \ +- -DGTK_DISABLE_DEPRECATED ++DEFINES = @DEFINES@ + + SRCS = bdf.c \ + bdfcons.c \ diff --git a/pkgs/tools/misc/gbdfed/default.nix b/pkgs/tools/misc/gbdfed/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..104d3fad8d097fec262cc0556f7f5506c82cc69d --- /dev/null +++ b/pkgs/tools/misc/gbdfed/default.nix @@ -0,0 +1,29 @@ + { stdenv, fetchurl, pkgconfig, freetype, gtk }: + +stdenv.mkDerivation rec { + version = "1.6"; + name = "gbdfed-${version}"; + + src = fetchurl { + url = "http://sofia.nmsu.edu/~mleisher/Software/gbdfed/${name}.tar.bz2"; + sha256 = "0g09k6wim58hngxncq2brr7mwjm92j3famp0vs4b3p48wr65vcjx"; + }; + + buildInputs = [ pkgconfig freetype gtk ]; + + patches = [ ./Makefile.patch ]; + + meta = { + description = "Bitmap Font Editor"; + longDescription = '' + gbdfed lets you interactively create new bitmap font files or modify existing ones. + It allows editing multiple fonts and multiple glyphs, + it allows cut and paste operations between fonts and glyphs and editing font properties. + The editor works natively with BDF fonts. + ''; + homepage = http://sofia.nmsu.edu/~mleisher/Software/gbdfed/; + license = stdenv.lib.licenses.mit; + maintainers = [ stdenv.lib.maintainers.linquize ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/tools/misc/gparted/default.nix b/pkgs/tools/misc/gparted/default.nix index 50af2a12c24ba5fb0a7395bcca7c47b1d3398edf..16c7f652decaf38cd3e846467d1f47a12bfaee1a 100644 --- a/pkgs/tools/misc/gparted/default.nix +++ b/pkgs/tools/misc/gparted/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { description = "Graphical disk partitioning tool"; homepage = http://gparted.sourceforge.net; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix index 17cd86014dd40466872e7370491dcdc39b4871de..b1877bdcf98cd129136c0288388b60ef0836bb03 100644 --- a/pkgs/tools/misc/grub/2.0x.nix +++ b/pkgs/tools/misc/grub/2.0x.nix @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/grub/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; platforms = if EFIsupport then [ "i686-linux" "x86_64-linux" ] diff --git a/pkgs/tools/misc/gsmartcontrol/default.nix b/pkgs/tools/misc/gsmartcontrol/default.nix index a937e96eed554055f8a61de13e9a692fe7d51cae..5f21559d471557429d005b1c2bae0d7c40f9c6eb 100644 --- a/pkgs/tools/misc/gsmartcontrol/default.nix +++ b/pkgs/tools/misc/gsmartcontrol/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { as well as run various tests on it. ''; homepage = http://gsmartcontrol.sourceforge.net/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [qknight]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/misc/hddtemp/default.nix b/pkgs/tools/misc/hddtemp/default.nix index f3c5dd02c7e5ab60d222652a242f4b290f5c602d..835ceb32881e4e071d905d67cc7ac69ce6e86f3a 100644 --- a/pkgs/tools/misc/hddtemp/default.nix +++ b/pkgs/tools/misc/hddtemp/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation { meta = { description = "Tool for displaying hard disk temperature"; homepage = https://savannah.nongnu.org/projects/hddtemp/; - license = "GPL2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/tools/misc/heimdall/default.nix b/pkgs/tools/misc/heimdall/default.nix index ab6102cf23c5c216d34d8159ab95a4ab8d0467de..227fba3d377eb6f25a3b6f40ec3b9978f9265a33 100644 --- a/pkgs/tools/misc/heimdall/default.nix +++ b/pkgs/tools/misc/heimdall/default.nix @@ -52,6 +52,6 @@ stdenv.mkDerivation { meta = { homepage = http://www.glassechidna.com.au/products/heimdall/; description = "A cross-platform open-source tool suite used to flash firmware onto Samsung Galaxy S devices"; - license = "bsd"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/tools/misc/idutils/default.nix b/pkgs/tools/misc/idutils/default.nix index e01a28ab1850f9168da3f6cd281cd4b40231c841..2b2f3aeaca3c9bc22f9a60d3e36e72c55c29bb84 100644 --- a/pkgs/tools/misc/idutils/default.nix +++ b/pkgs/tools/misc/idutils/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.gnu.org/software/idutils/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/tools/misc/jdiskreport/default.nix b/pkgs/tools/misc/jdiskreport/default.nix index fe9c46dac64f8320341df6f4b5f0c4e3e4ee9f26..2fa7122393143b33ce4214ce3e5a593aa4e2e050 100644 --- a/pkgs/tools/misc/jdiskreport/default.nix +++ b/pkgs/tools/misc/jdiskreport/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.jgoodies.com/freeware/jdiskreport/; description = "A graphical utility to visualize disk usage"; - license = "unfree-redistributable"; + license = "unfree-redistributable"; #TODO freedist, libs under BSD-3 }; } diff --git a/pkgs/tools/misc/kalibrate-rtl/default.nix b/pkgs/tools/misc/kalibrate-rtl/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..19870b8de5b8ae78fae48e6661248796ba02a452 --- /dev/null +++ b/pkgs/tools/misc/kalibrate-rtl/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchgit, autoreconfHook, pkgconfig, fftw, rtl-sdr, libusb1 }: + +stdenv.mkDerivation rec { + name = "kalibrate-rtl-20131214"; + + # There are no tags/releases, so use the latest commit from git master. + # Currently, the latest commit is from 2013-12-14. + src = fetchgit { + url = "https://github.com/steve-m/kalibrate-rtl.git"; + rev = "aae11c8a8dc79692a94ccfee39ba01e8c8c05d38"; + sha256 = "1spbfflkqnw9s8317ppsf7b1nnkicqsmaqsnz1zf8i49ix70i6kn"; + }; + + buildInputs = [ autoreconfHook pkgconfig fftw rtl-sdr libusb1 ]; + + meta = with stdenv.lib; { + description = "Calculate local oscillator frequency offset in RTL-SDR devices"; + longDescription = '' + Kalibrate, or kal, can scan for GSM base stations in a given frequency + band and can use those GSM base stations to calculate the local + oscillator frequency offset. + + This package is for RTL-SDR devices. + ''; + homepage = https://github.com/steve-m/kalibrate-rtl; + license = licenses.bsd2; + platforms = platforms.linux; + maintainers = [ maintainers.bjornfor ]; + }; +} diff --git a/pkgs/tools/misc/kermit/default.nix b/pkgs/tools/misc/kermit/default.nix index db2d6cffc40893265c72194978f499ae23920f06..ee521f04700604a68b32b3e2c1d66149d0b22888 100644 --- a/pkgs/tools/misc/kermit/default.nix +++ b/pkgs/tools/misc/kermit/default.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation { meta = { homepage = "http://www.columbia.edu/kermit/ck80.html"; description = "Portable Scriptable Network and Serial Communication Software"; - license = "free"; + license = "free non-commercial"; #Kermit http://www.columbia.edu/kermit/ckfaq.html#license }; } diff --git a/pkgs/tools/misc/keychain/default.nix b/pkgs/tools/misc/keychain/default.nix index 2c2a547f2fdc5ce44acd4bfbc4e765119996d435..2eb63f09216fe4bf49d1e464adf4bf655391f85a 100644 --- a/pkgs/tools/misc/keychain/default.nix +++ b/pkgs/tools/misc/keychain/default.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation { meta = { description = "Keychain management tool"; homepage = "http://www.gentoo.org/proj/en/keychain/"; - license = "GPL2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/tools/misc/lockfile-progs/default.nix b/pkgs/tools/misc/lockfile-progs/default.nix index 15c6258e86fd6716eee7346fa853ada25e0437ca..308b5217a6fc0f8fd87e1b6f64033e76b27c6cc7 100644 --- a/pkgs/tools/misc/lockfile-progs/default.nix +++ b/pkgs/tools/misc/lockfile-progs/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { description = "Programs for locking and unlocking files and mailboxes"; homepage = http://packages.debian.org/sid/lockfile-progs; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.bluescreen303 ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/tools/misc/logstash/default.nix b/pkgs/tools/misc/logstash/default.nix index a613dad3ec9f4484a5ffe6056d9cd74ceb728606..7f43ccdb6258f659929f7099373fec41d93ed882 100644 --- a/pkgs/tools/misc/logstash/default.nix +++ b/pkgs/tools/misc/logstash/default.nix @@ -1,11 +1,38 @@ -{ fetchurl }: +{ stdenv, fetchurl }: -let version = "1.3.3"; in +stdenv.mkDerivation rec { + version = "1.4.2"; + name = "logstash-${version}"; -fetchurl { - url = "https://download.elasticsearch.org/logstash/logstash/logstash-${version}-flatjar.jar"; + src = fetchurl { + url = "https://download.elasticsearch.org/logstash/logstash/logstash-${version}.tar.gz"; + sha256 = "0sc0bwyf96fzs5h3d7ii65v9vvpfbm7w67vk1im9djnlz0d1ggnm"; + }; - name = "logstash-${version}-flatjar.jar"; + dontBuild = true; + dontPatchELF = true; + dontStrip = true; + dontPatchShebangs = true; - sha256 = "a83503bd2aa32e1554b98f812d0b411fbc5f7b6b21cebb48b7d344474f2dfc6d"; + installPhase = '' + mkdir -p $out/bin + mkdir -p $out/vendor + mkdir -p $out/lib + mkdir -p $out/locales + mkdir -p $out/patterns + cp -a bin $out + cp -a vendor $out + cp -a lib $out + cp -a locales $out + cp -a patterns $out + patchShebangs $out/bin + ''; + + meta = { + description = "Open Source, Distributed, RESTful Search Engine"; + homepage = http://www.elasticsearch.org; + license = stdenv.lib.licenses.asl20; + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.wjlroe ]; + }; } diff --git a/pkgs/tools/misc/lrzsz/default.nix b/pkgs/tools/misc/lrzsz/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..729faa7a95d9ac65285f9f61380403bf79e36e9f --- /dev/null +++ b/pkgs/tools/misc/lrzsz/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "lrzsz-0.12.20"; + + src = fetchurl { + url = "https://ohse.de/uwe/releases/${name}.tar.gz"; + sha256 = "1wcgfa9fsigf1gri74gq0pa7pyajk12m4z69x7ci9c6x9fqkd2y2"; + }; + + configureFlags = [ "--program-transform-name=s/^l//" ]; + + meta = with stdenv.lib; { + homepage = https://ohse.de/uwe/software/lrzsz.html; + description = "Communication package providing the XMODEM, YMODEM ZMODEM file transfer protocols"; + license = licenses.gpl2; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/misc/mc/default.nix b/pkgs/tools/misc/mc/default.nix index 594947ba13d5dc82bd0656d36e61f979d133c2be..94c08fa9ba9b8f202c15f17ef4ac7cc94d5d0ce0 100644 --- a/pkgs/tools/misc/mc/default.nix +++ b/pkgs/tools/misc/mc/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { description = "File Manager and User Shell for the GNU Project"; homepage = http://www.midnight-commander.org; repositories.git = git://github.com/MidnightCommander/mc.git; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.sander ]; }; } diff --git a/pkgs/tools/misc/mcrypt/default.nix b/pkgs/tools/misc/mcrypt/default.nix index 761b2c5bdbfbd35bb8d1737670191e0594b19b3e..ffd8966a80eb349412a25c8dcdaa33a7910b83bc 100644 --- a/pkgs/tools/misc/mcrypt/default.nix +++ b/pkgs/tools/misc/mcrypt/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ever-wider range of algorithms and modes. ''; homepage = http://mcrypt.sourceforge.net; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.qknight ]; }; diff --git a/pkgs/tools/misc/megacli/default.nix b/pkgs/tools/misc/megacli/default.nix index 2b15d4470c36b3ca1bc29e28d8412343842f52a8..7fd6ce966d6df495b938463c59efe45c8a0c17b9 100644 --- a/pkgs/tools/misc/megacli/default.nix +++ b/pkgs/tools/misc/megacli/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { [ stdenv.gcc.gcc stdenv.gcc.libc ncurses ]; buildCommand = '' - ensureDir $out/bin + mkdir -p $out/bin cd $out unzip ${src} rpm2cpio linux/MegaCli-8.07.07-1.noarch.rpm | cpio -idmv @@ -30,6 +30,6 @@ stdenv.mkDerivation rec { meta = { description = "CLI program for LSI MegaRAID cards, which also works with some Dell PERC RAID cards"; - license = "unfree"; + license = stdenv.lib.licenses.unfree; }; } diff --git a/pkgs/tools/misc/mktorrent/default.nix b/pkgs/tools/misc/mktorrent/default.nix index f177e9e84c2830a0fa27ef34cabf9e8dcdc0e9fd..3200c7016b662bdc35b186a4ba5a9f038e734b20 100644 --- a/pkgs/tools/misc/mktorrent/default.nix +++ b/pkgs/tools/misc/mktorrent/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = { homepage = http://mktorrent.sourceforge.net/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; description = "Command line utility to create BitTorrent metainfo files"; platforms = with stdenv.lib.platforms; linux; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/pkgs/tools/misc/most/default.nix b/pkgs/tools/misc/most/default.nix index 941d805a6ffb269bc0b98591a4cf9e3cecabca4b..b7f7842680f6a6d288868de8efa914401935abc4 100644 --- a/pkgs/tools/misc/most/default.nix +++ b/pkgs/tools/misc/most/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { windows and can scroll left and right. Why settle for less? ''; homepage = http://www.jedsoft.org/most/index.html; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.gnu; # random choice }; } diff --git a/pkgs/tools/misc/mssys/default.nix b/pkgs/tools/misc/mssys/default.nix index a9d32205ceab01d120d388795578004cdc122fa1..6d3634ea7af9a72b3eacf49e2d03100e93b29d23 100644 --- a/pkgs/tools/misc/mssys/default.nix +++ b/pkgs/tools/misc/mssys/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = { homepage = http://ms-sys.sourceforge.net/; - license = "GPL"; + license = stdenv.lib.licenses.gpl2; description = "A program for writing Microsoft compatible boot records"; }; } diff --git a/pkgs/tools/misc/multitail/default.nix b/pkgs/tools/misc/multitail/default.nix index 96d3764abd46ea045805011a8e32c61c0a16679e..f3f90143bda98b8776c4a776cd0107d8ce663cf7 100644 --- a/pkgs/tools/misc/multitail/default.nix +++ b/pkgs/tools/misc/multitail/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ncurses }: -stdenv.mkDerivation { - name = "multitail-5.2.13"; +stdenv.mkDerivation rec { + name = "multitail-6.2.1"; src = fetchurl { - url = http://www.vanheusden.com/multitail/multitail-5.2.13.tgz; - sha256 = "1axgbdm1xkg570j0p150492x7p3mf11shwvn6dz8g4rha7cak4l6"; + url = "http://www.vanheusden.com/multitail/${name}.tgz"; + sha256 = "049fv5cyl5f7vcc8n2q3z3i5k0sqv2k715ic0s4q1nrw5kb6qn0y"; }; buildInputs = [ ncurses ]; @@ -13,7 +13,7 @@ stdenv.mkDerivation { makeFlags = stdenv.lib.optionalString stdenv.isDarwin "-f makefile.macosx"; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin cp multitail $out/bin ''; diff --git a/pkgs/tools/misc/mysql2pgsql/default.nix b/pkgs/tools/misc/mysql2pgsql/default.nix index 5d93ef44b36b2cc659b6ea997c5fadb7dbda65b2..0dad6c2d33f3508a6cf75f20b4f9facc4d906dd0 100644 --- a/pkgs/tools/misc/mysql2pgsql/default.nix +++ b/pkgs/tools/misc/mysql2pgsql/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation { meta = { description = "converts mysql dump files to psql loadable files "; homepage = http://pgfoundry.org/projects/mysql2pgsql/; - license = "GPL"; + license = "BSD-Original"; }; } diff --git a/pkgs/tools/misc/openopc/default.nix b/pkgs/tools/misc/openopc/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..2fce3807ca7ed3b61b6092bcda89e90b48923511 --- /dev/null +++ b/pkgs/tools/misc/openopc/default.nix @@ -0,0 +1,46 @@ +{ stdenv, fetchurl, pythonFull }: + +stdenv.mkDerivation rec { + name = "openopc-${version}"; + version = "1.2.0"; + + src = fetchurl { + url = "mirror://sourceforge/project/openopc/openopc/${version}/OpenOPC-${version}.source.tar.bz2"; + sha256 = "0mm77fiipz5zy82l6pr3wk18bfril81milv2rdxr954c4gw5smyd"; + }; + + # There is no setup.py or any other "build system" file in the source archive. + installPhase = '' + mkdir -p "$out/bin" + mkdir -p "$out/share/doc/openopc" + mkdir -p "$out/${pythonFull.python.sitePackages}" + mkdir -p "$out/libexec/opc" + + cp src/OpenOPC.py "$out/${pythonFull.python.sitePackages}" + cp src/opc.py "$out/libexec/opc/" + + cat > "$out/bin/opc" << __EOF__ + #!${stdenv.shell} + export PYTHONPATH="$out/${pythonFull.python.sitePackages}" + exec ${pythonFull}/bin/${pythonFull.python.executable} "$out/libexec/opc/opc.py" "\$@" + __EOF__ + chmod a+x "$out/bin/opc" + + cp -R *.txt doc/* "$out/share/doc/openopc/" + + # Copy these MS Windows tools, for reference. + cp src/OpenOPCService.py src/SystemHealth.py "$out/libexec/opc/" + ''; + + meta = with stdenv.lib; { + description = "OPC (OLE for Process Control) toolkit designed for use with Python"; + homepage = http://openopc.sourceforge.net/; + # """OpenOPC for Python is freely available under the terms of the GNU GPL. + # However, the OpenOPC library module is licensed under the "GPL + linking + # exception" license, which generally means that programs written using the + # OpenOPC library may be licensed under any terms.""" + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = [ maintainers.bjornfor ]; + }; +} diff --git a/pkgs/tools/misc/pal/default.nix b/pkgs/tools/misc/pal/default.nix index fbc6d6076500235d2221064412945179c0c37d43..2a081b882ab854d8ce6a35a6889b06342443b3fa 100644 --- a/pkgs/tools/misc/pal/default.nix +++ b/pkgs/tools/misc/pal/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://palcal.sourceforge.net/; description = "Command-line calendar program that can keep track of events"; - license = "BSD"; + license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index fa6f147efe490411831ac29a5c4b045e03c83e63..df360bb9804d41344d2fa5ee3b6b013a1702c37a 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/parallel/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.all; maintainers = [ ]; diff --git a/pkgs/tools/misc/parcellite/default.nix b/pkgs/tools/misc/parcellite/default.nix index 54697f98414aa4dbb90c6760b8bfa504fc34f88e..d516e50124c860cc0fa09fead48c37067ef68d38 100644 --- a/pkgs/tools/misc/parcellite/default.nix +++ b/pkgs/tools/misc/parcellite/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "Lightweight GTK+ clipboard manager"; homepage = "http://parcellite.sourceforge.net"; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ iyzsong ]; }; diff --git a/pkgs/tools/misc/parted/default.nix b/pkgs/tools/misc/parted/default.nix index 1d0c4f2a9e74b566e490dea64c7c0da23e2a6242..108d4d5e0400cb9ac931a1c1c3a1c43bf65482df 100644 --- a/pkgs/tools/misc/parted/default.nix +++ b/pkgs/tools/misc/parted/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.gnu.org/software/parted/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ # Add your name here! diff --git a/pkgs/tools/misc/partition-manager/default.nix b/pkgs/tools/misc/partition-manager/default.nix index 19a0df2616958a18fede7bc1c20fb6861c16e59f..156f03dad876f5dc25389d93d0437424c21740e3 100644 --- a/pkgs/tools/misc/partition-manager/default.nix +++ b/pkgs/tools/misc/partition-manager/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = { description = "Utility program to help you manage the disk devices"; homepage = http://www.kde-apps.org/content/show.php/KDE+Partition+Manager?content=89595; # ? - license = "GPL"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/misc/picocom/default.nix b/pkgs/tools/misc/picocom/default.nix index bb08091ad57a7f24f0149da8b1218dc95a737f90..303fdb3dbe07c1bbb77aa5a02c3e30117747aae4 100644 --- a/pkgs/tools/misc/picocom/default.nix +++ b/pkgs/tools/misc/picocom/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, makeWrapper, lrzsz }: stdenv.mkDerivation rec { name = "picocom-1.7"; @@ -8,16 +8,21 @@ stdenv.mkDerivation rec { sha256 = "17hjq713naq02xar711aw24qqd52p591mj1h5n97cni1ga7irwyh"; }; + buildInputs = [ makeWrapper ]; + installPhase = '' - ensureDir $out/bin $out/share/man/man8 + mkdir -p $out/bin $out/share/man/man8 cp picocom $out/bin cp picocom.8 $out/share/man/man8 + + wrapProgram $out/bin/picocom \ + --prefix PATH ":" "${lrzsz}/bin" ''; meta = { description = "Minimal dumb-terminal emulation program"; homepage = http://code.google.com/p/picocom/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.gnu; # arbitrary choice }; } diff --git a/pkgs/tools/misc/pk2cmd/default.nix b/pkgs/tools/misc/pk2cmd/default.nix index 37636da72350642d7e90534f791ef49761eb0cb5..909ed0856bb925f3664f0b2d3257e1add0dad760 100644 --- a/pkgs/tools/misc/pk2cmd/default.nix +++ b/pkgs/tools/misc/pk2cmd/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = { homepage = http://www.microchip.com/pickit2; - license = "nonfree"; + license = "nonfree"; #MicroChip-PK2 description = "Microchip PIC programming software for the PICKit2 programmer"; }; } diff --git a/pkgs/tools/misc/ponysay/default.nix b/pkgs/tools/misc/ponysay/default.nix index 1da0d70a14fac7cc1dc784e91b3dfaab03332d5c..031264f1edd06c24ff2ff78dd5e23f9ec2094696 100644 --- a/pkgs/tools/misc/ponysay/default.nix +++ b/pkgs/tools/misc/ponysay/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = { description = "Cowsay reimplemention for ponies"; homepage = http://terse.tk/ponysay/; - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [ bodil ]; }; } diff --git a/pkgs/tools/misc/proxytunnel/default.nix b/pkgs/tools/misc/proxytunnel/default.nix index f5be7b8a46d84b0ac2d05d25b5a128c0f8f798ac..993a36ea9092a59543b408814691cf6bb55c584f 100644 --- a/pkgs/tools/misc/proxytunnel/default.nix +++ b/pkgs/tools/misc/proxytunnel/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation { meta = { description = "program that connects stdin and stdout to a server somewhere on the network, through a standard HTTPS proxy"; homepage = http://proxytunnel.sourceforge.net/download.php; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/tools/misc/pv/default.nix b/pkgs/tools/misc/pv/default.nix index d99fc1960ddd69ee11f79f166687da60969ab321..a8b6e046a9b2b0d88fcc6c47f375d10dd09bc1e9 100644 --- a/pkgs/tools/misc/pv/default.nix +++ b/pkgs/tools/misc/pv/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.ivarch.com/programs/pv; description = "Tool for monitoring the progress of data through a pipeline"; - license = "free"; + license = "Artistic-2"; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; all; }; diff --git a/pkgs/tools/misc/recutils/default.nix b/pkgs/tools/misc/recutils/default.nix index e798ee669e2f0dd0a18bdc2082dc3bffe241153e..f2f5f37ebe44c033b91a0b958700ca24a465c57e 100644 --- a/pkgs/tools/misc/recutils/default.nix +++ b/pkgs/tools/misc/recutils/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/recutils/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.all; maintainers = [ ]; diff --git a/pkgs/tools/misc/remind/default.nix b/pkgs/tools/misc/remind/default.nix index b679218db79b7b3ec65cefe14714f69eb16b8cd4..fe0f3d646b86432230f7fb00fa6fc9efa172e3b2 100644 --- a/pkgs/tools/misc/remind/default.nix +++ b/pkgs/tools/misc/remind/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { meta = { homepage = http://www.roaringpenguin.com/products/remind; description = "Sophisticated calendar and alarm program for the console"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/misc/riemann-c-client/default.nix b/pkgs/tools/misc/riemann-c-client/default.nix index d3f18b1353c389fb54c7e4a91e8ed2e7b8ce63d2..00eaa8aad76077da3cc997016073956cb6855a56 100644 --- a/pkgs/tools/misc/riemann-c-client/default.nix +++ b/pkgs/tools/misc/riemann-c-client/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "riemann-c-client-${version}"; - version = "1.1.1"; + version = "1.2.0"; src = fetchurl { url = "https://github.com/algernon/riemann-c-client/archive/${name}.tar.gz"; - sha256 = "10nz20svf1nb6kymwp0x49nvwnxakby33r6jsadish1fjcvzki88"; + sha256 = "1w3rx0hva605d5vzlhhm4pb43ady0m3s4mz8ix1ycn4b8cq9jsjs"; }; buildInputs = [ autoconf automake libtool pkgconfig file protobufc ]; diff --git a/pkgs/tools/misc/rkflashtool/default.nix b/pkgs/tools/misc/rkflashtool/default.nix index c985183c1c00e8adb1ee67d641bb952436e3dbe7..6b74f9ac5d3417ca83baa947abf8a247a4f16d17 100644 --- a/pkgs/tools/misc/rkflashtool/default.nix +++ b/pkgs/tools/misc/rkflashtool/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin cp rkunpack rkcrc rkflashtool $out/bin ''; diff --git a/pkgs/tools/misc/rrdtool/default.nix b/pkgs/tools/misc/rrdtool/default.nix index 5270ddad35e70ea9f3db7344fe414b35b55d5ab4..aa14087dfc85564722617b5cd38a9e9556c045c5 100644 --- a/pkgs/tools/misc/rrdtool/default.nix +++ b/pkgs/tools/misc/rrdtool/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { meta = { homepage = http://oss.oetiker.ch/rrdtool/; description = "High performance logging in Round Robin Databases"; - license = "GPL"; - platforms = stdenv.lib.platforms.all; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/misc/sl/default.nix b/pkgs/tools/misc/sl/default.nix index 14cc6c4260f7d12b040f864eb521c6bfa01a0a19..a2dab4e0eb8029e9697f70413029a90637d81dfe 100644 --- a/pkgs/tools/misc/sl/default.nix +++ b/pkgs/tools/misc/sl/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation { buildInputs = [ ncurses ]; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin cp sl $out/bin ''; meta = { homepage = http://www.tkl.iis.u-tokyo.ac.jp/~toyoda/index_e.html; - license = "unfree"; # I couldn't find its license, only a copyright. + license = stdenv.lib.licenses.unfree; # I couldn't find its license, only a copyright. description = "Steam Locomotive runs across your terminal when you type 'sl'"; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/misc/slsnif/default.nix b/pkgs/tools/misc/slsnif/default.nix index c861fc6f73a3f6ae16343d9a459df11add5f8b7c..f3c1c278c76797309c37fb84be29795538006d3f 100644 --- a/pkgs/tools/misc/slsnif/default.nix +++ b/pkgs/tools/misc/slsnif/default.nix @@ -11,6 +11,6 @@ stdenv.mkDerivation { meta = { description = "Serial line sniffer"; homepage = http://slsnif.sourceforge.net/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/tools/misc/stow/default.nix b/pkgs/tools/misc/stow/default.nix index 58f30a021fa3e97a0c9182f5632c06eda84a9db5..a6afe475e3bd1ff3aeb2f376c0022552b1171a14 100644 --- a/pkgs/tools/misc/stow/default.nix +++ b/pkgs/tools/misc/stow/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { as .../share, .../man, and so on. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; homepage = http://www.gnu.org/software/stow/; maintainers = with stdenv.lib.maintainers; [ the-kenny ]; diff --git a/pkgs/tools/misc/sutils/default.nix b/pkgs/tools/misc/sutils/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..6d2bee23813005deb4a6475b78cd7bda703d31d2 --- /dev/null +++ b/pkgs/tools/misc/sutils/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "sutils-0.1"; + + src = fetchurl { + url = "https://github.com/baskerville/sutils/archive/0.1.tar.gz"; + sha256 = "0xqk42vl82chy458d64fj68a4md4bxaip8n3xw9skxz0a1sgvks8"; + }; + + prePatch = ''sed -i "s@/usr/local@$out@" Makefile''; + + meta = { + description = "Small command-line utilities."; + homepage = "https://github.com/baskerville/sutils"; + maintainers = stdenv.lib.maintainers.meisternu; + license = "Custom"; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/tools/misc/t1utils/default.nix b/pkgs/tools/misc/t1utils/default.nix index 607674051549566458056b3045cc4c197923810d..5e473a5cd09312fc6fb1b5bb51ec66d6df400bf3 100644 --- a/pkgs/tools/misc/t1utils/default.nix +++ b/pkgs/tools/misc/t1utils/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { homepage = http://www.lcdf.org/type/; # README from tarball says "BSD-like" and points to non-existing LICENSE # file... - license = "BSD-like"; + license = "Click"; # MIT with extra clause, https://github.com/kohler/t1utils/blob/master/LICENSE platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; }; diff --git a/pkgs/tools/misc/testdisk/default.nix b/pkgs/tools/misc/testdisk/default.nix index 73ac04dd34ec6e471e29e3e2587af1564068c9f8..fd237ac15f4acfb932a7180fbba61da213885803 100644 --- a/pkgs/tools/misc/testdisk/default.nix +++ b/pkgs/tools/misc/testdisk/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { meta = { homepage = http://www.cgsecurity.org/wiki/TestDisk; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.eelco ]; longDescription = '' diff --git a/pkgs/tools/misc/time/default.nix b/pkgs/tools/misc/time/default.nix index 05ab7cc7ae70b0329ebcf71e5e02c535c9df0e0e..3a35e9a9f1cc68a3633d7aa9ff8b793ac47a5779 100644 --- a/pkgs/tools/misc/time/default.nix +++ b/pkgs/tools/misc/time/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { `time' reports unavailable information as zero values. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://www.gnu.org/software/time/; }; } diff --git a/pkgs/tools/misc/timidity/default.nix b/pkgs/tools/misc/timidity/default.nix index 89ff6f4677fcac6c650f7cbf5e6e83caaca68f17..afe75c572c0235b9fafa583daadb09f1c7bfc3a9 100644 --- a/pkgs/tools/misc/timidity/default.nix +++ b/pkgs/tools/misc/timidity/default.nix @@ -1,4 +1,4 @@ -{ composableDerivation, stdenv, fetchurl, alsaLib, jackaudio, ncurses }: +{ composableDerivation, stdenv, fetchurl, alsaLib, jack2, ncurses }: let inherit (composableDerivation) edf; in @@ -30,8 +30,8 @@ composableDerivation.composableDerivation {} { }; jack = { audioModes = "jack"; - buildInputs = [jackaudio]; - NIX_LDFLAGS = ["-ljack -L${jackaudio}/lib64"]; + buildInputs = [jack2]; + NIX_LDFLAGS = ["-ljack -L${jack2}/lib64"]; }; } // edf { name = "ncurses"; enable = { buildInputs = [ncurses]; };}; diff --git a/pkgs/tools/misc/tmux/default.nix b/pkgs/tools/misc/tmux/default.nix index 10e22c3aad03d8ab0be2c19d002149ffc7bc6185..5b656cc13e72044aaf06498d3ad86c965e6f5c42 100644 --- a/pkgs/tools/misc/tmux/default.nix +++ b/pkgs/tools/misc/tmux/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "tmux"; - version = "1.9"; + version = "1.9a"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://sourceforge/${pname}/${name}.tar.gz"; - sha256 = "09qykbcyvsspg6bfsdx2lp9b32dbybwn5k6kx4baib0k6l4wmriy"; + sha256 = "1x9k4wfd4l5jg6fh7xkr3yyilizha6ka8m5b1nr0kw8wj0mv5qy5"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/misc/uucp/default.nix b/pkgs/tools/misc/uucp/default.nix index f8ad1fd4d15ec8a505d96f82dc5093136ca4ce5a..bf73dbcbf2fcaad49e45f34a65123f38ccd60cf4 100644 --- a/pkgs/tools/misc/uucp/default.nix +++ b/pkgs/tools/misc/uucp/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/uucp/uucp.html; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.all; maintainers = [ ]; diff --git a/pkgs/tools/misc/wv2/default.nix b/pkgs/tools/misc/wv2/default.nix index a3938c1af4c46c529fd46914ea8b305a5f8f7089..1c2c94ff89caceba49d9a6df4b0cb511e93f807d 100644 --- a/pkgs/tools/misc/wv2/default.nix +++ b/pkgs/tools/misc/wv2/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "Excellent MS Word filter lib, used in most Office suites"; - license = "LGPLv2"; + license = stdenv.lib.licenses.lgpl2; homepage = http://wvware.sourceforge.net; }; } diff --git a/pkgs/tools/misc/xburst-tools/default.nix b/pkgs/tools/misc/xburst-tools/default.nix index cc9f98a94f60f3fdfe27c2bd06a53cd1b4cf8391..93a2707d1e984cbd943b3c3fb6c166ec030f42a0 100644 --- a/pkgs/tools/misc/xburst-tools/default.nix +++ b/pkgs/tools/misc/xburst-tools/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { meta = { description = "Qi tools to access the Ben Nanonote USB_BOOT mode"; - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3; homepage = http://www.linux-mtd.infradead.org/; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/tools/misc/xclip/default.nix b/pkgs/tools/misc/xclip/default.nix index 1014f11453b9e6c4700e63411b25358faf838572..4afcc0ac36dfbe9cdb69470fe47778fe9659b4ca 100644 --- a/pkgs/tools/misc/xclip/default.nix +++ b/pkgs/tools/misc/xclip/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = { description = "Tool to access the X clipboard from a console application"; - homepage = http://people.debian.org/~kims/xclip/; - license = "GPL-2"; + homepage = http://sourceforge.net/projects/xclip/; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/tools/misc/xdaliclock/default.nix b/pkgs/tools/misc/xdaliclock/default.nix index f6d6a2bacfa758113510bb1aafbfe68059f5a98c..79c6a743bce4ca4084aa0a6cb682bd8808b735a1 100644 --- a/pkgs/tools/misc/xdaliclock/default.nix +++ b/pkgs/tools/misc/xdaliclock/default.nix @@ -45,7 +45,7 @@ rec { ]; platforms = with a.lib.platforms; linux ++ freebsd; - license = "free"; + license = "free"; #TODO BSD on Gentoo, looks like MIT }; passthru = { updateInfo = { @@ -53,4 +53,3 @@ rec { }; }; }) x - diff --git a/pkgs/tools/misc/xdo/default.nix b/pkgs/tools/misc/xdo/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..9a059c9dbb5a72754aab2b9f926a4760a1075efc --- /dev/null +++ b/pkgs/tools/misc/xdo/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, libxcb, xcbutilwm }: + +stdenv.mkDerivation rec { + name = "xdo-0.3"; + + src = fetchurl { + url = "https://github.com/baskerville/xdo/archive/0.3.tar.gz"; + sha256 = "128flaydag9ixsai87p85r84arg2pn1j9h3zgdjwlmbcpb8d4ia8"; + }; + + prePatch = ''sed -i "s@/usr/local@$out@" Makefile''; + + buildInputs = [ libxcb xcbutilwm ]; + + meta = { + description = "Small X utility to perform elementary actions on windows"; + homepage = "https://github.com/baskerville/xdo"; + maintainers = stdenv.lib.maintainers.meisternu; + license = "Custom"; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/tools/misc/xdummy/default.nix b/pkgs/tools/misc/xdummy/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..30aba19930c70e00cfca2a1f87884866f01c8aa0 --- /dev/null +++ b/pkgs/tools/misc/xdummy/default.nix @@ -0,0 +1,83 @@ +{ stdenv, writeText, writeScriptBin, xorg, xkeyboard_config }: + +let + xorgConfig = writeText "dummy-xorg.conf" '' + Section "ServerLayout" + Identifier "dummy_layout" + Screen 0 "dummy_screen" + InputDevice "dummy_keyboard" "CoreKeyboard" + InputDevice "dummy_mouse" "CorePointer" + EndSection + + Section "ServerFlags" + Option "DontVTSwitch" "true" + Option "AllowMouseOpenFail" "true" + Option "PciForceNone" "true" + Option "AutoEnableDevices" "false" + Option "AutoAddDevices" "false" + EndSection + + Section "Files" + ModulePath "${xorg.xorgserver}/lib/xorg/modules" + ModulePath "${xorg.xf86videodummy}/lib/xorg/modules" + XkbDir "${xkeyboard_config}/share/X11/xkb" + FontPath "${xorg.fontadobe75dpi}/lib/X11/fonts/75dpi" + FontPath "${xorg.fontadobe100dpi}/lib/X11/fonts/100dpi" + FontPath "${xorg.fontbhlucidatypewriter75dpi}/lib/X11/fonts/75dpi" + FontPath "${xorg.fontbhlucidatypewriter100dpi}/lib/X11/fonts/100dpi" + FontPath "${xorg.fontbh100dpi}/lib/X11/fonts/100dpi" + FontPath "${xorg.fontmiscmisc}/lib/X11/fonts/misc" + FontPath "${xorg.fontcursormisc}/lib/X11/fonts/misc" + EndSection + + Section "Module" + Load "dbe" + Load "extmod" + Load "freetype" + Load "glx" + EndSection + + Section "InputDevice" + Identifier "dummy_mouse" + Driver "void" + EndSection + + Section "InputDevice" + Identifier "dummy_keyboard" + Driver "void" + EndSection + + Section "Monitor" + Identifier "dummy_monitor" + HorizSync 30.0 - 130.0 + VertRefresh 50.0 - 250.0 + Option "DPMS" + EndSection + + Section "Device" + Identifier "dummy_device" + Driver "dummy" + VideoRam 192000 + EndSection + + Section "Screen" + Identifier "dummy_screen" + Device "dummy_device" + Monitor "dummy_monitor" + DefaultDepth 24 + SubSection "Display" + Depth 24 + Modes "1280x1024" + EndSubSection + EndSection + ''; + +in writeScriptBin "xdummy" '' + #!${stdenv.shell} + export XKB_BINDIR="${xorg.xkbcomp}/bin" + exec ${xorg.xorgserver}/bin/Xorg \ + -noreset \ + -logfile /dev/null \ + "$@" \ + -config "${xorgConfig}" +'' diff --git a/pkgs/tools/misc/xtitle/default.nix b/pkgs/tools/misc/xtitle/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..ca8be4c08eac9ef349a09738ec27abcdd4a76d73 --- /dev/null +++ b/pkgs/tools/misc/xtitle/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, libxcb, xcbutil, xcbutilwm, git }: + +stdenv.mkDerivation rec { + name = "xtitle-0.2"; + + src = fetchurl { + url = "https://github.com/baskerville/xtitle/archive/0.2.tar.gz"; + sha256 = "1wyhfwbwqnq4rn6i789gydxlg25ylc37xjrkq758bp55sdgb8fk2"; + }; + + + buildInputs = [ libxcb git xcbutil xcbutilwm ]; + + prePatch = ''sed -i "s@/usr/local@$out@" Makefile''; + + meta = { + description = "Outputs X window titles"; + homepage = "https://github.com/baskerville/xtitle"; + maintainers = stdenv.lib.maintainers.meisternu; + license = "Custom"; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 1a99cb291c47bfcd91d41b5a3aa989e5d1f99f8b..e237e0b25eb931a05420ce7f355ee22dbed22b22 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, python, zip }: let - version = "2014.04.02"; + version = "2014.08.10"; in stdenv.mkDerivation rec { name = "youtube-dl-${version}"; src = fetchurl { url = "http://youtube-dl.org/downloads/${version}/${name}.tar.gz"; - sha256 = "1c9d5wjl0aaqfvz868wbkr3dwby9vjkx0hkbnwx0wnpg48nlnwpm"; + sha256 = "1afa710vw0midpbv9pjw1b6h0x8kmdnj5dpipacnwsv3mbw1y4x1"; }; buildInputs = [ python ]; diff --git a/pkgs/tools/networking/ahcpd/default.nix b/pkgs/tools/networking/ahcpd/default.nix index 635d94a3e864d39b4f34846e0d1efd99f0c4b564..df8677bfffaf3168d9932c3466d0eebd54f51a4c 100644 --- a/pkgs/tools/networking/ahcpd/default.nix +++ b/pkgs/tools/networking/ahcpd/default.nix @@ -16,6 +16,6 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.pps.univ-paris-diderot.fr/~jch/software/ahcp/"; description = "Autoconfiguration protocol for IPv6 and dual-stack IPv6/IPv4 networks"; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/tools/networking/aircrack-ng/default.nix b/pkgs/tools/networking/aircrack-ng/default.nix index 475d6775cde2c549a90da622f3729af861bf99cb..ce2ded24f8236921354a9fcf431ba83ca5966465 100644 --- a/pkgs/tools/networking/aircrack-ng/default.nix +++ b/pkgs/tools/networking/aircrack-ng/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Wireless encryption crackign tools"; homepage = http://www.aircrack-ng.org/; - license = "GPL2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ maintainers.iElectric maintainers.viric maintainers.garbas maintainers.chaoflow ]; platforms = platforms.linux; }; diff --git a/pkgs/tools/networking/atftp/default.nix b/pkgs/tools/networking/atftp/default.nix index 2136762e6e0df49ce54d78ab2fe9bf18c88a4850..225c3c04f7a4c6761646512e6fcb2a92b3a2590b 100644 --- a/pkgs/tools/networking/atftp/default.nix +++ b/pkgs/tools/networking/atftp/default.nix @@ -1,5 +1,5 @@ x@{builderDefsPackage - , readline, tcp_wrappers, pcre + , readline, tcp_wrappers, pcre, runCommand , ...}: builderDefsPackage (a : @@ -29,11 +29,15 @@ rec { /* doConfigure should be removed if not needed */ phaseNames = ["doPatch" "doConfigure" "doMakeInstall"]; - debianPatch = a.fetchurl { - url = http://patch-tracker.debian.org/patch/nondebian/dl/atftp/0.7.dfsg-10; - sha256 = "0vannjp0wxvk10xxlr3hirgf0g57n9dr4vhmsyfd8x4cwgxwfgsa"; + debianPatchGz = a.fetchurl { + url = ftp://ftp.ru.debian.org/pub/debian/pool/main/a/atftp/atftp_0.7.dfsg-11.diff.gz; + sha256 = "07g4qbmp0lnscg2dkj6nsj657jaghibvfysdm1cdxcn215n3zwqd"; }; + debianPatch = a.runCommand "atftp-0.7.dfsg-11" {} '' + gunzip < "${debianPatchGz}" > "$out" + ''; + patches = [debianPatch]; meta = { diff --git a/pkgs/tools/networking/babeld/default.nix b/pkgs/tools/networking/babeld/default.nix index 34bdd153f3ab02bc3f355c5193f81aadedaf4a9c..cfd72098261c3dbf1ad64f03825b6643c7e68a35 100644 --- a/pkgs/tools/networking/babeld/default.nix +++ b/pkgs/tools/networking/babeld/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.pps.univ-paris-diderot.fr/~jch/software/babel/"; description = "Loop-avoiding distance-vector routing protocol"; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/tools/networking/bud/default.nix b/pkgs/tools/networking/bud/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..34e1a3964f67be8b76a58d2fb6b705b5b5d64fb2 --- /dev/null +++ b/pkgs/tools/networking/bud/default.nix @@ -0,0 +1,34 @@ +{ stdenv, lib, fetchgit, python, gyp, utillinux }: + +stdenv.mkDerivation rec { + name = "bud-${version}"; + + version = "0.25.0"; + + src = fetchgit { + url = "https://github.com/indutny/bud.git"; + rev = "f65b9c3531dac1a5b3c962e01f3bed1d41ab5621"; + sha256 = "000wwc88hsf6ccz8wxjn2af6l0nxm6a2fcad71xw35ymmdp9n5xg"; + }; + + buildInputs = [ + python gyp + ] ++ lib.optional stdenv.isLinux utillinux; + + buildPhase = '' + python ./gyp_bud -f make + make -C out + ''; + + installPhase = '' + ensureDir $out/bin + cp out/Release/bud $out/bin + ''; + + meta = with lib; { + description = "A TLS terminating proxy"; + license = licenses.mit; + platforms = with platforms; linux; + maintainers = with maintainers; [ cstrahan ]; + }; +} diff --git a/pkgs/tools/networking/cadaver/default.nix b/pkgs/tools/networking/cadaver/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..a37bf2d0a56d102dfdf327091a2c4fe318983287 --- /dev/null +++ b/pkgs/tools/networking/cadaver/default.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "cadaver-0.23.3"; + + src = fetchurl { + url = "http://www.webdav.org/cadaver/${name}.tar.gz"; + sha256 = "1jizq69ifrjbjvz5y79wh1ny94gsdby4gdxwjad4bfih6a5fck7x"; + }; + + meta = with stdenv.lib; { + description = "A command-line WebDAV client for Unix"; + homepage = http://www.webdav.org/cadaver; + maintainers = with maintainers; [ ianwookim ]; + license = licenses.gpl2; + platforms = with platforms; linux ++ freebsd ++ openbsd; + }; +} diff --git a/pkgs/tools/networking/chrony/default.nix b/pkgs/tools/networking/chrony/default.nix index ac7055e20f2a00d1e7311225be215069a597779c..1e2b39869c54c859a290fd9fb8e75056fe7f5813 100644 --- a/pkgs/tools/networking/chrony/default.nix +++ b/pkgs/tools/networking/chrony/default.nix @@ -1,25 +1,31 @@ -{ stdenv, fetchurl, libcap, readline }: +{ stdenv, fetchurl, libcap, readline, texinfo }: assert stdenv.isLinux -> libcap != null; stdenv.mkDerivation rec { - name = "chrony-1.29.1"; + name = "chrony-${version}"; + + version = "1.30"; src = fetchurl { url = "http://download.tuxfamily.org/chrony/${name}.tar.gz"; - sha256 = "09xgcmh9yrprsazsrm3bm0xl3y75csi9lhh815yyrn68v2s9p335"; + sha256 = "1pa6629nigcv95x2q9dnmzlrwhicxizq9z7ggy2c9cmyl1bakb23"; }; - buildInputs = [ readline ] ++ stdenv.lib.optional stdenv.isLinux libcap; + buildInputs = [ readline texinfo ] ++ stdenv.lib.optional stdenv.isLinux libcap; - configureFlags = [ "--sysconfdir=\$(out)/etc" "--chronyvardir=\$(out)/var/lib/chrony" ]; + 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/; repository.git = git://git.tuxfamily.org/gitroot/chrony/chrony.git; license = licenses.gpl2; - platforms = platforms.unix; + platforms = with platforms; linux ++ freebsd ++ openbsd; + maintainers = [ maintainers.rickynils ]; longDescription = '' Chronyd is a daemon which runs in background on the system. It obtains measurements via the network of the system clock’s offset relative to time servers on other systems and adjusts the system time accordingly. For isolated systems, the user can periodically enter the correct time by hand (using Chronyc). In either case, Chronyd determines the rate at which the computer gains or loses time, and compensates for this. Chronyd implements the NTP protocol and can act as either a client or a server. diff --git a/pkgs/tools/networking/connect/default.nix b/pkgs/tools/networking/connect/default.nix index c6291efad312335c5781e764ada6f359df86082f..8723c53c322935e9d2c819fd21171bd8da7bae2a 100644 --- a/pkgs/tools/networking/connect/default.nix +++ b/pkgs/tools/networking/connect/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { ''; buildPhase = '' - ensureDir $out/bin + mkdir -p $out/bin gcc -o $out/bin/connect connect.c ''; diff --git a/pkgs/tools/networking/dnsmasq/default.nix b/pkgs/tools/networking/dnsmasq/default.nix index d8f62913ad5059a60dfb7feb4df636453cbd8585..cec4057a284f4df7e09a3239c6b2f8661acafe7c 100644 --- a/pkgs/tools/networking/dnsmasq/default.nix +++ b/pkgs/tools/networking/dnsmasq/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "dnsmasq-2.69"; + name = "dnsmasq-2.71"; src = fetchurl { - url = "http://www.thekelleys.org.uk/dnsmasq/${name}.tar.gz"; - sha256 = "1zf4d6kjbsn6gwfwvmch1y84q67na1qhh0gyd50ip1vjsmw2l4i7"; + url = "http://www.thekelleys.org.uk/dnsmasq/${name}.tar.xz"; + sha256 = "1fpzpzja7qr8b4kfdhh4i4sijp62c634yf0xvq2n4p7d5xbzn6a9"; }; makeFlags = "DESTDIR= BINDIR=$(out)/bin MANDIR=$(out)/man LOCALEDIR=$(out)/share/locale"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { description = "An integrated DNS, DHCP and TFTP server for small networks"; homepage = http://www.thekelleys.org.uk/dnsmasq/doc.html; license = "GPL"; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; maintainers = [ stdenv.lib.maintainers.eelco ]; }; } diff --git a/pkgs/tools/networking/dropbear/default.nix b/pkgs/tools/networking/dropbear/default.nix index 00e747da7c7eac1ac2e3b7642e09d01c72222460..1f7c8a449f3d186be276d973926a660a5e4b524f 100644 --- a/pkgs/tools/networking/dropbear/default.nix +++ b/pkgs/tools/networking/dropbear/default.nix @@ -42,6 +42,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://matt.ucc.asn.au/dropbear/dropbear.html; description = "An small footprint implementation of the SSH 2 protocol"; - license = "mit"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/tools/networking/filegive/default.nix b/pkgs/tools/networking/filegive/default.nix index a47a0397bf5a6435392cfee2f75feb1c41ef77c0..d7d867cc8df5aae77ede9b37fd0be6643c8f4a17 100644 --- a/pkgs/tools/networking/filegive/default.nix +++ b/pkgs/tools/networking/filegive/default.nix @@ -35,14 +35,14 @@ stdenv.mkDerivation rec { ''; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin cp filegive $out/bin ''; meta = { homepage = http://viric.name/cgi-bin/filegive; description = "Easy p2p file sending program"; - license = "AGPLv3+"; + license = stdenv.lib.licenses.agpl3Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/networking/flvstreamer/default.nix b/pkgs/tools/networking/flvstreamer/default.nix index c9bc05658d03c4b46bd1ec98aa63bc9a293c15fa..f932212961256558c5f172c8283802a0d80c38ac 100644 --- a/pkgs/tools/networking/flvstreamer/default.nix +++ b/pkgs/tools/networking/flvstreamer/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { stream audio or video content from all types of flash or rtmp servers. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://savannah.nongnu.org/projects/flvstreamer; diff --git a/pkgs/tools/networking/gftp/default.nix b/pkgs/tools/networking/gftp/default.nix index e6b5cd9daabfb5370f7bc54503c22d983b528b41..e7aabcd9755414a7c0475300888489fcfb21fd29 100644 --- a/pkgs/tools/networking/gftp/default.nix +++ b/pkgs/tools/networking/gftp/default.nix @@ -13,6 +13,6 @@ stdenv.mkDerivation { meta = { description = "GTK+-based FTP client"; homepage = http://www.gftp.org; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/tools/networking/hyenae/default.nix b/pkgs/tools/networking/hyenae/default.nix index d0821a4f588131c5b76c8e6586d53202fe935ad3..557fce6d94b3d6d80d6a2590d70775fcb42a7775 100644 --- a/pkgs/tools/networking/hyenae/default.nix +++ b/pkgs/tools/networking/hyenae/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { meta = { description = ""; homepage = http://sourceforge.net/projects/hyenae/; - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3; maintainers = [stdenv.lib.maintainers.marcweber]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/tools/networking/imapproxy/default.nix b/pkgs/tools/networking/imapproxy/default.nix index 7af7f73aad925b46df62330d8b85243b554427b0..29f09b8cc1973e9becd3d8a5b8da62a82414fa83 100644 --- a/pkgs/tools/networking/imapproxy/default.nix +++ b/pkgs/tools/networking/imapproxy/default.nix @@ -16,6 +16,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://imapproxy.org/; description = "It proxies IMAP transactions caching server connections"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/tools/networking/imapsync/default.nix b/pkgs/tools/networking/imapsync/default.nix index c2c1320988a7a79e5b16517f88075c130162769e..1418ad63385c76b62f0d3341b48a5de3ccb4d58d 100644 --- a/pkgs/tools/networking/imapsync/default.nix +++ b/pkgs/tools/networking/imapsync/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.linux-france.org/prj/imapsync/"; description = "Mail folder synchronizer between IMAP servers"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/tools/networking/inadyn/default.nix b/pkgs/tools/networking/inadyn/default.nix index 99bc848824828c9dd67f7078494b1e4e7b94982f..ce90bed30106a312d5a57c28fe98db9552e22f99 100644 --- a/pkgs/tools/networking/inadyn/default.nix +++ b/pkgs/tools/networking/inadyn/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://inadyn.sourceforge.net/; description = "Free dynamic DNS client"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; all; }; diff --git a/pkgs/tools/networking/inetutils/default.nix b/pkgs/tools/networking/inetutils/default.nix index 295cb0bf1391ba900d47a8104bb13f0652a2c3f0..20ee6da8a30ceec8e85e441d28312c1060255e7b 100644 --- a/pkgs/tools/networking/inetutils/default.nix +++ b/pkgs/tools/networking/inetutils/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.gnu.org/software/inetutils/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; platforms = stdenv.lib.platforms.gnu; diff --git a/pkgs/tools/networking/isync/default.nix b/pkgs/tools/networking/isync/default.nix index ed01ccacd7972a8cdf471286d0332db08f77d8f9..2d3ffb2cb0a8c9aa2cc8183441169a1a47d0188e 100644 --- a/pkgs/tools/networking/isync/default.nix +++ b/pkgs/tools/networking/isync/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, openssl, pkgconfig, db }: stdenv.mkDerivation rec { - name = "isync-1.1.0"; + name = "isync-1.1.1"; src = fetchurl { url = "mirror://sourceforge/isync/${name}.tar.gz"; - sha256 = "51f5618c239013fb770f98ae269f24ee417214efaaf7e22821b4a27cf9a9213c"; + sha256 = "14blgxhpl78bpr1291zb7n3y9g8jpgmnpdnbl0vp2qplw76zv9f3"; }; buildInputs = [ openssl pkgconfig db ]; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { description = "Free IMAP and MailDir mailbox synchronizer"; license = [ "GPLv2+" ]; - maintainers = [ stdenv.lib.maintainers.viric ]; + maintainers = with stdenv.lib.maintainers; [ the-kenny viric ]; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/networking/jnettop/default.nix b/pkgs/tools/networking/jnettop/default.nix index 132d1832a9d53aee4707a14173dd8e37fbb0aec4..49753d189d63380e2c727543ec971e44eb67100e 100644 --- a/pkgs/tools/networking/jnettop/default.nix +++ b/pkgs/tools/networking/jnettop/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation rec { ''; homepage = http://jnettop.kubs.info/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/tools/networking/lsh/default.nix b/pkgs/tools/networking/lsh/default.nix index ab43813f923bc21fba7b41e143eac520465c8b68..6be4119469ea0ca6101a759c6ee96c7838d3ef2e 100644 --- a/pkgs/tools/networking/lsh/default.nix +++ b/pkgs/tools/networking/lsh/default.nix @@ -41,8 +41,9 @@ stdenv.mkDerivation rec { ''; homepage = http://www.lysator.liu.se/~nisse/lsh/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; + platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/tools/networking/megatools/default.nix b/pkgs/tools/networking/megatools/default.nix index 25dbd634c8c09dfbbb6d83df34fbcfc7f1ee11f8..5c1910f1d6eb0d2dcaeef02ee1965aff4064d900 100644 --- a/pkgs/tools/networking/megatools/default.nix +++ b/pkgs/tools/networking/megatools/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "Command line client for Mega.co.nz"; homepage = http://megatools.megous.com/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.viric ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/tools/networking/mosh/default.nix b/pkgs/tools/networking/mosh/default.nix index e781af7c235af3e47e60f2d07d28f328575acb79..5209e58ff246deb9256f3d1a688380a1ee5407bc 100644 --- a/pkgs/tools/networking/mosh/default.nix +++ b/pkgs/tools/networking/mosh/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { Mosh is a replacement for SSH. It's more robust and responsive, especially over Wi-Fi, cellular, and long-distance links. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix index 1055ef90b12403bb065cff3249e7bf6ef65ed9ab..87f0db1946b5a505ee5d8d4e550890f84812b09f 100644 --- a/pkgs/tools/networking/mu/default.nix +++ b/pkgs/tools/networking/mu/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = { description = "A collection of utilties for indexing and searching Maildirs"; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; homepage = "http://www.djcbsoftware.nl/code/mu/"; platforms = stdenv.lib.platforms.mesaPlatforms; maintainers = with stdenv.lib.maintainers; [ antono the-kenny ]; diff --git a/pkgs/tools/networking/nbd/default.nix b/pkgs/tools/networking/nbd/default.nix index b2943eb2aced5ad57fe2625dbe0361f2e6ea7129..dffafe5c81695a0f4e3d1ab651a87ebbf8d29637 100644 --- a/pkgs/tools/networking/nbd/default.nix +++ b/pkgs/tools/networking/nbd/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://nbd.sourceforge.net"; description = "map arbitrary files as block devices over the network"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.simons ]; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/tools/networking/netkit/tftp/default.nix b/pkgs/tools/networking/netkit/tftp/default.nix index 16b8a1159b6ae7b883717f36b56c97c6727e72da..5752ff2a63c11fd7b8a07ce7fc63acff2ffc7533 100644 --- a/pkgs/tools/networking/netkit/tftp/default.nix +++ b/pkgs/tools/networking/netkit/tftp/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "Netkit TFTP client and server"; homepage = "ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/"; - license = "BSD"; + license = "BSD-Original"; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/networking/ngrep/default.nix b/pkgs/tools/networking/ngrep/default.nix index 361d44eaca75b465ba7eb1efebfc91602834bcae..5c7840034b7f0f0d83676f20a4515fb04ad9b4cf 100644 --- a/pkgs/tools/networking/ngrep/default.nix +++ b/pkgs/tools/networking/ngrep/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { # /doc/README.txt says that ngrep itself is licensed under a # 'BSD-like' license but that the 'regex' library (in the ngrep tarball) is # GPLv2. - license = "BSD-like"; + license = "ngrep"; # Some custom BSD-style, see LICENSE.txt platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; }; diff --git a/pkgs/tools/networking/nss-mdns/default.nix b/pkgs/tools/networking/nss-mdns/default.nix index 7ef5eb17dc1428ea6ce3be260f5c7141a6add835..b3d4ec95e06193cd2655fd22fe06d22d4aa338a2 100644 --- a/pkgs/tools/networking/nss-mdns/default.nix +++ b/pkgs/tools/networking/nss-mdns/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ''; homepage = http://0pointer.de/lennart/projects/nss-mdns/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; # Supports both the GNU and FreeBSD NSS. platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.freebsd; diff --git a/pkgs/tools/networking/ntop/default.nix b/pkgs/tools/networking/ntop/default.nix index d5fa2deb68dc3b10ec2f1fc9ccfbd84fad85e42c..11e67ae63336cb4ab1a42ac29f54bd86a2866f06 100644 --- a/pkgs/tools/networking/ntop/default.nix +++ b/pkgs/tools/networking/ntop/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "Traffic analysis with NetFlow and sFlow support"; - license = "GLPv3+"; + license = stdenv.lib.licenses.gpl3Plus; homepage = http://www.ntop.org/products/ntop/; platforms = stdenv.lib.platforms.linux; broken = true; diff --git a/pkgs/tools/networking/nzbget/default.nix b/pkgs/tools/networking/nzbget/default.nix index c5386553f4f1cadc8199b598175dfb27acbd7683..ec14b8ee99a35ace46a52c5c2625e7d9f910ae50 100644 --- a/pkgs/tools/networking/nzbget/default.nix +++ b/pkgs/tools/networking/nzbget/default.nix @@ -2,11 +2,11 @@ , gnutls, libgcrypt }: stdenv.mkDerivation rec { - name = "nzbget-9.0"; + name = "nzbget-13.0"; src = fetchurl { url = "mirror://sourceforge/nzbget/${name}.tar.gz"; - sha256 = "1r4ys5nmcz1ilkdjdh3r8lawaf96i8spk6hl02h823q9rppvmya0"; + sha256 = "13lgwwrdv6ds25kj6hj0b5laqaf739n7l3j530x3640zyd254vv6"; }; buildInputs = [ pkgconfig libxml2 ncurses libsigcxx libpar2 gnutls libgcrypt ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://nzbget.sourceforge.net/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; description = "A command line tool for downloading files from news servers"; }; } diff --git a/pkgs/tools/networking/openresolv/default.nix b/pkgs/tools/networking/openresolv/default.nix index 666f3ad8ba715e5a0ec162e8c064c14322e2de03..b81c46c0b616763b8c17ca517b7b06da5de5425f 100644 --- a/pkgs/tools/networking/openresolv/default.nix +++ b/pkgs/tools/networking/openresolv/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = { description = "A program to manage /etc/resolv.conf"; homepage = http://roy.marples.name/projects/openresolv; - license = "bsd"; + license = stdenv.lib.licenses.bsd2; maintainers = [ stdenv.lib.maintainers.eelco ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index ea94560219f0c14fd7199faf055bd9ca238e897e..fec6679a14b03292170731e4b43ad277cee9eabf 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "http://www.openssh.org/"; description = "An implementation of the SSH protocol"; - license = "bsd"; + license = "bsd"; # multi BSD GPL-2 platforms = platforms.unix; maintainers = with maintainers; [ eelco ]; broken = hpnSupport; # cf. https://github.com/NixOS/nixpkgs/pull/1640 diff --git a/pkgs/tools/networking/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix index f06a36a96f5d90b459031845b9c71f962ede6a17..591bf26ff0b6948f087ae8aaa7b3db8c84628d3e 100644 --- a/pkgs/tools/networking/openvpn/default.nix +++ b/pkgs/tools/networking/openvpn/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = { description = "A robust and highly flexible tunneling application"; homepage = http://openvpn.net/; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.viric ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/tools/networking/p2p/amule/default.nix b/pkgs/tools/networking/p2p/amule/default.nix index ac848b5d72e2b0f5c0b24ab63e28cafba5a9691a..45a7392475848a43e5beab8d1a513047ed5c4224 100644 --- a/pkgs/tools/networking/p2p/amule/default.nix +++ b/pkgs/tools/networking/p2p/amule/default.nix @@ -61,7 +61,7 @@ mkDerivation rec { applications. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.gnu; # arbitrary choice maintainers = [ stdenv.lib.maintainers.phreedom ]; diff --git a/pkgs/tools/networking/p2p/seeks/default.nix b/pkgs/tools/networking/p2p/seeks/default.nix index 835744c600049620ca89800550efff33f07b8f42..8c707e2fcc72e9f40bc716475a0282123feb7fda 100644 --- a/pkgs/tools/networking/p2p/seeks/default.nix +++ b/pkgs/tools/networking/p2p/seeks/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation { web indexes as users can push content directly to search groups. ''; - license = "AGPLv3+"; + license = stdenv.lib.licenses.agpl3Plus; homepage = http://www.seeks-project.info/; diff --git a/pkgs/tools/networking/pdnsd/default.nix b/pkgs/tools/networking/pdnsd/default.nix index 6058639e412ab431f4219dcdc52f9de1701b8c85..40d57cd65b6316f148a942c137da0c71e1077426 100644 --- a/pkgs/tools/networking/pdnsd/default.nix +++ b/pkgs/tools/networking/pdnsd/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { description = "Permanent DNS caching"; homepage = http://www.phys.uu.nl/~rombouts/pdnsd.html; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [viric]; }; diff --git a/pkgs/tools/networking/pdsh/default.nix b/pkgs/tools/networking/pdsh/default.nix index 7a5b6b6c440d2102e6c6ae4b7c979a06df259b5c..fa3fc4472f3bab7de51d5a600dc5584f71cf5428 100644 --- a/pkgs/tools/networking/pdsh/default.nix +++ b/pkgs/tools/networking/pdsh/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { meta = { homepage = "http://code.google.com/p/pdsh/"; description = "High-performance, parallel remote shell utility"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; longDescription = '' Pdsh is a high-performance, parallel remote shell utility. It has diff --git a/pkgs/tools/networking/proxychains/default.nix b/pkgs/tools/networking/proxychains/default.nix index 6778cf94907ecfbf97d5398f9e080ec0cd7ea061..2835c9016ab47e684b7d8f05d39141a7651bccd4 100644 --- a/pkgs/tools/networking/proxychains/default.nix +++ b/pkgs/tools/networking/proxychains/default.nix @@ -10,6 +10,6 @@ stdenv.mkDerivation { meta = { description = "Proxifier for SOCKS proxies"; homepage = http://proxychains.sourceforge.net; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/tools/networking/pwnat/default.nix b/pkgs/tools/networking/pwnat/default.nix index 63919edd5054c67df8b2ac1a9d73ec8b6d9c60fe..e2da224cfdcce5b87a23f5b8fd0c2d997714a5e3 100644 --- a/pkgs/tools/networking/pwnat/default.nix +++ b/pkgs/tools/networking/pwnat/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://samy.pl/pwnat/; description = "ICMP NAT to NAT client-server communication"; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/networking/reaver-wps/default.nix b/pkgs/tools/networking/reaver-wps/default.nix index a057985b48ccbb0a5de49d9f87411272896e5600..afce95fbd449f3ed06de98f046eaa4f5528458e2 100644 --- a/pkgs/tools/networking/reaver-wps/default.nix +++ b/pkgs/tools/networking/reaver-wps/default.nix @@ -15,12 +15,12 @@ stdenv.mkDerivation rec { ''; preInstall = '' - ensureDir $out/bin + mkdir -p $out/bin ''; meta = { description = "Brute force attack against Wifi Protected Setup"; homepage = http://code.google.com/p/reaver-wps; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/tools/networking/s3sync/default.nix b/pkgs/tools/networking/s3sync/default.nix index 48788d36884cb895105a9a33ba702e620bb5c750..8390c70a4d3b3f08dedcee0160bcbcbeb66fbd46 100644 --- a/pkgs/tools/networking/s3sync/default.nix +++ b/pkgs/tools/networking/s3sync/default.nix @@ -24,6 +24,6 @@ stdenv.mkDerivation { meta = { homepage = http://s3sync.net/; description = "Command-line tools to manipulate Amazon S3 buckets"; - license = "free-non-copyleft"; + license = "free-non-copyleft"; # some custom as-is in file headers }; } diff --git a/pkgs/tools/networking/smbldaptools/default.nix b/pkgs/tools/networking/smbldaptools/default.nix index 74e8a530560c857c614fbdfd53dd334b273a8ce7..af1849565fe2df5002a0406614219685f8349e18 100644 --- a/pkgs/tools/networking/smbldaptools/default.nix +++ b/pkgs/tools/networking/smbldaptools/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation { meta = { homepage = http://gna.org/projects/smbldap-tools/; description = "SAMBA LDAP tools"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/tools/networking/socat/2.x.nix b/pkgs/tools/networking/socat/2.x.nix index 74b9b1bdf6aae746e5d64b9ee3acd110ef5f6d40..fbd249463812400c89270b55125cdba0e31d9058 100644 --- a/pkgs/tools/networking/socat/2.x.nix +++ b/pkgs/tools/networking/socat/2.x.nix @@ -10,11 +10,13 @@ stdenv.mkDerivation rec { buildInputs = [ openssl ]; + configureFlags = stdenv.lib.optionalString stdenv.isDarwin "--disable-ip6"; + meta = { description = "A utility for bidirectional data transfer between two independent data channels"; homepage = http://www.dest-unreach.org/socat/; repositories.git = git://repo.or.cz/socat.git; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; license = stdenv.lib.licenses.gpl2; maintainers = stdenv.lib.maintainers.eelco; }; diff --git a/pkgs/tools/networking/swec/default.nix b/pkgs/tools/networking/swec/default.nix index bf0c2f80694cd7969fe56cb3a43b7807e15c2436..3e8f3ca3dc5924b79c89374259853ea799e1cb59 100644 --- a/pkgs/tools/networking/swec/default.nix +++ b/pkgs/tools/networking/swec/default.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { (well, not exactly true, SWEC will ignore robots.txt). ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ ]; }; diff --git a/pkgs/tools/networking/ucspi-tcp/default.nix b/pkgs/tools/networking/ucspi-tcp/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..0bcd35b21ef95931da288274585df816dd1674f3 --- /dev/null +++ b/pkgs/tools/networking/ucspi-tcp/default.nix @@ -0,0 +1,85 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "ucspi-tcp-0.88"; + + src = fetchurl { + url = "http://cr.yp.to/ucspi-tcp/${name}.tar.gz"; + sha256 = "171yl9kfm8w7l17dfxild99mbf877a9k5zg8yysgb1j8nz51a1ja"; + }; + + # Plain upstream tarball doesn't build, get patches from Debian + patches = [ + (fetchurl { + url = "http://ftp.de.debian.org/debian/pool/main/u/ucspi-tcp/ucspi-tcp_0.88-3.diff.gz"; + sha256 = "0mzmhz8hjkrs0khmkzs5i0s1kgmgaqz07h493bd5jj5fm5njxln6"; + }) + ]; + + # Apply Debian patches + postPatch = '' + for fname in debian/diff/*.diff; do + echo "Applying patch $fname" + patch < "$fname" + done + ''; + + # The build system is weird; 'make install' doesn't install anything, instead + # it builds an executable called ./install (from C code) which installs + # binaries to the directory given on line 1 in ./conf-home. + # + # Also, assume getgroups and setgroups work, instead of doing a build time + # test that breaks on NixOS (I think because nixbld users lack CAP_SETGID + # capability). + preBuild = '' + echo "$out" > conf-home + + echo "main() { return 0; }" > chkshsgr.c + ''; + + installPhase = '' + mkdir -p "$out/bin" + mkdir -p "$out/share/man/man1" + + # run the newly built installer + ./install + + # Install Debian man pages (upstream has none) + cp debian/ucspi-tcp-man/*.1 "$out/share/man/man1" + ''; + + meta = with stdenv.lib; { + description = "Command-line tools for building TCP client-server applications"; + longDescription = '' + tcpserver waits for incoming connections and, for each connection, runs a + program of your choice. Your program receives environment variables + showing the local and remote host names, IP addresses, and port numbers. + + tcpserver offers a concurrency limit to protect you from running out of + processes and memory. When you are handling 40 (by default) simultaneous + connections, tcpserver smoothly defers acceptance of new connections. + + tcpserver also provides TCP access control features, similar to + tcp-wrappers/tcpd's hosts.allow but much faster. Its access control rules + are compiled into a hashed format with cdb, so it can easily deal with + thousands of different hosts. + + This package includes a recordio tool that monitors all the input and + output of a server. + + tcpclient makes a TCP connection and runs a program of your choice. It + sets up the same environment variables as tcpserver. + + This package includes several sample clients built on top of tcpclient: + who@, date@, finger@, http@, tcpcat, and mconnect. + + tcpserver and tcpclient conform to UCSPI, the UNIX Client-Server Program + Interface, using the TCP protocol. UCSPI tools are available for several + different networks. + ''; + homepage = http://cr.yp.to/ucspi-tcp.html; + license = licenses.publicDomain; + platforms = platforms.linux; + maintainers = [ maintainers.bjornfor ]; + }; +} diff --git a/pkgs/tools/networking/udptunnel/default.nix b/pkgs/tools/networking/udptunnel/default.nix index 88ee926e40651201b27578d1d18fa3bbde98be21..b12ce573d1c4107e8b78f1eb3cbc0d3e0a421595 100644 --- a/pkgs/tools/networking/udptunnel/default.nix +++ b/pkgs/tools/networking/udptunnel/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { }; installPhase = '' - ensureDir $out/bin $out/share/udptunnel + mkdir -p $out/bin $out/share/udptunnel cp udptunnel $out/bin cp README COPYING* $out/share/udptunnel ''; @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = { homepage = http://code.google.com/p/udptunnel/; description = "Tunnels TCP over UDP packets"; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/networking/uwimap/default.nix b/pkgs/tools/networking/uwimap/default.nix index 54390d4f9eee9358e700683b1a9ac6c96f0a9f61..1da9ca96984140f5f908830b9ac3911aa239577e 100644 --- a/pkgs/tools/networking/uwimap/default.nix +++ b/pkgs/tools/networking/uwimap/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { meta = { homepage = http://www.washington.edu/imap/; description = "UW IMAP toolkit - IMAP-supporting software developed by the UW"; - license = "Apache2"; + license = stdenv.lib.licenses.asl20; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/networking/vpnc/default.nix b/pkgs/tools/networking/vpnc/default.nix index 8619cd95409049d6887f158fe98dd6d7a1eb6a44..1386f7133e54657c71ae76d9db2968eec18fa757 100644 --- a/pkgs/tools/networking/vpnc/default.nix +++ b/pkgs/tools/networking/vpnc/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.unix-ag.uni-kl.de/~massar/vpnc/"; description = "virtual private network (VPN) client for Cisco's VPN concentrators"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.simons ]; diff --git a/pkgs/tools/networking/vtun/default.nix b/pkgs/tools/networking/vtun/default.nix index 3f3a0dc89936af0314392c6de2fa953f49fa9950..e32ee43113eb448593bb393ebad916756cbfd0e0 100644 --- a/pkgs/tools/networking/vtun/default.nix +++ b/pkgs/tools/networking/vtun/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation { meta = { description="Virtual Tunnels over TCP/IP with traffic shaping, compression and encryption"; homepage="http://vtun.sourceforge.net/"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/tools/networking/wakelan/default.nix b/pkgs/tools/networking/wakelan/default.nix index 837ab3627faf78efdbe94cf7d01f47187e839fc8..4f8717e9a11e391d2c07f4abbb7fe328bb1b0a6e 100644 --- a/pkgs/tools/networking/wakelan/default.nix +++ b/pkgs/tools/networking/wakelan/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { power on. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.viric ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/networking/wget/default.nix b/pkgs/tools/networking/wget/default.nix index c8698215525451c49b4425577e25cc459b1401e7..6ff5439c4bc627cca4129b146f8d1e8c7d202187 100644 --- a/pkgs/tools/networking/wget/default.nix +++ b/pkgs/tools/networking/wget/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { scripts, cron jobs, terminals without X-Windows support, etc. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; homepage = http://www.gnu.org/software/wget/; diff --git a/pkgs/tools/package-management/cabal-install/0.10.2.nix b/pkgs/tools/package-management/cabal-install/0.10.2.nix index 85882749ad4b9d8bdc8dbe95d0820f83ebd7b52e..3d7b2d72d719ca0a1303b000ba9c640a21db147a 100644 --- a/pkgs/tools/package-management/cabal-install/0.10.2.nix +++ b/pkgs/tools/package-management/cabal-install/0.10.2.nix @@ -14,9 +14,7 @@ cabal.mkDerivation (self: { description = "The command-line interface for Cabal and Hackage"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + hydraPlatforms = self.stdenv.lib.platforms.none; + maintainers = with self.stdenv.lib.maintainers; [ simons ]; }; }) diff --git a/pkgs/tools/package-management/cabal-install/0.14.0.nix b/pkgs/tools/package-management/cabal-install/0.14.0.nix index 72ed741497164239d20682a4f3bc90cce7b64cb7..c5a67e61999cefd79771ff8b0d8169155b6eab54 100644 --- a/pkgs/tools/package-management/cabal-install/0.14.0.nix +++ b/pkgs/tools/package-management/cabal-install/0.14.0.nix @@ -20,6 +20,7 @@ cabal.mkDerivation (self: { description = "The command-line interface for Cabal and Hackage"; 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/tools/package-management/cabal-install/0.6.2.nix b/pkgs/tools/package-management/cabal-install/0.6.2.nix index 4e0111e90e189338533da11c92f267953496a4cd..3c79857f6e7884bb0f0be5f97ef7fdb6ee5bcd1f 100644 --- a/pkgs/tools/package-management/cabal-install/0.6.2.nix +++ b/pkgs/tools/package-management/cabal-install/0.6.2.nix @@ -14,9 +14,7 @@ cabal.mkDerivation (self: { description = "The command-line interface for Cabal and Hackage"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + hydraPlatforms = self.stdenv.lib.platforms.none; + maintainers = with self.stdenv.lib.maintainers; [ simons ]; }; }) diff --git a/pkgs/tools/package-management/cabal-install/0.8.0.nix b/pkgs/tools/package-management/cabal-install/0.8.0.nix index d54f8140cc6ca2dcc400cba72e079ddff952a206..d27fbbca7d47b27ff868d9bad37c8ae277ebcba5 100644 --- a/pkgs/tools/package-management/cabal-install/0.8.0.nix +++ b/pkgs/tools/package-management/cabal-install/0.8.0.nix @@ -14,9 +14,7 @@ cabal.mkDerivation (self: { description = "The command-line interface for Cabal and Hackage"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + hydraPlatforms = self.stdenv.lib.platforms.none; + maintainers = with self.stdenv.lib.maintainers; [ simons ]; }; }) diff --git a/pkgs/tools/package-management/cabal-install/0.8.2.nix b/pkgs/tools/package-management/cabal-install/0.8.2.nix index 9d9aa7e1d6b1dc64cec82e0c5569b2fc73eb8e01..6f8881b504bd20de7fc90b8ec31ad4b5fe238485 100644 --- a/pkgs/tools/package-management/cabal-install/0.8.2.nix +++ b/pkgs/tools/package-management/cabal-install/0.8.2.nix @@ -14,9 +14,7 @@ cabal.mkDerivation (self: { description = "The command-line interface for Cabal and Hackage"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + hydraPlatforms = self.stdenv.lib.platforms.none; + maintainers = with self.stdenv.lib.maintainers; [ simons ]; }; }) diff --git a/pkgs/tools/package-management/cabal-install/1.16.0.2.nix b/pkgs/tools/package-management/cabal-install/1.16.0.2.nix index 14fc25bc8dc70351f79093d5280b193040d11338..84dc12d3145efb7da7a0f517d52eba9cdcb714b2 100644 --- a/pkgs/tools/package-management/cabal-install/1.16.0.2.nix +++ b/pkgs/tools/package-management/cabal-install/1.16.0.2.nix @@ -20,6 +20,7 @@ cabal.mkDerivation (self: { description = "The command-line interface for Cabal and Hackage"; 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/tools/package-management/cabal-install/1.18.0.3.nix b/pkgs/tools/package-management/cabal-install/1.18.0.3.nix index 31d43cc85d894c7be0abd69ca0e99d53d6900b4c..52db3a6faf4010103e86506e3801c62b60029fe6 100644 --- a/pkgs/tools/package-management/cabal-install/1.18.0.3.nix +++ b/pkgs/tools/package-management/cabal-install/1.18.0.3.nix @@ -27,6 +27,7 @@ cabal.mkDerivation (self: { description = "The command-line interface for Cabal and Hackage"; 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/tools/package-management/disnix/DisnixWebService/default.nix b/pkgs/tools/package-management/disnix/DisnixWebService/default.nix index 381cb21ec1b2fd23a289cdf6070c94de430a4fd4..291f7e36ce064d19cf840c5c9e1c66f23afeec83 100644 --- a/pkgs/tools/package-management/disnix/DisnixWebService/default.nix +++ b/pkgs/tools/package-management/disnix/DisnixWebService/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = { description = "A SOAP interface and client for Disnix"; - license = "MIT"; + license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.sander ]; }; } diff --git a/pkgs/tools/package-management/disnix/default.nix b/pkgs/tools/package-management/disnix/default.nix index d89ab7667e82da8e68d4a111db163b2dbb41bca7..61e998fd545ef0051fde7987683ffa40b4990cf1 100644 --- a/pkgs/tools/package-management/disnix/default.nix +++ b/pkgs/tools/package-management/disnix/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { meta = { description = "A distributed deployment extension for Nix"; - license = "LGPLv2.1+"; + license = stdenv.lib.licenses.lgpl21Plus; maintainers = [ stdenv.lib.maintainers.sander ]; }; } diff --git a/pkgs/tools/package-management/disnix/disnixos/default.nix b/pkgs/tools/package-management/disnix/disnixos/default.nix index 7420353499f5bf59314a6f24c256f9bec3141cc5..65ae91f6e187fb84d922a29b163fff7f5a3f4ced 100644 --- a/pkgs/tools/package-management/disnix/disnixos/default.nix +++ b/pkgs/tools/package-management/disnix/disnixos/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { meta = { description = "Provides complementary NixOS infrastructure deployment to Disnix"; - license = "LGPLv2.1+"; + license = stdenv.lib.licenses.lgpl21Plus; maintainers = [ stdenv.lib.maintainers.sander ]; }; } diff --git a/pkgs/tools/package-management/disnix/dysnomia/default.nix b/pkgs/tools/package-management/disnix/dysnomia/default.nix index d2f3ae6468c70a970b6497e1e6933965b8640db3..a1914224dbdb4d8f6ada92e0592b1f40ec360fcf 100644 --- a/pkgs/tools/package-management/disnix/dysnomia/default.nix +++ b/pkgs/tools/package-management/disnix/dysnomia/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation { meta = { description = "Automated deployment of mutable components and services for Disnix"; - license = "MIT"; + license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.sander ]; }; } diff --git a/pkgs/tools/package-management/guix/default.nix b/pkgs/tools/package-management/guix/default.nix index 7c4a098cad8a69a0c7dec05fa4985251cdfc8491..b4b3c98505e9041abdcad89b9afb1c688858f423 100644 --- a/pkgs/tools/package-management/guix/default.nix +++ b/pkgs/tools/package-management/guix/default.nix @@ -59,7 +59,7 @@ in stdenv.mkDerivation rec { Guix is based on the Nix package manager. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 16a276273cc345bb6f3ac9bb82847e8e39df70f6..b2e86935b50df5082714375e41c8f0570579a5b2 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { meta = { description = "The Nix Deployment System"; homepage = http://nixos.org/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ stdenv.lib.maintainers.eelco ]; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix index 25a71a2d5073b7afbdf6480f17928e8754109464..afcceb30474b94f203e3c2aa4fdf6aca4b47fd49 100644 --- a/pkgs/tools/package-management/nix/unstable.nix +++ b/pkgs/tools/package-management/nix/unstable.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "nix-1.8pre3679_f609eec"; + name = "nix-1.8pre3718_51485dc"; src = fetchurl { - url = "http://hydra.nixos.org/build/12606291/download/5/${name}.tar.xz"; - sha256 = "d185c00db8c1ab977d37695da0130628290af8dc315b3e24aa24d3ee25cdf875"; + url = "http://hydra.nixos.org/build/13025632/download/5/${name}.tar.xz"; + sha256 = "69f3a0729b6df1adcbfc7c13df405ce7f3f7904b0cbcdd7f6ad3a0af45f4024c"; }; nativeBuildInputs = [ perl pkgconfig ]; @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { meta = { description = "The Nix Deployment System"; homepage = http://nixos.org/; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ stdenv.lib.maintainers.eelco ]; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/tools/package-management/nox/default.nix b/pkgs/tools/package-management/nox/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..93c671287d6389d5060c6bce8a57c739d5166583 --- /dev/null +++ b/pkgs/tools/package-management/nox/default.nix @@ -0,0 +1,29 @@ +{ lib, pythonPackages, git, fetchgit, makeWrapper, nix }: + +pythonPackages.buildPythonPackage rec { + name = "nox-0.0.1"; + namePrefix = ""; + + src = fetchgit { + url = "git://github.com/madjar/nox.git"; + rev = "49e4bb7de473ac5e446a76c292bdaefa7e20a1c6"; + sha256 = "1w1b2g44lj6nbs7f2j5dz5pijhfah3fyldspfb34zcv17j2nlv0b"; + leaveDotGit = true; # required by pbr + }; + + buildInputs = [ git pythonPackages.pbr makeWrapper ]; + + pythonPath = + [ pythonPackages.dogpile_cache + pythonPackages.click + ]; + + postInstall = "wrapProgram $out/bin/nox --prefix PATH : ${nix}/bin"; + + meta = { + homepage = https://github.com/madjar/nox; + description = "Tools to make nix nicer to use"; + maintainers = [ lib.maintainers.madjar ]; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/tools/security/aespipe/default.nix b/pkgs/tools/security/aespipe/default.nix index 96de0e0fbe4a07f38c147b19da4f230d648a3cd2..dbbdb8e57a66d94a962d064a87a001e33be5c544 100644 --- a/pkgs/tools/security/aespipe/default.nix +++ b/pkgs/tools/security/aespipe/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = { description = "AES encrypting or decrypting pipe"; homepage = http://loop-aes.sourceforge.net/aespipe.README; - license = "GPL"; + license = stdenv.lib.licenses.gpl2; maintainers = stdenv.lib.maintainers.goibhniu; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/tools/security/ccid/default.nix b/pkgs/tools/security/ccid/default.nix index 458111be4006fe106f5a6d131c69fe9b8d3286f5..42af2e0b57e8750bba1cae464a4dae1a2176ec79 100644 --- a/pkgs/tools/security/ccid/default.nix +++ b/pkgs/tools/security/ccid/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { description = "ccid drivers for pcsclite"; homepage = http://pcsclite.alioth.debian.org/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/security/ccrypt/default.nix b/pkgs/tools/security/ccrypt/default.nix index 0d4841bf036b696e840d48cd203957cd1312f2d2..e6a63a2f288221beccb2e753e0ded470b3b7dbcd 100644 --- a/pkgs/tools/security/ccrypt/default.nix +++ b/pkgs/tools/security/ccrypt/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = { homepage = http://ccrypt.sourceforge.net/; description = "Utility for encrypting and decrypting files and streams with AES-256"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; all; }; diff --git a/pkgs/tools/security/fail2ban/default.nix b/pkgs/tools/security/fail2ban/default.nix index 8d6a6241ad3f9c0c6ecd33c605a0d31ab96190dd..6b5c69c3d2e2b1d0800df7ca9fa31fccc265665a 100644 --- a/pkgs/tools/security/fail2ban/default.nix +++ b/pkgs/tools/security/fail2ban/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, pythonPackages, unzip, gamin }: +{ stdenv, fetchurl, python, pythonPackages, unzip, systemd, gamin }: -let version = "0.8.13"; in +let version = "0.9"; in pythonPackages.buildPythonPackage { name = "fail2ban-${version}"; @@ -9,12 +9,12 @@ pythonPackages.buildPythonPackage { src = fetchurl { url = "https://github.com/fail2ban/fail2ban/zipball/${version}"; name = "fail2ban-${version}.zip"; - sha256 = "0c63i5jsn2n6hv6fb6q922ksxfpppah9415vpydiv0vpf23pq0cb"; + sha256 = "0dawl0vvdvpnkg1hc4l0c8sj8ikcr2l48d6khfx0174nq8yfcg93"; }; buildInputs = [ unzip ]; - pythonPath = [ gamin ]; + pythonPath = [ systemd python.modules.sqlite3 gamin ]; preConfigure = '' substituteInPlace setup.cfg \ diff --git a/pkgs/tools/security/fprot/default.nix b/pkgs/tools/security/fprot/default.nix index 2a8531a179541d387015b9f79f88582f8708b10e..b43ea402f6dc552dd4af6db677a0b9228159cf36 100644 --- a/pkgs/tools/security/fprot/default.nix +++ b/pkgs/tools/security/fprot/default.nix @@ -11,10 +11,10 @@ stdenv.mkDerivation rec { }; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin cp fpscan $out/bin - ensureDir $out/opt/f-prot + mkdir -p $out/opt/f-prot cp fpupdate $out/opt/f-prot cp product.data.default $out/opt/f-prot/product.data cp license.key $out/opt/f-prot/ @@ -23,12 +23,12 @@ stdenv.mkDerivation rec { patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" $out/opt/f-prot/fpupdate - ensureDir $out/share/man/ - ensureDir $out/share/man/man1 + mkdir -p $out/share/man/ + mkdir -p $out/share/man/man1 cp doc/man/fpscan.1 $out/share/man/man1 - ensureDir $out/share/man/man5 + mkdir -p $out/share/man/man5 cp doc/man/f-prot.conf.5 $out/share/man/man5 - ensureDir $out/share/man/man8 + mkdir -p $out/share/man/man8 cp doc/man/fpupdate.8 $out/share/man/man8 ''; diff --git a/pkgs/tools/security/gnupg/git.nix b/pkgs/tools/security/gnupg/git.nix index 3d7db862dce088f8d04eeae1db536da99ca39a5b..69a0a68319fd51dbad88f1a65a541bb0435346f6 100644 --- a/pkgs/tools/security/gnupg/git.nix +++ b/pkgs/tools/security/gnupg/git.nix @@ -52,6 +52,6 @@ stdenv.mkDerivation rec { homepage = http://gnupg.org/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; }; } diff --git a/pkgs/tools/security/gnupg1/default.nix b/pkgs/tools/security/gnupg1/default.nix index a25ae35b6cc99f3ac4576febb75fc33adf4831e5..53f784396a72a72bbf71f52a99ca87eb073ad9b0 100644 --- a/pkgs/tools/security/gnupg1/default.nix +++ b/pkgs/tools/security/gnupg1/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { description = "free implementation of the OpenPGP standard for encrypting and signing data"; homepage = http://www.gnupg.org/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.gnu; # arbitrary choice }; } diff --git a/pkgs/tools/security/meo/default.nix b/pkgs/tools/security/meo/default.nix index 31736123a9f2a4c78624eae05995f27fd817e439..be678b18dda0829b904b65200f6bca9640d15b81 100644 --- a/pkgs/tools/security/meo/default.nix +++ b/pkgs/tools/security/meo/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { ''; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin cp tools/{meo,p11} $out/bin cp meo-gui/meo-gui $out/bin cp meo-gui/meo-gui $out/bin @@ -27,7 +27,7 @@ stdenv.mkDerivation { meta = { homepage = http://oss.stamfest.net/wordpress/meo-multiple-eyepairs-only; description = "Tools to use cryptography for things like four-eyes principles"; - license = "AGPLv3+"; + license = stdenv.lib.licenses.agpl3Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/security/muscleframework/default.nix b/pkgs/tools/security/muscleframework/default.nix index e2a87119dd9a09c8a7367630daf28856ba7cd4a0..97b0617d396973a937242d51982175fad26c6483 100644 --- a/pkgs/tools/security/muscleframework/default.nix +++ b/pkgs/tools/security/muscleframework/default.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation { homepage = http://muscleplugins.alioth.debian.org/; license = "BSD"; maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + # XXX: don't build before libmusclecard is fixed + # platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/tools/security/muscletool/default.nix b/pkgs/tools/security/muscletool/default.nix index c9648fbe404d2286641616760e27e2f211dca19e..cc369835f25c20e343c40d42843e888e7613f0dd 100644 --- a/pkgs/tools/security/muscletool/default.nix +++ b/pkgs/tools/security/muscletool/default.nix @@ -12,8 +12,9 @@ stdenv.mkDerivation { meta = { description = "Smart card applications for use with MUSCLE plugins"; homepage = http://muscleapps.alioth.debian.org/; - license = "BSD"; + license = "BSD"; # http://anonscm.debian.org/viewvc/muscleapps/trunk/muscleTool/COPYING?view=markup maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + # XXX: don't build before libmusclecard is fixed + # platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/tools/security/paperkey/default.nix b/pkgs/tools/security/paperkey/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..c3b1d64c3a3e111407b4933236b46041ee0d63b9 --- /dev/null +++ b/pkgs/tools/security/paperkey/default.nix @@ -0,0 +1,28 @@ +{ fetchurl, stdenv }: + +stdenv.mkDerivation rec { + + version = "1.3"; + name = "paperkey-${version}"; + + src = fetchurl { + url = "http://www.jabberwocky.com/software/paperkey/${name}.tar.gz"; + sha256 = "5b57d7522336fb65c4c398eec27bf44ec0aaa35926157b79a76423231792cbfb"; + }; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Store OpenPGP or GnuPG on paper"; + longDescription = '' + A reasonable way to achieve a long term backup of OpenPGP (GnuPG, PGP, etc) + keys is to print them out on paper. Paper and ink have amazingly long + retention qualities - far longer than the magnetic or optical means that + are generally used to back up computer data. + ''; + homepage = "http://www.jabberwocky.com/software/paperkey/"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = [ maintainers.skeidel ]; + }; +} diff --git a/pkgs/tools/security/pass/default.nix b/pkgs/tools/security/pass/default.nix index f9bc017159243e4bf968d6fbd66b7fa76acf11ae..3b44edcf1d3bc0b1c9dc9b2bba1ff69f8bf87b98 100644 --- a/pkgs/tools/security/pass/default.nix +++ b/pkgs/tools/security/pass/default.nix @@ -7,12 +7,12 @@ assert withX -> xclip != null; stdenv.mkDerivation rec { - version = "1.6.2"; + version = "1.6.3"; name = "password-store-${version}"; src = fetchurl { url = "http://git.zx2c4.com/password-store/snapshot/${name}.tar.xz"; - sha256 = "1d32y6k625pv704icmhg46zg02kw5zcyxscgljxgy8bb5wv4lv2j"; + sha256 = "1xs00c7ffqd0093i452kryw9sjip6dkp1pclx69zihb5l45d86fl"; }; patches = [ ./darwin-getopt.patch ]; diff --git a/pkgs/tools/security/pinentry/default.nix b/pkgs/tools/security/pinentry/default.nix index 4d1d55244c0bc3780a3d79210b8b2ea0020b4387..038044ad68101741630369ee5f541dcb9f169086 100644 --- a/pkgs/tools/security/pinentry/default.nix +++ b/pkgs/tools/security/pinentry/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://gnupg.org/aegypten2/"; description = "GnuPG's interface to passphrase input"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; longDescription = '' Pinentry provides a console and a GTK+ GUI that allows users to diff --git a/pkgs/tools/security/pius/default.nix b/pkgs/tools/security/pius/default.nix index e693143e4c417f023ec8d68ee590051a07ccc32d..2a4995f45794aff9e5f75207f0fb382d27a38bde 100644 --- a/pkgs/tools/security/pius/default.nix +++ b/pkgs/tools/security/pius/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation { to the process. ''; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.gnu; maintainers = [ ]; diff --git a/pkgs/tools/security/tboot/default.nix b/pkgs/tools/security/tboot/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..86c4d96e97d98a953a70dabffa8d3adef02f4007 --- /dev/null +++ b/pkgs/tools/security/tboot/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl, trousers, openssl, zlib }: + +stdenv.mkDerivation rec { + name = "tboot-1.8.0"; + + src = fetchurl { + url = "mirror://sourceforge/tboot/${name}.tar.gz"; + sha256 = "04z1maryqnr714f3rcynqrpmlx76lxr6bb543xwj5rdl1yvdw2xr"; + }; + + buildInputs = [ trousers openssl zlib ]; + + patches = [ ./tboot-add-well-known-secret-option-to-lcp_writepol.patch ]; + + configurePhase = '' + for a in lcptools utils tb_polgen; do + substituteInPlace $a/Makefile --replace /usr/sbin /sbin + done + substituteInPlace docs/Makefile --replace /usr/share /share + ''; + installFlags = "DESTDIR=$(out)"; + + meta = with stdenv.lib; { + description = ''Trusted Boot (tboot) is an open source, pre-kernel/VMM module that uses + Intel(R) Trusted Execution Technology (Intel(R) TXT) to perform a measured + and verified launch of an OS kernel/VMM.''; + homepage = http://sourceforge.net/projects/tboot/; + license = licenses.bsd3; + maintainers = [ maintainers.ak ]; + platforms = platforms.linux; + }; +} + diff --git a/pkgs/tools/security/tboot/tboot-add-well-known-secret-option-to-lcp_writepol.patch b/pkgs/tools/security/tboot/tboot-add-well-known-secret-option-to-lcp_writepol.patch new file mode 100644 index 0000000000000000000000000000000000000000..a16ba9f4fbab28eab3e9350007327784255aafe5 --- /dev/null +++ b/pkgs/tools/security/tboot/tboot-add-well-known-secret-option-to-lcp_writepol.patch @@ -0,0 +1,50 @@ +diff -urp tboot-1.8.0.orig/lcptools/writepol.c tboot-1.8.0/lcptools/writepol.c +--- tboot-1.8.0.orig/lcptools/writepol.c 2014-01-30 10:34:57.000000000 +0100 ++++ tboot-1.8.0/lcptools/writepol.c 2014-02-12 01:48:51.523581057 +0100 +@@ -40,6 +40,7 @@ + #include + #include + #include ++#include + + #define PRINT printf + #include "../include/uuid.h" +@@ -51,14 +52,15 @@ static uint32_t index_value = 0; + static char *file_arg=NULL; + static uint32_t fLeng; + static unsigned char *policy_data = NULL; +-static char *password = NULL; ++static const char *password = NULL; + static uint32_t passwd_length = 0; ++static const char well_known_secret[] = TSS_WELL_KNOWN_SECRET; + static int help_input = 0; + static unsigned char empty_pol_data[] = {0}; + +-static const char *short_option = "ehi:f:p:"; ++static const char *short_option = "ehi:f:p:Z"; + static const char *usage_string = "lcp_writepol -i index_value " +- "[-f policy_file] [-e] [-p passwd] [-h]"; ++ "[-f policy_file] [-e] [-p passwd|-Z] [-h]"; + + static const char *option_strings[] = { + "-i index value: uint32/string.\n" +@@ -67,6 +69,7 @@ static const char *option_strings[] = { + "\tINDEX_AUX:0x50000002 or \"aux\"\n", + "-f file_name: string. File name of the policy data is stored. \n", + "-p password: string. \n", ++ "-Z use well known secret as password. \n", + "-e write 0 length data to the index.\n" + "\tIt will be used for some special index.\n" + "\tFor example, the index with permission WRITEDEFINE.\n", +@@ -119,6 +122,11 @@ parse_cmdline(int argc, const char * arg + fLeng = 0; + break; + ++ case 'Z': ++ password = well_known_secret; ++ passwd_length = sizeof(well_known_secret); ++ break; ++ + case 'h': + help_input = 1; + break; diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix index 57c4a9c56621484ff1b106fb1d98155b561b5ff5..d71bbd891f916cf6abccd793a249c708ab76aeb1 100644 --- a/pkgs/tools/security/tor/default.nix +++ b/pkgs/tools/security/tor/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libevent, openssl, zlib }: stdenv.mkDerivation rec { - name = "tor-0.2.4.22"; + name = "tor-0.2.4.23"; src = fetchurl { url = "https://archive.torproject.org/tor-package-archive/${name}.tar.gz"; - sha256 = "0k39ppcvld6p08yaf4rpspb34z4f5863j0d605yrm4dqjcp99xvb"; + sha256 = "0a8l6d82hk4wbn7nlphd3c1maxhgdli8338wbg5r9dk6zcy7k8q5"; }; buildInputs = [ libevent openssl zlib ]; diff --git a/pkgs/tools/security/tor/torbrowser.nix b/pkgs/tools/security/tor/torbrowser.nix index 7be7c79888eaec82d972258cc4f36a89e8e19545..f220a46bddcf83eb88f8fc24bd3071bb28510150 100644 --- a/pkgs/tools/security/tor/torbrowser.nix +++ b/pkgs/tools/security/tor/torbrowser.nix @@ -45,8 +45,8 @@ in stdenv.mkDerivation rec { ''; installPhase = '' - ensureDir $out/share/tor-browser - ensureDir $out/bin + mkdir -p $out/share/tor-browser + mkdir -p $out/bin cp -R * $out/share/tor-browser cat > "$out/bin/tor-browser" << EOF diff --git a/pkgs/tools/security/tor/torsocks.nix b/pkgs/tools/security/tor/torsocks.nix index 0254b143edfdcf251ff7d688fc4df64954f72cf4..f8e76c4e83b14d4ed95e8500e45e5e67ea0259b9 100644 --- a/pkgs/tools/security/tor/torsocks.nix +++ b/pkgs/tools/security/tor/torsocks.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { description = "use socks-friendly applications with Tor"; homepage = http://code.google.com/p/torsocks/; repositories.git = https://git.torproject.org/torsocks.git; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/tools/security/tpm-quote-tools/default.nix b/pkgs/tools/security/tpm-quote-tools/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..c178d401154faa90a64156131b4cf3c065ec2570 --- /dev/null +++ b/pkgs/tools/security/tpm-quote-tools/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, trousers, openssl }: + +stdenv.mkDerivation { + name = "tpm-quote-tools-1.0.2"; + + src = fetchurl { + url = "mirror://sourceforge/project/tpmquotetools/1.0.2/tpm-quote-tools-1.0.2.tar.gz"; + sha256 = "17bf9d1hiiaybx6rgl0sqcb0prjz6d2mv8fwp4bj1c0rsfw5dbk8"; + }; + + buildInputs = [ trousers openssl ]; + + meta = with stdenv.lib; { + description = ''The TPM Quote Tools is a collection of programs that provide support + for TPM based attestation using the TPM quote mechanism. The manual + page for tpm_quote_tools provides a usage overview.''; + homepage = http://tpmquotetools.sourceforge.net/; + license = licenses.bsd3; + maintainers = [ maintainers.ak ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/security/tpm-tools/default.nix b/pkgs/tools/security/tpm-tools/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..95b3b6b51f77706d7adee9d155fdf4dcb80d6c32 --- /dev/null +++ b/pkgs/tools/security/tpm-tools/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, trousers, openssl }: + +let + version = "1.3.8"; +in +stdenv.mkDerivation rec { + name = "tpm-tools-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/trousers/tpm-tools/${version}/${name}.tar.gz"; + sha256 = "10za1gi89vi9m2lmm7jfzs281h55x1sbbm2bdgdh692ljpq4zsv6"; + }; + + buildInputs = [ trousers openssl ]; + + meta = with stdenv.lib; { + description = ''tpm-tools is an open-source package designed to enable user and application + enablement of Trusted Computing using a Trusted Platform Module (TPM), + similar to a smart card environment.''; + homepage = http://sourceforge.net/projects/trousers/files/tpm-tools/; + license = licenses.cpl10; + maintainers = [ maintainers.ak ]; + platforms = platforms.unix; + }; +} + diff --git a/pkgs/tools/security/trousers/allow-non-tss-config-file-owner.patch b/pkgs/tools/security/trousers/allow-non-tss-config-file-owner.patch new file mode 100644 index 0000000000000000000000000000000000000000..774a14f72babe0807a9e95ae3571d89dcc51baed --- /dev/null +++ b/pkgs/tools/security/trousers/allow-non-tss-config-file-owner.patch @@ -0,0 +1,19 @@ +diff -ur trousers-0.3.11.2.orig/src/tcsd/tcsd_conf.c trousers-0.3.11.2/src/tcsd/tcsd_conf.c +--- trousers-0.3.11.2.orig/src/tcsd/tcsd_conf.c 2013-07-12 18:27:37.000000000 +0200 ++++ trousers-0.3.11.2/src/tcsd/tcsd_conf.c 2013-08-21 14:29:42.917231648 +0200 +@@ -763,6 +763,7 @@ + return TCSERR(TSS_E_INTERNAL_ERROR); + } + ++#ifndef ALLOW_NON_TSS_CONFIG_FILE + /* make sure user/group TSS owns the conf file */ + if (pw->pw_uid != stat_buf.st_uid || grp->gr_gid != stat_buf.st_gid) { + LogError("TCSD config file (%s) must be user/group %s/%s", tcsd_config_file, +@@ -775,6 +776,7 @@ + LogError("TCSD config file (%s) must be mode 0600", tcsd_config_file); + return TCSERR(TSS_E_INTERNAL_ERROR); + } ++#endif + #endif /* SOLARIS */ + + if ((f = fopen(tcsd_config_file, "r")) == NULL) { diff --git a/pkgs/tools/security/trousers/default.nix b/pkgs/tools/security/trousers/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..4c2af359b9645912fd19a5a5e7076b612c7c6a1f --- /dev/null +++ b/pkgs/tools/security/trousers/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl, openssl }: + +let + ver_maj = "0.3.11"; + ver_min = "2"; +in +stdenv.mkDerivation rec { + name = "trousers-${ver_maj}.${ver_min}"; + + src = fetchurl { + url = "mirror://sourceforge/trousers/trousers/${ver_maj}/${name}.tar.gz"; + sha256 = "1m9qi4452jr5yy4y9zyfi5ndwam5krq7ny8z2q3f91v1hcjgk5la"; + }; + + buildInputs = [ openssl ]; + + patches = [ # ./double-installed-man-page.patch + ./disable-install-rule.patch + ./allow-non-tss-config-file-owner.patch + ]; + + NIX_CFLAGS_COMPILE = "-DALLOW_NON_TSS_CONFIG_FILE"; + NIX_LDFLAGS = "-lgcc_s"; + + meta = with stdenv.lib; { + description = "TrouSerS is an CPL (Common Public License) licensed Trusted Computing Software Stack."; + homepage = http://trousers.sourceforge.net/; + license = licenses.cpl10; + maintainers = [ maintainers.ak ]; + platforms = platforms.unix; + }; +} + diff --git a/pkgs/tools/security/trousers/disable-install-rule.patch b/pkgs/tools/security/trousers/disable-install-rule.patch new file mode 100644 index 0000000000000000000000000000000000000000..698beac9ffde88e2851ad34afd893c170c7a07a2 --- /dev/null +++ b/pkgs/tools/security/trousers/disable-install-rule.patch @@ -0,0 +1,27 @@ +--- trousers-0.3.11/dist/Makefile.in 2013-08-14 06:49:37.597558787 +0200 ++++ trousers-0.3.11/dist/Makefile.in 2013-08-14 06:50:07.134510774 +0200 +@@ -363,16 +363,16 @@ + uninstall uninstall-am uninstall-hook + + install: install-exec-hook +- if test ! -e ${DESTDIR}/@sysconfdir@/tcsd.conf; then mkdir -p ${DESTDIR}/@sysconfdir@ && cp tcsd.conf ${DESTDIR}/@sysconfdir@; fi +- /bin/chown tss:tss ${DESTDIR}/@sysconfdir@/tcsd.conf || true +- /bin/chmod 0600 ${DESTDIR}/@sysconfdir@/tcsd.conf ++# echo if test ! -e ${DESTDIR}/@sysconfdir@/tcsd.conf; then mkdir -p ${DESTDIR}/@sysconfdir@ && cp tcsd.conf ${DESTDIR}/@sysconfdir@; fi ++ echo /bin/chown tss:tss ${DESTDIR}/@sysconfdir@/tcsd.conf || true ++ echo /bin/chmod 0600 ${DESTDIR}/@sysconfdir@/tcsd.conf + + install-exec-hook: +- /usr/sbin/groupadd tss || true +- /usr/sbin/useradd -r tss -g tss || true +- /bin/sh -c 'if [ ! -e ${DESTDIR}/@localstatedir@/lib/tpm ];then mkdir -p ${DESTDIR}/@localstatedir@/lib/tpm; fi' +- /bin/chown tss:tss ${DESTDIR}/@localstatedir@/lib/tpm || true +- /bin/chmod 0700 ${DESTDIR}/@localstatedir@/lib/tpm ++ echo /usr/sbin/groupadd tss || true ++ echo /usr/sbin/useradd -r tss -g tss || true ++ echo /bin/sh -c 'if [ ! -e ${DESTDIR}/@localstatedir@/lib/tpm ];then mkdir -p ${DESTDIR}/@localstatedir@/lib/tpm; fi' ++ echo /bin/chown tss:tss ${DESTDIR}/@localstatedir@/lib/tpm || true ++ echo /bin/chmod 0700 ${DESTDIR}/@localstatedir@/lib/tpm + + uninstall-hook: + /usr/sbin/userdel tss || true diff --git a/pkgs/tools/security/trousers/double-installed-man-page.patch b/pkgs/tools/security/trousers/double-installed-man-page.patch new file mode 100644 index 0000000000000000000000000000000000000000..6b40716120ea490521779f30c8c2bebeac6e1270 --- /dev/null +++ b/pkgs/tools/security/trousers/double-installed-man-page.patch @@ -0,0 +1,32 @@ +--- trousers-0.3.11/man/man3/Makefile.am 2013-08-14 04:57:47.018494495 +0200 ++++ trousers-0.3.11/man/man3/Makefile.am 2013-08-14 04:58:10.353453471 +0200 +@@ -75,7 +75,6 @@ + Tspi_TPM_TakeOwnership.3 \ + Tspi_TPM_GetAuditDigest.3 \ + Tspi_TPM_OwnerGetSRKPubKey.3 \ +- Tspi_TPM_Quote.3 \ + Tspi_TPM_CMKSetRestrictions.3 + if TSS_BUILD_DAA + man3_MANS += Tspi_DAA_IssueCredential.3 \ +--- trousers-0.3.11/man/man3/Makefile.in 2013-08-14 05:06:25.029490899 +0200 ++++ trousers-0.3.11/man/man3/Makefile.in 2013-08-14 05:06:43.153457942 +0200 +@@ -243,7 +243,7 @@ + Tspi_TPM_PcrExtend.3 Tspi_TPM_Quote.3 Tspi_TPM_SelfTestFull.3 \ + Tspi_TPM_SetStatus.3 Tspi_TPM_StirRandom.3 \ + Tspi_TPM_TakeOwnership.3 Tspi_TPM_GetAuditDigest.3 \ +- Tspi_TPM_OwnerGetSRKPubKey.3 Tspi_TPM_Quote.3 \ ++ Tspi_TPM_OwnerGetSRKPubKey.3 \ + Tspi_TPM_CMKSetRestrictions.3 $(am__append_1) + EXTRA_DIST = $(man3_MANS) + all: all-am +--- trousers-0.3.11/man/man3/Makefile 2013-08-14 05:07:05.686414845 +0200 ++++ trousers-0.3.11/man/man3/Makefile 2013-08-14 05:07:23.233381327 +0200 +@@ -243,7 +243,7 @@ + Tspi_TPM_PcrExtend.3 Tspi_TPM_Quote.3 Tspi_TPM_SelfTestFull.3 \ + Tspi_TPM_SetStatus.3 Tspi_TPM_StirRandom.3 \ + Tspi_TPM_TakeOwnership.3 Tspi_TPM_GetAuditDigest.3 \ +- Tspi_TPM_OwnerGetSRKPubKey.3 Tspi_TPM_Quote.3 \ ++ Tspi_TPM_OwnerGetSRKPubKey.3 \ + Tspi_TPM_CMKSetRestrictions.3 $(am__append_1) + EXTRA_DIST = $(man3_MANS) + all: all-am diff --git a/pkgs/tools/system/acct/default.nix b/pkgs/tools/system/acct/default.nix index cd9519590cc4dc5be7c5f118e04a77183761cc33..0bea6bec3547093c130a7537656f6882b865bf3f 100644 --- a/pkgs/tools/system/acct/default.nix +++ b/pkgs/tools/system/acct/default.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { execution statistics. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; homepage = http://www.gnu.org/software/acct/; maintainers = [ ]; - platforms = stdenv.lib.platforms.allBut "i686-cygwin"; + platforms = with stdenv.lib.platforms; allBut cygwin; }; } diff --git a/pkgs/tools/system/ansible/default.nix b/pkgs/tools/system/ansible/default.nix index 7d96092a3ceb92192e3eeaac343c1e8e1261346b..b3d40712926caa3d45374950307059c61a39bc62 100644 --- a/pkgs/tools/system/ansible/default.nix +++ b/pkgs/tools/system/ansible/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, pythonPackages, python }: pythonPackages.buildPythonPackage rec { - version = "1.6.1"; + version = "1.6.10"; name = "ansible-${version}"; namePrefix = ""; src = fetchurl { url = "https://github.com/ansible/ansible/archive/v${version}.tar.gz"; - sha256 = "1iz1q2h0zll4qsxk0pndc59knasw663kv53sm21q57qz7lf30q9z"; + sha256 = "0j133353skzb6ydrqqgfkzbkkj1zaibl1x8sgl0arnfma8qky1g1"; }; prePatch = '' diff --git a/pkgs/tools/system/at/default.nix b/pkgs/tools/system/at/default.nix index 252400bd7f46c3ef1c402d13c822fdd7997e0992..2964db34e1243104ff670876f245ac44fc8db394 100644 --- a/pkgs/tools/system/at/default.nix +++ b/pkgs/tools/system/at/default.nix @@ -1,12 +1,12 @@ { fetchurl, stdenv, bison, flex, pam, ssmtp }: stdenv.mkDerivation { - name = "at-3.1.12"; + name = "at-3.1.14"; src = fetchurl { # Debian is apparently the last location where it can be found. - url = mirror://debian/pool/main/a/at/at_3.1.12.orig.tar.gz; - sha256 = "1wqqrj4lg2ix79ib5kz7lk4hbs1zpw72n6zkd2gdv2my9ymwcmbw"; + url = mirror://debian/pool/main/a/at/at_3.1.14.orig.tar.gz; + sha256 = "cd092bf05d29c25b286f55a960ce8b8c3c5beb571d86ed8eb1dfb3b61291b3ae"; }; patches = [ ./install.patch ]; @@ -35,7 +35,7 @@ stdenv.mkDerivation { meta = { description = ''The classical Unix `at' job scheduling command''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://packages.qa.debian.org/at; }; } diff --git a/pkgs/tools/system/at/install.patch b/pkgs/tools/system/at/install.patch index 9db336e9bfe31fd0277183b27992e72e0de407f3..0297d680aa46824fb8655783bdb0b404098a25f2 100644 --- a/pkgs/tools/system/at/install.patch +++ b/pkgs/tools/system/at/install.patch @@ -1,6 +1,6 @@ ---- at-3.1.10.1/Makefile.in 2005-08-29 10:08:28.000000000 +0200 -+++ at-3.1.10.1/Makefile.in 2008-04-01 11:05:38.000000000 +0200 -@@ -88,35 +88,28 @@ atrun: atrun.in +--- at-3.1.14/Makefile.in 2013-09-08 14:43:53.000000000 +0200 ++++ at-3.1.14/Makefile.in 2014-07-27 20:42:04.017703443 +0200 +@@ -91,35 +91,28 @@ $(CC) -c $(CFLAGS) $(DEFS) $*.c install: all @@ -15,7 +15,7 @@ - chmod 600 $(IROOT)$(LFILE) - chown $(DAEMON_USERNAME):$(DAEMON_GROUPNAME) $(IROOT)$(LFILE) - test -f $(IROOT)$(etcdir)/at.allow || test -f $(IROOT)$(etcdir)/at.deny || $(INSTALL) -o root -g $(DAEMON_GROUPNAME) -m 640 at.deny $(IROOT)$(etcdir)/ -- $(INSTALL) -g $(DAEMON_GROUPNAME) -o $(DAEMON_USERNAME) -m 6755 -s at $(IROOT)$(bindir) +- $(INSTALL) -g $(DAEMON_GROUPNAME) -o $(DAEMON_USERNAME) -m 6755 at $(IROOT)$(bindir) + $(INSTALL) -m 755 -d $(IROOT)$(bindir) + $(INSTALL) -m 755 -d $(IROOT)$(sbindir) + $(INSTALL) -m 755 -d $(IROOT)$(docdir) @@ -27,7 +27,7 @@ - $(INSTALL) -d -o root -g root -m 755 $(IROOT)$(man1dir) - $(INSTALL) -d -o root -g root -m 755 $(IROOT)$(man5dir) - $(INSTALL) -d -o root -g root -m 755 $(IROOT)$(man8dir) -- $(INSTALL) -g root -o root -m 755 -s atd $(IROOT)$(sbindir) +- $(INSTALL) -g root -o root -m 755 atd $(IROOT)$(sbindir) - $(INSTALL) -g root -o root -m 755 atrun $(IROOT)$(sbindir) - $(INSTALL) -g root -o root -m 644 at.1 $(IROOT)$(man1dir)/ + $(INSTALL) -m 755 batch $(IROOT)$(bindir) @@ -44,12 +44,11 @@ - $(INSTALL) -g root -o root -m 644 tmpman $(IROOT)$(man8dir)/atrun.8 + $(INSTALL) -m 644 tmpman $(IROOT)$(man8dir)/atrun.8 rm -f tmpman -- $(INSTALL) -g root -o root -m 644 at_allow.5 $(IROOT)$(man5dir)/ -+ $(INSTALL) -m 644 at_allow.5 $(IROOT)$(man5dir)/ - cd $(IROOT)$(man5dir) && $(LN_S) -f at_allow.5 at_deny.5 +- $(INSTALL) -g root -o root -m 644 at.allow.5 $(IROOT)$(man5dir)/ ++ $(INSTALL) -m 644 at.allow.5 $(IROOT)$(man5dir)/ + cd $(IROOT)$(man5dir) && $(LN_S) -f at.allow.5 at.deny.5 - $(INSTALL) -g root -o root -m 644 $(DOCS) $(IROOT)$(atdocdir) + $(INSTALL) -m 644 $(DOCS) $(IROOT)$(atdocdir) rm -f $(IROOT)$(mandir)/cat1/at.1* $(IROOT)$(mandir)/cat1/batch.1* \ $(IROOT)$(mandir)/cat1/atq.1* rm -f $(IROOT)$(mandir)/cat1/atd.8* - diff --git a/pkgs/tools/system/collectd/default.nix b/pkgs/tools/system/collectd/default.nix index bc4bca887c801338313d8c2ad10a9bce0457937f..4210a0a04a5aa5cd847a638806b6cf4b3f59f033 100644 --- a/pkgs/tools/system/collectd/default.nix +++ b/pkgs/tools/system/collectd/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { name = "collectd-5.4.1"; - + src = fetchurl { url = "http://collectd.org/files/${name}.tar.bz2"; sha256 = "1q365zx6d1wyhv7n97bagfxqnqbhj2j14zz552nhmjviy8lj2ibm"; diff --git a/pkgs/tools/system/ddrescue/default.nix b/pkgs/tools/system/ddrescue/default.nix index d2ace27b1fd694eb223aa347ddda6db785e86c2f..e247c84dcf908bd93138a7970b42d18298391757 100644 --- a/pkgs/tools/system/ddrescue/default.nix +++ b/pkgs/tools/system/ddrescue/default.nix @@ -1,18 +1,18 @@ { stdenv, fetchurl, lzip }: stdenv.mkDerivation rec { - name = "ddrescue-1.17"; + name = "ddrescue-1.18.1"; src = fetchurl { url = "mirror://gnu/ddrescue/${name}.tar.lz"; - sha256 = "0bvmsbzli2j4czwkabzs978n1y6vx31axh02kpgcf7033cc6rydy"; + sha256 = "1ad1ifby89wys8lxh4d24y5lih6hkz54jhv6sf6bs1i7sd7lnqaq"; }; buildInputs = [ lzip ]; doCheck = true; - meta = { + meta = with stdenv.lib; { description = "GNU ddrescue, a data recovery tool"; longDescription = @@ -40,9 +40,9 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/ddrescue/ddrescue.html; - license = "GPLv3+"; + license = licenses.gpl3Plus; - platforms = stdenv.lib.platforms.all; - maintainers = with stdenv.lib.maintainers; [ iElectric ]; + platforms = platforms.all; + maintainers = with maintainers; [ iElectric ]; }; } diff --git a/pkgs/tools/system/efibootmgr/default.nix b/pkgs/tools/system/efibootmgr/default.nix index 81206a132965829fbf16198590b4927cecc2be96..67b97ea75b153db7e6160e4ef2a0aad28a4d04ed 100644 --- a/pkgs/tools/system/efibootmgr/default.nix +++ b/pkgs/tools/system/efibootmgr/default.nix @@ -27,4 +27,3 @@ stdenv.mkDerivation rec { platforms = platforms.linux; }; } - diff --git a/pkgs/tools/system/evemu/default.nix b/pkgs/tools/system/evemu/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..90833b83683d22d2dde6e2022eb90716d5851197 --- /dev/null +++ b/pkgs/tools/system/evemu/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchgit, automake, autoconf, libtool, pkgconfig, pythonPackages +, libevdev, linuxHeaders +}: + +stdenv.mkDerivation rec { + name = "evemu-${version}"; + version = "2.0.0"; + + # We could have downloaded a release tarball from cgit, but it changes hash + # each time it is downloaded :/ + src = fetchgit { + url = git://git.freedesktop.org/git/evemu; + rev = "refs/tags/v${version}"; + sha256 = "1509b524a2483054a45698c485968094dd8c0f857bba7333449e9d05acbfbd2c"; + }; + + buildInputs = [ + automake autoconf libtool pkgconfig pythonPackages.python + pythonPackages.evdev libevdev + ]; + + preConfigure = '' + ./autogen.sh --prefix=$out + ''; + + postPatch = '' + substituteInPlace src/make-event-names.py --replace "/usr/include/linux/input.h" "${linuxHeaders}/include/linux/input.h" + ''; + + meta = with stdenv.lib; { + description = "Records and replays device descriptions and events to emulate input devices through the kernel's input system"; + homepage = http://www.freedesktop.org/wiki/Evemu/; + repositories.git = git://git.freedesktop.org/git/evemu; + license = licenses.gpl2; + maintainers = [ maintainers.amorsillo ]; + }; +} diff --git a/pkgs/tools/system/fakeroot/default.nix b/pkgs/tools/system/fakeroot/default.nix index 1bf18ed867c302896fddcaf53e84b7f3778e92ce..9764ae6ce0e4e202a4c871595e44a9cdc6236d48 100644 --- a/pkgs/tools/system/fakeroot/default.nix +++ b/pkgs/tools/system/fakeroot/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://fakeroot.alioth.debian.org/; description = "Give a fake root environment through LD_PRELOAD"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/system/fcron/default.nix b/pkgs/tools/system/fcron/default.nix index 5a70843ff6bbb6bc51f65394d37038128b9a1f3e..f546cd8f5ffc6e34e5cde42c5393967ad3c1545c 100644 --- a/pkgs/tools/system/fcron/default.nix +++ b/pkgs/tools/system/fcron/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { meta = { description="A command scheduler with extended capabilities over cron and anacron"; homepage = http://fcron.free.fr; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/tools/system/fdisk/default.nix b/pkgs/tools/system/fdisk/default.nix index e72497cf7c4e0d49f06c4f6989ef2c0520f2b136..9a4ac260ecc751320cf04cc85963487d10a80f1c 100644 --- a/pkgs/tools/system/fdisk/default.nix +++ b/pkgs/tools/system/fdisk/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { cfdisk. It uses GNU Parted. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; homepage = http://www.gnu.org/software/fdisk/; diff --git a/pkgs/tools/system/fio/default.nix b/pkgs/tools/system/fio/default.nix index b4ddca4371e6da6a98e5bb3edd33f496668a48e1..c408c0f34ea8ee69c79e457b04d02c49fb1d3479 100644 --- a/pkgs/tools/system/fio/default.nix +++ b/pkgs/tools/system/fio/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { meta = { homepage = "http://git.kernel.dk/?p=fio.git;a=summary"; description = "Flexible IO Tester - an IO benchmark tool"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/tools/system/freeipmi/default.nix b/pkgs/tools/system/freeipmi/default.nix index 2bfa77164b81f33db78f7b35b0ba628d8894a51c..21a67dba305c7cae6d73bd036624348799b37796 100644 --- a/pkgs/tools/system/freeipmi/default.nix +++ b/pkgs/tools/system/freeipmi/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/freeipmi/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [ raskin ]; platforms = stdenv.lib.platforms.gnu; # arbitrary choice diff --git a/pkgs/tools/system/gptfdisk/default.nix b/pkgs/tools/system/gptfdisk/default.nix index 93dfab9a1a47ad4fcfbf8f98c48151e0bc7732b3..0fe4cbc986c1093a613877dcf84b697c32270bba 100644 --- a/pkgs/tools/system/gptfdisk/default.nix +++ b/pkgs/tools/system/gptfdisk/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "A set of text-mode partitioning tools for Globally Unique Identifier (GUID) Partition Table (GPT) disks"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; homepage = http://www.rodsbooks.com/gdisk/; @@ -32,4 +32,3 @@ stdenv.mkDerivation rec { platforms = stdenv.lib.platforms.linux; }; } - diff --git a/pkgs/tools/system/gt5/default.nix b/pkgs/tools/system/gt5/default.nix index ab682c60921a8051daed428364b7cf84597f9f65..ea121b0e43c99a0fef5ed94db27d808445a1d390 100644 --- a/pkgs/tools/system/gt5/default.nix +++ b/pkgs/tools/system/gt5/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "A diff-capable 'du' browser"; homepage = http://gt5.sourceforge.net/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/system/idle3tools/default.nix b/pkgs/tools/system/idle3tools/default.nix index 1325b52b380892b4c7f04d77d0691ee737171de2..d1631776d3939a4c00419e845f211ae0764a472d 100644 --- a/pkgs/tools/system/idle3tools/default.nix +++ b/pkgs/tools/system/idle3tools/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { meta = { homepage = http://idle3-tools.sourceforge.net/; description = "Tool to get/set the infamous idle3 timer in WD HDDs"; - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/system/logcheck/default.nix b/pkgs/tools/system/logcheck/default.nix index 208ff837b3460db6ac1fef7bd90f4db60f201bdd..88c9a4eecd1f4aa11f568aa255367149311e60d4 100644 --- a/pkgs/tools/system/logcheck/default.nix +++ b/pkgs/tools/system/logcheck/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { Logcheck was part of the Abacus Project of security tools, but this version has been rewritten. ''; homepage = http://logcheck.org; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.bluescreen303 ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/tools/system/logrotate/default.nix b/pkgs/tools/system/logrotate/default.nix index b623400960272c072ac4ae78f76f07eefceb48c9..964ee217108d0c74c6dc209d8a08c530ba808209 100644 --- a/pkgs/tools/system/logrotate/default.nix +++ b/pkgs/tools/system/logrotate/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { homepage = https://fedorahosted.org/releases/l/o/logrotate/; description = "Rotates and compresses system logs"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.viric ]; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/tools/system/mcron/default.nix b/pkgs/tools/system/mcron/default.nix index 2b4f28fa868d4d3a22b8396c2f88522690353613..4bf958959961b80dcbd52b2bd47c169b65495686 100644 --- a/pkgs/tools/system/mcron/default.nix +++ b/pkgs/tools/system/mcron/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/mcron/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; }; } diff --git a/pkgs/tools/system/monit/default.nix b/pkgs/tools/system/monit/default.nix index 8e4848f2db62ff4c03936ee2bf111c72daa9414b..41a94ff2f2e3e6ad2672c5f703bb5aa839edbc25 100644 --- a/pkgs/tools/system/monit/default.nix +++ b/pkgs/tools/system/monit/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { homepage = http://mmonit.com/monit/; description = "Monitoring system"; license = stdenv.lib.licenses.agpl3; - maintainer = with stdenv.lib.maintainers; [ raskin wmertens ]; + maintainers = with stdenv.lib.maintainers; [ raskin wmertens ]; }; } diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix index 3fe05e941b6cf9181dca1e5e15d47ac9577af042..d18c2737854ad174ce9b82c71e36f02c1701d62a 100644 --- a/pkgs/tools/system/rsyslog/default.nix +++ b/pkgs/tools/system/rsyslog/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = { homepage = "http://www.rsyslog.com/"; description = "Enhanced syslog implementation"; - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/system/safecopy/default.nix b/pkgs/tools/system/safecopy/default.nix index a6a5fced87943efbac1d293a2809924ee70a9e7f..304d8f21eb289f595d29989c04f41fc7211846b6 100644 --- a/pkgs/tools/system/safecopy/default.nix +++ b/pkgs/tools/system/safecopy/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { homepage = http://safecopy.sourceforge.net; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.bluescreen303 ]; diff --git a/pkgs/tools/system/sizes/default.nix b/pkgs/tools/system/sizes/default.nix index c8c983b417049e562fec3d88da7428a5ffc240d9..a20a40f701c24a053bc42ba88248afd3a2ab2cd1 100644 --- a/pkgs/tools/system/sizes/default.nix +++ b/pkgs/tools/system/sizes/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "sizes"; - version = "2.3.1.1"; - sha256 = "1k7rvcj5sp30zwm16wnsw40y4rkqnfxlrl3ridqhp91q8286qjbs"; + version = "2.3.2"; + sha256 = "0xns0xl3khks1jvsmxh0nqf1saxs7qscvkbcg4270pp7n6lziqdg"; isLibrary = false; isExecutable = true; buildDepends = [ diff --git a/pkgs/tools/system/storebrowse/default.nix b/pkgs/tools/system/storebrowse/default.nix index 1a3bfa69d1adadd6fa8d3aac8915996e81a74896..041dd96e1ca8196c0729174ca4c95aac27e176a4 100644 --- a/pkgs/tools/system/storebrowse/default.nix +++ b/pkgs/tools/system/storebrowse/default.nix @@ -34,12 +34,12 @@ stdenv.mkDerivation rec { ''; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin cp storebrowse $out/bin ''; meta = { homepage = http://viric.name/cgi-bin/storebrowse; - license = "AGPLv3+"; + license = stdenv.lib.licenses.agpl3Plus; }; } diff --git a/pkgs/tools/system/syslog-ng-incubator/default.nix b/pkgs/tools/system/syslog-ng-incubator/default.nix index 93cc7fa7c5da82760d6dee2720b355b4debf03df..34a0f15ec1dbe8775005964f513bd6870d94ad8d 100644 --- a/pkgs/tools/system/syslog-ng-incubator/default.nix +++ b/pkgs/tools/system/syslog-ng-incubator/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "syslog-ng-incubator-${version}"; - version = "0.3.1"; + version = "0.3.3"; src = fetchurl { url = "https://github.com/balabit/syslog-ng-incubator/archive/${name}.tar.gz"; - sha256 = "0zr0vlp7cq3qfhqhalf7rdyd54skswxnc9j9wi8sfmz3psy3vd4y"; + sha256 = "1yx2gdq1vhrcp113hxgl66z5df4ya9nznvq00nvy4v9yn8wf9fb8"; }; buildInputs = [ diff --git a/pkgs/tools/system/syslog-ng/default.nix b/pkgs/tools/system/syslog-ng/default.nix index 9102482d3d636a48b7598d682aaacf60d0b713c9..a62f81052bad2b8f735c93833cf6a3f36348777f 100644 --- a/pkgs/tools/system/syslog-ng/default.nix +++ b/pkgs/tools/system/syslog-ng/default.nix @@ -1,11 +1,13 @@ { stdenv, fetchurl, eventlog, pkgconfig, glib, python, systemd, perl }: -stdenv.mkDerivation { - name = "syslog-ng-3.5.4.1"; +stdenv.mkDerivation rec { + name = "syslog-ng-${version}"; + + version = "3.5.6"; src = fetchurl { - url = "http://www.balabit.com/downloads/files?path=/syslog-ng/sources/3.5.4.1/source/syslog-ng_3.5.4.1.tar.gz"; - sha256 = "0rkgrmnyx1x6m3jw5n49k7r1dcg79lxh900g74rgvd3j86g9dilj"; + url = "http://www.balabit.com/downloads/files?path=/syslog-ng/sources/${version}/source/syslog-ng_${version}.tar.gz"; + sha256 = "19i1idklpgn6mz0mg7194by5fjgvvh5n4v2a0rr1z0778l2038kc"; }; buildInputs = [ eventlog pkgconfig glib python systemd perl ]; @@ -16,9 +18,10 @@ stdenv.mkDerivation { "--with-systemdsystemunitdir=$(out)/etc/systemd/system" ]; - meta = { + meta = with stdenv.lib; { homepage = "http://www.balabit.com/network-security/syslog-ng/"; description = "Next-generation syslogd with advanced networking and filtering capabilities"; - license = "GPLv2"; + license = licenses.gpl2; + maintainers = [ maintainers.rickynils ]; }; } diff --git a/pkgs/tools/system/tree/default.nix b/pkgs/tools/system/tree/default.nix index afb6073b539ebf0535c2d55b3be8cd6dd4d89bde..e108589aaefee8296a11c09a8fbe3080b0e2fd29 100644 --- a/pkgs/tools/system/tree/default.nix +++ b/pkgs/tools/system/tree/default.nix @@ -8,7 +8,7 @@ let # manually, so we have to duplicate the know how here. systemFlags = if stdenv.isDarwin then '' - CFLAGS="-O2 -Wall -fomit-frame-pointer -no-cpp-precomp" + CFLAGS="-O2 -Wall -fomit-frame-pointer" LDFLAGS= EXTRA_OBJS=strverscmp.o '' else if stdenv.isCygwin then '' @@ -43,7 +43,7 @@ stdenv.mkDerivation { meta = { homepage = "http://mama.indstate.edu/users/ice/tree/"; description = "command to produce a depth indented directory listing"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; longDescription = '' Tree is a recursive directory listing command that produces a diff --git a/pkgs/tools/system/vboot_reference/default.nix b/pkgs/tools/system/vboot_reference/default.nix index e1c4734bbdaf1c0dc3130621f6d6d1e4d569ad4a..087a3212fc2e7bd0a367a8e63e4d982bb086e871 100644 --- a/pkgs/tools/system/vboot_reference/default.nix +++ b/pkgs/tools/system/vboot_reference/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ''; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin cp build/cgpt/cgpt $out/bin cp build/utility/vbutil_kernel $out/bin cp build/utility/vbutil_key $out/bin diff --git a/pkgs/tools/text/catdoc/default.nix b/pkgs/tools/text/catdoc/default.nix index e056af26877c16b7cb4cf12c802b2b754cb2f8e7..2865e5b34826f58a3e58cdbe1486ebf0e4fc9b03 100644 --- a/pkgs/tools/text/catdoc/default.nix +++ b/pkgs/tools/text/catdoc/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "MS-Word/Excel/PowerPoint to text converter"; platforms = platforms.all; - license = "GPL2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ maintainers.urkud ]; }; } diff --git a/pkgs/tools/text/convertlit/default.nix b/pkgs/tools/text/convertlit/default.nix index 05494e54a3ecf8c1151bbdcea3547c3c01b5b351..aaa458b05cb10bde1697d7e2c6fd4fb5c6201d57 100644 --- a/pkgs/tools/text/convertlit/default.nix +++ b/pkgs/tools/text/convertlit/default.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation { meta = { homepage = http://www.convertlit.com/; description = "A tool for converting Microsoft Reader ebooks to more open formats"; - license = "GPL"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/tools/text/dos2unix/default.nix b/pkgs/tools/text/dos2unix/default.nix index dc61723e59776886576917baf6069ddecdb32989..a87901eb5eb916638906049beae553e759be12ea 100644 --- a/pkgs/tools/text/dos2unix/default.nix +++ b/pkgs/tools/text/dos2unix/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = { homepage = http://waterlan.home.xs4all.nl/dos2unix.html; description = "Tools to transform text files from dos to unix formats and vicervesa"; - license = "BSD"; + license = stdenv.lib.licenses.bsd2; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; all; }; diff --git a/pkgs/tools/text/enca/default.nix b/pkgs/tools/text/enca/default.nix index 23223572bb2387bc439f9c1fd230b0a4b2dad87b..14014d06052d9c2754bb2a1b0af01f1b65ff03d5 100644 --- a/pkgs/tools/text/enca/default.nix +++ b/pkgs/tools/text/enca/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { Unicode variants, independently on language. ''; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/tools/text/enscript/default.nix b/pkgs/tools/text/enscript/default.nix index 7bb7060d5c2dac9e3aa4221f65df1f78ebbc1f55..fe11ec59246357905cd6344ac7a10fcb72a318a3 100644 --- a/pkgs/tools/text/enscript/default.nix +++ b/pkgs/tools/text/enscript/default.nix @@ -8,6 +8,13 @@ stdenv.mkDerivation rec { sha256 = "1fy0ymvzrrvs889zanxcaxjfcxarm2d3k43c9frmbl1ld7dblmkd"; }; + preBuild = + '' + # Fix building on Darwin with GCC. + substituteInPlace compat/regex.c --replace \ + __private_extern__ '__attribute__ ((visibility ("hidden")))' + ''; + buildInputs = [ gettext ]; doCheck = true; @@ -26,7 +33,7 @@ stdenv.mkDerivation rec { it has many options that can be used to customize printouts. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; homepage = http://www.gnu.org/software/enscript/; diff --git a/pkgs/tools/text/gawk/default.nix b/pkgs/tools/text/gawk/default.nix index b231f2875c092aec7e48b6380316df94cbe03c0b..8866888a736768d0878fca7415e4e227e92cc788 100644 --- a/pkgs/tools/text/gawk/default.nix +++ b/pkgs/tools/text/gawk/default.nix @@ -8,8 +8,6 @@ stdenv.mkDerivation rec { sha256 = "0hin2hswbbd6kd6i4zzvgciwpl5fba8d2s524z8y5qagyz3x010q"; }; - patches = []; - doCheck = !stdenv.isCygwin; # XXX: `test-dup2' segfaults on Cygwin 6.1 buildInputs = [ libsigsegv ] @@ -20,6 +18,8 @@ stdenv.mkDerivation rec { # only darwin where reported, seems OK on non-chrooted Fedora (don't rebuild stdenv) ++ stdenv.lib.optional (!readlineSupport && stdenv.isDarwin) "--without-readline"; + postInstall = "rm $out/bin/gawk-*"; + meta = { homepage = http://www.gnu.org/software/gawk/; description = "GNU implementation of the Awk programming language"; @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { lines of code. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; }; diff --git a/pkgs/tools/text/gnugrep/default.nix b/pkgs/tools/text/gnugrep/default.nix index bdf19161e43120e01965ea40225b3e7662aeff3f..6e83bd357b2710e30c5ed8e0343f4c5432d420e7 100644 --- a/pkgs/tools/text/gnugrep/default.nix +++ b/pkgs/tools/text/gnugrep/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation { prints the matching lines. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/tools/text/gnupatch/default.nix b/pkgs/tools/text/gnupatch/default.nix index 1ad40a4a5fa01129d496fb1b3fc19455c468dbff..7b38227cfcc10308b2c860d8bec18b530067aff9 100644 --- a/pkgs/tools/text/gnupatch/default.nix +++ b/pkgs/tools/text/gnupatch/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { homepage = http://savannah.gnu.org/projects/patch; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/tools/text/gnused/default.nix b/pkgs/tools/text/gnused/default.nix index cf30169acef14116c8b1babc59e08a48cded272e..b1c5910029dd791aeb2f96763fa658f45955dded 100644 --- a/pkgs/tools/text/gnused/default.nix +++ b/pkgs/tools/text/gnused/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { multiple occurrences of a string within a file. ''; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.all; maintainers = [ ]; diff --git a/pkgs/tools/text/groff/default.nix b/pkgs/tools/text/groff/default.nix index f4d3169f2fae61dc3a990a2d87eab2005ed47eb5..97cc3c611733f0839ecce3e9d213bf1232accefa 100644 --- a/pkgs/tools/text/groff/default.nix +++ b/pkgs/tools/text/groff/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.gnu.org/software/groff/"; description = "GNU Troff, a typesetting package that reads plain text and produces formatted output"; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.all; longDescription = '' diff --git a/pkgs/tools/text/html-tidy/default.nix b/pkgs/tools/text/html-tidy/default.nix index ea06a6255508c959c8f8ae5bdbc55b5f405aae96..247cb67da56c8cbe10413e3c09186adcaeb1fe9d 100644 --- a/pkgs/tools/text/html-tidy/default.nix +++ b/pkgs/tools/text/html-tidy/default.nix @@ -32,7 +32,7 @@ let date = "2009-07-04"; in used to validate and fix HTML data. ''; - license = "MIT"; + license = stdenv.lib.licenses.mit; homepage = http://tidy.sourceforge.net/; diff --git a/pkgs/tools/text/kdiff3/default.nix b/pkgs/tools/text/kdiff3/default.nix index 52781ed37927e6aa0fe88111eab4d7da02b5078f..eeac7b7f63fadca142aaa646d13958cb93a0ef39 100644 --- a/pkgs/tools/text/kdiff3/default.nix +++ b/pkgs/tools/text/kdiff3/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://kdiff3.sourceforge.net/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; description = "Compares and merges 2 or 3 files or directories"; maintainers = with stdenv.lib.maintainers; [viric urkud]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/tools/text/mairix/default.nix b/pkgs/tools/text/mairix/default.nix index 551d0b9f74a96e15dad423066dd924b3cb5fdb28..97fcd0629847c27f3c7b32094b7b10a71300e668 100644 --- a/pkgs/tools/text/mairix/default.nix +++ b/pkgs/tools/text/mairix/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.rc0.org.uk/mairix; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; description = "Program for indexing and searching email messages stored in maildir, MH or mbox"; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; all; diff --git a/pkgs/tools/text/multitran/data/default.nix b/pkgs/tools/text/multitran/data/default.nix index dbf13a6332b5d3ad4888c77314dd5e0251b01331..d0e39add665ab201deeaa623e00d2988430ea2a0 100644 --- a/pkgs/tools/text/multitran/data/default.nix +++ b/pkgs/tools/text/multitran/data/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation { meta = { homepage = http://multitran.sourceforge.net/; description = "Multitran data english-russian"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/tools/text/multitran/libbtree/default.nix b/pkgs/tools/text/multitran/libbtree/default.nix index 45dcf922d8e8081f25d74d0e57171a7bc83d3a19..3abe03b2a4eaa6fb68a5526f25860f160804a415 100644 --- a/pkgs/tools/text/multitran/libbtree/default.nix +++ b/pkgs/tools/text/multitran/libbtree/default.nix @@ -13,6 +13,6 @@ stdenv.mkDerivation { meta = { homepage = http://multitran.sourceforge.net/; description = "Multitran lib: library for reading Multitran's BTREE database format"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/tools/text/multitran/libfacet/default.nix b/pkgs/tools/text/multitran/libfacet/default.nix index 6dab8f86c32705dae8491354278127176502f90a..0f5032c4a175d7325697aeb6dc66f44a103e3e35 100644 --- a/pkgs/tools/text/multitran/libfacet/default.nix +++ b/pkgs/tools/text/multitran/libfacet/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation { meta = { homepage = http://multitran.sourceforge.net/; description = "Multitran lib: enchanced locale facets"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/tools/text/multitran/libmtquery/default.nix b/pkgs/tools/text/multitran/libmtquery/default.nix index fe3e3b7317d295a75b15d8286889d11c3f6d7763..b3e5f12407d8168147c2c7ac7206cd412eb1ec47 100644 --- a/pkgs/tools/text/multitran/libmtquery/default.nix +++ b/pkgs/tools/text/multitran/libmtquery/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation { meta = { homepage = http://multitran.sourceforge.net/; description = "Multitran lib: main engine to query translations"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/tools/text/multitran/libmtsupport/default.nix b/pkgs/tools/text/multitran/libmtsupport/default.nix index 3c77b50bee88f3fd682d20b0cf833e980fe77f12..e73ba43791a9b824d4db23895cebf2eed934decb 100644 --- a/pkgs/tools/text/multitran/libmtsupport/default.nix +++ b/pkgs/tools/text/multitran/libmtsupport/default.nix @@ -13,6 +13,6 @@ stdenv.mkDerivation { meta = { homepage = http://multitran.sourceforge.net/; description = "Multitran lib: basic useful functions"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/tools/text/multitran/mtutils/default.nix b/pkgs/tools/text/multitran/mtutils/default.nix index fb3856176d96d55add2f10f94765a3982ef3cc8f..b03b1b110c4b68daeeda8d464bd1510a9c4f29d5 100644 --- a/pkgs/tools/text/multitran/mtutils/default.nix +++ b/pkgs/tools/text/multitran/mtutils/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { meta = { homepage = http://multitran.sourceforge.net/; description = "Multitran: simple command line utilities for dictionary maintainance"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/text/namazu/default.nix b/pkgs/tools/text/namazu/default.nix index 21024c4aaad4db15976516be4bf9c94a9a8f680c..fba52b69fbafd1372394d6576f559f9f3aed600f 100644 --- a/pkgs/tools/text/namazu/default.nix +++ b/pkgs/tools/text/namazu/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { but also as a personal search system for email or other files. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://namazu.org/; platforms = stdenv.lib.platforms.gnu; # arbitrary choice diff --git a/pkgs/tools/text/peco/default.nix b/pkgs/tools/text/peco/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..be49ba509200b77649f3fe08c3d86f9fa8ea6371 --- /dev/null +++ b/pkgs/tools/text/peco/default.nix @@ -0,0 +1,63 @@ +{ stdenv, go, fetchgit }: + +let + go-flags = fetchgit { + url = "git://github.com/jessevdk/go-flags"; + rev = "4f0ca1e2d1349e9662b633ea1b8b8d48e8a32533"; + sha256 = "5f22f4c5a0529ff0da8e507462ad910bb73c513fde49d58dd4baf7332787ca3d"; + }; + go-runewidth = fetchgit { + url = "git://github.com/mattn/go-runewidth"; + rev = "36f63b8223e701c16f36010094fb6e84ffbaf8e0"; + sha256 = "718e9e04659441744b8d43bd3d7e806836194cf322962712a6e019311d407ecf"; + }; + termbox-go = fetchgit { + url = "git://github.com/nsf/termbox-go"; + rev = "4e63c3a917c197694cb4fef6c55582500b3741e3"; + sha256 = "00ecc0dcf0919a42ea06fe3bd93480a17241160c434ff3872b6f5e418eb18069"; + }; +in stdenv.mkDerivation rec { + name = "peco-${version}"; + version = "0.2.3"; + + src = fetchgit { + url = "git://github.com/peco/peco"; + rev = "b8e0c8f37d3eed68e64c931b0edb77728f3723f9"; + sha256 = "f178e01ab0536770b17eddcefd863e68c2d65b527b5da1fc3fb9efb19c12635f"; + }; + + buildInputs = [ go ]; + + sourceRoot = "."; + + buildPhase = '' + mkdir -p src/github.com/jessevdk/go-flags/ + ln -s ${go-flags}/* src/github.com/jessevdk/go-flags + + mkdir -p src/github.com/mattn/go-runewidth/ + ln -s ${go-runewidth}/* src/github.com/mattn/go-runewidth + + mkdir -p src/github.com/nsf/termbox-go/ + ln -s ${termbox-go}/* src/github.com/nsf/termbox-go + + mkdir -p src/github.com/peco/peco + ln -s ${src}/* src/github.com/peco/peco + + export GOPATH=$PWD + go build -v -o peco src/github.com/peco/peco/cmd/peco/peco.go + ''; # */ + + installPhase = '' + ensureDir $out/bin + cp peco $out/bin + ''; + + meta = with stdenv.lib; { + description = "Simplistic interactive filtering tool"; + homepage = https://github.com/peco/peco; + license = licenses.mit; + # peco should work on Windows or other POSIX platforms, but the go package + # declares only linux and darwin. + platforms = platforms.linux ++ platforms.darwin; + }; +} diff --git a/pkgs/tools/text/qshowdiff/default.nix b/pkgs/tools/text/qshowdiff/default.nix index 7c76c7f1bca23856b3277b34e3a5461149bd6c60..a2d6e360a374f317de089b77524a19d852ce4f34 100644 --- a/pkgs/tools/text/qshowdiff/default.nix +++ b/pkgs/tools/text/qshowdiff/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://qshowdiff.danfis.cz/; description = "Colourful diff viewer"; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; }; } diff --git a/pkgs/tools/text/sgml/openjade/default.nix b/pkgs/tools/text/sgml/openjade/default.nix index fc7ee9f6f0662e9be14b28ff950b7a27fcb0f206..a2920345afa73d572d061c10f06edf7d2325176a 100644 --- a/pkgs/tools/text/sgml/openjade/default.nix +++ b/pkgs/tools/text/sgml/openjade/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "An implementation of DSSSL, an ISO standard for formatting SGML (and XML) documents"; - license = "BSD"; + license = stdenv.lib.licenses.mit; homepage = http://openjade.sourceforge.net/; }; } diff --git a/pkgs/tools/text/sgml/opensp/default.nix b/pkgs/tools/text/sgml/opensp/default.nix index e30567000dd1daba26b4de7c168154323f4e29ed..59b9b7bc13d134e6f7cd2776393115757252db38 100644 --- a/pkgs/tools/text/sgml/opensp/default.nix +++ b/pkgs/tools/text/sgml/opensp/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = { description = "A suite of SGML/XML processing tools"; - license = "BSD"; + license = stdenv.lib.licenses.mit; homepage = http://openjade.sourceforge.net/; }; } diff --git a/pkgs/tools/text/source-highlight/default.nix b/pkgs/tools/text/source-highlight/default.nix index 21a866cf87e8b7973a565be42c025c4b65f93706..a7d1ddb0f3b5d24e64577d5c5b0c8444f3eb22cf 100644 --- a/pkgs/tools/text/source-highlight/default.nix +++ b/pkgs/tools/text/source-highlight/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = { description = "Source code renderer with syntax highlighting"; homepage = http://www.gnu.org/software/src-highlite/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.linux; longDescription = '' diff --git a/pkgs/tools/text/uni2ascii/default.nix b/pkgs/tools/text/uni2ascii/default.nix index c81e02b4399539eed59c232ddfdc49b6f0952655..9e62b2b3d59263bb9e5a2b3bf406a3002f26fd75 100644 --- a/pkgs/tools/text/uni2ascii/default.nix +++ b/pkgs/tools/text/uni2ascii/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { }; meta = { - license = "GPLv3"; + license = stdenv.lib.licenses.gpl3; homepage = http://billposer.org/Software/uni2ascii.html; description = "Converts between UTF-8 and many 7-bit ASCII equivalents and back"; diff --git a/pkgs/tools/text/wdiff/default.nix b/pkgs/tools/text/wdiff/default.nix index 3981f67aefb91cd946f88a9eb0a981bfae7b192d..e6fc3510cd40164e3f2d650ae32b93e7546bf69b 100644 --- a/pkgs/tools/text/wdiff/default.nix +++ b/pkgs/tools/text/wdiff/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.gnu.org/software/wdiff/; description = "GNU wdiff, comparing files on a word by word basis"; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.eelco ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/tools/text/xml/html-xml-utils/default.nix b/pkgs/tools/text/xml/html-xml-utils/default.nix index b8f2f4696aead730b6a0aa3a547fe3e3322e80d0..fd5a5dc5f8e5c66acd43eafd6740f036e61a5670 100644 --- a/pkgs/tools/text/xml/html-xml-utils/default.nix +++ b/pkgs/tools/text/xml/html-xml-utils/default.nix @@ -14,6 +14,6 @@ stdenv.mkDerivation rec { meta = { description = "Utilities for manipulating HTML and XML files"; homepage = http://www.w3.org/Tools/HTML-XML-utils/; - license = "free-non-copyleft"; + license = "free-non-copyleft"; #TODO W3C }; } diff --git a/pkgs/tools/text/xml/rxp/default.nix b/pkgs/tools/text/xml/rxp/default.nix index ee66cf9237744612bdcb2b6f6b21ad53c2642f56..6ec9758ed3a244bdb6823d483f8a488159245cd8 100644 --- a/pkgs/tools/text/xml/rxp/default.nix +++ b/pkgs/tools/text/xml/rxp/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { cp rxp $out/bin ''; meta = { - license = "GPL"; + license = stdenv.lib.licenses.gpl2Plus; description = "a validating XML parser written in C"; homepage = "http://www.cogsci.ed.ac.uk/~richard/rxp.html"; }; diff --git a/pkgs/tools/text/xml/xmlstarlet/default.nix b/pkgs/tools/text/xml/xmlstarlet/default.nix index db7ebfbb77a88feee35dc312c643e202e37d2aae..aea3ab2bd9683599fe9439c92f77e7387c692737 100644 --- a/pkgs/tools/text/xml/xmlstarlet/default.nix +++ b/pkgs/tools/text/xml/xmlstarlet/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { meta = { description = "A command line tool for manipulating and querying XML data"; homepage = http://xmlstar.sourceforge.net/; - license = "bsd"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/tools/typesetting/djvu2pdf/default.nix b/pkgs/tools/typesetting/djvu2pdf/default.nix index c7729ac676f8a40bff2c9220498960a7af5485e3..5455df5f106e7ea4b9c9e0558c2ec6075fdc7f4f 100644 --- a/pkgs/tools/typesetting/djvu2pdf/default.nix +++ b/pkgs/tools/typesetting/djvu2pdf/default.nix @@ -13,9 +13,9 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ djvulibre ghostscript ]; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin cp -p djvu2pdf $out/bin - ensureDir $out/man/man1 + mkdir -p $out/man/man1 cp -p djvu2pdf.1.gz $out/man/man1 ''; diff --git a/pkgs/tools/typesetting/docbook2x/default.nix b/pkgs/tools/typesetting/docbook2x/default.nix index d7d3f6f92a22b73df601b541fa162c93165a6edd..78dac0c6aa4eacd84d7684ec616de98a65e8fecd 100644 --- a/pkgs/tools/typesetting/docbook2x/default.nix +++ b/pkgs/tools/typesetting/docbook2x/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { into the traditional Unix man page format and the GNU Texinfo format. ''; - license = "MIT-style"; + license = stdenv.lib.licenses.mit; homepage = http://docbook2x.sourceforge.net/; }; } diff --git a/pkgs/tools/typesetting/halibut/default.nix b/pkgs/tools/typesetting/halibut/default.nix index 5a2c5fb2e067ea35a3f8a1b556bf52b3acbbb37b..48d1ebfc276257f10e40314a4198495c3ff497e9 100644 --- a/pkgs/tools/typesetting/halibut/default.nix +++ b/pkgs/tools/typesetting/halibut/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation { meta = { description = "Documentation production system for software manuals"; homepage = http://www.chiark.greenend.org.uk/~sgtatham/halibut/; - license = "free"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/tools/typesetting/lhs2tex/default.nix b/pkgs/tools/typesetting/lhs2tex/default.nix index ce531a920223554c7eee92cc265bcef3af840c04..35e609b440ab1bf37b9060e94fe5ab8af84914e1 100644 --- a/pkgs/tools/typesetting/lhs2tex/default.nix +++ b/pkgs/tools/typesetting/lhs2tex/default.nix @@ -18,7 +18,7 @@ cabal.mkDerivation (self: { meta = { homepage = "http://www.andres-loeh.de/lhs2tex/"; description = "Preprocessor for typesetting Haskell sources with LaTeX"; - license = "GPL"; + license = self.stdenv.lib.licenses.gpl2; platforms = self.ghc.meta.platforms; hydraPlatforms = self.stdenv.lib.platforms.linux; maintainers = [ self.stdenv.lib.maintainers.andres ]; diff --git a/pkgs/tools/typesetting/lout/default.nix b/pkgs/tools/typesetting/lout/default.nix index 61e94d4d6185a68148fe8c61e8b56f70e69e80fc..c0fc43362971591dcd2db36e7692fdde10580170 100644 --- a/pkgs/tools/typesetting/lout/default.nix +++ b/pkgs/tools/typesetting/lout/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { # Wiki: http://lout.wiki.sourceforge.net/ homepage = http://savannah.nongnu.org/projects/lout/; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.ludo ]; diff --git a/pkgs/tools/typesetting/pdftk/default.nix b/pkgs/tools/typesetting/pdftk/default.nix index 28a43e69598c88a1cba12bf6cf85f2084b163f3c..c71bc3ba77c6b1a5d66e9d68e6844b089dc6d806 100644 --- a/pkgs/tools/typesetting/pdftk/default.nix +++ b/pkgs/tools/typesetting/pdftk/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { meta = { description = "Simple tool for doing everyday things with PDF documents"; homepage = http://www.accesspdf.com/pdftk/; - license = "free"; + license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/typesetting/rubber/default.nix b/pkgs/tools/typesetting/rubber/default.nix index 054632533a1140c9205a08ef804c872a6338aa63..8344735606ca8a8e0d4e70c421fc82225f3d158b 100644 --- a/pkgs/tools/typesetting/rubber/default.nix +++ b/pkgs/tools/typesetting/rubber/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { of pdfLaTeX to produce PDF documents. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = http://www.pps.jussieu.fr/~beffara/soft/rubber/; }; diff --git a/pkgs/tools/typesetting/tex/dblatex/default.nix b/pkgs/tools/typesetting/tex/dblatex/default.nix index 6993158291c24fa260d27831e821e2dbb991da05..a68ab2d01b9ec2335973fa2d99b42ad2a4e04134 100644 --- a/pkgs/tools/typesetting/tex/dblatex/default.nix +++ b/pkgs/tools/typesetting/tex/dblatex/default.nix @@ -55,6 +55,6 @@ stdenv.mkDerivation rec { meta = { description = "A program to convert DocBook to DVI, PostScript or PDF via LaTeX or ConTeXt"; homepage = http://dblatex.sourceforge.net/; - license = "GPL"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/tools/typesetting/tex/pgfplots/default.nix b/pkgs/tools/typesetting/tex/pgfplots/default.nix index bc47244a5fa837c9347ad12ba853a3455749f3bb..67739350c6f6a7da0d06c33880ff7176bcf0063b 100644 --- a/pkgs/tools/typesetting/tex/pgfplots/default.nix +++ b/pkgs/tools/typesetting/tex/pgfplots/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { buildPhase = "true"; installPhase = " - ensureDir $out/share/texmf-nix + mkdir -p $out/share/texmf-nix cp -prd * $out/share/texmf-nix "; } diff --git a/pkgs/tools/typesetting/tex/tex4ht/default.nix b/pkgs/tools/typesetting/tex/tex4ht/default.nix index f903ef5792f461fbb724a931f087e6e42fd934a3..69d02a275b3410797a49d3d828080ff19a128e82 100644 --- a/pkgs/tools/typesetting/tex/tex4ht/default.nix +++ b/pkgs/tools/typesetting/tex/tex4ht/default.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation rec { meta = { homepage = "http://tug.org/tex4ht/"; description = "a system to convert (La)TeX documents to HTML and various other formats"; - license = "LPPL"; # LaTeX Project Public License + license = "LPPL-1.2"; # LaTeX Project Public License }; } diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix index 94d84fec4cee6b6d2fce71c3376d78f5d054b2a5..b5589cf943b36101fd9ac83b504b77cbad6d8901 100644 --- a/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/pkgs/tools/typesetting/tex/texlive/default.nix @@ -5,16 +5,16 @@ rec { sha256 = "0nh8hfayyf60nm4z8zyclrbc3792c62azgsvrwxnl28iq223200s"; }; - texmfVersion = "2014.20140626"; + texmfVersion = "2014.20140717"; texmfSrc = fetchurl { url = "mirror://debian/pool/main/t/texlive-base/texlive-base_${texmfVersion}.orig.tar.xz"; - sha256 = "1zimavr8nid6425i2k3i34a7xl45lskvsnp55q526i8y6f3zlw3g"; + sha256 = "08vhl6x742r8fl0gags2r6yspz8ynvz26vdjrqb4vyz5h7h3rzc9"; }; - langTexmfVersion = "2014.20140626"; + langTexmfVersion = "2014.20140717"; langTexmfSrc = fetchurl { url = "mirror://debian/pool/main/t/texlive-lang/texlive-lang_${langTexmfVersion}.orig.tar.xz"; - sha256 = "0gwms9jj8x2hp8fbqx420lvzccx3s6wlif7afp176y7ja9i3s17r"; + sha256 = "1x9aa3v2cg4lcb58lwksnfdsgrhi0sg968pjqsbndmbxhr1msbp7"; }; passthru = { inherit texmfSrc langTexmfSrc; }; @@ -120,7 +120,7 @@ rec { configureFlags = [ "--with-x11" "--enable-ipc" "--with-mktexfmt" "--enable-shared" "--disable-native-texlive-build" "--with-system-zziplib" - "--with-system-libgs" "--with-system-t1lib" "--with-system-freetype2" + "--with-system-libgs" "--with-system-t1lib" "--with-system-freetype2" "--with-system-freetype=no" "--disable-ttf2pk" "--enable-ttf2pk2" ] ++ stdenv.lib.optionals stdenv.isDarwin [ # TODO: We should be able to fix these tests diff --git a/pkgs/tools/typesetting/tex/texlive/extra.nix b/pkgs/tools/typesetting/tex/texlive/extra.nix index be280c5f483610fd6b994de6bd6815e0fba63115..4644ee3e50ec5fb2f95e2c82691e26553cf92645 100644 --- a/pkgs/tools/typesetting/tex/texlive/extra.nix +++ b/pkgs/tools/typesetting/tex/texlive/extra.nix @@ -1,11 +1,11 @@ args: with args; rec { name = "texlive-extra-2014"; - version = "2014.20140626"; + version = "2014.20140717"; src = fetchurl { url = "mirror://debian/pool/main/t/texlive-extra/texlive-extra_${version}.orig.tar.xz"; - sha256 = "1n7n2vssdspzg95qrikl4p8cr6axdpj6bgv2l61px7vp837ma83v"; + sha256 = "1khxqdq9gagm6z8kbpjbraysfzibfjs2cgbrhjpncbd24sxpw13q"; }; buildInputs = [texLive xz]; @@ -20,7 +20,7 @@ rec { description = "Extra components for TeXLive"; maintainers = [ args.lib.maintainers.raskin ]; - # Actually, arch-independent.. + # Actually, arch-independent.. hydraPlatforms = []; }; } diff --git a/pkgs/tools/typesetting/xmlto/default.nix b/pkgs/tools/typesetting/xmlto/default.nix index bfc5efc7361448ef25633ab88fe8c3a9ee0da909..1b0602063e9eb40fff99929113a3b4fe24bffa8e 100644 --- a/pkgs/tools/typesetting/xmlto/default.nix +++ b/pkgs/tools/typesetting/xmlto/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { necessary post-processing. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; homepage = https://fedorahosted.org/xmlto/; }; } diff --git a/pkgs/tools/video/dvgrab/default.nix b/pkgs/tools/video/dvgrab/default.nix index e4c8e99efdb6ee3cefaa3487fb7937bce94799a5..faaea6aaffc41539ae49840b650d5aac5b1b252a 100644 --- a/pkgs/tools/video/dvgrab/default.nix +++ b/pkgs/tools/video/dvgrab/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { homepage = http://kinodv.org/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.gnu; maintainers = [ ]; }; diff --git a/pkgs/tools/video/rtmpdump/default.nix b/pkgs/tools/video/rtmpdump/default.nix index 2034331c8e0fa5e7f46466a55902706b77a8a8d1..4dec3282fce92c628482da7d21310f23df62a51c 100644 --- a/pkgs/tools/video/rtmpdump/default.nix +++ b/pkgs/tools/video/rtmpdump/default.nix @@ -19,8 +19,8 @@ stdenv.mkDerivation { meta = { homepage = http://rtmpdump.mplayerhq.hu/; description = "Toolkit for RTMP streams"; - license = "GPLv2+"; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; all; + license = stdenv.lib.licenses.gpl2Plus; + maintainers = [ stdenv.lib.maintainers. viric ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/video/swfmill/default.nix b/pkgs/tools/video/swfmill/default.nix index 8e7fbdaeaf33ee0503bd4008e3e26001ab6136c5..0f3b5f4d39db8a9301f6ef16d68ab9dc955acb89 100644 --- a/pkgs/tools/video/swfmill/default.nix +++ b/pkgs/tools/video/swfmill/default.nix @@ -15,7 +15,6 @@ stdenv.mkDerivation rec { meta = { description = "An xml2swf and swf2xml processor with import functionalities"; homepage = "http://swfmill.org"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } - diff --git a/pkgs/tools/video/swftools/default.nix b/pkgs/tools/video/swftools/default.nix index 806a0b2109609bb20977674e6e3e853f4e8a379c..0a658a23e1cfbcc807d1630816366f963e25dcde 100644 --- a/pkgs/tools/video/swftools/default.nix +++ b/pkgs/tools/video/swftools/default.nix @@ -13,6 +13,6 @@ stdenv.mkDerivation { meta = { description = "Collection of SWF manipulation and creation utilities"; homepage = http://www.swftools.org/about.html; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/tools/virtualization/aws/default.nix b/pkgs/tools/virtualization/aws/default.nix index 27f4ce4476fd61da8989b893300ef51fe72626e2..123dbf647f0d71bfcce89a9f9a0b1f200cbaf7e9 100644 --- a/pkgs/tools/virtualization/aws/default.nix +++ b/pkgs/tools/virtualization/aws/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation { meta = { homepage = http://www.timkay.com/aws/; description = "Command-line utility for working with Amazon EC2, S3, SQS, ELB, IAM and SDB"; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; }; } diff --git a/pkgs/tools/virtualization/ec2-ami-tools/default.nix b/pkgs/tools/virtualization/ec2-ami-tools/default.nix index e9b62886fce8d2a465cb122c094d3de3b81ab9cb..cbe53326339aa5d793ebc29b5d4d385309b2dba1 100644 --- a/pkgs/tools/virtualization/ec2-ami-tools/default.nix +++ b/pkgs/tools/virtualization/ec2-ami-tools/default.nix @@ -1,13 +1,15 @@ { stdenv, fetchurl, unzip, ruby, openssl, makeWrapper }: stdenv.mkDerivation rec { - name = "ec2-ami-tools-1.4.0.9"; + name = "ec2-ami-tools-${version}"; + + version = "1.5.3"; buildInputs = [ unzip makeWrapper ]; src = fetchurl { - url = "http://tarballs.nixos.org/${name}.zip"; - sha256 = "0icpjr2ipch3f6cf4rg9x5z2y9k6a4rd85npsmw3a1ambs3dwxlq"; + url = "http://s3.amazonaws.com/ec2-downloads/${name}.zip"; + sha256 = "0n184nxc57alg25h5bslg0cs1z854sf7f52a820ihxxknrq2dy6i"; }; # Amazon EC2 requires that disk images are writable. If they're @@ -36,7 +38,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://developer.amazonwebservices.com/connect/entry.jspa?externalID=368&categoryID=88; description = "Command-line tools to create and manage Amazon EC2 virtual machine images"; - license = "unfree-redistributable"; + license = "unfree-redistributable"; # Amazon || (Ruby GPL-2) }; } diff --git a/pkgs/tools/virtualization/ec2-api-tools/default.nix b/pkgs/tools/virtualization/ec2-api-tools/default.nix index a80ad91c4c302eb2213449bd602f58d8d6b7ad2d..34cfa662c9167f0f0871a7c72d3b44545730f4e8 100644 --- a/pkgs/tools/virtualization/ec2-api-tools/default.nix +++ b/pkgs/tools/virtualization/ec2-api-tools/default.nix @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://developer.amazonwebservices.com/connect/entry.jspa?externalID=351; description = "Command-line tools to create and manage Amazon EC2 virtual machines"; - license = "unfree-redistributable"; + license = "unfree-redistributable"; #Amazon }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 469186022c901fa3463c54c826ef1e9ced377920..8a0fd0ed737b89681e57557eb5ac52cffee4e244 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8,15 +8,6 @@ { # The system (e.g., `i686-linux') for which to build the packages. system ? builtins.currentSystem - # Usually, the system type uniquely determines the stdenv and thus - # how to build the packages. But on some platforms we have - # different stdenvs, leading to different ways to build the - # packages. For instance, on Windows we support both Cygwin and - # Mingw builds. In both cases, `system' is `i686-cygwin'. The - # attribute `stdenvType' is used to select the specific kind of - # stdenv to use, e.g., `i686-mingw'. -, stdenvType ? system - , # The standard environment to use. Only used for bootstrapping. If # null, the default standard environment is used. bootStdenv ? null @@ -137,7 +128,7 @@ let self_ = with self; helperFunctions // { # Make some arguments passed to all-packages.nix available - inherit system stdenvType platform; + inherit system platform; # Allow callPackage to fill in the pkgs argument inherit pkgs; @@ -153,15 +144,16 @@ let # Override system. This is useful to build i686 packages on x86_64-linux. - forceSystem = system: (import ./all-packages.nix) { + forceSystem = system: kernel: (import ./all-packages.nix) { inherit system; + platform = platform // { kernelArch = kernel; }; inherit bootStdenv noSysDirs gccWithCC gccWithProfiling config - crossSystem platform; + crossSystem; }; # Used by wine, firefox with debugging version of Flash, ... - pkgsi686Linux = forceSystem "i686-linux"; + pkgsi686Linux = forceSystem "i686-linux" "i386"; callPackage_i686 = lib.callPackageWith (pkgsi686Linux // pkgsi686Linux.xorg); @@ -213,7 +205,7 @@ let allStdenvs = import ../stdenv { - inherit system stdenvType platform config; + inherit system platform config; allPackages = args: import ./all-packages.nix ({ inherit config system; } // args); }; @@ -239,6 +231,8 @@ let else defaultStdenv; + stdenvApple = stdenvAdapters.overrideGCC allStdenvs.stdenvNative gccApple; + forceNativeDrv = drv : if crossSystem == null then drv else (drv // { crossDrv = drv.nativeDrv; }); @@ -577,6 +571,8 @@ let bfr = callPackage ../tools/misc/bfr { }; + bindfs = callPackage ../tools/filesystems/bindfs { }; + bitbucket-cli = pythonPackages.bitbucket-cli; blockdiag = pythonPackages.blockdiag; @@ -611,6 +607,8 @@ let cv = callPackage ../tools/misc/cv { }; + crawl = callPackage ../games/crawl { lua = lua5; }; + ditaa = callPackage ../tools/graphics/ditaa { }; direnv = callPackage ../tools/misc/direnv { }; @@ -698,6 +696,10 @@ let btar = callPackage ../tools/backup/btar { }; + bud = callPackage ../tools/networking/bud { + inherit (pythonPackages) gyp; + }; + bup = callPackage ../tools/backup/bup { inherit (pythonPackages) pyxattr pylibacl setuptools fuse; inherit (haskellPackages) pandoc; @@ -712,6 +714,8 @@ let cabextract = callPackage ../tools/archivers/cabextract { }; + cadaver = callPackage ../tools/networking/cadaver { }; + cantata = callPackage ../applications/audio/cantata { }; can-utils = callPackage ../os-specific/linux/can-utils { }; @@ -950,20 +954,21 @@ let efivar = callPackage ../tools/system/efivar { }; + evemu = callPackage ../tools/system/evemu { }; + elasticsearch = callPackage ../servers/search/elasticsearch { }; - enblendenfuse = callPackage ../tools/graphics/enblend-enfuse { - boost = boost149; - }; + elasticsearchPlugins = recurseIntoAttrs ( + callPackage ../servers/search/elasticsearch/plugins.nix { } + ); + + emv = callPackage ../tools/misc/emv { }; + + enblendenfuse = callPackage ../tools/graphics/enblend-enfuse { }; encfs = callPackage ../tools/filesystems/encfs { }; - enscript = callPackage ../tools/text/enscript { - # fix syntax errors - stdenv = if stdenv.isDarwin - then clangStdenv - else stdenv; - }; + enscript = callPackage ../tools/text/enscript { }; ethtool = callPackage ../tools/misc/ethtool { }; @@ -989,7 +994,11 @@ let fabric = pythonPackages.fabric; - fail2ban = callPackage ../tools/security/fail2ban { }; + fail2ban = callPackage ../tools/security/fail2ban { + systemd = systemd.override { + pythonSupport = true; + }; + }; fakeroot = callPackage ../tools/system/fakeroot { }; @@ -1088,6 +1097,10 @@ let gawkInteractive = appendToName "interactive" (gawk.override { readlineSupport = true; }); + gbdfed = callPackage ../tools/misc/gbdfed { + gtk = gtk2; + }; + gdmap = callPackage ../tools/system/gdmap { }; genext2fs = callPackage ../tools/filesystems/genext2fs { }; @@ -1104,6 +1117,8 @@ let glusterfs = callPackage ../tools/filesystems/glusterfs { }; + glmark2 = callPackage ../tools/graphics/glmark2 { }; + glxinfo = callPackage ../tools/graphics/glxinfo { }; gmvault = callPackage ../tools/networking/gmvault { }; @@ -1139,16 +1154,9 @@ let libassuan = libassuan2_1; }); - gnuplot = callPackage ../tools/graphics/gnuplot { - texLive = null; - lua = null; - texinfo = texinfo4; # build errors with gnuplot-4.6.3 + gnuplot = callPackage ../tools/graphics/gnuplot { }; - # use gccApple to compile on darwin, seems to resolve a malloc error - stdenv = if stdenv.isDarwin - then stdenvAdapters.overrideGCC stdenv gccApple - else stdenv; - }; + gnuplot_qt = gnuplot.override { withQt = true; }; # must have AquaTerm installed separately gnuplot_aquaterm = gnuplot.override { aquaterm = true; }; @@ -1165,6 +1173,8 @@ let gource = callPackage ../applications/version-management/gource {}; + gpodder = callPackage ../applications/audio/gpodder { }; + gptfdisk = callPackage ../tools/system/gptfdisk { }; grafana = callPackage ../development/tools/misc/grafana { }; @@ -1345,6 +1355,8 @@ let kazam = callPackage ../applications/video/kazam { }; + kalibrate-rtl = callPackage ../tools/misc/kalibrate-rtl { }; + kexectools = callPackage ../os-specific/linux/kexectools { }; keychain = callPackage ../tools/misc/keychain { }; @@ -1397,6 +1409,8 @@ let libestr = callPackage ../development/libraries/libestr { }; + libevdev = callPackage ../development/libraries/libevdev { }; + liboauth = callPackage ../development/libraries/liboauth { }; libtirpc = callPackage ../development/libraries/ti-rpc { }; @@ -1635,6 +1649,11 @@ let notbit = callPackage ../applications/networking/notbit { }; + nox = callPackage ../tools/package-management/nox { + pythonPackages = python3Packages; + nix = nixUnstable; + }; + nss_pam_ldapd = callPackage ../tools/networking/nss-pam-ldapd {}; ntfs3g = callPackage ../tools/filesystems/ntfs-3g { }; @@ -1692,6 +1711,12 @@ let openobex = callPackage ../tools/bluetooth/openobex { }; + openopc = callPackage ../tools/misc/openopc { + pythonFull = python27Full.override { + extraLibs = [ python27Packages.pyro3 ]; + }; + }; + openresolv = callPackage ../tools/networking/openresolv { }; opensc = callPackage ../tools/security/opensc { }; @@ -1794,6 +1819,8 @@ let pdnsd = callPackage ../tools/networking/pdnsd { }; + peco = callPackage ../tools/text/peco { }; + pg_top = callPackage ../tools/misc/pg_top { }; pdsh = callPackage ../tools/networking/pdsh { @@ -2139,6 +2166,8 @@ let tcpcrypt = callPackage ../tools/security/tcpcrypt { }; + tboot = callPackage ../tools/security/tboot { }; + tcpdump = callPackage ../tools/networking/tcpdump { }; tcpflow = callPackage ../tools/networking/tcpflow { }; @@ -2178,8 +2207,14 @@ let torsocks = callPackage ../tools/security/tor/torsocks.nix { }; + tpm-quote-tools = callPackage ../tools/security/tpm-quote-tools { }; + + tpm-tools = callPackage ../tools/security/tpm-tools { }; + trickle = callPackage ../tools/networking/trickle {}; + trousers = callPackage ../tools/security/trousers { }; + ttf2pt1 = callPackage ../tools/misc/ttf2pt1 { }; ttysnoop = callPackage ../os-specific/linux/ttysnoop {}; @@ -2190,6 +2225,8 @@ let ucl = callPackage ../development/libraries/ucl { }; + ucspi-tcp = callPackage ../tools/networking/ucspi-tcp { }; + udftools = callPackage ../tools/filesystems/udftools {}; udptunnel = callPackage ../tools/networking/udptunnel { }; @@ -2327,6 +2364,8 @@ let xarchiver = callPackage ../tools/archivers/xarchiver { }; + xcruiser = callPackage ../applications/misc/xcruiser { }; + unarj = callPackage ../tools/archivers/unarj { }; unshield = callPackage ../tools/archivers/unshield { }; @@ -2421,8 +2460,12 @@ let xclip = callPackage ../tools/misc/xclip { }; + xtitle = callPackage ../tools/misc/xtitle { }; + xdelta = callPackage ../tools/compression/xdelta { }; + xdummy = callPackage ../tools/misc/xdummy { }; + xfsprogs = callPackage ../tools/filesystems/xfsprogs { }; xmlroff = callPackage ../tools/typesetting/xmlroff { @@ -2533,8 +2576,6 @@ let clang_34 = wrapClang llvmPackages_34.clang; clang_33 = wrapClang (clangUnwrapped llvm_33 ../development/compilers/llvm/3.3/clang.nix); - clang_32 = wrapClang (clangUnwrapped llvm_32 ../development/compilers/llvm/3.2/clang.nix); - clang_31 = wrapClang (clangUnwrapped llvm_31 ../development/compilers/llvm/3.1/clang.nix); clangAnalyzer = callPackage ../development/tools/analysis/clang-analyzer { clang = clang_34; @@ -2542,10 +2583,8 @@ let }; clangUnwrapped = llvm: pkg: callPackage pkg { - stdenv = if stdenv.isDarwin - then stdenvAdapters.overrideGCC stdenv gccApple - else stdenv; - llvm = llvm; + stdenv = if stdenv.isDarwin then stdenvApple else stdenv; + inherit llvm; }; clangSelf = clangWrapSelf llvmPackagesSelf.clang; @@ -2604,22 +2643,6 @@ let inherit fetchurl stdenv noSysDirs; }); - # XXX: GCC 4.2 (and possibly others) misdetects `makeinfo' when - # using Texinfo >= 4.10, just because it uses a stupid regexp that - # expects a single digit after the dot. As a workaround, we feed - # GCC with Texinfo 4.9. Stupid bug, hackish workaround. - - gcc42 = wrapGCC (makeOverridable (import ../development/compilers/gcc/4.2) { - inherit fetchurl stdenv noSysDirs; - profiledCompiler = false; - }); - - gcc43 = lowPrio (wrapGCC (makeOverridable (import ../development/compilers/gcc/4.3) { - inherit stdenv fetchurl gmp mpfr noSysDirs; - texinfo = texinfo4; - profiledCompiler = true; - })); - gcc48_realCross = lib.addMetaAttrs { hydraPlatforms = []; } (callPackage ../development/compilers/gcc/4.8 { inherit noSysDirs; @@ -2782,24 +2805,6 @@ let else null; })); - gcc49_multi = - if system == "x86_64-linux" then lowPrio ( - wrapGCCWith (import ../build-support/gcc-wrapper) glibc_multi (gcc49.gcc.override { - stdenv = overrideGCC stdenv (wrapGCCWith (import ../build-support/gcc-wrapper) glibc_multi gcc.gcc); - profiledCompiler = false; - enableMultilib = true; - })) - else throw "Multilib gcc not supported on ‘${system}’"; - - gcc49_debug = lowPrio (wrapGCC (callPackage ../development/compilers/gcc/4.9 { - stripped = false; - - inherit noSysDirs; - cross = null; - libcCross = null; - binutilsCross = null; - })); - gccApple = assert stdenv.isDarwin; wrapGCC (makeOverridable (import ../development/compilers/gcc/4.2-apple64) { @@ -3091,13 +3096,9 @@ let llvm_34 = llvmPackages_34.llvm; llvm_33 = llvm_v ../development/compilers/llvm/3.3/llvm.nix; - llvm_32 = llvm_v ../development/compilers/llvm/3.2; - llvm_31 = llvm_v ../development/compilers/llvm/3.1; llvm_v = path: callPackage path { - stdenv = if stdenv.isDarwin - then stdenvAdapters.overrideGCC stdenv gccApple - else stdenv; + stdenv = if stdenv.isDarwin then stdenvApple else stdenv; }; llvmPackages = if !stdenv.isDarwin then llvmPackages_34 else llvmPackages_34 // { @@ -3219,6 +3220,8 @@ let menhir = callPackage ../development/ocaml-modules/menhir { }; + merlin = callPackage ../development/tools/ocaml/merlin { }; + mldonkey = callPackage ../applications/networking/p2p/mldonkey { }; mlgmp = callPackage ../development/ocaml-modules/mlgmp { }; @@ -3296,14 +3299,10 @@ let ocaml_make = callPackage ../development/ocaml-modules/ocamlmake { }; - opa = let callPackage = newScope pkgs.ocamlPackages_3_12_1; in callPackage ../development/compilers/opa { }; + opa = let callPackage = newScope pkgs.ocamlPackages_4_00_1; in callPackage ../development/compilers/opa { }; ocamlnat = let callPackage = newScope pkgs.ocamlPackages_3_12_1; in callPackage ../development/ocaml-modules/ocamlnat { }; - opencxx = callPackage ../development/compilers/opencxx { - gcc = gcc33; - }; - qcmm = callPackage ../development/compilers/qcmm { lua = lua4; ocaml = ocaml_3_08_0; @@ -3311,11 +3310,15 @@ let roadsend = callPackage ../development/compilers/roadsend { }; - rust = callPackage ../development/compilers/rust {}; + rustc = callPackage ../development/compilers/rustc/0.11.nix {}; + rustcMaster = callPackage ../development/compilers/rustc/head.nix {}; + + rust = rustc; + sbclBootstrap = callPackage ../development/compilers/sbcl/bootstrap.nix {}; sbcl = callPackage ../development/compilers/sbcl { - clisp = clisp_2_44_1; + clisp = clisp; }; scala_2_9 = callPackage ../development/compilers/scala/2.9.nix { }; @@ -3489,6 +3492,13 @@ let flex = flex_2_5_35; }; + mesos = callPackage ../applications/networking/cluster/mesos { + sasl = cyrus_sasl; + automake = automake114x; + inherit (pythonPackages) python boto setuptools distutils-cfg wrapPython; + pythonProtobuf = pythonPackages.protobuf; + }; + octave = callPackage ../development/interpreters/octave { fltk = fltk13; qt = null; @@ -3659,12 +3669,10 @@ let tcl = callPackage ../development/interpreters/tcl { }; - xulrunnerWrapper = {application, launcher}: - import ../development/interpreters/xulrunner/wrapper { - inherit stdenv application launcher xulrunner; - }; - - xulrunner = pkgs.firefoxPkgs.xulrunner; + xulrunner = callPackage ../development/interpreters/xulrunner { + inherit (gnome) libIDL; + inherit (pythonPackages) pysqlite; + }; ### DEVELOPMENT / MISC @@ -3720,6 +3728,8 @@ let guile-xcb = callPackage ../development/guile-modules/guile-xcb { }; + pharo-vm = callPackage_i686 ../development/pharo/vm { }; + srecord = callPackage ../development/tools/misc/srecord { }; windowssdk = ( @@ -3989,7 +3999,9 @@ let inotifyTools = callPackage ../development/tools/misc/inotify-tools { }; - intelgen4asm = callPackage ../development/misc/intelgen4asm { }; + intel-gpu-tools = callPackage ../development/tools/misc/intel-gpu-tools { + inherit (xorg) libpciaccess dri2proto libX11 libXext libXv libXrandr; + }; ired = callPackage ../development/tools/analysis/radare/ired.nix { }; @@ -4015,9 +4027,9 @@ let ltrace = callPackage ../development/tools/misc/ltrace { }; - lttngTools = callPackage ../development/tools/misc/lttng-tools { }; + lttng-tools = callPackage ../development/tools/misc/lttng-tools { }; - lttngUst = callPackage ../development/tools/misc/lttng-ust { }; + lttng-ust = callPackage ../development/tools/misc/lttng-ust { }; lttv = callPackage ../development/tools/misc/lttv { }; @@ -4253,15 +4265,15 @@ let attr = callPackage ../development/libraries/attr { }; + at_spi2_core = callPackage ../development/libraries/at-spi2-core { }; + + at_spi2_atk = callPackage ../development/libraries/at-spi2-atk { }; + aqbanking = callPackage ../development/libraries/aqbanking { }; aubio = callPackage ../development/libraries/aubio { }; - audiofile = callPackage ../development/libraries/audiofile { - stdenv = if stdenv.isDarwin - then overrideGCC stdenv gccApple - else stdenv; - }; + audiofile = callPackage ../development/libraries/audiofile { }; axis = callPackage ../development/libraries/axis { }; @@ -4445,6 +4457,10 @@ let enginepkcs11 = callPackage ../development/libraries/enginepkcs11 { }; + epoxy = callPackage ../development/libraries/epoxy { + inherit (xorg) utilmacros libX11; + }; + esdl = callPackage ../development/libraries/esdl { }; exiv2 = callPackage ../development/libraries/exiv2 { }; @@ -4537,6 +4553,8 @@ let freetype = callPackage ../development/libraries/freetype { }; + frei0r = callPackage ../development/libraries/frei0r { }; + fribidi = callPackage ../development/libraries/fribidi { }; funambol = callPackage ../development/libraries/funambol { }; @@ -4797,11 +4815,7 @@ let gtkmm; }; - glib = callPackage ../development/libraries/glib { - stdenv = if stdenv.isDarwin - then overrideGCC stdenv gccApple - else stdenv; - }; + glib = callPackage ../development/libraries/glib { }; glib-tested = glib.override { doCheck = true; }; # checked version separate to break cycles glibmm = callPackage ../development/libraries/glibmm { }; @@ -4834,9 +4848,7 @@ let cupsSupport = config.gtk2.cups or stdenv.isLinux; }; - gtk3 = callPackage ../development/libraries/gtk+/3.x.nix { - inherit (gnome3) at_spi2_atk; - }; + gtk3 = callPackage ../development/libraries/gtk+/3.x.nix { }; gtk = pkgs.gtk2; @@ -5198,6 +5210,8 @@ let libgdiplus = callPackage ../development/libraries/libgdiplus { }; + libgksu = callPackage ../development/libraries/libgksu { }; + libgpgerror = callPackage ../development/libraries/libgpg-error { }; libgphoto2 = callPackage ../development/libraries/libgphoto2 { }; @@ -5263,11 +5277,7 @@ let librevisa = callPackage ../development/libraries/librevisa { }; - libsamplerate = callPackage ../development/libraries/libsamplerate { - stdenv = if stdenv.isDarwin - then overrideGCC stdenv gccApple - else stdenv; - }; + libsamplerate = callPackage ../development/libraries/libsamplerate { }; libspectre = callPackage ../development/libraries/libspectre { }; @@ -5462,11 +5472,7 @@ let # To bootstrap SBCL, I need CLisp 2.44.1; it needs libsigsegv 2.5 libsigsegv_25 = callPackage ../development/libraries/libsigsegv/2.5.nix { }; - libsndfile = callPackage ../development/libraries/libsndfile { - stdenv = if stdenv.isDarwin - then overrideGCC stdenv gccApple - else stdenv; - }; + libsndfile = callPackage ../development/libraries/libsndfile { }; libsodium = callPackage ../development/libraries/libsodium { }; @@ -5526,20 +5532,18 @@ let liburcu = callPackage ../development/libraries/liburcu { }; - libusb = callPackage ../development/libraries/libusb { - stdenv = if stdenv.isDarwin - then overrideGCC stdenv gccApple - else stdenv; - }; + libusb = callPackage ../development/libraries/libusb {}; libusb1 = callPackage ../development/libraries/libusb1 { - stdenv = if stdenv.isDarwin # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=50909 - then overrideGCC stdenv gccApple + stdenv = if stdenv.isDarwin + then clangStdenv else stdenv; }; libunwind = callPackage ../development/libraries/libunwind { }; + libuvVersions = callPackage ../development/libraries/libuv { }; + libv4l = lowPrio (v4l_utils.override { withQt4 = false; }); @@ -5636,7 +5640,7 @@ let expat gettext perl SDL SDL_image SDL_mixer SDL_ttf curl sqlite - libogg libvorbis + libogg libvorbis libcaca csound cunit ; guile = guile_1_8; libpng = libpng15; # 0.0.13 needs libpng 1.2--1.5 @@ -5711,7 +5715,17 @@ let mkvtoolnix = callPackage ../applications/video/mkvtoolnix { }; - mlt = callPackage ../development/libraries/mlt { }; + mlt-qt4 = callPackage ../development/libraries/mlt { + qt = qt4; + SDL = SDL_pulseaudio; + }; + + mlt-qt5 = callPackage ../development/libraries/mlt { + qt = qt5; + SDL = SDL_pulseaudio; + }; + + movit = callPackage ../development/libraries/movit { }; mps = callPackage ../development/libraries/mps { }; @@ -5737,6 +5751,8 @@ let muparser = callPackage ../development/libraries/muparser { }; + mygpoclient = callPackage ../development/python-modules/mygpoclient { }; + mygui = callPackage ../development/libraries/mygui {}; myguiSvn = callPackage ../development/libraries/mygui/svn.nix {}; @@ -5749,13 +5765,6 @@ let ncurses = callPackage ../development/libraries/ncurses { unicode = system != "i686-cygwin"; - stdenv = - # On Darwin, NCurses uses `-no-cpp-precomp', which is specific to - # Apple-GCC. Since NCurses is part of stdenv, always use - # `stdenvNative' to build it. - if stdenv.isDarwin - then allStdenvs.stdenvNative - else stdenv; }; neon = callPackage ../development/libraries/neon { @@ -5861,6 +5870,8 @@ let p11_kit = callPackage ../development/libraries/p11-kit { }; + paperkey = callPackage ../tools/security/paperkey { }; + pangoxsl = callPackage ../development/libraries/pangoxsl { }; pcl = callPackage ../development/libraries/pcl { @@ -5972,6 +5983,21 @@ let qtLib = qt48Full; }; + qt53Full = qt53.override { + buildDocs = true; + buildExamples = true; + buildTests = true; + developerBuild = true; + }; + + qt53 = callPackage ../development/libraries/qt-5/qt-5.3.nix { + mesa = mesa_noglu; + cups = if stdenv.isLinux then cups else null; + # GNOME dependencies are not used unless gtkStyle == true + inherit (gnome) libgnomeui GConf gnome_vfs; + bison = bison2; # error: too few arguments to function 'int yylex(... + }; + qt5 = callPackage ../development/libraries/qt-5 { mesa = mesa_noglu; cups = if stdenv.isLinux then cups else null; @@ -6006,6 +6032,8 @@ let rabbitmq-c = callPackage ../development/libraries/rabbitmq-c {}; + rabbitmq-java-client = callPackage ../development/libraries/rabbitmq-java-client {}; + raul = callPackage ../development/libraries/audio/raul { }; readline = readline6; # 6.2 works, 6.3 breaks python, parted @@ -6014,23 +6042,9 @@ let readline5 = callPackage ../development/libraries/readline/readline5.nix { }; - readline6 = callPackage ../development/libraries/readline/readline6.nix { - stdenv = - # On Darwin, Readline uses `-arch_only', which is specific to - # Apple-GCC. So give it what it expects. - if stdenv.isDarwin - then overrideGCC stdenv gccApple - else stdenv; - }; + readline6 = callPackage ../development/libraries/readline/readline6.nix { }; - readline63 = callPackage ../development/libraries/readline/readline6.3.nix { - stdenv = - # On Darwin, Readline uses `-arch_only', which is specific to - # Apple-GCC. So give it what it expects. - if stdenv.isDarwin - then overrideGCC stdenv gccApple - else stdenv; - }; + readline63 = callPackage ../development/libraries/readline/readline6.3.nix { }; librdf_raptor = callPackage ../development/libraries/librdf/raptor.nix { }; @@ -6080,6 +6094,9 @@ let else stdenv; }; + # Fixes major problems with choppy sound in MLT / Kdenlive / Shotcut + SDL_pulseaudio = SDL.override { pulseaudioSupport = true; }; + SDL_gfx = callPackage ../development/libraries/SDL_gfx { }; SDL_image = callPackage ../development/libraries/SDL_image { @@ -6208,6 +6225,8 @@ let suitesparse = callPackage ../development/libraries/suitesparse { }; + sutils = callPackage ../tools/misc/sutils { }; + sword = callPackage ../development/libraries/sword { }; szip = callPackage ../development/libraries/szip { }; @@ -6370,6 +6389,8 @@ let xbase = callPackage ../development/libraries/xbase { }; xcb-util-cursor = callPackage ../development/libraries/xcb-util-cursor { }; + + xdo = callPackage ../tools/misc/xdo { }; xineLib = callPackage ../development/libraries/xine-lib { ffmpeg = ffmpeg_1; @@ -6452,7 +6473,7 @@ let stdenv = overrideInStdenv stdenv [gnumake380]; }; - junit = callPackage ../development/libraries/java/junit { }; + junit = callPackage ../development/libraries/java/junit { antBuild = releaseTools.antBuild; }; junixsocket = callPackage ../development/libraries/java/junixsocket { }; @@ -6838,6 +6859,12 @@ let bluez = null; avahi = null; }; + pulseaudioFull = pulseaudio.override { + bluez = bluez5; + avahi = avahi; + jackaudioSupport = true; + x11Support = true; + }; tomcat_connectors = callPackage ../servers/http/apache-modules/tomcat-connectors { }; @@ -6914,12 +6941,7 @@ let radius = callPackage ../servers/radius { }; - redis = callPackage ../servers/nosql/redis { - stdenv = - if stdenv.isDarwin - then overrideGCC stdenv gccApple - else stdenv; - }; + redis = callPackage ../servers/nosql/redis { }; redstore = callPackage ../servers/http/redstore { }; @@ -6976,6 +6998,8 @@ let axis2 = callPackage ../servers/http/tomcat/axis2 { }; + unifi = callPackage ../servers/unifi { }; + virtuoso6 = callPackage ../servers/sql/virtuoso/6.x.nix { }; virtuoso7 = callPackage ../servers/sql/virtuoso/7.x.nix { }; @@ -7035,7 +7059,7 @@ let alsaLib = callPackage ../os-specific/linux/alsa-lib { }; alsaPlugins = callPackage ../os-specific/linux/alsa-plugins { - jackaudio = null; + jack2 = null; }; alsaPluginWrapper = callPackage ../os-specific/linux/alsa-plugins/wrapper.nix { }; @@ -7309,15 +7333,6 @@ let ]; }; - linux_3_10_tuxonice = linux_3_10.override (attrs: { - kernelPatches = attrs.kernelPatches ++ [ - kernelPatches.tuxonice_3_10 - ]; - extraConfig = '' - TOI_CORE y - ''; - }); - linux_3_12 = makeOverridable (import ../os-specific/linux/kernel/linux-3.12.nix) { inherit fetchurl stdenv perl buildLinux; kernelPatches = lib.optionals ((platform.kernelArch or null) == "mips") @@ -7345,6 +7360,15 @@ let ]; }; + linux_3_16 = makeOverridable (import ../os-specific/linux/kernel/linux-3.16.nix) { + inherit fetchurl stdenv perl buildLinux; + kernelPatches = lib.optionals ((platform.kernelArch or null) == "mips") + [ kernelPatches.mips_fpureg_emu + kernelPatches.mips_fpu_sigill + kernelPatches.mips_ext3_n32 + ]; + }; + linux_testing = makeOverridable (import ../os-specific/linux/kernel/linux-testing.nix) { inherit fetchurl stdenv perl buildLinux; kernelPatches = lib.optionals ((platform.kernelArch or null) == "mips") @@ -7419,7 +7443,7 @@ let ktap = callPackage ../os-specific/linux/ktap { }; - lttngModules = callPackage ../os-specific/linux/lttng-modules { }; + lttng-modules = callPackage ../os-specific/linux/lttng-modules { }; broadcom_sta = callPackage ../os-specific/linux/broadcom-sta/default.nix { }; @@ -7480,8 +7504,8 @@ let linuxPackages = linuxPackages_3_12; # Update this when adding the newest kernel major version! - linux_latest = pkgs.linux_3_15; - linuxPackages_latest = pkgs.linuxPackages_3_15; + linux_latest = pkgs.linux_3_16; + linuxPackages_latest = pkgs.linuxPackages_3_16; # Build the kernel modules for the some of the kernels. linuxPackages_3_2 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_2 linuxPackages_3_2); @@ -7493,6 +7517,7 @@ let linuxPackages_3_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_12 linuxPackages_3_12); linuxPackages_3_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_14 linuxPackages_3_14); linuxPackages_3_15 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_15 linuxPackages_3_15); + linuxPackages_3_16 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_16 linuxPackages_3_16); linuxPackages_testing = recurseIntoAttrs (linuxPackagesFor pkgs.linux_testing linuxPackages_testing); # grsecurity flavors @@ -7979,6 +8004,8 @@ let oldstandard = callPackage ../data/fonts/oldstandard { }; + opensans-ttf = callPackage ../data/fonts/opensans-ttf { }; + poly = callPackage ../data/fonts/poly { }; posix_man_pages = callPackage ../data/documentation/man-pages-posix { }; @@ -8003,7 +8030,16 @@ let r5rs = callPackage ../data/documentation/rnrs/r5rs.nix { }; - sourceCodePro = callPackage ../data/fonts/source-code-pro {}; + source-code-pro = callPackage ../data/fonts/source-code-pro {}; + + source-sans-pro = callPackage ../data/fonts/source-sans-pro { }; + + source-serif-pro = callPackage ../data/fonts/source-serif-pro { }; + + source-han-sans-japanese = callPackage ../data/fonts/source-han-sans/japanese.nix {}; + source-han-sans-korean = callPackage ../data/fonts/source-han-sans/korean.nix {}; + source-han-sans-simplified-chinese = callPackage ../data/fonts/source-han-sans/simplified-chinese.nix {}; + source-han-sans-traditional-chinese = callPackage ../data/fonts/source-han-sans/traditional-chinese.nix {}; tango-icon-theme = callPackage ../data/icons/tango-icon-theme { }; @@ -8135,6 +8171,8 @@ let inherit (gnome3) baobab; + bar = callPackage ../applications/window-managers/bar { }; + baresip = callPackage ../applications/networking/instant-messengers/baresip { ffmpeg = ffmpeg_1; }; @@ -8167,6 +8205,8 @@ let bristol = callPackage ../applications/audio/bristol { }; + bspwm = callPackage ../applications/window-managers/bspwm { }; + bvi = callPackage ../applications/editors/bvi { }; calf = callPackage ../applications/audio/calf { @@ -8355,24 +8395,6 @@ let emacs = emacs24; - emacs23 = callPackage ../applications/editors/emacs-23 { - stdenv = - if stdenv.isDarwin - /* On Darwin, use Apple-GCC, otherwise: - configure: error: C preprocessor "cc -E -no-cpp-precomp" fails sanity check */ - then overrideGCC stdenv gccApple - else stdenv; - - # use override to select the appropriate gui toolkit - libXaw = if stdenv.isDarwin then xlibs.libXaw else null; - Xaw3d = null; - gtk = if stdenv.isDarwin then null else gtk; - # TODO: these packages don't build on Darwin. - gconf = null /* if stdenv.isDarwin then null else gnome.GConf */; - librsvg = null /* if stdenv.isDarwin then null else librsvg */; - texinfo = texinfo4; - }; - emacs24 = callPackage ../applications/editors/emacs-24 { # use override to enable additional features libXaw = xlibs.libXaw; @@ -8381,23 +8403,15 @@ let librsvg = null; alsaLib = null; imagemagick = null; - - # resolve unrecognized section __static_data in __DATA segment - stdenv = if stdenv.isDarwin - then clangStdenv - else stdenv; }; emacs24-nox = lowPrio (appendToName "nox" (emacs24.override { withX = false; })); - emacs24Macport = callPackage ../applications/editors/emacs-24/macport.nix { - # resolve unrecognised flag '-fconstant-cfstrings' errors - stdenv = if stdenv.isDarwin - then clangStdenv - else stdenv; - }; + emacs24Macport = lowPrio (callPackage ../applications/editors/emacs-24/macport.nix { + stdenv = pkgs.clangStdenv; + }); emacsPackages = emacs: self: let callPackage = newScope self; in rec { inherit emacs; @@ -8406,6 +8420,8 @@ let bbdb = callPackage ../applications/editors/emacs-modes/bbdb { }; + bbdb3 = callPackage ../applications/editors/emacs-modes/bbdb/3.nix {}; + cedet = callPackage ../applications/editors/emacs-modes/cedet { }; calfw = callPackage ../applications/editors/emacs-modes/calfw { }; @@ -8528,7 +8544,6 @@ let xmlRpc = callPackage ../applications/editors/emacs-modes/xml-rpc { }; }; - emacs23Packages = emacsPackages emacs23 pkgs.emacs23Packages; emacs24Packages = recurseIntoAttrs (emacsPackages emacs24 pkgs.emacs24Packages); inherit (gnome3) empathy; @@ -8581,6 +8596,8 @@ let geany = callPackage ../applications/editors/geany { }; + gksu = callPackage ../applications/misc/gksu { }; + gnuradio = callPackage ../applications/misc/gnuradio { inherit (pythonPackages) lxml numpy scipy matplotlib pyopengl; fftw = fftwFloat; @@ -8639,27 +8656,18 @@ let filezilla = callPackage ../applications/networking/ftp/filezilla { }; - firefox = pkgs.firefoxPkgs.firefox; - - firefox36Pkgs = callPackage ../applications/networking/browsers/firefox/3.6.nix { - inherit (gnome) libIDL; - }; - - firefox36Wrapper = wrapFirefox { browser = firefox36Pkgs.firefox; }; - firefox13Pkgs = callPackage ../applications/networking/browsers/firefox/13.0.nix { inherit (gnome) libIDL; }; firefox13Wrapper = wrapFirefox { browser = firefox13Pkgs.firefox; }; - firefoxPkgs = callPackage ../applications/networking/browsers/firefox { + firefox = callPackage ../applications/networking/browsers/firefox { inherit (gnome) libIDL; inherit (pythonPackages) pysqlite; - libpng = libpng.override { apngSupport = true; }; }; - firefoxWrapper = wrapFirefox { browser = firefoxPkgs.firefox; }; + firefoxWrapper = wrapFirefox { browser = pkgs.firefox; }; firefox-bin = callPackage ../applications/networking/browsers/firefox-bin { gconf = pkgs.gnome.GConf; @@ -8672,7 +8680,6 @@ let flashplayer = callPackage ../applications/networking/browsers/mozilla-plugins/flashplayer-11 { debug = config.flashplayer.debug or false; - # !!! Fix the dependency on two different builds of nss. }; freecad = callPackage ../applications/graphics/freecad { @@ -8707,6 +8714,8 @@ let fuze = callPackage ../applications/networking/instant-messengers/fuze {}; + gcolor2 = callPackage ../applications/graphics/gcolor2 { }; + get_iplayer = callPackage ../applications/misc/get_iplayer {}; gimp_2_8 = callPackage ../applications/graphics/gimp/2.8.nix { @@ -8757,7 +8766,8 @@ let libart = gnome2.libart_lgpl; }; # latest version: gnome3.goffice - ideas = recurseIntoAttrs (callPackage ../applications/editors/idea { }); + ideas = recurseIntoAttrs ( (callPackage ../applications/editors/idea { }) + // (callPackage ../applications/editors/idea/pycharm.nix { })); libquvi = callPackage ../applications/video/quvi/library.nix { }; @@ -8776,7 +8786,6 @@ let gmu = callPackage ../applications/audio/gmu { }; gnash = callPackage ../applications/video/gnash { - xulrunner = firefoxPkgs.xulrunner; inherit (gnome) gtkglext; }; @@ -9097,6 +9106,10 @@ let lmms = callPackage ../applications/audio/lmms { }; + lrzsz = callPackage ../tools/misc/lrzsz { }; + + luminanceHDR = callPackage ../applications/graphics/luminance-hdr { }; + lxdvdrip = callPackage ../applications/video/lxdvdrip { }; handbrake = callPackage ../applications/video/handbrake { }; @@ -9187,6 +9200,8 @@ let mopidy-spotify = callPackage ../applications/audio/mopidy-spotify { }; + mopidy-moped = callPackage ../applications/audio/mopidy-moped { }; + mozilla = callPackage ../applications/networking/browsers/mozilla { inherit (gnome) libIDL; }; @@ -9221,7 +9236,9 @@ let vdpauSupport = config.mplayer.vdpauSupport or false; }; - mplayer2 = callPackage ../applications/video/mplayer2 { }; + mplayer2 = callPackage ../applications/video/mplayer2 { + ffmpeg = libav_9; # see https://trac.macports.org/ticket/44386 + }; MPlayerPlugin = browser: import ../applications/networking/browsers/mozilla-plugins/mplayerplug-in { @@ -9270,6 +9287,8 @@ let ruby_ncursesw_sup = callPackage ../development/libraries/ruby_ncursesw_sup { }; + shotcut = callPackage ../applications/video/shotcut { mlt = mlt-qt5; }; + smplayer = callPackage ../applications/video/smplayer { }; sup = with rubyLibs; callPackage ../applications/networking/mailreaders/sup { @@ -9296,6 +9315,8 @@ let }; synfigstudio = callPackage ../applications/graphics/synfigstudio { }; + + sxhkd = callPackage ../applications/window-managers/sxhkd { }; msmtp = callPackage ../applications/networking/msmtp { }; @@ -9505,9 +9526,9 @@ let qt = qt4; }; - retroshare06 = callPackage ../applications/networking/p2p/retroshare/0.6.nix { + retroshare06 = lowPrio (callPackage ../applications/networking/p2p/retroshare/0.6.nix { qt = qt4; - }; + }); rsync = callPackage ../applications/networking/sync/rsync { enableACLs = !(stdenv.isDarwin || stdenv.isSunOS || stdenv.isFreeBSD); @@ -9567,6 +9588,8 @@ let slrn = callPackage ../applications/networking/newsreaders/slrn { }; + spideroak = callPackage ../applications/networking/spideroak { }; + ssvnc = callPackage ../applications/networking/remote/ssvnc { }; st = callPackage ../applications/misc/st { @@ -9707,9 +9730,7 @@ let telegram-cli = callPackage ../applications/networking/instant-messengers/telegram-cli/default.nix { }; - telepathy_gabble = callPackage ../applications/networking/instant-messengers/telepathy/gabble { - inherit (pkgs.gnome) libsoup; - }; + telepathy_gabble = callPackage ../applications/networking/instant-messengers/telepathy/gabble { }; telepathy_haze = callPackage ../applications/networking/instant-messengers/telepathy/haze {}; @@ -9732,11 +9753,12 @@ let thunderbird = callPackage ../applications/networking/mailreaders/thunderbird { inherit (gnome) libIDL; + inherit (pythonPackages) pysqlite; + libpng = libpng_apng; }; thunderbird-bin = callPackage ../applications/networking/mailreaders/thunderbird-bin { gconf = pkgs.gnome.GConf; - inherit (pkgs.gnome3) at_spi2_atk; inherit (pkgs.gnome) libgnome libgnomeui; inherit (pkgs.xlibs) libX11 libXScrnSaver libXext libXinerama libXrender libXt; @@ -9769,13 +9791,7 @@ let trayer = callPackage ../applications/window-managers/trayer { }; - tree = callPackage ../tools/system/tree { - # use gccApple to compile on darwin as the configure script adds a - # -no-cpp-precomp flag, which is not compatible with the default gcc - stdenv = if stdenv.isDarwin - then stdenvAdapters.overrideGCC stdenv gccApple - else stdenv; - }; + tree = callPackage ../tools/system/tree {}; tribler = callPackage ../applications/networking/p2p/tribler { }; @@ -9802,6 +9818,8 @@ let uzbl = callPackage ../applications/networking/browsers/uzbl { webkit = webkitgtk2; }; + + uTox = callPackage ../applications/networking/instant-messengers/utox { }; vanitygen = callPackage ../applications/misc/vanitygen { }; @@ -9858,6 +9876,8 @@ let flags = [ "python" "X11" ]; # only flag "X11" by now }); + vimpc = callPackage ../applications/audio/vimpc { }; + virtviewer = callPackage ../applications/virtualization/virt-viewer { gtkvnc = gtkvnc.override { enableGTK3 = true; }; spice_gtk = spice_gtk.override { enableGTK3 = true; }; @@ -10012,7 +10032,9 @@ let xdotool = callPackage ../tools/X11/xdotool { }; - xen = callPackage ../applications/virtualization/xen { }; + xen = callPackage ../applications/virtualization/xen { + stdenv = overrideGCC stdenv gcc45; + }; xfe = callPackage ../applications/misc/xfe { fox = fox_1_6; @@ -10101,6 +10123,8 @@ let zathura = zathuraCollection.zathuraWrapper; + zed = callPackage ../applications/editors/zed { }; + zeroc_ice = callPackage ../development/libraries/zeroc-ice { }; girara = callPackage ../applications/misc/girara { @@ -10127,6 +10151,8 @@ let libsigcxx = libsigcxx12; }; + astromenace = callPackage ../games/astromenace { }; + atanks = callPackage ../games/atanks {}; ballAndPaddle = callPackage ../games/ball-and-paddle { @@ -10179,10 +10205,20 @@ let }; }; + dwarf_fortress_2014 = callPackage_i686 ../games/dwarf-fortress/df2014.nix { + SDL_image = pkgsi686Linux.SDL_image.override { + libpng = pkgsi686Linux.libpng12; + }; + }; + dwarf_fortress_modable = appendToName "moddable" (dwarf_fortress.override { copyDataDirectory = true; }); + dwarf_fortress_2014_modable = appendToName "moddable" (dwarf_fortress_2014.override { + copyDataDirectory = true; + }); + dwarf-therapist = callPackage ../games/dwarf-therapist { }; d1x_rebirth = callPackage ../games/d1x-rebirth { }; @@ -10195,10 +10231,7 @@ let egoboo = callPackage ../games/egoboo { }; - exult = callPackage ../games/exult { - stdenv = overrideGCC stdenv gcc42; - libpng = libpng12; - }; + exult = callPackage ../games/exult { }; flightgear = callPackage ../games/flightgear { }; @@ -10570,7 +10603,7 @@ let kdeconnect = callPackage ../applications/misc/kdeconnect { }; - kdenlive = callPackage ../applications/video/kdenlive { }; + kdenlive = callPackage ../applications/video/kdenlive { mlt = mlt-qt4; }; kdesvn = callPackage ../applications/version-management/kdesvn { }; @@ -10704,7 +10737,6 @@ let arb = callPackage ../applications/science/biology/arb { lesstif = lesstif93; - stdenv = overrideGCC stdenv gcc42; }; archimedes = callPackage ../applications/science/electronics/archimedes { }; @@ -10788,6 +10820,11 @@ let camlp5 = ocamlPackages.camlp5_transitional; }; + coq_HEAD = callPackage ../applications/science/logic/coq/HEAD.nix { + inherit (ocamlPackages) findlib lablgtk; + camlp5 = ocamlPackages.camlp5_transitional; + }; + coq_8_3 = callPackage ../applications/science/logic/coq/8.3.nix { inherit (ocamlPackages) findlib lablgtk; camlp5 = ocamlPackages.camlp5_transitional; @@ -11062,9 +11099,9 @@ let hplipWithPlugin = hplip.override { withPlugin = true; }; # using the new configuration style proposal which is unstable - jack1d = callPackage ../misc/jackaudio/jack1.nix { }; + jack1 = callPackage ../misc/jackaudio/jack1.nix { }; - jackaudio = callPackage ../misc/jackaudio { }; + jack2 = callPackage ../misc/jackaudio { }; keynav = callPackage ../tools/X11/keynav { }; @@ -11383,6 +11420,8 @@ let zsnes = callPackage_i686 ../misc/emulators/zsnes { }; + snes9x-gtk = callPackage ../misc/emulators/snes9x-gtk { }; + misc = import ../misc/misc.nix { inherit pkgs stdenv; }; bullet = callPackage ../development/libraries/bullet {}; @@ -11397,6 +11436,8 @@ let # Attributes for backward compatibility. adobeReader = adobe-reader; asciidocFull = asciidoc-full; # added 2014-06-22 + lttngTools = lttng-tools; # added 2014-07-31 + lttngUst = lttng-ust; # added 2014-07-31 }; in self; in pkgs diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index a81f8cae90ad4f65b2321d6fc39d5d08ef0fd410..20f695a0d2369b3eb310e86cbc82488edbf840bd 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -21,17 +21,19 @@ }; ghc783Prefs = self : super : ghcHEADPrefs self super // { - cabalInstall_1_20_0_3 = super.cabalInstall_1_20_0_3.override { Cabal = self.Cabal_1_20_0_1; }; - codex = super.codex.override { hackageDb = super.hackageDb.override { Cabal = self.Cabal_1_20_0_1; }; }; + cabalInstall_1_20_0_3 = super.cabalInstall_1_20_0_3.override { Cabal = self.Cabal_1_20_0_2; }; + codex = super.codex.override { hackageDb = super.hackageDb.override { Cabal = self.Cabal_1_20_0_2; }; }; mtl = self.mtl_2_1_2; }; ghc763Prefs = self : super : ghc783Prefs self super // { + aeson = self.aeson_0_7_0_4; ariadne = super.ariadne.override { haskellNames = self.haskellNames.override { haskellPackages = self.haskellPackages.override { Cabal = self.Cabal_1_18_1_3; }; }; }; + attoparsec = self.attoparsec_0_11_3_1; binaryConduit = super.binaryConduit.override { binary = self.binary_0_7_2_1; }; bson = super.bson.override { dataBinaryIeee754 = self.dataBinaryIeee754.override { binary = self.binary_0_7_2_1; }; }; criterion = super.criterion.override { @@ -48,20 +50,18 @@ distributedStatic = super.distributedStatic.override { binary = self.binary_0_7_2_1; }; networkTransport = super.networkTransport.override { binary = self.binary_0_7_2_1; }; distributedProcess = super.distributedProcess.override { binary = self.binary_0_7_2_1; }; + scientific = self.scientific_0_2_0_2; singletons = null; # requires base >= 4.7 - vty_5_1_1 = super.vty_5_1_1.override { cabal = self.cabal.override { Cabal = self.Cabal_1_18_1_3; }; }; transformers = self.transformers_0_3_0_0; # core packagen in ghc > 7.6.x zipArchive = super.zipArchive_0_2_2_1; # works without binary 0.7.x }; ghc742Prefs = self : super : ghc763Prefs self super // { aeson = self.aeson_0_7_0_4.override { blazeBuilder = self.blazeBuilder; }; - attoparsec = self.attoparsec_0_11_3_1; extensibleExceptions = null; # core package in ghc <= 7.4.x hackageDb = super.hackageDb.override { Cabal = self.Cabal_1_16_0_3; }; haddock = self.haddock_2_11_0; haskeline = super.haskeline.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; - scientific = self.scientific_0_2_0_2; shelly = self.shelly_0_15_4_1; }; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index e01959d7a255487190f06a6e11ab1057c541ed6b..6d85ab2bf70fe66271fb973056a16a958bc7d35a 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -135,14 +135,15 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in abstractPar = callPackage ../development/libraries/haskell/abstract-par {}; + ad = callPackage ../development/libraries/haskell/ad {}; + adjunctions = callPackage ../development/libraries/haskell/adjunctions {}; AES = callPackage ../development/libraries/haskell/AES {}; aeson_0_7_0_4 = callPackage ../development/libraries/haskell/aeson/0.7.0.4.nix { blazeBuilder = null; }; - aeson_0_7_0_6 = callPackage ../development/libraries/haskell/aeson/0.7.0.6.nix { blazeBuilder = null; }; aeson_0_8_0_0 = callPackage ../development/libraries/haskell/aeson/0.8.0.0.nix { blazeBuilder = null; }; - aeson = self.aeson_0_7_0_6; # 0.8.0.0 breaks too many packages at the moment + aeson = self.aeson_0_8_0_0; aesonPretty = callPackage ../development/libraries/haskell/aeson-pretty {}; @@ -198,8 +199,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in attoparsec_0_10_4_0 = callPackage ../development/libraries/haskell/attoparsec/0.10.4.0.nix {}; attoparsec_0_11_3_1 = callPackage ../development/libraries/haskell/attoparsec/0.11.3.1.nix {}; attoparsec_0_11_3_4 = callPackage ../development/libraries/haskell/attoparsec/0.11.3.4.nix {}; - attoparsec_0_12_1_0 = callPackage ../development/libraries/haskell/attoparsec/0.12.1.0.nix {}; - attoparsec = self.attoparsec_0_12_1_0; + attoparsec_0_12_1_1 = callPackage ../development/libraries/haskell/attoparsec/0.12.1.1.nix {}; + attoparsec = self.attoparsec_0_12_1_1; attoparsecBinary = callPackage ../development/libraries/haskell/attoparsec-binary {}; @@ -207,6 +208,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in attoparsecEnumerator = callPackage ../development/libraries/haskell/attoparsec-enumerator {}; + autoUpdate = callPackage ../development/libraries/haskell/auto-update {}; + aws = callPackage ../development/libraries/haskell/aws {}; authenticate = callPackage ../development/libraries/haskell/authenticate {}; @@ -219,16 +222,18 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in base64Bytestring = callPackage ../development/libraries/haskell/base64-bytestring {}; - base64Conduit = callPackage ../development/libraries/haskell/base64-conduit {}; - baseCompat = callPackage ../development/libraries/haskell/base-compat {}; baseUnicodeSymbols = callPackage ../development/libraries/haskell/base-unicode-symbols {}; + basePrelude = callPackage ../development/libraries/haskell/base-prelude {}; + basicPrelude = callPackage ../development/libraries/haskell/basic-prelude {}; benchpress = callPackage ../development/libraries/haskell/benchpress {}; + bencoding = callPackage ../development/libraries/haskell/bencoding {}; + bert = callPackage ../development/libraries/haskell/bert {}; bifunctors = callPackage ../development/libraries/haskell/bifunctors {}; @@ -303,6 +308,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in boomerang = callPackage ../development/libraries/haskell/boomerang {}; + bound = callPackage ../development/libraries/haskell/bound {}; + bv = callPackage ../development/libraries/haskell/bv {}; byteable = callPackage ../development/libraries/haskell/byteable {}; @@ -334,7 +341,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in Cabal_1_14_0 = callPackage ../development/libraries/haskell/Cabal/1.14.0.nix {}; Cabal_1_16_0_3 = callPackage ../development/libraries/haskell/Cabal/1.16.0.3.nix {}; Cabal_1_18_1_3 = callPackage ../development/libraries/haskell/Cabal/1.18.1.3.nix {}; - Cabal_1_20_0_1 = callPackage ../development/libraries/haskell/Cabal/1.20.0.1.nix {}; + Cabal_1_20_0_2 = callPackage ../development/libraries/haskell/Cabal/1.20.0.2.nix {}; Cabal = null; # core package since forever cabalCargs = callPackage ../development/libraries/haskell/cabal-cargs {}; @@ -566,6 +573,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in dataenc = callPackage ../development/libraries/haskell/dataenc {}; + dataFin = callPackage ../development/libraries/haskell/data-fin {}; + dataFix = callPackage ../development/libraries/haskell/data-fix {}; dataHash = callPackage ../development/libraries/haskell/data-hash {}; @@ -672,6 +681,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in doctestProp = callPackage ../development/libraries/haskell/doctest-prop {}; + domSelector = callPackage ../development/libraries/haskell/dom-selector {}; + dotgen = callPackage ../development/libraries/haskell/dotgen {}; doubleConversion = callPackage ../development/libraries/haskell/double-conversion {}; @@ -692,6 +703,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in dyre = callPackage ../development/libraries/haskell/dyre {}; + easyFile = callPackage ../development/libraries/haskell/easy-file {}; + editDistance = callPackage ../development/libraries/haskell/edit-distance {}; editline_0_2_1_0 = callPackage ../development/libraries/haskell/editline/0.2.1.0.nix {}; @@ -727,7 +740,9 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in entropy = callPackage ../development/libraries/haskell/entropy {}; - equivalence = callPackage ../development/libraries/haskell/equivalence {}; + equivalence_0_2_3 = callPackage ../development/libraries/haskell/equivalence/0.2.3.nix {}; + equivalence_0_2_5 = callPackage ../development/libraries/haskell/equivalence/0.2.5.nix {}; + equivalence = self.equivalence_0_2_5; erf = callPackage ../development/libraries/haskell/erf {}; @@ -757,7 +772,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in Extra = callPackage ../development/libraries/haskell/Extra {}; - fay = callPackage ../development/libraries/haskell/fay {}; + fay = callPackage ../development/libraries/haskell/fay { aeson = self.aeson_0_7_0_4; }; fayBase = callPackage ../development/libraries/haskell/fay-base {}; @@ -765,7 +780,6 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in fdoNotify = callPackage ../development/libraries/haskell/fdo-notify {}; - filepath_1_3_0_2 = callPackage ../development/libraries/haskell/filepath/1.3.0.2.nix {}; filepath = null; # core package since forever fileLocation = callPackage ../development/libraries/haskell/file-location {}; @@ -830,11 +844,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in free = callPackage ../development/libraries/haskell/free {}; - freeGame_1_0_5 = callPackage ../development/libraries/haskell/free-game/1.0.5.nix { - boundingboxes = self.boundingboxes_0_1_1; - }; - freeGame_1_1 = callPackage ../development/libraries/haskell/free-game/1.1.nix {}; - freeGame = self.freeGame_1_1; + freeGame = callPackage ../development/libraries/haskell/free-game {}; fsnotify = callPackage ../development/libraries/haskell/fsnotify {}; @@ -856,6 +866,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in genericDeriving = callPackage ../development/libraries/haskell/generic-deriving {}; + genericsSop = callPackage ../development/libraries/haskell/generics-sop {}; + ghcCore = callPackage ../development/libraries/haskell/ghc-core {}; ghcEvents = callPackage ../development/libraries/haskell/ghc-events {}; @@ -980,6 +992,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in gtkTraymanager = callPackage ../development/libraries/haskell/gtk-traymanager {}; + Graphalyze = callPackage ../development/libraries/haskell/Graphalyze {}; + graphviz = callPackage ../development/libraries/haskell/graphviz {}; graphSCC = callPackage ../development/libraries/haskell/graphscc {}; @@ -1008,6 +1022,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in hashable_1_2_2_0 = callPackage ../development/libraries/haskell/hashable/1.2.2.0.nix {}; hashable = self.hashable_1_2_2_0; + hashableExtras = callPackage ../development/libraries/haskell/hashable-extras {}; + hashedStorage = callPackage ../development/libraries/haskell/hashed-storage {}; hashtables = callPackage ../development/libraries/haskell/hashtables {}; @@ -1040,7 +1056,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in haskellSrcMeta = callPackage ../development/libraries/haskell/haskell-src-meta {}; - haskellTokenUtils = callPackage ../development/libraries/haskell/haskell-token-utils {}; + haskintex = callPackage ../development/libraries/haskell/haskintex {}; haskore = callPackage ../development/libraries/haskell/haskore {}; @@ -1048,7 +1064,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in hasteCompiler = callPackage ../development/libraries/haskell/haste-compiler {}; - hastePerch = callPackage ../development/libraries/haskell/haste-perch {}; + HaTeX = callPackage ../development/libraries/haskell/HaTeX {}; hcltest = callPackage ../development/libraries/haskell/hcltest {}; @@ -1152,7 +1168,9 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in HList = callPackage ../development/libraries/haskell/HList {}; - hmatrix = callPackage ../development/libraries/haskell/hmatrix {}; + hmatrix = callPackage ../development/libraries/haskell/hmatrix { + liblapack = pkgs.liblapack.override { shared = true; }; + }; hmatrixSpecial = callPackage ../development/libraries/haskell/hmatrix-special {}; @@ -1260,6 +1278,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in HUnit_1_2_5_2 = callPackage ../development/libraries/haskell/HUnit/1.2.5.2.nix {}; HUnit = self.HUnit_1_2_5_2; + HUnitApprox = callPackage ../development/libraries/haskell/HUnit-approx {}; + hweblib = callPackage ../development/libraries/haskell/hweblib/default.nix {}; hxt = callPackage ../development/libraries/haskell/hxt {}; @@ -1485,6 +1505,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in markovChain = callPackage ../development/libraries/haskell/markov-chain {}; + matrix = callPackage ../development/libraries/haskell/matrix {}; + maude = callPackage ../development/libraries/haskell/maude {}; MaybeT = callPackage ../development/libraries/haskell/MaybeT {}; @@ -1745,12 +1767,13 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in parsec = self.parsec_3_1_5; parsers_0_10_3 = callPackage ../development/libraries/haskell/parsers/0.10.3.nix {}; - parsers_0_11_0_3 = callPackage ../development/libraries/haskell/parsers/0.11.0.3.nix {}; - parsers_0_12 = callPackage ../development/libraries/haskell/parsers/0.12.nix {}; - parsers = self.parsers_0_11_0_3; # the new version breaks trifecta + parsers_0_12_1 = callPackage ../development/libraries/haskell/parsers/0.12.1.nix {}; + parsers = self.parsers_0_12_1; parsimony = callPackage ../development/libraries/haskell/parsimony {}; + PastePipe = callPackage ../development/tools/haskell/PastePipe {}; + pathtype = callPackage ../development/libraries/haskell/pathtype {}; patternArrows = callPackage ../development/libraries/haskell/pattern-arrows {}; @@ -1811,6 +1834,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in placeholders = callPackage ../development/libraries/haskell/placeholders {}; + plugins= callPackage ../development/libraries/haskell/plugins {}; + polyparse = callPackage ../development/libraries/haskell/polyparse {}; pointed = callPackage ../development/libraries/haskell/pointed {}; @@ -1845,6 +1870,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in preludeExtras = callPackage ../development/libraries/haskell/prelude-extras {}; + preludeSafeenum = callPackage ../development/libraries/haskell/prelude-safeenum {}; + preprocessorTools_0_1_3 = callPackage ../development/libraries/haskell/preprocessor-tools/0.1.3.nix {}; preprocessorTools_1_0_1 = callPackage ../development/libraries/haskell/preprocessor-tools/1.0.1.nix {}; preprocessorTools = self.preprocessorTools_1_0_1; @@ -1862,9 +1889,9 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in primitive_0_5_3_0 = callPackage ../development/libraries/haskell/primitive/0.5.3.0.nix {}; primitive = self.primitive_0_5_3_0; - profunctors = callPackage ../development/libraries/haskell/profunctors {}; + probability = callPackage ../development/libraries/haskell/probability {}; - profunctorExtras = callPackage ../development/libraries/haskell/profunctor-extras {}; + profunctors = callPackage ../development/libraries/haskell/profunctors {}; projectTemplate = callPackage ../development/libraries/haskell/project-template {}; @@ -2130,6 +2157,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in socketIo = callPackage ../development/libraries/haskell/socket-io {}; + sodium = callPackage ../development/libraries/haskell/sodium {}; + sparse = callPackage ../development/libraries/haskell/sparse {}; spawn = callPackage ../development/libraries/haskell/spawn {}; @@ -2572,10 +2601,12 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in void = callPackage ../development/libraries/haskell/void {}; vty_4_7_5 = callPackage ../development/libraries/haskell/vty/4.7.5.nix {}; - vty_5_1_1 = callPackage ../development/libraries/haskell/vty/5.1.1.nix {}; - vty = self.vty_4_7_5; + vty_5_1_4 = callPackage ../development/libraries/haskell/vty/5.1.4.nix {}; + vty = self.vty_5_1_4; - vtyUi = callPackage ../development/libraries/haskell/vty-ui {}; + vtyUi = callPackage ../development/libraries/haskell/vty-ui { + vty = self.vty_4_7_5; + }; wai = callPackage ../development/libraries/haskell/wai {}; @@ -2605,6 +2636,10 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in webdriver = callPackage ../development/libraries/haskell/webdriver {}; + webkit = callPackage ../development/libraries/haskell/webkit { + webkit = pkgs.webkitgtk2; + }; + webRoutes = callPackage ../development/libraries/haskell/web-routes {}; webRoutesBoomerang = callPackage ../development/libraries/haskell/web-routes-boomerang {}; @@ -2672,16 +2707,22 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in xmlConduit = callPackage ../development/libraries/haskell/xml-conduit {}; + xmlConduitWriter = callPackage ../development/libraries/haskell/xml-conduit-writer {}; + xmlgen = callPackage ../development/libraries/haskell/xmlgen {}; xmlHamlet = callPackage ../development/libraries/haskell/xml-hamlet {}; xmlhtml = callPackage ../development/libraries/haskell/xmlhtml {}; + xmlHtmlConduitLens = callPackage ../development/libraries/haskell/xml-html-conduit-lens {}; + xmlLens = callPackage ../development/libraries/haskell/xml-lens {}; xmlTypes = callPackage ../development/libraries/haskell/xml-types {}; + xorshift = callPackage ../development/libraries/haskell/xorshift {}; + xournalParser = callPackage ../development/libraries/haskell/xournal-parser {}; xournalTypes = callPackage ../development/libraries/haskell/xournal-types {}; @@ -2731,8 +2772,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in zeromq4Haskell = callPackage ../development/libraries/haskell/zeromq4-haskell { zeromq = pkgs.zeromq4; }; zipArchive_0_2_2_1 = callPackage ../development/libraries/haskell/zip-archive/0.2.2.1.nix {}; - zipArchive_0_2_3_2 = callPackage ../development/libraries/haskell/zip-archive/0.2.3.2.nix {}; - zipArchive = self.zipArchive_0_2_3_2; + zipArchive_0_2_3_4 = callPackage ../development/libraries/haskell/zip-archive/0.2.3.4.nix {}; + zipArchive = self.zipArchive_0_2_3_4; zipper = callPackage ../development/libraries/haskell/zipper {}; @@ -2754,20 +2795,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in # Compilers. - Agda_2_3_2_2 = callPackage ../development/compilers/agda/2.3.2.2.nix {}; - Agda_2_4_0_1 = callPackage ../development/compilers/agda/2.4.0.1.nix { - binary = self.binary_0_7_2_1; - QuickCheck = self.QuickCheck_2_7_5; - }; - Agda = self.Agda_2_4_0_1; - - AgdaStdlib_0_7 = callPackage ../development/compilers/agda/stdlib-0.7.nix { - Agda = self.Agda_2_3_2_2; - }; - AgdaStdlib_0_8 = callPackage ../development/compilers/agda/stdlib-0.8.nix { - Agda = self.Agda_2_4_0_1; - }; - AgdaStdlib = self.AgdaStdlib_0_8; + Agda = callPackage ../development/compilers/agda {}; + AgdaStdlib = callPackage ../development/compilers/agda/stdlib.nix {}; uhc = callPackage ../development/compilers/uhc {}; @@ -2787,12 +2816,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in 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 {}; - BNFC = callPackage ../development/tools/haskell/BNFC {}; - BNFCMeta = callPackage ../development/tools/haskell/BNFC-meta {}; - cake3 = callPackage ../development/tools/haskell/cake3 {}; cpphs = callPackage ../development/tools/misc/cpphs {}; @@ -2823,8 +2848,6 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in happyMeta = callPackage ../development/tools/haskell/happy-meta {}; - HaRe = callPackage ../development/tools/haskell/HaRe {}; - haskdogs = callPackage ../development/tools/haskell/haskdogs {}; hasktags = callPackage ../development/tools/haskell/hasktags {}; @@ -2850,6 +2873,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in ShellCheck = callPackage ../development/tools/misc/ShellCheck { }; + SourceGraph = callPackage ../development/tools/haskell/SourceGraph {}; + tar = callPackage ../development/libraries/haskell/tar {}; threadscope = callPackage ../development/tools/haskell/threadscope {}; @@ -2871,10 +2896,6 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in darcs = callPackage ../applications/version-management/darcs {}; idris_plain = callPackage ../development/compilers/idris { - parsers = self.parsers_0_10_3; - trifecta = self.trifecta.override { - parsers = self.parsers_0_10_3; - }; llvmGeneral = self.llvmGeneral_3_3_8_2; llvmGeneralPure = self.llvmGeneralPure_3_3_8_2; }; @@ -2887,7 +2908,9 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in taffybar = callPackage ../applications/misc/taffybar {}; - yi = callPackage ../applications/editors/yi/yi.nix {}; + yi = callPackage ../applications/editors/yi/yi.nix { + vty = self.vty_4_7_5; + }; yiContrib = callPackage ../applications/editors/yi/yi-contrib.nix {}; @@ -2931,9 +2954,9 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in cabalDelete = callPackage ../development/tools/haskell/cabal-delete {}; cabalBounds = callPackage ../development/tools/haskell/cabal-bounds { - Cabal = self.Cabal_1_20_0_1; + Cabal = self.Cabal_1_20_0_2; cabalLenses = self.cabalLenses.override { - Cabal = self.Cabal_1_20_0_1; + Cabal = self.Cabal_1_20_0_2; }; }; @@ -2950,7 +2973,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in cabalInstall_0_14_0 = callPackage ../tools/package-management/cabal-install/0.14.0.nix {}; cabalInstall_1_16_0_2 = callPackage ../tools/package-management/cabal-install/1.16.0.2.nix { Cabal = self.Cabal_1_16_0_3; }; cabalInstall_1_18_0_3 = callPackage ../tools/package-management/cabal-install/1.18.0.3.nix { Cabal = self.Cabal_1_18_1_3; }; - cabalInstall_1_20_0_3 = callPackage ../tools/package-management/cabal-install/1.20.0.3.nix { Cabal = self.Cabal_1_20_0_1; }; + cabalInstall_1_20_0_3 = callPackage ../tools/package-management/cabal-install/1.20.0.3.nix { Cabal = self.Cabal_1_20_0_2; }; cabalInstall = self.cabalInstall_1_20_0_3; codex = callPackage ../development/tools/haskell/codex {}; @@ -2989,6 +3012,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in }; }; + Allure = callPackage ../games/Allure {}; + # End of the main part of the file. } diff --git a/pkgs/top-level/mingw.nix b/pkgs/top-level/mingw.nix deleted file mode 100644 index 6c744bfd86122f52d6e206569e7264e66aeac5dc..0000000000000000000000000000000000000000 --- a/pkgs/top-level/mingw.nix +++ /dev/null @@ -1,27 +0,0 @@ -let { - pkgs = - import ./all-packages.nix { - stdenvType = "i686-mingw"; - }; - - body = { - inherit (pkgs) - aterm - getopt - pkgconfig - realCurl - strategoLibraries - zlib; -# inherit profileTest; - }; - -# profileTest = -# pkgs.stdenv.mkDerivation { -# name = "profile-test"; -# src = ./char-test.c; -# builder = ./profile-builder.sh; -# strlib = pkgs.strategoLibraries; -# aterm = pkgs.aterm; -# buildInputs = [pkgs.aterm pkgs.strategoLibraries]; -# }; -} diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 1e8433cec7f7d2b476e0c994f1f7a825c5f83f32..b37ce6581cd339cece526e9a0af0a9793b3942cb 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -116,6 +116,19 @@ let self = _self // overrides; _self = with self; { }; }; + AnyEventI3 = buildPerlPackage rec { + name = "AnyEvent-I3-0.15"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MS/MSTPLBG/${name}.tar.gz"; + sha256 = "0x8zi06667bdgaxn7driqx0d71mp6021r51hdzmj5m5qbhi2hvqi"; + }; + propagatedBuildInputs = [ AnyEvent JSONXS ]; + meta = { + description = "Communicate with the i3 window manager"; + license = "perl"; + }; + }; + AnyEventRabbitMQ = buildPerlPackage { name = "AnyEvent-RabbitMQ-1.15"; src = fetchurl { @@ -133,12 +146,12 @@ let self = _self // overrides; _self = with self; { }; AnyMoose = buildPerlPackage rec { - name = "Any-Moose-0.10"; + name = "Any-Moose-0.24"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SA/SARTAK/${name}.tar.gz"; - sha256 = "1kgksln1vykh0xynawv3pc3nw1yp7kjwbxbb5lh2hm21a4l4h61x"; + url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; + sha256 = "0g4w11chpnspnksw80jbdn5wp2m5hqzcyjzcy2hsjz9rkk2ncdbk"; }; - propagatedBuildInputs = [Mouse]; + propagatedBuildInputs = [ Mouse ]; }; ApacheLogFormatCompiler = buildPerlModule { @@ -556,6 +569,18 @@ let self = _self // overrides; _self = with self; { }; }; + CarpAlways = buildPerlPackage rec { + name = "Carp-Always-0.13"; + src = fetchurl { + url = "mirror://cpan/authors/id/F/FE/FERREIRA/${name}.tar.gz"; + sha256 = "0i2rifkr7ybfcdsqana52487z7vxp2l5qdra0f6ik0ddhn6rzii1"; + }; + meta = { + description = "Warns and dies noisily with stack backtraces"; + license = "perl"; + }; + }; + CarpAssert = buildPerlPackage { name = "Carp-Assert-0.20"; src = fetchurl { @@ -612,6 +637,7 @@ let self = _self // overrides; _self = with self; { meta = { description = "Automated REST Method Dispatching"; license = "perl"; + platforms = stdenv.lib.platforms.linux; }; }; @@ -779,6 +805,7 @@ let self = _self // overrides; _self = with self; { meta = { description = "Request logging from within Catalyst"; license = "perl"; + platforms = stdenv.lib.platforms.linux; }; }; @@ -816,6 +843,7 @@ let self = _self // overrides; _self = with self; { meta = { description = "Role based authorization for Catalyst based on Catalyst::Plugin::Authentication"; license = "perl"; + platforms = stdenv.lib.platforms.linux; }; }; @@ -860,6 +888,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CatalystRuntime CatalystPluginSession GDSecurityImage HTTPDate ]; meta = { description = "Create and validate Captcha for Catalyst"; + platforms = stdenv.lib.platforms.linux; }; }; @@ -919,6 +948,9 @@ let self = _self // overrides; _self = with self; { }; buildInputs = [ TestMockObject ]; propagatedBuildInputs = [ CatalystRuntime CatalystPluginSession ]; + meta = { + platforms = stdenv.lib.platforms.linux; + }; }; CatalystPluginSessionStoreFastMmap = buildPerlPackage rec { @@ -929,6 +961,9 @@ let self = _self // overrides; _self = with self; { }; propagatedBuildInputs = [ PathClass CatalystPluginSession CacheFastMmap MROCompat ]; + meta = { + platforms = stdenv.lib.platforms.linux; + }; }; CatalystPluginStackTrace = buildPerlPackage { @@ -979,6 +1014,7 @@ let self = _self // overrides; _self = with self; { meta = { description = "JSON view for your data"; license = "perl"; + platforms = stdenv.lib.platforms.linux; }; }; @@ -992,6 +1028,7 @@ let self = _self // overrides; _self = with self; { meta = { description = "Template View Class"; license = "perl"; + platforms = stdenv.lib.platforms.linux; }; }; @@ -1827,6 +1864,18 @@ let self = _self // overrides; _self = with self; { makeMakerFlags = "--lib=${pkgs.openssl}/lib"; }; + CwdGuard = buildPerlModule rec { + name = "Cwd-Guard-0.04"; + src = fetchurl { + url = "mirror://cpan/authors/id/K/KA/KAZEBURO/${name}.tar.gz"; + sha256 = "071k50n1yr48122jjjg50i1s2kwp06dmrisv35f3wjry8m6cqchm"; + }; + meta = { + description = "Temporary changing working directory (chdir)"; + license = "perl"; + }; + }; + DataClone = buildPerlPackage { name = "Data-Clone-0.003"; src = fetchurl { @@ -3077,6 +3126,9 @@ let self = _self // overrides; _self = with self; { sha256 = "0ffmpqys7yph5lb28m2xan0zd837vywg8c6gjjd9p80dahpqknyx"; }; propagatedBuildInputs = [EmailSimple EmailAddress ModulePluggable ReturnValue]; + meta = { + platforms = stdenv.lib.platforms.linux; + }; }; EmailSender = buildPerlPackage { @@ -3390,6 +3442,19 @@ let self = _self // overrides; _self = with self; { }; }; + ExtUtilsPkgConfig = buildPerlPackage rec { + name = "ExtUtils-PkgConfig-1.15"; + src = fetchurl { + url = "mirror://cpan/authors/id/X/XA/XAOC/${name}.tar.gz"; + sha256 = "1cxh6w8vmyqmhl6afys2q6z6jkp1m6zvacpk70196zmk48p1kcv9"; + }; + propagatedBuildInputs = [ pkgs.pkgconfig ]; + meta = { + description = "Simplistic interface to pkg-config"; + license = stdenv.lib.licenses.lgpl21Plus; + }; + }; + # From CPAN[1]: # This module exists merely as a compatibility wrapper around # ExtUtils::Typemaps. In a nutshell, ExtUtils::Typemap was renamed to @@ -3705,6 +3770,7 @@ let self = _self // overrides; _self = with self; { meta = { description = "Simple and Efficient Reading/Writing/Modifying of Complete Files"; license = "perl"; + platforms = stdenv.lib.platforms.linux; }; }; @@ -4376,6 +4442,7 @@ let self = _self // overrides; _self = with self; { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "IO Interface to compressed data files/buffers"; license = "perl5"; + platforms = stdenv.lib.platforms.linux; }; doCheck = !stdenv.isDarwin; }; @@ -4507,6 +4574,7 @@ let self = _self // overrides; _self = with self; { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "System() and background procs w/ piping, redirs, ptys (Unix, Win32)"; license = "perl5"; + platforms = stdenv.lib.platforms.linux; }; }; @@ -4558,13 +4626,14 @@ let self = _self // overrides; _self = with self; { }; Inline = buildPerlPackage rec { - name = "Inline-0.45"; + name = "Inline-0.64"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SI/SISYPHUS/${name}.tar.gz"; - sha256 = "1k5nrb3nh2y33bs944ri78m1ni60v4cl67ffhxx88azj542y5c9x"; + url = "mirror://cpan/authors/id/E/ET/ETJ/${name}.tar.gz"; + sha256 = "17n3gbc9jigpfwqfhgmxpvbgr9rkdrij8jayxqpzw611ixcxrplw"; }; + buildInputs = [ TestWarn ]; propagatedBuildInputs = [ ParseRecDescent ]; meta = { @@ -4583,6 +4652,28 @@ let self = _self // overrides; _self = with self; { }; }; + InlineC = buildPerlPackage rec { + name = "Inline-C-0.62"; + + src = fetchurl { + url = "mirror://cpan/authors/id/E/ET/ETJ/${name}.tar.gz"; + sha256 = "0clggdpj5mmi35vm2991f9jsgv2a3s8r4f1bd88xxk8akv5b8i3r"; + }; + + postPatch = '' + # this test will fail with chroot builds + rm -f t/08taint.t + ''; + + buildInputs = [ TestWarn FileCopyRecursive ]; + propagatedBuildInputs = [ Inline ]; + + meta = { + description = "Write Perl Subroutines in C"; + license = "perl"; + }; + }; + InlineJava = buildPerlPackage rec { name = "Inline-Java-0.52"; @@ -4682,6 +4773,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CommonSense ]; meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; + platforms = stdenv.lib.platforms.linux; }; }; @@ -4962,6 +5054,7 @@ let self = _self // overrides; _self = with self; { meta = { description = "The World-Wide Web library for Perl"; license = "perl"; + platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; }; }; @@ -4991,6 +5084,7 @@ let self = _self // overrides; _self = with self; { meta = { description = "Provide https support for LWP::UserAgent"; license = "perl5"; + platforms = stdenv.lib.platforms.linux; }; }; @@ -5350,6 +5444,19 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ ExtUtilsXSpp ExtUtilsCppGuess ]; }; + ModuleBuildXSUtil = buildPerlModule rec { + name = "Module-Build-XSUtil-0.10"; + src = fetchurl { + url = "mirror://cpan/authors/id/H/HI/HIDEAKIO/${name}.tar.gz"; + sha256 = "1323vxp8vf5xdz66lbc1wfciaks93mrbqfsjgb9nz1w9bb21xj36"; + }; + buildInputs = [ FileCopyRecursive CwdGuard CaptureTiny ]; + meta = { + description = "A Module::Build class for building XS modules"; + license = "perl"; + }; + }; + ModuleCoreList = buildPerlPackage { name = "Module-CoreList-3.01"; src = fetchurl { @@ -6156,14 +6263,30 @@ let self = _self // overrides; _self = with self; { }; }; - Mouse = buildPerlPackage rec { - name = "Mouse-0.26"; + Mouse = buildPerlModule rec { + name = "Mouse-2.3.0"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BO/BOBTFISH/${name}.tar.gz"; - sha256 = "0dpf5qmf1vc8dq5nj6yiriz8v4wl8s9g519v1hnz4yf11n2lnr4x"; + url = "mirror://cpan/authors/id/G/GF/GFUJI/${name}.tar.gz"; + sha256 = "0ycl521mmc5989934502730rzsi9xqihdpnjihrkhflqmrzmaqwq"; + }; + buildInputs = [ + ModuleBuildXSUtil TestException TestLeakTrace TestRequires TestOutput + TestFatal + ]; + }; + + MouseXNativeTraits = buildPerlPackage rec { + name = "MouseX-NativeTraits-1.09"; + src = fetchurl { + url = "mirror://cpan/authors/id/G/GF/GFUJI/${name}.tar.gz"; + sha256 = "0pnbchkxfz9fwa8sniyjqp0mz75b3k2fafq9r09znbbh51dbz9gq"; + }; + buildInputs = [ TestFatal ]; + propagatedBuildInputs = [ AnyMoose ]; + meta = { + description = "Extend attribute interfaces for Mouse"; + license = "perl"; }; - propagatedBuildInputs = [TestException]; - doCheck = false; # check can't find its own Mouse::Tiny module }; MozillaCA = buildPerlPackage { @@ -7168,6 +7291,9 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/R/RO/ROODE/${name}.tar.gz"; sha256 = "1shkyxajh6l87nif47ygnfxjwvqf3d3kjpdvxaff4957vqanii2k"; }; + meta = { + platforms = stdenv.lib.platforms.linux; + }; }; ReadonlyXS = buildPerlPackage rec { @@ -7504,6 +7630,9 @@ let self = _self // overrides; _self = with self; { }; buildInputs = [ TestException ]; propagatedBuildInputs = [ ClassAccessor ListMoreUtils RegexpCommon SQLTokenizer ]; + meta = { + platforms = stdenv.lib.platforms.linux; + }; }; SQLTokenizer = buildPerlPackage rec { @@ -7995,6 +8124,9 @@ let self = _self // overrides; _self = with self; { sha256 = "0hy1225zg2yg11xhgj0wbiapzjyf6slx17ln36zqvfm07k6widlx"; }; doCheck = false; # no `hostname' in stdenv + meta = { + platforms = stdenv.lib.platforms.linux; + }; }; TAPParserSourceHandlerpgTAP = buildPerlModule { @@ -8425,6 +8557,18 @@ let self = _self // overrides; _self = with self; { }; }; + TestLeakTrace = buildPerlPackage rec { + name = "Test-LeakTrace-0.14"; + src = fetchurl { + url = "mirror://cpan/authors/id/G/GF/GFUJI/${name}.tar.gz"; + sha256 = "06cn4g35l2gi9vbsdi2j49cxsji9fvfi7xp4xgdyxxds9vrxydia"; + }; + meta = { + description = "Traces memory leaks"; + license = "perl"; + }; + }; + TestLongString = buildPerlPackage rec { name = "Test-LongString-0.15"; src = fetchurl { @@ -9045,6 +9189,7 @@ let self = _self // overrides; _self = with self; { homepage = http://www.shlomifish.org/open-source/projects/docmake/; description = "Organize Data in Tables"; license = "bsd"; + platforms = stdenv.lib.platforms.linux; }; }; @@ -9590,6 +9735,41 @@ let self = _self // overrides; _self = with self; { doCheck = false; # requires an X server }; + X11XCB = buildPerlPackage rec { + name = "X11-XCB-0.11"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MS/MSTPLBG/${name}.tar.gz"; + sha256 = "18i3z1fzw76kl9n5driys12r6vhp3r6rmb2pjn5nc7m9n4bwgh38"; + }; + AUTOMATED_TESTING = false; + buildInputs = [ + ExtUtilsDepends ExtUtilsPkgConfig DataDump + XMLSimple XMLDescent TestDeep TestException + pkgs.xorg.libxcb pkgs.xorg.xcbproto pkgs.xorg.xcbutil pkgs.xorg.xcbutilwm + ]; + propagatedBuildInputs = [ XSObjectMagic Mouse MouseXNativeTraits TryTiny ]; + NIX_CFLAGS_LINK = [ "-lxcb" "-lxcb-util" "-lxcb-xinerama" "-lxcb-icccm" ]; + doCheck = false; # requires an X server + meta = { + description = "XCB bindings for X"; + license = "perl"; + }; + }; + + XMLDescent = buildPerlPackage rec { + name = "XML-Descent-1.04"; + src = fetchurl { + url = "mirror://cpan/authors/id/A/AN/ANDYA/${name}.tar.gz"; + sha256 = "0l5xmw2hd95ypppz3lyvp4sn02ccsikzjwacli3ydxfdz1bbh4d7"; + }; + buildInputs = [ TestDifferences ]; + propagatedBuildInputs = [ XMLTokeParser ]; + meta = { + description = "Recursive descent XML parsing"; + license = "perl"; + }; + }; + XMLDOM = buildPerlPackage { name = "XML-DOM-1.44"; src = fetchurl { @@ -9711,6 +9891,19 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [XMLParser]; }; + XMLTokeParser = buildPerlPackage rec { + name = "XML-TokeParser-0.05"; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PO/PODMASTER/${name}.tar.gz"; + sha256 = "1hnpwb3lh6cbgwvjjgqzcp6jm4mp612qn6ili38adc9nhkwv8fc5"; + }; + propagatedBuildInputs = [ XMLParser ]; + meta = { + description = "Simplified interface to XML::Parser"; + license = "perl"; + }; + }; + XMLTwig = buildPerlPackage { name = "XML-Twig-3.44"; src = fetchurl { @@ -9729,6 +9922,19 @@ let self = _self // overrides; _self = with self; { }; }; + XSObjectMagic = buildPerlPackage rec { + name = "XS-Object-Magic-0.04"; + src = fetchurl { + url = "mirror://cpan/authors/id/F/FL/FLORA/${name}.tar.gz"; + sha256 = "03fghj7hq0fiicmfdxhmzfm4mzv7s097pgkd32ji7jnljvhm9six"; + }; + buildInputs = [ ExtUtilsDepends TestFatal Testuseok ]; + meta = { + description = "XS pointer backed objects using sv_magic"; + license = "perl"; + }; + }; + YAML = buildPerlPackage { name = "YAML-0.90"; src = fetchurl { diff --git a/pkgs/top-level/python-packages-generated.nix b/pkgs/top-level/python-packages-generated.nix index ca980e3863730cef6e0d63e22d9bb948bf582892..e76cf4988d027ef220b2d13584bcf52060f042fd 100644 --- a/pkgs/top-level/python-packages-generated.nix +++ b/pkgs/top-level/python-packages-generated.nix @@ -142,7 +142,7 @@ in BTree-based folder implementation with order support ''; homepage = "http://pypi.python.org/pypi/plone.folder"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -162,7 +162,7 @@ in The Plone Content Management System (core) ''; homepage = "http://plone.org/"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -182,7 +182,7 @@ in Waitress WSGI server ''; homepage = "https://github.com/Pylons/waitress"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -202,7 +202,7 @@ in zope.deferredimport allows you to perform imports names that will only be resolved when used in the code. ''; homepage = "http://pypi.python.org/pypi/zope.deferredimport"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -222,7 +222,7 @@ in Python 2 and 3 compatibility utilities ''; homepage = "http://pypi.python.org/pypi/six/"; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; }; @@ -242,7 +242,7 @@ in Zope Deprecation Infrastructure ''; homepage = "http://pypi.python.org/pypi/zope.deprecation"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -262,7 +262,7 @@ in Uid product for the Zope Content Management Framework ''; homepage = "http://pypi.python.org/pypi/Products.CMFUid"; - license = "ZPL 2.1 (http://www.zope.org/Resources/License/ZPL-2.1)"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -322,7 +322,7 @@ in A referencebrowser implementation for Archetypes ''; homepage = "http://pypi.python.org/pypi/archetypes.referencebrowserwidget"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -342,7 +342,7 @@ in An extension to zope.formlib, which allows to group fields into different fieldsets. ''; homepage = "http://pypi.python.org/pypi/plone.fieldsets"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -362,7 +362,7 @@ in redirection tool ''; homepage = "http://pypi.python.org/pypi/plone.app.redirector"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -402,7 +402,7 @@ in ZODB blob support for Plone ''; homepage = "http://plone.org/products/plone.app.blob"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -444,7 +444,7 @@ in Programmable browser for functional black-box tests ''; homepage = "http://pypi.python.org/pypi/zope.testbrowser"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -464,7 +464,7 @@ in Full text indexing for ZCatalog / Zope 2. ''; homepage = "http://pypi.python.org/pypi/Products.ZCTextIndex"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -504,7 +504,7 @@ in Local registries for zope component architecture ''; homepage = "http://pypi.python.org/pypi/zope.site"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -524,7 +524,7 @@ in Plone's content menu implementation ''; homepage = "http://pypi.python.org/pypi/plone.app.contentmenu"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -584,7 +584,7 @@ in Structured Configuration Library ''; homepage = "http://www.zope.org/Members/fdrake/zconfig/"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -604,7 +604,7 @@ in Zope Deprecation Infrastructure ''; homepage = "http://pypi.python.org/pypi/zope.deprecation"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -664,7 +664,7 @@ in Very basic event publishing system ''; homepage = "http://pypi.python.org/pypi/zope.event"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -704,7 +704,7 @@ in Generic Transparent Proxies ''; homepage = "http://pypi.python.org/pypi/zope.proxy"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -724,7 +724,7 @@ in Component vocabularies ''; homepage = "http://pypi.python.org/pypi/zope.componentvocabulary"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -744,7 +744,7 @@ in Zope Content Management Framework core components ''; homepage = "http://pypi.python.org/pypi/Products.CMFCore"; - license = "ZPL 2.1 (http://www.zope.org/Resources/License/ZPL-2.1)"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -824,7 +824,7 @@ in Special MultiMapping objects used in Zope2. ''; homepage = "http://pypi.python.org/pypi/MultiMapping"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -844,7 +844,7 @@ in SQL method support for Zope 2. ''; homepage = "http://pypi.python.org/pypi/Products.ZSQLMethods"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -906,7 +906,7 @@ in Buildout recipe for creating a Zope 2 instance ''; homepage = "http://pypi.python.org/pypi/plone.recipe.zope2instance"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -926,7 +926,7 @@ in Very basic event publishing system ''; homepage = "http://pypi.python.org/pypi/zope.event"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -966,7 +966,7 @@ in Zope process lifetime events ''; homepage = "http://pypi.python.org/pypi/zope.processlifetime"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -986,7 +986,7 @@ in Default product for the Zope Content Management Framework ''; homepage = "http://pypi.python.org/pypi/Products.CMFDefault"; - license = "ZPL 2.1 (http://www.zope.org/Resources/License/ZPL-2.1)"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -1006,7 +1006,7 @@ in zope.formlib integration for Plone ''; homepage = "http://pypi.python.org/pypi/plone.app.form"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -1106,7 +1106,7 @@ in Load, configure, and compose WSGI applications and servers ''; homepage = "http://pythonpaste.org/deploy/"; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; }; @@ -1126,7 +1126,7 @@ in The default theme for Plone 4. ''; homepage = "http://pypi.python.org/pypi/plonetheme.sunburst"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -1166,7 +1166,7 @@ in Sequence Sorting ''; homepage = "http://cheeseshop.python.org/pypi/zope.sequencesort"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -1206,7 +1206,7 @@ in Interfaces for Python ''; homepage = "http://pypi.python.org/pypi/zope.interface"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -1226,7 +1226,7 @@ in Zope publication ''; homepage = "http://pypi.python.org/pypi/zope.app.publication"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -1246,7 +1246,7 @@ in Zope Component Architecture ''; homepage = "http://pypi.python.org/pypi/zope.component"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -1266,7 +1266,7 @@ in Content Views for Plone ''; homepage = "http://pypi.python.org/pypi/plone.app.content"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -1306,7 +1306,7 @@ in Zope External Editor ''; homepage = "http://pypi.python.org/pypi/Products.ExternalEditor"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -1386,7 +1386,7 @@ in A source query widget for z3c.form. ''; homepage = "http://pypi.python.org/pypi/z3c.formwidget.query"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -1406,7 +1406,7 @@ in DCWorkflow product for the Zope Content Management Framework ''; homepage = "http://pypi.python.org/pypi/Products.DCWorkflow"; - license = "ZPL 2.1 (http://www.zope.org/Resources/License/ZPL-2.1)"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -1470,7 +1470,7 @@ in Zope Template Application Language Expression Syntax (TALES) ''; homepage = "http://pypi.python.org/pypi/zope.tales"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -1510,7 +1510,7 @@ in This package provides a DateTime data type, as known from Zope 2.Unless you need to communicate with Zope 2 APIs, you're probablybetter off using Python's built-in datetime module. ''; homepage = "http://pypi.python.org/pypi/DateTime"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -1530,7 +1530,7 @@ in Special Missing objects used in Zope2. ''; homepage = "http://pypi.python.org/pypi/Missing"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -1570,7 +1570,7 @@ in World timezone definitions, modern and historical ''; homepage = "http://pytz.sourceforge.net"; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; }; @@ -1590,7 +1590,7 @@ in Zope Configuration Markup Language (ZCML) ''; homepage = "http://pypi.python.org/pypi/zope.configuration"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -1610,7 +1610,7 @@ in check-out/check-in staging for Plone ''; homepage = "http://pypi.python.org/pypi/plone.app.iterate"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -1670,7 +1670,7 @@ in zope.sendmail integration for Zope 2. ''; homepage = "http://pypi.python.org/pypi/Products.MailHost"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -1690,7 +1690,7 @@ in Zope Broken Object Interfaces ''; homepage = "http://pypi.python.org/pypi/zope.broken"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -1710,7 +1710,7 @@ in Document Templating Markup Language (DTML) ''; homepage = "http://pypi.python.org/pypi/DocumentTemplate"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -1730,7 +1730,7 @@ in Provides support for restricted execution of Python scripts in Zope 2. ''; homepage = "http://pypi.python.org/pypi/Products.PythonScripts"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -1810,7 +1810,7 @@ in Formlib-based controlpanels for Plone. ''; homepage = "http://pypi.python.org/pypi/plone.app.controlpanel"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -1830,7 +1830,7 @@ in Screen-scraping library ''; homepage = "http://www.crummy.com/software/BeautifulSoup/bs4/"; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; }; @@ -1850,7 +1850,7 @@ in WSGI request and response object ''; homepage = "http://webob.org/"; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; }; @@ -1870,7 +1870,7 @@ in An error reporting utility for Zope3 ''; homepage = "http://pypi.python.org/pypi/zope.error"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -1890,7 +1890,7 @@ in Plone OpenID authentication support ''; homepage = "http://pypi.python.org/pypi/plone.app.openid"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -1930,7 +1930,7 @@ in Plone integration for the basic plone.portlets package ''; homepage = "http://pypi.python.org/pypi/plone.app.portlets"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -1990,7 +1990,7 @@ in Persistent ExtensionClass ''; homepage = "http://pypi.python.org/pypi/Persistence"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -2030,7 +2030,7 @@ in Flexible CMF content ''; homepage = "http://code.google.com/p/dexterity"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -2050,7 +2050,7 @@ in Recipe for installing Python package distributions as eggs ''; homepage = "http://cheeseshop.python.org/pypi/zc.recipe.egg"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -2090,7 +2090,7 @@ in Enhanced emailing handlers for the python logging package. ''; homepage = "http://www.simplistix.co.uk/software/python/mailinglogger"; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; }; @@ -2110,7 +2110,7 @@ in A BTree based implementation for Zope 2's OFS. ''; homepage = "http://pypi.python.org/pypi/Products.BTreeFolder2"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -2130,7 +2130,7 @@ in webdav locking support ''; homepage = "http://pypi.python.org/pypi/plone.locking"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -2150,7 +2150,7 @@ in configurable viewlet manager ''; homepage = "http://pypi.python.org/pypi/plone.app.viewletmanager"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -2170,7 +2170,7 @@ in Zope testing framework, including the testrunner script. ''; homepage = "http://pypi.python.org/pypi/zope.testing"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -2190,7 +2190,7 @@ in Object life-cycle events ''; homepage = "http://pypi.python.org/pypi/zope.lifecycleevent"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -2210,7 +2210,7 @@ in User-configurable, blob-aware image scaling for Plone. ''; homepage = "http://pypi.python.org/pypi/plone.app.imaging"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -2230,7 +2230,7 @@ in Plone integration for plone.contentrules ''; homepage = "http://pypi.python.org/pypi/plone.app.contentrules"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -2270,7 +2270,7 @@ in Zope Page Templates ''; homepage = "http://pypi.python.org/pypi/zope.pagetemplate"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -2290,7 +2290,7 @@ in A package for all things users and groups related (specific to plone) ''; homepage = "http://pypi.python.org/pypi/plone.app.users"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -2310,7 +2310,7 @@ in System for managing development buildouts ''; homepage = "http://pypi.python.org/pypi/zc.buildout"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -2350,7 +2350,7 @@ in ZODB undo support for Zope2. ''; homepage = "http://pypi.python.org/pypi/ZopeUndo"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -2370,7 +2370,7 @@ in Zope 3 Template Application Languate (TAL) ''; homepage = "http://pypi.python.org/pypi/zope.tal"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -2390,7 +2390,7 @@ in General Zope 2 help screens. ''; homepage = "http://pypi.python.org/pypi/Products.OFSP"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -2452,7 +2452,7 @@ in Zope Container ''; homepage = "http://pypi.python.org/pypi/zope.container"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -2492,7 +2492,7 @@ in zope.interface extension for defining data schemas ''; homepage = "http://pypi.python.org/pypi/zope.schema"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -2512,7 +2512,7 @@ in zope.interface extension for defining data schemas ''; homepage = "http://pypi.python.org/pypi/zope.schema"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -2532,7 +2532,7 @@ in zExceptions contains common exceptions used in Zope2. ''; homepage = "http://pypi.python.org/pypi/zExceptions"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -2572,7 +2572,7 @@ in The Zope publisher publishes Python objects on the web. ''; homepage = "http://pypi.python.org/pypi/zope.publisher"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -2592,7 +2592,7 @@ in ZCML directives for configuring browser views for Zope. ''; homepage = "http://pypi.python.org/pypi/zope.browserpage/"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -2612,7 +2612,7 @@ in Plone specific i18n extensions. ''; homepage = "http://pypi.python.org/pypi/plone.app.i18n"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -2632,7 +2632,7 @@ in Zope Security Framework ''; homepage = "http://pypi.python.org/pypi/zope.security"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -2652,7 +2652,7 @@ in Cache purging support for Zope 2 applications ''; homepage = "http://pypi.python.org/pypi/plone.cachepurging"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -2694,7 +2694,7 @@ in Zope Component Architecture ''; homepage = "http://pypi.python.org/pypi/zope.component"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -2714,7 +2714,7 @@ in Acquisition is a mechanism that allows objects to obtain attributes from the containment hierarchy they're in. ''; homepage = "http://pypi.python.org/pypi/Acquisition"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -2774,7 +2774,7 @@ in Zope Viewlets ''; homepage = "http://pypi.python.org/pypi/zope.viewlet"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -2834,7 +2834,7 @@ in Zope Internationalization Support ''; homepage = "http://pypi.python.org/pypi/zope.i18n"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -2876,7 +2876,7 @@ in A backend for ZODB that stores pickles in a relational database. ''; homepage = "http://pypi.python.org/pypi/RelStorage"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -2896,7 +2896,7 @@ in zope.formlib integration for Zope 2 ''; homepage = "http://pypi.python.org/pypi/five.formlib"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -2978,7 +2978,7 @@ in Upgrade machinery for Plone. ''; homepage = "http://pypi.python.org/pypi/plone.app.upgrade"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -3018,7 +3018,7 @@ in Provides transforms from text/x-web-intelligent to text/html and vice versa. ''; homepage = "http://pypi.python.org/pypi/plone.intelligenttext"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -3038,7 +3038,7 @@ in Zope contenttype ''; homepage = "http://pypi.python.org/pypi/zope.contenttype"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -3058,7 +3058,7 @@ in Generic Transparent Proxies ''; homepage = "http://pypi.python.org/pypi/zope.proxy"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -3098,7 +3098,7 @@ in Zope sendmail ''; homepage = "http://pypi.python.org/pypi/zope.sendmail"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -3118,7 +3118,7 @@ in Object annotation mechanism ''; homepage = "http://pypi.python.org/pypi/zope.annotation"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -3138,7 +3138,7 @@ in Integrate five.customerize into Plone. ''; homepage = "http://pypi.python.org/pypi/plone.app.customerize/"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -3218,7 +3218,7 @@ in File-system Representation Interfaces ''; homepage = "http://pypi.python.org/pypi/zope.filerepresentation"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -3238,7 +3238,7 @@ in Decorators for caching the values of functions and methods ''; homepage = "http://pypi.python.org/pypi/plone.memoize"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -3258,7 +3258,7 @@ in Interfaces for Python ''; homepage = "http://pypi.python.org/pypi/zope.interface"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -3278,7 +3278,7 @@ in Interfaces and simple adapter that give the size of an object ''; homepage = "http://pypi.python.org/pypi/zope.size"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -3298,7 +3298,7 @@ in TTW customization of template-based Zope views ''; homepage = "http://pypi.python.org/pypi/five.customerize"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -3318,7 +3318,7 @@ in Resolver for Python dotted names. ''; homepage = "http://pypi.python.org/pypi/zope.dottedname"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -3358,7 +3358,7 @@ in Translation files for Plone ''; homepage = "http://pypi.python.org/pypi/plone.app.locales"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -3378,7 +3378,7 @@ in z3c.form date and datetime widgets ''; homepage = "https://github.com/collective/collective.z3cform.datetimewidget"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -3398,7 +3398,7 @@ in Listing of content for the Plone CMS ''; homepage = "http://pypi.python.org/pypi/plone.app.contentlisting"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -3418,7 +3418,7 @@ in Zope2 application server / web framework ''; homepage = "http://zope2.zope.org"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -3458,7 +3458,7 @@ in This package provides support for external Python methods within a Zope 2 environment. ''; homepage = "http://pypi.python.org/pypi/Products.ExternalMethod"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -3478,7 +3478,7 @@ in Browser layer management for Zope 2 applications ''; homepage = "http://pypi.python.org/pypi/plone.browserlayer"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -3498,7 +3498,7 @@ in workflow and security settings for Plone ''; homepage = "http://pypi.python.org/pypi/plone.app.workflow"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -3518,7 +3518,7 @@ in Integration package for `plone.folder` into Plone ''; homepage = "http://pypi.python.org/pypi/plone.app.folder/"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -3538,7 +3538,7 @@ in Basic inter-process locks ''; homepage = "http://www.python.org/pypi/zc.lockfile"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -3558,7 +3558,7 @@ in Cache managers for Zope 2. ''; homepage = "http://pypi.python.org/pypi/Products.StandardCacheManagers"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -3578,7 +3578,7 @@ in RestrictedPython provides a restricted execution environment for Python, e.g. for running untrusted code. ''; homepage = "http://pypi.python.org/pypi/RestrictedPython"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -3598,7 +3598,7 @@ in Adaptable string interpolation ''; homepage = "http://pypi.python.org/pypi/plone.stringinterp"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -3618,7 +3618,7 @@ in A RAM-based storage for ZODB ''; homepage = "http://pypi.python.org/pypi/tempstorage"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -3658,7 +3658,7 @@ in Zope datetime ''; homepage = "http://pypi.python.org/pypi/zope.datetime"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -3698,7 +3698,7 @@ in Zope Location ''; homepage = "http://pypi.python.org/pypi/zope.location/"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -3718,7 +3718,7 @@ in UNKNOWN ''; homepage = "https://github.com/gawel/WSGIProxy2/"; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; }; @@ -3738,7 +3738,7 @@ in Zope locale extraction and management utilities ''; homepage = "http://pypi.python.org/pypi/zope.app.locales"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -3778,7 +3778,7 @@ in Zope Content Type ''; homepage = "http://cheeseshop.python.org/pypi/zope.app.content"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -3818,7 +3818,7 @@ in MIMETools provides the <!--#mime--> tag for DocumentTemplate. ''; homepage = "http://pypi.python.org/pypi/Products.MIMETools"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -3878,7 +3878,7 @@ in Advanced i18n/l10n features ''; homepage = "http://pypi.python.org/pypi/plone.i18n"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -3938,7 +3938,7 @@ in Zope Object Database: object database and persistence ''; homepage = "UNKNOWN"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -3958,7 +3958,7 @@ in jQuery integration for Plone ''; homepage = "http://pypi.python.org/pypi/plone.app.jquery"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -3998,7 +3998,7 @@ in Plone ContentRules Engine ''; homepage = "http://pypi.python.org/pypi/plone.contentrules"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -4038,7 +4038,7 @@ in Message Identifiers for internationalization ''; homepage = "http://pypi.python.org/pypi/zope.i18nmessageid"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -4058,7 +4058,7 @@ in Transaction management for Python ''; homepage = "http://www.zope.org/Products/ZODB"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -4078,7 +4078,7 @@ in Method and property caching decorators ''; homepage = "http://pypi.python.org/pypi/zope.cachedescriptors"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -4098,7 +4098,7 @@ in Tools for managing themes in CMF and Plone sites ''; homepage = "http://pypi.python.org/pypi/plone.theme"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -4138,7 +4138,7 @@ in Zope 2's indexing and search solution. ''; homepage = "http://pypi.python.org/pypi/Products.ZCatalog"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -4178,7 +4178,7 @@ in Layout mechanisms for Plone ''; homepage = "http://pypi.python.org/pypi/plone.app.layout"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -4246,7 +4246,7 @@ in Plone UI and default rules for plone.caching/z3c.caching ''; homepage = "http://pypi.python.org/pypi/plone.app.caching"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -4266,7 +4266,7 @@ in Zope Exceptions ''; homepage = "http://cheeseshop.python.org/pypi/zope.exceptions"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -4286,7 +4286,7 @@ in plone.z3cform is a library that allows use of z3c.form with Zope 2 and the CMF. ''; homepage = "http://pypi.python.org/pypi/plone.z3cform"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -4306,7 +4306,7 @@ in Security framework for Zope2. ''; homepage = "http://pypi.python.org/pypi/AccessControl"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -4326,7 +4326,7 @@ in Special Record objects used in Zope2. ''; homepage = "http://pypi.python.org/pypi/Record"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -4386,7 +4386,7 @@ in Registry for managing CSS and JS ''; homepage = "http://pypi.python.org/pypi/Products.ResourceRegistries"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -4426,7 +4426,7 @@ in Convenience uid/gid helper function used in Zope2. ''; homepage = "http://pypi.python.org/pypi/initgroups"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -4446,7 +4446,7 @@ in Daemon process control library and tools for Unix-based systems ''; homepage = "http://www.python.org/pypi/zdaemon"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -4466,7 +4466,7 @@ in UNKNOWN ''; homepage = "http://pypi.python.org/pypi/plone.app.querystring"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -4506,7 +4506,7 @@ in Definition of authentication basics for the Zope Framework ''; homepage = "http://pypi.python.org/pypi/zope.authentication"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -4566,7 +4566,7 @@ in A portlet that fetches results from a collection ''; homepage = "http://pypi.python.org/pypi/plone.portlet.collection"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -4586,7 +4586,7 @@ in Shared Zope Toolkit browser components ''; homepage = "http://pypi.python.org/pypi/zope.browser"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -4606,7 +4606,7 @@ in This package adds 'saved search' functionality to Plone. ''; homepage = "http://pypi.python.org/pypi/plone.app.collection"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -4626,7 +4626,7 @@ in Calendar product for the Zope Content Management Framework ''; homepage = "http://pypi.python.org/pypi/Products.CMFCalendar"; - license = "ZPL 2.1 (http://www.zope.org/Resources/License/ZPL-2.1)"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -4648,7 +4648,7 @@ in The Plone Content Management System ''; homepage = "http://plone.org/"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -4668,7 +4668,7 @@ in Pluggable Zope2 authentication / authorization framework ''; homepage = "http://pypi.python.org/pypi/Products.PluggableAuthService"; - license = "ZPL 2.1 (http://www.zope.org/Resources/License/ZPL-2.1)"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -4708,7 +4708,7 @@ in jQuery Tools integration for Plone plus overlay and AJAX form helpers. ''; homepage = "http://pypi.python.org/pypi/plone.app.jquerytools"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -4728,7 +4728,7 @@ in Read Zope configuration state from profile dirs / tarballs ''; homepage = "http://pypi.python.org/pypi/Products.GenericSetup"; - license = "ZPL 2.1 (http://www.zope.org/Resources/License/ZPL-2.1)"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -4748,7 +4748,7 @@ in Metaclass for subclassable extension types ''; homepage = "http://pypi.python.org/pypi/ExtensionClass"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -4788,7 +4788,7 @@ in StructuredText parser ''; homepage = "http://pypi.python.org/pypi/zope.structuredtext"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -4808,7 +4808,7 @@ in Zope RAM Cache ''; homepage = "http://pypi.python.org/pypi/zope.ramcache"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -4828,7 +4828,7 @@ in Resolving paths in the object hierarchy ''; homepage = "http://pypi.python.org/pypi/zope.traversing"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -4848,7 +4848,7 @@ in Content Provider Framework for Zope Templates ''; homepage = "http://pypi.python.org/pypi/zope.contentprovider"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -4868,7 +4868,7 @@ in The classic Plone 3 default theme. ''; homepage = "http://pypi.python.org/pypi/plonetheme.classic"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -4908,7 +4908,7 @@ in A simple static HTML portlet for Plone. ''; homepage = "http://pypi.python.org/pypi/plone.portlet.static"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -4948,7 +4948,7 @@ in An extension of zope.viewlet to support dynamic portlets ''; homepage = "http://pypi.python.org/pypi/plone.portlets"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -4968,7 +4968,7 @@ in Configure application plugins based on interfaces ''; homepage = "http://pypi.python.org/pypi/Products.PluginRegistry"; - license = "ZPL 2.1 (http://www.zope.org/Resources/License/ZPL-2.1)"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -5008,7 +5008,7 @@ in A general logging facility ''; homepage = "http://cheeseshop.python.org/pypi/zLOG"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -5028,7 +5028,7 @@ in Zope Location ''; homepage = "http://pypi.python.org/pypi/zope.location/"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -5068,7 +5068,7 @@ in Form generation and validation library for Zope ''; homepage = "http://pypi.python.org/pypi/zope.formlib"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -5088,7 +5088,7 @@ in Pluggable object copying mechanism ''; homepage = "http://pypi.python.org/pypi/zope.copy"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -5108,7 +5108,7 @@ in A collection of generally useful vocabularies. ''; homepage = "https://github.com/plone/plone.app.vocabularies"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -5128,7 +5128,7 @@ in UNKNOWN ''; homepage = "http://pypi.python.org/pypi/archetypes.querywidget"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -5168,7 +5168,7 @@ in Zope catalog index for paths ''; homepage = "http://pypi.python.org/pypi/Products.ExtendedPathIndex"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -5188,7 +5188,7 @@ in Subrequests for Zope2 ''; homepage = "http://pypi.python.org/pypi/plone.subrequest/"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -5208,7 +5208,7 @@ in An advanced form and widget framework for Zope 3 ''; homepage = "https://launchpad.net/z3c.form"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -5228,7 +5228,7 @@ in Action icons product for the Zope Content Management Framework ''; homepage = "http://pypi.python.org/pypi/Products.CMFActionIcons"; - license = "ZPL 2.1 (http://www.zope.org/Resources/License/ZPL-2.1)"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -5248,7 +5248,7 @@ in Helper to test WSGI applications ''; homepage = "http://webtest.pythonpaste.org/"; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; }; @@ -5268,7 +5268,7 @@ in Manage link integrity in Plone. ''; homepage = "http://pypi.python.org/pypi/plone.app.linkintegrity"; - license = "GPL version 2"; + license = stdenv.lib.licenses.gpl2; }; }; @@ -5288,7 +5288,7 @@ in The Original Zope 3 Form Framework ''; homepage = "http://pypi.python.org/pypi/zope.app.form"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; @@ -5308,10 +5308,9 @@ in Local site manager implementation for Zope 2 ''; homepage = "http://pypi.python.org/pypi/five.localsitemanager"; - license = "ZPL 2.1"; + license = stdenv.lib.licenses.zpt21; }; }; } - diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fccad5c81de441348d4b8a2b87290c51d6f5f4e3..7ec651f0b146ae0bfa6e13229866b09961b9c395 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -163,11 +163,24 @@ rec { pythonDBus = dbus; }; + pyqt5 = import ../development/python-modules/pyqt/5.x.nix { + inherit (pkgs) stdenv fetchurl pkgconfig qt5 makeWrapper; + inherit (pkgs.xorg) lndir; + inherit python; + sip = sip_4_16; + pythonDBus = dbus; + }; + sip = import ../development/python-modules/sip { inherit (pkgs) stdenv fetchurl; inherit python; }; + sip_4_16 = import ../development/python-modules/sip/4.16.nix { + inherit (pkgs) stdenv fetchurl; + inherit python; + }; + tables = import ../development/python-modules/tables { inherit (pkgs) stdenv fetchurl bzip2 lzo; inherit python buildPythonPackage cython numpy numexpr; @@ -474,7 +487,7 @@ rec { meta = { homepage = http://code.google.com/p/argparse/; - license = "Apache License 2.0"; + license = stdenv.lib.licenses.asl20; description = "argparse: Python command line parser"; @@ -577,7 +590,7 @@ rec { meta = { homepage = https://github.com/botocore/bcdoc; - license = "Apache License 2.0"; + license = stdenv.lib.licenses.asl20; description = "ReST document generation tools for botocore"; }; }; @@ -895,11 +908,11 @@ rec { boto = buildPythonPackage rec { name = "boto-${version}"; - version = "2.9.9"; + version = "2.32.0"; src = fetchurl { url = "https://github.com/boto/boto/archive/${version}.tar.gz"; - sha256 = "18wqpzd1zf8nivcn2rl1wnladf7hhyy5p75b5l6kafynm4l9j6jq"; + sha256 = "0bl5y7m0m84rz4q7hx783kxpj1n9wcm7dhv54bnx8cnanyd13cxn"; }; # The tests seem to require AWS credentials. @@ -1582,7 +1595,7 @@ rec { homepage = http://code.google.com/p/cssutils/; - license = "LGPLv3+"; + license = stdenv.lib.licenses.lgpl3Plus; }; }); @@ -1753,6 +1766,42 @@ rec { }; }; + dogpile_cache = buildPythonPackage rec { + name = "dogpile.cache-0.5.4"; + + propagatedBuildInputs = [ dogpile_core ]; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/d/dogpile.cache/dogpile.cache-0.5.4.tar.gz"; + md5 = "513b77ba1bd0c31bb15dd9dd0d8471af"; + }; + + doCheck = false; + + meta = { + description = "A caching front-end based on the Dogpile lock."; + homepage = http://bitbucket.org/zzzeek/dogpile.cache; + license = licenses.bsd3; + }; + }; + + dogpile_core = buildPythonPackage rec { + name = "dogpile.core-0.4.1"; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/d/dogpile.core/dogpile.core-0.4.1.tar.gz"; + md5 = "01cb19f52bba3e95c9b560f39341f045"; + }; + + doCheck = false; + + meta = { + description = "A 'dogpile' lock, typically used as a component of a larger caching solution"; + homepage = http://bitbucket.org/zzzeek/dogpile.core; + license = licenses.bsd3; + }; + }; + dpkt = buildPythonPackage rec { name = "dpkt-1.8"; @@ -2654,7 +2703,7 @@ rec { sed -i "/use_setuptools/d" setup.py ''; - buildInputs = [ pkgs.alsaLib pkgs.jackaudio ]; + buildInputs = [ pkgs.alsaLib pkgs.jack2 ]; meta = with stdenv.lib; { description = "A Python wrapper for the RtMidi C++ library written with Cython"; @@ -2785,7 +2834,7 @@ rec { meta = { homepage = http://freedesktop.org/wiki/Software/pyxdg; description = "Contains implementations of freedesktop.org standards"; - license = "LGPLv2"; + license = stdenv.lib.licenses.lgpl2; maintainers = [ stdenv.lib.maintainers.iElectric ]; }; }; @@ -2801,7 +2850,7 @@ rec { meta = { homepage = https://github.com/erikrose/chardet; description = "Universal encoding detector"; - license = "LGPLv2"; + license = stdenv.lib.licenses.lgpl2; maintainers = [ stdenv.lib.maintainers.iElectric ]; }; }; @@ -3288,7 +3337,7 @@ rec { ''; # See http://foolscap.lothar.com/trac/browser/LICENSE. - license = "MIT"; + license = stdenv.lib.licenses.mit; maintainers = [ ]; }; @@ -3593,11 +3642,11 @@ rec { }; gunicorn = buildPythonPackage rec { - name = "gunicorn-18.0"; + name = "gunicorn-19.1.0"; src = fetchurl { url = "http://pypi.python.org/packages/source/g/gunicorn/${name}.tar.gz"; - md5 = "c7138b9ac7515a42066922d2b6120fbe"; + md5 = "3d759bec3c46a680ff010775258c4c56"; }; buildInputs = [ pytest ]; @@ -4134,7 +4183,7 @@ rec { meta = { description = "Super-fast templating language."; homepage = http://www.makotemplates.org; - license = "MIT"; + license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.iElectric ]; }; }; @@ -4256,11 +4305,11 @@ rec { meld3 = buildPythonPackage rec { - name = "meld3-0.6.10"; + name = "meld3-1.0.0"; src = fetchurl { - url = https://pypi.python.org/packages/source/m/meld3/meld3-0.6.10.tar.gz; - md5 = "42e58624e9d427be7659d7a28e2b0b6f"; + url = https://pypi.python.org/packages/source/m/meld3/meld3-1.0.0.tar.gz; + md5 = "ca270506dd4ecb20ae26fa72fbd9b0be"; }; doCheck = false; @@ -4268,7 +4317,7 @@ rec { meta = { description = "An HTML/XML templating engine used by supervisor"; homepage = https://github.com/supervisor/meld3; - license = "ZPL"; + license = "free-non-copyleft"; }; }; @@ -4305,6 +4354,24 @@ rec { }; }; + minimock = buildPythonPackage rec { + version = "1.2.8"; + name = "minimock-${version}"; + + src = fetchurl { + url = "https://bitbucket.org/jab/minimock/get/${version}.zip"; + sha256 = "c88fa8a7120623f23990a7f086a9657f6ced09025a55e3be8649a30b4945441a"; + }; + + buildInputs = [ nose ]; + + checkPhase = "./test"; + + meta = { + description = "A minimalistic mocking library for python"; + homepage = https://pypi.python.org/pypi/MiniMock; + }; + }; mitmproxy = buildPythonPackage rec { baseName = "mitmproxy"; @@ -4368,7 +4435,7 @@ rec { homepage = http://moinmo.in/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; }); @@ -4488,7 +4555,7 @@ rec { meta = { description = "Python multimedia tagging library"; homepage = http://code.google.com/p/mutagen; - license = "LGPLv2"; + license = stdenv.lib.licenses.lgpl2; }; }); @@ -4507,7 +4574,7 @@ rec { meta = { description = "Utilities for use with console mail clients, like mutt"; homepage = http://www.blacktrash.org/hg/muttils; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; }); @@ -4588,6 +4655,23 @@ rec { }); + nbxmpp = buildPythonPackage rec { + name = "nbxmpp-0.5"; + + src = fetchurl { + name = "${name}.tar.gz"; + url = "https://python-nbxmpp.gajim.org/downloads/5"; + sha256 = "0y270c9v4i9n58p4ghlm18h50qcfichmfkgcpqd3bypx4fkmdx90"; + }; + + meta = { + homepage = "https://python-nbxmpp.gajim.org/"; + description = "Non-blocking Jabber/XMPP module"; + license = stdenv.lib.licenses.gpl3; + }; + }; + + netaddr = buildPythonPackage rec { name = "netaddr-0.7.5"; @@ -5199,6 +5283,28 @@ rec { }; }; + pbr = buildPythonPackage rec { + name = "pbr-0.9.0"; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/pbr/${name}.tar.gz"; + sha256 = "e5a57c434b1faa509a00bf458d2c7af965199d9cced3d05a547bff9880f7e8cb"; + }; + + # pip depend on $HOME setting + preConfigure = "export HOME=$TMPDIR"; + + doCheck = false; + + buildInputs = [ pip ]; + + meta = { + description = "Python Build Reasonableness"; + homepage = "http://docs.openstack.org/developer/pbr/"; + license = licenses.asl20; + }; + }; + pep8 = buildPythonPackage rec { name = "pep8-${version}"; version = "1.5.7"; @@ -5231,7 +5337,7 @@ rec { meta = { homepage = "http://www.noah.org/wiki/Pexpect"; description = "Automate interactive console applications such as ssh, ftp, etc."; - license = "MIT"; + license = stdenv.lib.licenses.mit; longDescription = '' Pexpect is similar to the Don Libes "Expect" system, but Pexpect @@ -5425,7 +5531,7 @@ rec { protobuf = buildPythonPackage rec { inherit (pkgs.protobuf) name src; - propagatedBuildInputs = [pkgs.protobuf]; + propagatedBuildInputs = [ pkgs.protobuf setuptools ]; sourceRoot = "${name}/python"; meta = { @@ -5658,7 +5764,7 @@ rec { description = "Python wrappers for the Crypto++ library"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = [ ]; platforms = stdenv.lib.platforms.linux; @@ -5971,6 +6077,23 @@ rec { }; }); + pyro3 = buildPythonPackage (rec { + name = "Pyro-3.16"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/Pyro/${name}.tar.gz"; + md5 = "59d4d3f4a8786776c9d7f9051b8f1a69"; + }; + + meta = with stdenv.lib; { + description = "Distributed object middleware for Python (IPC/RPC)"; + homepage = http://pythonhosted.org/Pyro/; + license = licenses.mit; + platforms = platforms.unix; + maintainers = [ maintainers.bjornfor ]; + }; + }); + pyrss2gen = buildPythonPackage (rec { name = "PyRSS2Gen-1.0.0"; @@ -6397,7 +6520,7 @@ rec { homepage = http://allmydata.org/trac/pyutil; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; }); @@ -6646,12 +6769,12 @@ rec { robotframework = buildPythonPackage rec { - version = "2.8.4"; + version = "2.8.5"; name = "robotframework-${version}"; src = fetchurl { url = "https://pypi.python.org/packages/source/r/robotframework/${name}.tar.gz"; - sha256 = "0rxk135c1051cwv45219ib3faqvi5rl50l98ncb83c7qxy92jg2n"; + sha256 = "0rzdn2gvmcrxs2fvxm11h55w4j5pv0lf443fc4hl8kzwjwgjckga"; }; # error: invalid command 'test' @@ -6846,7 +6969,7 @@ rec { meta = { homepage = http://stuvel.eu/rsa; - license = "Apache License 2.0"; + license = stdenv.lib.licenses.asl20; description = "A pure-Python RSA implementation"; }; }; @@ -7034,7 +7157,7 @@ rec { homepage = http://code.google.com/p/simplejson/; - license = "MIT"; + license = stdenv.lib.licenses.mit; }; }); @@ -7100,6 +7223,25 @@ rec { }; }; + stevedore = buildPythonPackage rec { + name = "stevedore-0.15"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/s/stevedore/${name}.tar.gz"; + sha256 = "bec9269cbfa58de4f0849ec79bb7d54eeeed9df8b5fbfa1637fbc68062822847"; + }; + + buildInputs = [ pbr pip ]; + + propagatedBuildInputs = [ setuptools ]; + + meta = { + description = "Manage dynamic plugins for Python applications"; + homepage = "https://pypi.python.org/pypi/stevedore"; + license = licenses.asl20; + }; + }; + pydns = buildPythonPackage rec { name = "pydns-2.3.6"; @@ -7699,7 +7841,7 @@ rec { meta = { homepage = http://taskcoach.org/; description = "Todo manager to keep track of personal tasks and todo lists"; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; }; }; @@ -7984,7 +8126,7 @@ rec { meta = { homepage = "urlgrabber.baseurl.org"; - license = "LGPLv2+"; + license = stdenv.lib.licenses.lgpl2Plus; description = "Python module for downloading files"; maintainers = [ stdenv.lib.maintainers.qknight ]; }; @@ -8012,10 +8154,10 @@ rec { }); virtualenv = buildPythonPackage rec { - name = "virtualenv-1.11.4"; + name = "virtualenv-1.11.6"; src = fetchurl { url = "http://pypi.python.org/packages/source/v/virtualenv/${name}.tar.gz"; - md5 = "9accc2d3f0ec1da479ce2c3d1fdff06e"; + md5 = "f61cdd983d2c4e6aeabb70b1060d6f49"; }; inherit recursivePthLoader; @@ -8058,6 +8200,53 @@ rec { }; }; + virtualenvwrapper = buildPythonPackage (rec { + name = "virtualenvwrapper-4.3"; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/v/virtualenvwrapper/${name}.tar.gz"; + sha256 = "514cbc22218347bf7b54bdbe49e1a5f550d2d53b1ad2491c10e91ddf48fb528f"; + }; + + # pip depend on $HOME setting + preConfigure = "export HOME=$TMPDIR"; + + buildInputs = [ pbr pip pkgs.which ]; + propagatedBuildInputs = [ stevedore virtualenv virtualenv-clone ]; + + patchPhase = '' + substituteInPlace "virtualenvwrapper.sh" --replace "which" "${pkgs.which}/bin/which" + substituteInPlace "virtualenvwrapper_lazy.sh" --replace "which" "${pkgs.which}/bin/which" + ''; + + postInstall = '' + # This might look like a dirty hack but we can't use the makeWrapper function because + # the wrapped file were then called via "exec". The virtualenvwrapper shell scripts + # aren't normal executables. Instead, the user has to evaluate them. + + for file in "virtualenvwrapper.sh" "virtualenvwrapper_lazy.sh"; do + local wrapper="$out/bin/$file" + local wrapped="$out/bin/.$file-wrapped" + mv "$wrapper" "$wrapped" + + cat > "$wrapper" <<- EOF + export PATH=$PATH:\$PATH + export PYTHONPATH=$PYTHONPATH:$(toPythonPath $out):\$PYTHONPATH + source "$wrapped" + EOF + + chmod -x "$wrapped" + chmod +x "$wrapper" + done + ''; + + meta = { + description = "Enhancements to virtualenv"; + homepage = "https://pypi.python.org/pypi/virtualenvwrapper"; + license = licenses.mit; + }; + }); + waitress = buildPythonPackage rec { name = "waitress-0.8.7"; @@ -8296,7 +8485,7 @@ rec { homepage = http://python-xlib.sourceforge.net/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; }); @@ -8406,7 +8595,7 @@ rec { and Haskell API. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; }); @@ -8875,11 +9064,11 @@ rec { cliapp = buildPythonPackage rec { name = "cliapp-${version}"; - version = "1.20130808"; + version = "1.20140719"; src = fetchurl rec { url = "http://code.liw.fi/debian/pool/main/p/python-cliapp/python-cliapp_${version}.orig.tar.gz"; - sha256 = "0i9fqkahrc16mnxjw8fcr4hwrq3ibfrj2lzzbzzb7v5yk5dlr532"; + sha256 = "0kxl2q85n4ggvbw2m8crl11x8n637mx6y3a3b5ydw8nhlsiqijgp"; }; buildInputs = [ sphinx ]; @@ -8909,6 +9098,24 @@ rec { }; + tornadokick = buildPythonPackage rec { + name = "tornadokick-2014.07.23"; + + propagatedBuildInputs = [ tornado ]; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/t/tornadokick/${name}.tar.gz"; + md5 = "201d26de2993a554b16140af3b4ee1b6"; + }; + + meta = { + description = "The TornadoKick Web Toolkit for Tornado Web Framework."; + homepage = http://github.com/multoncore/tornadokick; + license = stdenv.lib.licenses.asl20; + }; + }; + + tarman = buildPythonPackage rec { version = "0.1.3"; name = "tarman-${version}"; @@ -9487,7 +9694,7 @@ rec { meta = { description = "Cross-platform system power status information"; homepage = https://github.com/Kentzo/Power; - license = "mit"; + license = stdenv.lib.licenses.mit; }; }; diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix index df0480bf82cb797d7070d441fa91878f0603048e..c447587e36e8f96071ffb6587a5dca2bb663f91c 100644 --- a/pkgs/top-level/release-small.nix +++ b/pkgs/top-level/release-small.nix @@ -23,7 +23,7 @@ with import ./release-lib.nix { inherit supportedSystems; }; aterm28 = all; autoconf = all; automake = all; - avahi = allBut "i686-cygwin"; # Cygwin builds fail + avahi = allBut cygwin; # Cygwin builds fail bash = all; bashInteractive = all; bc = all; @@ -48,7 +48,6 @@ with import ./release-lib.nix { inherit supportedSystems; }; gcc = all; gcc33 = linux; gcc34 = linux; - gcc42 = linux; gcc44 = linux; gcj = linux; ghdl = linux; @@ -60,7 +59,7 @@ with import ./release-lib.nix { inherit supportedSystems; }; gnumake = all; gnupatch = all; gnupg = linux; - gnuplot = allBut "i686-cygwin"; + gnuplot = allBut cygwin; gnused = all; gnutar = all; gnutls = linux; @@ -143,7 +142,7 @@ with import ./release-lib.nix { inherit supportedSystems; }; policykit = linux; portmap = linux; procps = linux; - python = allBut "i686-cygwin"; + python = allBut cygwin; pythonFull = linux; readline = all; rlwrap = all; @@ -153,9 +152,9 @@ with import ./release-lib.nix { inherit supportedSystems; }; scrot = linux; sdparm = linux; sharutils = all; - sloccount = allBut "i686-cygwin"; + sloccount = allBut cygwin; smartmontools = all; - sqlite = allBut "i686-cygwin"; + sqlite = allBut cygwin; squid = linux; ssmtp = linux; stdenv = prio 175 all; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 56cc49abac630adf132e03b04f380136d3ae24fd..da560b6997f858318eb501dac02b21daa4378b2a 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -53,7 +53,7 @@ let audacious = linux; autoconf = all; automake = all; - avahi = allBut "i686-cygwin"; # Cygwin builds fail + avahi = allBut cygwin; # Cygwin builds fail bash = all; bashInteractive = all; bazaar = linux; # first let sqlite3 work on darwin @@ -98,7 +98,6 @@ let drgeo = linux; ejabberd = linux; elinks = linux; - emacs23 = gtkSupported; enscript = all; eprover = linux; evince = linux; @@ -116,7 +115,6 @@ let gcc = linux; gcc33 = linux; gcc34 = linux; - gcc42 = linux; gcc44 = linux; gcj = linux; ghdl = linux; @@ -135,7 +133,7 @@ let gnumake = all; gnupatch = all; gnupg = linux; - gnuplot = allBut "i686-cygwin"; + gnuplot = allBut cygwin; gnused = all; gnutar = all; gnutls = linux; @@ -185,7 +183,6 @@ let libtool = all; libtool_2 = all; lout = linux; - lsh = linux; lsof = linux; ltrace = linux; lvm2 = linux; @@ -214,7 +211,7 @@ let mysql = linux; mysql51 = linux; mysql55 = linux; - nano = allBut "i686-cygwin"; + nano = allBut cygwin; ncat = linux; netcat = all; nfsUtils = linux; @@ -247,7 +244,7 @@ let pthreadmanpages = linux; pygtk = linux; pyqt4 = linux; - python = allBut "i686-cygwin"; + python = allBut cygwin; pythonFull = linux; sbcl = linux; qt3 = linux; @@ -258,7 +255,7 @@ let rogue = all; rpm = linux; rsync = linux; - rubber = allBut "i686-cygwin"; + rubber = allBut cygwin; ruby = all; rxvt_unicode = linux; screen = linux ++ darwin; @@ -268,10 +265,10 @@ let sgtpuzzles = linux; sharutils = all; slim = linux; - sloccount = allBut "i686-cygwin"; + sloccount = allBut cygwin; smartmontools = linux; spidermonkey = linux; - sqlite = allBut "i686-cygwin"; + sqlite = allBut cygwin; squid = linux; ssmtp = linux; stdenv = prio 175 all; @@ -342,17 +339,6 @@ let zsh = linux; zsnes = ["i686-linux"]; - emacs23Packages = { - bbdb = linux; - cedet = linux; - emacsw3m = linux; - emms = linux; - jdee = linux; - }; - - firefox36Pkgs.firefox = linux; - firefoxPkgs.firefox = linux; - gnome = { gnome_panel = linux; metacity = linux;