From 2a88ea4333b134153f3ef2f1b98938c946988c57 Mon Sep 17 00:00:00 2001 From: Erin van der Veen Date: Wed, 17 Mar 2021 14:50:08 +0100 Subject: [PATCH 1/2] maintainers: add erin --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 9efca53200f..044747daac3 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2889,6 +2889,12 @@ githubId = 3787281; name = "Erik Rybakken"; }; + erin = { + name = "Erin van der Veen"; + email = "erin@erinvanderveen.nl"; + github = "ErinvanderVeen"; + githubId = 10973664; + }; erosennin = { email = "ag@sologoc.com"; github = "erosennin"; From 2e698f6ba7494b015303e5275a00741b44eba3b1 Mon Sep 17 00:00:00 2001 From: Erin van der Veen Date: Wed, 17 Mar 2021 15:07:48 +0100 Subject: [PATCH 2/2] clean: change to bsd2 license Clean is released under the bsd2 license as can be seen here: https://clean.cs.ru.nl/Download_Clean For the full license, see: https://ftp.cs.ru.nl/Clean/Clean30/CleanLicenseConditions.txt --- pkgs/development/compilers/clean/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/clean/default.nix b/pkgs/development/compilers/clean/default.nix index f8121958e29..e360bb05f40 100644 --- a/pkgs/development/compilers/clean/default.nix +++ b/pkgs/development/compilers/clean/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation { - name = "clean-3.0"; + pname = "clean"; + version = "3.0"; src = if stdenv.hostPlatform.system == "i686-linux" then (fetchurl { @@ -45,8 +46,8 @@ stdenv.mkDerivation { ''; homepage = "http://wiki.clean.cs.ru.nl/Clean"; - license = lib.licenses.lgpl21; - maintainers = [ lib.maintainers.kkallio ]; + license = lib.licenses.bsd2; + maintainers = [ lib.maintainers.erin ]; platforms = [ "i686-linux" "x86_64-linux" ]; }; }