Merge branch 'master' into core-updates

This commit is contained in:
Marius Bakke 2022-06-27 19:23:48 +02:00
commit 2a7648774f
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
108 changed files with 4080 additions and 1733 deletions

View file

@ -50,6 +50,7 @@
;;; Copyright © 2022 Simon South <simon@simonsouth.net>
;;; Copyright © 2022 Pierre Langlois <pierre.langlois@gmx.com>
;;; Copyright © 2022 Petr Hodina <phodina@protonmail.com>
;;; Copyright © 2022 Manolis Fragkiskos Ragkousis <manolis837@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -184,6 +185,33 @@ oriented, reliable transport protocol with direct support for multihoming that
runs on top of IP or UDP, and supports both v4 and v6 versions.")
(license license:bsd-3)))
(define-public arp-scan
(package
(name "arp-scan")
(version "1.9.7")
(source
(origin
(method git-fetch)
(uri
(git-reference
(url "https://github.com/royhills/arp-scan/")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "1mf7a4f9vzvnkiavc87aqyciswggsb4fpy7j05jxnvjyyxv3l7gp"))))
(build-system gnu-build-system)
(inputs
(list libpcap))
(native-inputs
(list autoconf automake libtool pkg-config))
(propagated-inputs
(list perl-libwww))
(home-page "https://github.com/royhills/arp-scan")
(synopsis "Discover and fingerprint IP hosts on the local network using ARP")
(description "Arp-scan is a tool that uses ARP to discover and fingerprint
IP hosts on the local network.")
(license license:gpl3+)))
(define-public axel
(package
(name "axel")
@ -216,33 +244,37 @@ protocols.")
(define-public libcamera
(package
(name "libcamera")
(version "0.0.0")
(version "0.0.0-1")
(source
(origin
(method git-fetch)
(uri
(git-reference
(url "git://linuxtv.org/libcamera.git")
(commit "74c8b508338ccdd0780aa1e067a1e8fcb9ee326b")))
(commit "10be87fa7c3bfb097b21ca3d469c67e40c333f7e")))
(file-name
(git-file-name name version))
(sha256
(base32 "0d9lp8b9gyxh4jwfh55kp8zl1xyyg32z684v3y29378zpksncss1"))))
(base32 "0qgirhlalmk9f9v6piwz50dr2asb64rvbb9zb1vix7y9zh7m11by"))))
(build-system meson-build-system)
(outputs '("out" "doc"))
(arguments
`(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas
#:configure-flags
(list
"-Dv4l2=true")
"-Dv4l2=true"
;; XXX: Requires bundled pybind11.
"-Dpycamera=disabled")
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'disable-failing-tests
(lambda _
(substitute* "test/meson.build"
(("\\['list-cameras', 'list-cameras.cpp'\\],")
""))
#t))
"")
;; TODO: Why do the gstreamer tests fail.
(("^subdir\\('gstreamer'\\)")
""))))
(add-after 'install 'move-doc
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
@ -250,24 +282,26 @@ protocols.")
(mkdir-p (string-append doc "/share"))
(rename-file
(string-append out "/share/doc")
(string-append doc "/share/doc"))
#t))))))
(string-append doc "/share/doc"))))))))
(native-inputs
`(("dot" ,graphviz)
("doxygen" ,doxygen)
("pkg-config" ,pkg-config)
("python" ,python-wrapper)
("sphinx" ,python-sphinx)
("yaml" ,python-pyyaml)))
(list graphviz ;for 'dot'
doxygen
pkg-config
python-wrapper
python-sphinx
python-pyyaml))
(inputs
`(("boost" ,boost)
("glib" ,glib)
("gstreamer" ,gst-plugins-base)
("gnutls" ,gnutls)
("libtiff" ,libtiff)
("openssl" ,openssl)
("qt5" ,qtbase-5)
("udev" ,eudev)))
(list boost
eudev
glib
gst-plugins-base
gnutls
libtiff
libyaml
openssl
python-jinja2
python-ply
qtbase-5))
(synopsis "Camera stack and framework")
(description "LibCamera is a complex camera support library for GNU+Linux,
Android, and ChromeOS.")
@ -1744,8 +1778,8 @@ handling network namespaces in Go.")
(define-public go-sctp
;; docker-libnetwork-cmd-proxy requires this exact commit.
;; This commit is mentioned in docker-libnetwork-cmd-proxy's vendor.conf.
(let ((commit "6e2cb1366111dcf547c13531e3a263a067715847")
(revision "2"))
(let ((commit "f2269e66cdee387bd321445d5d300893449805be")
(revision "3"))
(package
(name "go-sctp")
(version (git-version "0.0.0" revision commit))
@ -1757,7 +1791,7 @@ handling network namespaces in Go.")
(file-name (git-file-name name version))
(sha256
(base32
"1ba90fmpdwxa1ba4hrsjhi3gfy3pwmz7x8amw1p5dc9p5a7nnqrb"))))
"04463rnn9y9psp11ac5di6wrwxlhymw5h9hfhhhnxqwla90ikp0g"))))
(build-system go-build-system)
(arguments
`(#:tests? #f ; Test suite is flakey.