diff --git a/.gitignore b/.gitignore
index 6405b7860f2..4bcac5d261e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
*~
,*
+.*.swp
+.*.swo
diff --git a/doc/language-support.xml b/doc/language-support.xml
index dc63dd68503..6cc028c0b0a 100644
--- a/doc/language-support.xml
+++ b/doc/language-support.xml
@@ -18,10 +18,10 @@ such as Perl or Haskell. These are described in this chapter.
Nixpkgs provides a function buildPerlPackage,
a generic package builder function for any Perl package that has a
standard Makefile.PL. It’s implemented in pkgs/development/perl-modules/generic.
+xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/perl-modules/generic">pkgs/development/perl-modules/generic.
Perl packages from CPAN are defined in pkgs/perl-packages.nix,
+xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/top-level/perl-packages.nix">pkgs/perl-packages.nix,
rather than pkgs/all-packages.nix. Most Perl
packages are so straight-forward to build that they are defined here
directly, rather than having a separate function for each package
@@ -162,7 +162,7 @@ ClassC3Componentised = buildPerlPackage rec {
which many Python packages do nowadays, can be built very simply using
the buildPythonPackage function. This function is
implemented
- in pkgs/development/python-modules/generic/default.nix
+ in pkgs/development/python-modules/generic/default.nix
and works similarly to buildPerlPackage. (See
for details.)
@@ -170,7 +170,7 @@ ClassC3Componentised = buildPerlPackage rec {
Python packages that use buildPythonPackage are
defined
- in pkgs/top-level/python-packages.nix.
+ in pkgs/top-level/python-packages.nix.
Most of them are simple. For example:
@@ -196,17 +196,18 @@ twisted = buildPythonPackage {
-
+
+
+ Terms and Conditions
+
+This is the Android Software Development Kit License Agreement.
+
+
+1. Introduction
+
+
+1.1 The Android Software Development Kit (referred to in this License Agreement as the "SDK" and specifically including the Android system files, packaged APIs, and Google APIs add-ons) is licensed to you subject to the terms of this License Agreement. This License Agreement forms a legally binding contract between you and Google in relation to your use of the SDK.
+
+1.2 "Android" means the Android software stack for devices, as made available under the Android Open Source Project, which is located at the following URL: http://source.android.com/, as updated from time to time.
+
+1.3 "Google" means Google Inc., a Delaware corporation with principal place of business at 1600 Amphitheatre Parkway, Mountain View, CA 94043, United States.
+
+
+2. Accepting this License Agreement
+
+
+2.1 In order to use the SDK, you must first agree to this License Agreement. You may not use the SDK if you do not accept this License Agreement.
+
+2.2 By clicking to accept, you hereby agree to the terms of this License Agreement.
+
+2.3 You may not use the SDK and may not accept the License Agreement if you are a person barred from receiving the SDK under the laws of the United States or other countries including the country in which you are resident or from which you use the SDK.
+
+2.4 If you are agreeing to be bound by this License Agreement on behalf of your employer or other entity, you represent and warrant that you have full legal authority to bind your employer or such entity to this License Agreement. If you do not have the requisite authority, you may not accept the License Agreement or use the SDK on behalf of your employer or other entity.
+
+
+3. SDK License from Google
+
+
+3.1 Subject to the terms of this License Agreement, Google grants you a limited, worldwide, royalty-free, non-assignable and non-exclusive license to use the SDK solely to develop applications to run on the Android platform.
+
+3.2 You agree that Google or third parties own all legal right, title and interest in and to the SDK, including any Intellectual Property Rights that subsist in the SDK. "Intellectual Property Rights" means any and all rights under patent law, copyright law, trade secret law, trademark law, and any and all other proprietary rights. Google reserves all rights not expressly granted to you.
+
+3.3 You may not use the SDK for any purpose not expressly permitted by this License Agreement. Except to the extent required by applicable third party licenses, you may not: (a) copy (except for backup purposes), modify, adapt, redistribute, decompile, reverse engineer, disassemble, or create derivative works of the SDK or any part of the SDK; or (b) load any part of the SDK onto a mobile handset or any other hardware device except a personal computer, combine any part of the SDK with other software, or distribute any software or device incorporating a part of the SDK.
+
+3.4 You agree that you will not take any actions that may cause or result in the fragmentation of Android, including but not limited to distributing, participating in the creation of, or promoting in any way a software development kit derived from the SDK.
+
+3.5 Use, reproduction and distribution of components of the SDK licensed under an open source software license are governed solely by the terms of that open source software license and not this License Agreement.
+
+3.6 You agree that the form and nature of the SDK that Google provides may change without prior notice to you and that future versions of the SDK may be incompatible with applications developed on previous versions of the SDK. You agree that Google may stop (permanently or temporarily) providing the SDK (or any features within the SDK) to you or to users generally at Google's sole discretion, without prior notice to you.
+
+3.7 Nothing in this License Agreement gives you a right to use any of Google's trade names, trademarks, service marks, logos, domain names, or other distinctive brand features.
+
+3.8 You agree that you will not remove, obscure, or alter any proprietary rights notices (including copyright and trademark notices) that may be affixed to or contained within the SDK.
+
+
+4. Use of the SDK by You
+
+
+4.1 Google agrees that it obtains no right, title or interest from you (or your licensors) under this License Agreement in or to any software applications that you develop using the SDK, including any intellectual property rights that subsist in those applications.
+
+4.2 You agree to use the SDK and write applications only for purposes that are permitted by (a) this License Agreement and (b) any applicable law, regulation or generally accepted practices or guidelines in the relevant jurisdictions (including any laws regarding the export of data or software to and from the United States or other relevant countries).
+
+4.3 You agree that if you use the SDK to develop applications for general public users, you will protect the privacy and legal rights of those users. If the users provide you with user names, passwords, or other login information or personal information, you must make the users aware that the information will be available to your application, and you must provide legally adequate privacy notice and protection for those users. If your application stores personal or sensitive information provided by users, it must do so securely. If the user provides your application with Google Account information, your application may only use that information to access the user's Google Account when, and for the limited purposes for which, the user has given you permission to do so.
+
+4.4 You agree that you will not engage in any activity with the SDK, including the development or distribution of an application, that interferes with, disrupts, damages, or accesses in an unauthorized manner the servers, networks, or other properties or services of any third party including, but not limited to, Google or any mobile communications carrier.
+
+4.5 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any data, content, or resources that you create, transmit or display through Android and/or applications for Android, and for the consequences of your actions (including any loss or damage which Google may suffer) by doing so.
+
+4.6 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any breach of your obligations under this License Agreement, any applicable third party contract or Terms of Service, or any applicable law or regulation, and for the consequences (including any loss or damage which Google or any third party may suffer) of any such breach.
+
+
+5. Your Developer Credentials
+
+
+5.1 You agree that you are responsible for maintaining the confidentiality of any developer credentials that may be issued to you by Google or which you may choose yourself and that you will be solely responsible for all applications that are developed under your developer credentials.
+
+
+6. Privacy and Information
+
+
+6.1 In order to continually innovate and improve the SDK, Google may collect certain usage statistics from the software including but not limited to a unique identifier, associated IP address, version number of the software, and information on which tools and/or services in the SDK are being used and how they are being used. Before any of this information is collected, the SDK will notify you and seek your consent. If you withhold consent, the information will not be collected.
+
+6.2 The data collected is examined in the aggregate to improve the SDK and is maintained in accordance with Google's Privacy Policy.
+
+
+7. Third Party Applications
+
+
+7.1 If you use the SDK to run applications developed by a third party or that access data, content or resources provided by a third party, you agree that Google is not responsible for those applications, data, content, or resources. You understand that all data, content or resources which you may access through such third party applications are the sole responsibility of the person from which they originated and that Google is not liable for any loss or damage that you may experience as a result of the use or access of any of those third party applications, data, content, or resources.
+
+7.2 You should be aware the data, content, and resources presented to you through such a third party application may be protected by intellectual property rights which are owned by the providers (or by other persons or companies on their behalf). You may not modify, rent, lease, loan, sell, distribute or create derivative works based on these data, content, or resources (either in whole or in part) unless you have been specifically given permission to do so by the relevant owners.
+
+7.3 You acknowledge that your use of such third party applications, data, content, or resources may be subject to separate terms between you and the relevant third party. In that case, this License Agreement does not affect your legal relationship with these third parties.
+
+
+8. Using Android APIs
+
+
+8.1 Google Data APIs
+
+8.1.1 If you use any API to retrieve data from Google, you acknowledge that the data may be protected by intellectual property rights which are owned by Google or those parties that provide the data (or by other persons or companies on their behalf). Your use of any such API may be subject to additional Terms of Service. You may not modify, rent, lease, loan, sell, distribute or create derivative works based on this data (either in whole or in part) unless allowed by the relevant Terms of Service.
+
+8.1.2 If you use any API to retrieve a user's data from Google, you acknowledge and agree that you shall retrieve data only with the user's explicit consent and only when, and for the limited purposes for which, the user has given you permission to do so.
+
+
+9. Terminating this License Agreement
+
+
+9.1 This License Agreement will continue to apply until terminated by either you or Google as set out below.
+
+9.2 If you want to terminate this License Agreement, you may do so by ceasing your use of the SDK and any relevant developer credentials.
+
+9.3 Google may at any time, terminate this License Agreement with you if:
+(A) you have breached any provision of this License Agreement; or
+(B) Google is required to do so by law; or
+(C) the partner with whom Google offered certain parts of SDK (such as APIs) to you has terminated its relationship with Google or ceased to offer certain parts of the SDK to you; or
+(D) Google decides to no longer provide the SDK or certain parts of the SDK to users in the country in which you are resident or from which you use the service, or the provision of the SDK or certain SDK services to you by Google is, in Google's sole discretion, no longer commercially viable.
+
+9.4 When this License Agreement comes to an end, all of the legal rights, obligations and liabilities that you and Google have benefited from, been subject to (or which have accrued over time whilst this License Agreement has been in force) or which are expressed to continue indefinitely, shall be unaffected by this cessation, and the provisions of paragraph 14.7 shall continue to apply to such rights, obligations and liabilities indefinitely.
+
+
+10. DISCLAIMER OF WARRANTIES
+
+
+10.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT YOUR USE OF THE SDK IS AT YOUR SOLE RISK AND THAT THE SDK IS PROVIDED "AS IS" AND "AS AVAILABLE" WITHOUT WARRANTY OF ANY KIND FROM GOOGLE.
+
+10.2 YOUR USE OF THE SDK AND ANY MATERIAL DOWNLOADED OR OTHERWISE OBTAINED THROUGH THE USE OF THE SDK IS AT YOUR OWN DISCRETION AND RISK AND YOU ARE SOLELY RESPONSIBLE FOR ANY DAMAGE TO YOUR COMPUTER SYSTEM OR OTHER DEVICE OR LOSS OF DATA THAT RESULTS FROM SUCH USE.
+
+10.3 GOOGLE FURTHER EXPRESSLY DISCLAIMS ALL WARRANTIES AND CONDITIONS OF ANY KIND, WHETHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO THE IMPLIED WARRANTIES AND CONDITIONS OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+
+
+11. LIMITATION OF LIABILITY
+
+
+11.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT GOOGLE, ITS SUBSIDIARIES AND AFFILIATES, AND ITS LICENSORS SHALL NOT BE LIABLE TO YOU UNDER ANY THEORY OF LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, CONSEQUENTIAL OR EXEMPLARY DAMAGES THAT MAY BE INCURRED BY YOU, INCLUDING ANY LOSS OF DATA, WHETHER OR NOT GOOGLE OR ITS REPRESENTATIVES HAVE BEEN ADVISED OF OR SHOULD HAVE BEEN AWARE OF THE POSSIBILITY OF ANY SUCH LOSSES ARISING.
+
+
+12. Indemnification
+
+
+12.1 To the maximum extent permitted by law, you agree to defend, indemnify and hold harmless Google, its affiliates and their respective directors, officers, employees and agents from and against any and all claims, actions, suits or proceedings, as well as any and all losses, liabilities, damages, costs and expenses (including reasonable attorneys fees) arising out of or accruing from (a) your use of the SDK, (b) any application you develop on the SDK that infringes any copyright, trademark, trade secret, trade dress, patent or other intellectual property right of any person or defames any person or violates their rights of publicity or privacy, and (c) any non-compliance by you with this License Agreement.
+
+
+13. Changes to the License Agreement
+
+
+13.1 Google may make changes to the License Agreement as it distributes new versions of the SDK. When these changes are made, Google will make a new version of the License Agreement available on the website where the SDK is made available.
+
+
+14. General Legal Terms
+
+
+14.1 This License Agreement constitutes the whole legal agreement between you and Google and governs your use of the SDK (excluding any services which Google may provide to you under a separate written agreement), and completely replaces any prior agreements between you and Google in relation to the SDK.
+
+14.2 You agree that if Google does not exercise or enforce any legal right or remedy which is contained in this License Agreement (or which Google has the benefit of under any applicable law), this will not be taken to be a formal waiver of Google's rights and that those rights or remedies will still be available to Google.
+
+14.3 If any court of law, having the jurisdiction to decide on this matter, rules that any provision of this License Agreement is invalid, then that provision will be removed from this License Agreement without affecting the rest of this License Agreement. The remaining provisions of this License Agreement will continue to be valid and enforceable.
+
+14.4 You acknowledge and agree that each member of the group of companies of which Google is the parent shall be third party beneficiaries to this License Agreement and that such other companies shall be entitled to directly enforce, and rely upon, any provision of this License Agreement that confers a benefit on (or rights in favor of) them. Other than this, no other person or company shall be third party beneficiaries to this License Agreement.
+
+14.5 EXPORT RESTRICTIONS. THE SDK IS SUBJECT TO UNITED STATES EXPORT LAWS AND REGULATIONS. YOU MUST COMPLY WITH ALL DOMESTIC AND INTERNATIONAL EXPORT LAWS AND REGULATIONS THAT APPLY TO THE SDK. THESE LAWS INCLUDE RESTRICTIONS ON DESTINATIONS, END USERS AND END USE.
+
+14.6 The rights granted in this License Agreement may not be assigned or transferred by either you or Google without the prior written approval of the other party. Neither you nor Google shall be permitted to delegate their responsibilities or obligations under this License Agreement without the prior written approval of the other party.
+
+14.7 This License Agreement, and your relationship with Google under this License Agreement, shall be governed by the laws of the State of California without regard to its conflict of laws provisions. You and Google agree to submit to the exclusive jurisdiction of the courts located within the county of Santa Clara, California to resolve any legal matter arising from this License Agreement. Notwithstanding this, you agree that Google shall still be allowed to apply for injunctive remedies (or an equivalent type of urgent legal relief) in any jurisdiction.
+
+November 13, 2012
+
+
+ Terms and Conditions
+
+This is the Google TV Add-on for the Android Software Development Kit License Agreement.
+
+1. Introduction
+
+1.1 The Google TV Add-on for the Android Software Development Kit (referred to in this License Agreement as the "Google TV Add-on" and specifically including the Android system files, packaged APIs, and Google APIs add-ons) is licensed to you subject to the terms of this License Agreement. This License Agreement forms a legally binding contract between you and Google in relation to your use of the Google TV Add-on.
+
+1.2 "Google" means Google Inc., a Delaware corporation with principal place of business at 1600 Amphitheatre Parkway, Mountain View, CA 94043, United States.
+
+2. Accepting this License Agreement
+
+2.1 In order to use the Google TV Add-on, you must first agree to this License Agreement. You may not use the Google TV Add-on if you do not accept this License Agreement.
+
+2.2 You can accept this License Agreement by:
+
+(A) clicking to accept or agree to this License Agreement, where this option is made available to you; or
+
+(B) by actually using the Google TV Add-on. In this case, you agree that use of the Google TV Add-on constitutes acceptance of the License Agreement from that point onwards.
+
+2.3 You may not use the Google TV Add-on and may not accept the Licensing Agreement if you are a person barred from receiving the Google TV Add-on under the laws of the United States or other countries including the country in which you are resident or from which you use the Google TV Add-on.
+
+2.4 If you are agreeing to be bound by this License Agreement on behalf of your employer or other entity, you represent and warrant that you have full legal authority to bind your employer or such entity to this License Agreement. If you do not have the requisite authority, you may not accept the Licensing Agreement or use the Google TV Add-on on behalf of your employer or other entity.
+
+3. Google TV Add-on License from Google
+
+3.1 Subject to the terms of this License Agreement, Google grants you a limited, worldwide, royalty-free, non- assignable and non-exclusive license to use the Google TV Add-on solely to develop applications to run on the Google TV platform.
+
+3.2 You agree that Google or third parties own all legal right, title and interest in and to the Google TV Add-on, including any Intellectual Property Rights that subsist in the Google TV Add-on. "Intellectual Property Rights" means any and all rights under patent law, copyright law, trade secret law, trademark law, and any and all other proprietary rights. Google reserves all rights not expressly granted to you.
+
+3.3 Except to the extent required by applicable third party licenses, you may not copy (except for backup purposes), modify, adapt, redistribute, decompile, reverse engineer, disassemble, or create derivative works of the Google TV Add-on or any part of the Google TV Add-on. Except to the extent required by applicable third party licenses, you may not load any part of the Google TV Add-on onto a mobile handset, television, or any other hardware device except a personal computer, combine any part of the Google TV Add-on with other software, or distribute any software or device incorporating a part of the Google TV Add-on.
+
+3.4 Use, reproduction and distribution of components of the Google TV Add-on licensed under an open source software license are governed solely by the terms of that open source software license and not this License Agreement.
+
+3.5 You agree that the form and nature of the Google TV Add-on that Google provides may change without prior notice to you and that future versions of the Google TV Add-on may be incompatible with applications developed on previous versions of the Google TV Add-on. You agree that Google may stop (permanently or temporarily) providing the Google TV Add-on (or any features within the Google TV Add-on) to you or to users generally at Google's sole discretion, without prior notice to you.
+
+3.6 Nothing in this License Agreement gives you a right to use any of Google's or it’s licensors’ trade names, trademarks, service marks, logos, domain names, or other distinctive brand features.
+
+3.7 You agree that you will not remove, obscure, or alter any proprietary rights notices (including copyright and trademark notices) that may be affixed to or contained within the Google TV Add-on.
+
+4. Use of the Google TV Add-on by You
+
+4.1 Google agrees that it obtains no right, title or interest from you (or your licensors) under this License Agreement in or to any software applications that you develop using the Google TV Add-on, including any intellectual property rights that subsist in those applications.
+
+4.2 You agree to use the Google TV Add-on and write applications only for purposes that are permitted by (a) this License Agreement and (b) any applicable law, regulation or generally accepted practices or guidelines in the relevant jurisdictions (including any laws regarding the export of data or software to and from the United States or other relevant countries).
+
+4.3 You agree that if you use the Google TV Add-on to develop applications for general public users, you will protect the privacy and legal rights of those users. If the users provide you with user names, passwords, or other login information or personal information, your must make the users aware that the information will be available to your application, and you must provide legally adequate privacy notice and protection for those users. If your application stores personal or sensitive information provided by users, it must do so securely. If the user provides your application with Google Account information, your application may only use that information to access the user's Google Account when, and for the limited purposes for which, the user has given you explicit permission to do so.
+
+4.4 You agree that you will not engage in any activity with the Google TV Add-on, including the development or distribution of an application, that interferes with, disrupts, damages, or accesses in an unauthorized manner the servers, networks, or other properties or services of any third party including, but not limited to, Google, Multichannel Video Program Distributors or any mobile communications carrier.
+
+4.5 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any data, content, or resources that you create, transmit or display through the Google TV platform and/or applications for the Google TV platform, and for the consequences of your actions (including any loss or damage which Google may suffer) by doing so.
+
+4.6 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any breach of your obligations under this License Agreement, any applicable third party contract or Terms of Service, or any applicable law or regulation, and for the consequences (including any loss or damage which Google or any third party may suffer) of any such breach.
+
+5. Your Developer Credentials
+
+5.1 You agree that you are responsible for maintaining the confidentiality of any developer credentials that may be issued to you by Google or which you may choose yourself and that you will be solely responsible for all applications that are developed under your developer credentials.
+
+6. Privacy and Information
+
+6.1 In order to continually innovate and improve the Google TV Add-on, Google may collect certain usage statistics from the software including but not limited to a unique identifier, associated IP address, version number of the software, and information on which tools and/or services in the Google TV Add-on are being used and how they are being used. Before any of this information is collected, the Google TV Add-on will notify you and seek your consent. If you withhold consent, the information will not be collected.
+
+6.2 The data collected is examined in the aggregate to improve the Google TV Add-on and is maintained in accordance with Google's Privacy Policy.
+
+7. Third Party Applications for the Google TV Platform
+
+7.1 If you use the Google TV Add-on to run applications developed by a third party or that access data, content or resources provided by a third party, you agree that Google is not responsible for those applications, data, content, or resources. You understand that all data, content or resources which you may access through such third party applications are the sole responsibility of the person from which they originated and that Google is not liable for any loss or damage that you may experience as a result of the use or access of any of those third party applications, data, content, or resources.
+
+7.2 You should be aware the data, content, and resources presented to you through such a third party application may be protected by intellectual property rights which are owned by the providers (or by other persons or companies on their behalf). You may not modify, rent, lease, loan, sell, distribute or create derivative works based on these data, content, or resources (either in whole or in part) unless you have been specifically given permission to do so by the relevant owners.
+
+7.3 You acknowledge that your use of such third party applications, data, content, or resources may be subject to separate terms between you and the relevant third party. In that case, this License Agreement does not affect your legal relationship with these third parties.
+
+8. Using Google TV APIs
+
+8.1 If you use any Google TV API to retrieve data from Google, you acknowledge that the data (“Google TV API Content”) may be protected by intellectual property rights which are owned by Google or those parties that provide the data (or by other persons or companies on their behalf). Your use of any such API may be subject to additional Terms of Service. You may not modify, rent, lease, loan, sell, distribute or create derivative works based on this data (either in whole or in part) unless allowed by the relevant Terms of Service. Some portions of the Google TV API Content are licensed to Google by third parties, including but not limited to Tribune Media Services
+
+8.2 If you use any API to retrieve a user's data from Google, you acknowledge and agree that you shall retrieve data only with the user's explicit consent and only when, and for the limited purposes for which, the user has given you permission to do so.
+
+8.3 Except as explicitly permitted in Section 3 (Google TV Add-on License from Google), you must:
+
+(a) not modify nor format the Google TV API Content except to the extent reasonably and technically necessary to optimize the display such Google TV API Content in your application;
+
+(b) not edit the Google TV API Content in a manner that renders the Google TV API Content inaccurate of alters its inherent meaning (provided that displaying excerpts will not violate the foregoing); or
+
+(c) not create any commercial audience measurement tool or service using the Google TV API Content
+
+9. Terminating this License Agreement
+
+9.1 This License Agreement will continue to apply until terminated by either you or Google as set out below.
+
+9.2 If you want to terminate this License Agreement, you may do so by ceasing your use of the Google TV Add-on and any relevant developer credentials.
+
+9.3 Google may at any time, terminate this License Agreement with you if:
+
+(A) you have breached any provision of this License Agreement; or
+
+(B) Google is required to do so by law; or
+
+(C) the partner with whom Google offered certain parts of Google TV Add-on (such as APIs) to you has terminated its relationship with Google or ceased to offer certain parts of the Google TV Add-on to you; or
+
+(D) Google decides to no longer providing the Google TV Add-on or certain parts of the Google TV Add-on to users in the country in which you are resident or from which you use the service, or the provision of the Google TV Add-on or certain Google TV Add-on services to you by Google is, in Google's sole discretion, no longer commercially viable.
+
+9.4 When this License Agreement comes to an end, all of the legal rights, obligations and liabilities that you and Google have benefited from, been subject to (or which have accrued over time whilst this License Agreement has been in force) or which are expressed to continue indefinitely, shall be unaffected by this cessation, and the provisions of paragraph 14.7 shall continue to apply to such rights, obligations and liabilities indefinitely.
+
+10. DISCLAIMER OF WARRANTIES
+
+10.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT YOUR USE OF THE GOOGLE TV ADD-ON IS AT YOUR SOLE RISK AND THAT THE GOOGLE TV ADD-ON IS PROVIDED "AS IS" AND "AS AVAILABLE" WITHOUT WARRANTY OF ANY KIND FROM GOOGLE.
+
+10.2 YOUR USE OF THE GOOGLE TV ADD-ON AND ANY MATERIAL DOWNLOADED OR OTHERWISE OBTAINED THROUGH THE USE OF THE GOOGLE TV ADD-ON IS AT YOUR OWN DISCRETION AND RISK AND YOU ARE SOLELY RESPONSIBLE FOR ANY DAMAGE TO YOUR COMPUTER SYSTEM OR OTHER DEVICE OR LOSS OF DATA THAT RESULTS FROM SUCH USE.
+
+10.3 GOOGLE FURTHER EXPRESSLY DISCLAIMS ALL WARRANTIES AND CONDITIONS OF ANY KIND, WHETHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO THE IMPLIED WARRANTIES AND CONDITIONS OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+
+11. LIMITATION OF LIABILITY
+
+11.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT GOOGLE, ITS SUBSIDIARIES AND AFFILIATES, AND ITS LICENSORS SHALL NOT BE LIABLE TO YOU UNDER ANY THEORY OF LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL CONSEQUENTIAL OR EXEMPLARY DAMAGES THAT MAY BE INCURRED BY YOU, INCLUDING ANY LOSS OF DATA, WHETHER OR NOT GOOGLE OR ITS REPRESENTATIVES HAVE BEEN ADVISED OF OR SHOULD HAVE BEEN AWARE OF THE POSSIBILITY OF ANY SUCH LOSSES ARISING.
+
+12. Indemnification
+
+12.1 To the maximum extent permitted by law, you agree to defend, indemnify and hold harmless Google, its affiliates and their respective directors, officers, employees and agents from and against any and all claims, actions, suits or proceedings, as well as any and all losses, liabilities, damages, costs and expenses (including reasonable attorneys fees) arising out of or accruing from (a) your use of the Google TV Add-on, (b) any application you develop on the Google TV Add-on that infringes any copyright, trademark, trade secret, trade dress, patent or other intellectual property right of any person or defames any person or violates their rights of publicity or privacy, and (c) any non-compliance by you with this License Agreement.
+
+13. Changes to the License Agreement
+
+13.1 Google may make changes to the License Agreement as it distributes new versions of the Google TV Add-on.
+
+14. General Legal Terms
+
+14.1 This License Agreement constitute the whole legal agreement between you and Google and govern your use of the Google TV Add-on (excluding any services which Google may provide to you under a separate written agreement), and completely replace any prior agreements between you and Google in relation to the Google TV Add-on.
+
+14.2 You agree that if Google does not exercise or enforce any legal right or remedy which is contained in this License Agreement (or which Google has the benefit of under any applicable law), this will not be taken to be a formal waiver of Google's rights and that those rights or remedies will still be available to Google.
+
+14.3 If any court of law, having the jurisdiction to decide on this matter, rules that any provision of this License Agreement is invalid, then that provision will be removed from this License Agreement without affecting the rest of this License Agreement. The remaining provisions of this License Agreement will continue to be valid and enforceable.
+
+14.4 You acknowledge and agree that Google’s API data licensors and each member of the group of companies of which Google is the parent shall be third party beneficiaries to this License Agreement and that such other companies shall be entitled to directly enforce, and rely upon, any provision of this License Agreement that confers a benefit on (or rights in favor of) them. Other than this, no other person or company shall be third party beneficiaries to this License Agreement.
+
+14.5 EXPORT RESTRICTIONS. THE GOOGLE TV ADD-ON IS SUBJECT TO UNITED STATES EXPORT LAWS AND REGULATIONS. YOU MUST COMPLY WITH ALL DOMESTIC AND INTERNATIONAL EXPORT LAWS AND REGULATIONS THAT APPLY TO THE GOOGLE TV ADD-ON. THESE LAWS INCLUDE RESTRICTIONS ON DESTINATIONS, END USERS AND END USE.
+
+14.6 The rights granted in this License Agreement may not be assigned or transferred by either you or Google without the prior written approval of the other party. Neither you nor Google shall be permitted to delegate their responsibilities or obligations under this License Agreement without the prior written approval of the other party.
+
+14.7 This License Agreement, and your relationship with Google under this License Agreement, shall be governed by the laws of the State of California without regard to its conflict of laws provisions. You and Google agree to submit to the exclusive jurisdiction of the courts located within the county of Santa Clara, California to resolve any legal matter arising from this License Agreement. Notwithstanding this, you agree that Google shall still be allowed to apply for injunctive remedies (or an equivalent type of urgent legal relief) in any jurisdiction.
+
+
+August 15, 2011
+
+
+
+
+
+ google
+ Google Inc.
+ google_apis
+ Google APIs
+ 3
+ 03
+ Android + Google APIs
+ http://developer.android.com/
+
+
+
+ 34908058
+ 1f92abf3a76be66ae8032257fc7620acbd2b2e3a
+ google_apis-3-r03.zip
+
+
+
+
+ com.google.android.maps
+ API for Google Maps.
+
+
+
+
+
+
+
+ google
+ Google Inc.
+ google_apis
+ Google APIs
+ 4
+ 2
+ Android + Google APIs, revision 2
+ http://developer.android.com/
+
+
+
+ 42435735
+ 9b6e86d8568558de4d606a7debc4f6049608dbd0
+ google_apis-4_r02.zip
+
+
+
+
+ com.google.android.maps
+ API for Google Maps.
+
+
+
+
+
+
+
+ google
+ Google Inc.
+ google_apis
+ Google APIs
+ 5
+ 01
+ Android + Google APIs, revision 1
+ http://developer.android.com/
+
+
+
+
+ 49123776
+ 46eaeb56b645ee7ffa24ede8fa17f3df70db0503
+ google_apis-5_r01.zip
+
+
+
+
+ com.google.android.maps
+ API for Google Maps.
+
+
+
+
+
+
+
+ google
+ Google Inc.
+ google_apis
+ Google APIs
+ 6
+ 1
+ Android + Google APIs, revision 1
+ http://developer.android.com/
+
+
+
+
+ 53382941
+ 5ff545d96e031e09580a6cf55713015c7d4936b2
+ google_apis-6_r01.zip
+
+
+
+
+ com.google.android.maps
+ API for Google Maps.
+
+
+
+
+
+
+
+ google
+ Google Inc.
+ google_apis
+ Google APIs
+ 7
+ 1
+ Android + Google APIs, revision 1
+ http://developer.android.com/
+
+
+
+ 53691339
+ 2e7f91e0fe34fef7f58aeced973c6ae52361b5ac
+ google_apis-7_r01.zip
+
+
+
+
+ com.google.android.maps
+ API for Google Maps.
+
+
+
+
+
+
+
+ google
+ Google Inc.
+ google_apis
+ Google APIs
+ 8
+ 2
+ Android + Google APIs, API 8, revision 2
+ http://developer.android.com/
+
+
+
+ 59505020
+ 3079958e7ec87222cac1e6b27bc471b27bf2c352
+ google_apis-8_r02.zip
+
+
+
+
+ com.google.android.maps
+ API for Google Maps.
+
+
+
+
+
+
+
+ google
+ Google Inc.
+ google_apis
+ Google APIs
+ 9
+ 2
+ Android + Google APIs, API 9, revision 2
+ http://developer.android.com/
+
+
+
+ 63401546
+ 78664645a1e9accea4430814f8694291a7f1ea5d
+ google_apis-9_r02.zip
+
+
+
+
+ com.google.android.maps
+ API for Google Maps.
+
+
+
+
+
+
+
+
+ google
+ Google Inc.
+ google_apis
+ Google APIs
+ 10
+ 2
+ Android + Google APIs, API 10, revision 2
+ http://developer.android.com/
+
+
+
+ 65781578
+ cc0711857c881fa7534f90cf8cc09b8fe985484d
+ google_apis-10_r02.zip
+
+
+
+
+ com.google.android.maps
+ API for Google Maps.
+
+
+
+
+
+
+
+ google
+ Google Inc.
+ google_apis
+ Google APIs
+ 11
+ 1
+ Android + Google APIs, API 11, revision 1
+ http://developer.android.com/
+
+
+
+ 83477179
+ 5eab5e81addee9f3576d456d205208314b5146a5
+ google_apis-11_r01.zip
+
+
+
+
+ com.google.android.maps
+ API for Google Maps.
+
+
+
+
+
+
+
+ google
+ Google Inc.
+ google_apis
+ Google APIs
+ 12
+ 1
+ Android + Google APIs, API 12, revision 1
+ http://developer.android.com/
+
+
+
+ 86099835
+ e9999f4fa978812174dfeceec0721c793a636e5d
+ google_apis-12_r01.zip
+
+
+
+
+ com.google.android.maps
+ API for Google Maps.
+
+
+
+
+
+
+
+ google
+ Google Inc.
+ google_apis
+ Google APIs
+ 13
+ 1
+ Android + Google APIs, API 13, revision 1
+ http://developer.android.com/
+
+
+
+ 88615525
+ 3b153edd211c27dc736c893c658418a4f9041417
+ google_apis-13_r01.zip
+
+
+
+
+ com.google.android.maps
+ API for Google Maps.
+
+
+
+
+
+
+ google
+ Google Inc.
+ google_apis
+ Google APIs
+ Android + Google APIs
+ 14
+ 2
+
+
+
+ com.google.android.maps
+
+
+ com.android.future.usb.accessory
+
+
+
+
+ 106533714
+ f8eb4d96ad0492b4c0db2d7e4f1a1a3836664d39
+ google_apis-14_r02.zip
+
+
+
+
+
+
+ google
+ Google Inc.
+ google_apis
+ Google APIs
+ Android + Google APIs
+ 15
+ 2
+
+
+ com.google.android.maps
+
+
+ com.android.future.usb.accessory
+
+
+ com.google.android.media.effects
+
+
+
+
+ 106612472
+ 6757c12788da0ea00c2ab58e54cb438b9f2bcf66
+ google_apis-15_r02.zip
+
+
+
+
+
+
+
+ google
+ Google Inc.
+ google_apis
+ Google APIs
+ Android + Google APIs
+ 16
+ 3
+
+
+ com.google.android.maps
+
+
+ com.android.future.usb.accessory
+
+
+ com.google.android.media.effects
+
+
+
+
+ 127278413
+ 63467dd32f471e3e81e33e9772c22f33235aa3b3
+ google_apis-16_r03.zip
+
+
+
+
+
+
+
+
+ google
+ Google Inc.
+ google_tv_addon
+ Google TV Addon
+ 12
+ 2
+ Android + Google TV, API 12, preview release
+ http://developer.android.com/
+
+
+
+ 78266751
+ 92128a12e7e8b0fb5bac59153d7779b717e7b840
+ google_tv-12_r02.zip
+
+
+
+
+
+
+
+ google
+ Google Inc.
+ google_apis
+ Google APIs
+ Android + Google APIs
+ 17
+ 1
+
+
+ com.google.android.maps
+
+
+ com.android.future.usb.accessory
+
+
+ com.google.android.media.effects
+
+
+
+
+ 132568033
+ 62cb086f11e15713878c8834d58ef1a2454c19a4
+ google_apis-17_r01.zip
+
+
+
+
+
+
+
+
+
+ 11
+ Android
+ android
+ Android Support Library
+ support
+ compatibility
+
+
+ 1264808
+ d30d182d8e4c86bb4464c03a83ccffce7bc84ecd
+ support_r11.zip
+
+
+
+
+
+
+
+
+ google
+ Google Inc.
+ Google Play Licensing Library
+ play_licensing
+ market_licensing
+ 2
+ Google Play Licensing client library
+ http://developer.android.com/guide/publishing/licensing.html
+
+
+ 75109
+ 355e8dc304a92a5616db235af8ee7bd554356254
+ market_licensing-r02.zip
+
+
+
+
+
+
+ google
+ Google Inc.
+ Google Play APK Expansion Library
+ play_apk_expansion
+ market_apk_expansion
+ 2
+ Google Play APK Expansion library
+ http://developer.android.com/guide/market/expansion-files.html
+
+
+ 111636
+ 47fa8c691fcc8cf815e7ebbf140f12e94495f73b
+ market_apk_expansion-r02.zip
+
+
+
+
+
+
+ google
+ Google Inc.
+ Google Play services
+ google_play_services
+ 4
+ Google Play Services client library and sample code
+ https://developers.google.com/android/google-play-services/index
+
+
+
+ 3732458
+ bbb3d11225fcf60a0bae75afa2c4737010468bf6
+ google_play_services_2012110_r04.zip
+
+
+
+
+
+
+ google
+ Google Inc.
+ Google USB Driver
+ usb_driver
+ 7
+ USB Driver for Windows, revision 7
+ http://developer.android.com/
+
+
+
+ 8681704
+ 147c339fde22f98ae41b15349a8303d39a2cf6e5
+ usb_driver_r07-windows.zip
+
+
+
+
+
+ google
+ Google Inc.
+ Google Play Billing Library
+ play_billing
+ market_billing
+ 3
+ Google Play Billing files and sample code
+ http://developer.android.com/google/play/billing/index.html
+
+
+ 435718
+ a133d454c992ef2a18e62fa810e8185f1be4b054
+ play_billing_r03.zip
+
+
+
+
+
+
+ google
+ Google Inc.
+ Google AdMob Ads SDK
+ admob_ads_sdk
+ 8
+ AdMob Ads SDK
+ https://developers.google.com/mobile-ads-sdk/docs/
+
+
+ 545547
+ 031476aa5a491239d2624e8de8c9e46e40d93e3f
+ https://dl-ssl.google.com/googleadmobadssdk/googleadmobadssdkandroid-6.2.1.zip
+
+
+
+
+
+
+ google
+ Google Inc.
+ Google Analytics SDK
+ analytics_sdk
+ 2
+ Analytics SDK
+ http://code.google.com/mobile/analytics/
+
+
+ 53055
+ 328bcdc6c241879ebb04d6edc6fec1052a171004
+ https://dl.google.com/gaformobileapps/GoogleAnalyticsAndroid_1.4.2.zip
+
+
+
+
+
+
+ google
+ Google Inc.
+ Google Web Driver
+ webdriver
+ 2
+ WebDriver
+ http://selenium.googlecode.com
+
+
+ 4055193
+ 13f3a3b2670a5fc04a7342861644be9a01b07e38
+ webdriver_r02.zip
+
+
+
+
+
+
+ google
+ Google Inc.
+ Google Cloud Messaging for Android Library
+ gcm
+ 3
+ Google Cloud Messaging for Android library and sample code
+ https://developers.google.com/android/gcm/index
+
+
+ 5901400
+ ad066fd0dc7fc99d8aadac09c65a3c2519fbc7bf
+ gcm_r03.zip
+
+
+
+
+
diff --git a/pkgs/development/mobile/androidenv/addons.nix b/pkgs/development/mobile/androidenv/addons.nix
new file mode 100644
index 00000000000..f26db5c2cb7
--- /dev/null
+++ b/pkgs/development/mobile/androidenv/addons.nix
@@ -0,0 +1,198 @@
+
+{stdenv, fetchurl, unzip}:
+
+let
+ buildGoogleApis = args:
+ stdenv.mkDerivation (args // {
+ buildInputs = [ unzip ];
+ buildCommand = ''
+ mkdir -p $out
+ cd $out
+ unzip $src
+ '';
+ });
+in
+{
+
+ google_apis_3 = buildGoogleApis {
+ name = "google_apis-3";
+ src = fetchurl {
+ url = https://dl-ssl.google.com/android/repository/google_apis-3-r03.zip;
+ sha1 = "1f92abf3a76be66ae8032257fc7620acbd2b2e3a";
+ };
+ meta = {
+ description = "Android + Google APIs";
+ url = http://developer.android.com/;
+ };
+ };
+
+ google_apis_4 = buildGoogleApis {
+ name = "google_apis-4";
+ src = fetchurl {
+ url = https://dl-ssl.google.com/android/repository/google_apis-4_r02.zip;
+ sha1 = "9b6e86d8568558de4d606a7debc4f6049608dbd0";
+ };
+ meta = {
+ description = "Android + Google APIs, revision 2";
+ url = http://developer.android.com/;
+ };
+ };
+
+ google_apis_5 = buildGoogleApis {
+ name = "google_apis-5";
+ src = fetchurl {
+ url = https://dl-ssl.google.com/android/repository/google_apis-5_r01.zip;
+ sha1 = "46eaeb56b645ee7ffa24ede8fa17f3df70db0503";
+ };
+ meta = {
+ description = "Android + Google APIs, revision 1";
+ url = http://developer.android.com/;
+ };
+ };
+
+ google_apis_6 = buildGoogleApis {
+ name = "google_apis-6";
+ src = fetchurl {
+ url = https://dl-ssl.google.com/android/repository/google_apis-6_r01.zip;
+ sha1 = "5ff545d96e031e09580a6cf55713015c7d4936b2";
+ };
+ meta = {
+ description = "Android + Google APIs, revision 1";
+ url = http://developer.android.com/;
+ };
+ };
+
+ google_apis_7 = buildGoogleApis {
+ name = "google_apis-7";
+ src = fetchurl {
+ url = https://dl-ssl.google.com/android/repository/google_apis-7_r01.zip;
+ sha1 = "2e7f91e0fe34fef7f58aeced973c6ae52361b5ac";
+ };
+ meta = {
+ description = "Android + Google APIs, revision 1";
+ url = http://developer.android.com/;
+ };
+ };
+
+ google_apis_8 = buildGoogleApis {
+ name = "google_apis-8";
+ src = fetchurl {
+ url = https://dl-ssl.google.com/android/repository/google_apis-8_r02.zip;
+ sha1 = "3079958e7ec87222cac1e6b27bc471b27bf2c352";
+ };
+ meta = {
+ description = "Android + Google APIs, API 8, revision 2";
+ url = http://developer.android.com/;
+ };
+ };
+
+ google_apis_9 = buildGoogleApis {
+ name = "google_apis-9";
+ src = fetchurl {
+ url = https://dl-ssl.google.com/android/repository/google_apis-9_r02.zip;
+ sha1 = "78664645a1e9accea4430814f8694291a7f1ea5d";
+ };
+ meta = {
+ description = "Android + Google APIs, API 9, revision 2";
+ url = http://developer.android.com/;
+ };
+ };
+
+ google_apis_10 = buildGoogleApis {
+ name = "google_apis-10";
+ src = fetchurl {
+ url = https://dl-ssl.google.com/android/repository/google_apis-10_r02.zip;
+ sha1 = "cc0711857c881fa7534f90cf8cc09b8fe985484d";
+ };
+ meta = {
+ description = "Android + Google APIs, API 10, revision 2";
+ url = http://developer.android.com/;
+ };
+ };
+
+ google_apis_11 = buildGoogleApis {
+ name = "google_apis-11";
+ src = fetchurl {
+ url = https://dl-ssl.google.com/android/repository/google_apis-11_r01.zip;
+ sha1 = "5eab5e81addee9f3576d456d205208314b5146a5";
+ };
+ meta = {
+ description = "Android + Google APIs, API 11, revision 1";
+ url = http://developer.android.com/;
+ };
+ };
+
+ google_apis_12 = buildGoogleApis {
+ name = "google_apis-12";
+ src = fetchurl {
+ url = https://dl-ssl.google.com/android/repository/google_apis-12_r01.zip;
+ sha1 = "e9999f4fa978812174dfeceec0721c793a636e5d";
+ };
+ meta = {
+ description = "Android + Google APIs, API 12, revision 1";
+ url = http://developer.android.com/;
+ };
+ };
+
+ google_apis_13 = buildGoogleApis {
+ name = "google_apis-13";
+ src = fetchurl {
+ url = https://dl-ssl.google.com/android/repository/google_apis-13_r01.zip;
+ sha1 = "3b153edd211c27dc736c893c658418a4f9041417";
+ };
+ meta = {
+ description = "Android + Google APIs, API 13, revision 1";
+ url = http://developer.android.com/;
+ };
+ };
+
+ google_apis_14 = buildGoogleApis {
+ name = "google_apis-14";
+ src = fetchurl {
+ url = https://dl-ssl.google.com/android/repository/google_apis-14_r02.zip;
+ sha1 = "f8eb4d96ad0492b4c0db2d7e4f1a1a3836664d39";
+ };
+ meta = {
+ description = "Android + Google APIs";
+
+ };
+ };
+
+ google_apis_15 = buildGoogleApis {
+ name = "google_apis-15";
+ src = fetchurl {
+ url = https://dl-ssl.google.com/android/repository/google_apis-15_r02.zip;
+ sha1 = "6757c12788da0ea00c2ab58e54cb438b9f2bcf66";
+ };
+ meta = {
+ description = "Android + Google APIs";
+
+ };
+ };
+
+ google_apis_16 = buildGoogleApis {
+ name = "google_apis-16";
+ src = fetchurl {
+ url = https://dl-ssl.google.com/android/repository/google_apis-16_r03.zip;
+ sha1 = "63467dd32f471e3e81e33e9772c22f33235aa3b3";
+ };
+ meta = {
+ description = "Android + Google APIs";
+
+ };
+ };
+
+ google_apis_17 = buildGoogleApis {
+ name = "google_apis-17";
+ src = fetchurl {
+ url = https://dl-ssl.google.com/android/repository/google_apis-17_r01.zip;
+ sha1 = "62cb086f11e15713878c8834d58ef1a2454c19a4";
+ };
+ meta = {
+ description = "Android + Google APIs";
+
+ };
+ };
+
+}
+
\ No newline at end of file
diff --git a/pkgs/development/mobile/androidenv/androidsdk.nix b/pkgs/development/mobile/androidenv/androidsdk.nix
new file mode 100644
index 00000000000..e8e1f919fe4
--- /dev/null
+++ b/pkgs/development/mobile/androidenv/androidsdk.nix
@@ -0,0 +1,194 @@
+{ stdenv, stdenv_32bit, fetchurl, unzip, makeWrapper
+, platformTools, support, platforms, sysimages, addons
+, zlib_32bit
+, libX11_32bit, libxcb_32bit, libXau_32bit, libXdmcp_32bit, libXext_32bit
+, libX11, libXext, libXrender, libxcb, libXau, libXdmcp
+, freetype, fontconfig, gtk, atk
+}:
+{platformVersions, useGoogleAPIs}:
+
+stdenv.mkDerivation {
+ name = "android-sdk-21";
+
+ src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux")
+ then fetchurl {
+ url = http://dl.google.com/android/android-sdk_r21-linux.tgz;
+ md5 = "7f8d73b629f808cdcfc9f9900bbd7580";
+ }
+ else if stdenv.system == "x86_64-darwin" then fetchurl {
+ url = http://dl.google.com/android/android-sdk_r21-macosx.zip;
+ md5 = "67e46adca90dd18d7291443f6c15d6af";
+ }
+ else throw "platform not ${stdenv.system} supported!";
+
+ buildCommand = ''
+ mkdir -p $out/libexec
+ cd $out/libexec
+ unpackFile $src;
+
+ cd android-sdk-*/tools
+
+ ${stdenv.lib.optionalString (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux")
+ ''
+ # There are a number of native binaries. We must patch them to let them find the interpreter and libstdc++
+
+ for i in dmtracedump emulator emulator-arm emulator-mips emulator-x86 hprof-conv mksdcard sqlite3
+ do
+ patchelf --set-interpreter ${stdenv_32bit.gcc.libc}/lib/ld-linux.so.2 $i
+ patchelf --set-rpath ${stdenv_32bit.gcc.gcc}/lib $i
+ done
+
+ ${stdenv.lib.optionalString (stdenv.system == "x86_64-linux") ''
+ # We must also patch the 64-bit emulator instances, if needed
+
+ for i in emulator64-arm emulator64-mips emulator64-x86
+ do
+ patchelf --set-interpreter ${stdenv.gcc.libc}/lib/ld-linux-x86-64.so.2 $i
+ patchelf --set-rpath ${stdenv.gcc.gcc}/lib64 $i
+ done
+ ''}
+
+ # These tools also need zlib in addition to libstdc++
+
+ for i in etc1tool zipalign
+ do
+ patchelf --set-interpreter ${stdenv_32bit.gcc.libc}/lib/ld-linux.so.2 $i
+ patchelf --set-rpath ${stdenv_32bit.gcc.gcc}/lib:${zlib_32bit}/lib $i
+ done
+
+ # The emulators need additional libraries, which are not in the RPATH => let's wrap them
+
+ for i in emulator emulator-arm emulator-mips emulator-x86
+ do
+ wrapProgram `pwd`/$i \
+ --prefix LD_LIBRARY_PATH : `pwd`/lib:${libX11_32bit}/lib:${libxcb_32bit}/lib:${libXau_32bit}/lib:${libXdmcp_32bit}/lib:${libXext_32bit}/lib
+ done
+
+ ${stdenv.lib.optionalString (stdenv.system == "x86_64-linux") ''
+ for i in emulator64-arm emulator64-mips emulator64-x86
+ do
+ wrapProgram `pwd`/$i \
+ --prefix LD_LIBRARY_PATH : `pwd`/lib:${libX11}/lib:${libxcb}/lib:${libXau}/lib:${libXdmcp}/lib:${libXext}/lib
+ done
+ ''}
+ ''}
+
+ patchShebangs .
+
+ ${if stdenv.system == "i686-linux" then
+ ''
+ # The monitor requires some more patching
+
+ cd lib/monitor-x86
+ patchelf --set-interpreter ${stdenv.gcc.libc}/lib/ld-linux.so.2 monitor
+ patchelf --set-rpath ${libX11}/lib:${libXext}/lib:${libXrender}/lib:${freetype}/lib:${fontconfig}/lib libcairo-swt.so
+
+ wrapProgram `pwd`/monitor \
+ --prefix LD_LIBRARY_PATH : ${gtk}/lib:${atk}/lib:${stdenv.gcc.gcc}/lib
+
+ cd ../..
+ ''
+ else if stdenv.system == "x86_64-linux" then
+ ''
+ # The monitor requires some more patching
+
+ cd lib/monitor-x86_64
+ patchelf --set-interpreter ${stdenv.gcc.libc}/lib/ld-linux-x86-64.so.2 monitor
+ patchelf --set-rpath ${libX11}/lib:${libXext}/lib:${libXrender}/lib:${freetype}/lib:${fontconfig}/lib libcairo-swt.so
+
+ wrapProgram `pwd`/monitor \
+ --prefix LD_LIBRARY_PATH : ${gtk}/lib:${atk}/lib:${stdenv.gcc.gcc}/lib
+
+ cd ../..
+ ''
+ else ""}
+
+ # Symlink the other sub packages
+
+ cd ..
+ ln -s ${platformTools}/platform-tools
+ ln -s ${support}/support
+
+ # Symlink required Google API add-ons
+
+ mkdir -p add-ons
+ cd add-ons
+
+ ${if useGoogleAPIs then
+ stdenv.lib.concatMapStrings (platformVersion:
+ if (builtins.hasAttr ("google_apis_"+platformVersion) addons) then
+ let
+ googleApis = builtins.getAttr ("google_apis_"+platformVersion) addons;
+ in
+ "ln -s ${googleApis}/* addon-google_apis-${platformVersion}"
+ else "") platformVersions
+ else ""}
+
+ cd ..
+
+ # Symlink required platforms
+
+ mkdir -p platforms
+ cd platforms
+
+ ${stdenv.lib.concatMapStrings (platformVersion:
+ if (builtins.hasAttr ("platform_"+platformVersion) platforms) then
+ let
+ platform = builtins.getAttr ("platform_"+platformVersion) platforms;
+ in
+ "ln -s ${platform}/* android-${platformVersion}"
+ else ""
+ ) platformVersions}
+
+ cd ..
+
+ # Symlink required system images
+
+ mkdir -p system-images
+ cd system-images
+
+ ${stdenv.lib.concatMapStrings (platformVersion:
+ if (builtins.hasAttr ("sysimg_"+platformVersion) sysimages) then
+ let
+ sysimg = builtins.getAttr ("sysimg_"+platformVersion) sysimages;
+ in
+ ''
+ mkdir -p android-${platformVersion}
+ cd android-${platformVersion}
+ ln -s ${sysimg}/*
+ cd ..
+ ''
+ else ""
+ ) platformVersions}
+
+ # Create wrappers to the most important tools and platform tools so that we can run them if the SDK is in our PATH
+
+ ensureDir $out/bin
+
+ for i in $out/libexec/android-sdk-*/tools/*
+ do
+ if [ ! -d $i ] && [ -x $i ]
+ then
+ ( echo '#! ${stdenv.shell} -e'
+ echo "cd $out/libexec/android-sdk-*/tools"
+ echo "exec ./$(basename $i) \"\$@\"" ) > $out/bin/$(basename $i)
+
+ chmod +x $out/bin/$(basename $i)
+ fi
+ done
+
+ for i in $out/libexec/android-sdk-*/platform-tools/*
+ do
+ if [ ! -d $i ] && [ -x $i ]
+ then
+ ( echo '#! ${stdenv.shell} -e'
+ echo "cd $out/libexec/android-sdk-*/platform-tools"
+ echo "exec ./$(basename $i) \"\$@\"") > $out/bin/$(basename $i)
+
+ chmod +x $out/bin/$(basename $i)
+ fi
+ done
+ '';
+
+ buildInputs = [ unzip makeWrapper ];
+}
diff --git a/pkgs/development/mobile/androidenv/build-app.nix b/pkgs/development/mobile/androidenv/build-app.nix
new file mode 100644
index 00000000000..d4df64e79c0
--- /dev/null
+++ b/pkgs/development/mobile/androidenv/build-app.nix
@@ -0,0 +1,41 @@
+{ stdenv, androidsdk, jdk, ant }:
+{ name, src, platformVersions ? [ "8" ], useGoogleAPIs ? false
+, release ? false, keyStore ? null, keyAlias ? null, keyStorePassword ? null, keyAliasPassword ? null
+}:
+
+assert release -> keyStore != null && keyAlias != null && keyStorePassword != null && keyAliasPassword != null;
+
+let
+ platformName = if stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" then "linux"
+ else if stdenv.system == "x86_64-darwin" then "macosx"
+ else throw "Platform: ${stdenv.system} is not supported!";
+
+ androidsdkComposition = androidsdk { inherit platformVersions useGoogleAPIs; };
+in
+stdenv.mkDerivation {
+ inherit name src;
+
+ ANDROID_HOME = "${androidsdkComposition}/libexec/android-sdk-${platformName}";
+
+ buildInputs = [ jdk ant ];
+
+ buildPhase = ''
+ ${stdenv.lib.optionalString release ''
+
+ # Provide key singing attributes
+ ( echo "key.store=${keyStore}"
+ echo "key.alias=${keyAlias}"
+ echo "key.store.password=${keyStorePassword}"
+ echo "key.alias.password=${keyAliasPassword}"
+ ) >> ant.properties
+ ''}
+
+ export ANDROID_SDK_HOME=`pwd` # Key files cannot be stored in the user's home directory. This overrides it.
+ ant ${if release then "release" else "debug"}
+ '';
+
+ installPhase = ''
+ mkdir -p $out
+ mv bin/*-${if release then "release" else "debug"}.apk $out
+ '';
+}
diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix
new file mode 100644
index 00000000000..a76deb98b6e
--- /dev/null
+++ b/pkgs/development/mobile/androidenv/default.nix
@@ -0,0 +1,62 @@
+{pkgs, pkgs_i686}:
+
+rec {
+ platformTools = import ./platform-tools.nix {
+ inherit (pkgs) stdenv fetchurl unzip;
+ inherit (pkgs_i686) zlib ncurses;
+ stdenv_32bit = pkgs_i686.stdenv;
+ };
+
+ support = import ./support.nix {
+ inherit (pkgs) stdenv fetchurl unzip;
+ };
+
+ platforms = if (pkgs.stdenv.system == "i686-linux" || pkgs.stdenv.system == "x86_64-linux")
+ then import ./platforms-linux.nix {
+ inherit (pkgs) stdenv fetchurl unzip;
+ }
+ else if pkgs.stdenv.system == "x86_64-darwin"
+ then import ./platforms-macosx.nix {
+ inherit (pkgs) stdenv fetchurl unzip;
+ }
+ else throw "Platform: ${pkgs.stdenv.system} not supported!";
+
+ sysimages = import ./sysimages.nix {
+ inherit (pkgs) stdenv fetchurl unzip;
+ };
+
+ addons = import ./addons.nix {
+ inherit (pkgs) stdenv fetchurl unzip;
+ };
+
+ androidsdk = import ./androidsdk.nix {
+ inherit (pkgs) stdenv fetchurl unzip makeWrapper;
+ inherit (pkgs) freetype fontconfig gtk atk;
+ inherit (pkgs.xorg) libX11 libXext libXrender libxcb libXau libXdmcp;
+
+ inherit platformTools support platforms sysimages addons;
+
+ stdenv_32bit = pkgs_i686.stdenv;
+ zlib_32bit = pkgs_i686.zlib;
+ libX11_32bit = pkgs_i686.xorg.libX11;
+ libxcb_32bit = pkgs_i686.xorg.libxcb;
+ libXau_32bit = pkgs_i686.xorg.libXau;
+ libXdmcp_32bit = pkgs_i686.xorg.libXdmcp;
+ libXext_32bit = pkgs_i686.xorg.libXext;
+ };
+
+ androidsdk_4_1 = androidsdk {
+ platformVersions = [ "16" ];
+ useGoogleAPIs = true;
+ };
+
+ buildApp = import ./build-app.nix {
+ inherit (pkgs) stdenv jdk ant;
+ inherit androidsdk;
+ };
+
+ emulateApp = import ./emulate-app.nix {
+ inherit (pkgs) stdenv;
+ inherit androidsdk;
+ };
+}
diff --git a/pkgs/development/mobile/androidenv/emulate-app.nix b/pkgs/development/mobile/androidenv/emulate-app.nix
new file mode 100644
index 00000000000..3cbe5723806
--- /dev/null
+++ b/pkgs/development/mobile/androidenv/emulate-app.nix
@@ -0,0 +1,87 @@
+{stdenv, androidsdk}:
+{name, app, platformVersion ? "8", useGoogleAPIs ? false, package, activity}:
+
+let
+ androidsdkComposition = androidsdk { inherit useGoogleAPIs; platformVersions = [ platformVersion ]; };
+in
+stdenv.mkDerivation {
+ inherit name;
+
+ buildCommand = ''
+ mkdir -p $out/bin
+
+ cat > $out/bin/run-test-emulator << "EOF"
+ #!/bin/sh -e
+
+ # We need a TMPDIR
+ if [ "$TMPDIR" = "" ]
+ then
+ export TMPDIR=/tmp
+ fi
+
+ # Store the virtual devices somewhere else, instead of polluting a user's HOME directory
+ export ANDROID_SDK_HOME=$(mktemp -d $TMPDIR/nix-android-vm-XXXX)
+
+ # We have to look for a free TCP port
+
+ echo "Looking for a free TCP port in range 5554-5584"
+
+ for i in $(seq 5554 2 5584)
+ do
+ if [ -z "$(${androidsdkComposition}/libexec/android-sdk-*/platform-tools/adb devices | grep emulator-$i)" ]
+ then
+ port=$i
+ break
+ fi
+ done
+
+ if [ -z "$port" ]
+ then
+ echo "Unfortunately, the emulator port space is exhausted!"
+ exit 1
+ else
+ echo "We have a free TCP port: $port"
+ fi
+
+ export ANDROID_SERIAL="emulator-$port"
+
+ # Create a virtual android device
+ ${androidsdkComposition}/libexec/android-sdk-*/tools/android create avd -n device -t ${if useGoogleAPIs then "'Google Inc.:Google APIs:"+platformVersion+"'" else "android-"+platformVersion}
+
+ # Launch the emulator
+ ${androidsdkComposition}/libexec/android-sdk-*/tools/emulator -avd device -no-boot-anim -port $port &
+
+ # Wait until the device has completely booted
+
+ echo "Waiting until the emulator has booted the device and the package manager is ready..."
+
+ ${androidsdkComposition}/libexec/android-sdk-*/platform-tools/adb -s emulator-$port wait-for-device
+
+ echo "Device state has been reached"
+
+ while [ -z "$(${androidsdkComposition}/libexec/android-sdk-*/platform-tools/adb -s emulator-$port shell getprop dev.bootcomplete | grep 1)" ]
+ do
+ sleep 5
+ done
+
+ echo "dev.bootcomplete property is 1"
+
+ #while [ -z "$(${androidsdkComposition}/libexec/android-sdk-*/platform-tools/adb -s emulator-$port shell getprop sys.boot_completed | grep 1)" ]
+ #do
+ #sleep 5
+ #done
+
+ #echo "sys.boot_completed property is 1"
+
+ echo "ready"
+
+ # Install the App through the debugger
+ ${androidsdkComposition}/libexec/android-sdk-*/platform-tools/adb -s emulator-$port install ${app}/*.apk
+
+ # Start the application
+ ${androidsdkComposition}/libexec/android-sdk-*/platform-tools/adb -s emulator-$port shell am start -a android.intent.action.MAIN -n ${package}/.${activity}
+ EOF
+
+ chmod +x $out/bin/run-test-emulator
+ '';
+}
diff --git a/pkgs/development/mobile/androidenv/generate-addons.sh b/pkgs/development/mobile/androidenv/generate-addons.sh
new file mode 100755
index 00000000000..9b2cf34eabc
--- /dev/null
+++ b/pkgs/development/mobile/androidenv/generate-addons.sh
@@ -0,0 +1,3 @@
+#!/bin/sh -e
+
+xsltproc generate-addons.xsl addon.xml > addons.nix
diff --git a/pkgs/development/mobile/androidenv/generate-addons.xsl b/pkgs/development/mobile/androidenv/generate-addons.xsl
new file mode 100644
index 00000000000..0100b980a4e
--- /dev/null
+++ b/pkgs/development/mobile/androidenv/generate-addons.xsl
@@ -0,0 +1,38 @@
+
+
+
+
+
+
+{stdenv, fetchurl, unzip}:
+
+let
+ buildGoogleApis = args:
+ stdenv.mkDerivation (args // {
+ buildInputs = [ unzip ];
+ buildCommand = ''
+ mkdir -p $out
+ cd $out
+ unzip $src
+ '';
+ });
+in
+{
+
+ google_apis_ = buildGoogleApis {
+ name = "-";
+ src = fetchurl {
+ url = https://dl-ssl.google.com/android/repository/;
+ sha1 = "";
+ };
+ meta = {
+ description = "";
+ url = ;
+ };
+ };
+
+}
+
+
+
diff --git a/pkgs/development/mobile/androidenv/generate-platforms.sh b/pkgs/development/mobile/androidenv/generate-platforms.sh
new file mode 100755
index 00000000000..983d8bde87b
--- /dev/null
+++ b/pkgs/development/mobile/androidenv/generate-platforms.sh
@@ -0,0 +1,4 @@
+#!/bin/sh -e
+
+xsltproc --stringparam os linux generate-platforms.xsl repository-7.xml > platforms-linux.nix
+xsltproc --stringparam os macosx generate-platforms.xsl repository-7.xml > platforms-macosx.nix
diff --git a/pkgs/development/mobile/androidenv/generate-platforms.xsl b/pkgs/development/mobile/androidenv/generate-platforms.xsl
new file mode 100644
index 00000000000..1802ae63efe
--- /dev/null
+++ b/pkgs/development/mobile/androidenv/generate-platforms.xsl
@@ -0,0 +1,38 @@
+
+
+
+
+
+
+
+{stdenv, fetchurl, unzip}:
+
+let
+ buildPlatform = args:
+ stdenv.mkDerivation (args // {
+ buildInputs = [ unzip ];
+ buildCommand = ''
+ mkdir -p $out
+ cd $out
+ unzip $src
+ '';
+ });
+in
+{
+
+ platform_ = buildPlatform {
+ name = "android-platform-";
+ src = fetchurl {
+ url = https://dl-ssl.google.com/android/repository/;
+ sha1 = "";
+ };
+ meta = {
+ description = "";
+ url = ;
+ };
+ };
+
+}
+
+
diff --git a/pkgs/development/mobile/androidenv/generate-sysimages.sh b/pkgs/development/mobile/androidenv/generate-sysimages.sh
new file mode 100755
index 00000000000..dc28c27f45f
--- /dev/null
+++ b/pkgs/development/mobile/androidenv/generate-sysimages.sh
@@ -0,0 +1,3 @@
+#!/bin/sh -e
+
+xsltproc generate-sysimages.xsl repository-7.xml > sysimages.nix
diff --git a/pkgs/development/mobile/androidenv/generate-sysimages.xsl b/pkgs/development/mobile/androidenv/generate-sysimages.xsl
new file mode 100644
index 00000000000..1224ebbd4e8
--- /dev/null
+++ b/pkgs/development/mobile/androidenv/generate-sysimages.xsl
@@ -0,0 +1,36 @@
+
+
+
+
+
+
+
+{stdenv, fetchurl, unzip}:
+
+let
+ buildSystemImage = args:
+ stdenv.mkDerivation (args // {
+ buildInputs = [ unzip ];
+ buildCommand = ''
+ mkdir -p $out
+ cd $out
+ unzip $src
+ '';
+ });
+in
+{
+
+ sysimg_ = buildSystemImage {
+ name = "-";
+ src = fetchurl {
+ url = https://dl-ssl.google.com/android/repository/;
+ sha1 = "";
+ };
+ };
+
+}
+
+
+
diff --git a/pkgs/development/mobile/androidenv/platform-tools.nix b/pkgs/development/mobile/androidenv/platform-tools.nix
new file mode 100644
index 00000000000..55499608290
--- /dev/null
+++ b/pkgs/development/mobile/androidenv/platform-tools.nix
@@ -0,0 +1,41 @@
+{stdenv, stdenv_32bit, fetchurl, unzip, zlib, ncurses}:
+
+stdenv.mkDerivation {
+ name = "android-platform-tools-r16";
+ src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux")
+ then fetchurl {
+ url = https://dl-ssl.google.com/android/repository/platform-tools_r16-linux.zip;
+ sha1 = "84d563ae5e324f223f335f11bf511bf6207c05fb";
+ }
+ else if stdenv.system == "x86_64-darwin" then fetchurl {
+ url = https://dl-ssl.google.com/android/repository/platform-tools_r16-macosx.zip;
+ sha1 = "fbb0f8d2786a83b8c3eb6df402e706e136db8fed";
+ }
+ else throw "System ${stdenv.system} not supported!";
+
+ buildCommand = ''
+ mkdir -p $out
+ cd $out
+ unzip $src
+ cd platform-tools
+
+ ${stdenv.lib.optionalString (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux")
+ ''
+ for i in aapt adb aidl dexdump fastboot llvm-rs-cc
+ do
+ patchelf --set-interpreter ${stdenv_32bit.gcc.libc}/lib/ld-linux.so.2 $i
+ done
+
+ patchelf --set-rpath ${zlib}/lib:${stdenv_32bit.gcc.gcc}/lib aapt
+ patchelf --set-rpath ${ncurses}/lib:${stdenv_32bit.gcc.gcc}/lib adb
+ patchelf --set-rpath ${stdenv_32bit.gcc.gcc}/lib aidl
+ patchelf --set-rpath ${stdenv_32bit.gcc.gcc}/lib fastboot
+ patchelf --set-rpath ${zlib}/lib:${stdenv_32bit.gcc.gcc}/lib dexdump
+ patchelf --set-rpath ${stdenv_32bit.gcc.gcc}/lib llvm-rs-cc
+ ''}
+
+ patchShebangs .
+ '';
+
+ buildInputs = [ unzip ];
+}
diff --git a/pkgs/development/mobile/androidenv/platforms-linux.nix b/pkgs/development/mobile/androidenv/platforms-linux.nix
new file mode 100644
index 00000000000..f544fcc08be
--- /dev/null
+++ b/pkgs/development/mobile/androidenv/platforms-linux.nix
@@ -0,0 +1,210 @@
+
+{stdenv, fetchurl, unzip}:
+
+let
+ buildPlatform = args:
+ stdenv.mkDerivation (args // {
+ buildInputs = [ unzip ];
+ buildCommand = ''
+ mkdir -p $out
+ cd $out
+ unzip $src
+ '';
+ });
+in
+{
+
+ platform_2 = buildPlatform {
+ name = "android-platform-1.1";
+ src = fetchurl {
+ url = https://dl-ssl.google.com/android/repository/android-1.1_r1-linux.zip;
+ sha1 = "c054d25c9b4c6251fa49c2f9c54336998679d3fe";
+ };
+ meta = {
+ description = "Android SDK Platform 1.1_r1";
+ url = http://developer.android.com/sdk/android-1.1.html;
+ };
+ };
+
+ platform_3 = buildPlatform {
+ name = "android-platform-1.5";
+ src = fetchurl {
+ url = https://dl-ssl.google.com/android/repository/android-1.5_r04-linux.zip;
+ sha1 = "5c134b7df5f4b8bd5b61ba93bdaebada8fa3468c";
+ };
+ meta = {
+ description = "Android SDK Platform 1.5_r3";
+ url = http://developer.android.com/sdk/android-1.5.html;
+ };
+ };
+
+ platform_4 = buildPlatform {
+ name = "android-platform-1.6";
+ src = fetchurl {
+ url = https://dl-ssl.google.com/android/repository/android-1.6_r03-linux.zip;
+ sha1 = "483ed088e45bbdf3444baaf9250c8b02e5383cb0";
+ };
+ meta = {
+ description = "Android SDK Platform 1.6_r2";
+ url = http://developer.android.com/sdk/android-1.6.html;
+ };
+ };
+
+ platform_5 = buildPlatform {
+ name = "android-platform-2.0";
+ src = fetchurl {
+ url = https://dl-ssl.google.com/android/repository/android-2.0_r01-linux.zip;
+ sha1 = "be9be6a99ca32875c96ec7f91160ca9fce7e3c7d";
+ };
+ meta = {
+ description = "Android SDK Platform 2.0, revision 1";
+ url = http://developer.android.com/sdk/android-2.0.html;
+ };
+ };
+
+ platform_6 = buildPlatform {
+ name = "android-platform-2.0.1";
+ src = fetchurl {
+ url = https://dl-ssl.google.com/android/repository/android-2.0.1_r01-linux.zip;
+ sha1 = "ce2c971dce352aa28af06bda92a070116aa5ae1a";
+ };
+ meta = {
+ description = "Android SDK Platform 2.0.1_r1";
+ url = http://developer.android.com/sdk/android-2.0.1.html;
+ };
+ };
+
+ platform_7 = buildPlatform {
+ name = "android-platform-2.1";
+ src = fetchurl {
+ url = https://dl-ssl.google.com/android/repository/android-2.1_r03-linux.zip;
+ sha1 = "5ce51b023ac19f8738500b1007a1da5de2349a1e";
+ };
+ meta = {
+ description = "Android SDK Platform 2.1_r3";
+ url = http://developer.android.com/sdk/;
+ };
+ };
+
+ platform_8 = buildPlatform {
+ name = "android-platform-2.2";
+ src = fetchurl {
+ url = https://dl-ssl.google.com/android/repository/android-2.2_r03-linux.zip;
+ sha1 = "231262c63eefdff8fd0386e9ccfefeb27a8f9202";
+ };
+ meta = {
+ description = "Android SDK Platform 2.2_r3";
+ url = http://developer.android.com/sdk/;
+ };
+ };
+
+ platform_9 = buildPlatform {
+ name = "android-platform-2.3.1";
+ src = fetchurl {
+ url = https://dl-ssl.google.com/android/repository/android-2.3.1_r02-linux.zip;
+ sha1 = "209f8a7a8b2cb093fce858b8b55fed3ba5206773";
+ };
+ meta = {
+ description = "Android SDK Platform 2.3.1_r2";
+ url = http://developer.android.com/sdk/;
+ };
+ };
+
+ platform_10 = buildPlatform {
+ name = "android-platform-2.3.3";
+ src = fetchurl {
+ url = https://dl-ssl.google.com/android/repository/android-2.3.3_r02-linux.zip;
+ sha1 = "887e37783ec32f541ea33c2c649dda648e8e6fb3";
+ };
+ meta = {
+ description = "Android SDK Platform 2.3.3._r2";
+ url = http://developer.android.com/sdk/;
+ };
+ };
+
+ platform_11 = buildPlatform {
+ name = "android-platform-3.0";
+ src = fetchurl {
+ url = https://dl-ssl.google.com/android/repository/android-3.0_r02-linux.zip;
+ sha1 = "2c7d4bd13f276e76f6bbd87315fe27aba351dd37";
+ };
+ meta = {
+ description = "Android SDK Platform 3.0, revision 2";
+ url = http://developer.android.com/sdk/;
+ };
+ };
+
+ platform_12 = buildPlatform {
+ name = "android-platform-3.1";
+ src = fetchurl {
+ url = https://dl-ssl.google.com/android/repository/android-3.1_r03-linux.zip;
+ sha1 = "4a50a6679cd95bb68bb5fc032e754cd7c5e2b1bf";
+ };
+ meta = {
+ description = "Android SDK Platform 3.1, revision 3";
+ url = http://developer.android.com/sdk/;
+ };
+ };
+
+ platform_13 = buildPlatform {
+ name = "android-platform-3.2";
+ src = fetchurl {
+ url = https://dl-ssl.google.com/android/repository/android-3.2_r01-linux.zip;
+ sha1 = "6189a500a8c44ae73a439604363de93591163cd9";
+ };
+ meta = {
+ description = "Android SDK Platform 3.2, revision 1";
+ url = http://developer.android.com/sdk/;
+ };
+ };
+
+ platform_14 = buildPlatform {
+ name = "android-platform-4.0";
+ src = fetchurl {
+ url = https://dl-ssl.google.com/android/repository/android-14_r03.zip;
+ sha1 = "41ba83b51e886461628c41b1b4d47762e0688ed5";
+ };
+ meta = {
+ description = "Android SDK Platform 4.0";
+
+ };
+ };
+
+ platform_15 = buildPlatform {
+ name = "android-platform-4.0.3";
+ src = fetchurl {
+ url = https://dl-ssl.google.com/android/repository/android-15_r03.zip;
+ sha1 = "23da24610a8da51054c5391001c51ce43a778b97";
+ };
+ meta = {
+ description = "Android SDK Platform 4.0.3";
+
+ };
+ };
+
+ platform_16 = buildPlatform {
+ name = "android-platform-4.1.2";
+ src = fetchurl {
+ url = https://dl-ssl.google.com/android/repository/android-16_r03.zip;
+ sha1 = "80d9ffef58168f9bccd862830e2ee51f686b167e";
+ };
+ meta = {
+ description = "Android SDK Platform 4.1";
+
+ };
+ };
+
+ platform_17 = buildPlatform {
+ name = "android-platform-4.2";
+ src = fetchurl {
+ url = https://dl-ssl.google.com/android/repository/android-17_r01.zip;
+ sha1 = "c2e7c8c8db40e06b804ddb1725ac2c3555b55025";
+ };
+ meta = {
+ description = "Android SDK Platform 4.2";
+
+ };
+ };
+
+}
+
\ No newline at end of file
diff --git a/pkgs/development/mobile/androidenv/platforms-macosx.nix b/pkgs/development/mobile/androidenv/platforms-macosx.nix
new file mode 100644
index 00000000000..a1434bbe56c
--- /dev/null
+++ b/pkgs/development/mobile/androidenv/platforms-macosx.nix
@@ -0,0 +1,210 @@
+
+{stdenv, fetchurl, unzip}:
+
+let
+ buildPlatform = args:
+ stdenv.mkDerivation (args // {
+ buildInputs = [ unzip ];
+ buildCommand = ''
+ mkdir -p $out
+ cd $out
+ unzip $src
+ '';
+ });
+in
+{
+
+ platform_2 = buildPlatform {
+ name = "android-platform-1.1";
+ src = fetchurl {
+ url = https://dl-ssl.google.com/android/repository/android-1.1_r1-macosx.zip;
+ sha1 = "e21dbcff45b7356657449ebb3c7e941be2bb5ebe";
+ };
+ meta = {
+ description = "Android SDK Platform 1.1_r1";
+ url = http://developer.android.com/sdk/android-1.1.html;
+ };
+ };
+
+ platform_3 = buildPlatform {
+ name = "android-platform-1.5";
+ src = fetchurl {
+ url = https://dl-ssl.google.com/android/repository/android-1.5_r04-macosx.zip;
+ sha1 = "d3a67c2369afa48b6c3c7624de5031c262018d1e";
+ };
+ meta = {
+ description = "Android SDK Platform 1.5_r3";
+ url = http://developer.android.com/sdk/android-1.5.html;
+ };
+ };
+
+ platform_4 = buildPlatform {
+ name = "android-platform-1.6";
+ src = fetchurl {
+ url = https://dl-ssl.google.com/android/repository/android-1.6_r03-macosx.zip;
+ sha1 = "bdafad44f5df9f127979bdb21a1fdd87ee3cd625";
+ };
+ meta = {
+ description = "Android SDK Platform 1.6_r2";
+ url = http://developer.android.com/sdk/android-1.6.html;
+ };
+ };
+
+ platform_5 = buildPlatform {
+ name = "android-platform-2.0";
+ src = fetchurl {
+ url = https://dl-ssl.google.com/android/repository/android-2.0_r01-macosx.zip;
+ sha1 = "2a866d0870dbba18e0503cd41e5fae988a21b314";
+ };
+ meta = {
+ description = "Android SDK Platform 2.0, revision 1";
+ url = http://developer.android.com/sdk/android-2.0.html;
+ };
+ };
+
+ platform_6 = buildPlatform {
+ name = "android-platform-2.0.1";
+ src = fetchurl {
+ url = https://dl-ssl.google.com/android/repository/android-2.0.1_r01-macosx.zip;
+ sha1 = "c3096f80d75a6fc8cb38ef8a18aec920e53d42c0";
+ };
+ meta = {
+ description = "Android SDK Platform 2.0.1_r1";
+ url = http://developer.android.com/sdk/android-2.0.1.html;
+ };
+ };
+
+ platform_7 = buildPlatform {
+ name = "android-platform-2.1";
+ src = fetchurl {
+ url = https://dl-ssl.google.com/android/repository/android-2.1_r03-linux.zip;
+ sha1 = "5ce51b023ac19f8738500b1007a1da5de2349a1e";
+ };
+ meta = {
+ description = "Android SDK Platform 2.1_r3";
+ url = http://developer.android.com/sdk/;
+ };
+ };
+
+ platform_8 = buildPlatform {
+ name = "android-platform-2.2";
+ src = fetchurl {
+ url = https://dl-ssl.google.com/android/repository/android-2.2_r03-linux.zip;
+ sha1 = "231262c63eefdff8fd0386e9ccfefeb27a8f9202";
+ };
+ meta = {
+ description = "Android SDK Platform 2.2_r3";
+ url = http://developer.android.com/sdk/;
+ };
+ };
+
+ platform_9 = buildPlatform {
+ name = "android-platform-2.3.1";
+ src = fetchurl {
+ url = https://dl-ssl.google.com/android/repository/android-2.3.1_r02-linux.zip;
+ sha1 = "209f8a7a8b2cb093fce858b8b55fed3ba5206773";
+ };
+ meta = {
+ description = "Android SDK Platform 2.3.1_r2";
+ url = http://developer.android.com/sdk/;
+ };
+ };
+
+ platform_10 = buildPlatform {
+ name = "android-platform-2.3.3";
+ src = fetchurl {
+ url = https://dl-ssl.google.com/android/repository/android-2.3.3_r02-linux.zip;
+ sha1 = "887e37783ec32f541ea33c2c649dda648e8e6fb3";
+ };
+ meta = {
+ description = "Android SDK Platform 2.3.3._r2";
+ url = http://developer.android.com/sdk/;
+ };
+ };
+
+ platform_11 = buildPlatform {
+ name = "android-platform-3.0";
+ src = fetchurl {
+ url = https://dl-ssl.google.com/android/repository/android-3.0_r02-linux.zip;
+ sha1 = "2c7d4bd13f276e76f6bbd87315fe27aba351dd37";
+ };
+ meta = {
+ description = "Android SDK Platform 3.0, revision 2";
+ url = http://developer.android.com/sdk/;
+ };
+ };
+
+ platform_12 = buildPlatform {
+ name = "android-platform-3.1";
+ src = fetchurl {
+ url = https://dl-ssl.google.com/android/repository/android-3.1_r03-linux.zip;
+ sha1 = "4a50a6679cd95bb68bb5fc032e754cd7c5e2b1bf";
+ };
+ meta = {
+ description = "Android SDK Platform 3.1, revision 3";
+ url = http://developer.android.com/sdk/;
+ };
+ };
+
+ platform_13 = buildPlatform {
+ name = "android-platform-3.2";
+ src = fetchurl {
+ url = https://dl-ssl.google.com/android/repository/android-3.2_r01-linux.zip;
+ sha1 = "6189a500a8c44ae73a439604363de93591163cd9";
+ };
+ meta = {
+ description = "Android SDK Platform 3.2, revision 1";
+ url = http://developer.android.com/sdk/;
+ };
+ };
+
+ platform_14 = buildPlatform {
+ name = "android-platform-4.0";
+ src = fetchurl {
+ url = https://dl-ssl.google.com/android/repository/android-14_r03.zip;
+ sha1 = "41ba83b51e886461628c41b1b4d47762e0688ed5";
+ };
+ meta = {
+ description = "Android SDK Platform 4.0";
+
+ };
+ };
+
+ platform_15 = buildPlatform {
+ name = "android-platform-4.0.3";
+ src = fetchurl {
+ url = https://dl-ssl.google.com/android/repository/android-15_r03.zip;
+ sha1 = "23da24610a8da51054c5391001c51ce43a778b97";
+ };
+ meta = {
+ description = "Android SDK Platform 4.0.3";
+
+ };
+ };
+
+ platform_16 = buildPlatform {
+ name = "android-platform-4.1.2";
+ src = fetchurl {
+ url = https://dl-ssl.google.com/android/repository/android-16_r03.zip;
+ sha1 = "80d9ffef58168f9bccd862830e2ee51f686b167e";
+ };
+ meta = {
+ description = "Android SDK Platform 4.1";
+
+ };
+ };
+
+ platform_17 = buildPlatform {
+ name = "android-platform-4.2";
+ src = fetchurl {
+ url = https://dl-ssl.google.com/android/repository/android-17_r01.zip;
+ sha1 = "c2e7c8c8db40e06b804ddb1725ac2c3555b55025";
+ };
+ meta = {
+ description = "Android SDK Platform 4.2";
+
+ };
+ };
+
+}
+
\ No newline at end of file
diff --git a/pkgs/development/mobile/androidenv/repository-7.xml b/pkgs/development/mobile/androidenv/repository-7.xml
new file mode 100644
index 00000000000..7bbbaf1e362
--- /dev/null
+++ b/pkgs/development/mobile/androidenv/repository-7.xml
@@ -0,0 +1,1030 @@
+
+
+
+
+ Terms and Conditions
+
+This is the Android Software Development Kit License Agreement.
+
+
+1. Introduction
+
+
+1.1 The Android Software Development Kit (referred to in this License Agreement as the "SDK" and specifically including the Android system files, packaged APIs, and Google APIs add-ons) is licensed to you subject to the terms of this License Agreement. This License Agreement forms a legally binding contract between you and Google in relation to your use of the SDK.
+
+1.2 "Android" means the Android software stack for devices, as made available under the Android Open Source Project, which is located at the following URL: http://source.android.com/, as updated from time to time.
+
+1.3 "Google" means Google Inc., a Delaware corporation with principal place of business at 1600 Amphitheatre Parkway, Mountain View, CA 94043, United States.
+
+
+2. Accepting this License Agreement
+
+
+2.1 In order to use the SDK, you must first agree to this License Agreement. You may not use the SDK if you do not accept this License Agreement.
+
+2.2 By clicking to accept, you hereby agree to the terms of this License Agreement.
+
+2.3 You may not use the SDK and may not accept the License Agreement if you are a person barred from receiving the SDK under the laws of the United States or other countries including the country in which you are resident or from which you use the SDK.
+
+2.4 If you are agreeing to be bound by this License Agreement on behalf of your employer or other entity, you represent and warrant that you have full legal authority to bind your employer or such entity to this License Agreement. If you do not have the requisite authority, you may not accept the License Agreement or use the SDK on behalf of your employer or other entity.
+
+
+3. SDK License from Google
+
+
+3.1 Subject to the terms of this License Agreement, Google grants you a limited, worldwide, royalty-free, non-assignable and non-exclusive license to use the SDK solely to develop applications to run on the Android platform.
+
+3.2 You agree that Google or third parties own all legal right, title and interest in and to the SDK, including any Intellectual Property Rights that subsist in the SDK. "Intellectual Property Rights" means any and all rights under patent law, copyright law, trade secret law, trademark law, and any and all other proprietary rights. Google reserves all rights not expressly granted to you.
+
+3.3 You may not use the SDK for any purpose not expressly permitted by this License Agreement. Except to the extent required by applicable third party licenses, you may not: (a) copy (except for backup purposes), modify, adapt, redistribute, decompile, reverse engineer, disassemble, or create derivative works of the SDK or any part of the SDK; or (b) load any part of the SDK onto a mobile handset or any other hardware device except a personal computer, combine any part of the SDK with other software, or distribute any software or device incorporating a part of the SDK.
+
+3.4 You agree that you will not take any actions that may cause or result in the fragmentation of Android, including but not limited to distributing, participating in the creation of, or promoting in any way a software development kit derived from the SDK.
+
+3.5 Use, reproduction and distribution of components of the SDK licensed under an open source software license are governed solely by the terms of that open source software license and not this License Agreement.
+
+3.6 You agree that the form and nature of the SDK that Google provides may change without prior notice to you and that future versions of the SDK may be incompatible with applications developed on previous versions of the SDK. You agree that Google may stop (permanently or temporarily) providing the SDK (or any features within the SDK) to you or to users generally at Google's sole discretion, without prior notice to you.
+
+3.7 Nothing in this License Agreement gives you a right to use any of Google's trade names, trademarks, service marks, logos, domain names, or other distinctive brand features.
+
+3.8 You agree that you will not remove, obscure, or alter any proprietary rights notices (including copyright and trademark notices) that may be affixed to or contained within the SDK.
+
+
+4. Use of the SDK by You
+
+
+4.1 Google agrees that it obtains no right, title or interest from you (or your licensors) under this License Agreement in or to any software applications that you develop using the SDK, including any intellectual property rights that subsist in those applications.
+
+4.2 You agree to use the SDK and write applications only for purposes that are permitted by (a) this License Agreement and (b) any applicable law, regulation or generally accepted practices or guidelines in the relevant jurisdictions (including any laws regarding the export of data or software to and from the United States or other relevant countries).
+
+4.3 You agree that if you use the SDK to develop applications for general public users, you will protect the privacy and legal rights of those users. If the users provide you with user names, passwords, or other login information or personal information, you must make the users aware that the information will be available to your application, and you must provide legally adequate privacy notice and protection for those users. If your application stores personal or sensitive information provided by users, it must do so securely. If the user provides your application with Google Account information, your application may only use that information to access the user's Google Account when, and for the limited purposes for which, the user has given you permission to do so.
+
+4.4 You agree that you will not engage in any activity with the SDK, including the development or distribution of an application, that interferes with, disrupts, damages, or accesses in an unauthorized manner the servers, networks, or other properties or services of any third party including, but not limited to, Google or any mobile communications carrier.
+
+4.5 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any data, content, or resources that you create, transmit or display through Android and/or applications for Android, and for the consequences of your actions (including any loss or damage which Google may suffer) by doing so.
+
+4.6 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any breach of your obligations under this License Agreement, any applicable third party contract or Terms of Service, or any applicable law or regulation, and for the consequences (including any loss or damage which Google or any third party may suffer) of any such breach.
+
+
+5. Your Developer Credentials
+
+
+5.1 You agree that you are responsible for maintaining the confidentiality of any developer credentials that may be issued to you by Google or which you may choose yourself and that you will be solely responsible for all applications that are developed under your developer credentials.
+
+
+6. Privacy and Information
+
+
+6.1 In order to continually innovate and improve the SDK, Google may collect certain usage statistics from the software including but not limited to a unique identifier, associated IP address, version number of the software, and information on which tools and/or services in the SDK are being used and how they are being used. Before any of this information is collected, the SDK will notify you and seek your consent. If you withhold consent, the information will not be collected.
+
+6.2 The data collected is examined in the aggregate to improve the SDK and is maintained in accordance with Google's Privacy Policy.
+
+
+7. Third Party Applications
+
+
+7.1 If you use the SDK to run applications developed by a third party or that access data, content or resources provided by a third party, you agree that Google is not responsible for those applications, data, content, or resources. You understand that all data, content or resources which you may access through such third party applications are the sole responsibility of the person from which they originated and that Google is not liable for any loss or damage that you may experience as a result of the use or access of any of those third party applications, data, content, or resources.
+
+7.2 You should be aware the data, content, and resources presented to you through such a third party application may be protected by intellectual property rights which are owned by the providers (or by other persons or companies on their behalf). You may not modify, rent, lease, loan, sell, distribute or create derivative works based on these data, content, or resources (either in whole or in part) unless you have been specifically given permission to do so by the relevant owners.
+
+7.3 You acknowledge that your use of such third party applications, data, content, or resources may be subject to separate terms between you and the relevant third party. In that case, this License Agreement does not affect your legal relationship with these third parties.
+
+
+8. Using Android APIs
+
+
+8.1 Google Data APIs
+
+8.1.1 If you use any API to retrieve data from Google, you acknowledge that the data may be protected by intellectual property rights which are owned by Google or those parties that provide the data (or by other persons or companies on their behalf). Your use of any such API may be subject to additional Terms of Service. You may not modify, rent, lease, loan, sell, distribute or create derivative works based on this data (either in whole or in part) unless allowed by the relevant Terms of Service.
+
+8.1.2 If you use any API to retrieve a user's data from Google, you acknowledge and agree that you shall retrieve data only with the user's explicit consent and only when, and for the limited purposes for which, the user has given you permission to do so.
+
+
+9. Terminating this License Agreement
+
+
+9.1 This License Agreement will continue to apply until terminated by either you or Google as set out below.
+
+9.2 If you want to terminate this License Agreement, you may do so by ceasing your use of the SDK and any relevant developer credentials.
+
+9.3 Google may at any time, terminate this License Agreement with you if:
+(A) you have breached any provision of this License Agreement; or
+(B) Google is required to do so by law; or
+(C) the partner with whom Google offered certain parts of SDK (such as APIs) to you has terminated its relationship with Google or ceased to offer certain parts of the SDK to you; or
+(D) Google decides to no longer provide the SDK or certain parts of the SDK to users in the country in which you are resident or from which you use the service, or the provision of the SDK or certain SDK services to you by Google is, in Google's sole discretion, no longer commercially viable.
+
+9.4 When this License Agreement comes to an end, all of the legal rights, obligations and liabilities that you and Google have benefited from, been subject to (or which have accrued over time whilst this License Agreement has been in force) or which are expressed to continue indefinitely, shall be unaffected by this cessation, and the provisions of paragraph 14.7 shall continue to apply to such rights, obligations and liabilities indefinitely.
+
+
+10. DISCLAIMER OF WARRANTIES
+
+
+10.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT YOUR USE OF THE SDK IS AT YOUR SOLE RISK AND THAT THE SDK IS PROVIDED "AS IS" AND "AS AVAILABLE" WITHOUT WARRANTY OF ANY KIND FROM GOOGLE.
+
+10.2 YOUR USE OF THE SDK AND ANY MATERIAL DOWNLOADED OR OTHERWISE OBTAINED THROUGH THE USE OF THE SDK IS AT YOUR OWN DISCRETION AND RISK AND YOU ARE SOLELY RESPONSIBLE FOR ANY DAMAGE TO YOUR COMPUTER SYSTEM OR OTHER DEVICE OR LOSS OF DATA THAT RESULTS FROM SUCH USE.
+
+10.3 GOOGLE FURTHER EXPRESSLY DISCLAIMS ALL WARRANTIES AND CONDITIONS OF ANY KIND, WHETHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO THE IMPLIED WARRANTIES AND CONDITIONS OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+
+
+11. LIMITATION OF LIABILITY
+
+
+11.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT GOOGLE, ITS SUBSIDIARIES AND AFFILIATES, AND ITS LICENSORS SHALL NOT BE LIABLE TO YOU UNDER ANY THEORY OF LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, CONSEQUENTIAL OR EXEMPLARY DAMAGES THAT MAY BE INCURRED BY YOU, INCLUDING ANY LOSS OF DATA, WHETHER OR NOT GOOGLE OR ITS REPRESENTATIVES HAVE BEEN ADVISED OF OR SHOULD HAVE BEEN AWARE OF THE POSSIBILITY OF ANY SUCH LOSSES ARISING.
+
+
+12. Indemnification
+
+
+12.1 To the maximum extent permitted by law, you agree to defend, indemnify and hold harmless Google, its affiliates and their respective directors, officers, employees and agents from and against any and all claims, actions, suits or proceedings, as well as any and all losses, liabilities, damages, costs and expenses (including reasonable attorneys fees) arising out of or accruing from (a) your use of the SDK, (b) any application you develop on the SDK that infringes any copyright, trademark, trade secret, trade dress, patent or other intellectual property right of any person or defames any person or violates their rights of publicity or privacy, and (c) any non-compliance by you with this License Agreement.
+
+
+13. Changes to the License Agreement
+
+
+13.1 Google may make changes to the License Agreement as it distributes new versions of the SDK. When these changes are made, Google will make a new version of the License Agreement available on the website where the SDK is made available.
+
+
+14. General Legal Terms
+
+
+14.1 This License Agreement constitutes the whole legal agreement between you and Google and governs your use of the SDK (excluding any services which Google may provide to you under a separate written agreement), and completely replaces any prior agreements between you and Google in relation to the SDK.
+
+14.2 You agree that if Google does not exercise or enforce any legal right or remedy which is contained in this License Agreement (or which Google has the benefit of under any applicable law), this will not be taken to be a formal waiver of Google's rights and that those rights or remedies will still be available to Google.
+
+14.3 If any court of law, having the jurisdiction to decide on this matter, rules that any provision of this License Agreement is invalid, then that provision will be removed from this License Agreement without affecting the rest of this License Agreement. The remaining provisions of this License Agreement will continue to be valid and enforceable.
+
+14.4 You acknowledge and agree that each member of the group of companies of which Google is the parent shall be third party beneficiaries to this License Agreement and that such other companies shall be entitled to directly enforce, and rely upon, any provision of this License Agreement that confers a benefit on (or rights in favor of) them. Other than this, no other person or company shall be third party beneficiaries to this License Agreement.
+
+14.5 EXPORT RESTRICTIONS. THE SDK IS SUBJECT TO UNITED STATES EXPORT LAWS AND REGULATIONS. YOU MUST COMPLY WITH ALL DOMESTIC AND INTERNATIONAL EXPORT LAWS AND REGULATIONS THAT APPLY TO THE SDK. THESE LAWS INCLUDE RESTRICTIONS ON DESTINATIONS, END USERS AND END USE.
+
+14.6 The rights granted in this License Agreement may not be assigned or transferred by either you or Google without the prior written approval of the other party. Neither you nor Google shall be permitted to delegate their responsibilities or obligations under this License Agreement without the prior written approval of the other party.
+
+14.7 This License Agreement, and your relationship with Google under this License Agreement, shall be governed by the laws of the State of California without regard to its conflict of laws provisions. You and Google agree to submit to the exclusive jurisdiction of the courts located within the county of Santa Clara, California to resolve any legal matter arising from this License Agreement. Notwithstanding this, you agree that Google shall still be allowed to apply for injunctive remedies (or an equivalent type of urgent legal relief) in any jurisdiction.
+
+November 13, 2012
+
+
+
+
+
+ 1.1
+ 2
+ 1
+ Android SDK Platform 1.1_r1
+ http://developer.android.com/sdk/android-1.1.html
+
+
+
+ 46828615
+ a4060f29ed39fc929c302836d488998c53c3002e
+ android-1.1_r1-windows.zip
+
+
+ 45584305
+ e21dbcff45b7356657449ebb3c7e941be2bb5ebe
+ android-1.1_r1-macosx.zip
+
+
+ 45476658
+ c054d25c9b4c6251fa49c2f9c54336998679d3fe
+ android-1.1_r1-linux.zip
+
+
+
+ 4
+
+
+
+
+
+
+
+ 1.5
+ 3
+ 04
+
+ 6
+
+ Android SDK Platform 1.5_r3
+ http://developer.android.com/sdk/android-1.5.html
+
+
+ 54624370
+ 5bb106d2e40d481edd337b0833093843e15fe49a
+ android-1.5_r04-windows.zip
+
+
+ 52440607
+ d3a67c2369afa48b6c3c7624de5031c262018d1e
+ android-1.5_r04-macosx.zip
+
+
+ 53348669
+ 5c134b7df5f4b8bd5b61ba93bdaebada8fa3468c
+ android-1.5_r04-linux.zip
+
+
+
+ 4
+
+
+
+
+
+ 1.6
+ 4
+
+ 03
+
+ 6
+
+ Android SDK Platform 1.6_r2
+ http://developer.android.com/sdk/android-1.6.html
+
+
+ 63454485
+ 483ed088e45bbdf3444baaf9250c8b02e5383cb0
+ android-1.6_r03-linux.zip
+
+
+ 62418496
+ bdafad44f5df9f127979bdb21a1fdd87ee3cd625
+ android-1.6_r03-macosx.zip
+
+
+ 64654625
+ ce0b5e4ffaf12ca4fd07c2da71a8a1ab4a03dc22
+ android-1.6_r03-windows.zip
+
+
+
+ 4
+
+
+
+
+
+
+
+ 2.0
+ 5
+
+ 01
+
+ 3
+
+ Android SDK Platform 2.0, revision 1
+ http://developer.android.com/sdk/android-2.0.html
+
+
+
+ 75095268
+ be9be6a99ca32875c96ec7f91160ca9fce7e3c7d
+ android-2.0_r01-linux.zip
+
+
+ 74956356
+ 2a866d0870dbba18e0503cd41e5fae988a21b314
+ android-2.0_r01-macosx.zip
+
+
+ 76288040
+ aeb623217ff88b87216d6eb7dbc846ed53f68f57
+ android-2.0_r01-windows.zip
+
+
+
+ 4
+
+
+
+
+
+
+
+ 2.0.1
+ 6
+
+ 01
+
+ 4
+
+ Android SDK Platform 2.0.1_r1
+ http://developer.android.com/sdk/android-2.0.1.html
+
+
+
+ 79192618
+ ce2c971dce352aa28af06bda92a070116aa5ae1a
+ android-2.0.1_r01-linux.zip
+
+
+ 79035527
+ c3096f80d75a6fc8cb38ef8a18aec920e53d42c0
+ android-2.0.1_r01-macosx.zip
+
+
+ 80385601
+ 255781ebe4509d9707d0e77edda2815e2bc216e6
+ android-2.0.1_r01-windows.zip
+
+
+
+ 4
+
+
+
+
+
+
+
+ 2.1
+ 7
+
+ 03
+
+ 8
+
+ Android SDK Platform 2.1_r3
+ http://developer.android.com/sdk/
+
+
+ 70142829
+ 5ce51b023ac19f8738500b1007a1da5de2349a1e
+ android-2.1_r03-linux.zip
+
+
+
+ 4
+
+
+
+
+
+
+
+ 2.2
+ 8
+
+ 03
+
+ 8
+
+ Android SDK Platform 2.2_r3
+ http://developer.android.com/sdk/
+
+
+ 74652366
+ 231262c63eefdff8fd0386e9ccfefeb27a8f9202
+ android-2.2_r03-linux.zip
+
+
+
+ 4
+
+
+
+
+
+
+
+ 2.3.1
+ 9
+
+ 02
+
+ 8
+
+ Android SDK Platform 2.3.1_r2
+ http://developer.android.com/sdk/
+
+
+
+ 78732563
+ 209f8a7a8b2cb093fce858b8b55fed3ba5206773
+ android-2.3.1_r02-linux.zip
+
+
+
+ 4
+
+
+
+
+
+
+
+ 2.3.3
+ 10
+
+ 02
+
+ 8
+
+ Android SDK Platform 2.3.3._r2
+ http://developer.android.com/sdk/
+
+
+ 85470907
+ 887e37783ec32f541ea33c2c649dda648e8e6fb3
+ android-2.3.3_r02-linux.zip
+
+
+
+ 4
+
+
+
+
+
+
+
+ 3.0
+ 11
+
+ 02
+
+ 10
+
+ Android SDK Platform 3.0, revision 2
+ http://developer.android.com/sdk/
+
+
+ 104513908
+ 2c7d4bd13f276e76f6bbd87315fe27aba351dd37
+ android-3.0_r02-linux.zip
+
+
+
+ 4
+
+
+
+
+
+
+
+ 3.1
+ 12
+
+ 03
+
+ 11
+
+ Android SDK Platform 3.1, revision 3
+ http://developer.android.com/sdk/
+
+
+ 106472351
+ 4a50a6679cd95bb68bb5fc032e754cd7c5e2b1bf
+ android-3.1_r03-linux.zip
+
+
+
+ 4
+
+
+
+
+
+
+
+ 3.2
+ 13
+
+ 01
+
+ 12
+
+ Android SDK Platform 3.2, revision 1
+ http://developer.android.com/sdk/
+
+
+ 108426536
+ 6189a500a8c44ae73a439604363de93591163cd9
+ android-3.2_r01-linux.zip
+
+
+
+ 4
+
+
+
+
+
+
+ 3
+ Android SDK Platform 4.0
+ 4.0
+ 14
+
+ 7
+ 1
+
+
+
+ 45919570
+ 41ba83b51e886461628c41b1b4d47762e0688ed5
+ android-14_r03.zip
+
+
+
+
+
+
+
+ 3
+ Android SDK Platform 4.0.3
+ 4.0.3
+ 15
+
+ 15
+
+
+ 7
+ 1
+
+
+
+ 44414679
+ 23da24610a8da51054c5391001c51ce43a778b97
+ android-15_r03.zip
+
+
+
+
+
+
+
+ 3
+ Android SDK Platform 4.1
+ 4.1.2
+ 16
+
+ 20
+
+
+ 8
+ 1
+
+
+
+ 47995505
+ 80d9ffef58168f9bccd862830e2ee51f686b167e
+ android-16_r03.zip
+
+
+
+
+
+
+
+ 1
+ Android SDK Platform 4.2
+ 4.2
+ 17
+
+ 21
+
+
+ 9
+ 1
+
+
+
+ 47886130
+ c2e7c8c8db40e06b804ddb1725ac2c3555b55025
+ android-17_r01.zip
+
+
+
+
+
+
+
+
+
+ 2
+ Android SDK Platform 4.0
+ 14
+ armeabi-v7a
+
+
+ 99621822
+ d8991b0c06b18d7d6ed4169d67460ee1add6661b
+ sysimg_armv7a-14_r02.zip
+
+
+
+
+
+
+
+ 2
+ Android SDK Platform 4.0.3
+ 15
+ armeabi-v7a
+
+
+ 96227377
+ 1bf977d6cb4e0ad38dceac0c4863d1caa21f326e
+ sysimg_armv7a-15_r02.zip
+
+
+
+
+
+
+
+ 3
+ Android SDK Platform 4.1
+ 16
+ armeabi-v7a
+
+
+ 112528368
+ d1cddb23f17aad5821a089c403d4cddad2cf9ef7
+ sysimg_armv7a-16_r03.zip
+
+
+
+
+
+
+
+ 1
+ Android SDK Platform 4.2
+ 17
+ armeabi-v7a
+
+
+ 116831648
+ 45b9344473e0a6d063c2b1fe58d8cd47d307905e
+ sysimg_armv7a-17_r01.zip
+
+
+
+
+
+
+
+
+
+
+ 7
+
+ 01
+ Android SDK Samples for Android API 7, revision 1
+ http://developer.android.com/sdk/
+
+
+ 7677831
+ 51e4907f60f248ede5c58b54ce7b6ae0b473e0ca
+ samples-2.1_r01-linux.zip
+
+
+
+
+
+
+
+
+ 8
+
+ 01
+ Android SDK Samples for Android API 8, revision 1
+ http://developer.android.com/sdk/
+
+
+ 7969716
+ d16d8bf2dd84cedf73b98b948d66461c8f19d6fb
+ samples-2.2_r01-linux.zip
+
+
+
+
+
+
+
+
+ 9
+
+ 01
+ Android SDK Samples for Android API 9, revision 1
+ http://developer.android.com/sdk/
+
+
+
+ 8516326
+ 36f7dd6c8b5dbb50b3cf3e3ac5209f3fe55db2aa
+ samples-2.3_r01-linux.zip
+
+
+
+
+
+
+
+
+ 10
+
+ 01
+ Android SDK Samples for Android API 10, revision 1
+ http://developer.android.com/sdk/
+
+
+ 8539583
+ 93b0c3f3bdf5b07f1f115100b4954f0665297a0d
+ samples-2.3.3_r01-linux.zip
+
+
+
+
+
+
+
+
+ 11
+
+ 01
+ Android SDK Samples for Android API 11, revision 1
+ http://developer.android.com/sdk/
+
+
+ 11976920
+ 3749ace584631270268d65bb1d0ad61b0d691682
+ samples-3.0_r01-linux.zip
+
+
+
+
+
+
+
+
+ 12
+
+ 01
+ Android SDK Samples for Android API 12, revision 1
+ http://developer.android.com/sdk/
+
+
+ 12150514
+ df0ace37cbca73373fe94080f94c71557cac73a7
+ samples-3.1_r01-linux.zip
+
+
+
+
+
+
+
+
+ 13
+
+ 01
+ Android SDK Samples for Android API 13, revision 1
+ http://developer.android.com/sdk/
+
+
+ 12193502
+ 078bcf1abc1cb8921f3fa482c252963a782bed60
+ samples-3.2_r01-linux.zip
+
+
+
+
+
+
+
+ 2
+ 14
+
+
+ 16253619
+ 1312c22ab0b650e26835cc3945d4ff8cea183416
+ samples-14_r02.zip
+
+
+
+
+
+
+
+ 2
+ 15
+
+
+ 16366656
+ 042f368c5b09eca4d278264e6dbf9c12c5f73d1f
+ samples-15_r02.zip
+
+
+
+
+
+
+
+ 1
+ 16
+
+
+ 14729945
+ dce3a2d41db50a381ef47ee8bddbe928520e685e
+ samples-16_r01.zip
+
+
+
+
+
+
+
+ 1
+ 17
+
+
+ 14840030
+ 12d58cb26503610fc05bd7618c434cc6f983bc41
+ samples-17_r01.zip
+
+
+
+
+
+
+
+
+
+
+ 16
+
+
+
+ 11938435
+ 0d6245b685c7d303cf4a054a3d373c4427b7ad01
+ platform-tools_r16-windows.zip
+
+
+ 12676089
+ 84d563ae5e324f223f335f11bf511bf6207c05fb
+ platform-tools_r16-linux.zip
+
+
+ 13147351
+ fbb0f8d2786a83b8c3eb6df402e706e136db8fed
+ platform-tools_r16-macosx.zip
+
+
+
+
+
+
+
+
+
+
+ 21
+
+
+ 16
+
+
+
+ 98982670
+ 57bbfadcedbef44fc322e5e037666393668cf3fe
+ tools_r21-windows.zip
+
+
+ 91495104
+ 013b9c04407a9d73b8bf3c574327fbe870acd264
+ tools_r21-linux.zip
+
+
+ 65767130
+ fcfa3a6932f2ed0d970a0ca959bb2b4972f7d46d
+ tools_r21-macosx.zip
+
+
+
+
+
+
+
+
+ 21
+ 0
+ 1
+ 1
+
+
+ 16
+
+
+
+ 98998088
+ 1503aaf2c91cb07c0240a2db3af0de027941a4f6
+ tools_r21.0.1_rc1-windows.zip
+
+
+ 91510079
+ 183670a7f9878d8d3693d5fcf32e1357b69f0fed
+ tools_r21.0.1_rc1-linux.zip
+
+
+ 65777178
+ 109d4f287904875f067e021be3fd1f549e6afb67
+ tools_r21.0.1_rc1-macosx.zip
+
+
+
+
+
+
+
+
+
+ 1
+ 17
+
+
+ 171564393
+ fb988cdd2beaac0dd47dc630821ccc30557c67e5
+ docs-17_r01.zip
+
+
+
+
+
+
+
+
+
+ 1
+ 14
+
+
+ 16152383
+ eaf4ed7dcac46e68516a1b4aa5b0d9e5a39a7555
+ sources-14_r01.zip
+
+
+
+
+
+
+
+ 2
+ 15
+
+
+ 16468746
+ e5992a5747c9590783fbbdd700337bf0c9f6b1fa
+ sources-15_r02.zip
+
+
+
+
+
+
+
+ 2
+ 16
+
+
+ 17876720
+ 0f83c14ed333c45d962279ab5d6bc98a0269ef84
+ sources-16_r02.zip
+
+
+
+
+
+
+
+ 1
+ 17
+
+
+ 18976816
+ 6f1f18cd2d2b1852d7f6892df9cee3823349d43a
+ sources-17_r01.zip
+
+
+
+
+
diff --git a/pkgs/development/mobile/androidenv/support.nix b/pkgs/development/mobile/androidenv/support.nix
new file mode 100644
index 00000000000..2e9690de7a2
--- /dev/null
+++ b/pkgs/development/mobile/androidenv/support.nix
@@ -0,0 +1,17 @@
+{stdenv, fetchurl, unzip}:
+
+stdenv.mkDerivation {
+ name = "android-support-r11";
+ src = fetchurl {
+ url = https://dl-ssl.google.com/android/repository/support_r11.zip;
+ sha1 = "d30d182d8e4c86bb4464c03a83ccffce7bc84ecd";
+ };
+
+ buildCommand = ''
+ mkdir -p $out
+ cd $out
+ unzip $src
+ '';
+
+ buildInputs = [ unzip ];
+}
\ No newline at end of file
diff --git a/pkgs/development/mobile/androidenv/sysimages.nix b/pkgs/development/mobile/androidenv/sysimages.nix
new file mode 100644
index 00000000000..b35b4298983
--- /dev/null
+++ b/pkgs/development/mobile/androidenv/sysimages.nix
@@ -0,0 +1,50 @@
+
+{stdenv, fetchurl, unzip}:
+
+let
+ buildSystemImage = args:
+ stdenv.mkDerivation (args // {
+ buildInputs = [ unzip ];
+ buildCommand = ''
+ mkdir -p $out
+ cd $out
+ unzip $src
+ '';
+ });
+in
+{
+
+ sysimg_14 = buildSystemImage {
+ name = "armeabi-v7a-14";
+ src = fetchurl {
+ url = https://dl-ssl.google.com/android/repository/sysimg_armv7a-14_r02.zip;
+ sha1 = "d8991b0c06b18d7d6ed4169d67460ee1add6661b";
+ };
+ };
+
+ sysimg_15 = buildSystemImage {
+ name = "armeabi-v7a-15";
+ src = fetchurl {
+ url = https://dl-ssl.google.com/android/repository/sysimg_armv7a-15_r02.zip;
+ sha1 = "1bf977d6cb4e0ad38dceac0c4863d1caa21f326e";
+ };
+ };
+
+ sysimg_16 = buildSystemImage {
+ name = "armeabi-v7a-16";
+ src = fetchurl {
+ url = https://dl-ssl.google.com/android/repository/sysimg_armv7a-16_r03.zip;
+ sha1 = "d1cddb23f17aad5821a089c403d4cddad2cf9ef7";
+ };
+ };
+
+ sysimg_17 = buildSystemImage {
+ name = "armeabi-v7a-17";
+ src = fetchurl {
+ url = https://dl-ssl.google.com/android/repository/sysimg_armv7a-17_r01.zip;
+ sha1 = "45b9344473e0a6d063c2b1fe58d8cd47d307905e";
+ };
+ };
+
+}
+
\ No newline at end of file
diff --git a/pkgs/development/mobile/titaniumenv/build-app.nix b/pkgs/development/mobile/titaniumenv/build-app.nix
new file mode 100644
index 00000000000..c05bf88ffbf
--- /dev/null
+++ b/pkgs/development/mobile/titaniumenv/build-app.nix
@@ -0,0 +1,119 @@
+{stdenv, androidsdk, titaniumsdk, xcodewrapper}:
+{ appId, name, src, target, androidPlatformVersions ? [ "8" ]
+, release ? false, androidKeyStore ? null, androidKeyAlias ? null, androidKeyStorePassword ? null
+, iosKeyFile ? null, iosCertificateName ? null, iosCertificate ? null, iosCertificatePassword ? null, iosDistribute ? false
+}:
+
+assert (release && target == "android") -> androidKeyStore != null && androidKeyAlias != null && androidKeyStorePassword != null;
+assert (release && target == "iphone") -> iosKeyFile != null && iosCertificateName != null && iosCertificate != null && iosCertificatePassword != null;
+
+let
+ androidsdkComposition = androidsdk {
+ platformVersions = androidPlatformVersions;
+ useGoogleAPIs = true;
+ };
+
+ deleteKeychain = "security delete-keychain $keychainName";
+in
+stdenv.mkDerivation {
+ name = stdenv.lib.replaceChars [" "] [""] name;
+ inherit src;
+
+ buildInputs = [] ++ stdenv.lib.optional (stdenv.system == "x86_64-darwin") xcodewrapper;
+
+ buildPhase = ''
+ export HOME=$TMPDIR
+
+ mkdir -p $out
+
+ ${if target == "android" then
+ if release then
+ ''${titaniumsdk}/mobilesdk/*/*/android/builder.py distribute "${name}" ${androidsdkComposition}/libexec/android-sdk-* $(pwd) ${appId} ${androidKeyStore} ${androidKeyStorePassword} ${androidKeyAlias} $out''
+ else
+ ''${titaniumsdk}/mobilesdk/*/*/android/builder.py build "${name}" ${androidsdkComposition}/libexec/android-sdk-* $(pwd) ${appId}''
+
+ else if target == "iphone" then
+ if iosDistribute then ''
+ export HOME=/Users/$(whoami)
+ export keychainName=$(basename $out)
+
+ # Create a keychain with the component hash name (should always be unique)
+ security create-keychain -p "" $keychainName
+ security default-keychain -s $keychainName
+ security unlock-keychain -p "" $keychainName
+ security import ${iosCertificate} -k $keychainName -P "${iosCertificatePassword}" -A
+
+ provisioningId=$(grep UUID -A1 -a ${iosKeyFile} | grep -o "[-A-Z0-9]\{36\}")
+
+ # Ensure that the requested provisioning profile can be found
+
+ if [ ! -f "$HOME/Library/MobileDevice/Provisioning Profiles/$provisioningId.mobileprovision" ]
+ then
+ mkdir -p "$HOME/Library/MobileDevice/Provisioning Profiles"
+ cp ${iosKeyFile} "$HOME/Library/MobileDevice/Provisioning Profiles/$provisioningId.mobileprovision"
+ fi
+
+ ${titaniumsdk}/mobilesdk/*/*/iphone/builder.py distribute 6.0 $(pwd) ${appId} "${name}" "$provisioningId" "${iosCertificateName}" $out universal "$HOME/Library/Keychains/$keychainName"
+
+ # Remove our generated keychain
+
+ ${deleteKeychain}
+ ''
+ else
+ if release then
+ ''
+ export HOME=/Users/$(whoami)
+ export keychainName=$(basename $out)
+
+ # Create a keychain with the component hash name (should always be unique)
+ security create-keychain -p "" $keychainName
+ security default-keychain -s $keychainName
+ security unlock-keychain -p "" $keychainName
+ security import ${iosCertificate} -k $keychainName -P "${iosCertificatePassword}" -A
+
+ provisioningId=$(grep UUID -A1 -a ${iosKeyFile} | grep -o "[-A-Z0-9]\{36\}")
+
+ # Ensure that the requested provisioning profile can be found
+
+ if [ ! -f "$HOME/Library/MobileDevice/Provisioning Profiles/$provisioningId.mobileprovision" ]
+ then
+ mkdir -p "$HOME/Library/MobileDevice/Provisioning Profiles"
+ cp ${iosKeyFile} "$HOME/Library/MobileDevice/Provisioning Profiles/$provisioningId.mobileprovision"
+ fi
+
+ ${titaniumsdk}/mobilesdk/*/*/iphone/builder.py adhoc 6.0 $(pwd) ${appId} "${name}" "$provisioningId" "${iosCertificateName}" universal "$HOME/Library/Keychains/$keychainName"
+
+ # Remove our generated keychain
+
+ ${deleteKeychain}
+ ''
+ else
+ ''
+ # Copy all sources to the output store directory.
+ # Why? Debug application include *.js files, which are symlinked into their
+ # sources. If they are not copied, we have dangling references to the
+ # temp folder.
+
+ cp -av * $out
+ cd $out
+ ${titaniumsdk}/mobilesdk/*/*/iphone/builder.py build 6.0 $(pwd) ${appId} "${name}" universal
+ ''
+
+ else throw "Target: ${target} is not supported!"}
+ '';
+
+ installPhase = ''
+ mkdir -p $out
+
+ ${if target == "android" && release then ""
+ else
+ if target == "android" then
+ ''cp $(ls build/android/bin/*.apk | grep -v '\-unsigned.apk') $out''
+ else if target == "iphone" && release then
+ "cp -av build/iphone/build/* $out"
+ else if target == "iphone" then ""
+ else throw "Target: ${target} is not supported!"}
+ '';
+
+ failureHook = stdenv.lib.optionalString (release && target == "iphone") deleteKeychain;
+}
diff --git a/pkgs/development/mobile/titaniumenv/default.nix b/pkgs/development/mobile/titaniumenv/default.nix
new file mode 100644
index 00000000000..8117b452d70
--- /dev/null
+++ b/pkgs/development/mobile/titaniumenv/default.nix
@@ -0,0 +1,18 @@
+{pkgs, pkgs_i686}:
+
+rec {
+ androidenv = pkgs.androidenv;
+
+ xcodeenv = if pkgs.stdenv.system == "x86_64-darwin" then pkgs.xcodeenv else null;
+
+ titaniumsdk = import ./titaniumsdk.nix {
+ inherit (pkgs) stdenv fetchurl unzip makeWrapper python jdk;
+ };
+
+ buildApp = import ./build-app.nix {
+ inherit (pkgs) stdenv;
+ inherit (androidenv) androidsdk;
+ inherit (xcodeenv) xcodewrapper;
+ inherit titaniumsdk;
+ };
+}
diff --git a/pkgs/development/mobile/titaniumenv/examples/default.nix b/pkgs/development/mobile/titaniumenv/examples/default.nix
new file mode 100644
index 00000000000..1526d4c4359
--- /dev/null
+++ b/pkgs/development/mobile/titaniumenv/examples/default.nix
@@ -0,0 +1,38 @@
+let
+ pkgs = import {};
+ pkgs_i686 = import { system = "i686-linux"; };
+in
+rec {
+ titaniumenv = import ./.. {
+ inherit pkgs pkgs_i686;
+ };
+
+ kitchensink_android = import ./kitchensink {
+ inherit titaniumenv;
+ inherit (pkgs) fetchgit;
+ target = "android";
+ };
+
+ kitchensink_iphone = import ./kitchensink {
+ inherit titaniumenv;
+ inherit (pkgs) fetchgit;
+ target = "iphone";
+ };
+
+ emulate_kitchensink = import ./emulate-kitchensink {
+ inherit (titaniumenv) androidenv;
+ kitchensink = kitchensink_android;
+ };
+
+ simulate_kitchensink_iphone = import ./simulate-kitchensink {
+ inherit (titaniumenv) xcodeenv;
+ kitchensink = kitchensink_iphone;
+ device = "iPhone";
+ };
+
+ simulate_kitchensink_ipad = import ./simulate-kitchensink {
+ inherit (titaniumenv) xcodeenv;
+ kitchensink = kitchensink_iphone;
+ device = "iPad";
+ };
+}
diff --git a/pkgs/development/mobile/titaniumenv/examples/emulate-kitchensink/default.nix b/pkgs/development/mobile/titaniumenv/examples/emulate-kitchensink/default.nix
new file mode 100644
index 00000000000..817aa5ab37f
--- /dev/null
+++ b/pkgs/development/mobile/titaniumenv/examples/emulate-kitchensink/default.nix
@@ -0,0 +1,10 @@
+{androidenv, kitchensink}:
+
+androidenv.emulateApp {
+ name = "kitchensink";
+ app = kitchensink;
+ platformVersion = "8";
+ useGoogleAPIs = true;
+ package = "com.appcelerator.kitchensink";
+ activity = "KitchensinkActivity";
+}
diff --git a/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix b/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix
new file mode 100644
index 00000000000..8e2b1df264a
--- /dev/null
+++ b/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix
@@ -0,0 +1,24 @@
+{titaniumenv, fetchgit, target, androidPlatformVersions ? [ "8" ]}:
+
+titaniumenv.buildApp {
+ name = "KitchenSink";
+ appId = "com.appcelerator.kitchensink";
+ src = fetchgit {
+ url = https://github.com/appcelerator/KitchenSink.git;
+ rev = "0f2c0b818034cc4e6867f0aa2afc98bf77dbff02";
+ sha256 = "de31496cfb5625d7a193bbbc32a8021e4094ffab20ae13ef2e1583b0394d7c60";
+ };
+
+ inherit target androidPlatformVersions;
+
+ /*release = true;
+ androidKeyStore = /home/sander/keystore;
+ androidKeyAlias = "sander";
+ androidKeyStorePassword = "foobar";*/
+
+ /*release = true;
+ iosKeyFile = /Users/sander/Downloads/profile.mobileprovision;
+ iosCertificateName = "My Company";
+ iosCertificate = /Users/sander/Downloads/c.p12;
+ iosCertificatePassword = "";*/
+}
diff --git a/pkgs/development/mobile/titaniumenv/examples/simulate-kitchensink/default.nix b/pkgs/development/mobile/titaniumenv/examples/simulate-kitchensink/default.nix
new file mode 100644
index 00000000000..70ec534f6ae
--- /dev/null
+++ b/pkgs/development/mobile/titaniumenv/examples/simulate-kitchensink/default.nix
@@ -0,0 +1,8 @@
+{xcodeenv, kitchensink, device}:
+
+xcodeenv.simulateApp {
+ name = "kitchensink";
+ app = kitchensink;
+ inherit device;
+ baseDir = "build/iphone/build/Debug-iphonesimulator";
+}
diff --git a/pkgs/development/mobile/titaniumenv/fixnativelibs.sed b/pkgs/development/mobile/titaniumenv/fixnativelibs.sed
new file mode 100644
index 00000000000..76b330136b6
--- /dev/null
+++ b/pkgs/development/mobile/titaniumenv/fixnativelibs.sed
@@ -0,0 +1 @@
+s|\t\t\t\t\t\t\t\tapk_zip.write(native_lib, path_in_zip)|\t\t\t\t\t\t\t\tinfo = zipfile.ZipInfo(path_in_zip)\n\t\t\t\t\t\t\t\tinfo.compress_type = zipfile.ZIP_DEFLATED\n\t\t\t\t\t\t\t\tinfo.create_system = 3\n\t\t\t\t\t\t\t\tf = open(native_lib)\n\t\t\t\t\t\t\t\tapk_zip.writestr(info, f.read())\n\t\t\t\t\t\t\t\tf.close()|
diff --git a/pkgs/development/mobile/titaniumenv/fixselfruntimev8.sed b/pkgs/development/mobile/titaniumenv/fixselfruntimev8.sed
new file mode 100644
index 00000000000..c849aaa611c
--- /dev/null
+++ b/pkgs/development/mobile/titaniumenv/fixselfruntimev8.sed
@@ -0,0 +1 @@
+s|apk_zip.write(os.path.join(lib_source_dir, fname), lib_dest_dir + fname)|info = zipfile.ZipInfo(lib_dest_dir + fname)\n\t\t\t\t\tinfo.compress_type = zipfile.ZIP_DEFLATED\n\t\t\t\t\tinfo.create_system = 3\n\t\t\t\t\tf = open(os.path.join(lib_source_dir, fname))\n\t\t\t\t\tapk_zip.writestr(info, f.read())\n\t\t\t\t\tf.close()|
diff --git a/pkgs/development/mobile/titaniumenv/fixtiverify.sed b/pkgs/development/mobile/titaniumenv/fixtiverify.sed
new file mode 100644
index 00000000000..8e1114769c8
--- /dev/null
+++ b/pkgs/development/mobile/titaniumenv/fixtiverify.sed
@@ -0,0 +1 @@
+s|apk_zip.write(os.path.join(lib_source_dir, 'libtiverify.so'), lib_dest_dir + 'libtiverify.so')|info = zipfile.ZipInfo(lib_dest_dir + 'libtiverify.so')\n\t\t\tinfo.compress_type = zipfile.ZIP_DEFLATED\n\t\t\tinfo.create_system = 3\n\t\t\tf = open(os.path.join(lib_source_dir, 'libtiverify.so'))\n\t\t\tapk_zip.writestr(info, f.read())\n\t\t\tf.close()|
diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk.nix
new file mode 100644
index 00000000000..b4cd1a98fb0
--- /dev/null
+++ b/pkgs/development/mobile/titaniumenv/titaniumsdk.nix
@@ -0,0 +1,62 @@
+{stdenv, src ? null, fetchurl, unzip, makeWrapper, python, jdk}:
+
+stdenv.mkDerivation {
+ name = "titanium-mobilesdk-2.1.5.v20121112144658";
+ src = if src == null then
+ if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl {
+ url = http://builds.appcelerator.com.s3.amazonaws.com/mobile/2_1_X/mobilesdk-2.1.5.v20121112144658-linux.zip;
+ sha1 = "79f073d11ee893c508c5aa675a3126501dd385fd";
+ }
+ else if stdenv.system == "x86_64-darwin" then fetchurl {
+ url = http://builds.appcelerator.com.s3.amazonaws.com/mobile/2_1_X/mobilesdk-2.1.5.v20121112144658-osx.zip;
+ sha1 = "6a9a726882222d1615de332aa1ca608c15564e1c";
+ }
+ else throw "Platform: ${stdenv.system} not supported!"
+ else src;
+
+ buildInputs = [ unzip makeWrapper ];
+
+ buildCommand = ''
+ mkdir -p $out
+ cd $out
+ yes y | unzip $src
+
+ # Fix shebang header for python scripts
+
+ find . -name \*.py | while read i
+ do
+ sed -i -e "s|#!/usr/bin/env python|#!${python}/bin/python|" $i
+ done
+
+ # Zip files do not support timestamps lower than 1980. We have to apply a few work-arounds to cope with that
+ # Yes, I know it's nasty :-)
+
+ cd mobilesdk/*/*/android
+
+ sed -i -f ${./fixtiverify.sed} builder.py
+ sed -i -f ${./fixselfruntimev8.sed} builder.py
+ sed -i -f ${./fixnativelibs.sed} builder.py
+
+ # Patch some executables
+
+ ${if stdenv.system == "i686-linux" then
+ ''
+ patchelf --set-interpreter ${stdenv.gcc.libc}/lib/ld-linux.so.2 titanium_prep.linux32
+ ''
+ else if stdenv.system == "x86_64-linux" then
+ ''
+ patchelf --set-interpreter ${stdenv.gcc.libc}/lib/ld-linux-x86-64.so.2 titanium_prep.linux64
+ ''
+ else ""}
+
+ # Wrap builder script
+
+ wrapProgram `pwd`/builder.py \
+ --prefix PYTHONPATH : ${python.modules.sqlite3}/lib/python*/site-packages \
+ --prefix PATH : ${jdk}/bin \
+ --prefix JAVA_HOME : ${jdk}
+ '' + stdenv.lib.optionalString (stdenv.system == "x86_64-darwin") ''
+ # 'ditto' utility is needed to copy stuff to the Xcode organizer. Dirty, but this allows it to work.
+ sed -i -e "s|ditto|/usr/bin/ditto|g" $out/mobilesdk/osx/*/iphone/builder.py
+ '';
+}
diff --git a/pkgs/development/mobile/xcodeenv/build-app.nix b/pkgs/development/mobile/xcodeenv/build-app.nix
new file mode 100644
index 00000000000..3ac9e4bb958
--- /dev/null
+++ b/pkgs/development/mobile/xcodeenv/build-app.nix
@@ -0,0 +1,92 @@
+{stdenv, xcodewrapper}:
+{ name
+, src
+, target ? null
+, configuration ? null
+, scheme ? null
+, sdk ? null
+, arch ? null
+, xcodeFlags ? ""
+, release ? false
+, codeSignIdentity ? null
+, certificateFile ? null
+, certificatePassword ? null
+, provisioningProfile ? null
+, generateIPA ? false
+, generateXCArchive ? false
+}:
+
+assert release -> codeSignIdentity != null && certificateFile != null && certificatePassword != null && provisioningProfile != null;
+
+let
+ # Set some default values here
+
+ _target = if target == null then name else target;
+ _scheme = if scheme == null then name else scheme;
+
+ _configuration = if configuration == null
+ then
+ if release then "Release" else "Debug"
+ else configuration;
+
+ _arch = if arch == null
+ then
+ if release then "armv7" else "i386"
+ else arch;
+
+ _sdk = if sdk == null
+ then
+ if release then "iphoneos6.0" else "iphonesimulator6.0"
+ else sdk;
+
+ # The following is to prevent repetition
+ deleteKeychain = "security delete-keychain $keychainName";
+in
+stdenv.mkDerivation {
+ inherit name src;
+ buildInputs = [ xcodewrapper ];
+ buildPhase = ''
+ ${stdenv.lib.optionalString release ''
+ export HOME=/Users/$(whoami)
+ keychainName="$(basename $out)"
+
+ # Create a keychain
+ security create-keychain -p "" $keychainName
+ security default-keychain -s $keychainName
+ security unlock-keychain -p "" $keychainName
+
+ # Import the certificate into the keychain
+ security import ${certificateFile} -k $keychainName -P "${certificatePassword}" -A
+
+ # Determine provisioning ID
+ PROVISIONING_PROFILE=$(grep UUID -A1 -a ${provisioningProfile} | grep -o "[-A-Z0-9]\{36\}")
+
+ if [ ! -f "$HOME/Library/MobileDevice/Provisioning Profiles/$PROVISIONING_PROFILE.mobileprovision" ]
+ then
+ # Copy provisioning profile into the home directory
+ mkdir -p "$HOME/Library/MobileDevice/Provisioning Profiles"
+ cp ${provisioningProfile} "$HOME/Library/MobileDevice/Provisioning Profiles/$PROVISIONING_PROFILE.mobileprovision"
+ fi
+
+ # Check whether the identity can be found
+ security find-identity -p codesigning $keychainName
+ ''}
+
+ # Do the building
+ xcodebuild -target ${_target} -configuration ${_configuration} -scheme ${_scheme} -sdk ${_sdk} -arch ${_arch} ONLY_ACTIVE_ARCH=NO CONFIGURATION_TEMP_DIR=$TMPDIR CONFIGURATION_BUILD_DIR=$out ${if generateXCArchive then "archive" else ""} ${xcodeFlags} ${if release then ''"CODE_SIGN_IDENTITY=${codeSignIdentity}" PROVISIONING_PROFILE=$PROVISIONING_PROFILE OTHER_CODE_SIGN_FLAGS="--keychain $HOME/Library/Keychains/$keychainName"'' else ""}
+
+ ${stdenv.lib.optionalString release ''
+ ${stdenv.lib.optionalString generateIPA ''
+ # Produce an IPA file
+ xcrun -sdk iphoneos PackageApplication -v $out/*.app -o $out/${name}.ipa
+ ''}
+
+ # Delete our temp keychain
+ ${deleteKeychain}
+ ''}
+ '';
+
+ failureHook = stdenv.lib.optionalString release deleteKeychain;
+
+ installPhase = "true";
+}
diff --git a/pkgs/development/mobile/xcodeenv/default.nix b/pkgs/development/mobile/xcodeenv/default.nix
new file mode 100644
index 00000000000..7f834688e63
--- /dev/null
+++ b/pkgs/development/mobile/xcodeenv/default.nix
@@ -0,0 +1,15 @@
+{stdenv}:
+
+rec {
+ xcodewrapper = import ./xcodewrapper.nix {
+ inherit stdenv;
+ };
+
+ buildApp = import ./build-app.nix {
+ inherit stdenv xcodewrapper;
+ };
+
+ simulateApp = import ./simulate-app.nix {
+ inherit stdenv xcodewrapper;
+ };
+}
diff --git a/pkgs/development/mobile/xcodeenv/simulate-app.nix b/pkgs/development/mobile/xcodeenv/simulate-app.nix
new file mode 100644
index 00000000000..e3eff458d27
--- /dev/null
+++ b/pkgs/development/mobile/xcodeenv/simulate-app.nix
@@ -0,0 +1,17 @@
+{stdenv, xcodewrapper}:
+{name, app, device ? "iPhone", baseDir ? ""}:
+
+stdenv.mkDerivation {
+ name = stdenv.lib.replaceChars [" "] [""] name;
+ buildCommand = ''
+ ensureDir $out/bin
+ cat > $out/bin/run-test-simulator << "EOF"
+ #! ${stdenv.shell} -e
+
+ cd '${app}/${baseDir}/${name}.app'
+ "$(readlink "${xcodewrapper}/bin/iPhone Simulator")" -SimulateApplication './${name}' -SimulateDevice '${device}'
+ EOF
+ chmod +x $out/bin/run-test-simulator
+ '';
+}
+
diff --git a/pkgs/development/mobile/xcodeenv/xcodewrapper.nix b/pkgs/development/mobile/xcodeenv/xcodewrapper.nix
new file mode 100644
index 00000000000..39804b1a248
--- /dev/null
+++ b/pkgs/development/mobile/xcodeenv/xcodewrapper.nix
@@ -0,0 +1,24 @@
+{stdenv}:
+
+let
+ version = "4.5.2";
+in
+stdenv.mkDerivation {
+ name = "xcode-wrapper-"+version;
+ buildCommand = ''
+ ensureDir $out/bin
+ cd $out/bin
+ ln -s /usr/bin/xcode-select
+ ln -s /usr/bin/xcodebuild
+ ln -s /usr/bin/xcrun
+ ln -s /usr/bin/security
+ ln -s "/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/Applications/iPhone Simulator.app/Contents/MacOS/iPhone Simulator"
+
+ # Check if we have the xcodebuild version that we want
+ if [ -z "$($out/bin/xcodebuild -version | grep ${version})" ]
+ then
+ echo "We require xcodebuild version: ${version}"
+ exit 1
+ fi
+ '';
+}
diff --git a/pkgs/development/ocaml-modules/extlib/default.nix b/pkgs/development/ocaml-modules/extlib/default.nix
index a520f8196d8..d59dbae45fe 100644
--- a/pkgs/development/ocaml-modules/extlib/default.nix
+++ b/pkgs/development/ocaml-modules/extlib/default.nix
@@ -4,11 +4,10 @@ stdenv.mkDerivation {
name = "ocaml-extlib-1.5.2";
src = fetchurl {
- url = "http://ocaml-extlib.googlecode.com/files/extlib-1.5.2.tar.gz";
- sha256 = "ca6d69adeba4242ce41c02a23746ba1e464c0bbec66e2d16b02c3c6e85dc10aa";
+ url = http://ocaml-extlib.googlecode.com/files/extlib-1.5.3.tar.gz;
+ sha256 = "c095eef4202a8614ff1474d4c08c50c32d6ca82d1015387785cf03d5913ec021";
};
- patches = [ ./hashtable-ocaml4-compat.patch ];
buildInputs = [ocaml findlib];
createFindlibDestdir = true;
@@ -19,9 +18,9 @@ stdenv.mkDerivation {
'';
meta = {
- homepage = "http://code.google.com/p/ocaml-extlib/";
+ homepage = http://code.google.com/p/ocaml-extlib/;
description = "Enhancements to the OCaml Standard Library modules";
- license = "LGPL";
+ license = stdenv.lib.licenses.lgpl21;
platforms = ocaml.meta.platforms;
};
}
diff --git a/pkgs/development/ocaml-modules/extlib/hashtable-ocaml4-compat.patch b/pkgs/development/ocaml-modules/extlib/hashtable-ocaml4-compat.patch
deleted file mode 100644
index c587f2b6cd3..00000000000
--- a/pkgs/development/ocaml-modules/extlib/hashtable-ocaml4-compat.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Revision 396 from the official extlib repository.
-
---- extlib/extHashtbl.ml (revision 395)
-+++ extlib/extHashtbl.ml (working copy)
-@@ -32,6 +32,7 @@
- }
-
- include Hashtbl
-+ let create n = Hashtbl.create (* no seed *) n
-
- external h_conv : ('a, 'b) t -> ('a, 'b) h_t = "%identity"
- external h_make : ('a, 'b) h_t -> ('a, 'b) t = "%identity"
\ No newline at end of file
diff --git a/pkgs/development/ocaml-modules/lablgtkmathview/configure.patch b/pkgs/development/ocaml-modules/lablgtkmathview/configure.patch
deleted file mode 100644
index b841e8f4382..00000000000
--- a/pkgs/development/ocaml-modules/lablgtkmathview/configure.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- configure 2010-09-02 10:58:16.128236964 -0400
-+++ configure.old 2010-09-02 10:57:42.368111615 -0400
-@@ -1637,9 +1637,9 @@
- echo "$as_me:$LINENO: result: $ac_cv_file__usr_include_caml_mlvalues_h" >&5
- echo "${ECHO_T}$ac_cv_file__usr_include_caml_mlvalues_h" >&6
- if test $ac_cv_file__usr_include_caml_mlvalues_h = yes; then
-- OCAML_INCLUDE_DIR=/usr/include
-+ OCAML_INCLUDE_DIR=/usr/include/caml
- else
-- OCAML_INCLUDE_DIR=$OCAML_LIB_DIR
-+ OCAML_INCLUDE_DIR=$OCAML_LIB_DIR/caml
-
- fi
-
diff --git a/pkgs/development/ocaml-modules/ocamlnet/default.nix b/pkgs/development/ocaml-modules/ocamlnet/default.nix
index e4dc43743f3..4d9e934b628 100644
--- a/pkgs/development/ocaml-modules/ocamlnet/default.nix
+++ b/pkgs/development/ocaml-modules/ocamlnet/default.nix
@@ -2,15 +2,14 @@
let
ocaml_version = (builtins.parseDrvName ocaml.name).version;
- version = "3.1";
in
stdenv.mkDerivation {
- name = "ocamlnet-${version}";
+ name = "ocamlnet-3.6";
src = fetchurl {
- url = "http://download.camlcity.org/download/ocamlnet-${version}.tar.gz";
- sha256 = "0kdc2540ad84j6haj9jxlwryz9cb8q8kjdr48f2wgvcaii38v9f5";
+ url = http://download.camlcity.org/download/ocamlnet-3.6.tar.gz;
+ sha256 = "306c20aee6512be3564c0f39872b70f929c06e1e893cfcf528ac47ae35cf7a69";
};
buildInputs = [ncurses ocaml findlib ocaml_pcre camlzip openssl ocaml_ssl];
diff --git a/pkgs/development/ocaml-modules/ounit/default.nix b/pkgs/development/ocaml-modules/ounit/default.nix
index 8f21ba649bf..533f1ec8d1c 100644
--- a/pkgs/development/ocaml-modules/ounit/default.nix
+++ b/pkgs/development/ocaml-modules/ounit/default.nix
@@ -5,11 +5,11 @@ let
in
stdenv.mkDerivation {
- name = "ounit-1.1.0";
+ name = "ounit-1.1.2";
src = fetchurl {
- url = http://forge.ocamlcore.org/frs/download.php/495/ounit-1.1.0.tar.gz;
- sha256 = "12vybg9xlw5c8ip23p8cljfzhkdsm25482sf1yh46fcqq8p2jmqx";
+ url = http://forge.ocamlcore.org/frs/download.php/886/ounit-1.1.2.tar.gz;
+ sha256 = "e6bc1b0cdbb5b5552d85bee653e23aafe20bb97fd7cd229c867d01ff999888e3";
};
buildInputs = [ocaml findlib];
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
meta = {
homepage = http://www.xs4all.nl/~mmzeeman/ocaml/;
description = "Unit test framework for OCaml";
- license = "MIT/X11";
+ license = stdenv.lib.licenses.mit;
platforms = ocaml.meta.platforms;
maintainers = [
stdenv.lib.maintainers.z77z
diff --git a/pkgs/development/perl-modules/Compress-Raw-Bzip2/default.nix b/pkgs/development/perl-modules/Compress-Raw-Bzip2/default.nix
deleted file mode 100644
index 6515efada6f..00000000000
--- a/pkgs/development/perl-modules/Compress-Raw-Bzip2/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ fetchurl, buildPerlPackage, bzip2 }:
-
-buildPerlPackage rec {
- name = "Compress-Raw-Bzip2-2.049";
-
- src = fetchurl {
- url = "mirror://cpan/modules/by-module/Compress/${name}.tar.gz";
- sha256 = "7881473e0ab5ecc6ce609382e4f7466fb32217e928eef27e7084702bb07ac172";
- };
-
- # Don't build a private copy of bzip2.
- BUILD_BZIP2 = false;
- BZIP2_LIB = "${bzip2}/lib";
- BZIP2_INCLUDE = "${bzip2}/include";
-}
diff --git a/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix b/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix
index c2c7b5f8363..70c2a294d6f 100644
--- a/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix
+++ b/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix
@@ -1,11 +1,11 @@
{ fetchurl, buildPerlPackage, zlib, stdenv }:
buildPerlPackage rec {
- name = "Compress-Raw-Zlib-2.051";
+ name = "Compress-Raw-Zlib-2.060";
src = fetchurl {
url = "mirror://cpan/modules/by-module/Compress/${name}.tar.gz";
- sha256 = "16c7e0d2ed339c0b5ffe787bbcc9fc063ce6f2145d8cd6a18d0c79fa68d36c09";
+ sha256 = "03z2vqcdpysanqnh9m714fs2mcfshzbkd8i11w359h69h5q0kms3";
};
preConfigure = ''
@@ -19,4 +19,8 @@ buildPerlPackage rec {
'';
doCheck = !stdenv.isDarwin;
+
+ meta = {
+ license = "perl5";
+ };
}
diff --git a/pkgs/development/perl-modules/DBD-Pg/default.nix b/pkgs/development/perl-modules/DBD-Pg/default.nix
index 0d0cb1accc5..be5faa330ae 100644
--- a/pkgs/development/perl-modules/DBD-Pg/default.nix
+++ b/pkgs/development/perl-modules/DBD-Pg/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, buildPerlPackage, DBI, postgresql }:
buildPerlPackage rec {
- name = "DBD-Pg-2.19.2";
+ name = "DBD-Pg-2.19.3";
src = fetchurl {
url = "mirror://cpan/modules/by-module/DBD/${name}.tar.gz";
- sha256 = "0scnhbp0lfclbppbsfzmcyw32z8jhb9calvbg9q3gk4kli1119j9";
+ sha256 = "0ai6p2094hrh6kjlwfjvpw2z8wqa3scr4ba3p6rqza3z9c9hsd9p";
};
buildInputs = [ postgresql ];
@@ -13,5 +13,10 @@ buildPerlPackage rec {
makeMakerFlags = "POSTGRES_HOME=${postgresql}";
- meta.platforms = stdenv.lib.platforms.linux;
+ meta = {
+ homepage = http://search.cpan.org/dist/DBD-Pg/;
+ description = "DBI PostgreSQL interface";
+ license = "perl";
+ platforms = stdenv.lib.platforms.linux;
+ };
}
diff --git a/pkgs/development/perl-modules/DBD-SQLite/default.nix b/pkgs/development/perl-modules/DBD-SQLite/default.nix
index bbe50182b90..5afa889f543 100644
--- a/pkgs/development/perl-modules/DBD-SQLite/default.nix
+++ b/pkgs/development/perl-modules/DBD-SQLite/default.nix
@@ -17,6 +17,11 @@ buildPerlPackage rec {
./external-sqlite.patch
];
+ preBuild =
+ ''
+ substituteInPlace Makefile --replace -L/usr/lib ""
+ '';
+
postInstall =
''
# Prevent warnings from `strip'.
diff --git a/pkgs/development/perl-modules/Google-ProtocolBuffers-multiline-comments.patch b/pkgs/development/perl-modules/Google-ProtocolBuffers-multiline-comments.patch
new file mode 100644
index 00000000000..6b634d0d242
--- /dev/null
+++ b/pkgs/development/perl-modules/Google-ProtocolBuffers-multiline-comments.patch
@@ -0,0 +1,12 @@
+diff -Naur Google-ProtocolBuffers-0.08-orig/lib/Google/ProtocolBuffers/Compiler.pm Google-ProtocolBuffers-0.08/lib/Google/ProtocolBuffers/Compiler.pm
+--- Google-ProtocolBuffers-0.08-orig/lib/Google/ProtocolBuffers/Compiler.pm 2008-10-23 13:46:01.000000000 -0400
++++ Google-ProtocolBuffers-0.08/lib/Google/ProtocolBuffers/Compiler.pm 2013-01-16 13:52:09.855063997 -0500
+@@ -16,7 +16,7 @@
+
+ my $grammar = <<'END_OF_GRAMMAR';
+
+-proto :
++proto :
+ ## list of top level declarations.
+ ## Skip empty declarations and ";".
+ (message | extend | enum | import | package | option | service | syntax | ";")(s) /\Z/
diff --git a/pkgs/development/perl-modules/generic/builder.sh b/pkgs/development/perl-modules/generic/builder.sh
index df2fe853b4a..7c51bf1b591 100644
--- a/pkgs/development/perl-modules/generic/builder.sh
+++ b/pkgs/development/perl-modules/generic/builder.sh
@@ -33,8 +33,8 @@ postFixup() {
# dependencies in the user environment (since Perl modules don't
# have something like an RPATH, so the only way to find the
# dependencies is to have them in the PERL5LIB variable).
- if test -e $out/nix-support/propagated-build-native-inputs; then
- ln -s $out/nix-support/propagated-build-native-inputs $out/nix-support/propagated-user-env-packages
+ if test -e $out/nix-support/propagated-native-build-inputs; then
+ ln -s $out/nix-support/propagated-native-build-inputs $out/nix-support/propagated-user-env-packages
fi
}
diff --git a/pkgs/development/perl-modules/starman-dont-change-name.patch b/pkgs/development/perl-modules/starman-dont-change-name.patch
deleted file mode 100644
index 82454cfdd16..00000000000
--- a/pkgs/development/perl-modules/starman-dont-change-name.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Changing the process name breaks applying libcgroup rules, so don't do it.
-
-diff -ru -x '*~' Starman-0.2014-orig/lib/Starman/Server.pm Starman-0.2014/lib/Starman/Server.pm
---- Starman-0.2014-orig/lib/Starman/Server.pm 2011-08-27 01:19:43.000000000 +0200
-+++ Starman-0.2014/lib/Starman/Server.pm 2011-11-25 13:30:24.570434653 +0100
-@@ -100,7 +100,7 @@
-
- sub run_parent {
- my $self = shift;
-- $0 = "starman master " . join(" ", @{$self->{options}{argv} || []});
-+ #$0 = "starman master " . join(" ", @{$self->{options}{argv} || []});
- $self->SUPER::run_parent(@_);
- }
-
-@@ -113,7 +113,7 @@
- DEBUG && warn "[$$] Initializing the PSGI app\n";
- $self->{app} = $self->{options}->{psgi_app_builder}->();
- }
-- $0 = "starman worker " . join(" ", @{$self->{options}{argv} || []});
-+ #$0 = "starman worker " . join(" ", @{$self->{options}{argv} || []});
- }
-
- sub post_accept_hook {
diff --git a/pkgs/development/perl-modules/template-toolkit-nix-store.patch b/pkgs/development/perl-modules/template-toolkit-nix-store.patch
deleted file mode 100644
index 402f1cb41be..00000000000
--- a/pkgs/development/perl-modules/template-toolkit-nix-store.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -rc Template-Toolkit-2.20-orig/lib/Template/Provider.pm Template-Toolkit-2.20/lib/Template/Provider.pm
-*** Template-Toolkit-2.20-orig/lib/Template/Provider.pm 2008-08-06 11:32:02.000000000 +0200
---- Template-Toolkit-2.20/lib/Template/Provider.pm 2008-11-28 16:37:36.000000000 +0100
-***************
-*** 936,942 ****
- sub _template_modified {
- my $self = shift;
- my $template = shift || return;
-! return (stat( $template ))[9];
- }
-
- #------------------------------------------------------------------------
---- 936,945 ----
- sub _template_modified {
- my $self = shift;
- my $template = shift || return;
-! # Nix specific hack: timestamps of 0 (1-1-1970) should not be
-! # treated as undefined, so return 1 instead.
-! my $t = (stat( $template ))[9];
-! return (defined $t && $t == 0) ? 1 : $t;
- }
-
- #------------------------------------------------------------------------
diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix
index 4e0b6100231..f72fbff1806 100644
--- a/pkgs/development/python-modules/generic/default.nix
+++ b/pkgs/development/python-modules/generic/default.nix
@@ -3,12 +3,14 @@
(http://pypi.python.org/pypi/setuptools/), which represents a large
number of Python packages nowadays. */
-{ python, setuptools, wrapPython, lib }:
+{ python, setuptools, wrapPython, lib, offlineDistutils, recursivePthLoader }:
{ name, namePrefix ? "python-"
, buildInputs ? []
+, propagatedBuildInputs ? []
+
, # List of packages that should be added to the PYTHONPATH
# environment variable in programs built by this function. Packages
# in the standard `propagatedBuildInputs' variable are also added.
@@ -19,9 +21,11 @@
, installCommand ?
''
- easy_install --prefix="$out" .
+ easy_install --always-unzip --prefix="$out" .
''
-
+
+, preConfigure ? "true"
+
, buildPhase ? "true"
, doCheck ? true
@@ -33,8 +37,11 @@
runHook postCheck
''
+, preInstall ? ""
, postInstall ? ""
+, meta ? {}
+
, ... } @ attrs:
# Keep extra attributes from ATTR, e.g., `patchPhase', etc.
@@ -43,26 +50,56 @@ python.stdenv.mkDerivation (attrs // {
name = namePrefix + name;
+ # default to python's platforms and add maintainer(s) to every
+ # package
+ meta = {
+ platforms = python.meta.platforms;
+ } // meta // {
+ maintainers = (meta.maintainers or []) ++ [ lib.maintainers.chaoflow ];
+ };
+
+ # checkPhase after installPhase to run tests on installed packages
+ phases = "unpackPhase patchPhase configurePhase buildPhase installPhase checkPhase fixupPhase distPhase";
+
buildInputs = [ python wrapPython setuptools ] ++ buildInputs ++ pythonPath;
- pythonPath = [ setuptools] ++ pythonPath;
+ propagatedBuildInputs = propagatedBuildInputs ++ [ recursivePthLoader ];
- # XXX: Should we run `easy_install --always-unzip'? It doesn't seem
- # to have a noticeable impact on small scripts.
- installPhase = ''
+ pythonPath = [ setuptools ] ++ pythonPath;
+
+ preConfigure = ''
+ PYTHONPATH="${offlineDistutils}/lib/${python.libPrefix}/site-packages:$PYTHONPATH"
+ ${preConfigure}
+ '';
+
+ installPhase = preInstall + ''
mkdir -p "$out/lib/${python.libPrefix}/site-packages"
echo "installing \`${name}' with \`easy_install'..."
export PYTHONPATH="$out/lib/${python.libPrefix}/site-packages:$PYTHONPATH"
${installCommand}
+ # A pth file might have been generated to load the package from
+ # within its own site-packages, rename this package not to
+ # collide with others.
+ eapth="$out/lib/${python.libPrefix}"/site-packages/easy-install.pth
+ if [ -e "$eapth" ]; then
+ # move colliding easy_install.pth to specifically named one
+ mv "$eapth" $(dirname "$eapth")/${name}.pth
+ fi
+
+ # Remove any site.py files generated by easy_install as these
+ # cause collisions. If pth files are to be processed a
+ # corresponding site.py needs to be included in the PYTHONPATH.
+ rm -f "$out/lib/${python.libPrefix}"/site-packages/site.py*
+
${postInstall}
'';
postFixup =
''
wrapPythonPrograms
-
+
# If a user installs a Python package, she probably also wants its
# dependencies in the user environment (since Python modules don't
# have something like an RPATH, so the only way to find the
@@ -70,5 +107,12 @@ python.stdenv.mkDerivation (attrs // {
if test -e $out/nix-support/propagated-build-inputs; then
ln -s $out/nix-support/propagated-build-inputs $out/nix-support/propagated-user-env-packages
fi
+
+ createBuildInputsPth build-inputs "$buildInputStrings"
+ for inputsfile in propagated-build-inputs propagated-native-build-inputs; do
+ if test -e $out/nix-support/$inputsfile; then
+ createBuildInputsPth $inputsfile "$(cat $out/nix-support/$inputsfile)"
+ fi
+ done
'';
})
diff --git a/pkgs/development/python-modules/generic/wrap.sh b/pkgs/development/python-modules/generic/wrap.sh
index 65f3229ca7c..6b02369927b 100644
--- a/pkgs/development/python-modules/generic/wrap.sh
+++ b/pkgs/development/python-modules/generic/wrap.sh
@@ -37,7 +37,7 @@ _addToPythonPath() {
pythonPathsSeen[$dir]=1
addToSearchPath program_PYTHONPATH $dir/lib/@libPrefix@/site-packages
addToSearchPath program_PATH $dir/bin
- local prop="$dir/nix-support/propagated-build-native-inputs"
+ local prop="$dir/nix-support/propagated-native-build-inputs"
if [ -e $prop ]; then
local i
for i in $(cat $prop); do
@@ -45,3 +45,19 @@ _addToPythonPath() {
done
fi
}
+
+createBuildInputsPth() {
+ local category="$1"
+ local inputs="$2"
+ if [ foo"$inputs" != foo ]; then
+ for x in $inputs; do
+ if $(echo -n $x |grep -q python-recursive-pth-loader); then
+ continue
+ fi
+ if test -d "$x"/lib/@libPrefix@/site-packages; then
+ echo $x/lib/@libPrefix@/site-packages \
+ >> "$out"/lib/@libPrefix@/site-packages/${name}-nix-python-$category.pth
+ fi
+ done
+ fi
+}
diff --git a/pkgs/development/python-modules/offline-distutils/default.nix b/pkgs/development/python-modules/offline-distutils/default.nix
new file mode 100644
index 00000000000..269f67bf5cd
--- /dev/null
+++ b/pkgs/development/python-modules/offline-distutils/default.nix
@@ -0,0 +1,21 @@
+# Used during module installation to prevent easy_install and python
+# setup.py install/test from downloading
+
+{ stdenv, python }:
+
+stdenv.mkDerivation {
+ name = "python-offline-distutils-${python.version}";
+
+ buildInputs = [ python ];
+
+ unpackPhase = "true";
+ installPhase = ''
+ dst="$out/lib/${python.libPrefix}/site-packages"
+ ensureDir $dst/distutils
+ ln -s ${python}/lib/${python.libPrefix}/distutils/* $dst/distutils/
+ cat < $dst/distutils/distutils.cfg
+[easy_install]
+allow-hosts = None
+EOF
+ '';
+}
diff --git a/pkgs/development/python-modules/pil/default.nix b/pkgs/development/python-modules/pil/default.nix
index 4cf4576c0ce..1dfdfee08fb 100644
--- a/pkgs/development/python-modules/pil/default.nix
+++ b/pkgs/development/python-modules/pil/default.nix
@@ -1,9 +1,9 @@
-{ fetchurl, stdenv, python, libjpeg, zlib, freetype }:
+{ fetchurl, stdenv, python, buildPythonPackage, libjpeg, zlib, freetype }:
let version = "1.1.7"; in
-stdenv.mkDerivation {
- name = "python-imaging-${version}";
+buildPythonPackage {
+ name = "imaging-${version}";
src = fetchurl {
url = "http://effbot.org/downloads/Imaging-${version}.tar.gz";
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
buildPhase = "python setup.py build_ext -i";
checkPhase = "python selftest.py";
- installPhase = "python setup.py install --prefix=$out";
+ #installPhase = "python setup.py install --prefix=$out";
meta = {
homepage = http://www.pythonware.com/products/pil/;
diff --git a/pkgs/development/python-modules/pycairo/default.nix b/pkgs/development/python-modules/pycairo/default.nix
index 8aebf1d7829..1e8ceed6878 100644
--- a/pkgs/development/python-modules/pycairo/default.nix
+++ b/pkgs/development/python-modules/pycairo/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, python, pkgconfig, cairo, x11}:
+{ stdenv, fetchurl, python, pkgconfig, cairo, x11 }:
stdenv.mkDerivation {
name = "pycairo-1.8.8";
@@ -7,5 +7,5 @@ stdenv.mkDerivation {
sha256 = "0q18hd4ai4raljlvd76ylgi30kxpr2qq83ka6gzwh0ya8fcmjlig";
};
- buildInputs = [python pkgconfig cairo x11];
+ buildInputs = [ python pkgconfig cairo x11 ];
}
diff --git a/pkgs/development/python-modules/pycrypto/default.nix b/pkgs/development/python-modules/pycrypto/default.nix
index 9c756c9ed64..0ad1663da65 100644
--- a/pkgs/development/python-modules/pycrypto/default.nix
+++ b/pkgs/development/python-modules/pycrypto/default.nix
@@ -1,7 +1,8 @@
-{ stdenv, fetchurl, python, gmp }:
+{ stdenv, fetchurl, python, buildPythonPackage, gmp }:
-stdenv.mkDerivation rec {
+buildPythonPackage rec {
name = "pycrypto-2.6";
+ namePrefix = "";
src = fetchurl {
url = "http://pypi.python.org/packages/source/p/pycrypto/${name}.tar.gz";
@@ -10,14 +11,16 @@ stdenv.mkDerivation rec {
buildInputs = [ python gmp ];
- buildPhase = "true";
-
- installPhase =
+ buildPhase =
''
python ./setup.py build_ext --library-dirs=${gmp}/lib
- python ./setup.py install --prefix=$out
'';
+# installPhase =
+# ''
+# python ./setup.py install --prefix=$out
+# '';
+
meta = {
homepage = "http://www.pycrypto.org/";
description = "Python Cryptography Toolkit";
diff --git a/pkgs/development/python-modules/pygobject/default.nix b/pkgs/development/python-modules/pygobject/default.nix
index 4ef851f5b3e..5575243bd9f 100644
--- a/pkgs/development/python-modules/pygobject/default.nix
+++ b/pkgs/development/python-modules/pygobject/default.nix
@@ -12,16 +12,12 @@ stdenv.mkDerivation rec {
buildInputs = [ python pkgconfig glib ];
+ # in a "normal" setup, pygobject and pygtk are installed into the
+ # same site-packages: we need a pth file for both. pygtk.py would be
+ # used to select a specific version, in our setup it should have no
+ # effect, but we leave it in case somebody expects and calls it.
postInstall = ''
- # All python code is installed into a "gtk-2.0" sub-directory. That
- # sub-directory may be useful on systems which share several library
- # versions in the same prefix, i.e. /usr/local, but on Nix that directory
- # is useless. Furthermore, its existence makes it very hard to guess a
- # proper $PYTHONPATH that allows "import gtk" to succeed.
- cd $(toPythonPath $out)/gtk-2.0
- for n in *; do
- ln -s "gtk-2.0/$n" "../$n"
- done
+ mv $out/lib/${python.libPrefix}/site-packages/{pygtk.pth,${name}.pth}
'';
meta = {
diff --git a/pkgs/development/python-modules/pygtk/default.nix b/pkgs/development/python-modules/pygtk/default.nix
index 81147fff17d..07d57591f1a 100644
--- a/pkgs/development/python-modules/pygtk/default.nix
+++ b/pkgs/development/python-modules/pygtk/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchurl, makeWrapper, python, pkgconfig, glib, gtk, pygobject, pycairo
-, libglade ? null }:
+{ stdenv, fetchurl, python, pkgconfig, glib, gtk, pygobject, pycairo
+, buildPythonPackage, libglade ? null }:
-stdenv.mkDerivation rec {
+buildPythonPackage rec {
name = "pygtk-2.22.0";
src = fetchurl {
@@ -10,26 +10,35 @@ stdenv.mkDerivation rec {
};
buildInputs =
- [ makeWrapper python pkgconfig glib gtk ]
+ [ pkgconfig glib gtk ]
++ stdenv.lib.optional (libglade != null) libglade;
propagatedBuildInputs = [ pygobject pycairo ];
+ installCommand = "make install";
+ checkPhase = stdenv.lib.optionalString (libglade == null)
+ ''
+ sed -i -e "s/glade = importModule('gtk.glade', buildDir)//" \
+ tests/common.py
+ sed -i -e "s/, glade$//" \
+ -e "s/.*testGlade.*//" \
+ -e "s/.*(glade.*//" \
+ tests/test_api.py
+ '' + ''
+ sed -i -e "s/sys.path.insert(0, os.path.join(buildDir, 'gtk'))//" \
+ -e "s/sys.path.insert(0, buildDir)//" \
+ tests/common.py
+ make check
+ '';
+ # XXX: TypeError: Unsupported type:
+ # The check phase was not executed in the previous
+ # non-buildPythonPackage setup - not sure why not.
+ doCheck = false;
+
postInstall = ''
rm $out/bin/pygtk-codegen-2.0
ln -s ${pygobject}/bin/pygobject-codegen-2.0 $out/bin/pygtk-codegen-2.0
-
- # All python code is installed into a "gtk-2.0" sub-directory. That
- # sub-directory may be useful on systems which share several library
- # versions in the same prefix, i.e. /usr/local, but on Nix that directory
- # is useless. Furthermore, its existence makes it very hard to guess a
- # proper $PYTHONPATH that allows "import gtk" to succeed.
- cd $(toPythonPath $out)/gtk-2.0
- for n in *; do
- ln -s "gtk-2.0/$n" "../$n"
- done
-
- wrapProgram $out/bin/pygtk-demo --prefix PYTHONPATH ":" \
- $(toPythonPath "${pygobject} ${pycairo} $out")
+ ln -s ${pygobject}/lib/${python.libPrefix}/site-packages/${pygobject.name}.pth \
+ $out/lib/${python.libPrefix}/site-packages/${name}.pth
'';
}
diff --git a/pkgs/development/python-modules/pyopenssl/default.nix b/pkgs/development/python-modules/pyopenssl/default.nix
index 0e282cf71f3..1d4fe53117c 100644
--- a/pkgs/development/python-modules/pyopenssl/default.nix
+++ b/pkgs/development/python-modules/pyopenssl/default.nix
@@ -2,15 +2,15 @@ a :
let
fetchurl = a.fetchurl;
- version = a.lib.attrByPath ["version"] "0.10" a;
+ version = a.lib.attrByPath ["version"] "0.13" a;
propagatedBuildInputs = with a; [
openssl python
];
in
rec {
src = fetchurl {
- url = "http://pypi.python.org/packages/source/p/pyOpenSSL/pyOpenSSL-0.10.tar.gz";
- sha256 = "4514f8960389042ca2587f9cb801a13f7990387753fc678680b0c084719b5b60";
+ url = "http://pypi.python.org/packages/source/p/pyOpenSSL/pyOpenSSL-${version}.tar.gz";
+ sha256 = "21e12b03abaa0e04ecc8cd9c251598f71bae11c9f385304234e4ea5618c6163b";
};
inherit propagatedBuildInputs;
diff --git a/pkgs/development/python-modules/python-gudev/default.nix b/pkgs/development/python-modules/python-gudev/default.nix
deleted file mode 100644
index c9105555f9d..00000000000
--- a/pkgs/development/python-modules/python-gudev/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{stdenv, fetchgit, python, autoconf, automake, libtool, pygobject, pkgconfig, udev}:
-
-stdenv.mkDerivation {
- name = "python-gudev-147.2";
- src = fetchgit {
- url = git://github.com/nzjrs/python-gudev.git;
- rev = "refs/tags/147.2";
- sha256 = "5b9766fcb88855a77ac8bb416ca3b51f55ac7d82b0e189f88c59cacb11586c15";
- };
-
- buildInputs = [ python autoconf automake libtool pygobject pkgconfig udev ];
-
- preConfigure = ''
- sed -e 's@/usr/bin/file@file@g' -i configure.ac
- sh autogen.sh
- '';
-
- meta = {
- homepage = http://www.freedesktop.org/software/systemd/gudev/;
- description = "Python binding to the GUDev udev helper library.";
- license = "GPLv3+";
- maintainers = with stdenv.lib.maintainers; [qknight];
- platforms = with stdenv.lib.platforms; all;
- };
-}
diff --git a/pkgs/development/python-modules/python-sip/default.nix b/pkgs/development/python-modules/python-sip/default.nix
index 34daf294358..7c1eca02745 100644
--- a/pkgs/development/python-modules/python-sip/default.nix
+++ b/pkgs/development/python-modules/python-sip/default.nix
@@ -4,7 +4,10 @@ stdenv.mkDerivation rec {
name = "sip-4.13.2";
src = fetchurl {
- url = "http://www.riverbankcomputing.co.uk/static/Downloads/sip4/${name}.tar.gz";
+ urls = [
+ "http://www.riverbankcomputing.co.uk/static/Downloads/sip4/${name}.tar.gz"
+ "http://pkgs.fedoraproject.org/repo/pkgs/sip/${name}.tar.gz/5a12ea8e8a09b879ed2b3817e30fbc84/${name}.tar.gz"
+ ];
sha256 = "1gzff61bi22g6fkdg9iya4q2qfdkwxs19v4rhhf8x4bm7hszbhsb";
};
diff --git a/pkgs/development/python-modules/recursive-pth-loader/default.nix b/pkgs/development/python-modules/recursive-pth-loader/default.nix
new file mode 100644
index 00000000000..959882be938
--- /dev/null
+++ b/pkgs/development/python-modules/recursive-pth-loader/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, python }:
+
+stdenv.mkDerivation rec {
+ name = "python-recursive-pth-loader-1.0";
+
+ unpackPhase = "true";
+
+ buildInputs = [ python ];
+
+ installPhase =
+ ''
+ dst=$out/lib/${python.libPrefix}/site-packages
+ mkdir -p $dst
+ cat ${./sitecustomize.py} >> $dst/sitecustomize.py
+ '';
+
+ meta = {
+ description = "Enable recursive processing of pth files anywhere in sys.path";
+ };
+}
diff --git a/pkgs/development/python-modules/recursive-pth-loader/sitecustomize.py b/pkgs/development/python-modules/recursive-pth-loader/sitecustomize.py
new file mode 100644
index 00000000000..057e779803c
--- /dev/null
+++ b/pkgs/development/python-modules/recursive-pth-loader/sitecustomize.py
@@ -0,0 +1,46 @@
+"""Recursively load pth files in site-packages of sys.path
+
+- iterate over sys.path
+- check for pth in dirs that end in site-packages
+- ignore import statements in pth files
+- add dirs listed in pth files right after current sys.path element,
+ they will be processed in next iteration
+"""
+
+import os
+import site
+import sys
+
+
+for path_idx, sitedir in enumerate(sys.path):
+ # ignore non-site-packages
+ if not sitedir.endswith('site-packages'):
+ continue
+
+ # find pth files
+ try:
+ names = os.listdir(sitedir)
+ except os.error:
+ continue
+ dotpth = os.extsep + "pth"
+ pths = [name for name in names if name.endswith(dotpth)]
+
+ for pth in pths:
+ fullname = os.path.join(sitedir, pth)
+ try:
+ f = open(fullname, "rU")
+ except IOError:
+ continue
+
+ with f:
+ for n, line in enumerate(f):
+ if line.startswith("#"):
+ continue
+
+ if line.startswith(("import ", "import\t")):
+ continue
+
+ line = line.rstrip()
+ dir, dircase = site.makepath(sitedir, line)
+ if not dircase in sys.path:
+ sys.path.insert(path_idx+1, dir)
diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix
index 50b73aaf8f6..468ea50c924 100644
--- a/pkgs/development/python-modules/setuptools/default.nix
+++ b/pkgs/development/python-modules/setuptools/default.nix
@@ -1,7 +1,9 @@
{ stdenv, fetchurl, python, wrapPython }:
stdenv.mkDerivation rec {
- name = "setuptools-0.6c11";
+ name = "python-setuptools-" + version;
+
+ version = "0.6c11";
src = fetchurl {
url = "http://pypi.python.org/packages/source/s/setuptools/${name}.tar.gz";
diff --git a/pkgs/development/python-modules/setuptools/site.nix b/pkgs/development/python-modules/setuptools/site.nix
new file mode 100644
index 00000000000..34e7b478595
--- /dev/null
+++ b/pkgs/development/python-modules/setuptools/site.nix
@@ -0,0 +1,16 @@
+# Propagated by buildPythonPackge to process pth files
+
+{ stdenv, python, setuptools }:
+
+stdenv.mkDerivation {
+ name = "python-setuptools-site-${setuptools.version}";
+
+ buildInputs = [ python setuptools ];
+
+ unpackPhase = "true";
+ installPhase = ''
+ dst="$out/lib/${python.libPrefix}/site-packages"
+ ensureDir $dst
+ ln -s ${setuptools}/lib/${python.libPrefix}/site-packages/site.* $dst/
+ '';
+}
diff --git a/pkgs/development/python-modules/virtualenv-change-prefix.patch b/pkgs/development/python-modules/virtualenv-change-prefix.patch
index 5093fdbead9..d3e588bd1cd 100644
--- a/pkgs/development/python-modules/virtualenv-change-prefix.patch
+++ b/pkgs/development/python-modules/virtualenv-change-prefix.patch
@@ -1,29 +1,32 @@
Without this patch `virtualenv --python=python2.7 .` fails with an error because it notices that the python readline.so is not in the same path as python2.7. I assume this is to avoid copying the wrong file on systems where it is possible to find incompatible libraries by accident. Adding "/nix/store" to the prefix fixes this problem. Unfortunately readline is still not available if you just run `virtualenv .`.
-
---- virtualenv-1.6.4/virtualenv.py 2012-05-20 00:40:38.070649647 +0200
-+++ virtualenv-1.6.4/virtualenv.py 2012-05-20 00:45:10.596242604 +0200
-@@ -951,13 +951,7 @@
+--- virtualenv-1.8.4/virtualenv.py 2013-01-16 23:43:37.583615220 +0100
++++ virtualenv-1.8.4/virtualenv.py 2013-01-16 23:44:47.885973431 +0100
+@@ -1135,17 +1135,7 @@
def change_prefix(filename, dst_prefix):
- prefixes = [sys.prefix]
-
-- if sys.platform == "darwin":
+- if is_darwin:
- prefixes.extend((
- os.path.join("/Library/Python", sys.version[:3], "site-packages"),
- os.path.join(sys.prefix, "Extras", "lib", "python"),
-- os.path.join("~", "Library", "Python", sys.version[:3], "site-packages")))
+- os.path.join("~", "Library", "Python", sys.version[:3], "site-packages"),
+- # Python 2.6 no-frameworks
+- os.path.join("~", ".local", "lib","python", sys.version[:3], "site-packages"),
+- # System Python 2.7 on OSX Mountain Lion
+- os.path.join("~", "Library", "Python", sys.version[:3], "lib", "python", "site-packages")))
+ prefixes = ["/nix/store", sys.prefix]
if hasattr(sys, 'real_prefix'):
prefixes.append(sys.real_prefix)
-@@ -968,6 +962,8 @@
- _, relpath = filename.split(src_prefix, 1)
- assert relpath[0] == os.sep
- relpath = relpath[1:]
-+ if src_prefix == "/nix/store":
-+ relpath = "/".join(relpath.split("/")[1:])
+@@ -1162,6 +1152,8 @@
+ if src_prefix != os.sep: # sys.prefix == "/"
+ assert relpath[0] == os.sep
+ relpath = relpath[1:]
++ if src_prefix == "/nix/store":
++ relpath = "/".join(relpath.split("/")[1:])
return join(dst_prefix, relpath)
assert False, "Filename %s does not start with any of these prefixes: %s" % \
(filename, prefixes)
diff --git a/pkgs/development/python-modules/zope/default.nix b/pkgs/development/python-modules/zope/default.nix
deleted file mode 100644
index c01945bf472..00000000000
--- a/pkgs/development/python-modules/zope/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{stdenv, fetchurl, python}:
-
-stdenv.mkDerivation rec {
- version = "3.4.0";
- name = "zope-${version}";
- src = fetchurl {
- url = "http://www.zope.org/Products/Zope3/${version}/Zope-${version}.tgz";
- sha256 = "3e834e8749945d8fc0a67bb724f2cf0c671f04f477e24fb8edb74828e331901d";
- };
- patches = [
- ./zope_python-2.4.4.patch
- ./zope_python-readline.patch
- ];
- buildInputs = [python];
-}
diff --git a/pkgs/development/python-modules/zope/zope_python-2.4.4.patch b/pkgs/development/python-modules/zope/zope_python-2.4.4.patch
deleted file mode 100644
index 22360412964..00000000000
--- a/pkgs/development/python-modules/zope/zope_python-2.4.4.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -r 8833d4892dfc Zope-3.2.1/configure
---- a/configure Mon Aug 18 14:55:39 2008 +0200
-+++ b/configure Mon Aug 18 14:57:39 2008 +0200
-@@ -21,7 +21,7 @@ prefix="$DEFAULT_PREFIX"
-
- # Place the optimal target version number (as returned by sys.version)
- # below
--TARGET="2.4.2"
-+TARGET="2.4.4"
-
- # Order a list of "acceptable" python version numbers (as returned by
- # sys.version) below in "best" to "worst" order, not including the
diff --git a/pkgs/development/python-modules/zope/zope_python-readline.patch b/pkgs/development/python-modules/zope/zope_python-readline.patch
deleted file mode 100644
index 4775cfba49b..00000000000
--- a/pkgs/development/python-modules/zope/zope_python-readline.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -r 8833d4892dfc Zope-3.2.1/Dependencies/zope.publisher-Zope-3.2.1/zope.publisher/http.py
---- a/Dependencies/zope.publisher-Zope-3.2.1/zope.publisher/http.py Mon Aug 18 14:55:39 2008 +0200
-+++ b/Dependencies/zope.publisher-Zope-3.2.1/zope.publisher/http.py Mon Aug 18 16:37:02 2008 +0200
-@@ -198,7 +198,7 @@ class HTTPInputStream(object):
- self.cacheStream.write(data)
- return data
-
-- def readline(self):
-+ def readline(self, size=None):
- data = self.stream.readline()
- self.cacheStream.write(data)
- return data
diff --git a/pkgs/development/qtcreator/default.nix b/pkgs/development/qtcreator/default.nix
new file mode 100644
index 00000000000..60ff5ede75a
--- /dev/null
+++ b/pkgs/development/qtcreator/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, fetchurl, qt4_for_qtcreator }:
+
+let
+ version = "2.6.0";
+in
+
+stdenv.mkDerivation rec {
+ name = "qtcreator-${version}";
+
+ src = fetchurl {
+ url = "http://origin.releases.qt-project.org/qtcreator/${version}/qt-creator-${version}-src.tar.gz";
+ md5 = "9bf01098f84a0fe930b2718d11124204";
+ };
+
+ buildInputs = [ qt4_for_qtcreator ];
+
+ doCheck = false;
+
+ enableParallelBuilding = true;
+
+ preConfigure = ''
+ qmake -spec linux-g++ "QT_PRIVATE_HEADERS=${qt4_for_qtcreator}/include" qtcreator.pro
+ '';
+
+ installFlags = "INSTALL_ROOT=$(out)";
+
+ meta = {
+ description = "Qt Creator is a cross-platform IDE tailored to the needs of Qt developers.";
+ longDescription = ''
+ Qt Creator is a cross-platform IDE (integrated development environment) tailored to the needs of Qt developers.
+ It includes features such as an advanced code editor, a visual debugger and a GUI designer.
+ '';
+ homepage = "http://qt-project.org/wiki/Category:Tools::QtCreator";
+ license = "LGPL";
+
+ maintainers = [ stdenv.lib.maintainers.bbenoist ];
+ platforms = stdenv.lib.platforms.all;
+ };
+}
diff --git a/pkgs/development/tools/analysis/radare/lua.patch b/pkgs/development/tools/analysis/radare/lua.patch
deleted file mode 100644
index 3a2ca0d505d..00000000000
--- a/pkgs/development/tools/analysis/radare/lua.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/plug/hack/Makefile b/src/plug/hack/Makefile
-index b05d8dd..d6c73f9 100644
---- a/src/plug/hack/Makefile
-+++ b/src/plug/hack/Makefile
-@@ -7,7 +7,6 @@ PERL_LIBS=`perl -MExtUtils::Embed -e ldopts` -lncurses
- PY_CFLAGS=-I${PREFIX}/include/python2.5/ -I/usr/include/python2.5/
- PY_LIBS=-lpython2.5
- LUA_CFLAGS=-I${PREFIX}/include/lua5.1/ -I/usr/include/lua5.1/
--LUA_LIBS=
- RUBY_CFLAGS=-I/usr/lib/ruby/1.8/i386-linux
- RUBY_LIBS=-lruby18
- SO=${SHARED_EXT}
diff --git a/pkgs/development/tools/analysis/smatch/default.nix b/pkgs/development/tools/analysis/smatch/default.nix
new file mode 100644
index 00000000000..1d1bf7a818a
--- /dev/null
+++ b/pkgs/development/tools/analysis/smatch/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchgit, sqlite, pkgconfig, perl
+, buildllvmsparse ? true
+, buildc2xml ? true
+, llvm ? null, libxml2 ? null
+}:
+
+assert buildllvmsparse -> llvm != null;
+assert buildc2xml -> libxml2 != null;
+
+stdenv.mkDerivation {
+ name = "smatch";
+
+ src = fetchgit {
+ url = git://repo.or.cz/smatch.git;
+ rev = "23656e3e578b700cbf96d043f039e6341a3ba5b9";
+ sha256 = "09a44967d4cff026c67062f778e251d0b432af132e9d59a47b7d3167f379adfa";
+ };
+
+ buildInputs = [sqlite pkgconfig perl]
+ ++ stdenv.lib.optional buildllvmsparse llvm
+ ++ stdenv.lib.optional buildc2xml libxml2;
+
+ preBuild =
+ '' sed -i Makefile \
+ -e "s|^PREFIX=.*|PREFIX = $out|g"
+ '';
+
+ meta = {
+ description = "A semantic analysis tool for C";
+ homepage = "http://smatch.sourceforge.net/";
+ license = "free"; /* OSL, see http://www.opensource.org */
+ };
+}
diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix
index a625de6ffdc..e4f04623ebb 100644
--- a/pkgs/development/tools/analysis/valgrind/default.nix
+++ b/pkgs/development/tools/analysis/valgrind/default.nix
@@ -1,16 +1,18 @@
{ stdenv, fetchurl, perl, gdb }:
stdenv.mkDerivation (rec {
- name = "valgrind-3.7.0";
+ name = "valgrind-3.8.1";
src = fetchurl {
url = "http://valgrind.org/downloads/${name}.tar.bz2";
- sha256 = "1xnb4jiimscwriw3jd1lkk0m9x4glqpijj9jb4ngx08l1wrw0qjx";
+ sha256 = "1nsqk70ry3221sd62s4f0njcrncppszs4xxjcak13lxyfq2y0fs7";
};
+ patches = [ ./glibc-2.17.patch ];
+
# Perl is needed for `cg_annotate'.
# GDB is needed to provide a sane default for `--db-command'.
- buildNativeInputs = [ perl ];
+ nativeBuildInputs = [ perl ];
buildInputs = stdenv.lib.optional (!stdenv.isDarwin) gdb;
configureFlags =
diff --git a/pkgs/development/tools/analysis/valgrind/glibc-2.17.patch b/pkgs/development/tools/analysis/valgrind/glibc-2.17.patch
new file mode 100644
index 00000000000..bee1abe71f1
--- /dev/null
+++ b/pkgs/development/tools/analysis/valgrind/glibc-2.17.patch
@@ -0,0 +1,78 @@
+commit 3781ac11ff374b3517011c1710ec517d52f25cd2
+Author: tom
+Date: Mon Jan 14 09:48:49 2013 +0000
+
+ Accept glibc 2.17 as valid.
+
+
+ git-svn-id: svn://svn.valgrind.org/valgrind/trunk@13228 a5019735-40e9-0310-863c-91ae7b9d1cf9
+
+diff --git a/configure.in b/configure.in
+index e0fb12d..0f3b3df 100644
+--- a/configure.in
++++ b/configure.in
+@@ -906,6 +906,13 @@ case "${GLIBC_VERSION}" in
+ DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
+ DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
+ ;;
++ 2.17)
++ AC_MSG_RESULT(2.17 family)
++ AC_DEFINE([GLIBC_2_17], 1, [Define to 1 if you're using glibc 2.17.x])
++ DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
++ DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
++ DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
++ ;;
+ darwin)
+ AC_MSG_RESULT(Darwin)
+ AC_DEFINE([DARWIN_LIBC], 1, [Define to 1 if you're using Darwin])
+@@ -919,7 +926,7 @@ case "${GLIBC_VERSION}" in
+
+ *)
+ AC_MSG_RESULT([unsupported version ${GLIBC_VERSION}])
+- AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.16])
++ AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.17])
+ AC_MSG_ERROR([or Darwin libc])
+ ;;
+ esac
+diff -ur valgrind-3.8.1/config.h.in valgrind-3.8.1/config.h.in
+--- valgrind-3.8.1/config.h.in 2013-01-16 17:15:33.531018561 +0100
++++ valgrind-3.8.1/config.h.in 2013-01-16 17:19:21.000000000 +0100
+@@ -48,6 +48,9 @@
+ /* Define to 1 if you're using glibc 2.16.x */
+ #undef GLIBC_2_16
+
++/* Define to 1 if you're using glibc 2.17.x */
++#undef GLIBC_2_17
++
+ /* Define to 1 if you're using glibc 2.2.x */
+ #undef GLIBC_2_2
+
+diff -ur valgrind-3.8.1/configure valgrind-3.8.1/configure
+--- valgrind-3.8.1/configure 2013-01-16 17:15:33.563018480 +0100
++++ valgrind-3.8.1/configure 2013-01-16 17:19:21.373643238 +0100
+@@ -6610,6 +6610,16 @@
+ DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
+ DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
+ ;;
++ 2.17)
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.17 family" >&5
++$as_echo "2.17 family" >&6; }
++
++$as_echo "#define GLIBC_2_17 1" >>confdefs.h
++
++ DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
++ DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
++ DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
++ ;;
+ darwin)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Darwin" >&5
+ $as_echo "Darwin" >&6; }
+@@ -6630,7 +6640,7 @@
+ *)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported version ${GLIBC_VERSION}" >&5
+ $as_echo "unsupported version ${GLIBC_VERSION}" >&6; }
+- as_fn_error "Valgrind requires glibc version 2.2 - 2.16" "$LINENO" 5
++ as_fn_error "Valgrind requires glibc version 2.2 - 2.17" "$LINENO" 5
+ as_fn_error "or Darwin libc" "$LINENO" 5
+ ;;
+ esac
diff --git a/pkgs/development/tools/build-managers/apache-ant/core-apache-ant.nix b/pkgs/development/tools/build-managers/apache-ant/core-apache-ant.nix
deleted file mode 100644
index 668a6c4d6b5..00000000000
--- a/pkgs/development/tools/build-managers/apache-ant/core-apache-ant.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{stdenv, fetchurl}:
-
-stdenv.mkDerivation {
- name = "core-apache-ant-1.6.5";
- realname = "apache-ant-1.6.5";
-
- builder = ./core-builder.sh;
- src = fetchurl {
- url = http://apache.surfnet.nl/ant/binaries/apache-ant-1.6.5-bin.tar.bz2;
- md5 = "26031ee1a2fd248ad0cc2e7f17c44c39";
- };
-}
diff --git a/pkgs/development/tools/build-managers/apache-ant/core-builder.sh b/pkgs/development/tools/build-managers/apache-ant/core-builder.sh
deleted file mode 100644
index fad5e047f94..00000000000
--- a/pkgs/development/tools/build-managers/apache-ant/core-builder.sh
+++ /dev/null
@@ -1,51 +0,0 @@
-source $stdenv/setup || exit 1
-
-# unpack the binary distribution
-tar jxf $src || exit 1
-mkdir -p $out
-mv apache-ant-*/* $out || exit 1
-
-# remove crap in the root directory
-
-for file in $out/*
-do
- if test -f $file ; then
- rm $file
- fi
-done
-rm -rf $out/docs
-
-# prevent the use of hacky scripts. This will be handled in Nix.
-rm $out/bin/* || exit 1
-
-# add core-ant script. This script is to be invoked with all
-# appropiate variables and will try to be clever or user-friendlt=y.
-
-cat >> $out/bin/core-ant <
-Date: Fri, 4 May 2012 10:56:38 +0700
-Subject: [PATCH] lein-pkg: require rlwrap unconditionally, unless run inside
- Emacs or a dumb terminal; chmod to 755 as this is an
- executable script
-
----
- bin/lein-pkg | 10 ++++++----
- 1 file changed, 6 insertions(+), 4 deletions(-)
- mode change 100644 => 100755 bin/lein-pkg
-
-diff --git a/bin/lein-pkg b/bin/lein-pkg
-old mode 100644
-new mode 100755
-index 8563da6..1b90ebe
---- lein-pkg.orig
-+++ lein-pkg
-@@ -3,6 +3,11 @@
- # This variant of the lein script is meant for downstream packagers.
- # It has all the cross-platform stuff stripped out as well as the
- # logic for running from checkouts and self-upgrading.
-+#
-+# Note to packagers:
-+# rlwrap is now required unless running inside Emacs or in a dumb
-+# terminal (this is to improve the 'lein repl' experience).
-+# Make sure that your packaging pulls in rlwrap as a dependency
-
- export LEIN_VERSION="1.7.1"
-
-@@ -103,10 +108,7 @@ fi
-
- # Use rlwrap if appropriate
- if ([ -z $INSIDE_EMACS ] && [ "$TERM" != "dumb" ]); then
-- which rlwrap > /dev/null
-- if [ $? -eq 0 ]; then
-- RLWRAP="rlwrap -r -m -q '\"'" # custom quote chars
-- fi
-+ RLWRAP="rlwrap -r -m -q '\"'" # custom quote chars
- RLWRAP_CLJ_WORDS_FILE=${RLWRAP_CLJ_WORDS_FILE:-"${HOME}/.clj_completions"}
- RLWRAP_CLJ_WORDS_OPTION=""
- if [ -r "${RLWRAP_CLJ_WORDS_FILE}" ]; then
---
-1.7.9.5
-
diff --git a/pkgs/development/tools/build-managers/leiningen/lein.patch b/pkgs/development/tools/build-managers/leiningen/lein.patch
deleted file mode 100644
index b62701e2519..00000000000
--- a/pkgs/development/tools/build-managers/leiningen/lein.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- lein-pkg 2012-05-04 11:02:41.524912828 +0700
-+++ lein-pkg-nix 2012-05-04 11:03:11.062543558 +0700
-@@ -76,30 +76,14 @@
- LEIN_PLUGIN_PATH="$(echo "$DEV_PLUGINS" | tr \\n :)"
- LEIN_USER_PLUGIN_PATH="$(echo "$(unique_user_plugins)" | tr \\n :)"
- CLASSPATH="$CLASSPATH:$LEIN_PLUGIN_PATH:$LEIN_USER_PLUGIN_PATH:test/:src/:resources/"
--CLOJURE_JAR="/usr/share/java/clojure-1.2.jar:/usr/share/java/asm3.jar:/usr/share/java/asm3-commons.jar"
-+CLOJURE_JAR="$(dirname $0)/../lib/*clojure-1.2.1.jar"
-
- # apply context specific CLASSPATH entries
- if [ -f .lein-classpath ]; then
- CLASSPATH="`cat .lein-classpath`:$CLASSPATH"
- fi
-
--SHARE_JARS="ant ant-launcher classworlds clojure-1.2 clojure-contrib \
--lucene-memory maven-ant-tasks maven-artifact maven-artifact-manager \
--maven-error-diagnostics maven-model maven-settings maven-project maven-profile \
--maven-repository-metadata plexus-container-default-alpha plexus-interpolation \
--plexus-utils wagon-file wagon-http-lightweight wagon-http-shared wagon-provider-api \
--xml-apis lucene-core lucene-highlighter clucy robert-hooke lancet \
--backport-util-concurrent" # NFI why that last one is necessary
--for JAR in $SHARE_JARS; do
-- CLASSPATH="$CLASSPATH":"/usr/share/java/$JAR.jar"
--done
--
--# Do not use installed leiningen jar during self-compilation
--if ! { [ "$1" = "compile" ] &&
-- grep -qsE 'defproject leiningen[[:space:]]+"[[:digit:].]+"' \
-- project.clj ;}; then
-- CLASSPATH="$CLASSPATH":/usr/share/java/leiningen-$LEIN_VERSION.jar
--fi
-+CLASSPATH="$CLASSPATH:$(dirname $0)/../lib/*"
-
- if [ $DEBUG ]; then
- echo $CLASSPATH
diff --git a/pkgs/development/tools/build-managers/leiningen/lein_2.0.0.patch b/pkgs/development/tools/build-managers/leiningen/lein_2.0.0.patch
new file mode 100644
index 00000000000..23f6b624776
--- /dev/null
+++ b/pkgs/development/tools/build-managers/leiningen/lein_2.0.0.patch
@@ -0,0 +1,4 @@
+46c47
+< LEIN_JAR=/usr/share/java/leiningen-$LEIN_VERSION-standalone.jar
+---
+> LEIN_JAR=$(find $(dirname $0)/../lib -name *-standalone.jar | head -n 1)
diff --git a/pkgs/development/tools/casperjs/default.nix b/pkgs/development/tools/casperjs/default.nix
new file mode 100644
index 00000000000..f140f0d7862
--- /dev/null
+++ b/pkgs/development/tools/casperjs/default.nix
@@ -0,0 +1,46 @@
+{ stdenv, fetchgit, python, phantomjs }:
+
+stdenv.mkDerivation rec {
+ name = "casperjs-1.0.0-RC5";
+
+ src = fetchgit {
+ url = "git://github.com/n1k0/casperjs.git";
+ rev = "refs/tags/1.0.0-RC5";
+ sha256 = "e7fd6b94b4b304416159196208dea7f6e8841a667df102eb378a698a92f0f2c7";
+ };
+
+ patchPhase = ''
+ substituteInPlace bin/casperjs --replace "/usr/bin/env python" "${python}/bin/python" \
+ --replace "'phantomjs'" "'${phantomjs}/bin/phantomjs'"
+ '';
+
+ installPhase = ''
+ mkdir -p $out/share/casperjs $out/bin
+ cp -a . $out/share/casperjs/.
+ ln -s $out/share/casperjs/bin/casperjs $out/bin
+ '';
+
+ meta = {
+ description = "Navigation scripting & testing utility for PhantomJS.";
+ longDescription = ''
+ CasperJS is a navigation scripting & testing utility for PhantomJS.
+ It eases the process of defining a full navigation scenario and provides useful high-level
+ functions, methods & syntaxic sugar for doing common tasks such as:
+ - defining & ordering navigation steps
+ - filling forms
+ - clicking links
+ - capturing screenshots of a page (or an area)
+ - making assertions on remote DOM
+ - logging & events
+ - downloading base64 encoded resources, even binary ones
+ - catching errors and react accordingly
+ - writing functional test suites, exporting results as JUnit XML (xUnit)
+ '';
+
+ homepage = http://casperjs.org;
+ license = stdenv.lib.licenses.mit;
+
+ maintainers = [ stdenv.lib.maintainers.bluescreen303 ];
+ platforms = stdenv.lib.platforms.all;
+ };
+}
diff --git a/pkgs/development/tools/documentation/docutils/default.nix b/pkgs/development/tools/documentation/docutils/default.nix
index 1630b0f4072..f6edcf54463 100644
--- a/pkgs/development/tools/documentation/docutils/default.nix
+++ b/pkgs/development/tools/documentation/docutils/default.nix
@@ -2,7 +2,7 @@ a :
let
fetchurl = a.fetchurl;
- version = a.lib.attrByPath ["version"] "0.5" a;
+ version = a.lib.attrByPath ["version"] "0.10" a;
buildInputs = with a; [
python pil makeWrapper
];
@@ -10,7 +10,7 @@ in
rec {
src = fetchurl {
url = "http://prdownloads.sourceforge.net/docutils/docutils-${version}.tar.gz";
- sha256 = "03k1dakb5j1xi1xd62vqqy7dkgd1fhr4ahmvvmd5g87wxn2gjz3l";
+ sha256 = "0gk0733w34zibzvi6paqqfbbajzaxajc4z5i5wpxlwv73gk281ip";
};
inherit buildInputs;
diff --git a/pkgs/development/tools/documentation/doxygen/1.7.nix b/pkgs/development/tools/documentation/doxygen/1.7.nix
index 86f2e8cf2b2..f530ed70e37 100644
--- a/pkgs/development/tools/documentation/doxygen/1.7.nix
+++ b/pkgs/development/tools/documentation/doxygen/1.7.nix
@@ -47,6 +47,6 @@ stdenv.mkDerivation {
'';
maintainers = [stdenv.lib.maintainers.simons];
- platforms = if (qt4 != null) then stdenv.lib.platforms.linux else stdenv.lib.platforms.unix;
+ platforms = if qt4 != null then stdenv.lib.platforms.linux else stdenv.lib.platforms.unix;
};
}
diff --git a/pkgs/development/tools/documentation/doxygen/default.nix b/pkgs/development/tools/documentation/doxygen/default.nix
index 07893987bbf..047da44a793 100644
--- a/pkgs/development/tools/documentation/doxygen/default.nix
+++ b/pkgs/development/tools/documentation/doxygen/default.nix
@@ -47,6 +47,6 @@ stdenv.mkDerivation {
'';
maintainers = [stdenv.lib.maintainers.simons];
- platforms = if (qt4 != null) then stdenv.lib.platforms.linux else stdenv.lib.platforms.unix;
+ platforms = if qt4 != null then stdenv.lib.platforms.linux else stdenv.lib.platforms.unix;
};
}
diff --git a/pkgs/development/tools/documentation/gnome-doc-utils/default.nix b/pkgs/development/tools/documentation/gnome-doc-utils/default.nix
index ad1be726578..374002e8d6c 100644
--- a/pkgs/development/tools/documentation/gnome-doc-utils/default.nix
+++ b/pkgs/development/tools/documentation/gnome-doc-utils/default.nix
@@ -14,5 +14,5 @@ stdenv.mkDerivation {
pythonPath = [ libxml2Python ];
postInstall = "wrapPythonPrograms";
- buildNativeInputs = [ pkgconfig intltool pythonPackages.wrapPython ];
+ nativeBuildInputs = [ pkgconfig intltool pythonPackages.wrapPython ];
}
diff --git a/pkgs/development/tools/documentation/haddock/2.11.0.nix b/pkgs/development/tools/documentation/haddock/2.11.0.nix
new file mode 100644
index 00000000000..92dccbf05a6
--- /dev/null
+++ b/pkgs/development/tools/documentation/haddock/2.11.0.nix
@@ -0,0 +1,18 @@
+{ cabal, alex, Cabal, filepath, ghcPaths, happy, xhtml }:
+
+cabal.mkDerivation (self: {
+ pname = "haddock";
+ version = "2.11.0";
+ sha256 = "0a29n6y9lmk5w78f6j8s7pg0m0k3wm7bx5r2lhk7bnzkr5f7rkcd";
+ isLibrary = true;
+ isExecutable = true;
+ buildDepends = [ Cabal filepath ghcPaths xhtml ];
+ buildTools = [ alex happy ];
+ 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;
+ 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
new file mode 100644
index 00000000000..39610f9a08c
--- /dev/null
+++ b/pkgs/development/tools/documentation/haddock/2.12.0.nix
@@ -0,0 +1,18 @@
+{ cabal, alex, Cabal, deepseq, filepath, ghcPaths, happy, xhtml }:
+
+cabal.mkDerivation (self: {
+ pname = "haddock";
+ version = "2.12.0";
+ sha256 = "00kdmpa6vhn6x790641ln40v3pn7aj4ws6pq854n1iyg5ly3ridn";
+ isLibrary = true;
+ isExecutable = true;
+ buildDepends = [ Cabal deepseq filepath ghcPaths xhtml ];
+ buildTools = [ alex happy ];
+ 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;
+ maintainers = [ self.stdenv.lib.maintainers.andres ];
+ };
+})
diff --git a/pkgs/development/tools/documentation/haddock/2.13.1.nix b/pkgs/development/tools/documentation/haddock/2.13.1.nix
new file mode 100644
index 00000000000..1eed852f537
--- /dev/null
+++ b/pkgs/development/tools/documentation/haddock/2.13.1.nix
@@ -0,0 +1,18 @@
+{ cabal, alex, Cabal, deepseq, filepath, ghcPaths, happy, xhtml }:
+
+cabal.mkDerivation (self: {
+ pname = "haddock";
+ version = "2.13.1";
+ sha256 = "0zsflbc3ayjsn542sa58zl62dd78ykr489f18sh467hrrnaj4pkf";
+ isLibrary = true;
+ isExecutable = true;
+ buildDepends = [ Cabal deepseq filepath ghcPaths xhtml ];
+ buildTools = [ alex happy ];
+ 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;
+ maintainers = [ self.stdenv.lib.maintainers.andres ];
+ };
+})
diff --git a/pkgs/development/tools/documentation/haddock/2.7.2.nix b/pkgs/development/tools/documentation/haddock/2.7.2.nix
index c94b3e43b7e..0c744d62419 100644
--- a/pkgs/development/tools/documentation/haddock/2.7.2.nix
+++ b/pkgs/development/tools/documentation/haddock/2.7.2.nix
@@ -17,9 +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
- self.stdenv.lib.maintainers.simons
- ];
+ 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 c6543936ab3..8e5b79cd519 100644
--- a/pkgs/development/tools/documentation/haddock/2.9.2.nix
+++ b/pkgs/development/tools/documentation/haddock/2.9.2.nix
@@ -19,7 +19,6 @@ cabal.mkDerivation (self : {
platforms = self.ghc.meta.platforms;
maintainers = [
self.stdenv.lib.maintainers.andres
- self.stdenv.lib.maintainers.simons
];
};
})
diff --git a/pkgs/development/tools/documentation/xdoc/builder.sh b/pkgs/development/tools/documentation/xdoc/builder.sh
deleted file mode 100644
index 4bc414ff7bf..00000000000
--- a/pkgs/development/tools/documentation/xdoc/builder.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-source $stdenv/setup
-
-configureFlags="--with-aterm=$aterm --with-sglr=$sglr --with-pgen=$pgen
- --with-pt-support=$ptsupport --with-asf-library=$asflibrary --with-strategoxt=$strategoxt --with-graphviz=$graphviz --with-svn=$subversion"
-genericBuild
diff --git a/pkgs/development/tools/documentation/xdoc/default.nix b/pkgs/development/tools/documentation/xdoc/default.nix
deleted file mode 100644
index cc56d7e133e..00000000000
--- a/pkgs/development/tools/documentation/xdoc/default.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{stdenv, fetchurl, strategoxt, aterm, sdf, subversion, graphviz}:
-
-stdenv.mkDerivation {
- name = "xdoc-0.1";
- src = fetchurl {
- url = http://machina.nl/xdoc/xdoc-0.1.tar.gz;
- md5 = "6f601254013d5fe3d2fdbd33b827001a";
- };
- builder = ./builder.sh;
- inherit aterm strategoxt subversion graphviz ;
- inherit (sdf) sglr pgen ptsupport asflibrary;
- buildInputs = [aterm sdf.pgen strategoxt];
-}
diff --git a/pkgs/development/tools/haskell/BNFC-meta/default.nix b/pkgs/development/tools/haskell/BNFC-meta/default.nix
index 1b0397ead1b..d39544342b3 100644
--- a/pkgs/development/tools/haskell/BNFC-meta/default.nix
+++ b/pkgs/development/tools/haskell/BNFC-meta/default.nix
@@ -2,12 +2,11 @@
cabal.mkDerivation (self: {
pname = "BNFC-meta";
- version = "0.3.0.3";
- sha256 = "06k8jnb4gw96gc0ffmczbywn4q2n87zwqa0pl0ada3ldvwaagv4l";
+ version = "0.4.0.1";
+ sha256 = "0x31a25njbgd3r8shh7rrqa9qq66iqjhh82k538p9bd2hblg30ka";
buildDepends = [ alexMeta happyMeta haskellSrcMeta syb ];
- noHaddock = true;
meta = {
- description = "Deriving Quasi-Quoters from BNF Grammars";
+ 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/BNFC/default.nix b/pkgs/development/tools/haskell/BNFC/default.nix
index e737a02a4ac..3cb85b86acb 100644
--- a/pkgs/development/tools/haskell/BNFC/default.nix
+++ b/pkgs/development/tools/haskell/BNFC/default.nix
@@ -1,14 +1,16 @@
-{ cabal, mtl }:
+{ cabal, mtl, fetchurl }:
cabal.mkDerivation (self: {
pname = "BNFC";
- version = "2.4.2.1";
- sha256 = "0a6ic9mqkxk2gql7dzik2bhm5iikgx035wxlz8iafxf45159dl14";
- isLibrary = false;
+ version = "2.6.0.3";
+ sha256 = "0i38rwslkvnicnlxbrxybnwkgfin04lnr4q12lcvli4ldp2ylfjq";
+ isLibrary = true;
isExecutable = true;
buildDepends = [ mtl ];
+ patches = [ (fetchurl { url = "https://github.com/BNFC/bnfc/pull/3.patch"; sha256 = "103l04ylzswgxrmpv5zy6dd0jyr96z21mdkpgk1z4prvn8wjl624"; }) ];
+ patchFlags = "-p2";
meta = {
- homepage = "http://www.cse.chalmers.se/research/group/Language-technology/BNFC/";
+ homepage = "http://bnfc.digitalgrammars.com/";
description = "A compiler front-end generator";
license = "GPL";
platforms = self.ghc.meta.platforms;
diff --git a/pkgs/development/tools/haskell/SourceGraph/default.nix b/pkgs/development/tools/haskell/SourceGraph/default.nix
index 731722126ca..17d19106481 100644
--- a/pkgs/development/tools/haskell/SourceGraph/default.nix
+++ b/pkgs/development/tools/haskell/SourceGraph/default.nix
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "SourceGraph";
- version = "0.7.0.2";
- sha256 = "0cdspzsz15r83fjry9467z67h6vvnjh31fip6gf64k74gdjkfisl";
+ version = "0.7.0.5";
+ sha256 = "0lbgs5a0ivn44bmc242hynsvczvxq2snz1fyjf13mrpfx8j5n8gk";
isLibrary = false;
isExecutable = true;
buildDepends = [
diff --git a/pkgs/development/tools/haskell/alex-meta/default.nix b/pkgs/development/tools/haskell/alex-meta/default.nix
index 661c9c7895b..5bb298e739a 100644
--- a/pkgs/development/tools/haskell/alex-meta/default.nix
+++ b/pkgs/development/tools/haskell/alex-meta/default.nix
@@ -2,10 +2,9 @@
cabal.mkDerivation (self: {
pname = "alex-meta";
- version = "0.3.0.3";
- sha256 = "08w7z2iq2s557vi9kp2x8qp1lwvh49skffbjm8kxrf2bn2il5q48";
+ version = "0.3.0.5";
+ sha256 = "0f41q5l6z1dcpfx8rxacv4f544zcw7pgvq935mnzzha9fvsxqzk4";
buildDepends = [ haskellSrcMeta QuickCheck ];
- noHaddock = true;
meta = {
description = "Quasi-quoter for Alex lexers";
license = self.stdenv.lib.licenses.bsd3;
diff --git a/pkgs/development/tools/haskell/cabal-dev/default.nix b/pkgs/development/tools/haskell/cabal-dev/default.nix
new file mode 100644
index 00000000000..79385bd88a9
--- /dev/null
+++ b/pkgs/development/tools/haskell/cabal-dev/default.nix
@@ -0,0 +1,21 @@
+{ cabal, Cabal, cabalInstall, filepath, HTTP, mtl, network, tar
+, transformers, zlib
+}:
+
+cabal.mkDerivation (self: {
+ pname = "cabal-dev";
+ version = "0.9.1";
+ sha256 = "1brz0nw959jdyjrhjqy9sixsb316hjmw4pxxsybfl8vixsivdfh6";
+ isLibrary = false;
+ isExecutable = true;
+ buildDepends = [
+ Cabal filepath HTTP mtl network tar transformers zlib
+ ];
+ buildTools = [ cabalInstall ];
+ meta = {
+ homepage = "http://github.com/creswick/cabal-dev";
+ description = "Manage sandboxed Haskell build environments";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ };
+})
diff --git a/pkgs/development/tools/haskell/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix
index b5983dec6fb..e3b6378e3d9 100644
--- a/pkgs/development/tools/haskell/cabal2nix/default.nix
+++ b/pkgs/development/tools/haskell/cabal2nix/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "cabal2nix";
- version = "1.38";
- sha256 = "1kybxrkddbzr1cqpqplbflhakf9njb9hvamhdwvlanlk8985h8jg";
+ version = "1.43";
+ sha256 = "00blyn8hxj7d0ib7gg0a2gk36scm1isr5m4xsi9nvqay3261b068";
isLibrary = false;
isExecutable = true;
buildDepends = [ Cabal filepath hackageDb HTTP mtl regexPosix ];
diff --git a/pkgs/development/tools/haskell/happy-meta/default.nix b/pkgs/development/tools/haskell/happy-meta/default.nix
index 3b9a6d4c983..a3d885c6008 100644
--- a/pkgs/development/tools/haskell/happy-meta/default.nix
+++ b/pkgs/development/tools/haskell/happy-meta/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "happy-meta";
- version = "0.2.0.4";
- sha256 = "1s1inv2l2hwdlvypn6wpiadmi5y5mpcjawiqjb1hv0d8y43dpz54";
+ version = "0.2.0.5";
+ sha256 = "103hi87azqv11l8lq1rv0v9v88sl227g31snvkn8db6b4cfrwrxk";
buildDepends = [ haskellSrcMeta mtl ];
meta = {
description = "Quasi-quoter for Happy parsers";
diff --git a/pkgs/development/tools/haskell/hlint/default.nix b/pkgs/development/tools/haskell/hlint/default.nix
index bb61bbaa7dc..c914e9c8225 100644
--- a/pkgs/development/tools/haskell/hlint/default.nix
+++ b/pkgs/development/tools/haskell/hlint/default.nix
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "hlint";
- version = "1.8.31";
- sha256 = "0d7m7viqf1cawbafiy4nj67hkavlxkv537qypy2vlhr502fispa4";
+ version = "1.8.43";
+ sha256 = "0wffswyx60qig1is3ki5asp8i4wvd3gqg2r811rw0zxwi3nrjiv6";
isLibrary = true;
isExecutable = true;
buildDepends = [
@@ -14,7 +14,7 @@ cabal.mkDerivation (self: {
meta = {
homepage = "http://community.haskell.org/~ndm/hlint/";
description = "Source code suggestions";
- license = "GPL";
+ license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
diff --git a/pkgs/development/tools/haskell/hslogger/default.nix b/pkgs/development/tools/haskell/hslogger/default.nix
index 4128f6b7d09..4443637def4 100644
--- a/pkgs/development/tools/haskell/hslogger/default.nix
+++ b/pkgs/development/tools/haskell/hslogger/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "hslogger";
- version = "1.2.0";
- sha256 = "17ipnz7zd403x2gi2086chrgcnk76304hdxr5mv4phg4rm8w226y";
+ version = "1.2.1";
+ sha256 = "1vfdf7i6fd4mb3rn57z3wn7bhw4z5g47f4vggb4sms5rg4zqqly5";
isLibrary = true;
isExecutable = true;
buildDepends = [ mtl network time ];
diff --git a/pkgs/development/tools/haskell/jailbreak-cabal/default.nix b/pkgs/development/tools/haskell/jailbreak-cabal/default.nix
new file mode 100644
index 00000000000..303e7ceb2c3
--- /dev/null
+++ b/pkgs/development/tools/haskell/jailbreak-cabal/default.nix
@@ -0,0 +1,17 @@
+{ cabal, Cabal }:
+
+cabal.mkDerivation (self: {
+ pname = "jailbreak-cabal";
+ version = "1.0";
+ sha256 = "10vq592fx1i3fdqiij7daf3dmqq5c8c29ihr2y1rn2pjhkyiy4kk";
+ isLibrary = false;
+ isExecutable = true;
+ buildDepends = [ Cabal ];
+ meta = {
+ homepage = "http://github.com/peti/jailbreak-cabal";
+ description = "Strip version restrictions from build dependencies in Cabal files";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ maintainers = [ self.stdenv.lib.maintainers.simons ];
+ };
+})
diff --git a/pkgs/development/tools/haskell/splot/default.nix b/pkgs/development/tools/haskell/splot/default.nix
new file mode 100644
index 00000000000..4bd47b8decd
--- /dev/null
+++ b/pkgs/development/tools/haskell/splot/default.nix
@@ -0,0 +1,21 @@
+{ cabal, bytestringLexing, cairo, Chart, colour, HUnit, mtl
+, strptime, time, vcsRevision
+}:
+
+cabal.mkDerivation (self: {
+ pname = "splot";
+ version = "0.3.8";
+ sha256 = "188v9c070wn6gr47k5q55gsiph0lj96d96bss76gz7znknfj9rm3";
+ isLibrary = false;
+ isExecutable = true;
+ buildDepends = [
+ bytestringLexing cairo Chart colour HUnit mtl strptime time
+ vcsRevision
+ ];
+ meta = {
+ homepage = "http://www.haskell.org/haskellwiki/Splot";
+ description = "A tool for visualizing the lifecycle of many concurrent multi-staged processes";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ };
+})
diff --git a/pkgs/development/tools/haskell/tar/0.4.0.0.nix b/pkgs/development/tools/haskell/tar/0.4.0.1.nix
similarity index 65%
rename from pkgs/development/tools/haskell/tar/0.4.0.0.nix
rename to pkgs/development/tools/haskell/tar/0.4.0.1.nix
index 7f6b70a52e6..04257960a64 100644
--- a/pkgs/development/tools/haskell/tar/0.4.0.0.nix
+++ b/pkgs/development/tools/haskell/tar/0.4.0.1.nix
@@ -1,10 +1,10 @@
-{ cabal, filepath }:
+{ cabal, filepath, time }:
cabal.mkDerivation (self: {
pname = "tar";
- version = "0.4.0.0";
- sha256 = "04qijdfyiqb64q58g0bf46qfgaxqjl3kl68x6z31cv36p3hpplx3";
- buildDepends = [ filepath ];
+ version = "0.4.0.1";
+ sha256 = "0vbsv7h3zgp30mlgsw156jkv1rqy5zbm98as9haf7x15hd6jf254";
+ buildDepends = [ filepath time ];
meta = {
description = "Reading, writing and manipulating \".tar\" archive files.";
license = self.stdenv.lib.licenses.bsd3;
diff --git a/pkgs/development/tools/haskell/threadscope/default.nix b/pkgs/development/tools/haskell/threadscope/default.nix
index f0d80e84c5a..4928c40e129 100644
--- a/pkgs/development/tools/haskell/threadscope/default.nix
+++ b/pkgs/development/tools/haskell/threadscope/default.nix
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "threadscope";
- version = "0.2.1";
- sha256 = "08s9fbwg33rgbqjdx7n90q83livfay9khr2ddjwj8brw8k1wkmxg";
+ version = "0.2.2";
+ sha256 = "07cmza391hjq77lx8m9g2287bzsh5ffka3s07fr49v6x6hivsic3";
isLibrary = false;
isExecutable = true;
buildDepends = [
diff --git a/pkgs/development/tools/haskell/timeplot/default.nix b/pkgs/development/tools/haskell/timeplot/default.nix
new file mode 100644
index 00000000000..d95c8cea03f
--- /dev/null
+++ b/pkgs/development/tools/haskell/timeplot/default.nix
@@ -0,0 +1,23 @@
+{ cabal, bytestringLexing, cairo, Chart, colour, dataAccessor
+, dataAccessorTemplate, regexTdfa, strptime, time, transformers
+, vcsRevision
+}:
+
+cabal.mkDerivation (self: {
+ pname = "timeplot";
+ version = "1.0.19";
+ sha256 = "1mwhrcjavx56z3msdf5zqvqlx5m3hbcw85f22h8p9wvfgn79aydx";
+ isLibrary = false;
+ isExecutable = true;
+ buildDepends = [
+ bytestringLexing cairo Chart colour dataAccessor
+ dataAccessorTemplate regexTdfa strptime time transformers
+ vcsRevision
+ ];
+ meta = {
+ homepage = "http://haskell.org/haskellwiki/Timeplot";
+ description = "A tool for visualizing time series from log files";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ };
+})
diff --git a/pkgs/development/tools/haskell/uuagc/cabal.nix b/pkgs/development/tools/haskell/uuagc/cabal.nix
index 24eded529b3..ea981ad423b 100644
--- a/pkgs/development/tools/haskell/uuagc/cabal.nix
+++ b/pkgs/development/tools/haskell/uuagc/cabal.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "uuagc-cabal";
- version = "1.0.2.0";
- sha256 = "0nvnyc6c1611rziglpp0ywqkgg9sgfi9ph33ya33k5zv3jxxh1q0";
+ version = "1.0.4.0";
+ sha256 = "0m6q8lfbrzcdxd923s175x0z1rnniv7gk08ninzpq16fisscr4lf";
buildDepends = [ Cabal filepath mtl uulib ];
meta = {
homepage = "http://www.cs.uu.nl/wiki/HUT/WebHome";
diff --git a/pkgs/development/tools/haskell/uuagc/default.nix b/pkgs/development/tools/haskell/uuagc/default.nix
index 833189b89ac..4e3214ee1df 100644
--- a/pkgs/development/tools/haskell/uuagc/default.nix
+++ b/pkgs/development/tools/haskell/uuagc/default.nix
@@ -1,16 +1,12 @@
-{ cabal, filepath, haskellSrcExts, mtl, uuagcBootstrap, uuagcCabal
-, uulib
-}:
+{ cabal, filepath, haskellSrcExts, mtl, uuagcCabal, uulib }:
cabal.mkDerivation (self: {
pname = "uuagc";
- version = "0.9.40.3";
- sha256 = "053p7cbis843zn0qg8imc77xnfj4kna8wwfanxbj8kcapcqvwihl";
+ version = "0.9.42.2";
+ sha256 = "1l7w3gimcx079giw5ri4qfr1xfi1wfj93v29r8hvs8q8a6ffjifn";
isLibrary = true;
isExecutable = true;
- buildDepends = [
- filepath haskellSrcExts mtl uuagcBootstrap uuagcCabal uulib
- ];
+ buildDepends = [ filepath haskellSrcExts mtl uuagcCabal uulib ];
meta = {
homepage = "http://www.cs.uu.nl/wiki/HUT/WebHome";
description = "Attribute Grammar System of Universiteit Utrecht";
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 7c9d06baa54..91c27deb8b8 100644
--- a/pkgs/development/tools/misc/automake/automake-1.11.x.nix
+++ b/pkgs/development/tools/misc/automake/automake-1.11.x.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, perl, autoconf, makeWrapper, doCheck ? true}:
+{ stdenv, fetchurl, perl, autoconf, makeWrapper }:
stdenv.mkDerivation rec {
name = "automake-1.11.6";
@@ -19,8 +19,6 @@ stdenv.mkDerivation rec {
buildInputs = [perl autoconf makeWrapper];
- inherit doCheck;
-
# Disable indented log output from Make, otherwise "make.test" will
# fail.
preCheck = "unset NIX_INDENT_MAKE";
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 e2db84d2fc3..bd609c4a40d 100644
--- a/pkgs/development/tools/misc/automake/automake-1.12.x.nix
+++ b/pkgs/development/tools/misc/automake/automake-1.12.x.nix
@@ -1,7 +1,7 @@
-{stdenv, fetchurl, perl, autoconf, makeWrapper, doCheck ? true}:
+{ stdenv, fetchurl, perl, autoconf, makeWrapper, doCheck ? false }:
stdenv.mkDerivation rec {
- name = "automake-1.12.2";
+ name = "automake-1.12.4";
# TODO: Remove the `aclocal' wrapper when $ACLOCAL_PATH support is
# available upstream; see
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://gnu/automake/${name}.tar.xz";
- sha256 = "5fb56e918189b377a22368e19baaf70252bd85a9969ed5f8a8373f49e8faf07f";
+ sha256 = "0wppdm0wfizs6nmiwlkigcmh2pn33dywdkl7b407j3pvwn622vsi";
};
buildInputs = [perl autoconf makeWrapper];
diff --git a/pkgs/development/tools/misc/automake/automake-1.13.x.nix b/pkgs/development/tools/misc/automake/automake-1.13.x.nix
new file mode 100644
index 00000000000..3556b4f47aa
--- /dev/null
+++ b/pkgs/development/tools/misc/automake/automake-1.13.x.nix
@@ -0,0 +1,40 @@
+{ stdenv, fetchurl, perl, autoconf, makeWrapper, doCheck ? false }:
+
+stdenv.mkDerivation rec {
+ name = "automake-1.13.1";
+
+ src = fetchurl {
+ url = "mirror://gnu/automake/${name}.tar.xz";
+ sha256 = "12yi1bzkipi7qdmkdy77pazljsa9z7q66hi6c4rq73p7hbv6rkbf";
+ };
+
+ buildInputs = [ perl autoconf ];
+
+ setupHook = ./setup-hook.sh;
+
+ # Disable indented log output from Make, otherwise "make.test" will
+ # fail.
+ preCheck = "unset NIX_INDENT_MAKE";
+ inherit doCheck;
+
+ # The test suite can run in parallel.
+ enableParallelBuilding = true;
+
+ # Don't fixup "#! /bin/sh" in Libtool, otherwise it will use the
+ # "fixed" path in generated files!
+ dontPatchShebangs = true;
+
+ meta = {
+ homepage = "http://www.gnu.org/software/automake/";
+ description = "GNU Automake, a GNU standard-compliant makefile generator";
+ license = "GPLv2+";
+
+ longDescription = ''
+ GNU Automake is a tool for automatically generating
+ `Makefile.in' files compliant with the GNU Coding
+ Standards. Automake requires the use of Autoconf.
+ '';
+
+ maintainers = [ stdenv.lib.maintainers.ludo stdenv.lib.maintainers.simons ];
+ };
+}
diff --git a/pkgs/development/tools/misc/automake/default.nix b/pkgs/development/tools/misc/automake/default.nix
deleted file mode 100644
index c37a829e3bc..00000000000
--- a/pkgs/development/tools/misc/automake/default.nix
+++ /dev/null
@@ -1 +0,0 @@
-import ./automake-1.10.x.nix
diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix
index 353cd9f40bc..c3f9de4bc89 100644
--- a/pkgs/development/tools/misc/binutils/default.nix
+++ b/pkgs/development/tools/misc/binutils/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, noSysDirs, zlib, cross ? null, gold ? false, bison ? null, flex2535 ? null, bc ? null, dejagnu ? null }:
-let basename = "binutils-2.21.1a"; in
+let basename = "binutils-2.23.1"; in
stdenv.mkDerivation rec {
name = basename + stdenv.lib.optionalString (cross != null) "-${cross.config}";
src = fetchurl {
url = "mirror://gnu/binutils/${basename}.tar.bz2";
- sha256 = "0m7nmd7gc9d9md43wbrv65hz6lbi2crqwryzpigv19ray1lzmv6d";
+ sha256 = "06bs5v5ndb4g5qx96d52lc818gkbskd1m0sz57314v887sqfbcia";
};
patches = [
@@ -14,6 +14,11 @@ stdenv.mkDerivation rec {
# RUNPATH instead of RPATH on binaries. This is important because
# RUNPATH can be overriden using LD_LIBRARY_PATH at runtime.
./new-dtags.patch
+
+ # Since binutils 2.22, DT_NEEDED flags aren't copied for dynamic outputs.
+ # That requires upstream changes for things to work. So we can patch it to
+ # get the old behaviour by now.
+ ./dtneeded.patch
];
buildInputs =
diff --git a/pkgs/development/tools/misc/binutils/dtneeded.patch b/pkgs/development/tools/misc/binutils/dtneeded.patch
new file mode 100644
index 00000000000..3754ec569ee
--- /dev/null
+++ b/pkgs/development/tools/misc/binutils/dtneeded.patch
@@ -0,0 +1,12 @@
+diff --git a/ld/ldmain.c b/ld/ldmain.c
+index 15f8ebf..f71241e 100644
+--- a/ld/ldmain.c
++++ b/ld/ldmain.c
+@@ -298,6 +298,7 @@ main (int argc, char **argv)
+ lang_init ();
+ ldemul_before_parse ();
+ lang_has_input_file = FALSE;
++ input_flags.add_DT_NEEDED_for_dynamic = TRUE;
+ parse_args (argc, argv);
+
+ if (config.hash_table_size != 0)
diff --git a/pkgs/development/tools/misc/cflow/default.nix b/pkgs/development/tools/misc/cflow/default.nix
index 041191640bd..d9be5802fa9 100644
--- a/pkgs/development/tools/misc/cflow/default.nix
+++ b/pkgs/development/tools/misc/cflow/default.nix
@@ -15,11 +15,10 @@ stdenv.mkDerivation rec {
'';
buildInputs = [ gettext ] ++
-
# We don't have Emacs/GTK/etc. on {Dar,Cyg}win.
stdenv.lib.optional
(! (stdenv.lib.lists.any (x: stdenv.system == x)
- [ "i686-darwin" "i686-cygwin" ]))
+ [ "i686-cygwin" ]))
emacs;
doCheck = true;
diff --git a/pkgs/development/tools/misc/coccinelle/default.nix b/pkgs/development/tools/misc/coccinelle/default.nix
index 0b5fa4b8d61..d31e2ec5f3b 100644
--- a/pkgs/development/tools/misc/coccinelle/default.nix
+++ b/pkgs/development/tools/misc/coccinelle/default.nix
@@ -1,9 +1,9 @@
-{ fetchurl, stdenv, python, ncurses, ocamlPackages, makeWrapper }:
+{ fetchurl, stdenv, python, ncurses, ocamlPackages, pkgconfig, makeWrapper }:
let
- name = "coccinelle-1.0.0-rc12";
- sha256 = "03b8930a53623ec79dc2486e9b6a569e373958cf46074c5f1d0028c70708498d";
+ name = "coccinelle-1.0.0-rc15";
+ sha256 = "07fab4e17512925b958890bb13c0809797074f2e44a1107b0074bdcc156b9596";
in stdenv.mkDerivation {
inherit name;
@@ -15,12 +15,15 @@ in stdenv.mkDerivation {
buildInputs = with ocamlPackages; [
ocaml findlib menhir
- ocaml_pcre ocaml_sexplib pycaml
- python ncurses makeWrapper
+ ocaml_pcre pycaml
+ python ncurses pkgconfig
+ makeWrapper
];
- configureFlagsArray = [ "--enable-release" ];
-
+ # TODO: is the generation of this wrapper truly/still needed?
+ # I don't have a non-NixOS system, so I cannot verify this, but shouldn't
+ # libpython know where to find its modules? (the path is for example in
+ # its Sys-module).
postInstall =
# On non-NixOS systems, Coccinelle would end up looking up Python modules
# in the wrong directory.
@@ -31,6 +34,8 @@ in stdenv.mkDerivation {
done
'';
+ configureFlags = "--enable-release";
+
meta = {
description = "Coccinelle, a program to apply C code semantic patches";
diff --git a/pkgs/development/tools/misc/cpphs/default.nix b/pkgs/development/tools/misc/cpphs/default.nix
index 4fbce76474c..2e419f67eb0 100644
--- a/pkgs/development/tools/misc/cpphs/default.nix
+++ b/pkgs/development/tools/misc/cpphs/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "cpphs";
- version = "1.14";
- sha256 = "1lscgylcbbny60lx36xwm8y22jmbv23159pfn8n87kbskq6cpk0z";
+ version = "1.16";
+ sha256 = "1fv91s3h2s76h1hadb3mmnkg0rrfakmbfsrw6q522kshvpk2wmmp";
isLibrary = true;
isExecutable = true;
meta = {
diff --git a/pkgs/development/tools/misc/cscope/default.nix b/pkgs/development/tools/misc/cscope/default.nix
index b9d2c10f537..3a83b1ba325 100644
--- a/pkgs/development/tools/misc/cscope/default.nix
+++ b/pkgs/development/tools/misc/cscope/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
configureFlags = "--with-ncurses=${ncurses}";
buildInputs = [ ncurses ];
- buildNativeInputs = [ pkgconfig emacs ];
+ nativeBuildInputs = [ pkgconfig emacs ];
postInstall = ''
# Install Emacs mode.
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
crossAttrs = {
postInstall = "";
- propagatedBuildInputs = [ ncurses.hostDrv ];
+ propagatedBuildInputs = [ ncurses.crossDrv ];
};
meta = {
diff --git a/pkgs/development/tools/misc/distcc/default.nix b/pkgs/development/tools/misc/distcc/default.nix
index a46c7a695f2..565d7835f05 100644
--- a/pkgs/development/tools/misc/distcc/default.nix
+++ b/pkgs/development/tools/misc/distcc/default.nix
@@ -1,46 +1,77 @@
-{ stdenv, fetchurl, popt, avahi, pkgconfig, python, gtk
+{ stdenv, fetchurl, popt, avahi, pkgconfig, python, gtk, runCommand, gcc
, sysconfDir ? "" # set this parameter to override the default value $out/etc
, static ? false
}:
-let name = "distcc";
- version = "3.1";
+let
+ name = "distcc";
+ version = "3.1";
+ distcc = stdenv.mkDerivation {
+ name = "${name}-${version}";
+ src = fetchurl {
+ url = "http://distcc.googlecode.com/files/${name}-${version}.tar.bz2";
+ sha256 = "f55dbafd76bed3ce57e1bbcdab1329227808890d90f4c724fcd2d53f934ddd89";
+ };
+
+ buildInputs = [popt avahi pkgconfig python gtk];
+ preConfigure =
+ ''
+ configureFlagsArray=( CFLAGS="-O2 -fno-strict-aliasing"
+ CXXFLAGS="-O2 -fno-strict-aliasing"
+ --mandir=$out/share/man
+ ${if sysconfDir == "" then "" else "--sysconfdir=${sysconfDir}"}
+ ${if static then "LDFLAGS=-static" else ""}
+ --with${if static == true || popt == null then "" else "out"}-included-popt
+ --with${if avahi != null then "" else "out"}-avahi
+ --with${if gtk != null then "" else "out"}-gtk
+ --without-gnome
+ --enable-rfc2553
+ --disable-Werror # a must on gcc 4.6
+ )
+ installFlags="sysconfdir=$out/etc";
+ '';
+ patches = [ ./20-minute-io-timeout.patch ];
+
+ # The test suite fails because it uses hard-coded paths, i.e. /usr/bin/gcc.
+ doCheck = false;
+
+ passthru = {
+ # A derivation that provides gcc and g++ commands, but that
+ # will end up calling distcc for the given cacheDir
+ #
+ # extraConfig is meant to be sh lines exporting environment
+ # variables like DISTCC_HOSTS, DISTCC_DIR, ...
+ links = extraConfig : (runCommand "distcc-links"
+ { inherit (gcc) langC langCC; }
+ ''
+ mkdir -p $out/bin
+ if [ $langC -eq 1 ]; then
+ cat > $out/bin/gcc << EOF
+ #!/bin/sh
+ ${extraConfig}
+ exec ${distcc}/bin/distcc gcc "\$@"
+ EOF
+ chmod +x $out/bin/gcc
+ fi
+ if [ $langCC -eq 1 ]; then
+ cat > $out/bin/g++ << EOF
+ #!/bin/sh
+ ${extraConfig}
+ exec ${distcc}/bin/distcc g++ "\$@"
+ EOF
+ chmod +x $out/bin/g++
+ fi
+ '');
+ };
+
+ meta = {
+ description = "a fast, free distributed C/C++ compiler";
+ homepage = "http://distcc.org";
+ license = "GPL";
+
+ platforms = stdenv.lib.platforms.linux;
+ maintainers = [ stdenv.lib.maintainers.simons ];
+ };
+ };
in
-
-stdenv.mkDerivation {
- name = "${name}-${version}";
- src = fetchurl {
- url = "http://distcc.googlecode.com/files/${name}-${version}.tar.bz2";
- sha256 = "f55dbafd76bed3ce57e1bbcdab1329227808890d90f4c724fcd2d53f934ddd89";
- };
-
- buildInputs = [popt avahi pkgconfig python gtk];
- preConfigure =
- ''
- configureFlagsArray=( CFLAGS="-O2 -fno-strict-aliasing"
- CXXFLAGS="-O2 -fno-strict-aliasing"
- --mandir=$out/share/man
- ${if sysconfDir == "" then "" else "--sysconfdir=${sysconfDir}"}
- ${if static then "LDFLAGS=-static" else ""}
- --with${if static == true || popt == null then "" else "out"}-included-popt
- --with${if avahi != null then "" else "out"}-avahi
- --with${if gtk != null then "" else "out"}-gtk
- --without-gnome
- --enable-rfc2553
- )
- installFlags="sysconfdir=$out/etc";
- '';
- patches = [ ./20-minute-io-timeout.patch ];
-
- # The test suite fails because it uses hard-coded paths, i.e. /usr/bin/gcc.
- doCheck = false;
-
- meta = {
- description = "a fast, free distributed C/C++ compiler";
- homepage = "http://distcc.org";
- license = "GPL";
-
- platforms = stdenv.lib.platforms.linux;
- maintainers = [ stdenv.lib.maintainers.simons ];
- };
-}
+ distcc
diff --git a/pkgs/development/tools/misc/distcc/masq.nix b/pkgs/development/tools/misc/distcc/masq.nix
new file mode 100644
index 00000000000..117480670c3
--- /dev/null
+++ b/pkgs/development/tools/misc/distcc/masq.nix
@@ -0,0 +1,41 @@
+{ stdenv, gccRaw, binutils }:
+
+stdenv.mkDerivation {
+ name = "distcc-masq-${gccRaw.name}";
+
+ phases = [ "installPhase" ];
+ installPhase = ''
+ ensureDir $out/bin
+
+ bin=${gccRaw}/bin
+
+ shopt -s nullglob
+ if [ -f $bin/gcc ]; then
+ ln -s $bin/gcc $out/bin
+ else
+ for a in $bin/*-gcc; do
+ ln -s $bin/*-gcc $out/bin/gcc
+ ln -s $bin/*-gcc $out/bin/cc
+ done
+ fi
+
+ if [ -f $bin/g++ ]; then
+ ln -s $bin/g++ $out/bin
+ else
+ for a in $bin/*-g++; do
+ ln -sf $bin/*-g++ $out/bin/g++
+ ln -sf $bin/*-g++ $out/bin/c++
+ done
+ fi
+
+ bbin=${binutils}/bin
+ if [ -f $bbin/as ]; then
+ ln -s $bbin/as $out/bin
+ else
+ for a in $bbin/*-as; do
+ ln -sf $bbin/*-as $out/bin/as
+ done
+ fi
+
+ '';
+}
diff --git a/pkgs/development/tools/misc/elfutils/default.nix b/pkgs/development/tools/misc/elfutils/default.nix
index 61b4647552d..5a1a19068a7 100644
--- a/pkgs/development/tools/misc/elfutils/default.nix
+++ b/pkgs/development/tools/misc/elfutils/default.nix
@@ -21,14 +21,14 @@ stdenv.mkDerivation rec {
# We need bzip2 in NativeInputs because otherwise we can't unpack the src,
# as the host-bzip2 will be in the path.
- buildNativeInputs = [m4 bison flex gettext bzip2];
+ nativeBuildInputs = [m4 bison flex gettext bzip2];
buildInputs = [zlib bzip2];
crossAttrs = {
/* Having bzip2 will harm, because anything using elfutils
as buildInput cross-building, will not be able to run 'bzip2' */
- propagatedBuildInputs = [ zlib.hostDrv ];
+ propagatedBuildInputs = [ zlib.crossDrv ];
# This program does not cross-build fine. So I only cross-build some parts
# I need for the linux perf tool.
diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix
index 08fde14eb53..a9b3dec5092 100644
--- a/pkgs/development/tools/misc/gdb/default.nix
+++ b/pkgs/development/tools/misc/gdb/default.nix
@@ -8,11 +8,11 @@
let
- basename = "gdb-7.5";
+ basename = "gdb-7.5.1";
# Whether (cross-)building for GNU/Hurd. This is an approximation since
- # having `stdenv ? cross' doesn't tell us if we're building `hostDrv' and
- # `buildDrv'.
+ # having `stdenv ? cross' doesn't tell us if we're building `crossDrv' and
+ # `nativeDrv'.
isGNU =
stdenv.system == "i686-gnu"
|| (stdenv ? cross && stdenv.cross.config == "i586-pc-gnu");
@@ -27,12 +27,12 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://gnu/gdb/${basename}.tar.bz2";
- md5 = "24a6779a9fe0260667710de1b082ef61";
+ sha256 = "084xs90545an51biyy4qd53hsw6p1k6arviq2wlz1a4z526q02q7";
};
# I think python is not a native input, but I leave it
# here while I will not need it cross building
- buildNativeInputs = [ texinfo python ]
+ nativeBuildInputs = [ texinfo python ]
++ stdenv.lib.optional isGNU mig;
buildInputs = [ ncurses readline gmp mpfr expat ]
@@ -51,8 +51,8 @@ stdenv.mkDerivation rec {
crossAttrs = {
# Do not add --with-python here to avoid cross building it.
configureFlags =
- '' --with-gmp=${gmp.hostDrv} --with-mpfr=${mpfr.hostDrv} --with-system-readline
- --with-expat --with-libexpat-prefix=${expat.hostDrv} --without-python
+ '' --with-gmp=${gmp.crossDrv} --with-mpfr=${mpfr.crossDrv} --with-system-readline
+ --with-expat --with-libexpat-prefix=${expat.crossDrv} --without-python
'' + stdenv.lib.optionalString (target != null)
" --target=${target.config}";
};
diff --git a/pkgs/development/tools/misc/gnum4/default.nix b/pkgs/development/tools/misc/gnum4/default.nix
index 1f026f12f52..d1b0d0e376e 100644
--- a/pkgs/development/tools/misc/gnum4/default.nix
+++ b/pkgs/development/tools/misc/gnum4/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
&& !stdenv.isSunOS; # XXX: `test-setlocale2.sh' fails
# Upstream is aware of it; it may be in the next release.
- patches = [ ./s_isdir.patch ./readlink-EINVAL.patch ];
+ patches = [ ./s_isdir.patch ./readlink-EINVAL.patch ./no-gets.patch ];
meta = {
homepage = http://www.gnu.org/software/m4/;
diff --git a/pkgs/development/tools/misc/gnum4/no-gets.patch b/pkgs/development/tools/misc/gnum4/no-gets.patch
new file mode 100644
index 00000000000..456c08b56c3
--- /dev/null
+++ b/pkgs/development/tools/misc/gnum4/no-gets.patch
@@ -0,0 +1,26 @@
+http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/sys-devel/m4/files/m4-1.4.16-no-gets.patch?revision=1.1
+
+https://bugs.gentoo.org/424978
+
+hack until m4 pulls a newer gnulib version
+
+From 66712c23388e93e5c518ebc8515140fa0c807348 Mon Sep 17 00:00:00 2001
+From: Eric Blake
+Date: Thu, 29 Mar 2012 13:30:41 -0600
+Subject: [PATCH] stdio: don't assume gets any more
+
+Gnulib intentionally does not have a gets module, and now that C11
+and glibc have dropped it, we should be more proactive about warning
+any user on a platform that still has a declaration of this dangerous
+interface.
+
+--- a/lib/stdio.in.h
++++ b/lib/stdio.in.h
+@@ -125,7 +125,6 @@
+ so any use of gets warrants an unconditional warning. Assume it is
+ always declared, since it is required by C89. */
+ #undef gets
+-_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
+
+ #if @GNULIB_FOPEN@
+ # if @REPLACE_FOPEN@
diff --git a/pkgs/development/tools/misc/intltool/default.nix b/pkgs/development/tools/misc/intltool/default.nix
new file mode 100644
index 00000000000..b2a400a6189
--- /dev/null
+++ b/pkgs/development/tools/misc/intltool/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchurl, perl, perlXMLParser, gettext }:
+let
+ s = # Generated upstream information
+ rec {
+ baseName="intltool";
+ version="0.50.2";
+ name="intltool-0.50.2";
+ hash="01j4yd7i84n9nk4ccs6yifg84pp68nr9by57jdbhj7dpdxf5rwk7";
+ url="https://launchpad.net/intltool/trunk/0.50.2/+download/intltool-0.50.2.tar.gz";
+ sha256="01j4yd7i84n9nk4ccs6yifg84pp68nr9by57jdbhj7dpdxf5rwk7";
+ };
+ propagatedBuildInputs = [perl perlXMLParser];
+ buildInputs = [];
+ in
+stdenv.mkDerivation {
+ inherit (s) name version;
+ src = fetchurl {
+ inherit (s) url sha256;
+ };
+ inherit buildInputs;
+
+ # not needed by intltool itself but (probably) needed for its usage
+ propagatedBuildInputs = propagatedBuildInputs ++ [ gettext ];
+
+ meta = {
+ description = "Translation helper tool";
+ homepage = "http://launchpad.net/intltool/";
+ license = stdenv.lib.licenses.gpl2Plus;
+ maintainers = [stdenv.lib.maintainers.raskin];
+ platforms = stdenv.lib.platforms.linux;
+ inherit (s) version;
+ };
+}
diff --git a/pkgs/development/tools/misc/intltool/default.upstream b/pkgs/development/tools/misc/intltool/default.upstream
new file mode 100644
index 00000000000..323bf21f45a
--- /dev/null
+++ b/pkgs/development/tools/misc/intltool/default.upstream
@@ -0,0 +1,2 @@
+attribute_name intltool
+url https://launchpad.net/intltool/+download
diff --git a/pkgs/development/tools/misc/libtool/libtool2.nix b/pkgs/development/tools/misc/libtool/libtool2.nix
index 403381af485..4c3500c65a2 100644
--- a/pkgs/development/tools/misc/libtool/libtool2.nix
+++ b/pkgs/development/tools/misc/libtool/libtool2.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation (rec {
sha256 = "0649qfpzkswgcj9vqkkr9rn4nlcx80faxpyqscy2k1x9c94f93dk";
};
- buildNativeInputs = [ lzma m4 perl ];
+ nativeBuildInputs = [ lzma m4 perl ];
# Don't fixup "#! /bin/sh" in Libtool, otherwise it will use the
# "fixed" path in generated files!
diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix
index 3589ffb5a07..d5bb2b06e12 100644
--- a/pkgs/development/tools/misc/strace/default.nix
+++ b/pkgs/development/tools/misc/strace/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "158iwk0pl2mfw93m1843xb7a2zb8p6lh0qim07rca6f1ff4dk764";
};
- buildNativeInputs = [ perl ];
+ nativeBuildInputs = [ perl ];
meta = {
homepage = http://strace.sourceforge.net/;
diff --git a/pkgs/development/tools/misc/sysbench/default.nix b/pkgs/development/tools/misc/sysbench/default.nix
new file mode 100644
index 00000000000..f09ab2af7d1
--- /dev/null
+++ b/pkgs/development/tools/misc/sysbench/default.nix
@@ -0,0 +1,19 @@
+{stdenv, fetchurl, mysql, libxslt, zlib, autoreconfHook }:
+
+stdenv.mkDerivation rec {
+ name = "sysbench-0.4.12";
+ buildInputs = [ autoreconfHook mysql libxslt zlib ];
+ src = fetchurl {
+ url = mirror://sourceforge/sysbench/sysbench-0.4.12.tar.gz;
+ sha256 = "17pa4cw7wxvlb4mba943lfs3b3jdi64mlnaf4n8jq09y35j79yl3";
+ };
+ preAutoreconf = ''
+ touch NEWS AUTHORS
+ '';
+
+ meta = {
+ description = "SysBench is a modular, cross-platform and multi-threaded benchmark tool.";
+ license = "GPLv2";
+ platforms = stdenv.lib.platforms.linux;
+ };
+}
diff --git a/pkgs/development/tools/misc/texinfo/default.nix b/pkgs/development/tools/misc/texinfo/4.13a.nix
similarity index 97%
rename from pkgs/development/tools/misc/texinfo/default.nix
rename to pkgs/development/tools/misc/texinfo/4.13a.nix
index 111f2d14200..9a41d296342 100644
--- a/pkgs/development/tools/misc/texinfo/default.nix
+++ b/pkgs/development/tools/misc/texinfo/4.13a.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [ ncurses ];
- buildNativeInputs = [ lzma ];
+ nativeBuildInputs = [ lzma ];
# Disabled because we don't have zdiff in the stdenv bootstrap.
#doCheck = true;
diff --git a/pkgs/development/tools/misc/texinfo/5.0.nix b/pkgs/development/tools/misc/texinfo/5.0.nix
new file mode 100644
index 00000000000..a4fb2e9b468
--- /dev/null
+++ b/pkgs/development/tools/misc/texinfo/5.0.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchurl, ncurses, perl }:
+
+stdenv.mkDerivation rec {
+ name = "texinfo-5.0";
+
+ src = fetchurl {
+ url = "mirror://gnu/texinfo/${name}.tar.xz";
+ sha256 = "1p34f68h9ggfj6ckgj0p62qlj7pmz3ha3vc91kh4hr44pnwm1pla";
+ };
+
+ buildInputs = [ ncurses perl ];
+
+ doCheck = true;
+
+ meta = {
+ homepage = "http://www.gnu.org/software/texinfo/";
+ description = "GNU Texinfo, the GNU documentation system";
+ license = stdenv.lib.licenses.gpl3Plus;
+
+ longDescription = ''
+ Texinfo is the official documentation format of the GNU project.
+ It was invented by Richard Stallman and Bob Chassell many years
+ ago, loosely based on Brian Reid's Scribe and other formatting
+ languages of the time. It is used by many non-GNU projects as
+ well.
+
+ Texinfo uses a single source file to produce output in a number
+ of formats, both online and printed (dvi, html, info, pdf, xml,
+ etc.). This means that instead of writing different documents
+ for online information and another for a printed manual, you
+ need write only one document. And when the work is revised, you
+ need revise only that one document. The Texinfo system is
+ well-integrated with GNU Emacs.
+ '';
+ };
+}
diff --git a/pkgs/development/tools/misc/xxdiff/default.nix b/pkgs/development/tools/misc/xxdiff/default.nix
index 1a44cd4bcbf..461c602a886 100644
--- a/pkgs/development/tools/misc/xxdiff/default.nix
+++ b/pkgs/development/tools/misc/xxdiff/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
sha256 = "7ae7d81becc25b1adabc9383bb5b9005dddb31510cdc404ce8a0d6ff6c3dc47e";
};
- buildNativeInputs = [ flex bison qt4 ];
+ nativeBuildInputs = [ flex bison qt4 ];
buildInputs = [ qt4 ];
diff --git a/pkgs/development/tools/neoload/default.nix b/pkgs/development/tools/neoload/default.nix
new file mode 100644
index 00000000000..d7a203ad3f4
--- /dev/null
+++ b/pkgs/development/tools/neoload/default.nix
@@ -0,0 +1,93 @@
+{ stdenv, fetchurl, writeTextFile, jre, makeWrapper, licenseAccepted ? false }:
+
+# If you happen to use this software on the XMonad window manager, you will have issues with
+# grey windows, no resizing, menus not showing and other glitches.
+# This can be fixed by setting a different WM name:
+# http://www.haskell.org/haskellwiki/Xmonad/Frequently_asked_questions#Using_SetWMName
+
+if !licenseAccepted then throw ''
+ You have to accept the neoload EULA at
+ https://www.neotys.com/documents/legal/eula/neoload/eula_en.html
+ by setting nixpkgs config option 'neoload.accept_license = true';
+ ''
+else assert licenseAccepted;
+
+# the installer is very picky and demands 1.7.0.07
+let dotInstall4j = writeTextFile { name = "dot-install4j"; text = ''
+ JRE_VERSION ${jre} 1 7 0 7
+ JRE_INFO ${jre} 94
+ ''; };
+
+ responseVarfile = writeTextFile { name = "response.varfile"; text = ''
+ sys.programGroupDisabled$Boolean=false
+ sys.component.Monitor\ Agent$Boolean=true
+ sys.component.Common$Boolean=true
+ sys.component.Controller$Boolean=true
+ sys.languageId=en
+ sys.component.Load\ Generator$Boolean=true
+ sys.installationTypeId=Controller
+ sys.installationDir=INSTALLDIR/lib/neoload
+ sys.symlinkDir=INSTALLDIR/bin
+ ''; };
+
+in stdenv.mkDerivation rec {
+ name = "neoload-4.1.1";
+
+ src = fetchurl (
+ if stdenv.system == "x86_64-linux" then
+ { url = http://www.neotys.com/documents/download/neoload/v4.1/neoload_4_1_1_linux_x64.sh;
+ sha256 = "1gik80pvrj95jcpvqk16alvldf2zc604zn3xz3nszgmpv9dgmjk6"; }
+ else
+ { url = http://www.neotys.com/documents/download/neoload/v4.1/neoload_4_1_1_linux_x86.sh;
+ sha256 = "1m42xqy2gsk4khcaps287b4bsamn14grcy8wdz07hk8wvcfncd3d"; } );
+
+ buildInputs = [ makeWrapper ];
+ phases = [ "installPhase" ];
+
+ # TODO: load generator / monitoring agent only builds
+
+ installPhase = ''
+ mkdir -p $out/lib/neoload
+ ln -s ${jre} $out/lib/neoload/jre
+
+ # the installer wants to use its internal JRE
+ # disable this. The extra spaces are needed because the installer carries
+ # a binary payload, so should not change in size
+ sed -e 's/^if \[ -f jre.tar.gz/if false /' $src > installer
+ chmod a+x installer
+
+ cp ${dotInstall4j} .install4j
+ chmod u+w .install4j
+
+ sed -e "s|INSTALLDIR|$out|" ${responseVarfile} > response.varfile
+
+ export HOME=`pwd`
+ export INSTALL4J_JAVA_HOME=${jre}
+ bash -ic './installer -q -varfile response.varfile'
+
+ for i in $out/bin/*; do
+ wrapProgram $i --run 'cp ${dotInstall4j} ~/.install4j' \
+ --run 'chmod u+w ~/.install4j'
+ done
+
+ mkdir -p $out/share/applications
+ for i in $out/lib/neoload/*.desktop; do
+ name=$(basename "$i")
+ sed -e 's|/lib/neoload/bin|/bin|' "$i" > "$out/share/applications/$name"
+ done
+ rm $out/lib/neoload/*.desktop $out/lib/neoload/uninstall
+
+ '';
+
+ meta = {
+ description = "load testing software for Web applications to realistically simulate user activity and analyze server behavior.";
+
+ homepage = https://www.neotys.com/product/overview-neoload.html;
+
+ # https://www.neotys.com/documents/legal/eula/neoload/eula_en.html
+ license = stdenv.lib.licenses.proprietary;
+
+ maintainers = [ stdenv.lib.maintainers.bluescreen303 ];
+ platforms = [ "i686-linux" "x86_64-linux" ];
+ };
+}
diff --git a/pkgs/development/tools/ocaml/camlp5/default.nix b/pkgs/development/tools/ocaml/camlp5/default.nix
index 315bca38f36..74b3368293c 100644
--- a/pkgs/development/tools/ocaml/camlp5/default.nix
+++ b/pkgs/development/tools/ocaml/camlp5/default.nix
@@ -2,28 +2,18 @@
let
ocaml_version = (builtins.parseDrvName ocaml.name).version;
- pname = "camlp5";
- version = "6.02.3";
- webpage = http://pauillac.inria.fr/~ddr/camlp5/;
metafile = ./META;
in
stdenv.mkDerivation {
- name = "${pname}${if transitional then "_transitional" else ""}-${version}";
+ name = "camlp5${if transitional then "_transitional" else ""}-6.06";
src = fetchurl {
- url = "${webpage}/distrib/src/${pname}-${version}.tgz";
- sha256 = "1z9bwh267117br0vlhirv9yy2niqp2n25zfnl14wg6kgg9bqx7rj";
+ url = http://pauillac.inria.fr/~ddr/camlp5/distrib/src/camlp5-6.06.tgz;
+ sha256 = "763f89ee6cde4ca063a50708c3fe252d55ea9f8037e3ae9801690411ea6180c5";
};
- patches = fetchurl {
- url = "${webpage}/distrib/src/patch-${version}-1";
- sha256 = "159qpvr07mnn72yqwx24c6mw7hs6bl77capsii7apg9dcxar8w7v";
- };
-
- patchFlags = "-p 0";
-
buildInputs = [ ocaml ];
prefixKey = "-prefix ";
@@ -41,8 +31,8 @@ stdenv.mkDerivation {
Camlp5 is a preprocessor and pretty-printer for OCaml programs.
It also provides parsing and printing tools.
'';
- homepage = "${webpage}";
- license = "BSD";
+ homepage = http://pauillac.inria.fr/~ddr/camlp5/;
+ license = stdenv.lib.licenses.bsd3;
platforms = ocaml.meta.platforms;
maintainers = [
stdenv.lib.maintainers.z77z
diff --git a/pkgs/development/tools/ocaml/findlib/default.nix b/pkgs/development/tools/ocaml/findlib/default.nix
index 3170712b9ba..aee0040f815 100644
--- a/pkgs/development/tools/ocaml/findlib/default.nix
+++ b/pkgs/development/tools/ocaml/findlib/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
buildInputs = [m4 ncurses ocaml];
- patches = [ ./ldconf.patch ];
+ patches = [ ./ldconf.patch ./install_topfind.patch ];
dontAddPrefix=true;
@@ -24,7 +24,6 @@ stdenv.mkDerivation {
-mandir $out/share/man
-sitelib $out/lib/ocaml/${ocaml_version}/site-lib
-config $out/etc/findlib.conf
- -no-topfind
)
'';
diff --git a/pkgs/development/tools/ocaml/findlib/install_topfind.patch b/pkgs/development/tools/ocaml/findlib/install_topfind.patch
new file mode 100644
index 00000000000..4729885bcef
--- /dev/null
+++ b/pkgs/development/tools/ocaml/findlib/install_topfind.patch
@@ -0,0 +1,12 @@
+--- findlib-1.3.3/src/findlib/Makefile
++++ findlib-1.3.3/src/findlib/Makefile
+@@ -82,7 +82,7 @@ clean:
+ install: all
+ mkdir -p "$(prefix)$(OCAML_SITELIB)/$(NAME)"
+ mkdir -p "$(prefix)$(OCAMLFIND_BIN)"
+- test $(INSTALL_TOPFIND) -eq 0 || cp topfind "$(prefix)$(OCAML_CORE_STDLIB)"
++ test $(INSTALL_TOPFIND) -eq 0 || cp topfind "$(prefix)$(OCAML_SITELIB)"
+ files=`$(TOP)/tools/collect_files $(TOP)/Makefile.config findlib.cmi findlib.mli findlib.cma topfind.cmi topfind.mli fl_package_base.mli fl_package_base.cmi fl_metascanner.mli fl_metascanner.cmi fl_metatoken.cmi findlib_top.cma findlib.cmxa findlib.a META` && \
+ cp $$files "$(prefix)$(OCAML_SITELIB)/$(NAME)"
+ f="ocamlfind$(EXEC_SUFFIX)"; { test -f ocamlfind_opt$(EXEC_SUFFIX) && f="ocamlfind_opt$(EXEC_SUFFIX)"; }; \
+
diff --git a/pkgs/development/tools/parsing/Ebnf2ps/default.nix b/pkgs/development/tools/parsing/Ebnf2ps/default.nix
index 81815500c61..f1964e815f6 100644
--- a/pkgs/development/tools/parsing/Ebnf2ps/default.nix
+++ b/pkgs/development/tools/parsing/Ebnf2ps/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "Ebnf2ps";
- version = "1.0.10";
- sha256 = "0xim32bnfapfs53lvmdz2af08rqd15lp5b0rh6yjqm7n1g2061zs";
+ version = "1.0.11";
+ sha256 = "0n0maihalnrks3l7ay1i16p6i7f69xv33jxhlsyshzck0v64qivb";
isLibrary = false;
isExecutable = true;
buildTools = [ happy ];
diff --git a/pkgs/development/tools/parsing/bison/bison-1.875.nix b/pkgs/development/tools/parsing/bison/bison-1.875.nix
deleted file mode 100644
index 3ee12a252ce..00000000000
--- a/pkgs/development/tools/parsing/bison/bison-1.875.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{stdenv, fetchurl, m4}:
-
-assert m4 != null;
-
-stdenv.mkDerivation {
- name = "bison-1.875";
- src = fetchurl {
- url = mirror://gnu/bison/bison-1.875.tar.bz2;
- md5 = "b7f8027b249ebd4dd0cc948943a71af0";
- };
- buildInputs = [m4];
- passthru = { glrSupport = true; };
-}
diff --git a/pkgs/development/tools/parsing/bison/bison-2.3.nix b/pkgs/development/tools/parsing/bison/bison-2.3.nix
deleted file mode 100644
index fcf4ed10795..00000000000
--- a/pkgs/development/tools/parsing/bison/bison-2.3.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{stdenv, fetchurl, m4}:
-
-assert m4 != null;
-
-stdenv.mkDerivation {
- name = "bison-2.3";
- src = fetchurl {
- url = mirror://gnu/bison/bison-2.3.tar.bz2;
- md5 = "c18640c6ec31a169d351e3117ecce3ec";
- };
-
- buildNativeInputs = [m4];
- propagatedBuildInputs = [m4];
-
- meta = {
- description = "GNU Bison, a Yacc-compatible parser generator";
-
- longDescription = ''
- Bison is a general-purpose parser generator that converts an
- annotated context-free grammar into an LALR(1) or GLR parser for
- that grammar. Once you are proficient with Bison, you can use
- it to develop a wide range of language parsers, from those used
- in simple desk calculators to complex programming languages.
-
- Bison is upward compatible with Yacc: all properly-written Yacc
- grammars ought to work with Bison with no change. Anyone
- familiar with Yacc should be able to use Bison with little
- trouble. You need to be fluent in C or C++ programming in order
- to use Bison.
- '';
-
- homepage = http://www.gnu.org/software/bison/;
-
- license = "GPLv2+";
- };
-
- passthru = { glrSupport = true; };
-}
diff --git a/pkgs/development/tools/parsing/bison/bison-2.4.nix b/pkgs/development/tools/parsing/bison/bison-2.4.nix
deleted file mode 100644
index a79a5e96381..00000000000
--- a/pkgs/development/tools/parsing/bison/bison-2.4.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{stdenv, fetchurl, m4}:
-
-stdenv.mkDerivation rec {
- name = "bison-2.4.3";
-
- src = fetchurl {
- url = "mirror://gnu/bison/${name}.tar.bz2";
- sha256 = "019s3pdzggb71g7p7dgajhh53gh0h6nfl4yrzrs0jzsc37ph4lwk";
- };
-
- buildNativeInputs = [m4];
-
- doCheck = true;
-
- meta = {
- description = "GNU Bison, a Yacc-compatible parser generator";
-
- longDescription = ''
- Bison is a general-purpose parser generator that converts an
- annotated context-free grammar into an LALR(1) or GLR parser for
- that grammar. Once you are proficient with Bison, you can use
- it to develop a wide range of language parsers, from those used
- in simple desk calculators to complex programming languages.
-
- Bison is upward compatible with Yacc: all properly-written Yacc
- grammars ought to work with Bison with no change. Anyone
- familiar with Yacc should be able to use Bison with little
- trouble. You need to be fluent in C or C++ programming in order
- to use Bison.
- '';
-
- homepage = http://www.gnu.org/software/bison/;
-
- license = "GPLv3+";
-
- maintainers = [ stdenv.lib.maintainers.ludo ];
- };
-
- passthru = { glrSupport = true; };
-}
diff --git a/pkgs/development/tools/parsing/bison/bison-2.5.nix b/pkgs/development/tools/parsing/bison/bison-2.5.nix
deleted file mode 100644
index ea50b859020..00000000000
--- a/pkgs/development/tools/parsing/bison/bison-2.5.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{ stdenv, fetchurl, m4, perl }:
-
-stdenv.mkDerivation rec {
- name = "bison-2.5";
-
- src = fetchurl {
- url = "mirror://gnu/bison/${name}.tar.bz2";
- sha256 = "1f1rai3v6k6xjii94964iq0alhc2hxwapqa363nfj8rbxvv0sdqa";
- };
-
- buildNativeInputs = [ m4 ]
- ++ stdenv.lib.optional doCheck perl;
- propagatedBuildInputs = [ m4 ];
-
- M4 = "${m4}/bin/m4";
-
- doCheck = true;
-
- meta = {
- description = "GNU Bison, a Yacc-compatible parser generator";
-
- longDescription = ''
- Bison is a general-purpose parser generator that converts an
- annotated context-free grammar into an LALR(1) or GLR parser for
- that grammar. Once you are proficient with Bison, you can use
- it to develop a wide range of language parsers, from those used
- in simple desk calculators to complex programming languages.
-
- Bison is upward compatible with Yacc: all properly-written Yacc
- grammars ought to work with Bison with no change. Anyone
- familiar with Yacc should be able to use Bison with little
- trouble. You need to be fluent in C or C++ programming in order
- to use Bison.
- '';
-
- homepage = http://www.gnu.org/software/bison/;
-
- license = "GPLv3+";
-
- maintainers = [ stdenv.lib.maintainers.ludo ];
- };
-
- passthru = { glrSupport = true; };
-}
diff --git a/pkgs/development/tools/parsing/bison/bison-2.6.nix b/pkgs/development/tools/parsing/bison/default.nix
similarity index 87%
rename from pkgs/development/tools/parsing/bison/bison-2.6.nix
rename to pkgs/development/tools/parsing/bison/default.nix
index ea43d30410e..b397a22443a 100644
--- a/pkgs/development/tools/parsing/bison/bison-2.6.nix
+++ b/pkgs/development/tools/parsing/bison/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchurl, m4, perl }:
stdenv.mkDerivation rec {
- name = "bison-2.6.2";
+ name = "bison-2.6.5";
src = fetchurl {
url = "mirror://gnu/bison/${name}.tar.xz";
- sha256 = "79503f80397c30ac81b62eca5ffeaccaed72fdfeddb76257efcf8c3ca24be03d";
+ sha256 = "8640d5b51aad462db6863711f333a9159836853e0b1e79fdef708c6efb5cd52b";
};
- buildNativeInputs = [ m4 ] ++ stdenv.lib.optional doCheck perl;
+ nativeBuildInputs = [ m4 ] ++ stdenv.lib.optional doCheck perl;
propagatedBuildInputs = [ m4 ];
doCheck = true;
diff --git a/pkgs/development/tools/parsing/flex/flex-2.5.35.nix b/pkgs/development/tools/parsing/flex/flex-2.5.35.nix
index 66ece227c92..21180e7d185 100644
--- a/pkgs/development/tools/parsing/flex/flex-2.5.35.nix
+++ b/pkgs/development/tools/parsing/flex/flex-2.5.35.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
sha256 = "0ysff249mwhq0053bw3hxh58djc0gy7vjan2z1krrf9n5d5vvv0b";
};
buildInputs = [yacc];
- propagatedBuildNativeInputs = [m4];
+ propagatedNativeBuildInputs = [m4];
crossAttrs = {
preConfigure = ''
diff --git a/pkgs/development/tools/parsing/happy/1.18.10.nix b/pkgs/development/tools/parsing/happy/1.18.10.nix
new file mode 100644
index 00000000000..d342d3381c8
--- /dev/null
+++ b/pkgs/development/tools/parsing/happy/1.18.10.nix
@@ -0,0 +1,18 @@
+{ cabal, mtl, perl }:
+
+cabal.mkDerivation (self: {
+ pname = "happy";
+ version = "1.18.10";
+ sha256 = "0jq6p5vvdh4wbam80q2d6j2fa6bmbgnbmqk1w9904x06g7vj1jf1";
+ isLibrary = false;
+ isExecutable = true;
+ buildDepends = [ mtl ];
+ buildTools = [ perl ];
+ 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/re2c/default.nix b/pkgs/development/tools/parsing/re2c/default.nix
new file mode 100644
index 00000000000..b7ed4fb8934
--- /dev/null
+++ b/pkgs/development/tools/parsing/re2c/default.nix
@@ -0,0 +1,13 @@
+{stdenv, fetchurl }:
+
+stdenv.mkDerivation {
+ name = "re2c-0.13.5";
+ src = fetchurl {
+ url = mirror://sourceforge/re2c/re2c/0.13.5/re2c-0.13.5.tar.gz;
+ sha256 = "1336c54b3cacjxg3grxdraq6a00yidr04z90605fhxglk89rbagk";
+ };
+
+ meta = {
+ description = "Re2c is a tool for writing very fast and very flexible scanners.";
+ };
+}
diff --git a/pkgs/development/tools/parsing/toolbuslib/toolbuslib-0.5.1.nix b/pkgs/development/tools/parsing/toolbuslib/toolbuslib-0.5.1.nix
deleted file mode 100644
index 4b93aa24baf..00000000000
--- a/pkgs/development/tools/parsing/toolbuslib/toolbuslib-0.5.1.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{stdenv, fetchurl, aterm}:
-
-stdenv.mkDerivation {
- name = "toolbuslib-0.5.1";
- src = fetchurl {
- url = http://www.cwi.nl/projects/MetaEnv/toolbuslib/toolbuslib-0.5.1.tar.gz;
- md5 = "1c7c7cce870f813bef60bbffdf061c90";
- };
- buildInputs = [aterm];
-}
-
diff --git a/pkgs/development/tools/parsing/toolbuslib/toolbuslib-0.6.nix b/pkgs/development/tools/parsing/toolbuslib/toolbuslib-0.6.nix
deleted file mode 100644
index c49ac9f0663..00000000000
--- a/pkgs/development/tools/parsing/toolbuslib/toolbuslib-0.6.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{stdenv, fetchurl, aterm}:
-
-stdenv.mkDerivation {
- name = "toolbuslib-0.6";
- src = fetchurl {
- url = http://www.cwi.nl/projects/MetaEnv/toolbuslib/toolbuslib-0.6.tar.gz;
- md5 = "e117c574b428408ad172b1ad904ff430";
- };
- buildInputs = [aterm];
-}
-
diff --git a/pkgs/development/tools/phantomjs/default.nix b/pkgs/development/tools/phantomjs/default.nix
new file mode 100644
index 00000000000..5d9433cc5ca
--- /dev/null
+++ b/pkgs/development/tools/phantomjs/default.nix
@@ -0,0 +1,63 @@
+{ stdenv, fetchurl, upx, freetype, fontconfig }:
+
+assert stdenv.lib.elem stdenv.system [ "i686-linux" "x86_64-linux" ];
+
+stdenv.mkDerivation rec {
+ name = "phantomjs-1.7.0";
+
+ # I chose to use the binary build for now.
+ # The source version is quite nasty to compile
+ # because it has bundled a lot of external libraries (like QT and Webkit)
+ # and no easy/nice way to use the system versions of these
+
+ src = if stdenv.system == "i686-linux" then
+ fetchurl {
+ url = "http://phantomjs.googlecode.com/files/${name}-linux-i686.tar.bz2";
+ sha256 = "045d80lymjxnsssa0sgp5pgkahm651jk69ibk3mjczk3ykc1k91f";
+ }
+ else # x86_64-linux
+ fetchurl {
+ url = "http://phantomjs.googlecode.com/files/${name}-linux-x86_64.tar.bz2";
+ sha256 = "1m14czhi3b388didn0a881glsx8bnsg9gnxgj5lghr4l5mgqyrd7";
+ };
+
+ nativeBuildInputs = stdenv.lib.optional (stdenv.system == "x86_64-linux") upx;
+
+ buildPhase = stdenv.lib.optionalString (stdenv.system == "x86_64-linux") ''
+ upx -d bin/phantomjs
+ '' + ''
+ patchelf \
+ --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
+ --set-rpath ${freetype}/lib:${fontconfig}/lib:${stdenv.gcc.gcc}/lib64:${stdenv.gcc.gcc}/lib \
+ bin/phantomjs
+ '';
+
+ dontStrip = true;
+
+ installPhase = ''
+ mkdir -p $out/share/doc/phantomjs
+ cp -a bin $out
+ cp -a ChangeLog examples LICENSE.BSD README.md third-party.txt $out/share/doc/phantomjs
+ '';
+
+ meta = {
+ description = "Headless WebKit with JavaScript API";
+ longDescription = ''
+ PhantomJS is a headless WebKit with JavaScript API.
+ It has fast and native support for various web standards:
+ DOM handling, CSS selector, JSON, Canvas, and SVG.
+
+ PhantomJS is an optimal solution for:
+ - Headless Website Testing
+ - Screen Capture
+ - Page Automation
+ - Network Monitoring
+ '';
+
+ homepage = http://phantomjs.org/;
+ license = stdenv.lib.licenses.bsd3;
+
+ maintainers = [ stdenv.lib.maintainers.bluescreen303 ];
+ platforms = ["i686-linux" "x86_64-linux" ];
+ };
+}
diff --git a/pkgs/development/tools/profiling/sysprof/default.nix b/pkgs/development/tools/profiling/sysprof/default.nix
index 154561e27e1..b6750f88937 100644
--- a/pkgs/development/tools/profiling/sysprof/default.nix
+++ b/pkgs/development/tools/profiling/sysprof/default.nix
@@ -1,44 +1,24 @@
-{ fetchurl, stdenv, kernel, binutils
+{ fetchurl, stdenv, binutils
, pkgconfig, gtk, glib, pango, libglade }:
stdenv.mkDerivation rec {
- name = "sysprof-1.0.12-${kernel.version}";
+ name = "sysprof-1.2.0";
src = fetchurl {
- url = "http://www.daimi.au.dk/~sandmann/sysprof/sysprof-1.0.12.tar.gz";
- sha256 = "0f0z1dh97swlrkw3cbv5k2jhy5rk7wxv55hp7yhysw3idgp8wbmz";
+ url = "http://www.sysprof.com/sysprof-1.2.0.tar.gz";
+ sha256 = "1wb4d844rsy8qjg3z5m6rnfm72da4xwzrrkkb1q5r10sq1pkrw5s";
};
buildInputs = [ binutils pkgconfig gtk glib pango libglade ];
- patches = [ ./configure.patch ];
-
- preConfigure = ''
- kernelVersion=$(cd "${kernel}/lib/modules" && echo *)
- echo "assuming Linux kernel version \`$kernelVersion'"
-
- sed -i "module/Makefile" \
- -e"s|^[[:blank:]]*KDIR[[:blank:]]*:=.*$|KDIR := ${kernel}/lib/modules/$kernelVersion/build|g ;
- s|\$(KMAKE) modules_install|install sysprof-module.ko $out/share/sysprof/module|g ;
- s|\\[ -e /sbin/depmod.*$|true|g"
-
- # XXX: We won't run `depmod' after installing the module.
- '';
-
- configureFlags = "--enable-kernel-module";
-
- preInstall = ''
- mkdir -p "$out/share/sysprof/module"
- '';
-
meta = {
- homepage = http://www.daimi.au.dk/~sandmann/sysprof/;
+ homepage = http://sysprof.com/;
description = "Sysprof, a system-wide profiler for Linux";
license = "GPLv2+";
longDescription = ''
- Sysprof is a sampling CPU profiler for Linux that uses a kernel
- module to profile the entire system, not just a single
+ Sysprof is a sampling CPU profiler for Linux that uses the perf_event_open
+ system call to profile the entire system, not just a single
application. Sysprof handles shared libraries and applications
do not need to be recompiled. In fact they don't even have to
be restarted.
diff --git a/pkgs/development/tools/pydb/default.nix b/pkgs/development/tools/pydb/default.nix
index 7aa2d57955f..23f0dea4453 100644
--- a/pkgs/development/tools/pydb/default.nix
+++ b/pkgs/development/tools/pydb/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
name = "pydb-1.26";
src = fetchurl {
- url = "mirror://sourceforge.net/sourceforge/bashdb/pydb-1.26.tar.bz2";
+ url = "mirror://sourceforge/sourceforge/bashdb/pydb-1.26.tar.bz2";
sha256 = "1wlkz1hd5d4gkzhkjkzcm650c1lchj28hj36jx96mklglm41h4q1";
};
diff --git a/pkgs/development/web/nodejs/build-node-package.nix b/pkgs/development/web/nodejs/build-node-package.nix
index 98136709170..e90e9446846 100644
--- a/pkgs/development/web/nodejs/build-node-package.nix
+++ b/pkgs/development/web/nodejs/build-node-package.nix
@@ -1,7 +1,16 @@
-{ stdenv, nodejs }:
+{ stdenv, runCommand, nodejs, neededNatives}:
-args @ { src, deps, ... }:
+args @ { src, deps ? [], flags ? [], ... }:
+with stdenv.lib;
+
+let npmFlags = concatStringsSep " " (map (v: "--${v}") flags);
+ sources = runCommand "node-sources" {} ''
+ tar xf ${nodejs.src}
+ mv *node* $out
+ '';
+
+in
stdenv.mkDerivation ({
unpackPhase = "true";
@@ -17,10 +26,12 @@ stdenv.mkDerivation ({
buildPhase = ''
runHook preBuild
- ${nodejs}/bin/npm --registry http://www.example.com install ${src}
+ ${nodejs}/bin/npm --registry http://www.example.com --nodedir=${sources} install ${src} ${npmFlags}
runHook postBuild
'';
+ nativeBuildInputs = neededNatives;
+
installPhase = ''
runHook preInstall
mkdir $out
diff --git a/pkgs/development/web/nodejs/default.nix b/pkgs/development/web/nodejs/default.nix
index 75e0df0e89e..7f1aafa64f7 100644
--- a/pkgs/development/web/nodejs/default.nix
+++ b/pkgs/development/web/nodejs/default.nix
@@ -1,21 +1,12 @@
-{ stdenv, fetchurl, openssl, python, zlib, v8, linkV8Headers ? false, utillinux }:
-
-let
-
- espipe_patch = fetchurl {
- url = https://github.com/joyent/libuv/commit/0ac2fdc55455794e057e4999a2e785ca8fbfb1b2.patch;
- sha256 = "0mqgbsz23b3zp19dwk12ys14b031hssmlp40dylb7psj937qcpzi";
- };
-
-in
+{ stdenv, fetchurl, openssl, python, zlib, v8, utillinux }:
stdenv.mkDerivation rec {
- version = "0.8.8";
+ version = "0.8.15";
name = "nodejs-${version}";
src = fetchurl {
url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.gz";
- sha256 = "0cri5r191l5pw8a8pf3gs7hfjm3rrz6kdnm3l8wghmp9p12p0aq9";
+ sha256 = "1ccjaw0lqspnrmzcb9jbnh1mf74ny7874m2q4vz83q7kdnf66n0p";
};
configureFlags = [
@@ -26,24 +17,22 @@ stdenv.mkDerivation rec {
"--shared-v8-libpath=${v8}/lib"
];
- patches = stdenv.lib.optional stdenv.isDarwin ./no-arch-flag.patch;
+ #patches = stdenv.lib.optional stdenv.isDarwin ./no-arch-flag.patch;
prePatch = ''
sed -e 's|^#!/usr/bin/env python$|#!${python}/bin/python|g' -i tools/{*.py,waf-light,node-waf} configure
- pushd deps/uv
- patch -p 1 < ${espipe_patch}
- popd
'';
postInstall = ''
+
sed -e 's|^#!/usr/bin/env node$|#!'$out'/bin/node|' -i $out/lib/node_modules/npm/bin/npm-cli.js
- '' + stdenv.lib.optionalString linkV8Headers '' # helps binary npms
- ln -s ${v8}/include/* $out/include
'' + stdenv.lib.optionalString stdenv.isDarwin ''
install_name_tool -change libv8.dylib ${v8}/lib/libv8.dylib $out/bin/node
'';
buildInputs = [ python openssl v8 zlib ] ++ stdenv.lib.optional stdenv.isLinux utillinux;
+
+ setupHook = ./setup-hook.sh;
meta = with stdenv.lib; {
description = "Event-driven I/O framework for the V8 JavaScript engine";
diff --git a/pkgs/development/web/nodejs/setup-hook.sh b/pkgs/development/web/nodejs/setup-hook.sh
new file mode 100644
index 00000000000..c2888471044
--- /dev/null
+++ b/pkgs/development/web/nodejs/setup-hook.sh
@@ -0,0 +1,5 @@
+addNodePath () {
+ addToSearchPath NODE_PATH $1/node_modules
+}
+
+envHooks=(${envHooks[@]} addNodePath)
diff --git a/pkgs/development/web/plone/default.nix b/pkgs/development/web/plone/default.nix
new file mode 100644
index 00000000000..b53254d2968
--- /dev/null
+++ b/pkgs/development/web/plone/default.nix
@@ -0,0 +1,10151 @@
+
+{ pkgs, python, buildPythonPackage }:
+
+let plone42Packages = python.modules // rec {
+ inherit python;
+ inherit (pkgs) fetchurl stdenv;
+
+
+
+ accesscontrol = buildPythonPackage rec {
+ name = "AccessControl-2.13.11";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/A/AccessControl/${name}.zip";
+ md5 = "7e622d99fb17914b4708d26f245cb696";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ acquisition = buildPythonPackage rec {
+ name = "Acquisition-2.13.8";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/A/Acquisition/${name}.zip";
+ md5 = "8c33160c157b50649e2b2b3224622579";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ archetypes_kss = buildPythonPackage rec {
+ name = "archetypes.kss-1.7.2";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/a/archetypes.kss/${name}.zip";
+ md5 = "a8502140123b74f1b7ed4f36d3e56ff3";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ archetypes_querywidget = buildPythonPackage rec {
+ name = "archetypes.querywidget-1.0.6";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/a/archetypes.querywidget/${name}.zip";
+ md5 = "cbe134f2806191fd35066bbb7c85bfcc";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ archetypes_referencebrowserwidget = buildPythonPackage rec {
+ name = "archetypes.referencebrowserwidget-2.4.16";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/a/archetypes.referencebrowserwidget/${name}.zip";
+ md5 = "7dd3b0d4e188828701a291449c7495f4";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ archetypes_schemaextender = buildPythonPackage rec {
+ name = "archetypes.schemaextender-2.1.2";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/a/archetypes.schemaextender/${name}.zip";
+ md5 = "865aa5b4b6b26e3bb650d89ddfe77c87";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ argparse = buildPythonPackage rec {
+ name = "argparse-1.1";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/a/argparse/${name}.zip";
+ md5 = "087399b73047fa5a6482037411ddc968";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ borg_localrole = buildPythonPackage rec {
+ name = "borg.localrole-3.0.2";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/b/borg.localrole/${name}.zip";
+ md5 = "04082694dfda9ae5cda62747b8ac7ccf";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ buildout_dumppickedversions = buildPythonPackage rec {
+ name = "buildout.dumppickedversions-0.5";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/b/buildout.dumppickedversions/${name}.tar.gz";
+ md5 = "e81cffff329aaaaf8dd0d1c6bd63c8b0";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ clientform = buildPythonPackage rec {
+ name = "ClientForm-0.2.10";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/C/ClientForm/${name}.zip";
+ md5 = "33826886848f89c67a5c8a30b931bd97";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ collective_monkeypatcher = buildPythonPackage rec {
+ name = "collective.monkeypatcher-1.0.1";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/c/collective.monkeypatcher/${name}.zip";
+ md5 = "4d4f20f9b8bb84b24afadc4f56f6dc2c";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ collective_recipe_omelette = buildPythonPackage rec {
+ name = "collective.recipe.omelette-0.15";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/c/collective.recipe.omelette/${name}.zip";
+ md5 = "088bcf60754bead215573ce114207939";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ collective_testcaselayer = buildPythonPackage rec {
+ name = "collective.testcaselayer-1.6";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/c/collective.testcaselayer/${name}.zip";
+ md5 = "fd8387d6b6ebd8645ec92f5f1e512450";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ collective_xmltestreport = buildPythonPackage rec {
+ name = "collective.xmltestreport-1.2.2";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/c/collective.xmltestreport/${name}.tar.gz";
+ md5 = "f247d47a019b44694660d785f70c05b3";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ collective_z3cform_datagridfield = buildPythonPackage rec {
+ name = "collective.z3cform.datagridfield-0.11";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/c/collective.z3cform.datagridfield/${name}.zip";
+ md5 = "c9210337b91305314864da42c12d04c2";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ collective_z3cform_datagridfield_demo = buildPythonPackage rec {
+ name = "collective.z3cform.datagridfield-demo-0.5";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/c/collective.z3cform.datagridfield/collective.z3cform.datagridfield-0.11.zip";
+ md5 = "c9210337b91305314864da42c12d04c2";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ collective_z3cform_datetimewidget = buildPythonPackage rec {
+ name = "collective.z3cform.datetimewidget-1.2.2";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/c/collective.z3cform.datetimewidget/${name}.zip";
+ md5 = "89daf27c7f0f235f9c001f0ee50d76e5";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ coverage = buildPythonPackage rec {
+ name = "coverage-3.5.2";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/c/coverage/${name}.tar.gz";
+ md5 = "28c43d41b13f8987ea14d7b1d4a4e3ec";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ datetime = buildPythonPackage rec {
+ name = "DateTime-2.12.7";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/D/DateTime/${name}.zip";
+ md5 = "72a8bcf80b52211ae7fdfe36c693d70c";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ diazo = buildPythonPackage rec {
+ name = "diazo-1.0.3";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/d/diazo/${name}.zip";
+ md5 = "d3c2b017af521db4c86fb360c86e0bc8";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ documenttemplate = buildPythonPackage rec {
+ name = "DocumentTemplate-2.13.2";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/D/DocumentTemplate/${name}.zip";
+ md5 = "07bb086c77c1dfe94125ad2efbba94b7";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ docutils = buildPythonPackage rec {
+ name = "docutils-0.9";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/d/docutils/${name}.1.tar.gz";
+ md5 = "b0d5cd5298fedf9c62f5fd364a274d56";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ elementtree = buildPythonPackage rec {
+ name = "elementtree-1.2.7-20070827-preview";
+
+ src = fetchurl {
+ url = "http://effbot.org/media/downloads/elementtree-1.2.7-20070827-preview.zip";
+ md5 = "30e2fe5edd143f347e03a8baf5d60f8a";
+ };
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ experimental_cssselect = buildPythonPackage rec {
+ name = "experimental.cssselect-0.3";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/e/experimental.cssselect/${name}.zip";
+ md5 = "3fecdcf1fbc3ea6025e115a56a262957";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ extensionclass = buildPythonPackage rec {
+ name = "ExtensionClass-2.13.2";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/E/ExtensionClass/${name}.zip";
+ md5 = "0236e6d7da9e8b87b9ba45f1b8f930b8";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ feedparser = buildPythonPackage rec {
+ name = "feedparser-5.0.1";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/f/feedparser/${name}.tar.bz2";
+ md5 = "702835de74bd4a578524f311e62c2877";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ five_customerize = buildPythonPackage rec {
+ name = "five.customerize-1.0.3";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/f/five.customerize/${name}.zip";
+ md5 = "32f597c2fa961f7dcc84b23e655d928e";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ five_formlib = buildPythonPackage rec {
+ name = "five.formlib-1.0.4";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/f/five.formlib/${name}.zip";
+ md5 = "09fcecbb7e0ed4a31a4f19787c1a78b4";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ five_globalrequest = buildPythonPackage rec {
+ name = "five.globalrequest-1.0";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/f/five.globalrequest/${name}.tar.gz";
+ md5 = "87f8996bd21d4aa156aa26e7d21b8744";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ five_grok = buildPythonPackage rec {
+ name = "five.grok-1.2.0";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/f/five.grok/${name}.zip";
+ md5 = "b99c3017f3a487dc2a8b7b0b310ee8cf";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ five_intid = buildPythonPackage rec {
+ name = "five.intid-1.0.3";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/f/five.intid/${name}.zip";
+ md5 = "60c6726c07a1c1bf557aeec0ddcee369";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ five_localsitemanager = buildPythonPackage rec {
+ name = "five.localsitemanager-2.0.5";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/f/five.localsitemanager/${name}.zip";
+ md5 = "5e3a658e6068832bd802018ebc83f2d4";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ grokcore_annotation = buildPythonPackage rec {
+ name = "grokcore.annotation-1.1";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/g/grokcore.annotation/${name}.tar.gz";
+ md5 = "a28ccb4b7c86198923d9cce40953314f";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ grokcore_component = buildPythonPackage rec {
+ name = "grokcore.component-1.9";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/g/grokcore.component/${name}.tar.gz";
+ md5 = "24b05b6b132787dbca18acd244c23ffb";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ grokcore_formlib = buildPythonPackage rec {
+ name = "grokcore.formlib-1.4";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/g/grokcore.formlib/${name}.tar.gz";
+ md5 = "dced4aba77053ed78a358a1f5e85d9c4";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ grokcore_security = buildPythonPackage rec {
+ name = "grokcore.security-1.2";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/g/grokcore.security/${name}.tar.gz";
+ md5 = "1e668b7e423814fa069c69f2a4014876";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ grokcore_site = buildPythonPackage rec {
+ name = "grokcore.site-1.1";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/g/grokcore.site/${name}.tar.gz";
+ md5 = "bd16753e6d4f1c0ff38266d2ae79633d";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ grokcore_view = buildPythonPackage rec {
+ name = "grokcore.view-1.13.5";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/g/grokcore.view/${name}.tar.gz";
+ md5 = "304363398aa752d5e1479bab39b93e4e";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ grokcore_viewlet = buildPythonPackage rec {
+ name = "grokcore.viewlet-1.3";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/g/grokcore.viewlet/${name}.tar.gz";
+ md5 = "5e53b3c77941f9ad0ff2aeb7c1b6dd7d";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ initgroups = buildPythonPackage rec {
+ name = "initgroups-2.13.0";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/i/initgroups/${name}.zip";
+ md5 = "38e842dcab8445f65e701fec75213acd";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ jinja2 = buildPythonPackage rec {
+ name = "Jinja2-2.5.5";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/J/Jinja2/${name}.tar.gz";
+ md5 = "83b20c1eeb31f49d8e6392efae91b7d5";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ kss_core = buildPythonPackage rec {
+ name = "kss.core-1.6.5";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/k/kss.core/${name}.zip";
+ md5 = "87e66e78c3bbd7af3ecce5b2fef935ae";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ mailinglogger = buildPythonPackage rec {
+ name = "mailinglogger-3.7.0";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/m/mailinglogger/${name}.tar.gz";
+ md5 = "f865f0df6059ce23062b7457d01dbac5";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ manuel = buildPythonPackage rec {
+ name = "manuel-1.1.1";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/m/manuel/${name}.tar.gz";
+ md5 = "8cd560cf6e8720ecb129c4e5be605fbb";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ markdown = buildPythonPackage rec {
+ name = "Markdown-2.0.3";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/M/Markdown/${name}.zip";
+ md5 = "122418893e21e91109edbf6e082f830d";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ martian = buildPythonPackage rec {
+ name = "martian-0.11.3";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/m/martian/${name}.tar.gz";
+ md5 = "865646fcd9dd31613204d5f4c2db943b";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ mechanize = buildPythonPackage rec {
+ name = "mechanize-0.2.5";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/m/mechanize/${name}.zip";
+ md5 = "a497ad4e875f7506ffcf8ad3ada4c2fc";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ missing = buildPythonPackage rec {
+ name = "Missing-2.13.1";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/M/Missing/${name}.zip";
+ md5 = "9823cff54444cbbcaef8fc45d8e42572";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ mocker = buildPythonPackage rec {
+ name = "mocker-1.1.1";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/m/mocker/${name}.tar.bz2";
+ md5 = "0bd9f83268e16aef2130fa89e2a4839f";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ mr_developer = buildPythonPackage rec {
+ name = "mr.developer-1.21";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/m/mr.developer/${name}.zip";
+ md5 = "5f832f1709714b09cd7490603afd2365";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ multimapping = buildPythonPackage rec {
+ name = "MultiMapping-2.13.0";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/M/MultiMapping/${name}.zip";
+ md5 = "d69c5904c105b9f2f085d4103e0f0586";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ nose = buildPythonPackage rec {
+ name = "nose-1.1.2";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/n/nose/${name}.tar.gz";
+ md5 = "144f237b615e23f21f6a50b2183aa817";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ nt_svcutils = buildPythonPackage rec {
+ name = "nt-svcutils-2.13.0";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/n/nose/nose-1.1.2.tar.gz";
+ md5 = "144f237b615e23f21f6a50b2183aa817";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ ordereddict = buildPythonPackage rec {
+ name = "ordereddict-1.1";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/o/ordereddict/${name}.tar.gz";
+ md5 = "a0ed854ee442051b249bfad0f638bbec";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ paste = buildPythonPackage rec {
+ name = "Paste-1.7.5.1";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/P/Paste/${name}.tar.gz";
+ md5 = "7ea5fabed7dca48eb46dc613c4b6c4ed";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ pastedeploy = buildPythonPackage rec {
+ name = "PasteDeploy-1.3.4";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/P/PasteDeploy/${name}.tar.gz";
+ md5 = "eb4b3e2543d54401249c2cbd9f2d014f";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ pastescript = buildPythonPackage rec {
+ name = "PasteScript-1.7.5";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/P/PasteScript/${name}.tar.gz";
+ md5 = "4c72d78dcb6bb993f30536842c16af4d";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ propagatedBuildInputs = [ paste pastedeploy ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ persistence = buildPythonPackage rec {
+ name = "Persistence-2.13.2";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/P/Persistence/${name}.zip";
+ md5 = "92693648ccdc59c8fc71f7f06b1d228c";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ pil = buildPythonPackage rec {
+ name = "PIL-1.1.6";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/P/Persistence/Persistence-2.13.2.zip";
+ md5 = "92693648ccdc59c8fc71f7f06b1d228c";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ plone = buildPythonPackage rec {
+ name = "Plone-4.2.4";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/P/Plone/${name}.zip";
+ md5 = "688438bd541e7cb2ab650c8c59282b85";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ plone_alterego = buildPythonPackage rec {
+ name = "plone.alterego-1.0";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/p/plone.alterego/${name}.zip";
+ md5 = "b7b6dbcbba00505d98d5aba83e016408";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ plone_app_blob = buildPythonPackage rec {
+ name = "plone.app.blob-1.5.6";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/p/plone.app.blob/${name}.zip";
+ md5 = "8d6ba6f360b6bfd40f87914132339660";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ plone_app_caching = buildPythonPackage rec {
+ name = "plone.app.caching-1.1.2";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/p/plone.app.caching/${name}.zip";
+ md5 = "83a52efeb7604d4c5b4afbc6c1365c6f";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ plone_app_collection = buildPythonPackage rec {
+ name = "plone.app.collection-1.0.7";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/p/plone.app.collection/${name}.zip";
+ md5 = "40c9035472e386fc9d0ec1b9a9a3d4f6";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ plone_app_content = buildPythonPackage rec {
+ name = "plone.app.content-2.0.12";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/p/plone.app.content/${name}.zip";
+ md5 = "2f14a85fb66d73e0b699b839caaaad26";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ plone_app_contentlisting = buildPythonPackage rec {
+ name = "plone.app.contentlisting-1.0.4";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/p/plone.app.contentlisting/${name}.zip";
+ md5 = "fa6eb45c4ffd0eb3817ad4813ca24916";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ plone_app_contentmenu = buildPythonPackage rec {
+ name = "plone.app.contentmenu-2.0.7";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/p/plone.app.contentmenu/${name}.zip";
+ md5 = "b1c7e5a37c659ba30b3a077e149b1752";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ plone_app_contentrules = buildPythonPackage rec {
+ name = "plone.app.contentrules-2.1.9";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/p/plone.app.contentrules/${name}.zip";
+ md5 = "74d2fed9095a7c5f890b6f27de78dafc";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ plone_app_controlpanel = buildPythonPackage rec {
+ name = "plone.app.controlpanel-2.2.11";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/p/plone.app.controlpanel/${name}.zip";
+ md5 = "401c8880865f398c281953f5837108b9";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ plone_app_customerize = buildPythonPackage rec {
+ name = "plone.app.customerize-1.2.2";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/p/plone.app.customerize/${name}.zip";
+ md5 = "6a3802c4e8fbd955597adc6a8298febf";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ plone_app_dexterity = buildPythonPackage rec {
+ name = "plone.app.dexterity-1.2.1";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/p/plone.app.dexterity/${name}.zip";
+ md5 = "25ccd382f9e08cfdfe4a9b7e455030bc";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ plone_app_discussion = buildPythonPackage rec {
+ name = "plone.app.discussion-2.1.8";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/p/plone.app.discussion/${name}.zip";
+ md5 = "b0cb1fbdf8a7a238cf5a58fb10c24731";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ plone_app_folder = buildPythonPackage rec {
+ name = "plone.app.folder-1.0.5";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/p/plone.app.folder/${name}.zip";
+ md5 = "8ea860daddb4c93c0b7f2b5f7106fef0";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ plone_app_form = buildPythonPackage rec {
+ name = "plone.app.form-2.1.2";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/p/plone.app.form/${name}.zip";
+ md5 = "8017f8f782d992825ed71d16b126c4e7";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ plone_app_i18n = buildPythonPackage rec {
+ name = "plone.app.i18n-2.0.2";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/p/plone.app.i18n/${name}.zip";
+ md5 = "a10026573463dfc1899bf4062cebdbf2";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ plone_app_imaging = buildPythonPackage rec {
+ name = "plone.app.imaging-1.0.6";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/p/plone.app.imaging/${name}.zip";
+ md5 = "8d494cd69b3f6be7fcb9e21c20277765";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ plone_app_intid = buildPythonPackage rec {
+ name = "plone.app.intid-1.0.2";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/p/plone.app.intid/${name}.tar.gz";
+ md5 = "863077002bd272ff11c47de0f7f9db1a";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ plone_app_iterate = buildPythonPackage rec {
+ name = "plone.app.iterate-2.1.9";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/p/plone.app.iterate/${name}.zip";
+ md5 = "db598cfc0986737145ddc7e6b70a1794";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ plone_app_jquery = buildPythonPackage rec {
+ name = "plone.app.jquery-1.4.4";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/p/plone.app.jquery/${name}.zip";
+ md5 = "a12d56f3dfd2ba6840bf21a6bd860b90";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ plone_app_jquerytools = buildPythonPackage rec {
+ name = "plone.app.jquerytools-1.3.2";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/p/plone.app.jquerytools/${name}.zip";
+ md5 = "326470a34e07aa98c40d75ec22484572";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ plone_app_kss = buildPythonPackage rec {
+ name = "plone.app.kss-1.7.1";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/p/plone.app.kss/${name}.zip";
+ md5 = "97a35086fecfe25e55b65042eb35e796";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ plone_app_layout = buildPythonPackage rec {
+ name = "plone.app.layout-2.2.8";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/p/plone.app.layout/${name}.zip";
+ md5 = "90ea408f5e01aeb01517d55eb6b6063a";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ plone_app_linkintegrity = buildPythonPackage rec {
+ name = "plone.app.linkintegrity-1.5.0";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/p/plone.app.linkintegrity/${name}.zip";
+ md5 = "41810cc85ca05921a329aac5bc4cf403";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ plone_app_locales = buildPythonPackage rec {
+ name = "plone.app.locales-4.2.5";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/p/plone.app.locales/${name}.zip";
+ md5 = "baf48a0a5278a18fa1c2848d3470464f";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ plone_app_lockingbehavior = buildPythonPackage rec {
+ name = "plone.app.lockingbehavior-1.0.1";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/p/plone.app.lockingbehavior/${name}.tar.gz";
+ md5 = "a25745f1f40c6298da1b228ccd95ee27";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ plone_app_openid = buildPythonPackage rec {
+ name = "plone.app.openid-2.0.2";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/p/plone.app.openid/${name}.tar.gz";
+ md5 = "ae0748f91cab0612a498926d405d8edd";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ plone_app_portlets = buildPythonPackage rec {
+ name = "plone.app.portlets-2.3.7";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/p/plone.app.portlets/${name}.zip";
+ md5 = "534be67a7a17a71ca1e76f6f149ff2ac";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ plone_app_querystring = buildPythonPackage rec {
+ name = "plone.app.querystring-1.0.7";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/p/plone.app.querystring/${name}.zip";
+ md5 = "b501910b23def9b58e8309d1e469eb6f";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ plone_app_redirector = buildPythonPackage rec {
+ name = "plone.app.redirector-1.1.3";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/p/plone.app.redirector/${name}.zip";
+ md5 = "7d441340a83b8ed72a03bc16148a5f21";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ plone_app_referenceablebehavior = buildPythonPackage rec {
+ name = "plone.app.referenceablebehavior-0.5";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/p/plone.app.referenceablebehavior/${name}.zip";
+ md5 = "2359140966f753204d5091bb49fce85c";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ plone_app_registry = buildPythonPackage rec {
+ name = "plone.app.registry-1.1";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/p/plone.app.registry/${name}.zip";
+ md5 = "0fdbb01e9ff71108f1be262c39b41b81";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ plone_app_relationfield = buildPythonPackage rec {
+ name = "plone.app.relationfield-1.2.0";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/p/plone.app.relationfield/${name}.zip";
+ md5 = "d19888741677cd457ac7f22dde97ded0";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ plone_app_search = buildPythonPackage rec {
+ name = "plone.app.search-1.0.7";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/p/plone.app.search/${name}.zip";
+ md5 = "bd5a1f4b5016a6d0a8697e7a9cc04833";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ plone_app_stagingbehavior = buildPythonPackage rec {
+ name = "plone.app.stagingbehavior-0.1b4";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/p/plone.app.stagingbehavior/${name}.zip";
+ md5 = "0f9589ec056c303ea0c81a804dd411eb";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ plone_app_testing = buildPythonPackage rec {
+ name = "plone.app.testing-4.2.1";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/p/plone.app.testing/${name}.zip";
+ md5 = "1a40df72c8beda9520b83dc449a97a3c";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ plone_app_textfield = buildPythonPackage rec {
+ name = "plone.app.textfield-1.2.2";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/p/plone.app.textfield/${name}.zip";
+ md5 = "f832887a40826d6f68c48b48f071fb9c";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ plone_app_theming = buildPythonPackage rec {
+ name = "plone.app.theming-1.0.4";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/p/plone.app.theming/${name}.zip";
+ md5 = "2da6d810e0d5f295dd0daa2b60731a1b";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ plone_app_upgrade = buildPythonPackage rec {
+ name = "plone.app.upgrade-1.2.4";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/p/plone.app.upgrade/${name}.zip";
+ md5 = "2798dd50863d8c25624400b988a0acdd";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ plone_app_users = buildPythonPackage rec {
+ name = "plone.app.users-1.1.5";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/p/plone.app.users/${name}.zip";
+ md5 = "97895d8dbdf885784be1afbf5b8b364c";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ plone_app_uuid = buildPythonPackage rec {
+ name = "plone.app.uuid-1.0";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/p/plone.app.uuid/${name}.zip";
+ md5 = "9ca8dcfb09a8a0d6bbee0f28073c3d3f";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ plone_app_versioningbehavior = buildPythonPackage rec {
+ name = "plone.app.versioningbehavior-1.1";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/p/plone.app.versioningbehavior/${name}.zip";
+ md5 = "6c153e3fa10b9ffea9742d0dad7b3b85";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ plone_app_viewletmanager = buildPythonPackage rec {
+ name = "plone.app.viewletmanager-2.0.3";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/p/plone.app.viewletmanager/${name}.zip";
+ md5 = "1dbc51c7664ce3e6ca4dcca1b7b86082";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ plone_app_vocabularies = buildPythonPackage rec {
+ name = "plone.app.vocabularies-2.1.9";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/p/plone.app.vocabularies/${name}.zip";
+ md5 = "34d4eb9c95879811fec0875aa3235ed3";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ plone_app_workflow = buildPythonPackage rec {
+ name = "plone.app.workflow-2.0.10";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/p/plone.app.workflow/${name}.zip";
+ md5 = "350ea680ccf7eb9b1598927cafad4f38";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ plone_app_z3cform = buildPythonPackage rec {
+ name = "plone.app.z3cform-0.6.2";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/p/plone.app.z3cform/${name}.zip";
+ md5 = "2e77f5e03d48a6fb2eb9994edb871917";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ plone_autoform = buildPythonPackage rec {
+ name = "plone.autoform-1.3";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/p/plone.autoform/${name}.zip";
+ md5 = "4cb2935ba9cda3eb3ee801ad8cda7c60";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ plone_behavior = buildPythonPackage rec {
+ name = "plone.behavior-1.0.1";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/p/plone.behavior/${name}.zip";
+ md5 = "a18feb9ec744b2a64028c366a8835d59";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ plone_browserlayer = buildPythonPackage rec {
+ name = "plone.browserlayer-2.1.2";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/p/plone.browserlayer/${name}.zip";
+ md5 = "bce02f4907a4f29314090c525e5fc28e";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ plone_cachepurging = buildPythonPackage rec {
+ name = "plone.cachepurging-1.0.4";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/p/plone.cachepurging/${name}.zip";
+ md5 = "886814ac4deef0f1ed99a2eb60864264";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ plone_caching = buildPythonPackage rec {
+ name = "plone.caching-1.0";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/p/plone.caching/${name}.zip";
+ md5 = "2c2e3b27d13b9101c92dfed222fde36c";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ plone_contentrules = buildPythonPackage rec {
+ name = "plone.contentrules-2.0.2";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/p/plone.contentrules/${name}.zip";
+ md5 = "a32370656c4fd58652fcd8a234db69c5";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ plone_dexterity = buildPythonPackage rec {
+ name = "plone.dexterity-1.1.2";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/p/plone.dexterity/${name}.zip";
+ md5 = "c8f495e368ada3a4566d99995d09e64c";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ plone_directives_dexterity = buildPythonPackage rec {
+ name = "plone.directives.dexterity-1.0.2";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/p/plone.directives.dexterity/${name}.zip";
+ md5 = "713b87644e3591b60b4a8ebd52987477";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ plone_directives_form = buildPythonPackage rec {
+ name = "plone.directives.form-1.0";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/p/plone.directives.form/${name}.zip";
+ md5 = "e40a4b3fdde3768a137a450374934565";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ plone_fieldsets = buildPythonPackage rec {
+ name = "plone.fieldsets-2.0.2";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/p/plone.fieldsets/${name}.zip";
+ md5 = "4158c8a1f784fcb5cecbd63deda7222f";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ plone_folder = buildPythonPackage rec {
+ name = "plone.folder-1.0.4";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/p/plone.folder/${name}.zip";
+ md5 = "1674ff18b7a9452d0c2063cf11c679b7";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ plone_formwidget_autocomplete = buildPythonPackage rec {
+ name = "plone.formwidget.autocomplete-1.2.4";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/p/plone.formwidget.autocomplete/${name}.zip";
+ md5 = "06b3bfed9ea51fe2e93827f539fc7f07";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ plone_formwidget_contenttree = buildPythonPackage rec {
+ name = "plone.formwidget.contenttree-1.0.6";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/p/plone.formwidget.contenttree/${name}.zip";
+ md5 = "2ea222d53ca856de7c6df831707f4ac1";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ plone_formwidget_namedfile = buildPythonPackage rec {
+ name = "plone.formwidget.namedfile-1.0.4";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/p/plone.formwidget.namedfile/${name}.zip";
+ md5 = "9274db2f5d7b4d07748fabfd125e49d0";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ plone_i18n = buildPythonPackage rec {
+ name = "plone.i18n-2.0.5";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/p/plone.i18n/${name}.zip";
+ md5 = "ef36aa9a294d507abb37787f9f7700bd";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ plone_indexer = buildPythonPackage rec {
+ name = "plone.indexer-1.0.2";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/p/plone.indexer/${name}.zip";
+ md5 = "538aeee1f9db78bc8c85ae1bcb0153ed";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ plone_intelligenttext = buildPythonPackage rec {
+ name = "plone.intelligenttext-2.0.2";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/p/plone.intelligenttext/${name}.zip";
+ md5 = "51688fa0815b49e00334e3ef948328ba";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ plone_keyring = buildPythonPackage rec {
+ name = "plone.keyring-2.0.1";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/p/plone.keyring/${name}.zip";
+ md5 = "f3970e9bddb2cc65e461a2c62879233f";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ plone_locking = buildPythonPackage rec {
+ name = "plone.locking-2.0.4";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/p/plone.locking/${name}.zip";
+ md5 = "a7f8b8db78f57272d351d7fe0d067eb2";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ plone_memoize = buildPythonPackage rec {
+ name = "plone.memoize-1.1.1";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/p/plone.memoize/${name}.zip";
+ md5 = "d07cd14b976160e1f26a859e3370147e";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ plone_mocktestcase = buildPythonPackage rec {
+ name = "plone.mocktestcase-1.0b3";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/p/plone.mocktestcase/${name}.tar.gz";
+ md5 = "6de66da6d610537d1f5c31e2ab0f36ee";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ plone_namedfile = buildPythonPackage rec {
+ name = "plone.namedfile-1.0.6";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/p/plone.namedfile/${name}.zip";
+ md5 = "06f5bfa7079f889307ac5760e4cb4a7b";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ plone_openid = buildPythonPackage rec {
+ name = "plone.openid-2.0.1";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/p/plone.openid/${name}.zip";
+ md5 = "d4c36926a6dbefed035ed92c29329ce1";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ plone_outputfilters = buildPythonPackage rec {
+ name = "plone.outputfilters-1.8";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/p/plone.outputfilters/${name}.zip";
+ md5 = "a5ef28580f7fa7f2dc1768893995b0f7";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ plone_portlet_collection = buildPythonPackage rec {
+ name = "plone.portlet.collection-2.1.3";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/p/plone.portlet.collection/${name}.zip";
+ md5 = "5f0006dbb3e0b56870383dfdedc49228";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ plone_portlet_static = buildPythonPackage rec {
+ name = "plone.portlet.static-2.0.2";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/p/plone.portlet.static/${name}.zip";
+ md5 = "ec0dc691b4191a41ff97779b117f9985";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ plone_portlets = buildPythonPackage rec {
+ name = "plone.portlets-2.1";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/p/plone.portlets/${name}.zip";
+ md5 = "12b9a33f787756a48617c2d2dd63c538";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ plone_protect = buildPythonPackage rec {
+ name = "plone.protect-2.0.2";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/p/plone.protect/${name}.zip";
+ md5 = "74925ffb08782e72f9b1e850fa78fffa";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ plone_recipe_alltests = buildPythonPackage rec {
+ name = "plone.recipe.alltests-1.2";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/p/plone.recipe.alltests/${name}.zip";
+ md5 = "c4ba0f67a2fdd259bd0e7d946bd35674";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ plone_recipe_zeoserver = buildPythonPackage rec {
+ name = "plone.recipe.zeoserver-1.2.3";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/p/plone.recipe.zeoserver/${name}.zip";
+ md5 = "cd58899a7d534fe2d0ef42990a07c499";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ plone_registry = buildPythonPackage rec {
+ name = "plone.registry-1.0.1";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/p/plone.registry/${name}.zip";
+ md5 = "6be3d2ec7e2d170e29b8c0bc65049aff";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ plone_reload = buildPythonPackage rec {
+ name = "plone.reload-2.0";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/p/plone.reload/${name}.zip";
+ md5 = "49eab593c81b78a9b80d54786aa4ad72";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ plone_resource = buildPythonPackage rec {
+ name = "plone.resource-1.0.2";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/p/plone.resource/${name}.zip";
+ md5 = "594d41e3acd913ae92f2e9ef96503b9f";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ plone_rfc822 = buildPythonPackage rec {
+ name = "plone.rfc822-1.0.1";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/p/plone.rfc822/${name}.zip";
+ md5 = "b5b79bb5a9181da624a7e88940a45424";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ plone_scale = buildPythonPackage rec {
+ name = "plone.scale-1.2.2";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/p/plone.scale/${name}.zip";
+ md5 = "7c59522b4806ee24f5e0a5fa69c523a5";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ plone_schemaeditor = buildPythonPackage rec {
+ name = "plone.schemaeditor-1.2.1";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/p/plone.schemaeditor/${name}.zip";
+ md5 = "0b0fb4b20d9463b3fef82c2079a897d7";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ plone_session = buildPythonPackage rec {
+ name = "plone.session-3.5.2";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/p/plone.session/${name}.zip";
+ md5 = "2f9d3b88e813a47135af56a4da8bbde1";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ plone_stringinterp = buildPythonPackage rec {
+ name = "plone.stringinterp-1.0.7";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/p/plone.stringinterp/${name}.zip";
+ md5 = "81909716210c6ac3fd0ee87f45ea523d";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ plone_subrequest = buildPythonPackage rec {
+ name = "plone.subrequest-1.6.7";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/p/plone.subrequest/${name}.zip";
+ md5 = "cc12f68a22565415b10dbeef0020baa4";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ plone_supermodel = buildPythonPackage rec {
+ name = "plone.supermodel-1.1.4";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/p/plone.supermodel/${name}.zip";
+ md5 = "00b3d723bb1a48116fe3bf8754f17085";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ plone_synchronize = buildPythonPackage rec {
+ name = "plone.synchronize-1.0.1";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/p/plone.synchronize/${name}.zip";
+ md5 = "d25e86ace8daa0816861296c3288c4fb";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ plone_testing = buildPythonPackage rec {
+ name = "plone.testing-4.0.7";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/p/plone.testing/${name}.zip";
+ md5 = "fa40f6d3e3e254409c486c1c2c3e8804";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ plone_theme = buildPythonPackage rec {
+ name = "plone.theme-2.1";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/p/plone.theme/${name}.zip";
+ md5 = "c592d0d095e9fc76cc81597cdf6d0c37";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ plone_transformchain = buildPythonPackage rec {
+ name = "plone.transformchain-1.0.3";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/p/plone.transformchain/${name}.zip";
+ md5 = "f5fb7ca894249e3e666501c4fae52a6c";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ plone_uuid = buildPythonPackage rec {
+ name = "plone.uuid-1.0.3";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/p/plone.uuid/${name}.zip";
+ md5 = "183fe2911a7d6c9f6b3103855e98ad8a";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ plone_z3cform = buildPythonPackage rec {
+ name = "plone.z3cform-0.7.8";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/p/plone.z3cform/${name}.zip";
+ md5 = "da891365156a5d5824d4e504465886a2";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ plonetheme_classic = buildPythonPackage rec {
+ name = "plonetheme.classic-1.2.5";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/p/plonetheme.classic/${name}.zip";
+ md5 = "9dc15871937f9cdf94cdfdb9be77a221";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ plonetheme_sunburst = buildPythonPackage rec {
+ name = "plonetheme.sunburst-1.2.8";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/p/plonetheme.sunburst/${name}.zip";
+ md5 = "be02660c869e04ac8cf6ade3559f2516";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ products_archetypes = buildPythonPackage rec {
+ name = "Products.Archetypes-1.8.6";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/P/Products.Archetypes/${name}.zip";
+ md5 = "74be68879b27228c084a9be869132a98";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ products_atcontenttypes = buildPythonPackage rec {
+ name = "Products.ATContentTypes-2.1.11";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/P/Products.ATContentTypes/${name}.zip";
+ md5 = "abfb5209ffa11dc2c1a15c488e75d89c";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ products_atreferencebrowserwidget = buildPythonPackage rec {
+ name = "Products.ATReferenceBrowserWidget-3.0";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/P/Products.ATReferenceBrowserWidget/${name}.zip";
+ md5 = "157bdd32155c8353450c17c649aad042";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ products_btreefolder2 = buildPythonPackage rec {
+ name = "Products.BTreeFolder2-2.13.3";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/P/Products.BTreeFolder2/${name}.tar.gz";
+ md5 = "f57c85673036af7ccd34c3fa251f6bb2";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ products_cmfactionicons = buildPythonPackage rec {
+ name = "Products.CMFActionIcons-2.1.3";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/P/Products.CMFActionIcons/${name}.tar.gz";
+ md5 = "ab1dc62404ed11aea84dc0d782b2235e";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ propagatedBuildInputs = [ eggtestinfo ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ products_cmfcalendar = buildPythonPackage rec {
+ name = "Products.CMFCalendar-2.2.2";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/P/Products.CMFCalendar/${name}.tar.gz";
+ md5 = "49458e68dc3b6826ea9a3576ac014419";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ propagatedBuildInputs = [ eggtestinfo ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ products_cmfcore = buildPythonPackage rec {
+ name = "Products.CMFCore-2.2.7";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/P/Products.CMFCore/${name}.tar.gz";
+ md5 = "9320a4023b8575097feacfd4a400e930";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ products_cmfdefault = buildPythonPackage rec {
+ name = "Products.CMFDefault-2.2.3";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/P/Products.CMFDefault/${name}.tar.gz";
+ md5 = "fe7d2d3906ee0e3b484e4a02401576ab";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ propagatedBuildInputs = [ eggtestinfo ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ products_cmfdifftool = buildPythonPackage rec {
+ name = "Products.CMFDiffTool-2.0.1";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/P/Products.CMFDiffTool/${name}.zip";
+ md5 = "7b7ed9b8f7b4f438e92e299823f92c86";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ products_cmfdynamicviewfti = buildPythonPackage rec {
+ name = "Products.CMFDynamicViewFTI-4.0.3";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/P/Products.CMFDynamicViewFTI/${name}.zip";
+ md5 = "7d39d416b41b2d93954bc73d9d0e077f";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ products_cmfeditions = buildPythonPackage rec {
+ name = "Products.CMFEditions-2.2.7";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/P/Products.CMFEditions/${name}.zip";
+ md5 = "7dc744b3b896c1b212d9ba37b1752b65";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ products_cmfformcontroller = buildPythonPackage rec {
+ name = "Products.CMFFormController-3.0.3";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/P/Products.CMFFormController/${name}.zip";
+ md5 = "6573df7dcb39e3b63ba22abe2acd639e";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ products_cmfplacefulworkflow = buildPythonPackage rec {
+ name = "Products.CMFPlacefulWorkflow-1.5.9";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/P/Products.CMFPlacefulWorkflow/${name}.zip";
+ md5 = "9041e1f52eab5b348c0dfa85be438722";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ products_cmfplone = buildPythonPackage rec {
+ name = "Products.CMFPlone-4.2.4";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/P/Products.CMFPlone/${name}.zip";
+ md5 = "9c9663cb2b68c07e3d9a2fceaa97eaa1";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ products_cmfquickinstallertool = buildPythonPackage rec {
+ name = "Products.CMFQuickInstallerTool-3.0.6";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/P/Products.CMFQuickInstallerTool/${name}.tar.gz";
+ md5 = "af34adb87ddf2b6da48eff8b70ca2989";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ products_cmftestcase = buildPythonPackage rec {
+ name = "Products.CMFTestCase-0.9.12";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/P/Products.CMFTestCase/${name}.zip";
+ md5 = "fbfdfe7bdb2158419d9899b4ab8c43eb";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ products_cmftopic = buildPythonPackage rec {
+ name = "Products.CMFTopic-2.2.1";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/P/Products.CMFTopic/${name}.tar.gz";
+ md5 = "4abeeaafe6b6b1d2f2936bf5431cccba";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ propagatedBuildInputs = [ eggtestinfo ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ products_cmfuid = buildPythonPackage rec {
+ name = "Products.CMFUid-2.2.1";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/P/Products.CMFUid/${name}.tar.gz";
+ md5 = "e20727959351dffbf0bac80613eee110";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ propagatedBuildInputs = [ eggtestinfo ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ products_contentmigration = buildPythonPackage rec {
+ name = "Products.contentmigration-2.1.2";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/P/Products.contentmigration/${name}.zip";
+ md5 = "1cef33faec03e655b7c52c317db50ed2";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ products_dcworkflow = buildPythonPackage rec {
+ name = "Products.DCWorkflow-2.2.4";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/P/Products.DCWorkflow/${name}.tar.gz";
+ md5 = "c90a16c4f3611015592ba8173a5f1863";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ propagatedBuildInputs = [ eggtestinfo ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ products_extendedpathindex = buildPythonPackage rec {
+ name = "Products.ExtendedPathIndex-3.1";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/P/Products.ExtendedPathIndex/${name}.zip";
+ md5 = "00c048a4b103200bdcbda61fa22c66df";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ products_externaleditor = buildPythonPackage rec {
+ name = "Products.ExternalEditor-1.1.0";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/P/Products.ExternalEditor/${name}.zip";
+ md5 = "475fea6e0b958c0c51cfdbfef2f4e623";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ products_externalmethod = buildPythonPackage rec {
+ name = "Products.ExternalMethod-2.13.0";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/P/Products.ExternalMethod/${name}.zip";
+ md5 = "15ba953ef6cb632eb571977651252ea6";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ products_genericsetup = buildPythonPackage rec {
+ name = "Products.GenericSetup-1.7.3";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/P/Products.GenericSetup/${name}.tar.gz";
+ md5 = "c48967c81c880ed33ee16a14caab3b11";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ products_i18ntestcase = buildPythonPackage rec {
+ name = "Products.i18ntestcase-1.3";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/P/Products.i18ntestcase/${name}.zip";
+ md5 = "f72f72e573975f15adfabfeef34fd721";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ products_kupu = buildPythonPackage rec {
+ name = "Products.kupu-1.5.1";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/P/Products.kupu/${name}.zip";
+ md5 = "b884fcc7f510426974d8d3c4333da4f4";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ products_mailhost = buildPythonPackage rec {
+ name = "Products.MailHost-2.13.1";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/P/Products.MailHost/${name}.zip";
+ md5 = "1102e523435d8bf78a15b9ddb57478e1";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ products_marshall = buildPythonPackage rec {
+ name = "Products.Marshall-2.1.2";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/P/Products.Marshall/${name}.zip";
+ md5 = "bde4d7f75195c1ded8371554b04d2541";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ products_mimetools = buildPythonPackage rec {
+ name = "Products.MIMETools-2.13.0";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/P/Products.MIMETools/${name}.zip";
+ md5 = "ad5372fc1190599a19493db0864448ec";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ products_mimetypesregistry = buildPythonPackage rec {
+ name = "Products.MimetypesRegistry-2.0.4";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/P/Products.MimetypesRegistry/${name}.zip";
+ md5 = "898166bb2aaececc8238ad4ee4826793";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ products_ofsp = buildPythonPackage rec {
+ name = "Products.OFSP-2.13.2";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/P/Products.OFSP/${name}.zip";
+ md5 = "c76d40928753c2ee56db873304e65bd5";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ products_passwordresettool = buildPythonPackage rec {
+ name = "Products.PasswordResetTool-2.0.11";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/P/Products.PasswordResetTool/${name}.zip";
+ md5 = "8dfd65f06c3f4a4b0742d1b44b65f014";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ products_placelesstranslationservice = buildPythonPackage rec {
+ name = "Products.PlacelessTranslationService-2.0.3";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/P/Products.PlacelessTranslationService/${name}.zip";
+ md5 = "a94635eb712563c5a002520713f5d6dc";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ products_plonelanguagetool = buildPythonPackage rec {
+ name = "Products.PloneLanguageTool-3.2.7";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/P/Products.PloneLanguageTool/${name}.zip";
+ md5 = "bd9eb6278bf76e8cbce99437ca362164";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ products_plonepas = buildPythonPackage rec {
+ name = "Products.PlonePAS-4.0.15";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/P/Products.PlonePAS/${name}.zip";
+ md5 = "c19241b558c994ff280a2e1f50aa1f19";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ products_plonetestcase = buildPythonPackage rec {
+ name = "Products.PloneTestCase-0.9.15";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/P/Products.PloneTestCase/${name}.zip";
+ md5 = "ddd5810937919ab5233ebd64893c8bae";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ products_pluggableauthservice = buildPythonPackage rec {
+ name = "Products.PluggableAuthService-1.9.0";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/P/Products.PluggableAuthService/${name}.tar.gz";
+ md5 = "f78f16e46d016c2848bc84254fa66596";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ products_pluginregistry = buildPythonPackage rec {
+ name = "Products.PluginRegistry-1.3";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/P/Products.PluginRegistry/${name}.tar.gz";
+ md5 = "5b166193ca1eb84dfb402051f779ebab";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ products_portaltransforms = buildPythonPackage rec {
+ name = "Products.PortalTransforms-2.1.2";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/P/Products.PortalTransforms/${name}.zip";
+ md5 = "9f429f3c3b9e0019d0f6c9b7a8a9376e";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ products_pythonscripts = buildPythonPackage rec {
+ name = "Products.PythonScripts-2.13.2";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/P/Products.PythonScripts/${name}.zip";
+ md5 = "04c86f2c45a29a162297a80dac61d14f";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ products_resourceregistries = buildPythonPackage rec {
+ name = "Products.ResourceRegistries-2.2.6";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/P/Products.ResourceRegistries/${name}.zip";
+ md5 = "9cf6efbcf2a6510033c06e1d3af94080";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ products_securemailhost = buildPythonPackage rec {
+ name = "Products.SecureMailHost-1.1.2";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/P/Products.SecureMailHost/${name}.zip";
+ md5 = "7db0f1fa867bd0df972082f502a7a707";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ products_standardcachemanagers = buildPythonPackage rec {
+ name = "Products.StandardCacheManagers-2.13.0";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/P/Products.StandardCacheManagers/${name}.zip";
+ md5 = "c5088b2b62bd26d63d9579a04369cb73";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ products_statusmessages = buildPythonPackage rec {
+ name = "Products.statusmessages-4.0";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/P/Products.statusmessages/${name}.zip";
+ md5 = "265324b0a58a032dd0ed038103ed0473";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ products_tinymce = buildPythonPackage rec {
+ name = "Products.TinyMCE-1.2.15";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/P/Products.TinyMCE/${name}.zip";
+ md5 = "108b919bfcff711d2116e41eccbede58";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ products_validation = buildPythonPackage rec {
+ name = "Products.validation-2.0";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/P/Products.validation/${name}.zip";
+ md5 = "afa217e2306637d1dccbebf337caa8bf";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ products_zcatalog = buildPythonPackage rec {
+ name = "Products.ZCatalog-2.13.23";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/P/Products.ZCatalog/${name}.zip";
+ md5 = "d425171516dfc70e543a4e2b852301cb";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ products_zctextindex = buildPythonPackage rec {
+ name = "Products.ZCTextIndex-2.13.4";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/P/Products.ZCTextIndex/${name}.zip";
+ md5 = "8bbfa5fcd3609246990a9314d6f826b4";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ products_zopeversioncontrol = buildPythonPackage rec {
+ name = "Products.ZopeVersionControl-1.1.3";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/P/Products.ZopeVersionControl/${name}.zip";
+ md5 = "238239102f3ac798ee4f4c53343a561f";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ products_zsqlmethods = buildPythonPackage rec {
+ name = "Products.ZSQLMethods-2.13.4";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/P/Products.ZSQLMethods/${name}.zip";
+ md5 = "bd1ad8fd4a9d4f8b4681401dd5b71dc1";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ py = buildPythonPackage rec {
+ name = "py-1.3.4";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/p/py/${name}.tar.gz";
+ md5 = "b64d73a04121c1c4e27c7ec335ef87c8";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ pygments = buildPythonPackage rec {
+ name = "Pygments-1.3.1";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/P/Pygments/${name}.tar.gz";
+ md5 = "54be67c04834f13d7e255e1797d629a5";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ python_dateutil = buildPythonPackage rec {
+ name = "python-dateutil-1.5";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/p/python-dateutil/${name}.tar.gz";
+ md5 = "0dcb1de5e5cad69490a3b6ab63f0cfa5";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ python_gettext = buildPythonPackage rec {
+ name = "python-gettext-1.2";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/p/python-gettext/${name}.zip";
+ md5 = "cd4201d440126d1296d1d2bc2b4795f3";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ python_openid = buildPythonPackage rec {
+ name = "python-openid-2.2.5";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/p/python-openid/${name}.zip";
+ md5 = "f89d9d4f4dccfd33b5ce34eb4725f751";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ pytz = buildPythonPackage rec {
+ name = "pytz-2012c";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/p/pytz/pytz-2012c.tar.gz";
+ md5 = "1aa85f072e3d34ae310665967a0ce053";
+ };
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ record = buildPythonPackage rec {
+ name = "Record-2.13.0";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/R/Record/${name}.zip";
+ md5 = "cfed6a89d4fb2c9cb995e9084c3071b7";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ repoze_retry = buildPythonPackage rec {
+ name = "repoze.retry-1.2";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/r/repoze.retry/${name}.tar.gz";
+ md5 = "55f9dbde5d7f939d93c352fef0f2ce8b";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ repoze_tm2 = buildPythonPackage rec {
+ name = "repoze.tm2-1.0";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/r/repoze.tm2/${name}.tar.gz";
+ md5 = "c645a878874c8876c9c6b3467246afbc";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ repoze_who = buildPythonPackage rec {
+ name = "repoze.who-2.0";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/r/repoze.who/${name}.tar.gz";
+ md5 = "eab01991b6a2979678ce6015815262e2";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ repoze_xmliter = buildPythonPackage rec {
+ name = "repoze.xmliter-0.5";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/r/repoze.xmliter/${name}.zip";
+ md5 = "99da76bcbad6fbaced4a273bde29b10e";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ restrictedpython = buildPythonPackage rec {
+ name = "RestrictedPython-3.6.0";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/R/RestrictedPython/${name}.zip";
+ md5 = "aa75a7dcc7fbc966357837cc66cacec6";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ roman = buildPythonPackage rec {
+ name = "roman-1.4.0";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/r/roman/${name}.tar.gz";
+ md5 = "4f8832ed4108174b159c2afb4bd1d1dd";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ rwproperty = buildPythonPackage rec {
+ name = "rwproperty-1.0";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/r/rwproperty/${name}.tar.gz";
+ md5 = "050bdf066492b3cd82a3399f8efea6b1";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ simplejson = buildPythonPackage rec {
+ name = "simplejson-2.5.2";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/s/simplejson/${name}.tar.gz";
+ md5 = "d7a7acf0bd7681bd116b5c981d2f7959";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ sphinx = buildPythonPackage rec {
+ name = "Sphinx-1.1.3";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/S/Sphinx/${name}.tar.gz";
+ md5 = "8f55a6d4f87fc6d528120c5d1f983e98";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ tempstorage = buildPythonPackage rec {
+ name = "tempstorage-2.12.2";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/t/tempstorage/${name}.zip";
+ md5 = "7a2b76b39839e229249b1bb175604480";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ tl_eggdeps = buildPythonPackage rec {
+ name = "tl.eggdeps-0.4";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/t/tl.eggdeps/${name}.tar.gz";
+ md5 = "2472204a2abd0d8cd4d11ff0fbf36ae7";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ transaction = buildPythonPackage rec {
+ name = "transaction-1.1.1";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/t/transaction/${name}.tar.gz";
+ md5 = "30b062baa34fe1521ad979fb088c8c55";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ unidecode = buildPythonPackage rec {
+ name = "Unidecode-0.04.1";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/U/Unidecode/${name}2.tar.gz";
+ md5 = "351dc98f4512bdd2e93f7a6c498730eb";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ unittest2 = buildPythonPackage rec {
+ name = "unittest2-0.5.1";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/u/unittest2/${name}.tar.gz";
+ md5 = "a0af5cac92bbbfa0c3b0e99571390e0f";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ webob = buildPythonPackage rec {
+ name = "WebOb-1.0.8";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/W/WebOb/${name}.zip";
+ md5 = "9809f9fb64fca8690a7da533fa29a272";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ wicked = buildPythonPackage rec {
+ name = "wicked-1.1.10";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/w/wicked/${name}.zip";
+ md5 = "f65611f11d547d7dc8e623bf87d3929d";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ wsgi_intercept = buildPythonPackage rec {
+ name = "wsgi-intercept-0.4";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/w/wicked/wicked-1.1.10.zip";
+ md5 = "f65611f11d547d7dc8e623bf87d3929d";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ z3c_autoinclude = buildPythonPackage rec {
+ name = "z3c.autoinclude-0.3.4";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/z3c.autoinclude/${name}.zip";
+ md5 = "6a615ae18c12b459bceb3ae28e8e7709";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ z3c_batching = buildPythonPackage rec {
+ name = "z3c.batching-1.1.0";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/z3c.batching/${name}.tar.gz";
+ md5 = "d1dc834781d228127ca6d15301757863";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ z3c_blobfile = buildPythonPackage rec {
+ name = "z3c.blobfile-0.1.5";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/z3c.blobfile/${name}.zip";
+ md5 = "2e806640aa2f3b51e4578f35c44f567a";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ z3c_caching = buildPythonPackage rec {
+ name = "z3c.caching-2.0a1";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/z3c.caching/${name}.tar.gz";
+ md5 = "17f250b5084c2324a7d15c6810ee628e";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ z3c_checkversions = buildPythonPackage rec {
+ name = "z3c.checkversions-0.4.1";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/z3c.checkversions/${name}.tar.gz";
+ md5 = "907f3a28aac04ad98fb3c4c5879a1eaf";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ z3c_coverage = buildPythonPackage rec {
+ name = "z3c.coverage-1.2.0";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/z3c.coverage/${name}.tar.gz";
+ md5 = "d7f323a6c89f848fab38209f2162294d";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ z3c_form = buildPythonPackage rec {
+ name = "z3c.form-2.5.1";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/z3c.form/${name}.tar.gz";
+ md5 = "f029f83dd226f695f55049ed1ecee95e";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ z3c_formwidget_query = buildPythonPackage rec {
+ name = "z3c.formwidget.query-0.9";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/z3c.formwidget.query/${name}.zip";
+ md5 = "d9f7960b1a5a81d8ba5241530f496522";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ z3c_objpath = buildPythonPackage rec {
+ name = "z3c.objpath-1.0";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/z3c.objpath/${name}.tar.gz";
+ md5 = "63641934441b255ebeeaeabc618f01ed";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ z3c_ptcompat = buildPythonPackage rec {
+ name = "z3c.ptcompat-1.0.1";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/z3c.ptcompat/${name}.tar.gz";
+ md5 = "bfe1ba6f9a38679705bd3eb5a5a2d7c4";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ z3c_recipe_compattest = buildPythonPackage rec {
+ name = "z3c.recipe.compattest-0.12.2";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/z3c.recipe.compattest/${name}.tar.gz";
+ md5 = "ed5a1bde7ce384154721913846c736c7";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ z3c_recipe_depgraph = buildPythonPackage rec {
+ name = "z3c.recipe.depgraph-0.5";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/z3c.recipe.depgraph/${name}.zip";
+ md5 = "eb734419815146eb5b7080b5e17346dc";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ z3c_recipe_sphinxdoc = buildPythonPackage rec {
+ name = "z3c.recipe.sphinxdoc-0.0.8";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/z3c.recipe.sphinxdoc/${name}.tar.gz";
+ md5 = "86e6965c919b43fa1de07588580f8790";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ z3c_relationfield = buildPythonPackage rec {
+ name = "z3c.relationfield-0.6.2";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/z3c.relationfield/${name}.zip";
+ md5 = "e34a6230cdfbd4a0bc1c90a77600e0e7";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ z3c_template = buildPythonPackage rec {
+ name = "z3c.template-1.4.1";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/z3c.template/${name}.tar.gz";
+ md5 = "330e2dba8cd064d5790392afd9f460dd";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ z3c_zcmlhook = buildPythonPackage rec {
+ name = "z3c.zcmlhook-1.0b1";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/z3c.zcmlhook/${name}.tar.gz";
+ md5 = "7b6c80146f5930409eb0b355ddf3daeb";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zc_lockfile = buildPythonPackage rec {
+ name = "zc.lockfile-1.0.0";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zc.lockfile/${name}.tar.gz";
+ md5 = "6cf83766ef9935c33e240b0904c7a45e";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zc_recipe_egg = buildPythonPackage rec {
+ name = "zc.recipe.egg-1.3.2";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zc.recipe.egg/${name}.tar.gz";
+ md5 = "1cb6af73f527490dde461d3614a36475";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zc_recipe_testrunner = buildPythonPackage rec {
+ name = "zc.recipe.testrunner-1.2.1";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zc.recipe.testrunner/${name}.tar.gz";
+ md5 = "1be4a1518e5b94890634468118242850";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zc_relation = buildPythonPackage rec {
+ name = "zc.relation-1.0";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zc.relation/${name}.tar.gz";
+ md5 = "7e479095954fc6d8f648951434695837";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zc_resourcelibrary = buildPythonPackage rec {
+ name = "zc.resourcelibrary-1.3.4";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zc.resourcelibrary/${name}.tar.gz";
+ md5 = "bebe49f3e930f896a8ea75531bf3fae8";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zc_sourcefactory = buildPythonPackage rec {
+ name = "zc.sourcefactory-0.7.0";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zc.sourcefactory/${name}.tar.gz";
+ md5 = "532dfd0a72489023268c19e3788b105d";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zconfig = buildPythonPackage rec {
+ name = "ZConfig-2.9.0";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/Z/ZConfig/${name}.zip";
+ md5 = "5c932690a70c8907efd240cdd76a7bc4";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zdaemon = buildPythonPackage rec {
+ name = "zdaemon-2.0.7";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zdaemon/${name}.tar.gz";
+ md5 = "291a875f82e812110557eb6704af8afe";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zexceptions = buildPythonPackage rec {
+ name = "zExceptions-2.13.0";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zExceptions/${name}.zip";
+ md5 = "4c679696c959040d8e656ef85ae40136";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zlog = buildPythonPackage rec {
+ name = "zLOG-2.11.1";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zLOG/${name}.tar.gz";
+ md5 = "68073679aaa79ac5a7b6a5c025467147";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zodb3 = buildPythonPackage rec {
+ name = "ZODB3-3.10.5";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/Z/ZODB3/${name}.tar.gz";
+ md5 = "6f180c6897a1820948fee2a6290503cd";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zodbcode = buildPythonPackage rec {
+ name = "zodbcode-3.4.0";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zodbcode/${name}.tar.gz";
+ md5 = "9b128f89aa2a2117fae4f74757eefeff";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope2 = buildPythonPackage rec {
+ name = "Zope2-2.13.19";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/Z/Zope2/${name}.zip";
+ md5 = "26fee311aace7c12e406543ea91eb42a";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_annotation = buildPythonPackage rec {
+ name = "zope.annotation-3.5.0";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.annotation/${name}.tar.gz";
+ md5 = "4238153279d3f30ab5613438c8e76380";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_app_apidoc = buildPythonPackage rec {
+ name = "zope.app.apidoc-3.7.5";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.app.apidoc/${name}.zip";
+ md5 = "91e969b2d1089bb0a6a303990d269f0a";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_app_applicationcontrol = buildPythonPackage rec {
+ name = "zope.app.applicationcontrol-3.5.10";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.app.applicationcontrol/${name}.tar.gz";
+ md5 = "f785c13698192c83024fda75f1f3d822";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_app_appsetup = buildPythonPackage rec {
+ name = "zope.app.appsetup-3.14.0";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.app.appsetup/${name}.tar.gz";
+ md5 = "2c3da1f514e6793e2bf612cb06ad9076";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_app_authentication = buildPythonPackage rec {
+ name = "zope.app.authentication-3.8.0";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.app.authentication/${name}.tar.gz";
+ md5 = "f8eb74fbdeebfd32c5e15c0f03aa3623";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_app_basicskin = buildPythonPackage rec {
+ name = "zope.app.basicskin-3.5.1";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.app.basicskin/${name}.tar.gz";
+ md5 = "75915a315f336a5b614db67df1093eb3";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_app_broken = buildPythonPackage rec {
+ name = "zope.app.broken-3.6.0";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.app.broken/${name}.tar.gz";
+ md5 = "e6a7efdd1ea1facfd8c5ba4b25d395cb";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_app_cache = buildPythonPackage rec {
+ name = "zope.app.cache-3.7.0";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.app.cache/${name}.zip";
+ md5 = "8dd74574e869ce236ced0de7e349bb5c";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_app_catalog = buildPythonPackage rec {
+ name = "zope.app.catalog-3.8.1";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.app.catalog/${name}.tar.gz";
+ md5 = "1ce21dee4e8256cfe254f8ee24c6ecef";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_app_component = buildPythonPackage rec {
+ name = "zope.app.component-3.9.3";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.app.component/${name}.tar.gz";
+ md5 = "bc2dce245d2afe462529c350956711e0";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_app_container = buildPythonPackage rec {
+ name = "zope.app.container-3.9.2";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.app.container/${name}.tar.gz";
+ md5 = "1e286c59f0166e517d67ddd723641c84";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_app_content = buildPythonPackage rec {
+ name = "zope.app.content-3.5.1";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.app.content/${name}.tar.gz";
+ md5 = "0ac6a6fcb5dd6f845759f998d8e8cbb3";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_app_dav = buildPythonPackage rec {
+ name = "zope.app.dav-3.5.3";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.app.dav/${name}.tar.gz";
+ md5 = "19ec8dc5f7ad21468dea1c46e86d95dd";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_app_debug = buildPythonPackage rec {
+ name = "zope.app.debug-3.4.1";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.app.debug/${name}.tar.gz";
+ md5 = "1a9d349b14d91137b57da52a2b9d185f";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_app_debugskin = buildPythonPackage rec {
+ name = "zope.app.debugskin-3.4.1";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.app.debugskin/${name}.tar.gz";
+ md5 = "bd95d2848aa3108e53717d13b3c0924d";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_app_dependable = buildPythonPackage rec {
+ name = "zope.app.dependable-3.5.1";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.app.dependable/${name}.zip";
+ md5 = "5f180620a880e6ec754e3a34bd110891";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_app_error = buildPythonPackage rec {
+ name = "zope.app.error-3.5.3";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.app.error/${name}.tar.gz";
+ md5 = "bab82dd06233e9b5e34e9709e8993ace";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_app_exception = buildPythonPackage rec {
+ name = "zope.app.exception-3.6.3";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.app.exception/${name}.tar.gz";
+ md5 = "af161d3e7c17db7f56f7816a6f2d980c";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_app_file = buildPythonPackage rec {
+ name = "zope.app.file-3.6.1";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.app.file/${name}.tar.gz";
+ md5 = "fff140c36a2872c85b55433835ac3b98";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_app_folder = buildPythonPackage rec {
+ name = "zope.app.folder-3.5.2";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.app.folder/${name}.tar.gz";
+ md5 = "5ba3a2a7ec527a7eb0cc3c2eb7bb75e9";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_app_form = buildPythonPackage rec {
+ name = "zope.app.form-4.0.2";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.app.form/${name}.tar.gz";
+ md5 = "3d2b164d9d37a71490a024aaeb412e91";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_app_ftp = buildPythonPackage rec {
+ name = "zope.app.ftp-3.5.0";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.app.ftp/${name}.tar.gz";
+ md5 = "b0769f90023156a86cb3f46040e6b5b0";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_app_generations = buildPythonPackage rec {
+ name = "zope.app.generations-3.6.1";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.app.generations/${name}.tar.gz";
+ md5 = "ca74e0f4a01ad8767e1bba6332c39aa2";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_app_http = buildPythonPackage rec {
+ name = "zope.app.http-3.9.0";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.app.http/${name}.tar.gz";
+ md5 = "26f73a3affecefc3aff960cd8b088681";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_app_i18n = buildPythonPackage rec {
+ name = "zope.app.i18n-3.6.3";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.app.i18n/${name}.tar.gz";
+ md5 = "c8573307ba08926214b7944a05e43632";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_app_interface = buildPythonPackage rec {
+ name = "zope.app.interface-3.5.2";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.app.interface/${name}.tar.gz";
+ md5 = "b15522275a435c609bd44f2f019bd13c";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_app_interpreter = buildPythonPackage rec {
+ name = "zope.app.interpreter-3.4.0";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.app.interpreter/${name}.tar.gz";
+ md5 = "fb8a2aa57dcfa3af2f30801dfafc78c4";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_app_intid = buildPythonPackage rec {
+ name = "zope.app.intid-3.7.1";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.app.intid/${name}.tar.gz";
+ md5 = "0d2c1daf5d1d6fd09351b652042a2dac";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_app_keyreference = buildPythonPackage rec {
+ name = "zope.app.keyreference-3.6.1";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.app.keyreference/${name}.tar.gz";
+ md5 = "78539e472016a8ca57b34b6ea0ab7d9d";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_app_locales = buildPythonPackage rec {
+ name = "zope.app.locales-3.6.2";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.app.locales/${name}.tar.gz";
+ md5 = "bd2b4c6040e768f33004b1210d3207fa";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_app_localpermission = buildPythonPackage rec {
+ name = "zope.app.localpermission-3.7.2";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.app.localpermission/${name}.tar.gz";
+ md5 = "121509781b19ce55ebe890fa408702fc";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_app_locking = buildPythonPackage rec {
+ name = "zope.app.locking-3.5.0";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.app.locking/${name}.tar.gz";
+ md5 = "4edce1ba26f6c56b0eb79f703d8a80fe";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_app_onlinehelp = buildPythonPackage rec {
+ name = "zope.app.onlinehelp-3.5.2";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.app.onlinehelp/${name}.tar.gz";
+ md5 = "67d0be66965e34b24ef18c269da62e4c";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_app_pagetemplate = buildPythonPackage rec {
+ name = "zope.app.pagetemplate-3.11.2";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.app.pagetemplate/${name}.tar.gz";
+ md5 = "2d304729c0d6a9ab67dd5ea852f19476";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_app_preference = buildPythonPackage rec {
+ name = "zope.app.preference-3.8.1";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.app.preference/${name}.tar.gz";
+ md5 = "ab6906261854c61ff9f0a13c7612d3e8";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_app_preview = buildPythonPackage rec {
+ name = "zope.app.preview-3.4.0";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.app.preview/${name}.tar.gz";
+ md5 = "e698c10b043fb944150a825af9af536e";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_app_principalannotation = buildPythonPackage rec {
+ name = "zope.app.principalannotation-3.7.0";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.app.principalannotation/${name}.tar.gz";
+ md5 = "29c6bf8e817330b0d29de253686a68f2";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_app_publication = buildPythonPackage rec {
+ name = "zope.app.publication-3.12.0";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.app.publication/${name}.zip";
+ md5 = "d8c521287f52fb9f40fa9b8c2acb4675";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_app_publisher = buildPythonPackage rec {
+ name = "zope.app.publisher-3.10.2";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.app.publisher/${name}.zip";
+ md5 = "66e9110e2967d8d204a65a98e2227404";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_app_renderer = buildPythonPackage rec {
+ name = "zope.app.renderer-3.5.1";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.app.renderer/${name}.tar.gz";
+ md5 = "1cc605baf5dab7db50b0a0fd218566f3";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_app_rotterdam = buildPythonPackage rec {
+ name = "zope.app.rotterdam-3.5.3";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.app.rotterdam/${name}.tar.gz";
+ md5 = "4cb3c53844bc7481f9b7d60f3c5e3a85";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_app_schema = buildPythonPackage rec {
+ name = "zope.app.schema-3.5.0";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.app.schema/${name}.tar.gz";
+ md5 = "92b7c3f4512f3433acc931ecb6ffc936";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_app_security = buildPythonPackage rec {
+ name = "zope.app.security-3.7.5";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.app.security/${name}.tar.gz";
+ md5 = "c7cec00f6d8379b93180faf6ffaa89ea";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_app_securitypolicy = buildPythonPackage rec {
+ name = "zope.app.securitypolicy-3.6.1";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.app.securitypolicy/${name}.tar.gz";
+ md5 = "e3c6ef1db3228dbbb60a452c1a2a8f27";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_app_server = buildPythonPackage rec {
+ name = "zope.app.server-3.6.0";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.app.server/${name}.tar.gz";
+ md5 = "d3a75eaf2a3f4759352dd3243dfb1d50";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_app_session = buildPythonPackage rec {
+ name = "zope.app.session-3.6.2";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.app.session/${name}.tar.gz";
+ md5 = "93467bf6854d714b53e71f36a9d770f3";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_app_skins = buildPythonPackage rec {
+ name = "zope.app.skins-3.4.0";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.app.skins/${name}.tar.gz";
+ md5 = "a0bc210720ee50e40adb93e9c685e884";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_app_testing = buildPythonPackage rec {
+ name = "zope.app.testing-3.7.8";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.app.testing/${name}.tar.gz";
+ md5 = "6fd3eb11e24973a3dbdf5f1ab655c0d4";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_app_tree = buildPythonPackage rec {
+ name = "zope.app.tree-3.6.0";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.app.tree/${name}.tar.gz";
+ md5 = "fbde3403c682bc7cf7b73d43cd2eed3a";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_app_twisted = buildPythonPackage rec {
+ name = "zope.app.twisted-3.5.0";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.app.twisted/${name}.tar.gz";
+ md5 = "9e98868b8be8a0c4f720036366364a67";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_app_undo = buildPythonPackage rec {
+ name = "zope.app.undo-3.5.0";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.app.undo/${name}.tar.gz";
+ md5 = "7a40060aa0451a635a31d6e12d17a82e";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_app_wsgi = buildPythonPackage rec {
+ name = "zope.app.wsgi-3.9.3";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.app.wsgi/${name}.tar.gz";
+ md5 = "9c766908b720d777e02e0b0a9ac8a8a1";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_app_zcmlfiles = buildPythonPackage rec {
+ name = "zope.app.zcmlfiles-3.7.1";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.app.zcmlfiles/${name}.tar.gz";
+ md5 = "0e8991d2bed71ee6b98a2c48d21e1126";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_app_zopeappgenerations = buildPythonPackage rec {
+ name = "zope.app.zopeappgenerations-3.5.1";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.app.zopeappgenerations/${name}.tar.gz";
+ md5 = "4c8a0bc409677f8b17dc57737d41f919";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_app_zptpage = buildPythonPackage rec {
+ name = "zope.app.zptpage-3.5.1";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.app.zptpage/${name}.tar.gz";
+ md5 = "aed8ec49e10911bd1e9d2c9d467fd098";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_applicationcontrol = buildPythonPackage rec {
+ name = "zope.applicationcontrol-3.5.5";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.applicationcontrol/${name}.tar.gz";
+ md5 = "5e4bb54afe55185e15bd9d1ba3750857";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_authentication = buildPythonPackage rec {
+ name = "zope.authentication-3.7.1";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.authentication/${name}.zip";
+ md5 = "7d6bb340610518f2fc71213cfeccda68";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_broken = buildPythonPackage rec {
+ name = "zope.broken-3.6.0";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.broken/${name}.zip";
+ md5 = "eff24d7918099a3e899ee63a9c31bee6";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_browser = buildPythonPackage rec {
+ name = "zope.browser-1.3";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.browser/${name}.zip";
+ md5 = "4ff0ddbf64c45bfcc3189e35f4214ded";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_browsermenu = buildPythonPackage rec {
+ name = "zope.browsermenu-3.9.1";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.browsermenu/${name}.zip";
+ md5 = "a47c7b1e786661c912a1150bf8d1f83f";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_browserpage = buildPythonPackage rec {
+ name = "zope.browserpage-3.12.2";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.browserpage/${name}.tar.gz";
+ md5 = "a543ef3cb1b42f7233b3fca23dc9ea60";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_browserresource = buildPythonPackage rec {
+ name = "zope.browserresource-3.10.3";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.browserresource/${name}.zip";
+ md5 = "dbfde30e82dbfa1a74c5da0cb5a4772d";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_cachedescriptors = buildPythonPackage rec {
+ name = "zope.cachedescriptors-3.5.1";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.cachedescriptors/${name}.zip";
+ md5 = "263459a95238fd61d17e815d97ca49ce";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_catalog = buildPythonPackage rec {
+ name = "zope.catalog-3.8.2";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.catalog/${name}.tar.gz";
+ md5 = "f9baff3997e337f0a23ac158258c8842";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_component = buildPythonPackage rec {
+ name = "zope.component-3.9.5";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.component/${name}.tar.gz";
+ md5 = "22780b445b1b479701c05978055d1c82";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_componentvocabulary = buildPythonPackage rec {
+ name = "zope.componentvocabulary-1.0.1";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.componentvocabulary/${name}.tar.gz";
+ md5 = "1c8fa82ca1ab1f4b0bd2455a31fde22b";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_configuration = buildPythonPackage rec {
+ name = "zope.configuration-3.7.4";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.configuration/${name}.zip";
+ md5 = "5b0271908ef26c05059eda76928896ea";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_container = buildPythonPackage rec {
+ name = "zope.container-3.11.2";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.container/${name}.tar.gz";
+ md5 = "fc66d85a17b8ffb701091c9328983dcc";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_contentprovider = buildPythonPackage rec {
+ name = "zope.contentprovider-3.7.2";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.contentprovider/${name}.tar.gz";
+ md5 = "1bb2132551175c0123f17939a793f812";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_contenttype = buildPythonPackage rec {
+ name = "zope.contenttype-3.5.5";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.contenttype/${name}.zip";
+ md5 = "c6ac80e6887de4108a383f349fbdf332";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_copy = buildPythonPackage rec {
+ name = "zope.copy-3.5.0";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.copy/${name}.tar.gz";
+ md5 = "a9836a5d36cd548be45210eb00407337";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_copypastemove = buildPythonPackage rec {
+ name = "zope.copypastemove-3.7.0";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.copypastemove/${name}.tar.gz";
+ md5 = "f335940686d15cfc5520c42f2494a924";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_datetime = buildPythonPackage rec {
+ name = "zope.datetime-3.4.1";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.datetime/${name}.tar.gz";
+ md5 = "4dde22d34f41a0a4f0c5a345e6d11ee9";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_deferredimport = buildPythonPackage rec {
+ name = "zope.deferredimport-3.5.3";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.deferredimport/${name}.tar.gz";
+ md5 = "68fce3bf4f011d4a840902fd763884ee";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_deprecation = buildPythonPackage rec {
+ name = "zope.deprecation-3.4.1";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.deprecation/${name}.tar.gz";
+ md5 = "8a47b0f8e1fa4e833007e5b8351bb1d4";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_documenttemplate = buildPythonPackage rec {
+ name = "zope.documenttemplate-3.4.3";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.documenttemplate/${name}.tar.gz";
+ md5 = "d5c302534ee0913c39bdc227e1592cb7";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_dottedname = buildPythonPackage rec {
+ name = "zope.dottedname-3.4.6";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.dottedname/${name}.tar.gz";
+ md5 = "62d639f75b31d2d864fe5982cb23959c";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_dublincore = buildPythonPackage rec {
+ name = "zope.dublincore-3.7.0";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.dublincore/${name}.tar.gz";
+ md5 = "2e34e42e454d896feb101ac74af62ded";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_error = buildPythonPackage rec {
+ name = "zope.error-3.7.4";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.error/${name}.tar.gz";
+ md5 = "281445a906458ff5f18f56923699a127";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_event = buildPythonPackage rec {
+ name = "zope.event-3.5.2";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.event/${name}.tar.gz";
+ md5 = "6e8af2a16157a74885d4f0d88137cefb";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_exceptions = buildPythonPackage rec {
+ name = "zope.exceptions-3.6.2";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.exceptions/${name}.tar.gz";
+ md5 = "d7234d99d728abe3d9275346e8d24fd9";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_file = buildPythonPackage rec {
+ name = "zope.file-0.6.1";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.file/${name}.tar.gz";
+ md5 = "5df3b63c678f4b445be345f1dff1bc9b";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_filerepresentation = buildPythonPackage rec {
+ name = "zope.filerepresentation-3.6.1";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.filerepresentation/${name}.tar.gz";
+ md5 = "4a7a434094f4bfa99a7f22e75966c359";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_formlib = buildPythonPackage rec {
+ name = "zope.formlib-4.0.6";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.formlib/${name}.zip";
+ md5 = "eed9c94382d11a4dececd0a48ac1d3f2";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_globalrequest = buildPythonPackage rec {
+ name = "zope.globalrequest-1.0";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.globalrequest/${name}.zip";
+ md5 = "ae6ff02db5ba89c1fb96ed7a73ca1cfa";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_hookable = buildPythonPackage rec {
+ name = "zope.hookable-3.4.1";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.hookable/${name}.tar.gz";
+ md5 = "fe6713aef5b6c0f4963fb984bf326da0";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_html = buildPythonPackage rec {
+ name = "zope.html-2.1.0";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.html/${name}.tar.gz";
+ md5 = "868cb987e400b9a290355a1207d47143";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_i18n = buildPythonPackage rec {
+ name = "zope.i18n-3.7.4";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.i18n/${name}.tar.gz";
+ md5 = "a6fe9d9ad53dd7e94e87cd58fb67d3b7";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_i18nmessageid = buildPythonPackage rec {
+ name = "zope.i18nmessageid-3.5.3";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.i18nmessageid/${name}.tar.gz";
+ md5 = "cb84bf61c2b7353e3b7578057fbaa264";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_index = buildPythonPackage rec {
+ name = "zope.index-3.6.4";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.index/${name}.tar.gz";
+ md5 = "65c34f446f54ffd711e34ede9eb89dad";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_interface = buildPythonPackage rec {
+ name = "zope.interface-3.6.7";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.interface/${name}.zip";
+ md5 = "9df962180fbbb54eb1875cff9fe436e5";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_intid = buildPythonPackage rec {
+ name = "zope.intid-3.7.2";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.intid/${name}.zip";
+ md5 = "241f2fe62fb60f6319d9902b12bc333d";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_keyreference = buildPythonPackage rec {
+ name = "zope.keyreference-3.6.4";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.keyreference/${name}.tar.gz";
+ md5 = "3774c90f236f880547f4c042ee0997e9";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_kgs = buildPythonPackage rec {
+ name = "zope.kgs-1.2.0";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.kgs/${name}.tar.gz";
+ md5 = "15ed01a270bddcf253b1c08479549692";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_lifecycleevent = buildPythonPackage rec {
+ name = "zope.lifecycleevent-3.6.2";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.lifecycleevent/${name}.tar.gz";
+ md5 = "3ba978f3ba7c0805c81c2c79ea3edb33";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_location = buildPythonPackage rec {
+ name = "zope.location-3.9.1";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.location/${name}.tar.gz";
+ md5 = "1684a8f986099d15296f670c58e713d8";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_login = buildPythonPackage rec {
+ name = "zope.login-1.0.0";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.login/${name}.zip";
+ md5 = "4eceb766329125a80aee1b4b4809869a";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_mimetype = buildPythonPackage rec {
+ name = "zope.mimetype-1.3.1";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.mimetype/${name}.tar.gz";
+ md5 = "c865758c896707287f86ba603f06a84b";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_minmax = buildPythonPackage rec {
+ name = "zope.minmax-1.1.2";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.minmax/${name}.tar.gz";
+ md5 = "0c3fbac9623f402ed758dace80080d55";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_mkzeoinstance = buildPythonPackage rec {
+ name = "zope.mkzeoinstance-3.9.5";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.mkzeoinstance/${name}.tar.gz";
+ md5 = "2c2dcf7cc7de58f7d009ca3294f54377";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_modulealias = buildPythonPackage rec {
+ name = "zope.modulealias-3.4.0";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.modulealias/${name}.tar.gz";
+ md5 = "77f4603524b578a5c6b4b4fdde58a484";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_pagetemplate = buildPythonPackage rec {
+ name = "zope.pagetemplate-3.6.3";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.pagetemplate/${name}.zip";
+ md5 = "834a4bf702c05fba1e669677b4dc871f";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_password = buildPythonPackage rec {
+ name = "zope.password-3.6.1";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.password/${name}.tar.gz";
+ md5 = "230f93a79020c8a3dc01d79832546e3c";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_pluggableauth = buildPythonPackage rec {
+ name = "zope.pluggableauth-1.0.3";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.pluggableauth/${name}.tar.gz";
+ md5 = "85d16cb2e5b41bf2a438828857719566";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_preference = buildPythonPackage rec {
+ name = "zope.preference-3.8.0";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.preference/${name}.tar.gz";
+ md5 = "bb8b1c9f65387a51be429407528cc453";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_principalannotation = buildPythonPackage rec {
+ name = "zope.principalannotation-3.6.1";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.principalannotation/${name}.tar.gz";
+ md5 = "652685ca13cefaad78dbc5c6507fc9ab";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_principalregistry = buildPythonPackage rec {
+ name = "zope.principalregistry-3.7.1";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.principalregistry/${name}.tar.gz";
+ md5 = "9b90adc7915d9bbed4237db432fc70c2";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_processlifetime = buildPythonPackage rec {
+ name = "zope.processlifetime-1.0";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.processlifetime/${name}.tar.gz";
+ md5 = "69604bfd668a01ebebdd616a8f26ccfe";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_proxy = buildPythonPackage rec {
+ name = "zope.proxy-3.6.1";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.proxy/${name}.zip";
+ md5 = "a400b0a26624b17fa889dbcaa989d440";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_ptresource = buildPythonPackage rec {
+ name = "zope.ptresource-3.9.0";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.ptresource/${name}.tar.gz";
+ md5 = "f4645e51c15289d3fdfb4139039e18e9";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_publisher = buildPythonPackage rec {
+ name = "zope.publisher-3.12.6";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.publisher/${name}.tar.gz";
+ md5 = "495131970cc7cb14de8e517fb3857ade";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_ramcache = buildPythonPackage rec {
+ name = "zope.ramcache-1.0";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.ramcache/${name}.zip";
+ md5 = "87289e15f0e51f50704adda1557c02a7";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_rdb = buildPythonPackage rec {
+ name = "zope.rdb-3.5.0";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.rdb/${name}.tar.gz";
+ md5 = "2068b469c07c9c0b41392cd9839e3728";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_schema = buildPythonPackage rec {
+ name = "zope.schema-4.2.1";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.schema/${name}.zip";
+ md5 = "bfa0460b68df0dbbf7a5dc793b0eecc6";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_security = buildPythonPackage rec {
+ name = "zope.security-3.7.4";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.security/${name}.tar.gz";
+ md5 = "072ab8d11adc083eace11262da08630c";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_securitypolicy = buildPythonPackage rec {
+ name = "zope.securitypolicy-3.7.0";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.securitypolicy/${name}.tar.gz";
+ md5 = "fe9ba029384c0640b2ba175ba1805cd8";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_sendmail = buildPythonPackage rec {
+ name = "zope.sendmail-3.7.5";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.sendmail/${name}.tar.gz";
+ md5 = "8a513ecf2b41cad849f6607bf16d6818";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_sequencesort = buildPythonPackage rec {
+ name = "zope.sequencesort-3.4.0";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.sequencesort/${name}.tar.gz";
+ md5 = "cfc35fc426a47f5c0ee43c416224b864";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_server = buildPythonPackage rec {
+ name = "zope.server-3.6.3";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.server/${name}.tar.gz";
+ md5 = "2a758720fd6d9bdfb1cea8d644c27923";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_session = buildPythonPackage rec {
+ name = "zope.session-3.9.5";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.session/${name}.tar.gz";
+ md5 = "2934e9f2daa01555e9a7a1f9945c3493";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_site = buildPythonPackage rec {
+ name = "zope.site-3.9.2";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.site/${name}.tar.gz";
+ md5 = "36a0b8dfbd713ed452ce6973ab0a3ddb";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_size = buildPythonPackage rec {
+ name = "zope.size-3.4.1";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.size/${name}.tar.gz";
+ md5 = "55d9084dfd9dcbdb5ad2191ceb5ed03d";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_structuredtext = buildPythonPackage rec {
+ name = "zope.structuredtext-3.5.1";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.structuredtext/${name}.tar.gz";
+ md5 = "eabbfb983485d0879322bc878d2478a0";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_tal = buildPythonPackage rec {
+ name = "zope.tal-3.5.2";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.tal/${name}.zip";
+ md5 = "13869f292ba36b294736b7330b1396fd";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_tales = buildPythonPackage rec {
+ name = "zope.tales-3.5.2";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.tales/${name}.tar.gz";
+ md5 = "1c5060bd766a0a18632b7879fc9e4e1e";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_testbrowser = buildPythonPackage rec {
+ name = "zope.testbrowser-3.11.1";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.testbrowser/${name}.tar.gz";
+ md5 = "64abbee892121e7f1a91aed12cfc155a";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_testing = buildPythonPackage rec {
+ name = "zope.testing-3.9.7";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.testing/${name}.tar.gz";
+ md5 = "8999f3d143d416dc3c8b2a5bd6f33e28";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_thread = buildPythonPackage rec {
+ name = "zope.thread-3.4";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.thread/${name}.tar.gz";
+ md5 = "3567037865b746c933d4af86e5aefa35";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_traversing = buildPythonPackage rec {
+ name = "zope.traversing-3.13.2";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.traversing/${name}.zip";
+ md5 = "eaad8fc7bbef126f9f8616b074ec00aa";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_viewlet = buildPythonPackage rec {
+ name = "zope.viewlet-3.7.2";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.viewlet/${name}.tar.gz";
+ md5 = "367e03096df57e2f9b74fff43f7901f9";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zope_xmlpickle = buildPythonPackage rec {
+ name = "zope.xmlpickle-3.4.0";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/z/zope.xmlpickle/${name}.tar.gz";
+ md5 = "b579f35546b095aec2c890d3f8a46911";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ zopeundo = buildPythonPackage rec {
+ name = "ZopeUndo-2.12.0";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/Z/ZopeUndo/${name}.zip";
+ md5 = "2b8da09d1b98d5558f62e12f6e52c401";
+ };
+
+ # ignore dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ buildInputs = [ pkgs.unzip ];
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+
+ eggtestinfo = buildPythonPackage rec {
+ name = "eggtestinfo-0.3";
+
+ src = fetchurl {
+ url = "http://pypi.python.org/packages/source/e/eggtestinfo/${name}.tar.gz";
+ md5 = "6f0507aee05f00c640c0d64b5073f840";
+ };
+
+ # circular dependencies
+ installCommand = ''
+ easy_install --always-unzip --no-deps --prefix="$out" .
+ '';
+
+ doCheck = false;
+
+ meta = {
+ maintainers = [
+ stdenv.lib.maintainers.chaoflow
+ stdenv.lib.maintainers.garbas
+ stdenv.lib.maintainers.goibhniu
+ ];
+ };
+ };
+
+}; in plone42Packages
+
+# Not Found: ['nt-svcutils', 'PIL', 'wsgi-intercept']
+# Version Error: ['collective.z3cform.datagridfield-demo']
diff --git a/pkgs/games/LambdaHack/default.nix b/pkgs/games/LambdaHack/default.nix
index f7375172f06..48c4809e5cd 100644
--- a/pkgs/games/LambdaHack/default.nix
+++ b/pkgs/games/LambdaHack/default.nix
@@ -1,15 +1,19 @@
-{ cabal, binary, ConfigFile, filepath, gtk, mtl, random, zlib }:
+{ cabal, binary, ConfigFile, filepath, gtk, miniutter, mtl, random
+, text, zlib
+}:
cabal.mkDerivation (self: {
pname = "LambdaHack";
- version = "0.2.1";
- sha256 = "1d2mnpy8fl9m5584rbskgary18mqibivwmlz9gfv87gg0lzhw2ab";
+ version = "0.2.6.5";
+ sha256 = "114s3adqs5mh566dbn0bb20v088wgg8arsm6m8hs9vx8j3jc8nx5";
isLibrary = true;
isExecutable = true;
- buildDepends = [ binary ConfigFile filepath gtk mtl random zlib ];
+ buildDepends = [
+ binary ConfigFile filepath gtk miniutter mtl random text zlib
+ ];
meta = {
homepage = "http://github.com/kosmikus/LambdaHack";
- description = "A roguelike game engine in early and very active development";
+ description = "A roguelike game engine in early and active development";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
diff --git a/pkgs/games/andyetitmoves/default.nix b/pkgs/games/andyetitmoves/default.nix
index 6234d3702f7..cf3f6e1563b 100644
--- a/pkgs/games/andyetitmoves/default.nix
+++ b/pkgs/games/andyetitmoves/default.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
cp -r * $out/opt/andyetitmoves/
fullPath=${stdenv.gcc.gcc}/lib64
- for i in $buildNativeInputs; do
+ for i in $nativeBuildInputs; do
fullPath=$fullPath''${fullPath:+:}$i/lib
done
diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix
new file mode 100644
index 00000000000..d2e438dfa7b
--- /dev/null
+++ b/pkgs/games/anki/default.nix
@@ -0,0 +1,67 @@
+{ stdenv, lib, fetchurl
+, python, pyqt4, pythonPackages
+# This little flag adds a huge number of dependencies, but we assume that
+# everyone wants Anki to draw plots with statistics by default.
+, plotsSupport ? true }:
+
+let
+ py = pythonPackages;
+in
+
+stdenv.mkDerivation rec {
+ name = "anki-2.0.3";
+ src = fetchurl {
+ url = "http://ankisrs.net/download/mirror/${name}.tgz";
+ sha256 = "f40ee4ef29c91101cf9978ce7bd4c513f13ca7c77497a3fb50b8128adf3a5178";
+ };
+
+ pythonPath = [ pyqt4 py.pysqlite py.sqlalchemy ]
+ ++ lib.optional plotsSupport py.matplotlib;
+
+ buildInputs = [ python py.wrapPython ];
+
+ preConfigure = ''
+ substituteInPlace anki \
+ --replace /usr/share/ $out/share/
+
+ substituteInPlace Makefile \
+ --replace PREFIX=/usr PREFIX=$out \
+ --replace /local/bin/ /bin/
+
+ sed -i '/xdg-mime/ d' Makefile
+ '';
+
+ preInstall = ''
+ mkdir -p $out/bin
+ mkdir -p $out/share/pixmaps
+ mkdir -p $out/share/applications
+ mkdir -p $out/share/man/man1
+ '';
+
+ postInstall = ''
+ wrapPythonPrograms
+ '';
+
+ meta = {
+ homepage = http://ankisrs.net/;
+ description = "Spaced repetition flashcard program";
+ # Copy-pasted from the homepage
+ longDescription = ''
+ Anki is a program which makes remembering things easy. Because it is a lot
+ more efficient than traditional study methods, you can either greatly
+ decrease your time spent studying, or greatly increase the amount you learn.
+
+ Anyone who needs to remember things in their daily life can benefit from
+ Anki. Since it is content-agnostic and supports images, audio, videos and
+ scientific markup (via LaTeX), the possibilities are endless. For example:
+
+ * learning a language
+ * studying for medical and law exams
+ * memorizing people's names and faces
+ * brushing up on geography
+ * mastering long poems
+ * even practicing guitar chords!
+ '';
+ license = "GPLv3";
+ };
+}
diff --git a/pkgs/games/bsdgames/default.nix b/pkgs/games/bsdgames/default.nix
index 38a32da9537..59423d7a5a6 100644
--- a/pkgs/games/bsdgames/default.nix
+++ b/pkgs/games/bsdgames/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, ncurses, openssl, flex, bison, miscfiles}:
+{stdenv, fetchurl, ncurses, openssl, flex, bison, less, miscfiles}:
stdenv.mkDerivation {
name = "bsd-games-2.17";
@@ -26,12 +26,19 @@ stdenv.mkDerivation {
bsd_games_cfg_fortune_dir=$out/share/games/fortune
bsd_games_cfg_quiz_dir=$out/share/games/quiz
bsd_games_cfg_gamesdir=$out/bin
+ bsd_games_cfg_sbindir=$out/bin
+ bsd_games_cfg_usrbindir=$out/bin
+ bsd_games_cfg_libexecdir=$out/lib/games/dm
+ bsd_games_cfg_docdir=$out/share/doc/bsd-games
+ bsd_games_cfg_sharedir=$out/share/games
+ bsd_games_cfg_varlibdir=.
bsd_games_cfg_non_interactive=y
bsd_games_cfg_no_build_dirs="dab hack phantasia sail"
bsd_games_cfg_dictionary_src=${miscfiles}/share/dict/words
+ bsd_games_cfg_pager=${less}
EOF
- sed -e s/getline/sdgames_local_getline/g -i $(grep getline -rl .)
+ sed -e s/getline/bsdgames_local_getline/g -i $(grep getline -rl .)
'';
postConfigure = ''
diff --git a/pkgs/games/exult/snapshot.nix b/pkgs/games/exult/snapshot.nix
deleted file mode 100644
index 95643af6a62..00000000000
--- a/pkgs/games/exult/snapshot.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{ stdenv, fetchurl, SDL, SDL_mixer, zlib, libpng, unzip
-, autoconf, automake, libtool, bison, flex
-}:
-
-stdenv.mkDerivation {
- name = "exult-1.4-pre-svn-20080712-0500";
-
- builder = ./builder.sh;
-
- src = fetchurl {
- url = http://www.math.leidenuniv.nl/~wpalenst/cvs/exult-20080712-0500.tar.gz;
- sha256 = "186z8qb713yr1wfasfbpgz2wfqwmbh2d6lmgz1v8lhmwmfpkzgc4";
- };
-
- buildInputs = [
- SDL SDL_mixer zlib libpng unzip
- # The following are only needed because we're building from SVN.
- autoconf automake libtool bison flex
- ];
-
- NIX_CFLAGS_COMPILE = "-I${SDL_mixer}/include/SDL";
-
- preConfigure = ''
- ./autogen.sh
- '';
-
- # 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";
- })
- ];
-
- meta = {
- homepage = http://exult.sourceforge.net/;
- description = "A reimplementation of the Ultima VII game engine (pre-release)";
- };
-}
diff --git a/pkgs/games/freeciv/default.nix b/pkgs/games/freeciv/default.nix
index 7aaf3238308..049f10ad15b 100644
--- a/pkgs/games/freeciv/default.nix
+++ b/pkgs/games/freeciv/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
sha256 = "1n3ak0y9hj9kha0r3cdbi8zb47vrgal1jsbblamqgwwwgzy8cri3";
};
- buildNativeInputs = [ pkgconfig ];
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [ zlib bzip2 ]
++ optionals sdlClient [ SDL SDL_mixer SDL_image SDL_ttf SDL_gfx freetype ]
diff --git a/pkgs/games/fsg/default.nix b/pkgs/games/fsg/default.nix
index ba6b65d602b..7a9dc110540 100644
--- a/pkgs/games/fsg/default.nix
+++ b/pkgs/games/fsg/default.nix
@@ -4,7 +4,8 @@ stdenv.mkDerivation {
name = "fsg-4.4";
src = fetchurl {
- url = http://www.piettes.com/fallingsandgame/fsg-src-4.4.tar.gz;
+ #url = http://www.piettes.com/fallingsandgame/fsg-src-4.4.tar.gz;
+ url = http://www.sourcefiles.org/Games/Simulation/Other/fsg-src-4.4.tar.gz;
sha256 = "1756y01rkvd3f1pkj88jqh83fqcfl2fy0c48mcq53pjzln9ycv8c";
};
@@ -38,7 +39,7 @@ stdenv.mkDerivation {
installPhase = ''
mkdir -p $out/bin $out/libexec
cp sand $out/libexec
- echo -e '#! /bin/sh\nLC_ALL=C '$out'/libexec/sand "$@"' >$out/bin/fsg
+ echo -e '#!${stdenv.shell}\nLC_ALL=C '$out'/libexec/sand "$@"' >$out/bin/fsg
chmod a+x $out/bin/fsg
'';
diff --git a/pkgs/games/gnuchess/default.nix b/pkgs/games/gnuchess/default.nix
index 24556d83148..8a706896ba5 100644
--- a/pkgs/games/gnuchess/default.nix
+++ b/pkgs/games/gnuchess/default.nix
@@ -1,36 +1,29 @@
-{builderDefsPackage, flex} @ x:
-builderDefsPackage
-(a :
-let
- fetchurl = a.fetchurl;
-
- version = a.lib.attrByPath ["version"] "5.07" a;
- buildInputs = with a; [
+{stdenv, fetchurl, flex}:
+let
+ s = # Generated upstream information
+ rec {
+ baseName="gnuchess";
+ version="6.0.2";
+ name="${baseName}-${version}";
+ hash="1xd3g28glz2xyjnca0zfw3k0jl5vhgd7wvy4n9km5wnn9z7287l2";
+ url="http://ftp.gnu.org/gnu/chess/gnuchess-6.0.2.tar.gz";
+ sha256="1xd3g28glz2xyjnca0zfw3k0jl5vhgd7wvy4n9km5wnn9z7287l2";
+ };
+ buildInputs = [
flex
];
in
-rec {
+stdenv.mkDerivation rec {
+ inherit (s) name version;
src = fetchurl {
- url = "mirror://gnu/chess/gnuchess-${version}.tar.gz";
- sha256 = "0zh15m35fzbsrk1aann9pwlkv54dwb00snx99pk3xbg5bwkf125k";
+ inherit (s) url sha256;
};
-
inherit buildInputs;
- configureFlags = [];
-
- /* doConfigure should be removed if not needed */
- phaseNames = ["doConfigure" "preBuild" "doMakeInstall"];
-
- preBuild = a.fullDepEntry (''
- sed -i src/input.c -e 's/static pthread_t/pthread_t/'
- sed -i "s@gnuchess@$out/bin/gnuchess@" -i src/gnuchessx
-
-
- sed -e s/getline/gnuchess_local_getline/g -i $(grep getline -rl .)
- '') ["minInit" "doUnpack"];
-
- name = "gnuchess-" + version;
meta = {
- description = "GNU Chess playing program";
+ inherit (s) version;
+ description = "GNU Chess engine";
+ maintainers = [stdenv.lib.maintainers.raskin];
+ platforms = stdenv.lib.platforms.linux;
+ license = stdenv.lib.licenses.gpl3Plus;
};
-}) x
+}
diff --git a/pkgs/games/gnuchess/default.upstream b/pkgs/games/gnuchess/default.upstream
new file mode 100644
index 00000000000..e1d1d5f2eeb
--- /dev/null
+++ b/pkgs/games/gnuchess/default.upstream
@@ -0,0 +1 @@
+url http://ftp.gnu.org/gnu/chess/
diff --git a/pkgs/games/lincity/ng.nix b/pkgs/games/lincity/ng.nix
new file mode 100644
index 00000000000..4e886466777
--- /dev/null
+++ b/pkgs/games/lincity/ng.nix
@@ -0,0 +1,35 @@
+{stdenv, fetchurl
+, zlib, jam, pkgconfig, gettext, libxml2, libxslt, xproto, libX11, mesa, SDL
+, SDL_mixer, SDL_image, SDL_ttf, SDL_gfx, physfs
+}:
+let s = # Generated upstream information
+ rec {
+ baseName="lincity";
+ version="2.0";
+ name="lincity-2.0";
+ hash="01k6n304qj0z5zmqr49gqirp0jmx2b0cpisgkxk1ga67vyjhdcm6";
+ url="http://download.berlios.de/lincity-ng/lincity-ng-2.0.tar.bz2";
+ sha256="01k6n304qj0z5zmqr49gqirp0jmx2b0cpisgkxk1ga67vyjhdcm6";
+ };
+ buildInputs = [zlib jam pkgconfig gettext libxml2 libxslt xproto libX11 mesa
+ SDL SDL_mixer SDL_image SDL_ttf SDL_gfx physfs];
+in
+stdenv.mkDerivation rec {
+ inherit (s) name version;
+ src = fetchurl {
+ inherit (s) url sha256;
+ };
+
+ inherit buildInputs;
+
+ buildPhase = "jam";
+ installPhase="jam install";
+
+ meta = {
+ documentation = ''City building game'';
+ license = stdenv.lib.licenses.gpl2;
+ platforms = stdenv.lib.platforms.linux;
+ maintainers = [stdenv.lib.maintainers.raskin];
+ inherit (s) version;
+ };
+}
diff --git a/pkgs/games/lincity/ng.upstream b/pkgs/games/lincity/ng.upstream
new file mode 100644
index 00000000000..d73d1a2c419
--- /dev/null
+++ b/pkgs/games/lincity/ng.upstream
@@ -0,0 +1,5 @@
+target ng.nix
+attribute_name lincity_ng
+url https://fedorahosted.org/LinCity-NG/wiki/Downloads
+version_link tar.bz2
+version_link tar.bz2
diff --git a/pkgs/games/minecraft/default.nix b/pkgs/games/minecraft/default.nix
index 3281f07335b..1f80998da92 100644
--- a/pkgs/games/minecraft/default.nix
+++ b/pkgs/games/minecraft/default.nix
@@ -1,12 +1,12 @@
{stdenv, fetchurl, jre, libX11, libXext, libXcursor, libXrandr, libXxf86vm
-, mesa, openal}:
+, mesa, openal, alsaOss }:
stdenv.mkDerivation {
- name = "minecraft-1.3.1";
+ name = "minecraft-1.4.7";
src = fetchurl {
url = "https://s3.amazonaws.com/MinecraftDownload/launcher/minecraft.jar";
- sha256 = "0j8a889w174vwgcxl4yqgp2kbqqha3x505fn7izz38srlx59gnwj";
+ sha256 = "92db974aa759a3f17f3cd61550fa5010e335c57dd813dad9e39b9cc013420a49";
};
phases = "installPhase";
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
# wrapper for minecraft
export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:${jre}/lib/${jre.architecture}/:${libX11}/lib/:${libXext}/lib/:${libXcursor}/lib/:${libXrandr}/lib/:${libXxf86vm}/lib/:${mesa}/lib/:${openal}/lib/
- ${jre}/bin/java -jar $out/minecraft.jar
+ ${alsaOss}/bin/aoss ${jre}/bin/java -jar $out/minecraft.jar
EOF
chmod +x $out/bin/minecraft
diff --git a/pkgs/games/minetest/default.nix b/pkgs/games/minetest/default.nix
new file mode 100644
index 00000000000..3b06cd8694c
--- /dev/null
+++ b/pkgs/games/minetest/default.nix
@@ -0,0 +1,40 @@
+{ stdenv, fetchgit, cmake, irrlicht3843, libpng12, bzip2,
+ libjpeg, libXxf86vm, mesa, openal, libvorbis, x11 }:
+
+let
+ version = "0.4.4";
+ sources = {
+ src = fetchgit {
+ url = "https://github.com/celeron55/minetest.git";
+ rev = "ab06fca4bed26f3dc97d5e5cff437d075d7acff8";
+ };
+ data = fetchgit {
+ url = "https://github.com/celeron55/minetest_game.git";
+ rev = "3928eccf74af0288d12ffb14f8222fae479bc06b";
+ };
+ };
+in stdenv.mkDerivation {
+ name = "minetest-${version}";
+
+ src = sources.src;
+
+ cmakeFlags = [
+ "-DIRRLICHT_INCLUDE_DIR=${irrlicht3843}/include/irrlicht"
+ ];
+
+ buildInputs = [
+ cmake irrlicht3843 libpng12 bzip2 libjpeg
+ libXxf86vm mesa openal libvorbis x11
+ ];
+
+ postInstall = ''
+ mkdir -pv $out/share/minetest/games/minetest_game/
+ cp -rv ${sources.data}/* $out/share/minetest/games/minetest_game/
+ '';
+
+ meta = {
+ homepage = "http://minetest.net/";
+ description = "Minetest is an infinite-world block sandbox game.";
+ license = "LGPLv2.1+";
+ };
+}
diff --git a/pkgs/games/naev/default.nix b/pkgs/games/naev/default.nix
index 36ccbf98274..4516afaef6d 100644
--- a/pkgs/games/naev/default.nix
+++ b/pkgs/games/naev/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
buildInputs = [ SDL SDL_mixer openal libxml2 libvorbis libpng mesa zlib ];
- buildNativeInputs = [ pkgconfig makeWrapper ];
+ nativeBuildInputs = [ pkgconfig makeWrapper ];
NIX_CFLAGS_COMPILE="-include ${zlib}/include/zlib.h";
@@ -36,6 +36,6 @@ stdenv.mkDerivation {
homepage = http://www.naev.org;
license = "GPLv3+";
maintainers = with stdenv.lib.maintainers; [viric];
- platforms = with stdenv.lib.platforms; linux;
+ #platforms = stdenv.lib.platforms.linux;
};
}
diff --git a/pkgs/games/oilrush/default.nix b/pkgs/games/oilrush/default.nix
index 4605f04e3ae..339c3bbd1a8 100644
--- a/pkgs/games/oilrush/default.nix
+++ b/pkgs/games/oilrush/default.nix
@@ -1,11 +1,12 @@
-{ stdenv, getConfig, fetchurl, libX11, libXext, libXinerama, libXrandr
+{ stdenv, config, fetchurl, libX11, libXext, libXinerama, libXrandr
, libXrender, fontconfig, freetype, openal }:
+
stdenv.mkDerivation {
name = "oilrush";
src =
let
- url = getConfig [ "oilrush" "url" ] null;
- sha256 = getConfig [ "oilrush" "sha256" ] null;
+ url = config.oilrush.url or null;
+ sha256 = config.oilrush.sha256 or null;
in
assert url != null && sha256 != null;
fetchurl { inherit url sha256; };
diff --git a/pkgs/games/openttd/default.nix b/pkgs/games/openttd/default.nix
index 66c296b487a..616adf00224 100644
--- a/pkgs/games/openttd/default.nix
+++ b/pkgs/games/openttd/default.nix
@@ -1,22 +1,42 @@
-{stdenv, fetchurl, SDL, libpng, zlib}:
+{stdenv, fetchurl, pkgconfig, SDL, libpng, zlib, xz, freetype, fontconfig}:
stdenv.mkDerivation rec {
name = "openttd-${version}";
- version = "0.6.0";
+ version = "1.2.2";
src = fetchurl {
- url = "mirror://sf/openttd/${name}-source.tar.bz2";
- md5 = "dcf63687c73ff56887049fedaf6c6019";
+ url = "http://binaries.openttd.org/releases/${version}/${name}-source.tar.xz";
+ sha256 = "158znfx389bhs9gd2hadnbc2a32z4ma1vz8704cmw9yh0fmhbcap";
};
- buildInputs = [SDL libpng];
+ buildInputs = [SDL libpng pkgconfig xz zlib freetype fontconfig];
prefixKey = "--prefix-dir=";
- configureFlags = "--with-zlib=${zlib}/lib/libz.a";
+
+ configureFlags = ''
+ --with-zlib=${zlib}/lib/libz.a
+ --without-liblzo2
+ '';
+
makeFlags = "INSTALL_PERSONAL_DIR=";
+ postInstall = ''
+ mv $out/games/ $out/bin
+ '';
+
meta = {
description = ''OpenTTD is an open source clone of the Microprose game "Transport Tycoon Deluxe".'';
+ longDescription = ''
+ OpenTTD is a transportation economics simulator. In single player mode,
+ players controll a transportation business, and use rail, road, sea, and air
+ transport to move goods and people around the simulated world.
+
+ In multiplayer networked mode, players may:
+ - play competitively as different businesses
+ - play cooperatively controling the same business
+ - observe as spectators
+ '';
homepage = http://www.openttd.org/;
license = "GPLv2";
+ maintainers = with stdenv.lib.maintainers; [ jcumming ];
};
}
diff --git a/pkgs/games/pingus/default.nix b/pkgs/games/pingus/default.nix
new file mode 100644
index 00000000000..43cdc2031bf
--- /dev/null
+++ b/pkgs/games/pingus/default.nix
@@ -0,0 +1,29 @@
+{stdenv, fetchurl, scons, SDL, SDL_image, boost, libpng, SDL_mixer, pkgconfig
+, mesa}:
+let
+ buildInputs = [scons SDL SDL_image boost libpng SDL_mixer pkgconfig mesa];
+ s = # Generated upstream information
+ rec {
+ baseName="pingus";
+ version="0.7.6";
+ name="pingus-0.7.6";
+ hash="0q34d2k6anzqvb0mf67x85q92lfx9jr71ry13dlp47jx0x9i573m";
+ url="http://pingus.googlecode.com/files/pingus-0.7.6.tar.bz2";
+ sha256="0q34d2k6anzqvb0mf67x85q92lfx9jr71ry13dlp47jx0x9i573m";
+ };
+in
+stdenv.mkDerivation rec {
+ inherit (s) name version;
+ inherit buildInputs;
+ src = fetchurl {
+ inherit (s) url sha256;
+ };
+ makeFlags = '' PREFIX="$(out)" '';
+ meta = {
+ inherit (s) version;
+ description = ''A puzzle game with mechanics similar to Lemmings'';
+ platforms = stdenv.lib.platforms.linux;
+ maintainers = [stdenv.lib.maintainers.raskin];
+ license = stdenv.lib.licenses.gpl3;
+ };
+}
diff --git a/pkgs/games/pingus/default.upstream b/pkgs/games/pingus/default.upstream
new file mode 100644
index 00000000000..6b4eb31aa5f
--- /dev/null
+++ b/pkgs/games/pingus/default.upstream
@@ -0,0 +1 @@
+url http://pingus.seul.org/download.html
diff --git a/pkgs/games/prboom/default.nix b/pkgs/games/prboom/default.nix
index f66e2295a22..95ad53cb1ae 100644
--- a/pkgs/games/prboom/default.nix
+++ b/pkgs/games/prboom/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
buildInputs = [ SDL SDL_mixer SDL_net mesa ];
crossAttrs = {
- propagatedBuildInputs = [ SDL.hostDrv SDL_mixer.hostDrv SDL_net.hostDrv ];
+ propagatedBuildInputs = [ SDL.crossDrv SDL_mixer.crossDrv SDL_net.crossDrv ];
configureFlags = "--disable-gl --disable-cpu-opt --without-x --disable-sdltest
ac_cv_type_uid_t=yes ac_cv_type_gid_t=yes";
diff --git a/pkgs/games/rili/default.nix b/pkgs/games/rili/default.nix
new file mode 100644
index 00000000000..934213279fa
--- /dev/null
+++ b/pkgs/games/rili/default.nix
@@ -0,0 +1,31 @@
+{stdenv, fetchurl, SDL_mixer, SDL, autoconf, automake}:
+
+stdenv.mkDerivation {
+ name = "ri_li-2.0.1";
+
+ src = fetchurl {
+ url = mirror://sourceforge/ri-li/Ri-li-2.0.1.tar.bz2;
+ sha256 = "f71ccc20c37c601358d963e087ac0d524de8c68e96df09c3aac1ae65edd38dbd";
+ };
+
+ patches = [ ./moderinze_cpp.patch ];
+
+ preConfigure = ''
+ export CPPFLAGS="-I${SDL}/include -I${SDL}/include/SDL -I${SDL_mixer}/include"
+ autoreconf -i
+ '';
+
+ buildInputs = [SDL SDL_mixer autoconf automake];
+
+ meta = {
+ homepage = http://ri-li.sourceforge.net;
+ license = "GPL2+";
+ description = "A children's train game";
+ longDescription = ''
+ Ri-li is an arcade game licensed under the GPL (General Public License).
+You drive a toy wood engine in many levels and you must collect all the coaches
+to win.
+ '';
+ maintainers = with stdenv.lib.maintainers; [ jcumming ];
+ };
+}
diff --git a/pkgs/games/rili/moderinze_cpp.patch b/pkgs/games/rili/moderinze_cpp.patch
new file mode 100644
index 00000000000..3d076afb39e
--- /dev/null
+++ b/pkgs/games/rili/moderinze_cpp.patch
@@ -0,0 +1,391 @@
+diff -r -u Ri-li-2.0.1.orig/src/audio.cc Ri-li-2.0.1/src/audio.cc
+--- Ri-li-2.0.1.orig/src/audio.cc 2012-01-22 00:40:56.928609371 -0800
++++ Ri-li-2.0.1/src/audio.cc 2012-01-22 00:28:33.360636539 -0800
+@@ -22,8 +22,8 @@
+ // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+ #include
+-#include
+-#include
++#include
++#include
+
+ #include "audio.h"
+ #include "utils.h"
+@@ -57,7 +57,7 @@
+ char PathFile[512];
+
+ if(Mix_OpenAudio(22050,AUDIO_S16,1,1024)) {
+- cerr <<"Enable to init Sound card ! "<
++#include
+ #include
+ #include
+ #include
+diff -r -u Ri-li-2.0.1.orig/src/editeur.cc Ri-li-2.0.1/src/editeur.cc
+--- Ri-li-2.0.1.orig/src/editeur.cc 2007-11-02 04:48:17.000000000 -0700
++++ Ri-li-2.0.1/src/editeur.cc 2012-01-22 00:28:59.632635579 -0800
+@@ -25,10 +25,10 @@
+ #include
+ #endif
+
+-#include
++#include
+ #include
+ #include
+-#include
++#include
+ #include
+ #include
+
+@@ -374,7 +374,7 @@
+
+ // Sauve le niveau
+ if(Niveau.Save()==false) {
+- cerr <<"ERREUR Saving levels!"<
+ #endif
+
+-#include
++#include
+ #include
+ #include
+-#include
++#include
+ #include
+ #include
+
+diff -r -u Ri-li-2.0.1.orig/src/loco.cc Ri-li-2.0.1/src/loco.cc
+--- Ri-li-2.0.1.orig/src/loco.cc 2007-11-02 04:48:18.000000000 -0700
++++ Ri-li-2.0.1/src/loco.cc 2012-01-22 00:14:17.878797797 -0800
+@@ -21,10 +21,10 @@
+ // with this program; if not, write to the Free Software Foundation, Inc.,
+ // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+-#include
++#include
+ #include
+ #include
+-#include
++#include
+ #include
+ #include "preference.h"
+ #include "loco.h"
+diff -r -u Ri-li-2.0.1.orig/src/main.cc Ri-li-2.0.1/src/main.cc
+--- Ri-li-2.0.1.orig/src/main.cc 2007-11-02 04:48:19.000000000 -0700
++++ Ri-li-2.0.1/src/main.cc 2012-01-22 00:29:40.080634136 -0800
+@@ -23,8 +23,8 @@
+
+ #include
+ #include
+-#include
+-#include
++#include
++#include
+ #include
+ #include
+
+@@ -115,7 +115,7 @@
+
+ // Initilise SDL
+ if( SDL_Init(SDL_INIT_VIDEO|SDL_INIT_TIMER|SDL_INIT_AUDIO|SDL_INIT_NOPARACHUTE) < 0 ) {
+- cerr <<"Impossible d'initialiser SDL:"<vfmt->BitsPerPixel==8) {
+- cerr <<"Impossible d'utiliser 8bits pour la vido !"<vfmt->BitsPerPixel,vOption);
+
+ if(sdlVideo==NULL) {
+- cerr <<"Impossible de passer dans le mode vido 800x600 !"<
++#include
+ #include
+ #include
+-#include
++#include
+ #include "preference.h"
+ #include "menu.h"
+ #include "sprite.h"
+@@ -92,7 +92,7 @@
+ // Teste la resolution video
+ sdlVideoInfo=(SDL_VideoInfo*)SDL_GetVideoInfo();
+ if(sdlVideoInfo->vfmt->BitsPerPixel==8) {
+- cerr <<"Impossible d'utiliser 8bits pour la vido !"<vfmt->BitsPerPixel,vOption);
+ if(sdlVideo==NULL) {
+- cerr <<"Impossible de passer dans le mode vido 800x600 !"<
++#include
+ #include
+ #include "mouse.h"
+ #include "preference.h"
+diff -r -u Ri-li-2.0.1.orig/src/sprite.cc Ri-li-2.0.1/src/sprite.cc
+--- Ri-li-2.0.1.orig/src/sprite.cc 2007-11-02 04:48:20.000000000 -0700
++++ Ri-li-2.0.1/src/sprite.cc 2012-01-22 00:30:43.640631779 -0800
+@@ -21,10 +21,10 @@
+ // with this program; if not, write to the Free Software Foundation, Inc.,
+ // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+-#include
++#include
+ #include
+ #include
+-#include
++#include
+ #include
+ #include "sprite.h"
+ #include "preference.h"
+@@ -84,7 +84,7 @@
+ strcpy(PathFile,Langue[Pref.Langue]);
+ GetPath(PathFile);
+ if(FileExiste(PathFile)==false) {
+- cerr <<"Impossible de trouver "<
++#include
+ #include
+ #include
+ #include "preference.h"
+diff -r -u Ri-li-2.0.1.orig/src/utils.cc Ri-li-2.0.1/src/utils.cc
+--- Ri-li-2.0.1.orig/src/utils.cc 2007-11-02 04:48:22.000000000 -0700
++++ Ri-li-2.0.1/src/utils.cc 2012-01-22 00:31:30.944630051 -0800
+@@ -21,10 +21,10 @@
+ // with this program; if not, write to the Free Software Foundation, Inc.,
+ // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+-#include
++#include
+ #include
+ #include
+-#include
++#include
+
+ #ifdef WINDOWS
+ #include
+@@ -77,7 +77,7 @@
+
+ file=fopen(Path,"r");
+ if(!file) {
+- cerr <<"ERREUR: Impossible d'ouvrir '"<1024) {
+ AfficheChargeur();
+ if( fread(Po,1,1024,file) != 1024 ) {
+- cerr <<"ERREUR de lecture du fichier '"<512) {
+ if( fwrite(Buf,1,512,file) != 512 ) {
+- cerr <<"ERREUR d'ecriture du fichier '"<0) {
+ if( fwrite(Buf,1,(size_t)L,file) != (size_t)L ) {
+- cerr <<"ERREUR d'ecriture du fichier '"< config.default
- installPhase = ''
- # Erase the source distribution object definitions, will be replaced with langtab.
- rm -r simutrans
+ # Different default data dir
+ sed -i -e 's:argv\[0\]:"'$out'/share/simutrans/":' \
+ simmain.cc
- # Default pakset and binary release core objects.
- unzip ${pak64}
- unzip ${langtab}
+ # Use ~/.simutrans instead of ~/simutrans ##not working
+ #sed -i -e 's@%s/simutrans@%s/.simutrans@' simsys_s.cc
- mv sim simutrans/
-
- mkdir -p $out/simutrans
- cp -r simutrans $out
-
- mkdir -p $out/bin
- ln -s $out/simutrans/sim $out/bin/simutrans
- '';
-
- meta = {
- description = "Simutrans is a simulation game in which the player strives to run a successful transport system.";
- longDescription = ''
- Simutrans is a cross-platform simulation game in which the
- player strives to run a successful transport system by
- transporting goods, passengers, and mail between
- places. Simutrans is an open source remake of Transport Tycoon.
+ # No optimization overriding
+ sed -i -e '/-O$/d' Makefile
'';
- homepage = http://www.simutrans.com/;
- license = "Artistic";
- maintainers = [ stdenv.lib.maintainers.kkallio ];
- platforms = stdenv.lib.platforms.linux;
+ installPhase = ''
+ mkdir -p $out/share/
+ mv simutrans $out/share/
+
+ mkdir -p $out/bin/
+ mv build/default/sim $out/bin/simutrans
+ '';
+
+ meta = {
+ description = "A simulation game in which the player strives to run a successful transport system";
+ longDescription = ''
+ Simutrans is a cross-platform simulation game in which the
+ player strives to run a successful transport system by
+ transporting goods, passengers, and mail between
+ places. Simutrans is an open source remake of Transport Tycoon.
+ '';
+
+ homepage = http://www.simutrans.com/;
+ license = "Artistic";
+ maintainers = [ stdenv.lib.maintainers.kkallio ];
+ platforms = stdenv.lib.platforms.linux;
+ };
};
-}
+
+in result
diff --git a/pkgs/games/six/default.nix b/pkgs/games/six/default.nix
deleted file mode 100644
index a95ed6c50c6..00000000000
--- a/pkgs/games/six/default.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ stdenv, fetchurl, arts, kdelibs, libX11, libXext, libXt, perl, qt3, zlib }:
-
-let
-
- versionNumber = "0.5.3";
-
-in
-
-stdenv.mkDerivation {
-
- name = "six-${versionNumber}";
-
- src = fetchurl {
- url = "http://six.retes.hu/download/six-${versionNumber}.tar.gz";
- sha256 = "0hialm0kxr11rp5z452whjmxp2vaqqj668d0dfs32fd10ggi8wj4";
- };
-
- meta = {
- description = "Six - A Hex playing program for KDE";
- homepage = http://six.retes.hu/;
- license = "GPLv2";
- platforms = stdenv.lib.platforms.linux;
- };
-
- buildInputs = [ arts kdelibs libX11 libXext libXt perl qt3 zlib ];
-
- # Supress some warnings which are less useful to us when making packages.
- NIX_CFLAGS_COMPILE = "-Wno-conversion -Wno-parentheses";
-
- # Without "--x-libraries=", we get the error
- # "impure path `/usr/lib' used in link".
- configureFlags = "--x-libraries=";
-
- patches = [ ./gcc43-includes.patch ];
-}
diff --git a/pkgs/games/six/gcc43-includes.patch b/pkgs/games/six/gcc43-includes.patch
deleted file mode 100644
index 83096bb0da2..00000000000
--- a/pkgs/games/six/gcc43-includes.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-This patch makes six compile with gcc 4.3 by including more header files. It
-is based on the advice at .
-
---- a/six/carrier.h
-+++ b/six/carrier.h
-@@ -2,6 +2,7 @@
- #ifndef CARRIER_H
- #define CARRIER_H
-
-+#include
- #include
- #include
-
-diff --git a/six/hexgame.cpp b/six/hexgame.cpp
-index 720e977..5d0dafe 100644
---- a/six/hexgame.cpp
-+++ b/six/hexgame.cpp
-@@ -3,6 +3,7 @@
- #include
- #include
- #include
-+#include
-
- #include
-
-diff --git a/six/main.cpp b/six/main.cpp
-index 7fb5c21..b925a0c 100644
---- a/six/main.cpp
-+++ b/six/main.cpp
-@@ -4,6 +4,8 @@
- #include "carrier.h"
- #include "misc.h"
-
-+#include
-+
- #include
- #include
- #include
diff --git a/pkgs/games/spring/default.nix b/pkgs/games/spring/default.nix
index 09eb41f7267..3cb79e94631 100644
--- a/pkgs/games/spring/default.nix
+++ b/pkgs/games/spring/default.nix
@@ -6,11 +6,11 @@
stdenv.mkDerivation rec {
name = "spring-${version}";
- version = "0.88.0";
+ version = "0.91.0";
src = fetchurl {
- url = "mirror://sourceforge/springrts/spring_88.0_src.tar.lzma";
- sha256 = "f203114b849a83795fe2d413d01c843b6f5b50df0832ce570bc476502f89e6fa";
+ url = "mirror://sourceforge/springrts/spring_91.0_src.tar.lzma";
+ sha256 = "0ycn9yxpbw58a8p3j3wf3r0x102k665l27bfp1vxq7kpwlk6314l";
};
buildInputs = [ cmake lzma boost libdevil zlib p7zip openal libvorbis freetype SDL
diff --git a/pkgs/games/stuntrally/default.nix b/pkgs/games/stuntrally/default.nix
index 69609b1bbfb..31fd25a5150 100644
--- a/pkgs/games/stuntrally/default.nix
+++ b/pkgs/games/stuntrally/default.nix
@@ -1,15 +1,33 @@
-{ fetchurl, stdenv, cmake, boost, ogre, myguiSvn, ois, SDL, libvorbis, pkgconfig
-, makeWrapper }:
+{ fetchgit, stdenv, cmake, boost, ogre, mygui, ois, SDL, libvorbis, pkgconfig
+, makeWrapper, enet, libXcursor }:
stdenv.mkDerivation rec {
- name = "stunt-rally-1.4";
+ name = "stunt-rally-1.8";
- src = fetchurl {
- url = mirror://sourceforge/stuntrally/StuntRally-1.4-sources.tar.bz2;
- sha256 = "1am5af4l1qliyrq1183sqvwzqwcjx0v6gkzsxhfmk6ygp7yhw7kq";
+ src = fetchgit {
+ url = git://github.com/stuntrally/stuntrally.git;
+ rev = "refs/tags/1.8";
+ sha256 = "0p8p83xx8q33kymsqnmxqca4jdfyg9rwrsac790z56gdbc7gnahm";
};
- buildInputs = [ cmake boost ogre myguiSvn ois SDL libvorbis pkgconfig makeWrapper ];
+ tracks = fetchgit {
+ url = git://github.com/stuntrally/tracks.git;
+ rev = "refs/tags/1.8";
+ sha256 = "1gcrs21nn0v3hvhrw8dc0wh1knn5qh66cjx7a1igiciiadmi2s3l";
+ };
+
+ patchPhase = ''
+ sed -i 's/materials/materials material_templates/' data/CMakeLists.txt
+ '';
+
+ preConfigure = ''
+ mkdir data/tracks
+ cp -R $tracks/* data/tracks
+ '';
+
+ buildInputs = [ cmake boost ogre mygui ois SDL libvorbis pkgconfig makeWrapper enet
+ libXcursor
+ ];
# I think they suppose cmake should give them OGRE_PLUGIN_DIR defined, but
# the cmake code I saw is not ready for that. Therefore, we use the env var.
diff --git a/pkgs/games/super-tux-kart/default.nix b/pkgs/games/super-tux-kart/default.nix
index 0c92ffbcdbb..46f22d332cc 100644
--- a/pkgs/games/super-tux-kart/default.nix
+++ b/pkgs/games/super-tux-kart/default.nix
@@ -1,24 +1,27 @@
-{ fetchurl, stdenv, plib, SDL, openal, freealut, mesa
-, libvorbis, libogg, gettext, irrlicht3843, libXxf86vm, curl, pkgconfig
-, fribidi }:
+{ fetchurl, cmake, stdenv, plib, SDL, openal, freealut, mesa
+, libvorbis, libogg, gettext, libXxf86vm, curl, pkgconfig
+, fribidi, autoconf, automake, libtool }:
stdenv.mkDerivation rec {
- name = "supertuxkart-0.7.3";
+ name = "supertuxkart-0.8";
src = fetchurl {
url = "mirror://sourceforge/supertuxkart/${name}-src.tar.bz2";
- sha256 = "0njrs2qyhbiqdbsqk9jx0sl8nhdwmipf1i91k23rv1biwrim9yq7";
+ sha256 = "12sbml4wxg2x2wgnnkxfisj96a9gcsaj3fj27kdk8yj524ikv7xr";
};
buildInputs = [
- plib SDL openal freealut mesa libvorbis libogg gettext irrlicht3843
- libXxf86vm curl pkgconfig fribidi
+ plib SDL openal freealut mesa libvorbis libogg gettext
+ libXxf86vm curl pkgconfig fribidi autoconf automake libtool cmake
];
- configureFlags = [ "--with-irrlicht=${irrlicht3843}" ];
+ enableParallelBuilding = true;
- postInstall = ''
- mv $out/games $out/bin
+ preConfigure = ''
+ echo Building internal Irrlicht
+ cd lib/irrlicht/source/Irrlicht/
+ NDEBUG=1 make ''${enableParallelBuilding:+-j''${NIX_BUILD_CORES} -l''${NIX_BUILD_CORES}}
+ cd -
'';
meta = {
diff --git a/pkgs/games/the-butterfly-effect/default.nix b/pkgs/games/the-butterfly-effect/default.nix
index 5fc5e9be84e..979fcd1a48c 100644
--- a/pkgs/games/the-butterfly-effect/default.nix
+++ b/pkgs/games/the-butterfly-effect/default.nix
@@ -41,7 +41,7 @@ rec {
mkdir -p "$out/share/tbe"
cp -r . "$out/share/tbe/build-dir"
mkdir -p "$out/bin"
- echo '#! /bin/sh' >> "$out/bin/tbe"
+ echo '#!${a.stdenv.shell}' >> "$out/bin/tbe"
echo "$out/share/tbe/build-dir/tbe \"\$@\"" >> "$out/bin/tbe"
chmod a+x "$out/bin/tbe"
'' ["minInit" "doMake" "defEnsureDir"];
diff --git a/pkgs/games/torcs/default.nix b/pkgs/games/torcs/default.nix
index cf740def511..f5b713ae337 100644
--- a/pkgs/games/torcs/default.nix
+++ b/pkgs/games/torcs/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
buildInputs = [ mesa freeglut libX11 plib openal freealut libXrandr xproto
libXext libSM libICE libXi libXt libXrender libXxf86vm libpng zlib libvorbis ];
- buildNativeInputs = [ bash ];
+ nativeBuildInputs = [ bash ];
installTargets = "install datainstall";
@@ -26,6 +26,6 @@ stdenv.mkDerivation rec {
homepage = http://torcs.sourceforge.net/;
license = "GPLv2+";
maintainers = with stdenv.lib.maintainers; [viric];
- platforms = with stdenv.lib.platforms; linux;
+ #platforms = with stdenv.lib.platforms; linux;
};
}
diff --git a/pkgs/games/ufoai/default.nix b/pkgs/games/ufoai/default.nix
index 85440f88901..80f3d72c579 100644
--- a/pkgs/games/ufoai/default.nix
+++ b/pkgs/games/ufoai/default.nix
@@ -1,51 +1,33 @@
-{stdenv, fetchurl, SDL, mesa, SDL_image, SDL_ttf, SDL_mixer, libpng, libjpeg, zlib
-, curl, libvorbis, libtheora, xvidcore, pkgconfig, gtk, glib, libxml2, gtksourceview
-, gtkglext, openal, gettext, p7zip }:
+{ stdenv, fetchurl, libtheora, xvidcore, mesa, SDL, SDL_ttf, SDL_mixer
+, curl, libjpeg, libpng, gettext, cunit, enableEditor?false }:
stdenv.mkDerivation rec {
- name = "ufoai-2.3";
+ name = "ufoai-2.4";
src = fetchurl {
- url = mirror://sourceforge/ufoai/ufoai-2.3-source.tar.bz2;
- sha256 = "1pb41q5wx180l6xv8gm1sw8b7cji42znnb6qpjaap6vpgc8k3hp9";
+ url = "mirror://sourceforge/ufoai/${name}-source.tar.bz2";
+ sha256 = "0kxrbcjrharcwz319s90m789i4my9285ihp5ax6kfhgif2vn2ji5";
};
srcData = fetchurl {
- url = mirror://sourceforge/ufoai/ufoai-2.3-data.tar;
- sha256 = "0952kx6cbi4y89fbz1ig32rvsmfhzqpvdf79rq4axag9d3i5qlqf";
+ url = "mirror://sourceforge/ufoai/${name}-data.tar";
+ sha256 = "1drhh08cqqkwv1yz3z4ngkplr23pqqrdx6cp8c3isy320gy25cvb";
};
- srcI18n = fetchurl {
- url = mirror://sourceforge/ufoai/ufoai-2.3-i18n.tar.bz2;
- sha256 = "14fzv8a4xng6kfl6aw8yzz6vl2j5vryxija5b2yz75jbfpa94i09";
- };
+ preConfigure = ''tar xvf "${srcData}"'';
- # for the xvidcore static lib
- NIX_CFLAGS_COMPILE = "-pthread -lm";
+ configureFlags = [ "--enable-release" "--enable-sse" ]
+ ++ stdenv.lib.optional enableEditor "--enable-uforadiant";
- # Order is important, x libs include a libpng version that fails for ufoai
- buildInputs = [ libpng SDL mesa SDL_image SDL_ttf SDL_mixer libjpeg zlib curl libvorbis
- libtheora xvidcore pkgconfig glib gtk gtkglext gtksourceview libxml2 openal gettext
- p7zip ];
+ buildInputs = [
+ libtheora xvidcore mesa SDL SDL_ttf SDL_mixer
+ curl libjpeg libpng gettext cunit
+ ];
- enableParallelBuilding = true;
-
- preConfigure = ''
- tar xvf $srcI18n
- '';
-
- configureFlags = "--enable-release";
-
- postInstall = ''
- pushd $out/share/ufoai
- tar xvf $srcData
- popd
- '';
-
- installTargets = "install_exec";
+ NIX_CFLAGS_LINK = "-lgcc_s"; # to avoid occasional runtime error in finding libgcc_s.so.1
meta = {
- homepage = http://www.ultimatestunts.nl/;
- description = "Squad-based tactical strategy game in the tradition of X-Com";
+ homepage = http://ufoai.org;
+ description = "A squad-based tactical strategy game in the tradition of X-Com";
license = "GPLv2+";
maintainers = with stdenv.lib.maintainers; [viric];
platforms = with stdenv.lib.platforms; linux;
diff --git a/pkgs/games/uqm/default.nix b/pkgs/games/uqm/default.nix
new file mode 100644
index 00000000000..a9fe9d596c7
--- /dev/null
+++ b/pkgs/games/uqm/default.nix
@@ -0,0 +1,78 @@
+{stdenv, fetchurl
+, pkgconfig, mesa
+, SDL, SDL_image, libpng, zlib, libvorbis, libogg, libmikmod, unzip
+}:
+
+stdenv.mkDerivation rec {
+ name = "uqm-${version}";
+ version = "0.7.0";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/sc2/uqm-${version}-source.tgz";
+ sha256 = "a3695c5f7f0be7ec9c0f80ec569907b382023a1fee6e635532bd53b7b53bb221";
+ };
+
+ content = fetchurl {
+ url = "mirror://sourceforge/sc2/uqm-${version}-content.uqm";
+ sha256 = "b8f6db8ba29f0628fb1d5c233830896b19f441aee3744bda671ea264b44da3bf";
+ };
+
+ voice = fetchurl {
+ url = "mirror://sourceforge/sc2/uqm-${version}-voice.uqm";
+ sha256 = "bcccf801b4ba37594ff6217b292744ea586ee2d447e927804842ccae8b73c979";
+ };
+
+ music = fetchurl {
+ url = "mirror://sourceforge/sc2/uqm-${version}-3domusic.uqm";
+ sha256 = "c57085e64dad4bddf8a679a9aa2adf63f2156d5f6cbabe63af80519033dbcb82";
+ };
+
+
+ /* uses pthread_cancel(), which requires libgcc_s.so.1 to be
+ loadable at run-time. Adding the flag below ensures that the
+ library can be found. Obviously, though, this is a hack. */
+ NIX_LDFLAGS="-lgcc_s";
+
+ buildInputs = [SDL SDL_image libpng libvorbis libogg libmikmod unzip pkgconfig mesa];
+
+ postUnpack = ''
+ mkdir -p uqm-${version}/content/packages
+ mkdir -p uqm-${version}/content/addons
+ cp $content uqm-${version}/content/packages/uqm-0.7.0-content.uqm
+ cp $music uqm-${version}/content/addons/uqm-0.7.0-3domusic.uqm
+ cp $voice uqm-${version}/content/addons/uqm-0.7.0-voice.uqm
+ '';
+
+ /* uqm has a 'unique' build system with a root script incidentally called
+ * 'build.sh'. */
+
+ configurePhase = ''
+ echo "INPUT_install_prefix_VALUE='$out'" >> config.state
+ echo "INPUT_install_bindir_VALUE='$out/bin'" >> config.state
+ echo "INPUT_install_libdir_VALUE='$out/lib'" >> config.state
+ echo "INPUT_install_sharedir_VALUE='$out/share'" >> config.state
+ PREFIX=$out ./build.sh uqm config
+ '';
+
+ buildPhase = ''
+ ./build.sh uqm
+ '';
+
+ installPhase = ''
+ ./build.sh uqm install
+ sed -i $out/bin/uqm -e "s%/usr/local/games/%$out%g"
+ '';
+
+ meta = {
+ description = "Remake of Star Control II";
+ longDescription = ''
+ The goals for the The Ur-Quan Masters project are:
+ - to bring Star Control II to modern platforms, thereby making a lot of people happy
+ - to make game translations easy, thereby making even more people happy
+ - 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";
+ maintainers = with stdenv.lib.maintainers; [ jcumming ];
+ };
+}
diff --git a/pkgs/games/urbanterror/default.nix b/pkgs/games/urbanterror/default.nix
index 875dfc93bb1..535e575fdc4 100644
--- a/pkgs/games/urbanterror/default.nix
+++ b/pkgs/games/urbanterror/default.nix
@@ -1,72 +1,49 @@
{ stdenv, fetchurl, unzip, SDL, mesa, openal, curl }:
stdenv.mkDerivation rec {
name = "urbanterror-${version}";
- version = "4.1";
- src1 = fetchurl {
- url = "http://ftp.snt.utwente.nl/pub/games/urbanterror/UrbanTerror_41_FULL.zip";
- sha256 = "0pr6xpwq8zllc0xsdxl8cfd0zz5fhggw5fsbrizygr6hhdvra1jp";
- };
- src2 = fetchurl {
- url = "http://ftp.snt.utwente.nl/pub/games/urbanterror/iourbanterror/source/complete/ioUrbanTerrorSource_2007_12_20.zip";
- sha256 = "1s1wq9m7shhvvk7s4400yrmz7dys501i4c9ln1mglc9dhmi8dmcn";
- };
+ version = "4.2.009";
+ srcs =
+ [ (fetchurl {
+ url = "http://download.urbanterror.info/urt/42/zips/UrbanTerror42_full_009.zip";
+ sha256 = "0m423zy6l1z4kxz55knlh1ypnqq58ghh08i8ziv4lm00ygm6mx2i";
+ })
+ (fetchurl {
+ url = "https://github.com/Barbatos/ioq3-for-UrbanTerror-4/archive/release-4.2.007.tar.gz";
+ sha256 = "1299j0i94697m2bbcgraxfbb7q1g6nc43l1xqlgqvcsjp799mwwn";
+ })
+ ];
buildInputs = [ unzip SDL mesa openal curl ];
- unpackPhase = ''
- mkdir urbanterror
- cd urbanterror
- unzip $src1
- unzip $src2
- '';
- patches = [ ./l_script.patch ];
- patchPhase = ''
- for d in ioUrbanTerrorClientSource ioUrbanTerrorServerSource
- do
- cd "$d"
- patch -p 0 < "''${patches[0]}"
- cd ..
- done
- '';
+ sourceRoot = "ioq3-for-UrbanTerror-4-release-4.2.007";
configurePhase = ''
- cd ioUrbanTerrorClientSource
echo "USE_OPENAL = 1" > Makefile.local
echo "USE_OPENAL_DLOPEN = 0" >> Makefile.local
echo "USE_CURL = 1" >> Makefile.local
echo "USE_CURL_DLOPEN = 0" >> Makefile.local
- substituteInPlace code/tools/asm/Makefile --replace -Werror ""
- cd ..
- '';
- buildPhase = ''
- for d in ioUrbanTerrorClientSource ioUrbanTerrorServerSource
- do
- cd $d
- make
- cd ..
- done
'';
installPhase = ''
destDir="$out/opt/urbanterror"
mkdir -p "$destDir"
mkdir -p "$out/bin"
- cp -v ioUrbanTerrorClientSource/build/release-linux-*/ioUrbanTerror.* \
- "$destDir/ioUrbanTerror"
- cp -v ioUrbanTerrorServerSource/build/release-linux-*/ioUrTded.* \
- "$destDir/ioUrTded"
- cp -rv UrbanTerror/q3ut4 "$destDir"
+ cp -v build/release-linux-*/Quake3-UrT.* \
+ "$destDir/Quake3-UrT"
+ cp -v build/release-linux-*/Quake3-UrT-Ded.* \
+ "$destDir/Quake3-UrT-Ded"
+ cp -rv ../UrbanTerror42/q3ut4 "$destDir"
cat << EOF > "$out/bin/urbanterror"
- #!/bin/sh
+ #! ${stdenv.shell}
cd "$destDir"
- exec ./ioUrbanTerror "\$@"
+ exec ./Quake3-UrT "\$@"
EOF
chmod +x "$out/bin/urbanterror"
cat << EOF > "$out/bin/urbanterror-ded"
- #!/bin/sh
+ #! ${stdenv.shell}
cd "$destDir"
- exec ./ioUrTded "\$@"
+ exec ./Quake3-UrT-Ded "\$@"
EOF
chmod +x "$out/bin/urbanterror-ded"
'';
postFixup = ''
- p=$out/opt/urbanterror/ioUrbanTerror
+ p=$out/opt/urbanterror/Quake3-UrT
cur_rpath=$(patchelf --print-rpath $p)
patchelf --set-rpath $cur_rpath:${mesa}/lib $p
'';
@@ -82,6 +59,6 @@ stdenv.mkDerivation rec {
homepage = http://www.urbanterror.net;
license = [ "unfree-redistributable" ];
maintainers = with stdenv.lib.maintainers; [ astsmtl ];
- platforms = with stdenv.lib.platforms; linux;
+ #platforms = stdenv.lib.platforms.linux;
};
}
diff --git a/pkgs/games/urbanterror/l_script.patch b/pkgs/games/urbanterror/l_script.patch
deleted file mode 100644
index 8aa176cca8c..00000000000
--- a/pkgs/games/urbanterror/l_script.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ur code/botlib/l_script.c kode/botlib/l_script.c
---- code/botlib/l_script.c 2007-10-09 02:47:26.000000000 +0400
-+++ kode/botlib/l_script.c 2012-04-16 02:02:55.170360236 +0400
-@@ -1118,7 +1118,7 @@
- {
- if (*string == '\"')
- {
-- strcpy(string, string+1);
-+ memmove(string, string+1, strlen(string) - 1);
- } //end if
- if (string[strlen(string)-1] == '\"')
- {
-@@ -1135,7 +1135,7 @@
- {
- if (*string == '\'')
- {
-- strcpy(string, string+1);
-+ memmove(string, string+1, strlen(string) - 1);
- } //end if
- if (string[strlen(string)-1] == '\'')
- {
diff --git a/pkgs/games/vessel/default.nix b/pkgs/games/vessel/default.nix
new file mode 100644
index 00000000000..e6f3523fa24
--- /dev/null
+++ b/pkgs/games/vessel/default.nix
@@ -0,0 +1,84 @@
+{ stdenv, requireFile, SDL, pulseaudio, alsaLib }:
+
+stdenv.mkDerivation rec {
+ name = "vessel-12082012";
+
+ goBuyItNow = ''
+ We cannot download the full version automatically, as you require a license.
+ Once you bought a license, you need to add your downloaded version to the nix store.
+ You can do this by using "nix-prefetch-url file://${name}-bin" in the
+ directory where you saved it.
+ '';
+
+ src = if (stdenv.isi686) then
+ requireFile {
+ message = goBuyItNow;
+ name = "${name}-bin";
+ sha256 = "1vpwcrjiln2mx43h7ib3jnccyr3chk7a5x2bw9kb4lw8ycygvg96";
+ } else throw "unsupported platform ${stdenv.s:ystem} only i686-linux supported for now.";
+
+ phases = "installPhase";
+ ld_preload = ./isatty.c;
+
+ libPath = stdenv.lib.makeLibraryPath [ stdenv.gcc.gcc stdenv.gcc.libc ]
+ + ":" + stdenv.lib.makeLibraryPath [ SDL pulseaudio alsaLib ] ;
+
+ installPhase = ''
+ ensureDir $out/libexec/strangeloop/vessel/
+ ensureDir $out/bin
+
+ # allow scripting of the mojoinstaller
+ gcc -fPIC -shared -o isatty.so $ld_preload
+
+ echo @@@
+ echo @@@ this next step appears to hang for a while
+ echo @@@
+
+ # if we call ld.so $(bin) we don't need to set the ELF interpreter, and save a patchelf step.
+ LD_PRELOAD=./isatty.so $(cat $NIX_GCC/nix-support/dynamic-linker) $src << IM_A_BOT
+ n
+ $out/libexec/strangeloop/vessel/
+ IM_A_BOT
+
+ # use nix SDL libraries
+ rm $out/libexec/strangeloop/vessel/x86/libSDL*
+ rm $out/libexec/strangeloop/vessel/x86/libstdc++*
+
+ # props to Ethan Lee (the Vessel porter) for understanding
+ # how $ORIGIN works in rpath. There is hope for humanity.
+ patchelf \
+ --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
+ --set-rpath $libPath:$out/libexec/strangeloop/vessel/x86/ \
+ $out/libexec/strangeloop/vessel/x86/vessel.x86
+
+ # we need to libs to find their deps
+ for lib in $out/libexec/strangeloop/vessel/x86/lib* ; do
+ patchelf \
+ --set-rpath $libPath:$out/libexec/strangeloop/vessel/x86/ \
+ $lib
+ done
+
+ cat > $out/bin/Vessel << EOW
+ #!/bin/sh
+ cd $out/libexec/strangeloop/vessel/
+ exec ./x86/vessel.x86
+ EOW
+
+ chmod +x $out/bin/Vessel
+ '';
+
+ meta = {
+ description = "A fluid physics based puzzle game";
+ longDescription = ''
+ Living liquid machines have overrun this world of unstoppable progress,
+ and it is the role of their inventor, Arkwright, to stop the chaos they are
+ causing. Vessel is a game about a man with the power to bring ordinary matter
+ to life, and all the consequences that ensue.
+ '';
+ homepage = http://www.strangeloopgames.com;
+ license = [ "unfree" ];
+ maintainers = with stdenv.lib.maintainers; [ jcumming ];
+ platforms = [ "i686-linux"] ;
+ };
+
+}
diff --git a/pkgs/games/vessel/isatty.c b/pkgs/games/vessel/isatty.c
new file mode 100644
index 00000000000..38ee2b6ce2e
--- /dev/null
+++ b/pkgs/games/vessel/isatty.c
@@ -0,0 +1,6 @@
+// We override isatty to help 'automate' installers.
+
+// Some installers (mojoinstall) have a stdio GUI that refuses to run if you
+// feed it a file on stdin. This should help that.
+
+int isatty(int fd) { return 1; }
diff --git a/pkgs/games/warsow/default.nix b/pkgs/games/warsow/default.nix
index c584319bdc9..aeb7e37cd7e 100644
--- a/pkgs/games/warsow/default.nix
+++ b/pkgs/games/warsow/default.nix
@@ -1,43 +1,45 @@
-{ stdenv, fetchurl, unzip, pkgconfig, zlib, curl, libjpeg, libvorbis
-, libXxf86dga, libXxf86vm, libXinerama, SDL, mesa, openal
+{ stdenv, fetchurl, unzip, pkgconfig, zlib, curl, libjpeg, libpng, libvorbis
+, libtheora, libXxf86dga, libXxf86vm, libXinerama, SDL, mesa, openal, freetype
+, makeWrapper
}:
stdenv.mkDerivation rec {
name = "warsow-${version}";
- version = "0.62";
- mversion = "0.61"; # sometimes only engine is updated
+ version = "1.03";
+ mversion = "1.02"; # sometimes only engine is updated
src1 = fetchurl {
- url = "http://www.zcdn.org/dl/warsow_${version}_sdk.zip";
- sha256 = "0nb1z55lzmwarnn71dcyg9b3k7r7wxagqxks8a7rnlq7acsnra71";
+ url = "http://www.warsow.net:1337/~warsow/${version}/warsow_${version}_sdk.tar.gz";
+ sha256 = "0z6r5v30p8fxbszmkxssv5fnnjw7w5wfn7wfgbwvmy87ayi7mkcq";
};
src2 = fetchurl {
- url = "http://www.zcdn.org/dl/warsow_${mversion}_unified.zip";
- sha256 = "1b5bv4dsly7i7c4fqlkckv4da1knxl9m3kg8nlgkgr8waczgvazv";
+ url = "http://www.warsow.net:1337/~warsow/${mversion}/warsow_${mversion}.tar.gz";
+ sha256 = "0ai5v1h5g9nq21ixz23v0qsj9dr7dbiz7l8r34mq4c3z6ili8zpy";
};
unpackPhase = ''
- mkdir warsow_${version}_sdk
+ tar xf "$src1"
cd warsow_${version}_sdk
- unzip $src1
- unzip $src2
+ tar xf "$src2"
mkdir -p source/release/
- mv warsow_${mversion}_unified/basewsw source/release/
+ mv warsow_${mversion}/basewsw source/release/
cd source
'';
patchPhase = ''
substituteInPlace snd_openal/snd_main.c --replace libopenal.so.1 ${openal}/lib/libopenal.so.1
'';
- buildInputs = [ unzip pkgconfig zlib curl libjpeg libvorbis libXxf86dga
- libXxf86vm libXinerama SDL mesa openal ];
+ buildInputs = [ unzip pkgconfig zlib curl libjpeg libpng libvorbis libtheora
+ libXxf86dga libXxf86vm libXinerama SDL mesa openal makeWrapper
+ ];
installPhase = ''
dest=$out/opt/warsow
cd release
- for f in warsow wsw_server wswtv_server; do
- substituteInPlace $f --replace BINARY_DIR= BINARY_DIR=$dest
- done
mkdir -p $dest
mkdir -p $out/bin
- cp -v {warsow,wsw_server,wswtv_server}.* $dest
+ cp -v {warsow,wsw_server,wswtv_server}* $dest
cp -rv basewsw libs $dest
- cp -v warsow wsw_server wswtv_server $out/bin
+ # Since 1.03 some modules are _always_ downloaded from server, thus
+ makeWrapper $dest/warsow $out/bin/warsow \
+ --suffix-each LD_LIBRARY_PATH ':' "${freetype}/lib"
+ makeWrapper $dest/wsw_server $out/bin/wsw_server
+ makeWrapper $dest/wswtv_server $out/bin/wswtv_server
'';
postFixup = ''
p=$out/opt/warsow/warsow.*
diff --git a/pkgs/games/wesnoth/default.nix b/pkgs/games/wesnoth/default.nix
index 2bac3cba198..b8e53b0cefb 100644
--- a/pkgs/games/wesnoth/default.nix
+++ b/pkgs/games/wesnoth/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "wesnoth";
- version = "1.10.2";
+ version = "1.10.5";
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://sourceforge/sourceforge/${pname}/${name}.tar.bz2";
- sha256 = "0hawzq85sq0kdddj0s7y6kpx043g1hsl7cvyw1xcxqh45hkgw2ix";
+ sha256 = "1rvlr8c3vzhgd33vzc1hfhiil6d7hc3px8r8p79vmp3kwi3d49zn";
};
buildInputs = [ SDL SDL_image SDL_mixer SDL_net SDL_ttf pango gettext zlib boost fribidi
diff --git a/pkgs/games/widelands/boost_and_cmake_die_die_die.patch b/pkgs/games/widelands/boost_and_cmake_die_die_die.patch
new file mode 100644
index 00000000000..f008be35e37
--- /dev/null
+++ b/pkgs/games/widelands/boost_and_cmake_die_die_die.patch
@@ -0,0 +1,11 @@
+--- widelands-build17-src.old/CMakeLists.txt 2012-04-23 02:46:49.000000000 -0700
++++ widelands-build17-src/CMakeLists.txt 2012-07-14 19:49:14.000000000 -0700
+@@ -140,8 +140,6 @@
+ else (WL_UNIT_TESTS)
+ message(STATUS "Disabled Unit Tests")
+ set (Boost_FIND_COMPONENTS signals)
+- set (Boost_USE_STATIC_LIBS ON)
+- set (Boost_USE_MULTITHREADED ON)
+ set (Boost_DETAILED_FAILURE_MSG ON)
+ find_package(Boost 1.35.0 COMPONENTS signals REQUIRED)
+ endif (WL_UNIT_TESTS)
diff --git a/pkgs/games/widelands/default.nix b/pkgs/games/widelands/default.nix
index 74d1f87e0be..e20adc8faa7 100644
--- a/pkgs/games/widelands/default.nix
+++ b/pkgs/games/widelands/default.nix
@@ -13,11 +13,11 @@ let
(builtins.attrNames (builtins.removeAttrs x helperArgNames));
sourceInfo = rec {
baseName="widelands";
- version="build16";
+ version="build17";
name="${baseName}-${version}";
project="${baseName}";
- url="http://launchpad.net/${project}/${version}/${version}/+download/${name}-src.tar.bz2";
- hash="0pb2d73c6hynhp1x54rcfbibrrri7lyxjybd1hicn503qcakrnyq";
+ url="https://launchpadlibrarian.net/102893896/widelands-build17-src.tar.bz2";
+ hash="be48b3b8f342a537b39a3aec2f7702250a6a47e427188ba3bece67d7d90f3cc5";
};
in
rec {
@@ -30,7 +30,9 @@ rec {
inherit buildInputs;
/* doConfigure should be removed if not needed */
- phaseNames = ["killBuildDir" "doCmake" "doMakeInstall" "createScript"];
+ phaseNames = ["killBuildDir" "doPatch" "doCmake" "doMakeInstall" "createScript"];
+
+ patches = [ ./boost_and_cmake_die_die_die.patch ];
killBuildDir = a.fullDepEntry ''
rm -r build
@@ -38,6 +40,7 @@ rec {
cmakeFlags = [
"-DLUA_LIBRARIES=-llua"
+ "-DWL_PORTABLE=true"
];
createScript = a.fullDepEntry ''
@@ -50,12 +53,18 @@ rec {
meta = {
description = "Widelands RTS with multiple-goods economy";
+ longDescription = ''
+ Widelands is a real time strategy game based on "The Settlers" and "The
+ Settlers II". It has a single player campaign mode, as well as a networked
+ multiplayer mode.
+ '';
+
maintainers = with a.lib.maintainers;
[
raskin
+ jcumming
];
- platforms = with a.lib.platforms;
- linux;
+ #platforms = a.lib.platforms.linux;
license = a.lib.licenses.gpl2Plus;
};
passthru = {
diff --git a/pkgs/games/worldofgoo/default.nix b/pkgs/games/worldofgoo/default.nix
new file mode 100644
index 00000000000..216ec0d8041
--- /dev/null
+++ b/pkgs/games/worldofgoo/default.nix
@@ -0,0 +1,83 @@
+{ stdenv, config, requireFile, fetchurl
+, libX11, libXext, libXau, libxcb, libXdmcp , SDL, SDL_mixer, libvorbis, mesa
+, demo ? false }:
+
+# TODO: add i686 support
+
+stdenv.mkDerivation rec {
+ name = if demo
+ then "WorldOfGooDemo-1.41"
+ else "WorldofGoo-1.41";
+
+ arch = if stdenv.system == "x86_64-linux" then "supported"
+ else throw "Sorry. World of Goo only is only supported on x86_64 now.";
+
+ goBuyItNow = ''
+ We cannot download the full version automatically, as you require a license.
+ Once you bought a license, you need to add your downloaded version to the nix store.
+ You can do this by using "nix-prefetch-url file://WorldOfGooSetup.1.41.tar.gz" in the
+ directory where you saved it.
+
+ Or you can install the demo version: 'nix-env -i -A pkgs.worldofgoo_demo'.
+ '';
+
+ getTheDemo = ''
+ We cannot download the demo version automatically, please go to
+ http://worldofgoo.com/dl2.php?lk=demo, then add it to your nix store.
+ You can do this by using "nix-prefetch-url file://WorldOfGooDemo.1.41.tar.gz" in the
+ directory where you saved it.
+ '';
+
+ src = if demo
+ then
+ requireFile {
+ message = getTheDemo;
+ name = "WorldOfGooDemo.1.41.tar.gz";
+ sha256 = "0ndcix1ckvcj47sgndncr3hxjcg402cbd8r16rhq4cc43ibbaxri";
+ }
+ else
+ requireFile {
+ message = goBuyItNow;
+ name = "WorldOfGooSetup.1.41.tar.gz";
+ sha256 = "0rj5asx4a2x41ncwdby26762my1lk1gaqar2rl8dijfnpq8qlnk7";
+ };
+
+ phases = "unpackPhase installPhase";
+
+ # XXX: stdenv.lib.makeLibraryPath doesn't pick up /lib64
+ libPath = stdenv.lib.makeLibraryPath [ stdenv.gcc.gcc stdenv.gcc.libc ]
+ + ":" + stdenv.lib.makeLibraryPath [libX11 libXext libXau libxcb libXdmcp SDL SDL_mixer libvorbis mesa ]
+ + ":" + stdenv.gcc.gcc + "/lib64";
+
+ installPhase = ''
+ ensureDir $out/libexec/2dboy/WorldOfGoo/
+ ensureDir $out/bin
+
+ patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" --set-rpath $libPath ./WorldOfGoo.bin64
+
+ cp -r * $out/libexec/2dboy/WorldOfGoo/
+
+ #makeWrapper doesn't do cd. :(
+
+ cat > $out/bin/WorldofGoo << EOF
+ #!/bin/sh
+ cd $out/libexec/2dboy/WorldOfGoo
+ exec ./WorldOfGoo.bin64
+ EOF
+ chmod +x $out/bin/WorldofGoo
+ '';
+
+ meta = {
+ description = "A physics based puzzle game";
+ longDescription = ''
+ World of Goo is a physics based puzzle / construction game. The millions of Goo
+ Balls who live in the beautiful World of Goo don't know that they are in a
+ game, or that they are extremely delicious.
+ '';
+ homepage = http://worldofgoo.com;
+ license = [ "unfree" ];
+ maintainers = with stdenv.lib.maintainers; [ jcumming ];
+ platforms = [ "x86_64-linux"] ;
+ };
+
+}
diff --git a/pkgs/games/xboard/default.nix b/pkgs/games/xboard/default.nix
index a1a65165326..ab74d56dbcc 100644
--- a/pkgs/games/xboard/default.nix
+++ b/pkgs/games/xboard/default.nix
@@ -1,33 +1,32 @@
-a:
-let
- fetchurl = a.fetchurl;
-
- buildInputs = with a; [
+{stdenv, fetchurl, libX11, xproto, libXt, libXaw, libSM, libICE, libXmu
+, libXext, gnuchess, texinfo, libXpm
+}:
+let
+ s = # Generated upstream information
+ rec {
+ baseName="xboard";
+ version="4.6.2";
+ name="${baseName}-${version}";
+ hash="1pw90fh1crf0nkqyql54z728vn2093hwdh2v5i5703z9qv9g4mrf";
+ url="http://ftp.gnu.org/gnu/xboard/xboard-4.6.2.tar.gz";
+ sha256="1pw90fh1crf0nkqyql54z728vn2093hwdh2v5i5703z9qv9g4mrf";
+ };
+ buildInputs = [
libX11 xproto libXt libXaw libSM libICE libXmu
libXext gnuchess texinfo libXpm
];
-
- s = import ./src-for-default.nix;
in
-rec {
- src = fetchurl {
- inherit(s) url;
- sha256 = s.hash;
- };
-
+stdenv.mkDerivation {
+ inherit (s) name version;
inherit buildInputs;
- configureFlags = [];
-
- /* doConfigure should be removed if not needed */
- phaseNames = ["doConfigure" "preBuild" "doMakeInstall"];
-
- preBuild = a.fullDepEntry(''
- sed -e '/FIRST_CHESS_PROGRAM/s@gnuchessx@${a.gnuchess}/bin/gnuchessx@' -i xboard.h
- sed -e '/SECOND_CHESS_PROGRAM/s@gnuchessx@${a.gnuchess}/bin/gnuchessx@' -i xboard.h
- '') ["doUnpack" "minInit"];
-
- inherit(s) name;
+ src = fetchurl {
+ inherit (s) url sha256;
+ };
meta = {
- description = "XBoard - a chess board compatible with GNU Chess";
+ inherit (s) version;
+ description = ''GUI for chess engines'';
+ maintainers = [stdenv.lib.maintainers.raskin];
+ platforms = stdenv.lib.platforms.linux;
+ license = stdenv.lib.licenses.gpl3Plus;
};
}
diff --git a/pkgs/games/xboard/default.upstream b/pkgs/games/xboard/default.upstream
new file mode 100644
index 00000000000..1e649bba505
--- /dev/null
+++ b/pkgs/games/xboard/default.upstream
@@ -0,0 +1 @@
+url http://ftp.gnu.org/gnu/xboard/
diff --git a/pkgs/games/xboard/src-for-default.nix b/pkgs/games/xboard/src-for-default.nix
deleted file mode 100644
index d648dfe5abb..00000000000
--- a/pkgs/games/xboard/src-for-default.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-rec {
- version="4.4.2";
- name="xboard-4.4.2";
- hash="1ihg39nnwp90w410rzwxj9layadavz08gc9m2b1jg5z5c6ky28zp";
- url="http://ftp.gnu.org/gnu/xboard/xboard-${version}.tar.gz";
- advertisedUrl="http://ftp.gnu.org/gnu/xboard/xboard-4.4.2.tar.gz";
-
-
-}
diff --git a/pkgs/games/xboard/src-info-for-default.nix b/pkgs/games/xboard/src-info-for-default.nix
deleted file mode 100644
index 8d0386671a1..00000000000
--- a/pkgs/games/xboard/src-info-for-default.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- downloadPage = "http://ftp.gnu.org/gnu/xboard/?C=T,M;O=D";
- baseName = "xboard";
-}
diff --git a/pkgs/games/xmoto/default.nix b/pkgs/games/xmoto/default.nix
index 229d58029de..ed37227bb03 100644
--- a/pkgs/games/xmoto/default.nix
+++ b/pkgs/games/xmoto/default.nix
@@ -15,9 +15,7 @@ rec {
configureFlags = [];
/* doConfigure should be removed if not needed */
- phaseNames = [ "doPatch" "doConfigure" "doMakeInstall"];
-
- patches = [ ./r3402.patch ];
+ phaseNames = [ "doConfigure" "doMakeInstall"];
meta = {
description = "X-Moto - obstacled race game";
diff --git a/pkgs/games/xmoto/r3402.patch b/pkgs/games/xmoto/r3402.patch
deleted file mode 100644
index 787e5625b5f..00000000000
--- a/pkgs/games/xmoto/r3402.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: a/src/image/tim_png.cpp
-===================================================================
---- a/src/image/tim_png.cpp (revision 3401)
-+++ b/src/image/tim_png.cpp (revision 3402)
-@@ -25,7 +25,8 @@
- #include
- #include
- #include "tim.h"
--#include "png.h"
-+#include
-+#include
-
- /*==============================================================================
- Types
-Index: ChangeLog
-===================================================================
---- a/ChangeLog (revision 3401)
-+++ b/ChangeLog (revision 3402)
-@@ -1,3 +1,7 @@
-+X-Moto 0.5.10 2012-
-+--------------------------------
-+ * libpng patch by Kelly Anderson
-+
- X-Moto 0.5.9 2011-11-13
- --------------------------------
- * fix a compilation error with libxml
diff --git a/pkgs/games/xmoto/src-for-default.nix b/pkgs/games/xmoto/src-for-default.nix
index 7d85cdbe528..60de24e16c7 100644
--- a/pkgs/games/xmoto/src-for-default.nix
+++ b/pkgs/games/xmoto/src-for-default.nix
@@ -1,9 +1,9 @@
rec {
- version="0.5.9";
- name="xmoto-0.5.9";
- hash="1r1kl3w2scncw754lgsfa7i6hh4mg39zc3bcvd1iqcmdfr25gmvl";
+ version="0.5.10";
+ name="xmoto-0.5.10";
+ hash="07lyvwb8v75hzp4iqvnxzabzrmwkd3ignfzpm4dgr9asd3j3h91d";
url="http://download.tuxfamily.org/xmoto/xmoto/${version}/xmoto-${version}-src.tar.gz";
- advertisedUrl="http://download.tuxfamily.org/xmoto/xmoto/0.5.9/xmoto-0.5.9-src.tar.gz";
+ advertisedUrl="http://download.tuxfamily.org/xmoto/xmoto/0.5.10/xmoto-0.5.10-src.tar.gz";
}
diff --git a/pkgs/games/xsokoban/default.nix b/pkgs/games/xsokoban/default.nix
index b8917b4d41c..b8c6096b756 100644
--- a/pkgs/games/xsokoban/default.nix
+++ b/pkgs/games/xsokoban/default.nix
@@ -20,6 +20,7 @@ rec {
phaseNames = ["preConfigure" "doConfigure" "preBuild" "doMakeInstall"];
preConfigure = a.fullDepEntry (''
+ sed -e 's/getline/my_getline/' -i score.c
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${a.libXpm}/include/X11"
for i in $NIX_CFLAGS_COMPILE; do echo $i; ls ''${i#-I}; done
chmod a+rw config.h
@@ -28,8 +29,8 @@ rec {
echo '#define OWNER "'$(whoami)'"' >> config.h
echo '#define ROOTDIR "'$out/lib/xsokoban'"' >> config.h
echo '#define ANYLEVEL 1' >> config.h
- echo '#define SCOREFILE "/tmp/.xsokoban-score"' >> config.h
- echo '#define LOCKFILE "/tmp/.xsokoban-score-lock"' >> config.h
+ echo '#define SCOREFILE ".xsokoban-score"' >> config.h
+ echo '#define LOCKFILE ".xsokoban-score-lock"' >> config.h
sed -e 's/getpass[(][^)]*[)]/PASSWORD/' -i main.c
sed -e '/if [(]owner[)]/iowner=1;' -i main.c
diff --git a/pkgs/games/zdoom/default.nix b/pkgs/games/zdoom/default.nix
index 4bf8c526f58..59a88191d2e 100644
--- a/pkgs/games/zdoom/default.nix
+++ b/pkgs/games/zdoom/default.nix
@@ -1,11 +1,19 @@
-{stdenv, fetchsvn, cmake, SDL, nasm, p7zip, zlib, flac, fmod, libjpeg}:
+{stdenv, fetchurl, cmake, SDL, nasm, p7zip, zlib, flac, fmod, libjpeg}:
stdenv.mkDerivation {
- name = "zdoom-svn-1424";
- src = fetchsvn {
- url = http://mancubus.net/svn/hosted/zdoom/zdoom/trunk;
- rev = 1424;
+ name = "zdoom-2.6.1";
+ src = fetchurl {
+ url = http://zdoom.org/files/zdoom/2.6/zdoom-2.6.1-src.7z;
+ sha256 = "1ha7hygwf243vkgw0dfh4dxphf5vffb3kkci1p1p75a7r1g1bir8";
};
+
+ # XXX: shouldn't inclusion of p7zip handle this?
+ unpackPhase = ''
+ mkdir zdoom
+ cd zdoom
+ 7z x $src
+ '';
+
buildInputs = [cmake nasm SDL p7zip zlib flac fmod libjpeg];
cmakeFlags = [ "-DSDL_INCLUDE_DIR=${SDL}/include/SDL" ];
diff --git a/pkgs/games/zoom/default.nix b/pkgs/games/zoom/default.nix
index 1ca39ebc73b..fdf3aa91e2b 100644
--- a/pkgs/games/zoom/default.nix
+++ b/pkgs/games/zoom/default.nix
@@ -3,11 +3,11 @@
# !!! assert freetype == xlibs.freetype
stdenv.mkDerivation {
- name = "zoom-1.0.2alpha1";
+ name = "zoom-1.1.5";
src = fetchurl {
- url = http://www.logicalshift.demon.co.uk/unix/zoom/zoom-1.0.2alpha1.tar.gz;
- md5 = "91b2fe444028178aa3b23bd0e3ae1a61";
+ url = http://www.logicalshift.co.uk/unix/zoom/zoom-1.1.5.tar.gz;
+ sha256 = "1g6van7f7sg3zfcz80mncnnbccyg2hnm0hq4x558vpsm0lf7z5pj";
};
buildInputs = [perl expat x11 freetype];
diff --git a/pkgs/lib/attrsets.nix b/pkgs/lib/attrsets.nix
index de6eccbec1f..fcdc3c31f29 100644
--- a/pkgs/lib/attrsets.nix
+++ b/pkgs/lib/attrsets.nix
@@ -5,7 +5,8 @@ with {
inherit (import ./trivial.nix) or;
inherit (import ./default.nix) fold;
inherit (import ./strings.nix) concatStringsSep;
- inherit (import ./lists.nix) concatMap concatLists;
+ inherit (import ./lists.nix) concatMap concatLists all deepSeqList;
+ inherit (import ./misc.nix) maybeAttr;
};
rec {
@@ -23,7 +24,7 @@ rec {
then attrByPath (tail attrPath) default (getAttr attr e)
else default;
-
+
/* Return nested attribute set in which an attribute is set. For instance
["x" "y"] applied with some value v returns `x.y = v;' */
setAttrByPath = attrPath: value:
@@ -36,7 +37,7 @@ rec {
getAttrFromPath = attrPath: set:
let errorMsg = "cannot find attribute `" + concatStringsSep "." attrPath + "'";
in attrByPath attrPath (abort errorMsg) set;
-
+
/* Return the specified attributes from a set.
@@ -79,6 +80,18 @@ rec {
listToAttrs (fold (n: ys: let v = getAttr n set; in if pred n v then [(nameValuePair n v)] ++ ys else ys) [] (attrNames set));
+ /* foldAttrs: apply fold functions to values grouped by key. Eg accumulate values as list:
+ foldAttrs (n: a: [n] ++ a) [] [{ a = 2; } { a = 3; }]
+ => { a = [ 2 3 ]; }
+ */
+ foldAttrs = op: nul: list_of_attrs:
+ fold (n: a:
+ fold (name: o:
+ o // (listToAttrs [{inherit name; value = op (getAttr name n) (maybeAttr name nul a); }])
+ ) a (attrNames n)
+ ) {} list_of_attrs;
+
+
/* Recursively collect sets that verify a given predicate named `pred'
from the set `attrs'. The recursion is stopped when the predicate is
verified.
@@ -108,7 +121,7 @@ rec {
builtins.listToAttrs. */
nameValuePair = name: value: { inherit name value; };
-
+
/* Apply a function to each element in an attribute set. The
function takes two arguments --- the attribute name and its value
--- and returns the new value for the attribute. The result is a
@@ -126,7 +139,7 @@ rec {
/* Like `mapAttrs', but allows the name of each attribute to be
changed in addition to the value. The applied function should
return both the new name and value as a `nameValuePair'.
-
+
Example:
mapAttrs' (name: value: nameValuePair ("foo_" + name) ("bar-" + value))
{ x = "a"; y = "b"; }
@@ -134,11 +147,11 @@ rec {
*/
mapAttrs' = f: set:
listToAttrs (map (attr: f attr (getAttr attr set)) (attrNames set));
-
+
/* Call a function for each attribute in the given set and return
the result in a list.
-
+
Example:
mapAttrsToList (name: value: name + value)
{ x = "a"; y = "b"; }
@@ -146,7 +159,7 @@ rec {
*/
mapAttrsToList = f: attrs:
map (name: f name (getAttr name attrs)) (attrNames attrs);
-
+
/* Like `mapAttrs', except that it recursively applies itself to
attribute sets. Also, the first argument of the argument
@@ -163,7 +176,7 @@ rec {
*/
mapAttrsRecursive = mapAttrsRecursiveCond (as: true);
-
+
/* Like `mapAttrsRecursive', but it takes an additional predicate
function that tells it whether to recursive into an attribute
set. If it returns false, `mapAttrsRecursiveCond' does not
@@ -247,7 +260,7 @@ rec {
returns: {
foo.bar = 1; # 'foo.*' from the second set
- foo.quz = 2; #
+ foo.quz = 2; #
bar = 3; # 'bar' from the first set
baz = 4; # 'baz' from the second set
}
@@ -264,9 +277,9 @@ rec {
);
in f [] [rhs lhs];
- /* Does the same as the update operator '//' and keep siblings attribute.
- This recusion stop when one of the attribute value is not an attribute
- set, in which case the right hand side value takes precedence over the
+ /* A recursive variant of the update operator ‘//’. The recusion
+ stops when one of the attribute values is not an attribute set,
+ in which case the right hand side value takes precedence over the
left hand side value.
Example:
@@ -301,4 +314,5 @@ rec {
overrideExisting = old: new:
old // listToAttrs (map (attr: nameValuePair attr (attrByPath [attr] (getAttr attr old) new)) (attrNames old));
+ deepSeqAttrs = x: y: deepSeqList (attrValues x) y;
}
diff --git a/pkgs/lib/customisation.nix b/pkgs/lib/customisation.nix
index 54965ffb580..18cec3209f9 100644
--- a/pkgs/lib/customisation.nix
+++ b/pkgs/lib/customisation.nix
@@ -34,7 +34,7 @@ rec {
overrideDerivation = drv: f:
let
# Filter out special attributes.
- drop = [ "meta" "passthru" "outPath" "drvPath" "hostDrv" "buildDrv" "type" "override" "deepOverride" "origArgs" "drvAttrs" "outputName" "all" "out" ]
+ drop = [ "meta" "passthru" "outPath" "drvPath" "crossDrv" "nativeDrv" "type" "override" "deepOverride" "origArgs" "drvAttrs" "outputName" "all" "out" ]
# also drop functions such as .merge .override etc
++ lib.filter (n: isFunction (getAttr n drv)) (attrNames drv);
attrs = removeAttrs drv drop;
@@ -44,10 +44,10 @@ rec {
passthru = if drv ? passthru then drv.passthru else {};
}
//
- (if (drv ? hostDrv && drv ? buildDrv)
+ (if (drv ? crossDrv && drv ? nativeDrv)
then {
- hostDrv = overrideDerivation drv.hostDrv f;
- buildDrv = overrideDerivation drv.buildDrv f;
+ crossDrv = overrideDerivation drv.crossDrv f;
+ nativeDrv = overrideDerivation drv.nativeDrv f;
}
else { });
diff --git a/pkgs/lib/debug.nix b/pkgs/lib/debug.nix
index b78f946c5d4..d627bc861ab 100644
--- a/pkgs/lib/debug.nix
+++ b/pkgs/lib/debug.nix
@@ -95,7 +95,7 @@ rec {
else if isInt x then true
else if x == null then true
else true; # a (store) path?
- in if (traverse x) then x else throw "else never reached";
+ in if traverse x then x else throw "else never reached";
# example: (traceCallXml "myfun" id 3) will output something like
# calling myfun arg 1: 3 result: 3
diff --git a/pkgs/lib/licenses.nix b/pkgs/lib/licenses.nix
index dc88f887cc7..e1743bddf69 100644
--- a/pkgs/lib/licenses.nix
+++ b/pkgs/lib/licenses.nix
@@ -34,6 +34,12 @@
url = https://fedoraproject.org/wiki/Licensing/BSD;
};
+ cddl = {
+ shortName = "CDDL";
+ fullName = "Common Development Distribution License ";
+ url = http://www.opensolaris.org/os/licensing/cddllicense.txt;
+ };
+
cpl10 = {
shortName = "CPL 1.0";
fullName = "Common Public License version 1.0";
@@ -175,6 +181,12 @@
shortName = "Proprietary";
fullName = "Proprietary (non redistributable) license";
};
+
+ tcltk = {
+ shortName = "Tcl/Tk";
+ fullName = "Tcl/Tk license";
+ url = http://www.tcl.tk/software/tcltk/license.html;
+ };
zlib = {
shortName = "zlib";
diff --git a/pkgs/lib/lists.nix b/pkgs/lib/lists.nix
index b9eba9ab478..0916355568c 100644
--- a/pkgs/lib/lists.nix
+++ b/pkgs/lib/lists.nix
@@ -1,4 +1,7 @@
# General list operations.
+with {
+ inherit (import ./trivial.nix) deepSeq;
+};
rec {
inherit (builtins) head tail length isList add sub lessThan;
@@ -190,7 +193,7 @@ rec {
else let
part = partition (strictLess (head l)) (tail l);
in
- qs part.wrong ([(head l)] ++ qs part.right []);
+ qs part.wrong ([(head l)] ++ qs part.right concat);
in
qs list [];
@@ -220,4 +223,5 @@ rec {
++ zipTwoLists (tail xs) (tail ys)
else [];
+ deepSeqList = xs: y: if any (x: deepSeq x false) xs then y else y;
}
diff --git a/pkgs/lib/maintainers.nix b/pkgs/lib/maintainers.nix
index 127295a2feb..76aa2de723d 100644
--- a/pkgs/lib/maintainers.nix
+++ b/pkgs/lib/maintainers.nix
@@ -10,14 +10,18 @@
andres = "Andres Loeh ";
antono = "Antono Vasiljev ";
astsmtl = "Alexander Tsamutali ";
+ aszlig = "aszlig ";
+ bbenoist = "Baptist BENOIST ";
bjg = "Brian Gough ";
bluescreen303 = "Mathijs Kwik ";
chaoflow = "Florian Friesdorf ";
coconnor = "Corey O'Connor ";
- eelco = "Eelco Dolstra ";
+ eelco = "Eelco Dolstra ";
garbas = "Rok Garbas ";
goibhniu = "Cillian de Róiste ";
guibert = "David Guibert ";
+ iElectric = "Domen Kozar ";
+ jcumming = "Jack Cummings ";
kkallio = "Karn Kallio ";
ludo = "Ludovic Courtès ";
marcweber = "Marc Weber ";
@@ -35,6 +39,7 @@
sander = "Sander van der Burg ";
shlevy = "Shea Levy ";
simons = "Peter Simons ";
+ smironov = "Sergey Mironov ";
thammers = "Tobias Hammerschmidt ";
urkud = "Yury G. Kudryashov ";
viric = "Lluís Batlle i Rossell ";
diff --git a/pkgs/lib/misc.nix b/pkgs/lib/misc.nix
index 39a3ad258b0..79504f7d886 100644
--- a/pkgs/lib/misc.nix
+++ b/pkgs/lib/misc.nix
@@ -53,7 +53,7 @@ rec {
f : # the function applied to the arguments
initial : # you pass attrs, the functions below are passing a function taking the fix argument
let
- takeFixed = if (isFunction initial) then initial else (fixed : initial); # transform initial to an expression always taking the fixed argument
+ takeFixed = if isFunction initial then initial else (fixed : initial); # transform initial to an expression always taking the fixed argument
tidy = args :
let # apply all functions given in "applyPreTidy" in sequence
applyPreTidyFun = fold ( n : a : x : n ( a x ) ) lib.id (maybeAttr "applyPreTidy" [] args);
@@ -106,11 +106,11 @@ rec {
# shortcut for attrByPath ["name"] default attrs
maybeAttrNullable = name: default: attrs:
if attrs == null then default else
- if (__hasAttr name attrs) then (__getAttr name attrs) else default;
+ if __hasAttr name attrs then (__getAttr name attrs) else default;
# shortcut for attrByPath ["name"] default attrs
maybeAttr = name: default: attrs:
- if (__hasAttr name attrs) then (__getAttr name attrs) else default;
+ if __hasAttr name attrs then (__getAttr name attrs) else default;
# Return the second argument if the first one is true or the empty version
@@ -120,14 +120,14 @@ rec {
else if builtins.isList val then []
else if builtins.isAttrs val then {}
# else if builtins.isString val then ""
- else if (val == true || val == false) then false
+ else if val == true || val == false then false
else null;
# Return true only if there is an attribute and it is true.
checkFlag = attrSet: name:
- if (name == "true") then true else
- if (name == "false") then false else
+ if name == "true" then true else
+ if name == "false" then false else
if (elem name (attrByPath ["flags"] [] attrSet)) then true else
attrByPath [name] false attrSet ;
@@ -170,7 +170,7 @@ rec {
uniqListExt = {inputList, outputList ? [],
getter ? (x : x), compare ? (x: y: x==y)}:
- if (inputList == []) then outputList else
+ if inputList == [] then outputList else
let x=head inputList;
isX = y: (compare (getter y) (getter x));
newOutputList = outputList ++
@@ -226,7 +226,7 @@ rec {
in innerClosePropagation
acc'
(uniqList { inputList = (maybeAttrNullable "propagatedBuildInputs" [] y)
- ++ (maybeAttrNullable "propagatedBuildNativeInputs" [] y)
+ ++ (maybeAttrNullable "propagatedNativeBuildInputs" [] y)
++ ys;
acc = acc';
}
@@ -317,7 +317,7 @@ rec {
mergeAttrsByFuncDefaults = foldl mergeAttrByFunc { inherit mergeAttrBy; };
# sane defaults (same name as attr name so that inherit can be used)
mergeAttrBy = # { buildInputs = concatList; [...]; passthru = mergeAttr; [..]; }
- listToAttrs (map (n : nameValuePair n lib.concat) [ "buildNativeInputs" "buildInputs" "propagatedBuildInputs" "configureFlags" "prePhases" "postAll" ])
+ listToAttrs (map (n : nameValuePair n lib.concat) [ "nativeBuildInputs" "buildInputs" "propagatedBuildInputs" "configureFlags" "prePhases" "postAll" ])
// listToAttrs (map (n : nameValuePair n lib.mergeAttrs) [ "passthru" "meta" "cfg" "flags" ])
// listToAttrs (map (n : nameValuePair n (a: b: "${a}\n${b}") ) [ "preConfigure" "postInstall" ])
;
@@ -362,7 +362,7 @@ rec {
cfgWithDefaults = (listToAttrs (map (n : nameValuePair (flagName n) false) (attrNames args2.flags)))
// args2.cfg;
opts = attrValues (mapAttrs (a : v :
- let v2 = if (v ? set || v ? unset) then v else { set = v; };
+ let v2 = if v ? set || v ? unset then v else { set = v; };
n = if (getAttr (flagName a) cfgWithDefaults) then "set" else "unset";
attr = maybeAttr n {} v2; in
if (maybeAttr "assertion" true attr)
diff --git a/pkgs/lib/modules.nix b/pkgs/lib/modules.nix
index 25cb956a0ea..286178a0fa7 100644
--- a/pkgs/lib/modules.nix
+++ b/pkgs/lib/modules.nix
@@ -21,22 +21,26 @@ rec {
|| builtins.isList x
);
+
importIfPath = path:
if isPath path then
import path
else
path;
+
applyIfFunction = f: arg:
if builtins.isFunction f then
f arg
else
f;
+
isModule = m:
(m ? config && isAttrs m.config && ! isOption m.config)
|| (m ? options && isAttrs m.options && ! isOption m.options);
+
# Convert module to a set which has imports / options and config
# attributes.
unifyModuleSyntax = m:
@@ -88,8 +92,7 @@ rec {
# used by generic closure to avoid duplicated imports.
key =
if isPath m then m
- else if m' ? key then m'.key
- else newModuleName origin index;
+ else m'.key or (newModuleName origin index);
};
getImports = m: m.imports or [];
@@ -107,15 +110,6 @@ rec {
operator = m: imap (moduleImport m) (getImports m);
});
- selectDeclsAndDefs = modules:
- lib.concatMap (m:
- if m ? config || m ? options then
- [ (m.options or {}) ]
- ++ [ (m.config or {}) ]
- else
- [ m ]
- ) modules;
-
moduleApply = funs: module:
lib.mapAttrs (name: value:
@@ -126,6 +120,7 @@ rec {
value
) module;
+
# Handle mkMerge function left behind after a delay property.
moduleFlattenMerge = module:
if module ? config &&
@@ -137,6 +132,7 @@ rec {
else
[ module ];
+
# Handle mkMerge attributes which are left behind by previous delay
# properties and convert them into a list of modules. Delay properties
# inside the config attribute of a module and create a second module if a
@@ -146,8 +142,9 @@ rec {
delayModule = module:
map (moduleApply { config = delayProperties; }) (moduleFlattenMerge module);
+
evalDefinitions = opt: values:
- if opt ? type && opt.type.delayOnGlobalEval then
+ if opt.type.delayOnGlobalEval or false then
map (delayPropertiesWithIter opt.type.iter opt.name)
(evalLocalProperties values)
else
@@ -171,17 +168,20 @@ rec {
map (selectModule name) modules
);
+
modulesNames = modules:
lib.concatMap (m: []
++ optionals (m ? options) (lib.attrNames m.options)
++ optionals (m ? config) (lib.attrNames m.config)
) modules;
+
moduleZip = funs: modules:
lib.mapAttrs (name: fun:
fun (catAttrs name modules)
) funs;
+
moduleMerge = path: modules:
let modules_ = modules; in
let
@@ -234,7 +234,6 @@ rec {
source = m.key;
}) declarations;
-
hasOptions = values != [];
isOption = any lib.isOption values;
@@ -303,8 +302,7 @@ rec {
let opt = option.decl; in
opt.apply (
if isNotDefined then
- if opt ? default then opt.default
- else throw "Not defined."
+ opt.default or (throw "Not defined.")
else opt.merge defs
)
);
@@ -342,16 +340,16 @@ rec {
fixMergeModules = initModules: {...}@args:
lib.fix (result:
- # This trick avoid an infinite loop because names of attribute are
- # know and it is not require to evaluate the result of moduleMerge to
- # know which attribute are present as argument.
+ # This trick avoids an infinite loop because names of attribute
+ # are know and it is not required to evaluate the result of
+ # moduleMerge to know which attributes are present as arguments.
let module = { inherit (result) options config; }; in
-
moduleMerge "" (
moduleClosure initModules (module // args)
)
);
+
# Visit all definitions to raise errors related to undeclared options.
checkModule = path: {config, options, ...}@m:
let
diff --git a/pkgs/lib/platforms.nix b/pkgs/lib/platforms.nix
index 45e863458d4..8be37d7ed1e 100644
--- a/pkgs/lib/platforms.nix
+++ b/pkgs/lib/platforms.nix
@@ -2,9 +2,8 @@ let lists = import ./lists.nix; in
rec {
gnu = linux; /* ++ hurd ++ kfreebsd ++ ... */
- linux = ["i686-linux" "x86_64-linux" "powerpc-linux" "armv5tel-linux"
- "armv7l-linux" "mips64el-linux"];
- darwin = ["i686-darwin" "powerpc-darwin" "x86_64-darwin"];
+ linux = ["i686-linux" "x86_64-linux" "powerpc-linux" "armv5tel-linux" "armv7l-linux" "mips64el-linux"];
+ darwin = ["x86_64-darwin"];
freebsd = ["i686-freebsd" "x86_64-freebsd" "powerpc-freebsd"];
openbsd = ["i686-openbsd" "x86_64-openbsd"];
netbsd = ["i686-netbsd" "x86_64-netbsd"];
@@ -13,5 +12,5 @@ rec {
all = linux ++ darwin ++ cygwin ++ freebsd ++ openbsd;
none = [];
allBut = platform: lists.filter (x: platform != x) all;
- mesaPlatforms = linux;
+ mesaPlatforms = ["i686-linux" "x86_64-linux" "x86_64-darwin" "armv5tel-linux" "armv6l-linux"];
}
diff --git a/pkgs/lib/properties.nix b/pkgs/lib/properties.nix
index 0d864b0c553..eeac27ae70c 100644
--- a/pkgs/lib/properties.nix
+++ b/pkgs/lib/properties.nix
@@ -25,7 +25,7 @@ rec {
# contains a _type attribute and a list of functions which are used to
# evaluate this property. The content attribute is used to stack properties
# on top of each other.
- #
+ #
# The optional functions which may be contained in the property attribute
# are:
# - onDelay: run on a copied property.
@@ -41,7 +41,7 @@ rec {
# property and call the function `nul' on the final value which is not a
# property. The stack is traversed in reversed order. The `op' function
# should expect a property with a content which have been modified.
- #
+ #
# Warning: The `op' function expects only one argument in order to avoid
# calls to mkProperties as the argument is already a valid property which
# contains the result of the folding inside the content attribute.
@@ -100,12 +100,10 @@ rec {
triggerPropertiesDelay = name: attrs:
let
callOnDelay = p@{property, ...}:
- lib.addErrorContext "while calling an `onDelay' function:" (
- if property ? onDelay then
- property.onDelay name p
- else
- p
- );
+ if property ? onDelay then
+ property.onDelay name p
+ else
+ p;
in
foldProperty callOnDelay id attrs;
@@ -123,9 +121,7 @@ rec {
};
callOnGlobalDelay = property: content:
- lib.addErrorContext "while calling an `onGlobalDelay' function:" (
- property.onGlobalDelay name content
- );
+ property.onGlobalDelay name content;
in
fold callOnGlobalDelay attrs globalDelayFuns;
@@ -136,28 +132,25 @@ rec {
evalProperties = valList:
if valList != [] then
filter (x: !isNotdef x) (
- lib.addErrorContext "while evaluating properties:" (
- triggerPropertiesGlobalEval (
- evalLocalProperties valList
- )))
+ triggerPropertiesGlobalEval (
+ evalLocalProperties valList
+ )
+ )
else
valList;
evalLocalProperties = valList:
filter (x: !isNotdef x) (
- lib.addErrorContext "while evaluating local properties:" (
- map triggerPropertiesEval valList
- ));
+ map triggerPropertiesEval valList
+ );
# Call onEval function
triggerPropertiesEval = val:
foldProperty (p@{property, ...}:
- lib.addErrorContext "while calling an `onEval' function:" (
- if property ? onEval then
- property.onEval p
- else
- p
- )
+ if property ? onEval then
+ property.onEval p
+ else
+ p
) id val;
# Call onGlobalEval function
@@ -176,10 +169,7 @@ rec {
) [] valList;
};
- callOnGlobalEval = property: valList:
- lib.addErrorContext "while calling an `onGlobalEval' function:" (
- property.onGlobalEval valList
- );
+ callOnGlobalEval = property: valList: property.onGlobalEval valList;
in
fold callOnGlobalEval valList globalEvalFuns;
@@ -225,45 +215,11 @@ rec {
inherit content;
};
- # Create a "ThenElse" property which contains choices being chosen by
- # the evaluation of an "If" statement.
- isThenElse = attrs: (typeOf attrs) == "then-else";
- mkThenElse = attrs:
- assert attrs ? thenPart && attrs ? elsePart;
- __trace "Obsolete usage of mkThenElse, replace it by mkMerge."
- mkProperty {
- property = {
- _type = "then-else";
- onEval = val: throw "Missing mkIf statement.";
- inherit (attrs) thenPart elsePart;
- };
- content = mkNotdef;
- };
-
- # Create an "Always" property removing/ ignoring all "If" statement.
- isAlways = attrs: (typeOf attrs) == "always";
- mkAlways = value:
- mkProperty {
- property = {
- _type = "always";
- onEval = p@{content, ...}: content;
- inherit value;
- };
- content = mkNotdef;
- };
-
mkAssert = assertion: message: content:
mkIf
(if assertion then true else throw "\nFailed assertion: ${message}")
content;
- # Remove all "If" statement defined on a value.
- rmIf = foldProperty (
- foldFilter isIf
- ({content, ...}: content)
- id
- ) id;
-
# Evaluate the "If" statements when either "ThenElse" or "Always"
# statement is encountered. Otherwise it removes multiple If statements and
# replaces them by one "If" statement where the condition is the list of all
@@ -274,8 +230,8 @@ rec {
# in the attribute list and attrs.
ifProps =
foldProperty
- (foldFilter (p: isIf p || isThenElse p || isAlways p)
- # then, push the codition inside the list list
+ (foldFilter (p: isIf p)
+ # then, push the condition inside the list list
(p@{property, content, ...}:
{ inherit (content) attrs;
list = [property] ++ content.list;
@@ -297,19 +253,7 @@ rec {
mkIf condition content
else
let p = head list; in
-
- # evaluate the condition.
- if isThenElse p then
- if condition then
- copyProperties content p.thenPart
- else
- copyProperties content p.elsePart
- # ignore the condition.
- else if isAlways p then
- copyProperties content p.value
- # otherwise (isIf)
- else
- evalIf content (condition && p.condition) (tail list);
+ evalIf content (condition && p.condition) (tail list);
in
evalIf ifProps.attrs true ifProps.list;
diff --git a/pkgs/lib/strings.nix b/pkgs/lib/strings.nix
index fb2752d97c1..4d899927887 100644
--- a/pkgs/lib/strings.nix
+++ b/pkgs/lib/strings.nix
@@ -109,6 +109,13 @@ rec {
stringAsChars subst s;
+ # Case conversion utilities
+ lowerChars = stringToCharacters "abcdefghijklmnopqrstuvwxyz";
+ upperChars = stringToCharacters "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+ toLower = replaceChars upperChars lowerChars;
+ toUpper = replaceChars lowerChars upperChars;
+
+
# Compares strings not requiring context equality
# Obviously, a workaround but works on all Nix versions
eqStrings = a: b: (a+(substring 0 0 b)) == ((substring 0 0 a)+b);
@@ -155,4 +162,20 @@ rec {
# Return true iff string v1 denotes a version older than v2.
versionOlder = v1: v2: builtins.compareVersions v2 v1 == 1;
+
+ # Get the version of the specified derivation, as specified in its
+ # ‘name’ attribute.
+ getVersion = drv: (builtins.parseDrvName drv.name).version;
+
+
+ # Extract name with version from URL. Ask for separator which is
+ # supposed to start extension
+ nameFromURL = url: sep: let
+ components = splitString "/" url;
+ filename = lib.last components;
+ name = builtins.head (splitString sep filename);
+ in
+ assert ! eqStrings name filename;
+ name;
+
}
diff --git a/pkgs/lib/tests.nix b/pkgs/lib/tests.nix
index 835298ddb9e..298bdffc379 100644
--- a/pkgs/lib/tests.nix
+++ b/pkgs/lib/tests.nix
@@ -58,6 +58,13 @@ runTests {
([ 1 2 3 ] == (take 4 [ 1 2 3 ]))
];
+ testFoldAttrs = {
+ expr = foldAttrs (n: a: [n] ++ a) [] [
+ { a = 2; b = 7; }
+ { a = 3; c = 8; }
+ ];
+ expected = { a = [ 2 3 ]; b = [7]; c = [8];};
+ };
testOverridableDelayableArgsTest = {
expr =
@@ -97,5 +104,10 @@ runTests {
];
expected = true;
};
+
+ testSort = {
+ expr = sort builtins.lessThan [ 40 2 30 42 ];
+ expected = [2 30 40 42];
+ };
}
diff --git a/pkgs/lib/trivial.nix b/pkgs/lib/trivial.nix
index af47a8c8841..8af3474f2a6 100644
--- a/pkgs/lib/trivial.nix
+++ b/pkgs/lib/trivial.nix
@@ -1,3 +1,8 @@
+with {
+ inherit (import ./lists.nix) deepSeqList;
+ inherit (import ./attrsets.nix) deepSeqAttrs;
+};
+
rec {
# Identity function.
@@ -22,4 +27,12 @@ rec {
# evaluation of its first argument.
seq = x: y: if x == null then y else y;
+ # Like `seq', but recurses into lists and attribute sets to force evaluation
+ # of all list elements/attributes.
+ deepSeq = x: y:
+ if builtins.isList x
+ then deepSeqList x y
+ else if builtins.isAttrs x
+ then deepSeqAttrs x y
+ else seq x y;
}
diff --git a/pkgs/lib/types.nix b/pkgs/lib/types.nix
index 38ae7b43630..6ddac61d91b 100644
--- a/pkgs/lib/types.nix
+++ b/pkgs/lib/types.nix
@@ -11,7 +11,7 @@ with import ./trivial.nix;
rec {
hasType = x: isAttrs x && x ? _type;
- typeOf = x: if hasType x then x._type else "";
+ typeOf = x: x._type or "";
setType = typeName: value: value // {
_type = typeName;
@@ -68,6 +68,14 @@ rec {
merge = lib.concatStrings;
};
+ # Like ‘string’, but add newlines between every value. Useful for
+ # configuration file contents.
+ lines = mkOptionType {
+ name = "string";
+ check = lib.traceValIfNot builtins.isString;
+ merge = lib.concatStringsSep "\n";
+ };
+
envVar = mkOptionType {
name = "environment variable";
inherit (string) check;
@@ -176,6 +184,20 @@ rec {
fold = op: nul: v: if v == null then nul else elemType.fold op nul v;
};
+ functionTo = elemType: mkOptionType {
+ name = "function that evaluates to a(n) ${elemType.name}";
+ check = lib.traceValIfNot builtins.isFunction;
+ merge = fns:
+ args: elemType.merge (map (fn: fn args) fns);
+ # These are guesses, I don't fully understand iter, fold, delayOnGlobalEval
+ iter = f: path: v:
+ args: elemType.iter f path (v args);
+ fold = op: nul: v:
+ args: elemType.fold op nul (v args);
+ inherit (elemType) delayOnGlobalEval;
+ hasOptions = false;
+ };
+
# !!! this should be a type constructor that takes the options as
# an argument.
optionSet = mkOptionType {
diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix
index bf4e4d1d7e5..6cc13aa3013 100644
--- a/pkgs/misc/cups/default.nix
+++ b/pkgs/misc/cups/default.nix
@@ -1,9 +1,8 @@
{ stdenv, fetchurl, pkgconfig, zlib, libjpeg, libpng, libtiff, pam, openssl
-, dbus, libusb, acl }:
+, dbus, libusb1, acl }:
+
+let version = "1.5.4"; in
-let
- version = "1.5.2";
-in
stdenv.mkDerivation {
name = "cups-${version}";
@@ -11,10 +10,10 @@ stdenv.mkDerivation {
src = fetchurl {
url = "http://ftp.easysw.com/pub/cups/${version}/cups-${version}-source.tar.bz2";
- sha256 = "1yw7l5rq93zg91akqf68b871frrs4q0krc9cx43ly7v3ih8all5i";
+ md5 = "de3006e5cf1ee78a9c6145ce62c4e982";
};
- buildInputs = [ pkgconfig zlib libjpeg libpng libtiff libusb ]
+ buildInputs = [ pkgconfig zlib libjpeg libpng libtiff libusb1 ]
++ stdenv.lib.optionals stdenv.isLinux [ pam dbus acl ] ;
propagatedBuildInputs = [ openssl ];
@@ -44,6 +43,6 @@ stdenv.mkDerivation {
description = "A standards-based printing system for UNIX";
license = stdenv.lib.licenses.gpl2; # actually LGPL for the library and GPL for the rest
maintainers = [ stdenv.lib.maintainers.urkud stdenv.lib.maintainers.simons ];
- platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
+ platforms = stdenv.lib.platforms.linux;
};
}
diff --git a/pkgs/misc/cups/drivers/samsung/builder.sh b/pkgs/misc/cups/drivers/samsung/builder.sh
new file mode 100644
index 00000000000..58e1c0cd781
--- /dev/null
+++ b/pkgs/misc/cups/drivers/samsung/builder.sh
@@ -0,0 +1,35 @@
+source $stdenv/setup
+
+arch=$(uname -m)
+# replace i[3456]86 with i386
+echo arch | egrep -q '^i[3456]86$' && arch=i386
+arch=i386
+unpackPhase
+patchPhase
+
+set -v
+
+echo $arch
+cd cdroot/Linux
+mkdir -p $out/opt
+cp -r $arch/at_root/* $out
+cp -r $arch/at_opt/* $out/opt
+#cp -r noarch/at_root/* $out
+cp -r noarch/at_opt/* $out/opt
+
+cd $out
+#test -d usr/lib64 && ln -s usr/lib64 lib ||
+ln -s usr/lib lib
+mkdir -p share/cups
+cd share/cups
+ln -s ../../opt/share/* .
+ln -s ppd model
+
+cd $out/lib/cups/filter
+for i in $(ls); do
+ echo patching $i...
+ patchelf --set-interpreter $(cat $NIX_GCC/nix-support/dynamic-linker) $i || echo "(couldn't set interpreter)"
+ patchelf --set-rpath $cups/lib:$gcc/lib:$glibc/lib $i # This might not be necessary.
+done
+
+ln -s $ghostscript/bin/gs $out/lib/cups/filter
diff --git a/pkgs/misc/cups/drivers/samsung/default.nix b/pkgs/misc/cups/drivers/samsung/default.nix
new file mode 100644
index 00000000000..ab0c0dc25e4
--- /dev/null
+++ b/pkgs/misc/cups/drivers/samsung/default.nix
@@ -0,0 +1,35 @@
+# Tested on linux-x86_64. Might work on linux-i386. Probably won't work on anything else.
+
+# To use this driver in NixOS, add it to printing.drivers in configuration.nix.
+# configuration.nix might look like this when you're done:
+# { pkgs, ... }: {
+# printing = {
+# enable = true;
+# drivers = [ pkgs.samsungUnifiedLinuxDriver ];
+# };
+# (more stuff)
+# }
+# (This advice was tested on 2010 August 2.)
+
+{stdenv, fetchurl, cups, gcc, ghostscript, glibc, patchelf}:
+
+stdenv.mkDerivation rec {
+ name = "samsung-UnifiedLinuxDriver-0.92";
+
+ src = fetchurl {
+ url = "http://downloadcenter.samsung.com/content/DR/200911/20091103171827750/UnifiedLinuxDriver_0.92.tar.gz";
+ sha256 = "0p2am0p8xvm339mad07c4j77gz31m63z76sy6d9hgwmxy2prbqfq";
+ };
+
+ buildInputs = [ cups gcc ghostscript glibc patchelf ];
+
+ inherit cups gcc ghostscript glibc;
+
+ builder = ./builder.sh;
+
+ meta = {
+ description = "Samsung's Linux drivers; includes binaries without source code";
+ homepage = "http://www.samsung.com/";
+ license = "samsung"; # Binary-only
+ };
+}
diff --git a/pkgs/misc/drivers/foomatic-filters/default.nix b/pkgs/misc/drivers/foomatic-filters/default.nix
index 867f4f440d5..ff03770014d 100644
--- a/pkgs/misc/drivers/foomatic-filters/default.nix
+++ b/pkgs/misc/drivers/foomatic-filters/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, fetchurl, perl, cups, coreutils, gnused }:
+{ stdenv, fetchurl, pkgconfig, perl, cups, dbus }:
stdenv.mkDerivation rec {
- name = "foomatic-filters-4.0.6";
+ name = "foomatic-filters-4.0.12";
src = fetchurl {
url = "http://www.openprinting.org/download/foomatic/${name}.tar.gz";
- sha256 = "0wa9hlq7s99sh50kl6bj8j0vxrz7pcbwdnqs1yfjjhqshfh7hsav";
+ sha256 = "17w26r15094j4fqifa7f7i7jad4gsy9zdlq69kffrykcw31qx3q8";
};
- buildInputs = [ perl cups ];
+ buildInputs = [ pkgconfig perl cups dbus ];
preConfigure =
''
diff --git a/pkgs/misc/drivers/gutenprint/bin.nix b/pkgs/misc/drivers/gutenprint/bin.nix
index d78e1674d87..1def4b7d1c9 100644
--- a/pkgs/misc/drivers/gutenprint/bin.nix
+++ b/pkgs/misc/drivers/gutenprint/bin.nix
@@ -56,6 +56,9 @@ stdenv.mkDerivation {
patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
--set-rpath $libPath $p
done
+
+ mkdir $out/lib
+ ln -s $out/cups/lib $out/lib/cups
'';
meta = {
diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix
index 514655bd727..5b9ef87a129 100644
--- a/pkgs/misc/drivers/hplip/default.nix
+++ b/pkgs/misc/drivers/hplip/default.nix
@@ -1,5 +1,5 @@
-{stdenv, fetchurl, cups, zlib, libjpeg, libusb, python, saneBackends, dbus
-, pkgconfig, polkit, qtSupport ? true, qt4
+{stdenv, fetchurl, cups, zlib, libjpeg, libusb, pythonPackages, saneBackends, dbus
+, pkgconfig, polkit, qtSupport ? true, qt4, pythonDBus, pyqt4, net_snmp
}:
stdenv.mkDerivation rec {
@@ -16,6 +16,7 @@ stdenv.mkDerivation rec {
prePatch = ''
sed -i s,/etc/sane.d,$out/etc/sane.d/, Makefile.in
+ sed -i s,/etc/hp/,$out/etc/hp/, base/g.py
'';
# --disable-network-build Until we have snmp
@@ -28,7 +29,7 @@ stdenv.mkDerivation rec {
--with-systraydir=$out/xdg/autostart
--with-mimedir=$out/etc/cups
--enable-policykit
- --disable-network-build"
+ "
export makeFlags="
halpredir=$out/share/hal/fdi/preprobe/10osvendor
@@ -41,8 +42,27 @@ stdenv.mkDerivation rec {
";
'';
- buildInputs = [libjpeg cups libusb python saneBackends dbus pkgconfig] ++
- stdenv.lib.optional qtSupport qt4;
+ postInstall = ''
+ wrapPythonPrograms
+ '';
+
+ buildInputs = [
+ libjpeg
+ cups
+ libusb
+ pythonPackages.python
+ pythonPackages.wrapPython
+ saneBackends
+ dbus
+ pkgconfig
+ net_snmp
+ ] ++ stdenv.lib.optional qtSupport qt4;
+
+ pythonPath = with pythonPackages; [
+ pythonDBus
+ pygobject
+ recursivePthLoader
+ ] ++ stdenv.lib.optional qtSupport pyqt4;
meta = with stdenv.lib; {
description = "Print, scan and fax HP drivers for Linux";
diff --git a/pkgs/misc/emulators/dlx/default.nix b/pkgs/misc/emulators/dlx/default.nix
new file mode 100644
index 00000000000..c23b60c29b3
--- /dev/null
+++ b/pkgs/misc/emulators/dlx/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl, unzip }:
+
+stdenv.mkDerivation {
+ name = "dlx-2012.07.08";
+
+ src = fetchurl {
+ url = "http://www.davidviner.com/zip/dlx/dlx.zip";
+ sha256 = "0q5hildq2xcig7yrqi26n7fqlanyssjirm7swy2a9icfxpppfpkn";
+ };
+
+ buildInputs = [ unzip ];
+
+ makeFlags = "LINK=gcc CFLAGS=-O2";
+
+ installPhase = ''
+ mkdir -p $out/include/dlx $out/share/dlx/{examples,doc} $out/bin
+ mv -v masm mon dasm $out/bin/
+ mv -v *.i auto.a $out/include/dlx/
+ mv -v *.a *.m $out/share/dlx/examples/
+ mv -v README.txt MANUAL.TXT $out/share/dlx/doc/
+ '';
+
+ meta = {
+ homepage = "http://www.davidviner.com/dlx.php";
+ description = "DLX Simulator";
+ license = "GPL-2";
+ };
+}
diff --git a/pkgs/misc/emulators/wine/build_winetricks.sh b/pkgs/misc/emulators/wine/build_winetricks.sh
new file mode 100644
index 00000000000..2d19e749f2d
--- /dev/null
+++ b/pkgs/misc/emulators/wine/build_winetricks.sh
@@ -0,0 +1,17 @@
+#!bash
+source $stdenv/setup
+mkdir -p $out/bin
+cp $src/src/winetricks $out/bin/winetricks
+chmod +x $out/bin/winetricks
+cd $out/bin
+patch -u -p0 < $patch
+
+mkdir -p "$out/share/man/man1"
+cp "$src/src/winetricks.1" "$out/share/man/man1/"
+
+patchShebangs "$out"
+
+substituteInPlace "$out/bin/winetricks" --replace "/usr/bin/perl" `which perl`
+
+# add stuff to PATH
+sed -i "2i PATH=\"${pathAdd}:\${PATH}\"" "$out/bin/winetricks"
diff --git a/pkgs/misc/emulators/wine/default.nix b/pkgs/misc/emulators/wine/default.nix
index b35660daf5e..010e65f62eb 100644
--- a/pkgs/misc/emulators/wine/default.nix
+++ b/pkgs/misc/emulators/wine/default.nix
@@ -1,22 +1,23 @@
{ stdenv, fetchurl, xlibs, flex, bison, mesa, alsaLib
, ncurses, libpng, libjpeg, lcms, freetype, fontconfig, fontforge
-, libxml2, libxslt, openssl, gnutls
+, libxml2, libxslt, openssl, gnutls, cups
}:
assert stdenv.isLinux;
assert stdenv.gcc.gcc != null;
stdenv.mkDerivation rec {
- name = "wine-1.5.10";
+ version = "1.5.23";
+ name = "wine-${version}";
src = fetchurl {
url = "mirror://sourceforge/wine/${name}.tar.bz2";
- sha256 = "04wydwc8q49bw8brlklx2nbgr453lx7bbfass5zn88xbz997lppk";
+ sha256 = "1wgs2bdl3sn3j0za7fk9zfjlii1x6qkvmyw4jxzz1mfw6nizswzr";
};
gecko = fetchurl {
- url = "mirror://sourceforge/wine/wine_gecko-1.5-x86.msi";
- sha256 = "2e372a1b87ff2a22ad5127400ece4b09e55591d9f84e00bb562d294898a49b5c";
+ url = "mirror://sourceforge/wine/wine_gecko-1.9-x86.msi";
+ sha256 = "10p7djsf85xjk8rzg3hgw5fskrn8402y2aijy701xwm4hy9ga79g";
};
buildInputs = [
@@ -24,7 +25,7 @@ stdenv.mkDerivation rec {
xlibs.libXcursor xlibs.libXinerama xlibs.libXrandr
xlibs.libXrender xlibs.libXxf86vm xlibs.libXcomposite
alsaLib ncurses libpng libjpeg lcms fontforge
- libxml2 libxslt openssl gnutls
+ libxml2 libxslt openssl gnutls cups
];
# Wine locates a lot of libraries dynamically through dlopen(). Add
@@ -34,7 +35,7 @@ stdenv.mkDerivation rec {
freetype fontconfig stdenv.gcc.gcc mesa mesa.libdrm
xlibs.libXinerama xlibs.libXrender xlibs.libXrandr
xlibs.libXcursor xlibs.libXcomposite libpng libjpeg
- openssl gnutls
+ openssl gnutls cups
];
# Don't shrink the ELF RPATHs in order to keep the extra RPATH
diff --git a/pkgs/misc/emulators/wine/default.upstream b/pkgs/misc/emulators/wine/default.upstream
new file mode 100644
index 00000000000..e23f341c28a
--- /dev/null
+++ b/pkgs/misc/emulators/wine/default.upstream
@@ -0,0 +1,8 @@
+url http://sourceforge.net/projects/wine/files/Source/
+version_link '[.]tar[.][^./]+/download$'
+SF_redirect
+do_overwrite () {
+ ensure_hash
+ set_var_value version "$CURRENT_VERSION"
+ set_var_value sha256 "$CURRENT_HASH"
+}
diff --git a/pkgs/misc/emulators/wine/wine-warcraft.nix b/pkgs/misc/emulators/wine/wine-warcraft.nix
deleted file mode 100644
index 3573c0ba4fe..00000000000
--- a/pkgs/misc/emulators/wine/wine-warcraft.nix
+++ /dev/null
@@ -1,49 +0,0 @@
-{ stdenv, fetchgit, xlibs, flex, bison, mesa, alsaLib
-, ncurses, libpng, libjpeg, lcms, freetype, fontconfig, fontforge
-, libxml2, libxslt, openssl, gnutls
-}:
-
-assert stdenv.isLinux;
-assert stdenv.gcc.gcc != null;
-
-stdenv.mkDerivation rec {
- name = "wine-warcraft-${version}";
- version = "1.1.19";
-
- src = fetchgit {
- url = git://repo.or.cz/wine/warcraft3.git;
- rev = "38faaffd99331b71284d8da5f76f38625107ed6d";
- };
-
- buildInputs = [
- xlibs.xlibs flex bison xlibs.libXi mesa
- xlibs.libXcursor xlibs.libXinerama xlibs.libXrandr
- xlibs.libXrender xlibs.libXxf86vm xlibs.libXcomposite
- xlibs.xf86vidmodeproto
- alsaLib ncurses libpng libjpeg lcms fontforge
- libxml2 libxslt openssl gnutls
- ];
-
- # Wine locates a lot of libraries dynamically through dlopen(). Add
- # them to the RPATH so that the user doesn't have to set them in
- # LD_LIBRARY_PATH.
- NIX_LDFLAGS = map (path: "-rpath ${path}/lib ") [
- freetype fontconfig stdenv.gcc.gcc mesa mesa.libdrm
- xlibs.libXinerama xlibs.libXrender xlibs.libXrandr
- xlibs.libXcursor xlibs.libXcomposite xlibs.libXxf86vm
- xlibs.xf86vidmodeproto
- openssl gnutls
- ];
-
- # Don't shrink the ELF RPATHs in order to keep the extra RPATH
- # elements specified above.
- dontPatchELF = true;
-
- meta = with stdenv.lib; {
- homepage = "http://www.winehq.org/";
- license = "LGPL";
- description = "An Open Source implementation of the Windows API on top of X, OpenGL, and Unix with patches for Warcraft 3";
- maintainers = [ maintainers.phreedom ];
- platforms = [ "i686-linux" ];
- };
-}
diff --git a/pkgs/misc/emulators/wine/winetricks.nix b/pkgs/misc/emulators/wine/winetricks.nix
new file mode 100644
index 00000000000..8a0901ddb80
--- /dev/null
+++ b/pkgs/misc/emulators/wine/winetricks.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchsvn, wine, perl, which, coreutils, zenity, curl, cabextract, unzip, p7zip } :
+
+stdenv.mkDerivation rec {
+ rev = "939";
+ name = "winetricks-${rev}";
+
+ src = fetchsvn {
+ url = "http://winetricks.googlecode.com/svn/trunk";
+ inherit rev;
+ };
+
+ buildInputs = [ perl which ];
+
+ pathAdd = stdenv.lib.concatStringsSep "/bin:" # coreutils is for sha1sum
+ [ wine perl which coreutils zenity curl cabextract unzip p7zip ]
+ + "/bin";
+
+ patch = ./winetricks.patch;
+
+ builder = ./build_winetricks.sh;
+
+ meta = {
+ description = "A script to install DLLs needed to work around problems in Wine";
+ license = "LGPLv2.1";
+ homepage = http://code.google.com/p/winetricks/;
+ };
+}
+
diff --git a/pkgs/misc/emulators/wine/winetricks.patch b/pkgs/misc/emulators/wine/winetricks.patch
new file mode 100644
index 00000000000..f419a0dcee4
--- /dev/null
+++ b/pkgs/misc/emulators/wine/winetricks.patch
@@ -0,0 +1,21 @@
+--- upstream-winetricks 2013-01-12 13:26:12.333076904 -0800
++++ winetricks 2013-01-12 14:37:39.675092352 -0800
+@@ -3398,7 +3398,7 @@
+ WINETRICKS_OPT_SHAREDPREFIX=${WINETRICKS_OPT_SHAREDPREFIX:-0}
+
+ # Mac folks tend to not have sha1sum, but we can make do with openssl
+- if [ -x "`which sha1sum 2>/dev/null`" ]
++ if [ -e "`which sha1sum 2>/dev/null`" ]
+ then
+ WINETRICKS_SHA1SUM="sha1sum"
+ elif [ -x "`which openssl 2>/dev/null`" ]
+@@ -3628,7 +3628,7 @@
+ if ! test "$WINETRICKS_LIB"
+ then
+ WINETRICKS_SRCDIR=`dirname "$0"`
+- WINETRICKS_SRCDIR=`cd "$WINETRICKS_SRCDIR"; /bin/pwd`
++ WINETRICKS_SRCDIR=`cd "$WINETRICKS_SRCDIR"; pwd`
+
+ # Which GUI helper to use (none/zenity/kdialog). See winetricks_detect_gui.
+ WINETRICKS_GUI=none
+
diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix
index 0a028660f7f..cf2c40f785e 100644
--- a/pkgs/misc/ghostscript/default.nix
+++ b/pkgs/misc/ghostscript/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, libjpeg, libpng, libtiff, zlib, pkgconfig, fontconfig, openssl, lcms, freetype
+{ stdenv, fetchurl, libjpeg, libpng, libtiff, zlib, pkgconfig, fontconfig, openssl
+, lcms2, freetype, libpaper, jbig2dec, expat
, x11Support, x11 ? null
, cupsSupport ? false, cups ? null
, gnuFork ? true
@@ -8,8 +9,8 @@ assert x11Support -> x11 != null;
assert cupsSupport -> cups != null;
let
- meta = {
- homepage = http://www.gnu.org/software/ghostscript/;
+ meta_common = {
+ homepage = "http://www.gnu.org/software/ghostscript/";
description = "GNU Ghostscript, a PostScript interpreter";
longDescription = ''
@@ -27,35 +28,38 @@ let
maintainers = [ stdenv.lib.maintainers.ludo stdenv.lib.maintainers.viric ];
};
- gnuForkData = rec {
+ gnuForkSrc = rec {
name = "ghostscript-9.04.1";
src = fetchurl {
url = "mirror://gnu/ghostscript/gnu-${name}.tar.bz2";
sha256 = "0zqa6ggbkdqiszsywgrra4ij0sddlmrfa50bx2mh568qid4ga0a2";
};
- inherit meta;
+ meta = meta_common;
patches = [ ./purity.patch ];
};
- mainlineData = {
- name = "ghostscript-9.05";
+ mainlineSrc = rec {
+ name = "ghostscript-9.06";
src = fetchurl {
- url = http://downloads.ghostscript.com/public/ghostscript-9.05.tar.bz2;
- sha256 = "1b6fi76x6pn9dmr9k9lh8kimn968dmh91k824fmm59d5ycm22h8g";
+ url = "http://downloads.ghostscript.com/public/${name}.tar.bz2";
+ sha256 = "014f10rxn4ihvcr1frby4szd1jvkrwvmdhnbivpp55c9fssx3b05";
};
- meta = meta // {
- homepage = http://www.ghostscript.com/;
+ meta = meta_common // {
+ homepage = "http://www.ghostscript.com/";
description = "GPL Ghostscript, a PostScript interpreter";
};
preConfigure = ''
- rm -R libpng jpeg lcms tiff freetype
+ rm -R libpng jpeg lcms{,2} tiff freetype jbig2dec expat jasper openjpeg
+
+ substituteInPlace base/unix-aux.mak --replace "INCLUDE=/usr/include" "INCLUDE=/no-such-path"
+ sed "s@if ( test -f \$(INCLUDE)[^ ]* )@if ( true )@" -i base/unix-aux.mak
'';
- patches = [ ./purity-9.05.patch ];
+ patches = [];
};
- variant = if gnuFork then gnuForkData else mainlineData;
+ variant = if gnuFork then gnuForkSrc else mainlineSrc;
in
@@ -64,19 +68,23 @@ stdenv.mkDerivation rec {
fonts = [
(fetchurl {
- url = mirror://gnu/ghostscript/gnu-gs-fonts-std-6.0.tar.gz;
- sha256 = "1lxr1y52r26qjif8kdqkfhsb5llakdcx3f5b9ppdyn59bb83ivsc";
+ url = "mirror://sourceforge/gs-fonts/ghostscript-fonts-std-8.11.tar.gz";
+ sha256 = "00f4l10xd826kak51wsmaz69szzm2wp8a41jasr4jblz25bg7dhf";
})
(fetchurl {
- url = mirror://gnu/ghostscript/gnu-gs-fonts-other-6.0.tar.gz;
+ url = "mirror://gnu/ghostscript/gnu-gs-fonts-other-6.0.tar.gz";
sha256 = "1cxaah3r52qq152bbkiyj2f7dx1rf38vsihlhjmrvzlr8v6cqil1";
})
# ... add other fonts here
];
- buildInputs = [libjpeg libpng libtiff zlib pkgconfig fontconfig openssl lcms]
- ++ stdenv.lib.optionals x11Support [x11 freetype]
- ++ stdenv.lib.optional cupsSupport cups;
+ buildInputs = [
+ libjpeg libpng libtiff zlib pkgconfig fontconfig openssl lcms2
+ libpaper jbig2dec expat
+ ] ++ stdenv.lib.optionals x11Support [x11 freetype]
+ ++ stdenv.lib.optional cupsSupport cups
+ # [] # maybe sometimes jpeg2000 support
+ ;
CFLAGS = "-fPIC";
NIX_LDFLAGS =
@@ -92,7 +100,7 @@ stdenv.mkDerivation rec {
makeFlagsArray=(CUPSSERVERBIN=$out/lib/cups CUPSSERVERROOT=$out/etc/cups CUPSDATA=$out/share/cups)
'' + stdenv.lib.optionalString (variant ? preConfigure) variant.preConfigure;
- configureFlags =
+ configureFlags = [ "--with-system-libtiff" ] ++
(if x11Support then [ "--with-x" ] else [ "--without-x" ]) ++
(if cupsSupport then [ "--enable-cups" "--with-install-cups" ] else [ "--disable-cups" ]);
@@ -100,6 +108,7 @@ stdenv.mkDerivation rec {
installTargets="install soinstall";
+ # ToDo: web says the fonts should be already included
postInstall = ''
for i in $fonts; do
(cd $out/share/ghostscript && tar xvfz $i)
diff --git a/pkgs/misc/ghostscript/libpng-1.5.patch b/pkgs/misc/ghostscript/libpng-1.5.patch
deleted file mode 100644
index b00305804a0..00000000000
--- a/pkgs/misc/ghostscript/libpng-1.5.patch
+++ /dev/null
@@ -1,198 +0,0 @@
-$NetBSD: patch-ak,v 1.5 2011/01/15 14:08:10 wiz Exp $
-
-Fix build with png-1.5. From John Bowler.
-
-See also http://bugs.ghostscript.com/show_bug.cgi?id=692060
-
---- a/base/gdevpng.c.orig 2008-07-17 02:34:01.000000000 +0000
-+++ b/base/gdevpng.c
-@@ -36,12 +36,14 @@
- #include "gdevpccm.h"
- #include "gscdefs.h"
-
--#define PNG_INTERNAL
- /*
- * libpng versions 1.0.3 and later allow disabling access to the stdxxx
- * files while retaining support for FILE * I/O.
-+ *
-+ * This is a misunderstanding - this is a build time option for libpng,
-+ * it has no effect on a user of libpng.
- */
--#define PNG_NO_CONSOLE_IO
-+/*#define PNG_NO_CONSOLE_IO*/
- /*
- * Earlier libpng versions require disabling FILE * I/O altogether.
- * This produces a compiler warning about no prototype for png_init_io.
-@@ -280,7 +282,7 @@ png_print_page(gx_device_printer * pdev,
- goto done;
- }
- /* set error handling */
-- if (setjmp(png_ptr->jmpbuf)) {
-+ if (setjmp(png_jmpbuf(png_ptr))) {
- /* If we get here, we had a problem reading the file */
- code = gs_note_error(gs_error_VMerror);
- goto done;
-@@ -290,19 +292,12 @@ png_print_page(gx_device_printer * pdev,
- png_init_io(png_ptr, file);
-
- /* set the file information here */
-- info_ptr->width = pdev->width;
-- info_ptr->height = pdev->height;
-- /* resolution is in pixels per meter vs. dpi */
-- info_ptr->x_pixels_per_unit =
-- (png_uint_32) (pdev->HWResolution[0] * (100.0 / 2.54));
-- info_ptr->y_pixels_per_unit =
-- (png_uint_32) (pdev->HWResolution[1] * (100.0 / 2.54));
-- info_ptr->phys_unit_type = PNG_RESOLUTION_METER;
-- info_ptr->valid |= PNG_INFO_pHYs;
- switch (depth) {
- case 32:
-- info_ptr->bit_depth = 8;
-- info_ptr->color_type = PNG_COLOR_TYPE_RGB_ALPHA;
-+ png_set_IHDR(png_ptr, info_ptr, pdev->width, pdev->height,
-+ 8, PNG_COLOR_TYPE_RGB_ALPHA,
-+ PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT,
-+ PNG_FILTER_TYPE_DEFAULT);
- png_set_invert_alpha(png_ptr);
- { gx_device_pngalpha *ppdev = (gx_device_pngalpha *)pdev;
- png_color_16 background;
-@@ -315,57 +310,69 @@ png_print_page(gx_device_printer * pdev,
- }
- break;
- case 48:
-- info_ptr->bit_depth = 16;
-- info_ptr->color_type = PNG_COLOR_TYPE_RGB;
-+ png_set_IHDR(png_ptr, info_ptr, pdev->width, pdev->height,
-+ 16, PNG_COLOR_TYPE_RGB,
-+ PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT,
-+ PNG_FILTER_TYPE_DEFAULT);
- #if defined(ARCH_IS_BIG_ENDIAN) && (!ARCH_IS_BIG_ENDIAN)
- png_set_swap(png_ptr);
- #endif
- break;
- case 24:
-- info_ptr->bit_depth = 8;
-- info_ptr->color_type = PNG_COLOR_TYPE_RGB;
-+ png_set_IHDR(png_ptr, info_ptr, pdev->width, pdev->height,
-+ 8, PNG_COLOR_TYPE_RGB,
-+ PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT,
-+ PNG_FILTER_TYPE_DEFAULT);
- break;
- case 8:
-- info_ptr->bit_depth = 8;
-- if (gx_device_has_color(pdev))
-- info_ptr->color_type = PNG_COLOR_TYPE_PALETTE;
-- else
-- info_ptr->color_type = PNG_COLOR_TYPE_GRAY;
-+ png_set_IHDR(png_ptr, info_ptr, pdev->width, pdev->height,
-+ 8, gx_device_has_color(pdev) ?
-+ PNG_COLOR_TYPE_PALETTE : PNG_COLOR_TYPE_GRAY,
-+ PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT,
-+ PNG_FILTER_TYPE_DEFAULT);
- break;
- case 4:
-- info_ptr->bit_depth = 4;
-- info_ptr->color_type = PNG_COLOR_TYPE_PALETTE;
-+ png_set_IHDR(png_ptr, info_ptr, pdev->width, pdev->height,
-+ 4, PNG_COLOR_TYPE_PALETTE,
-+ PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT,
-+ PNG_FILTER_TYPE_DEFAULT);
- break;
- case 1:
-- info_ptr->bit_depth = 1;
-- info_ptr->color_type = PNG_COLOR_TYPE_GRAY;
-+ png_set_IHDR(png_ptr, info_ptr, pdev->width, pdev->height,
-+ 1, PNG_COLOR_TYPE_GRAY,
-+ PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT,
-+ PNG_FILTER_TYPE_DEFAULT);
- /* invert monocrome pixels */
- png_set_invert_mono(png_ptr);
- break;
-+ default:
-+ png_error(png_ptr, "invalid bit depth");
- }
-
-+ /* resolution is in pixels per meter vs. dpi */
-+ png_set_pHYs(png_ptr, info_ptr,
-+ (png_uint_32) (pdev->HWResolution[0] * (100.0 / 2.54)),
-+ (png_uint_32) (pdev->HWResolution[1] * (100.0 / 2.54)),
-+ PNG_RESOLUTION_METER);
-+
- /* set the palette if there is one */
-- if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE) {
-+ if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_PALETTE) {
- int i;
- int num_colors = 1 << depth;
- gx_color_value rgb[3];
-+ png_color palette[256];
-+
-+ if (num_colors > 256)
-+ num_colors = 256;
-
-- info_ptr->palette =
-- (void *)gs_alloc_bytes(mem, 256 * sizeof(png_color),
-- "png palette");
-- if (info_ptr->palette == 0) {
-- code = gs_note_error(gs_error_VMerror);
-- goto done;
-- }
-- info_ptr->num_palette = num_colors;
-- info_ptr->valid |= PNG_INFO_PLTE;
- for (i = 0; i < num_colors; i++) {
- (*dev_proc(pdev, map_color_rgb)) ((gx_device *) pdev,
- (gx_color_index) i, rgb);
-- info_ptr->palette[i].red = gx_color_value_to_byte(rgb[0]);
-- info_ptr->palette[i].green = gx_color_value_to_byte(rgb[1]);
-- info_ptr->palette[i].blue = gx_color_value_to_byte(rgb[2]);
-+ palette[i].red = gx_color_value_to_byte(rgb[0]);
-+ palette[i].green = gx_color_value_to_byte(rgb[1]);
-+ palette[i].blue = gx_color_value_to_byte(rgb[2]);
- }
-+ png_set_PLTE(png_ptr, info_ptr, palette, num_colors);
- }
- /* add comment */
- strncpy(software_key, "Software", sizeof(software_key));
-@@ -375,15 +382,14 @@ png_print_page(gx_device_printer * pdev,
- text_png.key = software_key;
- text_png.text = software_text;
- text_png.text_length = strlen(software_text);
-- info_ptr->text = &text_png;
-- info_ptr->num_text = 1;
-+ png_set_text(png_ptr, info_ptr, &text_png, 1);
-
- /* write the file information */
- png_write_info(png_ptr, info_ptr);
-
- /* don't write the comments twice */
-- info_ptr->num_text = 0;
-- info_ptr->text = NULL;
-+ /*info_ptr->num_text = 0;*/
-+ /*info_ptr->text = NULL;*/
-
- /* Write the contents of the image. */
- for (y = 0; y < height; y++) {
-@@ -395,7 +401,7 @@ png_print_page(gx_device_printer * pdev,
- png_write_end(png_ptr, info_ptr);
-
- /* if you alloced the palette, free it here */
-- gs_free_object(mem, info_ptr->palette, "png palette");
-+ /*gs_free_object(mem, info_ptr->palette, "png palette");*/
-
- done:
- /* free the structures */
-@@ -405,6 +411,7 @@ png_print_page(gx_device_printer * pdev,
- return code;
- }
-
-+#if 0 /* not required in 1.5 */
- /*
- * Patch around a static reference to a never-used procedure.
- * This could be avoided if we were willing to edit pngconf.h to
-@@ -422,6 +429,7 @@ png_push_fill_buffer(png_structp png_ptr
- {
- }
- #endif
-+#endif
-
- static int
- pngalpha_open(gx_device * pdev)
diff --git a/pkgs/misc/ghostscript/purity-9.05.patch b/pkgs/misc/ghostscript/purity-9.05.patch
deleted file mode 100644
index cae9df7110b..00000000000
--- a/pkgs/misc/ghostscript/purity-9.05.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/base/unix-aux.mak b/base/unix-aux.mak
-index 18745bc..0a67942 100644
---- a/base/unix-aux.mak
-+++ b/base/unix-aux.mak
-@@ -111,15 +111,15 @@ $(MKROMFS_XE): $(MKROMFS_XE)_$(SHARE_ZLIB) $(MAKEDIRS)
- # The "else true;" is required because Ultrix's implementation of sh -e
- # terminates execution of a command if any error occurs, even if the command
- # traps the error with ||.
--INCLUDE=/usr/include
-+INCLUDE=/no-such-path
- $(gconfig__h): $(UNIX_AUX_MAK) $(ECHOGS_XE)
- $(ECHOGS_XE) -w $(gconfig__h) -x 2f2a -s This file was generated automatically by unix-aux.mak. -s -x 2a2f
-- if ( test -f $(INCLUDE)/dirent.h ); then $(ECHOGS_XE) -a $(gconfig__h) -x 23 define HAVE_DIRENT_H; else true; fi
-- if ( test -f $(INCLUDE)/ndir.h ); then $(ECHOGS_XE) -a $(gconfig__h) -x 23 define HAVE_NDIR_H; else true; fi
-- if ( test -f $(INCLUDE)/sys/dir.h ); then $(ECHOGS_XE) -a $(gconfig__h) -x 23 define HAVE_SYS_DIR_H; else true; fi
-- if ( test -f $(INCLUDE)/sys/ndir.h ); then $(ECHOGS_XE) -a $(gconfig__h) -x 23 define HAVE_SYS_NDIR_H; else true; fi
-- if ( test -f $(INCLUDE)/sys/time.h ); then $(ECHOGS_XE) -a $(gconfig__h) -x 23 ifndef HAVE_SYS_TIME_H ; \
-+ if ( true ); then $(ECHOGS_XE) -a $(gconfig__h) -x 23 define HAVE_DIRENT_H; else true; fi
-+ if ( true ); then $(ECHOGS_XE) -a $(gconfig__h) -x 23 define HAVE_NDIR_H; else true; fi
-+ if ( true ); then $(ECHOGS_XE) -a $(gconfig__h) -x 23 define HAVE_SYS_DIR_H; else true; fi
-+ if ( true ); then $(ECHOGS_XE) -a $(gconfig__h) -x 23 define HAVE_SYS_NDIR_H; else true; fi
-+ if ( true ); then $(ECHOGS_XE) -a $(gconfig__h) -x 23 ifndef HAVE_SYS_TIME_H ; \
- $(ECHOGS_XE) -a $(gconfig__h) -x 23 define HAVE_SYS_TIME_H ; \
- $(ECHOGS_XE) -a $(gconfig__h) -x 23 endif; else true; fi
-- if ( test -f $(INCLUDE)/sys/times.h ); then $(ECHOGS_XE) -a $(gconfig__h) -x 23 define HAVE_SYS_TIMES_H; else true; fi
-+ if ( true ); then $(ECHOGS_XE) -a $(gconfig__h) -x 23 define HAVE_SYS_TIMES_H; else true; fi
- if ( test -f $(JSRCDIR)/jmemsys.h); then true; else $(ECHOGS_XE) -a $(gconfig__h) -x 23 define DONT_HAVE_JMEMSYS_H; fi
diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix
index 7447421fc94..826924b8e8e 100644
--- a/pkgs/misc/jackaudio/default.nix
+++ b/pkgs/misc/jackaudio/default.nix
@@ -1,16 +1,18 @@
{ stdenv, fetchurl, alsaLib, dbus, expat, libsamplerate
, libsndfile, makeWrapper, pkgconfig, python, pythonDBus
-, firewireSupport ? false, ffado ? null }:
+, firewireSupport ? false, ffado ? null, bash }:
assert firewireSupport -> ffado != null;
stdenv.mkDerivation rec {
name = "jackdbus-${version}";
- version = "1.9.8";
+ version = "1.9.9.5";
src = fetchurl {
- url = "http://www.grame.fr/~letz/jack-1.9.8.tgz";
- sha256 = "0788092zxrivcfnfg15brpjkf14x8ma8cwjz4k0b9xdxajn2wwac";
+ urls = [
+ https://dl.dropbox.com/u/28869550/jack-1.9.9.5.tar.bz2
+ ];
+ sha256 = "1ggba69jsfg7dmjzlyqz58y2wa92lm3vwdy4r15bs7mvxb65mvv5";
};
buildInputs =
@@ -18,8 +20,11 @@ stdenv.mkDerivation rec {
pkgconfig python pythonDBus
] ++ (stdenv.lib.optional firewireSupport ffado);
+ patchPhase = ''
+ substituteInPlace svnversion_regenerate.sh --replace /bin/bash ${bash}/bin/bash
+ '';
+
configurePhase = ''
- cd jack-1.9.8
python waf configure --prefix=$out --dbus --alsa ${if firewireSupport then "--firewire" else ""}
'';
diff --git a/pkgs/misc/my-env/default.nix b/pkgs/misc/my-env/default.nix
index 990606668fe..85499e893f8 100644
--- a/pkgs/misc/my-env/default.nix
+++ b/pkgs/misc/my-env/default.nix
@@ -63,8 +63,8 @@
mkDerivation {
# The setup.sh script from stdenv will expect the native build inputs in
- # the buildNativeInputs environment variable.
- buildNativeInputs = [ ] ++ buildInputs;
+ # the nativeBuildInputs environment variable.
+ nativeBuildInputs = [ ] ++ buildInputs;
# Trick to bypass the stdenv usual change of propagatedBuildInputs => propagatedNativeBuildInputs
propagatedBuildInputs2 = propagatedBuildInputs;
@@ -87,7 +87,7 @@ mkDerivation {
-e 's@trap.*@@' \
-i "$s"
cat >> "$out/dev-envs/''${name/env-/}" << EOF
- buildNativeInputs="$buildNativeInputs"
+ nativeBuildInputs="$nativeBuildInputs"
propagatedBuildInputs="$propagatedBuildInputs2"
# the setup-new script wants to write some data to a temp file.. so just let it do that and tidy up afterwards
tmp="\$("${pkgs.coreutils}/bin/mktemp" -d)"
@@ -95,6 +95,8 @@ mkDerivation {
phases=
# only do all the setup stuff in nix-support/*
set +e
+ # This prevents having -rpath /lib in NIX_LDFLAGS
+ export NIX_NO_SELF_RPATH=1
if [[ -z "\$ZSH_VERSION" ]]; then
source "$s"
else
diff --git a/pkgs/misc/rosegarden/default.nix b/pkgs/misc/rosegarden/default.nix
deleted file mode 100644
index dd4e351a020..00000000000
--- a/pkgs/misc/rosegarden/default.nix
+++ /dev/null
@@ -1,59 +0,0 @@
-x@{builderDefsPackage
- , automake, pkgconfig, libX11, libSM, imake, qt4, alsaLib, jackaudio
- , ladspaH, liblrdf, dssi, liblo, fftwSinglePrec, libsndfile, libsamplerate
- , xproto, libICE, perl, makedepend, librdf_raptor, lilypond, flac, libunwind
- , ...}:
-builderDefsPackage
-(a :
-let
- helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
- [];
-
- buildInputs = map (n: builtins.getAttr n x)
- (builtins.attrNames (builtins.removeAttrs x helperArgNames));
- sourceInfo = rec {
- baseName="rosegarden";
- version="10.10";
- project="${baseName}";
- name="${baseName}-${version}";
- url="mirror://sourceforge/project/${project}/${baseName}/${version}/${name}.tar.bz2";
- hash="1ia74kzkw1yr3h8q4lrccx49hcy2961rni3h4css7r6hdl9xq909";
- };
-in
-rec {
- src = a.fetchurl {
- url = sourceInfo.url;
- sha256 = sourceInfo.hash;
- };
-
- inherit (sourceInfo) name version;
- inherit buildInputs;
-
- /* doConfigure should be removed if not needed */
- phaseNames = ["doConfigure" "doMakeInstall"];
-
- configureFlags = [
- "--with-qtdir=${qt4}"
- ];
-
- setVars = a.noDepEntry ''
- export NIX_LDFLAGS="$NIX_LDFLAGS -lz -ldl -lX11"
- '';
-
- meta = {
- description = "A music editor and MIDI sequencer";
- maintainers = with a.lib.maintainers;
- [
- raskin
- ];
- platforms = with a.lib.platforms;
- linux;
- license = a.lib.licenses.gpl2;
- };
- passthru = {
- updateInfo = {
- downloadPage = "http://sourceforge.net/projects/rosegarden/files/rosegarden/";
- };
- };
-}) x
-
diff --git a/pkgs/misc/sane-backends/default.nix b/pkgs/misc/sane-backends/default.nix
deleted file mode 100644
index 31372aa8418..00000000000
--- a/pkgs/misc/sane-backends/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ stdenv, fetchurl, hotplugSupport ? true, libusb ? null
-, gt68xxFirmware ? null }:
-let
- firmware = gt68xxFirmware {inherit fetchurl;};
-in
-assert hotplugSupport -> (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux");
-
-stdenv.mkDerivation {
- name = "sane-backends-1.0.22";
-
- src = fetchurl {
- url = http://alioth.debian.org/frs/download.php/3503/sane-backends-1.0.22.tar.gz;
- sha256 = "0m0cz4ljw9asqvpryl6gx1ndwf7ll2qinlvql9whnzs901la314z";
- };
-
- udevSupport = hotplugSupport;
-
- buildInputs = if libusb != null then [libusb] else [];
-
- postInstall = ''
- if test "$udevSupport" = "1"; then
- mkdir -p $out/etc/udev/rules.d/
- ./tools/sane-desc -m udev > $out/etc/udev/rules.d/60-libsane.rules || \
- cp tools/udev/libsane.rules $out/etc/udev/rules.d/60-libsane.rules
- fi
- '';
-
- preInstall =
- if gt68xxFirmware != null then
- "mkdir -p \${out}/share/sane/gt68xx ; ln -s " + firmware.fw +
- " \${out}/share/sane/gt68xx/" + firmware.name
- else "";
-}
diff --git a/pkgs/misc/sane-backends/snapshot.nix b/pkgs/misc/sane-backends/snapshot.nix
deleted file mode 100644
index 636ae37ec05..00000000000
--- a/pkgs/misc/sane-backends/snapshot.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ stdenv, fetchurl, hotplugSupport ? true, libusb ? null
-, gt68xxFirmware ? null }:
-let
- firmware = gt68xxFirmware {inherit fetchurl;};
-in
-assert hotplugSupport -> stdenv.system == "i686-linux";
-
-stdenv.mkDerivation {
- name = "sane-backends-1.0.22.git201111204";
-
- src = fetchurl {
- url = http://www.sane-project.org/snapshots/sane-backends-git20111204.tar.gz;
- sha256 = "00b3fi8zjrq3in0wndz1xcz228mgfhwhh2knmyjsikr88hal0m47";
- };
-
- udevSupport = hotplugSupport;
-
- buildInputs = if libusb != null then [libusb] else [];
-
- postInstall = ''
- if test "$udevSupport" = "1"; then
- mkdir -p $out/etc/udev/rules.d/
- ./tools/sane-desc -m udev > $out/etc/udev/rules.d/60-libsane.rules || \
- cp tools/udev/libsane.rules $out/etc/udev/rules.d/60-libsane.rules
- fi
- '';
-
- preInstall =
- if gt68xxFirmware != null then
- "mkdir -p \${out}/share/sane/gt68xx ; ln -s " + firmware.fw +
- " \${out}/share/sane/gt68xx/" + firmware.name
- else "";
-}
diff --git a/pkgs/misc/sane-front/default.nix b/pkgs/misc/sane-front/default.nix
deleted file mode 100644
index 9427d17ac64..00000000000
--- a/pkgs/misc/sane-front/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{stdenv, fetchurl, saneBackends, libX11, gtk,
- pkgconfig, libusb ? null}:
-stdenv.mkDerivation {
- name = "sane-frontend";
-
- src = fetchurl {
- url = ftp://ftp.sane-project.org/pub/sane/sane-frontends-1.0.14/sane-frontends-1.0.14.tar.gz;
- md5 = "c63bf7b0bb5f530cf3c08715db721cd3";
- };
-
- preConfigure = ''
- sed -e '/SANE_CAP_ALWAYS_SETTABLE/d' -i src/gtkglue.c
- '';
-
- buildInputs = [saneBackends libX11 gtk pkgconfig] ++
- (if (libusb != null) then [libusb] else []);
-}
diff --git a/pkgs/misc/screensavers/rss-glx/builder.sh b/pkgs/misc/screensavers/rss-glx/builder.sh
deleted file mode 100644
index a0c138d5e04..00000000000
--- a/pkgs/misc/screensavers/rss-glx/builder.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-source $stdenv/setup
-
-# This is a very dirty hack to prevent the binaries from putting the
-# Mesa libraries in their RPATHs.
-mkdir -p $out/tmp
-ln -s $mesa/lib/* $out/tmp/
-mkdir -p $out/lib
-ln -s $mesa/lib/libGLU* $out/lib/
-export NIX_LDFLAGS="-L$out/tmp $NIX_LDFLAGS"
-
-genericBuild
-
-rm -rf $out/tmp
-
-
-# Add a wrapper around each program to use the appropriate OpenGL driver.
-mkdir -p $out/bin/.orig
-
-for i in $(cd $out/bin && ls); do
- mv $out/bin/$i $out/bin/.orig/$i
- cat >$out/bin/$i <
++ * Written-by: Gérald Kerma
++ *
++ * (C) Copyright 2003
++ * Kyle Harris, Nexus Technologies, Inc. kharris@nexus-tech.net
++ *
++ * See file CREDITS for list of people who contributed to this
++ * project.
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License as
++ * published by the Free Software Foundation; either version 2 of
++ * the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
++ * MA 02110-1301 USA
++ */
++
++#include
++#include
++#include
++#include
++#include
++#include
++#include
++#ifdef CONFIG_KIRKWOOD
++#include
++#endif
++#include "mv_sdio.h"
++
++#ifdef CONFIG_MMC
++
++#define DRIVER_NAME "mv-sdio"
++
++#ifdef DEBUG
++#define pr_debug(fmt, args...) printf(fmt, ##args)
++#else
++#define pr_debug(...) do { } while(0)
++#endif
++
++//static mv_sdio_t *mvsd = (mv_sdio_t *)mmc->priv;
++static mv_sdio_t *mvsd = (mv_sdio_t *)MV_SDIO_BASE;
++
++static int is_sdhc;
++extern int fat_register_device(block_dev_desc_t *dev_desc, int part_no);
++static block_dev_desc_t mmc_dev;
++block_dev_desc_t * mmc_get_dev(int dev)
++{
++ return ((block_dev_desc_t *)&mmc_dev);
++}
++
++/*
++ * FIXME needs to read cid and csd info to determine block size
++ * and other parameters
++ */
++static uchar mmc_buf[MMC_BLOCK_SIZE];
++static mv_mmc_csd_t mv_mmc_csd;
++static int mmc_ready = 0;
++
++/* MMC_DEFAULT_RCA should probably be just 1, but this may break other code
++ that expects it to be shifted. */
++static u_int16_t rca = 0;
++
++/* used for debug */
++static u_int32_t mv_mmc_size(const struct mv_mmc_csd *csd)
++{
++ u_int32_t block_len, mult, blocknr;
++
++ block_len = csd->read_bl_len << 12;
++ mult = csd->c_size_mult1 << 8;
++ blocknr = (csd->c_size+1) * mult;
++
++ return blocknr * block_len;
++}
++
++static int isprint (unsigned char ch)
++{
++ if (ch >= 32 && ch < 127)
++ return (1);
++
++ return (0);
++}
++
++static int toprint(char *dst, char c)
++{
++ if (isprint(c)) {
++ *dst = c;
++ return 1;
++ }
++
++ return sprintf(dst,"\\x%02x", c);
++
++}
++
++static void print_mmc_cid(mv_mmc_cid_t *cid)
++{
++ printf("MMC found. Card desciption is:\n");
++ printf("Manufacturer ID = %02x%02x%02x\n",
++ cid->id[0], cid->id[1], cid->id[2]);
++ printf("HW/FW Revision = %x %x\n",cid->hwrev, cid->fwrev);
++ cid->hwrev = cid->fwrev = 0; /* null terminate string */
++ printf("Product Name = %s\n",cid->name);
++ printf("Serial Number = %02x%02x%02x\n",
++ cid->sn[0], cid->sn[1], cid->sn[2]);
++ printf("Month = %d\n",cid->month);
++ printf("Year = %d\n",1997 + cid->year);
++}
++
++static void print_sd_cid(mv_sd_cid_t *cid)
++{
++ int len;
++ char tbuf[64];
++
++ printf("SD%s found. Card desciption is:\n", is_sdhc?"HC":"");
++
++ len = 0;
++ len += toprint(&tbuf[len], cid->oid_0);
++ len += toprint(&tbuf[len], cid->oid_1);
++ tbuf[len] = 0;
++
++ printf("Manufacturer: 0x%02x, OEM \"%s\"\n",
++ cid->mid, tbuf);
++
++ len = 0;
++ len += toprint(&tbuf[len], cid->pnm_0);
++ len += toprint(&tbuf[len], cid->pnm_1);
++ len += toprint(&tbuf[len], cid->pnm_2);
++ len += toprint(&tbuf[len], cid->pnm_3);
++ len += toprint(&tbuf[len], cid->pnm_4);
++ tbuf[len] = 0;
++
++ printf("Product name: \"%s\", revision %d.%d\n",
++ tbuf,
++ cid->prv >> 4, cid->prv & 15);
++
++ printf("Serial number: %u\n",
++ cid->psn_0 << 24 | cid->psn_1 << 16 | cid->psn_2 << 8 |
++ cid->psn_3);
++ printf("Manufacturing date: %d/%d\n",
++ cid->mdt_1 & 15,
++ 2000+((cid->mdt_0 & 15) << 4)+((cid->mdt_1 & 0xf0) >> 4));
++
++ printf("CRC: 0x%02x, b0 = %d\n",
++ cid->crc >> 1, cid->crc & 1);
++}
++
++static void mvsdio_set_clock(unsigned int clock)
++{
++ unsigned int m;
++
++ m = MVSDMMC_BASE_FAST_CLOCK/(2*clock) - 1;
++
++ pr_debug("mvsdio_set_clock: dividor = 0x%x clock=%d\n",
++ m, clock);
++
++
++ writew(m & 0x7ff, &mvsd->CLK_DIV);
++
++ if (isprint(1))
++ udelay(10*1000);
++}
++
++/****************************************************/
++static ulong * mv_mmc_cmd(ulong cmd, ulong arg, ushort xfermode, ushort resptype, ushort waittype)
++/****************************************************/
++{
++ static ulong resp[4];
++ ushort done ;
++ int err = 0 ;
++ ulong curr, start, diff, hz;
++ ushort response[8];
++
++ pr_debug("mv_mmc_cmd %x, arg: %x,xfer: %x,resp: %x, wait : %x\n"
++ , (unsigned int)cmd, (unsigned int)arg, xfermode, resptype, waittype);
++
++
++ /* clear status */
++ writew(0xffff, &mvsd->NOR_INTR_STATUS);
++ writew(0xffff, &mvsd->ERR_INTR_STATUS);
++
++ start = get_timer(0);
++ hz = CONFIG_SYS_HZ;
++
++ while((readw(&mvsd->PRESENT_STATE0) & CARD_BUSY)) {
++ curr = get_timer(0);
++ diff = (long) curr - (long) start;
++ if (diff > (3*hz))
++ {
++ /* 3 seconds timeout, card busy, can't sent cmd */
++ printf("card too busy \n");
++ return 0;
++ }
++ }
++
++ writew((ushort)(arg&0xffff), &mvsd->ARG_LOW);
++ writew((ushort)(arg>>16), &mvsd->ARG_HI);
++ writew(xfermode, &mvsd->XFER_MODE);
++ if( (cmd == MMC_CMD_READ_BLOCK) || (cmd == 25) )
++ {
++ writew(((cmd << 8) | resptype | 0x3c ) , &mvsd->CMD);
++ pr_debug("cmd reg : %x\n", readw(&mvsd->CMD)) ;
++
++ }
++ else
++ {
++ writew(((cmd << 8) | resptype ), &mvsd->CMD);
++ }
++
++ done = readw(&mvsd->NOR_INTR_STATUS) & waittype;
++ start = get_timer(0);
++
++ while( done!=waittype)
++ {
++ done = readw(&mvsd->NOR_INTR_STATUS) & waittype;
++
++ if( readw(&mvsd->NOR_INTR_STATUS) & 0x8000 )
++ {
++ pr_debug("Error! cmd : %d, err : %04x\n", (unsigned int)cmd, readw(&mvsd->ERR_INTR_STATUS)) ;
++
++ return 0 ; /* error happen */
++ }
++
++ curr = get_timer(0);
++ diff = (long) curr - (long) start;
++ if (diff > (3*hz))
++ {
++ pr_debug("cmd timeout, status : %04x\n", readw(&mvsd->NOR_INTR_STATUS));
++ pr_debug("xfer mode : %04x\n", readw(&mvsd->XFER_MODE));
++
++ err = 1 ;
++ break;
++ }
++ }
++
++ response[0] = readw(&mvsd->RSP0);
++ response[1] = readw(&mvsd->RSP1);
++ response[2] = readw(&mvsd->RSP2);
++ response[3] = readw(&mvsd->RSP3);
++ response[4] = readw(&mvsd->RSP4);
++ response[5] = readw(&mvsd->RSP5);
++ response[6] = readw(&mvsd->RSP6);
++ response[7] = readw(&mvsd->RSP7);
++
++ memset(resp, 0, sizeof(resp));
++
++ switch (resptype & 0x3) {
++ case SDIO_CMD_RSP_48:
++ case SDIO_CMD_RSP_48BUSY:
++ resp[0] = ((response[2] & 0x3f) << (8 - 8)) |
++ ((response[1] & 0xffff) << (14 - 8)) |
++ ((response[0] & 0x3ff) << (30 - 8));
++ resp[1] = ((response[0] & 0xfc00) >> 10);
++ break;
++
++ case SDIO_CMD_RSP_136:
++ resp[3] = ((response[7] & 0x3fff) << 8) |
++ ((response[6] & 0x3ff) << 22);
++ resp[2] = ((response[6] & 0xfc00) >> 10) |
++ ((response[5] & 0xffff) << 6) |
++ ((response[4] & 0x3ff) << 22);
++ resp[1] = ((response[4] & 0xfc00) >> 10) |
++ ((response[3] & 0xffff) << 6) |
++ ((response[2] & 0x3ff) << 22);
++ resp[0] = ((response[2] & 0xfc00) >> 10) |
++ ((response[1] & 0xffff) << 6) |
++ ((response[0] & 0x3ff) << 22);
++ break;
++ default:
++ return 0;
++ }
++ int i;
++ pr_debug("MMC resp :");
++ for (i=0; i<4; ++i ) {
++ pr_debug(" %08x", (unsigned int)resp[i]);
++ }
++ pr_debug("\n");
++ if( err )
++ return NULL ;
++ else
++ return resp;
++}
++
++/****************************************************/
++static int mv_mmc_block_read(uchar *dst, ulong src, ulong len)
++/****************************************************/
++{
++ ulong *resp;
++
++ if (len == 0) {
++ return 0;
++ }
++
++ if (is_sdhc) {
++ /* SDHC: use block address */
++ src >>= 9;
++ }
++
++ pr_debug("mmc_block_rd dst %lx src %lx len %d\n", (ulong)dst, src, (int)len);
++
++ /* prepare for dma transfer */
++ writew(((ulong)(dst))&0xffff,&mvsd->SYS_ADDR_LOW);
++ writew(((ulong)(dst)>>16)&0xffff,&mvsd->SYS_ADDR_HI);
++ writew(len,&mvsd->BLK_SIZE);
++ writew(1,&mvsd->BLK_COUNT);
++
++ /* send read command */
++ resp = mv_mmc_cmd(MMC_CMD_READ_BLOCK, src, 0x10 ,
++ SDIO_CMD_RSP_48, SDIO_NOR_XFER_DONE);
++ if (!resp) {
++ pr_debug("mv_mmc_block_read: mmc read block cmd fails\n");
++ return -EIO;
++ }
++
++ return 0;
++}
++
++/****************************************************/
++int mv_mmc_read(ulong src, uchar *dst, int size)
++/****************************************************/
++{
++ ulong end, part_start, part_end, part_len, aligned_start, aligned_end;
++ ulong mmc_block_size, mmc_block_address;
++
++ if (size == 0) {
++ return 0;
++ }
++
++ if (!mmc_ready) {
++ printf("Please initial the MMC first\n");
++ return -1;
++ }
++
++ mmc_block_size = MMC_BLOCK_SIZE;
++ mmc_block_address = ~(mmc_block_size - 1);
++
++ end = src + size;
++ part_start = ~mmc_block_address & src;
++ part_end = ~mmc_block_address & end;
++ aligned_start = mmc_block_address & src;
++ aligned_end = mmc_block_address & end;
++
++ /* all block aligned accesses */
++ pr_debug("src %lx dst %lx end %lx pstart %lx pend %lx astart %lx aend %lx\n",
++ (long unsigned int)src,(ulong)dst, end, part_start, part_end, aligned_start, aligned_end);
++
++ if (part_start) {
++ part_len = mmc_block_size - part_start;
++ pr_debug("ps src %lx dst %lx end %lx pstart %lx pend %lx astart %lx aend %lx\n",
++ (long unsigned int)src,(ulong)dst, end, part_start, part_end, aligned_start, aligned_end);
++
++ if ((mv_mmc_block_read(mmc_buf, aligned_start, mmc_block_size)) < 0) {
++ return -1;
++ }
++ memcpy(dst, mmc_buf+part_start, part_len);
++ dst += part_len;
++ src += part_len;
++ }
++ pr_debug("src %lx dst %lx end %lx pstart %lx pend %lx astart %lx aend %lx\n",
++ (long unsigned int)src,(ulong)dst, end, part_start, part_end, aligned_start, aligned_end);
++
++ for (; src < aligned_end; aligned_start +=mmc_block_size, src += mmc_block_size, dst += mmc_block_size) {
++ pr_debug("al src %lx dst %lx end %lx pstart %lx pend %lx astart %lx aend %lx\n",
++ (long unsigned int)src,(ulong)dst, end, part_start, part_end, aligned_start, aligned_end);
++
++ if ((mv_mmc_block_read(mmc_buf, aligned_start, mmc_block_size)) < 0) {
++ printf("mmc block read error\n");
++ return -1;
++ }
++ memcpy(dst, mmc_buf, mmc_block_size);
++ }
++ pr_debug("src %lx dst %lx end %lx pstart %lx pend %lx astart %lx aend %lx\n",
++ (long unsigned int)src,(ulong)dst, end, part_start, part_end, aligned_start, aligned_end);
++
++ if (part_end && src < end) {
++ pr_debug("pe src %lx dst %lx end %lx pstart %lx pend %lx astart %lx aend %lx\n",
++ (long unsigned int)src,(ulong)dst, end, part_start, part_end, aligned_start, aligned_end);
++
++ if ((mv_mmc_block_read(mmc_buf, aligned_end, mmc_block_size)) < 0) {
++ return -1;
++ }
++ memcpy(dst, mmc_buf, part_end);
++ }
++ return 0;
++}
++
++/****************************************************/
++static ulong mv_mmc_bread(int dev_num, ulong blknr, ulong blkcnt, ulong *dst)
++/****************************************************/
++{
++ int mmc_block_size = MMC_BLOCK_SIZE;
++ ulong src = blknr * mmc_block_size;
++
++ mv_mmc_read(src, (uchar *)dst, blkcnt*mmc_block_size);
++ return blkcnt;
++}
++
++/****************************************************/
++int mmc_legacy_init(int verbose)
++/****************************************************/
++{
++ int retries, rc = -ENODEV;
++ ulong *resp;
++ int sd_ver20;
++ int is_sd;
++ ushort reg;
++ uchar cidbuf[64];
++
++ sd_ver20 = 0;
++ is_sdhc = 0;
++ is_sd = 0;
++
++ /* Initial Host Ctrl : Timeout : max , Normal Speed mode, 4-bit data mode */
++ /* Big Endian, SD memory Card, Push_pull CMD Line */
++ writew( SDIO_HOST_CTRL_TMOUT(0xf) |
++ SDIO_HOST_CTRL_DATA_WIDTH_4_BITS |
++ SDIO_HOST_CTRL_BIG_ENDIAN |
++ SDIO_HOST_CTRL_PUSH_PULL_EN |
++ SDIO_HOST_CTRL_CARD_TYPE_MEM_ONLY ,
++ &mvsd->HOST_CTRL);
++
++ writew( 0, &mvsd->CLK_CTRL);
++
++ /* enable status */
++ writew( 0xffff, &mvsd->NOR_STATUS_EN);
++ writew( 0xffff, &mvsd->ERR_STATUS_EN);
++
++ /* disable interrupts */
++ writew( 0, &mvsd->NOR_INTR_EN);
++ writew( 0, &mvsd->ERR_INTR_EN);
++
++ writew( 0x100, &mvsd->SW_RESET);
++ udelay(10000);
++
++ mv_mmc_csd.c_size = 0;
++
++ /* reset */
++ retries = 10;
++ resp = mv_mmc_cmd(0, 0, 0, SDIO_CMD_RSP_NONE, SDIO_NOR_CMD_DONE );
++ pr_debug("cmd 0 resp : %08x %08x %08x %08x\n",
++ (unsigned int)resp[0], (unsigned int)resp[1], (unsigned int)resp[2], (unsigned int)resp[3] );
++
++
++ pr_debug ("trying to detect SD card version\n");
++
++ resp = mv_mmc_cmd(8, 0x000001aa, 0, SDIO_CMD_RSP_48, SDIO_NOR_CMD_DONE );
++ pr_debug("cmd 8 resp : %08x %08x %08x %08x\n",
++ (unsigned int)resp[0], (unsigned int)resp[1], (unsigned int)resp[2], (unsigned int)resp[3] );
++
++ if (resp && (resp[0] & 0x1ff)==0x1aa) {
++ pr_debug ("SD version 2.0 card detected\n");
++
++ sd_ver20 = 1;
++ }
++
++ if (sd_ver20)
++ retries = 50;
++ else
++ retries = 10;
++
++ while (retries--) {
++ resp = mv_mmc_cmd(55, 0, 0, SDIO_CMD_RSP_48, SDIO_NOR_CMD_DONE );
++ pr_debug("cmd 55 resp : %08x %08x %08x %08x\n",
++ (unsigned int)resp[0], (unsigned int)resp[1], (unsigned int)resp[2], (unsigned int)resp[3] );
++
++
++ if (sd_ver20)
++ resp = mv_mmc_cmd(41, 0x40300000, 0, SDIO_CMD_RSP_48, SDIO_NOR_CMD_DONE );
++ else
++ resp = mv_mmc_cmd(41, 0x00300000, 0, SDIO_CMD_RSP_48, SDIO_NOR_CMD_DONE );
++
++ pr_debug("cmd 41 resp : %08x %08x %08x %08x\n",
++ (unsigned int)resp[0], (unsigned int)resp[1], (unsigned int)resp[2], (unsigned int)resp[3] );
++
++
++ if (resp && (resp[0] & 0x80000000)) {
++ pr_debug ("detected SD card\n");
++
++ is_sd = 1;
++ break;
++ }
++
++ udelay(100*1000);
++ }
++
++ if (retries <= 0 && !is_sd) {
++ pr_debug ("failed to detect SD card, trying MMC\n");
++
++ retries = 10;
++ while (retries--) {
++ resp = mv_mmc_cmd(1, 0, 0, SDIO_CMD_RSP_48, SDIO_NOR_CMD_DONE );
++ pr_debug("cmd 01 resp : %08x %08x %08x %08x\n",
++ (unsigned int)resp[0], (unsigned int)resp[1], (unsigned int)resp[2], (unsigned int)resp[3] );
++
++
++ if (resp && (resp[0] & 0x80000000)) {
++ printf ("detected MMC card\n");
++ reg = readw(&mvsd->HOST_CTRL);
++ reg &= ~(0x3<<1);
++ reg |= SDIO_HOST_CTRL_CARD_TYPE_IO_MMC;
++ writew( reg, &mvsd->HOST_CTRL);
++ break;
++ }
++
++ udelay(100*1000);
++ }
++ }
++
++ if (retries <= 0) {
++ pr_debug ("detect fails\n");
++
++ return -ENODEV;
++ }
++
++ /* try to get card id */
++ resp = mv_mmc_cmd(2, 0, 0, SDIO_CMD_RSP_136, SDIO_NOR_CMD_DONE );
++ pr_debug("cmd 2 resp : %08x %08x %08x %08x\n",
++ (unsigned int)resp[0], (unsigned int)resp[1], (unsigned int)resp[2], (unsigned int)resp[3] );
++
++
++ if (resp == NULL) {
++ pr_debug ("read cid fails\n");
++
++ return -ENODEV;
++ }
++
++ if (is_sd) {
++ mv_sd_cid_t *cid = (mv_sd_cid_t *) resp;
++
++ memcpy(cidbuf, resp, sizeof(mv_sd_cid_t));
++
++ sprintf((char *) mmc_dev.vendor,
++ "Man %02x OEM %c%c \"%c%c%c%c%c\"",
++ cid->mid, cid->oid_0, cid->oid_1,
++ cid->pnm_0, cid->pnm_1, cid->pnm_2, cid->pnm_3, cid->pnm_4);
++
++ sprintf((char *) mmc_dev.product, "%d",
++ (cid->psn_0 << 24) | (cid->psn_1 <<16) | (cid->psn_2 << 8) | (cid->psn_3 << 8));
++
++ sprintf((char *) mmc_dev.revision, "%d.%d", cid->prv>>4, cid->prv & 0xff);
++
++ } else {
++ /* TODO configure mmc driver depending on card attributes */
++ mv_mmc_cid_t *cid = (mv_mmc_cid_t *) resp;
++
++ memcpy(cidbuf, resp, sizeof(mv_sd_cid_t));
++
++
++ sprintf((char *) mmc_dev.vendor,
++ "Man %02x%02x%02x Snr %02x%02x%02x",
++ cid->id[0], cid->id[1], cid->id[2],
++ cid->sn[0], cid->sn[1], cid->sn[2]);
++ sprintf((char *) mmc_dev.product, "%s", cid->name);
++ sprintf((char *) mmc_dev.revision, "%x %x", cid->hwrev, cid->fwrev);
++ }
++
++ /* fill in device description */
++ mmc_dev.if_type = IF_TYPE_MMC;
++ mmc_dev.part_type = PART_TYPE_DOS;
++ mmc_dev.dev = 0;
++ mmc_dev.lun = 0;
++ mmc_dev.type = 0;
++
++ /* FIXME fill in the correct size (is set to 128MByte) */
++ mmc_dev.blksz = MMC_BLOCK_SIZE;
++ mmc_dev.lba = 0x10000;
++
++ mmc_dev.removable = 0;
++ mmc_dev.block_read = (unsigned long) mv_mmc_bread;
++
++ /* MMC exists, get CSD too */
++ resp = mv_mmc_cmd(MMC_CMD_SET_RCA, 0, 0, SDIO_CMD_RSP_48, SDIO_NOR_CMD_DONE );
++ if (resp == NULL) {
++ pr_debug ("set rca fails\n");
++
++ return -ENODEV;
++ }
++ pr_debug("cmd3 resp : 0x%08x 0x%08x 0x%08x 0x%08x\n",
++ (unsigned int)resp[0], (unsigned int)resp[1], (unsigned int)resp[2], (unsigned int)resp[3]);
++
++
++ if (is_sd)
++ rca = resp[0] >> 16;
++ else
++ rca = 0;
++
++ resp = mv_mmc_cmd(MMC_CMD_SEND_CSD, rca<<16, 0, SDIO_CMD_RSP_136,SDIO_NOR_CMD_DONE );
++ pr_debug("cmd 9 resp : %08x %08x %08x %08x\n",
++ (unsigned int)resp[0], (unsigned int)resp[1], (unsigned int)resp[2], (unsigned int)resp[3] );
++
++ if (resp == NULL) {
++ pr_debug ("read csd fails\n");
++
++ return -ENODEV;
++ }
++
++ memcpy(&mv_mmc_csd, (mv_mmc_csd_t *) resp, sizeof(mv_mmc_csd_t));
++ rc = 0;
++ mmc_ready = 1;
++
++ /* FIXME add verbose printout for csd */
++ pr_debug ("size = %u\n", mv_mmc_size(&mv_mmc_csd));
++
++
++ resp = mv_mmc_cmd(7, rca<<16, 0, SDIO_CMD_RSP_48BUSY, SDIO_NOR_CMD_DONE);
++ if (resp == NULL) {
++ pr_debug ("select card fails\n");
++
++ return -ENODEV;
++ }
++ pr_debug("cmd 7 resp : %08x %08x %08x %08x\n",
++ (unsigned int)resp[0], (unsigned int)resp[1], (unsigned int)resp[2], (unsigned int)resp[3] );
++
++
++ if (is_sd) {
++ resp = mv_mmc_cmd(55, rca<<16, 0, SDIO_CMD_RSP_48, SDIO_NOR_CMD_DONE );
++ if (resp == NULL) {
++ pr_debug ("cmd55 fails\n");
++
++ return -ENODEV;
++ }
++ pr_debug("cmd55 resp : 0x%08x 0x%08x 0x%08x 0x%08x\n",
++ (unsigned int)resp[0], (unsigned int)resp[1], (unsigned int)resp[2], (unsigned int)resp[3]);
++
++
++ resp = mv_mmc_cmd(6, (rca<<16) | 0x2 , 0, SDIO_CMD_RSP_48, SDIO_NOR_CMD_DONE );
++ if (resp == NULL) {
++ pr_debug ("cmd55 fails\n");
++
++ return -ENODEV;
++ }
++ pr_debug("cmd6 resp : 0x%08x 0x%08x 0x%08x 0x%08x\n",
++ (unsigned int)resp[0], (unsigned int)resp[1], (unsigned int)resp[2], (unsigned int)resp[3]);
++
++ }
++
++ resp = (ulong *) &mv_mmc_csd;
++ pr_debug("csd: 0x%08x 0x%08x 0x%08x 0x%08x\n",
++ (unsigned int)resp[0], (unsigned int)resp[1], (unsigned int)resp[2], (unsigned int)resp[3]);
++
++
++ /* check SDHC */
++ if ((resp[0]&0xf0000000)==0x40000000)
++ is_sdhc = 1;
++
++ /* set block len */
++ resp = mv_mmc_cmd(MMC_CMD_SET_BLOCKLEN, MMC_BLOCK_SIZE, 0, SDIO_CMD_RSP_48, SDIO_NOR_CMD_DONE );
++ if (!resp) {
++ pr_debug("mv_mmc_block_read: set blk len fails\n");
++ return -ENODEV;
++ }
++
++ if (verbose) {
++ if (is_sd)
++ print_sd_cid((mv_sd_cid_t *) cidbuf);
++ else
++ print_mmc_cid((mv_mmc_cid_t *) cidbuf);
++ }
++
++ mvsdio_set_clock(CONFIG_SYS_MMC_CLK_PP);
++
++ fat_register_device(&mmc_dev,1); /* partitions start counting with 1 */
++
++ return 0;
++}
++
++#endif /* CONFIG_MMC */
+diff --git a/drivers/mmc/mv_sdio.h b/drivers/mmc/mv_sdio.h
+new file mode 100644
+index 0000000..9707000
+--- /dev/null
++++ b/drivers/mmc/mv_sdio.h
+@@ -0,0 +1,310 @@
++/*
++ * (C) Copyright 2009
++ * Marvell Semiconductor
++ * Written-by: Gérald Kerma
++ *
++ * See file CREDITS for list of people who contributed to this
++ * project.
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License as
++ * published by the Free Software Foundation; either version 2 of
++ * the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
++ * MA 02110-1301 USA
++ */
++
++#ifndef _MVSDIO_INCLUDE
++#define _MVSDIO_INCLUDE
++
++//#define SDIO_REG(x) (MV_SDIO_BASE + (x))
++
++#define MVSDMMC_DMA_SIZE 65536
++#define MVSDMMC_CMD_TIMEOUT 2 /* 100 usec*/
++
++/*
++ * Clock rates
++ */
++
++#define MVSD_CLOCKRATE_MAX 50000000
++#define MVSD_BASE_DIV_MAX 0x7ff
++
++#define CONFIG_SYS_MMC_CLK_PP 25000000
++
++/*
++ * The base MMC clock rate
++ */
++
++#define MVSDMMC_CLOCKRATE_MIN 100000
++#define MVSDMMC_CLOCKRATE_MAX MVSD_CLOCKRATE_MAX
++#define MVSDMMC_BASE_FAST_CLOCK CONFIG_SYS_TCLK
++
++
++/*
++ * SDIO register
++ */
++#ifndef __ASSEMBLY__
++
++/*
++ * Structure for struct SoC access.
++ * Names starting with '_' are fillers.
++ */
++typedef struct mv_sdio {
++ /* reg Offset */
++ u32 SYS_ADDR_LOW; /* 0x00 */
++ u32 SYS_ADDR_HI; /* 0x04 */
++ u32 BLK_SIZE; /* 0x08 */
++ u32 BLK_COUNT; /* 0x0c */
++ u32 ARG_LOW; /* 0x10 */
++ u32 ARG_HI; /* 0x14 */
++ u32 XFER_MODE; /* 0x18 */
++ u32 CMD; /* 0x1c */
++ u32 RSP0; /* 0x20 */
++ u32 RSP1; /* 0x24 */
++ u32 RSP2; /* 0x28 */
++ u32 RSP3; /* 0x2c */
++ u32 RSP4; /* 0x30 */
++ u32 RSP5; /* 0x34 */
++ u32 RSP6; /* 0x38 */
++ u32 RSP7; /* 0x3c */
++ u32 BUF_DATA_PORT; /* 0x40 */
++ u32 RSVED; /* 0x44 */
++ u32 PRESENT_STATE0; /* 0x48 */
++ u32 PRESENT_STATE1; /* 0x4c */
++ u32 HOST_CTRL; /* 0x50 */
++ u32 BLK_GAP_CTRL; /* 0x54 */
++ u32 CLK_CTRL; /* 0x58 */
++ u32 SW_RESET; /* 0x5c */
++ u32 NOR_INTR_STATUS; /* 0x60 */
++ u32 ERR_INTR_STATUS; /* 0x64 */
++ u32 NOR_STATUS_EN; /* 0x68 */
++ u32 ERR_STATUS_EN; /* 0x6c */
++ u32 NOR_INTR_EN; /* 0x70 */
++ u32 ERR_INTR_EN; /* 0x74 */
++ u32 AUTOCMD12_ERR_STATUS; /* 0x78 */
++ u32 CURR_BYTE_LEFT; /* 0x7c */
++ u32 CURR_BLK_LEFT; /* 0x80 */
++ u32 AUTOCMD12_ARG_LOW; /* 0x84 */
++ u32 AUTOCMD12_ARG_HI; /* 0x88 */
++ u32 AUTOCMD12_INDEX; /* 0x8c */
++ u32 AUTO_RSP0; /* 0x90 */
++ u32 AUTO_RSP1; /* 0x94 */
++ u32 AUTO_RSP2; /* 0x98 */
++ u32 _9c; /* 0x9c */
++ u32 _a0[0x78]; /* 0xa0 */
++ u32 CLK_DIV; /* 0x128 */
++
++} mv_sdio_t;
++
++#endif /* __ASSEMBLY__ */
++
++/*
++ * SDIO_PRESENT_STATE
++ */
++
++#define CARD_BUSY (1 << 1)
++#define CMD_INHIBIT (1 << 0)
++#define CMD_TXACTIVE (1 << 8)
++#define CMD_RXACTIVE (1 << 9)
++#define CMD_AUTOCMD12ACTIVE (1 << 14)
++
++#define CMD_BUS_BUSY (CMD_AUTOCMD12ACTIVE| \
++ CMD_RXACTIVE| \
++ CMD_TXACTIVE| \
++ CMD_INHIBIT| \
++ CARD_BUSY)
++
++/*
++ * SDIO_CMD
++ */
++
++#define SDIO_CMD_RSP_NONE (0 << 0)
++#define SDIO_CMD_RSP_136 (1 << 0)
++#define SDIO_CMD_RSP_48 (2 << 0)
++#define SDIO_CMD_RSP_48BUSY (3 << 0)
++
++#define SDIO_CMD_CHECK_DATACRC16 (1 << 2)
++#define SDIO_CMD_CHECK_CMDCRC (1 << 3)
++#define SDIO_CMD_INDX_CHECK (1 << 4)
++#define SDIO_CMD_DATA_PRESENT (1 << 5)
++#define SDIO_UNEXPECTED_RESP (1 << 7)
++
++
++/*
++ * SDIO_XFER_MODE
++ */
++
++#define SDIO_XFER_MODE_STOP_CLK (1 << 5)
++#define SDIO_XFER_MODE_HW_WR_DATA_EN (1 << 1)
++#define SDIO_XFER_MODE_AUTO_CMD12 (1 << 2)
++#define SDIO_XFER_MODE_INT_CHK_EN (1 << 3)
++#define SDIO_XFER_MODE_TO_HOST (1 << 4)
++
++
++/*
++ * SDIO_HOST_CTRL
++ */
++
++#define SDIO_HOST_CTRL_PUSH_PULL_EN (1 << 0)
++
++#define SDIO_HOST_CTRL_CARD_TYPE_MEM_ONLY (0 << 1)
++#define SDIO_HOST_CTRL_CARD_TYPE_IO_ONLY (1 << 1)
++#define SDIO_HOST_CTRL_CARD_TYPE_IO_MEM_COMBO (2 << 1)
++#define SDIO_HOST_CTRL_CARD_TYPE_IO_MMC (3 << 1)
++#define SDIO_HOST_CTRL_CARD_TYPE_MASK (3 << 1)
++
++#define SDIO_HOST_CTRL_BIG_ENDIAN (1 << 3)
++#define SDIO_HOST_CTRL_LSB_FIRST (1 << 4)
++#define SDIO_HOST_CTRL_ID_MODE_LOW_FREQ (1 << 5)
++#define SDIO_HOST_CTRL_HALF_SPEED (1 << 6)
++#define SDIO_HOST_CTRL_DATA_WIDTH_4_BITS (1 << 9)
++#define SDIO_HOST_CTRL_HI_SPEED_EN (1 << 10)
++
++
++#define SDIO_HOST_CTRL_TMOUT_MASK (0xf << 11)
++#define SDIO_HOST_CTRL_TMOUT_MAX (0xf << 11)
++#define SDIO_HOST_CTRL_TMOUT(x) ((x) << 11)
++#define SDIO_HOST_CTRL_TMOUT_EN (1 << 15)
++
++#define SDIO_HOST_CTRL_DFAULT_OPEN_DRAIN \
++ (SDIO_HOST_CTRL_TMOUT(x)(0xf))
++#define SDIO_HOST_CTRL_DFAULT_PUSH_PULL \
++ (SDIO_HOST_CTRL_TMOUT(x)(0xf) | SDIO_HOST_CTRL_PUSH_PULL_EN)
++
++
++/*
++ * NOR status bits
++ */
++
++#define SDIO_NOR_ERROR (1 << 15)
++#define SDIO_NOR_UNEXP_RSP (1 << 14)
++#define SDIO_NOR_AUTOCMD12_DONE (1 << 13)
++#define SDIO_NOR_SUSPEND_ON (1 << 12)
++#define SDIO_NOR_LMB_FF_8W_AVAIL (1 << 11)
++#define SDIO_NOR_LMB_FF_8W_FILLED (1 << 10)
++#define SDIO_NOR_READ_WAIT_ON (1 << 9)
++#define SDIO_NOR_CARD_INT (1 << 8)
++#define SDIO_NOR_READ_READY (1 << 5)
++#define SDIO_NOR_WRITE_READY (1 << 4)
++#define SDIO_NOR_DMA_INI (1 << 3)
++#define SDIO_NOR_BLK_GAP_EVT (1 << 2)
++#define SDIO_NOR_XFER_DONE (1 << 1)
++#define SDIO_NOR_CMD_DONE (1 << 0)
++
++
++/*
++ * ERR status bits
++ */
++
++#define SDIO_ERR_CRC_STATUS (1 << 14)
++#define SDIO_ERR_CRC_STARTBIT (1 << 13)
++#define SDIO_ERR_CRC_ENDBIT (1 << 12)
++#define SDIO_ERR_RESP_TBIT (1 << 11)
++#define SDIO_ERR_SIZE (1 << 10)
++#define SDIO_ERR_CMD_STARTBIT (1 << 9)
++#define SDIO_ERR_AUTOCMD12 (1 << 8)
++#define SDIO_ERR_DATA_ENDBIT (1 << 6)
++#define SDIO_ERR_DATA_CRC (1 << 5)
++#define SDIO_ERR_DATA_TIMEOUT (1 << 4)
++#define SDIO_ERR_CMD_INDEX (1 << 3)
++#define SDIO_ERR_CMD_ENDBIT (1 << 2)
++#define SDIO_ERR_CMD_CRC (1 << 1)
++#define SDIO_ERR_CMD_TIMEOUT (1 << 0)
++
++#define SDIO_ERR_INTR_MASK 0xFFFF
++
++
++#define MMC_BLOCK_SIZE 512
++#define MMC_CMD_RESET 0
++#define MMC_CMD_SEND_OP_COND 1
++#define MMC_CMD_ALL_SEND_CID 2
++#define MMC_CMD_SET_RCA 3
++#define MMC_CMD_SELECT_CARD 7
++#define MMC_CMD_SEND_CSD 9
++#define MMC_CMD_SEND_CID 10
++#define MMC_CMD_SEND_STATUS 13
++#define MMC_CMD_SET_BLOCKLEN 16
++#define MMC_CMD_READ_BLOCK 17
++#define MMC_CMD_RD_BLK_MULTI 18
++#define MMC_CMD_WRITE_BLOCK 24
++#define MMC_MAX_BLOCK_SIZE 512
++
++typedef struct mv_mmc_cid
++{
++ /* FIXME: BYTE_ORDER */
++ uchar year:4,
++ month:4;
++ uchar sn[3];
++ uchar fwrev:4,
++ hwrev:4;
++ uchar name[6];
++ uchar id[3];
++} mv_mmc_cid_t;
++
++typedef struct mv_mmc_csd
++{
++ uchar ecc:2,
++ file_format:2,
++ tmp_write_protect:1,
++ perm_write_protect:1,
++ copy:1,
++ file_format_grp:1;
++ uint64_t content_prot_app:1,
++ rsvd3:4,
++ write_bl_partial:1,
++ write_bl_len:4,
++ r2w_factor:3,
++ default_ecc:2,
++ wp_grp_enable:1,
++ wp_grp_size:5,
++ erase_grp_mult:5,
++ erase_grp_size:5,
++ c_size_mult1:3,
++ vdd_w_curr_max:3,
++ vdd_w_curr_min:3,
++ vdd_r_curr_max:3,
++ vdd_r_curr_min:3,
++ c_size:12,
++ rsvd2:2,
++ dsr_imp:1,
++ read_blk_misalign:1,
++ write_blk_misalign:1,
++ read_bl_partial:1;
++ ushort read_bl_len:4,
++ ccc:12;
++ uchar tran_speed;
++ uchar nsac;
++ uchar taac;
++ uchar rsvd1:2,
++ spec_vers:4,
++ csd_structure:2;
++} mv_mmc_csd_t;
++
++typedef struct {
++ char pnm_0; /* product name */
++ char oid_1; /* OEM/application ID */
++ char oid_0;
++ uint8_t mid; /* manufacturer ID */
++ char pnm_4;
++ char pnm_3;
++ char pnm_2;
++ char pnm_1;
++ uint8_t psn_2; /* product serial number */
++ uint8_t psn_1;
++ uint8_t psn_0; /* MSB */
++ uint8_t prv; /* product revision */
++ uint8_t crc; /* CRC7 checksum, b0 is unused and set to 1 */
++ uint8_t mdt_1; /* manufacturing date, LSB, RRRRyyyy yyyymmmm */
++ uint8_t mdt_0; /* MSB */
++ uint8_t psn_3; /* LSB */
++} mv_sd_cid_t;
++
++#endif /* _MVSDIO_INCLUDE */
+diff --git a/include/configs/sheevaplug.h b/include/configs/sheevaplug.h
+index 83dd8ff..7c8497c 100644
+--- a/include/configs/sheevaplug.h
++++ b/include/configs/sheevaplug.h
+@@ -1,3 +1,4 @@
++
+ /*
+ * (C) Copyright 2009
+ * Marvell Semiconductor
+@@ -47,7 +48,9 @@
+ #define CONFIG_CMD_DHCP
+ #define CONFIG_CMD_ENV
+ #define CONFIG_CMD_MII
++#define CONFIG_CMD_MMC
+ #define CONFIG_CMD_NAND
++#define CONFIG_JFFS2_NAND
+ #define CONFIG_CMD_PING
+ #define CONFIG_CMD_USB
+ /*
+@@ -70,8 +73,8 @@
+ * it has to be rounded to sector size
+ */
+ #define CONFIG_ENV_SIZE 0x20000 /* 128k */
+-#define CONFIG_ENV_ADDR 0x60000
+-#define CONFIG_ENV_OFFSET 0x60000 /* env starts here */
++#define CONFIG_ENV_ADDR 0xa0000
++#define CONFIG_ENV_OFFSET 0xa0000 /* env starts here */
+
+ /*
+ * Default environment variables
+@@ -81,10 +84,11 @@
+ "${x_bootcmd_usb}; bootm 0x6400000;"
+
+ #define CONFIG_MTDPARTS "orion_nand:512k(uboot)," \
+- "3m@1m(kernel),1m@4m(psm),13m@5m(rootfs) rw\0"
++ "0x1ff00000@512k(rootfs) rw\0"
+
+ #define CONFIG_EXTRA_ENV_SETTINGS "x_bootargs=console" \
+ "=ttyS0,115200 mtdparts="CONFIG_MTDPARTS \
++ "mtdids=nand0=orion_nand\0" \
+ "x_bootcmd_kernel=nand read 0x6400000 0x100000 0x300000\0" \
+ "x_bootcmd_usb=usb start\0" \
+ "x_bootargs_root=root=/dev/mtdblock3 rw rootfstype=jffs2\0"
diff --git a/pkgs/misc/uboot/sheevaplug.nix b/pkgs/misc/uboot/sheevaplug.nix
index ad8029d9020..4d4f61c40a7 100644
--- a/pkgs/misc/uboot/sheevaplug.nix
+++ b/pkgs/misc/uboot/sheevaplug.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation {
fi
'';
- buildNativeInputs = [ unzip ];
+ nativeBuildInputs = [ unzip ];
dontStrip = true;
diff --git a/pkgs/os-specific/darwin/native-x11-and-opengl/default.nix b/pkgs/os-specific/darwin/native-x11-and-opengl/default.nix
new file mode 100644
index 00000000000..cee03741dce
--- /dev/null
+++ b/pkgs/os-specific/darwin/native-x11-and-opengl/default.nix
@@ -0,0 +1,12 @@
+{ stdenv, writeScript }:
+
+assert stdenv.isDarwin;
+
+stdenv.mkDerivation rec {
+ name = "darwin-native-x11-and-opengl";
+
+ builder = writeScript "${name}-builder.sh" ''
+ /bin/mkdir -p $out
+ /bin/ln -sv /usr/X11/{bin,lib,include,share} $out/
+ '';
+}
diff --git a/pkgs/os-specific/gnu/default.nix b/pkgs/os-specific/gnu/default.nix
index 0a42b83a46f..27b1cdd3e8a 100644
--- a/pkgs/os-specific/gnu/default.nix
+++ b/pkgs/os-specific/gnu/default.nix
@@ -3,7 +3,7 @@
args@{ fetchgit, stdenv, autoconf, automake, automake111x, libtool
, texinfo, glibcCross, hurdPartedCross, libuuid, samba_light
, gccCrossStageStatic, gccCrossStageFinal
-, forceBuildDrv, forceSystem, newScope, platform, config, crossSystem
+, forceNativeDrv, forceSystem, newScope, platform, config, crossSystem
, overrides ? {} }:
with args;
@@ -12,18 +12,18 @@ let
callPackage = newScope gnu;
gnu = {
- hurdCross = forceBuildDrv(callPackage ./hurd {
+ hurdCross = forceNativeDrv (callPackage ./hurd {
inherit fetchgit stdenv autoconf libtool texinfo
glibcCross hurdPartedCross;
inherit (gnu) machHeaders mig;
- libuuid = libuuid.hostDrv;
+ libuuid = libuuid.crossDrv;
automake = automake111x;
headersOnly = false;
cross = assert crossSystem != null; crossSystem;
gccCross = gccCrossStageFinal;
});
- hurdCrossIntermediate = forceBuildDrv(callPackage ./hurd {
+ hurdCrossIntermediate = forceNativeDrv (callPackage ./hurd {
inherit fetchgit stdenv autoconf libtool texinfo glibcCross;
inherit (gnu) machHeaders mig;
hurdPartedCross = null;
@@ -58,7 +58,7 @@ let
hurd = null;
};
- libpthreadCross = forceBuildDrv(callPackage ./libpthread {
+ libpthreadCross = forceNativeDrv (callPackage ./libpthread {
inherit fetchgit stdenv autoconf automake libtool glibcCross;
inherit (gnu) machHeaders hurdHeaders;
hurd = gnu.hurdCrossIntermediate;
@@ -85,7 +85,7 @@ let
stdenv = (forceSystem "i686-linux").stdenv;
};
- # XXX: Use this one for its `.hostDrv'. Using the one above from
+ # XXX: Use this one for its `.crossDrv'. Using the one above from
# `x86_64-linux' leads to building a different cross-toolchain because of
# the `forceSystem'.
mig_raw = callPackage ./mig {};
diff --git a/pkgs/os-specific/gnu/libpthread/default.nix b/pkgs/os-specific/gnu/libpthread/default.nix
index 08838f17aff..3eaa6336ec2 100644
--- a/pkgs/os-specific/gnu/libpthread/default.nix
+++ b/pkgs/os-specific/gnu/libpthread/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation ({
inherit rev;
};
- buildNativeInputs = [ autoconf automake libtool ];
+ nativeBuildInputs = [ autoconf automake libtool ];
buildInputs = [ machHeaders hurdHeaders ]
++ stdenv.lib.optional (!headersOnly) hurd
++ stdenv.lib.optional (gccCross != null) gccCross;
diff --git a/pkgs/os-specific/gnu/mach/default.nix b/pkgs/os-specific/gnu/mach/default.nix
index f5120fca478..54c6429955b 100644
--- a/pkgs/os-specific/gnu/mach/default.nix
+++ b/pkgs/os-specific/gnu/mach/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation ({
# .
++ [ "--enable-dependency-tracking" ];
- buildNativeInputs = [ autoconf automake texinfo ]
+ nativeBuildInputs = [ autoconf automake texinfo ]
++ stdenv.lib.optional (mig != null) mig;
preConfigure = "autoreconf -vfi";
diff --git a/pkgs/os-specific/gnu/mig/default.nix b/pkgs/os-specific/gnu/mig/default.nix
index f7b798a7624..9ee188b0c8c 100644
--- a/pkgs/os-specific/gnu/mig/default.nix
+++ b/pkgs/os-specific/gnu/mig/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
patches = [ ./noyywrap.patch ];
- buildNativeInputs = [ autoconf automake flex bison machHeaders ];
+ nativeBuildInputs = [ autoconf automake flex bison machHeaders ];
preConfigure = "autoreconf -vfi";
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
postInstall =
# Fix the shebang to point to the cross-built shell.
'' sed -i "$out/bin/mig" \
- -e 's|^#!/.*|#!${bash.hostDrv}/bin/sh|g'
+ -e 's|^#!/.*|#!${bash.crossDrv}/bin/sh|g'
'';
};
diff --git a/pkgs/os-specific/gnu/unionfs/default.nix b/pkgs/os-specific/gnu/unionfs/default.nix
index f35fed282b6..946e4c0c109 100644
--- a/pkgs/os-specific/gnu/unionfs/default.nix
+++ b/pkgs/os-specific/gnu/unionfs/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
makeFlags = [ "CC=i586-pc-gnu-gcc" ];
buildInputs = [ hurd machHeaders ];
- buildNativeInputs = [ mig ];
+ nativeBuildInputs = [ mig ];
installPhase =
'' mkdir -p "$out/hurd"
diff --git a/pkgs/os-specific/linux/acpi/default.nix b/pkgs/os-specific/linux/acpi/default.nix
index 84ee4486807..6bb44d7db44 100644
--- a/pkgs/os-specific/linux/acpi/default.nix
+++ b/pkgs/os-specific/linux/acpi/default.nix
@@ -1,11 +1,12 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "acpi-1.5";
-
+ name = "acpi-${version}";
+ version = "1.6";
+
src = fetchurl {
- url = "http://ftp.de.debian.org/debian/pool/main/a/acpi/acpi_1.5.orig.tar.gz";
- sha256 = "1pb020j627ldjm1askqfzp6cjxrs79ail8svihanv7pgbg5r3zsp";
+ url = "mirror://sourceforge/acpiclient/${version}/${name}.tar.gz";
+ sha256 = "0cawznhkzb51yxa599d1xkw05nklmjrrmd79vmjkkzf4002d4qgd";
};
meta = {
@@ -15,7 +16,7 @@ stdenv.mkDerivation rec {
the "old" `apm' command on ACPI systems. It includes
battery and thermal information.
'';
- homepage = http://grahame.angrygoats.net/acpi.shtml;
+ homepage = http://sourceforge.net/projects/acpiclient/;
license = "GPLv2+";
};
}
diff --git a/pkgs/os-specific/linux/acpid/default.nix b/pkgs/os-specific/linux/acpid/default.nix
index 40db323c522..fe1792478d6 100644
--- a/pkgs/os-specific/linux/acpid/default.nix
+++ b/pkgs/os-specific/linux/acpid/default.nix
@@ -1,11 +1,11 @@
{stdenv, fetchurl}:
stdenv.mkDerivation rec {
- name = "acpid-1.0.10";
-
+ name = "acpid-2.0.17";
+
src = fetchurl {
- url = "mirror://sourceforge/acpid/${name}.tar.gz";
- sha256 = "0q27adx0c0bzvy9f9zfny69iaay3b4b79b693fhaq1bkvph3qw12";
+ url = "http://tedfelix.com/linux/${name}.tar.xz";
+ sha256 = "0gksl6z3sb6yyk7bdmldxsrncvprd3rny0i8ggl4m95nvv3x5drn";
};
preBuild = ''
@@ -13,8 +13,8 @@ stdenv.mkDerivation rec {
'';
meta = {
- homepage = http://acpid.sourceforge.net/;
+ homepage = http://tedfelix.com/linux/acpid-netlink.html;
description = "A daemon for delivering ACPI events to userspace programs";
- license = "GPLv2+";
+ license = stdenv.lib.licenses.gpl2Plus;
};
}
diff --git a/pkgs/os-specific/linux/alsa-lib/default.nix b/pkgs/os-specific/linux/alsa-lib/default.nix
index 36d9fa2ba9e..3be6d0c3c33 100644
--- a/pkgs/os-specific/linux/alsa-lib/default.nix
+++ b/pkgs/os-specific/linux/alsa-lib/default.nix
@@ -1,11 +1,14 @@
{stdenv, fetchurl}:
stdenv.mkDerivation rec {
- name = "alsa-lib-1.0.25";
+ name = "alsa-lib-1.0.26";
src = fetchurl {
- url = "ftp://ftp.alsa-project.org/pub/lib/${name}.tar.bz2";
- sha256 = "1rl6wa06d1jiqnrshyqh5qb1lwg6dh8m1ilyaink21j1y1f806js";
+ urls = [
+ "ftp://ftp.alsa-project.org/pub/lib/${name}.tar.bz2"
+ "http://alsa.cybermirror.org/lib/${name}.tar.bz2"
+ ];
+ sha256 = "0zbfkwqn7ixa71lsna9llq6i2gic540h8r8r0rjdphrwc1hq37wc";
};
configureFlags = "--disable-xmlto";
diff --git a/pkgs/os-specific/linux/alsa-oss/default.nix b/pkgs/os-specific/linux/alsa-oss/default.nix
new file mode 100644
index 00000000000..98bf4374b4f
--- /dev/null
+++ b/pkgs/os-specific/linux/alsa-oss/default.nix
@@ -0,0 +1,33 @@
+{stdenv, fetchurl, alsaLib, gettext, ncurses, libsamplerate}:
+
+stdenv.mkDerivation rec {
+ name = "alsa-oss-1.0.25";
+
+ 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";
+ };
+
+ buildInputs = [ alsaLib ncurses libsamplerate ];
+ nativeBuildInputs = [ gettext ];
+
+ configureFlags = "--disable-xmlto";
+
+ installFlags = "ASOUND_STATE_DIR=$(TMPDIR)/dummy";
+
+ preConfigure =
+ ''
+ '';
+
+ meta = {
+ description = "ALSA, the Advanced Linux Sound Architecture alsa-oss emulation";
+
+ longDescription = ''
+ The Advanced Linux Sound Architecture (ALSA) provides audio and
+ MIDI functionality to the Linux-based operating system.
+ '';
+
+ homepage = http://www.alsa-project.org/;
+ };
+}
diff --git a/pkgs/os-specific/linux/alsa-plugins/default.nix b/pkgs/os-specific/linux/alsa-plugins/default.nix
index 180f9153043..fb17b47b506 100644
--- a/pkgs/os-specific/linux/alsa-plugins/default.nix
+++ b/pkgs/os-specific/linux/alsa-plugins/default.nix
@@ -1,11 +1,14 @@
{ stdenv, fetchurl, lib, pkgconfig, alsaLib, pulseaudio ? null, jackaudio ? null }:
stdenv.mkDerivation rec {
- name = "alsa-plugins-1.0.25";
+ name = "alsa-plugins-1.0.26";
src = fetchurl {
- url = "ftp://ftp.alsa-project.org/pub/plugins/${name}.tar.bz2";
- sha256 = "1assar5k8zb2srqdcph6a54daqfymlyygdm5fcs6isaydpyp9qx0";
+ urls = [
+ "ftp://ftp.alsa-project.org/pub/plugins/${name}.tar.bz2"
+ "http://alsa.cybermirror.org/plugins/${name}.tar.bz2"
+ ];
+ sha256 = "07wz3kl6isabk15ddpzz820pqlgvw6q0m7knnbgv9780s8s52l83";
};
buildInputs =
diff --git a/pkgs/os-specific/linux/alsa-utils/default.nix b/pkgs/os-specific/linux/alsa-utils/default.nix
index ca3a45bddfd..c121b227eee 100644
--- a/pkgs/os-specific/linux/alsa-utils/default.nix
+++ b/pkgs/os-specific/linux/alsa-utils/default.nix
@@ -1,20 +1,27 @@
-{stdenv, fetchurl, alsaLib, gettext, ncurses}:
+{stdenv, fetchurl, alsaLib, gettext, ncurses, libsamplerate}:
stdenv.mkDerivation rec {
- name = "alsa-utils-1.0.25";
-
+ name = "alsa-utils-1.0.26";
+
src = fetchurl {
- url = "ftp://ftp.alsa-project.org/pub/utils/${name}.tar.bz2";
- sha256 = "0b1hbdq1bdkbz72zdfy5cgp75jqpysb0mqb0n9wy5gsbccpnlrrf";
+ # url = "ftp://ftp.alsa-project.org/pub/utils/${name}.tar.bz2";
+ url = "http://alsa.cybermirror.org/utils/${name}.tar.bz2";
+ sha256 = "1rw1n3w8syqky9i7kwy5xd2rzfdbihxas32vwfxpb177lqx2lpzq";
};
-
- buildInputs = [ alsaLib ncurses ];
- buildNativeInputs = [ gettext ];
-
+
+ buildInputs = [ alsaLib ncurses libsamplerate ];
+ nativeBuildInputs = [ gettext ];
+
configureFlags = "--disable-xmlto --with-udev-rules-dir=$(out)/lib/udev/rules.d";
installFlags = "ASOUND_STATE_DIR=$(TMPDIR)/dummy";
+ preConfigure =
+ ''
+ # Ensure that ‘90-alsa-restore.rules.in’ gets rebuilt.
+ rm alsactl/90-alsa-restore.rules
+ '';
+
meta = {
description = "ALSA, the Advanced Linux Sound Architecture utils";
diff --git a/pkgs/os-specific/linux/atheros/inj.patch b/pkgs/os-specific/linux/atheros/inj.patch
deleted file mode 100644
index baae9b88aa4..00000000000
--- a/pkgs/os-specific/linux/atheros/inj.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -Naur madwifi/ath/if_ath.c madwifi_rawtx/ath/if_ath.c
---- madwifi/ath/if_ath.c 2008-06-24 17:20:58.000000000 -0400
-+++ madwifi_rawtx/ath/if_ath.c 2008-06-24 17:20:12.000000000 -0400
-@@ -2950,6 +2950,7 @@
- ath_tx_startraw(struct net_device *dev, struct ath_buf *bf, struct sk_buff *skb)
- {
- struct ath_softc *sc = dev->priv;
-+ struct ieee80211com *ic = &sc->sc_ic;
- struct ath_hal *ah = sc->sc_ah;
- struct ieee80211_phy_params *ph = &(SKB_CB(skb)->phy);
- const HAL_RATE_TABLE *rt;
-@@ -2962,7 +2963,8 @@
- struct ieee80211_frame *wh;
-
- wh = (struct ieee80211_frame *)skb->data;
-- try0 = ph->try[0];
-+// try0 = ph->try[0];
-+ try0 = (ic->ic_opmode == IEEE80211_M_MONITOR) ? 1 : ph->try[0];
- rt = sc->sc_currates;
- txrate = dot11_to_ratecode(sc, rt, ph->rate[0]);
- power = ph->power > 60 ? 60 : ph->power;
-@@ -2986,7 +2988,8 @@
- rt = sc->sc_currates;
- KASSERT(rt != NULL, ("no rate table, mode %u", sc->sc_curmode));
-
-- if (IEEE80211_IS_MULTICAST(wh->i_addr1)) {
-+ if (IEEE80211_IS_MULTICAST(wh->i_addr1) || ((ic->ic_opmode ==
-+IEEE80211_M_MONITOR) && (skb->data[1]&3) != 0x01) ) {
- flags |= HAL_TXDESC_NOACK; /* no ack on broad/multicast */
- sc->sc_stats.ast_tx_noack++;
- try0 = 1;
-
diff --git a/pkgs/os-specific/linux/atheros/r3867.nix b/pkgs/os-specific/linux/atheros/r3867.nix
deleted file mode 100644
index 95a834dd67a..00000000000
--- a/pkgs/os-specific/linux/atheros/r3867.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-args : with args;
- let localDefs = builderDefs.passthru.function {
- src = fetchurl {
- url = http://snapshots.madwifi.org/madwifi-trunk/madwifi-trunk-r3867-20080924.tar.gz;
- sha256 = "0m48p5mqx1d3aimjjiy251fii7x7y15ch5n74hvq4hygc6bcjf79";
- };
-
- buildInputs = [];
- configureFlags = [];
- makeFlags = [''KERNELPATH=${kernel}/lib/modules/*/build'' ''DESTDIR=$out''];
- hal20080528 = fetchurl {
- url = http://people.freebsd.org/~sam/ath_hal-20080528.tgz;
- sha256 = "1a6glkd8n46876hl48ib08p81qwsvrk4153j4b9xrxgid6f8bar9";
- };
- injectionPatchFile = ./inj.patch;
- };
- in with localDefs;
-let
-preBuild = fullDepEntry (''
- echo Replacing HAL.
- tar xvf ${hal20080528}
- rm -r hal
- mv ath_hal-* hal
-'') ["minInit" "doUnpack"];
-postInstall = fullDepEntry (''
- ln -s $out/usr/local/bin $out/bin
-'') [minInit doMakeInstall];
-in
-stdenv.mkDerivation rec {
- name = "atheros-"+version;
- patches = lib.optional
- (lib.attrByPath ["injectionPatch"] false args)
- injectionPatchFile;
- builder = writeScript (name + "-builder")
- (textClosure localDefs
- ((lib.optional
- (lib.attrByPath ["freshHAL"] false args)
- preBuild)
- ++ [doPatch doMakeInstall postInstall
- doForceShare doPropagate]));
- meta = {
- description = "Atheros WiFi driver";
- inherit src;
- };
-}
diff --git a/pkgs/os-specific/linux/ati-drivers/builder.sh b/pkgs/os-specific/linux/ati-drivers/builder.sh
index b05093d8915..abb78549cee 100644
--- a/pkgs/os-specific/linux/ati-drivers/builder.sh
+++ b/pkgs/os-specific/linux/ati-drivers/builder.sh
@@ -2,13 +2,14 @@
# TODO gentoo removes some tools because there are xorg sources (?)
source $stdenv/setup
+set -x
die(){ echo $@; exit 1; }
-
# custom unpack:
-cp $src archive
-sh archive --extract .
+unzip $src
+run_file=$(echo amd-driver-installer-*)
+sh $run_file --extract .
kernelVersion=$(cd ${kernel}/lib/modules && ls)
@@ -68,7 +69,7 @@ setModVersions(){
# On kernels with the fix, use arch_compat_alloc_user_space instead
# of compat_alloc_user_space since the latter is GPL-only
-COMPAT_ALLOC_USER_SPACE=compat_alloc_user_space
+COMPAT_ALLOC_USER_SPACE=arch_compat_alloc_user_space
for src_file in \
$kernelBuild/arch/x86/include/asm/compat.h \
@@ -123,6 +124,8 @@ GCC_MAJOR="`gcc --version | grep -o -e ") ." | head -1 | cut -d " " -f 2`"
echo .lib${MODULE}_ip.a.GCC${GCC_MAJOR}.cmd
echo 'This is a dummy file created to suppress this warning: could not find /lib/modules/fglrx/build_mod/2.6.x/.libfglrx_ip.a.GCC4.cmd for /lib/modules/fglrx/build_mod/2.6.x/libfglrx_ip.a.GCC4' > lib${MODULE}_ip.a.GCC${GCC_MAJOR}.cmd
+ sed -i -e "s@COMPAT_ALLOC_USER_SPACE@$COMPAT_ALLOC_USER_SPACE@" ../kcl_ioctl.c
+
make CC=${CC} \
LIBIP_PREFIX=$(echo "$LIBIP_PREFIX" | sed -e 's|^\([^/]\)|../\1|') \
MODFLAGS="-DMODULE -DATI -DFGL -DPAGE_ATTR_FIX=$PAGE_ATTR_FIX -DCOMPAT_ALLOC_USER_SPACE=$COMPAT_ALLOC_USER_SPACE $def_smp $def_modversions" \
@@ -143,12 +146,12 @@ GCC_MAJOR="`gcc --version | grep -o -e ") ." | head -1 | cut -d " " -f 2`"
cp -r common/usr/share $out
cp -r common/usr/X11R6 $out
- cp -r arch/$arch/lib $out/lib
+ # cp -r arch/$arch/lib $out/lib
# what are those files used for?
cp -r common/etc $out
- DIR_DEPENDING_ON_XORG_VERSION=x750_64a
+ DIR_DEPENDING_ON_XORG_VERSION=xpic_64a
cp -r $DIR_DEPENDING_ON_XORG_VERSION/usr/X11R6/$lib_arch/* $out/lib/xorg
t=$out/lib/modules/${kernelVersion}/kernel/drivers/misc
@@ -164,12 +167,18 @@ GCC_MAJOR="`gcc --version | grep -o -e ") ." | head -1 | cut -d " " -f 2`"
cp -r $TMP/arch/$arch/usr/X11R6/$lib_arch/modules/dri $out/lib
cp -r $TMP/arch/$arch/usr/X11R6/$lib_arch/modules/dri/* $out/lib
cp -r $TMP/arch/$arch/usr/X11R6/$lib_arch/*.so.* $out/lib
+ cp -r $TMP/arch/$arch/usr/X11R6/$lib_arch/fglrx/fglrx-libGL.so.1.2 $out/lib/fglrx-libGL.so.1.2
+
cp -r $TMP/arch/$arch/usr/$lib_arch/* $out/lib
# cp -r $TMP/arch/$arch/usr/$lib_arch/* $out/lib
ln -s libatiuki.so.1.0 $out/lib/libatiuki.so.1
- ln -s libGL.so.1.2 $out/lib/libGL.so.1
+ ln -s fglrx-libGL.so.1.2 $out/lib/libGL.so.1
+ ln -s fglrx-libGL.so.1.2 $out/lib/libGL.so
+
ln -s libfglrx_gamma.so.1.0 $out/lib/libfglrx_gamma.so.1
+ # make xorg use the ati version
+ ln -s $out/lib/xorg/modules/extensions/{fglrx/fglrx-libglx.so,libglx.so}
}
diff --git a/pkgs/os-specific/linux/ati-drivers/default.nix b/pkgs/os-specific/linux/ati-drivers/default.nix
index a53058de6a0..c30d18fe75b 100644
--- a/pkgs/os-specific/linux/ati-drivers/default.nix
+++ b/pkgs/os-specific/linux/ati-drivers/default.nix
@@ -2,6 +2,7 @@
, mesa # for fgl_glxgears
, libXxf86vm, xf86vidmodeproto # for fglrx_gamma
, xorg, makeWrapper, glibc, patchelf
+, unzip
}:
# If you want to use a different Xorg version probably
@@ -16,6 +17,9 @@
# http://wiki.cchtml.com/index.php/Main_Page
+# There is one issue left:
+# /usr/lib/dri/fglrx_dri.so must point to /run/opengl-driver/lib/fglrx_dri.so
+
assert stdenv.system == "x86_64-linux";
stdenv.mkDerivation rec {
@@ -27,18 +31,23 @@ stdenv.mkDerivation rec {
inherit libXxf86vm xf86vidmodeproto;
src = fetchurl {
- url = https://www2.ati.com/drivers/linux/ati-driver-installer-10-11-x86.x86_64.run;
- sha256 = "1z33w831ayx1j5lm9d1xv6whkmzsz9v8li3s8c96hwnwki6zpimr";
+ url = http://www2.ati.com/drivers/linux/amd-driver-installer-12-8-x86.x86_64.zip;
+ sha256 = "0hdv89vdap6v0dnwhddizfmlkwyh0j910sp4wyj2lq5pn9rm2lk2";
+
+ # beta
+ # url = "http://www2.ati.com/drivers/beta/amd-driver-installer-12-9-beta-x86.x86_64.zip";
+ # sha256 = "02dmflzfrgr07fa1hv34m7ad8pra21xv7qbk500gqm6v8s9vbplk";
};
buildInputs =
[ xlibs.libXext xlibs.libX11
xlibs.libXrandr which imake makeWrapper
patchelf
+ unzip
];
-
+
inherit kernel glibc /* glibc only used for setting interpreter */;
-
+
LD_LIBRARY_PATH = stdenv.lib.concatStringsSep ":"
[ "${xorg.libXrandr}/lib"
"${xorg.libXrender}/lib"
@@ -49,11 +58,11 @@ stdenv.mkDerivation rec {
inherit mesa; # only required to build examples
meta = {
- description = "ati drivers";
+ description = "ATI drivers";
homepage = http://support.amd.com/us/gpudownload/Pages/index.aspx;
license = "unfree";
maintainers = [stdenv.lib.maintainers.marcweber];
- platforms = [ "x86_64-linux" ];
+ #platforms = [ "x86_64-linux" ];
};
# moved assertions here because the name is evaluated when the NixOS manual is generated
diff --git a/pkgs/os-specific/linux/atop/default.nix b/pkgs/os-specific/linux/atop/default.nix
index 0e2df1e25fb..39ba5dc3973 100644
--- a/pkgs/os-specific/linux/atop/default.nix
+++ b/pkgs/os-specific/linux/atop/default.nix
@@ -1,12 +1,12 @@
{stdenv, fetchurl, zlib, ncurses}:
stdenv.mkDerivation rec {
- version = "1.27-3";
+ version = "2.0.2";
name = "atop-${version}";
src = fetchurl {
url = "http://www.atoptool.nl/download/atop-${version}.tar.gz";
- sha256 = "bce36e0b50f0e03995d86d25dbc9ab4a289f6755ce3558844f96d41b0bba563f";
+ sha256 = "029lfa2capz1lg3m3rnyrgb8v6jm4znin84vjh2f0zkwvvhdn856";
};
buildInputs = [zlib ncurses];
diff --git a/pkgs/os-specific/linux/aufs-util/2.1.nix b/pkgs/os-specific/linux/aufs-util/2.1.nix
deleted file mode 100644
index 87541def9ad..00000000000
--- a/pkgs/os-specific/linux/aufs-util/2.1.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{ stdenv, fetchgit, kernel, aufs }:
-
-assert aufs != null;
-
-let version = "20110217"; in
-
-stdenv.mkDerivation {
- name = "aufs2.1-util-${version}-${kernel.version}";
-
- src = fetchgit {
- url = "git://git.c3sl.ufpr.br/aufs/aufs2-util.git";
- rev = "0f0cf3f2ae39906fd4b5376cdaa24e9fe64a03f4";
- sha256 = "0fce5601b67efe8b5652a813ae612348bf4503aa71056cd31a5ed0406632e364";
- };
-
- buildInputs = [ aufs ];
-
- makeFlags =
- [ "KDIR=${kernel}/lib/modules/${kernel.version}/build"
- "Install=install"
- "DESTDIR=$(out)"
- ];
-
- postInstall =
- ''
- mv $out/usr/* $out
- rmdir $out/usr
-
- cp aufs.shlib $out/lib/
-
- substituteInPlace $out/bin/aubrsync \
- --replace /sbin/mount $out/sbin/mount \
- --replace /usr/lib/aufs.shlib $out/lib/aufs.shlib
- '';
-
- meta = {
- description = "Utilities for AUFS2.1";
- homepage = http://aufs.sourceforge.net/;
- maintainers = [ stdenv.lib.maintainers.eelco ];
- platforms = stdenv.lib.platforms.linux;
- };
-}
diff --git a/pkgs/os-specific/linux/aufs-util/3.nix b/pkgs/os-specific/linux/aufs-util/3.nix
index 8eefc1b0f4a..d75f51d38c9 100644
--- a/pkgs/os-specific/linux/aufs-util/3.nix
+++ b/pkgs/os-specific/linux/aufs-util/3.nix
@@ -34,8 +34,7 @@ stdenv.mkDerivation {
meta = {
description = "Utilities for AUFS3";
homepage = http://aufs.sourceforge.net/;
- maintainers = [ stdenv.lib.maintainers.eelco
- stdenv.lib.maintainers.shlevy ];
+ maintainers = [ stdenv.lib.maintainers.eelco ];
platforms = stdenv.lib.platforms.linux;
};
}
diff --git a/pkgs/os-specific/linux/aufs/2.1.nix b/pkgs/os-specific/linux/aufs/2.1.nix
deleted file mode 100644
index 1539775a2a1..00000000000
--- a/pkgs/os-specific/linux/aufs/2.1.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-{ stdenv, kernel, fetchgit, perl }:
-
-assert kernel.features ? aufsBase;
-
-let version =
- if (builtins.lessThan (builtins.compareVersions kernel.version "2.6.38") 0)
- then "20110303"
- else "20110408"; in
-
-stdenv.mkDerivation {
- name = "aufs2.1-${version}-${kernel.version}";
-
- src =
- if (builtins.lessThan (builtins.compareVersions kernel.version "2.6.38") 0)
- then
- fetchgit {
- url = "git://git.c3sl.ufpr.br/aufs/aufs2-standalone.git";
- rev = "aceef6c84dbe5798bf46904252727b9588eafaf6";
- sha256 = "50a8cb39af5fee82e88b65351cac52b6ab95a68c45e0a98da9fa1925b28f048d";
- }
- else
- fetchgit {
- url = "git://git.c3sl.ufpr.br/aufs/aufs2-standalone.git";
- rev = "01cb6101f477339bc95e6b47e3618bb29ecc68db";
- sha256 = "4af3c4b1e99ef58abe8530665309021d541ee840ee54f442606cc418646a1faf";
- };
-
- buildInputs = [ perl ];
-
- makeFlags = "KDIR=${kernel}/lib/modules/${kernel.version}/build";
-
- installPhase =
- ''
- mkdir -p $out/lib/modules/${kernel.version}/misc
- cp -v aufs.ko $out/lib/modules/${kernel.version}/misc
-
- # Install the headers because aufs2.1-util requires them.
- cp -av usr/include $out/
- '';
-
- meta = {
- description = "Another Unionfs implementation for Linux (second generation)";
- homepage = http://aufs.sourceforge.net/;
- maintainers = [ stdenv.lib.maintainers.eelco
- stdenv.lib.maintainers.raskin ];
- platforms = stdenv.lib.platforms.linux;
- };
-}
diff --git a/pkgs/os-specific/linux/aufs/3.nix b/pkgs/os-specific/linux/aufs/3.nix
index 83de1faa8fe..255804a31de 100644
--- a/pkgs/os-specific/linux/aufs/3.nix
+++ b/pkgs/os-specific/linux/aufs/3.nix
@@ -33,12 +33,12 @@ stdenv.mkDerivation {
'';
passthru = { inherit patch; };
+
meta = {
description = "Another Unionfs implementation for Linux (third generation)";
homepage = http://aufs.sourceforge.net/;
maintainers = [ stdenv.lib.maintainers.eelco
- stdenv.lib.maintainers.raskin
- stdenv.lib.maintainers.shlevy ];
+ stdenv.lib.maintainers.raskin ];
platforms = stdenv.lib.platforms.linux;
};
}
diff --git a/pkgs/os-specific/linux/blcr/default.nix b/pkgs/os-specific/linux/blcr/default.nix
index 8c77cffe177..9c2821d7776 100644
--- a/pkgs/os-specific/linux/blcr/default.nix
+++ b/pkgs/os-specific/linux/blcr/default.nix
@@ -1,15 +1,17 @@
{ stdenv, fetchurl, kernel, perl, makeWrapper }:
# BLCR 0.8.4 works for kernel version up to 2.6.38 (including 2.6.38.x)
+# BLCR 0.8.5 should works for kernel version up to 3.7.1
+
assert stdenv.isLinux;
-assert builtins.compareVersions "2.6.39" kernel.version == 1;
+assert builtins.compareVersions "3.7.2" kernel.version == 1;
stdenv.mkDerivation {
- name = "blcr-0.8.4-${kernel.version}";
+ name = "blcr_${kernel.version}-0.8.5";
src = fetchurl {
- url = https://ftg.lbl.gov/assets/projects/CheckpointRestart/downloads/blcr-0.8.4.tar.gz;
- sha256 = "d851da66627d9212ac37bc9ea2aba40008ff2dc51d45dbd395ca2e403c3d78cf";
+ url = http://crd.lbl.gov/assets/Uploads/FTG/Projects/CheckpointRestart/downloads/blcr-0.8.5.tar.gz;
+ sha256 = "01a809nfbr715pnidlslv55pxadm3021l97p98zkqy8chyrnkjb0";
};
buildInputs = [ perl makeWrapper ];
diff --git a/pkgs/os-specific/linux/bluez/default.nix b/pkgs/os-specific/linux/bluez/default.nix
index 10187986111..3b876322f1f 100644
--- a/pkgs/os-specific/linux/bluez/default.nix
+++ b/pkgs/os-specific/linux/bluez/default.nix
@@ -9,11 +9,11 @@ let
in
stdenv.mkDerivation rec {
- name = "bluez-4.98";
+ name = "bluez-4.101";
src = fetchurl {
url = "mirror://kernel/linux/bluetooth/${name}.tar.gz";
- sha256 = "9a5b655bada7c7a1921cb3bac83b8a32bbe49893e4c7a1377cdc1b0d35f7d233";
+ sha256 = "11vldy255zkmmpj0g0a1m6dy9bzsmyd7vxy02cdfdw79ml888wsr";
};
buildInputs =
diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix
index 0848cb33253..a24e0fd2307 100644
--- a/pkgs/os-specific/linux/busybox/default.nix
+++ b/pkgs/os-specific/linux/busybox/default.nix
@@ -44,6 +44,9 @@ stdenv.mkDerivation rec {
sha256 = "10k8kgrprll9hxfm9gc3jl7kkq79g6l2pygn5snqwqg5v80zy4zb";
};
+ # Remove this patch after the next busybox update.
+ patches = [ ./include-missing-sys-resource-header.patch ];
+
configurePhase = ''
make defconfig
${configParser}
@@ -60,7 +63,7 @@ stdenv.mkDerivation rec {
extraCrossConfig = ''
CONFIG_CROSS_COMPILER_PREFIX "${stdenv.cross.config}-"
'' +
- (if (stdenv.cross.platform.kernelMajor == "2.4") then ''
+ (if stdenv.cross.platform.kernelMajor == "2.4" then ''
CONFIG_IONICE n
'' else "");
};
diff --git a/pkgs/os-specific/linux/busybox/include-missing-sys-resource-header.patch b/pkgs/os-specific/linux/busybox/include-missing-sys-resource-header.patch
new file mode 100644
index 00000000000..8163a86e3cd
--- /dev/null
+++ b/pkgs/os-specific/linux/busybox/include-missing-sys-resource-header.patch
@@ -0,0 +1,12 @@
+diff --git a/include/libbb.h b/include/libbb.h
+index f12800f..e7806c2 100644
+--- a/include/libbb.h
++++ b/include/libbb.h
+@@ -40,6 +40,7 @@
+ #include
+ #include
+ #include
++#include
+ #include
+ #include
+ #include
diff --git a/pkgs/os-specific/linux/cifs-utils/default.nix b/pkgs/os-specific/linux/cifs-utils/default.nix
index 63eafb93e30..9e761b90a05 100644
--- a/pkgs/os-specific/linux/cifs-utils/default.nix
+++ b/pkgs/os-specific/linux/cifs-utils/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
-
+
stdenv.mkDerivation rec {
- name = "cifs-utils-5.3";
-
+ name = "cifs-utils-5.6";
+
src = fetchurl {
url = "ftp://ftp.samba.org/pub/linux-cifs/cifs-utils/${name}.tar.bz2";
- sha256 = "68e969c4107a872e2848992732dc11eafc7bdf084bec894c0ba677572de49b32";
+ sha256 = "0f619nw1163bcmfc83mmqj31qdkl68wfm81vynx3d8q0m0k1ll7i";
};
makeFlags = "root_sbindir=$(out)/sbin";
@@ -13,6 +13,6 @@ stdenv.mkDerivation rec {
meta = {
homepage = http://www.samba.org/linux-cifs/cifs-utils/;
description = "Tools for managing Linux CIFS client filesystems";
- platforms = stdenv.lib.platforms.linux;
+ platforms = stdenv.lib.platforms.linux;
};
}
diff --git a/pkgs/os-specific/linux/conky/curl-types-h.patch b/pkgs/os-specific/linux/conky/curl-types-h.patch
deleted file mode 100644
index ba99da23b46..00000000000
--- a/pkgs/os-specific/linux/conky/curl-types-h.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-curl removed header
-diff --git a/src/ccurl_thread.c b/src/ccurl_thread.c
-index 10e73a6..9bea299 100644
---- a/src/ccurl_thread.c
-+++ b/src/ccurl_thread.c
-@@ -33,7 +33,6 @@
- #endif /* DEBUG */
-
- #include
--#include
- #include
-
- /*
-diff --git a/src/eve.c b/src/eve.c
-index dc07264..f62a5f6 100644
---- a/src/eve.c
-+++ b/src/eve.c
-@@ -37,7 +37,6 @@
- #include
-
- #include
--#include
- #include
-
- #include
diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix
index fda361d6c74..086b792b4cd 100644
--- a/pkgs/os-specific/linux/conky/default.nix
+++ b/pkgs/os-specific/linux/conky/default.nix
@@ -1,24 +1,26 @@
-{stdenv, fetchurl, pkgconfig, libxml2, curl, wirelesstools, glib, openssl}:
+{ stdenv, fetchurl, pkgconfig, libxml2, curl, wirelesstools, glib, openssl
+, ncurses }:
stdenv.mkDerivation rec {
- name = "conky-1.8.1";
+ name = "conky-1.9.0";
src = fetchurl {
url = "mirror://sourceforge/conky/${name}.tar.bz2";
- sha256 = "0hsybra4qzaqzny6n66m7768vbwkikajcvcbsqgnnnb9527jfnpq";
+ sha256 = "0vxvjmi3cdvnp994sv5zcdyncfn0mlxa71p2wm9zpyrmy58bbwds";
};
- buildInputs = [ pkgconfig libxml2 curl wirelesstools glib openssl ];
- configureFlags =
- (map (x: "--disable-${x}") [ "x11" "xdamage" "own-window" "xft" "lua" "ncurses" ])
- ++ (map (x: "--enable-${x}") [ "mpd" "double-buffer" "wlan" "rss" ]);
+ patches = [ ./stdbool.patch ];
- patches = [ ./curl-types-h.patch ];
+ buildInputs = [ pkgconfig libxml2 curl wirelesstools glib openssl ncurses ];
+ configureFlags =
+ (map (x: "--disable-${x}") [ "x11" "xdamage" "own-window" "xft" "lua" ])
+ ++ (map (x: "--enable-${x}") [ "mpd" "double-buffer" "wlan" "rss"
+ "weather-metar" "weather-xoap" ]);
meta = {
homepage = http://conky.sourceforge.net/;
description = "Conky is an advanced, highly configurable system monitor complied without X based on torsmo";
maintainers = [ stdenv.lib.maintainers.guibert ];
+ license = stdenv.lib.licenses.gpl3Plus;
};
}
-
diff --git a/pkgs/os-specific/linux/conky/stdbool.patch b/pkgs/os-specific/linux/conky/stdbool.patch
new file mode 100644
index 00000000000..3f0b714a1f0
--- /dev/null
+++ b/pkgs/os-specific/linux/conky/stdbool.patch
@@ -0,0 +1,12 @@
+diff --git a/src/conky.c b/src/conky.c
+index 5848b61..69a3d45 100644
+--- a/src/conky.c
++++ b/src/conky.c
+@@ -34,6 +34,7 @@
+ #include "common.h"
+ #include "timed_thread.h"
+ #include
++#include
+ #include
+ #include
+ #include
diff --git a/pkgs/os-specific/linux/consoletools/default.nix b/pkgs/os-specific/linux/consoletools/default.nix
new file mode 100644
index 00000000000..537cc386402
--- /dev/null
+++ b/pkgs/os-specific/linux/consoletools/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchgit, SDL }:
+
+stdenv.mkDerivation rec {
+ name = "linuxconsoletools-${version}";
+ version = "1.4.3";
+
+ src = fetchgit {
+ url = "git://linuxconsole.git.sourceforge.net/gitroot/linuxconsole/linuxconsole";
+ rev = "dac2cae0e5795ddc27b76a92767dd9e07a10621e";
+ sha256 = "350b008e614923dbd548fcaaf2842b39433acdcf595e2ce8aaf1599f076d331d";
+ };
+
+ buildInputs = [ SDL ];
+ makeFlags = [ "PREFIX=$(out)" ];
+
+ meta = {
+ homepage = "https://sourceforge.net/projects/linuxconsole/";
+ description = "A set of tools for joysticks and serial peripherals";
+ license = stdenv.lib.licenses.gpl2Plus;
+
+ longDescription = ''
+ The included tools are:
+
+ ffcfstress(1) - force-feedback stress test
+ ffmvforce(1) - force-feedback orientation test
+ ffset(1) - force-feedback configuration tool
+ fftest(1) - general force-feedback test
+ jstest(1) - joystick test
+ jscal(1) - joystick calibration tool
+ inputattach(1) - connects legacy serial devices to the input layer
+ '';
+ };
+}
diff --git a/pkgs/os-specific/linux/cpufrequtils/default.nix b/pkgs/os-specific/linux/cpufrequtils/default.nix
index 35bf57c269e..e9e0a36f156 100644
--- a/pkgs/os-specific/linux/cpufrequtils/default.nix
+++ b/pkgs/os-specific/linux/cpufrequtils/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
name = "cpufrequtils-008";
src = fetchurl {
- url = "mirror://kernel/linux/utils/kernel/cpufreq/cpufrequtils-008.tar.gz";
+ url = http://ftp.be.debian.org/pub/linux/utils/kernel/cpufreq/cpufrequtils-008.tar.gz;
md5 = "52d3e09e47ffef634833f7fab168eccf";
};
diff --git a/pkgs/os-specific/linux/cryptodev/default.nix b/pkgs/os-specific/linux/cryptodev/default.nix
new file mode 100644
index 00000000000..b9e5690e80e
--- /dev/null
+++ b/pkgs/os-specific/linux/cryptodev/default.nix
@@ -0,0 +1,30 @@
+{ fetchurl, stdenv, kernel, onlyHeaders ? false }:
+
+stdenv.mkDerivation rec {
+ pname = "cryptodev-linux-1.5";
+ name = "${pname}-${kernel.version}";
+
+ src = fetchurl {
+ url = "http://download.gna.org/cryptodev-linux/${pname}.tar.gz";
+ sha256 = "13hybl5p0ck0vgi2gxmiwa2810gcfk78kdy17ai8nczj8il15mn0";
+ };
+
+ buildPhase = if !onlyHeaders then ''
+ make -C ${kernel}/lib/modules/${kernel.modDirVersion}/build \
+ SUBDIRS=`pwd` INSTALL_PATH=$out
+ '' else ":";
+
+ installPhase = stdenv.lib.optionalString (!onlyHeaders) ''
+ make -C ${kernel}/lib/modules/${kernel.modDirVersion}/build \
+ INSTALL_MOD_PATH=$out SUBDIRS=`pwd` modules_install
+ '' + ''
+ mkdir -p $out/include/crypto
+ cp crypto/cryptodev.h $out/include/crypto
+ '';
+
+ meta = {
+ description = "Device that allows access to Linux kernel cryptographic drivers";
+ homepage = http://home.gna.org/cryptodev-linux/;
+ license = "GPLv2+";
+ };
+}
diff --git a/pkgs/os-specific/linux/cryptsetup/default.nix b/pkgs/os-specific/linux/cryptsetup/default.nix
index 9e762f64904..6d612f8cdbd 100644
--- a/pkgs/os-specific/linux/cryptsetup/default.nix
+++ b/pkgs/os-specific/linux/cryptsetup/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, devicemapper, libgcrypt, libuuid, pkgconfig, popt }:
stdenv.mkDerivation rec {
- name = "cryptsetup-1.5.0";
+ name = "cryptsetup-1.5.1";
src = fetchurl {
url = "http://cryptsetup.googlecode.com/files/${name}.tar.bz2";
- sha256 = "1l7qcmaq092k28k8sbw845hs6jwn0f05h68rmb7iwh52232m8wa0";
+ sha256 = "0dib3nw6ifd7d7hr9k4iyaha3hz0pkzairqa38l3fndkr9w3zlhn";
};
configureFlags = "--enable-cryptsetup-reencrypt";
diff --git a/pkgs/os-specific/linux/ebtables/default.nix b/pkgs/os-specific/linux/ebtables/default.nix
index 1f0539add93..eec456ff5ad 100644
--- a/pkgs/os-specific/linux/ebtables/default.nix
+++ b/pkgs/os-specific/linux/ebtables/default.nix
@@ -1,22 +1,27 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "ebtables-2.0.9-2";
+ name = "ebtables-${version}";
+ version = "2.0.10-4";
src = fetchurl {
- url = mirror://sourceforge/ebtables/ebtables-v2.0.9-2.tar.gz;
- sha256 = "18yni9zzhfi1ygkgifzj8qpn95cwwiw7j6b3wsl1bij39mj5z1cq";
+ url = "mirror://sourceforge/ebtables/ebtables-v${version}.tar.gz";
+ sha256 = "0pa5ljlk970yfyhpf3iqwfpbc30j8mgn90fapw9cfz909x47nvyw";
};
makeFlags =
- "LIBDIR=$(out)/lib BINDIR=$(out)/sbin MANDIR=$(out)/share/man " +
- "ETCDIR=$(out)/etc INITDIR=$(TMPDIR) SYSCONFIGDIR=$(out)/etc/sysconfig";
+ [ "LIBDIR=$(out)/lib" "BINDIR=$(out)/sbin" "MANDIR=$(out)/share/man"
+ "ETCDIR=$(out)/etc" "INITDIR=$(TMPDIR)" "SYSCONFIGDIR=$(out)/etc/sysconfig"
+ "LOCALSTATEDIR=/var"
+ ];
preBuild =
''
substituteInPlace Makefile --replace '-o root -g root' ""
'';
+ NIX_CFLAGS_COMPILE = "-Wno-error";
+
preInstall = "mkdir -p $out/etc/sysconfig";
meta = {
diff --git a/pkgs/os-specific/linux/eject/default.nix b/pkgs/os-specific/linux/eject/default.nix
deleted file mode 100644
index eec1ec5342c..00000000000
--- a/pkgs/os-specific/linux/eject/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{stdenv, fetchurl, gettext}:
-
-stdenv.mkDerivation {
- name = "eject-2.1.5";
- #builder = ./builder.sh;
- src = fetchurl {
- url = http://ca.geocities.com/jefftranter@rogers.com/eject-2.1.5.tar.gz;
- sha256 = "0mgy5wp40rsalfkxs6mvsg3s7yaqf2iq49iv4axf9zac9037k7zg";
- };
- buildInputs = [gettext];
- preBuild = "
- makeFlagsArray=(PREFIX=$out)
- ";
-}
diff --git a/pkgs/os-specific/linux/fbterm/default.nix b/pkgs/os-specific/linux/fbterm/default.nix
index 0201422cdf9..59f93e836c4 100644
--- a/pkgs/os-specific/linux/fbterm/default.nix
+++ b/pkgs/os-specific/linux/fbterm/default.nix
@@ -1,37 +1,33 @@
-a :
-let
- fetchurl = a.fetchurl;
-
- buildInputs = with a; [
- gpm freetype fontconfig pkgconfig ncurses
- ];
- s = import ./src-for-default.nix;
+{stdenv, fetchurl, gpm, freetype, fontconfig, pkgconfig, ncurses}:
+let
+ s = # Generated upstream information
+ rec {
+ baseName="fbterm";
+ version="1.7.0";
+ name="fbterm-1.7.0";
+ hash="0pciv5by989vzvjxsv1jsv4bdp4m8j0nfbl29jm5fwi12w4603vj";
+ url="http://fbterm.googlecode.com/files/fbterm-1.7.0.tar.gz";
+ sha256="0pciv5by989vzvjxsv1jsv4bdp4m8j0nfbl29jm5fwi12w4603vj";
+ };
+ buildInputs = [gpm freetype fontconfig pkgconfig ncurses];
in
-rec {
- src = a.fetchUrlFromSrcInfo s;
- inherit(s) name;
+stdenv.mkDerivation {
+ inherit (s) name version;
+ src = fetchurl {
+ inherit (s) url sha256;
+ };
inherit buildInputs;
- configureFlags = [];
-
- fixInc = a.fullDepEntry (''
+ preConfigure = ''
sed -e '/ifdef SYS_signalfd/atypedef long long loff_t;' -i src/fbterm.cpp
- '') ["doUnpack" "minInit"];
-
- fixMakeInstall = a.fullDepEntry (''
sed -e '/install-exec-hook:/,/^[^\t]/{d}; /.NOEXPORT/iinstall-exec-hook:\
' -i src/Makefile.in
- '') ["doUnpack" "minInit"];
-
- setVars = a.noDepEntry (''
export HOME=$PWD;
export NIX_LDFLAGS="$NIX_LDFLAGS -lfreetype"
- '') ;
-
- /* doConfigure should be removed if not needed */
- phaseNames = ["setVars" "fixInc" "fixMakeInstall" "doConfigure" "doMakeInstall"];
-
+ '';
meta = {
+ inherit (s) version;
description = "Framebuffer terminal emulator";
- maintainers = [a.lib.maintainers.raskin];
+ maintainers = [stdenv.lib.maintainers.raskin];
+ platforms = stdenv.lib.platforms.linux;
};
}
diff --git a/pkgs/os-specific/linux/fbterm/default.upstream b/pkgs/os-specific/linux/fbterm/default.upstream
new file mode 100644
index 00000000000..387ef8862fb
--- /dev/null
+++ b/pkgs/os-specific/linux/fbterm/default.upstream
@@ -0,0 +1,3 @@
+url http://code.google.com/p/fbterm/downloads/list
+version_link '[.]tar[.][a-z0-9]+$'
+process 'code[.]google[.]com//' ''
diff --git a/pkgs/os-specific/linux/fbterm/src-for-default.nix b/pkgs/os-specific/linux/fbterm/src-for-default.nix
deleted file mode 100644
index 6705404ac9f..00000000000
--- a/pkgs/os-specific/linux/fbterm/src-for-default.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-rec {
- version="1.7";
- name="fbterm-1.7";
- hash="19qjb2zb4gwr1jlybmalaw3y3zybvc8vliwj85dfabmill1k1afh";
- url="http://fbterm.googlecode.com/files/fbterm-${version}.tar.gz";
- advertisedUrl="http://fbterm.googlecode.com/files/fbterm-1.7.tar.gz";
-
-
-}
diff --git a/pkgs/os-specific/linux/fbterm/src-info-for-default.nix b/pkgs/os-specific/linux/fbterm/src-info-for-default.nix
deleted file mode 100644
index b0c439714fb..00000000000
--- a/pkgs/os-specific/linux/fbterm/src-info-for-default.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- downloadPage = "http://code.google.com/p/fbterm/";
- baseName = "fbterm";
-}
diff --git a/pkgs/os-specific/linux/fbterm/stdenv.nix b/pkgs/os-specific/linux/fbterm/stdenv.nix
deleted file mode 100644
index e257a7d46eb..00000000000
--- a/pkgs/os-specific/linux/fbterm/stdenv.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-# Quick version to be able to cross-build fbterm meanwhile builderDefs cannot
-# cross-build with an equivalent to the stdenvCross adapter.
-{ stdenv, fetchurl, gpm, freetype, fontconfig, pkgconfig, ncurses }:
-
-let
- version="1.7";
- name="fbterm-1.7";
- hash="19qjb2zb4gwr1jlybmalaw3y3zybvc8vliwj85dfabmill1k1afh";
- url="http://fbterm.googlecode.com/files/fbterm-${version}.tar.gz";
-in
-
-stdenv.mkDerivation {
- inherit name;
-
- src = fetchurl {
- inherit url;
- sha256 = hash;
- };
-
- buildNativeInputs = [ ncurses ];
- buildInputs = [ gpm freetype fontconfig pkgconfig ];
-
- preConfigure = ''
- sed -e '/ifdef SYS_signalfd/atypedef long long loff_t;' -i src/fbterm.cpp
-
- sed -e '/install-exec-hook:/,/^[^\t]/{d}; /.NOEXPORT/iinstall-exec-hook:\
- ' -i src/Makefile.in
-
- export HOME=$PWD;
-
- export NIX_LDFLAGS="$NIX_LDFLAGS -lfreetype"
- # This is only relevant cross-building
- export NIX_CROSS_LDFLAGS="$NIX_CROSS_LDFLAGS -lfreetype"
- '';
-}
diff --git a/pkgs/os-specific/linux/ffado/default.nix b/pkgs/os-specific/linux/ffado/default.nix
index a78599c6a20..834f98960df 100644
--- a/pkgs/os-specific/linux/ffado/default.nix
+++ b/pkgs/os-specific/linux/ffado/default.nix
@@ -1,13 +1,14 @@
-{ stdenv, fetchsvn, dbus, dbus_cplusplus, expat, glibmm, libconfig
+{ stdenv, fetchurl, dbus, dbus_cplusplus, expat, glibmm, libconfig
, libavc1394, libiec61883, libraw1394, libxmlxx, makeWrapper, pkgconfig
, pyqt4, python, pythonDBus, qt4, scons }:
stdenv.mkDerivation rec {
- name = "libffado-svn-1995";
+ name = "libffado-${version}";
+ version = "2.1.0";
- src = fetchsvn {
- url = "http://subversion.ffado.org/ffado/trunk/libffado";
- rev = "1995";
+ src = fetchurl {
+ url = "http://www.ffado.org/files/${name}.tgz";
+ sha256 = "11cxmy31c19720j2171l735rpg7l8i41icsgqscfd2vkbscfmh6y";
};
buildInputs =
@@ -18,13 +19,16 @@ stdenv.mkDerivation rec {
patches = [ ./enable-mixer-and-dbus.patch ];
- preBuild = "export PYLIBSUFFIX=lib/${python.libPrefix}/site-packages";
-
# TODO fix ffado-diag, it doesn't seem to use PYPKGDIR
- buildPhase = "scons PYPKGDIR=$out/$PYLIBSUFFIX";
+ buildPhase = ''
+ export PYLIBSUFFIX=lib/${python.libPrefix}/site-packages
+ scons PYPKGDIR=$out/$PYLIBSUFFIX DEBUG=False
+ sed -e "s#/usr/local#$out#" -i support/mixer-qt4/ffado/config.py
+ '';
+
installPhase = ''
scons PREFIX=$out LIBDIR=$out/lib SHAREDIR=$out/share/libffado \
- PYPKGDIR=$out/$PYLIBSUFFIX install
+ PYPKGDIR=$out/$PYLIBSUFFIX UDEVDIR=$out/lib/udev/rules.d install
sed -e "s#/usr/local#$out#g" -i $out/bin/ffado-diag
diff --git a/pkgs/os-specific/linux/ffado/enable-mixer-and-dbus.patch b/pkgs/os-specific/linux/ffado/enable-mixer-and-dbus.patch
index 44c0b991e0a..480e0f45a92 100644
--- a/pkgs/os-specific/linux/ffado/enable-mixer-and-dbus.patch
+++ b/pkgs/os-specific/linux/ffado/enable-mixer-and-dbus.patch
@@ -1,24 +1,25 @@
---- libffado-r2117/SConstruct 1970-01-01 01:00:01.000000000 +0100
-+++ libffado-r2117/SConstruct 2012-04-06 18:26:45.521100690 +0200
-@@ -314,10 +314,8 @@
+--- libffado-2.1.0/SConstruct 1970-01-01 01:00:01.000000000 +0100
++++ libffado-2.1.0/SConstruct 2012-09-30 16:50:23.603283095 +0000
+@@ -349,11 +349,9 @@
+ # Optional checks follow:
#
- # PyQT checks
+-# PyQT checks
-build_mixer = False
-if conf.CheckForApp( 'which pyuic4' ) and conf.CheckForPyModule( 'dbus' ) and conf.CheckForPyModule( 'PyQt4' ) and conf.CheckForPyModule( 'dbus.mainloop.qt' ):
- env['PYUIC4'] = True
- build_mixer = True
+env['PYUIC4'] = True
+build_mixer = True
++
if conf.CheckForApp( 'xdg-desktop-menu --help' ):
env['XDG_TOOLS'] = True
-@@ -348,7 +346,8 @@
+@@ -384,7 +382,7 @@
name2 = pkg.replace("+","").replace(".","").replace("-","").upper()
env['%s_FLAGS' % name2] = conf.GetPKGFlags( pkg, pkgs[pkg] )
-if not env['DBUS1_FLAGS'] or not env['DBUSC1_FLAGS'] or not conf.CheckForApp('which dbusxx-xml2cpp'):
-+
+if False:
env['DBUS1_FLAGS'] = ""
env['DBUSC1_FLAGS'] = ""
diff --git a/pkgs/os-specific/linux/firmware/amd-ucode/default.nix b/pkgs/os-specific/linux/firmware/amd-ucode/default.nix
index 685b44a1651..dc5959d400d 100644
--- a/pkgs/os-specific/linux/firmware/amd-ucode/default.nix
+++ b/pkgs/os-specific/linux/firmware/amd-ucode/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
- name = "amd-ucode-2012-01-17";
+ name = "amd-ucode-2012-09-10";
src = fetchurl {
url = "http://www.amd64.org/pub/microcode/${name}.tar";
- sha256 = "0mqnbs87khv6p874cbyf9nb8i4gc592ws67lyzhc4chmwvc9ln47";
+ sha256 = "065phvhx5hx5ssdd1x2p5m1yv26ak7l5aaw6yk6h95x9mxn5r111";
};
installPhase = ''
diff --git a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
index e2ba47abb9a..f6173fcf5f5 100644
--- a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
+++ b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
@@ -6,25 +6,26 @@
{ stdenv, fetchurl, buildEnv, dpkg }:
let
- version = "0.35";
+ version = "0.36";
+
packages = [
- { name = "linux-nonfree"; sha256 = "8c0701500e5252e3e05ad0e5403cc5295899ccb2d6d731380b5f4c2d90003ed1"; }
- { name = "atheros"; sha256 = "df411d76e3d55cb256b0974df16cf18f316c1325f33670fbc9e36abba5aa46c0"; }
- { name = "bnx2"; sha256 = "124e74aa6ce477f7b6a0b5eff3870b0104fd885b4bdfb9977175e75bdb9a7525"; }
- { name = "bnx2x"; sha256 = "4cbcf3422a9aaa6e31704770c724179765dceabd2e6867e24cf47039925e6545"; }
- { name = "brcm80211"; sha256 = "eefba7ba31c018d514ea15878cfd7bca36a65b0df3e9024fc3875a990678a684"; }
- { name = "intelwimax"; sha256 = "436a3bd128224f43988630318aa3e74abfbe838916e1e10a602ddc468b75d843"; }
- { name = "ipw2x00"; sha256 = "9c214e3a9f7f7d710b5cb30282d5ca2b2ccafc3bb208dfe7e18de16d3aadc7a3"; }
- { name = "ivtv"; sha256 = "ced47d8b87ff8ff70a8c32492cc4fb5818860ef018b5c04a4415ab26c9b16300"; }
- { name = "iwlwifi"; sha256 = "5d9615ec128b59cc5834e0261ea74127c0bc64bafabdaef1028a8f1acf611568"; }
- { name = "libertas"; sha256 = "b109fb5c392928ac5495f8ce1d0f41d123b193031f8b548e8b68e9563db37016"; }
- { name = "linux"; sha256 = "8e87f75c120904f2ca5fd9017e4503c23d8705b9ccaeb570374d1747163620ab"; }
- { name = "myricom"; sha256 = "4c9e19d8b2cea97eb05f9d577537dba81aa36ac06c6da9bbed0bfa20434b7acc"; }
- { name = "netxen"; sha256 = "3bd129229cf548a533c79cb55deefa7e4919e09fcc1f655773f4fa5078d81b9b"; }
- { name = "qlogic"; sha256 = "213d098435c657115d2754ef5ead52e64f5fa05be4dcbcb0d5d3ca745376959c"; }
- { name = "ralink"; sha256 = "51f3001ed15ca72bb088297b9e6e4a821ba6250f0ccc8886d77d2f5386a21836"; }
- { name = "realtek"; sha256 = "a6338f5cd8bbe9627fa994016ebb0a91b40914021bec280ddc8f8a56eab22287"; }
+ { name = "linux-nonfree"; sha256 = "668d262dfcf18ffef2fe2a0b853b81bf5855f49fd2133203cbda097b1507c953"; }
+ { name = "atheros"; sha256 = "27cbd2099ce28c742f42833b09a61bdc7fb5b2ebcf5b35a52e750160ea1001b6"; }
+ { name = "bnx2"; sha256 = "32730fdeb0fb15a36e0ca046bde69e1a6fece8561af57afc7d9f1cf978fd25ab"; }
+ { name = "bnx2x"; sha256 = "22f23f4abb4aa2dac22718f12cf3bbd3fd2d63870b13e81c8401e6f841a719e8"; }
+ { name = "brcm80211"; sha256 = "17055c4199cc7e2aaa7d1d76dd5e718d24dbebb84020bb2d95ffab03bcfc7e8a"; }
+ { name = "intelwimax"; sha256 = "cc1b894990d3074e93b3f79b2b617614aab554b5e832d34993b5a16f64bdb84a"; }
+ { name = "ipw2x00"; sha256 = "2ef0810e2e037f7d536b24cc35527c456ff13b7aa5fd2df607b7035227553c9d"; }
+ { name = "ivtv"; sha256 = "7bf30e142679d53ad376002f29026bbe28de51e1cb71bcc3ec5c5f5f119a7118"; }
+ { name = "iwlwifi"; sha256 = "46ce0915583674ec10bfde3840b66ff450237edf604804ff51b9872fe767c1bb"; }
+ { name = "libertas"; sha256 = "c5d370d244f1c3a42f0a0280ed0cab067dbf36fa2926d387c9d10cf4ccd1b000"; }
+ { name = "linux"; sha256 = "e19bedc2cacf2cd7a1fc38e25820effe9e58fdc56608e9f7c320c85b80cba6ea"; }
+ { name = "myricom"; sha256 = "038bd618c00e852206a8a1443ba47ea644c04052bd8f10af9392c716ebf16b3c"; }
+ { name = "netxen"; sha256 = "29e3c1707dab6439f391318a223e5d4b6508d493c8d8bad799aef4f35b4704e7"; }
+ { name = "qlogic"; sha256 = "cc43c6016f2b7661d39e1d678ac0e8ca70081be8a0c76c2ec4d2e71493afa7d8"; }
+ { name = "ralink"; sha256 = "4db8dc6b98821c59f008c8bf7464317443b031cebf6d7e56c06f0824e69e3922"; }
+ { name = "realtek"; sha256 = "c39e65e5a589325ceb365d11b9ea10b0244134b7e5b3b05fd91fe6ad66b2f093"; }
];
fetchPackage =
diff --git a/pkgs/os-specific/linux/firmware/iwlwifi-1000-ucode/default.nix b/pkgs/os-specific/linux/firmware/iwlwifi-1000-ucode/default.nix
index 2660c0b2493..8acb75c3ed6 100644
--- a/pkgs/os-specific/linux/firmware/iwlwifi-1000-ucode/default.nix
+++ b/pkgs/os-specific/linux/firmware/iwlwifi-1000-ucode/default.nix
@@ -4,7 +4,8 @@ stdenv.mkDerivation rec {
name = "iwlwifi-1000-ucode-128.50.3.1";
src = fetchurl {
- url = "http://intellinuxwireless.org/iwlwifi/downloads/${name}.tgz";
+ url = "http://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=${name}.tgz";
+ name = "${name}.tgz";
sha256 = "7e81ddad18acec19364c9df22496e8afae99a2e1490b2b178e420b52d443728d";
};
@@ -26,6 +27,6 @@ stdenv.mkDerivation rec {
driver found in recent kernels.
'';
- homepage = http://intellinuxwireless.org/;
+ homepage = http://wireless.kernel.org/en/users/Drivers/iwlwifi;
};
}
diff --git a/pkgs/os-specific/linux/firmware/iwlwifi-2030-ucode/default.nix b/pkgs/os-specific/linux/firmware/iwlwifi-2030-ucode/default.nix
new file mode 100644
index 00000000000..bc9c8efe063
--- /dev/null
+++ b/pkgs/os-specific/linux/firmware/iwlwifi-2030-ucode/default.nix
@@ -0,0 +1,30 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation rec {
+ name = "iwlwifi-2030-ucode-18.168.6.1";
+
+ src = fetchurl {
+ url = "http://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=${name}.tgz";
+ name = "${name}.tgz";
+ sha256 = "0b69jpb46fk63ybyyb8lbh99j1d29ayp8fl98l18iqy3q7mx4ry8";
+ };
+
+ buildPhase = "true";
+
+ installPhase = ''
+ mkdir -p "$out"
+ chmod -x *
+ cp * "$out"
+ '';
+
+ meta = {
+ description = "Firmware for the Intel 2030 Series wireless card";
+
+ longDescription = ''
+ This package provides the Intel 2030 Series wireless card
+ firmware. It contains the `iwlwifi-2030-6.ucode' file.
+ '';
+
+ homepage = http://intellinuxwireless.org/;
+ };
+}
diff --git a/pkgs/os-specific/linux/firmware/iwlwifi-4965-ucode/default.nix b/pkgs/os-specific/linux/firmware/iwlwifi-4965-ucode/default.nix
index 3e3ad74adb3..266c7795d23 100644
--- a/pkgs/os-specific/linux/firmware/iwlwifi-4965-ucode/default.nix
+++ b/pkgs/os-specific/linux/firmware/iwlwifi-4965-ucode/default.nix
@@ -4,7 +4,8 @@ stdenv.mkDerivation rec {
name = "iwlwifi-4965-ucode-228.57.1.21";
src = fetchurl {
- url = "http://intellinuxwireless.org/iwlwifi/downloads/" + name + ".tgz";
+ url = "wireless.kernel.org/en/users/Drivers/iwlegacy?action=AttachFile&do=get&target=${name}.tgz";
+ name = "${name}.tgz";
sha256 = "1rry0kpzszxk60h5gb94advzi009010xb332iyvfpaiwbj6aiyas";
};
diff --git a/pkgs/os-specific/linux/firmware/iwlwifi-5150-ucode/default.nix b/pkgs/os-specific/linux/firmware/iwlwifi-5150-ucode/default.nix
index 0d409bd8427..dca427cbff5 100644
--- a/pkgs/os-specific/linux/firmware/iwlwifi-5150-ucode/default.nix
+++ b/pkgs/os-specific/linux/firmware/iwlwifi-5150-ucode/default.nix
@@ -4,7 +4,8 @@ stdenv.mkDerivation rec {
name = "iwlwifi-5150-ucode-8.24.2.2";
src = fetchurl {
- url = "http://intellinuxwireless.org/iwlwifi/downloads/iwlwifi-5150-ucode-8.24.2.2.tgz";
+ url = "http://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=${name}.tgz";
+ name = "${name}.tgz";
sha256 = "d253e6ff6624639aded67c82df98b2bc4a66eb66400848d5614921d513540cf9";
};
@@ -24,6 +25,6 @@ stdenv.mkDerivation rec {
firmware. It contains the `iwlwifi-5150-2.ucode' file.
'';
- homepage = http://intellinuxwireless.org/;
+ homepage = http://wireless.kernel.org/en/users/Drivers/iwlwifi;
};
}
diff --git a/pkgs/os-specific/linux/firmware/iwlwifi-6000-ucode/default.nix b/pkgs/os-specific/linux/firmware/iwlwifi-6000-ucode/default.nix
index e5f3effa4b7..2e88f1bba74 100644
--- a/pkgs/os-specific/linux/firmware/iwlwifi-6000-ucode/default.nix
+++ b/pkgs/os-specific/linux/firmware/iwlwifi-6000-ucode/default.nix
@@ -4,7 +4,8 @@ stdenv.mkDerivation rec {
name = "iwlwifi-6000-ucode-9.221.4.1";
src = fetchurl {
- url = "http://intellinuxwireless.org/iwlwifi/downloads/${name}.tgz";
+ url = "http://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=${name}.tgz";
+ name = "${name}.tgz";
sha256 = "7f04623231663dc4ee63df32fd890bfa9514dce1fab9dc7a25fda90350da836b";
};
@@ -24,6 +25,6 @@ stdenv.mkDerivation rec {
firmware. It contains the `iwlwifi-6000-4.ucode' file.
'';
- homepage = http://intellinuxwireless.org/;
+ homepage = http://wireless.kernel.org/en/users/Drivers/iwlwifi;
};
}
diff --git a/pkgs/os-specific/linux/firmware/iwlwifi-6000g2a-ucode/default.nix b/pkgs/os-specific/linux/firmware/iwlwifi-6000g2a-ucode/default.nix
index e5fe73ca498..ef259b70975 100644
--- a/pkgs/os-specific/linux/firmware/iwlwifi-6000g2a-ucode/default.nix
+++ b/pkgs/os-specific/linux/firmware/iwlwifi-6000g2a-ucode/default.nix
@@ -1,11 +1,12 @@
-{stdenv, fetchurl}:
+{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "iwlwifi-6000g2a-ucode-17.168.5.3";
+ name = "iwlwifi-6000g2a-ucode-18.168.6.1";
src = fetchurl {
- url = "http://intellinuxwireless.org/iwlwifi/downloads/${name}.tgz";
- sha256 = "febbbc0851db17296d35e5ca1d9266c1a14e9a9ae6ce41a36578c44971ae79f9";
+ url = "http://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=${name}.tgz";
+ name = "${name}.tgz";
+ sha256 = "a7f2615756addafbf3e6912cb0265f9650b2807d1ccdf54b620735772725bbe9";
};
buildPhase = "true";
@@ -17,13 +18,12 @@ stdenv.mkDerivation rec {
'';
meta = {
+ homepage = http://wireless.kernel.org/en/users/Drivers/iwlwifi;
description = "Firmware for the Intel 6000 Series Gen2 wireless card";
longDescription = ''
This package provides the Intel 6000 Series wireless card
firmware. It contains the `iwlwifi-6000g2a-5.ucode' file.
'';
-
- homepage = http://intellinuxwireless.org/;
};
}
diff --git a/pkgs/os-specific/linux/firmware/iwlwifi-6000g2b-ucode/default.nix b/pkgs/os-specific/linux/firmware/iwlwifi-6000g2b-ucode/default.nix
index b3a2a810bf7..0fee3acd0a3 100644
--- a/pkgs/os-specific/linux/firmware/iwlwifi-6000g2b-ucode/default.nix
+++ b/pkgs/os-specific/linux/firmware/iwlwifi-6000g2b-ucode/default.nix
@@ -4,7 +4,8 @@ stdenv.mkDerivation rec {
name = "iwlwifi-6000g2b-ucode-17.168.5.2";
src = fetchurl {
- url = "http://intellinuxwireless.org/iwlwifi/downloads/${name}.tgz";
+ url = "http://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=${name}.tgz";
+ name = "${name}.tgz";
sha256 = "5e4afdf070bfef549e50e62187f22dc2e40f5d9fe8b9a77561f8f3efb0d1d052";
};
@@ -24,6 +25,6 @@ stdenv.mkDerivation rec {
firmware. It contains the `iwlwifi-6000g2b-4.ucode' file.
'';
- homepage = http://intellinuxwireless.org/;
+ homepage = http://wireless.kernel.org/en/users/Drivers/iwlwifi;
};
}
diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix
new file mode 100644
index 00000000000..02d7194b500
--- /dev/null
+++ b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix
@@ -0,0 +1,23 @@
+{stdenv, fetchurl }:
+
+stdenv.mkDerivation {
+ name = "raspberrypi-firmware-20160106";
+
+ src = fetchurl {
+ url = "https://github.com/raspberrypi/firmware/archive/4ade27942e.tar.gz";
+ sha256 = "0f4p920vr7dcj4hprgil8baqqbnsjx1jykz0pkdx29mqy0n0xanl";
+ };
+
+ installPhase = ''
+ mkdir -p $out/share/raspberrypi/boot
+ cp -R boot/* $out/share/raspberrypi/boot
+ cp -R hardfp/opt/vc/* $out
+ cp opt/vc/LICENCE $out/share/raspberrypi
+ '';
+
+ meta = {
+ description = "Firmware for the Raspberry Pi board";
+ homepage = https://github.com/raspberrypi;
+ license = "non-free";
+ };
+}
diff --git a/pkgs/os-specific/linux/fuse/default.nix b/pkgs/os-specific/linux/fuse/default.nix
index 2a0dfb220ec..bd2507ec1bc 100644
--- a/pkgs/os-specific/linux/fuse/default.nix
+++ b/pkgs/os-specific/linux/fuse/default.nix
@@ -1,13 +1,13 @@
{ stdenv, fetchurl, utillinux }:
stdenv.mkDerivation rec {
- name = "fuse-2.8.7";
+ name = "fuse-2.9.2";
builder = ./builder.sh;
src = fetchurl {
url = "mirror://sourceforge/fuse/${name}.tar.gz";
- sha256 = "17dlp6p7kcd8kav3rylmn1a1rqbnri4iawl78mmcm1szllck6w90";
+ sha256 = "1z6fg593hy1j7mynhckx43gqkkg2nwpmwwv860337nl77zxji9w1";
};
configureFlags = "--disable-kernel-module";
diff --git a/pkgs/os-specific/linux/gogoclient/default.nix b/pkgs/os-specific/linux/gogoclient/default.nix
index d1a4bf9feb6..4328eb36b6d 100644
--- a/pkgs/os-specific/linux/gogoclient/default.nix
+++ b/pkgs/os-specific/linux/gogoclient/default.nix
@@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
name = "${baseName}-${version}";
src = fetchurl {
- url = http://gogo6.com/downloads/gogoc-1_2-RELEASE.tar.gz;
+ #url = http://gogo6.com/downloads/gogoc-1_2-RELEASE.tar.gz;
+ url = http://pkgs.fedoraproject.org/repo/pkgs/gogoc/gogoc-1_2-RELEASE.tar.gz/41177ed683cf511cc206c7782c37baa9/gogoc-1_2-RELEASE.tar.gz;
sha256 = "a0ef45c0bd1fc9964dc8ac059b7d78c12674bf67ef641740554e166fa99a2f49";
};
patches = [./gcc46-include-fix.patch ./config-paths.patch ];
@@ -28,6 +29,7 @@ stdenv.mkDerivation rec {
--replace "/sbin/route" "${nettools}/sbin/route" \
--replace "/sbin/ip" "${iproute}/sbin/ip" \
--replace "/sbin/sysctl" "${procps}/sbin/sysctl"
+ sed -i -e 's/^.*Exec \$route -A.*$/& metric 128/' $out/template/linux.sh
'';
meta = {
diff --git a/pkgs/os-specific/linux/hal/default.nix b/pkgs/os-specific/linux/hal/default.nix
deleted file mode 100644
index f1757be94cf..00000000000
--- a/pkgs/os-specific/linux/hal/default.nix
+++ /dev/null
@@ -1,63 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, python, pciutils, expat
-, libusb, dbus, dbus_glib, glib, libuuid, perl
-, perlXMLParser, gettext, zlib, gperf, consolekit, policykit
-, libsmbios, dmidecode, udev, utillinux, pmutils, usbutils
-, eject, upstart
-}:
-
-assert stdenv ? glibc;
-
-let
- isPC = stdenv.isi686 || stdenv.isx86_64;
- changeDmidecode = if isPC then
- "--replace /usr/sbin/dmidecode ${dmidecode}/sbin/dmidecode"
- else "";
-in
-stdenv.mkDerivation rec {
- name = "hal-0.5.14";
-
- src = fetchurl {
- url = "http://hal.freedesktop.org/releases/${name}.tar.gz";
- sha256 = "00ld3afcbh4ckb8sli63mm2w69zh6ip4axhy1lxyybgiabxaqfij";
- };
-
- buildInputs = [
- pkgconfig python pciutils expat libusb dbus.libs dbus_glib glib
- libuuid perl perlXMLParser gettext zlib gperf
- consolekit policykit
- ];
-
- # !!! Hm, maybe the pci/usb.ids location should be in /etc, so that
- # we don't have to rebuild HAL when we update the PCI/USB IDs.
- configureFlags = ''
- --with-pci-ids=${pciutils}/share
- --with-usb-ids=${usbutils}/share
- --localstatedir=/var
- --with-eject=${eject}/bin/eject
- --with-linux-input-header=${stdenv.glibc}/include/linux/input.h
- --enable-umount-helper
- '';
-
- propagatedBuildInputs = [ libusb ]
- ++ stdenv.lib.optional isPC libsmbios;
-
- preConfigure = ''
- for i in hald/linux/probing/probe-smbios.c hald/linux/osspec.c \
- hald/linux/coldplug.c hald/linux/blockdev.c \
- tools/hal-storage-mount.c ./tools/hal-storage-shared.c \
- tools/hal-system-power-pm-is-supported.c \
- tools/linux/hal-*-linux
- do
- substituteInPlace $i \
- ${changeDmidecode} \
- ${if udev != null then "--replace /sbin/udevadm ${udev}/sbin/udevadm" else ""} \
- --replace /bin/mount ${utillinux}/bin/mount \
- --replace /bin/umount ${utillinux}/bin/umount \
- --replace /usr/bin/pm-is-supported ${pmutils}/bin/pm-is-supported \
- --replace /usr/sbin/pm ${pmutils}/sbin/pm \
- --replace /sbin/shutdown ${upstart}/sbin/shutdown
- done
- '';
-
- installFlags = "slashsbindir=$(out)/sbin";
-}
diff --git a/pkgs/os-specific/linux/hal/hal-evt.nix b/pkgs/os-specific/linux/hal/hal-evt.nix
deleted file mode 100644
index a49f4fcc0f8..00000000000
--- a/pkgs/os-specific/linux/hal/hal-evt.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ stdenv, fetchurl, libxml2, pkgconfig, boolstuff, hal, dbus_glib }:
-
-stdenv.mkDerivation {
- name = "hal-evt-0.1.4";
-
- src = fetchurl {
- url = http://savannah.nongnu.org/download/halevt/halevt-0.1.4.tar.gz;
- sha256 = "173dphyzpicjz5pnw0d6wmibvib5h99nh1gmyvcqpgvf8la5vrps";
- };
-
- buildInputs = [ libxml2 pkgconfig boolstuff hal dbus_glib ];
-
- meta = {
- description = "Execute commands on hal events";
- homepage = http://www.nongnu.org/halevt/;
- license = "GPLv2";
- maintainers = [ stdenv.lib.maintainers.marcweber ];
- platforms = stdenv.lib.platforms.linux;
- };
-}
diff --git a/pkgs/os-specific/linux/hal/info.nix b/pkgs/os-specific/linux/hal/info.nix
deleted file mode 100644
index 1a4e41c776f..00000000000
--- a/pkgs/os-specific/linux/hal/info.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{stdenv, fetchurl, pkgconfig}:
-
-stdenv.mkDerivation rec {
- name = "hal-info-20091130";
-
- src = fetchurl {
- url = "http://hal.freedesktop.org/releases/${name}.tar.gz";
- sha256 = "092jhzpxa2h8djf8pijql92m70q87yds22686ryrfna3xbm90niv";
- };
-
- meta = {
- homepage = http://www.freedesktop.org/wiki/Software/hal;
- description = "Hardware data and quirks for HAL";
- };
-}
diff --git a/pkgs/os-specific/linux/hal/synaptics.nix b/pkgs/os-specific/linux/hal/synaptics.nix
deleted file mode 100644
index 20c4d1ec24f..00000000000
--- a/pkgs/os-specific/linux/hal/synaptics.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{stdenv}:
-stdenv.mkDerivation {
- name = "hal-info-synaptics";
- buildCommand = ''
- mkdir -p $out/share/hal/fdi/information/15-osvendor/
- cat << EOF > $out/share/hal/fdi/information/15-osvendor/10-x11-synaptics.fdi
-
-
-
-
- synaptics
- true
- event
-
-
-
-EOF
- '';
-}
diff --git a/pkgs/os-specific/linux/hostapd/default.nix b/pkgs/os-specific/linux/hostapd/default.nix
index 39f92d99b7f..f13a1033f8b 100644
--- a/pkgs/os-specific/linux/hostapd/default.nix
+++ b/pkgs/os-specific/linux/hostapd/default.nix
@@ -1,21 +1,22 @@
-{ stdenv, fetchurl, libnl1, openssl }:
+{ stdenv, fetchurl, libnl, openssl, pkgconfig }:
stdenv.mkDerivation rec {
name = "hostapd-${version}";
- version = "0.7.3";
+ version = "1.0";
src = fetchurl {
- url = http://w1.fi/releases/hostapd-0.7.3.tar.gz;
- sha256 = "0rqmjs4k50qjp2d0k71lg5vsh34w07w985cxjqklq6kyyf0jgsri";
+ url = "http://w1.fi/releases/${name}.tar.gz";
+ sha256 = "1k6z2g0g324593a7ybd76bywvj0gnf9cybqaj2sq5ks6gv5rsbh0";
};
- buildInputs = [ libnl1 openssl ];
+ buildInputs = [ libnl openssl pkgconfig ];
configurePhase = ''
cd hostapd
- substituteInPlace defconfig --replace "#CONFIG_DRIVER_NL80211" "CONFIG_DRIVER_NL80211"
- substituteInPlace Makefile --replace "/usr/local/bin/" "$out/bin/"
+ substituteInPlace Makefile --replace "/usr/local/bin" "$out/bin"
mv defconfig .config
+ echo CONFIG_LIBNL32=y | tee -a .config
+ export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags libnl-3.0)"
'';
preInstall = "mkdir -p $out/bin";
diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix
index cc5339ba900..2b22f4a2881 100644
--- a/pkgs/os-specific/linux/iproute/default.nix
+++ b/pkgs/os-specific/linux/iproute/default.nix
@@ -1,11 +1,11 @@
-{fetchurl, stdenv, flex, bison, db4, iptables}:
+{ fetchurl, stdenv, flex, bison, db4, iptables, pkgconfig }:
stdenv.mkDerivation rec {
- name = "iproute2-2.6.35";
+ name = "iproute2-3.6.0";
src = fetchurl {
- url = "http://pkgs.fedoraproject.org/repo/pkgs/iproute/iproute2-2.6.35.tar.bz2/b0f281b3124bf04669e18f5fe16d4934/iproute2-2.6.35.tar.bz2";
- sha256 = "18why1wy0v859axgrlfxn80zmskss0410hh9rf5gn9cr29zg9cla";
+ url = http://kernel.org/pub/linux/utils/net/iproute2/iproute2-3.6.0.tar.xz;
+ sha256 = "0d05av2s7p552yszgj6glz6d74jlmg392s7n74hicgqfl16m85rd";
};
patches = [ ./vpnc.patch ];
@@ -15,20 +15,25 @@ stdenv.mkDerivation rec {
patchShebangs ./configure
sed -e '/ARPDDIR/d' -i Makefile
'';
+
postConfigure = "cat Config";
makeFlags = "DESTDIR= LIBDIR=$(out)/lib SBINDIR=$(out)/sbin"
- + " CONFDIR=$(out)/etc DOCDIR=$(out)/share/doc/${name}"
- + " MANDIR=$(out)/share/man";
+ + " CONFDIR=$(out)/etc DOCDIR=$(out)/share/doc/${name}"
+ + " MANDIR=$(out)/share/man";
- buildInputs = [db4 iptables];
- buildNativeInputs = [bison flex db4];
+ buildInputs = [ db4 iptables ];
+ nativeBuildInputs = [ bison flex pkgconfig ];
+
+ enableParallelBuilding = true;
+
+ # Get rid of useless TeX/SGML docs.
+ postInstall = "rm -rf $out/share/doc";
meta = {
- homepage =
- http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2;
- description = "A collection of utilities for controlling TCP / IP"
- + " networking and traffic control in Linux";
+ homepage = http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2;
+ description = "A collection of utilities for controlling TCP/IP networking and traffic control in Linux";
platforms = stdenv.lib.platforms.linux;
+ maintainers = [ stdenv.lib.maintainers.eelco ];
};
}
diff --git a/pkgs/os-specific/linux/ipsec-tools/default.nix b/pkgs/os-specific/linux/ipsec-tools/default.nix
new file mode 100644
index 00000000000..00676319b03
--- /dev/null
+++ b/pkgs/os-specific/linux/ipsec-tools/default.nix
@@ -0,0 +1,42 @@
+{ stdenv, fetchurl, linuxHeaders, readline, openssl, flex, krb5, pam }:
+
+# TODO: These tools are supposed to work under NetBSD and FreeBSD as
+# well, so I guess it's not appropriate to place this expression in
+# "os-specific/linux/ipsec-tools". Since I cannot verify that the
+# expression actually builds on those platforms, I'll leave it here for
+# the time being.
+
+stdenv.mkDerivation rec {
+ name = "ipsec-tools-0.8.0";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/ipsec-tools/${name}.tar.bz2";
+ sha256 = "2359a24aa8eda9ca7043fc47950c8e6b7f58a07c5d5ad316aa7de2bc5e3a8717";
+ };
+
+ buildInputs = [ readline openssl flex krb5 pam ];
+
+ patches = [ ./dont-create-localstatedir-during-install.patch ];
+
+ configureFlags = ''
+ --sysconfdir=/etc --localstatedir=/var
+ --with-kernel-headers=${linuxHeaders}/include
+ --disable-security-context
+ --enable-adminport
+ --enable-dpd
+ --enable-frag
+ --enable-gssapi
+ --enable-hybrid
+ --enable-natt
+ --enable-shared
+ --enable-stats
+ '';
+
+ meta = {
+ homepage = "http://ipsec-tools.sourceforge.net/";
+ description = "Port of KAME's IPsec utilities to the Linux-2.6 IPsec implementation";
+
+ platforms = stdenv.lib.platforms.linux;
+ maintainers = [stdenv.lib.maintainers.simons];
+ };
+}
diff --git a/pkgs/os-specific/linux/ipsec-tools/dont-create-localstatedir-during-install.patch b/pkgs/os-specific/linux/ipsec-tools/dont-create-localstatedir-during-install.patch
new file mode 100644
index 00000000000..16b80c36d6a
--- /dev/null
+++ b/pkgs/os-specific/linux/ipsec-tools/dont-create-localstatedir-during-install.patch
@@ -0,0 +1,13 @@
+diff -ubr ipsec-tools-0.8.0-orig/src/racoon/Makefile.in ipsec-tools-0.8.0/src/racoon/Makefile.in
+--- ipsec-tools-0.8.0-orig/src/racoon/Makefile.in 2012-10-20 13:01:07.700903316 +0200
++++ ipsec-tools-0.8.0/src/racoon/Makefile.in 2012-10-20 13:01:13.177832616 +0200
+@@ -1085,9 +1085,6 @@
+ uninstall-sbinPROGRAMS
+
+
+-install-exec-local:
+- ${mkinstalldirs} $(DESTDIR)${adminsockdir}
+-
+ # special object rules
+ crypto_openssl_test.o: crypto_openssl.c
+ $(COMPILE) -DEAYDEBUG -o crypto_openssl_test.o -c $(srcdir)/crypto_openssl.c
diff --git a/pkgs/os-specific/linux/iptables/default.nix b/pkgs/os-specific/linux/iptables/default.nix
index a1dace598fe..78d8ee52fb1 100644
--- a/pkgs/os-specific/linux/iptables/default.nix
+++ b/pkgs/os-specific/linux/iptables/default.nix
@@ -1,11 +1,11 @@
{stdenv, fetchurl}:
stdenv.mkDerivation rec {
- name = "iptables-1.4.10";
+ name = "iptables-1.4.16.2";
src = fetchurl {
url = "http://www.netfilter.org/projects/iptables/files/${name}.tar.bz2";
- md5 = "f382fe693f0b59d87bd47bea65eca198";
+ md5 = "57220bb26866a713073e5614f88071fc";
};
# Install header files required by miniupnpd.
diff --git a/pkgs/os-specific/linux/jujuutils/default.nix b/pkgs/os-specific/linux/jujuutils/default.nix
index c52aae291eb..7c688943ea8 100644
--- a/pkgs/os-specific/linux/jujuutils/default.nix
+++ b/pkgs/os-specific/linux/jujuutils/default.nix
@@ -1,18 +1,18 @@
-{stdenv, fetchurl, linuxHeaders}:
+{ stdenv, fetchurl, linuxHeaders }:
stdenv.mkDerivation {
name = "jujuutils-0.2";
src = fetchurl {
- url = http://jujuutils.googlecode.com/files/jujuutils-0.2.tar.gz;
+ url = "http://jujuutils.googlecode.com/files/jujuutils-0.2.tar.gz";
sha256 = "1r74m7s7rs9d6y7cffi7mdap3jf96qwm1v6jcw53x5cikgmfxn4x";
};
buildInputs = [ linuxHeaders ];
meta = {
+ homepage = "http://code.google.com/p/jujuutils/";
description = "Utilities around FireWire devices connected to a Linux computer";
license = "GPLv2";
- homepage = http://code.google.com/p/jujuutils/;
};
}
diff --git a/pkgs/os-specific/linux/kernel-headers/2.4.nix b/pkgs/os-specific/linux/kernel-headers/2.4.nix
index c5926ff2e47..9457769f5ef 100644
--- a/pkgs/os-specific/linux/kernel-headers/2.4.nix
+++ b/pkgs/os-specific/linux/kernel-headers/2.4.nix
@@ -4,7 +4,7 @@ assert cross == null -> stdenv.isLinux;
let
version = "2.4.37.9";
- kernelHeadersBaseConfig = if (cross == null) then
+ kernelHeadersBaseConfig = if cross == null then
stdenv.platform.kernelHeadersBaseConfig
else
cross.platform.kernelHeadersBaseConfig;
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
sha256 = "08rca9lcb5l5w483hgaqk8pi2njd7cmwpkifjqxwlb3g8liz4r5g";
};
- targetConfig = if (cross != null) then cross.config else null;
+ targetConfig = if cross != null then cross.config else null;
platform =
if cross != null then cross.platform.kernelArch else
diff --git a/pkgs/os-specific/linux/kernel-headers/2.6.28.nix b/pkgs/os-specific/linux/kernel-headers/2.6.28.nix
index b576b68773c..1ba03010f8a 100644
--- a/pkgs/os-specific/linux/kernel-headers/2.6.28.nix
+++ b/pkgs/os-specific/linux/kernel-headers/2.6.28.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
sha256 = "0hifjh75sinifr5138v22zwbpqln6lhn65k8b57a1dyzlqca7cl9";
};
- targetConfig = if (cross != null) then cross.config else null;
+ targetConfig = if cross != null then cross.config else null;
platform =
if cross != null then cross.arch else
diff --git a/pkgs/os-specific/linux/kernel-headers/2.6.32.nix b/pkgs/os-specific/linux/kernel-headers/2.6.32.nix
index a2fc597eaac..100dd0c611b 100644
--- a/pkgs/os-specific/linux/kernel-headers/2.6.32.nix
+++ b/pkgs/os-specific/linux/kernel-headers/2.6.32.nix
@@ -4,7 +4,7 @@ assert cross == null -> stdenv.isLinux;
let
version = "2.6.32.16";
- kernelHeadersBaseConfig = if (cross == null) then
+ kernelHeadersBaseConfig = if cross == null then
stdenv.platform.kernelHeadersBaseConfig
else
cross.platform.kernelHeadersBaseConfig;
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
sha256 = "1ndvqvfaxachsklzzr5db1bzvfhnzz8diddrm1zlv7171fzmn13j";
};
- targetConfig = if (cross != null) then cross.config else null;
+ targetConfig = if cross != null then cross.config else null;
platform =
if cross != null then cross.platform.kernelArch else
diff --git a/pkgs/os-specific/linux/kernel-headers/3.3.5.nix b/pkgs/os-specific/linux/kernel-headers/3.7.nix
similarity index 74%
rename from pkgs/os-specific/linux/kernel-headers/3.3.5.nix
rename to pkgs/os-specific/linux/kernel-headers/3.7.nix
index f4dd28dab03..4371bf7df9c 100644
--- a/pkgs/os-specific/linux/kernel-headers/3.3.5.nix
+++ b/pkgs/os-specific/linux/kernel-headers/3.7.nix
@@ -3,22 +3,25 @@
assert cross == null -> stdenv.isLinux;
let
- version = "3.3.5";
- kernelHeadersBaseConfig = if cross == null then
- stdenv.platform.kernelHeadersBaseConfig
- else
- cross.platform.kernelHeadersBaseConfig;
+
+ version = "3.7.1";
+
+ kernelHeadersBaseConfig =
+ if cross == null
+ then stdenv.platform.kernelHeadersBaseConfig
+ else cross.platform.kernelHeadersBaseConfig;
+
in
stdenv.mkDerivation {
name = "linux-headers-${version}";
src = fetchurl {
- url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
- sha256 = "0i74jn47f6vs5kcvk8abvz3k08z32c9bbqw0sdjkdxwvr4jbczpv";
+ url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.bz2";
+ sha256 = "1bb1dxj1i6j7pj926kfy6pz58kw03swyyikl9f3fq3jnswispaj2";
};
- targetConfig = if (cross != null) then cross.config else null;
+ targetConfig = if cross != null then cross.config else null;
platform =
if cross != null then cross.platform.kernelArch else
@@ -33,15 +36,15 @@ stdenv.mkDerivation {
extraIncludeDirs =
if cross != null then
- (if cross.arch == "powerpc" then ["ppc"] else [])
+ (if cross.arch == "powerpc" then ["ppc"] else [])
else if stdenv.system == "powerpc-linux" then ["ppc"] else [];
buildPhase = ''
if test -n "$targetConfig"; then
export ARCH=$platform
fi
- make ${kernelHeadersBaseConfig}
- make mrproper headers_check
+ make ${kernelHeadersBaseConfig} SHELL=bash
+ make mrproper headers_check SHELL=bash
'';
installPhase = ''
diff --git a/pkgs/os-specific/linux/kernel-headers/default.nix b/pkgs/os-specific/linux/kernel-headers/default.nix
deleted file mode 100644
index 3fb5ef8ef2d..00000000000
--- a/pkgs/os-specific/linux/kernel-headers/default.nix
+++ /dev/null
@@ -1,62 +0,0 @@
-{ stdenv, fetchurl, perl, cross ? null }:
-
-assert cross == null -> stdenv.isLinux;
-
-let
- version = "2.6.35.14";
- kernelHeadersBaseConfig = if cross == null then
- stdenv.platform.kernelHeadersBaseConfig
- else
- cross.platform.kernelHeadersBaseConfig;
-in
-
-stdenv.mkDerivation {
- name = "linux-headers-${version}";
-
- src = fetchurl {
- url = "mirror://kernel/linux/kernel/v2.6/longterm/v2.6.35/linux-${version}.tar.bz2";
- sha256 = "1wzml7s9karfbk2yi36g1r8fyaq4d4f16yizc68zgchv0xzj39zl";
- };
-
- targetConfig = if (cross != null) then cross.config else null;
-
- platform =
- if cross != null then cross.platform.kernelArch else
- if stdenv.system == "i686-linux" then "i386" else
- if stdenv.system == "x86_64-linux" then "x86_64" else
- if stdenv.system == "powerpc-linux" then "powerpc" else
- if stdenv.isArm then "arm" else
- if stdenv.platform ? kernelArch then stdenv.platform.kernelArch else
- abort "don't know what the kernel include directory is called for this platform";
-
- buildInputs = [perl];
-
- extraIncludeDirs =
- if cross != null then
- (if cross.arch == "powerpc" then ["ppc"] else [])
- else if stdenv.system == "powerpc-linux" then ["ppc"] else [];
-
- buildPhase = ''
- if test -n "$targetConfig"; then
- export ARCH=$platform
- fi
- make ${kernelHeadersBaseConfig}
- make mrproper headers_check
- '';
-
- installPhase = ''
- make INSTALL_HDR_PATH=$out headers_install
-
- # Some builds (e.g. KVM) want a kernel.release.
- mkdir -p $out/include/config
- echo "${version}-default" > $out/include/config/kernel.release
- '';
-
- # !!! hacky
- fixupPhase = ''
- ln -s asm $out/include/asm-$platform
- if test "$platform" = "i386" -o "$platform" = "x86_64"; then
- ln -s asm $out/include/asm-x86
- fi
- '';
-}
diff --git a/pkgs/os-specific/linux/kernel/builder.sh b/pkgs/os-specific/linux/kernel/builder.sh
index 4c095bf8bbc..14d8108ba16 100644
--- a/pkgs/os-specific/linux/kernel/builder.sh
+++ b/pkgs/os-specific/linux/kernel/builder.sh
@@ -140,6 +140,10 @@ installPhase() {
(cd arch/$archDir/include && cp -a asm/* $includeDir/asm/ || true)
(cd arch/$archDir/include && cp -a generated/asm/* $includeDir/asm/ || true)
(cd arch/$archDir/include/asm/mach-generic && cp -a * $includeDir/ || true)
+ # include files for special arm architectures
+ if [ "$archDir" == "arm" ]; then
+ cp -a --parents arch/arm/mach-*/include $out/lib/modules/$version/build
+ fi
fi
fi
diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix
index 9e8ee74acb1..eecf52b1ddf 100644
--- a/pkgs/os-specific/linux/kernel/generic.nix
+++ b/pkgs/os-specific/linux/kernel/generic.nix
@@ -27,9 +27,6 @@
# optionally be compressed with gzip or bzip2.
kernelPatches ? []
-, # Whether to build a User-Mode Linux kernel.
- userModeLinux ? false
-
, # Allows you to set your own kernel version suffix (e.g.,
# "-my-kernel").
localVersion ? ""
@@ -63,7 +60,7 @@ let
in
stdenv.mkDerivation {
- name = if userModeLinux then "user-mode-linux-${version}" else "linux-${version}";
+ name = "linux-${version}";
enableParallelBuilding = true;
@@ -84,9 +81,9 @@ stdenv.mkDerivation {
kernelConfig = kernelConfigFun config;
# For UML and non-PC, just ignore all options that don't apply (We are lazy).
- ignoreConfigErrors = (userModeLinux || stdenv.platform.name != "pc");
+ ignoreConfigErrors = stdenv.platform.name != "pc";
- buildNativeInputs = [ perl mktemp ];
+ nativeBuildInputs = [ perl mktemp ];
buildInputs = lib.optional (stdenv.platform.uboot != null)
(ubootChooser stdenv.platform.uboot);
@@ -98,7 +95,6 @@ stdenv.mkDerivation {
# Should we trust platform.kernelArch? We can only do
# that once we differentiate i686/x86_64 in platforms.
arch =
- if userModeLinux then "um" else
if stdenv.system == "i686-linux" then "i386" else
if stdenv.system == "x86_64-linux" then "x86_64" else
if stdenv.isArm then "arm" else
@@ -123,16 +119,13 @@ stdenv.mkDerivation {
# The substitution of crossAttrs happens *after* the stdenv cross adapter sets
# the parameters for the usual stdenv. Thus, we need to specify
- # the ".hostDrv" in the buildInputs here.
- buildInputs = lib.optional (cp.uboot != null) (ubootChooser cp.uboot).hostDrv;
+ # the ".crossDrv" in the buildInputs here.
+ buildInputs = lib.optional (cp.uboot != null) (ubootChooser cp.uboot).crossDrv;
};
meta = {
description =
- (if userModeLinux then
- "User-Mode Linux"
- else
- "The Linux kernel") +
+ "The Linux kernel" +
(if kernelPatches == [] then "" else
" (with patches: "
+ lib.concatStrings (lib.intersperse ", " (map (x: x.name) kernelPatches))
@@ -141,6 +134,7 @@ stdenv.mkDerivation {
homepage = http://www.kernel.org/;
maintainers = [
lib.maintainers.eelco
+ lib.maintainers.shlevy
lib.maintainers.chaoflow
];
platforms = lib.platforms.linux;
diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.32-xen.nix b/pkgs/os-specific/linux/kernel/linux-2.6.32-xen.nix
deleted file mode 100644
index 20e14ccf5e2..00000000000
--- a/pkgs/os-specific/linux/kernel/linux-2.6.32-xen.nix
+++ /dev/null
@@ -1,222 +0,0 @@
-{ stdenv, fetchurl, extraConfig ? "", ... } @ args:
-
-let
- configWithPlatform = kernelPlatform:
- ''
- # Don't include any debug features.
- DEBUG_KERNEL n
-
- # Support drivers that need external firmware.
- STANDALONE n
-
- # Make /proc/config.gz available.
- IKCONFIG_PROC y
-
- # Optimize with -O2, not -Os.
- CC_OPTIMIZE_FOR_SIZE n
-
- # Enable the kernel's built-in memory tester.
- MEMTEST y
-
- # Include the CFQ I/O scheduler in the kernel, rather than as a
- # module, so that the initrd gets a good I/O scheduler.
- IOSCHED_CFQ y
-
- # Disable some expensive (?) features.
- FTRACE n
- KPROBES n
- NUMA? n
- PM_TRACE_RTC n
-
- # Enable various subsystems.
- ACCESSIBILITY y # Accessibility support
- AUXDISPLAY y # Auxiliary Display support
- DONGLE y # Serial dongle support
- HIPPI y
- MTD_COMPLEX_MAPPINGS y # needed for many devices
- NET_POCKET y # enable pocket and portable adapters
- SCSI_LOWLEVEL y # enable lots of SCSI devices
- SCSI_LOWLEVEL_PCMCIA y
- SPI y # needed for many devices
- SPI_MASTER y
- WAN y
-
- # Networking options.
- IP_PNP n
- IPV6_PRIVACY y
- NETFILTER_ADVANCED y
- IP_VS_PROTO_TCP y
- IP_VS_PROTO_UDP y
- IP_VS_PROTO_ESP y
- IP_VS_PROTO_AH y
- IP_DCCP_CCID3 n # experimental
- CLS_U32_PERF y
- CLS_U32_MARK y
-
- # Wireless networking.
- IPW2100_MONITOR y # support promiscuous mode
- IPW2200_MONITOR y # support promiscuous mode
- IWLWIFI_LEDS? y
- IWLWIFI_SPECTRUM_MEASUREMENT y
- IWL3945_SPECTRUM_MEASUREMENT y
- IWL4965 y # Intel Wireless WiFi 4965AGN
- IWL5000 y # Intel Wireless WiFi 5000AGN
- HOSTAP_FIRMWARE y # Support downloading firmware images with Host AP driver
- HOSTAP_FIRMWARE_NVRAM y
-
- # Some settings to make sure that fbcondecor works - in particular,
- # disable tileblitting and the drivers that need it.
-
- # Enable various FB devices.
- FB y
- FB_EFI y
- FB_NVIDIA_I2C y # Enable DDC Support
- FB_RIVA_I2C y
- FB_ATY_CT y # Mach64 CT/VT/GT/LT (incl. 3D RAGE) support
- FB_ATY_GX y # Mach64 GX support
- FB_SAVAGE_I2C y
- FB_SAVAGE_ACCEL y
- FB_SIS_300 y
- FB_SIS_315 y
- FB_3DFX_ACCEL y
- FB_GEODE y
-
- # Video configuration
- # The intel drivers already require KMS
- DRM_I915_KMS y
-
- # Sound.
- SND_AC97_POWER_SAVE y # AC97 Power-Saving Mode
- SND_HDA_INPUT_BEEP y # Support digital beep via input layer
- SND_USB_CAIAQ_INPUT y
- PSS_MIXER y # Enable PSS mixer (Beethoven ADSP-16 and other compatible)
-
- # USB serial devices.
- USB_SERIAL_GENERIC y # USB Generic Serial Driver
- USB_SERIAL_KEYSPAN_MPR y # include firmware for various USB serial devices
- USB_SERIAL_KEYSPAN_USA28 y
- USB_SERIAL_KEYSPAN_USA28X y
- USB_SERIAL_KEYSPAN_USA28XA y
- USB_SERIAL_KEYSPAN_USA28XB y
- USB_SERIAL_KEYSPAN_USA19 y
- USB_SERIAL_KEYSPAN_USA18X y
- USB_SERIAL_KEYSPAN_USA19W y
- USB_SERIAL_KEYSPAN_USA19QW y
- USB_SERIAL_KEYSPAN_USA19QI y
- USB_SERIAL_KEYSPAN_USA49W y
- USB_SERIAL_KEYSPAN_USA49WLC y
-
- # Filesystem options - in particular, enable extended attributes and
- # ACLs for all filesystems that support them.
- EXT2_FS_XATTR y # Ext2 extended attributes
- EXT2_FS_POSIX_ACL y # Ext2 POSIX Access Control Lists
- EXT2_FS_SECURITY y # Ext2 Security Labels
- EXT2_FS_XIP y # Ext2 execute in place support
- EXT4_FS_POSIX_ACL y
- EXT4_FS_SECURITY y
- REISERFS_FS_XATTR y
- REISERFS_FS_POSIX_ACL y
- REISERFS_FS_SECURITY y
- JFS_POSIX_ACL y
- JFS_SECURITY y
- XFS_QUOTA y
- XFS_POSIX_ACL y
- XFS_RT y # XFS Realtime subvolume support
- OCFS2_DEBUG_MASKLOG n
- OCFS2_FS_POSIX_ACL y
- BTRFS_FS_POSIX_ACL y
- UBIFS_FS_XATTR y
- UBIFS_FS_ADVANCED_COMPR y
- NFSD_V2_ACL y
- NFSD_V3 y
- NFSD_V3_ACL y
- NFSD_V4 y
- CIFS_XATTR y
- CIFS_POSIX y
-
- # Security related features.
- STRICT_DEVMEM y # Filter access to /dev/mem
- SECURITY_SELINUX_BOOTPARAM_VALUE 0 # disable SELinux by default
-
- # Misc. options.
- 8139TOO_8129 y
- 8139TOO_PIO n # PIO is slower
- AIC79XX_DEBUG_ENABLE n
- AIC7XXX_DEBUG_ENABLE n
- AIC94XX_DEBUG n
- B43_PCMCIA y
- BLK_DEV_BSG n
- BLK_DEV_CMD640_ENHANCED y # CMD640 enhanced support
- BLK_DEV_IDEACPI y # IDE ACPI support
- BLK_DEV_INTEGRITY y
- BSD_PROCESS_ACCT_V3 y
- BT_HCIUART_BCSP y
- BT_HCIUART_H4 y # UART (H4) protocol support
- BT_HCIUART_LL y
- BT_RFCOMM_TTY y # RFCOMM TTY support
- CPU_FREQ_DEBUG n
- CRASH_DUMP n
- DMAR? n # experimental
- DVB_DYNAMIC_MINORS y # we use udev
- 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
- KALLSYMS_EXTRA_PASS n
- LDM_PARTITION y # Windows Logical Disk Manager (Dynamic Disk) support
- LEDS_TRIGGER_IDE_DISK y # LED IDE Disk Trigger
- LOGIRUMBLEPAD2_FF y # Logitech Rumblepad 2 force feedback
- LOGO n # not needed
- MEDIA_ATTACH y
- MEGARAID_NEWGEN y
- MICROCODE_AMD y
- MODVERSIONS y
- MOUSE_PS2_ELANTECH y # Elantech PS/2 protocol extension
- MTRR_SANITIZER y
- NET_FC y # Fibre Channel driver support
- PCI_LEGACY y
- PPP_MULTILINK y # PPP multilink support
- REGULATOR y # Voltage and Current Regulator Support
- SCSI_LOGGING y # SCSI logging facility
- SERIAL_8250 y # 8250/16550 and compatible serial support
- SLIP_COMPRESSED y # CSLIP compressed headers
- SLIP_SMART y
- THERMAL_HWMON y # Hardware monitoring support
- USB_DEBUG n
- USB_EHCI_ROOT_HUB_TT y # Root Hub Transaction Translators
- X86_CHECK_BIOS_CORRUPTION y
- X86_MCE y
-
- # Enable Xen Dom0 support.
- XEN_DOM0 y
- XEN_PCI_PASSTHROUGH y
-
- ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""}
- ${extraConfig}
- '';
-in
-
-import ./generic.nix (
-
- rec {
- version = "2.6.32.24-xen-179eca5";
- localVersion = "-xen-179eca5";
-
- src = fetchurl {
- url = "http://nixos.org/tarballs/linux-${version}.tar.bz2";
- sha256 = "09a7xh4hvw0hzq67dqdxn8p4rkd907937xvshx30rg4ab6717scf";
- };
-
- config = configWithPlatform stdenv.platform;
- configCross = configWithPlatform stdenv.cross.platform;
-
- features.iwlwifi = true;
-
- meta.description = "Linux kernel suitable for Xen Domain 0";
- }
-
- // removeAttrs args ["extraConfig"]
-)
diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.32.nix b/pkgs/os-specific/linux/kernel/linux-2.6.32.nix
index a7cb499a993..57b16c791cf 100644
--- a/pkgs/os-specific/linux/kernel/linux-2.6.32.nix
+++ b/pkgs/os-specific/linux/kernel/linux-2.6.32.nix
@@ -198,11 +198,11 @@ in
import ./generic.nix (
rec {
- version = "2.6.32.57";
-
+ version = "2.6.32.60";
+
src = fetchurl {
url = "mirror://kernel/linux/kernel/v2.6/longterm/v2.6.32/linux-${version}.tar.bz2";
- sha256 = "1pbwjdignv5qdzpiv3ijs5g95l86ss7jrslak12jfxly13lanzzh";
+ sha256 = "0iyg5z76g8wnh73aq6p6j4xb3043skpa14fb3dwgbpdpx710x5nf";
};
config = configWithPlatform stdenv.platform;
diff --git a/pkgs/os-specific/linux/kernel/linux-3.0.nix b/pkgs/os-specific/linux/kernel/linux-3.0.nix
index e2ed7fc8c5d..b7ccdde367c 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.0.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.0.nix
@@ -1,4 +1,4 @@
-args @ { stdenv, fetchurl, userModeLinux ? false, extraConfig ? ""
+args @ { stdenv, fetchurl, extraConfig ? ""
, perl, mktemp, module_init_tools
, ... }:
@@ -230,15 +230,15 @@ in
import ./generic.nix (
rec {
- version = "3.0.31";
-
+ version = "3.0.65";
+
preConfigure = ''
substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' ""
'';
src = fetchurl {
- url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.bz2";
- sha256 = "1b5ix1fc55m6vsr28dh5xi89fphl3m3kmvaniq9div5rj8f6kv0f";
+ url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
+ sha256 = "1vmk0bmg0djwbh9scrhpyljan01ygkwn4q0j1ydn8snag7sn4x8y";
};
config = configWithPlatform stdenv.platform;
diff --git a/pkgs/os-specific/linux/kernel/linux-3.1.nix b/pkgs/os-specific/linux/kernel/linux-3.1.nix
deleted file mode 100644
index 76e2942c6a3..00000000000
--- a/pkgs/os-specific/linux/kernel/linux-3.1.nix
+++ /dev/null
@@ -1,251 +0,0 @@
-args @ { stdenv, fetchurl, userModeLinux ? false, extraConfig ? ""
-, perl, mktemp, module_init_tools
-, ... }:
-
-let
- configWithPlatform = kernelPlatform :
- ''
- # Power management and debugging for powertop.
- DEBUG_KERNEL y
- PM_ADVANCED_DEBUG y
- PM_RUNTIME y
- TIMER_STATS y
- USB_SUSPEND y
- BACKTRACE_SELF_TEST n
- CPU_NOTIFIER_ERROR_INJECT n
- DEBUG_DEVRES n
- DEBUG_NX_TEST n
- DEBUG_STACK_USAGE n
- DEBUG_STACKOVERFLOW n
- RCU_TORTURE_TEST n
- SCHEDSTATS n
-
- # Support drivers that need external firmware.
- STANDALONE n
-
- # Make /proc/config.gz available.
- IKCONFIG_PROC y
-
- # Optimize with -O2, not -Os.
- CC_OPTIMIZE_FOR_SIZE n
-
- # Enable the kernel's built-in memory tester.
- MEMTEST y
-
- # Include the CFQ I/O scheduler in the kernel, rather than as a
- # module, so that the initrd gets a good I/O scheduler.
- IOSCHED_CFQ y
- BLK_CGROUP y # required by CFQ
-
- # Disable some expensive (?) features.
- FTRACE n
- KPROBES n
- NUMA? n
- PM_TRACE_RTC n
-
- # Enable various subsystems.
- ACCESSIBILITY y # Accessibility support
- AUXDISPLAY y # Auxiliary Display support
- DONGLE y # Serial dongle support
- HIPPI y
- MTD_COMPLEX_MAPPINGS y # needed for many devices
- NET_POCKET y # enable pocket and portable adapters
- SCSI_LOWLEVEL y # enable lots of SCSI devices
- SCSI_LOWLEVEL_PCMCIA y
- SPI y # needed for many devices
- SPI_MASTER y
- WAN y
-
- # Networking options.
- IP_PNP n
- IPV6_PRIVACY y
- NETFILTER_ADVANCED y
- IP_VS_PROTO_TCP y
- IP_VS_PROTO_UDP y
- IP_VS_PROTO_ESP y
- IP_VS_PROTO_AH y
- IP_DCCP_CCID3 n # experimental
- CLS_U32_PERF y
- CLS_U32_MARK y
-
- # Wireless networking.
- IPW2100_MONITOR y # support promiscuous mode
- IPW2200_MONITOR y # support promiscuous mode
- HOSTAP_FIRMWARE y # Support downloading firmware images with Host AP driver
- HOSTAP_FIRMWARE_NVRAM y
- ATH9K_PCI y # Detect Atheros AR9xxx cards on PCI(e) bus
- ATH9K_AHB y # Ditto, AHB bus
-
- # Some settings to make sure that fbcondecor works - in particular,
- # disable tileblitting and the drivers that need it.
-
- # Enable various FB devices.
- FB y
- FB_EFI y
- FB_NVIDIA_I2C y # Enable DDC Support
- FB_RIVA_I2C y
- FB_ATY_CT y # Mach64 CT/VT/GT/LT (incl. 3D RAGE) support
- FB_ATY_GX y # Mach64 GX support
- FB_SAVAGE_I2C y
- FB_SAVAGE_ACCEL y
- FB_SIS_300 y
- FB_SIS_315 y
- FB_3DFX_ACCEL y
- FB_GEODE y
-
- # Video configuration
- # Enable KMS for devices whose X.org driver supports it.
- DRM_I915_KMS y
- DRM_RADEON_KMS y
- # Hybrid graphics support
- VGA_SWITCHEROO y
-
- # Sound.
- SND_AC97_POWER_SAVE y # AC97 Power-Saving Mode
- SND_HDA_INPUT_BEEP y # Support digital beep via input layer
- SND_USB_CAIAQ_INPUT y
- PSS_MIXER y # Enable PSS mixer (Beethoven ADSP-16 and other compatible)
-
- # USB serial devices.
- USB_SERIAL_GENERIC y # USB Generic Serial Driver
- USB_SERIAL_KEYSPAN_MPR y # include firmware for various USB serial devices
- USB_SERIAL_KEYSPAN_USA28 y
- USB_SERIAL_KEYSPAN_USA28X y
- USB_SERIAL_KEYSPAN_USA28XA y
- USB_SERIAL_KEYSPAN_USA28XB y
- USB_SERIAL_KEYSPAN_USA19 y
- USB_SERIAL_KEYSPAN_USA18X y
- USB_SERIAL_KEYSPAN_USA19W y
- USB_SERIAL_KEYSPAN_USA19QW y
- USB_SERIAL_KEYSPAN_USA19QI y
- USB_SERIAL_KEYSPAN_USA49W y
- USB_SERIAL_KEYSPAN_USA49WLC y
-
- # Filesystem options - in particular, enable extended attributes and
- # ACLs for all filesystems that support them.
- EXT2_FS_XATTR y # Ext2 extended attributes
- EXT2_FS_POSIX_ACL y # Ext2 POSIX Access Control Lists
- EXT2_FS_SECURITY y # Ext2 Security Labels
- EXT2_FS_XIP y # Ext2 execute in place support
- EXT4_FS_POSIX_ACL y
- EXT4_FS_SECURITY y
- REISERFS_FS_XATTR y
- REISERFS_FS_POSIX_ACL y
- REISERFS_FS_SECURITY y
- JFS_POSIX_ACL y
- JFS_SECURITY y
- XFS_QUOTA y
- XFS_POSIX_ACL y
- XFS_RT y # XFS Realtime subvolume support
- OCFS2_DEBUG_MASKLOG n
- BTRFS_FS_POSIX_ACL y
- UBIFS_FS_XATTR y
- UBIFS_FS_ADVANCED_COMPR y
- NFSD_V2_ACL y
- NFSD_V3 y
- NFSD_V3_ACL y
- NFSD_V4 y
- CIFS_XATTR y
- CIFS_POSIX y
-
- # Security related features.
- STRICT_DEVMEM y # Filter access to /dev/mem
- SECURITY_SELINUX_BOOTPARAM_VALUE 0 # disable SELinux by default
-
- # Misc. options.
- 8139TOO_8129 y
- 8139TOO_PIO n # PIO is slower
- AIC79XX_DEBUG_ENABLE n
- AIC7XXX_DEBUG_ENABLE n
- AIC94XX_DEBUG n
- B43_PCMCIA y
- BLK_DEV_CMD640_ENHANCED y # CMD640 enhanced support
- BLK_DEV_IDEACPI y # IDE ACPI support
- BLK_DEV_INTEGRITY y
- BSD_PROCESS_ACCT_V3 y
- BT_HCIUART_BCSP y
- BT_HCIUART_H4 y # UART (H4) protocol support
- BT_HCIUART_LL y
- BT_L2CAP y
- BT_SCO y # audio support
- BT_RFCOMM m
- BT_RFCOMM_TTY y # RFCOMM TTY support
- CRASH_DUMP n
- DMAR? n # experimental
- DVB_DYNAMIC_MINORS y # we use udev
- FUSION y # Fusion MPT device support
- IDE_GD_ATAPI y # ATAPI floppy support
- IRDA_ULTRA y # Ultra (connectionless) protocol
- JOYSTICK_IFORCE_232 y # I-Force Serial joysticks and wheels
- JOYSTICK_IFORCE_USB y # I-Force USB joysticks and wheels
- JOYSTICK_XPAD_FF y # X-Box gamepad rumble support
- JOYSTICK_XPAD_LEDS y # LED Support for Xbox360 controller 'BigX' LED
- LDM_PARTITION y # Windows Logical Disk Manager (Dynamic Disk) support
- LEDS_TRIGGER_IDE_DISK y # LED IDE Disk Trigger
- LOGIRUMBLEPAD2_FF y # Logitech Rumblepad 2 force feedback
- LOGO n # not needed
- MEDIA_ATTACH y
- MEGARAID_NEWGEN y
- MICROCODE_AMD y
- MODVERSIONS y
- MOUSE_PS2_ELANTECH y # Elantech PS/2 protocol extension
- MTRR_SANITIZER y
- NET_FC y # Fibre Channel driver support
- PPP_MULTILINK y # PPP multilink support
- REGULATOR y # Voltage and Current Regulator Support
- SCSI_LOGGING y # SCSI logging facility
- SERIAL_8250 y # 8250/16550 and compatible serial support
- SLIP_COMPRESSED y # CSLIP compressed headers
- SLIP_SMART y
- THERMAL_HWMON y # Hardware monitoring support
- USB_DEBUG n
- USB_EHCI_ROOT_HUB_TT y # Root Hub Transaction Translators
- X86_CHECK_BIOS_CORRUPTION y
- X86_MCE y
-
- # Linux Containers
- RT_GROUP_SCHED? y
- CGROUP_DEVICE? y
- CGROUP_MEM_RES_CTLR? y
- CGROUP_MEM_RES_CTLR_SWAP? y
- DEVPTS_MULTIPLE_INSTANCES? y
-
- # Enable staging drivers. These are somewhat experimental, but
- # they generally don't hurt.
- STAGING y
-
- # PROC_EVENTS requires that the netlink connector is not built
- # as a module. This is required by libcgroup's cgrulesengd.
- CONNECTOR y
- PROC_EVENTS y
-
- # Devtmpfs support.
- DEVTMPFS y
-
- ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""}
- ${extraConfig}
- '';
-in
-
-import ./generic.nix (
-
- rec {
- version = "3.1.10";
-
- preConfigure = ''
- substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' ""
- '';
-
- src = fetchurl {
- url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.bz2";
- sha256 = "1vcpbh7wnc9smw2l5ci27a5p0rgmc1a5dc6a1aljm6f6wcfic8lz";
- };
-
- config = configWithPlatform stdenv.platform;
- configCross = configWithPlatform stdenv.cross.platform;
-
- features.iwlwifi = true;
- }
-
- // removeAttrs args ["extraConfig"]
-)
diff --git a/pkgs/os-specific/linux/kernel/linux-3.2.nix b/pkgs/os-specific/linux/kernel/linux-3.2.nix
index bea68decf64..afa62fe7798 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.2.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.2.nix
@@ -1,4 +1,4 @@
-args @ { stdenv, fetchurl, userModeLinux ? false, extraConfig ? ""
+args @ { stdenv, fetchurl, extraConfig ? ""
, perl, mktemp, module_init_tools
, ... }:
@@ -146,8 +146,10 @@ let
NFSD_V3 y
NFSD_V3_ACL y
NFSD_V4 y
+ NFS_FSCACHE y
CIFS_XATTR y
CIFS_POSIX y
+ CIFS_FSCACHE y
# Security related features.
STRICT_DEVMEM y # Filter access to /dev/mem
@@ -237,7 +239,7 @@ in
import ./generic.nix (
rec {
- version = "3.2.28";
+ version = "3.2.38";
testing = false;
modDirVersion = version;
@@ -248,7 +250,7 @@ import ./generic.nix (
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.0/${if testing then "testing/" else ""}linux-${version}.tar.xz";
- sha256 = "0v4mbqf0mgnshhkq3symlliaz1jwa7vx7195r3qls390plc9g0nl";
+ sha256 = "10hm4cy56xjl5ckv3jj3grw31qfhwrgia0wq71c34dw0mv3bix8w";
};
config = configWithPlatform stdenv.platform;
diff --git a/pkgs/os-specific/linux/kernel/linux-3.3.nix b/pkgs/os-specific/linux/kernel/linux-3.3.nix
deleted file mode 100644
index c56df955b79..00000000000
--- a/pkgs/os-specific/linux/kernel/linux-3.3.nix
+++ /dev/null
@@ -1,259 +0,0 @@
-args @ { stdenv, fetchurl, userModeLinux ? false, extraConfig ? ""
-, perl, mktemp, module_init_tools
-, ... }:
-
-let
- configWithPlatform = kernelPlatform :
- ''
- # Power management and debugging for powertop.
- DEBUG_KERNEL y
- PM_ADVANCED_DEBUG y
- PM_RUNTIME y
- TIMER_STATS y
- USB_SUSPEND y
- BACKTRACE_SELF_TEST n
- CPU_NOTIFIER_ERROR_INJECT? n
- DEBUG_DEVRES n
- DEBUG_NX_TEST n
- DEBUG_STACK_USAGE n
- DEBUG_STACKOVERFLOW n
- RCU_TORTURE_TEST n
- SCHEDSTATS n
-
- # Support drivers that need external firmware.
- STANDALONE n
-
- # Make /proc/config.gz available.
- IKCONFIG_PROC y
-
- # Optimize with -O2, not -Os.
- CC_OPTIMIZE_FOR_SIZE n
-
- # Enable the kernel's built-in memory tester.
- MEMTEST y
-
- # Include the CFQ I/O scheduler in the kernel, rather than as a
- # module, so that the initrd gets a good I/O scheduler.
- IOSCHED_CFQ y
- BLK_CGROUP y # required by CFQ
-
- # Enable NUMA.
- NUMA? y
-
- # Disable some expensive (?) features.
- FTRACE n
- KPROBES n
- PM_TRACE_RTC n
-
- # Enable various subsystems.
- ACCESSIBILITY y # Accessibility support
- AUXDISPLAY y # Auxiliary Display support
- DONGLE y # Serial dongle support
- HIPPI? y
- MTD_COMPLEX_MAPPINGS y # needed for many devices
- SCSI_LOWLEVEL y # enable lots of SCSI devices
- SCSI_LOWLEVEL_PCMCIA y
- SPI y # needed for many devices
- SPI_MASTER y
- WAN y
-
- # Networking options.
- IP_PNP n
- IPV6_PRIVACY y
- NETFILTER_ADVANCED y
- IP_VS_PROTO_TCP y
- IP_VS_PROTO_UDP y
- IP_VS_PROTO_ESP y
- IP_VS_PROTO_AH y
- IP_DCCP_CCID3 n # experimental
- CLS_U32_PERF y
- CLS_U32_MARK y
-
- # Wireless networking.
- IPW2100_MONITOR y # support promiscuous mode
- IPW2200_MONITOR y # support promiscuous mode
- HOSTAP_FIRMWARE y # Support downloading firmware images with Host AP driver
- HOSTAP_FIRMWARE_NVRAM y
- ATH9K_PCI y # Detect Atheros AR9xxx cards on PCI(e) bus
- ATH9K_AHB y # Ditto, AHB bus
-
- # Some settings to make sure that fbcondecor works - in particular,
- # disable tileblitting and the drivers that need it.
-
- # Enable various FB devices.
- FB y
- FB_EFI y
- FB_NVIDIA_I2C y # Enable DDC Support
- FB_RIVA_I2C y
- FB_ATY_CT y # Mach64 CT/VT/GT/LT (incl. 3D RAGE) support
- FB_ATY_GX y # Mach64 GX support
- FB_SAVAGE_I2C y
- FB_SAVAGE_ACCEL y
- FB_SIS_300 y
- FB_SIS_315 y
- FB_3DFX_ACCEL y
- FB_GEODE y
-
- # Video configuration
- # Enable KMS for devices whose X.org driver supports it.
- DRM_I915_KMS y
- DRM_RADEON_KMS y
- # Hybrid graphics support
- VGA_SWITCHEROO y
-
- # Sound.
- SND_AC97_POWER_SAVE y # AC97 Power-Saving Mode
- SND_HDA_INPUT_BEEP y # Support digital beep via input layer
- SND_USB_CAIAQ_INPUT y
- PSS_MIXER y # Enable PSS mixer (Beethoven ADSP-16 and other compatible)
-
- # USB serial devices.
- USB_SERIAL_GENERIC y # USB Generic Serial Driver
- USB_SERIAL_KEYSPAN_MPR y # include firmware for various USB serial devices
- USB_SERIAL_KEYSPAN_USA28 y
- USB_SERIAL_KEYSPAN_USA28X y
- USB_SERIAL_KEYSPAN_USA28XA y
- USB_SERIAL_KEYSPAN_USA28XB y
- USB_SERIAL_KEYSPAN_USA19 y
- USB_SERIAL_KEYSPAN_USA18X y
- USB_SERIAL_KEYSPAN_USA19W y
- USB_SERIAL_KEYSPAN_USA19QW y
- USB_SERIAL_KEYSPAN_USA19QI y
- USB_SERIAL_KEYSPAN_USA49W y
- USB_SERIAL_KEYSPAN_USA49WLC y
-
- # Filesystem options - in particular, enable extended attributes and
- # ACLs for all filesystems that support them.
- EXT2_FS_XATTR y # Ext2 extended attributes
- EXT2_FS_POSIX_ACL y # Ext2 POSIX Access Control Lists
- EXT2_FS_SECURITY y # Ext2 Security Labels
- EXT2_FS_XIP y # Ext2 execute in place support
- EXT4_FS_POSIX_ACL y
- EXT4_FS_SECURITY y
- REISERFS_FS_XATTR y
- REISERFS_FS_POSIX_ACL y
- REISERFS_FS_SECURITY y
- JFS_POSIX_ACL y
- JFS_SECURITY y
- XFS_QUOTA y
- XFS_POSIX_ACL y
- XFS_RT y # XFS Realtime subvolume support
- OCFS2_DEBUG_MASKLOG n
- BTRFS_FS_POSIX_ACL y
- UBIFS_FS_XATTR y
- UBIFS_FS_ADVANCED_COMPR y
- NFSD_V2_ACL y
- NFSD_V3 y
- NFSD_V3_ACL y
- NFSD_V4 y
- CIFS_XATTR y
- CIFS_POSIX y
-
- # Security related features.
- STRICT_DEVMEM y # Filter access to /dev/mem
- SECURITY_SELINUX_BOOTPARAM_VALUE 0 # disable SELinux by default
-
- # Misc. options.
- 8139TOO_8129 y
- 8139TOO_PIO n # PIO is slower
- AIC79XX_DEBUG_ENABLE n
- AIC7XXX_DEBUG_ENABLE n
- AIC94XX_DEBUG n
- B43_PCMCIA y
- BLK_DEV_CMD640_ENHANCED y # CMD640 enhanced support
- BLK_DEV_IDEACPI y # IDE ACPI support
- BLK_DEV_INTEGRITY y
- BSD_PROCESS_ACCT_V3 y
- BT_HCIUART_BCSP y
- BT_HCIUART_H4 y # UART (H4) protocol support
- BT_HCIUART_LL y
- BT_RFCOMM m
- BT_RFCOMM_TTY y # RFCOMM TTY support
- CRASH_DUMP n
- DMAR? n # experimental
- DVB_DYNAMIC_MINORS y # we use udev
- EFI_STUB y # EFI bootloader in the bzImage itself
- FUSION y # Fusion MPT device support
- IDE_GD_ATAPI y # ATAPI floppy support
- IRDA_ULTRA y # Ultra (connectionless) protocol
- JOYSTICK_IFORCE_232 y # I-Force Serial joysticks and wheels
- JOYSTICK_IFORCE_USB y # I-Force USB joysticks and wheels
- JOYSTICK_XPAD_FF y # X-Box gamepad rumble support
- JOYSTICK_XPAD_LEDS y # LED Support for Xbox360 controller 'BigX' LED
- LDM_PARTITION y # Windows Logical Disk Manager (Dynamic Disk) support
- LEDS_TRIGGER_IDE_DISK y # LED IDE Disk Trigger
- LOGIRUMBLEPAD2_FF y # Logitech Rumblepad 2 force feedback
- LOGO n # not needed
- MEDIA_ATTACH y
- MEGARAID_NEWGEN y
- MICROCODE_AMD y
- MODVERSIONS y
- MOUSE_PS2_ELANTECH y # Elantech PS/2 protocol extension
- MTRR_SANITIZER y
- NET_FC y # Fibre Channel driver support
- PPP_MULTILINK y # PPP multilink support
- REGULATOR y # Voltage and Current Regulator Support
- SCSI_LOGGING y # SCSI logging facility
- SERIAL_8250 y # 8250/16550 and compatible serial support
- SLIP_COMPRESSED y # CSLIP compressed headers
- SLIP_SMART y
- THERMAL_HWMON y # Hardware monitoring support
- USB_DEBUG n
- USB_EHCI_ROOT_HUB_TT y # Root Hub Transaction Translators
- X86_CHECK_BIOS_CORRUPTION y
- X86_MCE y
-
- # Linux Containers
- RT_GROUP_SCHED? y
- CGROUP_DEVICE? y
- CGROUP_MEM_RES_CTLR? y
- CGROUP_MEM_RES_CTLR_SWAP? y
- DEVPTS_MULTIPLE_INSTANCES? y
-
- # Enable staging drivers. These are somewhat experimental, but
- # they generally don't hurt.
- STAGING y
-
- # PROC_EVENTS requires that the netlink connector is not built
- # as a module. This is required by libcgroup's cgrulesengd.
- CONNECTOR y
- PROC_EVENTS y
-
- # Tracing
- FTRACE y
- FUNCTION_TRACER y
- FTRACE_SYSCALLS y
- SCHED_TRACER y
-
- # Devtmpfs support.
- DEVTMPFS y
-
- ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""}
- ${extraConfig}
- '';
-in
-
-import ./generic.nix (
-
- rec {
- version = "3.3.8";
- testing = false;
-
- preConfigure = ''
- substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' ""
- '';
-
- src = fetchurl {
- url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz";
- sha256 = "0bgppngf711mlxp0jcsnv5xc0xxc8vs5rzc1czkv2igrfb1kvrnz";
- };
-
- config = configWithPlatform stdenv.platform;
- configCross = configWithPlatform stdenv.cross.platform;
-
- features.iwlwifi = true;
- features.efiBootStub = true;
- }
-
- // removeAttrs args ["extraConfig"]
-)
diff --git a/pkgs/os-specific/linux/kernel/linux-3.4.nix b/pkgs/os-specific/linux/kernel/linux-3.4.nix
index 7d421af4917..0e032935900 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix
@@ -1,4 +1,4 @@
-args @ { stdenv, fetchurl, userModeLinux ? false, extraConfig ? ""
+args @ { stdenv, fetchurl, extraConfig ? ""
, perl, mktemp, module_init_tools
, ... }:
@@ -148,8 +148,10 @@ let
NFSD_V3 y
NFSD_V3_ACL y
NFSD_V4 y
+ NFS_FSCACHE y
CIFS_XATTR y
CIFS_POSIX y
+ CIFS_FSCACHE y
# Security related features.
STRICT_DEVMEM y # Filter access to /dev/mem
@@ -231,6 +233,9 @@ let
# Devtmpfs support.
DEVTMPFS y
+ # Easier debug of NFS issues
+ SUNRPC_DEBUG y
+
${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""}
${extraConfig}
'';
@@ -239,7 +244,7 @@ in
import ./generic.nix (
rec {
- version = "3.4.9";
+ version = "3.4.32";
testing = false;
preConfigure = ''
@@ -248,7 +253,7 @@ import ./generic.nix (
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz";
- sha256 = "02rnzpnfs7hfsglrgwr1450ssj47da1w079rmvzh1k0apy7qdpzm";
+ sha256 = "0z218ibz36lpdyjjch94jx12fcghj376x3fkmgxmwdjaz7zngn4i";
};
config = configWithPlatform stdenv.platform;
@@ -256,6 +261,8 @@ import ./generic.nix (
features.iwlwifi = true;
features.efiBootStub = true;
+ features.needsCifsUtils = true;
+ features.netfilterRPFilter = true;
}
// removeAttrs args ["extraConfig"]
diff --git a/pkgs/os-specific/linux/kernel/linux-3.5.nix b/pkgs/os-specific/linux/kernel/linux-3.7.nix
similarity index 92%
rename from pkgs/os-specific/linux/kernel/linux-3.5.nix
rename to pkgs/os-specific/linux/kernel/linux-3.7.nix
index 8e347595f22..9c96c2a8fd2 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.5.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.7.nix
@@ -1,4 +1,4 @@
-args @ { stdenv, fetchurl, userModeLinux ? false, extraConfig ? ""
+args @ { stdenv, fetchurl, extraConfig ? ""
, perl, mktemp, module_init_tools
, ... }:
@@ -71,7 +71,7 @@ let
# Wireless networking.
IPW2100_MONITOR y # support promiscuous mode
- IPW2200_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
@@ -148,8 +148,10 @@ let
NFSD_V3 y
NFSD_V3_ACL y
NFSD_V4 y
+ NFS_FSCACHE y
CIFS_XATTR y
CIFS_POSIX y
+ CIFS_FSCACHE y
# Security related features.
STRICT_DEVMEM y # Filter access to /dev/mem
@@ -173,7 +175,7 @@ let
BT_RFCOMM_TTY y # RFCOMM TTY support
CRASH_DUMP n
DMAR? n # experimental
- DVB_DYNAMIC_MINORS y # we use udev
+ DVB_DYNAMIC_MINORS? y # we use udev
EFI_STUB y # EFI bootloader in the bzImage itself
FUSION y # Fusion MPT device support
IDE_GD_ATAPI y # ATAPI floppy support
@@ -186,7 +188,7 @@ let
LEDS_TRIGGER_IDE_DISK y # LED IDE Disk Trigger
LOGIRUMBLEPAD2_FF y # Logitech Rumblepad 2 force feedback
LOGO n # not needed
- MEDIA_ATTACH y
+ MEDIA_ATTACH? y
MEGARAID_NEWGEN y
MICROCODE_AMD y
MODVERSIONS y
@@ -232,6 +234,14 @@ let
# Devtmpfs support.
DEVTMPFS y
+ # Media support
+ MEDIA_CAMERA_SUPPORT? y
+ MEDIA_RC_SUPPORT? y
+ MEDIA_USB_SUPPORT y
+
+ # Easier debug of NFS issues
+ SUNRPC_DEBUG y
+
${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""}
${extraConfig}
'';
@@ -240,7 +250,7 @@ in
import ./generic.nix (
rec {
- version = "3.5.2";
+ version = "3.7.9";
testing = false;
preConfigure = ''
@@ -249,7 +259,7 @@ import ./generic.nix (
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz";
- sha256 = "13dzx7gqm0n7s73bq87ibhmydrfsngyps9sczkcy1sh56rrkv0x6";
+ sha256 = "1d9834flw0jyfn0lq1l0ahp8v12p227qn6z39v1pk53dap1zl0v1";
};
config = configWithPlatform stdenv.platform;
@@ -257,6 +267,9 @@ import ./generic.nix (
features.iwlwifi = true;
features.efiBootStub = true;
+ features.needsCifsUtils = true;
+ features.canDisableNetfilterConntrackHelpers = true;
+ features.netfilterRPFilter = true;
}
// removeAttrs args ["extraConfig"]
diff --git a/pkgs/os-specific/linux/kernel/linux-rpi-3.6.nix b/pkgs/os-specific/linux/kernel/linux-rpi-3.6.nix
new file mode 100644
index 00000000000..b425f2792b4
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/linux-rpi-3.6.nix
@@ -0,0 +1,42 @@
+args @ {
+ stdenv, fetchurl, extraConfig ? "" , perl, mktemp, module_init_tools, ...
+}:
+
+let
+ configWithPlatform = kernelPlatform :
+ ''
+ ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""}
+ ${extraConfig}
+ '';
+
+ rev = "91a3be5b2b";
+in
+
+import ./generic.nix (
+
+ rec {
+ version = "3.6.y-${rev}";
+ testing = false;
+
+ preConfigure = ''
+ substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' ""
+ '';
+
+ src = fetchurl {
+ url = "https://api.github.com/repos/raspberrypi/linux/tarball/${rev}";
+ name = "linux-raspberrypi-${version}.tar.gz";
+ sha256 = "04370b1da7610622372940decdc13ddbba2a58c9da3c3bd3e7df930a399f140d";
+ };
+
+ config = configWithPlatform stdenv.platform;
+ configCross = configWithPlatform stdenv.cross.platform;
+
+ features.iwlwifi = true;
+ #features.efiBootStub = true;
+ #features.needsCifsUtils = true;
+ #features.canDisableNetfilterConntrackHelpers = true;
+ #features.netfilterRPFilter = true;
+ }
+
+ // removeAttrs args ["extraConfig"]
+)
diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix
index 52e284827d0..5d84dee0a28 100644
--- a/pkgs/os-specific/linux/kernel/manual-config.nix
+++ b/pkgs/os-specific/linux/kernel/manual-config.nix
@@ -8,16 +8,13 @@ let
readConfig = configFile:
let
configAttrs = import "${runCommand "config.nix" {} ''
- (. ${configFile}
- echo "{"
- for var in `set`; do
- if [[ "$var" =~ ^CONFIG_ ]]; then
- IFS="="
- set -- $var
- echo "\"$1\" = \"''${*:2}\";"
- fi
- done
- echo "}") > $out
+ echo "{" > "$out"
+ while IFS='=' read key val; do
+ [ "x''${key#CONFIG_}" != "x$key" ] || continue
+ no_firstquote="''${val#\"}";
+ echo ' "'"$key"'" = "'"''${no_firstquote%\"}"'";' >> "$out"
+ done < "${configFile}"
+ echo "}" >> $out
''}";
config = configAttrs // rec {
@@ -125,7 +122,7 @@ stdenv.mkDerivation {
runHook postConfigure
'';
- buildNativeInputs = [ perl nettools ];
+ nativeBuildInputs = [ perl nettools ];
makeFlags = commonMakeFlags ++ [
"INSTALLKERNEL=${installkernel stdenv.platform.kernelTarget}"
diff --git a/pkgs/os-specific/linux/kernel/mips-ext3-n32.patch b/pkgs/os-specific/linux/kernel/mips-ext3-n32.patch
new file mode 100644
index 00000000000..fcb6f9177c7
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/mips-ext3-n32.patch
@@ -0,0 +1,17 @@
+Dirty patch that makes ext3 work again on 3.5 and 3.6 kernels,
+on mips n32.
+
+http://www.linux-mips.org/archives/linux-mips/2012-11/msg00030.html
+
+diff --git a/fs/ext3/dir.c b/fs/ext3/dir.c
+index 92490e9..bf63d7b 100644
+--- a/fs/ext3/dir.c
++++ b/fs/ext3/dir.c
+@@ -228,6 +228,7 @@ out:
+
+ static inline int is_32bit_api(void)
+ {
++ return 1;
+ #ifdef CONFIG_COMPAT
+ return is_compat_task();
+ #else
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 7aa365a67de..5288050d70d 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -107,27 +107,13 @@ rec {
aufs3_0 = rec {
name = "aufs3.0";
- version = "3.0";
- utilRev = "cabe3601001ab3838215116c32715c9de9412e62";
- utilHash = "7fc6cfe1e69a0b2438eaee056e15d42a2d6be396a637fcfb1b89858fcecc832f";
+ version = "3.0.20121210";
+ utilRev = "91af15f977d12e02165759620005f6ce1a4d7602";
+ utilHash = "dda4df89828dcf0e4012d88b4aa3eda8c30af69d6530ff5fedc2411de872c996";
patch = makeAufs3StandalonePatch {
inherit version;
- rev = "517b27621cdfb793959acac849dae9888338526a";
- sha256 = "8085200ac78d0c1e082d4c721a09f4a4c1d96ae86e307075836d09c3e7d502df";
- };
- features.aufsBase = true;
- features.aufs3 = true;
- };
-
- aufs3_1 = rec {
- name = "aufs3.1";
- version = "3.1";
- utilRev = "cabe3601001ab3838215116c32715c9de9412e62";
- utilHash = "7fc6cfe1e69a0b2438eaee056e15d42a2d6be396a637fcfb1b89858fcecc832f";
- patch = makeAufs3StandalonePatch {
- inherit version;
- rev = "7386b57432ec5e73632a5375804239b02b6c00f0";
- sha256 = "af4e9ad890e1b72d14170c97d8ead53291f09e275db600932724e6181530be2d";
+ rev = "0627c706d69778f5c74be982f28c746153b8cdf7";
+ sha256 = "7008ff64f5adc2b3a30fcbb090bcbfaac61b778af38493b6144fc7d768a6514d";
};
features.aufsBase = true;
features.aufs3 = true;
@@ -135,27 +121,13 @@ rec {
aufs3_2 = rec {
name = "aufs3.2";
- version = "3.2";
- utilRev = "a953b0218667e06b722f4c41df29edacd8dc8e1f";
- utilHash = "28ac4c1a07b2c30fb61a6facc9cedcf67b14f303baedf1b121aeb6293ea49eb4";
- patch = makeAufs3StandalonePatch {
- inherit version;
- rev = "9c4bbeb58f0ecc235ea820ae320efa2c0006e033";
- sha256 = "5363a7f5fbadaef9457e743a5781f2525332c4bbb91693ca2596ab2d8f7860ea";
- };
- features.aufsBase = true;
- features.aufs3 = true;
- };
-
- aufs3_3 = rec {
- name = "aufs3.3";
- version = "3.3.20120730";
+ version = "3.2.20121210";
utilRev = "91af15f977d12e02165759620005f6ce1a4d7602";
utilHash = "dda4df89828dcf0e4012d88b4aa3eda8c30af69d6530ff5fedc2411de872c996";
patch = makeAufs3StandalonePatch {
inherit version;
- rev = "ff0c9f1c002ef564d7bd52dd56a9b72f4ee7ce0c";
- sha256 = "cfa1a06669c984e1b8755da649aac40152e8018ee87939c5f0825100e45e196e";
+ rev = "0bf50c3b82f98e2ddc4c9ba0657f28ebfa8d15cb";
+ sha256 = "bc4b65cb77c62744db251da98488fdf4962f14a144c045cea6cbbbd42718ff89";
};
features.aufsBase = true;
features.aufs3 = true;
@@ -163,27 +135,28 @@ rec {
aufs3_4 = rec {
name = "aufs3.4";
- version = "3.4.20120730";
+ version = "3.4.20121210";
utilRev = "91af15f977d12e02165759620005f6ce1a4d7602";
utilHash = "dda4df89828dcf0e4012d88b4aa3eda8c30af69d6530ff5fedc2411de872c996";
patch = makeAufs3StandalonePatch {
inherit version;
- rev = "8d7338df43d5e5372424813679c7531cf96ec260";
- sha256 = "37880124df88791d51089277230df0816fc5545c9752be3fa5173385489362c6";
+ rev = "2faacd9baffb37df3b9062cc554353eebe68df1e";
+ sha256 = "3ecf97468f5e85970d9fd2bfc61e38c7f5ae2c6dde0045d5a17de085c411d452";
};
features.aufsBase = true;
features.aufs3 = true;
};
- aufs3_5 = rec {
- name = "aufs3.5";
- version = "3.5.20120813";
+ # not officially released yet, but 3.x seems to work fine
+ aufs3_7 = rec {
+ name = "aufs3.7";
+ version = "3.x.20121210";
utilRev = "91af15f977d12e02165759620005f6ce1a4d7602";
utilHash = "dda4df89828dcf0e4012d88b4aa3eda8c30af69d6530ff5fedc2411de872c996";
patch = makeAufs3StandalonePatch {
inherit version;
- rev = "85b5f7059bc8a1759989408a13fc56f92e0d6d31";
- sha256 = "2be13407a2291c7e69658f10a6fb7672751c906a27ac700a2e5e05dbada97cc5";
+ rev = "8d24d728c7eb54dd624bccd8e87afa826670142c";
+ sha256 = "02dcb46e02b2a6b90c1601b5747614276074488c9308625c3a52ab74cad997a5";
};
features.aufsBase = true;
features.aufs3 = true;
@@ -226,11 +199,6 @@ rec {
patch = ./dell-rfkill.patch;
};
- perf3_5 =
- { name = "perf-3.5";
- patch = ./perf-3.5.patch;
- };
-
sheevaplug_modules_2_6_35 =
{ name = "sheevaplug_modules-2.6.35";
patch = ./sheevaplug_modules-2.6.35.patch;
@@ -246,6 +214,11 @@ rec {
patch = ./mips-fpu-sigill.patch;
};
+ mips_ext3_n32 =
+ { name = "mips-ext3-n32";
+ patch = ./mips-ext3-n32.patch;
+ };
+
guruplug_defconfig =
{ # Default configuration for the GuruPlug. From
# .
diff --git a/pkgs/os-specific/linux/kernel/perf-3.5.patch b/pkgs/os-specific/linux/kernel/perf-3.5.patch
deleted file mode 100644
index 6d62a1db80e..00000000000
--- a/pkgs/os-specific/linux/kernel/perf-3.5.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-http://permalink.gmane.org/gmane.linux.kernel.perf.user/960
-
-Fix to build perf.
-
-diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c
-index 9f6cebd..d5491f1 100644
---- a/tools/perf/util/evsel.c
-+++ b/tools/perf/util/evsel.c
-@@ -15,7 +15,7 @@
- #include "cpumap.h"
- #include "thread_map.h"
- #include "target.h"
--#include "../../include/linux/perf_event.h"
-+#include "../../../include/linux/perf_event.h"
-
- #define FD(e, x, y) (*(int *)xyarray__entry(e->fd, x, y))
- #define GROUP_FD(group_fd, cpu) (*(int *)xyarray__entry(group_fd, cpu, 0))
diff --git a/pkgs/os-specific/linux/kernel/perf.nix b/pkgs/os-specific/linux/kernel/perf.nix
index 01d989e75b1..8f2db1b15bd 100644
--- a/pkgs/os-specific/linux/kernel/perf.nix
+++ b/pkgs/os-specific/linux/kernel/perf.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
'';
# perf refers both to newt and slang
- buildNativeInputs = [ asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt flex bison ];
+ nativeBuildInputs = [ asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt flex bison ];
buildInputs = [ elfutils python perl newt slang pkgconfig] ++
stdenv.lib.optional withGtk gtk;
@@ -27,9 +27,9 @@ stdenv.mkDerivation {
crossAttrs = {
/* I don't want cross-python or cross-perl -
I don't know if cross-python even works */
- propagatedBuildInputs = [ elfutils.hostDrv newt.hostDrv ];
+ propagatedBuildInputs = [ elfutils.crossDrv newt.crossDrv ];
makeFlags = "CROSS_COMPILE=${stdenv.cross.config}-";
- elfutils = elfutils.hostDrv;
+ elfutils = elfutils.crossDrv;
};
meta = {
diff --git a/pkgs/os-specific/linux/klibc/default.nix b/pkgs/os-specific/linux/klibc/default.nix
index 781bb67edca..42fd6097da0 100644
--- a/pkgs/os-specific/linux/klibc/default.nix
+++ b/pkgs/os-specific/linux/klibc/default.nix
@@ -70,5 +70,5 @@ stdenv.mkDerivation {
cp usr/dash/sh $dir/
'';
- buildNativeInputs = [ perl bison mktemp ];
+ nativeBuildInputs = [ perl bison mktemp ];
}
diff --git a/pkgs/os-specific/linux/kudzu/builder.sh b/pkgs/os-specific/linux/kudzu/builder.sh
deleted file mode 100644
index 002bac8a1db..00000000000
--- a/pkgs/os-specific/linux/kudzu/builder.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-source $stdenv/setup
-
-export DESTDIR=$out
-
-preInstall() {
- mkdir -p $out
- mkdir -p $out/etc
- mkdir -p $out/sbin
- mkdir -p $out/usr
- make install-program
-}
-
-genericBuild
diff --git a/pkgs/os-specific/linux/kudzu/default.nix b/pkgs/os-specific/linux/kudzu/default.nix
deleted file mode 100644
index 5cc8161bd94..00000000000
--- a/pkgs/os-specific/linux/kudzu/default.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{stdenv, fetchurl, pciutils, python, popt, gettext}:
-
-stdenv.mkDerivation {
- name = "kudzu-1.2.16";
- builder = ./builder.sh;
- src = fetchurl {
- url = http://losser.labs.cs.uu.nl/~armijn/.nix/kudzu-1.2.16.tar.gz;
- md5 = "5fc786dd558064fd9c9cb3e5be10e799";
- };
- buildInputs = [pciutils python popt gettext];
- inherit python;
- patches = [./kudzu-python.patch];
-}
diff --git a/pkgs/os-specific/linux/kudzu/kudzu-python.patch b/pkgs/os-specific/linux/kudzu/kudzu-python.patch
deleted file mode 100644
index 553d998f517..00000000000
--- a/pkgs/os-specific/linux/kudzu/kudzu-python.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ruN kudzu-1.2.16/Makefile kudzu-1.2.16.new/Makefile
---- kudzu-1.2.16/Makefile 2005-10-28 21:57:55.000000000 +0200
-+++ kudzu-1.2.16.new/Makefile 2005-12-23 19:55:12.000000000 +0100
-@@ -17,7 +17,7 @@
-
- CVSTAG = kudzu-r$(subst .,-,$(VERSION))
-
--PYTHONVERS = $(shell ls /usr/include/python*/Python.h | sed "s|/usr/include/||g"| sed "s|/Python.h||g")
-+PYTHONVERS = $(shell ls $(python)/include/python*/Python.h | sed "s|$(python)/include/||g"| sed "s|/Python.h||g")
-
- CFLAGS += -I. -DVERSION=\"$(VERSION)\"
-
-@@ -84,7 +84,7 @@
- for ver in $(PYTHONVERS) ; do \
- if [ ! -f "$$ver/_kudzumodule.so" -o libkudzu.a -nt "$$ver/_kudzumodule.so" ]; then \
- mkdir -p $$ver ;\
-- $(CC) $(CFLAGS) -I/usr/include/$$ver -fpic -c -o $$ver/kudzumodule.o kudzumodule.c ;\
-+ $(CC) $(CFLAGS) -I$(python)/include/$$ver -fpic -c -o $$ver/kudzumodule.o kudzumodule.c ;\
- $(CC) -o $$ver/_kudzumodule.so $$ver/kudzumodule.o -shared -Wl,-soname,_kudzumodule.so -L. -lkudzu -lpci ;\
- fi ; \
- done
diff --git a/pkgs/os-specific/linux/libcap/default.nix b/pkgs/os-specific/linux/libcap/default.nix
index 667fe63bba7..92f15c1ade3 100644
--- a/pkgs/os-specific/linux/libcap/default.nix
+++ b/pkgs/os-specific/linux/libcap/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "03q50j6bg65cc501q87qh328ncav1i8qw2bjig99vxmmfx4bvsvk";
};
- buildNativeInputs = [ perl ];
+ nativeBuildInputs = [ perl ];
propagatedBuildInputs = [ attr ];
preConfigure = "cd libcap";
diff --git a/pkgs/os-specific/linux/libcgroup/default.nix b/pkgs/os-specific/linux/libcgroup/default.nix
index 0246f6729b1..6323d8c4f23 100644
--- a/pkgs/os-specific/linux/libcgroup/default.nix
+++ b/pkgs/os-specific/linux/libcgroup/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
buildInputs = [ pam ];
- buildNativeInputs = [ yacc flex ];
+ nativeBuildInputs = [ yacc flex ];
meta = {
description = "Library and tools to manage Linux's cgroup resource management system";
diff --git a/pkgs/os-specific/linux/libnl/default.nix b/pkgs/os-specific/linux/libnl/default.nix
index 35f05e9d009..6fe31c63178 100644
--- a/pkgs/os-specific/linux/libnl/default.nix
+++ b/pkgs/os-specific/linux/libnl/default.nix
@@ -1,11 +1,11 @@
{stdenv, fetchurl, bison, flex}:
stdenv.mkDerivation rec {
- name = "libnl-3.0";
+ name = "libnl-3.2.13";
src = fetchurl {
url = "${meta.homepage}files/${name}.tar.gz";
- sha256 = "1vac10m3w0m5lsypjcrhs2dzwng82nkbzqz8g8kyzkxb3qz5ql3s";
+ sha256 = "1ydw42lsd572qwrfgws97n76hyvjdpanwrxm03lysnhfxkna1ssd";
};
buildInputs = [ bison flex ];
diff --git a/pkgs/os-specific/linux/libnl/libnl-1.1-flags.patch b/pkgs/os-specific/linux/libnl/libnl-1.1-flags.patch
deleted file mode 100644
index bb09b362660..00000000000
--- a/pkgs/os-specific/linux/libnl/libnl-1.1-flags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libnl-1.1/lib/Makefile.orig 2008-01-14 16:48:45.000000000 +0100
-+++ libnl-1.1/lib/Makefile 2009-05-26 09:47:42.000000000 +0200
-@@ -48,7 +48,7 @@
-
- $(OUT_SLIB): ../Makefile.opts $(OBJ)
- @echo " LD $(OUT_SLIB)"; \
-- $(CC) -shared -Wl,-soname,libnl.so.1 -o $(OUT_SLIB) $(OBJ) $(LIBNL_LIB) -lc
-+ $(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl,-soname,libnl.so.1 -o $(OUT_SLIB) $(OBJ) $(LIBNL_LIB) -lc
- @echo " LN $(OUT_SLIB) $(LN1_SLIB)"; \
- rm -f $(LN1_SLIB) ; $(LN) -s $(OUT_SLIB) $(LN1_SLIB)
- @echo " LN $(LN1_SLIB) $(LN_SLIB)"; \
diff --git a/pkgs/os-specific/linux/libnl/libnl-1.1-glibc-2.8-ULONG_MAX.patch b/pkgs/os-specific/linux/libnl/libnl-1.1-glibc-2.8-ULONG_MAX.patch
deleted file mode 100644
index 79dd039a338..00000000000
--- a/pkgs/os-specific/linux/libnl/libnl-1.1-glibc-2.8-ULONG_MAX.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=225393
-
---- libnl-1.1/include/netlink-local.h 2008-06-09 07:54:20 +0000
-+++ libnl-1.1/include/netlink-local.h 2008-06-09 07:54:47 +0000
-@@ -26,6 +26,7 @@
- #include
- #include
- #include
-+#include
-
- #include
- #include
-
diff --git a/pkgs/os-specific/linux/libnl/libnl-1.1-minor-leaks.patch b/pkgs/os-specific/linux/libnl/libnl-1.1-minor-leaks.patch
deleted file mode 100644
index 855a6ab3912..00000000000
--- a/pkgs/os-specific/linux/libnl/libnl-1.1-minor-leaks.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From: Patrick McHardy
-Date: Fri, 18 Jan 2008 16:55:49 +0000 (+0100)
-Subject: [LIBNL]: Fix minor memleaks on exit
-X-Git-Url: http://git.kernel.org/?p=libs%2Fnetlink%2Flibnl.git;a=commitdiff_plain;h=b64f15d6f947839236fa276d473d238f8c9b9d57;hp=e91bb2ffb090955d443e643a25b250bf3d33534a
-
-[LIBNL]: Fix minor memleaks on exit
-
-Make valgrind happy ...
-
-Signed-off-by: Patrick McHardy
----
-
-diff --git a/lib/route/route_utils.c b/lib/route/route_utils.c
-index a12d169..1386cda 100644
---- a/lib/route/route_utils.c
-+++ b/lib/route/route_utils.c
-@@ -63,6 +63,11 @@ static void __init init_routing_table_names(void)
- add_routing_table_name(RT_TABLE_LOCAL, "local");
- };
-
-+static void __exit release_routing_table_names(void)
-+{
-+ __trans_list_clear(&table_names);
-+}
-+
- int rtnl_route_read_table_names(const char *path)
- {
- __trans_list_clear(&table_names);
-@@ -104,6 +109,11 @@ static void __init init_proto_names(void)
- add_proto_name(RTPROT_STATIC, "static");
- };
-
-+static void __exit release_proto_names(void)
-+{
-+ __trans_list_clear(&proto_names);
-+}
-+
- int rtnl_route_read_protocol_names(const char *path)
- {
- __trans_list_clear(&proto_names);
diff --git a/pkgs/os-specific/linux/libnl/libnl-1.1-vlan-header.patch b/pkgs/os-specific/linux/libnl/libnl-1.1-vlan-header.patch
deleted file mode 100644
index c4c2fc6382d..00000000000
--- a/pkgs/os-specific/linux/libnl/libnl-1.1-vlan-header.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From: Patrick McHardy
-Date: Fri, 18 Jan 2008 16:55:48 +0000 (+0100)
-Subject: [LIBNL]: Add if_vlan.h
-X-Git-Url: http://git.kernel.org/?p=libs%2Fnetlink%2Flibnl.git;a=commitdiff_plain;h=e91bb2ffb090955d443e643a25b250bf3d33534a;hp=7f6b7a8eea0334b34d58dec72c66121a76f08958
-
-[LIBNL]: Add if_vlan.h
-
-vlan support needs VLAN_FLAG_REORDER_HDR, which is not available in
-older if_vlan.h versions. Add the current version from the kernel.
-
-Signed-off-by: Patrick McHardy
----
-
-diff --git a/include/linux/if_vlan.h b/include/linux/if_vlan.h
-new file mode 100644
-index 0000000..068cd7b
---- /dev/null
-+++ include/linux/if_vlan.h
-@@ -0,0 +1,61 @@
-+/*
-+ * VLAN An implementation of 802.1Q VLAN tagging.
-+ *
-+ * Authors: Ben Greear
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version
-+ * 2 of the License, or (at your option) any later version.
-+ *
-+ */
-+
-+#ifndef _LINUX_IF_VLAN_H_
-+#define _LINUX_IF_VLAN_H_
-+
-+
-+/* VLAN IOCTLs are found in sockios.h */
-+
-+/* Passed in vlan_ioctl_args structure to determine behaviour. */
-+enum vlan_ioctl_cmds {
-+ ADD_VLAN_CMD,
-+ DEL_VLAN_CMD,
-+ SET_VLAN_INGRESS_PRIORITY_CMD,
-+ SET_VLAN_EGRESS_PRIORITY_CMD,
-+ GET_VLAN_INGRESS_PRIORITY_CMD,
-+ GET_VLAN_EGRESS_PRIORITY_CMD,
-+ SET_VLAN_NAME_TYPE_CMD,
-+ SET_VLAN_FLAG_CMD,
-+ GET_VLAN_REALDEV_NAME_CMD, /* If this works, you know it's a VLAN device, btw */
-+ GET_VLAN_VID_CMD /* Get the VID of this VLAN (specified by name) */
-+};
-+
-+enum vlan_flags {
-+ VLAN_FLAG_REORDER_HDR = 0x1,
-+};
-+
-+enum vlan_name_types {
-+ VLAN_NAME_TYPE_PLUS_VID, /* Name will look like: vlan0005 */
-+ VLAN_NAME_TYPE_RAW_PLUS_VID, /* name will look like: eth1.0005 */
-+ VLAN_NAME_TYPE_PLUS_VID_NO_PAD, /* Name will look like: vlan5 */
-+ VLAN_NAME_TYPE_RAW_PLUS_VID_NO_PAD, /* Name will look like: eth0.5 */
-+ VLAN_NAME_TYPE_HIGHEST
-+};
-+
-+struct vlan_ioctl_args {
-+ int cmd; /* Should be one of the vlan_ioctl_cmds enum above. */
-+ char device1[24];
-+
-+ union {
-+ char device2[24];
-+ int VID;
-+ unsigned int skb_priority;
-+ unsigned int name_type;
-+ unsigned int bind_type;
-+ unsigned int flag; /* Matches vlan_dev_info flags */
-+ } u;
-+
-+ short vlan_qos;
-+};
-+
-+#endif /* !(_LINUX_IF_VLAN_H_) */
diff --git a/pkgs/os-specific/linux/libnl/v1.nix b/pkgs/os-specific/linux/libnl/v1.nix
deleted file mode 100644
index f3f7f3fa732..00000000000
--- a/pkgs/os-specific/linux/libnl/v1.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{stdenv, fetchurl, bison, flex}:
-
-stdenv.mkDerivation rec {
- name = "libnl-1.1";
-
- src = fetchurl {
- url = "${meta.homepage}files/${name}.tar.gz";
- sha256 = "1hzd48z8h8abkclq90wb7cciynpg3pwgyd0gzb5g12ndnv7s9kim";
- };
-
- buildInputs = [ bison flex ];
- postConfigure = "type -tp flex";
-
- patches = [
- ./libnl-1.1-flags.patch
- ./libnl-1.1-glibc-2.8-ULONG_MAX.patch
- ./libnl-1.1-minor-leaks.patch
- ./libnl-1.1-vlan-header.patch
- ];
-
- meta = {
- homepage = "http://www.infradead.org/~tgr/libnl/";
- description = "Linux NetLink interface library";
- maintainers = [ stdenv.lib.maintainers.urkud ];
- platforms = stdenv.lib.platforms.linux;
- };
-}
diff --git a/pkgs/os-specific/linux/libnl/v2.nix b/pkgs/os-specific/linux/libnl/v2.nix
deleted file mode 100644
index cb5c022c3d4..00000000000
--- a/pkgs/os-specific/linux/libnl/v2.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{stdenv, fetchurl, bison, flex}:
-
-stdenv.mkDerivation rec {
- name = "libnl-2.0";
-
- src = fetchurl {
- url = "${meta.homepage}files/${name}.tar.gz";
- sha256 = "173sr25xpsakdvjcg62790v6kwcgxj5r0js2lx6hg89w7n8dqh2s";
- };
-
- buildInputs = [ bison flex ];
-
- meta = {
- homepage = "http://www.infradead.org/~tgr/libnl/";
- description = "Linux NetLink interface library";
- maintainers = [ stdenv.lib.maintainers.urkud ];
- platforms = stdenv.lib.platforms.linux;
- };
-}
diff --git a/pkgs/os-specific/linux/lvm2/assume-uevent-generated.patch b/pkgs/os-specific/linux/lvm2/assume-uevent-generated.patch
new file mode 100644
index 00000000000..4098d042fd5
--- /dev/null
+++ b/pkgs/os-specific/linux/lvm2/assume-uevent-generated.patch
@@ -0,0 +1,39 @@
+Work around LVM/cryptsetup errors like:
+
+ semid 32768: semop failed for cookie 0xd4d41f4: incorrect semaphore state
+ Failed to set a proper state for notification semaphore identified by cookie value 223166964 (0xd4d41f4) to initialize waiting for incoming notifications.
+
+and (when running "cryptsetup --debug"):
+
+ Uevent not generated! Calling udev_complete internally to avoid process lock-up.
+
+Here for some reason libdm *thinks* that the uevent hasn't been
+emitted, so it calls udev_complete. But the uevent actually *has*
+been emitted, so udev calls ‘dmsetup udevcomplete’ as well, leading to
+a race.
+
+This is probably a reoccurence of the problem described here:
+
+ http://www.redhat.com/archives/dm-devel/2011-August/msg00075.html
+ http://www.redhat.com/archives/linux-lvm/2011-September/msg00023.html
+
+which was fixed in the kernel, so it's not clear why it's surfacing
+again. Maybe netlink_broadcast_filtered() has started returning some
+other bogus error code.
+
+diff -ru -x '*~' LVM2.2.02.98/libdm/ioctl/libdm-iface.c LVM2.2.02.98-new/libdm/ioctl/libdm-iface.c
+--- LVM2.2.02.98/libdm/ioctl/libdm-iface.c 2012-10-15 10:24:58.000000000 -0400
++++ LVM2.2.02.98-new/libdm/ioctl/libdm-iface.c 2012-10-15 14:19:06.774363736 -0400
+@@ -1754,9 +1754,12 @@
+
+ if (ioctl_with_uevent && dm_udev_get_sync_support() &&
+ !_check_uevent_generated(dmi)) {
++ log_debug("warning: Uevent might not be generated!");
++#if 0
+ log_debug("Uevent not generated! Calling udev_complete "
+ "internally to avoid process lock-up.");
+ _udev_complete(dmt);
++#endif
+ }
+
+ if (!_dm_ioctl_unmangle_names(dmt->type, dmi))
diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix
index 1ebebfd634b..ec68304c935 100644
--- a/pkgs/os-specific/linux/lvm2/default.nix
+++ b/pkgs/os-specific/linux/lvm2/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig, udev, utillinux, coreutils }:
let
- v = "2.02.97";
+ v = "2.02.98";
in
stdenv.mkDerivation {
@@ -9,9 +9,11 @@ stdenv.mkDerivation {
src = fetchurl {
url = "ftp://sources.redhat.com/pub/lvm2/old/LVM2.${v}.tgz";
- sha256 = "0azwa555dgvixbdw055yj8cj1q6kd0a36nms005iz7la5q0q5npd";
+ sha256 = "0r6q6z8ip6q5qgkzng0saljassp4912k6i21ra10vq7pzrc0l0vi";
};
+ patches = [ ./assume-uevent-generated.patch ];
+
configureFlags =
"--disable-readline --enable-udev_rules --enable-udev_sync --enable-pkgconfig --enable-applib";
diff --git a/pkgs/applications/virtualization/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix
similarity index 81%
rename from pkgs/applications/virtualization/lxc/default.nix
rename to pkgs/os-specific/linux/lxc/default.nix
index 26180b84368..8f60ff2554b 100644
--- a/pkgs/applications/virtualization/lxc/default.nix
+++ b/pkgs/os-specific/linux/lxc/default.nix
@@ -1,17 +1,14 @@
-{ stdenv, fetchurl, libcap, perl, docbook2x, docbook_xml_dtd_45 }:
+{ stdenv, fetchurl, libcap, apparmor, perl, docbook2x, docbook_xml_dtd_45 }:
-let
- name = "lxc-0.7.5";
-in
-stdenv.mkDerivation{
- inherit name;
+stdenv.mkDerivation rec {
+ name = "lxc-0.8.0";
src = fetchurl {
url = "http://lxc.sf.net/download/lxc/${name}.tar.gz";
- sha256 = "019ec63f250c874bf7625b1f1bf555b1a6e3a947937a4fca73100abddf829b1c";
+ sha256 = "0b3912mal1n56i1v5f3aplm7shqnlz24p0znpva27r4l1drk7j7a";
};
- buildInputs = [ libcap perl docbook2x ];
+ buildInputs = [ libcap apparmor perl docbook2x ];
patches = [
./dont-run-ldconfig.patch
@@ -42,7 +39,6 @@ stdenv.mkDerivation{
mechanisms to Linux’s existing process management infrastructure.
'';
-
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.simons ];
};
diff --git a/pkgs/applications/virtualization/lxc/dont-run-ldconfig.patch b/pkgs/os-specific/linux/lxc/dont-run-ldconfig.patch
similarity index 100%
rename from pkgs/applications/virtualization/lxc/dont-run-ldconfig.patch
rename to pkgs/os-specific/linux/lxc/dont-run-ldconfig.patch
diff --git a/pkgs/applications/virtualization/lxc/fix-documentation-build.patch b/pkgs/os-specific/linux/lxc/fix-documentation-build.patch
similarity index 100%
rename from pkgs/applications/virtualization/lxc/fix-documentation-build.patch
rename to pkgs/os-specific/linux/lxc/fix-documentation-build.patch
diff --git a/pkgs/applications/virtualization/lxc/fix-sgml-documentation.patch b/pkgs/os-specific/linux/lxc/fix-sgml-documentation.patch
similarity index 53%
rename from pkgs/applications/virtualization/lxc/fix-sgml-documentation.patch
rename to pkgs/os-specific/linux/lxc/fix-sgml-documentation.patch
index 4d2cce0dd62..60c9027cca5 100644
--- a/pkgs/applications/virtualization/lxc/fix-sgml-documentation.patch
+++ b/pkgs/os-specific/linux/lxc/fix-sgml-documentation.patch
@@ -1,7 +1,8 @@
-diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-cgroup.sgml.in lxc-0.7.5/doc/lxc-cgroup.sgml.in
---- lxc-0.7.5-orig/doc/lxc-cgroup.sgml.in 2010-06-07 10:51:51.000000000 +0200
-+++ lxc-0.7.5/doc/lxc-cgroup.sgml.in 2011-09-26 10:05:01.753873426 +0200
-@@ -23,7 +23,7 @@
+diff --git a/doc/lxc-attach.sgml.in b/doc/lxc-attach.sgml.in
+index 7092f16..021da41 100644
+--- a/doc/lxc-attach.sgml.in
++++ b/doc/lxc-attach.sgml.in
+@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-->
@@ -10,10 +11,11 @@ diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-cgroup.sgml.in lxc-0.7.5/
-diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-checkpoint.sgml.in lxc-0.7.5/doc/lxc-checkpoint.sgml.in
---- lxc-0.7.5-orig/doc/lxc-checkpoint.sgml.in 2011-02-17 10:07:44.000000000 +0100
-+++ lxc-0.7.5/doc/lxc-checkpoint.sgml.in 2011-09-26 10:05:01.753873426 +0200
-@@ -23,7 +23,7 @@
+diff --git a/doc/lxc-cgroup.sgml.in b/doc/lxc-cgroup.sgml.in
+index 5acd313..856a544 100644
+--- a/doc/lxc-cgroup.sgml.in
++++ b/doc/lxc-cgroup.sgml.in
+@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-->
@@ -22,10 +24,110 @@ diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-checkpoint.sgml.in lxc-0.
-diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc.conf.sgml.in lxc-0.7.5/doc/lxc.conf.sgml.in
---- lxc-0.7.5-orig/doc/lxc.conf.sgml.in 2011-08-09 16:51:01.000000000 +0200
-+++ lxc-0.7.5/doc/lxc.conf.sgml.in 2011-09-26 10:05:01.754873476 +0200
-@@ -23,7 +23,7 @@
+diff --git a/doc/lxc-checkpoint.sgml.in b/doc/lxc-checkpoint.sgml.in
+index bf0efd9..eeb0039 100644
+--- a/doc/lxc-checkpoint.sgml.in
++++ b/doc/lxc-checkpoint.sgml.in
+@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+ -->
+
+-
+
+diff --git a/doc/lxc-console.sgml.in b/doc/lxc-console.sgml.in
+index 606c868..62f9e07 100644
+--- a/doc/lxc-console.sgml.in
++++ b/doc/lxc-console.sgml.in
+@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+ -->
+
+-
+
+diff --git a/doc/lxc-create.sgml.in b/doc/lxc-create.sgml.in
+index a3cca83..d59106d 100644
+--- a/doc/lxc-create.sgml.in
++++ b/doc/lxc-create.sgml.in
+@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+ -->
+
+-
+
+@@ -141,6 +141,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ filesystem) of size SIZE rather than the default, which is 1G.
+
+
++
+
+
+
+diff --git a/doc/lxc-destroy.sgml.in b/doc/lxc-destroy.sgml.in
+index e75de57..05f53d6 100644
+--- a/doc/lxc-destroy.sgml.in
++++ b/doc/lxc-destroy.sgml.in
+@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+ -->
+
+-
+
+diff --git a/doc/lxc-execute.sgml.in b/doc/lxc-execute.sgml.in
+index 77d132a..1e58bef 100644
+--- a/doc/lxc-execute.sgml.in
++++ b/doc/lxc-execute.sgml.in
+@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+ -->
+
+-
+
+diff --git a/doc/lxc-freeze.sgml.in b/doc/lxc-freeze.sgml.in
+index 798ccf4..f0d0485 100644
+--- a/doc/lxc-freeze.sgml.in
++++ b/doc/lxc-freeze.sgml.in
+@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+ -->
+
+-
+
+diff --git a/doc/lxc-kill.sgml.in b/doc/lxc-kill.sgml.in
+index 5bec922..1f48820 100644
+--- a/doc/lxc-kill.sgml.in
++++ b/doc/lxc-kill.sgml.in
+@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+ -->
+
+-
+
+diff --git a/doc/lxc-ls.sgml.in b/doc/lxc-ls.sgml.in
+index 3ffd4f8..b11d211 100644
+--- a/doc/lxc-ls.sgml.in
++++ b/doc/lxc-ls.sgml.in
+@@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-->
@@ -34,10 +136,11 @@ diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc.conf.sgml.in lxc-0.7.5/do
]>
-diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-console.sgml.in lxc-0.7.5/doc/lxc-console.sgml.in
---- lxc-0.7.5-orig/doc/lxc-console.sgml.in 2010-06-07 10:51:51.000000000 +0200
-+++ lxc-0.7.5/doc/lxc-console.sgml.in 2011-09-26 10:05:01.754873476 +0200
-@@ -23,7 +23,7 @@
+diff --git a/doc/lxc-monitor.sgml.in b/doc/lxc-monitor.sgml.in
+index 9d8711c..b492968 100644
+--- a/doc/lxc-monitor.sgml.in
++++ b/doc/lxc-monitor.sgml.in
+@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-->
@@ -46,70 +149,11 @@ diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-console.sgml.in lxc-0.7.5
-diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-create.sgml.in lxc-0.7.5/doc/lxc-create.sgml.in
---- lxc-0.7.5-orig/doc/lxc-create.sgml.in 2011-07-25 00:27:10.000000000 +0200
-+++ lxc-0.7.5/doc/lxc-create.sgml.in 2011-09-26 10:05:01.755873526 +0200
-@@ -23,7 +23,7 @@
-
- -->
-
--
-
-diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-destroy.sgml.in lxc-0.7.5/doc/lxc-destroy.sgml.in
---- lxc-0.7.5-orig/doc/lxc-destroy.sgml.in 2010-10-08 11:54:53.000000000 +0200
-+++ lxc-0.7.5/doc/lxc-destroy.sgml.in 2011-09-26 10:05:01.755873526 +0200
-@@ -23,7 +23,7 @@
-
- -->
-
--
-
-diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-execute.sgml.in lxc-0.7.5/doc/lxc-execute.sgml.in
---- lxc-0.7.5-orig/doc/lxc-execute.sgml.in 2011-07-25 00:27:10.000000000 +0200
-+++ lxc-0.7.5/doc/lxc-execute.sgml.in 2011-09-26 10:05:01.755873526 +0200
-@@ -23,7 +23,7 @@
-
- -->
-
--
-
-diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-freeze.sgml.in lxc-0.7.5/doc/lxc-freeze.sgml.in
---- lxc-0.7.5-orig/doc/lxc-freeze.sgml.in 2010-06-07 10:51:51.000000000 +0200
-+++ lxc-0.7.5/doc/lxc-freeze.sgml.in 2011-09-26 10:05:01.755873526 +0200
-@@ -23,7 +23,7 @@
-
- -->
-
--
-
-diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-kill.sgml.in lxc-0.7.5/doc/lxc-kill.sgml.in
---- lxc-0.7.5-orig/doc/lxc-kill.sgml.in 2010-10-08 11:54:53.000000000 +0200
-+++ lxc-0.7.5/doc/lxc-kill.sgml.in 2011-09-26 10:05:01.756873576 +0200
-@@ -23,7 +23,7 @@
-
- -->
-
--
-
-diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-ls.sgml.in lxc-0.7.5/doc/lxc-ls.sgml.in
---- lxc-0.7.5-orig/doc/lxc-ls.sgml.in 2010-06-07 10:51:51.000000000 +0200
-+++ lxc-0.7.5/doc/lxc-ls.sgml.in 2011-09-26 10:05:01.756873576 +0200
-@@ -24,7 +24,7 @@
+diff --git a/doc/lxc-ps.sgml.in b/doc/lxc-ps.sgml.in
+index bb7b5a6..05ed59f 100644
+--- a/doc/lxc-ps.sgml.in
++++ b/doc/lxc-ps.sgml.in
+@@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-->
@@ -118,10 +162,11 @@ diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-ls.sgml.in lxc-0.7.5/doc/
]>
-diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-monitor.sgml.in lxc-0.7.5/doc/lxc-monitor.sgml.in
---- lxc-0.7.5-orig/doc/lxc-monitor.sgml.in 2010-06-07 10:51:51.000000000 +0200
-+++ lxc-0.7.5/doc/lxc-monitor.sgml.in 2011-09-26 10:05:01.756873576 +0200
-@@ -23,7 +23,7 @@
+diff --git a/doc/lxc-restart.sgml.in b/doc/lxc-restart.sgml.in
+index eb556d9..d158cc7 100644
+--- a/doc/lxc-restart.sgml.in
++++ b/doc/lxc-restart.sgml.in
+@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-->
@@ -130,22 +175,11 @@ diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-monitor.sgml.in lxc-0.7.5
-diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-ps.sgml.in lxc-0.7.5/doc/lxc-ps.sgml.in
---- lxc-0.7.5-orig/doc/lxc-ps.sgml.in 2011-08-11 17:54:57.000000000 +0200
-+++ lxc-0.7.5/doc/lxc-ps.sgml.in 2011-09-26 10:05:01.756873576 +0200
-@@ -24,7 +24,7 @@
-
- -->
-
--
- ]>
-diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-restart.sgml.in lxc-0.7.5/doc/lxc-restart.sgml.in
---- lxc-0.7.5-orig/doc/lxc-restart.sgml.in 2011-02-17 10:07:44.000000000 +0100
-+++ lxc-0.7.5/doc/lxc-restart.sgml.in 2011-09-26 10:05:01.757873626 +0200
-@@ -23,7 +23,7 @@
+diff --git a/doc/lxc-start.sgml.in b/doc/lxc-start.sgml.in
+index 4504d58..f268185 100644
+--- a/doc/lxc-start.sgml.in
++++ b/doc/lxc-start.sgml.in
+@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-->
@@ -154,10 +188,50 @@ diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-restart.sgml.in lxc-0.7.5
-diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc.sgml.in lxc-0.7.5/doc/lxc.sgml.in
---- lxc-0.7.5-orig/doc/lxc.sgml.in 2010-10-26 18:07:35.000000000 +0200
-+++ lxc-0.7.5/doc/lxc.sgml.in 2011-09-26 10:05:01.758873676 +0200
-@@ -23,7 +23,7 @@
+diff --git a/doc/lxc-stop.sgml.in b/doc/lxc-stop.sgml.in
+index d15e649..51179c4 100644
+--- a/doc/lxc-stop.sgml.in
++++ b/doc/lxc-stop.sgml.in
+@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+ -->
+
+-
+
+diff --git a/doc/lxc-unfreeze.sgml.in b/doc/lxc-unfreeze.sgml.in
+index bb00d85..3f8f59b 100644
+--- a/doc/lxc-unfreeze.sgml.in
++++ b/doc/lxc-unfreeze.sgml.in
+@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+ -->
+
+-
+
+diff --git a/doc/lxc-wait.sgml.in b/doc/lxc-wait.sgml.in
+index 97a4c39..0c7c589 100644
+--- a/doc/lxc-wait.sgml.in
++++ b/doc/lxc-wait.sgml.in
+@@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+ -->
+
+-
+
+diff --git a/doc/lxc.conf.sgml.in b/doc/lxc.conf.sgml.in
+index 9edabf8..daa2ff8 100644
+--- a/doc/lxc.conf.sgml.in
++++ b/doc/lxc.conf.sgml.in
+@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-->
@@ -166,7 +240,20 @@ diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc.sgml.in lxc-0.7.5/doc/lxc
]>
-@@ -280,7 +280,7 @@
+diff --git a/doc/lxc.sgml.in b/doc/lxc.sgml.in
+index 1b30fed..d98ca21 100644
+--- a/doc/lxc.sgml.in
++++ b/doc/lxc.sgml.in
+@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+ -->
+
+-
+ ]>
+@@ -280,7 +280,7 @@ rootfs
@@ -175,7 +262,7 @@ diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc.sgml.in lxc-0.7.5/doc/lxc
---------
| STOPPED |<---------------
--------- |
-@@ -305,7 +305,7 @@
+@@ -305,7 +305,7 @@ rootfs
---------- |
| |
---------------------
@@ -184,7 +271,7 @@ diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc.sgml.in lxc-0.7.5/doc/lxc
-@@ -570,7 +570,7 @@
+@@ -570,7 +570,7 @@ rootfs
to the background.
@@ -193,7 +280,7 @@ diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc.sgml.in lxc-0.7.5/doc/lxc
# launch lxc-wait in background
lxc-wait -n foo -s STOPPED &
LXC_WAIT_PID=$!
-@@ -583,7 +583,7 @@
+@@ -583,7 +583,7 @@ rootfs
# is STOPPED
wait $LXC_WAIT_PID
echo "'foo' is finished"
@@ -202,51 +289,3 @@ diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc.sgml.in lxc-0.7.5/doc/lxc
-diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-start.sgml.in lxc-0.7.5/doc/lxc-start.sgml.in
---- lxc-0.7.5-orig/doc/lxc-start.sgml.in 2011-02-01 15:12:40.000000000 +0100
-+++ lxc-0.7.5/doc/lxc-start.sgml.in 2011-09-26 10:05:01.758873676 +0200
-@@ -23,7 +23,7 @@
-
- -->
-
--
-
-diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-stop.sgml.in lxc-0.7.5/doc/lxc-stop.sgml.in
---- lxc-0.7.5-orig/doc/lxc-stop.sgml.in 2010-06-07 10:51:51.000000000 +0200
-+++ lxc-0.7.5/doc/lxc-stop.sgml.in 2011-09-26 10:05:01.758873676 +0200
-@@ -23,7 +23,7 @@
-
- -->
-
--
-
-diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-unfreeze.sgml.in lxc-0.7.5/doc/lxc-unfreeze.sgml.in
---- lxc-0.7.5-orig/doc/lxc-unfreeze.sgml.in 2010-06-07 10:51:51.000000000 +0200
-+++ lxc-0.7.5/doc/lxc-unfreeze.sgml.in 2011-09-26 10:05:01.759873726 +0200
-@@ -23,7 +23,7 @@
-
- -->
-
--
-
-diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-wait.sgml.in lxc-0.7.5/doc/lxc-wait.sgml.in
---- lxc-0.7.5-orig/doc/lxc-wait.sgml.in 2010-06-07 10:51:51.000000000 +0200
-+++ lxc-0.7.5/doc/lxc-wait.sgml.in 2011-09-26 10:05:01.759873726 +0200
-@@ -24,7 +24,7 @@
-
- -->
-
--
-
diff --git a/pkgs/os-specific/linux/mcelog/default.nix b/pkgs/os-specific/linux/mcelog/default.nix
index 82c502ede72..b60b6134fdd 100644
--- a/pkgs/os-specific/linux/mcelog/default.nix
+++ b/pkgs/os-specific/linux/mcelog/default.nix
@@ -25,9 +25,13 @@ in stdenv.mkDerivation {
makeFlags = "prefix=$(out) etcprefix=$(out) DOCDIR=$(out)/share/doc";
+ preInstall = ''
+ ensureDir $out/share/doc
+ '';
+
meta = {
description = "Tool to display logged machine check exceptions";
homepage = http://mcelog.org/;
license = stdenv.lib.licenses.gpl2;
};
-}
\ No newline at end of file
+}
diff --git a/pkgs/os-specific/linux/mdadm/default.nix b/pkgs/os-specific/linux/mdadm/default.nix
index a88107ae73d..1653c018ce1 100644
--- a/pkgs/os-specific/linux/mdadm/default.nix
+++ b/pkgs/os-specific/linux/mdadm/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
# Enable incremental activation of swraid arrays from udev.
patches = [ ./udev.patch ];
- buildNativeInputs = [ groff ];
+ nativeBuildInputs = [ groff ];
preConfigure = "sed -e 's@/lib/udev@\${out}/lib/udev@' -e 's@ -Werror @ @' -i Makefile";
diff --git a/pkgs/os-specific/linux/module-init-tools/default.nix b/pkgs/os-specific/linux/module-init-tools/default.nix
index 077d08f899d..240150b09dd 100644
--- a/pkgs/os-specific/linux/module-init-tools/default.nix
+++ b/pkgs/os-specific/linux/module-init-tools/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
src = [
(fetchurl {
- url = mirror://kernel/linux/utils/kernel/module-init-tools/module-init-tools-3.16.tar.bz2;
+ url = http://ftp.be.debian.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-3.16.tar.bz2;
sha256 = "0jxnz9ahfic79rp93l5wxcbgh4pkv85mwnjlbv1gz3jawv5cvwp1";
})
diff --git a/pkgs/os-specific/linux/modutils/default.nix b/pkgs/os-specific/linux/modutils/default.nix
deleted file mode 100644
index 3a063408a2f..00000000000
--- a/pkgs/os-specific/linux/modutils/default.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{stdenv, fetchurl, bison, flex}:
-
-stdenv.mkDerivation {
- name = "modutils-2.4.27";
- src = fetchurl {
- url = mirror://kernel/linux/utils/kernel/modutils/v2.4/modutils-2.4.27.tar.bz2;
- md5 = "bac989c74ed10f3bf86177fc5b4b89b6";
- };
- buildInputs = [bison flex];
-}
diff --git a/pkgs/os-specific/linux/mountall/default.nix b/pkgs/os-specific/linux/mountall/default.nix
index 67d7801fdb2..4cad810cc5f 100644
--- a/pkgs/os-specific/linux/mountall/default.nix
+++ b/pkgs/os-specific/linux/mountall/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, libnih, dbus, udev, autoconf, automake, libtool, gettext }:
+{ stdenv, fetchurl, pkgconfig, libnih, dbus, udev, gettext, autoreconfHook }:
stdenv.mkDerivation {
name = "mountall-2.35";
@@ -10,9 +10,7 @@ stdenv.mkDerivation {
patches = [ ./no-plymouth.patch ./fix-usr1-race.patch ];
- preConfigure = "rm -R aclocal.m4; gettextize -f; autoreconf -vfi";
-
- buildInputs = [ pkgconfig libnih dbus.libs udev autoconf automake libtool gettext ];
+ buildInputs = [ pkgconfig libnih dbus.libs udev gettext autoreconfHook ];
makeFlags = "initramfshookdir=$(out)/share/initramfs-tools/hooks upstart_jobs_initramfs_configdir=$(out)/share/initramfs-tools/event-driven/upstart-jobs";
diff --git a/pkgs/os-specific/linux/net-tools/config.h b/pkgs/os-specific/linux/net-tools/config.h
index b060bea12c2..dedaac6247d 100644
--- a/pkgs/os-specific/linux/net-tools/config.h
+++ b/pkgs/os-specific/linux/net-tools/config.h
@@ -38,6 +38,7 @@
#define HAVE_AFECONET 0
#define HAVE_AFDECnet 0
#define HAVE_AFASH 0
+#define HAVE_AFBLUETOOTH 0
/*
*
@@ -49,20 +50,23 @@
#define HAVE_HWSLIP 1
#define HAVE_HWPPP 1
#define HAVE_HWTUNNEL 1
-#define HAVE_HWSTRIP 1
-#define HAVE_HWTR 1
+#define HAVE_HWSTRIP 0
+#define HAVE_HWTR 0
#define HAVE_HWAX25 0
#define HAVE_HWROSE 0
#define HAVE_HWNETROM 1
#define HAVE_HWX25 0
#define HAVE_HWFR 1
-#define HAVE_HWSIT 0
+#define HAVE_HWSIT 1
#define HAVE_HWFDDI 0
#define HAVE_HWHIPPI 0
#define HAVE_HWASH 0
#define HAVE_HWHDLCLAPB 0
#define HAVE_HWIRDA 1
#define HAVE_HWEC 0
+#define HAVE_HWEC 0
+#define HAVE_HWEUI64 1
+#define HAVE_HWIB 1
/*
*
@@ -72,3 +76,4 @@
#define HAVE_FW_MASQUERADE 0
#define HAVE_IP_TOOLS 0
#define HAVE_MII 0
+#define HAVE_SELINUX 0
diff --git a/pkgs/os-specific/linux/net-tools/default.nix b/pkgs/os-specific/linux/net-tools/default.nix
index 59af976a71b..9386b50969f 100644
--- a/pkgs/os-specific/linux/net-tools/default.nix
+++ b/pkgs/os-specific/linux/net-tools/default.nix
@@ -1,15 +1,13 @@
{ stdenv, fetchurl }:
-stdenv.mkDerivation {
- name = "net-tools-1.60";
-
+stdenv.mkDerivation rec {
+ name = "net-tools-1.60_p20120127084908";
+
src = fetchurl {
- url = http://www.tazenda.demon.co.uk/phil/net-tools/net-tools-1.60.tar.bz2;
- md5 = "888774accab40217dde927e21979c165";
+ url = "mirror://gentoo/distfiles/${name}.tar.xz";
+ sha256 = "408a51964aa142a4f45c4cffede2478abbd5630a7c7346ba0d3611059a2a3c94";
};
- patches = [ ./net-tools-labels.patch ];
-
preBuild =
''
cp ${./config.h} config.h
diff --git a/pkgs/os-specific/linux/net-tools/net-tools-labels.patch b/pkgs/os-specific/linux/net-tools/net-tools-labels.patch
deleted file mode 100644
index 82c3a27d9c6..00000000000
--- a/pkgs/os-specific/linux/net-tools/net-tools-labels.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -ruN net-tools-1.60/hostname.c net-tools-1.60-new/hostname.c
---- net-tools-1.60/hostname.c 2001-04-08 19:04:23.000000000 +0200
-+++ net-tools-1.60-new/hostname.c 2004-12-17 14:48:15.624174382 +0100
-@@ -98,6 +98,7 @@
- fprintf(stderr, _("%s: name too long\n"), program_name);
- break;
- default:
-+ break;
- }
- exit(1);
- };
-@@ -117,6 +118,7 @@
- fprintf(stderr, _("%s: name too long\n"), program_name);
- break;
- default:
-+ break;
- }
- exit(1);
- };
-@@ -174,6 +176,7 @@
- printf("%s\n", hp->h_name);
- break;
- default:
-+ break;
- }
- }
-
-diff -ruN net-tools-1.60/lib/inet_sr.c net-tools-1.60-new/lib/inet_sr.c
---- net-tools-1.60/lib/inet_sr.c 2000-02-20 22:46:45.000000000 +0100
-+++ net-tools-1.60-new/lib/inet_sr.c 2004-12-17 14:37:15.416349441 +0100
-@@ -105,6 +105,7 @@
- case 2:
- isnet = 0; break;
- default:
-+ break;
- }
-
- /* Fill in the other fields. */
diff --git a/pkgs/os-specific/linux/nfs-utils/default.nix b/pkgs/os-specific/linux/nfs-utils/default.nix
index 6429d8092cf..42bacd41be0 100644
--- a/pkgs/os-specific/linux/nfs-utils/default.nix
+++ b/pkgs/os-specific/linux/nfs-utils/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, tcpWrapper, utillinux, libcap, libtirpc, libevent, libnfsidmap
+{ fetchurl, stdenv, tcp_wrappers, utillinux, libcap, libtirpc, libevent, libnfsidmap
, lvm2, e2fsprogs }:
stdenv.mkDerivation rec {
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
};
buildInputs =
- [ tcpWrapper utillinux libcap libtirpc libevent libnfsidmap
+ [ tcp_wrappers utillinux libcap libtirpc libevent libnfsidmap
lvm2 e2fsprogs
];
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
'';
# One test fails on mips.
- doCheck = if stdenv.isMips then false else true;
+ doCheck = !stdenv.isMips;
meta = {
description = "Linux user-space NFS utilities";
diff --git a/pkgs/os-specific/linux/nvidia-x11/acpixf.patch b/pkgs/os-specific/linux/nvidia-x11/acpixf.patch
deleted file mode 100644
index c94641c6919..00000000000
--- a/pkgs/os-specific/linux/nvidia-x11/acpixf.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -pur 96.43.20/conftest.sh 96.43.20-3.4/conftest.sh
---- 96.43.20/conftest.sh 2011-07-18 10:51:11.000000000 +0400
-+++ 96.43.20-3.4/conftest.sh 2012-06-16 00:04:22.870746239 +0400
-@@ -908,6 +908,7 @@ compile_test() {
- #
- echo "$CONFTEST_PREAMBLE
- #include
-+ #include
- void conftest_acpi_walk_namespace(void) {
- acpi_walk_namespace();
- }" > conftest$$.c
-@@ -923,6 +924,7 @@ compile_test() {
-
- echo "$CONFTEST_PREAMBLE
- #include
-+ #include
- void conftest_acpi_walk_namespace(void) {
- acpi_walk_namespace(0, NULL, 0, NULL, NULL, NULL, NULL);
- }" > conftest$$.c
-@@ -939,6 +941,7 @@ compile_test() {
-
- echo "$CONFTEST_PREAMBLE
- #include
-+ #include
- void conftest_acpi_walk_namespace(void) {
- acpi_walk_namespace(0, NULL, 0, NULL, NULL, NULL);
- }" > conftest$$.c
diff --git a/pkgs/os-specific/linux/nvidia-x11/builder-legacy304.sh b/pkgs/os-specific/linux/nvidia-x11/builder-legacy304.sh
new file mode 100755
index 00000000000..bb8beab29c5
--- /dev/null
+++ b/pkgs/os-specific/linux/nvidia-x11/builder-legacy304.sh
@@ -0,0 +1,101 @@
+source $stdenv/setup
+
+dontPatchELF=1 # must keep libXv, $out in RPATH
+
+
+unpackFile() {
+ sh $src -x
+}
+
+
+buildPhase() {
+ if test -z "$libsOnly"; then
+ # Create the module.
+ echo "Building linux driver against kernel: $kernel";
+ cd kernel
+ kernelVersion=$(cd $kernel/lib/modules && ls)
+ sysSrc=$(echo $kernel/lib/modules/$kernelVersion/build/)
+ unset src # used by the nv makefile
+ # Hack necessary to compile on 2.6.28.
+ export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$sysSrc/include/asm/mach-default -I$sysSrc/include/generated"
+ make SYSSRC=$sysSrc module
+ cd ..
+ fi
+}
+
+
+installPhase() {
+
+ # Install libGL and friends.
+ mkdir -p $out/lib/vendors
+
+ for f in \
+ libcuda libGL libnvcuvid libnvidia-cfg libnvidia-compiler \
+ libnvidia-glcore libnvidia-ml libnvidia-opencl \
+ libnvidia-tls libOpenCL libnvidia-tls libvdpau_nvidia
+ do
+ cp -prd $f.* $out/lib/
+ ln -snf $f.so.$versionNumber $out/lib/$f.so
+ ln -snf $f.so.$versionNumber $out/lib/$f.so.1
+ done
+
+ cp -p nvidia.icd $out/lib/vendors/
+ cp -prd tls $out/lib/
+ cp -prd libOpenCL.so.1.0.0 $out/lib/
+ ln -snf libOpenCL.so.1.0.0 $out/lib/libOpenCL.so
+ ln -snf libOpenCL.so.1.0.0 $out/lib/libOpenCL.so.1
+
+ patchelf --set-rpath $out/lib:$glPath $out/lib/libGL.so.*.*
+ patchelf --set-rpath $out/lib:$glPath $out/lib/libvdpau_nvidia.so.*.*
+ patchelf --set-rpath $cudaPath $out/lib/libcuda.so.*.*
+
+ if test -z "$libsOnly"; then
+
+ # Install the kernel module.
+ mkdir -p $out/lib/modules/$kernelVersion/misc
+ cp kernel/nvidia.ko $out/lib/modules/$kernelVersion/misc
+
+ # Install the X driver.
+ mkdir -p $out/lib/xorg/modules
+ cp -p libnvidia-wfb.* $out/lib/xorg/modules/
+ mkdir -p $out/lib/xorg/modules/drivers
+ cp -p nvidia_drv.so $out/lib/xorg/modules/drivers
+ mkdir -p $out/lib/xorg/modules/extensions
+ cp -p libglx.so.* $out/lib/xorg/modules/extensions
+
+ ln -snf libnvidia-wfb.so.$versionNumber $out/lib/xorg/modules/libnvidia-wfb.so.1
+ ln -snf libglx.so.$versionNumber $out/lib/xorg/modules/extensions/libglx.so
+
+ patchelf --set-rpath $out/lib $out/lib/xorg/modules/extensions/libglx.so.*.*
+
+ # Install the programs.
+ mkdir -p $out/bin
+
+ for i in nvidia-settings nvidia-xconfig; do
+ cp $i $out/bin/$i
+ patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
+ --set-rpath $out/lib:$programPath:$glPath $out/bin/$i
+ done
+
+ # Header files etc.
+ mkdir -p $out/include/nvidia
+ cp -p *.h $out/include/nvidia
+
+ mkdir -p $out/share/man/man1
+ cp -p *.1.gz $out/share/man/man1
+
+ mkdir -p $out/share/applications
+ cp -p *.desktop $out/share/applications
+
+ mkdir -p $out/share/pixmaps
+ cp -p nvidia-settings.png $out/share/pixmaps
+
+ # Patch the `nvidia-settings.desktop' file.
+ substituteInPlace $out/share/applications/nvidia-settings.desktop \
+ --replace '__UTILS_PATH__' $out/bin \
+ --replace '__PIXMAP_PATH__' $out/share/pixmaps
+ fi
+}
+
+
+genericBuild
diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh
index ace9d50cdee..c0ba9d88554 100755
--- a/pkgs/os-specific/linux/nvidia-x11/builder.sh
+++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh
@@ -27,28 +27,31 @@ buildPhase() {
installPhase() {
# Install libGL and friends.
- mkdir -p $out/lib
- cp -prd libcuda.* libGL.* libnvidia-cfg.* libnvidia-compiler.* libnvidia-tls.* libnvidia-glcore.* libOpenCL.* libXv* libvdpau_nvidia* tls $out/lib/
-
- ln -snf libnvidia-glcore.so.$versionNumber $out/lib/libnvidia-glcore.so
- ln -snf libnvidia-glcore.so.$versionNumber $out/lib/libnvidia-glcore.so.1
- ln -snf libGL.so.$versionNumber $out/lib/libGL.so
- ln -snf libGL.so.$versionNumber $out/lib/libGL.so.1
- ln -snf libnvidia-cfg.so.$versionNumber $out/lib/libnvidia-cfg.so.1
- ln -snf libnvidia-tls.so.$versionNumber $out/lib/libnvidia-tls.so.1
- ln -snf libnvidia-tls.so.$versionNumber $out/lib/tls/libnvidia-tls.so.1
- ln -snf libXvMCNVIDIA.so.$versionNumber $out/lib/libXvMCNVIDIA_dynamic.so.1
- ln -snf libcuda.so.$versionNumber $out/lib/libcuda.so.1
- ln -snf libcuda.so.1 $out/lib/libcuda.so
- ln -snf libvdpau_nvidia.so.$versionNumber $out/lib/libvdpau_nvidia.so
+ 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
+ do
+ cp -prd $f.* $out/lib/
+ ln -snf $f.so.$versionNumber $out/lib/$f.so
+ ln -snf $f.so.$versionNumber $out/lib/$f.so.1
+ done
+
+ cp -p nvidia.icd $out/lib/vendors/
+ cp -prd tls $out/lib/
+ cp -prd libOpenCL.so.1.0.0 $out/lib/
+ ln -snf libOpenCL.so.1.0.0 $out/lib/libOpenCL.so
+ ln -snf libOpenCL.so.1.0.0 $out/lib/libOpenCL.so.1
patchelf --set-rpath $out/lib:$glPath $out/lib/libGL.so.*.*
- patchelf --set-rpath $out/lib:$glPath $out/lib/libXvMCNVIDIA.so.*.*
patchelf --set-rpath $out/lib:$glPath $out/lib/libvdpau_nvidia.so.*.*
patchelf --set-rpath $cudaPath $out/lib/libcuda.so.*.*
-
+ patchelf --set-rpath $openclPath $out/lib/libnvidia-opencl.so.*.*
+
if test -z "$libsOnly"; then
-
+
# Install the kernel module.
mkdir -p $out/lib/modules/$kernelVersion/misc
cp kernel/nvidia.ko $out/lib/modules/$kernelVersion/misc
@@ -74,7 +77,7 @@ installPhase() {
patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
--set-rpath $out/lib:$programPath:$glPath $out/bin/$i
done
-
+
# Header files etc.
mkdir -p $out/include/nvidia
cp -p *.h $out/include/nvidia
diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index 8714c342f1a..c965ef01c72 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -8,23 +8,25 @@
with stdenv.lib;
-let versionNumber = "304.37"; in
+let versionNumber = "310.32"; in
stdenv.mkDerivation {
name = "nvidia-x11-${versionNumber}${optionalString (!libsOnly) "-${kernel.version}"}";
-
+
builder = ./builder.sh;
-
+
+ patches = [ ./version-test.patch ];
+
src =
if stdenv.system == "i686-linux" then
fetchurl {
url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run";
- sha256 = "0dxka66vp15xgm7z9v6x01gdvyvj3l9c33sa7zyahdxbr6h78cdb";
+ sha256 = "13dc2s312h4k4bp7qb2ymdafr739jxbh0f3h1ilrkyjkd945cgnl";
}
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 = "1xjg91sh7zyn6djdm78wdfas8j7cqn96nyy5zavsnd9jh7v1i0gp";
+ sha256 = "1wk0lcm712glffdmwpk4drrwb0fjva7qhpxylnqs7fl7d3acnsvq";
}
else throw "nvidia-x11 does not support platform ${stdenv.system}";
@@ -38,6 +40,8 @@ stdenv.mkDerivation {
cudaPath = stdenv.lib.makeLibraryPath [zlib stdenv.gcc.gcc];
+ openclPath = stdenv.lib.makeLibraryPath [zlib];
+
programPath = optionalString (!libsOnly) (stdenv.lib.makeLibraryPath
[ gtk atk pango glib gdk_pixbuf xlibs.libXv ] );
diff --git a/pkgs/os-specific/linux/nvidia-x11/generated.patch b/pkgs/os-specific/linux/nvidia-x11/generated.patch
deleted file mode 100644
index 6cf7a93c644..00000000000
--- a/pkgs/os-specific/linux/nvidia-x11/generated.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -pur 173.14.31/conftest.sh 173.14.31-3.3/conftest.sh
---- 173.14.31/conftest.sh 2011-07-18 09:49:58.000000000 +0400
-+++ 173.14.31-3.3/conftest.sh 2012-04-09 19:33:34.407928432 +0400
-@@ -123,7 +123,7 @@ build_cflags() {
- CFLAGS="$BASE_CFLAGS $MACH_CFLAGS $OUTPUT_CFLAGS -I$HEADERS $AUTOCONF_CFLAGS"
-
- if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then
-- CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include"
-+ CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include -I$SOURCES/arch/x86/include/generated"
- fi
- if [ -n "$BUILD_PARAMS" ]; then
- CFLAGS="$CFLAGS -D$BUILD_PARAMS"
diff --git a/pkgs/os-specific/linux/nvidia-x11/legacy173.nix b/pkgs/os-specific/linux/nvidia-x11/legacy173.nix
index 0112270f3bf..90ff989b759 100644
--- a/pkgs/os-specific/linux/nvidia-x11/legacy173.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/legacy173.nix
@@ -2,7 +2,7 @@
let
- versionNumber = "173.14.35";
+ versionNumber = "173.14.36";
in
@@ -15,12 +15,12 @@ stdenv.mkDerivation {
if stdenv.system == "i686-linux" then
fetchurl {
url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}-pkg0.run";
- sha256 = "16kjxj2bn78cgyb4xq39zajjv1hx1z5dw50n9r17w14ifq7i09id";
+ sha256 = "19wnikms9wradf1kmaywnp7hykrdm4xqz2ka7az66s3ma096y95c";
}
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}-pkg0.run";
- sha256 = "0mk7pj7in090dx2v5yzkd7qkaf0qvz3jv4cmpiflpmzmg9p15x8n";
+ sha256 = "1xf1w6qvqw0a3vd807hp3cgqmzm1wkpz2by52p0qgpjqld421k2s";
}
else throw "nvidia-x11 does not support platform ${stdenv.system}";
diff --git a/pkgs/os-specific/linux/nvidia-x11/legacy304.nix b/pkgs/os-specific/linux/nvidia-x11/legacy304.nix
new file mode 100644
index 00000000000..c88eb77c12f
--- /dev/null
+++ b/pkgs/os-specific/linux/nvidia-x11/legacy304.nix
@@ -0,0 +1,51 @@
+{ stdenv, fetchurl, kernel ? null, xlibs, zlib, perl
+, gtk, atk, pango, glib, gdk_pixbuf
+, # Whether to build the libraries only (i.e. not the kernel module or
+ # nvidia-settings). Used to support 32-bit binaries on 64-bit
+ # Linux.
+ libsOnly ? false
+}:
+
+with stdenv.lib;
+
+let versionNumber = "304.64"; in
+
+stdenv.mkDerivation {
+ name = "nvidia-x11-${versionNumber}${optionalString (!libsOnly) "-${kernel.version}"}";
+
+ builder = ./builder-legacy304.sh;
+
+ src =
+ if stdenv.system == "i686-linux" then
+ fetchurl {
+ url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run";
+ sha256 = "0li27nlhx9bbln9424xpxw46sarjdch2fxpn4kvh0npaywll2ii3";
+ }
+ 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 = "1x33f6b9zcsnpjcxlv38l1w0blimsv1y3bbrrzg48wwwb5wvynxl";
+ }
+ else throw "nvidia-x11 does not support platform ${stdenv.system}";
+
+ inherit versionNumber libsOnly;
+
+ kernel = if libsOnly then null else kernel;
+
+ dontStrip = true;
+
+ glPath = stdenv.lib.makeLibraryPath [xlibs.libXext xlibs.libX11 xlibs.libXrandr];
+
+ cudaPath = stdenv.lib.makeLibraryPath [zlib stdenv.gcc.gcc];
+
+ programPath = optionalString (!libsOnly) (stdenv.lib.makeLibraryPath
+ [ gtk atk pango glib gdk_pixbuf xlibs.libXv ] );
+
+ buildInputs = [ perl ];
+
+ meta = {
+ homepage = http://www.nvidia.com/object/unix.html;
+ description = "X.org driver and kernel module for NVIDIA graphics cards";
+ license = "unfree";
+ };
+}
diff --git a/pkgs/os-specific/linux/nvidia-x11/legacy96.nix b/pkgs/os-specific/linux/nvidia-x11/legacy96.nix
index fd27a989c07..8e1fb784ae3 100644
--- a/pkgs/os-specific/linux/nvidia-x11/legacy96.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/legacy96.nix
@@ -2,7 +2,7 @@
let
- versionNumber = "96.43.20";
+ versionNumber = "96.43.23";
in
@@ -15,27 +15,17 @@ stdenv.mkDerivation {
if stdenv.system == "i686-linux" then
fetchurl {
url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}-pkg0.run";
- sha256 = "05vm36jnydp4cfdkfvrvxczd64i3f0pp0yp7dn8y8pklrxi80xxw";
+ sha256 = "0hi10h26l51mknr57zsdg0zaxcqdz1lp3hsz0hi1c1vkpbsavrji";
}
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}-pkg0.run";
- sha256 = "0a8ninp4wyql3xh6z93dzhbacvz7g0h8gs4pg5279a0i6h05wb1w";
+ sha256 = "09vynha40rsxpklj1m0qjfg853ckdpi9g87h06irikh405x57kzp";
}
else throw "nvidia-x11 does not support platform ${stdenv.system}";
inherit versionNumber kernel;
- # Only for kernels 3.4 and over
- # Patches taken from arch linux AUR
- # https://aur.archlinux.org/packages.php?ID=57698
- kpatches = stdenv.lib.optionals (stdenv.lib.strings.versionOlder "3.4" kernel.version)
- [ ./acpixf.patch
- ./generated.patch
- ./patchlevel.patch
- ./switch_to.patch
- ];
-
dontStrip = true;
glPath = stdenv.lib.makeLibraryPath [xlibs.libXext xlibs.libX11 xlibs.libXrandr];
diff --git a/pkgs/os-specific/linux/nvidia-x11/patchlevel.patch b/pkgs/os-specific/linux/nvidia-x11/patchlevel.patch
deleted file mode 100644
index 256922ca966..00000000000
--- a/pkgs/os-specific/linux/nvidia-x11/patchlevel.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-diff -pur 96.43.20-t1/conftest.sh 96.43.20-t2/conftest.sh
---- 96.43.20-t1/conftest.sh 2012-06-16 17:14:47.206589267 +0400
-+++ 96.43.20-t2/conftest.sh 2012-06-16 15:35:45.049203248 +0400
-@@ -1303,10 +1303,14 @@ case "$5" in
- MAKEFILE=$HEADERS/../Makefile
-
- if [ -f $MAKEFILE ]; then
-+ VERSION=$(grep "^VERSION =" $MAKEFILE | cut -d " " -f 3)
- PATCHLEVEL=$(grep "^PATCHLEVEL =" $MAKEFILE | cut -d " " -f 3)
-
-- if [ -z "$PATCHLEVEL" ]; then
-+ if [ -z "$PATCHLEVEL" -o -z "$VERSION" ]; then
- exit 1
-+ elif [ "$VERSION" = '3' ]; then
-+ echo 6
-+ exit 0
- else
- echo $PATCHLEVEL
- exit 0
-@@ -1426,10 +1430,11 @@ case "$5" in
- # kernel older than 2.6.6, that's all we require to
- # build the module.
- #
-+ VERSION=$(grep "^VERSION =" $MAKEFILE | cut -d " " -f 3)
- PATCHLEVEL=$(grep "^PATCHLEVEL =" $MAKEFILE | cut -d " " -f 3)
- SUBLEVEL=$(grep "^SUBLEVEL =" $MAKEFILE | cut -d " " -f 3)
-
-- if [ -n "$PATCHLEVEL" -a $PATCHLEVEL -ge 6 \
-+ if [ "$VERSION" = '2' -a -n "$PATCHLEVEL" -a $PATCHLEVEL -ge 6 \
- -a -n "$SUBLEVEL" -a $SUBLEVEL -le 5 ]; then
- SELECTED_MAKEFILE=Makefile.kbuild
- RET=0
-@@ -1525,11 +1530,12 @@ case "$5" in
- # This source tree is not configured, but includes
- # the top-level Makefile.
- #
-+ VERSION=$(grep "^VERSION =" $MAKEFILE | cut -d " " -f 3)
- PATCHLEVEL=$(grep "^PATCHLEVEL =" $MAKEFILE | cut -d " " -f 3)
- SUBLEVEL=$(grep "^SUBLEVEL =" $MAKEFILE | cut -d " " -f 3)
-
-- if [ -n "$PATCHLEVEL" -a -n "$SUBLEVEL" ]; then
-- echo 2.$PATCHLEVEL.$SUBLEVEL
-+ if [ -n "$VERSION" -a -n "$PATCHLEVEL" -a -n "$SUBLEVEL" ]; then
-+ echo $VERSION.$PATCHLEVEL.$SUBLEVEL
- RET=0
- fi
- fi
-diff -pur 96.43.20-t1/Makefile.kbuild 96.43.20-t2/Makefile.kbuild
---- 96.43.20-t1/Makefile.kbuild 2011-07-18 10:51:11.000000000 +0400
-+++ 96.43.20-t2/Makefile.kbuild 2012-06-16 17:08:11.694605133 +0400
-@@ -132,7 +132,7 @@ MODULE_ROOT := /lib/modules/$(KERNEL_UNA
- #
-
- TOPDIR ?= $(KERNEL_SOURCES)
--PATCHLEVEL ?= $(shell $(CONFTEST) kernel_patch_level)
-+PATCHLEVEL := $(shell $(CONFTEST) kernel_patch_level)
-
- #
- # Linux 2.4 uses the .o module extension. Linux 2.6, however, uses the .ko
diff --git a/pkgs/os-specific/linux/nvidia-x11/switch_to.patch b/pkgs/os-specific/linux/nvidia-x11/switch_to.patch
deleted file mode 100644
index 51ffa7f83f1..00000000000
--- a/pkgs/os-specific/linux/nvidia-x11/switch_to.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -pur 173.14.31-3.3/conftest.sh 173.14.31-3.4/conftest.sh
---- 173.14.31-3.3/conftest.sh 2012-04-09 19:33:34.407928432 +0400
-+++ 173.14.31-3.4/conftest.sh 2012-04-10 19:50:36.052346728 +0400
-@@ -465,7 +465,7 @@ compile_test() {
- # and if it as an 'event' member.
- #
- echo "$CONFTEST_PREAMBLE
-- #include
-+ #include
- #include
- void conftest_pm_message_t(pm_message_t state) {
- pm_message_t *p = &state;
-diff -pur 173.14.31-3.3/nv-linux.h 173.14.31-3.4/nv-linux.h
---- 173.14.31-3.3/nv-linux.h 2011-07-18 09:49:58.000000000 +0400
-+++ 173.14.31-3.4/nv-linux.h 2012-04-10 19:53:04.853776013 +0400
-@@ -92,7 +92,7 @@
- #include
-
- #include /* do_div() */
--#include /* cli, sli, save_flags */
-+#include /* cli, sli, save_flags */
- #include /* ioremap, virt_to_phys */
- #include /* access_ok */
- #include /* PAGE_OFFSET */
diff --git a/pkgs/os-specific/linux/nvidia-x11/version-test.patch b/pkgs/os-specific/linux/nvidia-x11/version-test.patch
new file mode 100644
index 00000000000..9b6908ee5c0
--- /dev/null
+++ b/pkgs/os-specific/linux/nvidia-x11/version-test.patch
@@ -0,0 +1,19 @@
+diff -Naur NVIDIA-Linux-x86_64-310.32-no-compat32/kernel/conftest.sh NVIDIA-patched/kernel/conftest.sh
+--- NVIDIA-Linux-x86_64-310.32-no-compat32/kernel/conftest.sh 2013-01-14 18:11:17.000000000 -0430
++++ NVIDIA-patched/kernel/conftest.sh 2013-02-05 14:44:50.757999124 -0430
+@@ -1699,11 +1699,13 @@
+ # kernel older than 2.6.6, that's all we require to
+ # build the module.
+ #
++ VERSION=$(grep "^VERSION =" $MAKEFILE | cut -d " " -f 3)
+ PATCHLEVEL=$(grep "^PATCHLEVEL =" $MAKEFILE | cut -d " " -f 3)
+ SUBLEVEL=$(grep "^SUBLEVEL =" $MAKEFILE | cut -d " " -f 3)
+
+- if [ -n "$PATCHLEVEL" -a $PATCHLEVEL -ge 6 \
+- -a -n "$SUBLEVEL" -a $SUBLEVEL -le 5 ]; then
++ if [ -n "$VERSION" -a -n "$PATCHLEVEL" -a -n "$SUBLEVEL" \
++ -a "$VERSION" -ge 3 -o "$VERSION" -eq 2 -a "$PATCHLEVEL" -ge 7 \
++ -o "$PATCHLEVEL" -eq 6 -a "$SUBLEVEL" -ge 6 ]; then
+ SELECTED_MAKEFILE=Makefile.kbuild
+ RET=0
+ fi
diff --git a/pkgs/os-specific/linux/ov511/default.nix b/pkgs/os-specific/linux/ov511/default.nix
deleted file mode 100644
index 628261e6c5f..00000000000
--- a/pkgs/os-specific/linux/ov511/default.nix
+++ /dev/null
@@ -1 +0,0 @@
-import ./ov511-2.30-default.nix
diff --git a/pkgs/os-specific/linux/ov511/ov511-2.30-builder.sh b/pkgs/os-specific/linux/ov511/ov511-2.30-builder.sh
deleted file mode 100644
index 21a2ac725ca..00000000000
--- a/pkgs/os-specific/linux/ov511/ov511-2.30-builder.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-source $stdenv/setup
-
-hashname=$(basename $kernel)
-echo $hashname
-if echo "$hashname" | grep -q '^[a-z0-9]\{32\}-'; then
- hashname=$(echo "$hashname" | cut -c -32)
-fi
-
-stripHash $kernel
-version=$(echo $strippedName | cut -c 7-)-$hashname
-
-echo "version $version"
-
-export version
-
-mkdir -p $out/lib/modules/$version/kernel/drivers/usb/media/
-
-genericBuild
diff --git a/pkgs/os-specific/linux/ov511/ov511-2.30-default.nix b/pkgs/os-specific/linux/ov511/ov511-2.30-default.nix
deleted file mode 100644
index 4b2cd1ed5b2..00000000000
--- a/pkgs/os-specific/linux/ov511/ov511-2.30-default.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{stdenv, fetchurl, kernel}:
-
-stdenv.mkDerivation {
- name = "ov511-2.30";
- builder = ./ov511-2.30-builder.sh;
- src = fetchurl {
- url = http://nixos.org/tarballs/ov511-2.30.tar.bz2;
- md5 = "9eacf9e54f2f54a59ddbf14221a53f2a";
- };
- patches = [./ov511-kernel.patch ./ov511-2.32-kdir.patch];
- inherit kernel;
- NIX_GLIBC_FLAGS_SET=1;
-}
diff --git a/pkgs/os-specific/linux/ov511/ov511-2.32-builder.sh b/pkgs/os-specific/linux/ov511/ov511-2.32-builder.sh
deleted file mode 100644
index 636b19a95af..00000000000
--- a/pkgs/os-specific/linux/ov511/ov511-2.32-builder.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-source $stdenv/setup
-
-hashname=$(basename $kernel)
-echo $hashname
-if echo "$hashname" | grep -q '^[a-z0-9]\{32\}-'; then
- hashname=$(echo "$hashname" | cut -c -32)
-fi
-
-stripHash $kernel
-version=$(echo $strippedName | cut -c 7-)-$hashname
-
-echo "version $version"
-
-export version
-
-mkdir -p $out/lib/modules/$version/kernel/drivers/usb/media/
-
-genericBuild
-
-echo "b0rken"
-
-exit 1
diff --git a/pkgs/os-specific/linux/ov511/ov511-2.32-default.nix b/pkgs/os-specific/linux/ov511/ov511-2.32-default.nix
deleted file mode 100644
index 6af69d882db..00000000000
--- a/pkgs/os-specific/linux/ov511/ov511-2.32-default.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{stdenv, fetchurl, kernel}:
-
-stdenv.mkDerivation {
- name = "ov511-2.32";
- builder = ./ov511-2.32-builder.sh;
- src = fetchurl {
- url = http://www.ovcam.org/ov511/download/2.xx/distros/ov511-2.32.tar.bz2;
- md5 = "6a08025311649356242761641a1df0f2";
- };
- patches = [./ov511-kernel.patch ./ov511-2.32.patch ./ov511-2.32-kdir.patch];
- inherit kernel;
- NIX_GLIBC_FLAGS_SET=1;
-}
diff --git a/pkgs/os-specific/linux/ov511/ov511-2.32-kdir.patch b/pkgs/os-specific/linux/ov511/ov511-2.32-kdir.patch
deleted file mode 100644
index e0a1175a7ff..00000000000
--- a/pkgs/os-specific/linux/ov511/ov511-2.32-kdir.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -rc ov511-2.32/Makefile ov511-2.32.new/Makefile
-*** ov511-2.32/Makefile 2006-03-28 17:47:31.000000000 +0200
---- ov511-2.32.new/Makefile 2006-07-17 09:46:17.000000000 +0200
-***************
-*** 114,120 ****
-
- else # We were called from command line
-
-! KDIR := /lib/modules/$(shell uname -r)/build
- PWD := $(shell pwd)
-
- default:
---- 114,120 ----
-
- else # We were called from command line
-
-! KDIR := $(kernel)/lib/modules/$(version)/build
- PWD := $(shell pwd)
-
- default:
diff --git a/pkgs/os-specific/linux/ov511/ov511-2.32.patch b/pkgs/os-specific/linux/ov511/ov511-2.32.patch
deleted file mode 100644
index 55e78afaeaa..00000000000
--- a/pkgs/os-specific/linux/ov511/ov511-2.32.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -rc ov511-2.32/tuner.c ov511-2.32.new/tuner.c
-*** ov511-2.32/tuner.c Mon Apr 3 15:16:27 2006
---- ov511-2.32.new/tuner.c Mon Jul 17 00:26:57 2006
-***************
-*** 1029,1035 ****
- static struct i2c_client client_template =
- {
- .name = "(tuner unset)",
-- .flags = I2C_CLIENT_ALLOW_USE,
- .driver = &driver,
- };
-
---- 1029,1034 ----
diff --git a/pkgs/os-specific/linux/ov511/ov511-kernel.patch b/pkgs/os-specific/linux/ov511/ov511-kernel.patch
deleted file mode 100644
index eca39e90fce..00000000000
--- a/pkgs/os-specific/linux/ov511/ov511-kernel.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -rc ov511-2.32/do_install.sh ov511-2.32.new/do_install.sh
-*** ov511-2.32/do_install.sh 2003-11-12 09:24:29.000000000 +0100
---- ov511-2.32.new/do_install.sh 2006-07-16 19:44:56.000000000 +0200
-***************
-*** 8,15 ****
-
- UNAME=`uname -r`
-
-! INSTALL_PATH_2_4=/lib/modules/$UNAME/kernel/drivers/usb/
-! INSTALL_PATH_2_6=/lib/modules/$UNAME/kernel/drivers/usb/media/
-
- MAJMIN=`echo $UNAME | cut -d . -f 1-2`
-
---- 8,15 ----
-
- UNAME=`uname -r`
-
-! INSTALL_PATH_2_4=$out/lib/modules/$version/kernel/drivers/usb/
-! INSTALL_PATH_2_6=$out/lib/modules/$version/kernel/drivers/usb/media/
-
- MAJMIN=`echo $UNAME | cut -d . -f 1-2`
-
-***************
-*** 35,41 ****
- install $MODULE $INSTALL_PATH
- done
-
-! echo Finding module dependencies
-! /sbin/depmod -ae
-
- echo All done!
---- 35,41 ----
- install $MODULE $INSTALL_PATH
- done
-
-! #echo Finding module dependencies
-! #/sbin/depmod -ae
-
- echo All done!
diff --git a/pkgs/os-specific/linux/pam/default.nix b/pkgs/os-specific/linux/pam/default.nix
index c18ea2b1f2b..43300425c00 100644
--- a/pkgs/os-specific/linux/pam/default.nix
+++ b/pkgs/os-specific/linux/pam/default.nix
@@ -1,24 +1,21 @@
-{ stdenv, fetchurl, flex, cracklib, libxcrypt }:
+{ stdenv, fetchurl, flex, cracklib }:
stdenv.mkDerivation rec {
- name = "linux-pam-1.1.1";
+ name = "linux-pam-1.1.6";
src = fetchurl {
- url = mirror://kernel/linux/libs/pam/library/Linux-PAM-1.1.1.tar.bz2;
- sha256 = "015r3xdkjpqwcv4lvxavq0nybdpxhfjycqpzbx8agqd5sywkx3b0";
+ url = https://fedorahosted.org/releases/l/i/linux-pam/Linux-PAM-1.1.6.tar.bz2;
+ sha256 = "1hlz2kqvbjisvwyicdincq7nz897b9rrafyzccwzqiqg53b8gf5s";
};
- buildNativeInputs = [ flex ];
- buildInputs = [ cracklib ]
- ++ stdenv.lib.optional
- (!stdenv.isArm && stdenv.system != "mips64el-linux")
- libxcrypt;
+ nativeBuildInputs = [ flex ];
+
+ buildInputs = [ cracklib ];
crossAttrs = {
- # Skip libxcrypt cross-building, as it fails for mips and arm
- propagatedBuildInputs = [ flex.hostDrv cracklib.hostDrv ];
+ propagatedBuildInputs = [ flex.crossDrv cracklib.crossDrv ];
preConfigure = preConfigure + ''
- ar x ${flex.hostDrv}/lib/libfl.a
+ ar x ${flex.crossDrv}/lib/libfl.a
mv libyywrap.o libyywrap-target.o
ar x ${flex}/lib/libfl.a
mv libyywrap.o libyywrap-host.o
@@ -27,13 +24,13 @@ stdenv.mkDerivation rec {
'';
postConfigure = ''
sed -e "s@ $PWD/libyywrap-target.o@ $PWD/libyywrap-host.o@" -i doc/specs/Makefile
- '';
+ '';
};
postInstall = ''
mv -v $out/sbin/unix_chkpwd{,.orig}
ln -sv /var/setuid-wrappers/unix_chkpwd $out/sbin/unix_chkpwd
- '';
+ '';
preConfigure = ''
configureFlags="$configureFlags --includedir=$out/include/security"
diff --git a/pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix b/pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix
index 34600870671..eae62c9e197 100644
--- a/pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix
+++ b/pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix
@@ -1,15 +1,23 @@
{ stdenv, fetchurl, pam, openssl, perl }:
stdenv.mkDerivation rec {
- name = "pam_ssh_agent_auth-0.9.3";
+ name = "pam_ssh_agent_auth-0.9.4";
src = fetchurl {
url = "mirror://sourceforge/pamsshagentauth/${name}.tar.bz2";
- sha256 = "19p5mzplnr9g9vlp16nipf5rjw4v8zncvimarwgix958yml7j08h";
+ sha256 = "1a8cv223f30mvkxnyh9hk6kya0ynkwwkc5nhlz3rcqhxfw0fcva9";
};
+ patches =
+ [ # Allow multiple colon-separated authorized keys files to be
+ # specified in the file= option.
+ ./multiple-key-files.patch
+ ];
+
buildInputs = [ pam openssl perl ];
+ enableParallelBuilding = true;
+
meta = {
homepage = http://pamsshagentauth.sourceforge.net/;
description = "PAM module for authentication through the SSH agent";
diff --git a/pkgs/os-specific/linux/pam_ssh_agent_auth/multiple-key-files.patch b/pkgs/os-specific/linux/pam_ssh_agent_auth/multiple-key-files.patch
new file mode 100644
index 00000000000..dc97b7d54f7
--- /dev/null
+++ b/pkgs/os-specific/linux/pam_ssh_agent_auth/multiple-key-files.patch
@@ -0,0 +1,338 @@
+diff -ru -x '*~' pam_ssh_agent_auth-0.9.4-orig/iterate_ssh_agent_keys.c pam_ssh_agent_auth-0.9.4/iterate_ssh_agent_keys.c
+--- pam_ssh_agent_auth-0.9.4-orig/iterate_ssh_agent_keys.c 2012-06-28 01:47:49.000000000 +0000
++++ pam_ssh_agent_auth-0.9.4/iterate_ssh_agent_keys.c 2012-12-17 19:29:16.014226336 +0000
+@@ -69,14 +69,14 @@
+ return cookie;
+ }
+
+-int
++const char *
+ pamsshagentauth_find_authorized_keys(uid_t uid)
+ {
+ Identity *id;
+ Key *key;
+ AuthenticationConnection *ac;
+ char *comment;
+- uint8_t retval = 0;
++ const char *key_file = 0;
+
+ OpenSSL_add_all_digests();
+ session_id2 = pamsshagentauth_session_id2_gen();
+@@ -90,13 +90,11 @@
+ id->key = key;
+ id->filename = comment;
+ id->ac = ac;
+- if(userauth_pubkey_from_id(id)) {
+- retval = 1;
+- }
++ key_file = userauth_pubkey_from_id(id);
+ pamsshagentauth_xfree(id->filename);
+ pamsshagentauth_key_free(id->key);
+ pamsshagentauth_xfree(id);
+- if(retval == 1)
++ if(key_file)
+ break;
+ }
+ }
+@@ -107,5 +105,5 @@
+ }
+ pamsshagentauth_xfree(session_id2);
+ EVP_cleanup();
+- return retval;
++ return key_file;
+ }
+diff -ru -x '*~' pam_ssh_agent_auth-0.9.4-orig/iterate_ssh_agent_keys.h pam_ssh_agent_auth-0.9.4/iterate_ssh_agent_keys.h
+--- pam_ssh_agent_auth-0.9.4-orig/iterate_ssh_agent_keys.h 2012-06-28 01:47:49.000000000 +0000
++++ pam_ssh_agent_auth-0.9.4/iterate_ssh_agent_keys.h 2012-12-17 19:28:57.454334806 +0000
+@@ -31,6 +31,6 @@
+ #ifndef _ITERATE_SSH_AGENT_KEYS_H
+ #define _ITERATE_SSH_AGENT_KEYS_H
+
+-int pamsshagentauth_find_authorized_keys(uid_t);
++const char * pamsshagentauth_find_authorized_keys(uid_t);
+
+ #endif
+diff -ru -x '*~' pam_ssh_agent_auth-0.9.4-orig/pam_ssh_agent_auth.c pam_ssh_agent_auth-0.9.4/pam_ssh_agent_auth.c
+--- pam_ssh_agent_auth-0.9.4-orig/pam_ssh_agent_auth.c 2012-06-28 01:47:49.000000000 +0000
++++ pam_ssh_agent_auth-0.9.4/pam_ssh_agent_auth.c 2012-12-17 19:30:24.013830673 +0000
+@@ -60,7 +60,6 @@
+
+ #define strncasecmp_literal(A,B) strncasecmp( A, B, sizeof(B) - 1)
+
+-char *authorized_keys_file = NULL;
+ uint8_t allow_user_owned_authorized_keys_file = 0;
+
+ #if ! HAVE___PROGNAME || HAVE_BUNDLE
+@@ -161,15 +160,13 @@
+ goto cleanexit;
+ }
+
+- if(authorized_keys_file_input && user) {
+- /*
+- * user is the name of the target-user, and so must be used for validating the authorized_keys file
+- */
+- parse_authorized_key_file(user, authorized_keys_file_input);
+- } else {
+- pamsshagentauth_verbose("Using default file=/etc/security/authorized_keys");
+- authorized_keys_file = pamsshagentauth_xstrdup("/etc/security/authorized_keys");
+- }
++ if (!authorized_keys_file_input || !user)
++ authorized_keys_file_input = "/etc/security/authorized_keys";
++
++ /*
++ * user is the name of the target-user, and so must be used for validating the authorized_keys file
++ */
++ parse_authorized_key_files(user, authorized_keys_file_input);
+
+ /*
+ * PAM_USER and PAM_RUSER do not necessarily have to get set by the calling application, and we may be unable to divine the latter.
+@@ -177,16 +174,17 @@
+ */
+
+ if(user && strlen(ruser) > 0) {
+- pamsshagentauth_verbose("Attempting authentication: `%s' as `%s' using %s", ruser, user, authorized_keys_file);
++ pamsshagentauth_verbose("Attempting authentication: `%s' as `%s' using %s", ruser, user, authorized_keys_file_input);
+
+ /*
+ * this pw_uid is used to validate the SSH_AUTH_SOCK, and so must be the uid of the ruser invoking the program, not the target-user
+ */
+- if(pamsshagentauth_find_authorized_keys(getpwnam(ruser)->pw_uid)) {
+- pamsshagentauth_logit("Authenticated: `%s' as `%s' using %s", ruser, user, authorized_keys_file);
++ const char *key_file;
++ if((key_file = pamsshagentauth_find_authorized_keys(getpwnam(ruser)->pw_uid))) {
++ pamsshagentauth_logit("Authenticated: `%s' as `%s' using %s", ruser, user, key_file);
+ retval = PAM_SUCCESS;
+ } else {
+- pamsshagentauth_logit("Failed Authentication: `%s' as `%s' using %s", ruser, user, authorized_keys_file);
++ pamsshagentauth_logit("Failed Authentication: `%s' as `%s' using %s", ruser, user, authorized_keys_file_input);
+ }
+ } else {
+ pamsshagentauth_logit("No %s specified, cannot continue with this form of authentication", (user) ? "ruser" : "user" );
+@@ -198,7 +196,7 @@
+ free(__progname);
+ #endif
+
+- free(authorized_keys_file);
++ free_authorized_key_files();
+
+ return retval;
+ }
+diff -ru -x '*~' pam_ssh_agent_auth-0.9.4-orig/pam_ssh_agent_auth.pod pam_ssh_agent_auth-0.9.4/pam_ssh_agent_auth.pod
+--- pam_ssh_agent_auth-0.9.4-orig/pam_ssh_agent_auth.pod 2012-06-28 01:47:49.000000000 +0000
++++ pam_ssh_agent_auth-0.9.4/pam_ssh_agent_auth.pod 2012-12-17 19:52:35.968965448 +0000
+@@ -26,7 +26,7 @@
+
+ =item file=
+
+-Specify the path to the authorized_keys file(s) you would like to use for authentication. Subject to tilde and % EXPANSIONS (below)
++Specify the path(s) to the authorized_keys file(s) you would like to use for authentication. Subject to tilde and % EXPANSIONS (below). Paths are separated using colons.
+
+ =item allow_user_owned_authorized_keys_file
+
+diff -ru -x '*~' pam_ssh_agent_auth-0.9.4-orig/pam_user_authorized_keys.c pam_ssh_agent_auth-0.9.4/pam_user_authorized_keys.c
+--- pam_ssh_agent_auth-0.9.4-orig/pam_user_authorized_keys.c 2012-06-28 01:47:49.000000000 +0000
++++ pam_ssh_agent_auth-0.9.4/pam_user_authorized_keys.c 2012-12-17 19:32:20.830157313 +0000
+@@ -79,66 +79,96 @@
+
+ #include "identity.h"
+ #include "pam_user_key_allowed2.h"
++#include "pam_user_authorized_keys.h"
+
+-extern char *authorized_keys_file;
++#define MAX_AUTHORIZED_KEY_FILES 16
++
++char *authorized_keys_files[MAX_AUTHORIZED_KEY_FILES];
++unsigned int nr_authorized_keys_files = 0;
+ extern uint8_t allow_user_owned_authorized_keys_file;
+ uid_t authorized_keys_file_allowed_owner_uid;
+
+ void
+-parse_authorized_key_file(const char *user, const char *authorized_keys_file_input)
++parse_authorized_key_files(const char *user, const char *authorized_keys_file_input)
+ {
+- char fqdn[HOST_NAME_MAX] = "";
++ const char *pos = authorized_keys_file_input;
+ char hostname[HOST_NAME_MAX] = "";
+- char auth_keys_file_buf[4096] = "";
+- char *slash_ptr = NULL;
+- char owner_uname[128] = "";
+- size_t owner_uname_len = 0;
+-
+- /*
+- * temporary copy, so that both tilde expansion and percent expansion both get to apply to the path
+- */
+- strncat(auth_keys_file_buf, authorized_keys_file_input, sizeof(auth_keys_file_buf) - 1);
++ char fqdn[HOST_NAME_MAX] = "";
++
++#if HAVE_GETHOSTNAME
++ *hostname = '\0';
++ gethostname(fqdn, HOST_NAME_MAX);
++ strncat(hostname, fqdn, strcspn(fqdn,"."));
++#endif
+
+- if(allow_user_owned_authorized_keys_file)
+- authorized_keys_file_allowed_owner_uid = getpwnam(user)->pw_uid;
++ while (pos) {
++ const char *colon = strchr(pos, ':');
++ char auth_keys_file_buf[4096] = "";
++ char *slash_ptr = NULL;
++ char owner_uname[128] = "";
++ size_t owner_uname_len = 0;
++
++ strncat(auth_keys_file_buf, pos, sizeof(auth_keys_file_buf) - 1);
++ if (colon) {
++ auth_keys_file_buf[colon - pos] = 0;
++ pos = colon + 1;
++ } else {
++ pos = 0;
++ }
+
+- if(*auth_keys_file_buf == '~') {
+- if(*(auth_keys_file_buf+1) == '/') {
++ if(allow_user_owned_authorized_keys_file)
+ authorized_keys_file_allowed_owner_uid = getpwnam(user)->pw_uid;
++
++ if(*auth_keys_file_buf == '~') {
++ if(*(auth_keys_file_buf+1) == '/') {
++ authorized_keys_file_allowed_owner_uid = getpwnam(user)->pw_uid;
++ }
++ else {
++ slash_ptr = strchr(auth_keys_file_buf,'/');
++ if(!slash_ptr)
++ pamsshagentauth_fatal("cannot expand tilde in path without a `/'");
++
++ owner_uname_len = slash_ptr - auth_keys_file_buf - 1;
++ if(owner_uname_len > (sizeof(owner_uname) - 1) )
++ pamsshagentauth_fatal("Username too long");
++
++ strncat(owner_uname, auth_keys_file_buf + 1, owner_uname_len);
++ if(!authorized_keys_file_allowed_owner_uid)
++ authorized_keys_file_allowed_owner_uid = getpwnam(owner_uname)->pw_uid;
++ }
++ char *tmp = pamsshagentauth_tilde_expand_filename(auth_keys_file_buf, authorized_keys_file_allowed_owner_uid);
++ strncpy(auth_keys_file_buf, tmp, sizeof(auth_keys_file_buf) - 1 );
++ pamsshagentauth_xfree(tmp);
+ }
+- else {
+- slash_ptr = strchr(auth_keys_file_buf,'/');
+- if(!slash_ptr)
+- pamsshagentauth_fatal("cannot expand tilde in path without a `/'");
+-
+- owner_uname_len = slash_ptr - auth_keys_file_buf - 1;
+- if(owner_uname_len > (sizeof(owner_uname) - 1) )
+- pamsshagentauth_fatal("Username too long");
+-
+- strncat(owner_uname, auth_keys_file_buf + 1, owner_uname_len);
+- if(!authorized_keys_file_allowed_owner_uid)
+- authorized_keys_file_allowed_owner_uid = getpwnam(owner_uname)->pw_uid;
++
++ if(strstr(auth_keys_file_buf, "%h")) {
++ authorized_keys_file_allowed_owner_uid = getpwnam(user)->pw_uid;
+ }
+- authorized_keys_file = pamsshagentauth_tilde_expand_filename(auth_keys_file_buf, authorized_keys_file_allowed_owner_uid);
+- strncpy(auth_keys_file_buf, authorized_keys_file, sizeof(auth_keys_file_buf) - 1 );
+- pamsshagentauth_xfree(authorized_keys_file) /* when we percent_expand later, we'd step on this, so free it immediately */;
+- }
+
+- if(strstr(auth_keys_file_buf, "%h")) {
+- authorized_keys_file_allowed_owner_uid = getpwnam(user)->pw_uid;
++ if (nr_authorized_keys_files >= MAX_AUTHORIZED_KEY_FILES)
++ pamsshagentauth_fatal("Too many authorized key files");
++ authorized_keys_files[nr_authorized_keys_files++] =
++ pamsshagentauth_percent_expand(auth_keys_file_buf, "h", getpwnam(user)->pw_dir, "H", hostname, "f", fqdn, "u", user, NULL);
+ }
++}
+
+-#if HAVE_GETHOSTNAME
+- *hostname = '\0';
+- gethostname(fqdn, HOST_NAME_MAX);
+- strncat(hostname, fqdn, strcspn(fqdn,"."));
+-#endif
+- authorized_keys_file = pamsshagentauth_percent_expand(auth_keys_file_buf, "h", getpwnam(user)->pw_dir, "H", hostname, "f", fqdn, "u", user, NULL);
++void
++free_authorized_key_files()
++{
++ unsigned int n;
++ for (n = 0; n < nr_authorized_keys_files; n++)
++ free(authorized_keys_files[n]);
++ nr_authorized_keys_files = 0;
+ }
+
+-int
++const char *
+ pam_user_key_allowed(Key * key)
+ {
+- return pam_user_key_allowed2(getpwuid(authorized_keys_file_allowed_owner_uid), key, authorized_keys_file)
+- || pam_user_key_allowed2(getpwuid(0), key, authorized_keys_file);
++ unsigned int n;
++ for (n = 0; n < nr_authorized_keys_files; n++) {
++ if (pam_user_key_allowed2(getpwuid(authorized_keys_file_allowed_owner_uid), key, authorized_keys_files[n])
++ || pam_user_key_allowed2(getpwuid(0), key, authorized_keys_files[n]))
++ return authorized_keys_files[n];
++ }
++ return 0;
+ }
+diff -ru -x '*~' pam_ssh_agent_auth-0.9.4-orig/pam_user_authorized_keys.h pam_ssh_agent_auth-0.9.4/pam_user_authorized_keys.h
+--- pam_ssh_agent_auth-0.9.4-orig/pam_user_authorized_keys.h 2010-01-13 02:17:01.000000000 +0000
++++ pam_ssh_agent_auth-0.9.4/pam_user_authorized_keys.h 2012-12-17 19:24:34.477894517 +0000
+@@ -28,11 +28,12 @@
+ */
+
+
+-#ifndef _PAM_USER_KEY_ALLOWED_H
+-#define _PAM_USER_KEY_ALLOWED_H
++#ifndef _PAM_USER_AUTHORIZED_KEYS_H
++#define _PAM_USER_AUTHORIZED_KEYS_H
+
+ #include "identity.h"
+-int pam_user_key_allowed(Key *);
+-void parse_authorized_key_file(const char *, const char *);
++const char * pam_user_key_allowed(Key *);
++void parse_authorized_key_files(const char *, const char *);
++void free_authorized_key_files();
+
+ #endif
+diff -ru -x '*~' pam_ssh_agent_auth-0.9.4-orig/userauth_pubkey_from_id.c pam_ssh_agent_auth-0.9.4/userauth_pubkey_from_id.c
+--- pam_ssh_agent_auth-0.9.4-orig/userauth_pubkey_from_id.c 2012-06-28 01:47:49.000000000 +0000
++++ pam_ssh_agent_auth-0.9.4/userauth_pubkey_from_id.c 2012-12-17 19:27:30.813843933 +0000
+@@ -51,7 +51,7 @@
+ extern u_char *session_id2;
+ extern uint8_t session_id_len;
+
+-int
++const char *
+ userauth_pubkey_from_id(Identity * id)
+ {
+ Buffer b = { 0 };
+@@ -59,11 +59,12 @@
+ u_char *pkblob = NULL, *sig = NULL;
+ u_int blen = 0, slen = 0;
+ int authenticated = 0;
++ const char *key_file;
+
+ pkalg = (char *) key_ssh_name(id->key);
+
+ /* first test if this key is even allowed */
+- if(! pam_user_key_allowed(id->key))
++ if(!(key_file = pam_user_key_allowed(id->key)))
+ goto user_auth_clean_exit;
+
+ if(pamsshagentauth_key_to_blob(id->key, &pkblob, &blen) == 0)
+@@ -96,5 +97,5 @@
+ if(pkblob != NULL)
+ pamsshagentauth_xfree(pkblob);
+ CRYPTO_cleanup_all_ex_data();
+- return authenticated;
++ return authenticated ? key_file : 0;
+ }
+diff -ru -x '*~' pam_ssh_agent_auth-0.9.4-orig/userauth_pubkey_from_id.h pam_ssh_agent_auth-0.9.4/userauth_pubkey_from_id.h
+--- pam_ssh_agent_auth-0.9.4-orig/userauth_pubkey_from_id.h 2010-01-13 02:17:01.000000000 +0000
++++ pam_ssh_agent_auth-0.9.4/userauth_pubkey_from_id.h 2012-12-17 19:25:54.893412987 +0000
+@@ -32,6 +32,6 @@
+ #define _USERAUTH_PUBKEY_FROM_ID_H
+
+ #include
+-int userauth_pubkey_from_id(Identity *);
++const char * userauth_pubkey_from_id(Identity *);
+
+ #endif
diff --git a/pkgs/os-specific/linux/pam_unix2/default.nix b/pkgs/os-specific/linux/pam_unix2/default.nix
deleted file mode 100644
index c2eec4a2e4b..00000000000
--- a/pkgs/os-specific/linux/pam_unix2/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ stdenv, fetchurl, pam, libxcrypt }:
-
-stdenv.mkDerivation {
- name = "pam_unix2-2.6";
-
- src = fetchurl {
- url = ftp://ftp.suse.com/pub/people/kukuk/pam/pam_unix2/pam_unix2-2.6.tar.bz2;
- sha256 = "067xnyd3q8ik73glxwyx1lydk4bgl78lzq44mnqqp4jrpnpd04ml";
- };
-
- buildInputs = [ pam ] ++ stdenv.lib.optional (!stdenv.isArm) libxcrypt;
-
- meta = {
- homepage = ftp://ftp.suse.com/pub/people/kukuk/pam/pam_unix2;
- };
-}
diff --git a/pkgs/os-specific/linux/pm-utils/default.nix b/pkgs/os-specific/linux/pm-utils/default.nix
index f20cadabc53..e3b6168be9b 100644
--- a/pkgs/os-specific/linux/pm-utils/default.nix
+++ b/pkgs/os-specific/linux/pm-utils/default.nix
@@ -8,8 +8,8 @@ let
sbinPath = stdenv.lib.makeSearchPath "sbin"
[ procps ];
-
-in
+
+in
stdenv.mkDerivation rec {
name = "pm-utils-1.4.1";
@@ -30,15 +30,26 @@ stdenv.mkDerivation rec {
substituteInPlace pm/pm-functions.in --replace '/sbin:/usr/sbin:/bin:/usr/bin' '$PATH:${binPath}:${sbinPath}'
substituteInPlace src/pm-action.in --replace 'tr ' '${coreutils}/bin/tr '
-
+
substituteInPlace pm/sleep.d/00logging --replace /bin/uname "$(type -P uname)"
substituteInPlace pm/sleep.d/90clock --replace /sbin/hwclock hwclock
'';
+ postInstall =
+ ''
+ # Remove some hooks that have doubtful usefulness. See
+ # http://zinc.canonical.com/~cking/power-benchmarking/pm-utils-results/results.txt.
+ # In particular, journal-commit breaks things if you have
+ # read-only bind mounts, since it ends up remounting the
+ # underlying filesystem read-only.
+ rm $out/lib/pm-utils/power.d/{journal-commit,readahead}
+ '';
+
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";
+ platforms = stdenv.lib.platforms.linux;
};
}
diff --git a/pkgs/os-specific/linux/pmtools/default.nix b/pkgs/os-specific/linux/pmtools/default.nix
new file mode 100644
index 00000000000..13a6e87319e
--- /dev/null
+++ b/pkgs/os-specific/linux/pmtools/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+ name = "pmtools-20071116";
+
+ src = fetchurl {
+ url = "http://www.lesswatts.org/patches/linux_acpi/${name}.tar.gz";
+ sha256 = "91751774976e39f6237efd0326eb35196a9346220b92ad35894a33283e872748";
+ };
+
+ installPhase = ''
+ mkdir -p $out/bin $out/share/pmtools
+ cp acpidump/acpidump acpixtract/acpixtract madt/madt $out/bin/
+ cp README $out/share/pmtools/
+ '';
+
+ meta = {
+ homepage = http://www.lesswatts.org/projects/acpi/utilities.php;
+ description = "Linux ACPI utilities";
+ license = "GPLv2";
+
+ platforms = stdenv.lib.platforms.linux;
+ maintainers = [ stdenv.lib.maintainers.simons ];
+ };
+}
diff --git a/pkgs/os-specific/linux/powertop/default.nix b/pkgs/os-specific/linux/powertop/default.nix
index d175c5f0478..4de8ad6db0f 100644
--- a/pkgs/os-specific/linux/powertop/default.nix
+++ b/pkgs/os-specific/linux/powertop/default.nix
@@ -1,13 +1,14 @@
-{ stdenv, fetchurl, gettext, libnl1, ncurses, pciutils, pkgconfig, zlib }:
+{ stdenv, fetchurl, gettext, libnl, ncurses, pciutils, pkgconfig, zlib }:
stdenv.mkDerivation rec {
- name = "powertop-2.0";
+ name = "powertop-2.2";
+
src = fetchurl {
- url = "https://01.org/powertop/sites/default/files/downloads/${name}.tar.bz2";
- sha256 = "7af51d320856b3446bcc314c9414385f3b05b9360f650883b0210cd3b12c5c1c";
+ url = "https://01.org/powertop/sites/default/files/downloads/${name}.tar.gz";
+ sha256 = "0a5haxawcjrlwwxx4j5kd4ad05gjmcr13v8gswfwfxcn7fyf2f8k";
};
- buildInputs = [ gettext libnl1 ncurses pciutils pkgconfig zlib ];
+ buildInputs = [ gettext libnl ncurses pciutils pkgconfig zlib ];
meta = {
description = "Analyze power consumption on Intel-based laptops";
diff --git a/pkgs/os-specific/linux/procps-ng/default.nix b/pkgs/os-specific/linux/procps-ng/default.nix
new file mode 100644
index 00000000000..6099505f1d6
--- /dev/null
+++ b/pkgs/os-specific/linux/procps-ng/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchurl, ncurses }:
+
+stdenv.mkDerivation {
+ name = "procps-ng-3.3.6";
+
+ src = fetchurl {
+ url = mirror://sourceforge/procps-ng/procps-ng-3.3.6.tar.xz;
+ sha256 = "0k0j3ilzfpw8n3y058ymgfmafdfqqqwpqm7nh7a35xlk6zgw96nh";
+ };
+
+ buildInputs = [ ncurses ];
+
+ makeFlags = "usrbin_execdir=$(out)/bin";
+
+ enableParallelBuilding = true;
+
+ crossAttrs = {
+ CC = stdenv.cross.config + "-gcc";
+ };
+
+ meta = {
+ homepage = http://sourceforge.net/projects/procps-ng/;
+ description = "Utilities that give information about processes using the /proc filesystem";
+ priority = 10; # less than coreutils, which also provides "kill" and "uptime"
+ };
+}
diff --git a/pkgs/os-specific/linux/pwdutils/default.nix b/pkgs/os-specific/linux/pwdutils/default.nix
deleted file mode 100644
index 98b9ab70735..00000000000
--- a/pkgs/os-specific/linux/pwdutils/default.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{ stdenv, fetchurl, pam, gnutls, libnscd }:
-
-stdenv.mkDerivation rec {
- name = "pwdutils-3.2.6";
-
- src = fetchurl {
- url = "mirror://kernel/linux/utils/net/NIS/${name}.tar.bz2";
- sha256 = "1pyawvv9x0hiachn1mb257s6hm92dh1ykczgp7ik8z6jl020z3n7";
- };
-
- buildInputs = [ pam gnutls libnscd ];
-
- patches = [ ./sys-stat-h.patch ];
-
- postPatch =
- '' for i in src/tst-*
- do
- sed -i "$i" -e's|/bin/bash|/bin/sh|g'
- done
- '';
-
- configureFlags = "--disable-ldap --enable-gnutls --exec-prefix=$(out)";
-
- # FIXME: The test suite seems to make assumptions that don't hold in Nix
- # chroots.
- doCheck = false;
-
- meta = {
- description = "Linux pwdutils, utilities to manage passwd information";
-
- longDescription =
- '' Pwdutils is a collection of utilities to manage the passwd
- information stored in local files, NIS, NIS+ or LDAP and can replace
- the shadow suite complete.
- '';
-
- license = "GPLv2";
-
- maintainers = [ stdenv.lib.maintainers.ludo ];
- platforms = stdenv.lib.platforms.linux;
- };
-}
diff --git a/pkgs/os-specific/linux/pwdutils/sys-stat-h.patch b/pkgs/os-specific/linux/pwdutils/sys-stat-h.patch
deleted file mode 100644
index 5b5bc8440d5..00000000000
--- a/pkgs/os-specific/linux/pwdutils/sys-stat-h.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Fix builds with current glibc git, which appears to be stricter
-about .
-
---- pwdutils-3.2.6/src/useradd.c~ 2008-10-16 13:46:07.000000000 +0200
-+++ pwdutils-3.2.6/src/useradd.c 2010-04-26 11:24:43.000000000 +0200
-@@ -18,6 +18,7 @@
- #include "config.h"
- #endif
-
-+#include
- #include
- #include
- #include
-
---- pwdutils-3.2.6/src/userdel.c~ 2006-11-29 14:20:39.000000000 +0100
-+++ pwdutils-3.2.6/src/userdel.c 2010-04-26 11:26:08.000000000 +0200
-@@ -18,6 +18,7 @@
- #include "config.h"
- #endif
-
-+#include
- #include
- #include
- #include
-
-diff -ubB --show-c-function pwdutils-3.2.6/src/usermod.c\~ pwdutils-3.2.6/src/usermod.c
---- pwdutils-3.2.6/src/usermod.c~ 2006-11-29 14:20:41.000000000 +0100
-+++ pwdutils-3.2.6/src/usermod.c 2010-04-26 11:27:41.000000000 +0200
-@@ -18,6 +18,7 @@
- #include "config.h"
- #endif
-
-+#include
- #include
- #include
- #include
-
diff --git a/pkgs/os-specific/linux/qemu-kvm/default.nix b/pkgs/os-specific/linux/qemu-kvm/default.nix
index f6709bb439f..a26ea540808 100644
--- a/pkgs/os-specific/linux/qemu-kvm/default.nix
+++ b/pkgs/os-specific/linux/qemu-kvm/default.nix
@@ -1,41 +1,47 @@
{ stdenv, fetchurl, attr, zlib, SDL, alsaLib, pkgconfig, pciutils, libuuid, vde2
-, libjpeg, libpng, ncurses, python, glib, libaio, mesa }:
+, libjpeg, libpng, ncurses, python, glib, libaio, mesa
+, spice, spice_protocol, spiceSupport ? false }:
assert stdenv.isLinux;
-let version = "1.0.1"; in
+let version = "1.2.0"; in
stdenv.mkDerivation rec {
name = "qemu-kvm-${version}";
src = fetchurl {
url = "mirror://sourceforge/kvm/qemu-kvm/${version}/${name}.tar.gz";
- sha256 = "0kxzwaw8h71mqcm46angpyx8gd58ascrxnr861k068xg89ix5g2p";
+ sha256 = "018vb5nmk2fsm143bs2bl2wirhasd4b10d7jchl32zik4inbk2p9";
};
- patches = [ ./smb-tmpdir.patch ./qemu-img-fix-corrupt-vdi.patch ];
+ patches = [ ./fix-librt-check.patch ];
postPatch =
- '' for i in $(find kvm -type f)
+ '' for i in $(find . -type f)
do
sed -i "$i" \
-e 's|/bin/bash|/bin/sh|g ;
s|/usr/bin/python|${python}/bin/python|g ;
s|/bin/rm|rm|g'
done
+ '' + stdenv.lib.optionalString spiceSupport ''
+ for i in configure spice-qemu-char.c ui/spice-input.c ui/spice-core.c ui/qemu-spice.h
+ do
+ substituteInPlace $i --replace '#include ' '#include '
+ done
'';
configureFlags =
[ "--audio-drv-list=alsa"
"--smbd=smbd" # use `smbd' from $PATH
- ];
+ ] ++ stdenv.lib.optional spiceSupport "--enable-spice";
enableParallelBuilding = true;
buildInputs =
[ attr zlib SDL alsaLib pkgconfig pciutils libuuid vde2 libjpeg libpng
ncurses python glib libaio mesa
- ];
+ ] ++ stdenv.lib.optionals spiceSupport [ spice_protocol spice ];
postInstall =
''
diff --git a/pkgs/os-specific/linux/qemu-kvm/fix-librt-check.patch b/pkgs/os-specific/linux/qemu-kvm/fix-librt-check.patch
new file mode 100644
index 00000000000..57de288723e
--- /dev/null
+++ b/pkgs/os-specific/linux/qemu-kvm/fix-librt-check.patch
@@ -0,0 +1,72 @@
+commit 8bacde8d86a09699207d85d4bab06162aed18dc4
+Author: Natanael Copa
+Date: Wed Sep 12 09:06:51 2012 +0000
+
+ configure: properly check if -lrt and -lm is needed
+
+ Fixes build against uClibc.
+
+ uClibc provides 2 versions of clock_gettime(), one with realtime
+ support and one without (this is so you can avoid linking in -lrt
+ unless actually needed). This means that the clock_gettime() don't
+ need -lrt. We still need it for timer_create() so we check for this
+ function in addition.
+
+ We also need check if -lm is needed for isnan().
+
+ Both -lm and -lrt are needed for libs_qga.
+
+ Signed-off-by: Natanael Copa
+ Signed-off-by: Blue Swirl
+
+diff --git a/configure b/configure
+index 7656c32..9ab13db 100755
+--- a/configure
++++ b/configure
+@@ -2671,17 +2671,44 @@ fi
+
+
+ ##########################################
++# Do we need libm
++cat > $TMPC << EOF
++#include
++int main(void) { return isnan(sin(0.0)); }
++EOF
++if compile_prog "" "" ; then
++ :
++elif compile_prog "" "-lm" ; then
++ LIBS="-lm $LIBS"
++ libs_qga="-lm $libs_qga"
++else
++ echo
++ echo "Error: libm check failed"
++ echo
++ exit 1
++fi
++
++##########################################
+ # Do we need librt
++# uClibc provides 2 versions of clock_gettime(), one with realtime
++# support and one without. This means that the clock_gettime() don't
++# need -lrt. We still need it for timer_create() so we check for this
++# function in addition.
+ cat > $TMPC <
+ #include
+-int main(void) { return clock_gettime(CLOCK_REALTIME, NULL); }
++int main(void) {
++ timer_create(CLOCK_REALTIME, NULL, NULL);
++ return clock_gettime(CLOCK_REALTIME, NULL);
++}
+ EOF
+
+ if compile_prog "" "" ; then
+ :
+-elif compile_prog "" "-lrt" ; then
++# we need pthread for static linking. use previous pthread test result
++elif compile_prog "" "-lrt $pthread_lib" ; then
+ LIBS="-lrt $LIBS"
++ libs_qga="-lrt $libs_qga"
+ fi
+
+ if test "$darwin" != "yes" -a "$mingw32" != "yes" -a "$solaris" != yes -a \
diff --git a/pkgs/os-specific/linux/qemu-kvm/qemu-img-fix-corrupt-vdi.patch b/pkgs/os-specific/linux/qemu-kvm/qemu-img-fix-corrupt-vdi.patch
deleted file mode 100644
index 446a69a146b..00000000000
--- a/pkgs/os-specific/linux/qemu-kvm/qemu-img-fix-corrupt-vdi.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From http://patchwork.ozlabs.org/patch/137186/
-
-diff -ru qemu-kvm-0.15.1-orig/block/vdi.c qemu-kvm-0.15.1/block/vdi.c
---- qemu-kvm-0.15.1-orig/block/vdi.c 2011-10-19 15:54:48.000000000 +0200
-+++ qemu-kvm-0.15.1/block/vdi.c 2012-02-25 18:15:36.114574574 +0100
-@@ -1,7 +1,7 @@
- /*
- * Block driver for the Virtual Disk Image (VDI) format
- *
-- * Copyright (c) 2009 Stefan Weil
-+ * Copyright (c) 2009, 2012 Stefan Weil
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
-@@ -767,8 +767,12 @@
- acb->header_modified = 1;
- }
- acb->bmap_last = block_index;
-+ /* Copy data to be written to new block and zero unused parts. */
-+ memset(block, 0, sector_in_block * SECTOR_SIZE);
- memcpy(block + sector_in_block * SECTOR_SIZE,
- acb->buf, n_sectors * SECTOR_SIZE);
-+ memset(block + (sector_in_block + n_sectors) * SECTOR_SIZE, 0,
-+ (s->block_sectors - n_sectors - sector_in_block) * SECTOR_SIZE);
- acb->hd_iov.iov_base = (void *)block;
- acb->hd_iov.iov_len = s->block_size;
- qemu_iovec_init_external(&acb->hd_qiov, &acb->hd_iov, 1);
diff --git a/pkgs/os-specific/linux/qemu-kvm/smb-tmpdir.patch b/pkgs/os-specific/linux/qemu-kvm/smb-tmpdir.patch
deleted file mode 100644
index 6d6c7831d15..00000000000
--- a/pkgs/os-specific/linux/qemu-kvm/smb-tmpdir.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Honour $TMPDIR for the qemu-smb temporary directory.
-
-diff -rc -x '*~' qemu-kvm-0.12.2-orig/net/slirp.c qemu-kvm-0.12.2/net/slirp.c
-*** qemu-kvm-0.12.2-orig/net/slirp.c 2010-02-01 19:05:24.000000000 +0100
---- qemu-kvm-0.12.2/net/slirp.c 2010-02-01 19:05:54.000000000 +0100
-***************
-*** 476,486 ****
- struct in_addr vserver_addr)
- {
- static int instance;
-! char smb_conf[128];
-! char smb_cmdline[128];
- FILE *f;
-
-! snprintf(s->smb_dir, sizeof(s->smb_dir), "/tmp/qemu-smb.%ld-%d",
- (long)getpid(), instance++);
- if (mkdir(s->smb_dir, 0700) < 0) {
- qemu_error("could not create samba server dir '%s'\n", s->smb_dir);
---- 476,489 ----
- struct in_addr vserver_addr)
- {
- static int instance;
-! char smb_conf[1024];
-! char smb_cmdline[1024];
- FILE *f;
-
-! char *tmpdir = getenv("TMPDIR");
-!
-! snprintf(s->smb_dir, sizeof(s->smb_dir), "%s/qemu-smb.%ld-%d",
-! tmpdir ? tmpdir : "/tmp",
- (long)getpid(), instance++);
- if (mkdir(s->smb_dir, 0700) < 0) {
- qemu_error("could not create samba server dir '%s'\n", s->smb_dir);
diff --git a/pkgs/os-specific/linux/reptyr/default.nix b/pkgs/os-specific/linux/reptyr/default.nix
new file mode 100644
index 00000000000..573f1a578c7
--- /dev/null
+++ b/pkgs/os-specific/linux/reptyr/default.nix
@@ -0,0 +1,17 @@
+{stdenv, fetchgit}:
+stdenv.mkDerivation rec {
+ version = "0.4";
+ name = "reptyr-${version}";
+ src = fetchgit {
+ url = "https://github.com/nelhage/reptyr.git";
+ rev = "refs/tags/${name}";
+ sha256 = "2d2814c210e4bde6f9bcf3aa20477287d7e4a5aa7ee09110b37d2eaaf7e5ecae";
+ };
+ makeFlags = ["PREFIX=$(out)"];
+ meta = {
+ platforms = stdenv.lib.platforms.linux;
+ maintainers = with stdenv.lib.maintainers; [raskin];
+ license = stdenv.lib.licenses.mit;
+ description = ''A Linux tool to change controlling pty of a process'';
+ };
+}
diff --git a/pkgs/os-specific/linux/sepolgen/default.nix b/pkgs/os-specific/linux/sepolgen/default.nix
deleted file mode 100644
index a17a4153c47..00000000000
--- a/pkgs/os-specific/linux/sepolgen/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ stdenv, fetchurl, python }:
-stdenv.mkDerivation rec {
-
- name = "sepolgen-${version}";
- version = "1.0.23";
-
- src = fetchurl {
- url = http://userspace.selinuxproject.org/releases/20101221/devel/sepolgen-1.0.23.tar.gz;
- sha256 = "04d11l091iclp8lnay9as7y473ydrjz7171h95ddsbn0ihj5if2p";
- };
-
- buildInputs = [ python ];
- preBuild = '' makeFlags="$makeFlags DESTDIR=$out PACKAGEDIR=$out/lib/${python.libPrefix}/site-packages/sepolgen" '';
-
- meta = with stdenv.lib; {
- homepage = http://userspace.selinuxproject.org/;
- description = "Python module for SELinux policy generation";
- license = licenses.gpl2;
- maintainers = [ maintainers.phreedom ];
- platforms = platforms.linux;
- };
-}
\ No newline at end of file
diff --git a/pkgs/os-specific/linux/shadow/default.nix b/pkgs/os-specific/linux/shadow/default.nix
index d401a04e6b9..1055fccd8aa 100644
--- a/pkgs/os-specific/linux/shadow/default.nix
+++ b/pkgs/os-specific/linux/shadow/default.nix
@@ -7,6 +7,11 @@ let
then glibcCross
else assert stdenv ? glibc; stdenv.glibc;
+ dots_in_usernames = fetchurl {
+ url = http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/sys-apps/shadow/files/shadow-4.1.3-dots-in-usernames.patch;
+ sha256 = "1fj3rg6x3jppm5jvi9y7fhd2djbi4nc5pgwisw00xlh4qapgz692";
+ };
+
in
stdenv.mkDerivation rec {
@@ -19,7 +24,7 @@ stdenv.mkDerivation rec {
buildInputs = stdenv.lib.optional (pam != null && stdenv.isLinux) pam;
- patches = [ ./keep-path.patch ];
+ patches = [ ./keep-path.patch dots_in_usernames ];
# Assume System V `setpgrp (void)', which is the default on GNU variants
# (`AC_FUNC_SETPGRP' is not cross-compilation capable.)
diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix
new file mode 100644
index 00000000000..c95060a5ffb
--- /dev/null
+++ b/pkgs/os-specific/linux/spl/default.nix
@@ -0,0 +1,45 @@
+{ stdenv, fetchurl, kernel, perl, autoconf, automake, libtool, coreutils, gawk }:
+
+stdenv.mkDerivation {
+ name = "spl-0.6.0-rc14-${kernel.version}";
+ src = fetchurl {
+ url = http://archive.zfsonlinux.org/downloads/zfsonlinux/spl/spl-0.6.0-rc14.tar.gz;
+ sha256 = "00wyamf13z8ins4s14xf0b3hfjfz4w084mr17hs3k5xifb5jxa8g";
+ };
+
+ patches = [ ./install_prefix.patch ./install_prefix_2.patch ./module_prefix.patch ];
+
+ buildInputs = [ perl kernel autoconf automake libtool ];
+
+ NIX_CFLAGS_COMPILE = "-I${kernel}/lib/modules/${kernel.modDirVersion}/build/include/generated";
+
+ preConfigure = ''
+ ./autogen.sh
+
+ substituteInPlace ./module/spl/spl-generic.c --replace /usr/bin/hostid hostid
+ substituteInPlace ./module/spl/spl-module.c --replace /bin/mknod mknod
+
+ substituteInPlace ./module/spl/spl-generic.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:${gawk}:/bin"
+ substituteInPlace ./module/spl/spl-module.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:/bin"
+ substituteInPlace ./module/splat/splat-vnode.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:/bin"
+ '';
+
+ configureFlags = ''
+ --with-linux=${kernel}/lib/modules/${kernel.version}/build
+ --with-linux-obj=${kernel}/lib/modules/${kernel.version}/build
+ '';
+
+ meta = {
+ description = "Kernel module driver for solaris porting layer (needed by in-kernel zfs)";
+
+ longDescription = ''
+ This kernel module is a porting layer for ZFS to work inside the linux
+ kernel.
+ '';
+
+ homepage = http://zfsonlinux.org/;
+ platforms = stdenv.lib.platforms.linux;
+ license = stdenv.lib.licenses.gpl2Plus;
+ maintainers = with stdenv.lib.maintainers; [ jcumming ];
+ };
+}
diff --git a/pkgs/os-specific/linux/spl/install_prefix.patch b/pkgs/os-specific/linux/spl/install_prefix.patch
new file mode 100644
index 00000000000..9a7393b7170
--- /dev/null
+++ b/pkgs/os-specific/linux/spl/install_prefix.patch
@@ -0,0 +1,19 @@
+*** spl-0.6.0-rc10/Makefile.am.old Fri Aug 17 14:49:16 2012
+--- spl-0.6.0-rc10/Makefile.am Fri Aug 17 14:51:06 2012
+***************
+*** 32,38 ****
+ if CONFIG_KERNEL
+ install-data-local:
+ release=$(SPL_META_VERSION)-$(SPL_META_RELEASE); \
+! instdest=$(DESTDIR)/usr/src/spl-$$release/$(LINUX_VERSION); \
+ for instfile in $(noinst_HEADERS) module/$(LINUX_SYMBOLS); do \
+ $(INSTALL) -D $$instfile $$instdest/$$instfile; \
+ done
+--- 32,38 ----
+ if CONFIG_KERNEL
+ install-data-local:
+ release=$(SPL_META_VERSION)-$(SPL_META_RELEASE); \
+! instdest=$(DESTDIR)/@libexecdir@/spl/$(LINUX_VERSION); \
+ for instfile in $(noinst_HEADERS) module/$(LINUX_SYMBOLS); do \
+ $(INSTALL) -D $$instfile $$instdest/$$instfile; \
+ done
diff --git a/pkgs/os-specific/linux/spl/install_prefix_2.patch b/pkgs/os-specific/linux/spl/install_prefix_2.patch
new file mode 100644
index 00000000000..6068ad1d69c
--- /dev/null
+++ b/pkgs/os-specific/linux/spl/install_prefix_2.patch
@@ -0,0 +1,32 @@
+*** git-export/include/Makefile.am Tue Mar 6 00:05:28 2012
+--- git-export/include/Makefile.am.new Tue Mar 6 00:04:46 2012
+***************
+*** 16,22 ****
+
+ install-data-local:
+ release=$(SPL_META_VERSION)-$(SPL_META_RELEASE); \
+! instdest=$(DESTDIR)/usr/src/spl-$$release/$(LINUX_VERSION); \
+ instfiles=`find . -name '*.h'`; \
+ for instfile in $$instfiles; do \
+ $(INSTALL) -D $$instfile $$instdest/$$instfile; \
+--- 16,22 ----
+
+ install-data-local:
+ release=$(SPL_META_VERSION)-$(SPL_META_RELEASE); \
+! instdest=$(DESTDIR)/@libexecdir@/spl/$(LINUX_VERSION); \
+ instfiles=`find . -name '*.h'`; \
+ for instfile in $$instfiles; do \
+ $(INSTALL) -D $$instfile $$instdest/$$instfile; \
+***************
+*** 24,28 ****
+
+ uninstall-local:
+ release=$(SPL_META_VERSION)-$(SPL_META_RELEASE); \
+! instdest=$(DESTDIR)/usr/src/spl-$$release/$(LINUX_VERSION); \
+ $(RM) -R $$instdest
+--- 24,28 ----
+
+ uninstall-local:
+ release=$(SPL_META_VERSION)-$(SPL_META_RELEASE); \
+! instdest=$(DESTDIR)/@libexecdir@/spl/$(LINUX_VERSION); \
+ $(RM) -R $$instdest
diff --git a/pkgs/os-specific/linux/spl/module_prefix.patch b/pkgs/os-specific/linux/spl/module_prefix.patch
new file mode 100644
index 00000000000..dd40711ccdb
--- /dev/null
+++ b/pkgs/os-specific/linux/spl/module_prefix.patch
@@ -0,0 +1,33 @@
+*** git-export/module/Makefile.in Wed Dec 31 16:00:01 1969
+--- git-export/module/Makefile.in.new Sat Jan 28 21:42:06 2012
+***************
+*** 17,30 ****
+ modules_install:
+ @# Install the kernel modules
+ $(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` \
+! INSTALL_MOD_PATH=$(DESTDIR) \
+ INSTALL_MOD_DIR=addon/spl $@
+ @# Remove extraneous build products when packaging
+! if [ -n "$(DESTDIR)" ]; then \
+! find $(DESTDIR)/lib/modules/@LINUX_VERSION@ \
+ -name 'modules.*' | xargs $(RM); \
+ fi
+! sysmap=$(DESTDIR)/boot/System.map-@LINUX_VERSION@; \
+ if [ -f $$sysmap ]; then \
+ depmod -ae -F $$sysmap @LINUX_VERSION@; \
+ fi
+--- 17,30 ----
+ modules_install:
+ @# Install the kernel modules
+ $(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` \
+! INSTALL_MOD_PATH=@prefix@ \
+ INSTALL_MOD_DIR=addon/spl $@
+ @# Remove extraneous build products when packaging
+! if [ -n "@prefix@" ]; then \
+! find @prefix@/lib/modules/@LINUX_VERSION@ \
+ -name 'modules.*' | xargs $(RM); \
+ fi
+! sysmap=@prefix@/boot/System.map-@LINUX_VERSION@; \
+ if [ -f $$sysmap ]; then \
+ depmod -ae -F $$sysmap @LINUX_VERSION@; \
+ fi
diff --git a/pkgs/os-specific/linux/sysfsutils/default.nix b/pkgs/os-specific/linux/sysfsutils/default.nix
index cecb65f50a2..bf6dafae10a 100644
--- a/pkgs/os-specific/linux/sysfsutils/default.nix
+++ b/pkgs/os-specific/linux/sysfsutils/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
name = "sysfsutils-2.1.0";
src = fetchurl {
- url = "http://kent.dl.sourceforge.net/sourceforge/linux-diag/${name}.tar.gz";
+ url = "mirror://sourceforge/linux-diag/${name}.tar.gz";
sha256 = "e865de2c1f559fff0d3fc936e660c0efaf7afe662064f2fb97ccad1ec28d208a";
};
diff --git a/pkgs/os-specific/linux/syslinux/default.nix b/pkgs/os-specific/linux/syslinux/default.nix
index 1287da097ca..98917f943f5 100644
--- a/pkgs/os-specific/linux/syslinux/default.nix
+++ b/pkgs/os-specific/linux/syslinux/default.nix
@@ -1,16 +1,18 @@
-{ stdenv, fetchurl, nasm, perl }:
+{ stdenv, fetchurl, nasm, perl, libuuid }:
stdenv.mkDerivation rec {
- name = "syslinux-4.03";
-
+ name = "syslinux-4.06";
+
src = fetchurl {
url = "mirror://kernel/linux/utils/boot/syslinux/4.xx/${name}.tar.bz2";
- sha256 = "0f6s1cnibw6j0jh9bn5qsx3vsar9l1w9b3xfjkvzglgr4kinfmf6";
+ sha256 = "09md61npd5z64rv5s3knl4qsn2bqsn57irm5izk6snf46r77gdyv";
};
patches = [ ./perl-deps.patch ];
-
- buildInputs = [ nasm perl ];
+
+ buildInputs = [ nasm perl libuuid ];
+
+ enableParallelBuilding = true;
preBuild =
''
@@ -18,4 +20,9 @@ stdenv.mkDerivation rec {
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)
'';
+
+ meta = {
+ homepage = http://www.syslinux.org/;
+ description = "A lightweight bootloader";
+ };
}
diff --git a/pkgs/os-specific/linux/systemd/0001-Make-systemctl-daemon-reexec-do-the-right-thing-on-N.patch b/pkgs/os-specific/linux/systemd/0001-Make-systemctl-daemon-reexec-do-the-right-thing-on-N.patch
new file mode 100644
index 00000000000..9afa7543e57
--- /dev/null
+++ b/pkgs/os-specific/linux/systemd/0001-Make-systemctl-daemon-reexec-do-the-right-thing-on-N.patch
@@ -0,0 +1,26 @@
+From 0085f49cd0ba889e3db9102f328f6044ae3a2c18 Mon Sep 17 00:00:00 2001
+From: Eelco Dolstra
+Date: Tue, 8 Jan 2013 15:44:33 +0100
+Subject: [PATCH 1/6] Make "systemctl daemon-reexec" do the right thing on
+ NixOS
+
+---
+ src/core/main.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/core/main.c b/src/core/main.c
+index 1ee3c9c..1686f60 100644
+--- a/src/core/main.c
++++ b/src/core/main.c
+@@ -1858,7 +1858,7 @@ finish:
+ char_array_0(sfd);
+
+ i = 0;
+- args[i++] = SYSTEMD_BINARY_PATH;
++ args[i++] = "/run/current-system/systemd/lib/systemd/systemd";
+ if (switch_root_dir)
+ args[i++] = "--switched-root";
+ args[i++] = arg_running_as == SYSTEMD_SYSTEM ? "--system" : "--user";
+--
+1.8.0.1
+
diff --git a/pkgs/os-specific/linux/systemd/0002-Ignore-duplicate-paths-in-systemctl-start.patch b/pkgs/os-specific/linux/systemd/0002-Ignore-duplicate-paths-in-systemctl-start.patch
new file mode 100644
index 00000000000..76160a1f7cc
--- /dev/null
+++ b/pkgs/os-specific/linux/systemd/0002-Ignore-duplicate-paths-in-systemctl-start.patch
@@ -0,0 +1,30 @@
+From 2b0a9106d3aabb365af0cc34b595a1e697120f37 Mon Sep 17 00:00:00 2001
+From: Eelco Dolstra
+Date: Tue, 8 Jan 2013 15:45:01 +0100
+Subject: [PATCH 2/6] Ignore duplicate paths in "systemctl start"
+
+---
+ src/systemctl/systemctl.c | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
+index 2ebfff8..9f99df5 100644
+--- a/src/systemctl/systemctl.c
++++ b/src/systemctl/systemctl.c
+@@ -1591,8 +1591,11 @@ static int start_unit_one(
+
+ r = set_put(s, p);
+ if (r < 0) {
+- log_error("Failed to add path to set.");
+- return r;
++ free(p);
++ if (r != -EEXIST) {
++ log_error("Failed to add path %s to set.", p);
++ return r;
++ }
+ }
+
+ p = NULL;
+--
+1.8.0.1
+
diff --git a/pkgs/os-specific/linux/systemd/0003-Start-device-units-for-uninitialised-encrypted-devic.patch b/pkgs/os-specific/linux/systemd/0003-Start-device-units-for-uninitialised-encrypted-devic.patch
new file mode 100644
index 00000000000..a16a2672feb
--- /dev/null
+++ b/pkgs/os-specific/linux/systemd/0003-Start-device-units-for-uninitialised-encrypted-devic.patch
@@ -0,0 +1,32 @@
+From a013beb84f135cebf1c8c9363d5676c1c0a6be7a Mon Sep 17 00:00:00 2001
+From: Eelco Dolstra
+Date: Tue, 8 Jan 2013 15:46:30 +0100
+Subject: [PATCH 3/6] Start device units for uninitialised encrypted devices
+
+This is necessary because the NixOS service that initialises the
+filesystem depends on the appearance of the device unit. Also, this
+makes more sense to me: the device is ready; it's the filesystem
+that's not, but taking care of that is the responsibility of the mount
+unit. (However, this ignores the fsck unit, so it's not perfect...)
+---
+ rules/99-systemd.rules.in | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/rules/99-systemd.rules.in b/rules/99-systemd.rules.in
+index d17bdd9..040b10e 100644
+--- a/rules/99-systemd.rules.in
++++ b/rules/99-systemd.rules.in
+@@ -14,10 +14,6 @@ KERNEL=="vport*", TAG+="systemd"
+ SUBSYSTEM=="block", KERNEL!="ram*|loop*", TAG+="systemd"
+ SUBSYSTEM=="block", KERNEL!="ram*|loop*", ENV{DM_UDEV_DISABLE_OTHER_RULES_FLAG}=="1", ENV{SYSTEMD_READY}="0"
+
+-# Ignore encrypted devices with no identified superblock on it, since
+-# we are probably still calling mke2fs or mkswap on it.
+-SUBSYSTEM=="block", KERNEL!="ram*|loop*", ENV{DM_UUID}=="CRYPT-*", ENV{ID_PART_TABLE_TYPE}=="", ENV{ID_FS_USAGE}=="", ENV{SYSTEMD_READY}="0"
+-
+ # Ignore raid devices that are not yet assembled and started
+ SUBSYSTEM=="block", ENV{DEVTYPE}=="disk", KERNEL=="md*", TEST!="md/array_state", ENV{SYSTEMD_READY}="0"
+ SUBSYSTEM=="block", ENV{DEVTYPE}=="disk", KERNEL=="md*", ATTR{md/array_state}=="|clear|inactive", ENV{SYSTEMD_READY}="0"
+--
+1.8.0.1
+
diff --git a/pkgs/os-specific/linux/systemd/0004-Set-switch-to-configuration-hints-for-some-units.patch b/pkgs/os-specific/linux/systemd/0004-Set-switch-to-configuration-hints-for-some-units.patch
new file mode 100644
index 00000000000..beab35d63a0
--- /dev/null
+++ b/pkgs/os-specific/linux/systemd/0004-Set-switch-to-configuration-hints-for-some-units.patch
@@ -0,0 +1,74 @@
+From b40d8783f94666035baae567882c0d4be82cda01 Mon Sep 17 00:00:00 2001
+From: Eelco Dolstra
+Date: Tue, 8 Jan 2013 15:48:19 +0100
+Subject: [PATCH 4/6] Set switch-to-configuration hints for some units
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Target units like local-fs.target need ‘X-StopOnReconfiguration=yes’
+to ensure dependencies *on* that target properly take into account the
+dependencies *of* the target.
+
+‘X-RestartIfChanged=no’ is necessary for systemd-journald.service
+because restarting it causes services connected to journald to stop
+logging.
+
+‘X-RestartIfChanged=no’ is necessary for systemd-user-sessions.service
+to prevent all user sessions from being killed when this unit changes.
+---
+ units/local-fs.target | 2 ++
+ units/remote-fs.target | 2 ++
+ units/systemd-journald.service.in | 5 +++++
+ units/systemd-user-sessions.service.in | 3 +++
+ 4 files changed, 12 insertions(+)
+
+diff --git a/units/local-fs.target b/units/local-fs.target
+index dd92b17..dfcbc7b 100644
+--- a/units/local-fs.target
++++ b/units/local-fs.target
+@@ -10,3 +10,5 @@ Description=Local File Systems
+ Documentation=man:systemd.special(7)
+ OnFailure=emergency.target
+ OnFailureIsolate=yes
++
++X-StopOnReconfiguration=yes
+diff --git a/units/remote-fs.target b/units/remote-fs.target
+index 9e68878..85a53d7 100644
+--- a/units/remote-fs.target
++++ b/units/remote-fs.target
+@@ -9,5 +9,7 @@
+ Description=Remote File Systems
+ Documentation=man:systemd.special(7)
+
++X-StopOnReconfiguration=yes
++
+ [Install]
+ WantedBy=multi-user.target
+diff --git a/units/systemd-journald.service.in b/units/systemd-journald.service.in
+index ab2e50c..9563a7d 100644
+--- a/units/systemd-journald.service.in
++++ b/units/systemd-journald.service.in
+@@ -24,3 +24,8 @@ CapabilityBoundingSet=CAP_SYS_ADMIN CAP_DAC_OVERRIDE CAP_SYS_PTRACE CAP_SYSLOG C
+ # Increase the default a bit in order to allow many simultaneous
+ # services being run since we keep one fd open per service.
+ LimitNOFILE=16384
++
++# Don't restart journald, since that causes services connected to
++# journald to stop logging (see
++# https://bugs.freedesktop.org/show_bug.cgi?id=56043).
++X-RestartIfChanged=no
+diff --git a/units/systemd-user-sessions.service.in b/units/systemd-user-sessions.service.in
+index 0869e73..b6ed958 100644
+--- a/units/systemd-user-sessions.service.in
++++ b/units/systemd-user-sessions.service.in
+@@ -15,3 +15,6 @@ Type=oneshot
+ RemainAfterExit=yes
+ ExecStart=@rootlibexecdir@/systemd-user-sessions start
+ ExecStop=@rootlibexecdir@/systemd-user-sessions stop
++
++# Restart kills all active sessions.
++X-RestartIfChanged=no
+--
+1.8.0.1
+
diff --git a/pkgs/os-specific/linux/systemd/0005-sysinit.target-Drop-the-dependency-on-local-fs.targe.patch b/pkgs/os-specific/linux/systemd/0005-sysinit.target-Drop-the-dependency-on-local-fs.targe.patch
new file mode 100644
index 00000000000..4403e6f56aa
--- /dev/null
+++ b/pkgs/os-specific/linux/systemd/0005-sysinit.target-Drop-the-dependency-on-local-fs.targe.patch
@@ -0,0 +1,33 @@
+From c5c8ac3a0420fb42ba2f629368fd5bd6ea1e753b Mon Sep 17 00:00:00 2001
+From: Eelco Dolstra
+Date: Tue, 8 Jan 2013 15:56:03 +0100
+Subject: [PATCH 5/6] sysinit.target: Drop the dependency on local-fs.target
+ and swap.target
+
+Having all services with DefaultDependencies=yes depend on
+local-fs.target is annoying, because some of those services might be
+necessary to mount local filesystems. For instance, Charon's
+send-keys feature requires sshd to be running in order to receive LUKS
+encryption keys, which in turn requires dhcpcd, and so on. So we drop
+this dependency (and swap.target as well for consistency). If
+services require a specific mount, they should use RequiresMountsFor
+in any case.
+---
+ units/sysinit.target | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/units/sysinit.target b/units/sysinit.target
+index 8f4fb8f..e0f0147 100644
+--- a/units/sysinit.target
++++ b/units/sysinit.target
+@@ -9,6 +9,5 @@
+ Description=System Initialization
+ Documentation=man:systemd.special(7)
+ Conflicts=emergency.service emergency.target
+-Wants=local-fs.target swap.target
+-After=local-fs.target swap.target emergency.service emergency.target
++After=emergency.service emergency.target
+ RefuseManualStart=yes
+--
+1.8.0.1
+
diff --git a/pkgs/os-specific/linux/systemd/0006-Don-t-call-plymouth-quit.patch b/pkgs/os-specific/linux/systemd/0006-Don-t-call-plymouth-quit.patch
new file mode 100644
index 00000000000..250a751fe0c
--- /dev/null
+++ b/pkgs/os-specific/linux/systemd/0006-Don-t-call-plymouth-quit.patch
@@ -0,0 +1,38 @@
+From d3caa154098e215145679f38fa92a8bd482107be Mon Sep 17 00:00:00 2001
+From: Eelco Dolstra
+Date: Tue, 8 Jan 2013 18:36:28 +0100
+Subject: [PATCH 6/6] Don't call "plymouth quit"
+
+NixOS doesn't use Plymouth (yet).
+---
+ units/emergency.service.in | 1 -
+ units/rescue.service.m4.in | 1 -
+ 2 files changed, 2 deletions(-)
+
+diff --git a/units/emergency.service.in b/units/emergency.service.in
+index 442f0e0..6b7eafd 100644
+--- a/units/emergency.service.in
++++ b/units/emergency.service.in
+@@ -15,7 +15,6 @@ Before=shutdown.target
+ [Service]
+ Environment=HOME=/root
+ WorkingDirectory=/root
+-ExecStartPre=-/bin/plymouth quit
+ ExecStartPre=-/bin/echo -e 'Welcome to emergency mode! After logging in, type "journalctl -xb" to view\\nsystem logs, "systemctl reboot" to reboot, "systemctl default" to try again\\nto boot into default mode.'
+ ExecStart=-/sbin/sulogin
+ ExecStopPost=@SYSTEMCTL@ --fail --no-block default
+diff --git a/units/rescue.service.m4.in b/units/rescue.service.m4.in
+index 269797a..2c640f4 100644
+--- a/units/rescue.service.m4.in
++++ b/units/rescue.service.m4.in
+@@ -16,7 +16,6 @@ Before=shutdown.target
+ [Service]
+ Environment=HOME=/root
+ WorkingDirectory=/root
+-ExecStartPre=-/bin/plymouth quit
+ ExecStartPre=-/bin/echo -e 'Welcome to rescue mode! Type "systemctl default" or ^D to enter default mode.\\nType "journalctl -xb" to view system logs. Type "systemctl reboot" to reboot.'
+ ExecStart=-/sbin/sulogin
+ ExecStopPost=-@SYSTEMCTL@ --fail --no-block default
+--
+1.8.0.1
+
diff --git a/pkgs/os-specific/linux/systemd/0007-Ignore-IPv6-link-local-addresses.patch b/pkgs/os-specific/linux/systemd/0007-Ignore-IPv6-link-local-addresses.patch
new file mode 100644
index 00000000000..1a8d294fd22
--- /dev/null
+++ b/pkgs/os-specific/linux/systemd/0007-Ignore-IPv6-link-local-addresses.patch
@@ -0,0 +1,37 @@
+From ab889004b8972258a87798133451f99dfce21823 Mon Sep 17 00:00:00 2001
+From: Eelco Dolstra
+Date: Mon, 4 Feb 2013 12:41:14 +0100
+Subject: [PATCH 7/8] Ignore IPv6 link-local addresses
+
+Returning IPv6 link-local addresses is a bad idea, because they only
+work if an application connects specifically over the corresponding
+interface. So you get errors like:
+
+ $ curl -6 http://my-machine/
+ curl: (7) Failed to connect to fe80::d6be:d9ff:fe1b:8477: Invalid argument
+
+To prevent this, this patch filters out link-local addresses. So if
+you don't have a routable IPv6 address, nss-myhostname will fall back
+to returning ::1.
+---
+ src/nss-myhostname/netlink.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/nss-myhostname/netlink.c b/src/nss-myhostname/netlink.c
+index 53c3b50..621ca1d 100644
+--- a/src/nss-myhostname/netlink.c
++++ b/src/nss-myhostname/netlink.c
+@@ -155,6 +155,10 @@ int ifconf_acquire_addresses(struct address **_list, unsigned *_n_list) {
+ ifaddrmsg->ifa_scope == RT_SCOPE_NOWHERE)
+ continue;
+
++ if (ifaddrmsg->ifa_family == AF_INET6 &&
++ ifaddrmsg->ifa_scope == RT_SCOPE_LINK)
++ continue;
++
+ if (ifaddrmsg->ifa_flags & IFA_F_DEPRECATED)
+ continue;
+
+--
+1.8.1
+
diff --git a/pkgs/os-specific/linux/systemd/0008-Fix-a-segfault-in-nscd-when-using-nss-myhostname.patch b/pkgs/os-specific/linux/systemd/0008-Fix-a-segfault-in-nscd-when-using-nss-myhostname.patch
new file mode 100644
index 00000000000..6937c6c594e
--- /dev/null
+++ b/pkgs/os-specific/linux/systemd/0008-Fix-a-segfault-in-nscd-when-using-nss-myhostname.patch
@@ -0,0 +1,42 @@
+From ef9b259ae24e7bf4ebec04b0b0a44964bc661bb5 Mon Sep 17 00:00:00 2001
+From: Eelco Dolstra
+Date: Mon, 4 Feb 2013 12:43:08 +0100
+Subject: [PATCH 8/8] Fix a segfault in nscd when using nss-myhostname
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Nscd expects that an NSS module's gethostbyname4_r function returns
+its first result in the pre-allocated gaih_addrtuple denoted by **pat.
+(See nscd/aicache.c in the Glibc sources.) However, nss-myhostname
+doesn't fill in **pat but allocates the first result in ‘buffer’, then
+sets *pat. So nscd crashes (e.g. when running ‘getent ahosts
+my-machine’).
+
+Hard to tell if this is a bug in nscd, since there doesn't seem to be
+a proper API spec for gethostbyname4_r. But in any case, this patch
+fixes the crash by copying the first result to **pat.
+---
+ src/nss-myhostname/nss-myhostname.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/src/nss-myhostname/nss-myhostname.c b/src/nss-myhostname/nss-myhostname.c
+index 834a806..b0fb832 100644
+--- a/src/nss-myhostname/nss-myhostname.c
++++ b/src/nss-myhostname/nss-myhostname.c
+@@ -176,7 +176,11 @@ enum nss_status _nss_myhostname_gethostbyname4_r(
+ /* Verify the size matches */
+ assert(idx == ms);
+
+- *pat = r_tuple_prev;
++ /* Nscd expects us to store the first record in **pat. */
++ if (*pat)
++ **pat = *r_tuple_prev;
++ else
++ *pat = r_tuple_prev;
+
+ if (ttlp)
+ *ttlp = 0;
+--
+1.8.1
+
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index e6e5822c9ea..9e64bb7ed40 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -1,66 +1,89 @@
{ stdenv, fetchurl, pkgconfig, intltool, gperf, libcap, dbus, kmod
-, xz, pam, acl, cryptsetup, libuuid, m4, utillinux, usbutils, pciutils
-, glib, kbd
+, xz, pam, acl, cryptsetup, libuuid, m4, utillinux
+, glib, kbd, libxslt, coreutils, libgcrypt, sysvtools
}:
assert stdenv.gcc.libc or null != null;
stdenv.mkDerivation rec {
- name = "systemd-188";
+ name = "systemd-197";
src = fetchurl {
url = "http://www.freedesktop.org/software/systemd/${name}.tar.xz";
- sha256 = "0nr1cg1mizbwcafjcqw3c30mx6xdv596jpbgjlxr6myvc5hfsfg8";
+ sha256 = "1dbljyyc3w4a1af99f15f3sqnfx7mfmc5x5hwxb70kg23ai7x1g6";
};
- patches = [ ./fail-after-reaching-respawn-limit.patch ];
+ patches =
+ [ ./0001-Make-systemctl-daemon-reexec-do-the-right-thing-on-N.patch
+ ./0002-Ignore-duplicate-paths-in-systemctl-start.patch
+ ./0003-Start-device-units-for-uninitialised-encrypted-devic.patch
+ ./0004-Set-switch-to-configuration-hints-for-some-units.patch
+ ./0005-sysinit.target-Drop-the-dependency-on-local-fs.targe.patch
+ ./0006-Don-t-call-plymouth-quit.patch
+ ./0007-Ignore-IPv6-link-local-addresses.patch
+ ./0008-Fix-a-segfault-in-nscd-when-using-nss-myhostname.patch
+ ] ++ stdenv.lib.optional stdenv.isArm ./libc-bug-accept4-arm.patch;
buildInputs =
[ pkgconfig intltool gperf libcap dbus kmod xz pam acl
- /* cryptsetup */ libuuid m4 usbutils pciutils glib
+ /* cryptsetup */ libuuid m4 glib libxslt libgcrypt
];
configureFlags =
[ "--localstatedir=/var"
"--sysconfdir=/etc"
- "--with-distro=other"
"--with-rootprefix=$(out)"
+ "--with-kbd-loadkeys=${kbd}/bin/loadkeys"
+ "--with-kbd-setfont=${kbd}/bin/setfont"
"--with-rootprefix=$(out)"
"--with-dbusinterfacedir=$(out)/share/dbus-1/interfaces"
"--with-dbuspolicydir=$(out)/etc/dbus-1/system.d"
"--with-dbussystemservicedir=$(out)/share/dbus-1/system-services"
"--with-dbussessionservicedir=$(out)/share/dbus-1/services"
"--with-firmware-path=/root/test-firmware:/var/run/current-system/firmware"
- "--with-pci-ids-path=${pciutils}/share/pci.ids"
"--with-tty-gid=3" # tty in NixOS has gid 3
];
preConfigure =
''
# FIXME: patch this in systemd properly (and send upstream).
- for i in src/remount-fs/remount-fs.c src/core/mount.c src/core/swap.c src/fsck/fsck.c; do
+ # FIXME: use sulogin from util-linux once updated.
+ for i in src/remount-fs/remount-fs.c src/core/mount.c src/core/swap.c src/fsck/fsck.c units/emergency.service.in units/rescue.service.m4.in; do
test -e $i
substituteInPlace $i \
--replace /bin/mount ${utillinux}/bin/mount \
--replace /bin/umount ${utillinux}/bin/umount \
--replace /sbin/swapon ${utillinux}/sbin/swapon \
--replace /sbin/swapoff ${utillinux}/sbin/swapoff \
- --replace /sbin/fsck ${utillinux}/sbin/fsck
+ --replace /sbin/fsck ${utillinux}/sbin/fsck \
+ --replace /bin/echo ${coreutils}/bin/echo \
+ --replace /sbin/sulogin ${sysvtools}/sbin/sulogin
done
+
+ substituteInPlace src/journal/catalog.c \
+ --replace /usr/lib/systemd/catalog/ $out/lib/systemd/catalog/
'';
+ PYTHON_BINARY = "${coreutils}/bin/env python"; # don't want a build time dependency on Python
+
NIX_CFLAGS_COMPILE =
- [ "-DKBD_LOADKEYS=\"${kbd}/bin/loadkeys\""
- "-DKBD_SETFONT=\"${kbd}/bin/setfont\""
- # Can't say ${polkit}/bin/pkttyagent here because that would
+ [ # Can't say ${polkit}/bin/pkttyagent here because that would
# lead to a cyclic dependency.
"-DPOLKIT_AGENT_BINARY_PATH=\"/run/current-system/sw/bin/pkttyagent\""
"-fno-stack-protector"
+ # Work around our kernel headers being too old. FIXME: remove
+ # this after the next stdenv update.
+ "-DFS_NOCOW_FL=0x00800000"
];
- makeFlags = "CPPFLAGS=-I${stdenv.gcc.libc}/include";
+ # Use /var/lib/udev rather than /etc/udev for the generated hardware
+ # database. Upstream doesn't want this (see commit
+ # 1e1954f53386cb773e2a152748dd31c4d36aa2d8) because using /var is
+ # forbidden in early boot, but in NixOS the initrd guarantees that
+ # /var is mounted.
+ makeFlags = "CPPFLAGS=-I${stdenv.gcc.libc}/include hwdb_bin=/var/lib/udev/hwdb.bin";
- installFlags = "localstatedir=$(TMPDIR)/var sysconfdir=$(out)/etc";
+ installFlags = "localstatedir=$(TMPDIR)/var sysconfdir=$(out)/etc sysvinitdir=$(TMPDIR)/etc/init.d";
# Get rid of configuration-specific data.
postInstall =
@@ -75,7 +98,14 @@ stdenv.mkDerivation rec {
for i in init halt poweroff runlevel reboot shutdown; do
ln -s $out/bin/systemctl $out/sbin/$i
done
- '';
+
+ # Fix reference to /bin/false in the D-Bus services.
+ for i in $out/share/dbus-1/system-services/*.service; do
+ substituteInPlace $i --replace /bin/false ${coreutils}/bin/false
+ done
+
+ rm -rf $out/etc/rpm
+ ''; # */
enableParallelBuilding = true;
@@ -88,7 +118,9 @@ stdenv.mkDerivation rec {
passthru.interfaceVersion = 2;
meta = {
- homepage = http://www.freedesktop.org/wiki/Software/systemd;
+ homepage = "http://www.freedesktop.org/wiki/Software/systemd";
description = "A system and service manager for Linux";
+ platforms = stdenv.lib.platforms.linux;
+ maintainers = [ stdenv.lib.maintainers.eelco stdenv.lib.maintainers.simons ];
};
}
diff --git a/pkgs/os-specific/linux/systemd/fail-after-reaching-respawn-limit.patch b/pkgs/os-specific/linux/systemd/fail-after-reaching-respawn-limit.patch
deleted file mode 100644
index 7271b5578d5..00000000000
--- a/pkgs/os-specific/linux/systemd/fail-after-reaching-respawn-limit.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/core/service.c b/src/core/service.c
-index 1c127bd..eafdbe5 100644
---- a/src/core/service.c
-+++ b/src/core/service.c
-@@ -2487,6 +2487,7 @@ static int service_start(Unit *u) {
- r = service_start_limit_test(s);
- if (r < 0) {
- service_notify_sockets_dead(s, true);
-+ service_set_state(s, SERVICE_FAILED);
- return r;
- }
-
diff --git a/pkgs/os-specific/linux/systemd/libc-bug-accept4-arm.patch b/pkgs/os-specific/linux/systemd/libc-bug-accept4-arm.patch
new file mode 100644
index 00000000000..7cde2260189
--- /dev/null
+++ b/pkgs/os-specific/linux/systemd/libc-bug-accept4-arm.patch
@@ -0,0 +1,81 @@
+Based on a patch for udev in
+nixpkgs(upstart)/pkgs/os-specific/linux/udev/pre-accept4-kernel.patch
+
+It was taken from:
+https://github.com/archlinuxarm/PKGBUILDs/blob/master/core/udev-oxnas/pre-accept4-kernel.patch
+
+Basically, ARM implemented accept4() only in 2.6.36. Nixpkgs now uses
+linux headers from 2.6.35. And the particular nixpkgs glibc version had a bug,
+not checking about 2.6.36 for accept4 on arm.
+
+diff --git a/src/journal/journald-stream.c b/src/journal/journald-stream.c
+index 7b88f74..a9f7b62 100644
+--- a/src/journal/journald-stream.c
++++ b/src/journal/journald-stream.c
+@@ -347,10 +347,12 @@ int stdout_stream_new(Server *s) {
+ int fd, r;
+ socklen_t len;
+ struct epoll_event ev;
++ int flgs;
+
+ assert(s);
+
+- fd = accept4(s->stdout_fd, NULL, NULL, SOCK_NONBLOCK|SOCK_CLOEXEC);
++ //fd = accept4(s->stdout_fd, NULL, NULL, SOCK_NONBLOCK|SOCK_CLOEXEC);
++ fd = accept(s->stdout_fd, NULL, NULL);
+ if (fd < 0) {
+ if (errno == EAGAIN)
+ return 0;
+@@ -359,6 +361,11 @@ int stdout_stream_new(Server *s) {
+ return -errno;
+ }
+
++ // Since we don't have accept4
++ flgs = fcntl(fd, F_GETFL, NULL);
++ if(flgs >= 0) fcntl(fd, F_SETFL, flgs | O_NONBLOCK);
++ fcntl(fd, F_SETFD, FD_CLOEXEC);
++
+ if (s->n_stdout_streams >= STDOUT_STREAMS_MAX) {
+ log_warning("Too many stdout streams, refusing connection.");
+ close_nointr_nofail(fd);
+diff --git a/src/udev/udev-ctrl.c b/src/udev/udev-ctrl.c
+index a235912..c05e4b4 100644
+--- a/src/udev/udev-ctrl.c
++++ b/src/udev/udev-ctrl.c
+@@ -15,6 +15,7 @@
+ #include
+ #include
+ #include
++#include
+ #include
+ #include
+ #include
+@@ -181,6 +182,7 @@ struct udev_ctrl_connection *udev_ctrl_get_connection(struct udev_ctrl *uctrl)
+ struct ucred ucred;
+ socklen_t slen;
+ const int on = 1;
++ int flgs;
+
+ conn = calloc(1, sizeof(struct udev_ctrl_connection));
+ if (conn == NULL)
+@@ -188,13 +190,19 @@ struct udev_ctrl_connection *udev_ctrl_get_connection(struct udev_ctrl *uctrl)
+ conn->refcount = 1;
+ conn->uctrl = uctrl;
+
+- conn->sock = accept4(uctrl->sock, NULL, NULL, SOCK_CLOEXEC|SOCK_NONBLOCK);
++ //conn->sock = accept4(uctrl->sock, NULL, NULL, SOCK_CLOEXEC|SOCK_NONBLOCK);
++ conn->sock = accept(uctrl->sock, NULL, NULL);
+ if (conn->sock < 0) {
+ if (errno != EINTR)
+ log_error("unable to receive ctrl connection: %m\n");
+ goto err;
+ }
+
++ // Since we don't have accept4
++ flgs = fcntl(conn->sock, F_GETFL, NULL);
++ if(flgs >= 0) fcntl(conn->sock, F_SETFL, flgs | O_NONBLOCK);
++ fcntl(conn->sock, F_SETFD, FD_CLOEXEC);
++
+ /* check peer credential of connection */
+ slen = sizeof(ucred);
+ if (getsockopt(conn->sock, SOL_SOCKET, SO_PEERCRED, &ucred, &slen) < 0) {
diff --git a/pkgs/os-specific/linux/sysvinit/default.nix b/pkgs/os-specific/linux/sysvinit/default.nix
index 7b3ea62ea2d..99aebd11667 100644
--- a/pkgs/os-specific/linux/sysvinit/default.nix
+++ b/pkgs/os-specific/linux/sysvinit/default.nix
@@ -4,12 +4,12 @@ let version = "2.88dsf"; in
stdenv.mkDerivation {
name = (if withoutInitTools then "sysvtools" else "sysvinit") + "-" + version;
-
+
src = fetchurl {
url = "mirror://savannah/sysvinit/sysvinit-${version}.tar.bz2";
sha256 = "068mvzaz808a673zigyaqb63xc8bndh2klk16zi5c83rw70wifv0";
};
-
+
prePatch = ''
# Patch some minimal hard references, so halt/shutdown work
sed -i -e "s,/sbin/,$out/sbin/," src/halt.c src/init.c src/paths.h
@@ -27,16 +27,17 @@ stdenv.mkDerivation {
'';
postInstall = stdenv.lib.optionalString withoutInitTools
- ''
+ ''
mv $out/sbin/killall5 $out/bin
ln -sf killall5 $out/bin/pidof
- rm -rf $out/sbin
+ shopt -s extglob
+ rm -rf $out/sbin/!(sulogin)
rm -rf $out/include
rm -rf $out/share/man/man5
rm $(for i in $out/share/man/man8/*; do echo $i; done | grep -v 'pidof\|killall5')
rm $out/bin/{mountpoint,wall} $out/share/man/man1/{mountpoint.1,wall.1}
'';
-
+
meta = {
homepage = http://www.nongnu.org/sysvinit/;
description = "Utilities related to booting and shutdown";
diff --git a/pkgs/os-specific/linux/tcp-wrapper/builder.sh b/pkgs/os-specific/linux/tcp-wrappers/builder.sh
similarity index 100%
rename from pkgs/os-specific/linux/tcp-wrapper/builder.sh
rename to pkgs/os-specific/linux/tcp-wrappers/builder.sh
diff --git a/pkgs/os-specific/linux/tcp-wrapper/default.nix b/pkgs/os-specific/linux/tcp-wrappers/default.nix
similarity index 100%
rename from pkgs/os-specific/linux/tcp-wrapper/default.nix
rename to pkgs/os-specific/linux/tcp-wrappers/default.nix
diff --git a/pkgs/os-specific/linux/uclibc/default.nix b/pkgs/os-specific/linux/uclibc/default.nix
index 1ad392ad6fa..e7cce315e8c 100644
--- a/pkgs/os-specific/linux/uclibc/default.nix
+++ b/pkgs/os-specific/linux/uclibc/default.nix
@@ -33,8 +33,8 @@ let
}
'';
- archMakeFlag = if (cross != null) then "ARCH=${cross.arch}" else "";
- crossMakeFlag = if (cross != null) then "CROSS=${cross.config}-" else "";
+ archMakeFlag = if cross != null then "ARCH=${cross.arch}" else "";
+ crossMakeFlag = if cross != null then "CROSS=${cross.config}-" else "";
# UCLIBC_SUSV4_LEGACY defines 'tmpnam', needed for gcc libstdc++ builds.
nixConfig = ''
@@ -74,7 +74,7 @@ stdenv.mkDerivation {
'';
# Cross stripping hurts.
- dontStrip = if (cross != null) then true else false;
+ dontStrip = cross != null;
makeFlags = [ crossMakeFlag "VERBOSE=1" ];
diff --git a/pkgs/os-specific/linux/udev/173.nix b/pkgs/os-specific/linux/udev/173.nix
deleted file mode 100644
index 795826cf6bf..00000000000
--- a/pkgs/os-specific/linux/udev/173.nix
+++ /dev/null
@@ -1,58 +0,0 @@
-{ stdenv, fetchurl, gperf, pkgconfig, glib, acl
-, libusb, usbutils, pciutils }:
-
-assert stdenv ? glibc;
-
-stdenv.mkDerivation rec {
- name = "udev-173";
-
- src = fetchurl {
- url = "mirror://kernel/linux/utils/kernel/hotplug/${name}.tar.bz2";
- sha256 = "1bxadi4bi11v8ipzj22wknv8hsb0wgdb99bx3w9w33rgl4aq78bh";
- };
-
- buildInputs = [ gperf pkgconfig glib acl libusb usbutils ];
-
- configureFlags =
- ''
- --with-pci-ids-path=${pciutils}/share/pci.ids
- --enable-udev_acl --enable-edd
- --disable-introspection --libexecdir=$(out)/lib/udev
- --with-firmware-path=/root/test-firmware:/var/run/current-system/firmware
- '';
-
- # Workaround for the Linux kernel headers being too old.
- NIX_CFLAGS_COMPILE = "-DBTN_TRIGGER_HAPPY=0x2c0";
-
- postInstall =
- ''
- # The path to rule_generator.functions in write_cd_rules and
- # write_net_rules is broken. Also, don't store the mutable
- # persistant rules in /etc/udev/rules.d but in
- # /var/lib/udev/rules.d.
- for i in $out/lib/udev/write_cd_rules $out/lib/udev/write_net_rules; do
- substituteInPlace $i \
- --replace /lib/udev $out/lib/udev \
- --replace /etc/udev/rules.d /var/lib/udev/rules.d
- done
-
- # Don't set PATH to /bin:/sbin; won't work in NixOS.
- sed -e '/PATH=/d' -i $out/lib/udev/rule_generator.functions
-
- ln -sv $out/lib/ConsoleKit $out/etc/ConsoleKit
-
- rm -frv $out/share/gtk-doc
- '';
-
- patches = [ ./custom-rules.patch ] ++
- [(fetchurl {
- url = https://bugs.archlinux.org/task/25356?getfile=7281;
- sha256 = "01xib1pfdbwacgx8dqxgrf67a0mwkpm4kxy9f9v3df93v0m4pmbm";
- })] ++
- stdenv.lib.optional stdenv.isArm ./pre-accept4-kernel.patch;
-
- meta = {
- homepage = http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html;
- description = "Udev manages the /dev filesystem";
- };
-}
diff --git a/pkgs/os-specific/linux/udev/custom-rules.patch b/pkgs/os-specific/linux/udev/custom-rules.patch
deleted file mode 100644
index 647691acfb1..00000000000
--- a/pkgs/os-specific/linux/udev/custom-rules.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-commit c49ec33ba0f1a7f11b188913bb4895360ced67f8
-Author: Yury G. Kudryashov
-Date: Tue Aug 16 16:28:56 2011 +0400
-
- Upstream considers presence of rules_dir=... in udev.conf as a very special case.
- In particular, they disable /dev/.udev/*. Re-enable it.
-
-diff --git a/udev/udev-rules.c b/udev/udev-rules.c
-index 6bf2726..c1ae1f3 100644
---- a/udev/udev-rules.c
-+++ b/udev/udev-rules.c
-@@ -1812,6 +1812,7 @@ struct udev_rules *udev_rules_new(struct udev *udev, int resolve_names)
- struct udev_list file_list;
- struct udev_list_entry *file_loop;
- struct token end_token;
-+ char runpathrules[UTIL_PATH_SIZE];
-
- rules = calloc(1, sizeof(struct udev_rules));
- if (rules == NULL)
-@@ -1854,22 +1855,21 @@ struct udev_rules *udev_rules_new(struct udev *udev, int resolve_names)
- rules->trie_nodes_cur = 1;
-
- if (udev_get_rules_path(udev) == NULL) {
-- char filename[UTIL_PATH_SIZE];
-
- /* /lib/udev -- default/package rules */
- add_matching_files(udev, &file_list, LIBEXECDIR "/rules.d", ".rules");
-
- /* /etc/udev -- system-specific/user/admin rules */
- add_matching_files(udev, &file_list, SYSCONFDIR "/udev/rules.d", ".rules");
--
-- /* /run/udev -- throw-away/temporary rules */
-- util_strscpyl(filename, sizeof(filename), udev_get_run_path(udev), "/rules.d", NULL);
-- add_matching_files(udev, &file_list, filename, ".rules");
- } else {
- /* custom rules files location for testing */
- add_matching_files(udev, &file_list, udev_get_rules_path(udev), ".rules");
- }
-
-+ /* /run/udev -- throw-away/temporary rules */
-+ util_strscpyl(runpathrules, sizeof(runpathrules), udev_get_run_path(udev), "/rules.d", NULL);
-+ add_matching_files(udev, &file_list, runpathrules, ".rules");
-+
- /* add all filenames to the string buffer */
- udev_list_entry_foreach(file_loop, udev_list_get_entry(&file_list)) {
- const char *filename = udev_list_entry_get_value(file_loop);
-diff --git a/udev/udevd.c b/udev/udevd.c
-index f1a31e7..45d10b6 100644
---- a/udev/udevd.c
-+++ b/udev/udevd.c
-@@ -1198,6 +1198,8 @@ int main(int argc, char *argv[])
- struct epoll_event ep_ctrl, ep_inotify, ep_signal, ep_netlink, ep_worker;
- struct udev_ctrl_connection *ctrl_conn = NULL;
- int rc = 1;
-+ char filename[UTIL_PATH_SIZE];
-+ struct stat statbuf;
-
- udev = udev_new();
- if (udev == NULL)
-@@ -1480,23 +1482,21 @@ int main(int argc, char *argv[])
- inotify_add_watch(fd_inotify, udev_get_rules_path(udev),
- IN_DELETE | IN_MOVE | IN_CLOSE_WRITE);
- } else {
-- char filename[UTIL_PATH_SIZE];
-- struct stat statbuf;
-
- inotify_add_watch(fd_inotify, LIBEXECDIR "/rules.d",
- IN_DELETE | IN_MOVE | IN_CLOSE_WRITE);
- inotify_add_watch(fd_inotify, SYSCONFDIR "/udev/rules.d",
- IN_DELETE | IN_MOVE | IN_CLOSE_WRITE);
-+ }
-
-- /* watch dynamic rules directory */
-- util_strscpyl(filename, sizeof(filename), udev_get_run_path(udev), "/rules.d", NULL);
-- if (stat(filename, &statbuf) != 0) {
-- util_create_path(udev, filename);
-- mkdir(filename, 0755);
-- }
-- inotify_add_watch(fd_inotify, filename,
-- IN_DELETE | IN_MOVE | IN_CLOSE_WRITE);
-+ /* watch dynamic rules directory */
-+ util_strscpyl(filename, sizeof(filename), udev_get_run_path(udev), "/rules.d", NULL);
-+ if (stat(filename, &statbuf) != 0) {
-+ util_create_path(udev, filename);
-+ mkdir(filename, 0755);
- }
-+ inotify_add_watch(fd_inotify, filename,
-+ IN_DELETE | IN_MOVE | IN_CLOSE_WRITE);
- udev_watch_restore(udev);
-
- /* block and listen to all signals on signalfd */
diff --git a/pkgs/os-specific/linux/udev/pre-accept4-kernel.patch b/pkgs/os-specific/linux/udev/pre-accept4-kernel.patch
deleted file mode 100644
index 2cf549d99a7..00000000000
--- a/pkgs/os-specific/linux/udev/pre-accept4-kernel.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From:
-https://github.com/archlinuxarm/PKGBUILDs/blob/master/core/udev-oxnas/pre-accept4-kernel.patch
-
-diff -urN a/udev/udev-ctrl.c b/udev/udev-ctrl.c
---- a/udev/udev-ctrl.c 2011-10-09 17:10:32.000000000 -0600
-+++ b/udev/udev-ctrl.c 2011-10-25 15:11:09.000000000 -0600
-@@ -15,6 +15,7 @@
- #include
- #include
- #include
-+#include
- #include
- #include
- #include
-@@ -182,6 +183,7 @@
- struct ucred ucred;
- socklen_t slen;
- const int on = 1;
-+ int flgs;
-
- conn = calloc(1, sizeof(struct udev_ctrl_connection));
- if (conn == NULL)
-@@ -189,13 +191,19 @@
- conn->refcount = 1;
- conn->uctrl = uctrl;
-
-- conn->sock = accept4(uctrl->sock, NULL, NULL, SOCK_CLOEXEC|SOCK_NONBLOCK);
-+// conn->sock = accept4(uctrl->sock, NULL, NULL, SOCK_CLOEXEC|SOCK_NONBLOCK);
-+ conn->sock = accept(uctrl->sock, NULL, NULL);
- if (conn->sock < 0) {
- if (errno != EINTR)
- err(uctrl->udev, "unable to receive ctrl connection: %m\n");
- goto err;
- }
-
-+// Since we don't have accept4
-+ flgs = fcntl(conn->sock, F_GETFL, NULL);
-+ if(flgs >= 0) fcntl(conn->sock, F_SETFL, flgs | O_NONBLOCK);
-+ fcntl(conn->sock, F_SETFD, FD_CLOEXEC);
-+
- /* check peer credential of connection */
- slen = sizeof(ucred);
- if (getsockopt(conn->sock, SOL_SOCKET, SO_PEERCRED, &ucred, &slen) < 0) {
diff --git a/pkgs/os-specific/linux/udisks/default.nix b/pkgs/os-specific/linux/udisks/default.nix
index 4987e90429c..b53af52755f 100644
--- a/pkgs/os-specific/linux/udisks/default.nix
+++ b/pkgs/os-specific/linux/udisks/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "1xgqifddwaavmjc8c30i0mdffyirsld7c6qhfyjw7f9khwv8jjw5";
};
- patches = [ ./purity.patch ];
+ patches = [ ./purity.patch ./no-pci-db.patch ];
postPatch =
''
@@ -26,15 +26,10 @@ stdenv.mkDerivation rec {
lvm2 libatasmart intltool libuuid libxslt docbook_xsl
];
- buildNativeInputs = [ pkgconfig ];
+ nativeBuildInputs = [ pkgconfig ];
configureFlags = "--localstatedir=/var --enable-lvm2";
- preConfigure =
- ''
- # Ensure that udisks can find the necessary programs.
- '';
-
meta = {
homepage = http://www.freedesktop.org/wiki/Software/udisks;
description = "A daemon and command-line utility for querying and manipulating storage devices";
diff --git a/pkgs/os-specific/linux/udisks/no-pci-db.patch b/pkgs/os-specific/linux/udisks/no-pci-db.patch
new file mode 100644
index 00000000000..b323b515c40
--- /dev/null
+++ b/pkgs/os-specific/linux/udisks/no-pci-db.patch
@@ -0,0 +1,13 @@
+Systemd no longer has the pci-db program.
+
+diff -ru -x '*~' udisks-1.0.4-orig/data/80-udisks.rules udisks-1.0.4/data/80-udisks.rules
+--- udisks-1.0.4-orig/data/80-udisks.rules 2011-08-25 23:31:20.000000000 +0200
++++ udisks-1.0.4/data/80-udisks.rules 2012-12-13 13:06:52.189650854 +0100
+@@ -3,7 +3,6 @@
+
+ # import names for PCI storage controllers
+ #
+-SUBSYSTEM=="pci", ACTION=="add|change", ENV{ID_MODEL_FROM_DATABASE}=="", ATTR{class}=="0x01*", IMPORT{program}="pci-db %p"
+
+ # Set eSATA port type for known eSATA CardBus adapters - first we want to ensure
+ # the device is on a cardbus controller (upper PCI device) - then we check
diff --git a/pkgs/os-specific/linux/uml-utilities/builder.sh b/pkgs/os-specific/linux/uml-utilities/builder.sh
deleted file mode 100644
index 00b40278889..00000000000
--- a/pkgs/os-specific/linux/uml-utilities/builder.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-buildinputs=""
-source $stdenv/setup
-
-tar xvfj $src
-cd tools
-[ -n "$tunctl" ] && sed -e '1s/.*/TUNCTL = tunctl/' -i Makefile
-[ -z "$mconsole" ] && sed -e 's/mconsole//' -i Makefile
-
-mkdir $out
-mkdir $out/bin
-mkdir $out/lib
-mkdir $out/lib/uml
-make BIN_DIR=$out/bin LIB_DIR=$out/lib/uml
-make BIN_DIR=$out/bin LIB_DIR=$out/lib/uml install
-ln -s $out/lib/uml/port-helper $out/bin/port-helper
-[ -z "$tunctl" ] || [ -f $out/bin/tunctl ] || fail_no_tunctl
-[ -z "$mconsole" ] || [ -f $out/bin/uml_mconsole ] || fail_no_mconsole
diff --git a/pkgs/os-specific/linux/uml-utilities/default.nix b/pkgs/os-specific/linux/uml-utilities/default.nix
deleted file mode 100644
index 4ed7c6e8a3a..00000000000
--- a/pkgs/os-specific/linux/uml-utilities/default.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{lib, stdenv, fetchurl, linuxHeaders , readline, tunctl ? false, mconsole ? false}:
-
-stdenv.mkDerivation {
- inherit tunctl mconsole;
- buildInputs = lib.optional tunctl linuxHeaders
- ++ lib.optional mconsole readline;
- name = "uml-utilities-20040114";
- builder = ./builder.sh;
- src = fetchurl {
- url = http://nixos.org/tarballs/uml_utilities_20040114.tar.bz2;
- md5 = "1fd5b791ef32c6a3ed4ae42c4a53a316";
- };
-}
diff --git a/pkgs/os-specific/linux/upower/default.nix b/pkgs/os-specific/linux/upower/default.nix
index 2f870e5d999..8f244c3d645 100644
--- a/pkgs/os-specific/linux/upower/default.nix
+++ b/pkgs/os-specific/linux/upower/default.nix
@@ -1,23 +1,23 @@
{ stdenv, fetchurl, pkgconfig, glib, dbus, dbus_glib, dbus_tools, polkit
, intltool, libxslt, docbook_xsl, udev, libusb1, pmutils
-, useSystemd ? false, systemd ? null
+, useSystemd ? true, systemd
}:
assert stdenv.isLinux;
stdenv.mkDerivation rec {
- name = "upower-0.9.18";
+ name = "upower-0.9.19";
src = fetchurl {
url = "http://upower.freedesktop.org/releases/${name}.tar.xz";
- sha256 = "13q6cw2d45qp077g3bjng4yhrvm6g1y9347dkf53kscm5xfm18d1";
+ sha256 = "053yahks5c7nwdxwx8q6nqp3mxbqldmc844mzyvc3ws9635zmisl";
};
buildInputs =
[ dbus_glib polkit intltool libxslt docbook_xsl udev libusb1 ]
++ stdenv.lib.optional useSystemd systemd;
- buildNativeInputs = [ pkgconfig ];
+ nativeBuildInputs = [ pkgconfig ];
configureFlags =
[ "--with-backend=linux" "--localstatedir=/var" ]
diff --git a/pkgs/os-specific/linux/upstart/cfgdir.patch b/pkgs/os-specific/linux/upstart/cfgdir.patch
deleted file mode 100644
index 2a29b36412c..00000000000
--- a/pkgs/os-specific/linux/upstart/cfgdir.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -rc upstart-0.3.0-orig/init/main.c upstart-0.3.0/init/main.c
-*** upstart-0.3.0-orig/init/main.c 2006-10-13 14:35:16.000000000 +0200
---- upstart-0.3.0/init/main.c 2006-11-19 21:41:01.000000000 +0100
-***************
-*** 206,215 ****
- control_open ();
-
- /* Read configuration */
-! cfg_watch_dir (NULL, CFG_DIR, NULL);
-
- /* Set the PATH environment variable */
-! setenv ("PATH", PATH, TRUE);
-
-
- /* Generate and run the startup event or read the state from the
---- 206,217 ----
- control_open ();
-
- /* Read configuration */
-! char *cfg_dir = getenv("UPSTART_CFG_DIR");
-! if (!cfg_dir) cfg_dir = CFG_DIR;
-! cfg_watch_dir (NULL, cfg_dir, NULL);
-
- /* Set the PATH environment variable */
-! /* setenv ("PATH", PATH, TRUE); */
-
-
- /* Generate and run the startup event or read the state from the
-diff -rc upstart-0.3.0-orig/util/initctl.c upstart-0.3.0/util/initctl.c
-*** upstart-0.3.0-orig/util/initctl.c 2006-10-13 16:18:06.000000000 +0200
---- upstart-0.3.0/util/initctl.c 2006-11-20 16:53:21.000000000 +0100
-***************
-*** 95,105 ****
- } else if (! strcmp (command->command, "stop")) {
- msg.type = UPSTART_JOB_STOP;
- msg.job_stop.name = *arg;
-- break;
- } else if (! strcmp (command->command, "status")) {
- msg.type = UPSTART_JOB_QUERY;
- msg.job_stop.name = *arg;
-- break;
- }
-
- /* Send the message */
---- 95,103 ----
diff --git a/pkgs/os-specific/linux/usbutils/default.nix b/pkgs/os-specific/linux/usbutils/default.nix
index 96ae5b93aa8..5af28876dc1 100644
--- a/pkgs/os-specific/linux/usbutils/default.nix
+++ b/pkgs/os-specific/linux/usbutils/default.nix
@@ -1,25 +1,25 @@
-{ stdenv, fetchurl, pkgconfig, libusb }:
+{ stdenv, fetchurl, pkgconfig, libusb1 }:
let
# Obtained from http://www.linux-usb.org/usb.ids.bz2.
usbids = fetchurl {
- url = http://nixos.org/tarballs/usb.ids.20100720.bz2;
- sha256 = "0krncssk0b10z6grw305824zma953l3g2rb7jkk25mb78pw5fd5d";
+ url = http://nixos.org/tarballs/usb.ids.20120920.bz2;
+ sha256 = "0sz860g7grf6kx22p49s6j8h85c69ymcw16a8110klzfl9hl9hli";
};
in
stdenv.mkDerivation rec {
- name = "usbutils-0.86";
-
+ name = "usbutils-006";
+
src = fetchurl {
- url = "mirror://kernel/linux/utils/usb/usbutils/${name}.tar.gz";
- sha256 = "1x0jkiwrgdb8qwy21iwhxpc8k61apxqp1901h866d1ydsakbxcmk";
+ url = mirror://kernel/linux/utils/usb/usbutils/usbutils-006.tar.xz;
+ sha256 = "03pd57vv8c6x0hgjqcbrxnzi14h8hcghmapg89p8k5zpwpkvbdfr";
};
-
- buildInputs = [ pkgconfig libusb ];
-
+
+ buildInputs = [ pkgconfig libusb1 ];
+
preBuild = "bunzip2 < ${usbids} > usb.ids";
meta = {
diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix
index ae5727568f2..d42424e6fc8 100644
--- a/pkgs/os-specific/linux/util-linux/default.nix
+++ b/pkgs/os-specific/linux/util-linux/default.nix
@@ -1,17 +1,13 @@
-{ stdenv, fetchurl, zlib, ncurses ? null, perl ? null }:
+{ stdenv, fetchurl, zlib, ncurses ? null, perl ? null, pam }:
stdenv.mkDerivation rec {
- name = "util-linux-2.20.1";
+ name = "util-linux-2.22.2";
src = fetchurl {
- # This used to be mirror://kernel/linux/utils/util-linux, but it
- # disappeared in the kernel.org meltdown.
- url = "mirror://gentoo/distfiles/${name}.tar.bz2";
- sha256 = "1q5vjcvw4f067c63vj2n3xggvk5prm11571x6vnqiav47vdbqvni";
+ url = "http://www.kernel.org/pub/linux/utils/util-linux/v2.22/${name}.tar.bz2";
+ sha256 = "0vf3ifb45gr4cd27pmmxk8y5b3r0920mv16fv0vfwz5705xa2qvl";
};
- patches = [ ./linux-specific-header.patch ];
-
crossAttrs = {
# Work around use of `AC_RUN_IFELSE'.
preConfigure = "export scanf_cv_type_modifier=ms";
@@ -21,13 +17,27 @@ stdenv.mkDerivation rec {
# (/sbin/mount.*) through an environment variable, but that's
# somewhat risky because we have to consider that mount can setuid
# root...
+ # --enable-libmount-mount fixes the behaviour being /etc/mtab a symlink to /proc/monunts
+ # http://pl.digipedia.org/usenet/thread/19513/1924/
configureFlags = ''
- --disable-use-tty-group
--enable-write
+ --enable-last
+ --enable-mesg
+ --enable-ddate
+ --disable-use-tty-group
--enable-fs-paths-default=/var/setuid-wrappers:/var/run/current-system/sw/sbin:/sbin
${if ncurses == null then "--without-ncurses" else ""}
'';
- buildInputs = [ zlib ] ++ stdenv.lib.optional (ncurses != null) ncurses
- ++ stdenv.lib.optional (perl != null) perl;
+ buildInputs =
+ [ zlib pam ]
+ ++ stdenv.lib.optional (ncurses != null) ncurses
+ ++ stdenv.lib.optional (perl != null) perl;
+
+ enableParallelBuilding = true;
+
+ meta = {
+ homepage = http://www.kernel.org/pub/linux/utils/util-linux/;
+ description = "A set of system utilities for Linux";
+ };
}
diff --git a/pkgs/os-specific/linux/util-linux/linux-specific-header.patch b/pkgs/os-specific/linux/util-linux/linux-specific-header.patch
deleted file mode 100644
index 8d0b57dea3f..00000000000
--- a/pkgs/os-specific/linux/util-linux/linux-specific-header.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-The header is Linux-only and breaks GNU/Hurd builds.
-
---- util-linux-2.20.1/term-utils/write.c 2012-03-07 23:06:14.000000000 +0100
-+++ util-linux-2.20.1/term-utils/write.c 2012-03-07 23:06:19.000000000 +0100
-@@ -57,7 +57,9 @@
- #include
- #include
- #include
--#include
-+#ifdef __linux__
-+# include
-+#endif
- #include
- #include "c.h"
- #include "carefulputc.h"
-
diff --git a/pkgs/os-specific/linux/v4l-utils/default.nix b/pkgs/os-specific/linux/v4l-utils/default.nix
index ea63dadc8bd..8e6584465d0 100644
--- a/pkgs/os-specific/linux/v4l-utils/default.nix
+++ b/pkgs/os-specific/linux/v4l-utils/default.nix
@@ -4,30 +4,22 @@
assert withQt4 -> qt4 != null;
stdenv.mkDerivation rec {
- name = "v4l-utils-0.8.8";
+ name = "v4l-utils-0.9.3";
src = fetchurl {
url = "http://linuxtv.org/downloads/v4l-utils/${name}.tar.bz2";
- sha256 = "0zx8f1npsl6g5vjah1gwydg1j5azl74kr83ifbjhshgmnvscd92z";
+ sha256 = "0gaag38x47wlvmp4j60wgf9ma1rxzfyg7i12zxxxi4m3cpcb0bah";
};
- buildInputs = [ libjpeg which ] ++ stdenv.lib.optional withQt4 qt4;
+ buildInputs = [ which ];
+ propagatedBuildInputs = [ libjpeg ] ++ stdenv.lib.optional withQt4 qt4;
- # The keytable wants to touch /etc files and udev scripts in /lib.
- # I skip it.
- patchPhase = ''
- sed -i s/keytable// utils/Makefile
- '';
-
- installPhase = ''
- make PREFIX=$out install
- '';
+ preConfigure = ''configureFlags="--with-udevdir=$out/lib/udev"'';
meta = {
homepage = http://linuxtv.org/projects.php;
description = "V4L utils and libv4l, that provides common image formats regardless of the v4l device";
- # (The libs are of LGPLv2.1+, some other pieces are GPL)
- license = "free";
+ license = "free"; # The libs are of LGPLv2.1+, some other pieces are GPL.
maintainers = with stdenv.lib.maintainers; [viric];
platforms = with stdenv.lib.platforms; linux;
};
diff --git a/pkgs/os-specific/linux/v86d/default.nix b/pkgs/os-specific/linux/v86d/default.nix
index aedfe9ac686..f0f7fcbb9ce 100644
--- a/pkgs/os-specific/linux/v86d/default.nix
+++ b/pkgs/os-specific/linux/v86d/default.nix
@@ -1,10 +1,11 @@
{stdenv, fetchurl, klibc, kernel, withKlibc ? true}:
stdenv.mkDerivation rec {
- name = "v86d-0.1.10-${kernel.version}";
+ name = "v86d-${version}-${kernel.version}";
+ version = "0.1.10";
src = fetchurl {
- url = "http://dev.gentoo.org/~spock/projects/uvesafb/archive/${name}.tar.bz2";
+ url = "mirror://gentoo/distfiles//v86d-${version}.tar.bz2";
sha256 = "0p3kwqjis941pns9948dxfnjnl5lwd8f2b6x794whs7g32p68jb3";
};
diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix
index 522478ed5b7..b3d94e26396 100644
--- a/pkgs/os-specific/linux/wpa_supplicant/default.nix
+++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix
@@ -1,43 +1,48 @@
-{ stdenv, fetchurl, openssl, dbus_libs, pkgconfig, libnl1 }:
+{ stdenv, fetchurl, lib, openssl, dbus_libs, pkgconfig, libnl
+, readlineSupport ? true, readline
+}:
+
+assert readlineSupport -> readline != null;
stdenv.mkDerivation rec {
- version = "0.7.3";
-
+ version = "1.1";
+
name = "wpa_supplicant-${version}";
src = fetchurl {
- url = "http://hostap.epitest.fi/releases/wpa_supplicant-${version}.tar.gz";
- sha256 = "0hwlsn512q2ps8wxxjmkjfdg3vjqqb9mxnnwfv1wqijkm3551kfh";
+ url = "http://hostap.epitest.fi/releases/${name}.tar.gz";
+ sha256 = "00lyifj8cz7qyal6dy1dxbpk3g3bywvdarik8gbj9ds7zmfbwkd5";
};
-
+
+ extraConfig =
+ ''
+ CONFIG_DEBUG_SYSLOG=y
+ CONFIG_CTRL_IFACE_DBUS=y
+ CONFIG_CTRL_IFACE_DBUS_NEW=y
+ CONFIG_CTRL_IFACE_DBUS_INTRO=y
+ CONFIG_DRIVER_NL80211=y
+ CONFIG_LIBNL32=y
+ ${stdenv.lib.optionalString readlineSupport "CONFIG_READLINE=y"}
+ '';
+
preBuild = ''
cd wpa_supplicant
cp -v defconfig .config
- echo CONFIG_DEBUG_SYSLOG=y | tee -a .config
- echo CONFIG_CTRL_IFACE_DBUS=y | tee -a .config
- echo CONFIG_CTRL_IFACE_DBUS_NEW=y | tee -a .config
- echo CONFIG_CTRL_IFACE_DBUS_INTRO=y | tee -a .config
- echo CONFIG_DRIVER_NL80211=y | tee -a .config
+ echo "$extraConfig" >> .config
+ cat .config
substituteInPlace Makefile --replace /usr/local $out
'';
- buildInputs = [ openssl dbus_libs libnl1 ];
+ buildInputs = [ openssl dbus_libs libnl ]
+ ++ lib.optional readlineSupport readline;
- buildNativeInputs = [ pkgconfig ];
+ nativeBuildInputs = [ pkgconfig ];
patches =
- [ # Upstream patch required for NetworkManager-0.9
- (fetchurl {
- url = "http://w1.fi/gitweb/gitweb.cgi?p=hostap-07.git;a=commitdiff_plain;h=b80b5639935d37b95d00f86b57f2844a9c775f57";
- name = "wpa_supplicant-nm-0.9.patch";
- sha256 = "1pqba0l4rfhba5qafvvbywi9x1qmphs944p704bh1flnx7cz6ya8";
- })
- # wpa_supplicant crashes when controlled through dbus (wicd/nm)
- # see: https://bugzilla.redhat.com/show_bug.cgi?id=678625
- (fetchurl {
- url = "https://bugzilla.redhat.com/attachment.cgi?id=491018";
- name = "dbus-assertion-fix.patch";
- sha256 = "6206d79bcd800d56cae73e2a01a27ac2bee961512f77e5d62a59256a9919077a";
+ [ (fetchurl {
+ url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/hostap_allow-linking-with-libnl-3.2.patch?h=packages/wpa_supplicant";
+ name = "hostap_allow-linking-with-libnl-3.2.patch";
+ sha256 = "0iwvjq0apc6mv1r03k5pnyjgda3q47yx36c4lqvv8i8q1vn7kbf2";
})
];
@@ -45,10 +50,11 @@ stdenv.mkDerivation rec {
mkdir -p $out/share/man/man5 $out/share/man/man8
cp -v doc/docbook/*.5 $out/share/man/man5/
cp -v doc/docbook/*.8 $out/share/man/man8/
- mkdir -p $out/etc/dbus-1/system.d $out/share/dbus-1/system-services
+ mkdir -p $out/etc/dbus-1/system.d $out/share/dbus-1/system-services $out/etc/systemd/system
cp -v dbus/*service $out/share/dbus-1/system-services
sed -e "s@/sbin/wpa_supplicant@$out&@" -i $out/share/dbus-1/system-services/*
cp -v dbus/dbus-wpa_supplicant.conf $out/etc/dbus-1/system.d
+ cp -v systemd/*.service $out/etc/systemd/system
''; # */
meta = {
diff --git a/pkgs/os-specific/linux/wpa_supplicant/gui.nix b/pkgs/os-specific/linux/wpa_supplicant/gui.nix
index 12ec08361a6..29591bf0335 100644
--- a/pkgs/os-specific/linux/wpa_supplicant/gui.nix
+++ b/pkgs/os-specific/linux/wpa_supplicant/gui.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
buildInputs = [ qt4 ];
- buildNativeInputs = [ inkscape ];
+ nativeBuildInputs = [ inkscape ];
prePatch = "cd wpa_supplicant/wpa_gui-qt4";
diff --git a/pkgs/os-specific/linux/x86info/default.nix b/pkgs/os-specific/linux/x86info/default.nix
new file mode 100644
index 00000000000..297991ff4d9
--- /dev/null
+++ b/pkgs/os-specific/linux/x86info/default.nix
@@ -0,0 +1,35 @@
+{stdenv, fetchurl, pciutils, python}:
+
+stdenv.mkDerivation rec {
+ version = "1.30";
+ name = "x86info-${version}";
+
+ src = fetchurl {
+ url = "http://codemonkey.org.uk/projects/x86info/${name}.tgz";
+ sha256 = "0a4lzka46nabpsrg3n7akwr46q38f96zfszd73xcback1s2hjc7y";
+ };
+
+ preConfigure = "patchShebangs .";
+
+ buildInputs = [ pciutils python ];
+
+ installPhase = ''
+ ensureDir $out/bin
+ cp x86info lsmsr $out/bin
+ '';
+
+ meta = {
+ description = "An identification utility for the x86 series of processors.";
+ longDescription =
+ ''
+ x86info will identify all Intel/AMD/Centaur/Cyrix/VIA CPUs. It leverages
+ the cpuid kernel module where possible. it supports parsing model specific
+ registers (MSRs) via the msr kernel module. it will approximate processor
+ frequency, and identify the cache sizes and layout.
+ '';
+ platforms = stdenv.lib.platforms.linux;
+ license = stdenv.lib.licenses.gpl2;
+ homepage = http://codemonkey.org.uk/projects/x86info/;
+ maintainers = with stdenv.lib.maintainers; [jcumming];
+ };
+}
diff --git a/pkgs/os-specific/linux/xf86-input-mtrack/default.nix b/pkgs/os-specific/linux/xf86-input-mtrack/default.nix
index 405f722f70f..4f74ce57ea8 100644
--- a/pkgs/os-specific/linux/xf86-input-mtrack/default.nix
+++ b/pkgs/os-specific/linux/xf86-input-mtrack/default.nix
@@ -10,10 +10,11 @@
, xorgserver
, xproto
, inputproto
+, pixman
}:
stdenv.mkDerivation {
- name = "xf86-input-mtrack-0.2.0";
+ name = "xf86-input-mtrack-0.3.0";
preConfigure = "autoreconf -vfi";
@@ -27,12 +28,15 @@ stdenv.mkDerivation {
xorgserver
xproto
inputproto
+ pixman
];
+ CFLAGS = "-I${pixman}/include/pixman-1";
+
src = fetchurl {
name = "xf86-input-mtrack.tar.gz";
- url = "https://github.com/BlueDragonX/xf86-input-mtrack/tarball/v0.2.0";
- sha256 = "1zvd68dxpjn44ys7ysi3yc95xdjw1rz0s3xwlh3fzpw1ib3wrr3x";
+ url = "https://github.com/BlueDragonX/xf86-input-mtrack/tarball/v0.3.0";
+ sha256 = "174rdw7gv0wsnjgmwpx4pgjn1zfbylflda4k2dzff6phzxj9yl6v";
};
meta = {
@@ -45,3 +49,4 @@ stdenv.mkDerivation {
maintainers = [ stdenv.lib.maintainers.shlevy ];
};
}
+
diff --git a/pkgs/os-specific/linux/xf86-input-wacom/default.nix b/pkgs/os-specific/linux/xf86-input-wacom/default.nix
index 4bcf82a7052..e043b12e820 100644
--- a/pkgs/os-specific/linux/xf86-input-wacom/default.nix
+++ b/pkgs/os-specific/linux/xf86-input-wacom/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl
-, file, inputproto, libX11, libXext, libXi, libXrandr, libXrender, libXinerama
-, ncurses, pkgconfig, randrproto, xorgserver, xproto, udev }:
+, file, inputproto, libX11, libXext, libXi, libXrandr, libXrender
+, ncurses, pkgconfig, randrproto, xorgserver, xproto, udev, libXinerama, pixman }:
stdenv.mkDerivation rec {
name = "xf86-input-wacom-0.16.0";
@@ -10,8 +10,8 @@ stdenv.mkDerivation rec {
sha256 = "0sc0hmbs3l3ad68iwglbwjv9lg1vd333n1lv72j4nqmk7g57yrii";
};
- buildInputs = [ inputproto libX11 libXext libXi libXrandr libXrender libXinerama
- ncurses pkgconfig randrproto xorgserver xproto udev ];
+ buildInputs = [ inputproto libX11 libXext libXi libXrandr libXrender
+ ncurses pkgconfig randrproto xorgserver xproto udev libXinerama pixman ];
preConfigure = ''
mkdir -p $out/share/X11/xorg.conf.d
@@ -19,6 +19,8 @@ stdenv.mkDerivation rec {
--with-sdkdir=$out/include/xorg --with-xorg-conf-dir=$out/share/X11/xorg.conf.d"
'';
+ CFLAGS = "-I${pixman}/include/pixman-1";
+
meta = with stdenv.lib; {
maintainers = [ maintainers.goibhniu maintainers.urkud ];
description = "Wacom digitizer driver for X11";
diff --git a/pkgs/os-specific/linux/xf86-video-nested/default.nix b/pkgs/os-specific/linux/xf86-video-nested/default.nix
index 6ed04f490c0..b3cad227d27 100644
--- a/pkgs/os-specific/linux/xf86-video-nested/default.nix
+++ b/pkgs/os-specific/linux/xf86-video-nested/default.nix
@@ -1,30 +1,31 @@
{ stdenv, fetchgit, autoconf, automake, fontsproto, libX11, libXext
-, libtool, pkgconfig, renderproto, utilmacros, xorgserver
+, libtool, pixman, pkgconfig, renderproto, utilmacros, xorgserver
}:
stdenv.mkDerivation {
- name = "xf86-video-nested-2011-09-12";
+ name = "xf86-video-nested-2012-06-15";
- # Breaks at 8d80f2e415e9e58ca481fe52ae8f2290e25de898 for Xorg 7.6
src = fetchgit {
url = git://anongit.freedesktop.org/xorg/driver/xf86-video-nested;
- rev = "fceee1716625badf698ca27dd5788a4deb8533bc";
- sha256 = "6b3544ddcf40602364fd0e528f6e677c37ef8d08f6c4e756caea7e29abf200f7";
+ rev = "ad48dc6eb98776a8a886f26f31c0110352fa1da4";
+ sha256 = "43a102405acdcdb346ab197b33c8fa724d2140f33754f8ee3941a0eea152735c";
};
- # Fixed in e123277d10337a1c3b853118df0d1becdddf3b77
- patchPhase = "sed -e 's/Werror/Werror -Wno-extra-portability/g' -i configure.ac";
-
- buildInputs =
- [ autoconf automake fontsproto libX11 libXext libtool pkgconfig
- renderproto utilmacros xorgserver
+ buildInputs =
+ [ autoconf automake fontsproto libX11 libXext libtool pixman
+ pkgconfig renderproto utilmacros xorgserver
];
- configureScript = "./autogen.sh";
+
+ configurePhase = ''
+ autoreconf -fvi
+ ./configure --prefix=$out CFLAGS="-I${pixman}/include/pixman-1"
+ '';
meta = {
homepage = git://anongit.freedesktop.org/xorg/driver/xf86-video-nested;
description = "Driver to run Xorg on top of Xorg or something else";
maintainers = [ stdenv.lib.maintainers.goibhniu ];
+ platforms = stdenv.lib.platforms.linux;
};
}
diff --git a/pkgs/os-specific/linux/xf86-video-nouveau/default.nix b/pkgs/os-specific/linux/xf86-video-nouveau/default.nix
index e92b7f8003d..876daa7a1ec 100644
--- a/pkgs/os-specific/linux/xf86-video-nouveau/default.nix
+++ b/pkgs/os-specific/linux/xf86-video-nouveau/default.nix
@@ -3,7 +3,7 @@
, autoconf
, automake
, libtool
-, xorgserver, xproto, fontsproto, xf86driproto, renderproto, videoproto
+, xorgserver, xproto, fontsproto, xf86driproto, renderproto, videoproto, pixman
, utilmacros
, libdrm
, pkgconfig }:
@@ -21,12 +21,14 @@ stdenv.mkDerivation {
autoconf
automake
libtool
- xorgserver xproto fontsproto xf86driproto renderproto videoproto
+ xorgserver xproto fontsproto xf86driproto renderproto videoproto pixman
utilmacros
libdrm
pkgconfig
];
+ NIX_CFLAGS_COMPILE = "-I${pixman}/include/pixman-1";
+
preConfigure = "autoreconf -vfi";
meta = {
diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix
new file mode 100644
index 00000000000..4769d78a2fd
--- /dev/null
+++ b/pkgs/os-specific/linux/zfs/default.nix
@@ -0,0 +1,50 @@
+{ stdenv, fetchurl, kernel, spl, perl, autoconf, automake, libtool, zlib, libuuid, coreutils, utillinux }:
+
+stdenv.mkDerivation {
+ name = "zfs-0.6.0-rc14-${kernel.version}";
+
+ src = fetchurl {
+ url = http://archive.zfsonlinux.org/downloads/zfsonlinux/zfs/zfs-0.6.0-rc14.tar.gz;
+ sha256 = "0ny2lbhyfsfwfcasa1iv2hz12hzcskx9mv641955d844dh32z9fg";
+ };
+
+ patches = [ ./module_perm_prefix.patch ./mount_zfs_prefix.patch ./kerneldir_path.patch ./no_absolute_paths_to_coreutils.patch ];
+
+ buildInputs = [ kernel spl perl autoconf automake libtool zlib libuuid coreutils ];
+
+ # for zdb to get the rpath to libgcc_s, needed for pthread_cancel to work
+ NIX_CFLAGS_LINK = "-lgcc_s";
+ NIX_CFLAGS_COMPILE = "-I${kernel}/lib/modules/${kernel.modDirVersion}/build/include/generated";
+
+ preConfigure = ''
+ ./autogen.sh
+
+ substituteInPlace ./module/zfs/zfs_ctldir.c --replace "umount -t zfs" "${utillinux}/bin/umount -t zfs"
+ substituteInPlace ./module/zfs/zfs_ctldir.c --replace "mount -t zfs" "${utillinux}/bin/mount -t zfs"
+ substituteInPlace ./lib/libzfs/libzfs_mount.c --replace "/bin/umount" "${utillinux}/bin/umount"
+ substituteInPlace ./lib/libzfs/libzfs_mount.c --replace "/bin/mount" "${utillinux}/bin/mount"
+ substituteInPlace ./udev/rules.d/* --replace "/lib/udev/vdev_id" "$out/lib/udev/vdev_id"
+ substituteInPlace ./cmd/ztest/ztest.c --replace "/usr/sbin/ztest" "$out/sbin/ztest"
+ substituteInPlace ./cmd/ztest/ztest.c --replace "/usr/sbin/zdb" "$out/sbin/zdb"
+ '';
+
+ configureFlags = ''
+ --with-linux=${kernel}/lib/modules/${kernel.version}/build
+ --with-linux-obj=${kernel}/lib/modules/${kernel.version}/build
+ --with-spl=${spl}/libexec/spl/${kernel.version}
+ ${if stdenv.system == "i686-linux" then "--enable-atomic-spinlocks" else ""}
+ '';
+
+ meta = {
+ description = "ZFS Filesystem Linux Kernel module";
+ longDescription = ''
+ ZFS is a filesystem that combines a logical volume manager with a
+ Copy-On-Write filesystem with data integrity detection and repair,
+ snapshotting, cloning, block devices, deduplication, and more.
+ '';
+ homepage = http://zfsonlinux.org/;
+ license = stdenv.lib.licenses.cddl;
+ platforms = stdenv.lib.platforms.linux;
+ maintainers = with stdenv.lib.maintainers; [ jcumming ];
+ };
+}
diff --git a/pkgs/os-specific/linux/zfs/kerneldir_path.patch b/pkgs/os-specific/linux/zfs/kerneldir_path.patch
new file mode 100644
index 00000000000..4503ac4ca48
--- /dev/null
+++ b/pkgs/os-specific/linux/zfs/kerneldir_path.patch
@@ -0,0 +1,85 @@
+diff --git a/Makefile.am b/Makefile.am
+index 9ffd6be..8e51412 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -34,7 +34,7 @@ distclean-local::
+ if CONFIG_KERNEL
+ install-data-local:
+ release=$(ZFS_META_VERSION)-$(ZFS_META_RELEASE); \
+- instdest=$(DESTDIR)/usr/src/zfs-$$release/$(LINUX_VERSION); \
++ instdest=$(DESTDIR)/$(libexecdir)/zfs/$(LINUX_VERSION); \
+ for instfile in $(noinst_HEADERS) module/$(LINUX_SYMBOLS); do \
+ $(INSTALL) -D $$instfile $$instdest/$$instfile; \
+ done
+diff --git a/include/Makefile.am b/include/Makefile.am
+index 8f9c8d7..5fc44d5 100644
+--- a/include/Makefile.am
++++ b/include/Makefile.am
+@@ -27,6 +27,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H)
+ endif
+
+ if CONFIG_KERNEL
+-kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)-$(ZFS_META_RELEASE)/$(LINUX_VERSION)
++kerneldir = $(DESTDIR)/$(libexecdir)/zfs/$(LINUX_VERSION)
+ kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
+ endif
+diff --git a/include/linux/Makefile.am b/include/linux/Makefile.am
+index 6e481a1..1107809 100644
+--- a/include/linux/Makefile.am
++++ b/include/linux/Makefile.am
+@@ -16,6 +16,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H)
+ endif
+
+ if CONFIG_KERNEL
+-kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)-$(ZFS_META_RELEASE)/$(LINUX_VERSION)/linux
++kerneldir = $(DESTDIR)/$(libexecdir)/zfs/$(LINUX_VERSION)
+ kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
+ endif
+diff --git a/include/sys/Makefile.am b/include/sys/Makefile.am
+index 651e68b..b80bb55 100644
+--- a/include/sys/Makefile.am
++++ b/include/sys/Makefile.am
+@@ -89,6 +89,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H)
+ endif
+
+ if CONFIG_KERNEL
+-kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)-$(ZFS_META_RELEASE)/$(LINUX_VERSION)/sys
++kerneldir = $(DESTDIR)/$(libexecdir)/zfs/$(LINUX_VERSION)
+ kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
+ endif
+diff --git a/include/sys/fm/Makefile.am b/include/sys/fm/Makefile.am
+index 900ed93..8d9bed2 100644
+--- a/include/sys/fm/Makefile.am
++++ b/include/sys/fm/Makefile.am
+@@ -16,6 +16,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H)
+ endif
+
+ if CONFIG_KERNEL
+-kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)-$(ZFS_META_RELEASE)/$(LINUX_VERSION)/sys/fm
++kerneldir = $(DESTDIR)/$(libexecdir)/zfs/$(LINUX_VERSION)
+ kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
+ endif
+diff --git a/include/sys/fm/fs/Makefile.am b/include/sys/fm/fs/Makefile.am
+index d82d076..b4ae3ee 100644
+--- a/include/sys/fm/fs/Makefile.am
++++ b/include/sys/fm/fs/Makefile.am
+@@ -13,6 +13,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H)
+ endif
+
+ if CONFIG_KERNEL
+-kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)-$(ZFS_META_RELEASE)/$(LINUX_VERSION)/sys/fm/fs
++kerneldir = $(DESTDIR)/$(libexecdir)/zfs/$(LINUX_VERSION)
+ kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
+ endif
+diff --git a/include/sys/fs/Makefile.am b/include/sys/fs/Makefile.am
+index b702679..3c747f4 100644
+--- a/include/sys/fs/Makefile.am
++++ b/include/sys/fs/Makefile.am
+@@ -13,6 +13,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H)
+ endif
+
+ if CONFIG_KERNEL
+-kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)-$(ZFS_META_RELEASE)/$(LINUX_VERSION)/sys/fs
++kerneldir = $(DESTDIR)/$(libexecdir)/zfs/$(LINUX_VERSION)
+ kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
+ endif
diff --git a/pkgs/os-specific/linux/zfs/module_perm_prefix.patch b/pkgs/os-specific/linux/zfs/module_perm_prefix.patch
new file mode 100644
index 00000000000..07cd04d1dde
--- /dev/null
+++ b/pkgs/os-specific/linux/zfs/module_perm_prefix.patch
@@ -0,0 +1,70 @@
+*** git-export/module/Makefile.in.orig Wed Dec 31 16:00:01 1969
+--- git-export/module/Makefile.in Tue Mar 6 00:23:07 2012
+***************
+*** 11,19 ****
+ @# installed devel headers, or they may be in the module
+ @# subdirectory when building against the spl source tree.
+ @if [ -f @SPL_OBJ@/@SPL_SYMBOLS@ ]; then \
+! /bin/cp @SPL_OBJ@/@SPL_SYMBOLS@ .; \
+ elif [ -f @SPL_OBJ@/module/@SPL_SYMBOLS@ ]; then \
+! /bin/cp @SPL_OBJ@/module/@SPL_SYMBOLS@ .; \
+ else \
+ echo -e "\n" \
+ "*** Missing spl symbols ensure you have built the spl:\n" \
+--- 11,21 ----
+ @# installed devel headers, or they may be in the module
+ @# subdirectory when building against the spl source tree.
+ @if [ -f @SPL_OBJ@/@SPL_SYMBOLS@ ]; then \
+! /bin/cp -f @SPL_OBJ@/@SPL_SYMBOLS@ .; \
+! chmod +w @SPL_SYMBOLS@ .; \
+ elif [ -f @SPL_OBJ@/module/@SPL_SYMBOLS@ ]; then \
+! /bin/cp -f @SPL_OBJ@/module/@SPL_SYMBOLS@ .; \
+! chmod +w @SPL_SYMBOLS@ .; \
+ else \
+ echo -e "\n" \
+ "*** Missing spl symbols ensure you have built the spl:\n" \
+***************
+*** 35,55 ****
+ modules_install:
+ @# Install the kernel modules
+ $(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` \
+! INSTALL_MOD_PATH=$(DESTDIR) \
+ INSTALL_MOD_DIR=addon/zfs $@
+ @# Remove extraneous build products when packaging
+! if [ -n "$(DESTDIR)" ]; then \
+! find $(DESTDIR)/lib/modules/@LINUX_VERSION@ \
+ -name 'modules.*' | xargs $(RM); \
+ fi
+! sysmap=$(DESTDIR)/boot/System.map-@LINUX_VERSION@; \
+ if [ -f $$sysmap ]; then \
+ depmod -ae -F $$sysmap @LINUX_VERSION@; \
+ fi
+
+ modules_uninstall:
+ @# Uninstall the kernel modules
+! $(RM) -R $(DESTDIR)/lib/modules/@LINUX_VERSION@/addon/zfs
+
+ distdir:
+
+--- 37,57 ----
+ modules_install:
+ @# Install the kernel modules
+ $(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` \
+! INSTALL_MOD_PATH=@prefix@ \
+ INSTALL_MOD_DIR=addon/zfs $@
+ @# Remove extraneous build products when packaging
+! if [ -n "@prefix@" ]; then \
+! find @prefix@/lib/modules/@LINUX_VERSION@ \
+ -name 'modules.*' | xargs $(RM); \
+ fi
+! sysmap=@prefix@/boot/System.map-@LINUX_VERSION@; \
+ if [ -f $$sysmap ]; then \
+ depmod -ae -F $$sysmap @LINUX_VERSION@; \
+ fi
+
+ modules_uninstall:
+ @# Uninstall the kernel modules
+! $(RM) -R @prefix@/lib/modules/@LINUX_VERSION@/addon/zfs
+
+ distdir:
+
diff --git a/pkgs/os-specific/linux/zfs/mount_zfs_prefix.patch b/pkgs/os-specific/linux/zfs/mount_zfs_prefix.patch
new file mode 100644
index 00000000000..49ad88fc3a4
--- /dev/null
+++ b/pkgs/os-specific/linux/zfs/mount_zfs_prefix.patch
@@ -0,0 +1,24 @@
+diff -crN '--exclude=.git' zfs-0.60-rc11/cmd/mount_zfs/Makefile.am zfs/cmd/mount_zfs/Makefile.am
+*** zfs-0.60-rc11/cmd/mount_zfs/Makefile.am 2012-10-22 10:26:07.066205000 -0700
+--- zfs/cmd/mount_zfs/Makefile.am 2012-10-22 11:16:21.859286000 -0700
+***************
+*** 7,14 ****
+ #
+ # Ignore the prefix for the mount helper. It must be installed in /sbin/
+ # because this path is hardcoded in the mount(8) for security reasons.
+ #
+- sbindir=/sbin
+ sbin_PROGRAMS = mount.zfs
+
+ mount_zfs_SOURCES = \
+--- 7,16 ----
+ #
+ # Ignore the prefix for the mount helper. It must be installed in /sbin/
+ # because this path is hardcoded in the mount(8) for security reasons.
++ #
++ # ... except on nixos, where it really is /var/run/current-system/sw/sbin,
++ # which is where this will end up if we put it in ${out}/sbin.
+ #
+ sbin_PROGRAMS = mount.zfs
+
+ mount_zfs_SOURCES = \
diff --git a/pkgs/os-specific/linux/zfs/no_absolute_paths_to_coreutils.patch b/pkgs/os-specific/linux/zfs/no_absolute_paths_to_coreutils.patch
new file mode 100644
index 00000000000..e223e34c3a4
--- /dev/null
+++ b/pkgs/os-specific/linux/zfs/no_absolute_paths_to_coreutils.patch
@@ -0,0 +1,25 @@
+*** git-export/module/Makefile.in.old Tue Mar 6 01:04:48 2012
+--- git-export/module/Makefile.in Tue Mar 6 01:04:59 2012
+***************
+*** 11,20 ****
+ @# installed devel headers, or they may be in the module
+ @# subdirectory when building against the spl source tree.
+ @if [ -f @SPL_OBJ@/@SPL_SYMBOLS@ ]; then \
+! /bin/cp -f @SPL_OBJ@/@SPL_SYMBOLS@ .; \
+ chmod +w @SPL_SYMBOLS@ .; \
+ elif [ -f @SPL_OBJ@/module/@SPL_SYMBOLS@ ]; then \
+! /bin/cp -f @SPL_OBJ@/module/@SPL_SYMBOLS@ .; \
+ chmod +w @SPL_SYMBOLS@ .; \
+ else \
+ echo -e "\n" \
+--- 11,20 ----
+ @# installed devel headers, or they may be in the module
+ @# subdirectory when building against the spl source tree.
+ @if [ -f @SPL_OBJ@/@SPL_SYMBOLS@ ]; then \
+! cp -f @SPL_OBJ@/@SPL_SYMBOLS@ .; \
+ chmod +w @SPL_SYMBOLS@ .; \
+ elif [ -f @SPL_OBJ@/module/@SPL_SYMBOLS@ ]; then \
+! cp -f @SPL_OBJ@/module/@SPL_SYMBOLS@ .; \
+ chmod +w @SPL_SYMBOLS@ .; \
+ else \
+ echo -e "\n" \
diff --git a/pkgs/os-specific/windows/jom/default.nix b/pkgs/os-specific/windows/jom/default.nix
index 2cdd63cc0eb..8f8477d1864 100644
--- a/pkgs/os-specific/windows/jom/default.nix
+++ b/pkgs/os-specific/windows/jom/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
};
buildInputs = [ qt48 ];
- buildNativeInputs = [ flex /*cmake*/ ];
+ nativeBuildInputs = [ flex /*cmake*/ ];
QTDIR = qt48;
configurePhase = ''
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
crossAttrs = {
# cmakeFlags = "-DWIN32=1 -DCMAKE_SYSTEM_NAME=Windows -DCMAKE_RC_COMPILER=${stdenv.cross.config}-windres";
- QTDIR = qt48.hostDrv;
+ QTDIR = qt48.crossDrv;
preBuild = ''
export NIX_CROSS_CFLAGS_COMPILE=-fpermissive
'';
diff --git a/pkgs/os-specific/windows/w32api/default.nix b/pkgs/os-specific/windows/w32api/default.nix
index a4f4245125d..2a5af71b5ec 100644
--- a/pkgs/os-specific/windows/w32api/default.nix
+++ b/pkgs/os-specific/windows/w32api/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation ({
sha256 = "09rhnl6zikmdyb960im55jck0rdy5z9nlg3akx68ixn7khf3j8wb";
};
- buildNativeInputs = [ xz ];
+ nativeBuildInputs = [ xz ];
} //
(if onlyHeaders then {
diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix
index cdd8704739b..54fa398a8e9 100644
--- a/pkgs/servers/dns/bind/default.nix
+++ b/pkgs/servers/dns/bind/default.nix
@@ -1,15 +1,14 @@
{ stdenv, fetchurl, openssl, libtool, perl, libxml2 }:
-let
- version = "9.7.6-P1";
-in
+let version = "9.9.2"; in
+
stdenv.mkDerivation rec {
name = "bind-${version}";
src = fetchurl {
url = "http://ftp.isc.org/isc/bind9/${version}/${name}.tar.gz";
- sha256 = "1xp7c3fpi3b6y1bz77mf7c98ic7rxp5lpwlmzqwsdrllip33qw1k";
+ sha256 = "0j4v01ch4xkgnsnngmh6bpapzi53n4k79gbbhmxf44nmk2qk0rby";
};
patchPhase = ''
@@ -21,7 +20,7 @@ stdenv.mkDerivation rec {
/* Why --with-libtool? */
configureFlags = [ "--with-libtool" "--with-openssl=${openssl}"
"--localstatedir=/var" ];
-
+
meta = {
homepage = http://www.isc.org/software/bind;
description = "ISC BIND: a domain name server";
diff --git a/pkgs/servers/ftp/vsftpd/default.nix b/pkgs/servers/ftp/vsftpd/default.nix
index 0fc1531056b..39b78958b03 100644
--- a/pkgs/servers/ftp/vsftpd/default.nix
+++ b/pkgs/servers/ftp/vsftpd/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, openssl, sslEnable ? false, libcap, pam }:
stdenv.mkDerivation (rec {
- name = "vsftpd-2.3.4";
+ name = "vsftpd-3.0.2";
src = fetchurl {
- url = "ftp://vsftpd.beasts.org/users/cevans/${name}.tar.gz";
- sha256 = "0nhsqwnb8qkbxx5wjahara1ln85hp151v656psra5brpckwysrml";
+ url = "https://security.appspot.com/downloads/${name}.tar.gz";
+ sha256 = "0mjy345wszskz1vnk83360c1y37arwgap3gwz8hy13sjqpig0imy";
};
# The gcc-wrappers use -idirafter for glibc, and vsftpd also, and
@@ -14,9 +14,13 @@ stdenv.mkDerivation (rec {
sed -i -e 's/-idirafter.*//' Makefile
'';
- preBuild =''
- makeFlagsArray=( "LIBS=${if sslEnable then "-lcrypt -lssl -lcrypto " else ""}-lpam -lcap" )
- '';
+ preBuild = let
+ sslLibs = if sslEnable then "-lcrypt -lssl -lcrypto " else "";
+ in ''
+ makeFlagsArray=( "LIBS=${sslLibs}-lpam -lcap -fstack-protector" )
+ '';
+
+ # It won't link without this flag, used in CFLAGS
buildInputs = [ openssl libcap pam ];
diff --git a/pkgs/servers/gpm/1.99.6.nix b/pkgs/servers/gpm/1.99.6.nix
deleted file mode 100644
index 3874e4adfbd..00000000000
--- a/pkgs/servers/gpm/1.99.6.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-args : with args;
-rec {
- src = fetchurl {
- url = http://linux.schottelius.org/gpm/archives/gpm-1.99.6.tar.lzma;
- sha256 = "14zxx7nx40k8b0bmwhxfyv20xrdi8cg9fxmv8ylsx661lvizqsg3";
- };
-
- buildInputs = [lzma flex bison ncurses];
- configureFlags = [];
-
- /* doConfigure should be specified separately */
- phaseNames = ["preConfigure" "doConfigure" "doMakeInstall"];
-
- preConfigure = fullDepEntry (''
- sed -e 's/[$](MKDIR)/mkdir -p /' -i doc/Makefile.in
- sed -e 's/gpm2//' -i Makefile.in
- '') ["addInputs" "doUnpack" "minInit"];
-
- name = "gpm-" + version;
- meta = {
- description = "Mouse daemon";
- };
-}
diff --git a/pkgs/servers/gpm/default.nix b/pkgs/servers/gpm/default.nix
index cb664eac253..7c16153e9b5 100644
--- a/pkgs/servers/gpm/default.nix
+++ b/pkgs/servers/gpm/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "1990i19ddzn8gg5xwm53yn7d0mya885f48sd2hyvr7dvzyaw7ch8";
};
- buildNativeInputs = [ flex bison ];
+ nativeBuildInputs = [ flex bison ];
buildInputs = [ ncurses ];
preConfigure =
diff --git a/pkgs/servers/gpsd/default.nix b/pkgs/servers/gpsd/default.nix
index 31c9deaf3af..25051167ca5 100644
--- a/pkgs/servers/gpsd/default.nix
+++ b/pkgs/servers/gpsd/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "1bjhyjg561kwp6zc2wg58njdvpnsj5yaa2slz8g3ga1176jl68w3";
};
- buildNativeInputs = [ makeWrapper pkgconfig docbook_xml_dtd_412 docbook_xsl
+ nativeBuildInputs = [ makeWrapper pkgconfig docbook_xml_dtd_412 docbook_xsl
xmlto bc pythonPackages.wrapPython ];
pythonPath = [ pythonPackages.curses ];
diff --git a/pkgs/servers/http/4store/default.nix b/pkgs/servers/http/4store/default.nix
index 08d671d960e..4854f9e18dd 100644
--- a/pkgs/servers/http/4store/default.nix
+++ b/pkgs/servers/http/4store/default.nix
@@ -3,8 +3,8 @@ x@{builderDefsPackage
glib, libxml2, pcre, avahi,
readline, ncurses, expat,
zlib, pkgconfig, which,
- perl,
- db_dir ? "/var/lib/4store"
+ perl, libuuid, gmp, mpfr
+ , db_dir ? "/var/lib/4store"
, ...}:
builderDefsPackage
(a :
@@ -28,9 +28,9 @@ rec {
doFixConfigure = a.fullDepEntry ''
sed -e 's@#! */bin/bash@#! ${a.stdenv.shell}@' -i configure
find . -name Makefile -exec sed -e "s@/usr/local@$out@g" -i '{}' ';'
- sed -e '/\/var\/lib\/4store/d' -i src/utilities/Makefile
sed -e 's@/var/lib/4store@${db_dir}@g' -i src/common/params.h src/utilities/*
+ sed -e '/FS_STORE_ROOT/d' -i src/utilities/Makefile*
'' ["minInit" "doUnpack"];
fixInterpreter = (a.doPatchShebangs "$out/bin");
@@ -46,4 +46,3 @@ rec {
linux;
};
}) x
-
diff --git a/pkgs/servers/http/4store/src-for-default.nix b/pkgs/servers/http/4store/src-for-default.nix
index a8624ab40ab..7076b921911 100644
--- a/pkgs/servers/http/4store/src-for-default.nix
+++ b/pkgs/servers/http/4store/src-for-default.nix
@@ -1,9 +1,9 @@
rec {
- version="v1.0.3";
- name="4store-v1.0.3";
- hash="1d3n2xgqrq2kgigql3slxw1w2bml3b57xa7h6x9dbngxcz11xg22";
+ version="v1.1.5";
+ name="4store-v1.1.5";
+ hash="0nwckvf8xqwvc2h3v6s1rvmxvcx2xrjy6yapghc052180jw6zp9b";
url="http://4store.org/download/4store-${version}.tar.gz";
- advertisedUrl="http://4store.org/download/4store-v1.0.3.tar.gz";
+ advertisedUrl="http://4store.org/download/4store-v1.1.5.tar.gz";
}
diff --git a/pkgs/servers/http/apache-httpd/2.2.nix b/pkgs/servers/http/apache-httpd/2.2.nix
index f2a21ee28be..d4def35c09f 100644
--- a/pkgs/servers/http/apache-httpd/2.2.nix
+++ b/pkgs/servers/http/apache-httpd/2.2.nix
@@ -12,12 +12,12 @@ assert ldapSupport -> aprutil.ldapSupport && openldap != null;
assert mpm == "prefork" || mpm == "worker" || mpm == "event";
stdenv.mkDerivation rec {
- version = "2.2.22";
+ version = "2.2.23";
name = "apache-httpd-${version}";
src = fetchurl {
url = "mirror://apache/httpd/httpd-${version}.tar.bz2";
- sha1 = "766cd0843050a8dfb781e48b976f3ba6ebcf8696";
+ sha1 = "2776145201068045d4ed83157a0e2e1c28c4c453";
};
buildInputs = [perl apr aprutil pcre] ++
diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix
index c9161bf5909..507ced85998 100644
--- a/pkgs/servers/http/apache-httpd/2.4.nix
+++ b/pkgs/servers/http/apache-httpd/2.4.nix
@@ -14,17 +14,17 @@ assert sslSupport -> aprutil.sslSupport && openssl != null;
assert ldapSupport -> aprutil.ldapSupport && openldap != null;
stdenv.mkDerivation rec {
- version = "2.4.2";
+ version = "2.4.3";
name = "apache-httpd-${version}";
src = fetchurl {
url = "mirror://apache/httpd/httpd-${version}.tar.bz2";
- sha1 = "8d391db515edfb6623c0c7c6ce5c1b2e1f7c64c2";
+ sha256 = "17i4zdcjfvxks0p1fbqvab37kr8d6zscqaqan8pqkw8iq6wh48fq";
};
buildInputs = [perl] ++
optional ldapSupport openldap ++ # there is no --with-ldap flag
- optional libxml2Support libxml2; # there is --with-libxml2, but it doesn't work
+ optional libxml2Support libxml2;
# Required for ‘pthread_cancel’.
NIX_LDFLAGS = "-lgcc_s";
@@ -38,9 +38,13 @@ stdenv.mkDerivation rec {
--disable-debugger-mode
--enable-mods-shared=all
--enable-mpms-shared=all
+ --enable-cern-meta
+ --enable-imagemap
+ --enable-cgi
${optionalString proxySupport "--enable-proxy"}
${optionalString sslSupport "--enable-ssl --with-ssl=${openssl}"}
${optionalString luaSupport "--enable-lua --with-lua=${lua5}"}
+ ${optionalString libxml2Support "--with-libxml2=${libxml2}/include/libxml2"}
'';
postInstall = ''
diff --git a/pkgs/servers/http/couchdb/src-for-default.nix b/pkgs/servers/http/couchdb/src-for-default.nix
index 0c174feed8d..6e07077d333 100644
--- a/pkgs/servers/http/couchdb/src-for-default.nix
+++ b/pkgs/servers/http/couchdb/src-for-default.nix
@@ -1,9 +1,9 @@
rec {
- version="1.1.1";
- name="couchdb-1.1.1";
- hash="9d6592aacd4bc139f8c1ccb0ed80f30021cee50eb7f8a1feddf46b6eb963891c";
- url="mirror://apache/couchdb/${version}/apache-couchdb-${version}.tar.gz";
- advertisedUrl="http://www.apache.org/dist/couchdb/${version}/apache-couchdb-${version}.tar.gz";
-
-
+ version="1.2.0";
+ name="couchdb-1.2.0";
+ hash="0dswinmg32zn217049dkbx3pab3qwihzmlbc7i6vq7a7lbg4s98g";
+ url="mirror://apache/couchdb/releases/1.2.0/apache-couchdb-${version}.tar.gz";
+ advertisedUrl="http://www.apache.org/dist/couchdb/releases/1.2.0/apache-couchdb-1.2.0.tar.gz";
+
+
}
diff --git a/pkgs/servers/http/joseki/default.nix b/pkgs/servers/http/joseki/default.nix
index f23a6ce73eb..6ca5caba944 100644
--- a/pkgs/servers/http/joseki/default.nix
+++ b/pkgs/servers/http/joseki/default.nix
@@ -81,8 +81,8 @@ rec {
sed -e 's/\r//g' -i "$TARGET/bin"/*
- echo -e '#! /bin/sh\nls "'"$TARGET"'"/bin' > "$out/bin/jena-list-commands"
- echo '#! /bin/sh' >> "$out/bin/jena-command"
+ echo -e '#! ${a.stdenv.shell}\nls "'"$TARGET"'"/bin' > "$out/bin/jena-list-commands"
+ echo '#! ${a.stdenv.shell}' >> "$out/bin/jena-command"
echo 'export JENAROOT="'"$TARGET"'"' >> "$out/bin/jena-command"
echo 'export JOSEKIROOT="'"$TARGET"'"' >> "$out/bin/jena-command"
echo 'export TDBROOT="'"$TARGET"'"' >> "$out/bin/jena-command"
diff --git a/pkgs/servers/http/mini-httpd/default.nix b/pkgs/servers/http/mini-httpd/default.nix
index a6ae56b6534..f853b3ebacc 100644
--- a/pkgs/servers/http/mini-httpd/default.nix
+++ b/pkgs/servers/http/mini-httpd/default.nix
@@ -1,14 +1,16 @@
-{ stdenv, fetchurl, boost }:
+{ stdenv, fetchurl, boostHeaders }:
-stdenv.mkDerivation {
- name = "mini-httpd-1.1";
+stdenv.mkDerivation rec {
+ name = "mini-httpd-1.2";
src = fetchurl {
- url = "mirror://savannah/mini-httpd/mini-httpd-1.1.tar.gz";
- sha256 = "12hqvh67hgxmc9b3fhb8gb5ash7j6f7d0mxv47zkmjl7k3vw3ny7";
+ url = "mirror://savannah/mini-httpd/${name}.tar.gz";
+ sha256 = "1547312rg2phxwny9vm1bkyid251n7wy4p1mgs6f5yq6ypwrsr6p";
};
- buildInputs = [ boost ];
+ buildInputs = [ boostHeaders ];
+
+ enableParallelBuilding = true;
meta = {
homepage = "http://mini-httpd.nongnu.org/";
diff --git a/pkgs/servers/http/myserver/installable-binary.patch b/pkgs/servers/http/myserver/installable-binary.patch
deleted file mode 100644
index 346e76afd5e..00000000000
--- a/pkgs/servers/http/myserver/installable-binary.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-We actually want the `myserver' binary to be installable. Failing to do that
-it gets an RPATH pointing to $top_builddir/src/.libs.
-
---- myserver-0.10/src/Makefile.in 2010-10-14 12:45:42.000000000 +0200
-+++ myserver-0.10/src/Makefile.in 2011-03-03 22:23:05.000000000 +0100
-@@ -1307,7 +1307,6 @@ libmyserver_la_LIBADD = \
- $(INTLLIBS) $(LDFLAGS)
-
- myserver_CXXFLAGS = $(AM_CXXFLAGS) $(CXXFLAGS) -DHOST_STR=\"$(build)\" -DPREFIX=\"$(prefix)\"
--myserver_LDFLAGS = -static -no-install
- myserver_LDADD = libmyserver.la $(PTHREAD_LIB) $(IDN_LIB) \
- $(XNET_LIB) $(DL_LIB) $(ZLIB_LIB) \
- $(XML_LIBS) $(INTLLIBS) $(LDFLAGS)
-
diff --git a/pkgs/servers/http/nginx/default.nix b/pkgs/servers/http/nginx/default.nix
index 4a1c0be649f..5c0b1c2d723 100644
--- a/pkgs/servers/http/nginx/default.nix
+++ b/pkgs/servers/http/nginx/default.nix
@@ -1,10 +1,13 @@
{ stdenv, fetchurl, openssl, zlib, pcre, libxml2, libxslt }:
+
stdenv.mkDerivation rec {
- name = "nginx-1.1.7";
+ name = "nginx-1.2.4";
+
src = fetchurl {
url = "http://nginx.org/download/${name}.tar.gz";
- sha256 = "1y0bzmrgnyqw8ghc508nipy5k46byrxc2sycqp35fdx0jmjz3h51";
+ sha256 = "0hvcv4lgfcrsl40azkd3rxhf73l05jzzgflclpkdvjd95xgw51y5";
};
+
buildInputs = [ openssl zlib pcre libxml2 libxslt ];
configureFlags = [
@@ -15,7 +18,7 @@ stdenv.mkDerivation rec {
"--with-http_gzip_static_module"
"--with-http_secure_link_module"
# Install destination problems
- # "--with-http_perl_module"
+ # "--with-http_perl_module"
];
preConfigure = ''
@@ -27,11 +30,8 @@ stdenv.mkDerivation rec {
'';
meta = {
- description = "nginx - 'engine x' - reverse proxy and lightweight webserver";
- maintainers = [
- stdenv.lib.maintainers.raskin
- ];
- platforms = with stdenv.lib.platforms;
- all;
+ description = "A reverse proxy and lightweight webserver";
+ maintainers = [ stdenv.lib.maintainers.raskin];
+ platforms = stdenv.lib.platforms.all;
};
}
diff --git a/pkgs/servers/icecast/default.nix b/pkgs/servers/icecast/default.nix
new file mode 100644
index 00000000000..24ae245a8a0
--- /dev/null
+++ b/pkgs/servers/icecast/default.nix
@@ -0,0 +1,32 @@
+{stdenv, fetchurl
+, libxml2, libxslt, curl
+, libvorbis, libtheora, speex, libkate }:
+
+stdenv.mkDerivation rec {
+ name = "icecast-2.3.3";
+
+ src = fetchurl {
+ url = "http://downloads.xiph.org/releases/icecast/${name}.tar.gz";
+ sha256 = "0vf38mk13z1czpbj0g8va4rzjf201slqmiwcs8y9i6iwz3shc78v";
+ };
+
+ buildInputs = [ libxml2 libxslt curl libvorbis libtheora speex libkate ];
+
+ meta = {
+ description = "icecast is free server software for streaming multimedia.";
+
+ longDescription = ''
+ Icecast is a streaming media server which currently supports Ogg Vorbis and MP3
+ audio streams. It can be used to create an Internet radio station or a
+ privately running jukebox and many things in between. It is very versatile in
+ that new formats can be added relatively easily and supports open standards for
+ commuincation and interaction.
+ '';
+
+
+ homepage = http://www.icecast.org;
+ license = stdenv.lib.licenses.gpl2;
+ maintainers = with stdenv.lib.maintainers; [ jcumming ];
+ };
+}
+
diff --git a/pkgs/servers/mail/dovecot/1.1.1.nix b/pkgs/servers/mail/dovecot/1.1.1.nix
deleted file mode 100644
index 103f79652fd..00000000000
--- a/pkgs/servers/mail/dovecot/1.1.1.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{stdenv, fetchurl
- , openssl
- , pam
-}:
-
-let
- version = "1.1.1";
-in
-
-stdenv.mkDerivation {
- name = "dovecot-${version}";
-
- buildInputs = [openssl pam];
-
- src = fetchurl {
- url = "http://dovecot.org/releases/1.1/dovecot-${version}.tar.gz";
- sha256 = "0plzrzz07k0cylk9323gs9fzlv176y6nd6am660b6dch4p884sck";
- };
-
-}
diff --git a/pkgs/servers/mail/dovecot/2.x.nix b/pkgs/servers/mail/dovecot/2.x.nix
deleted file mode 100644
index 1b4fbe7c7cc..00000000000
--- a/pkgs/servers/mail/dovecot/2.x.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{stdenv, fetchurl, openssl, pam, bzip2, zlib, inotifyTools, openldap}:
-
-stdenv.mkDerivation rec {
- name = "dovecot-2.1.8";
-
- buildInputs = [openssl pam bzip2 zlib inotifyTools openldap];
-
- src = fetchurl {
- url = "http://dovecot.org/releases/2.1/${name}.tar.gz";
- sha256 = "03801f4agcwdpqyg6dfxlga3750pnhk4gaf8m7sjq1qmz2277028";
- };
-
- # It will hardcode this for /var/lib/dovecot.
- # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=626211
- configureFlags = [
- "--localstatedir=/var"
- "--with-ldap"
- ];
-
- meta = {
- homepage = http://dovecot.org/;
- description = "Open source IMAP and POP3 email server written with security primarily in mind";
- maintainers = with stdenv.lib.maintainers; [viric];
- platforms = with stdenv.lib.platforms; linux;
- };
-
-}
diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix
index 70e84fa51b0..cb29c9ebc89 100644
--- a/pkgs/servers/mail/dovecot/default.nix
+++ b/pkgs/servers/mail/dovecot/default.nix
@@ -1,16 +1,27 @@
-{stdenv, fetchurl
- , openssl
- , pam
-}:
+{stdenv, fetchurl, openssl, pam, bzip2, zlib, inotifyTools, openldap}:
-stdenv.mkDerivation {
- name = "dovecot-1.0.3";
+stdenv.mkDerivation rec {
+ name = "dovecot-2.1.8";
- buildInputs = [openssl pam];
+ buildInputs = [openssl pam bzip2 zlib inotifyTools openldap];
src = fetchurl {
- url = http://dovecot.org/releases/1.0/dovecot-1.0.3.tar.gz;
- sha256 = "14b3sbvj9xpm5mjwfavwrcwmzfdgian51ncspl8j83cd8j01jdjz";
+ url = "http://dovecot.org/releases/2.1/${name}.tar.gz";
+ sha256 = "03801f4agcwdpqyg6dfxlga3750pnhk4gaf8m7sjq1qmz2277028";
};
-
+
+ # It will hardcode this for /var/lib/dovecot.
+ # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=626211
+ configureFlags = [
+ "--localstatedir=/var"
+ "--with-ldap"
+ ];
+
+ meta = {
+ homepage = "http://dovecot.org/";
+ description = "Open source IMAP and POP3 email server written with security primarily in mind";
+ maintainers = with stdenv.lib.maintainers; [viric simons];
+ platforms = with stdenv.lib.platforms; linux;
+ };
+
}
diff --git a/pkgs/servers/mail/freepops/default.nix b/pkgs/servers/mail/freepops/default.nix
index d5866029762..c80d0f04bda 100644
--- a/pkgs/servers/mail/freepops/default.nix
+++ b/pkgs/servers/mail/freepops/default.nix
@@ -3,7 +3,7 @@
stdenv.mkDerivation {
name = "freepops-0.2.9";
src = fetchurl {
- url = mirror://sf/freepops/0.2.9/freepops-0.2.9.tar.gz;
+ url = mirror://sourceforge/freepops/0.2.9/freepops-0.2.9.tar.gz;
sha256 = "3a065e30cafed03d9b6fdb28251ae5bf0d8aeb62181746154beecd25dc0c9cae";
};
buildInputs = [pkgconfig openssl lua5 curl readline bison expat];
diff --git a/pkgs/servers/mail/petidomo/default.nix b/pkgs/servers/mail/petidomo/default.nix
new file mode 100644
index 00000000000..6c6cde8a46a
--- /dev/null
+++ b/pkgs/servers/mail/petidomo/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, flex, bison, sendmailPath ? "/var/setuid-wrappers/sendmail" }:
+
+stdenv.mkDerivation rec {
+ name = "petidomo-4.3";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/petidomo/${name}.tar.gz";
+ sha256 = "0x4dbxc4fcfg1rw5ywpcypvylnzn3y4rh0m6fz4h4cdnzb8p1lvm";
+ };
+
+ buildInputs = [ flex bison ];
+
+ configureFlags = "--with-mta=${sendmailPath}";
+
+ enableParallelBuilding = true;
+
+ doCheck = true;
+
+ meta = {
+ homepage = "http://petidomo.sourceforge.net/";
+ description = "a simple and easy to administer mailing list server";
+ license = stdenv.lib.licenses.gpl3Plus;
+
+ platforms = stdenv.lib.platforms.unix;
+ maintainers = [ stdenv.lib.maintainers.simons ];
+ };
+}
diff --git a/pkgs/servers/mail/popa3d/default.nix b/pkgs/servers/mail/popa3d/default.nix
new file mode 100644
index 00000000000..25ac0d5f9e3
--- /dev/null
+++ b/pkgs/servers/mail/popa3d/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, openssl }:
+
+stdenv.mkDerivation rec {
+
+ name = "popa3d-1.0.2";
+
+ src = fetchurl {
+ url = "http://www.openwall.com/popa3d/${name}.tar.gz";
+ sha256 = "0zvspgnlrx4jhhkb5b1p280nsf9d558jijgpvwfyvdp4q4v460z7";
+ };
+
+ buildInputs = [ openssl ];
+
+ patches = [
+ ./fix-mail-spool-path.patch
+ ./use-openssl.patch
+ ./use-glibc-crypt.patch
+ ./enable-standalone-mode.patch
+ ];
+
+ configurePhase = ''makeFlags="PREFIX=$out MANDIR=$out/share/man"'';
+
+ meta = {
+ homepage = "http://www.openwall.com/popa3d/";
+ description = "tiny POP3 daemon with security as the primary goal";
+ platforms = stdenv.lib.platforms.linux;
+ maintainers = [ stdenv.lib.maintainers.simons ];
+ };
+}
diff --git a/pkgs/servers/mail/popa3d/enable-standalone-mode.patch b/pkgs/servers/mail/popa3d/enable-standalone-mode.patch
new file mode 100644
index 00000000000..763ede102f2
--- /dev/null
+++ b/pkgs/servers/mail/popa3d/enable-standalone-mode.patch
@@ -0,0 +1,12 @@
+diff -ubr popa3d-1.0.2-orig/params.h popa3d-1.0.2/params.h
+--- popa3d-1.0.2-orig/params.h 2012-09-19 01:19:56.698098130 +0200
++++ popa3d-1.0.2/params.h 2012-09-19 01:37:06.749130665 +0200
+@@ -13,7 +13,7 @@
+ /*
+ * Are we going to be a standalone server or start via an inetd clone?
+ */
+-#define POP_STANDALONE 0
++#define POP_STANDALONE 1
+
+ #if POP_STANDALONE
+
diff --git a/pkgs/servers/mail/popa3d/fix-mail-spool-path.patch b/pkgs/servers/mail/popa3d/fix-mail-spool-path.patch
new file mode 100644
index 00000000000..4f440ae5966
--- /dev/null
+++ b/pkgs/servers/mail/popa3d/fix-mail-spool-path.patch
@@ -0,0 +1,12 @@
+diff -ubr popa3d-1.0.2-orig/params.h popa3d-1.0.2/params.h
+--- popa3d-1.0.2-orig/params.h 2012-09-19 01:19:56.698098130 +0200
++++ popa3d-1.0.2/params.h 2012-09-19 01:21:13.748065132 +0200
+@@ -191,7 +191,7 @@
+ *
+ * #undef this for qmail-style $HOME/Mailbox mailboxes.
+ */
+-#define MAIL_SPOOL_PATH "/var/mail"
++#define MAIL_SPOOL_PATH "/var/spool/mail"
+
+ #ifndef MAIL_SPOOL_PATH
+ /*
diff --git a/pkgs/servers/mail/popa3d/use-glibc-crypt.patch b/pkgs/servers/mail/popa3d/use-glibc-crypt.patch
new file mode 100644
index 00000000000..35843a38bb3
--- /dev/null
+++ b/pkgs/servers/mail/popa3d/use-glibc-crypt.patch
@@ -0,0 +1,12 @@
+diff -ubr popa3d-1.0.2-orig/Makefile popa3d-1.0.2/Makefile
+--- popa3d-1.0.2-orig/Makefile 2012-09-19 01:19:56.698098130 +0200
++++ popa3d-1.0.2/Makefile 2012-09-19 01:24:33.871750473 +0200
+@@ -9,7 +9,7 @@
+ LDFLAGS = -s
+ LIBS =
+ # Linux with glibc, FreeBSD, NetBSD
+-#LIBS += -lcrypt
++LIBS += -lcrypt
+ # HP-UX trusted system
+ #LIBS += -lsec
+ # Solaris (POP_STANDALONE, POP_VIRTUAL)
diff --git a/pkgs/servers/mail/popa3d/use-openssl.patch b/pkgs/servers/mail/popa3d/use-openssl.patch
new file mode 100644
index 00000000000..54301dd873b
--- /dev/null
+++ b/pkgs/servers/mail/popa3d/use-openssl.patch
@@ -0,0 +1,21 @@
+diff -ubr popa3d-1.0.2-orig/Makefile popa3d-1.0.2/Makefile
+--- popa3d-1.0.2-orig/Makefile 2012-09-19 01:19:56.698098130 +0200
++++ popa3d-1.0.2/Makefile 2012-09-19 01:23:00.309636423 +0200
+@@ -5,7 +5,7 @@
+ INSTALL = install -c
+ CFLAGS = -Wall -O2 -fomit-frame-pointer
+ # You may use OpenSSL's MD5 routines instead of the ones supplied here
+-#CFLAGS += -DHAVE_OPENSSL
++CFLAGS += -DHAVE_OPENSSL
+ LDFLAGS = -s
+ LIBS =
+ # Linux with glibc, FreeBSD, NetBSD
+@@ -21,7 +21,7 @@
+ # libwrap may also want this
+ #LIBS += -lnsl
+ # OpenSSL (-DHAVE_OPENSSL)
+-#LIBS += -lcrypto
++LIBS += -lcrypto
+
+ DESTDIR =
+ PREFIX = /usr/local
diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix
index 16d9127e556..a435eea8663 100644
--- a/pkgs/servers/mail/postfix/default.nix
+++ b/pkgs/servers/mail/postfix/default.nix
@@ -4,31 +4,22 @@
assert stdenv.isLinux;
-stdenv.mkDerivation {
- name = "postfix-2.8.6";
-
+stdenv.mkDerivation rec {
+ name = "postfix-2.8.12";
+
src = fetchurl {
- url = ftp://ftp.cs.uu.nl/mirror/postfix/postfix-release/official/postfix-2.8.6.tar.gz;
- sha256 = "1rfsfhna5hy5lc6hkg1zc2862pdc5c1y9z6aiy8rinlmzrfplhlb";
+ url = "ftp://ftp.cs.uu.nl/mirror/postfix/postfix-release/official/${name}.tar.gz";
+ sha256 = "11z07mjy53l1fnl7k4101yk4ilibgqr1164628mqcbmmr8bh2szl";
};
- installTargets = ["non-interactive-package"];
-
- installFlags = [" install_root=$out "];
-
- preInstall = ''
- sed -e '/^PATH=/d' -i postfix-install
- '';
-
- postInstall = ''
- mkdir -p $out
- mv ut/$out/* $out/
+ buildInputs = [db4 openssl cyrus_sasl bison perl];
- mkdir $out/share/postfix/conf
- cp conf/* $out/share/postfix/conf
- sed -e 's@PATH=.*@PATH=${coreutils}/bin:${findutils}/bin:${gnused}/bin:${gnugrep}/bin:'$out'/sbin@' -i $out/share/postfix/conf/post-install $out/libexec/postfix/post-install
- sed -e '2aPATH=${coreutils}/bin:${findutils}/bin:${gnused}/bin:${gnugrep}/bin:'$out'/sbin' -i $out/share/postfix/conf/postfix-script $out/libexec/postfix/postfix-script
- chmod a+x $out/share/postfix/conf/{postfix-script,post-install}
+ patches = [ ./postfix-2.2.9-db.patch ./postfix-2.2.9-lib.patch ./db-linux3.patch ];
+
+ postPatch = ''
+ sed -i -e s,/usr/bin,/var/run/current-system/sw/bin, \
+ -e s,/usr/sbin,/var/run/current-system/sw/sbin, \
+ -e s,:/sbin,, src/util/sys_defs.h
'';
preBuild = ''
@@ -46,15 +37,29 @@ stdenv.mkDerivation {
make makefiles CCARGS='-DUSE_TLS -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I${cyrus_sasl}/include/sasl' AUXLIBS='-lssl -lcrypto -lsasl2 -ldb -lnsl'
'';
- buildInputs = [db4 openssl cyrus_sasl bison perl];
-
- patches = [ ./postfix-2.2.9-db.patch ./postfix-2.2.9-lib.patch ./db-linux3.patch ];
+ installPhase = ''
+ sed -e '/^PATH=/d' -i postfix-install
+ $SHELL postfix-install install_root=out -non-interactive -package
- postPatch = ''
- sed -i -e s,/usr/bin,/var/run/current-system/sw/bin, \
- -e s,/usr/sbin,/var/run/current-system/sw/sbin, \
- -e s,:/sbin,, src/util/sys_defs.h
+ mkdir -p $out
+ mv -v "out$out/"* $out/
+
+ mkdir -p $out/share/postfix
+ mv conf $out/share/postfix/
+ mv LICENSE TLS_LICENSE $out/share/postfix/
+
+ sed -e 's@^PATH=.*@PATH=${coreutils}/bin:${findutils}/bin:${gnused}/bin:${gnugrep}/bin:'$out'/sbin@' -i $out/share/postfix/conf/post-install $out/libexec/postfix/post-install
+ sed -e '2aPATH=${coreutils}/bin:${findutils}/bin:${gnused}/bin:${gnugrep}/bin:'$out'/sbin' -i $out/share/postfix/conf/postfix-script $out/libexec/postfix/postfix-script
+ chmod a+x $out/share/postfix/conf/{postfix-script,post-install}
'';
-
+
inherit glibc;
+
+ meta = {
+ homepage = "http://www.postfix.org/";
+ description = "a fast, easy to administer, and secure mail server";
+ license = stdenv.lib.licenses.bsdOriginal;
+ platforms = stdenv.lib.platforms.linux;
+ maintainers = [ stdenv.lib.maintainers.simons ];
+ };
}
diff --git a/pkgs/servers/mail/spamassassin/default.nix b/pkgs/servers/mail/spamassassin/default.nix
index 0f5cefb84c2..dc316267e6c 100644
--- a/pkgs/servers/mail/spamassassin/default.nix
+++ b/pkgs/servers/mail/spamassassin/default.nix
@@ -1,16 +1,16 @@
{ stdenv, fetchurl, buildPerlPackage, perl, HTMLParser, NetDNS, NetAddrIP, DBFile
-, HTTPDate, MailDKIM, makeWrapper
+, HTTPDate, MailDKIM, LWP, IOSocketSSL, makeWrapper, gnupg1
}:
-# TODO:
+# TODO: Add the Perl modules ...
+#
+# DBI
+# Encode::Detect
+# IP::Country::Fast
+# Mail::SPF
+# Net::Ident
+# Razor2::Client::Agent
#
-# - Mail::SPF
-# - IP::Country
-# - Razor2
-# - Net::Ident
-# - DBI
-# - LWP::UserAgent
-# - Encode::Detect
buildPerlPackage rec {
name = "SpamAssassin-3.3.2";
@@ -20,18 +20,22 @@ buildPerlPackage rec {
sha256 = "01d2jcpy423zfnhg123wlhzysih1hmb93nxfspiaajzh9r5rn8y7";
};
- buildInputs = [ makeWrapper HTMLParser NetDNS NetAddrIP DBFile HTTPDate
- MailDKIM ];
+ buildInputs = [ makeWrapper HTMLParser NetDNS NetAddrIP DBFile HTTPDate MailDKIM
+ LWP IOSocketSSL ];
# Enabling 'taint' mode is desirable, but that flag disables support
# for the PERL5LIB environment variable. Needs further investigation.
makeFlags = "PERL_BIN=${perl}/bin/perl PERL_TAINT=no";
+ makeMakerFlags = "CONFDIR=/etc/spamassassin LOCALSTATEDIR=/var/lib/spamassassin";
+
doCheck = false;
postInstall = ''
+ mv "rules/"* $out/share/spamassassin/
+
for n in "$out/bin/"*; do
- wrapProgram "$n" --prefix PERL5LIB : "$PERL5LIB"
+ wrapProgram "$n" --prefix PERL5LIB : "$PERL5LIB" --prefix PATH : "${gnupg1}/bin"
done
'';
diff --git a/pkgs/servers/memcached/default.nix b/pkgs/servers/memcached/default.nix
index 36ce54b53ef..17c674b4d06 100644
--- a/pkgs/servers/memcached/default.nix
+++ b/pkgs/servers/memcached/default.nix
@@ -1,11 +1,11 @@
{stdenv, fetchurl, cyrus_sasl, libevent}:
stdenv.mkDerivation {
- name = "memcached-1.4.13";
+ name = "memcached-1.4.15";
src = fetchurl {
- url = http://memcached.googlecode.com/files/memcached-1.4.13.tar.gz;
- sha256 = "0abyy9agjinac56bb1881j3qs6xny7r12slh4wihv2apma3qn2yb";
+ url = http://memcached.googlecode.com/files/memcached-1.4.15.tar.gz;
+ sha256 = "1d7205cp49s379fdy2qz1gz2a5v4nnv18swzmvbascbmgamj35qn";
};
buildInputs = [cyrus_sasl libevent];
diff --git a/pkgs/servers/monitoring/zabbix/2.0.nix b/pkgs/servers/monitoring/zabbix/2.0.nix
new file mode 100644
index 00000000000..6b0a22962a3
--- /dev/null
+++ b/pkgs/servers/monitoring/zabbix/2.0.nix
@@ -0,0 +1,70 @@
+{ stdenv, fetchurl, pkgconfig, postgresql, curl, openssl, zlib, gettext }:
+
+let
+
+ version = "2.0.4";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/zabbix/zabbix-${version}.tar.gz";
+ sha256 = "0l8038j6ldsv0ywrs2j69ybjl2zv4qw42791glqvcabjj8x24m3m";
+ };
+
+ preConfigure =
+ ''
+ substituteInPlace ./configure \
+ --replace " -static" "" \
+ ${stdenv.lib.optionalString (stdenv.gcc.libc != null) ''
+ --replace /usr/include/iconv.h ${stdenv.gcc.libc}/include/iconv.h
+ ''}
+ '';
+
+in
+
+{
+
+ server = stdenv.mkDerivation {
+ name = "zabbix-${version}";
+
+ inherit src preConfigure;
+
+ configureFlags = "--enable-agent --enable-server --with-postgresql --with-libcurl --with-gettext";
+
+ buildInputs = [ pkgconfig postgresql curl openssl zlib ];
+
+ postInstall =
+ ''
+ mkdir -p $out/share/zabbix
+ cp -prvd frontends/php $out/share/zabbix/php
+ mkdir -p $out/share/zabbix/db/data
+ cp -prvd database/postgresql/data.sql $out/share/zabbix/db/data/data.sql
+ cp -prvd database/postgresql/images.sql $out/share/zabbix/db/data/images_pgsql.sql
+ mkdir -p $out/share/zabbix/db/schema
+ cp -prvd database/postgresql/schema.sql $out/share/zabbix/db/schema/postgresql.sql
+ '';
+
+ meta = {
+ description = "An enterprise-class open source distributed monitoring solution";
+ homepage = http://www.zabbix.com/;
+ license = "GPL";
+ maintainers = [ stdenv.lib.maintainers.eelco ];
+ platforms = stdenv.lib.platforms.linux;
+ };
+ };
+
+ agent = stdenv.mkDerivation {
+ name = "zabbix-agent-${version}";
+
+ inherit src preConfigure;
+
+ configureFlags = "--enable-agent";
+
+ meta = {
+ description = "An enterprise-class open source distributed monitoring solution (client-side agent)";
+ homepage = http://www.zabbix.com/;
+ license = "GPL";
+ maintainers = [ stdenv.lib.maintainers.eelco ];
+ platforms = stdenv.lib.platforms.all;
+ };
+ };
+
+}
diff --git a/pkgs/servers/monitoring/zabbix/default.nix b/pkgs/servers/monitoring/zabbix/default.nix
index 864f11bee3e..0189f3dd8fd 100644
--- a/pkgs/servers/monitoring/zabbix/default.nix
+++ b/pkgs/servers/monitoring/zabbix/default.nix
@@ -2,11 +2,11 @@
let
- version = "1.8.10";
-
+ version = "1.8.15";
+
src = fetchurl {
url = "mirror://sourceforge/zabbix/zabbix-${version}.tar.gz";
- sha256 = "0jx5i1ps1zr908g8gh1zisajiblg40x8cchmgbpdviz85hzx4rfr";
+ sha256 = "0358syx6vck6l8j9wwlsb78faivh4qxrgy3jlkmjqr99xi6h3r3f";
};
preConfigure =
@@ -49,7 +49,7 @@ in
platforms = stdenv.lib.platforms.linux;
};
};
-
+
agent = stdenv.mkDerivation {
name = "zabbix-agent-${version}";
@@ -65,5 +65,5 @@ in
platforms = stdenv.lib.platforms.all;
};
};
-
+
}
diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix
index 0c3257d61c3..54c9d160565 100644
--- a/pkgs/servers/mpd/default.nix
+++ b/pkgs/servers/mpd/default.nix
@@ -1,34 +1,90 @@
-{ stdenv, fetchurl, pkgconfig, glib, alsaSupport ? true, alsaLib
-, flacSupport ? true, flac, vorbisSupport ? true, libvorbis
-, madSupport ? true, libmad, id3tagSupport ? true, libid3tag
-, mikmodSupport ? true, libmikmod, cueSupport ? true, libcue
+{ stdenv, fetchurl, pkgconfig, glib, systemd
+, alsaSupport ? true, alsaLib
+, flacSupport ? true, flac
+, vorbisSupport ? true, libvorbis
+, madSupport ? true, libmad
+, id3tagSupport ? true, libid3tag
+, mikmodSupport ? true, libmikmod
+, shoutSupport ? true, libshout
+, sqliteSupport ? true, sqlite
+, curlSupport ? true, curl
+, soupSupport ? true, libsoup
+, audiofileSupport ? true, audiofile
+, bzip2Support ? true, bzip2
+, ffadoSupport ? true, ffado
+, ffmpegSupport ? true, ffmpeg
+, fluidsynthSupport ? true, fluidsynth
+, zipSupport ? true, zziplib
+, samplerateSupport ? true, libsamplerate
+, mmsSupport ? true, libmms
+, mpg123Support ? true, mpg123
+, aacSupport ? true, faad2
}:
+
let
+
opt = stdenv.lib.optional;
-in
-stdenv.mkDerivation rec {
- name = "mpd-0.16.3";
+
+ mkFlag = c: f: if c then "--enable-${f}" else "--disable-${f}";
+
+in stdenv.mkDerivation rec {
+ name = "mpd-0.17.3";
src = fetchurl {
url = "mirror://sourceforge/musicpd/${name}.tar.bz2";
- sha256 = "1liihxj58f944gapdqg15firl6phbxh3y3vjxq9m8dlvm37pkpsq";
+ sha256 = "1iilimlyhw22lpbqiab4qprznxg9c4d68fkrr9jww765b4c7x1ip";
};
- buildInputs = [ pkgconfig glib ]
+
+ buildInputs = [ pkgconfig glib systemd ]
++ opt alsaSupport alsaLib
++ opt flacSupport flac
++ opt vorbisSupport libvorbis
++ opt madSupport libmad
++ opt id3tagSupport libid3tag
++ opt mikmodSupport libmikmod
- ++ opt cueSupport libcue;
- configureFlags = ''
- ${if alsaSupport then "--enable-alsa" else "--disable-alsa"}
- ${if flacSupport then "--enable-flac" else "--disable-flac"}
- ${if vorbisSupport then "--enable-vorbis" else "--disable-vorbis"}
- ${if madSupport then "--enable-mad" else "--disable-mad"}
- ${if mikmodSupport then "--enable-mikmod" else "--disable-mikmod"}
- ${if id3tagSupport then "--enable-id3" else "--disable-id3"}
- ${if cueSupport then "--enable-cue" else "--disable-cue"}
+ ++ opt shoutSupport libshout
+ ++ opt sqliteSupport sqlite
+ ++ opt curlSupport curl
+ ++ opt soupSupport libsoup
+ ++ opt bzip2Support bzip2
+ ++ opt audiofileSupport audiofile
+ ++ opt ffadoSupport ffado
+ ++ opt ffmpegSupport ffmpeg
+ ++ opt fluidsynthSupport fluidsynth
+ ++ opt samplerateSupport libsamplerate
+ ++ opt mmsSupport libmms
+ ++ opt mpg123Support mpg123
+ ++ opt aacSupport faad2
+ ++ opt zipSupport zziplib;
+
+ configureFlags = [
+ "--with-systemdsystemunitdir=$(out)/etc/systemd/system"
+ (mkFlag alsaSupport "alsa")
+ (mkFlag flacSupport "flac")
+ (mkFlag vorbisSupport "vorbis")
+ (mkFlag vorbisSupport "vorbis-encoder")
+ (mkFlag madSupport "mad")
+ (mkFlag mikmodSupport "mikmod")
+ (mkFlag id3tagSupport "id3")
+ (mkFlag shoutSupport "shout")
+ (mkFlag sqliteSupport "sqlite")
+ (mkFlag curlSupport "curl")
+ (mkFlag soupSupport "soup")
+ (mkFlag audiofileSupport "audiofile")
+ (mkFlag bzip2Support "bzip2")
+ (mkFlag ffadoSupport "ffado")
+ (mkFlag ffmpegSupport "ffmpeg")
+ (mkFlag fluidsynthSupport "fluidsynth")
+ (mkFlag zipSupport "zzip")
+ (mkFlag samplerateSupport "lsr")
+ (mkFlag mmsSupport "mms")
+ (mkFlag mpg123Support "mpg123")
+ (mkFlag aacSupport "aac")
+ ];
+
+ NIX_LDFLAGS = ''
+ ${if shoutSupport then "-lshout" else ""}
'';
+
meta = {
description = "A flexible, powerful daemon for playing music";
longDescription = ''
diff --git a/pkgs/servers/nosql/mongodb/default.nix b/pkgs/servers/nosql/mongodb/default.nix
index 685aeb05ce7..345234ba25e 100644
--- a/pkgs/servers/nosql/mongodb/default.nix
+++ b/pkgs/servers/nosql/mongodb/default.nix
@@ -1,39 +1,42 @@
-{ stdenv, fetchurl, scons, which, boost, gnutar, v8 ? null, useV8 ? false}:
-
-assert useV8 -> v8 != null;
+{ stdenv, fetchurl, scons, which, v8, useV8 ? false}:
with stdenv.lib;
+let installerPatch = fetchurl {
+ url = "https://jira.mongodb.org/secure/attachment/18160/SConscript.client.patch";
+ sha256 = "0n60fh2r8i7m6g113k0iw4adc8jv2by4ahrd780kxg47kzfgw06a";
+ };
+
+in
stdenv.mkDerivation rec {
- name = "mongodb-2.0.6";
+ name = "mongodb-2.2.0";
src = fetchurl {
- url = "http://downloads.mongodb.org/src/mongodb-src-r2.0.6.tar.gz";
- sha256 = "0kiiz8crx318sdn0wd9d88pzx9s1c6ak2dhd0zw7kl63gmd74wm9";
+ url = http://downloads.mongodb.org/src/mongodb-src-r2.2.0.tar.gz;
+ sha256 = "12v0cpq9j2gmagr9pbw08karqwqgl4j9r223w7x7sx5cfvj2cih8";
};
- buildInputs = [scons which boost] ++ stdenv.lib.optional useV8 v8;
+ nativeBuildInputs = [ scons which ];
+
+ patches = [ installerPatch ];
enableParallelBuilding = true;
- patchPhase = ''
- substituteInPlace SConstruct --replace "Environment( MSVS_ARCH=msarch , tools = [\"default\", \"gch\"], toolpath = '.' )" "Environment( MSVS_ARCH=msarch , tools = [\"default\", \"gch\"], toolpath = '.', ENV = os.environ )"
- substituteInPlace SConstruct --replace "../v8" "${v8}"
- substituteInPlace SConstruct --replace "LIBPATH=[\"${v8}/\"]" "LIBPATH=[\"${v8}/lib\"]"
+ postPatch = ''
+ substituteInPlace SConstruct --replace "Environment( BUILD_DIR" "Environment( ENV = os.environ, BUILD_DIR"
+ '' + optionalString useV8 ''
+ substituteInPlace SConstruct --replace "#/../v8" "${v8}" \
+ --replace "[\"${v8}/\"]" "[\"${v8}/lib\"]"
'';
buildPhase = ''
- export TERM=""
- scons all --cc=`which gcc` --cxx=`which g++` --libpath=${boost}/lib --cpppath=${boost}/include \
- ${optionalString useV8 "--usev8"}
+ echo $PATH
+ scons all --cc=`which gcc` --cxx=`which g++` ${optionalString useV8 "--usev8"}
'';
installPhase = ''
- scons install --cc=`which gcc` --cxx=`which g++` --libpath=${boost}/lib --cpppath=${boost}/include \
- ${optionalString useV8 "--usev8"} --full --prefix=$out
- if [ -d $out/lib64 ]; then
- mv $out/lib64 $out/lib
- fi
+ scons install --cc=`which gcc` --cxx=`which g++` ${optionalString useV8 "--usev8"} --full --prefix=$out
+ rm -rf $out/lib64 # exact same files as installed in $out/lib
'';
meta = {
@@ -42,7 +45,6 @@ stdenv.mkDerivation rec {
license = "AGPLv3";
maintainers = [ stdenv.lib.maintainers.bluescreen303 ];
- platforms = stdenv.lib.platforms.all;
+ platforms = stdenv.lib.platforms.linux;
};
}
-
diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix
index e2e111a81fb..1992164b3d1 100644
--- a/pkgs/servers/nosql/redis/default.nix
+++ b/pkgs/servers/nosql/redis/default.nix
@@ -1,17 +1,17 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- pname = "redis";
- version = "2.4.7";
- name = "${pname}-${version}";
+ name = "redis-2.6.9";
src = fetchurl {
- url = "http://redis.googlecode.com/files/redis-2.4.7.tar.gz";
- sha256 = "f91956377b7ff23cc23e0c8758e0b873032f36545c61d88436ebb741bf4dd5e1";
+ url = "http://redis.googlecode.com/files/${name}.tar.gz";
+ sha256 = "12bl3inq7xr2lqlqbxjxa3v9s5v7xn2pxlbm72ivxbiq43zpx5jd";
};
makeFlags = "PREFIX=$(out)";
+ enableParallelBuilding = true;
+
meta = {
homepage = http://redis.io;
description = "An open source, advanced key-value store";
diff --git a/pkgs/servers/portmap/default.nix b/pkgs/servers/portmap/default.nix
index d7a05261ff2..f2152b65df3 100644
--- a/pkgs/servers/portmap/default.nix
+++ b/pkgs/servers/portmap/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, lib, tcpWrapper
+{ fetchurl, stdenv, lib, tcp_wrappers
, daemonUser ? false, daemonUID ? false, daemonGID ? false }:
assert daemonUser -> (!daemonUID && !daemonGID);
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
++ lib.optional (daemonUID != false) "DAEMON_UID=${toString daemonUID}"
++ lib.optional (daemonGID != false) "DAEMON_GID=${toString daemonGID}";
- buildInputs = [ tcpWrapper ];
+ buildInputs = [ tcp_wrappers ];
installPhase = ''
mkdir -p "$out/sbin" "$out/man/man8"
diff --git a/pkgs/servers/prayer/default.nix b/pkgs/servers/prayer/default.nix
index c67d2c8a010..f105920ab81 100644
--- a/pkgs/servers/prayer/default.nix
+++ b/pkgs/servers/prayer/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [ openssl db4 zlib uwimap htmlTidy pam ];
- buildNativeInputs = [ perl ];
+ nativeBuildInputs = [ perl ];
NIX_LDFLAGS = "-lpam";
diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix
index 21112250597..e315f788904 100644
--- a/pkgs/servers/pulseaudio/default.nix
+++ b/pkgs/servers/pulseaudio/default.nix
@@ -4,16 +4,17 @@
, jackaudioSupport ? false, jackaudio ? null
, x11Support ? false, xlibs
, json_c
+, useSystemd ? false, systemd ? null
}:
assert jackaudioSupport -> jackaudio != null;
stdenv.mkDerivation rec {
- name = "pulseaudio-1.1";
+ name = "pulseaudio-2.1";
src = fetchurl {
- url = "http://freedesktop.org/software/pulseaudio/releases/pulseaudio-1.1.tar.xz";
- sha256 = "1vpm0681zj2jvhbabvnmrmfxr3172k4x58kjb39y5g3fdw9k3rbg";
+ url = "http://freedesktop.org/software/pulseaudio/releases/pulseaudio-2.1.tar.xz";
+ sha256 = "0zyal2mix7lzhxmr3pxlmss5kjca061iapvrh20bkgvsyixk8szg";
};
# Since `libpulse*.la' contain `-lgdbm', it must be propagated.
@@ -26,13 +27,10 @@ stdenv.mkDerivation rec {
#gtk gconf
]
++ stdenv.lib.optional jackaudioSupport jackaudio
- ++ stdenv.lib.optionals x11Support [ xlibs.xlibs xlibs.libXtst xlibs.libXi ];
+ ++ stdenv.lib.optionals x11Support [ xlibs.xlibs xlibs.libXtst xlibs.libXi ]
+ ++ stdenv.lib.optional useSystemd systemd;
preConfigure = ''
- # Change the `padsp' script so that it contains the full path to
- # `libpulsedsp.so'.
- sed -i "src/utils/padsp" \
- -e "s|libpulsedsp\.so|$out/lib/libpulsedsp.so|g"
# Move the udev rules under $(prefix).
sed -i "src/Makefile.in" \
diff --git a/pkgs/servers/restund/default.nix b/pkgs/servers/restund/default.nix
new file mode 100644
index 00000000000..e817151e778
--- /dev/null
+++ b/pkgs/servers/restund/default.nix
@@ -0,0 +1,28 @@
+{stdenv, fetchurl, zlib, openssl, libre, librem, mysql}:
+stdenv.mkDerivation rec {
+ version = "0.4.2";
+ name = "restund-${version}";
+ src=fetchurl {
+ url = "http://www.creytiv.com/pub/restund-${version}.tar.gz";
+ sha256 = "db5260939d40cb2ce531075bef02b9d6431067bdd52f3168a6f25246bdf7b9f2";
+ };
+ buildInputs = [zlib openssl libre librem mysql];
+ makeFlags = [
+ "LIBRE_MK=${libre}/share/re/re.mk"
+ "LIBRE_INC=${libre}/include/re"
+ "LIBRE_SO=${libre}/lib"
+ "LIBREM_PATH=${librem}"
+ ''PREFIX=$(out)''
+ "USE_MYSQL=1"
+ ]
+ ++ stdenv.lib.optional (stdenv.gcc.gcc != null) "SYSROOT_ALT=${stdenv.gcc.gcc}"
+ ++ stdenv.lib.optional (stdenv.gcc.libc != null) "SYSROOT=${stdenv.gcc.libc}"
+ ;
+ NIX_LDFLAGS='' -L${mysql}/lib/mysql '';
+ meta = {
+ homepage = "http://www.creytiv.com/restund.html";
+ platforms = with stdenv.lib.platforms; linux;
+ maintainers = with stdenv.lib.maintainers; [raskin];
+ license = with stdenv.lib.licenses; bsd3;
+ };
+}
diff --git a/pkgs/servers/samba/default.nix b/pkgs/servers/samba/default.nix
index 7a73a041798..059b1c1a217 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.7";
+ name = "samba-3.6.8";
src = fetchurl {
url = "http://us3.samba.org/samba/ftp/stable/${name}.tar.gz";
- sha256 = "1jnl9v6axz30ymh6in1fwan7zjy9n5n7x70vi1afazxs27qa0n5q";
+ sha256 = "1phl6mmrc72jyvbyrw6cv6b92cxq3v2pbn1fh97nnb4hild1fnjg";
};
patches =
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
postPatch =
# XXX: Awful hack to allow cross-compilation.
'' sed -i source3/configure \
- -e 's/^as_fn_error \("cannot run test program while cross compiling\)/$as_echo \1/g'
+ -e 's/^as_fn_error .. \("cannot run test program while cross compiling\)/$as_echo \1/g'
''; # "
preConfigure =
@@ -68,11 +68,17 @@ stdenv.mkDerivation rec {
''
mkdir -p $out
mv $TMPDIR/inst/$out/* $out/
-
+
mkdir -pv $out/lib/cups/backend
ln -sv ../../../bin/smbspool $out/lib/cups/backend/smb
mkdir -pv $out/etc/openldap/schema
cp ../examples/LDAP/samba.schema $out/etc/openldap/schema
'' # */
+ stdenv.lib.optionalString (configDir == "") "touch $out/lib/smb.conf";
+
+ meta = {
+ homepage = http://www.samba.org/;
+ description = "The standard Windows interoperability suite of programs for Linux and Unix";
+ platforms = stdenv.lib.platforms.linux;
+ };
}
diff --git a/pkgs/servers/shishi/default.nix b/pkgs/servers/shishi/default.nix
index 6779ac9e0c3..db6f94d3826 100644
--- a/pkgs/servers/shishi/default.nix
+++ b/pkgs/servers/shishi/default.nix
@@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
sha256 = "13c6w9rpaqb3am65nrn86byvmll5r78pld2vb0i68491vww4fzlx";
};
+ patches = [ ./no-gets.patch ];
+
buildInputs = [ libtasn1 libgcrypt gnutls ] ;
doCheck = true;
@@ -17,14 +19,14 @@ stdenv.mkDerivation rec {
longDescription =
'' GNU Shishi is an implementation of the Kerberos 5 network
- authentication system, as specified in RFC 4120. Shishi can be
- used to authenticate users in distributed systems.
+ authentication system, as specified in RFC 4120. Shishi can be
+ used to authenticate users in distributed systems.
- Shishi contains a library (`libshishi') that can be used by
- application developers to add support for Kerberos 5. Shishi
- contains a command line utility (1shishi') that is used by
- users to acquire and manage tickets (and more). The server
- side, a Key Distribution Center, is implemented by `shishid'.
+ Shishi contains a library (`libshishi') that can be used by
+ application developers to add support for Kerberos 5. Shishi
+ contains a command line utility (1shishi') that is used by
+ users to acquire and manage tickets (and more). The server
+ side, a Key Distribution Center, is implemented by `shishid'.
'';
homepage = http://www.gnu.org/software/shishi/;
diff --git a/pkgs/servers/shishi/no-gets.patch b/pkgs/servers/shishi/no-gets.patch
new file mode 100644
index 00000000000..12137204f45
--- /dev/null
+++ b/pkgs/servers/shishi/no-gets.patch
@@ -0,0 +1,20 @@
+diff --git a/gl/stdio.in.h b/gl/stdio.in.h
+index 06d9780..fa04a10 100644
+--- a/gl/stdio.in.h
++++ b/gl/stdio.in.h
+@@ -713,10 +713,13 @@ _GL_CXXALIAS_SYS (gets, char *, (char *s));
+ # endif
+ _GL_CXXALIASWARN (gets);
+ /* 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. */
++ so any use of gets warrants an unconditional warning; besides C11
++ removed it. */
++#ifdef gets
++#undef gets
+ _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
+ #endif
++#endif
+
+
+ #if @GNULIB_OBSTACK_PRINTF@ || @GNULIB_OBSTACK_PRINTF_POSIX@
diff --git a/pkgs/servers/sip/freeswitch/default.nix b/pkgs/servers/sip/freeswitch/default.nix
index 5b341b7deb9..a1d9940c887 100644
--- a/pkgs/servers/sip/freeswitch/default.nix
+++ b/pkgs/servers/sip/freeswitch/default.nix
@@ -1,21 +1,16 @@
-{ fetchgit, stdenv, ncurses, curl, pkgconfig, gnutls, readline, openssl, perl, libjpeg
-, libzrtpcpp, autoconf, automake, libtool }:
+{ fetchurl, stdenv, ncurses, curl, pkgconfig, gnutls, readline, openssl, perl, libjpeg
+, libzrtpcpp }:
stdenv.mkDerivation rec {
- name = "freeswitch-git-0db52e6";
+ name = "freeswitch-1.2.3";
- src = fetchgit {
- url = "git://git.freeswitch.org/freeswitch.git";
- rev = "0db52e6e556fce584f1850c3a3b87c8f46ff87c5";
- sha256 = "5cc7161c1ba64c5faf3dda2669e9aafd529eaa66be2fd83f284304444bcab9ff";
+ src = fetchurl {
+ url = http://files.freeswitch.org/freeswitch-1.2.3.tar.bz2;
+ sha256 = "0kfvn5f75c6r6yp18almjz9p6llvpm66gpbxcjswrg3ddgbkzg0k";
};
- preConfigure = ''
- ./bootstrap.sh
- '';
-
buildInputs = [ ncurses curl pkgconfig gnutls readline openssl perl libjpeg
- autoconf automake libtool libzrtpcpp ];
+ libzrtpcpp ];
meta = {
description = "Cross-Platform Scalable FREE Multi-Protocol Soft Switch";
diff --git a/pkgs/servers/sip/sipwitch/default.nix b/pkgs/servers/sip/sipwitch/default.nix
index 7fa9a62e5e3..097dde325f1 100644
--- a/pkgs/servers/sip/sipwitch/default.nix
+++ b/pkgs/servers/sip/sipwitch/default.nix
@@ -1,11 +1,11 @@
{ fetchurl, stdenv, pkgconfig, ucommon, libosip, libexosip, gnutls, zlib }:
stdenv.mkDerivation rec {
- name = "sipwitch-1.2.3";
+ name = "sipwitch-1.2.4";
src = fetchurl {
url = "mirror://gnu/sipwitch/${name}.tar.gz";
- sha256 = "0vc7x061m2jdj8hwpw56yiz8ij07x058vm1rm1dz7w98slpkcj6d";
+ sha256 = "1c826832xi9p85l7c9va33xx8hx01m3jq49s0d1xl4c8kvri7bsj";
};
buildInputs = [ pkgconfig ucommon libosip libexosip gnutls zlib ];
diff --git a/pkgs/servers/sql/mysql/jdbc/default.nix b/pkgs/servers/sql/mysql/jdbc/default.nix
index 0f411b43f9f..07c4d6a0aba 100644
--- a/pkgs/servers/sql/mysql/jdbc/default.nix
+++ b/pkgs/servers/sql/mysql/jdbc/default.nix
@@ -1,12 +1,12 @@
{stdenv, fetchurl, ant, unzip}:
stdenv.mkDerivation {
- name = "mysql-connector-java-5.1.17";
+ name = "mysql-connector-java-5.1.22";
builder = ./builder.sh;
src = fetchurl {
- url = ftp://mirror.leaseweb.com/mysql/Downloads/Connector-J/mysql-connector-java-5.1.17.zip;
- sha256 = "1c4hsx0qwb3rp66a1dllnah2zi9gqqnr4aqm9p59yrqj5jr22ldp";
+ url = http://cdn.mysql.com/Downloads/Connector-J/mysql-connector-java-5.1.22.zip;
+ sha256 = "0hfx1znq0iqclkc8visca7x67lvlk3cswni69ghi2c5cpa2d4ijm";
};
buildInputs = [ unzip ant ];
diff --git a/pkgs/servers/sql/mysql55/default.nix b/pkgs/servers/sql/mysql55/default.nix
index 3f26ea1f98b..81514494c07 100644
--- a/pkgs/servers/sql/mysql55/default.nix
+++ b/pkgs/servers/sql/mysql55/default.nix
@@ -2,20 +2,32 @@
# Note: zlib is not required; MySQL can use an internal zlib.
-stdenv.mkDerivation {
- name = "mysql-5.5.23";
+stdenv.mkDerivation rec {
+ name = "mysql-${version}";
+ version = "5.5.28";
src = fetchurl {
- url = ftp://ftp.inria.fr/pub/MySQL/Downloads/MySQL-5.5/mysql-5.5.23.tar.gz;
- sha256 = "0sklcz6miff7nb6bi1pqncgjv819255y7if6jxcqgiqs50z319i0";
+ urls = [
+ "mirror://sourceforge/mysql.mirror/${name}.tar.gz"
+ "http://mysql.linux.cz/Downloads/MySQL-5.5/${name}.tar.gz"
+ "http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.5/${name}.tar.gz"
+ ];
+ sha256 = "13y7bhjmx4daidvyqjz88yffbswb6rc1khkmiqm896fx3lglkcpr";
};
- buildInputs = [ cmake bison ncurses openssl readline zlib ];
+ buildInputs = [ cmake bison ncurses openssl readline zlib ]
+ ++ stdenv.lib.optional stdenv.isDarwin perl;
+
+
+ enableParallelBuilding = true;
cmakeFlags = "-DWITH_SSL=yes -DWITH_READLINE=yes -DWITH_EMBEDDED_SERVER=yes -DWITH_ZLIB=yes -DINSTALL_SCRIPTDIR=bin -DHAVE_IPV6=yes";
NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";
+ prePatch = ''
+ sed -i -e "s|/usr/bin/libtool|libtool|" cmake/libutils.cmake
+ '';
postInstall = ''
sed -i -e "s|basedir=\"\"|basedir=\"$out\"|" $out/bin/mysql_install_db
rm -rf $out/mysql-test $out/sql-bench
diff --git a/pkgs/servers/sql/postgresql/8.3.x.nix b/pkgs/servers/sql/postgresql/8.3.x.nix
index d4ddb36d4fe..b7f2d7d2a50 100644
--- a/pkgs/servers/sql/postgresql/8.3.x.nix
+++ b/pkgs/servers/sql/postgresql/8.3.x.nix
@@ -1,13 +1,13 @@
{ stdenv, fetchurl, zlib, ncurses, readline }:
-let version = "8.3.20"; in
+let version = "8.3.23"; in
stdenv.mkDerivation rec {
name = "postgresql-${version}";
src = fetchurl {
url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
- sha256 = "0qqic4wx59lgbyfmdfcgip9nrcpk10zdb91bw9b96wr1vijn2awj";
+ sha256 = "1n8qj1bvyx83jsn2x2l8xzk53c014gkz8hwvswvnzcdyvlbnd90p";
};
buildInputs = [ zlib ncurses readline ];
diff --git a/pkgs/servers/sql/postgresql/8.4.x.nix b/pkgs/servers/sql/postgresql/8.4.x.nix
index e1150543f36..37713d87fd5 100644
--- a/pkgs/servers/sql/postgresql/8.4.x.nix
+++ b/pkgs/servers/sql/postgresql/8.4.x.nix
@@ -1,13 +1,13 @@
{ stdenv, fetchurl, zlib, ncurses, readline }:
-let version = "8.4.13"; in
+let version = "8.4.16"; in
stdenv.mkDerivation rec {
name = "postgresql-${version}";
src = fetchurl {
url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
- sha256 = "1fccqkni64vg1pi4zzcl67bm9g2brrlzjn1vh6qlyfpsld139p90";
+ sha256 = "0bv10jh9pg523rzgbqjq4lzq4ai3275pqhkg0qkr40ap756xj0wd";
};
buildInputs = [ zlib ncurses readline ];
diff --git a/pkgs/servers/sql/postgresql/9.0.x.nix b/pkgs/servers/sql/postgresql/9.0.x.nix
index a28e5c33779..c0766ba2813 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.9"; in
+let version = "9.0.12"; in
stdenv.mkDerivation rec {
name = "postgresql-${version}";
src = fetchurl {
url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
- sha256 = "12nslml1mg3lyvrhmdvv5g15n7vj5fk1blx1dfllylqg38c7shc7";
+ sha256 = "090m5cxw7jv9q2jgwbs3qm57z6ldf0mcavc0wsmqk1ywrdrniw40";
};
buildInputs = [ zlib readline ];
diff --git a/pkgs/servers/sql/postgresql/9.1.x.nix b/pkgs/servers/sql/postgresql/9.1.x.nix
index 14488d4649e..18716707fd9 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.5"; in
+let version = "9.1.8"; in
stdenv.mkDerivation rec {
name = "postgresql-${version}";
src = fetchurl {
url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
- sha256 = "0i6fssldjp65xfxz9dcmkhz6bk4rpw9g26zbqbc6iz164h9rr20b";
+ sha256 = "0vacnhqs9mrjrx9vh4r66a9smwl1d4qrmjlsq3ydnqj0lbfzk20x";
};
buildInputs = [ zlib readline ];
diff --git a/pkgs/servers/sql/postgresql/9.2.x.nix b/pkgs/servers/sql/postgresql/9.2.x.nix
new file mode 100644
index 00000000000..45173ad6511
--- /dev/null
+++ b/pkgs/servers/sql/postgresql/9.2.x.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchurl, zlib, readline }:
+
+let version = "9.2.3"; in
+
+stdenv.mkDerivation rec {
+ name = "postgresql-${version}";
+
+ src = fetchurl {
+ url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
+ sha256 = "0zszqgp64pn7z9ab36bi989apj6hi20yxvcrk26jvhy0j0radxf4";
+ };
+
+ buildInputs = [ zlib readline ];
+
+ enableParallelBuilding = true;
+
+ LC_ALL = "C";
+
+ postInstall =
+ ''
+ mkdir -p $out/share/man
+ cp -rvd doc/src/sgml/man1 $out/share/man
+ '';
+
+ passthru = {
+ inherit readline;
+ psqlSchema = "9.1";
+ };
+
+ meta = {
+ homepage = http://www.postgresql.org/;
+ description = "A powerful, open source object-relational database system";
+ license = "bsd";
+ };
+}
diff --git a/pkgs/servers/sql/postgresql/psqlodbc/default.nix b/pkgs/servers/sql/postgresql/psqlodbc/default.nix
new file mode 100644
index 00000000000..ce57c214183
--- /dev/null
+++ b/pkgs/servers/sql/postgresql/psqlodbc/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, libiodbc, postgresql, openssl }:
+
+stdenv.mkDerivation rec {
+ name = "psqlodbc-09.01.0200";
+
+ src = fetchurl {
+ url = "http://ftp.postgresql.org/pub/odbc/versions/src/${name}.tar.gz";
+ sha256 = "0b4w1ahfpp34jpscfk2kv9050lh3xl9pvcysqvaigkcd0vsk1hl9";
+ };
+
+ buildInputs = [ libiodbc postgresql openssl ];
+
+ configureFlags = "--with-iodbc=${libiodbc}";
+
+ meta = {
+ homepage = http://psqlodbc.projects.postgresql.org/;
+ description = "ODBC driver for PostgreSQL";
+ license = "LGPL";
+ };
+}
diff --git a/pkgs/servers/squid/squids.nix b/pkgs/servers/squid/squids.nix
index 3e5e4ebbe6f..b349ab617ac 100644
--- a/pkgs/servers/squid/squids.nix
+++ b/pkgs/servers/squid/squids.nix
@@ -30,16 +30,16 @@ rec {
configureFlags = ["--enable-ipv6"];
};
- squid32Beta = squid30.merge rec {
- name = "squid-3.2.0.16";
+ squid32 = squid30.merge rec {
+ name = "squid-3.2.2";
src = args.fetchurl {
url = "http://www.squid-cache.org/Versions/v3/3.2/${name}.tar.bz2";
- sha256 = "2431f4f9372e4e1a9c5fca5a4fa0c4bb0761ce3e044642ea9362bb1580a36d25";
+ sha256 = "13jlx3d6rqq7ajxs8bgn8a0mh932jhq6aa8032q205nxnhqs0l4l";
};
configureFlags = ["--enable-ipv6"];
buildInputs = [openldap pam db4 cyrus_sasl libcap expat libxml2
libtool openssl];
};
- latest = squid32Beta;
+ latest = squid32;
}
diff --git a/pkgs/servers/unfs3/default.nix b/pkgs/servers/unfs3/default.nix
index e59023c905e..96073645cc1 100644
--- a/pkgs/servers/unfs3/default.nix
+++ b/pkgs/servers/unfs3/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "076zkyqkn56q0a8n3h65n1a68fknk4hrrp6mbhajq5s1wp5248j8";
};
- buildNativeInputs = [ flex bison ];
+ nativeBuildInputs = [ flex bison ];
configureFlags = [ "--disable-shared" ];
diff --git a/pkgs/servers/x11/xorg/builder.sh b/pkgs/servers/x11/xorg/builder.sh
index bb776a5051b..6ba50d24507 100644
--- a/pkgs/servers/x11/xorg/builder.sh
+++ b/pkgs/servers/x11/xorg/builder.sh
@@ -26,7 +26,7 @@ postInstall() {
for p in $nativePkgs; do
if test -e $p/lib/pkgconfig/$r.pc; then
echo " found requisite $r in $p"
- propagatedBuildNativeInputs="$propagatedBuildNativeInputs $p"
+ propagatedNativeBuildInputs="$propagatedNativeBuildInputs $p"
fi
done
fi
@@ -34,7 +34,7 @@ postInstall() {
mkdir -p "$out/nix-support"
echo "$propagatedBuildInputs" > "$out/nix-support/propagated-build-inputs"
- echo "$propagatedBuildNativeInputs" > "$out/nix-support/propagated-build-native-inputs"
+ echo "$propagatedNativeBuildInputs" > "$out/nix-support/propagated-native-build-inputs"
}
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 4fbc6fbdfda..23600b0e014 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -8,11 +8,11 @@ let
xorg = rec {
applewmproto = (stdenv.mkDerivation ((if overrides ? applewmproto then overrides.applewmproto else x: x) {
- name = "applewmproto-1.4.1";
+ name = "applewmproto-1.4.2";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/applewmproto-1.4.1.tar.bz2;
- sha256 = "06fyixmx36qac2qqwmra3l9xr570rankm9kzmk0mgqyhgldrw1h8";
+ url = mirror://xorg/X11R7.7/src/everything/applewmproto-1.4.2.tar.bz2;
+ sha256 = "1zi4p07mp6jmk030p4gmglwxcwp0lzs5mi31y1b4rp8lsqxdxizw";
};
buildInputs = [pkgconfig ];
})) // {inherit ;};
@@ -21,18 +21,18 @@ let
name = "bdftopcf-1.0.3";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/bdftopcf-1.0.3.tar.bz2;
+ url = mirror://xorg/X11R7.7/src/everything/bdftopcf-1.0.3.tar.bz2;
sha256 = "02hx981f7jfwylxj21s91yvv4h597nqqzz3vd6ar81zyn84b944w";
};
buildInputs = [pkgconfig libXfont ];
})) // {inherit libXfont ;};
bigreqsproto = (stdenv.mkDerivation ((if overrides ? bigreqsproto then overrides.bigreqsproto else x: x) {
- name = "bigreqsproto-1.1.1";
+ name = "bigreqsproto-1.1.2";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/bigreqsproto-1.1.1.tar.bz2;
- sha256 = "16phzxa55lr749rghpaa699h1lcpndmw7izxzgl1bljq5f3qafqw";
+ url = mirror://xorg/X11R7.7/src/everything/bigreqsproto-1.1.2.tar.bz2;
+ sha256 = "07hvfm84scz8zjw14riiln2v4w03jlhp756ypwhq27g48jmic8a6";
};
buildInputs = [pkgconfig ];
})) // {inherit ;};
@@ -41,7 +41,7 @@ let
name = "compositeproto-0.4.2";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/compositeproto-0.4.2.tar.bz2;
+ url = mirror://xorg/X11R7.7/src/everything/compositeproto-0.4.2.tar.bz2;
sha256 = "1z0crmf669hirw4s7972mmp8xig80kfndja9h559haqbpvq5k4q4";
};
buildInputs = [pkgconfig ];
@@ -51,7 +51,7 @@ let
name = "damageproto-1.2.1";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/damageproto-1.2.1.tar.bz2;
+ url = mirror://xorg/X11R7.7/src/everything/damageproto-1.2.1.tar.bz2;
sha256 = "0nzwr5pv9hg7c21n995pdiv0zqhs91yz3r8rn3aska4ykcp12z2w";
};
buildInputs = [pkgconfig ];
@@ -61,18 +61,18 @@ let
name = "dmxproto-2.3.1";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/individual/proto/dmxproto-2.3.1.tar.bz2;
+ url = mirror://xorg/X11R7.7/src/everything/dmxproto-2.3.1.tar.bz2;
sha256 = "02b5x9dkgajizm8dqyx2w6hmqx3v25l67mgf35nj6sz0lgk52877";
};
buildInputs = [pkgconfig ];
})) // {inherit ;};
dri2proto = (stdenv.mkDerivation ((if overrides ? dri2proto then overrides.dri2proto else x: x) {
- name = "dri2proto-2.6";
+ name = "dri2proto-2.8";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/individual/proto/dri2proto-2.6.tar.bz2;
- sha256 = "02drlfqvjm2q7dvkkwli3fs2crb6rdb3kyd13vwx7z0rijrc10md";
+ url = mirror://xorg/individual/proto/dri2proto-2.8.tar.bz2;
+ sha256 = "015az1vfdqmil1yay5nlsmpf6cf7vcbpslxjb72cfkzlvrv59dgr";
};
buildInputs = [pkgconfig ];
})) // {inherit ;};
@@ -81,18 +81,18 @@ let
name = "encodings-1.0.4";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/encodings-1.0.4.tar.bz2;
+ url = mirror://xorg/X11R7.7/src/everything/encodings-1.0.4.tar.bz2;
sha256 = "0ffmaw80vmfwdgvdkp6495xgsqszb6s0iira5j0j6pd4i0lk3mnf";
};
buildInputs = [pkgconfig ];
})) // {inherit ;};
fixesproto = (stdenv.mkDerivation ((if overrides ? fixesproto then overrides.fixesproto else x: x) {
- name = "fixesproto-4.1.2";
+ name = "fixesproto-5.0";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/fixesproto-4.1.2.tar.bz2;
- sha256 = "0mzq8kh1v1w2mrl4y82qzgv8jzlr3n4jmss56h3r1h9knp6byk6y";
+ url = mirror://xorg/X11R7.7/src/everything/fixesproto-5.0.tar.bz2;
+ sha256 = "1ki4wiq2iivx5g4w5ckzbjbap759kfqd72yg18m3zpbb4hqkybxs";
};
buildInputs = [pkgconfig xextproto ];
})) // {inherit xextproto ;};
@@ -101,47 +101,47 @@ let
name = "font-adobe-100dpi-1.0.3";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/font-adobe-100dpi-1.0.3.tar.bz2;
+ url = mirror://xorg/X11R7.7/src/everything/font-adobe-100dpi-1.0.3.tar.bz2;
sha256 = "0m60f5bd0caambrk8ksknb5dks7wzsg7g7xaf0j21jxmx8rq9h5j";
};
- buildInputs = [pkgconfig bdftopcf fontutil mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts";
- })) // {inherit bdftopcf fontutil mkfontdir ;};
+ buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts";
+ })) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
fontadobe75dpi = (stdenv.mkDerivation ((if overrides ? fontadobe75dpi then overrides.fontadobe75dpi else x: x) {
name = "font-adobe-75dpi-1.0.3";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/font-adobe-75dpi-1.0.3.tar.bz2;
+ url = mirror://xorg/X11R7.7/src/everything/font-adobe-75dpi-1.0.3.tar.bz2;
sha256 = "02advcv9lyxpvrjv8bjh1b797lzg6jvhipclz49z8r8y98g4l0n6";
};
- buildInputs = [pkgconfig bdftopcf fontutil mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts";
- })) // {inherit bdftopcf fontutil mkfontdir ;};
+ buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts";
+ })) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
fontadobeutopia100dpi = (stdenv.mkDerivation ((if overrides ? fontadobeutopia100dpi then overrides.fontadobeutopia100dpi else x: x) {
name = "font-adobe-utopia-100dpi-1.0.4";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/font-adobe-utopia-100dpi-1.0.4.tar.bz2;
+ url = mirror://xorg/X11R7.7/src/everything/font-adobe-utopia-100dpi-1.0.4.tar.bz2;
sha256 = "19dd9znam1ah72jmdh7i6ny2ss2r6m21z9v0l43xvikw48zmwvyi";
};
- buildInputs = [pkgconfig bdftopcf fontutil mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts";
- })) // {inherit bdftopcf fontutil mkfontdir ;};
+ buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts";
+ })) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
fontadobeutopia75dpi = (stdenv.mkDerivation ((if overrides ? fontadobeutopia75dpi then overrides.fontadobeutopia75dpi else x: x) {
name = "font-adobe-utopia-75dpi-1.0.4";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/font-adobe-utopia-75dpi-1.0.4.tar.bz2;
+ url = mirror://xorg/X11R7.7/src/everything/font-adobe-utopia-75dpi-1.0.4.tar.bz2;
sha256 = "152wigpph5wvl4k9m3l4mchxxisgsnzlx033mn5iqrpkc6f72cl7";
};
- buildInputs = [pkgconfig bdftopcf fontutil mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts";
- })) // {inherit bdftopcf fontutil mkfontdir ;};
+ buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts";
+ })) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
fontadobeutopiatype1 = (stdenv.mkDerivation ((if overrides ? fontadobeutopiatype1 then overrides.fontadobeutopiatype1 else x: x) {
name = "font-adobe-utopia-type1-1.0.4";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/font-adobe-utopia-type1-1.0.4.tar.bz2;
+ url = mirror://xorg/X11R7.7/src/everything/font-adobe-utopia-type1-1.0.4.tar.bz2;
sha256 = "0xw0pdnzj5jljsbbhakc6q9ha2qnca1jr81zk7w70yl9bw83b54p";
};
buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts";
@@ -151,7 +151,7 @@ let
name = "font-alias-1.0.3";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/font-alias-1.0.3.tar.bz2;
+ url = mirror://xorg/X11R7.7/src/everything/font-alias-1.0.3.tar.bz2;
sha256 = "16ic8wfwwr3jicaml7b5a0sk6plcgc1kg84w02881yhwmqm3nicb";
};
buildInputs = [pkgconfig ];
@@ -161,7 +161,7 @@ let
name = "font-arabic-misc-1.0.3";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/font-arabic-misc-1.0.3.tar.bz2;
+ url = mirror://xorg/X11R7.7/src/everything/font-arabic-misc-1.0.3.tar.bz2;
sha256 = "1x246dfnxnmflzf0qzy62k8jdpkb6jkgspcjgbk8jcq9lw99npah";
};
buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts";
@@ -171,47 +171,47 @@ let
name = "font-bh-100dpi-1.0.3";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/font-bh-100dpi-1.0.3.tar.bz2;
+ url = mirror://xorg/X11R7.7/src/everything/font-bh-100dpi-1.0.3.tar.bz2;
sha256 = "10cl4gm38dw68jzln99ijix730y7cbx8np096gmpjjwff1i73h13";
};
- buildInputs = [pkgconfig bdftopcf fontutil mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts";
- })) // {inherit bdftopcf fontutil mkfontdir ;};
+ buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts";
+ })) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
fontbh75dpi = (stdenv.mkDerivation ((if overrides ? fontbh75dpi then overrides.fontbh75dpi else x: x) {
name = "font-bh-75dpi-1.0.3";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/font-bh-75dpi-1.0.3.tar.bz2;
+ url = mirror://xorg/X11R7.7/src/everything/font-bh-75dpi-1.0.3.tar.bz2;
sha256 = "073jmhf0sr2j1l8da97pzsqj805f7mf9r2gy92j4diljmi8sm1il";
};
- buildInputs = [pkgconfig bdftopcf fontutil mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts";
- })) // {inherit bdftopcf fontutil mkfontdir ;};
+ buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts";
+ })) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
fontbhlucidatypewriter100dpi = (stdenv.mkDerivation ((if overrides ? fontbhlucidatypewriter100dpi then overrides.fontbhlucidatypewriter100dpi else x: x) {
name = "font-bh-lucidatypewriter-100dpi-1.0.3";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/font-bh-lucidatypewriter-100dpi-1.0.3.tar.bz2;
+ url = mirror://xorg/X11R7.7/src/everything/font-bh-lucidatypewriter-100dpi-1.0.3.tar.bz2;
sha256 = "1fqzckxdzjv4802iad2fdrkpaxl4w0hhs9lxlkyraq2kq9ik7a32";
};
- buildInputs = [pkgconfig bdftopcf fontutil mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts";
- })) // {inherit bdftopcf fontutil mkfontdir ;};
+ buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts";
+ })) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
fontbhlucidatypewriter75dpi = (stdenv.mkDerivation ((if overrides ? fontbhlucidatypewriter75dpi then overrides.fontbhlucidatypewriter75dpi else x: x) {
name = "font-bh-lucidatypewriter-75dpi-1.0.3";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/font-bh-lucidatypewriter-75dpi-1.0.3.tar.bz2;
+ url = mirror://xorg/X11R7.7/src/everything/font-bh-lucidatypewriter-75dpi-1.0.3.tar.bz2;
sha256 = "0cfbxdp5m12cm7jsh3my0lym9328cgm7fa9faz2hqj05wbxnmhaa";
};
- buildInputs = [pkgconfig bdftopcf fontutil mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts";
- })) // {inherit bdftopcf fontutil mkfontdir ;};
+ buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts";
+ })) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
fontbhttf = (stdenv.mkDerivation ((if overrides ? fontbhttf then overrides.fontbhttf else x: x) {
name = "font-bh-ttf-1.0.3";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/font-bh-ttf-1.0.3.tar.bz2;
+ url = mirror://xorg/X11R7.7/src/everything/font-bh-ttf-1.0.3.tar.bz2;
sha256 = "0pyjmc0ha288d4i4j0si4dh3ncf3jiwwjljvddrb0k8v4xiyljqv";
};
buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts";
@@ -221,7 +221,7 @@ let
name = "font-bh-type1-1.0.3";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/font-bh-type1-1.0.3.tar.bz2;
+ url = mirror://xorg/X11R7.7/src/everything/font-bh-type1-1.0.3.tar.bz2;
sha256 = "1hb3iav089albp4sdgnlh50k47cdjif9p4axm0kkjvs8jyi5a53n";
};
buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts";
@@ -231,7 +231,7 @@ let
name = "font-bitstream-100dpi-1.0.3";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/font-bitstream-100dpi-1.0.3.tar.bz2;
+ url = mirror://xorg/X11R7.7/src/everything/font-bitstream-100dpi-1.0.3.tar.bz2;
sha256 = "1kmn9jbck3vghz6rj3bhc3h0w6gh0qiaqm90cjkqsz1x9r2dgq7b";
};
buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts";
@@ -241,7 +241,7 @@ let
name = "font-bitstream-75dpi-1.0.3";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/font-bitstream-75dpi-1.0.3.tar.bz2;
+ url = mirror://xorg/X11R7.7/src/everything/font-bitstream-75dpi-1.0.3.tar.bz2;
sha256 = "13plbifkvfvdfym6gjbgy9wx2xbdxi9hfrl1k22xayy02135wgxs";
};
buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts";
@@ -251,7 +251,7 @@ let
name = "font-bitstream-type1-1.0.3";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/font-bitstream-type1-1.0.3.tar.bz2;
+ url = mirror://xorg/X11R7.7/src/everything/font-bitstream-type1-1.0.3.tar.bz2;
sha256 = "1256z0jhcf5gbh1d03593qdwnag708rxqa032izmfb5dmmlhbsn6";
};
buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts";
@@ -261,7 +261,7 @@ let
name = "font-cronyx-cyrillic-1.0.3";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/font-cronyx-cyrillic-1.0.3.tar.bz2;
+ url = mirror://xorg/X11R7.7/src/everything/font-cronyx-cyrillic-1.0.3.tar.bz2;
sha256 = "0ai1v4n61k8j9x2a1knvfbl2xjxk3xxmqaq3p9vpqrspc69k31kf";
};
buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts";
@@ -271,7 +271,7 @@ let
name = "font-cursor-misc-1.0.3";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/font-cursor-misc-1.0.3.tar.bz2;
+ url = mirror://xorg/X11R7.7/src/everything/font-cursor-misc-1.0.3.tar.bz2;
sha256 = "0dd6vfiagjc4zmvlskrbjz85jfqhf060cpys8j0y1qpcbsrkwdhp";
};
buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts";
@@ -281,7 +281,7 @@ let
name = "font-daewoo-misc-1.0.3";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/font-daewoo-misc-1.0.3.tar.bz2;
+ url = mirror://xorg/X11R7.7/src/everything/font-daewoo-misc-1.0.3.tar.bz2;
sha256 = "1s2bbhizzgbbbn5wqs3vw53n619cclxksljvm759h9p1prqdwrdw";
};
buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts";
@@ -291,7 +291,7 @@ let
name = "font-dec-misc-1.0.3";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/font-dec-misc-1.0.3.tar.bz2;
+ url = mirror://xorg/X11R7.7/src/everything/font-dec-misc-1.0.3.tar.bz2;
sha256 = "0yzza0l4zwyy7accr1s8ab7fjqkpwggqydbm2vc19scdby5xz7g1";
};
buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts";
@@ -301,7 +301,7 @@ let
name = "font-ibm-type1-1.0.3";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/font-ibm-type1-1.0.3.tar.bz2;
+ url = mirror://xorg/X11R7.7/src/everything/font-ibm-type1-1.0.3.tar.bz2;
sha256 = "1pyjll4adch3z5cg663s6vhi02k8m6488f0mrasg81ssvg9jinzx";
};
buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts";
@@ -311,7 +311,7 @@ let
name = "font-isas-misc-1.0.3";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/font-isas-misc-1.0.3.tar.bz2;
+ url = mirror://xorg/X11R7.7/src/everything/font-isas-misc-1.0.3.tar.bz2;
sha256 = "0rx8q02rkx673a7skkpnvfkg28i8gmqzgf25s9yi0lar915sn92q";
};
buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts";
@@ -321,7 +321,7 @@ let
name = "font-jis-misc-1.0.3";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/font-jis-misc-1.0.3.tar.bz2;
+ url = mirror://xorg/X11R7.7/src/everything/font-jis-misc-1.0.3.tar.bz2;
sha256 = "0rdc3xdz12pnv951538q6wilx8mrdndpkphpbblszsv7nc8cw61b";
};
buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts";
@@ -331,7 +331,7 @@ let
name = "font-micro-misc-1.0.3";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/font-micro-misc-1.0.3.tar.bz2;
+ url = mirror://xorg/X11R7.7/src/everything/font-micro-misc-1.0.3.tar.bz2;
sha256 = "1dldxlh54zq1yzfnrh83j5vm0k4ijprrs5yl18gm3n9j1z0q2cws";
};
buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts";
@@ -341,7 +341,7 @@ let
name = "font-misc-cyrillic-1.0.3";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/font-misc-cyrillic-1.0.3.tar.bz2;
+ url = mirror://xorg/X11R7.7/src/everything/font-misc-cyrillic-1.0.3.tar.bz2;
sha256 = "0q2ybxs8wvylvw95j6x9i800rismsmx4b587alwbfqiw6biy63z4";
};
buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts";
@@ -351,7 +351,7 @@ let
name = "font-misc-ethiopic-1.0.3";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/font-misc-ethiopic-1.0.3.tar.bz2;
+ url = mirror://xorg/X11R7.7/src/everything/font-misc-ethiopic-1.0.3.tar.bz2;
sha256 = "19cq7iq0pfad0nc2v28n681fdq3fcw1l1hzaq0wpkgpx7bc1zjsk";
};
buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts";
@@ -361,7 +361,7 @@ let
name = "font-misc-meltho-1.0.3";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/font-misc-meltho-1.0.3.tar.bz2;
+ url = mirror://xorg/X11R7.7/src/everything/font-misc-meltho-1.0.3.tar.bz2;
sha256 = "148793fqwzrc3bmh2vlw5fdiwjc2n7vs25cic35gfp452czk489p";
};
buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts";
@@ -371,17 +371,17 @@ let
name = "font-misc-misc-1.1.2";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/font-misc-misc-1.1.2.tar.bz2;
+ url = mirror://xorg/X11R7.7/src/everything/font-misc-misc-1.1.2.tar.bz2;
sha256 = "150pq6n8n984fah34n3k133kggn9v0c5k07igv29sxp1wi07krxq";
};
- buildInputs = [pkgconfig bdftopcf fontutil mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts";
- })) // {inherit bdftopcf fontutil mkfontdir ;};
+ buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts";
+ })) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
fontmuttmisc = (stdenv.mkDerivation ((if overrides ? fontmuttmisc then overrides.fontmuttmisc else x: x) {
name = "font-mutt-misc-1.0.3";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/font-mutt-misc-1.0.3.tar.bz2;
+ url = mirror://xorg/X11R7.7/src/everything/font-mutt-misc-1.0.3.tar.bz2;
sha256 = "13qghgr1zzpv64m0p42195k1kc77pksiv059fdvijz1n6kdplpxx";
};
buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts";
@@ -391,17 +391,17 @@ let
name = "font-schumacher-misc-1.1.2";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/font-schumacher-misc-1.1.2.tar.bz2;
+ url = mirror://xorg/X11R7.7/src/everything/font-schumacher-misc-1.1.2.tar.bz2;
sha256 = "0nkym3n48b4v36y4s927bbkjnsmicajarnf6vlp7wxp0as304i74";
};
- buildInputs = [pkgconfig bdftopcf fontutil mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts";
- })) // {inherit bdftopcf fontutil mkfontdir ;};
+ buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts";
+ })) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
fontscreencyrillic = (stdenv.mkDerivation ((if overrides ? fontscreencyrillic then overrides.fontscreencyrillic else x: x) {
name = "font-screen-cyrillic-1.0.4";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/font-screen-cyrillic-1.0.4.tar.bz2;
+ url = mirror://xorg/X11R7.7/src/everything/font-screen-cyrillic-1.0.4.tar.bz2;
sha256 = "0yayf1qlv7irf58nngddz2f1q04qkpr5jwp4aja2j5gyvzl32hl2";
};
buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts";
@@ -411,18 +411,18 @@ let
name = "font-sony-misc-1.0.3";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/font-sony-misc-1.0.3.tar.bz2;
+ url = mirror://xorg/X11R7.7/src/everything/font-sony-misc-1.0.3.tar.bz2;
sha256 = "1xfgcx4gsgik5mkgkca31fj3w72jw9iw76qyrajrsz1lp8ka6hr0";
};
buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts";
})) // {inherit bdftopcf mkfontdir ;};
fontsproto = (stdenv.mkDerivation ((if overrides ? fontsproto then overrides.fontsproto else x: x) {
- name = "fontsproto-2.1.1";
+ name = "fontsproto-2.1.2";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/fontsproto-2.1.1.tar.bz2;
- sha256 = "1g1rsvj0lb7744x6fj18d989ymf7zgry3v3fzipnnzljwa0vr6lw";
+ url = mirror://xorg/X11R7.7/src/everything/fontsproto-2.1.2.tar.bz2;
+ sha256 = "1ab8mbqxdwvdz4k5x4xb9c4n5w7i1xw276cbpk4z7a1nlpjrg746";
};
buildInputs = [pkgconfig ];
})) // {inherit ;};
@@ -431,18 +431,18 @@ let
name = "font-sun-misc-1.0.3";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/font-sun-misc-1.0.3.tar.bz2;
+ url = mirror://xorg/X11R7.7/src/everything/font-sun-misc-1.0.3.tar.bz2;
sha256 = "1q6jcqrffg9q5f5raivzwx9ffvf7r11g6g0b125na1bhpz5ly7s8";
};
buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts";
})) // {inherit bdftopcf mkfontdir ;};
fontutil = (stdenv.mkDerivation ((if overrides ? fontutil then overrides.fontutil else x: x) {
- name = "font-util-1.2.0";
+ name = "font-util-1.3.0";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/font-util-1.2.0.tar.bz2;
- sha256 = "04lp7xlrcqfyrsnvdgyqbanlnzr13lhn28v0kr2nzpvcmqbwdfnv";
+ url = mirror://xorg/X11R7.7/src/everything/font-util-1.3.0.tar.bz2;
+ sha256 = "15cijajwhjzpy3ydc817zz8x5z4gbkyv3fps687jbq544mbfbafz";
};
buildInputs = [pkgconfig ];
})) // {inherit ;};
@@ -451,7 +451,7 @@ let
name = "font-winitzki-cyrillic-1.0.3";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/font-winitzki-cyrillic-1.0.3.tar.bz2;
+ url = mirror://xorg/X11R7.7/src/everything/font-winitzki-cyrillic-1.0.3.tar.bz2;
sha256 = "181n1bgq8vxfxqicmy1jpm1hnr6gwn1kdhl6hr4frjigs1ikpldb";
};
buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts";
@@ -461,7 +461,7 @@ let
name = "font-xfree86-type1-1.0.4";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/font-xfree86-type1-1.0.4.tar.bz2;
+ url = mirror://xorg/X11R7.7/src/everything/font-xfree86-type1-1.0.4.tar.bz2;
sha256 = "0jp3zc0qfdaqfkgzrb44vi9vi0a8ygb35wp082yz7rvvxhmg9sya";
};
buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts";
@@ -478,91 +478,91 @@ let
})) // {inherit ;};
glproto = (stdenv.mkDerivation ((if overrides ? glproto then overrides.glproto else x: x) {
- name = "glproto-1.4.12";
+ name = "glproto-1.4.16";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/glproto-1.4.12.tar.bz2;
- sha256 = "1pjpnj78hski4krvsbf55pkhhsrahvlb825dwl804q0b36fpmgj8";
+ url = mirror://xorg/individual/proto/glproto-1.4.16.tar.bz2;
+ sha256 = "13arnb4bz5pn89bxbh3shr8gihkhyznpjnq3zzr05msygwx6dpal";
};
buildInputs = [pkgconfig ];
})) // {inherit ;};
iceauth = (stdenv.mkDerivation ((if overrides ? iceauth then overrides.iceauth else x: x) {
- name = "iceauth-1.0.4";
+ name = "iceauth-1.0.5";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/iceauth-1.0.4.tar.bz2;
- sha256 = "13ck97rz53l490aba3xpgv4psgk4rywh1vi6slg1n4zhai2zvrhf";
+ url = mirror://xorg/X11R7.7/src/everything/iceauth-1.0.5.tar.bz2;
+ sha256 = "1aq6v671s2x5rc6zn0rgxb4wddg4vq94mckw3cpwl7ccrjjvd5hl";
};
buildInputs = [pkgconfig libICE xproto ];
})) // {inherit libICE xproto ;};
imake = (stdenv.mkDerivation ((if overrides ? imake then overrides.imake else x: x) {
- name = "imake-1.0.4";
+ name = "imake-1.0.5";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/individual/util/imake-1.0.4.tar.bz2;
- sha256 = "1zj6y59yip40hrdvvljjmnsfqddzxpxmbmd8842010rhkvq7zcmc";
+ url = mirror://xorg/individual/util/imake-1.0.5.tar.bz2;
+ sha256 = "1h8ww97aymm10l9qn21n1b9x5ypjrqr10qpf48jjcbc9fg77gklr";
};
buildInputs = [pkgconfig xproto ];
})) // {inherit xproto ;};
inputproto = (stdenv.mkDerivation ((if overrides ? inputproto then overrides.inputproto else x: x) {
- name = "inputproto-2.0.1";
+ name = "inputproto-2.2";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/inputproto-2.0.1.tar.bz2;
- sha256 = "0i2a28bnvv68i6z8qx09iw95c1wchqc2migx1s7764pqipc3srk3";
+ url = mirror://xorg/X11R7.7/src/everything/inputproto-2.2.tar.bz2;
+ sha256 = "1c5wqamfsd8g5i8kya5pjfmcac8q5zq1l3vclh6p96f24nmicxfy";
};
buildInputs = [pkgconfig ];
})) // {inherit ;};
kbproto = (stdenv.mkDerivation ((if overrides ? kbproto then overrides.kbproto else x: x) {
- name = "kbproto-1.0.5";
+ name = "kbproto-1.0.6";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/kbproto-1.0.5.tar.bz2;
- sha256 = "17glym611bbkca371ihpcnx9ydp4asay4psqq267j00pbr94zfhf";
+ url = mirror://xorg/X11R7.7/src/everything/kbproto-1.0.6.tar.bz2;
+ sha256 = "0yal11hhpiisy3w8wmacsdzzzcnc3xwnswxz8k7zri40xc5aqz03";
};
buildInputs = [pkgconfig ];
})) // {inherit ;};
libAppleWM = (stdenv.mkDerivation ((if overrides ? libAppleWM then overrides.libAppleWM else x: x) {
- name = "libAppleWM-1.4.0";
+ name = "libAppleWM-1.4.1";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/libAppleWM-1.4.0.tar.bz2;
- sha256 = "10hw7rvwc2b0v3v6mc6vaq8xs6vim4bg43rnhspf4p26mlb2dsf8";
+ url = mirror://xorg/X11R7.7/src/everything/libAppleWM-1.4.1.tar.bz2;
+ sha256 = "0r8x28n45q89x91mz8mv0zkkcxi8wazkac886fyvflhiv2y8ap2y";
};
buildInputs = [pkgconfig applewmproto libX11 libXext xextproto ];
})) // {inherit applewmproto libX11 libXext xextproto ;};
libFS = (stdenv.mkDerivation ((if overrides ? libFS then overrides.libFS else x: x) {
- name = "libFS-1.0.3";
+ name = "libFS-1.0.4";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/libFS-1.0.3.tar.bz2;
- sha256 = "0694iyc1rdz0fqnalgzpgzmxfaklrdk0jz769fsn1bv88mszjymb";
+ url = mirror://xorg/X11R7.7/src/everything/libFS-1.0.4.tar.bz2;
+ sha256 = "05c3bqgn5m7j4kx8wvy0p36faq6f9jv5yq12m6033m4lflg7cwvh";
};
buildInputs = [pkgconfig fontsproto xproto xtrans ];
})) // {inherit fontsproto xproto xtrans ;};
libICE = (stdenv.mkDerivation ((if overrides ? libICE then overrides.libICE else x: x) {
- name = "libICE-1.0.7";
+ name = "libICE-1.0.8";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/libICE-1.0.7.tar.bz2;
- sha256 = "00drapw7n793nqy23m76vxj5yzlgx7prmprkhzp3qiqs2lpnkcd8";
+ url = mirror://xorg/X11R7.7/src/everything/libICE-1.0.8.tar.bz2;
+ sha256 = "07mp13pb3s73kj7y490gnx619znzwk91mlf8kdw0rzq29ll93a94";
};
buildInputs = [pkgconfig xproto xtrans ];
})) // {inherit xproto xtrans ;};
libSM = (stdenv.mkDerivation ((if overrides ? libSM then overrides.libSM else x: x) {
- name = "libSM-1.2.0";
+ name = "libSM-1.2.1";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/libSM-1.2.0.tar.bz2;
- sha256 = "1jspgbd9g1d20kl18nnbzv37f1kpfybjff2xn08dmgv7f0dxzn0c";
+ url = mirror://xorg/X11R7.7/src/everything/libSM-1.2.1.tar.bz2;
+ sha256 = "07bzi6xwlhq36f60qfspjbz0qjj7zcgayi1vp4ihgx34kib1vhck";
};
buildInputs = [pkgconfig libICE libuuid xproto xtrans ];
})) // {inherit libICE libuuid xproto xtrans ;};
@@ -571,48 +571,48 @@ let
name = "libWindowsWM-1.0.1";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/libWindowsWM-1.0.1.tar.bz2;
+ url = mirror://xorg/X11R7.7/src/everything/libWindowsWM-1.0.1.tar.bz2;
sha256 = "1p0flwb67xawyv6yhri9w17m1i4lji5qnd0gq8v1vsfb8zw7rw15";
};
buildInputs = [pkgconfig windowswmproto libX11 libXext xextproto ];
})) // {inherit windowswmproto libX11 libXext xextproto ;};
libX11 = (stdenv.mkDerivation ((if overrides ? libX11 then overrides.libX11 else x: x) {
- name = "libX11-1.4.1";
+ name = "libX11-1.5.0";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/individual/lib/libX11-1.4.1.tar.bz2;
- sha256 = "1qiwyqaf9vfn52nwp7nxlbixld3r9jyzsarnkwk0ynk4k3vy1x3h";
+ url = mirror://xorg/X11R7.7/src/everything/libX11-1.5.0.tar.bz2;
+ sha256 = "11jdpl15bxwpwv0knpkh990s8jvlybng3dx477pkrz1bx7byz0n3";
};
buildInputs = [pkgconfig inputproto kbproto libxcb xextproto xf86bigfontproto xproto xtrans ];
})) // {inherit inputproto kbproto libxcb xextproto xf86bigfontproto xproto xtrans ;};
libXScrnSaver = (stdenv.mkDerivation ((if overrides ? libXScrnSaver then overrides.libXScrnSaver else x: x) {
- name = "libXScrnSaver-1.2.1";
+ name = "libXScrnSaver-1.2.2";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/libXScrnSaver-1.2.1.tar.bz2;
- sha256 = "16i59gac2sixgi692w4lvq5cp8hkl6rc375bh0ib51gsyvi6cfnf";
+ url = mirror://xorg/X11R7.7/src/everything/libXScrnSaver-1.2.2.tar.bz2;
+ sha256 = "07ff4r20nkkrj7h08f9fwamds9b3imj8jz5iz6y38zqw6jkyzwcg";
};
buildInputs = [pkgconfig scrnsaverproto libX11 libXext xextproto ];
})) // {inherit scrnsaverproto libX11 libXext xextproto ;};
libXau = (stdenv.mkDerivation ((if overrides ? libXau then overrides.libXau else x: x) {
- name = "libXau-1.0.6";
+ name = "libXau-1.0.7";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/libXau-1.0.6.tar.bz2;
- sha256 = "1z3h07wj2kg2hnzj4gd9pc3rkj4n0mfw6f9skg9w1hfwzrgl317f";
+ url = mirror://xorg/X11R7.7/src/everything/libXau-1.0.7.tar.bz2;
+ sha256 = "12d4f7sdv2pjxhk0lcay0pahccddszkw579dc59daqi37r8bllvi";
};
buildInputs = [pkgconfig xproto ];
})) // {inherit xproto ;};
libXaw = (stdenv.mkDerivation ((if overrides ? libXaw then overrides.libXaw else x: x) {
- name = "libXaw-1.0.9";
+ name = "libXaw-1.0.11";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/individual/lib/libXaw-1.0.9.tar.bz2;
- sha256 = "0dxh5ldcmzl6afq0a9172ryah1341g0zysm8vk2lmqkqdda7ffd8";
+ url = mirror://xorg/X11R7.7/src/everything/libXaw-1.0.11.tar.bz2;
+ sha256 = "14ll7ndf5njc30hz2w197qvwp7fqj7y14wq4p1cyxlbipfn79a47";
};
buildInputs = [pkgconfig libX11 libXext xextproto libXmu libXpm xproto libXt ];
})) // {inherit libX11 libXext xextproto libXmu libXpm xproto libXt ;};
@@ -621,18 +621,18 @@ let
name = "libXcomposite-0.4.3";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/libXcomposite-0.4.3.tar.bz2;
+ url = mirror://xorg/X11R7.7/src/everything/libXcomposite-0.4.3.tar.bz2;
sha256 = "1b8sniijb85v4my6v30ma9yqnwl4hkclci9l1hqxnipfyhl4sa9j";
};
buildInputs = [pkgconfig compositeproto libX11 libXfixes xproto ];
})) // {inherit compositeproto libX11 libXfixes xproto ;};
libXcursor = (stdenv.mkDerivation ((if overrides ? libXcursor then overrides.libXcursor else x: x) {
- name = "libXcursor-1.1.11";
+ name = "libXcursor-1.1.13";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/libXcursor-1.1.11.tar.bz2;
- sha256 = "1zpn5dx66l5ql9qv0yz41qlbap4imkkvi0p6j2a6zh72g52zfvm0";
+ url = mirror://xorg/X11R7.7/src/everything/libXcursor-1.1.13.tar.bz2;
+ sha256 = "13xd1dyb06gwdwb0bxb22fkgdlmis6wrljm2xk6fhz0v9bg2g27p";
};
buildInputs = [pkgconfig fixesproto libX11 libXfixes xproto libXrender ];
})) // {inherit fixesproto libX11 libXfixes xproto libXrender ;};
@@ -641,88 +641,88 @@ let
name = "libXdamage-1.1.3";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/libXdamage-1.1.3.tar.bz2;
+ url = mirror://xorg/X11R7.7/src/everything/libXdamage-1.1.3.tar.bz2;
sha256 = "1a678bwap74sqczbr2z4y4fvbr35km3inkm8bi1igjyk4v46jqdw";
};
buildInputs = [pkgconfig damageproto fixesproto libX11 xextproto libXfixes xproto ];
})) // {inherit damageproto fixesproto libX11 xextproto libXfixes xproto ;};
libXdmcp = (stdenv.mkDerivation ((if overrides ? libXdmcp then overrides.libXdmcp else x: x) {
- name = "libXdmcp-1.1.0";
+ name = "libXdmcp-1.1.1";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/libXdmcp-1.1.0.tar.bz2;
- sha256 = "0wh0q4ih9p3nsxsjjj9a3d03nhiyjggpl7gbavdzsfia36iyk85q";
+ url = mirror://xorg/X11R7.7/src/everything/libXdmcp-1.1.1.tar.bz2;
+ sha256 = "13highx4xpgkiwykpcl7z2laslrjc4pzi4h617ny9p7r6116vkls";
};
buildInputs = [pkgconfig xproto ];
})) // {inherit xproto ;};
libXext = (stdenv.mkDerivation ((if overrides ? libXext then overrides.libXext else x: x) {
- name = "libXext-1.2.0";
+ name = "libXext-1.3.1";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/libXext-1.2.0.tar.bz2;
- sha256 = "1xvgvrbg9lc812zi44hsyr461hiiwy05alckq847ki213qhkxvaa";
+ url = mirror://xorg/X11R7.7/src/everything/libXext-1.3.1.tar.bz2;
+ sha256 = "0ng8clhn7srbkadxjc7ih3z3v27v9ny0aa0dqkgddgxpgrhrq8jn";
};
buildInputs = [pkgconfig libX11 xextproto xproto ];
})) // {inherit libX11 xextproto xproto ;};
libXfixes = (stdenv.mkDerivation ((if overrides ? libXfixes then overrides.libXfixes else x: x) {
- name = "libXfixes-4.0.5";
+ name = "libXfixes-5.0";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/libXfixes-4.0.5.tar.bz2;
- sha256 = "0x4drdxrslxf4vgcfyba0f0fbxg98c8x5dfrl7azakhf8qhd0v1f";
+ url = mirror://xorg/X11R7.7/src/everything/libXfixes-5.0.tar.bz2;
+ sha256 = "1qx2rmwhmca2n7rgafy0arp15k5vwhdhhh6v6mx76hlj29328yjk";
};
buildInputs = [pkgconfig fixesproto libX11 xextproto xproto ];
})) // {inherit fixesproto libX11 xextproto xproto ;};
libXfont = (stdenv.mkDerivation ((if overrides ? libXfont then overrides.libXfont else x: x) {
- name = "libXfont-1.4.3";
+ name = "libXfont-1.4.5";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/libXfont-1.4.3.tar.bz2;
- sha256 = "1k79f8vcibd114ydndvna8axx39bsdaj351f16901lh155jlb4pp";
+ url = mirror://xorg/X11R7.7/src/everything/libXfont-1.4.5.tar.bz2;
+ sha256 = "0w3irg00k6b6mziddnacln9q2rkf5848b04nvjqwv5bb1fw6zydv";
};
buildInputs = [pkgconfig libfontenc fontsproto freetype xproto xtrans zlib ];
})) // {inherit libfontenc fontsproto freetype xproto xtrans zlib ;};
libXft = (stdenv.mkDerivation ((if overrides ? libXft then overrides.libXft else x: x) {
- name = "libXft-2.2.0";
+ name = "libXft-2.3.1";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/libXft-2.2.0.tar.bz2;
- sha256 = "1cprbz7xnxkb7axblw8sdaw9ibkngmz60d0ypk1drhd0dpjmls68";
+ url = mirror://xorg/X11R7.7/src/everything/libXft-2.3.1.tar.bz2;
+ sha256 = "1gdv6559cdz1lfw73x7wsvax1fkvphmayrymprljhyyb5nwk5kkz";
};
- buildInputs = [pkgconfig fontconfig freetype xproto libXrender ];
- })) // {inherit fontconfig freetype xproto libXrender ;};
+ 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.4.1";
+ name = "libXi-1.6.1";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/individual/lib/libXi-1.4.1.tar.bz2;
- sha256 = "19i92if8anv5pg2mwyy93jcllk1mgxx5gchi8zkjlk7r604ir7sr";
+ url = mirror://xorg/X11R7.7/src/everything/libXi-1.6.1.tar.bz2;
+ sha256 = "029ihw4jq8mng8rx7a3jdvq64jm1zdkqidca93zmxv4jf9yn5qzj";
};
buildInputs = [pkgconfig inputproto libX11 libXext xextproto xproto ];
})) // {inherit inputproto libX11 libXext xextproto xproto ;};
libXinerama = (stdenv.mkDerivation ((if overrides ? libXinerama then overrides.libXinerama else x: x) {
- name = "libXinerama-1.1.1";
+ name = "libXinerama-1.1.2";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/libXinerama-1.1.1.tar.bz2;
- sha256 = "17vpsscracg1hza0avrczm9fc7xx3229qhicy101mw6cx2hb9qmv";
+ url = mirror://xorg/X11R7.7/src/everything/libXinerama-1.1.2.tar.bz2;
+ sha256 = "1b3aq1762hxzchd9ndavdjlksq93991s0g2z6spf8wl3v0pprrx4";
};
buildInputs = [pkgconfig libX11 libXext xextproto xineramaproto ];
})) // {inherit libX11 libXext xextproto xineramaproto ;};
libXmu = (stdenv.mkDerivation ((if overrides ? libXmu then overrides.libXmu else x: x) {
- name = "libXmu-1.1.0";
+ name = "libXmu-1.1.1";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/libXmu-1.1.0.tar.bz2;
- sha256 = "1b9nkml1mk8yi76bv23cikbfrd7hlp48h710yqgcrpkh7cq1za8g";
+ url = mirror://xorg/X11R7.7/src/everything/libXmu-1.1.1.tar.bz2;
+ sha256 = "1pbym8rrznxqd60zwf7w4xpf27sa72bky2knginqcfnca32q343h";
};
buildInputs = [pkgconfig libX11 libXext xextproto xproto libXt ];
})) // {inherit libX11 libXext xextproto xproto libXt ;};
@@ -738,91 +738,91 @@ let
})) // {inherit printproto libX11 libXau libXext xextproto ;};
libXpm = (stdenv.mkDerivation ((if overrides ? libXpm then overrides.libXpm else x: x) {
- name = "libXpm-3.5.9";
+ name = "libXpm-3.5.10";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/libXpm-3.5.9.tar.bz2;
- sha256 = "07k2zpiadck1p986pgksfm5zfdm6h5vjy6p0hv59h1dbkh103pca";
+ url = mirror://xorg/X11R7.7/src/everything/libXpm-3.5.10.tar.bz2;
+ sha256 = "0dd737ch4q9gr151wff1m3q2j7wf3pip4y81601xdrsh8wipxnx6";
};
buildInputs = [pkgconfig libX11 libXext xextproto xproto libXt ];
})) // {inherit libX11 libXext xextproto xproto libXt ;};
libXrandr = (stdenv.mkDerivation ((if overrides ? libXrandr then overrides.libXrandr else x: x) {
- name = "libXrandr-1.3.1";
+ name = "libXrandr-1.4.0";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/libXrandr-1.3.1.tar.bz2;
- sha256 = "0qf6aywqk2mgd5hw0nr24xxp5k015aa11sax5yycn14wch4agfv2";
+ url = mirror://xorg/individual/lib/libXrandr-1.4.0.tar.bz2;
+ sha256 = "1hzm2ndra4nf8xxzm4lzd225zj05hzbzcq464q2znah15ynd0fh3";
};
buildInputs = [pkgconfig randrproto renderproto libX11 libXext xextproto xproto libXrender ];
})) // {inherit randrproto renderproto libX11 libXext xextproto xproto libXrender ;};
libXrender = (stdenv.mkDerivation ((if overrides ? libXrender then overrides.libXrender else x: x) {
- name = "libXrender-0.9.6";
+ name = "libXrender-0.9.7";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/libXrender-0.9.6.tar.bz2;
- sha256 = "0s567qgys8m6782lbrpvpscm8fkk2jm2717g7s3hm7hhcgib2n3z";
+ url = mirror://xorg/X11R7.7/src/everything/libXrender-0.9.7.tar.bz2;
+ sha256 = "1rmvja2gkf5v0k2n1bcghw8v98m2kfn3af0rbmsda5dwr69npd7r";
};
buildInputs = [pkgconfig renderproto libX11 xproto ];
})) // {inherit renderproto libX11 xproto ;};
libXres = (stdenv.mkDerivation ((if overrides ? libXres then overrides.libXres else x: x) {
- name = "libXres-1.0.5";
+ name = "libXres-1.0.6";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/libXres-1.0.5.tar.bz2;
- sha256 = "0nd032jn3im6ar71xm1wgcmb4pa76c73nl8lavdkih609d30y2x0";
+ url = mirror://xorg/X11R7.7/src/everything/libXres-1.0.6.tar.bz2;
+ sha256 = "1478pm70gdi6l70r4jpkyyg2am9wv6xh53z9ibwq5cg84p4n31pz";
};
buildInputs = [pkgconfig resourceproto libX11 libXext xextproto xproto ];
})) // {inherit resourceproto libX11 libXext xextproto xproto ;};
libXt = (stdenv.mkDerivation ((if overrides ? libXt then overrides.libXt else x: x) {
- name = "libXt-1.0.9";
+ name = "libXt-1.1.3";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/libXt-1.0.9.tar.bz2;
- sha256 = "00bbms32fkzrxhdm9kybb2404ad6f3d6v4qgl83py7w09dcipfga";
+ url = mirror://xorg/X11R7.7/src/everything/libXt-1.1.3.tar.bz2;
+ sha256 = "1g85gwnhs7lg5f01gfi1cpb916xc3spm1fjlv2f4xz2zzk1r7dcd";
};
buildInputs = [pkgconfig libICE kbproto libSM libX11 xproto ];
})) // {inherit libICE kbproto libSM libX11 xproto ;};
libXtst = (stdenv.mkDerivation ((if overrides ? libXtst then overrides.libXtst else x: x) {
- name = "libXtst-1.2.0";
+ name = "libXtst-1.2.1";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/libXtst-1.2.0.tar.bz2;
- sha256 = "022lx3c57pkkw11j2k5s1f5idf53li5qg291766bvxi1nl90jbks";
+ url = mirror://xorg/X11R7.7/src/everything/libXtst-1.2.1.tar.bz2;
+ sha256 = "1q750hjplq1rfyxkr4545z1y2a1wfnc828ynvbws7b4jwdk3xsky";
};
buildInputs = [pkgconfig inputproto recordproto libX11 libXext xextproto libXi ];
})) // {inherit inputproto recordproto libX11 libXext xextproto libXi ;};
libXv = (stdenv.mkDerivation ((if overrides ? libXv then overrides.libXv else x: x) {
- name = "libXv-1.0.6";
+ name = "libXv-1.0.7";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/libXv-1.0.6.tar.bz2;
- sha256 = "1vpmr9wnbz990ivarsp5rcmdg483fd2nk695plzlzx5h9dcqw3z2";
+ url = mirror://xorg/X11R7.7/src/everything/libXv-1.0.7.tar.bz2;
+ sha256 = "044hllz013afhzywwpxz007l4zjy99bv9im065rqd30zckmllrjx";
};
buildInputs = [pkgconfig videoproto libX11 libXext xextproto xproto ];
})) // {inherit videoproto libX11 libXext xextproto xproto ;};
libXvMC = (stdenv.mkDerivation ((if overrides ? libXvMC then overrides.libXvMC else x: x) {
- name = "libXvMC-1.0.6";
+ name = "libXvMC-1.0.7";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/libXvMC-1.0.6.tar.bz2;
- sha256 = "14ik1kgpnds213dsa16i8cf5qg3hc7vccy9jz4a4ml8zqzlq1nix";
+ url = mirror://xorg/X11R7.7/src/everything/libXvMC-1.0.7.tar.bz2;
+ sha256 = "18yf6ysc01pqkbk9704914ghalq1sl2hfdjmwggxm8qqhpy8bw18";
};
buildInputs = [pkgconfig videoproto libX11 libXext xextproto xproto libXv ];
})) // {inherit videoproto libX11 libXext xextproto xproto libXv ;};
libXxf86dga = (stdenv.mkDerivation ((if overrides ? libXxf86dga then overrides.libXxf86dga else x: x) {
- name = "libXxf86dga-1.1.2";
+ name = "libXxf86dga-1.1.3";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/libXxf86dga-1.1.2.tar.bz2;
- sha256 = "01jsc0jg7mjngfbh3j942595pwbyxf2m9kljy3zb6gyfcbsm59hv";
+ url = mirror://xorg/X11R7.7/src/everything/libXxf86dga-1.1.3.tar.bz2;
+ sha256 = "15291ddhyr54sribwbg8hxx2psgzm5gh0pgkw5yrf3zgvdsa67sm";
};
buildInputs = [pkgconfig libX11 libXext xextproto xf86dgaproto xproto ];
})) // {inherit libX11 libXext xextproto xf86dgaproto xproto ;};
@@ -838,41 +838,41 @@ let
})) // {inherit libX11 libXext xextproto xf86miscproto xproto ;};
libXxf86vm = (stdenv.mkDerivation ((if overrides ? libXxf86vm then overrides.libXxf86vm else x: x) {
- name = "libXxf86vm-1.1.1";
+ name = "libXxf86vm-1.1.2";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/libXxf86vm-1.1.1.tar.bz2;
- sha256 = "17i342h7a2nqfz4lpk8cay0vc0h4i7nxdc6xli9r7mggk8iykji1";
+ url = mirror://xorg/X11R7.7/src/everything/libXxf86vm-1.1.2.tar.bz2;
+ sha256 = "117w92xz39rcqcahspi48nc04cc9110x1dycpf3vbcb6p0pifr55";
};
buildInputs = [pkgconfig libX11 libXext xextproto xf86vidmodeproto xproto ];
})) // {inherit libX11 libXext xextproto xf86vidmodeproto xproto ;};
libdmx = (stdenv.mkDerivation ((if overrides ? libdmx then overrides.libdmx else x: x) {
- name = "libdmx-1.1.1";
+ name = "libdmx-1.1.2";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/libdmx-1.1.1.tar.bz2;
- sha256 = "066yndshwq2nzkd0z0w96wq37rnhb23s6vq50bg4kiqb8y3nxpm6";
+ url = mirror://xorg/X11R7.7/src/everything/libdmx-1.1.2.tar.bz2;
+ sha256 = "1fiq73sfxcbyjval118ialwrzxhzb08xsxmg69adcs47i9j0p1x7";
};
buildInputs = [pkgconfig dmxproto libX11 libXext xextproto ];
})) // {inherit dmxproto libX11 libXext xextproto ;};
libfontenc = (stdenv.mkDerivation ((if overrides ? libfontenc then overrides.libfontenc else x: x) {
- name = "libfontenc-1.1.0";
+ name = "libfontenc-1.1.1";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/libfontenc-1.1.0.tar.bz2;
- sha256 = "1gww1cbi17q15lh2ws6qzspp807issbyk5wlzjmgw6pn880ip2il";
+ url = mirror://xorg/X11R7.7/src/everything/libfontenc-1.1.1.tar.bz2;
+ sha256 = "0zq1483xy31sssq0h3xxf8y1v4q14cp8rv164ayn7fsn30pq2wny";
};
buildInputs = [pkgconfig xproto zlib ];
})) // {inherit xproto zlib ;};
libpciaccess = (stdenv.mkDerivation ((if overrides ? libpciaccess then overrides.libpciaccess else x: x) {
- name = "libpciaccess-0.12.1";
+ name = "libpciaccess-0.13.1";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/individual/lib/libpciaccess-0.12.1.tar.bz2;
- sha256 = "0i3kdmvl1mcjrkhklpli45sqsy4pvipm6swifbcyxx4cwkqdfiyc";
+ url = mirror://xorg/X11R7.7/src/everything/libpciaccess-0.13.1.tar.bz2;
+ sha256 = "11509lkgd5j4g5wy0g13z4sf31h50hqx3jfwb2i4q6k98pv6iar7";
};
buildInputs = [pkgconfig zlib ];
})) // {inherit zlib ;};
@@ -881,91 +881,91 @@ let
name = "libpthread-stubs-0.3";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/libpthread-stubs-0.3.tar.bz2;
+ url = mirror://xorg/X11R7.7/src/everything/libpthread-stubs-0.3.tar.bz2;
sha256 = "16bjv3in19l84hbri41iayvvg4ls9gv1ma0x0qlbmwy67i7dbdim";
};
buildInputs = [pkgconfig ];
})) // {inherit ;};
libxcb = (stdenv.mkDerivation ((if overrides ? libxcb then overrides.libxcb else x: x) {
- name = "libxcb-1.7";
+ name = "libxcb-1.9";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/libxcb-1.7.tar.bz2;
- sha256 = "1pr40wa3i1f0iwx83c8alcycy9sfzd2y1qlc63kr8q56w8sxqxp7";
+ url = mirror://xorg/individual/xcb/libxcb-1.9.tar.bz2;
+ sha256 = "15icn78x610dvvgnji6b3pyn8nd88lz68hq0w73pcadf78mycmw8";
};
buildInputs = [pkgconfig libxslt libpthreadstubs python libXau xcbproto libXdmcp ];
})) // {inherit libxslt libpthreadstubs python libXau xcbproto libXdmcp ;};
libxkbfile = (stdenv.mkDerivation ((if overrides ? libxkbfile then overrides.libxkbfile else x: x) {
- name = "libxkbfile-1.0.7";
+ name = "libxkbfile-1.0.8";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/libxkbfile-1.0.7.tar.bz2;
- sha256 = "1r9a1xnn57431hfp1am2r5h23pa1zh646482li3vd5ivfc53fzk6";
+ url = mirror://xorg/X11R7.7/src/everything/libxkbfile-1.0.8.tar.bz2;
+ sha256 = "0flg5arw6n3njagmsi4i4l0zl5bfx866a1h9ydc3bi1pqlclxaca";
};
buildInputs = [pkgconfig kbproto libX11 ];
})) // {inherit kbproto libX11 ;};
lndir = (stdenv.mkDerivation ((if overrides ? lndir then overrides.lndir else x: x) {
- name = "lndir-1.0.2";
+ name = "lndir-1.0.3";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/individual/util/lndir-1.0.2.tar.bz2;
- sha256 = "1d988z0ywy2k53s7i43ff0j5qac1cpy9j0gjwmiprq66w8rh24z5";
+ url = mirror://xorg/individual/util/lndir-1.0.3.tar.bz2;
+ sha256 = "0pdngiy8zdhsiqx2am75yfcl36l7kd7d7nl0rss8shcdvsqgmx29";
};
buildInputs = [pkgconfig xproto ];
})) // {inherit xproto ;};
luit = (stdenv.mkDerivation ((if overrides ? luit then overrides.luit else x: x) {
- name = "luit-1.1.0";
+ name = "luit-1.1.1";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/luit-1.1.0.tar.bz2;
- sha256 = "1l83b5yknh4svqzwsppvmm2q9l0mvsfwm16ik7q3yss8m5zgvypi";
+ url = mirror://xorg/X11R7.7/src/everything/luit-1.1.1.tar.bz2;
+ sha256 = "0dn694mk56x6hdk6y9ylx4f128h5jcin278gnw2gb807rf3ygc1h";
};
- buildInputs = [pkgconfig libfontenc zlib ];
- })) // {inherit libfontenc zlib ;};
+ buildInputs = [pkgconfig libfontenc ];
+ })) // {inherit libfontenc ;};
makedepend = (stdenv.mkDerivation ((if overrides ? makedepend then overrides.makedepend else x: x) {
- name = "makedepend-1.0.3";
+ name = "makedepend-1.0.4";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/makedepend-1.0.3.tar.bz2;
- sha256 = "0dxpz376bvphjg8q0nqrcf4y0dbni0c6jj5y16qymr37wlq1s99s";
+ url = mirror://xorg/X11R7.7/src/everything/makedepend-1.0.4.tar.bz2;
+ sha256 = "1zpp2b9dfvlnfj2i1mzdyn785rpl7vih5lap7kcpiv80xspbhmmb";
};
buildInputs = [pkgconfig xproto ];
})) // {inherit xproto ;};
mkfontdir = (stdenv.mkDerivation ((if overrides ? mkfontdir then overrides.mkfontdir else x: x) {
- name = "mkfontdir-1.0.6";
+ name = "mkfontdir-1.0.7";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/mkfontdir-1.0.6.tar.bz2;
- sha256 = "0nf8p0zsndd9qmrw70h2wdq7sz6j066q73lpp262dlpq21inrmam";
+ url = mirror://xorg/X11R7.7/src/everything/mkfontdir-1.0.7.tar.bz2;
+ sha256 = "0c3563kw9fg15dpgx4dwvl12qz6sdqdns1pxa574hc7i5m42mman";
};
buildInputs = [pkgconfig ];
})) // {inherit ;};
mkfontscale = (stdenv.mkDerivation ((if overrides ? mkfontscale then overrides.mkfontscale else x: x) {
- name = "mkfontscale-1.0.8";
+ name = "mkfontscale-1.1.0";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/mkfontscale-1.0.8.tar.bz2;
- sha256 = "1yah41gr5hlihbjm5l1kykdqj1p5rx6y4vrqraxbzvkrrn37gdbf";
+ url = mirror://xorg/X11R7.7/src/everything/mkfontscale-1.1.0.tar.bz2;
+ sha256 = "1539h3ws66vcql6sf2831bcs0r4d9b05lcgpswkw33lvcxighmff";
};
buildInputs = [pkgconfig libfontenc freetype xproto zlib ];
})) // {inherit libfontenc freetype xproto zlib ;};
pixman = (stdenv.mkDerivation ((if overrides ? pixman then overrides.pixman else x: x) {
- name = "pixman-0.20.2";
+ name = "pixman-0.26.2";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/individual/lib/pixman-0.20.2.tar.bz2;
- sha256 = "1agl6f63y2wiqr6n9slzhisnilcg8byafp2l8wmw713bk8k6yc9h";
+ url = mirror://xorg/individual/lib/pixman-0.26.2.tar.bz2;
+ sha256 = "0z34jb75wpbyj3gxn34icd8j81fk5d6s6qnwp2ncz7m8icf6afqr";
};
- buildInputs = [pkgconfig perl ];
- })) // {inherit perl ;};
+ buildInputs = [pkgconfig libpng perl ];
+ })) // {inherit libpng perl ;};
printproto = (stdenv.mkDerivation ((if overrides ? printproto then overrides.printproto else x: x) {
name = "printproto-1.0.5";
@@ -978,21 +978,21 @@ let
})) // {inherit libXau ;};
randrproto = (stdenv.mkDerivation ((if overrides ? randrproto then overrides.randrproto else x: x) {
- name = "randrproto-1.3.2";
+ name = "randrproto-1.4.0";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/randrproto-1.3.2.tar.bz2;
- sha256 = "0wfwcq85wbm0g5r0snc7prgki1wi3kxrxhcxinyr54n45ihh03fr";
+ url = mirror://xorg/individual/proto/randrproto-1.4.0.tar.bz2;
+ sha256 = "1kq9h93qdnniiivry8jmhlgwn9fbx9xp5r9cmzfihlx5cs62xi45";
};
buildInputs = [pkgconfig ];
})) // {inherit ;};
recordproto = (stdenv.mkDerivation ((if overrides ? recordproto then overrides.recordproto else x: x) {
- name = "recordproto-1.14.1";
+ name = "recordproto-1.14.2";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/recordproto-1.14.1.tar.bz2;
- sha256 = "1389fc3r8h8xqix11y9ngw7a13i1mvw68jkhicgvq676sd1v0zmj";
+ url = mirror://xorg/X11R7.7/src/everything/recordproto-1.14.2.tar.bz2;
+ sha256 = "0w3kgr1zabwf79bpc28dcnj0fpni6r53rpi82ngjbalj5s6m8xx7";
};
buildInputs = [pkgconfig ];
})) // {inherit ;};
@@ -1001,78 +1001,78 @@ let
name = "renderproto-0.11.1";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/renderproto-0.11.1.tar.bz2;
+ url = mirror://xorg/X11R7.7/src/everything/renderproto-0.11.1.tar.bz2;
sha256 = "0dr5xw6s0qmqg0q5pdkb4jkdhaja0vbfqla79qh5j1xjj9dmlwq6";
};
buildInputs = [pkgconfig ];
})) // {inherit ;};
resourceproto = (stdenv.mkDerivation ((if overrides ? resourceproto then overrides.resourceproto else x: x) {
- name = "resourceproto-1.1.1";
+ name = "resourceproto-1.2.0";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/resourceproto-1.1.1.tar.bz2;
- sha256 = "1imqlkvn4mfjsflwvqx8dj0n7i7frdpzkdafq001r25ak6782yc5";
+ url = mirror://xorg/X11R7.7/src/everything/resourceproto-1.2.0.tar.bz2;
+ sha256 = "0638iyfiiyjw1hg3139pai0j6m65gkskrvd9684zgc6ydcx00riw";
};
buildInputs = [pkgconfig ];
})) // {inherit ;};
scrnsaverproto = (stdenv.mkDerivation ((if overrides ? scrnsaverproto then overrides.scrnsaverproto else x: x) {
- name = "scrnsaverproto-1.2.1";
+ name = "scrnsaverproto-1.2.2";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/scrnsaverproto-1.2.1.tar.bz2;
- sha256 = "1w94c1an7cy9v68289xbqszaj6g5qx5a29qx67fwsvqkmhygglps";
+ url = mirror://xorg/X11R7.7/src/everything/scrnsaverproto-1.2.2.tar.bz2;
+ sha256 = "0rfdbfwd35d761xkfifcscx56q0n56043ixlmv70r4v4l66hmdwb";
};
buildInputs = [pkgconfig ];
})) // {inherit ;};
sessreg = (stdenv.mkDerivation ((if overrides ? sessreg then overrides.sessreg else x: x) {
- name = "sessreg-1.0.6";
+ name = "sessreg-1.0.7";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/sessreg-1.0.6.tar.bz2;
- sha256 = "143ivrs2pbkid4wr1hri9221z4gi9dlkq7x60jarcz9bhiq1dwvk";
+ url = mirror://xorg/X11R7.7/src/everything/sessreg-1.0.7.tar.bz2;
+ sha256 = "0lifgjxdvc6lwyjk90slddnr12fsv88ldy6qhklr5av409cfwd47";
};
buildInputs = [pkgconfig xproto ];
})) // {inherit xproto ;};
setxkbmap = (stdenv.mkDerivation ((if overrides ? setxkbmap then overrides.setxkbmap else x: x) {
- name = "setxkbmap-1.2.0";
+ name = "setxkbmap-1.3.0";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/setxkbmap-1.2.0.tar.bz2;
- sha256 = "0fdfvc0fqdp11ly5iywrsi4w7rln4dq02b0b91yjmjm83fzr35cr";
+ url = mirror://xorg/X11R7.7/src/everything/setxkbmap-1.3.0.tar.bz2;
+ sha256 = "1inygpvlgc6vr5h9laxw9lnvafnccl3fy0g5n9ll28iq3yfmqc1x";
};
buildInputs = [pkgconfig libX11 libxkbfile ];
})) // {inherit libX11 libxkbfile ;};
smproxy = (stdenv.mkDerivation ((if overrides ? smproxy then overrides.smproxy else x: x) {
- name = "smproxy-1.0.4";
+ name = "smproxy-1.0.5";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/smproxy-1.0.4.tar.bz2;
- sha256 = "0wj4z4ars9j4k5pysl42jpx4zclrz3ifwgqxrcdlmb3l5xvyb4ip";
+ url = mirror://xorg/X11R7.7/src/everything/smproxy-1.0.5.tar.bz2;
+ sha256 = "02fn5wa1gs2jap6sr9j9yk6zsvz82j8l61pf74iyqwa99q4wnb67";
};
- buildInputs = [pkgconfig libSM libXmu libXt ];
- })) // {inherit libSM libXmu libXt ;};
+ buildInputs = [pkgconfig libICE libSM libXmu libXt ];
+ })) // {inherit libICE libSM libXmu libXt ;};
twm = (stdenv.mkDerivation ((if overrides ? twm then overrides.twm else x: x) {
- name = "twm-1.0.6";
+ name = "twm-1.0.7";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/individual/app/twm-1.0.6.tar.bz2;
- sha256 = "1scly9kv3kx8zh8bfljsdd32dsb4j05xzn8c5x270xcshzbwmp77";
+ url = mirror://xorg/individual/app/twm-1.0.7.tar.bz2;
+ sha256 = "0i6dbf5vafi5hm4bcmnj6r412cncjlv9hkkbr6bzlh15qvg56p8g";
};
- buildInputs = [pkgconfig libICE libSM libX11 libXext libXmu libXt ];
- })) // {inherit libICE libSM libX11 libXext libXmu libXt ;};
+ buildInputs = [pkgconfig libICE libSM libX11 libXext libXmu xproto libXt ];
+ })) // {inherit libICE libSM libX11 libXext libXmu xproto libXt ;};
utilmacros = (stdenv.mkDerivation ((if overrides ? utilmacros then overrides.utilmacros else x: x) {
- name = "util-macros-1.11.0";
+ name = "util-macros-1.17";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/util-macros-1.11.0.tar.bz2;
- sha256 = "1kya7z5rad93zmc0ij7jhl3shh1k37szmjg1rv75lizqlib4slz8";
+ url = mirror://xorg/X11R7.7/src/everything/util-macros-1.17.tar.bz2;
+ sha256 = "1vbmrcn5n3wp4pyw0n4c3pyvzlc4yf7jzgngavfdq5zwfbgfsybx";
};
buildInputs = [pkgconfig ];
})) // {inherit ;};
@@ -1081,7 +1081,7 @@ let
name = "videoproto-2.3.1";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/videoproto-2.3.1.tar.bz2;
+ url = mirror://xorg/X11R7.7/src/everything/videoproto-2.3.1.tar.bz2;
sha256 = "0nk3i6gwkqq1w8zwn7bxz344pi1dwcjrmf6hr330h7hxjcj6viry";
};
buildInputs = [pkgconfig ];
@@ -1091,88 +1091,88 @@ let
name = "windowswmproto-1.0.4";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/windowswmproto-1.0.4.tar.bz2;
+ url = mirror://xorg/X11R7.7/src/everything/windowswmproto-1.0.4.tar.bz2;
sha256 = "0syjxgy4m8l94qrm03nvn5k6bkxc8knnlld1gbllym97nvnv0ny0";
};
buildInputs = [pkgconfig ];
})) // {inherit ;};
x11perf = (stdenv.mkDerivation ((if overrides ? x11perf then overrides.x11perf else x: x) {
- name = "x11perf-1.5.3";
+ name = "x11perf-1.5.4";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/individual/app/x11perf-1.5.3.tar.bz2;
- sha256 = "1g91ksfrvj59hvxvfj1xb730aqscg5wdnc3grrab1wz7mxap6k9r";
+ url = mirror://xorg/X11R7.7/src/everything/x11perf-1.5.4.tar.bz2;
+ sha256 = "111iwpxhnxjiq44w96zf0kszg5zpgv1g3ayx18v4nhdzl9bqivi4";
};
buildInputs = [pkgconfig libX11 libXext libXft libXmu libXrender ];
})) // {inherit libX11 libXext libXft libXmu libXrender ;};
xauth = (stdenv.mkDerivation ((if overrides ? xauth then overrides.xauth else x: x) {
- name = "xauth-1.0.5";
+ name = "xauth-1.0.7";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/xauth-1.0.5.tar.bz2;
- sha256 = "0v3lmm3qil8shgm7731pl0wd32kpq7w73w5d4mjq1bqxzw09a4vd";
+ url = mirror://xorg/X11R7.7/src/everything/xauth-1.0.7.tar.bz2;
+ sha256 = "1382wdfiakgckbw1xxavzh1nm34q21b1zzy96qp7ws66xc48rxw4";
};
buildInputs = [pkgconfig libX11 libXau libXext libXmu ];
})) // {inherit libX11 libXau libXext libXmu ;};
xbacklight = (stdenv.mkDerivation ((if overrides ? xbacklight then overrides.xbacklight else x: x) {
- name = "xbacklight-1.1.2";
+ name = "xbacklight-1.2.0";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/xbacklight-1.1.2.tar.bz2;
- sha256 = "02b5jfys2msla2yvg5s0knzyxg2104r25czkwd49i8g8kp804bxg";
+ url = mirror://xorg/individual/app/xbacklight-1.2.0.tar.bz2;
+ sha256 = "199n9qszjiz82nbjz6ychh0xl15igm535mv0830wk4m59w9xclji";
};
- buildInputs = [pkgconfig libX11 libXrandr ];
- })) // {inherit libX11 libXrandr ;};
+ buildInputs = [pkgconfig libxcb xcbutil ];
+ })) // {inherit libxcb xcbutil ;};
xbitmaps = (stdenv.mkDerivation ((if overrides ? xbitmaps then overrides.xbitmaps else x: x) {
name = "xbitmaps-1.1.1";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/xbitmaps-1.1.1.tar.bz2;
+ url = mirror://xorg/X11R7.7/src/everything/xbitmaps-1.1.1.tar.bz2;
sha256 = "178ym90kwidia6nas4qr5n5yqh698vv8r02js0r4vg3b6lsb0w9n";
};
buildInputs = [pkgconfig ];
})) // {inherit ;};
xcbproto = (stdenv.mkDerivation ((if overrides ? xcbproto then overrides.xcbproto else x: x) {
- name = "xcb-proto-1.6";
+ name = "xcb-proto-1.8";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/xcb-proto-1.6.tar.bz2;
- sha256 = "18jwkgd2ayvd0zzwawnbh86b4xqjq29mgsq44h06yj8jkcaw2azm";
+ url = mirror://xorg/individual/xcb/xcb-proto-1.8.tar.bz2;
+ sha256 = "1c11652h9sjynw3scm1pn5z3a6ci888pq7hij8q5n8qrl33icg93";
};
buildInputs = [pkgconfig python ];
})) // {inherit python ;};
xcbutil = (stdenv.mkDerivation ((if overrides ? xcbutil then overrides.xcbutil else x: x) {
- name = "xcb-util-0.3.8";
+ name = "xcb-util-0.3.9";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/individual/xcb/xcb-util-0.3.8.tar.bz2;
- sha256 = "1fa7njhg7dsqbrkwrzbkfszdp1dmggvlsrb05qshkg2h8wldkvn1";
+ url = mirror://xorg/individual/xcb/xcb-util-0.3.9.tar.bz2;
+ sha256 = "1i0qbhqkcdlbbsj7ifkyjsffl61whj24d3zlg5pxf3xj1af2a4f6";
};
buildInputs = [pkgconfig gperf m4 libxcb xproto ];
})) // {inherit gperf m4 libxcb xproto ;};
xcbutilimage = (stdenv.mkDerivation ((if overrides ? xcbutilimage then overrides.xcbutilimage else x: x) {
- name = "xcb-util-image-0.3.8";
+ name = "xcb-util-image-0.3.9";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/individual/xcb/xcb-util-image-0.3.8.tar.bz2;
- sha256 = "1nd67105lb8qfa7r2lli5sxnipi1p1wnbwa04l9k30kfq8l0afa0";
+ url = mirror://xorg/individual/xcb/xcb-util-image-0.3.9.tar.bz2;
+ sha256 = "1pr1l1nkg197gyl9d0fpwmn72jqpxjfgn9y13q4gawg1m873qnnk";
};
buildInputs = [pkgconfig gperf m4 libxcb xcbutil xproto ];
})) // {inherit gperf m4 libxcb xcbutil xproto ;};
xcbutilkeysyms = (stdenv.mkDerivation ((if overrides ? xcbutilkeysyms then overrides.xcbutilkeysyms else x: x) {
- name = "xcb-util-keysyms-0.3.8";
+ name = "xcb-util-keysyms-0.3.9";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/individual/xcb/xcb-util-keysyms-0.3.8.tar.bz2;
- sha256 = "08b1d19gaqv3agpkvh5mgcir11vjy89ywdknva0cb073mzvk4gci";
+ url = mirror://xorg/individual/xcb/xcb-util-keysyms-0.3.9.tar.bz2;
+ sha256 = "0vjwk7vrcfnlhiadv445c6skfxmdrg5v4qf81y8s2s5xagqarqbv";
};
buildInputs = [pkgconfig gperf m4 libxcb xproto ];
})) // {inherit gperf m4 libxcb xproto ;};
@@ -1188,51 +1188,51 @@ let
})) // {inherit gperf m4 libxcb xproto ;};
xcbutilwm = (stdenv.mkDerivation ((if overrides ? xcbutilwm then overrides.xcbutilwm else x: x) {
- name = "xcb-util-wm-0.3.8";
+ name = "xcb-util-wm-0.3.9";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/individual/xcb/xcb-util-wm-0.3.8.tar.bz2;
- sha256 = "01shwv13rfcxycrsla6c5xlrk1qska7kvvj10n7jcibx9jzanmy5";
+ url = mirror://xorg/individual/xcb/xcb-util-wm-0.3.9.tar.bz2;
+ sha256 = "0c30fj33gvwzwhyz1dhsfwni0ai16bxpvxb4l6c6s7vvj7drp3q3";
};
buildInputs = [pkgconfig gperf m4 libxcb xproto ];
})) // {inherit gperf m4 libxcb xproto ;};
xclock = (stdenv.mkDerivation ((if overrides ? xclock then overrides.xclock else x: x) {
- name = "xclock-1.0.5";
+ name = "xclock-1.0.6";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/individual/app/xclock-1.0.5.tar.bz2;
- sha256 = "16jcmsmhz503mqv7wz7daqqhm11phsws0g7fryzlz0gk4jg1daak";
+ url = mirror://xorg/individual/app/xclock-1.0.6.tar.bz2;
+ sha256 = "1l1zxr69p0734fnx9rdqw79ahr273hr050sm8xdc0n51n1bnzfr1";
};
buildInputs = [pkgconfig libX11 libXaw libXft libxkbfile libXmu libXrender libXt ];
})) // {inherit libX11 libXaw libXft libxkbfile libXmu libXrender libXt ;};
xcmiscproto = (stdenv.mkDerivation ((if overrides ? xcmiscproto then overrides.xcmiscproto else x: x) {
- name = "xcmiscproto-1.2.1";
+ name = "xcmiscproto-1.2.2";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/xcmiscproto-1.2.1.tar.bz2;
- sha256 = "05acy1axzkrq6z9xlbmz1kg66lbgfqzky8v4qfdl16gv5gi2f3kk";
+ url = mirror://xorg/X11R7.7/src/everything/xcmiscproto-1.2.2.tar.bz2;
+ sha256 = "1pyjv45wivnwap2wvsbrzdvjc5ql8bakkbkrvcv6q9bjjf33ccmi";
};
buildInputs = [pkgconfig ];
})) // {inherit ;};
xcmsdb = (stdenv.mkDerivation ((if overrides ? xcmsdb then overrides.xcmsdb else x: x) {
- name = "xcmsdb-1.0.3";
+ name = "xcmsdb-1.0.4";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/xcmsdb-1.0.3.tar.bz2;
- sha256 = "102s9lsghdp5n3bsg4chlkhrk0jh0kxvg2g0pyi1zmzfy5hd0dxj";
+ url = mirror://xorg/X11R7.7/src/everything/xcmsdb-1.0.4.tar.bz2;
+ sha256 = "03ms731l3kvaldq7ycbd30j6134b61i3gbll4b2gl022wyzbjq74";
};
buildInputs = [pkgconfig libX11 ];
})) // {inherit libX11 ;};
xcursorgen = (stdenv.mkDerivation ((if overrides ? xcursorgen then overrides.xcursorgen else x: x) {
- name = "xcursorgen-1.0.4";
+ name = "xcursorgen-1.0.5";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/xcursorgen-1.0.4.tar.bz2;
- sha256 = "07azdw6w18hdgrd6z3nawrhn1m18nyp24cz54ih91vpz8hpxnany";
+ url = mirror://xorg/X11R7.7/src/everything/xcursorgen-1.0.5.tar.bz2;
+ sha256 = "10f5wk1326mm45gvgpf4m2p0j80fcd0i4c52zikahb91zah72wdw";
};
buildInputs = [pkgconfig libpng libX11 libXcursor ];
})) // {inherit libpng libX11 libXcursor ;};
@@ -1241,58 +1241,58 @@ let
name = "xcursor-themes-1.0.3";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/xcursor-themes-1.0.3.tar.bz2;
+ url = mirror://xorg/X11R7.7/src/everything/xcursor-themes-1.0.3.tar.bz2;
sha256 = "1is4bak0qkkhv63mfa5l7492r475586y52yzfxyv3psppn662ilr";
};
buildInputs = [pkgconfig libXcursor ];
})) // {inherit libXcursor ;};
xdm = (stdenv.mkDerivation ((if overrides ? xdm then overrides.xdm else x: x) {
- name = "xdm-1.1.10";
+ name = "xdm-1.1.11";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/individual/app/xdm-1.1.10.tar.bz2;
- sha256 = "0zzrlkmppy6mma49db2x1il47rhjqkg9rs91ryl7xyv5iqbgg1ql";
+ url = mirror://xorg/individual/app/xdm-1.1.11.tar.bz2;
+ sha256 = "0iqw11977lpr9nk1is4fca84d531vck0mq7jldwl44m0vrnl5nnl";
};
buildInputs = [pkgconfig libX11 libXau libXaw libXdmcp libXext libXft libXinerama libXmu libXpm libXt ];
})) // {inherit libX11 libXau libXaw libXdmcp libXext libXft libXinerama libXmu libXpm libXt ;};
xdpyinfo = (stdenv.mkDerivation ((if overrides ? xdpyinfo then overrides.xdpyinfo else x: x) {
- name = "xdpyinfo-1.2.0";
+ name = "xdpyinfo-1.3.0";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/xdpyinfo-1.2.0.tar.bz2;
- sha256 = "1kmmfawcjxgmp06jb3w7d0pxbrcxrrgfx3m1lbwj3gygir4ssnzy";
+ url = mirror://xorg/X11R7.7/src/everything/xdpyinfo-1.3.0.tar.bz2;
+ sha256 = "0gypsvpmay3lsh3b1dg29pjxv95pkrr21d4w6ys02mrbld24kvi3";
};
- buildInputs = [pkgconfig libdmx libX11 libXcomposite libXext libXi libXinerama libXrender libXtst libXxf86dga libXxf86misc libXxf86vm ];
- })) // {inherit libdmx libX11 libXcomposite libXext libXi libXinerama libXrender libXtst libXxf86dga libXxf86misc libXxf86vm ;};
+ buildInputs = [pkgconfig libdmx libX11 libxcb libXcomposite libXext libXi libXinerama libXrender libXtst libXxf86dga libXxf86misc libXxf86vm ];
+ })) // {inherit libdmx libX11 libxcb libXcomposite libXext libXi libXinerama libXrender libXtst libXxf86dga libXxf86misc libXxf86vm ;};
xdriinfo = (stdenv.mkDerivation ((if overrides ? xdriinfo then overrides.xdriinfo else x: x) {
name = "xdriinfo-1.0.4";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/xdriinfo-1.0.4.tar.bz2;
+ url = mirror://xorg/X11R7.7/src/everything/xdriinfo-1.0.4.tar.bz2;
sha256 = "076bjix941znyjmh3j5jjsnhp2gv2iq53d0ks29mvvv87cyy9iim";
};
buildInputs = [pkgconfig glproto libX11 ];
})) // {inherit glproto libX11 ;};
xev = (stdenv.mkDerivation ((if overrides ? xev then overrides.xev else x: x) {
- name = "xev-1.1.0";
+ name = "xev-1.2.0";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/xev-1.1.0.tar.bz2;
- sha256 = "1ih1rxf2b6bpsggvbx4ibyx70bzgcyjl98l1894d0smjxmlc4n9q";
+ url = mirror://xorg/X11R7.7/src/everything/xev-1.2.0.tar.bz2;
+ sha256 = "13xk5z7vy87rnn4574z0jfzymdivyc7pl4axim81sx0pmdysg1ip";
};
- buildInputs = [pkgconfig libX11 ];
- })) // {inherit libX11 ;};
+ buildInputs = [pkgconfig libX11 xproto libXrandr ];
+ })) // {inherit libX11 xproto libXrandr ;};
xextproto = (stdenv.mkDerivation ((if overrides ? xextproto then overrides.xextproto else x: x) {
- name = "xextproto-7.1.2";
+ name = "xextproto-7.2.1";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/xextproto-7.1.2.tar.bz2;
- sha256 = "16ci2mc9g85fsb7lgml349rbgf97v7l9688by71agv682bhjky7n";
+ url = mirror://xorg/X11R7.7/src/everything/xextproto-7.2.1.tar.bz2;
+ sha256 = "06kdanbnprxvgl56l5h0lqj4b0f1fbb1ndha33mv5wvy802v2lvw";
};
buildInputs = [pkgconfig ];
})) // {inherit ;};
@@ -1311,7 +1311,7 @@ let
name = "xf86bigfontproto-1.2.0";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/xf86bigfontproto-1.2.0.tar.bz2;
+ url = mirror://xorg/X11R7.7/src/everything/xf86bigfontproto-1.2.0.tar.bz2;
sha256 = "0j0n7sj5xfjpmmgx6n5x556rw21hdd18fwmavp95wps7qki214ms";
};
buildInputs = [pkgconfig ];
@@ -1321,7 +1321,7 @@ let
name = "xf86dgaproto-2.1";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/xf86dgaproto-2.1.tar.bz2;
+ url = mirror://xorg/X11R7.7/src/everything/xf86dgaproto-2.1.tar.bz2;
sha256 = "0l4hx48207mx0hp09026r6gy9nl3asbq0c75hri19wp1118zcpmc";
};
buildInputs = [pkgconfig ];
@@ -1331,98 +1331,78 @@ let
name = "xf86driproto-2.1.1";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/individual/proto/xf86driproto-2.1.1.tar.bz2;
+ url = mirror://xorg/X11R7.7/src/everything/xf86driproto-2.1.1.tar.bz2;
sha256 = "07v69m0g2dfzb653jni4x656jlr7l84c1k39j8qc8vfb45r8sjww";
};
buildInputs = [pkgconfig ];
})) // {inherit ;};
- xf86inputacecad = (stdenv.mkDerivation ((if overrides ? xf86inputacecad then overrides.xf86inputacecad else x: x) {
- name = "xf86-input-acecad-1.4.0";
- builder = ./builder.sh;
- src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/xf86-input-acecad-1.4.0.tar.bz2;
- sha256 = "0mnmvffxwgcvsa208vffsqlai7lldjc46rdk6j0j4q00df5isd28";
- };
- buildInputs = [pkgconfig inputproto randrproto xorgserver xproto ];
- })) // {inherit inputproto randrproto xorgserver xproto ;};
-
- xf86inputaiptek = (stdenv.mkDerivation ((if overrides ? xf86inputaiptek then overrides.xf86inputaiptek else x: x) {
- name = "xf86-input-aiptek-1.3.1";
- builder = ./builder.sh;
- src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/xf86-input-aiptek-1.3.1.tar.bz2;
- sha256 = "16pby473s65lfd2v60fwayzfhf1n6x696lrx720zwb2p22rlsna3";
- };
- buildInputs = [pkgconfig inputproto randrproto xorgserver xproto ];
- })) // {inherit inputproto randrproto xorgserver xproto ;};
-
xf86inputevdev = (stdenv.mkDerivation ((if overrides ? xf86inputevdev then overrides.xf86inputevdev else x: x) {
- name = "xf86-input-evdev-2.6.0";
+ name = "xf86-input-evdev-2.7.3";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/individual/driver/xf86-input-evdev-2.6.0.tar.bz2;
- sha256 = "1b2kcxm7bc255ym56dpl1fw3km44f5ny3hwn65sa90w13acz7rxh";
+ url = mirror://xorg/individual/driver/xf86-input-evdev-2.7.3.tar.bz2;
+ sha256 = "01557w1kmsaqdsc42pxyypig10l5r5vh9axz9g22hg9cc09r8f7b";
};
- buildInputs = [pkgconfig inputproto xorgserver xproto ];
- })) // {inherit inputproto xorgserver xproto ;};
+ buildInputs = [pkgconfig inputproto udev xorgserver xproto ];
+ })) // {inherit inputproto udev xorgserver xproto ;};
xf86inputjoystick = (stdenv.mkDerivation ((if overrides ? xf86inputjoystick then overrides.xf86inputjoystick else x: x) {
- name = "xf86-input-joystick-1.5.0";
+ name = "xf86-input-joystick-1.6.1";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/xf86-input-joystick-1.5.0.tar.bz2;
- sha256 = "1ac2lap4npylyzg0pi0zy0n48wvicgz9kw0z9ih9ylk9sz2ii0bi";
+ url = mirror://xorg/X11R7.7/src/everything/xf86-input-joystick-1.6.1.tar.bz2;
+ sha256 = "1xgpkdmfw4ahjlva97gs9sllzw8nlpa8mxj59g28fxhak67mvv8x";
};
buildInputs = [pkgconfig inputproto kbproto xorgserver xproto ];
})) // {inherit inputproto kbproto xorgserver xproto ;};
xf86inputkeyboard = (stdenv.mkDerivation ((if overrides ? xf86inputkeyboard then overrides.xf86inputkeyboard else x: x) {
- name = "xf86-input-keyboard-1.5.0";
+ name = "xf86-input-keyboard-1.6.1";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/xf86-input-keyboard-1.5.0.tar.bz2;
- sha256 = "1c4ww4yj23shqwhc52r512qsy5baf1sxsb7jj7pfnralj07520r3";
+ url = mirror://xorg/X11R7.7/src/everything/xf86-input-keyboard-1.6.1.tar.bz2;
+ sha256 = "1hwc1bjw5mxv186xbrxiky0agfglwqg8fsxqdh4br1vzgxpck7ma";
};
buildInputs = [pkgconfig inputproto xorgserver xproto ];
})) // {inherit inputproto xorgserver xproto ;};
xf86inputmouse = (stdenv.mkDerivation ((if overrides ? xf86inputmouse then overrides.xf86inputmouse else x: x) {
- name = "xf86-input-mouse-1.6.0";
+ name = "xf86-input-mouse-1.7.2";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/xf86-input-mouse-1.6.0.tar.bz2;
- sha256 = "1nzvlbhvdyki3h1s4x2i3ps1immf3wfns6az2i3669v8a5g29bn7";
+ url = mirror://xorg/X11R7.7/src/everything/xf86-input-mouse-1.7.2.tar.bz2;
+ sha256 = "0fs1lwnycyv3d0m6l2wrnlgvbs8qw66d93hwlnmrsswfq5bp6ark";
};
buildInputs = [pkgconfig inputproto xorgserver xproto ];
})) // {inherit inputproto xorgserver xproto ;};
xf86inputsynaptics = (stdenv.mkDerivation ((if overrides ? xf86inputsynaptics then overrides.xf86inputsynaptics else x: x) {
- name = "xf86-input-synaptics-1.5.0";
+ name = "xf86-input-synaptics-1.6.2";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/individual/driver/xf86-input-synaptics-1.5.0.tar.bz2;
- sha256 = "0khwda8lrrvrdb37i4i1kdhg8f44kgcjq9y209ds7ja9zjcm7k4m";
+ url = mirror://xorg/individual/driver/xf86-input-synaptics-1.6.2.tar.bz2;
+ sha256 = "082rlbyw63sashjbwd7dd0a0smp5n8yv9bihy19c706lhnhddxy3";
};
buildInputs = [pkgconfig inputproto randrproto recordproto libX11 libXi xorgserver xproto libXtst ];
})) // {inherit inputproto randrproto recordproto libX11 libXi xorgserver xproto libXtst ;};
xf86inputvmmouse = (stdenv.mkDerivation ((if overrides ? xf86inputvmmouse then overrides.xf86inputvmmouse else x: x) {
- name = "xf86-input-vmmouse-12.6.10";
+ name = "xf86-input-vmmouse-12.9.0";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/xf86-input-vmmouse-12.6.10.tar.bz2;
- sha256 = "0409lkwk1ws8vw4axxilwmcs8qxj8lq5dma2i2iz49q6hrd9sdm6";
+ url = mirror://xorg/individual/driver/xf86-input-vmmouse-12.9.0.tar.bz2;
+ sha256 = "1gwrna96f0p4gpjhin8yx01y5xvns2j15f7hw1jvqf7fpzv01kzv";
};
buildInputs = [pkgconfig inputproto randrproto xorgserver xproto ];
})) // {inherit inputproto randrproto xorgserver xproto ;};
xf86inputvoid = (stdenv.mkDerivation ((if overrides ? xf86inputvoid then overrides.xf86inputvoid else x: x) {
- name = "xf86-input-void-1.3.1";
+ name = "xf86-input-void-1.4.0";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/xf86-input-void-1.3.1.tar.bz2;
- sha256 = "0x662i756p0nqmfv76ppm28ir2sbvcm32r71ycd9bxc3mj29g9mb";
+ url = mirror://xorg/X11R7.7/src/everything/xf86-input-void-1.4.0.tar.bz2;
+ sha256 = "01bmk324fq48wydvy1qrnxbw6qz0fjd0i80g0n4cqr1c4mjmif9a";
};
buildInputs = [pkgconfig xorgserver xproto ];
})) // {inherit xorgserver xproto ;};
@@ -1437,145 +1417,115 @@ let
buildInputs = [pkgconfig ];
})) // {inherit ;};
- xf86videoapm = (stdenv.mkDerivation ((if overrides ? xf86videoapm then overrides.xf86videoapm else x: x) {
- name = "xf86-video-apm-1.2.3";
- builder = ./builder.sh;
- src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/xf86-video-apm-1.2.3.tar.bz2;
- sha256 = "1nih9ayiw13aa1s8j6gr99b207215if055c6yvsrssnpvccflij0";
- };
- buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
- })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
-
xf86videoark = (stdenv.mkDerivation ((if overrides ? xf86videoark then overrides.xf86videoark else x: x) {
- name = "xf86-video-ark-0.7.3";
+ name = "xf86-video-ark-0.7.4";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/xf86-video-ark-0.7.3.tar.bz2;
- sha256 = "164gyaaddjjma0xqys0knid2rsd0c7jlab02c8wh3bk4bib9l51r";
+ url = mirror://xorg/X11R7.7/src/everything/xf86-video-ark-0.7.4.tar.bz2;
+ sha256 = "194zc35ivfh3vcxcilf9nbi88c2di8kbh84x535cljlpiajdnk5x";
};
buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ];
})) // {inherit fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ;};
xf86videoast = (stdenv.mkDerivation ((if overrides ? xf86videoast then overrides.xf86videoast else x: x) {
- name = "xf86-video-ast-0.91.10";
+ name = "xf86-video-ast-0.93.10";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/xf86-video-ast-0.91.10.tar.bz2;
- sha256 = "05fcp0svdd4skkfgag1rrram6v3xzgasf582dihpyrwlz28186vy";
+ url = mirror://xorg/X11R7.7/src/everything/xf86-video-ast-0.93.10.tar.bz2;
+ sha256 = "1q64z8qqa0ix3cymqiwk1s3sphd1fvvz30lvyxhgkgciygz6dm69";
};
buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
})) // {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-6.14.3";
+ name = "xf86-video-ati-6.14.4";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/individual/driver/xf86-video-ati-6.14.3.tar.bz2;
- sha256 = "1d1ph7xvgcr7rdf5sgibhas625aghvm3f61yzwmfk8znxx4jcjl4";
+ url = mirror://xorg/individual/driver/xf86-video-ati-6.14.4.tar.bz2;
+ sha256 = "11gg6xn65vym75769hzgzpkjsyhlkrw4zw3ncngriq7vz1g47zjg";
};
buildInputs = [pkgconfig fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ];
})) // {inherit fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
- xf86videochips = (stdenv.mkDerivation ((if overrides ? xf86videochips then overrides.xf86videochips else x: x) {
- name = "xf86-video-chips-1.2.3";
- builder = ./builder.sh;
- src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/xf86-video-chips-1.2.3.tar.bz2;
- sha256 = "07fb03cxdlis2rjphz2pl59cjhldrhqric8p0gi4wkgq0s72fq85";
- };
- buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
- })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
-
xf86videocirrus = (stdenv.mkDerivation ((if overrides ? xf86videocirrus then overrides.xf86videocirrus else x: x) {
- name = "xf86-video-cirrus-1.3.2";
+ name = "xf86-video-cirrus-1.5.1";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/xf86-video-cirrus-1.3.2.tar.bz2;
- sha256 = "06na525xy5d6xf5g13bjsk9cyxly5arzgrk9j8dmxfll5jj9i6jj";
+ url = mirror://xorg/individual/driver/xf86-video-cirrus-1.5.1.tar.bz2;
+ sha256 = "0my54x52fsa82bsh196hz79750xjlv8ddbvin7230ck7pnf44md9";
};
buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
})) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
xf86videodummy = (stdenv.mkDerivation ((if overrides ? xf86videodummy then overrides.xf86videodummy else x: x) {
- name = "xf86-video-dummy-0.3.4";
+ name = "xf86-video-dummy-0.3.5";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/xf86-video-dummy-0.3.4.tar.bz2;
- sha256 = "1p0vhxvx25d8fp59i72664smhd0z5zw0i2kipk0879xk1vsxz13y";
+ url = mirror://xorg/X11R7.7/src/everything/xf86-video-dummy-0.3.5.tar.bz2;
+ sha256 = "0pyr50kqh7g84r4p0x09ay5kxax20dip9sh8h3cbd4xv8cswdbfm";
};
buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xf86dgaproto xorgserver xproto ];
})) // {inherit fontsproto randrproto renderproto videoproto xf86dgaproto xorgserver xproto ;};
xf86videofbdev = (stdenv.mkDerivation ((if overrides ? xf86videofbdev then overrides.xf86videofbdev else x: x) {
- name = "xf86-video-fbdev-0.4.2";
+ name = "xf86-video-fbdev-0.4.3";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/xf86-video-fbdev-0.4.2.tar.bz2;
- sha256 = "1mc23w0bfmak5216411xh58nrs93jlxmi6l412hmqzhxnjs73clk";
+ url = mirror://xorg/individual/driver/xf86-video-fbdev-0.4.3.tar.bz2;
+ sha256 = "0ca8khgy3wv0fys7s4087apvnp8j86blxj5m5m70l10hs5x06yzz";
};
buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xorgserver xproto ];
})) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xorgserver xproto ;};
xf86videogeode = (stdenv.mkDerivation ((if overrides ? xf86videogeode then overrides.xf86videogeode else x: x) {
- name = "xf86-video-geode-2.11.10";
+ name = "xf86-video-geode-2.11.13";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/xf86-video-geode-2.11.10.tar.bz2;
- sha256 = "1zdb3y5df1dcqlvijg8hxcd6520a5c69jk52yz7ww194ka2c8icf";
+ url = mirror://xorg/X11R7.7/src/everything/xf86-video-geode-2.11.13.tar.bz2;
+ sha256 = "09p2cjd2fb7h32k9qs4wp7qvhfn2zv454spv5mfplv7w2jis4863";
};
buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
})) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
xf86videoglide = (stdenv.mkDerivation ((if overrides ? xf86videoglide then overrides.xf86videoglide else x: x) {
- name = "xf86-video-glide-1.1.0";
+ name = "xf86-video-glide-1.2.0";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/xf86-video-glide-1.1.0.tar.bz2;
- sha256 = "1wf35ai8z3qqk2a97rp72jzvm28ylw2wj2hllrsn29p7jpznh5aw";
+ url = mirror://xorg/X11R7.7/src/everything/xf86-video-glide-1.2.0.tar.bz2;
+ sha256 = "0byapm9mnpqk3wijfnnan3d22ii5cw6dmg4xn1625iiz89j5vs1l";
};
buildInputs = [pkgconfig xextproto xorgserver xproto ];
})) // {inherit xextproto xorgserver xproto ;};
xf86videoglint = (stdenv.mkDerivation ((if overrides ? xf86videoglint then overrides.xf86videoglint else x: x) {
- name = "xf86-video-glint-1.2.5";
+ name = "xf86-video-glint-1.2.7";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/xf86-video-glint-1.2.5.tar.bz2;
- sha256 = "0jw1kkyja8hvvhrr3ldl1r5vpqfhn1xmqkpgd2jrkc5p59rz4xan";
+ url = mirror://xorg/X11R7.7/src/everything/xf86-video-glint-1.2.7.tar.bz2;
+ sha256 = "0nf36jryabpncqq4m6sfsnmzk00f7gvfmjnl8l8sfy7w6sa6iacs";
};
- buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xf86driproto xorgserver xproto ];
- })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xf86driproto xorgserver xproto ;};
+ buildInputs = [pkgconfig libpciaccess videoproto xextproto xf86dgaproto xorgserver xproto ];
+ })) // {inherit libpciaccess videoproto xextproto xf86dgaproto xorgserver xproto ;};
xf86videoi128 = (stdenv.mkDerivation ((if overrides ? xf86videoi128 then overrides.xf86videoi128 else x: x) {
- name = "xf86-video-i128-1.3.4";
+ name = "xf86-video-i128-1.3.5";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/xf86-video-i128-1.3.4.tar.bz2;
- sha256 = "1kwb4ifxwm77s1ks19csmq2ymgs36bxqwvwv24ssvxb9znki76xn";
- };
- buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
- })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
-
- xf86videoi740 = (stdenv.mkDerivation ((if overrides ? xf86videoi740 then overrides.xf86videoi740 else x: x) {
- name = "xf86-video-i740-1.3.2";
- builder = ./builder.sh;
- src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/xf86-video-i740-1.3.2.tar.bz2;
- sha256 = "0hzr5fz6d5jk9jxh9plfgvgias3w7xzyg1n4gx0hs2lc7mm9qm28";
+ url = mirror://xorg/X11R7.7/src/everything/xf86-video-i128-1.3.5.tar.bz2;
+ sha256 = "1sik8ck410hb2885vy7rlc590hw5br8lr2fzxgmv55jyawgfpv9y";
};
buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
})) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
xf86videointel = (stdenv.mkDerivation ((if overrides ? xf86videointel then overrides.xf86videointel else x: x) {
- name = "xf86-video-intel-2.15.0";
+ name = "xf86-video-intel-2.20.10";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/individual/driver/xf86-video-intel-2.15.0.tar.bz2;
- sha256 = "080pkhjp910wy36crpgi0dmcwpcx8w2r3k4s0dz6v14bmgly2xy3";
+ url = mirror://xorg/individual/driver/xf86-video-intel-2.20.10.tar.bz2;
+ sha256 = "1kfd6qiqxyqhjp8g1xcipkldsf7xa47q8zfdhxg3qzw77n6a4hfz";
};
- buildInputs = [pkgconfig dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXvMC ];
- })) // {inherit dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXvMC ;};
+ buildInputs = [pkgconfig dri2proto fontsproto libdrm udev libpciaccess pixman randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXrender libXvMC ];
+ })) // {inherit dri2proto fontsproto libdrm udev libpciaccess pixman randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXrender libXvMC ;};
xf86videointel_2_14_901 = (stdenv.mkDerivation ((if overrides ? xf86videointel_2_14_901 then overrides.xf86videointel_2_14_901 else x: x) {
name = "xf86-video-intel-2.14.901";
@@ -1598,170 +1548,110 @@ let
})) // {inherit dri2proto fontsproto libdrm udev libpciaccess pixman randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXrender libXvMC ;};
xf86videomach64 = (stdenv.mkDerivation ((if overrides ? xf86videomach64 then overrides.xf86videomach64 else x: x) {
- name = "xf86-video-mach64-6.8.2";
+ name = "xf86-video-mach64-6.9.1";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/xf86-video-mach64-6.8.2.tar.bz2;
- sha256 = "07b7dkb6xc10pvf483dg52r2klpikmw339i5ln9ig913601r84dr";
+ url = mirror://xorg/X11R7.7/src/everything/xf86-video-mach64-6.9.1.tar.bz2;
+ sha256 = "0kl3kvpc2ny48z89313i9fi4cxzwb2pllvxcr9j5ly680ygx8slz";
};
- buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xineramaproto xorgserver xproto ];
- })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xineramaproto xorgserver xproto ;};
+ buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ];
+ })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
xf86videomga = (stdenv.mkDerivation ((if overrides ? xf86videomga then overrides.xf86videomga else x: x) {
- name = "xf86-video-mga-1.4.13";
+ name = "xf86-video-mga-1.5.0";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/xf86-video-mga-1.4.13.tar.bz2;
- sha256 = "1xnzxmp9cfpi6q7fx2r74iwyb33wkdrqcf38dhwydbaaxigvsmxn";
+ url = mirror://xorg/X11R7.7/src/everything/xf86-video-mga-1.5.0.tar.bz2;
+ sha256 = "03l3wz5kz0hmxmzqqbkgn7pf9d956jlag04rb701a0fr1mw3v66a";
};
buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ];
})) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
xf86videoneomagic = (stdenv.mkDerivation ((if overrides ? xf86videoneomagic then overrides.xf86videoneomagic else x: x) {
- name = "xf86-video-neomagic-1.2.5";
+ name = "xf86-video-neomagic-1.2.6";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/xf86-video-neomagic-1.2.5.tar.bz2;
- sha256 = "0jshn5k1byq0msl1ymip3m2xycrd8jkk6nzm5dx2av5xlj1rxdn0";
+ url = mirror://xorg/X11R7.7/src/everything/xf86-video-neomagic-1.2.6.tar.bz2;
+ sha256 = "124qci48xrk0w2jy91n7vqs7s6q397zyiqqszhmkx6ld7six57mi";
};
buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ];
})) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ;};
xf86videonewport = (stdenv.mkDerivation ((if overrides ? xf86videonewport then overrides.xf86videonewport else x: x) {
- name = "xf86-video-newport-0.2.3";
+ name = "xf86-video-newport-0.2.4";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/xf86-video-newport-0.2.3.tar.bz2;
- sha256 = "0w02rz49gipnfl33vak3zgis8bh9i0v5ykyj8qh9vzddjm7ypjp6";
+ url = mirror://xorg/X11R7.7/src/everything/xf86-video-newport-0.2.4.tar.bz2;
+ sha256 = "1yafmp23jrfdmc094i6a4dsizapsc9v0pl65cpc8w1kvn7343k4i";
};
buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xorgserver xproto ];
})) // {inherit fontsproto randrproto renderproto videoproto xorgserver xproto ;};
xf86videonv = (stdenv.mkDerivation ((if overrides ? xf86videonv then overrides.xf86videonv else x: x) {
- name = "xf86-video-nv-2.1.18";
+ name = "xf86-video-nv-2.1.20";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/xf86-video-nv-2.1.18.tar.bz2;
- sha256 = "05glbi9jc7j9nm4sf4qvl3z87s48ibm3i283lqz85kbphg62dxvc";
+ url = mirror://xorg/individual/driver/xf86-video-nv-2.1.20.tar.bz2;
+ sha256 = "1gqh1khc4zalip5hh2nksgs7i3piqq18nncgmsx9qvzi05azd5c3";
};
buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
})) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
xf86videoopenchrome = (stdenv.mkDerivation ((if overrides ? xf86videoopenchrome then overrides.xf86videoopenchrome else x: x) {
- name = "xf86-video-openchrome-0.2.904";
+ name = "xf86-video-openchrome-0.2.906";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/xf86-video-openchrome-0.2.904.tar.bz2;
- sha256 = "1sksddn0pc3izvab5ppxhprs1xzk5ijwqz5ylivx1cb5hg2gggf7";
+ url = mirror://xorg/X11R7.7/src/everything/xf86-video-openchrome-0.2.906.tar.bz2;
+ sha256 = "0hgzn1r7ig94xbr9dvq0bp1nxqlfp2ki8823jca3f22a2kf8wmg7";
};
buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xf86driproto xorgserver xproto libXvMC ];
})) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xf86driproto xorgserver xproto libXvMC ;};
xf86videor128 = (stdenv.mkDerivation ((if overrides ? xf86videor128 then overrides.xf86videor128 else x: x) {
- name = "xf86-video-r128-6.8.1";
+ name = "xf86-video-r128-6.8.2";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/xf86-video-r128-6.8.1.tar.bz2;
- sha256 = "1jlybabm3k09hhlzx1xilndqngk3xgdck66n94sr02w5hg622zji";
+ url = mirror://xorg/X11R7.7/src/everything/xf86-video-r128-6.8.2.tar.bz2;
+ sha256 = "1c84x40k9qz9dnf5qs6nnjcgz7px6mpc3rbk8mj62zhp7mf16hbv";
};
- buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xineramaproto xorgserver xproto ];
- })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xineramaproto xorgserver xproto ;};
-
- xf86videorendition = (stdenv.mkDerivation ((if overrides ? xf86videorendition then overrides.xf86videorendition else x: x) {
- name = "xf86-video-rendition-4.2.4";
- builder = ./builder.sh;
- src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/xf86-video-rendition-4.2.4.tar.bz2;
- sha256 = "1a9anxgqs7wc8d7jb5nw6dgmynw0sxiwp9p90h4w19y315kqx6rv";
- };
- buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ];
- })) // {inherit fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ;};
-
- xf86videos3 = (stdenv.mkDerivation ((if overrides ? xf86videos3 then overrides.xf86videos3 else x: x) {
- name = "xf86-video-s3-0.6.3";
- builder = ./builder.sh;
- src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/xf86-video-s3-0.6.3.tar.bz2;
- sha256 = "0i2i1080cw3pxy1pm43bskb80n7wql0cxpyd2s61v0didsm6b7zd";
- };
- buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
- })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
-
- xf86videos3virge = (stdenv.mkDerivation ((if overrides ? xf86videos3virge then overrides.xf86videos3virge else x: x) {
- name = "xf86-video-s3virge-1.10.4";
- builder = ./builder.sh;
- src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/xf86-video-s3virge-1.10.4.tar.bz2;
- sha256 = "1f3zjs6a3j2a8lfdilijggpwbg9cs88qksrvzvd71ggxf5p0vl0w";
- };
- buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
- })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
+ buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xorgserver xproto ];
+ })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xorgserver xproto ;};
xf86videosavage = (stdenv.mkDerivation ((if overrides ? xf86videosavage then overrides.xf86videosavage else x: x) {
- name = "xf86-video-savage-2.3.1";
+ name = "xf86-video-savage-2.3.4";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/xf86-video-savage-2.3.1.tar.bz2;
- sha256 = "1ays1l4phyjcdikc9d1zwgswivcrb1grkh7klv5klvqahbfxqjib";
+ url = mirror://xorg/X11R7.7/src/everything/xf86-video-savage-2.3.4.tar.bz2;
+ sha256 = "0jdy4wv3k3ylx3lajjcbsg37z2hf6366a1jvv16sv1ln6dk6lris";
};
buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ];
})) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
xf86videosiliconmotion = (stdenv.mkDerivation ((if overrides ? xf86videosiliconmotion then overrides.xf86videosiliconmotion else x: x) {
- name = "xf86-video-siliconmotion-1.7.4";
+ name = "xf86-video-siliconmotion-1.7.6";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/xf86-video-siliconmotion-1.7.4.tar.bz2;
- sha256 = "1mq4dsg2f77wxl0n4fnm6a5p3lajyhra6rxx29z52p5b1x412xdl";
+ url = mirror://xorg/X11R7.7/src/everything/xf86-video-siliconmotion-1.7.6.tar.bz2;
+ sha256 = "01sdl6ky1vmvmfgx2d44i35rqafi0z07xdy40cvindcr2k91p7x5";
};
- buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
- })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
+ buildInputs = [pkgconfig fontsproto libpciaccess videoproto xextproto xorgserver xproto ];
+ })) // {inherit fontsproto libpciaccess videoproto xextproto xorgserver xproto ;};
xf86videosis = (stdenv.mkDerivation ((if overrides ? xf86videosis then overrides.xf86videosis else x: x) {
- name = "xf86-video-sis-0.10.3";
+ name = "xf86-video-sis-0.10.4";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/xf86-video-sis-0.10.3.tar.bz2;
- sha256 = "0dy7a7iil35nz1xlazrcq0sp474p6wy0f1pa5y0spbfj5zib6fcv";
+ url = mirror://xorg/X11R7.7/src/everything/xf86-video-sis-0.10.4.tar.bz2;
+ sha256 = "03diq0l93lfsipmwkpdb2ysgbxxryl6yakpghzc3fksjxa01112f";
};
buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xf86driproto xineramaproto xorgserver xproto ];
})) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xf86driproto xineramaproto xorgserver xproto ;};
- xf86videosisusb = (stdenv.mkDerivation ((if overrides ? xf86videosisusb then overrides.xf86videosisusb else x: x) {
- name = "xf86-video-sisusb-0.9.4";
- builder = ./builder.sh;
- src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/xf86-video-sisusb-0.9.4.tar.bz2;
- sha256 = "0b5afc1dqj8h34fldl35hzf7wphj1x76czkd461bfarnvyljgfrb";
- };
- buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xextproto xineramaproto xorgserver xproto ];
- })) // {inherit fontsproto randrproto renderproto videoproto xextproto xineramaproto xorgserver xproto ;};
-
- xf86videosuncg14 = (stdenv.mkDerivation ((if overrides ? xf86videosuncg14 then overrides.xf86videosuncg14 else x: x) {
- name = "xf86-video-suncg14-1.1.1";
- builder = ./builder.sh;
- src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/xf86-video-suncg14-1.1.1.tar.bz2;
- sha256 = "1n108xbwg803v2sk51galx66ph8wdb0ym84fx45h0jrr41wh0hyb";
- };
- buildInputs = [pkgconfig fontsproto randrproto renderproto xorgserver xproto ];
- })) // {inherit fontsproto randrproto renderproto xorgserver xproto ;};
-
- xf86videosuncg3 = (stdenv.mkDerivation ((if overrides ? xf86videosuncg3 then overrides.xf86videosuncg3 else x: x) {
- name = "xf86-video-suncg3-1.1.1";
- builder = ./builder.sh;
- src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/xf86-video-suncg3-1.1.1.tar.bz2;
- sha256 = "06c4hzmd5cfzbw79yrv3knss80hllciamz734ij1pbzj6j6fjvym";
- };
- buildInputs = [pkgconfig fontsproto randrproto renderproto xorgserver xproto ];
- })) // {inherit fontsproto randrproto renderproto xorgserver xproto ;};
-
xf86videosuncg6 = (stdenv.mkDerivation ((if overrides ? xf86videosuncg6 then overrides.xf86videosuncg6 else x: x) {
name = "xf86-video-suncg6-1.1.1";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/xf86-video-suncg6-1.1.1.tar.bz2;
+ url = mirror://xorg/X11R7.7/src/everything/xf86-video-suncg6-1.1.1.tar.bz2;
sha256 = "07w0hm63fiy5l3cpcjsl0ig8z84z9r36xm0cmnpiv3g75dy6q8fi";
};
buildInputs = [pkgconfig fontsproto randrproto renderproto xorgserver xproto ];
@@ -1771,38 +1661,18 @@ let
name = "xf86-video-sunffb-1.2.1";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/xf86-video-sunffb-1.2.1.tar.bz2;
+ url = mirror://xorg/X11R7.7/src/everything/xf86-video-sunffb-1.2.1.tar.bz2;
sha256 = "04byax4sc1fn183vyyq0q11q730k16h2by4ggjky7s36wgv7ldzx";
};
buildInputs = [pkgconfig fontsproto randrproto renderproto xextproto xorgserver xproto ];
})) // {inherit fontsproto randrproto renderproto xextproto xorgserver xproto ;};
- xf86videosunleo = (stdenv.mkDerivation ((if overrides ? xf86videosunleo then overrides.xf86videosunleo else x: x) {
- name = "xf86-video-sunleo-1.2.0";
- builder = ./builder.sh;
- src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/xf86-video-sunleo-1.2.0.tar.bz2;
- sha256 = "01kffjbshmwix2cdb95j0cx2qmrss6yfjj7y5qssw83h36bvw5dk";
- };
- buildInputs = [pkgconfig fontsproto randrproto renderproto xorgserver xproto ];
- })) // {inherit fontsproto randrproto renderproto xorgserver xproto ;};
-
- xf86videosuntcx = (stdenv.mkDerivation ((if overrides ? xf86videosuntcx then overrides.xf86videosuntcx else x: x) {
- name = "xf86-video-suntcx-1.1.1";
- builder = ./builder.sh;
- src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/xf86-video-suntcx-1.1.1.tar.bz2;
- sha256 = "07lqah5sizhwjpzr4vcpwgvbl86fwz4k0c3skp63sq58ng21acal";
- };
- buildInputs = [pkgconfig fontsproto randrproto renderproto xorgserver xproto ];
- })) // {inherit fontsproto randrproto renderproto xorgserver xproto ;};
-
xf86videotdfx = (stdenv.mkDerivation ((if overrides ? xf86videotdfx then overrides.xf86videotdfx else x: x) {
- name = "xf86-video-tdfx-1.4.3";
+ name = "xf86-video-tdfx-1.4.4";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/xf86-video-tdfx-1.4.3.tar.bz2;
- sha256 = "0cxz1rsc87cnf0ba1zfwhk0lhfas92ysc9b13q6x21m31b53bn9s";
+ url = mirror://xorg/X11R7.7/src/everything/xf86-video-tdfx-1.4.4.tar.bz2;
+ sha256 = "124gsi30rj547jjd7gvv7xykfnwlyrxw0gcacamby7pvl3g33fg0";
};
buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ];
})) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
@@ -1811,58 +1681,48 @@ let
name = "xf86-video-tga-1.2.1";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/xf86-video-tga-1.2.1.tar.bz2;
+ url = mirror://xorg/X11R7.7/src/everything/xf86-video-tga-1.2.1.tar.bz2;
sha256 = "0mdqrn02zzkdnmhg4vh9djaawg6b2p82g5qbj66z8b30yr77b93h";
};
buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ];
})) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ;};
xf86videotrident = (stdenv.mkDerivation ((if overrides ? xf86videotrident then overrides.xf86videotrident else x: x) {
- name = "xf86-video-trident-1.3.4";
+ name = "xf86-video-trident-1.3.5";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/xf86-video-trident-1.3.4.tar.bz2;
- sha256 = "1a4wybqwd617mg8lzn1xvi5m0iibimxpvyqsr31mhb7gw0qidrjq";
+ url = mirror://xorg/X11R7.7/src/everything/xf86-video-trident-1.3.5.tar.bz2;
+ sha256 = "02y5pzdp0a1c12jr8gghbrzgbyfbgq67x7kd7n4f323pmf8x1csb";
};
buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ];
})) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ;};
- xf86videotseng = (stdenv.mkDerivation ((if overrides ? xf86videotseng then overrides.xf86videotseng else x: x) {
- name = "xf86-video-tseng-1.2.4";
- builder = ./builder.sh;
- src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/xf86-video-tseng-1.2.4.tar.bz2;
- sha256 = "0gfiwx2p51k3k78qic8y9y0d3d6nhhbmzfvzmw5hx3ba9kxmvpfh";
- };
- buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
- })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
-
xf86videov4l = (stdenv.mkDerivation ((if overrides ? xf86videov4l then overrides.xf86videov4l else x: x) {
name = "xf86-video-v4l-0.2.0";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/xf86-video-v4l-0.2.0.tar.bz2;
+ url = mirror://xorg/X11R7.7/src/everything/xf86-video-v4l-0.2.0.tar.bz2;
sha256 = "0pcjc75hgbih3qvhpsx8d4fljysfk025slxcqyyhr45dzch93zyb";
};
buildInputs = [pkgconfig randrproto videoproto xorgserver xproto ];
})) // {inherit randrproto videoproto xorgserver xproto ;};
xf86videovesa = (stdenv.mkDerivation ((if overrides ? xf86videovesa then overrides.xf86videovesa else x: x) {
- name = "xf86-video-vesa-2.3.0";
+ name = "xf86-video-vesa-2.3.2";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/xf86-video-vesa-2.3.0.tar.bz2;
- sha256 = "0yhdj39d8rfv2n4i52dg7cg1rsrclagn7rjs3pc3jdajjh75mn4f";
+ url = mirror://xorg/individual/driver/xf86-video-vesa-2.3.2.tar.bz2;
+ sha256 = "1qqf97baii1dcsm3y8gqw674j4r8llhkbqsavhyn11iwmvzifjhl";
};
buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ];
})) // {inherit fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ;};
xf86videovmware = (stdenv.mkDerivation ((if overrides ? xf86videovmware then overrides.xf86videovmware else x: x) {
- name = "xf86-video-vmware-11.0.3";
+ name = "xf86-video-vmware-12.0.2";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/xf86-video-vmware-11.0.3.tar.bz2;
- sha256 = "18rqkzr1dvzgdr2khlhhpai69z28rnrfl8jiw9hnahbyv2r7qjmj";
+ url = mirror://xorg/X11R7.7/src/everything/xf86-video-vmware-12.0.2.tar.bz2;
+ sha256 = "0isiwx516gww8hfk3vy7js83yziyjym9mq2zjadyq1a8v5gqf9y8";
};
buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xineramaproto xorgserver xproto ];
})) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xineramaproto xorgserver xproto ;};
@@ -1871,78 +1731,58 @@ let
name = "xf86-video-voodoo-1.2.4";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/xf86-video-voodoo-1.2.4.tar.bz2;
+ url = mirror://xorg/X11R7.7/src/everything/xf86-video-voodoo-1.2.4.tar.bz2;
sha256 = "0ha748yz92yzn6hp2rhin3il8f4j2rs4vkgdvqkagnv1ryxkh0ph";
};
buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto xextproto xf86dgaproto xorgserver xproto ];
})) // {inherit fontsproto libpciaccess randrproto renderproto xextproto xf86dgaproto xorgserver xproto ;};
xf86videowsfb = (stdenv.mkDerivation ((if overrides ? xf86videowsfb then overrides.xf86videowsfb else x: x) {
- name = "xf86-video-wsfb-0.3.0";
+ name = "xf86-video-wsfb-0.4.0";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/xf86-video-wsfb-0.3.0.tar.bz2;
- sha256 = "17lqhir0adcccfkrzz2sr8cpv5vkakk0w7xfc22vv7c6jz9vdgbq";
+ url = mirror://xorg/X11R7.7/src/everything/xf86-video-wsfb-0.4.0.tar.bz2;
+ sha256 = "0hr8397wpd0by1hc47fqqrnaw3qdqd8aqgwgzv38w5k3l3jy6p4p";
};
buildInputs = [pkgconfig xorgserver xproto ];
})) // {inherit xorgserver xproto ;};
- xf86videoxgi = (stdenv.mkDerivation ((if overrides ? xf86videoxgi then overrides.xf86videoxgi else x: x) {
- name = "xf86-video-xgi-1.6.0";
- builder = ./builder.sh;
- src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/xf86-video-xgi-1.6.0.tar.bz2;
- sha256 = "05wl9a51pik5swkzpyhh4y2gf6m3hd458r4142p5w39bbkmhcd78";
- };
- buildInputs = [pkgconfig fontsproto glproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xineramaproto xorgserver xproto ];
- })) // {inherit fontsproto glproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xineramaproto xorgserver xproto ;};
-
- xf86videoxgixp = (stdenv.mkDerivation ((if overrides ? xf86videoxgixp then overrides.xf86videoxgixp else x: x) {
- name = "xf86-video-xgixp-1.8.0";
- builder = ./builder.sh;
- src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/xf86-video-xgixp-1.8.0.tar.bz2;
- sha256 = "06np5s3f3451vmjwpxbn8hb7d4dhsxff2af8qy8jlc24rinnv9is";
- };
- buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ];
- })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
-
xf86vidmodeproto = (stdenv.mkDerivation ((if overrides ? xf86vidmodeproto then overrides.xf86vidmodeproto else x: x) {
name = "xf86vidmodeproto-2.3.1";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/individual/proto/xf86vidmodeproto-2.3.1.tar.bz2;
+ url = mirror://xorg/X11R7.7/src/everything/xf86vidmodeproto-2.3.1.tar.bz2;
sha256 = "0w47d7gfa8zizh2bshdr2rffvbr4jqjv019mdgyh6cmplyd4kna5";
};
buildInputs = [pkgconfig ];
})) // {inherit ;};
xfs = (stdenv.mkDerivation ((if overrides ? xfs then overrides.xfs else x: x) {
- name = "xfs-1.1.1";
+ name = "xfs-1.1.2";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/individual/app/xfs-1.1.1.tar.bz2;
- sha256 = "1yxm87az3xghngcsd50zz6mdgi9j6vm8pw90sjqzshwq7hx7d0qc";
+ url = mirror://xorg/individual/app/xfs-1.1.2.tar.bz2;
+ sha256 = "17g34yq789grnic83cqj5khq0knda1w2rgabhjflsyw9wg663shd";
};
- buildInputs = [pkgconfig libFS libXfont xtrans ];
- })) // {inherit libFS libXfont xtrans ;};
+ buildInputs = [pkgconfig libXfont xproto xtrans ];
+ })) // {inherit libXfont xproto xtrans ;};
xgamma = (stdenv.mkDerivation ((if overrides ? xgamma then overrides.xgamma else x: x) {
- name = "xgamma-1.0.4";
+ name = "xgamma-1.0.5";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/xgamma-1.0.4.tar.bz2;
- sha256 = "05lfx9517why64b3n14drid7vn1d2g2ymg22034vqq50h9437j3x";
+ url = mirror://xorg/X11R7.7/src/everything/xgamma-1.0.5.tar.bz2;
+ sha256 = "0463sawps86jnxn121ramsz4sicy3az5wa5wsq4rqm8dm3za48p3";
};
buildInputs = [pkgconfig libX11 libXxf86vm ];
})) // {inherit libX11 libXxf86vm ;};
xhost = (stdenv.mkDerivation ((if overrides ? xhost then overrides.xhost else x: x) {
- name = "xhost-1.0.4";
+ name = "xhost-1.0.5";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/xhost-1.0.4.tar.bz2;
- sha256 = "15558q9hgmw6vbwc2sgjkfpzw342lxci9w8vcbrmi8mpmrnc00jy";
+ url = mirror://xorg/X11R7.7/src/everything/xhost-1.0.5.tar.bz2;
+ sha256 = "0l483y6wfrjh37j16b41kpi2nc7ss5rvndafpbaylrs87ygx2w18";
};
buildInputs = [pkgconfig libX11 libXau libXmu ];
})) // {inherit libX11 libXau libXmu ;};
@@ -1951,48 +1791,48 @@ let
name = "xineramaproto-1.2.1";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/individual/proto/xineramaproto-1.2.1.tar.bz2;
+ url = mirror://xorg/X11R7.7/src/everything/xineramaproto-1.2.1.tar.bz2;
sha256 = "0ns8abd27x7gbp4r44z3wc5k9zqxxj8zjnazqpcyr4n17nxp8xcp";
};
buildInputs = [pkgconfig ];
})) // {inherit ;};
xinit = (stdenv.mkDerivation ((if overrides ? xinit then overrides.xinit else x: x) {
- name = "xinit-1.3.0";
+ name = "xinit-1.3.2";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/individual/app/xinit-1.3.0.tar.bz2;
- sha256 = "0k70bw6x2zgvmd0l7xyzbps18pbzfz26yzjva1vcz9s239pf6xms";
+ url = mirror://xorg/individual/app/xinit-1.3.2.tar.bz2;
+ sha256 = "0d821rlqwyn2js7bkzicyp894n9gqv1hahxs285pas1zm3d7z1m1";
};
buildInputs = [pkgconfig libX11 ];
})) // {inherit libX11 ;};
xinput = (stdenv.mkDerivation ((if overrides ? xinput then overrides.xinput else x: x) {
- name = "xinput-1.5.3";
+ name = "xinput-1.6.0";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/xinput-1.5.3.tar.bz2;
- sha256 = "0xjwi1sjmvmmzgcvzvz4q8wn0gs7x3aivknx77yfxnndrqqy3bba";
+ url = mirror://xorg/X11R7.7/src/everything/xinput-1.6.0.tar.bz2;
+ sha256 = "0zl4cdgnzh9shz20yn7hz889v4nkbyqwx0nb7dh6arn7abchgc2a";
};
- buildInputs = [pkgconfig inputproto libX11 libXext libXi ];
- })) // {inherit inputproto libX11 libXext libXi ;};
+ buildInputs = [pkgconfig inputproto libX11 libXext libXi libXinerama libXrandr ];
+ })) // {inherit inputproto libX11 libXext libXi libXinerama libXrandr ;};
xkbcomp = (stdenv.mkDerivation ((if overrides ? xkbcomp then overrides.xkbcomp else x: x) {
- name = "xkbcomp-1.2.1";
+ name = "xkbcomp-1.2.4";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/individual/app/xkbcomp-1.2.1.tar.bz2;
- sha256 = "1sv51rliqs6wygrp2hc79a5pgn6ly0bbr4sa8a8x00j4j4kjaqdp";
+ url = mirror://xorg/X11R7.7/src/everything/xkbcomp-1.2.4.tar.bz2;
+ sha256 = "0bas1d2wjiy5zy9d0g92d2p9pwv4aapfbfidi7hxy8ax8jmwkl4i";
};
- buildInputs = [pkgconfig libX11 libxkbfile ];
- })) // {inherit libX11 libxkbfile ;};
+ buildInputs = [pkgconfig libX11 libxkbfile xproto ];
+ })) // {inherit libX11 libxkbfile xproto ;};
xkbevd = (stdenv.mkDerivation ((if overrides ? xkbevd then overrides.xkbevd else x: x) {
- name = "xkbevd-1.1.2";
+ name = "xkbevd-1.1.3";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/xkbevd-1.1.2.tar.bz2;
- sha256 = "0qzbh1wb2fg0wsyfqr4j15443caa1xfcxwdf1gzb4gpbkxn98qnd";
+ url = mirror://xorg/X11R7.7/src/everything/xkbevd-1.1.3.tar.bz2;
+ sha256 = "05h1xcnbalndbrryyqs8wzy9h3wz655vc0ymhlk2q4aik17licjm";
};
buildInputs = [pkgconfig libX11 libxkbfile ];
})) // {inherit libX11 libxkbfile ;};
@@ -2001,28 +1841,38 @@ let
name = "xkbutils-1.0.3";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/xkbutils-1.0.3.tar.bz2;
+ url = mirror://xorg/X11R7.7/src/everything/xkbutils-1.0.3.tar.bz2;
sha256 = "1ga913pw6chssf2016kjyjl6ar2lj83pa497w97ak2kq603sy2g4";
};
buildInputs = [pkgconfig inputproto libX11 libXaw xproto libXt ];
})) // {inherit inputproto libX11 libXaw xproto libXt ;};
+ xkeyboardconfig = (stdenv.mkDerivation ((if overrides ? xkeyboardconfig then overrides.xkeyboardconfig else x: x) {
+ name = "xkeyboard-config-2.6";
+ builder = ./builder.sh;
+ src = fetchurl {
+ url = mirror://xorg/X11R7.7/src/everything/xkeyboard-config-2.6.tar.bz2;
+ sha256 = "1nmb7ma8rqryicc5xqrn2hm5pwp5lkf7nj28bwbf63mz2r0mk892";
+ };
+ buildInputs = [pkgconfig ];
+ })) // {inherit ;};
+
xkill = (stdenv.mkDerivation ((if overrides ? xkill then overrides.xkill else x: x) {
name = "xkill-1.0.3";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/xkill-1.0.3.tar.bz2;
+ url = mirror://xorg/X11R7.7/src/everything/xkill-1.0.3.tar.bz2;
sha256 = "1ac110qbb9a4x1dim3vaghvdk3jc708i2p3f4rmag33458khg0xx";
};
buildInputs = [pkgconfig libX11 libXmu ];
})) // {inherit libX11 libXmu ;};
xlsatoms = (stdenv.mkDerivation ((if overrides ? xlsatoms then overrides.xlsatoms else x: x) {
- name = "xlsatoms-1.1.0";
+ name = "xlsatoms-1.1.1";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/xlsatoms-1.1.0.tar.bz2;
- sha256 = "03fbknvq7rixfgpv5945s7r82jz2xc06a0n09w1p22hl4pd7l0aa";
+ url = mirror://xorg/X11R7.7/src/everything/xlsatoms-1.1.1.tar.bz2;
+ sha256 = "1y9nfl8s7njxbnci8c20j986xixharasgg40vdw92y593j6dk2rv";
};
buildInputs = [pkgconfig libxcb ];
})) // {inherit libxcb ;};
@@ -2031,7 +1881,7 @@ let
name = "xlsclients-1.1.2";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/individual/app/xlsclients-1.1.2.tar.bz2;
+ url = mirror://xorg/X11R7.7/src/everything/xlsclients-1.1.2.tar.bz2;
sha256 = "1l97j15mg4wfzpm81wlpzagfjff7v4fwn7s2z2rpksk3gfcg7r8w";
};
buildInputs = [pkgconfig libxcb ];
@@ -2048,14 +1898,14 @@ let
})) // {inherit libXaw libXt ;};
xmodmap = (stdenv.mkDerivation ((if overrides ? xmodmap then overrides.xmodmap else x: x) {
- name = "xmodmap-1.0.5";
+ name = "xmodmap-1.0.7";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/xmodmap-1.0.5.tar.bz2;
- sha256 = "00il5y6q2m90f62cqzgc0ni5qg3y946gf98jj325kx8cgfhyf7j2";
+ url = mirror://xorg/X11R7.7/src/everything/xmodmap-1.0.7.tar.bz2;
+ sha256 = "1dg47lay4vhrl9mfq3cfc6741a0m2n8wd4ljagd21ix3qklys8pg";
};
- buildInputs = [pkgconfig libX11 ];
- })) // {inherit libX11 ;};
+ buildInputs = [pkgconfig libX11 xproto ];
+ })) // {inherit libX11 xproto ;};
xorgcffiles = (stdenv.mkDerivation ((if overrides ? xorgcffiles then overrides.xorgcffiles else x: x) {
name = "xorg-cf-files-1.0.4";
@@ -2068,81 +1918,91 @@ let
})) // {inherit ;};
xorgdocs = (stdenv.mkDerivation ((if overrides ? xorgdocs then overrides.xorgdocs else x: x) {
- name = "xorg-docs-1.6";
+ name = "xorg-docs-1.7";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/xorg-docs-1.6.tar.bz2;
- sha256 = "0clxy41642jx77mmw5j2fnwa88ms1a7z1z8xpzrgs45bhv21pcpn";
+ url = mirror://xorg/X11R7.7/src/everything/xorg-docs-1.7.tar.bz2;
+ sha256 = "0prphdba6kgr1bxk7r07wxxx6x6pqjw6prr5qclypsb5sf5r3cdr";
};
buildInputs = [pkgconfig ];
})) // {inherit ;};
xorgserver = (stdenv.mkDerivation ((if overrides ? xorgserver then overrides.xorgserver else x: x) {
- name = "xorg-server-1.9.5";
+ name = "xorg-server-1.12.4";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/individual/xserver/xorg-server-1.9.5.tar.bz2;
- sha256 = "1p19w1s840jb1ah6na0c9k23gbh9wwz1il272irqy3jggh4pbirz";
+ url = mirror://xorg/individual/xserver/xorg-server-1.12.4.tar.bz2;
+ sha256 = "1xscr6rf0q15hv3hmm51xhwk0c0rx7a2swkj14ygp8vb60sprh4a";
};
- buildInputs = [pkgconfig bigreqsproto damageproto fixesproto fontsproto inputproto kbproto libdrm openssl libpciaccess perl randrproto renderproto libX11 libXau libXaw xcmiscproto libXdmcp xextproto libXfixes libxkbfile libXmu libXpm xproto libXrender libXres libXt xtrans libXv ];
- })) // {inherit bigreqsproto damageproto fixesproto fontsproto inputproto kbproto libdrm openssl libpciaccess perl randrproto renderproto libX11 libXau libXaw xcmiscproto libXdmcp xextproto libXfixes libxkbfile libXmu libXpm xproto libXrender libXres libXt xtrans libXv ;};
+ 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 ;};
+
+ xorgserver_1_13_0 = (stdenv.mkDerivation ((if overrides ? xorgserver_1_13_0 then overrides.xorgserver_1_13_0 else x: x) {
+ name = "xorg-server-1.13.0";
+ builder = ./builder.sh;
+ src = fetchurl {
+ url = mirror://xorg/individual/xserver/xorg-server-1.13.0.tar.bz2;
+ sha256 = "12pjis236ss3402cg1iy749cylajjp27m3j2jbwd8yh8075r32sl";
+ };
+ buildInputs = [pkgconfig renderproto libdrm openssl libX11 libXau libXaw libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt libXv pixman glproto ];
+ })) // {inherit renderproto libdrm openssl libX11 libXau libXaw libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt libXv pixman glproto ;};
xorgsgmldoctools = (stdenv.mkDerivation ((if overrides ? xorgsgmldoctools then overrides.xorgsgmldoctools else x: x) {
- name = "xorg-sgml-doctools-1.6";
+ name = "xorg-sgml-doctools-1.11";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/xorg-sgml-doctools-1.6.tar.bz2;
- sha256 = "0smfsman09dqqw6h638w44lgp2kng2jwk53sb74i7r53x1v09llq";
+ url = mirror://xorg/X11R7.7/src/everything/xorg-sgml-doctools-1.11.tar.bz2;
+ sha256 = "0k5pffyi5bx8dmfn033cyhgd3gf6viqj3x769fqixifwhbgy2777";
};
buildInputs = [pkgconfig ];
})) // {inherit ;};
xpr = (stdenv.mkDerivation ((if overrides ? xpr then overrides.xpr else x: x) {
- name = "xpr-1.0.3";
+ name = "xpr-1.0.4";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/xpr-1.0.3.tar.bz2;
- sha256 = "0zckkd45lzbikmdn29r12faby8g5prjkacc1z8aw87pq9sqdcy18";
+ url = mirror://xorg/X11R7.7/src/everything/xpr-1.0.4.tar.bz2;
+ sha256 = "1dbcv26w2yand2qy7b3h5rbvw1mdmdd57jw88v53sgdr3vrqvngy";
};
- buildInputs = [pkgconfig libX11 libXmu ];
- })) // {inherit libX11 libXmu ;};
+ buildInputs = [pkgconfig libX11 libXmu xproto ];
+ })) // {inherit libX11 libXmu xproto ;};
xprop = (stdenv.mkDerivation ((if overrides ? xprop then overrides.xprop else x: x) {
- name = "xprop-1.2.0";
+ name = "xprop-1.2.1";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/xprop-1.2.0.tar.bz2;
- sha256 = "173bpq7x2amr77xy28f9m4nfdwr340wj3jw9hkbbznq35c48ql2k";
+ url = mirror://xorg/X11R7.7/src/everything/xprop-1.2.1.tar.bz2;
+ sha256 = "18zi2any13zlb7f34fzyw6lkiwkd6k2scp3b800a1f4rj0c7m407";
};
- buildInputs = [pkgconfig libX11 ];
- })) // {inherit libX11 ;};
+ buildInputs = [pkgconfig libX11 xproto ];
+ })) // {inherit libX11 xproto ;};
xproto = (stdenv.mkDerivation ((if overrides ? xproto then overrides.xproto else x: x) {
- name = "xproto-7.0.20";
+ name = "xproto-7.0.23";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/xproto-7.0.20.tar.bz2;
- sha256 = "0alyxrd8wmdvdqm1v3q4x5brv4prj0gxf59pp9h5wycvgpj7zs1z";
+ url = mirror://xorg/X11R7.7/src/everything/xproto-7.0.23.tar.bz2;
+ sha256 = "17lkmi12f89qvg4jj5spqzwzc24fmsqq68dv6kpy7r7b944lmq5d";
};
buildInputs = [pkgconfig ];
})) // {inherit ;};
xrandr = (stdenv.mkDerivation ((if overrides ? xrandr then overrides.xrandr else x: x) {
- name = "xrandr-1.3.4";
+ name = "xrandr-1.3.5";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/xrandr-1.3.4.tar.bz2;
- sha256 = "1nsadgvn57b9way7v0s4yk2729rwqj1m5fbilmd38lfcws928jjy";
+ url = mirror://xorg/X11R7.7/src/everything/xrandr-1.3.5.tar.bz2;
+ sha256 = "03lq1c1q4w5cf2ijs4b34v008lshibha9zv5lw08xpyhk9xgyn8h";
};
- buildInputs = [pkgconfig libX11 libXrandr libXrender ];
- })) // {inherit libX11 libXrandr libXrender ;};
+ buildInputs = [pkgconfig libX11 xproto libXrandr libXrender ];
+ })) // {inherit libX11 xproto libXrandr libXrender ;};
xrdb = (stdenv.mkDerivation ((if overrides ? xrdb then overrides.xrdb else x: x) {
- name = "xrdb-1.0.8";
+ name = "xrdb-1.0.9";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/individual/app/xrdb-1.0.8.tar.bz2;
- sha256 = "1r2k50qnflj40iandhxhvnrvnhy4qliz5kymlh682455gjmlgn7z";
+ url = mirror://xorg/X11R7.7/src/everything/xrdb-1.0.9.tar.bz2;
+ sha256 = "1dza5a34nj68fzhlgwf18i5bk0n24ig28yihwpjy7vwn57hh2934";
};
buildInputs = [pkgconfig libX11 libXmu ];
})) // {inherit libX11 libXmu ;};
@@ -2151,38 +2011,38 @@ let
name = "xrefresh-1.0.4";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/xrefresh-1.0.4.tar.bz2;
+ url = mirror://xorg/X11R7.7/src/everything/xrefresh-1.0.4.tar.bz2;
sha256 = "0ywxzwa4kmnnmf8idr8ssgcil9xvbhnk155zpsh2i8ay93mh5586";
};
buildInputs = [pkgconfig libX11 ];
})) // {inherit libX11 ;};
xset = (stdenv.mkDerivation ((if overrides ? xset then overrides.xset else x: x) {
- name = "xset-1.2.1";
+ name = "xset-1.2.2";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/xset-1.2.1.tar.bz2;
- sha256 = "18cja8b9xrilpshz0z8bkmpjm6pjb20w71xf41jgm70h4dymz6gc";
+ url = mirror://xorg/X11R7.7/src/everything/xset-1.2.2.tar.bz2;
+ sha256 = "1s61mvscd0h7y6anljarj7nkii6plhs8ndx1fm8b1f1h00a1qdv1";
};
- buildInputs = [pkgconfig libX11 libXext libXmu libXxf86misc ];
- })) // {inherit libX11 libXext libXmu libXxf86misc ;};
+ buildInputs = [pkgconfig libX11 libXext libXmu xproto libXxf86misc ];
+ })) // {inherit libX11 libXext libXmu xproto libXxf86misc ;};
xsetroot = (stdenv.mkDerivation ((if overrides ? xsetroot then overrides.xsetroot else x: x) {
name = "xsetroot-1.1.0";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/xsetroot-1.1.0.tar.bz2;
+ url = mirror://xorg/X11R7.7/src/everything/xsetroot-1.1.0.tar.bz2;
sha256 = "1bazzsf9sy0q2bj4lxvh1kvyrhmpggzb7jg575i15sksksa3xwc8";
};
buildInputs = [pkgconfig libX11 xbitmaps libXcursor libXmu ];
})) // {inherit libX11 xbitmaps libXcursor libXmu ;};
xtrans = (stdenv.mkDerivation ((if overrides ? xtrans then overrides.xtrans else x: x) {
- name = "xtrans-1.2.6";
+ name = "xtrans-1.2.7";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/xtrans-1.2.6.tar.bz2;
- sha256 = "1im5kj6y8j8m9i5lf1c33dkag6sb7g1zmi0niydqrfyx0lvsgyf5";
+ url = mirror://xorg/X11R7.7/src/everything/xtrans-1.2.7.tar.bz2;
+ sha256 = "19p1bw3qyn0ia1znx6q3gx92rr9rl88ylrfijjclm8vhpa8i30bz";
};
buildInputs = [pkgconfig ];
})) // {inherit ;};
@@ -2191,40 +2051,40 @@ let
name = "xvinfo-1.1.1";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/xvinfo-1.1.1.tar.bz2;
+ url = mirror://xorg/X11R7.7/src/everything/xvinfo-1.1.1.tar.bz2;
sha256 = "119rd93d7661ll1rfcdssn78l0b97326smziyr2f5wdwj2hlmiv0";
};
buildInputs = [pkgconfig libX11 libXv ];
})) // {inherit libX11 libXv ;};
xwd = (stdenv.mkDerivation ((if overrides ? xwd then overrides.xwd else x: x) {
- name = "xwd-1.0.4";
+ name = "xwd-1.0.5";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/xwd-1.0.4.tar.bz2;
- sha256 = "07mh72j794hwq5rnqkmdd4wj27mqmdc3da4jkwpva2hsj64wi9mp";
+ url = mirror://xorg/X11R7.7/src/everything/xwd-1.0.5.tar.bz2;
+ sha256 = "0fkg6msy2zg7rda2rpxb7j6vmrdmqmk72xsxnyhz97196ykjnx82";
};
- buildInputs = [pkgconfig libX11 ];
- })) // {inherit libX11 ;};
+ buildInputs = [pkgconfig libX11 xproto ];
+ })) // {inherit libX11 xproto ;};
xwininfo = (stdenv.mkDerivation ((if overrides ? xwininfo then overrides.xwininfo else x: x) {
- name = "xwininfo-1.1.1";
+ name = "xwininfo-1.1.2";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/xwininfo-1.1.1.tar.bz2;
- sha256 = "0g9ll8hv0k5cjz4l5kdv64xzmalf9mpwjzcy8nx6myvh92z5fnk4";
+ url = mirror://xorg/X11R7.7/src/everything/xwininfo-1.1.2.tar.bz2;
+ sha256 = "0fmcr5yl03xw7m8p9h1rk67rrj7gp5x16a547xhmg8idw2f6r9lg";
};
buildInputs = [pkgconfig libX11 libxcb xproto ];
})) // {inherit libX11 libxcb xproto ;};
xwud = (stdenv.mkDerivation ((if overrides ? xwud then overrides.xwud else x: x) {
- name = "xwud-1.0.3";
+ name = "xwud-1.0.4";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/X11R7.6/src/everything/xwud-1.0.3.tar.bz2;
- sha256 = "0hrc6gbipg7cximgkaxixlha9m2fph31dpzhzdfw7g63bkhfmzc8";
+ url = mirror://xorg/X11R7.7/src/everything/xwud-1.0.4.tar.bz2;
+ sha256 = "1ggql6maivah58kwsh3z9x1hvzxm1a8888xx4s78cl77ryfa1cyn";
};
- buildInputs = [pkgconfig libX11 ];
- })) // {inherit libX11 ;};
+ buildInputs = [pkgconfig libX11 xproto ];
+ })) // {inherit libX11 xproto ;};
}; in xorg
diff --git a/pkgs/servers/x11/xorg/extra.list b/pkgs/servers/x11/xorg/extra.list
index 744eb66d84c..f7f139b19c1 100644
--- a/pkgs/servers/x11/xorg/extra.list
+++ b/pkgs/servers/x11/xorg/extra.list
@@ -1,8 +1,7 @@
-mirror://xorg/individual/driver/xf86-video-intel-2.14.901.tar.bz2:xf86videointel_2_14_901
-mirror://xorg/individual/driver/xf86-video-intel-2.17.0.tar.bz2:xf86videointel_2_17_0
-mirror://xorg/individual/lib/pixman-0.20.2.tar.bz2
-mirror://xorg/individual/xcb/xcb-util-0.3.8.tar.bz2
-mirror://xorg/individual/xcb/xcb-util-image-0.3.8.tar.bz2
-mirror://xorg/individual/xcb/xcb-util-keysyms-0.3.8.tar.bz2
+mirror://xorg/individual/lib/pixman-0.26.2.tar.bz2
+mirror://xorg/individual/xcb/xcb-util-0.3.9.tar.bz2
+mirror://xorg/individual/xcb/xcb-util-image-0.3.9.tar.bz2
+mirror://xorg/individual/xcb/xcb-util-keysyms-0.3.9.tar.bz2
mirror://xorg/individual/xcb/xcb-util-renderutil-0.3.8.tar.bz2
-mirror://xorg/individual/xcb/xcb-util-wm-0.3.8.tar.bz2
+mirror://xorg/individual/xcb/xcb-util-wm-0.3.9.tar.bz2
+mirror://xorg/individual/xserver/xorg-server-1.13.0.tar.bz2:xorgserver_1_13_0
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index 89edb571e0f..7b00e5e9043 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -169,7 +169,7 @@ while (<>) {
}
if ($file =~ /XORG_FONT_UCS2ANY/) {
- push @requires, "fontutil";
+ push @requires, "fontutil", "mkfontscale";
$isFont = 1;
}
diff --git a/pkgs/servers/x11/xorg/old.list b/pkgs/servers/x11/xorg/old.list
index 5eacf46d1c3..94fae784488 100644
--- a/pkgs/servers/x11/xorg/old.list
+++ b/pkgs/servers/x11/xorg/old.list
@@ -1,15 +1,15 @@
-mirror://xorg/individual/app/twm-1.0.6.tar.bz2
-mirror://xorg/individual/app/xclock-1.0.5.tar.bz2
-mirror://xorg/individual/app/xdm-1.1.10.tar.bz2
+mirror://xorg/individual/app/twm-1.0.7.tar.bz2
+mirror://xorg/individual/app/xclock-1.0.6.tar.bz2
+mirror://xorg/individual/app/xdm-1.1.11.tar.bz2
mirror://xorg/individual/app/xeyes-1.1.1.tar.bz2
-mirror://xorg/individual/app/xfs-1.1.1.tar.bz2
-mirror://xorg/individual/app/xinit-1.3.0.tar.bz2
+mirror://xorg/individual/app/xfs-1.1.2.tar.bz2
+mirror://xorg/individual/app/xinit-1.3.2.tar.bz2
mirror://xorg/individual/app/xmessage-1.0.3.tar.bz2
mirror://xorg/individual/lib/libXp-1.0.1.tar.bz2
mirror://xorg/individual/lib/libXxf86misc-1.0.3.tar.bz2
mirror://xorg/individual/proto/printproto-1.0.5.tar.bz2
mirror://xorg/individual/proto/xf86miscproto-0.9.3.tar.bz2
mirror://xorg/individual/util/gccmakedep-1.0.2.tar.bz2
-mirror://xorg/individual/util/imake-1.0.4.tar.bz2
-mirror://xorg/individual/util/lndir-1.0.2.tar.bz2
+mirror://xorg/individual/util/imake-1.0.5.tar.bz2
+mirror://xorg/individual/util/lndir-1.0.3.tar.bz2
mirror://xorg/individual/util/xorg-cf-files-1.0.4.tar.bz2
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 46903124568..cf8c4737471 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -8,6 +8,10 @@ let
in
{
+ fontcursormisc = attrs: attrs // {
+ buildInputs = attrs.buildInputs ++ [ xorg.mkfontscale ];
+ };
+
fontmiscmisc = attrs: attrs // {
postInstall =
''
@@ -24,7 +28,7 @@ in
};
mkfontdir = attrs: attrs // {
- preBuild = "substituteInPlace mkfontdir.cpp --replace BINDIR ${xorg.mkfontscale}/bin";
+ preBuild = "substituteInPlace mkfontdir.in --replace @bindir@ ${xorg.mkfontscale}/bin";
};
libxcb = attrs : attrs // {
@@ -33,18 +37,18 @@ in
# I should use: builtins.unsafeDiscardStringContext
buildInputs = [args.pkgconfig args.libxslt xorg.libpthreadstubs /*xorg.python*/
xorg.libXau xorg.xcbproto xorg.libXdmcp ] ++ [ xorg.xproto ];
- buildNativeInputs = [ args.python ];
+ nativeBuildInputs = [ args.python ];
};
xcbproto = attrs : attrs // {
# I only remove python from the original.
buildInputs = [args.pkgconfig /*xorg.python*/ ];
- buildNativeInputs = [ args.python ];
+ nativeBuildInputs = [ args.python ];
};
pixman = attrs : attrs // {
buildInputs = [ args.pkgconfig ];
- buildNativeInputs = [ args.perl ];
+ nativeBuildInputs = [ args.perl ];
};
libpciaccess = attrs : attrs // {
@@ -83,21 +87,19 @@ in
compositeproto = attrs: attrs // {
propagatedBuildInputs = [ xorg.fixesproto ];
};
-
+
libXcomposite = attrs: attrs // {
propagatedBuildInputs = [ xorg.libXfixes ];
};
-
+
libXaw = attrs: attrs // {
propagatedBuildInputs = [ xorg.libXmu ];
};
-
+
libXft = attrs: attrs // {
buildInputs = attrs.buildInputs ++
[ xorg.xproto xorg.libX11 xorg.renderproto ];
- # probably, fontconfig and freetype could be added
- # pkgconfig seems to be nice, too...
- propagatedBuildInputs = [ xorg.libXrender ];
+ propagatedBuildInputs = [ xorg.libXrender args.freetype args.fontconfig ];
preConfigure = setMalloc0ReturnsNullCrossCompiling;
};
@@ -124,13 +126,30 @@ in
buildInputs = attrs.buildInputs ++ [ args.freetype args.fontconfig ];
};
+ xev = attrs: attrs // {
+ buildInputs = attrs.buildInputs ++ [ xorg.libXrender ];
+ };
+
xf86inputevdev = attrs: attrs // {
preBuild = "sed -e '/motion_history_proc/d; /history_size/d;' -i src/*.c";
- buildInputs = attrs.buildInputs ++ [xorg.kbproto xorg.libxkbfile xorg.randrproto];
+ NIX_CFLAGS_COMPILE = "-I${xorg.pixman}/include/pixman-1";
+ buildInputs = attrs.buildInputs ++ [xorg.kbproto xorg.libxkbfile xorg.randrproto xorg.pixman];
installFlags = "sdkdir=\${out}/include/xorg";
};
+ xf86inputkeyboard = attrs: attrs // {
+ NIX_CFLAGS_COMPILE = "-I${xorg.pixman}/include/pixman-1";
+ buildInputs = attrs.buildInputs ++ [xorg.pixman];
+ };
+
+ xf86inputmouse = attrs: attrs // {
+ NIX_CFLAGS_COMPILE = "-I${xorg.pixman}/include/pixman-1";
+ buildInputs = attrs.buildInputs ++ [xorg.pixman];
+ };
+
xf86inputsynaptics = attrs: attrs // {
+ NIX_CFLAGS_COMPILE = "-I${xorg.pixman}/include/pixman-1";
+ buildInputs = attrs.buildInputs ++ [args.mtdev xorg.pixman];
installFlags = "sdkdir=\${out}/include/xorg configdir=\${out}/include/xorg";
};
@@ -139,20 +158,38 @@ in
};
xf86videosis = attrs: attrs // {
+ NIX_CFLAGS_COMPILE = "-I${xorg.pixman}/include/pixman-1";
buildInputs = attrs.buildInputs ++ [xorg.glproto args.mesa];
};
xf86videoati = attrs: attrs // {
- buildInputs = attrs.buildInputs ++ [xorg.glproto args.mesa];
+ NIX_CFLAGS_COMPILE = "-I${xorg.pixman}/include/pixman-1";
+ buildInputs = attrs.buildInputs ++ [xorg.glproto args.mesa xorg.pixman];
};
- xf86videoopenchrome = attrs: attrs // rec {
- name = "xf86-video-openchrome-0.2.905";
- src = args.fetchurl {
- url = "http://openchrome.org/releases/${name}.tar.bz2";
- sha256 = "1llbm020s0fck9chs0906xz7jr4h3whxan4s10ls9046g7xib3qc";
- };
- buildInputs = attrs.buildInputs ++ [xorg.glproto args.mesa xorg.libXext];
+ xf86videocirrus = attrs: attrs // {
+ NIX_CFLAGS_COMPILE = "-I${xorg.pixman}/include/pixman-1";
+ buildInputs = attrs.buildInputs ++ [xorg.pixman];
+ };
+
+ xf86videofbdev = attrs: attrs // {
+ NIX_CFLAGS_COMPILE = "-I${xorg.pixman}/include/pixman-1";
+ buildInputs = attrs.buildInputs ++ [xorg.pixman];
+ };
+
+ xf86videoopenchrome = attrs: attrs // {
+ NIX_CFLAGS_COMPILE = "-I${xorg.pixman}/include/pixman-1";
+ buildInputs = attrs.buildInputs ++ [xorg.pixman xorg.glproto args.mesa];
+ };
+
+ xf86videonv = attrs: attrs // {
+ NIX_CFLAGS_COMPILE = "-I${xorg.pixman}/include/pixman-1";
+ buildInputs = attrs.buildInputs ++ [xorg.pixman];
+ };
+
+ xf86videovesa = attrs: attrs // {
+ NIX_CFLAGS_COMPILE = "-I${xorg.pixman}/include/pixman-1";
+ buildInputs = attrs.buildInputs ++ [xorg.pixman];
};
xdriinfo = attrs: attrs // {
@@ -168,6 +205,7 @@ in
};
xorgserver = attrs: attrs // {
+ configureFlags = "--enable-xcsecurity"; # enable SECURITY extension
patches = [./xorgserver-dri-path.patch ./xorgserver-xkbcomp-path.patch];
buildInputs = attrs.buildInputs ++
[ args.zlib args.udev args.mesa args.dbus.libs
@@ -176,6 +214,7 @@ in
xorg.xineramaproto xorg.xf86dgaproto
xorg.dmxproto xorg.libdmx xorg.xf86vidmodeproto
xorg.recordproto xorg.libXext xorg.pixman xorg.libXfont
+ xorg.damageproto xorg.xcmiscproto xorg.xtrans xorg.bigreqsproto
];
propagatedBuildInputs =
[ xorg.libpciaccess xorg.inputproto xorg.xextproto xorg.randrproto
@@ -188,10 +227,32 @@ in
'';
};
- libSM = attrs: attrs // args.stdenv.lib.optionalAttrs (args.stdenv.system == "i686-darwin") {
- configureFlags = "LIBUUID_CFLAGS='' LIBUUID_LIBS=''";
+ xorgserver_1_13_0 = attrs: attrs // {
+ configureFlags = "--enable-xcsecurity"; # enable SECURITY extension
+ patches = [./xorgserver-dri-path.patch ./xorgserver-xkbcomp-path.patch];
+ buildInputs = attrs.buildInputs ++
+ [ args.zlib args.udev args.mesa args.dbus.libs
+ xorg.xf86bigfontproto xorg.glproto xorg.xf86driproto
+ xorg.compositeproto xorg.scrnsaverproto xorg.resourceproto
+ xorg.xineramaproto xorg.xf86dgaproto
+ xorg.dmxproto xorg.libdmx xorg.xf86vidmodeproto
+ xorg.recordproto xorg.libXext xorg.pixman xorg.libXfont
+ xorg.damageproto xorg.xcmiscproto xorg.xtrans xorg.bigreqsproto
+ ];
+ propagatedBuildInputs =
+ [ xorg.libpciaccess xorg.inputproto xorg.xextproto xorg.randrproto
+ xorg.dri2proto xorg.kbproto
+ ];
+ postInstall =
+ ''
+ rm -fr $out/share/X11/xkb/compiled
+ ln -s /var/tmp $out/share/X11/xkb/compiled
+ '';
};
+ libSM = attrs: attrs
+ // { propagatedBuildInputs = [ xorg.libICE ]; };
+
lndir = attrs: attrs // {
preConfigure = ''
substituteInPlace lndir.c \
@@ -200,11 +261,26 @@ in
};
twm = attrs: attrs // {
- buildNativeInputs = [args.bison args.flex];
+ nativeBuildInputs = [args.bison args.flex];
};
xbacklight = attrs: attrs // {
buildInputs = attrs.buildInputs ++ [xorg.libXrender];
};
+ xinput = attrs: attrs // {
+ buildInputs = attrs.buildInputs ++ [xorg.libXrender];
+ };
+
+ xinit = attrs: attrs // {
+ configureFlags = "--with-xserver=${xorg.xorgserver}/bin/X";
+ propagatedBuildInputs = [ xorg.xauth ];
+ prePatch = ''
+ sed -i 's|^defaultserverargs="|&-logfile \"$HOME/.xorg.log\"|p' startx.cpp
+ '';
+ };
+
+ xwd = attrs: attrs // {
+ buildInputs = attrs.buildInputs ++ [xorg.libXt];
+ };
}
diff --git a/pkgs/servers/x11/xorg/tarballs-7.6.list b/pkgs/servers/x11/xorg/tarballs-7.6.list
deleted file mode 100644
index 613c3107c86..00000000000
--- a/pkgs/servers/x11/xorg/tarballs-7.6.list
+++ /dev/null
@@ -1,199 +0,0 @@
-mirror://xorg/X11R7.6/src/everything/applewmproto-1.4.1.tar.bz2
-mirror://xorg/X11R7.6/src/everything/bdftopcf-1.0.3.tar.bz2
-mirror://xorg/X11R7.6/src/everything/bigreqsproto-1.1.1.tar.bz2
-mirror://xorg/X11R7.6/src/everything/compositeproto-0.4.2.tar.bz2
-mirror://xorg/X11R7.6/src/everything/damageproto-1.2.1.tar.bz2
-mirror://xorg/individual/proto/dri2proto-2.6.tar.bz2
-mirror://xorg/individual/proto/dmxproto-2.3.1.tar.bz2
-mirror://xorg/X11R7.6/src/everything/encodings-1.0.4.tar.bz2
-mirror://xorg/X11R7.6/src/everything/fixesproto-4.1.2.tar.bz2
-mirror://xorg/X11R7.6/src/everything/font-adobe-100dpi-1.0.3.tar.bz2
-mirror://xorg/X11R7.6/src/everything/font-adobe-75dpi-1.0.3.tar.bz2
-mirror://xorg/X11R7.6/src/everything/font-adobe-utopia-100dpi-1.0.4.tar.bz2
-mirror://xorg/X11R7.6/src/everything/font-adobe-utopia-75dpi-1.0.4.tar.bz2
-mirror://xorg/X11R7.6/src/everything/font-adobe-utopia-type1-1.0.4.tar.bz2
-mirror://xorg/X11R7.6/src/everything/font-alias-1.0.3.tar.bz2
-mirror://xorg/X11R7.6/src/everything/font-arabic-misc-1.0.3.tar.bz2
-mirror://xorg/X11R7.6/src/everything/font-bh-100dpi-1.0.3.tar.bz2
-mirror://xorg/X11R7.6/src/everything/font-bh-75dpi-1.0.3.tar.bz2
-mirror://xorg/X11R7.6/src/everything/font-bh-lucidatypewriter-100dpi-1.0.3.tar.bz2
-mirror://xorg/X11R7.6/src/everything/font-bh-lucidatypewriter-75dpi-1.0.3.tar.bz2
-mirror://xorg/X11R7.6/src/everything/font-bh-ttf-1.0.3.tar.bz2
-mirror://xorg/X11R7.6/src/everything/font-bh-type1-1.0.3.tar.bz2
-mirror://xorg/X11R7.6/src/everything/font-bitstream-100dpi-1.0.3.tar.bz2
-mirror://xorg/X11R7.6/src/everything/font-bitstream-75dpi-1.0.3.tar.bz2
-mirror://xorg/X11R7.6/src/everything/font-bitstream-type1-1.0.3.tar.bz2
-mirror://xorg/X11R7.6/src/everything/font-cronyx-cyrillic-1.0.3.tar.bz2
-mirror://xorg/X11R7.6/src/everything/font-cursor-misc-1.0.3.tar.bz2
-mirror://xorg/X11R7.6/src/everything/font-daewoo-misc-1.0.3.tar.bz2
-mirror://xorg/X11R7.6/src/everything/font-dec-misc-1.0.3.tar.bz2
-mirror://xorg/X11R7.6/src/everything/font-ibm-type1-1.0.3.tar.bz2
-mirror://xorg/X11R7.6/src/everything/font-isas-misc-1.0.3.tar.bz2
-mirror://xorg/X11R7.6/src/everything/font-jis-misc-1.0.3.tar.bz2
-mirror://xorg/X11R7.6/src/everything/font-micro-misc-1.0.3.tar.bz2
-mirror://xorg/X11R7.6/src/everything/font-misc-cyrillic-1.0.3.tar.bz2
-mirror://xorg/X11R7.6/src/everything/font-misc-ethiopic-1.0.3.tar.bz2
-mirror://xorg/X11R7.6/src/everything/font-misc-meltho-1.0.3.tar.bz2
-mirror://xorg/X11R7.6/src/everything/font-misc-misc-1.1.2.tar.bz2
-mirror://xorg/X11R7.6/src/everything/font-mutt-misc-1.0.3.tar.bz2
-mirror://xorg/X11R7.6/src/everything/font-schumacher-misc-1.1.2.tar.bz2
-mirror://xorg/X11R7.6/src/everything/font-screen-cyrillic-1.0.4.tar.bz2
-mirror://xorg/X11R7.6/src/everything/font-sony-misc-1.0.3.tar.bz2
-mirror://xorg/X11R7.6/src/everything/fontsproto-2.1.1.tar.bz2
-mirror://xorg/X11R7.6/src/everything/font-sun-misc-1.0.3.tar.bz2
-mirror://xorg/X11R7.6/src/everything/font-util-1.2.0.tar.bz2
-mirror://xorg/X11R7.6/src/everything/font-winitzki-cyrillic-1.0.3.tar.bz2
-mirror://xorg/X11R7.6/src/everything/font-xfree86-type1-1.0.4.tar.bz2
-mirror://xorg/X11R7.6/src/everything/glproto-1.4.12.tar.bz2
-mirror://xorg/X11R7.6/src/everything/iceauth-1.0.4.tar.bz2
-mirror://xorg/X11R7.6/src/everything/inputproto-2.0.1.tar.bz2
-mirror://xorg/X11R7.6/src/everything/kbproto-1.0.5.tar.bz2
-mirror://xorg/X11R7.6/src/everything/libAppleWM-1.4.0.tar.bz2
-mirror://xorg/X11R7.6/src/everything/libdmx-1.1.1.tar.bz2
-mirror://xorg/X11R7.6/src/everything/libfontenc-1.1.0.tar.bz2
-mirror://xorg/X11R7.6/src/everything/libFS-1.0.3.tar.bz2
-mirror://xorg/X11R7.6/src/everything/libICE-1.0.7.tar.bz2
-mirror://xorg/individual/lib/libpciaccess-0.12.1.tar.bz2
-mirror://xorg/X11R7.6/src/everything/libpthread-stubs-0.3.tar.bz2
-mirror://xorg/X11R7.6/src/everything/libSM-1.2.0.tar.bz2
-mirror://xorg/X11R7.6/src/everything/libWindowsWM-1.0.1.tar.bz2
-mirror://xorg/individual/lib/libX11-1.4.1.tar.bz2
-mirror://xorg/X11R7.6/src/everything/libXau-1.0.6.tar.bz2
-mirror://xorg/individual/lib/libXaw-1.0.9.tar.bz2
-mirror://xorg/X11R7.6/src/everything/libxcb-1.7.tar.bz2
-mirror://xorg/X11R7.6/src/everything/libXcomposite-0.4.3.tar.bz2
-mirror://xorg/X11R7.6/src/everything/libXcursor-1.1.11.tar.bz2
-mirror://xorg/X11R7.6/src/everything/libXdamage-1.1.3.tar.bz2
-mirror://xorg/X11R7.6/src/everything/libXdmcp-1.1.0.tar.bz2
-mirror://xorg/X11R7.6/src/everything/libXext-1.2.0.tar.bz2
-mirror://xorg/X11R7.6/src/everything/libXfixes-4.0.5.tar.bz2
-mirror://xorg/X11R7.6/src/everything/libXfont-1.4.3.tar.bz2
-mirror://xorg/X11R7.6/src/everything/libXft-2.2.0.tar.bz2
-mirror://xorg/individual/lib/libXi-1.4.1.tar.bz2
-mirror://xorg/X11R7.6/src/everything/libXinerama-1.1.1.tar.bz2
-mirror://xorg/X11R7.6/src/everything/libxkbfile-1.0.7.tar.bz2
-mirror://xorg/X11R7.6/src/everything/libXmu-1.1.0.tar.bz2
-mirror://xorg/X11R7.6/src/everything/libXpm-3.5.9.tar.bz2
-mirror://xorg/X11R7.6/src/everything/libXrandr-1.3.1.tar.bz2
-mirror://xorg/X11R7.6/src/everything/libXrender-0.9.6.tar.bz2
-mirror://xorg/X11R7.6/src/everything/libXres-1.0.5.tar.bz2
-mirror://xorg/X11R7.6/src/everything/libXScrnSaver-1.2.1.tar.bz2
-mirror://xorg/X11R7.6/src/everything/libXt-1.0.9.tar.bz2
-mirror://xorg/X11R7.6/src/everything/libXtst-1.2.0.tar.bz2
-mirror://xorg/X11R7.6/src/everything/libXv-1.0.6.tar.bz2
-mirror://xorg/X11R7.6/src/everything/libXvMC-1.0.6.tar.bz2
-mirror://xorg/X11R7.6/src/everything/libXxf86dga-1.1.2.tar.bz2
-mirror://xorg/X11R7.6/src/everything/libXxf86vm-1.1.1.tar.bz2
-mirror://xorg/X11R7.6/src/everything/luit-1.1.0.tar.bz2
-mirror://xorg/X11R7.6/src/everything/makedepend-1.0.3.tar.bz2
-mirror://xorg/X11R7.6/src/everything/mkfontdir-1.0.6.tar.bz2
-mirror://xorg/X11R7.6/src/everything/mkfontscale-1.0.8.tar.bz2
-mirror://xorg/X11R7.6/src/everything/randrproto-1.3.2.tar.bz2
-mirror://xorg/X11R7.6/src/everything/recordproto-1.14.1.tar.bz2
-mirror://xorg/X11R7.6/src/everything/renderproto-0.11.1.tar.bz2
-mirror://xorg/X11R7.6/src/everything/resourceproto-1.1.1.tar.bz2
-mirror://xorg/X11R7.6/src/everything/scrnsaverproto-1.2.1.tar.bz2
-mirror://xorg/X11R7.6/src/everything/sessreg-1.0.6.tar.bz2
-mirror://xorg/X11R7.6/src/everything/setxkbmap-1.2.0.tar.bz2
-mirror://xorg/X11R7.6/src/everything/smproxy-1.0.4.tar.bz2
-mirror://xorg/X11R7.6/src/everything/util-macros-1.11.0.tar.bz2
-mirror://xorg/X11R7.6/src/everything/videoproto-2.3.1.tar.bz2
-mirror://xorg/X11R7.6/src/everything/windowswmproto-1.0.4.tar.bz2
-mirror://xorg/individual/app/x11perf-1.5.3.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xauth-1.0.5.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xbacklight-1.1.2.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xbitmaps-1.1.1.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xcb-proto-1.6.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xcmiscproto-1.2.1.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xcmsdb-1.0.3.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xcursorgen-1.0.4.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xcursor-themes-1.0.3.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xdpyinfo-1.2.0.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xdriinfo-1.0.4.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xev-1.1.0.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xextproto-7.1.2.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xf86bigfontproto-1.2.0.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xf86dgaproto-2.1.tar.bz2
-mirror://xorg/individual/proto/xf86driproto-2.1.1.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xf86-input-acecad-1.4.0.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xf86-input-aiptek-1.3.1.tar.bz2
-mirror://xorg/individual/driver/xf86-input-evdev-2.6.0.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xf86-input-joystick-1.5.0.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xf86-input-keyboard-1.5.0.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xf86-input-mouse-1.6.0.tar.bz2
-mirror://xorg/individual/driver/xf86-input-synaptics-1.5.0.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xf86-input-vmmouse-12.6.10.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xf86-input-void-1.3.1.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xf86-video-apm-1.2.3.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xf86-video-ark-0.7.3.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xf86-video-ast-0.91.10.tar.bz2
-mirror://xorg/individual/driver/xf86-video-ati-6.14.3.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xf86-video-chips-1.2.3.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xf86-video-cirrus-1.3.2.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xf86-video-dummy-0.3.4.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xf86-video-fbdev-0.4.2.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xf86-video-geode-2.11.10.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xf86-video-glide-1.1.0.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xf86-video-glint-1.2.5.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xf86-video-i128-1.3.4.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xf86-video-i740-1.3.2.tar.bz2
-mirror://xorg/individual/driver/xf86-video-intel-2.15.0.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xf86-video-mach64-6.8.2.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xf86-video-mga-1.4.13.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xf86-video-neomagic-1.2.5.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xf86-video-newport-0.2.3.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xf86-video-nv-2.1.18.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xf86-video-openchrome-0.2.904.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xf86-video-r128-6.8.1.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xf86-video-rendition-4.2.4.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xf86-video-s3-0.6.3.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xf86-video-s3virge-1.10.4.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xf86-video-savage-2.3.1.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xf86-video-siliconmotion-1.7.4.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xf86-video-sis-0.10.3.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xf86-video-sisusb-0.9.4.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xf86-video-suncg14-1.1.1.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xf86-video-suncg3-1.1.1.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xf86-video-suncg6-1.1.1.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xf86-video-sunffb-1.2.1.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xf86-video-sunleo-1.2.0.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xf86-video-suntcx-1.1.1.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xf86-video-tdfx-1.4.3.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xf86-video-tga-1.2.1.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xf86-video-trident-1.3.4.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xf86-video-tseng-1.2.4.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xf86-video-v4l-0.2.0.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xf86-video-vesa-2.3.0.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xf86-video-vmware-11.0.3.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xf86-video-voodoo-1.2.4.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xf86-video-wsfb-0.3.0.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xf86-video-xgi-1.6.0.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xf86-video-xgixp-1.8.0.tar.bz2
-mirror://xorg/individual/proto/xf86vidmodeproto-2.3.1.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xgamma-1.0.4.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xhost-1.0.4.tar.bz2
-mirror://xorg/individual/proto/xineramaproto-1.2.1.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xinput-1.5.3.tar.bz2
-mirror://xorg/individual/app/xkbcomp-1.2.1.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xkbevd-1.1.2.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xkbutils-1.0.3.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xkill-1.0.3.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xlsatoms-1.1.0.tar.bz2
-mirror://xorg/individual/app/xlsclients-1.1.2.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xmodmap-1.0.5.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xorg-docs-1.6.tar.bz2
-mirror://xorg/individual/xserver/xorg-server-1.9.5.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xorg-sgml-doctools-1.6.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xpr-1.0.3.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xprop-1.2.0.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xproto-7.0.20.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xrandr-1.3.4.tar.bz2
-mirror://xorg/individual/app/xrdb-1.0.8.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xrefresh-1.0.4.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xset-1.2.1.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xsetroot-1.1.0.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xtrans-1.2.6.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xvinfo-1.1.1.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xwd-1.0.4.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xwininfo-1.1.1.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xwud-1.0.3.tar.bz2
diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list
new file mode 100644
index 00000000000..7b361636264
--- /dev/null
+++ b/pkgs/servers/x11/xorg/tarballs-7.7.list
@@ -0,0 +1,184 @@
+mirror://xorg/X11R7.7/src/everything/applewmproto-1.4.2.tar.bz2
+mirror://xorg/X11R7.7/src/everything/bdftopcf-1.0.3.tar.bz2
+mirror://xorg/X11R7.7/src/everything/bigreqsproto-1.1.2.tar.bz2
+mirror://xorg/X11R7.7/src/everything/compositeproto-0.4.2.tar.bz2
+mirror://xorg/X11R7.7/src/everything/damageproto-1.2.1.tar.bz2
+mirror://xorg/X11R7.7/src/everything/dmxproto-2.3.1.tar.bz2
+mirror://xorg/individual/proto/dri2proto-2.8.tar.bz2
+mirror://xorg/X11R7.7/src/everything/encodings-1.0.4.tar.bz2
+mirror://xorg/X11R7.7/src/everything/fixesproto-5.0.tar.bz2
+mirror://xorg/X11R7.7/src/everything/font-adobe-100dpi-1.0.3.tar.bz2
+mirror://xorg/X11R7.7/src/everything/font-adobe-75dpi-1.0.3.tar.bz2
+mirror://xorg/X11R7.7/src/everything/font-adobe-utopia-100dpi-1.0.4.tar.bz2
+mirror://xorg/X11R7.7/src/everything/font-adobe-utopia-75dpi-1.0.4.tar.bz2
+mirror://xorg/X11R7.7/src/everything/font-adobe-utopia-type1-1.0.4.tar.bz2
+mirror://xorg/X11R7.7/src/everything/font-alias-1.0.3.tar.bz2
+mirror://xorg/X11R7.7/src/everything/font-arabic-misc-1.0.3.tar.bz2
+mirror://xorg/X11R7.7/src/everything/font-bh-100dpi-1.0.3.tar.bz2
+mirror://xorg/X11R7.7/src/everything/font-bh-75dpi-1.0.3.tar.bz2
+mirror://xorg/X11R7.7/src/everything/font-bh-lucidatypewriter-100dpi-1.0.3.tar.bz2
+mirror://xorg/X11R7.7/src/everything/font-bh-lucidatypewriter-75dpi-1.0.3.tar.bz2
+mirror://xorg/X11R7.7/src/everything/font-bh-ttf-1.0.3.tar.bz2
+mirror://xorg/X11R7.7/src/everything/font-bh-type1-1.0.3.tar.bz2
+mirror://xorg/X11R7.7/src/everything/font-bitstream-100dpi-1.0.3.tar.bz2
+mirror://xorg/X11R7.7/src/everything/font-bitstream-75dpi-1.0.3.tar.bz2
+mirror://xorg/X11R7.7/src/everything/font-bitstream-type1-1.0.3.tar.bz2
+mirror://xorg/X11R7.7/src/everything/font-cronyx-cyrillic-1.0.3.tar.bz2
+mirror://xorg/X11R7.7/src/everything/font-cursor-misc-1.0.3.tar.bz2
+mirror://xorg/X11R7.7/src/everything/font-daewoo-misc-1.0.3.tar.bz2
+mirror://xorg/X11R7.7/src/everything/font-dec-misc-1.0.3.tar.bz2
+mirror://xorg/X11R7.7/src/everything/font-ibm-type1-1.0.3.tar.bz2
+mirror://xorg/X11R7.7/src/everything/font-isas-misc-1.0.3.tar.bz2
+mirror://xorg/X11R7.7/src/everything/font-jis-misc-1.0.3.tar.bz2
+mirror://xorg/X11R7.7/src/everything/font-micro-misc-1.0.3.tar.bz2
+mirror://xorg/X11R7.7/src/everything/font-misc-cyrillic-1.0.3.tar.bz2
+mirror://xorg/X11R7.7/src/everything/font-misc-ethiopic-1.0.3.tar.bz2
+mirror://xorg/X11R7.7/src/everything/font-misc-meltho-1.0.3.tar.bz2
+mirror://xorg/X11R7.7/src/everything/font-misc-misc-1.1.2.tar.bz2
+mirror://xorg/X11R7.7/src/everything/font-mutt-misc-1.0.3.tar.bz2
+mirror://xorg/X11R7.7/src/everything/font-schumacher-misc-1.1.2.tar.bz2
+mirror://xorg/X11R7.7/src/everything/font-screen-cyrillic-1.0.4.tar.bz2
+mirror://xorg/X11R7.7/src/everything/font-sony-misc-1.0.3.tar.bz2
+mirror://xorg/X11R7.7/src/everything/fontsproto-2.1.2.tar.bz2
+mirror://xorg/X11R7.7/src/everything/font-sun-misc-1.0.3.tar.bz2
+mirror://xorg/X11R7.7/src/everything/font-util-1.3.0.tar.bz2
+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.16.tar.bz2
+mirror://xorg/X11R7.7/src/everything/iceauth-1.0.5.tar.bz2
+mirror://xorg/X11R7.7/src/everything/inputproto-2.2.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/X11R7.7/src/everything/libdmx-1.1.2.tar.bz2
+mirror://xorg/X11R7.7/src/everything/libfontenc-1.1.1.tar.bz2
+mirror://xorg/X11R7.7/src/everything/libFS-1.0.4.tar.bz2
+mirror://xorg/X11R7.7/src/everything/libICE-1.0.8.tar.bz2
+mirror://xorg/X11R7.7/src/everything/libpciaccess-0.13.1.tar.bz2
+mirror://xorg/X11R7.7/src/everything/libpthread-stubs-0.3.tar.bz2
+mirror://xorg/X11R7.7/src/everything/libSM-1.2.1.tar.bz2
+mirror://xorg/X11R7.7/src/everything/libWindowsWM-1.0.1.tar.bz2
+mirror://xorg/X11R7.7/src/everything/libX11-1.5.0.tar.bz2
+mirror://xorg/X11R7.7/src/everything/libXau-1.0.7.tar.bz2
+mirror://xorg/X11R7.7/src/everything/libXaw-1.0.11.tar.bz2
+mirror://xorg/individual/xcb/libxcb-1.9.tar.bz2
+mirror://xorg/X11R7.7/src/everything/libXcomposite-0.4.3.tar.bz2
+mirror://xorg/X11R7.7/src/everything/libXcursor-1.1.13.tar.bz2
+mirror://xorg/X11R7.7/src/everything/libXdamage-1.1.3.tar.bz2
+mirror://xorg/X11R7.7/src/everything/libXdmcp-1.1.1.tar.bz2
+mirror://xorg/X11R7.7/src/everything/libXext-1.3.1.tar.bz2
+mirror://xorg/X11R7.7/src/everything/libXfixes-5.0.tar.bz2
+mirror://xorg/X11R7.7/src/everything/libXfont-1.4.5.tar.bz2
+mirror://xorg/X11R7.7/src/everything/libXft-2.3.1.tar.bz2
+mirror://xorg/X11R7.7/src/everything/libXi-1.6.1.tar.bz2
+mirror://xorg/X11R7.7/src/everything/libXinerama-1.1.2.tar.bz2
+mirror://xorg/X11R7.7/src/everything/libxkbfile-1.0.8.tar.bz2
+mirror://xorg/X11R7.7/src/everything/libXmu-1.1.1.tar.bz2
+mirror://xorg/X11R7.7/src/everything/libXpm-3.5.10.tar.bz2
+mirror://xorg/individual/lib/libXrandr-1.4.0.tar.bz2
+mirror://xorg/X11R7.7/src/everything/libXrender-0.9.7.tar.bz2
+mirror://xorg/X11R7.7/src/everything/libXres-1.0.6.tar.bz2
+mirror://xorg/X11R7.7/src/everything/libXScrnSaver-1.2.2.tar.bz2
+mirror://xorg/X11R7.7/src/everything/libXt-1.1.3.tar.bz2
+mirror://xorg/X11R7.7/src/everything/libXtst-1.2.1.tar.bz2
+mirror://xorg/X11R7.7/src/everything/libXv-1.0.7.tar.bz2
+mirror://xorg/X11R7.7/src/everything/libXvMC-1.0.7.tar.bz2
+mirror://xorg/X11R7.7/src/everything/libXxf86dga-1.1.3.tar.bz2
+mirror://xorg/X11R7.7/src/everything/libXxf86vm-1.1.2.tar.bz2
+mirror://xorg/X11R7.7/src/everything/luit-1.1.1.tar.bz2
+mirror://xorg/X11R7.7/src/everything/makedepend-1.0.4.tar.bz2
+mirror://xorg/X11R7.7/src/everything/mkfontdir-1.0.7.tar.bz2
+mirror://xorg/X11R7.7/src/everything/mkfontscale-1.1.0.tar.bz2
+mirror://xorg/individual/proto/randrproto-1.4.0.tar.bz2
+mirror://xorg/X11R7.7/src/everything/recordproto-1.14.2.tar.bz2
+mirror://xorg/X11R7.7/src/everything/renderproto-0.11.1.tar.bz2
+mirror://xorg/X11R7.7/src/everything/resourceproto-1.2.0.tar.bz2
+mirror://xorg/X11R7.7/src/everything/scrnsaverproto-1.2.2.tar.bz2
+mirror://xorg/X11R7.7/src/everything/sessreg-1.0.7.tar.bz2
+mirror://xorg/X11R7.7/src/everything/setxkbmap-1.3.0.tar.bz2
+mirror://xorg/X11R7.7/src/everything/smproxy-1.0.5.tar.bz2
+mirror://xorg/X11R7.7/src/everything/util-macros-1.17.tar.bz2
+mirror://xorg/X11R7.7/src/everything/videoproto-2.3.1.tar.bz2
+mirror://xorg/X11R7.7/src/everything/windowswmproto-1.0.4.tar.bz2
+mirror://xorg/X11R7.7/src/everything/x11perf-1.5.4.tar.bz2
+mirror://xorg/X11R7.7/src/everything/xauth-1.0.7.tar.bz2
+mirror://xorg/individual/app/xbacklight-1.2.0.tar.bz2
+mirror://xorg/X11R7.7/src/everything/xbitmaps-1.1.1.tar.bz2
+mirror://xorg/individual/xcb/xcb-proto-1.8.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/X11R7.7/src/everything/xcursor-themes-1.0.3.tar.bz2
+mirror://xorg/X11R7.7/src/everything/xdpyinfo-1.3.0.tar.bz2
+mirror://xorg/X11R7.7/src/everything/xdriinfo-1.0.4.tar.bz2
+mirror://xorg/X11R7.7/src/everything/xev-1.2.0.tar.bz2
+mirror://xorg/X11R7.7/src/everything/xextproto-7.2.1.tar.bz2
+mirror://xorg/X11R7.7/src/everything/xf86bigfontproto-1.2.0.tar.bz2
+mirror://xorg/X11R7.7/src/everything/xf86dgaproto-2.1.tar.bz2
+mirror://xorg/X11R7.7/src/everything/xf86driproto-2.1.1.tar.bz2
+mirror://xorg/individual/driver/xf86-input-evdev-2.7.3.tar.bz2
+mirror://xorg/X11R7.7/src/everything/xf86-input-joystick-1.6.1.tar.bz2
+mirror://xorg/X11R7.7/src/everything/xf86-input-keyboard-1.6.1.tar.bz2
+mirror://xorg/X11R7.7/src/everything/xf86-input-mouse-1.7.2.tar.bz2
+mirror://xorg/individual/driver/xf86-input-synaptics-1.6.2.tar.bz2
+mirror://xorg/individual/driver/xf86-input-vmmouse-12.9.0.tar.bz2
+mirror://xorg/X11R7.7/src/everything/xf86-input-void-1.4.0.tar.bz2
+mirror://xorg/X11R7.7/src/everything/xf86-video-ark-0.7.4.tar.bz2
+mirror://xorg/X11R7.7/src/everything/xf86-video-ast-0.93.10.tar.bz2
+mirror://xorg/individual/driver/xf86-video-ati-6.14.4.tar.bz2
+mirror://xorg/individual/driver/xf86-video-cirrus-1.5.1.tar.bz2
+mirror://xorg/X11R7.7/src/everything/xf86-video-dummy-0.3.5.tar.bz2
+mirror://xorg/individual/driver/xf86-video-fbdev-0.4.3.tar.bz2
+mirror://xorg/X11R7.7/src/everything/xf86-video-geode-2.11.13.tar.bz2
+mirror://xorg/X11R7.7/src/everything/xf86-video-glide-1.2.0.tar.bz2
+mirror://xorg/X11R7.7/src/everything/xf86-video-glint-1.2.7.tar.bz2
+mirror://xorg/X11R7.7/src/everything/xf86-video-i128-1.3.5.tar.bz2
+mirror://xorg/individual/driver/xf86-video-intel-2.20.10.tar.bz2
+mirror://xorg/X11R7.7/src/everything/xf86-video-mach64-6.9.1.tar.bz2
+mirror://xorg/X11R7.7/src/everything/xf86-video-mga-1.5.0.tar.bz2
+mirror://xorg/X11R7.7/src/everything/xf86-video-neomagic-1.2.6.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
+mirror://xorg/X11R7.7/src/everything/xf86-video-openchrome-0.2.906.tar.bz2
+mirror://xorg/X11R7.7/src/everything/xf86-video-r128-6.8.2.tar.bz2
+mirror://xorg/X11R7.7/src/everything/xf86-video-savage-2.3.4.tar.bz2
+mirror://xorg/X11R7.7/src/everything/xf86-video-siliconmotion-1.7.6.tar.bz2
+mirror://xorg/X11R7.7/src/everything/xf86-video-sis-0.10.4.tar.bz2
+mirror://xorg/X11R7.7/src/everything/xf86-video-suncg6-1.1.1.tar.bz2
+mirror://xorg/X11R7.7/src/everything/xf86-video-sunffb-1.2.1.tar.bz2
+mirror://xorg/X11R7.7/src/everything/xf86-video-tdfx-1.4.4.tar.bz2
+mirror://xorg/X11R7.7/src/everything/xf86-video-tga-1.2.1.tar.bz2
+mirror://xorg/X11R7.7/src/everything/xf86-video-trident-1.3.5.tar.bz2
+mirror://xorg/X11R7.7/src/everything/xf86-video-v4l-0.2.0.tar.bz2
+mirror://xorg/individual/driver/xf86-video-vesa-2.3.2.tar.bz2
+mirror://xorg/X11R7.7/src/everything/xf86-video-vmware-12.0.2.tar.bz2
+mirror://xorg/X11R7.7/src/everything/xf86-video-voodoo-1.2.4.tar.bz2
+mirror://xorg/X11R7.7/src/everything/xf86-video-wsfb-0.4.0.tar.bz2
+mirror://xorg/X11R7.7/src/everything/xf86vidmodeproto-2.3.1.tar.bz2
+mirror://xorg/X11R7.7/src/everything/xgamma-1.0.5.tar.bz2
+mirror://xorg/X11R7.7/src/everything/xhost-1.0.5.tar.bz2
+mirror://xorg/X11R7.7/src/everything/xineramaproto-1.2.1.tar.bz2
+mirror://xorg/X11R7.7/src/everything/xinput-1.6.0.tar.bz2
+mirror://xorg/X11R7.7/src/everything/xkbcomp-1.2.4.tar.bz2
+mirror://xorg/X11R7.7/src/everything/xkbevd-1.1.3.tar.bz2
+mirror://xorg/X11R7.7/src/everything/xkbutils-1.0.3.tar.bz2
+mirror://xorg/X11R7.7/src/everything/xkeyboard-config-2.6.tar.bz2
+mirror://xorg/X11R7.7/src/everything/xkill-1.0.3.tar.bz2
+mirror://xorg/X11R7.7/src/everything/xlsatoms-1.1.1.tar.bz2
+mirror://xorg/X11R7.7/src/everything/xlsclients-1.1.2.tar.bz2
+mirror://xorg/X11R7.7/src/everything/xmodmap-1.0.7.tar.bz2
+mirror://xorg/X11R7.7/src/everything/xorg-docs-1.7.tar.bz2
+mirror://xorg/individual/xserver/xorg-server-1.12.4.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/X11R7.7/src/everything/xprop-1.2.1.tar.bz2
+mirror://xorg/X11R7.7/src/everything/xproto-7.0.23.tar.bz2
+mirror://xorg/X11R7.7/src/everything/xrandr-1.3.5.tar.bz2
+mirror://xorg/X11R7.7/src/everything/xrdb-1.0.9.tar.bz2
+mirror://xorg/X11R7.7/src/everything/xrefresh-1.0.4.tar.bz2
+mirror://xorg/X11R7.7/src/everything/xset-1.2.2.tar.bz2
+mirror://xorg/X11R7.7/src/everything/xsetroot-1.1.0.tar.bz2
+mirror://xorg/X11R7.7/src/everything/xtrans-1.2.7.tar.bz2
+mirror://xorg/X11R7.7/src/everything/xvinfo-1.1.1.tar.bz2
+mirror://xorg/X11R7.7/src/everything/xwd-1.0.5.tar.bz2
+mirror://xorg/X11R7.7/src/everything/xwininfo-1.1.2.tar.bz2
+mirror://xorg/X11R7.7/src/everything/xwud-1.0.4.tar.bz2
diff --git a/pkgs/servers/x11/xorg/unichrome/default.nix b/pkgs/servers/x11/xorg/unichrome/default.nix
index 5cc26338c95..720ccd10158 100644
--- a/pkgs/servers/x11/xorg/unichrome/default.nix
+++ b/pkgs/servers/x11/xorg/unichrome/default.nix
@@ -1,24 +1,25 @@
{stdenv, fetchgit, pkgconfig, fontsproto, libdrm, libpciaccess, randrproto, renderproto,
videoproto, libX11,
xextproto, xf86driproto, xorgserver, xproto, libXvMC, glproto, mesa, automake,
-autoconf, libtool, libXext, utilmacros}:
+autoconf, libtool, libXext, utilmacros, pixman}:
stdenv.mkDerivation {
name = "xf86-video-unichrome-git";
src = fetchgit {
- url = "git://anongit.freedesktop.org/~libv/xf86-video-unichrome";
+ url = "git://people.freedesktop.org/~libv/xf86-video-unichrome";
md5 = "6e5e0f8ee204af2385a02e502d1ca8f1";
rev = "6260e0fc9f0754d101dda014a8f4b5f76f58e978";
};
buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto
videoproto libX11 libXext xextproto xf86driproto xorgserver xproto libXvMC
- glproto mesa automake autoconf libtool libXext utilmacros ];
+ glproto mesa automake autoconf libtool libXext utilmacros pixman ];
preConfigure = "chmod +x autogen.sh";
prePatch = ''
sed s,/bin/bash,/bin/sh, -i git_version.sh
'';
patches = [ ./configure.patch ];
configureScript = "./autogen.sh";
+ CFLAGS="-I${pixman}/include/pixman-1";
meta = {
homepage = "http://unichrome.sourceforge.net/";
diff --git a/pkgs/servers/x11/xorg/xorgserver-dri-path.patch b/pkgs/servers/x11/xorg/xorgserver-dri-path.patch
index 30e423ba3cb..3a5f061eb9a 100644
--- a/pkgs/servers/x11/xorg/xorgserver-dri-path.patch
+++ b/pkgs/servers/x11/xorg/xorgserver-dri-path.patch
@@ -1,52 +1,19 @@
-diff --git a/glx/glxdri.c b/glx/glxdri.c
-index 6122653..3f5fc2b 100644
---- a/glx/glxdri.c
-+++ b/glx/glxdri.c
-@@ -1042,8 +1042,11 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
- goto handle_error;
- }
+diff -Naur xorg-server-1.12.2-orig/glx/glxdricommon.c xorg-server-1.12.2/glx/glxdricommon.c
+--- xorg-server-1.12.2-orig/glx/glxdricommon.c 2012-05-17 13:09:02.000000000 -0400
++++ xorg-server-1.12.2/glx/glxdricommon.c 2012-07-14 14:57:37.972791909 -0400
+@@ -219,10 +219,14 @@
+ int i;
+ void *driver;
+ char filename[PATH_MAX];
++ char *real_dri_driver_path;
+ const __DRIextension **extensions;
-+ char *real_dri_driver_path = getenv("XORG_DRI_DRIVER_PATH");
++ real_dri_driver_path = getenv("XORG_DRI_DRIVER_PATH");
+ if (!real_dri_driver_path) real_dri_driver_path = dri_driver_path;
+
snprintf(filename, sizeof filename, "%s/%s_dri.so",
- dri_driver_path, driverName);
+ real_dri_driver_path, driverName);
- screen->driver = dlopen(filename, RTLD_LAZY | RTLD_LOCAL);
- if (screen->driver == NULL) {
-diff --git a/glx/glxdri2.c b/glx/glxdri2.c
-index ed7fb4c..135b1c8 100644
---- a/glx/glxdri2.c
-+++ b/glx/glxdri2.c
-@@ -617,8 +617,11 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
-
- __glXInitExtensionEnableBits(screen->glx_enable_bits);
-
-- snprintf(filename, sizeof filename,
-- "%s/%s_dri.so", dri_driver_path, driverName);
-+ char *real_dri_driver_path = getenv("XORG_DRI_DRIVER_PATH");
-+ if (!real_dri_driver_path) real_dri_driver_path = dri_driver_path;
-+
-+ snprintf(filename, sizeof filename, "%s/%s_dri.so",
-+ real_dri_driver_path, driverName);
-
- screen->driver = dlopen(filename, RTLD_LAZY | RTLD_LOCAL);
- if (screen->driver == NULL) {
-diff --git a/glx/glxdriswrast.c b/glx/glxdriswrast.c
-index 44f658f..8922414 100644
---- a/glx/glxdriswrast.c
-+++ b/glx/glxdriswrast.c
-@@ -458,8 +458,11 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
- screen->base.swapInterval = NULL;
- screen->base.pScreen = pScreen;
-
-+ char *real_dri_driver_path = getenv("XORG_DRI_DRIVER_PATH");
-+ if (!real_dri_driver_path) real_dri_driver_path = dri_driver_path;
-+
- snprintf(filename, sizeof filename,
-- "%s/%s_dri.so", dri_driver_path, driverName);
-+ "%s/%s_dri.so", real_dri_driver_path, driverName);
-
- screen->driver = dlopen(filename, RTLD_LAZY | RTLD_LOCAL);
- if (screen->driver == NULL) {
+ driver = dlopen(filename, RTLD_LAZY | RTLD_LOCAL);
+ if (driver == NULL) {
diff --git a/pkgs/servers/x11/xorg/xorgserver-xkbcomp-path.patch b/pkgs/servers/x11/xorg/xorgserver-xkbcomp-path.patch
index 825d09ba1e0..f5196c60c7c 100644
--- a/pkgs/servers/x11/xorg/xorgserver-xkbcomp-path.patch
+++ b/pkgs/servers/x11/xorg/xorgserver-xkbcomp-path.patch
@@ -9,7 +9,7 @@ diff -rc xorg-server-X11R7.2-1.2.0-orig/xkb/xkbInit.c xorg-server-X11R7.2-1.2.0/
}
+ char *xkbBinDir = getenv("XKB_BINDIR");
+ if (xkbBinDir)
-+ XkbBinDirectory = _XkbDupString(xkbBinDir);
++ XkbBinDirectory = Xstrdup(xkbBinDir);
return 0;
}
diff --git a/pkgs/servers/x11/xorg/xorgserver.sh b/pkgs/servers/x11/xorg/xorgserver.sh
deleted file mode 100644
index 0beb09d61a7..00000000000
--- a/pkgs/servers/x11/xorg/xorgserver.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-# There is a dependency somewhere on `-ldl', which Make treats
-# specially by mapping it to /usr/lib/libdl.so. That won't work on
-# NixOS, so force Make to search in our own Glibc.
-export VPATH=$(cat ${NIX_GCC}/nix-support/orig-libc)/lib
-
-preConfigure() {
- unpackFile $mesaSrc
- configureFlags="$configureFlags --with-mesa-source=$(ls -d $(pwd)/Mesa-*)"
-}
\ No newline at end of file
diff --git a/pkgs/servers/xinetd/default.nix b/pkgs/servers/xinetd/default.nix
index 6f752a7194f..c841f8431de 100644
--- a/pkgs/servers/xinetd/default.nix
+++ b/pkgs/servers/xinetd/default.nix
@@ -1,11 +1,11 @@
{ fetchurl, stdenv }:
stdenv.mkDerivation rec {
- name = "xinetd-2.3.14";
-
+ name = "xinetd-2.3.15";
+
src = fetchurl {
url = "http://www.xinetd.org/${name}.tar.gz";
- sha256 = "07xws1ydxrrx4xinvfqkc66diwfjh2apxz33xw4hb6k0gihhw3kn";
+ sha256 = "1qsv1al506x33gh92bqa8w21k7mxqrbsrwmxvkj0amn72420ckmz";
};
meta = {
diff --git a/pkgs/shells/bash-completion/default.nix b/pkgs/shells/bash-completion/default.nix
index d79c9774569..217489f4dc0 100644
--- a/pkgs/shells/bash-completion/default.nix
+++ b/pkgs/shells/bash-completion/default.nix
@@ -1,20 +1,17 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchgit, autoconf, automake }:
-let
- version = "2.0";
-in
stdenv.mkDerivation {
- name = "bash-completion-${version}";
+ name = "bash-completion-2.0-95-gd08b9f2";
- src = fetchurl {
- url = "http://bash-completion.alioth.debian.org/files/bash-completion-${version}.tar.bz2";
- sha256 = "e5a490a4301dfb228361bdca2ffca597958e47dd6056005ef9393a5852af5804";
+ src = fetchgit {
+ url = "http://anonscm.debian.org/git/bash-completion/bash-completion.git";
+ rev = "d08b9f233559b3dced20050ba312b08fe0de53b4";
+ sha256 = "0jybaib2bmpk5qd80y1l6wmfcd0b95cmf1l3hcb0ckpj0pjff0bn";
};
- postInstall = ''
- sed -i "$out/share/bash-completion/bash_completion" \
- -e 's|: .{BASH_COMPLETION_COMPAT_DIR:=.*}|BASH_COMPLETION_COMPAT_DIR="$HOME/.nix-profile/etc/bash_completion.d"|'
- '';
+ buildInputs = [ autoconf automake ];
+
+ preConfigure = "autoreconf -i";
doCheck = true;
@@ -23,6 +20,7 @@ stdenv.mkDerivation {
description = "Programmable completion for the bash shell";
license = "GPL";
+ platforms = stdenv.lib.platforms.unix;
maintainers = [ stdenv.lib.maintainers.simons ];
};
}
diff --git a/pkgs/shells/bash/bash-4.2-patches.nix b/pkgs/shells/bash/bash-4.2-patches.nix
index 8d2a74e95b0..52392f4b32c 100644
--- a/pkgs/shells/bash/bash-4.2-patches.nix
+++ b/pkgs/shells/bash/bash-4.2-patches.nix
@@ -25,4 +25,22 @@ patch: [
(patch "022" "0sswp2c63pclvdwi2hbkwbqf9ysmiw6mmi0qinl2pkgqyyfzdkcx")
(patch "023" "1gzhcmwj0741libjqwln4r4h9k7lskprc4q87hvqgj56y6a17hax")
(patch "024" "1rlrdfk67g8as6pr076ldhjhnkd2c86mb4ci18fjivivsfyjdj4r")
+(patch "025" "05am4w789v630x0a6a9wrxhvrjvs73fjn68i55qdand5sxpn9c0d")
+(patch "026" "1li3sd3hpdxhh257hdwzzn2g18m4ksflx6crqswv9qxwmgx0rsg7")
+(patch "027" "0hpdywvny6vihls2qqlwwxkvps7q710vp6szq117zhgwarr6n7qc")
+(patch "028" "0ypdn590h5f8y7kvk2sk93vcjbh5vrcwsaasvprsm0ds77g2chi0")
+(patch "029" "10gm73rvfhr42v7i70qqc56wl8l459i2frs6ifrcsnmw2w48rc6h")
+(patch "030" "1bmg8iz95jijxp89czwaw9msppgj220233nbrn66s4qsb5k46n8j")
+(patch "031" "1yfrz093hghhlrj8na48dzc8v6ax34mj5i0h6l3bnpvp6i6qrwsm")
+(patch "032" "1vci8xh1r8f59j6d95iljw9i555jm1fm2lssm1ycprdivdivba73")
+(patch "033" "0js38r5gmlyz70zjfw0m2j08h26c3vma2vy8gbsb5pwzss82glgm")
+(patch "034" "1f213qpvqnv2bm79a01r44xjlwk65483cxvw6kgwx28k20rg7h81")
+(patch "035" "1pvqxpm7m1y7ab5srq3s7r095z34nbcr62gz6nb89d1qn1iy9kff")
+(patch "036" "1yma0m9wrk6a15x36libb8a0cz7gmzihv6lvmrrd5i1ar4dklagy")
+(patch "037" "0x0niqv7zwqvz4l8n9nivhk0g0036jh5h3vlkil3095vsgfqqmy7")
+(patch "038" "0mvdpsxxs4bn5zvsm04yfsplhcrv6y0avpwilj5yasr0vwdsijdq")
+(patch "039" "148pkj5s73ym0jhpr8d3z5vfily4chm0am4yms4506ijc0531ygl")
+(patch "040" "0v5a98ybibwsd4iyh18gy0kc51mx8qn9w2wfpjaiycn7yg5gjrdj")
+(patch "041" "1szmm8xv41hvbzgxfwrj6dg85wa7zy3781nnil428rlzpm8ikk05")
+(patch "042" "017kpdqy6v9sgi2a931wyzpix86n9mkalpm6n9cb45v58lgmraps")
]
diff --git a/pkgs/shells/bash/default.nix b/pkgs/shells/bash/default.nix
index 98fe43b0122..0bad70e9eef 100644
--- a/pkgs/shells/bash/default.nix
+++ b/pkgs/shells/bash/default.nix
@@ -44,10 +44,14 @@ stdenv.mkDerivation rec {
configureFlags = baseConfigureFlags;
# Note: Bison is needed because the patches above modify parse.y.
- buildNativeInputs = [bison]
+ nativeBuildInputs = [bison]
++ stdenv.lib.optional (texinfo != null) texinfo
++ stdenv.lib.optional interactive readline;
+ # Bash randomly fails to build because of a recursive invocation to
+ # build `version.h'.
+ enableParallelBuilding = false;
+
postInstall = ''
# Add an `sh' -> `bash' symlink.
ln -s bash "$out/bin/sh"
diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix
index dc9314f6885..662f3307b46 100644
--- a/pkgs/stdenv/adapters.nix
+++ b/pkgs/stdenv/adapters.nix
@@ -3,8 +3,8 @@
compiler. */
{dietlibc, fetchurl, runCommand}:
-
-
+
+
rec {
@@ -14,13 +14,13 @@ rec {
inherit gcc;
};
-
+
# Add some arbitrary packages to buildInputs for specific packages.
# Used to override packages in stdenv like Make. Should not be used
# for other dependencies.
overrideInStdenv = stdenv: pkgs: stdenv //
{ mkDerivation = args: stdenv.mkDerivation (args //
- { buildInputs = (if args ? buildInputs then args.buildInputs else []) ++ pkgs; }
+ { buildInputs = args.buildInputs or [] ++ pkgs; }
);
};
@@ -48,11 +48,11 @@ rec {
# These are added *after* the command-line flags, so we'll
# always optimise for size.
NIX_CFLAGS_COMPILE =
- (if args ? NIX_CFLAGS_COMPILE then args.NIX_CFLAGS_COMPILE else "")
+ args.NIX_CFLAGS_COMPILE or ""
+ " -Os -s -D_BSD_SOURCE=1";
configureFlags =
- (if args ? configureFlags then args.configureFlags else "")
+ args.configureFlags or ""
+ " --disable-shared"; # brrr...
NIX_GCC = import ../build-support/gcc-wrapper {
@@ -65,7 +65,7 @@ rec {
isDietLibC = true;
} // {inherit fetchurl;};
-
+
# Return a modified stdenv that uses klibc to create small
# statically linked binaries.
useKlibc = stdenv: klibc: stdenv //
@@ -75,12 +75,10 @@ rec {
# These are added *after* the command-line flags, so we'll
# always optimise for size.
NIX_CFLAGS_COMPILE =
- (if args ? NIX_CFLAGS_COMPILE then args.NIX_CFLAGS_COMPILE else "")
- + " -Os -s";
+ args.NIX_CFLAGS_COMPILE or "" + " -Os -s";
configureFlags =
- (if args ? configureFlags then args.configureFlags else "")
- + " --disable-shared"; # brrr...
+ args.configureFlags or "" + " --disable-shared"; # brrr...
NIX_GCC = runCommand "klibc-wrapper" {} ''
mkdir -p $out/bin
@@ -94,98 +92,95 @@ rec {
isStatic = true;
} // {inherit fetchurl;};
-
+
# Return a modified stdenv that tries to build statically linked
# binaries.
makeStaticBinaries = stdenv: stdenv //
{ mkDerivation = args: stdenv.mkDerivation (args // {
NIX_CFLAGS_LINK = "-static";
-
configureFlags =
- (if args ? configureFlags then toString args.configureFlags else "")
+ toString args.configureFlags or ""
+ " --disable-shared"; # brrr...
});
isStatic = true;
} // {inherit fetchurl;};
-
+
# Return a modified stdenv that builds static libraries instead of
# shared libraries.
makeStaticLibraries = stdenv: stdenv //
{ mkDerivation = args: stdenv.mkDerivation (args // {
dontDisableStatic = true;
configureFlags =
- (if args ? configureFlags then toString args.configureFlags else "")
+ toString args.configureFlags or ""
+ " --enable-static --disable-shared";
});
} // {inherit fetchurl;};
-
+
# Return a modified stdenv that adds a cross compiler to the
# builds.
makeStdenvCross = stdenv: cross: binutilsCross: gccCross: stdenv //
- { mkDerivation = {name ? "", buildInputs ? [], buildNativeInputs ? [],
- propagatedBuildInputs ? [], propagatedBuildNativeInputs ? [],
- selfBuildNativeInput ? false, ...}@args: let
+ { mkDerivation = {name ? "", buildInputs ? [], nativeBuildInputs ? [],
+ propagatedBuildInputs ? [], propagatedNativeBuildInputs ? [],
+ selfNativeBuildInput ? false, ...}@args: let
# *BuildInputs exists temporarily as another name for
# *HostInputs.
# In nixpkgs, sometimes 'null' gets in as a buildInputs element,
# and we handle that through isAttrs.
- getBuildDrv = drv : if (builtins.isAttrs drv && drv ? buildDrv) then drv.buildDrv else drv;
- getHostDrv = drv : if (builtins.isAttrs drv && drv ? hostDrv) then drv.hostDrv else drv;
- buildNativeInputsDrvs = map (getBuildDrv) buildNativeInputs;
- buildInputsDrvs = map (getHostDrv) buildInputs;
- buildInputsDrvsAsBuildInputs = map (getBuildDrv) buildInputs;
- propagatedBuildInputsDrvs = map (getHostDrv) (propagatedBuildInputs);
- propagatedBuildNativeInputsDrvs = map (getBuildDrv)
- (propagatedBuildNativeInputs);
+ getNativeDrv = drv: drv.nativeDrv or drv;
+ getCrossDrv = drv: drv.crossDrv or drv;
+ nativeBuildInputsDrvs = map getNativeDrv nativeBuildInputs;
+ buildInputsDrvs = map getCrossDrv buildInputs;
+ buildInputsDrvsAsBuildInputs = map getNativeDrv buildInputs;
+ propagatedBuildInputsDrvs = map getCrossDrv propagatedBuildInputs;
+ propagatedNativeBuildInputsDrvs = map getNativeDrv propagatedNativeBuildInputs;
- # The base stdenv already knows that buildNativeInputs and
+ # The base stdenv already knows that nativeBuildInputs and
# buildInputs should be built with the usual gcc-wrapper
# And the same for propagatedBuildInputs.
- buildDrv = stdenv.mkDerivation args;
+ nativeDrv = stdenv.mkDerivation args;
# Temporary expression until the cross_renaming, to handle the
# case of pkgconfig given as buildInput, but to be used as
- # buildNativeInput.
- hostAsBuildDrv = drv: builtins.unsafeDiscardStringContext
- drv.buildDrv.drvPath == builtins.unsafeDiscardStringContext
- drv.hostDrv.drvPath;
+ # nativeBuildInput.
+ hostAsNativeDrv = drv:
+ builtins.unsafeDiscardStringContext drv.nativeDrv.drvPath
+ == builtins.unsafeDiscardStringContext drv.crossDrv.drvPath;
buildInputsNotNull = stdenv.lib.filter
- (drv: builtins.isAttrs drv && drv ? buildDrv) buildInputs;
- nativeInputsFromBuildInputs = stdenv.lib.filter (hostAsBuildDrv) buildInputsNotNull;
+ (drv: builtins.isAttrs drv && drv ? nativeDrv) buildInputs;
+ nativeInputsFromBuildInputs = stdenv.lib.filter hostAsNativeDrv buildInputsNotNull;
- # We should overwrite the input attributes in hostDrv, to overwrite
+ # We should overwrite the input attributes in crossDrv, to overwrite
# the defaults for only-native builds in the base stdenv
- hostDrv = if (cross == null) then buildDrv else
+ crossDrv = if cross == null then nativeDrv else
stdenv.mkDerivation (args // {
name = name + "-" + cross.config;
- buildNativeInputs = buildNativeInputsDrvs
+ nativeBuildInputs = nativeBuildInputsDrvs
++ nativeInputsFromBuildInputs
++ [ gccCross binutilsCross ] ++
- stdenv.lib.optional selfBuildNativeInput buildDrv;
+ stdenv.lib.optional selfNativeBuildInput nativeDrv;
# Cross-linking dynamic libraries, every buildInput should
# be propagated because ld needs the -rpath-link to find
# any library needed to link the program dynamically at
# loader time. ld(1) explains it.
buildInputs = [];
- propagatedBuildInputs = propagatedBuildInputsDrvs ++
- buildInputsDrvs;
- propagatedBuildNativeInputs = propagatedBuildNativeInputsDrvs;
+ propagatedBuildInputs = propagatedBuildInputsDrvs ++ buildInputsDrvs;
+ propagatedNativeBuildInputs = propagatedNativeBuildInputsDrvs;
crossConfig = cross.config;
- } // (if args ? crossAttrs then args.crossAttrs else {}));
- in buildDrv // {
- inherit hostDrv buildDrv;
+ } // args.crossAttrs or {});
+ in nativeDrv // {
+ inherit crossDrv nativeDrv;
};
} // {
inherit cross gccCross binutilsCross;
};
-
+
/* Modify a stdenv so that the specified attributes are added to
every derivation returned by its mkDerivation function.
@@ -202,7 +197,7 @@ rec {
/* Return a modified stdenv that performs the build under $out/.build
instead of in $TMPDIR. Thus, the sources are kept available.
This is useful for things like debugging or generation of
- dynamic analysis reports. */
+ dynamic analysis reports. */
keepBuildTree = stdenv:
addAttrsToDerivation
{ prePhases = "moveBuildDir";
@@ -230,12 +225,12 @@ rec {
\( -name "*.c" -o -name "*.h" -o -name "*.gcno" \) \
| xargs rm -f --
- for i in $(find $out/.build/ -name ".tmp_*.gcno"); do
+ for i in $(find $out/.build/ -name ".tmp_*.gcno"); do
mv "$i" "$(echo $i | sed s/.tmp_//)"
done
'';
- } stdenv;
-
+ } stdenv;
+
/* Return a modified stdenv that builds packages with GCC's coverage
instrumentation. The coverage note files (*.gcno) are stored in
@@ -258,7 +253,7 @@ rec {
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -O0 --coverage"
'';
}
-
+
# Object files instrumented with coverage analysis write
# runtime coverage data to /