diff options
Diffstat (limited to 'gnu/packages/networking.scm')
| -rw-r--r-- | gnu/packages/networking.scm | 136 |
1 files changed, 67 insertions, 69 deletions
diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index c683ac6117..dd3c7485d0 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -256,7 +256,7 @@ protocols.") (define-public lcrq (package (name "lcrq") - (version "0.1.0") + (version "0.1.2") (source (origin (method git-fetch) (uri (git-reference @@ -265,7 +265,7 @@ protocols.") (file-name (git-file-name name version)) (sha256 (base32 - "13mfg866scvy557zrvjxjhkzam39h8d07s2w3fqbwhw6br6axkxk")))) + "1m29p4bsafzbchnkidyrnglfdf1c9pnq6akkmivi23qdv9kj51dg")))) (build-system gnu-build-system) (arguments `(#:parallel-tests? #f @@ -289,7 +289,7 @@ the RFC.") (define-public lcsync (package (name "lcsync") - (version "0.0.1") + (version "0.2.1") (source (origin (method git-fetch) (uri (git-reference @@ -298,45 +298,33 @@ the RFC.") (file-name (git-file-name name version)) (sha256 (base32 - "0s038b4xg9nlzhrganzjyfvc6n6cgd6kilnpik4axp62j2n5q11q")))) + "0bsd3dkir2i647nmrmyb7skbv16v0f6f3gfwkpxz8g42978dlms5")))) (build-system gnu-build-system) (arguments `(#:parallel-tests? #f + #:configure-flags + (list + (string-append "--prefix=" + (assoc-ref %outputs "out"))) #:make-flags (let ((target ,(%current-target-system))) (list ,(string-append "CC=" - (cc-for-target)) - ;; avoid running setcap in the install process - "SETCAP_PROGRAM=true" - (string-append "prefix=" - (assoc-ref %outputs "out")))) + (cc-for-target)))) #:test-target "test" #:phases (modify-phases %standard-phases - (delete 'configure) ;no configure script - (add-before 'check 'remove-network-tests + (add-after 'unpack 'use-prefix-from-configure-in-doc-makefile + ;; Use prefix from configure. Fixed upstream: + ;; https://codeberg.org/librecast/lcsync/commit/4ba00f6 + ;; XXX: Remove for 0.2.2+ (lambda _ - ;; these tests require networking - (delete-file "./test/0000-0027.c") - (delete-file "./test/0000-0049.c") - (delete-file "./test/0000-0074.c"))) - (add-after 'unpack 'remove-immintrin.h - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "Makefile" - (("CFLAGS :=") - (string-append "CFLAGS := -I" (search-input-directory - inputs "include/simde")))) - (substitute* (find-files "src") - ((".*immintrin\\.h.*") - (string-append "#include <simde-features.h>\n" - "#include <x86/ssse3.h>\n")) - (("__m128i") "simde__m128i")))) + (substitute* "doc/Makefile.in" + (("PREFIX .= /usr/local") "PREFIX ?= @prefix@")))) (add-before 'build 'add-library-paths (lambda* (#:key inputs #:allow-other-keys) (let* ((librecast (assoc-ref inputs "librecast"))) (substitute* (list "./src/Makefile" "./test/Makefile") (("-llibrecast") (string-append "-L" librecast "/lib -llibrecast"))))))))) - (inputs (list librecast libsodium)) - (native-inputs (list simde)) + (inputs (list lcrq librecast libsodium)) (home-page "https://librecast.net/lcsync.html") (synopsis "Librecast file and data syncing tool") (description @@ -487,7 +475,7 @@ GLib-based library, libnice, as well as GStreamer elements to use it.") (define-public librecast (package (name "librecast") - (version "0.6.1") + (version "0.7.0") (source (origin (method git-fetch) (uri (git-reference @@ -496,7 +484,7 @@ GLib-based library, libnice, as well as GStreamer elements to use it.") (file-name (git-file-name name version)) (sha256 (base32 - "1kixnm7pn8345wp0klhnpw5x992cqbqx3bhc01j8xhqf6irlzdm3")))) + "0y0km0fv39m3i227pyg7fcr7d94gbji51fkcywqyrjgmk4j1hp1n")))) (build-system gnu-build-system) (arguments `(#:parallel-tests? #f @@ -505,26 +493,7 @@ GLib-based library, libnice, as well as GStreamer elements to use it.") (cc-for-target)) (string-append "PREFIX=" (assoc-ref %outputs "out")))) - #:test-target "test" - #:phases (modify-phases %standard-phases - (add-before 'check 'remove-network-tests - (lambda _ - ;; these tests require networking - (delete-file "./test/0000-0010.c") - (delete-file "./test/0000-0012.c") - (delete-file "./test/0000-0013.c") - (delete-file "./test/0000-0014.c") - (delete-file "./test/0000-0015.c") - (delete-file "./test/0000-0016.c") - (delete-file "./test/0000-0018.c") - (delete-file "./test/0000-0019.c") - (delete-file "./test/0000-0021.c") - (delete-file "./test/0000-0028.c") - (delete-file "./test/0000-0036.c") - (delete-file "./test/0000-0037.c") - (delete-file "./test/0000-0038.c") - (delete-file "./test/0000-0039.c") - (delete-file "./test/0000-0040.c")))))) + #:test-target "test")) (inputs (list libsodium lcrq)) (synopsis "IPv6 multicast library") (description "Librecast is a C library which supports IPv6 multicast @@ -1505,6 +1474,26 @@ containing both Producer and Consumer support.") (base32 "0ay0n0d85254zdmv8znmn399gfiqpk6ga0jwdwa7ylpbw9pbdzw8")))) (build-system gnu-build-system) + (native-inputs + (if (%current-target-system) + (list pkg-config + libtool + gettext-minimal + autoconf automake) + '())) + (arguments + (if (%current-target-system) + (list #:phases + #~(modify-phases %standard-phases + ;; AC_FUNC_MALLOC and AC_FUNC_REALLOC usually unneeded + ;; see https://lists.gnu.org/archive/html/autoconf/2003-02/msg00017.html + (add-after 'unpack 'fix-rpl_malloc + (lambda _ + (substitute* "configure.ac" + (("AC_FUNC_MALLOC") "")) + ;; let bootstrap phase run. + (delete-file "./configure"))))) + '())) (home-page "https://libndp.org/") (synopsis "Library for Neighbor Discovery Protocol") (description @@ -4389,7 +4378,7 @@ network.") (define-public yggdrasil (package (name "yggdrasil") - (version "0.4.3") + (version "0.4.7") (source (origin (method git-fetch) @@ -4400,27 +4389,33 @@ network.") (recursive? #t))) (file-name (git-file-name name version)) (sha256 - (base32 "0jp6998a45xi8pbi8p84chvpm1mhhcvcxm1avi1c1gjjp4jqm3vl")) + (base32 "01mllfrsr55lnfivxwa57cfrjas6w4shsvx9k81pw8jixc124myk")) (patches (search-patches "yggdrasil-extra-config.patch")))) (build-system go-build-system) (arguments - '(#:import-path "github.com/yggdrasil-network/yggdrasil-go" - ;; TODO: figure out how tests are run - #:tests? #f - #:install-source? #f - #:phases - (modify-phases %standard-phases - (replace 'build - (lambda* (#:key import-path build-flags #:allow-other-keys) - (for-each - (lambda (directory) - ((assoc-ref %standard-phases 'build) - #:build-flags build-flags - #:import-path directory)) - (list "github.com/yggdrasil-network/yggdrasil-go/cmd/yggdrasil" - "github.com/yggdrasil-network/yggdrasil-go/cmd/yggdrasilctl" - "github.com/yggdrasil-network/yggdrasil-go/cmd/genkeys")) - #t))))) + (list #:import-path "github.com/yggdrasil-network/yggdrasil-go" + ;; TODO: figure out how tests are run + #:tests? #f + #:install-source? #f + #:go go-1.20 + #:phases + #~(modify-phases %standard-phases + (replace 'build + (lambda* (#:key import-path build-flags #:allow-other-keys) + (let* ((pkgsrc "github.com/yggdrasil-network/yggdrasil-go/src/version") + (ldflags (format #f + "-X ~a.buildName=yggdrasil -X ~a.buildVersion=~a" + pkgsrc + pkgsrc + #$version))) + (for-each + (lambda (directory) + ((assoc-ref %standard-phases 'build) + #:build-flags `("-ldflags" ,ldflags) + #:import-path directory)) + (list "github.com/yggdrasil-network/yggdrasil-go/cmd/yggdrasil" + "github.com/yggdrasil-network/yggdrasil-go/cmd/yggdrasilctl" + "github.com/yggdrasil-network/yggdrasil-go/cmd/genkeys")))))))) ;; https://github.com/kardianos/minwinsvc is windows only (propagated-inputs (list ;;("go-golang-zx2c4-com-wireguard-windows" @@ -4430,11 +4425,14 @@ network.") go-golang-org-x-sys go-golang-org-x-net go-golang-org-x-crypto + go-golang-org-x-tools go-netns go-netlink + go-github-com-olekukonko-tablewriter go-github-com-mitchellh-mapstructure go-github-com-mattn-go-runewidth go-github-com-mattn-go-isatty + go-github-com-mattn-go-colorable go-github-com-kardianos-minwinsvc go-github-com-hjson-hjson-go go-github-com-hashicorp-go-syslog |