* [bug#49778] [PATCH 1/2] gnu: openttd-opensfx: Update to 1.0.1.
@ 2021-07-30 0:48 Ron Nazarov via Guix-patches via
2021-07-30 0:49 ` [bug#49778] [PATCH 2/2] licenses: Remove CC-Sampling+-1.0 Ron Nazarov via Guix-patches via
2021-07-30 9:50 ` bug#49778: [PATCH 1/2] gnu: openttd-opensfx: Update to 1.0.1 Leo Prikler
0 siblings, 2 replies; 4+ messages in thread
From: Ron Nazarov via Guix-patches via @ 2021-07-30 0:48 UTC (permalink / raw)
To: 49778; +Cc: Ron Nazarov
* gnu/packages/games.scm (openttd-opensfx): Update to 1.0.1.
[license]: Update license to cc-by-sa3.0.
---
gnu/packages/games.scm | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 8c6b5523f1..88293df306 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -62,6 +62,7 @@
;;; Copyright © 2021 David Pflug <david@pflug.io>
;;; Copyright © 2021 Felix Gruber <felgru@posteo.net>
;;; Copyright © 2021 Solene Rapenne <solene@perso.pw>
+;;; Copyright © 2021 Noisytoot <noisytoot@disroot.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -4423,7 +4424,7 @@ OpenGFX provides you with...
(define openttd-opensfx
(package
(name "openttd-opensfx")
- (version "0.2.3")
+ (version "1.0.1")
(source
(origin
(method url-fetch)
@@ -4456,7 +4457,7 @@ OpenGFX provides you with...
(description "OpenSFX is a set of free base sounds for OpenTTD which make
it possible to play OpenTTD without requiring the proprietary sound files from
the original Transport Tycoon Deluxe.")
- (license license:cc-sampling-plus-1.0)))
+ (license license:cc-by-sa3.0)))
(define openttd-openmsx
(package
--
2.32.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [bug#49778] [PATCH 2/2] licenses: Remove CC-Sampling+-1.0.
2021-07-30 0:48 [bug#49778] [PATCH 1/2] gnu: openttd-opensfx: Update to 1.0.1 Ron Nazarov via Guix-patches via
@ 2021-07-30 0:49 ` Ron Nazarov via Guix-patches via
2021-07-30 0:52 ` Ron Nazarov via Guix-patches via
2021-07-30 9:50 ` bug#49778: [PATCH 1/2] gnu: openttd-opensfx: Update to 1.0.1 Leo Prikler
1 sibling, 1 reply; 4+ messages in thread
From: Ron Nazarov via Guix-patches via @ 2021-07-30 0:49 UTC (permalink / raw)
To: 49778; +Cc: Ron Nazarov
* guix/licenses.scm (cc-sampling-plus-1.0): Remove variable.
---
guix/licenses.scm | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/guix/licenses.scm b/guix/licenses.scm
index 3affe1e920..388023e619 100644
--- a/guix/licenses.scm
+++ b/guix/licenses.scm
@@ -18,6 +18,7 @@
;;; Copyright © 2020 Helio Machado <0x2b3bfa0+guix@googlemail.com>
;;; Copyright © 2021 Felix Gruber <felgru@posteo.net>
;;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz>
+;;; Copyright © 2021 Noisytoot <noisytoot@disroot.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -234,11 +235,6 @@ at URI, which may be a file:// URI pointing the package's tree."
"http://creativecommons.org/licenses/by/2.0/"
"Creative Commons Attribution 2.0 Generic"))
-(define cc-sampling-plus-1.0
- (license "CC-Sampling+ 1.0"
- "https://creativecommons.org/licenses/sampling+/1.0"
- "Creative Commons Sampling Plus 1.0"))
-
(define cddl1.0
(license "CDDL 1.0"
"http://directory.fsf.org/wiki/License:CDDLv1.0"
--
2.32.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [bug#49778] [PATCH 2/2] licenses: Remove CC-Sampling+-1.0.
2021-07-30 0:49 ` [bug#49778] [PATCH 2/2] licenses: Remove CC-Sampling+-1.0 Ron Nazarov via Guix-patches via
@ 2021-07-30 0:52 ` Ron Nazarov via Guix-patches via
0 siblings, 0 replies; 4+ messages in thread
From: Ron Nazarov via Guix-patches via @ 2021-07-30 0:52 UTC (permalink / raw)
To: 49778
[-- Attachment #1: Type: text/plain, Size: 189 bytes --]
Reasons for removing CC-Sampling+-1.0:
1. It is nonfree
2. I updated the only package that used it (openttd-opensfx) to a
version that uses CC-BY-SA 3.0 instead (they switched license)
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* bug#49778: [PATCH 1/2] gnu: openttd-opensfx: Update to 1.0.1.
2021-07-30 0:48 [bug#49778] [PATCH 1/2] gnu: openttd-opensfx: Update to 1.0.1 Ron Nazarov via Guix-patches via
2021-07-30 0:49 ` [bug#49778] [PATCH 2/2] licenses: Remove CC-Sampling+-1.0 Ron Nazarov via Guix-patches via
@ 2021-07-30 9:50 ` Leo Prikler
1 sibling, 0 replies; 4+ messages in thread
From: Leo Prikler @ 2021-07-30 9:50 UTC (permalink / raw)
To: 49778-done, noisytoot
> Reasons for removing CC-Sampling+-1.0:
> 1. It is nonfree
> 2. I updated the only package that used it (openttd-opensfx) to a
> version that uses CC-BY-SA 3.0 instead (they switched license)
I've pushed both your patches and also updated OpenGFX. There appears
to be a bug in the music player, so I didn't update OpenMSX yet.
Thanks
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-07-30 9:51 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-30 0:48 [bug#49778] [PATCH 1/2] gnu: openttd-opensfx: Update to 1.0.1 Ron Nazarov via Guix-patches via
2021-07-30 0:49 ` [bug#49778] [PATCH 2/2] licenses: Remove CC-Sampling+-1.0 Ron Nazarov via Guix-patches via
2021-07-30 0:52 ` Ron Nazarov via Guix-patches via
2021-07-30 9:50 ` bug#49778: [PATCH 1/2] gnu: openttd-opensfx: Update to 1.0.1 Leo Prikler
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).