From 2cb6b2d577799363f39664bbf68cd0d0987ec62a Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Wed, 7 Jul 2021 17:09:22 +0200 Subject: [PATCH 1/2] Add MIT license --- COPYING | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 COPYING diff --git a/COPYING b/COPYING new file mode 100644 index 0000000..694ce95 --- /dev/null +++ b/COPYING @@ -0,0 +1,20 @@ +Copyright (c) 2020-2021 Eelco Dolstra and the flake-compat contributors + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +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. -- 2.44.1 From 14dbada01f25f2ddc86b0e1f2401bf8fe1f7a8f7 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Sun, 1 Aug 2021 13:47:05 +0200 Subject: [PATCH 2/2] Revert unlicensed contribution Some explanation is in order: I have tried to contact Zanculmarktum three times in the last 25 days, but I have not received any response. Meanwhile, others are waiting to be able to use flake-compat, so I have decided that it is best to move forward with the licensing effort, considering that everyone else except Eelco has already agreed, and quickly as well. I have no hard feelings towards Zanculmarktum and I really do not like having to make this commit. This reverts commit e363cffac26b0009972e0e20c1bbb0953473bd86 and subsequent improvements. I should note that it could be argued that their contribution was not a creative work in the sense of most copyright law, but I'd prefer to avoid any confusion by choosing to reimplement their contribution in a "clean room" manner. --- default.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/default.nix b/default.nix index 1ffef45..8116f29 100644 --- a/default.nix +++ b/default.nix @@ -46,13 +46,6 @@ let { outPath = builtins.path { path = info.path; }; narHash = info.narHash; } - else if info.type == "tarball" then - { outPath = - fetchTarball - ({ inherit (info) url; } - // (if info ? narHash then { sha256 = info.narHash; } else {}) - ); - } else if info.type == "gitlab" then { inherit (info) rev narHash lastModified; outPath = -- 2.44.1