[PATCH 00/15] Updates and fixes for elixir and dependents

Done

Details

2 participants

Andrew Tropin
Igor Goryachev

Owner: unassigned

Submitted by: Igor Goryachev

Severity: normal

Debbugs page

Igor Goryachev wrote 9 months ago

Recipients:(address . guix-patches@gnu.org)(name . Igor Goryachev)(address . igor@goryachev.org)

Message-ID:cover.1718992389.git.igor@goryachev.org

Here are fixes and updates for elixir, mix-build-system and things which are
in elixir-xyz.scm. Package elixir was updated to most recent version. Some
packages became more reproducible.

Igor Goryachev (15):
  gnu: elixir: Fix mix substitute.
  gnu: elixir-hex: Remove redundant directory, fix lint warnings.
  gnu: elixir: Update to 1.17.1.
  gnu: elixir-nimble-parsec: Update to 1.4.0.
  build-sysem/mix: Preserve code paths.
  gnu: elixir-makeup: Update to 1.1.2, make reproducible.
  gnu: elixir-jason: Fix lint warnings.
  gnu: elixir-file-system: Update to 1.0.0.
  gnu: elixir-bunt: Update to 1.0.0.
  gnu: elixir-castore: Update to 1.0.7.
  gnu: elixir-excoveralls: Update to 0.18.1, fix lint warnings.
  gnu: elixir-credo: Update to 1.7.7, fix lint warnings.
  gnu: elixir-erlex: Update to 0.2.7.
  gnu: elixir-dialyxir: Update to 1.4.3.
  gnu: elixir-machete: Update to 0.3.3, temporarily disable tests.

 gnu/packages/elixir-xyz.scm     | 87 ++++++++++++++++++++++-----------
 gnu/packages/elixir.scm         | 19 ++++---
 guix/build/mix-build-system.scm |  3 +-
 3 files changed, 72 insertions(+), 37 deletions(-)


base-commit: e3f87960915e3ef0b1d6a5a15281b3d4e9ee4d38
-- 
2.45.1

Igor Goryachev wrote 9 months ago

[PATCH 02/15] gnu: elixir-hex: Remove redundant directory, fix lint warnings.

Recipients:(address . 71707@debbugs.gnu.org)

Message-ID:4351173e2417ee0bd95b37a78c2518ee8edb96fc.1718992389.git.igor@goryachev.org

* gnu/packages/elixir.scm (elixir-hex): Remove redundant directory, fix lint warnings.

Change-Id: Ic5b29d8ddb9c3d4dc058494cf6cbb5f60a492bb1

---

gnu/packages/elixir.scm | 11 ++++++++---

1 file changed, 8 insertions(+), 3 deletions(-)

