From 1e51827ba3d986caa9e00871f538107ebe7b1419 Mon Sep 17 00:00:00 2001 From: swirl Date: Sat, 8 Jan 2022 10:32:30 -0500 Subject: add LICENSE file explicitly Closes: #24 --- LICENSE | 674 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 674 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 00000000..f288702d --- /dev/null +++ b/LICENSE @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. -- cgit From 8d184958d8412762a345aa1a5047db0cba03dfcb Mon Sep 17 00:00:00 2001 From: Mustafa Çalışkan Date: Sat, 8 Jan 2022 21:33:50 +0300 Subject: nix: init flake --- flake.lock | 43 +++++++++++++++++++++++++++++++++++++++++++ flake.nix | 33 +++++++++++++++++++++++++++++---- 2 files changed, 72 insertions(+), 4 deletions(-) create mode 100644 flake.lock diff --git a/flake.lock b/flake.lock new file mode 100644 index 00000000..cb93f3e0 --- /dev/null +++ b/flake.lock @@ -0,0 +1,43 @@ +{ + "nodes": { + "flake-utils": { + "locked": { + "lastModified": 1638122382, + "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "74f7e4319258e287b0f9cb95426c9853b282730b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1641528457, + "narHash": "sha256-FyU9E63n1W7Ql4pMnhW2/rO9OftWZ37pLppn/c1aisY=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "ff377a78794d412a35245e05428c8f95fef3951f", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix index 8f8325c0..bf45baa4 100644 --- a/flake.nix +++ b/flake.nix @@ -1,7 +1,32 @@ { - description = "PolyMC"; + description = "PolyMC flake"; + inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + inputs.flake-utils.url = "github:numtide/flake-utils"; - outputs = inputs: { - overlay = import ./packages/nix/overlay.nix; - }; + outputs = inputs@{ self, nixpkgs, flake-utils,... }: + flake-utils.lib.eachSystem [ "x86_64-linux" "aarch64-linux" ] (system: + let + pkgs = import nixpkgs { + inherit system; + }; + + packages = { + polymc = pkgs.libsForQt5.callPackage ./package/nix {}; + }; + + apps = { + polymc = flake-utils.lib.mkApp { + name = "PolyMC"; + drv = packages.polymc; + }; + }; + in + { + inherit packages apps; + + defaultPackage = packages.polymc; + defaultApp = apps.polymc; + overlay = import ./packages/nix/overlay.nix; + } + ); } -- cgit From b1fa551fd29490653cff65e8c0d2bb1a144640ab Mon Sep 17 00:00:00 2001 From: Mustafa Çalışkan Date: Sat, 8 Jan 2022 21:53:50 +0300 Subject: flake: updates --- flake.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index bf45baa4..faa6600e 100644 --- a/flake.nix +++ b/flake.nix @@ -11,7 +11,7 @@ }; packages = { - polymc = pkgs.libsForQt5.callPackage ./package/nix {}; + polymc = pkgs.libsForQt5.callPackage ./packages/nix/polymc { inherit self; }; }; apps = { @@ -26,7 +26,7 @@ defaultPackage = packages.polymc; defaultApp = apps.polymc; - overlay = import ./packages/nix/overlay.nix; + overlay = import ./packages/nix/overlay.nix { inherit self; }; } ); } -- cgit From 8d4f8795de81c221e8f58f35b4155b62301b295d Mon Sep 17 00:00:00 2001 From: Mustafa Çalışkan Date: Sat, 8 Jan 2022 21:55:19 +0300 Subject: nix: update package and remove meta section since we are not on nixpkgs --- packages/nix/overlay.nix | 8 +- .../nix/polymc/0001-pick-latest-java-first.patch | 48 ----------- packages/nix/polymc/default.nix | 92 ++++++++++++++-------- 3 files changed, 63 insertions(+), 85 deletions(-) delete mode 100644 packages/nix/polymc/0001-pick-latest-java-first.patch diff --git a/packages/nix/overlay.nix b/packages/nix/overlay.nix index 5a494459..c9e0e195 100644 --- a/packages/nix/overlay.nix +++ b/packages/nix/overlay.nix @@ -1,3 +1,5 @@ -self: super: rec { - polymc = super.libsForQt5.callPackage ./polymc {}; -} \ No newline at end of file +{ self }: + +final: prev: rec { + polymc = prev.libsForQt5.callPackage ./polymc { inherit self; }; +} diff --git a/packages/nix/polymc/0001-pick-latest-java-first.patch b/packages/nix/polymc/0001-pick-latest-java-first.patch deleted file mode 100644 index a65dcbfd..00000000 --- a/packages/nix/polymc/0001-pick-latest-java-first.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 44e1b2a19a869b907b40e56c85c8a47aa6c22097 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Mustafa=20=C3=87al=C4=B1=C5=9Fkan?= -Date: Tue, 22 Jun 2021 21:50:11 +0300 -Subject: [PATCH] pick latest java first - ---- - launcher/java/JavaInstallList.cpp | 4 ++-- - launcher/java/JavaUtils.cpp | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/launcher/java/JavaInstallList.cpp b/launcher/java/JavaInstallList.cpp -index 0bded03c..40898e20 100644 ---- a/launcher/java/JavaInstallList.cpp -+++ b/launcher/java/JavaInstallList.cpp -@@ -120,8 +120,8 @@ void JavaInstallList::updateListData(QList versions) - - bool sortJavas(BaseVersionPtr left, BaseVersionPtr right) - { -- auto rleft = std::dynamic_pointer_cast(left); -- auto rright = std::dynamic_pointer_cast(right); -+ auto rleft = std::dynamic_pointer_cast(right); -+ auto rright = std::dynamic_pointer_cast(left); - return (*rleft) > (*rright); - } - -diff --git a/launcher/java/JavaUtils.cpp b/launcher/java/JavaUtils.cpp -index 5f004a10..6d633631 100644 ---- a/launcher/java/JavaUtils.cpp -+++ b/launcher/java/JavaUtils.cpp -@@ -350,7 +350,6 @@ QList JavaUtils::FindJavaPaths() - qDebug() << "Linux Java detection incomplete - defaulting to \"java\""; - - QList javas; -- javas.append(this->GetDefaultJava()->path); - auto scanJavaDir = [&](const QString & dirPath) - { - QDir dir(dirPath); -@@ -379,6 +378,7 @@ QList JavaUtils::FindJavaPaths() - // general locations used by distro packaging - scanJavaDir("/usr/lib/jvm"); - scanJavaDir("/usr/lib32/jvm"); -+ javas.append(this->GetDefaultJava()->path); - // javas stored in MultiMC's folder - scanJavaDir("java"); - return javas; --- -2.31.1 - diff --git a/packages/nix/polymc/default.nix b/packages/nix/polymc/default.nix index 5f1a0f27..8b5c4812 100644 --- a/packages/nix/polymc/default.nix +++ b/packages/nix/polymc/default.nix @@ -1,49 +1,73 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, jdk8, jdk, zlib, file, makeWrapper, xorg, libpulseaudio, qtbase, libGL, msaClientID ? "" }: +{ lib +, mkDerivation +, fetchFromGitHub +, makeDesktopItem +, substituteAll +, fetchpatch +, cmake +, jdk8 +, jdk +, zlib +, file +, makeWrapper +, xorg +, libpulseaudio +, qtbase +, libGL +, self +, msaClientID ? "" +}: let - libpath = with xorg; lib.makeLibraryPath [ libX11 libXext libXcursor libXrandr libXxf86vm libpulseaudio libGL ]; -in + gameLibraryPath = with xorg; lib.makeLibraryPath [ + libX11 + libXext + libXcursor + libXrandr + libXxf86vm + libpulseaudio + libGL + ]; +in + mkDerivation rec { pname = "polymc"; - version = "1.0.4"; - src = fetchFromGitHub { - owner = "PolyMC"; - repo = "PolyMC"; - rev = "${version}"; - sha256 = "sha256-8aya0KfV9F+i2qBpweWcR9hwyTSQkqn2wHdtkCEeNvk="; - fetchSubmodules = true; - }; + version = "nightly"; + + src = lib.cleanSource self; + nativeBuildInputs = [ cmake file makeWrapper ]; buildInputs = [ qtbase jdk8 zlib ]; - patches = [ ./0001-pick-latest-java-first.patch ]; - postPatch = '' - # hardcode jdk paths - substituteInPlace launcher/java/JavaUtils.cpp \ - --replace 'scanJavaDir("/usr/lib/jvm")' 'javas.append("${jdk}/lib/openjdk/bin/java")' \ - --replace 'scanJavaDir("/usr/lib32/jvm")' 'javas.append("${jdk8}/lib/openjdk/bin/java")' + # add client ID + substituteInPlace notsecrets/Secrets.cpp \ + --replace 'QString MSAClientID = "";' 'QString MSAClientID = "${msaClientID}";' ''; - cmakeFlags = [ "-DLauncher_LAYOUT=lin-system" ]; + cmakeFlags = [ + "-DLauncher_LAYOUT=lin-system" + ]; + + desktopItem = makeDesktopItem { + name = "polymc"; + exec = "polymc"; + icon = "polymc"; + desktopName = "PolyMC"; + genericName = "Minecraft Launcher"; + comment = "A custom launcher for Minecraft"; + categories = "Game;"; + extraEntries = '' + Keywords=game;Minecraft; + ''; + }; postInstall = '' + install -Dm644 ../launcher/resources/multimc/scalable/launcher.svg $out/share/pixmaps/multimc.svg + install -Dm755 ${desktopItem}/share/applications/polymc.desktop -t $out/share/applications # xorg.xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128 wrapProgram $out/bin/polymc \ - --set GAME_LIBRARY_PATH /run/opengl-driver/lib:${libpath} \ - --prefix PATH : ${lib.makeBinPath [ xorg.xrandr ]} - - substituteInPlace $out/share/applications/org.polymc.PolyMC.desktop --replace 'Exec=' 'Exec=${placeholder "out"}/bin/polymc' + --set GAME_LIBRARY_PATH /run/opengl-driver/lib:${gameLibraryPath} \ + --prefix PATH : ${lib.makeBinPath [ xorg.xrandr jdk ]} ''; - - meta = with lib; { - homepage = "https://github.com/PolyMC/PolyMC"; - description = "A free, open source launcher for Minecraft"; - longDescription = '' - Allows you to have multiple, separate instances of Minecraft (each with their own mods, texture packs, saves, etc) and helps you manage them and their associated options with a simple interface. - ''; - platforms = platforms.linux; - license = licenses.gpl3; - maintainers = with maintainers; [ cidkid ]; - }; -} \ No newline at end of file +} -- cgit From d29d020d6f485852805b7f92d2dabd614d4da2e5 Mon Sep 17 00:00:00 2001 From: Mustafa Çalışkan Date: Sat, 8 Jan 2022 22:15:19 +0300 Subject: {nix,flake}: add submodules --- flake.lock | 36 +++++++++++++++++++++++++++++++++++- flake.nix | 26 ++++++++++++++++++++------ packages/nix/overlay.nix | 8 ++++++-- packages/nix/polymc/default.nix | 9 +++++++++ 4 files changed, 70 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index cb93f3e0..131a9112 100644 --- a/flake.lock +++ b/flake.lock @@ -15,6 +15,22 @@ "type": "github" } }, + "libnbtplusplus": { + "flake": false, + "locked": { + "lastModified": 1591558203, + "narHash": "sha256-QgvNvaoFflCXEPCCFBCeZvYTpuiwScBG7EosUgFwFNQ=", + "owner": "multimc", + "repo": "libnbtplusplus", + "rev": "dc72a20b7efd304d12af2025223fad07b4b78464", + "type": "github" + }, + "original": { + "owner": "multimc", + "repo": "libnbtplusplus", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1641528457, @@ -31,10 +47,28 @@ "type": "github" } }, + "quazip": { + "flake": false, + "locked": { + "lastModified": 1633895098, + "narHash": "sha256-+Of0M2IAoTf1CyC0teCpsyurv6xfqiBo84V49dSeNTA=", + "owner": "multimc", + "repo": "quazip", + "rev": "b1a72ac0bb5a732bf887a535ab75c6f9bedb6b6b", + "type": "github" + }, + "original": { + "owner": "multimc", + "repo": "quazip", + "type": "github" + } + }, "root": { "inputs": { "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs" + "libnbtplusplus": "libnbtplusplus", + "nixpkgs": "nixpkgs", + "quazip": "quazip" } } }, diff --git a/flake.nix b/flake.nix index faa6600e..aa2c2cb5 100644 --- a/flake.nix +++ b/flake.nix @@ -2,8 +2,16 @@ description = "PolyMC flake"; inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; inputs.flake-utils.url = "github:numtide/flake-utils"; + inputs.libnbtplusplus = { + url = "github:multimc/libnbtplusplus"; + flake = false; + }; + inputs.quazip = { + url = "github:multimc/quazip"; + flake = false; + }; - outputs = inputs@{ self, nixpkgs, flake-utils,... }: + outputs = inputs@{ self, nixpkgs, flake-utils, libnbtplusplus, quazip, ... }: flake-utils.lib.eachSystem [ "x86_64-linux" "aarch64-linux" ] (system: let pkgs = import nixpkgs { @@ -11,9 +19,17 @@ }; packages = { - polymc = pkgs.libsForQt5.callPackage ./packages/nix/polymc { inherit self; }; + polymc = pkgs.libsForQt5.callPackage ./packages/nix/polymc { + inherit self; + submoduleQuazip = quazip; + submoduleNbt = libnbtplusplus; + }; + }; + + overlay = import ./packages/nix/overlay.nix { + inherit self quazip libnbtplusplus; }; - + apps = { polymc = flake-utils.lib.mkApp { name = "PolyMC"; @@ -22,11 +38,9 @@ }; in { - inherit packages apps; - + inherit packages overlay apps; defaultPackage = packages.polymc; defaultApp = apps.polymc; - overlay = import ./packages/nix/overlay.nix { inherit self; }; } ); } diff --git a/packages/nix/overlay.nix b/packages/nix/overlay.nix index c9e0e195..a65c23e0 100644 --- a/packages/nix/overlay.nix +++ b/packages/nix/overlay.nix @@ -1,5 +1,9 @@ -{ self }: +{ self, quazip, libnbtplusplus }: final: prev: rec { - polymc = prev.libsForQt5.callPackage ./polymc { inherit self; }; + polymc = prev.libsForQt5.callPackage ./polymc { + inherit self; + submoduleQuazip = quazip; + submoduleNbt = libnbtplusplus; + }; } diff --git a/packages/nix/polymc/default.nix b/packages/nix/polymc/default.nix index 8b5c4812..414835f5 100644 --- a/packages/nix/polymc/default.nix +++ b/packages/nix/polymc/default.nix @@ -14,7 +14,10 @@ , libpulseaudio , qtbase , libGL +# submodules , self +, submoduleNbt +, submoduleQuazip , msaClientID ? "" }: @@ -39,6 +42,12 @@ mkDerivation rec { nativeBuildInputs = [ cmake file makeWrapper ]; buildInputs = [ qtbase jdk8 zlib ]; + postUnpack = '' + mkdir libraries/{libnbtplusplus,quazip} + cp -a ${submoduleNbt}/* libraries/libnbtplusplus + cp -a ${submoduleQuazip}/* libraries/quazip + ''; + postPatch = '' # add client ID substituteInPlace notsecrets/Secrets.cpp \ -- cgit From 9611b92b07a6dfea6e3e249539336d330145739c Mon Sep 17 00:00:00 2001 From: Mustafa Çalışkan Date: Sat, 8 Jan 2022 22:31:13 +0300 Subject: nix: fix build --- packages/nix/polymc/default.nix | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/packages/nix/polymc/default.nix b/packages/nix/polymc/default.nix index 414835f5..340c1ae5 100644 --- a/packages/nix/polymc/default.nix +++ b/packages/nix/polymc/default.nix @@ -18,7 +18,6 @@ , self , submoduleNbt , submoduleQuazip -, msaClientID ? "" }: let @@ -43,15 +42,10 @@ mkDerivation rec { buildInputs = [ qtbase jdk8 zlib ]; postUnpack = '' - mkdir libraries/{libnbtplusplus,quazip} - cp -a ${submoduleNbt}/* libraries/libnbtplusplus - cp -a ${submoduleQuazip}/* libraries/quazip - ''; - - postPatch = '' - # add client ID - substituteInPlace notsecrets/Secrets.cpp \ - --replace 'QString MSAClientID = "";' 'QString MSAClientID = "${msaClientID}";' + mkdir source/libraries/{libnbtplusplus,quazip} + cp -a ${submoduleNbt}/* source/libraries/libnbtplusplus + cp -a ${submoduleQuazip}/* source/libraries/quazip + chmod a+r+w source/libraries/{libnbtplusplus,quazip}/* ''; cmakeFlags = [ -- cgit From 6065b4dcf9c084dcea6b317ca3e186d14ad9f26e Mon Sep 17 00:00:00 2001 From: Mustafa Çalışkan Date: Sat, 8 Jan 2022 23:06:56 +0300 Subject: nix: revert overlay changes and add conditionals to derivation for flake build --- flake.nix | 5 ++--- packages/nix/overlay.nix | 8 +------- packages/nix/polymc/default.nix | 22 +++++++++++++++------- 3 files changed, 18 insertions(+), 17 deletions(-) diff --git a/flake.nix b/flake.nix index aa2c2cb5..2ef65c64 100644 --- a/flake.nix +++ b/flake.nix @@ -21,14 +21,13 @@ packages = { polymc = pkgs.libsForQt5.callPackage ./packages/nix/polymc { inherit self; + isFlakeBuild = true; submoduleQuazip = quazip; submoduleNbt = libnbtplusplus; }; }; - overlay = import ./packages/nix/overlay.nix { - inherit self quazip libnbtplusplus; - }; + overlay = import ./packages/nix/overlay.nix {}; apps = { polymc = flake-utils.lib.mkApp { diff --git a/packages/nix/overlay.nix b/packages/nix/overlay.nix index a65c23e0..6fa701b3 100644 --- a/packages/nix/overlay.nix +++ b/packages/nix/overlay.nix @@ -1,9 +1,3 @@ -{ self, quazip, libnbtplusplus }: - final: prev: rec { - polymc = prev.libsForQt5.callPackage ./polymc { - inherit self; - submoduleQuazip = quazip; - submoduleNbt = libnbtplusplus; - }; + polymc = prev.libsForQt5.callPackage ./polymc {}; } diff --git a/packages/nix/polymc/default.nix b/packages/nix/polymc/default.nix index 340c1ae5..c55c8a3c 100644 --- a/packages/nix/polymc/default.nix +++ b/packages/nix/polymc/default.nix @@ -15,9 +15,10 @@ , qtbase , libGL # submodules -, self -, submoduleNbt -, submoduleQuazip +, isFlakeBuild ? false +, self ? "" +, submoduleNbt ? "" +, submoduleQuazip ? "" }: let @@ -34,19 +35,26 @@ in mkDerivation rec { pname = "polymc"; - version = "nightly"; + version = if isFlakeBuild then "nightly" else "1.0.4"; - src = lib.cleanSource self; + src = if isFlakeBuild then lib.cleanSource self + else fetchFromGitHub { + owner = "PolyMC"; + repo = "PolyMC"; + rev = "${version}"; + sha256 = "sha256-8aya0KfV9F+i2qBpweWcR9hwyTSQkqn2wHdtkCEeNvk="; + fetchSubmodules = true; + }; nativeBuildInputs = [ cmake file makeWrapper ]; buildInputs = [ qtbase jdk8 zlib ]; - postUnpack = '' + postUnpack = if isFlakeBuild then '' mkdir source/libraries/{libnbtplusplus,quazip} cp -a ${submoduleNbt}/* source/libraries/libnbtplusplus cp -a ${submoduleQuazip}/* source/libraries/quazip chmod a+r+w source/libraries/{libnbtplusplus,quazip}/* - ''; + '' else ""; cmakeFlags = [ "-DLauncher_LAYOUT=lin-system" -- cgit From 2a760a8e32627617dc80c96c9598ad3ed34ffbc8 Mon Sep 17 00:00:00 2001 From: Mustafa Çalışkan Date: Sat, 8 Jan 2022 23:09:53 +0300 Subject: Revert "nix: revert overlay changes and add conditionals to derivation for flake build" --- flake.nix | 5 +++-- packages/nix/overlay.nix | 8 +++++++- packages/nix/polymc/default.nix | 22 +++++++--------------- 3 files changed, 17 insertions(+), 18 deletions(-) diff --git a/flake.nix b/flake.nix index 2ef65c64..aa2c2cb5 100644 --- a/flake.nix +++ b/flake.nix @@ -21,13 +21,14 @@ packages = { polymc = pkgs.libsForQt5.callPackage ./packages/nix/polymc { inherit self; - isFlakeBuild = true; submoduleQuazip = quazip; submoduleNbt = libnbtplusplus; }; }; - overlay = import ./packages/nix/overlay.nix {}; + overlay = import ./packages/nix/overlay.nix { + inherit self quazip libnbtplusplus; + }; apps = { polymc = flake-utils.lib.mkApp { diff --git a/packages/nix/overlay.nix b/packages/nix/overlay.nix index 6fa701b3..a65c23e0 100644 --- a/packages/nix/overlay.nix +++ b/packages/nix/overlay.nix @@ -1,3 +1,9 @@ +{ self, quazip, libnbtplusplus }: + final: prev: rec { - polymc = prev.libsForQt5.callPackage ./polymc {}; + polymc = prev.libsForQt5.callPackage ./polymc { + inherit self; + submoduleQuazip = quazip; + submoduleNbt = libnbtplusplus; + }; } diff --git a/packages/nix/polymc/default.nix b/packages/nix/polymc/default.nix index c55c8a3c..340c1ae5 100644 --- a/packages/nix/polymc/default.nix +++ b/packages/nix/polymc/default.nix @@ -15,10 +15,9 @@ , qtbase , libGL # submodules -, isFlakeBuild ? false -, self ? "" -, submoduleNbt ? "" -, submoduleQuazip ? "" +, self +, submoduleNbt +, submoduleQuazip }: let @@ -35,26 +34,19 @@ in mkDerivation rec { pname = "polymc"; - version = if isFlakeBuild then "nightly" else "1.0.4"; + version = "nightly"; - src = if isFlakeBuild then lib.cleanSource self - else fetchFromGitHub { - owner = "PolyMC"; - repo = "PolyMC"; - rev = "${version}"; - sha256 = "sha256-8aya0KfV9F+i2qBpweWcR9hwyTSQkqn2wHdtkCEeNvk="; - fetchSubmodules = true; - }; + src = lib.cleanSource self; nativeBuildInputs = [ cmake file makeWrapper ]; buildInputs = [ qtbase jdk8 zlib ]; - postUnpack = if isFlakeBuild then '' + postUnpack = '' mkdir source/libraries/{libnbtplusplus,quazip} cp -a ${submoduleNbt}/* source/libraries/libnbtplusplus cp -a ${submoduleQuazip}/* source/libraries/quazip chmod a+r+w source/libraries/{libnbtplusplus,quazip}/* - '' else ""; + ''; cmakeFlags = [ "-DLauncher_LAYOUT=lin-system" -- cgit From 9499acedabb77e9783fd78bd0c9a24112ce1c319 Mon Sep 17 00:00:00 2001 From: Mustafa Çalışkan Date: Sat, 8 Jan 2022 23:23:55 +0300 Subject: nix: fix overlay --- flake.nix | 6 +++--- packages/nix/overlay.nix | 9 --------- packages/nix/polymc/default.nix | 1 + 3 files changed, 4 insertions(+), 12 deletions(-) delete mode 100644 packages/nix/overlay.nix diff --git a/flake.nix b/flake.nix index aa2c2cb5..b30008a4 100644 --- a/flake.nix +++ b/flake.nix @@ -26,9 +26,9 @@ }; }; - overlay = import ./packages/nix/overlay.nix { - inherit self quazip libnbtplusplus; - }; + overlay = (final: prev: rec { + polymc = packages.polymc; + }); apps = { polymc = flake-utils.lib.mkApp { diff --git a/packages/nix/overlay.nix b/packages/nix/overlay.nix deleted file mode 100644 index a65c23e0..00000000 --- a/packages/nix/overlay.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ self, quazip, libnbtplusplus }: - -final: prev: rec { - polymc = prev.libsForQt5.callPackage ./polymc { - inherit self; - submoduleQuazip = quazip; - submoduleNbt = libnbtplusplus; - }; -} diff --git a/packages/nix/polymc/default.nix b/packages/nix/polymc/default.nix index 340c1ae5..92097442 100644 --- a/packages/nix/polymc/default.nix +++ b/packages/nix/polymc/default.nix @@ -42,6 +42,7 @@ mkDerivation rec { buildInputs = [ qtbase jdk8 zlib ]; postUnpack = '' + rm -rf source/libraries/{libnbtplusplus,quazip} mkdir source/libraries/{libnbtplusplus,quazip} cp -a ${submoduleNbt}/* source/libraries/libnbtplusplus cp -a ${submoduleQuazip}/* source/libraries/quazip -- cgit From ccde63bbabd4259117c52540058a8875f469b7ae Mon Sep 17 00:00:00 2001 From: Mustafa Çalışkan Date: Sun, 9 Jan 2022 01:10:32 +0300 Subject: add nix result path to .gitignore --- .gitignore | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index a2f4e78a..3f76a608 100644 --- a/.gitignore +++ b/.gitignore @@ -47,4 +47,6 @@ builddir # Deb packages/debian/polymc/usr/ packages/debian/polymc.deb -packages/debian/polymc/DEBIAN/control \ No newline at end of file +packages/debian/polymc/DEBIAN/control +# Nix/NixOS +result/ -- cgit From ae3c613f6cc2070fc4e191fd923fb7f9ed30c768 Mon Sep 17 00:00:00 2001 From: Mustafa Çalışkan Date: Sun, 9 Jan 2022 01:23:53 +0300 Subject: nix: use user package set on overlay and switch to ninja --- flake.nix | 6 +++++- packages/nix/polymc/default.nix | 4 +++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index b30008a4..d6885c3b 100644 --- a/flake.nix +++ b/flake.nix @@ -27,7 +27,11 @@ }; overlay = (final: prev: rec { - polymc = packages.polymc; + polymc = prev.libsForQt5.callPackage ./packages/nix/polymc { + inherit self; + submoduleQuazip = quazip; + submoduleNbt = libnbtplusplus; + }; }); apps = { diff --git a/packages/nix/polymc/default.nix b/packages/nix/polymc/default.nix index 92097442..4f80ff34 100644 --- a/packages/nix/polymc/default.nix +++ b/packages/nix/polymc/default.nix @@ -5,6 +5,7 @@ , substituteAll , fetchpatch , cmake +, ninja , jdk8 , jdk , zlib @@ -38,7 +39,7 @@ mkDerivation rec { src = lib.cleanSource self; - nativeBuildInputs = [ cmake file makeWrapper ]; + nativeBuildInputs = [ cmake ninja file makeWrapper ]; buildInputs = [ qtbase jdk8 zlib ]; postUnpack = '' @@ -50,6 +51,7 @@ mkDerivation rec { ''; cmakeFlags = [ + "-GNinja" "-DLauncher_LAYOUT=lin-system" ]; -- cgit From 4a9d9b268ab6effb2ffdf96c246b859c49a449c1 Mon Sep 17 00:00:00 2001 From: Mustafa Çalışkan Date: Sun, 9 Jan 2022 02:40:13 +0300 Subject: nix: fix 'nix run' --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index d6885c3b..825f747e 100644 --- a/flake.nix +++ b/flake.nix @@ -36,7 +36,7 @@ apps = { polymc = flake-utils.lib.mkApp { - name = "PolyMC"; + name = "polymc"; drv = packages.polymc; }; }; -- cgit From 2ca094bd5798fc3e7c039730b556068e2192a240 Mon Sep 17 00:00:00 2001 From: seth Date: Sat, 8 Jan 2022 22:44:18 -0500 Subject: add rpm build script and spec file --- packages/rpm/makerpm.sh | 9 ++++++++ packages/rpm/polymc.spec | 55 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+) create mode 100755 packages/rpm/makerpm.sh create mode 100644 packages/rpm/polymc.spec diff --git a/packages/rpm/makerpm.sh b/packages/rpm/makerpm.sh new file mode 100755 index 00000000..02ecf206 --- /dev/null +++ b/packages/rpm/makerpm.sh @@ -0,0 +1,9 @@ +#!/usr/bin/env bash + +git submodule init +git submodule update +VERSION=$(git describe --tags | sed 's/-.*//') +DIR=$(pwd) +sed -i "s/Version:.*/Version: ${VERSION}/" polymc.spec +sudo dnf builddep polymc.spec +rpmbuild -ba polymc.spec diff --git a/packages/rpm/polymc.spec b/packages/rpm/polymc.spec new file mode 100644 index 00000000..3c5ba435 --- /dev/null +++ b/packages/rpm/polymc.spec @@ -0,0 +1,55 @@ +%global _origdir %(pwd) + +Name: polymc +Version: +Release: 1%{?dist} +Summary: A custom launcher for Minecraft +License: GPLv3 +URL: https://polymc.org/ + +BuildArch: x86_64 +BuildRequires: java-devel +BuildRequires: pkgconfig(gl) +BuildRequires: pkgconfig(Qt5) +BuildRequires: pkgconfig(zlib) + +Requires: java-headless +Requires: pkgconfig(gl) +Requires: pkgconfig(Qt5) +Requires: pkgconfig(zlib) + +%description +A custom launcher for Minecraft that allows you to easily manage multiple installations of Minecraft at once + +%prep +mkdir -p %{_builddir}/%{name} +cp -r %{_origdir}/../../* %{_builddir}/%{name} + +%build +cd %{_builddir}/%{name} +cmake \ + -DLauncher_LAYOUT=lin-system \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DLauncher_LIBRARY_DEST_DIR=%{_lib} \ + . + +%cmake_build + +%install +cd %{_builddir}/%{name} +%cmake_install + +%files +%{_bindir}/polymc +%{_datadir}/applications/org.polymc.PolyMC.desktop +%{_datadir}/metainfo/org.polymc.PolyMC.metainfo.xml +%{_datadir}/polymc/jars/* +%{_datadir}/icons/hicolor/scalable/apps/org.polymc.PolyMC.svg +%{_libdir}/libLauncher_nbt++.so +%{_libdir}/libLauncher_quazip.so +%{_libdir}/libLauncher_rainbow.so +%{_libdir}/libLauncher_iconfix.so + +%changelog +* Fri Jan 7 2022 getchoo - 1.0.4 +- Initial polymc spec -- cgit From 390a90b36117d428fe002a19b2c47d0f127b45fe Mon Sep 17 00:00:00 2001 From: seth Date: Sat, 8 Jan 2022 22:49:30 -0500 Subject: stop cmake from blocking builds on wsl --- CMakeLists.txt | 8 -------- libraries/katabasis/CMakeLists.txt | 8 -------- 2 files changed, 16 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bd5057a4..7439491d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,14 +13,6 @@ if(IS_IN_SOURCE_BUILD) message(FATAL_ERROR "You are building the Launcher in-source. Please separate the build tree from the source tree.") endif() -if (CMAKE_SYSTEM_NAME STREQUAL "Linux") - if(CMAKE_HOST_SYSTEM_VERSION MATCHES ".*[Mm]icrosoft.*" OR - CMAKE_HOST_SYSTEM_VERSION MATCHES ".*WSL.*" - ) - message(FATAL_ERROR "Building the Launcher is not supported in Linux-on-Windows distributions.") - endif() -endif() - ##################################### Set CMake options ##################################### set(CMAKE_AUTOMOC ON) diff --git a/libraries/katabasis/CMakeLists.txt b/libraries/katabasis/CMakeLists.txt index c6115881..d579dc29 100644 --- a/libraries/katabasis/CMakeLists.txt +++ b/libraries/katabasis/CMakeLists.txt @@ -5,14 +5,6 @@ if(IS_IN_SOURCE_BUILD) message(FATAL_ERROR "You are building Katabasis in-source. Please separate the build tree from the source tree.") endif() -if (CMAKE_SYSTEM_NAME STREQUAL "Linux") - if(CMAKE_HOST_SYSTEM_VERSION MATCHES ".*[Mm]icrosoft.*" OR - CMAKE_HOST_SYSTEM_VERSION MATCHES ".*WSL.*" - ) - message(FATAL_ERROR "Building Katabasis is not supported in Linux-on-Windows distributions. Use a real Linux machine, not a fraudulent one.") - endif() -endif() - project(Katabasis) enable_testing() -- cgit From 59ef13f032d73fcfb827c03b5d9df86a7d1b53e6 Mon Sep 17 00:00:00 2001 From: seth Date: Sat, 8 Jan 2022 23:13:10 -0500 Subject: add documentation for building a .rpm --- BUILD.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/BUILD.md b/BUILD.md index 2345d6ad..f0573ab1 100644 --- a/BUILD.md +++ b/BUILD.md @@ -45,6 +45,18 @@ cd packages/debian If everything works correctly, the .deb will be next to the build script, in `PolyMC/packages/debian` +### Building a .rpm + +You don't need to install the build dependencies, as the script will use `dnf` to install them for you. + +``` +git clone https://github.com/PolyMC/PolyMC.git +cd packages/rpm +./makerpm.sh +``` + +If everything works correctly, the .rpm will be next to the build script, in `PolyMC/packages/rpm` + ### Building from command line You need a source folder, a build folder and an install folder. -- cgit From 27eca0694709662b1e8253d36d2160ca1563edb0 Mon Sep 17 00:00:00 2001 From: swirl Date: Sat, 8 Jan 2022 23:55:59 -0500 Subject: rpm in readme --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 0ff8e3e2..a88cfc95 100644 --- a/README.md +++ b/README.md @@ -15,6 +15,7 @@ Several source build packages are available, along with experimental pre-built g - An [AUR package](https://aur.archlinux.org/packages/polymc-git/) is available. - A Gentoo ebuild is available in the [swirl](https://git.swurl.xyz/swirl/ebuilds) overlay, named `games-action/polymc`. Check the README for instructions on how to add the overlay. - A Flatpak is available in [Flathub](https://flathub.org/apps/details/org.polymc.PolyMC). You can install it from there or build it yourself using [this source](https://github.com/flathub/org.polymc.PolyMC). +- An RPM package is available, by going to the `packages/rpm` directory and running `./makerpm.sh`. - Generic, prebuilt packages (archived by version) can be found [here](https://packages.polymc.org/) ([latest](https://packages.polymc.org/latest)). - Last build status: https://jenkins.polymc.org/job/PolyMC/lastBuild/ - [Linux (AMD64) System](https://packages.polymc.org/latest/lin64-system/lin64-system.tar.zst) ([SHA256](https://packages.polymc.org/latest/lin64-system/lin64-system.tar.zst.sha256)) - this is a generic system package intended to be used as a base for making distro-specific packages. -- cgit From 87af5f631d344c26422f477d504c069261281e0a Mon Sep 17 00:00:00 2001 From: Ezekiel Smith Date: Sun, 9 Jan 2022 15:13:15 +1000 Subject: Update branding: New Logo (#30) New logo Co-authored-by: swirl --- README.md | 21 +- launcher/resources/multimc/scalable/launcher.svg | 30 ++- program_info/org.polymc.PolyMC.Source.svg | 261 +++++++++++++++++++++++ program_info/org.polymc.PolyMC.svg | 30 ++- program_info/polymc.icns | Bin 150958 -> 33406 bytes program_info/polymc.ico | Bin 102134 -> 15086 bytes program_info/polymc_dark.png | Bin 0 -> 50722 bytes program_info/polymc_light.png | Bin 0 -> 48991 bytes 8 files changed, 314 insertions(+), 28 deletions(-) create mode 100644 program_info/org.polymc.PolyMC.Source.svg create mode 100644 program_info/polymc_dark.png create mode 100644 program_info/polymc_light.png diff --git a/README.md b/README.md index a88cfc95..9539de9a 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,8 @@

