about summary refs log tree commit diff
path: root/COPYING
diff options
context:
space:
mode:
Diffstat (limited to 'COPYING')
-rw-r--r--COPYING29
1 files changed, 16 insertions, 13 deletions
diff --git a/COPYING b/COPYING
index 8377ade4..1da4f5dd 100644
--- a/COPYING
+++ b/COPYING
@@ -1,17 +1,20 @@
-All Nix expressions in this repository are free software: you can
-redistribute them and/or modify them 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.
+Everything except files that end with ".patch" are copyright (C) 2015
+aszlig and licensed under the Apache License, Version 2.0 (the
+"License"); you may not use these files except in compliance with the
+License. You may obtain a copy of the License at
 
-The expression files are distributed in the hope that they 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.
+   http://www.apache.org/licenses/LICENSE-2.0
 
-For files other than the Nix expression files the same terms apply,
-unless explicitly stated otherwise here or in the file header.
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
 
-You should have received a copy of the GNU General Public License
-along with this program (see LICENSE file).
+If the URL to the license is unavailable, please see LICENSE.APACHE in
+this directory.
 
-If not, see <http://www.gnu.org/licenses/>.
+All of the .patch files are copyright (C) 2015 aszlig as well, but are
+licensed under the licenses of the corresponding projects. Please look
+at accompanying Nix expressions for more information about the
+licenses of the respective projects and thus my patches.