[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/02: Merge remote-tracking branch 'origin/master' into core-updates
|
From: |
guix-commits |
|
Subject: |
01/02: Merge remote-tracking branch 'origin/master' into core-updates |
|
Date: |
Tue, 25 Apr 2023 09:22:29 -0400 (EDT) |
andreas pushed a commit to branch core-updates
in repository guix.
commit c919bfefd98bf2e29549539b4e28e6dc2a8a6f32
Merge: ce0bdceb49 472706ae2f
Author: Andreas Enge <andreas@enge.fr>
AuthorDate: Tue Apr 25 15:19:29 2023 +0200
Merge remote-tracking branch 'origin/master' into core-updates
gnu/local.mk | 1 +
gnu/packages/algebra.scm | 4 +-
gnu/packages/curl.scm | 37 ++++++
gnu/packages/dezyne.scm | 2 +
gnu/packages/education.scm | 4 +-
gnu/packages/emacs-xyz.scm | 125 ++++++++++++---------
gnu/packages/games.scm | 86 +++++++++++++-
gnu/packages/lisp-xyz.scm | 13 +--
gnu/packages/music.scm | 33 +++---
gnu/packages/package-management.scm | 6 +-
.../patches/dezyne-add-missing-shebangs.patch | 61 ++++++++++
gnu/packages/purescript.scm | 4 +-
gnu/packages/python-check.scm | 33 ++----
gnu/packages/python-xyz.scm | 31 ++++-
gnu/packages/search.scm | 5 +-
gnu/packages/ssh.scm | 4 +-
gnu/packages/terminals.scm | 5 +
gnu/packages/tex.scm | 31 +++++
gnu/packages/web-browsers.scm | 4 +-
19 files changed, 375 insertions(+), 114 deletions(-)
diff --cc gnu/packages/python-xyz.scm
index 232a56ad43,38c182ca96..97837bcfec
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@@ -135,7 -135,7 +135,8 @@@
;;; Copyright © 2023 Gabriel Wicki <gabriel@erlikon.ch>
;;; Copyright © 2023 Amade Nemes <nemesamade@gmail.com>
;;; Copyright © 2023 Bruno Victal <mirai@makinata.eu>
+;;; Copyright © 2023 Kaelyn Takata <kaelyn.alexi@protonmail.com>
+ ;;; Copyright © 2023 Dominik Delgado Steuter <d@delgado.nrw>
;;;
;;; This file is part of GNU Guix.
;;;