- PolyMC logo + PolyMC logo + PolyMC logo

- -PolyMC 5 -========= - +
PolyMC is a custom launcher for Minecraft that focuses on predictability, long term stability and simplicity. This is a **fork** of the MultiMC Launcher and not endorsed by MultiMC. The PolyMC community felt that the maintainer was not acting in the spirit of Free Software so this fork was made. Read "[Why was this fork made?](https://github.com/PolyMC/PolyMC/wiki/FAQ)" on the wiki for more details. @@ -12,9 +10,10 @@ This is a **fork** of the MultiMC Launcher and not endorsed by MultiMC. The Poly ## Packages Several source build packages are available, along with experimental pre-built generic packages. -- An [AUR package](https://aur.archlinux.org/packages/polymc-git/) is available. -- A Gentoo ebuild is available in the [swirl](https://git.swurl.xyz/swirl/ebuilds) overlay, named `games-action/polymc`. Check the README for instructions on how to add the overlay. -- A Flatpak is available in [Flathub](https://flathub.org/apps/details/org.polymc.PolyMC). You can install it from there or build it yourself using [this source](https://github.com/flathub/org.polymc.PolyMC). +Download on Flathub +[![AUR package](https://img.shields.io/aur/version/polymc-git)](https://aur.archlinux.org/packages/polymc-git/) +- A Gentoo ebuild is available in the [swirl](https://git.swurl.xyz/swirl/ebuilds) overlay, named `games-action/polymc`. Check the README for instructions on how to add the overlay. +- The Flatpak can be built using [this source](https://github.com/flathub/org.polymc.PolyMC). - An RPM package is available, by going to the `packages/rpm` directory and running `./makerpm.sh`. - Generic, prebuilt packages (archived by version) can be found [here](https://packages.polymc.org/) ([latest](https://packages.polymc.org/latest)). - Last build status: https://jenkins.polymc.org/job/PolyMC/lastBuild/ @@ -30,6 +29,8 @@ If you want to contribute to PolyMC you might find it useful to join [#developme ### Building If you want to build PolyMC yourself, check [BUILD.md](BUILD.md) for build instructions. +You can build the flatpak using [this source](https://github.com/flathub/org.polymc.PolyMC). + ### Code formatting Just follow the existing formatting. @@ -51,11 +52,11 @@ Feel free to create an issue if you need help. However, you might find it easier [![PolyMC Discord](https://img.shields.io/discord/923671181020766230?label=PolyMC%20Discord)](https://discord.gg/xq7fxrgtMP) -For people who don't want to use Discord, we have a Matrix Space which is bridged to the Discord server. Be sure to enable spaces first (Settings -> Labs -> Spaces), and then you may join the space: +For people who don't want to use Discord, we have a Matrix Space which is bridged to the Discord server: [![PolyMC Space](https://img.shields.io/matrix/polymc:polymc.org?label=PolyMC%20Space&server_fqdn=matrix.polymc.org)](https://matrix.to/#/#polymc:polymc.org) -Matrix's support for spaces is still in development, so if you have issues accessing rooms via the space, then you can join the rooms directly: +If there are any issues with the space or you are using a client that does not support the feature here are the individual rooms: [![Support](https://img.shields.io/matrix/support:polymc.org?label=%23support&server_fqdn=matrix.polymc.org)](https://matrix.to/#/#support:polymc.org) [![Discussion](https://img.shields.io/matrix/discussion:polymc.org?label=%23discussion&server_fqdn=matrix.polymc.org)](https://matrix.to/#/#discussion:polymc.org) diff --git a/launcher/resources/multimc/scalable/launcher.svg b/launcher/resources/multimc/scalable/launcher.svg index d561a2c2..c192d503 100644 --- a/launcher/resources/multimc/scalable/launcher.svg +++ b/launcher/resources/multimc/scalable/launcher.svg @@ -1,9 +1,21 @@ - -Made with Pixels to Svg https://codepen.io/shshaw/pen/XbxvNj - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + diff --git a/program_info/org.polymc.PolyMC.Source.svg b/program_info/org.polymc.PolyMC.Source.svg new file mode 100644 index 00000000..0614cde2 --- /dev/null +++ b/program_info/org.polymc.PolyMC.Source.svg @@ -0,0 +1,261 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/program_info/org.polymc.PolyMC.svg b/program_info/org.polymc.PolyMC.svg index d561a2c2..c192d503 100644 --- a/program_info/org.polymc.PolyMC.svg +++ b/program_info/org.polymc.PolyMC.svg @@ -1,9 +1,21 @@ - -Made with Pixels to Svg https://codepen.io/shshaw/pen/XbxvNj - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + diff --git a/program_info/polymc.icns b/program_info/polymc.icns index 0a9426de..248353b0 100644 Binary files a/program_info/polymc.icns and b/program_info/polymc.icns differ diff --git a/program_info/polymc.ico b/program_info/polymc.ico index 84599c7f..ddd035b2 100644 Binary files a/program_info/polymc.ico and b/program_info/polymc.ico differ diff --git a/program_info/polymc_dark.png b/program_info/polymc_dark.png new file mode 100644 index 00000000..cedf6cef Binary files /dev/null and b/program_info/polymc_dark.png differ diff --git a/program_info/polymc_light.png b/program_info/polymc_light.png new file mode 100644 index 00000000..d3899a1f Binary files /dev/null and b/program_info/polymc_light.png differ -- cgit From 5a09dcae68508b50b2dc5b273141e7016bdcc7da Mon Sep 17 00:00:00 2001 From: swirl Date: Sun, 9 Jan 2022 00:19:21 -0500 Subject: forgot linebreak --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 9539de9a..1e72ada3 100644 --- a/README.md +++ b/README.md @@ -11,8 +11,9 @@ This is a **fork** of the MultiMC Launcher and not endorsed by MultiMC. The Poly Several source build packages are available, along with experimental pre-built generic packages. Download on Flathub +
[![AUR package](https://img.shields.io/aur/version/polymc-git)](https://aur.archlinux.org/packages/polymc-git/) -- A Gentoo ebuild is available in the [swirl](https://git.swurl.xyz/swirl/ebuilds) overlay, named `games-action/polymc`. Check the README for instructions on how to add the overlay. +- A Gentoo ebuild is available in the [swirl](https://git.swurl.xyz/swirl/ebuilds) overlay, named `games-action/polymc`. Check the README for instructions on how to add the overlay. - The Flatpak can be built using [this source](https://github.com/flathub/org.polymc.PolyMC). - An RPM package is available, by going to the `packages/rpm` directory and running `./makerpm.sh`. - Generic, prebuilt packages (archived by version) can be found [here](https://packages.polymc.org/) ([latest](https://packages.polymc.org/latest)). -- cgit