diff mbox series

[bug#57916,core-updates] gnu: xkeyboard-config: Switch to Github repo.

Message ID CAFHYt55FzOSwg1cTtCEDNEM9Ch-22eH1F5=Rj3pEvqTk+nFJLg@mail.gmail.com
State Accepted
Headers show
Series [bug#57916,core-updates] gnu: xkeyboard-config: Switch to Github repo. | expand

Checks

Context Check Description
cbaines/applying patch fail View Laminar job
cbaines/issue success View issue

Commit Message

Felix Lechner Sept. 18, 2022, 5:01 p.m. UTC 
Hi,

In continuation to Bug#57872, switch to the Github repo that is
archived on Software Heritage, plus there is an automatic updater.

Kind regards,
Felix Lechner

Comments

M Sept. 18, 2022, 9:36 p.m. UTC | #1 
On 18-09-2022 19:01, Felix Lechner via Guix-patches via wrote:
> In continuation to Bug#57872, switch to the Github repo that is
> archived on Software Heritage, plus there is an automatic updater.

We do have an automatic updater: %xorg-updater.
Somehow, it is not currently used, but maybe that's just a matter of 
switching from the ftp:// URL to an appropriate mirror://.

If there is an appropriate mirror://, likely there is a HTTP or HTTPS 
among the mirrors than Software Heritage will be able to pick up.

Greetings,
Maxime.
Felix Lechner Sept. 18, 2022, 9:49 p.m. UTC | #2 
Hi,

On Sun, Sep 18, 2022 at 2:36 PM Maxime Devos <maximedevos@telenet.be> wrote:
>
> If there is an appropriate mirror://, likely there is a HTTP or HTTPS
> among the mirrors than Software Heritage will be able to pick up.

Due to email difficulties, I saw only now that mbakke already picked a
different mirror. [1] I am therefore closing this issue.

Kind regards
Felix Lechner

[1] https://issues.guix.gnu.org/57872#1
diff mbox series

Patch

From 5cf57a3b044e77df3630f3c503f112f418f74529 Mon Sep 17 00:00:00 2001
From: Felix Lechner <felix.lechner@lease-up.com>
Date: Fri, 16 Sep 2022 10:36:36 -0700
Subject: [PATCH] gnu: xkeyboard-config: Switch to Github repo.

* gnu/packages/xorg.scm (xkeyboard-config): Switch to the Github repo
that is archived on Software Heritage, plus there is an automatic
updater.
---
 gnu/packages/xorg.scm | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 6c5bea8669..3e021483b9 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -3882,18 +3882,14 @@  (define-public xkeyboard-config
     (name "xkeyboard-config")
     (version "2.36")
     (source (origin
-              (method url-fetch)
-              (uri (string-append
-                    "ftp://ftp.freedesktop.org/pub/xorg/individual/data/"
-                    name
-                    "/"
-                    name
-                    "-"
-                    version
-                    ".tar.xz"))
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/freedesktop/xkeyboard-config")
+                    (commit (string-append name "-" version))))
+              (file-name (git-file-name name version))
               (sha256
                (base32
-                "158m7r6ga7w12ry35q6d0z6hilbpj9h7ilw56h55478n58lv26qz"))))
+                "0qmfcvcg1jmzfk6xpcdg14gwy83hqw0k16z96p7f5np11xn2jyvy"))))
     (build-system meson-build-system)
     (inputs (list libx11 xkbcomp-intermediate))
     (native-inputs (list gettext-minimal perl pkg-config python))

base-commit: ce3b51a4c6bef22e35ca04a945917510627fc3a7
prerequisite-patch-id: 9fa0dad649e0ed0995a7188480e6c021fb19e121
prerequisite-patch-id: 1d4299c099ce538972011c5a09ff47e65626f5c0
-- 
2.37.3