* [bug#62292] [PATCH] gnu: Add kitsas
@ 2023-03-20 10:56 Saku Laesvuori via Guix-patches via
2023-03-20 18:09 ` Bruno Victal
2023-03-22 12:54 ` [bug#62292] [PATCH v2] " Saku Laesvuori via Guix-patches via
0 siblings, 2 replies; 8+ messages in thread
From: Saku Laesvuori via Guix-patches via @ 2023-03-20 10:56 UTC (permalink / raw)
To: 62292; +Cc: Saku Laesvuori
* gnu/packages/finance.scm (kitsas): New variable.
---
gnu/packages/finance.scm | 57 ++++++++++++++++++++++++++++++++++++++++
1 file changed, 57 insertions(+)
diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
index 3f3fc078f0..9c27df04ad 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -109,6 +109,7 @@ (define-module (gnu packages finance)
#:use-module (gnu packages multiprecision)
#:use-module (gnu packages ncurses)
#:use-module (gnu packages networking)
+ #:use-module (gnu packages pdf)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages popt)
#:use-module (gnu packages protobuf)
@@ -1290,6 +1291,62 @@ (define-public keepkey-agent
agent.")
(license license:lgpl3)))
+(define-public kitsas
+ (package
+ (name "kitsas")
+ (version "4.0.3")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append
+ "https://github.com/artoh/kitupiikki/archive/refs/tags/v"
+ version ".tar.gz"))
+ (sha256
+ (base32
+ "1a15axggskrvjb3r3yyr3kdxyzcygxjj756b6dzpwlca5g1l7x5w"))))
+ (build-system qt-build-system)
+ (inputs (list qtbase-5 libzip poppler-qt5 qtsvg-5))
+ (arguments
+ '(#:test-target "check"
+ #:tests? #f
+ #:phases (modify-phases %standard-phases
+ (replace 'configure
+ (lambda* _
+ (invoke "qmake" "kitsasproject.pro" "CONFIG+=release")))
+ (replace 'install
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out")))
+ (install-file "kitsas/kitsas"
+ (string-append out "/bin/"))
+ (install-file "kitsas.png"
+ (string-append out "/share/icons/"))
+ (install-file "kitsas.desktop"
+ (string-append out
+ "/share/applications/"))))))))
+ (home-page "https://kitsas.fi")
+ (synopsis "Finnish bookkeeping software for small organisations")
+ (description
+ "The software is in Finnish only.
+
+ Finnish free software accounting program with the following goals and features:
+
+ @itemize @bullet
+ @item
+ Ease of use
+ @item
+ Digital management of documents
+ @item
+ Creating a digital archive
+ @item
+ Built-in invoicing
+ @item
+ Creating reports
+ @end itemize")
+ (license license:gpl3)))
+ ; GPL3 with additional terms:
+ ; - Modified versions of this software should be clearly mentioned as modified
+ ; - Kitsas Oy will not support any modified version of this software
+ ; - The name Kitsas Oy should not be used in any modified version
+
(define-public python-stdnum
(package
(name "python-stdnum")
base-commit: 3a2200e1ad2049ad7e25295e6b4e013f74dd84e2
--
2.39.2
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [bug#62292] [PATCH] gnu: Add kitsas
2023-03-20 10:56 [bug#62292] [PATCH] gnu: Add kitsas Saku Laesvuori via Guix-patches via
@ 2023-03-20 18:09 ` Bruno Victal
2023-03-22 12:54 ` [bug#62292] [PATCH v2] " Saku Laesvuori via Guix-patches via
1 sibling, 0 replies; 8+ messages in thread
From: Bruno Victal @ 2023-03-20 18:09 UTC (permalink / raw)
To: Saku Laesvuori; +Cc: 62292
Hi Saku,
On 2023-03-20 10:56, Saku Laesvuori via Guix-patches via wrote:
>
> +(define-public kitsas
> + (package
> + (name "kitsas")
> + (version "4.0.3")
> + (source (origin
> + (method url-fetch)
> + (uri (string-append
> + "https://github.com/artoh/kitupiikki/archive/refs/tags/v"
> + version ".tar.gz"))
Use git-fetch instead.
GitHub tarballs are not stable and their hash can change in the future.
> + (sha256
> + (base32
> + "1a15axggskrvjb3r3yyr3kdxyzcygxjj756b6dzpwlca5g1l7x5w"))))
> + (build-system qt-build-system)
> + (inputs (list qtbase-5 libzip poppler-qt5 qtsvg-5))
> + (arguments
[...]
> + '(#:test-target "check"
> + #:tests? #f
If the tests don't work, leave a comment stating such.
It's worth trying to get them working if possible though.
[...]
> + #:phases (modify-phases %standard-phases
> + (replace 'configure
> + (lambda* _
> + (invoke "qmake" "kitsasproject.pro" "CONFIG+=release")))
> + (replace 'install
> + (lambda* (#:key outputs #:allow-other-keys)
> + (let ((out (assoc-ref outputs "out")))
> + (install-file "kitsas/kitsas"
> + (string-append out "/bin/"))
> + (install-file "kitsas.png"
> + (string-append out "/share/icons/"))
> + (install-file "kitsas.desktop"
> + (string-append out
> + "/share/applications/"))))))))
Prefer list to ' and use G-Expressions here, i.e.
(arguments
(list
#:tests? #f ;; comment here...
#:phases
#~(modify-phases %standard-phases
(replace 'install
(lambda* _
(install-file "kitsas/kitsas" (string-append #$output "/bin/"))
... )))))
> + (home-page "https://kitsas.fi")
> + (synopsis "Finnish bookkeeping software for small organisations")
> + (description
> + "The software is in Finnish only.
> +
> + Finnish free software accounting program with the following goals and features:
> +
> + @itemize @bullet
> + @item
> + Ease of use
> + @item
> + Digital management of documents
> + @item
> + Creating a digital archive
> + @item
> + Built-in invoicing
> + @item
> + Creating reports
> + @end itemize")
You can collapse this into:
@itemize @bullet
@item Ease of use
@item Digital management of documents
...
@end itemize
> + (license license:gpl3)))
> + ; GPL3 with additional terms:
> + ; - Modified versions of this software should be clearly mentioned as modified
> + ; - Kitsas Oy will not support any modified version of this software
> + ; - The name Kitsas Oy should not be used in any modified version
Move this comment into the package definition.
Cheers,
Bruno
^ permalink raw reply [flat|nested] 8+ messages in thread
* [bug#62292] [PATCH v2] gnu: Add kitsas
2023-03-20 10:56 [bug#62292] [PATCH] gnu: Add kitsas Saku Laesvuori via Guix-patches via
2023-03-20 18:09 ` Bruno Victal
@ 2023-03-22 12:54 ` Saku Laesvuori via Guix-patches via
2023-04-17 21:29 ` bug#62292: [PATCH] " Ludovic Courtès
1 sibling, 1 reply; 8+ messages in thread
From: Saku Laesvuori via Guix-patches via @ 2023-03-22 12:54 UTC (permalink / raw)
To: 62292; +Cc: Saku Laesvuori, mirai
* gnu/packages/finance.scm (kitsas): New variable.
---
gnu/packages/finance.scm | 49 ++++++++++++++++++++++++++++++++++++++++
1 file changed, 49 insertions(+)
diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
index 3f3fc078f0..a4b7ede62a 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -109,6 +109,7 @@ (define-module (gnu packages finance)
#:use-module (gnu packages multiprecision)
#:use-module (gnu packages ncurses)
#:use-module (gnu packages networking)
+ #:use-module (gnu packages pdf)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages popt)
#:use-module (gnu packages protobuf)
@@ -1290,6 +1291,54 @@ (define-public keepkey-agent
agent.")
(license license:lgpl3)))
+(define-public kitsas
+ (package
+ (name "kitsas")
+ (version "4.0.3")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/artoh/kitupiikki")
+ (commit (string-append "v" version))))
+ (sha256
+ (base32
+ "0hrbsqqm6v2pmjq17s7i4akjgclz3d051mg02vcykq80xgxvbkgf"))))
+ (build-system qt-build-system)
+ (inputs (list qtbase-5 libzip poppler-qt5 qtsvg-5))
+ (arguments
+ (list
+ ; Some tests fail and others segfault
+ #:tests #f
+ #:test-target "check"
+ #:phases #~(modify-phases %standard-phases
+ (replace 'configure
+ (lambda* _
+ (invoke "qmake" "kitsasproject.pro" "CONFIG+=release")))
+ (replace 'install
+ (lambda* _
+ (install-file "kitsas/kitsas" (string-append #$output "/bin/"))
+ (install-file "kitsas.png" (string-append #$output "/share/icons/"))
+ (install-file "kitsas.desktop" (string-append #$output "/share/applications/")))))))
+ (home-page "https://kitsas.fi")
+ (synopsis "Finnish bookkeeping software for small organisations")
+ (description
+ "The software is in Finnish only.
+
+ Finnish free software accounting program with the following goals and features:
+
+ @itemize @bullet
+ @item Ease of use
+ @item Digital management of documents
+ @item Creating a digital archive
+ @item Built-in invoicing
+ @item Creating reports
+ @end itemize")
+ ; GPL3 with additional terms:
+ ; - Modified versions of this software should be clearly mentioned as modified
+ ; - Kitsas Oy will not support any modified version of this software
+ ; - The name Kitsas Oy should not be used in any modified version
+ (license license:gpl3)))
+
(define-public python-stdnum
(package
(name "python-stdnum")
base-commit: 3a2200e1ad2049ad7e25295e6b4e013f74dd84e2
--
2.39.2
^ permalink raw reply related [flat|nested] 8+ messages in thread
* bug#62292: [PATCH] gnu: Add kitsas
2023-03-22 12:54 ` [bug#62292] [PATCH v2] " Saku Laesvuori via Guix-patches via
@ 2023-04-17 21:29 ` Ludovic Courtès
2023-04-18 14:51 ` [bug#62292] " Saku Laesvuori via Guix-patches via
0 siblings, 1 reply; 8+ messages in thread
From: Ludovic Courtès @ 2023-04-17 21:29 UTC (permalink / raw)
To: Saku Laesvuori; +Cc: 62292-done, mirai
Hi Saku,
Saku Laesvuori <saku@laesvuori.fi> skribis:
> * gnu/packages/finance.scm (kitsas): New variable.
Thanks for the updated patch. I went ahead and applied it with the
changes below (the license is ‘gpl3+’ because the ‘LICENSE’ file
explicitly says “version 3 or any later version”).
The test failures are worrisome though. Could you investigate why those
tests are failing or crashing?
Those failures may indicate real issues. Or it could be that they
require a running X server (other packages usually solve that by
spawning ‘Xvfb’ right before the ‘check’ phase).
Thank you, and thanks Bruno for reviewing.
Ludo’.
^ permalink raw reply [flat|nested] 8+ messages in thread
* [bug#62292] [PATCH] gnu: Add kitsas
2023-04-17 21:29 ` bug#62292: [PATCH] " Ludovic Courtès
@ 2023-04-18 14:51 ` Saku Laesvuori via Guix-patches via
2023-04-20 10:30 ` Ludovic Courtès
0 siblings, 1 reply; 8+ messages in thread
From: Saku Laesvuori via Guix-patches via @ 2023-04-18 14:51 UTC (permalink / raw)
To: Ludovic Courtès; +Cc: 62292-done, mirai
[-- Attachment #1: Type: text/plain, Size: 551 bytes --]
> The test failures are worrisome though. Could you investigate why those
> tests are failing or crashing?
>
> Those failures may indicate real issues. Or it could be that they
> require a running X server (other packages usually solve that by
> spawning ‘Xvfb’ right before the ‘check’ phase).
The tests also fail on an Arch linux machine with a running X server. I
tried removing the failing ones, but that caused some of the previously
passing ones to start segfaulting, so I have no idea how to fix them
properly.
- Saku
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
* [bug#62292] [PATCH] gnu: Add kitsas
2023-04-18 14:51 ` [bug#62292] " Saku Laesvuori via Guix-patches via
@ 2023-04-20 10:30 ` Ludovic Courtès
2023-04-20 11:38 ` Saku Laesvuori via Guix-patches via
0 siblings, 1 reply; 8+ messages in thread
From: Ludovic Courtès @ 2023-04-20 10:30 UTC (permalink / raw)
To: Saku Laesvuori; +Cc: 62292-done, mirai
Saku Laesvuori <saku@laesvuori.fi> skribis:
>> The test failures are worrisome though. Could you investigate why those
>> tests are failing or crashing?
>>
>> Those failures may indicate real issues. Or it could be that they
>> require a running X server (other packages usually solve that by
>> spawning ‘Xvfb’ right before the ‘check’ phase).
>
> The tests also fail on an Arch linux machine with a running X server. I
> tried removing the failing ones, but that caused some of the previously
> passing ones to start segfaulting, so I have no idea how to fix them
> properly.
OK. Could you report it upstream?
Thanks,
Ludo’.
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2023-04-20 12:38 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-03-20 10:56 [bug#62292] [PATCH] gnu: Add kitsas Saku Laesvuori via Guix-patches via
2023-03-20 18:09 ` Bruno Victal
2023-03-22 12:54 ` [bug#62292] [PATCH v2] " Saku Laesvuori via Guix-patches via
2023-04-17 21:29 ` bug#62292: [PATCH] " Ludovic Courtès
2023-04-18 14:51 ` [bug#62292] " Saku Laesvuori via Guix-patches via
2023-04-20 10:30 ` Ludovic Courtès
2023-04-20 11:38 ` Saku Laesvuori via Guix-patches via
2023-04-20 12:37 ` Saku Laesvuori via Guix-patches via
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).