GNU bug report logs - #57510
[PATCH 0/3] Update git.

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 57510 in the body.
You can then email your comments to 57510 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: Greg Hogan <code <at> greghogan.com>
To: guix-patches <at> gnu.org
Cc: Greg Hogan <code <at> greghogan.com>
Subject: [PATCH 0/3] Update git.
Date: Wed, 31 Aug 2022 19:33:06 +0000

This patchset updates git and fixes two builds.

Greg Hogan (3):
  gnu: git: Update to 2.37.3.
  gnu: src: Update to 1.29.
  gnu: orange: Fix QT_PLUGIN_PATH.

 gnu/packages/orange.scm          |  2 +-
 gnu/packages/version-control.scm | 13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

-- 
2.37.2

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

From: Greg Hogan <code <at> greghogan.com>
To: 57510 <at> debbugs.gnu.org
Cc: Greg Hogan <code <at> greghogan.com>
Subject: [PATCH 1/3] gnu: git: Update to 2.37.3.
Date: Wed, 31 Aug 2022 19:34:48 +0000

* gnu/packages/version-control.scm (git): Update to 2.37.3.
---
 gnu/packages/version-control.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 82df12b55a..e0398cc9a4 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -221,14 +221,14 @@ (define git-cross-configure-flags
 (define-public git
   (package
    (name "git")
-   (version "2.37.2")
+   (version "2.37.3")
    (source (origin
             (method url-fetch)
             (uri (string-append "mirror://kernel.org/software/scm/git/git-"
                                 version ".tar.xz"))
             (sha256
              (base32
-              "00xhdm086bxm4v2p8m7ra7vf9kwdppw4l2n3vakfff253j19qg8w"))))
+              "0yp8hdj0w18jhmmdflzz74z418cw95i08pc22yycyn8nyvbl2il1"))))
    (build-system gnu-build-system)
    (native-inputs
     `(("native-perl" ,perl)
@@ -248,7 +248,7 @@ (define-public git
                 version ".tar.xz"))
           (sha256
            (base32
-            "1zhn91fzyyz890a5hm0bvs0vnhy8c81q1fhsk2gfwbbh73z161nz"))))
+            "053lj9wy8y2yr5jzpb0af4w50gz3ckhgc15wqx7is4z6k9a76lww"))))
       ;; For subtree documentation.
       ("asciidoc" ,asciidoc)
       ("docbook-xsl" ,docbook-xsl)
-- 
2.37.2

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

From: Greg Hogan <code <at> greghogan.com>
To: 57510 <at> debbugs.gnu.org
Cc: Greg Hogan <code <at> greghogan.com>
Subject: [PATCH 2/3] gnu: src: Update to 1.29.
Date: Wed, 31 Aug 2022 19:34:49 +0000

* gnu/packages/version-control.scm (src): Update to 1.29.
[inputs]: Add cssc.
---
 gnu/packages/version-control.scm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index e0398cc9a4..b40b97efc0 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -2846,14 +2846,14 @@ (define-public gource
 (define-public src
   (package
     (name "src")
-    (version "1.18")
+    (version "1.29")
     (source (origin
               (method url-fetch)
               (uri (string-append
                     "http://www.catb.org/~esr/src/src-" version ".tar.gz"))
               (sha256
                (base32
-                "0n0skhvya8w2az45h2gsafxy8m2mvqas64nrgxifcmrzfv0rf26c"))))
+                "0ha287gc95vz6bdvn42pi3qibc56h1w5dshsvjvdn2zd283amksd"))))
     (build-system gnu-build-system)
     (arguments
      '(#:make-flags
@@ -2879,7 +2879,8 @@ (define-public src
      ;; For testing.
      (list git perl))
     (inputs
-     `(("python" ,python-wrapper)
+     `(("cssc" ,cssc)
+       ("python" ,python-wrapper)
        ("rcs" ,rcs)))
     (synopsis "Simple revision control")
     (home-page "http://www.catb.org/~esr/src/")
-- 
2.37.2

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

From: Greg Hogan <code <at> greghogan.com>
To: 57510 <at> debbugs.gnu.org
Cc: Greg Hogan <code <at> greghogan.com>
Subject: [PATCH 3/3] gnu: orange: Fix QT_PLUGIN_PATH.
Date: Wed, 31 Aug 2022 19:34:50 +0000

* gnu/packages/orange.scm (orange)[arguments]: Fix QT_PLUGIN_PATH.
---
 gnu/packages/orange.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/orange.scm b/gnu/packages/orange.scm
index 367c9cc288..0b8a642014 100644
--- a/gnu/packages/orange.scm
+++ b/gnu/packages/orange.scm
@@ -137,7 +137,7 @@ (define-public orange
              (let ((out (assoc-ref outputs "out")))
                (wrap-program (string-append out "/bin/orange-canvas")
                  `("QT_PLUGIN_PATH" prefix
-                   ,(list (string-append (assoc-ref inputs "qtsvg-5")
+                   ,(list (string-append (assoc-ref inputs "qtsvg")
                                          "/lib/qt5/plugins/"))))))))))
     (native-inputs
      (list python-cython))
-- 
2.37.2

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

From: Ludovic Courtès <ludo <at> gnu.org>
To: Greg Hogan <code <at> greghogan.com>
Cc: 57510-done <at> debbugs.gnu.org
Subject: Re: bug#57510: [PATCH 0/3] Update git.
Date: Tue, 06 Sep 2022 16:56:55 +0200

Hi,

Greg Hogan <code <at> greghogan.com> skribis:

>   gnu: git: Update to 2.37.3.
>   gnu: src: Update to 1.29.
>   gnu: orange: Fix QT_PLUGIN_PATH.

Applied, thanks!

Ludo’.

Previous Next

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