unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
* [bug#46572] [PATCH] gnu: Add usync.
@ 2021-02-16 22:15 Stefan Reichör
  0 siblings, 0 replies; 9+ messages in thread
From: Stefan Reichör @ 2021-02-16 22:15 UTC (permalink / raw)
  To: 46572; +Cc: Stefan Reichör

* gnu/packages/sync.scm (usync): New variable.
---
 gnu/packages/sync.scm | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/gnu/packages/sync.scm b/gnu/packages/sync.scm
index f3d6e9013c..8715690483 100644
--- a/gnu/packages/sync.scm
+++ b/gnu/packages/sync.scm
@@ -6,6 +6,7 @@
 ;;; Copyright © 2018, 2019, 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
 ;;; Copyright © 2019 Clément Lassieur <clement@lassieur.org>
 ;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
+;;; Copyright © 2021 Stefan Reichör <stefan@xsteve.at>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -25,6 +26,7 @@
 (define-module (gnu packages sync)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix build-system cmake)
+  #:use-module (guix build-system copy)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system go)
   #:use-module (guix build-system meson)
@@ -46,6 +48,7 @@
   #:use-module (gnu packages kde-frameworks)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages lua)
+  #:use-module (gnu packages ocaml)
   #:use-module (gnu packages pcre)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages pkg-config)
@@ -53,6 +56,7 @@
   #:use-module (gnu packages readline)
   #:use-module (gnu packages rsync)
   #:use-module (gnu packages selinux)
+  #:use-module (gnu packages shells)
   #:use-module (gnu packages sphinx)
   #:use-module (gnu packages sqlite)
   #:use-module (gnu packages tls))
@@ -315,6 +319,37 @@ comparatively easy to install not requiring new file systems or block devices
 and does not hamper local file system performance.")
     (license license:gpl2+)))
 
