Merge branch 'master' into core-updates-frozen

1 files changed, 2 insertions, 88 deletions

diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index 1ef872ffe1..a3b1182101 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -706,9 +706,6 @@ is not available for Guile 2.0.")
     (name "guile2.2-fibers")
     (inputs `(("guile" ,guile-2.2)))))
 
-(define-public guile3.0-fibers
-  (deprecated-package "guile3.0-fibers" guile-fibers))
-
 (define-public guile-filesystem
   (package
     (name "guile-filesystem")
@@ -811,9 +808,6 @@ HTML (via SXML) or any other format for rendering.")
     (name "guile2.2-syntax-highlight")
     (inputs `(("guile" ,guile-2.2)))))
 
-(define-public guile3.0-syntax-highlight
-  (deprecated-package "guile3.0-syntax-highlight" guile-syntax-highlight))
-
 (define-public guile-sjson
   (package
     (name "guile-sjson")
@@ -899,9 +893,6 @@ using Guile's foreign function interface.")
                      ,@(alist-delete "guile"
                                      (package-native-inputs guile-squee))))))
 
-(define-public guile3.0-squee
-  (deprecated-package "guile3.0-squee" guile-squee))
-
 (define-public guile-colorized
   (package
     (name "guile-colorized")
@@ -930,9 +921,6 @@ using Guile's foreign function interface.")
     (name "guile2.2-colorized")
     (native-inputs `(("guile" ,guile-2.2)))))
 
-(define-public guile3.0-colorized
-  (deprecated-package "guile3.0-colorized" guile-colorized))
-
 (define-public guile-pfds
   (package
     (name "guile-pfds")
@@ -1094,9 +1082,6 @@ types are supported.")
                          (find-files "." "\\.sls$"))
                #t))))))))
 
-(define-public guile3.0-pfds
-  (deprecated-package "guile3.0-pfds" guile-pfds))
-
 (define-public guile-aa-tree
   (package
     (name "guile-aa-tree")
@@ -1162,9 +1147,6 @@ messaging library.")
     (name "guile2.2-simple-zmq")
     (native-inputs `(("guile" ,guile-2.2)))))
 
-(define-public guile3.0-simple-zmq
-  (deprecated-package "guile3.0-simple-zmq" guile-simple-zmq))
-
 (define-public jupyter-guile-kernel
   (let ((commit "f25fb90b95529b17a006a807bd04e6aee12ea304")
         (revision "2"))
@@ -1361,9 +1343,6 @@ format.")
     (inputs `(("guile" ,guile-2.2)
               ,@(alist-delete "guile" (package-inputs guile-email))))))
 
-(define-public guile3.0-email
-  (deprecated-package "guile3.0-email" guile-email))
-
 (define-public guile-newt
   (package
     (name "guile-newt")
@@ -1403,9 +1382,6 @@ Scheme by using Guile’s foreign function interface.")
     (inputs `(("guile" ,guile-2.2)
               ,@(alist-delete "guile" (package-inputs guile-newt))))))
 
-(define-public guile3.0-newt
-  (deprecated-package "guile3.0-newt" guile-newt))
-
 (define-public guile-mastodon
   (let ((commit "74b75bcf547df92acee1e0466ecd7ec07f775392")
         (revision "1"))
@@ -1483,9 +1459,6 @@ written in pure Scheme by using Guile's foreign function interface.")
     (propagated-inputs
      `(("guile-bytestructures" ,guile2.2-bytestructures)))))
 
-(define-public guile3.0-parted
-  (deprecated-package "guile3.0-parted" guile-parted))
-
 (define-public guile-xosd
   (package
     (name "guile-xosd")
@@ -1706,9 +1679,6 @@ above command-line parameters.")
     (inputs `(("guile" ,guile-2.2)
               ,@(alist-delete "guile" (package-inputs guile-config))))))
 
-(define-public guile3.0-config
-  (deprecated-package "guile3.0-config" guile-config))
-
 (define-public guile-hall
   (package
     (name "guile-hall")
@@ -1798,9 +1768,6 @@ provides tight coupling to Guix.")
        ,@(alist-delete "guile-config"
                        (package-propagated-inputs guile-hall))))))
 
-(define-public guile3.0-hall
-  (deprecated-package "guile3.0-hall" guile-hall))
-
 (define-public guile-ics
   (package
     (name "guile-ics")
@@ -1852,9 +1819,6 @@ The library is shipped with documentation in Info format and usage examples.")
               ,@(alist-delete "guile" (package-inputs guile-ics))))
     (propagated-inputs `(("guile-lib" ,guile2.2-lib)))))
 
-(define-public guile3.0-ics
-  (deprecated-package "guile3.0-ics" guile-ics))
-
 (define-public guile-imanifest
   (let ((commit "ccd5a2111b008d778106f5595a3a585954d95d0")
         (revision "0"))
@@ -1972,9 +1936,6 @@ users and in some situations.")
     (name "guile2.2-wisp")
     (inputs `(("guile" ,guile-2.2)))))
 
-(define-public guile3.0-wisp
-  (deprecated-package "guile3.0-wisp" guile-wisp))
-
 (define-public guile-udev
   (package
     (name "guile-udev")
@@ -2338,9 +2299,6 @@ library.")
     (inputs `(("ncurses" ,ncurses)
               ("guile" ,guile-2.2)))))
 
-(define-public guile3.0-ncurses
-  (deprecated-package "guile3.0-ncurses" guile-ncurses))
-
 (define-public guile-ncurses/gpm
   (package
     (inherit guile-ncurses)
@@ -2348,13 +2306,6 @@ library.")
     (inputs `(("ncurses" ,ncurses/gpm)
               ("guile" ,guile-3.0)))))
 
