diff --git a/.gitignore b/.gitignore index d43399383a0..16aaf68b70b 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/Makefile b/doc/Makefile index 3c2e8cb21b0..39988cdd414 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -21,18 +21,18 @@ all: NEWS.html NEWS.txt manual.html manual.pdf NEWS.html: release-notes.xml $(XSLTPROC) --nonet --xinclude --output $@ $(NEWS_OPTS) \ - $(docbookxsl)/html/docbook.xsl release-notes.xml + $(docbookxsl)/xhtml/docbook.xsl release-notes.xml NEWS.txt: release-notes.xml $(XSLTPROC) --nonet --xinclude quote-literals.xsl release-notes.xml | \ $(XSLTPROC) --nonet --output $@.tmp.html $(NEWS_OPTS) \ - $(docbookxsl)/html/docbook.xsl - + $(docbookxsl)/xhtml/docbook.xsl - LANG=en_US w3m -dump $@.tmp.html > $@ rm $@.tmp.html manual.html: *.xml $(XSLTPROC) --nonet --xinclude --output manual.html \ - $(docbookxsl)/html/docbook.xsl manual.xml + $(docbookxsl)/xhtml/docbook.xsl manual.xml manual.pdf: *.xml $(dblatex) \ diff --git a/doc/contributing.xml b/doc/contributing.xml new file mode 100644 index 00000000000..bcea404baee --- /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 d2c07859b28..145e3e12dd9 100644 --- a/doc/manual.xml +++ b/doc/manual.xml @@ -32,6 +32,7 @@ + diff --git a/doc/meta.xml b/doc/meta.xml index 6c8e458509a..eb644b3b0ee 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 49c674052b9..0f11a906d77 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 e49528f2a2e..29144264ddd 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,118 +27,149 @@ 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"; }; - boost = { - shortName = "boost"; - fullName = "Boost Software License"; - url = http://www.boost.org/LICENSE_1_0.txt; + asl20 = spdx { + shortName = "Apache-2.0"; + fullName = "Apache License 2.0"; }; - bsd2 = { - shortName = "BSD-2"; - fullName = "BSD license (2 clause)"; - url = http://opensource.org/licenses/BSD-2-Clause; + boost = spdx { + shortName = "BSL-1.0"; + fullName = "Boost Software License 1.0"; }; - bsd3 = { - shortName = "BSD-3"; - fullName = "BSD license (3 clause)"; - url = http://opensource.org/licenses/BSD-3-Clause; + bsd2 = spdx { + shortName = "BSD-2-Clause"; + fullName = ''BSD 2-clause "Simplified" License''; }; - bsdOriginal = { - shortName = "BSD-original"; - fullName = "Original BSD license with advertising clause"; - url = https://fedoraproject.org/wiki/Licensing/BSD; + bsd3 = spdx { + shortName = "BSD-3-Clause"; + fullName = ''BSD 3-clause "New" or "Revised" License''; }; - cc-by-30 = { - shortName = "CC BY 3.0"; + bsdOriginal = spdx { + shortName = "BSD-4-Clause"; + fullName = ''BSD 4-clause "Original" or "Old" License''; + }; + + 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"; }; - cpl10 = { - shortName = "CPL 1.0"; - fullName = "Common Public License version 1.0"; - url = http://www.eclipse.org/legal/cpl-v10.html; + cecill-c = spdx { + shortName = "CECILL-C"; + fullName = "CeCILL-C Free Software License Agreement"; }; - epl10 = { - shortName = "EPL 1.0"; - fullName = "Eclipse Public License version 1.0"; - url = http://www.eclipse.org/legal/epl-v10.html; + cpl10 = spdx { + shortName = "CPL-1.0"; + fullName = "Common Public License 1.0"; }; - gpl2 = { - shortName = "GPLv2"; - fullName = "GNU General Public License version 2"; - url = http://www.gnu.org/licenses/old-licenses/gpl-2.0.html; + epl10 = spdx { + shortName = "EPL-1.0"; + fullName = "Eclipse Public License 1.0"; + }; + + free = "free"; + + 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 = { + 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"; + }; + + ipl10 = spdx { + shortName = "IPL-1.0"; + fullName = "IBM Public License v1.0"; + }; + + isc = spdx { shortName = "ISC"; - fullName = "Internet Systems Consortium License"; - url = http://www.opensource.org/licenses/ISC; + fullName = "ISC License"; }; - 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; + lgpl2 = spdx { + shortName = "LGPL-2.0"; + fullName = "GNU Library General Public License v2 only"; }; - ijg = { - shortName = "IJG"; - fullName = "Independent JPEG Group License"; - url = https://fedoraproject.org/wiki/Licensing/IJG; + lgpl2Plus = spdx { + shortName = "LGPL-2.0+"; + fullName = "GNU Library General Public License v2 or later"; + }; + + lgpl21 = spdx { + shortName = "LGPL-2.1"; + fullName = "GNU Library General Public License v2.1 only"; + }; + + lgpl21Plus = spdx { + shortName = "LGPL-2.1+"; + fullName = "GNU Library General Public License v2.1 or later"; + }; + + lgpl3 = spdx { + shortName = "LGPL-3.0"; + fullName = "GNU Lesser General Public License v3.0 only"; + }; + + lgpl3Plus = spdx { + shortName = "LGPL-3.0+"; + fullName = "GNU Lesser General Public License v3.0 or later"; }; libtiff = { @@ -148,76 +178,47 @@ url = https://fedoraproject.org/wiki/Licensing/libtiff; }; - lgpl2 = { - shortName = "LGPLv2"; - fullName = "GNU Library General Public License version 2"; - url = http://www.gnu.org/licenses/old-licenses/lgpl-2.0.html; - }; - - 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; - }; - - 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; - }; - - 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; - }; - 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; - }; - - lgpl3Plus = { - shortName = "LGPLv3+"; - fullName = "GNU Lesser General Public License version 3 or later"; - url = http://www.fsf.org/licensing/licenses/lgpl.html; - }; - - mit = { + mit = spdx { shortName = "MIT"; - fullName = "MIT/X11 license"; - url = http://www.opensource.org/licenses/mit-license.php; + fullName = "MIT License"; }; - mpl11 = { - shortName = "MPL1.1"; - fullName = "Mozilla Public License version 1.1"; - url = http://www.mozilla.org/MPL/MPL-1.1.html; + mpl11 = spdx { + shortName = "MPL-1.1"; + fullName = "Mozilla Public License 1.1"; }; - mpl20 = { - shortName = "MPL2.0"; - fullName = "Mozilla Public License version 2.0"; - url = https://www.mozilla.org/MPL/2.0; + mpl20 = spdx { + shortName = "MPL-2.0"; + fullName = "Mozilla Public License 2.0"; }; - ofl = { - shortName = "OFL"; - fullName = "SIL Open Font License"; - url = "http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&id=OFL_web"; + msrla = { + shortName = "MSR-LA"; + fullName = "Microsoft Research License Agreement"; + url = "http://research.microsoft.com/en-us/projects/pex/msr-la.txt"; }; - openssl = { - shortName = "openssl"; - fullName = "OpenSSL license"; - url = http://www.openssl.org/source/license.html; + ofl = spdx { + shortName = "OFL-1.1"; + fullName = "SIL Open Font License 1.1"; + }; + + openssl = spdx { + shortName = "OpenSSL"; + fullName = "OpenSSL License"; + }; + + psfl = spdx { + shortName = "Python-2.0"; + fullName = "Python Software Foundation License version 2"; + #url = http://docs.python.org/license.html; }; publicDomain = { @@ -225,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 = { @@ -243,45 +243,26 @@ unfreeRedistributableFirmware = "unfree-redistributable-firmware"; - zlib = { - shortName = "zlib"; - fullName = "zlib license"; - url = http://www.gzip.org/zlib/zlib_license.html; + wadalab = { + shortName = "wadalab"; + fullName = "Wadalab Font License"; + url = https://fedoraproject.org/wiki/Licensing:Wadalab?rd=Licensing/Wadalab; }; - zpt20 = { - shortName = "ZPT2.0"; + zlib = spdx { + shortName = "Zlib"; + fullName = "zlib License"; + }; + + 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 3a66f7a60b3..b1c3f6bcdd2 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -6,6 +6,7 @@ _1126 = "Christian Lask "; aforemny = "Alexander Foremny "; + ak = "Alexander Kjeldaas "; akc = "Anders Claesson "; algorith = "Dries Van Daele "; all = "Nix Committers "; @@ -25,27 +26,32 @@ bjornfor = "Bjørn Forsman "; bluescreen303 = "Mathijs Kwik "; bodil = "Bodil Stokke "; + bosu = "Boris Sukholitko "; calrama = "Moritz Maxeiner "; cfouche = "Chaddaï Fouché "; chaoflow = "Florian Friesdorf "; coconnor = "Corey O'Connor "; coroa = "Jonas Hörsch "; cstrahan = "Charles Strahan "; + DamienCassou = "Damien Cassou "; ederoyd46 = "Matthew Brown "; edwtjo = "Edward Tjörnhammar "; eelco = "Eelco Dolstra "; emery = "Emery Hemingway "; ertes = "Ertugrul Söylemez "; falsifian = "James Cook "; + flosse = "Markus Kohlhase "; fuuzetsu = "Mateusz Kowalczyk "; garbas = "Rok Garbas "; goibhniu = "Cillian de Róiste "; guibert = "David Guibert "; hinton = "Tom Hinton "; + hrdinka = "Christoph Hrdinka "; ianwookim = "Ian-Woo Kim "; iElectric = "Domen Kozar "; iyzsong = "Song Wenwu "; jcumming = "Jack Cummings "; + jgeerds = "Jascha Geerds "; joamaki = "Jussi Maki "; joelteon = "Joel Taylor "; jwiegley = "John Wiegley "; @@ -58,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 "; @@ -74,6 +82,7 @@ qknight = "Joachim Schiele "; raskin = "Michael Raskin <7c6f434c@mail.ru>"; redbaron = "Maxim Ivanov "; + refnil = "Martin Lavoie "; relrod = "Ricky Elrod "; rickynils = "Rickard Nilsson "; rob = "Rob Vermaas "; @@ -84,13 +93,16 @@ 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 "; tomberek = "Thomas Bereknyei "; ttuegel = "Thomas Tuegel "; + tv = "Tomislav Viljetić "; urkud = "Yury G. Kudryashov "; vbmithr = "Vincent Bernardoff "; vcunat = "Vladimír Čunát "; @@ -99,6 +111,8 @@ vlstill = "Vladimír Štill "; 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/modules.nix b/lib/modules.nix index 633b6fc05b2..bcaadc7fd97 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -194,7 +194,7 @@ rec { is transformed into - [ { boot = set1; } { boot = mkIf cond set2; services mkIf cond set3; } ]. + [ { boot = set1; } { boot = mkIf cond set2; services = mkIf cond set3; } ]. This transform is the critical step that allows mkIf conditions to refer to the full configuration without creating an infinite diff --git a/lib/platforms.nix b/lib/platforms.nix index 76df389deac..44a56b659c7 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 b67b6ee2a57..00000000000 --- 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 00000000000..587f6275197 --- /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 98686a19f1e..051f0fb8c1e 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 a79a77f40df..55533a05b06 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 3da5e300977..4cbfcc229fa 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 8d7c28dee73..f51a04cdf25 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 bb65a49217f..e81a1dc356e 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 89b681ed2cd..675b5bb3514 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 aadd0f6428c..096d96ac1c8 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/test-driver/log2html.xsl b/nixos/lib/test-driver/log2html.xsl index 8e907d85ffa..ce8a9c6de2b 100644 --- a/nixos/lib/test-driver/log2html.xsl +++ b/nixos/lib/test-driver/log2html.xsl @@ -9,8 +9,8 @@ - - + + + + diff --git a/pkgs/development/mobile/xcodeenv/simulate-app.nix b/pkgs/development/mobile/xcodeenv/simulate-app.nix index d25ef0f8e43..c999497d8c0 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 71e34ee5127..fd375d6213c 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/biniou/default.nix b/pkgs/development/ocaml-modules/biniou/default.nix new file mode 100644 index 00000000000..59f30de5e84 --- /dev/null +++ b/pkgs/development/ocaml-modules/biniou/default.nix @@ -0,0 +1,32 @@ +{stdenv, fetchurl, ocaml, findlib, easy-format}: +let + pname = "biniou"; + version = "1.0.9"; + webpage = "http://mjambon.com/${pname}.html"; +in +stdenv.mkDerivation rec { + + name = "${pname}-${version}"; + + src = fetchurl { + url = "http://mjambon.com/releases/${pname}/${name}.tar.gz"; + sha256 = "14j3hrhbjqxbizr1pr8fcig9dmfzhbjjwzwyc99fcsdic67w8izb"; + }; + + buildInputs = [ ocaml findlib easy-format ]; + + createFindlibDestdir = true; + + makeFlags = "PREFIX=$(out)"; + + preBuild = '' + mkdir $out/bin + ''; + + meta = { + description = "A binary data format designed for speed, safety, ease of use and backward compatibility as protocols evolve"; + homepage = "${webpage}"; + license = stdenv.lib.licenses.bsd3; + platforms = ocaml.meta.platforms; + }; +} diff --git a/pkgs/development/ocaml-modules/camlimages/default.nix b/pkgs/development/ocaml-modules/camlimages/default.nix index 21610f8f310..ff344ef6f32 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 7379a62d424..8f18658b0f6 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/easy-format/default.nix b/pkgs/development/ocaml-modules/easy-format/default.nix new file mode 100644 index 00000000000..d01a4edf26e --- /dev/null +++ b/pkgs/development/ocaml-modules/easy-format/default.nix @@ -0,0 +1,27 @@ +{stdenv, fetchurl, ocaml, findlib}: +let + pname = "easy-format"; + version = "1.0.2"; + webpage = "http://mjambon.com/${pname}.html"; +in +stdenv.mkDerivation rec { + + name = "${pname}-${version}"; + + src = fetchurl { + url = "http://mjambon.com/releases/${pname}/${name}.tar.gz"; + sha256 = "07wlgprqvk92z0p2xzbnvh312ca6gvhy3xc6hxlqfawnnnin7rzi"; + }; + + buildInputs = [ ocaml findlib ]; + + createFindlibDestdir = true; + + meta = { + description = "A high-level and functional interface to the Format module of the OCaml standard library"; + homepage = "${webpage}"; + license = "bsd"; + }; +} + + diff --git a/pkgs/development/ocaml-modules/expat/default.nix b/pkgs/development/ocaml-modules/expat/default.nix index b2702a5cade..f4837bd047f 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 4d46bda243f..f1ec69143b0 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 46398d26114..8b611c65a41 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 75c8d7ad224..7cefe26746f 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 392cf5c9772..c2f50c4e5b8 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 976910aae29..333e86fa3fe 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 ed70d1b9c3e..0ae60ab07e4 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 8f19847680b..94395f601aa 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 0170119d94e..3f91901d9b6 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 6361dbd9ae6..51af8d99d69 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/pcre/default.nix b/pkgs/development/ocaml-modules/pcre/default.nix index 6df221a9244..b6c2488b250 100644 --- a/pkgs/development/ocaml-modules/pcre/default.nix +++ b/pkgs/development/ocaml-modules/pcre/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, pcre, ocaml, findlib}: stdenv.mkDerivation { - name = "ocaml-pcre-7.0.4"; + name = "ocaml-pcre-7.1.1"; src = fetchurl { - url = https://bitbucket.org/mmottl/pcre-ocaml/downloads/pcre-ocaml-7.0.4.tar.gz; - sha256 = "0h2qlza7jkzgrglw1k0fydpbil0dgpv526kxyyd1apdbyzhb0mpw"; + url = https://github.com/mmottl/pcre-ocaml/releases/download/v7.1.1/pcre-ocaml-7.1.1.tar.gz; + sha256 = "0nj4gb6hjjjmz5gnl9cjrh4w82rw8cvbwnk0hxhfgfd25p9k50n3"; }; buildInputs = [ocaml findlib]; diff --git a/pkgs/development/ocaml-modules/sqlite3/default.nix b/pkgs/development/ocaml-modules/sqlite3/default.nix index 63dc06634d7..d92207cd20b 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 e996b6223b1..77ffa752898 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 19beeec1ec5..72efaa0606d 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/ocaml-modules/yojson/default.nix b/pkgs/development/ocaml-modules/yojson/default.nix new file mode 100644 index 00000000000..9237db080d6 --- /dev/null +++ b/pkgs/development/ocaml-modules/yojson/default.nix @@ -0,0 +1,32 @@ +{stdenv, fetchurl, ocaml, findlib, cppo, easy-format, biniou}: +let + pname = "yojson"; + version = "1.1.8"; + webpage = "http://mjambon.com/${pname}.html"; +in +stdenv.mkDerivation rec { + + name = "${pname}-${version}"; + + src = fetchurl { + url = "http://mjambon.com/releases/${pname}/${name}.tar.gz"; + sha256 = "0ayx17dimnpavdfyq6dk9xv2x1fx69by85vc6vl3nqxjkcv5d2rv"; + }; + + buildInputs = [ ocaml findlib cppo easy-format biniou ]; + + createFindlibDestdir = true; + + makeFlags = "PREFIX=$(out)"; + + preBuild = '' + mkdir $out/bin + ''; + + meta = { + description = "An optimized parsing and printing library for the JSON format"; + homepage = "${webpage}"; + license = stdenv.lib.licenses.bsd3; + platforms = ocaml.meta.platforms; + }; +} diff --git a/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix b/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix index 5d22970155b..93cef5d844c 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 b30e2f12fc6..2b412d518c5 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 00000000000..7022206c5cc --- /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 00000000000..b32ed7a32d2 --- /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 00000000000..c06916c96ee --- /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 00000000000..9061ec9b8e5 --- /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 00000000000..7910e17ebc4 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 00000000000..f6e88141752 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 00000000000..ec8a5f95c6c 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 00000000000..3f206cf8b18 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 00000000000..927514dd215 --- /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 32ef97bf29c..d88504379ed 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 282aeca9ed1..857f002cace 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 00000000000..d4461788381 --- /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 a6efb8bdc2b..93fa70e44bc 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 00000000000..2d2a2ed5151 --- /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 107bb08759f..e3bcf059c1c 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 dc4f733a4cf..d274283594a 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 12ec5a7ef51..2423cbb0c2e 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 d8ef2d7b52f..5e266aba7d0 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 a3153bed217..b5ddec09c03 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 374158da810..cc36680fcb0 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 00000000000..aa1fb198438 --- /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/python-modules/tables/default.nix b/pkgs/development/python-modules/tables/default.nix index d3edf54788a..7c897e9531f 100644 --- a/pkgs/development/python-modules/tables/default.nix +++ b/pkgs/development/python-modules/tables/default.nix @@ -52,5 +52,6 @@ buildPythonPackage rec { meta = { description = "Hierarchical datasets for Python"; homepage = "http://www.pytables.org/"; + license = stdenv.lib.licenses.bsd2; }; } diff --git a/pkgs/development/qtcreator/default.nix b/pkgs/development/qtcreator/default.nix index 2b0410f0874..dec94a912e0 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/r-modules/cran-packages.nix b/pkgs/development/r-modules/cran-packages.nix index 3bebd5468e9..3a8624c9493 100644 --- a/pkgs/development/r-modules/cran-packages.nix +++ b/pkgs/development/r-modules/cran-packages.nix @@ -44,7 +44,10 @@ let derive = { name, version, sha256, depends ? [] }: buildRPackage { name = "${name}-${version}"; src = fetchurl { - url = "mirror://cran/src/contrib/${name}_${version}.tar.gz"; + urls = [ + "mirror://cran/src/contrib/${name}_${version}.tar.gz" + "mirror://cran/src/contrib/Archive/${name}/${name}_${version}.tar.gz" + ]; inherit sha256; }; propagatedBuildInputs = depends; diff --git a/pkgs/development/tools/analysis/lcov/default.nix b/pkgs/development/tools/analysis/lcov/default.nix index 9ad34097d0b..89a17d28a1b 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 d549bd8fb19..2ab8c05ebf8 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 f7fb810410d..a2d135d4484 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 f860f05c36a..6d0e28f0ab2 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/spin/default.nix b/pkgs/development/tools/analysis/spin/default.nix index 4be166f9768..06c04ca41b5 100644 --- a/pkgs/development/tools/analysis/spin/default.nix +++ b/pkgs/development/tools/analysis/spin/default.nix @@ -1,26 +1,20 @@ -{stdenv, fetchurl, flex, yacc, tk }: +{stdenv, fetchurl, yacc }: -stdenv.mkDerivation { - name = "spin-5.1.7"; +stdenv.mkDerivation rec { + version = "6.3.2"; + name = "spin-${version}"; src = fetchurl { - url = http://spinroot.com/spin/Src/spin517.tar.gz; - sha256 = "03c6bmar4z13jx7dddb029f0qnmgl8x4hyfwn3qijjyd4dbliiw6"; + url = http://spinroot.com/spin/Src/spin632.tar.gz; + curlOpts = "--user-agent 'Mozilla/5.0'"; + sha256 = "1llsv1mnwr99hvsm052i3wwpa3dm5j12s5p10hizi6i9hlp00b5y"; }; - buildInputs = [ flex yacc tk ]; + buildInputs = [ yacc ]; - patchPhase = '' - cd Src* - sed -i -e 's/-DNXT/-DNXT -DCPP="\\"gcc -E -x c\\""/' makefile - ''; - installPhase = '' - mkdir -p $out/bin - cp ../Xspin*/xsp* $out/bin/xspin - sed -i -e '1s@^#!/bin/sh@#!${tk}/bin/wish@' \ - -e '/exec wish/d' $out/bin/xspin - cp spin $out/bin - ''; + sourceRoot = "Spin/Src${version}"; + + installPhase = "install -D spin $out/bin/spin"; meta = { description = "Formal verification tool for distributed software systems"; diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix index a6ea2c2f59d..5ffc287d114 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 3a0879d6edf..76becca74cf 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 a415ffd152d..23941653575 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 f21be7cc48c..870664c252a 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 2d7c63fdc7d..ccbf74e528e 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 42277b22036..45dffe06676 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 abc0b070a76..39052fea6cb 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 25ef7ef0b24..edc901858b8 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 56d2326c916..2a8c80e7db2 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 4f3c7defa48..6b24df39be9 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 6a76fa0302b..2da17490abf 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 f8466e5aafd..b7316fc17c4 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 b57c4c263f5..d10d9d6d1a3 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 c6856dae565..93f7699481c 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 9a8979aaa6c..54509178b1a 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 d3e48c619fa..af9a72058b2 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 6a2cf668682..d43e529585b 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 12907a64d21..b1249eee327 100644 --- a/pkgs/development/tools/documentation/haddock/2.12.0.nix +++ b/pkgs/development/tools/documentation/haddock/2.12.0.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, alex, Cabal, deepseq, filepath, ghcPaths, happy, xhtml }: cabal.mkDerivation (self: { @@ -15,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 89a488fdd31..749fee28571 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 6227f55888b..aa5be90fbae 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 8838b6def42..c8ef4299f56 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 new file mode 100644 index 00000000000..a16994b1f2e --- /dev/null +++ b/pkgs/development/tools/documentation/haddock/2.14.3.nix @@ -0,0 +1,23 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, Cabal, deepseq, filepath, ghcPaths, hspec, QuickCheck +, xhtml +}: + +cabal.mkDerivation (self: { + pname = "haddock"; + version = "2.14.3"; + sha256 = "031ikrsbkpmmwgdkgdr8s19dfx5y6n39rmyljjdfqygas17gcm6l"; + isLibrary = true; + isExecutable = true; + buildDepends = [ Cabal deepseq filepath ghcPaths xhtml ]; + testDepends = [ Cabal deepseq filepath hspec QuickCheck ]; + doCheck = false; + meta = { + homepage = "http://www.haskell.org/haddock/"; + 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; + }; +}) diff --git a/pkgs/development/tools/documentation/haddock/2.4.2.nix b/pkgs/development/tools/documentation/haddock/2.4.2.nix index 811ffd2855d..6493302218f 100644 --- a/pkgs/development/tools/documentation/haddock/2.4.2.nix +++ b/pkgs/development/tools/documentation/haddock/2.4.2.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, alex, Cabal, filepath, ghcPaths, happy }: cabal.mkDerivation (self: { @@ -14,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 fd31a96b291..53178aca0a1 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 fcae14d789e..2ed94ff072a 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 8a57dd851c2..80d7c623c1e 100644 --- a/pkgs/development/tools/documentation/haddock/2.9.4.nix +++ b/pkgs/development/tools/documentation/haddock/2.9.4.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, alex, Cabal, filepath, ghcPaths, happy, regexCompat, xhtml }: @@ -16,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 a37ef26f541..5e6438d0f5f 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/exercism/default.nix b/pkgs/development/tools/exercism/default.nix new file mode 100644 index 00000000000..6c909382522 --- /dev/null +++ b/pkgs/development/tools/exercism/default.nix @@ -0,0 +1,47 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "exercism-${version}"; + + version = "1.6.2"; + + src = + if stdenv.system == "x86_64-darwin" then + fetchurl { + url = "https://github.com/exercism/cli/releases/download/v${version}/exercism-darwin-amd64.tgz"; + sha256 = "1w9jw52nhb5mlcj6ampzwjscdr9rja5mdn5ga2r4z2qzsqzwkpm2"; + } + else if stdenv.system == "i686-darwin" then + fetchurl { + url = "https://github.com/exercism/cli/releases/download/v${version}/exercism-darwin-386.tgz"; + sha256 = "1g5cy53mrdzq047b8hlkjrkc4bp7yhipvhf4lnw0x2jr50z73bzd"; + } + else if stdenv.system == "i686-linux" then + fetchurl { + url = "https://github.com/exercism/cli/releases/download/v1.6.2/exercism-linux-386.tgz"; + sha256 = "1akdggla9kn7v4dwkyz63bp84dihcgyph546zskiyh9bz67l5liz"; + } + else if stdenv.system == "x86_64-linux" then + fetchurl { + url = "https://github.com/exercism/cli/releases/download/v1.6.2/exercism-linux-amd64.tgz"; + sha256 = "00kp0r9xy9bw9b2854csy35pk9sxvbivxmwiy97wl9gh0acva5ng"; + } + else throw "Platform: ${stdenv.system} not supported!"; + + buildPhase = ""; + + setSourceRoot = "sourceRoot=./"; + + installPhase = '' + mkdir -p $out/bin + cp -a exercism $out/bin + ''; + + meta = { + description = "A Go based command line tool for exercism.io"; + homepage = http://exercism.io; + license = stdenv.lib.licenses.mit; + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.wjlroe ]; + }; +} diff --git a/pkgs/development/tools/gocode/default.nix b/pkgs/development/tools/gocode/default.nix index 6057c288cf6..30e4b79ee38 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 8698dc27b40..74e967686f3 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 d39544342b3..00000000000 --- a/pkgs/development/tools/haskell/BNFC-meta/default.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ 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/DrIFT/default.nix b/pkgs/development/tools/haskell/DrIFT/default.nix index f0ae57b6287..6f0f8fb0c60 100644 --- a/pkgs/development/tools/haskell/DrIFT/default.nix +++ b/pkgs/development/tools/haskell/DrIFT/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, filepath, random }: cabal.mkDerivation (self: { diff --git a/pkgs/development/tools/haskell/HaRe/default.nix b/pkgs/development/tools/haskell/HaRe/default.nix deleted file mode 100644 index 0bcb19968ba..00000000000 --- a/pkgs/development/tools/haskell/HaRe/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ cabal, deepseq, Diff, dualTree, filepath, ghcMod, ghcPaths -, ghcSybUtils, 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.3"; - sha256 = "1zhwi568asgwvsbqrcglwa6jmbm85m3fi94mklb40ib149k4il1s"; - isLibrary = true; - isExecutable = true; - buildDepends = [ - dualTree filepath ghcMod ghcPaths ghcSybUtils hslogger monoidExtras - mtl parsec rosezipper semigroups StrafunskiStrategyLib syb syz time - transformers - ]; - testDepends = [ - deepseq Diff dualTree filepath ghcMod ghcPaths ghcSybUtils 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 00000000000..ce1c8a27c54 --- /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 00000000000..abfd386c82a --- /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 5bb298e739a..00000000000 --- a/pkgs/development/tools/haskell/alex-meta/default.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ 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 ee1fc152f80..c8dc299e7d9 100644 --- a/pkgs/development/tools/haskell/cabal-bounds/default.nix +++ b/pkgs/development/tools/haskell/cabal-bounds/default.nix @@ -1,11 +1,13 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, Cabal, cabalLenses, cmdargs, either, filepath, lens , strict, tasty, tastyGolden, transformers, unorderedContainers }: cabal.mkDerivation (self: { pname = "cabal-bounds"; - version = "0.6"; - sha256 = "0dl8rf8y365a20yz5kk1c9y860k5mkg1jp5dipvbf451h7a7h9w5"; + version = "0.8"; + sha256 = "0db5vy4qfjc2d27d4vk37gz9sdjgjlargndligmljf52s2g568r0"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -13,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-db/default.nix b/pkgs/development/tools/haskell/cabal-db/default.nix index 0d8b6ce5993..234c158cf90 100644 --- a/pkgs/development/tools/haskell/cabal-db/default.nix +++ b/pkgs/development/tools/haskell/cabal-db/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, ansiWlPprint, Cabal, filepath, mtl, optparseApplicative , tar, utf8String }: diff --git a/pkgs/development/tools/haskell/cabal-delete/default.nix b/pkgs/development/tools/haskell/cabal-delete/default.nix index 65a7b4d3211..7de6c0e6f1c 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 dee25727384..389318978da 100644 --- a/pkgs/development/tools/haskell/cabal-ghci/default.nix +++ b/pkgs/development/tools/haskell/cabal-ghci/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, Cabal, filepath }: cabal.mkDerivation (self: { @@ -12,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/cabal-meta/default.nix b/pkgs/development/tools/haskell/cabal-meta/default.nix index 7aec5022720..9dc0a4fb9af 100644 --- a/pkgs/development/tools/haskell/cabal-meta/default.nix +++ b/pkgs/development/tools/haskell/cabal-meta/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, hspec, shelly, systemFileio, systemFilepath, text }: cabal.mkDerivation (self: { diff --git a/pkgs/development/tools/haskell/cabal2ghci/default.nix b/pkgs/development/tools/haskell/cabal2ghci/default.nix index f8adaee4671..deb9e8d18d9 100644 --- a/pkgs/development/tools/haskell/cabal2ghci/default.nix +++ b/pkgs/development/tools/haskell/cabal2ghci/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, Cabal, cmdargs, stylishHaskell, systemFileio , systemFilepath, text, unorderedContainers, yaml }: diff --git a/pkgs/development/tools/haskell/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix index 2201040efe1..978ebde7e29 100644 --- a/pkgs/development/tools/haskell/cabal2nix/default.nix +++ b/pkgs/development/tools/haskell/cabal2nix/default.nix @@ -1,10 +1,12 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, Cabal, doctest, filepath, hackageDb, HTTP, mtl, regexPosix }: cabal.mkDerivation (self: { pname = "cabal2nix"; - version = "1.63"; - sha256 = "12frnhm86w5i6rmhghrdngdv658332bh9j5nr04ql439yysvkypj"; + version = "1.68"; + sha256 = "0w9ayvr3ljfxgi17yaayqvyxflbgf7b5245pc3m011lp3cfnj849"; isLibrary = false; isExecutable = true; buildDepends = [ Cabal filepath hackageDb HTTP mtl regexPosix ]; @@ -15,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/cake3/default.nix b/pkgs/development/tools/haskell/cake3/default.nix index f7b678ad9fb..5b948f510bf 100644 --- a/pkgs/development/tools/haskell/cake3/default.nix +++ b/pkgs/development/tools/haskell/cake3/default.nix @@ -1,18 +1,20 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, attoparsec, deepseq, filepath, haskellSrcMeta , languageJavascript, mimeTypes, monadloc, mtl, optparseApplicative -, syb, systemFilepath, text, textFormat +, parsec, syb, systemFilepath, text, textFormat }: cabal.mkDerivation (self: { pname = "cake3"; - version = "0.5.0.0"; - sha256 = "0hfnda0xp8saav85pgqmcb6ib699gm6gy5f087nlrx7058f4n7ji"; + version = "0.5.1.0"; + sha256 = "0kqx8xr0ynbn7fhfz11is7lbi32dfladsx32bcpspykqj1bjv954"; isLibrary = true; isExecutable = true; buildDepends = [ attoparsec deepseq filepath haskellSrcMeta languageJavascript - mimeTypes monadloc mtl optparseApplicative syb systemFilepath text - textFormat + mimeTypes monadloc mtl optparseApplicative parsec syb + systemFilepath text textFormat ]; meta = { homepage = "https://github.com/grwlf/cake3"; diff --git a/pkgs/development/tools/haskell/codex/default.nix b/pkgs/development/tools/haskell/codex/default.nix index 3bc9959c8d7..fac145b14c2 100644 --- a/pkgs/development/tools/haskell/codex/default.nix +++ b/pkgs/development/tools/haskell/codex/default.nix @@ -1,17 +1,20 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, Cabal, downloadCurl, either, filepath, hackageDb, MissingH , monadLoops, tar, text, transformers, yaml, zlib }: cabal.mkDerivation (self: { pname = "codex"; - version = "0.0.2.1"; - sha256 = "0cwn44dw3fks1qaymrjn3q99lq6baginh12y6wwkhz53cd6cv41z"; + version = "0.1.0.3"; + sha256 = "0sbkri6y9f4wws120kbb93sv1z0z75hjw9pw5r3wadmmd0lygsn9"; isLibrary = true; isExecutable = true; buildDepends = [ Cabal downloadCurl either filepath hackageDb MissingH monadLoops tar text transformers yaml zlib ]; + jailbreak = true; meta = { homepage = "http://github.com/aloiscochard/codex"; description = "A ctags file generator for cabal project dependencies"; diff --git a/pkgs/development/tools/haskell/ghc-events-analyze/default.nix b/pkgs/development/tools/haskell/ghc-events-analyze/default.nix index 7744a3071cc..af708e40afe 100644 --- a/pkgs/development/tools/haskell/ghc-events-analyze/default.nix +++ b/pkgs/development/tools/haskell/ghc-events-analyze/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, diagramsLib, diagramsSvg, filepath, ghcEvents, lens, mtl , optparseApplicative, parsec, SVGFonts, thLift, transformers }: diff --git a/pkgs/development/tools/haskell/ghc-gc-tune/default.nix b/pkgs/development/tools/haskell/ghc-gc-tune/default.nix index 193d12fdefa..e5517854c34 100644 --- a/pkgs/development/tools/haskell/ghc-gc-tune/default.nix +++ b/pkgs/development/tools/haskell/ghc-gc-tune/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, filepath }: cabal.mkDerivation (self: { diff --git a/pkgs/development/tools/haskell/happy-meta/default.nix b/pkgs/development/tools/haskell/happy-meta/default.nix index a3d885c6008..dc5c1f203ba 100644 --- a/pkgs/development/tools/haskell/happy-meta/default.nix +++ b/pkgs/development/tools/haskell/happy-meta/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, haskellSrcMeta, mtl }: cabal.mkDerivation (self: { @@ -9,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 c05368c3980..27e4876ea09 100644 --- a/pkgs/development/tools/haskell/haskdogs/default.nix +++ b/pkgs/development/tools/haskell/haskdogs/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, Cabal, filepath, HSH }: cabal.mkDerivation (self: { @@ -12,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/haskell-docs/default.nix b/pkgs/development/tools/haskell/haskell-docs/default.nix new file mode 100644 index 00000000000..e77a9ffe21e --- /dev/null +++ b/pkgs/development/tools/haskell/haskell-docs/default.nix @@ -0,0 +1,22 @@ +{ cabal, aeson, Cabal, filepath, ghcPaths, haddock, monadLoops +, text, unorderedContainers +}: + +cabal.mkDerivation (self: { + pname = "haskell-docs"; + version = "4.2.2"; + sha256 = "0w52kzwjzd5jl8v55rjy5550cy2fcyj9j5b7b33vbwjyh06gfrk1"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + aeson Cabal filepath ghcPaths haddock monadLoops text + unorderedContainers + ]; + doCheck = false; + meta = { + homepage = "http://github.com/chrisdone/haskell-docs"; + description = "A program to find and display the docs and type of a name"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/tools/haskell/hasktags/default.nix b/pkgs/development/tools/haskell/hasktags/default.nix index 8942a1b79c2..36b3739a140 100644 --- a/pkgs/development/tools/haskell/hasktags/default.nix +++ b/pkgs/development/tools/haskell/hasktags/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, filepath, json, utf8String }: cabal.mkDerivation (self: { diff --git a/pkgs/development/tools/haskell/hlint/default.nix b/pkgs/development/tools/haskell/hlint/default.nix index 69e880176a3..4fe5f01c3d1 100644 --- a/pkgs/development/tools/haskell/hlint/default.nix +++ b/pkgs/development/tools/haskell/hlint/default.nix @@ -1,23 +1,23 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, cmdargs, cpphs, filepath, haskellSrcExts, hscolour , transformers, uniplate }: cabal.mkDerivation (self: { pname = "hlint"; - version = "1.8.61"; - sha256 = "08y8ny6dv14gxnzzr5f1hvs22m7y62yffyq2pzvw2aja8fbj5d2z"; + 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/hobbes/default.nix b/pkgs/development/tools/haskell/hobbes/default.nix index 0c9b2d45ae1..a9b48f922c8 100644 --- a/pkgs/development/tools/haskell/hobbes/default.nix +++ b/pkgs/development/tools/haskell/hobbes/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, filemanip, filepath, fsnotify, systemFilepath, text }: cabal.mkDerivation (self: { diff --git a/pkgs/development/tools/haskell/hp2any-manager/default.nix b/pkgs/development/tools/haskell/hp2any-manager/default.nix index 2189d52f707..537550e989f 100644 --- a/pkgs/development/tools/haskell/hp2any-manager/default.nix +++ b/pkgs/development/tools/haskell/hp2any-manager/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, cairo, filepath, glade, glib, gtk, gtkglext, hp2anyCore , hp2anyGraph, OpenGL, time }: @@ -17,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 d8bc08b4b33..bb00ade3d4c 100644 --- a/pkgs/development/tools/haskell/hscolour/default.nix +++ b/pkgs/development/tools/haskell/hscolour/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { @@ -11,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/hscope/default.nix b/pkgs/development/tools/haskell/hscope/default.nix new file mode 100644 index 00000000000..57ae3d128f0 --- /dev/null +++ b/pkgs/development/tools/haskell/hscope/default.nix @@ -0,0 +1,21 @@ +{ cabal, cereal, cpphs, deepseq, haskellSrcExts, mtl, pureCdb +, uniplate, vector +}: + +cabal.mkDerivation (self: { + pname = "hscope"; + version = "0.4"; + sha256 = "1jb2d61c1as6li54zw33jsyvfap214pqxpkr2m6lkzaizh8396hg"; + isLibrary = false; + isExecutable = true; + buildDepends = [ + cereal cpphs deepseq haskellSrcExts mtl pureCdb uniplate vector + ]; + doCheck = false; + meta = { + homepage = "https://github.com/bosu/hscope"; + description = "cscope like browser for Haskell code"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/tools/haskell/hslogger/default.nix b/pkgs/development/tools/haskell/hslogger/default.nix index deb97d85fdc..43da5b21ca4 100644 --- a/pkgs/development/tools/haskell/hslogger/default.nix +++ b/pkgs/development/tools/haskell/hslogger/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl, network, time }: cabal.mkDerivation (self: { @@ -12,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/jailbreak-cabal/default.nix b/pkgs/development/tools/haskell/jailbreak-cabal/default.nix index ea61fd9b6ed..a6986c1cdc5 100644 --- a/pkgs/development/tools/haskell/jailbreak-cabal/default.nix +++ b/pkgs/development/tools/haskell/jailbreak-cabal/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, Cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/tools/haskell/keter/default.nix b/pkgs/development/tools/haskell/keter/default.nix index a065d7f01eb..34bc45e7471 100644 --- a/pkgs/development/tools/haskell/keter/default.nix +++ b/pkgs/development/tools/haskell/keter/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, aeson, async, attoparsec, blazeBuilder, caseInsensitive , conduit, conduitExtra, dataDefault, filepath, fsnotify, hspec , httpClient, httpConduit, httpReverseProxy, httpTypes, liftedBase @@ -9,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/packunused/default.nix b/pkgs/development/tools/haskell/packunused/default.nix index 8acee158683..c68d5dec8b3 100644 --- a/pkgs/development/tools/haskell/packunused/default.nix +++ b/pkgs/development/tools/haskell/packunused/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, Cabal, filepath, haskellSrcExts, optparseApplicative , split }: diff --git a/pkgs/development/tools/haskell/pointful/default.nix b/pkgs/development/tools/haskell/pointful/default.nix new file mode 100644 index 00000000000..6d0ed794721 --- /dev/null +++ b/pkgs/development/tools/haskell/pointful/default.nix @@ -0,0 +1,16 @@ +{ cabal, haskellSrc, mtl, syb }: + +cabal.mkDerivation (self: { + pname = "pointful"; + version = "1.0.2"; + sha256 = "00xlxgdajkbi5d6gv88wdpwm16xdryshszz5qklryi0p65mmp99p"; + isLibrary = false; + isExecutable = true; + buildDepends = [ haskellSrc mtl syb ]; + meta = { + homepage = "http://github.com/23Skidoo/pointful"; + description = "Pointful refactoring tool"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/tools/haskell/profiteur/default.nix b/pkgs/development/tools/haskell/profiteur/default.nix index 748b0093ba2..2cc73ca6672 100644 --- a/pkgs/development/tools/haskell/profiteur/default.nix +++ b/pkgs/development/tools/haskell/profiteur/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, aeson, attoparsec, filepath, text, unorderedContainers , vector }: diff --git a/pkgs/development/tools/haskell/rehoo/default.nix b/pkgs/development/tools/haskell/rehoo/default.nix index 016070f66c3..f7993feddf8 100644 --- a/pkgs/development/tools/haskell/rehoo/default.nix +++ b/pkgs/development/tools/haskell/rehoo/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, cmdargs, parallelIo, shelly, split, systemFilepath, text }: diff --git a/pkgs/development/tools/haskell/splot/default.nix b/pkgs/development/tools/haskell/splot/default.nix index 987715a9cf8..0e984778579 100644 --- a/pkgs/development/tools/haskell/splot/default.nix +++ b/pkgs/development/tools/haskell/splot/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, bytestringLexing, cairo, colour, HUnit, mtl, strptime , time, vcsRevision }: diff --git a/pkgs/development/tools/haskell/threadscope/default.nix b/pkgs/development/tools/haskell/threadscope/default.nix index 1158221ad1a..892faca8e8c 100644 --- a/pkgs/development/tools/haskell/threadscope/default.nix +++ b/pkgs/development/tools/haskell/threadscope/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, binary, cairo, deepseq, filepath, ghcEvents, glib, gtk , mtl, pango, time }: @@ -17,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/timeplot/default.nix b/pkgs/development/tools/haskell/timeplot/default.nix index 6ae2b40b081..4342b877a2e 100644 --- a/pkgs/development/tools/haskell/timeplot/default.nix +++ b/pkgs/development/tools/haskell/timeplot/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, bytestringLexing, cairo, Chart, ChartCairo, colour , dataDefault, lens, regexTdfa, strptime, time, transformers , vcsRevision diff --git a/pkgs/development/tools/haskell/una/default.nix b/pkgs/development/tools/haskell/una/default.nix index 172949818a6..9b80f6d478a 100644 --- a/pkgs/development/tools/haskell/una/default.nix +++ b/pkgs/development/tools/haskell/una/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, cmdargs, filepath, ioStorage }: cabal.mkDerivation (self: { diff --git a/pkgs/development/tools/haskell/uuagc/bootstrap.nix b/pkgs/development/tools/haskell/uuagc/bootstrap.nix index d24d22f350a..5e954c526c4 100644 --- a/pkgs/development/tools/haskell/uuagc/bootstrap.nix +++ b/pkgs/development/tools/haskell/uuagc/bootstrap.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, filepath, haskellSrcExts, mtl, uulib }: cabal.mkDerivation (self: { @@ -12,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 38be593a1f0..1a735a2471e 100644 --- a/pkgs/development/tools/haskell/uuagc/cabal.nix +++ b/pkgs/development/tools/haskell/uuagc/cabal.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, Cabal, filepath, mtl, uulib }: cabal.mkDerivation (self: { @@ -10,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 d61746ddbe1..230174dccbc 100644 --- a/pkgs/development/tools/haskell/uuagc/default.nix +++ b/pkgs/development/tools/haskell/uuagc/default.nix @@ -1,9 +1,11 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, filepath, haskellSrcExts, mtl, uuagcCabal, uulib }: cabal.mkDerivation (self: { pname = "uuagc"; - version = "0.9.50.2"; - sha256 = "1f587g4lf1gc5j9wd2fzxhjrny0a9axkpj6znxwsiylcpqw39dqs"; + version = "0.9.51"; + sha256 = "07nymg525x41y8pl94d0n990h1yz5km8v0fasiggqv94sd04j22w"; isLibrary = true; isExecutable = true; buildDepends = [ filepath haskellSrcExts mtl uuagcCabal uulib ]; @@ -12,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 cfcd8564b4c..c8bb94412ca 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 291bc29e1b7..4f8691c40ad 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/ShellCheck/default.nix b/pkgs/development/tools/misc/ShellCheck/default.nix index a3f67393eed..8beca12325b 100644 --- a/pkgs/development/tools/misc/ShellCheck/default.nix +++ b/pkgs/development/tools/misc/ShellCheck/default.nix @@ -1,12 +1,15 @@ -{ cabal, json, mtl, parsec, regexCompat }: +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, json, mtl, parsec, QuickCheck, regexCompat }: cabal.mkDerivation (self: { pname = "ShellCheck"; - version = "0.3.3"; - sha256 = "15lmc7cbi6s852qhd6h9asgz7ss1khfhq7wj4sgblr5mgppldg93"; + version = "0.3.4"; + sha256 = "07fw8c33p7h1kvg899dwnvqpxpywcidhbw9jhjd8xsma7kz471iw"; isLibrary = true; isExecutable = true; - buildDepends = [ json mtl parsec regexCompat ]; + buildDepends = [ json mtl parsec QuickCheck regexCompat ]; + testDepends = [ json mtl parsec QuickCheck regexCompat ]; meta = { homepage = "http://www.shellcheck.net/"; description = "Shell script analysis tool"; diff --git a/pkgs/development/tools/misc/arcanist/default.nix b/pkgs/development/tools/misc/arcanist/default.nix index 7e3a3a6d15c..c4f4caa3b65 100644 --- a/pkgs/development/tools/misc/arcanist/default.nix +++ b/pkgs/development/tools/misc/arcanist/default.nix @@ -3,18 +3,18 @@ let libphutil = fetchgit { url = "git://github.com/facebook/libphutil.git"; - rev = "0027e97cd6cbafcbdc626b4ac6cf315b9508a14f"; - sha256 = "4781a4e3e1cb72da24e97f89a9b879803be8e1cf6baa2a4517801dfb893eec26"; + rev = "49f08a756a54f12405d3704c0f978b71c7b13811"; + sha256 = "b32267fe19c6e9532887388815b8553519e2844bc5b839b5ad35efeab6b07fb8"; }; arcanist = fetchgit { url = "git://github.com/facebook/arcanist.git"; - rev = "680ec3670cd9d9195debf3e9b674b1b232156e61"; - sha256 = "a70cde586960676c0d69f4d98e6936633e0d79c37c6f6cc5b0213146a6b18c83"; + rev = "4c0edd296e3301fffdda33c447f6fcafe7d1de01"; + sha256 = "a9f162fb6b47bcf628130e0e8988ab650278b3a6606fa425e4707241ed22dd3e"; }; in stdenv.mkDerivation rec { name = "arcanist-${version}"; - version = "20140617"; + version = "20140812"; src = [ arcanist libphutil ]; buildInputs = [ php makeWrapper flex ]; diff --git a/pkgs/development/tools/misc/autobuild/default.nix b/pkgs/development/tools/misc/autobuild/default.nix index 88246e4bb6e..b35ec4357c4 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 f6793e3aeec..c3b44ca5686 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 08fcd95afb5..4dca332722b 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 0af9877c935..2cd80eb4bac 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 269d423f2fa..6a93cdc78fd 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 96a93e8d60b..d4369787f1b 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 d20ea2c2e91..0c6ed42825a 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 3caeee7287a..8d8fc5d464e 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 bf927db2793..2cc8e640631 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 d9be5802fa9..53bc8ed78c8 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 d313d271afb..09c9325d4ff 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 122c256657f..0bf5bbce692 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 cfdc35f1b34..9f1eca0fa13 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 72a6571f3cc..f3a724f3039 100644 --- a/pkgs/development/tools/misc/cpphs/default.nix +++ b/pkgs/development/tools/misc/cpphs/default.nix @@ -1,9 +1,11 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, polyparse }: cabal.mkDerivation (self: { pname = "cpphs"; - version = "1.18.4"; - sha256 = "0rmcq66wn7lsc5g1wk6bbsr7jiw8h6bz5cbvdywnv7vmwsx8gh51"; + version = "1.18.5"; + sha256 = "0bqfz0wkfnxvv711fgmhmh6rbwffgna1pfqbj7whb6crqji9w7g7"; isLibrary = true; isExecutable = true; buildDepends = [ polyparse ]; @@ -12,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 f9246df9e56..500129c7c9d 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/d-feet/default.nix b/pkgs/development/tools/misc/d-feet/default.nix index d4847afc786..852c1b74219 100644 --- a/pkgs/development/tools/misc/d-feet/default.nix +++ b/pkgs/development/tools/misc/d-feet/default.nix @@ -1,7 +1,6 @@ { stdenv, pkgconfig, fetchurl, itstool, intltool, libxml2, glib, gtk3 -, pango, gdk_pixbuf, atk, pep8, python, makeWrapper -, pygobject3, gobjectIntrospection, libwnck3 -, gnome_icon_theme }: +, pango, gdk_pixbuf, atk, pep8, python, makeWrapper, gnome3 +, pygobject3, gobjectIntrospection, libwnck3 }: let version = "${major}.8"; @@ -18,16 +17,19 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig libxml2 itstool intltool glib gtk3 pep8 python + gnome3.gnome_icon_theme gnome3.gnome_icon_theme_symbolic makeWrapper pygobject3 libwnck3 ]; - postInstall = + preFixup = '' wrapProgram $out/bin/d-feet \ --prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${pygobject3})" \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ --prefix LD_LIBRARY_PATH : "${gtk3}/lib:${atk}/lib:${libwnck3}/lib" \ - --prefix XDG_DATA_DIRS : "${gnome_icon_theme}/share:$out/share" + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$out/share" + + rm $out/share/icons/hicolor/icon-theme.cache ''; meta = { diff --git a/pkgs/development/tools/misc/ddd/default.nix b/pkgs/development/tools/misc/ddd/default.nix index 0a6895aff6b..91150255bda 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 9e400cc5c62..d3c2e7e6389 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 93dceb60f8d..2df687b8bc6 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 117480670c3..753c35b5d3a 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 b3a86a03d97..2b5ced78063 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 d0efe4e6249..9926dd6cd33 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 fdb5f72af83..d6abf8d10bd 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 75e8e2dfe4f..67688254a40 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 2f35f96e932..a434e54bba9 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 478d2162b33..e25998e5420 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 346c7fb6ad2..b1566684cf0 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 b447cf918cf..cd8ad0d64cd 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 2d60a06fb3e..23bd35c8739 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 caa277bfbf5..0940bcca191 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 0c82c2cd275..17714b7a9d4 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 0465b6d90a8..086f4b5fed3 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 00000000000..14bfe74821d --- /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 c7f790b7d50..07ef5ffc082 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 78cd15e04bd..5eee9ead5d6 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 4c3500c65a2..8b0a92c1244 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 541385d8bec..5758500d86f 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/luarocks/default.nix b/pkgs/development/tools/misc/luarocks/default.nix index c8579ef3831..4a38762a3ff 100644 --- a/pkgs/development/tools/misc/luarocks/default.nix +++ b/pkgs/development/tools/misc/luarocks/default.nix @@ -1,16 +1,16 @@ -{stdenv, fetchurl, lua, curl}: +{stdenv, fetchurl, lua, curl, makeWrapper, which}: let s = # Generated upstream information rec { baseName="luarocks"; - version="2.2"; + version="2.2.0"; name="${baseName}-${version}"; - hash="03i46ayimp087288f0bi6g30fi3aixp2bha2jmsbbhwmsxm1yshs"; - url="http://luarocks.org/releases/luarocks-2.2.0beta1.tar.gz"; - sha256="03i46ayimp087288f0bi6g30fi3aixp2bha2jmsbbhwmsxm1yshs"; + hash="1717p694455w1fdldb2ldlyklln8w3bqk1dsly8gpqh3n73lw6lv"; + url="http://luarocks.org/releases/luarocks-2.2.0-rc1.tar.gz"; + sha256="1717p694455w1fdldb2ldlyklln8w3bqk1dsly8gpqh3n73lw6lv"; }; buildInputs = [ - lua curl + lua curl makeWrapper which ]; in stdenv.mkDerivation { @@ -19,6 +19,29 @@ stdenv.mkDerivation { src = fetchurl { inherit (s) url sha256; }; + preConfigure = '' + lua -e "" || { + luajit -e "" && { + export LUA_SUFFIX=jit + configureFlags="$configureFlags --lua-suffix=$LUA_SUFFIX" + } + } + lua_inc="$(echo "${lua}/include"/*/)" + if test -n "$lua_inc"; then + configureFlags="$configureFlags --with-lua-include=$lua_inc" + fi + ''; + postInstall = '' + sed -e "1s@.*@#! ${lua}/bin/lua$LUA_SUFFIX@" -i "$out"/bin/* + for i in "$out"/bin/*; do + test -L "$i" || { + wrapProgram "$i" \ + --prefix LUA_PATH ";" "$(echo "$out"/share/lua/*/)?.lua" \ + --prefix LUA_PATH ";" "$(echo "$out"/share/lua/*/)?/init.lua" \ + + } + done + ''; meta = { inherit (s) version; description = ''A package manager for Lua''; diff --git a/pkgs/development/tools/misc/ninka/default.nix b/pkgs/development/tools/misc/ninka/default.nix index a5410204340..dc7eb5cabfd 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 8f77b3d7283..d38c862ecfb 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/openocd/default.nix b/pkgs/development/tools/misc/openocd/default.nix index 490ed6d1eef..7334fa8754f 100644 --- a/pkgs/development/tools/misc/openocd/default.nix +++ b/pkgs/development/tools/misc/openocd/default.nix @@ -30,25 +30,23 @@ stdenv.mkDerivation rec { postInstall = '' mkdir -p "$out/etc/udev/rules.d" - ln -s "$out/share/openocd/contrib/99-openocd.udev" "$out/etc/udev/rules.d/99-openocd.rules" + ln -s "$out/share/openocd/contrib/99-openocd.rules" "$out/etc/udev/rules.d/99-openocd.rules" ''; - meta = { + meta = with stdenv.lib; { + description = "Free and Open On-Chip Debugging, In-System Programming and Boundary-Scan Testing"; + longDescription = '' + OpenOCD provides on-chip programming and debugging support with a layered + architecture of JTAG interface and TAP support, debug target support + (e.g. ARM, MIPS), and flash chip drivers (e.g. CFI, NAND, etc.). Several + network interfaces are available for interactiving with OpenOCD: HTTP, + telnet, TCL, and GDB. The GDB server enables OpenOCD to function as a + "remote target" for source-level debugging of embedded systems using the + GNU GDB program. + ''; homepage = http://openocd.sourceforge.net/; - description = "OpenOCD, an on-chip debugger"; - - longDescription = - '' OpenOCD provides on-chip programming and debugging support with a - layered architecture of JTAG interface and TAP support, debug target - support (e.g. ARM, MIPS), and flash chip drivers (e.g. CFI, NAND, - etc.). Several network interfaces are available for interactiving - with OpenOCD: HTTP, telnet, TCL, and GDB. The GDB server enables - OpenOCD to function as a "remote target" for source-level debugging - of embedded systems using the GNU GDB program. - ''; - - license = "GPLv2+"; - maintainers = with stdenv.lib.maintainers; [ viric bjornfor ]; - platforms = with stdenv.lib.platforms; linux; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ viric bjornfor ]; + platforms = platforms.linux; }; } diff --git a/pkgs/development/tools/misc/pmccabe/default.nix b/pkgs/development/tools/misc/pmccabe/default.nix index 10cf371f13a..a71afd5d472 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/prelink/default.nix b/pkgs/development/tools/misc/prelink/default.nix new file mode 100644 index 00000000000..15abc1f48c1 --- /dev/null +++ b/pkgs/development/tools/misc/prelink/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, libelf }: + +let + version = "20130503"; +in +stdenv.mkDerivation rec { + name = "prelink-${version}"; + + buildInputs = [ libelf ]; + + src = fetchurl { + url = "http://people.redhat.com/jakub/prelink/prelink-${version}.tar.bz2"; + sha256 = "1w20f6ilqrz8ca51qhrn1n13h7q1r34k09g33d6l2vwvbrhcffb3"; + }; + + meta = { + homepage = http://people.redhat.com/jakub/prelink/; + license = "GPL"; + description = "ELF prelinking utility to speed up dynamic linking"; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/development/tools/misc/sloccount/default.nix b/pkgs/development/tools/misc/sloccount/default.nix index 9dc50abf3f7..455305be749 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 6b99a5755e4..6b06bf385b3 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 e3acf620c73..1b4cab361ce 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 7fa604e4af6..1f36a14fa97 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 9a41d296342..5131d381412 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/texinfo/5.2.nix b/pkgs/development/tools/misc/texinfo/5.2.nix index d5aeac2eef8..804e7a2527f 100644 --- a/pkgs/development/tools/misc/texinfo/5.2.nix +++ b/pkgs/development/tools/misc/texinfo/5.2.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { homepage = "http://www.gnu.org/software/texinfo/"; description = "GNU Texinfo, the GNU documentation system"; license = stdenv.lib.licenses.gpl3Plus; + platforms = stdenv.lib.platforms.all; longDescription = '' Texinfo is the official documentation format of the GNU project. diff --git a/pkgs/development/tools/misc/uisp/default.nix b/pkgs/development/tools/misc/uisp/default.nix index 732d3ab92c1..234ff82b50a 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 48a823c3c65..bba7ef7fad0 100644 --- a/pkgs/development/tools/misc/usb-modeswitch/default.nix +++ b/pkgs/development/tools/misc/usb-modeswitch/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, libusb }: +{ stdenv, fetchurl, pkgconfig, libusb1 }: -stdenv.mkDerivation { - name = "usb-modeswitch-1.1.2"; +stdenv.mkDerivation rec { + name = "usb-modeswitch-2.2.0"; src =fetchurl { - url = "http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-1.1.2.tar.bz2"; - sha256 = "1wzhd0r49nh5y43qrvsi3c7a29206zwd6v8xlpb8dqm40xg3j9nz"; + url = "http://www.draisberghof.de/usb_modeswitch/${name}.tar.bz2"; + sha256 = "0flaj3mq0xhzk72kkpclwglf77kcw5rkwvkaimn5zvbiw4yi0li7"; }; # make clean: we always build from source. It should be necessary on x86_64 only @@ -16,10 +16,10 @@ stdenv.mkDerivation { makeFlags="DESTDIR=$out PREFIX=$out" ''; - buildInputs = [ libusb ]; + 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 36047210a92..1d7e6b33042 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 be125801bd5..1f101776064 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/cppo/default.nix b/pkgs/development/tools/ocaml/cppo/default.nix new file mode 100644 index 00000000000..04475959f3d --- /dev/null +++ b/pkgs/development/tools/ocaml/cppo/default.nix @@ -0,0 +1,37 @@ +{stdenv, fetchurl, ocaml, findlib}: +let + pname = "cppo"; + version = "0.9.4"; + webpage = "http://mjambon.com/${pname}.html"; +in +stdenv.mkDerivation rec { + + name = "${pname}-${version}"; + + src = fetchurl { + url = "http://mjambon.com/releases/${pname}/${name}.tar.gz"; + sha256 = "1m7cbja7cf74l45plqnmjrjjz55v8x65rvx0ikk9mg1ak8lcmvxa"; + }; + + buildInputs = [ ocaml findlib ]; + + createFindlibDestdir = true; + + makeFlags = "PREFIX=$(out)"; + + preBuild = '' + mkdir $out/bin + ''; + + meta = { + description = "The C preprocessor for OCaml"; + longDescription = '' + Cppo is an equivalent of the C preprocessor targeted at the OCaml language and its variants. + ''; + homepage = "${webpage}"; + license = "bsd"; + }; +} + + + diff --git a/pkgs/development/tools/ocaml/deriving/default.nix b/pkgs/development/tools/ocaml/deriving/default.nix index d53f41b5da5..55bbf3748ea 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 18b03f5923b..4c0176de7e8 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 00000000000..c0882439f5c --- /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 5cea753dd9c..073de5137f8 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/packer/deps.nix b/pkgs/development/tools/packer/deps.nix index 4c8a376991a..ce56ecad8a2 100644 --- a/pkgs/development/tools/packer/deps.nix +++ b/pkgs/development/tools/packer/deps.nix @@ -15,7 +15,7 @@ let root = "code.google.com/p/go.crypto"; src = fetchhg { url = "http://code.google.com/p/go.crypto"; - tag = "199"; + rev = "199"; sha256 = "0ibrpc6kknzl6a2g2fkxn03mvrd635lcnvf4a9rk1dfrpjbpcixh"; }; } @@ -23,7 +23,7 @@ let root = "code.google.com/p/goauth2"; src = fetchhg { url = "http://code.google.com/p/goauth2"; - tag = "67"; + rev = "67"; sha256 = "053vajj8hd9869by7z9qfgzn84h6avpcjvyxcyw5jml8dsln4bah"; }; } @@ -31,7 +31,7 @@ let root = "code.google.com/p/google-api-go-client"; src = fetchhg { url = "http://code.google.com/p/google-api-go-client"; - tag = "111"; + rev = "111"; sha256 = "1ib8i1c2mb86lkrr5w7bgwb70gkqmp860wa3h1j8080gxdx3yy16"; }; } @@ -39,7 +39,7 @@ let root = "code.google.com/p/gosshold"; src = fetchhg { url = "http://code.google.com/p/gosshold"; - tag = "2"; + rev = "2"; sha256 = "1ljl8pcxxfz5rv89b2ajd31gxxzifl57kzpksvdhyjdxh98gkvg8"; }; } @@ -65,7 +65,7 @@ let root = "launchpad.net/tomb"; src = fetchbzr { url = "https://launchpad.net/tomb"; - revision = "17"; + rev = "17"; sha256 = "1cjw0sr9hald1darq6n8akfpkzcgrk3mcq59hga3ibf2lrg35ha0"; }; } @@ -82,7 +82,7 @@ let root = "code.google.com/p/goprotobuf"; src = fetchhg { url = "http://code.google.com/p/goprotobuf"; - tag = "246"; + rev = "246"; sha256 = "0k4wcv1dnkwcp0gdrajj6kr25f1lg4lgpbi0h5v9l9n7sdwzplf4"; }; } @@ -135,7 +135,7 @@ let root = "launchpad.net/gocheck"; src = fetchbzr { url = "https://launchpad.net/gocheck"; - revision = "87"; + rev = "87"; sha256 = "1y9fa2mv61if51gpik9isls48idsdz87zkm1p3my7swjdix7fcl0"; }; } @@ -278,7 +278,7 @@ let root = "launchpad.net/mgo"; src = fetchbzr { url = "https://launchpad.net/mgo"; - revision = "2"; + rev = "2"; sha256 = "0h1dxzyx5c4r4gfnmjxv92hlhjxrgx9p4g53p4fhmz6x2fdglb0x"; }; } diff --git a/pkgs/development/tools/parsing/Ebnf2ps/default.nix b/pkgs/development/tools/parsing/Ebnf2ps/default.nix index 82d998c2fcb..b3d4c125bb9 100644 --- a/pkgs/development/tools/parsing/Ebnf2ps/default.nix +++ b/pkgs/development/tools/parsing/Ebnf2ps/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, happy }: cabal.mkDerivation (self: { @@ -12,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 b38979256c6..83138e2e0ff 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 dc4a0261c4a..0bc13d16017 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 146f784463e..ccef30058c5 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 65faf84aa2c..d8e7e759e76 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 cdcaead8635..7dc18c63c91 100644 --- a/pkgs/development/tools/parsing/alex/3.0.1.nix +++ b/pkgs/development/tools/parsing/alex/3.0.1.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, perl, QuickCheck }: cabal.mkDerivation (self: { @@ -14,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 9011db12c7d..c18c5d89d1b 100644 --- a/pkgs/development/tools/parsing/alex/3.0.2.nix +++ b/pkgs/development/tools/parsing/alex/3.0.2.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, perl, QuickCheck }: cabal.mkDerivation (self: { @@ -14,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 c4458f7b829..af32598ee47 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 8174d851a31..172c90d96cc 100644 --- a/pkgs/development/tools/parsing/alex/3.1.3.nix +++ b/pkgs/development/tools/parsing/alex/3.1.3.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, happy, perl, QuickCheck }: cabal.mkDerivation (self: { @@ -13,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 5660d51f060..5bf5d7c2e8c 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 284223905f6..5947f85343c 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 d342d3381c8..187fd3628e8 100644 --- a/pkgs/development/tools/parsing/happy/1.18.10.nix +++ b/pkgs/development/tools/parsing/happy/1.18.10.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl, perl }: cabal.mkDerivation (self: { @@ -13,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 5ebac4303e7..c7e3f919568 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 7463a9f94a0..f66f2089351 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 3a3795c90db..7919908681e 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.8.nix b/pkgs/development/tools/parsing/happy/1.18.8.nix deleted file mode 100644 index 141205d1940..00000000000 --- a/pkgs/development/tools/parsing/happy/1.18.8.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ cabal, mtl, perl }: - -cabal.mkDerivation (self: { - pname = "happy"; - version = "1.18.8"; - sha256 = "1mqdawxszmdk71fbl8ljxz7jyhai00sflaw0gahp039n44mrspam"; - isLibrary = false; - isExecutable = true; - buildDepends = [ mtl ]; - buildTools = [ perl ]; - patches = [ ./adapt-crazy-perl-regex-for-cpp-4.8.0.patch ]; - meta = { - homepage = "http://www.haskell.org/happy/"; - 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/happy/1.18.9.nix b/pkgs/development/tools/parsing/happy/1.18.9.nix index b1f752ae35f..4ad9bf546b5 100644 --- a/pkgs/development/tools/parsing/happy/1.18.9.nix +++ b/pkgs/development/tools/parsing/happy/1.18.9.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl, perl }: cabal.mkDerivation (self: { @@ -13,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.2.nix b/pkgs/development/tools/parsing/happy/1.19.2.nix deleted file mode 100644 index 4173d6d6c11..00000000000 --- a/pkgs/development/tools/parsing/happy/1.19.2.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ cabal, mtl, perl }: - -cabal.mkDerivation (self: { - pname = "happy"; - version = "1.19.2"; - sha256 = "1m74dz83fs7gbcr040nhfx1xw3smjk24g5cp6a0wxvrmlh12yc66"; - isLibrary = false; - isExecutable = true; - buildDepends = [ mtl ]; - buildTools = [ perl ]; - patchPhase = "sed -i -e '/^import Data.Monoid/d' Setup.lhs"; - meta = { - homepage = "http://www.haskell.org/happy/"; - 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/happy/1.19.3.nix b/pkgs/development/tools/parsing/happy/1.19.3.nix deleted file mode 100644 index c43806cd2df..00000000000 --- a/pkgs/development/tools/parsing/happy/1.19.3.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ cabal, mtl, perl }: - -cabal.mkDerivation (self: { - pname = "happy"; - version = "1.19.3"; - sha256 = "1q3hipgcwvrf333wlyqmg4mgf24gwiagddlfyr9zgi4k42p2373x"; - isLibrary = false; - isExecutable = true; - buildDepends = [ mtl ]; - buildTools = [ perl ]; - preConfigure = self.stdenv.lib.optional (self.stdenv.lib.versionOlder "7.9" self.ghc.version) '' - sed -i -e 's|extensions: |extensions: FlexibleContexts, |' happy.cabal - sed -i -e 's|> import System.Exit|> import System.Exit ( exitWith, ExitCode(..) )|' src/Main.lhs - ''; - meta = { - homepage = "http://www.haskell.org/happy/"; - 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/happy/1.18.11.nix b/pkgs/development/tools/parsing/happy/1.19.4.nix similarity index 70% rename from pkgs/development/tools/parsing/happy/1.18.11.nix rename to pkgs/development/tools/parsing/happy/1.19.4.nix index 41f6d5c49a4..979d4bc52e3 100644 --- a/pkgs/development/tools/parsing/happy/1.18.11.nix +++ b/pkgs/development/tools/parsing/happy/1.19.4.nix @@ -1,9 +1,11 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl, perl }: cabal.mkDerivation (self: { pname = "happy"; - version = "1.18.11"; - sha256 = "1hssiihzl7xipmn5bz71q30wbq2sj92lh2f7z4jarckhldwcqfi9"; + version = "1.19.4"; + sha256 = "0vcklr1y6yjf8z4wip4al2zw4qlfxcahbdxwpf6c9y31dkv9kr3b"; isLibrary = false; isExecutable = true; buildDepends = [ mtl ]; @@ -13,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 2dec606254b..247daacf161 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 ee464423929..e301fe8431a 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 b6750f88937..457a5d1dcaa 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 884091c1636..66dda8f43ef 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 23f0dea4453..baa816589ca 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/quilt/default.nix b/pkgs/development/tools/quilt/default.nix new file mode 100644 index 00000000000..7ac4f6d39b7 --- /dev/null +++ b/pkgs/development/tools/quilt/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl, pkgs}: + +with pkgs; + +stdenv.mkDerivation rec { + name = "quilt-0.63"; + + src = fetchurl { + url = "mirror://savannah/quilt/${name}.tar.gz"; + sha256 = "2846788221aa8844c54f10239c7cbc5e88031859162bcc285449446c3cfffe52"; + }; + + buildInputs = [ makeWrapper perl bash diffutils patch findutils diffstat ]; + + postInstall = '' + wrapProgram $out/bin/quilt --prefix PATH : \ + ${perl}/bin:${bash}/bin:${diffstat}/bin:${diffutils}/bin:${findutils}/bin:${patch}/bin + ''; + + meta = { + homepage = http://savannah.nongnu.org/projects/quilt; + description = "Easily manage large numbers of patches"; + + longDescription = '' + Quilt allows you to easily manage large numbers of + patches by keeping track of the changes each patch + makes. Patches can be applied, un-applied, refreshed, + and more. + ''; + + license = "GPLv2+"; + }; +} diff --git a/pkgs/development/tools/selenium/chromedriver/default.nix b/pkgs/development/tools/selenium/chromedriver/default.nix index 90f7647aa05..30430671342 100644 --- a/pkgs/development/tools/selenium/chromedriver/default.nix +++ b/pkgs/development/tools/selenium/chromedriver/default.nix @@ -10,8 +10,8 @@ stdenv.mkDerivation rec { name = "chromedriver_linux64"; src = fetchurl { - url = "http://chromedriver.storage.googleapis.com/2.9/${name}.zip"; - sha256 = "1m5xl5pz445igvhj31hby97xbizlw05b8fc6w53zq7faw7mzm665"; + url = "http://chromedriver.storage.googleapis.com/2.10/${name}.zip"; + sha256 = "1949lhrv4hrmgapvypsgwzyr75w7vpy7nkkkwjkjxn61dkwmx4jw"; }; buildInputs = [ unzip makeWrapper ]; diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix index d0870e82b72..072b8eeff5c 100644 --- a/pkgs/development/tools/vagrant/default.nix +++ b/pkgs/development/tools/vagrant/default.nix @@ -4,18 +4,18 @@ assert stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux"; stdenv.mkDerivation rec { - name = "vagrant-1.4.3"; + name = "vagrant-1.6.3"; src = if stdenv.system == "x86_64-linux" then fetchurl { - url = https://dl.bintray.com/mitchellh/vagrant/vagrant_1.4.3_x86_64.deb; - sha256 = "dbd06de0f3560e2d046448d627bca0cbb0ee34b036ef605aa87ed20e6ad2684b"; + url = https://dl.bintray.com/mitchellh/vagrant/vagrant_1.6.3_x86_64.deb; + sha256 = "1gmdg92dw7afnvpji0wg4nzr7vhk8mrmcqk3hcrkwscby2f2bhqg"; } else fetchurl { - url = https://dl.bintray.com/mitchellh/vagrant/vagrant_1.4.3_i686.deb; - sha256 = "66e613fc1c9e31ecaf8e5f1d07d2ae4fca3d4fc2e43593543962664258d9af9b"; + url = https://dl.bintray.com/mitchellh/vagrant/vagrant_1.6.3_i686.deb; + sha256 = "1z26b6yghqgx8jbi2igf4kk4h6rzy869gli2vj7ayl7vbqdfvb60"; }; meta = with stdenv.lib; { @@ -81,4 +81,13 @@ stdenv.mkDerivation rec { cp -r opt "$out" cp -r usr/bin "$out" ''; + + preFixup = '' + # 'hide' the template file from shebang-patching + chmod -x $out/opt/vagrant/embedded/gems/gems/bundler-1.6.2/lib/bundler/templates/Executable + ''; + + postFixup = '' + chmod +x $out/opt/vagrant/embedded/gems/gems/bundler-1.6.2/lib/bundler/templates/Executable + ''; } diff --git a/pkgs/development/tools/watchman/default.nix b/pkgs/development/tools/watchman/default.nix new file mode 100644 index 00000000000..6db164131f7 --- /dev/null +++ b/pkgs/development/tools/watchman/default.nix @@ -0,0 +1,36 @@ +{ stdenv, lib, config, fetchFromGitHub, autoconf, automake, pcre +, confFile ? config.watchman.confFile or null +}: + +stdenv.mkDerivation rec { + name = "watchman-${version}"; + + version = "2.9.8"; + + src = fetchFromGitHub { + owner = "facebook"; + repo = "watchman"; + rev = "v${version}"; + sha256 = "196d71ci7ki4p6xx49w55cqd0bqrx19nf79na3a91mrfa6f22sp6"; + }; + + buildInputs = [ autoconf automake pcre ]; + + configureFlags = [ + "--enable-lenient" + "--enable-conffile=${if confFile == null then "no" else confFile}" + "--with-pcre=yes" + ]; + + preConfigure = '' + ./autogen.sh + ''; + + meta = with lib; { + description = "Watches files and takes action when they change"; + homepage = https://facebook.github.io/watchman; + maintainers = with maintainers; [ cstrahan ]; + platforms = with platforms; linux ++ darwin; + license = licenses.asl20; + }; +} diff --git a/pkgs/development/tools/yuicompressor/default.nix b/pkgs/development/tools/yuicompressor/default.nix index 5dcc30811e2..1a5485af541 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 544634626b0..84b0da1674c 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/development/web/nodejs/default.nix b/pkgs/development/web/nodejs/default.nix index 4b79a500b1f..c53cee4a20e 100644 --- a/pkgs/development/web/nodejs/default.nix +++ b/pkgs/development/web/nodejs/default.nix @@ -6,7 +6,7 @@ let ln -sv /usr/sbin/dtrace $out/bin ''; - version = "0.10.28"; + version = "0.10.29"; # !!! Should we also do shared libuv? deps = { @@ -30,7 +30,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.gz"; - sha256 = "043pc6sb3y2b0aiakmmjvzvafgki7wly0id0v1p8y80g3r2cdpdb"; + sha256 = "0pdib215ldypc149ad03wlfj0i8fwdfydd4q2hd7ry35yw0rsds7"; }; configureFlags = concatMap sharedConfigureFlags (builtins.attrNames deps); diff --git a/pkgs/development/web/remarkjs/default.nix b/pkgs/development/web/remarkjs/default.nix index bf96175b8cd..08987617334 100644 --- a/pkgs/development/web/remarkjs/default.nix +++ b/pkgs/development/web/remarkjs/default.nix @@ -14,11 +14,11 @@ let in stdenv.mkDerivation rec { name = "remarkjs-${version}"; - version = "0.6.4"; + version = "0.6.5"; src = fetchurl { url = "https://github.com/gnab/remark/archive/v${version}.tar.gz"; - sha256 = "0sdhpn91b05qdqfqbfrhkfx8rkqrgm9pqg4bgjhxf9prfjhvmlrn"; + sha256 = "1bh3hmhq99qqd3qg747xwjqkyppc9vf3b5nhi56556rwc02cn17p"; }; buildInputs = with nodePackages; [ diff --git a/pkgs/games/0ad/data.nix b/pkgs/games/0ad/data.nix new file mode 100644 index 00000000000..6f3c85183da --- /dev/null +++ b/pkgs/games/0ad/data.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, version, releaseType }: + +stdenv.mkDerivation rec { + name = "0ad-data-${version}"; + + src = fetchurl { + url = "http://releases.wildfiregames.com/0ad-${version}-${releaseType}-unix-data.tar.xz"; + sha256 = "0f16d41e81d7349fb16490f3abbfd38bcb3f2b89648355b2b281c5045ddafadc"; + }; + + patchPhase = '' + rm binaries/data/tools/fontbuilder/fonts/*.txt + ''; + + installPhase = '' + mkdir -p $out/share/0ad + cp -r binaries/data/* $out/share/0ad/ + ''; +} diff --git a/pkgs/games/0ad/default.nix b/pkgs/games/0ad/default.nix new file mode 100644 index 00000000000..78b76f1ac36 --- /dev/null +++ b/pkgs/games/0ad/default.nix @@ -0,0 +1,121 @@ +{ 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 +, gloox, nvidia-texture-tools +, withEditor ? true, wxGTK ? null +}: + +assert withEditor -> wxGTK != null; + +let + version = "0.0.16"; + + releaseType = "alpha"; + + zeroadData = callPackage ./data.nix { inherit version releaseType; }; + + archForPremake = + 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 { + name = "0ad-${version}"; + + src = fetchurl { + url = "http://releases.wildfiregames.com/0ad-${version}-${releaseType}-unix-build.tar.xz"; + sha256 = "cb965ef7e292bc3a2f1f598a9695e16ff4d786398f384a1ec7d5f9bfe2626de5"; + }; + + buildInputs = [ + zeroadData python27 pkgconfig spidermonkey_24 boost icu + libxml2 libpng libjpeg zlib curl libogg libvorbis enet + miniupnpc openalSoft mesa xproto libX11 libXcursor nspr + SDL gloox nvidia-texture-tools + ] ++ stdenv.lib.optional withEditor wxGTK; + + NIX_CFLAGS_COMPILE = [ + "-I${xproto}/include/X11" + "-I${libX11}/include/X11" + "-I${libXcursor}/include/X11" + ]; + + configurePhase = '' + # Delete shipped libraries which we don't need. + rm -rf libraries/source/{enet,miniupnpc,nvtt,spidermonkey} + + # Build shipped premake. + make -C build/premake/premake4/build/gmake.unix + + # Run premake. + pushd build/premake + ./premake4/bin/release/premake4 \ + --file="premake4.lua" \ + --outpath="../workspaces/gcc/" \ + --platform=${archForPremake} \ + --os=linux \ + --with-system-nvtt \ + --with-system-enet \ + --with-system-miniupnpc \ + --with-system-mozjs24 \ + ${ if withEditor then "--atlas" else "" } \ + --collada \ + --bindir="$out"/bin \ + --libdir="$out"/lib/0ad \ + --datadir="$out"/share/0ad \ + gmake + popd + ''; + + buildPhase = '' + # Build bundled fcollada. + make -C libraries/source/fcollada/src + + # Build 0ad. + make -C build/workspaces/gcc verbose=1 + ''; + + installPhase = '' + # Copy executables. + mkdir -p "$out"/bin + cp binaries/system/pyrogenesis "$out"/bin/ + ((${ toString withEditor })) && cp binaries/system/ActorEditor "$out"/bin/ + + # Copy l10n data. + mkdir -p "$out"/share/0ad + cp -r binaries/data/l10n "$out"/share/0ad/ + + # Copy libraries. + mkdir -p "$out"/lib/0ad + cp binaries/system/libCollada.so "$out"/lib/0ad/ + ((${ toString withEditor })) && cp binaries/system/libAtlasUI.so "$out"/lib/0ad/ + + # Create links to data files. + ln -s -t "$out"/share/0ad "${zeroadData}"/share/0ad/* + + # Copy icon. + mkdir -p "$out"/share/icons + cp build/resources/0ad.png "$out"/share/icons/ + + # Copy/fix desktop item. + mkdir -p "$out"/share/applications + while read LINE; do + if [[ $LINE = "Exec=0ad" ]]; then + echo "Exec=$out/bin/pyrogenesis" + elif [[ $LINE = "Icon=0ad" ]]; then + echo "Icon=$out/share/icons/0ad.png" + else + echo "$LINE" + fi + done "$out"/share/applications/0ad.desktop + ''; + + meta = { + description = "A free, open-source game of ancient warfare"; + 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 00000000000..532ef092f09 --- /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 93277eb15a2..eb4edf2b36a 100644 --- a/pkgs/games/LambdaHack/default.nix +++ b/pkgs/games/LambdaHack/default.nix @@ -1,26 +1,33 @@ -{ cabal, assertFailure, binary, deepseq, enummapsetTh, filepath -, gtk, hashable, hsini, keys, miniutter, mtl, prettyShow, random -, stm, text, transformers, unorderedContainers, vector -, vectorBinaryInstances, zlib +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ 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 cf3f6e1563b..ae04c57aa26 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 77891f43881..1925c73b2e4 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 bf2fb1e89c2..93297171bcb 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 00000000000..a2897a795e8 --- /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/atanks/default.nix b/pkgs/games/atanks/default.nix index 7669c443321..587fefe600b 100644 --- a/pkgs/games/atanks/default.nix +++ b/pkgs/games/atanks/default.nix @@ -11,17 +11,17 @@ let (builtins.attrNames (builtins.removeAttrs x helperArgNames)); sourceInfo = rec { baseName="atanks"; - version="4.9"; + version = "6.0"; name="${baseName}-${version}"; project="${baseName}"; url="mirror://sourceforge/project/${project}/${baseName}/${name}/${name}.tar.gz"; - hash="015nwh8jk4k24ci6ilihii8idkyf6g266r4vl50csvykc82slrvd"; + sha256 = "0460zwzd800vcgsmd1dzb7j5wcy3lf9hsdw152f6p2mbd0nq5pds"; }; in rec { src = a.fetchurl { url = sourceInfo.url; - sha256 = sourceInfo.hash; + sha256 = sourceInfo.sha256; }; inherit (sourceInfo) name version; @@ -35,6 +35,7 @@ rec { fixInstall = a.fullDepEntry ('' sed -e "s@INSTALL=.*bin/install @INSTALL=install @" -i Makefile sed -e "s@-g 0 -m ... -o 0@@" -i Makefile + sed -e 's@/usr/@'"$out"'@g' -i Makefile '') ["doUnpack" "minInit"]; meta = { @@ -45,11 +46,8 @@ rec { ]; platforms = with a.lib.platforms; linux; - }; - passthru = { - updateInfo = { - downloadPage = "http://sourceforge.net/projects/atanks/files/atanks/"; - }; + downloadPage = "http://sourceforge.net/projects/atanks/files/atanks/"; + inherit version; }; }) x diff --git a/pkgs/games/atanks/default.upstream b/pkgs/games/atanks/default.upstream new file mode 100644 index 00000000000..f52364b3427 --- /dev/null +++ b/pkgs/games/atanks/default.upstream @@ -0,0 +1,5 @@ +url http://sourceforge.net/projects/atanks/files/atanks/ +version_link 'atanks[-][0-9.]+/$' +version_link '[.]tar[.][a-z0-9]+/download' +SF_redirect +do_overwrite () { do_overwrite_just_version; } diff --git a/pkgs/games/ball-and-paddle/default.nix b/pkgs/games/ball-and-paddle/default.nix index c923f089405..4a7eb9376da 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 3bb17b3e02f..b4e61b6d1d1 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 252f881c375..57cd67fbb7b 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 0f4904bfed9..d7e2cf4894d 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/blobby/default.nix b/pkgs/games/blobby/default.nix index faf7366f249..801b7ea7277 100644 --- a/pkgs/games/blobby/default.nix +++ b/pkgs/games/blobby/default.nix @@ -1,17 +1,18 @@ -{stdenv, fetchurl, SDL, SDL_image, mesa, cmake, physfs, boost, zip, zlib}: +{stdenv, fetchurl, SDL2, SDL2_image, mesa, cmake, physfs, boost, zip, zlib +, pkgconfig}: stdenv.mkDerivation rec { - version = "1.0-rc3"; + version = "1.0"; name = "blobby-volley-${version}"; src = fetchurl { - url = "mirror://sourceforge/project/blobby/Blobby%20Volley%202%20%28Linux%29/1.0RC3/blobby2-linux-1.0rc3.tar.gz"; - sha256 = "10f50b2ygw8cb9mp33wpdwv9p6lc10qlwc1xd44bbcby1d9v5ga5"; + url = "http://softlayer-ams.dl.sourceforge.net/project/blobby/Blobby%20Volley%202%20%28Linux%29/1.0/blobby2-linux-1.0.tar.gz"; + sha256 = "1qpmbdlyhfbrdsq4vkb6cb3b8mh27fpizb71q4a21ala56g08yms"; }; - buildInputs = [SDL SDL_image mesa cmake physfs boost zip zlib]; + buildInputs = [SDL2 SDL2_image mesa cmake physfs boost zip zlib pkgconfig]; - preConfigure = '' - sed -re '1i#include ' -i src/CrossCorrelation.h + preConfigure='' + sed -e '1i#include ' -i src/NetworkMessage.cpp ''; meta = { @@ -19,5 +20,8 @@ stdenv.mkDerivation rec { license = with stdenv.lib.licenses; bsd3; platforms = with stdenv.lib.platforms; linux; maintainers = with stdenv.lib.maintainers; [raskin]; + homepage = "http://blobby.sourceforge.net/"; + downloadPage = "http://sourceforge.net/projects/blobby/files/Blobby%20Volley%202%20%28Linux%29/"; + inherit version; }; } diff --git a/pkgs/games/blobby/default.upstream b/pkgs/games/blobby/default.upstream new file mode 100644 index 00000000000..e9ab417f5d2 --- /dev/null +++ b/pkgs/games/blobby/default.upstream @@ -0,0 +1,8 @@ +url http://sourceforge.net/projects/blobby/files/Blobby%20Volley%202%20%28Linux%29/ +SF_version_dir +version_link '[.]tar[.][^.]+/download$' +SF_redirect +do_overwrite(){ + do_overwrite_just_version + set_var_value url $CURRENT_URL +} diff --git a/pkgs/games/btanks/default.nix b/pkgs/games/btanks/default.nix index 085c7c4082c..46f5b3d0183 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 ce3a0c8fa3c..0798173a64d 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 99bf2d41fd6..538efebf833 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 54deae2ecfe..0e2796df22d 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 00000000000..6cb48d85f85 --- /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 00000000000..6c73407b65c --- /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 00000000000..3849e79234b --- /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 00000000000..869d703b125 --- /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 00000000000..e08859c989b --- /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 00000000000..2508ad0a54c --- /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 00000000000..e6c7101de72 --- /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 00000000000..fbcb925d608 --- /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 944b67041c2..b50aa704048 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 6036d7fabd5..f0d885c1f88 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 00000000000..6a0d30ea89f --- /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 c7e594f89bd..8cc1b9933cd 100644 --- a/pkgs/games/dwarf-therapist/default.nix +++ b/pkgs/games/dwarf-therapist/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchhg { url = "https://code.google.com/r/splintermind-attributes/"; - tag = rev; + inherit rev; sha256 = "0a9m967q6p2q3plrl6qysg1xrdmg65jzil6awjh2wr3g10x2x15z"; }; @@ -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 1f879393868..96ff52446ec 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 49c67cd2f05..00000000000 --- 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 00000000000..70de34184a2 --- /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 e784cc109f5..a79b6f8d5d8 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 = [SDL SDL_mixer zlib libpng unzip]; - - NIX_CFLAGS_COMPILE = "-I${SDL_mixer}/include/SDL"; + buildInputs = [ pkgconfig SDL libogg libvorbis zlib unzip ]; + + 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 a30ff7e2f87..94451ef8930 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 d83358cd69d..d26dfc2401c 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 89790bfacec..2fa9cd35f76 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 b58654f1f42..d925c8810bf 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 72270cc312a..90a4a069c2a 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 21c4195b28b..3f1d52c5fc0 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 52c3830c22a..757d3cf7681 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 ee792ef1e4d..7bdcc7afecd 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 6ab6b8d79d7..8668de26a19 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 cbc445f6216..c7b40db5caf 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 70288e549a4..8fe7591cde0 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 292aa2ff190..cd7478d99c8 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 b4ec7eb311f..9f79dd70c6a 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 f2ac737486c..f19596789ce 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 c2a7ee90a1f..580b27ab21d 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 1ebb4b69b6e..2bec14a11c1 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 4062405407b..88cfbe98851 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 f62570dbd08..49dbb7ba82b 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 0c7e46ae074..2dc4dece75f 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 638d494131f..35057a5de75 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/openspades/default.nix b/pkgs/games/openspades/default.nix new file mode 100644 index 00000000000..7f11fc82903 --- /dev/null +++ b/pkgs/games/openspades/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl, cmake, curl, glew, makeWrapper, mesa, SDL2, + SDL2_image, unzip, wget, zlib, withOpenal ? true, openal ? null }: + +assert withOpenal -> openal != null; + +stdenv.mkDerivation rec { + name = "openspades-${version}"; + version = "0.0.12"; + + src = fetchurl { + url = "https://github.com/yvt/openspades/archive/v${version}.tar.gz"; + sha256 = "1aa848cck8qrp67ha9vrkzm3k24r2aiv1v4dxla6pi22rw98yxzm"; + }; + + nativeBuildInputs = + with stdenv.lib; + [ cmake curl glew makeWrapper mesa SDL2 SDL2_image unzip wget zlib ] + ++ optional withOpenal openal; + + cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" "-DOPENSPADES_INSTALL_BINARY=bin" ]; + + # OpenAL is loaded dynamicly + postInstall = + if withOpenal then '' + wrapProgram "$out/bin/openspades" \ + --prefix LD_LIBRARY_PATH : "${openal}/lib" + '' + else null; + + meta = with stdenv.lib; { + description = "OpenSpades is a compatible client of Ace of Spades 0.75"; + homepage = "https://github.com/yvt/openspades/"; + license = licenses.gpl3; + platforms = platforms.linux; + }; +} diff --git a/pkgs/games/openttd/default.nix b/pkgs/games/openttd/default.nix index 09a7761326a..1b6b7f26a41 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 260b146217c..cfae6a4bb3e 100644 --- a/pkgs/games/opentyrian/default.nix +++ b/pkgs/games/opentyrian/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchhg { url = "https://opentyrian.googlecode.com/hg/"; - tag = "13ef8ce47362"; + rev = "13ef8ce47362"; md5 = "95c8f9e7ff3d4207f1c692c7cec6c9b0"; }; @@ -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 04d2f2ecb8b..19aff03daca 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 77e8ab3b92e..af9900cede5 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 009d07d4456..7c58b4ca1e8 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 d5f9ca6ee23..98cf0dbeed8 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 8969b613ceb..06e43fd273f 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 809bcc930d2..26c7e0a3667 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 934213279fa..fbf47653af9 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 3848f22ed20..cf55bcd597e 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 ca72ac506d7..42fa98e372d 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 196561d1e37..403fc88cb4a 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 7a78235bdff..e6105eab95b 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 51149d4f260..c1273e9a20f 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 31fd25a5150..7b258deef8a 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 cd2698665f6..29d3b4e4557 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 72a894b63af..c8e0d3f097f 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 18a911d563b..e5d9e5e9751 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 e06aec68b1a..83b2c62870e 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 979fcd1a48c..44d07cf3ffd 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 698653784a7..a2355ba9d1e 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 47316177115..e6370d6e7c6 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 bef4b63b0cc..5c175be8af0 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 2a25c290b2d..a5ae8ec8b6d 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 2fef444328c..0d909e1c43c 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 4b1cab6531c..c90972db66e 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 dbae3e16724..47fcd2dc4cf 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 07055c41558..9d233d38338 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 af112c37af4..bba7823f663 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 6f0fb48f0a5..f87633e299b 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 9b9dd6c1f43..8a92490b6e0 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 13e7e487c8f..c39ffb1de05 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 d9fcb47bcc3..0b344873734 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 8f0830be186..b5e4adfa0b9 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 8a08eadc6a4..e99ad03212c 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 fcec3bf2675..a4d2ca621a1 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 942bf2c2184..015c61e461e 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 181a89b6667..526ea25a04e 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 c23b60c29b3..60854f8550b 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 e3c9dbc84e5..5462f772703 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 150b45dd727..5c9138ed2e2 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 786ed21decc..c7ef5735750 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 d67121fe430..571e14347b4 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 d67121fe430..571e14347b4 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 5e474d6f747..00000000000 --- 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 975de0f5270..ced8e1344da 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 00000000000..760821e3654 --- /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 9f93c9957d6..0fa5a08d2dc 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 8323ca082b7..b869143ff1c 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 0e19d6ab893..cd5c5a8b479 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 3dd3d4bc731..8103ff9c43f 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 a85d0fb389e..0366b9dd22c 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 c3bced29200..bca81a4b6b3 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 ef8cb7d0a92..945d6556837 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 fa2c36cf2c2..bb3520e300a 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 142c75aeb0f..275b93e01b8 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 826924b8e8e..4f9f071094b 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 540735ab810..d424452ecd5 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/maven/default.nix b/pkgs/misc/maven/default.nix index 8367e6ea72a..b7cb84fbb3c 100644 --- a/pkgs/misc/maven/default.nix +++ b/pkgs/misc/maven/default.nix @@ -3,13 +3,13 @@ assert jdk != null; stdenv.mkDerivation { - name = "apache-maven-3.0.4"; + name = "apache-maven-3.1.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://apache/maven/binaries/apache-maven-3.0.4-bin.tar.gz; - sha256 = "0bxa7x8ifm8590nxifhsh3sxzm6aicbczyx21vibg3606ih8fnnk"; + url = mirror://apache/maven/binaries/apache-maven-3.1.1-bin.tar.gz; + sha256 = "06ymc5y8bp5crcz74z2m9pf58aid5q11v2klnjmxb4ar8mkd8zh7"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/misc/my-env/loadenv.sh b/pkgs/misc/my-env/loadenv.sh index 6752d1c03b5..1aab4ac0208 100644 --- a/pkgs/misc/my-env/loadenv.sh +++ b/pkgs/misc/my-env/loadenv.sh @@ -6,9 +6,14 @@ source @myenvpath@ PATH="$PATH:$OLDPATH" export PS1="\n@name@:[\u@\h:\w]\$ " +export NIX_MYENV_NAME="@name@" export buildInputs export NIX_STRIP_DEBUG=0 export TZ="$OLDTZ" -@shell@ +if test $# -gt 0; then + exec "$@" +else + exec @shell@ +fi diff --git a/pkgs/misc/screensavers/xscreensaver/default.nix b/pkgs/misc/screensavers/xscreensaver/default.nix index 3bf2e316dea..04791749810 100644 --- a/pkgs/misc/screensavers/xscreensaver/default.nix +++ b/pkgs/misc/screensavers/xscreensaver/default.nix @@ -1,21 +1,21 @@ { stdenv, fetchurl, pkgconfig, bc, perl, pam, libXext, libXScrnSaver, libX11 , libXrandr, libXmu, libXxf86vm, libXrender, libXxf86misc, libjpeg, mesa, gtk -, libxml2, libglade +, libxml2, libglade, intltool }: stdenv.mkDerivation rec { - version = "5.26"; + version = "5.29"; name = "xscreensaver-${version}"; src = fetchurl { url = "http://www.jwz.org/xscreensaver/${name}.tar.gz"; - sha256 = "0m8v9zxl1pyqndqqinhsvpc8s3byg397vy6i4ihkjiqrw5kdr91c"; + sha256 = "157jy1mh84h6p4mpzsgcadv6c660c212rmjgdpgpidcn0rsza664"; }; buildInputs = [ pkgconfig bc perl libjpeg mesa gtk libxml2 libglade pam libXext libXScrnSaver libX11 libXrandr libXmu libXxf86vm libXrender - libXxf86misc + libXxf86misc intltool ]; patchPhase = @@ -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 976e4dc687f..87014a9c714 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 @@ -88,8 +88,8 @@ let vimHelpTags = '' inherit buildPhase; installPhase = '' - target=$out/vim-plugins/$path - ensureDir $out/vim-plugins + target=$out/share/vim-plugins/${path} + mkdir -p $out/share/vim-plugins cp -r . $target ${vimHelpTags} vimHelpTags $target @@ -111,24 +111,26 @@ 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 = ":"; buildPhase = '' - target=$out/vim-plugins/YouCompleteMe + target=$out/share/vim-plugins/YouCompleteMe 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 @@ -311,7 +313,7 @@ in rec preBuild = '' sed -ie '1 i\ - set runtimepath+=${vimproc}/vim-plugins/vimproc\ + set runtimepath+=${vimproc}/share/vim-plugins/vimproc\ ' autoload/vimshell.vim ''; @@ -346,4 +348,69 @@ in rec path = "vimproc"; }; + + colorsamplerpack = simpleDerivation rec { + version = "2012.10.28"; + name = "vim-colorsamplerpack-${version}"; + + setSourceRoot = "sourceRoot=."; + src = fetchurl { + url = "http://www.vim.org/scripts/download_script.php?src_id=18915"; + name = "colorsamplerpack.zip"; + sha256 = "1wsrb3vpqn9fncnalfpvc8r92wk1mcskm4shb3s2h9x5dyihf2rd"; + }; + + buildInputs = [ unzip ]; + + path = "colorsamplerpack"; + }; + + yankring = simpleDerivation rec { + version = "18.0"; + name = "vim-yankring-${version}"; + + setSourceRoot = "sourceRoot=."; + src = fetchurl { + url = "http://www.vim.org/scripts/download_script.php?src_id=20842"; + name = "yankring_180.zip"; + sha256 = "0bsq4pxagy12jqxzs7gcf25k5ahwif13ayb9k8clyhm0jjdkf0la"; + }; + + buildInputs = [ unzip ]; + + path = "yankring"; + }; + + ctrlp = simpleDerivation rec { + version = "1.79"; + name = "vim-ctrlp-${version}"; + + setSourceRoot = "sourceRoot=."; + src = fetchurl { + url = "http://www.vim.org/scripts/download_script.php?src_id=19448"; + name = "ctrlp_180.zip"; + sha256 = "1x9im8g0g27mxc3c9k7v0jg5bb1dmnbjygmqif5bizab5g69n2mi"; + }; + + buildInputs = [ unzip ]; + + path = "ctrlp"; + }; + + alternate = stdenv.mkDerivation rec { + version = "2.18"; + name = "vim-a-${version}"; + + src = fetchurl { + url = "http://www.vim.org/scripts/download_script.php?src_id=7218"; + name = "a.vim"; + sha256 = "1q22vfkv60sshp9yj3mmfc8azavgzz7rpmaf72iznzq4wccy6gac"; + }; + unpackPhase = ":"; + installPhase = '' + 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 73585d59c0b..2a48590154e 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 27b1cdd3e8a..94bfec0a18e 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 0c9059a3008..4bdb6e132fb 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 3eaa6336ec2..4b16652ba05 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 54c6429955b..6d2d20687bc 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 9ee188b0c8c..34426b45d55 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 4897c0c0af8..6f3d719d816 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 946e4c0c109..5e2f428130c 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-call/default.nix b/pkgs/os-specific/linux/acpi-call/default.nix index 2882c804c50..63c55341b14 100644 --- a/pkgs/os-specific/linux/acpi-call/default.nix +++ b/pkgs/os-specific/linux/acpi-call/default.nix @@ -5,8 +5,8 @@ stdenv.mkDerivation { src = fetchgit { url = "git://github.com/mkottman/acpi_call.git"; - rev = "46dd97e115ddc7219c88b0818c4d5b235162fe6e"; - sha256 = "1bi0azd7xxhrivjhnmxllj2sfj12br56mxii20mnqdpqwyz0rhni"; + rev = "ac67445bc75ec4fcf46ceb195fb84d74ad350d51"; + sha256 = "0jl19irz9x9pxab2qp4z8c3jijv2m30zhmnzi6ygbrisqqlg4c75"; }; preBuild = '' diff --git a/pkgs/os-specific/linux/acpi/default.nix b/pkgs/os-specific/linux/acpi/default.nix index a3400ee0823..0fc79922515 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 c7f96206eab..6fc3bbe7c08 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 06af0c9228a..70c8f36105c 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 8ad77c6b99e..f46e54448b9 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 3af7c5d4deb..00000000000 --- 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 904c56665d1..0d02daebe1d 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 84d67b96d17..0bb96c343df 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 6167696f336..7ab4a919786 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 12173e20f3f..8048419a93b 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/atop/default.nix b/pkgs/os-specific/linux/atop/default.nix index 39ba5dc3973..fd4b6df9552 100644 --- a/pkgs/os-specific/linux/atop/default.nix +++ b/pkgs/os-specific/linux/atop/default.nix @@ -35,5 +35,8 @@ stdenv.mkDerivation rec { longDescription = '' Atop is an ASCII full-screen performance monitor that is capable of reporting the activity of all processes (even if processes have finished during the interval), daily logging of system and process activity for long-term analysis, highlighting overloaded system resources by using colors, etc. At regular intervals, it shows system-level activity related to the CPU, memory, swap, disks and network layers, and for every active process it shows the CPU utilization, memory growth, disk utilization, priority, username, state, and exit code. ''; + inherit version; + downloadPage = http://atoptool.nl/downloadatop.php; + updateWalker = true; }; } diff --git a/pkgs/os-specific/linux/audit/default.nix b/pkgs/os-specific/linux/audit/default.nix index a7ff782d69e..9de84e228c4 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 81ead8d33d0..5c5c2f026af 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 88c7ffd93ee..6e57e7651c4 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 0b7b6a0cafb..fee955bcca2 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 e12c80e0886..6c7d6d5330e 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 0cc4e3741c2..43673c899b4 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 f9f5c185bbd..2a87611a680 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 7226acf0e57..98fedb2d3f4 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 a718b3656c4..2b80114fe47 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/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix index 3e95daba29e..92b97ffb592 100644 --- a/pkgs/os-specific/linux/conky/default.nix +++ b/pkgs/os-specific/linux/conky/default.nix @@ -37,6 +37,8 @@ stdenv.mkDerivation rec { sha256 = "0vxvjmi3cdvnp994sv5zcdyncfn0mlxa71p2wm9zpyrmy58bbwds"; }; + NIX_LDFLAGS = "-lgcc_s"; + buildInputs = [ pkgconfig glib ncurses ] ++ optional luaSupport lua5 ++ optional wireless wirelesstools diff --git a/pkgs/os-specific/linux/criu/default.nix b/pkgs/os-specific/linux/criu/default.nix index 8cb39927353..433cc2c81d7 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 022ea648fea..4ea9295ef4f 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 0f4a1b6985e..d3a0b827ed1 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 57fc9390f61..b60232a9b75 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 138b4ff468f..c95532f1360 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 419207882f8..80ad483b367 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 09a449bbede..a627a8cbcc9 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 a9278f0c7ce..0e38d94e1ed 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 d0e77a3bb70..6c5dd330f65 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 e701c91019d..325a44f97aa 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 33ac05aef47..1fe1f48f4ef 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 63a056712ac..00f27a43e65 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 new file mode 100644 index 00000000000..fccf7b6b1cd --- /dev/null +++ b/pkgs/os-specific/linux/iomelt/default.nix @@ -0,0 +1,25 @@ +{ stdenv, lib, fetchurl }: + +let version = "0.7"; +in stdenv.mkDerivation { + name = "iomelt-${version}"; + src = fetchurl { + url = "http://iomelt.com/s/iomelt-${version}.tar.gz"; + sha256 = "1jhrdm5b7f1bcbrdwcc4yzg26790jxl4d2ndqiwd9brl2g5537im"; + }; + + preBuild = '' + mkdir -p $out/bin + mkdir -p $out/share/man/man1 + + substituteInPlace Makefile \ + --replace /usr $out + ''; + + meta = with lib; { + description = "A simple yet effective way to benchmark disk IO in Linux systems"; + homepage = http://www.iomelt.com; + maintainers = with maintainers; [ cstrahan ]; + platforms = platforms.linux ++ platforms.darwin; + }; +} diff --git a/pkgs/os-specific/linux/jujuutils/default.nix b/pkgs/os-specific/linux/jujuutils/default.nix index 7c688943ea8..a47b59e9e56 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/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index b089e962397..a4b2c221b81 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -78,17 +78,17 @@ with stdenv.lib; CLS_U32_MARK y # Wireless networking. - CFG80211_WEXT y # Without it, ipw2200 drivers don't build - IPW2100_MONITOR y # support promiscuous mode - IPW2200_MONITOR y # support promiscuous mode - HOSTAP_FIRMWARE y # Support downloading firmware images with Host AP driver - HOSTAP_FIRMWARE_NVRAM y - ATH9K_PCI y # Detect Atheros AR9xxx cards on PCI(e) bus - ATH9K_AHB y # Ditto, AHB bus + CFG80211_WEXT? y # Without it, ipw2200 drivers don't build + IPW2100_MONITOR? y # support promiscuous mode + IPW2200_MONITOR? y # support promiscuous mode + HOSTAP_FIRMWARE? y # Support downloading firmware images with Host AP driver + HOSTAP_FIRMWARE_NVRAM? y + ATH9K_PCI? y # Detect Atheros AR9xxx cards on PCI(e) bus + ATH9K_AHB? y # Ditto, AHB bus ${optionalString (versionAtLeast version "3.2") '' - B43_PHY_HT y + B43_PHY_HT? y ''} - BCMA_HOST_PCI y + BCMA_HOST_PCI? y # Enable various FB devices. FB y @@ -110,7 +110,7 @@ with stdenv.lib; # Enable KMS for devices whose X.org driver supports it. DRM_I915_KMS y ${optionalString (versionOlder version "3.9") '' - DRM_RADEON_KMS y + DRM_RADEON_KMS? y ''} # Hybrid graphics support VGA_SWITCHEROO y @@ -145,18 +145,25 @@ with stdenv.lib; EXT2_FS_XIP y # Ext2 execute in place support EXT4_FS_POSIX_ACL y EXT4_FS_SECURITY y - REISERFS_FS_XATTR y - REISERFS_FS_POSIX_ACL y - REISERFS_FS_SECURITY y - JFS_POSIX_ACL y - JFS_SECURITY y - XFS_QUOTA y - XFS_POSIX_ACL y - XFS_RT y # XFS Realtime subvolume support - OCFS2_DEBUG_MASKLOG n + REISERFS_FS_XATTR? y + REISERFS_FS_POSIX_ACL? y + REISERFS_FS_SECURITY? y + JFS_POSIX_ACL? y + JFS_SECURITY? y + XFS_QUOTA? y + XFS_POSIX_ACL? y + XFS_RT? y # XFS Realtime subvolume support + OCFS2_DEBUG_MASKLOG? n BTRFS_FS_POSIX_ACL y UBIFS_FS_XATTR? y - UBIFS_FS_ADVANCED_COMPR y + UBIFS_FS_ADVANCED_COMPR? y + ${optionalString (versionAtLeast version "3.6") '' + NFS_SWAP y + ''} + ${optionalString (versionAtLeast version "3.11") '' + NFS_V4_1 y # NFSv4.1 client support + NFS_V4_2 y + ''} NFSD_V2_ACL y NFSD_V3 y NFSD_V3_ACL y @@ -192,14 +199,14 @@ with stdenv.lib; ${optionalString (versionAtLeast version "3.3" && versionOlder version "3.13") '' AUDIT_LOGINUID_IMMUTABLE y ''} - B43_PCMCIA y + B43_PCMCIA? y BLK_DEV_CMD640_ENHANCED y # CMD640 enhanced support BLK_DEV_IDEACPI y # IDE ACPI support BLK_DEV_INTEGRITY y BSD_PROCESS_ACCT_V3 y - BT_HCIUART_BCSP y - BT_HCIUART_H4 y # UART (H4) protocol support - BT_HCIUART_LL y + BT_HCIUART_BCSP? y + BT_HCIUART_H4? y # UART (H4) protocol support + BT_HCIUART_LL? y BT_RFCOMM_TTY? y # RFCOMM TTY support CRASH_DUMP? n ${optionalString (versionOlder version "3.1") '' @@ -213,10 +220,10 @@ with stdenv.lib; FUSION y # Fusion MPT device support IDE_GD_ATAPI y # ATAPI floppy support IRDA_ULTRA y # Ultra (connectionless) protocol - JOYSTICK_IFORCE_232 y # I-Force Serial joysticks and wheels - JOYSTICK_IFORCE_USB y # I-Force USB joysticks and wheels - JOYSTICK_XPAD_FF y # X-Box gamepad rumble support - JOYSTICK_XPAD_LEDS y # LED Support for Xbox360 controller 'BigX' LED + JOYSTICK_IFORCE_232? y # I-Force Serial joysticks and wheels + JOYSTICK_IFORCE_USB? y # I-Force USB joysticks and wheels + JOYSTICK_XPAD_FF? y # X-Box gamepad rumble support + JOYSTICK_XPAD_LEDS? y # LED Support for Xbox360 controller 'BigX' LED LDM_PARTITION y # Windows Logical Disk Manager (Dynamic Disk) support LEDS_TRIGGER_IDE_DISK y # LED IDE Disk Trigger LOGIRUMBLEPAD2_FF y # Logitech Rumblepad 2 force feedback @@ -315,8 +322,8 @@ with stdenv.lib; ''} # Enable the 9P cache to speed up NixOS VM tests. - 9P_FSCACHE y - 9P_FS_POSIX_ACL y + 9P_FSCACHE? y + 9P_FS_POSIX_ACL? y # Enable transparent support for huge pages. TRANSPARENT_HUGEPAGE? y diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index 8ba677d6dfe..08611e44856 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -95,6 +95,8 @@ let ''; installPhase = "mv .config $out"; + + enableParallelBuilding = true; }; kernel = buildLinux { diff --git a/pkgs/os-specific/linux/kernel/linux-3.10.nix b/pkgs/os-specific/linux/kernel/linux-3.10.nix index a08ad5ea53d..26938b71578 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.44"; + version = "3.10.51"; extraMeta.branch = "3.10"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "06brvvxkgx4im4jzyl08y8hifgqb8ndxlhdkczwlqx3cgs6769c0"; + 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 33bed4213b4..291e43a98e5 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.22"; + version = "3.12.26"; extraMeta.branch = "3.12"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0c9rw11iihjimqb6mdmwn4q67ds7jg4qibj5ijj5pdmkdqzj7g54"; + 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 4fbca05501d..2d53d06f755 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.8"; + version = "3.14.15"; extraMeta.branch = "3.14"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0l2k7c8i3vzcs8mwdy3h1yzlqli6vr56wbn6bxp4nyvxkwxlhs5d"; + 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 531b85b789a..b59baf9f669 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.1"; + version = "3.15.8"; extraMeta.branch = "3.15"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0bmzag945bb9v20xc2f6i4syx456prai3qj5cxhm8cb76wby4s8b"; + sha256 = "012d793mg2lkxfs6rxqkl22p6899l620ssbsii1szfjhnynh1qjd"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/linux-3.13.nix b/pkgs/os-specific/linux/kernel/linux-3.16.nix similarity index 72% rename from pkgs/os-specific/linux/kernel/linux-3.13.nix rename to pkgs/os-specific/linux/kernel/linux-3.16.nix index d84cec235ce..3a7e51a080e 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.13.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.16.nix @@ -1,12 +1,13 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.13.11"; - extraMeta.branch = "3.13"; + 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 = "1nhi5m0nnrb7v2gqpa3181p32k5hm5jwkf647vs80r14750gxlpw"; + sha256 = "183p3pz2rfprbp5i4kwk90kjn90v40banwx8759jxnd74xwss4s8"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/linux-3.4.nix b/pkgs/os-specific/linux/kernel/linux-3.4.nix index 8308340f3f5..6a232d6450b 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.94"; + version = "3.4.101"; extraMeta.branch = "3.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0kc1s38zij39z8mrk9x29wizhbn4i7c7gyd796s1ib4826p3k48k"; + sha256 = "1zmb3dzqjiwb9ckj0gqqvlpdvqrjw17z9sddzxyawfrag6xv24a7"; }; kernelPatches = args.kernelPatches ++ diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index bafac2fc58d..f44f3d32792 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -2,13 +2,13 @@ import ./generic.nix (args // rec { # Reason to add: RTL8192EE - version = "3.16-rc2"; - modDirVersion = "3.16.0-rc2"; + version = "3.16-rc3"; + modDirVersion = "3.16.0-rc3"; extraMeta.branch = "3.16"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/testing/linux-${version}.tar.xz"; - sha256 = "12bxf62qqsf471ak6rj4gbvvjsybsamgwj9p8bphr98dp14js27w"; + sha256 = "17jgv1hnx2im68f8721x11yfg8mpas7lsxg0j00qxv2fc6km2glm"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 30e2a37cb91..6d9baed7f2d 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/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index eb4d7a100be..cfe006fbe4b 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -60,17 +60,17 @@ rec { }; grsecurity_stable = grsecPatch - { kversion = "3.14.8"; - revision = "201406222110"; + { kversion = "3.14.10"; + revision = "201407012152"; branch = "stable"; - sha256 = "0jar710hqpjkp4g3ldrbcpgc170v9qp8ykajq5fi8mxx4j54gjwa"; + sha256 = "1119044lzkr9wpr1gpl1g0bz67c2xpdd9bkddllij7ja24jv8sx1"; }; grsecurity_unstable = grsecPatch - { kversion = "3.15.1"; - revision = "201406222112"; + { kversion = "3.15.3"; + revision = "201407012153"; branch = "test"; - sha256 = "04sbpmzgfgn7hjiln9baynpgr7k67lm0b5wn2z8i2jsjigfmv0r4"; + sha256 = "0bccayakprc77530crxfr9v2hbs6hlcf290pj1ywlh1p861ljgbm"; }; grsec_fix_path = diff --git a/pkgs/os-specific/linux/kernel/perf.nix b/pkgs/os-specific/linux/kernel/perf.nix index a7337760b79..8b8f7e1e78d 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 }: -assert withGtk -> 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 8673981ecd5..d1eb38df6da 100644 --- a/pkgs/os-specific/linux/keyutils/default.nix +++ b/pkgs/os-specific/linux/keyutils/default.nix @@ -1,29 +1,28 @@ { stdenv, fetchurl, gnumake, file }: stdenv.mkDerivation rec { - name = "keyutils-1.5.8"; - + name = "keyutils-1.5.9"; + src = fetchurl { url = "http://people.redhat.com/dhowells/keyutils/${name}.tar.bz2"; - sha256 = "17419fr7mph8wlhxpqb1bdrghz0db15bmjdgxg1anfgbf9ra6zbc"; + sha256 = "1bl3w03ygxhc0hz69klfdlwqn33jvzxl1zfl2jmnb2v85iawb8jd"; }; buildInputs = [ file ]; patchPhase = '' - sed -i -e "s,/usr/bin/make,${gnumake}/bin/make," \ - -e "s, /etc, $out/etc," \ - -e "s, /bin, $out/bin," \ - -e "s, /sbin, $out/sbin," \ - -e "s, /lib, $out/lib," \ - -e "s, /lib64, $out/lib64," \ - -e "s,/usr,$out," \ + sed -i -e "s, /usr/bin/make, ${gnumake}/bin/make," \ + -e "s, /usr, ," \ + -e "s,\$(LNS) \$(LIBDIR)/\$(SONAME),\$(LNS) \$(SONAME)," \ Makefile ''; - - meta = { + + 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"; - license = "GPLv2+"; + license = licenses.gpl2Plus; + platforms = platforms.linux; }; } diff --git a/pkgs/os-specific/linux/latencytop/default.nix b/pkgs/os-specific/linux/latencytop/default.nix index eb776dcb86d..163ac189050 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 202831309f0..c5e94ed81e9 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 bbeb2851ea3..3670f06e543 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 f878d284496..bb5dde9a61e 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 700455d5f8b..93cab433c9c 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 5c36bb09781..463722d2c96 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 49babc6ca57..da4d9677217 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 9386b50969f..76f4661ecfc 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 a863ee8a4d0..c77faa6a9e7 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 42bacd41be0..bb85acf4dcb 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 aa39091070e..8aa538f2068 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 @@ -104,7 +102,6 @@ installPhase() { # Test a bit. $out/bin/nvidia-settings --version - $out/bin/nvidia-smi --help > /dev/null fi } diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 0c0f6ecc71e..7176cb2b941 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -12,7 +12,7 @@ assert (!libsOnly) -> kernel != null; let - versionNumber = "331.79"; + versionNumber = "340.24"; in @@ -25,12 +25,12 @@ stdenv.mkDerivation { if stdenv.system == "i686-linux" then fetchurl { url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run"; - sha256 = "0dl6gj1k6rz7bzyflfgi8y4489bxv03gfcni7zjzy440xjm3sk9l"; + sha256 = "0c5iix6rihbx7mbfhznz0jjbc3kkccwyfxi56p76fvrbyan9dvam"; } else if stdenv.system == "x86_64-linux" then fetchurl { url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run"; - sha256 = "14mwxz12kd5znnrmwia4qk35sd7xpr6cgpxs1xzjwmjgvz6gc71v"; + sha256 = "04yy26722fjf9k7y6r909g68nqnsglfd9xs1dk1nain1021p70iq"; } else throw "nvidia-x11 does not support platform ${stdenv.system}"; diff --git a/pkgs/os-specific/linux/nvidia-x11/legacy173.nix b/pkgs/os-specific/linux/nvidia-x11/legacy173.nix index d85c0c1a389..0014a5d2ee5 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 0665ff83ea7..9acaee797f0 100644 --- a/pkgs/os-specific/linux/nvidia-x11/legacy304.nix +++ b/pkgs/os-specific/linux/nvidia-x11/legacy304.nix @@ -8,7 +8,7 @@ with stdenv.lib; -let versionNumber = "304.117"; in +let versionNumber = "304.123"; in stdenv.mkDerivation { name = "nvidia-x11-${versionNumber}${optionalString (!libsOnly) "-${kernel.version}"}"; @@ -19,12 +19,12 @@ stdenv.mkDerivation { if stdenv.system == "i686-linux" then fetchurl { url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run"; - sha256 = "16a09iinz3zgrvj8cywyxsy7i8kpan28b814xhfbl88zadyj0hy3"; + sha256 = "09gljwxw14img7hw0xdxd24cvpvlymdxssmxa9gikdrw2w04j0ym"; } else if stdenv.system == "x86_64-linux" then fetchurl { url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run"; - sha256 = "0kzcxfwnp4aw4q53vl57ypc9yck4yj1hfhy8v9wfjlxvi6w6cp0v"; + sha256 = "0vxw4gp78g06h5inwkhl989p9mq0m8rqipz9a67rdc4s364r243s"; } else throw "nvidia-x11 does not support platform ${stdenv.system}"; @@ -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 e28593d0252..88ab08e6c3d 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 fe5f938b75b..27d0510a657 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 b5672728b53..f5fdc567087 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 b53c61c754a..787b72fde48 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 e3b6168be9b..4fb7fc8cb0b 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 f966180a8b6..c1049d78f42 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 13a6e87319e..7fa32ce4c94 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 89e9ff66342..b4b4569def4 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 702ebc5d828..630fe04e226 100644 --- a/pkgs/os-specific/linux/powertop/default.nix +++ b/pkgs/os-specific/linux/powertop/default.nix @@ -1,18 +1,18 @@ { stdenv, fetchurl, gettext, libnl, ncurses, pciutils, pkgconfig, zlib }: stdenv.mkDerivation rec { - name = "powertop-2.5"; + name = "powertop-2.6.1"; src = fetchurl { - url = "https://01.org/powertop/sites/default/files/downloads/${name}.tar.gz"; - sha256 = "02rwqbpasdayl201v0549gbp2f82rd0hqiv3i111r7npanjhhb4b"; + url = "https://01.org/sites/default/files/downloads/powertop/${name}.tar.gz"; + sha256 = "1r103crmkdk617qrxqjzy2mlhaacbpg5q795546zwcxlbdnxwk03"; }; buildInputs = [ gettext libnl ncurses pciutils pkgconfig zlib ]; 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 65f1a5cf6c6..9dd78f5885a 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 4dbe7e54247..92e00ffad3f 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 6cf6e4adfa0..054ed471eaa 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 c95d27005ef..cc1363156dd 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 10a1d88f234..d5e2ed3ff94 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 7071d982500..485de5741d7 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/syslinux/default.nix b/pkgs/os-specific/linux/syslinux/default.nix index 95f482a8230..734613c44ac 100644 --- a/pkgs/os-specific/linux/syslinux/default.nix +++ b/pkgs/os-specific/linux/syslinux/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, nasm, perl, libuuid }: stdenv.mkDerivation rec { - name = "syslinux-4.07"; + name = "syslinux-6.02"; src = fetchurl { - url = "mirror://kernel/linux/utils/boot/syslinux/4.xx/${name}.tar.bz2"; - sha256 = "0nm0lx45h4c5nxnsr538bvryzvqvj1p1p4vqxzd8nlcv47ja8h0j"; + url = "mirror://kernel/linux/utils/boot/syslinux/${name}.tar.xz"; + sha256 = "0y2ld2s64s6vc5pf8rj36w71rq2cfax3c1iafp0w1qbjpxy1p8xg"; }; patches = [ ./perl-deps.patch ]; @@ -14,15 +14,27 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - preBuild = - '' - substituteInPlace gpxe/src/Makefile.housekeeping --replace /bin/echo $(type -P echo) - substituteInPlace gpxe/src/Makefile --replace /usr/bin/perl $(type -P perl) - makeFlagsArray=(BINDIR=$out/bin SBINDIR=$out/sbin LIBDIR=$out/lib INCDIR=$out/include DATADIR=$out/share MANDIR=$out/share/man PERL=perl) - ''; + preBuild = '' + substituteInPlace Makefile --replace /bin/pwd $(type -P pwd) + substituteInPlace gpxe/src/Makefile.housekeeping --replace /bin/echo $(type -P echo) + substituteInPlace gpxe/src/Makefile --replace /usr/bin/perl $(type -P perl) + ''; - meta = { + makeFlags = [ + "BINDIR=$(out)/bin" + "SBINDIR=$(out)/sbin" + "LIBDIR=$(out)/lib" + "INCDIR=$(out)/include" + "DATADIR=$(out)/share" + "MANDIR=$(out)/share/man" + "PERL=perl" + "bios" + ]; + + meta = with stdenv.lib; { homepage = http://www.syslinux.org/; description = "A lightweight bootloader"; + license = licenses.gpl2; + platforms = platforms.linux; }; } diff --git a/pkgs/os-specific/linux/sysstat/default.nix b/pkgs/os-specific/linux/sysstat/default.nix index 2b4888f89cd..ec504bd9235 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 8ea3599ff19..fe79c23dc44 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 e7cce315e8c..a0df3d526f5 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 e9fa2b4adb1..605d3d7adc5 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 d2b3632d69a..9bf8692d1ce 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 cdc384f3ee8..1dd7c0c089f 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/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix index 5ee25ea976a..937f65089e9 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/default.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix @@ -5,13 +5,13 @@ assert readlineSupport -> readline != null; stdenv.mkDerivation rec { - version = "2.1"; + version = "2.2"; name = "wpa_supplicant-${version}"; src = fetchurl { url = "http://hostap.epitest.fi/releases/${name}.tar.gz"; - sha256 = "0xxjw7lslvql1ykfbwmbhdrnjsjljf59fbwf837418s97dz2wqwi"; + sha256 = "1vf8jc4yyksbxf86narvsli3vxfbm8nbnim2mdp66nd6d3yvin70"; }; extraConfig = @@ -38,13 +38,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; - patches = [ ./libnl.patch - # remove this patch after wpa_supplicant 2.1 - (fetchurl { - url ="http://projects.archlinux.org/svntogit/packages.git/plain/trunk/0001-Revert-OpenSSL-Do-not-accept-SSL-Client-certificate-.patch?h=packages/wpa_supplicant"; - sha256 = "0x1wl2nbl7v9kv80qvysfjhhg5a7lmgygv1y723flps6y8ngm19w"; - }) - ]; + patches = [ ./libnl.patch ]; postInstall = '' mkdir -p $out/share/man/man5 $out/share/man/man8 diff --git a/pkgs/os-specific/linux/x86info/default.nix b/pkgs/os-specific/linux/x86info/default.nix index 6cd2a431a60..eaec63f98bf 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 f84088a9302..a4fd00e4911 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 ae24e32a157..7abf6d7c828 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 e59fd695f78..d4786037b5a 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/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index aec95832d16..0242c586cea 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -27,14 +27,14 @@ stdenv.mkDerivation { substituteInPlace ./cmd/ztest/ztest.c --replace "/usr/sbin/zdb" "$out/sbin/zdb" ''; - configureFlags = '' - --disable-systemd - --with-linux=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source - --with-linux-obj=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build - --with-spl=${spl}/libexec/spl - --with-dracutdir=$$out/lib/dracut - --with-udevdir=$$out/lib/udev - ''; + configureFlags = [ + "--disable-systemd" + "--with-linux=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source" + "--with-linux-obj=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + "--with-spl=${spl}/libexec/spl" + "--with-dracutdir=$(out)/lib/dracut" + "--with-udevdir=$(out)/lib/udev" + ]; enableParallelBuilding = true; diff --git a/pkgs/os-specific/linux/zfs/git.nix b/pkgs/os-specific/linux/zfs/git.nix index ebbbc994d02..e88cb9d6130 100644 --- a/pkgs/os-specific/linux/zfs/git.nix +++ b/pkgs/os-specific/linux/zfs/git.nix @@ -28,14 +28,14 @@ stdenv.mkDerivation { substituteInPlace ./cmd/ztest/ztest.c --replace "/usr/sbin/zdb" "$out/sbin/zdb" ''; - configureFlags = '' - --disable-systemd - --with-linux=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source - --with-linux-obj=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build - --with-spl=${spl_git}/libexec/spl - --with-dracutdir=$$out/lib/dracut - --with-udevdir=$$out/lib/udev - ''; + configureFlags = [ + "--disable-systemd" + "--with-linux=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source" + "--with-linux-obj=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + "--with-spl=${spl_git}/libexec/spl" + "--with-dracutdir=$(out)/lib/dracut" + "--with-udevdir=$(out)/lib/udev" + ]; enableParallelBuilding = true; diff --git a/pkgs/os-specific/windows/jom/default.nix b/pkgs/os-specific/windows/jom/default.nix index 8f8477d1864..4b118a5a7cd 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 cd417eb9ad0..dde4f5d7371 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 da0ec89cbc6..09b091b323c 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 717ea6306cf..264e6ff749a 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 5e86d60871d..585228af2b4 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 9e9c05d2f91..370bfd39137 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 063868ddc6e..b6680e8b21c 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 db8db908d1e..921d8e907f1 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 3d0324775f8..0fec6a5fe0e 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 1fb21f2b8ab..8b4903c8602 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 627c1ff0cf9..e3a53c85052 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 7deab6584f8..e164c21ec78 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 2431c86ddb6..07dff1cf585 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/couchdb/default.nix b/pkgs/servers/http/couchdb/default.nix index 36d932c1ace..35d4ebbf89f 100644 --- a/pkgs/servers/http/couchdb/default.nix +++ b/pkgs/servers/http/couchdb/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "couchdb-${version}"; - version = "1.5.1"; + version = "1.6.0"; src = fetchurl { url = "mirror://apache/couchdb/source/${version}/apache-${name}.tar.gz"; - sha256 = "0isddp29zh72idgwjaswqy887c1fwx5g1lwlbzscwcv6q70xrmfr"; + sha256 = "0m4k7i3gibzzcabssysv42rmdr89myppc6765xr0jggwkwdxgxmx"; }; buildInputs = [ erlang icu openssl spidermonkey curl help2man sphinx which diff --git a/pkgs/servers/http/myserver/default.nix b/pkgs/servers/http/myserver/default.nix index 8c0118912f5..3e1c94e79b4 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"; - - 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! - ''; - - homepage = http://www.gnu.org/software/myserver/; - - license = "GPLv3+"; - - maintainers = [ ]; - - # libevent fails to build on Cygwin and Guile has troubles on Darwin. - platforms = stdenv.lib.platforms.gnu; - }; - } - - // + enableParallelBuilding = true; # 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 { })) + postCheck = lib.optionalString stdenv.isLinux "${psmisc}/bin/killall test_suite || true"; + + meta = { + description = "GNU MyServer, a powerful and easy to configure web server"; + + 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! + ''; + + homepage = http://www.gnu.org/software/myserver/; + + license = lib.licenses.gpl3Plus; + + # libevent fails to build on Cygwin and Guile has troubles on Darwin. + platforms = lib.platforms.gnu; + + broken = true; # needs patch for gets() + }; +} diff --git a/pkgs/servers/http/nix-binary-cache/default.nix b/pkgs/servers/http/nix-binary-cache/default.nix new file mode 100644 index 00000000000..b007c09b056 --- /dev/null +++ b/pkgs/servers/http/nix-binary-cache/default.nix @@ -0,0 +1,61 @@ +{stdenv, fetchurl +, coreutils, findutils, nix, xz, bzip2, gnused, gnugrep, openssl +, lighttpd, iproute }: +stdenv.mkDerivation rec { + version = "2014-06-29-1"; + name = "nix-binary-cache-${version}"; + + phases = ["installPhase"]; + + installPhase = '' + mkdir -p "$out/bin" + substitute "${./nix-binary-cache.cgi.in}" "$out"/bin/nix-binary-cache.cgi \ + --replace @out@ "$out/bin" \ + --replace @shell@ "${stdenv.shell}" \ + --replace @coreutils@ "${coreutils}/bin" \ + --replace @findutils@ "${findutils}/bin" \ + --replace @nix@ "${nix}/bin" \ + --replace @xz@ "${xz}/bin" \ + --replace @bzip2@ "${bzip2}/bin" \ + --replace @gnused@ "${gnused}/bin" \ + --replace @gnugrep@ "${gnugrep}/bin" \ + --replace @openssl@ "${openssl}/bin" \ + --replace @lighttpd@ "${lighttpd}/sbin" \ + --replace @iproute@ "${iproute}/sbin" \ + --replace "xXxXx" "xXxXx" + + chmod a+x "$out/bin/nix-binary-cache.cgi" + + substitute "${./nix-binary-cache-start.in}" "$out"/bin/nix-binary-cache-start \ + --replace @out@ "$out/bin" \ + --replace @shell@ "${stdenv.shell}" \ + --replace @coreutils@ "${coreutils}/bin" \ + --replace @findutils@ "${findutils}/bin" \ + --replace @nix@ "${nix}/bin" \ + --replace @xz@ "${xz}/bin" \ + --replace @bzip2@ "${bzip2}/bin" \ + --replace @gnused@ "${gnused}/bin" \ + --replace @gnugrep@ "${gnugrep}/bin" \ + --replace @openssl@ "${openssl}/bin" \ + --replace @lighttpd@ "${lighttpd}/sbin" \ + --replace @iproute@ "${iproute}/sbin" \ + --replace "xXxXx" "xXxXx" + + chmod a+x "$out/bin/nix-binary-cache-start" + ''; + + meta = { + description = ''A set of scripts to serve the Nix store as a binary cache''; + longDescription = '' + This package installs a CGI script that serves Nix store path in the + binary cache format. It also installs a launcher called + nix-binary-cache-start that can be run without any setup to launch + a binary cache and get the example arguments for its usage. + ''; + maintainers = [stdenv.lib.maintainers.raskin]; + license = stdenv.lib.licenses.gpl2Plus; + inherit version; + platforms = stdenv.lib.platforms.all; + hydraPlatforms = []; + }; +} diff --git a/pkgs/servers/http/nix-binary-cache/nix-binary-cache-start.in b/pkgs/servers/http/nix-binary-cache/nix-binary-cache-start.in new file mode 100644 index 00000000000..2a2356f39ab --- /dev/null +++ b/pkgs/servers/http/nix-binary-cache/nix-binary-cache-start.in @@ -0,0 +1,105 @@ +#! @shell@ + +parse_opts () { + while @coreutils@/test -n "$1" && @coreutils@/test "x$1" != x-- ; do + case "$1" in + --store-dir) + shift; + echo "STORE_DIR='$1'" + shift; + ;; + --priority) + shift; + echo "PRIORITY=$1"; + shift; + ;; + --compression) + shift; + echo "COMPRESSION=$1"; + shift; + ;; + --key) + shift; + echo "KEY=${1#*:}" + echo "KEYNAME=${1%%:*}" + shift; + ;; + --nix-remote) + shift; + echo "NIX_REMOTE=$1" + shift; + ;; + --mass-query) + shift; + echo "MASS_QUERY=$1" + shift; + ;; + --port) + shift; + echo "PORT=$1" + shift; + ;; + --help) + cat <&2 +"$0": start the Nix binary cache serving the Nix store dynamically. + +Recognized options: + +--port server port +--store-dir served Nix store + +--priority binary cache priority +--mass-query 0 or 1 - whether binary cache expects queries for nix-env -qas + +--compression compression to use: bzip2 or xz +--key name:/path/to/key - key to use for narinfo signing + +--nix-remote 'daemon' or empty string '' - whether to use daemon for store + operations + +--help show help and exit +EOF + exit 1; + ;; + *) shift ;; + esac; + done +} + +workingdir="$(@coreutils@/mktemp -d)" +cd "$workingdir" + +PORT=8080 +(echo "STORE_DIR=${NIX_STORE_DIR:-/nix/store}"; parse_opts "$@" + ) > nix-binary-cache.conf || exit +. "$workingdir/nix-binary-cache.conf" + +echo " +server.port = $PORT +server.modules = ( \"mod_cgi\", \"mod_setenv\", ) +server.document-root = \"$workingdir\" +cgi.assign = ( \".cgi\" => \"@shell@\" ) +setenv.add-request-header = ( \"NIX_BINARY_CACHE_CONFIG\" => \"$workingdir/nix-binary-cache.conf\" ) +" > lighttpd.conf + +cp @out@/nix-binary-cache.cgi . +cp @out@/nix-binary-cache.cgi ./nix-bc.cgi + +ip="$(@iproute@/ip a | @gnugrep@/grep 'inet .* scope global' | @coreutils@/head -n 1)" +ip="${ip%%/*}" +ip="${ip##* }" + +url="http://$ip:$PORT/nix-bc.cgi?" + +echo "Working directory: $workingdir" +echo +echo "Address of the binary cache: $url" +echo +echo "Usage example: NIX_REMOTE= nix-store --option binary-caches '$url'" +echo +echo + +@lighttpd@/lighttpd -D -f "$workingdir/lighttpd.conf" + +cd / +@coreutils@/rm -rf "$workingdir" diff --git a/pkgs/servers/http/nix-binary-cache/nix-binary-cache.cgi.in b/pkgs/servers/http/nix-binary-cache/nix-binary-cache.cgi.in new file mode 100644 index 00000000000..219ab9763ad --- /dev/null +++ b/pkgs/servers/http/nix-binary-cache/nix-binary-cache.cgi.in @@ -0,0 +1,97 @@ +#! @shell@ + +STORE_DIR="${NIX_STORE_DIR:-/nix/store}" +MASS_QUERY=0 +PRIORITY=75 +COMPRESSION=bzip2 +KEY= +KEYNAME=na + +export NIX_REMOTE=daemon + +config="${NIX_BINARY_CACHE_CONFIG:-${HTTP_NIX_BINARY_CACHE_CONFIG:-/etc/nix/nix-binary-cache.cgi.conf}}" +config="$(cd "$(@coreutils@/dirname "$config")"; + @coreutils@/pwd)/$(@coreutils@/basename "$config")" +@coreutils@/test -e "$config" && . "$config" + +header(){ + echo "Content-Type: text/plain; charset=utf-8" + echo +} + +clean_path() { + @gnused@/sed -re "s@^$STORE_DIR/?@@" | @findutils@/xargs +} + +storeq(){ + @nix@/nix-store -q "$@" +} + +sign(){ + test -n "$1" && + @coreutils@/sha256sum | @gnused@/sed -e 's/ .*//' | + @openssl@/openssl rsautl -sign -inkey "$@" | @coreutils@/base64 -w 0 +} + +case "$QUERY_STRING" in + "") + header + echo "Hello, this is a dynamically-generated Nix binary cache" + ;; + /debug) + header + set + ;; + /nix-cache-info) + header + echo "StoreDir: $STORE_DIR" + echo "WantMassQuery: $MASS_QUERY" + echo "Priority: $PRIORITY" + ;; + *.narinfo) + hash=${QUERY_STRING%.narinfo} + hash=${hash#/} + path="$(echo "$STORE_DIR/$hash-"* )" + if [ -n "$path" ] && [ -e "$path" ]; then + header + info="$( + echo "StorePath: $path" + echo "URL: $(@coreutils@/basename "$path" + ).nar.$COMPRESSION" + echo "Compression: $COMPRESSION" + echo "NarHash: $(storeq --hash "$path")" + echo "NarSize: $(storeq --size "$path")" + echo "References: $(storeq --references "$path" | + @coreutils@/tac | clean_path )" + echo "Deriver: $(storeq --deriver "$path" | + clean_path )" + )" + signature="$(echo "$info" | sign "$KEY")" + + echo "$info" + echo "Signature: 1;$KEYNAME;$signature" + + else + exit 1 + fi + ;; + *.nar.xz) + path="$STORE_DIR${QUERY_STRING%.nar.xz}" + if [ -n "$path" ] && [ -e "$path" ]; then + header + @nix@/nix-store --dump "$path" | @xz@/xz + else + exit 1 + fi + ;; + *.nar.bzip2) + path="$STORE_DIR${QUERY_STRING%.nar.bzip2}" + echo "$path" >&2; + if [ -n "$path" ] && [ -e "$path" ]; then + header + @nix@/nix-store --dump "$path" | @bzip2@/bzip2 + else + exit 1 + fi + ;; +esac diff --git a/pkgs/servers/http/thttpd/default.nix b/pkgs/servers/http/thttpd/default.nix index e03183cbe49..0bb3d96b37b 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 c80d0f04bda..a96e4cb37c0 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 e531f6160ff..d88e1dd9e14 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/munin/default.nix b/pkgs/servers/monitoring/munin/default.nix index be890ff5900..245c838607f 100644 --- a/pkgs/servers/monitoring/munin/default.nix +++ b/pkgs/servers/monitoring/munin/default.nix @@ -99,18 +99,17 @@ stdenv.mkDerivation rec { ln -s $out/nix-support/propagated-native-build-inputs $out/nix-support/propagated-user-env-packages fi - # TODO: toPerlLibPath can be added to - # pkgs/development/interpreters/perl5.16/setup-hook.sh (and the other perl - # versions) just like for python. NOTE: it causes massive rebuilds. - # $(toPerlLibPath $out perlPackages.Log4Perl ...) - for file in "$out"/bin/munindoc "$out"/sbin/munin-* "$out"/lib/munin-* "$out"/www/cgi/*; do # don't wrap .jar files case "$file" in *.jar) continue;; esac wrapProgram "$file" \ - --set PERL5LIB "$out/lib/perl5/site_perl:${perlPackages.Log4Perl}/lib/perl5/site_perl:${perlPackages.IOSocketInet6}/lib/perl5/site_perl:${perlPackages.Socket6}/lib/perl5/site_perl:${perlPackages.URI}/lib/perl5/site_perl:${perlPackages.DBFile}/lib/perl5/site_perl:${perlPackages.DateManip}/lib/perl5/site_perl:${perlPackages.HTMLTemplate}/lib/perl5/site_perl:${perlPackages.FileCopyRecursive}/lib/perl5/site_perl:${perlPackages.FCGI}/lib/perl5/site_perl:${perlPackages.NetSNMP}/lib/perl5/site_perl:${perlPackages.NetServer}/lib/perl5/site_perl:${perlPackages.ListMoreUtils}/lib/perl5/site_perl:${perlPackages.TimeHiRes}/lib/perl5/site_perl:${rrdtool}/lib/perl:${perlPackages.DBDPg}/lib/perl5/site_perl:${perlPackages.LWPUserAgent}/lib/perl5/site_perl" + --set PERL5LIB "$out/lib/perl5/site_perl:${with perlPackages; stdenv.lib.makePerlPath [ + Log4Perl IOSocketInet6 Socket6 URI DBFile DateManip + HTMLTemplate FileCopyRecursive FCGI NetSNMP NetServer + ListMoreUtils TimeHiRes DBDPg LWPUserAgent + ]}" done ''; diff --git a/pkgs/servers/monitoring/seyren/default.nix b/pkgs/servers/monitoring/seyren/default.nix index 541c377c404..e6e15129568 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 40b4ff1f2d7..bbbe54b95fd 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 5bc55039260..c8a6434cac3 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 ] @@ -55,7 +55,7 @@ in stdenv.mkDerivation rec { ++ opt mpg123Support mpg123 ++ opt aacSupport faad2 ++ opt zipSupport zziplib - ++ opt zipSupport pulseaudio; + ++ opt pulseaudioSupport pulseaudio; configureFlags = [ (mkFlag (!stdenv.isDarwin && alsaSupport) "alsa") diff --git a/pkgs/servers/news/leafnode/default.nix b/pkgs/servers/news/leafnode/default.nix index 9da83fe891f..56d402397ec 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 fa9c48c6ea9..77852b6d2ed 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 78792c3a4f7..aa9da965d17 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 67dff3f6572..3694547c2d9 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 b1570d96c7b..4d32c3203c7 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/nsq/deps.nix b/pkgs/servers/nsq/deps.nix index 8518ceed916..bd98357ece6 100644 --- a/pkgs/servers/nsq/deps.nix +++ b/pkgs/servers/nsq/deps.nix @@ -6,7 +6,7 @@ let root = "code.google.com/p/snappy-go"; src = fetchhg { url = "http://code.google.com/p/snappy-go"; - tag = "14"; + rev = "14"; sha256 = "0ywa52kcii8g2a9lbqcx8ghdf6y56lqq96sl5nl9p6h74rdvmjr7"; }; } diff --git a/pkgs/servers/pies/default.nix b/pkgs/servers/pies/default.nix index 898bfb711ff..958578138bc 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/polipo/default.nix b/pkgs/servers/polipo/default.nix index 3e49715b94d..08ccbbd06c6 100644 --- a/pkgs/servers/polipo/default.nix +++ b/pkgs/servers/polipo/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, texinfo }: -stdenv.mkDerivation rec { +stdenv.mkDerivation rec { name = "polipo-${version}"; - version = "1.0.4.1"; + version = "1.1.1"; src = fetchurl { - url = "http://freehaven.net/~chrisd/polipo/${name}.tar.gz"; - sha256 = "1ykwkyvmdw6fsaj2hc40971pkwf60hvi9c43whijim00qvgbyvwd"; + url = "http://www.pps.univ-paris-diderot.fr/~jch/software/files/polipo/${name}.tar.gz"; + sha256 = "05g09sg9qkkhnc2mxldm1w1xkxzs2ylybkjzs28w8ydbjc3pand2"; }; buildInputs = [ texinfo ]; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { homepage = http://www.pps.jussieu.fr/~jch/software/polipo/; description = "A small and fast caching web proxy"; license = licenses.mit; - maintainers = [ maintainers.phreedom ]; + maintainers = with maintainers; [ phreedom emery ]; platforms = platforms.all; }; } \ No newline at end of file diff --git a/pkgs/servers/prayer/default.nix b/pkgs/servers/prayer/default.nix index a398a3ccdf9..781fca1c33d 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 35922b3c46f..0665222a9e0 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 dcd577bb6cb..a8c991e12d3 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/restund/default.nix b/pkgs/servers/restund/default.nix index e817151e778..d6952e9700e 100644 --- a/pkgs/servers/restund/default.nix +++ b/pkgs/servers/restund/default.nix @@ -24,5 +24,9 @@ stdenv.mkDerivation rec { platforms = with stdenv.lib.platforms; linux; maintainers = with stdenv.lib.maintainers; [raskin]; license = with stdenv.lib.licenses; bsd3; + inherit version; + downloadPage = "http://www.creytiv.com/pub/"; + updateWalker = true; + downloadURLRegexp = "/restund-.*[.]tar[.]"; }; } diff --git a/pkgs/servers/samba/default.nix b/pkgs/servers/samba/default.nix index ade79e2c99c..08f12d97506 100644 --- a/pkgs/servers/samba/default.nix +++ b/pkgs/servers/samba/default.nix @@ -18,11 +18,11 @@ assert useKerberos -> kerberos != null; stdenv.mkDerivation rec { - name = "samba-3.6.22"; + name = "samba-3.6.24"; src = fetchurl { - url = "http://us3.samba.org/samba/ftp/stable/${name}.tar.gz"; - sha256 = "1sny3irf1p4fjli5qa29swr3l217grg90cva35rmay48fw7g5g9h"; + url = "http://samba.org/samba/ftp/stable/${name}.tar.gz"; + sha256 = "19rln8m1k359bz6dhmlv39kzyjg7p296dz4y4mq1jwrlnw2bvl0i"; }; buildInputs = [ readline pam openldap popt iniparser libunwind fam acl cups ] diff --git a/pkgs/servers/search/elasticsearch/default.nix b/pkgs/servers/search/elasticsearch/default.nix index b227832ad73..569ec87c4cb 100644 --- a/pkgs/servers/search/elasticsearch/default.nix +++ b/pkgs/servers/search/elasticsearch/default.nix @@ -1,15 +1,18 @@ { stdenv, fetchurl, makeWrapper, jre, utillinux }: + +with stdenv.lib; + stdenv.mkDerivation rec { - name = "elasticsearch-1.2.1"; + name = "elasticsearch-1.2.2"; src = fetchurl { url = "https://download.elasticsearch.org/elasticsearch/elasticsearch/${name}.tar.gz"; - sha256 = "11lirxl0hb0xfd57accsgldq1adrlv9pak2520jll2sj5gg71cmj"; + sha256 = "1vpvxndcq48rcsgw2jnzdh4fwnf141hf5wjxrjs1g7p2qw0d0cy8"; }; patches = [ ./es-home.patch ]; - buildInputs = [ makeWrapper jre utillinux ]; + buildInputs = [ makeWrapper jre ] ++ optional (!stdenv.isDarwin) utillinux; installPhase = '' mkdir -p $out @@ -21,7 +24,7 @@ stdenv.mkDerivation rec { # set ES_CLASSPATH and JAVA_HOME wrapProgram $out/bin/elasticsearch \ --prefix ES_CLASSPATH : "$out/lib/${name}.jar":"$out/lib/*":"$out/lib/sigar/*" \ - --prefix PATH : "${utillinux}/bin/" \ + ${optionalString (!stdenv.isDarwin) ''--prefix PATH : "${utillinux}/bin/"''} \ --set JAVA_HOME "${jre}" wrapProgram $out/bin/elasticsearch-plugin \ --prefix ES_CLASSPATH : "$out/lib/${name}.jar":"$out/lib/*":"$out/lib/sigar/*" --set JAVA_HOME "${jre}" @@ -29,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 00000000000..c03a2feae5f --- /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 40b41c8f9d3..48e5f2cea22 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 d4da74b5476..a4b4058a711 100644 --- a/pkgs/servers/serfdom/deps.nix +++ b/pkgs/servers/serfdom/deps.nix @@ -6,7 +6,7 @@ let root = "code.google.com/p/go.net"; src = fetchhg { url = "http://code.google.com/p/go.net"; - tag = "134"; + rev = "134"; sha256 = "1jycpgrfwgkfac60zjbx6babcz7sgyn9xgy6cr3l811j6k8r2pbv"; }; } @@ -14,7 +14,7 @@ let root = "code.google.com/p/go.text"; src = fetchhg { url = "http://code.google.com/p/go.text"; - tag = "85"; + rev = "85"; sha256 = "1x8h6vq9g5gbi7iiwla6dkaaqqf7wmkdm4szj7wvzlsijf2x8dwr"; }; } @@ -77,8 +77,8 @@ let src = fetchFromGitHub { owner = "hashicorp"; repo = "serf"; - rev = "4232a3f7b52f755084caf6b2cc2789efa2948555"; - sha256 = "1hxxqrjz08882d205ylakhvvwciahiqdzkwi2a7zwrmx6sxna7sr"; + rev = "5e0771b8d61bee28986087a246f7611d6bd4a87a"; + sha256 = "0ck77ji28bvm4ahzxyyi4sm17c3fxc16k0k5mihl1nlkgdd73m8y"; }; } { @@ -157,7 +157,7 @@ let root = "launchpad.net/gocheck"; src = fetchbzr { url = "https://launchpad.net/gocheck"; - revision = "87"; + rev = "87"; sha256 = "1y9fa2mv61if51gpik9isls48idsdz87zkm1p3my7swjdix7fcl0"; }; } @@ -165,7 +165,7 @@ let root = "launchpad.net/mgo"; src = fetchbzr { url = "https://launchpad.net/mgo"; - revision = "2"; + rev = "2"; sha256 = "0h1dxzyx5c4r4gfnmjxv92hlhjxrgx9p4g53p4fhmz6x2fdglb0x"; }; } diff --git a/pkgs/servers/shellinabox/default.nix b/pkgs/servers/shellinabox/default.nix index acff3a84a31..2d827c737d8 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 2afec801961..fdb1dcbd1cf 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 90e71f5e47a..14cd91ee141 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 782019f8ee0..7c31bd7c582 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 00c614021b6..97e98217f8a 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 8d714c6f5a6..92417dc730c 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 8b0ce0f7bb2..e5dbdd034d3 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 50ea799099c..6c6ef132e81 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 642b713daaa..a6552738ea6 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 96073645cc1..ee566c32def 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 00000000000..8aa15ee9f82 --- /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 1834dfd6a96..2f18a4e1020 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 3abfed675f8..2d105241c2d 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 bb97eadef46..e5aad4aea40 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 e7b3a6f4ad6..417d12ddadc 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 5877643fb1b..bee394e9963 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 f15705d4a11..5868125c97f 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 736517b53f1..3fb89d7a222 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"; - }; - - buildInputs = [jre]; - configureFlags = []; - - 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]); + name = "openfire-${version}"; + version = "3_6_3"; + + 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 + ''; + 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 ac6e9e97f18..567ec3c551c 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 61f6478629d..6a6b8563a55 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/fish/default.nix b/pkgs/shells/fish/default.nix index e69c033cf40..adfe44b3bac 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, python27, which, groff, gettext, man_db, bc }: +{ stdenv, fetchurl, ncurses, python, which, groff, gettext, man_db, bc }: stdenv.mkDerivation rec { name = "fish-${version}"; @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses ]; # Required binaries during execution - # Python27: Autocompletion generated from manpages and config editing - propagatedBuildInputs = [ python27 which groff gettext man_db bc ]; + # Python: Autocompletion generated from manpages and config editing + propagatedBuildInputs = [ python which groff gettext man_db bc ]; postInstall = '' sed -i "s|bc|${bc}/bin/bc|" "$out/share/fish/functions/seq.fish" diff --git a/pkgs/shells/rush/default.nix b/pkgs/shells/rush/default.nix index 4354a3cd0b3..e9d0c61ee08 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 00000000000..94b1f5dd2f5 --- /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/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix index 704527d28c7..d187c50f251 100644 --- a/pkgs/shells/zsh/default.nix +++ b/pkgs/shells/zsh/default.nix @@ -70,6 +70,6 @@ EOF license = "MIT-like"; homePage = "http://www.zsh.org/"; maintainers = with stdenv.lib.maintainers; [ chaoflow ]; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/stdenv/default.nix b/pkgs/stdenv/default.nix index a2723f5575c..47d1fb6d9f7 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 6047ecf853c..11731c1c1c1 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 ce83b1f6961..c3b9033b49a 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 9ea63a46be3..3abffc46926 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 5a9f9749a4f..00000000000 --- 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 3061900ee0c..00000000000 --- 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 a0554c1d41d..00000000000 --- 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 422699971ed..00000000000 --- 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 947db5f10a8..00000000000 --- 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 e9f2669a097..00000000000 --- 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 b4d278b2686..00000000000 --- 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 09d933bd17b..00000000000 --- 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 a801e7fbcab..00000000000 --- 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 0cbc13e4fab..00000000000 --- 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 379cda0a598..00000000000 --- 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 78e5b84a841..a496a819a6d 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 bc7679b1670..8506c9f38f3 100644 --- a/pkgs/tools/X11/autocutsel/default.nix +++ b/pkgs/tools/X11/autocutsel/default.nix @@ -1,14 +1,12 @@ {stdenv, fetchurl, libX11, libXaw}: -let - name = "autocutsel-0.9.0"; -in -stdenv.mkDerivation { - inherit name; +stdenv.mkDerivation rec { + version = "0.10.0"; + name = "autocutsel-${version}"; src = fetchurl { - url = "mirror://savannah/autocutsel/${name}.tar.gz"; - sha256 = "0hp335qq57l0kp58pfwb0bk930zx5497frq8y0lzr4icvk1fpw5y"; + url = "https://github.com/sigmike/autocutsel/releases/download/${version}/${name}.tar.gz"; + sha256 = "0gsys2dzh4az51ndcsabhlbbrjn2nm75lnjr45kg6r8sm8q66dx2"; }; buildInputs = [ libX11 libXaw ]; @@ -18,9 +16,11 @@ stdenv.mkDerivation { ''; meta = { + 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 ed700fa6356..00cf9a54fb7 100644 --- a/pkgs/tools/X11/bgs/default.nix +++ b/pkgs/tools/X11/bgs/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "bgs-${version}"; - version = "0.5"; + version = "0.6"; src = fetchurl { url = "https://github.com/Gottox/bgs/archive/${version}.tar.gz"; - sha256 = "67fe16e3483f30f940005856fbb3246e1f99cf58371470e0d6668a27acbaefb9"; + sha256 = "19xwslh74686qln0ylaql28z3ng45c7srrb3cxxvfp35lz7hjpf0"; }; buildInputs = [ libX11 libXinerama imlib2 ]; @@ -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 96241bd02cd..d91f4bfdf65 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 182c058e1c1..dd8b496fe66 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 2db0d172173..ad7ac7c64c8 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/wmctrl/64-bit-data.patch b/pkgs/tools/X11/wmctrl/64-bit-data.patch new file mode 100644 index 00000000000..3ec1c913ffe --- /dev/null +++ b/pkgs/tools/X11/wmctrl/64-bit-data.patch @@ -0,0 +1,32 @@ +Description: Correct 64 Architecture implementation of 32 bit data +Author: Chris Donoghue +Bug-Debian: http://bugs.debian.org/362068 + +--- wmctrl-1.07.orig/main.c ++++ wmctrl-1.07/main.c +@@ -1425,6 +1425,16 @@ static gchar *get_property (Display *dis + * + * long_length = Specifies the length in 32-bit multiples of the + * data to be retrieved. ++ * ++ * NOTE: see ++ * http://mail.gnome.org/archives/wm-spec-list/2003-March/msg00067.html ++ * In particular: ++ * ++ * When the X window system was ported to 64-bit architectures, a ++ * rather peculiar design decision was made. 32-bit quantities such ++ * as Window IDs, atoms, etc, were kept as longs in the client side ++ * APIs, even when long was changed to 64 bits. ++ * + */ + if (XGetWindowProperty(disp, win, xa_prop_name, 0, MAX_PROPERTY_VALUE_LEN / 4, False, + xa_prop_type, &xa_ret_type, &ret_format, +@@ -1441,6 +1451,8 @@ static gchar *get_property (Display *dis + + /* null terminate the result to make string handling easier */ + tmp_size = (ret_format / 8) * ret_nitems; ++ /* Correct 64 Architecture implementation of 32 bit data */ ++ if(ret_format==32) tmp_size *= sizeof(long)/4; + ret = g_malloc(tmp_size + 1); + memcpy(ret, ret_prop, tmp_size); + ret[tmp_size] = '\0'; diff --git a/pkgs/tools/X11/wmctrl/default.nix b/pkgs/tools/X11/wmctrl/default.nix index f4705bdb0d4..3f691b8ecd4 100644 --- a/pkgs/tools/X11/wmctrl/default.nix +++ b/pkgs/tools/X11/wmctrl/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { buildInputs = [ libX11 libXmu glib pkgconfig ]; + patches = [ ./64-bit-data.patch ]; + meta = { homepage = http://tomas.styblo.name/wmctrl/; description = "wmctrl is a UNIX/Linux command line tool to interact with an EWMH/NetWM compatible X Window Manager"; diff --git a/pkgs/tools/X11/xbindkeys/default.nix b/pkgs/tools/X11/xbindkeys/default.nix index 57417fa7721..0d63c190b05 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 42e26825e33..eab21f2d221 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 ce439d22c21..0e92021b62c 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 e6b2f78332d..688c0e12d93 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 c9f41b68446..efc0647f5db 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 ec139e7240d..54dac32141f 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 14822d8b6e9..c502cee5415 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 new file mode 100644 index 00000000000..d8c60c0ec3c --- /dev/null +++ b/pkgs/tools/admin/sec/default.nix @@ -0,0 +1,30 @@ +{ fetchurl, perl, stdenv }: + +stdenv.mkDerivation rec { + name = "sec-2.7.6"; + + src = fetchurl { + url = "mirror://sourceforge/simple-evcorr/${name}.tar.gz"; + sha256 = "1lrssln55p3bmn3d2hl8c5l5ix32bn8065w1cgycwsf7r6fww51p"; + }; + + buildInputs = [ perl ]; + + configurePhase = ":"; + buildPhase = ":"; + installPhase = '' + mkdir -p $out/bin $out/share/man/man1 + cp sec $out/bin + cp sec.man $out/share/man/man1/sec.1 + ''; + doCheck = false; + + meta = { + homepage = "http://simple-evcorr.sourceforge.net/"; + license = "GPLv2"; + description = "Simple Event Correlator"; + maintainers = [ stdenv.lib.maintainers.tv ]; + platforms = stdenv.lib.platforms.all; + }; + +} diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix index b2dedf4688d..3d5abd074d9 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 187d3345e6b..acb8708ec14 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 6428fbaa9dc..87324ac80a2 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 ff51b28f34b..cd0cea13a14 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 273b394881b..afd734fbae0 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 718a80e1406..1ed5866a692 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 0258edb8a19..89f577e93ad 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 e51d6d6acea..baa0d617016 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 8a9db4e5701..45d6cb83739 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 a77689c85fc..4df142afe3a 100644 --- a/pkgs/tools/backup/httrack/default.nix +++ b/pkgs/tools/backup/httrack/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, zlib, openssl }: stdenv.mkDerivation rec { - version = "3.48.3"; + version = "3.48.17"; name = "httrack-${version}"; src = fetchurl { url = "http://mirror.httrack.com/httrack-${version}.tar.gz"; - sha256 = "1lg5rrql01q3z7fwcij5p64r22x4vbswcky80gajx5f62kxlxn0r"; + sha256 = "03q8sk7qihw9x4bfgfhv6523khgj13nilqps28qy7ndpzpggw9vn"; }; buildInputs = [ zlib openssl ]; @@ -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 854801a3edd..bf71f9397cb 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 d58815f6d6d..58affe10e4e 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 9b147d68230..0bd19e2d6be 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 e9b98fec710..c986adeafdc 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 b8b7510b882..e5a4f83ab0f 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 0d44624786b..bcf9ec2c0cc 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 39b7c809858..516f0750807 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 fd0f131b8c2..f181ab71edf 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 62a802ebab5..88cca66efb1 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 b1d127635f6..b7bf9c59f49 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 6fd1ae97d96..51f61fcf239 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 8c4547753aa..ca8d356abb3 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 283b751cf26..c012be7c56d 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 4c00252fc2a..5a43aa52a0e 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 00000000000..7d79eefb122 --- /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/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix new file mode 100644 index 00000000000..7a8b85a8945 --- /dev/null +++ b/pkgs/tools/filesystems/ceph/default.nix @@ -0,0 +1,37 @@ +{stdenv, fetchgit, libatomic_ops, autoconf, automake, boost, btrfsProgs, cryptopp, curl, expat, + fcgi, fuse, gperftools, keyutils, leveldb, libaio, libedit, libtool, + libuuid, linuxHeaders, openssl, pkgconfig, python, snappy, which, xfsprogs, xz}: + +stdenv.mkDerivation rec { + baseName="ceph"; + version="0.79"; + name="${baseName}-${version}"; + buildInputs = [ + fuse linuxHeaders pkgconfig libatomic_ops autoconf automake boost btrfsProgs cryptopp expat + fcgi fuse gperftools keyutils leveldb libaio libedit libtool libuuid openssl pkgconfig + python snappy which xfsprogs.lib xz + ]; + + preConfigure = '' + ./autogen.sh + ''; + + installFlags = "DESTDIR=\${out}"; + + enableParallelBuilding = true; + src = fetchgit { + url = "https://github.com/ceph/ceph"; + rev = "4c2d73a5095f527c3a2168deb5fa54b3c8991a6e"; + sha256 = "0850m817wqqmw2qdnwm5jvbdgifzlc7kcd05jv526pdvmq1x92rf"; + }; + + meta = { + inherit version; + description = "Distributed storage system"; + maintainers = [ + stdenv.lib.maintainers.ak + ]; + platforms = with stdenv.lib.platforms; + linux; + }; +} diff --git a/pkgs/tools/filesystems/chunkfs/default.nix b/pkgs/tools/filesystems/chunkfs/default.nix index c51837eef18..d91525e348f 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 f944e591a12..97548442eba 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 0e72c45e31a..75e5280d391 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 1c843a66636..69f3f7ef1ef 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 dce7757d23a..c6d2776f437 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 6f68a798ede..b0f7981ebb3 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 4cb09d53adc..2a7d9672843 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 2c14bc624ae..0c5ec063b1a 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 3951a8d8bb7..89e49c9586c 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 4787ed77b59..b6a296e6bc7 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 bff5aaf242b..23340f88376 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/filesystems/xfsprogs/default.nix b/pkgs/tools/filesystems/xfsprogs/default.nix index 400890e95f3..7c9cd05009d 100644 --- a/pkgs/tools/filesystems/xfsprogs/default.nix +++ b/pkgs/tools/filesystems/xfsprogs/default.nix @@ -12,11 +12,26 @@ stdenv.mkDerivation rec { sed -i s,/bin/bash,`type -P bash`, install-sh ''; + outputs = ["out" "lib"]; + + postInstall = '' + (cd include; make install-dev) + # The make install-dev target is broken when --disable-shared + mkdir -p $lib/lib $lib/include + cp ./libhandle/.libs/libhandle.a \ + ./libxcmd/.libs/libxcmd.a \ + ./libxlog/.libs/libxlog.a \ + ./libxfs/.libs/libxfs.a $lib/lib + mv $out/include/* $lib/include + ''; + + enableParallelBuilding = true; + buildInputs = [ libtool gettext libuuid ]; configureFlags = "MAKE=make MSGFMT=msgfmt MSGMERGE=msgmerge XGETTEXT=xgettext ZIP=gzip AWK=gawk --disable-shared"; preConfigure = '' - configureFlags="$configureFlags root_sbindir=$out/sbin root_libdir=$out/lib" + configureFlags="$configureFlags root_sbindir=$out/sbin root_libdir=$lib/lib" ''; disableStatic = false; diff --git a/pkgs/tools/graphics/barcode/default.nix b/pkgs/tools/graphics/barcode/default.nix index d43540a8b99..60dc5a285da 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 ed9ac2da2d2..72b50bd4e77 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 b77d63d510d..6b65d3df0d3 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 debc340ee4c..dc1a8b3abae 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 00000000000..97fcd1addd0 --- /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 e0f9ce2a2bf..f92c82e3d74 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 10cd9adf2b3..94a613078a4 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 ed69327b752..36a75743ed8 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 1a7c3317cf9..f14c16775f8 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 857a86d57af..92dce64dcfd 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 bb250b9d852..ae0c4d19731 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 2a4364164dd..b27e5132804 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 560352c481e..77cc898ef2a 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 df1046cb750..fe01a9459ec 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 12f307ca9de..b4a1d1a7d67 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/redirect/www.povray.org/ftp/pub/povray/Official/Unix/povray-3.6.tar.bz2; - sha256 = "0wvsfgkybx28mj2p76nnsq9rdq50192g5qb7d0xk81s8skn7z2jf"; + 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 62816705b8f..d4e977128cf 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 747c4b44ac8..2795b0d4d87 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 f2fe1d95930..d2d29aae785 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 024798a84e3..78383f4185d 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 f7c121d825e..52d80a8812e 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 b0dbb049cbf..8844fe9c57c 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/cpuminer/default.nix b/pkgs/tools/misc/cpuminer/default.nix index c172930cfd2..57bd21dff23 100644 --- a/pkgs/tools/misc/cpuminer/default.nix +++ b/pkgs/tools/misc/cpuminer/default.nix @@ -2,15 +2,17 @@ stdenv.mkDerivation rec { name = "cpuminer-${version}"; - version = "2.3.3"; + version = "2.4"; src = fetchurl { url = "mirror://sourceforge/cpuminer/pooler-${name}.tar.gz"; - sha256 = "17pjnb1nb8c1akr07hgac2pqd5fcv34f12g7iykbn9hgig5r1sxc"; + sha256 = "0yl3ca31ck732f4551svxw6lx1lrjr7rhld5v09v0bgm3z07nnrx"; }; buildInputs = [ curl jansson ]; + configureFlags = [ "CFLAGS=-O3" ]; + meta = { homepage = https://github.com/pooler/cpuminer; description = "CPU miner for Litecoin and Bitcoin"; diff --git a/pkgs/tools/misc/cunit/default.nix b/pkgs/tools/misc/cunit/default.nix index 35e4c3ab4d4..ac9685b83f5 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/cv/default.nix b/pkgs/tools/misc/cv/default.nix new file mode 100644 index 00000000000..28c6347a63d --- /dev/null +++ b/pkgs/tools/misc/cv/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "cv-2014-07-20"; + + src = fetchFromGitHub { + owner = "Xfennec"; + repo = "cv"; + rev = "7441de974cc13f3b07903bb86c41be4e45c8e81b"; + sha256 = "19ky88b52a8zcv7lx802y4zi3sp0cdhya08cnax0yvlwwq43w6x9"; + }; + + buildInputs = [ ]; + + makeFlags = [ "PREFIX=$(out)" ]; + + meta = with stdenv.lib; { + homepage = https://github.com/Xfennec/cv; + description = "Tool that shows the progress of coreutils programs"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ pSub ]; + }; +} diff --git a/pkgs/tools/misc/debian-devscripts/default.nix b/pkgs/tools/misc/debian-devscripts/default.nix index ddf30f342d1..49e158ea2d0 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 aac7855827c..16b1858e91d 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 435115ffc59..65a0047738b 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/direnv/default.nix b/pkgs/tools/misc/direnv/default.nix index f8b590cde21..739908e3699 100644 --- a/pkgs/tools/misc/direnv/default.nix +++ b/pkgs/tools/misc/direnv/default.nix @@ -1,14 +1,14 @@ { fetchurl, stdenv, go }: let - version = "2.2.1"; + version = "2.4.0"; in stdenv.mkDerivation { name = "direnv-${version}"; src = fetchurl { url = "http://github.com/zimbatm/direnv/archive/v${version}.tar.gz"; name = "direnv-${version}.tar.gz"; - sha256 = "6d55cb96189e20609a08133fe9392c50209cd435b4f77e3baaa0f423d82ae59a"; + sha256 = "aab8028cc1d68461dd1f6c3c9d000eef10273c52399fe5d1dd917f2f4a1a349a"; }; buildInputs = [ go ]; @@ -31,7 +31,7 @@ stdenv.mkDerivation { ''; homepage = http://direnv.net; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.zimbatm ]; + platforms = go.meta.platforms; }; } diff --git a/pkgs/tools/misc/dvtm/default.nix b/pkgs/tools/misc/dvtm/default.nix index 55e8367538a..22bea399f03 100644 --- a/pkgs/tools/misc/dvtm/default.nix +++ b/pkgs/tools/misc/dvtm/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ncurses }: stdenv.mkDerivation rec { - name = "dvtm-0.11"; + name = "dvtm-0.12"; meta = { description = "Dynamic virtual terminal manager"; - homepage = "http://www.brain-dump.org/projects/dvtm"; + homepage = http://www.brain-dump.org/projects/dvtm; license = stdenv.lib.licenses.mit; platfroms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ iyzsong ]; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/${name}.tar.gz"; - sha256 = "11zb5wnvmcx8np2886hwaqijvhdw8l87lldxhgqikw2ncpgrz8h1"; + sha256 = "0qcwsxhg738rq3bh4yid15nz2rrjc9k7ay6c1qv15c3gkw86zc3f"; }; buildInputs = [ ncurses ]; diff --git a/pkgs/tools/misc/emv/default.nix b/pkgs/tools/misc/emv/default.nix new file mode 100644 index 00000000000..ee8b12ad89b --- /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 77d1d58c30c..1cbbb9720c9 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 14e6a2f6681..41c479e414b 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 8d6cbc1359b..015820916c7 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 d0a03f955a8..d6ae74e02b5 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 88cb2c313c0..a6ea96b77db 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 00000000000..9c437deca07 --- /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 00000000000..104d3fad8d0 --- /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 50af2a12c24..16c7f652dec 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 17cd86014dd..b1877bdcf98 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 a937e96eed5..5f21559d471 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/gummiboot/default.nix b/pkgs/tools/misc/gummiboot/default.nix index 502d9044c5d..2d0b0015f9d 100644 --- a/pkgs/tools/misc/gummiboot/default.nix +++ b/pkgs/tools/misc/gummiboot/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, gnu-efi, unzip, pkgconfig, utillinux, libxslt, docbook_xsl, docbook_xml_dtd_42 }: stdenv.mkDerivation rec { - name = "gummiboot-43"; + name = "gummiboot-45"; buildInputs = [ gnu-efi pkgconfig libxslt utillinux ]; @@ -13,8 +13,8 @@ stdenv.mkDerivation rec { ]; src = fetchurl { - url = http://pkgs.fedoraproject.org/repo/pkgs/gummiboot/gummiboot-43.tar.xz/c9b46a3504a2f7e335404a1475818d98/gummiboot-43.tar.xz; - sha256 = "1hwaan3985ap9r5ncf9bykbaixbm0xn4x09silssngwfl2srn4iv"; + url = http://pkgs.fedoraproject.org/repo/pkgs/gummiboot/gummiboot-45.tar.xz/5d4957390e959cb9f325b87712ddd3f1/gummiboot-45.tar.xz; + md5 = "5d4957390e959cb9f325b87712ddd3f1"; }; meta = { diff --git a/pkgs/tools/misc/hddtemp/default.nix b/pkgs/tools/misc/hddtemp/default.nix index f3c5dd02c7e..835ceb32881 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 ab6102cf23c..227fba3d377 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 e01a28ab185..2b2f3aeaca3 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 2457668d5b0..2fa71223931 100644 --- a/pkgs/tools/misc/jdiskreport/default.nix +++ b/pkgs/tools/misc/jdiskreport/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, unzip, jre }: stdenv.mkDerivation rec { - name = "jdiskreport-1.4.0"; + name = "jdiskreport-1.4.1"; builder = ./builder.sh; src = fetchurl { - url = http://www.jgoodies.com/download/jdiskreport/jdiskreport-1_4_0.zip; - sha256 = "0kx43480p89wlyza94lzqygqfafsdf964syc2c24q28y42psz4kd"; + url = http://www.jgoodies.com/download/jdiskreport/jdiskreport-1_4_1.zip; + sha256 = "0d5mzkwsbh9s9b1vyvpaawqc09b0q41l2a7pmwf7386b1fsx6d58"; }; buildInputs = [ unzip ]; @@ -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 00000000000..19870b8de5b --- /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 db2d6cffc40..ee521f04700 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 2c2a547f2fd..2eb63f09216 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 15c6258e86f..308b5217a6f 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 a613dad3ec9..7f43ccdb625 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 00000000000..729faa7a95d --- /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 594947ba13d..94c08fa9ba9 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 761b2c5bdbf..ffd8966a80e 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 2b15d4470c3..7fd6ce966d6 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 f177e9e84c2..3200c7016b6 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 941d805a6ff..b7f7842680f 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 a9d32205cea..6d3634ea7af 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 96d3764abd4..f3f90143bda 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 5d93ef44b36..0dad6c2d33f 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/ngrok/default.nix b/pkgs/tools/misc/ngrok/default.nix index e517dba7c55..6435923b48a 100644 --- a/pkgs/tools/misc/ngrok/default.nix +++ b/pkgs/tools/misc/ngrok/default.nix @@ -30,16 +30,16 @@ let url = "https://launchpad.net/goyaml"; sha256 = "03is37cgw62cha316xrs5h7q97im46ry5qldkfvbhimjq3ww0swj"; # Branch: "branch:lp:goyaml" - revision = 47; + rev = 47; }; log4go = fetchhg { url = "https://code.google.com/p/log4go/"; - tag = "c3294304d93f"; + rev = "c3294304d93f"; sha256 = "0q906sxrmwir295virfibqvdzlaj340qh2r4ysx1ccjrjazc0q5p"; }; osext = fetchhg { url = "https://bitbucket.org/kardianos/osext"; - tag = "364fb57"; + rev = "364fb57"; sha256 = "1w9x2zj716agfd5x5497ajb9nz3ljar74768vjidsyly143vzjws"; }; in stdenv.mkDerivation rec { diff --git a/pkgs/tools/misc/openopc/default.nix b/pkgs/tools/misc/openopc/default.nix new file mode 100644 index 00000000000..2fce3807ca7 --- /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 fbc6d607650..2a081b882ab 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 fa6f147efe4..df360bb9804 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 54697f98414..d516e50124c 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 1d0c4f2a9e7..108d4d5e040 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 19a0df26169..156f03dad87 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 bb08091ad57..303fdb3dbe0 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 37636da7235..909ed0856bb 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 1da0d70a14f..031264f1edd 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 f5be7b8a46d..993a36ea909 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 d99fc1960dd..a8b6e046a9b 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 e798ee669e2..f2f5f37ebe4 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 b679218db79..fe0f3d646b8 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 new file mode 100644 index 00000000000..00eaa8aad76 --- /dev/null +++ b/pkgs/tools/misc/riemann-c-client/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, file, protobufc }: + +stdenv.mkDerivation rec { + name = "riemann-c-client-${version}"; + + version = "1.2.0"; + + src = fetchurl { + url = "https://github.com/algernon/riemann-c-client/archive/${name}.tar.gz"; + sha256 = "1w3rx0hva605d5vzlhhm4pb43ady0m3s4mz8ix1ycn4b8cq9jsjs"; + }; + + buildInputs = [ autoconf automake libtool pkgconfig file protobufc ]; + + preConfigure = "autoreconf -i"; + + meta = with stdenv.lib; { + homepage = "https://github.com/algernon/riemann-c-client"; + description = "A C client library for the Riemann monitoring system"; + license = licenses.gpl3; + maintainers = [ maintainers.rickynils ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/misc/rkflashtool/default.nix b/pkgs/tools/misc/rkflashtool/default.nix index c985183c1c0..6b74f9ac5d3 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 5270ddad35e..aa14087dfc8 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 14cc6c4260f..a2dab4e0eb8 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 c861fc6f73a..f3c1c278c76 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 58f30a021fa..a6afe475e3b 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 00000000000..6d2bee23813 --- /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 60767405154..5e473a5cd09 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 73ac04dd34e..fd237ac15f4 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 05ab7cc7ae7..3a35e9a9f1c 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 89ff6f4677f..afe75c572c0 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 10e22c3aad0..5b656cc13e7 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 f8ad1fd4d15..bf73dbcbf2f 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 a3938c1af4c..1c2c94ff89c 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 cc9f98a94f6..93a2707d1e9 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 1014f11453b..4afcc0ac36d 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 f6d6a2bacfa..79c6a743bce 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 00000000000..9a059c9dbb5 --- /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 00000000000..30aba19930c --- /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 00000000000..ca8be4c08ea --- /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 1a99cb291c4..e237e0b25eb 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 635d94a3e86..df8677bfffa 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 475d6775cde..ce2ded24f82 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/altermime/default.nix b/pkgs/tools/networking/altermime/default.nix index a80757faa1f..1c9dbfe6235 100644 --- a/pkgs/tools/networking/altermime/default.nix +++ b/pkgs/tools/networking/altermime/default.nix @@ -42,11 +42,9 @@ rec { ]; platforms = with a.lib.platforms; linux; - }; - passthru = { - updateInfo = { - downloadPage = "http://www.pldaniels.com/altermime/"; - }; + downloadPage = "http://www.pldaniels.com/altermime/"; + inherit version; + updateWalker = true; }; }) x diff --git a/pkgs/tools/networking/aria/default.nix b/pkgs/tools/networking/aria/default.nix deleted file mode 100644 index c7ccefd045b..00000000000 --- a/pkgs/tools/networking/aria/default.nix +++ /dev/null @@ -1,21 +0,0 @@ - -args : with args; -let version="1.18.3"; in -rec { - src = /* Here a fetchurl expression goes */ - fetchurl { - url = "mirror://sourceforge/aria2/stable/aria2-${version}.tar.bz2"; - sha256 = "0y5wv7llq5sdwrsxqkc67wzk8gpb1kl4l1c0zl6l7kr0bkidna9r"; - }; - - buildInputs = []; - configureFlags = []; - - /* doConfigure should be specified separately */ - phaseNames = ["doConfigure" "doMakeInstall"]; - - name = "aria-" + version; - meta = { - description = "Multiprotocol download manager"; - }; -} diff --git a/pkgs/tools/networking/aria2/default.nix b/pkgs/tools/networking/aria2/default.nix index 87613695be7..72f3b5ec843 100644 --- a/pkgs/tools/networking/aria2/default.nix +++ b/pkgs/tools/networking/aria2/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, openssl, libxml2, sqlite, zlib }: stdenv.mkDerivation rec { - name = "aria2-1.18.1"; + name = "aria2-1.18.5"; src = fetchurl { url = "mirror://sourceforge/aria2/stable/${name}/${name}.tar.bz2"; - sha256 = "0fwm5d0i4nr9yzckmd8yc80yj4h1acrv6jca3h1vjji0rbgk49zy"; + sha256 = "0gyfp4zw7rlaxcxhb402azazf1fi83kk3qg4w0j8d2i7pfa1zqi5"; }; buildInputs = [ pkgconfig openssl libxml2 sqlite zlib ]; diff --git a/pkgs/tools/networking/atftp/default.nix b/pkgs/tools/networking/atftp/default.nix index 2136762e6e0..225c3c04f7a 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 08805738f50..cfd72098261 100644 --- a/pkgs/tools/networking/babeld/default.nix +++ b/pkgs/tools/networking/babeld/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "babeld-1.4.3"; + name = "babeld-1.5.0"; src = fetchurl { url = "http://www.pps.univ-paris-diderot.fr/~jch/software/files/${name}.tar.gz"; - sha256 = "18qb0g7pxxgl9j0jwpyzhxk2h8bf26sk5bwmnqxv34a5f6lhzf6h"; + sha256 = "0lpm1zras74b71y01fxndrcvfjzb1ny2hh62pjw6idaqpyrp797s"; }; preBuild = '' @@ -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 00000000000..34e1a3964f6 --- /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 00000000000..a37bf2d0a56 --- /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 ac7055e20f2..1e2b39869c5 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 c6291efad31..8723c53c322 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/connman/default.nix b/pkgs/tools/networking/connman/default.nix index 9a4bab65557..c99af220a56 100644 --- a/pkgs/tools/networking/connman/default.nix +++ b/pkgs/tools/networking/connman/default.nix @@ -3,11 +3,11 @@ wpa_supplicant, readline6, pptp, ppp, tree }: stdenv.mkDerivation { - name = "connman-1.20"; + name = "connman-1.24"; src = fetchgit { url = "git://git.kernel.org/pub/scm/network/connman/connman.git"; - rev = "8047f3d051b32d38ac0b1e78296b482368728ec6"; - sha256 = "0hb03rzrspgry8z43x8x76vlq1hdq2wggkk7wbidavnqhpmz7dxz"; + rev = "11b8a873988ab5fc3f360c5b6fb25a6761fe7683"; + sha256 = "12z1krm5qnjyamc3qr2px7wvz7qkss7jk5brnmhyalqmcnkwcbrm"; }; buildInputs = [ autoconf automake libtool pkgconfig openconnect polkit diff --git a/pkgs/tools/networking/dhcpcd/check-interface.patch b/pkgs/tools/networking/dhcpcd/check-interface.patch deleted file mode 100644 index 2b732b740ad..00000000000 --- a/pkgs/tools/networking/dhcpcd/check-interface.patch +++ /dev/null @@ -1,24 +0,0 @@ -Index: dhcpcd.c -================================================================== ---- a/dhcpcd.c -+++ b/dhcpcd.c -@@ -747,14 +747,14 @@ - if (ifp->hwlen != 0) - memcpy(ifl->hwaddr, ifp->hwaddr, ifl->hwlen); - } else { - TAILQ_REMOVE(ifs, ifp, next); - TAILQ_INSERT_TAIL(ctx->ifaces, ifp, next); -- } -- if (action == 1) { -- init_state(ifp, ctx->argc, ctx->argv); -- start_interface(ifp); -+ if (action == 1) { -+ init_state(ifp, ctx->argc, ctx->argv); -+ start_interface(ifp); -+ } - } - } - - /* Free our discovered list */ - while ((ifp = TAILQ_FIRST(ifs))) { - diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix index 40f6538750f..8e93c424cb1 100644 --- a/pkgs/tools/networking/dhcpcd/default.nix +++ b/pkgs/tools/networking/dhcpcd/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, udev }: stdenv.mkDerivation rec { - name = "dhcpcd-6.3.2"; + name = "dhcpcd-6.4.2"; src = fetchurl { url = "http://roy.marples.name/downloads/dhcpcd/${name}.tar.bz2"; - sha256 = "1v2m5wdr6x5cz6i0n1y63am9dhj5j7ylrk717scjgwwjdbq1x75n"; + sha256 = "1dr08aqvazg4ncq5p93v6givwh7naj75dn2npgplf3dl2fg9zfzf"; }; - patches = [ ./lxc_ro_promote_secondaries.patch ./reload.patch ./check-interface.patch ]; + patches = [ /* ./lxc_ro_promote_secondaries.patch */ ]; buildInputs = [ pkgconfig udev ]; diff --git a/pkgs/tools/networking/dhcpcd/reload.patch b/pkgs/tools/networking/dhcpcd/reload.patch deleted file mode 100644 index 0ecb75a4476..00000000000 --- a/pkgs/tools/networking/dhcpcd/reload.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/dhcpcd.c -+++ b/dhcpcd.c -@@ -143,16 +143,18 @@ - if (ctx->ifac) { - for (ctx->ifac--; ctx->ifac >= 0; ctx->ifac--) - free(ctx->ifav[ctx->ifac]); - free(ctx->ifav); - ctx->ifav = NULL; -+ ctx->ifac = 0; - } - if (ctx->ifdc) { - for (ctx->ifdc--; ctx->ifdc >= 0; ctx->ifdc--) - free(ctx->ifdv[ctx->ifdc]); - free(ctx->ifdv); - ctx->ifdv = NULL; -+ ctx->ifdc = 0; - } - - #ifdef INET - if (ctx->dhcp_opts) { - for (opt = ctx->dhcp_opts; - diff --git a/pkgs/tools/networking/dnsmasq/default.nix b/pkgs/tools/networking/dnsmasq/default.nix index d8f62913ad5..cec4057a284 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 00e747da7c7..1f7c8a449f3 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 a47a0397bf5..d7d867cc8df 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 c9bc05658d0..f9322129612 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 e6b5cd9daab..e7aabcd9755 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 d0821a4f588..557fce6d94b 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 7af7f73aad9..29f09b8cc19 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 c2c1320988a..1418ad63385 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 99bc8488248..ce90bed3010 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 295cb0bf139..20ee6da8a30 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 ed01ccacd79..2d3ffb2cb0a 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 132d1832a9d..49753d189d6 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 ab43813f923..6be4119469e 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 25dbd634c8c..5c1910f1d6e 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 e781af7c235..5209e58ff24 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 f959ad1d573..87f0db1946b 100644 --- a/pkgs/tools/networking/mu/default.nix +++ b/pkgs/tools/networking/mu/default.nix @@ -1,19 +1,25 @@ -{ fetchurl, stdenv, sqlite, pkgconfig, xapian, glib, gmime, texinfo, emacs, guile +{ fetchurl, stdenv, sqlite, pkgconfig, autoconf, automake +, xapian, glib, gmime, texinfo , emacs, guile , gtk3, webkit, libsoup, icu, withMug ? false /* doesn't build with current gtk3 */ }: stdenv.mkDerivation rec { - version = "0.9.9.5"; + version = "0.9.9.6"; name = "mu-${version}"; src = fetchurl { - url = "https://mu0.googlecode.com/files/mu-${version}.tar.gz"; - sha256 = "1hwkliyb8fjrz5sw9fcisssig0jkdxzhccw0ld0l9a10q1l9mqhp"; + url = "https://github.com/djcb/mu/archive/v${version}.tar.gz"; + sha256 = "1jr9ss29yi6d62hd4ap07p2abgf12hwqfhasv3gwdkrx8dzwmr2a"; }; buildInputs = - [ sqlite pkgconfig xapian glib gmime texinfo emacs guile libsoup icu ] + [ sqlite pkgconfig autoconf automake xapian + glib gmime texinfo emacs guile libsoup icu ] ++ stdenv.lib.optional withMug [ gtk3 webkit ]; + preConfigure = '' + autoreconf -i + ''; + preBuild = '' # Fix mu4e-builddir (set it to $out) substituteInPlace mu4e/mu4e-meta.el.in \ @@ -32,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 b2943eb2ace..dffafe5c816 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 16b8a1159b6..5752ff2a63c 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/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix index 352a908c1d7..850981c5d33 100644 --- a/pkgs/tools/networking/network-manager-applet/default.nix +++ b/pkgs/tools/networking/network-manager-applet/default.nix @@ -2,7 +2,7 @@ , libnotify, libsecret, dbus_glib, polkit, isocodes, libgnome_keyring , mobile_broadband_provider_info, glib_networking, gsettings_desktop_schemas , makeWrapper, networkmanager_openvpn, networkmanager_vpnc -, networkmanager_openconnect, networkmanager_pptp, udev, hicolor_icon_theme }: +, networkmanager_openconnect, networkmanager_pptp, udev, hicolor_icon_theme, dconf }: let pn = "network-manager-applet"; @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { preFixup = '' wrapProgram "$out/bin/nm-applet" \ - --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules" \ + --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules:${dconf}/lib/gio/modules" \ --prefix XDG_DATA_DIRS : "${gnome3.gtk}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \ --set GCONF_CONFIG_SOURCE "xml::~/.gconf" \ --prefix PATH ":" "${gnome3.gconf}/bin" diff --git a/pkgs/tools/networking/ngrep/default.nix b/pkgs/tools/networking/ngrep/default.nix index 361d44eaca7..5c7840034b7 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 7ef5eb17dc1..b3d4ec95e06 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 d5fa2deb68d..11e67ae6333 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 c5386553f4f..ec14b8ee99a 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 98a76dc98b1..b81c46c0b61 100644 --- a/pkgs/tools/networking/openresolv/default.nix +++ b/pkgs/tools/networking/openresolv/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, makeWrapper, coreutils }: stdenv.mkDerivation rec { - name = "openresolv-3.5.6"; + name = "openresolv-3.5.7"; src = fetchurl { url = "http://roy.marples.name/downloads/openresolv/${name}.tar.bz2"; - sha256 = "1n3cw1vbm7mh5d95ykhzdn2mrrf3pm65sp61p8iwydz1gqkp2inv"; + sha256 = "14n51wqnh49zdvx11l79s3fh1jhg7kg9cfny5vk7zsix78spmyx7"; }; buildInputs = [ makeWrapper ]; @@ -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 ea94560219f..fec6679a14b 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 f06a36a96f5..591bf26ff0b 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 ac848b5d72e..45a73924758 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 835744c6000..8c707e2fcc7 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 6058639e412..40d57cd65b6 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 7a5b6b6c440..fa3fc4472f3 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/plasma-nm/default.nix b/pkgs/tools/networking/plasma-nm/default.nix new file mode 100644 index 00000000000..42c5ab3973a --- /dev/null +++ b/pkgs/tools/networking/plasma-nm/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, pkgconfig, cmake, gettext, kdelibs, networkmanager, libnm-qt }: + +let + pname = "plasma-nm"; + version = "0.9.3.3"; + name = "${pname}-${version}"; +in +stdenv.mkDerivation { + inherit name; + + src = fetchurl { + url = "mirror://kde/unstable/${pname}/${name}.tar.xz"; + sha256 = "099cbe86eb989c4fda8cdcc0f8721dc3350cc6735c3f50bcdd94661e5930e326"; + }; + + buildInputs = [ + cmake + pkgconfig + gettext + kdelibs + networkmanager + libnm-qt + ]; + + meta = with stdenv.lib; { + homepage = "https://projects.kde.org/projects/kde/workspace/plasma-nm"; + description = "Plasma applet written in QML for managing network connections"; + license = licenses.lgpl21; + inherit (kdelibs.meta) platforms; + maintainers = [ maintainers.jgeerds ]; + }; +} diff --git a/pkgs/tools/networking/proxychains/default.nix b/pkgs/tools/networking/proxychains/default.nix index 6778cf94907..2835c9016ab 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 63919edd505..e2da224cfdc 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 a057985b48c..afce95fbd44 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 48788d36884..8390c70a4d3 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/siege/default.nix b/pkgs/tools/networking/siege/default.nix index fee3db878ac..c88557262b2 100644 --- a/pkgs/tools/networking/siege/default.nix +++ b/pkgs/tools/networking/siege/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, openssl }: stdenv.mkDerivation rec { name = "siege-3.0.6"; @@ -10,6 +10,8 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; + configureFlags = [ "--with-ssl=${openssl}" ]; + meta = with stdenv.lib; { description = "HTTP load tester"; maintainers = with maintainers; [ ocharles raskin ]; diff --git a/pkgs/tools/networking/smbldaptools/default.nix b/pkgs/tools/networking/smbldaptools/default.nix index 74e8a530560..af1849565fe 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 74b9b1bdf6a..fbd24946381 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 bf0c2f80694..3e8f3ca3dc5 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 00000000000..0bcd35b21ef --- /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 88ee926e406..b12ce573d1c 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 54390d4f9ee..1da9ca96984 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 8619cd95409..1386f7133e5 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 3f3a0dc8993..e32ee43113e 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 837ab3627fa..4f8717e9a11 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 c8698215525..6ff5439c4bc 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 16853cab7fc..3d7b2d72d71 100644 --- a/pkgs/tools/package-management/cabal-install/0.10.2.nix +++ b/pkgs/tools/package-management/cabal-install/0.10.2.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, Cabal, filepath, HTTP, network, random, time, zlib }: cabal.mkDerivation (self: { @@ -12,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 15fe5f1e22c..c5a67e61999 100644 --- a/pkgs/tools/package-management/cabal-install/0.14.0.nix +++ b/pkgs/tools/package-management/cabal-install/0.14.0.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, Cabal, filepath, HTTP, mtl, network, random, time, zlib }: cabal.mkDerivation (self: { @@ -18,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 140c3628405..3c79857f6e7 100644 --- a/pkgs/tools/package-management/cabal-install/0.6.2.nix +++ b/pkgs/tools/package-management/cabal-install/0.6.2.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, Cabal, filepath, HTTP, network, random, zlib }: cabal.mkDerivation (self: { @@ -12,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 ed84d069d10..d27fbbca7d4 100644 --- a/pkgs/tools/package-management/cabal-install/0.8.0.nix +++ b/pkgs/tools/package-management/cabal-install/0.8.0.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, Cabal, filepath, HTTP, network, random, time, zlib }: cabal.mkDerivation (self: { @@ -12,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 a53460b6319..6f8881b504b 100644 --- a/pkgs/tools/package-management/cabal-install/0.8.2.nix +++ b/pkgs/tools/package-management/cabal-install/0.8.2.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, Cabal, filepath, HTTP, network, random, time, zlib }: cabal.mkDerivation (self: { @@ -12,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 8f28f57c18f..84dc12d3145 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 @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, Cabal, filepath, HTTP, mtl, network, random, time, zlib }: cabal.mkDerivation (self: { @@ -18,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 041cc471cab..52db3a6faf4 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 @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, Cabal, filepath, HTTP, HUnit, mtl, network, QuickCheck , random, stm, testFramework, testFrameworkHunit , testFrameworkQuickcheck2, time, zlib @@ -25,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/cabal-install/1.20.0.2.nix b/pkgs/tools/package-management/cabal-install/1.20.0.3.nix similarity index 84% rename from pkgs/tools/package-management/cabal-install/1.20.0.2.nix rename to pkgs/tools/package-management/cabal-install/1.20.0.3.nix index dba92ab9321..8c136dc9dbb 100644 --- a/pkgs/tools/package-management/cabal-install/1.20.0.2.nix +++ b/pkgs/tools/package-management/cabal-install/1.20.0.3.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, Cabal, filepath, HTTP, HUnit, mtl, network, QuickCheck , random, stm, testFramework, testFrameworkHunit , testFrameworkQuickcheck2, time, zlib @@ -5,8 +7,8 @@ cabal.mkDerivation (self: { pname = "cabal-install"; - version = "1.20.0.2"; - sha256 = "1nsc8qklhlg2xpaj7k158gg45rlrp7mn15zyfsgjpaqf3rjm9dl4"; + version = "1.20.0.3"; + sha256 = "050b9dc4khfc1fs283p1635zni25z4b55gi5ffwvg4mfpkrmdgfj"; isLibrary = false; isExecutable = true; buildDepends = [ diff --git a/pkgs/tools/package-management/disnix/DisnixWebService/default.nix b/pkgs/tools/package-management/disnix/DisnixWebService/default.nix index 381cb21ec1b..291f7e36ce0 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 d89ab7667e8..61e998fd545 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 7420353499f..65ae91f6e18 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 d2f3ae6468c..a1914224dbd 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 7c4a098cad8..b4b3c98505e 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 16a276273cc..b2e86935b50 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 f61b9eb818a..afcceb30474 100644 --- a/pkgs/tools/package-management/nix/unstable.nix +++ b/pkgs/tools/package-management/nix/unstable.nix @@ -5,16 +5,18 @@ }: stdenv.mkDerivation rec { - name = "nix-1.8pre3636_9d0709e"; + name = "nix-1.8pre3718_51485dc"; src = fetchurl { - url = "http://hydra.nixos.org/build/11854244/download/5/${name}.tar.xz"; - sha256 = "13h32d4nbkhvxhj9nyamxf6mfsi7mzvjz1bhyy63088vx468nhmm"; + url = "http://hydra.nixos.org/build/13025632/download/5/${name}.tar.xz"; + sha256 = "69f3a0729b6df1adcbfc7c13df405ce7f3f7904b0cbcdd7f6ad3a0af45f4024c"; }; nativeBuildInputs = [ perl pkgconfig ]; - buildInputs = [ curl openssl boehmgc sqlite ]; + buildInputs = [ curl openssl sqlite ]; + + propagatedBuildInputs = [ boehmgc ]; # Note: bzip2 is not passed as a build input, because the unpack phase # would end up using the wrong bzip2 when cross-compiling. @@ -68,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 00000000000..93c671287d6 --- /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/package-management/opkg/default.nix b/pkgs/tools/package-management/opkg/default.nix index b0bb090b64d..6708cd1fbd1 100644 --- a/pkgs/tools/package-management/opkg/default.nix +++ b/pkgs/tools/package-management/opkg/default.nix @@ -1,10 +1,20 @@ -{stdenv, fetchurl, pkgconfig, curl, gpgme}: +{ stdenv, fetchurl, pkgconfig, curl, gpgme }: -stdenv.mkDerivation { - name = "opkg-0.1.8"; +stdenv.mkDerivation rec { + version = "0.2.2"; + name = "opkg-${version}"; src = fetchurl { - url = http://opkg.googlecode.com/files/opkg-0.1.8.tar.gz; - sha256 = "0q0w7hmc6zk7pnddamd5v8d76qnh3043lzh5np24jbb6plqbz57z"; + url = "http://downloads.yoctoproject.org/releases/opkg/opkg-${version}.tar.gz"; + sha256 = "0ax10crp2grrpl20gl5iqfw37d5qz6h790lyyv2ali45agklqmda"; }; + buildInputs = [ pkgconfig curl gpgme ]; + + meta = with stdenv.lib; { + description = "A lightweight package management system based upon ipkg"; + homepage = http://code.google.com/p/opkg/; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ pSub ]; + }; } diff --git a/pkgs/tools/security/aespipe/default.nix b/pkgs/tools/security/aespipe/default.nix index 96de0e0fbe4..dbbdb8e57a6 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 458111be400..42af2e0b57e 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 0d4841bf036..e6a63a2f288 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/ecryptfs/default.nix b/pkgs/tools/security/ecryptfs/default.nix index d1ed6f420ec..13046aa0b2d 100644 --- a/pkgs/tools/security/ecryptfs/default.nix +++ b/pkgs/tools/security/ecryptfs/default.nix @@ -1,18 +1,37 @@ -{stdenv, fetchurl, fuse, python, perl, keyutils, pam, nss, nspr}: +{ stdenv, fetchurl, pkgconfig, perl, keyutils, nss, nspr, python, pam +, intltool, makeWrapper, coreutils, gettext, cryptsetup, lvm2, rsync, which }: + stdenv.mkDerivation { - name = "ecryptfs-82"; + name = "ecryptfs-104"; src = fetchurl { - url = http://launchpad.net/ecryptfs/trunk/82/+download/ecryptfs-utils_82.orig.tar.gz; - sha256 = "1w3swispgp71prz8h56hqby2wwnvam5vllqvc69rn8cf605i69a6"; + url = http://launchpad.net/ecryptfs/trunk/104/+download/ecryptfs-utils_104.orig.tar.gz; + sha256 = "0f3lzpjw97vcdqzzgii03j3knd6pgwn1y0lpaaf46iidaiv0282a"; }; - NIX_CFLAGS_COMPILE = "-I${nspr}/include/nspr -I${nss}/include/nss"; + buildInputs = [ pkgconfig perl nss nspr python pam intltool makeWrapper ]; + propagatedBuildInputs = [ coreutils gettext cryptsetup lvm2 rsync keyutils which ]; - buildInputs = [ python perl keyutils pam nss nspr ]; + postInstall = '' + FILES="$(grep -r '/bin/sh' $out/bin | sed 's,:.*,,' | uniq)" + for file in $FILES; do + sed -i $file -e "s,\(/sbin/u\?mount.ecryptfs\(_private\)\?\),$out\1," \ + -e "s,\(/sbin/cryptsetup\),${cryptsetup}\1," \ + -e "s,\(/sbin/dmsetup\),${lvm2}\1," \ + -e 's,/sbin/\(unix_chkpwd\),\1,' + wrapProgram $file \ + --prefix PATH ":" "${coreutils}/bin" \ + --prefix PATH ":" "${gettext}/bin" \ + --prefix PATH ":" "${rsync}/bin" \ + --prefix PATH ":" "${keyutils}/bin" \ + --prefix PATH ":" "${which}/bin" \ + --prefix PATH ":" "$out/bin" + done + ''; - meta = { + meta = with stdenv.lib; { description = "Enterprise-class stacked cryptographic filesystem"; - license = "GPLv2+"; + license = licenses.gpl2Plus; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/security/fail2ban/default.nix b/pkgs/tools/security/fail2ban/default.nix index 8d6a6241ad3..6b5c69c3d2e 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 2a8531a1795..b43ea402f6d 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/default.nix b/pkgs/tools/security/gnupg/default.nix index f242c3f323a..9b8d33b6b69 100644 --- a/pkgs/tools/security/gnupg/default.nix +++ b/pkgs/tools/security/gnupg/default.nix @@ -13,11 +13,11 @@ assert useUsb -> (libusb != null); assert useCurl -> (curl != null); stdenv.mkDerivation rec { - name = "gnupg-2.0.22"; + name = "gnupg-2.0.24"; src = fetchurl { url = "mirror://gnupg/gnupg/${name}.tar.bz2"; - sha256 = "0lg210acj2rxq291q4cwamg9gx6gh2prb1xa93y5jhw5b6r0lza3"; + sha256 = "0ch2hbindk832cy7ca00a7whw84ndm0nhqrl24a5fw4ldkca2x6r"; }; buildInputs diff --git a/pkgs/tools/security/gnupg/git.nix b/pkgs/tools/security/gnupg/git.nix index 3d7db862dce..69a0a68319f 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 a25ae35b6cc..53f784396a7 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 e18b68c7593..be678b18dda 100644 --- a/pkgs/tools/security/meo/default.nix +++ b/pkgs/tools/security/meo/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { src = fetchhg { url = http://oss.stamfest.net/hg/meo; - tag = "b48e5f16cff8"; + rev = "b48e5f16cff8"; sha256 = "0ifg7y28s89i9gwda6fyj1jbrykbcvq8bf1m6rxmdcv5afi3arbq"; }; @@ -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 e2a87119dd9..97b0617d396 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 c9648fbe404..cc369835f25 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 00000000000..c3b1d64c3a3 --- /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 f9bc0171592..3b44edcf1d3 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 4d1d55244c0..038044ad681 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 e693143e4c4..2a4995f4579 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/sudo/default.nix b/pkgs/tools/security/sudo/default.nix index b4c2d7f1c1f..ab46af5a1cd 100644 --- a/pkgs/tools/security/sudo/default.nix +++ b/pkgs/tools/security/sudo/default.nix @@ -11,39 +11,43 @@ stdenv.mkDerivation rec { sha256 = "002l6h27pnhb77b65frhazbhknsxvrsnkpi43j7i0qw1lrgi7nkf"; }; - postConfigure = '' - cat >> pathnames.h <> pathnames.h <<'EOF' + #undef _PATH_MV + #define _PATH_MV "${coreutils}/bin/mv" + EOF makeFlags="install_uid=$(id -u) install_gid=$(id -g)" - installFlags="sudoers_uid=$(id -u) sudoers_gid=$(id -g) sysconfdir=$out/etc timedir=$TMPDIR/dummy" - ''; + installFlags="sudoers_uid=$(id -u) sudoers_gid=$(id -g) sysconfdir=$out/etc rundir=$TMPDIR/dummy vardir=$TMPDIR/dummy" + ''; buildInputs = [ coreutils pam groff ]; enableParallelBuilding = true; - postInstall = '' - rm $out/share/doc/sudo/ChangeLog - ''; + postInstall = + '' + rm -f $out/share/doc/sudo/ChangeLog + ''; meta = { description = "A command to run commands as root"; - longDescription = '' + longDescription = + '' Sudo (su "do") allows a system administrator to delegate authority to give certain users (or groups of users) the ability to run some (or all) commands as root or another user while providing an audit trail of the commands and their arguments. - ''; + ''; homepage = http://www.sudo.ws/; diff --git a/pkgs/tools/security/tboot/default.nix b/pkgs/tools/security/tboot/default.nix new file mode 100644 index 00000000000..1c9967edc47 --- /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.2"; + + src = fetchurl { + url = "mirror://sourceforge/tboot/${name}.tar.gz"; + sha256 = "1l9ccm7ik9fs7kzg1bjc5cjh0pcf4v0k1c84dmyr51r084i7p31m"; + }; + + 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 00000000000..a16ba9f4fba --- /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 57c4a9c5662..d71bbd891f9 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 7be7c79888e..f220a46bddc 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 0254b143edf..f8e76c4e83b 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 00000000000..c178d401154 --- /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 00000000000..95b3b6b51f7 --- /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 00000000000..774a14f72ba --- /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 00000000000..4c2af359b96 --- /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 00000000000..698beac9ffd --- /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 00000000000..6b40716120e --- /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/security/volatility/default.nix b/pkgs/tools/security/volatility/default.nix new file mode 100644 index 00000000000..41e227cee7e --- /dev/null +++ b/pkgs/tools/security/volatility/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, buildPythonPackage, pycrypto }: + +buildPythonPackage rec { + namePrefix = ""; + name = "volatility-2.3.1"; + + src = fetchurl { + url = "http://volatility.googlecode.com/files/${name}.tar.gz"; + sha256 = "bb1411fc671e0bf550a31e534fb1991b2f940f1dce1ebe4ce2fb627aec40726c"; + }; + + doCheck = false; + + propagatedBuildInputs = [ pycrypto ]; + + meta = with stdenv.lib; { + homepage = https://code.google.com/p/volatility; + description = "advanced memory forensics framework"; + maintainers = with maintainers; [ bosu ]; + license = "GPLv2+"; + }; +} diff --git a/pkgs/tools/system/acct/default.nix b/pkgs/tools/system/acct/default.nix index cd9519590cc..0bea6bec354 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 7d96092a3ce..b3d40712926 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 252400bd7f4..2964db34e12 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 9db336e9bfe..0297d680aa4 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 c76a1a13677..4210a0a04a5 100644 --- a/pkgs/tools/system/collectd/default.nix +++ b/pkgs/tools/system/collectd/default.nix @@ -1,8 +1,33 @@ -{stdenv, fetchurl }: +{ stdenv, fetchurl +# optional: +, pkgconfig ? null # most of the extra deps need pkgconfig to be found +, curl ? null +, iptables ? null +, libcredis ? null +, libdbi ? null +, libgcrypt ? null +, libmemcached ? null, cyrus_sasl ? null +, libmodbus ? null +, libnotify ? null, gdk_pixbuf ? null +, liboping ? null +, libpcap ? null +, libsigrok ? null +, libvirt ? null +, libxml2 ? null +, lm_sensors ? null +, lvm2 ? null +, mysql ? null +, postgresql ? null +, protobufc ? null +, rabbitmq-c ? null +, rrdtool ? null +, varnish ? null +, yajl ? null +}: stdenv.mkDerivation rec { name = "collectd-5.4.1"; - + src = fetchurl { url = "http://collectd.org/files/${name}.tar.bz2"; sha256 = "1q365zx6d1wyhv7n97bagfxqnqbhj2j14zz552nhmjviy8lj2ibm"; @@ -10,10 +35,21 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = "-lgcc_s"; # for pthread_cancel - meta = { + buildInputs = [ + pkgconfig curl iptables libcredis libdbi libgcrypt libmemcached cyrus_sasl + libmodbus libnotify gdk_pixbuf liboping libpcap libsigrok libvirt + lm_sensors libxml2 lvm2 mysql postgresql protobufc rabbitmq-c rrdtool + varnish yajl + ]; + + # for some reason libsigrok isn't auto-detected + configureFlags = stdenv.lib.optional (libsigrok != null) "--with-libsigrok"; + + meta = with stdenv.lib; { + description = "Daemon which collects system performance statistics periodically"; homepage = http://collectd.org; - description = "collectd is a daemon which collects system performance statistics periodically"; - platforms = stdenv.lib.platforms.linux; - license = "GPLv2"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = [ maintainers.bjornfor ]; }; } diff --git a/pkgs/tools/system/ddrescue/default.nix b/pkgs/tools/system/ddrescue/default.nix index d2ace27b1fd..e247c84dcf9 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/arbitrary-filenames.patch b/pkgs/tools/system/efibootmgr/arbitrary-filenames.patch deleted file mode 100644 index ae542ac8795..00000000000 --- a/pkgs/tools/system/efibootmgr/arbitrary-filenames.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Naur efibootmgr-0.5.4-orig/src/lib/efi.c efibootmgr-0.5.4/src/lib/efi.c ---- efibootmgr-0.5.4-orig/src/lib/efi.c 2008-01-03 15:34:01.000000000 +0100 -+++ efibootmgr-0.5.4/src/lib/efi.c 2012-03-13 22:25:51.000000000 +0100 -@@ -495,7 +495,8 @@ - int rc, edd_version=0; - uint8_t mbr_type=0, signature_type=0; - uint64_t start=0, size=0; -- efi_char16_t os_loader_path[40]; -+ efi_char16_t *os_loader_path; -+ size_t os_loader_path_size; - - memset(signature, 0, sizeof(signature)); - -@@ -535,7 +536,9 @@ - signature, - mbr_type, signature_type); - -- efichar_from_char(os_loader_path, opts.loader, sizeof(os_loader_path)); -+ os_loader_path_size = sizeof(efi_char16_t) * (1 + strlen(opts.loader) / sizeof(char)); -+ os_loader_path = malloc(os_loader_path_size); -+ efichar_from_char(os_loader_path, opts.loader, os_loader_path_size); - p += make_file_path_device_path (p, os_loader_path); - p += make_end_device_path (p); - diff --git a/pkgs/tools/system/efibootmgr/default.nix b/pkgs/tools/system/efibootmgr/default.nix index 618454d87a4..67b97ea75b1 100644 --- a/pkgs/tools/system/efibootmgr/default.nix +++ b/pkgs/tools/system/efibootmgr/default.nix @@ -1,17 +1,15 @@ -{stdenv, fetchurl, pciutils, perl, zlib}: +{ stdenv, fetchgit, perl, efivar, pciutils, zlib }: -let version = "0.5.4"; in - -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "efibootmgr-${version}"; + version = "0.7.0"; - buildInputs = [ pciutils zlib perl ]; + buildInputs = [ perl efivar pciutils zlib ]; - patches = [ ./arbitrary-filenames.patch ]; - - src = fetchurl { - url = "http://linux.dell.com/efibootmgr/permalink/efibootmgr-${version}.tar.gz"; - sha256 = "0wcfgf8x4p4xfh38m9x3njwsxibm9bhnmvpjj94lj9sk9xxa8qmm"; + src = fetchgit { + url = "git://github.com/vathpela/efibootmgr.git"; + rev = "refs/tags/${name}"; + sha256 = "1nazmqxppx2xa8clv4bjdb1b6gyyimgjdj85n2hmf1smqr8krrmz"; }; postPatch = '' @@ -19,16 +17,13 @@ stdenv.mkDerivation { --replace "/usr/bin/perl" "${perl}/bin/perl" ''; - preBuild = '' - export makeFlags="BINDIR=$out/sbin" - ''; + installFlags = [ "BINDIR=$(out)/sbin" ]; - meta = { + meta = with stdenv.lib; { description = "A Linux user-space application to modify the Intel Extensible Firmware Interface (EFI) Boot Manager"; homepage = http://linux.dell.com/efibootmgr/; - license = "GPLv2"; - maintainers = [ stdenv.lib.maintainers.shlevy ]; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl2; + maintainers = with maintainers; [ shlevy ]; + platforms = platforms.linux; }; } - diff --git a/pkgs/tools/system/efivar/default.nix b/pkgs/tools/system/efivar/default.nix new file mode 100644 index 00000000000..618623146ba --- /dev/null +++ b/pkgs/tools/system/efivar/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchgit, popt }: + +stdenv.mkDerivation rec { + name = "efivar-${version}"; + version = "0.10"; + + src = fetchgit { + url = "git://github.com/vathpela/efivar.git"; + rev = "refs/tags/${version}"; + sha256 = "04fznbmrf860b4d4i8rshx3mgwbx06v187wf1rddvxxnpkq8920w"; + }; + + buildInputs = [ popt ]; + + installFlags = [ + "libdir=$(out)/lib" + "mandir=$(out)/share/man" + "includedir=$(out)/include" + "bindir=$(out)/bin" + ]; + + meta = with stdenv.lib; { + homepage = http://github.com/vathpela/efivar; + description = "Tools and library to manipulate EFI variables"; + platforms = platforms.linux; + license = licenses.lgpl21; + }; +} diff --git a/pkgs/tools/system/evemu/default.nix b/pkgs/tools/system/evemu/default.nix new file mode 100644 index 00000000000..90833b83683 --- /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 1bf18ed867c..9764ae6ce0e 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 5a70843ff6b..f546cd8f5ff 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 e72497cf7c4..9a4ac260ecc 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 b4ddca4371e..c408c0f34ea 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 2bfa77164b8..21a67dba305 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 93dfab9a1a4..0fe4cbc986c 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 ab682c60921..ea121b0e43c 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 1325b52b380..d1631776d39 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 208ff837b34..88c9a4eecd1 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 b6234009602..964ee217108 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 2b4f28fa868..4bf95895996 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 8e4848f2db6..41a94ff2f2e 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 97020ce2e42..d18c2737854 100644 --- a/pkgs/tools/system/rsyslog/default.nix +++ b/pkgs/tools/system/rsyslog/default.nix @@ -1,14 +1,14 @@ -{stdenv, fetchurl, eventlog, pkgconfig, libestr, libee, json_c, libuuid, zlib, gnutls, libgcrypt, systemd}: +{stdenv, fetchurl, eventlog, pkgconfig, libestr, libee, json_c, libuuid, zlib, gnutls, libgcrypt, systemd, liblogging}: stdenv.mkDerivation { - name = "rsyslog-7.4.7"; + name = "rsyslog-7.6.3"; src = fetchurl { - url = http://www.rsyslog.com/files/download/rsyslog/rsyslog-7.4.7.tar.gz; - sha256 = "5fc7f930fa748bb6a9d86a3fc831eb1a14107db81b67d79ba8f113cf2776fa21"; + url = http://www.rsyslog.com/files/download/rsyslog/rsyslog-7.6.3.tar.gz; + sha256 = "1v7mi2jjyn3awrfxqvd3mg64m5r027dgpbzd511mlvlbbw1mjcq1"; }; - buildInputs = [pkgconfig libestr libee json_c libuuid zlib gnutls libgcrypt systemd]; + buildInputs = [pkgconfig libestr libee json_c libuuid zlib gnutls libgcrypt systemd liblogging]; preConfigure = '' export configureFlags="$configureFlags --enable-gnutls --enable-cached-man-pages --enable-imjournal --with-systemdsystemunitdir=$out/etc/systemd/system" @@ -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 a6a5fced879..304d8f21eb2 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 9be2a709af5..a20a40f701c 100644 --- a/pkgs/tools/system/sizes/default.nix +++ b/pkgs/tools/system/sizes/default.nix @@ -1,11 +1,13 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, cmdargs, deepseq, dlist, lens, parallelIo, regexPosix , systemFileio, systemFilepath, text }: 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 c46372bcd4b..041dd96e1ca 100644 --- a/pkgs/tools/system/storebrowse/default.nix +++ b/pkgs/tools/system/storebrowse/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { # This source has license BSD srcGoSqlite = fetchhg { url = "https://code.google.com/p/gosqlite/"; - tag = "5baefb109e18"; + rev = "5baefb109e18"; sha256 = "0mqfnx06jj15cs8pq9msny2z18x99hgk6mchnaxpg343nzdiz4zk"; }; @@ -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/symlinks/default.nix b/pkgs/tools/system/symlinks/default.nix new file mode 100644 index 00000000000..0c69bdd03c5 --- /dev/null +++ b/pkgs/tools/system/symlinks/default.nix @@ -0,0 +1,27 @@ +{ fetchurl, stdenv }: + +stdenv.mkDerivation rec { + name = "symlinks-${version}"; + version = "1.4"; + + src = fetchurl { + url = "http://www.ibiblio.org/pub/Linux/utils/file/${name}.tar.gz"; + sha256 = "1683psyi8jwq6anhnkwwyaf7pfksf19v04fignd6vi52s2fnifxh"; + }; + + installPhase = '' + mkdir -p $out/bin + mkdir -p $out/share/man + cp symlinks $out/bin/ + cp symlinks.8 $out/share/man/ + ''; + + # No license is mentioned in the code but + # http://www.ibiblio.org/pub/Linux/utils/file/symlinks.lsm + # and other package managers list it as + # "(c) Mark Lord, freely distributable" + meta = with stdenv.lib; { + description = "A symbolic link maintenance utility"; + maintainers = [ maintainers.goibhniu ]; + }; +} diff --git a/pkgs/tools/system/syslog-ng-incubator/default.nix b/pkgs/tools/system/syslog-ng-incubator/default.nix new file mode 100644 index 00000000000..34a0f15ec1d --- /dev/null +++ b/pkgs/tools/system/syslog-ng-incubator/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, glib, syslogng +, eventlog, perl, python, yacc, riemann_c_client, libivykis, protobufc }: + +stdenv.mkDerivation rec { + name = "syslog-ng-incubator-${version}"; + + version = "0.3.3"; + + src = fetchurl { + url = "https://github.com/balabit/syslog-ng-incubator/archive/${name}.tar.gz"; + sha256 = "1yx2gdq1vhrcp113hxgl66z5df4ya9nznvq00nvy4v9yn8wf9fb8"; + }; + + buildInputs = [ + autoconf automake libtool pkgconfig glib syslogng eventlog perl python + yacc riemann_c_client libivykis protobufc + ]; + + preConfigure = "autoreconf -i"; + + configureFlags = [ + "--without-ivykis" + "--with-riemann" + "--with-module-dir=$(out)/lib/syslog-ng" + ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/balabit/syslog-ng-incubator"; + description = "A collection of tools and modules for syslog-ng"; + license = licenses.gpl2; + maintainers = [ maintainers.rickynils ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/system/syslog-ng/default.nix b/pkgs/tools/system/syslog-ng/default.nix index 9102482d3d6..a62f81052ba 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 afb6073b539..e108589aaef 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 e1c4734bbda..087a3212fc2 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 e056af26877..2865e5b3482 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 05494e54a3e..aaa458b05cb 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 dc61723e597..a87901eb5eb 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 23223572bb2..14014d06052 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 7bb7060d5c2..fe11ec59246 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 b231f2875c0..8866888a736 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 bdf19161e43..6e83bd357b2 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 1ad40a4a5fa..7b38227cfcc 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 cf30169acef..b1c5910029d 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 f4d3169f2fa..97cc3c61173 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 ea06a625550..247cb67da56 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 52781ed3792..eeac7b7f63f 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 551d0b9f74a..97fcd062984 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 dbf13a6332b..d0e39add665 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 45dcf922d8e..3abe03b2a4e 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 6dab8f86c32..0f5032c4a17 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 fe3e3b7317d..b3e5f12407d 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 3c77b50bee8..e73ba43791a 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 fb3856176d9..b03b1b110c4 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 21024c4aaad..fba52b69fba 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 00000000000..be49ba50920 --- /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 7c76c7f1bca..a2d6e360a37 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 fc7ee9f6f06..a2920345afa 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 e30567000dd..59b9b7bc13d 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 21a866cf87e..a7d1ddb0f3b 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 c81e02b4399..9e62b2b3d59 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 3981f67aefb..e6fc3510cd4 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 b8f2f4696ae..fd5a5dc5f8e 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 ee66cf92377..6ec9758ed3a 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 db7ebfbb77a..aea3ab2bd96 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/asciidoc/default.nix b/pkgs/tools/typesetting/asciidoc/default.nix index fd7551e234e..370f0efb32a 100644 --- a/pkgs/tools/typesetting/asciidoc/default.nix +++ b/pkgs/tools/typesetting/asciidoc/default.nix @@ -22,6 +22,10 @@ , gnused ? null , coreutils ? null +# if true, enable all the below filters and backends +, enableExtraPlugins ? false + +# unzip is needed to extract filter and backend plugins , unzip ? null # filters , enableDitaaFilter ? false, jre ? null @@ -58,17 +62,26 @@ assert enableStandardFeatures -> coreutils != null; # filters -assert (enableDitaaFilter || enableMscgenFilter || enableDiagFilter || enableQrcodeFilter || enableAafigureFilter) -> unzip != null; -assert enableDitaaFilter -> jre != null; -assert enableMscgenFilter -> mscgen != null; -assert enableDiagFilter -> blockdiag != null && seqdiag != null && actdiag != null && nwdiag != null; -assert enableMatplotlibFilter -> matplotlib != null && numpy != null; -assert enableAafigureFilter -> aafigure != null && recursivePthLoader != null; +assert enableExtraPlugins || enableDitaaFilter || enableMscgenFilter || enableDiagFilter || enableQrcodeFilter || enableAafigureFilter -> unzip != null; +assert enableExtraPlugins || enableDitaaFilter -> jre != null; +assert enableExtraPlugins || enableMscgenFilter -> mscgen != null; +assert enableExtraPlugins || enableDiagFilter -> blockdiag != null && seqdiag != null && actdiag != null && nwdiag != null; +assert enableExtraPlugins || enableMatplotlibFilter -> matplotlib != null && numpy != null; +assert enableExtraPlugins || enableAafigureFilter -> aafigure != null && recursivePthLoader != null; # backends -assert (enableDeckjsBackend || enableOdfBackend) -> unzip != null; +assert enableExtraPlugins || enableDeckjsBackend || enableOdfBackend -> unzip != null; let + _enableDitaaFilter = enableExtraPlugins || enableDitaaFilter; + _enableMscgenFilter = enableExtraPlugins || enableMscgenFilter; + _enableDiagFilter = enableExtraPlugins || enableDiagFilter; + _enableQrcodeFilter = enableExtraPlugins || enableQrcodeFilter; + _enableMatplotlibFilter = enableExtraPlugins || enableMatplotlibFilter; + _enableAafigureFilter = enableExtraPlugins || enableAafigureFilter; + _enableDeckjsBackend = enableExtraPlugins || enableDeckjsBackend; + _enableOdfBackend = enableExtraPlugins || enableOdfBackend; + # # filters # @@ -141,17 +154,17 @@ stdenv.mkDerivation rec { patchPhase = with stdenv.lib; '' mkdir -p "$out/etc/asciidoc/filters" mkdir -p "$out/etc/asciidoc/backends" - '' + optionalString enableDitaaFilter '' + '' + optionalString _enableDitaaFilter '' echo "Extracting ditaa filter" unzip -d "$out/etc/asciidoc/filters/ditaa" "${ditaaFilterSrc}" sed -i -e "s|java -jar|${jre}/bin/java -jar|" \ "$out/etc/asciidoc/filters/ditaa/ditaa2img.py" - '' + optionalString enableMscgenFilter '' + '' + optionalString _enableMscgenFilter '' echo "Extracting mscgen filter" unzip -d "$out/etc/asciidoc/filters/mscgen" "${mscgenFilterSrc}" sed -i -e "s|filter-wrapper.py mscgen|filter-wrapper.py ${mscgen}/bin/mscgen|" \ "$out/etc/asciidoc/filters/mscgen/mscgen-filter.conf" - '' + optionalString enableDiagFilter '' + '' + optionalString _enableDiagFilter '' echo "Extracting diag filter" unzip -d "$out/etc/asciidoc/filters/diag" "${diagFilterSrc}" sed -i \ @@ -161,12 +174,12 @@ stdenv.mkDerivation rec { -e "s|filter='nwdiag|filter=\'${nwdiag}/bin/nwdiag|" \ -e "s|filter='packetdiag|filter=\'${nwdiag}/bin/packetdiag|" \ "$out/etc/asciidoc/filters/diag/diag-filter.conf" - '' + optionalString enableQrcodeFilter '' + '' + optionalString _enableQrcodeFilter '' echo "Extracting qrcode filter" unzip -d "$out/etc/asciidoc/filters/qrcode" "${qrcodeFilterSrc}" sed -i -e "s|systemcmd('qrencode|systemcmd('${qrencode}/bin/qrencode|" \ "$out/etc/asciidoc/filters/qrcode/qrcode2img.py" - '' + optionalString enableMatplotlibFilter '' + '' + optionalString _enableMatplotlibFilter '' echo "Extracting mpl (matplotlib) filter" mkdir -p "$out/etc/asciidoc/filters/mpl" tar xvf "${matplotlibFilterSrc}" -C "$out/etc/asciidoc/filters/mpl" --strip-components=1 @@ -177,7 +190,7 @@ stdenv.mkDerivation rec { numpy_path="$(toPythonPath ${numpy})" sed -i "/^import.*sys/asys.path.append(\"$matplotlib_path\"); sys.path.append(\"$numpy_path\");" \ "$out/etc/asciidoc/filters/mpl/mplw.py" - '' + optionalString enableAafigureFilter '' + '' + optionalString _enableAafigureFilter '' echo "Extracting aafigure filter" unzip -d "$out/etc/asciidoc/filters/aafigure" "${aafigureFilterSrc}" # Add aafigure to sys.path (and it needs recursive-pth-loader) @@ -185,10 +198,10 @@ stdenv.mkDerivation rec { aafigure_path="$(toPythonPath ${aafigure})" sed -i "/^import.*sys/asys.path.append(\"$pth_loader_path\"); sys.path.append(\"$aafigure_path\"); import sitecustomize" \ "$out/etc/asciidoc/filters/aafigure/aafig2img.py" - '' + optionalString enableDeckjsBackend '' + '' + optionalString _enableDeckjsBackend '' echo "Extracting deckjs backend" unzip -d "$out/etc/asciidoc/backends/deckjs" "${deckjsBackendSrc}" - '' + optionalString enableOdfBackend '' + '' + optionalString _enableOdfBackend '' echo "Extracting odf backend (odt + odp)" unzip -d "$out/etc/asciidoc/backends/odt" "${odtBackendSrc}" unzip -d "$out/etc/asciidoc/backends/odp" "${odpBackendSrc}" @@ -244,7 +257,7 @@ stdenv.mkDerivation rec { preInstall = "mkdir -p $out/etc/vim"; meta = with stdenv.lib; { - description = "Text-based document generation system ${stdenv.lib.optionalString enableStandardFeatures "(full version)"}"; + description = "Text-based document generation system"; longDescription = '' AsciiDoc is a text document format for writing notes, documentation, articles, books, ebooks, slideshows, web pages, man pages and blogs. diff --git a/pkgs/tools/typesetting/djvu2pdf/default.nix b/pkgs/tools/typesetting/djvu2pdf/default.nix index c7729ac676f..5455df5f106 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 d7d3f6f92a2..78dac0c6aa4 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 5a2c5fb2e06..48d1ebfc276 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 ade7fd202d5..35e609b440a 100644 --- a/pkgs/tools/typesetting/lhs2tex/default.nix +++ b/pkgs/tools/typesetting/lhs2tex/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, filepath, mtl, regexCompat, texLive }: cabal.mkDerivation (self: { @@ -16,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 61e94d4d618..c0fc4336297 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/pdfgrep/default.nix b/pkgs/tools/typesetting/pdfgrep/default.nix new file mode 100644 index 00000000000..e05e4d16a06 --- /dev/null +++ b/pkgs/tools/typesetting/pdfgrep/default.nix @@ -0,0 +1,32 @@ +{ fetchurl, stdenv, pkgconfig, poppler, poppler_data, makeWrapper }: + +stdenv.mkDerivation rec { + name = "pdfgrep-${version}"; + version = "1.3.1"; + + src = fetchurl { + url = "http://downloads.sourceforge.net/project/pdfgrep/${version}/${name}.tar.gz"; + sha256 = "6e8bcaf8b219e1ad733c97257a97286a94124694958c27506b2ea7fc8e532437"; + }; + + buildInputs = [ pkgconfig poppler poppler_data makeWrapper ]; + + patchPhase = '' + sed -i -e "s%cpp/poppler-document.h%poppler/cpp/poppler-document.h%" pdfgrep.cc + sed -i -e "s%cpp/poppler-page.h%poppler/cpp/poppler-page.h%" pdfgrep.cc + ''; + + # workarround since it can't be hardcoded in pdfgrep + preFixup = '' + wrapProgram "$out/bin/pdfgrep" \ + --set POPPLER_DATADIR "${poppler_data}/share/poppler" + ''; + + meta = { + description = "a tool to search text in PDF files"; + homepage = http://pdfgrep.sourceforge.net/; + license = "free"; + maintainers = with stdenv.lib.maintainers; [qknight]; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/tools/typesetting/pdftk/default.nix b/pkgs/tools/typesetting/pdftk/default.nix index 28a43e69598..c71bc3ba77c 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 054632533a1..8344735606c 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 6993158291c..a68ab2d01b9 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 bc47244a5fa..67739350c6f 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 f903ef5792f..69d02a275b3 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 b9e71a7cde2..b5589cf943b 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.20140528"; + texmfVersion = "2014.20140717"; texmfSrc = fetchurl { url = "mirror://debian/pool/main/t/texlive-base/texlive-base_${texmfVersion}.orig.tar.xz"; - sha256 = "09z3jp5if0llszm02x3f93izrspjh14g77034c677r0sj4xrb63w"; + sha256 = "08vhl6x742r8fl0gags2r6yspz8ynvz26vdjrqb4vyz5h7h3rzc9"; }; - langTexmfVersion = "2014.20140528"; + langTexmfVersion = "2014.20140717"; langTexmfSrc = fetchurl { url = "mirror://debian/pool/main/t/texlive-lang/texlive-lang_${langTexmfVersion}.orig.tar.xz"; - sha256 = "0c7rppqya74g8fb431i3bbga88xzjiarj540fcn34plar5wz4k31"; + sha256 = "1x9aa3v2cg4lcb58lwksnfdsgrhi0sg968pjqsbndmbxhr1msbp7"; }; passthru = { inherit texmfSrc langTexmfSrc; }; @@ -33,6 +33,9 @@ rec { sed -e s@/usr/bin/@@g -i $(grep /usr/bin/ -rl . ) + sed -e 's@dehypht-x-2013-05-26@dehypht-x-2014-05-21@' -i $(grep 'dehypht-x' -rl $out ) + sed -e 's@dehyphn-x-2013-05-26@dehyphn-x-2014-05-21@' -i $(grep 'dehyphn-x' -rl $out ) + sed -e 's@\).success - then builtins.toString - else null; - GIT_SSH = pkgs.writeScript "fetchgit-ssh" '' - #! ${pkgs.stdenv.shell} - exec -a ssh ${pkgs.openssh}/bin/ssh -F ${let - sshConfigFile = if (builtins.tryEval ).success - then - else builtins.trace '' - Please set your nix-path such that ssh-config-file points to a file that will allow ssh to access private repositories. The builder will not be able to see any running ssh agent sessions unless ssh-auth-sock is also set in the nix-path. - - Note that the config file and any keys it points to must be readable by the build user, which depending on your nix configuration means making it readable by the build-users-group, the user of the running nix-daemon, or the user calling the nix command which started the build. Similarly, if using an ssh agent ssh-auth-sock must point to a socket the build user can access. - - You may need StrictHostKeyChecking=no in the config file. Since ssh will refuse to use a group-readable private key, if using build-users you will likely want to use something like IdentityFile /some/directory/%u/key and have a directory for each build user accessible to that user. - '' "/var/lib/empty/config"; - in builtins.toString sshConfigFile} "$@" - ''; - }); + fetchgitPrivate = import ../build-support/fetchgit/private.nix { + inherit fetchgit writeScript openssh stdenv; + }; fetchgitrevision = import ../build-support/fetchgitrevision runCommand git; @@ -548,9 +526,8 @@ let inherit (androidenv) androidsdk_4_1; - aria = builderDefsPackage (import ../tools/networking/aria) { }; - aria2 = callPackage ../tools/networking/aria2 { }; + aria = aria2; at = callPackage ../tools/system/at { }; @@ -594,6 +571,10 @@ let bfr = callPackage ../tools/misc/bfr { }; + bindfs = callPackage ../tools/filesystems/bindfs { }; + + bitbucket-cli = pythonPackages.bitbucket-cli; + blockdiag = pythonPackages.blockdiag; bmon = callPackage ../tools/misc/bmon { }; @@ -627,6 +608,10 @@ let consul = callPackage ../servers/consul { }; consul_ui = callPackage ../servers/consul/ui.nix { }; + cv = callPackage ../tools/misc/cv { }; + + crawl = callPackage ../games/crawl { lua = lua5; }; + ditaa = callPackage ../tools/graphics/ditaa { }; direnv = callPackage ../tools/misc/direnv { }; @@ -651,6 +636,8 @@ let syslogng = callPackage ../tools/system/syslog-ng { }; + syslogng_incubator = callPackage ../tools/system/syslog-ng-incubator { }; + rsyslog = callPackage ../tools/system/rsyslog { }; mcrypt = callPackage ../tools/misc/mcrypt { }; @@ -712,6 +699,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; @@ -726,6 +717,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 { }; @@ -740,6 +733,8 @@ let cdrkit = callPackage ../tools/cd-dvd/cdrkit { }; + ceph = callPackage ../tools/filesystems/ceph { }; + cfdg = builderDefsPackage ../tools/graphics/cfdg { inherit libpng bison flex ffmpeg; }; @@ -960,20 +955,23 @@ let efibootmgr = callPackage ../tools/system/efibootmgr { }; + 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 { }; @@ -985,6 +983,8 @@ let exempi = callPackage ../development/libraries/exempi { }; + exercism = callPackage ../development/tools/exercism { }; + exif = callPackage ../tools/graphics/exif { }; exiftags = callPackage ../tools/graphics/exiftags { }; @@ -997,7 +997,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 { }; @@ -1096,6 +1100,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 { }; @@ -1112,6 +1120,8 @@ let glusterfs = callPackage ../tools/filesystems/glusterfs { }; + glmark2 = callPackage ../tools/graphics/glmark2 { }; + glxinfo = callPackage ../tools/graphics/glxinfo { }; gmvault = callPackage ../tools/networking/gmvault { }; @@ -1147,16 +1157,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; }; @@ -1173,6 +1176,8 @@ let gource = callPackage ../applications/version-management/gource {}; + gpodder = callPackage ../applications/audio/gpodder { }; + gptfdisk = callPackage ../tools/system/gptfdisk { }; grafana = callPackage ../development/tools/misc/grafana { }; @@ -1353,6 +1358,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 { }; @@ -1405,6 +1412,8 @@ let libestr = callPackage ../development/libraries/libestr { }; + libevdev = callPackage ../development/libraries/libevdev { }; + liboauth = callPackage ../development/libraries/liboauth { }; libtirpc = callPackage ../development/libraries/ti-rpc { }; @@ -1608,7 +1617,7 @@ let networkmanager_openconnect = callPackage ../tools/networking/network-manager/openconnect.nix { }; - networkmanagerapplet = newScope gnome ../tools/networking/network-manager-applet { }; + networkmanagerapplet = newScope gnome ../tools/networking/network-manager-applet { dconf = gnome3.dconf; }; newsbeuter = callPackage ../applications/networking/feedreaders/newsbeuter { }; @@ -1643,6 +1652,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 { }; @@ -1700,6 +1714,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 { }; @@ -1802,6 +1822,8 @@ let pdnsd = callPackage ../tools/networking/pdnsd { }; + peco = callPackage ../tools/text/peco { }; + pg_top = callPackage ../tools/misc/pg_top { }; pdsh = callPackage ../tools/networking/pdsh { @@ -1905,6 +1927,8 @@ let qshowdiff = callPackage ../tools/text/qshowdiff { }; + quilt = callPackage ../development/tools/quilt { }; + radvd = callPackage ../tools/networking/radvd { }; ranger = callPackage ../applications/misc/ranger { }; @@ -1943,6 +1967,8 @@ let rdmd = callPackage ../development/compilers/rdmd { }; + riemann_c_client = callPackage ../tools/misc/riemann-c-client { }; + ripmime = callPackage ../tools/networking/ripmime {}; rkflashtool = callPackage ../tools/misc/rkflashtool { }; @@ -2003,6 +2029,8 @@ let sdcv = callPackage ../applications/misc/sdcv { }; + sec = callPackage ../tools/admin/sec { }; + seccure = callPackage ../tools/security/seccure { }; setserial = builderDefsPackage (import ../tools/system/setserial) { @@ -2141,6 +2169,8 @@ let tcpcrypt = callPackage ../tools/security/tcpcrypt { }; + tboot = callPackage ../tools/security/tboot { }; + tcpdump = callPackage ../tools/networking/tcpdump { }; tcpflow = callPackage ../tools/networking/tcpflow { }; @@ -2180,8 +2210,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 {}; @@ -2192,6 +2228,8 @@ let ucl = callPackage ../development/libraries/ucl { }; + ucspi-tcp = callPackage ../tools/networking/ucspi-tcp { }; + udftools = callPackage ../tools/filesystems/udftools {}; udptunnel = callPackage ../tools/networking/udptunnel { }; @@ -2212,6 +2250,8 @@ let vacuum = callPackage ../applications/networking/instant-messengers/vacuum {}; + volatility = callPackage ../tools/security/volatility { }; + vidalia = callPackage ../tools/security/vidalia { }; vbetool = builderDefsPackage ../tools/system/vbetool { @@ -2256,6 +2296,8 @@ let wal_e = callPackage ../tools/backup/wal-e { }; + watchman = callPackage ../development/tools/watchman { }; + wbox = callPackage ../tools/networking/wbox {}; welkin = callPackage ../tools/graphics/welkin {}; @@ -2325,6 +2367,8 @@ let xarchiver = callPackage ../tools/archivers/xarchiver { }; + xcruiser = callPackage ../applications/misc/xcruiser { }; + unarj = callPackage ../tools/archivers/unarj { }; unshield = callPackage ../tools/archivers/unshield { }; @@ -2419,8 +2463,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 { @@ -2488,7 +2536,9 @@ let dash = callPackage ../shells/dash { }; - fish = callPackage ../shells/fish { }; + fish = callPackage ../shells/fish { + python = python27Full; + }; tcsh = callPackage ../shells/tcsh { }; @@ -2529,8 +2579,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; @@ -2538,10 +2586,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; @@ -2567,10 +2613,10 @@ let cmucl_binary = callPackage ../development/compilers/cmucl/binary.nix { }; - compcert = callPackage_i686 ../development/compilers/compcert {}; + compcert = callPackage ../development/compilers/compcert {}; cryptol1 = lowPrio (callPackage ../development/compilers/cryptol/1.8.x.nix {}); - cryptol2 = haskellPackages.cryptol; + cryptol2 = haskellPackages_ghc763.cryptol; # doesn't compile with the lastest 7.8.3 release cython = pythonPackages.cython; cython3 = python3Packages.cython; @@ -2600,22 +2646,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; @@ -2778,24 +2808,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) { @@ -2921,7 +2933,10 @@ let # Import Haskell infrastructure. - haskell = callPackage ./haskell-defaults.nix { inherit pkgs; }; + haskell = let pkgs_ = pkgs // { gmp = gmp.override { withStatic = true; }; }; + callPackage = newScope pkgs_; + newScope = extra: lib.callPackageWith (pkgs_ // pkgs_.xorg // extra); + in callPackage ./haskell-defaults.nix { pkgs = pkgs_; inherit callPackage newScope; }; # Available GHC versions. @@ -2939,7 +2954,7 @@ let builtins.substring 0 (builtins.stringLength "packages_") name == "packages_" ) haskell)); - haskellPackages = haskellPackages_ghc763; + haskellPackages = haskellPackages_ghc783; haskellPlatform = haskellPlatformPackages."2013_2_0_0"; haskellPackages_ghc6104 = haskell.packages_ghc6104; @@ -2947,15 +2962,10 @@ let haskellPackages_ghc704 = haskell.packages_ghc704; haskellPackages_ghc722 = haskell.packages_ghc722; haskellPackages_ghc742 = haskell.packages_ghc742; - # For the default version, we build profiling versions of the libraries, too. - # The following three lines achieve that: the first two make Hydra build explicit - # profiling and non-profiling versions; the final respects the user-configured - # default setting. - haskellPackages_ghc763_no_profiling = recurseIntoAttrs haskell.packages_ghc763.noProfiling; - haskellPackages_ghc763_profiling = recurseIntoAttrs haskell.packages_ghc763.profiling; - haskellPackages_ghc763 = recurseIntoAttrs haskell.packages_ghc763.highPrio; - # Reasonably current HEAD snapshot. - haskellPackages_ghc782 = haskell.packages_ghc782; + haskellPackages_ghc763 = haskell.packages_ghc763; + haskellPackages_ghc783_no_profiling = recurseIntoAttrs haskell.packages_ghc783.noProfiling; + haskellPackages_ghc783_profiling = recurseIntoAttrs haskell.packages_ghc783.profiling; + haskellPackages_ghc783 = recurseIntoAttrs haskell.packages_ghc783.highPrio; haskellPackages_ghcHEAD = haskell.packages_ghcHEAD; haskellPlatformPackages = recurseIntoAttrs (import ../development/libraries/haskell/haskell-platform { inherit pkgs; }); @@ -3036,10 +3046,14 @@ let oraclejdk7 = pkgs.oraclejdk7distro true false; + oraclejdk8 = pkgs.oraclejdk8distro true false; + oraclejre = lowPrio (pkgs.jdkdistro false false); oraclejre7 = lowPrio (pkgs.oraclejdk7distro false false); + oraclejre8 = lowPrio (pkgs.oraclejdk8distro false false); + jrePlugin = lowPrio (pkgs.jdkdistro false true); supportsJDK = @@ -3049,12 +3063,17 @@ let jdkdistro = installjdk: pluginSupport: assert supportsJDK; (if pluginSupport then appendToName "with-plugin" else x: x) - (callPackage ../development/compilers/jdk/jdk6-linux.nix { }); + (callPackage ../development/compilers/oraclejdk/jdk6-linux.nix { }); oraclejdk7distro = installjdk: pluginSupport: assert supportsJDK; (if pluginSupport then appendToName "with-plugin" else x: x) - (callPackage ../development/compilers/jdk/jdk7-linux.nix { inherit installjdk; }); + (callPackage ../development/compilers/oraclejdk/jdk7-linux.nix { inherit installjdk; }); + + oraclejdk8distro = installjdk: pluginSupport: + assert supportsJDK; + (if pluginSupport then appendToName "with-plugin" else x: x) + (callPackage ../development/compilers/oraclejdk/jdk8-linux.nix { inherit installjdk; }); jikes = callPackage ../development/compilers/jikes { }; @@ -3080,13 +3099,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 // { @@ -3176,12 +3191,18 @@ let giflib = giflib_4_1; }; + biniou = callPackage ../development/ocaml-modules/biniou { }; + ocaml_cairo = callPackage ../development/ocaml-modules/ocaml-cairo { }; + cppo = callPackage ../development/tools/ocaml/cppo { }; + cryptokit = callPackage ../development/ocaml-modules/cryptokit { }; deriving = callPackage ../development/tools/ocaml/deriving { }; + easy-format = callPackage ../development/ocaml-modules/easy-format { }; + findlib = callPackage ../development/tools/ocaml/findlib { }; dypgen = callPackage ../development/ocaml-modules/dypgen { }; @@ -3202,6 +3223,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 { }; @@ -3264,6 +3287,8 @@ let opam_1_1 = callPackage ../development/tools/ocaml/opam/1.1.nix { }; opam = opam_1_1; + yojson = callPackage ../development/ocaml-modules/yojson { }; + zarith = callPackage ../development/ocaml-modules/zarith { }; }; @@ -3277,14 +3302,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; @@ -3292,11 +3313,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 {}; - sbcl = builderDefsPackage (import ../development/compilers/sbcl) { - inherit makeWrapper; - clisp = clisp_2_44_1; + rust = rustc; + + + sbclBootstrap = callPackage ../development/compilers/sbcl/bootstrap.nix {}; + sbcl = callPackage ../development/compilers/sbcl { + clisp = clisp; }; scala_2_9 = callPackage ../development/compilers/scala/2.9.nix { }; @@ -3306,6 +3331,7 @@ let sdcc = callPackage ../development/compilers/sdcc { }; + smlnjBootstrap = callPackage ../development/compilers/smlnj/bootstrap.nix { }; smlnj = callPackage_i686 ../development/compilers/smlnj { }; stalin = callPackage ../development/compilers/stalin { }; @@ -3449,8 +3475,12 @@ let compat = true; }; lua5 = lua5_1; + lua = lua5; lua5_sockets = callPackage ../development/interpreters/lua-5/sockets.nix {}; + lua5_expat = callPackage ../development/interpreters/lua-5/expat.nix {}; + lua5_filesystem = callPackage ../development/interpreters/lua-5/filesystem.nix {}; + lua5_sec = callPackage ../development/interpreters/lua-5/sec.nix {}; luarocks = callPackage ../development/tools/misc/luarocks { lua = lua5; @@ -3465,6 +3495,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; @@ -3505,9 +3542,9 @@ let php = php54; - phpPackages = import ./php-packages.nix { + phpPackages = recurseIntoAttrs (import ./php-packages.nix { inherit php pkgs; - }; + }); php53 = callPackage ../development/interpreters/php/5.3.nix { }; @@ -3522,10 +3559,6 @@ let php54 = callPackage ../development/interpreters/php/5.4.nix { }; - php_apc = callPackage ../development/libraries/php-apc { }; - - php_xcache = callPackage ../development/libraries/php-xcache { }; - picolisp = callPackage ../development/interpreters/picolisp {}; pltScheme = racket; # just to be sure @@ -3536,17 +3569,26 @@ let llvm = llvm_33 ; }; + python = python2; + python2 = python27; + python3 = python34; + + # pythonPackages further below, but assigned here because they need to be in sync + pythonPackages = python2Packages; + python2Packages = python27Packages; + python3Packages = python34Packages; + + pythonFull = python2Full; + python2Full = python27Full; + python26 = callPackage ../development/interpreters/python/2.6 { db = db47; }; - python27 = callPackage ../development/interpreters/python/2.7 { libX11 = xlibs.libX11; }; + python27 = callPackage ../development/interpreters/python/2.7 { }; python32 = callPackage ../development/interpreters/python/3.2 { }; python33 = callPackage ../development/interpreters/python/3.3 { }; python34 = hiPrio (callPackage ../development/interpreters/python/3.4 { }); - python = python27; - python3 = python3Packages.python; pypy = callPackage ../development/interpreters/pypy/2.3 { }; - pythonFull = python27Full; python26Full = callPackage ../development/interpreters/python/wrapper.nix { extraLibs = []; postBuild = ""; @@ -3630,12 +3672,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 @@ -3691,6 +3731,8 @@ let guile-xcb = callPackage ../development/guile-modules/guile-xcb { }; + pharo-vm = callPackage_i686 ../development/pharo/vm { }; + srecord = callPackage ../development/tools/misc/srecord { }; windowssdk = ( @@ -3852,7 +3894,6 @@ let dfeet = callPackage ../development/tools/misc/d-feet { inherit (pythonPackages) pep8; - inherit (gnome3) gnome_icon_theme; }; dfu-programmer = callPackage ../development/tools/misc/dfu-programmer { }; @@ -3961,7 +4002,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 { }; @@ -3987,9 +4030,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 { }; @@ -4037,6 +4080,8 @@ let pkgconfig = forceNativeDrv (callPackage ../development/tools/misc/pkgconfig { }); pkgconfigUpstream = lowPrio (pkgconfig.override { vanilla = true; }); + prelink = callPackage ../development/tools/misc/prelink { }; + premake3 = callPackage ../development/tools/misc/premake/3.nix { }; premake4 = callPackage ../development/tools/misc/premake { }; @@ -4130,7 +4175,9 @@ let uncrustify = callPackage ../development/tools/misc/uncrustify { }; - vagrant = callPackage ../development/tools/vagrant { }; + vagrant = callPackage ../development/tools/vagrant { + ruby = ruby2; + }; gdb = callPackage ../development/tools/misc/gdb { hurd = gnu.hurdCross; @@ -4190,6 +4237,8 @@ let allegro = callPackage ../development/libraries/allegro {}; allegro5 = callPackage ../development/libraries/allegro/5.nix {}; + allegro5unstable = callPackage + ../development/libraries/allegro/5-unstable.nix {}; amrnb = callPackage ../development/libraries/amrnb { }; @@ -4219,15 +4268,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 { }; @@ -4249,6 +4298,7 @@ let boostHeaders = callPackage ../development/libraries/boost/header-only-wrapper.nix { }; botan = callPackage ../development/libraries/botan { }; + botanUnstable = callPackage ../development/libraries/botan/unstable.nix { }; box2d = callPackage ../development/libraries/box2d { }; box2d_2_0_1 = callPackage ../development/libraries/box2d/2.0.1.nix { }; @@ -4410,6 +4460,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 { }; @@ -4502,6 +4556,8 @@ let freetype = callPackage ../development/libraries/freetype { }; + frei0r = callPackage ../development/libraries/frei0r { }; + fribidi = callPackage ../development/libraries/fribidi { }; funambol = callPackage ../development/libraries/funambol { }; @@ -4623,6 +4679,15 @@ let ln -s $glibc32/lib $out/lib/32 ln -s lib $out/lib64 + # fixing ldd RLTDLIST + rm $out/bin + cp -rs $glibc64/bin $out + chmod u+w $out/bin + rm $out/bin/ldd + sed -e "s|^RTLDLIST=.*$|RTLDLIST=\"$out/lib/ld-2.19.so $out/lib/32/ld-linux.so.2\"|g" \ + $glibc64/bin/ldd > $out/bin/ldd + chmod 555 $out/bin/ldd + rm $out/include cp -rs $glibc32/include $out chmod -R u+w $out/include @@ -4634,6 +4699,8 @@ let glog = callPackage ../development/libraries/glog { }; + gloox = callPackage ../development/libraries/gloox { }; + glpk = callPackage ../development/libraries/glpk { }; glsurf = callPackage ../applications/science/math/glsurf { @@ -4668,7 +4735,7 @@ let gperftools = callPackage ../development/libraries/gperftools { }; gst_all_1 = recurseIntoAttrs(callPackage ../development/libraries/gstreamer { - callPackage = pkgs.newScope (pkgs // { libav = pkgs.libav_9; }); + callPackage = pkgs.newScope (pkgs // { libav = pkgs.libav_10; }); }); gst_all = { @@ -4751,11 +4818,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 { }; @@ -4788,9 +4851,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; @@ -4921,6 +4982,11 @@ let lua = lua5_1; }; + keybinder3 = callPackage ../development/libraries/keybinder3 { + automake = automake111x; + lua = lua5_1; + }; + krb5 = callPackage ../development/libraries/kerberos/krb5.nix { }; lcms = lcms1; @@ -4967,6 +5033,8 @@ let libassuan2_1 = callPackage ../development/libraries/libassuan/git.nix { }; + libatomic_ops = callPackage ../development/libraries/libatomic_ops {}; + libav = libav_10; libav_all = callPackage ../development/libraries/libav { }; inherit (libav_all) libav_0_8 libav_9 libav_10; @@ -5012,6 +5080,8 @@ let libcangjie = callPackage ../development/libraries/libcangjie { }; + libcredis = callPackage ../development/libraries/libcredis { }; + libctemplate = callPackage ../development/libraries/libctemplate { }; libcue = callPackage ../development/libraries/libcue { }; @@ -5099,6 +5169,9 @@ let liblscp = callPackage ../development/libraries/liblscp { }; + libe-book = callPackage ../development/libraries/libe-book {}; + libe-book_00 = callPackage ../development/libraries/libe-book/0.0.nix {}; + libev = builderDefsPackage ../development/libraries/libev { }; libevent14 = callPackage ../development/libraries/libevent/1.4.nix { }; @@ -5140,6 +5213,8 @@ let libgdiplus = callPackage ../development/libraries/libgdiplus { }; + libgksu = callPackage ../development/libraries/libgksu { }; + libgpgerror = callPackage ../development/libraries/libgpg-error { }; libgphoto2 = callPackage ../development/libraries/libgphoto2 { }; @@ -5162,6 +5237,8 @@ let useGTK = config.libiodbc.gtk or false; }; + libivykis = callPackage ../development/libraries/libivykis { }; + liblastfmSF = callPackage ../development/libraries/liblastfmSF { }; liblastfm = callPackage ../development/libraries/liblastfm { }; @@ -5170,6 +5247,8 @@ let liblockfile = callPackage ../development/libraries/liblockfile { }; + liblogging = callPackage ../development/libraries/liblogging { }; + libmcrypt = callPackage ../development/libraries/libmcrypt {}; libmhash = callPackage ../development/libraries/libmhash {}; @@ -5197,13 +5276,11 @@ let libresample = callPackage ../development/libraries/libresample {}; + librevenge = callPackage ../development/libraries/librevenge {}; + 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 { }; @@ -5289,6 +5366,8 @@ let libmpcdec = callPackage ../development/libraries/libmpcdec { }; + libmp3splt = callPackage ../development/libraries/libmp3splt { }; + libmrss = callPackage ../development/libraries/libmrss { }; libmsn = callPackage ../development/libraries/libmsn { }; @@ -5305,6 +5384,9 @@ let libmusicbrainz = libmusicbrainz3; + libmwaw = callPackage ../development/libraries/libmwaw { }; + libmwaw_02 = callPackage ../development/libraries/libmwaw/0.2.nix { }; + libmx = callPackage ../development/libraries/libmx { }; libnet = callPackage ../development/libraries/libnet { }; @@ -5321,6 +5403,8 @@ let libnxml = callPackage ../development/libraries/libnxml { }; + libodfgen = callPackage ../development/libraries/libodfgen { }; + libofa = callPackage ../development/libraries/libofa { }; libofx = callPackage ../development/libraries/libofx { }; @@ -5335,6 +5419,8 @@ let libopus = callPackage ../development/libraries/libopus { }; + libosinfo = callPackage ../development/libraries/libosinfo {}; + libosip = callPackage ../development/libraries/osip {}; libosip_3 = callPackage ../development/libraries/osip/3.nix {}; @@ -5389,11 +5475,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 { }; @@ -5453,20 +5535,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; }); @@ -5563,7 +5643,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 @@ -5638,7 +5718,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 { }; @@ -5664,6 +5754,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 {}; @@ -5676,13 +5768,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 { @@ -5698,6 +5783,10 @@ let newt = callPackage ../development/libraries/newt { }; + nix-plugins = callPackage ../development/libraries/nix-plugins { + nix = pkgs.nixUnstable; + }; + nspr = callPackage ../development/libraries/nspr { }; nss = lowPrio (callPackage ../development/libraries/nss { }); @@ -5708,6 +5797,8 @@ let ntrack = callPackage ../development/libraries/ntrack { }; + nvidia-texture-tools = callPackage ../development/libraries/nvidia-texture-tools { }; + ode = builderDefsPackage (import ../development/libraries/ode) { }; ogre = callPackage ../development/libraries/ogre {}; @@ -5766,6 +5857,8 @@ let ffmpeg = ffmpeg_0_10; }; + openspades = callPackage ../games/openspades {}; + openssl = callPackage ../development/libraries/openssl { fetchurl = fetchurlBoot; cryptodevHeaders = linuxPackages.cryptodev.override { @@ -5780,6 +5873,8 @@ let p11_kit = callPackage ../development/libraries/p11-kit { }; + paperkey = callPackage ../tools/security/paperkey { }; + pangoxsl = callPackage ../development/libraries/pangoxsl { }; pcl = callPackage ../development/libraries/pcl { @@ -5891,6 +5986,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; @@ -5925,6 +6035,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 @@ -5933,23 +6045,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 { }; @@ -5999,6 +6097,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 { @@ -6100,6 +6201,11 @@ let inherit readline ncurses; }); + sqlcipher = lowPrio (callPackage ../development/libraries/sqlcipher { + readline = null; + ncurses = null; + }); + stfl = callPackage ../development/libraries/stfl { stdenv = if stdenv.isDarwin then overrideGCC stdenv gccApple @@ -6122,6 +6228,8 @@ let suitesparse = callPackage ../development/libraries/suitesparse { }; + sutils = callPackage ../tools/misc/sutils { }; + sword = callPackage ../development/libraries/sword { }; szip = callPackage ../development/libraries/szip { }; @@ -6284,6 +6392,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; @@ -6307,6 +6417,8 @@ let xvidcore = callPackage ../development/libraries/xvidcore { }; + xylib = callPackage ../development/libraries/xylib { }; + yajl = callPackage ../development/libraries/yajl { }; zangband = builderDefsPackage (import ../games/zangband) { @@ -6366,7 +6478,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 { }; @@ -6457,8 +6569,6 @@ let # python function with default python interpreter buildPythonPackage = pythonPackages.buildPythonPackage; - pythonPackages = python27Packages; - # `nix-env -i python-nose` installs for 2.7, the default python. # Therefore we do not recurse into attributes here, in contrast to # python27Packages. `nix-env -iA python26Packages.nose` works @@ -6468,7 +6578,15 @@ let python = python26; }; - python3Packages = python34Packages; + python27Packages = lib.hiPrioSet (recurseIntoAttrs (import ./python-packages.nix { + inherit pkgs; + python = python27; + })); + + python32Packages = import ./python-packages.nix { + inherit pkgs; + python = python32; + }; python33Packages = recurseIntoAttrs (import ./python-packages.nix { inherit pkgs; @@ -6480,16 +6598,6 @@ let python = python34; }); - python32Packages = import ./python-packages.nix { - inherit pkgs; - python = python32; - }; - - python27Packages = lib.hiPrioSet (recurseIntoAttrs (import ./python-packages.nix { - inherit pkgs; - python = python27; - })); - pypyPackages = recurseIntoAttrs (import ./python-packages.nix { inherit pkgs; python = pypy; @@ -6732,6 +6840,8 @@ let ngircd = callPackage ../servers/irc/ngircd { }; + nix-binary-cache = callPackage ../servers/http/nix-binary-cache {}; + nsd = callPackage ../servers/dns/nsd { }; nsq = callPackage ../servers/nsq { }; @@ -6754,6 +6864,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 { }; @@ -6830,12 +6946,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 { }; @@ -6892,6 +7003,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 { }; @@ -6951,7 +7064,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 { }; @@ -7129,6 +7242,8 @@ let ifplugd = callPackage ../os-specific/linux/ifplugd { }; + iomelt = callPackage ../os-specific/linux/iomelt { }; + iotop = callPackage ../os-specific/linux/iotop { }; iproute = callPackage ../os-specific/linux/iproute { }; @@ -7223,15 +7338,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") @@ -7241,15 +7347,6 @@ let ]; }; - linux_3_13 = makeOverridable (import ../os-specific/linux/kernel/linux-3.13.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_3_14 = makeOverridable (import ../os-specific/linux/kernel/linux-3.14.nix) { inherit fetchurl stdenv perl buildLinux; kernelPatches = lib.optionals ((platform.kernelArch or null) == "mips") @@ -7268,6 +7365,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") @@ -7342,7 +7448,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 { }; @@ -7403,8 +7509,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); @@ -7414,9 +7520,9 @@ let linuxPackages_3_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_10 linuxPackages_3_10); linuxPackages_3_10_tuxonice = linuxPackagesFor pkgs.linux_3_10_tuxonice linuxPackages_3_10_tuxonice; linuxPackages_3_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_12 linuxPackages_3_12); - linuxPackages_3_13 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_13 linuxPackages_3_13); 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 @@ -7871,8 +7977,14 @@ let inconsolata = callPackage ../data/fonts/inconsolata {}; + ipafont = callPackage ../data/fonts/ipafont {}; + junicode = callPackage ../data/fonts/junicode { }; + kochi-substitute = callPackage ../data/fonts/kochi-substitute {}; + + kochi-substitute-naga10 = callPackage ../data/fonts/kochi-substitute-naga10 {}; + liberation_ttf = callPackage ../data/fonts/redhat-liberation-fonts { }; libertine = builderDefsPackage (import ../data/fonts/libertine) { @@ -7897,6 +8009,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 { }; @@ -7921,7 +8035,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 { }; @@ -8053,6 +8176,8 @@ let inherit (gnome3) baobab; + bar = callPackage ../applications/window-managers/bar { }; + baresip = callPackage ../applications/networking/instant-messengers/baresip { ffmpeg = ffmpeg_1; }; @@ -8080,11 +8205,13 @@ let }; blender = callPackage ../applications/misc/blender { - python = python3; + python = python34; }; bristol = callPackage ../applications/audio/bristol { }; + bspwm = callPackage ../applications/window-managers/bspwm { }; + bvi = callPackage ../applications/editors/bvi { }; calf = callPackage ../applications/audio/calf { @@ -8191,10 +8318,11 @@ let d4x = callPackage ../applications/misc/d4x { }; - darcs = haskellPackages.darcs.override { + darcs = haskellPackages_ghc763.darcs.override { # A variant of the Darcs derivation that containts only the executable and - # thus has no dependencies on other Haskell packages. - cabal = haskellPackages.cabal.override { + # thus has no dependencies on other Haskell packages. We have to use the older + # GHC 7.6.3 package set because darcs won't compile with 7.8.x. + cabal = haskellPackages_ghc763.cabal.override { extension = self : super : { isLibrary = false; configureFlags = "-f-library " + super.configureFlags or ""; @@ -8244,7 +8372,11 @@ let dvdauthor = callPackage ../applications/video/dvdauthor { }; - dwb = callPackage ../applications/networking/browsers/dwb { }; + dwb = callPackage ../applications/networking/browsers/dwb { dconf = gnome3.dconf; }; + + dwbWrapper = wrapFirefox + { browser = dwb; browserName = "dwb"; desktopName = "dwb"; + }; dwm = callPackage ../applications/window-managers/dwm { patches = config.dwm.patches or []; @@ -8268,24 +8400,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; @@ -8294,23 +8408,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; @@ -8319,6 +8425,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 { }; @@ -8441,7 +8549,6 @@ let xmlRpc = callPackage ../applications/editors/emacs-modes/xml-rpc { }; }; - emacs23Packages = emacsPackages emacs23 pkgs.emacs23Packages; emacs24Packages = recurseIntoAttrs (emacsPackages emacs24 pkgs.emacs24Packages); inherit (gnome3) empathy; @@ -8494,6 +8601,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; @@ -8552,33 +8661,30 @@ 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; + inherit (pkgs.gnome) libgnome libgnomeui; + inherit (pkgs.xlibs) libX11 libXScrnSaver libXext + libXinerama libXrender libXt; + }; flac = callPackage ../applications/audio/flac { }; 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 { @@ -8613,6 +8719,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 { @@ -8639,6 +8747,8 @@ let python = python27; }; + gitolite = callPackage ../applications/version-management/gitolite { }; + inherit (gnome3) gitg; giv = callPackage ../applications/graphics/giv { @@ -8661,7 +8771,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 { }; @@ -8680,7 +8791,6 @@ let gmu = callPackage ../applications/audio/gmu { }; gnash = callPackage ../applications/video/gnash { - xulrunner = firefoxPkgs.xulrunner; inherit (gnome) gtkglext; }; @@ -8856,6 +8966,8 @@ let inherit (pythonPackages) pyopengl; }; + inferno = callPackage_i686 ../applications/inferno { }; + inkscape = callPackage ../applications/graphics/inkscape { inherit (pythonPackages) lxml; lcms = lcms2; @@ -8956,7 +9068,7 @@ let inherit (perlPackages) ArchiveZip CompressZlib; inherit (gnome) GConf ORBit2 gnome_vfs; zip = zip.override { enableNLS = false; }; - boost = boost149; + boost = boost155; jdk = openjdk; fontsConf = makeFontsConf { fontDirectories = [ @@ -8965,7 +9077,9 @@ let }; clucene_core = clucene_core_2; lcms = lcms2; - mdds = mdds_0_7_1; + harfbuzz = harfbuzz.override { + withIcu = true; withGraphite2 = true; + }; }; liferea = callPackage ../applications/networking/newsreaders/liferea { }; @@ -8979,6 +9093,8 @@ let ledger = callPackage ../applications/office/ledger/2.6.3.nix { }; ledger3 = callPackage ../applications/office/ledger/3.0.nix { }; + lighttable = callPackage ../applications/editors/lighttable {}; + links2 = callPackage ../applications/networking/browsers/links2 { }; linphone = callPackage ../applications/networking/instant-messengers/linphone rec { @@ -8995,6 +9111,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 { }; @@ -9083,6 +9203,10 @@ let mopidy = callPackage ../applications/audio/mopidy { }; + mopidy-spotify = callPackage ../applications/audio/mopidy-spotify { }; + + mopidy-moped = callPackage ../applications/audio/mopidy-moped { }; + mozilla = callPackage ../applications/networking/browsers/mozilla { inherit (gnome) libIDL; }; @@ -9096,6 +9220,8 @@ let mp3info = callPackage ../applications/audio/mp3info { }; + mp3splt = callPackage ../applications/audio/mp3splt { }; + mpc123 = callPackage ../applications/audio/mpc123 { }; mpg123 = callPackage ../applications/audio/mpg123 { }; @@ -9115,7 +9241,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 { @@ -9164,6 +9292,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 { @@ -9190,6 +9320,8 @@ let }; synfigstudio = callPackage ../applications/graphics/synfigstudio { }; + + sxhkd = callPackage ../applications/window-managers/sxhkd { }; msmtp = callPackage ../applications/networking/msmtp { }; @@ -9286,6 +9418,7 @@ let }; pdftk = callPackage ../tools/typesetting/pdftk { }; + pdfgrep = callPackage ../tools/typesetting/pdfgrep { }; pianobar = callPackage ../applications/audio/pianobar { }; @@ -9399,6 +9532,10 @@ let qt = qt4; }; + 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); enableCopyDevicesPatch = (config.rsync.enableCopyDevicesPatch or false); @@ -9449,9 +9586,7 @@ let siproxd = callPackage ../applications/networking/siproxd { }; - skype = callPackage_i686 ../applications/networking/instant-messengers/skype { - usePulseAudio = config.pulseaudio or true; - }; + skype = callPackage_i686 ../applications/networking/instant-messengers/skype { }; skype4pidgin = callPackage ../applications/networking/instant-messengers/pidgin-plugins/skype4pidgin { }; @@ -9459,6 +9594,8 @@ let slrn = callPackage ../applications/networking/newsreaders/slrn { }; + spideroak = callPackage ../applications/networking/spideroak { }; + ssvnc = callPackage ../applications/networking/remote/ssvnc { }; st = callPackage ../applications/misc/st { @@ -9567,6 +9704,8 @@ let gpgSupport = true; }; + symlinks = callPackage ../tools/system/symlinks { }; + syncthing = callPackage ../applications/networking/syncthing { }; # linux only by now @@ -9597,9 +9736,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 {}; @@ -9622,11 +9759,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; @@ -9650,6 +9788,8 @@ let toxic = callPackage ../applications/networking/instant-messengers/toxic { }; + transcode = callPackage ../applications/audio/transcode { }; + transmission = callPackage ../applications/networking/p2p/transmission { }; transmission_gtk = transmission.override { enableGTK3 = true; }; @@ -9657,16 +9797,12 @@ 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 { }; + twister = callPackage ../applications/networking/p2p/twister { }; + twmn = callPackage ../applications/misc/twmn { }; twinkle = callPackage ../applications/networking/instant-messengers/twinkle { @@ -9688,11 +9824,15 @@ let uzbl = callPackage ../applications/networking/browsers/uzbl { webkit = webkitgtk2; }; + + uTox = callPackage ../applications/networking/instant-messengers/utox { }; vanitygen = callPackage ../applications/misc/vanitygen { }; vbindiff = callPackage ../applications/editors/vbindiff { }; + vcprompt = callPackage ../applications/version-management/vcprompt { }; + vdpauinfo = callPackage ../tools/X11/vdpauinfo { }; veracity = callPackage ../applications/version-management/veracity {}; @@ -9708,12 +9848,8 @@ let macvim = callPackage ../applications/editors/vim/macvim.nix { }; - vimWrapper = wrapVim vim; - vimHugeX = vim_configurable; - vimHugeXWrapper = wrapVim vimHugeX; - vim_configurable = callPackage ../applications/editors/vim/configurable.nix { inherit (pkgs) fetchurl fetchhg stdenv ncurses pkgconfig gettext composableDerivation lib config glib gtk python perl tcl ruby; @@ -9746,10 +9882,7 @@ let flags = [ "python" "X11" ]; # only flag "X11" by now }); - wrapVim = vim: import ../applications/editors/vim/wrapper.nix { - inherit stdenv makeWrapper writeText vim; - vimrc = config.vim.vimrc or ""; - }; + vimpc = callPackage ../applications/audio/vimpc { }; virtviewer = callPackage ../applications/virtualization/virt-viewer { gtkvnc = gtkvnc.override { enableGTK3 = true; }; @@ -9854,6 +9987,7 @@ let ++ lib.optional (supportsJDK && cfg.jre or false && jrePlugin ? mozillaPlugin) jrePlugin ++ lib.optional (cfg.enableGoogleTalkPlugin or false) google_talk_plugin ++ lib.optional (cfg.enableFriBIDPlugin or false) fribid + ++ lib.optional (cfg.enableGnomeExtensions or false) gnome3.gnome_shell ); libs = [ gstreamer gst_plugins_base ] ++ lib.optionals (cfg.enableQuakeLive or false) (with xlibs; [ stdenv.gcc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib ]); @@ -9904,7 +10038,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; @@ -9949,6 +10085,8 @@ let xterm = callPackage ../applications/misc/xterm { }; + finalterm = callPackage ../applications/misc/finalterm { }; + xtrace = callPackage ../tools/X11/xtrace { }; xlaunch = callPackage ../tools/X11/xlaunch { }; @@ -9991,6 +10129,8 @@ let zathura = zathuraCollection.zathuraWrapper; + zed = callPackage ../applications/editors/zed { }; + zeroc_ice = callPackage ../development/libraries/zeroc-ice { }; girara = callPackage ../applications/misc/girara { @@ -10017,6 +10157,8 @@ let libsigcxx = libsigcxx12; }; + astromenace = callPackage ../games/astromenace { }; + atanks = callPackage ../games/atanks {}; ballAndPaddle = callPackage ../games/ball-and-paddle { @@ -10031,9 +10173,7 @@ let blackshadeselite = callPackage ../games/blackshadeselite { }; - blobby = callPackage ../games/blobby { - boost = boost149; - }; + blobby = callPackage ../games/blobby { }; bsdgames = callPackage ../games/bsdgames { }; @@ -10071,10 +10211,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 { }; @@ -10087,10 +10237,7 @@ let egoboo = callPackage ../games/egoboo { }; - exult = callPackage ../games/exult { - stdenv = overrideGCC stdenv gcc42; - libpng = libpng12; - }; + exult = callPackage ../games/exult { }; flightgear = callPackage ../games/flightgear { }; @@ -10349,6 +10496,7 @@ let keen4 = callPackage ../games/keen4 { }; + zeroad = callPackage ../games/0ad { }; ### DESKTOP ENVIRONMENTS @@ -10378,6 +10526,11 @@ let import ../desktops/e17 { inherit callPackage pkgs; } ); + e18 = recurseIntoAttrs ( + let callPackage = newScope pkgs.e18; in + import ../desktops/e18 { inherit callPackage pkgs; } + ); + gnome2 = callPackage ../desktops/gnome-2 { callPackage = pkgs.newScope pkgs.gnome2; self = pkgs.gnome2; @@ -10456,7 +10609,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 { }; @@ -10496,17 +10649,23 @@ let liblikeback = callPackage ../development/libraries/liblikeback { }; + libmm-qt = callPackage ../development/libraries/libmm-qt { }; + + libnm-qt = callPackage ../development/libraries/libnm-qt { }; + networkmanagement = callPackage ../tools/networking/networkmanagement { }; partitionManager = callPackage ../tools/misc/partition-manager { }; + plasma-nm = callPackage ../tools/networking/plasma-nm { }; + polkit_kde_agent = callPackage ../tools/security/polkit-kde-agent { }; psi = callPackage ../applications/networking/instant-messengers/psi { }; qtcurve = callPackage ../misc/themes/qtcurve { }; - quassel = callPackage ../applications/networking/irc/quassel { }; + quassel = callPackage ../applications/networking/irc/quassel { dconf = gnome3.dconf; }; quasselDaemon = (self.quassel.override { monolithic = false; @@ -10584,7 +10743,6 @@ let arb = callPackage ../applications/science/biology/arb { lesstif = lesstif93; - stdenv = overrideGCC stdenv gcc42; }; archimedes = callPackage ../applications/science/electronics/archimedes { }; @@ -10668,6 +10826,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; @@ -10744,6 +10907,12 @@ let tptp = callPackage ../applications/science/logic/tptp {}; + twelf = callPackage ../applications/science/logic/twelf { + smlnj = if stdenv.isDarwin + then smlnjBootstrap + else smlnj; + }; + verifast = callPackage ../applications/science/logic/verifast {}; why3 = callPackage ../applications/science/logic/why3 {}; @@ -10833,6 +11002,8 @@ let inherit (pkgs.gnome) gtkglext; }; + fityk = callPackage ../applications/science/misc/fityk { }; + gravit = callPackage ../applications/science/astronomy/gravit { }; golly = callPackage ../applications/science/misc/golly { }; @@ -10936,9 +11107,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 { }; @@ -11168,7 +11339,7 @@ let viewnior = callPackage ../applications/graphics/viewnior { }; - vimPlugins = callPackage ../misc/vim-plugins { }; + vimPlugins = recurseIntoAttrs (callPackage ../misc/vim-plugins { }); vimprobable2 = callPackage ../applications/networking/browsers/vimprobable2 { webkit = webkitgtk2; @@ -11257,6 +11428,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 {}; @@ -11271,6 +11444,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 a770cbdda8f..20f695a0d23 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -15,23 +15,25 @@ # Older compilers inherit the overrides from newer ones. ghcHEADPrefs = self : super : super // { - cabalInstall_1_20_0_2 = super.cabalInstall_1_20_0_2.override { Cabal = null; }; + cabalInstall_1_20_0_3 = super.cabalInstall_1_20_0_3.override { Cabal = null; }; mtl = self.mtl_2_2_1; transformersCompat = super.transformersCompat_0_3_3; }; - ghc782Prefs = self : super : ghcHEADPrefs self super // { - cabalInstall_1_20_0_2 = super.cabalInstall_1_20_0_2.override { Cabal = self.Cabal_1_20_0_1; }; - codex = super.codex.override { hackageDb = super.hackageDb.override { Cabal = self.Cabal_1_20_0_1; }; }; + ghc783Prefs = self : super : ghcHEADPrefs self super // { + 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 : ghc782Prefs self super // { + 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_0 = super.vty_5_1_0.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; }; @@ -209,15 +209,15 @@ ghcBinary = pkgs.haskellPackages.ghcPlain; prefFun = ghcHEADPrefs; extraArgs = { - happy = pkgs.haskellPackages.happy_1_19_2; - alex = pkgs.haskellPackages.alex_3_1_3; + happy = pkgs.haskellPackages.happy; + alex = pkgs.haskellPackages.alex; }; }; - packages_ghc782 = - packages { ghcPath = ../development/compilers/ghc/7.8.2.nix; + packages_ghc783 = + packages { ghcPath = ../development/compilers/ghc/7.8.3.nix; ghcBinary = ghc742Binary; - prefFun = ghc782Prefs; + prefFun = ghc783Prefs; }; packages_ghc763 = diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 608108a1847..7bb049de55f 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -135,18 +135,22 @@ 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 {}; + 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 = self.aeson_0_7_0_6; + aeson_0_8_0_0 = callPackage ../development/libraries/haskell/aeson/0.8.0.0.nix { blazeBuilder = null; }; + aeson = self.aeson_0_8_0_0; aesonPretty = callPackage ../development/libraries/haskell/aeson-pretty {}; aesonQq = callPackage ../development/libraries/haskell/aeson-qq {}; + aesonUtils = callPackage ../development/libraries/haskell/aeson-utils {}; + alsaCore = callPackage ../development/libraries/haskell/alsa-core {}; alsaMixer = callPackage ../development/libraries/haskell/alsa-mixer {}; @@ -163,6 +167,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in ansiWlPprint = callPackage ../development/libraries/haskell/ansi-wl-pprint {}; + applicativeQuoters = callPackage ../development/libraries/haskell/applicative-quoters {}; + ariadne = callPackage ../development/libraries/haskell/ariadne {}; arithmoi = callPackage ../development/libraries/haskell/arithmoi {}; @@ -193,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 {}; @@ -202,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 {}; @@ -214,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 {}; @@ -262,6 +272,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in blazeBuilderEnumerator = callPackage ../development/libraries/haskell/blaze-builder-enumerator {}; + blazeFromHtml = callPackage ../development/libraries/haskell/blaze-from-html {}; + blazeHtml = callPackage ../development/libraries/haskell/blaze-html {}; blazeMarkup = callPackage ../development/libraries/haskell/blaze-markup {}; @@ -296,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 {}; @@ -327,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 {}; @@ -372,6 +386,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in cgi_3001_1_8_5 = callPackage ../development/libraries/haskell/cgi/3001.1.8.5.nix {}; cgi = self.cgi_3001_1_8_5; + cgrep = callPackage ../development/libraries/haskell/cgrep {}; + charset = callPackage ../development/libraries/haskell/charset {}; Chart = callPackage ../development/libraries/haskell/Chart {}; @@ -411,6 +427,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in classyPreludeConduit = callPackage ../development/libraries/haskell/classy-prelude-conduit {}; + clay = callPackage ../development/libraries/haskell/clay {}; + clientsession = callPackage ../development/libraries/haskell/clientsession {}; clock = callPackage ../development/libraries/haskell/clock {}; @@ -421,6 +439,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in cmdtheline = callPackage ../development/libraries/haskell/cmdtheline {}; + codeBuilder = callPackage ../development/libraries/haskell/code-builder {}; + CodecImageDevIL = callPackage ../development/libraries/haskell/codec-image-devil {}; colorizeHaskell = callPackage ../development/libraries/haskell/colorize-haskell {}; @@ -437,7 +457,9 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in compactStringFix = callPackage ../development/libraries/haskell/compact-string-fix {}; - compdata = callPackage ../development/libraries/haskell/compdata {}; + compdata = if (pkgs.stdenv.lib.versionOlder "7.8" ghc.version) + then callPackage ../development/libraries/haskell/compdata {} + else null; composition = callPackage ../development/libraries/haskell/composition {}; @@ -551,6 +573,10 @@ 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 {}; dataInttrie = callPackage ../development/libraries/haskell/data-inttrie {}; @@ -587,6 +613,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in deepseq_1_3_0_2 = callPackage ../development/libraries/haskell/deepseq/1.3.0.2.nix {}; deepseq = null; # core package since ghc >= 7.4.x + deepseqGenerics = callPackage ../development/libraries/haskell/deepseq-generics {}; + deepseqTh = callPackage ../development/libraries/haskell/deepseq-th {}; derive = callPackage ../development/libraries/haskell/derive {}; @@ -636,7 +664,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in directoryTree = callPackage ../development/libraries/haskell/directory-tree {}; distributedStatic = callPackage ../development/libraries/haskell/distributed-static {}; - + distributedProcess = callPackage ../development/libraries/haskell/distributed-process {}; distributive = callPackage ../development/libraries/haskell/distributive {}; @@ -653,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 {}; @@ -673,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 {}; @@ -680,6 +712,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in editline = self.editline_0_2_1_1; ekg = callPackage ../development/libraries/haskell/ekg {}; + ekgCarbon = callPackage ../development/libraries/haskell/ekg-carbon {}; ekgCore = callPackage ../development/libraries/haskell/ekg-core {}; elerea = callPackage ../development/libraries/haskell/elerea {}; @@ -694,6 +727,9 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in encoding = callPackage ../development/libraries/haskell/encoding {}; + engineIo = callPackage ../development/libraries/haskell/engine-io {}; + engineIoSnap = callPackage ../development/libraries/haskell/engine-io-snap {}; + enumerator = callPackage ../development/libraries/haskell/enumerator {}; enummapset = callPackage ../development/libraries/haskell/enummapset {}; @@ -704,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 {}; @@ -734,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 {}; @@ -742,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 {}; @@ -797,17 +834,19 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in fingertree = callPackage ../development/libraries/haskell/fingertree {}; + focus = callPackage ../development/libraries/haskell/focus {}; + foldl = callPackage ../development/libraries/haskell/foldl {}; + folds = callPackage ../development/libraries/haskell/folds {}; + forceLayout = callPackage ../development/libraries/haskell/force-layout {}; + formatting = callPackage ../development/libraries/haskell/formatting {}; + 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 {}; @@ -825,8 +864,12 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in gdiff = callPackage ../development/libraries/haskell/gdiff {}; + genericAeson = callPackage ../development/libraries/haskell/generic-aeson {}; + 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 {}; @@ -867,6 +910,12 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in gitit = callPackage ../development/libraries/haskell/gitit {}; + gitlib = callPackage ../development/libraries/haskell/gitlib {}; + + gitlibLibgit2 = callPackage ../development/libraries/haskell/gitlib-libgit2 {}; + + gitlibTest = callPackage ../development/libraries/haskell/gitlib-test {}; + glade = callPackage ../development/libraries/haskell/glade { inherit (pkgs.gnome) libglade; gtkC = pkgs.gtk; @@ -934,10 +983,9 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in libc = pkgs.stdenv.gcc.libc; }; - gtkglext = callPackage ../development/libraries/haskell/gtkglext {}; + gtkglext = callPackage ../development/libraries/haskell/gtkglext { gtkglext = pkgs.gnome2.gtkglext; }; gtk2hsBuildtools = callPackage ../development/libraries/haskell/gtk2hs-buildtools {}; - gtk2hsC2hs = self.gtk2hsBuildtools; gtksourceview2 = callPackage ../development/libraries/haskell/gtksourceview2 { inherit (pkgs.gnome) gtksourceview; @@ -946,6 +994,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 {}; @@ -974,6 +1024,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 {}; @@ -994,6 +1046,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in haskellNames = callPackage ../development/libraries/haskell/haskell-names {}; + HaskellNet = callPackage ../development/libraries/haskell/HaskellNet {}; + haskellPackages = callPackage ../development/libraries/haskell/haskell-packages {}; haskellSrc_1_0_1_3 = callPackage ../development/libraries/haskell/haskell-src/1.0.1.3.nix {}; @@ -1006,10 +1060,18 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in haskellSrcMeta = callPackage ../development/libraries/haskell/haskell-src-meta {}; + haskintex = callPackage ../development/libraries/haskell/haskintex {}; + haskore = callPackage ../development/libraries/haskell/haskore {}; hastache = callPackage ../development/libraries/haskell/hastache {}; + 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 {}; hedis = callPackage ../development/libraries/haskell/hedis {}; @@ -1022,6 +1084,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in hourglass = callPackage ../development/libraries/haskell/hourglass {}; + hplayground = callPackage ../development/libraries/haskell/hplayground {}; + hseCpp = callPackage ../development/libraries/haskell/hse-cpp {}; hsimport = callPackage ../development/libraries/haskell/hsimport {}; @@ -1060,12 +1124,16 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in haskellForMaths = callPackage ../development/libraries/haskell/HaskellForMaths {}; + haxl = callPackage ../development/libraries/haskell/haxl {}; + haxr = callPackage ../development/libraries/haskell/haxr {}; haxr_th = callPackage ../development/libraries/haskell/haxr-th {}; HaXml = callPackage ../development/libraries/haskell/HaXml {}; + hdaemonize = callPackage ../development/libraries/haskell/hdaemonize {}; + HDBC = callPackage ../development/libraries/haskell/HDBC/HDBC.nix {}; HDBCOdbc = callPackage ../development/libraries/haskell/HDBC/HDBC-odbc.nix { @@ -1076,6 +1144,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in HDBCSqlite3 = callPackage ../development/libraries/haskell/HDBC/HDBC-sqlite3.nix {}; + HPDF = callPackage ../development/libraries/haskell/HPDF {}; + heist = callPackage ../development/libraries/haskell/heist {}; hflags = callPackage ../development/libraries/haskell/hflags {}; @@ -1088,6 +1158,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in hinotify = callPackage ../development/libraries/haskell/hinotify {}; + hi = callPackage ../development/libraries/haskell/hi {}; + hint = callPackage ../development/libraries/haskell/hint {}; hit = callPackage ../development/libraries/haskell/hit {}; @@ -1100,9 +1172,13 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in hledgerIrr = callPackage ../applications/office/hledger-irr {}; hledgerWeb = callPackage ../development/libraries/haskell/hledger-web {}; + hlibgit2 = callPackage ../development/libraries/haskell/hlibgit2 {}; + 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 {}; @@ -1168,6 +1244,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in hspec = callPackage ../development/libraries/haskell/hspec {}; + hspecAttoparsec = callPackage ../development/libraries/haskell/hspec-attoparsec {}; + hspecWai = callPackage ../development/libraries/haskell/hspec-wai {}; hspec2 = callPackage ../development/libraries/haskell/hspec2 {}; @@ -1208,6 +1286,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 {}; @@ -1216,6 +1296,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in hxtHttp = callPackage ../development/libraries/haskell/hxt-http {}; + hxtPickleUtils = callPackage ../development/libraries/haskell/hxt-pickle-utils {}; + hxtRegexXmlschema = callPackage ../development/libraries/haskell/hxt-regex-xmlschema {}; hxtTagsoup = callPackage ../development/libraries/haskell/hxt-tagsoup {}; @@ -1280,18 +1362,27 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in preprocessorTools = self.preprocessorTools_0_1_3; }; + ixset = callPackage ../development/libraries/haskell/ixset {}; + ixShapable = callPackage ../development/libraries/haskell/ix-shapable {}; jack = callPackage ../development/libraries/haskell/jack {}; JuicyPixels = callPackage ../development/libraries/haskell/JuicyPixels {}; + jmacro = callPackage ../development/libraries/haskell/jmacro {}; + jmacroRpc = callPackage ../development/libraries/haskell/jmacro-rpc {}; + jmacroRpcHappstack = callPackage ../development/libraries/haskell/jmacro-rpc-happstack {}; + jmacroRpcSnap = callPackage ../development/libraries/haskell/jmacro-rpc-snap {}; + jpeg = callPackage ../development/libraries/haskell/jpeg {}; json = callPackage ../development/libraries/haskell/json {}; jsonAssertions = callPackage ../development/libraries/haskell/json-assertions {}; + jsonSchema = callPackage ../development/libraries/haskell/json-schema {}; + jsonTypes = callPackage ../development/libraries/haskell/jsonTypes {}; JuicyPixelsUtil = callPackage ../development/libraries/haskell/JuicyPixels-util {}; @@ -1322,6 +1413,12 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in lambdabot = callPackage ../development/libraries/haskell/lambdabot {}; + lambdabotWrapper = callPackage ../development/libraries/haskell/lambdabot/wrapper.nix { + mueval = self.muevalWrapper.override { + additionalPackages = [ self.lambdabot ]; + }; + }; + lambdabotUtils = callPackage ../development/libraries/haskell/lambdabot-utils {}; lambdacubeEngine = callPackage ../development/libraries/haskell/lambdacube-engine {}; @@ -1390,6 +1487,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in lrucache = callPackage ../development/libraries/haskell/lrucache {}; + lochTh = callPackage ../development/libraries/haskell/loch-th {}; + lockfreeQueue = callPackage ../development/libraries/haskell/lockfree-queue {}; logfloat = callPackage ../development/libraries/haskell/logfloat {}; @@ -1414,6 +1513,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 {}; @@ -1466,6 +1567,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in monadloc = callPackage ../development/libraries/haskell/monadloc {}; + monadlocPp = callPackage ../development/libraries/haskell/monadloc-pp {}; + monadLoops = callPackage ../development/libraries/haskell/monad-loops {}; monadLogger = callPackage ../development/libraries/haskell/monad-logger {}; @@ -1515,10 +1618,14 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in mueval = callPackage ../development/libraries/haskell/mueval {}; + muevalWrapper = callPackage ../development/libraries/haskell/mueval/wrapper.nix {}; + multiarg = callPackage ../development/libraries/haskell/multiarg {}; multimap = callPackage ../development/libraries/haskell/multimap {}; + multipart = callPackage ../development/libraries/haskell/multipart {}; + multiplate = callPackage ../development/libraries/haskell/multiplate {}; multirec = callPackage ../development/libraries/haskell/multirec {}; @@ -1564,6 +1671,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in network_2_5_0_0 = callPackage ../development/libraries/haskell/network/2.5.0.0.nix {}; network = self.network_2_5_0_0; + networkCarbon = callPackage ../development/libraries/haskell/network-carbon {}; + networkConduit = callPackage ../development/libraries/haskell/network-conduit {}; networkConduitTls = callPackage ../development/libraries/haskell/network-conduit-tls {}; @@ -1666,11 +1775,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_2 = callPackage ../development/libraries/haskell/parsers/0.11.0.2.nix {}; - parsers = self.parsers_0_11_0_2; + 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 {}; @@ -1711,6 +1822,10 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in pipesConcurrency = callPackage ../development/libraries/haskell/pipes-concurrency {}; + pipesCsv = callPackage ../development/libraries/haskell/pipes-csv {}; + + pipesHttp = callPackage ../development/libraries/haskell/pipes-http {}; + pipesNetwork = callPackage ../development/libraries/haskell/pipes-network {}; pipesGroup = callPackage ../development/libraries/haskell/pipes-group {}; @@ -1725,6 +1840,10 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in pipesZlib = callPackage ../development/libraries/haskell/pipes-zlib {}; + placeholders = callPackage ../development/libraries/haskell/placeholders {}; + + plugins= callPackage ../development/libraries/haskell/plugins {}; + polyparse = callPackage ../development/libraries/haskell/polyparse {}; pointed = callPackage ../development/libraries/haskell/pointed {}; @@ -1759,6 +1878,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; @@ -1771,14 +1892,16 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in punycode = callPackage ../development/libraries/haskell/punycode {}; + pureCdb = callPackage ../development/libraries/haskell/pure-cdb {}; + primitive_0_5_0_1 = callPackage ../development/libraries/haskell/primitive/0.5.0.1.nix {}; primitive_0_5_2_1 = callPackage ../development/libraries/haskell/primitive/0.5.2.1.nix {}; 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 {}; @@ -1813,7 +1936,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in QuickCheck_2_5_1_1 = callPackage ../development/libraries/haskell/QuickCheck/2.5.1.1.nix {}; QuickCheck_2_6 = callPackage ../development/libraries/haskell/QuickCheck/2.6.nix {}; QuickCheck_2_7_5 = callPackage ../development/libraries/haskell/QuickCheck/2.7.5.nix {}; - QuickCheck = self.QuickCheck_2_7_5; + QuickCheck_2_7_6 = callPackage ../development/libraries/haskell/QuickCheck/2.7.6.nix {}; + QuickCheck = self.QuickCheck_2_7_6; quickcheckAssertions = callPackage ../development/libraries/haskell/quickcheck-assertions {}; @@ -1889,6 +2013,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in regexTdfa = callPackage ../development/libraries/haskell/regex-tdfa {}; + regexTdfaRc = callPackage ../development/libraries/haskell/regex-tdfa-rc {}; + regexTdfaText = callPackage ../development/libraries/haskell/regex-tdfa-text {}; regexPcre = callPackage ../development/libraries/haskell/regex-pcre {}; @@ -1897,6 +2023,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in regular = callPackage ../development/libraries/haskell/regular {}; + regularXmlpickler = callPackage ../development/libraries/haskell/regular-xmlpickler {}; + remote = callPackage ../development/libraries/haskell/remote {}; repa = callPackage ../development/libraries/haskell/repa {}; @@ -1910,8 +2038,26 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in resourcePool = callPackage ../development/libraries/haskell/resource-pool {}; + resourcePoolCatchio = callPackage ../development/libraries/haskell/resource-pool-catchio {}; + resourcet = callPackage ../development/libraries/haskell/resourcet {}; + restClient = callPackage ../development/libraries/haskell/rest-client {}; + + restCore = callPackage ../development/libraries/haskell/rest-core {}; + + restGen = callPackage ../development/libraries/haskell/rest-gen {}; + + restHappstack = callPackage ../development/libraries/haskell/rest-happstack {}; + + restSnap = callPackage ../development/libraries/haskell/rest-snap {}; + + restStringmap = callPackage ../development/libraries/haskell/rest-stringmap {}; + + restTypes = callPackage ../development/libraries/haskell/rest-types {}; + + restWai = callPackage ../development/libraries/haskell/rest-wai {}; + retry = callPackage ../development/libraries/haskell/retry {}; rethinkdb = callPackage ../development/libraries/haskell/rethinkdb {}; @@ -1937,8 +2083,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in sbv = callPackage ../development/libraries/haskell/sbv {}; scientific_0_2_0_2 = callPackage ../development/libraries/haskell/scientific/0.2.0.2.nix {}; - scientific_0_3_2_1 = callPackage ../development/libraries/haskell/scientific/0.3.2.1.nix {}; - scientific = self.scientific_0_3_2_1; + scientific_0_3_3_0 = callPackage ../development/libraries/haskell/scientific/0.3.3.0.nix {}; + scientific = self.scientific_0_3_3_0; scotty = callPackage ../development/libraries/haskell/scotty {}; @@ -1960,10 +2106,17 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in setlocale = callPackage ../development/libraries/haskell/setlocale {}; + + shellish = callPackage ../development/libraries/haskell/shellish {}; + + shellmate = callPackage ../development/libraries/haskell/shellmate {}; + shelly_0_15_4_1 = callPackage ../development/libraries/haskell/shelly/0.15.4.1.nix {}; shelly_1_5_3_1 = callPackage ../development/libraries/haskell/shelly {}; shelly = self.shelly_1_5_3_1; + simpleConduit = callPackage ../development/libraries/haskell/simple-conduit {}; + simpleReflect = callPackage ../development/libraries/haskell/simple-reflect {}; simpleSendfile = callPackage ../development/libraries/haskell/simple-sendfile {}; @@ -1988,6 +2141,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in snapletAcidState = callPackage ../development/libraries/haskell/snaplet-acid-state {}; + snapletPostgresqlSimple = callPackage ../development/libraries/haskell/snaplet-postgresql-simple {}; + snapletRedis = callPackage ../development/libraries/haskell/snaplet-redis {}; snapletStripe = callPackage ../development/libraries/haskell/snaplet-stripe {}; @@ -2004,10 +2159,16 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in snapServer = callPackage ../development/libraries/haskell/snap/server.nix {}; + snapWebRoutes = callPackage ../development/libraries/haskell/snap-web-routes {}; + snowball = callPackage ../development/libraries/haskell/snowball {}; socks = callPackage ../development/libraries/haskell/socks {}; + 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 {}; @@ -2080,6 +2241,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in SHA = callPackage ../development/libraries/haskell/SHA {}; + SHA2 = callPackage ../development/libraries/haskell/SHA2 {}; + shake = callPackage ../development/libraries/haskell/shake {}; shakespeare = callPackage ../development/libraries/haskell/shakespeare {}; @@ -2126,6 +2289,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in stmConduit = callPackage ../development/libraries/haskell/stm-conduit {}; + stmContainers = callPackage ../development/libraries/haskell/stm-containers {}; + STMonadTrans = callPackage ../development/libraries/haskell/STMonadTrans {}; stmStats = callPackage ../development/libraries/haskell/stm-stats {}; @@ -2160,10 +2325,16 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in TableAlgebra = callPackage ../development/libraries/haskell/TableAlgebra {}; + tables = callPackage ../development/libraries/haskell/tables {}; + tabular = callPackage ../development/libraries/haskell/tabular {}; tagged = callPackage ../development/libraries/haskell/tagged {}; + taggy = callPackage ../development/libraries/haskell/taggy {}; + + taggyLens = callPackage ../development/libraries/haskell/taggy-lens {}; + tagshare = callPackage ../development/libraries/haskell/tagshare {}; tagsoup = callPackage ../development/libraries/haskell/tagsoup {}; @@ -2192,6 +2363,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in tcacheAWS = callPackage ../development/libraries/haskell/tcache-AWS {}; + template = callPackage ../development/libraries/haskell/template {}; + templateDefault = callPackage ../development/libraries/haskell/template-default {}; temporary = callPackage ../development/libraries/haskell/temporary {}; @@ -2266,6 +2439,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in threads = callPackage ../development/libraries/haskell/threads {}; + Thrift = callPackage ../development/libraries/haskell/Thrift {}; + thyme = callPackage ../development/libraries/haskell/thyme {}; threepennyGui = callPackage ../development/libraries/haskell/threepenny-gui {}; @@ -2296,10 +2471,12 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in tls = self.tls_1_1_5; }; + tostring = callPackage ../development/libraries/haskell/tostring {}; + transformers_0_2_2_0 = callPackage ../development/libraries/haskell/transformers/0.2.2.0.nix {}; transformers_0_3_0_0 = callPackage ../development/libraries/haskell/transformers/0.3.0.0.nix {}; transformers_0_4_1_0 = callPackage ../development/libraries/haskell/transformers/0.4.1.0.nix {}; - transformers = null; # core package since ghc >= 7.8.2 + transformers = null; # core package since ghc >= 7.8.x transformersBase = callPackage ../development/libraries/haskell/transformers-base {}; @@ -2363,10 +2540,13 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in unorderedContainers_0_2_3_0 = callPackage ../development/libraries/haskell/unordered-containers/0.2.3.0.nix {}; unorderedContainers_0_2_4_0 = callPackage ../development/libraries/haskell/unordered-containers/0.2.4.0.nix {}; - unorderedContainers = self.unorderedContainers_0_2_4_0; + unorderedContainers_0_2_5_0 = callPackage ../development/libraries/haskell/unordered-containers/0.2.5.0.nix {}; + unorderedContainers = self.unorderedContainers_0_2_5_0; uri = callPackage ../development/libraries/haskell/uri {}; + uriEncode = callPackage ../development/libraries/haskell/uri-encode {}; + url = callPackage ../development/libraries/haskell/url {}; urlencoded = callPackage ../development/libraries/haskell/urlencoded {}; @@ -2431,10 +2611,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_0 = callPackage ../development/libraries/haskell/vty/5.1.0.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 {}; @@ -2462,6 +2644,12 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in wcwidth = callPackage ../development/libraries/haskell/wcwidth {}; + 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 {}; @@ -2529,16 +2717,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 {}; @@ -2547,6 +2741,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in xssSanitize = callPackage ../development/libraries/haskell/xss-sanitize {}; + Yampa = callPackage ../development/libraries/haskell/Yampa {}; + yaml = callPackage ../development/libraries/haskell/yaml {}; yamlLight = callPackage ../development/libraries/haskell/yaml-light {}; @@ -2586,11 +2782,13 @@ 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 {}; + zippers = callPackage ../development/libraries/haskell/zippers {}; + zlib_0_5_0_0 = callPackage ../development/libraries/haskell/zlib/0.5.0.0.nix { inherit (pkgs) zlib; }; zlib_0_5_2_0 = callPackage ../development/libraries/haskell/zlib/0.5.2.0.nix { inherit (pkgs) zlib; }; zlib_0_5_3_1 = callPackage ../development/libraries/haskell/zlib/0.5.3.1.nix { inherit (pkgs) zlib; }; @@ -2607,19 +2805,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; - }; - 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 {}; @@ -2639,12 +2826,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 {}; @@ -2660,24 +2843,22 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in haddock_2_12_0 = callPackage ../development/tools/documentation/haddock/2.12.0.nix {}; haddock_2_13_2 = callPackage ../development/tools/documentation/haddock/2.13.2.nix {}; haddock_2_14_2 = callPackage ../development/tools/documentation/haddock/2.14.2.nix {}; - haddock = self.haddock_2_14_2; + haddock_2_14_3 = callPackage ../development/tools/documentation/haddock/2.14.3.nix {}; + haddock = self.haddock_2_14_3; HandsomeSoup = callPackage ../development/libraries/haskell/HandsomeSoup {}; happy_1_18_4 = callPackage ../development/tools/parsing/happy/1.18.4.nix {}; happy_1_18_5 = callPackage ../development/tools/parsing/happy/1.18.5.nix {}; happy_1_18_6 = callPackage ../development/tools/parsing/happy/1.18.6.nix {}; - happy_1_18_8 = callPackage ../development/tools/parsing/happy/1.18.8.nix {}; happy_1_18_9 = callPackage ../development/tools/parsing/happy/1.18.9.nix {}; happy_1_18_10 = callPackage ../development/tools/parsing/happy/1.18.10.nix {}; - happy_1_18_11 = callPackage ../development/tools/parsing/happy/1.18.11.nix {}; - happy_1_19_2 = callPackage ../development/tools/parsing/happy/1.19.2.nix {}; - happy_1_19_3 = callPackage ../development/tools/parsing/happy/1.19.3.nix {}; - happy = self.happy_1_19_3; + happy_1_19_4 = callPackage ../development/tools/parsing/happy/1.19.4.nix {}; + happy = self.happy_1_19_4; happyMeta = callPackage ../development/tools/haskell/happy-meta {}; - HaRe = callPackage ../development/tools/haskell/HaRe {}; + haskellDocs = callPackage ../development/tools/haskell/haskell-docs {}; haskdogs = callPackage ../development/tools/haskell/haskdogs {}; @@ -2700,10 +2881,16 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in }; }; + hscope = callPackage ../development/tools/haskell/hscope {}; + hslogger = callPackage ../development/tools/haskell/hslogger {}; + pointful = callPackage ../development/tools/haskell/pointful {}; + ShellCheck = callPackage ../development/tools/misc/ShellCheck { }; + SourceGraph = callPackage ../development/tools/haskell/SourceGraph {}; + tar = callPackage ../development/libraries/haskell/tar {}; threadscope = callPackage ../development/tools/haskell/threadscope {}; @@ -2725,10 +2912,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; }; @@ -2741,7 +2924,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 {}; @@ -2785,9 +2970,10 @@ 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 = if pkgs.stdenv.lib.versionOlder "7.7" ghc.version - then null - else self.Cabal_1_18_1_3; + Cabal = self.Cabal_1_20_0_2; + cabalLenses = self.cabalLenses.override { + Cabal = self.Cabal_1_20_0_2; + }; }; cabalMeta = callPackage ../development/tools/haskell/cabal-meta {}; @@ -2803,11 +2989,13 @@ 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_2 = callPackage ../tools/package-management/cabal-install/1.20.0.2.nix { Cabal = self.Cabal_1_20_0_1; }; - cabalInstall = self.cabalInstall_1_20_0_2; + 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 {}; + commandQq = callPackage ../development/libraries/haskell/command-qq {}; + gitAnnex = callPackage ../applications/version-management/git-and-tools/git-annex {}; githubBackup = callPackage ../applications/version-management/git-and-tools/github-backup {}; @@ -2840,6 +3028,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 6c744bfd861..00000000000 --- 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 81cbf0e7bdc..b37ce6581cd 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; }; }; @@ -4784,6 +4876,14 @@ let self = _self // overrides; _self = with self; { platforms = stdenv.lib.platforms.unix; }; }; + + ListBinarySearch = pkgs.buildPerlPackage { + name = "List-BinarySearch-0.20"; + src = pkgs.fetchurl { + url = mirror://cpan/authors/id/D/DA/DAVIDO/List-BinarySearch-0.20.tar.gz; + sha256 = "1piyl65m38bwqaap13wkgs033wiwb6m5zmr5va86ya4696cir7wd"; + }; + }; ListMoreUtils = buildPerlPackage { name = "List-MoreUtils-0.33"; @@ -4954,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; }; }; @@ -4983,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; }; }; @@ -5342,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 { @@ -6148,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 { @@ -7160,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 { @@ -7496,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 { @@ -7987,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 { @@ -8417,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 { @@ -9037,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; }; }; @@ -9582,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 { @@ -9703,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 { @@ -9721,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/php-packages.nix b/pkgs/top-level/php-packages.nix index 39ea219cf64..1225021ad37 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -3,16 +3,13 @@ let self = with self; { buildPecl = import ../build-support/build-pecl.nix { inherit php; - inherit (pkgs) stdenv autoreconfHook; + inherit (pkgs) stdenv autoreconfHook fetchurl; }; memcache = buildPecl { name = "memcache-3.0.8"; - src = pkgs.fetchurl { - url = http://pecl.php.net/get/memcache-3.0.8.tgz; - sha256 = "04c35rj0cvq5ygn2jgmyvqcb0k8d03v4k642b6i37zgv7x15pbic"; - }; + sha256 = "04c35rj0cvq5ygn2jgmyvqcb0k8d03v4k642b6i37zgv7x15pbic"; configureFlags = "--with-zlib-dir=${pkgs.zlib}"; }; @@ -20,10 +17,7 @@ let self = with self; { memcached = buildPecl { name = "memcached-2.1.0"; - src = pkgs.fetchurl { - url = http://pecl.php.net/get/memcached-2.1.0.tgz; - sha256 = "1by4zhkq4mbk9ja6s0vlavv5ng8aw5apn3a1in84fkz7bc0l0jdw"; - }; + sha256 = "1by4zhkq4mbk9ja6s0vlavv5ng8aw5apn3a1in84fkz7bc0l0jdw"; configureFlags = [ "--with-zlib-dir=${pkgs.zlib}" @@ -33,28 +27,22 @@ let self = with self; { buildInputs = [ pkgs.cyrus_sasl ]; }; - xdebug = buildPecl rec { + xdebug = buildPecl { name = "xdebug-2.2.5"; - src = pkgs.fetchurl { - url = "http://pecl.php.net/get/${name}.tgz"; - sha256 = "0vss35da615709kdvqji8pblckfvmabmj2njjjz6h8zzvj9gximd"; - }; + + sha256 = "0vss35da615709kdvqji8pblckfvmabmj2njjjz6h8zzvj9gximd"; }; - apc = buildPecl rec { + apc = buildPecl { name = "apc-3.1.13"; - src = pkgs.fetchurl { - url = "http://pecl.php.net/get/${name}.tgz"; - sha256 = "1gcsh9iar5qa1yzpjki9bb5rivcb6yjp45lmjmp98wlyf83vmy2y"; - }; + + sha256 = "1gcsh9iar5qa1yzpjki9bb5rivcb6yjp45lmjmp98wlyf83vmy2y"; }; - zmq = buildPecl rec { + zmq = buildPecl { name = "zmq-1.1.2"; - src = pkgs.fetchurl { - url = "http://pecl.php.net/get/${name}.tgz"; - sha256 = "0ccz73p8pkda3y9p9qbr3m19m0yrf7k2bvqgbaly3ibgh9bazc69"; - }; + + sha256 = "0ccz73p8pkda3y9p9qbr3m19m0yrf7k2bvqgbaly3ibgh9bazc69"; configureFlags = [ "--with-zmq=${pkgs.zeromq2}" @@ -62,4 +50,26 @@ let self = with self; { buildInputs = [ pkgs.pkgconfig ]; }; + + xcache = buildPecl rec { + name = "xcache-${version}"; + + version = "3.1.0"; + + src = pkgs.fetchurl { + url = "http://xcache.lighttpd.net/pub/Releases/${version}/${name}.tar.bz2"; + md5 = "e5816d47d52be200b959bf69a673ff74"; + }; + + configureFlags = [ + "--enable-xcache" + "--enable-xcache-coverager" + "--enable-xcache-optimizer" + "--enable-xcache-assembler" + "--enable-xcache-encoder" + "--enable-xcache-decoder" + ]; + + buildInputs = [ pkgs.m4 ]; + }; }; in self diff --git a/pkgs/top-level/python-packages-generated.nix b/pkgs/top-level/python-packages-generated.nix index ca980e38637..e76cf4988d0 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 f21bf4f4df9..0c9ddf3e7ff 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -67,6 +67,28 @@ rec { inherit python; }; + discid = buildPythonPackage rec { + name = "discid-1.1.0"; + + meta = with stdenv.lib; { + description = "Python binding of libdiscid"; + homepage = "https://python-discid.readthedocs.org/"; + license = licenses.lgpl3Plus; + platforms = platforms.linux; + maintainer = with maintainers; [ iyzsong ]; + }; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/d/discid/${name}.tar.gz"; + md5 = "2ad2141452dd10b03ad96ccdad075235"; + }; + + patchPhase = '' + substituteInPlace discid/libdiscid.py \ + --replace '_open_library(_LIB_NAME)' "_open_library('${pkgs.libdiscid}/lib/libdiscid.so.0')" + ''; + }; + ipython = import ../shells/ipython { inherit (pkgs) stdenv fetchurl sip pyqt4; inherit buildPythonPackage pythonPackages; @@ -141,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; @@ -452,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"; @@ -555,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"; }; }; @@ -656,11 +691,11 @@ rec { }; beets = buildPythonPackage rec { - name = "beets-1.0.0"; + name = "beets-1.3.6"; src = fetchurl { url = "http://pypi.python.org/packages/source/b/beets/${name}.tar.gz"; - md5 = "88ad09a93aa0d69ce813205cf23b2a6c"; + md5 = "59615a54b3ac3983159e77ff9dda373e"; }; # tests depend on $HOME setting @@ -672,9 +707,18 @@ rec { pythonPackages.mutagen pythonPackages.munkres pythonPackages.musicbrainzngs + pythonPackages.enum34 + pythonPackages.pylast + pythonPackages.rarfile + pythonPackages.flask modules.sqlite3 modules.readline ]; + + buildInputs = with pythonPackages; [ mock pyechonest six responses nose ]; + + # 10 tests are failing + doCheck = false; meta = { homepage = http://beets.radbox.org; @@ -683,6 +727,52 @@ rec { maintainers = [ stdenv.lib.maintainers.iElectric ]; }; }; + + responses = pythonPackages.buildPythonPackage rec { + name = "responses-0.2.2"; + + propagatedBuildInputs = with pythonPackages; [ requests mock six pytest flake8 ]; + + doCheck = false; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/r/responses/responses-0.2.2.tar.gz"; + md5 = "5d79fd425cf8d858dfc8afa6475395d3"; + }; + + }; + + rarfile = pythonPackages.buildPythonPackage rec { + name = "rarfile-2.6"; + + propagatedBuildInputs = with pythonPackages; [ ]; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/r/rarfile/rarfile-2.6.tar.gz"; + md5 = "50ce3f3fdb9196a00059a5ea7b3739fd"; + }; + + meta = with stdenv.lib; { + description = "rarfile - RAR archive reader for Python"; + homepage = https://github.com/markokr/rarfile; + }; + }; + + pyechonest = pythonPackages.buildPythonPackage rec { + name = "pyechonest-8.0.2"; + + propagatedBuildInputs = with pythonPackages; [ ]; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/pyechonest/pyechonest-8.0.2.tar.gz"; + md5 = "5586fe8ece7af4e24f71ea740185127e"; + }; + + meta = with stdenv.lib; { + description = "Tap into The Echo Nest's Musical Brain for the best music search, information, recommendations and remix tools on the web"; + homepage = https://github.com/echonest/pyechonest; + }; + }; bitbucket_api = buildPythonPackage rec { @@ -704,6 +794,22 @@ rec { }; }; + bitbucket-cli = buildPythonPackage rec { + name = "bitbucket-cli-0.4.1"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/b/bitbucket-cli/${name}.tar.gz"; + md5 = "79cdbdc6c95dfa313d12cbdef406c9f2"; + }; + + pythonPath = [ requests ]; + + meta = with stdenv.lib; { + description = "Bitbucket command line interface"; + homepage = "https://bitbucket.org/zhemao/bitbucket-cli"; + maintainers = [ maintainers.refnil ]; + }; + }; + bitstring = buildPythonPackage rec { name = "bitstring-3.1.2"; @@ -802,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. @@ -1030,6 +1136,20 @@ rec { }); + click = buildPythonPackage { + name = "click-2.1"; + src = fetchurl { + url = https://pypi.python.org/packages/source/c/click/click-2.1.tar.gz; + md5 = "0ba97ba09af82c56e2d35f3412d0aa6e"; + }; + meta = { + homepage = "http://click.pocoo.org/"; + description = "Click is a Python package for creating beautiful command line interfaces in a composable way with as little code as necessary."; + license = "bsd, 3-clause"; + }; + }; + + clepy = buildPythonPackage rec { name = "clepy-0.3.20"; @@ -1475,7 +1595,7 @@ rec { homepage = http://code.google.com/p/cssutils/; - license = "LGPLv3+"; + license = stdenv.lib.licenses.lgpl3Plus; }; }); @@ -1646,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"; @@ -2007,6 +2163,16 @@ rec { }; + logster = buildPythonPackage { + name = "logster-7475c53822"; + src = fetchgit { + url = git://github.com/etsy/logster; + rev = "7475c53822"; + sha256 = "1ls007qmziwb50c5iikxhqin0xbn673gbd25m5k09861435cknvr"; + }; + }; + + paver = buildPythonPackage rec { version = "1.2.2"; name = "Paver-${version}"; @@ -2264,6 +2430,37 @@ rec { }; }; + radicale = buildPythonPackage rec { + name = "radicale-${version}"; + namePrefix = ""; + version = "0.9b1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/R/Radicale/Radicale-${version}.tar.gz"; + sha256 = "3a8451909de849f173f577ddec0a085f19040dbb6aa13d5256208a0f8e11d88d"; + }; + + propagatedBuildInputs = with pythonPackages; [ + flup + ldap + sqlalchemy + ]; + + doCheck = false; + + meta = { + homepage = "http://www.radicale.org/"; + longDescription = '' + The Radicale Project is a complete CalDAV (calendar) and CardDAV + (contact) server solution. Calendars and address books are available for + both local and remote access, possibly limited through authentication + policies. They can be viewed and edited by calendar and contact clients + on mobile phones or computers. + ''; + license = stdenv.lib.licenses.gpl3Plus; + maintainers = [ stdenv.lib.maintainers.edwtjo ]; + }; + }; raven = buildPythonPackage rec { name = "raven-3.4.1"; @@ -2506,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"; @@ -2637,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 ]; }; }; @@ -2653,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 ]; }; }; @@ -2930,6 +3127,15 @@ rec { }; }; + enum34 = buildPythonPackage rec { + name = "enum34-1.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/e/enum34/${name}.tar.gz"; + md5 = "9d57f5454c70c11707998ea26c1b0a7c"; + }; + + }; epc = buildPythonPackage rec { name = "epc-0.0.3"; @@ -3131,7 +3337,7 @@ rec { ''; # See http://foolscap.lothar.com/trac/browser/LICENSE. - license = "MIT"; + license = stdenv.lib.licenses.mit; maintainers = [ ]; }; @@ -3436,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 ]; @@ -3546,6 +3752,24 @@ rec { }; }); + httpbin = buildPythonPackage rec { + name = "httpbin-0.2.0"; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/h/httpbin/${name}.tar.gz"; + md5 = "9b2bb2fab45f5fa839e9a776a64d6089"; + }; + + propagatedBuildInputs = [ flask markupsafe decorator itsdangerous six ]; + + meta = { + homepage = https://github.com/kennethreitz/httpbin; + description = "HTTP Request & Response Service"; + license = licenses.mit; + }; + + }; + httplib2 = buildPythonPackage rec { name = "httplib2-0.9"; @@ -3562,6 +3786,38 @@ rec { }; }; + httpretty = buildPythonPackage rec { + name = "httpretty-${version}"; + version = "0.8.3"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/h/httpretty/${name}.tar.gz"; + md5 = "50b02560a49fe928c90c53a49791f621"; + }; + + buildInputs = [ tornado requests httplib2 sure nose coverage ]; + + propagatedBuildInputs = [ urllib3 ]; + + postPatch = '' + sed -i -e 's/==.*$//' *requirements.txt + # XXX: Drop this after version 0.8.4 is released. + patch httpretty/core.py < "$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"; @@ -8078,7 +8503,7 @@ rec { homepage = http://python-xlib.sourceforge.net/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; }); @@ -8188,7 +8613,7 @@ rec { and Haskell API. ''; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; }); @@ -8657,11 +9082,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 ]; @@ -8691,6 +9116,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}"; @@ -9062,26 +9505,21 @@ rec { pykka = buildPythonPackage rec { name = "pykka-${version}"; - version = "1.1.0"; + version = "1.2.0"; src = fetchgit { url = "https://github.com/jodal/pykka.git"; rev = "refs/tags/v${version}"; - sha256 = "0w6bcaqkzwmd9habszlgjkp3kkhkna08s9aivnmna5hddsghfqmz"; + sha256 = "17vv2q636zp2fvxrp7ckgnz1ifaffcj5vdxvfb4isd1d32c49amb"; }; - # python zip complains about old timestamps - preConfigure = '' - find -print0 | xargs -0 touch - ''; - # There are no tests doCheck = false; - meta = { + meta = with stdenv.lib; { homepage = http://www.pykka.org; description = "A Python implementation of the actor model"; - maintainers = [ stdenv.lib.maintainers.rickynils ]; + maintainers = [ maintainers.rickynils ]; }; }; @@ -9274,7 +9712,7 @@ rec { meta = { description = "Cross-platform system power status information"; homepage = https://github.com/Kentzo/Power; - license = "mit"; + license = stdenv.lib.licenses.mit; }; }; @@ -9298,6 +9736,27 @@ rec { }; }; + pythonefl = buildPythonPackage rec { + name = "python-efl-${version}"; + version = "1.10.0"; + src = fetchurl { + url = "http://download.enlightenment.org/rel/bindings/python/${name}.tar.gz"; + sha256 = "1inv2qalnm9paifdwyh9q3ffxcp9bjj92phvfw1rgkaildvfji5i"; + }; + preConfigure = '' + export NIX_CFLAGS_COMPILE="-I${pkgs.e18.efl}/include/eo-1 -I${pkgs.e18.efl}/include/eina-1 -I${pkgs.e18.efl}/include/eina-1/eina -I${pkgs.e18.efl}/include/evas-1 -I${dbus}/include/dbus-1.0 -I${pkgs.e18.efl}/include/efl-1 -I${pkgs.e18.efl}/include/eet-1 -I${pkgs.e18.efl}/include/ecore-1 -I${pkgs.e18.efl}/include/ecore-evas-1 -I${pkgs.e18.efl}/include/ecore-file-1 -I${pkgs.e18.efl}/include/ecore-input-1 -I${pkgs.e18.efl}/include/ecore-imf-1 -I${pkgs.e18.efl}/include/ecore-con-1 -I${pkgs.e18.efl}/include/edje-1 -I${pkgs.e18.efl}/include/eldbus-1 -I${pkgs.e18.efl}/include/efreet-1 -I${pkgs.e18.efl}/include/ethumb-client-1 -I${pkgs.e18.efl}/include/ethumb-1 -I${pkgs.e18.efl}/include/ecore-x-1 $NIX_CFLAGS_COMPILE" + ''; + buildInputs = [ pkgs.pkgconfig pkgs.e18.efl pkgs.e18.elementary ]; + meta = { + description = "Python bindings for EFL and Elementary."; + homepage = http://enlightenment.org/; + maintainers = [ stdenv.lib.maintainers.matejc ]; + platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.gpl3; + }; + }; + + # python2.7 specific packages } // optionalAttrs isPy27 ( with pythonPackages; diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix index df0480bf82c..c447587e36e 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 ce01b257741..da560b6997f 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; @@ -295,7 +292,6 @@ let texLive = linux; texLiveBeamer = linux; texLiveExtra = linux; - texinfo = all; tightvnc = linux; time = linux; tinycc = linux; @@ -343,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;