GNU bug report logs - #57361
[PATCH] gnu: Add solvespace.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 57361 in the body.
You can then email your comments to 57361 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Kristian Lein-Mathisen <kristianlein <at> gmail.com>
To: guix-patches <at> gnu.org
Subject: [PATCH] gnu: Add solvespace.
Date: Tue, 23 Aug 2022 14:08:31 +0200

[Message part 1 (text/plain, inline)]

Hi everyone,

I'm new to Guix and I'm enjoying it very much so far. Here is my little
contribution: a lightweight CAD package. I don't have a lot of experience
with SolveSpace, so I haven't done any testing other than checking if
export to DXF works and drawing some sketches.

I think I've managed to follow the steps in the Submitting Patches
<https://guix.gnu.org/manual/devel/en/html_node/Submitting-Patches.html>
guide. The package has a couple of TODO's though, mostly regarding
extracting dependencies instead of building the git submodules in-place:

- mimalloc This just points to Microsoft's upstream
<https://github.com/microsoft/mimalloc/tree/f819dbb4e4813fab464aee16770f39f11476bfea>,
very close to version 2.0.6. The only other use of mimalloc I found was
rust-mimalloc, but it seems to be
<https://github.com/purpleprotocol/mimalloc_rust/tree/v0.1.20/libmimalloc-sys/c_src>
on version mimalloc 1.6.4.

- dxfrw: I believe this is an independent fork
<https://github.com/solvespace/libdxfrw>, which is unlikely useful
elsewhere.

Please consider this for inclusion,
Thank you.
K.

[Message part 2 (text/html, inline)]

[0001-gnu-Add-solvespace.patch (text/x-patch, attachment)]

Message #8 received at 57361 <at> debbugs.gnu.org (full text, mbox):

From: Kristian Lein-Mathisen <kristianlein <at> gmail.com>
To: 57361 <at> debbugs.gnu.org
Subject: Solvespace package re-done
Date: Wed, 31 Aug 2022 20:51:43 +0200

[Message part 1 (text/plain, inline)]

Based off feedback from lilyp and rekado_ on #guix, I've made some
improvements:

- Remove the recursive checkout
- Extract mimalloc as a (nonpublic) package
- Fix commit hash value
- Enabled tests

I've made an amend commit, so the new patch replaces the original one above.

Note that the previous commit hash of solvespace of was off. The correct
hash for solvespace 3.1 is 70bde63cb32a7f049fa56cbdf924e2695fcb2916, as
shown in the new patch.

Thanks for all help this far, and hoping to see SolveSpace included in GNU
Guix.
- Kris

[Message part 2 (text/html, inline)]

[0001-gnu-Add-solvespace.patch (text/x-patch, attachment)]

Message #11 received at 57361 <at> debbugs.gnu.org (full text, mbox):

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: Kristian Lein-Mathisen <kristianlein <at> gmail.com>, 57361 <at> debbugs.gnu.org
Subject: Re: Solvespace package re-done
Date: Thu, 01 Sep 2022 19:18:37 +0200

Am Mittwoch, dem 31.08.2022 um 20:51 +0200 schrieb Kristian Lein-
Mathisen:

