Package: guix-patches;
Reported by: Philippe SWARTVAGHER <phil.swart <at> gmx.fr>
Date: Mon, 19 May 2025 19:17:02 UTC
Severity: normal
Tags: patch
Done: Ludovic Courtès <ludo <at> gnu.org>
To reply to this bug, email your comments to 78496 AT debbugs.gnu.org.
There is no need to reopen the bug first.
Toggle the display of automated, internal messages from the tracker.
View this report as an mbox folder, status mbox, maintainer mbox
sharlatanus <at> gmail.com, guix-patches <at> gnu.org:bug#78496; Package guix-patches.
(Mon, 19 May 2025 19:17:02 GMT) Full text and rfc822 format available.Philippe SWARTVAGHER <phil.swart <at> gmx.fr>:sharlatanus <at> gmail.com, guix-patches <at> gnu.org.
(Mon, 19 May 2025 19:17:02 GMT) Full text and rfc822 format available.Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):
From: Philippe SWARTVAGHER <phil.swart <at> gmx.fr> To: guix-patches <at> gnu.org Cc: Philippe SWARTVAGHER <phil.swart <at> gmx.fr> Subject: [PATCH] gnu: Add sqlitestudio. Date: Mon, 19 May 2025 21:15:53 +0200
* gnu/packages/databases.scm (sqlitestudio): New variable.
Change-Id: I012a189d37661bf70b140048696ae97647bf0a6f
---
gnu/packages/databases.scm | 112 +++++++++++++++++++++++++++++++++++++
1 file changed, 112 insertions(+)
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index c3a10efece..16cca632c9 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -64,6 +64,7 @@
;;; Copyright © 2023 Giacomo Leidi <goodoldpaul <at> autistici.org>
;;; Copyright © 2024 Troy Figiel <troy <at> troyfigiel.com>
;;; Copyright © 2024 gemmaro <gemmaro.dev <at> gmail.com>
+;;; Copyright © 2025 Philippe Swartvagher <phil.swart <at> gmx.fr>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -5728,6 +5729,117 @@ (define-public sqlitebrowser
(list license:gpl3+
license:mpl2.0))))
+(define-public sqlitestudio
+ (package
+ (name "sqlitestudio")
+ (version "3.4.17")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/pawelsalawa/sqlitestudio")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1zb1qr88rwkzmrxc0lm99x8h99hpn5c2wfdpvqzs9f9ph8qvasww"))))
+ (build-system gnu-build-system)
+ (arguments
+ `(#:phases (modify-phases %standard-phases
+ (replace 'configure
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (python-version ,(version-major+minor (package-version
+ python)))
+ (python-include (string-append (assoc-ref inputs
+ "python")
+ "/include/python"
+ python-version)))
+ (invoke "qmake"
+ (string-append
+ "QMAKE_LFLAGS_RPATH=-Wl,-rpath," out "/lib:")
+ (string-append "PREFIX=" out)
+ "./SQLiteStudio3")
+ (mkdir-p "Plugins")
+ (chdir "Plugins")
+ (invoke "qmake"
+ (string-append
+ "QMAKE_LFLAGS_RPATH=-Wl,-rpath," out "/lib:")
+ (string-append "PREFIX=" out)
+ (string-append "INCLUDEPATH+=" python-include)
+ (string-append "PYTHON_VERSION="
+ python-version)
+ ".")
+ (chdir ".."))))
+ (replace 'build
+ (lambda _
+ (invoke "make" "-j"
+ (number->string (parallel-job-count)))
+ (chdir "Plugins")
+ (invoke "make") ;building plugins in parallel corrupts them
+ (chdir "..")))
+ (replace 'install
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (icons-dir (string-append out
+ "/share/icons/hicolor/"))
+ (src-img-dir (string-append
+ "SQLiteStudio3/guiSQLiteStudio/img/")))
+ (invoke "make" "-j"
+ (number->string (parallel-job-count))
+ "install")
+ (for-each (lambda (size)
+ (let ((target-dir (string-append icons-dir
+ size "x" size "/apps/")))
+ (mkdir-p target-dir)
+ (copy-file (string-append src-img-dir
+ "sqlitestudio_" size ".png")
+ (string-append target-dir
+ "sqlitestudio.png"))))
+ '("16" "48" "256"))
+ (let ((target-dir (string-append icons-dir
+ "scalable/apps/")))
+ (mkdir-p target-dir)
+ (install-file (string-append src-img-dir
+ "sqlitestudio.svg")
+ target-dir))
+ (chdir "Plugins")
+ (invoke "make" "-j"
+ (number->string (parallel-job-count))
+ "install")
+ (chdir ".."))))
+ (add-after 'install 'install-desktop
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out")))
+ (make-desktop-entry-file (string-append out
+ "/share/applications/"
+ ,name ".desktop")
+ #:name "SQLiteStudio"
+ #:comment ,(package-synopsis
+ this-package)
+ #:exec (string-append ,name
+ " %f")
+ #:icon ,name
+ #:categories '("Development"
+ "Utility"
+ "Database")
+ #:mime-type
+ "application/vnd.sqlite3")))))))
+ (inputs (list openssl
+ python
+ qtbase-5
+ qtsvg-5
+ readline
+ sqlite-next))
+ (native-inputs (list python qttools-5 qtdeclarative-5 tcl))
+ (home-page "https://sqlitestudio.pl/")
+ (synopsis
+ "A free, open source, multi-platform SQLite database manager")
+ (description
+ "SQLiteStudio is desktop application for browsing and editing SQLite
+ database files. It is aimed for people, who know what SQLite is, or what
+ relational databases are in general.")
+ (license license:gpl3+)))
+
(define-public sqls
(package
(name "sqls")
base-commit: 450a361532573a02389530a6a80b7821683ed41b
--
2.49.0
guix-patches <at> gnu.org:bug#78496; Package guix-patches.
(Wed, 28 May 2025 21:53:01 GMT) Full text and rfc822 format available.Message #8 received at 78496 <at> debbugs.gnu.org (full text, mbox):
From: Ludovic Courtès <ludo <at> gnu.org> To: Philippe SWARTVAGHER <phil.swart <at> gmx.fr> Cc: 78496 <at> debbugs.gnu.org, Sharlatan Hellseher <sharlatanus <at> gmail.com> Subject: Re: [bug#78496] [PATCH] gnu: Add sqlitestudio. Date: Wed, 28 May 2025 23:34:47 +0200
Hello, Philippe SWARTVAGHER <phil.swart <at> gmx.fr> writes: > * gnu/packages/databases.scm (sqlitestudio): New variable. > > Change-Id: I012a189d37661bf70b140048696ae97647bf0a6f [...] > + (arguments > + `(#:phases (modify-phases %standard-phases I recommend running ‘guix style -S arguments sqlitestudio’. > + (chdir "Plugins") [...] > + (chdir "..")))) Rather (with-directory-excursion "Plugin" …). > + (chdir "Plugins") > + (invoke "make") ;building plugins in parallel corrupts them > + (chdir ".."))) Likewise: (with-directory-excursion "Plugin" (invoke "make")). > + (synopsis > + "A free, open source, multi-platform SQLite database manager") Maybe: “Graphical user interface to browse and edit SQLite databases”? “Free” and “open source” is implicit and “multi-platform” is mostly irrelevant in the context of a distro. > + database files. It is aimed for people, who know what SQLite is, or what > + relational databases are in general.") ^ Please remove the extra leading spaces. Also: two spaces after end-of-sentence period, as reported by ‘guix lint’. The rest LGTM. Could you send an updated patch? Thanks! Ludo’.
sharlatanus <at> gmail.com, guix-patches <at> gnu.org:bug#78496; Package guix-patches.
(Thu, 29 May 2025 12:11:01 GMT) Full text and rfc822 format available.Message #11 received at 78496 <at> debbugs.gnu.org (full text, mbox):
From: Philippe SWARTVAGHER <phil.swart <at> gmx.fr> To: 78496 <at> debbugs.gnu.org Cc: Philippe SWARTVAGHER <phil.swart <at> gmx.fr> Subject: [PATCH v2] gnu: Add sqlitestudio. Date: Thu, 29 May 2025 14:08:41 +0200
* gnu/packages/databases.scm (sqlitestudio): New variable.
Change-Id: I012a189d37661bf70b140048696ae97647bf0a6f
---
gnu/packages/databases.scm | 100 +++++++++++++++++++++++++++++++++++++
1 file changed, 100 insertions(+)
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index 73c8bebe98..6e296e3324 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -65,6 +65,7 @@
;;; Copyright © 2024 Troy Figiel <troy <at> troyfigiel.com>
;;; Copyright © 2024 gemmaro <gemmaro.dev <at> gmail.com>
;;; Copyright © 2025 Ashvith Shetty <ashvithshetty0010 <at> zohomail.in>
+;;; Copyright © 2025 Philippe Swartvagher <phil.swart <at> gmx.fr>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -5820,6 +5821,105 @@ (define-public sqlitebrowser
(list license:gpl3+
license:mpl2.0))))
+(define-public sqlitestudio
+ (package
+ (name "sqlitestudio")
+ (version "3.4.17")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/pawelsalawa/sqlitestudio")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1zb1qr88rwkzmrxc0lm99x8h99hpn5c2wfdpvqzs9f9ph8qvasww"))))
+ (build-system gnu-build-system)
+ (arguments
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (replace 'configure
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (python-version #$(version-major+minor (package-version
+ python)))
+ (python-include (string-append (assoc-ref inputs "python")
+ "/include/python"
+ python-version)))
+ (invoke "qmake"
+ (string-append "QMAKE_LFLAGS_RPATH=-Wl,-rpath," out
+ "/lib:")
+ (string-append "PREFIX=" out) "./SQLiteStudio3")
+ (mkdir-p "Plugins")
+ (with-directory-excursion "Plugins"
+ (invoke "qmake"
+ (string-append "QMAKE_LFLAGS_RPATH=-Wl,-rpath," out
+ "/lib:")
+ (string-append "PREFIX=" out)
+ (string-append "INCLUDEPATH+=" python-include)
+ (string-append "PYTHON_VERSION=" python-version)
+ ".")))))
+ (replace 'build
+ (lambda _
+ (invoke "make" "-j"
+ (number->string (parallel-job-count)))
+ (with-directory-excursion "Plugins"
+ (invoke "make")))) ;building plugins in parallel corrupts them
+ (replace 'install
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (icons-dir (string-append out "/share/icons/hicolor/"))
+ (src-img-dir (string-append
+ "SQLiteStudio3/guiSQLiteStudio/img/")))
+ (invoke "make" "-j"
+ (number->string (parallel-job-count)) "install")
+ (for-each (lambda (size)
+ (let ((target-dir (string-append icons-dir size
+ "x" size "/apps/")))
+ (mkdir-p target-dir)
+ (copy-file (string-append src-img-dir
+ "sqlitestudio_" size
+ ".png")
+ (string-append target-dir
+ "sqlitestudio.png"))))
+ '("16" "48" "256"))
+ (let ((target-dir (string-append icons-dir "scalable/apps/")))
+ (mkdir-p target-dir)
+ (install-file (string-append src-img-dir "sqlitestudio.svg")
+ target-dir))
+ (with-directory-excursion "Plugins"
+ (invoke "make" "-j"
+ (number->string (parallel-job-count)) "install")))))
+ (add-after 'install 'install-desktop
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out")))
+ (make-desktop-entry-file (string-append out
+ "/share/applications/"
+ #$name ".desktop")
+ #:name "SQLiteStudio"
+ #:comment #$(package-synopsis
+ this-package)
+ #:exec (string-append #$name " %f")
+ #:icon #$name
+ #:categories '("Development"
+ "Utility" "Database")
+ #:mime-type "application/vnd.sqlite3")))))))
+ (inputs (list openssl
+ python
+ qtbase-5
+ qtsvg-5
+ readline
+ sqlite-next))
+ (native-inputs (list python qttools-5 qtdeclarative-5 tcl))
+ (home-page "https://sqlitestudio.pl/")
+ (synopsis "Graphical user interface to browse and edit SQLite databases")
+ (description
+ "SQLiteStudio is desktop application for browsing and editing SQLite
+database files. It is aimed for people, who know what SQLite is, or what
+relational databases are in general.")
+ (license license:gpl3+)))
+
(define-public sqls
(package
(name "sqls")
base-commit: 799d930bf740a66792240eb27d98823f041b1335
--
2.49.0
guix-patches <at> gnu.org:bug#78496; Package guix-patches.
(Thu, 29 May 2025 12:20:01 GMT) Full text and rfc822 format available.Message #14 received at 78496 <at> debbugs.gnu.org (full text, mbox):
From: Philippe SWARTVAGHER <phil.swart <at> gmx.fr> To: Ludovic Courtès <ludo <at> gnu.org> Cc: 78496 <at> debbugs.gnu.org Subject: Re: [bug#78496] [PATCH] gnu: Add sqlitestudio. Date: Thu, 29 May 2025 14:19:05 +0200
Hi, Le 28/05/2025 à 23:34, Ludovic Courtès a écrit : > I recommend running ‘guix style -S arguments sqlitestudio’. Arf, I only ran `guix style sqlitestudio`. Done. > Rather (with-directory-excursion "Plugin" …). > Likewise: (with-directory-excursion "Plugin" (invoke "make")). Done. >> + (synopsis >> + "A free, open source, multi-platform SQLite database manager") > Maybe: “Graphical user interface to browse and edit SQLite databases”? I just copied/pasted the upstream synopsis. Done. > >> + database files. It is aimed for people, who know what SQLite is, or what >> + relational databases are in general.") > ^ > Please remove the extra leading spaces. Also: two spaces after > end-of-sentence period, as reported by ‘guix lint’. Oops, forgot running `guix lint`. Done. > Could you send an updated patch? Done, in a separate mail. Thanks for the review! Philippe.
Ludovic Courtès <ludo <at> gnu.org>:Philippe SWARTVAGHER <phil.swart <at> gmx.fr>:Message #19 received at 78496-done <at> debbugs.gnu.org (full text, mbox):
From: Ludovic Courtès <ludo <at> gnu.org> To: Philippe SWARTVAGHER <phil.swart <at> gmx.fr> Cc: 78496-done <at> debbugs.gnu.org, Sharlatan Hellseher <sharlatanus <at> gmail.com> Subject: Re: bug#78496: [PATCH] gnu: Add sqlitestudio. Date: Mon, 02 Jun 2025 10:25:05 +0200
Philippe SWARTVAGHER <phil.swart <at> gmx.fr> writes: > * gnu/packages/databases.scm (sqlitestudio): New variable. > > Change-Id: I012a189d37661bf70b140048696ae97647bf0a6f Applied, thanks!
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.