Toggle diff (32 lines)diff --git a/gnu/packages/elixir.scm b/gnu/packages/elixir.scm
index ace067aa47..e2e9fcc245 100644
--- a/gnu/packages/elixir.scm
+++ b/gnu/packages/elixir.scm
@@ -174,7 +174,7 @@ (define-public elixir-hex
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/hexpm/hex.git")
+             (url "https://github.com/hexpm/hex")
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -201,9 +201,14 @@ (define-public elixir-hex
           (replace 'install
             (lambda* (#:key inputs outputs #:allow-other-keys)
               (define X.Y #$(version-major+minor (package-version elixir)))
-              (define out (string-append (assoc-ref outputs "out") "/lib/elixir/" X.Y "/hex"))
+              (define out (string-append (assoc-ref outputs "out")
+                                         "/lib/elixir/" X.Y "/hex"))
               (mkdir-p out)
-              (copy-recursively "_build/prod/lib/hex" out))))))
+              (let* ((prod-dir "_build/prod/lib/hex")
+                     (prod-dir-mix (string-append prod-dir "/.mix")))
+                (and (directory-exists? prod-dir-mix)
+                     (delete-file-recursively prod-dir-mix))
+              (copy-recursively "_build/prod/lib/hex" out)))))))
     (synopsis "Package manager for the Erlang VM")
     (description
      "This project provides tasks that integrate with Mix, Elixir's build
-- 
2.45.1

Igor Goryachev wrote 9 months ago

[PATCH 01/15] gnu: elixir: Fix mix substitute.

Recipients:(address . 71707@debbugs.gnu.org)

Message-ID:dd0727509f6fcb5e39596bfc8d2a78c9782e089b.1718992389.git.igor@goryachev.org

* gnu/packages/elixir.scm (elixir): Fix mix substitute.

Change-Id: I02d5849409dfbc624fcbe76b0a06b88e2ff8f4f2

---

gnu/packages/elixir.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (24 lines)diff --git a/gnu/packages/elixir.scm b/gnu/packages/elixir.scm
index e3051a8275..ace067aa47 100644
--- a/gnu/packages/elixir.scm
+++ b/gnu/packages/elixir.scm
@@ -136,7 +136,7 @@ (define-public elixir
                   ;; program, for example `iex -S mix`, so we should not wrap
                   ;; mix into shell script.
                   (substitute* (string-append out "/bin/mix")
-                    (("Mix.start\\(\\)")
+                    (("Mix.CLI.main\\(\\)")
                      (format #f "\
 ~~w[GUIX_ELIXIR_LIBS ERL_LIBS]
 |> Enum.map(&System.get_env/1)
@@ -144,7 +144,7 @@ (define-public elixir
 |> Enum.join(\":\")
 |> case do \"\" -> :ok; erl_libs -> System.put_env(\"ERL_LIBS\", erl_libs) end
 System.put_env(\"MIX_REBAR3\", System.get_env(\"MIX_REBAR3\", \"~a\"))
-Mix.start()"
+Mix.CLI.main()"
                              (search-input-file inputs "/bin/rebar3"))))
                   (for-each
                    (lambda (program)
-- 
2.45.1

Igor Goryachev wrote 9 months ago

[PATCH 03/15] gnu: elixir: Update to 1.17.1.

Recipients:(address . 71707@debbugs.gnu.org)

Message-ID:92cc46f4de4254de84e74528fa099e2ca7753da2.1718992389.git.igor@goryachev.org

* gnu/packages/elixir.scm (elixir): Update to 1.17.1.

Change-Id: Iad374439bc79c9dbef29c38ec2de19d9e8ea963b

---

gnu/packages/elixir.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (24 lines)diff --git a/gnu/packages/elixir.scm b/gnu/packages/elixir.scm
index e2e9fcc245..e646fe7dd6 100644
--- a/gnu/packages/elixir.scm
+++ b/gnu/packages/elixir.scm
@@ -41,7 +41,7 @@ (define-module (gnu packages elixir)
 (define-public elixir
   (package
     (name "elixir")
-    (version "1.16.3")
+    (version "1.17.1")
     (source
      (origin
        (method git-fetch)
@@ -50,7 +50,7 @@ (define-public elixir
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0db1f6p8409ld81lfd9ln9ir4v55h48lzsbd91jz0hns7ninlh2r"))
+        (base32 "1nav5mv52l2sd37rhdnr4scqfnnnb04r481qabdqvfmfdvikxc3b"))
        (patches (search-patches "elixir-path-length.patch"))))
     (build-system gnu-build-system)
     (arguments
-- 
2.45.1

Igor Goryachev wrote 9 months ago

[PATCH 04/15] gnu: elixir-nimble-parsec: Update to 1.4.0.

Recipients:(address . 71707@debbugs.gnu.org)

Message-ID:597664d74f6addc7b8ee60b3ef015db0aee63599.1718992389.git.igor@goryachev.org

* gnu/packages/elixir-xyz.scm (elixir-nimble-parsec): Update to 1.4.0.

Change-Id: I4622df968c176a6ad318b70d18dba31909d9276c

---

gnu/packages/elixir-xyz.scm | 5 +++--

1 file changed, 3 insertions(+), 2 deletions(-)

Toggle diff (29 lines)diff --git a/gnu/packages/elixir-xyz.scm b/gnu/packages/elixir-xyz.scm
index 5af8d7c1b4..69e3a53ff3 100644
--- a/gnu/packages/elixir-xyz.scm
+++ b/gnu/packages/elixir-xyz.scm
@@ -1,5 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2023 Pierre-Henry Fröhring <phfrohring@deeplinks.com>
+;;; Copyright © 2024 Igor Goryachev <igor@goryachev.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -36,13 +37,13 @@ (define-module (gnu packages elixir-xyz)
 (define-public elixir-nimble-parsec
   (package
     (name "elixir-nimble-parsec")
-    (version "1.3.1")
+    (version "1.4.0")
     (source
      (origin
        (method url-fetch)
        (uri (hexpm-uri name version))
        (sha256
-        (base32 "0rxiw6jzz77v0j460wmzcprhdgn71g1hrz3mcc6djn7bnb0f70i6"))))
+        (base32 "0a6gs7950gpkdax18x167g8v6dy4sbbx47cchglq7cqgh5i5hmlw"))))
     (build-system mix-build-system)
     (arguments (list #:tests? #f)) ; no tests
     (synopsis "Text-based parser combinators")
-- 
2.45.1

Igor Goryachev wrote 9 months ago

[PATCH 05/15] build-sysem/mix: Preserve code paths.

Recipients:(address . 71707@debbugs.gnu.org)

Message-ID:7e269e40ecfea13e9444b1ca7428e293730d1758.1718992389.git.igor@goryachev.org

* guix/build/mix-build-system.scm (build): Preserve code paths.

Change-Id: Ia43e79385a536de98ae026893e1bda2a8416562c

---

guix/build/mix-build-system.scm | 3 ++-

1 file changed, 2 insertions(+), 1 deletion(-)

Toggle diff (16 lines)diff --git a/guix/build/mix-build-system.scm b/guix/build/mix-build-system.scm
index fe2e36d184..cb832adae4 100644
--- a/guix/build/mix-build-system.scm
+++ b/guix/build/mix-build-system.scm
@@ -102,7 +102,8 @@ (define* (build #:key mix-environments #:allow-other-keys)
   "Builds the Mix project."
   (for-each (lambda (mix-env)
               (setenv "MIX_ENV" mix-env)
-              (invoke "mix" "compile" "--no-deps-check"))
+              (invoke "mix" "compile" "--no-deps-check"
+                      "--no-prune-code-paths"))
             mix-environments))
 
 (define* (check #:key (tests? #t) #:allow-other-keys)
-- 
2.45.1

Igor Goryachev wrote 9 months ago

[PATCH 06/15] gnu: elixir-makeup: Update to 1.1.2, make reproducible.

Recipients:(address . 71707@debbugs.gnu.org)

Message-ID:47b0d6f93a1da8ccc1f587120615223075baa3b1.1718992389.git.igor@goryachev.org

* gnu/packages/elixir-xyz.scm (elixir-makeup): Update to 1.1.2, make reproducible.

Change-Id: I43fca3e4d1f6d2a5e678940416710c126b51a59b

---

gnu/packages/elixir-xyz.scm | 36 +++++++++++++++++++++++++++++++-----

1 file changed, 31 insertions(+), 5 deletions(-)

Toggle diff (65 lines)diff --git a/gnu/packages/elixir-xyz.scm b/gnu/packages/elixir-xyz.scm
index 69e3a53ff3..9f3601c427 100644
--- a/gnu/packages/elixir-xyz.scm
+++ b/gnu/packages/elixir-xyz.scm
@@ -24,6 +24,8 @@ (define-module (gnu packages elixir-xyz)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages base)
   #:use-module (gnu packages)
+  #:use-module (guix build mix-build-system)
+  #:use-module (guix build utils)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system mix)
   #:use-module (guix download)
@@ -56,20 +58,44 @@ (define-public elixir-nimble-parsec
 (define-public elixir-makeup
   (package
     (name "elixir-makeup")
-    (version "1.1.0")
+    (version "1.1.2")
     (source
      (origin
        (method url-fetch)
        (uri (hexpm-uri name version))
        (sha256
-        (base32 "19jpprryixi452jwhws3bbks6ki3wni9kgzah3srg22a3x8fsi8a"))))
+        (base32 "1b3civqrznn3dxqa3iybwbpgj8dj6f7q1zlgr8gd5jzvh5mmdqfc"))))
     (build-system mix-build-system)
     (propagated-inputs (list elixir-nimble-parsec))
-    (arguments (list #:tests? #f)) ; no tests
+    (arguments
+     `(#:tests? #f ; no tests
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'make-reproducible
+           (lambda _
+             (substitute* "lib/makeup/token/utils.ex"
+               (("@precedence Hierarchy.hierarchy_to_precedence\\(@hierarchy\\)")
+                ""))
+             (substitute* "lib/makeup/token/utils.ex"
+               (("@token_to_class_map Hierarchy.style_to_class_map\\(@hierarchy\\)")
+                ""))
+             (substitute* "lib/makeup/token/utils.ex"
+               (("@standard_token_types Map.keys\\(@token_to_class_map\\)")
+                ""))
+             (substitute* "lib/makeup/token/utils.ex"
+               (("@precedence")
+                "Hierarchy.hierarchy_to_precedence(@hierarchy)"))
+             (substitute* "lib/makeup/token/utils.ex"
+               (("@token_to_class_map")
+                "Hierarchy.style_to_class_map(@hierarchy)"))
+             (substitute* "lib/makeup/token/utils.ex"
+               (("@standard_token_types")
+                "Map.keys(token_to_class_map())")))))))
     (synopsis "Syntax highlighter for source code")
     (description
-     "Makeup is a generic syntax highlighter in the style of Pygments suitable for use in code hosting,
-forums, wikis or other applications that need to prettify source code.")
+     "Makeup is a generic syntax highlighter in the style of Pygments suitable
+for use in code hosting, forums, wikis or other applications that need to prettify
+source code.")
     (home-page "https://hexdocs.pm/makeup/")
     (license license:bsd-2)))
 
-- 
2.45.1

Igor Goryachev wrote 9 months ago

[PATCH 07/15] gnu: elixir-jason: Fix lint warnings.

Recipients:(address . 71707@debbugs.gnu.org)

Message-ID:17862a19398ea56fa1acdf749562c95f9c9f96c1.1718992389.git.igor@goryachev.org

* gnu/packages/elixir-xyz.scm (elixir-jason): Fix lint warnings.

Change-Id: Iafefc4758d3b505cc725f32a0aa1061f1814188f

---

gnu/packages/elixir-xyz.scm | 7 +++----

1 file changed, 3 insertions(+), 4 deletions(-)

Toggle diff (20 lines)diff --git a/gnu/packages/elixir-xyz.scm b/gnu/packages/elixir-xyz.scm
index 9f3601c427..147eedb50b 100644
--- a/gnu/packages/elixir-xyz.scm
+++ b/gnu/packages/elixir-xyz.scm
@@ -113,10 +113,9 @@ (define-public elixir-jason
     (arguments (list #:tests? #f)) ; no tests
     (synopsis "JSON parser and generator")
     (description
-     "Parser and generator are written in pure Elixir and optimized for speed. They
-are at least twice as fast as other Elixir/Erlang libraries (e.g.
-Poison). The performance is comparable to jiffy, which is implemented in C as
-a NIF.")
+     "Parser and generator are written in pure Elixir and optimized for speed.  They
+are at least twice as fast as other Elixir/Erlang libraries (e.g. Poison).  The
+performance is comparable to jiffy, which is implemented in C as a NIF.")
     (home-page "https://hexdocs.pm/jason/")
     (license license:asl2.0)))
 
-- 
2.45.1

Igor Goryachev wrote 9 months ago

[PATCH 08/15] gnu: elixir-file-system: Update to 1.0.0.

Recipients:(address . 71707@debbugs.gnu.org)

Message-ID:6de7ff30cdecce6e555e0436bf0e0570f754604e.1718992389.git.igor@goryachev.org

* gnu/packages/elixir-xyz.scm (elixir-file-system): Update to 1.0.0.

Change-Id: I532d13e76c5a0a2cc683b97799eb52c6df5bc161

---

gnu/packages/elixir-xyz.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (22 lines)diff --git a/gnu/packages/elixir-xyz.scm b/gnu/packages/elixir-xyz.scm
index 147eedb50b..b1ce5fc976 100644
--- a/gnu/packages/elixir-xyz.scm
+++ b/gnu/packages/elixir-xyz.scm
@@ -122,13 +122,13 @@ (define-public elixir-jason
 (define-public elixir-file-system
   (package
     (name "elixir-file-system")
-    (version "0.2.10")
+    (version "1.0.0")
     (source
      (origin
        (method url-fetch)
        (uri (hexpm-uri name version))
        (sha256
-        (base32 "1p0myxmnjjds8bbg69dd6fvhk8q3n7lb78zd4qvmjajnzgdmw6a1"))
+        (base32 "0vakv2hmqcj0ijxlbh8bvdwislxrvpcfxvracq7a3idfcqnhjlk7"))
        (snippet #~(begin
                     (use-modules (guix build utils) (ice-9 ftw))
                     (mkdir "source")
-- 
2.45.1

Igor Goryachev wrote 9 months ago

[PATCH 09/15] gnu: elixir-bunt: Update to 1.0.0.

Recipients:(address . 71707@debbugs.gnu.org)

Message-ID:ebdf52582e47eb46e5942963a2e9a2a06616f096.1718992389.git.igor@goryachev.org

* gnu/packages/elixir-xyz.scm (elixir-bunt): Update to 1.0.0.

Change-Id: I5b51b2063f5eb07adeadb3ac33ad78a834b4b962

---

gnu/packages/elixir-xyz.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (22 lines)diff --git a/gnu/packages/elixir-xyz.scm b/gnu/packages/elixir-xyz.scm
index b1ce5fc976..af5f760294 100644
--- a/gnu/packages/elixir-xyz.scm
+++ b/gnu/packages/elixir-xyz.scm
@@ -153,13 +153,13 @@ (define-public elixir-file-system
 (define-public elixir-bunt
   (package
     (name "elixir-bunt")
-    (version "0.2.1")
+    (version "1.0.0")
     (source
      (origin
        (method url-fetch)
        (uri (hexpm-uri name version))
        (sha256
-        (base32 "19bp6xh052ql3ha0v3r8999cvja5d2p6cph02mxphfaj4jsbyc53"))))
+        (base32 "1ddnkg6w3iqzb8z18b7sr7jlmmbn9rf77w4nh1mzmxm512m8cpyw"))))
     (build-system mix-build-system)
     (arguments (list #:tests? #f)) ; no tests
     (synopsis "256 color ANSI coloring in the terminal")
-- 
2.45.1

Igor Goryachev wrote 9 months ago

[PATCH 10/15] gnu: elixir-castore: Update to 1.0.7.

Recipients:(address . 71707@debbugs.gnu.org)

Message-ID:c62a3358a21b1f8934c8ea66e9cf36709fc43320.1718992389.git.igor@goryachev.org

* gnu/packages/elixir-xyz.scm (elixir-castore): Update to 1.0.7.

Change-Id: I5281ad7e453774053f82c004fe75c886b69b48aa

---

gnu/packages/elixir-xyz.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (22 lines)diff --git a/gnu/packages/elixir-xyz.scm b/gnu/packages/elixir-xyz.scm
index af5f760294..f7b1b04855 100644
--- a/gnu/packages/elixir-xyz.scm
+++ b/gnu/packages/elixir-xyz.scm
@@ -193,13 +193,13 @@ (define-public elixir-inch-ex
 (define-public elixir-castore
   (package
     (name "elixir-castore")
-    (version "1.0.4")
+    (version "1.0.7")
     (source
      (origin
        (method url-fetch)
        (uri (hexpm-uri name version))
        (sha256
-        (base32 "1y44amb8falsmrfzpkmf7qp6215g9kdl76g91dpna4af2jwc264l"))))
+        (base32 "1xaw8n8g7qfygf8z8sz7f7pwmdl4lxshi9lj2b6j386jn2j8axys"))))
     (build-system mix-build-system)
     (arguments (list #:tests? #f)) ; no tests
     (synopsis "Up-to-date CA certificate store")
-- 
2.45.1

Igor Goryachev wrote 9 months ago

[PATCH 11/15] gnu: elixir-excoveralls: Update to 0.18.1, fix lint warnings.

Recipients:(address . 71707@debbugs.gnu.org)

Message-ID:3706d46e76670955fcf56da60e5c4a7515af4400.1718992389.git.igor@goryachev.org

* gnu/packages/elixir-xyz.scm (elixir-excoveralls): Update to 0.18.1, fix lint warnings.

Change-Id: I475270291fb41f603b6e4769e62816c7e5eb9183

---

gnu/packages/elixir-xyz.scm | 6 +++---

1 file changed, 3 insertions(+), 3 deletions(-)

Toggle diff (30 lines)diff --git a/gnu/packages/elixir-xyz.scm b/gnu/packages/elixir-xyz.scm
index f7b1b04855..afcc996c4a 100644
--- a/gnu/packages/elixir-xyz.scm
+++ b/gnu/packages/elixir-xyz.scm
@@ -211,20 +211,20 @@ (define-public elixir-castore
 (define-public elixir-excoveralls
   (package
     (name "elixir-excoveralls")
-    (version "0.18.0")
+    (version "0.18.1")
     (source
      (origin
        (method url-fetch)
        (uri (hexpm-uri name version))
        (sha256
-        (base32 "02x69ll5scvraky0k5gacvnnmldv5k04kgk02x087d9w3y8vn28i"))))
+        (base32 "138bls6hfk87mid2zfwsidk7j06yfich2iihyach7ckb2kdpjpyn"))))
     (build-system mix-build-system)
     (propagated-inputs (list elixir-castore elixir-jason))
     (arguments (list #:tests? #f)) ; no tests
     (synopsis "Coverage report tool with coveralls.io integration")
     (description
      "Library that reports test coverage statistics, with the option to
-post to coveralls.io service. It uses Erlang's cover to generate coverage
+post to coveralls.io service.  It uses Erlang's cover to generate coverage
 information, and posts the test coverage results to coveralls.io through the
 JSON API.")
     (home-page "https://hexdocs.pm/excoveralls/")
-- 
2.45.1

Igor Goryachev wrote 9 months ago

[PATCH 12/15] gnu: elixir-credo: Update to 1.7.7, fix lint warnings.

Recipients:(address . 71707@debbugs.gnu.org)

Message-ID:770a6ddf8117c923af271b051f1cc5a0d1d8055b.1718992389.git.igor@goryachev.org

* gnu/packages/elixir-xyz.scm (elixir-credo): Update to 1.7.7, fix lint warnings.

Change-Id: I1264249260689ab27d4689042e99872f78a7fa3f

---

gnu/packages/elixir-xyz.scm | 6 +++---

1 file changed, 3 insertions(+), 3 deletions(-)

Toggle diff (31 lines)diff --git a/gnu/packages/elixir-xyz.scm b/gnu/packages/elixir-xyz.scm
index afcc996c4a..25de4225f9 100644
--- a/gnu/packages/elixir-xyz.scm
+++ b/gnu/packages/elixir-xyz.scm
@@ -233,13 +233,13 @@ (define-public elixir-excoveralls
 (define-public elixir-credo
   (package
     (name "elixir-credo")
-    (version "1.7.1")
+    (version "1.7.7")
     (source
      (origin
        (method url-fetch)
        (uri (hexpm-uri name version))
        (sha256
-        (base32 "18jqi9s9r1587njzdxycvmmbma30cay9iamni4f3ih54jmh1r1z9"))))
+        (base32 "0bigri1xh29ims5gwh94pns6jys6h82pn6zhj0zxrb5ar6b79j4b"))))
     (build-system mix-build-system)
     (arguments (list #:tests? #f)) ; no tests
     (propagated-inputs (list elixir-bunt elixir-file-system elixir-jason))
@@ -247,7 +247,7 @@ (define-public elixir-credo
     (synopsis "Static code analysis tool")
     (description
      "Credo is a static code analysis tool for the Elixir language with a focus on
-teaching and code consistency. Credo can show you refactoring opportunities in
+teaching and code consistency.  Credo can show you refactoring opportunities in
 your code, complex code fragments, warn you about common mistakes, show
 inconsistencies in your naming scheme and - if needed - help you enforce a
 desired coding style.")
-- 
2.45.1

Igor Goryachev wrote 9 months ago

[PATCH 13/15] gnu: elixir-erlex: Update to 0.2.7.

Recipients:(address . 71707@debbugs.gnu.org)

Message-ID:5d11ca51073d25eba9df9b1aa901ca2b913d1fa4.1718992389.git.igor@goryachev.org

* gnu/packages/elixir-xyz.scm (elixir-erlex): Update to 0.2.7.

Change-Id: Ifbfa7886525e89894fc9d440d85eca0281e32e23

---

gnu/packages/elixir-xyz.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (22 lines)diff --git a/gnu/packages/elixir-xyz.scm b/gnu/packages/elixir-xyz.scm
index 25de4225f9..7b4025f3ad 100644
--- a/gnu/packages/elixir-xyz.scm
+++ b/gnu/packages/elixir-xyz.scm
@@ -257,13 +257,13 @@ (define-public elixir-credo
 (define-public elixir-erlex
   (package
     (name "elixir-erlex")
-    (version "0.2.6")
+    (version "0.2.7")
     (source
      (origin
        (method url-fetch)
        (uri (hexpm-uri name version))
        (sha256
-        (base32 "0x8c1j62y748ldvlh46sxzv5514rpzm809vxn594vd7y25by5lif"))))
+        (base32 "1c7gcm9nhf7m3pq0776sav744ak1sph63shcpzvc6i58s5wmzn9y"))))
     (build-system mix-build-system)
     (arguments (list #:tests? #f)) ; no tests
     (synopsis
-- 
2.45.1

Igor Goryachev wrote 9 months ago

[PATCH 14/15] gnu: elixir-dialyxir: Update to 1.4.3.

Recipients:(address . 71707@debbugs.gnu.org)

Message-ID:6d00c44788b3cce744ae63041f1cc8aaca6736d0.1718992389.git.igor@goryachev.org

* gnu/packages/elixir-xyz.scm (elixir-dialyxir): Update to 1.4.3.

Change-Id: I2abd139ec694d21b4a23940bb9476f6ad577d489

---

gnu/packages/elixir-xyz.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (22 lines)diff --git a/gnu/packages/elixir-xyz.scm b/gnu/packages/elixir-xyz.scm
index 7b4025f3ad..61044ace96 100644
--- a/gnu/packages/elixir-xyz.scm
+++ b/gnu/packages/elixir-xyz.scm
@@ -277,13 +277,13 @@ (define-public elixir-erlex
 (define-public elixir-dialyxir
   (package
     (name "elixir-dialyxir")
-    (version "1.4.1")
+    (version "1.4.3")
     (source
      (origin
        (method url-fetch)
        (uri (hexpm-uri name version))
        (sha256
-        (base32 "00cqwhd1wabwds44jz94rvvr8z8cp12884d3lp69fqkrszb9bdw4"))))
+        (base32 "11m9hxs5byidqyxpzv34m1hwd69jcqqv2h81qfz0cl2wrmsznb5z"))))
     (build-system mix-build-system)
     (arguments (list #:tests? #f)) ; no tests
     (propagated-inputs (list elixir-erlex))
-- 
2.45.1

Igor Goryachev wrote 9 months ago

[PATCH 15/15] gnu: elixir-machete: Update to 0.3.3, temporarily disable tests.

Recipients:(address . 71707@debbugs.gnu.org)

Message-ID:22cff68131b38db74680771eb64f11dde7d7d831.1718992389.git.igor@goryachev.org

* gnu/packages/elixir-xyz.scm (elixir-machete): Update to 0.3.3, temporarily disable tests.

Change-Id: I6f8e205d74967b2ab3bbef491b8596d4901d0e22

---

gnu/packages/elixir-xyz.scm | 7 +++++--

1 file changed, 5 insertions(+), 2 deletions(-)

Toggle diff (26 lines)diff --git a/gnu/packages/elixir-xyz.scm b/gnu/packages/elixir-xyz.scm
index 61044ace96..dab86ebf62 100644
--- a/gnu/packages/elixir-xyz.scm
+++ b/gnu/packages/elixir-xyz.scm
@@ -296,14 +296,17 @@ (define-public elixir-dialyxir
 (define-public elixir-machete
   (package
     (name "elixir-machete")
-    (version "0.2.8")
+    (version "0.3.3")
     (source
      (origin
        (method url-fetch)
        (uri (hexpm-uri name version))
        (sha256
-        (base32 "0952603bmqsf6v3ja99zpbnbx5d52i4xksjkfj3irl45ccq5pgq9"))))
+        (base32 "0705qp9l8yakdfpbafsf351b7xzqn86qcma1jm7i1n64r6bxkh31"))))
     (build-system mix-build-system)
+    ;; Temporarily disable tests until find the solution not to prune
+    ;; dependencies paths like in 'mix compile' task.
+    (arguments (list #:tests? #f))
     (native-inputs (list elixir-credo elixir-dialyxir))
     (synopsis "Literate test matchers for ExUnit")
     (description
-- 
2.45.1

Igor Goryachev wrote 9 months ago

[PATCH v2] build-sysem/mix: Preserve code paths.

Recipients:(address . 71707@debbugs.gnu.org)

Message-ID:7d2eebfc19fb1ad5cf6bb0c3b3f43129573ed2f5.1719051515.git.igor@goryachev.org

* guix/build/mix-build-system.scm (build): Preserve code paths.

Change-Id: Ia43e79385a536de98ae026893e1bda2a8416562c

---

guix/build/mix-build-system.scm | 4 +++-

1 file changed, 3 insertions(+), 1 deletion(-)

Toggle diff (39 lines)diff --git a/guix/build/mix-build-system.scm b/guix/build/mix-build-system.scm
index fe2e36d184..be9b04fa48 100644
--- a/guix/build/mix-build-system.scm
+++ b/guix/build/mix-build-system.scm
@@ -1,5 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2023 Pierre-Henry Fröhring <contact@phfrohring.com>
+;;; Copyright © 2024 Igor Goryachev <igor@goryachev.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -102,7 +103,8 @@ (define* (build #:key mix-environments #:allow-other-keys)
   "Builds the Mix project."
   (for-each (lambda (mix-env)
               (setenv "MIX_ENV" mix-env)
-              (invoke "mix" "compile" "--no-deps-check"))
+              (invoke "mix" "compile" "--no-deps-check"
+                      "--no-prune-code-paths"))
             mix-environments))
 
 (define* (check #:key (tests? #t) #:allow-other-keys)

base-commit: e3f87960915e3ef0b1d6a5a15281b3d4e9ee4d38
prerequisite-patch-id: f67c13fc4633d7231adde19419b58d26786f22e6
prerequisite-patch-id: 38d4eedd556dcbb3a7226893428e17dc11422e93
prerequisite-patch-id: b7a9d65b9096c9f81c9177fd9223327db3f88fdc
prerequisite-patch-id: 8529c9bfb7218c45d581ba238cd080e61a04348e
prerequisite-patch-id: 1415bdf2ac831e4403f4984ac50459e50e614fe5
prerequisite-patch-id: 27bfae4ab49135d63c37cae67d77adf32dd125e9
prerequisite-patch-id: 3401dc3320e0815193b0a43818fb6acbed551f8a
prerequisite-patch-id: 485aa6852930bd142948e65496f2a9f11eeada87
prerequisite-patch-id: 0e16cef28f01b31ec9776fed0cfc080f53f37551
prerequisite-patch-id: 522c512f834123b723098988b92ae77c6a6eb216
prerequisite-patch-id: 539cddcca36740084cc55a4bdd8c61f33c94d788
prerequisite-patch-id: 7957227db42c2c55475f4821840763b1aaa237f0
prerequisite-patch-id: 71acf56137b93b2d65547037c9620ac46a5470cf
prerequisite-patch-id: 5565ce218f7406465d639f90d3794f328a0e5b89
-- 
2.45.1

Igor Goryachev wrote 9 months ago

[PATCH v3 1/2] build-sysem/mix: Preserve code paths.

Recipients:(address . 71707@debbugs.gnu.org)

Message-ID:1ca3f415ea8c19b105152099ea4265246ffab95b.1719054612.git.igor@goryachev.org

* guix/build/mix-build-system.scm (build): Preserve code paths.

Change-Id: Ia43e79385a536de98ae026893e1bda2a8416562c

---

guix/build/mix-build-system.scm | 9 +++++++--

1 file changed, 7 insertions(+), 2 deletions(-)

Toggle diff (33 lines)diff --git a/guix/build/mix-build-system.scm b/guix/build/mix-build-system.scm
index fe2e36d184..0b021da791 100644
--- a/guix/build/mix-build-system.scm
+++ b/guix/build/mix-build-system.scm
@@ -1,5 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2023 Pierre-Henry Fröhring <contact@phfrohring.com>
+;;; Copyright © 2024 Igor Goryachev <igor@goryachev.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -102,13 +103,17 @@ (define* (build #:key mix-environments #:allow-other-keys)
   "Builds the Mix project."
   (for-each (lambda (mix-env)
               (setenv "MIX_ENV" mix-env)
-              (invoke "mix" "compile" "--no-deps-check"))
+              (invoke "mix" "compile" "--no-deps-check"
+                      "--no-prune-code-paths"))
             mix-environments))
 
 (define* (check #:key (tests? #t) #:allow-other-keys)
   "Test the Mix project."
   (if tests?
-      (invoke "mix" "test" "--no-deps-check")
+      (begin
+        (setenv "MIX_ENV" "test")
+        (invoke "mix" "do" "compile" "--no-deps-check" "--no-prune-code-paths" "+"
+                "test" "--no-deps-check"))
       (format #t "tests? = ~a~%" tests?)))
 
 (define* (remove-mix-dirs . _)
-- 
2.45.1

Igor Goryachev wrote 9 months ago

[PATCH v3 0/2] Fix tests for elixir dependents

Recipients:(address . 71707@debbugs.gnu.org)

Message-ID:cover.1719054612.git.igor@goryachev.org

This update includes working solution for not to prune dependencies
paths for elixir dependents during test executions. Also returned
back tests for elixir-machete package.

Igor Goryachev (2):
  build-sysem/mix: Preserve code paths.
  gnu: elixir-machete: Update to 0.3.3.

 gnu/packages/elixir-xyz.scm     | 4 ++--
 guix/build/mix-build-system.scm | 9 +++++++--
 2 files changed, 9 insertions(+), 4 deletions(-)


base-commit: e3f87960915e3ef0b1d6a5a15281b3d4e9ee4d38
prerequisite-patch-id: f67c13fc4633d7231adde19419b58d26786f22e6
prerequisite-patch-id: 38d4eedd556dcbb3a7226893428e17dc11422e93
prerequisite-patch-id: b7a9d65b9096c9f81c9177fd9223327db3f88fdc
prerequisite-patch-id: 8529c9bfb7218c45d581ba238cd080e61a04348e
prerequisite-patch-id: 1415bdf2ac831e4403f4984ac50459e50e614fe5
prerequisite-patch-id: 27bfae4ab49135d63c37cae67d77adf32dd125e9
prerequisite-patch-id: 3401dc3320e0815193b0a43818fb6acbed551f8a
prerequisite-patch-id: 485aa6852930bd142948e65496f2a9f11eeada87
prerequisite-patch-id: 0e16cef28f01b31ec9776fed0cfc080f53f37551
prerequisite-patch-id: 522c512f834123b723098988b92ae77c6a6eb216
prerequisite-patch-id: 539cddcca36740084cc55a4bdd8c61f33c94d788
prerequisite-patch-id: 7957227db42c2c55475f4821840763b1aaa237f0
prerequisite-patch-id: 71acf56137b93b2d65547037c9620ac46a5470cf
-- 
2.45.1

Igor Goryachev wrote 9 months ago

[PATCH v3 2/2] gnu: elixir-machete: Update to 0.3.3.

Recipients:(address . 71707@debbugs.gnu.org)

Message-ID:04d09c4ddf3c165827458863af4d8538b8a72fbb.1719054612.git.igor@goryachev.org

* gnu/packages/elixir-xyz.scm (elixir-machete): Update to 0.3.3.

Change-Id: I6f8e205d74967b2ab3bbef491b8596d4901d0e22

---

gnu/packages/elixir-xyz.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (22 lines)diff --git a/gnu/packages/elixir-xyz.scm b/gnu/packages/elixir-xyz.scm
index 61044ace96..f08e07bb57 100644
--- a/gnu/packages/elixir-xyz.scm
+++ b/gnu/packages/elixir-xyz.scm
@@ -296,13 +296,13 @@ (define-public elixir-dialyxir
 (define-public elixir-machete
   (package
     (name "elixir-machete")
-    (version "0.2.8")
+    (version "0.3.3")
     (source
      (origin
        (method url-fetch)
        (uri (hexpm-uri name version))
        (sha256
-        (base32 "0952603bmqsf6v3ja99zpbnbx5d52i4xksjkfj3irl45ccq5pgq9"))))
+        (base32 "0705qp9l8yakdfpbafsf351b7xzqn86qcma1jm7i1n64r6bxkh31"))))
     (build-system mix-build-system)
     (native-inputs (list elixir-credo elixir-dialyxir))
     (synopsis "Literate test matchers for ExUnit")
-- 
2.45.1

Andrew Tropin wrote 8 months ago

Re: [bug#71707] [PATCH v3 0/2] Fix tests for elixir dependents

Recipients:(name . Igor Goryachev)(address . igor@goryachev.org)

Message-ID:87r0cczcsy.fsf@trop.in

On 2024-06-22 14:10, Igor Goryachev via Guix-patches via wrote:

Toggle quote (4 lines)

> This update includes working solution for not to prune dependencies

> paths for elixir dependents during test executions. Also returned

> back tests for elixir-machete package.

Hi Igor!

Could you resend the whole patch series, please?

The usual approach is to send all commits on every re-roll, even if they

didn't change, this way it's easy to pick and apply the whole patch

series, otherwise it will require to cherrypick and mix patches from

different re-rolls, which is inconvinient and also very error prone.

Toggle quote (25 lines)>
> Igor Goryachev (2):
>   build-sysem/mix: Preserve code paths.
>   gnu: elixir-machete: Update to 0.3.3.
>
>  gnu/packages/elixir-xyz.scm     | 4 ++--
>  guix/build/mix-build-system.scm | 9 +++++++--
>  2 files changed, 9 insertions(+), 4 deletions(-)
>
>
> base-commit: e3f87960915e3ef0b1d6a5a15281b3d4e9ee4d38
> prerequisite-patch-id: f67c13fc4633d7231adde19419b58d26786f22e6
> prerequisite-patch-id: 38d4eedd556dcbb3a7226893428e17dc11422e93
> prerequisite-patch-id: b7a9d65b9096c9f81c9177fd9223327db3f88fdc
> prerequisite-patch-id: 8529c9bfb7218c45d581ba238cd080e61a04348e
> prerequisite-patch-id: 1415bdf2ac831e4403f4984ac50459e50e614fe5
> prerequisite-patch-id: 27bfae4ab49135d63c37cae67d77adf32dd125e9
> prerequisite-patch-id: 3401dc3320e0815193b0a43818fb6acbed551f8a
> prerequisite-patch-id: 485aa6852930bd142948e65496f2a9f11eeada87
> prerequisite-patch-id: 0e16cef28f01b31ec9776fed0cfc080f53f37551
> prerequisite-patch-id: 522c512f834123b723098988b92ae77c6a6eb216
> prerequisite-patch-id: 539cddcca36740084cc55a4bdd8c61f33c94d788
> prerequisite-patch-id: 7957227db42c2c55475f4821840763b1aaa237f0
> prerequisite-patch-id: 71acf56137b93b2d65547037c9620ac46a5470cf

-- 
Best regards,
Andrew Tropin

Igor Goryachev wrote 8 months ago

[PATCH v4 02/15] gnu: elixir-hex: Remove redundant directory, fix lint warnings.

Recipients:(address . 71707@debbugs.gnu.org)

Message-ID:32744e22e386e762bb5f6b73018cad3b7d03ecc9.1719903317.git.igor@goryachev.org

* gnu/packages/elixir.scm (elixir-hex): Remove redundant directory, fix lint warnings.

Change-Id: Ic5b29d8ddb9c3d4dc058494cf6cbb5f60a492bb1

---

gnu/packages/elixir.scm | 11 ++++++++---

1 file changed, 8 insertions(+), 3 deletions(-)

Toggle diff (32 lines)diff --git a/gnu/packages/elixir.scm b/gnu/packages/elixir.scm
index ace067aa47..e2e9fcc245 100644
--- a/gnu/packages/elixir.scm
+++ b/gnu/packages/elixir.scm
@@ -174,7 +174,7 @@ (define-public elixir-hex
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/hexpm/hex.git")
+             (url "https://github.com/hexpm/hex")
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -201,9 +201,14 @@ (define-public elixir-hex
           (replace 'install
             (lambda* (#:key inputs outputs #:allow-other-keys)
               (define X.Y #$(version-major+minor (package-version elixir)))
-              (define out (string-append (assoc-ref outputs "out") "/lib/elixir/" X.Y "/hex"))
+              (define out (string-append (assoc-ref outputs "out")
+                                         "/lib/elixir/" X.Y "/hex"))
               (mkdir-p out)
-              (copy-recursively "_build/prod/lib/hex" out))))))
+              (let* ((prod-dir "_build/prod/lib/hex")
+                     (prod-dir-mix (string-append prod-dir "/.mix")))
+                (and (directory-exists? prod-dir-mix)
+                     (delete-file-recursively prod-dir-mix))
+              (copy-recursively "_build/prod/lib/hex" out)))))))
     (synopsis "Package manager for the Erlang VM")
     (description
      "This project provides tasks that integrate with Mix, Elixir's build
-- 
2.45.2

Igor Goryachev wrote 8 months ago

[PATCH v4 03/15] gnu: elixir: Update to 1.17.1.

Recipients:(address . 71707@debbugs.gnu.org)

Message-ID:c5f22133279c5ade894a755d044fbc370676c44b.1719903317.git.igor@goryachev.org

* gnu/packages/elixir.scm (elixir): Update to 1.17.1.

Change-Id: Iad374439bc79c9dbef29c38ec2de19d9e8ea963b

---

gnu/packages/elixir.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (24 lines)diff --git a/gnu/packages/elixir.scm b/gnu/packages/elixir.scm
index e2e9fcc245..e646fe7dd6 100644
--- a/gnu/packages/elixir.scm
+++ b/gnu/packages/elixir.scm
@@ -41,7 +41,7 @@ (define-module (gnu packages elixir)
 (define-public elixir
   (package
     (name "elixir")
-    (version "1.16.3")
+    (version "1.17.1")
     (source
      (origin
        (method git-fetch)
@@ -50,7 +50,7 @@ (define-public elixir
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0db1f6p8409ld81lfd9ln9ir4v55h48lzsbd91jz0hns7ninlh2r"))
+        (base32 "1nav5mv52l2sd37rhdnr4scqfnnnb04r481qabdqvfmfdvikxc3b"))
        (patches (search-patches "elixir-path-length.patch"))))
     (build-system gnu-build-system)
     (arguments
-- 
2.45.2

Igor Goryachev wrote 8 months ago

[PATCH v4 01/15] gnu: elixir: Fix mix substitute.

Recipients:(address . 71707@debbugs.gnu.org)

Message-ID:cc8086621cbda47eb7ad139e7b779064520df1ed.1719903317.git.igor@goryachev.org

* gnu/packages/elixir.scm (elixir): Fix mix substitute.

Change-Id: I02d5849409dfbc624fcbe76b0a06b88e2ff8f4f2

---

gnu/packages/elixir.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (26 lines)diff --git a/gnu/packages/elixir.scm b/gnu/packages/elixir.scm
index e3051a8275..ace067aa47 100644
--- a/gnu/packages/elixir.scm
+++ b/gnu/packages/elixir.scm
@@ -136,7 +136,7 @@ (define-public elixir
                   ;; program, for example `iex -S mix`, so we should not wrap
                   ;; mix into shell script.
                   (substitute* (string-append out "/bin/mix")
-                    (("Mix.start\\(\\)")
+                    (("Mix.CLI.main\\(\\)")
                      (format #f "\
 ~~w[GUIX_ELIXIR_LIBS ERL_LIBS]
 |> Enum.map(&System.get_env/1)
@@ -144,7 +144,7 @@ (define-public elixir
 |> Enum.join(\":\")
 |> case do \"\" -> :ok; erl_libs -> System.put_env(\"ERL_LIBS\", erl_libs) end
 System.put_env(\"MIX_REBAR3\", System.get_env(\"MIX_REBAR3\", \"~a\"))
-Mix.start()"
+Mix.CLI.main()"
                              (search-input-file inputs "/bin/rebar3"))))
                   (for-each
                    (lambda (program)

base-commit: 0f51ddd8dba6b69115d07f4a77ba70abb6521293
-- 
2.45.2

Igor Goryachev wrote 8 months ago

[PATCH v4 05/15] gnu: elixir-makeup: Update to 1.1.2, make reproducible.

Recipients:(address . 71707@debbugs.gnu.org)

Message-ID:ecd52b985ae2993214a8ef9c0211b0b640873e1d.1719903317.git.igor@goryachev.org

* gnu/packages/elixir-xyz.scm (elixir-makeup): Update to 1.1.2, make reproducible.

Change-Id: I43fca3e4d1f6d2a5e678940416710c126b51a59b

---

gnu/packages/elixir-xyz.scm | 36 +++++++++++++++++++++++++++++++-----

1 file changed, 31 insertions(+), 5 deletions(-)

Toggle diff (65 lines)diff --git a/gnu/packages/elixir-xyz.scm b/gnu/packages/elixir-xyz.scm
index 69e3a53ff3..9f3601c427 100644
--- a/gnu/packages/elixir-xyz.scm
+++ b/gnu/packages/elixir-xyz.scm
@@ -24,6 +24,8 @@ (define-module (gnu packages elixir-xyz)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages base)
   #:use-module (gnu packages)
+  #:use-module (guix build mix-build-system)
+  #:use-module (guix build utils)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system mix)
   #:use-module (guix download)
@@ -56,20 +58,44 @@ (define-public elixir-nimble-parsec
 (define-public elixir-makeup
   (package
     (name "elixir-makeup")
-    (version "1.1.0")
+    (version "1.1.2")
     (source
      (origin
        (method url-fetch)
        (uri (hexpm-uri name version))
        (sha256
-        (base32 "19jpprryixi452jwhws3bbks6ki3wni9kgzah3srg22a3x8fsi8a"))))
+        (base32 "1b3civqrznn3dxqa3iybwbpgj8dj6f7q1zlgr8gd5jzvh5mmdqfc"))))
     (build-system mix-build-system)
     (propagated-inputs (list elixir-nimble-parsec))
-    (arguments (list #:tests? #f)) ; no tests
+    (arguments
+     `(#:tests? #f ; no tests
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'make-reproducible
+           (lambda _
+             (substitute* "lib/makeup/token/utils.ex"
+               (("@precedence Hierarchy.hierarchy_to_precedence\\(@hierarchy\\)")
+                ""))
+             (substitute* "lib/makeup/token/utils.ex"
+               (("@token_to_class_map Hierarchy.style_to_class_map\\(@hierarchy\\)")
+                ""))
+             (substitute* "lib/makeup/token/utils.ex"
+               (("@standard_token_types Map.keys\\(@token_to_class_map\\)")
+                ""))
+             (substitute* "lib/makeup/token/utils.ex"
+               (("@precedence")
+                "Hierarchy.hierarchy_to_precedence(@hierarchy)"))
+             (substitute* "lib/makeup/token/utils.ex"
+               (("@token_to_class_map")
+                "Hierarchy.style_to_class_map(@hierarchy)"))
+             (substitute* "lib/makeup/token/utils.ex"
+               (("@standard_token_types")
+                "Map.keys(token_to_class_map())")))))))
     (synopsis "Syntax highlighter for source code")
     (description
-     "Makeup is a generic syntax highlighter in the style of Pygments suitable for use in code hosting,
-forums, wikis or other applications that need to prettify source code.")
+     "Makeup is a generic syntax highlighter in the style of Pygments suitable
+for use in code hosting, forums, wikis or other applications that need to prettify
+source code.")
     (home-page "https://hexdocs.pm/makeup/")
     (license license:bsd-2)))
 
-- 
2.45.2

Igor Goryachev wrote 8 months ago

[PATCH v4 04/15] gnu: elixir-nimble-parsec: Update to 1.4.0.

Recipients:(address . 71707@debbugs.gnu.org)

Message-ID:c0709853bf935d3bc85bf8039ca58e8d58a635ff.1719903317.git.igor@goryachev.org

* gnu/packages/elixir-xyz.scm (elixir-nimble-parsec): Update to 1.4.0.

Change-Id: I4622df968c176a6ad318b70d18dba31909d9276c

---

gnu/packages/elixir-xyz.scm | 5 +++--

1 file changed, 3 insertions(+), 2 deletions(-)

Toggle diff (29 lines)diff --git a/gnu/packages/elixir-xyz.scm b/gnu/packages/elixir-xyz.scm
index 5af8d7c1b4..69e3a53ff3 100644
--- a/gnu/packages/elixir-xyz.scm
+++ b/gnu/packages/elixir-xyz.scm
@@ -1,5 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2023 Pierre-Henry Fröhring <phfrohring@deeplinks.com>
+;;; Copyright © 2024 Igor Goryachev <igor@goryachev.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -36,13 +37,13 @@ (define-module (gnu packages elixir-xyz)
 (define-public elixir-nimble-parsec
   (package
     (name "elixir-nimble-parsec")
-    (version "1.3.1")
+    (version "1.4.0")
     (source
      (origin
        (method url-fetch)
        (uri (hexpm-uri name version))
        (sha256
-        (base32 "0rxiw6jzz77v0j460wmzcprhdgn71g1hrz3mcc6djn7bnb0f70i6"))))
+        (base32 "0a6gs7950gpkdax18x167g8v6dy4sbbx47cchglq7cqgh5i5hmlw"))))
     (build-system mix-build-system)
     (arguments (list #:tests? #f)) ; no tests
     (synopsis "Text-based parser combinators")
-- 
2.45.2

Igor Goryachev wrote 8 months ago

[PATCH v4 06/15] gnu: elixir-jason: Fix lint warnings.

Recipients:(address . 71707@debbugs.gnu.org)

Message-ID:46b3419923e652bb72ee458b7cc790ed525e460a.1719903317.git.igor@goryachev.org

* gnu/packages/elixir-xyz.scm (elixir-jason): Fix lint warnings.

Change-Id: Iafefc4758d3b505cc725f32a0aa1061f1814188f

---

gnu/packages/elixir-xyz.scm | 7 +++----

1 file changed, 3 insertions(+), 4 deletions(-)

Toggle diff (20 lines)diff --git a/gnu/packages/elixir-xyz.scm b/gnu/packages/elixir-xyz.scm
index 9f3601c427..147eedb50b 100644
--- a/gnu/packages/elixir-xyz.scm
+++ b/gnu/packages/elixir-xyz.scm
@@ -113,10 +113,9 @@ (define-public elixir-jason
     (arguments (list #:tests? #f)) ; no tests
     (synopsis "JSON parser and generator")
     (description
-     "Parser and generator are written in pure Elixir and optimized for speed. They
-are at least twice as fast as other Elixir/Erlang libraries (e.g.
-Poison). The performance is comparable to jiffy, which is implemented in C as
-a NIF.")
+     "Parser and generator are written in pure Elixir and optimized for speed.  They
+are at least twice as fast as other Elixir/Erlang libraries (e.g. Poison).  The
+performance is comparable to jiffy, which is implemented in C as a NIF.")
     (home-page "https://hexdocs.pm/jason/")
     (license license:asl2.0)))
 
-- 
2.45.2

Igor Goryachev wrote 8 months ago

[PATCH v4 07/15] gnu: elixir-file-system: Update to 1.0.0.

Recipients:(address . 71707@debbugs.gnu.org)

Message-ID:182f90f5bbecfbec6ba0e7f05c6c3ca1a9d3ca93.1719903317.git.igor@goryachev.org

* gnu/packages/elixir-xyz.scm (elixir-file-system): Update to 1.0.0.

Change-Id: I532d13e76c5a0a2cc683b97799eb52c6df5bc161

---

gnu/packages/elixir-xyz.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (22 lines)diff --git a/gnu/packages/elixir-xyz.scm b/gnu/packages/elixir-xyz.scm
index 147eedb50b..b1ce5fc976 100644
--- a/gnu/packages/elixir-xyz.scm
+++ b/gnu/packages/elixir-xyz.scm
@@ -122,13 +122,13 @@ (define-public elixir-jason
 (define-public elixir-file-system
   (package
     (name "elixir-file-system")
-    (version "0.2.10")
+    (version "1.0.0")
     (source
      (origin
        (method url-fetch)
        (uri (hexpm-uri name version))
        (sha256
-        (base32 "1p0myxmnjjds8bbg69dd6fvhk8q3n7lb78zd4qvmjajnzgdmw6a1"))
+        (base32 "0vakv2hmqcj0ijxlbh8bvdwislxrvpcfxvracq7a3idfcqnhjlk7"))
        (snippet #~(begin
                     (use-modules (guix build utils) (ice-9 ftw))
                     (mkdir "source")
-- 
2.45.2

Igor Goryachev wrote 8 months ago

[PATCH v4 09/15] gnu: elixir-castore: Update to 1.0.7.

Recipients:(address . 71707@debbugs.gnu.org)

Message-ID:debd4d1e0c05a9bc017204b0597c48921992d6b2.1719903317.git.igor@goryachev.org

* gnu/packages/elixir-xyz.scm (elixir-castore): Update to 1.0.7.

Change-Id: I5281ad7e453774053f82c004fe75c886b69b48aa

---

gnu/packages/elixir-xyz.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (22 lines)diff --git a/gnu/packages/elixir-xyz.scm b/gnu/packages/elixir-xyz.scm
index af5f760294..f7b1b04855 100644
--- a/gnu/packages/elixir-xyz.scm
+++ b/gnu/packages/elixir-xyz.scm
@@ -193,13 +193,13 @@ (define-public elixir-inch-ex
 (define-public elixir-castore
   (package
     (name "elixir-castore")
-    (version "1.0.4")
+    (version "1.0.7")
     (source
      (origin
        (method url-fetch)
        (uri (hexpm-uri name version))
        (sha256
-        (base32 "1y44amb8falsmrfzpkmf7qp6215g9kdl76g91dpna4af2jwc264l"))))
+        (base32 "1xaw8n8g7qfygf8z8sz7f7pwmdl4lxshi9lj2b6j386jn2j8axys"))))
     (build-system mix-build-system)
     (arguments (list #:tests? #f)) ; no tests
     (synopsis "Up-to-date CA certificate store")
-- 
2.45.2

Igor Goryachev wrote 8 months ago

[PATCH v4 08/15] gnu: elixir-bunt: Update to 1.0.0.

Recipients:(address . 71707@debbugs.gnu.org)

Message-ID:7babcba88c424e889b2b87ff95085da99225085d.1719903317.git.igor@goryachev.org

* gnu/packages/elixir-xyz.scm (elixir-bunt): Update to 1.0.0.

Change-Id: I5b51b2063f5eb07adeadb3ac33ad78a834b4b962

---

gnu/packages/elixir-xyz.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (22 lines)diff --git a/gnu/packages/elixir-xyz.scm b/gnu/packages/elixir-xyz.scm
index b1ce5fc976..af5f760294 100644
--- a/gnu/packages/elixir-xyz.scm
+++ b/gnu/packages/elixir-xyz.scm
@@ -153,13 +153,13 @@ (define-public elixir-file-system
 (define-public elixir-bunt
   (package
     (name "elixir-bunt")
-    (version "0.2.1")
+    (version "1.0.0")
     (source
      (origin
        (method url-fetch)
        (uri (hexpm-uri name version))
        (sha256
-        (base32 "19bp6xh052ql3ha0v3r8999cvja5d2p6cph02mxphfaj4jsbyc53"))))
+        (base32 "1ddnkg6w3iqzb8z18b7sr7jlmmbn9rf77w4nh1mzmxm512m8cpyw"))))
     (build-system mix-build-system)
     (arguments (list #:tests? #f)) ; no tests
     (synopsis "256 color ANSI coloring in the terminal")
-- 
2.45.2

Igor Goryachev wrote 8 months ago

[PATCH v4 10/15] gnu: elixir-excoveralls: Update to 0.18.1, fix lint warnings.

Recipients:(address . 71707@debbugs.gnu.org)

Message-ID:3cd57999a2bc084a0f090d5d774e30867cd91fb2.1719903317.git.igor@goryachev.org

* gnu/packages/elixir-xyz.scm (elixir-excoveralls): Update to 0.18.1, fix lint warnings.

Change-Id: I475270291fb41f603b6e4769e62816c7e5eb9183

---

gnu/packages/elixir-xyz.scm | 6 +++---

1 file changed, 3 insertions(+), 3 deletions(-)

Toggle diff (30 lines)diff --git a/gnu/packages/elixir-xyz.scm b/gnu/packages/elixir-xyz.scm
index f7b1b04855..afcc996c4a 100644
--- a/gnu/packages/elixir-xyz.scm
+++ b/gnu/packages/elixir-xyz.scm
@@ -211,20 +211,20 @@ (define-public elixir-castore
 (define-public elixir-excoveralls
   (package
     (name "elixir-excoveralls")
-    (version "0.18.0")
+    (version "0.18.1")
     (source
      (origin
        (method url-fetch)
        (uri (hexpm-uri name version))
        (sha256
-        (base32 "02x69ll5scvraky0k5gacvnnmldv5k04kgk02x087d9w3y8vn28i"))))
+        (base32 "138bls6hfk87mid2zfwsidk7j06yfich2iihyach7ckb2kdpjpyn"))))
     (build-system mix-build-system)
     (propagated-inputs (list elixir-castore elixir-jason))
     (arguments (list #:tests? #f)) ; no tests
     (synopsis "Coverage report tool with coveralls.io integration")
     (description
      "Library that reports test coverage statistics, with the option to
-post to coveralls.io service. It uses Erlang's cover to generate coverage
+post to coveralls.io service.  It uses Erlang's cover to generate coverage
 information, and posts the test coverage results to coveralls.io through the
 JSON API.")
     (home-page "https://hexdocs.pm/excoveralls/")
-- 
2.45.2

Igor Goryachev wrote 8 months ago

[PATCH v4 11/15] gnu: elixir-credo: Update to 1.7.7, fix lint warnings.

Recipients:(address . 71707@debbugs.gnu.org)

Message-ID:10eaee394868c2d6c241292ecde13e8be45399f9.1719903317.git.igor@goryachev.org

* gnu/packages/elixir-xyz.scm (elixir-credo): Update to 1.7.7, fix lint warnings.

Change-Id: I1264249260689ab27d4689042e99872f78a7fa3f

---

gnu/packages/elixir-xyz.scm | 6 +++---

1 file changed, 3 insertions(+), 3 deletions(-)

Toggle diff (31 lines)diff --git a/gnu/packages/elixir-xyz.scm b/gnu/packages/elixir-xyz.scm
index afcc996c4a..25de4225f9 100644
--- a/gnu/packages/elixir-xyz.scm
+++ b/gnu/packages/elixir-xyz.scm
@@ -233,13 +233,13 @@ (define-public elixir-excoveralls
 (define-public elixir-credo
   (package
     (name "elixir-credo")
-    (version "1.7.1")
+    (version "1.7.7")
     (source
      (origin
        (method url-fetch)
        (uri (hexpm-uri name version))
        (sha256
-        (base32 "18jqi9s9r1587njzdxycvmmbma30cay9iamni4f3ih54jmh1r1z9"))))
+        (base32 "0bigri1xh29ims5gwh94pns6jys6h82pn6zhj0zxrb5ar6b79j4b"))))
     (build-system mix-build-system)
     (arguments (list #:tests? #f)) ; no tests
     (propagated-inputs (list elixir-bunt elixir-file-system elixir-jason))
@@ -247,7 +247,7 @@ (define-public elixir-credo
     (synopsis "Static code analysis tool")
     (description
      "Credo is a static code analysis tool for the Elixir language with a focus on
-teaching and code consistency. Credo can show you refactoring opportunities in
+teaching and code consistency.  Credo can show you refactoring opportunities in
 your code, complex code fragments, warn you about common mistakes, show
 inconsistencies in your naming scheme and - if needed - help you enforce a
 desired coding style.")
-- 
2.45.2

Igor Goryachev wrote 8 months ago

[PATCH v4 12/15] gnu: elixir-erlex: Update to 0.2.7.

Recipients:(address . 71707@debbugs.gnu.org)

Message-ID:e736b87225bbe960cceaa0476a619c3088d0fb38.1719903317.git.igor@goryachev.org

* gnu/packages/elixir-xyz.scm (elixir-erlex): Update to 0.2.7.

Change-Id: Ifbfa7886525e89894fc9d440d85eca0281e32e23

---

gnu/packages/elixir-xyz.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (22 lines)diff --git a/gnu/packages/elixir-xyz.scm b/gnu/packages/elixir-xyz.scm
index 25de4225f9..7b4025f3ad 100644
--- a/gnu/packages/elixir-xyz.scm
+++ b/gnu/packages/elixir-xyz.scm
@@ -257,13 +257,13 @@ (define-public elixir-credo
 (define-public elixir-erlex
   (package
     (name "elixir-erlex")
-    (version "0.2.6")
+    (version "0.2.7")
     (source
      (origin
        (method url-fetch)
        (uri (hexpm-uri name version))
        (sha256
-        (base32 "0x8c1j62y748ldvlh46sxzv5514rpzm809vxn594vd7y25by5lif"))))
+        (base32 "1c7gcm9nhf7m3pq0776sav744ak1sph63shcpzvc6i58s5wmzn9y"))))
     (build-system mix-build-system)
     (arguments (list #:tests? #f)) ; no tests
     (synopsis
-- 
2.45.2

Igor Goryachev wrote 8 months ago

[PATCH v4 13/15] gnu: elixir-dialyxir: Update to 1.4.3.

Recipients:(address . 71707@debbugs.gnu.org)

Message-ID:185aecf039564198ea107a67a1b0ea208dc5f0fb.1719903317.git.igor@goryachev.org

* gnu/packages/elixir-xyz.scm (elixir-dialyxir): Update to 1.4.3.

Change-Id: I2abd139ec694d21b4a23940bb9476f6ad577d489

---

gnu/packages/elixir-xyz.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (22 lines)diff --git a/gnu/packages/elixir-xyz.scm b/gnu/packages/elixir-xyz.scm
index 7b4025f3ad..61044ace96 100644
--- a/gnu/packages/elixir-xyz.scm
+++ b/gnu/packages/elixir-xyz.scm
@@ -277,13 +277,13 @@ (define-public elixir-erlex
 (define-public elixir-dialyxir
   (package
     (name "elixir-dialyxir")
-    (version "1.4.1")
+    (version "1.4.3")
     (source
      (origin
        (method url-fetch)
        (uri (hexpm-uri name version))
        (sha256
-        (base32 "00cqwhd1wabwds44jz94rvvr8z8cp12884d3lp69fqkrszb9bdw4"))))
+        (base32 "11m9hxs5byidqyxpzv34m1hwd69jcqqv2h81qfz0cl2wrmsznb5z"))))
     (build-system mix-build-system)
     (arguments (list #:tests? #f)) ; no tests
     (propagated-inputs (list elixir-erlex))
-- 
2.45.2

Igor Goryachev wrote 8 months ago

[PATCH v4 14/15] gnu: elixir-machete: Update to 0.3.3.

Recipients:(address . 71707@debbugs.gnu.org)

Message-ID:0c8066736677599e93432f30e96b13dea9f1f0d3.1719903317.git.igor@goryachev.org

* gnu/packages/elixir-xyz.scm (elixir-machete): Update to 0.3.3.

Change-Id: I6f8e205d74967b2ab3bbef491b8596d4901d0e22

---

gnu/packages/elixir-xyz.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (22 lines)diff --git a/gnu/packages/elixir-xyz.scm b/gnu/packages/elixir-xyz.scm
index 61044ace96..f08e07bb57 100644
--- a/gnu/packages/elixir-xyz.scm
+++ b/gnu/packages/elixir-xyz.scm
@@ -296,13 +296,13 @@ (define-public elixir-dialyxir
 (define-public elixir-machete
   (package
     (name "elixir-machete")
-    (version "0.2.8")
+    (version "0.3.3")
     (source
      (origin
        (method url-fetch)
        (uri (hexpm-uri name version))
        (sha256
-        (base32 "0952603bmqsf6v3ja99zpbnbx5d52i4xksjkfj3irl45ccq5pgq9"))))
+        (base32 "0705qp9l8yakdfpbafsf351b7xzqn86qcma1jm7i1n64r6bxkh31"))))
     (build-system mix-build-system)
     (native-inputs (list elixir-credo elixir-dialyxir))
     (synopsis "Literate test matchers for ExUnit")
-- 
2.45.2

Igor Goryachev wrote 8 months ago

[PATCH v4 15/15] build-sysem/mix: Preserve code paths.

Recipients:(address . 71707@debbugs.gnu.org)

Message-ID:077a3687610260bacc9972bc9956568795a69438.1719903317.git.igor@goryachev.org

* guix/build/mix-build-system.scm (build): Preserve code paths.

Change-Id: Ia43e79385a536de98ae026893e1bda2a8416562c

---

guix/build/mix-build-system.scm | 9 +++++++--

1 file changed, 7 insertions(+), 2 deletions(-)

Toggle diff (33 lines)diff --git a/guix/build/mix-build-system.scm b/guix/build/mix-build-system.scm
index fe2e36d184..0b021da791 100644
--- a/guix/build/mix-build-system.scm
+++ b/guix/build/mix-build-system.scm
@@ -1,5 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2023 Pierre-Henry Fröhring <contact@phfrohring.com>
+;;; Copyright © 2024 Igor Goryachev <igor@goryachev.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -102,13 +103,17 @@ (define* (build #:key mix-environments #:allow-other-keys)
   "Builds the Mix project."
   (for-each (lambda (mix-env)
               (setenv "MIX_ENV" mix-env)
-              (invoke "mix" "compile" "--no-deps-check"))
+              (invoke "mix" "compile" "--no-deps-check"
+                      "--no-prune-code-paths"))
             mix-environments))
 
 (define* (check #:key (tests? #t) #:allow-other-keys)
   "Test the Mix project."
   (if tests?
-      (invoke "mix" "test" "--no-deps-check")
+      (begin
+        (setenv "MIX_ENV" "test")
+        (invoke "mix" "do" "compile" "--no-deps-check" "--no-prune-code-paths" "+"
+                "test" "--no-deps-check"))
       (format #t "tests? = ~a~%" tests?)))
 
 (define* (remove-mix-dirs . _)
-- 
2.45.2

Andrew Tropin wrote 8 months ago

Re: [PATCH v4 01/15] gnu: elixir: Fix mix substitute.

Recipients:(name . Igor Goryachev)(address . igor@goryachev.org)

Message-ID:87a5j0i4ox.fsf@trop.in

On 2024-07-02 09:55, Igor Goryachev wrote:

Toggle quote (32 lines)> * gnu/packages/elixir.scm (elixir): Fix mix substitute.
>
> Change-Id: I02d5849409dfbc624fcbe76b0a06b88e2ff8f4f2
> ---
>  gnu/packages/elixir.scm | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/gnu/packages/elixir.scm b/gnu/packages/elixir.scm
> index e3051a8275..ace067aa47 100644
> --- a/gnu/packages/elixir.scm
> +++ b/gnu/packages/elixir.scm
> @@ -136,7 +136,7 @@ (define-public elixir
>                    ;; program, for example `iex -S mix`, so we should not wrap
>                    ;; mix into shell script.
>                    (substitute* (string-append out "/bin/mix")
> -                    (("Mix.start\\(\\)")
> +                    (("Mix.CLI.main\\(\\)")
>                       (format #f "\
>  ~~w[GUIX_ELIXIR_LIBS ERL_LIBS]
>  |> Enum.map(&System.get_env/1)
> @@ -144,7 +144,7 @@ (define-public elixir
>  |> Enum.join(\":\")
>  |> case do \"\" -> :ok; erl_libs -> System.put_env(\"ERL_LIBS\", erl_libs) end
>  System.put_env(\"MIX_REBAR3\", System.get_env(\"MIX_REBAR3\", \"~a\"))
> -Mix.start()"
> +Mix.CLI.main()"
>                               (search-input-file inputs "/bin/rebar3"))))
>                    (for-each
>                     (lambda (program)
>
> base-commit: 0f51ddd8dba6b69115d07f4a77ba70abb6521293

Hi Igor,

Thank you for the fixes and updates, applied, pushed as

https://git.savannah.gnu.org/cgit/guix.git/commit/?id=b3c8285127

Best regards,

Andrew Tropin

Closed

Your comment

This issue is archived.

To comment on this conversation send an email to 71707@debbugs.gnu.org

To respond to this issue using the mumi CLI, first switch to it

mumi current 71707

Then, you may apply the latest patchset in this issue (with sign off)

mumi am -- -s

Or, compose a reply to this issue

mumi compose

Or, send patches to this issue

mumi send-email *.patch

You may also tag this issue. See list of standard tags. For example, to set the confirmed and easy tags

mumi command -t +confirmed -t +easy

Or, remove the moreinfo tag and set the help tag

mumi command -t -moreinfo -t +help

is:open	open issues
is:done	closed issues
submitter:<who>	search issue submitter
author:<who>	search by message author
date:yesterday..now	search by issue date
mdate:3m..2d	search by message date