summaryrefslogtreecommitdiff
path: root/rodion
diff options
context:
space:
mode:
Diffstat (limited to 'rodion')
-rw-r--r--rodion/licenses.scm13
-rw-r--r--rodion/packages/audio.scm10
-rw-r--r--rodion/packages/emacs.scm5
-rw-r--r--rodion/packages/fonts.scm3
-rw-r--r--rodion/packages/games.scm63
-rw-r--r--rodion/packages/k8s.scm4
-rw-r--r--rodion/packages/node.scm4
-rw-r--r--rodion/packages/wm.scm22
8 files changed, 58 insertions, 66 deletions
diff --git a/rodion/licenses.scm b/rodion/licenses.scm
new file mode 100644
index 0000000..76cffb3
--- /dev/null
+++ b/rodion/licenses.scm
@@ -0,0 +1,13 @@
+(define-module (rodion licenses)
+ #:use-module (guix licenses)
+ #:export (unspecified!
+ sustainable-use
+ bsl))
+
+(define license (@@ (guix licenses) license))
+
+(define unspecified! (license "unspecified" "" "License is not specified"))
+
+(define sustainable-use (license "Sustainable Use License 1.0" "https://github.com/n8n-io/n8n/blob/master/LICENSE.md" "Non-free license with commercial use restrictions"))
+
+(define bsl (license "Business Source License" "https://github.com/hashicorp/terraform/blob/main/LICENSE" "Non-free license with commercial userrestrictions"))
diff --git a/rodion/packages/audio.scm b/rodion/packages/audio.scm
index 1015969..17cd662 100644
--- a/rodion/packages/audio.scm
+++ b/rodion/packages/audio.scm
@@ -34,9 +34,9 @@
(version "1.9.6")
(build-system glib-or-gtk-build-system)
(home-page "https://github.com/DeaDBeeF-Player/deadbeef")
- (license license:zlib)
- (description "Test")
- (synopsis "Test")
+ (license license:bsd-3)
+ (description "DeaDBeeF (as in 0xDEADBEEF) is a modular cross-platform audio player which runs on desktop operating systems. DeaDBeeF plays a variety of audio formats, converts between them, lets you customize the UI in almost any way you want, and use many additional plugins which can extend it even more.")
+ (synopsis "DeaDBeeF is a multiple-platform music player for desktop operating systems")
(native-inputs (list
gnu-gettext
autoconf
@@ -128,8 +128,8 @@
(build-system cmake-build-system)
(home-page "https://github.com/fooyin/fooyinx")
(license license:gpl3)
- (description "fooyin is a music player built around customisation. It offers a growing list of widgets to manage and play your local music collection. It's extensible using a plugin system and many widgets make use of FooScript to offer an even deeper level of control.")
- (synopsis "A customisable music player")
+ (description "fooyin is a music player built around customisation. It offers a growing list of widgets to manage and play your local music collection. It's extensible using a plugin system and many widgets make use of FooScript to offer an even deeper level of control.")
+ (synopsis "fooyin is a customisable music player")
(native-inputs (list pkg-config))
(inputs (list
alsa-lib
diff --git a/rodion/packages/emacs.scm b/rodion/packages/emacs.scm
index 456b719..1e1a45c 100644
--- a/rodion/packages/emacs.scm
+++ b/rodion/packages/emacs.scm
@@ -4,7 +4,8 @@
#:use-module (guix git-download)
#:use-module (guix build-system emacs)
#:use-module (gnu packages emacs-xyz)
- #:use-module (guix gexp))
+ #:use-module (guix gexp)
+ #:use-module ((rodion licenses) #:prefix nonfree-license:))
(define-public emacs-mood-one-theme
(package
@@ -27,7 +28,7 @@
(synopsis "A dark Emacs color scheme inspired by the Doom One theme")
(description
"mood-one-theme is a dark color scheme that aims to replicate some of the features of the Doom One theme.")
- (license license:unlicense)))
+ (license nonfree-license:unspecified!)))
(define-public emacs-yaml-pro
(package
diff --git a/rodion/packages/fonts.scm b/rodion/packages/fonts.scm
index 0081423..2c81ee6 100644
--- a/rodion/packages/fonts.scm
+++ b/rodion/packages/fonts.scm
@@ -5,7 +5,6 @@
#:use-module (guix build-system font)
#:use-module (gnu packages fonts))
-
(define-public font-awesome-6
(package
(name "font-awesome-6")
@@ -41,6 +40,6 @@
(description
"Font Awesome is a full suite of pictographic icons for easy scalable
vector graphics.")
- (license license:silofl1.1)))
+ (license (list license:silofl1.1 license:expat))))
diff --git a/rodion/packages/games.scm b/rodion/packages/games.scm
index 39b52f5..8da53f8 100644
--- a/rodion/packages/games.scm
+++ b/rodion/packages/games.scm
@@ -7,34 +7,35 @@
#:use-module (gnu packages sdl)
#:use-module (gnu packages emulators)
#:use-module (gnu packages compression)
- #:use-module ((guix licenses) #:prefix license:))
+ #:use-module ((guix licenses) #:prefix license:)
+ #:use-module ((rodion licenses) #:prefix nonfree-license:))
(define-public fpattern
(package
- (name "fpattern")
- (version "1.9")
- (build-system copy-build-system)
- (home-page "https://github.com/Loadmaster/fpattern")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/Loadmaster/fpattern")
- (commit (string-append "v" version))))
- (sha256
- (base32 "0lm5afk18a6m4wib4xvslik9zz00r36zvdrrgjbwd8d8550cq2zx"))))
- (arguments
- (list #:phases
- #~(modify-phases %standard-phases
- (add-before 'install 'build-library
- (lambda* (#:key inputs #:allow-other-keys)
- (invoke "gcc" "-c" "-Wall" "-fpic" "fpattern.c")
- (invoke "gcc" "-shared" "-o" "libfpattern.so" "fpattern.o"))))
- #:install-plan ''(("libfpattern.so" "lib/")
- ("fpattern.h" "include/"))))
- (license license:expat)
- (description "Filename pattern matching library functions")
- (synopsis "Filename pattern matching library functions for DOS, Windows, and Unix.
+ (name "fpattern")
+ (version "1.9")
+ (build-system copy-build-system)
+ (home-page "https://github.com/Loadmaster/fpattern")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/Loadmaster/fpattern")
+ (commit (string-append "v" version))))
+ (sha256
+ (base32 "0lm5afk18a6m4wib4xvslik9zz00r36zvdrrgjbwd8d8550cq2zx"))))
+ (arguments
+ (list #:phases
+ #~(modify-phases %standard-phases
+ (add-before 'install 'build-library
+ (lambda* (#:key inputs #:allow-other-keys)
+ (invoke "gcc" "-c" "-Wall" "-fpic" "fpattern.c")
+ (invoke "gcc" "-shared" "-o" "libfpattern.so" "fpattern.o"))))
+ #:install-plan ''(("libfpattern.so" "lib/")
+ ("fpattern.h" "include/"))))
+ (license license:expat)
+ (description "Filename pattern matching library functions")
+ (synopsis "Filename pattern matching library functions for DOS, Windows, and Unix.
Functions for matching filename patterns to filenames. Written in C. Provided as an object file (fpattern.obj) and a header include source file (fpattern.h).
@@ -67,9 +68,9 @@ Filename patterns are composed of regular (printable) characters which may compr
(patches `(,(local-file "./patches/0001-fallout-ce-fpattern.patch")))
(sha256
(base32 "0c11zbvja42s0z8zqfm6gf981m0v2vwxvhqas46lplwbfhbnh836"))))
- (license license:expat)
- (description "Fallout")
- (synopsis "Fallout")))
+ (license nonfree-license:sustainable-use)
+ (description "Fallout Community Edition is a fully working re-implementation of Fallout, with the same original gameplay, engine bugfixes, and some quality of life improvements, that works (mostly) hassle-free on multiple platforms.")
+ (synopsis "Fallout Community Edition is an engine rewrite for modern operating systems")))
(define-public fallout2-ce
(package
@@ -99,9 +100,9 @@ Filename patterns are composed of regular (printable) characters which may compr
(patches `(,(local-file "./patches/0001-fallout2-ce-fpattern.patch")))
(sha256
(base32 "15b30i2ixq0w01qxrymd1qs1awj8kijbqzac8wvfrpm85fdnfnmg"))))
- (license license:expat)
- (description "Fallout")
- (synopsis "Fallout")))
+ (license nonfree-license:sustainable-use)
+ (description "Fallout 2 Community Edition is a fully working re-implementation of Fallout 2, with the same original gameplay, engine bugfixes, and some quality of life improvements, that works (mostly) hassle-free on multiple platforms.")
+ (synopsis "Fallout 2 Community Edition is an engine rewrite for modern operating systems")))
;; Build with the old CPU support
(define-public dosbox-staging/old-cpu
diff --git a/rodion/packages/k8s.scm b/rodion/packages/k8s.scm
index 34433e9..ed9b530 100644
--- a/rodion/packages/k8s.scm
+++ b/rodion/packages/k8s.scm
@@ -1,6 +1,6 @@
(define-module (rodion packages k8s)
#:use-module ((guix licenses) #:prefix license:)
- #:use-module (nonguix licenses)
+ #:use-module ((rodion licenses) #:prefix nonfree-license:)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (gnu packages compression)
@@ -23,7 +23,7 @@
(description "Terraform")
(inputs (list unzip))
(home-page "https://terraform.io")
- (license (nonfree "https://github.com/hashicorp/terraform/blob/main/LICENSE" "Business Source License"))))
+ (license nonfree-license:bsl)))
(define-public helmfile
(package
diff --git a/rodion/packages/node.scm b/rodion/packages/node.scm
index 77e051e..c60f0af 100644
--- a/rodion/packages/node.scm
+++ b/rodion/packages/node.scm
@@ -7,7 +7,7 @@
#:use-module (nonguix build-system binary)
#:use-module (guix licenses))
-(define-public node-fresh
+(define-public node/fresh
(package
(name "node")
(version "20.11.1")
@@ -38,7 +38,7 @@
(inputs `((,gcc "lib")
,gcc-toolchain))
(home-page "https://nodejs.org/")
- (synopsis "nodejs")
+ (synopsis "Node.js 20 binary version")
(description
"Node.js is a JavaScript runtime built on Chrome's V8 JavaScript engine.")
(license expat)))
diff --git a/rodion/packages/wm.scm b/rodion/packages/wm.scm
deleted file mode 100644
index 556709e..0000000
--- a/rodion/packages/wm.scm
+++ /dev/null
@@ -1,22 +0,0 @@
-(define-module (rodion packages wm)
- #:use-module (guix packages)
- #:use-module (gnu packages wm)
- #:use-module (gnu packages vulkan))
-
-(define-public wlroots-vulkan
- (package
- (inherit wlroots)
- (name "wlroots-vulkan")
- (propagated-inputs
- (modify-inputs
- (package-propagated-inputs wlroots)
- (append vulkan-loader vulkan-headers glslang)))))
-
-(define-public sway-vulkan
- (package
- (inherit sway)
- (name "sway-vulkan")
- (inputs
- (modify-inputs
- (package-inputs sway)
- (replace "wlroots" wlroots-vulkan)))))