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/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 2a45dc50c6d..0267c1def5d 100644 --- a/pkgs/development/compilers/gcc/4.7/default.nix +++ b/pkgs/development/compilers/gcc/4.7/default.nix @@ -60,8 +60,7 @@ let version = "4.7.2"; # 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 @@ -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/head.nix b/pkgs/development/compilers/ghc/head.nix index 5487b00cef2..67f2b4f5c7e 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ghc, perl, gmp, ncurses }: stdenv.mkDerivation rec { - version = "7.7.20120912"; + version = "7.7.20121106"; name = "ghc-${version}"; src = fetchurl { url = "http://haskell.org/ghc/dist/current/dist/${name}-src.tar.bz2"; - sha256 = "0dilndcfs1nhs48nhi361bpffmbbyjaq1i6qnzn24vg34wckyrjg"; + sha256 = "1n3xj8arkzfvs3q1ymxsnbzs23ndsp8pl67sqirl837pkgcmq263"; }; buildInputs = [ ghc perl gmp ncurses ]; @@ -16,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/julia/default.nix b/pkgs/development/compilers/julia/default.nix index a01aa3aded4..4fd31d573ce 100644 --- a/pkgs/development/compilers/julia/default.nix +++ b/pkgs/development/compilers/julia/default.nix @@ -7,7 +7,7 @@ let in stdenv.mkDerivation rec { pname = "julia"; - date = "20120922"; + date = "20121106"; name = "${pname}-git-${date}"; grisu_ver = "1.1.1"; @@ -54,8 +54,8 @@ stdenv.mkDerivation rec { src = fetchgit { url = "git://github.com/JuliaLang/julia.git"; - rev = "e1ba1ebf09da42a5bd7f4ed18f1595ae06032b4c"; - sha256 = "187e67a7c6bf44469e0e0dda41072ac8f3a40380ea9364ed07a4cadc08965663"; + 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/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix index a5a915ae642..246696f81e2 100644 --- a/pkgs/development/compilers/openjdk/default.nix +++ b/pkgs/development/compilers/openjdk/default.nix @@ -117,6 +117,7 @@ stdenv.mkDerivation rec { ./cppflags-include-fix.patch ./printf-fix.patch ./linux-version-check-fix.patch + ./no-crypto-restrictions.patch ]; makeFlags = [ 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/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 fc23f901e5a..00000000000 --- a/pkgs/development/compilers/sbcl/src-for-default.nix +++ /dev/null @@ -1,9 +0,0 @@ -rec { - version="1.1.0"; - name="sbcl-1.1.0"; - hash="128zb7i6w2a93yjvh8mc6f36w47psnda671y81a9yl6mr5696k00"; - url="http://downloads.sourceforge.net/project/sbcl/sbcl/1.1.0/sbcl-1.1.0-source.tar.bz2"; - advertisedUrl="http://downloads.sourceforge.net/project/sbcl/sbcl/1.1.0/sbcl-1.1.0-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/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/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/boost/1.52-headers.nix b/pkgs/development/libraries/boost/1.52-headers.nix new file mode 100644 index 00000000000..b89273fdd30 --- /dev/null +++ b/pkgs/development/libraries/boost/1.52-headers.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation { + name = "boost-1.52.0-headers"; + + src = fetchurl { + url = "mirror://sourceforge/boost/boost_1_52_0.tar.bz2"; + sha256 = "14mc7gsnnahdjaxbbslzk79rc0d12h1i681cd3srdwr3fzynlar2"; + }; + + phases = [ "installPhase" ]; + + installPhase = '' + mkdir -p $out/include + tar xf $src -C $out/include --strip-components=1 ./boost_1_52_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.52.nix b/pkgs/development/libraries/boost/1.52.nix new file mode 100644 index 00000000000..0de11aaed87 --- /dev/null +++ b/pkgs/development/libraries/boost/1.52.nix @@ -0,0 +1,86 @@ +{ stdenv, fetchurl, icu, expat, zlib, bzip2, python +, enableRelease ? true +, enableDebug ? false +, enableSingleThreaded ? false +, enableMultiThreaded ? true +, enableShared ? true +, enableStatic ? false +, enablePIC ? false +, enableExceptions ? false +, taggedLayout ? ((enableRelease && enableDebug) || (enableSingleThreaded && enableMultiThreaded) || (enableShared && enableStatic)) +}: + +let + + variant = stdenv.lib.concatStringsSep "," + (stdenv.lib.optional enableRelease "release" ++ + stdenv.lib.optional enableDebug "debug"); + + threading = stdenv.lib.concatStringsSep "," + (stdenv.lib.optional enableSingleThreaded "single" ++ + stdenv.lib.optional enableMultiThreaded "multi"); + + link = stdenv.lib.concatStringsSep "," + (stdenv.lib.optional enableShared "shared" ++ + stdenv.lib.optional enableStatic "static"); + + # To avoid library name collisions + layout = if taggedLayout then "tagged" else "system"; + + cflags = if (enablePIC && enableExceptions) then + "cflags=-fPIC -fexceptions cxxflags=-fPIC linkflags=-fPIC" + else if (enablePIC) then + "cflags=-fPIC cxxflags=-fPIC linkflags=-fPIC" + else if (enableExceptions) then + "cflags=-fexceptions" + else + ""; +in + +stdenv.mkDerivation { + name = "boost-1.52.0"; + + meta = { + homepage = "http://boost.org/"; + description = "Boost C++ Library Collection"; + license = "boost-license"; + + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.simons ]; + }; + + src = fetchurl { + url = "mirror://sourceforge/boost/boost_1_52_0.tar.bz2"; + sha256 = "14mc7gsnnahdjaxbbslzk79rc0d12h1i681cd3srdwr3fzynlar2"; + }; + + enableParallelBuilding = true; + + buildInputs = [icu expat zlib bzip2 python]; + + configureScript = "./bootstrap.sh"; + configureFlags = "--with-icu=${icu} --with-python=${python}/bin/python"; + + buildPhase = "./b2 -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat}/include -sEXPAT_LIBPATH=${expat}/lib --layout=${layout} variant=${variant} threading=${threading} link=${link} ${cflags} install"; + + installPhase = ":"; + + crossAttrs = rec { + buildInputs = [ expat.hostDrv zlib.hostDrv bzip2.hostDrv ]; + # all buildInputs set previously fell into propagatedBuildInputs, as usual, so we have to + # override them. + propagatedBuildInputs = buildInputs; + # We want to substitute the contents of configureFlags, removing thus the + # usual --build and --host added on cross building. + preConfigure = '' + export configureFlags="--prefix=$out --without-icu" + ''; + buildPhase = '' + set -x + cat << EOF > user-config.jam + using gcc : cross : $crossConfig-g++ ; + EOF + ./b2 -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat.hostDrv}/include -sEXPAT_LIBPATH=${expat.hostDrv}/lib --layout=${layout} --user-config=user-config.jam toolset=gcc-cross variant=${variant} threading=${threading} link=${link} ${cflags} --without-python install + ''; + }; +} 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/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/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/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 c54c84080d6..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.1.0"; - sha256 = "1843fddsc7x3mf6h69xpg7yjkpaws4v57zg02424mj86m5x6jfgz"; + 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.2.nix b/pkgs/development/libraries/haskell/Cabal/1.16.0.3.nix similarity index 81% rename from pkgs/development/libraries/haskell/Cabal/1.16.0.2.nix rename to pkgs/development/libraries/haskell/Cabal/1.16.0.3.nix index 0d2fa370966..68b985507b6 100644 --- a/pkgs/development/libraries/haskell/Cabal/1.16.0.2.nix +++ b/pkgs/development/libraries/haskell/Cabal/1.16.0.3.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "Cabal"; - version = "1.16.0.2"; - sha256 = "1yqzcml460ya98b0ylik1591zwinr8pa3q3wgw894x7m55g321db"; + version = "1.16.0.3"; + sha256 = "11lzqgdjaix8n7nabmafl3jf9gisb04c025cmdycfihfajfn49zg"; buildDepends = [ filepath ]; meta = { homepage = "http://www.haskell.org/cabal/"; 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 50% 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 4c50197a6d7..d65dfa15c6f 100644 --- a/pkgs/development/libraries/haskell/GLUT/2.3.0.0.nix +++ b/pkgs/development/libraries/haskell/GLUT/2.3.1.0.nix @@ -1,17 +1,13 @@ { cabal, freeglut, libICE, libSM, libXi, libXmu, mesa, OpenGL -, OpenGLRaw, StateVar, Tensor, fetchurl +, OpenGLRaw, StateVar, Tensor }: 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 ]; - patches = [ - (fetchurl { url = "https://github.com/haskell-opengl/GLUT/commit/e962ebb7bed7e61e4591ae67f86199d557c7d54c.patch"; sha256 = "0s9xrkz1pkbkhsjzwbj4ayynmvzp5cckkl2lrizcjwcnqv83srmq"; }) - (fetchurl { url = "https://github.com/haskell-opengl/GLUT/commit/fced812bc726c208064a2c48e411f4d609444abc.patch"; sha256 = "1kc7ic70lq43v8ikbcgbs5f2l4wzaz9vylhkmp38q26zs6qzbv07"; }) - ]; meta = { homepage = "http://www.haskell.org/haskellwiki/Opengl"; description = "A binding for the OpenGL Utility Toolkit"; diff --git a/pkgs/development/libraries/haskell/List/default.nix b/pkgs/development/libraries/haskell/List/default.nix index 809a3549428..65c90c0824e 100644 --- a/pkgs/development/libraries/haskell/List/default.nix +++ b/pkgs/development/libraries/haskell/List/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "List"; - version = "0.4.4"; - sha256 = "1dmri9l2mzq1kwy2539z9z21a61rr5ldy990kcixngi4wnaymdbz"; + version = "0.5.1"; + sha256 = "1hgkal8jh035bs0z6z8i899dc0888fhdx8940y27aaxxbmlzfy1p"; buildDepends = [ transformers ]; meta = { homepage = "http://github.com/yairchu/generator/tree"; 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/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/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/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/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/attoparsec-conduit/default.nix b/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix index 97a6c67f6b2..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.2"; - sha256 = "183p4jd2cfzvv9lhp4w5z4xrb3ki5l1h8kmlwv8523plnk7x7486"; + 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/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/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/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 ea64cef451f..eb40a4744f9 100644 --- a/pkgs/development/libraries/haskell/certificate/default.nix +++ b/pkgs/development/libraries/haskell/certificate/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "certificate"; - version = "1.3.1"; - sha256 = "10qn6bpvkqxj0lnfkb6a2aqphwl9yg9qv7q10rn72myyf2l101zy"; + version = "1.3.3"; + sha256 = "043xj3xd6cfnbg9hw2f8agckww3fasvraa72jw84zqc7l2gq0rq2"; isLibrary = true; isExecutable = true; buildDepends = [ 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/conduit/default.nix b/pkgs/development/libraries/haskell/conduit/default.nix index 6da1b8db34d..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.7"; - sha256 = "14bn755f25cin0wv775na85ngfx8ack31s15982zkqfva88xg48i"; + version = "0.5.4.1"; + sha256 = "00fx4v9phclyg8ybz22w8053pfvy92nibx5g3c6h37hhn7hnsxh4"; buildDepends = [ liftedBase monadControl resourcet text transformers transformersBase void 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 6f8143a9543..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.6"; - sha256 = "1sx89b4k0wm9a4ivh5zfn0jlccflg4cm0mic3i829l14y5184ngm"; + 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-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/dbus/default.nix b/pkgs/development/libraries/haskell/dbus/default.nix index ba310862948..16cb2c7ca03 100644 --- a/pkgs/development/libraries/haskell/dbus/default.nix +++ b/pkgs/development/libraries/haskell/dbus/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "dbus"; - version = "0.10.3"; - sha256 = "1l74whkrznlycl6rc1h63rc1vmvp6q2g8g92imycf8f4sizmigfq"; + version = "0.10.4"; + sha256 = "0cv4sgk1mdxc81jlky21k0y3zg7qii585xiapr1m589r5528gj2f"; buildDepends = [ cereal libxmlSax network parsec random text transformers vector xmlTypes 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/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/filestore/default.nix b/pkgs/development/libraries/haskell/filestore/default.nix index 887d06e2b07..f56db649fc7 100644 --- a/pkgs/development/libraries/haskell/filestore/default.nix +++ b/pkgs/development/libraries/haskell/filestore/default.nix @@ -11,7 +11,6 @@ cabal.mkDerivation (self: { buildDepends = [ Diff filepath HUnit mtl parsec split time utf8String xml ]; - noHaddock = 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 index 3e6252a4e00..fd20b7c7547 100644 --- a/pkgs/development/libraries/haskell/filesystem-conduit/default.nix +++ b/pkgs/development/libraries/haskell/filesystem-conduit/default.nix @@ -3,8 +3,8 @@ cabal.mkDerivation (self: { pname = "filesystem-conduit"; - version = "0.5.0.1"; - sha256 = "1rpyrvs9hsi86zj6rghv91jn5lcx9wppg1wa4gp976kmagd4wl93"; + version = "0.5.0.2"; + sha256 = "0vpxl32k6734vli8nky9cwyabw9alvpjm0g5q822yj9rk2439yfq"; buildDepends = [ conduit systemFileio systemFilepath text transformers ]; 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/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 dfbf5181d40..7eb49668e3c 100644 --- a/pkgs/development/libraries/haskell/ghc-events/default.nix +++ b/pkgs/development/libraries/haskell/ghc-events/default.nix @@ -2,12 +2,11 @@ cabal.mkDerivation (self: { pname = "ghc-events"; - version = "0.4.0.1"; - sha256 = "1ic8r3hn1m500xwq1n8wz7fp65vm43n7dkjnn341xdmpd1546wlc"; + version = "0.4.2.0"; + sha256 = "0209r9g5w4ifsaw3dkfra6kma1vyk50dc306an72mcwnp4l7dv4l"; isLibrary = true; isExecutable = true; buildDepends = [ binary mtl ]; - noHaddock = 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/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 8fe5080b1ac..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.6.5"; - sha256 = "0s02vbcyfqzlmjw68kp3arn3vvmldh04460gm050vbc6rqpc8dkv"; + 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/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 fd62553886e..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.5.0.0"; - sha256 = "18mvnhhf03qq2zr85vyg3h87kf2ny0jrj0zjp0886i6qvmbrjwlj"; + 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 4fd567f75aa..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.1"; - sha256 = "0003rp40px3zd5j2k8mm6igafbw8npn0zxm3ip27pq506ak2a0p9"; + version = "1.1.1.1"; + sha256 = "0vxnvh9npsf1jxh471fnr2d13bdi7p8sxn5b2w86bla3q273jxp8"; buildDepends = [ blazeBuilder blazeHtml blazeMarkup failure parsec shakespeare text ]; 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 index 23af64e4489..23d1f7a0a7d 100644 --- 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 @@ -108,6 +108,6 @@ library -- hscolour ==1.19 -- ??? -- haddock ==2.11.0 -- need to use the one shipped with ghc --- N.B.: The begin/end comment annocations are used to build the source +-- 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/hexpat/default.nix b/pkgs/development/libraries/haskell/hexpat/default.nix index ec208aaad59..5a656bc19c7 100644 --- a/pkgs/development/libraries/haskell/hexpat/default.nix +++ b/pkgs/development/libraries/haskell/hexpat/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hexpat"; - version = "0.20.2"; - sha256 = "1v96xiys1664cdspbd9mps9m1ia4xwykzsg4z62pklqnf21wna7j"; + version = "0.20.3"; + sha256 = "13dh0cvcmp6yi4nncsn6q9pkisld9xvz6j4xabng5ax67vdgdvrs"; buildDepends = [ deepseq extensibleExceptions List text transformers utf8String ]; diff --git a/pkgs/development/libraries/haskell/highlighting-kate/default.nix b/pkgs/development/libraries/haskell/highlighting-kate/default.nix index 99726ab0389..4b2e32d2352 100644 --- a/pkgs/development/libraries/haskell/highlighting-kate/default.nix +++ b/pkgs/development/libraries/haskell/highlighting-kate/default.nix @@ -1,4 +1,4 @@ -{ cabal, blazeHtml, filepath, mtl, parsec, regexPcreBuiltin }: +{ cabal, blazeHtml, filepath, mtl, parsec, regexPcre }: cabal.mkDerivation (self: { pname = "highlighting-kate"; @@ -6,7 +6,8 @@ cabal.mkDerivation (self: { 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 3767fe635f0..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.3"; - sha256 = "0z8pd5zva25zii5kkh807kdkn4j9w9z74f2dw4kyflwidn0063fr"; + version = "0.3.5"; + sha256 = "00pzvqw2w3gbz8j4hiz8zxm7rki07g1iamjlbazz3kmpwcgjxi0l"; meta = { 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/hledger-lib/default.nix b/pkgs/development/libraries/haskell/hledger-lib/default.nix index 20b73fa5cad..05a1c04fe59 100644 --- a/pkgs/development/libraries/haskell/hledger-lib/default.nix +++ b/pkgs/development/libraries/haskell/hledger-lib/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hledger-lib"; - version = "0.19"; - sha256 = "1kbjal838b3k0rmvdrndmyjngvyfwpmzh6y8kir4l2nf31jxwjbs"; + version = "0.19.1"; + sha256 = "19ccbf9g1garwg56ig4qckz1zky89g1z71nwfbwi4v57bjw53ab4"; buildDepends = [ cmdargs csv filepath HUnit mtl parsec regexpr safe shakespeareText split time transformers utf8String 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 063fef9ee53..30427f2cddd 100644 --- a/pkgs/development/libraries/haskell/hledger/default.nix +++ b/pkgs/development/libraries/haskell/hledger/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "hledger"; - version = "0.19"; - sha256 = "0pl280vlwwsnl3grsbl5yv8kli1prkswa0p9j2s13g8m89srd1vf"; + version = "0.19.1"; + sha256 = "0ad7wmcpwi7a9nag4j27rhffhai6a5zgzaafss7sfr7yia00cpgg"; isLibrary = true; isExecutable = true; buildDepends = [ 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/hspec-expectations/default.nix b/pkgs/development/libraries/haskell/hspec-expectations/default.nix index bd2d4d290ee..e7d5756b759 100644 --- a/pkgs/development/libraries/haskell/hspec-expectations/default.nix +++ b/pkgs/development/libraries/haskell/hspec-expectations/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "hspec-expectations"; - version = "0.3.0.2"; - sha256 = "1jwwi4pbv0pc88vdg5y0ljjq41sha4v4y5qaxi6qms7rl6cp4qkr"; + version = "0.3.0.3"; + sha256 = "1ppcbfmcgrd1lwswa293fxwny6khhg4blygfbcsawrvgc5ji0q74"; buildDepends = [ HUnit ]; meta = { homepage = "https://github.com/sol/hspec-expectations#readme"; diff --git a/pkgs/development/libraries/haskell/hspec/default.nix b/pkgs/development/libraries/haskell/hspec/default.nix index d525f2a6e0b..4c43513e229 100644 --- a/pkgs/development/libraries/haskell/hspec/default.nix +++ b/pkgs/development/libraries/haskell/hspec/default.nix @@ -1,20 +1,20 @@ { cabal, ansiTerminal, filepath, hspecExpectations, HUnit -, QuickCheck, silently, time, transformers +, QuickCheck, setenv, silently, time, transformers }: cabal.mkDerivation (self: { pname = "hspec"; - version = "1.3.0.1"; - sha256 = "1xgj1yg49vb524blswclr0yw4pvfpbmjyh0b62fac14mawl89v36"; + version = "1.4.2"; + sha256 = "0qlm6p5i1fkgyca704bsjc1nm1ks19pfq6l3vmzsszjzbdl8p5cq"; isLibrary = true; isExecutable = true; buildDepends = [ - ansiTerminal filepath hspecExpectations HUnit QuickCheck silently - time transformers + ansiTerminal filepath hspecExpectations HUnit QuickCheck setenv + silently time transformers ]; meta = { homepage = "http://hspec.github.com/"; - description = "Behavior Driven Development for Haskell"; + 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 index b3482292b04..28216a54815 100644 --- a/pkgs/development/libraries/haskell/html-conduit/default.nix +++ b/pkgs/development/libraries/haskell/html-conduit/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "html-conduit"; - version = "0.1.0.2"; - sha256 = "0r9bnzz6r5q2fgichg8vfjgwyig33diqvj5pxchk97m3m5rqj5k4"; + version = "0.1.0.4"; + sha256 = "1g217856dz1ad545slk020n5w0la4yyd5ygva2gg2g0999padi78"; buildDepends = [ conduit filesystemConduit resourcet systemFilepath tagstreamConduit text transformers xmlConduit xmlTypes diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix index 2909d56368f..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.8.2"; - sha256 = "01iv4gfsch5dyxykmq6g4ki3wmlpwhkjwmgxcpz6cphrv67lbysl"; + 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-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/instant-generics/default.nix b/pkgs/development/libraries/haskell/instant-generics/default.nix index edbf96128da..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.6"; - sha256 = "0rwxj30p4s8imwfsrrrb26dvxax74cr77yzrm5s9yj7hc7hr0c5p"; + 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/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/liblastfm/default.nix b/pkgs/development/libraries/haskell/liblastfm/default.nix index 17489b157a2..70ba29830c6 100644 --- a/pkgs/development/libraries/haskell/liblastfm/default.nix +++ b/pkgs/development/libraries/haskell/liblastfm/default.nix @@ -7,6 +7,9 @@ cabal.mkDerivation (self: { 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/lrucache/default.nix b/pkgs/development/libraries/haskell/lrucache/default.nix index 2a93ee4af33..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.1"; - sha256 = "0w310wsvin5hw3awpicnzddyifcq0844h52jwjcqnin81l2lqrfw"; + 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/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/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/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/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/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/repa-algorithms/default.nix b/pkgs/development/libraries/haskell/repa-algorithms/default.nix index 2385066116a..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.2.1"; - sha256 = "1g6cf70bmkglx0b92kxazaaap75s55fqpp1g7qiskbj2vzvppsg3"; + 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 6d87b10f429..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.2.1"; - sha256 = "17v7ay33fwxjm0ip09jhh979rc6hzfxrrj1hkwj7x4x9gkd79yn7"; + 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 98111abcc14..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.2.1"; - sha256 = "0wcg4a8z6qf7jg353b89ci4pzqvb7pnzgb6ml3av6l54n9rg4vsp"; + 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 1ddf05ce5f8..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.2.2"; - sha256 = "1a7rgpy2qc42zc9si7p1zgi1m9b06dz533d2mvhizzac9k3fb5vq"; + 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/resourcet/default.nix b/pkgs/development/libraries/haskell/resourcet/default.nix index 95e051a3eec..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.2"; - sha256 = "0w4hm29dig6m4jm6y9zmyfnhwii7b88hqjqlvl6xmk5zxp1q7hc2"; + 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/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 54bc170f069..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.5"; - sha256 = "0arfc64wsyn0af34blbjgxxr9xxk9k61p7zy4b7m3ynnpxqh2hzn"; - 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 bed71a7c14e..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.6"; - sha256 = "0ilzg5g2pvq36cv5fhyv9sqz3nnj9gscrc2y4vlqkm6f1ks3gyg8"; - 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/default.nix b/pkgs/development/libraries/haskell/shakespeare/default.nix index fca3d04a305..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.4"; - sha256 = "01gw31g75v8r8hjvkv7mxvx7736ib9x9nqpxavpbrfplyxgk2y31"; + 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 9f67c6ff1b4..9ac5b355583 100644 --- a/pkgs/development/libraries/haskell/shelly/default.nix +++ b/pkgs/development/libraries/haskell/shelly/default.nix @@ -3,12 +3,11 @@ cabal.mkDerivation (self: { pname = "shelly"; - version = "0.14.2.2"; - sha256 = "10wnmbs8bfj5m7z8gxj4z5ncvrx55br4mcfgs9x2w1avjzq5yhq3"; + version = "0.14.3"; + sha256 = "0nlspgk5svc9zr2gry96sykhd8i7vdmqxpsvfsz22khw8climqzj"; buildDepends = [ mtl systemFileio systemFilepath text time unixCompat ]; - jailbreak = true; meta = { homepage = "https://github.com/yesodweb/Shelly.hs"; description = "shell-like (systems) programming in Haskell"; diff --git a/pkgs/development/libraries/haskell/srcloc/default.nix b/pkgs/development/libraries/haskell/srcloc/default.nix index aa2331cfac3..c867a353cd6 100644 --- a/pkgs/development/libraries/haskell/srcloc/default.nix +++ b/pkgs/development/libraries/haskell/srcloc/default.nix @@ -5,7 +5,6 @@ cabal.mkDerivation (self: { version = "0.3.0"; sha256 = "1ymk8k0r9ckk7dalz3virvvpyrf4nw8xvb23cs6ibdjjbzsphpiz"; buildDepends = [ syb ]; - noHaddock = true; 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/stylish-haskell/default.nix b/pkgs/development/libraries/haskell/stylish-haskell/default.nix index ef02145a2a7..fc875d75bd0 100644 --- a/pkgs/development/libraries/haskell/stylish-haskell/default.nix +++ b/pkgs/development/libraries/haskell/stylish-haskell/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "stylish-haskell"; - version = "0.5.3.0"; - sha256 = "1qg24cm2mxkskh701zcg5g8l5hnh3nkaw71mijxr80izls1wlf0z"; + version = "0.5.4.0"; + sha256 = "1bnsjs5s760xnk3s1l7kjqr2svxp4a881p9z2slaywi5kn0v5mwf"; isLibrary = true; isExecutable = true; buildDepends = [ 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/tls/default.nix b/pkgs/development/libraries/haskell/tls/default.nix index 81901c3d587..082a4b75cc6 100644 --- a/pkgs/development/libraries/haskell/tls/default.nix +++ b/pkgs/development/libraries/haskell/tls/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "tls"; - version = "1.0.1"; - sha256 = "1p0v0lrc3hkgyhczz3w9krxnnrlq1w75z4jb9vba0ygq5bxj3d53"; + version = "1.0.2"; + sha256 = "0fkbh89j4gpwq45hv88axcdy7hxhvj1wj14nf7ma8wzaga2p4m75"; isLibrary = true; isExecutable = true; buildDepends = [ 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/vty/default.nix b/pkgs/development/libraries/haskell/vty/default.nix index 0e32dc1c81b..2642af7457e 100644 --- a/pkgs/development/libraries/haskell/vty/default.nix +++ b/pkgs/development/libraries/haskell/vty/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "vty"; - version = "4.7.0.18"; - sha256 = "1a414k8fcnjinr01ly49wyk025zacyznw7gclpa83qm0wn0q7bs3"; + version = "4.7.0.20"; + sha256 = "15slw4zpvfkx9qwj2g5ndcxwbw0kkhyq8frvh9kharqd0zqzgqzb"; buildDepends = [ deepseq mtl parallel parsec terminfo utf8String vector ]; diff --git a/pkgs/development/libraries/haskell/wai-app-static/default.nix b/pkgs/development/libraries/haskell/wai-app-static/default.nix index 442d59d8988..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.3"; - sha256 = "00fa2gjm26yhcy1g8k7hr81f5vbvqfcar7xzx25ibfshv64lyqkx"; + 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 bc70d14ddf9..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.3"; - sha256 = "0nfk24mwzf2v35vlvvhzb7a6ldr6pvw37m3ws3b3cv2m80jdd7kr"; + 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/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix index 53e819a9cc0..56cdbd9adc1 100644 --- a/pkgs/development/libraries/haskell/warp/default.nix +++ b/pkgs/development/libraries/haskell/warp/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "warp"; - version = "1.3.4.2"; - sha256 = "1qh986ljnlz1607aypjiqmk62wjs9rzc4dffab5isipg199vshwj"; + version = "1.3.4.4"; + sha256 = "0i6mjadw87f9c949wg9lcbld0yfvnrxn7bhapf71gk36sh7llxaj"; buildDepends = [ blazeBuilder blazeBuilderConduit caseInsensitive conduit hashable httpTypes liftedBase network networkConduit simpleSendfile 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/yaml/default.nix b/pkgs/development/libraries/haskell/yaml/default.nix index 20d0bf3bc89..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.1"; - sha256 = "0cirffxydjh5650s1i0mq1v839pl2dljwmrjnmjf44fcqsvanvyg"; + 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 56143269e42..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.4"; - sha256 = "162f92s78ppqr7f2bcdcr9wvl0n77nr8lma7z1816dn1j5mwm0kr"; + 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 0d7346ed589..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.3.1"; - sha256 = "16fb0f9si5r65mw7d8j6221qjw61xgi2v60j7dm9j02ljp68i2bq"; + 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 5a82c8b30af..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.2"; - sha256 = "0gjf819mrg3h50c8qlnh8i3xzq0z8mdz8bbqrpjx1haljcgxrzm3"; + 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 a562897cf14..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.3"; - sha256 = "1af1wdzwbw1a2bf991pgx52d9dap3cqpsr5h4yy4mid6p980slrb"; + 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 12076d94f26..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.2"; - sha256 = "07nrxqkpc5z32c8lk5wz9m6ql703hdhyd86pfk704frvbic02xly"; + 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 index 5c88b652f86..bd0e3c17c86 100644 --- a/pkgs/development/libraries/haskell/yesod-test/default.nix +++ b/pkgs/development/libraries/haskell/yesod-test/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "yesod-test"; - version = "0.3.0.1"; - sha256 = "0dfdvhk3mspqhqicjapqvjzmi0hpd2641zb1899fk6mank8yfz0m"; + version = "0.3.1.1"; + sha256 = "0p3490yw0xcc62vzjk2vq32vv2ij7mcs6h28szp7y04gn6xc5nbg"; buildDepends = [ attoparsec blazeHtml blazeMarkup caseInsensitive hspec htmlConduit httpTypes HUnit monadControl network persistent poolConduit text diff --git a/pkgs/development/libraries/haskell/yesod/default.nix b/pkgs/development/libraries/haskell/yesod/default.nix index 6115601f530..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.2"; - sha256 = "02d40crvsnhasa6jhl0k7hzxnwr9lxmbm7caf2mrvpr4sldzy1ss"; + 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/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/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/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/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/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/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/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 cea59780627..87cec5bb3d9 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -138,7 +138,7 @@ stdenv.mkDerivation rec { }; meta = { - homepage = http://qt.nokia.com/products; + 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-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/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index 6b3c5e498fe..be3a24c1e4c 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -3,11 +3,11 @@ assert readline != null -> ncurses != null; stdenv.mkDerivation { - name = "sqlite-3.7.14"; + name = "sqlite-3.7.14.1"; src = fetchurl { - url = http://www.sqlite.org/sqlite-autoconf-3071400.tar.gz; - sha1 = "7b429809918201555f4c0fa639183a1c663d3fe0"; + url = http://www.sqlite.org/sqlite-autoconf-3071401.tar.gz; + sha1 = "c464e0e3efe98227c6546b9b1e786b51b8b642fc"; }; buildInputs = [ readline ncurses ]; 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/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/haskell/BNFC-meta/default.nix b/pkgs/development/tools/haskell/BNFC-meta/default.nix index e18a63cd86c..d39544342b3 100644 --- a/pkgs/development/tools/haskell/BNFC-meta/default.nix +++ b/pkgs/development/tools/haskell/BNFC-meta/default.nix @@ -5,7 +5,6 @@ cabal.mkDerivation (self: { version = "0.4.0.1"; sha256 = "0x31a25njbgd3r8shh7rrqa9qq66iqjhh82k538p9bd2hblg30ka"; buildDepends = [ alexMeta happyMeta haskellSrcMeta syb ]; - noHaddock = true; meta = { description = "Deriving Parsers and Quasi-Quoters from BNF Grammars"; license = self.stdenv.lib.licenses.gpl2; diff --git a/pkgs/development/tools/haskell/alex-meta/default.nix b/pkgs/development/tools/haskell/alex-meta/default.nix index e28b37aafc6..5bb298e739a 100644 --- a/pkgs/development/tools/haskell/alex-meta/default.nix +++ b/pkgs/development/tools/haskell/alex-meta/default.nix @@ -5,7 +5,6 @@ cabal.mkDerivation (self: { 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/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix index 6eac3153009..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.40"; - sha256 = "0finmky9lyzg5gs0y95fb0gmzraszljv7l5271185jmhky4wppim"; + version = "1.42"; + sha256 = "02yg4lj2y272fvn79kgqccizs71xg5ifnjhpw4vhw5wya657a20w"; isLibrary = false; isExecutable = true; buildDepends = [ Cabal filepath hackageDb HTTP mtl regexPosix ]; diff --git a/pkgs/development/tools/haskell/hlint/default.nix b/pkgs/development/tools/haskell/hlint/default.nix index 7bee8229be9..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.33"; - sha256 = "1n1kcd99226f8cwx3zmjv0fh1xk2k0y490l6p2fa9m0av835brr7"; + 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/splot/default.nix b/pkgs/development/tools/haskell/splot/default.nix index 12d603bc736..9f35054b4c0 100644 --- a/pkgs/development/tools/haskell/splot/default.nix +++ b/pkgs/development/tools/haskell/splot/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "splot"; - version = "0.3.5"; - sha256 = "1bayh9s0jj8874w7lv9m11h2f609h30ywgrp438h57jq1prs2wlk"; + version = "0.3.6"; + sha256 = "0fxjji6b0v3hf4pn1cbh88nvp4n4bfgfkiga6l149flk5nmlapqx"; isLibrary = false; isExecutable = true; buildDepends = [ 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/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/neoload/default.nix b/pkgs/development/tools/neoload/default.nix new file mode 100644 index 00000000000..a1ce7f8e34e --- /dev/null +++ b/pkgs/development/tools/neoload/default.nix @@ -0,0 +1,89 @@ +{ 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 + ''; + + 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/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/the-butterfly-effect/default.nix b/pkgs/games/the-butterfly-effect/default.nix index 5fc5e9be84e..979fcd1a48c 100644 --- a/pkgs/games/the-butterfly-effect/default.nix +++ b/pkgs/games/the-butterfly-effect/default.nix @@ -41,7 +41,7 @@ rec { mkdir -p "$out/share/tbe" cp -r . "$out/share/tbe/build-dir" mkdir -p "$out/bin" - echo '#! /bin/sh' >> "$out/bin/tbe" + echo '#!${a.stdenv.shell}' >> "$out/bin/tbe" echo "$out/share/tbe/build-dir/tbe \"\$@\"" >> "$out/bin/tbe" chmod a+x "$out/bin/tbe" '' ["minInit" "doMake" "defEnsureDir"]; diff --git a/pkgs/lib/attrsets.nix b/pkgs/lib/attrsets.nix index eca6936bbee..5e0ab620865 100644 --- a/pkgs/lib/attrsets.nix +++ b/pkgs/lib/attrsets.nix @@ -277,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/maintainers.nix b/pkgs/lib/maintainers.nix index 18671255fce..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 "; diff --git a/pkgs/misc/emulators/wine/default.nix b/pkgs/misc/emulators/wine/default.nix index a59bce94ab5..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.15"; + name = "wine-${meta.version}"; src = fetchurl { url = "mirror://sourceforge/wine/${name}.tar.bz2"; - sha256 = "0m4lnqq4aniczp6m67m2n2ijz9h8z83ka3y30kyxkidv0j16jhi6"; + 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/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/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/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 ad69486622e..346ecf5660e 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.0.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.0.nix @@ -230,7 +230,7 @@ in import ./generic.nix ( rec { - version = "3.0.49"; + version = "3.0.52"; preConfigure = '' substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' "" @@ -238,7 +238,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0h24c0mhxznnlqgqq9yf12ad5g1ya33qjjcahzhaafb7kwvjkqyx"; + sha256 = "09iszqkxnwkcmm4cwh7320jrwbpwgzx0v05l8mq36p8ix3s926k6"; }; config = configWithPlatform stdenv.platform; diff --git a/pkgs/os-specific/linux/kernel/linux-3.2.nix b/pkgs/os-specific/linux/kernel/linux-3.2.nix index f1f45b9aae3..77fb9bd1e45 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.2.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.2.nix @@ -237,7 +237,7 @@ in import ./generic.nix ( rec { - version = "3.2.33"; + 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 = "19m8w332vlm0h1by365k1f85q2j067klr5ryrkkihdymwl3ddb3n"; + sha256 = "0j99pg1kdrj200wda7w2v4d272y4x0hyrp3w540a6rj00gkxsmn4"; }; config = configWithPlatform stdenv.platform; diff --git a/pkgs/os-specific/linux/kernel/linux-3.4.nix b/pkgs/os-specific/linux/kernel/linux-3.4.nix index af1c8c2d512..df38aec881b 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix @@ -239,7 +239,7 @@ in import ./generic.nix ( rec { - version = "3.4.16"; + 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 = "1dg8zy33vri71yv6zavyfyr5dg2wl4xz5ll8gqa4kjlq8hn8d5s2"; + sha256 = "0zf5da2yfy10ml0f7rpzdbfj9avayw2i9mpm07xhjamw717b82bh"; }; config = configWithPlatform stdenv.platform; diff --git a/pkgs/os-specific/linux/kernel/linux-3.6.nix b/pkgs/os-specific/linux/kernel/linux-3.6.nix index 02a509e7df2..5334712865b 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.6.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.6.nix @@ -244,7 +244,7 @@ in import ./generic.nix ( rec { - version = "3.6.4"; + version = "3.6.7"; testing = false; preConfigure = '' @@ -253,7 +253,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "0y64hd9cdrg9fpkwsww8s7dvq7z55k55a5pd06kkr1kwgjxqnj4a"; + sha256 = "08ivh0md8lcq4xqq98y2ripfb02pykh6qla4zspj76qvl0awvp3x"; }; config = configWithPlatform stdenv.platform; 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 4fb7563c9a1..d42581e457e 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -230,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; @@ -262,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/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix index 63a2a8454aa..29d56a60e95 100644 --- a/pkgs/os-specific/linux/spl/default.nix +++ b/pkgs/os-specific/linux/spl/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, kernel, perl, autoconf, automake, libtool, coreutils, gawk }: stdenv.mkDerivation { - name = "spl-0.6.0-rc11"; + name = "spl-0.6.0-rc12"; src = fetchurl { - url = http://github.com/downloads/zfsonlinux/spl/spl-0.6.0-rc11.tar.gz; - sha256 = "0brsrr9hvzlpx7a26nn8rw9k2kh9s75hmxp6h087hi64hzxysf8g"; + 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 ]; @@ -33,23 +33,13 @@ stdenv.mkDerivation { 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. - - LICENSE NOTE: the Linux kernel is licensed under the GNU General Public - License which is incompatible with ZFS which is licensed under the Sun CDDL. - While both the GPL and CDDL are open source licenses their terms are such that - it is impossible to simultaneously satisfy both licenses. This means that a - single derived work of the Linux kernel and ZFS cannot be legally distributed. - - The ZFS code can be modified to build as a CDDL licensed kernel module - which is not distributed as part of the Linux kernel. This makes a Native ZFS - on Linux implementation possible if you are willing to download and build it - yourself. + 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.cddl; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [ jcumming ]; }; } 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 index 4c13320f6d8..1768581d8f9 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -1,19 +1,21 @@ -{ stdenv, fetchurl, kernel, spl, perl, zlib, libuuid, coreutils, utillinux }: +{ stdenv, fetchurl, kernel, spl, perl, autoconf, automake, libtool, zlib, libuuid, coreutils, utillinux }: stdenv.mkDerivation { - name = "zfs-0.6.0-rc11"; + name = "zfs-0.6.0-rc12"; src = fetchurl { - url = http://github.com/downloads/zfsonlinux/zfs/zfs-0.6.0-rc11.tar.gz; - sha256 = "0wx0srn2k31j9xdk3nvk7l847r0diyb7ph6hd006ax9l5p9zj0a7"; + 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 zlib libuuid coreutils ]; + 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" @@ -25,31 +27,19 @@ stdenv.mkDerivation { --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. - - LICENSE NOTE: the Linux kernel is licensed under the GNU General Public - License which is incompatible with ZFS which is licensed under the Sun CDDL. - While both the GPL and CDDL are open source licenses their terms are such that - it is impossible to simultaneously satisfy both licenses. This means that a - single derived work of the Linux kernel and ZFS cannot be legally distributed. - - The ZFS code can be modified to build as a CDDL licensed kernel module - which is not distributed as part of the Linux kernel. This makes a Native ZFS - on Linux implementation possible if you are willing to download and build it - yourself. ''; - homepage = http://zfsonlinux.org/; - platforms = stdenv.lib.platforms.linux; 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 index 7deda946821..4503ac4ca48 100644 --- a/pkgs/os-specific/linux/zfs/kerneldir_path.patch +++ b/pkgs/os-specific/linux/zfs/kerneldir_path.patch @@ -1,140 +1,85 @@ -diff -rc zfs-0.6.0-rc10.old/Makefile.in zfs-0.6.0-rc10/Makefile.in -*** zfs-0.6.0-rc10.old/Makefile.in Tue Aug 14 12:35:34 2012 ---- zfs-0.6.0-rc10/Makefile.in Fri Aug 17 15:21:18 2012 -*************** -*** 1121,1127 **** - - @CONFIG_KERNEL_TRUE@install-data-local: - @CONFIG_KERNEL_TRUE@ release=$(ZFS_META_VERSION)-$(ZFS_META_RELEASE); \ -! @CONFIG_KERNEL_TRUE@ instdest=$(DESTDIR)/usr/src/zfs-$$release/$(LINUX_VERSION); \ - @CONFIG_KERNEL_TRUE@ for instfile in $(noinst_HEADERS) module/$(LINUX_SYMBOLS); do \ - @CONFIG_KERNEL_TRUE@ $(INSTALL) -D $$instfile $$instdest/$$instfile; \ - @CONFIG_KERNEL_TRUE@ done ---- 1121,1127 ---- - - @CONFIG_KERNEL_TRUE@install-data-local: - @CONFIG_KERNEL_TRUE@ release=$(ZFS_META_VERSION)-$(ZFS_META_RELEASE); \ -! @CONFIG_KERNEL_TRUE@ instdest=$(DESTDIR)/@libexecdir@/zfs/$(LINUX_VERSION); \ - @CONFIG_KERNEL_TRUE@ for instfile in $(noinst_HEADERS) module/$(LINUX_SYMBOLS); do \ - @CONFIG_KERNEL_TRUE@ $(INSTALL) -D $$instfile $$instdest/$$instfile; \ - @CONFIG_KERNEL_TRUE@ done -diff -rc zfs-0.6.0-rc10.old/include/Makefile.in zfs-0.6.0-rc10/include/Makefile.in -*** zfs-0.6.0-rc10.old/include/Makefile.in Tue Aug 14 12:35:32 2012 ---- zfs-0.6.0-rc10/include/Makefile.in Fri Aug 17 15:20:50 2012 -*************** -*** 402,408 **** - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs - @CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H) -! @CONFIG_KERNEL_TRUE@kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)-$(ZFS_META_RELEASE)/$(LINUX_VERSION) - @CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H) - all: all-recursive - ---- 402,408 ---- - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs - @CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H) -! @CONFIG_KERNEL_TRUE@kerneldir = $(DESTDIR)/@libexecdir@/zfs/$(LINUX_VERSION) - @CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H) - all: all-recursive - -diff -rc zfs-0.6.0-rc10.old/include/linux/Makefile.in zfs-0.6.0-rc10/include/linux/Makefile.in -*** zfs-0.6.0-rc10.old/include/linux/Makefile.in Tue Aug 14 12:35:32 2012 ---- zfs-0.6.0-rc10/include/linux/Makefile.in Fri Aug 17 15:20:53 2012 -*************** -*** 337,343 **** - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs/linux - @CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H) -! @CONFIG_KERNEL_TRUE@kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)-$(ZFS_META_RELEASE)/$(LINUX_VERSION)/linux - @CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H) - all: all-am - ---- 337,343 ---- - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs/linux - @CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H) -! @CONFIG_KERNEL_TRUE@kerneldir = $(DESTDIR)/@libexecdir@/zfs/$(LINUX_VERSION)/linux - @CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H) - all: all-am - -diff -rc zfs-0.6.0-rc10.old/include/sys/Makefile.in zfs-0.6.0-rc10/include/sys/Makefile.in -*** zfs-0.6.0-rc10.old/include/sys/Makefile.in Tue Aug 14 12:35:32 2012 ---- zfs-0.6.0-rc10/include/sys/Makefile.in Fri Aug 17 15:20:57 2012 -*************** -*** 590,596 **** - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs/sys - @CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H) -! @CONFIG_KERNEL_TRUE@kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)-$(ZFS_META_RELEASE)/$(LINUX_VERSION)/sys - @CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H) - all: all-recursive - ---- 590,596 ---- - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs/sys - @CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H) -! @CONFIG_KERNEL_TRUE@kerneldir = $(DESTDIR)/@libexecdir@/zfs/$(LINUX_VERSION)/sys - @CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H) - all: all-recursive - -diff -rc zfs-0.6.0-rc10.old/include/sys/fm/Makefile.in zfs-0.6.0-rc10/include/sys/fm/Makefile.in -*** zfs-0.6.0-rc10.old/include/sys/fm/Makefile.in Tue Aug 14 12:35:32 2012 ---- zfs-0.6.0-rc10/include/sys/fm/Makefile.in Fri Aug 17 15:21:00 2012 -*************** -*** 374,380 **** - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs/sys/fm - @CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H) -! @CONFIG_KERNEL_TRUE@kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)-$(ZFS_META_RELEASE)/$(LINUX_VERSION)/sys/fm - @CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H) - all: all-recursive - ---- 374,380 ---- - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs/sys/fm - @CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H) -! @CONFIG_KERNEL_TRUE@kerneldir = $(DESTDIR)/@libexecdir@/zfs/$(LINUX_VERSION)/sys/fm - @CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H) - all: all-recursive - -diff -rc zfs-0.6.0-rc10.old/include/sys/fm/fs/Makefile.in zfs-0.6.0-rc10/include/sys/fm/fs/Makefile.in -*** zfs-0.6.0-rc10.old/include/sys/fm/fs/Makefile.in Tue Aug 14 12:35:32 2012 ---- zfs-0.6.0-rc10/include/sys/fm/fs/Makefile.in Fri Aug 17 15:21:03 2012 -*************** -*** 332,338 **** - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs/sys/fm/fs - @CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H) -! @CONFIG_KERNEL_TRUE@kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)-$(ZFS_META_RELEASE)/$(LINUX_VERSION)/sys/fm/fs - @CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H) - all: all-am - ---- 332,338 ---- - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs/sys/fm/fs - @CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H) -! @CONFIG_KERNEL_TRUE@kerneldir = $(DESTDIR)/@libexecdir@/zfs/$(LINUX_VERSION)/sys/fm/fs - @CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H) - all: all-am - -diff -rc zfs-0.6.0-rc10.old/include/sys/fs/Makefile.in zfs-0.6.0-rc10/include/sys/fs/Makefile.in -*** zfs-0.6.0-rc10.old/include/sys/fs/Makefile.in Tue Aug 14 12:35:32 2012 ---- zfs-0.6.0-rc10/include/sys/fs/Makefile.in Fri Aug 17 15:21:06 2012 -*************** -*** 332,338 **** - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs/sys/fs - @CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H) -! @CONFIG_KERNEL_TRUE@kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)-$(ZFS_META_RELEASE)/$(LINUX_VERSION)/sys/fs - @CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H) - all: all-am - ---- 332,338 ---- - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs/sys/fs - @CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H) -! @CONFIG_KERNEL_TRUE@kerneldir = $(DESTDIR)/@libexecdir@/zfs/$(LINUX_VERSION)/sys/fs - @CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H) - all: all-am - +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/mount_zfs_prefix.patch b/pkgs/os-specific/linux/zfs/mount_zfs_prefix.patch index 94710c5c985..49ad88fc3a4 100644 --- a/pkgs/os-specific/linux/zfs/mount_zfs_prefix.patch +++ b/pkgs/os-specific/linux/zfs/mount_zfs_prefix.patch @@ -1,24 +1,24 @@ -*** zfs-0.6.0-rc4.old/cmd/mount_zfs/Makefile.in Thu May 5 15:12:25 2011 ---- zfs-0.6.0-rc4/cmd/mount_zfs/Makefile.in Fri Jun 3 16:42:41 2011 +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 *************** -*** 285,296 **** - prefix = @prefix@ - program_transform_name = @program_transform_name@ - psdir = @psdir@ -! -! # -! # 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 - sharedstatedir = @sharedstatedir@ - srcdir = @srcdir@ - sysconfdir = @sysconfdir@ ---- 285,291 ---- - prefix = @prefix@ - program_transform_name = @program_transform_name@ - psdir = @psdir@ -! sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ - srcdir = @srcdir@ - sysconfdir = @sysconfdir@ +*** 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/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/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/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index d34ccce7fe9..057142a8707 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -158,6 +158,7 @@ in }; xf86videosis = attrs: attrs // { + NIX_CFLAGS_COMPILE = "-I${xorg.pixman}/include/pixman-1"; buildInputs = attrs.buildInputs ++ [xorg.glproto args.mesa]; }; @@ -176,13 +177,9 @@ in buildInputs = attrs.buildInputs ++ [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]; + xf86videoopenchrome = attrs: attrs // { + NIX_CFLAGS_COMPILE = "-I${xorg.pixman}/include/pixman-1"; + buildInputs = attrs.buildInputs ++ [xorg.pixman xorg.glproto args.mesa]; }; xf86videonv = attrs: attrs // { diff --git a/pkgs/tools/archivers/sharutils/default.nix b/pkgs/tools/archivers/sharutils/default.nix index 15b8ead7d38..2773e112a49 100644 --- a/pkgs/tools/archivers/sharutils/default.nix +++ b/pkgs/tools/archivers/sharutils/default.nix @@ -13,6 +13,10 @@ stdenv.mkDerivation rec { doCheck = true; + crossAttrs = { + patches = [ ./sharutils-4.11.1-cross-binary-mode-popen.patch ]; + }; + meta = { description = "GNU Sharutils, tools for remote synchronization and `shell archives'"; diff --git a/pkgs/tools/archivers/sharutils/sharutils-4.11.1-cross-binary-mode-popen.patch b/pkgs/tools/archivers/sharutils/sharutils-4.11.1-cross-binary-mode-popen.patch new file mode 100644 index 00000000000..f05eab251d4 --- /dev/null +++ b/pkgs/tools/archivers/sharutils/sharutils-4.11.1-cross-binary-mode-popen.patch @@ -0,0 +1,63 @@ +diff -Naur sharutils-4.11.1.orig/configure sharutils-4.11.1/configure +--- sharutils-4.11.1.orig/configure 2011-06-20 11:07:40.000000000 -0400 ++++ sharutils-4.11.1/configure 2011-06-20 11:09:30.000000000 -0400 +@@ -26962,33 +26962,33 @@ + CATALOGS="$new_CATALOGS" + fi + +-if test "$cross_compiling" = yes; then : +- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error $? "cannot run test program while cross compiling +-See \`config.log' for more details" "$LINENO" 5; } +-else +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +-int +-main () +-{ +- FILE * fp = popen ("date", "rb"); +- exit (fp == NULL); +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_run "$LINENO"; then : +- ++#if test "$cross_compiling" = yes; then : ++# { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++#$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++#as_fn_error $? "cannot run test program while cross compiling ++#See \`config.log' for more details" "$LINENO" 5; } ++#else ++# cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++#/* end confdefs.h. */ ++# ++#int ++#main () ++#{ ++# FILE * fp = popen ("date", "rb"); ++# exit (fp == NULL); ++# ; ++# return 0; ++#} ++#_ACEOF ++#if ac_fn_c_try_run "$LINENO"; then : ++# + $as_echo "#define BINARY_MODE_POPEN 1" >>confdefs.h +- +- +-fi +-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ +- conftest.$ac_objext conftest.beam conftest.$ac_ext +-fi ++# ++# ++#fi ++#rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ ++# conftest.$ac_objext conftest.beam conftest.$ac_ext ++#fi + + + diff --git a/pkgs/tools/archivers/zip/default.nix b/pkgs/tools/archivers/zip/default.nix index c7bddfd6de2..2e3f111aba4 100644 --- a/pkgs/tools/archivers/zip/default.nix +++ b/pkgs/tools/archivers/zip/default.nix @@ -6,7 +6,10 @@ stdenv.mkDerivation { name = "zip-3.0"; src = fetchurl { - url = ftp://ftp.info-zip.org/pub/infozip/src/zip30.tgz; + urls = [ + ftp://ftp.info-zip.org/pub/infozip/src/zip30.tgz + http://pkgs.fedoraproject.org/repo/pkgs/zip/zip30.tar.gz/7b74551e63f8ee6aab6fbc86676c0d37/zip30.tar.gz + ]; sha256 = "0sb3h3067pzf3a7mlxn1hikpcjrsvycjcnj9hl9b1c3ykcgvps7h"; }; diff --git a/pkgs/tools/graphics/graphviz/default.nix b/pkgs/tools/graphics/graphviz/default.nix index 4edec43e243..db4d766b760 100644 --- a/pkgs/tools/graphics/graphviz/default.nix +++ b/pkgs/tools/graphics/graphviz/default.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { pango gd gts ] ++ stdenv.lib.optionals (xlibs != null) [ xlibs.xlibs xlibs.libXrender ]; + patches = [ ./fix-broken-memcp-signature.patch ]; + configureFlags = [ "--with-pngincludedir=${libpng}/include" "--with-pnglibdir=${libpng}/lib" diff --git a/pkgs/tools/graphics/graphviz/fix-broken-memcp-signature.patch b/pkgs/tools/graphics/graphviz/fix-broken-memcp-signature.patch new file mode 100644 index 00000000000..e93728d4850 --- /dev/null +++ b/pkgs/tools/graphics/graphviz/fix-broken-memcp-signature.patch @@ -0,0 +1,15 @@ +diff -ubr graphviz-2.28.0-orig/lib/cdt/cdt.h graphviz-2.28.0-new/lib/cdt/cdt.h +--- graphviz-2.28.0-orig/lib/cdt/cdt.h 2012-11-11 20:05:55.674397100 +0100 ++++ graphviz-2.28.0-new/lib/cdt/cdt.h 2012-11-11 20:06:28.069511092 +0100 +@@ -238,11 +238,6 @@ + extern int dtstat _ARG_((Dt_t*, Dtstat_t*, int)); + extern unsigned int dtstrhash _ARG_((unsigned int, Void_t*, int)); + +-#if !_PACKAGE_ast +-extern int memcmp _ARG_((const Void_t*, const Void_t*, size_t)); +-extern int strcmp _ARG_((const char*, const char*)); +-#endif +- + #undef extern + _END_EXTERNS_ + diff --git a/pkgs/tools/graphics/plotutils/debian-patches.nix b/pkgs/tools/graphics/plotutils/debian-patches.nix index d72974445e6..0615d1f52e1 100644 --- a/pkgs/tools/graphics/plotutils/debian-patches.nix +++ b/pkgs/tools/graphics/plotutils/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/plotutils/2.6-2"; + prefix = "http://patch-tracker.debian.org/patch/series/dl/plotutils/2.6-3"; in [ { diff --git a/pkgs/tools/misc/file/default.nix b/pkgs/tools/misc/file/default.nix index 01a674fe227..38fb0b78cb1 100644 --- a/pkgs/tools/misc/file/default.nix +++ b/pkgs/tools/misc/file/default.nix @@ -4,7 +4,10 @@ stdenv.mkDerivation { name = "file-5.04"; src = fetchurl { - url = ftp://ftp.astron.com/pub/file/file-5.04.tar.gz; + urls = [ + ftp://ftp.astron.com/pub/file/file-5.04.tar.gz + http://pkgs.fedoraproject.org/repo/pkgs/file/file-5.04.tar.gz/accade81ff1cc774904b47c72c8aeea0/file-5.04.tar.gz + ]; sha256 = "0316lj3jxmp2g8azv0iykmmwjsnjanq93bklccwb6k77jiwnx7jc"; }; diff --git a/pkgs/tools/misc/jdiskreport/builder.sh b/pkgs/tools/misc/jdiskreport/builder.sh index 1e73b674c15..cdc5f94bde0 100644 --- a/pkgs/tools/misc/jdiskreport/builder.sh +++ b/pkgs/tools/misc/jdiskreport/builder.sh @@ -2,13 +2,14 @@ source $stdenv/setup unzip $src -mkdir -p $out/jars -mv */*.jar $out/jars -jar=$(ls $out/jars/jdiskreport-*.jar) +jar=$(ls */*.jar) + +mkdir -p $out/lib/java +mv $jar $out/lib/java mkdir -p $out/bin cat > $out/bin/jdiskreport < { - 'daemon' => setv(T_DELAY, 0, 0, 1, 0, interval('60s')), -! 'file' => setv(T_FILE, 0, 0, 1, "$etc$program.conf", undef), - 'cache' => setv(T_FILE, 0, 0, 1, "$cachedir$program.cache", undef), - 'pid' => setv(T_FILE, 0, 0, 1, "", undef), - 'proxy' => setv(T_FQDNP, 0, 0, 1, '', undef), ---- 307,314 ---- - my %variables = ( - 'global-defaults' => { - 'daemon' => setv(T_DELAY, 0, 0, 1, 0, interval('60s')), -! 'foreground' => setv(T_BOOL, 0, 0, 1, 0, undef), -! 'file' => setv(T_FILE, 0, 0, 1, "$etc$program.conf", undef), - 'cache' => setv(T_FILE, 0, 0, 1, "$cachedir$program.cache", undef), - 'pid' => setv(T_FILE, 0, 0, 1, "", undef), - 'proxy' => setv(T_FQDNP, 0, 0, 1, '', undef), -*************** -*** 535,540 **** ---- 536,542 ---- - "usage: ${program} [options]", - "options are:", - [ "daemon", "=s", "-daemon delay : run as a daemon, specify delay as an interval." ], -+ [ "foreground", "!", "-foreground : do not fork" ], - [ "proxy", "=s", "-proxy host : use 'host' as the HTTP proxy" ], - [ "server", "=s", "-server host : update DNS information on 'host'" ], - [ "protocol", "=s", "-protocol type : update protocol used" ], -*************** -*** 623,629 **** - $SIG{'HUP'} = sub { $caught_hup = 1; }; - $SIG{'TERM'} = sub { $caught_term = 1; }; - $SIG{'KILL'} = sub { $caught_kill = 1; }; -! if (opt('daemon') && !opt('force')) { - $SIG{'CHLD'} = 'IGNORE'; - my $pid = fork; - if ($pid < 0) { ---- 625,634 ---- - $SIG{'HUP'} = sub { $caught_hup = 1; }; - $SIG{'TERM'} = sub { $caught_term = 1; }; - $SIG{'KILL'} = sub { $caught_kill = 1; }; -! # don't fork() if foreground or force is on -! if (opt('foreground') || opt('force')) { -! ; -! } elsif (opt('daemon')) { - $SIG{'CHLD'} = 'IGNORE'; - my $pid = fork; - if ($pid < 0) { -*************** -*** 633,644 **** - exit 0; - } - $SIG{'CHLD'} = 'DEFAULT'; -- $opt{'syslog'} = 1; - open(STDOUT, ">/dev/null"); - open(STDERR, ">/dev/null"); - open(STDIN, "/dev/null"); - open(STDERR, ">/dev/null"); - open(STDIN, "/dev/null || exit 1@alias which="type -p"@' update-smart-drivedb.in + ''; meta = { description = "Tools for monitoring the health of hard drivers"; diff --git a/pkgs/tools/virtualization/ec2-api-tools/default.nix b/pkgs/tools/virtualization/ec2-api-tools/default.nix index 22669c67b12..ac2902aab94 100644 --- a/pkgs/tools/virtualization/ec2-api-tools/default.nix +++ b/pkgs/tools/virtualization/ec2-api-tools/default.nix @@ -1,28 +1,31 @@ { stdenv, fetchurl, unzip, makeWrapper, jre }: stdenv.mkDerivation rec { - name = "ec2-api-tools-1.6.0.0"; - + name = "ec2-api-tools-1.6.5.1"; + src = fetchurl { url = "http://nixos.org/tarballs/${name}.zip"; - sha256 = "1j9isvi6g68zhk7zxs29yad2d0rpnbqx8fz25yn5paqx9c8pzqcl"; + sha256 = "1j2pc20vggi4hv950999mhh7dl6475yma76nyj6k0hzkd1lf5hda"; }; buildInputs = [ unzip makeWrapper ]; installPhase = '' - mkdir -p $out - mv * $out - rm $out/bin/*.cmd # Windows stuff + d=$out/libexec/ec2-api-tools + mkdir -p $d + mv * $d + rm $d/bin/*.cmd # Windows stuff - for i in $out/bin/*; do - wrapProgram $i \ - --set EC2_HOME $out \ + for i in $d/bin/*; do + b=$(basename $i) + if [ $b = "ec2-cmd" ]; then continue; fi + makeWrapper $i $out/bin/$(basename $i) \ + --set EC2_HOME $d \ --set JAVA_HOME ${jre} done ''; # */ - + meta = { homepage = http://developer.amazonwebservices.com/connect/entry.jspa?externalID=351; description = "Command-line tools to create and manage Amazon EC2 virtual machines"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9cc10a68968..159aee43116 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -402,6 +402,13 @@ let client = true; }); + androidenv = import ../development/androidenv { + inherit pkgs; + pkgs_i686 = pkgsi686Linux; + }; + + inherit (androidenv) androidsdk_4_1; + aria = builderDefsPackage (import ../tools/networking/aria) { }; aria2 = callPackage ../tools/networking/aria2 { }; @@ -732,6 +739,9 @@ let fortune = callPackage ../tools/misc/fortune { }; + fox = callPackage ../development/libraries/fox/default.nix { }; + fox_1_6 = callPackage ../development/libraries/fox/fox-1.6.nix { }; + fprot = callPackage ../tools/security/fprot { }; freeipmi = callPackage ../tools/system/freeipmi {}; @@ -1441,6 +1451,8 @@ let sablotron = callPackage ../tools/text/xml/sablotron { }; + safecopy = callPackage ../tools/system/safecopy { }; + salut_a_toi = callPackage ../applications/networking/instant-messengers/salut-a-toi {}; screen = callPackage ../tools/misc/screen { }; @@ -1636,6 +1648,17 @@ let tkabber_plugins = callPackage ../applications/networking/instant-messengers/tkabber-plugins { }; + qfsm = callPackage ../applications/science/electronics/qfsm { }; + + tkgate = callPackage ../applications/science/electronics/tkgate/1.x.nix { + inherit (xlibs) libX11 imake xproto gccmakedep; + }; + + # The newer package is low-priority because it segfaults at startup. + tkgate2 = lowPrio (callPackage ../applications/science/electronics/tkgate/2.x.nix { + inherit (xlibs) libX11; + }); + tm = callPackage ../tools/system/tm { }; trang = callPackage ../tools/text/xml/trang { }; @@ -1951,7 +1974,19 @@ let cross = assert crossSystem != null; crossSystem; }); - gcc_realCross = gcc46_realCross; + gcc47_realCross = lib.addMetaAttrs { platforms = []; } + (makeOverridable (import ../development/compilers/gcc/4.7) { + inherit fetchurl stdenv texinfo gmp mpfr mpc libelf zlib + cloog ppl gettext which noSysDirs; + binutilsCross = binutilsCross; + libcCross = libcCross; + profiledCompiler = false; + enableMultilib = false; + crossStageStatic = false; + cross = assert crossSystem != null; crossSystem; + }); + + gcc_realCross = gcc47_realCross; gccCrossStageStatic = let isMingw = (stdenv.cross.libc == "msvcrt"); @@ -2319,9 +2354,9 @@ let # particularly in connection with Hydra builds for all these packages. # So we enable it for selected versions only. - # Current default version: 7.4.1. - haskellPackages = haskellPackages_ghc741; - # Current Haskell platform. + # Current default version: 7.4.2. + haskellPackages = haskellPackages_ghc742; + # Current Haskell Platform: 2012.4.0.0 haskellPlatform = haskellPackages.haskellPlatform; haskellPackages_ghc6104 = recurseIntoAttrs (haskell.packages_ghc6104); @@ -2338,11 +2373,10 @@ let # The following three lines achieve that: the first two make Hydra build explicit # profiling and non-profiling versions; the final respects the user-configured # default setting. - haskellPackages_ghc741_no_profiling = recurseIntoAttrs (haskell.packages_ghc741.noProfiling); - haskellPackages_ghc741_profiling = recurseIntoAttrs (haskell.packages_ghc741.profiling); - haskellPackages_ghc741 = recurseIntoAttrs (haskell.packages_ghc741.highPrio); - haskellPackages_ghc742 = recurseIntoAttrs (haskell.packages_ghc742); - haskellPackages_ghc742_pedantic = haskell.packages_ghc742_pedantic; + haskellPackages_ghc741 = recurseIntoAttrs (haskell.packages_ghc741); + haskellPackages_ghc742_no_profiling = recurseIntoAttrs (haskell.packages_ghc741.noProfiling); + haskellPackages_ghc742_profiling = recurseIntoAttrs (haskell.packages_ghc741.profiling); + haskellPackages_ghc742 = recurseIntoAttrs (haskell.packages_ghc742.highPrio); haskellPackages_ghc761 = recurseIntoAttrs (haskell.packages_ghc761); # Reasonably current HEAD snapshot. haskellPackages_ghcHEAD = haskell.packages_ghcHEAD; @@ -2708,9 +2742,9 @@ let clooj = clooj_standalone_binary; }; - erlang = callPackage ../development/interpreters/erlang { }; - erlangR14B04 = callPackage ../development/interpreters/erlang/R14B04.nix { }; + erlangR15B02 = callPackage ../development/interpreters/erlang/R15B02.nix { }; + erlang = erlangR15B02; groovy = callPackage ../development/interpreters/groovy { }; @@ -2952,11 +2986,11 @@ let gold = true; }; - binutilsCross = forceBuildDrv (import ../development/tools/misc/binutils { + binutilsCross = lowPrio (forceBuildDrv (import ../development/tools/misc/binutils { inherit stdenv fetchurl zlib; noSysDirs = true; cross = assert crossSystem != null; crossSystem; - }); + })); bison = bison25; @@ -3151,6 +3185,10 @@ let mk = callPackage ../development/tools/build-managers/mk { }; + neoload = callPackage ../development/tools/neoload { + licenseAccepted = (config.neoload.accept_license or false); + }; + noweb = callPackage ../development/tools/literate-programming/noweb { }; omake = callPackage ../development/tools/ocaml/omake { }; @@ -3238,9 +3276,9 @@ let inherit (gnu) mig; }; - gdbCross = callPackage ../development/tools/misc/gdb { + gdbCross = lowPrio (callPackage ../development/tools/misc/gdb { target = crossSystem; - }; + }); valgrind = callPackage ../development/tools/analysis/valgrind { stdenv = @@ -3331,11 +3369,13 @@ let boost147 = callPackage ../development/libraries/boost/1.47.nix { }; boost149 = callPackage ../development/libraries/boost/1.49.nix { }; boost151 = callPackage ../development/libraries/boost/1.51.nix { }; - boost = boost151; + boost152 = callPackage ../development/libraries/boost/1.52.nix { }; + boost = boost152; boostHeaders149 = callPackage ../development/libraries/boost/1.49-headers.nix { }; boostHeaders151 = callPackage ../development/libraries/boost/1.51-headers.nix { }; - boostHeaders = boostHeaders151; + boostHeaders152 = callPackage ../development/libraries/boost/1.52-headers.nix { }; + boostHeaders = boostHeaders152; botan = callPackage ../development/libraries/botan { }; @@ -3808,7 +3848,9 @@ let gnutls_without_guile = gnutls.override { guileBindings = false; }; gnutls2_without_guile = gnutls2.override { guileBindings = false; }; - gpgme = callPackage ../development/libraries/gpgme { }; + gpgme = callPackage ../development/libraries/gpgme { + gnupg1 = gnupg1orig; + }; grantlee = callPackage ../development/libraries/grantlee { }; @@ -4967,6 +5009,8 @@ let vtk = callPackage ../development/libraries/vtk { }; + vtkWithQt4 = vtk.override { useQt4 = true; }; + vxl = callPackage ../development/libraries/vxl { libpng = libpng12; }; @@ -5866,9 +5910,11 @@ let kernelPatches.sec_perm_2_6_24 kernelPatches.aufs3_5 kernelPatches.perf3_5 + kernelPatches.cifs_timeout_3_5_7 ] ++ lib.optionals (platform.kernelArch == "mips") [ kernelPatches.mips_fpureg_emu kernelPatches.mips_fpu_sigill + kernelPatches.mips_ext3_n32 ]; }; @@ -5881,6 +5927,7 @@ let ] ++ lib.optionals (platform.kernelArch == "mips") [ kernelPatches.mips_fpureg_emu kernelPatches.mips_fpu_sigill + kernelPatches.mips_ext3_n32 ]; }; @@ -6228,12 +6275,12 @@ let uclibc = callPackage ../os-specific/linux/uclibc { }; - uclibcCross = callPackage ../os-specific/linux/uclibc { + uclibcCross = lowPrio (callPackage ../os-specific/linux/uclibc { inherit fetchurl stdenv libiconv; linuxHeaders = linuxHeadersCross; gccCross = gccCrossStageStatic; cross = assert crossSystem != null; crossSystem; - }; + }); udev145 = callPackage ../os-specific/linux/udev/145.nix { }; udev173 = callPackage ../os-specific/linux/udev/173.nix { }; @@ -6510,7 +6557,9 @@ let aangifte2011 = callPackage_i686 ../applications/taxes/aangifte-2011 { }; - abcde = callPackage ../applications/audio/abcde { }; + abcde = callPackage ../applications/audio/abcde { + inherit (perlPackages) DigestSHA MusicBrainz MusicBrainzDiscID; + }; abiword = callPackage ../applications/office/abiword { inherit (gnome) libglade libgnomecanvas; @@ -6697,7 +6746,9 @@ let djview = callPackage ../applications/graphics/djview { }; djview4 = pkgs.djview; - dmenu = callPackage ../applications/misc/dmenu { }; + dmenu = callPackage ../applications/misc/dmenu { + enableXft = config.dmenu.enableXft or false; + }; dmtx = builderDefsPackage (import ../tools/graphics/dmtx) { inherit libpng libtiff libjpeg imagemagick librsvg @@ -6809,6 +6860,8 @@ let gh = callPackage ../applications/editors/emacs-modes/gh { }; + graphvizDot = callPackage ../applications/editors/emacs-modes/graphviz-dot { }; + gist = callPackage ../applications/editors/emacs-modes/gist { }; jade = callPackage ../applications/editors/emacs-modes/jade { }; @@ -6918,6 +6971,8 @@ let fossil = callPackage ../applications/version-management/fossil { }; + geany = callPackage ../applications/editors/geany { }; + goldendict = callPackage ../applications/misc/goldendict { }; grass = import ../applications/misc/grass { @@ -6962,6 +7017,12 @@ let firefox36Wrapper = wrapFirefox { browser = firefox36Pkgs.firefox; }; + firefox13Pkgs = callPackage ../applications/networking/browsers/firefox/13.0.nix { + inherit (gnome) libIDL; + }; + + firefox13Wrapper = lowPrio (wrapFirefox { browser = firefox13Pkgs.firefox; }); + firefox15Pkgs = callPackage ../applications/networking/browsers/firefox/15.0.nix { inherit (gnome) libIDL; inherit (pythonPackages) pysqlite; @@ -7033,6 +7094,8 @@ let pcre = pcre.override { unicodeSupport = true; }; }; + gmrun = callPackage ../applications/misc/gmrun {}; + gnucash = callPackage ../applications/office/gnucash { inherit (gnome) libgnomeui libgtkhtml gtkhtml libbonoboui libgnomeprint; gconf = gnome.GConf; @@ -7256,6 +7319,8 @@ let kermit = callPackage ../tools/misc/kermit { }; + keymon = callPackage ../applications/video/key-mon { }; + kino = callPackage ../applications/video/kino { inherit (gnome) libglade; }; @@ -7477,6 +7542,8 @@ let novaclient = callPackage ../applications/virtualization/nova/client.nix { }; + nspluginwrapper = callPackage ../applications/networking/browsers/mozilla-plugins/nspluginwrapper {}; + nvi = callPackage ../applications/editors/nvi { }; ocrad = callPackage ../applications/graphics/ocrad { }; @@ -7590,6 +7657,8 @@ let qsynth = callPackage ../applications/audio/qsynth { }; + qtcreator = callPackage ../development/qtcreator { }; + qtpfsgui = callPackage ../applications/graphics/qtpfsgui { }; qtractor = callPackage ../applications/audio/qtractor { }; @@ -7655,7 +7724,7 @@ let siproxd = callPackage ../applications/networking/siproxd { }; - skype_linux = callPackage_i686 ../applications/networking/instant-messengers/skype { + skype = callPackage_i686 ../applications/networking/instant-messengers/skype { usePulseAudio = config.pulseaudio or false; # disabled by default (the 100% cpu bug) }; @@ -7694,6 +7763,8 @@ let clisp = clisp_2_44_1; }; + sublime = callPackage ../applications/editors/sublime { }; + subversion = callPackage ../applications/version-management/subversion/default.nix { neon = pkgs.neon029; bdbSupport = true; @@ -7819,10 +7890,11 @@ let uwimap = callPackage ../tools/networking/uwimap { }; uzbl = builderDefsPackage (import ../applications/networking/browsers/uzbl) { - inherit pkgconfig webkit makeWrapper glib_networking; - inherit gtk3 glib; + inherit pkgconfig webkit makeWrapper glib_networking python3; + inherit glib pango cairo gdk_pixbuf atk; inherit (xlibs) libX11 kbproto; inherit (gnome) libsoup; + gtk = gtk3; }; vdpauinfo = callPackage ../tools/X11/vdpauinfo { }; @@ -7889,6 +7961,8 @@ let wings = callPackage ../applications/graphics/wings { }; + wmname = callPackage ../applications/misc/wmname { }; + # I'm keen on wmiimenu only >wmii-3.5 no longer has it... wmiimenu = import ../applications/window-managers/wmii31 { libixp = libixp_for_wmii; @@ -7966,6 +8040,8 @@ let xen = callPackage ../applications/virtualization/xen { }; + xfe = callPackage ../applications/misc/xfe { }; + xfig = callPackage ../applications/graphics/xfig { stdenv = overrideGCC stdenv gcc34; }; diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index b4489fe72e5..aa43203fe53 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -22,18 +22,12 @@ extensibleExceptions = self.extensibleExceptions_0_1_1_4; }; - ghc742Prefs_pedantic = + ghc742Prefs = self : self.haskellPlatformArgs_2012_4_0_0 self // { haskellPlatform = self.haskellPlatform_2012_4_0_0; binary = null; # now a core package }; - # until the Haskell Platform for 7.4.2 is released, this works fine/better; - # mainly because the Haskell Platform 2012.4.0.0 release candidate mandates - # vector 0.10 and primitive 0.5, which at this time aren't supported widely - # by other packages - ghc742Prefs = ghc741Prefs; - ghc741Prefs = self : self.haskellPlatformArgs_2012_2_0_0 self // { haskellPlatform = self.haskellPlatform_2012_2_0_0; @@ -273,9 +267,6 @@ prefFun = ghc742Prefs; }; - packages_ghc742_pedantic = - packages_ghc742.override { prefFun = ghc742Prefs_pedantic; }; - packages_ghc761 = packages { ghcPath = ../development/compilers/ghc/7.6.1.nix; ghcBinary = ghc704Binary; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index ee627aaf78b..484e01dcf11 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -116,21 +116,21 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); # GHC version, change the "preferences function" for that GHC version # in haskell-defaults.nix. - # NOTE: 2012.2.0.0 is the current default. + # NOTE: 2012.4.0.0 is the current default. haskellPlatformArgs_future = self : { inherit (self) cabal ghc; async = self.async_2_0_1_4; # 7.6 ok cgi = self.cgi_3001_1_8_3; # 7.6 ok fgl = self.fgl_5_4_2_4; # 7.6 ok - GLUT = self.GLUT_2_3_0_0; # 7.6 ok + GLUT = self.GLUT_2_3_1_0; # 7.6 ok haskellSrc = self.haskellSrc_1_0_1_5; # 7.6 ok html = self.html_1_0_1_2; # 7.6 ok HTTP = self.HTTP_4000_2_6; # 7.6 ok HUnit = self.HUnit_1_2_5_1; # 7.6 ok mtl = self.mtl_2_1_2; # 7.6 ok network = self.network_2_4_0_1; # 7.6 ok - OpenGL = self.OpenGL_2_5_0_0; # 7.6 ok + OpenGL = self.OpenGL_2_6_0_1; # 7.6 ok parallel = self.parallel_3_2_0_3; # 7.6 ok parsec = self.parsec_3_1_3; # 7.6 ok QuickCheck = self.QuickCheck_2_5_1_1; # 7.6 ok @@ -139,14 +139,14 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); regexCompat = self.regexCompat_0_95_1; # 7.6 ok regexPosix = self.regexPosix_0_95_2; # 7.6 ok split = self.split_0_2_1_1; # 7.6 ok - stm = self.stm_2_4; # 7.6 ok + stm = self.stm_2_4_2; # 7.6 ok syb = self.syb_0_3_7; # 7.6 ok text = self.text_0_11_2_3; # 7.6 ok transformers = self.transformers_0_3_0_0; # 7.6 ok vector = self.vector_0_10_0_1; # 7.6 ok xhtml = self.xhtml_3000_2_1; # 7.6 ok zlib = self.zlib_0_5_4_0; # 7.6 ok - cabalInstall = self.cabalInstall_1_16_0_1; # 7.6 ok + cabalInstall = self.cabalInstall_1_16_0_2; # 7.6 ok alex = self.alex_3_0_2; # 7.6 ok haddock = self.haddock_2_13_1; # 7.6 ok happy = self.happy_1_18_10; # 7.6 ok @@ -429,6 +429,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); Agda = callPackage ../development/libraries/haskell/Agda { haskellSrcExts = self.haskellSrcExts_1_11_1; + QuickCheck = self.QuickCheck_2_4_2; }; accelerate = callPackage ../development/libraries/haskell/accelerate {}; @@ -451,6 +452,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); alternativeIo = callPackage ../development/libraries/haskell/alternative-io {}; + appar = callPackage ../development/libraries/haskell/appar {}; + ansiTerminal = callPackage ../development/libraries/haskell/ansi-terminal {}; ansiWlPprint = callPackage ../development/libraries/haskell/ansi-wl-pprint {}; @@ -485,6 +488,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); baseUnicodeSymbols = callPackage ../development/libraries/haskell/base-unicode-symbols {}; + basicPrelude = callPackage ../development/libraries/haskell/basic-prelude {}; + benchpress = callPackage ../development/libraries/haskell/benchpress { time = self.time_1_1_3; }; @@ -543,7 +548,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); }; Cabal_1_14_0 = callPackage ../development/libraries/haskell/Cabal/1.14.0.nix { cabal = self.cabal.override { Cabal = null; }; }; - Cabal_1_16_0_2 = callPackage ../development/libraries/haskell/Cabal/1.16.0.2.nix { cabal = self.cabal.override { Cabal = null; }; }; + Cabal_1_16_0_3 = callPackage ../development/libraries/haskell/Cabal/1.16.0.3.nix { cabal = self.cabal.override { Cabal = null; }; }; Cabal = null; # core package in GHC cabalFileTh = callPackage ../development/libraries/haskell/cabal-file-th {}; @@ -576,6 +581,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); cipherAes = callPackage ../development/libraries/haskell/cipher-aes {}; + classyPrelude = callPackage ../development/libraries/haskell/classy-prelude {}; + + classyPreludeConduit = callPackage ../development/libraries/haskell/classy-prelude-conduit {}; + clientsession = callPackage ../development/libraries/haskell/clientsession {}; cmdargs = callPackage ../development/libraries/haskell/cmdargs {}; @@ -710,6 +719,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); dlist = callPackage ../development/libraries/haskell/dlist {}; + dns = callPackage ../development/libraries/haskell/dns {}; + dotgen = callPackage ../development/libraries/haskell/dotgen {}; doubleConversion = callPackage ../development/libraries/haskell/double-conversion {}; @@ -782,8 +793,12 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); fingertree = callPackage ../development/libraries/haskell/fingertree {}; + fsnotify = callPackage ../development/libraries/haskell/fsnotify {}; + gamma = callPackage ../development/libraries/haskell/gamma {}; + geniplate = callPackage ../development/libraries/haskell/geniplate {}; + gd = callPackage ../development/libraries/haskell/gd { inherit (pkgs) gd zlib; }; @@ -828,8 +843,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); GlomeVec = callPackage ../development/libraries/haskell/GlomeVec {}; gloss = callPackage ../development/libraries/haskell/gloss { - GLUT = self.GLUT23; - OpenGL = self.OpenGL25; + OpenGL = self.OpenGL_2_6_0_1; + GLUT = self.GLUT_2_3_1_0; }; glpkHs = callPackage ../development/libraries/haskell/glpk-hs {}; @@ -842,12 +857,16 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); GLUT_2_2_2_1 = callPackage ../development/libraries/haskell/GLUT/2.2.2.1.nix { OpenGL = self.OpenGL_2_4_0_2; }; - GLUT_2_3_0_0 = callPackage ../development/libraries/haskell/GLUT/2.3.0.0.nix { - OpenGL = self.OpenGL_2_5_0_0; + GLUT_2_3_1_0 = callPackage ../development/libraries/haskell/GLUT/2.3.1.0.nix { + OpenGL = self.OpenGL_2_6_0_1; }; - GLUT22 = self.GLUT_2_2_2_1; - GLUT23 = self.GLUT_2_3_0_0; - GLUT = self.GLUT_2_3_0_0; + GLUT = self.GLUT_2_3_1_0; + + gnuidn = callPackage ../development/libraries/haskell/gnuidn {}; + + gnutls = callPackage ../development/libraries/haskell/gnutls { inherit (pkgs) gnutls; }; + + gsasl = callPackage ../development/libraries/haskell/gsasl { inherit (pkgs) gsasl; }; gtk = callPackage ../development/libraries/haskell/gtk { inherit (pkgs) gtk; @@ -923,6 +942,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); HTTP_4000_2_6 = callPackage ../development/libraries/haskell/HTTP/4000.2.6.nix {}; HTTP = self.HTTP_4000_2_6; + httpReverseProxy = callPackage ../development/libraries/haskell/http-reverse-proxy {}; + hackageDb = callPackage ../development/libraries/haskell/hackage-db {}; haskellForMaths = callPackage ../development/libraries/haskell/HaskellForMaths {}; @@ -1051,6 +1072,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); ioStorage = callPackage ../development/libraries/haskell/io-storage {}; + iproute = callPackage ../development/libraries/haskell/iproute {}; + irc = callPackage ../development/libraries/haskell/irc { parsec = self.parsec2; }; @@ -1208,6 +1231,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); networkMulticast = callPackage ../development/libraries/haskell/network-multicast {}; + networkPprotocolXmpp = callPackage ../development/libraries/haskell/network-protocol-xmpp {}; + networkTransport = callPackage ../development/libraries/haskell/network-transport {}; networkTransportTcp = callPackage ../development/libraries/haskell/network-transport-tcp {}; @@ -1236,13 +1261,13 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); OpenGL_2_2_3_0 = callPackage ../development/libraries/haskell/OpenGL/2.2.3.0.nix {}; OpenGL_2_2_3_1 = callPackage ../development/libraries/haskell/OpenGL/2.2.3.1.nix {}; OpenGL_2_4_0_2 = callPackage ../development/libraries/haskell/OpenGL/2.4.0.2.nix {}; - OpenGL_2_5_0_0 = callPackage ../development/libraries/haskell/OpenGL/2.5.0.0.nix {}; - OpenGL24 = self.OpenGL_2_4_0_2; - OpenGL25 = self.OpenGL_2_5_0_0; - OpenGL = self.OpenGL_2_5_0_0; + OpenGL_2_6_0_1 = callPackage ../development/libraries/haskell/OpenGL/2.6.0.1.nix {}; + OpenGL = self.OpenGL_2_6_0_1; OpenGLRaw = callPackage ../development/libraries/haskell/OpenGLRaw {}; + optparseApplicative = callPackage ../development/libraries/haskell/optparse-applicative {}; + pathPieces = callPackage ../development/libraries/haskell/path-pieces {}; pandoc = callPackage ../development/libraries/haskell/pandoc {}; @@ -1316,6 +1341,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); primitive_0_5_0_1 = callPackage ../development/libraries/haskell/primitive/0.5.0.1.nix {}; primitive = self.primitive_0_5_0_1; + projectTemplate = callPackage ../development/libraries/haskell/project-template {}; + processExtras = callPackage ../development/libraries/haskell/process-extras {}; processLeksah = callPackage ../development/libraries/haskell/leksah/process-leksah.nix {}; @@ -1366,6 +1393,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); reactiveBananaWx = callPackage ../development/libraries/haskell/reactive-banana-wx {}; + ReadArgs = callPackage ../development/libraries/haskell/ReadArgs {}; + readline = callPackage ../development/libraries/haskell/readline { inherit (pkgs) readline; }; @@ -1398,8 +1427,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); regexPCRE = callPackage ../development/libraries/haskell/regex-pcre {}; regexPcre = self.regexPCRE; - regexPcreBuiltin = callPackage ../development/libraries/haskell/regex-pcre-builtin {}; - regexpr = callPackage ../development/libraries/haskell/regexpr {}; regular = callPackage ../development/libraries/haskell/regular {}; @@ -1423,12 +1450,16 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); safe = callPackage ../development/libraries/haskell/safe {}; + SafeSemaphore = callPackage ../development/libraries/haskell/SafeSemaphore {}; + sendfile = callPackage ../development/libraries/haskell/sendfile {}; semigroups = callPackage ../development/libraries/haskell/semigroups {}; semigroupoids = callPackage ../development/libraries/haskell/semigroupoids {}; + setenv = callPackage ../development/libraries/haskell/setenv {}; + shelly = callPackage ../development/libraries/haskell/shelly {}; simpleSendfile = callPackage ../development/libraries/haskell/simple-sendfile {}; @@ -1522,7 +1553,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); stm_2_2_0_1 = callPackage ../development/libraries/haskell/stm/2.2.0.1.nix {}; stm_2_3 = callPackage ../development/libraries/haskell/stm/2.3.nix {}; stm_2_4 = callPackage ../development/libraries/haskell/stm/2.4.nix {}; - stm = self.stm_2_4; + stm_2_4_2 = callPackage ../development/libraries/haskell/stm/2.4.2.nix {}; + stm = self.stm_2_4_2; storableComplex = callPackage ../development/libraries/haskell/storable-complex {}; @@ -1570,7 +1602,11 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); testFrameworkTh = callPackage ../development/libraries/haskell/test-framework-th {}; - testpack = callPackage ../development/libraries/haskell/testpack {}; + testFrameworkThPrime = callPackage ../development/libraries/haskell/test-framework-th-prime {}; + + testpack = callPackage ../development/libraries/haskell/testpack { + QuickCheck = self.QuickCheck_2_4_2; + }; texmath = callPackage ../development/libraries/haskell/texmath {}; @@ -1705,6 +1741,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); wlPprintText = callPackage ../development/libraries/haskell/wl-pprint-text {}; + word8 = callPackage ../development/libraries/haskell/word8 {}; + wx = callPackage ../development/libraries/haskell/wxHaskell/wx.nix {}; wxc = callPackage ../development/libraries/haskell/wxHaskell/wxc.nix { @@ -1924,8 +1962,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); cabalInstall_0_8_2 = callPackage ../tools/package-management/cabal-install/0.8.2.nix {}; cabalInstall_0_10_2 = callPackage ../tools/package-management/cabal-install/0.10.2.nix {}; cabalInstall_0_14_0 = callPackage ../tools/package-management/cabal-install/0.14.0.nix {}; - cabalInstall_1_16_0_1 = callPackage ../tools/package-management/cabal-install/1.16.0.1.nix {}; - cabalInstall = self.cabalInstall_1_16_0_1; + cabalInstall_1_16_0_2 = callPackage ../tools/package-management/cabal-install/1.16.0.2.nix {}; + cabalInstall = self.cabalInstall_1_16_0_2; jailbreakCabal = callPackage ../development/tools/haskell/jailbreak-cabal {}; diff --git a/pkgs/top-level/node-packages.nix b/pkgs/top-level/node-packages.nix index 9d1137925c3..291108c3f6d 100644 --- a/pkgs/top-level/node-packages.nix +++ b/pkgs/top-level/node-packages.nix @@ -998,6 +998,19 @@ let self = { self."requirejs-==0.26.0" ]; }; + + "swig" = self."swig-0.13.2"; + + "swig-0.13.2" = self.buildNodePackage rec { + name = "swig-0.13.2"; + src = fetchurl { + url = "http://registry.npmjs.org/swig/-/${name}.tgz"; + sha256 = "1fxc1cg0g5bn0ksm4gddx75ff5yzzbhqn4yqh6xqa5ag73nvxiyg"; + }; + deps = [ + self."underscore" + ]; + }; "tar" = self."tar-~0.1.12"; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 0604ae46e4f..b085dfe49bb 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1439,10 +1439,10 @@ rec { }; EmailSender = buildPerlPackage rec { - name = "Email-Sender-0.110001"; + name = "Email-Sender-0.120002"; src = fetchurl { url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; - sha256 = "0z4nl7aizbailraqwkkqhx6k3hdz67wxszjfhd5yg2vn06ybsjwj"; + sha256 = "1cp735ndmh76xzijsm1hd0yh0m9yj34jc8akjhidkn677h2021dc"; }; buildInputs = [ TestMore ]; propagatedBuildInputs = @@ -2100,10 +2100,10 @@ rec { }; IOSocketSSL = buildPerlPackage rec { - name = "IO-Socket-SSL-1.44"; + name = "IO-Socket-SSL-1.77"; src = fetchurl { url = "mirror://cpan/modules/by-module/IO/${name}.tar.gz"; - sha256 = "1xbgx1ij34a3dlwv94zjh3a02cj2lyhwzxcmv59harl784xn1mlg"; + sha256 = "2a090167a0d13cdefdac7fb25ca49decd5fd925f37d032bca98c73c4856570a9"; }; propagatedBuildInputs = [ URI NetSSLeay ]; }; @@ -2775,6 +2775,30 @@ rec { }; }; + MusicBrainzDiscID = buildModule rec { + name = "MusicBrainz-DiscID-0.03"; + src = fetchurl { + url = "mirror://cpan/authors/id/N/NJ/NJH/${name}.tar.gz"; + sha256 = "0fjph2q3yp0aa87gckv3391s47m13wbyylj7jb7vqx7hv0pzj0jh"; + }; + # Build.PL in this package uses which to find pkg-config -- make it use path instead + patchPhase = ''sed -ie 's/`which pkg-config`/"pkg-config"/' Build.PL''; + doCheck = false; # The main test performs network access + #buildInputs = [ TestMore TestPod ]; + buildInputs = [ pkgs.pkgconfig ]; + propagatedBuildInputs = [ pkgs.libdiscid ]; + }; + + MusicBrainz = buildPerlPackage rec { + name = "WebService-MusicBrainz-0.93"; + src = fetchurl { + url = "mirror://cpan/authors/id/B/BF/BFAIST/${name}.tar.gz"; + sha256 = "1gg62x6qv4jj73jsqh0sb237k96i22blj29afpbp1scp3m7i5g61"; + }; + propagatedBuildInputs = [ XMLLibXML LWP ClassAccessor URI ]; + doCheck = false; # Test performs network access. + }; + NamespaceAutoclean = buildPerlPackage rec { name = "namespace-autoclean-0.12"; src = fetchurl { @@ -4345,13 +4369,13 @@ rec { }; }; - XSLoader = buildPerlPackage { - name = "XSLoader-0.08"; - src = fetchurl { - url = mirror://cpan/authors/id/S/SA/SAPER/XSLoader-0.08.tar.gz; - sha256 = "0mr4l3givrpyvz1kg0kap2ds8g0rza2cim9kbnjy8hi64igkixi5"; - }; - }; + # XSLoader = buildPerlPackage { + # name = "XSLoader-0.08"; + # src = fetchurl { + # url = mirror://cpan/authors/id/S/SA/SAPER/XSLoader-0.08.tar.gz; + # sha256 = "0mr4l3givrpyvz1kg0kap2ds8g0rza2cim9kbnjy8hi64igkixi5"; + # }; + # }; YAML = buildPerlPackage rec { name = "YAML-0.80"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ed352306c20..761f63d4be6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -61,13 +61,13 @@ let pythonPackages = python.modules // rec { alot = buildPythonPackage rec { - rev = "27c91058c49d8755d2813d5b78094f40f36ec905"; + rev = "5ed59825ffaeaacea90ea10be4b932c60428ed8e"; name = "alot-0.3.3_${rev}"; src = fetchurl { url = "https://github.com/pazz/alot/tarball/${rev}"; name = "${name}.tar.bz"; - sha256 = "67e1033aa91818b7fa4c3911430a4da0f73aca92c3e3832c010038cbf263eec2"; + sha256 = "1b724d47bf766ba3ca7cb6d27c7bb597dbc67dcae1347c5a0f01f80c2246ca07"; }; doCheck = false; @@ -542,11 +542,11 @@ let pythonPackages = python.modules // rec { django_1_3 = buildPythonPackage rec { - name = "Django-1.3.2"; + name = "Django-1.3.3"; src = fetchurl { url = "http://www.djangoproject.com/m/releases/1.3/${name}.tar.gz"; - sha256 = "0r6pdm33x96aba9x36jvqpkh2bf1zixnzvr12mcc8qq8wc7hii3j"; + sha256 = "0snlrcvk92qj1v0n9dpycn6sw56w4zns4mpc30837q6yi7ylrx4f"; }; doCheck = false; @@ -576,11 +576,11 @@ let pythonPackages = python.modules // rec { djblets = buildPythonPackage rec { - name = "Djblets-0.6.19"; + name = "Djblets-0.6.23"; src = fetchurl { url = "http://downloads.reviewboard.org/releases/Djblets/0.6/${name}.tar.gz"; - sha256 = "1hhvpi81yknvlaazq1cpgamp9vf3x1fcr0ba64q3j2yz1kgin1i8"; + sha256 = "1d8vg5a9q2ldnbxqap1893lqb66jwcsli2brbjx7mcnqrzcz449x"; }; propagatedBuildInputs = [ pkgs.pil django_1_3 ]; @@ -705,11 +705,11 @@ let pythonPackages = python.modules // rec { flake8 = buildPythonPackage (rec { - name = "flake8-1.4"; + name = "flake8-1.5"; src = fetchurl { url = "http://pypi.python.org/packages/source/f/flake8/${name}.tar.gz"; - md5 = "64acc2c905178f6d6817d88574407fb5"; + md5 = "525be5c7fcaf85f6819c77752cb2ee72"; }; doCheck = false; @@ -1458,7 +1458,7 @@ let pythonPackages = python.modules // rec { sha256 = "82a38f674da1fa496c0fc4df714cbb058540bed72a30c50a2e344b0d984c4d21"; }; - propagatedBuildInputs = [ httplib2 ]; + propagatedBuildInputs = [ httplib2 ]; doCheck = false; meta = { @@ -2327,11 +2327,11 @@ let pythonPackages = python.modules // rec { reviewboard = buildPythonPackage rec { - name = "ReviewBoard-1.6.9"; + name = "ReviewBoard-1.6.13"; src = fetchurl { url = "http://downloads.reviewboard.org/releases/ReviewBoard/1.6/${name}.tar.gz"; - sha256 = "06pwbmqwsb0g2y8zg5hk5ibaivsl1af7v0vnkqranimf4yaa10mc"; + sha256 = "06q9vgvmmwiyqj6spw6sbhrcxwds02pvqir50psbpps74nxn2mph"; }; propagatedBuildInputs = @@ -2774,7 +2774,7 @@ let pythonPackages = python.modules // rec { }; turses = buildPythonPackage (rec { - name = "turses-0.2.5"; + name = "turses-0.2.8"; src = fetchurl { url = "http://pypi.python.org/packages/source/t/turses/${name}.tar.gz";