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 47729a1b4ba..6cc028c0b0a 100644
--- a/doc/language-support.xml
+++ b/doc/language-support.xml
@@ -196,17 +196,18 @@ twisted = buildPythonPackage {
-
+
+
+ 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 "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 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 SDK. In this case, you agree that use of the SDK constitutes acceptance of the Licensing Agreement from that point onwards.
+
+2.3 You may not use the SDK and may not accept the Licensing 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 Licensing 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 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 SDK or any part of the SDK. Except to the extent required by applicable third party licenses, you may not 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 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.5 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.6 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.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 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, 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 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 the Android platform and/or applications for the Android 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 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 for the Android Platform
+
+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 providing 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 constitute the whole legal agreement between you and Google and govern your use of the SDK (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 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.
+
+April 10, 2009
+
+
+ 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
+
+
+
+
+
+
+
+
+
+ 10
+ Android
+ android
+ Android Support Library
+ support
+ compatibility
+
+
+ 1161015
+ 7c62e542d46ac3bdb89e1b90503d6afae557cf7d
+ support_r10.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
+ 1
+ Google Play Services client library and sample code
+ https://developers.google.com/android/google-play-services/index
+
+
+
+ 363692
+ b1808a7d5f91a3ed42839b950fd254c60e9328f1
+ google_play_services_1013.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
+ 2
+ Google Play Billing sample code
+ http://developer.android.com/guide/market/billing/index.html
+
+
+ 55191
+ 3c84c05c60a9cabb578cebce0515860be7ad23d2
+ market_billing_r02.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
+
+
+
+
+
\ No newline at end of file
diff --git a/pkgs/development/androidenv/addons.nix b/pkgs/development/androidenv/addons.nix
new file mode 100644
index 00000000000..b995b4301e9
--- /dev/null
+++ b/pkgs/development/androidenv/addons.nix
@@ -0,0 +1,186 @@
+
+{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";
+
+ };
+ };
+
+}
+
diff --git a/pkgs/development/androidenv/androidsdk.nix b/pkgs/development/androidenv/androidsdk.nix
new file mode 100644
index 00000000000..b175266ebf7
--- /dev/null
+++ b/pkgs/development/androidenv/androidsdk.nix
@@ -0,0 +1,176 @@
+{ 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
+, freetype, fontconfig, gtk, atk
+}:
+{platformVersions, useGoogleAPIs}:
+
+stdenv.mkDerivation {
+ name = "android-sdk-20.0.3";
+
+ src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux")
+ then fetchurl {
+ url = http://dl.google.com/android/android-sdk_r20.0.3-linux.tgz;
+ sha256 = "0xfb41xsjaf7n6b9gsrxm24jwg2fi1hzn73y69rlqm55bw1vxhc1";
+ }
+ else if stdenv.system == "x86_64-darwin" then fetchurl {
+ url = http://dl.google.com/android/android-sdk_r20.0.3-macosx.zip;
+ sha256 = "0eecaa04950d5c540f36ab4183a4cbaef3ae6a7434467bfc32febaeb796a8ff2";
+ }
+ 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-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
+
+ # 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-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
+ ''}
+
+ 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/androidenv/build-app.nix b/pkgs/development/androidenv/build-app.nix
new file mode 100644
index 00000000000..571cd2be623
--- /dev/null
+++ b/pkgs/development/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/androidenv/default.nix b/pkgs/development/androidenv/default.nix
new file mode 100644
index 00000000000..d2769799df1
--- /dev/null
+++ b/pkgs/development/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;
+
+ 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/androidenv/emulate-app.nix b/pkgs/development/androidenv/emulate-app.nix
new file mode 100644
index 00000000000..3cbe5723806
--- /dev/null
+++ b/pkgs/development/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/androidenv/generate-addons.sh b/pkgs/development/androidenv/generate-addons.sh
new file mode 100755
index 00000000000..9b2cf34eabc
--- /dev/null
+++ b/pkgs/development/androidenv/generate-addons.sh
@@ -0,0 +1,3 @@
+#!/bin/sh -e
+
+xsltproc generate-addons.xsl addon.xml > addons.nix
diff --git a/pkgs/development/androidenv/generate-addons.xsl b/pkgs/development/androidenv/generate-addons.xsl
new file mode 100644
index 00000000000..0100b980a4e
--- /dev/null
+++ b/pkgs/development/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/androidenv/generate-platforms.sh b/pkgs/development/androidenv/generate-platforms.sh
new file mode 100755
index 00000000000..983d8bde87b
--- /dev/null
+++ b/pkgs/development/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/androidenv/generate-platforms.xsl b/pkgs/development/androidenv/generate-platforms.xsl
new file mode 100644
index 00000000000..1802ae63efe
--- /dev/null
+++ b/pkgs/development/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/androidenv/generate-sysimages.sh b/pkgs/development/androidenv/generate-sysimages.sh
new file mode 100755
index 00000000000..dc28c27f45f
--- /dev/null
+++ b/pkgs/development/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/androidenv/generate-sysimages.xsl b/pkgs/development/androidenv/generate-sysimages.xsl
new file mode 100644
index 00000000000..1224ebbd4e8
--- /dev/null
+++ b/pkgs/development/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/androidenv/platform-tools.nix b/pkgs/development/androidenv/platform-tools.nix
new file mode 100644
index 00000000000..bc4ceb4e39d
--- /dev/null
+++ b/pkgs/development/androidenv/platform-tools.nix
@@ -0,0 +1,41 @@
+{stdenv, stdenv_32bit, fetchurl, unzip, zlib, ncurses}:
+
+stdenv.mkDerivation {
+ name = "android-platform-tools-r15_rc7";
+ src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux")
+ then fetchurl {
+ url = https://dl-ssl.google.com/android/repository/platform-tools_r15_rc7-linux.zip;
+ sha1 = "444e12ba413341282cd810d2e4bdb49975c95758";
+ }
+ else if stdenv.system == "x86_64-darwin" then fetchurl {
+ url = https://dl-ssl.google.com/android/repository/platform-tools_r15_rc7-macosx.zip;
+ sha1 = "974eac4afbe404278fcda8f8cd39b55c82be012d";
+ }
+ 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/androidenv/platforms-linux.nix b/pkgs/development/androidenv/platforms-linux.nix
new file mode 100644
index 00000000000..c2cff1b62a2
--- /dev/null
+++ b/pkgs/development/androidenv/platforms-linux.nix
@@ -0,0 +1,198 @@
+
+{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";
+
+ };
+ };
+
+}
+
diff --git a/pkgs/development/androidenv/platforms-macosx.nix b/pkgs/development/androidenv/platforms-macosx.nix
new file mode 100644
index 00000000000..355740c4200
--- /dev/null
+++ b/pkgs/development/androidenv/platforms-macosx.nix
@@ -0,0 +1,198 @@
+
+{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";
+
+ };
+ };
+
+}
+
diff --git a/pkgs/development/androidenv/repository-7.xml b/pkgs/development/androidenv/repository-7.xml
new file mode 100644
index 00000000000..695be1d90a7
--- /dev/null
+++ b/pkgs/development/androidenv/repository-7.xml
@@ -0,0 +1,928 @@
+
+
+
+
+ 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 "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 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 SDK. In this case, you agree that use of the SDK constitutes acceptance of the Licensing Agreement from that point onwards.
+
+2.3 You may not use the SDK and may not accept the Licensing 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 Licensing 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 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 SDK or any part of the SDK. Except to the extent required by applicable third party licenses, you may not 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 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.5 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.6 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.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 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, 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 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 the Android platform and/or applications for the Android 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 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 for the Android Platform
+
+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 providing 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 constitute the whole legal agreement between you and Google and govern your use of the SDK (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 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.
+
+April 10, 2009
+
+
+
+
+
+ 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
+
+
+
+
+
+
+
+
+ 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
+
+
+
+
+
+
+
+
+
+ 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
+
+
+
+
+
+
+
+
+
+ 14
+
+
+
+ 11159472
+ 6028258d8f2fba14d8b40c3cf507afa0289aaa13
+ platform-tools_r14-windows.zip
+
+
+ 10985068
+ 6e2bc329c9485eb383172cbc2cde8b0c0cd1843f
+ platform-tools_r14-linux.zip
+
+
+ 11342461
+ 4a015090c6a209fc33972acdbc65745e0b3c08b9
+ platform-tools_r14-macosx.zip
+
+
+
+
+
+
+
+ 15
+ 9
+
+
+
+ 11170483
+ 853afdf5f63aaac61dcfd016a7acb930b6dac377
+ platform-tools_r15_rc9-windows.zip
+
+
+ 10996592
+ c1aa2bc0d6f7dac7e292151ee77752bbfb10d1c5
+ platform-tools_r15_rc9-linux.zip
+
+
+ 11345162
+ 22ac626ec3526b606d358193a16df10179f1d4f5
+ platform-tools_r15_rc9-macosx.zip
+
+
+
+
+
+
+
+
+
+ 20
+ 0
+ 3
+
+
+ 12
+
+
+
+ 90272048
+ 54fb94168e631e211910f88aa40c532205730dd4
+ tools_r20.0.3-windows.zip
+
+
+ 82723559
+ 09bc633b406ae81981e3a0db19426acbb01ef219
+ tools_r20.0.3-linux.zip
+
+
+ 58197071
+ 09cee5ff3226277a6f0c07dcd29cba4ffc2e1da4
+ tools_r20.0.3-macosx.zip
+
+
+
+
+
+
+
+ 21
+ 9
+
+
+ 15
+ 9
+
+
+
+ 98865433
+ a1379cef10f33e74061f6935fd74922b0351addb
+ tools_r21_rc9-windows.zip
+
+
+ 91377922
+ dde958cb26276b632a02ca6d530506c09ce4e086
+ tools_r21_rc9-linux.zip
+
+
+ 65655657
+ 43803f6179707ca6bd4a37e129bcf022ebda0043
+ tools_r21_rc9-macosx.zip
+
+
+
+
+
+
+
+
+ 3
+ 16
+
+
+ 164244602
+ 3168152f52f5edc0c85523c875c96e7431ab4545
+ docs-16_r03.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
+
+
+
+
\ No newline at end of file
diff --git a/pkgs/development/androidenv/support.nix b/pkgs/development/androidenv/support.nix
new file mode 100644
index 00000000000..0c69bf37107
--- /dev/null
+++ b/pkgs/development/androidenv/support.nix
@@ -0,0 +1,17 @@
+{stdenv, fetchurl, unzip}:
+
+stdenv.mkDerivation {
+ name = "android-support";
+ src = fetchurl {
+ url = https://dl-ssl.google.com/android/repository/support_r10.zip;
+ sha1 = "7c62e542d46ac3bdb89e1b90503d6afae557cf7d";
+ };
+
+ buildCommand = ''
+ mkdir -p $out
+ cd $out
+ unzip $src
+ '';
+
+ buildInputs = [ unzip ];
+}
\ No newline at end of file
diff --git a/pkgs/development/androidenv/sysimages.nix b/pkgs/development/androidenv/sysimages.nix
new file mode 100644
index 00000000000..3add0c41444
--- /dev/null
+++ b/pkgs/development/androidenv/sysimages.nix
@@ -0,0 +1,42 @@
+
+{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";
+ };
+ };
+
+}
+
diff --git a/pkgs/development/compilers/Agda-executable/default.nix b/pkgs/development/compilers/Agda-executable/default.nix
index 823a412459f..f9acff43ef7 100644
--- a/pkgs/development/compilers/Agda-executable/default.nix
+++ b/pkgs/development/compilers/Agda-executable/default.nix
@@ -7,6 +7,7 @@ cabal.mkDerivation (self: {
isLibrary = false;
isExecutable = true;
buildDepends = [ Agda ];
+ jailbreak = true;
meta = {
homepage = "http://wiki.portal.chalmers.se/agda/";
description = "Command-line program for type-checking and compiling Agda programs";
diff --git a/pkgs/development/compilers/ccl/default.nix b/pkgs/development/compilers/ccl/default.nix
index 54628fa509d..7678c066df2 100644
--- a/pkgs/development/compilers/ccl/default.nix
+++ b/pkgs/development/compilers/ccl/default.nix
@@ -5,13 +5,13 @@ let
];
in
rec {
- version = "1.4";
+ version = "1.8";
name = "ccl-${version}";
/* There are also MacOS and FreeBSD and Windows versions */
src = a.fetchurl {
url = "ftp://ftp.clozure.com/pub/release/${version}/${name}-linuxx86.tar.gz";
- sha256 = "1z4x4kxjj2ligb2vfrx5mjww20gdkxbvgw1ax5l9c8ha802bfyg8";
+ sha256 = "1dgg6a8i2csa6xidsq66hbw7zx62gm2178hpkp88yyzgxylszp01";
};
inherit buildInputs;
diff --git a/pkgs/development/compilers/ecl/default.nix b/pkgs/development/compilers/ecl/default.nix
index c08fc3ee585..fb801b6b844 100644
--- a/pkgs/development/compilers/ecl/default.nix
+++ b/pkgs/development/compilers/ecl/default.nix
@@ -3,16 +3,23 @@
, ...} @ x:
builderDefsPackage (a :
let
- s = import ./src-for-default.nix;
propagatedBuildInputs = with a; [
gmp mpfr
];
buildInputs = [ gmp libffi mpfr ];
in
rec {
- src = a.fetchUrlFromSrcInfo s;
+ mainVersion = "12.7";
+ revision = "1";
+ version = "${mainVersion}.${revision}";
+
+ name = "ecl-${version}";
+
+ src = a.fetchurl {
+ url = "mirror://sourceforge/project/ecls/ecls/${mainVersion}/${name}.tar.gz";
+ sha256 = "0k8ww142g3bybvvnlijqsbidl8clbs1pb4ympk2ds07z5swvy2ap";
+ };
- inherit (s) name;
inherit buildInputs propagatedBuildInputs;
configureFlags = [
"--enable-threads"
diff --git a/pkgs/development/compilers/ecl/src-for-default.nix b/pkgs/development/compilers/ecl/src-for-default.nix
deleted file mode 100644
index 1baaf4bbec4..00000000000
--- a/pkgs/development/compilers/ecl/src-for-default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-rec {
- version="12.2.1";
- name="ecl-12.2.1";
- hash="dbb3f83c27f3d2565ca22c1c6b4ab497bbfdd0d0a7b09dee76338f378621f091";
- url="http://downloads.sourceforge.net/project/ecls/ecls/12.2/ecl-${version}.tgz";
- advertisedUrl="http://downloads.sourceforge.net/project/ecls/ecls/12.2/ecl-12.2.1.tgz";
-}
diff --git a/pkgs/development/compilers/ecl/src-info-for-default.nix b/pkgs/development/compilers/ecl/src-info-for-default.nix
deleted file mode 100644
index 1f5f3270f53..00000000000
--- a/pkgs/development/compilers/ecl/src-info-for-default.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- downloadPage = "http://sourceforge.net/projects/ecls/files/";
- baseName = "ecl";
- choiceCommand = "head -1 | sed -e 's@/download@@;'\"$skipRedirectSF\"";
- sourceRegexp = ".*[.](tar.gz|tgz|tbz2|tar.bz2)";
-}
diff --git a/pkgs/development/compilers/edk2/default.nix b/pkgs/development/compilers/edk2/default.nix
index 53517e853e9..9633967da6a 100644
--- a/pkgs/development/compilers/edk2/default.nix
+++ b/pkgs/development/compilers/edk2/default.nix
@@ -14,8 +14,8 @@ edk2 = stdenv.mkDerivation {
src = fetchsvn {
url = https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2;
- rev = "13094";
- sha256 = "1qfpal0y4sas204ydg3pg3634dm25q1vr94mpgmbdh6yqcviah3h";
+ rev = "13783";
+ sha256 = "18sx0nwcnghij7737xdnmgwk5vm0ax4p0v3ybggqqs8cdhzfghil";
};
buildInputs = [ libuuid pythonFull ];
diff --git a/pkgs/development/compilers/fpc/lazarus.nix b/pkgs/development/compilers/fpc/lazarus.nix
index 4278f2c664f..e2a9fd128e9 100644
--- a/pkgs/development/compilers/fpc/lazarus.nix
+++ b/pkgs/development/compilers/fpc/lazarus.nix
@@ -1,9 +1,10 @@
args : with args;
rec {
- version = "0.9.30.4";
+ version = "1.0.2";
+ versionSuffix = "-0";
src = fetchurl {
- url = "mirror://sourceforge/lazarus/Lazarus%20Zip%20_%20GZip/Lazarus%20${version}/lazarus-${version}-src.tar.bz2";
- sha256 = "0kndg4xf32r6w5hb58d9qvzkyiphhysgnhs2rd9bmlc8sy8c7zmv";
+ url = "mirror://sourceforge/lazarus/Lazarus%20Zip%20_%20GZip/Lazarus%20${version}/lazarus-${version}${versionSuffix}.tar.gz";
+ sha256 = "17a94wig8b4yrkq42wng4qbal7n77axkynwh78wday5whsp7div8";
};
buildInputs = [fpc gtk glib libXi inputproto
diff --git a/pkgs/development/compilers/gcc/4.3/default.nix b/pkgs/development/compilers/gcc/4.3/default.nix
index 57fc0f805c4..4b9fd616d84 100644
--- a/pkgs/development/compilers/gcc/4.3/default.nix
+++ b/pkgs/development/compilers/gcc/4.3/default.nix
@@ -80,7 +80,8 @@ stdenv.mkDerivation ({
++ optional noSysDirs ./no-sys-dirs.patch
++ optional (noSysDirs && langFortran) ./no-sys-dirs-fortran.patch
++ optional langJava ./java-jvgenmain-link.patch
- ++ optional langVhdl ./ghdl-ortho-cflags.patch;
+ ++ optional langVhdl ./ghdl-ortho-cflags.patch
+ ++ optional langVhdl ./ghdl-runtime-o2.patch;
inherit noSysDirs profiledCompiler staticCompiler crossStageStatic
binutilsCross libcCross;
diff --git a/pkgs/development/compilers/gcc/4.3/ghdl-runtime-o2.patch b/pkgs/development/compilers/gcc/4.3/ghdl-runtime-o2.patch
new file mode 100644
index 00000000000..ddc455143c0
--- /dev/null
+++ b/pkgs/development/compilers/gcc/4.3/ghdl-runtime-o2.patch
@@ -0,0 +1,13 @@
+diff --git a/gcc/vhdl/Makefile.in b/gcc/vhdl/Makefile.in
+index b8d2ed0..0e8bd55 100644
+--- a/gcc/vhdl/Makefile.in
++++ b/gcc/vhdl/Makefile.in
+@@ -682,7 +682,7 @@ install-ghdllib: ghdllib grt.lst $(STD93_SRCS) $(STD87_SRCS) \
+ PDIR=`pwd` && cd $(DESTDIR)$(VHDL_LIB_DIR) && \
+ $(MAKE) -f $$PDIR/Makefile REL_DIR=../../.. \
+ LIBSRC_DIR="src" LIB93_DIR=lib/v93 LIB87_DIR=lib/v87 \
+- ANALYZE="$$PDIR/../ghdl -a --GHDL1=$$PDIR/../ghdl1 --ieee=none" \
++ ANALYZE="$$PDIR/../ghdl -a --GHDL1=$$PDIR/../ghdl1 --ieee=none -Wc,-O2" \
+ std.v93 std.v87 ieee.v93 ieee.v87 synopsys.v93 synopsys.v87 mentor.v93
+ # Copy std_standard (this is done after libraries, since they remove dirs).
+ $(INSTALL_DATA) std87_standard.o \
diff --git a/pkgs/development/compilers/gcc/4.7/default.nix b/pkgs/development/compilers/gcc/4.7/default.nix
index 02733d04203..0267c1def5d 100644
--- a/pkgs/development/compilers/gcc/4.7/default.nix
+++ b/pkgs/development/compilers/gcc/4.7/default.nix
@@ -49,7 +49,7 @@ assert langGo -> langCC;
with stdenv.lib;
with builtins;
-let version = "4.7.1";
+let version = "4.7.2";
# Whether building a cross-compiler for GNU/Hurd.
crossGNU = cross != null && cross.config == "i586-pc-gnu";
@@ -60,8 +60,7 @@ let version = "4.7.1";
# The GNAT Makefiles did not pay attention to CFLAGS_FOR_TARGET for its
# target libraries and tools.
++ optional langAda ./gnat-cflags.patch
- ++ optional langFortran ./gfortran-driving.patch
- ++ optional (stdenv.isGNU || crossGNU) ./hurd-sigrtmin.patch;
+ ++ optional langFortran ./gfortran-driving.patch;
javaEcj = fetchurl {
# The `$(top_srcdir)/ecj.jar' file is automatically picked up at
@@ -164,7 +163,7 @@ stdenv.mkDerivation ({
src = fetchurl {
url = "mirror://gnu/gcc/gcc-${version}/gcc-${version}.tar.bz2";
- sha256 = "0vs0v89zzgkngkw2p8kdynyk7j8ky4wf6zyrg3rsschpl1pky28n";
+ sha256 = "115h03hil99ljig8lkrq4qk426awmzh0g99wrrggxf8g07bq74la";
};
inherit patches;
@@ -206,8 +205,6 @@ stdenv.mkDerivation ({
echo "setting \`NATIVE_SYSTEM_HEADER_DIR' and \`STANDARD_INCLUDE_DIR' to \`${libc}/include'..."
sed -i "${gnu_h}" \
-es'|#define STANDARD_INCLUDE_DIR.*$|#define STANDARD_INCLUDE_DIR "${libc}/include"|g'
- sed -i gcc/config/t-gnu \
- -es'|NATIVE_SYSTEM_HEADER_DIR.*$|NATIVE_SYSTEM_HEADER_DIR = ${libc}/include|g'
''
else if cross != null || stdenv.gcc.libc != null then
# On NixOS, use the right path to the dynamic linker instead of
@@ -308,7 +305,6 @@ stdenv.mkDerivation ({
else "install";
crossAttrs = {
- patches = patches ++ [ ./hurd-sigrtmin.patch ];
AR = "${stdenv.cross.config}-ar";
LD = "${stdenv.cross.config}-ld";
CC = "${stdenv.cross.config}-gcc";
diff --git a/pkgs/development/compilers/gcc/4.7/hurd-sigrtmin.patch b/pkgs/development/compilers/gcc/4.7/hurd-sigrtmin.patch
deleted file mode 100644
index dc8236d2b99..00000000000
--- a/pkgs/development/compilers/gcc/4.7/hurd-sigrtmin.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-GNU libc on GNU/Hurd doesn't define `__SIGRTMIN'.
-From .
-
---- a/libgcc/generic-morestack.c 2011-12-19 21:14:52.000000000 +0100
-+++ b/libgcc/generic-morestack.c 2011-12-19 21:15:35.000000000 +0100
-@@ -507,7 +507,7 @@
- sigemptyset (&__morestack_initial_sp.mask);
-
- sigfillset (&__morestack_fullmask);
--#ifdef __GLIBC__
-+#if defined(__GLIBC__) && defined(__SIGRTMIN)
- /* In glibc, the first two real time signals are used by the NPTL
- threading library. By taking them out of the set of signals, we
- avoiding copying the signal mask in pthread_sigmask. More
diff --git a/pkgs/development/compilers/ghc/6.10.1-binary.nix b/pkgs/development/compilers/ghc/6.10.1-binary.nix
index 5a15cc0dff7..353a4176ea4 100644
--- a/pkgs/development/compilers/ghc/6.10.1-binary.nix
+++ b/pkgs/development/compilers/ghc/6.10.1-binary.nix
@@ -1,11 +1,5 @@
{stdenv, fetchurl, perl, libedit, ncurses, gmp}:
-let
- supportedPlatforms = ["i686-darwin" "x86_64-linux" "i686-linux"];
-in
-
-assert stdenv.lib.elem stdenv.system supportedPlatforms;
-
stdenv.mkDerivation rec {
version = "6.10.1";
@@ -104,5 +98,5 @@ stdenv.mkDerivation rec {
[ $(./main) == "yes" ]
'';
- meta.platforms = supportedPlatforms;
+ meta.platforms = ["i686-darwin" "x86_64-linux" "i686-linux"];
}
diff --git a/pkgs/development/compilers/ghc/6.10.2-binary.nix b/pkgs/development/compilers/ghc/6.10.2-binary.nix
index 616c9de7ede..02f1db354a1 100644
--- a/pkgs/development/compilers/ghc/6.10.2-binary.nix
+++ b/pkgs/development/compilers/ghc/6.10.2-binary.nix
@@ -1,11 +1,5 @@
{stdenv, fetchurl, perl, libedit, ncurses, gmp}:
-let
- supportedPlatforms = ["x86_64-linux" "i686-linux"];
-in
-
-assert stdenv.lib.elem stdenv.system supportedPlatforms;
-
stdenv.mkDerivation rec {
version = "6.10.2";
@@ -103,5 +97,5 @@ stdenv.mkDerivation rec {
[ $(./main) == "yes" ]
'';
- meta.platforms = supportedPlatforms;
+ meta.platforms = ["x86_64-linux" "i686-linux"];
}
diff --git a/pkgs/development/compilers/ghc/6.12.1-binary.nix b/pkgs/development/compilers/ghc/6.12.1-binary.nix
index a84b75d705b..23486b5f4fa 100644
--- a/pkgs/development/compilers/ghc/6.12.1-binary.nix
+++ b/pkgs/development/compilers/ghc/6.12.1-binary.nix
@@ -1,11 +1,5 @@
{stdenv, fetchurl, perl, ncurses, gmp}:
-let
- supportedPlatforms = ["x86_64-linux" "i686-linux"];
-in
-
-assert stdenv.lib.elem stdenv.system supportedPlatforms;
-
stdenv.mkDerivation rec {
version = "6.12.1";
@@ -105,5 +99,5 @@ stdenv.mkDerivation rec {
[ $(./main) == "yes" ]
'';
- meta.platforms = supportedPlatforms;
+ meta.platforms = ["x86_64-linux" "i686-linux"];
}
diff --git a/pkgs/development/compilers/ghc/6.4.2-binary.nix b/pkgs/development/compilers/ghc/6.4.2-binary.nix
index 2ed6f2be4fe..1a5bf059e9f 100644
--- a/pkgs/development/compilers/ghc/6.4.2-binary.nix
+++ b/pkgs/development/compilers/ghc/6.4.2-binary.nix
@@ -1,11 +1,5 @@
{stdenv, fetchurl, perl, readline, ncurses, gmp}:
-let
- supportedPlatforms = ["i686-darwin" "x86_64-linux" "i686-linux"];
-in
-
-assert stdenv.lib.elem stdenv.system supportedPlatforms;
-
stdenv.mkDerivation {
name = if stdenv.system == "i686-darwin" then "ghc-6.6.1-binary" else "ghc-6.4.2-binary";
@@ -68,5 +62,5 @@ stdenv.mkDerivation {
'' else "";
- meta.platforms = supportedPlatforms;
+ meta.platforms = ["i686-darwin" "x86_64-linux" "i686-linux"];
}
diff --git a/pkgs/development/compilers/ghc/7.0.4-binary.nix b/pkgs/development/compilers/ghc/7.0.4-binary.nix
index 0baf9718f85..0bfc81a17a4 100644
--- a/pkgs/development/compilers/ghc/7.0.4-binary.nix
+++ b/pkgs/development/compilers/ghc/7.0.4-binary.nix
@@ -1,11 +1,5 @@
{stdenv, fetchurl, perl, ncurses, gmp}:
-let
- supportedPlatforms = ["x86_64-linux" "i686-linux" "i686-darwin" "x86_64-darwin"];
-in
-
-assert stdenv.lib.elem stdenv.system supportedPlatforms;
-
stdenv.mkDerivation rec {
version = "7.0.4";
@@ -93,5 +87,5 @@ stdenv.mkDerivation rec {
[ $(./main) == "yes" ]
'';
- meta.platforms = supportedPlatforms;
+ meta.platforms = ["x86_64-linux" "i686-linux" "i686-darwin" "x86_64-darwin"];
}
diff --git a/pkgs/development/compilers/ghc/7.4.2-binary.nix b/pkgs/development/compilers/ghc/7.4.2-binary.nix
new file mode 100644
index 00000000000..e0a8fee4b66
--- /dev/null
+++ b/pkgs/development/compilers/ghc/7.4.2-binary.nix
@@ -0,0 +1,91 @@
+{stdenv, fetchurl, perl, ncurses, gmp}:
+
+stdenv.mkDerivation rec {
+ version = "7.4.2";
+
+ name = "ghc-${version}-binary";
+
+ src =
+ if stdenv.system == "i686-linux" then
+ fetchurl {
+ url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-i386-unknown-linux.tar.bz2";
+ sha256 = "0gny7knhss0w0d9r6jm1gghrcb8kqjvj94bb7hxf9syrk4fxlcxi";
+ }
+ else if stdenv.system == "x86_64-linux" then
+ fetchurl {
+ url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-unknown-linux.tar.bz2";
+ sha256 = "043jabd0lh6n1zlqhysngbpvlsdznsa2mmsj08jyqgahw9sjb5ns";
+ }
+ else if stdenv.system == "i686-darwin" then
+ fetchurl {
+ url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-i386-apple-darwin.tar.bz2";
+ sha256 = "1vrbs3pzki37hzym1f1nh07lrqh066z3ypvm81fwlikfsvk4djc0";
+ }
+ else if stdenv.system == "x86_64-darwin" then
+ fetchurl {
+ url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-apple-darwin.tar.bz2";
+ sha256 = "1imzqc0slpg0r6p40n5a9m18cbcm0m86z8dgyhfxcckksw54mzwf";
+ }
+ else throw "cannot bootstrap GHC on this platform";
+
+ buildInputs = [perl];
+
+ postUnpack =
+ # Strip is harmful, see also below. It's important that this happens
+ # first. The GHC Cabal build system makes use of strip by default and
+ # has hardcoded paths to /usr/bin/strip in many places. We replace
+ # those below, making them point to our dummy script.
+ ''
+ mkdir "$TMP/bin"
+ for i in strip; do
+ echo '#!/bin/sh' >> "$TMP/bin/$i"
+ chmod +x "$TMP/bin/$i"
+ PATH="$TMP/bin:$PATH"
+ done
+ '' +
+ # We have to patch the GMP paths for the integer-gmp package.
+ ''
+ find . -name integer-gmp.buildinfo \
+ -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${gmp}/lib@" {} \;
+ '' +
+ # On Linux, use patchelf to modify the executables so that they can
+ # find editline/gmp.
+ (if stdenv.isLinux then ''
+ find . -type f -perm +100 \
+ -exec patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
+ --set-rpath "${ncurses}/lib:${gmp}/lib" {} \;
+ sed -i "s|/usr/bin/perl|perl\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2
+ sed -i "s|/usr/bin/gcc|gcc\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2
+ for prog in ld ar gcc strip ranlib; do
+ find . -name "setup-config" -exec sed -i "s@/usr/bin/$prog@$(type -p $prog)@g" {} \;
+ done
+ '' else "");
+
+ configurePhase = ''
+ ./configure --prefix=$out --with-gmp-libraries=${gmp}/lib --with-gmp-includes=${gmp}/include
+ '';
+
+ # Stripping combined with patchelf breaks the executables (they die
+ # with a segfault or the kernel even refuses the execve). (NIXPKGS-85)
+ dontStrip = true;
+
+ # No building is necessary, but calling make without flags ironically
+ # calls install-strip ...
+ buildPhase = "true";
+
+ postInstall =
+ ''
+ # Sanity check, can ghc create executables?
+ cd $TMP
+ mkdir test-ghc; cd test-ghc
+ cat > main.hs << EOF
+ module Main where
+ main = putStrLn "yes"
+ EOF
+ $out/bin/ghc --make main.hs
+ echo compilation ok
+ [ $(./main) == "yes" ]
+ '';
+
+ meta.platforms = ["x86_64-linux" "i686-linux" "i686-darwin" "x86_64-darwin"];
+}
diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index 566e7d80f86..67f2b4f5c7e 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -1,13 +1,12 @@
{ stdenv, fetchurl, ghc, perl, gmp, ncurses }:
stdenv.mkDerivation rec {
- version = "7.5.20120714";
-
+ version = "7.7.20121106";
name = "ghc-${version}";
src = fetchurl {
url = "http://haskell.org/ghc/dist/current/dist/${name}-src.tar.bz2";
- sha256 = "02jicyqqr18yixf970f1rfrn64bm528aig6s9566galji063p6ah";
+ sha256 = "1n3xj8arkzfvs3q1ymxsnbzs23ndsp8pl67sqirl837pkgcmq263";
};
buildInputs = [ ghc perl gmp ncurses ];
@@ -17,6 +16,7 @@ stdenv.mkDerivation rec {
buildMK = ''
libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib"
libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp}/include"
+ DYNAMIC_BY_DEFAULT = NO
'';
preConfigure = ''
diff --git a/pkgs/development/compilers/ghc/with-packages.nix b/pkgs/development/compilers/ghc/with-packages.nix
index 9313c54b908..f4f567f30b3 100644
--- a/pkgs/development/compilers/ghc/with-packages.nix
+++ b/pkgs/development/compilers/ghc/with-packages.nix
@@ -59,6 +59,11 @@ stdenv.mkDerivation rec {
ln -s $f $out/bin
echo -n .
done
+ for f in "$currentPath/etc/bash_completion.d/"*; do
+ mkdir -p $out/etc/bash_completion.d
+ ln -s $f $out/etc/bash_completion.d/
+ echo -n .
+ done
for f in "$currentPkgDir/"*.conf; do
ln -s $f $linkedPkgDir
echo -n .
diff --git a/pkgs/development/compilers/ghc/wrapper.nix b/pkgs/development/compilers/ghc/wrapper.nix
index 4407f16c9e0..bc28fdc9131 100644
--- a/pkgs/development/compilers/ghc/wrapper.nix
+++ b/pkgs/development/compilers/ghc/wrapper.nix
@@ -1,6 +1,10 @@
-{stdenv, ghc, makeWrapper, coreutils}:
+{ stdenv, ghc, makeWrapper, coreutils }:
-stdenv.mkDerivation {
+let
+ ghc761OrLater = !stdenv.lib.versionOlder ghc.version "7.6.1";
+ packageDBFlag = if ghc761OrLater then "-package-db" else "-package-conf";
+in
+stdenv.mkDerivation ({
name = "ghc-${ghc.version}-wrapper";
buildInputs = [makeWrapper];
@@ -15,10 +19,10 @@ stdenv.mkDerivation {
makeWrapper $ghc/bin/$prg $out/bin/$prg --add-flags "\$($out/bin/ghc-get-packages.sh ${ghc.version} \"\$(dirname \$0)\")"
done
for prg in runghc runhaskell; do
- makeWrapper $ghc/bin/$prg $out/bin/$prg --add-flags "\$($out/bin/ghc-get-packages.sh ${ghc.version} \"\$(dirname \$0)\" \" -package-conf --ghc-arg=\")"
+ makeWrapper $ghc/bin/$prg $out/bin/$prg --add-flags "\$($out/bin/ghc-get-packages.sh ${ghc.version} \"\$(dirname \$0)\" \" ${packageDBFlag} --ghc-arg=\")"
done
for prg in ghc-pkg ghc-pkg-${ghc.version}; do
- makeWrapper $ghc/bin/$prg $out/bin/$prg --add-flags "\$($out/bin/ghc-get-packages.sh ${ghc.version} \"\$(dirname \$0)\" --package-conf=)"
+ makeWrapper $ghc/bin/$prg $out/bin/$prg --add-flags "\$($out/bin/ghc-get-packages.sh ${ghc.version} \"\$(dirname \$0)\" -${packageDBFlag}=)"
done
for prg in hp2ps hpc hasktags hsc2hs; do
test -x $ghc/bin/$prg && ln -s $ghc/bin/$prg $out/bin/$prg
@@ -29,7 +33,7 @@ stdenv.mkDerivation {
for arg in \$($out/bin/ghc-get-packages.sh ${ghc.version} \"\$(dirname \$0)\"); do
case "\$arg" in
- -package-conf) ;;
+ ${packageDBFlag}) ;;
*)
CANONICALIZED="\$(${stdenv.lib.optionalString stdenv.isDarwin "${coreutils}/bin/"}readlink -f "\$arg")"
GHC_PACKAGES_HASH["\$CANONICALIZED"]= ;;
@@ -50,4 +54,4 @@ stdenv.mkDerivation {
inherit ghc;
inherit (ghc) meta;
ghcVersion = ghc.version;
-}
+} // (stdenv.lib.optionalAttrs ghc761OrLater { preFixup = "sed -i -e 's|-package-conf|${packageDBFlag}|' $out/bin/ghc-get-packages.sh"; }))
diff --git a/pkgs/development/compilers/go/default.nix b/pkgs/development/compilers/go/default.nix
index 1d9765539bf..60ea7981931 100644
--- a/pkgs/development/compilers/go/default.nix
+++ b/pkgs/development/compilers/go/default.nix
@@ -7,11 +7,11 @@ let
in
stdenv.mkDerivation {
- name = "go-1.0.2";
+ name = "go-1.0.3";
src = fetchurl {
- url = http://go.googlecode.com/files/go1.0.2.src.tar.gz;
- sha256 = "1a4mpkb3bd9dwp0r3fgrfcyk5lgw0f0cfrbskg2lrhc7a12zpz3h";
+ url = http://go.googlecode.com/files/go1.0.3.src.tar.gz;
+ sha256 = "1pz31az3icwqfqfy3avms05jnqr0qrbrx9yqsclkdwbjs4rkbfkz";
};
buildInputs = [ bison glibc bash makeWrapper ];
diff --git a/pkgs/development/compilers/gprolog/default.nix b/pkgs/development/compilers/gprolog/default.nix
index f7a64da7309..bbc273365b9 100644
--- a/pkgs/development/compilers/gprolog/default.nix
+++ b/pkgs/development/compilers/gprolog/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "gprolog-1.4.0";
+ name = "gprolog-1.4.1";
src = fetchurl {
urls = [
"mirror://gnu/gprolog/${name}.tar.gz"
"http://www.gprolog.org/${name}.tar.gz"
];
- sha256 = "1l66k66ryfw1nfi2wlvsyq4cmr6mm95f4iay1fxdk3hdk3fjyjl0";
+ sha256 = "e2819ed9c426138d3191e4d97ae5121cf97e132eecf102400f87f1e372a05b72";
};
configurePhase = "cd src ;"
@@ -17,16 +17,17 @@ stdenv.mkDerivation rec {
+ "--with-examples-dir=$out/share/doc/${name}/examples "
+ "--with-doc-dir=$out/share/doc/${name}";
- doCheck = true;
-
postInstall = ''
ln -vs "$out/share/${name}/include" "$out/include"
+ ln -vs "$out/share/${name}/lib" "$out/lib"
'';
- meta = {
- homepage = http://www.gnu.org/software/gprolog/;
+ doCheck = true;
+ meta = {
+ homepage = "http://www.gnu.org/software/gprolog/";
description = "GNU Prolog, a free Prolog compiler with constraint solving over finite domains";
+ license = "GPLv2+";
longDescription = ''
GNU Prolog is a free Prolog compiler with constraint solving
@@ -52,8 +53,6 @@ stdenv.mkDerivation rec {
declarativity of logic programming.
'';
- license = "GPLv2+";
-
maintainers = [ stdenv.lib.maintainers.simons ];
platforms = stdenv.lib.platforms.gnu;
};
diff --git a/pkgs/development/compilers/haxe/default.nix b/pkgs/development/compilers/haxe/default.nix
index 8018b478e80..817e4573df2 100644
--- a/pkgs/development/compilers/haxe/default.nix
+++ b/pkgs/development/compilers/haxe/default.nix
@@ -1,141 +1,37 @@
-args: with args;
+{ stdenv, fetchsvn, ocaml, zlib, neko }:
-let
+stdenv.mkDerivation {
+ name = "haxe-2.10";
- src_haxe_swflib = {
- # REGION AUTO UPDATE: { name = "haxe_swflib"; type="cvs"; cvsRoot = ":pserver:anonymous@cvs.motion-twin.com:/cvsroot"; module = "ocaml/swflib"; groups = "haxe_group"; }
- src = sourceFromHead "haxe_swflib-F_10-43-46.tar.gz"
- (fetchurl { url = "http://mawercer.de/~nix/repos/haxe_swflib-F_10-43-46.tar.gz"; sha256 = "a63de75e48bf500ef0e8ef715d178d32f0ef113ded8c21bbca698a8cc70e7b58"; });
- # END
- }.src;
+ buildInputs = [ocaml zlib neko];
- src_haxe_extc = {
- # REGION AUTO UPDATE: { name = "haxe_extc"; type="cvs"; cvsRoot = ":pserver:anonymous@cvs.motion-twin.com:/cvsroot"; module = "ocaml/extc"; groups = "haxe_group"; }
- src = sourceFromHead "haxe_extc-F_10-43-47.tar.gz"
- (fetchurl { url = "http://mawercer.de/~nix/repos/haxe_extc-F_10-43-47.tar.gz"; sha256 = "d0a9980527d62ac6cfe27925ddb0964d334ec382f813fdfb8bd6c59fbbede730"; });
- # END
- }.src;
-
- src_haxe_extlib_dev = {
- # REGION AUTO UPDATE: { name = "haxe_extlib_dev"; type="cvs"; cvsRoot = ":pserver:anonymous@cvs.motion-twin.com:/cvsroot"; module = "ocaml/extlib-dev"; groups = "haxe_group"; }
- src = sourceFromHead "haxe_extlib_dev-F_10-43-48.tar.gz"
- (fetchurl { url = "http://mawercer.de/~nix/repos/haxe_extlib_dev-F_10-43-48.tar.gz"; sha256 = "6b9037230e2615dd5e22f4e7f4165c84f2816bc526957683afc945394fcdf67e"; });
- # END
- }.src;
-
- src_haxe_xml_light = {
- # REGION AUTO UPDATE: { name = "haxe_xml_light"; type="cvs"; cvsRoot = ":pserver:anonymous@cvs.motion-twin.com:/cvsroot"; module = "ocaml/xml-light"; groups = "haxe_group"; }
- src = sourceFromHead "haxe_xml_light-F_10-43-48.tar.gz"
- (fetchurl { url = "http://mawercer.de/~nix/repos/haxe_xml_light-F_10-43-48.tar.gz"; sha256 = "be29d9e22ad0dbcb3d447cbbc14907aff5f89bb562b8db369659d299f3a5b44f"; });
- # END
- }.src;
-
- src_haxe_neko_include = {
- # REGION AUTO UPDATE: { name = "haxe_neko_include"; type="cvs"; cvsRoot = ":pserver:anonymous@cvs.motion-twin.com:/cvsroot"; module = "neko/libs/include/ocaml"; groups = "haxe_group"; }
- src = sourceFromHead "haxe_neko_include-F_10-43-49.tar.gz"
- (fetchurl { url = "http://mawercer.de/~nix/repos/haxe_neko_include-F_10-43-49.tar.gz"; sha256 = "e49efc1b348fa6e0f6fb40079a2d380b947d9ebda31843bc293f3cc77f8453db"; });
- # END
- }.src;
-
- src_haxe = {
- # REGION AUTO UPDATE: { name="haxe-read-only"; type="svn"; url="http://haxe.googlecode.com/svn/trunk"; groups = "haxe_group"; }
- src = sourceFromHead "haxe-read-only-3220.tar.gz"
- (fetchurl { url = "http://mawercer.de/~nix/repos/haxe-read-only-3220.tar.gz"; sha256 = "2b6702dca95d0829e539cea07b8224e3848e584a425ce8f8e0984a7a2bf7b1f8"; });
- # END
- }.src;
-
-
- # the HaXe compiler
- haxe = stdenv.mkDerivation {
- name = "haxe-cvs";
-
- buildInputs = [ocaml zlib makeWrapper];
-
- src = src_haxe;
-
- inherit zlib;
-
- buildPhase = ''
- set -x
- mkdir -p ocaml/{swflib,extc,extlib-dev,xml-light} neko/libs
-
- # strange setup. install.ml seems to co the same repo again into haxe directory!
- mkdir haxe
- tar xfz $src --strip-components=1 -C haxe
-
- t(){ tar xfz $1 -C $2 --strip-components=2; }
- t ${src_haxe_swflib} ocaml/swflib
- t ${src_haxe_extc} ocaml/extc
- t ${src_haxe_extlib_dev} ocaml/extlib-dev
- t ${src_haxe_xml_light} ocaml/xml-light
- t ${src_haxe_neko_include} neko/libs
-
- sed -e '/download();/d' \
- -e "s@/usr/lib/@''${zlib}/lib/@g" \
- doc/install.ml > install.ml
-
- ocaml install.ml
- '';
-
- # probably rpath should be set properly
- installPhase = ''
- mkdir -p $out/lib/haxe
- cp -r bin $out/bin
- wrapProgram "$out/bin/haxe" \
- --set "LD_LIBRARY_PATH" $zlib/lib \
- --set HAXE_LIBRARY_PATH "''${HAXE_LIBRARY_PATH}''${HAXE_LIBRARY_PATH:-:}:$out/lib/haxe/std:."
- cp -r std $out/lib/haxe/
- '';
-
- meta = {
- description = "programming language targeting JavaScript, Flash, NekVM, PHP, C++";
- homepage = http://haxe.org;
- license = ["GPLv2" "BSD2" /*?*/ ]; # -> docs/license.txt
- maintainers = [args.lib.maintainers.marcweber];
- platforms = args.lib.platforms.linux;
- };
- };
-
- # build a tool found in std/tools/${name} source directory
- # the .hxml files contain a recipe to cerate a binary.
- tool = { name, description }: stdenv.mkDerivation {
-
- inherit name;
-
- src = src_haxe;
-
- buildPhase = ''
- cd std/tools/${name};
- haxe *.hxml
- mkdir -p $out/bin
- mv ${name} $out/bin/
- '';
-
- buildInputs = [haxe neko];
-
- dontStrip=1;
-
- installPhase=":";
-
- meta = {
- inherit description;
- homepage = http://haxe.org;
- # license = "?"; TODO
- maintainers = [args.lib.maintainers.marcweber];
- platforms = args.lib.platforms.linux;
- };
-
- };
-
-in
-
-{
-
- inherit haxe;
-
- haxelib = tool {
- name = "haxelib";
- description = "haxelib is a HaXe library management tool similar to easyinstall or ruby gems";
+ src = fetchsvn {
+ url = "http://haxe.googlecode.com/svn/tags/v2-10";
+ sha256 = "dbd3c655e4136eb68a165ef83b96bfc1f0f2eb9ec8729603b19bcd717a61a679";
};
+ prePatch = ''
+ sed -i -e 's|com.class_path <- \[|&"'"$out/lib/haxe/std/"'";|' main.ml
+ '';
+
+ postBuild = ''
+ find std/tools -name '*.n' -delete
+ rm std/tools/haxedoc/haxedoc std/tools/haxelib/haxelib
+ '';
+
+ installPhase = ''
+ install -vd "$out/bin" "$out/lib/haxe/std"
+ install -vt "$out/bin" haxe haxelib haxedoc
+ cp -vr std "$out/lib/haxe"
+ '';
+
+ dontStrip = true;
+
+ meta = {
+ description = "Programming language targeting JavaScript, Flash, NekoVM, PHP, C++";
+ homepage = http://haxe.org;
+ license = ["GPLv2" "BSD2" /*?*/ ]; # -> docs/license.txt
+ maintainers = [stdenv.lib.maintainers.marcweber];
+ platforms = stdenv.lib.platforms.linux;
+ };
}
diff --git a/pkgs/development/compilers/idris/default.nix b/pkgs/development/compilers/idris/default.nix
index fe9ce209191..dbd35d9e948 100644
--- a/pkgs/development/compilers/idris/default.nix
+++ b/pkgs/development/compilers/idris/default.nix
@@ -1,15 +1,15 @@
-{ cabal, binary, Cabal, epic, filepath, happy, haskeline, mtl
-, parsec, transformers
+{ cabal, binary, Cabal, filepath, happy, haskeline, mtl, parsec
+, transformers
}:
cabal.mkDerivation (self: {
pname = "idris";
- version = "0.9.2.1";
- sha256 = "16jbmyza57066s3wmkvgwn11kqn0nzkjrrvsinh9xd69a79h2iiy";
+ version = "0.9.5.1";
+ sha256 = "0cy27b2kq696lw354y55mpx1gv66jdax1xjph989kxp0rd1v1sw9";
isLibrary = false;
isExecutable = true;
buildDepends = [
- binary Cabal epic filepath haskeline mtl parsec transformers
+ binary Cabal filepath haskeline mtl parsec transformers
];
buildTools = [ happy ];
meta = {
diff --git a/pkgs/development/compilers/jhc/default.nix b/pkgs/development/compilers/jhc/default.nix
new file mode 100644
index 00000000000..4b4d85df890
--- /dev/null
+++ b/pkgs/development/compilers/jhc/default.nix
@@ -0,0 +1,29 @@
+{
+ stdenv, fetchurl, perl, ghc, binary, zlib, utf8String, readline, fgl,
+ regexCompat, HsSyck, random
+}:
+
+stdenv.mkDerivation rec {
+
+ name = "jhc-${version}";
+
+ version = "0.8.0";
+
+ src = fetchurl {
+ url = "http://repetae.net/dist/${name}.tar.gz";
+ sha256 = "0rbv0gpp7glhd9xqy7snbiaiizwnsfg9vzhvyywcvbmb35yivy2a";
+ };
+
+ buildInputs = [
+ perl ghc binary zlib utf8String readline fgl regexCompat HsSyck random
+ ];
+
+ meta = {
+ description = ''
+ A Haskell compiler which aims to produce the most efficient programs
+ '';
+ license = stdenv.lib.licenses.gpl2;
+ maintainers = [ stdenv.lib.maintainers.aforemny ];
+ };
+
+}
diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix
index c1b607b725b..4fd31d573ce 100644
--- a/pkgs/development/compilers/julia/default.nix
+++ b/pkgs/development/compilers/julia/default.nix
@@ -7,11 +7,11 @@ let
in
stdenv.mkDerivation rec {
pname = "julia";
- date = "20120904";
+ date = "20121106";
name = "${pname}-git-${date}";
grisu_ver = "1.1.1";
- dsfmt_ver = "2.1";
+ dsfmt_ver = "2.2";
openblas_ver = "v0.2.2";
lapack_ver = "3.4.1";
arpack_ver = "3.1.2";
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
dsfmt_src = fetchurl {
url = "http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/dSFMT-src-${dsfmt_ver}.tar.gz";
name = "dsfmt-${dsfmt_ver}.tar.gz";
- sha256 = "e9d3e04bc984ec3b14033342f5ebdcd5202d8d8e40128dd737f566945612378f";
+ sha256 = "bc3947a9b2253a869fcbab8ff395416cb12958be9dba10793db2cd7e37b26899";
};
openblas_src = fetchurl {
url = "https://github.com/xianyi/OpenBLAS/tarball/${openblas_ver}";
@@ -54,8 +54,8 @@ stdenv.mkDerivation rec {
src = fetchgit {
url = "git://github.com/JuliaLang/julia.git";
- rev = "b842bf4ae4d80f28803ec54f3da412a0248046a9";
- sha256 = "4d67f4f4d35c76ea8981198e42feb1c30a50ac7e1e15b752fa41b26ebadcd828";
+ rev = "8f4d073881beb42c9f272b9327efa0a5715bd31c";
+ sha256 = "2df2ba800bd4fd9b0297a0b8cff53174a7c05ffbc889a7df5830a014fed8c433";
};
buildInputs = [ gfortran perl m4 gmp pcre llvm readline zlib
@@ -92,14 +92,14 @@ stdenv.mkDerivation rec {
sed -e "s@/usr/local/lib@$out/lib@g" -i deps/Makefile
sed -e "s@/usr/lib@$out/lib@g" -i deps/Makefile
- export makeFlags="$makeFlags PREFIX=$out"
+ export makeFlags="$makeFlags PREFIX=$out SHELL=${stdenv.shell}"
export dontPatchELF=1
'';
preBuild = ''
- make -C test/unicode all
- make -C extras glpk_h.jl GLPK_PREFIX="$GLPK_PREFIX"
+ make -C test/unicode all SHELL="${stdenv.shell}"
+ make -C extras glpk_h.jl GLPK_PREFIX="$GLPK_PREFIX" SHELL="${stdenv.shell}"
'';
postInstall = ''
diff --git a/pkgs/development/compilers/llvm/3.1.nix b/pkgs/development/compilers/llvm/3.1.nix
deleted file mode 100644
index 204c080b871..00000000000
--- a/pkgs/development/compilers/llvm/3.1.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ stdenv, fetchurl, perl, groff, cmake, python }:
-
-let version = "3.1"; in
-
-stdenv.mkDerivation {
- name = "llvm-${version}";
-
- src = fetchurl {
- url = "http://llvm.org/releases/${version}/llvm-${version}.src.tar.gz";
- sha256 = "1ea05135197b5400c1f88d00ff280d775ce778f8f9ea042e25a1e1e734a4b9ab";
- };
-
- buildInputs = [ perl groff cmake python ];
-
- cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ];
-
- enableParallelBuilding = true;
-
- meta = {
- homepage = http://llvm.org/;
- description = "Collection of modular and reusable compiler and toolchain technologies";
- license = "BSD";
- maintainers = with stdenv.lib.maintainers; [viric shlevy raskin];
- platforms = with stdenv.lib.platforms; all;
- };
-}
-
diff --git a/pkgs/development/compilers/llvm/clang-include-paths.patch b/pkgs/development/compilers/llvm/clang-include-paths.patch
index 828c554175e..5e7370718ab 100644
--- a/pkgs/development/compilers/llvm/clang-include-paths.patch
+++ b/pkgs/development/compilers/llvm/clang-include-paths.patch
@@ -1,49 +1,21 @@
-diff -Naur clang-3.0.src-orig/lib/Driver/ToolChains.cpp clang-3.0.src/lib/Driver/ToolChains.cpp
---- clang-3.0.src-orig/lib/Driver/ToolChains.cpp 2011-11-17 02:40:32.000000000 -0500
-+++ clang-3.0.src/lib/Driver/ToolChains.cpp 2011-12-19 06:29:27.562428830 -0500
-@@ -1926,14 +1926,17 @@
+diff -Naur clang-3.1.src-orig/lib/Driver/ToolChains.cpp clang-3.1.src/lib/Driver/ToolChains.cpp
+--- clang-3.1.src-orig/lib/Driver/ToolChains.cpp 2012-05-11 20:16:02.000000000 -0400
++++ clang-3.1.src/lib/Driver/ToolChains.cpp 2012-10-08 01:13:01.044083509 -0400
+@@ -2146,9 +2146,6 @@
if (DriverArgs.hasArg(options::OPT_nostdinc))
return;
-+#if 0
- if (!DriverArgs.hasArg(options::OPT_nostdlibinc))
- addSystemInclude(DriverArgs, CC1Args, D.SysRoot + "/usr/local/include");
-
-+#endif
+- if (!DriverArgs.hasArg(options::OPT_nostdlibinc))
+- addSystemInclude(DriverArgs, CC1Args, D.SysRoot + "/usr/local/include");
+-
if (!DriverArgs.hasArg(options::OPT_nobuiltininc)) {
llvm::sys::Path P(D.ResourceDir);
P.appendComponent("include");
- addSystemInclude(DriverArgs, CC1Args, P.str());
- }
-+#if 0
-
- if (DriverArgs.hasArg(options::OPT_nostdlibinc))
- return;
-@@ -1998,6 +2001,8 @@
+@@ -2264,6 +2261,7 @@
return;
- addExternCSystemInclude(DriverArgs, CC1Args, D.SysRoot + "/usr/include");
-+#endif
-+ addExternCSystemInclude(DriverArgs, CC1Args, D.SysRoot + C_INCLUDE_PATH);
- }
-
- static bool addLibStdCXXIncludePaths(Twine Base, Twine TargetArchDir,
-@@ -2030,6 +2035,7 @@
- bool IsTarget64Bit = (TargetArch == llvm::Triple::x86_64 ||
- TargetArch == llvm::Triple::ppc64);
-
-+#if 0
- StringRef CxxIncludeRoot(CXX_INCLUDE_ROOT);
- if (!CxxIncludeRoot.empty()) {
- StringRef CxxIncludeArch(CXX_INCLUDE_ARCH);
-@@ -2072,6 +2078,10 @@
- GCCInstallation.getTriple() + Suffix,
- DriverArgs, CC1Args);
- }
-+#endif
-+ addLibStdCXXIncludePaths(CPP_INCLUDE_PATH,
-+ CPP_HOST,
-+ DriverArgs, CC1Args);
- }
-
- /// DragonFly - DragonFly tool chain which can call as(1) and ld(1) directly.
+ // Check if libc++ has been enabled and provide its include paths if so.
++ // !!! Will need to modify this if/when nixpkgs uses libc++
+ if (GetCXXStdlibType(DriverArgs) == ToolChain::CST_Libcxx) {
+ // libc++ is always installed at a fixed path on Linux currently.
+ addSystemInclude(DriverArgs, CC1Args,
diff --git a/pkgs/development/compilers/llvm/clang-ld-flags.patch b/pkgs/development/compilers/llvm/clang-ld-flags.patch
index 62b8bc763f9..ffa67b464ec 100644
--- a/pkgs/development/compilers/llvm/clang-ld-flags.patch
+++ b/pkgs/development/compilers/llvm/clang-ld-flags.patch
@@ -1,38 +1,57 @@
-diff -Naur clang-3.0.src-orig/lib/Driver/ToolChains.cpp clang-3.0.src/lib/Driver/ToolChains.cpp
---- clang-3.0.src-orig/lib/Driver/ToolChains.cpp 2011-11-17 02:40:32.000000000 -0500
-+++ clang-3.0.src/lib/Driver/ToolChains.cpp 2011-12-19 05:32:38.695513475 -0500
-@@ -1800,6 +1800,7 @@
+diff -Naur clang-3.1.src-orig/lib/Driver/ToolChains.cpp clang-3.1.src/lib/Driver/ToolChains.cpp
+--- clang-3.1.src-orig/lib/Driver/ToolChains.cpp 2012-05-11 20:16:02.000000000 -0400
++++ clang-3.1.src/lib/Driver/ToolChains.cpp 2012-10-08 01:22:53.458850737 -0400
+@@ -2077,16 +2077,6 @@
+ addPathIfExists(LibPath + "/../" + Multilib, Paths);
+ }
+ }
+- addPathIfExists(SysRoot + "/lib/" + MultiarchTriple, Paths);
+- addPathIfExists(SysRoot + "/lib/../" + Multilib, Paths);
+- addPathIfExists(SysRoot + "/usr/lib/" + MultiarchTriple, Paths);
+- addPathIfExists(SysRoot + "/usr/lib/../" + Multilib, Paths);
+-
+- // Try walking via the GCC triple path in case of multiarch GCC
+- // installations with strange symlinks.
+- if (GCCInstallation.isValid())
+- addPathIfExists(SysRoot + "/usr/lib/" + GCCInstallation.getTriple().str() +
+- "/../../" + Multilib, Paths);
- Linker = GetProgramPath("ld");
-
-+#if 0
- LinuxDistro Distro = DetectLinuxDistro(Arch);
-
- if (IsOpenSuse(Distro) || IsUbuntu(Distro)) {
-@@ -1882,6 +1883,7 @@
- addPathIfExists(SysRoot + "/lib", Paths);
- addPathIfExists(SysRoot + "/usr/lib/" + MultiarchTriple, Paths);
- addPathIfExists(SysRoot + "/usr/lib", Paths);
-+#endif
+ // Add the non-multilib suffixed paths (if potentially different).
+ if (GCCInstallation.isValid()) {
+@@ -2100,8 +2090,6 @@
+ addPathIfExists(LibPath, Paths);
+ }
+ }
+- addPathIfExists(SysRoot + "/lib", Paths);
+- addPathIfExists(SysRoot + "/usr/lib", Paths);
}
bool Linux::HasNativeLLVMSupport() const {
-diff -Naur clang-3.0.src-orig/lib/Driver/Tools.cpp clang-3.0.src/lib/Driver/Tools.cpp
---- clang-3.0.src-orig/lib/Driver/Tools.cpp 2011-11-07 05:27:39.000000000 -0500
-+++ clang-3.0.src/lib/Driver/Tools.cpp 2011-12-19 05:34:44.075325534 -0500
-@@ -4306,6 +4306,7 @@
+diff -Naur clang-3.1.src-orig/lib/Driver/Tools.cpp clang-3.1.src/lib/Driver/Tools.cpp
+--- clang-3.1.src-orig/lib/Driver/Tools.cpp 2012-04-18 17:32:25.000000000 -0400
++++ clang-3.1.src/lib/Driver/Tools.cpp 2012-10-08 01:25:23.913501995 -0400
+@@ -5210,24 +5210,6 @@
ToolChain.getArch() == llvm::Triple::thumb ||
(!Args.hasArg(options::OPT_static) &&
!Args.hasArg(options::OPT_shared))) {
-+#if 0
- CmdArgs.push_back("-dynamic-linker");
- if (ToolChain.getArch() == llvm::Triple::x86)
- CmdArgs.push_back("/lib/ld-linux.so.2");
-@@ -4318,6 +4319,7 @@
- CmdArgs.push_back("/lib64/ld64.so.1");
- else
- CmdArgs.push_back("/lib64/ld-linux-x86-64.so.2");
-+#endif
+- CmdArgs.push_back("-dynamic-linker");
+- if (ToolChain.getArch() == llvm::Triple::x86)
+- CmdArgs.push_back("/lib/ld-linux.so.2");
+- else if (ToolChain.getArch() == llvm::Triple::arm ||
+- ToolChain.getArch() == llvm::Triple::thumb)
+- CmdArgs.push_back("/lib/ld-linux.so.3");
+- else if (ToolChain.getArch() == llvm::Triple::mips ||
+- ToolChain.getArch() == llvm::Triple::mipsel)
+- CmdArgs.push_back("/lib/ld.so.1");
+- else if (ToolChain.getArch() == llvm::Triple::mips64 ||
+- ToolChain.getArch() == llvm::Triple::mips64el)
+- CmdArgs.push_back("/lib64/ld.so.1");
+- else if (ToolChain.getArch() == llvm::Triple::ppc)
+- CmdArgs.push_back("/lib/ld.so.1");
+- else if (ToolChain.getArch() == llvm::Triple::ppc64)
+- CmdArgs.push_back("/lib64/ld64.so.1");
+- else
+- CmdArgs.push_back("/lib64/ld-linux-x86-64.so.2");
}
CmdArgs.push_back("-o");
diff --git a/pkgs/development/compilers/llvm/clang.nix b/pkgs/development/compilers/llvm/clang.nix
index 663e1bfab28..48e4c4946f3 100644
--- a/pkgs/development/compilers/llvm/clang.nix
+++ b/pkgs/development/compilers/llvm/clang.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, perl, groff, llvm, cmake }:
-let version = "3.0"; in
+let version = "3.1"; in
stdenv.mkDerivation {
name = "clang-${version}";
@@ -10,20 +10,19 @@ stdenv.mkDerivation {
patches = stdenv.lib.optionals (stdenv.gcc.libc != null)
[ ./clang-include-paths.patch ./clang-ld-flags.patch ];
- postPatch = stdenv.lib.optionalString (stdenv.gcc.libc != null) ''
- sed -i -e 's,C_INCLUDE_PATH,"${stdenv.gcc.libc}/include/",' \
- -e 's,CPP_HOST,"'$(${stdenv.gcc}/bin/cc -dumpmachine)'",' \
- -e 's,CPP_INCLUDE_PATH,"${stdenv.gcc.gcc}/include/c++/${stdenv.gcc.gcc.version}",' \
- lib/Driver/ToolChains.cpp
- '';
-
- cmakeFlags = [ "-DCLANG_PATH_TO_LLVM_BUILD=${llvm}" "-DCMAKE_BUILD_TYPE=Release" "-DLLVM_TARGETS_TO_BUILD=all"];
+ cmakeFlags = [
+ "-DCLANG_PATH_TO_LLVM_BUILD=${llvm}"
+ "-DCMAKE_BUILD_TYPE=Release"
+ "-DLLVM_TARGETS_TO_BUILD=all"
+ ] ++ stdenv.lib.optionals (stdenv.gcc.libc != null) [
+ "-DC_INCLUDE_DIRS=${stdenv.gcc.libc}/include/"
+ ];
enableParallelBuilding = true;
src = fetchurl {
- url = "http://llvm.org/releases/${version}/clang-${version}.tar.gz";
- sha256 = "0v8j9rgmb7w74ihc44zfxa22q17c946n5b6prwl38z3d6pd74kmn";
+ url = "http://llvm.org/releases/${version}/clang-${version}.src.tar.gz";
+ sha256 = "11m7sm9f8qcrayckfg3z91zb3fimilpm0f7azn7q7qnkvhay4qzz";
};
passthru = { gcc = stdenv.gcc.gcc; };
diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix
index 0fb1cf82cc2..204c080b871 100644
--- a/pkgs/development/compilers/llvm/default.nix
+++ b/pkgs/development/compilers/llvm/default.nix
@@ -1,16 +1,16 @@
-{ stdenv, fetchurl, perl, groff, cmake }:
+{ stdenv, fetchurl, perl, groff, cmake, python }:
-let version = "3.0"; in
+let version = "3.1"; in
stdenv.mkDerivation {
name = "llvm-${version}";
src = fetchurl {
- url = "http://llvm.org/releases/${version}/llvm-${version}.tar.gz";
- sha256 = "0xq4gi7lflv8ilfckslhfvnja5693xjii1yvzz39kklr6hfv37ji";
+ url = "http://llvm.org/releases/${version}/llvm-${version}.src.tar.gz";
+ sha256 = "1ea05135197b5400c1f88d00ff280d775ce778f8f9ea042e25a1e1e734a4b9ab";
};
- buildInputs = [ perl groff cmake ];
+ buildInputs = [ perl groff cmake python ];
cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ];
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
homepage = http://llvm.org/;
description = "Collection of modular and reusable compiler and toolchain technologies";
license = "BSD";
- maintainers = with stdenv.lib.maintainers; [viric shlevy];
+ maintainers = with stdenv.lib.maintainers; [viric shlevy raskin];
platforms = with stdenv.lib.platforms; all;
};
}
diff --git a/pkgs/development/compilers/neko/default.nix b/pkgs/development/compilers/neko/default.nix
index 28a98fe1e25..ddeeb51c25e 100644
--- a/pkgs/development/compilers/neko/default.nix
+++ b/pkgs/development/compilers/neko/default.nix
@@ -1,69 +1,44 @@
-{ composableDerivation, lib, fetchurl, mysql, apacheHttpd, zlib, sqlite
-, pcre, apr, gtk, boehmgc, pkgconfig, makeWrapper, sourceFromHead }:
+{ stdenv, fetchurl, boehmgc, zlib, sqlite, pcre }:
-let
+stdenv.mkDerivation rec {
+ name = "neko-${version}";
+ version = "1.8.2";
- inherit (composableDerivation) edf wwf;
-
- libs = [ mysql apacheHttpd zlib sqlite pcre apr gtk ];
-
- includes = lib.concatMapStrings (x: ''"${x}/include",'' ) libs + ''"{gkt}/include/gtk-2.0",'';
-
-in
-
-composableDerivation.composableDerivation {} ( fixed : {
-
- name = "neko-cvs";
-
- # REGION AUTO UPDATE: { name="neko"; type="cvs"; cvsRoot = ":pserver:anonymous@cvs.motion-twin.com:/cvsroot"; module = "neko"; groups = "haxe_group"; }
- src = sourceFromHead "neko-F_16-06-48.tar.gz"
- (fetchurl { url = "http://mawercer.de/~nix/repos/neko-F_16-06-48.tar.gz"; sha256 = "e952582a26099b7a5568d0798839a6d349331510ffe6d7936b4537d60b6ccf26"; });
- # END
-
- # optionally remove apache mysql like gentoo does?
- # they just remove libs/{apache,mod_neko}
- buildInputs = [boehmgc pkgconfig makeWrapper] ++ libs;
- # apr should be in apacheHttpd propagatedBuildInputs
-
- preConfigure = ''
- sed -i \
- -e 's@"/usr/include",@${includes}@' \
- src/tools/install.neko
- sed -i "s@/usr/local@$out@" Makefile vm/load.c
- # make sure that nekotools boot finds the neko executable and not our wrapper:
- mkdir -p $out/{bin,lib}
-
- sed -i "s@\"neko\"@\".neko-wrapped\"@" src/tools/nekoboot.neko
- ln -s ./neko bin/.neko-wrapped
- '';
-
- inherit zlib;
-
- meta = {
- description = "Neko is an high-level dynamicly typed programming language";
- homepage = http://nekovm.org;
- license = ["GPLv2" ]; # -> docs/license.txt
- maintainers = [ lib.maintainers.marcweber ];
- platforms = lib.platforms.linux;
+ src = fetchurl {
+ url = "http://nekovm.org/_media/neko-${version}.tar.gz";
+ sha256 = "099727w6dk689z3pcgbhsqjl74zzrh82a5vb2abxynamcqxcgz1w";
};
- # if stripping was done neko and nekoc would be the same. ?!
- dontStrip = 1;
+ prePatch = with stdenv.lib; let
+ libs = concatStringsSep "," (map (lib: "\"${lib}/include\"") buildInputs);
+ in ''
+ sed -i -e '/^search_includes/,/^}/c \
+ search_includes = function(_) { return $array(${libs}) }
+ ' src/tools/install.neko
+ sed -i -e '/allocated = strdup/s|"[^"]*"|"'"$out/lib/neko:$out/bin"'"|' \
+ vm/load.c
+ # temporarily, fixed in 1.8.3
+ sed -i -e 's/^#if defined(_64BITS)/& || defined(__x86_64__)/' vm/neko.h
- # neko-wrapped: nekotools boot has to find it. So don't prefix wrapped executable by "."
- postInstall = ''
- for prog in nekotools nekoc; do
- wrapProgram "$out/bin/$prog" \
- --prefix "LD_LIBRARY_PATH" $out/lib/neko
+ for disabled_mod in mod_neko{,2} mod_tora{,2} mysql ui; do
+ sed -i -e '/^libs/,/^}/{/^\s*'"$disabled_mod"'\s*=>/,/^\s*}/d}' \
+ src/tools/install.neko
done
-
- wrapProgram "$out/bin/neko" \
- --prefix "LD_LIBRARY_PATH" $out/lib/neko
-
- # create symlink so that nekotools boot finds not wrapped neko-wrapped executable
- ln -s ln -s ../../bin/.neko-wrapped $out/lib/neko
'';
- # TODO make them optional and make them work
- patches = [ ./disable-modules.patch ];
-})
+ makeFlags = "INSTALL_PREFIX=$(out)";
+ buildInputs = [ boehmgc zlib sqlite pcre ];
+ dontStrip = true;
+
+ preInstall = ''
+ install -vd "$out/lib" "$out/bin"
+ '';
+
+ meta = {
+ description = "A high-level dynamically typed programming language";
+ homepage = http://nekovm.org;
+ license = stdenv.lib.licenses.lgpl21;
+ maintainers = [ stdenv.lib.maintainers.marcweber ];
+ platforms = stdenv.lib.platforms.linux;
+ };
+}
diff --git a/pkgs/development/compilers/neko/disable-modules.patch b/pkgs/development/compilers/neko/disable-modules.patch
deleted file mode 100644
index d4d5a8eb30e..00000000000
--- a/pkgs/development/compilers/neko/disable-modules.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-diff --git a/src/tools/install.neko b/src/tools/install.neko
-index 4cffa5e..5702add 100644
---- a/src/tools/install.neko
-+++ b/src/tools/install.neko
-@@ -39,26 +39,6 @@ buffer_string = $loader.loadprim("std@buffer_string",1);
- // LIBS DATAS
-
- libs = {
-- mod_neko => {
-- src => $array("../../vm/stats","mod_neko","cgi"),
-- inc => "httpd.h",
-- incname => "Apache 1.3.x"
-- },
-- mod_neko2 => {
-- src => $array("../../vm/stats","mod_neko","cgi"),
-- inc => $array("httpd.h","apr.h"),
-- incname => "Apache 2.2.x",
-- cflags => "-D_LARGEFILE64_SOURCE",
-- realdir => "mod_neko",
-- apache2 => true,
-- },
-- mysql => {
-- src => $array("mysql"),
-- inc => "mysql.h",
-- incname => "MySQL 4.+"
-- lib => "libmysqlclient_r.a",
-- lparams => "-lz -lssl"
-- },
- mysql5 => {
- src => $array("../common/sha1","../common/socket","my_proto/my_proto","my_proto/my_api","mysql"),
- inc => $array(),
-@@ -83,27 +63,6 @@ libs = {
- incname => "Sqlite 3",
- lparams => "-lsqlite3",
- },
-- ui => {
-- src => $array("ui"),
-- inc => switch system { "Mac" => "Carbon.h" default => "gtk/gtk.h" },
-- incname => switch system { "Mac" => "Carbon" default => "GTK+2.0" },
-- cflags => switch system { "Mac" => "" default => "`pkg-config --cflags gtk+-2.0`" },
-- lparams => switch system { "Mac" => "-framework Carbon" default => "`pkg-config --libs gtk+-2.0` -lgthread-2.0" },
-- },
-- mod_tora => {
-- src => $array("../common/socket","protocol","mod_tora"),
-- inc => "httpd.h",
-- incname => "Apache 1.3.x",
-- cflags => "-I../common",
-- },
-- mod_tora2 => {
-- src => $array("../common/socket","protocol","mod_tora"),
-- inc => $array("httpd.h","apr.h"),
-- incname => "Apache 2.2.x",
-- cflags => "-D_LARGEFILE64_SOURCE -I../common",
-- realdir => "mod_tora",
-- apache2 => true,
-- },
- }
-
- // PLATFORM
diff --git a/pkgs/development/compilers/ocaml/3.12.1.nix b/pkgs/development/compilers/ocaml/3.12.1.nix
index a70ba649d1f..c719abc4abc 100644
--- a/pkgs/development/compilers/ocaml/3.12.1.nix
+++ b/pkgs/development/compilers/ocaml/3.12.1.nix
@@ -2,7 +2,7 @@
let
useX11 = !stdenv.isArm && !stdenv.isMips;
- useNativeCompilers = !stdenv.isArm && !stdenv.isMips;
+ useNativeCompilers = !stdenv.isMips;
inherit (stdenv.lib) optionals optionalString;
in
diff --git a/pkgs/development/compilers/ocaml/4.00.0.nix b/pkgs/development/compilers/ocaml/4.00.1.nix
similarity index 92%
rename from pkgs/development/compilers/ocaml/4.00.0.nix
rename to pkgs/development/compilers/ocaml/4.00.1.nix
index da065356e85..d7c14e031b3 100644
--- a/pkgs/development/compilers/ocaml/4.00.0.nix
+++ b/pkgs/development/compilers/ocaml/4.00.1.nix
@@ -2,17 +2,17 @@
let
useX11 = !stdenv.isArm && !stdenv.isMips;
- useNativeCompilers = !stdenv.isArm && !stdenv.isMips;
+ useNativeCompilers = !stdenv.isMips;
inherit (stdenv.lib) optionals optionalString;
in
stdenv.mkDerivation rec {
- name = "ocaml-4.00.0";
+ name = "ocaml-4.00.1";
src = fetchurl {
url = "http://caml.inria.fr/pub/distrib/ocaml-4.00/${name}.tar.bz2";
- sha256 = "ec886d7bc587ce472fcbdf294feb4b1fa2d8e7ef78ab6a4e66551699435d5cd7";
+ sha256 = "33c3f4acff51685f5bfd7c260f066645e767d4e865877bf1613c176a77799951";
};
prefixKey = "-prefix ";
diff --git a/pkgs/development/compilers/openjdk-darwin/default.nix b/pkgs/development/compilers/openjdk-darwin/default.nix
index cbd41033bfc..1e74acfae72 100644
--- a/pkgs/development/compilers/openjdk-darwin/default.nix
+++ b/pkgs/development/compilers/openjdk-darwin/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{stdenv, fetchurl, ...}:
stdenv.mkDerivation {
name = "openjdk6-b16-24_apr_2009-r1";
diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix
index f243baab591..246696f81e2 100644
--- a/pkgs/development/compilers/openjdk/default.nix
+++ b/pkgs/development/compilers/openjdk/default.nix
@@ -17,8 +17,13 @@
, libXrender
, libXtst
, libXi
+, libXinerama
+, libXcursor
+, fontconfig
, cpio
+, cacert
, jreOnly ? false
+, perl
}:
let
@@ -82,8 +87,14 @@ stdenv.mkDerivation rec {
libXrender
libXtst
libXi
+ libXinerama
+ libXcursor
+ fontconfig
+ perl
];
+ NIX_LDFLAGS = "-lfontconfig -lXcursor -lXinerama";
+
postUnpack = ''
mkdir -p drops
cp ${jaxp_src} drops/${jaxp_src_name}
@@ -106,6 +117,7 @@ stdenv.mkDerivation rec {
./cppflags-include-fix.patch
./printf-fix.patch
./linux-version-check-fix.patch
+ ./no-crypto-restrictions.patch
];
makeFlags = [
@@ -122,7 +134,6 @@ stdenv.mkDerivation rec {
"UNIXCOMMAND_PATH="
"BOOTDIR=${jdk}"
"DROPS_DIR=$(DROPS_PATH)"
- "SKIP_BOOT_CYCLE=false"
];
configurePhase = ''
@@ -132,6 +143,10 @@ stdenv.mkDerivation rec {
installPhase = ''
mkdir -p $out
cp -av build/*/j2${if jreOnly then "re" else "sdk"}-image/* $out
+ pushd $out/${if ! jreOnly then "jre/" else ""}lib/security
+ rm cacerts
+ perl ${./generate-cacerts.pl} $out/bin/keytool ${cacert}/etc/ca-bundle.crt
+ popd
'';
# '' + (if jreOnly then "" else ''
# if [ -z $jre ]; then
diff --git a/pkgs/development/compilers/openjdk/generate-cacerts.pl b/pkgs/development/compilers/openjdk/generate-cacerts.pl
new file mode 100644
index 00000000000..3bdd42f7274
--- /dev/null
+++ b/pkgs/development/compilers/openjdk/generate-cacerts.pl
@@ -0,0 +1,366 @@
+#!/usr/bin/perl
+
+# Copyright (C) 2007, 2008 Red Hat, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 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.
+
+# generate-cacerts.pl generates a JKS keystore named 'cacerts' from
+# OpenSSL's certificate bundle using OpenJDK's keytool.
+
+# First extract each of OpenSSL's bundled certificates into its own
+# aliased filename.
+
+# Downloaded from http://cvs.fedoraproject.org/viewvc/rpms/ca-certificates/F-12/generate-cacerts.pl?revision=1.2
+# Check and prevention of duplicate aliases added by Vlastimil Babka
+
+$file = $ARGV[1];
+open(CERTS, $file);
+@certs = ;
+close(CERTS);
+
+$pem_file_count = 0;
+$in_cert_block = 0;
+$write_current_cert = 1;
+foreach $cert (@certs)
+{
+ if ($cert =~ /Issuer: /)
+ {
+ $_ = $cert;
+ if ($cert =~ /personal-freemail/)
+ {
+ $cert_alias = "thawtepersonalfreemailca";
+ }
+ elsif ($cert =~ /personal-basic/)
+ {
+ $cert_alias = "thawtepersonalbasicca";
+ }
+ elsif ($cert =~ /personal-premium/)
+ {
+ $cert_alias = "thawtepersonalpremiumca";
+ }
+ elsif ($cert =~ /server-certs/)
+ {
+ $cert_alias = "thawteserverca";
+ }
+ elsif ($cert =~ /premium-server/)
+ {
+ $cert_alias = "thawtepremiumserverca";
+ }
+ elsif ($cert =~ /Class 1 Public Primary Certification Authority$/)
+ {
+ $cert_alias = "verisignclass1ca";
+ }
+ elsif ($cert =~ /Class 1 Public Primary Certification Authority - G2/)
+ {
+ $cert_alias = "verisignclass1g2ca";
+ }
+ elsif ($cert =~
+ /VeriSign Class 1 Public Primary Certification Authority - G3/)
+ {
+ $cert_alias = "verisignclass1g3ca";
+ }
+ elsif ($cert =~ /Class 2 Public Primary Certification Authority$/)
+ {
+ $cert_alias = "verisignclass2ca";
+ }
+ elsif ($cert =~ /Class 2 Public Primary Certification Authority - G2/)
+ {
+ $cert_alias = "verisignclass2g2ca";
+ }
+ elsif ($cert =~
+ /VeriSign Class 2 Public Primary Certification Authority - G3/)
+ {
+ $cert_alias = "verisignclass2g3ca";
+ }
+ elsif ($cert =~ /Class 3 Public Primary Certification Authority$/)
+ {
+ $cert_alias = "verisignclass3ca";
+ }
+ # Version 1 of Class 3 Public Primary Certification Authority
+ # - G2 is added. Version 3 is excluded. See below.
+ elsif ($cert =~
+ /VeriSign Class 3 Public Primary Certification Authority - G3/)
+ {
+ $cert_alias = "verisignclass3g3ca";
+ }
+ elsif ($cert =~
+ /RSA Data Security.*Secure Server Certification Authority/)
+ {
+ $cert_alias = "verisignserverca";
+ }
+ elsif ($cert =~ /GTE CyberTrust Global Root/)
+ {
+ $cert_alias = "gtecybertrustglobalca";
+ }
+ elsif ($cert =~ /Baltimore CyberTrust Root/)
+ {
+ $cert_alias = "baltimorecybertrustca";
+ }
+ elsif ($cert =~ /www.entrust.net\/Client_CA_Info\/CPS/)
+ {
+ $cert_alias = "entrustclientca";
+ }
+ elsif ($cert =~ /www.entrust.net\/GCCA_CPS/)
+ {
+ $cert_alias = "entrustglobalclientca";
+ }
+ elsif ($cert =~ /www.entrust.net\/CPS_2048/)
+ {
+ $cert_alias = "entrust2048ca";
+ }
+ elsif ($cert =~ /www.entrust.net\/CPS /)
+ {
+ $cert_alias = "entrustsslca";
+ }
+ elsif ($cert =~ /www.entrust.net\/SSL_CPS/)
+ {
+ $cert_alias = "entrustgsslca";
+ }
+ elsif ($cert =~ /The Go Daddy Group/)
+ {
+ $cert_alias = "godaddyclass2ca";
+ }
+ elsif ($cert =~ /Starfield Class 2 Certification Authority/)
+ {
+ $cert_alias = "starfieldclass2ca";
+ }
+ elsif ($cert =~ /ValiCert Class 2 Policy Validation Authority/)
+ {
+ $cert_alias = "valicertclass2ca";
+ }
+ elsif ($cert =~ /GeoTrust Global CA$/)
+ {
+ $cert_alias = "geotrustglobalca";
+ }
+ elsif ($cert =~ /Equifax Secure Certificate Authority/)
+ {
+ $cert_alias = "equifaxsecureca";
+ }
+ elsif ($cert =~ /Equifax Secure eBusiness CA-1/)
+ {
+ $cert_alias = "equifaxsecureebusinessca1";
+ }
+ elsif ($cert =~ /Equifax Secure eBusiness CA-2/)
+ {
+ $cert_alias = "equifaxsecureebusinessca2";
+ }
+ elsif ($cert =~ /Equifax Secure Global eBusiness CA-1/)
+ {
+ $cert_alias = "equifaxsecureglobalebusinessca1";
+ }
+ elsif ($cert =~ /Sonera Class1 CA/)
+ {
+ $cert_alias = "soneraclass1ca";
+ }
+ elsif ($cert =~ /Sonera Class2 CA/)
+ {
+ $cert_alias = "soneraclass2ca";
+ }
+ elsif ($cert =~ /AAA Certificate Services/)
+ {
+ $cert_alias = "comodoaaaca";
+ }
+ elsif ($cert =~ /AddTrust Class 1 CA Root/)
+ {
+ $cert_alias = "addtrustclass1ca";
+ }
+ elsif ($cert =~ /AddTrust External CA Root/)
+ {
+ $cert_alias = "addtrustexternalca";
+ }
+ elsif ($cert =~ /AddTrust Qualified CA Root/)
+ {
+ $cert_alias = "addtrustqualifiedca";
+ }
+ elsif ($cert =~ /UTN-USERFirst-Hardware/)
+ {
+ $cert_alias = "utnuserfirsthardwareca";
+ }
+ elsif ($cert =~ /UTN-USERFirst-Client Authentication and Email/)
+ {
+ $cert_alias = "utnuserfirstclientauthemailca";
+ }
+ elsif ($cert =~ /UTN - DATACorp SGC/)
+ {
+ $cert_alias = "utndatacorpsgcca";
+ }
+ elsif ($cert =~ /UTN-USERFirst-Object/)
+ {
+ $cert_alias = "utnuserfirstobjectca";
+ }
+ elsif ($cert =~ /America Online Root Certification Authority 1/)
+ {
+ $cert_alias = "aolrootca1";
+ }
+ elsif ($cert =~ /DigiCert Assured ID Root CA/)
+ {
+ $cert_alias = "digicertassuredidrootca";
+ }
+ elsif ($cert =~ /DigiCert Global Root CA/)
+ {
+ $cert_alias = "digicertglobalrootca";
+ }
+ elsif ($cert =~ /DigiCert High Assurance EV Root CA/)
+ {
+ $cert_alias = "digicerthighassuranceevrootca";
+ }
+ elsif ($cert =~ /GlobalSign Root CA$/)
+ {
+ $cert_alias = "globalsignca";
+ }
+ elsif ($cert =~ /GlobalSign Root CA - R2/)
+ {
+ $cert_alias = "globalsignr2ca";
+ }
+ elsif ($cert =~ /Elektronik.*Kas.*2005/)
+ {
+ $cert_alias = "extra-elektronikkas2005";
+ }
+ elsif ($cert =~ /Elektronik/)
+ {
+ $cert_alias = "extra-elektronik2005";
+ }
+ # Mozilla does not provide these certificates:
+ # baltimorecodesigningca
+ # gtecybertrust5ca
+ # trustcenterclass2caii
+ # trustcenterclass4caii
+ # trustcenteruniversalcai
+ else
+ {
+ # Generate an alias using the OU and CN attributes of the
+ # Issuer field if both are present, otherwise use only the
+ # CN attribute. The Issuer field must have either the OU
+ # or the CN attribute.
+ $_ = $cert;
+ if ($cert =~ /OU=/)
+ {
+ s/Issuer:.*?OU=//;
+ # Remove other occurrences of OU=.
+ s/OU=.*CN=//;
+ # Remove CN= if there were not other occurrences of OU=.
+ s/CN=//;
+ s/\/emailAddress.*//;
+ s/Certificate Authority/ca/g;
+ s/Certification Authority/ca/g;
+ }
+ elsif ($cert =~ /CN=/)
+ {
+ s/Issuer:.*CN=//;
+ s/\/emailAddress.*//;
+ s/Certificate Authority/ca/g;
+ s/Certification Authority/ca/g;
+ }
+ s/\W//g;
+ tr/A-Z/a-z/;
+ $cert_alias = "extra-$_";
+
+ }
+ while (-e "$cert_alias.pem")
+ {
+ $cert_alias = "$cert_alias" . "_";
+ }
+ }
+ # When it attempts to parse:
+ #
+ # Class 3 Public Primary Certification Authority - G2, Version 3
+ #
+ # keytool says:
+ #
+ # #2: ObjectId: 1.3.6.1.5.5.7.1.1 Criticality=false
+ # Unparseable AuthorityInfoAccess extension due to
+ # java.io.IOException: Invalid encoding of URI
+ #
+ # If we do not exclude this file
+ # openjdk/jdk/test/lib/security/cacerts/VerifyCACerts.java fails
+ # on this cert, printing:
+ #
+ # Couldn't verify: java.security.SignatureException: Signature
+ # does not match.
+ #
+ elsif ($cert =~
+ /A6:0F:34:C8:62:6C:81:F6:8B:F7:7D:A9:F6:67:58:8A:90:3F:7D:36/)
+ {
+ $write_current_cert = 0;
+ $pem_file_count--;
+ }
+ elsif ($cert eq "-----BEGIN CERTIFICATE-----\n")
+ {
+ $_ = $cert;
+ s/\W//g;
+ tr/A-Z/a-z/;
+ $cert_alias = "extra-$_";
+ while (-e "$cert_alias.pem")
+ {
+ $cert_alias = "$cert_alias" . "_";
+ }
+ if ($in_cert_block != 0)
+ {
+ die "$file is malformed.";
+ }
+ $in_cert_block = 1;
+ if ($write_current_cert == 1)
+ {
+ $pem_file_count++;
+ if (-e "$cert_alias.pem")
+ {
+ print "$cert_alias";
+ die "already exists"
+ }
+ open(PEM, ">$cert_alias.pem");
+ print PEM $cert;
+ }
+ }
+ elsif ($cert eq "-----END CERTIFICATE-----\n")
+ {
+ $in_cert_block = 0;
+ if ($write_current_cert == 1)
+ {
+ print PEM $cert;
+ close(PEM);
+ }
+ $write_current_cert = 1
+ }
+ else
+ {
+ if ($in_cert_block == 1 && $write_current_cert == 1)
+ {
+ print PEM $cert;
+ }
+ }
+}
+
+# Check that the correct number of .pem files were produced.
+@pem_files = <*.pem>;
+if (@pem_files != $pem_file_count)
+{
+ print "$pem_file_count";
+ die "Number of .pem files produced does not match".
+ " number of certs read from $file.";
+}
+
+# Now store each cert in the 'cacerts' file using keytool.
+$certs_written_count = 0;
+foreach $pem_file (@pem_files)
+{
+ system "$ARGV[0] -noprompt -import".
+ " -alias `basename $pem_file .pem`".
+ " -keystore cacerts -storepass 'changeit' -file $pem_file";
+ unlink($pem_file);
+ $certs_written_count++;
+}
+
+# Check that the correct number of certs were added to the keystore.
+if ($certs_written_count != $pem_file_count)
+{
+ die "Number of certs added to keystore does not match".
+ " number of certs read from $file.";
+}
diff --git a/pkgs/development/compilers/openjdk/no-crypto-restrictions.patch b/pkgs/development/compilers/openjdk/no-crypto-restrictions.patch
new file mode 100644
index 00000000000..427ef353466
--- /dev/null
+++ b/pkgs/development/compilers/openjdk/no-crypto-restrictions.patch
@@ -0,0 +1,12 @@
+diff -Naur openjdk-orig/jdk/make/javax/crypto/Makefile openjdk/jdk/make/javax/crypto/Makefile
+--- openjdk-orig/jdk/make/javax/crypto/Makefile 2011-06-27 13:18:45.000000000 -0400
++++ openjdk/jdk/make/javax/crypto/Makefile 2012-11-08 14:12:01.360718616 -0500
+@@ -156,7 +156,7 @@
+ #
+
+ ifdef OPENJDK
+-all: build-jar install-jar build-policy install-limited
++all: build-jar install-jar build-policy install-unlimited
+ else # OPENJDK
+ ifeq ($(strip $(FILES_java)),)
+ all:
diff --git a/pkgs/development/compilers/pakcs/default.nix b/pkgs/development/compilers/pakcs/default.nix
index 35771f6691f..817559ffecc 100644
--- a/pkgs/development/compilers/pakcs/default.nix
+++ b/pkgs/development/compilers/pakcs/default.nix
@@ -76,7 +76,7 @@ stdenv.mkDerivation {
with dynamic web pages, prototyping embedded systems).
'';
- maintainers = [ stdenv.lib.maintainers.kkallio stdenv.lib.maintainers.simons ];
+ maintainers = [ stdenv.lib.maintainers.kkallio ];
platforms = stdenv.lib.platforms.linux;
};
}
diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix
index eb3f47a15c0..adffb7c5074 100644
--- a/pkgs/development/compilers/sbcl/default.nix
+++ b/pkgs/development/compilers/sbcl/default.nix
@@ -1,7 +1,14 @@
a :
let
fetchurl = a.fetchurl;
- s= import ./src-for-default.nix;
+ s= # Generated upstream information
+ rec {
+ baseName="sbcl";
+ version="1.1.1";
+ name="${baseName}-${version}";
+ hash="1gkwz0248zl2nhx79ck5wiyxj8407c10gcrpgg1c67102pgyiikv";
+ url="mirror://sourceforge/project/sbcl/sbcl/1.1.1/sbcl-1.1.1-source.tar.bz2";
+ };
buildInputs = with a; [
clisp makeWrapper
];
@@ -73,12 +80,14 @@ rec {
'') ["doBuild" "minInit" "addInputs"];
inherit(s) name;
+ inherit(s) version;
meta = {
description = "Lisp compiler";
homepage = "http://www.sbcl.org";
license = "bsd";
maintainers = [a.lib.maintainers.raskin];
platforms = with a.lib.platforms; all;
+ inherit(s) version;
};
}
diff --git a/pkgs/development/compilers/sbcl/default.upstream b/pkgs/development/compilers/sbcl/default.upstream
new file mode 100644
index 00000000000..de69a2828c6
--- /dev/null
+++ b/pkgs/development/compilers/sbcl/default.upstream
@@ -0,0 +1,9 @@
+name sbcl
+target default.nix
+url http://sf.net/projects/sbcl/files/sbcl/
+version_link '/sbcl/[0-9.]+/$'
+link "source.tar.bz2"
+version '.*/sbcl-([0-9.]+)-source.*' '\1'
+redirect
+process 'http://[a-z]+[.]dl[.]sourceforge[.]net/' 'mirror://sourceforge/'
+process '[?].*' ''
diff --git a/pkgs/development/compilers/sbcl/src-for-default.nix b/pkgs/development/compilers/sbcl/src-for-default.nix
deleted file mode 100644
index d56520d2902..00000000000
--- a/pkgs/development/compilers/sbcl/src-for-default.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-rec {
- version="1.0.58";
- name="sbcl-1.0.58";
- hash="0ifr96hy5ax5c5iv7igwgkwcqb3pwrc4ism957pkfb5yy39p4yc1";
- url="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.58/sbcl-1.0.58-source.tar.bz2";
- advertisedUrl="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.58/sbcl-1.0.58-source.tar.bz2";
-
-
-}
diff --git a/pkgs/development/compilers/sbcl/src-info-for-default.nix b/pkgs/development/compilers/sbcl/src-info-for-default.nix
deleted file mode 100644
index 597aded1792..00000000000
--- a/pkgs/development/compilers/sbcl/src-info-for-default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- baseName = "sbcl";
- downloadPage = "http://sourceforge.net/projects/sbcl/files/sbcl/";
- choiceCommand = "head -n 1 | sed -re 's%.*/([0-9.]+)/%http://downloads.sourceforge.net/project/sbcl/sbcl/\\1/sbcl-\\1-source.tar.bz2%'";
- sourceRegexp = "[/][0-9.]+/\$";
- versionExtractorSedScript = "s/.*-([0-9.rc]+)-.*/\\1/";
-}
diff --git a/pkgs/development/compilers/uhc/default.nix b/pkgs/development/compilers/uhc/default.nix
index 2c812e8842b..fa66306721d 100644
--- a/pkgs/development/compilers/uhc/default.nix
+++ b/pkgs/development/compilers/uhc/default.nix
@@ -44,7 +44,6 @@ in stdenv.mkDerivation {
platforms = stdenv.lib.platforms.linux;
maintainers = [
stdenv.lib.maintainers.andres
- stdenv.lib.maintainers.simons
];
};
}
diff --git a/pkgs/development/interpreters/clisp/default.nix b/pkgs/development/interpreters/clisp/default.nix
index c985da9a5a2..23b4e4e9e54 100644
--- a/pkgs/development/interpreters/clisp/default.nix
+++ b/pkgs/development/interpreters/clisp/default.nix
@@ -34,6 +34,7 @@ stdenv.mkDerivation rec {
--with-module=clx/new-clx --with-module=i18n --with-module=bindings/glibc
--with-module=pcre --with-module=rawsock --with-module=readline
--with-module=syscalls --with-module=wildcard --with-module=zlib
+ --with-threads=POSIX_THREADS
'';
preBuild = ''
diff --git a/pkgs/development/interpreters/erlang/R14B04.nix b/pkgs/development/interpreters/erlang/R14B04.nix
index b5133bd7f83..1d5c9ae3d39 100644
--- a/pkgs/development/interpreters/erlang/R14B04.nix
+++ b/pkgs/development/interpreters/erlang/R14B04.nix
@@ -1,23 +1,40 @@
{ stdenv, fetchurl, perl, gnum4, ncurses, openssl }:
-let version = "R14B04"; in
+let version = "14B04"; in
stdenv.mkDerivation {
name = "erlang-" + version;
-
+
src = fetchurl {
- url = "http://www.erlang.org/download/otp_src_" + version + ".tar.gz";
+ url = "http://www.erlang.org/download/otp_src_R${version}.tar.gz";
sha256 = "0vlvjlg8vzcy6inb4vj00bnj0aarvpchzxwhmi492nv31s8kb6q9";
};
-
+
buildInputs = [ perl gnum4 ncurses openssl ];
-
+
patchPhase = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure erts/configure '';
-
+
preConfigure = ''
export HOME=$PWD/../
sed -e s@/bin/pwd@pwd@g -i otp_build
'';
-
+
configureFlags = "--with-ssl=${openssl}";
+
+ meta = {
+ homepage = "http://www.erlang.org/";
+ description = "Programming language used for massively scalable soft real-time systems";
+
+ longDescription = ''
+ Erlang is a programming language used to build massively scalable
+ soft real-time systems with requirements on high availability.
+ Some of its uses are in telecoms, banking, e-commerce, computer
+ telephony and instant messaging. Erlang's runtime system has
+ built-in support for concurrency, distribution and fault
+ tolerance.
+ '';
+
+ platforms = stdenv.lib.platforms.linux;
+ maintainers = [ stdenv.lib.maintainers.simons ];
+ };
}
diff --git a/pkgs/development/interpreters/erlang/R15B02.nix b/pkgs/development/interpreters/erlang/R15B02.nix
new file mode 100644
index 00000000000..858f7753177
--- /dev/null
+++ b/pkgs/development/interpreters/erlang/R15B02.nix
@@ -0,0 +1,45 @@
+{ stdenv, fetchurl, perl, gnum4, ncurses, openssl
+, wxSupport ? false, mesa ? null, wxGTK ? null, xlibs ? null }:
+
+assert wxSupport -> mesa != null && wxGTK != null && xlibs != null;
+
+let version = "15B02"; in
+
+stdenv.mkDerivation {
+ name = "erlang-" + version;
+
+ src = fetchurl {
+ url = "http://www.erlang.org/download/otp_src_R${version}.tar.gz";
+ sha256 = "03eb0bd640916666ff83df1330912225fbf555e0c8cf58bb35d8307a314f1158";
+ };
+
+ buildInputs =
+ [ perl gnum4 ncurses openssl
+ ] ++ stdenv.lib.optional wxSupport [ mesa wxGTK xlibs.libX11 ];
+
+ patchPhase = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure erts/configure '';
+
+ preConfigure = ''
+ export HOME=$PWD/../
+ sed -e s@/bin/pwd@pwd@g -i otp_build
+ '';
+
+ configureFlags = "--with-ssl=${openssl}";
+
+ meta = {
+ homepage = "http://www.erlang.org/";
+ description = "Programming language used for massively scalable soft real-time systems";
+
+ longDescription = ''
+ Erlang is a programming language used to build massively scalable
+ soft real-time systems with requirements on high availability.
+ Some of its uses are in telecoms, banking, e-commerce, computer
+ telephony and instant messaging. Erlang's runtime system has
+ built-in support for concurrency, distribution and fault
+ tolerance.
+ '';
+
+ platforms = stdenv.lib.platforms.linux;
+ maintainers = [ stdenv.lib.maintainers.simons ];
+ };
+}
diff --git a/pkgs/development/interpreters/erlang/default.nix b/pkgs/development/interpreters/erlang/default.nix
deleted file mode 100644
index 18cfeca6329..00000000000
--- a/pkgs/development/interpreters/erlang/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ stdenv, fetchurl, perl, gnum4, ncurses, openssl
-, wxSupport ? false, mesa ? null, wxGTK ? null, xlibs ? null }:
-
-assert wxSupport -> mesa != null && wxGTK != null && xlibs != null;
-
-let version = "R15B01"; in
-
-stdenv.mkDerivation {
- name = "erlang-" + version;
-
- src = fetchurl {
- url = "http://www.erlang.org/download/otp_src_" + version + ".tar.gz";
- sha256 = "1pmb3hk51p6dwsspxx40qs7gjfyhxjjc3290qk6w1wwa6bkpskzr";
- };
-
- buildInputs =
- [ perl gnum4 ncurses openssl
- ] ++ stdenv.lib.optional wxSupport [ mesa wxGTK xlibs.libX11 ];
-
- patchPhase = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure erts/configure '';
-
- preConfigure = ''
- export HOME=$PWD/../
- sed -e s@/bin/pwd@pwd@g -i otp_build
- '';
-
- configureFlags = "--with-ssl=${openssl}";
-}
diff --git a/pkgs/development/interpreters/lua-5/5.1.nix b/pkgs/development/interpreters/lua-5/5.1.nix
new file mode 100644
index 00000000000..e3dfd4711a1
--- /dev/null
+++ b/pkgs/development/interpreters/lua-5/5.1.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchurl, readline}:
+
+stdenv.mkDerivation rec {
+ name = "lua-5.1.5";
+
+ src = fetchurl {
+ url = "http://www.lua.org/ftp/${name}.tar.gz";
+ sha256 = "2640fc56a795f29d28ef15e13c34a47e223960b0240e8cb0a82d9b0738695333";
+ };
+
+ buildInputs = [ readline ];
+
+ configurePhase = "makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=linux )";
+
+ meta = {
+ homepage = "http://www.lua.org";
+ description = "Lua is a powerful, fast, lightweight, embeddable scripting language.";
+ longDescription = ''
+ Lua combines simple procedural syntax with powerful data
+ description constructs based on associative arrays and extensible
+ semantics. Lua is dynamically typed, runs by interpreting bytecode
+ for a register-based virtual machine, and has automatic memory
+ management with incremental garbage collection, making it ideal
+ for configuration, scripting, and rapid prototyping.
+ '';
+ license = "MIT";
+ platforms = stdenv.lib.platforms.unix;
+ maintainers = [ ];
+ };
+}
diff --git a/pkgs/development/interpreters/octave/hg.nix b/pkgs/development/interpreters/octave/hg.nix
index a908ddc0fc8..f414dd71965 100644
--- a/pkgs/development/interpreters/octave/hg.nix
+++ b/pkgs/development/interpreters/octave/hg.nix
@@ -1,5 +1,5 @@
{stdenv, fetchurl, gfortran, readline, ncurses, perl, flex,
- bison, autoconf, automake, sourceFromHead, getConfig, lib, atlas, gperf, python, glibc, gnuplot, texinfo, texLive, qhull, libX11}:
+ bison, autoconf, automake, sourceFromHead, config, lib, atlas, gperf, python, glibc, gnuplot, texinfo, texLive, qhull, libX11}:
let commonBuildInputs = [gfortran readline ncurses perl glibc qhull libX11 texinfo]; in
@@ -12,7 +12,7 @@ stdenv.mkDerivation ({
license = "GPL-3";
};
} // (
- if (getConfig ["octave" "devVersion"] false) then {
+ if (config.octave.devVersion or false) then {
name = "octave-hg"; # developement version mercurial repo
# REGION AUTO UPDATE: { name="octave"; type = "hg"; url = "http://www.octave.org/hg/octave"; }
src = sourceFromHead "octave-03b414516dd8.tar.gz"
@@ -27,7 +27,7 @@ stdenv.mkDerivation ({
export HOME=$TMP
'';
buildInputs = commonBuildInputs ++ [ flex bison autoconf automake gperf gnuplot texLive ]
- ++ lib.optionals (getConfig ["octave" "atlas"] true) [ python atlas ];
+ ++ lib.optionals (config.octave.atlas or true) [ python atlas ];
# it does build, but documentation doesn't.. So just remove that directory
# from the buildfile
buildPhase = ''
@@ -44,6 +44,6 @@ stdenv.mkDerivation ({
sha256 = "1lm4v85kdic4n5yxwzrdb0v6dc6nw06ljgx1q8hfkmi146kpg7s6";
};
buildInputs = commonBuildInputs ++ [ flex bison autoconf automake python ]
- ++ lib.optionals (getConfig ["octave" "atlas"] true) [ python atlas ];
+ ++ lib.optionals (config.octave.atlas or true) [ python atlas ];
}
))
diff --git a/pkgs/development/interpreters/php/5.2.nix b/pkgs/development/interpreters/php/5.2.nix
deleted file mode 100644
index f98d178663f..00000000000
--- a/pkgs/development/interpreters/php/5.2.nix
+++ /dev/null
@@ -1,172 +0,0 @@
-args: with args;
-
-let
-
- inherit (args.composableDerivation) composableDerivation edf wwf;
-
-in
-
-composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in {
-
- version = "5.2.17";
-
- name = "php-${version}";
-
- buildInputs = ["flex" "bison" "pkgconfig"];
-
- flags = {
-
-# much left to do here...
-
- # SAPI modules:
-
- apxs2 = {
- configureFlags = ["--with-apxs2=${apacheHttpd}/bin/apxs"];
- buildInputs = [apacheHttpd];
- };
-
- # Extensions
-
- curl = {
- configureFlags = ["--with-curl=${args.curl}" "--with-curlwrappers"];
- buildInputs = [curl openssl];
- };
-
- zlib = {
- configureFlags = ["--with-zlib=${args.zlib}"];
- buildInputs = [zlib];
- };
-
- libxml2 = {
- configureFlags = [
- "--with-libxml-dir=${libxml2}"
- "--with-iconv-dir=${libiconv}"
- ];
- buildInputs = [ libxml2 ];
- };
-
- readline = {
- configureFlags = ["--with-readline=${readline}"];
- buildInputs = [ readline ];
- };
-
- sqlite = {
- configureFlags = ["--with-pdo-sqlite=${sqlite}"];
- buildInputs = [ sqlite ];
- };
-
- postgresql = {
- configureFlags = ["--with-pgsql=${postgresql}"];
- buildInputs = [ postgresql ];
- };
-
- mysql = {
- configureFlags = ["--with-mysql=${mysql}"];
- buildInputs = [ mysql ];
- };
-
- mysqli = {
- configureFlags = ["--with-mysqli=${mysql}/bin/mysql_config"];
- buildInputs = [ mysql];
- };
-
- mysqli_embedded = {
- configureFlags = ["--enable-embedded-mysqli"];
- depends = "mysqli";
- assertion = fixed.mysqliSupport;
- };
-
- pdo_mysql = {
- configureFlags = ["--with-pdo-mysql=${mysql}"];
- buildInputs = [ mysql ];
- };
-
- bcmath = {
- configureFlags = ["--enable-bcmath"];
- };
-
- gd = {
- configureFlags = ["--with-gd=${args.gd}"];
- buildInputs = [gd libpng libjpeg ];
- };
-
- soap = {
- configureFlags = ["--enable-soap"];
- };
-
- sockets = {
- configureFlags = ["--enable-sockets"];
- };
-
- openssl = {
- configureFlags = ["--with-openssl=${args.openssl}"];
- buildInputs = ["openssl"];
- };
-
- mbstring = {
- configureFlags = ["--enable-mbstring"];
- };
-
- /*
- php is build within this derivation in order to add the xdebug lines to the php.ini.
- So both Apache and command line php both use xdebug without having to configure anything.
- Xdebug could be put in its own derivation.
- * /
- meta = {
- description = "debugging support for PHP";
- homepage = http://xdebug.org;
- license = "based on the PHP license - as is";
- };
- */
- };
-
- cfg = {
- mysqlSupport = getConfig ["php" "mysql"] true;
- mysqliSupport = getConfig ["php" "mysqli"] true;
- pdo_mysqlSupport = getConfig ["php" "pdo_mysql"] true;
- libxml2Support = getConfig ["php" "libxml2"] true;
- apxs2Support = getConfig ["php" "apxs2"] true;
- bcmathSupport = getConfig ["php" "bcmath"] true;
- socketsSupport = getConfig ["php" "sockets"] true;
- curlSupport = getConfig ["php" "curl"] true;
- gettextSupport = getConfig ["php" "gettext"] true;
- postgresqlSupport = getConfig ["php" "postgresql"] true;
- readlineSupport = getConfig ["php" "readline"] true;
- sqliteSupport = getConfig ["php" "sqlite"] true;
- soapSupport = getConfig ["php" "soap"] true;
- zlibSupport = getConfig ["php" "zlib"] true;
- opensslSupport = getConfig ["php" "openssl"] true;
- mbstringSupport = getConfig ["php" "mbstring"] true;
- gdSupport = getConfig ["php" "gd"] true;
- };
-
- configurePhase = ''
- iniFile=$out/etc/php-recommended.ini
- [[ -z "$libxml2" ]] || export PATH=$PATH:$libxml2/bin
- ./configure --with-config-file-scan-dir=/etc --with-config-file-path=$out/etc --prefix=$out $configureFlags
- echo configurePhase end
- '';
-
- installPhase = ''
- unset installPhase; installPhase;
- cp php.ini-${ if builtins.lessThan (builtins.compareVersions version "5.3") 0
- then "recommended" /* < PHP 5.3 */
- else "production" /* >= PHP 5.3 */
- } $iniFile
- '';
-
- src = args.fetchurl {
- url = "http://nl.php.net/get/php-${version}.tar.bz2/from/this/mirror";
- sha256 = "0v0i7zjp1a2c60imn58xjqcczmiglnfnwdkgwl0bfai4xh9yn6z8";
- name = "php-${version}.tar.bz2";
- };
-
- meta = {
- description = "The PHP language runtime engine";
- homepage = http://www.php.net/;
- license = "PHP-3";
- };
-
- patches = [./fix.patch];
-
-})
diff --git a/pkgs/development/interpreters/php/5.3.nix b/pkgs/development/interpreters/php/5.3.nix
index b4f00ab1f7d..e073a51c92d 100644
--- a/pkgs/development/interpreters/php/5.3.nix
+++ b/pkgs/development/interpreters/php/5.3.nix
@@ -1,25 +1,23 @@
-args: with args;
+{ stdenv, fetchurl, composableDerivation, autoconf, automake, flex, bison
+, apacheHttpd, mysql, libxml2, readline, zlib, curl, gd, postgresql
+, openssl, pkgconfig, sqlite, config, libiconv, libjpeg, libpng }:
-let
+composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in {
- inherit (args.composableDerivation) composableDerivation edf wwf;
-
-in
-
-composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in {
-
- version = "5.3.15";
+ version = "5.3.18";
name = "php-${version}";
+ enableParallelBuilding = true;
+
buildInputs = ["flex" "bison" "pkgconfig"];
flags = {
-# much left to do here...
+ # much left to do here...
# SAPI modules:
-
+
apxs2 = {
configureFlags = ["--with-apxs2=${apacheHttpd}/bin/apxs"];
buildInputs = [apacheHttpd];
@@ -28,12 +26,12 @@ composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in {
# Extensions
curl = {
- configureFlags = ["--with-curl=${args.curl}" "--with-curlwrappers"];
+ configureFlags = ["--with-curl=${curl}" "--with-curlwrappers"];
buildInputs = [curl openssl];
};
-
+
zlib = {
- configureFlags = ["--with-zlib=${args.zlib}"];
+ configureFlags = ["--with-zlib=${zlib}"];
buildInputs = [zlib];
};
@@ -44,7 +42,7 @@ composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in {
];
buildInputs = [ libxml2 ];
};
-
+
readline = {
configureFlags = ["--with-readline=${readline}"];
buildInputs = [ readline ];
@@ -54,12 +52,12 @@ composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in {
configureFlags = ["--with-pdo-sqlite=${sqlite}"];
buildInputs = [ sqlite ];
};
-
+
postgresql = {
configureFlags = ["--with-pgsql=${postgresql}"];
buildInputs = [ postgresql ];
};
-
+
mysql = {
configureFlags = ["--with-mysql=${mysql}"];
buildInputs = [ mysql ];
@@ -80,13 +78,13 @@ composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in {
configureFlags = ["--with-pdo-mysql=${mysql}"];
buildInputs = [ mysql ];
};
-
+
bcmath = {
configureFlags = ["--enable-bcmath"];
};
gd = {
- configureFlags = ["--with-gd=${args.gd}"];
+ configureFlags = ["--with-gd=${gd}"];
buildInputs = [gd libpng libjpeg ];
};
@@ -99,7 +97,7 @@ composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in {
};
openssl = {
- configureFlags = ["--with-openssl=${args.openssl}"];
+ configureFlags = ["--with-openssl=${openssl}"];
buildInputs = ["openssl"];
};
@@ -121,23 +119,23 @@ composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in {
};
cfg = {
- mysqlSupport = getConfig ["php" "mysql"] true;
- mysqliSupport = getConfig ["php" "mysqli"] true;
- pdo_mysqlSupport = getConfig ["php" "pdo_mysql"] true;
- libxml2Support = getConfig ["php" "libxml2"] true;
- apxs2Support = getConfig ["php" "apxs2"] true;
- bcmathSupport = getConfig ["php" "bcmath"] true;
- socketsSupport = getConfig ["php" "sockets"] true;
- curlSupport = getConfig ["php" "curl"] true;
- gettextSupport = getConfig ["php" "gettext"] true;
- postgresqlSupport = getConfig ["php" "postgresql"] true;
- readlineSupport = getConfig ["php" "readline"] true;
- sqliteSupport = getConfig ["php" "sqlite"] true;
- soapSupport = getConfig ["php" "soap"] true;
- zlibSupport = getConfig ["php" "zlib"] true;
- opensslSupport = getConfig ["php" "openssl"] true;
- mbstringSupport = getConfig ["php" "mbstring"] true;
- gdSupport = getConfig ["php" "gd"] true;
+ mysqlSupport = config.php.mysql or true;
+ mysqliSupport = config.php.mysqli or true;
+ pdo_mysqlSupport = config.php.pdo_mysql or true;
+ libxml2Support = config.php.libxml2 or true;
+ apxs2Support = config.php.apxs2 or true;
+ bcmathSupport = config.php.bcmath or true;
+ socketsSupport = config.php.sockets or true;
+ curlSupport = config.php.curl or true;
+ gettextSupport = config.php.gettext or true;
+ postgresqlSupport = config.php.postgresql or true;
+ readlineSupport = config.php.readline or true;
+ sqliteSupport = config.php.sqlite or true;
+ soapSupport = config.php.soap or true;
+ zlibSupport = config.php.zlib or true;
+ opensslSupport = config.php.openssl or true;
+ mbstringSupport = config.php.mbstring or true;
+ gdSupport = config.php.gd or true;
};
configurePhase = ''
@@ -152,9 +150,9 @@ composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in {
cp php.ini-production $iniFile
'';
- src = args.fetchurl {
+ src = fetchurl {
url = "http://nl.php.net/get/php-${version}.tar.bz2/from/this/mirror";
- sha256 = "1vzij845n2akh2lkpacgdc5r0f7nw6pk9l9vi1h8l8k4krjjbdzr";
+ sha256 = "0bqsdwil13m1r449c4rhrc8cmx2a09k8h2g107qqxfwanzndwrgh";
name = "php-${version}.tar.bz2";
};
diff --git a/pkgs/development/interpreters/ruby/libs.nix b/pkgs/development/interpreters/ruby/libs.nix
index 9aa9203f10f..1b4b7aec2b1 100644
--- a/pkgs/development/interpreters/ruby/libs.nix
+++ b/pkgs/development/interpreters/ruby/libs.nix
@@ -1,4 +1,4 @@
-{stdenv, getConfig, fetchurl, callPackage}:
+{ stdenv, config, fetchurl, callPackage }:
let
inherit (stdenv.lib) fold optional;
@@ -36,7 +36,7 @@ in
if builtins.pathExists file then import (builtins.toPath file)
else null;
in
- getConfig [ "gems" name ] fallback;
+ stdenv.lib.attrByPath [ "gems" name ] fallback config;
in
{
generated = getLocalGemFun "generated";
diff --git a/pkgs/development/libraries/aacskeys/default.nix b/pkgs/development/libraries/aacskeys/default.nix
index 3bed95e2671..f791ea84f6b 100644
--- a/pkgs/development/libraries/aacskeys/default.nix
+++ b/pkgs/development/libraries/aacskeys/default.nix
@@ -6,7 +6,7 @@
let baseName = "aacskeys";
- version = "0.4.0c";
+ version = "0.4.0e";
in
stdenv.mkDerivation {
@@ -18,8 +18,8 @@ stdenv.mkDerivation {
'';
src = fetchurl {
- url = "http://debian-multimedia.org/pool/main/a/${baseName}/${baseName}_${version}.orig.tar.gz";
- sha256 = "54ea78898917f4acaf78101dda254de56bc7696bad12cbf22ee6f09d4ee88a43";
+ url = "http://deb-multimedia.org/pool/main/a/${baseName}/${baseName}_${version}.orig.tar.gz";
+ sha256 = "0d3zvwixpkixfkkc16wj37h2xbcq5hsqqhqngzqr6pslmqr67vnr";
};
buildInputs = [openssl jdk premake];
diff --git a/pkgs/development/libraries/atk/2.2.x.nix b/pkgs/development/libraries/atk/2.6.x.nix
similarity index 83%
rename from pkgs/development/libraries/atk/2.2.x.nix
rename to pkgs/development/libraries/atk/2.6.x.nix
index d0f7e109795..eba56776bd2 100644
--- a/pkgs/development/libraries/atk/2.2.x.nix
+++ b/pkgs/development/libraries/atk/2.6.x.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, perl, glib }:
stdenv.mkDerivation rec {
- name = "atk-2.2.0";
+ name = "atk-2.6.0";
src = fetchurl {
- url = mirror://gnome/sources/atk/2.2/atk-2.2.0.tar.xz;
- sha256 = "17bkqg89l9hxbkgc76cxlin1bwczk7m6ikbccx677lrxh3kz08lb";
+ url = "mirror://gnome/sources/atk/2.6/${name}.tar.xz";
+ sha256 = "eff663f90847620bb68c9c2cbaaf7f45e2ff44163b9ab3f10d15be763680491f";
};
buildNativeInputs = [ pkgconfig perl ];
diff --git a/pkgs/development/libraries/audio/suil/default.nix b/pkgs/development/libraries/audio/suil/default.nix
index a7300f541c4..0358e1c982c 100644
--- a/pkgs/development/libraries/audio/suil/default.nix
+++ b/pkgs/development/libraries/audio/suil/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, fetchurl, lv2, pkgconfig, python, serd, sord, sratom }:
+{ stdenv, fetchurl, gtk, lv2, pkgconfig, python, serd, sord, sratom, qt4 }:
stdenv.mkDerivation rec {
name = "suil-${version}";
- version = "0.6.2";
+ version = "0.6.4";
src = fetchurl {
url = "http://download.drobilla.net/${name}.tar.bz2";
- sha256 = "1rqi16zqnaf30gr2gwb8wbhg8a2l3m5fllf7rabldmgj4b4jlyzp";
+ sha256 = "12pz2w74rhhi6gsskfs6l71vw8qfz8906kbjf5w6jyy1x4kkdca2";
};
- buildInputs = [ lv2 pkgconfig python serd sord sratom ];
+ buildInputs = [ gtk lv2 pkgconfig python qt4 serd sord sratom ];
configurePhase = "python waf configure --prefix=$out";
diff --git a/pkgs/development/libraries/boehm-gc/default.nix b/pkgs/development/libraries/boehm-gc/default.nix
index 0ad643d9ac4..3b2670d988a 100644
--- a/pkgs/development/libraries/boehm-gc/default.nix
+++ b/pkgs/development/libraries/boehm-gc/default.nix
@@ -1,15 +1,20 @@
{ stdenv, fetchurl }:
-stdenv.mkDerivation (rec {
- name = "boehm-gc-7.2alpha6";
+stdenv.mkDerivation rec {
+ name = "boehm-gc-7.2d";
src = fetchurl {
- url = "http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc-7.2alpha6.tar.gz";
- sha256 = "05jwadjbrv8pr7z9cb4miskicxqpxm0pca4h2rg5cgbpajr2bx7b";
+ url = http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc-7.2d.tar.gz;
+ sha256 = "0phwa5driahnpn79zqff14w9yc8sn3599cxz91m78hqdcpl0mznr";
};
+ configureFlags = "--enable-cplusplus";
+
doCheck = true;
+ # Don't run the native `strip' when cross-compiling.
+ dontStrip = stdenv ? cross;
+
meta = {
description = "The Boehm-Demers-Weiser conservative garbage collector for C and C++";
@@ -39,10 +44,3 @@ stdenv.mkDerivation (rec {
platforms = stdenv.lib.platforms.all;
};
}
-
-//
-
-# Don't run the native `strip' when cross-compiling.
-(if (stdenv ? cross)
- then { dontStrip = true; }
- else { }))
diff --git a/pkgs/development/libraries/boost/1.51-headers.nix b/pkgs/development/libraries/boost/1.51-headers.nix
new file mode 100644
index 00000000000..4b1c1f80c54
--- /dev/null
+++ b/pkgs/development/libraries/boost/1.51-headers.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation {
+ name = "boost-1.51.0-headers";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/boost/boost_1_51_0.tar.bz2";
+ sha256 = "fb2d2335a29ee7fe040a197292bfce982af84a645c81688a915c84c925b69696";
+ };
+
+ phases = [ "installPhase" ];
+
+ installPhase = ''
+ mkdir -p $out/include
+ tar xf $src -C $out/include --strip-components=1 ./boost_1_51_0/boost
+ '';
+
+ meta = {
+ homepage = "http://boost.org/";
+ description = "Boost C++ Library Collection";
+ license = "boost-license";
+
+ platforms = stdenv.lib.platforms.unix;
+ maintainers = [ stdenv.lib.maintainers.viric stdenv.lib.maintainers.simons ];
+ };
+}
diff --git a/pkgs/development/libraries/boost/1.50-headers.nix b/pkgs/development/libraries/boost/1.52-headers.nix
similarity index 63%
rename from pkgs/development/libraries/boost/1.50-headers.nix
rename to pkgs/development/libraries/boost/1.52-headers.nix
index b901d73da73..b89273fdd30 100644
--- a/pkgs/development/libraries/boost/1.50-headers.nix
+++ b/pkgs/development/libraries/boost/1.52-headers.nix
@@ -1,18 +1,18 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation {
- name = "boost-1.50.0-headers";
+ name = "boost-1.52.0-headers";
src = fetchurl {
- url = "mirror://sourceforge/boost/boost_1_50_0.tar.bz2";
- sha256 = "0ac5b82g6b5pdhzypgddql0i3i9vvrwf9iqp3lyp19hzr2wf5b69";
+ url = "mirror://sourceforge/boost/boost_1_52_0.tar.bz2";
+ sha256 = "14mc7gsnnahdjaxbbslzk79rc0d12h1i681cd3srdwr3fzynlar2";
};
phases = [ "installPhase" ];
installPhase = ''
mkdir -p $out/include
- tar xvf $src -C $out/include --strip-components=1 boost_1_50_0/boost
+ tar xf $src -C $out/include --strip-components=1 ./boost_1_52_0/boost
'';
meta = {
diff --git a/pkgs/development/libraries/boost/1.50.nix b/pkgs/development/libraries/boost/1.52.nix
similarity index 94%
rename from pkgs/development/libraries/boost/1.50.nix
rename to pkgs/development/libraries/boost/1.52.nix
index 3d6c6010a20..0de11aaed87 100644
--- a/pkgs/development/libraries/boost/1.50.nix
+++ b/pkgs/development/libraries/boost/1.52.nix
@@ -38,7 +38,7 @@ let
in
stdenv.mkDerivation {
- name = "boost-1.50.0";
+ name = "boost-1.52.0";
meta = {
homepage = "http://boost.org/";
@@ -50,8 +50,8 @@ stdenv.mkDerivation {
};
src = fetchurl {
- url = "mirror://sourceforge/boost/boost_1_50_0.tar.bz2";
- sha256 = "0ac5b82g6b5pdhzypgddql0i3i9vvrwf9iqp3lyp19hzr2wf5b69";
+ url = "mirror://sourceforge/boost/boost_1_52_0.tar.bz2";
+ sha256 = "14mc7gsnnahdjaxbbslzk79rc0d12h1i681cd3srdwr3fzynlar2";
};
enableParallelBuilding = true;
diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix
index fe3fe1e251c..d21f303e741 100644
--- a/pkgs/development/libraries/cairo/default.nix
+++ b/pkgs/development/libraries/cairo/default.nix
@@ -5,7 +5,7 @@
, gobjectSupport ? true, glib
, stdenv, fetchurl, pkgconfig, x11, fontconfig, freetype, xlibs
, zlib, libpng, pixman, libxcb ? null, xcbutil ? null
-, gettext
+, gettext, libiconvOrEmpty
}:
assert postscriptSupport -> zlib != null;
@@ -13,11 +13,11 @@ assert pngSupport -> libpng != null;
assert xcbSupport -> libxcb != null && xcbutil != null;
stdenv.mkDerivation rec {
- name = "cairo-1.10.2";
-
+ name = "cairo-1.12.4";
+
src = fetchurl {
- url = "http://cairographics.org/releases/${name}.tar.gz";
- sha1 = "ccce5ae03f99c505db97c286a0c9a90a926d3c6e";
+ url = "http://cairographics.org/releases/${name}.tar.xz";
+ sha1 = "f4158981ed01e73c94fb8072074b17feee61a68b";
};
buildInputs =
@@ -25,14 +25,16 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optionals xcbSupport [ libxcb xcbutil ]
# On non-GNU systems we need GNU Gettext for libintl.
- ++ stdenv.lib.optional (!stdenv.isLinux) gettext;
+ ++ stdenv.lib.optional (!stdenv.isLinux) gettext
+
+ ++ libiconvOrEmpty;
propagatedBuildInputs =
[ freetype pixman ] ++
stdenv.lib.optional gobjectSupport glib ++
stdenv.lib.optional postscriptSupport zlib ++
stdenv.lib.optional pngSupport libpng;
-
+
configureFlags =
[ "--enable-tee" ]
++ stdenv.lib.optional xcbSupport "--enable-xcb"
@@ -43,7 +45,18 @@ stdenv.mkDerivation rec {
# `-I' flags to be propagated.
sed -i "src/cairo.pc.in" \
-es'|^Cflags:\(.*\)$|Cflags: \1 -I${freetype}/include/freetype2 -I${freetype}/include|g'
- '';
+ ''
+
+ # On FreeBSD, `-ldl' doesn't exist.
+ + (stdenv.lib.optionalString stdenv.isFreeBSD
+ '' for i in "util/"*"/Makefile.in" boilerplate/Makefile.in
+ do
+ cat "$i" | sed -es/-ldl//g > t
+ mv t "$i"
+ done
+ '');
+
+ enableParallelBuilding = true;
# The default `--disable-gtk-doc' is ignored.
postInstall = "rm -rf $out/share/gtk-doc";
diff --git a/pkgs/development/libraries/cyrus-sasl/default.nix b/pkgs/development/libraries/cyrus-sasl/default.nix
index a03f753a114..c5aefbe3214 100644
--- a/pkgs/development/libraries/cyrus-sasl/default.nix
+++ b/pkgs/development/libraries/cyrus-sasl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, openssl, db4, gettext }:
+{ stdenv, fetchurl, openssl, db4, gettext, pam }:
stdenv.mkDerivation rec {
name = "cyrus-sasl-2.1.25";
@@ -8,12 +8,13 @@ stdenv.mkDerivation rec {
sha256 = "418c16e6240a4f9b637cbe3d62937b9675627bad27c622191d47de8686fe24fe";
};
- buildInputs = [ openssl db4 gettext ];
+ buildInputs = [ openssl db4 gettext ] ++ stdenv.lib.optional stdenv.isLinux pam;
# Set this variable at build-time to make sure $out can be evaluated.
preConfigure = ''
configureFlagsArray=( --with-plugindir=$out/lib/sasl2
--with-configdir=$out/lib/sasl2
+ --with-saslauthd=/run/saslauthd
--enable-login
)
'';
diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix
index c943fe87fb3..0b8029c94db 100644
--- a/pkgs/development/libraries/dbus/default.nix
+++ b/pkgs/development/libraries/dbus/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, expat, libX11, libICE, libSM, useX11 ? true }:
let
- version = "1.4.16";
+ version = "1.6.4";
src = fetchurl {
url = "http://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.gz";
- sha256 = "1ii93d0lzj5xm564dcq6ca4s0nvm5i9fx3jp0s7i9hlc5wkfd3hx";
+ sha256 = "1wacqyfkcpayg7f8rvx9awqg275n5pksxq5q7y21lxjx85x6pfjz";
};
patches = [ ./ignore-missing-includedirs.patch ];
@@ -21,6 +21,10 @@ in rec {
buildInputs = [ expat ];
+ # FIXME: dbus has optional systemd integration when checking
+ # at_console policies. How to enable this without introducing a
+ # circular dependency between dbus and systemd?
+
inherit src patches configureFlags;
preConfigure =
@@ -58,6 +62,8 @@ in rec {
'';
postConfigure = "cd tools";
+
+ installFlags = "localstatedir=$TMPDIR/var";
};
# I'm too lazy to separate daemon and libs now.
diff --git a/pkgs/development/libraries/expat/cve-2009-3560.patch b/pkgs/development/libraries/expat/cve-2009-3560.patch
deleted file mode 100644
index 71da9e39351..00000000000
--- a/pkgs/development/libraries/expat/cve-2009-3560.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-From: http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-libs/expat/files/expat-2.0.1-CVE-2009-3560-revised.patch?revision=1.1
-
-http://nvd.nist.gov/nvd.cfm?cvename=CVE-2009-3560
-http://bugs.gentoo.org/show_bug.cgi?id=303727
-http://cvs.fedoraproject.org/viewvc/rpms/expat/devel/
-
---- a/lib/xmlparse.c
-+++ b/lib/xmlparse.c
-@@ -3703,6 +3703,9 @@ doProlog(XML_Parser parser,
- return XML_ERROR_UNCLOSED_TOKEN;
- case XML_TOK_PARTIAL_CHAR:
- return XML_ERROR_PARTIAL_CHAR;
-+ case -XML_TOK_PROLOG_S:
-+ tok = -tok;
-+ break;
- case XML_TOK_NONE:
- #ifdef XML_DTD
- /* for internal PE NOT referenced between declarations */
diff --git a/pkgs/development/libraries/expat/default.nix b/pkgs/development/libraries/expat/default.nix
index 35a2945207b..6b675230119 100644
--- a/pkgs/development/libraries/expat/default.nix
+++ b/pkgs/development/libraries/expat/default.nix
@@ -1,17 +1,15 @@
{ stdenv, fetchurl }:
-stdenv.mkDerivation {
- name = "expat-2.0.1";
-
+stdenv.mkDerivation rec {
+ name = "expat-2.1.0";
+
src = fetchurl {
- url = mirror://sourceforge/expat/expat-2.0.1.tar.gz;
- sha256 = "14sy5qx9hgjyfs743iq8ywldhp5w4n6cscqf2p4hgrw6vys60xl4";
+ url = "mirror://sourceforge/expat/${name}.tar.gz";
+ sha256 = "11pblz61zyxh68s5pdcbhc30ha1b2vfjd83aiwfg4vc15x3hadw2";
};
- patches = [ ./cve-2009-3560.patch ];
-
meta = {
- homepage = http://expat.sourceforge.net/;
+ homepage = http://www.libexpat.org/;
description = "A stream-oriented XML parser library written in C";
};
}
diff --git a/pkgs/development/libraries/farstream/default.nix b/pkgs/development/libraries/farstream/default.nix
index b2b8ca6255b..3babcb82833 100644
--- a/pkgs/development/libraries/farstream/default.nix
+++ b/pkgs/development/libraries/farstream/default.nix
@@ -1,5 +1,7 @@
{ stdenv, fetchurl, libnice, pkgconfig, python, gstreamer, gst_plugins_base
-, pygobject, gst_python, gupnp_igd }:
+, pygobject, gst_python, gupnp_igd
+, gst_plugins_good, gst_plugins_bad, gst_ffmpeg
+}:
stdenv.mkDerivation rec {
name = "farstream-0.1.2";
@@ -8,11 +10,13 @@ stdenv.mkDerivation rec {
sha256 = "1nbkbvq959f70zhr03fwdibhs0sbf1k7zmbz9w99vda7gdcl0nps";
};
- buildInputs = [ libnice python pygobject gst_python gupnp_igd ];
+ buildInputs = [ libnice python pygobject gupnp_igd ];
buildNativeInputs = [ pkgconfig ];
- propagatedBuildInputs = [ gstreamer gst_plugins_base ];
+ propagatedBuildInputs = [ gstreamer gst_plugins_base gst_python
+ gst_plugins_good gst_plugins_bad gst_ffmpeg
+ ];
meta = {
homepage = http://www.freedesktop.org/wiki/Software/Farstream;
diff --git a/pkgs/development/libraries/ffmpeg/1.0.nix b/pkgs/development/libraries/ffmpeg/1.0.nix
new file mode 100644
index 00000000000..7ac77ffdcb7
--- /dev/null
+++ b/pkgs/development/libraries/ffmpeg/1.0.nix
@@ -0,0 +1,85 @@
+{ stdenv, fetchurl, pkgconfig, yasm, zlib, bzip2
+, mp3Support ? true, lame ? null
+, speexSupport ? true, speex ? null
+, theoraSupport ? true, libtheora ? null
+, vorbisSupport ? true, libvorbis ? null
+, vpxSupport ? false, libvpx ? null
+, x264Support ? true, x264 ? null
+, xvidSupport ? true, xvidcore ? null
+, vdpauSupport ? true, libvdpau ? null
+, faacSupport ? false, faac ? null
+, dc1394Support ? false, libdc1394 ? null
+, x11grabSupport ? false, libXext ? null, libXfixes ? null
+}:
+
+assert speexSupport -> speex != null;
+assert theoraSupport -> libtheora != null;
+assert vorbisSupport -> libvorbis != null;
+assert vpxSupport -> libvpx != null;
+assert x264Support -> x264 != null;
+assert xvidSupport -> xvidcore != null;
+assert vdpauSupport -> libvdpau != null;
+assert faacSupport -> faac != null;
+assert x11grabSupport -> libXext != null && libXfixes != null;
+
+stdenv.mkDerivation rec {
+ name = "ffmpeg-1.0";
+
+ src = fetchurl {
+ url = "http://www.ffmpeg.org/releases/${name}.tar.bz2";
+ sha256 = "1jbi85z2zkk3fh09l9f1s70kpvsz8706ay4lsw75395q8vic70hd";
+ };
+
+ # `--enable-gpl' (as well as the `postproc' and `swscale') mean that
+ # the resulting library is GPL'ed, so it can only be used in GPL'ed
+ # applications.
+ configureFlags = [
+ "--enable-gpl"
+ "--enable-postproc"
+ "--enable-swscale"
+ "--disable-ffplay"
+ "--enable-shared"
+ "--enable-runtime-cpudetect"
+ ]
+ ++ stdenv.lib.optional mp3Support "--enable-libmp3lame"
+ ++ stdenv.lib.optional speexSupport "--enable-libspeex"
+ ++ stdenv.lib.optional theoraSupport "--enable-libtheora"
+ ++ stdenv.lib.optional vorbisSupport "--enable-libvorbis"
+ ++ stdenv.lib.optional vpxSupport "--enable-libvpx"
+ ++ stdenv.lib.optional x264Support "--enable-libx264"
+ ++ stdenv.lib.optional xvidSupport "--enable-libxvid"
+ ++ stdenv.lib.optional vdpauSupport "--enable-vdpau"
+ ++ stdenv.lib.optional faacSupport "--enable-libfaac --enable-nonfree"
+ ++ stdenv.lib.optional dc1394Support "--enable-libdc1394"
+ ++ stdenv.lib.optional x11grabSupport "--enable-x11grab";
+
+ buildInputs = [ pkgconfig lame yasm zlib bzip2 ]
+ ++ stdenv.lib.optional mp3Support lame
+ ++ stdenv.lib.optional speexSupport speex
+ ++ stdenv.lib.optional theoraSupport libtheora
+ ++ stdenv.lib.optional vorbisSupport libvorbis
+ ++ stdenv.lib.optional vpxSupport libvpx
+ ++ stdenv.lib.optional x264Support x264
+ ++ stdenv.lib.optional xvidSupport xvidcore
+ ++ stdenv.lib.optional vdpauSupport libvdpau
+ ++ stdenv.lib.optional faacSupport faac
+ ++ stdenv.lib.optional dc1394Support libdc1394
+ ++ stdenv.lib.optionals x11grabSupport [ libXext libXfixes ];
+
+ enableParallelBuilding = true;
+
+ crossAttrs = {
+ dontSetConfigureCross = true;
+ configureFlags = configureFlags ++ [
+ "--cross-prefix=${stdenv.cross.config}-"
+ "--enable-cross-compile"
+ "--target_os=linux"
+ "--arch=${stdenv.cross.arch}"
+ ];
+ };
+
+ meta = {
+ homepage = http://www.ffmpeg.org/;
+ description = "A complete, cross-platform solution to record, convert and stream audio and video";
+ };
+}
diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix
index 8e016401e3d..116fe3c0c20 100644
--- a/pkgs/development/libraries/fontconfig/default.nix
+++ b/pkgs/development/libraries/fontconfig/default.nix
@@ -1,22 +1,21 @@
-{ stdenv, fetchurl, freetype, expat }:
+{ stdenv, fetchurl, pkgconfig, freetype, expat }:
stdenv.mkDerivation rec {
- name = "fontconfig-2.8.0";
-
+ name = "fontconfig-2.10.1";
+
src = fetchurl {
url = "http://fontconfig.org/release/${name}.tar.gz";
- sha256 = "0d9370qnn1qzq0jidbycin2frkcr1kqj04jbgb79ykb5x9p1qaps";
+ sha256 = "08h252crb3aqciwdk81jypmz2i7618dzqn3zlr87w1f017wjp4f3";
};
-
- buildInputs = [ freetype ];
+
+ buildInputs = [ pkgconfig freetype ];
+
propagatedBuildInputs = [ expat ]; # !!! shouldn't be necessary, but otherwise pango breaks
configureFlags = "--with-confdir=/etc/fonts --with-cache-dir=/var/cache/fontconfig --disable-docs --with-default-fonts=";
# We should find a better way to access the arch reliably.
- crossArch = if (stdenv ? cross && stdenv.cross != null)
- then stdenv.cross.arch else null;
-
+ crossArch = stdenv.cross.arch or null;
preConfigure = ''
if test -n "$crossConfig"; then
@@ -24,6 +23,8 @@ stdenv.mkDerivation rec {
fi
'';
+ enableParallelBuilding = true;
+
# Don't try to write to /etc/fonts or /var/cache/fontconfig at install time.
installFlags = "CONFDIR=$(out)/etc/fonts RUN_FC_CACHE_TEST=false fc_cachedir=$(TMPDIR)/dummy";
@@ -31,5 +32,5 @@ stdenv.mkDerivation rec {
description = "A library for font customization and configuration";
homepage = http://fontconfig.org/;
license = "bsd";
- };
+ };
}
diff --git a/pkgs/development/libraries/fox/default.nix b/pkgs/development/libraries/fox/default.nix
new file mode 100644
index 00000000000..76cc1d5c3d2
--- /dev/null
+++ b/pkgs/development/libraries/fox/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchurl, x11 }:
+
+let
+ version = "1.7.9";
+in
+
+stdenv.mkDerivation rec {
+ name = "fox-${version}";
+
+ src = fetchurl {
+ url = "ftp://ftp.fox-toolkit.org/pub/${name}.tar.gz";
+ md5 = "b5897e9c664967f5042e57070037ff18";
+ };
+
+ buildInputs = [ x11 ];
+
+ doCheck = true;
+
+ enableParallelBuilding = true;
+
+ meta = {
+ description = "FOX is a C++ based class library for building Graphical User Interfaces";
+ longDescription = ''
+ FOX stands for Free Objects for X.
+ It is a C++ based class library for building Graphical User Interfaces.
+ Initially, it was developed for LINUX, but the scope of this project has in the course of time become somewhat more ambitious.
+ Current aims are to make FOX completely platform independent, and thus programs written against the FOX library will be only a compile away from running on a variety of platforms.
+ '';
+ homepage = "http://fox-toolkit.org";
+ license = "LGPL";
+ maintainers = [ stdenv.lib.maintainers.bbenoist ];
+ platforms = stdenv.lib.platforms.all;
+ };
+}
diff --git a/pkgs/development/libraries/fox/fox-1.6.nix b/pkgs/development/libraries/fox/fox-1.6.nix
new file mode 100644
index 00000000000..e8961621cab
--- /dev/null
+++ b/pkgs/development/libraries/fox/fox-1.6.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchurl, x11 }:
+
+let
+ version = "1.6.9";
+in
+
+stdenv.mkDerivation rec {
+ name = "fox-${version}";
+
+ src = fetchurl {
+ url = "ftp://ftp.fox-toolkit.org/pub/${name}.tar.gz";
+ md5 = "8ab8274237431865f57b2f5596374a65";
+ };
+
+ buildInputs = [ x11 ];
+
+ doCheck = true;
+
+ enableParallelBuilding = true;
+
+ meta = {
+ description = "FOX is a C++ based class library for building Graphical User Interfaces";
+ longDescription = ''
+ FOX stands for Free Objects for X.
+ It is a C++ based class library for building Graphical User Interfaces.
+ Initially, it was developed for LINUX, but the scope of this project has in the course of time become somewhat more ambitious.
+ Current aims are to make FOX completely platform independent, and thus programs written against the FOX library will be only a compile away from running on a variety of platforms.
+ '';
+ homepage = "http://fox-toolkit.org";
+ license = "LGPL";
+ maintainers = [ stdenv.lib.maintainers.bbenoist ];
+ platforms = stdenv.lib.platforms.all;
+ };
+}
diff --git a/pkgs/development/libraries/freeimage/default.nix b/pkgs/development/libraries/freeimage/default.nix
index ec381dc433a..c3cfa6e8c87 100644
--- a/pkgs/development/libraries/freeimage/default.nix
+++ b/pkgs/development/libraries/freeimage/default.nix
@@ -1,9 +1,9 @@
{stdenv, fetchurl, unzip}:
stdenv.mkDerivation {
- name = "freeimage-3.15.0";
+ name = "freeimage-3.15.3";
src = fetchurl {
- url = mirror://sourceforge/freeimage/FreeImage3150.zip;
- sha256 = "0diyj862sdqwjqb7v2nccf8cl6886v937jkw6dgszp86qpwsfx3n";
+ url = mirror://sourceforge/freeimage/FreeImage3153.zip;
+ sha256 = "0i60fn1n9rw55dci0yw92zrw7k1jz3f9kv2z1wxmh84s5ngxa626";
};
buildInputs = [ unzip ];
prePatch = ''
diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix
index e53a3c297ff..a2d14be5001 100644
--- a/pkgs/development/libraries/freetype/default.nix
+++ b/pkgs/development/libraries/freetype/default.nix
@@ -5,12 +5,12 @@
useEncumberedCode ? false
}:
-stdenv.mkDerivation (rec {
- name = "freetype-2.4.4";
-
+stdenv.mkDerivation rec {
+ name = "freetype-2.4.10";
+
src = fetchurl {
url = "mirror://sourceforge/freetype/${name}.tar.bz2";
- sha256 = "1vqg93473j6jma1bxms7mczk32j8is0g9inkcmmmqdsdvk3q30jb";
+ sha256 = "0bwrkqpygayfc1rf6rr1nb8l3svgn1fmjz8davg2hnf46cn293hc";
};
configureFlags = "--disable-static";
@@ -21,16 +21,26 @@ stdenv.mkDerivation (rec {
# The asm for armel is written with the 'asm' keyword.
CFLAGS = stdenv.lib.optionalString stdenv.isArm "-std=gnu99";
+ # FreeType requires GNU Make, which is not part of stdenv on FreeBSD.
+ buildInputs = stdenv.lib.optional (stdenv.system == "i686-freebsd") gnumake;
+
+ enableParallelBuilding = true;
+
+ postInstall =
+ ''
+ ln -s freetype2/freetype $out/include/freetype
+ '';
+
+ crossAttrs = {
+ # Somehow it calls the unwrapped gcc, "i686-pc-linux-gnu-gcc", instead
+ # of gcc. I think it's due to the unwrapped gcc being in the PATH. I don't
+ # know why it's on the PATH.
+ configureFlags = "--disable-static CC_BUILD=gcc";
+ };
+
meta = {
description = "A font rendering engine";
homepage = http://www.freetype.org/;
license = "GPLv2+"; # or the FreeType License (BSD + advertising clause)
};
}
-
-//
-
-# FreeType requires GNU Make, which is not part of stdenv on FreeBSD.
-(if stdenv.system == "i686-freebsd"
- then { buildInputs = [ gnumake ]; }
- else {}))
diff --git a/pkgs/development/libraries/gamin/debian-patches.nix b/pkgs/development/libraries/gamin/debian-patches.nix
index 1da558db141..f784b8ccfee 100644
--- a/pkgs/development/libraries/gamin/debian-patches.nix
+++ b/pkgs/development/libraries/gamin/debian-patches.nix
@@ -1,6 +1,6 @@
# Generated by debian-patches.sh from debian-patches.txt
let
- prefix = "http://patch-tracker.debian.org/patch/series/dl/gamin/0.1.10-4";
+ prefix = "http://patch-tracker.debian.org/patch/series/dl/gamin/0.1.10-4.1";
in
[
{
diff --git a/pkgs/development/libraries/gdk-pixbuf/2.24.x.nix b/pkgs/development/libraries/gdk-pixbuf/2.26.x.nix
similarity index 73%
rename from pkgs/development/libraries/gdk-pixbuf/2.24.x.nix
rename to pkgs/development/libraries/gdk-pixbuf/2.26.x.nix
index 5c0860196d3..07e66df33b5 100644
--- a/pkgs/development/libraries/gdk-pixbuf/2.24.x.nix
+++ b/pkgs/development/libraries/gdk-pixbuf/2.26.x.nix
@@ -1,12 +1,11 @@
-{ stdenv, fetchurl, pkgconfig, glib, libtiff, libjpeg, libpng, libX11, xz
-, jasper }:
+{ stdenv, fetchurl, pkgconfig, glib, libtiff, libjpeg, libpng, libX11, xz, jasper }:
-stdenv.mkDerivation {
- name = "gdk-pixbuf-2.24.1";
+stdenv.mkDerivation rec {
+ name = "gdk-pixbuf-2.26.1";
src = fetchurl {
- url = mirror://gnome/sources/gdk-pixbuf/2.24/gdk-pixbuf-2.24.1.tar.xz;
- sha256 = "1qdywh1r75lalb7z6s9pm6pmqx82chrrxqb8cdqi629nvc03yyns";
+ url = "mirror://gnome/sources/gdk-pixbuf/2.26/${name}.tar.xz";
+ sha256 = "a60af12b58d9cc15ba4c680c6730ce5d38e8d664af1d575a379385b94b4ec7ba";
};
# !!! We might want to factor out the gdk-pixbuf-xlib subpackage.
diff --git a/pkgs/development/libraries/glib/2.30.x.nix b/pkgs/development/libraries/glib/2.34.x.nix
similarity index 71%
rename from pkgs/development/libraries/glib/2.30.x.nix
rename to pkgs/development/libraries/glib/2.34.x.nix
index 72baf0154d9..7fb61ac20e2 100644
--- a/pkgs/development/libraries/glib/2.30.x.nix
+++ b/pkgs/development/libraries/glib/2.34.x.nix
@@ -11,26 +11,25 @@
# Reminder: add 'sed -e 's@python2\.[0-9]@python@' -i
# $out/bin/gtester-report' to postInstall if this is solved
-stdenv.mkDerivation rec {
- name = "glib-2.30.3";
+stdenv.mkDerivation (rec {
+ name = "glib-2.34.0";
src = fetchurl {
- url = mirror://gnome/sources/glib/2.30/glib-2.30.3.tar.xz;
- sha256 = "09yxfajynbw78kji48z384lylp67kihfi1g78qrrjif4f5yb5jz6";
+ url = "mirror://gnome/sources/glib/2.34/${name}.tar.xz";
+ sha256 = "f69b112f8848be35139d9099b62bc81649241f78f6a775516f0d4c9b47f65144";
};
# configure script looks for d-bus but it is only needed for tests
- buildInputs = [ pcre ]
- ++ (if libiconvOrNull != null
- then [ libiconvOrNull ]
- else []);
+ buildInputs = [ libiconvOrNull ];
buildNativeInputs = [ perl pkgconfig gettext python ];
- propagatedBuildInputs = [ zlib libffi ];
+ propagatedBuildInputs = [ pcre zlib libffi ];
configureFlags = "--with-pcre=system --disable-fam";
+ enableParallelBuilding = true;
+
passthru.gioModuleDir = "lib/gio/modules";
postInstall = ''rm -rvf $out/share/gtk-doc'';
@@ -53,3 +52,13 @@ stdenv.mkDerivation rec {
platforms = stdenv.lib.platforms.linux;
};
}
+
+//
+
+(stdenv.lib.optionalAttrs stdenv.isDarwin {
+ # XXX: Disable the NeXTstep back-end because stdenv.gcc doesn't support
+ # Objective-C.
+ postConfigure =
+ '' sed -i configure -e's/glib_have_cocoa=yes/glib_have_cocoa=no/g'
+ '';
+}))
diff --git a/pkgs/development/libraries/gnu-efi/default.nix b/pkgs/development/libraries/gnu-efi/default.nix
index c43e9f6b4da..731b44aa0ec 100644
--- a/pkgs/development/libraries/gnu-efi/default.nix
+++ b/pkgs/development/libraries/gnu-efi/default.nix
@@ -3,11 +3,11 @@
}:
stdenv.mkDerivation {
- name = "gnu-efi-3.0p";
+ name = "gnu-efi-3.0r";
src = fetchurl {
- url = "mirror://sourceforge/gnu-efi/gnu-efi_3.0p.orig.tar.gz";
- sha256 = "1pm4wk1gma7mb8z19js7kb5y31a0zk308mkafmq6gb0b2a0i39cn";
+ url = "mirror://sourceforge/gnu-efi/gnu-efi_3.0r.orig.tar.gz";
+ sha256 = "1zi298wsg8v29xj4azcawqfjbxqi2w7l60agf7x2ph2lnqlga2v5";
};
meta = {
diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix
index 93f5dab537e..ee566d46b65 100644
--- a/pkgs/development/libraries/gnutls/default.nix
+++ b/pkgs/development/libraries/gnutls/default.nix
@@ -5,29 +5,29 @@ assert guileBindings -> guile != null;
stdenv.mkDerivation (rec {
- name = "gnutls-3.0.22";
+ name = "gnutls-3.1.3";
src = fetchurl {
url = "mirror://gnu/gnutls/${name}.tar.xz";
- sha256 = "1pp90fm27qi5cd0pq18xcmnl79xcbfwxc54bg1xi1wv0vryqdpcr";
+ sha256 = "0fff9frz0ycbnppfn0w4a2s9x27k21l4hh9zbax3v7a8cg33dcpw";
};
- # FIXME: Turn into a Nix list.
+ # Note: GMP is a dependency of Nettle, whose public headers include
+ # GMP headers, hence the hack.
configurePhase = ''
./configure --prefix="$out" \
--disable-dependency-tracking --enable-fast-install \
--without-p11-kit \
- --with-lzo --with-libtasn1-prefix="${libtasn1}" \
+ --with-lzo --with-libtasn1-prefix="${libtasn1}" \
+ --with-libnettle-prefix="${nettle}" \
+ CPPFLAGS="-I${gmp}/include" \
${if guileBindings
then "--enable-guile --with-guile-site-dir=\"$out/share/guile/site\""
- else ""}${if stdenv.isSunOS
- # TODO: Use `--with-libnettle-prefix' on all platforms
- # Note: GMP is a dependency of Nettle, whose public headers include
- # GMP headers, hence the hack.
- then " --with-libnettle-prefix=${nettle} CPPFLAGS=-I${gmp}/include"
else ""}
'';
+ enableParallelBuilding = true;
+
buildInputs = [ zlib lzo ]
++ stdenv.lib.optional guileBindings guile;
diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix
index de9059dbd15..fe1d519f562 100644
--- a/pkgs/development/libraries/gobject-introspection/default.nix
+++ b/pkgs/development/libraries/gobject-introspection/default.nix
@@ -1,12 +1,7 @@
{ stdenv, fetchurl, glib, flex, bison, pkgconfig, libffi, python }:
-let
- baseName = "gobject-introspection";
- v = "0.10.8";
-in
-
stdenv.mkDerivation rec {
- name = "${baseName}-${v}";
+ name = "gobject-introspection-1.34.0";
buildInputs = [ flex bison glib pkgconfig python ];
propagatedBuildInputs = [ libffi ];
@@ -16,8 +11,8 @@ stdenv.mkDerivation rec {
configureFlags = "--disable-tests";
src = fetchurl {
- url = "mirror://gnome/sources/${baseName}/0.10/${name}.tar.bz2";
- sha256 = "5b1387ff37f03db880a2b1cbd6c6b6dfb923a29468d4d8367c458abf7704c61e";
+ url = "mirror://gnome/sources/gobject-introspection/1.34/${name}.tar.xz";
+ sha256 = "80e211ea95404fc7c5fa3b04ba69ee0b29af70847af315155ab06b8cff832c85";
};
postInstall = "rm -rf $out/share/gtk-doc";
diff --git a/pkgs/development/libraries/goffice/default.nix b/pkgs/development/libraries/goffice/default.nix
index b90cbbad920..1eaa1baf86d 100644
--- a/pkgs/development/libraries/goffice/default.nix
+++ b/pkgs/development/libraries/goffice/default.nix
@@ -1,19 +1,18 @@
{ fetchurl, stdenv, pkgconfig, glib, gtk, libglade, bzip2
, pango, libgsf, libxml2, libart, intltool, gettext
-, cairo, gconf, libgnomeui }:
+, cairo, gconf, libgnomeui, pcre }:
stdenv.mkDerivation rec {
- name = "goffice-0.6.6";
+ name = "goffice-0.8.17";
src = fetchurl {
- # An old version, but one that's actually usable for Gnucash.
- url = "mirror://gnome/sources/goffice/0.6/${name}.tar.bz2";
- sha256 = "11lzhmk7g6mdsbyn4p4a6q2d9m8j71vad2haw6pmzyjzv2gs4rq7";
+ url = "mirror://gnome/sources/goffice/0.8/${name}.tar.xz";
+ sha256 = "165070beb67b84580afe80a8a100b674a81d553ab791acd72ac0c655f4fadb15";
};
buildInputs = [
pkgconfig libglade bzip2 libart intltool gettext
- gconf libgnomeui
+ gconf libgnomeui pcre
];
propagatedBuildInputs = [
@@ -21,6 +20,12 @@ stdenv.mkDerivation rec {
glib libgsf libxml2 gtk libglade libart cairo pango
];
+ postInstall =
+ ''
+ # Get GnuCash to build. Might be unnecessary if we upgrade pkgconfig.
+ substituteInPlace $out/lib/pkgconfig/libgoffice-*.pc --replace Requires.private Requires
+ '';
+
doCheck = true;
meta = {
diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix
index 582208f08b6..2f1411a0bda 100644
--- a/pkgs/development/libraries/gpgme/default.nix
+++ b/pkgs/development/libraries/gpgme/default.nix
@@ -1,5 +1,15 @@
-{ stdenv, fetchurl, libgpgerror, gnupg, pkgconfig, glib, pth, libassuan }:
+{ stdenv, fetchurl, libgpgerror, gnupg, pkgconfig, glib, pth, libassuan
+, useGnupg1 ? false, gnupg1 ? null }:
+assert useGnupg1 -> gnupg1 != null;
+assert !useGnupg1 -> gnupg != null;
+
+let
+ gpgPath = if useGnupg1 then
+ "${gnupg1}/bin/gpg"
+ else
+ "${gnupg}/bin/gpg2";
+in
stdenv.mkDerivation rec {
name = "gpgme-1.3.1";
@@ -8,9 +18,9 @@ stdenv.mkDerivation rec {
sha256 = "1m7l7nicn6gd952cgspv9xr8whqivbg33nbg8kbpj3dffnl2gvqm";
};
- propagatedBuildInputs = [ libgpgerror glib pth libassuan ];
+ propagatedBuildInputs = [ libgpgerror glib libassuan pth ];
buildNativeInputs = [ pkgconfig ];
- configureFlags = "--with-gpg=${gnupg}/bin/gpg2";
+ configureFlags = "--with-gpg=${gpgPath}";
}
diff --git a/pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix b/pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix
index 47762660b29..2ac325dc282 100644
--- a/pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix
+++ b/pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix
@@ -8,14 +8,14 @@
}:
stdenv.mkDerivation rec {
- name = "gst-plugins-base-0.10.35";
+ name = "gst-plugins-base-0.10.36";
src = fetchurl {
urls = [
- "${meta.homepage}/src/gst-plugins-base/${name}.tar.bz2"
- "mirror://gentoo/distfiles/${name}.tar.bz2"
+ "${meta.homepage}/src/gst-plugins-base/${name}.tar.xz"
+ "mirror://gentoo/distfiles/${name}.tar.xz"
];
- sha256 = "00vis5kg6km26zaq1ywz7ki9xvkwpc9c5wn41d01z2i5nldz096d";
+ sha256 = "0jp6hjlra98cnkal4n6bdmr577q8mcyp3c08s3a02c4hjhw5rr0z";
};
patchPhase = ''
@@ -43,3 +43,4 @@ stdenv.mkDerivation rec {
license = "LGPLv2+";
};
}
+
diff --git a/pkgs/development/libraries/gstreamer/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/gstreamer/default.nix
index 01d5487302c..5d33e7bff03 100644
--- a/pkgs/development/libraries/gstreamer/gstreamer/default.nix
+++ b/pkgs/development/libraries/gstreamer/gstreamer/default.nix
@@ -1,14 +1,14 @@
{ fetchurl, stdenv, perl, bison, flex, pkgconfig, glib, libxml2 }:
stdenv.mkDerivation rec {
- name = "gstreamer-0.10.35";
+ name = "gstreamer-0.10.36";
src = fetchurl {
urls =
- [ "${meta.homepage}/src/gstreamer/${name}.tar.bz2"
- "mirror://gentoo/distfiles/${name}.tar.bz2"
+ [ "${meta.homepage}/src/gstreamer/${name}.tar.xz"
+ "mirror://gentoo/distfiles/${name}.tar.xz"
];
- sha256 = "11lp13lig3c6qys80phyvsik56r9y0c95vg2jxxliqj6rnigwyw1";
+ sha256 = "1nkid1n2l3rrlmq5qrf5yy06grrkwjh3yxl5g0w58w0pih8allci";
};
buildInputs = [ perl bison flex pkgconfig ];
diff --git a/pkgs/development/libraries/gtk+/2.24.x.nix b/pkgs/development/libraries/gtk+/2.24.x.nix
index 12b270d637b..2bf657e04e7 100644
--- a/pkgs/development/libraries/gtk+/2.24.x.nix
+++ b/pkgs/development/libraries/gtk+/2.24.x.nix
@@ -7,24 +7,18 @@
assert xineramaSupport -> xlibs.libXinerama != null;
assert cupsSupport -> cups != null;
-stdenv.mkDerivation {
- name = "gtk+-2.24.10";
+stdenv.mkDerivation rec {
+ name = "gtk+-2.24.13";
src = fetchurl {
- url = mirror://gnome/sources/gtk+/2.24/gtk+-2.24.10.tar.xz;
- sha256 = "128fb8vmsqmfmpf1r8na65281jwkqix4q7wix399xqfnp4dy6mpa";
+ url = "mirror://gnome/sources/gtk+/2.24/${name}.tar.xz";
+ sha256 = "35e1a01e46b02970b02ee9f299390d0aa57c1215ad2667bcd584b72f4ea6513d";
};
- patches =
- [ # Fix broken icons such as the back/forward buttons in Firefox.
- # http://bugs.gentoo.org/339319
- ./old-icons.patch
- ];
-
enableParallelBuilding = true;
-
+
buildNativeInputs = [ perl pkgconfig ];
-
+
propagatedBuildInputs =
[ xlibs.xlibs glib atk pango gdk_pixbuf cairo
xlibs.libXrandr xlibs.libXrender xlibs.libXcomposite xlibs.libXi
@@ -35,7 +29,7 @@ stdenv.mkDerivation {
configureFlags = "--with-xinput=yes";
postInstall = "rm -rf $out/share/gtk-doc";
-
+
meta = {
description = "A multi-platform toolkit for creating graphical user interfaces";
diff --git a/pkgs/development/libraries/gtk+/3.2.x.nix b/pkgs/development/libraries/gtk+/3.2.x.nix
index df59c017626..9f333c03fab 100644
--- a/pkgs/development/libraries/gtk+/3.2.x.nix
+++ b/pkgs/development/libraries/gtk+/3.2.x.nix
@@ -8,11 +8,11 @@ assert xineramaSupport -> xlibs.libXinerama != null;
assert cupsSupport -> cups != null;
stdenv.mkDerivation rec {
- name = "gtk+-3.2.3";
+ name = "gtk+-3.2.4";
src = fetchurl {
- url = mirror://gnome/sources/gtk+/3.2/gtk+-3.2.3.tar.xz;
- sha256 = "0g8x2kcqq17bccm4yszim837saj73zfk66ia2azcgfqfa7r21kz2";
+ url = "mirror://gnome/sources/gtk+/3.2/${name}.tar.xz";
+ sha256 = "f981bf514858c00d7084bd6f6c34b3c60b8aebdb959e7aca6faa59ed67c136bd";
};
enableParallelBuilding = true;
diff --git a/pkgs/development/libraries/gtk+/old-icons.patch b/pkgs/development/libraries/gtk+/old-icons.patch
deleted file mode 100644
index e53d87474d0..00000000000
--- a/pkgs/development/libraries/gtk+/old-icons.patch
+++ /dev/null
@@ -1,270 +0,0 @@
-diff -ru gtk+-2.24.5-orig/gtk/Makefile.in gtk+-2.24.5/gtk/Makefile.in
---- gtk+-2.24.5-orig/gtk/Makefile.in 2011-06-16 01:56:37.000000000 +0200
-+++ gtk+-2.24.5/gtk/Makefile.in 2011-07-07 15:38:06.000000000 +0200
-@@ -1616,7 +1616,173 @@
- stock-icons/24/folder-remote.png \
- stock-icons/24/user-home.png \
- stock-icons/24/user-desktop.png \
-- stock-icons/24/text-x-generic.png
-+ stock-icons/24/text-x-generic.png \
-+ stock-icons/16/gtk-quit.png \
-+ stock-icons/16/gtk-info.png \
-+ stock-icons/16/gtk-file.png \
-+ stock-icons/16/gtk-open.png \
-+ stock-icons/16/gtk-print-preview.png \
-+ stock-icons/16/gtk-print.png \
-+ stock-icons/16/gtk-properties.png \
-+ stock-icons/16/gtk-revert-to-saved-ltr.png \
-+ stock-icons/16/gtk-revert-to-saved-rtl.png \
-+ stock-icons/16/gtk-save-as.png \
-+ stock-icons/16/gtk-new.png \
-+ stock-icons/16/gtk-harddisk.png \
-+ stock-icons/16/gtk-clear.png \
-+ stock-icons/16/gtk-copy.png \
-+ stock-icons/16/gtk-cut.png \
-+ stock-icons/16/gtk-delete.png \
-+ stock-icons/16/gtk-find-and-replace.png \
-+ stock-icons/16/gtk-find.png \
-+ stock-icons/16/gtk-paste.png \
-+ stock-icons/16/gtk-redo-ltr.png \
-+ stock-icons/16/gtk-redo-rtl.png \
-+ stock-icons/16/gtk-select-all.png \
-+ stock-icons/16/gtk-undo-ltr.png \
-+ stock-icons/16/gtk-undo-rtl.png \
-+ stock-icons/16/gtk-directory.png \
-+ stock-icons/16/gtk-unindent-ltr.png \
-+ stock-icons/16/gtk-unindent-rtl.png \
-+ stock-icons/16/gtk-indent-ltr.png \
-+ stock-icons/16/gtk-indent-rtl.png \
-+ stock-icons/16/gtk-justify-center.png \
-+ stock-icons/16/gtk-justify-fill.png \
-+ stock-icons/16/gtk-justify-left.png \
-+ stock-icons/16/gtk-justify-right.png \
-+ stock-icons/16/gtk-bold.png \
-+ stock-icons/16/gtk-italic.png \
-+ stock-icons/16/gtk-strikethrough.png \
-+ stock-icons/16/gtk-underline.png \
-+ stock-icons/16/gtk-goto-bottom.png \
-+ stock-icons/16/gtk-go-down.png \
-+ stock-icons/16/gtk-goto-first-ltr.png \
-+ stock-icons/16/gtk-home.png \
-+ stock-icons/16/gtk-jump-to-ltr.png \
-+ stock-icons/16/gtk-jump-to-rtl.png \
-+ stock-icons/16/gtk-goto-last-ltr.png \
-+ stock-icons/16/gtk-go-forward-ltr.png \
-+ stock-icons/16/gtk-go-back-ltr.png \
-+ stock-icons/16/gtk-goto-top.png \
-+ stock-icons/16/gtk-go-up.png \
-+ stock-icons/16/gtk-about.png \
-+ stock-icons/16/gtk-help.png \
-+ stock-icons/16/gtk-missing-image.png \
-+ stock-icons/16/gtk-add.png \
-+ stock-icons/16/gtk-remove.png \
-+ stock-icons/16/gtk-floppy.png \
-+ stock-icons/16/gtk-cdrom.png \
-+ stock-icons/16/gtk-media-pause.png \
-+ stock-icons/16/gtk-media-play-ltr.png \
-+ stock-icons/16/gtk-media-play-rtl.png \
-+ stock-icons/16/gtk-media-stop.png \
-+ stock-icons/16/gtk-media-record.png \
-+ stock-icons/16/gtk-media-rewind-ltr.png \
-+ stock-icons/16/gtk-media-forward-ltr.png \
-+ stock-icons/16/gtk-media-previous-ltr.png \
-+ stock-icons/16/gtk-media-next-ltr.png \
-+ stock-icons/16/gtk-network.png \
-+ stock-icons/16/gtk-print-error.png \
-+ stock-icons/16/gtk-print-report.png \
-+ stock-icons/16/gtk-print-paused.png \
-+ stock-icons/16/gtk-print-warning.png \
-+ stock-icons/16/gtk-stop.png \
-+ stock-icons/16/gtk-execute.png \
-+ stock-icons/16/gtk-spell-check.png \
-+ stock-icons/16/gtk-fullscreen.png \
-+ stock-icons/16/gtk-refresh.png \
-+ stock-icons/16/gtk-leave-fullscreen.png \
-+ stock-icons/16/gtk-sort-ascending.png \
-+ stock-icons/16/gtk-sort-descending.png \
-+ stock-icons/16/gtk-close.png \
-+ stock-icons/16/gtk-zoom-fit.png \
-+ stock-icons/16/gtk-zoom-in.png \
-+ stock-icons/16/gtk-zoom-100.png \
-+ stock-icons/16/gtk-zoom-out.png \
-+ stock-icons/24/gtk-quit.png \
-+ stock-icons/24/gtk-info.png \
-+ stock-icons/24/gtk-file.png \
-+ stock-icons/24/gtk-open.png \
-+ stock-icons/24/gtk-print-preview.png \
-+ stock-icons/24/gtk-print.png \
-+ stock-icons/24/gtk-properties.png \
-+ stock-icons/24/gtk-revert-to-saved-ltr.png \
-+ stock-icons/24/gtk-revert-to-saved-rtl.png \
-+ stock-icons/24/gtk-save-as.png \
-+ stock-icons/24/gtk-new.png \
-+ stock-icons/24/gtk-harddisk.png \
-+ stock-icons/24/gtk-clear.png \
-+ stock-icons/24/gtk-copy.png \
-+ stock-icons/24/gtk-cut.png \
-+ stock-icons/24/gtk-delete.png \
-+ stock-icons/24/gtk-find-and-replace.png \
-+ stock-icons/24/gtk-find.png \
-+ stock-icons/24/gtk-paste.png \
-+ stock-icons/24/gtk-redo-ltr.png \
-+ stock-icons/24/gtk-redo-rtl.png \
-+ stock-icons/24/gtk-select-all.png \
-+ stock-icons/24/gtk-undo-ltr.png \
-+ stock-icons/24/gtk-undo-rtl.png \
-+ stock-icons/24/gtk-directory.png \
-+ stock-icons/24/gtk-unindent-ltr.png \
-+ stock-icons/24/gtk-unindent-rtl.png \
-+ stock-icons/24/gtk-indent-ltr.png \
-+ stock-icons/24/gtk-indent-rtl.png \
-+ stock-icons/24/gtk-justify-center.png \
-+ stock-icons/24/gtk-justify-fill.png \
-+ stock-icons/24/gtk-justify-left.png \
-+ stock-icons/24/gtk-justify-right.png \
-+ stock-icons/24/gtk-bold.png \
-+ stock-icons/24/gtk-italic.png \
-+ stock-icons/24/gtk-strikethrough.png \
-+ stock-icons/24/gtk-underline.png \
-+ stock-icons/24/gtk-goto-bottom.png \
-+ stock-icons/24/gtk-go-down.png \
-+ stock-icons/24/gtk-goto-first-ltr.png \
-+ stock-icons/24/gtk-home.png \
-+ stock-icons/24/gtk-jump-to-ltr.png \
-+ stock-icons/24/gtk-jump-to-rtl.png \
-+ stock-icons/24/gtk-goto-last-ltr.png \
-+ stock-icons/24/gtk-go-forward-ltr.png \
-+ stock-icons/24/gtk-go-back-ltr.png \
-+ stock-icons/24/gtk-goto-top.png \
-+ stock-icons/24/gtk-go-up.png \
-+ stock-icons/24/gtk-about.png \
-+ stock-icons/24/gtk-help.png \
-+ stock-icons/24/gtk-missing-image.png \
-+ stock-icons/24/gtk-add.png \
-+ stock-icons/24/gtk-remove.png \
-+ stock-icons/24/gtk-floppy.png \
-+ stock-icons/24/gtk-cdrom.png \
-+ stock-icons/24/gtk-media-pause.png \
-+ stock-icons/24/gtk-media-play-ltr.png \
-+ stock-icons/24/gtk-media-play-rtl.png \
-+ stock-icons/24/gtk-media-stop.png \
-+ stock-icons/24/gtk-media-record.png \
-+ stock-icons/24/gtk-media-rewind-ltr.png \
-+ stock-icons/24/gtk-media-forward-ltr.png \
-+ stock-icons/24/gtk-media-previous-ltr.png \
-+ stock-icons/24/gtk-media-next-ltr.png \
-+ stock-icons/24/gtk-network.png \
-+ stock-icons/24/gtk-print-error.png \
-+ stock-icons/24/gtk-print-report.png \
-+ stock-icons/24/gtk-print-paused.png \
-+ stock-icons/24/gtk-print-warning.png \
-+ stock-icons/24/gtk-stop.png \
-+ stock-icons/24/gtk-execute.png \
-+ stock-icons/24/gtk-spell-check.png \
-+ stock-icons/24/gtk-fullscreen.png \
-+ stock-icons/24/gtk-refresh.png \
-+ stock-icons/24/gtk-leave-fullscreen.png \
-+ stock-icons/24/gtk-sort-ascending.png \
-+ stock-icons/24/gtk-sort-descending.png \
-+ stock-icons/24/gtk-close.png \
-+ stock-icons/24/gtk-zoom-fit.png \
-+ stock-icons/24/gtk-zoom-in.png \
-+ stock-icons/24/gtk-zoom-100.png \
-+ stock-icons/24/gtk-zoom-out.png \
-+ stock-icons/48/gtk-dialog-error.png
-+
-
- @CROSS_COMPILING_FALSE@gtk_update_icon_cache_program = \
- @CROSS_COMPILING_FALSE@ ./gtk-update-icon-cache
-@@ -2887,7 +3053,91 @@
- && $(LN_S) folder.png user-desktop.png \
- && $(RM) user-home.png \
- && $(LN_S) folder.png user-home.png \
-+ && $(LN_S) application-exit.png gtk-quit.png \
-+ && $(LN_S) dialog-information.png gtk-info.png \
-+ && $(LN_S) document-new.png gtk-file.png \
-+ && $(LN_S) document-open.png gtk-open.png \
-+ && $(LN_S) document-print-preview.png gtk-print-preview.png \
-+ && $(LN_S) document-print.png gtk-print.png \
-+ && $(LN_S) document-properties.png gtk-properties.png \
-+ && $(LN_S) document-revert-ltr.png gtk-revert-to-saved-ltr.png \
-+ && $(LN_S) document-revert-rtl.png gtk-revert-to-saved-rtl.png \
-+ && $(LN_S) document-save-as.png gtk-save-as.png \
-+ && $(LN_S) document-x-generic.png gtk-new.png \
-+ && $(LN_S) drive-harddisk.png gtk-harddisk.png \
-+ && $(LN_S) edit-clear.png gtk-clear.png \
-+ && $(LN_S) edit-copy.png gtk-copy.png \
-+ && $(LN_S) edit-cut.png gtk-cut.png \
-+ && $(LN_S) edit-delete.png gtk-delete.png \
-+ && $(LN_S) edit-find-replace.png gtk-find-and-replace.png \
-+ && $(LN_S) edit-find.png gtk-find.png \
-+ && $(LN_S) edit-paste.png gtk-paste.png \
-+ && $(LN_S) edit-redo-ltr.png gtk-redo-ltr.png \
-+ && $(LN_S) edit-redo-rtl.png gtk-redo-rtl.png \
-+ && $(LN_S) edit-select-all.png gtk-select-all.png \
-+ && $(LN_S) edit-undo-ltr.png gtk-undo-ltr.png \
-+ && $(LN_S) edit-undo-rtl.png gtk-undo-rtl.png \
-+ && $(LN_S) folder.png gtk-directory.png \
-+ && $(LN_S) format-indent-less-ltr.png gtk-unindent-ltr.png \
-+ && $(LN_S) format-indent-less-rtl.png gtk-unindent-rtl.png \
-+ && $(LN_S) format-indent-more-ltr.png gtk-indent-ltr.png \
-+ && $(LN_S) format-indent-more-rtl.png gtk-indent-rtl.png \
-+ && $(LN_S) format-justify-center.png gtk-justify-center.png \
-+ && $(LN_S) format-justify-fill.png gtk-justify-fill.png \
-+ && $(LN_S) format-justify-left.png gtk-justify-left.png \
-+ && $(LN_S) format-justify-right.png gtk-justify-right.png \
-+ && $(LN_S) format-text-bold.png gtk-bold.png \
-+ && $(LN_S) format-text-italic.png gtk-italic.png \
-+ && $(LN_S) format-text-strikethrough.png gtk-strikethrough.png \
-+ && $(LN_S) format-text-underline.png gtk-underline.png \
-+ && $(LN_S) go-bottom.png gtk-goto-bottom.png \
-+ && $(LN_S) go-down.png gtk-go-down.png \
-+ && $(LN_S) go-first-ltr.png gtk-goto-first-ltr.png \
-+ && $(LN_S) go-home.png gtk-home.png \
-+ && $(LN_S) go-jump-ltr.png gtk-jump-to-ltr.png \
-+ && $(LN_S) go-jump-rtl.png gtk-jump-to-rtl.png \
-+ && $(LN_S) go-last-ltr.png gtk-goto-last-ltr.png \
-+ && $(LN_S) go-next-ltr.png gtk-go-forward-ltr.png \
-+ && $(LN_S) go-previous-ltr.png gtk-go-back-ltr.png \
-+ && $(LN_S) go-top.png gtk-goto-top.png \
-+ && $(LN_S) go-up.png gtk-go-up.png \
-+ && $(LN_S) help-about.png gtk-about.png \
-+ && $(LN_S) help-contents.png gtk-help.png \
-+ && $(LN_S) image-missing.png gtk-missing-image.png \
-+ && $(LN_S) list-add.png gtk-add.png \
-+ && $(LN_S) list-remove.png gtk-remove.png \
-+ && $(LN_S) media-floppy.png gtk-floppy.png \
-+ && $(LN_S) media-optical.png gtk-cdrom.png \
-+ && $(LN_S) media-playback-pause.png gtk-media-pause.png \
-+ && $(LN_S) media-playback-start-ltr.png gtk-media-play-ltr.png \
-+ && $(LN_S) media-playback-start-rtl.png gtk-media-play-rtl.png \
-+ && $(LN_S) media-playback-stop.png gtk-media-stop.png \
-+ && $(LN_S) media-record.png gtk-media-record.png \
-+ && $(LN_S) media-seek-backward-ltr.png gtk-media-rewind-ltr.png \
-+ && $(LN_S) media-seek-forward-ltr.png gtk-media-forward-ltr.png \
-+ && $(LN_S) media-skip-backward-ltr.png gtk-media-previous-ltr.png \
-+ && $(LN_S) media-skip-forward-ltr.png gtk-media-next-ltr.png \
-+ && $(LN_S) network-idle.png gtk-network.png \
-+ && $(LN_S) printer-error.png gtk-print-error.png \
-+ && $(LN_S) printer-info.png gtk-print-report.png \
-+ && $(LN_S) printer-paused.png gtk-print-paused.png \
-+ && $(LN_S) printer-warning.png gtk-print-warning.png \
-+ && $(LN_S) process-stop.png gtk-stop.png \
-+ && $(LN_S) system-run.png gtk-execute.png \
-+ && $(LN_S) tools-check-spelling.png gtk-spell-check.png \
-+ && $(LN_S) view-fullscreen.png gtk-fullscreen.png \
-+ && $(LN_S) view-refresh.png gtk-refresh.png \
-+ && $(LN_S) view-restore.png gtk-leave-fullscreen.png \
-+ && $(LN_S) view-sort-ascending.png gtk-sort-ascending.png \
-+ && $(LN_S) view-sort-descending.png gtk-sort-descending.png \
-+ && $(LN_S) window-close.png gtk-close.png \
-+ && $(LN_S) zoom-fit-best.png gtk-zoom-fit.png \
-+ && $(LN_S) zoom-in.png gtk-zoom-in.png \
-+ && $(LN_S) zoom-original.png gtk-zoom-100.png \
-+ && $(LN_S) zoom-out.png gtk-zoom-out.png \
- ) done \
-+ && (cd stock-icons/48 \
-+ && $(LN_S) dialog-error.png gtk-dialog-error.png) \
- && touch stamp-icons
-
- gtkbuiltincache.h: @REBUILD@ stamp-icons
diff --git a/pkgs/development/libraries/gupnp-igd/default.nix b/pkgs/development/libraries/gupnp-igd/default.nix
index bd930e5ecf6..a8bb065d7eb 100644
--- a/pkgs/development/libraries/gupnp-igd/default.nix
+++ b/pkgs/development/libraries/gupnp-igd/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
name = "gupnp-igd-0.2.1";
src = fetchurl {
- url = "http://www.gupnp.org/sites/all/files/sources/${name}.tar.gz";
+ url = https://launchpad.net/ubuntu/+archive/primary/+files/gupnp-igd_0.2.1.orig.tar.gz;
sha256 = "18ia8l24hbylz3dnbg2jf848bmbx0hjkq4fkwzzfn57z021f0fh2";
};
diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix
new file mode 100644
index 00000000000..5755e747a6b
--- /dev/null
+++ b/pkgs/development/libraries/harfbuzz/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl, pkgconfig, glib, freetype }:
+
+stdenv.mkDerivation rec {
+ name = "harfbuzz-0.9.4";
+
+ src = fetchurl {
+ url = "http://www.freedesktop.org/software/harfbuzz/release/${name}.tar.bz2";
+ sha256 = "2572f9a810d17a735ef565115463827d075af2371ee5b68e6d77231381f4bddc";
+ };
+
+ buildInputs = [ pkgconfig glib freetype ];
+
+ meta = {
+ description = "An OpenType text shaping engine";
+ homepage = http://www.freedesktop.org/wiki/Software/HarfBuzz;
+ maintainers = [ stdenv.lib.maintainers.eelco ];
+ platforms = stdenv.lib.platforms.linux;
+ };
+}
diff --git a/pkgs/development/libraries/haskell/Agda/default.nix b/pkgs/development/libraries/haskell/Agda/default.nix
index b598accffc6..a9d05596495 100644
--- a/pkgs/development/libraries/haskell/Agda/default.nix
+++ b/pkgs/development/libraries/haskell/Agda/default.nix
@@ -1,19 +1,20 @@
-{ cabal, alex, binary, filepath, happy, hashable, hashtables
-, haskeline, haskellSrcExts, mtl, QuickCheck, syb, xhtml, zlib
+{ cabal, alex, binary, deepseq, filepath, geniplate, happy
+, hashable, hashtables, haskeline, haskellSrcExts, mtl, parallel
+, QuickCheck, text, unorderedContainers, xhtml, zlib
}:
cabal.mkDerivation (self: {
pname = "Agda";
- version = "2.3.0.1";
- sha256 = "0f2kc3by2z01g8bqc446hyzx9sidx6qi0p7h5bcpjf8iryk1dh2w";
+ version = "2.3.2";
+ sha256 = "1xp0qvag6wx6zjwhmb7nm13hp63vlh8h4a2rkc85rsh610m0nynl";
isLibrary = true;
isExecutable = true;
buildDepends = [
- binary filepath hashable hashtables haskeline haskellSrcExts mtl
- QuickCheck syb xhtml zlib
+ binary deepseq filepath geniplate hashable hashtables haskeline
+ haskellSrcExts mtl parallel QuickCheck text unorderedContainers
+ xhtml zlib
];
buildTools = [ alex happy ];
- jailbreak = true;
meta = {
homepage = "http://wiki.portal.chalmers.se/agda/";
description = "A dependently typed functional programming language and proof assistant";
diff --git a/pkgs/development/libraries/haskell/Boolean/default.nix b/pkgs/development/libraries/haskell/Boolean/default.nix
index 58bdf8b9970..45661b815b1 100644
--- a/pkgs/development/libraries/haskell/Boolean/default.nix
+++ b/pkgs/development/libraries/haskell/Boolean/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "Boolean";
- version = "0.0.1";
- sha256 = "dafcfb2e9d7f7aa24a3d3ceb385424176297cdf6f6044028d42d0fea1cae7765";
+ version = "0.1.1";
+ sha256 = "1id075slxgz67gv382vpr7cr19i59bjajvb60iv2xrhh73gp08yv";
meta = {
description = "Generalized booleans";
license = self.stdenv.lib.licenses.bsd3;
diff --git a/pkgs/development/libraries/haskell/Cabal/1.16.0.3.nix b/pkgs/development/libraries/haskell/Cabal/1.16.0.3.nix
new file mode 100644
index 00000000000..68b985507b6
--- /dev/null
+++ b/pkgs/development/libraries/haskell/Cabal/1.16.0.3.nix
@@ -0,0 +1,15 @@
+{ cabal, filepath }:
+
+cabal.mkDerivation (self: {
+ pname = "Cabal";
+ version = "1.16.0.3";
+ sha256 = "11lzqgdjaix8n7nabmafl3jf9gisb04c025cmdycfihfajfn49zg";
+ buildDepends = [ filepath ];
+ meta = {
+ homepage = "http://www.haskell.org/cabal/";
+ description = "A framework for packaging Haskell software";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ maintainers = [ self.stdenv.lib.maintainers.andres ];
+ };
+})
diff --git a/pkgs/development/libraries/haskell/Crypto/default.nix b/pkgs/development/libraries/haskell/Crypto/default.nix
index f6f06b9c283..f93fbdcb679 100644
--- a/pkgs/development/libraries/haskell/Crypto/default.nix
+++ b/pkgs/development/libraries/haskell/Crypto/default.nix
@@ -11,9 +11,6 @@ cabal.mkDerivation (self: {
description = "Collects together existing Haskell cryptographic functions into a package";
license = "unknown";
platforms = self.ghc.meta.platforms;
- maintainers = [
- self.stdenv.lib.maintainers.andres
- self.stdenv.lib.maintainers.simons
- ];
+ maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})
diff --git a/pkgs/development/libraries/haskell/DAV/default.nix b/pkgs/development/libraries/haskell/DAV/default.nix
new file mode 100644
index 00000000000..2ab6e29e226
--- /dev/null
+++ b/pkgs/development/libraries/haskell/DAV/default.nix
@@ -0,0 +1,22 @@
+{ cabal, caseInsensitive, cmdargs, httpConduit, httpTypes, lens
+, liftedBase, mtl, network, resourcet, transformers, xmlConduit
+, xmlHamlet
+}:
+
+cabal.mkDerivation (self: {
+ pname = "DAV";
+ version = "0.2";
+ sha256 = "0g9b72ia4h85ykbng6103wc8f218fj9fdvm1896yx999vr95kxw4";
+ isLibrary = true;
+ isExecutable = true;
+ buildDepends = [
+ caseInsensitive cmdargs httpConduit httpTypes lens liftedBase mtl
+ network resourcet transformers xmlConduit xmlHamlet
+ ];
+ meta = {
+ homepage = "http://floss.scru.org/hDAV";
+ description = "RFC 4918 WebDAV support";
+ license = self.stdenv.lib.licenses.gpl3;
+ platforms = self.ghc.meta.platforms;
+ };
+})
diff --git a/pkgs/development/libraries/haskell/DSH/default.nix b/pkgs/development/libraries/haskell/DSH/default.nix
index 725fe95cc8d..32cf21242de 100644
--- a/pkgs/development/libraries/haskell/DSH/default.nix
+++ b/pkgs/development/libraries/haskell/DSH/default.nix
@@ -1,15 +1,10 @@
-{ cabal, convertible, csv, FerryCore, HaXml, HDBC, json, mtl
-, Pathfinder, syb, text, xhtml
-}:
+{ cabal, csv, FerryCore, HaXml, HDBC, mtl, Pathfinder, text }:
cabal.mkDerivation (self: {
pname = "DSH";
- version = "0.7.8.1";
- sha256 = "1yz8rh3hkqc465slfzi7jqhjd1xrmcghjxl7zprxw082p2qvj8g5";
- buildDepends = [
- convertible csv FerryCore HaXml HDBC json mtl Pathfinder syb text
- xhtml
- ];
+ version = "0.8.2.2";
+ sha256 = "0hjy8c97avi4wwv3p9gyml66n34mbrfrhb19j5y6vcy0y8ysgf0c";
+ buildDepends = [ csv FerryCore HaXml HDBC mtl Pathfinder text ];
meta = {
description = "Database Supported Haskell";
license = self.stdenv.lib.licenses.bsd3;
diff --git a/pkgs/development/libraries/haskell/GLFW/default.nix b/pkgs/development/libraries/haskell/GLFW/default.nix
index 59095ba7927..f204bcdf655 100644
--- a/pkgs/development/libraries/haskell/GLFW/default.nix
+++ b/pkgs/development/libraries/haskell/GLFW/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "GLFW";
- version = "0.5.0.1";
- sha256 = "1zjxw0fn1am9n4bwqn8jwp14cdgyg1cv5v8rrg2bisggw7wdc4c6";
+ version = "0.5.1.0";
+ sha256 = "190d75w84y9gayxvdz13dnzpyflc5qy4vdg5iv9p2dpcamcih3km";
buildDepends = [ OpenGL ];
extraLibraries = [ libX11 mesa ];
meta = {
diff --git a/pkgs/development/libraries/haskell/GLURaw/default.nix b/pkgs/development/libraries/haskell/GLURaw/default.nix
index 459c7b99e5c..d719e8179d4 100644
--- a/pkgs/development/libraries/haskell/GLURaw/default.nix
+++ b/pkgs/development/libraries/haskell/GLURaw/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "GLURaw";
- version = "1.2.0.0";
- sha256 = "06dsazj3zadjahwy926gnjngqg8cb1mhdxh8bg5f3axf3hsvxqp1";
+ version = "1.3.0.0";
+ sha256 = "1sh87jz9161svsf719y63cr21wf4d7wpbz75g2c2xss301qhafg0";
buildDepends = [ OpenGLRaw ];
extraLibraries = [ freeglut mesa ];
meta = {
diff --git a/pkgs/development/libraries/haskell/GLUT/2.3.0.0.nix b/pkgs/development/libraries/haskell/GLUT/2.3.1.0.nix
similarity index 86%
rename from pkgs/development/libraries/haskell/GLUT/2.3.0.0.nix
rename to pkgs/development/libraries/haskell/GLUT/2.3.1.0.nix
index 7725d1c8303..d65dfa15c6f 100644
--- a/pkgs/development/libraries/haskell/GLUT/2.3.0.0.nix
+++ b/pkgs/development/libraries/haskell/GLUT/2.3.1.0.nix
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "GLUT";
- version = "2.3.0.0";
- sha256 = "10rh57w3lx8fs0xy24lqilv5a5sgq57kshydja41r6fq9wdvwp99";
+ version = "2.3.1.0";
+ sha256 = "1ijx636py7gpm79r0qjsv8f4pw3m1cgz80gnn3qghs3lw0l8f1ci";
buildDepends = [ OpenGL OpenGLRaw StateVar Tensor ];
extraLibraries = [ freeglut libICE libSM libXi libXmu mesa ];
meta = {
diff --git a/pkgs/development/libraries/haskell/HStringTemplate/default.nix b/pkgs/development/libraries/haskell/HStringTemplate/default.nix
index 6754c15f3f4..c2c4f70b47e 100644
--- a/pkgs/development/libraries/haskell/HStringTemplate/default.nix
+++ b/pkgs/development/libraries/haskell/HStringTemplate/default.nix
@@ -1,13 +1,14 @@
-{ cabal, deepseq, filepath, mtl, parsec, syb, sybWithClass, text
-, time, utf8String
+{ cabal, blazeBuilder, deepseq, filepath, mtl, parsec, syb
+, sybWithClass, text, time, utf8String
}:
cabal.mkDerivation (self: {
pname = "HStringTemplate";
- version = "0.6.9";
- sha256 = "0xa665q5gya51vjkg1i6f6qk67jx28xcbxs5v1d9yr1f8djh5d9v";
+ version = "0.6.12";
+ sha256 = "02jx02qbs4jxpf1s8nzc9lbaz0flkfcy6xj475v77i45xc1hc71p";
buildDepends = [
- deepseq filepath mtl parsec syb sybWithClass text time utf8String
+ blazeBuilder deepseq filepath mtl parsec syb sybWithClass text time
+ utf8String
];
meta = {
description = "StringTemplate implementation in Haskell";
diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.4.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.5.nix
similarity index 81%
rename from pkgs/development/libraries/haskell/HTTP/4000.2.4.nix
rename to pkgs/development/libraries/haskell/HTTP/4000.2.5.nix
index 6f7b57ba64c..f345e7c98e1 100644
--- a/pkgs/development/libraries/haskell/HTTP/4000.2.4.nix
+++ b/pkgs/development/libraries/haskell/HTTP/4000.2.5.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "HTTP";
- version = "4000.2.4";
- sha256 = "1riqz69mnzl2xnbkk8s798xkizvcly3hcpigshbhpa57q016labi";
+ version = "4000.2.5";
+ sha256 = "03ij1zkykc438x2r1szz6ddvfhrjywlx61nrz377srcpbdmhxpb7";
buildDepends = [ mtl network parsec ];
meta = {
homepage = "https://github.com/haskell/HTTP";
diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.6.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.6.nix
new file mode 100644
index 00000000000..2c85ec7cd9e
--- /dev/null
+++ b/pkgs/development/libraries/haskell/HTTP/4000.2.6.nix
@@ -0,0 +1,15 @@
+{ cabal, mtl, network, parsec }:
+
+cabal.mkDerivation (self: {
+ pname = "HTTP";
+ version = "4000.2.6";
+ sha256 = "0rycwrn9cq9mrsgxkbx373zjvmzg4hd8hzclya6ipd3jda1w5r92";
+ buildDepends = [ mtl network parsec ];
+ meta = {
+ homepage = "https://github.com/haskell/HTTP";
+ description = "A library for client-side HTTP";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ maintainers = [ self.stdenv.lib.maintainers.andres ];
+ };
+})
diff --git a/pkgs/development/libraries/haskell/JuicyPixels/default.nix b/pkgs/development/libraries/haskell/JuicyPixels/default.nix
index a99f8295c60..1f7d9067e75 100644
--- a/pkgs/development/libraries/haskell/JuicyPixels/default.nix
+++ b/pkgs/development/libraries/haskell/JuicyPixels/default.nix
@@ -4,14 +4,14 @@
cabal.mkDerivation (self: {
pname = "JuicyPixels";
- version = "1.3";
- sha256 = "07wljfag4ylw16wdi7znjb61pfihdik5d7p4h2lmz6xirm4mjzrm";
+ version = "2.0.2";
+ sha256 = "14nqifdsdhzlfq29waqlwspyy37gp174vw368ph772zp9b0ngyff";
buildDepends = [
cereal deepseq mtl primitive transformers vector zlib
];
meta = {
homepage = "https://github.com/Twinside/Juicy.Pixels";
- description = "Picture loading/serialization (in png, jpeg and bitmap)";
+ description = "Picture loading/serialization (in png, jpeg, bitmap and gif)";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
diff --git a/pkgs/development/libraries/haskell/List/default.nix b/pkgs/development/libraries/haskell/List/default.nix
new file mode 100644
index 00000000000..65c90c0824e
--- /dev/null
+++ b/pkgs/development/libraries/haskell/List/default.nix
@@ -0,0 +1,14 @@
+{ cabal, transformers }:
+
+cabal.mkDerivation (self: {
+ pname = "List";
+ version = "0.5.1";
+ sha256 = "1hgkal8jh035bs0z6z8i899dc0888fhdx8940y27aaxxbmlzfy1p";
+ buildDepends = [ transformers ];
+ meta = {
+ homepage = "http://github.com/yairchu/generator/tree";
+ description = "List monad transformer and class";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ };
+})
diff --git a/pkgs/development/libraries/haskell/ListLike/default.nix b/pkgs/development/libraries/haskell/ListLike/default.nix
index 58595edf744..2fa427b1f57 100644
--- a/pkgs/development/libraries/haskell/ListLike/default.nix
+++ b/pkgs/development/libraries/haskell/ListLike/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "ListLike";
- version = "3.1.6";
- sha256 = "0ij6yb80dv841zn23lp6251avzmljzmy4j25r7w6h55y32y7gq46";
+ version = "3.1.7.1";
+ sha256 = "1g3i8iz71x3j41ji9xsbh84v5hj3mxls0zqnx27sb31mx6bic4w1";
isLibrary = true;
isExecutable = true;
meta = {
diff --git a/pkgs/development/libraries/haskell/ListZipper/default.nix b/pkgs/development/libraries/haskell/ListZipper/default.nix
new file mode 100644
index 00000000000..d7307bde5d7
--- /dev/null
+++ b/pkgs/development/libraries/haskell/ListZipper/default.nix
@@ -0,0 +1,13 @@
+{ cabal, QuickCheck }:
+
+cabal.mkDerivation (self: {
+ pname = "ListZipper";
+ version = "1.2.0.2";
+ sha256 = "0z3izxpl21fxz43jpx7zqs965anb3gp5vidv3pwwznr88ss2j6a9";
+ buildDepends = [ QuickCheck ];
+ meta = {
+ description = "Simple zipper for lists";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ };
+})
diff --git a/pkgs/development/libraries/haskell/MissingH/default.nix b/pkgs/development/libraries/haskell/MissingH/default.nix
index 52e26fe1f83..659a1158d0f 100644
--- a/pkgs/development/libraries/haskell/MissingH/default.nix
+++ b/pkgs/development/libraries/haskell/MissingH/default.nix
@@ -1,15 +1,15 @@
{ cabal, filepath, hslogger, HUnit, mtl, network, parsec, random
-, regexCompat
+, regexCompat, time
}:
cabal.mkDerivation (self: {
pname = "MissingH";
- version = "1.1.1.0";
- sha256 = "1i2fdr6p0jnn9w865ngjcchbsamrvnvdf9c4vzhjhzy500z2k1ry";
+ version = "1.2.0.0";
+ sha256 = "0bqg1j2pvm0ixrbnsxrr5kgibhbp191irhcavqlwfwgaxhrpqnm1";
isLibrary = true;
isExecutable = true;
buildDepends = [
- filepath hslogger HUnit mtl network parsec random regexCompat
+ filepath hslogger HUnit mtl network parsec random regexCompat time
];
meta = {
homepage = "http://software.complete.org/missingh";
diff --git a/pkgs/development/libraries/haskell/OpenGL/2.5.0.0.nix b/pkgs/development/libraries/haskell/OpenGL/2.6.0.1.nix
similarity index 85%
rename from pkgs/development/libraries/haskell/OpenGL/2.5.0.0.nix
rename to pkgs/development/libraries/haskell/OpenGL/2.6.0.1.nix
index 9d8c1bb29ae..318bdf19748 100644
--- a/pkgs/development/libraries/haskell/OpenGL/2.5.0.0.nix
+++ b/pkgs/development/libraries/haskell/OpenGL/2.6.0.1.nix
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "OpenGL";
- version = "2.5.0.0";
- sha256 = "1kpakn5i4aka67mqcpfq9jpl38h409x63zd14y35abpm6h3x8m3j";
+ version = "2.6.0.1";
+ sha256 = "1fpabhpjfl1bj0dhlj2sg8zsn3l6py4zw1arplwmqalz3xbkkgdi";
buildDepends = [ GLURaw ObjectName OpenGLRaw StateVar Tensor ];
extraLibraries = [ libX11 mesa ];
meta = {
diff --git a/pkgs/development/libraries/haskell/OpenGLRaw/default.nix b/pkgs/development/libraries/haskell/OpenGLRaw/default.nix
index b51e12eab65..a6a45bf5b24 100644
--- a/pkgs/development/libraries/haskell/OpenGLRaw/default.nix
+++ b/pkgs/development/libraries/haskell/OpenGLRaw/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "OpenGLRaw";
- version = "1.2.0.0";
- sha256 = "1nwk93wlwh7gz2lb1dc88frmwik71g61a7k8xfiib2q5a8a8kf9r";
+ version = "1.3.0.0";
+ sha256 = "0ifp5inrm48hzpq0x9hlk5cxh2k64y05phmsdb5hydb7r6dcla32";
extraLibraries = [ mesa ];
meta = {
homepage = "http://www.haskell.org/haskellwiki/Opengl";
diff --git a/pkgs/development/libraries/haskell/QuickCheck/2.5.nix b/pkgs/development/libraries/haskell/QuickCheck/2.5.1.1.nix
similarity index 65%
rename from pkgs/development/libraries/haskell/QuickCheck/2.5.nix
rename to pkgs/development/libraries/haskell/QuickCheck/2.5.1.1.nix
index 127d90ca5e7..24e16a4955f 100644
--- a/pkgs/development/libraries/haskell/QuickCheck/2.5.nix
+++ b/pkgs/development/libraries/haskell/QuickCheck/2.5.1.1.nix
@@ -1,10 +1,10 @@
-{ cabal, extensibleExceptions, random }:
+{ cabal, random }:
cabal.mkDerivation (self: {
pname = "QuickCheck";
- version = "2.5";
- sha256 = "0a4ibyw5abm7ds6pds41147phjkccx8v60vqdj05c5n28hbzbgbh";
- buildDepends = [ extensibleExceptions random ];
+ version = "2.5.1.1";
+ sha256 = "1ff2mhm27l8cc8nrsbw2z65dc9m7h879jykl5g7yqip5l88j0jcq";
+ buildDepends = [ random ];
meta = {
homepage = "http://code.haskell.org/QuickCheck";
description = "Automatic testing of Haskell programs";
diff --git a/pkgs/development/libraries/haskell/RSA/default.nix b/pkgs/development/libraries/haskell/RSA/default.nix
index ed14a3e8d19..c5257c5b262 100644
--- a/pkgs/development/libraries/haskell/RSA/default.nix
+++ b/pkgs/development/libraries/haskell/RSA/default.nix
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "RSA";
- version = "1.2.1.0";
- sha256 = "14x53xjy4rqdgin6kyrm2b16hb0k599gfiwiwrsyri9mx3f3s1ca";
+ version = "1.2.2.0";
+ sha256 = "0x4an1060slppyccf18isqrdl548ll33xzzqch3qxg285a0mm12m";
isLibrary = true;
isExecutable = true;
buildDepends = [
diff --git a/pkgs/development/libraries/haskell/ReadArgs/default.nix b/pkgs/development/libraries/haskell/ReadArgs/default.nix
new file mode 100644
index 00000000000..4b8a513914a
--- /dev/null
+++ b/pkgs/development/libraries/haskell/ReadArgs/default.nix
@@ -0,0 +1,16 @@
+{ cabal, systemFilepath, text }:
+
+cabal.mkDerivation (self: {
+ pname = "ReadArgs";
+ version = "1.2.1";
+ sha256 = "099gg6nq70yf2pl5ya8f083lw8x5rncnv54y2p5jlkdwfwmpmbnv";
+ isLibrary = true;
+ isExecutable = true;
+ buildDepends = [ systemFilepath text ];
+ meta = {
+ homepage = "http://github.com/rampion/ReadArgs";
+ description = "Simple command line argument parsing";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ };
+})
diff --git a/pkgs/development/libraries/haskell/SDL/default.nix b/pkgs/development/libraries/haskell/SDL/default.nix
index a83518f9e10..62731657e82 100644
--- a/pkgs/development/libraries/haskell/SDL/default.nix
+++ b/pkgs/development/libraries/haskell/SDL/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "SDL";
- version = "0.6.3";
- sha256 = "0m3ick3rw8623ja42yfj4pa57naa6yb20ym8lv252gwb18ghp4sp";
+ version = "0.6.4";
+ sha256 = "1zrfx2nw0k8lfkr6vnwsp5wr3yz62v0bq60p4sdzj7gm01bz92g0";
extraLibraries = [ SDL ];
meta = {
description = "Binding to libSDL";
diff --git a/pkgs/development/libraries/haskell/SHA/default.nix b/pkgs/development/libraries/haskell/SHA/default.nix
index 956b1a8f8a3..ea353c63803 100644
--- a/pkgs/development/libraries/haskell/SHA/default.nix
+++ b/pkgs/development/libraries/haskell/SHA/default.nix
@@ -1,12 +1,16 @@
-{ cabal, binary }:
+{ cabal, binary, QuickCheck, testFramework
+, testFrameworkQuickcheck2
+}:
cabal.mkDerivation (self: {
pname = "SHA";
- version = "1.5.1";
- sha256 = "009c0nabva0c4aq4yhqdmdqmrrjmg8scpy7yz65bbhqnfwnjvdks";
+ version = "1.6.0";
+ sha256 = "0i5x2irk08yr4p428wyqvdysz22jqc3q5qn08wc38pw2xhmc0zzk";
isLibrary = true;
isExecutable = true;
- buildDepends = [ binary ];
+ buildDepends = [
+ binary QuickCheck testFramework testFrameworkQuickcheck2
+ ];
meta = {
description = "Implementations of the SHA suite of message digest functions";
license = self.stdenv.lib.licenses.bsd3;
diff --git a/pkgs/development/libraries/haskell/SafeSemaphore/default.nix b/pkgs/development/libraries/haskell/SafeSemaphore/default.nix
new file mode 100644
index 00000000000..ad161f97102
--- /dev/null
+++ b/pkgs/development/libraries/haskell/SafeSemaphore/default.nix
@@ -0,0 +1,14 @@
+{ cabal, stm }:
+
+cabal.mkDerivation (self: {
+ pname = "SafeSemaphore";
+ version = "0.9.0";
+ sha256 = "1xa30cciw8wmri675kdsz4pb5qwrh592pzylbhawqsvsarf80gz4";
+ buildDepends = [ stm ];
+ meta = {
+ homepage = "https://github.com/ChrisKuklewicz/SafeSemaphore";
+ description = "Much safer replacement for QSemN, QSem, and SampleVar";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ };
+})
diff --git a/pkgs/development/libraries/haskell/Stream/default.nix b/pkgs/development/libraries/haskell/Stream/default.nix
index 83789765ec7..a95b3076137 100644
--- a/pkgs/development/libraries/haskell/Stream/default.nix
+++ b/pkgs/development/libraries/haskell/Stream/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "Stream";
- version = "0.4.6";
- sha256 = "0ppjcddm8dxxd260dsnzrdijifg4pa66lm401qj4fiddw0b50wzb";
+ version = "0.4.6.1";
+ sha256 = "19z052rd0varq5cbw0i0f0vkbpb40kqg6i93kz2brk6a101q5llp";
buildDepends = [ lazysmallcheck QuickCheck ];
meta = {
description = "A library for manipulating infinite lists";
diff --git a/pkgs/development/libraries/haskell/X11/1.6.0.1.nix b/pkgs/development/libraries/haskell/X11/1.6.0.2.nix
similarity index 84%
rename from pkgs/development/libraries/haskell/X11/1.6.0.1.nix
rename to pkgs/development/libraries/haskell/X11/1.6.0.2.nix
index 4a558d483a3..dff5bca4400 100644
--- a/pkgs/development/libraries/haskell/X11/1.6.0.1.nix
+++ b/pkgs/development/libraries/haskell/X11/1.6.0.2.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "X11";
- version = "1.6.0.1";
- sha256 = "0crbprh4m48l4yvbamgvvzrmm1d94lgbyqv1xsd37r4a3xh7qakz";
+ version = "1.6.0.2";
+ sha256 = "0z1g93k2zbkb9is2zy6pfwp13bv11cvs30b9cz253wjv2liphshw";
extraLibraries = [
libX11 libXext libXinerama libXrandr libXrender
];
diff --git a/pkgs/development/libraries/haskell/accelerate-cuda/default.nix b/pkgs/development/libraries/haskell/accelerate-cuda/default.nix
index 3772320b0c2..26f2c0a14c0 100644
--- a/pkgs/development/libraries/haskell/accelerate-cuda/default.nix
+++ b/pkgs/development/libraries/haskell/accelerate-cuda/default.nix
@@ -1,15 +1,15 @@
-{ cabal, accelerate, binary, blazeBuilder, cryptohash, cuda
-, fclabels, filepath, hashable, hashtables, languageCQuote
-, mainlandPretty, mtl, srcloc, transformers, unorderedContainers
+{ cabal, accelerate, binary, cryptohash, cuda, fclabels, filepath
+, hashable, hashtables, languageCQuote, mainlandPretty, mtl, srcloc
+, text, transformers, unorderedContainers
}:
cabal.mkDerivation (self: {
pname = "accelerate-cuda";
- version = "0.12.1.1";
- sha256 = "1kj9i6djjb46ad3dnzk72mf33r8h1mjxljs7x5rf2d658hqk5yfv";
+ version = "0.12.1.2";
+ sha256 = "184rxdp9idvhrqa0k3fqcm3nrgjcs3f53dz7wrhhpfa3iqrr6vd4";
buildDepends = [
- accelerate binary blazeBuilder cryptohash cuda fclabels filepath
- hashable hashtables languageCQuote mainlandPretty mtl srcloc
+ accelerate binary cryptohash cuda fclabels filepath hashable
+ hashtables languageCQuote mainlandPretty mtl srcloc text
transformers unorderedContainers
];
meta = {
diff --git a/pkgs/development/libraries/haskell/appar/default.nix b/pkgs/development/libraries/haskell/appar/default.nix
new file mode 100644
index 00000000000..4c2f5a9ce46
--- /dev/null
+++ b/pkgs/development/libraries/haskell/appar/default.nix
@@ -0,0 +1,12 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+ pname = "appar";
+ version = "0.1.4";
+ sha256 = "09jb9ij78fdkz2qk66rw99q19qnm504dpv0yq0pjsl6xwjmndsjq";
+ meta = {
+ description = "A simple applicative parser";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ };
+})
diff --git a/pkgs/development/libraries/haskell/async/default.nix b/pkgs/development/libraries/haskell/async/2.0.1.3.nix
similarity index 100%
rename from pkgs/development/libraries/haskell/async/default.nix
rename to pkgs/development/libraries/haskell/async/2.0.1.3.nix
diff --git a/pkgs/development/libraries/haskell/async/2.0.1.4.nix b/pkgs/development/libraries/haskell/async/2.0.1.4.nix
new file mode 100644
index 00000000000..c5caa55e97f
--- /dev/null
+++ b/pkgs/development/libraries/haskell/async/2.0.1.4.nix
@@ -0,0 +1,15 @@
+{ cabal, stm }:
+
+cabal.mkDerivation (self: {
+ pname = "async";
+ version = "2.0.1.4";
+ sha256 = "1hi40bjwpl65mz7zj0sgh16bp9dwafbm5ysi2q8fzwwq5l0zxpa1";
+ buildDepends = [ stm ];
+ meta = {
+ homepage = "https://github.com/simonmar/async";
+ description = "Run IO operations asynchronously and wait for their results";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ maintainers = [ self.stdenv.lib.maintainers.andres ];
+ };
+})
diff --git a/pkgs/development/libraries/haskell/attoparsec-binary/attoparsec-binary-ghc7.6.1.patch b/pkgs/development/libraries/haskell/attoparsec-binary/attoparsec-binary-ghc7.6.1.patch
new file mode 100644
index 00000000000..dae949b2570
--- /dev/null
+++ b/pkgs/development/libraries/haskell/attoparsec-binary/attoparsec-binary-ghc7.6.1.patch
@@ -0,0 +1,20 @@
+diff --git a/Data/Attoparsec/Binary.hs b/Data/Attoparsec/Binary.hs
+index fab76c6..01d6c8b 100644
+--- a/Data/Attoparsec/Binary.hs
++++ b/Data/Attoparsec/Binary.hs
+@@ -23,7 +23,7 @@ import Data.Word
+ byteSize :: (Bits a) => a -> Int
+ byteSize = (`div` 8) . bitSize
+
+-pack :: (Bits a) => B.ByteString -> a
++pack :: (Bits a, Num a) => B.ByteString -> a
+ pack = B.foldl' (\n h -> (n `shiftL` 8) .|. fromIntegral h) 0
+
+ anyWordN :: (Bits a) => (B.ByteString -> a) -> Parser a
+@@ -84,4 +84,4 @@ word64be = wordN unpack
+
+ -- |Match a specific 64-bit little-endian word.
+ word64le :: Word64 -> Parser Word64
+-word64le = wordN $ B.reverse . unpack
+\ No newline at end of file
++word64le = wordN $ B.reverse . unpack
diff --git a/pkgs/development/libraries/haskell/attoparsec-binary/default.nix b/pkgs/development/libraries/haskell/attoparsec-binary/default.nix
new file mode 100644
index 00000000000..623ae104090
--- /dev/null
+++ b/pkgs/development/libraries/haskell/attoparsec-binary/default.nix
@@ -0,0 +1,13 @@
+{ cabal, attoparsec }:
+
+cabal.mkDerivation (self: {
+ pname = "attoparsec-binary";
+ version = "0.2";
+ sha256 = "02vswxsgayw50xli7mbacsjmk1diifzkfgnyfn9ck5mk41dl9rh5";
+ buildDepends = [ attoparsec ];
+ meta = {
+ description = "Binary processing extensions to Attoparsec";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ };
+})
diff --git a/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix b/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix
index e887b2d539c..9c969ed858f 100644
--- a/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "attoparsec-conduit";
- version = "0.5.0.1";
- sha256 = "1qrg524gr9ajdxaqd9gmxpj45d7ga21q27ykr76kjdwxfpqaq6n8";
+ version = "0.5.0.3";
+ sha256 = "1n35v7mq93marx6ayja7zfk2hib4whspvysf0a7hjikylp4lfydw";
buildDepends = [ attoparsec conduit text transformers ];
meta = {
homepage = "http://github.com/snoyberg/conduit";
diff --git a/pkgs/development/libraries/haskell/authenticate/default.nix b/pkgs/development/libraries/haskell/authenticate/default.nix
index 27edc1e9a9c..b336a632b9d 100644
--- a/pkgs/development/libraries/haskell/authenticate/default.nix
+++ b/pkgs/development/libraries/haskell/authenticate/default.nix
@@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "authenticate";
- version = "1.3.1.1";
- sha256 = "120n7z22x4y4ngxqxsi65zn992f1lksaawcd7rmjvf8m0fysbb4n";
+ version = "1.3.2";
+ sha256 = "1bvgfri0c2nyz06r59rm3slpvm1b0s242s4mznmndpdclgg33d9m";
buildDepends = [
aeson attoparsec blazeBuilder blazeBuilderConduit caseInsensitive
conduit httpConduit httpTypes monadControl network resourcet
diff --git a/pkgs/development/libraries/haskell/basic-prelude/default.nix b/pkgs/development/libraries/haskell/basic-prelude/default.nix
new file mode 100644
index 00000000000..c30f3f5c7e0
--- /dev/null
+++ b/pkgs/development/libraries/haskell/basic-prelude/default.nix
@@ -0,0 +1,19 @@
+{ cabal, hashable, ReadArgs, systemFilepath, text, transformers
+, unorderedContainers, vector
+}:
+
+cabal.mkDerivation (self: {
+ pname = "basic-prelude";
+ version = "0.3.1.0";
+ sha256 = "15k89z78zjhga36wrvfn8b17hsmlwr1na6xq0gmimivfrdlnz5j0";
+ buildDepends = [
+ hashable ReadArgs systemFilepath text transformers
+ unorderedContainers vector
+ ];
+ meta = {
+ homepage = "https://github.com/snoyberg/basic-prelude";
+ description = "An enhanced core prelude; a common foundation for alternate preludes";
+ license = self.stdenv.lib.licenses.mit;
+ platforms = self.ghc.meta.platforms;
+ };
+})
diff --git a/pkgs/development/libraries/haskell/binary/default.nix b/pkgs/development/libraries/haskell/binary/default.nix
index a8fefba0274..303e67c3b99 100644
--- a/pkgs/development/libraries/haskell/binary/default.nix
+++ b/pkgs/development/libraries/haskell/binary/default.nix
@@ -2,10 +2,10 @@
cabal.mkDerivation (self: {
pname = "binary";
- version = "0.5.1.1";
- sha256 = "0s62a92a2wwp8hdmkc6j6i9lh5mi6z1yd26fbhsbbm8bxah64pcl";
+ version = "0.6.2.0";
+ sha256 = "0nm4vsgyz7ml6w3lk5hrh34i7s7li32gj7bgs75w636kln338aab";
meta = {
- homepage = "http://code.haskell.org/binary/";
+ homepage = "https://github.com/kolmodin/binary";
description = "Binary serialisation for Haskell values using lazy ByteStrings";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
diff --git a/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix b/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix
index 14d4498f585..e6b8785b6a9 100644
--- a/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "blaze-builder-conduit";
- version = "0.5.0.1";
- sha256 = "1avbgrgqzryqv717714s0418lknm0lqzkis3hia00qhy762amlcn";
+ version = "0.5.0.2";
+ sha256 = "0ynkz822zxp1m02fp9l572d8j8xi5r9j1bg6zs2671m81h22d4in";
buildDepends = [ blazeBuilder conduit text transformers ];
meta = {
homepage = "http://github.com/snoyberg/conduit";
diff --git a/pkgs/development/libraries/haskell/blaze-markup/default.nix b/pkgs/development/libraries/haskell/blaze-markup/default.nix
index 7a5adbf1079..1f6a83894cc 100644
--- a/pkgs/development/libraries/haskell/blaze-markup/default.nix
+++ b/pkgs/development/libraries/haskell/blaze-markup/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "blaze-markup";
- version = "0.5.1.0";
- sha256 = "0vq0xzwa13sjybg6zdi3ynsn6yxyl1q6rbalvb9r6f3plrmik37a";
+ version = "0.5.1.1";
+ sha256 = "14va7db8icf2xj7v4i5z0srgv74pf8z6w7046lxs3cyj5pcjl2r9";
buildDepends = [ blazeBuilder text ];
meta = {
homepage = "http://jaspervdj.be/blaze";
diff --git a/pkgs/development/libraries/haskell/bmp/default.nix b/pkgs/development/libraries/haskell/bmp/default.nix
index 705b462a6d5..e018ac7a8d2 100644
--- a/pkgs/development/libraries/haskell/bmp/default.nix
+++ b/pkgs/development/libraries/haskell/bmp/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "bmp";
- version = "1.2.1.1";
- sha256 = "0s5srqkaccrwh9gsxn9kmyh4jf0qf40ix8ipi0b70fbbffr97hmk";
+ version = "1.2.2.1";
+ sha256 = "0yxkkvpgavk9im9i9f6zpzc1n5nj2g4qsk4ck51aqz2fv6z1rhiy";
buildDepends = [ binary ];
meta = {
homepage = "http://code.ouroborus.net/bmp";
diff --git a/pkgs/development/libraries/haskell/boomerang/default.nix b/pkgs/development/libraries/haskell/boomerang/default.nix
new file mode 100644
index 00000000000..963448a56e7
--- /dev/null
+++ b/pkgs/development/libraries/haskell/boomerang/default.nix
@@ -0,0 +1,13 @@
+{ cabal, mtl, text }:
+
+cabal.mkDerivation (self: {
+ pname = "boomerang";
+ version = "1.3.3";
+ sha256 = "1i44j3qyjkq69h65wfsrps5zp097i3nh9fwcb2f1spr8nznb5mff";
+ buildDepends = [ mtl text ];
+ meta = {
+ description = "Library for invertible parsing and printing";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ };
+})
diff --git a/pkgs/development/libraries/haskell/c2hs/default.nix b/pkgs/development/libraries/haskell/c2hs/default.nix
index d717174902b..6ad4db61cfd 100644
--- a/pkgs/development/libraries/haskell/c2hs/default.nix
+++ b/pkgs/development/libraries/haskell/c2hs/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "c2hs";
- version = "0.16.3";
- sha256 = "1qqsxfdkf5sfj3mvk265dbng3br9w633y8v1piajqaidki7vwqm5";
+ version = "0.16.4";
+ sha256 = "0m8mzc19cgaqsi1skqimk22770xddxx0j024mgp76hl8vqc5rcgi";
isLibrary = false;
isExecutable = true;
buildDepends = [ filepath languageC ];
diff --git a/pkgs/development/libraries/haskell/cabal-file-th/default.nix b/pkgs/development/libraries/haskell/cabal-file-th/default.nix
index c57e46cb8bb..55b4fea36fe 100644
--- a/pkgs/development/libraries/haskell/cabal-file-th/default.nix
+++ b/pkgs/development/libraries/haskell/cabal-file-th/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "cabal-file-th";
- version = "0.2.2";
- sha256 = "1ql2gmg3mdfkmnk1m3966npr6l1in15fzlkbn7dr1cp4s90igqhy";
+ version = "0.2.3";
+ sha256 = "0kawvb5n56rkq4453l6pia3wrr6jvvdwkghi6i176n1gm2zf2ri8";
buildDepends = [ Cabal ];
meta = {
homepage = "http://github.com/nkpart/cabal-file-th";
diff --git a/pkgs/development/libraries/haskell/cairo/default.nix b/pkgs/development/libraries/haskell/cairo/default.nix
index 183e0815f71..59126959bfb 100644
--- a/pkgs/development/libraries/haskell/cairo/default.nix
+++ b/pkgs/development/libraries/haskell/cairo/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "cairo";
- version = "0.12.3.1";
- sha256 = "173pql0n51a9z46vzpwd9q67nblhb61qirynjra9vzydiy79bfwi";
+ version = "0.12.4";
+ sha256 = "0gy6nxhxam3yv0caj4psg9dd1a5yazh616fjbmjfh0kbk8vl6fbq";
buildDepends = [ mtl ];
buildTools = [ gtk2hsBuildtools ];
extraLibraries = [ cairo libc pkgconfig zlib ];
diff --git a/pkgs/development/libraries/haskell/certificate/default.nix b/pkgs/development/libraries/haskell/certificate/default.nix
index d79f6faa3ef..eb40a4744f9 100644
--- a/pkgs/development/libraries/haskell/certificate/default.nix
+++ b/pkgs/development/libraries/haskell/certificate/default.nix
@@ -1,12 +1,16 @@
-{ cabal, asn1Data, cryptoPubkeyTypes, mtl, pem, time }:
+{ cabal, asn1Data, cryptohash, cryptoPubkeyTypes, filepath, mtl
+, pem, time
+}:
cabal.mkDerivation (self: {
pname = "certificate";
- version = "1.2.6";
- sha256 = "1li65r4zbff7r7p533p5xw2z3rd0xnlb2bbwqdldrnswy4mvlakx";
+ version = "1.3.3";
+ sha256 = "043xj3xd6cfnbg9hw2f8agckww3fasvraa72jw84zqc7l2gq0rq2";
isLibrary = true;
isExecutable = true;
- buildDepends = [ asn1Data cryptoPubkeyTypes mtl pem time ];
+ buildDepends = [
+ asn1Data cryptohash cryptoPubkeyTypes filepath mtl pem time
+ ];
meta = {
homepage = "http://github.com/vincenthz/hs-certificate";
description = "Certificates and Key Reader/Writer";
diff --git a/pkgs/development/libraries/haskell/cgi/3001.1.8.2.nix b/pkgs/development/libraries/haskell/cgi/3001.1.8.3.nix
similarity index 84%
rename from pkgs/development/libraries/haskell/cgi/3001.1.8.2.nix
rename to pkgs/development/libraries/haskell/cgi/3001.1.8.3.nix
index d77bd227f8b..cfe95ab8e1e 100644
--- a/pkgs/development/libraries/haskell/cgi/3001.1.8.2.nix
+++ b/pkgs/development/libraries/haskell/cgi/3001.1.8.3.nix
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "cgi";
- version = "3001.1.8.2";
- sha256 = "09ly7bn5ck563jq1wip5w628g74xj4p1ha9rllfdck33pqrl2mgz";
+ version = "3001.1.8.3";
+ sha256 = "1pacv0qxfs7l71xvf9amd7qsw5g725qbrm8r6fgdb2awyl925sf4";
buildDepends = [
extensibleExceptions MonadCatchIOMtl mtl network parsec xhtml
];
diff --git a/pkgs/development/libraries/haskell/cipher-aes/default.nix b/pkgs/development/libraries/haskell/cipher-aes/default.nix
index e89fc1d6faf..42152bfb0d7 100644
--- a/pkgs/development/libraries/haskell/cipher-aes/default.nix
+++ b/pkgs/development/libraries/haskell/cipher-aes/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "cipher-aes";
- version = "0.1.1";
- sha256 = "0pyiqsdvvq0qhlin17rijqjq0sc0i9nl9rdwbql01fr4pw46cwwg";
+ version = "0.1.2";
+ sha256 = "1c8drabfmx5wc519kxsr64bdvakfvxwzhfh7ym01kk1dpja0nlnq";
isLibrary = true;
isExecutable = true;
meta = {
diff --git a/pkgs/development/libraries/haskell/citeproc-hs/default.nix b/pkgs/development/libraries/haskell/citeproc-hs/default.nix
index 3cd0c09c3b2..027fe75033a 100644
--- a/pkgs/development/libraries/haskell/citeproc-hs/default.nix
+++ b/pkgs/development/libraries/haskell/citeproc-hs/default.nix
@@ -1,14 +1,14 @@
-{ cabal, filepath, hsBibutils, HTTP, json, mtl, network
-, pandocTypes, parsec, syb, time, utf8String, xml
+{ cabal, filepath, hexpat, hsBibutils, HTTP, json, mtl, network
+, pandocTypes, parsec, syb, time, utf8String
}:
cabal.mkDerivation (self: {
pname = "citeproc-hs";
- version = "0.3.4";
- sha256 = "17w6fpmlhbfd8jxxz4s6ybz3dswf0i96fjjbs05ykh4i97rs62nv";
+ version = "0.3.6";
+ sha256 = "0zxwca3i7gg1vhdvrxd15c8zgx1gy3y7zjj746bcvf8pwavkq5q2";
buildDepends = [
- filepath hsBibutils HTTP json mtl network pandocTypes parsec syb
- time utf8String xml
+ filepath hexpat hsBibutils HTTP json mtl network pandocTypes parsec
+ syb time utf8String
];
meta = {
homepage = "http://gorgias.mine.nu/repos/citeproc-hs/";
diff --git a/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix b/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix
new file mode 100644
index 00000000000..31c7eecaa6e
--- /dev/null
+++ b/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix
@@ -0,0 +1,14 @@
+{ cabal, classyPrelude, conduit, xmlConduit }:
+
+cabal.mkDerivation (self: {
+ pname = "classy-prelude-conduit";
+ version = "0.4.1";
+ sha256 = "0llir0xnnyhgxifay019x64jw7mnn9p1sqs1xwm14gjcqr2nqqg8";
+ buildDepends = [ classyPrelude conduit xmlConduit ];
+ meta = {
+ homepage = "https://github.com/snoyberg/classy-prelude";
+ description = "conduit instances for classy-prelude";
+ license = self.stdenv.lib.licenses.mit;
+ platforms = self.ghc.meta.platforms;
+ };
+})
diff --git a/pkgs/development/libraries/haskell/classy-prelude/default.nix b/pkgs/development/libraries/haskell/classy-prelude/default.nix
new file mode 100644
index 00000000000..8c5a94d4d12
--- /dev/null
+++ b/pkgs/development/libraries/haskell/classy-prelude/default.nix
@@ -0,0 +1,19 @@
+{ cabal, basicPrelude, hashable, systemFilepath, text, transformers
+, unorderedContainers, vector
+}:
+
+cabal.mkDerivation (self: {
+ pname = "classy-prelude";
+ version = "0.4.1";
+ sha256 = "14s1qirss8qbicdw4bc7smdnk1xrpp1xsii8kgmrb1z4ji0h9bf1";
+ buildDepends = [
+ basicPrelude hashable systemFilepath text transformers
+ unorderedContainers vector
+ ];
+ meta = {
+ homepage = "https://github.com/snoyberg/classy-prelude";
+ description = "A typeclass-based Prelude";
+ license = self.stdenv.lib.licenses.mit;
+ platforms = self.ghc.meta.platforms;
+ };
+})
diff --git a/pkgs/development/libraries/haskell/cmdargs/default.nix b/pkgs/development/libraries/haskell/cmdargs/default.nix
index 0719bf5a03c..e6b208b0297 100644
--- a/pkgs/development/libraries/haskell/cmdargs/default.nix
+++ b/pkgs/development/libraries/haskell/cmdargs/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "cmdargs";
- version = "0.10";
- sha256 = "1xx4cks3hr2ldb0hd5hnc53dpns2zm4gc1dw25gs1vc977kga3hz";
+ version = "0.10.1";
+ sha256 = "0p7fzh65asn1bpzp137vfww97in2mkqfwwsk8hxzsdx32zi1nfz8";
isLibrary = true;
isExecutable = true;
buildDepends = [ filepath transformers ];
diff --git a/pkgs/development/libraries/haskell/comonads-fd/default.nix b/pkgs/development/libraries/haskell/comonads-fd/default.nix
new file mode 100644
index 00000000000..26a18c667a2
--- /dev/null
+++ b/pkgs/development/libraries/haskell/comonads-fd/default.nix
@@ -0,0 +1,18 @@
+{ cabal, comonad, comonadTransformers, mtl, semigroups
+, transformers
+}:
+
+cabal.mkDerivation (self: {
+ pname = "comonads-fd";
+ version = "3.0";
+ sha256 = "1j5ymj711c49fsk2ilxfpzqr0jr117z8kb5ggyh5nlwjy16m32in";
+ buildDepends = [
+ comonad comonadTransformers mtl semigroups transformers
+ ];
+ meta = {
+ homepage = "http://github.com/ekmett/comonads-fd/";
+ description = "Comonad transformers using functional dependencies";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ };
+})
diff --git a/pkgs/development/libraries/haskell/conduit/default.nix b/pkgs/development/libraries/haskell/conduit/default.nix
index c383c46f30b..9263bb0c893 100644
--- a/pkgs/development/libraries/haskell/conduit/default.nix
+++ b/pkgs/development/libraries/haskell/conduit/default.nix
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "conduit";
- version = "0.5.2.4";
- sha256 = "17959j5frfbl5af4pmxhfb4swrjckk4fh5wmd5bwsbs824glb97a";
+ version = "0.5.4.1";
+ sha256 = "00fx4v9phclyg8ybz22w8053pfvy92nibx5g3c6h37hhn7hnsxh4";
buildDepends = [
liftedBase monadControl resourcet text transformers
transformersBase void
diff --git a/pkgs/development/libraries/haskell/criterion/default.nix b/pkgs/development/libraries/haskell/criterion/default.nix
index 54b6b20dc83..64f03d4dcca 100644
--- a/pkgs/development/libraries/haskell/criterion/default.nix
+++ b/pkgs/development/libraries/haskell/criterion/default.nix
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "criterion";
- version = "0.6.1.1";
- sha256 = "1w5yqcgnx2ij3hmvmz5g4ynj6n8wa3yyk1kfbbwxyh9j5kc2xwiw";
+ version = "0.6.2.0";
+ sha256 = "1xd90qb026niq2sn7ks8bn92ifb6255saic68bzg6kzj7ydwwdmx";
buildDepends = [
aeson deepseq filepath hastache mtl mwcRandom parsec statistics
time transformers vector vectorAlgorithms
diff --git a/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix b/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix
index fa3151d893c..72ba3d20b02 100644
--- a/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix
+++ b/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix
@@ -1,10 +1,9 @@
-{ cabal, cryptoApi }:
+{ cabal }:
cabal.mkDerivation (self: {
pname = "crypto-pubkey-types";
- version = "0.1.1";
- sha256 = "0chlz01nlxnh9bk5b97vm6q6ai0ifybkdaynwibj8px418mmbkib";
- buildDepends = [ cryptoApi ];
+ version = "0.2.0";
+ sha256 = "1arzkyxcm1ffnwk7imxkwvyi20dp8n960vzj7cbl7fhv3j04c9xq";
meta = {
homepage = "http://github.com/vincenthz/hs-crypto-pubkey-types";
description = "Generic cryptography Public keys algorithm types";
diff --git a/pkgs/development/libraries/haskell/cryptocipher/default.nix b/pkgs/development/libraries/haskell/cryptocipher/default.nix
index 1798f4e21a5..b464180ca55 100644
--- a/pkgs/development/libraries/haskell/cryptocipher/default.nix
+++ b/pkgs/development/libraries/haskell/cryptocipher/default.nix
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "cryptocipher";
- version = "0.3.5";
- sha256 = "02qc1rr9l51dnk0sn7js8zv2w2qhkha3ik828j5s729h80cyw99s";
+ version = "0.3.6";
+ sha256 = "0r2alw0in0ndaz7y9bzqigla74wbn8h1z43s2zx5rc3sq5p3rp6s";
isLibrary = true;
isExecutable = true;
buildDepends = [
diff --git a/pkgs/development/libraries/haskell/cryptohash/default.nix b/pkgs/development/libraries/haskell/cryptohash/default.nix
index 77ecc4ef554..eed28262470 100644
--- a/pkgs/development/libraries/haskell/cryptohash/default.nix
+++ b/pkgs/development/libraries/haskell/cryptohash/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "cryptohash";
- version = "0.7.5";
- sha256 = "18x1k22m2mw0jx3p1mc68n0gg1vsnkp50qvmlkh3i34vdnjcdrqg";
+ version = "0.7.8";
+ sha256 = "0n9m5gl3hfkx0p0mg05k7317vjqqx5aynandg428pcgcjkpbfv9g";
isLibrary = true;
isExecutable = true;
buildDepends = [ cereal cryptoApi tagged ];
diff --git a/pkgs/development/libraries/haskell/curl/default.nix b/pkgs/development/libraries/haskell/curl/default.nix
index 072b8f2d6e6..a530044ca6e 100644
--- a/pkgs/development/libraries/haskell/curl/default.nix
+++ b/pkgs/development/libraries/haskell/curl/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "curl";
- version = "1.3.7";
- sha256 = "0i6d7732p5gn1bcvavbxcg4wd18j425mi1yjg0b29zzz3yl0qhgi";
+ version = "1.3.8";
+ sha256 = "0vj4hpaa30jz7c702xpsfvqaqdxz28zslsqnsfx6bf6dpwvck1wh";
extraLibraries = [ curl ];
meta = {
description = "Haskell binding to libcurl";
diff --git a/pkgs/development/libraries/haskell/data-accessor/data-accessor-template.nix b/pkgs/development/libraries/haskell/data-accessor/data-accessor-template.nix
index 077e31c683e..41bd2347012 100644
--- a/pkgs/development/libraries/haskell/data-accessor/data-accessor-template.nix
+++ b/pkgs/development/libraries/haskell/data-accessor/data-accessor-template.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "data-accessor-template";
- version = "0.2.1.9";
- sha256 = "14zp2zjxlkdi33cjif9lc1kl8m0x4brh0pk3d34wk1g1bfzynijc";
+ version = "0.2.1.10";
+ sha256 = "11a4c0g74ppl7nls0dhx6xs47dfcq1wp7bd8qgdba6hhn645afzy";
buildDepends = [ dataAccessor utilityHt ];
meta = {
homepage = "http://www.haskell.org/haskellwiki/Record_access";
diff --git a/pkgs/development/libraries/haskell/data-accessor/data-accessor.nix b/pkgs/development/libraries/haskell/data-accessor/data-accessor.nix
index 6f73cc48817..7c1de10b20b 100644
--- a/pkgs/development/libraries/haskell/data-accessor/data-accessor.nix
+++ b/pkgs/development/libraries/haskell/data-accessor/data-accessor.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "data-accessor";
- version = "0.2.2.2";
- sha256 = "1q9hx2bkp7dknr9ygx39lj93i846x8g9j7lkhkjijvsicih28yyi";
+ version = "0.2.2.3";
+ sha256 = "1fa1rbbs3m05y61w42vj4vqlcpqmz60v8mv3r0h6lx669k6ka5gj";
buildDepends = [ transformers ];
meta = {
homepage = "http://www.haskell.org/haskellwiki/Record_access";
diff --git a/pkgs/development/libraries/haskell/data-binary-ieee754/default.nix b/pkgs/development/libraries/haskell/data-binary-ieee754/default.nix
index 08f6b654f3b..5066a83c5f6 100644
--- a/pkgs/development/libraries/haskell/data-binary-ieee754/default.nix
+++ b/pkgs/development/libraries/haskell/data-binary-ieee754/default.nix
@@ -2,13 +2,11 @@
cabal.mkDerivation (self: {
pname = "data-binary-ieee754";
- version = "0.4.2.1";
- sha256 = "0i0nclq8858flpp2sl3czwz6rfaykjrlzpvlfr6vlxzf8zvah9kz";
- isLibrary = true;
- isExecutable = true;
+ version = "0.4.3";
+ sha256 = "0aba7qvjvhfp9cpr65j8zs62niv9yccrardk10aaqpkz3ihc86pm";
buildDepends = [ binary ];
meta = {
- homepage = "http://john-millikin.com/software/data-binary-ieee754/";
+ homepage = "https://john-millikin.com/software/data-binary-ieee754/";
description = "Parser/Serialiser for IEEE-754 floating-point values";
license = self.stdenv.lib.licenses.mit;
platforms = self.ghc.meta.platforms;
diff --git a/pkgs/development/libraries/haskell/data-inttrie/default.nix b/pkgs/development/libraries/haskell/data-inttrie/default.nix
index 926d465065d..ecb0748df6a 100644
--- a/pkgs/development/libraries/haskell/data-inttrie/default.nix
+++ b/pkgs/development/libraries/haskell/data-inttrie/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "data-inttrie";
- version = "0.0.7";
- sha256 = "19d586p2pj38pirrkip9z6yxrdbpiqsbnczmnyvd8slndilqz0ip";
+ version = "0.0.8";
+ sha256 = "0lzp89lq4gb84rcxqi77yarggz94a206da456208rrr7rhlqxg2x";
meta = {
homepage = "http://github.com/luqui/data-inttrie";
description = "A lazy, infinite trie of integers";
diff --git a/pkgs/development/libraries/haskell/data-lens-template/default.nix b/pkgs/development/libraries/haskell/data-lens-template/default.nix
index fc058b92e54..7ba9e3f9da7 100644
--- a/pkgs/development/libraries/haskell/data-lens-template/default.nix
+++ b/pkgs/development/libraries/haskell/data-lens-template/default.nix
@@ -2,11 +2,11 @@
cabal.mkDerivation (self: {
pname = "data-lens-template";
- version = "2.1.5";
- sha256 = "09i9lby5jd2kcg0l7y4hkga7jxixcpqw4dc7h1kngqdz92a1ydxc";
+ version = "2.1.7";
+ sha256 = "108xvk5glsw016vdvjb1p3a9zh7rgbkjv5xashs1hj25f8k4cw49";
buildDepends = [ dataLens ];
meta = {
- homepage = "http://github.com/ekmett/data-lens-template/";
+ homepage = "http://github.com/roconnor/data-lens-template/";
description = "Utilities for Data.Lens";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
diff --git a/pkgs/development/libraries/haskell/data-memocombinators/default.nix b/pkgs/development/libraries/haskell/data-memocombinators/default.nix
index 25f063c20ac..2b3adde1d72 100644
--- a/pkgs/development/libraries/haskell/data-memocombinators/default.nix
+++ b/pkgs/development/libraries/haskell/data-memocombinators/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "data-memocombinators";
- version = "0.4.3";
- sha256 = "0mzvjgccm23y7mfaz9iwdy64amf69d7i8yq9fc9mjx1nyzxdrgsc";
+ version = "0.4.4";
+ sha256 = "06x79rgxi6cxrpzjzzsjk7yj7i0ajmcgns0n12lxakz9vxbqxyn2";
buildDepends = [ dataInttrie ];
meta = {
homepage = "http://github.com/luqui/data-memocombinators";
diff --git a/pkgs/development/libraries/haskell/dataenc/default.nix b/pkgs/development/libraries/haskell/dataenc/default.nix
index d2428600ce9..2ece14dcfdc 100644
--- a/pkgs/development/libraries/haskell/dataenc/default.nix
+++ b/pkgs/development/libraries/haskell/dataenc/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "dataenc";
- version = "0.14.0.3";
- sha256 = "1k6k9cpx5ma32gvzf2mdbz4kfiblwfah9875qr13zkl4has9y0pd";
+ version = "0.14.0.4";
+ sha256 = "0xnn90nyz4m0rbzykkr5p9270s8dq2bfiz5j7qyzyy5m8vbl15bw";
isLibrary = true;
isExecutable = true;
meta = {
diff --git a/pkgs/development/libraries/haskell/dbus/default.nix b/pkgs/development/libraries/haskell/dbus/default.nix
new file mode 100644
index 00000000000..16cb2c7ca03
--- /dev/null
+++ b/pkgs/development/libraries/haskell/dbus/default.nix
@@ -0,0 +1,19 @@
+{ cabal, cereal, libxmlSax, network, parsec, random, text
+, transformers, vector, xmlTypes
+}:
+
+cabal.mkDerivation (self: {
+ pname = "dbus";
+ version = "0.10.4";
+ sha256 = "0cv4sgk1mdxc81jlky21k0y3zg7qii585xiapr1m589r5528gj2f";
+ buildDepends = [
+ cereal libxmlSax network parsec random text transformers vector
+ xmlTypes
+ ];
+ meta = {
+ homepage = "https://john-millikin.com/software/haskell-dbus/";
+ description = "A client library for the D-Bus IPC system";
+ license = self.stdenv.lib.licenses.gpl3;
+ platforms = self.ghc.meta.platforms;
+ };
+})
diff --git a/pkgs/development/libraries/haskell/deepseq-th/default.nix b/pkgs/development/libraries/haskell/deepseq-th/default.nix
index 1072bcb9ca7..2af4bb9f3f1 100644
--- a/pkgs/development/libraries/haskell/deepseq-th/default.nix
+++ b/pkgs/development/libraries/haskell/deepseq-th/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "deepseq-th";
- version = "0.1.0.3";
- sha256 = "1xx88i55iskyxrpxbdg0srb64y5siqs1b8qj7bh3i1893qs9sha2";
+ version = "0.1.0.4";
+ sha256 = "12wk8higrp12b22zzz1b4ar1q5h7flk22bp2rvswsqri2zkbi965";
buildDepends = [ deepseq ];
meta = {
description = "Template Haskell based deriver for optimised NFData instances";
diff --git a/pkgs/development/libraries/haskell/digest/default.nix b/pkgs/development/libraries/haskell/digest/default.nix
index bd6d249eee3..c315c0813eb 100644
--- a/pkgs/development/libraries/haskell/digest/default.nix
+++ b/pkgs/development/libraries/haskell/digest/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "digest";
- version = "0.0.1.1";
- sha256 = "1m04szf9yabmm6mkjq2x7a57bjdf2i611wm2k99wdcygb5cvif3v";
+ version = "0.0.1.2";
+ sha256 = "04gy2zp8yzvv7j9bdfvmfzcz3sqyqa6rwslqcn4vyair2vmif5v4";
extraLibraries = [ zlib ];
meta = {
description = "Various cryptographic hashes for bytestrings; CRC32 and Adler32 for now";
diff --git a/pkgs/development/libraries/haskell/digestive-functors-snap/default.nix b/pkgs/development/libraries/haskell/digestive-functors-snap/default.nix
index 3d5725e603f..2d7fdada428 100644
--- a/pkgs/development/libraries/haskell/digestive-functors-snap/default.nix
+++ b/pkgs/development/libraries/haskell/digestive-functors-snap/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "digestive-functors-snap";
- version = "0.5.0.0";
- sha256 = "01lbd42rsryzqzra8ax22iw6c9fyv5az8q7dkdi6yyfxdq976l0x";
+ version = "0.5.0.2";
+ sha256 = "0xx5i09l8n1srdmslq0sq1h366cdq3xqxwjd3kp2ck9s6x65zyjz";
buildDepends = [ digestiveFunctors filepath mtl snapCore text ];
meta = {
homepage = "http://github.com/jaspervdj/digestive-functors";
diff --git a/pkgs/development/libraries/haskell/digestive-functors/default.nix b/pkgs/development/libraries/haskell/digestive-functors/default.nix
index d6d4710f306..cce033eaf29 100644
--- a/pkgs/development/libraries/haskell/digestive-functors/default.nix
+++ b/pkgs/development/libraries/haskell/digestive-functors/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "digestive-functors";
- version = "0.5.0.2";
- sha256 = "1phakcljl6ri2p9lfzjnn001jw0inyxa5zd7lp2k9lhq1yq0byb0";
+ version = "0.5.0.4";
+ sha256 = "0diaj1pmfmhwbyjmw49kna59f7dckwrp16cbar5xpcn9k2pf19nv";
buildDepends = [ mtl text ];
meta = {
homepage = "http://github.com/jaspervdj/digestive-functors";
diff --git a/pkgs/development/libraries/haskell/directory-tree/default.nix b/pkgs/development/libraries/haskell/directory-tree/default.nix
index 65148f10a22..5c8b357593e 100644
--- a/pkgs/development/libraries/haskell/directory-tree/default.nix
+++ b/pkgs/development/libraries/haskell/directory-tree/default.nix
@@ -2,11 +2,11 @@
cabal.mkDerivation (self: {
pname = "directory-tree";
- version = "0.10.1";
- sha256 = "02acmfdw1yjb0h9dpjy04xxclsasm1p0m6w1dvccd4x2aqc6ybbw";
+ version = "0.11.0";
+ sha256 = "07vqwnzbwfjvlwcl50x5jl9yzvqfln0m4k4lam9r5n49wv7p01c9";
buildDepends = [ filepath ];
meta = {
- homepage = "http://coder.bsimmons.name/blog/2009/05/directory-tree-module-released/";
+ homepage = "http://brandon.si/code/directory-tree-module-released/";
description = "A simple directory-like tree datatype, with useful IO functions";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
diff --git a/pkgs/development/libraries/haskell/distributed-process-simplelocalnet/default.nix b/pkgs/development/libraries/haskell/distributed-process-simplelocalnet/default.nix
new file mode 100644
index 00000000000..bb48c394414
--- /dev/null
+++ b/pkgs/development/libraries/haskell/distributed-process-simplelocalnet/default.nix
@@ -0,0 +1,23 @@
+{ cabal, binary, dataAccessor, distributedProcess, network
+, networkMulticast, networkTransport, networkTransportTcp
+, transformers
+}:
+
+cabal.mkDerivation (self: {
+ pname = "distributed-process-simplelocalnet";
+ version = "0.2.0.7";
+ sha256 = "0jxbxacvdg4pf65s6r48nck45g8dfsarks3m2pdn73gjn4cd81c7";
+ isLibrary = true;
+ isExecutable = true;
+ buildDepends = [
+ binary dataAccessor distributedProcess network networkMulticast
+ networkTransport networkTransportTcp transformers
+ ];
+ meta = {
+ homepage = "http://github.com/haskell-distributed/distributed-process";
+ description = "Simple zero-configuration backend for Cloud Haskell";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ maintainers = [ self.stdenv.lib.maintainers.andres ];
+ };
+})
diff --git a/pkgs/development/libraries/haskell/distributed-process/default.nix b/pkgs/development/libraries/haskell/distributed-process/default.nix
new file mode 100644
index 00000000000..b38ae0c46c8
--- /dev/null
+++ b/pkgs/development/libraries/haskell/distributed-process/default.nix
@@ -0,0 +1,24 @@
+{ cabal, binary, dataAccessor, distributedStatic, mtl
+, networkTransport, random, rank1dynamic, stm, syb, time
+, transformers
+}:
+
+cabal.mkDerivation (self: {
+ pname = "distributed-process";
+ version = "0.4.0.2";
+ sha256 = "0wjxai5z6m84blrgic1pd0jgivqcc8ymjya3m0dhqbmsljwh6ynw";
+ isLibrary = true;
+ isExecutable = true;
+ buildDepends = [
+ binary dataAccessor distributedStatic mtl networkTransport random
+ rank1dynamic stm syb time transformers
+ ];
+ noHaddock = true;
+ meta = {
+ homepage = "http://github.com/haskell-distributed/distributed-process";
+ description = "Cloud Haskell: Erlang-style concurrency in Haskell";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ maintainers = [ self.stdenv.lib.maintainers.andres ];
+ };
+})
diff --git a/pkgs/development/libraries/haskell/distributed-static/default.nix b/pkgs/development/libraries/haskell/distributed-static/default.nix
new file mode 100644
index 00000000000..c09558449df
--- /dev/null
+++ b/pkgs/development/libraries/haskell/distributed-static/default.nix
@@ -0,0 +1,15 @@
+{ cabal, binary, rank1dynamic }:
+
+cabal.mkDerivation (self: {
+ pname = "distributed-static";
+ version = "0.2.1";
+ sha256 = "0cdwizm4fr2akw7hsqdrvqk06h1lybpxjiczv3kmd0lyc4cb7kyc";
+ buildDepends = [ binary rank1dynamic ];
+ meta = {
+ homepage = "http://www.github.com/haskell-distributed/distributed-process";
+ description = "Compositional, type-safe, polymorphic static values and closures";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ maintainers = [ self.stdenv.lib.maintainers.andres ];
+ };
+})
diff --git a/pkgs/development/libraries/haskell/dns/default.nix b/pkgs/development/libraries/haskell/dns/default.nix
new file mode 100644
index 00000000000..0854f39efce
--- /dev/null
+++ b/pkgs/development/libraries/haskell/dns/default.nix
@@ -0,0 +1,18 @@
+{ cabal, attoparsec, attoparsecConduit, binary, blazeBuilder
+, conduit, iproute, mtl, network, networkConduit, random
+}:
+
+cabal.mkDerivation (self: {
+ pname = "dns";
+ version = "0.3.6";
+ sha256 = "0dpwy94id9rxxjpji47nazinm8i1ihm0606dmi5iqqhbl5h2jara";
+ buildDepends = [
+ attoparsec attoparsecConduit binary blazeBuilder conduit iproute
+ mtl network networkConduit random
+ ];
+ meta = {
+ description = "DNS library in Haskell";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ };
+})
diff --git a/pkgs/development/libraries/haskell/dstring/default.nix b/pkgs/development/libraries/haskell/dstring/default.nix
index e025b00f837..4b5dd2b3888 100644
--- a/pkgs/development/libraries/haskell/dstring/default.nix
+++ b/pkgs/development/libraries/haskell/dstring/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "dstring";
- version = "0.4.0.3";
- sha256 = "0wzj1wzls7w79ac84sc5msblh2dmfmcxm77drpdqdirl1pwdlq9c";
+ version = "0.4.0.4";
+ sha256 = "15zy1dhfs87hxq1qm54ym0pdhvg7l76m7vy5y06dnksb1sblhaqm";
buildDepends = [ baseUnicodeSymbols dlist ];
meta = {
homepage = "https://github.com/basvandijk/dstring";
diff --git a/pkgs/development/libraries/haskell/edit-distance/default.nix b/pkgs/development/libraries/haskell/edit-distance/default.nix
index 07744765adb..b6d0b4668f8 100644
--- a/pkgs/development/libraries/haskell/edit-distance/default.nix
+++ b/pkgs/development/libraries/haskell/edit-distance/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "edit-distance";
- version = "0.2.1";
- sha256 = "1zhiyzgqmxi4mn7zn5q6rg03hgff9y5f9xizbs00069v7ncygi38";
+ version = "0.2.1.1";
+ sha256 = "1d8h38cn3azvsp2dp5gycglm5bwwd8plbag8ypi38yj6c35a82yn";
isLibrary = true;
isExecutable = true;
buildDepends = [ random ];
diff --git a/pkgs/development/libraries/haskell/elerea/default.nix b/pkgs/development/libraries/haskell/elerea/default.nix
new file mode 100644
index 00000000000..8ba4687d3e3
--- /dev/null
+++ b/pkgs/development/libraries/haskell/elerea/default.nix
@@ -0,0 +1,12 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+ pname = "elerea";
+ version = "2.7.0.2";
+ sha256 = "1n45q1hx548c6yqbj3321lky3xxsffpqvmcq0m9hw36d3cvwbvg0";
+ meta = {
+ description = "A minimalistic FRP library";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ };
+})
diff --git a/pkgs/development/libraries/haskell/exception-mtl/default.nix b/pkgs/development/libraries/haskell/exception-mtl/default.nix
index 9b378751ebf..2c64598d1d0 100644
--- a/pkgs/development/libraries/haskell/exception-mtl/default.nix
+++ b/pkgs/development/libraries/haskell/exception-mtl/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "exception-mtl";
- version = "0.3.0.2";
- sha256 = "1mhk1z7hz50h8ssr4s7dzdxzn02rr0njxijdddfjjw71fln3nl5h";
+ version = "0.3.0.3";
+ sha256 = "1mmkp16c5ixknhm69a2zjrs9q0dd5ragmljnjjd6lxpakdlw64ww";
buildDepends = [ exceptionTransformers mtl transformers ];
meta = {
homepage = "http://www.eecs.harvard.edu/~mainland/";
diff --git a/pkgs/development/libraries/haskell/exception-transformers/default.nix b/pkgs/development/libraries/haskell/exception-transformers/default.nix
index b1e0fcec5e0..5c4a9402020 100644
--- a/pkgs/development/libraries/haskell/exception-transformers/default.nix
+++ b/pkgs/development/libraries/haskell/exception-transformers/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "exception-transformers";
- version = "0.3.0.2";
- sha256 = "1ah3dimnc980vkr2lycpl4nsb615gxqws6mv9j90mz6g165h9khf";
+ version = "0.3.0.3";
+ sha256 = "0z3z5pppaqqbndd4fgv1czr8f9f4a8r86bwc3bcv88yf7y8cfbwz";
buildDepends = [ stm transformers ];
meta = {
homepage = "http://www.eecs.harvard.edu/~mainland/";
diff --git a/pkgs/development/libraries/haskell/explicit-exception/default.nix b/pkgs/development/libraries/haskell/explicit-exception/default.nix
index 86d4cc50c3b..0f2385a004f 100644
--- a/pkgs/development/libraries/haskell/explicit-exception/default.nix
+++ b/pkgs/development/libraries/haskell/explicit-exception/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "explicit-exception";
- version = "0.1.7";
- sha256 = "0pqh97fxs55554bd16dknggkr0yayqj1dz0sddp9b2svjy2q4vrm";
+ version = "0.1.7.1";
+ sha256 = "15p5pndam6byd3p8qlnn8pjdhb7rvn93fxa2m40x3wxh58ymkh14";
isLibrary = true;
isExecutable = true;
buildDepends = [ transformers ];
diff --git a/pkgs/development/libraries/haskell/file-embed/default.nix b/pkgs/development/libraries/haskell/file-embed/default.nix
index 0a6fdf6c8cc..a36d333e909 100644
--- a/pkgs/development/libraries/haskell/file-embed/default.nix
+++ b/pkgs/development/libraries/haskell/file-embed/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "file-embed";
- version = "0.0.4.5";
- sha256 = "18rhcjll5gj790g5balk3xhnmmgjh2bixik8vna5drs7y9i0innp";
+ version = "0.0.4.6";
+ sha256 = "0p2vs56s1jy5xaw3axzfsir925z2a46624n32x797lga9khm3qvp";
meta = {
homepage = "https://github.com/snoyberg/file-embed";
description = "Use Template Haskell to embed file contents directly";
diff --git a/pkgs/development/libraries/haskell/filestore/default.nix b/pkgs/development/libraries/haskell/filestore/default.nix
index 752037698ca..f56db649fc7 100644
--- a/pkgs/development/libraries/haskell/filestore/default.nix
+++ b/pkgs/development/libraries/haskell/filestore/default.nix
@@ -4,15 +4,13 @@
cabal.mkDerivation (self: {
pname = "filestore";
- version = "0.5";
- sha256 = "0cppm8iksz4dnh4kafyfy0cqbidw83rdpgc1mksiwh9c9gaxrlq7";
+ version = "0.5.0.1";
+ sha256 = "1wbiw3skbbcqi9p97xnhg5lnakq3vyan9v4f68wd3g4swk09xp7l";
isLibrary = true;
isExecutable = true;
buildDepends = [
Diff filepath HUnit mtl parsec split time utf8String xml
];
- noHaddock = true;
- jailbreak = true;
meta = {
description = "Interface for versioning file stores";
license = self.stdenv.lib.licenses.bsd3;
diff --git a/pkgs/development/libraries/haskell/filesystem-conduit/default.nix b/pkgs/development/libraries/haskell/filesystem-conduit/default.nix
new file mode 100644
index 00000000000..fd20b7c7547
--- /dev/null
+++ b/pkgs/development/libraries/haskell/filesystem-conduit/default.nix
@@ -0,0 +1,17 @@
+{ cabal, conduit, systemFileio, systemFilepath, text, transformers
+}:
+
+cabal.mkDerivation (self: {
+ pname = "filesystem-conduit";
+ version = "0.5.0.2";
+ sha256 = "0vpxl32k6734vli8nky9cwyabw9alvpjm0g5q822yj9rk2439yfq";
+ buildDepends = [
+ conduit systemFileio systemFilepath text transformers
+ ];
+ meta = {
+ homepage = "http://github.com/snoyberg/conduit";
+ description = "Use system-filepath data types with conduits";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ };
+})
diff --git a/pkgs/development/libraries/haskell/fsnotify/default.nix b/pkgs/development/libraries/haskell/fsnotify/default.nix
new file mode 100644
index 00000000000..2b8378803b9
--- /dev/null
+++ b/pkgs/development/libraries/haskell/fsnotify/default.nix
@@ -0,0 +1,13 @@
+{ cabal, hinotify, systemFileio, systemFilepath, text, time }:
+
+cabal.mkDerivation (self: {
+ pname = "fsnotify";
+ version = "0.0.4";
+ sha256 = "0s71zxj48jimzhl7wz9j22g9c09z64g61nfmpy4mlrhpkzn1f8sz";
+ buildDepends = [ hinotify systemFileio systemFilepath text time ];
+ meta = {
+ description = "Cross platform library for file creation, modification, and deletion notification";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ };
+})
diff --git a/pkgs/development/libraries/haskell/generic-deriving/default.nix b/pkgs/development/libraries/haskell/generic-deriving/default.nix
index ffc44542976..27eecd552a6 100644
--- a/pkgs/development/libraries/haskell/generic-deriving/default.nix
+++ b/pkgs/development/libraries/haskell/generic-deriving/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "generic-deriving";
- version = "1.2.1";
- sha256 = "0ld4kh3p3lmavxi4y25fpxvq75qk7bd87yvwcbj63j6af1v60h2z";
+ version = "1.3.1";
+ sha256 = "1z02j86lgn57ws0rfq2m0zb0m866k9afh9346k8bbwb5c4914wm3";
meta = {
description = "Generic programming library for generalised deriving";
license = self.stdenv.lib.licenses.bsd3;
diff --git a/pkgs/development/libraries/haskell/geniplate/default.nix b/pkgs/development/libraries/haskell/geniplate/default.nix
new file mode 100644
index 00000000000..eff79afa416
--- /dev/null
+++ b/pkgs/development/libraries/haskell/geniplate/default.nix
@@ -0,0 +1,13 @@
+{ cabal, mtl }:
+
+cabal.mkDerivation (self: {
+ pname = "geniplate";
+ version = "0.6.0.3";
+ sha256 = "1n73p57gkn9qf7jn54izypc7zycd9i6y9z9i1gc8yn1wd8sv7vkn";
+ buildDepends = [ mtl ];
+ meta = {
+ description = "Use template Haskell to generate Uniplate-like functions";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ };
+})
diff --git a/pkgs/development/libraries/haskell/ghc-core/default.nix b/pkgs/development/libraries/haskell/ghc-core/default.nix
index fd1e45d1e2e..8c2f481122b 100644
--- a/pkgs/development/libraries/haskell/ghc-core/default.nix
+++ b/pkgs/development/libraries/haskell/ghc-core/default.nix
@@ -2,13 +2,13 @@
cabal.mkDerivation (self: {
pname = "ghc-core";
- version = "0.5.4";
- sha256 = "1s68m2zkpz0n927rgzg0l0r5v8pk3z03rlkd82h83agw0hzb9ng7";
+ version = "0.5.6";
+ sha256 = "11byidxq2mcqams9a7df0hwwlzir639mr1s556sw5rrbi7jz6d7c";
isLibrary = false;
isExecutable = true;
buildDepends = [ colorizeHaskell filepath pcreLight ];
meta = {
- homepage = "http://code.haskell.org/~dons/code/ghc-core";
+ homepage = "https://github.com/shachaf/ghc-core";
description = "Display GHC's core and assembly output in a pager";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
diff --git a/pkgs/development/libraries/haskell/ghc-events/default.nix b/pkgs/development/libraries/haskell/ghc-events/default.nix
index 0b5fc5c107a..7eb49668e3c 100644
--- a/pkgs/development/libraries/haskell/ghc-events/default.nix
+++ b/pkgs/development/libraries/haskell/ghc-events/default.nix
@@ -2,13 +2,11 @@
cabal.mkDerivation (self: {
pname = "ghc-events";
- version = "0.4.0.0";
- sha256 = "0q1r5jxk8ma8rg65n4iixl5zyk4nxpzi4ywf0jz8y1nbbhbas7g2";
+ version = "0.4.2.0";
+ sha256 = "0209r9g5w4ifsaw3dkfra6kma1vyk50dc306an72mcwnp4l7dv4l";
isLibrary = true;
isExecutable = true;
buildDepends = [ binary mtl ];
- noHaddock = true;
- jailbreak = true;
meta = {
description = "Library and tool for parsing .eventlog files from GHC";
license = self.stdenv.lib.licenses.bsd3;
diff --git a/pkgs/development/libraries/haskell/ghc-mod/default.nix b/pkgs/development/libraries/haskell/ghc-mod/default.nix
index b4412c35421..6ef59a4451b 100644
--- a/pkgs/development/libraries/haskell/ghc-mod/default.nix
+++ b/pkgs/development/libraries/haskell/ghc-mod/default.nix
@@ -1,16 +1,16 @@
-{ cabal, Cabal, emacs, filepath, ghcPaths, ghcSybUtils, hlint
-, ioChoice, regexPosix, syb, transformers
+{ cabal, Cabal, convertible, emacs, filepath, ghcPaths, ghcSybUtils
+, hlint, ioChoice, regexPosix, syb, time, transformers
}:
cabal.mkDerivation (self: {
pname = "ghc-mod";
- version = "1.11.0";
- sha256 = "19cx6jhciww2xgad3q35h3jlwiv9s9b6na2qi1cbga7p77swarsv";
+ version = "1.11.2";
+ sha256 = "0df1g57mwgd9avd2smnc7j97n14553p3zdmnbjanhnzin2fqj0dc";
isLibrary = false;
isExecutable = true;
buildDepends = [
- Cabal filepath ghcPaths ghcSybUtils hlint ioChoice regexPosix syb
- transformers
+ Cabal convertible filepath ghcPaths ghcSybUtils hlint ioChoice
+ regexPosix syb time transformers
];
buildTools = [ emacs ];
postInstall = ''
diff --git a/pkgs/development/libraries/haskell/ghc-mtl/default.nix b/pkgs/development/libraries/haskell/ghc-mtl/default.nix
index f885b9a5313..ea2495f6586 100644
--- a/pkgs/development/libraries/haskell/ghc-mtl/default.nix
+++ b/pkgs/development/libraries/haskell/ghc-mtl/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "ghc-mtl";
- version = "1.0.1.1";
- sha256 = "04lm1g27xwwph02k3d8b51nbhi2sw8jx7arqczcqc3rygak10fpn";
+ version = "1.0.1.2";
+ sha256 = "06m8ynqlbvvs37w211ikldwvlvg4ry27x9l7idnwa1m8w2jkbkva";
buildDepends = [ MonadCatchIOMtl mtl ];
meta = {
homepage = "http://darcsden.com/jcpetruzza/ghc-mtl";
diff --git a/pkgs/development/libraries/haskell/ghc-syb-utils/default.nix b/pkgs/development/libraries/haskell/ghc-syb-utils/default.nix
index 804e55a2245..6f5f1458507 100644
--- a/pkgs/development/libraries/haskell/ghc-syb-utils/default.nix
+++ b/pkgs/development/libraries/haskell/ghc-syb-utils/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "ghc-syb-utils";
- version = "0.2.1.0";
- sha256 = "02wmd4zkng38z3bhsk4w4dqj1lzznhg2p0ijwr1a0dgx8cqr490z";
+ version = "0.2.1.1";
+ sha256 = "1fwlzqbkjn592jh01nccn99iii6047fg9f3hh255586nzngihh1l";
buildDepends = [ syb ];
meta = {
homepage = "http://github.com/nominolo/ghc-syb";
diff --git a/pkgs/development/libraries/haskell/gio/default.nix b/pkgs/development/libraries/haskell/gio/default.nix
index 98a3d32348e..e9d295798b6 100644
--- a/pkgs/development/libraries/haskell/gio/default.nix
+++ b/pkgs/development/libraries/haskell/gio/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "gio";
- version = "0.12.3";
- sha256 = "0kmqldlgxwj8sh0b5k5gicc5z2n6mc9h3fmdby4wx1l4ska7rajn";
+ version = "0.12.4";
+ sha256 = "0npvq77z72c9z009krvs4n9vv3gqj6g8fdqd777kzw1dbkhp9ziy";
buildDepends = [ glib mtl ];
buildTools = [ gtk2hsBuildtools ];
pkgconfigDepends = [ glib ];
diff --git a/pkgs/development/libraries/haskell/gitit/default.nix b/pkgs/development/libraries/haskell/gitit/default.nix
index 7de302aee6d..a77c122985e 100644
--- a/pkgs/development/libraries/haskell/gitit/default.nix
+++ b/pkgs/development/libraries/haskell/gitit/default.nix
@@ -7,8 +7,8 @@
cabal.mkDerivation (self: {
pname = "gitit";
- version = "0.10.0.1";
- sha256 = "0dx4jq7j0s6h5lfl8qrr4qnyb3j0cnnc1c786yf8kcmhk04n028f";
+ version = "0.10.0.2";
+ sha256 = "0cnql35h4laqpaymg32dmszwzc74qmbmmjas44gcsd8v5n6f701i";
isLibrary = true;
isExecutable = true;
buildDepends = [
diff --git a/pkgs/development/libraries/haskell/glib/default.nix b/pkgs/development/libraries/haskell/glib/default.nix
index 86ce395f1ff..29d2f92d7ba 100644
--- a/pkgs/development/libraries/haskell/glib/default.nix
+++ b/pkgs/development/libraries/haskell/glib/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "glib";
- version = "0.12.3.1";
- sha256 = "1k5s1d05kv0amvkjr644pqvicvmcgr5fffsz0xyljbj5jk4iv0py";
+ version = "0.12.4";
+ sha256 = "0s92phy1xlgjzqc7y5plviipb98m13h5lj4n9g6lbv4i106z97ax";
buildTools = [ gtk2hsBuildtools ];
extraLibraries = [ libc pkgconfig ];
pkgconfigDepends = [ glib ];
diff --git a/pkgs/development/libraries/haskell/gloss/default.nix b/pkgs/development/libraries/haskell/gloss/default.nix
index a4b613dd756..7d2319df08a 100644
--- a/pkgs/development/libraries/haskell/gloss/default.nix
+++ b/pkgs/development/libraries/haskell/gloss/default.nix
@@ -2,9 +2,10 @@
cabal.mkDerivation (self: {
pname = "gloss";
- version = "1.7.5.2";
- sha256 = "1lasq106slq57k832pqhaq5wh7hwxn5bzg7rjk95rf3rrq5xb9f5";
+ version = "1.7.6.6";
+ sha256 = "1by8zr1194mjnnia0ackhd48yqxh79k752c5jwxx6nsk1diwrvl9";
buildDepends = [ bmp GLUT OpenGL ];
+ jailbreak = true;
meta = {
homepage = "http://gloss.ouroborus.net";
description = "Painless 2D vector graphics, animations and simulations";
diff --git a/pkgs/development/libraries/haskell/gnuidn/default.nix b/pkgs/development/libraries/haskell/gnuidn/default.nix
new file mode 100644
index 00000000000..6ae78cf49b6
--- /dev/null
+++ b/pkgs/development/libraries/haskell/gnuidn/default.nix
@@ -0,0 +1,17 @@
+{ cabal, c2hs, libidn, text }:
+
+cabal.mkDerivation (self: {
+ pname = "gnuidn";
+ version = "0.2";
+ sha256 = "0xk72p3z1lwlmab0jcf7m48p5pncgz00hb7l96naz1gdkbq7xizd";
+ buildDepends = [ text ];
+ buildTools = [ c2hs ];
+ extraLibraries = [ libidn ];
+ pkgconfigDepends = [ libidn ];
+ meta = {
+ homepage = "http://john-millikin.com/software/bindings/gnuidn/";
+ description = "Bindings for GNU IDN";
+ license = self.stdenv.lib.licenses.gpl3;
+ platforms = self.ghc.meta.platforms;
+ };
+})
diff --git a/pkgs/development/libraries/haskell/gnutls/default.nix b/pkgs/development/libraries/haskell/gnutls/default.nix
new file mode 100644
index 00000000000..72f98677ce6
--- /dev/null
+++ b/pkgs/development/libraries/haskell/gnutls/default.nix
@@ -0,0 +1,16 @@
+{ cabal, gnutls, monadsTf, transformers }:
+
+cabal.mkDerivation (self: {
+ pname = "gnutls";
+ version = "0.1.4";
+ sha256 = "0xgjp274m4z005z77lhmh7blg6rw9g28jm0sd376rr49hykbxwd1";
+ buildDepends = [ monadsTf transformers ];
+ extraLibraries = [ gnutls ];
+ pkgconfigDepends = [ gnutls ];
+ meta = {
+ homepage = "https://john-millikin.com/software/haskell-gnutls/";
+ description = "Bindings for GNU libgnutls";
+ license = self.stdenv.lib.licenses.gpl3;
+ platforms = self.ghc.meta.platforms;
+ };
+})
diff --git a/pkgs/development/libraries/haskell/graphviz/default.nix b/pkgs/development/libraries/haskell/graphviz/default.nix
index 7986ef07c1e..e48f92e5b81 100644
--- a/pkgs/development/libraries/haskell/graphviz/default.nix
+++ b/pkgs/development/libraries/haskell/graphviz/default.nix
@@ -9,6 +9,7 @@ cabal.mkDerivation (self: {
buildDepends = [
colour dlist fgl filepath polyparse text transformers wlPprintText
];
+ patchPhase = "sed -i -e 's|bytestring.*,|bytestring,|' graphviz.cabal";
meta = {
homepage = "http://projects.haskell.org/graphviz/";
description = "Bindings to Graphviz for graph visualisation";
diff --git a/pkgs/development/libraries/haskell/gsasl/default.nix b/pkgs/development/libraries/haskell/gsasl/default.nix
new file mode 100644
index 00000000000..5a654cdd11d
--- /dev/null
+++ b/pkgs/development/libraries/haskell/gsasl/default.nix
@@ -0,0 +1,15 @@
+{ cabal, gsasl, transformers }:
+
+cabal.mkDerivation (self: {
+ pname = "gsasl";
+ version = "0.3.5";
+ sha256 = "1797rs6syrgs82akbj7nkmj0nni4w83fhwrl1zy2l3jqkcacvbm3";
+ buildDepends = [ transformers ];
+ pkgconfigDepends = [ gsasl ];
+ meta = {
+ homepage = "https://john-millikin.com/software/haskell-gsasl/";
+ description = "Bindings for GNU libgsasl";
+ license = self.stdenv.lib.licenses.gpl3;
+ platforms = self.ghc.meta.platforms;
+ };
+})
diff --git a/pkgs/development/libraries/haskell/gtk/default.nix b/pkgs/development/libraries/haskell/gtk/default.nix
index 57e6e20f78d..ed5244d7262 100644
--- a/pkgs/development/libraries/haskell/gtk/default.nix
+++ b/pkgs/development/libraries/haskell/gtk/default.nix
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "gtk";
- version = "0.12.3.1";
- sha256 = "0v9sh07lpvih2gk4ivy0jx2slw7rpvbf75xp20plzgzmay1y978s";
+ version = "0.12.4";
+ sha256 = "0w6ffi9fdz44kb6g1kipk5780r2wc2l3f5cgxjx5nd60qz1xh7p2";
buildDepends = [ cairo glib mtl pango ];
buildTools = [ gtk2hsBuildtools ];
extraLibraries = [ libc pkgconfig ];
diff --git a/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix b/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix
index aea067af904..677c6c15214 100644
--- a/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix
+++ b/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "gtk2hs-buildtools";
- version = "0.12.3.1";
- sha256 = "0a5lay1zy1pi6inaqjvhn8v0by2z5dpy3dssqsxwbq2hkfxizzy6";
+ version = "0.12.4";
+ sha256 = "0xh5z8pix5q48d9liicl021kq9py4rj5612va6lfjkj813p5zq2z";
isLibrary = false;
isExecutable = true;
buildDepends = [ filepath random ];
diff --git a/pkgs/development/libraries/haskell/hackage-db/default.nix b/pkgs/development/libraries/haskell/hackage-db/default.nix
index 37698cebb38..82175abb17e 100644
--- a/pkgs/development/libraries/haskell/hackage-db/default.nix
+++ b/pkgs/development/libraries/haskell/hackage-db/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "hackage-db";
- version = "1.3";
- sha256 = "17l2aw2kzjpjzyrg0c5vlaglx0vl475g3wxwavvzrd60z9lb3cp9";
+ version = "1.4";
+ sha256 = "12z1ak21xc9v373j956gz8l4ryj0582lgbl9ykp8q46n9b8sxfph";
buildDepends = [ Cabal filepath tar ];
meta = {
homepage = "http://github.com/peti/hackage-db";
diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix
index 4224bfe1216..ef2cc128e04 100644
--- a/pkgs/development/libraries/haskell/hakyll/default.nix
+++ b/pkgs/development/libraries/haskell/hakyll/default.nix
@@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = "hakyll";
- version = "3.4.1.0";
- sha256 = "028wq61kvh2nkz8dxbpcnvic1vlqnz1a2l1xrvficmvk25qyqmvy";
+ version = "3.5.1.0";
+ sha256 = "16aaxnknxbpzdlm6dlmsq8pfssp63ywqim0zm3kvf7zic3hvq2xr";
buildDepends = [
binary blazeHtml blazeMarkup citeprocHs cryptohash filepath hamlet
lrucache mtl pandoc parsec regexBase regexTdfa snapCore snapServer
diff --git a/pkgs/development/libraries/haskell/hamlet/default.nix b/pkgs/development/libraries/haskell/hamlet/default.nix
index 31d1ad66d2e..0fc9d7b59f3 100644
--- a/pkgs/development/libraries/haskell/hamlet/default.nix
+++ b/pkgs/development/libraries/haskell/hamlet/default.nix
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "hamlet";
- version = "1.1.0.2";
- sha256 = "0knkc43ldz3jhn3pmsysqbzlsp8akh9kiyy2jncra9y0xhminpqy";
+ version = "1.1.1.1";
+ sha256 = "0vxnvh9npsf1jxh471fnr2d13bdi7p8sxn5b2w86bla3q273jxp8";
buildDepends = [
blazeBuilder blazeHtml blazeMarkup failure parsec shakespeare text
];
diff --git a/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix b/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix
index cf71dde30c3..fad611798e9 100644
--- a/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix
+++ b/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix
@@ -2,10 +2,9 @@
cabal.mkDerivation (self: {
pname = "happstack-hamlet";
- version = "7.0.1";
- sha256 = "13ayypl2x402h6a7yq7fvgd2mn21gl5gcw2hk7f5vr2bdlvwv53n";
+ version = "7.0.2";
+ sha256 = "0hsmvv5rggyl7sa4sp30zyr43k6zj7dlpd0mb916wzcqrnyxa34a";
buildDepends = [ hamlet happstackServer text ];
- jailbreak = true;
meta = {
homepage = "http://www.happstack.com/";
description = "Support for Hamlet HTML templates in Happstack";
diff --git a/pkgs/development/libraries/haskell/happstack/happstack-server.nix b/pkgs/development/libraries/haskell/happstack/happstack-server.nix
index 06b882c20bb..e864075b42a 100644
--- a/pkgs/development/libraries/haskell/happstack/happstack-server.nix
+++ b/pkgs/development/libraries/haskell/happstack/happstack-server.nix
@@ -1,19 +1,19 @@
{ cabal, base64Bytestring, blazeHtml, extensibleExceptions
, filepath, hslogger, html, monadControl, mtl, network, parsec
-, sendfile, syb, systemFilepath, text, time, transformers
+, sendfile, syb, systemFilepath, text, threads, time, transformers
, transformersBase, utf8String, xhtml, zlib
}:
cabal.mkDerivation (self: {
pname = "happstack-server";
- version = "7.0.4";
- sha256 = "168201z5slm6mrkckpdpshgaiz29k9j1j97vmbrybprj0zhcrl7r";
+ version = "7.0.7";
+ sha256 = "0r9bk82zjzlsi6j6dnz5b73qacpfdyhsn5ds98cn7gkqyf4yg7cj";
buildDepends = [
base64Bytestring blazeHtml extensibleExceptions filepath hslogger
html monadControl mtl network parsec sendfile syb systemFilepath
- text time transformers transformersBase utf8String xhtml zlib
+ text threads time transformers transformersBase utf8String xhtml
+ zlib
];
- jailbreak = true;
meta = {
homepage = "http://happstack.com";
description = "Web related tools and services";
diff --git a/pkgs/development/libraries/haskell/hashed-storage/default.nix b/pkgs/development/libraries/haskell/hashed-storage/default.nix
index 04f465bb9fe..161e81eb375 100644
--- a/pkgs/development/libraries/haskell/hashed-storage/default.nix
+++ b/pkgs/development/libraries/haskell/hashed-storage/default.nix
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "hashed-storage";
- version = "0.5.9";
- sha256 = "1ycn0zwk5jqm6wwgs8nxpdg7fh5wx0i2058i0a924whj196kkhk2";
+ version = "0.5.10";
+ sha256 = "1k7drnk0y5apjvwsiw85032yvxllbi7ndg6h9x207gnjxm64m0h5";
isLibrary = true;
isExecutable = true;
buildDepends = [
diff --git a/pkgs/development/libraries/haskell/hashtables/default.nix b/pkgs/development/libraries/haskell/hashtables/default.nix
index 1f9e4b418e2..8b8616fce20 100644
--- a/pkgs/development/libraries/haskell/hashtables/default.nix
+++ b/pkgs/development/libraries/haskell/hashtables/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "hashtables";
- version = "1.0.1.6";
- sha256 = "071msa15447rk2zc5jbpms8sc1ml8yi1n5pycycrcik8dhsm3slb";
+ version = "1.0.1.8";
+ sha256 = "0skrzvzasm0hg4631nhfppsb7mn60pnxk4v31gipzz780sbx9zi8";
buildDepends = [ hashable primitive vector ];
meta = {
homepage = "http://github.com/gregorycollins/hashtables";
diff --git a/pkgs/development/libraries/haskell/haskell-platform/2012.4.0.0.nix b/pkgs/development/libraries/haskell/haskell-platform/2012.4.0.0.nix
new file mode 100644
index 00000000000..c9f269eebef
--- /dev/null
+++ b/pkgs/development/libraries/haskell/haskell-platform/2012.4.0.0.nix
@@ -0,0 +1,44 @@
+{cabal, fetchurl, GLUT, HTTP, HUnit, OpenGL, QuickCheck, async, cgi, fgl,
+ haskellSrc, html, network, parallel, parsec, primitive,
+ regexBase, regexCompat, regexPosix,
+ split, stm, syb, deepseq, text, transformers, mtl, vector, xhtml, zlib, random,
+ cabalInstall, alex, happy, haddock, ghc}:
+
+# This is just a meta-package. Because upstream fails to provide proper versioned
+# release tarballs that can be used for the purpose of verifying this package, we
+# just create it on the fly from a simple Setup.hs file and a .cabal file that we
+# store directly in the nixpkgs repository.
+
+cabal.mkDerivation (self : {
+ pname = "haskell-platform";
+ version = "2012.4.0.0";
+ cabalFile = ./haskell-platform-2012.4.0.0.cabal;
+ setupFile = ./Setup.hs;
+ src = null;
+ propagatedBuildInputs = [
+ GLUT HTTP HUnit OpenGL QuickCheck async cgi fgl
+ haskellSrc html network parallel parsec primitive
+ regexBase regexCompat regexPosix
+ split stm syb deepseq text transformers mtl vector xhtml zlib random
+ cabalInstall alex happy ghc haddock
+ ];
+ unpackPhase = ''
+ sourceRoot=haskell-platform
+ mkdir $sourceRoot
+ cp ${self.cabalFile} $sourceRoot/${self.pname}.cabal
+ cp ${self.setupFile} $sourceRoot/Setup.hs
+ touch $sourceRoot/LICENSE
+ '';
+ noHaddock = true;
+ meta = {
+ homepage = "http://haskell.org/platform";
+ description = "Haskell Platform meta package";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ maintainers = [
+ self.stdenv.lib.maintainers.andres
+ self.stdenv.lib.maintainers.simons
+ ];
+ };
+})
+
diff --git a/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2012.4.0.0.cabal b/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2012.4.0.0.cabal
new file mode 100644
index 00000000000..23d1f7a0a7d
--- /dev/null
+++ b/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2012.4.0.0.cabal
@@ -0,0 +1,113 @@
+name: haskell-platform
+version: 2012.4.0.0
+homepage: http://haskell.org/platform
+license: BSD3
+license-file: LICENSE
+author: libraries@haskell.org
+maintainer: haskell-platform@projects.haskell.org
+category: System
+synopsis: The Haskell Platform
+description:
+ The Haskell Platform (HP) is the blessed set of libraries and tools on
+ which to build further Haskell libraries and applications. It is
+ intended to provide a comprehensive, stable, and quality tested base for
+ Haskell projects to work from.
+ .
+ This version specifies the following additional developer tools be
+ installed, for a system to be in full compliance:
+ .
+ * cabal-install
+ * alex
+ * happy
+ * haddock
+
+cabal-version: >= 1.8
+build-type: Custom
+tested-with: GHC ==7.4.2
+
+flag include-ghc-depends
+ description: Include all the GHC provided packages in the dependencies
+ default: False
+
+library
+ if flag(include-ghc-depends)
+ build-depends:
+ ghc ==7.4.2,
+
+ -- Core libraries: provided by every ghc installation
+ -- We don't include "non-API" packages here.
+ -- begin core packages
+ array ==0.4.0.0,
+ base ==4.5.1.0,
+ bytestring ==0.9.2.1,
+ Cabal ==1.14.0,
+ containers ==0.4.2.1,
+ deepseq ==1.3.0.0,
+ directory ==1.1.0.2,
+ extensible-exceptions ==0.1.1.4,
+ filepath ==1.3.0.0,
+ haskell2010 ==1.1.0.1,
+ haskell98 ==2.0.0.1,
+ hpc ==0.5.1.1,
+ old-locale ==1.0.0.4,
+ old-time ==1.1.0.0,
+ pretty ==1.1.1.0,
+ process ==1.1.0.1,
+ template-haskell ==2.7.0.0,
+ time ==1.4
+ if !os(windows)
+ build-depends:
+ unix ==2.5.1.1
+ -- end core packages
+ else
+ build-depends:
+ Win32 ==2.2.2.0
+
+ build-depends:
+ -- Libraries in addition to what GHC provides:
+ -- Note: newer versions of cgi need monad-catchio.
+ -- begin platform packages
+ async ==2.0.1.3,
+ cgi ==3001.1.7.4,
+ fgl ==5.4.2.4,
+ GLUT ==2.1.2.1,
+ haskell-src ==1.0.1.5,
+ html ==1.0.1.2,
+ HTTP ==4000.2.5,
+ HUnit ==1.2.5.1,
+ mtl ==2.1.2,
+ network ==2.3.1.0,
+ OpenGL ==2.2.3.1,
+ parallel ==3.2.0.3,
+ parsec ==3.1.3,
+ QuickCheck ==2.5.1.1,
+ random ==1.0.1.1,
+ regex-base ==0.93.2,
+ regex-compat ==0.95.1,
+ regex-posix ==0.95.2,
+ split ==0.2.1.1,
+ stm ==2.4,
+ syb ==0.3.7,
+ text ==0.11.2.3,
+ transformers ==0.3.0.0,
+ vector ==0.10.0.1,
+ xhtml ==3000.2.1,
+ zlib ==0.5.4.0,
+
+ -- Libraries that are needed to support the above,
+ -- though are not officially part of the platform
+ primitive ==0.5.0.1
+
+ -- Depending on programs does not work, they are not registered
+ -- We list them to help distro packaging.
+ build-tools:
+ cabal-install ==0.14.0,
+ alex ==3.0.2,
+ happy ==1.18.10
+ -- end platform packages
+ -- hscolour ==1.19 -- ???
+ -- haddock ==2.11.0 -- need to use the one shipped with ghc
+
+-- N.B.: The begin/end comment annotations are used to build the source
+-- installer: Packages that are part of the core are checked at build time.
+-- Source of packages that are part of the platform are included in the tarball.
diff --git a/pkgs/development/libraries/haskell/heist/default.nix b/pkgs/development/libraries/haskell/heist/default.nix
index 44ba8ba15ee..d87f4fe239e 100644
--- a/pkgs/development/libraries/haskell/heist/default.nix
+++ b/pkgs/development/libraries/haskell/heist/default.nix
@@ -1,16 +1,16 @@
{ cabal, aeson, attoparsec, blazeBuilder, blazeHtml, directoryTree
, filepath, MonadCatchIOTransformers, mtl, random, text, time
-, transformers, unorderedContainers, vector, xmlhtml
+, unorderedContainers, vector, xmlhtml
}:
cabal.mkDerivation (self: {
pname = "heist";
- version = "0.8.1.1";
- sha256 = "0ad56izskafpc1dx2nq0a8w71ayppwx8dc7kdaw1by972kh3nflh";
+ version = "0.8.2";
+ sha256 = "0zamggvfq9054vxznbnfq1fihk110ih8q0dza1rmsjb1h2s88rkj";
buildDepends = [
aeson attoparsec blazeBuilder blazeHtml directoryTree filepath
- MonadCatchIOTransformers mtl random text time transformers
- unorderedContainers vector xmlhtml
+ MonadCatchIOTransformers mtl random text time unorderedContainers
+ vector xmlhtml
];
meta = {
homepage = "http://snapframework.com/";
diff --git a/pkgs/development/libraries/haskell/hexpat/default.nix b/pkgs/development/libraries/haskell/hexpat/default.nix
new file mode 100644
index 00000000000..5a656bc19c7
--- /dev/null
+++ b/pkgs/development/libraries/haskell/hexpat/default.nix
@@ -0,0 +1,18 @@
+{ cabal, deepseq, extensibleExceptions, List, text, transformers
+, utf8String
+}:
+
+cabal.mkDerivation (self: {
+ pname = "hexpat";
+ version = "0.20.3";
+ sha256 = "13dh0cvcmp6yi4nncsn6q9pkisld9xvz6j4xabng5ax67vdgdvrs";
+ buildDepends = [
+ deepseq extensibleExceptions List text transformers utf8String
+ ];
+ meta = {
+ homepage = "http://haskell.org/haskellwiki/Hexpat/";
+ description = "XML parser/formatter based on expat";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ };
+})
diff --git a/pkgs/development/libraries/haskell/hfuse/default.nix b/pkgs/development/libraries/haskell/hfuse/default.nix
index 8ff4f7fd275..64943d5e1c1 100644
--- a/pkgs/development/libraries/haskell/hfuse/default.nix
+++ b/pkgs/development/libraries/haskell/hfuse/default.nix
@@ -17,7 +17,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/libraries/haskell/highlighting-kate/default.nix b/pkgs/development/libraries/haskell/highlighting-kate/default.nix
index 21497f3252a..4b2e32d2352 100644
--- a/pkgs/development/libraries/haskell/highlighting-kate/default.nix
+++ b/pkgs/development/libraries/haskell/highlighting-kate/default.nix
@@ -1,12 +1,13 @@
-{ cabal, blazeHtml, filepath, mtl, parsec, regexPcreBuiltin }:
+{ cabal, blazeHtml, filepath, mtl, parsec, regexPcre }:
cabal.mkDerivation (self: {
pname = "highlighting-kate";
- version = "0.5.3.2";
- sha256 = "09yvqxvjzahz0y6yhsfgkx5xm39a74arv294w14sgmhay1wnlwvj";
+ version = "0.5.3.3";
+ sha256 = "08jxl2ba0kb4vj1qbdf4sas8bwbxzayzwsxnjvq358x57i5l302n";
isLibrary = true;
isExecutable = true;
- buildDepends = [ blazeHtml filepath mtl parsec regexPcreBuiltin ];
+ buildDepends = [ blazeHtml filepath mtl parsec regexPcre ];
+ prePatch = "sed -i -e 's|regex-pcre-builtin|regex-pcre|' highlighting-kate.cabal";
meta = {
homepage = "http://github.com/jgm/highlighting-kate";
description = "Syntax highlighting";
diff --git a/pkgs/development/libraries/haskell/hinotify/default.nix b/pkgs/development/libraries/haskell/hinotify/default.nix
index 8cbf3f20a72..de1c0e12759 100644
--- a/pkgs/development/libraries/haskell/hinotify/default.nix
+++ b/pkgs/development/libraries/haskell/hinotify/default.nix
@@ -2,13 +2,12 @@
cabal.mkDerivation (self: {
pname = "hinotify";
- version = "0.3.2";
- sha256 = "0gr9rv1af6w7g2hbjhz1livi5zfhzdswjyapvjz3d7cga906bj48";
+ version = "0.3.5";
+ sha256 = "00pzvqw2w3gbz8j4hiz8zxm7rki07g1iamjlbazz3kmpwcgjxi0l";
meta = {
- homepage = "http://code.haskell.org/hinotify/README.html";
- description = "Haskell binding to INotify";
+ homepage = "https://github.com/kolmodin/hinotify.git";
+ description = "Haskell binding to inotify";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
- maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})
diff --git a/pkgs/development/libraries/haskell/hint/default.nix b/pkgs/development/libraries/haskell/hint/default.nix
index 795d8c1d674..106b8591778 100644
--- a/pkgs/development/libraries/haskell/hint/default.nix
+++ b/pkgs/development/libraries/haskell/hint/default.nix
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "hint";
- version = "0.3.3.4";
- sha256 = "0pmvhlj9m0s1wvw8ppx1wx879lwzg38bcvhy1ma1d4wnrpq3bhiy";
+ version = "0.3.3.5";
+ sha256 = "09pd4b105c2ikf4ap96fz8091qra7hypq3k3ik0kay3bb532hmlq";
buildDepends = [
extensibleExceptions filepath ghcMtl ghcPaths haskellSrc
MonadCatchIOMtl mtl random utf8String
diff --git a/pkgs/development/libraries/haskell/hjsmin/default.nix b/pkgs/development/libraries/haskell/hjsmin/default.nix
index 6d749feea3a..35eed1de3f0 100644
--- a/pkgs/development/libraries/haskell/hjsmin/default.nix
+++ b/pkgs/development/libraries/haskell/hjsmin/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "hjsmin";
- version = "0.1.2";
- sha256 = "04yk383504blg8x10x5j1fd5mzyybqkhz7jfsyimvz2wz2v86qsb";
+ version = "0.1.3";
+ sha256 = "0lz7qsm74hbs8qa5d3khw43ipiimjbvxsrqqmxvp44605ib22y4d";
buildDepends = [ blazeBuilder languageJavascript text ];
meta = {
homepage = "http://github.com/alanz/hjsmin";
diff --git a/pkgs/development/libraries/haskell/hledger-lib/default.nix b/pkgs/development/libraries/haskell/hledger-lib/default.nix
index af230b2e644..05a1c04fe59 100644
--- a/pkgs/development/libraries/haskell/hledger-lib/default.nix
+++ b/pkgs/development/libraries/haskell/hledger-lib/default.nix
@@ -4,13 +4,12 @@
cabal.mkDerivation (self: {
pname = "hledger-lib";
- version = "0.18.2";
- sha256 = "0lcs58bdix4m7sslrdi38rqw5x5fb4ip0n5is0phxdrbp0nggd4z";
+ version = "0.19.1";
+ sha256 = "19ccbf9g1garwg56ig4qckz1zky89g1z71nwfbwi4v57bjw53ab4";
buildDepends = [
cmdargs csv filepath HUnit mtl parsec regexpr safe shakespeareText
split time transformers utf8String
];
- jailbreak = true;
meta = {
homepage = "http://hledger.org";
description = "Core data types, parsers and utilities for the hledger accounting tool";
diff --git a/pkgs/development/libraries/haskell/hledger-web/default.nix b/pkgs/development/libraries/haskell/hledger-web/default.nix
index cc4ccc186c6..825b79ae159 100644
--- a/pkgs/development/libraries/haskell/hledger-web/default.nix
+++ b/pkgs/development/libraries/haskell/hledger-web/default.nix
@@ -1,21 +1,23 @@
-{ cabal, blazeHtml, cabalFileTh, clientsession, cmdargs, filepath
-, hamlet, hledger, hledgerLib, HUnit, ioStorage, networkConduit
-, parsec, regexpr, safe, shakespeareText, text, time, transformers
-, wai, waiExtra, warp, yaml, yesod, yesodCore, yesodDefault
-, yesodStatic
+{ cabal, blazeHtml, blazeMarkup, clientsession, cmdargs
+, dataDefault, filepath, hamlet, hjsmin, hledger, hledgerLib
+, httpConduit, HUnit, ioStorage, monadControl, networkConduit
+, parsec, regexpr, safe, shakespeareCss, shakespeareJs
+, shakespeareText, text, time, transformers, wai, waiExtra, warp
+, yaml, yesod, yesodCore, yesodDefault, yesodForm, yesodStatic
}:
cabal.mkDerivation (self: {
pname = "hledger-web";
- version = "0.18.2";
- sha256 = "1bhah29why34qaiy7mgzpzjd5dm94izcf3jmgflix56gkgzk86p1";
+ version = "0.19";
+ sha256 = "0p820pwx4javzfvzhz02930adx6w7246hdk802wz1g4937rlq8p3";
isLibrary = true;
isExecutable = true;
buildDepends = [
- blazeHtml cabalFileTh clientsession cmdargs filepath hamlet hledger
- hledgerLib HUnit ioStorage networkConduit parsec regexpr safe
- shakespeareText text time transformers wai waiExtra warp yaml yesod
- yesodCore yesodDefault yesodStatic
+ blazeHtml blazeMarkup clientsession cmdargs dataDefault filepath
+ hamlet hjsmin hledger hledgerLib httpConduit HUnit ioStorage
+ monadControl networkConduit parsec regexpr safe shakespeareCss
+ shakespeareJs shakespeareText text time transformers wai waiExtra
+ warp yaml yesod yesodCore yesodDefault yesodForm yesodStatic
];
meta = {
homepage = "http://hledger.org";
diff --git a/pkgs/development/libraries/haskell/hledger/default.nix b/pkgs/development/libraries/haskell/hledger/default.nix
index 46ae378d738..30427f2cddd 100644
--- a/pkgs/development/libraries/haskell/hledger/default.nix
+++ b/pkgs/development/libraries/haskell/hledger/default.nix
@@ -1,19 +1,18 @@
-{ cabal, cabalFileTh, cmdargs, filepath, haskeline, hledgerLib
-, HUnit, mtl, parsec, regexpr, safe, shakespeareText, split, text
-, time, utf8String
+{ cabal, cmdargs, filepath, haskeline, hledgerLib, HUnit, mtl
+, parsec, regexpr, safe, shakespeareText, split, text, time
+, utf8String
}:
cabal.mkDerivation (self: {
pname = "hledger";
- version = "0.18.2";
- sha256 = "1i0rix3h5vrq9j01fzgwyhs2n8nfzhidi4rjlvn402ps0w6j15ld";
+ version = "0.19.1";
+ sha256 = "0ad7wmcpwi7a9nag4j27rhffhai6a5zgzaafss7sfr7yia00cpgg";
isLibrary = true;
isExecutable = true;
buildDepends = [
- cabalFileTh cmdargs filepath haskeline hledgerLib HUnit mtl parsec
- regexpr safe shakespeareText split text time utf8String
+ cmdargs filepath haskeline hledgerLib HUnit mtl parsec regexpr safe
+ shakespeareText split text time utf8String
];
- jailbreak = true;
meta = {
homepage = "http://hledger.org";
description = "The main command-line interface for the hledger accounting tool";
diff --git a/pkgs/development/libraries/haskell/hoogle/default.nix b/pkgs/development/libraries/haskell/hoogle/default.nix
index e13ab47beaa..8ebc698892f 100644
--- a/pkgs/development/libraries/haskell/hoogle/default.nix
+++ b/pkgs/development/libraries/haskell/hoogle/default.nix
@@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = "hoogle";
- version = "4.2.13";
- sha256 = "0asw9lr22d8jxr58b7w2j5hgllxhw2w8kllh5aq5jjs272hjiy9i";
+ version = "4.2.14";
+ sha256 = "1ymmf8zxp2nbygnavhr3ay0fidhd3vhrdqb7mg0qgk8y9kx25brj";
isLibrary = true;
isExecutable = true;
buildDepends = [
@@ -17,7 +17,7 @@ cabal.mkDerivation (self: {
meta = {
homepage = "http://www.haskell.org/hoogle/";
description = "Haskell API Search";
- license = "GPL";
+ license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
diff --git a/pkgs/development/libraries/haskell/hopenssl/default.nix b/pkgs/development/libraries/haskell/hopenssl/default.nix
index 5c62cbf3fe0..fec3f5dccf4 100644
--- a/pkgs/development/libraries/haskell/hopenssl/default.nix
+++ b/pkgs/development/libraries/haskell/hopenssl/default.nix
@@ -11,6 +11,9 @@ cabal.mkDerivation (self: {
description = "FFI bindings to OpenSSL's EVP digest interface";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
- maintainers = [ self.stdenv.lib.maintainers.andres ];
+ maintainers = [
+ self.stdenv.lib.maintainers.andres
+ self.stdenv.lib.maintainers.simons
+ ];
};
})
diff --git a/pkgs/development/libraries/haskell/hs-bibutils/default.nix b/pkgs/development/libraries/haskell/hs-bibutils/default.nix
index c96e6aeaac6..8acb621fe3f 100644
--- a/pkgs/development/libraries/haskell/hs-bibutils/default.nix
+++ b/pkgs/development/libraries/haskell/hs-bibutils/default.nix
@@ -2,11 +2,11 @@
cabal.mkDerivation (self: {
pname = "hs-bibutils";
- version = "4.12";
- sha256 = "0akxi69as7k5c0955yla9wcl1xvcvgzpzy3p1jj781w1lf89p537";
+ version = "4.15";
+ sha256 = "1h2vqi6ymhx9wpfv5qzvq4fhc4iand93shsncp8nszk64acmz9z9";
buildDepends = [ syb ];
meta = {
- homepage = "http://code.haskell.org/hs-bibutils";
+ homepage = "http://gorgias.mine.nu/repos/hs-bibutils/";
description = "Haskell bindings to bibutils, the bibliography conversion utilities";
license = "GPL";
platforms = self.ghc.meta.platforms;
diff --git a/pkgs/development/libraries/haskell/hspec-expectations/default.nix b/pkgs/development/libraries/haskell/hspec-expectations/default.nix
new file mode 100644
index 00000000000..e7d5756b759
--- /dev/null
+++ b/pkgs/development/libraries/haskell/hspec-expectations/default.nix
@@ -0,0 +1,14 @@
+{ cabal, HUnit }:
+
+cabal.mkDerivation (self: {
+ pname = "hspec-expectations";
+ version = "0.3.0.3";
+ sha256 = "1ppcbfmcgrd1lwswa293fxwny6khhg4blygfbcsawrvgc5ji0q74";
+ buildDepends = [ HUnit ];
+ meta = {
+ homepage = "https://github.com/sol/hspec-expectations#readme";
+ description = "Catchy combinators for HUnit";
+ license = self.stdenv.lib.licenses.mit;
+ platforms = self.ghc.meta.platforms;
+ };
+})
diff --git a/pkgs/development/libraries/haskell/hspec/default.nix b/pkgs/development/libraries/haskell/hspec/default.nix
new file mode 100644
index 00000000000..4c43513e229
--- /dev/null
+++ b/pkgs/development/libraries/haskell/hspec/default.nix
@@ -0,0 +1,21 @@
+{ cabal, ansiTerminal, filepath, hspecExpectations, HUnit
+, QuickCheck, setenv, silently, time, transformers
+}:
+
+cabal.mkDerivation (self: {
+ pname = "hspec";
+ version = "1.4.2";
+ sha256 = "0qlm6p5i1fkgyca704bsjc1nm1ks19pfq6l3vmzsszjzbdl8p5cq";
+ isLibrary = true;
+ isExecutable = true;
+ buildDepends = [
+ ansiTerminal filepath hspecExpectations HUnit QuickCheck setenv
+ silently time transformers
+ ];
+ meta = {
+ homepage = "http://hspec.github.com/";
+ description = "Behavior-Driven Development for Haskell";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ };
+})
diff --git a/pkgs/development/libraries/haskell/html-conduit/default.nix b/pkgs/development/libraries/haskell/html-conduit/default.nix
new file mode 100644
index 00000000000..28216a54815
--- /dev/null
+++ b/pkgs/development/libraries/haskell/html-conduit/default.nix
@@ -0,0 +1,19 @@
+{ cabal, conduit, filesystemConduit, resourcet, systemFilepath
+, tagstreamConduit, text, transformers, xmlConduit, xmlTypes
+}:
+
+cabal.mkDerivation (self: {
+ pname = "html-conduit";
+ version = "0.1.0.4";
+ sha256 = "1g217856dz1ad545slk020n5w0la4yyd5ygva2gg2g0999padi78";
+ buildDepends = [
+ conduit filesystemConduit resourcet systemFilepath tagstreamConduit
+ text transformers xmlConduit xmlTypes
+ ];
+ meta = {
+ homepage = "https://github.com/snoyberg/xml";
+ description = "Parse HTML documents using xml-conduit datatypes";
+ license = self.stdenv.lib.licenses.mit;
+ platforms = self.ghc.meta.platforms;
+ };
+})
diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix
index b1cb2bac6ab..b13926f7527 100644
--- a/pkgs/development/libraries/haskell/http-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/http-conduit/default.nix
@@ -8,8 +8,8 @@
cabal.mkDerivation (self: {
pname = "http-conduit";
- version = "1.6.0.3";
- sha256 = "101h4ba92h8gh74pl9kkgfg94sx3nivv6cc2lfm7i85lrp2fwyjr";
+ version = "1.8.4";
+ sha256 = "1gs4ac5qhrx8xdz4zbhwalkycspl28lkk23m16pdpf2gkmbhh58a";
buildDepends = [
asn1Data attoparsec attoparsecConduit base64Bytestring blazeBuilder
blazeBuilderConduit caseInsensitive certificate conduit cookie
diff --git a/pkgs/development/libraries/haskell/http-date/default.nix b/pkgs/development/libraries/haskell/http-date/default.nix
index 82e6d8477b6..a0168a51958 100644
--- a/pkgs/development/libraries/haskell/http-date/default.nix
+++ b/pkgs/development/libraries/haskell/http-date/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "http-date";
- version = "0.0.2";
- sha256 = "18nijf3hswbvcd5amhbccqmgnanmslsmqpd2iixlvwz5hqb3ncvj";
+ version = "0.0.3";
+ sha256 = "12iylfzz1d0v0gl4cf31dxcmlg0x7bq5f7acacy2pb0ilrxmzsnn";
buildDepends = [ attoparsec ];
meta = {
description = "HTTP Date parser/formatter";
diff --git a/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix b/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix
new file mode 100644
index 00000000000..9c44971688d
--- /dev/null
+++ b/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix
@@ -0,0 +1,21 @@
+{ cabal, blazeBuilder, caseInsensitive, classyPreludeConduit
+, conduit, httpConduit, httpTypes, liftedBase, monadControl
+, network, networkConduit, text, wai, warp, word8
+}:
+
+cabal.mkDerivation (self: {
+ pname = "http-reverse-proxy";
+ version = "0.1.0.5";
+ sha256 = "1x1m9vklgg6x8niry8c5fxcjpmsmrpxv7j2i5h38hp1hbka3mpr0";
+ buildDepends = [
+ blazeBuilder caseInsensitive classyPreludeConduit conduit
+ httpConduit httpTypes liftedBase monadControl network
+ networkConduit text wai warp word8
+ ];
+ meta = {
+ homepage = "https://github.com/fpco/http-reverse-proxy";
+ description = "Reverse proxy HTTP requests, either over raw sockets or with WAI";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ };
+})
diff --git a/pkgs/development/libraries/haskell/hxt/default.nix b/pkgs/development/libraries/haskell/hxt/default.nix
index 203bb89ef09..35783c7762e 100644
--- a/pkgs/development/libraries/haskell/hxt/default.nix
+++ b/pkgs/development/libraries/haskell/hxt/default.nix
@@ -4,12 +4,13 @@
cabal.mkDerivation (self: {
pname = "hxt";
- version = "9.2.2";
- sha256 = "0ichjpshq10b11dyfv1q7rs2m190x3gplx6k54amlxv45nwd1s6r";
+ version = "9.3.1.1";
+ sha256 = "1x0z85vx49s2b9bgjm14c2152cwr0vzf02rlxrla5dj5g565985y";
buildDepends = [
binary deepseq filepath HUnit hxtCharproperties hxtRegexXmlschema
hxtUnicode mtl network parsec
];
+ jailbreak = true;
meta = {
homepage = "http://www.fh-wedel.de/~si/HXmlToolbox/index.html";
description = "A collection of tools for processing XML with Haskell";
diff --git a/pkgs/development/libraries/haskell/instant-generics/default.nix b/pkgs/development/libraries/haskell/instant-generics/default.nix
index f4dfc4848a6..61e580b6293 100644
--- a/pkgs/development/libraries/haskell/instant-generics/default.nix
+++ b/pkgs/development/libraries/haskell/instant-generics/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "instant-generics";
- version = "0.3.5";
- sha256 = "15j41krvabf541vm4vpn2jvlg3nbi6pywcig9zbjjpckzwp5vj9x";
+ version = "0.3.7";
+ sha256 = "0kkfx009ij3pwga7x18vr8p0ffhahlp8sb6ykzfh8rhcqd4ryzyv";
buildDepends = [ syb ];
meta = {
homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/InstantGenerics";
diff --git a/pkgs/development/libraries/haskell/iproute/default.nix b/pkgs/development/libraries/haskell/iproute/default.nix
new file mode 100644
index 00000000000..d323bece64c
--- /dev/null
+++ b/pkgs/development/libraries/haskell/iproute/default.nix
@@ -0,0 +1,14 @@
+{ cabal, appar, byteorder, network }:
+
+cabal.mkDerivation (self: {
+ pname = "iproute";
+ version = "1.2.7";
+ sha256 = "07ixxq45w5wzvfrvsv2b206kygiqn1v3bcclkd98afjpc6mv3ld3";
+ buildDepends = [ appar byteorder network ];
+ meta = {
+ homepage = "http://www.mew.org/~kazu/proj/iproute/";
+ description = "IP Routing Table";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ };
+})
diff --git a/pkgs/development/libraries/haskell/json/default.nix b/pkgs/development/libraries/haskell/json/default.nix
index 5bfbb59d83f..9a56f412fe2 100644
--- a/pkgs/development/libraries/haskell/json/default.nix
+++ b/pkgs/development/libraries/haskell/json/default.nix
@@ -1,18 +1,14 @@
-{ cabal, mtl, parsec, syb }:
+{ cabal, mtl, parsec, syb, text }:
cabal.mkDerivation (self: {
pname = "json";
- version = "0.5";
- sha256 = "12jbvq0lp7z5q6g94pv8s5455yydfyh9h2xlr76wqzfh3myvy6fl";
- buildDepends = [ mtl parsec syb ];
- patchPhase = "sed -i json.cabal -e '1iExtensions: FlexibleInstances'";
+ version = "0.7";
+ sha256 = "18v8vbx3pyskf3ap4lpy2d3461gghfsq5bzjyrjvqsd2r9r44rfk";
+ buildDepends = [ mtl parsec syb text ];
meta = {
description = "Support for serialising Haskell to and from JSON";
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/libraries/haskell/lambdacube-engine/default.nix b/pkgs/development/libraries/haskell/lambdacube-engine/default.nix
new file mode 100644
index 00000000000..f3c9a8af4ea
--- /dev/null
+++ b/pkgs/development/libraries/haskell/lambdacube-engine/default.nix
@@ -0,0 +1,19 @@
+{ cabal, binary, bitmap, bytestringTrie, filepath, mtl, OpenGLRaw
+, stbImage, uulib, vect, vector, vectorAlgorithms, xml, zipArchive
+}:
+
+cabal.mkDerivation (self: {
+ pname = "lambdacube-engine";
+ version = "0.2.4";
+ sha256 = "1xdp10nylndmfw16dywqrxj30g99rf9qbcx5qiglvzm1c1kxid3f";
+ buildDepends = [
+ binary bitmap bytestringTrie filepath mtl OpenGLRaw stbImage uulib
+ vect vector vectorAlgorithms xml zipArchive
+ ];
+ meta = {
+ homepage = "http://www.haskell.org/haskellwiki/LambdaCubeEngine";
+ description = "3D rendering engine written entirely in Haskell";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ };
+})
diff --git a/pkgs/development/libraries/haskell/language-c-quote/default.nix b/pkgs/development/libraries/haskell/language-c-quote/default.nix
index 7cf0aae9596..77396e3cf55 100644
--- a/pkgs/development/libraries/haskell/language-c-quote/default.nix
+++ b/pkgs/development/libraries/haskell/language-c-quote/default.nix
@@ -4,14 +4,13 @@
cabal.mkDerivation (self: {
pname = "language-c-quote";
- version = "0.3.2";
- sha256 = "1pxrag9ws93rsqrsxcyxg07pvp2qw0f19yj2b40ynwzk112nkd16";
+ version = "0.4.3";
+ sha256 = "13xpmj3jrqkcgilkh4p8ycxhlk5yvfsisx4c1ax7n7aafg1n7phf";
buildDepends = [
exceptionMtl exceptionTransformers filepath haskellSrcMeta
mainlandPretty mtl srcloc syb symbol
];
buildTools = [ alex happy ];
- jailbreak = true;
meta = {
homepage = "http://www.eecs.harvard.edu/~mainland/";
description = "C/CUDA/OpenCL quasiquoting library";
diff --git a/pkgs/development/libraries/haskell/language-haskell-extract/default.nix b/pkgs/development/libraries/haskell/language-haskell-extract/default.nix
index 7cbbce517f6..461c790c88b 100644
--- a/pkgs/development/libraries/haskell/language-haskell-extract/default.nix
+++ b/pkgs/development/libraries/haskell/language-haskell-extract/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "language-haskell-extract";
- version = "0.2.1";
- sha256 = "0lmg16g3z8cx0vb037bk4j2nr3qvybfcqfsr8l6jk57b2nz3yhbf";
+ version = "0.2.3";
+ sha256 = "0fz1nin596ihlh77pafzpdf46br1k3pxcxyml2rvly6g0h3yjgpr";
buildDepends = [ haskellSrcExts regexPosix ];
meta = {
homepage = "http://github.com/finnsson/template-helper";
diff --git a/pkgs/development/libraries/haskell/language-javascript/default.nix b/pkgs/development/libraries/haskell/language-javascript/default.nix
index 3f04b3a9289..e05b93655e4 100644
--- a/pkgs/development/libraries/haskell/language-javascript/default.nix
+++ b/pkgs/development/libraries/haskell/language-javascript/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "language-javascript";
- version = "0.5.4";
- sha256 = "0hjx12n3pkxcdkppqalv6sl68vjlib37gby89ksay807ndslvb9q";
+ version = "0.5.7";
+ sha256 = "0mndz0bqxkayzm7g92cvai9ahb9msr99syp9djhaya1d45595ad3";
buildDepends = [ blazeBuilder mtl utf8Light utf8String ];
buildTools = [ happy ];
meta = {
diff --git a/pkgs/development/libraries/haskell/lens/default.nix b/pkgs/development/libraries/haskell/lens/default.nix
new file mode 100644
index 00000000000..c849665b1c8
--- /dev/null
+++ b/pkgs/development/libraries/haskell/lens/default.nix
@@ -0,0 +1,22 @@
+{ cabal, comonad, comonadsFd, comonadTransformers, filepath
+, hashable, mtl, parallel, semigroups, split, text, transformers
+, unorderedContainers, vector, void
+}:
+
+cabal.mkDerivation (self: {
+ pname = "lens";
+ version = "3.3";
+ sha256 = "0gq24y1727ml5lpr0b67hqw3vwanvx6hpk3lsfx3nk6csscn1lvk";
+ buildDepends = [
+ comonad comonadsFd comonadTransformers filepath hashable mtl
+ parallel semigroups split text transformers unorderedContainers
+ vector void
+ ];
+ noHaddock = true;
+ meta = {
+ homepage = "http://github.com/ekmett/lens/";
+ description = "Lenses, Folds and Traversals";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ };
+})
diff --git a/pkgs/development/libraries/haskell/liblastfm/default.nix b/pkgs/development/libraries/haskell/liblastfm/default.nix
index c625fc44479..70ba29830c6 100644
--- a/pkgs/development/libraries/haskell/liblastfm/default.nix
+++ b/pkgs/development/libraries/haskell/liblastfm/default.nix
@@ -2,11 +2,14 @@
cabal.mkDerivation (self: {
pname = "liblastfm";
- version = "0.0.3.4";
- sha256 = "1d8fypl9s64jpsr8hygyfqq6jzv1bvd22zq4f93xsffpvv7nqnyk";
+ version = "0.0.3.6";
+ sha256 = "0xmrciv489dvksgpg9g83kna34x1amsx45wvpngcpnx4m44fcp4w";
buildDepends = [
aeson curl mtl pureMD5 urlencoded utf8String xml
];
+ patchPhase = ''
+ sed -i -e 's|curl == .*,|curl,|' -e 's|urlencoded .*,|urlencoded,|' liblastfm.cabal
+ '';
meta = {
description = "Wrapper to Lastfm API";
license = self.stdenv.lib.licenses.mit;
diff --git a/pkgs/development/libraries/haskell/libmpd/default.nix b/pkgs/development/libraries/haskell/libmpd/default.nix
index c0ba821d5f1..f6185597af1 100644
--- a/pkgs/development/libraries/haskell/libmpd/default.nix
+++ b/pkgs/development/libraries/haskell/libmpd/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "libmpd";
- version = "0.8.0";
- sha256 = "0sn9yqiqr011glb7q0f3xj24wkkvnib0khzf833npcas4420d0ya";
+ version = "0.8.0.1";
+ sha256 = "16j2c0dnwllsb979gqf1cl4ylvpldcj8k32ddpp4wf62lbb1mqxm";
buildDepends = [ filepath mtl network text time utf8String ];
meta = {
homepage = "http://github.com/joachifm/libmpd-haskell";
diff --git a/pkgs/development/libraries/haskell/libxml-sax/default.nix b/pkgs/development/libraries/haskell/libxml-sax/default.nix
new file mode 100644
index 00000000000..b41ca8dfa54
--- /dev/null
+++ b/pkgs/development/libraries/haskell/libxml-sax/default.nix
@@ -0,0 +1,16 @@
+{ cabal, libxml2, text, xmlTypes }:
+
+cabal.mkDerivation (self: {
+ pname = "libxml-sax";
+ version = "0.7.3";
+ sha256 = "1514ix5n8y1dwjdm0kmr17fdigc0ic89gzwdvfgh542sjm11100r";
+ buildDepends = [ text xmlTypes ];
+ extraLibraries = [ libxml2 ];
+ pkgconfigDepends = [ libxml2 ];
+ meta = {
+ homepage = "https://john-millikin.com/software/haskell-libxml/";
+ description = "Bindings for the libXML2 SAX interface";
+ license = self.stdenv.lib.licenses.mit;
+ platforms = self.ghc.meta.platforms;
+ };
+})
diff --git a/pkgs/development/libraries/haskell/lifted-base/default.nix b/pkgs/development/libraries/haskell/lifted-base/default.nix
index 09264ab57f4..e5c334e1b22 100644
--- a/pkgs/development/libraries/haskell/lifted-base/default.nix
+++ b/pkgs/development/libraries/haskell/lifted-base/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "lifted-base";
- version = "0.1.2";
- sha256 = "0js94dlfy2wjl026jcj2l399ly4zgw0cgxkmil6lsm34gcy9vrvq";
+ version = "0.2";
+ sha256 = "12ai34wb1sd6fza50arlpvsdc6l2nwrrcik0xakf2q0ddzjmhjfb";
buildDepends = [
baseUnicodeSymbols monadControl transformersBase
];
diff --git a/pkgs/development/libraries/haskell/lrucache/default.nix b/pkgs/development/libraries/haskell/lrucache/default.nix
index d92bd820348..2d494f4a896 100644
--- a/pkgs/development/libraries/haskell/lrucache/default.nix
+++ b/pkgs/development/libraries/haskell/lrucache/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "lrucache";
- version = "1.1.1";
- sha256 = "05y0b2dbbp017hkbr0pz943956dm31g5xhma4bqnh49yd4lyn5l9";
+ version = "1.1.1.3";
+ sha256 = "1djjxlyfrk3wpgc4h6xljpray09v7lc956202k9bxra24vj5f1lm";
meta = {
homepage = "http://github.com/chowells79/lrucache";
description = "a simple, pure LRU cache";
diff --git a/pkgs/development/libraries/haskell/mainland-pretty/default.nix b/pkgs/development/libraries/haskell/mainland-pretty/default.nix
index d64a6c76180..5da3e47a333 100644
--- a/pkgs/development/libraries/haskell/mainland-pretty/default.nix
+++ b/pkgs/development/libraries/haskell/mainland-pretty/default.nix
@@ -1,10 +1,10 @@
-{ cabal, srcloc, symbol }:
+{ cabal, srcloc, text }:
cabal.mkDerivation (self: {
pname = "mainland-pretty";
- version = "0.1.3.0";
- sha256 = "1grfsn066z11737dxdk1bdhyvz9vjxxn6krfgx9bc8jin6n9h6aq";
- buildDepends = [ srcloc symbol ];
+ version = "0.2.4";
+ sha256 = "0x481k36rz4zvj1nwvrfw1d10vbmmx8gb5f2nc8alnxcbc2y7xwq";
+ buildDepends = [ srcloc text ];
meta = {
homepage = "http://www.eecs.harvard.edu/~mainland/";
description = "Pretty printing designed for printing source code";
diff --git a/pkgs/development/libraries/haskell/monad-logger/default.nix b/pkgs/development/libraries/haskell/monad-logger/default.nix
index 740b68edb96..0a5f52512c6 100644
--- a/pkgs/development/libraries/haskell/monad-logger/default.nix
+++ b/pkgs/development/libraries/haskell/monad-logger/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "monad-logger";
- version = "0.2.0.1";
- sha256 = "151brb5h92xc0mhfqcapmxib7vh2k36rsw493fxbn3256xkzc8gk";
+ version = "0.2.1";
+ sha256 = "00ssh60rxw7dg1dcfh8kr4mg9p7pvvvmjf9xd8kvxbrb9s3nkc4s";
buildDepends = [ fastLogger resourcet text transformers ];
meta = {
homepage = "https://github.com/kazu-yamamoto/logger";
diff --git a/pkgs/development/libraries/haskell/monad-peel/default.nix b/pkgs/development/libraries/haskell/monad-peel/default.nix
index 69ab9b0365b..39f911dae93 100644
--- a/pkgs/development/libraries/haskell/monad-peel/default.nix
+++ b/pkgs/development/libraries/haskell/monad-peel/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "monad-peel";
- version = "0.1";
- sha256 = "0q56hdjgbj7ykpjx5z8qlqqkngmgm5wzm9vwcd7v675k2ywcl3ys";
+ version = "0.1.1";
+ sha256 = "0n3cxa94wd3hjvy9jgf3d8p7qfb9jaaf29simjya7rlcb673pg3l";
buildDepends = [ extensibleExceptions transformers ];
meta = {
homepage = "http://andersk.mit.edu/haskell/monad-peel/";
diff --git a/pkgs/development/libraries/haskell/monadcryptorandom/default.nix b/pkgs/development/libraries/haskell/monadcryptorandom/default.nix
index c1901f470fd..b702f10354c 100644
--- a/pkgs/development/libraries/haskell/monadcryptorandom/default.nix
+++ b/pkgs/development/libraries/haskell/monadcryptorandom/default.nix
@@ -1,12 +1,12 @@
-{ cabal, cryptoApi, mtl, transformers }:
+{ cabal, cryptoApi, mtl, tagged, transformers }:
cabal.mkDerivation (self: {
pname = "monadcryptorandom";
- version = "0.4.1";
- sha256 = "01x3zfr4m93bgx062rhxqk1d8qhn6s7rkfkm4yf00p89fclyjsg1";
- buildDepends = [ cryptoApi mtl transformers ];
+ version = "0.5";
+ sha256 = "19sb9mgfvmmmx1sn0aiq6dn5nl0201xwgs6xqakn7pz5vsqcww2b";
+ buildDepends = [ cryptoApi mtl tagged transformers ];
meta = {
- homepage = "http://trac.haskell.org/crypto-api/wiki";
+ homepage = "https://github.com/TomMD/monadcryptorandom";
description = "A monad for using CryptoRandomGen";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
diff --git a/pkgs/development/libraries/haskell/monads-tf/default.nix b/pkgs/development/libraries/haskell/monads-tf/default.nix
index 53c0a2cad8e..f51fd8c840a 100644
--- a/pkgs/development/libraries/haskell/monads-tf/default.nix
+++ b/pkgs/development/libraries/haskell/monads-tf/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "monads-tf";
- version = "0.1.0.0";
- sha256 = "1d38rddm9h8crs96zhzj87a3ygix0ipyxy0qcyas88k60fgavg5i";
+ version = "0.1.0.1";
+ sha256 = "19za12iazwrbqwpxy6lkj01dwm921386ryxgdqvcqisn8cj6jm1v";
buildDepends = [ transformers ];
meta = {
description = "Monad classes, using type families";
diff --git a/pkgs/development/libraries/haskell/mongoDB/default.nix b/pkgs/development/libraries/haskell/mongoDB/default.nix
index aec216ea59d..32187c39963 100644
--- a/pkgs/development/libraries/haskell/mongoDB/default.nix
+++ b/pkgs/development/libraries/haskell/mongoDB/default.nix
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "mongoDB";
- version = "1.3.0";
- sha256 = "1l6r55bicjdybn8jn9rp94aamjqy5j5qs2775m05aba8svsl4kma";
+ version = "1.3.1";
+ sha256 = "1qvsb993n5gmchym4zz2pv68mdyir439cfindqdqlvjwam0jf4l5";
buildDepends = [
binary bson cryptohash liftedBase monadControl mtl network parsec
random randomShuffle text transformersBase
diff --git a/pkgs/development/libraries/haskell/multiarg/default.nix b/pkgs/development/libraries/haskell/multiarg/default.nix
index c376ab0cbd6..8b2871c3ce4 100644
--- a/pkgs/development/libraries/haskell/multiarg/default.nix
+++ b/pkgs/development/libraries/haskell/multiarg/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "multiarg";
- version = "0.4.0.0";
- sha256 = "04m4ynf6x8rlnlmnl6a7jj42fszjc1bly4h3jyjxxsqjdynrv81q";
+ version = "0.6.0.0";
+ sha256 = "1qrw1rajdvrvd297a7lpfkxm5qqhwmnnl5jiagjwzb9lckgpy87y";
buildDepends = [ explicitException utf8String ];
meta = {
homepage = "https://github.com/massysett/multiarg";
diff --git a/pkgs/development/libraries/haskell/murmur-hash/default.nix b/pkgs/development/libraries/haskell/murmur-hash/default.nix
index 8f1ee9fa6a3..0c4058eb111 100644
--- a/pkgs/development/libraries/haskell/murmur-hash/default.nix
+++ b/pkgs/development/libraries/haskell/murmur-hash/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "murmur-hash";
- version = "0.1.0.5";
- sha256 = "1m7rm57bxkrl4i9fbvmx5m29axyxddrs4ss7plbd19pw3wsvgmr0";
+ version = "0.1.0.6";
+ sha256 = "0wnkwl3a9x0f4rvsj4wf129n03vpw8qk4kzx6vmrapwwb4r80npz";
meta = {
homepage = "http://github.com/nominolo/murmur-hash";
description = "MurmurHash2 implementation for Haskell";
diff --git a/pkgs/development/libraries/haskell/network-conduit/default.nix b/pkgs/development/libraries/haskell/network-conduit/default.nix
index 4c989e17698..3b86b0699ca 100644
--- a/pkgs/development/libraries/haskell/network-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/network-conduit/default.nix
@@ -3,8 +3,8 @@
cabal.mkDerivation (self: {
pname = "network-conduit";
- version = "0.5.0.1";
- sha256 = "1rk8a8n1yily20y3jr51zbd00m2c6ic8gxw9rnmkr2cfs963l2v5";
+ version = "0.6.1.1";
+ sha256 = "00x5ks1qcq5smmd2g4bm23lb3ngdxmdlz822qkkj9l9c27lkn67n";
buildDepends = [
conduit liftedBase monadControl network transformers
];
diff --git a/pkgs/development/libraries/haskell/network-info/default.nix b/pkgs/development/libraries/haskell/network-info/default.nix
new file mode 100644
index 00000000000..c1bfea43bde
--- /dev/null
+++ b/pkgs/development/libraries/haskell/network-info/default.nix
@@ -0,0 +1,13 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+ pname = "network-info";
+ version = "0.2.0.3";
+ sha256 = "04nwl5akrsppxkqqq7a7qi5sixvrzvj4njl8rbz7sglbh9393rs2";
+ meta = {
+ homepage = "http://github.com/jystic/network-info";
+ description = "Access the local computer's basic network configuration";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ };
+})
diff --git a/pkgs/development/libraries/haskell/network-multicast/default.nix b/pkgs/development/libraries/haskell/network-multicast/default.nix
new file mode 100644
index 00000000000..3a461a51f53
--- /dev/null
+++ b/pkgs/development/libraries/haskell/network-multicast/default.nix
@@ -0,0 +1,14 @@
+{ cabal, network }:
+
+cabal.mkDerivation (self: {
+ pname = "network-multicast";
+ version = "0.0.7";
+ sha256 = "18qlg4cg7ci1z3mbqh5z16mxkjir0079a0rgm4qk6jbmsnvfsq43";
+ buildDepends = [ network ];
+ meta = {
+ description = "Simple multicast library";
+ license = self.stdenv.lib.licenses.publicDomain;
+ platforms = self.ghc.meta.platforms;
+ maintainers = [ self.stdenv.lib.maintainers.andres ];
+ };
+})
diff --git a/pkgs/development/libraries/haskell/network-protocol-xmpp/default.nix b/pkgs/development/libraries/haskell/network-protocol-xmpp/default.nix
new file mode 100644
index 00000000000..304017d3d24
--- /dev/null
+++ b/pkgs/development/libraries/haskell/network-protocol-xmpp/default.nix
@@ -0,0 +1,20 @@
+{ cabal, gnuidn, gnutls, gsasl, libxmlSax, monadsTf, network, text
+, transformers, xmlTypes
+}:
+
+cabal.mkDerivation (self: {
+ pname = "network-protocol-xmpp";
+ version = "0.4.4";
+ sha256 = "0l2s412aazli80jszdl1am01z14a0q2z8fsxxjawk4cy70d6f4ry";
+ buildDepends = [
+ gnuidn gnutls gsasl libxmlSax monadsTf network text transformers
+ xmlTypes
+ ];
+ jailbreak = true;
+ meta = {
+ homepage = "https://john-millikin.com/software/haskell-xmpp/";
+ description = "Client library for the XMPP protocol";
+ license = self.stdenv.lib.licenses.gpl3;
+ platforms = self.ghc.meta.platforms;
+ };
+})
diff --git a/pkgs/development/libraries/haskell/network-transport-tcp/default.nix b/pkgs/development/libraries/haskell/network-transport-tcp/default.nix
new file mode 100644
index 00000000000..fb313005bda
--- /dev/null
+++ b/pkgs/development/libraries/haskell/network-transport-tcp/default.nix
@@ -0,0 +1,15 @@
+{ cabal, dataAccessor, network, networkTransport }:
+
+cabal.mkDerivation (self: {
+ pname = "network-transport-tcp";
+ version = "0.3.1";
+ sha256 = "15i4qbx1s3dxaixn6kd2z1hsymfvpqzf4jpqd3mcbpjlgrn6craf";
+ buildDepends = [ dataAccessor network networkTransport ];
+ meta = {
+ homepage = "http://github.com/haskell-distributed/distributed-process";
+ description = "TCP instantiation of Network.Transport";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ maintainers = [ self.stdenv.lib.maintainers.andres ];
+ };
+})
diff --git a/pkgs/development/libraries/haskell/network-transport/default.nix b/pkgs/development/libraries/haskell/network-transport/default.nix
new file mode 100644
index 00000000000..813e8372cfc
--- /dev/null
+++ b/pkgs/development/libraries/haskell/network-transport/default.nix
@@ -0,0 +1,15 @@
+{ cabal, binary, transformers }:
+
+cabal.mkDerivation (self: {
+ pname = "network-transport";
+ version = "0.3.0";
+ sha256 = "1i6sn5x3z1r9l7xwag68s5gsii137d5dajwr0abcbv6143ph3bvm";
+ buildDepends = [ binary transformers ];
+ meta = {
+ homepage = "http://github.com/haskell-distributed/distributed-process";
+ description = "Network abstraction layer";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ maintainers = [ self.stdenv.lib.maintainers.andres ];
+ };
+})
diff --git a/pkgs/development/libraries/haskell/network/2.4.0.1.nix b/pkgs/development/libraries/haskell/network/2.4.0.1.nix
new file mode 100644
index 00000000000..e0aa44c38bd
--- /dev/null
+++ b/pkgs/development/libraries/haskell/network/2.4.0.1.nix
@@ -0,0 +1,15 @@
+{ cabal, parsec }:
+
+cabal.mkDerivation (self: {
+ pname = "network";
+ version = "2.4.0.1";
+ sha256 = "00jj3pf2gchkx5wmipm2ijxcmhy37g86ggnp6pb92i5nmb93h1iw";
+ buildDepends = [ parsec ];
+ meta = {
+ homepage = "https://github.com/haskell/network";
+ description = "Low-level networking interface";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ maintainers = [ self.stdenv.lib.maintainers.andres ];
+ };
+})
diff --git a/pkgs/development/libraries/haskell/numbers/default.nix b/pkgs/development/libraries/haskell/numbers/default.nix
index 8b57b3d7e96..d1485b7cf1f 100644
--- a/pkgs/development/libraries/haskell/numbers/default.nix
+++ b/pkgs/development/libraries/haskell/numbers/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "numbers";
- version = "3000.0.0.0";
- sha256 = "073xjrnbv6z16va2h3arlxq3z8kywb961dwh4jcm8g7w5m84b2xb";
+ version = "3000.1.0.1";
+ sha256 = "0r2s47nfdxasnp8j7giwpxls9v48f6ld0gc2hg2p7y2ar5xfrcc4";
meta = {
homepage = "https://github.com/DanBurton/numbers";
description = "Various number types";
diff --git a/pkgs/development/libraries/haskell/optparse-applicative/default.nix b/pkgs/development/libraries/haskell/optparse-applicative/default.nix
new file mode 100644
index 00000000000..75f801eee18
--- /dev/null
+++ b/pkgs/development/libraries/haskell/optparse-applicative/default.nix
@@ -0,0 +1,14 @@
+{ cabal, transformers }:
+
+cabal.mkDerivation (self: {
+ pname = "optparse-applicative";
+ version = "0.4.1";
+ sha256 = "00byv248662n6pr8gn5b777l0fjg6f0wcxfkbhw0qyhd1ciq8d38";
+ buildDepends = [ transformers ];
+ meta = {
+ homepage = "https://github.com/pcapriotti/optparse-applicative";
+ description = "Utilities and combinators for parsing command line options";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ };
+})
diff --git a/pkgs/development/libraries/haskell/pandoc/default.nix b/pkgs/development/libraries/haskell/pandoc/default.nix
index 85a8338e431..de6b29ff9cc 100644
--- a/pkgs/development/libraries/haskell/pandoc/default.nix
+++ b/pkgs/development/libraries/haskell/pandoc/default.nix
@@ -1,4 +1,4 @@
-{ cabal, base64Bytestring, blazeHtml, citeprocHs
+{ cabal, base64Bytestring, blazeHtml, blazeMarkup, citeprocHs
, extensibleExceptions, filepath, highlightingKate, HTTP, json, mtl
, network, pandocTypes, parsec, random, syb, tagsoup, temporary
, texmath, time, utf8String, xml, zipArchive, zlib
@@ -6,16 +6,17 @@
cabal.mkDerivation (self: {
pname = "pandoc";
- version = "1.9.4.2";
- sha256 = "1zr2qx6bimyhzia5maqpb454hgdwjvgs234mcki4f1z3dgbq0lsk";
+ version = "1.9.4.5";
+ sha256 = "05k8i537756m07xlb6kgshpfxa4sp2jxidb1c8m72ilpai13r6fb";
isLibrary = true;
isExecutable = true;
buildDepends = [
- base64Bytestring blazeHtml citeprocHs extensibleExceptions filepath
- highlightingKate HTTP json mtl network pandocTypes parsec random
- syb tagsoup temporary texmath time utf8String xml zipArchive zlib
+ base64Bytestring blazeHtml blazeMarkup citeprocHs
+ extensibleExceptions filepath highlightingKate HTTP json mtl
+ network pandocTypes parsec random syb tagsoup temporary texmath
+ time utf8String xml zipArchive zlib
];
- jailbreak = true;
+ configureFlags = "-fblaze_html_0_5";
meta = {
homepage = "http://johnmacfarlane.net/pandoc";
description = "Conversion between markup formats";
diff --git a/pkgs/development/libraries/haskell/pango/default.nix b/pkgs/development/libraries/haskell/pango/default.nix
index ca764844c16..bbd935eb043 100644
--- a/pkgs/development/libraries/haskell/pango/default.nix
+++ b/pkgs/development/libraries/haskell/pango/default.nix
@@ -3,8 +3,8 @@
cabal.mkDerivation (self: {
pname = "pango";
- version = "0.12.3";
- sha256 = "0203z59c9dsqp6mgb12h2iwjs52m2cqdxa7arwi1sccc3cz86cai";
+ version = "0.12.4";
+ sha256 = "08c7kmbnga6lijv7hpxgs766lsvaqpbqbph1gsxncqsl8haq4v5c";
buildDepends = [ cairo glib mtl ];
buildTools = [ gtk2hsBuildtools ];
extraLibraries = [ libc pkgconfig ];
diff --git a/pkgs/development/libraries/haskell/parallel-io/default.nix b/pkgs/development/libraries/haskell/parallel-io/default.nix
new file mode 100644
index 00000000000..d16f42f52ff
--- /dev/null
+++ b/pkgs/development/libraries/haskell/parallel-io/default.nix
@@ -0,0 +1,16 @@
+{ cabal, extensibleExceptions, random }:
+
+cabal.mkDerivation (self: {
+ pname = "parallel-io";
+ version = "0.3.2.1";
+ sha256 = "0wrmz0i5s8p87840pacdnpf2fi12nips4yc72vymifrc1wvlc42q";
+ isLibrary = true;
+ isExecutable = true;
+ buildDepends = [ extensibleExceptions random ];
+ meta = {
+ homepage = "http://batterseapower.github.com/parallel-io";
+ description = "Combinators for executing IO actions in parallel on a thread pool";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ };
+})
diff --git a/pkgs/development/libraries/haskell/path-pieces/default.nix b/pkgs/development/libraries/haskell/path-pieces/default.nix
index d4f52aef58e..5abc6309146 100644
--- a/pkgs/development/libraries/haskell/path-pieces/default.nix
+++ b/pkgs/development/libraries/haskell/path-pieces/default.nix
@@ -2,11 +2,10 @@
cabal.mkDerivation (self: {
pname = "path-pieces";
- version = "0.1.1";
- sha256 = "17ymk2azgz2c1hwnzqd9xy77hh51mvrgz4zs7lz4ik6rnvvihraz";
+ version = "0.1.2";
+ sha256 = "1cxsa8lq1f2jf86iv6f17nraiav8k2vzjxln1y7z45qhcp1sbbaa";
buildDepends = [ text time ];
meta = {
- homepage = "http://github.com/snoyberg/path-pieces";
description = "Components of paths";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
diff --git a/pkgs/development/libraries/haskell/pathtype/default.nix b/pkgs/development/libraries/haskell/pathtype/default.nix
index f08ded72968..f0be81e64ae 100644
--- a/pkgs/development/libraries/haskell/pathtype/default.nix
+++ b/pkgs/development/libraries/haskell/pathtype/default.nix
@@ -1,10 +1,10 @@
-{ cabal, QuickCheck }:
+{ cabal, QuickCheck, time }:
cabal.mkDerivation (self: {
pname = "pathtype";
- version = "0.5.2";
- sha256 = "0rbmq6kzz2l07q9a5k888scpn62hnw2hmzz4ysprhfgdnn5b2cvi";
- buildDepends = [ QuickCheck ];
+ version = "0.5.3";
+ sha256 = "11plb7xw4j8vjziw1q0ymx33p6185cxd2hqrxw2hgsfzf2b9dvqg";
+ buildDepends = [ QuickCheck time ];
meta = {
homepage = "http://code.haskell.org/pathtype";
description = "Type-safe replacement for System.FilePath etc";
diff --git a/pkgs/development/libraries/haskell/persistent-template/default.nix b/pkgs/development/libraries/haskell/persistent-template/default.nix
index f87e6348963..8d09c593170 100644
--- a/pkgs/development/libraries/haskell/persistent-template/default.nix
+++ b/pkgs/development/libraries/haskell/persistent-template/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "persistent-template";
- version = "1.0.0.1";
- sha256 = "0dvhxcyzqv4h3n5nnaglgq2pipynax2nrsdsgj3wgyk1a5k8wdrw";
+ version = "1.0.0.2";
+ sha256 = "0skd1gfrxq8mpa2g56b2wn83zw4zca5q2dxyjf6d7k6sh9sc9iz8";
buildDepends = [ aeson monadControl persistent text transformers ];
meta = {
homepage = "http://www.yesodweb.com/book/persistent";
diff --git a/pkgs/development/libraries/haskell/persistent/default.nix b/pkgs/development/libraries/haskell/persistent/default.nix
index 73bb01d7075..449debe0405 100644
--- a/pkgs/development/libraries/haskell/persistent/default.nix
+++ b/pkgs/development/libraries/haskell/persistent/default.nix
@@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "persistent";
- version = "1.0.1.1";
- sha256 = "05jzraw8g87vbd5qqrpvivzaz8k50sm9dlabd86a6n1hpcd7xaka";
+ version = "1.0.1.3";
+ sha256 = "156iv1iv807wm39sr98z0f10sbw4q0ac3lafgai0mq3ph5xysi80";
buildDepends = [
aeson attoparsec base64Bytestring blazeHtml blazeMarkup conduit
liftedBase monadControl monadLogger pathPieces poolConduit
diff --git a/pkgs/development/libraries/haskell/primitive/default.nix b/pkgs/development/libraries/haskell/primitive/0.4.1.nix
similarity index 100%
rename from pkgs/development/libraries/haskell/primitive/default.nix
rename to pkgs/development/libraries/haskell/primitive/0.4.1.nix
diff --git a/pkgs/development/libraries/haskell/primitive/0.5.0.1.nix b/pkgs/development/libraries/haskell/primitive/0.5.0.1.nix
new file mode 100644
index 00000000000..af6778ccd14
--- /dev/null
+++ b/pkgs/development/libraries/haskell/primitive/0.5.0.1.nix
@@ -0,0 +1,14 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+ pname = "primitive";
+ version = "0.5.0.1";
+ sha256 = "04s33xqxz68ddppig5pjf7ki1y5y62xzzzmg3b5pkcxp0r6rsv2j";
+ meta = {
+ homepage = "http://code.haskell.org/primitive";
+ description = "Primitive memory-related operations";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ maintainers = [ self.stdenv.lib.maintainers.andres ];
+ };
+})
diff --git a/pkgs/development/libraries/haskell/primitive/0.5.nix b/pkgs/development/libraries/haskell/primitive/0.5.nix
new file mode 100644
index 00000000000..d09359aaeb9
--- /dev/null
+++ b/pkgs/development/libraries/haskell/primitive/0.5.nix
@@ -0,0 +1,14 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+ pname = "primitive";
+ version = "0.5";
+ sha256 = "0m2gv7lac7q24cy02bbc7hq41awjxzs8dcjc6j2nv8xiq14cp3mk";
+ meta = {
+ homepage = "http://code.haskell.org/primitive";
+ description = "Primitive memory-related operations";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ maintainers = [ self.stdenv.lib.maintainers.andres ];
+ };
+})
diff --git a/pkgs/development/libraries/haskell/process-extras/default.nix b/pkgs/development/libraries/haskell/process-extras/default.nix
index ac2950d4927..1d9cb4f8062 100644
--- a/pkgs/development/libraries/haskell/process-extras/default.nix
+++ b/pkgs/development/libraries/haskell/process-extras/default.nix
@@ -1,10 +1,10 @@
-{ cabal, text }:
+{ cabal, deepseq, text }:
cabal.mkDerivation (self: {
pname = "process-extras";
- version = "0.1.3";
- sha256 = "16hm1w34qnrpb6x8gaqv1bs1cd4p98kayf23275s6vd48kw9v0b0";
- buildDepends = [ text ];
+ version = "0.2.0";
+ sha256 = "0mr4f2v19qz6d6jhffz9gky0ykdqwl8c11adbdm04wm2a3xsvf7g";
+ buildDepends = [ deepseq text ];
meta = {
homepage = "https://github.com/davidlazar/process-extras";
description = "Process extras";
diff --git a/pkgs/development/libraries/haskell/project-template/default.nix b/pkgs/development/libraries/haskell/project-template/default.nix
new file mode 100644
index 00000000000..62058e8737b
--- /dev/null
+++ b/pkgs/development/libraries/haskell/project-template/default.nix
@@ -0,0 +1,19 @@
+{ cabal, base64Bytestring, classyPreludeConduit, conduit, mtl
+, systemFileio, systemFilepath, text, transformers
+}:
+
+cabal.mkDerivation (self: {
+ pname = "project-template";
+ version = "0.1.0.1";
+ sha256 = "0ahmdlfn48yz8fj7199w0qsa1dbbxr21bs9hq1lnm3s2p4qiki23";
+ buildDepends = [
+ base64Bytestring classyPreludeConduit conduit mtl systemFileio
+ systemFilepath text transformers
+ ];
+ meta = {
+ homepage = "https://github.com/fpco/haskell-ide";
+ description = "Specify Haskell project templates and generate files";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ };
+})
diff --git a/pkgs/development/libraries/haskell/pwstore-fast/default.nix b/pkgs/development/libraries/haskell/pwstore-fast/default.nix
index add66a0bed2..d75823d6025 100644
--- a/pkgs/development/libraries/haskell/pwstore-fast/default.nix
+++ b/pkgs/development/libraries/haskell/pwstore-fast/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "pwstore-fast";
- version = "2.2";
- sha256 = "03b9vr5j6cadvi6w3lr8b9km4jq6jh0vzcmkxzq9qvvly89lx96a";
+ version = "2.3";
+ sha256 = "014l4n00lpg5037fkdwnxnv7xjfc3vlz1dphr7hfbqnjwf1z9ibw";
buildDepends = [ base64Bytestring cryptohash random ];
meta = {
homepage = "https://github.com/PeterScott/pwstore";
diff --git a/pkgs/development/libraries/haskell/random-fu/default.nix b/pkgs/development/libraries/haskell/random-fu/default.nix
index 72936308464..520f232d81f 100644
--- a/pkgs/development/libraries/haskell/random-fu/default.nix
+++ b/pkgs/development/libraries/haskell/random-fu/default.nix
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "random-fu";
- version = "0.2.3.0";
- sha256 = "17vn1dz4z00xjpsxjx2dfjnz4qhbn5cbkm2s142kdskiphgxi2f8";
+ version = "0.2.3.1";
+ sha256 = "06b4v7012fj1kmnz6i63vbwl9gkhzgk556gmcc62k14299ks8pci";
buildDepends = [
erf gamma monadLoops mtl randomShuffle randomSource rvar syb
transformers vector
diff --git a/pkgs/development/libraries/haskell/rank1dynamic/default.nix b/pkgs/development/libraries/haskell/rank1dynamic/default.nix
new file mode 100644
index 00000000000..602f0cc2574
--- /dev/null
+++ b/pkgs/development/libraries/haskell/rank1dynamic/default.nix
@@ -0,0 +1,15 @@
+{ cabal, binary }:
+
+cabal.mkDerivation (self: {
+ pname = "rank1dynamic";
+ version = "0.1.0.1";
+ sha256 = "18rlih5bndlm5v4nnv8g2rgvab5n22vd8mcjd0m4wq8fmqkb3x9d";
+ buildDepends = [ binary ];
+ meta = {
+ homepage = "http://github.com/haskell-distributed/distributed-process";
+ description = "Like Data.Dynamic/Data.Typeable but with support for rank-1 polymorphic types";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ maintainers = [ self.stdenv.lib.maintainers.andres ];
+ };
+})
diff --git a/pkgs/development/libraries/haskell/reactive-banana-wx/default.nix b/pkgs/development/libraries/haskell/reactive-banana-wx/default.nix
index 2d46992ddab..ee408fea480 100644
--- a/pkgs/development/libraries/haskell/reactive-banana-wx/default.nix
+++ b/pkgs/development/libraries/haskell/reactive-banana-wx/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "reactive-banana-wx";
- version = "0.7.0.0";
- sha256 = "06qln09d57l084nvh1js3k6074vl8yzih5kwfpp43gsy8in2dspx";
+ version = "0.7.1.0";
+ sha256 = "06hkb8v6rjpw95vf16xh547igxxzddr6wpjiwhqwpwhz2alavk2v";
isLibrary = true;
isExecutable = true;
buildDepends = [ cabalMacosx reactiveBanana wx wxcore ];
diff --git a/pkgs/development/libraries/haskell/reactive-banana/default.nix b/pkgs/development/libraries/haskell/reactive-banana/default.nix
index a80e911eefa..467addefeeb 100644
--- a/pkgs/development/libraries/haskell/reactive-banana/default.nix
+++ b/pkgs/development/libraries/haskell/reactive-banana/default.nix
@@ -1,14 +1,10 @@
-{ cabal, hashable, QuickCheck, transformers, unorderedContainers
-, vault
-}:
+{ cabal, hashable, transformers, unorderedContainers, vault }:
cabal.mkDerivation (self: {
pname = "reactive-banana";
- version = "0.7.0.1";
- sha256 = "0nd6j2782x7i12xw480qgk42jkya9qi0xdas15ik6cmg4c9z1dyk";
- buildDepends = [
- hashable QuickCheck transformers unorderedContainers vault
- ];
+ version = "0.7.1.0";
+ sha256 = "0diklfkc4fq05g5fhgcdkx8y0vmq26zfnmfkj95yvmwks8p9k22r";
+ buildDepends = [ hashable transformers unorderedContainers vault ];
meta = {
homepage = "http://haskell.org/haskellwiki/Reactive-banana";
description = "Practical library for functional reactive programming (FRP)";
diff --git a/pkgs/development/libraries/haskell/readline/default.nix b/pkgs/development/libraries/haskell/readline/default.nix
index 898b005c4da..0e65740b47e 100644
--- a/pkgs/development/libraries/haskell/readline/default.nix
+++ b/pkgs/development/libraries/haskell/readline/default.nix
@@ -16,7 +16,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/libraries/haskell/regex-pcre-builtin/default.nix b/pkgs/development/libraries/haskell/regex-pcre-builtin/default.nix
deleted file mode 100644
index 67180215fde..00000000000
--- a/pkgs/development/libraries/haskell/regex-pcre-builtin/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ cabal, regexBase }:
-
-cabal.mkDerivation (self: {
- pname = "regex-pcre-builtin";
- version = "0.94.2.1.7.7";
- sha256 = "1c4zxfild1fbpxwqcp2jnf6iwfs0z6nc8dry09gmjykxlhisxi8s";
- buildDepends = [ regexBase ];
- meta = {
- homepage = "http://sourceforge.net/projects/lazy-regex";
- description = "Replaces/Enhances Text.Regex";
- license = self.stdenv.lib.licenses.bsd3;
- platforms = self.ghc.meta.platforms;
- maintainers = [ self.stdenv.lib.maintainers.andres ];
- };
-})
diff --git a/pkgs/development/libraries/haskell/regular/default.nix b/pkgs/development/libraries/haskell/regular/default.nix
index c37c54e8bfa..8a3e740491c 100644
--- a/pkgs/development/libraries/haskell/regular/default.nix
+++ b/pkgs/development/libraries/haskell/regular/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "regular";
- version = "0.3.4";
- sha256 = "10gfid99xcqv3i9rp4x8hykk91qq3h7b7lxzsl7ii58vmifa4kgq";
+ version = "0.3.4.2";
+ sha256 = "0fshjpbgabdcsa9a4cjmvfrzy7db4s679rprdbrhhfwf5xiszs2s";
meta = {
description = "Generic programming library for regular datatypes";
license = self.stdenv.lib.licenses.bsd3;
diff --git a/pkgs/development/libraries/haskell/repa-algorithms/default.nix b/pkgs/development/libraries/haskell/repa-algorithms/default.nix
index d8a1e61c5d7..39f0682e4ba 100644
--- a/pkgs/development/libraries/haskell/repa-algorithms/default.nix
+++ b/pkgs/development/libraries/haskell/repa-algorithms/default.nix
@@ -2,10 +2,11 @@
cabal.mkDerivation (self: {
pname = "repa-algorithms";
- version = "3.2.1.1";
- sha256 = "19gc2vbkqxysnm0argksn8c3cv7vf30hkdycgv8fdfn0yc95xz0v";
+ version = "3.2.2.3";
+ sha256 = "1maxkl7plxzdkmbak4c7qj68chbpkbarjmw454kjx544pbkn9xhb";
buildDepends = [ repa vector ];
extraLibraries = [ llvm ];
+ jailbreak = true;
meta = {
homepage = "http://repa.ouroborus.net";
description = "Algorithms using the Repa array library";
diff --git a/pkgs/development/libraries/haskell/repa-examples/default.nix b/pkgs/development/libraries/haskell/repa-examples/default.nix
index 1f3e66e5e08..0320eea7c62 100644
--- a/pkgs/development/libraries/haskell/repa-examples/default.nix
+++ b/pkgs/development/libraries/haskell/repa-examples/default.nix
@@ -2,12 +2,13 @@
cabal.mkDerivation (self: {
pname = "repa-examples";
- version = "3.2.1.1";
- sha256 = "0nbdp3vwg7ha9vhz7f2kys3jxdlwiihxz031cfpkv2si5ci3gy1b";
+ version = "3.2.2.3";
+ sha256 = "0v21f8zzn05j3pjwvnb7x08q0sd375kbf450zjgsv8fzsypclr51";
isLibrary = false;
isExecutable = true;
buildDepends = [ random repa repaAlgorithms repaIo vector ];
extraLibraries = [ llvm ];
+ jailbreak = true;
meta = {
homepage = "http://repa.ouroborus.net";
description = "Examples using the Repa array library";
diff --git a/pkgs/development/libraries/haskell/repa-io/default.nix b/pkgs/development/libraries/haskell/repa-io/default.nix
index 293a7bc6d58..f410595d895 100644
--- a/pkgs/development/libraries/haskell/repa-io/default.nix
+++ b/pkgs/development/libraries/haskell/repa-io/default.nix
@@ -2,9 +2,10 @@
cabal.mkDerivation (self: {
pname = "repa-io";
- version = "3.2.1.1";
- sha256 = "156amnlqsxhwalnc4nypcd66znv2f8c71d5xi8ja5g8d9f1yg02g";
+ version = "3.2.2.3";
+ sha256 = "1rzis7gp9dq06czqmnj9p7hpyfkdbirx2bldhg5mz3glmqf4xvw5";
buildDepends = [ binary bmp repa vector ];
+ jailbreak = true;
meta = {
homepage = "http://repa.ouroborus.net";
description = "Read and write Repa arrays in various formats";
diff --git a/pkgs/development/libraries/haskell/repa/default.nix b/pkgs/development/libraries/haskell/repa/default.nix
index b6102d45572..de8f9cd4f95 100644
--- a/pkgs/development/libraries/haskell/repa/default.nix
+++ b/pkgs/development/libraries/haskell/repa/default.nix
@@ -2,9 +2,10 @@
cabal.mkDerivation (self: {
pname = "repa";
- version = "3.2.1.1";
- sha256 = "0jzcy3xdlwmcjq1mpfqh0axcgbj3i03nxg7blw2sly8qrgfl0ri1";
+ version = "3.2.2.3";
+ sha256 = "04y8yrfh0khk7w9wv61fh2rfygw8r6g9c3spzki6kw63byr01m5c";
buildDepends = [ QuickCheck vector ];
+ jailbreak = true;
meta = {
homepage = "http://repa.ouroborus.net";
description = "High performance, regular, shape polymorphic parallel arrays";
diff --git a/pkgs/development/libraries/haskell/repr/default.nix b/pkgs/development/libraries/haskell/repr/default.nix
index 2558f4fbd31..c44735eda00 100644
--- a/pkgs/development/libraries/haskell/repr/default.nix
+++ b/pkgs/development/libraries/haskell/repr/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "repr";
- version = "0.4.1.2";
- sha256 = "09rv23p1hvvfw5wnhiawgrpqgqa4i0d00skyj9z1jj6bfxk5avjs";
+ version = "0.4.1.3";
+ sha256 = "1y1zl81yjc9jrci83bm6bn8hrfqf6x25vxzkhrkydhhwcwqfqaj5";
buildDepends = [
baseUnicodeSymbols dstring random stringCombinators
];
diff --git a/pkgs/development/libraries/haskell/resourcet/default.nix b/pkgs/development/libraries/haskell/resourcet/default.nix
index e3190749f1c..e5df582bad0 100644
--- a/pkgs/development/libraries/haskell/resourcet/default.nix
+++ b/pkgs/development/libraries/haskell/resourcet/default.nix
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "resourcet";
- version = "0.4.0.1";
- sha256 = "0idyb2xvjk9cbz9gy1gr6sw1mz6v9d8fgk0kw778n6k3h488dw9x";
+ version = "0.4.3";
+ sha256 = "0j3sr4xl30nszy79akzzn8aws40bmhd2dyw8ispirnx004i6ay3b";
buildDepends = [
liftedBase monadControl mtl transformers transformersBase
];
diff --git a/pkgs/development/libraries/haskell/semigroupoids/default.nix b/pkgs/development/libraries/haskell/semigroupoids/default.nix
index 4ffc3c2badc..c2e8deefbad 100644
--- a/pkgs/development/libraries/haskell/semigroupoids/default.nix
+++ b/pkgs/development/libraries/haskell/semigroupoids/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "semigroupoids";
- version = "3.0";
- sha256 = "0wsax14ck363nby0xrhcpvdzf0pzspayl7gsm0br0lr6ipmpcrag";
+ version = "3.0.0.1";
+ sha256 = "0ilqmpywiwp9m1k8lrw0mxb0pzc9l8bs2hgzrp8k5iln1yq1fh6i";
buildDepends = [ comonad contravariant semigroups transformers ];
meta = {
homepage = "http://github.com/ekmett/semigroupoids";
diff --git a/pkgs/development/libraries/haskell/sendfile/default.nix b/pkgs/development/libraries/haskell/sendfile/default.nix
index a4b410f4561..455328ec9cb 100644
--- a/pkgs/development/libraries/haskell/sendfile/default.nix
+++ b/pkgs/development/libraries/haskell/sendfile/default.nix
@@ -2,11 +2,11 @@
cabal.mkDerivation (self: {
pname = "sendfile";
- version = "0.7.6";
- sha256 = "0wqbnr07s3g7f6p4x27ips9nzjjz1ii5hw1q54i31g40jzv8rs7z";
+ version = "0.7.8";
+ sha256 = "0xy9ciikr444gblh3r8z3w4h4rcrfjfciw3dvxgzbygqs5dy6yxl";
buildDepends = [ network ];
meta = {
- homepage = "http://patch-tag.com/r/mae/sendfile";
+ homepage = "http://hub.darcs.net/stepcut/sendfile";
description = "A portable sendfile library";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
diff --git a/pkgs/development/libraries/haskell/setenv/default.nix b/pkgs/development/libraries/haskell/setenv/default.nix
new file mode 100644
index 00000000000..8ce0b125416
--- /dev/null
+++ b/pkgs/development/libraries/haskell/setenv/default.nix
@@ -0,0 +1,12 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+ pname = "setenv";
+ version = "0.1.0";
+ sha256 = "04w42bpfbrs5crjp19zzi9dg61xpz4wvmjs2vc7q7qxblyhdfdsy";
+ meta = {
+ description = "A cross-platform library for setting environment variables";
+ license = self.stdenv.lib.licenses.mit;
+ platforms = self.ghc.meta.platforms;
+ };
+})
diff --git a/pkgs/development/libraries/haskell/shakespeare-css/default.nix b/pkgs/development/libraries/haskell/shakespeare-css/default.nix
index a64e9acc7d7..61c783c6727 100644
--- a/pkgs/development/libraries/haskell/shakespeare-css/default.nix
+++ b/pkgs/development/libraries/haskell/shakespeare-css/default.nix
@@ -1,10 +1,10 @@
-{ cabal, parsec, shakespeare, text }:
+{ cabal, parsec, shakespeare, text, transformers }:
cabal.mkDerivation (self: {
pname = "shakespeare-css";
- version = "1.0.1.4";
- sha256 = "0avixf7z3hcvgcijgrm7hisr8i8waa8nb435gv8lv5vvz8yq3k0n";
- buildDepends = [ parsec shakespeare text ];
+ version = "1.0.2";
+ sha256 = "02sk9ql357ybj1h5a4xjn06di5zdafibabhy32j5vs9kpyamvck3";
+ buildDepends = [ parsec shakespeare text transformers ];
meta = {
homepage = "http://www.yesodweb.com/book/shakespearean-templates";
description = "Stick your haskell variables into css at compile time";
diff --git a/pkgs/development/libraries/haskell/shakespeare-js/default.nix b/pkgs/development/libraries/haskell/shakespeare-js/default.nix
index ff2f0c09e0c..228e35bab46 100644
--- a/pkgs/development/libraries/haskell/shakespeare-js/default.nix
+++ b/pkgs/development/libraries/haskell/shakespeare-js/default.nix
@@ -1,10 +1,10 @@
-{ cabal, shakespeare, text }:
+{ cabal, aeson, shakespeare, text }:
cabal.mkDerivation (self: {
pname = "shakespeare-js";
- version = "1.0.0.5";
- sha256 = "1d4na2q1q798ki5f84gpf89ri26qmrxqrwbw7mmlrfwkj1qw69rs";
- buildDepends = [ shakespeare text ];
+ version = "1.1.0";
+ sha256 = "0rb1fim6xvpgc2in71drxgimh1z75p72zj0k6hwh2hyfwkj2yh9p";
+ buildDepends = [ aeson shakespeare text ];
meta = {
homepage = "http://www.yesodweb.com/book/shakespearean-templates";
description = "Stick your haskell variables into javascript/coffeescript at compile time";
diff --git a/pkgs/development/libraries/haskell/shakespeare-text/default.nix b/pkgs/development/libraries/haskell/shakespeare-text/default.nix
index fbc31e3eda1..4e9516d107c 100644
--- a/pkgs/development/libraries/haskell/shakespeare-text/default.nix
+++ b/pkgs/development/libraries/haskell/shakespeare-text/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "shakespeare-text";
- version = "1.0.0.4";
- sha256 = "14kas2m7kbv1f49qpx6z097r707l3gqp9lwvh0q42cc6rlwab5l7";
+ version = "1.0.0.5";
+ sha256 = "176yzx43sh0fnxpszn8kximd6i96yf2s374z55kvc1kspf7jk736";
buildDepends = [ shakespeare text ];
meta = {
homepage = "http://www.yesodweb.com/book/shakespearean-templates";
diff --git a/pkgs/development/libraries/haskell/shakespeare/default.nix b/pkgs/development/libraries/haskell/shakespeare/default.nix
index 3cc2456a7d5..11a03eaa9b2 100644
--- a/pkgs/development/libraries/haskell/shakespeare/default.nix
+++ b/pkgs/development/libraries/haskell/shakespeare/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "shakespeare";
- version = "1.0.1.3";
- sha256 = "1m0ca3b73fiph939kpd94mxh4a606mv3hafbwg9j4is38mv5kn8d";
+ version = "1.0.2";
+ sha256 = "1n7qymrn2f83a11zdh2950pf8rsqnc52blwi02amjxsvy2piidzm";
buildDepends = [ parsec text ];
meta = {
homepage = "http://www.yesodweb.com/book/shakespearean-templates";
diff --git a/pkgs/development/libraries/haskell/shelly/default.nix b/pkgs/development/libraries/haskell/shelly/default.nix
index 0c266ab1b29..9ac5b355583 100644
--- a/pkgs/development/libraries/haskell/shelly/default.nix
+++ b/pkgs/development/libraries/haskell/shelly/default.nix
@@ -3,8 +3,8 @@
cabal.mkDerivation (self: {
pname = "shelly";
- version = "0.14.0.1";
- sha256 = "062c3zqr6ad61p0s423h8rhimqfld6p95z3qzrmag9f29a5f4fbz";
+ version = "0.14.3";
+ sha256 = "0nlspgk5svc9zr2gry96sykhd8i7vdmqxpsvfsz22khw8climqzj";
buildDepends = [
mtl systemFileio systemFilepath text time unixCompat
];
diff --git a/pkgs/development/libraries/haskell/silently/default.nix b/pkgs/development/libraries/haskell/silently/default.nix
new file mode 100644
index 00000000000..658fe4fc693
--- /dev/null
+++ b/pkgs/development/libraries/haskell/silently/default.nix
@@ -0,0 +1,14 @@
+{ cabal, deepseq }:
+
+cabal.mkDerivation (self: {
+ pname = "silently";
+ version = "1.2.4";
+ sha256 = "0ac75b4n9566vpvv6jfcqafnyplv8dd7bgak89b16wy032z1xl5j";
+ buildDepends = [ deepseq ];
+ meta = {
+ homepage = "https://github.com/trystan/silently";
+ description = "Prevent or capture writing to stdout and other handles";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ };
+})
diff --git a/pkgs/development/libraries/haskell/simple-sendfile/default.nix b/pkgs/development/libraries/haskell/simple-sendfile/default.nix
index d99762df2b2..2a55427a6aa 100644
--- a/pkgs/development/libraries/haskell/simple-sendfile/default.nix
+++ b/pkgs/development/libraries/haskell/simple-sendfile/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "simple-sendfile";
- version = "0.2.7";
- sha256 = "0chjcn6j5irzjqid3nhh2ya395aqavcar3ygzd01z96ha1nl4dbw";
+ version = "0.2.8";
+ sha256 = "11lw8m21cy40hd9nzp80d9jawgv9hd3sfvizjcfbvdc2lpq6m17j";
buildDepends = [ network ];
meta = {
description = "Cross platform library for the sendfile system call";
diff --git a/pkgs/development/libraries/haskell/snap/core.nix b/pkgs/development/libraries/haskell/snap/core.nix
index 1d51b9d9933..16df3f34756 100644
--- a/pkgs/development/libraries/haskell/snap/core.nix
+++ b/pkgs/development/libraries/haskell/snap/core.nix
@@ -1,21 +1,19 @@
-{ cabal, attoparsec, attoparsecEnumerator, base16Bytestring
-, blazeBuilder, blazeBuilderEnumerator, bytestringMmap
-, bytestringNums, caseInsensitive, deepseq, dlist, enumerator
-, filepath, HUnit, MonadCatchIOTransformers, mtl, mwcRandom
-, regexPosix, text, time, transformers, unixCompat
-, unorderedContainers, vector, zlibEnum
+{ cabal, attoparsec, attoparsecEnumerator, blazeBuilder
+, blazeBuilderEnumerator, bytestringMmap, caseInsensitive, deepseq
+, enumerator, filepath, HUnit, MonadCatchIOTransformers, mtl
+, random, regexPosix, text, time, unixCompat, unorderedContainers
+, vector, zlibEnum
}:
cabal.mkDerivation (self: {
pname = "snap-core";
- version = "0.9.0";
- sha256 = "1fsjamv9sl19in2ws97v246sbvlnj05rm9dljc0pz7kasawyqsb7";
+ version = "0.9.2.2";
+ sha256 = "0svahih2piaj87xfysgjvqqh11gmwz9icrh2g819h68kzh10imlf";
buildDepends = [
- attoparsec attoparsecEnumerator base16Bytestring blazeBuilder
- blazeBuilderEnumerator bytestringMmap bytestringNums
- caseInsensitive deepseq dlist enumerator filepath HUnit
- MonadCatchIOTransformers mtl mwcRandom regexPosix text time
- transformers unixCompat unorderedContainers vector zlibEnum
+ attoparsec attoparsecEnumerator blazeBuilder blazeBuilderEnumerator
+ bytestringMmap caseInsensitive deepseq enumerator filepath HUnit
+ MonadCatchIOTransformers mtl random regexPosix text time unixCompat
+ unorderedContainers vector zlibEnum
];
meta = {
homepage = "http://snapframework.com/";
diff --git a/pkgs/development/libraries/haskell/snap/loader-dynamic.nix b/pkgs/development/libraries/haskell/snap/loader-dynamic.nix
index 5815496695c..3f6c5db004b 100644
--- a/pkgs/development/libraries/haskell/snap/loader-dynamic.nix
+++ b/pkgs/development/libraries/haskell/snap/loader-dynamic.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "snap-loader-dynamic";
- version = "0.9.0";
- sha256 = "1pbpvi20an077klvha1dflnlxpfb6m81n9d50hjhidf6430cmmhm";
+ version = "0.9.0.1";
+ sha256 = "1pzn8lfqngn8cqm1dpxn5wsx70xcd7r90rd2948n4p5309qgh9mq";
buildDepends = [ directoryTree hint mtl snapCore time ];
meta = {
homepage = "http://snapframework.com/";
diff --git a/pkgs/development/libraries/haskell/snap/server.nix b/pkgs/development/libraries/haskell/snap/server.nix
index 20a6af0ba90..7f8dc878024 100644
--- a/pkgs/development/libraries/haskell/snap/server.nix
+++ b/pkgs/development/libraries/haskell/snap/server.nix
@@ -1,19 +1,17 @@
-{ cabal, attoparsec, attoparsecEnumerator, binary, blazeBuilder
-, blazeBuilderEnumerator, bytestringNums, caseInsensitive
-, directoryTree, enumerator, filepath, MonadCatchIOTransformers
-, mtl, murmurHash, network, snapCore, text, time, transformers
-, unixCompat, vector, vectorAlgorithms
+{ cabal, attoparsec, attoparsecEnumerator, blazeBuilder
+, blazeBuilderEnumerator, caseInsensitive, enumerator
+, MonadCatchIOTransformers, mtl, network, snapCore, text, time
+, unixCompat
}:
cabal.mkDerivation (self: {
pname = "snap-server";
- version = "0.9.0";
- sha256 = "12mjy1w6gsnw93bcpsnxnw7kc2v73dfps7gk542iw73lldfhh3va";
+ version = "0.9.2.4";
+ sha256 = "1kwmrlk9dr033h6q05afnr916wnw5wlxrr87z1myv0a6nzqmdhzl";
buildDepends = [
- attoparsec attoparsecEnumerator binary blazeBuilder
- blazeBuilderEnumerator bytestringNums caseInsensitive directoryTree
- enumerator filepath MonadCatchIOTransformers mtl murmurHash network
- snapCore text time transformers unixCompat vector vectorAlgorithms
+ attoparsec attoparsecEnumerator blazeBuilder blazeBuilderEnumerator
+ caseInsensitive enumerator MonadCatchIOTransformers mtl network
+ snapCore text time unixCompat
];
meta = {
homepage = "http://snapframework.com/";
diff --git a/pkgs/development/libraries/haskell/snap/snap.nix b/pkgs/development/libraries/haskell/snap/snap.nix
index e40aee63bc1..1676de1e840 100644
--- a/pkgs/development/libraries/haskell/snap/snap.nix
+++ b/pkgs/development/libraries/haskell/snap/snap.nix
@@ -2,14 +2,14 @@
, dataLens, dataLensTemplate, directoryTree, filepath, hashable
, heist, logict, MonadCatchIOTransformers, mtl, mwcRandom
, pwstoreFast, snapCore, snapServer, stm, syb, text, time
-, transformers, unorderedContainers, utf8String, vector
-, vectorAlgorithms, xmlhtml
+, transformers, unorderedContainers, vector, vectorAlgorithms
+, xmlhtml
}:
cabal.mkDerivation (self: {
pname = "snap";
- version = "0.9.1.1";
- sha256 = "1g8jvnwrhna5g064dmv4v4khrpwwn0vcqw8l7rcpkp75l46fq29z";
+ version = "0.9.2.2";
+ sha256 = "1ql9c8b9arcd8zwlwsiipl4diah87sp339ljc5bc7yls1g4d9zsw";
isLibrary = true;
isExecutable = true;
buildDepends = [
@@ -17,12 +17,11 @@ cabal.mkDerivation (self: {
dataLensTemplate directoryTree filepath hashable heist logict
MonadCatchIOTransformers mtl mwcRandom pwstoreFast snapCore
snapServer stm syb text time transformers unorderedContainers
- utf8String vector vectorAlgorithms xmlhtml
+ vector vectorAlgorithms xmlhtml
];
- jailbreak = true;
meta = {
homepage = "http://snapframework.com/";
- description = "Snap: A Haskell Web Framework: project starter executable and glue code library";
+ description = "Top-level package for the Snap Web Framework";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
diff --git a/pkgs/development/libraries/haskell/split/default.nix b/pkgs/development/libraries/haskell/split/0.2.1.1.nix
similarity index 76%
rename from pkgs/development/libraries/haskell/split/default.nix
rename to pkgs/development/libraries/haskell/split/0.2.1.1.nix
index 42d33d10a06..e106b2687f5 100644
--- a/pkgs/development/libraries/haskell/split/default.nix
+++ b/pkgs/development/libraries/haskell/split/0.2.1.1.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "split";
- version = "0.2.0.0";
- sha256 = "1gk0nx6bw5j9gxaa6ki70wqszbllz7c1ccfnwg49fl3qfabg1i7c";
+ version = "0.2.1.1";
+ sha256 = "1zzp4dwf846s74a4lhw2gf4awsk9iblhl5zcg2zccgv1lr4w2dmz";
meta = {
description = "Combinator library for splitting lists";
license = self.stdenv.lib.licenses.bsd3;
diff --git a/pkgs/development/libraries/haskell/srcloc/default.nix b/pkgs/development/libraries/haskell/srcloc/default.nix
index d76309bc795..c867a353cd6 100644
--- a/pkgs/development/libraries/haskell/srcloc/default.nix
+++ b/pkgs/development/libraries/haskell/srcloc/default.nix
@@ -1,10 +1,10 @@
-{ cabal, syb, symbol }:
+{ cabal, syb }:
cabal.mkDerivation (self: {
pname = "srcloc";
- version = "0.1.2";
- sha256 = "08awipz6al7jk7d974am5v9fkp87i5dy6d457mx1rv7lczlyhws9";
- buildDepends = [ syb symbol ];
+ version = "0.3.0";
+ sha256 = "1ymk8k0r9ckk7dalz3virvvpyrf4nw8xvb23cs6ibdjjbzsphpiz";
+ buildDepends = [ syb ];
meta = {
homepage = "http://www.eecs.harvard.edu/~mainland/";
description = "Data types for managing source code locations";
diff --git a/pkgs/development/libraries/haskell/stm/2.4.2.nix b/pkgs/development/libraries/haskell/stm/2.4.2.nix
new file mode 100644
index 00000000000..a3fa76e4a51
--- /dev/null
+++ b/pkgs/development/libraries/haskell/stm/2.4.2.nix
@@ -0,0 +1,13 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+ pname = "stm";
+ version = "2.4.2";
+ sha256 = "1nsq92z7y0w227fyig0xz4365xp50hnzzkqr4s836q969kb3rvn8";
+ meta = {
+ description = "Software Transactional Memory";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ maintainers = [ self.stdenv.lib.maintainers.andres ];
+ };
+})
diff --git a/pkgs/development/libraries/haskell/string-combinators/default.nix b/pkgs/development/libraries/haskell/string-combinators/default.nix
index 03587d24d02..bfc38fb07e8 100644
--- a/pkgs/development/libraries/haskell/string-combinators/default.nix
+++ b/pkgs/development/libraries/haskell/string-combinators/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "string-combinators";
- version = "0.6.0.3";
- sha256 = "18jawxqvcj7zpvb0wf1zln12s03mp6nglhv5ccywrkb5x0r0557j";
+ version = "0.6.0.4";
+ sha256 = "0r1za5ypx9fz073h1yljjdkxmz0h77vg94bk827ndwkfgzgpzvh7";
buildDepends = [ baseUnicodeSymbols ];
meta = {
homepage = "https://github.com/basvandijk/string-combinators";
diff --git a/pkgs/development/libraries/haskell/stringsearch/default.nix b/pkgs/development/libraries/haskell/stringsearch/default.nix
index fb31ab76a2c..f8032f8cde4 100644
--- a/pkgs/development/libraries/haskell/stringsearch/default.nix
+++ b/pkgs/development/libraries/haskell/stringsearch/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "stringsearch";
- version = "0.3.6.3";
- sha256 = "1f0sl1zjya8glvlscf3g5i0in0ai1knls7kg9dp82grg2k287sgz";
+ version = "0.3.6.4";
+ sha256 = "16g0x0n8x3bg3mij7w3r5m3h2i2dn3bd298n14iccdwhfnlzm91b";
meta = {
homepage = "https://bitbucket.org/dafis/stringsearch";
description = "Fast searching, splitting and replacing of ByteStrings";
diff --git a/pkgs/development/libraries/haskell/strptime/default.nix b/pkgs/development/libraries/haskell/strptime/default.nix
new file mode 100644
index 00000000000..bb30fe71cc3
--- /dev/null
+++ b/pkgs/development/libraries/haskell/strptime/default.nix
@@ -0,0 +1,13 @@
+{ cabal, time }:
+
+cabal.mkDerivation (self: {
+ pname = "strptime";
+ version = "1.0.8";
+ sha256 = "0cd4wzrg9zpnwrfpp6lxs1ib06h0fcsdqd3idsw663wr5lllfgdq";
+ buildDepends = [ time ];
+ meta = {
+ description = "Efficient parsing of LocalTime using a binding to C's strptime, with some extra features (i.e. fractional seconds)";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ };
+})
diff --git a/pkgs/development/libraries/haskell/stylish-haskell/default.nix b/pkgs/development/libraries/haskell/stylish-haskell/default.nix
index eca99a8c440..fc875d75bd0 100644
--- a/pkgs/development/libraries/haskell/stylish-haskell/default.nix
+++ b/pkgs/development/libraries/haskell/stylish-haskell/default.nix
@@ -4,9 +4,9 @@
cabal.mkDerivation (self: {
pname = "stylish-haskell";
- version = "0.4.0.0";
- sha256 = "1d5a7a5f1lbyf7if0sb9vhmnbi5ry28wakhsgh75hvgzd999vbhx";
- isLibrary = false;
+ version = "0.5.4.0";
+ sha256 = "1bnsjs5s760xnk3s1l7kjqr2svxp4a881p9z2slaywi5kn0v5mwf";
+ isLibrary = true;
isExecutable = true;
buildDepends = [
aeson cmdargs filepath haskellSrcExts mtl strict syb yaml
diff --git a/pkgs/development/libraries/haskell/symbol/default.nix b/pkgs/development/libraries/haskell/symbol/default.nix
index b8dd2aa69a2..d82a1968878 100644
--- a/pkgs/development/libraries/haskell/symbol/default.nix
+++ b/pkgs/development/libraries/haskell/symbol/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "symbol";
- version = "0.1.3";
- sha256 = "1kz4kzbv6bara31pv4vc75r6wvjln6md8gjlsxx8hf50ab8vb68j";
+ version = "0.1.4";
+ sha256 = "00318syprv1ixfbr4v7xq86z10f0psxk0b8kaxvawvacm8hp61bn";
buildDepends = [ deepseq syb ];
meta = {
homepage = "http://www.eecs.harvard.edu/~mainland/";
diff --git a/pkgs/development/libraries/haskell/system-fileio/default.nix b/pkgs/development/libraries/haskell/system-fileio/default.nix
index 7534ce4a1d1..7b1f7d7bcfd 100644
--- a/pkgs/development/libraries/haskell/system-fileio/default.nix
+++ b/pkgs/development/libraries/haskell/system-fileio/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "system-fileio";
- version = "0.3.9";
- sha256 = "0mfmijwnkp92s58jb51lk0p1p3418f6qskr95phc1zp40yrcw8nx";
+ version = "0.3.10";
+ sha256 = "1f8si6m62nxzj71jgyhxl38szmw8wr3frvgih596vfjxwdhqpkq4";
buildDepends = [ systemFilepath text time ];
meta = {
homepage = "https://john-millikin.com/software/haskell-filesystem/";
diff --git a/pkgs/development/libraries/haskell/tagged/default.nix b/pkgs/development/libraries/haskell/tagged/default.nix
index dde949686bd..e435671fe22 100644
--- a/pkgs/development/libraries/haskell/tagged/default.nix
+++ b/pkgs/development/libraries/haskell/tagged/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "tagged";
- version = "0.4.2.1";
- sha256 = "0acd0wyyl6nx8i6r5h6smb7apmnmic6kn7ks9pc8nfmhlzhgfk57";
+ version = "0.4.4";
+ sha256 = "0bc88q33pyz4sx429awhxmnjzvmsg7vwwsqi2w7yf8lrmz5ph08x";
meta = {
homepage = "http://github.com/ekmett/tagged";
description = "Haskell 98 phantom types to avoid unsafely passing dummy arguments";
diff --git a/pkgs/development/libraries/haskell/tagsoup/default.nix b/pkgs/development/libraries/haskell/tagsoup/default.nix
index 78f52a3ad32..3258267f012 100644
--- a/pkgs/development/libraries/haskell/tagsoup/default.nix
+++ b/pkgs/development/libraries/haskell/tagsoup/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "tagsoup";
- version = "0.12.7";
- sha256 = "0f4f0552n9qkycvh01jyk52190nk4frlp9za8vyczayrm3vmw268";
+ version = "0.12.8";
+ sha256 = "05cm9h80qmxvk7xhlgly9zcmpbsajagspaa8p6k4ddch6q9lj7m3";
isLibrary = true;
isExecutable = true;
buildDepends = [ text ];
diff --git a/pkgs/development/libraries/haskell/tagstream-conduit/default.nix b/pkgs/development/libraries/haskell/tagstream-conduit/default.nix
new file mode 100644
index 00000000000..84187bb4c1f
--- /dev/null
+++ b/pkgs/development/libraries/haskell/tagstream-conduit/default.nix
@@ -0,0 +1,18 @@
+{ cabal, attoparsec, blazeBuilder, blazeBuilderConduit, conduit
+, text
+}:
+
+cabal.mkDerivation (self: {
+ pname = "tagstream-conduit";
+ version = "0.5.3";
+ sha256 = "08g34dbb59mrpj0lym5a0zlygvj7in57nkhbk84kxvggrhl0jndl";
+ buildDepends = [
+ attoparsec blazeBuilder blazeBuilderConduit conduit text
+ ];
+ meta = {
+ homepage = "http://github.com/yihuang/tagstream-conduit";
+ description = "streamlined html tag parser";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ };
+})
diff --git a/pkgs/development/libraries/haskell/temporary/default.nix b/pkgs/development/libraries/haskell/temporary/default.nix
index 99ce29b1991..df93cae198a 100644
--- a/pkgs/development/libraries/haskell/temporary/default.nix
+++ b/pkgs/development/libraries/haskell/temporary/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "temporary";
- version = "1.1.2.3";
- sha256 = "1x4jljggbcdq90h578yyvc8z1i9zmlhvqfz2dym8kj8pq4qiwixd";
+ version = "1.1.2.4";
+ sha256 = "1j8kc22rz2wqg90n5wcxb06ylqv3lnz764077kvwhrw7mhmbp7jz";
buildDepends = [ filepath ];
meta = {
homepage = "http://www.github.com/batterseapower/temporary";
diff --git a/pkgs/development/libraries/haskell/test-framework-th-prime/default.nix b/pkgs/development/libraries/haskell/test-framework-th-prime/default.nix
new file mode 100644
index 00000000000..ebcd608eb6a
--- /dev/null
+++ b/pkgs/development/libraries/haskell/test-framework-th-prime/default.nix
@@ -0,0 +1,13 @@
+{ cabal, cpphs, haskellSrcExts, testFramework }:
+
+cabal.mkDerivation (self: {
+ pname = "test-framework-th-prime";
+ version = "0.0.5";
+ sha256 = "0lsxnbckh88cq38azml86szdcvx3rhs3is13ib4z0ryfqnv4hhpl";
+ buildDepends = [ cpphs haskellSrcExts testFramework ];
+ meta = {
+ description = "Template Haskell for test framework";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ };
+})
diff --git a/pkgs/development/libraries/haskell/test-framework-th/default.nix b/pkgs/development/libraries/haskell/test-framework-th/default.nix
index 64164c7f161..57b4302938b 100644
--- a/pkgs/development/libraries/haskell/test-framework-th/default.nix
+++ b/pkgs/development/libraries/haskell/test-framework-th/default.nix
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "test-framework-th";
- version = "0.2.2";
- sha256 = "0nzfvxr5bnxinx41a5w5mwhyxzz2936dl0xhd80cv9plx19ylh0w";
+ version = "0.2.3";
+ sha256 = "1xls8034zkfnvkv2p6jd6kc1x3xrr0sm5c6hl0mp7ym2w2ww9f1w";
buildDepends = [
haskellSrcExts languageHaskellExtract regexPosix testFramework
];
diff --git a/pkgs/development/libraries/haskell/threads/default.nix b/pkgs/development/libraries/haskell/threads/default.nix
new file mode 100644
index 00000000000..8f5008032f6
--- /dev/null
+++ b/pkgs/development/libraries/haskell/threads/default.nix
@@ -0,0 +1,14 @@
+{ cabal, baseUnicodeSymbols, stm }:
+
+cabal.mkDerivation (self: {
+ pname = "threads";
+ version = "0.5.0.1";
+ sha256 = "0amyaxa70q6v021nab6v3cfqc40mwj5dr2fwla9d4bm6ppmq6lyy";
+ buildDepends = [ baseUnicodeSymbols stm ];
+ meta = {
+ homepage = "https://github.com/basvandijk/threads";
+ description = "Fork threads and wait for their result";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ };
+})
diff --git a/pkgs/development/libraries/haskell/tls-extra/default.nix b/pkgs/development/libraries/haskell/tls-extra/default.nix
index 349c4e05754..6a7b24f1fe2 100644
--- a/pkgs/development/libraries/haskell/tls-extra/default.nix
+++ b/pkgs/development/libraries/haskell/tls-extra/default.nix
@@ -1,19 +1,19 @@
-{ cabal, certificate, cryptoApi, cryptocipher, cryptohash, mtl
-, network, pem, text, time, tls, vector
+{ cabal, certificate, cipherAes, cryptoApi, cryptocipher
+, cryptohash, mtl, network, pem, text, time, tls, vector
}:
cabal.mkDerivation (self: {
pname = "tls-extra";
- version = "0.4.6";
- sha256 = "1xl55i4nr7kyc3qxi8zmq18m0xhlwlrx9fwkck22krshqgq2i6nn";
+ version = "0.5.0";
+ sha256 = "1r645qljn3ql7jcphsqf4cm259cl8fsva64q4p2x37mafi01bkr8";
isLibrary = true;
isExecutable = true;
buildDepends = [
- certificate cryptoApi cryptocipher cryptohash mtl network pem text
- time tls vector
+ certificate cipherAes cryptoApi cryptocipher cryptohash mtl network
+ pem text time tls vector
];
meta = {
- homepage = "http://github.com/vincenthz/hs-tls-extra";
+ homepage = "http://github.com/vincenthz/hs-tls";
description = "TLS extra default values and helpers";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
diff --git a/pkgs/development/libraries/haskell/tls/default.nix b/pkgs/development/libraries/haskell/tls/default.nix
index 2154aa347d2..082a4b75cc6 100644
--- a/pkgs/development/libraries/haskell/tls/default.nix
+++ b/pkgs/development/libraries/haskell/tls/default.nix
@@ -1,15 +1,15 @@
{ cabal, cereal, certificate, cryptoApi, cryptocipher, cryptohash
-, mtl
+, mtl, network
}:
cabal.mkDerivation (self: {
pname = "tls";
- version = "0.9.10";
- sha256 = "1kiwb5skirdla32gjicgmjyk09p8f701jgs6krxbi38gmmfj1dxf";
+ version = "1.0.2";
+ sha256 = "0fkbh89j4gpwq45hv88axcdy7hxhvj1wj14nf7ma8wzaga2p4m75";
isLibrary = true;
isExecutable = true;
buildDepends = [
- cereal certificate cryptoApi cryptocipher cryptohash mtl
+ cereal certificate cryptoApi cryptocipher cryptohash mtl network
];
meta = {
homepage = "http://github.com/vincenthz/hs-tls";
diff --git a/pkgs/development/libraries/haskell/unix-compat/default.nix b/pkgs/development/libraries/haskell/unix-compat/default.nix
index df329ba1d90..7c5cb6c63c4 100644
--- a/pkgs/development/libraries/haskell/unix-compat/default.nix
+++ b/pkgs/development/libraries/haskell/unix-compat/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "unix-compat";
- version = "0.3.0.2";
- sha256 = "0rikix2l8d0n948pzri2rdis9k5q0m73h7vxsxjz1vh24ryjj59f";
+ version = "0.4.0.0";
+ sha256 = "0xhhvqdjcmcyavf0g2q2sjghj2h4si1ijg4nc4s8kidbd957z9r8";
meta = {
homepage = "http://github.com/jystic/unix-compat";
description = "Portable POSIX-compatibility layer";
diff --git a/pkgs/development/libraries/haskell/unlambda/default.nix b/pkgs/development/libraries/haskell/unlambda/default.nix
index c0cfc72bd9e..474bb1a8b09 100644
--- a/pkgs/development/libraries/haskell/unlambda/default.nix
+++ b/pkgs/development/libraries/haskell/unlambda/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "unlambda";
- version = "0.1";
- sha256 = "0xmn5w5vza6z2i3fs2hv2jgmb1lyk918viknsx3lk36i1dbyivgi";
+ version = "0.1.3";
+ sha256 = "0clcpkhg23a7ma72rjjpl2w8jpg2mdn4rgm3vf0vqr7lbyma1h89";
isLibrary = true;
isExecutable = true;
buildDepends = [ mtl ];
diff --git a/pkgs/development/libraries/haskell/urlencoded/default.nix b/pkgs/development/libraries/haskell/urlencoded/default.nix
index 45891bb45b1..05bd2ab09bb 100644
--- a/pkgs/development/libraries/haskell/urlencoded/default.nix
+++ b/pkgs/development/libraries/haskell/urlencoded/default.nix
@@ -2,12 +2,11 @@
cabal.mkDerivation (self: {
pname = "urlencoded";
- version = "0.3.0.1";
- sha256 = "1i6r05d5libcilngsa6illcazfv6g4rhibzgk8c2jsjq9cg53ihz";
+ version = "0.4.0";
+ sha256 = "0idh70apfxx8bkbsxda4xhb0b5xf4x237dwi4v55ildrhxx4b68k";
isLibrary = true;
isExecutable = true;
buildDepends = [ mtl network split ];
- jailbreak = true;
meta = {
homepage = "https://github.com/pheaver/urlencoded";
description = "Generate or process x-www-urlencoded data";
diff --git a/pkgs/development/libraries/haskell/uu-parsinglib/default.nix b/pkgs/development/libraries/haskell/uu-parsinglib/default.nix
index 1bb3cb76dac..02356789bc3 100644
--- a/pkgs/development/libraries/haskell/uu-parsinglib/default.nix
+++ b/pkgs/development/libraries/haskell/uu-parsinglib/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "uu-parsinglib";
- version = "2.7.3.4";
- sha256 = "1f582cr17qxwrhxx6pdv503ldm4ccbnbv9pcksibgparfyc25bnv";
+ version = "2.7.4";
+ sha256 = "1cznyn09a3glfkvvzqma3bhjinddkp6v2xwiy5x403v0wy8y565j";
buildDepends = [ ListLike time ];
meta = {
homepage = "http://www.cs.uu.nl/wiki/bin/view/HUT/ParserCombinators";
diff --git a/pkgs/development/libraries/haskell/vacuum/default.nix b/pkgs/development/libraries/haskell/vacuum/default.nix
index 11f74432be6..8506e580502 100644
--- a/pkgs/development/libraries/haskell/vacuum/default.nix
+++ b/pkgs/development/libraries/haskell/vacuum/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "vacuum";
- version = "2.0.0.0";
- sha256 = "0a810ql4lp1pyvys9a5aw28gxn7h2p4hkc0by4pmpw5d7kdhn9y3";
+ version = "2.1.0.1";
+ sha256 = "0gzh5v9mr0mgz9hxjnm8n3jcl2702wad7qaqaar1zc95lkabpf65";
extraLibraries = [ ghcPaths ];
meta = {
homepage = "http://thoughtpolice.github.com/vacuum";
diff --git a/pkgs/development/libraries/haskell/vcs-revision/default.nix b/pkgs/development/libraries/haskell/vcs-revision/default.nix
new file mode 100644
index 00000000000..a1cd2783931
--- /dev/null
+++ b/pkgs/development/libraries/haskell/vcs-revision/default.nix
@@ -0,0 +1,12 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+ pname = "vcs-revision";
+ version = "0.0.1";
+ sha256 = "1zfv9b02ml8622kz755azhi4ajyxrqniiachd92znfrry4n8z1mn";
+ meta = {
+ description = "Facilities for accessing the version control revision of the current directory";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ };
+})
diff --git a/pkgs/development/libraries/haskell/vect/default.nix b/pkgs/development/libraries/haskell/vect/default.nix
new file mode 100644
index 00000000000..2d81a013176
--- /dev/null
+++ b/pkgs/development/libraries/haskell/vect/default.nix
@@ -0,0 +1,14 @@
+{ cabal, random }:
+
+cabal.mkDerivation (self: {
+ pname = "vect";
+ version = "0.4.7";
+ sha256 = "1049jh8rcxfnyckz5m5asdlyafqszlig96k387raldyfzbrf8f4d";
+ buildDepends = [ random ];
+ meta = {
+ homepage = "http://code.haskell.org/~bkomuves/";
+ description = "A low-dimensional linear algebra library, tailored to computer graphics";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ };
+})
diff --git a/pkgs/development/libraries/haskell/vector-algorithms/default.nix b/pkgs/development/libraries/haskell/vector-algorithms/default.nix
index 2704942b360..dc8c9dd35ba 100644
--- a/pkgs/development/libraries/haskell/vector-algorithms/default.nix
+++ b/pkgs/development/libraries/haskell/vector-algorithms/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "vector-algorithms";
- version = "0.5.4.1";
- sha256 = "00dikjmy1pyyn3mmq7sjnmd91xcg7q3n3yiil3dqi1fgr0787xng";
+ version = "0.5.4.2";
+ sha256 = "08pb6mkghf9h5011vxrfdrfq6g26jk4gxmjh9s3hpdiwybf3ab64";
buildDepends = [ primitive vector ];
meta = {
homepage = "http://code.haskell.org/~dolio/";
diff --git a/pkgs/development/libraries/haskell/vector-space-points/default.nix b/pkgs/development/libraries/haskell/vector-space-points/default.nix
index 7497ed59c4f..1debf3f0f71 100644
--- a/pkgs/development/libraries/haskell/vector-space-points/default.nix
+++ b/pkgs/development/libraries/haskell/vector-space-points/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "vector-space-points";
- version = "0.1.1.1";
- sha256 = "08lar9ydni87w79y86xk2blddsgx5n6gwz3262w8z32dgy9lrmwx";
+ version = "0.1.2.0";
+ sha256 = "19azl6g14rsxs0qbik6x637qw9jv4xl01w65xd0xh7833mypmj6d";
buildDepends = [ newtype vectorSpace ];
meta = {
description = "A type for points, as distinct from vectors";
diff --git a/pkgs/development/libraries/haskell/vector-space/default.nix b/pkgs/development/libraries/haskell/vector-space/default.nix
index 2957959f005..60762ce3f9b 100644
--- a/pkgs/development/libraries/haskell/vector-space/default.nix
+++ b/pkgs/development/libraries/haskell/vector-space/default.nix
@@ -2,11 +2,10 @@
cabal.mkDerivation (self: {
pname = "vector-space";
- version = "0.8.2";
- sha256 = "09gndxxscyc9w85fih370gag8yd1xbfg94nxkwdvhzvbkns9k2ad";
+ version = "0.8.4";
+ sha256 = "1hrilbv44lrqm9p3z97xw8nlgxam98abll4iqik8a4d6ky225bwq";
buildDepends = [ Boolean MemoTrie NumInstances ];
meta = {
- homepage = "http://haskell.org/haskellwiki/vector-space";
description = "Vector & affine spaces, linear maps, and derivatives";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
diff --git a/pkgs/development/libraries/haskell/vector/0.10.0.1.nix b/pkgs/development/libraries/haskell/vector/0.10.0.1.nix
new file mode 100644
index 00000000000..7acc89d6a91
--- /dev/null
+++ b/pkgs/development/libraries/haskell/vector/0.10.0.1.nix
@@ -0,0 +1,15 @@
+{ cabal, deepseq, primitive }:
+
+cabal.mkDerivation (self: {
+ pname = "vector";
+ version = "0.10.0.1";
+ sha256 = "1bq8am8qnpnsla315i21f1kikikalyz9ps1izxgpr9q1ic2lbsgc";
+ buildDepends = [ deepseq primitive ];
+ meta = {
+ homepage = "http://code.haskell.org/vector";
+ description = "Efficient Arrays";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ maintainers = [ self.stdenv.lib.maintainers.andres ];
+ };
+})
diff --git a/pkgs/development/libraries/haskell/vector/0.10.nix b/pkgs/development/libraries/haskell/vector/0.10.nix
new file mode 100644
index 00000000000..8fac71eed4b
--- /dev/null
+++ b/pkgs/development/libraries/haskell/vector/0.10.nix
@@ -0,0 +1,15 @@
+{ cabal, deepseq, primitive }:
+
+cabal.mkDerivation (self: {
+ pname = "vector";
+ version = "0.10";
+ sha256 = "0lwhsdg7wv6gwjswakf2d1h9w7lp4pznab0mz6xg5q48pgknrcig";
+ buildDepends = [ deepseq primitive ];
+ meta = {
+ homepage = "http://code.haskell.org/vector";
+ description = "Efficient Arrays";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ maintainers = [ self.stdenv.lib.maintainers.andres ];
+ };
+})
diff --git a/pkgs/development/libraries/haskell/vector/default.nix b/pkgs/development/libraries/haskell/vector/0.9.1.nix
similarity index 100%
rename from pkgs/development/libraries/haskell/vector/default.nix
rename to pkgs/development/libraries/haskell/vector/0.9.1.nix
diff --git a/pkgs/development/libraries/haskell/void/default.nix b/pkgs/development/libraries/haskell/void/default.nix
index 581d2f8c9ae..e19a0450c02 100644
--- a/pkgs/development/libraries/haskell/void/default.nix
+++ b/pkgs/development/libraries/haskell/void/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "void";
- version = "0.5.7";
- sha256 = "1rkc32122mkyxl0a4spbcqz908wh49l5ab8gfvsy0y02d3lldfd4";
+ version = "0.5.8";
+ sha256 = "1iqwndpc77i4i1977z7lxj20viplr2f5pwxwa2kibyhy556bs27z";
buildDepends = [ semigroups ];
meta = {
homepage = "http://github.com/ekmett/void";
diff --git a/pkgs/development/libraries/haskell/vty/default.nix b/pkgs/development/libraries/haskell/vty/default.nix
index 684fbd2eed0..2642af7457e 100644
--- a/pkgs/development/libraries/haskell/vty/default.nix
+++ b/pkgs/development/libraries/haskell/vty/default.nix
@@ -4,14 +4,14 @@
cabal.mkDerivation (self: {
pname = "vty";
- version = "4.7.0.14";
- sha256 = "0wgn2jbr7lih9znkpa09nvb4qjd0801c0r4mwwrw4pd9n9mkjqn9";
+ version = "4.7.0.20";
+ sha256 = "15slw4zpvfkx9qwj2g5ndcxwbw0kkhyq8frvh9kharqd0zqzgqzb";
buildDepends = [
deepseq mtl parallel parsec terminfo utf8String vector
];
meta = {
homepage = "https://github.com/coreyoconnor/vty";
- description = "A simple terminal access library";
+ description = "A simple terminal UI library";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
diff --git a/pkgs/development/libraries/haskell/wai-app-static/default.nix b/pkgs/development/libraries/haskell/wai-app-static/default.nix
index f073d36f502..427efd4d9bf 100644
--- a/pkgs/development/libraries/haskell/wai-app-static/default.nix
+++ b/pkgs/development/libraries/haskell/wai-app-static/default.nix
@@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "wai-app-static";
- version = "1.3.0.1";
- sha256 = "0rgbqbcj4jd6xpjm3nqa5hdf3an7208in536dl6x9n88w9a6qngp";
+ version = "1.3.0.4";
+ sha256 = "1dcgw6b10j5y2xa1jpqfsgcq8w6c7cdbp4pfc8nb6n54bys4linn";
buildDepends = [
base64Bytestring blazeBuilder blazeHtml blazeMarkup cereal
cryptoConduit cryptohash fileEmbed httpDate httpTypes mimeTypes
diff --git a/pkgs/development/libraries/haskell/wai-extra/default.nix b/pkgs/development/libraries/haskell/wai-extra/default.nix
index 0debe101b4f..1c681a39ef5 100644
--- a/pkgs/development/libraries/haskell/wai-extra/default.nix
+++ b/pkgs/development/libraries/haskell/wai-extra/default.nix
@@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "wai-extra";
- version = "1.3.0.1";
- sha256 = "0mclhaxdgj1vcqa6q22zl5zv4znfis1zyivwypl1pwv0r267siy5";
+ version = "1.3.0.4";
+ sha256 = "1i909qipmnwx161c0xlqzrwcpbv6si2rrbhfs524dicgr1jdijcc";
buildDepends = [
ansiTerminal blazeBuilder blazeBuilderConduit caseInsensitive
conduit dataDefault dateCache fastLogger httpTypes network
diff --git a/pkgs/development/libraries/haskell/wai-test/default.nix b/pkgs/development/libraries/haskell/wai-test/default.nix
new file mode 100644
index 00000000000..0c9b8eb2eb8
--- /dev/null
+++ b/pkgs/development/libraries/haskell/wai-test/default.nix
@@ -0,0 +1,19 @@
+{ cabal, blazeBuilder, blazeBuilderConduit, caseInsensitive
+, conduit, cookie, httpTypes, HUnit, text, transformers, wai
+}:
+
+cabal.mkDerivation (self: {
+ pname = "wai-test";
+ version = "1.3.0";
+ sha256 = "15y0aw5c4sh1mns4ss39l0wsxrd1b6yq6m5r638x23zl6y7d9j40";
+ buildDepends = [
+ blazeBuilder blazeBuilderConduit caseInsensitive conduit cookie
+ httpTypes HUnit text transformers wai
+ ];
+ meta = {
+ homepage = "http://www.yesodweb.com/book/wai";
+ description = "Unit test framework (built on HUnit) for WAI applications";
+ license = self.stdenv.lib.licenses.mit;
+ platforms = self.ghc.meta.platforms;
+ };
+})
diff --git a/pkgs/development/libraries/haskell/wai/default.nix b/pkgs/development/libraries/haskell/wai/default.nix
index a67da394a65..56421b213d5 100644
--- a/pkgs/development/libraries/haskell/wai/default.nix
+++ b/pkgs/development/libraries/haskell/wai/default.nix
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "wai";
- version = "1.3.0";
- sha256 = "08y0s7b5db5nyvxv0bvraj6ih7054h5n4lkwdlm3nkbm8s9k8hwv";
+ version = "1.3.0.1";
+ sha256 = "0z6byx71awhjb7fycz1ixsyzzlsrv1i69qwjrfzh9y5wnbchj9yl";
buildDepends = [
blazeBuilder conduit httpTypes network text transformers vault
];
diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix
index 30bbbef9a0b..56cdbd9adc1 100644
--- a/pkgs/development/libraries/haskell/warp/default.nix
+++ b/pkgs/development/libraries/haskell/warp/default.nix
@@ -1,16 +1,16 @@
{ cabal, blazeBuilder, blazeBuilderConduit, caseInsensitive
-, conduit, httpTypes, liftedBase, network, networkConduit
+, conduit, hashable, httpTypes, liftedBase, network, networkConduit
, simpleSendfile, transformers, unixCompat, void, wai
}:
cabal.mkDerivation (self: {
pname = "warp";
- version = "1.3.1";
- sha256 = "12f4v080v8jgm02swqbbgq9yvbajmbr8ja2p6ljc7bhf3rkpwplr";
+ version = "1.3.4.4";
+ sha256 = "0i6mjadw87f9c949wg9lcbld0yfvnrxn7bhapf71gk36sh7llxaj";
buildDepends = [
- blazeBuilder blazeBuilderConduit caseInsensitive conduit httpTypes
- liftedBase network networkConduit simpleSendfile transformers
- unixCompat void wai
+ blazeBuilder blazeBuilderConduit caseInsensitive conduit hashable
+ httpTypes liftedBase network networkConduit simpleSendfile
+ transformers unixCompat void wai
];
meta = {
homepage = "http://github.com/yesodweb/wai";
diff --git a/pkgs/development/libraries/haskell/word8/default.nix b/pkgs/development/libraries/haskell/word8/default.nix
new file mode 100644
index 00000000000..d86ef72d2cb
--- /dev/null
+++ b/pkgs/development/libraries/haskell/word8/default.nix
@@ -0,0 +1,12 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+ pname = "word8";
+ version = "0.0.2";
+ sha256 = "0ij8l5h9kj93srsizwxiss4jcgj0hy2gsskw88l58lgd2v4c9dnb";
+ meta = {
+ description = "Word8 library";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ };
+})
diff --git a/pkgs/development/libraries/haskell/xml-conduit/default.nix b/pkgs/development/libraries/haskell/xml-conduit/default.nix
index 3f2e6e6af4f..09c5a5563bc 100644
--- a/pkgs/development/libraries/haskell/xml-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/xml-conduit/default.nix
@@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "xml-conduit";
- version = "1.0.3.1";
- sha256 = "1000gbdwfp98s44kkp793lmqrdm046phwxcvlik20b2485ml8yrj";
+ version = "1.0.3.3";
+ sha256 = "0jw1r4vmcbxj8kgkdj4pgibihcdmbdj15g06i9p8mdklmmd7gqnz";
buildDepends = [
attoparsec attoparsecConduit blazeBuilder blazeBuilderConduit
blazeHtml blazeMarkup conduit dataDefault failure monadControl
diff --git a/pkgs/development/libraries/haskell/xml-hamlet/default.nix b/pkgs/development/libraries/haskell/xml-hamlet/default.nix
new file mode 100644
index 00000000000..41a5c710d6a
--- /dev/null
+++ b/pkgs/development/libraries/haskell/xml-hamlet/default.nix
@@ -0,0 +1,14 @@
+{ cabal, parsec, shakespeare, text, xmlConduit }:
+
+cabal.mkDerivation (self: {
+ pname = "xml-hamlet";
+ version = "0.4.0.3";
+ sha256 = "1923c2jg162jab01mcbpy52xs1pzxkrgny6sq8v0p758n8hjazwc";
+ buildDepends = [ parsec shakespeare text xmlConduit ];
+ meta = {
+ homepage = "http://www.yesodweb.com/";
+ description = "Hamlet-style quasiquoter for XML content";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ };
+})
diff --git a/pkgs/development/libraries/haskell/xmlhtml/default.nix b/pkgs/development/libraries/haskell/xmlhtml/default.nix
index 654da2e76b5..adbf68655ca 100644
--- a/pkgs/development/libraries/haskell/xmlhtml/default.nix
+++ b/pkgs/development/libraries/haskell/xmlhtml/default.nix
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "xmlhtml";
- version = "0.2.0.2";
- sha256 = "0dqlqx3cnrqap3ficdkmwm8661j8i7qknb8xhjqvfmnb9pwqdks2";
+ version = "0.2.0.3";
+ sha256 = "03bwsm3dazc01cwndlm92nr35a4fllsxx17rp72d2vnf1571a1vb";
buildDepends = [
blazeBuilder blazeHtml blazeMarkup parsec text unorderedContainers
];
diff --git a/pkgs/development/libraries/haskell/yaml/default.nix b/pkgs/development/libraries/haskell/yaml/default.nix
index 52460c8246b..0271f6874f3 100644
--- a/pkgs/development/libraries/haskell/yaml/default.nix
+++ b/pkgs/development/libraries/haskell/yaml/default.nix
@@ -4,15 +4,15 @@
cabal.mkDerivation (self: {
pname = "yaml";
- version = "0.8.0.2";
- sha256 = "14blcsylbf9wx4yw8fsk8ddjvg844x97xfc1h7r4ls9l9ar7k95j";
+ version = "0.8.1.1";
+ sha256 = "0n2m205f0jq8v4g84bw642vdqqr68m3jklv98rr21s8r2fyy7937";
buildDepends = [
aeson attoparsec conduit resourcet text transformers
unorderedContainers vector
];
meta = {
homepage = "http://github.com/snoyberg/yaml/";
- description = "Low-level binding to the libyaml C library";
+ description = "Support for parsing and rendering YAML documents";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
diff --git a/pkgs/development/libraries/haskell/yesod-auth/default.nix b/pkgs/development/libraries/haskell/yesod-auth/default.nix
index ac5c87d7613..712fd44fbf0 100644
--- a/pkgs/development/libraries/haskell/yesod-auth/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-auth/default.nix
@@ -7,8 +7,8 @@
cabal.mkDerivation (self: {
pname = "yesod-auth";
- version = "1.1.1.1";
- sha256 = "1ryq3jxcgb55ijjmcv0j234n9nay2ianifb59gz9akyv0sc3zcl9";
+ version = "1.1.1.6";
+ sha256 = "0xbr8q7rv73hsh90pdb5cl00pd4mx3q74q0dqampha0y2lpq6124";
buildDepends = [
aeson authenticate blazeHtml blazeMarkup hamlet httpConduit
liftedBase mimeMail persistent persistentTemplate pureMD5
diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix
index 5a6d6e1c41c..c7cd1466072 100644
--- a/pkgs/development/libraries/haskell/yesod-core/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-core/default.nix
@@ -9,8 +9,8 @@
cabal.mkDerivation (self: {
pname = "yesod-core";
- version = "1.1.1.2";
- sha256 = "1q0p4hnmd0mg3pqkydqcv61p3hrmnqnrsya005dyvxf320anya0y";
+ version = "1.1.5";
+ sha256 = "1mnmszka6fy5gps1y4bwpn0aq5vzxdxqyh2vrl7vii1lfl51yly7";
buildDepends = [
aeson blazeBuilder blazeHtml blazeMarkup caseInsensitive cereal
clientsession conduit cookie failure fastLogger hamlet httpTypes
diff --git a/pkgs/development/libraries/haskell/yesod-default/default.nix b/pkgs/development/libraries/haskell/yesod-default/default.nix
index c3dce8ca7d3..0ff1c202826 100644
--- a/pkgs/development/libraries/haskell/yesod-default/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-default/default.nix
@@ -1,15 +1,16 @@
-{ cabal, dataDefault, hamlet, networkConduit, shakespeareCss
+{ cabal, dataDefault, hamlet, networkConduit, safe, shakespeareCss
, shakespeareJs, text, transformers, unorderedContainers, wai
, waiExtra, warp, yaml, yesodCore
}:
cabal.mkDerivation (self: {
pname = "yesod-default";
- version = "1.1.0";
- sha256 = "124407a0in474l71jja04ds0xh84ac5i3jv62iswxlcp1y9f52bq";
+ version = "1.1.2";
+ sha256 = "0asz9daf7by0d8sx8zqjsbxbzbyy59bvrdkq4f533fbn0nm1bn38";
buildDepends = [
- dataDefault hamlet networkConduit shakespeareCss shakespeareJs text
- transformers unorderedContainers wai waiExtra warp yaml yesodCore
+ dataDefault hamlet networkConduit safe shakespeareCss shakespeareJs
+ text transformers unorderedContainers wai waiExtra warp yaml
+ yesodCore
];
meta = {
homepage = "http://www.yesodweb.com/";
diff --git a/pkgs/development/libraries/haskell/yesod-form/default.nix b/pkgs/development/libraries/haskell/yesod-form/default.nix
index 8f3cf37149f..787fa78f828 100644
--- a/pkgs/development/libraries/haskell/yesod-form/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-form/default.nix
@@ -1,4 +1,4 @@
-{ cabal, attoparsec, blazeBuilder, blazeHtml, blazeMarkup
+{ cabal, aeson, attoparsec, blazeBuilder, blazeHtml, blazeMarkup
, cryptoApi, dataDefault, emailValidate, hamlet, network
, persistent, shakespeareCss, shakespeareJs, text, time
, transformers, wai, xssSanitize, yesodCore, yesodPersistent
@@ -6,11 +6,11 @@
cabal.mkDerivation (self: {
pname = "yesod-form";
- version = "1.1.1.1";
- sha256 = "0239sbnpl022g53iwbg9pnphiyadxysdwrqz3f8spf6x3w2gs6vg";
+ version = "1.2.0";
+ sha256 = "1p5c75dcbhcc90chwzhsk5sk86x3i2ipz6krrqrkx0zx7ykbf94m";
buildDepends = [
- attoparsec blazeBuilder blazeHtml blazeMarkup cryptoApi dataDefault
- emailValidate hamlet network persistent shakespeareCss
+ aeson attoparsec blazeBuilder blazeHtml blazeMarkup cryptoApi
+ dataDefault emailValidate hamlet network persistent shakespeareCss
shakespeareJs text time transformers wai xssSanitize yesodCore
yesodPersistent
];
diff --git a/pkgs/development/libraries/haskell/yesod-json/default.nix b/pkgs/development/libraries/haskell/yesod-json/default.nix
index 4a2a2346a87..1c46d7977aa 100644
--- a/pkgs/development/libraries/haskell/yesod-json/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-json/default.nix
@@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = "yesod-json";
- version = "1.1.0";
- sha256 = "13dbajs51nyrvch13xz05h6jrnhc097s0iykw5z43x05a6xwj20n";
+ version = "1.1.2";
+ sha256 = "0vbjg038vgdwd5a4w7r5261xgvylzzk4gikk4285ns471x8n0vrf";
buildDepends = [
aeson attoparsecConduit blazeBuilder conduit safe shakespeareJs
text transformers vector wai waiExtra yesodCore yesodRoutes
diff --git a/pkgs/development/libraries/haskell/yesod-routes/default.nix b/pkgs/development/libraries/haskell/yesod-routes/default.nix
index 9a801d62df8..ec09a68e32c 100644
--- a/pkgs/development/libraries/haskell/yesod-routes/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-routes/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "yesod-routes";
- version = "1.1.0";
- sha256 = "0r0a3s1dngqp2vcq0cdsbqf1lsyhygj2x4a93csr2iyn244zgxnx";
+ version = "1.1.1.1";
+ sha256 = "10cy50dnhbhwi0yspq0x06gzqpmhkalqq1sww2wjpv13hp53pq3m";
buildDepends = [ pathPieces text vector ];
meta = {
homepage = "http://www.yesodweb.com/";
diff --git a/pkgs/development/libraries/haskell/yesod-static/default.nix b/pkgs/development/libraries/haskell/yesod-static/default.nix
index ddd0f24d9af..ada24ea3193 100644
--- a/pkgs/development/libraries/haskell/yesod-static/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-static/default.nix
@@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = "yesod-static";
- version = "1.1.0.1";
- sha256 = "1hlg32bhmhc5npd0bm317mssrddf7jzhwr0z3ns0dpiynz9mh0vy";
+ version = "1.1.1.1";
+ sha256 = "1wp3ijiwsai9npf6zl0bq3fi4rbh0qjy8bii3d178sariv7588js";
buildDepends = [
base64Bytestring cereal conduit cryptoConduit cryptohash fileEmbed
httpTypes systemFilepath text transformers unixCompat wai
diff --git a/pkgs/development/libraries/haskell/yesod-test/default.nix b/pkgs/development/libraries/haskell/yesod-test/default.nix
new file mode 100644
index 00000000000..bd0e3c17c86
--- /dev/null
+++ b/pkgs/development/libraries/haskell/yesod-test/default.nix
@@ -0,0 +1,22 @@
+{ cabal, attoparsec, blazeHtml, blazeMarkup, caseInsensitive, hspec
+, htmlConduit, httpTypes, HUnit, monadControl, network, persistent
+, poolConduit, text, transformers, wai, waiTest, xmlConduit
+, xmlTypes
+}:
+
+cabal.mkDerivation (self: {
+ pname = "yesod-test";
+ version = "0.3.1.1";
+ sha256 = "0p3490yw0xcc62vzjk2vq32vv2ij7mcs6h28szp7y04gn6xc5nbg";
+ buildDepends = [
+ attoparsec blazeHtml blazeMarkup caseInsensitive hspec htmlConduit
+ httpTypes HUnit monadControl network persistent poolConduit text
+ transformers wai waiTest xmlConduit xmlTypes
+ ];
+ meta = {
+ homepage = "http://www.yesodweb.com";
+ description = "integration testing for WAI/Yesod Applications";
+ license = self.stdenv.lib.licenses.mit;
+ platforms = self.ghc.meta.platforms;
+ };
+})
diff --git a/pkgs/development/libraries/haskell/yesod/default.nix b/pkgs/development/libraries/haskell/yesod/default.nix
index 46ebf6c8b85..7c592cb7efe 100644
--- a/pkgs/development/libraries/haskell/yesod/default.nix
+++ b/pkgs/development/libraries/haskell/yesod/default.nix
@@ -1,23 +1,30 @@
-{ cabal, attoparsec, blazeBuilder, blazeHtml, blazeMarkup, Cabal
-, filepath, hamlet, httpTypes, monadControl, parsec, shakespeareCss
-, shakespeareJs, shakespeareText, systemFileio, systemFilepath, tar
-, text, time, transformers, unixCompat, unorderedContainers, wai
-, waiExtra, warp, yaml, yesodAuth, yesodCore, yesodForm, yesodJson
-, yesodPersistent, zlib
+{ cabal, attoparsec, base64Bytestring, blazeBuilder, blazeHtml
+, blazeMarkup, Cabal, conduit, fileEmbed, filepath, fsnotify
+, ghcPaths, hamlet, httpConduit, httpReverseProxy, httpTypes
+, liftedBase, monadControl, network, optparseApplicative, parsec
+, projectTemplate, resourcet, shakespeare, shakespeareCss
+, shakespeareJs, shakespeareText, split, systemFileio
+, systemFilepath, tar, text, time, transformers, unixCompat
+, unorderedContainers, wai, waiExtra, warp, yaml, yesodAuth
+, yesodCore, yesodDefault, yesodForm, yesodJson, yesodPersistent
+, zlib
}:
cabal.mkDerivation (self: {
pname = "yesod";
- version = "1.1.0.3";
- sha256 = "07rj7dyicnklp6hs1m0kjj6xz983d1zryv2f3sqhf620bc2d70fx";
+ version = "1.1.4";
+ sha256 = "1na50j7cd89mxk7ss67xlj703spvkpzcwgp7qs1pn2x3xsm7vrm2";
isLibrary = true;
isExecutable = true;
buildDepends = [
- attoparsec blazeBuilder blazeHtml blazeMarkup Cabal filepath hamlet
- httpTypes monadControl parsec shakespeareCss shakespeareJs
- shakespeareText systemFileio systemFilepath tar text time
- transformers unixCompat unorderedContainers wai waiExtra warp yaml
- yesodAuth yesodCore yesodForm yesodJson yesodPersistent zlib
+ attoparsec base64Bytestring blazeBuilder blazeHtml blazeMarkup
+ Cabal conduit fileEmbed filepath fsnotify ghcPaths hamlet
+ httpConduit httpReverseProxy httpTypes liftedBase monadControl
+ network optparseApplicative parsec projectTemplate resourcet
+ shakespeare shakespeareCss shakespeareJs shakespeareText split
+ systemFileio systemFilepath tar text time transformers unixCompat
+ unorderedContainers wai waiExtra warp yaml yesodAuth yesodCore
+ yesodDefault yesodForm yesodJson yesodPersistent zlib
];
meta = {
homepage = "http://www.yesodweb.com/";
diff --git a/pkgs/development/libraries/haskell/yst/default.nix b/pkgs/development/libraries/haskell/yst/default.nix
index 6a94987ba91..5cb5fb6a209 100644
--- a/pkgs/development/libraries/haskell/yst/default.nix
+++ b/pkgs/development/libraries/haskell/yst/default.nix
@@ -1,16 +1,16 @@
-{ cabal, csv, filepath, HsSyck, HStringTemplate, pandoc, parsec
-, split, time, utf8String, xhtml
+{ cabal, csv, filepath, HDBC, HDBCSqlite3, HsSyck, HStringTemplate
+, pandoc, parsec, split, time, utf8String, xhtml
}:
cabal.mkDerivation (self: {
pname = "yst";
- version = "0.2.4.1";
- sha256 = "0y620p6kn1mky30fia63na5idppfjfmc828jcaa0ads08rmj5wgy";
+ version = "0.3.0.1";
+ sha256 = "17jp9vdbpp82wzsj8rhp5nh6fbmgm2xrclfnb7jl4gjwls7xggrv";
isLibrary = false;
isExecutable = true;
buildDepends = [
- csv filepath HsSyck HStringTemplate pandoc parsec split time
- utf8String xhtml
+ csv filepath HDBC HDBCSqlite3 HsSyck HStringTemplate pandoc parsec
+ split time utf8String xhtml
];
meta = {
homepage = "http://github.com/jgm/yst";
diff --git a/pkgs/development/libraries/haskell/zeromq3-haskell/default.nix b/pkgs/development/libraries/haskell/zeromq3-haskell/default.nix
new file mode 100644
index 00000000000..44b04397c3f
--- /dev/null
+++ b/pkgs/development/libraries/haskell/zeromq3-haskell/default.nix
@@ -0,0 +1,14 @@
+{ cabal, zeromq }:
+
+cabal.mkDerivation (self: {
+ pname = "zeromq3-haskell";
+ version = "0.1.4";
+ sha256 = "026b18ligbrfbg4x7vivk6r2gj9rj3vy6pm3h0s81571h6lk3dhx";
+ extraLibraries = [ zeromq ];
+ meta = {
+ homepage = "http://github.com/twittner/zeromq-haskell/";
+ description = "Bindings to ZeroMQ 3.x";
+ license = self.stdenv.lib.licenses.mit;
+ platforms = self.ghc.meta.platforms;
+ };
+})
diff --git a/pkgs/development/libraries/haskell/zip-archive/default.nix b/pkgs/development/libraries/haskell/zip-archive/default.nix
index 050d48280d2..5ee2377147e 100644
--- a/pkgs/development/libraries/haskell/zip-archive/default.nix
+++ b/pkgs/development/libraries/haskell/zip-archive/default.nix
@@ -1,12 +1,12 @@
-{ cabal, binary, digest, filepath, mtl, utf8String, zlib }:
+{ cabal, binary, digest, filepath, mtl, time, utf8String, zlib }:
cabal.mkDerivation (self: {
pname = "zip-archive";
- version = "0.1.1.8";
- sha256 = "0rq4jk1sxi6lrc7d7sh500lh83v2fxxrfh2gknqiyzxd3wh364y1";
+ version = "0.1.2.1";
+ sha256 = "1c0pjbrkfv44nbpz60b1c4xdbkdk8qaxlkfxl51rb2183gj1gkph";
isLibrary = true;
isExecutable = true;
- buildDepends = [ binary digest filepath mtl utf8String zlib ];
+ buildDepends = [ binary digest filepath mtl time utf8String zlib ];
meta = {
homepage = "http://github.com/jgm/zip-archive";
description = "Library for creating and modifying zip archives";
diff --git a/pkgs/development/libraries/haskell/zlib-bindings/default.nix b/pkgs/development/libraries/haskell/zlib-bindings/default.nix
index c78ca3f68ee..d0ffcecaaeb 100644
--- a/pkgs/development/libraries/haskell/zlib-bindings/default.nix
+++ b/pkgs/development/libraries/haskell/zlib-bindings/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "zlib-bindings";
- version = "0.1.1.1";
- sha256 = "1r502gskbm36smd5nj0f53ildv9rkm3k79zmwdmrskg6z1n7jmfh";
+ version = "0.1.1.2";
+ sha256 = "0p4713craq59vbyf3rr6kzv53rrfycbnlfs57i78fjrgwv6bd1ln";
buildDepends = [ zlib ];
meta = {
homepage = "http://github.com/snoyberg/zlib-bindings";
diff --git a/pkgs/development/libraries/haskell/zlib-conduit/default.nix b/pkgs/development/libraries/haskell/zlib-conduit/default.nix
index 728d2d202f1..89a22b6b889 100644
--- a/pkgs/development/libraries/haskell/zlib-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/zlib-conduit/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "zlib-conduit";
- version = "0.5.0.1";
- sha256 = "138wag9fjq3hx48nzr0nvvclcyjwcd0ykjbbgms2h9msmz9vflk5";
+ version = "0.5.0.2";
+ sha256 = "1jgj3x4z1901bm1618753hqyrjragzrpyhy9h02qj9kplqswh878";
buildDepends = [ conduit transformers void zlibBindings ];
meta = {
homepage = "http://github.com/snoyberg/conduit";
diff --git a/pkgs/development/libraries/haskell/zlib-enum/default.nix b/pkgs/development/libraries/haskell/zlib-enum/default.nix
index d4ec47410fc..f799194c0f6 100644
--- a/pkgs/development/libraries/haskell/zlib-enum/default.nix
+++ b/pkgs/development/libraries/haskell/zlib-enum/default.nix
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "zlib-enum";
- version = "0.2.2.1";
- sha256 = "02ava6h40bqfmby33683nxasfw5fmrgfvbx6kqgz1gqz5921gjx9";
+ version = "0.2.3";
+ sha256 = "0lr72h4wlclav0p0j5wwaxifq97lw7rh3612lva73fg45akl9di1";
isLibrary = true;
isExecutable = true;
buildDepends = [ enumerator transformers zlibBindings ];
diff --git a/pkgs/development/libraries/haskell/zlib/0.5.4.0.nix b/pkgs/development/libraries/haskell/zlib/0.5.4.0.nix
new file mode 100644
index 00000000000..abeed295e03
--- /dev/null
+++ b/pkgs/development/libraries/haskell/zlib/0.5.4.0.nix
@@ -0,0 +1,14 @@
+{ cabal, zlib }:
+
+cabal.mkDerivation (self: {
+ pname = "zlib";
+ version = "0.5.4.0";
+ sha256 = "18hc4wr8brzbl9qapjbjyb9kyqrznv2xbw7rv1a6k8i3392ilxv1";
+ extraLibraries = [ zlib ];
+ meta = {
+ description = "Compression and decompression in the gzip and zlib formats";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ maintainers = [ self.stdenv.lib.maintainers.andres ];
+ };
+})
diff --git a/pkgs/development/libraries/json-glib/default.nix b/pkgs/development/libraries/json-glib/default.nix
index ace271b7a35..ad3af7778ff 100644
--- a/pkgs/development/libraries/json-glib/default.nix
+++ b/pkgs/development/libraries/json-glib/default.nix
@@ -5,8 +5,8 @@ stdenv.mkDerivation rec {
src = fetchurl_gnome {
project = "json-glib";
- major = "0"; minor = "14"; patchlevel = "0"; extension = "xz";
- sha256 = "0mpw996cyidspjwns281l5haj9i8azpkfpl4jf98lh3kcqcr07l2";
+ major = "0"; minor = "14"; patchlevel = "2"; extension = "xz";
+ sha256 = "19wlpsbdnm3mq2a6yjpzj0cwrmlkarp2m5x6g63b0r2n7vxaa5mq";
};
propagatedBuildInputs = [ glib ];
diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix
index fc554dcd875..64d769fab75 100644
--- a/pkgs/development/libraries/libarchive/default.nix
+++ b/pkgs/development/libraries/libarchive/default.nix
@@ -1,21 +1,29 @@
-{ fetchurl, stdenv, acl, openssl, libxml2, attr, zlib, bzip2, e2fsprogs
+{ fetchurl, stdenv, acl, openssl, libxml2, attr, zlib, bzip2, e2fsprogs, xz
, sharutils }:
stdenv.mkDerivation rec {
- name = "libarchive-2.8.3";
+ name = "libarchive-3.0.4";
src = fetchurl {
- url = "http://libarchive.googlecode.com/files/${name}.tar.gz";
- sha256 = "16095d15334b3c8dbb02db5af3d415f12c1c3bdd4eb43af7bbc36ab7572c0b7a";
+ url = "https://github.com/downloads/libarchive/libarchive/${name}.tar.gz";
+ sha256 = "76e8d7c7b100ec4071e48c1b7d3f3ea1d22b39db3e45b7189f75b5ff4df90fac";
};
- propagatedBuildInputs = [ libxml2 zlib bzip2 openssl ] ++
+ propagatedBuildInputs = [ libxml2 zlib bzip2 openssl xz ] ++
stdenv.lib.optionals stdenv.isLinux [ e2fsprogs attr acl ];
buildInputs = [ sharutils ];
meta = {
- description = "A library for reading and writing streaming archives";
- homepage = http://people.freebsd.org/~kientzle/libarchive;
+ description = "Multi-format archive and compression library";
+ longDescription = ''
+ This library has code for detecting and reading many archive formats and
+ compressions formats including (but not limited to) tar, shar, cpio, zip, and
+ compressed with gzip, bzip2, lzma, xz, ..
+ '';
+ homepage = http://libarchive.github.com/;
+ license = stdenv.lib.licenses.bsd3;
+ platforms = with stdenv.lib.platforms; all;
+ maintainers = with stdenv.lib.maintainers; [ jcumming ];
};
}
diff --git a/pkgs/development/libraries/libassuan/default.nix b/pkgs/development/libraries/libassuan/default.nix
index 362ecd403d2..f93a44c2e1d 100644
--- a/pkgs/development/libraries/libassuan/default.nix
+++ b/pkgs/development/libraries/libassuan/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "06xckkvxxlx7cj77803m8x58gxksap4k8yhspc5cqsy7fhinimds";
};
- propagatedBuildInputs = [ pth libgpgerror ];
+ propagatedBuildInputs = [ libgpgerror pth ];
doCheck = true;
diff --git a/pkgs/development/libraries/libbluray/default.nix b/pkgs/development/libraries/libbluray/default.nix
index 03bbcc933f4..b0252617d7d 100644
--- a/pkgs/development/libraries/libbluray/default.nix
+++ b/pkgs/development/libraries/libbluray/default.nix
@@ -19,7 +19,8 @@ stdenv.mkDerivation {
sha256 = "551b623e76c2dba44b5490fb42ccdc491b28cd42841de28237b8edbed0f0711c";
};
- buildInputs = [autoconf automake libtool] ++ stdenv.lib.optionals withAACS [jdk ant libaacs];
+ buildNativeInputs = [autoconf automake libtool];
+ buildInputs = stdenv.lib.optionals withAACS [jdk ant libaacs];
NIX_LDFLAGS = stdenv.lib.optionalString withAACS "-laacs";
preConfigure = "./bootstrap";
diff --git a/pkgs/development/libraries/libc++/default.nix b/pkgs/development/libraries/libc++/default.nix
new file mode 100644
index 00000000000..bed95311915
--- /dev/null
+++ b/pkgs/development/libraries/libc++/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchsvn, cmake }:
+
+let rev = "165151"; in
+
+stdenv.mkDerivation {
+ name = "libc++-pre${rev}";
+
+ src = fetchsvn {
+ url = "http://llvm.org/svn/llvm-project/libcxx/trunk";
+ inherit rev;
+ sha256 = "00l8xx5nc3cjlmln7c1sy1i4v844has9kbfxrsziwkalzbgwaslz";
+ };
+
+ buildInputs = [ cmake ];
+
+ cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ];
+
+ enableParallelBuilding = true;
+
+ meta = {
+ homepage = http://libcxx.llvm.org/;
+ description = "A new implementation of the C++ standard library, targeting C++11";
+ license = "BSD";
+ maintainers = stdenv.lib.maintainers.shlevy;
+ platforms = stdenv.lib.platforms.all;
+ };
+}
+
diff --git a/pkgs/development/libraries/libdiscid/default.nix b/pkgs/development/libraries/libdiscid/default.nix
index bd39ea9464c..3ee43ba3bee 100644
--- a/pkgs/development/libraries/libdiscid/default.nix
+++ b/pkgs/development/libraries/libdiscid/default.nix
@@ -1,8 +1,9 @@
-{ stdenv, fetchurl, cmake }:
+{ stdenv, fetchurl, cmake, pkgconfig }:
stdenv.mkDerivation rec {
name = "libdiscid-0.2.2";
+ buildNativeInputs = [ pkgconfig ];
buildInputs = [ cmake ];
src = fetchurl {
@@ -10,6 +11,13 @@ stdenv.mkDerivation rec {
sha256 = "00l4ln9rk0vqf67iccwqrgc9qx1al92i05zylh85kd1zn9d5sjwp";
};
+ # developer forgot to update his version number
+ # this is propagated to pkg-config
+ preConfigure = ''
+ substituteInPlace "CMakeLists.txt" \
+ --replace "PROJECT_VERSION 0.1.1" "PROJECT_VERSION 0.2.2"
+ '';
+
meta = {
description = "A C library for creating MusicBrainz DiscIDs from audio CDs";
homepage = http://musicbrainz.org/doc/libdiscid;
diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix
index a6b39e170bd..3a1e101aa43 100644
--- a/pkgs/development/libraries/libdrm/default.nix
+++ b/pkgs/development/libraries/libdrm/default.nix
@@ -1,20 +1,20 @@
-{stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, cairo, udev}:
+{ stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, udev }:
stdenv.mkDerivation rec {
- name = "libdrm-2.4.29";
+ name = "libdrm-2.4.33";
src = fetchurl {
url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2";
- sha256 = "0bj5ihmnzpbbgdrvp5f8bgsk0k19haixr893449pjd4k7v4jshz2";
+ sha256 = "1slgi61n4dlsfli47ql354fd1ppj7n40jd94wvnsdqx0mna9syrd";
};
buildNativeInputs = [ pkgconfig ];
- buildInputs = [ libpthreadstubs libpciaccess cairo udev ];
+ buildInputs = [ libpthreadstubs libpciaccess udev ];
patches = stdenv.lib.optional stdenv.isDarwin ./libdrm-apple.patch;
preConfigure = stdenv.lib.optionalString stdenv.isDarwin
- "echo : \\\${ac_cv_func_clock_gettime=\'yes\'} > config.cache";
+ "echo : \\\${ac_cv_func_clock_gettime=\'yes\'} > config.cache";
configureFlags = [ "--enable-nouveau-experimental-api"
"--enable-radeon-experimental-api"
diff --git a/pkgs/development/libraries/libgphoto2/default.nix b/pkgs/development/libraries/libgphoto2/default.nix
index 16001e689dd..b55da62c9fb 100644
--- a/pkgs/development/libraries/libgphoto2/default.nix
+++ b/pkgs/development/libraries/libgphoto2/default.nix
@@ -1,11 +1,11 @@
{stdenv, fetchurl, pkgconfig, libusb, libtool, libexif, libjpeg, gettext}:
stdenv.mkDerivation rec {
- name = "libgphoto2-2.4.11";
+ name = "libgphoto2-2.4.14";
src = fetchurl {
url = "mirror://sourceforge/gphoto/${name}.tar.bz2";
- sha256 = "08y40mqy714cg0160lny13z9kyxm63m3ksg8hljy5pspxanbn5ji";
+ sha256 = "14h20s0kwqr1nsj90dgjwzs0r3h7z1cpmnivrikd0rrg4m2jvcsr";
};
buildNativeInputs = [ pkgconfig gettext ];
@@ -17,6 +17,14 @@ stdenv.mkDerivation rec {
meta = {
homepage = http://www.gphoto.org/proj/libgphoto2/;
description = "A library for accessing digital cameras";
- license = "LGPL 2.1";
+ longDescription = ''
+ This is the library backend for gphoto2. It contains the code for PTP,
+ MTP, and other vendor specific protocols for controlling and transferring data
+ from digital cameras.
+ '';
+ # XXX: the homepage claims LGPL, but several src files are lgpl21Plus
+ license = stdenv.lib.licenses.lgpl21Plus;
+ platforms = with stdenv.lib.platforms; unix;
+ maintainers = with stdenv.lib.maintainers; [ jcumming ];
};
}
diff --git a/pkgs/development/libraries/libgsf/default.nix b/pkgs/development/libraries/libgsf/default.nix
index 3941fd4d694..0acd4a77b46 100644
--- a/pkgs/development/libraries/libgsf/default.nix
+++ b/pkgs/development/libraries/libgsf/default.nix
@@ -7,11 +7,11 @@ assert gnomeSupport -> gdk_pixbuf != null && gnome_vfs != null && libbonobo != n
&& glib != null;
stdenv.mkDerivation rec {
- name = "libgsf-1.14.22";
+ name = "libgsf-1.14.23";
src = fetchurl {
- url = mirror://gnome/sources/libgsf/1.14/libgsf-1.14.22.tar.xz;
- sha256 = "0gvq1gbbcl078s3kgdc508jp7p3a3ps34fj4pf8vsamprbikpwm5";
+ url = "mirror://gnome/sources/libgsf/1.14/${name}.tar.xz";
+ sha256 = "05zvaazf0d584nfirwsz7889lbsl4v781hslv3kda6akiwbwdhdz";
};
buildNativeInputs = [ intltool pkgconfig ];
@@ -24,6 +24,8 @@ stdenv.mkDerivation rec {
doCheck = true;
+ patches = [ ./syscall-name-clash.patch ];
+
meta = {
homepage = http://www.gnome.org/projects/libgsf;
license = "LGPLv2";
diff --git a/pkgs/development/libraries/libgsf/syscall-name-clash.patch b/pkgs/development/libraries/libgsf/syscall-name-clash.patch
new file mode 100644
index 00000000000..01543ade4fd
--- /dev/null
+++ b/pkgs/development/libraries/libgsf/syscall-name-clash.patch
@@ -0,0 +1,120 @@
+diff -Naur libgsf-1.14.23-orig/tests/test-cp-msole.c libgsf-1.14.23/tests/test-cp-msole.c
+--- libgsf-1.14.23-orig/tests/test-cp-msole.c 2009-05-18 21:55:48.000000000 -0400
++++ libgsf-1.14.23/tests/test-cp-msole.c 2012-07-15 03:52:03.858382670 -0400
+@@ -34,7 +34,7 @@
+ static void clone_dir (GsfInfile *in, GsfOutfile *out);
+
+ static void
+-clone (GsfInput *input, GsfOutput *output)
++clone_is_a_stupid_name_for_a_function_compiled_on_linux (GsfInput *input, GsfOutput *output)
+ {
+ if (gsf_input_size (input) > 0) {
+ guint8 const *data;
+@@ -87,7 +87,7 @@
+ gsf_infile_name_by_index (in, i),
+ is_dir);
+
+- clone (new_input, new_output);
++ clone_is_a_stupid_name_for_a_function_compiled_on_linux (new_input, new_output);
+ }
+ /* An observation: when you think about the explanation to is_dir
+ * above, you realize that clone_dir is called even for regular files.
+@@ -137,7 +137,7 @@
+
+ outfile = gsf_outfile_msole_new (output);
+ g_object_unref (G_OBJECT (output));
+- clone (GSF_INPUT (infile), GSF_OUTPUT (outfile));
++ clone_is_a_stupid_name_for_a_function_compiled_on_linux (GSF_INPUT (infile), GSF_OUTPUT (outfile));
+
+ return 0;
+ }
+diff -Naur libgsf-1.14.23-orig/tests/test-cp-zip.c libgsf-1.14.23/tests/test-cp-zip.c
+--- libgsf-1.14.23-orig/tests/test-cp-zip.c 2009-05-18 21:55:48.000000000 -0400
++++ libgsf-1.14.23/tests/test-cp-zip.c 2012-07-15 03:54:53.719198559 -0400
+@@ -32,7 +32,7 @@
+ #include
+
+ static void
+-clone (GsfInfile *in, GsfOutfile *out)
++clone_is_a_stupid_name_for_a_function_compiled_on_linux (GsfInfile *in, GsfOutfile *out)
+ {
+ GsfInput *input = GSF_INPUT (in);
+ GsfOutput *output = GSF_OUTPUT (out);
+@@ -85,7 +85,7 @@
+ output = gsf_outfile_new_child_full (out, name, is_dir,
+ "compression-level", level,
+ NULL);
+- clone (GSF_INFILE (input), GSF_OUTFILE (output));
++ clone_is_a_stupid_name_for_a_function_compiled_on_linux (GSF_INFILE (input), GSF_OUTFILE (output));
+ }
+ }
+ gsf_output_close (GSF_OUTPUT (out));
+@@ -137,7 +137,7 @@
+
+ outfile = gsf_outfile_zip_new (output, &err);
+ g_object_unref (G_OBJECT (output));
+- clone (infile, outfile);
++ clone_is_a_stupid_name_for_a_function_compiled_on_linux (infile, outfile);
+
+ return 0;
+ }
+diff -Naur libgsf-1.14.23-orig/tests/test-dump-msole.c libgsf-1.14.23/tests/test-dump-msole.c
+--- libgsf-1.14.23-orig/tests/test-dump-msole.c 2011-12-07 18:05:18.000000000 -0500
++++ libgsf-1.14.23/tests/test-dump-msole.c 2012-07-15 03:56:15.581110536 -0400
+@@ -32,7 +32,7 @@
+ #include
+
+ static void
+-clone (GsfInput *input, GsfOutput *output)
++clone_is_a_stupid_name_for_a_function_compiled_on_linux (GsfInput *input, GsfOutput *output)
+ {
+ guint8 const *data;
+ size_t len;
+@@ -72,7 +72,7 @@
+ dst = gsf_outfile_new_child (out,
+ gsf_infile_name_by_index (in, i),
+ is_dir);
+- clone (src, dst);
++ clone_is_a_stupid_name_for_a_function_compiled_on_linux (src, dst);
+ }
+ }
+
+@@ -118,7 +118,7 @@
+ g_error_free (err);
+ return 1;
+ }
+- clone (GSF_INPUT (infile), GSF_OUTPUT (outfile));
++ clone_is_a_stupid_name_for_a_function_compiled_on_linux (GSF_INPUT (infile), GSF_OUTPUT (outfile));
+
+ return 0;
+ }
+diff -Naur libgsf-1.14.23-orig/tests/test-restore-msole.c libgsf-1.14.23/tests/test-restore-msole.c
+--- libgsf-1.14.23-orig/tests/test-restore-msole.c 2011-12-07 18:05:18.000000000 -0500
++++ libgsf-1.14.23/tests/test-restore-msole.c 2012-07-15 03:57:39.972017963 -0400
+@@ -32,7 +32,7 @@
+ #include
+
+ static void
+-clone (GsfInput *input, GsfOutput *output)
++clone_is_a_stupid_name_for_a_function_compiled_on_linux (GsfInput *input, GsfOutput *output)
+ {
+ guint8 const *data;
+ size_t len;
+@@ -72,7 +72,7 @@
+ dst = gsf_outfile_new_child (out,
+ gsf_infile_name_by_index (in, i),
+ is_dir);
+- clone (src, dst);
++ clone_is_a_stupid_name_for_a_function_compiled_on_linux (src, dst);
+ }
+ }
+
+@@ -111,7 +111,7 @@
+
+ outfile = gsf_outfile_msole_new (output);
+ g_object_unref (G_OBJECT (output));
+- clone (GSF_INPUT (infile), GSF_OUTPUT (outfile));
++ clone_is_a_stupid_name_for_a_function_compiled_on_linux (GSF_INPUT (infile), GSF_OUTPUT (outfile));
+
+ return 0;
+ }
diff --git a/pkgs/development/libraries/libicns/default.nix b/pkgs/development/libraries/libicns/default.nix
index 0e582c903c5..970a7a87497 100644
--- a/pkgs/development/libraries/libicns/default.nix
+++ b/pkgs/development/libraries/libicns/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, libpng, jasper }:
-stdenv.mkDerivation {
- name = "libicns-0.8.0";
+stdenv.mkDerivation rec {
+ name = "libicns-0.8.1";
src = fetchurl {
- url = mirror://sourceforge/icns/libicns-0.8.0.tar.gz;
- sha256 = "0jh67nm07jr1nfkfjid3jjw7fyw5hvj6a2fqan1bhg6gyr2hswla";
+ url = "mirror://sourceforge/icns/${name}.tar.gz";
+ sha256 = "1hjm8lwap7bjyyxsyi94fh5817xzqhk4kb5y0b7mb6675xw10prk";
};
buildInputs = [ libpng jasper ];
diff --git a/pkgs/development/libraries/libinfinity/default.nix b/pkgs/development/libraries/libinfinity/default.nix
index 3d34f6303e3..b8a815e4a6f 100644
--- a/pkgs/development/libraries/libinfinity/default.nix
+++ b/pkgs/development/libraries/libinfinity/default.nix
@@ -3,7 +3,7 @@
, documentation ? false # build documentation
, avahiSupport ? false # build support for Avahi in libinfinity
, stdenv, fetchurl, pkgconfig, glib, libxml2, gnutls, gsasl
-, gtk ? null, gtkdoc ? null, avahi ? null, libdaemon ? null }:
+, gtk ? null, gtkdoc ? null, avahi ? null, libdaemon ? null, libidn, gss }:
let
edf = flag: feature: (if flag then "--with-" else "--without-") + feature;
@@ -11,13 +11,13 @@ let
in stdenv.mkDerivation rec {
- name = "libinfinity-0.4.1";
+ name = "libinfinity-0.5.3";
src = fetchurl {
url = "http://releases.0x539.de/libinfinity/${name}.tar.gz";
- sha256 = "1vdyj6xvwkisrc222i84mq93gasywad4i0ismafdjq2wapxn30r6";
+ sha256 = "04qa3ky2skhc9b5f9i9sc8hci3ykklqznmgy616yzs3n22bmax9j";
};
- buildInputs = [ pkgconfig glib libxml2 gsasl ]
+ buildInputs = [ pkgconfig glib libxml2 gsasl libidn gss ]
++ optional gtkWidgets gtk
++ optional documentation gtkdoc
++ optional avahiSupport avahi
diff --git a/pkgs/development/libraries/libmnl/default.nix b/pkgs/development/libraries/libmnl/default.nix
new file mode 100644
index 00000000000..fb6eacc366b
--- /dev/null
+++ b/pkgs/development/libraries/libmnl/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+ name = "libmnl-1.0.3";
+
+ src = fetchurl {
+ url = "http://netfilter.org/projects/libmnl/files/${name}.tar.bz2";
+ sha1 = "c27e25f67c6422ebf893fc3a844af8085a1c5b63";
+ };
+
+ meta = {
+ description = "minimalistic user-space library oriented to Netlink developers";
+ longDescription = ''
+ libmnl is a minimalistic user-space library oriented to Netlink developers.
+ There are a lot of common tasks in parsing, validating, constructing of both the Netlink
+ header and TLVs that are repetitive and easy to get wrong.
+ This library aims to provide simple helpers that allows you to re-use code and to avoid
+ re-inventing the wheel.
+ '';
+ homepage = http://netfilter.org/projects/libmnl/index.html;
+ license = "GPLv2+";
+
+ platforms = stdenv.lib.platforms.linux;
+ };
+}
diff --git a/pkgs/development/libraries/libnetfilter_conntrack/default.nix b/pkgs/development/libraries/libnetfilter_conntrack/default.nix
new file mode 100644
index 00000000000..99624911077
--- /dev/null
+++ b/pkgs/development/libraries/libnetfilter_conntrack/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchurl, pkgconfig, libnfnetlink, libmnl }:
+
+stdenv.mkDerivation rec {
+ name = "libnetfilter_conntrack-1.0.2";
+
+ src = fetchurl {
+ url = "http://netfilter.org/projects/libnetfilter_conntrack/files/${name}.tar.bz2";
+ md5 = "447114b5d61bb9a9617ead3217c3d3ff";
+ };
+
+ buildInputs = [ pkgconfig libnfnetlink libmnl ];
+
+ meta = {
+ description = "userspace library providing an API to the in-kernel connection tracking state table.";
+ longDescription = ''
+ libnetfilter_conntrack is a userspace library providing a programming interface (API) to the
+ in-kernel connection tracking state table. The library libnetfilter_conntrack has been
+ previously known as libnfnetlink_conntrack and libctnetlink. This library is currently used
+ by conntrack-tools among many other applications
+ '';
+ homepage = http://netfilter.org/projects/libnetfilter_conntrack/;
+ license = "GPLv2+";
+
+ platforms = stdenv.lib.platforms.linux;
+ };
+}
diff --git a/pkgs/development/libraries/libnfnetlink/default.nix b/pkgs/development/libraries/libnfnetlink/default.nix
new file mode 100644
index 00000000000..07a182dff10
--- /dev/null
+++ b/pkgs/development/libraries/libnfnetlink/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+ name = "libnfnetlink-1.0.1";
+
+ src = fetchurl {
+ url = "http://www.netfilter.org/projects/libnfnetlink/files/${name}.tar.bz2";
+ md5 = "98927583d2016a9fb1936fed992e2c5e";
+ };
+
+ meta = {
+ description = "low-level library for netfilter related kernel/userspace communication.";
+ longDescription = ''
+ libnfnetlink is the low-level library for netfilter related kernel/userspace communication.
+ It provides a generic messaging infrastructure for in-kernel netfilter subsystems
+ (such as nfnetlink_log, nfnetlink_queue, nfnetlink_conntrack) and their respective users
+ and/or management tools in userspace.
+
+ This library is not meant as a public API for application developers.
+ It is only used by other netfilter.org projects, like the aforementioned ones.
+ '';
+ homepage = http://www.netfilter.org/projects/libnfnetlink/index.html;
+ license = "GPLv2";
+
+ platforms = stdenv.lib.platforms.linux;
+ };
+}
diff --git a/pkgs/development/libraries/libopus/default.nix b/pkgs/development/libraries/libopus/default.nix
new file mode 100644
index 00000000000..d4c90ee33fb
--- /dev/null
+++ b/pkgs/development/libraries/libopus/default.nix
@@ -0,0 +1,18 @@
+{ stdenv, fetchurl, fixedPoint ? false }:
+
+stdenv.mkDerivation rec {
+ name = "libopus-1.0.1";
+
+ src = fetchurl {
+ url = "http://downloads.xiph.org/releases/opus/opus-1.0.1.tar.gz";
+ sha256 = "1vs133z6c03xi1a7b8bkqxlb6ipwchawwb52z1lgvh1amwy5ryl0";
+ };
+
+ configureFlags = stdenv.lib.optionalString fixedPoint "--enable-fixed-point";
+
+ meta = {
+ description = "Open, royalty-free, highly versatile audio codec";
+ license = "BSD";
+ homepage = http://www.opus-codec.org/;
+ };
+}
diff --git a/pkgs/development/libraries/libpng/12.nix b/pkgs/development/libraries/libpng/12.nix
index 5d6e439484d..ebdb9e756aa 100644
--- a/pkgs/development/libraries/libpng/12.nix
+++ b/pkgs/development/libraries/libpng/12.nix
@@ -3,11 +3,11 @@
assert zlib != null;
stdenv.mkDerivation rec {
- name = "libpng-1.2.47";
+ name = "libpng-1.2.50";
src = fetchurl {
url = "mirror://sourceforge/libpng/${name}.tar.xz";
- sha256 = "1lai3dnzw81y40jr17bdj1qh08hwv9mc1v74yybl7jdx2hiilsvx";
+ sha256 = "1rz8v3cvy1zzpagxn91lj8swb9vf75rz3yyi18v7zb4jihgzh927";
};
propagatedBuildInputs = [ zlib ];
diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix
index a06e8e12543..ce23cf48587 100644
--- a/pkgs/development/libraries/libpng/default.nix
+++ b/pkgs/development/libraries/libpng/default.nix
@@ -3,11 +3,11 @@
assert zlib != null;
stdenv.mkDerivation rec {
- name = "libpng-1.5.10";
+ name = "libpng-1.5.13";
src = fetchurl {
url = "mirror://sourceforge/libpng/${name}.tar.xz";
- sha256 = "0pb096zn6iyza28js4j7krvcw23b979igfi315aqmvx622bw6jfx";
+ sha256 = "1vks4mqv4140b10kp53qrywsx9m4xan5ibwsrlmf42ni075zjhxq";
};
propagatedBuildInputs = [ zlib ];
diff --git a/pkgs/development/libraries/libraw1394/default.nix b/pkgs/development/libraries/libraw1394/default.nix
index 2ca4d1bd090..81cac5be709 100644
--- a/pkgs/development/libraries/libraw1394/default.nix
+++ b/pkgs/development/libraries/libraw1394/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "libraw1394-2.0.8";
+ name = "libraw1394-2.1.0";
src = fetchurl {
url = "mirror://kernel/linux/libs/ieee1394/${name}.tar.gz";
- sha256 = "0cwd8xn7wsm7nddbz7xgynxcjb1m4v2vjw1ky4dd6r5cv454hslk";
+ sha256 = "0w5sw06p51wfq2ahgql93ljkkp3hqprifzcxq8dq71c8zcbgyg58";
};
meta = {
diff --git a/pkgs/development/libraries/libre/default.nix b/pkgs/development/libraries/libre/default.nix
new file mode 100644
index 00000000000..cc9139d664e
--- /dev/null
+++ b/pkgs/development/libraries/libre/default.nix
@@ -0,0 +1,23 @@
+{stdenv, fetchurl, zlib, openssl}:
+stdenv.mkDerivation rec {
+ version = "0.4.2";
+ name = "libre-${version}";
+ src=fetchurl {
+ url = "http://www.creytiv.com/pub/re-${version}.tar.gz";
+ sha256 = "1c99ygs46qhd4a0ardxhdyjaw5p8clhzmsm8jydqxnmbakwy518m";
+ };
+ buildInputs = [zlib openssl];
+ makeFlags = [
+ "USE_ZLIB=1" "USE_OPENSSL=1"
+ ''PREFIX=$(out)''
+ ]
+ ++ stdenv.lib.optional (stdenv.gcc.gcc != null) "SYSROOT_ALT=${stdenv.gcc.gcc}"
+ ++ stdenv.lib.optional (stdenv.gcc.libc != null) "SYSROOT=${stdenv.gcc.libc}"
+ ;
+ meta = {
+ homepage = "http://www.creytiv.com/re.html";
+ platforms = with stdenv.lib.platforms; linux;
+ maintainers = with stdenv.lib.maintainers; [raskin];
+ license = with stdenv.lib.licenses; bsd3;
+ };
+}
diff --git a/pkgs/development/libraries/librem/default.nix b/pkgs/development/libraries/librem/default.nix
new file mode 100644
index 00000000000..04f3cc97bf3
--- /dev/null
+++ b/pkgs/development/libraries/librem/default.nix
@@ -0,0 +1,24 @@
+{stdenv, fetchurl, zlib, openssl, libre}:
+stdenv.mkDerivation rec {
+ version = "0.4.2";
+ name = "librem-${version}";
+ src=fetchurl {
+ url = "http://www.creytiv.com/pub/rem-${version}.tar.gz";
+ sha256 = "55c66118e3026c5ed42d8b9e0c668149baefe83f1aa76394cddba2d72f45d5c7";
+ };
+ buildInputs = [zlib openssl libre];
+ makeFlags = [
+ "LIBRE_MK=${libre}/share/re/re.mk"
+ "LIBRE_INC=${libre}/include/re"
+ ''PREFIX=$(out)''
+ ]
+ ++ stdenv.lib.optional (stdenv.gcc.gcc != null) "SYSROOT_ALT=${stdenv.gcc.gcc}"
+ ++ stdenv.lib.optional (stdenv.gcc.libc != null) "SYSROOT=${stdenv.gcc.libc}"
+ ;
+ meta = {
+ homepage = "http://www.creytiv.com/rem.html";
+ platforms = with stdenv.lib.platforms; linux;
+ maintainers = with stdenv.lib.maintainers; [raskin];
+ license = with stdenv.lib.licenses; bsd3;
+ };
+}
diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix
index 86b818cd5a9..3f84a69e3f4 100644
--- a/pkgs/development/libraries/librsvg/default.nix
+++ b/pkgs/development/libraries/librsvg/default.nix
@@ -11,6 +11,19 @@ stdenv.mkDerivation {
propagatedBuildInputs = [ glib gtk ];
buildNativeInputs = [ pkgconfig ];
- # It tries to install the loader to $gdk_pixbuf
- configureFlags = "--disable-pixbuf-loader";
+ # It wants to add loaders and update the loaders.cache in gdk-pixbuf
+ # Patching the Makefiles to it creates rsvg specific loaders and the
+ # relevant loader.cache here.
+ # The loaders.cache can be used by setting GDK_PIXBUF_MODULE_FILE to
+ # point to this file in a wrapper.
+ postConfigure = ''
+ GDK_PIXBUF=$out/lib/gdk-pixbuf
+ mkdir -p $GDK_PIXBUF/loaders
+ sed -e "s#gdk_pixbuf_moduledir = .*#gdk_pixbuf_moduledir = $GDK_PIXBUF/loaders#" \
+ -i gdk-pixbuf-loader/Makefile
+ sed -e "s#gdk_pixbuf_cache_file = .*#gdk_pixbuf_cache_file = $GDK_PIXBUF/loaders.cache#" \
+ -i gdk-pixbuf-loader/Makefile
+ sed -e "s#\$(GDK_PIXBUF_QUERYLOADERS)#GDK_PIXBUF_MODULEDIR=$GDK_PIXBUF/loaders \$(GDK_PIXBUF_QUERYLOADERS)#" \
+ -i gdk-pixbuf-loader/Makefile
+ '';
}
diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix
index 861f41cb7a4..87aaafabcc4 100644
--- a/pkgs/development/libraries/libsoup/default.nix
+++ b/pkgs/development/libraries/libsoup/default.nix
@@ -2,11 +2,11 @@
, gnomeSupport ? true, libgnome_keyring, sqlite, glib_networking }:
stdenv.mkDerivation {
- name = "libsoup-2.36.1";
+ name = "libsoup-2.38.1";
src = fetchurl {
- url = mirror://gnome/sources/libsoup/2.36/libsoup-2.36.1.tar.xz;
- sha256 = "0r8zkr0a328jkww4dv9z1q691rw59nh4lf5f5pzzr9szzw3j8wkk";
+ url = mirror://gnome/sources/libsoup/2.38/libsoup-2.38.1.tar.xz;
+ sha256 = "16iza4y8pmc4sn90iid88fgminvgcqypy3s2qnmzkzm5qwzr5f3i";
};
diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix
index d170c2fd231..ba5966d13d4 100644
--- a/pkgs/development/libraries/libtiff/default.nix
+++ b/pkgs/development/libraries/libtiff/default.nix
@@ -1,18 +1,22 @@
{ stdenv, fetchurl, zlib, libjpeg }:
-stdenv.mkDerivation {
- name = "libtiff-3.9.4";
-
+let version = "3.9.7"; in
+
+stdenv.mkDerivation rec {
+ name = "libtiff-${version}";
+
src = fetchurl {
urls =
- [ ftp://ftp.remotesensing.org/pub/libtiff/tiff-3.9.4.tar.gz
- http://download.osgeo.org/libtiff/tiff-3.9.4.tar.gz
+ [ "ftp://ftp.remotesensing.org/pub/libtiff/tiff-${version}.tar.gz"
+ "http://download.osgeo.org/libtiff/tiff-${version}.tar.gz"
];
- sha256 = "19hxd773yxcs4lxlc3zfdkz5aiv705vj2jvy5srpqkxpbw3nvdv7";
+ sha256 = "0spg1hr5rsrmg88sfzb05qnf0haspq7r5hvdkxg5zib1rva4vmpm";
};
-
+
propagatedBuildInputs = [ zlib libjpeg ];
+ enableParallelBuilding = true;
+
meta = {
description = "Library and utilities for working with the TIFF image file format";
homepage = http://www.libtiff.org/;
diff --git a/pkgs/development/libraries/libusb1/default.nix b/pkgs/development/libraries/libusb1/default.nix
index dcdd9f46d76..8a1580d4fbe 100644
--- a/pkgs/development/libraries/libusb1/default.nix
+++ b/pkgs/development/libraries/libusb1/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "libusb-1.0.8";
+ name = "libusb-1.0.9";
src = fetchurl {
url = "mirror://sourceforge/libusb/${name}.tar.bz2";
- sha256 = "1afvpaqnl5plqg95nkvsl4sj9d6ckrmjq44mql8l4zqgf6jx7l11";
+ sha256 = "16sz34ix6hw2wwl3kqx6rf26fg210iryr68wc439dc065pffw879";
};
meta = {
diff --git a/pkgs/development/libraries/libvpx/default.nix b/pkgs/development/libraries/libvpx/default.nix
index 0d1a2cacc46..1c225aa7853 100644
--- a/pkgs/development/libraries/libvpx/default.nix
+++ b/pkgs/development/libraries/libvpx/default.nix
@@ -1,11 +1,11 @@
{stdenv, fetchurl, bash, yasm, which, perl}:
stdenv.mkDerivation rec {
- name = "libvpx-1.0.0";
+ name = "libvpx-1.1.0";
src = fetchurl {
- url = http://webm.googlecode.com/files/libvpx-v1.0.0.tar.bz2;
- sha256 = "08gyx90ndv0v8dhbhp3jdh6g37pmcjlfwljzsy0nskm4345dpkh7";
+ url = http://webm.googlecode.com/files/libvpx-v1.1.0.tar.bz2;
+ sha256 = "1ibjxcdsazqfbbjhb8w56vy3n9qwny2m9q4kzx4rmk9v9g7p9q4w";
};
patchPhase = ''
diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix
index defba390cf1..e25074f8d12 100644
--- a/pkgs/development/libraries/libxml2/default.nix
+++ b/pkgs/development/libraries/libxml2/default.nix
@@ -1,28 +1,39 @@
-{stdenv, fetchurl, zlib, python ? null, pythonSupport ? true }:
+{ stdenv, fetchurl, zlib, xz, python ? null, pythonSupport ? true }:
assert pythonSupport -> python != null;
-stdenv.mkDerivation {
- name = "libxml2-2.7.8";
+stdenv.mkDerivation rec {
+ name = "libxml2-2.9.0";
src = fetchurl {
- url = ftp://xmlsoft.org/libxml2/libxml2-sources-2.7.8.tar.gz;
- sha256 = "6a33c3a2d18b902cd049e0faa25dd39f9b554a5b09a3bb56ee07dd7938b11c54";
+ url = "ftp://xmlsoft.org/libxml2/${name}.tar.gz";
+ sha256 = "10ib8bpar2pl68aqksfinvfmqknwnk7i35ibq6yjl8dpb0cxj9dd";
};
- configureFlags = ''
- ${if pythonSupport then "--with-python=${python}" else ""}
- '';
-
- propagatedBuildInputs = [zlib];
+ patches = [ ./pthread-once-init.patch ];
+
+ configureFlags = stdenv.lib.optionalString pythonSupport "--with-python=${python}";
+
+ buildInputs = (stdenv.lib.optional pythonSupport [ python ])
+
+ # Libxml2 has an optional dependency on liblzma. However, on impure
+ # platforms, it may end up using that from /usr/lib, and thus lack a
+ # RUNPATH for that, leading to undefined references for its users.
+ ++ (stdenv.lib.optional stdenv.isFreeBSD xz);
+
+ propagatedBuildInputs = [ zlib ];
setupHook = ./setup-hook.sh;
- passthru = {inherit pythonSupport;};
+ passthru = { inherit pythonSupport; };
+
+ enableParallelBuilding = true;
meta = {
homepage = http://xmlsoft.org/;
- description = "A XML parsing library for C";
+ description = "An XML parsing library for C";
license = "bsd";
+ platforms = stdenv.lib.platforms.linux;
+ maintainers = [ stdenv.lib.maintainers.eelco ];
};
}
diff --git a/pkgs/development/libraries/libxml2/pthread-once-init.patch b/pkgs/development/libraries/libxml2/pthread-once-init.patch
new file mode 100644
index 00000000000..fadfc27a911
--- /dev/null
+++ b/pkgs/development/libraries/libxml2/pthread-once-init.patch
@@ -0,0 +1,35 @@
+http://git.gnome.org/browse/libxml2/commit/?id=3f6cfbd1d38d0634a2ddcb9a0a13e1b5a2195a5e
+
+From 3f6cfbd1d38d0634a2ddcb9a0a13e1b5a2195a5e Mon Sep 17 00:00:00 2001
+From: Friedrich Haubensak
+Date: Wed, 12 Sep 2012 15:34:53 +0000
+Subject: Fix a thread portability problem
+
+cannot compile libxml2-2.9.0 using studio 12.1 compiler on solaris 10
+
+I.M.O. structure initializer (as PTHREAD_ONCE_INIT) cannot be used in
+a structure assignment anyway
+---
+diff --git a/threads.c b/threads.c
+index f206149..7e85a26 100644
+--- a/threads.c
++++ b/threads.c
+@@ -146,6 +146,7 @@ struct _xmlRMutex {
+ static pthread_key_t globalkey;
+ static pthread_t mainthread;
+ static pthread_once_t once_control = PTHREAD_ONCE_INIT;
++static pthread_once_t once_control_init = PTHREAD_ONCE_INIT;
+ static pthread_mutex_t global_init_lock = PTHREAD_MUTEX_INITIALIZER;
+ #elif defined HAVE_WIN32_THREADS
+ #if defined(HAVE_COMPILER_TLS)
+@@ -915,7 +916,7 @@ xmlCleanupThreads(void)
+ #ifdef HAVE_PTHREAD_H
+ if ((libxml_is_threaded) && (pthread_key_delete != NULL))
+ pthread_key_delete(globalkey);
+- once_control = PTHREAD_ONCE_INIT;
++ once_control = once_control_init;
+ #elif defined(HAVE_WIN32_THREADS) && !defined(HAVE_COMPILER_TLS) && (!defined(LIBXML_STATIC) || defined(LIBXML_STATIC_FOR_DLL))
+ if (globalkey != TLS_OUT_OF_INDEXES) {
+ xmlGlobalStateCleanupHelperParams *p;
+--
+cgit v0.9.0.2
diff --git a/pkgs/development/libraries/libxml2/setup-hook.sh b/pkgs/development/libraries/libxml2/setup-hook.sh
index d87c226506a..f8e4f5e0fd6 100644
--- a/pkgs/development/libraries/libxml2/setup-hook.sh
+++ b/pkgs/development/libraries/libxml2/setup-hook.sh
@@ -1,10 +1,10 @@
addXMLCatalogs () {
for kind in dtd xsl; do
- if test -d $1/xml/$kind; then
+ if test -d $1/xml/$kind; then
for i in $(find $1/xml/$kind -name catalog.xml); do
- export XML_CATALOG_FILES="$XML_CATALOG_FILES $i"
+ export XML_CATALOG_FILES="$XML_CATALOG_FILES $i"
done
- fi
+ fi
done
}
diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix
index 05ce8019c4e..d3b7769754e 100644
--- a/pkgs/development/libraries/libxslt/default.nix
+++ b/pkgs/development/libraries/libxslt/default.nix
@@ -1,15 +1,15 @@
-{stdenv, fetchurl, libxml2 }:
+{ stdenv, fetchurl, libxml2 }:
stdenv.mkDerivation rec {
- name = "libxslt-1.1.26";
-
+ name = "libxslt-1.1.27";
+
src = fetchurl {
url = "ftp://xmlsoft.org/libxml2/${name}.tar.gz";
- sha256 = "1c9xdv39jvq1hp16gsbi56hbz032dmqyy0fpi4ls1y3152s55pam";
+ sha256 = "09ky3vhlaahvsb0q9gp6h3as53pfj70gincirachjqzj46jdka5n";
};
-
- buildInputs = [libxml2];
-
+
+ buildInputs = [ libxml2 ];
+
postInstall = ''
mkdir -p $out/nix-support
ln -s ${libxml2}/nix-support/setup-hook $out/nix-support/
@@ -19,5 +19,7 @@ stdenv.mkDerivation rec {
homepage = http://xmlsoft.org/XSLT/;
description = "A C library and tools to do XSL transformations";
license = "bsd";
+ platforms = stdenv.lib.platforms.linux;
+ maintainers = [ stdenv.lib.maintainers.eelco ];
};
}
diff --git a/pkgs/development/libraries/loudmouth/default.nix b/pkgs/development/libraries/loudmouth/default.nix
index ffa3ebdef92..ae9f3fc6c18 100644
--- a/pkgs/development/libraries/loudmouth/default.nix
+++ b/pkgs/development/libraries/loudmouth/default.nix
@@ -1,16 +1,22 @@
-{stdenv, fetchurl, openssl, libidn, glib, pkgconfig, zlib}:
+{ stdenv, fetchurl, openssl, libidn, glib, pkgconfig, zlib }:
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
name = "loudmouth-1.4.3";
-
+
src = fetchurl {
- url = mirror://gnome/sources/loudmouth/1.4/loudmouth-1.4.3.tar.bz2;
+ url = "mirror://gnome/sources/loudmouth/1.4/${name}.tar.bz2";
md5 = "55339ca42494690c3942ee1465a96937";
};
-
+
+ patches = [ ./glib-2.32.patch ];
+
configureFlags = "--with-ssl=openssl";
-
- propagatedBuildInputs = [openssl libidn glib zlib];
-
- buildInputs = [pkgconfig];
+
+ propagatedBuildInputs = [ openssl libidn glib zlib ];
+
+ buildInputs = [ pkgconfig ];
+
+ meta = {
+ description = "A lightweight C library for the Jabber protocol";
+ };
}
diff --git a/pkgs/development/libraries/loudmouth/glib-2.32.patch b/pkgs/development/libraries/loudmouth/glib-2.32.patch
new file mode 100644
index 00000000000..87fc170c80d
--- /dev/null
+++ b/pkgs/development/libraries/loudmouth/glib-2.32.patch
@@ -0,0 +1,13 @@
+Index: loudmouth-1.4.3/loudmouth/lm-error.c
+===================================================================
+--- loudmouth-1.4.3.orig/loudmouth/lm-error.c
++++ loudmouth-1.4.3/loudmouth/lm-error.c
+@@ -19,7 +19,7 @@
+ */
+
+ #include
+-#include
++#include
+ #include "lm-error.h"
+
+ /**
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 219dc161761..f72638677d1 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -7,27 +7,24 @@ if ! stdenv.lib.lists.elem stdenv.system stdenv.lib.platforms.mesaPlatforms then
throw "unsupported platform for Mesa"
else
-let version = "7.11.2"; in
+let version = "8.0.4"; in
stdenv.mkDerivation {
name = "mesa-${version}";
src = fetchurl {
url = "ftp://ftp.freedesktop.org/pub/mesa/${version}/MesaLib-${version}.tar.bz2";
- sha256 = "0msk1fh4yw4yi7z37v75vhpa23z49lkwgin6drczbihbqsl6lx2p";
+ md5 = "d546f988adfdf986cff45b1efa2d8a46";
};
- patches = [ ./swrast-settexbuffer.patch ] ++ stdenv.lib.optional
- (stdenv.system == "mips64el-linux") ./mips_wmb.patch;
+ patches =
+ stdenv.lib.optional (stdenv.system == "mips64el-linux") ./mips_wmb.patch;
prePatch = "patchShebangs .";
-# r300
configureFlags =
- " --with-driver=dri --enable-gl-osmesa --enable-gles1"
+ " --enable-gles1 --enable-gles2 --enable-gallium-egl"
+ " --with-gallium-drivers=i915,nouveau,r600,svga,swrast"
- + " --enable-gles2 --enable-gallium-egl --disable-glx-tls"
- + " --enable-xcb --enable-egl --disable-glut"
# Texture floats are patented, see docs/patents.txt
+ stdenv.lib.optionalString enableTextureFloats " --enable-texture-float";
@@ -44,7 +41,6 @@ stdenv.mkDerivation {
description = "An open source implementation of OpenGL";
homepage = http://www.mesa3d.org/;
license = "bsd";
-
platforms = stdenv.lib.platforms.mesaPlatforms;
maintainers = [ stdenv.lib.maintainers.simons ];
};
diff --git a/pkgs/development/libraries/nettle/default.nix b/pkgs/development/libraries/nettle/default.nix
index 6c7383435a8..2a4d89bb4f0 100644
--- a/pkgs/development/libraries/nettle/default.nix
+++ b/pkgs/development/libraries/nettle/default.nix
@@ -1,12 +1,11 @@
{ fetchurl, stdenv, gmp, gnum4 }:
stdenv.mkDerivation (rec {
- name = "nettle-2.4";
+ name = "nettle-2.5";
src = fetchurl {
- # Eventually use `mirror://gnu/'.
- url = "ftp://ftp.lysator.liu.se/pub/security/lsh/${name}.tar.gz";
- sha256 = "0gwwcipmjxkv7p2p01m19n4c3jiczg682w58l5dgg0b8vw494056";
+ url = "mirror://gnu/nettle/${name}.tar.gz";
+ sha256 = "0wicr7amx01l03rm0pzgr1qvw3f9blaw17vjsy1301dh13ll58aa";
};
buildInputs = [ gnum4 ];
@@ -14,6 +13,8 @@ stdenv.mkDerivation (rec {
doCheck = (stdenv.system != "i686-cygwin");
+ enableParallelBuilding = true;
+
patches = stdenv.lib.optional (stdenv.system == "i686-cygwin")
./cygwin.patch;
diff --git a/pkgs/development/libraries/npth/default.nix b/pkgs/development/libraries/npth/default.nix
index a9f80fa9348..c9b685aa05b 100644
--- a/pkgs/development/libraries/npth/default.nix
+++ b/pkgs/development/libraries/npth/default.nix
@@ -1,18 +1,13 @@
-{ stdenv, fetchgit, autoconf, automake, libtool }:
+{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "npth-git20120407";
+ name = "npth-0.91";
- src = fetchgit {
- url = "git://git.gnupg.org/npth.git";
- rev = "cbb52bd5ada02bbd914869f4540221831358d077";
- sha256 = "1789b15bc49171d47bbd5a3bccbadc7dde1ae095bb2c205c7ec5d7a36573876d";
+ src = fetchurl {
+ url = "ftp://ftp.gnupg.org/gcrypt/npth/${name}.tar.bz2";
+ sha256 = "1qgs1n70x83dyyysabg50dh8s3464jwsa63qi5if2cd3sk78dvya";
};
- buildInputs = [ autoconf automake libtool ];
-
- preConfigure = "autoreconf -vfi";
-
meta = {
description = "The New GNU Portable Threads Library";
longDescription = ''
diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix
index c570688de21..77003961fd9 100644
--- a/pkgs/development/libraries/nspr/default.nix
+++ b/pkgs/development/libraries/nspr/default.nix
@@ -1,13 +1,13 @@
{ stdenv, fetchurl }:
-let version = "4.9.1"; in
+let version = "4.9.3"; in
stdenv.mkDerivation {
name = "nspr-${version}";
src = fetchurl {
url = "http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${version}/src/nspr-${version}.tar.gz";
- sha1 = "1d52282668f2f8f5aabf7a5a3e7f6ba9a5df9710";
+ sha256 = "1igkfb7dm3fd59swa5m961rgc53z98l3jadk42c4yy76b85z78ww";
};
preConfigure = "cd mozilla/nsprpub";
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
'';
enableParallelBuilding = true;
-
+
meta = {
homepage = http://www.mozilla.org/projects/nspr/;
description = "Netscape Portable Runtime, a platform-neutral API for system-level and libc-like functions";
diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix
index 38e9d80d5b7..e0bd1d2a53e 100644
--- a/pkgs/development/libraries/nss/default.nix
+++ b/pkgs/development/libraries/nss/default.nix
@@ -11,20 +11,21 @@ let
};
secLoadPatch = fetchurl {
- url = "http://patch-tracker.debian.org/patch/series/dl/nss/2:3.13.5-1/85_security_load.patch";
+ name = "security_load.patch";
+ urls = [
+ "http://patch-tracker.debian.org/patch/series/dl/nss/2:3.13.6-1/85_security_load.patch"
+ "http://anonscm.debian.org/gitweb/?p=pkg-mozilla/nss.git;a=blob_plain;f=debian/patches/85_security_load.patch;hb=HEAD"
+ ];
sha256 = "8a8d0ae4ebbd7c389973fa5d26d8bc5f473046c6cb1d8283cb9a3c1f4c565c47";
};
in stdenv.mkDerivation rec {
name = "nss-${version}";
- version = "3.13.6";
+ version = "3.14";
- src = let
- uscoreVersion = stdenv.lib.replaceChars ["."] ["_"] version;
- releasePath = "releases/NSS_${uscoreVersion}_RTM/src/nss-${version}.tar.gz";
- in fetchurl {
- url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/${releasePath}";
- sha256 = "f7e90727e0ecc1c29de10da39a79bc9c53b814ccfbf40720e053b29c683d43a0";
+ src = fetchurl {
+ url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_14_RTM/src/${name}.tar.gz";
+ sha1 = "ace3642fb2ca67854ea7075d053ca01a6d81e616";
};
buildInputs = [ nspr perl zlib sqlite ];
diff --git a/pkgs/development/libraries/openjpeg/default.nix b/pkgs/development/libraries/openjpeg/default.nix
index 575d580faf6..6024456652c 100644
--- a/pkgs/development/libraries/openjpeg/default.nix
+++ b/pkgs/development/libraries/openjpeg/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+ name = "openjpeg-1.5.1";
-stdenv.mkDerivation {
- name = "openjpeg-1.5.0";
-
src = fetchurl {
- url = http://openjpeg.googlecode.com/files/openjpeg-1.5.0.tar.gz;
- sha256 = "1kja6s9dk0hh7p9064kg69y6vninwyvpqi8cap92waj38jmqz469";
+ url = "http://openjpeg.googlecode.com/files/${name}.tar.gz";
+ sha256 = "13dbyf3jwr4h2dn1k11zph3jgx17z7d66xmi640mbsf8l6bk1yvc";
};
meta = {
diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 3b2f224e6a9..923c24a51eb 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, perl }:
+{ stdenv, fetchurl, perl
+, withCryptodev ? false, cryptodevHeaders }:
let
name = "openssl-1.0.1c";
@@ -45,6 +46,8 @@ stdenv.mkDerivation {
patches = patchesCross false;
+ buildInputs = stdenv.lib.optional withCryptodev cryptodevHeaders;
+
buildNativeInputs = [ perl ];
# On x86_64-darwin, "./config" misdetects the system as
@@ -52,7 +55,8 @@ stdenv.mkDerivation {
configureScript =
if stdenv.system == "x86_64-darwin" then "./Configure darwin64-x86_64-cc" else "./config";
- configureFlags = "shared --libdir=lib";
+ configureFlags = "shared --libdir=lib" +
+ stdenv.lib.optionalString withCryptodev " -DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS";
makeFlags = "MANDIR=$(out)/share/man";
diff --git a/pkgs/development/libraries/pango/1.29.x.nix b/pkgs/development/libraries/pango/1.30.x.nix
similarity index 83%
rename from pkgs/development/libraries/pango/1.29.x.nix
rename to pkgs/development/libraries/pango/1.30.x.nix
index 6c5d0f4cebc..7168c1b6c9d 100644
--- a/pkgs/development/libraries/pango/1.29.x.nix
+++ b/pkgs/development/libraries/pango/1.30.x.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, gettext, x11, glib, cairo, libpng }:
stdenv.mkDerivation rec {
- name = "pango-1.29.4";
+ name = "pango-1.30.1";
src = fetchurl {
- url = mirror://gnome/sources/pango/1.29/pango-1.29.4.tar.xz;
- sha256 = "0zqjq6ccv6mbah74rcvb03ksq1jwan21z37mdmqa56307sax3s3s";
+ url = "mirror://gnome/sources/pango/1.30/${name}.tar.xz";
+ sha256 = "3a8c061e143c272ddcd5467b3567e970cfbb64d1d1600a8f8e62435556220cbe";
};
buildInputs = stdenv.lib.optional stdenv.isDarwin gettext;
@@ -14,6 +14,8 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ x11 glib cairo libpng ];
+ enableParallelBuilding = true;
+
postInstall = "rm -rf $out/share/gtk-doc";
meta = {
diff --git a/pkgs/development/libraries/phat/default.nix b/pkgs/development/libraries/phat/default.nix
deleted file mode 100644
index 6e68e3d9da8..00000000000
--- a/pkgs/development/libraries/phat/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, gtk, libgnomecanvas, pkgconfig }:
-
-stdenv.mkDerivation rec {
- name = "phat-${version}";
- version = "0.4.1";
-
- src = fetchurl {
- url = "http://download.berlios.de/phat/${name}.tar.gz";
- sha256 = "1icncp2d8hbarzz8mmflkw13blg7blgwfic8q2wll7s6n01ii2av";
- };
-
- buildInputs = [ gtk libgnomecanvas pkgconfig ];
-
- meta = with stdenv.lib; {
- description = "GTK+ widgets geared toward pro-audio apps";
- homepage = http://phat.berlios.de;
- license = licenses.gpl2Plus;
- platforms = platforms.linux;
- maintainers = [ maintainers.goibhniu ];
- };
-}
diff --git a/pkgs/development/libraries/podofo/default.nix b/pkgs/development/libraries/podofo/default.nix
index ad447207a14..44ae11a6317 100644
--- a/pkgs/development/libraries/podofo/default.nix
+++ b/pkgs/development/libraries/podofo/default.nix
@@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
sha256 = "0icpxh1l1dpviq2zwy764dhg8y03zwyf4pgw4s7kb165nvh9v5kv";
};
propagatedBuildInputs = [ zlib freetype libjpeg libtiff fontconfig openssl libpng ];
- buildInputs = [ cmake lua5 stdenv.gcc.libc ];
+ buildNativeInputs = [ cmake ];
+ buildInputs = [ lua5 stdenv.gcc.libc ];
cmakeFlags = "-DPODOFO_BUILD_SHARED=ON -DPODOFO_BUILD_STATIC=OFF";
meta = {
diff --git a/pkgs/development/libraries/protobufc/default.nix b/pkgs/development/libraries/protobufc/default.nix
new file mode 100644
index 00000000000..58c639ee604
--- /dev/null
+++ b/pkgs/development/libraries/protobufc/default.nix
@@ -0,0 +1,22 @@
+{ fetchurl, stdenv, zlib, protobuf }:
+
+stdenv.mkDerivation rec {
+ name = "protobuf-c-0.15";
+
+ src = fetchurl {
+ url = "http://protobuf-c.googlecode.com/files/${name}.tar.gz";
+ sha256 = "0dh0180lzqk6n1r0qk38kgdy4x15mpkg5j4g2r31qhx52f757jwg";
+ };
+
+ buildInputs = [ protobuf ];
+
+ doCheck = true;
+
+ meta = {
+ description = "C bindings for Google's Protocol Buffers";
+
+ license = "BSD";
+
+ homepage = http://code.google.com/p/protobuf-c/;
+ };
+}
diff --git a/pkgs/development/libraries/pth/default.nix b/pkgs/development/libraries/pth/default.nix
index ffd81f84489..b7b09caed9b 100644
--- a/pkgs/development/libraries/pth/default.nix
+++ b/pkgs/development/libraries/pth/default.nix
@@ -8,6 +8,10 @@ stdenv.mkDerivation rec {
sha256 = "0ckjqw5kz5m30srqi87idj7xhpw6bpki43mj07bazjm2qmh3cdbj";
};
+ preConfigure = stdenv.lib.optionalString stdenv.isArm ''
+ configureFlagsArray=("CFLAGS=-DJB_SP=8 -DJB_PC=9")
+ '';
+
meta = {
description = "The GNU Portable Threads library";
homepage = http://www.gnu.org/software/pth;
diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix
index f56886259a6..87cec5bb3d9 100644
--- a/pkgs/development/libraries/qt-4.x/4.8/default.nix
+++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix
@@ -7,13 +7,13 @@
, perl, coreutils, libXi
, buildMultimedia ? true, alsaLib, gstreamer, gst_plugins_base
, buildWebkit ? true
-, flashplayerFix ? true, gdk_pixbuf
+, flashplayerFix ? false, gdk_pixbuf
, gtkStyle ? false, libgnomeui, gtk, GConf, gnome_vfs
}:
-let
- v = "4.8.2";
-in
+with stdenv.lib;
+
+let v = "4.8.3"; in
# TODO:
# * move some plugins (e.g., SQL plugins) to dedicated derivations to avoid
@@ -24,27 +24,26 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-${v}.tar.gz";
- sha256 = "0y93vkkn44md37gyg4y8sc9ylk27xkniaimfcpdcwd090qnjl6wj";
+ sha256 = "0a67riy4i0xj6j7vmckd0nakras3rl3rzx0r83h1p1i4z5s2kxzi";
};
- patches = [ ( substituteAll {
+ patches =
+ [ ./glib-2.32.patch
+ (substituteAll {
src = ./dlopen-absolute-paths.diff;
inherit cups icu libXfixes;
glibc = stdenv.gcc.libc;
})
- ] ++ stdenv.lib.optional gtkStyle (
- substituteAll {
+ ] ++ stdenv.lib.optional gtkStyle (substituteAll {
src = ./dlopen-gtkstyle.diff;
# substituteAll ignores env vars starting with capital letter
- gconf = GConf;
+ gconf = GConf;
inherit gnome_vfs libgnomeui gtk;
- }
- ) ++ stdenv.lib.optional flashplayerFix (
- substituteAll {
+ })
+ ++ stdenv.lib.optional flashplayerFix (substituteAll {
src = ./dlopen-webkit-nsplugin.diff;
inherit gtk gdk_pixbuf;
- }
- );
+ });
preConfigure =
''
@@ -81,18 +80,16 @@ stdenv.mkDerivation rec {
[ libXrender libXrandr libXinerama libXcursor libXext libXfixes
libXv libXi libSM
]
- ++ (stdenv.lib.optional (stdenv.lib.lists.elem stdenv.system
- stdenv.lib.platforms.mesaPlatforms)
- mesa)
- ++ (stdenv.lib.optional (buildWebkit || buildMultimedia) alsaLib)
+ ++ optional (stdenv.lib.lists.elem stdenv.system stdenv.lib.platforms.mesaPlatforms) mesa
+ ++ optional (buildWebkit || buildMultimedia) alsaLib
++ [ zlib libpng openssl dbus.libs freetype fontconfig glib ]
- ++ (stdenv.lib.optionals (buildWebkit || buildMultimedia)
- [ gstreamer gst_plugins_base ]);
+ ++ optionals (buildWebkit || buildMultimedia) [ gstreamer gst_plugins_base ];
# The following libraries are only used in plugins
- buildInputs = [ cups # Qt dlopen's libcups instead of linking to it
- mysql postgresql sqlite libjpeg libmng libtiff icu ]
- ++ stdenv.lib.optionals gtkStyle [ gtk gdk_pixbuf ];
+ buildInputs =
+ [ cups # Qt dlopen's libcups instead of linking to it
+ mysql postgresql sqlite libjpeg libmng libtiff icu ]
+ ++ optionals gtkStyle [ gtk gdk_pixbuf ];
buildNativeInputs = [ perl pkgconfig which ];
@@ -119,7 +116,7 @@ stdenv.mkDerivation rec {
-no-svg
-make qmake -make libs -nomake tools
-nomake demos -nomake examples -nomake docs
- '' + stdenv.lib.optionalString isMingw " -xplatform win32-g++-4.6";
+ '' + optionalString isMingw " -xplatform win32-g++-4.6";
patches = [];
preConfigure = ''
sed -i -e 's/ g++/ ${stdenv.cross.config}-g++/' \
@@ -136,13 +133,12 @@ stdenv.mkDerivation rec {
'';
dontSetConfigureCross = true;
dontStrip = true;
- } // (if isMingw then
- {
+ } // optionalAttrs isMingw {
propagatedBuildInputs = [ ];
- } else {});
+ };
- meta = with stdenv.lib; {
- homepage = http://qt.nokia.com/products;
+ meta = {
+ homepage = http://qt-project.org/;
description = "A cross-platform application framework for C++";
license = "GPL/LGPL";
maintainers = with maintainers; [ urkud sander ];
diff --git a/pkgs/development/libraries/qt-4.x/4.8/dlopen-absolute-paths.diff b/pkgs/development/libraries/qt-4.x/4.8/dlopen-absolute-paths.diff
index 9823d649365..fe691996277 100644
--- a/pkgs/development/libraries/qt-4.x/4.8/dlopen-absolute-paths.diff
+++ b/pkgs/development/libraries/qt-4.x/4.8/dlopen-absolute-paths.diff
@@ -1,5 +1,27 @@
---- a/src/gui/painting/qcups.cpp 2011-12-08 09:06:02.000000000 +0400
-+++ b/src/gui/painting/qcups.cpp 2011-12-18 12:17:07.000000000 +0400
+diff -ru qt-everywhere-opensource-src-4.8.3-orig/src/corelib/tools/qlocale_icu.cpp qt-everywhere-opensource-src-4.8.3/src/corelib/tools/qlocale_icu.cpp
+--- qt-everywhere-opensource-src-4.8.3-orig/src/corelib/tools/qlocale_icu.cpp 2012-09-10 21:36:50.000000000 -0400
++++ qt-everywhere-opensource-src-4.8.3/src/corelib/tools/qlocale_icu.cpp 2012-09-28 22:57:40.764153828 -0400
+@@ -81,7 +81,7 @@
+ if (status == NotLoaded) {
+
+ // resolve libicui18n
+- QLibrary lib(QLatin1String("icui18n"), QLatin1String(U_ICU_VERSION_SHORT));
++ QLibrary lib(QLatin1String("@icu@/lib/libicui18n"), QLatin1String(U_ICU_VERSION_SHORT));
+ lib.setLoadHints(QLibrary::ImprovedSearchHeuristics);
+ if (!lib.load()) {
+ qWarning() << "Unable to load library icui18n" << lib.errorString();
+@@ -111,7 +111,7 @@
+ }
+
+ // resolve libicuuc
+- QLibrary ucLib(QLatin1String("icuuc"), QLatin1String(U_ICU_VERSION_SHORT));
++ QLibrary ucLib(QLatin1String("@icu@/lib/libicuuc"), QLatin1String(U_ICU_VERSION_SHORT));
+ ucLib.setLoadHints(QLibrary::ImprovedSearchHeuristics);
+ if (!ucLib.load()) {
+ qWarning() << "Unable to load library icuuc" << ucLib.errorString();
+diff -ru qt-everywhere-opensource-src-4.8.3-orig/src/gui/painting/qcups.cpp qt-everywhere-opensource-src-4.8.3/src/gui/painting/qcups.cpp
+--- qt-everywhere-opensource-src-4.8.3-orig/src/gui/painting/qcups.cpp 2012-09-10 21:36:51.000000000 -0400
++++ qt-everywhere-opensource-src-4.8.3/src/gui/painting/qcups.cpp 2012-09-28 18:08:26.600720491 -0400
@@ -87,7 +87,7 @@
static void resolveCups()
@@ -9,8 +31,9 @@
if(cupsLib.load()) {
_cupsGetDests = (CupsGetDests) cupsLib.resolve("cupsGetDests");
_cupsFreeDests = (CupsFreeDests) cupsLib.resolve("cupsFreeDests");
---- a/src/gui/painting/qprinterinfo_unix.cpp 2011-12-08 09:06:02.000000000 +0400
-+++ b/src/gui/painting/qprinterinfo_unix.cpp 2011-12-23 16:22:15.000000000 +0400
+diff -ru qt-everywhere-opensource-src-4.8.3-orig/src/gui/painting/qprinterinfo_unix.cpp qt-everywhere-opensource-src-4.8.3/src/gui/painting/qprinterinfo_unix.cpp
+--- qt-everywhere-opensource-src-4.8.3-orig/src/gui/painting/qprinterinfo_unix.cpp 2012-09-10 21:36:51.000000000 -0400
++++ qt-everywhere-opensource-src-4.8.3/src/gui/painting/qprinterinfo_unix.cpp 2012-09-28 18:08:26.601720488 -0400
@@ -454,7 +454,7 @@
char *domain;
int err;
@@ -20,39 +43,21 @@
typedef int (*ypGetDefaultDomain)(char **);
ypGetDefaultDomain _ypGetDefaultDomain = (ypGetDefaultDomain)lib.resolve("yp_get_default_domain");
typedef int (*ypAll)(const char *, const char *, const struct ypall_callback *);
---- a/src/network/kernel/qhostinfo_unix.cpp 2011-12-23 16:26:07.000000000 +0400
-+++ b/src/network/kernel/qhostinfo_unix.cpp 2011-12-23 16:25:55.000000000 +0400
+diff -ru qt-everywhere-opensource-src-4.8.3-orig/src/network/kernel/qhostinfo_unix.cpp qt-everywhere-opensource-src-4.8.3/src/network/kernel/qhostinfo_unix.cpp
+--- qt-everywhere-opensource-src-4.8.3-orig/src/network/kernel/qhostinfo_unix.cpp 2012-09-10 21:36:51.000000000 -0400
++++ qt-everywhere-opensource-src-4.8.3/src/network/kernel/qhostinfo_unix.cpp 2012-09-28 18:08:53.186643755 -0400
@@ -95,7 +95,7 @@
static void resolveLibrary()
{
#ifndef QT_NO_LIBRARY
- QLibrary lib(QLatin1String("resolv"));
+ QLibrary lib(QLatin1String("@glibc@/lib/libresolv"));
+ lib.setLoadHints(QLibrary::ImprovedSearchHeuristics);
if (!lib.load())
return;
-
---- a/src/corelib/tools/qlocale_icu.cpp 2011-12-08 09:06:03.000000000 +0400
-+++ b/src/corelib/tools/qlocale_icu.cpp 2011-12-23 16:29:15.000000000 +0400
-@@ -81,7 +81,7 @@
- if (status == NotLoaded) {
-
- // resolve libicui18n
-- QLibrary lib(QLatin1String("icui18n"), QLatin1String(U_ICU_VERSION_SHORT));
-+ QLibrary lib(QLatin1String("@icu@/lib/libicui18n"), QLatin1String(U_ICU_VERSION_SHORT));
- if (!lib.load()) {
- qWarning() << "Unable to load library icui18n" << lib.errorString();
- status = ErrorLoading;
-@@ -110,7 +110,7 @@
- }
-
- // resolve libicuuc
-- QLibrary ucLib(QLatin1String("icuuc"), QLatin1String(U_ICU_VERSION_SHORT));
-+ QLibrary ucLib(QLatin1String("@icu@/lib/libicuuc"), QLatin1String(U_ICU_VERSION_SHORT));
- if (!ucLib.load()) {
- qWarning() << "Unable to load library icuuc" << ucLib.errorString();
- status = ErrorLoading;
---- a/src/plugins/platforms/xlib/qxlibstatic.cpp 2011-12-08 09:06:02.000000000 +0400
-+++ b/src/plugins/platforms/xlib/qxlibstatic.cpp 2011-12-23 20:38:49.000000000 +0400
+diff -ru qt-everywhere-opensource-src-4.8.3-orig/src/plugins/platforms/xlib/qxlibstatic.cpp qt-everywhere-opensource-src-4.8.3/src/plugins/platforms/xlib/qxlibstatic.cpp
+--- qt-everywhere-opensource-src-4.8.3-orig/src/plugins/platforms/xlib/qxlibstatic.cpp 2012-09-10 21:36:51.000000000 -0400
++++ qt-everywhere-opensource-src-4.8.3/src/plugins/platforms/xlib/qxlibstatic.cpp 2012-09-28 18:08:26.601720488 -0400
@@ -242,7 +242,7 @@
}
diff --git a/pkgs/development/libraries/qt-4.x/4.8/dlopen-gtkstyle.diff b/pkgs/development/libraries/qt-4.x/4.8/dlopen-gtkstyle.diff
index 522676a2b31..a1c9238be1a 100644
--- a/pkgs/development/libraries/qt-4.x/4.8/dlopen-gtkstyle.diff
+++ b/pkgs/development/libraries/qt-4.x/4.8/dlopen-gtkstyle.diff
@@ -1,15 +1,17 @@
---- a/src/gui/styles/qgtkstyle_p.cpp 2011-12-08 09:06:02.000000000 +0400
-+++ b/src/gui/styles/qgtkstyle_p.cpp 2011-12-24 17:56:46.000000000 +0400
-@@ -312,7 +312,7 @@
+diff --git a/src/gui/styles/qgtkstyle_p.cpp b/src/gui/styles/qgtkstyle_p.cpp
+index 3b128e6..39434db 100644
+--- a/src/gui/styles/qgtkstyle_p.cpp
++++ b/src/gui/styles/qgtkstyle_p.cpp
+@@ -312,7 +312,7 @@ GtkStyle* QGtkStylePrivate::gtkStyle(const QHashableLatin1Literal &path)
void QGtkStylePrivate::resolveGtk() const
{
// enforce the "0" suffix, so we'll open libgtk-x11-2.0.so.0
- QLibrary libgtk(QLS("gtk-x11-2.0"), 0, 0);
+ QLibrary libgtk(QLS("@gtk@/lib/libgtk-x11-2.0"), 0, 0);
+ libgtk.setLoadHints(QLibrary::ImprovedSearchHeuristics);
gtk_init = (Ptr_gtk_init)libgtk.resolve("gtk_init");
- gtk_window_new = (Ptr_gtk_window_new)libgtk.resolve("gtk_window_new");
-@@ -434,8 +434,8 @@
+@@ -435,8 +435,8 @@ void QGtkStylePrivate::resolveGtk() const
pango_font_description_get_family = (Ptr_pango_font_description_get_family)libgtk.resolve("pango_font_description_get_family");
pango_font_description_get_style = (Ptr_pango_font_description_get_style)libgtk.resolve("pango_font_description_get_style");
@@ -20,7 +22,7 @@
}
/* \internal
-@@ -607,9 +607,9 @@
+@@ -608,9 +608,9 @@ void QGtkStylePrivate::cleanupGtkWidgets()
static bool resolveGConf()
{
if (!QGtkStylePrivate::gconf_client_get_default) {
diff --git a/pkgs/development/libraries/qt-4.x/4.8/glib-2.32.patch b/pkgs/development/libraries/qt-4.x/4.8/glib-2.32.patch
new file mode 100644
index 00000000000..4593c1b4ba8
--- /dev/null
+++ b/pkgs/development/libraries/qt-4.x/4.8/glib-2.32.patch
@@ -0,0 +1,12 @@
+diff -Naur qt-everywhere-opensource-src-4.8.2-orig/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h qt-everywhere-opensource-src-4.8.2/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h
+--- qt-everywhere-opensource-src-4.8.2-orig/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h 2012-04-26 15:46:22.000000000 -0400
++++ qt-everywhere-opensource-src-4.8.2/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h 2012-07-14 22:47:02.145152876 -0400
+@@ -89,7 +89,7 @@
+ #include
+ #elif PLATFORM(GTK)
+ #include
+-typedef struct _GMutex GMutex;
++typedef union _GMutex GMutex;
+ typedef struct _GCond GCond;
+ #endif
+
diff --git a/pkgs/development/libraries/science/math/blas/default.nix b/pkgs/development/libraries/science/math/blas/default.nix
index 55654586edd..7066ebad87c 100644
--- a/pkgs/development/libraries/science/math/blas/default.nix
+++ b/pkgs/development/libraries/science/math/blas/default.nix
@@ -32,10 +32,14 @@ stdenv.mkDerivation {
echo >>make.inc "RANLIB = ranlib"
make
'';
-
- installPhase = ''
- install -D -m755 libblas.a "$out/lib/libblas.a"
- install -D -m755 libblas.so.3.0.3 "$out/lib/libblas.so.3.0.3"
+
+ installPhase =
+ # FreeBSD's stdenv doesn't use Coreutils.
+ let dashD = if stdenv.isFreeBSD then "" else "-D"; in
+ (stdenv.lib.optionalString stdenv.isFreeBSD "mkdir -p $out/lib ;")
+ + ''
+ install ${dashD} -m755 libblas.a "$out/lib/libblas.a"
+ install ${dashD} -m755 libblas.so.3.0.3 "$out/lib/libblas.so.3.0.3"
ln -s libblas.so.3.0.3 "$out/lib/libblas.so.3"
ln -s libblas.so.3.0.3 "$out/lib/libblas.so"
'';
diff --git a/pkgs/development/libraries/smpeg/default.nix b/pkgs/development/libraries/smpeg/default.nix
index 3e7baf77df8..e259e22ff01 100644
--- a/pkgs/development/libraries/smpeg/default.nix
+++ b/pkgs/development/libraries/smpeg/default.nix
@@ -10,11 +10,13 @@ stdenv.mkDerivation rec {
sha256 = "0ynwn7ih5l2b1kpzpibns9bb9wzfjak7mgrb1ji0dkn2q5pv6lr0";
};
+ enableParallelBuilding = true;
+
buildInputs = [ SDL autoconf automake libtool gtk m4 pkgconfig mesa ];
preConfigure = ''
touch NEWS AUTHORS ChangeLog
- autoreconf -fvi -I acinclude
+ sh autogen.sh
'';
postInstall = ''
diff --git a/pkgs/development/libraries/spandsp/default.nix b/pkgs/development/libraries/spandsp/default.nix
new file mode 100644
index 00000000000..f88ab48e027
--- /dev/null
+++ b/pkgs/development/libraries/spandsp/default.nix
@@ -0,0 +1,18 @@
+{stdenv, fetchurl, audiofile, libtiff}:
+stdenv.mkDerivation rec {
+ version = "0.0.5";
+ name = "spandsp-${version}";
+ src=fetchurl {
+ url = "http://www.soft-switch.org/downloads/spandsp/spandsp-${version}.tgz";
+ sha256 = "07f42a237c77b08fa765c3a148c83cdfa267bf24c0ab681d80b90d30dd0b3dbf";
+ };
+ buildInputs = [];
+ propagatedBuildInputs = [audiofile libtiff];
+ meta = {
+ homepage = "http://www.creytiv.com/baresip.html";
+ platforms = with stdenv.lib.platforms; linux;
+ maintainers = with stdenv.lib.maintainers; [raskin];
+ license = with stdenv.lib.licenses; gpl2;
+ };
+}
+
diff --git a/pkgs/development/libraries/spice/default.nix b/pkgs/development/libraries/spice/default.nix
index cba5d910783..52726f017ab 100644
--- a/pkgs/development/libraries/spice/default.nix
+++ b/pkgs/development/libraries/spice/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, pixman, celt, alsaLib, openssl
, libXrandr, libXfixes, libXext, libXrender, libXinerama, libjpeg, zlib
-, spiceProtocol }:
+, spice_protocol }:
with stdenv.lib;
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
libXrandr libXfixes libXrender libXext libXinerama
];
- buildNativeInputs = [ pkgconfig spiceProtocol ];
+ buildNativeInputs = [ pkgconfig spice_protocol ];
# NIX_CFLAGS_COMPILE = "-fno-stack-protector";
diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix
index de154964fe5..be3a24c1e4c 100644
--- a/pkgs/development/libraries/sqlite/default.nix
+++ b/pkgs/development/libraries/sqlite/default.nix
@@ -3,15 +3,15 @@
assert readline != null -> ncurses != null;
stdenv.mkDerivation {
- name = "sqlite-3.7.13";
+ name = "sqlite-3.7.14.1";
src = fetchurl {
- url = http://www.sqlite.org/sqlite-autoconf-3071300.tar.gz;
- sha1 = "d3833b6ad68db8505d1044f761dd962f415cd302";
+ url = http://www.sqlite.org/sqlite-autoconf-3071401.tar.gz;
+ sha1 = "c464e0e3efe98227c6546b9b1e786b51b8b642fc";
};
buildInputs = [ readline ncurses ];
-
+
configureFlags = "--enable-threadsafe";
CFLAGS = "-DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_SECURE_DELETE=1 -DSQLITE_ENABLE_UNLOCK_NOTIFY=1";
diff --git a/pkgs/development/libraries/srtp/default.nix b/pkgs/development/libraries/srtp/default.nix
index 887c0c7c1a3..1b8b654ca80 100644
--- a/pkgs/development/libraries/srtp/default.nix
+++ b/pkgs/development/libraries/srtp/default.nix
@@ -27,8 +27,12 @@ rec {
inherit buildInputs;
/* doConfigure should be removed if not needed */
- phaseNames = ["doConfigure" "doMakeInstall"];
-
+ phaseNames = ["setVars" "doConfigure" "doMakeInstall"];
+
+ setVars = a.fullDepEntry ''
+ export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -fPIC"
+ '' ["minInit"];
+
meta = {
description = "Secure RTP";
maintainers = with a.lib.maintainers;
diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix
index af0e6426b81..5cd083a7e33 100644
--- a/pkgs/development/libraries/v8/default.nix
+++ b/pkgs/development/libraries/v8/default.nix
@@ -5,7 +5,7 @@ assert readline != null;
let
system = stdenv.system;
arch = if system == "i686-linux" then "ia32" else if system == "x86_64-linux" || system == "x86_64-darwin" then "x64" else "";
- version = "3.11.10.15";
+ version = "3.11.10.22";
in
assert arch != "";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
name = "v8-${version}";
src = fetchsvn {
url = "http://v8.googlecode.com/svn/tags/${version}";
- sha256 = "0pdw4r6crsb07gshww4kbfbavxgkal8yaxkaggnkz62lrwbcwrwi";
+ sha256 = "1bm3hg4pa17xvs8s895bwklxpaihl3f3vzghdg55s1wd0y4dj96j";
};
configurePhase = ''
diff --git a/pkgs/development/libraries/vtk/default.nix b/pkgs/development/libraries/vtk/default.nix
index db7d0d77f69..9e4816cab0a 100644
--- a/pkgs/development/libraries/vtk/default.nix
+++ b/pkgs/development/libraries/vtk/default.nix
@@ -1,18 +1,32 @@
-{stdenv, fetchurl, cmake, mesa, libX11, xproto, libXt }:
+{ stdenv, fetchurl, cmake, mesa, libX11, xproto, libXt
+, useQt4 ? false, qt4 }:
+
+with stdenv.lib;
+
+let
+ os = stdenv.lib.optionalString;
+ majorVersion = "5.10";
+ minorVersion = "0";
+ version = "${majorVersion}.${minorVersion}";
+in
stdenv.mkDerivation rec {
- name = "vtk-5.4.2";
+ name = "vtk-${os useQt4 "qvtk-"}${version}";
src = fetchurl {
- url = "http://www.vtk.org/files/release/5.4/${name}.tar.gz";
- sha256 = "0gd7xlxiqww6xxcs2kicz0g6k147y3200np4jnsf10vlxs10az03";
+ url = "${meta.homepage}files/release/${majorVersion}/vtk-${version}.tar.gz";
+ md5 = "a0363f78910f466ba8f1bd5ab5437cb9";
};
- buildInputs = [ cmake mesa libX11 xproto libXt ];
+ buildInputs = [ cmake mesa libX11 xproto libXt ]
+ ++ optional useQt4 qt4;
+
+ cmakeFlags = optional useQt4
+ [ "-DVTK_USE_QT:BOOL=ON" ];
meta = {
description = "Open source libraries for 3D computer graphics, image processing and visualization";
homepage = http://www.vtk.org/;
license = "BSD";
- maintainers = with stdenv.lib.maintainers; [viric];
+ maintainers = with stdenv.lib.maintainers; [ viric bbenoist ];
platforms = with stdenv.lib.platforms; linux;
};
}
diff --git a/pkgs/development/libraries/webkit/default.nix b/pkgs/development/libraries/webkit/default.nix
index c0fd878e0bb..d229228b94f 100644
--- a/pkgs/development/libraries/webkit/default.nix
+++ b/pkgs/development/libraries/webkit/default.nix
@@ -14,7 +14,7 @@ rec {
sqlite icu gperf bison flex autoconf automake libtool
perl intltool pkgconfig libsoup gtkdoc libXt libproxy
enchant python ruby which renderproto libXrender geoclue
- kbproto
+ kbproto mesa
];
propagatedBuildInputs = [
@@ -54,7 +54,7 @@ rec {
];
/* doConfigure should be specified separately */
- phaseNames = ["setVars" /* "paranoidFixComments" */ "doConfigure" (doPatchShebangs ".")
+ phaseNames = ["setVars" "fixConfigure" /* "paranoidFixComments" */ "doConfigure" (doPatchShebangs ".")
"doReplaceUsrBin" "doMakeInstall" "doAddPrograms"];
setVars = fullDepEntry (''
@@ -78,6 +78,13 @@ rec {
sed -re 's@( |^)//.*@/* & */@' -i $(find . -name '*.c' -o -name '*.h')
'') ["minInit" "doUnpack"];
+ # See http://archive.linuxfromscratch.org/mail-archives/blfs-dev/2012-April/022893.html
+ fixConfigure = fullDepEntry (''
+ sed -i -e 's/=GSTREAMER_0_10_REQUIRED_VERSION/=\$GSTREAMER_0_10_REQUIRED_VERSION/' \
+ -e 's/=GSTREAMER_0_10_PLUGINS_BASE_REQUIRED_VERSION/=\$GSTREAMER_0_10_PLUGINS_BASE_REQUIRED_VERSION/' \
+ configure{,.ac}
+ '') ["minInit" "doUnpack"];
+
name = s.name;
meta = {
description = "WebKit - a fast and correct HTML renderer";
diff --git a/pkgs/development/libraries/webkit/gtk2.nix b/pkgs/development/libraries/webkit/gtk2.nix
index 5c755c193a5..0b836cd08f0 100644
--- a/pkgs/development/libraries/webkit/gtk2.nix
+++ b/pkgs/development/libraries/webkit/gtk2.nix
@@ -61,6 +61,7 @@ rec {
setVars = fullDepEntry (''
export NIX_LDFLAGS="$NIX_LDFLAGS -lXt"
+ export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -fpermissive"
'') ["minInit"];
doReplaceUsrBin = fullDepEntry (''
diff --git a/pkgs/development/libraries/webkit/src-for-default.nix b/pkgs/development/libraries/webkit/src-for-default.nix
index 30e129e2fae..65bcd435096 100644
--- a/pkgs/development/libraries/webkit/src-for-default.nix
+++ b/pkgs/development/libraries/webkit/src-for-default.nix
@@ -1,9 +1,10 @@
rec {
- version="1.6.3";
- name="webkit-1.6.3";
- hash="1hvph13ak7a85qmj1ikanwxf2nn53m5f6a50j627lp49db7dpl0j";
- url="http://webkitgtk.org/webkit-1.6.3.tar.xz";
- advertisedUrl="http://webkitgtk.org/webkit-1.6.3.tar.xz";
+ version="1.8.1";
+ name="webkit-1.8.1";
+ hash="0a1v3v8dp2cl332qr51j4fpl0rwpgxbf29hn3zdim9hcniv6l4ls";
+ url="http://webkitgtk.org/releases/webkit-1.8.1.tar.xz";
+ advertisedUrl="http://webkitgtk.org/releases/webkit-1.8.1.tar.xz";
}
+
diff --git a/pkgs/development/libraries/zeromq/default.nix b/pkgs/development/libraries/zeromq/2.x.nix
similarity index 100%
rename from pkgs/development/libraries/zeromq/default.nix
rename to pkgs/development/libraries/zeromq/2.x.nix
diff --git a/pkgs/development/libraries/zeromq/3.x.nix b/pkgs/development/libraries/zeromq/3.x.nix
new file mode 100644
index 00000000000..fbb3b5ad74f
--- /dev/null
+++ b/pkgs/development/libraries/zeromq/3.x.nix
@@ -0,0 +1,17 @@
+{stdenv, fetchurl, libuuid}:
+
+stdenv.mkDerivation rec {
+ name = "zeromq-3.2.1-rc2";
+
+ src = fetchurl {
+ url = "http://download.zeromq.org/${name}.tar.gz";
+ sha256 = "b0a70da77e39537120a1fa058c49434982741ecef5211edcd7aeab4caffb82b7";
+ };
+
+ buildInputs = [ libuuid ];
+
+ meta = {
+ homepage = "http://www.zeromq.org";
+ description = "The Intelligent Transport Layer";
+ };
+}
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/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/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/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/qtcreator/default.nix b/pkgs/development/qtcreator/default.nix
new file mode 100644
index 00000000000..b57b9884e61
--- /dev/null
+++ b/pkgs/development/qtcreator/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchurl, qt4 }:
+
+let
+ version = "2.5.2";
+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 = "4a9c09cdf4609753283c31451c84ceb8";
+ };
+
+ buildInputs = [ qt4 ];
+
+ doCheck = false;
+
+ enableParallelBuilding = true;
+
+ preConfigure = "qmake";
+ 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/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/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix
index cab217fef97..d66149a9509 100644
--- a/pkgs/development/tools/build-managers/cmake/default.nix
+++ b/pkgs/development/tools/build-managers/cmake/default.nix
@@ -7,7 +7,7 @@ with stdenv.lib;
let
os = stdenv.lib.optionalString;
majorVersion = "2.8";
- minorVersion = "7";
+ minorVersion = "9";
version = "${majorVersion}.${minorVersion}";
in
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "${meta.homepage}files/v${majorVersion}/cmake-${version}.tar.gz";
- sha256 = "17zmxh0gyis6w05d2km0swlvy94h3w10jgra0fpa5qcg7l2j628k";
+ sha256 = "1yg68ng732cfm5c0h91chqwhg06zdh45bybm353kd1myk5rwqgfw";
};
patches =
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/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/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 72c032342d9..8ce6b62a521 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.39";
- sha256 = "0q2kgzjbcrqxml12hncsrkjdwjiq52dp00v6i3qdgiyj460iy60d";
+ version = "1.42";
+ sha256 = "02yg4lj2y272fvn79kgqccizs71xg5ifnjhpw4vhw5wya657a20w";
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..739e48ba247 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.35";
+ sha256 = "1w6scnbpy6vl46r0srpkxr0qjr0lpld046d9gb4s9c7if3ajibjv";
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/splot/default.nix b/pkgs/development/tools/haskell/splot/default.nix
new file mode 100644
index 00000000000..9f35054b4c0
--- /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.6";
+ sha256 = "0fxjji6b0v3hf4pn1cbh88nvp4n4bfgfkiga6l149flk5nmlapqx";
+ 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..ffdfa7869e0
--- /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.18";
+ sha256 = "1q4kzzqmr7bx97wfaasrkzii6b9zpxcxggshpsjv02bwb1hazxmc";
+ 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..3c2f0351672 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.3.0";
+ sha256 = "0kr0k8pgz52n4g7x998djwncfr9byyxg5slqq80qijh06v01bm79";
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..6289abd7120 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.1";
+ sha256 = "1xyzvv9rqzqdc7kd2rncafnglfg699sn3f4987kbsxzhilvmhw78";
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/coccinelle/default.nix b/pkgs/development/tools/misc/coccinelle/default.nix
index 044ae8f93a0..d31e2ec5f3b 100644
--- a/pkgs/development/tools/misc/coccinelle/default.nix
+++ b/pkgs/development/tools/misc/coccinelle/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, python, ncurses, ocamlPackages, pkgconfig }:
+{ fetchurl, stdenv, python, ncurses, ocamlPackages, pkgconfig, makeWrapper }:
let
@@ -17,6 +17,7 @@ in stdenv.mkDerivation {
ocaml findlib menhir
ocaml_pcre pycaml
python ncurses pkgconfig
+ makeWrapper
];
# TODO: is the generation of this wrapper truly/still needed?
diff --git a/pkgs/development/tools/misc/sysbench/default.nix b/pkgs/development/tools/misc/sysbench/default.nix
new file mode 100644
index 00000000000..2860ac3731f
--- /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/0.4.12/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/neoload/default.nix b/pkgs/development/tools/neoload/default.nix
new file mode 100644
index 00000000000..1c026550387
--- /dev/null
+++ b/pkgs/development/tools/neoload/default.nix
@@ -0,0 +1,91 @@
+{ stdenv, fetchurl, writeTextFile, oraclejre, 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.6.0.29
+let dotInstall4j = writeTextFile { name = "dot-install4j"; text = ''
+ JRE_VERSION ${oraclejre} 1 6 0 29
+ JRE_INFO ${oraclejre} 0
+ ''; };
+
+ 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.0.4";
+
+ src = fetchurl (
+ if stdenv.system == "x86_64-linux" then
+ { url = http://www.neotys.com/documents/download/neoload/v4.0/neoload_4_0_4_linux_x64.sh;
+ sha256 = "1w5pqik1998irpamx6y4rf2v5v34nm8xm6cwa1a8j0agawv992w2"; }
+ else
+ { url = http://www.neotys.com/documents/download/neoload/v4.0/neoload_4_0_4_linux_x86.sh;
+ sha256 = "0k49kcwnimax9q7d2kychcbhh4zlixlx4ak9jgrm901zpkhw2f3b"; } );
+
+ buildInputs = [ makeWrapper ];
+ phases = [ "installPhase" ];
+
+ # TODO: load generator / monitoring agent only builds
+
+ installPhase = ''
+ # 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=${oraclejre}
+ ./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
+
+ ln -s ${oraclejre}/bin $out/lib/neoload/jre
+ '';
+
+ 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/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/web/nodejs/build-node-package.nix b/pkgs/development/web/nodejs/build-node-package.nix
index 98136709170..95d10db167f 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
'';
+ buildNativeInputs = neededNatives;
+
installPhase = ''
runHook preInstall
mkdir $out
diff --git a/pkgs/development/web/nodejs/default.nix b/pkgs/development/web/nodejs/default.nix
index 75e0df0e89e..6a654b3b78d 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.12";
name = "nodejs-${version}";
src = fetchurl {
url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.gz";
- sha256 = "0cri5r191l5pw8a8pf3gs7hfjm3rrz6kdnm3l8wghmp9p12p0aq9";
+ sha256 = "0igsz9g3hmxcnn685v4k8p6d2vv6cmh9sdz5pl8rlhglp0m7yjnn";
};
configureFlags = [
@@ -30,15 +21,11 @@ stdenv.mkDerivation rec {
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
'';
diff --git a/pkgs/games/fsg/default.nix b/pkgs/games/fsg/default.nix
index b2210141f57..7a9dc110540 100644
--- a/pkgs/games/fsg/default.nix
+++ b/pkgs/games/fsg/default.nix
@@ -39,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/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/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 vidéo !"<vfmt->BitsPerPixel,vOption);
+
+ if(sdlVideo==NULL) {
+- cerr <<"Impossible de passer dans le mode vidéo 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 vidéo !"<vfmt->BitsPerPixel,vOption);
+ if(sdlVideo==NULL) {
+- cerr <<"Impossible de passer dans le mode vidéo 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 '"<> "$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/uqm/default.nix b/pkgs/games/uqm/default.nix
new file mode 100644
index 00000000000..6e67ce660f1
--- /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://sf/sc2/uqm-${version}-source.tgz";
+ sha256 = "a3695c5f7f0be7ec9c0f80ec569907b382023a1fee6e635532bd53b7b53bb221";
+ };
+
+ content = fetchurl {
+ url = "mirror://sf/sc2/uqm-${version}-content.uqm";
+ sha256 = "b8f6db8ba29f0628fb1d5c233830896b19f441aee3744bda671ea264b44da3bf";
+ };
+
+ voice = fetchurl {
+ url = "mirror://sf/sc2/uqm-${version}-voice.uqm";
+ sha256 = "bcccf801b4ba37594ff6217b292744ea586ee2d447e927804842ccae8b73c979";
+ };
+
+ music = fetchurl {
+ url = "mirror://sf/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/warsow/default.nix b/pkgs/games/warsow/default.nix
index c584319bdc9..66c33842b89 100644
--- a/pkgs/games/warsow/default.nix
+++ b/pkgs/games/warsow/default.nix
@@ -1,32 +1,33 @@
-{ 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
}:
stdenv.mkDerivation rec {
name = "warsow-${version}";
- version = "0.62";
- mversion = "0.61"; # sometimes only engine is updated
+ version = "1.0";
+ mversion = "1.0"; # sometimes only engine is updated
src1 = fetchurl {
- url = "http://www.zcdn.org/dl/warsow_${version}_sdk.zip";
- sha256 = "0nb1z55lzmwarnn71dcyg9b3k7r7wxagqxks8a7rnlq7acsnra71";
+ url = "http://www.warsow.net/download?dl=sdk";
+ name = "warsow_${version}_sdk.tar.gz";
+ sha256 = "08hfhx3ggb8v8lsb62ki5rhdhscg8j9sndlnllinf85da1f4nf9f";
};
src2 = fetchurl {
- url = "http://www.zcdn.org/dl/warsow_${mversion}_unified.zip";
- sha256 = "1b5bv4dsly7i7c4fqlkckv4da1knxl9m3kg8nlgkgr8waczgvazv";
+ url = "http://www.warsow.net/download?dl=linux";
+ name = "warsow_${mversion}_unified.tar.gz";
+ sha256 = "1v455v4lpqda7lf2yviasdrlibvb6bsyxcadgl8bd4jcvr8x4czr";
};
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 ];
installPhase = ''
dest=$out/opt/warsow
cd release
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..45538acdca3 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,9 +53,16 @@ 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;
diff --git a/pkgs/lib/attrsets.nix b/pkgs/lib/attrsets.nix
index 63448847a15..5e0ab620865 100644
--- a/pkgs/lib/attrsets.nix
+++ b/pkgs/lib/attrsets.nix
@@ -24,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:
@@ -37,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 +79,7 @@ rec {
filterAttrs = pred: set:
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 ]; }
@@ -90,6 +91,7 @@ rec {
) 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.
@@ -119,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
@@ -137,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"; }
@@ -145,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"; }
@@ -157,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
@@ -174,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
@@ -258,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
}
@@ -275,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:
diff --git a/pkgs/lib/licenses.nix b/pkgs/lib/licenses.nix
index 87f9298706e..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";
diff --git a/pkgs/lib/maintainers.nix b/pkgs/lib/maintainers.nix
index 127295a2feb..4de3ff4237b 100644
--- a/pkgs/lib/maintainers.nix
+++ b/pkgs/lib/maintainers.nix
@@ -10,6 +10,7 @@
andres = "Andres Loeh ";
antono = "Antono Vasiljev ";
astsmtl = "Alexander Tsamutali ";
+ bbenoist = "Baptist BENOIST ";
bjg = "Brian Gough ";
bluescreen303 = "Mathijs Kwik ";
chaoflow = "Florian Friesdorf ";
@@ -18,6 +19,7 @@
garbas = "Rok Garbas ";
goibhniu = "Cillian de Róiste ";
guibert = "David Guibert ";
+ jcumming = "Jack Cummings ";
kkallio = "Karn Kallio ";
ludo = "Ludovic Courtès ";
marcweber = "Marc Weber ";
diff --git a/pkgs/lib/strings.nix b/pkgs/lib/strings.nix
index fb2752d97c1..19d1738182f 100644
--- a/pkgs/lib/strings.nix
+++ b/pkgs/lib/strings.nix
@@ -155,4 +155,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/misc/cups/default.nix b/pkgs/misc/cups/default.nix
index bf4e4d1d7e5..f19298e7ccd 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 ];
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/emulators/wine/default.nix b/pkgs/misc/emulators/wine/default.nix
index b35660daf5e..c24bbaad1a5 100644
--- a/pkgs/misc/emulators/wine/default.nix
+++ b/pkgs/misc/emulators/wine/default.nix
@@ -7,11 +7,11 @@ assert stdenv.isLinux;
assert stdenv.gcc.gcc != null;
stdenv.mkDerivation rec {
- name = "wine-1.5.10";
+ name = "wine-${meta.version}";
src = fetchurl {
url = "mirror://sourceforge/wine/${name}.tar.bz2";
- sha256 = "04wydwc8q49bw8brlklx2nbgr453lx7bbfass5zn88xbz997lppk";
+ sha256 = "05ac8qlpbiacn3gmwlafpppyl7r2grsym20gz163szsbmfzlqnxi";
};
gecko = fetchurl {
@@ -46,6 +46,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
meta = {
+ version = "1.5.17";
homepage = "http://www.winehq.org/";
license = "LGPL";
description = "An Open Source implementation of the Windows API on top of X, OpenGL, and Unix";
diff --git a/pkgs/misc/emulators/wine/default.upstream b/pkgs/misc/emulators/wine/default.upstream
new file mode 100644
index 00000000000..a1e9fe05f40
--- /dev/null
+++ b/pkgs/misc/emulators/wine/default.upstream
@@ -0,0 +1,13 @@
+name wine
+url http://sourceforge.net/projects/wine/files/Source/
+version_link 'wine-[0-9.]+[.]tar[.][0-9a-z]+/download$'
+SF_redirect
+
+do_regenerate () {
+ set_var_value name "$CURRENT_NAME-"'${meta.version}'
+ set_var_value version "$CURRENT_VERSION"
+ set_var_value url 'mirror://sourceforge/wine/${name}.tar.bz2' 1
+ set_var_value sha256 "$CURRENT_HASH"
+ cat "$CURRENT_TARGET"
+}
+
diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix
index 7447421fc94..77d3c2f35ab 100644
--- a/pkgs/misc/jackaudio/default.nix
+++ b/pkgs/misc/jackaudio/default.nix
@@ -9,7 +9,10 @@ stdenv.mkDerivation rec {
version = "1.9.8";
src = fetchurl {
- url = "http://www.grame.fr/~letz/jack-1.9.8.tgz";
+ urls = [
+ "http://pkgs.fedoraproject.org/lookaside/pkgs/jack-audio-connection-kit/jack-1.9.8.tgz/1dd2ff054cab79dfc11d134756f27165/jack-1.9.8.tgz"
+ "http://www.grame.fr/~letz/jack-1.9.8.tgz"
+ ];
sha256 = "0788092zxrivcfnfg15brpjkf14x8ma8cwjz4k0b9xdxajn2wwac";
};
@@ -18,6 +21,8 @@ stdenv.mkDerivation rec {
pkgconfig python pythonDBus
] ++ (stdenv.lib.optional firewireSupport ffado);
+ patches = ./ffado_setbuffsize-jack2.patch;
+
configurePhase = ''
cd jack-1.9.8
python waf configure --prefix=$out --dbus --alsa ${if firewireSupport then "--firewire" else ""}
diff --git a/pkgs/misc/jackaudio/ffado_setbuffsize-jack2.patch b/pkgs/misc/jackaudio/ffado_setbuffsize-jack2.patch
new file mode 100644
index 00000000000..7771639280d
--- /dev/null
+++ b/pkgs/misc/jackaudio/ffado_setbuffsize-jack2.patch
@@ -0,0 +1,140 @@
+https://projects.archlinux.org/svntogit/community.git/tree/trunk?h=packages/jack2
+
+From 96e0251234a29a1360c05d5d7dc98b83436b8183 Mon Sep 17 00:00:00 2001
+From: Adrian Knoth
+Date: Sat, 17 Mar 2012 22:36:30 +0100
+Subject: [PATCH] [firewire] Allow FFADO backend to change the buffer size
+
+This is a port of Jonathan Woithe's patch from jackd1.
+With sufficiently recent versions of FFADO, it allows to change
+the buffersize at runtime.
+---
+ linux/firewire/JackFFADODriver.cpp | 65 ++++++++++++++++++++++++++++++++----
+ linux/firewire/JackFFADODriver.h | 6 ++++
+ 2 files changed, 65 insertions(+), 6 deletions(-)
+
+diff --git a/jack-1.9.8/linux/firewire/JackFFADODriver.cpp b/jack-1.9.8/linux/firewire/JackFFADODriver.cpp
+index b33e1cd..085b78a 100644
+--- a/jack-1.9.8/linux/firewire/JackFFADODriver.cpp
++++ b/jack-1.9.8/linux/firewire/JackFFADODriver.cpp
+@@ -3,6 +3,7 @@
+ Copyright (C) 2004 Grame
+ Copyright (C) 2007 Pieter Palmers
+ Copyright (C) 2009 Devin Anderson
++Copyright (C) 2012 Jonathan Woithe, Adrian Knoth
+
+ 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
+@@ -48,7 +49,10 @@
+ namespace Jack
+ {
+
++// Basic functionality requires API version 8. If version 9 or later
++// is present the buffers can be resized at runtime.
+ #define FIREWIRE_REQUIRED_FFADO_API_VERSION 8
++#define FIREWIRE_REQUIRED_FFADO_API_VERSION_FOR_SETBUFSIZE 9
+
+ #define jack_get_microseconds GetMicroSeconds
+
+@@ -281,19 +285,68 @@
+ int
+ JackFFADODriver::SetBufferSize (jack_nframes_t nframes)
+ {
+- printError("Buffer size change requested but not supported!!!");
++ ffado_driver_t* driver = (ffado_driver_t*)fDriver;
++ signed int chn;
++
++ // The speed of this function isn't critical; we can afford the
++ // time to check the FFADO API version.
++ if (ffado_get_api_version() < FIREWIRE_REQUIRED_FFADO_API_VERSION_FOR_SETBUFSIZE ||
++ ffado_streaming_set_period_size == NULL) {
++ printError("unsupported on current version of FFADO; please upgrade FFADO");
++ return -1;
++ }
+
+- /*
+ driver->period_size = nframes;
+ driver->period_usecs =
+ (jack_time_t) floor ((((float) nframes) / driver->sample_rate)
+ * 1000000.0f);
+- */
++
++
++ // Reallocate the null and scratch buffers.
++ driver->nullbuffer = (ffado_sample_t*) calloc(driver->period_size, sizeof(ffado_sample_t));
++ if(driver->nullbuffer == NULL) {
++ printError("could not allocate memory for null buffer");
++ return -1;
++ }
++ driver->scratchbuffer = (ffado_sample_t*) calloc(driver->period_size, sizeof(ffado_sample_t));
++ if(driver->scratchbuffer == NULL) {
++ printError("could not allocate memory for scratch buffer");
++ return -1;
++ }
++
++ // MIDI buffers need reallocating
++ for (chn = 0; chn < driver->capture_nchannels; chn++) {
++ if(driver->capture_channels[chn].stream_type == ffado_stream_type_midi) {
++ // setup the midi buffer
++ if (driver->capture_channels[chn].midi_buffer != NULL)
++ free(driver->capture_channels[chn].midi_buffer);
++ driver->capture_channels[chn].midi_buffer = (ffado_sample_t*) calloc(driver->period_size, sizeof(uint32_t));
++ }
++ }
++ for (chn = 0; chn < driver->playback_nchannels; chn++) {
++ if(driver->playback_channels[chn].stream_type == ffado_stream_type_midi) {
++ if (driver->playback_channels[chn].midi_buffer != NULL)
++ free(driver->playback_channels[chn].midi_buffer);
++ driver->playback_channels[chn].midi_buffer = (ffado_sample_t*) calloc(driver->period_size, sizeof(uint32_t));
++ }
++ }
++
++ // Notify FFADO of the period size change
++ if (ffado_streaming_set_period_size(driver->dev, nframes) != 0) {
++ printError("could not alter FFADO device period size");
++ return -1;
++ }
++
++ // This is needed to give the shadow variables a chance to
++ // properly update to the changes.
++ sleep(1);
+
+ /* tell the engine to change its buffer size */
+- //driver->engine->set_buffer_size (driver->engine, nframes);
++ JackAudioDriver::SetBufferSize(nframes); // Generic change, never fails
+
+- return -1; // unsupported
++ UpdateLatencies();
++
++ return 0;
+ }
+
+ typedef void (*JackDriverFinishFunction) (jack_driver_t *);
+@@ -306,7 +359,7 @@
+
+ assert(params);
+
+- if (ffado_get_api_version() != FIREWIRE_REQUIRED_FFADO_API_VERSION) {
++ if (ffado_get_api_version() < FIREWIRE_REQUIRED_FFADO_API_VERSION) {
+ printError("Incompatible libffado version! (%s)", ffado_get_version());
+ return NULL;
+ }
+diff --git a/jack-1.9.8/linux/firewire/JackFFADODriver.h b/jack-1.9.8/linux/firewire/JackFFADODriver.h
+index cb2a45d..790f4dd 100644
+--- a/jack-1.9.8/linux/firewire/JackFFADODriver.h
++++ b/jack-1.9.8/linux/firewire/JackFFADODriver.h
+@@ -82,6 +82,12 @@ class JackFFADODriver : public JackAudioDriver
+ int Read();
+ int Write();
+
++ // BufferSize can be changed
++ bool IsFixedBufferSize()
++ {
++ return false;
++ }
++
+ int SetBufferSize(jack_nframes_t nframes);
+ };
+
+--
+1.7.10
diff --git a/pkgs/misc/sane-backends/default.nix b/pkgs/misc/sane-backends/default.nix
index 31372aa8418..ac6fed5deb4 100644
--- a/pkgs/misc/sane-backends/default.nix
+++ b/pkgs/misc/sane-backends/default.nix
@@ -1,21 +1,27 @@
-{ stdenv, fetchurl, hotplugSupport ? true, libusb ? null
+{ stdenv, fetchurl, hotplugSupport ? true, libusb ? null, libv4l ? null
+, pkgconfig ? 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";
+stdenv.mkDerivation rec {
+ version = "1.0.23";
+ name = "sane-backends-${version}";
src = fetchurl {
- url = http://alioth.debian.org/frs/download.php/3503/sane-backends-1.0.22.tar.gz;
- sha256 = "0m0cz4ljw9asqvpryl6gx1ndwf7ll2qinlvql9whnzs901la314z";
+ url = "https://launchpad.net/ubuntu/+archive/primary/+files/sane-backends_${version}.orig.tar.gz";
+ sha256 = "4d4f5b2881615af7fc0ed75fdde7dc623a749e80e40f3f792fe4010163cbb029";
};
udevSupport = hotplugSupport;
- buildInputs = if libusb != null then [libusb] else [];
+ buildInputs = []
+ ++ stdenv.lib.optional (libusb != null) libusb
+ ++ stdenv.lib.optional (libv4l != null) libv4l
+ ++ stdenv.lib.optional (pkgconfig != null) pkgconfig
+ ;
postInstall = ''
if test "$udevSupport" = "1"; then
diff --git a/pkgs/misc/screensavers/xscreensaver/default.nix b/pkgs/misc/screensavers/xscreensaver/default.nix
index cf4f81ea407..e3932744286 100644
--- a/pkgs/misc/screensavers/xscreensaver/default.nix
+++ b/pkgs/misc/screensavers/xscreensaver/default.nix
@@ -4,12 +4,12 @@
}:
stdenv.mkDerivation rec {
- version = "5.18";
+ version = "5.19";
name = "xscreensaver-${version}";
src = fetchurl {
url = "http://www.jwz.org/xscreensaver/${name}.tar.gz";
- sha256 = "3d70edb8f46511f5427f21b4ba4d8323f336888f60268d16731f5231c6883db9";
+ sha256 = "fd62ea0f996abe1bea3770dd7141681454521b49302f9bced8af9c2ee428c0e0";
};
buildInputs =
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
''
# Fix build error in version 5.18. Remove this patch when updating
# to a later version.
- sed -i -e '/AF_LINK/d' hacks/glx/sonar-icmp.c
+ #sed -i -e '/AF_LINK/d' hacks/glx/sonar-icmp.c
# Fix path to GTK.
sed -e 's%@GTK_DATADIR@%@datadir@% ; s%@PO_DATADIR@%@datadir@%' \
-i driver/Makefile.in po/Makefile.in.in
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-utils/default.nix b/pkgs/os-specific/linux/alsa-utils/default.nix
index ca3a45bddfd..ebaef323491 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.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 ];
-
+
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/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..49efcc1e76e 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,14 +31,19 @@ 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 */;
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/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/cryptodev/default.nix b/pkgs/os-specific/linux/cryptodev/default.nix
new file mode 100644
index 00000000000..c64d47d0d4d
--- /dev/null
+++ b/pkgs/os-specific/linux/cryptodev/default.nix
@@ -0,0 +1,29 @@
+{ fetchurl, stdenv, kernel, onlyHeaders ? false }:
+
+stdenv.mkDerivation rec {
+ name = "cryptodev-linux-1.5";
+
+ src = fetchurl {
+ url = "http://download.gna.org/cryptodev-linux/${name}.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/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-6000g2a-ucode/default.nix b/pkgs/os-specific/linux/firmware/iwlwifi-6000g2a-ucode/default.nix
index e5fe73ca498..4aea802244f 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,11 @@
-{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";
+ sha256 = "a7f2615756addafbf3e6912cb0265f9650b2807d1ccdf54b620735772725bbe9";
};
buildPhase = "true";
@@ -17,13 +17,12 @@ stdenv.mkDerivation rec {
'';
meta = {
+ homepage = "http://intellinuxwireless.org/";
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/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/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix
index cc5339ba900..c97c7416de1 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 ];
+ buildNativeInputs = [ 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/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/cifs-timeout-3.5.7.patch b/pkgs/os-specific/linux/kernel/cifs-timeout-3.5.7.patch
new file mode 100644
index 00000000000..13d17ad6485
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/cifs-timeout-3.5.7.patch
@@ -0,0 +1,13 @@
+--- a/fs/cifs/transport.c.old 2012-11-06 10:53:23.640093369 +0100
++++ a/fs/cifs/transport.c 2012-11-06 10:54:31.835469340 +0100
+@@ -176,8 +176,8 @@
+ * after the retries we will kill the socket and
+ * reconnect which may clear the network problem.
+ */
+- if ((i >= 14) || (!server->noblocksnd && (i > 2))) {
+- cERROR(1, "sends on sock %p stuck for 15 seconds",
++ if ((i >= 119) || (!server->noblocksnd && (i > 2))) {
++ cERROR(1, "sends on sock %p stuck for 119 seconds",
+ ssocket);
+ rc = -EAGAIN;
+ break;
diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix
index 9e8ee74acb1..48f050f98cc 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,7 +81,7 @@ 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 ];
buildInputs = lib.optional (stdenv.platform.uboot != null)
@@ -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
@@ -129,10 +125,7 @@ stdenv.mkDerivation {
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))
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..346ecf5660e 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.52";
+
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 = "09iszqkxnwkcmm4cwh7320jrwbpwgzx0v05l8mq36p8ix3s926k6";
};
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
index 76e2942c6a3..0ec50303ee2 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.1.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.1.nix
@@ -1,4 +1,4 @@
-args @ { stdenv, fetchurl, userModeLinux ? false, extraConfig ? ""
+args @ { stdenv, fetchurl, extraConfig ? ""
, perl, mktemp, module_init_tools
, ... }:
diff --git a/pkgs/os-specific/linux/kernel/linux-3.2.nix b/pkgs/os-specific/linux/kernel/linux-3.2.nix
index bea68decf64..77fb9bd1e45 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
, ... }:
@@ -237,7 +237,7 @@ in
import ./generic.nix (
rec {
- version = "3.2.28";
+ version = "3.2.34";
testing = false;
modDirVersion = version;
@@ -248,7 +248,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 = "0j99pg1kdrj200wda7w2v4d272y4x0hyrp3w540a6rj00gkxsmn4";
};
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
index c56df955b79..0db9a5c375d 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.3.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.3.nix
@@ -1,4 +1,4 @@
-args @ { stdenv, fetchurl, userModeLinux ? false, extraConfig ? ""
+args @ { stdenv, fetchurl, extraConfig ? ""
, perl, mktemp, module_init_tools
, ... }:
@@ -253,6 +253,7 @@ import ./generic.nix (
features.iwlwifi = true;
features.efiBootStub = true;
+ features.netfilterRPFilter = 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 8b0e3e0d8a2..df38aec881b 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
, ... }:
@@ -239,7 +239,7 @@ in
import ./generic.nix (
rec {
- version = "3.4.10";
+ version = "3.4.19";
testing = false;
preConfigure = ''
@@ -248,7 +248,7 @@ import ./generic.nix (
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz";
- sha256 = "03xfiyhv6zl3wn78bgm7a30w4hs2p328s447slilp0z2w09jqn4q";
+ sha256 = "0zf5da2yfy10ml0f7rpzdbfj9avayw2i9mpm07xhjamw717b82bh";
};
config = configWithPlatform stdenv.platform;
@@ -257,6 +257,7 @@ 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.5.nix
index 61d6b0aeba5..78f60c9906a 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.5.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.5.nix
@@ -1,4 +1,4 @@
-args @ { stdenv, fetchurl, userModeLinux ? false, extraConfig ? ""
+args @ { stdenv, fetchurl, extraConfig ? ""
, perl, mktemp, module_init_tools
, ... }:
@@ -240,7 +240,7 @@ in
import ./generic.nix (
rec {
- version = "3.5.3";
+ version = "3.5.7";
testing = false;
preConfigure = ''
@@ -249,7 +249,7 @@ import ./generic.nix (
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz";
- sha256 = "1p8imlvka3mjm74k09535lyqgdrl1jxrldzd7c8k4qlh5s8fz13w";
+ sha256 = "0k3r0qrlfgn7yk35wf4c49yvyy79kzn42qcrf5kms5iir838kini";
};
config = configWithPlatform stdenv.platform;
@@ -258,6 +258,8 @@ 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-3.6.nix b/pkgs/os-specific/linux/kernel/linux-3.6.nix
new file mode 100644
index 00000000000..5334712865b
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/linux-3.6.nix
@@ -0,0 +1,270 @@
+args @ { stdenv, fetchurl, extraConfig ? ""
+, perl, mktemp, module_init_tools
+, ... }:
+
+let
+ configWithPlatform = kernelPlatform :
+ ''
+ # Power management and debugging for powertop.
+ DEBUG_KERNEL y
+ PM_ADVANCED_DEBUG y
+ PM_RUNTIME y
+ TIMER_STATS y
+ USB_SUSPEND y
+ BACKTRACE_SELF_TEST n
+ CPU_NOTIFIER_ERROR_INJECT? n
+ DEBUG_DEVRES n
+ DEBUG_NX_TEST n
+ DEBUG_STACK_USAGE n
+ DEBUG_STACKOVERFLOW n
+ RCU_TORTURE_TEST n
+ SCHEDSTATS n
+
+ # Support drivers that need external firmware.
+ STANDALONE n
+
+ # Make /proc/config.gz available.
+ IKCONFIG_PROC y
+
+ # Optimize with -O2, not -Os.
+ CC_OPTIMIZE_FOR_SIZE n
+
+ # Enable the kernel's built-in memory tester.
+ MEMTEST y
+
+ # Include the CFQ I/O scheduler in the kernel, rather than as a
+ # module, so that the initrd gets a good I/O scheduler.
+ IOSCHED_CFQ y
+ BLK_CGROUP y # required by CFQ
+
+ # Enable NUMA.
+ NUMA? y
+
+ # Disable some expensive (?) features.
+ FTRACE n
+ KPROBES n
+ PM_TRACE_RTC n
+
+ # Enable various subsystems.
+ ACCESSIBILITY y # Accessibility support
+ AUXDISPLAY y # Auxiliary Display support
+ DONGLE y # Serial dongle support
+ HIPPI? y
+ MTD_COMPLEX_MAPPINGS y # needed for many devices
+ SCSI_LOWLEVEL y # enable lots of SCSI devices
+ SCSI_LOWLEVEL_PCMCIA y
+ SPI y # needed for many devices
+ SPI_MASTER y
+ WAN y
+
+ # Networking options.
+ IP_PNP n
+ IPV6_PRIVACY y
+ NETFILTER_ADVANCED y
+ IP_VS_PROTO_TCP y
+ IP_VS_PROTO_UDP y
+ IP_VS_PROTO_ESP y
+ IP_VS_PROTO_AH y
+ IP_DCCP_CCID3 n # experimental
+ CLS_U32_PERF y
+ CLS_U32_MARK y
+
+ # Wireless networking.
+ IPW2100_MONITOR y # support promiscuous mode
+ IPW2200_MONITOR? y # support promiscuous mode
+ HOSTAP_FIRMWARE y # Support downloading firmware images with Host AP driver
+ HOSTAP_FIRMWARE_NVRAM y
+ ATH9K_PCI y # Detect Atheros AR9xxx cards on PCI(e) bus
+ ATH9K_AHB y # Ditto, AHB bus
+ B43_PHY_HT y
+ BCMA_HOST_PCI y
+
+ # 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
+ USB_EHCI_TT_NEWSCHED y # Improved transaction translator scheduling
+ X86_CHECK_BIOS_CORRUPTION y
+ X86_MCE y
+ XEN_DOM0 y
+
+ # Linux Containers
+ RT_GROUP_SCHED? y
+ CGROUP_DEVICE? y
+ 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
+
+ # Media support
+ MEDIA_CAMERA_SUPPORT? y
+ MEDIA_RC_SUPPORT? y
+
+ ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""}
+ ${extraConfig}
+ '';
+in
+
+import ./generic.nix (
+
+ rec {
+ version = "3.6.7";
+ 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 = "08ivh0md8lcq4xqq98y2ripfb02pykh6qla4zspj76qvl0awvp3x";
+ };
+
+ 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/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..d42581e457e 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -107,13 +107,13 @@ rec {
aufs3_0 = rec {
name = "aufs3.0";
- version = "3.0";
- utilRev = "cabe3601001ab3838215116c32715c9de9412e62";
- utilHash = "7fc6cfe1e69a0b2438eaee056e15d42a2d6be396a637fcfb1b89858fcecc832f";
+ version = "3.0.20120827";
+ utilRev = "91af15f977d12e02165759620005f6ce1a4d7602";
+ utilHash = "dda4df89828dcf0e4012d88b4aa3eda8c30af69d6530ff5fedc2411de872c996";
patch = makeAufs3StandalonePatch {
inherit version;
- rev = "517b27621cdfb793959acac849dae9888338526a";
- sha256 = "8085200ac78d0c1e082d4c721a09f4a4c1d96ae86e307075836d09c3e7d502df";
+ rev = "4bd8efe495832ec43c26cb31ddcab3bae56485da";
+ sha256 = "496113f0eae1a24ae0c1998d1c73fc7c13961579c8e694b3651a8080eae7b74e";
};
features.aufsBase = true;
features.aufs3 = true;
@@ -121,13 +121,13 @@ rec {
aufs3_1 = rec {
name = "aufs3.1";
- version = "3.1";
- utilRev = "cabe3601001ab3838215116c32715c9de9412e62";
- utilHash = "7fc6cfe1e69a0b2438eaee056e15d42a2d6be396a637fcfb1b89858fcecc832f";
+ version = "3.1.20120827";
+ utilRev = "91af15f977d12e02165759620005f6ce1a4d7602";
+ utilHash = "dda4df89828dcf0e4012d88b4aa3eda8c30af69d6530ff5fedc2411de872c996";
patch = makeAufs3StandalonePatch {
inherit version;
- rev = "7386b57432ec5e73632a5375804239b02b6c00f0";
- sha256 = "af4e9ad890e1b72d14170c97d8ead53291f09e275db600932724e6181530be2d";
+ rev = "9be47f1ff7c86976b0baa7847f22d75983e53922";
+ sha256 = "0cd239b9aad396750a26a5cd7b0d54146f21db63fb13d3fa03c4f73b7ebce77e";
};
features.aufsBase = true;
features.aufs3 = true;
@@ -135,13 +135,13 @@ rec {
aufs3_2 = rec {
name = "aufs3.2";
- version = "3.2";
- utilRev = "a953b0218667e06b722f4c41df29edacd8dc8e1f";
- utilHash = "28ac4c1a07b2c30fb61a6facc9cedcf67b14f303baedf1b121aeb6293ea49eb4";
+ version = "3.2.20120827";
+ utilRev = "91af15f977d12e02165759620005f6ce1a4d7602";
+ utilHash = "dda4df89828dcf0e4012d88b4aa3eda8c30af69d6530ff5fedc2411de872c996";
patch = makeAufs3StandalonePatch {
inherit version;
- rev = "9c4bbeb58f0ecc235ea820ae320efa2c0006e033";
- sha256 = "5363a7f5fbadaef9457e743a5781f2525332c4bbb91693ca2596ab2d8f7860ea";
+ rev = "267cb1138b4724ee028ec64ace556abdf993c9f4";
+ sha256 = "61f69264806cf06a05548166e2bc8fd121de9a3e524385f725d76abab22b8a0d";
};
features.aufsBase = true;
features.aufs3 = true;
@@ -149,13 +149,13 @@ rec {
aufs3_3 = rec {
name = "aufs3.3";
- version = "3.3.20120730";
+ version = "3.3.20120827";
utilRev = "91af15f977d12e02165759620005f6ce1a4d7602";
utilHash = "dda4df89828dcf0e4012d88b4aa3eda8c30af69d6530ff5fedc2411de872c996";
patch = makeAufs3StandalonePatch {
inherit version;
- rev = "ff0c9f1c002ef564d7bd52dd56a9b72f4ee7ce0c";
- sha256 = "cfa1a06669c984e1b8755da649aac40152e8018ee87939c5f0825100e45e196e";
+ rev = "ef302b8a8a2862b622cf4826d08b1e076ee6acb7";
+ sha256 = "7f78783685cc3e4eb825cd5dd8dabc82bb16c275493a850e8b7955ac69048d98";
};
features.aufsBase = true;
features.aufs3 = true;
@@ -163,13 +163,13 @@ rec {
aufs3_4 = rec {
name = "aufs3.4";
- version = "3.4.20120730";
+ version = "3.4.20120827";
utilRev = "91af15f977d12e02165759620005f6ce1a4d7602";
utilHash = "dda4df89828dcf0e4012d88b4aa3eda8c30af69d6530ff5fedc2411de872c996";
patch = makeAufs3StandalonePatch {
inherit version;
- rev = "8d7338df43d5e5372424813679c7531cf96ec260";
- sha256 = "37880124df88791d51089277230df0816fc5545c9752be3fa5173385489362c6";
+ rev = "79d8207b22c38420757adf7eec86ee2dcec7443c";
+ sha256 = "bc148aa251c6e63edca70c516c0548dc9b3e48653039df4cf693aa2bcc1b9bb0";
};
features.aufsBase = true;
features.aufs3 = true;
@@ -177,13 +177,28 @@ rec {
aufs3_5 = rec {
name = "aufs3.5";
- version = "3.5.20120813";
+ version = "3.5.20120827";
utilRev = "91af15f977d12e02165759620005f6ce1a4d7602";
utilHash = "dda4df89828dcf0e4012d88b4aa3eda8c30af69d6530ff5fedc2411de872c996";
patch = makeAufs3StandalonePatch {
inherit version;
- rev = "85b5f7059bc8a1759989408a13fc56f92e0d6d31";
- sha256 = "2be13407a2291c7e69658f10a6fb7672751c906a27ac700a2e5e05dbada97cc5";
+ rev = "18e455787597579fe144cdb2f18aa6a0a32c46a4";
+ sha256 = "9649a4cb00e41e2b2e3aa57c3869c33faf90ecbd845a3ac0119922655e80a030";
+ };
+ features.aufsBase = true;
+ features.aufs3 = true;
+ };
+
+ # not officially released yet, but 3.x seems to work fine
+ aufs3_6 = rec {
+ name = "aufs3.6";
+ version = "3.x.20120827";
+ utilRev = "91af15f977d12e02165759620005f6ce1a4d7602";
+ utilHash = "dda4df89828dcf0e4012d88b4aa3eda8c30af69d6530ff5fedc2411de872c996";
+ patch = makeAufs3StandalonePatch {
+ inherit version;
+ rev = "46660ad144289fa1f0aca59bd00d592b560d0dbb";
+ sha256 = "823b7b4c011c103d63711900b3213008de3c9e408b909e0cc2b8697c1e82b67d";
};
features.aufsBase = true;
features.aufs3 = true;
@@ -215,6 +230,12 @@ rec {
features.cifsTimeout = true;
};
+ cifs_timeout_3_5_7 =
+ { name = "cifs-timeout";
+ patch = ./cifs-timeout-3.5.7.patch;
+ features.cifsTimeout = true;
+ };
+
no_xsave =
{ name = "no-xsave";
patch = ./no-xsave.patch;
@@ -226,6 +247,7 @@ rec {
patch = ./dell-rfkill.patch;
};
+ # seems no longer necessary on 3.6
perf3_5 =
{ name = "perf-3.5";
patch = ./perf-3.5.patch;
@@ -246,6 +268,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/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 89%
rename from pkgs/applications/virtualization/lxc/default.nix
rename to pkgs/os-specific/linux/lxc/default.nix
index 26180b84368..be943f5df9e 100644
--- a/pkgs/applications/virtualization/lxc/default.nix
+++ b/pkgs/os-specific/linux/lxc/default.nix
@@ -1,14 +1,11 @@
{ stdenv, fetchurl, libcap, 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-rc2";
src = fetchurl {
url = "http://lxc.sf.net/download/lxc/${name}.tar.gz";
- sha256 = "019ec63f250c874bf7625b1f1bf555b1a6e3a947937a4fca73100abddf829b1c";
+ sha256 = "1f0ee0464507d26e494784e841b68c765ecd3abc5976012e226f69d1aa361bef";
};
buildInputs = [ libcap perl docbook2x ];
@@ -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/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/nfs-utils/default.nix b/pkgs/os-specific/linux/nfs-utils/default.nix
index 6429d8092cf..4060204d505 100644
--- a/pkgs/os-specific/linux/nfs-utils/default.nix
+++ b/pkgs/os-specific/linux/nfs-utils/default.nix
@@ -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/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index 8714c342f1a..9a6a23500be 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -8,23 +8,23 @@
with stdenv.lib;
-let versionNumber = "304.37"; in
+let versionNumber = "304.60"; in
stdenv.mkDerivation {
name = "nvidia-x11-${versionNumber}${optionalString (!libsOnly) "-${kernel.version}"}";
-
+
builder = ./builder.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 = "0dxka66vp15xgm7z9v6x01gdvyvj3l9c33sa7zyahdxbr6h78cdb";
+ sha256 = "0h64wxivh4kmqqhyklvkfwy9nxddqhc0whrw1skpczyjblr2ranr";
}
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 = "1jkgvpd7c760bn34zvq6iinidmbmn70ymh635c3sy9nnx2gr2f7m";
}
else throw "nvidia-x11 does not support platform ${stdenv.system}";
diff --git a/pkgs/os-specific/linux/nvidia-x11/legacy173.nix b/pkgs/os-specific/linux/nvidia-x11/legacy173.nix
index 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/pmtools/default.nix b/pkgs/os-specific/linux/pmtools/default.nix
new file mode 100644
index 00000000000..1cb2220a3bd
--- /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 = "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/qemu-kvm/default.nix b/pkgs/os-specific/linux/qemu-kvm/default.nix
index 39b7074e299..9223b7af917 100644
--- a/pkgs/os-specific/linux/qemu-kvm/default.nix
+++ b/pkgs/os-specific/linux/qemu-kvm/default.nix
@@ -1,23 +1,21 @@
{ stdenv, fetchurl, attr, zlib, SDL, alsaLib, pkgconfig, pciutils, libuuid, vde2
, libjpeg, libpng, ncurses, python, glib, libaio, mesa
-, spice, spiceProtocol, spiceSupport ? false }:
+, 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 ];
-
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 ;
@@ -41,7 +39,7 @@ stdenv.mkDerivation rec {
buildInputs =
[ attr zlib SDL alsaLib pkgconfig pciutils libuuid vde2 libjpeg libpng
ncurses python glib libaio mesa
- ] ++ stdenv.lib.optionals spiceSupport [ spiceProtocol spice ];
+ ] ++ stdenv.lib.optionals spiceSupport [ spice_protocol spice ];
postInstall =
''
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/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..29d56a60e95
--- /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-rc12";
+ src = fetchurl {
+ url = http://github.com/downloads/zfsonlinux/spl/spl-0.6.0-rc12.tar.gz;
+ sha256 = "166853pqa294f78mn4j4x9pri79lyv3j2h8m9fzhfy7d7gxfqljk";
+ };
+
+ 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/systemd/crypt-devices-are-ready.patch b/pkgs/os-specific/linux/systemd/crypt-devices-are-ready.patch
new file mode 100644
index 00000000000..4646ed0e44c
--- /dev/null
+++ b/pkgs/os-specific/linux/systemd/crypt-devices-are-ready.patch
@@ -0,0 +1,22 @@
+Do start device units for uninitialised encrypted devices, because the
+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...)
+
+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"
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index e6e5822c9ea..bab8dfa4a89 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -1,23 +1,28 @@
{ stdenv, fetchurl, pkgconfig, intltool, gperf, libcap, dbus, kmod
, xz, pam, acl, cryptsetup, libuuid, m4, utillinux, usbutils, pciutils
-, glib, kbd
+, glib, kbd, libxslt, coreutils, libgcrypt
}:
assert stdenv.gcc.libc or null != null;
stdenv.mkDerivation rec {
- name = "systemd-188";
+ name = "systemd-195";
src = fetchurl {
url = "http://www.freedesktop.org/software/systemd/${name}.tar.xz";
- sha256 = "0nr1cg1mizbwcafjcqw3c30mx6xdv596jpbgjlxr6myvc5hfsfg8";
+ sha256 = "00v3haymdxhjk71pqp17irw9pm5ivfvz35ibvw41v5zdhj5il179";
};
- patches = [ ./fail-after-reaching-respawn-limit.patch ];
+ patches =
+ [ ./reexec.patch
+ ./ignore-duplicates.patch
+ ./crypt-devices-are-ready.patch
+ ./listunitfiles-abort.patch
+ ];
buildInputs =
[ pkgconfig intltool gperf libcap dbus kmod xz pam acl
- /* cryptsetup */ libuuid m4 usbutils pciutils glib
+ /* cryptsetup */ libuuid m4 usbutils pciutils glib libxslt libgcrypt
];
configureFlags =
@@ -56,11 +61,14 @@ stdenv.mkDerivation rec {
# 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";
- 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 +83,12 @@ 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
+ ''; # */
enableParallelBuilding = true;
@@ -88,7 +101,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/ignore-duplicates.patch b/pkgs/os-specific/linux/systemd/ignore-duplicates.patch
new file mode 100644
index 00000000000..764eead54ea
--- /dev/null
+++ b/pkgs/os-specific/linux/systemd/ignore-duplicates.patch
@@ -0,0 +1,20 @@
+Ignore duplicate paths in "systemctl start".
+
+diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
+index a4290c4..d3ac3ad 100644
+--- a/src/systemctl/systemctl.c
++++ b/src/systemctl/systemctl.c
+@@ -1596,8 +1596,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;
diff --git a/pkgs/os-specific/linux/systemd/listunitfiles-abort.patch b/pkgs/os-specific/linux/systemd/listunitfiles-abort.patch
new file mode 100644
index 00000000000..4bbb0a9b1be
--- /dev/null
+++ b/pkgs/os-specific/linux/systemd/listunitfiles-abort.patch
@@ -0,0 +1,20 @@
+diff --git a/src/core/dbus-manager.c b/src/core/dbus-manager.c
+index ed9784b..6d045cc 100644
+--- a/src/core/dbus-manager.c
++++ b/src/core/dbus-manager.c
+@@ -491,7 +491,6 @@ static DBusMessage *message_from_file_changes(
+ return reply;
+
+ oom:
+- dbus_message_unref(reply);
+ return NULL;
+ }
+
+@@ -1432,7 +1431,6 @@ static DBusHandlerResult bus_manager_message_handler(DBusConnection *connection,
+ r = unit_file_get_list(m->running_as == SYSTEMD_SYSTEM ? UNIT_FILE_SYSTEM : UNIT_FILE_USER, NULL, h);
+ if (r < 0) {
+ unit_file_list_free(h);
+- dbus_message_unref(reply);
+ return bus_send_error_reply(connection, message, NULL, r);
+ }
+
diff --git a/pkgs/os-specific/linux/systemd/reexec.patch b/pkgs/os-specific/linux/systemd/reexec.patch
new file mode 100644
index 00000000000..ff13a44ca0b
--- /dev/null
+++ b/pkgs/os-specific/linux/systemd/reexec.patch
@@ -0,0 +1,15 @@
+Make "systemctl daemon-reexec" do the right thing on NixOS.
+
+diff --git a/src/core/main.c b/src/core/main.c
+index 04fc0b3..0f5b0e9 100644
+--- a/src/core/main.c
++++ b/src/core/main.c
+@@ -1819,7 +1819,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";
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/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/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/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix
new file mode 100644
index 00000000000..1768581d8f9
--- /dev/null
+++ b/pkgs/os-specific/linux/zfs/default.nix
@@ -0,0 +1,45 @@
+{ stdenv, fetchurl, kernel, spl, perl, autoconf, automake, libtool, zlib, libuuid, coreutils, utillinux }:
+
+stdenv.mkDerivation {
+ name = "zfs-0.6.0-rc12";
+ src = fetchurl {
+ url = http://github.com/downloads/zfsonlinux/zfs/zfs-0.6.0-rc12.tar.gz;
+ sha256 = "1mipy6v63y8z3c5chn813x8c2r8mwyja1v19dvars3j85105xf1y";
+ };
+
+ 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 ];
+
+ 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"
+ '';
+
+ 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/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/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/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/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/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/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/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/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..08c53182dd5 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,7 +68,7 @@ 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
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/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..a5f588f747d 100644
--- a/pkgs/servers/sql/mysql55/default.nix
+++ b/pkgs/servers/sql/mysql55/default.nix
@@ -2,16 +2,23 @@
# 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 ];
+ 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";
diff --git a/pkgs/servers/sql/postgresql/8.3.x.nix b/pkgs/servers/sql/postgresql/8.3.x.nix
index d4ddb36d4fe..7a153187cd5 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.21"; in
stdenv.mkDerivation rec {
name = "postgresql-${version}";
src = fetchurl {
url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
- sha256 = "0qqic4wx59lgbyfmdfcgip9nrcpk10zdb91bw9b96wr1vijn2awj";
+ sha256 = "1y1lw83jr3v91920xdhd4ypaa5iazmdh4snl5qzq0yq6z3lnsjx6";
};
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..3500299b50d 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.14"; in
stdenv.mkDerivation rec {
name = "postgresql-${version}";
src = fetchurl {
url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
- sha256 = "1fccqkni64vg1pi4zzcl67bm9g2brrlzjn1vh6qlyfpsld139p90";
+ sha256 = "0fhk3mmk95p5gwmg2skqv1rfi7ylk8gw195hx8rska7fbdryfwhi";
};
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..9993732ebcd 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.10"; in
stdenv.mkDerivation rec {
name = "postgresql-${version}";
src = fetchurl {
url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
- sha256 = "12nslml1mg3lyvrhmdvv5g15n7vj5fk1blx1dfllylqg38c7shc7";
+ sha256 = "0af7in1fp4qxkvzbipz74gxm06x31a9n4z9g91mcis4r015ii523";
};
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..c8fa9327cf3 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.6"; in
stdenv.mkDerivation rec {
name = "postgresql-${version}";
src = fetchurl {
url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
- sha256 = "0i6fssldjp65xfxz9dcmkhz6bk4rpw9g26zbqbc6iz164h9rr20b";
+ sha256 = "1rridkybr55xw4a1h0ppqwv2x2ffwvmpjai9yzsvk58scb56lfbf";
};
buildInputs = [ zlib readline ];
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/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..057142a8707 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 // {
@@ -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,35 @@ 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 ]; }
+ // args.stdenv.lib.optionalAttrs (args.stdenv.system == "i686-darwin") {
+ configureFlags = "LIBUUID_CFLAGS='' LIBUUID_LIBS=''";
+ };
+
lndir = attrs: attrs // {
preConfigure = ''
substituteInPlace lndir.c \
@@ -207,4 +271,11 @@ in
buildInputs = attrs.buildInputs ++ [xorg.libXrender];
};
+ xinput = attrs: attrs // {
+ buildInputs = attrs.buildInputs ++ [xorg.libXrender];
+ };
+
+ 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/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..7e4c0f23015 100644
--- a/pkgs/shells/bash-completion/default.nix
+++ b/pkgs/shells/bash-completion/default.nix
@@ -11,11 +11,6 @@ stdenv.mkDerivation {
sha256 = "e5a490a4301dfb228361bdca2ffca597958e47dd6056005ef9393a5852af5804";
};
- 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"|'
- '';
-
doCheck = true;
meta = {
diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix
index dc9314f6885..fb0eed51d56 100644
--- a/pkgs/stdenv/adapters.nix
+++ b/pkgs/stdenv/adapters.nix
@@ -3,8 +3,8 @@
compiler. */
{dietlibc, fetchurl, runCommand}:
-
-
+
+
rec {
@@ -14,7 +14,7 @@ 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.
@@ -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 //
@@ -94,7 +94,7 @@ rec {
isStatic = true;
} // {inherit fetchurl;};
-
+
# Return a modified stdenv that tries to build statically linked
# binaries.
makeStaticBinaries = stdenv: stdenv //
@@ -108,7 +108,7 @@ rec {
isStatic = true;
} // {inherit fetchurl;};
-
+
# Return a modified stdenv that builds static libraries instead of
# shared libraries.
makeStaticLibraries = stdenv: stdenv //
@@ -120,7 +120,7 @@ rec {
});
} // {inherit fetchurl;};
-
+
# Return a modified stdenv that adds a cross compiler to the
# builds.
makeStdenvCross = stdenv: cross: binutilsCross: gccCross: stdenv //
@@ -185,7 +185,7 @@ rec {
inherit cross gccCross binutilsCross;
};
-
+
/* Modify a stdenv so that the specified attributes are added to
every derivation returned by its mkDerivation function.
@@ -202,7 +202,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 +230,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 +258,7 @@ rec {
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -O0 --coverage"
'';
}
-
+
# Object files instrumented with coverage analysis write
# runtime coverage data to /