summary refs log tree commit diff
diff options
context:
space:
mode:
authorMatthew Bauer <mjbauer95@gmail.com>2018-10-13 16:42:34 -0500
committerGitHub <noreply@github.com>2018-10-13 16:42:34 -0500
commit0c97d2509266f0ea71dea3461aa7c691d07f45ee (patch)
treed4b8fad83ab1b8ebf0f4a6fa0ce9823d4dd1ee1a
parentfc3e172170da1bee1ef03eb038a0dc6904f4577c (diff)
parentef54c618dc7af978e875704b0142d3d1e8b96f29 (diff)
downloadnixlib-0c97d2509266f0ea71dea3461aa7c691d07f45ee.tar
nixlib-0c97d2509266f0ea71dea3461aa7c691d07f45ee.tar.gz
nixlib-0c97d2509266f0ea71dea3461aa7c691d07f45ee.tar.bz2
nixlib-0c97d2509266f0ea71dea3461aa7c691d07f45ee.tar.lz
nixlib-0c97d2509266f0ea71dea3461aa7c691d07f45ee.tar.xz
nixlib-0c97d2509266f0ea71dea3461aa7c691d07f45ee.tar.zst
nixlib-0c97d2509266f0ea71dea3461aa7c691d07f45ee.zip
Merge pull request #48320 from transumption/201810/move-notice-to-readme
COPYING: move notice to README.md
-rw-r--r--COPYING9
-rw-r--r--README.md6
2 files changed, 6 insertions, 9 deletions
diff --git a/COPYING b/COPYING
index 198597a1b410..7c52fb768978 100644
--- a/COPYING
+++ b/COPYING
@@ -18,12 +18,3 @@ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-======================================================================
-
-Note: the license above does not apply to the packages built by the
-Nix Packages collection, merely to the package descriptions (i.e., Nix
-expressions, build scripts, etc.).  It also might not apply to patches
-included in Nixpkgs, which may be derivative works of the packages to
-which they apply.  The aforementioned artifacts are all covered by the
-licenses of the respective packages.
diff --git a/README.md b/README.md
index 144a23027db9..278ef66cf7e8 100644
--- a/README.md
+++ b/README.md
@@ -39,3 +39,9 @@ Communication:
 
 * [Discourse Forum](https://discourse.nixos.org/)
 * [IRC - #nixos on freenode.net](irc://irc.freenode.net/#nixos)
+
+Note: MIT license does not apply to the packages built by Nixpkgs, merely to
+the package descriptions (Nix expressions, build scripts, and so on). It also
+might not apply to patches included in Nixpkgs, which may be derivative works
+of the packages to which they apply. The aforementioned artifacts are all
+covered by the licenses of the respective packages.