[gnunet-scheme] 05/07: Eliminate guix.scm.

[gnunet]

This is an automated email from the git hooks/post-receive script.

maxime-devos pushed a commit to branch master
in repository gnunet-scheme.

commit 308cda1472486e833baca0ecde9aa4bef554da5c
Author: Maxime Devos <maximedevos@telenet.be>
AuthorDate: Sat Feb 5 18:34:45 2022 +0000

    Eliminate guix.scm.
    
    It's in Guix now!
    
    * guix.scm: Delete.
    * doc/scheme-gnunet.tm (Installation and contributing guide): Update
      instructions.
    
    Reported-by: zimoun <zimon.toutoune@gmail.com>
---
 doc/scheme-gnunet.tm |  11 +++---
 guix.scm             | 105 ---------------------------------------------------
 2 files changed, 5 insertions(+), 111 deletions(-)

diff --git a/doc/scheme-gnunet.tm b/doc/scheme-gnunet.tm
index f017a84..e7b9570 100644
--- a/doc/scheme-gnunet.tm
+++ b/doc/scheme-gnunet.tm
@@ -214,23 +214,22 @@
     and <hlink|automake|https://www.gnu.org/software/automake/>)
 
     <item><hlink|GNU Guile|https://www.gnu.org/software/guile/> (at least
-    version 3)
+    version 3), with the patch from 
<slink|https://debbugs.gnu.org/cgi/bugreport.cgi?bug=49623>
+    applied
 
     <item><hlink|Purely Functional Data Structures in Scheme
     (pfds)|https://github.com/ijp/pfds/>
 
-    <item><hlink|(Guile) Fibers|https://github.com/wingo/fibers/>
+    <item><hlink|(Guile) Fibers|https://github.com/wingo/fibers/>, with the
+    <slink|https://github.com/wingo/fibers/pull/50> patch
 
     
<item><hlink|Guile-QuickCheck|https://ngyro.com/software/guile-quickcheck.html>
 
     <item><hlink|Guile-Gcrypt|https://notabug.org/cwebber/guile-gcrypt>
   </itemize>
 
-  A few patches to guile and guile-fibers are required (some bug fixes, some
-  extra functionality), see <verbatim|guix.scm>.
-
   Users of <hlink|GNU Guix|https://guix.gnu.org><index|Guix> can run
-  <shell|guix environment -l guix.scm> in the checkout to create an
+  <shell|guix shell -D gnunet-scheme> in the checkout to create an
   environment where these dependencies are all
   present.<space|1em>Scheme-GNUnet uses the standard GNU build system, so to
   build Scheme-Gnunet, you only need to run
diff --git a/guix.scm b/guix.scm
deleted file mode 100644
index dd58a41..0000000
--- a/guix.scm
+++ /dev/null
@@ -1,105 +0,0 @@
-;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2021 GNUnet e.V.
-;;;
-;;; This file is part of GNU Guix.
-;;;
-;;; GNU Guix is free software; you can redistribute it and/or modify it
-;;; under the terms of the GNU General Public License as published by
-;;; the Free Software Foundation; either version 3 of the License, or (at
-;;; your option) any later version.
-;;;
-;;; GNU Guix is distributed in the hope that it will be useful, but
-;;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;;; GNU General Public License for more details.
-;;;
-;;; You should have received a copy of the GNU General Public License
-;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
-;;;
-;;;  SPDX-License-Identifier: GPL-3.0-or-later
-
-(use-modules (gnu packages guile)
-            (gnu packages guile-xyz)
-            (gnu packages autotools)
-            (gnu packages gettext)
-            (gnu packages gnupg)
-            (gnu packages pkg-config)
-            (gnu packages xorg)
-            (gnu packages text-editors)
-            (guix packages)
-            (guix utils)
-            (guix gexp)
-            (guix git)
-            (guix git-download)
-            (guix download)
-            (guix build-system gnu)
-            ((guix licenses) #:prefix license:))
-
-(define guile-3.0/fixed
-  (package
-    (inherit guile-3.0-latest)
-    (source
-     (origin
-       (inherit (package-source guile-3.0-latest))
-       (patches (list (local-file 
"0001-Fix-non-revealed-port-is-closed-ports.test.patch")
-                     (local-file "0001-ice-9-read-Parse-properly.patch")))))
-    (arguments
-     (substitute-keyword-arguments
-      (package-arguments guile-3.0-latest)
-      ;; Tests can take long to run.
-      ;; Also, it fails with
-      ;;   ERROR: web-server.test: GET / - arguments: ((system-error "connect" 
"~A" ("Connection refused") (111)))
-      ;; and likewise for /latin1, /user-agent and /does-not-exist.
-      ((#:tests? _) #f)))))
-
-;; This has some I/O patches (wait-until-port-readable-operation),
-;; see <https://github.com/wingo/fibers/pull/50>.
-(define-public guile-fibers/patched
-  (package
-   (inherit guile-fibers)
-   (source (origin
-            (method git-fetch)
-            (uri (git-reference
-                  (url "https://notabug.org/maximed/fibers";)
-                  (commit "4658b62b402e7d4920ab528da1b42835cea03429")))
-            (sha256
-             (base32 "1956rz411p3yf7a75z2k1hii88kmn25y2p32bw6w45yy8pynm1rg"))))
-   ;; Tests take a lot of time.
-   (arguments `(#:tests? #f))
-   (native-inputs
-    `(("autoconf" ,autoconf)
-      ("gettext" ,gettext-minimal)
-      ("libtool" ,libtool)
-      ("automake" ,automake)
-      ,@(package-native-inputs guile-fibers)))))
-
-(define %source-dir (dirname (current-filename)))
-
-(define-public scheme-gnunet
-  (package
-   (name "scheme-gnunet")
-   (version "0.2")
-   (source (local-file %source-dir
-                      #:recursive? #t
-                      #:select? (git-predicate %source-dir)))
-   (build-system gnu-build-system)
-   (propagated-inputs
-    (list guile-zlib guile-bytestructures guile-fibers/patched guile-gcrypt
-         guile-json-4 guile-pfds))
-   (native-inputs
-    (list guile-3.0/fixed guile-gcrypt guile-json-4 guile-pfds
-         automake
-         ;; Only used for testing.
-         guile-quickcheck
-          ;; Gettext brings 'AC_LIB_LINKFLAGS_FROM_LIBS'.
-         gettext-minimal
-         pkg-config
-         autoconf-wrapper
-         texmacs
-         xvfb-run))
-   (inputs (list guile-3.0/fixed))
-   (synopsis "partial Scheme port of GNUnet")
-   (license license:agpl3+)
-   (description #f)
-   (home-page #f)))
-scheme-gnunet

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.