From 8d7455c4a98d745fbe6291424b7d5f7c4e32559f Mon Sep 17 00:00:00 2001 From: Daniel Gröber Date: Mon, 13 Aug 2018 00:05:25 +0200 Subject: Downgrade license from AGPLv3 to regular GPLv3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit There are only 8 commits in cabal-helper not by me or alanz, see: $ git log --author='Daniel Gröber\|Alan Zimmerman' --invert-grep -p 9142d8a9e6ed18faf17a360521fbbbd25f6a3b47 Alan Zimmerman has agreed to the license change on IRC. The rest are IMO uncopyrightable. I'm pretty sure version-bounds are "facts" which are inherently uncopyrightable, i.e. the software builds with this and that version, that's a fact. Simple build fixes such as ae568d10 and eb178a5b shouldn't really cross the necessary creative threshold. --- src/CabalHelper/Compiletime/Compat/Environment.hs | 15 +++++++++++++++ src/CabalHelper/Compiletime/Compat/ProgramDb.hs | 15 +++++++++++++++ src/CabalHelper/Compiletime/Compat/Version.hs | 15 +++++++++++++++ src/CabalHelper/Compiletime/Compile.hs | 10 +++++----- src/CabalHelper/Compiletime/Data.hs | 10 +++++----- src/CabalHelper/Compiletime/Log.hs | 10 +++++----- src/CabalHelper/Compiletime/Types.hs | 10 +++++----- src/CabalHelper/Compiletime/Wrapper.hs | 8 ++++---- src/CabalHelper/Runtime/Main.hs | 8 ++++---- src/CabalHelper/Shared/Common.hs | 10 +++++----- src/CabalHelper/Shared/InterfaceTypes.hs | 10 +++++----- src/CabalHelper/Shared/Sandbox.hs | 10 +++++----- 12 files changed, 88 insertions(+), 43 deletions(-) (limited to 'src') diff --git a/src/CabalHelper/Compiletime/Compat/Environment.hs b/src/CabalHelper/Compiletime/Compat/Environment.hs index 535bcc6..e1dd817 100644 --- a/src/CabalHelper/Compiletime/Compat/Environment.hs +++ b/src/CabalHelper/Compiletime/Compat/Environment.hs @@ -1,3 +1,18 @@ +-- Copyright (C) 2017 Daniel Gröber +-- +-- 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 . + {-# LANGUAGE CPP #-} module CabalHelper.Compiletime.Compat.Environment where diff --git a/src/CabalHelper/Compiletime/Compat/ProgramDb.hs b/src/CabalHelper/Compiletime/Compat/ProgramDb.hs index 89dd886..afc2530 100644 --- a/src/CabalHelper/Compiletime/Compat/ProgramDb.hs +++ b/src/CabalHelper/Compiletime/Compat/ProgramDb.hs @@ -1,3 +1,18 @@ +-- Copyright (C) 2018 Daniel Gröber +-- +-- 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 . + {-# LANGUAGE CPP #-} module CabalHelper.Compiletime.Compat.ProgramDb ( defaultProgramDb diff --git a/src/CabalHelper/Compiletime/Compat/Version.hs b/src/CabalHelper/Compiletime/Compat/Version.hs index af17bcb..a9e0de6 100644 --- a/src/CabalHelper/Compiletime/Compat/Version.hs +++ b/src/CabalHelper/Compiletime/Compat/Version.hs @@ -1,3 +1,18 @@ +-- Copyright (C) 2017-2018 Daniel Gröber +-- +-- 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 . + {-# LANGUAGE CPP #-} module CabalHelper.Compiletime.Compat.Version ( DataVersion diff --git a/src/CabalHelper/Compiletime/Compile.hs b/src/CabalHelper/Compiletime/Compile.hs index 571240d..78872bb 100644 --- a/src/CabalHelper/Compiletime/Compile.hs +++ b/src/CabalHelper/Compiletime/Compile.hs @@ -1,16 +1,16 @@ --- Copyright (C) 2015,2017 Daniel Gröber +-- Copyright (C) 2015-2018 Daniel Gröber -- -- This program is free software: you can redistribute it and/or modify --- it under the terms of the GNU Affero General Public License as published by +-- 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 Affero General Public License for more details. +-- GNU General Public License for more details. -- --- You should have received a copy of the GNU Affero General Public License +-- You should have received a copy of the GNU General Public License -- along with this program. If not, see . {-# LANGUAGE RecordWildCards, FlexibleContexts, NamedFieldPuns, DeriveFunctor, GADTs #-} @@ -18,7 +18,7 @@ GADTs #-} {-| Module : CabalHelper.Compiletime.Compile Description : Runtime compilation machinery -License : AGPL-3 +License : GPL-3 -} module CabalHelper.Compiletime.Compile where diff --git a/src/CabalHelper/Compiletime/Data.hs b/src/CabalHelper/Compiletime/Data.hs index 818f626..e1c6c55 100644 --- a/src/CabalHelper/Compiletime/Data.hs +++ b/src/CabalHelper/Compiletime/Data.hs @@ -1,16 +1,16 @@ --- Copyright (C) 2015,2017 Daniel Gröber +-- Copyright (C) 2015-2017 Daniel Gröber -- -- This program is free software: you can redistribute it and/or modify --- it under the terms of the GNU Affero General Public License as published by +-- 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 Affero General Public License for more details. +-- GNU General Public License for more details. -- --- You should have received a copy of the GNU Affero General Public License +-- You should have received a copy of the GNU General Public License -- along with this program. If not, see . {-# LANGUAGE TemplateHaskell, ScopedTypeVariables #-} @@ -19,7 +19,7 @@ {-| Module : CabalHelper.Compiletime.Data Description : Embeds source code for runtime component using TH -License : AGPL-3 +License : GPL-3 -} module CabalHelper.Compiletime.Data where diff --git a/src/CabalHelper/Compiletime/Log.hs b/src/CabalHelper/Compiletime/Log.hs index 4c9a5c5..0b95866 100644 --- a/src/CabalHelper/Compiletime/Log.hs +++ b/src/CabalHelper/Compiletime/Log.hs @@ -1,16 +1,16 @@ --- Copyright (C) 2017 Daniel Gröber +-- Copyright (C) 2017-2018 Daniel Gröber -- -- This program is free software: you can redistribute it and/or modify --- it under the terms of the GNU Affero General Public License as published by +-- 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 Affero General Public License for more details. +-- GNU General Public License for more details. -- --- You should have received a copy of the GNU Affero General Public License +-- You should have received a copy of the GNU General Public License -- along with this program. If not, see . {-# LANGUAGE ScopedTypeVariables #-} @@ -18,7 +18,7 @@ {-| Module : CabalHelper.Compiletime.Log Description : Basic logging facilities -License : AGPL-3 +License : GPL-3 -} module CabalHelper.Compiletime.Log where diff --git a/src/CabalHelper/Compiletime/Types.hs b/src/CabalHelper/Compiletime/Types.hs index 07d0266..d75933b 100644 --- a/src/CabalHelper/Compiletime/Types.hs +++ b/src/CabalHelper/Compiletime/Types.hs @@ -1,16 +1,16 @@ --- Copyright (C) 2015 Daniel Gröber +-- Copyright (C) 2015-2018 Daniel Gröber -- -- This program is free software: you can redistribute it and/or modify --- it under the terms of the GNU Affero General Public License as published by +-- 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 Affero General Public License for more details. +-- GNU General Public License for more details. -- --- You should have received a copy of the GNU Affero General Public License +-- You should have received a copy of the GNU General Public License -- along with this program. If not, see . {-# LANGUAGE DeriveGeneric, DeriveDataTypeable, DefaultSignatures #-} @@ -18,7 +18,7 @@ {-| Module : CabalHelper.Compiletime.Types Description : Types used throughout -License : AGPL-3 +License : GPL-3 -} module CabalHelper.Compiletime.Types where diff --git a/src/CabalHelper/Compiletime/Wrapper.hs b/src/CabalHelper/Compiletime/Wrapper.hs index cd92219..9a9f27f 100644 --- a/src/CabalHelper/Compiletime/Wrapper.hs +++ b/src/CabalHelper/Compiletime/Wrapper.hs @@ -1,17 +1,17 @@ -- cabal-helper: Simple interface to Cabal's configuration state --- Copyright (C) 2015 Daniel Gröber +-- Copyright (C) 2015-2018 Daniel Gröber -- -- This program is free software: you can redistribute it and/or modify --- it under the terms of the GNU Affero General Public License as published by +-- 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 Affero General Public License for more details. +-- GNU General Public License for more details. -- --- You should have received a copy of the GNU Affero General Public License +-- You should have received a copy of the GNU General Public License -- along with this program. If not, see . {-# LANGUAGE RecordWildCards, NamedFieldPuns, FlexibleContexts, ViewPatterns #-} module Main where diff --git a/src/CabalHelper/Runtime/Main.hs b/src/CabalHelper/Runtime/Main.hs index 2b520fc..a22303a 100644 --- a/src/CabalHelper/Runtime/Main.hs +++ b/src/CabalHelper/Runtime/Main.hs @@ -1,16 +1,16 @@ --- Copyright (C) 2015 Daniel Gröber +-- Copyright (C) 2015-2018 Daniel Gröber -- -- This program is free software: you can redistribute it and/or modify --- it under the terms of the GNU Affero General Public License as published by +-- 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 Affero General Public License for more details. +-- GNU General Public License for more details. -- --- You should have received a copy of the GNU Affero General Public License +-- You should have received a copy of the GNU General Public License -- along with this program. If not, see . {-# LANGUAGE CPP, BangPatterns, RecordWildCards, RankNTypes, ViewPatterns #-} diff --git a/src/CabalHelper/Shared/Common.hs b/src/CabalHelper/Shared/Common.hs index 2699496..2bc3e2b 100644 --- a/src/CabalHelper/Shared/Common.hs +++ b/src/CabalHelper/Shared/Common.hs @@ -1,22 +1,22 @@ --- Copyright (C) 2015 Daniel Gröber +-- Copyright (C) 2015-2018 Daniel Gröber -- -- This program is free software: you can redistribute it and/or modify --- it under the terms of the GNU Affero General Public License as published by +-- 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 Affero General Public License for more details. +-- GNU General Public License for more details. -- --- You should have received a copy of the GNU Affero General Public License +-- You should have received a copy of the GNU General Public License -- along with this program. If not, see . {-| Module : CabalHelper.Shared.Common Description : Shared utility functions -License : AGPL-3 +License : GPL-3 -} {-# LANGUAGE CPP, DeriveDataTypeable, OverloadedStrings #-} diff --git a/src/CabalHelper/Shared/InterfaceTypes.hs b/src/CabalHelper/Shared/InterfaceTypes.hs index bff0f56..4c85ea9 100644 --- a/src/CabalHelper/Shared/InterfaceTypes.hs +++ b/src/CabalHelper/Shared/InterfaceTypes.hs @@ -1,16 +1,16 @@ --- Copyright (C) 2015,2017 Daniel Gröber +-- Copyright (C) 2015-2018 Daniel Gröber -- -- This program is free software: you can redistribute it and/or modify --- it under the terms of the GNU Affero General Public License as published by +-- 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 Affero General Public License for more details. +-- GNU General Public License for more details. -- --- You should have received a copy of the GNU Affero General Public License +-- You should have received a copy of the GNU General Public License -- along with this program. If not, see . {-# LANGUAGE DeriveGeneric, DeriveDataTypeable, DefaultSignatures #-} @@ -18,7 +18,7 @@ {-| Module : CabalHelper.Shared.InterfaceTypes Description : Types which are used by c-h library and executable to communicate -License : AGPL-3 +License : GPL-3 These types are used to communicate between the cabal-helper library and main executable, using Show/Read. If any types in this module change the major diff --git a/src/CabalHelper/Shared/Sandbox.hs b/src/CabalHelper/Shared/Sandbox.hs index 4dd9705..52484e0 100644 --- a/src/CabalHelper/Shared/Sandbox.hs +++ b/src/CabalHelper/Shared/Sandbox.hs @@ -1,22 +1,22 @@ --- Copyright (C) 2015 Daniel Gröber +-- Copyright (C) 2015-2017 Daniel Gröber -- -- This program is free software: you can redistribute it and/or modify --- it under the terms of the GNU Affero General Public License as published by +-- 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 Affero General Public License for more details. +-- GNU General Public License for more details. -- --- You should have received a copy of the GNU Affero General Public License +-- You should have received a copy of the GNU General Public License -- along with this program. If not, see . {-| Module : CabalHelper.Shared.Sandbox Description : Extracting information from @cabal.sandbox.config@ files -License : AGPL-3 +License : GPL-3 -} module CabalHelper.Shared.Sandbox where -- cgit v1.2.3