From 5ed679a2a91d84b2f651290a0a98fd5c0352f943 Mon Sep 17 00:00:00 2001 From: Morgan Smith Date: Wed, 31 Aug 2022 12:44:22 -0400 Subject: gnu: Add steam-devices-udev-rules. * gnu/packages/games.scm (steam-devices-udev-rules): New variable. Signed-off-by: Mathieu Othacehe --- gnu/packages/games.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) (limited to 'gnu/packages/games.scm') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 2c7f892f19..09ce55f168 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -11169,3 +11169,39 @@ principle of prioritizing the guests' happiness with a well-maintained park. Should they go unwise, a theme park plunge into chaos with vandalizing guests and unsafe rides. Which path will you take?") (license license:gpl2))) + +(define-public steam-devices-udev-rules + ;; Last release from 2019-04-10 + (let ((commit "d87ef558408c5e7a1a793d738db4c9dc2cb5f8fa") + (revision "0")) + (package + (name "steam-devices-udev-rules") + (version (git-version "1.0.0.61" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ValveSoftware/steam-devices") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1yqigraz9f19018ma5n2pbx7naadh9960lia3z8ayg7vz1fjdl54")))) + (build-system copy-build-system) + (arguments + '(#:install-plan '(("./" "lib/udev/rules.d" + #:include-regexp ("rules$"))) + #:phases (modify-phases %standard-phases + (add-after 'unpack 'patch-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "60-steam-input.rules" + (("/bin/sh") + (search-input-file inputs "/bin/sh")) + (("udevadm") + (search-input-file inputs "/bin/udevadm")))))))) + (inputs (list eudev)) + (home-page "https://github.com/ValveSoftware/steam-devices") + (synopsis "udev rules for game controllers and virtual reality devices") + (description + "This package provides a set of udev rules for game controllers and +virtual reality devices.") + (license license:expat)))) -- cgit v1.2.3 From 04ed75cc9de4a8302ad1d168fb1b114a81a27a86 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 9 Sep 2022 08:49:41 -0400 Subject: gnu: libgnome-games-support: Update to 2.0.0. * gnu/packages/gnome.scm (libgnome-games-support): Update to 2.0.0. [propagated-inputs]: Remove gtk+; add gtk. (libgnome-games-support-1): New variable. (gnome-klotski)[inputs]: Replace libgnome-games-support with libgnome-games-support-1. * gnu/packages/games.scm (gnome-2048)[inputs]: Likewise. --- gnu/packages/games.scm | 2 +- gnu/packages/gnome.scm | 57 +++++++++++++++++++++++++++++++++----------------- 2 files changed, 39 insertions(+), 20 deletions(-) (limited to 'gnu/packages/games.scm') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 09ce55f168..3b05e0f88a 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -1789,7 +1789,7 @@ destroying an ancient book using a special wand.") (("gtk-update-icon-cache") "true")) #t))))) (inputs - (list gtk+ clutter clutter-gtk libgee libgnome-games-support)) + (list gtk+ clutter clutter-gtk libgee libgnome-games-support-1)) (native-inputs `(("gettext" ,gettext-minimal) ("glib:bin" ,glib "bin") ; for desktop-file-validate and appstream-util diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 469f7f04cb..66d84e27e2 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6290,30 +6290,30 @@ queries upon that data.") (define-public libgnome-games-support (package (name "libgnome-games-support") - (version "1.7.1") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/libgnome-games-support/" - (version-major+minor version) "/" - "libgnome-games-support-" version ".tar.xz")) - (sha256 - (base32 - "11g1r3ppb9v8m3anks9gxf7fv1x38vmjiya3lr7zjjv328pb69d6")))) + (version "2.0.0") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://gnome/sources/libgnome-games-support/" + (version-major+minor version) "/" + "libgnome-games-support-" version ".tar.xz")) + (sha256 + (base32 + "196jaga70r16bzypv4z07mnwr0xcm93gc91kxygcpp9fwdpiz0jk")))) (build-system meson-build-system) (arguments - '(#:glib-or-gtk? #t - #:phases - (modify-phases %standard-phases - (add-before 'check 'pre-check - (lambda _ - ;; Tests require a writable HOME. - (setenv "HOME" (getcwd)) - #t))))) + '(#:glib-or-gtk? #t + #:phases + (modify-phases %standard-phases + (add-before 'check 'pre-check + (lambda _ + ;; Tests require a writable HOME. + (setenv "HOME" (getcwd))))))) (native-inputs (list intltool pkg-config vala)) (propagated-inputs ;; Required by libgnome-games-support-1.0.pc - (list gtk+ libgee)) + (list gtk libgee)) (home-page "https://www.gnome.org/") (synopsis "Useful functionality shared among GNOME games") (description @@ -6321,6 +6321,23 @@ queries upon that data.") GNOME Games, but it may be used by others.") (license license:lgpl3+))) +(define-public libgnome-games-support-1 + (package + (inherit libgnome-games-support) + (version "1.8.2") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://gnome/sources/libgnome-games-support/" + (version-major+minor version) "/" + "libgnome-games-support-" version ".tar.xz")) + (sha256 + (base32 + "0zggsg7h9nlcwwjcqc13pdjza17iiww325r3q0d76f5hlw24chr8")))) + (propagated-inputs (modify-inputs (package-propagated-inputs + libgnome-games-support) + (replace "gtk" gtk+))))) + (define-public gnome-klotski (package (name "gnome-klotski") @@ -6353,7 +6370,9 @@ GNOME Games, but it may be used by others.") ("vala" ,vala) ("xmllint" ,libxml2))) (inputs - (list gtk+ libgnome-games-support librsvg)) + (list gtk+ + libgnome-games-support-1 + librsvg)) (home-page "https://wiki.gnome.org/Apps/Klotski") (synopsis "Sliding block puzzles") (description -- cgit v1.2.3 From 7d59dbfb8bb1a905ae77e5321ca13a6fb91d160e Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 12 Sep 2022 14:34:35 -0400 Subject: gnu: gnome-2048: Remove input labels. * gnu/packages/games.scm (gnome-2048)[inputs, native-inputs]: Remove labels. --- gnu/packages/games.scm | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) (limited to 'gnu/packages/games.scm') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 3b05e0f88a..55cf3d813f 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -1786,17 +1786,20 @@ destroying an ancient book using a special wand.") ;; Don't create 'icon-theme.cache'. (lambda _ (substitute* "meson_post_install.py" - (("gtk-update-icon-cache") "true")) - #t))))) + (("gtk-update-icon-cache") "true"))))))) (inputs - (list gtk+ clutter clutter-gtk libgee libgnome-games-support-1)) + (list gtk+ + clutter + clutter-gtk + libgee + libgnome-games-support-1)) (native-inputs - `(("gettext" ,gettext-minimal) - ("glib:bin" ,glib "bin") ; for desktop-file-validate and appstream-util - ("itstool" ,itstool) - ("libxml2" ,libxml2) - ("pkg-config" ,pkg-config) - ("vala" ,vala))) + (list gettext-minimal + `(,glib "bin") ; for desktop-file-validate and appstream-util + itstool + libxml2 + pkg-config + vala)) (home-page "https://wiki.gnome.org/Apps/2048") (synopsis "Move the tiles until you obtain the 2048 tile") (description "GNOME 2048 provides a 2D grid for playing 2048, a -- cgit v1.2.3 From 4017a47766e84be1072f4bedddda131db69366d5 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 13 Sep 2022 14:39:11 +0200 Subject: gnu: crawl: Update to 0.29.1. * gnu/packages/games.scm (crawl): Update to 0.29.1. --- gnu/packages/games.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/games.scm') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 55cf3d813f..6e176fee9e 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -6613,7 +6613,7 @@ fish. The whole game is accompanied by quiet, comforting music.") (define-public crawl (package (name "crawl") - (version "0.29.0") + (version "0.29.1") (source (origin (method git-fetch) @@ -6622,7 +6622,7 @@ fish. The whole game is accompanied by quiet, comforting music.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0cx67ln5qr4bawidi48ss63wflx7x22901da683c9wvy6m41vks8")) + (base32 "17bl8hdv2z3mpdfmd5gnwg3r1p9dqjbisiql24pxs1d33qcw0h7x")) (patches (search-patches "crawl-upgrade-saves.patch")))) (build-system gnu-build-system) (inputs -- cgit v1.2.3 From d8d5e2a88fe3c7de1fe4d02c6cafd585a808dde5 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 13 Sep 2022 22:38:35 +0200 Subject: gnu: hedgewars: Update to 1.0.2. * gnu/packages/games.scm (hedgewars): Update to 1.0.2. * gnu/packages/patches/hedgewars-network-bsd.patch: Delete file. * gnu/local.mk: Apply removal. --- gnu/local.mk | 1 - gnu/packages/games.scm | 5 +- gnu/packages/patches/hedgewars-network-bsd.patch | 150 ----------------------- 3 files changed, 2 insertions(+), 154 deletions(-) delete mode 100644 gnu/packages/patches/hedgewars-network-bsd.patch (limited to 'gnu/packages/games.scm') diff --git a/gnu/local.mk b/gnu/local.mk index c9a7cb7489..2f65e7ed01 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1286,7 +1286,6 @@ dist_patch_DATA = \ %D%/packages/patches/hdf-eos5-remove-gctp.patch \ %D%/packages/patches/hdf-eos5-fix-szip.patch \ %D%/packages/patches/hdf-eos5-fortrantests.patch \ - %D%/packages/patches/hedgewars-network-bsd.patch \ %D%/packages/patches/helm-fix-gcc-9-build.patch \ %D%/packages/patches/http-parser-CVE-2020-8287.patch \ %D%/packages/patches/htslib-for-stringtie.patch \ diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 6e176fee9e..23d51b1aa9 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -9311,15 +9311,14 @@ play with up to four players simultaneously. It has network support.") (define-public hedgewars (package (name "hedgewars") - (version "1.0.0") + (version "1.0.2") (source (origin (method url-fetch) (uri (string-append "https://www.hedgewars.org/download/releases/" "hedgewars-src-" version ".tar.bz2")) - (patches (search-patches "hedgewars-network-bsd.patch")) (sha256 (base32 - "0nqm9w02m0xkndlsj6ys3wr0ik8zc14zgilq7k6fwjrf3zk385i1")))) + "04pjpkjhpy720n803gv35iygmjdvsrmw13mih4ympjnqbgjfa7r0")))) (build-system cmake-build-system) (arguments ;; XXX: Engine is built as Pascal source code, requiring Free Pascal diff --git a/gnu/packages/patches/hedgewars-network-bsd.patch b/gnu/packages/patches/hedgewars-network-bsd.patch deleted file mode 100644 index 311ce8bf09..0000000000 --- a/gnu/packages/patches/hedgewars-network-bsd.patch +++ /dev/null @@ -1,150 +0,0 @@ -From f813f3d5b63bb5be1b5e0b44930e77656c547aad Mon Sep 17 00:00:00 2001 -From: Jens Petersen -Date: Wed, 8 Jul 2020 17:02:45 +0300 -Subject: [PATCH] update server network - ---- - gameServer/Actions.hs | 2 +- - gameServer/CMakeLists.txt | 3 ++- - gameServer/ClientIO.hs | 4 ++-- - gameServer/CoreTypes.hs | 2 +- - gameServer/OfficialServer/checker.hs | 5 ++--- - gameServer/Utils.hs | 6 +----- - gameServer/hedgewars-server.cabal | 3 ++- - gameServer/hedgewars-server.hs | 5 +++-- - 8 files changed, 14 insertions(+), 16 deletions(-) - -diff --git a/gameServer/Actions.hs b/gameServer/Actions.hs -index 125d6ea832..c42d17b9a9 100644 ---- a/gameServer/Actions.hs -+++ b/gameServer/Actions.hs -@@ -709,7 +709,7 @@ processAction RestartServer = do - args <- gets (runArgs . serverInfo) - io $ do - noticeM "Core" "Closing listening socket" -- sClose sock -+ close sock - noticeM "Core" "Spawning new server" - _ <- createProcess (proc "./hedgewars-server" args) - return () -diff --git a/gameServer/CMakeLists.txt b/gameServer/CMakeLists.txt -index 5f2c882563..e71650c70c 100644 ---- a/gameServer/CMakeLists.txt -+++ b/gameServer/CMakeLists.txt -@@ -9,7 +9,8 @@ check_haskell_package_exists(base "Control.Exception" mask 1) - check_haskell_package_exists(containers "Data.Map" size 1) - check_haskell_package_exists(vector "Data.Vector" length 1) - check_haskell_package_exists(bytestring "Data.ByteString" pack 1) --check_haskell_package_exists(network "Network.BSD" getHostName 0) -+check_haskell_package_exists(network "Network.Socket" defaultHints 0) -+check_haskell_package_exists(network-bsd "Network.BSD" getHostName 0) - check_haskell_package_exists(time "Data.Time" getCurrentTime 0) - check_haskell_package_exists(mtl "Control.Monad.State" fix 1) - check_haskell_package_exists(sandi "Codec.Binary.Base64" encode 1) -diff --git a/gameServer/ClientIO.hs b/gameServer/ClientIO.hs -index 46dd40ed9f..0c97bde932 100644 ---- a/gameServer/ClientIO.hs -+++ b/gameServer/ClientIO.hs -@@ -23,7 +23,7 @@ import qualified Control.Exception as Exception - import Control.Monad.State - import Control.Concurrent.Chan - import Control.Concurrent --import Network -+import Network.Socket hiding (recv) - import Network.Socket.ByteString - import qualified Data.ByteString.Char8 as B - ---------------- -@@ -90,7 +90,7 @@ clientSendLoop s tId chan ci = do - sendAll s $ B.unlines answer `B.snoc` '\n' - - if isQuit answer then -- sClose s -+ close s - else - clientSendLoop s tId chan ci - -diff --git a/gameServer/CoreTypes.hs b/gameServer/CoreTypes.hs -index f547df483a..72f35807e3 100644 ---- a/gameServer/CoreTypes.hs -+++ b/gameServer/CoreTypes.hs -@@ -23,7 +23,7 @@ import Control.Concurrent - import Data.Word - import qualified Data.Map as Map - import Data.Time --import Network -+import Network.Socket - import Data.Function - import Data.ByteString.Char8 as B - import Data.Unique -diff --git a/gameServer/OfficialServer/checker.hs b/gameServer/OfficialServer/checker.hs -index 37df3208b9..b4ecb8fc57 100644 ---- a/gameServer/OfficialServer/checker.hs -+++ b/gameServer/OfficialServer/checker.hs -@@ -28,8 +28,7 @@ import System.Directory - import Control.Monad.State - import Control.Concurrent.Chan - import Control.Concurrent --import Network --import Network.BSD -+import Network.BSD hiding (recv) - import Network.Socket hiding (recv, sClose) - import Network.Socket.ByteString - import qualified Data.ByteString.Char8 as B -@@ -207,7 +206,7 @@ main = withSocketsDo . forever $ do - - Exception.bracket - setupConnection -- (\s -> noticeM "Core" "Shutting down" >> sClose s) -+ (\s -> noticeM "Core" "Shutting down" >> close s) - (session login password (d ++ "/.hedgewars") exeFullname dataPrefix) - where - setupConnection = do -diff --git a/gameServer/Utils.hs b/gameServer/Utils.hs -index 3d81b7f7c6..9fd80c01ba 100644 ---- a/gameServer/Utils.hs -+++ b/gameServer/Utils.hs -@@ -41,11 +41,7 @@ import CoreTypes - - - sockAddr2String :: SockAddr -> IO B.ByteString --sockAddr2String (SockAddrInet _ hostAddr) = liftM B.pack $ inet_ntoa hostAddr --sockAddr2String (SockAddrInet6 _ _ (a, b, c, d) _) = -- return $ B.pack $ (foldr1 (.) -- $ List.intersperse (':':) -- $ concatMap (\n -> (\(a0, a1) -> [showHex a0, showHex a1]) $ divMod n 65536) [a, b, c, d]) [] -+sockAddr2String = liftM (B.pack . fromJust . fst) . getNameInfo [] True False - - maybeRead :: Read a => String -> Maybe a - maybeRead s = case reads s of -diff --git a/gameServer/hedgewars-server.cabal b/gameServer/hedgewars-server.cabal -index 3c7f2418c9..9f764fd997 100644 ---- a/gameServer/hedgewars-server.cabal -+++ b/gameServer/hedgewars-server.cabal -@@ -57,7 +57,8 @@ Executable checker - containers, - vector, - bytestring, -- network >= 2.3 && < 3.0, -+ network >= 2.3, -+ network-bsd, - mtl >= 2, - sandi, - hslogger, -diff --git a/gameServer/hedgewars-server.hs b/gameServer/hedgewars-server.hs -index e47ae2891d..7e6ab8fa38 100644 ---- a/gameServer/hedgewars-server.hs -+++ b/gameServer/hedgewars-server.hs -@@ -50,10 +50,11 @@ server si = do - proto <- getProtocolNumber "tcp" - E.bracket - (socket AF_INET Stream proto) -- sClose -+ close - (\sock -> do - setSocketOption sock ReuseAddr 1 -- bindSocket sock (SockAddrInet (listenPort si) iNADDR_ANY) -+ iNADDR_ANY <- addrAddress . head <$> getAddrInfo Nothing (Just "0") (Just (show (listenPort si))) -+ bind sock iNADDR_ANY - listen sock maxListenQueue - startServer si{serverSocket = Just sock} - ) -- cgit v1.2.3 From 669187accc6a0200bd428e716ea3e829d6fc2fe7 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 13 Sep 2022 23:00:28 +0200 Subject: gnu: hedgewars: Improve package style. * gnu/packages/games.scm (hedgewars)[arguments]: Use G-expressions. Remove trailing #T. Remove FIX-SORCES phase. Run tests according to #:tests? keyword. [inputs]: Remove labels. --- gnu/packages/games.scm | 81 ++++++++++++++++++++++++-------------------------- 1 file changed, 39 insertions(+), 42 deletions(-) (limited to 'gnu/packages/games.scm') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 23d51b1aa9..a50e083c16 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -9321,49 +9321,46 @@ play with up to four players simultaneously. It has network support.") "04pjpkjhpy720n803gv35iygmjdvsrmw13mih4ympjnqbgjfa7r0")))) (build-system cmake-build-system) (arguments - ;; XXX: Engine is built as Pascal source code, requiring Free Pascal - ;; Compiler, which we haven't packaged yet. With the flag below, we use - ;; a Pascal to C translator and Clang instead. - `(#:configure-flags (list "-DBUILD_ENGINE_C=ON" - "-Dhaskell_flags=-dynamic;-fPIC") - #:phases - (modify-phases %standard-phases - (add-before 'configure 'fix-sources - (lambda _ - ;; Fix a missing 'include'. - (substitute* "QTfrontend/ui/page/pagegamestats.cpp" - (("#include ") - "#include \n#include ")))) - (replace 'check - (lambda _ (invoke "ctest"))) - (add-after 'install 'install-icon - (lambda _ - ;; Install icon for the desktop file. - (let* ((out (assoc-ref %outputs "out")) - (icons (string-append out "/share/icons/hicolor/512x512/apps"))) - (with-directory-excursion (string-append "../hedgewars-src-" ,version) - (install-file "misc/hedgewars.png" icons))) - #t))))) + (list + ;; XXX: Engine is built as Pascal source code, requiring Free Pascal + ;; Compiler, which we haven't packaged yet. With the flag below, we use + ;; a Pascal to C translator and Clang instead. + #:configure-flags #~(list "-DBUILD_ENGINE_C=ON" + "-Dhaskell_flags=-dynamic;-fPIC") + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "ctest")))) + (add-after 'install 'install-icon + (lambda _ + ;; Install icon for the desktop file. + (let ((icons (string-append #$output + "/share/icons/hicolor/512x512/apps"))) + (with-directory-excursion + (string-append "../hedgewars-src-" #$version) + (install-file "misc/hedgewars.png" icons)))))))) (inputs - `(("ffmpeg" ,ffmpeg) - ("freeglut" ,freeglut) - ("ghc-entropy" ,ghc-entropy) - ("ghc-hslogger" ,ghc-hslogger) - ("ghc-network" ,ghc-network) - ("ghc-random" ,ghc-random) - ("ghc-regex-tdfa" ,ghc-regex-tdfa) - ("ghc-sandi" ,ghc-sandi) - ("ghc-sha" ,ghc-sha) - ("ghc-utf8-string" ,ghc-utf8-string) - ("ghc-vector" ,ghc-vector) - ("ghc-zlib" ,ghc-zlib) - ("glew" ,glew) - ("libpng" ,libpng) - ("lua" ,lua-5.1) - ("physfs" ,physfs) - ("qtbase" ,qtbase-5) - ("sdl" ,(sdl-union - (list sdl2 sdl2-mixer sdl2-net sdl2-ttf sdl2-image))))) + (list ffmpeg + freeglut + ghc-entropy + ghc-hslogger + ghc-network + ghc-random + ghc-regex-tdfa + ghc-sandi + ghc-sha + ghc-utf8-string + ghc-vector + ghc-zlib + glew + libpng + lua-5.1 + physfs + qtbase-5 + (sdl-union + (list sdl2 sdl2-mixer sdl2-net sdl2-ttf sdl2-image)))) (native-inputs (list clang-9 ghc pkg-config qttools-5)) (home-page "https://hedgewars.org/") -- 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/games.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 @@ the platform-specific getters provided by winit, or another library.") (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 @@ library.") (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 @@ and unsafe rides. Which path will you take?") "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 @@ sending MIDI, OSC, and UDP to your audio/visual interfaces like Ableton, 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 @@ and import their menus over DBus.") 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 @@ You can feed it URLs one at a time, or schedule regular imports. It saves 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