From: Vivien Kraus via Guix-patches via <guix-patches@gnu.org>
To: 66008@debbugs.gnu.org
Cc: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com,
rg@raghavgururajan.name
Subject: [bug#66008] [PATCH gnome-team 2/4] gnu: editorconfig-core-c: Move to (gnu packages gnome).
Date: Fri, 15 Sep 2023 19:36:22 +0200 [thread overview]
Message-ID: <450222c04f40a3f1179aac46187547cc604697f0.1694801847.git.vivien@planete-kraus.eu> (raw)
In-Reply-To: <cover.1694801847.git.vivien@planete-kraus.eu>
* gnu/packages/gnome.scm (editorconfig-core-c): New variable.
* gnu/packages/text-editors.scm: Export editorconfig-core-c from (gnu packages
gnome).
---
gnu/packages/gnome.scm | 51 +++++++++++++++++++++++++++++++++
gnu/packages/text-editors.scm | 53 ++---------------------------------
2 files changed, 54 insertions(+), 50 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index ea47d31f90..8535ad784e 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -5468,6 +5468,57 @@ (define-public gnome-terminal
keyboard shortcuts.")
(license license:gpl3+)))
+(define-public editorconfig-core-c
+ (package
+ (name "editorconfig-core-c")
+ (version "0.12.5")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/editorconfig/editorconfig-core-c")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "073sh18y0v8wm10iphaia54pkdmwylalccpn1k5i9dwyfjzgj7yg"))))
+ (build-system cmake-build-system)
+ (arguments
+ '(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'insert-tests
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let ((tests (assoc-ref inputs "tests")))
+ (copy-recursively tests "tests"))
+ #t))
+ (add-after 'install 'delete-static-library
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (lib (string-append out "/lib")))
+ (with-directory-excursion lib
+ (delete-file "libeditorconfig_static.a"))
+ #t))))))
+ (native-inputs
+ `(("tests"
+ ,(origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/editorconfig/editorconfig-core-test")
+ ;; The tests submodule commit matching this package's version.
+ (commit "48610d43b7455af12195473377f93c4ceea654f5")))
+ (file-name (git-file-name "editorconfig-core-test" version))
+ (sha256
+ (base32 "1s29p4brmcsc3xsww3gk85dg45f1kk3iykh1air3ij0hymf5dyqy"))))))
+ (inputs
+ (list pcre2))
+ (home-page "https://editorconfig.org/")
+ (synopsis "EditorConfig core library written in C")
+ (description "EditorConfig makes it easy to maintain the correct coding
+style when switching between different text editors and between different
+projects. The EditorConfig project maintains a file format and plugins for
+various text editors which allow this file format to be read and used by those
+editors.")
+ (license license:bsd-2)))
+
(define-public gnome-text-editor
(package
(name "gnome-text-editor")
diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm
index 44c5754d6d..eae8b6efa5 100644
--- a/gnu/packages/text-editors.scm
+++ b/gnu/packages/text-editors.scm
@@ -823,56 +823,9 @@ (define-public manuskript
in plain text file format.")
(license license:gpl3+)))
-(define-public editorconfig-core-c
- (package
- (name "editorconfig-core-c")
- (version "0.12.5")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/editorconfig/editorconfig-core-c")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32 "073sh18y0v8wm10iphaia54pkdmwylalccpn1k5i9dwyfjzgj7yg"))))
- (build-system cmake-build-system)
- (arguments
- '(#:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'insert-tests
- (lambda* (#:key inputs #:allow-other-keys)
- (let ((tests (assoc-ref inputs "tests")))
- (copy-recursively tests "tests"))
- #t))
- (add-after 'install 'delete-static-library
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (lib (string-append out "/lib")))
- (with-directory-excursion lib
- (delete-file "libeditorconfig_static.a"))
- #t))))))
- (native-inputs
- `(("tests"
- ,(origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/editorconfig/editorconfig-core-test")
- ;; The tests submodule commit matching this package's version.
- (commit "48610d43b7455af12195473377f93c4ceea654f5")))
- (file-name (git-file-name "editorconfig-core-test" version))
- (sha256
- (base32 "1s29p4brmcsc3xsww3gk85dg45f1kk3iykh1air3ij0hymf5dyqy"))))))
- (inputs
- (list pcre2))
- (home-page "https://editorconfig.org/")
- (synopsis "EditorConfig core library written in C")
- (description "EditorConfig makes it easy to maintain the correct coding
-style when switching between different text editors and between different
-projects. The EditorConfig project maintains a file format and plugins for
-various text editors which allow this file format to be read and used by those
-editors.")
- (license license:bsd-2)))
+;; editorconfig-core-c has been moved to (gnu packages gnome) to avoid a
+;; module circular dependency.
+(export editorconfig-core-c)
(define-public texmacs
(package
--
2.41.0
next prev parent reply other threads:[~2023-09-15 18:25 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-15 18:17 [bug#66008] [PATCH gnome-team 0/4] Fix and update gnome-text-editor Vivien Kraus via Guix-patches via
2023-09-15 16:57 ` [bug#66008] [PATCH gnome-team 1/4] gnu: gnome-text-editor: Add missing input Vivien Kraus via Guix-patches via
2023-09-15 20:33 ` Liliana Marie Prikler
2023-09-15 17:36 ` Vivien Kraus via Guix-patches via [this message]
2023-09-15 20:22 ` [bug#66008] [PATCH gnome-team 2/4] gnu: editorconfig-core-c: Move to (gnu packages gnome) Liliana Marie Prikler
2023-09-15 21:25 ` [bug#66008] [PATCH gnome-team v2 0/3] Update gnome-text-editor without moving editorconfig-core-c Vivien Kraus via Guix-patches via
2023-09-15 16:57 ` [bug#66008] [PATCH gnome-team v2 1/3] gnu: gnome-text-editor: Add missing input Vivien Kraus via Guix-patches via
2023-09-15 17:50 ` [bug#66008] [PATCH gnome-team v2 2/3] gnu: editorconfig-core-c: Update to 0.12.6 Vivien Kraus via Guix-patches via
2023-09-15 17:52 ` [bug#66008] [PATCH gnome-team v2 3/3] gnu: gnome-text-editor: Update to 44.0 Vivien Kraus via Guix-patches via
2023-09-24 10:04 ` bug#66008: " Liliana Marie Prikler
2023-09-16 3:59 ` [bug#66008] [PATCH gnome-team v2 0/3] Update gnome-text-editor without moving editorconfig-core-c Liliana Marie Prikler
2023-09-15 17:50 ` [bug#66008] [PATCH gnome-team 3/4] gnu: editorconfig-core-c: Update to 0.12.6 Vivien Kraus via Guix-patches via
2023-09-15 20:20 ` Liliana Marie Prikler
2023-09-15 17:52 ` [bug#66008] [PATCH gnome-team 4/4] gnu: gnome-text-editor: Update to 44.0 Vivien Kraus via Guix-patches via
2023-09-15 20:18 ` Liliana Marie Prikler
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=450222c04f40a3f1179aac46187547cc604697f0.1694801847.git.vivien@planete-kraus.eu \
--to=guix-patches@gnu.org \
--cc=66008@debbugs.gnu.org \
--cc=liliana.prikler@gmail.com \
--cc=maxim.cournoyer@gmail.com \
--cc=rg@raghavgururajan.name \
--cc=vivien@planete-kraus.eu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).