+(define-public usync
+  (let ((revision "1")
+        (commit "09a8059a1adc22666d3ecf7872e22e6846c3ac9e"))
+    (package
+      (name "usync")
+      (version (git-version "0" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/ebzzry/usync")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "16i1q8f0jmfd43rb8d70l2b383vr5ib4kh7iq3yd345q7xjz9c2j"))))
+      (build-system copy-build-system)
+      (propagated-inputs
+       `(("scsh" ,scsh)
+         ("rsync" ,rsync)
+         ("unison" ,unison)))
+      (arguments
+       `(#:install-plan
+         '(("usync" "bin/usync"))))
+      (home-page "https://github.com/ebzzry/usync")
+      (synopsis "Command line site-to-site synchronization tool")
+      (description
+       "@command{usync} is a simple site-to-site synchronization program
+written in @command{scsh}.  It makes use of @command{unison} and
+@command{rsync} for bi- and uni-directional synchronizations.")
+      (license license:expat))))
+
 (define-public casync
   (package
     (name "casync")
-- 
2.25.1





^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [bug#46672] [PATCH] gnu: mesa: Update to 20.3.4.
@ 2021-02-20 22:50 Milkey Mouse
  2021-02-25 17:10 ` [bug#46672] [PATCH] gnu: Add usync Léo Le Bouter via Guix-patches via
                   ` (4 more replies)
  0 siblings, 5 replies; 9+ messages in thread
From: Milkey Mouse @ 2021-02-20 22:50 UTC (permalink / raw)
  To: 46672

* gnu/packages/patches/X: Adjust.
* gnu/packages/gl.scm (mesa): Update to 20.3.4.
[arguments]<#:configure-flags>: Remove deprecated platforms.
---
 gnu/packages/gl.scm                        |  6 +++---
 gnu/packages/patches/mesa-skip-tests.patch | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index e378474147..7eb47db4fc 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -235,7 +235,7 @@ also known as DXTn or DXTC) for Mesa.")
 (define-public mesa
   (package
     (name "mesa")
-    (version "20.2.4")
+    (version "20.3.4")
     (source
       (origin
         (method url-fetch)
@@ -247,7 +247,7 @@ also known as DXTn or DXTC) for Mesa.")
                                   version "/mesa-" version ".tar.xz")))
         (sha256
          (base32
-          "14m09bk7akj0k02lg8fhvvzbdsashlbdsgl2cw7wbqfj2mhdqwh5"))
+          "1120kf280hg4h0a2505vxf6rdw8r2ydl3cg4iwkmpx0zxj3sj8fw"))
         (patches
          (search-patches "mesa-skip-tests.patch"))))
     (build-system meson-build-system)
@@ -301,7 +301,7 @@ also known as DXTn or DXTC) for Mesa.")
               '("-Dgallium-drivers=iris,nouveau,r300,r600,radeonsi,svga,swrast,virgl")))
          ;; Enable various optional features.  TODO: opencl requires libclc,
          ;; omx requires libomxil-bellagio
-         "-Dplatforms=x11,drm,surfaceless,wayland"
+         "-Dplatforms=x11,wayland"
          "-Dglx=dri"        ;Thread Local Storage, improves performance
          ;; "-Dopencl=true"
          ;; "-Domx=true"
diff --git a/gnu/packages/patches/mesa-skip-tests.patch b/gnu/packages/patches/mesa-skip-tests.patch
index 2622d5d312..9c0c531189 100644
--- a/gnu/packages/patches/mesa-skip-tests.patch
+++ b/gnu/packages/patches/mesa-skip-tests.patch
@@ -5,7 +5,7 @@ for now.
 
 --- a/src/compiler/glsl/tests/cache_test.c
 +++ b/src/compiler/glsl/tests/cache_test.c
-@@ -170,11 +170,6 @@
+@@ -212,11 +212,6 @@ test_disk_cache_create(void)
     unsetenv("MESA_GLSL_CACHE_DIR");
     unsetenv("XDG_CACHE_HOME");
  
@@ -14,9 +14,9 @@ for now.
 -
 -   disk_cache_destroy(cache);
 -
-    /* Test with XDG_CACHE_HOME set */
-    setenv("XDG_CACHE_HOME", CACHE_TEST_TMP "/xdg-cache-home", 1);
-    cache = disk_cache_create("test", "make_check", 0);
+ #ifdef ANDROID
+    /* Android doesn't try writing to disk (just calls the cache callbacks), so
+     * the directory tests below don't apply.
 
 This test fails on i686-linux. I couldn't come up with a regex that
 could be used to disable it just on i686-linux, so we disable it
@@ -28,7 +28,7 @@ diff --git a/src/util/meson.build b/src/util/meson.build
 index 0893f64..909b3e0 100644
 --- a/src/util/meson.build
 +++ b/src/util/meson.build
-@@ -289,18 +289,6 @@ if with_tests
+@@ -320,18 +320,6 @@ if with_tests
       suite : ['util'],
    )   
  
-- 
2.30.1






^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [bug#46672] [PATCH] gnu: Add usync.
  2021-02-20 22:50 [bug#46672] [PATCH] gnu: mesa: Update to 20.3.4 Milkey Mouse
@ 2021-02-25 17:10 ` Léo Le Bouter via Guix-patches via
  2021-02-25 17:35   ` [bug#46572] " zimoun
  2021-02-25 17:44 ` [bug#46572] " Léo Le Bouter via Guix-patches via
                   ` (3 subsequent siblings)
  4 siblings, 1 reply; 9+ messages in thread
From: Léo Le Bouter via Guix-patches via @ 2021-02-25 17:10 UTC (permalink / raw)
  To: 46672

[-- Attachment #1: Type: text/plain, Size: 1996 bytes --]

Hello!

Somehow after applying your patch and running "$ ./pre-inst-env guix
lint usync" the following error appears, probably syntax error
somewhere, can't figure it out though, can you take a look?

I ran something like this to apply the patch on current GNU Guix master
(a2ece4da1fdccb9e94681e38a3f3a79b0d43e061):

$ curl https://issues.guix.gnu.org/issue/46572/raw/0 | git am

Backtrace:
In ice-9/boot-9.scm:
  1736:10 19 (with-exception-handler _ _ #:unwind? _ # _)
In guix/store.scm:
   636:37 18 (thunk)
   1305:8 17 (call-with-build-handler #<procedure 7f72e83a5360 at i…>
…)
In guix/scripts/build.scm:
    499:2 16 (_)
In srfi/srfi-1.scm:
   673:15 15 (append-map _ _ . _)
   586:17 14 (map1 ((argument . "usync") (build-mode . 0) (# . #t) …))
In guix/scripts/build.scm:
   519:30 13 (_ _)
In gnu/packages.scm:
    477:2 12 (%find-package "usync" "usync" #f)
    362:6 11 (find-best-packages-by-name _ _)
   292:55 10 (_ "usync" _)
In unknown file:
           9 (force #<promise #<procedure 7f72e82e9fc0 at gnu/packag…>)
In gnu/packages.scm:
   239:33  8 (fold-packages #<procedure 7f72e414cf18 at gnu/package…>
…)
In guix/discovery.scm:
   153:11  7 (all-modules _ #:warn _)
In srfi/srfi-1.scm:
   460:18  6 (fold #<procedure 7f72e83aa760 at guix/discovery.scm:1…>
…)
In guix/discovery.scm:
   143:19  5 (_ _ ())
In srfi/srfi-1.scm:
   691:23  4 (filter-map #<procedure 7f72e83aa740 at guix/discove…> .
#)
In guix/discovery.scm:
   118:22  3 (_ . _)
In ice-9/eval.scm:
    619:8  2 (_ #(#(#<directory (guix ui) 7f72e9e08500> (# "re…" …))))
In ice-9/boot-9.scm:
  1669:16  1 (raise-exception _ #:continuable? _)
  1669:16  0 (raise-exception _ #:continuable? _)

ice-9/boot-9.scm:1669:16: In procedure raise-exception:
Throw to key `match-error' with args `("match" "no matching pattern"
(unbound-variable "resolve-interface" "no binding `~A' in module ~A"
(python (gnu packages python)) #f))'.

Thank you!

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

^ permalink raw reply	[flat|nested] 9+ messages in thread

* [bug#46572] [bug#46672] [PATCH] gnu: Add usync.
  2021-02-25 17:10 ` [bug#46672] [PATCH] gnu: Add usync Léo Le Bouter via Guix-patches via
@ 2021-02-25 17:35   ` zimoun
  0 siblings, 0 replies; 9+ messages in thread
From: zimoun @ 2021-02-25 17:35 UTC (permalink / raw)
  To: Léo Le Bouter; +Cc: 46572

Hi Léo,

(Your email was for 46572@debbugs.gnu.org and not 46672@debbugs.gnu, right?)

Note that even "guix show" would return a backtrace.

The error you get comes from circular dependency, I guess.
If you comment both 'unison' and '#:use-module (gnu packages ocaml)',
then there is no backtrace.

To find the offending path and detect the cycle, a tool is still missing, AFAIK.


Hope that helps,
simon




^ permalink raw reply	[flat|nested] 9+ messages in thread

* [bug#46572] [PATCH] gnu: Add usync.
  2021-02-20 22:50 [bug#46672] [PATCH] gnu: mesa: Update to 20.3.4 Milkey Mouse
  2021-02-25 17:10 ` [bug#46672] [PATCH] gnu: Add usync Léo Le Bouter via Guix-patches via
@ 2021-02-25 17:44 ` Léo Le Bouter via Guix-patches via
  2021-02-26 13:30 ` [bug#46672] [PATCH] gnu: mesa: Update to 20.3.4 Léo Le Bouter via Guix-patches via
                   ` (2 subsequent siblings)
  4 siblings, 0 replies; 9+ messages in thread
From: Léo Le Bouter via Guix-patches via @ 2021-02-25 17:44 UTC (permalink / raw)
  To: 46572

[-- Attachment #1: Type: text/plain, Size: 1996 bytes --]

Hello!

Somehow after applying your patch and running "$ ./pre-inst-env guix
lint usync" the following error appears, probably syntax error
somewhere, can't figure it out though, can you take a look?

I ran something like this to apply the patch on current GNU Guix master
(a2ece4da1fdccb9e94681e38a3f3a79b0d43e061):

$ curl https://issues.guix.gnu.org/issue/46572/raw/0 | git am

Backtrace:
In ice-9/boot-9.scm:
  1736:10 19 (with-exception-handler _ _ #:unwind? _ # _)
In guix/store.scm:
   636:37 18 (thunk)
   1305:8 17 (call-with-build-handler #<procedure 7f72e83a5360 at i…>
…)
In guix/scripts/build.scm:
    499:2 16 (_)
In srfi/srfi-1.scm:
   673:15 15 (append-map _ _ . _)
   586:17 14 (map1 ((argument . "usync") (build-mode . 0) (# . #t) …))
In guix/scripts/build.scm:
   519:30 13 (_ _)
In gnu/packages.scm:
    477:2 12 (%find-package "usync" "usync" #f)
    362:6 11 (find-best-packages-by-name _ _)
   292:55 10 (_ "usync" _)
In unknown file:
           9 (force #<promise #<procedure 7f72e82e9fc0 at gnu/packag…>)
In gnu/packages.scm:
   239:33  8 (fold-packages #<procedure 7f72e414cf18 at gnu/package…>
…)
In guix/discovery.scm:
   153:11  7 (all-modules _ #:warn _)
In srfi/srfi-1.scm:
   460:18  6 (fold #<procedure 7f72e83aa760 at guix/discovery.scm:1…>
…)
In guix/discovery.scm:
   143:19  5 (_ _ ())
In srfi/srfi-1.scm:
   691:23  4 (filter-map #<procedure 7f72e83aa740 at guix/discove…> .
#)
In guix/discovery.scm:
   118:22  3 (_ . _)
In ice-9/eval.scm:
    619:8  2 (_ #(#(#<directory (guix ui) 7f72e9e08500> (# "re…" …))))
In ice-9/boot-9.scm:
  1669:16  1 (raise-exception _ #:continuable? _)
  1669:16  0 (raise-exception _ #:continuable? _)

ice-9/boot-9.scm:1669:16: In procedure raise-exception:
Throw to key `match-error' with args `("match" "no matching pattern"
(unbound-variable "resolve-interface" "no binding `~A' in module ~A"
(python (gnu packages python)) #f))'.

Thank you!

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

^ permalink raw reply	[flat|nested] 9+ messages in thread

* [bug#46672] [PATCH] gnu: mesa: Update to 20.3.4.
  2021-02-20 22:50 [bug#46672] [PATCH] gnu: mesa: Update to 20.3.4 Milkey Mouse
  2021-02-25 17:10 ` [bug#46672] [PATCH] gnu: Add usync Léo Le Bouter via Guix-patches via
  2021-02-25 17:44 ` [bug#46572] " Léo Le Bouter via Guix-patches via
@ 2021-02-26 13:30 ` Léo Le Bouter via Guix-patches via
  2021-04-08 21:26 ` [bug#46672] mesa 20.3.4 Vincent Legoll
  2021-04-08 21:26 ` [bug#46672] [PATCH] gnu: mesa: Update to 20.3.5 Vincent Legoll
  4 siblings, 0 replies; 9+ messages in thread
From: Léo Le Bouter via Guix-patches via @ 2021-02-26 13:30 UTC (permalink / raw)
  To: 46672

[-- Attachment #1: Type: text/plain, Size: 116 bytes --]

Sorry, ignore the previous email that was sent for here by mistake due
to typing out (wrong) bug number manually.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

^ permalink raw reply	[flat|nested] 9+ messages in thread

* [bug#46672] mesa 20.3.4
  2021-02-20 22:50 [bug#46672] [PATCH] gnu: mesa: Update to 20.3.4 Milkey Mouse
                   ` (2 preceding siblings ...)
  2021-02-26 13:30 ` [bug#46672] [PATCH] gnu: mesa: Update to 20.3.4 Léo Le Bouter via Guix-patches via
@ 2021-04-08 21:26 ` Vincent Legoll
  2021-04-08 21:26 ` [bug#46672] [PATCH] gnu: mesa: Update to 20.3.5 Vincent Legoll
  4 siblings, 0 replies; 9+ messages in thread
From: Vincent Legoll @ 2021-04-08 21:26 UTC (permalink / raw)
  To: 46672

This still builds OK on master, and following
this, I'll send 20.3.5 update that also builds
OK on current master.

But guix refresh -l tells me it's for core-updates.

Which is a kind of freeze now I think...

I'll revisit later then

-- 
Vincent Legoll




^ permalink raw reply	[flat|nested] 9+ messages in thread

* [bug#46672] [PATCH] gnu: mesa: Update to 20.3.5.
  2021-02-20 22:50 [bug#46672] [PATCH] gnu: mesa: Update to 20.3.4 Milkey Mouse
                   ` (3 preceding siblings ...)
  2021-04-08 21:26 ` [bug#46672] mesa 20.3.4 Vincent Legoll
@ 2021-04-08 21:26 ` Vincent Legoll
  2021-09-04 13:39   ` bug#46672: [PATCH] gnu: mesa: Update to 20.3.4 Brice Waegeneire
  4 siblings, 1 reply; 9+ messages in thread
From: Vincent Legoll @ 2021-04-08 21:26 UTC (permalink / raw)
  To: 46672; +Cc: Vincent Legoll

* gnu/packages/gl.scm (mesa): Update to 20.3.5.
---
 gnu/packages/gl.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index 437d270f05..b86f879465 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -235,7 +235,7 @@ also known as DXTn or DXTC) for Mesa.")
 (define-public mesa
   (package
     (name "mesa")
-    (version "20.3.4")
+    (version "20.3.5")
     (source
       (origin
         (method url-fetch)
@@ -247,7 +247,7 @@ also known as DXTn or DXTC) for Mesa.")
                                   version "/mesa-" version ".tar.xz")))
         (sha256
          (base32
-          "1120kf280hg4h0a2505vxf6rdw8r2ydl3cg4iwkmpx0zxj3sj8fw"))
+          "1klifqyr54q8ar8sncykgqllil98q1ma4i6g9j2c18yzcggp56lh"))
         (patches
          (search-patches "mesa-skip-tests.patch"))))
     (build-system meson-build-system)
-- 
2.31.0





^ permalink raw reply related	[flat|nested] 9+ messages in thread

* bug#46672: [PATCH] gnu: mesa: Update to 20.3.4.
  2021-04-08 21:26 ` [bug#46672] [PATCH] gnu: mesa: Update to 20.3.5 Vincent Legoll
@ 2021-09-04 13:39   ` Brice Waegeneire
  0 siblings, 0 replies; 9+ messages in thread
From: Brice Waegeneire @ 2021-09-04 13:39 UTC (permalink / raw)
  To: Vincent Legoll; +Cc: 46672-close, milkeymouse

Hello Vincent and Milkey,

Vincent Legoll <vincent.legoll@gmail.com> writes:

> * gnu/packages/gl.scm (mesa): Update to 20.3.5.

Thank for updating mesa!  Unfortunatly this patch as been supserseeded by the
commit 2c0013916e87acc90562dea167a6ff3e1dfee58e (curently on
corer-update-frozen) which update mesa to 21.1.6.  So I'm closing this issue.

Cheers,
- Brice




^ permalink raw reply	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2021-09-04 13:41 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-20 22:50 [bug#46672] [PATCH] gnu: mesa: Update to 20.3.4 Milkey Mouse
2021-02-25 17:10 ` [bug#46672] [PATCH] gnu: Add usync Léo Le Bouter via Guix-patches via
2021-02-25 17:35   ` [bug#46572] " zimoun
2021-02-25 17:44 ` [bug#46572] " Léo Le Bouter via Guix-patches via
2021-02-26 13:30 ` [bug#46672] [PATCH] gnu: mesa: Update to 20.3.4 Léo Le Bouter via Guix-patches via
2021-04-08 21:26 ` [bug#46672] mesa 20.3.4 Vincent Legoll
2021-04-08 21:26 ` [bug#46672] [PATCH] gnu: mesa: Update to 20.3.5 Vincent Legoll
2021-09-04 13:39   ` bug#46672: [PATCH] gnu: mesa: Update to 20.3.4 Brice Waegeneire
  -- strict thread matches above, loose matches on Subject: below --
2021-02-16 22:15 [bug#46572] [PATCH] gnu: Add usync Stefan Reichör

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).