> ;; There is another mimalloc, used in rust-mimalloc. But it's on
> mimalloc
> +;; version 1.6.4. TODO: See if it's possible to re-use this package
> by both.
> +(define mimalloc-for-solvespace
Given that this is the upstream mimalloc, there's no reason to make
this private or only for solvespace.  Note that you should separate
this into one patch per package.

> +  (let ((commit "f2712f4a8f038a7fb4df2790f4c3b7e3ed9e219b")
> +        (version "2.0.6"))
This is the release commit, no reason to use git-version etc. here
> +    (package
> +      (name "mimalloc-for-solvespace")
> +      (version (git-version version "1" commit))
> +      (source (origin
> +                (method git-fetch)
> +                (uri (git-reference
> +                      (url "https://github.com/microsoft/mimalloc")
> +                      (commit commit)))
You can use (string-append "v" version) to check out the tag.
> +                (file-name (git-file-name name version))
> +                (sha256
> +                 (base32
> +                 
> "05x2dl3zimflfj91ns3vrphmzpdlyyr230p9adqgfds101f16qmv"))))
> +      (build-system cmake-build-system)
> +      (arguments
> +       `(#:build-type "Release"))
> +      (synopsis "Compact general purpose allocator with excellent
> performance")
Don't bloat the synopsis with marketing terms; "General purpose
allocator" should probably suffice.
> +      (description "@code{mimalloc} is a drop-in replacement for
> @code{malloc}
.")

The rest appears somewhat superfluous :)
> +      (home-page "https://microsoft.github.io/mimalloc/")
> +      (license license:expat))))


> +(define-public solvespace
> +  (let ((commit "70bde63cb32a7f049fa56cbdf924e2695fcb2916")
> +        (version "3.1")
I haven't checked, but is this the release commit?  If so, no need for
all this verbosity.

> +        ;; libdxfrw has no readme, no version release, no tags. 
> Initial
> +        ;; commit says "libdxfrw-0.6.3 import", but it shares no git
> history
> +        ;; with "upstream" https://github.com/codelibs/libdxfrw. 
> Both are
> +        ;; difficult to package separately as they don't install
> properly.
> +        ;; Copying in-tree instead of #:recursive #t to avoid
> downloading the
> +        ;; other bigger dependencies which aren't needed.
> +        (libdxfrw-sources (origin
> +                            (method git-fetch)
> +                            (uri (git-reference (url
> +                                                
> "https://github.com/solvespace/libdxfrw")
> +                                                (commit
> +                                                
> "0b7b7b709d9299565db603f878214656ef5e9ddf")))
> +                            (sha256 (base32
> +                                    
> "0d2wjq81466m3hb5cffiy99vhx0irwwy47yfxp318k2q4cvd5z2a")))))
This should be its own variable.  Unlike with mimalloc, since it's just
an origin, you can use the same patch as solvespace.
> +    (package
> +      (name "solvespace")
> +      (version (git-version version "1" commit))
> +      (source (origin
> +                (method git-fetch)
> +                (uri (git-reference
> +                      (url
> "https://github.com/solvespace/solvespace")
> +                      (commit commit)))
> +                (file-name (git-file-name name version))
> +                (sha256
> +                 (base32
> +                 
> "1hbdln44k00a6vlklv2mq2c9zda3i9d5x0f7ks85w4v6zskhqnra"))))
> +      (build-system cmake-build-system)
> +      (native-inputs (list pkg-config gettext-minimal))
> +      (arguments
> +       (list #:build-type "Release"
> +             #:phases #~(modify-phases %standard-phases
`guix style' is not yet perfect when it comes to trade-offs between
horizontal and vertical space.  Prefer 
  (list 
   #:build-type "Release"
   #:phases
   #~(modify-phases ...
> +                          (add-after 'unpack 'unpack-libdxfrw
> +                            (lambda _
> +                              (copy-recursively #$libdxfrw-sources
> +                                                "extlib/libdxfrw")))
> +                          (add-before 'configure 'embed-git-commit-
> hash
> +                            (lambda _
> +                              ;; `git describe` doesn't work here,
> so embed
> +                              ;; the commit hash directly in
> CMakeLists.txt as
> +                              ;; described instead.
> +                              (substitute* "CMakeLists.txt"
> +                                (("include\\(GetGitCommitHash\\)")
> +                                 (string-append "set(GIT_COMMIT_HASH
> "
> +                                                #$commit ")")))))
> +                          (add-before 'configure 'use-packaged-
> mimalloc
> +                            (lambda _
> +                              (substitute* "CMakeLists.txt"
> +                                (("message\\(STATUS \"Using in-tree
> mimalloc\"\\)")
> +                                 "message(STATUS \"Using guix
> packaged mimalloc\")")
> +                               
> (("add_subdirectory\\(extlib/mimalloc EXCLUDE_FROM_ALL\\)")
> +                                 "find_package(mimalloc
> REQUIRED)")))))))
> +      (inputs (list cairo
> +                    eigen
> +                    freetype
> +                    gtkmm-3
> +                    json-c
> +                    libpng
> +                    libspnav            ;spaceware
> +                    mimalloc-for-solvespace
> +                    mesa
> +                    zlib))
> +      (synopsis "Parametric 2D/3D CAD")
> +      (description
> +       "SOLVESPACE is a parametric 3D @acronym{CAD,
> +Computer Aided Design} tool.  Applications include:
> +
> +@itemize
> +@item modeling 3d parts — draw with extrudes, revolves, helixes and
> +      Boolean (union / difference / intersection) operations
> +@item modeling 2d parts — draw the part as a single section,
> +      and export DXF, PDF, SVG; use 3d assembly to verify fit
> +@item 3d-printed parts — export the STL or other triangle mesh
> +      expected by most 3d printers
> +@item preparing CAM data — export 2d vector art for a waterjet
> +      machine or laser cutter; or generate STEP or STL, for import
> into
> +      third-party CAM software for machining
> +@item mechanism design — use the constraint solver to simulate
> planar
> +      or spatial linkages, with pin, ball, or slide joints
> +@item plane and solid geometry — replace hand-solved trigonometry
> and spreadsheets
> +      with a live dimensioned drawing
> +@end itemize")
> +      (home-page "https://solvespace.com/")
> +      (license license:gpl3+))))
> +

Cheers

Message #14 received at 57361 <at> debbugs.gnu.org (full text, mbox):

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: Kristian Lein-Mathisen <kristianlein <at> gmail.com>, 57361 <at> debbugs.gnu.org
Subject: Re: Solvespace package re-done
Date: Thu, 01 Sep 2022 19:20:18 +0200

Am Donnerstag, dem 01.09.2022 um 19:18 +0200 schrieb Liliana Marie
Prikler:
> Am Mittwoch, dem 31.08.2022 um 20:51 +0200 schrieb Kristian Lein-
> Mathisen:
> 
> > ;; There is another mimalloc, used in rust-mimalloc. But it's on
> > mimalloc
> > +;; version 1.6.4. TODO: See if it's possible to re-use this
> > package
> > by both.
> > +(define mimalloc-for-solvespace
> Given that this is the upstream mimalloc, there's no reason to make
> this private or only for solvespace.  Note that you should separate
> this into one patch per package.
Oh, and there's no conflict with rust-mimalloc, since that bundles
mimalloc as rust stuff does.  *sigh*

IOW you can name it mimalloc, no need for version suffixes or anything
else.  If at any point you need an old mimalloc as well, you can add it
as mimalloc-1.6 or whatever.

Cheers

Message #17 received at 57361 <at> debbugs.gnu.org (full text, mbox):

From: Kristian Lein-Mathisen <kristianlein <at> gmail.com>
To: 57361 <at> debbugs.gnu.org
Subject: [PATCH] gnu: Add solvespace.
Date: Mon, 5 Sep 2022 21:57:56 +0200

[Message part 1 (text/plain, inline)]

Hi,

And thanks for your feedback, Liliana. Here's another attempt!

> > +(define mimalloc-for-solvespace
> Given that this is the upstream mimalloc, there's no reason to make
> this private or only for solvespace. Note that you should separate
> this into one patch per package.
> > + (let ((commit "f2712f4a8f038a7fb4df2790f4c3b7e3ed9e219b")
> > + (version "2.0.6"))
> This is the release commit, no reason to use git-version etc. here

Done! I wasn't sure where to place this public mimalloc. I asked
on #guix but go no replies, so I kept it right there in engineering.scm.

> > + (synopsis "Compact general purpose allocator with excellent
> > performance")
> Don't bloat the synopsis with marketing terms; "General purpose
> allocator" should probably suffice.

Ah, of course. Fixed.

> > + (define-public solvespace
> > + (let ((commit "70bde63cb32a7f049fa56cbdf924e2695fcb2916")
> > + (version "3.1")
> I haven't checked, but is this the release commit? If so, no need for
> all this verbosity.

Unfortunately, the verbosity is needed. I need to reference the commit hash
before the configure phase below.

> > + (libdxfrw-sources (origin
> > + (method git-fetch)
> > + (uri (git-reference (url
> > + "https://github.com/solvespace/libdxfrw")
> > + (commit
> > +   "0b7b7b709d9299565db603f878214656ef5e9ddf")))
> > + (sha256 (base32
> > +  "0d2wjq81466m3hb5cffiy99vhx0irwwy47yfxp318k2q4cvd5z2a")))))
> This should be its own variable. Unlike with mimalloc, since it's just
> an origin, you can use the same patch as solvespace.

Done, but here I'm curious - why does this deserve it's own top-level
variable? It shouldn't to be referenced by anything other than inside
SolveSpace.
Could I have used a nested define inside solvespace instead?

> > + (package (name "solvespace")
> > + (version (git-version version "1" commit))
> > + (source (origin
> > + (method git-fetch)
> > + (uri (git-reference
> > + (url "https://github.com/solvespace/solvespace")
> > + (commit commit)))
> > +   (file-name (git-file-name name version))
> > +   (sha256
> > +   (base32
> > +    "1hbdln44k00a6vlklv2mq2c9zda3i9d5x0f7ks85w4v6zskhqnra"))))
> > + (build-system cmake-build-system)
> > + (native-inputs (list pkg-config gettext-minimal))
> > + (arguments
> > + (list #:build-type "Release"
> > + #:phases #~(modify-phases %standard-phases
> `guix style' is not yet perfect when it comes to trade-offs between
> horizontal and vertical space. Prefer
> (list
> #:build-type "Release"
> #:phases
> #~(modify-phases ...

Indentation fixed (by Emacs this time, not guix style).

K.

[Message part 2 (text/html, inline)]

[0002-gnu-Add-solvespace.patch (text/x-patch, attachment)]

[0001-gnu-Add-mimalloc.patch (text/x-patch, attachment)]

Message #20 received at 57361 <at> debbugs.gnu.org (full text, mbox):

From: Kristian Lein-Mathisen <kristianlein <at> gmail.com>
To: 57361 <at> debbugs.gnu.org
Subject: [PATCH] gnu: Add solvespace.
Date: Tue, 6 Sep 2022 10:30:00 +0200

[Message part 1 (text/plain, inline)]

Hi again,

unmatched-paren suggested to put mimalloc into c.scm on #guix, so here is
new set of patches to reflect that.

K.

[Message part 2 (text/html, inline)]

[0002-gnu-Add-solvespace.patch (text/x-patch, attachment)]

[0001-gnu-Add-mimalloc.patch (text/x-patch, attachment)]

Message #23 received at 57361 <at> debbugs.gnu.org (full text, mbox):

From: Kristian Lein-Mathisen <kristianlein <at> gmail.com>
To: 57361 <at> debbugs.gnu.org
Subject: [PATCH] gnu: Add solvespace.
Date: Tue, 6 Sep 2022 10:33:32 +0200

[Message part 1 (text/plain, inline)]

Sorry, forgot to add (gnu packages c) dependency. Here are the updated
patches again.

K.

[Message part 2 (text/html, inline)]

[0001-gnu-Add-mimalloc.patch (text/x-patch, attachment)]

[0002-gnu-Add-solvespace.patch (text/x-patch, attachment)]

Message #26 received at 57361 <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: Kristian Lein-Mathisen <kristianlein <at> gmail.com>
Cc: 57361 <at> debbugs.gnu.org
Subject: Re: bug#57361: [PATCH] gnu: Add solvespace.
Date: Thu, 08 Sep 2022 15:14:36 +0200

[Message part 1 (text/plain, inline)]

Hi,

Kristian Lein-Mathisen <kristianlein <at> gmail.com> skribis:

> From a19e2d22f52b71db2ddc14b5dcaa6acb57c27484 Mon Sep 17 00:00:00 2001
> From: Kristian Lein-Mathisen <kristianlein <at> gmail.com>
> Date: Mon, 5 Sep 2022 21:49:03 +0200
> Subject: [PATCH 1/2] gnu: Add mimalloc.
>
> * gnu/packages/c.scm (mimalloc): New variable.

[...]

> From a2967120d10320962a0298caa412d320bca7804a Mon Sep 17 00:00:00 2001
> From: Kristian Lein-Mathisen <kristianlein <at> gmail.com>
> Date: Tue, 6 Sep 2022 10:24:01 +0200
> Subject: [PATCH 2/2] gnu: Add solvespace.
>
> * gnu/packages/engineering.scm (solvespace): New variable.

Applied both, the latter with the cosmetic changes below.

Thanks!

Ludo’.

[Message part 2 (text/x-patch, inline)]

diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index f6a5e22188..05f33db143 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -2963,18 +2963,19 @@ (define-public solvespace
                     mimalloc
                     mesa
                     zlib))
-      (synopsis "Parametric 2D/3D CAD")
+      (synopsis
+       "Parametric 2D/3D @acronym{CAD, computer-aided design} software")
       (description
        "SOLVESPACE is a parametric 3D @acronym{CAD,
-Computer Aided Design} tool.  Applications include:
+computer-aided design} tool.  Applications include:
 
 @itemize
-@item modeling 3d parts — draw with extrudes, revolves, helixes and
+@item modeling 3D parts — draw with extrudes, revolves, helixes and
       Boolean (union / difference / intersection) operations
 @item modeling 2d parts — draw the part as a single section,
-      and export DXF, PDF, SVG; use 3d assembly to verify fit
-@item 3d-printed parts — export the STL or other triangle mesh
-      expected by most 3d printers
+      and export DXF, PDF, SVG; use 3D assembly to verify fit
+@item 3D-printed parts — export the STL or other triangle mesh
+      expected by most 3D printers
 @item preparing CAM data — export 2d vector art for a waterjet
       machine or laser cutter; or generate STEP or STL, for import into
       third-party CAM software for machining

Message #29 received at 57361 <at> debbugs.gnu.org (full text, mbox):

From: "(" <paren <at> disroot.org>
To: "Kristian Lein-Mathisen" <kristianlein <at> gmail.com>, <57361 <at> debbugs.gnu.org>
Subject: Re: [bug#57361] [PATCH] gnu: Add solvespace.
Date: Sat, 10 Sep 2022 08:55:44 +0100

Hey,

In future, if you need to resend a patchset, you can use the -v flag of git
(format-patch|send-email) to indicate the revision number of the patchset,
eg:

  git send-email -3 --to=XXXXX <at> debbugs.gnu.org -v2

    -- (

Message #32 received at 57361 <at> debbugs.gnu.org (full text, mbox):

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: Ludovic Courtès <ludo <at> gnu.org>, Kristian
 Lein-Mathisen <kristianlein <at> gmail.com>
Cc: 57361 <at> debbugs.gnu.org
Subject: Re: bug#57361: [PATCH] gnu: Add solvespace.
Date: Sat, 10 Sep 2022 17:27:03 +0200

Am Donnerstag, dem 08.09.2022 um 15:14 +0200 schrieb Ludovic Courtès:
> Hi,
> 
> Kristian Lein-Mathisen <kristianlein <at> gmail.com> skribis:
> 
> > From a19e2d22f52b71db2ddc14b5dcaa6acb57c27484 Mon Sep 17 00:00:00
> > 2001
> > From: Kristian Lein-Mathisen <kristianlein <at> gmail.com>
> > Date: Mon, 5 Sep 2022 21:49:03 +0200
> > Subject: [PATCH 1/2] gnu: Add mimalloc.
> > 
> > * gnu/packages/c.scm (mimalloc): New variable.
> 
> [...]
> 
> > From a2967120d10320962a0298caa412d320bca7804a Mon Sep 17 00:00:00
> > 2001
> > From: Kristian Lein-Mathisen <kristianlein <at> gmail.com>
> > Date: Tue, 6 Sep 2022 10:24:01 +0200
> > Subject: [PATCH 2/2] gnu: Add solvespace.
> > 
> > * gnu/packages/engineering.scm (solvespace): New variable.
> 
> Applied both, the latter with the cosmetic changes below.
Should we mark this as done then?

Message #37 received at 57361-done <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
Cc: 57361-done <at> debbugs.gnu.org, Kristian Lein-Mathisen <kristianlein <at> gmail.com>
Subject: Re: bug#57361: [PATCH] gnu: Add solvespace.
Date: Sun, 11 Sep 2022 16:13:33 +0200

Liliana Marie Prikler <liliana.prikler <at> gmail.com> skribis:

> Am Donnerstag, dem 08.09.2022 um 15:14 +0200 schrieb Ludovic Courtès:
>> Hi,
>> 
>> Kristian Lein-Mathisen <kristianlein <at> gmail.com> skribis:
>> 
>> > From a19e2d22f52b71db2ddc14b5dcaa6acb57c27484 Mon Sep 17 00:00:00
>> > 2001
>> > From: Kristian Lein-Mathisen <kristianlein <at> gmail.com>
>> > Date: Mon, 5 Sep 2022 21:49:03 +0200
>> > Subject: [PATCH 1/2] gnu: Add mimalloc.
>> > 
>> > * gnu/packages/c.scm (mimalloc): New variable.
>> 
>> [...]
>> 
>> > From a2967120d10320962a0298caa412d320bca7804a Mon Sep 17 00:00:00
>> > 2001
>> > From: Kristian Lein-Mathisen <kristianlein <at> gmail.com>
>> > Date: Tue, 6 Sep 2022 10:24:01 +0200
>> > Subject: [PATCH 2/2] gnu: Add solvespace.
>> > 
>> > * gnu/packages/engineering.scm (solvespace): New variable.
>> 
>> Applied both, the latter with the cosmetic changes below.
> Should we mark this as done then?

Yes, sorry.  Done!

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.