From e61c581805b2338ea8feaac86617c5d7bff41c41 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 13 Sep 2022 16:36:50 +0200 Subject: gnu: qtshadertools: Fix 'license' field. Fixes . Reported by Julien Lepiller . Fix provided by Florian Pelz . * gnu/packages/qt.scm (qtshadertools)[license]: Fix value. --- gnu/packages/qt.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/qt.scm') diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 6ee70bc701..bcdad65d3c 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1383,7 +1383,7 @@ (define-public qtshadertools (description "The @code{qtshadertools} module provides APIs and tools supporting shader pipeline functionality as offered in Qt Quick to operate on Vulkan, OpenGL and other main graphic APIs.") - (license (package-home-page qtbase)))) + (license (package-license qtbase)))) (define-public qtmultimedia (package -- cgit v1.2.3 From fa4fffbd08890c5a66096b712380b9737aeb1a93 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Wed, 14 Sep 2022 09:31:05 +0100 Subject: gnu: Add comments to the bottom of a few more package modules. This will hopefully discourage patches which add new packages to the bottom of files, as this increases the likelihood of conflicts when applying patches. If there are more specific ways that packages should be arranged in specific modules, this message can be updated accordingly. * gnu/packages/crates-graphics.scm: Add comment discouraging adding packages to the bottom of the file. * gnu/packages/crates-gtk.scm: ditto. * gnu/packages/games.scm: ditto. * gnu/packages/music.scm: ditto. * gnu/packages/qt.scm: ditto. * gnu/packages/web.scm: ditto. --- gnu/packages/crates-graphics.scm | 6 ++++++ gnu/packages/crates-gtk.scm | 6 ++++++ gnu/packages/games.scm | 6 ++++++ gnu/packages/music.scm | 6 ++++++ gnu/packages/qt.scm | 6 ++++++ gnu/packages/web.scm | 6 ++++++ 6 files changed, 36 insertions(+) (limited to 'gnu/packages/qt.scm') diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm index c5d9555599..c7a36e49b5 100644 --- a/gnu/packages/crates-graphics.scm +++ b/gnu/packages/crates-graphics.scm @@ -3554,3 +3554,9 @@ (define-public rust-y4m-0.5 (arguments `(#:cargo-development-inputs (("rust-resize" ,rust-resize-0.3)))))) + +;;; +;;; Avoid adding new packages to the end of this file. To reduce the chances +;;; of a merge conflict, place them above by existing packages with similar +;;; functionality or similar names. +;;; diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm index e392220a01..c0cdc13a59 100644 --- a/gnu/packages/crates-gtk.scm +++ b/gnu/packages/crates-gtk.scm @@ -1834,3 +1834,9 @@ (define-public rust-webkit2gtk-sys-0.12 (synopsis "Rust binding for webkit-gtk library") (description "This crate provides Rust binding for webkit-gtk library.") (license license:expat))) + +;;; +;;; Avoid adding new packages to the end of this file. To reduce the chances +;;; of a merge conflict, place them above by existing packages with similar +;;; functionality or similar names. +;;; diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index a50e083c16..60ce0167a6 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -11204,3 +11204,9 @@ (define-public steam-devices-udev-rules "This package provides a set of udev rules for game controllers and virtual reality devices.") (license license:expat)))) + +;;; +;;; Avoid adding new packages to the end of this file. To reduce the chances +;;; of a merge conflict, place them above by existing packages with similar +;;; functionality or similar names. +;;; diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 627050eeec..66b4beae0c 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -6895,3 +6895,9 @@ (define-public orca-music Renoise, VCV Rack, or SuperCollider.") (home-page "https://100r.co/site/orca.html") (license license:expat)))) + +;;; +;;; Avoid adding new packages to the end of this file. To reduce the chances +;;; of a merge conflict, place them above by existing packages with similar +;;; functionality or similar names. +;;; diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index bcdad65d3c..cb7f72e698 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -4228,3 +4228,9 @@ (define-public kdsoap services using the XML based SOAP protocol and without the need for a dedicated web server.") (license (list license:gpl2 license:gpl3)))) + +;;; +;;; Avoid adding new packages to the end of this file. To reduce the chances +;;; of a merge conflict, place them above by existing packages with similar +;;; functionality or similar names. +;;; diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index dd9540a9cb..5dbec6e8bc 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -8220,3 +8220,9 @@ (define-public archivebox snapshots of the URLs you feed it in several formats.") (home-page "https://archivebox.io/") (license license:expat))) + +;;; +;;; Avoid adding new packages to the end of this file. To reduce the chances +;;; of a merge conflict, place them above by existing packages with similar +;;; functionality or similar names. +;;; -- cgit v1.2.3