-(define-public guile3.0-ncurses/gpm
-  (package
-    (inherit guile3.0-ncurses)
-    (name "guile3.0-ncurses-with-gpm")
-    (inputs `(("ncurses" ,ncurses/gpm)
-              ("guile" ,guile-3.0)))))
-
 (define-public guile-lib
   (package
     (name "guile-lib")
@@ -2450,9 +2401,6 @@ for Guile\".  It provides the following modules:
      (alist-replace "guile" (list guile-2.2)
                     (package-inputs guile-lib)))))
 
-(define-public guile3.0-lib
-  (deprecated-package "guile3.0-lib" guile-lib))
-
 (define-public guile-minikanren
   (package
     (name "guile-minikanren")
@@ -2495,9 +2443,6 @@ See http://minikanren.org/ for more on miniKanren generally.")
     (name "guile2.2-minikanren")
     (native-inputs `(("guile" ,guile-2.2)))))
 
-(define-public guile3.0-minikanren
-  (deprecated-package "guile3.0-minikanren" guile-minikanren))
-
 (define-public guile-irregex
   (package
     (name "guile-irregex")
@@ -2550,9 +2495,6 @@ inspired by the SCSH regular expression system.")
     (name "guile2.2-irregex")
     (native-inputs `(("guile" ,guile-2.2)))))
 
-(define-public guile3.0-irregex
-  (deprecated-package "guile3.0-irregex" guile-irregex))
-
 (define-public haunt
   (package
     (name "haunt")
@@ -2637,9 +2579,6 @@ interface for reading articles in any format.")
     (name "guile2.0-haunt")
     (inputs `(("guile" ,guile-2.0)))))
 
-(define-public guile3.0-haunt
-  (deprecated-package "guile3.0-haunt" haunt))
-
 (define-public guile-redis
   (package
     (name "guile-redis")
@@ -2755,9 +2694,6 @@ is no support for parsing block and inline level HTML.")
     (name "guile2.0-commonmark")
     (inputs `(("guile" ,guile-2.0)))))
 
-(define-public guile3.0-commonmark
-  (deprecated-package "guile3.0-commonmark" guile-commonmark))
-
 (define-public mcron
   (package
     (name "mcron")
@@ -2808,9 +2744,6 @@ format is also supported.")
     (name "guile2.2-mcron")
     (inputs `(("guile" ,guile-2.2)))))
 
-(define-public guile3.0-mcron
-  (deprecated-package "guile3.0-mcron" mcron))
-
 (define-public guile-picture-language
   (let ((commit "a1322bf11945465241ca5b742a70893f24156d12")
         (revision "5"))
@@ -2856,10 +2789,6 @@ The picture values can directly be displayed in Geiser.")
      `(("guile-cairo" ,guile2.2-cairo)
        ("guile-rsvg" ,guile2.2-rsvg)))))
 
-(define-public guile3.0-picture-language
-  (deprecated-package "guile3.0-picture-language"
-                      guile-picture-language))
-
 (define-public guile-studio
   (let ((commit "dd0ad42e51feafebda7cc29afe7c8bc7a182a842")
         (revision "1"))
@@ -3211,9 +3140,6 @@ pre-alpha code.")
      `(("guile" ,guile-2.2)
        ,@(alist-delete "guile" (package-inputs guile-gi))))))
 
-(define-public guile3.0-gi
-  (deprecated-package "guile3.0-gi" guile-gi))
-
 (define-public guile-srfi-89
   (package
     (name "guile-srfi-89")
@@ -3797,9 +3723,6 @@ comparing, and writing Semantic Versions.  It also includes ranges in
 the style of the Node Package Manager (NPM).")
     (license license:gpl3+)))
 
-(define-public guile3.0-semver
-  (deprecated-package "guile3.0-semver" guile-semver))
-
 (define-public guile2.2-semver
   (package
     (inherit guile-semver)
@@ -3865,9 +3788,6 @@ SHA-512).")
     (native-inputs
      `(("guile" ,guile-2.2)))))
 
-(define-public guile3.0-hashing
-  (deprecated-package "guile3.0-hashing" guile-hashing))
-
 (define-public guile-packrat
   (package
     (name "guile-packrat")
@@ -4117,9 +4037,6 @@ models and also supports a rich set of boolean query operators.")
      `(("guile" ,guile-2.2)
        ,@(alist-delete "guile" (package-inputs guile-xapian))))))
 
-(define-public guile3.0-xapian
-  (deprecated-package "guile3.0-xapian" guile-xapian))
-
 (define-public guile-torrent
   (package
     (name "guile-torrent")
@@ -4214,9 +4131,6 @@ WebSocket protocol as defined by RFC 6455.")
       (home-page "https://git.dthompson.us/guile-websocket.git")
       (license license:lgpl3+))))
 
-(define-public guile3.0-websocket
-  (deprecated-package "guile3.0-websocket" guile-websocket))
-
 (define-public guile-rdf
   (package
     (name "guile-rdf")
@@ -4861,7 +4775,7 @@ locations.")
 (define-public guile-netlink
   (package
     (name "guile-netlink")
-    (version "1.0.1")
+    (version "1.1")
     (source
      (origin
        (method git-fetch)
@@ -4871,7 +4785,7 @@ locations.")
        (file-name (git-file-name name version))
        (sha256
         (base32
-         "03zmsha2d7whlwb52gna83jdas9bqi18rq3sss7kkicv814qb35g"))))
+         "1x1rx6agjdah56r50cfs41vyvycydyjdq0plq3jxgvl1q2dar1gw"))))
     (build-system gnu-build-system)
     (arguments
      `(#:tests? #f)); no tests