From 28604cdc765b395442b1aed5d2ef0c3d134a5ac4 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 7 Oct 2021 08:47:54 +0200
Subject: gnu: fet: Update to 6.1.8.

* gnu/packages/education.scm (fet): Update to 6.1.8.
---
 gnu/packages/education.scm | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'gnu/packages/education.scm')

diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm
index 2039347ddc..634420a905 100644
--- a/gnu/packages/education.scm
+++ b/gnu/packages/education.scm
@@ -653,14 +653,14 @@ Portuguese, Spanish and Italian.")
 (define-public fet
   (package
     (name "fet")
-    (version "6.0.4")
+    (version "6.1.8")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "https://www.lalescu.ro/liviu/fet/download/"
                            "fet-" version ".tar.bz2"))
        (sha256
-        (base32 "16yajwbvm2ain1p2h81qfm8pbrdp70zljck67j9yijwyr6xqdj2a"))))
+        (base32 "16m20vbhv8i7saxqb731bhds1f86d6x1f935j3ivg357805fqzll"))))
     (build-system gnu-build-system)
     (arguments
      `(#:phases
@@ -671,8 +671,7 @@ Portuguese, Spanish and Italian.")
                                 "src/src.pro"
                                 "src/src-cl.pro"
                                 "src/interface/fet.cpp")
-               (("/usr") (assoc-ref outputs "out")))
-             #t))
+               (("/usr") (assoc-ref outputs "out")))))
          (replace 'configure
            (lambda _ (invoke "qmake" "fet.pro"))))))
     (inputs
-- 
cgit v1.2.3


From e85ccc8b50f8ff76e4324be2cd11e4194470a6df Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Thu, 7 Oct 2021 12:16:32 +0200
Subject: gnu: fet: Add alternative URL for older source tarballs.

* gnu/packages/education.scm (fet)[source]: Add "old/" URL.
---
 gnu/packages/education.scm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'gnu/packages/education.scm')

diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm
index 634420a905..4f4de1a834 100644
--- a/gnu/packages/education.scm
+++ b/gnu/packages/education.scm
@@ -657,8 +657,10 @@ Portuguese, Spanish and Italian.")
     (source
      (origin
        (method url-fetch)
-       (uri (string-append "https://www.lalescu.ro/liviu/fet/download/"
-                           "fet-" version ".tar.bz2"))
+       (uri (let ((directory "https://www.lalescu.ro/liviu/fet/download/")
+                  (base (string-append "fet-" version ".tar.bz2")))
+              (list (string-append directory base)
+                    (string-append directory "old/" base))))
        (sha256
         (base32 "16m20vbhv8i7saxqb731bhds1f86d6x1f935j3ivg357805fqzll"))))
     (build-system gnu-build-system)
-- 
cgit v1.2.3