From 62e8cc113a9e7e23c7d2981e0d6eaf9122f07c85 Mon Sep 17 00:00:00 2001 From: "Paul A. Patience" Date: Thu, 28 Dec 2023 12:10:59 +0000 Subject: gnu: cl-pathname-utils: Update to 1.1.0-3.f28068a. * gnu/packages/lisp-xyz.scm (sbcl-pathname-utils): Update to 1.1.0-3.f28068a. Change-Id: Ieaff98da3cff210c9cbf1022e3cebffe2ed38efa Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 4daf7afd84..72275eeca8 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -19939,8 +19939,8 @@ lQuery.") (sbcl-package->cl-source-package sbcl-clip)) (define-public sbcl-pathname-utils - (let ((commit "13189c08f2480802a6cba207304c2e0cfdc57f47") - (revision "2")) + (let ((commit "f28068a79825f37002e96d13dfd739172382bf94") + (revision "3")) (package (name "sbcl-pathname-utils") (version (git-version "1.1.0" revision commit)) @@ -19952,7 +19952,7 @@ lQuery.") (commit commit))) (file-name (git-file-name "cl-pathname-utils" version)) (sha256 - (base32 "0b5pjsrpfw0pmahi1zydzpaa5missg3cxqnyz4k6xwvk8fqscpha")))) + (base32 "10xs0wnnkbdiirr1cb7q7hzi2zmksfsrj0p7yws0j1l215vz8qs8")))) (build-system asdf-build-system/sbcl) (native-inputs (list sbcl-parachute)) -- cgit 1.4.1 From 24dcb4b36cbef0093bc7532c45966298afae7dde Mon Sep 17 00:00:00 2001 From: "Paul A. Patience" Date: Thu, 28 Dec 2023 12:20:29 +0000 Subject: gnu: cl-filesystem-utils: Update to 1.0.0-2.a07e8b6. * gnu/packages/lisp-xyz.scm (sbcl-filesystem-utils): Update to 1.0.0-2.a07e8b6. Change-Id: I5823f315d0f400d2e447afeee73d6b03ebe685c8 Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 72275eeca8..c30f70b86e 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -18752,19 +18752,20 @@ attributes not supported by the Common Lisp standard functions.") (sbcl-package->cl-source-package sbcl-file-attributes)) (define-public sbcl-filesystem-utils - (let ((commit "4455bb6c43f4433dd68a34ddad9ed5aa9b649243")) + (let ((commit "a07e8b61b89d4b46408fb9294d9b8130e8c8a02e") + (revision "2")) (package (name "sbcl-filesystem-utils") - (version (git-version "1.0.0" "1" commit)) + (version (git-version "1.0.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/Shinmera/filesystem-utils/") (commit commit))) - (file-name (git-file-name "filesystem-utils" version)) + (file-name (git-file-name "cl-filesystem-utils" version)) (sha256 - (base32 "0rww9r26zh44qwmj0b4sl95jngdn2h0239x5gjzak3gpdc3i3nbr")))) + (base32 "1zv2i2gndnbs7hz3bgkkq1qfx604wbndpc7qqlqvg23fssn9w59f")))) (build-system asdf-build-system/sbcl) (inputs (list sbcl-documentation-utils -- cgit 1.4.1 From 35cb74823f427a50f5cad0081f8a594b809f1ade Mon Sep 17 00:00:00 2001 From: "Paul A. Patience" Date: Thu, 28 Dec 2023 12:29:03 +0000 Subject: gnu: cl-3bmd: Update to 0.0.0-4.e68b2d4. * gnu/packages/lisp-xyz.scm (sbcl-3bmd): Update to 0.0.0-4.e68b2d4. Change-Id: I2e2a4f3fc96bf70b72a15840aa85349a3d71be02 Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index c30f70b86e..973b4e9be6 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -3284,8 +3284,8 @@ C, C++, Java, Python, Erlang, Haskell, Objective-C, Diff, Webkit.") (sbcl-package->ecl-package sbcl-colorize)) (define-public sbcl-3bmd - (let ((commit "4e08d82d7c8fb1b8fc708c87f4d9d13a1ab490cb") - (revision "3")) + (let ((commit "e68b2d442f29b4534c1c8e2f2cdf7583643a2fc5") + (revision "4")) (package (name "sbcl-3bmd") (version (git-version "0.0.0" revision commit)) @@ -3296,7 +3296,7 @@ C, C++, Java, Python, Erlang, Haskell, Objective-C, Diff, Webkit.") (url "https://github.com/3b/3bmd") (commit commit))) (sha256 - (base32 "1j885ykg2yds0l7dmw21lrhs7pd66lf541pf9lb677nkhc2f62jz")) + (base32 "12xqih1gnwsn1baqm7bq3kxss73phn06gvd0v1h1vwsjd1xgpq3g")) (file-name (git-file-name "cl-3bmd" version)))) (build-system asdf-build-system/sbcl) (arguments -- cgit 1.4.1 From fdc6ff3326eb4d11f9787d9f1d892525fe546745 Mon Sep 17 00:00:00 2001 From: "Paul A. Patience" Date: Thu, 28 Dec 2023 12:39:27 +0000 Subject: gnu: cl-mgl-pax: Update to 0.3.0-1.6782eb0. * gnu/packages/lisp-xyz.scm (sbcl-mgl-pax): Update to 0.3.0-1.6782eb0. [inputs]: Add sbcl-trivial-utf-8. Change-Id: I0d78ec4cca4924703adfabfa0e536933f345256d Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 973b4e9be6..d7a00db648 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -3666,11 +3666,11 @@ processes that doesn't run under Emacs. Lisp processes created by (sbcl-package->ecl-package sbcl-slime-swank)) (define-public sbcl-mgl-pax - (let ((commit "ed82a80207b70801fab061f6592cf7d7355294a6") - (revision "0")) + (let ((commit "6782eb041c152721972420dfafa192692d16b7ce") + (revision "1")) (package (name "sbcl-mgl-pax") - (version (git-version "0.1.0" revision commit)) + (version (git-version "0.3.0" revision commit)) (source (origin (method git-fetch) @@ -3678,7 +3678,7 @@ processes that doesn't run under Emacs. Lisp processes created by (url "https://github.com/melisgl/mgl-pax") (commit commit))) (sha256 - (base32 "008wfa70q68cj6npi4107mfjhjzfjmvrhm1x51jpndsn2165c5bx")) + (base32 "0fjbzc2fn17m80lfsc8121sa0bk7fg42fqlwhm01sk1fj4s48pma")) (file-name (git-file-name "cl-mgl-pax" version)))) (build-system asdf-build-system/sbcl) ;; (native-inputs @@ -3690,7 +3690,8 @@ processes that doesn't run under Emacs. Lisp processes created by sbcl-md5 sbcl-named-readtables sbcl-pythonic-string-reader - sbcl-slime-swank)) + sbcl-slime-swank + sbcl-trivial-utf-8)) (arguments `(#:asd-systems '("mgl-pax" "mgl-pax/navigate" -- cgit 1.4.1 From 6a7db35524344c7728d655789c9075bd2e78f88d Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 29 Dec 2023 10:27:19 +0100 Subject: gnu: cl-clog: Fix build. * gnu/packages/lisp-xyz.scm (sbcl-clog)[arguments]: Add 'fix-symbol-name' phase. Change-Id: If9f5546eb252c69bb12a0904eb9db37140a90d24 --- gnu/packages/lisp-xyz.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index d7a00db648..1625197550 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -26754,7 +26754,13 @@ inspired by Haskell package @code{Data.List}.") sbcl-trivial-open-browser sbcl-websocket-driver)) (arguments - '(#:asd-systems '("clog" "clog/docs" "clog/tools"))) + '(#:asd-systems '("clog" "clog/docs" "clog/tools") + #:phases (modify-phases %standard-phases + (add-after 'unpack 'fix-symbol-name + (lambda _ + (substitute* "source/clog-docs.lisp" + (("clog:@CLOG-MANUAL") + "clog::@CLOG_MANUAL"))))))) (home-page "https://github.com/rabbibotton/clog") (synopsis "Common Lisp Omnificent GUI") (description -- cgit 1.4.1 From d4cef7edffe0283949fc0f06d7796cea3543b92f Mon Sep 17 00:00:00 2001 From: Felix Gruber Date: Thu, 28 Dec 2023 19:40:54 +0000 Subject: gnu: spatialite-tools: Update to 5.1.0a. * gnu/packages/geo.scm (spatialite-tools): Update to 5.1.0a. Change-Id: I2dd09003d090db692d6056402cef55e1c1203684 Signed-off-by: Guillaume Le Vaillant --- gnu/packages/geo.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index fd6bbb003a..053ea40408 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -2329,7 +2329,7 @@ associated attribute file (@file{.dbf}).") (define-public spatialite-tools (package (name "spatialite-tools") - (version "5.1.0") + (version "5.1.0a") (source (origin (method url-fetch) @@ -2337,7 +2337,7 @@ associated attribute file (@file{.dbf}).") "spatialite-tools-sources/" "spatialite-tools-" version ".tar.gz")) (sha256 - (base32 "1dc3hnqa9ns0ycsac6wyl96pi052y7rrf233lq7sk708ghv30c6z")))) + (base32 "1kh1amab452m3801knmpn1jcg27axakb90gd8fxwv240irsk97hi")))) (build-system gnu-build-system) (native-inputs (list pkg-config)) -- cgit 1.4.1 From d68517059f12f9adf86adfa3f087ab7d93bc2f15 Mon Sep 17 00:00:00 2001 From: Adam Faiz Date: Wed, 20 Dec 2023 21:17:01 +0800 Subject: gnu: gnunet: Update to 0.20.0. * gnu/packages/gnunet.scm (gnunet): Update to 0.20.0. [source]: Remove snippet. Change-Id: I1157f586764f9282d331596ca83bb8850ddee7ab Signed-off-by: Guillaume Le Vaillant --- gnu/packages/gnunet.scm | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm index d1ac228639..1f53e2c788 100644 --- a/gnu/packages/gnunet.scm +++ b/gnu/packages/gnunet.scm @@ -262,7 +262,7 @@ supports HTTP, HTTPS and GnuTLS.") (define-public gnunet (package (name "gnunet") - (version "0.19.4") + (version "0.20.0") (source (origin (method url-fetch) @@ -270,14 +270,7 @@ supports HTTP, HTTPS and GnuTLS.") ".tar.gz")) (sha256 (base32 - "16q0mkkr9b33wlm307ignfgvv0kilzr42155m5dpz66m13s3v9h0")) - (modules '((guix build utils))) - (snippet - #~(begin - ;; This is fixed in the upstream repository but the fix - ;; has not been released. - (substitute* "src/gns/test_proxy.sh" - (("test_gnunet_proxy.conf") "test_gns_proxy.conf")))))) + "064mmhksznbsymanikwqkgmdhk2f0zjll2aq2cmxa14wm5w9w0jn")))) (build-system gnu-build-system) (inputs (list bluez -- cgit 1.4.1 From f90d6adec787187f7929159e3327c73245d3bbe3 Mon Sep 17 00:00:00 2001 From: Adam Faiz Date: Wed, 20 Dec 2023 21:19:12 +0800 Subject: gnu: gnunet-gtk: Update to 0.20.0. * gnu/packages/gnunet.scm (gnunet-gtk): Update to 0.20.0. Signed-off-by: Guillaume Le Vaillant Change-Id: I293aecd0e7074d2b522d955ab4509a5eeb1cf7d6 --- gnu/packages/gnunet.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm index 1f53e2c788..fd101a8acf 100644 --- a/gnu/packages/gnunet.scm +++ b/gnu/packages/gnunet.scm @@ -443,14 +443,14 @@ The following services are supported: (define-public gnunet-gtk (package (inherit gnunet) (name "gnunet-gtk") - (version "0.19.0") + (version "0.20.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/gnunet/gnunet-gtk-" version ".tar.gz")) (sha256 (base32 - "0z2731l69vnfsa0cdsw8wh8g1d08wz15y5n0a58qjpf7baric01k")))) + "0bandj2f24v4wfq1v5j73zn5jp25dn8r7y0wd7znlkmbh86fb4g9")))) (arguments (list #:configure-flags #~(list "--with-libunique" -- cgit 1.4.1 From 4d8b93e865ba71d2baa606d11529c3ecb5f14aea Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 29 Dec 2023 11:20:35 +0100 Subject: gnu: Add python-pymemcache. * gnu/packages/python-xyz.scm (python-pymemcache): New variable. Change-Id: I2141c79d01d8a59e9cd4ee2fbef608ba882ffaa9 --- gnu/packages/python-xyz.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index ee689809a3..bac82b4893 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -20288,6 +20288,31 @@ etc.") support.") (license license:bsd-3))) +(define-public python-pymemcache + (package + (name "python-pymemcache") + (version "4.0.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pymemcache" version)) + (sha256 + (base32 "157z9blr8pjg9x84jph5hm0z2l6yaq6n421jcf1hzqn1pg8rpgr7")))) + (build-system pyproject-build-system) + (arguments + ;; We don't have the zstd module. + (list + #:test-flags + '(list "--ignore=pymemcache/test/test_compression.py"))) + (native-inputs + (list python-faker python-pytest python-pytest-cov)) + (home-page "https://github.com/pinterest/pymemcache") + (synopsis "Comprehensive, fast, pure Python memcached client") + (description + "This package provides a comprehensive, fast, pure Python memcached +client.") + (license license:asl2.0))) + (define-public python-pymodbus (package (name "python-pymodbus") -- cgit 1.4.1 From 375200111db1c90dcb3cd179609f0aab96360bed Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 29 Dec 2023 17:26:17 +0100 Subject: gnu: python-dm-tree: Fix build. * gnu/packages/python-xyz.scm (python-dm-tree)[arguments]: Drop --whole-archive linker arguments because with them symbols provided by libabsl_hash.a would not be found. Change-Id: Id9ea0e233dc9a1cc76c88c08314803671e4810f9 --- gnu/packages/python-xyz.scm | 2 -- 1 file changed, 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index bac82b4893..2afce6c667 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5935,7 +5935,6 @@ flexibility and power of the Python language.") (string-append "-Wl," "-rpath=" python "/lib") "-fno-semantic-interposition" "build/temp/tree/tree.o" - "-Wl,--whole-archive" "-L" (string-append python "/lib") (string-append abseil-cpp "/lib/libabsl_int128.a") (string-append abseil-cpp "/lib/libabsl_raw_hash_set.a") @@ -5943,7 +5942,6 @@ flexibility and power of the Python language.") (string-append abseil-cpp "/lib/libabsl_strings.a") (string-append abseil-cpp "/lib/libabsl_strings_internal.a") (string-append abseil-cpp "/lib/libabsl_throw_delegate.a") - "-Wl,--no-whole-archive" "-o" "build/lib/tree/_tree.so"))))))) (home-page "https://github.com/deepmind/tree") (synopsis "Work with nested data structures in Python") -- cgit 1.4.1 From 2911aaa9ae54cf86d2a776c441f3559d4a838f16 Mon Sep 17 00:00:00 2001 From: Zheng Junjie Date: Thu, 28 Dec 2023 21:57:58 +0800 Subject: gnu: libmng: Fix cross-compiling to riscv64-linux. * gnu/packages/image.scm (libmng) [native-inputs]: When cross compiling to riscv64-linux-gnu, add config. [arguments]: When target riscv64-linux-gnu, add update-config-scripts phase. Change-Id: I906a2b7b7691ae53592cfa35ba64fc7e7d735664 Signed-off-by: Mathieu Othacehe --- gnu/packages/image.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index ebabd1c973..79f1a293ec 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -1483,6 +1483,26 @@ channels.") (base32 "1lvxnpds0vcf0lil6ia2036ghqlbl740c4d2sz0q5g6l93fjyija")))) (build-system gnu-build-system) + (arguments + (if (and (target-riscv64?) + (%current-target-system)) + (list #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'update-config-scripts + (lambda* (#:key inputs native-inputs #:allow-other-keys) + ;; Replace outdated config.guess and config.sub. + (for-each (lambda (file) + (install-file + (search-input-file + (or native-inputs inputs) + (string-append "/bin/" file)) ".")) + '("config.guess" "config.sub")))))) + '())) + (native-inputs + (if (and (target-riscv64?) + (%current-target-system)) + (list config) + '())) (propagated-inputs ;; These are all in the 'Libs.private' field of libmng.pc. (list lcms libjpeg-turbo zlib)) -- cgit 1.4.1 From c5c28df899b4c4f114bee9afd58dbde9fbbf3424 Mon Sep 17 00:00:00 2001 From: Zheng Junjie Date: Thu, 28 Dec 2023 22:26:21 +0800 Subject: gnu: xcb-util-renderutil: Fix cross-compiling to riscv64-linux. * gnu/packages/xorg.scm (xcb-util-renderutil) [native-inputs]: When cross compiling to riscv64-linux-gnu, add config. [arguments]: When target riscv64-linux-gnu, add update-config-scripts phase. Change-Id: I906a2b7b7691ae53592cfa35ba64fc7e7d735664 Signed-off-by: Mathieu Othacehe --- gnu/packages/xorg.scm | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 382075237a..4f85a5de8b 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -5675,11 +5675,29 @@ The XCB util-keysyms module provides the following library: "0nza1csdvvxbmk8vgv8vpmq7q8h05xrw3cfx9lwxd1hjzd47xsf6")))) (build-system gnu-build-system) (arguments - '(#:configure-flags '("--disable-static"))) + `(#:configure-flags '("--disable-static") + ,@(if (and (%current-target-system) + (target-riscv64?)) + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'update-config-scripts + (lambda* (#:key inputs native-inputs #:allow-other-keys) + ;; Replace outdated config.guess and config.sub. + (for-each (lambda (file) + (install-file + (search-input-file + (or native-inputs inputs) + (string-append "/bin/" file)) ".")) + '("config.guess" "config.sub")))))) + '()))) (propagated-inputs (list libxcb)) (native-inputs - (list pkg-config)) + (append (if (and (%current-target-system) + (target-riscv64?)) + (list config) + '()) + (list pkg-config))) (home-page "https://cgit.freedesktop.org/xcb/util-renderutil/") (synopsis "Convenience functions for the Render extension") (description -- cgit 1.4.1 From 2c371d2cd9a30bf88fe9aae53913526876b01bcc Mon Sep 17 00:00:00 2001 From: Zheng Junjie Date: Thu, 28 Dec 2023 23:58:59 +0800 Subject: gnu: f3: Fix cross-compiling. * gnu/packages/disk.scm (f3) [arguments]: Use Gexp. Change-Id: I906a2b7b7691ae53592cfa35ba64fc7e7d735664 Signed-off-by: Mathieu Othacehe --- gnu/packages/disk.scm | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index 754c70897c..165f0a8a74 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -27,6 +27,7 @@ ;;; Copyright © 2022 Disseminate Dissent ;;; Copyright © 2023 Timotej Lazar ;;; Copyright © 2023 Morgan Smith +;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -843,18 +844,18 @@ systems. Output format is completely customizable.") (base32 "17l5vspfcgfbkqg7bakp3gql29yb05gzawm8n3im30ilzdr53678")))) (build-system gnu-build-system) (arguments - `(#:tests? #f ; no check target - #:make-flags (list (string-append "CC=" ,(cc-for-target)) - (string-append "PREFIX=" %output)) - #:phases - (modify-phases %standard-phases - (delete 'configure) ; no configure script - (add-after 'build 'build-extra - (lambda* (#:key make-flags #:allow-other-keys) - (apply invoke "make" "extra" make-flags))) - (add-after 'build 'install-extra - (lambda* (#:key make-flags #:allow-other-keys) - (apply invoke "make" "install-extra" make-flags)))))) + (list #:tests? #f ; no check target + #:make-flags #~(list (string-append "CC=" #$(cc-for-target)) + (string-append "PREFIX=" #$output)) + #:phases + #~(modify-phases %standard-phases + (delete 'configure) ; no configure script + (add-after 'build 'build-extra + (lambda* (#:key make-flags #:allow-other-keys) + (apply invoke "make" "extra" make-flags))) + (add-after 'build 'install-extra + (lambda* (#:key make-flags #:allow-other-keys) + (apply invoke "make" "install-extra" make-flags)))))) (inputs (list eudev parted)) (home-page "http://oss.digirati.com.br/f3/") -- cgit 1.4.1 From 0f2164c577ef2329a95e1fce1c33947f4c6ae89c Mon Sep 17 00:00:00 2001 From: Zheng Junjie Date: Fri, 29 Dec 2023 20:08:29 +0800 Subject: gnu: libid3tag: Fix cross-compiling. * gnu/packages/mp3.scm (libid3tag) [native-inputs]: when cross compiling to {riscv,aarch}64-linux-gnu, add config. [arguments]: when target {riscv,aarch}64-linux-gnu, add update-config-scripts phase. Change-Id: I715e20b7d0aeabe7eba76185b542d9d184167448 Signed-off-by: Mathieu Othacehe --- gnu/packages/mp3.scm | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/mp3.scm b/gnu/packages/mp3.scm index 7ede16f4bb..3010e01432 100644 --- a/gnu/packages/mp3.scm +++ b/gnu/packages/mp3.scm @@ -12,6 +12,7 @@ ;;; Copyright © 2021 Guillaume Le Vaillant ;;; Copyright © 2022 John Kehayias ;;; Copyright © 2022 Joeke de Graaf +;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -161,7 +162,25 @@ This package contains the library.") Version: ~a~@ Libs: -L${libdir} -lid3tag -lz~@ Cflags: -I${includedir}~%" - out ,version))))))))) + out ,version)))))) + ,@(if (and (%current-target-system) + (or (target-riscv64?) + (target-aarch64?))) + `((add-after 'unpack 'update-config + (lambda* (#:key native-inputs inputs #:allow-other-keys) + (for-each + (lambda (file) + (install-file + (search-input-file (or native-inputs inputs) + (string-append "/bin/" file)) + ".")) + '("config.guess" "config.sub"))))) + '())))) + (native-inputs (if (and (%current-target-system) + (or (target-riscv64?) + (target-aarch64?))) + (list config) + '())) (inputs (list zlib)) (synopsis "Library for reading ID3 tags") (description -- cgit 1.4.1 From a14a94deb218f459dc8a3139ef6e25f15c822463 Mon Sep 17 00:00:00 2001 From: Zheng Junjie Date: Fri, 29 Dec 2023 20:31:41 +0800 Subject: gnu: swaylock: Fix cross-compiling. * gnu/packages/wm.scm (swaylock) [native-inputs]: When cross-compiling, add pkg-config-for-build wayland. [inputs]: When cross-compiling, add wayland-protocols. Change-Id: I24274502375f51411576642d87496b8be2e42c45 Signed-off-by: Mathieu Othacehe --- gnu/packages/wm.scm | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 82ef67a2e4..a87eb20428 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -41,7 +41,7 @@ ;;; Copyright © 2020 B. Wilson ;;; Copyright © 2020 Niklas Eklund ;;; Copyright © 2020 Robert Smith -;;; Copyright © 2021 Zheng Junjie <873216071@qq.com> +;;; Copyright © 2021, 2023 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2021 Sharlatan Hellseher ;;; Copyright © 2021 qblade ;;; Copyright © 2021 lasnesne @@ -1845,8 +1845,14 @@ corners, shadows, inactive window dimming, etc.") (sha256 (base32 "03jrjwlwxkcyd6m9a1bbwapasnz7b7aws7h0y6jigjm4m478phv6")))) (build-system meson-build-system) - (inputs (list cairo gdk-pixbuf libxkbcommon linux-pam wayland)) - (native-inputs (list pango pkg-config scdoc wayland-protocols)) + (inputs (append (if (%current-target-system) + (list wayland-protocols) + '()) + (list cairo gdk-pixbuf libxkbcommon linux-pam wayland))) + (native-inputs (append (if (%current-target-system) + (list pkg-config-for-build wayland) + '()) + (list pango pkg-config scdoc wayland-protocols))) (home-page "https://github.com/swaywm/sway") (synopsis "Screen locking utility for Wayland compositors") (description "Swaylock is a screen locking utility for Wayland compositors.") -- cgit 1.4.1 From ceb69872881ed9cdabc0e55c28cca548379dbb5e Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 16 Dec 2023 16:06:15 -0500 Subject: gnu: tremc: Update to 0.9.3-1.d8deaa5. * gnu/packages/bittorrent.scm (tremc): Update to 0.9.3-1.d8deaa5. Change-Id: Ib138825770172c02eaa91ced5f226fd87c7cfb1c --- gnu/packages/bittorrent.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm index 8c032940d4..91c29c3af7 100644 --- a/gnu/packages/bittorrent.scm +++ b/gnu/packages/bittorrent.scm @@ -253,8 +253,8 @@ XML-RPC over SCGI.") (license l:gpl2+))) (define-public tremc - (let ((commit "6c15e3f5637c8f3641473328bd8c5b0cc122d930") - (revision "0")) + (let ((commit "d8deaa5ac25bb45a2ca3a930309d6ecc74836a54") + (revision "1")) (package (name "tremc") (version (git-version "0.9.3" revision commit)) @@ -267,7 +267,7 @@ XML-RPC over SCGI.") (file-name (git-file-name name version)) (sha256 (base32 - "1anlqzbwgmhrxlh20pfzf4iyw5l2w227h95rq6xf29ai7vddr82k")))) + "08kpqmgisja98918f2hlmdrld5662dqlkssp0pqlki38l6fvbj7r")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no test suite -- cgit 1.4.1 From d263c49919235b81b318c45c99aa189be04c5f28 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 16 Dec 2023 15:25:30 -0500 Subject: gnu: Transmission: Update to 4.0.5. * gnu/packages/bittorrent.scm (transmission): Update to 4.0.5. [source]: Use 'transmission-4.0.5-fix-build.patch'. * gnu/packages/patches/transmission-4.0.5-fix-build.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. Change-Id: I8e9486dca07f01628e7886e7ac5757d511056cb7 --- gnu/local.mk | 1 + gnu/packages/bittorrent.scm | 5 +-- .../patches/transmission-4.0.5-fix-build.patch | 39 ++++++++++++++++++++++ 3 files changed, 43 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/transmission-4.0.5-fix-build.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 2896395120..3e9ac33945 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2059,6 +2059,7 @@ dist_patch_DATA = \ %D%/packages/patches/tofi-32bit-compat.patch \ %D%/packages/patches/tpetra-remove-duplicate-using.patch \ %D%/packages/patches/transcode-ffmpeg.patch \ + %D%/packages/patches/transmission-4.0.5-fix-build.patch \ %D%/packages/patches/trytond-add-egg-modules-to-path.patch \ %D%/packages/patches/trytond-add-guix_trytond_path.patch \ %D%/packages/patches/ttf2eot-cstddef.patch \ diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm index 91c29c3af7..0d544235c1 100644 --- a/gnu/packages/bittorrent.scm +++ b/gnu/packages/bittorrent.scm @@ -87,15 +87,16 @@ (define-public transmission (package (name "transmission") - (version "4.0.4") + (version "4.0.5") (source (origin (method url-fetch) (uri (string-append "https://github.com/transmission/transmission" "/releases/download/" version "/transmission-" version ".tar.xz")) + (patches (search-patches "transmission-4.0.5-fix-build.patch")) (sha256 (base32 - "19nm7f4x3zq610da5fl63vpycj4kv07np6ldm8czpgyziwqv9xqm")))) + "0mv3ds3bbp1fbmdlrjinmzvk46acpafydirh7h2014j7988zys7x")))) (build-system cmake-build-system) (outputs '("out" ; library and command-line interface "gui")) ; graphical user interface diff --git a/gnu/packages/patches/transmission-4.0.5-fix-build.patch b/gnu/packages/patches/transmission-4.0.5-fix-build.patch new file mode 100644 index 0000000000..7eeb0f1921 --- /dev/null +++ b/gnu/packages/patches/transmission-4.0.5-fix-build.patch @@ -0,0 +1,39 @@ +Fix the build with gtkmm 4: + +https://github.com/transmission/transmission/issues/6392 + +Patch copied from upstream source repository: + +https://github.com/transmission/transmission/commit/e116672b27b314d54514c96b1fa7aef1dee900b1 + +From e116672b27b314d54514c96b1fa7aef1dee900b1 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?C=C5=93ur?= +Date: Sun, 17 Dec 2023 16:37:35 +0100 +Subject: [PATCH] fix: build error on GTKMM-4 (#6393) + +--- + gtk/OptionsDialog.cc | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) + +diff --git a/gtk/OptionsDialog.cc b/gtk/OptionsDialog.cc +index 08198540c10..8c28fc76f98 100644 +--- a/gtk/OptionsDialog.cc ++++ b/gtk/OptionsDialog.cc +@@ -338,7 +338,16 @@ void TorrentFileChooserDialog::onOpenDialogResponse(int response, Glib::RefPtr>(); ++ auto files_model = get_files(); ++ for (auto i = guint{ 0 }; i < files_model->get_n_items(); ++i) ++ { ++ files.push_back(gtr_ptr_dynamic_cast(files_model->get_object(i))); ++ } ++#else ++ auto const files = get_files(); ++#endif + g_assert(!files.empty()); + + /* remember this folder the next time we use this dialog */ -- cgit 1.4.1 From 6eb7eb1f050dc9c6d9c7c5e39f038e51192503d6 Mon Sep 17 00:00:00 2001 From: Wilko Meyer Date: Mon, 25 Dec 2023 23:00:45 +0100 Subject: gnu: linux-libre 5.15: Update to 5.15.145. * gnu/packages/linux.scm (linux-libre-5.15-version): Update to 5.15.145. (linux-libre-5.15-pristine-source): Update hash. Change-Id: Ibb9b7e939530f25385ef7564cccdd98e270f6698 Signed-off-by: Leo Famulari --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index e7a317db33..1c359cb300 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -527,7 +527,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-6.1))) -(define-public linux-libre-5.15-version "5.15.144") +(define-public linux-libre-5.15-version "5.15.145") (define-public linux-libre-5.15-gnu-revision "gnu") (define deblob-scripts-5.15 (linux-libre-deblob-scripts @@ -537,7 +537,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1idjrn2w8jrixj8ifkk1awxyyq5042nc4p2mld4rda96azlnp948"))) (define-public linux-libre-5.15-pristine-source (let ((version linux-libre-5.15-version) - (hash (base32 "0fsv18q64q17ad7mq818wfhb11dax4bdvbvqyk5ilxyfmypsylzh"))) + (hash (base32 "086nssif66s86wkixz4yb7xilz1k49g32l0ib28r8fjzc23rv95j"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.15))) -- cgit 1.4.1 From f76ca2b0e894c244d5011a32b30dee8fd874e322 Mon Sep 17 00:00:00 2001 From: Aaron Covrig Date: Mon, 20 Nov 2023 22:45:49 -0500 Subject: gnu: Add Sirikali. * gnu/packages/file-systems.scm (sirikali): New variable Change-Id: Ie46cf269dac1ba842d935221b2372fb3d8a6ea2d Signed-off-by: Leo Famulari --- gnu/packages/file-systems.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm index 05074b2eb4..8cac1eae9c 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -11,6 +11,7 @@ ;;; Copyright © 2021 Noisytoot ;;; Copyright © 2021, 2023 Kaelyn Takata ;;; Copyright © 2022 Brian Cully +;;; Copyright © 2023 Aaron Covrig ;;; ;;; This file is part of GNU Guix. ;;; @@ -64,8 +65,10 @@ #:use-module (gnu packages docbook) #:use-module (gnu packages elf) #:use-module (gnu packages flex) + #:use-module (gnu packages freedesktop) #:use-module (gnu packages gawk) #:use-module (gnu packages glib) + #:use-module (gnu packages gnome) #:use-module (gnu packages gnupg) #:use-module (gnu packages golang) #:use-module (gnu packages golang-check) @@ -81,6 +84,7 @@ #:use-module (gnu packages nfs) #:use-module (gnu packages onc-rpc) #:use-module (gnu packages openldap) + #:use-module (gnu packages password-utils) #:use-module (gnu packages pcre) #:use-module (gnu packages perl) #:use-module (gnu packages photo) @@ -91,6 +95,7 @@ #:use-module (gnu packages python-crypto) #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) + #:use-module (gnu packages qt) #:use-module (gnu packages readline) #:use-module (gnu packages rsync) #:use-module (gnu packages sssd) @@ -2112,3 +2117,29 @@ filtering and ordering functionality. @end itemize\n") (license license:gpl3))) + +(define-public sirikali + (package + (name "sirikali") + (version "1.5.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mhogomchungu/sirikali") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1l52s8rxkfcxcx3s2fnsh08wy6hhjjvp7gcggdi84aqc4dq3rdnm")))) + (build-system cmake-build-system) + (arguments + '(#:tests? #f ;No tests + #:configure-flags '("-DQT5=true"))) + (inputs (list xdg-utils libpwquality libgcrypt libsecret qtbase-5)) + (native-inputs (list pkg-config)) + (home-page "https://mhogomchungu.github.io/sirikali/") + (synopsis "Graphical program for managing encrypted file-systems") + (description "@dfn{SiriKali} is a Qt / C++ @acronym{GUI, graphical user +interface} application that manages ecryptfs, cryfs, encfs, gocryptfs, fscrypt +and securefs based encrypted folders.") + (license license:gpl2+))) -- cgit 1.4.1 From 3d445618a1842368baea4da172535108294bacd9 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Dec 2023 22:39:06 -0500 Subject: gnu: guile-udev: Update to 0.3.0. * gnu/packages/guile-xyz.scm (guile-udev): Update to 0.3.0. [arguments]: Move check phase after install phase. Change-Id: I0cf0683e9ea3e73b9e5b44892796d79925937b4e --- gnu/packages/guile-xyz.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 7b44dc3167..afd8900848 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -2267,7 +2267,7 @@ users and in some situations.") (define-public guile-udev (package (name "guile-udev") - (version "0.2.4") + (version "0.3.0") (source (origin (method git-fetch) (uri (git-reference @@ -2276,7 +2276,7 @@ users and in some situations.") (file-name (git-file-name name version)) (sha256 (base32 - "1q1snj8gz2bvqw2v2jvwlzn5xfh7f7wlp922isnzismrp4adc918")))) + "0zvn7ph6sbz5q8jnbkrxxlbxlyf0j8q34hr4a2yxklvg29ya7sd3")))) (build-system gnu-build-system) (arguments (list @@ -2289,7 +2289,10 @@ users and in some situations.") (substitute* (find-files "." "\\.scm") (("load-extension \"libguile-udev\"") (format #f "load-extension \"~a/lib/libguile-udev.so\"" - #$output)))))))) + #$output))))) + (delete 'check) ;moved after install + (add-after 'install 'check + (assoc-ref %standard-phases 'check))))) (native-inputs (list autoconf automake gettext-minimal -- cgit 1.4.1 From 24f3b2eb108d6403dc3efe92bbf29a98bdb6eb35 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 18 Dec 2023 15:30:33 -0500 Subject: gnu: Add x-resize. * gnu/packages/xdisorg.scm (x-resize): New variable. Change-Id: Ia36c07fba5a90f792cfe50b1e060891cf5706839 --- gnu/packages/xdisorg.scm | 57 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 485d55a8d3..449cbbaf6e 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -118,6 +118,7 @@ #:use-module (gnu packages gnome) #:use-module (gnu packages gtk) #:use-module (gnu packages guile) + #:use-module (gnu packages guile-xyz) #:use-module (gnu packages haskell-xyz) #:use-module (gnu packages icu4c) #:use-module (gnu packages image) @@ -2931,6 +2932,62 @@ can optionally use some appearance settings from XSettings, tint2 and GTK.") (home-page "https://jgmenu.github.io/") (license license:gpl2))) +(define-public x-resize + (package + (name "x-resize") + (version "0.2") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/Apteryks/x-resize") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "10y2p55m5hbrma01kixsppq1a3ld0q1jk8hwx1d1jfgw9vd243j8")))) + (build-system gnu-build-system) + (arguments + (list + #:tests? #f ;no test suite + #:modules `(((guix build guile-build-system) + #:select (target-guile-effective-version)) + ,@%gnu-build-system-modules + (srfi srfi-26)) + #:phases + (with-imported-modules `((guix build guile-build-system) + ,@%gnu-build-system-modules) + #~(modify-phases %standard-phases + (add-after 'install 'wrap + (lambda* (#:key inputs #:allow-other-keys) + (let* ((version (target-guile-effective-version)) + (site-ccache (string-append "/lib/guile/" version + "/site-ccache")) + (site (string-append "/share/guile/site/" version)) + (dep-path + (lambda (env path) + (list env '= + (map (cut string-append <> path) + (list #$output + #$(this-package-input + "guile-lib") + #$(this-package-input + "guile-udev")))))) + (bin (string-append #$output "/bin/"))) + (wrap-program (string-append bin "x-resize") + (dep-path "GUILE_LOAD_PATH" site) + (dep-path "GUILE_LOAD_COMPILED_PATH" site-ccache) + (dep-path "GUILE_EXTENSIONS_PATH" "/lib"))))))))) + (native-inputs (list autoconf automake guile-3.0 pkg-config)) + (inputs (list guile-lib guile-udev xrandr)) + (home-page "https://gitlab.com/Apteryks/x-resize/") + (synopsis "Dynamic display resizing leveraging udev events") + (description "The @command{x-resize} command detects physical display +resolution changes via udev and invokes the @command{xrandr} command to +reconfigure the active display resolution accordingly. It can be used to +implement dynamic resize support for desktop environments that lack native +support such as Xfce.") + (license license:gpl3+))) + (define-public xwallpaper (package (name "xwallpaper") -- cgit 1.4.1 From 1d4db94bebbaecfd4ddd96f90b8dc3ae3f6bf1a3 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 24 Oct 2023 09:03:46 -0400 Subject: gnu: vm-image.tmpl: Improve SPICE dynamic resizing. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/system/examples/vm-image.tmpl (auto-update-resolution-crutch): Delete variable. (operating-system) [packages]: Add x-resize. [services]: Remove auto-update-resolution-crutch mcron service. Fixes: https://issues.guix.gnu.org/57068 Reported-by: Ludovic Courtès Change-Id: I45cd3d79b94ece2511d324c7b180f8f37bd9ba49 --- gnu/system/examples/vm-image.tmpl | 28 +++++++++------------------- 1 file changed, 9 insertions(+), 19 deletions(-) (limited to 'gnu') diff --git a/gnu/system/examples/vm-image.tmpl b/gnu/system/examples/vm-image.tmpl index b68183a023..dc9a7542a5 100644 --- a/gnu/system/examples/vm-image.tmpl +++ b/gnu/system/examples/vm-image.tmpl @@ -8,7 +8,7 @@ (use-modules (gnu) (guix) (srfi srfi-1)) (use-service-modules desktop mcron networking spice ssh xorg sddm) (use-package-modules bootloaders certs fonts - package-management xorg) + package-management xdisorg xorg) (define vm-image-motd (plain-file "motd" " \x1b[1;37mThis is the GNU system. Welcome!\x1b[0m @@ -25,18 +25,6 @@ Run '\x1b[1;37minfo guix\x1b[0m' to browse documentation. accounts.\x1b[0m ")) -;;; XXX: Xfce does not implement what is needed for the SPICE dynamic -;;; resolution to work (see: -;;; https://gitlab.xfce.org/xfce/xfce4-settings/-/issues/142). Workaround it -;;; by manually invoking xrandr every second. -(define auto-update-resolution-crutch - #~(job '(next-second) - (lambda () - (setenv "DISPLAY" ":0.0") - (setenv "XAUTHORITY" "/home/guest/.Xauthority") - (execl (string-append #$xrandr "/bin/xrandr") "xrandr" "-s" "0")) - #:user "guest")) - (operating-system (host-name "gnu") (timezone "Etc/UTC") @@ -65,7 +53,7 @@ accounts.\x1b[0m (users (cons (user-account (name "guest") (comment "GNU Guix Live") - (password "") ;no password + (password "") ;no password (group "users") (supplementary-groups '("wheel" "netdev" "audio" "video"))) @@ -77,8 +65,13 @@ accounts.\x1b[0m root ALL=(ALL) ALL %wheel ALL=NOPASSWD: ALL\n")) - (packages (append (list font-bitstream-vera nss-certs) - %base-packages)) + (packages + (append (list font-bitstream-vera nss-certs + ;; Auto-started script providing SPICE dynamic resizing for + ;; Xfce (see: + ;; https://gitlab.xfce.org/xfce/xfce4-settings/-/issues/142). + x-resize) + %base-packages)) (services (append (list (service xfce-desktop-service-type) @@ -104,9 +97,6 @@ root ALL=(ALL) ALL ;; integration with the host, etc. (service spice-vdagent-service-type) - (simple-service 'cron-jobs mcron-service-type - (list auto-update-resolution-crutch)) - ;; Use the DHCP client service rather than NetworkManager. (service dhcp-client-service-type)) -- cgit 1.4.1 From b8d1492647898d15f3367c868e3fc70524d8920d Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 24 Dec 2023 14:02:38 +0100 Subject: gnu: Remove ocaml4.07-gsl-1. * gnu/packages/ocaml.scm (ocaml4.07-gsl-1): Remove variable. Change-Id: Ie446999c873dbf5b16ce2e4f9e2a6c33833c7d05 --- gnu/packages/ocaml.scm | 33 ++++++--------------------------- 1 file changed, 6 insertions(+), 27 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 7993dbaa73..d632289871 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2146,7 +2146,7 @@ powerful.") (description "This package provides a way to write bitstrings and matching over bitsrings in Erlang style as primitives to the language."))) - + (define-public ocaml-result (package (name "ocaml-result") @@ -2189,7 +2189,7 @@ defined in this library.") `(#:dune ,ocaml5.0-dune-bootstrap #:ocaml ,ocaml-5.0 #:findlib ,ocaml5.0-findlib)))) - + (define-public ocaml-topkg (package (name "ocaml-topkg") @@ -2219,7 +2219,7 @@ provides an API to describe the files a package installs in a given build configuration and to specify information about the package's distribution, creation and publication procedures.") (license license:isc))) - + (define-public ocaml-rresult (package (name "ocaml-rresult") @@ -3738,7 +3738,7 @@ without a complete in-memory representation.") the JSON data format. It can process JSON text without blocking on IO and without a complete in-memory representation of the data.") (license license:isc))) - + (define-public ocaml-ocp-indent (package (name "ocaml-ocp-indent") @@ -3773,7 +3773,7 @@ This package includes: fault-tolerant and approximate parsing. @end itemize") (license license:lgpl2.1))) - + (define-public ocaml-ocp-index (package (name "ocaml-ocp-index") @@ -6108,7 +6108,7 @@ speedup, polymorphic variants and optional syntax for tuples and variants. yojson package. The program @code{atdgen} can be used to derive OCaml-JSON serializers and deserializers from type definitions.") (license license:bsd-3))) - + (define-public ocaml-merlin-lib (package (name "ocaml-merlin-lib") @@ -6264,27 +6264,6 @@ Atom.") the OCaml language.") (license license:gpl3+))) -(define-public ocaml4.07-gsl-1 - (package-with-ocaml4.07 - (package - (inherit ocaml-gsl) - (version "1.19.3") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/mmottl/gsl-ocaml" - "/releases/download/v" - version "/gsl-ocaml-" version ".tar.gz")) - (sha256 - (base32 - "0nzp43hp8pbjqkrxnwp5lgjrabxayf61h18fjaydi0s5faq6f3xh")))) - (build-system ocaml-build-system) - (inputs - `(("gsl" ,gsl-static))) - (native-inputs - `(("ocamlbuild" ,ocamlbuild))) - (arguments '()) - (propagated-inputs '())))) - (define-public cubicle (package (name "cubicle") -- cgit 1.4.1 From 3e16291043b49f544a009da93bcb3bd04503df17 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 24 Dec 2023 14:04:45 +0100 Subject: gnu: Remove ocaml4.07-bitstring. * gnu/packages/ocaml.scm (ocaml4.07-bitstring): Remove variable. (ocaml-bitstring)[properties]: Remove variant. Change-Id: I7b5964ef9d0e2319a47409ce0e378012a2094671 --- gnu/packages/ocaml.scm | 18 ------------------ 1 file changed, 18 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index d632289871..f47ccd8494 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2104,7 +2104,6 @@ to replace readline.") (lambda _ (invoke "dune" "upgrade") #t))))) - (properties `((ocaml4.07-variant . ,(delay ocaml4.07-bitstring)))) (home-page "https://github.com/xguerin/bitstring") (synopsis "Bitstrings and bitstring matching for OCaml") (description "Adds Erlang-style bitstrings and matching over bitstrings as @@ -2114,23 +2113,6 @@ as primitives to the language, making it exceptionally simple to use and very powerful.") (license license:isc))) -(define-public ocaml4.07-bitstring - (package-with-ocaml4.07 - (package - (inherit ocaml-bitstring) - (version "3.1.0") - (source (origin - (method url-fetch) - (uri (string-append "https://bitbucket.org/thanatonauts/bitstring/" - "get/v" version ".tar.gz")) - (file-name (string-append "ocaml-bitsring-" version ".tar.gz")) - (sha256 - (base32 - "15jjk2pq1vx311gl49s5ag6x5y0654x35w75z07g7kr2q334hqps")))) - (propagated-inputs - `(("ocaml-ppx-tools-versioned" ,ocaml4.07-ppx-tools-versioned))) - (properties '())))) - (define-public ocaml-ppx-bitstring (package (inherit ocaml-bitstring) -- cgit 1.4.1 From 76997a0ddb2d7dde8d390470f8d28f2ea3b7d6d1 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 24 Dec 2023 14:07:12 +0100 Subject: gnu: Remove ocaml4.07-base64. * gnu/packages/ocaml.scm (ocaml4.07-base64): Remove variable. (ocaml-base64)[properties]: Remove variant. Change-Id: Ibf92682e0d322e9d294c99f5532da2fe68a92f4a --- gnu/packages/ocaml.scm | 20 -------------------- 1 file changed, 20 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index f47ccd8494..dd52189811 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -4284,7 +4284,6 @@ multitude of other network protocols (FTP/SMTP/RTSP/etc).") (build-system dune-build-system) (native-inputs (list ocaml-alcotest ocaml-bos ocaml-rresult)) - (properties `((ocaml4.07-variant . ,(delay ocaml4.07-base64)))) (home-page "https://github.com/mirage/ocaml-base64") (synopsis "Base64 encoding for OCaml") (description "Base64 is a group of similar binary-to-text encoding schemes @@ -4292,25 +4291,6 @@ that represent binary data in an ASCII string format by translating it into a radix-64 representation. It is specified in RFC 4648.") (license license:isc))) -(define-public ocaml4.07-base64 - (package-with-ocaml4.07 - (package - (inherit ocaml-base64) - (version "3.2.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/mirage/ocaml-base64") - (commit (string-append "v" version)))) - (file-name (git-file-name "ocaml-base64" version)) - (sha256 - (base32 - "1ilw3zj0w6cq7i4pvr8m2kv5l5f2y9aldmv72drlwwns013b1gwy")))) - (arguments - ;; Tests are likely incompatible with our recent alcotest - `(#:tests? #f)) - (properties '())))) - (define-public ocamlify (package (name "ocamlify") -- cgit 1.4.1 From 1915c363744fbfc90c6eddcf70de89addaf62644 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 24 Dec 2023 14:09:01 +0100 Subject: gnu: Remove ocaml4.07-utop. * gnu/packages/ocaml.scm (ocaml4.07-utop): Remove variable. (ocaml-utop)[properties]: Remove variant. Change-Id: I5307736534705f79e681462d07cce61cfd08699c --- gnu/packages/ocaml.scm | 23 ----------------------- 1 file changed, 23 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index dd52189811..f320e7f760 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5523,7 +5523,6 @@ instead of bindings to a C library.") ocaml-lwt-react ocaml-react ocaml-zed)) - (properties `((ocaml4.07-variant . ,(delay ocaml4.07-utop)))) (home-page "https://github.com/ocaml-community/utop") (synopsis "Improved interface to the OCaml toplevel") (description "UTop is an improved toplevel for OCaml. It can run in a @@ -5531,28 +5530,6 @@ terminal or in Emacs. It supports line editing, history, real-time and context sensitive completion, colors, and more.") (license license:bsd-3))) -(define-public ocaml4.07-utop - (package-with-ocaml4.07 - (package - (inherit ocaml-utop) - (version "2.4.3") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/ocaml-community/utop") - (commit version))) - (file-name (git-file-name "ocaml4.07-utop" version)) - (sha256 - (base32 "1bl4943qpi3qy152dbdm5glhx19zsiylmn4rcxi8l66g58hikyjp")))) - (propagated-inputs - `(("ocaml-lambda-term" ,ocaml-lambda-term) - ("ocaml-lwt" ,ocaml-lwt) - ("ocaml-react" ,ocaml-react) - ("ocaml-camomile" ,ocaml-camomile) - ("ocaml-zed" ,ocaml-zed))) - (properties '())))) - (define-public ocaml-ansiterminal (package (name "ocaml-ansiterminal") -- cgit 1.4.1 From dd96805c888bc924a7bc42d39bc098c9791ab633 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 24 Dec 2023 14:10:37 +0100 Subject: gnu: Remove ocaml4.07-cstruct. * gnu/packages/ocaml.scm (ocaml4.07-cstruct): Remove variable. (ocaml-cstruct)[properties]: Remove variant. Change-Id: I623e2947aa9a597d9ee1342f27c7ec98d171b05e --- gnu/packages/ocaml.scm | 17 ----------------- 1 file changed, 17 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index f320e7f760..e218d27ec7 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -4852,7 +4852,6 @@ big- and little-endian, with their unsafe counter-parts.") (list ocaml-bigarray-compat)) (native-inputs (list ocaml-alcotest)) - (properties `((ocaml4.07-variant . ,(delay ocaml4.07-cstruct)))) (home-page "https://github.com/mirage/ocaml-cstruct") (synopsis "Access C structures via a camlp4 extension") (description "Cstruct is a library and syntax extension to make it easier @@ -4860,22 +4859,6 @@ to access C-like structures directly from OCaml. It supports both reading and writing to these structures, and they are accessed via the Bigarray module.") (license license:isc))) -(define-public ocaml4.07-cstruct - (package-with-ocaml4.07 - (package - (inherit ocaml-cstruct) - (version "5.1.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/mirage/ocaml-cstruct") - (commit (string-append "v" version)))) - (file-name (git-file-name "ocaml-cstruct" version)) - (sha256 - (base32 - "0jj3whs8r3jc524i9bb67rffh7y7r157hjgvws0bkxijxpjzwkbk")))) - (properties '())))) - ;; TODO again, the "parent" package already has an explicit package argument, ;; so a variant package doesn't make sense, at least these aliases help the ;; importer out so it doesn't re-import things. At least hopefully. -- cgit 1.4.1 From 2e8700052e26566b9c17563cf0a3d0979da6fbd1 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 24 Dec 2023 14:11:42 +0100 Subject: gnu: Remove ocaml4.07-batteries. * gnu/packages/ocaml.scm (ocaml4.07-batteries): Remove variable. (ocaml-batteries)[properties]: Remove variant. Change-Id: I7573033dd1a517cf4f9e456c4f8507e82065550c --- gnu/packages/ocaml.scm | 49 ------------------------------------------------- 1 file changed, 49 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index e218d27ec7..353185129f 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -4453,7 +4453,6 @@ samples.") (("Sys.readdir dirname") "let a = Sys.readdir dirname in Array.sort String.compare a; a")) #t))))) - (properties `((ocaml4.07-variant . ,(delay ocaml4.07-batteries)))) (home-page "http://batteries.forge.ocamlcore.org/") (synopsis "Development platform for the OCaml programming language") (description "Define a standard set of libraries which may be expected on @@ -4461,54 +4460,6 @@ every compliant installation of OCaml and organize these libraries into a hierarchy of modules.") (license license:lgpl2.1+))) -(define-public ocaml4.07-batteries - (package-with-ocaml4.07 - (package - (inherit ocaml-batteries) - (version "2.10.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/ocaml-batteries-team/batteries-included") - (commit (string-append "v" version)))) - (file-name (git-file-name "ocaml-batteries" version)) - (sha256 - (base32 - "02fxa1nkp7rpiwfp04n0sagdp9lad4dh9bvljp95xfshm1cx7y4q")))) - (arguments - `(#:phases - (modify-phases %standard-phases - (delete 'check) ; tests are run by the build phase - (add-before 'build 'fix-nondeterminism - (lambda _ - (substitute* "setup.ml" - (("Sys.readdir dirname") - "let a = Sys.readdir dirname in Array.sort String.compare a; a")) - #t)) - (replace 'build - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((files - (map (lambda (str) - (substring str 0 (- (string-length str) 1))) - (append - (find-files "src" ".*.mliv") - (find-files "src" ".*.mlv") - (find-files "src" ".*.mlp"))))) - (apply invoke "ocamlbuild" "-no-links" "-use-ocamlfind" "-I" "num" - "-lflag" "-dllpath-all" files) - (for-each (lambda (file) - (copy-file (string-append "_build/" file) file)) - files)) - (invoke "ocamlbuild" "-no-links" "-use-ocamlfind" "-I" "num" - "-lflag" "-dllpath-all" "build/mkconf.byte") - (copy-file "_build/build/mkconf.byte" "build/mkconf.byte") - (invoke "make" "all") - #t))))) - (native-inputs - `(("ocamlbuild" ,ocamlbuild) - ("qtest" ,ocaml-qtest))) - (properties '())))) - (define-public ocaml-pcre (package (name "ocaml-pcre") -- cgit 1.4.1 From b4a71d1d4f27cef6694e5f8c695ca9256f0bb0e1 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 24 Dec 2023 14:12:50 +0100 Subject: gnu: Remove ocaml4.07-uri. * gnu/packages/ocaml.scm (ocaml4.07-uri): Remove variable. (ocaml-uri)[properties]: Remove variant. Change-Id: I078537f7c1c10bcf319f3482ec50c252d25cb463 --- gnu/packages/ocaml.scm | 38 -------------------------------------- 1 file changed, 38 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 353185129f..8a4f15edb2 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -4901,45 +4901,7 @@ JSON.") (list ocaml-stringext ocaml-angstrom)) (native-inputs (list ocaml-ounit ocaml-ppx-sexp-conv)) - (properties `((upstream-name . "uri") - (ocaml4.07-variant ,(delay ocaml4.07-uri)))) - (synopsis "RFC3986 URI/URL parsing library") - (description "OCaml-uri is a library for parsing URI/URL in the RFC3986 format.") - (license license:isc))) - -(define-public ocaml4.07-uri - (package - (name "ocaml4.07-uri") - (version "2.2.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/mirage/ocaml-uri") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1ppbav41mszpjcl0zi3fyg958cxyfs57i7kvha4ds9ydn89bjmrh")))) - (build-system dune-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'build 'update-deprecated - (lambda _ - (substitute* "lib/uri.ml" - (("Re.get") "Re.Group.get"))))) - #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) - (native-inputs - `(("ocaml-ounit" ,(package-with-ocaml4.07 ocaml-ounit)) - ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)))) - (propagated-inputs - `(("ocaml-re" ,(package-with-ocaml4.07 ocaml-re)) - ("ocaml-sexplib0" ,(package-with-ocaml4.07 ocaml-sexplib0)) - ("ocaml-stringext" ,(package-with-ocaml4.07 ocaml-stringext)))) (properties `((upstream-name . "uri"))) - (home-page "https://github.com/mirage/ocaml-uri") (synopsis "RFC3986 URI/URL parsing library") (description "OCaml-uri is a library for parsing URI/URL in the RFC3986 format.") (license license:isc))) -- cgit 1.4.1 From e63133a6cc202b9d4bd2c597317ff2ad16eb7065 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 24 Dec 2023 14:13:53 +0100 Subject: gnu: Remove ocaml4.07-lambda-term. * gnu/packages/ocaml.scm (ocaml4.07-lambda-term): Remove variable. (ocaml-lambda-term)[properties]: Remove variant. Change-Id: I4c7a0a0833103acc39e48e74770f57a4b5df8f69 --- gnu/packages/ocaml.scm | 22 ---------------------- 1 file changed, 22 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 8a4f15edb2..3c44819f5b 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5365,7 +5365,6 @@ capabilities, Zed provides macro recording and cursor management facilities.") ocaml-odoc ocaml-react ocaml-zed)) - (properties `((ocaml4.07-variant . ,(delay ocaml4.07-lambda-term)))) (synopsis "Terminal manipulation library for OCaml") (description "Lambda-Term is a cross-platform library for manipulating the terminal. It provides an abstraction for keys, mouse events, colors, as well as @@ -5375,27 +5374,6 @@ manipulation than, for example, ncurses, by providing a native OCaml interface instead of bindings to a C library.") (license license:bsd-3))) -(define-public ocaml4.07-lambda-term - (package-with-ocaml4.07 - (package - (inherit ocaml-lambda-term) - (version "2.0.2") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/ocaml-community/lambda-term") - (commit version))) - (file-name (git-file-name "ocaml4.07-lambda-term" version)) - (sha256 - (base32 "0zcjy6fvf0d3i2ssz96asl889n3r6bplyzk7xvb2s3dkxbgcisyy")))) - (propagated-inputs - `(("ocaml-lwt" ,ocaml-lwt) - ("ocaml-lwt-log" ,ocaml-lwt-log) - ("ocaml-lwt-react" ,ocaml-lwt-react) - ("ocaml-zed" ,ocaml-zed))) - (properties '())))) - (define-public ocaml-utop (package (name "ocaml-utop") -- cgit 1.4.1 From fa126caee1214e7b873e8c7287a6bca8c9259c18 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 24 Dec 2023 14:14:43 +0100 Subject: gnu: Remove ocaml4.07-splittable-random. * gnu/packages/ocaml.scm (ocaml4.07-splittable-random): Remove variable. (ocaml-splittable-random)[properties]: Remove variant. Change-Id: I30cd8ccdc296655a60e821544151e2a38d46d3ca --- gnu/packages/ocaml.scm | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 3c44819f5b..7fe842550b 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -8121,8 +8121,7 @@ use in I/O and C-bindings.") ocaml-ppx-bench ocaml-ppx-inline-test ocaml-ppx-sexp-message)) - (properties `((upstream-name . "splittable_random") - (ocaml-4.07-variant . ,(delay ocaml4.07-splittable-random)))) + (properties `((upstream-name . "splittable_random"))) (home-page "https://github.com/janestreet/splittable_random") (synopsis "PRNG that can be split into independent streams") (description "This package provides a splittable @@ -8134,24 +8133,6 @@ This library implements a splittable pseudo-random number generator that sacrifi cryptographic-quality randomness in favor of performance.") (license license:expat))) -(define-public ocaml4.07-splittable-random - (package-with-ocaml4.07 - (package - (inherit ocaml-splittable-random) - (version "0.11.0") - (source (origin - (method url-fetch) - (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" - (version-major+minor version) - "/files/splittable_random-v" version ".tar.gz")) - (sha256 - (base32 - "0l1wbd881mymlnpzlq5q53mmdz3g5d7qjhyc7lfaq1x0iaccn5lc")))) - (propagated-inputs - (list ocaml-base ocaml-ppx-jane ocaml-migrate-parsetree)) - (properties '()) - (license license:asl2.0)))) - (define-public ocaml-base-quickcheck (package (name "ocaml-base-quickcheck") -- cgit 1.4.1 From 5823552c19dc2fbf054b05515d092081bc40f698 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 24 Dec 2023 14:15:26 +0100 Subject: gnu: Remove ocaml4.07-sedlex. * gnu/packages/ocaml.scm (ocaml4.07-sedlex): Remove variable. (ocaml-sedlex)[properties]: Remove variant. Change-Id: I6ce2cfac54b7bf8879fde315ea60e3932bac8a9c --- gnu/packages/ocaml.scm | 21 --------------------- 1 file changed, 21 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 7fe842550b..2c7711f1b7 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -3549,32 +3549,11 @@ and consumable.") (sha256 (base32 "0gsb1jpj3mnqbjgbavi4l95gl6g4agq58j82km22fdfg63j3w3fk")))))) - (properties `((ocaml4.07-variant . ,(delay ocaml4.07-sedlex)))) (home-page "https://www.cduce.org/download.html#side") (synopsis "Lexer generator for Unicode and OCaml") (description "Lexer generator for Unicode and OCaml.") (license license:expat))) -(define-public ocaml4.07-sedlex - (package-with-ocaml4.07 - (package - (inherit ocaml-sedlex) - (name "ocaml-sedlex") - (version "2.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/ocaml-community/sedlex") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "05f6qa8x3vhpdz1fcnpqk37fpnyyq13icqsk2gww5idjnh6kng26")))) - (propagated-inputs - `(("ocaml-ppx-tools-versioned" ,ocaml4.07-ppx-tools-versioned) - ,@(package-propagated-inputs ocaml-sedlex))) - (properties '())))) - (define-public ocaml-uchar (package (name "ocaml-uchar") -- cgit 1.4.1 From 476a16e173415662b7638883c23ae41cf5760dad Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 24 Dec 2023 14:16:14 +0100 Subject: gnu: Remove ocaml4.07-sqlite3. * gnu/packages/ocaml.scm (ocaml4.07-sqlite3): Remove variable. (ocaml-sqlite3)[properties]: Remove variant. Change-Id: I336d685ac271e50d0bb4ed0e41d0bcee38ee4686 --- gnu/packages/ocaml.scm | 27 --------------------------- 1 file changed, 27 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 2c7711f1b7..30a5b102d6 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2247,7 +2247,6 @@ library.") (base32 "1ksm0a490315sf0yy8lmva5f3bgr0jnllffanyq89431grpj6x15")))) (build-system dune-build-system) - (properties `((ocaml4.07-variant . ,(delay ocaml4.07-sqlite3)))) (propagated-inputs (list dune-configurator ocaml-odoc)) (native-inputs @@ -2263,32 +2262,6 @@ coexistence with the old (version 2) SQLite and its OCaml wrapper @code{ocaml-sqlite}.") (license license:expat))) -(define-public ocaml4.07-sqlite3 - (package-with-ocaml4.07 - (package - (inherit ocaml-sqlite3) - (version "5.0.2") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/mmottl/sqlite3-ocaml") - (commit version))) - (file-name (git-file-name "ocaml-sqlite3" version)) - (sha256 - (base32 - "15mmq7ak5facpfawfrc6hjz211gli7jab52iqdsihfvh790xm55f")))) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'build 'chmod - (lambda _ - (for-each (lambda (file) (chmod file #o644)) (find-files "." ".*")) - #t))))) - (propagated-inputs - `(("ocaml-odoc" ,ocaml-odoc))) - (properties '())))) - (define-public ocaml-csv (package (name "ocaml-csv") -- cgit 1.4.1 From 1ff5aef15c855588deac2b3e834ee1479cc26083 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 24 Dec 2023 14:17:16 +0100 Subject: gnu: Remove ocaml4.07-zed. * gnu/packages/ocaml.scm (ocaml4.07-zed): Remove variable. (ocaml-zed)[properties]: Remove variant. Change-Id: I13b2f5b0a3f38ca9a2f57e207487889adaad2d03 --- gnu/packages/ocaml.scm | 21 --------------------- 1 file changed, 21 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 30a5b102d6..5058201eb0 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5262,7 +5262,6 @@ function that follows the prototype of POSIX's wcwidth.") ocaml-uucp ocaml-uuseg ocaml-odoc)) - (properties `((ocaml4.07-variant . ,(delay ocaml4.07-zed)))) (synopsis "Abstract engine for text edition in OCaml") (description "This module provides an abstract engine for text edition. It can be @@ -5274,26 +5273,6 @@ regular expression search on ropes. To support efficient text edition capabilities, Zed provides macro recording and cursor management facilities.") (license license:bsd-3))) -(define-public ocaml4.07-zed - (package-with-ocaml4.07 - (package - (inherit ocaml-zed) - (version "2.0.3") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/ocaml-community/zed") - (commit version))) - (file-name (git-file-name "ocaml4.07-zed" version)) - (sha256 - (base32 - "0pa9awinqr0plp4b2az78dwpvh01pwaljnn5ydg8mc6hi7rmir55")))) - (propagated-inputs - `(("ocaml-charInfo-width" ,ocaml-charinfo-width) - ("ocaml-camomile" ,ocaml-camomile) - ("ocaml-react" ,ocaml-react))) - (properties '())))) - (define-public ocaml-lambda-term (package (name "ocaml-lambda-term") -- cgit 1.4.1 From dc0a6dc61b269861fc21efa78af56207f662ee13 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 24 Dec 2023 14:18:08 +0100 Subject: gnu: Remove ocaml4.07-core. * gnu/packages/ocaml.scm (ocaml4.07-core): Remove variable. Change-Id: Ie1e593746061506133e2e344e8c5021ad77f6820 --- gnu/packages/ocaml.scm | 29 ----------------------------- 1 file changed, 29 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 5058201eb0..9a437f2dc0 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -8271,35 +8271,6 @@ standard library that was developed by Jane Street.") ;; by OCaml's license for consortium members (see THIRD-PARTY.txt). (license license:expat))) -(define-public ocaml4.07-core - (package-with-ocaml4.07 - (package - (inherit ocaml-core) - (version "0.11.3") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/janestreet/core") - (commit (string-append "v" version)))) - (file-name (git-file-name "ocaml4.07-core" version)) - (sha256 - (base32 - "0pzl8n09z4f3i7z2wq4cjxfqrr8mj6xcdp7rbg0nxap2zdhjgvrq")))) - (propagated-inputs - (list ocaml-base - ocaml4.07-configurator - ocaml-core-kernel - ocaml-ppx-assert - ocaml-ppx-jane - ocaml-sexplib - ocaml-spawn - ocaml-stdio - ocaml-migrate-parsetree - ocaml-ppxlib)) - ;; Also contains parts of OCaml, relicensed to asl2.0, as permitted - ;; by OCaml's license for consortium members (see THIRD-PARTY.txt). - (license license:asl2.0)))) - (define-public ocaml-int-repr (package (name "ocaml-int-repr") -- cgit 1.4.1 From 560a6c4962276aaba181e966b0b07e014b7f55ac Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 24 Dec 2023 14:18:52 +0100 Subject: gnu: Remove ocaml4.07-core-kernel. * gnu/packages/ocaml.scm (ocaml4.07-core-kernel): Remove variable. (ocaml-core-kernel)[properties]: Remove variant. Change-Id: Ia3c7b3fd2f5b3712c46e091f707961bc18123296 --- gnu/packages/ocaml.scm | 43 +------------------------------------------ 1 file changed, 1 insertion(+), 42 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 9a437f2dc0..c8f53c193c 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -8313,8 +8313,7 @@ standard library that was developed by Jane Street.") `(#:tests? #f)) (propagated-inputs (list ocaml-base ocaml-core ocaml-int-repr ocaml-ppx-jane)) - (properties `((upstream-name . "core_kernel") - (ocaml4.07-variant . ,(delay ocaml4.07-core-kernel)))) + (properties `((upstream-name . "core_kernel"))) (home-page "https://github.com/janestreet/core_kernel") (synopsis "Portable standard library for OCaml") (description "Core is an alternative to the OCaml standard library. @@ -8323,46 +8322,6 @@ Core_kernel is the system-independent part of Core. It is aimed for cases when the full Core is not available, such as in Javascript.") (license license:expat))) -(define-public ocaml4.07-core-kernel - (package-with-ocaml4.07 - (package - (inherit ocaml-core-kernel) - (version "0.11.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/janestreet/core_kernel") - (commit (string-append "v" version)))) - (file-name (git-file-name "ocaml4.07-core-kernel" version)) - (sha256 - (base32 - "1dg7ygy7i64c5gaakb1cp1b26p9ks81vbxmb8fd7jff2q60j2z2g")))) - (propagated-inputs - (list ocaml-base - ocaml-bin-prot - ocaml4.07-configurator - ocaml-fieldslib - ocaml-jane-street-headers - ocaml-ppx-assert - ocaml-ppx-base - ocaml-ppx-hash - ocaml-ppx-inline-test - ocaml-ppx-jane - ocaml-ppx-sexp-conv - ocaml-ppx-sexp-message - ocaml-sexplib - ocaml-splittable-random - ocaml-stdio - ocaml-typerep - ocaml-variantslib - ocaml-migrate-parsetree)) - (properties '()) - (license (list - ;; this package and parts of OCaml, relicensed by janestreet - license:asl2.0 - ;; MLton and sjs - license:expat))))) - (define-public ocaml-core-unix (package (name "ocaml-core-unix") -- cgit 1.4.1 From bbd0a46127cd673f7d1d1507e33b8486a9afde3a Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 24 Dec 2023 14:19:47 +0100 Subject: gnu: Remove ocaml4.07-frontc. * gnu/packages/ocaml.scm (ocaml4.07-frontc): Remove variable. (ocaml-frontc)[properties]: Remove variant. Change-Id: I52bf626af56d05e6230365825b944240cc523cdc --- gnu/packages/ocaml.scm | 42 +----------------------------------------- 1 file changed, 1 insertion(+), 41 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index c8f53c193c..8f8758ed59 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1638,8 +1638,7 @@ for speed and space economy.") (for-each make-file-writable (find-files "." "."))))))) (native-inputs (list ocaml-menhir ocaml-odoc)) - (properties `((upstream-name . "FrontC") - (ocaml4.07-variant . ,(delay ocaml4.07-frontc)))) + (properties `((upstream-name . "FrontC"))) (home-page "https://www.irit.fr/FrontC") (synopsis "C parser and lexer library") (description "FrontC is an OCAML library providing a C parser and lexer. @@ -1648,45 +1647,6 @@ It provides support for ANSI C syntax, old-C K&R style syntax and the standard GNU CC attributes. It provides also a C pretty printer as an example of use.") (license license:lgpl2.1))) -(define-public ocaml4.07-frontc - (package-with-ocaml4.07 - (package - (inherit ocaml-frontc) - (version "3.4.2") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/mirage/ocaml-base64") - (commit (string-append - "V_" (string-join (string-split version #\.) "_"))))) - (file-name (git-file-name "ocaml-frontc" version)) - (sha256 - (base32 - "0k7jk9hkglnkk27s62xl493jyqc017gyvwqb1lyc0ywbb001s102")))) - (build-system ocaml-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (delete 'configure) - (add-after 'install 'install-meta - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (with-output-to-file - (string-append out "/lib/ocaml/frontc/META") - (lambda _ - (display - (string-append - "description = \"Parser for the C language\" -version = \"" ,version "\" -requires = \"unix\" -archive(byte) = \"frontc.cma\" -archive(native) = \"frontc.cmxa\"")))) - (symlink (string-append out "/lib/ocaml/frontc") - (string-append out "/lib/ocaml/FrontC")))))) - #:make-flags ,#~(list (string-append "PREFIX=" #$output) - "OCAML_SITE=$(LIB_DIR)/ocaml/"))) - (properties '())))) - (define-public ocaml-qcheck (package (name "ocaml-qcheck") -- cgit 1.4.1 From 17101812a8c231d2d8d69bb2137c67cd929c6eca Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 24 Dec 2023 14:20:28 +0100 Subject: gnu: Remove ocaml4.07-qcheck. * gnu/packages/ocaml.scm (ocaml4.07-qcheck): Remove variable. (ocaml-qcheck)[properties]: Remove variant. Change-Id: I5d658a105d626315742428a68638222da212bea6 --- gnu/packages/ocaml.scm | 17 ----------------- 1 file changed, 17 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 8f8758ed59..5169877b46 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1665,7 +1665,6 @@ GNU CC attributes. It provides also a C pretty printer as an example of use.") (list ocaml-alcotest ocaml-ounit ocaml-ppxlib)) (native-inputs (list ocamlbuild)) - (properties `((ocaml4.07-variant . ,(delay ocaml4.07-qcheck)))) (home-page "https://github.com/c-cube/qcheck") (synopsis "QuickCheck inspired property-based testing for OCaml") (description "QuickCheck inspired property-based testing for OCaml. This @@ -1674,22 +1673,6 @@ generated instances of the type. It provides combinators for generating instances and printing them.") (license license:lgpl3+))) -(define-public ocaml4.07-qcheck - (package-with-ocaml4.07 - (package - (inherit ocaml-qcheck) - (version "0.12") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/c-cube/qcheck") - (commit version))) - (file-name (git-file-name "ocaml-qcheck" version)) - (sha256 - (base32 - "1llnfynhlndwyjig7wrayjnds2b3mggp5lw20dwxhn2i2lkkb22m")))) - (properties '())))) - (define-public ocaml-qtest (package (name "ocaml-qtest") -- cgit 1.4.1 From b9dcefa5703144af00eab9723dd2f4865d97d572 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 24 Dec 2023 14:21:40 +0100 Subject: gnu: Remove ocaml4.07-jane-street-headers. * gnu/packages/ocaml.scm (ocaml4.07-jane-street-headers): Remove variable. (ocaml-jane-street-headers)[properties]: Remove variant. Change-Id: I4df9b3a74ea8100605bf730848888db4f63c1dc0 --- gnu/packages/ocaml.scm | 24 ------------------------ 1 file changed, 24 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 5169877b46..fdb3dabb9c 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5566,7 +5566,6 @@ recommend using this package directly.") "1r27r0bxxa0iaah5rm84lwhrmh784vfpmb6056hpv0p34rxs7r1l")) (build-system dune-build-system) (arguments '(#:tests? #f)) ; no tests - (properties `((ocaml4.07-variant . ,(delay ocaml4.07-jane-street-headers)))) (home-page "https://github.com/janestreet/jane-street-headers") (synopsis "Jane Street C header files") (description "C header files shared between the various Jane Street @@ -8040,29 +8039,6 @@ Haskell's Quickcheck library, with support for built-in types as well as types provided by Base.") (license license:expat))) -(define-public ocaml4.07-jane-street-headers - (package - (name "ocaml4.07-jane-street-headers") - (version "0.11.0") - (source (origin - (method url-fetch) - (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" - (version-major+minor version) - "/files/jane-street-headers-v" version ".tar.gz")) - (sha256 - (base32 - "0afhzm08l9v883fhpqqh2lmy7az609pxif40bp7x1sk8c0yszqsh")))) - (build-system dune-build-system) - (arguments - `(#:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) - (home-page "https://github.com/janestreet/jane-street-headers") - (synopsis "Jane Street C header files") - (description "This package provides C header files shared between the -various Jane Street packages.") - (license license:asl2.0))) - (define-public ocaml4.07-configurator (package (name "ocaml4.07-configurator") -- cgit 1.4.1 From 71b29cfac94cd33c4f3a989ef2f49d9c00fbce0d Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 24 Dec 2023 14:22:38 +0100 Subject: gnu: Remove ocaml4.07-odoc. * gnu/packages/ocaml.scm (ocaml4.07-odoc): Remove variable. (ocaml-odoc)[properties]: Remove variant. Change-Id: I903ba64cfb460064531a502ca0c97e81ed4bbb82 --- gnu/packages/ocaml.scm | 36 ------------------------------------ 1 file changed, 36 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index fdb3dabb9c..f99135d2e3 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -8674,7 +8674,6 @@ then run the Bisect_ppx report tool on the generated visitation files.") ocaml-version ocaml-yojson jq)) - (properties `((ocaml4.07-variant . ,(delay ocaml4.07-odoc)))) (home-page "https://github.com/ocaml/odoc") (synopsis "OCaml documentation generator") (description "Odoc is a documentation generator for OCaml. It reads @@ -8713,41 +8712,6 @@ documentation comments, formatted using Odoc syntax, an extension of the language understood by ocamldoc.") (license license:isc))) -;; version 1.5.2 requires ocaml-markdown 1.0.0 which does not compile -;; with old version of dune used in package-with-ocaml4.07 -(define-public ocaml4.07-odoc - (package-with-ocaml4.07 - (package - (inherit ocaml-odoc) - (name "ocaml-odoc") - (version "1.5.1") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/ocaml/odoc") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0z2nisg1vb5xlk41hqw8drvj90v52wli7zvnih6a844cg6xsvvj2")))) - (arguments '()) - (inputs - `(("ocaml-alcotest" ,ocaml-alcotest) - ("ocaml-markup" ,ocaml-markup) - ("ocaml-sexplib" ,ocaml-sexplib) - ("ocaml-re" ,ocaml-re) - ("ocaml-uutf" ,ocaml-uutf))) - (native-inputs - `(("ocaml-astring" ,ocaml-astring) - ("ocaml-cmdliner" ,ocaml-cmdliner) - ("ocaml-cppo" ,ocaml-cppo) - ("ocaml-fpath" ,ocaml-fpath) - ("ocaml-result" ,ocaml-result) - ("ocaml-tyxml" ,ocaml-tyxml) - ("ocaml-bisect-ppx" ,ocaml-bisect-ppx) - ("tidy-html" ,tidy-html))) - (properties '())))) - (define-public ocaml-fftw3 (package (name "ocaml-fftw3") -- cgit 1.4.1 From da9771c0f295b2e343465216e5fe18f244e40d56 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 24 Dec 2023 14:23:23 +0100 Subject: gnu: Remove ocaml4.07-spawn. * gnu/packages/ocaml.scm (ocaml4.07-spawn): Remove variable. (ocaml-spawn)[properties]: Remove variant. Change-Id: Ib655eca9b305de23aa0cee0e29e51d9acea01094 --- gnu/packages/ocaml.scm | 31 ------------------------------- 1 file changed, 31 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index f99135d2e3..092272c08d 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -8092,8 +8092,6 @@ Configurator allows one to: (build-system dune-build-system) (propagated-inputs (list ocaml-odoc)) (native-inputs (list ocaml-ppx-expect)) - (properties - `((ocaml4.07-variant . ,(delay ocaml4.07-spawn)))) (home-page "https://github.com/janestreet/spawn") (synopsis "Spawning sub-processes") (description @@ -8115,35 +8113,6 @@ thousands of times faster than fork. @end itemize") (license license:asl2.0))) -(define-public ocaml4.07-spawn - (package-with-ocaml4.07 - (package - (inherit ocaml-spawn) - (version "0.13.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/janestreet/spawn") - (commit (string-append "v" version)))) - (file-name (git-file-name "ocaml4.07-spawn" version)) - (sha256 - (base32 - "1w003k1kw1lmyiqlk58gkxx8rac7dchiqlz6ah7aj7bh49b36ppf")))) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'check 'fix-tests - (lambda _ - (substitute* "test/tests.ml" - (("/bin/pwd") (which "pwd")) - (("/bin/echo") (which "echo"))) - #t))) - #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) - (propagated-inputs '()) - (properties '())))) - (define-public ocaml-core (package (name "ocaml-core") -- cgit 1.4.1 From 954108bd30483f87de15da398681114e4e76d3c6 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 24 Dec 2023 14:24:04 +0100 Subject: gnu: Remove ocaml4.07-ppx-jane. * gnu/packages/ocaml.scm (ocaml4.07-ppx-jane): Remove variable. (ocaml-ppx-jane)[properties]: Remove variant. Change-Id: Ia40acb52457f5c70221d424ec7015877b70ce614 --- gnu/packages/ocaml.scm | 40 +--------------------------------------- 1 file changed, 1 insertion(+), 39 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 092272c08d..0d2fecb3ec 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -7907,51 +7907,13 @@ nodes for lazily rendering log messages.") ocaml-ppx-typerep-conv ocaml-ppx-variants-conv ocaml-ppxlib)) - (properties `((upstream-name . "ppx_jane") - (ocaml4.07-variant . ,(delay ocaml4.07-ppx-jane)))) + (properties `((upstream-name . "ppx_jane"))) (home-page "https://github.com/janestreet/ppx_jane") (synopsis "Standard Jane Street ppx rewriters") (description "This package installs a ppx-jane executable, which is a ppx driver including all standard Jane Street ppx rewriters.") (license license:expat))) -(define-public ocaml4.07-ppx-jane - (package-with-ocaml4.07 - (package - (inherit ocaml-ppx-jane) - (version "0.11.0") - (source (origin - (method url-fetch) - (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" - (version-major+minor version) - "/files/ppx_jane-v" version ".tar.gz")) - (sha256 - (base32 - "0lgppkw3aixrfnixihrsz2ipafv8fpvkdpy3pw8n0r615gg8x8la")))) - (propagated-inputs - (list ocaml-ppx-assert - ocaml-ppx-base - ocaml-ppx-bench - ocaml-ppx-bin-prot - ocaml-ppx-custom-printf - ocaml-ppx-expect - ocaml-ppx-fail - ocaml-ppx-fields-conv - ocaml-ppx-here - ocaml-ppx-inline-test - ocaml-ppx-let - ocaml-ppx-optcomp - ocaml-ppx-optional - ocaml-ppx-pipebang - ocaml-ppx-sexp-message - ocaml-ppx-sexp-value - ocaml-ppx-typerep-conv - ocaml-ppx-variants-conv - ocaml-migrate-parsetree - ocaml-ppxlib)) - (properties '()) - (license license:asl2.0)))) - (define-public ocaml-base-bigstring (package (name "ocaml-base-bigstring") -- cgit 1.4.1 From 44e4726a5eff2c0c70561e196f3e74f1a5a91789 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 25 Dec 2023 10:55:30 +0100 Subject: gnu: Remove ocaml4.07-tyxml. * gnu/packages/ocaml.scm (ocaml4.07-tyxml): Remove variable. (ocaml-tyxml)[properties]: Remove variant. Change-Id: I2b86d01832baf4c139e2a0391a4dd344982bb160 --- gnu/packages/ocaml.scm | 17 ----------------- 1 file changed, 17 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 0d2fecb3ec..c96a2a24cd 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -8472,7 +8472,6 @@ stream, and convert everything to UTF-8.") (native-inputs (list ocaml-alcotest)) (arguments `(#:package "tyxml")) - (properties `((ocaml4.07-variant . ,(delay ocaml4.07-tyxml)))) (home-page "https://github.com/ocsigen/tyxml/") (synopsis "TyXML is a library for building correct HTML and SVG documents") (description "TyXML provides a set of convenient combinators that uses the @@ -8484,22 +8483,6 @@ also create your own representation and use it to instantiate a new set of combinators.") (license license:lgpl2.1))) -(define-public ocaml4.07-tyxml - (package-with-ocaml4.07 - (package - (inherit ocaml-tyxml) - (version "4.4.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/ocsigen/tyxml") - (commit version))) - (file-name (git-file-name "ocaml-tyxml" version)) - (sha256 - (base32 - "1hw4phyadcfgywgh5sj87i76gp56qwxzwlcpfdwjbf6ggag9clmd")))) - (properties '())))) - (define-public ocaml-bisect-ppx (package (name "ocaml-bisect-ppx") -- cgit 1.4.1 From 553c25da8240e035d9853f167c79177385a9a4ca Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 25 Dec 2023 10:56:16 +0100 Subject: gnu: Remove ocaml4.07-ppx-typerep-conv. * gnu/packages/ocaml.scm (ocaml4.07-ppx-typerep-conv): Remove variable. (ocaml-ppx-typerep-conv)[properties]: Remove variant. Change-Id: Iacd645286f2b1819d94c44fb6545382d755906bd --- gnu/packages/ocaml.scm | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index c96a2a24cd..b6590509af 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -7622,33 +7622,13 @@ packages.") (base32 "1q1lzykpm83ra4l5jh4rfddhd3c96kx4s4rvx0w4b51z1qk56zam")))) (build-system dune-build-system) (propagated-inputs (list ocaml-base ocaml-typerep ocaml-ppxlib)) - (properties `((upstream-name . "ppx_typerep_conv") - (ocaml4.07-variant . ,(delay ocaml4.07-ppx-typerep-conv)))) + (properties `((upstream-name . "ppx_typerep_conv"))) (home-page "https://github.com/janestreet/ppx_typerep_conv") (synopsis "Generation of runtime types from type declarations") (description "This package can automatically generate runtime types from type definitions.") (license license:expat))) -(define-public ocaml4.07-ppx-typerep-conv - (package-with-ocaml4.07 - (package - (inherit ocaml-ppx-typerep-conv) - (version "0.11.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/janestreet/ppx_typerep_conv") - (commit (string-append "v" version)))) - (file-name (git-file-name "ocaml4.07-ppx-typerep-conv" version)) - (sha256 - (base32 - "0a13dpfrrg0rsm8qni1bh7pqcda30l70z8r6yzi5a64bmwk7g5ah")))) - (properties '()) - (propagated-inputs - (list ocaml-base ocaml-typerep ocaml-migrate-parsetree ocaml-ppxlib)) - (license license:asl2.0)))) - (define-public ocaml-ppx-string (package (name "ocaml-ppx-string") -- cgit 1.4.1 From 76968f549d4828cc8e6425b0e0ff8568c9803fe3 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 25 Dec 2023 10:57:04 +0100 Subject: gnu: Remove ocaml4.07-ppx-pipebang. * gnu/packages/ocaml.scm (ocaml4.07-ppx-pipebang): Remove variable. (ocaml-ppx-pipebang)[properties]: Remove variant. Change-Id: I3c74444122e43571c9922bf703701e20b7baf58f --- gnu/packages/ocaml.scm | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index b6590509af..f8bdff934e 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -7211,31 +7211,13 @@ context such as function arguments.") (build-system dune-build-system) (arguments `(#:tests? #f)); no tests (propagated-inputs (list ocaml-ppxlib)) - (properties `((upstream-name . "ppx_pipebang") - (ocaml4.07-variant . ,(delay ocaml4.07-ppx-pipebang)))) + (properties `((upstream-name . "ppx_pipebang"))) (home-page "https://github.com/janestreet/ppx_pipebang") (synopsis "Inline reverse application operators `|>` and `|!`") (description "A ppx rewriter that inlines reverse application operators @code{|>} and @code{|!}.") (license license:expat))) -(define-public ocaml4.07-ppx-pipebang - (package-with-ocaml4.07 - (package - (inherit ocaml-ppx-pipebang) - (version "0.11.0") - (source (origin - (method url-fetch) - (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" - (version-major+minor version) - "/files/ppx_pipebang-v" version ".tar.gz")) - (sha256 - (base32 - "1wrrzlb4kdvkkcmzi01fw25jar38r2jlnyn0i6pn4z0lq4gpm9m0")))) - (propagated-inputs (list ocaml-migrate-parsetree ocaml-ppxlib)) - (properties '()) - (license license:asl2.0)))) - (define-public ocaml-ppx-module-timer (package (name "ocaml-ppx-module-timer") -- cgit 1.4.1 From 6446f0dfc3c4c37c72781f079ae415378f668d52 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 25 Dec 2023 10:57:46 +0100 Subject: gnu: Remove ocaml4.07-ppx-fail. * gnu/packages/ocaml.scm (ocaml4.07-ppx-fail): Remove variable. (ocaml-ppx-fail)[properties]: Remove variant. Change-Id: Iec707f415906d109a2eb2076477c2bfecc27bcc8 --- gnu/packages/ocaml.scm | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index f8bdff934e..136ab4151a 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -7381,32 +7381,13 @@ match expressions, and if expressions.") (base32 "012p9gv7w4sk3b4x0sdmqrmr2856w8xc424waxb6vrybid7qjs95")))) (build-system dune-build-system) (propagated-inputs (list ocaml-base ocaml-ppx-here ocaml-ppxlib)) - (properties `((upstream-name . "ppx_fail") - (ocaml4.07-variant . ,(delay ocaml4.07-ppx-fail)))) + (properties `((upstream-name . "ppx_fail"))) (home-page "https://github.com/janestreet/ppx_fail") (synopsis "Add location to calls to failwiths") (description "Syntax extension that makes [failwiths] always include a position.") (license license:expat))) -(define-public ocaml4.07-ppx-fail - (package-with-ocaml4.07 - (package - (inherit ocaml-ppx-fail) - (version "0.11.0") - (source (origin - (method url-fetch) - (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" - (version-major+minor version) - "/files/ppx_fail-v" version ".tar.gz")) - (sha256 - (base32 - "07plqsvljiwvngggfypwq55g46s5my55y45mvlmalrxyppzr03s8")))) - (propagated-inputs - (list ocaml-base ocaml-ppx-here ocaml-migrate-parsetree ocaml-ppxlib)) - (properties '()) - (license license:asl2.0)))) - (define-public ocaml-ppx-cold (package (name "ocaml-ppx-cold") -- cgit 1.4.1 From 0dc699477e79bb7a9cc1147439dbc04f3d006520 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 25 Dec 2023 10:58:28 +0100 Subject: gnu: Remove ocaml4.07-bisect-ppx. * gnu/packages/ocaml.scm (ocaml4.07-bisect-ppx): Remove variable. (ocaml-bisect-ppx)[properties]: Remove variant. Change-Id: I91dcdd486980885530ea2e269328ecf781aee020 --- gnu/packages/ocaml.scm | 29 +---------------------------- 1 file changed, 1 insertion(+), 28 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 136ab4151a..1dda348ade 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -8446,8 +8446,7 @@ combinators.") (arguments ;; Tests require ocamlformat which would lead to circular dependencies '(#:tests? #f)) - (properties `((upstream-name . "bisect_ppx") - (ocaml4.07-variant . ,(delay ocaml4.07-bisect-ppx)))) + (properties `((upstream-name . "bisect_ppx"))) (home-page "https://github.com/aantron/bisect_ppx") (synopsis "Code coverage for OCaml") (description "Bisect_ppx helps you test thoroughly. It is a small @@ -8459,32 +8458,6 @@ Usage is simple - add package bisect_ppx when building tests, run your tests, then run the Bisect_ppx report tool on the generated visitation files.") (license license:mpl2.0))) -(define-public ocaml4.07-bisect-ppx - (package-with-ocaml4.07 - (package - (inherit ocaml-bisect-ppx) - (version "2.4.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/aantron/bisect_ppx") - (commit version))) - (file-name (git-file-name "ocaml-bisect-ppx" version)) - (sha256 - (base32 - "1njs8xc108rrpx5am5zhhcn6vjva7rsphm8034qp5lgyvnhfgh7q")))) - (propagated-inputs - `(("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) - ("ocaml-ppx-tools-versioned" ,ocaml4.07-ppx-tools-versioned) - ,@(package-propagated-inputs ocaml-bisect-ppx))) - (native-inputs - `(("ocaml-ounit2" ,ocaml-ounit2))) - (arguments - `(;; tests require git and network - #:tests? #f)) - (properties '((upstream-name . "bisect_ppx")))))) - (define-public ocaml-odoc (package (name "ocaml-odoc") -- cgit 1.4.1 From 9ba9487306843c7c959e62ab28e6197801828580 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 25 Dec 2023 10:59:11 +0100 Subject: gnu: Remove ocaml4.07-ppx-sexp-message. * gnu/packages/ocaml.scm (ocaml4.07-ppx-sexp-message): Remove variable. (ocaml-ppx-sexp-message)[properties]: Remove variant. Change-Id: Iaee2fbecb086ddad1b15b878d8148f9101903834 --- gnu/packages/ocaml.scm | 25 +------------------------ 1 file changed, 1 insertion(+), 24 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 1dda348ade..860ff4f752 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -7163,8 +7163,7 @@ building s-expressions from ocaml values.") (build-system dune-build-system) (propagated-inputs (list ocaml-base ocaml-ppx-here ocaml-ppx-sexp-conv ocaml-ppxlib)) - (properties `((upstream-name . "ppx_sexp_message") - (ocaml4.07-variant . ,(delay ocaml4.07-ppx-sexp-message)))) + (properties `((upstream-name . "ppx_sexp_message"))) (home-page "https://github.com/janestreet/ppx_sexp_message") (synopsis "Ppx rewriter for easy construction of s-expressions") (description "Ppx_sexp_message aims to ease the creation of s-expressions @@ -7173,28 +7172,6 @@ where one needs to construct a s-expression based on various element of the context such as function arguments.") (license license:expat))) -(define-public ocaml4.07-ppx-sexp-message - (package-with-ocaml4.07 - (package - (inherit ocaml-ppx-sexp-message) - (version "0.11.0") - (source (origin - (method url-fetch) - (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" - (version-major+minor version) - "/files/ppx_sexp_message-v" version ".tar.gz")) - (sha256 - (base32 - "1yh440za0w9cvrbxbmqacir8715kdaw6sw24ys9xj80av9nqpiw7")))) - (propagated-inputs - (list ocaml-base - ocaml-ppx-here - ocaml-ppx-sexp-conv - ocaml-migrate-parsetree - ocaml-ppxlib)) - (properties '()) - (license license:asl2.0)))) - (define-public ocaml-ppx-pipebang (package (name "ocaml-ppx-pipebang") -- cgit 1.4.1 From 3d74d84235038a8329a734918c3dd0093c4935ab Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 25 Dec 2023 10:59:56 +0100 Subject: gnu: Remove ocaml4.07-ppx-base. * gnu/packages/ocaml.scm (ocaml4.07-ppx-base): Remove variable. (ocaml-ppx-base)[properties]: Remove variant. Change-Id: I1a079a895eb260bb6870a12f494b79869a5a350c --- gnu/packages/ocaml.scm | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 860ff4f752..ae549473f7 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -7632,8 +7632,7 @@ conversion functions between almost identical types.") ocaml-ppx-sexp-conv ocaml-migrate-parsetree ocaml-ppxlib)) - (properties `((upstream-name . "ppx_base") - (ocaml4.07-variant . ,(delay ocaml4.07-ppx-base)))) + (properties `((upstream-name . "ppx_base"))) (home-page "https://github.com/janestreet/ppx_base") (synopsis "Base set of ppx rewriters") (description "Ppx_base is the set of ppx rewriters used for Base. @@ -7642,25 +7641,6 @@ Note that Base doesn't need ppx to build, it is only used as a verification tool.") (license license:asl2.0))) -(define-public ocaml4.07-ppx-base - (package-with-ocaml4.07 - (package - (inherit ocaml-ppx-base) - (version "0.11.0") - (source - (janestreet-origin - "ppx_base" version - "0aq206pg330jmj7lhcagiiwm3a0b3gsqm801m8ajd4ysyw7idkym")) - (propagated-inputs - `(("ocaml-ppx-compare" ,ocaml-ppx-compare) - ("ocaml-ppx-enumerate" ,ocaml-ppx-enumerate) - ("ocaml-ppx-hash" ,ocaml-ppx-hash) - ("ocaml-ppx-js-style" ,ocaml-ppx-js-style) - ("ocaml-ppx-sexp-conv" ,ocaml-ppx-sexp-conv) - ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) - ("ocaml-ppxlib" ,ocaml-ppxlib))) - (properties `((upstream-name . "ppx_base")))))) - (define-public ocaml-ppx-bin-prot (package (name "ocaml-ppx-bin-prot") -- cgit 1.4.1 From 47532ebc1e9fd00fa101b8a7f76f318daf7d46b4 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 25 Dec 2023 11:00:41 +0100 Subject: gnu: Remove ocaml4.07-ppx-bin-prot. * gnu/packages/ocaml.scm (ocaml4.07-ppx-bin-prot): Remove variable. (ocaml-ppx-bin-prot)[properties]: Remove variant. Change-Id: I132d19d38cbb40c72afaa86a758ca0d4267fe645 --- gnu/packages/ocaml.scm | 26 +------------------------- 1 file changed, 1 insertion(+), 25 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index ae549473f7..631b7e2bf0 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -7660,37 +7660,13 @@ verification tool.") `(#:tests? #f)) (propagated-inputs (list ocaml-base ocaml-bin-prot ocaml-ppx-here ocaml-ppxlib)) - (properties `((upstream-name . "ppx_bin_prot") - (ocaml4.07-variant . ,(delay ocaml4.07-ppx-bin-prot)))) + (properties `((upstream-name . "ppx_bin_prot"))) (home-page "https://github.com/janestreet/ppx_bin_prot") (synopsis "Generation of bin_prot readers and writers from types") (description "Generation of binary serialization and deserialization functions from type definitions.") (license license:expat))) -(define-public ocaml4.07-ppx-bin-prot - (package-with-ocaml4.07 - (package - (inherit ocaml-ppx-bin-prot) - (version "0.11.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/janestreet/ppx_bin_prot") - (commit (string-append "v" version)))) - (file-name (git-file-name "ocaml4.07-ppx-bin-prot" version)) - (sha256 - (base32 - "1h60i75bzvhna1axyn662gyrzhh441l79vl142d235i5x31dmnkz")))) - (propagated-inputs - (list ocaml-base - ocaml-bin-prot - ocaml-ppx-here - ocaml-migrate-parsetree - ocaml-ppxlib)) - (properties '()) - (license license:asl2.0)))) - (define-public ocaml-ppx-ignore-instrumentation (package (name "ocaml-ppx-ignore-instrumentation") -- cgit 1.4.1 From d2ea723f8eda3e6e57ca75be4f57c31dec18a6fc Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 25 Dec 2023 11:01:21 +0100 Subject: gnu: Remove ocaml4.07-ppx-optional. * gnu/packages/ocaml.scm (ocaml4.07-ppx-optional): Remove variable. (ocaml-ppx-optional)[properties]: Remove variant. Change-Id: Ie6aad28146cea0f5b48be78c68e7341307234e4a --- gnu/packages/ocaml.scm | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 631b7e2bf0..0c0a1d1765 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -7257,8 +7257,7 @@ literal of the form 1.0v to conversion functions currently in scope.") (arguments `(#:tests? #f)) ; No tests (propagated-inputs (list ocaml-base ocaml-migrate-parsetree ocaml-ppxlib)) - (properties `((upstream-name . "ppx_optional") - (ocaml4.07-variant . ,(delay ocaml4.07-ppx-optional)))) + (properties `((upstream-name . "ppx_optional"))) (home-page "https://github.com/janestreet/ppx_optional") (synopsis "Pattern matching on flat options") (description @@ -7266,17 +7265,6 @@ literal of the form 1.0v to conversion functions currently in scope.") else expression.") (license license:asl2.0))) -(define-public ocaml4.07-ppx-optional - (package-with-ocaml4.07 - (package - (inherit ocaml-ppx-optional) - (version "0.11.0") - (source - (janestreet-origin - "ppx_optional" version - "1z8z2bga95k2vksljljfglg10vygkjd24kn1b37sk4z3nmp47x0h")) - (properties `((upstream-name . "ppx_optional")))))) - (define-public ocaml-ppx-optcomp (package (name "ocaml-ppx-optcomp") -- cgit 1.4.1 From 5d1809a08a0bf048341aff3d6a6e4234bd607dca Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 25 Dec 2023 11:02:03 +0100 Subject: gnu: Remove ocaml4.07-ppx-sexp-value. * gnu/packages/ocaml.scm (ocaml4.07-ppx-sexp-value): Remove variable. (ocaml-ppx-sexp-value)[properties]: Remove variant. Change-Id: Ib5b777b78c63d9cbc4812affba6f861c89ff3cce --- gnu/packages/ocaml.scm | 25 +------------------------ 1 file changed, 1 insertion(+), 24 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 0c0a1d1765..d961bb7ec7 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -7117,36 +7117,13 @@ many values).") (build-system dune-build-system) (propagated-inputs (list ocaml-base ocaml-ppx-here ocaml-ppx-sexp-conv ocaml-ppxlib)) - (properties `((upstream-name . "ppx_sexp_value") - (ocaml4.07-variant . ,(delay ocaml4.07-ppx-sexp-value)))) + (properties `((upstream-name . "ppx_sexp_value"))) (home-page "https://github.com/janestreet/ppx_sexp_value") (synopsis "Simplify building s-expressions from ocaml values") (description "@samp{ppx-sexp-value} is a ppx rewriter that simplifies building s-expressions from ocaml values.") (license license:expat))) -(define-public ocaml4.07-ppx-sexp-value - (package-with-ocaml4.07 - (package - (inherit ocaml-ppx-sexp-value) - (version "0.11.0") - (source (origin - (method url-fetch) - (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" - (version-major+minor version) - "/files/ppx_sexp_value-v" version ".tar.gz")) - (sha256 - (base32 - "1xnalfrln6k5khsyxvxkg6v32q8fpr4cqamsjqfih29jdv486xrs")))) - (propagated-inputs - (list ocaml-base - ocaml-ppx-here - ocaml-ppx-sexp-conv - ocaml-migrate-parsetree - ocaml-ppxlib)) - (properties '()) - (license license:asl2.0)))) - (define-public ocaml-ppx-sexp-message (package (name "ocaml-ppx-sexp-message") -- cgit 1.4.1 From bccd84ba0dd7b44242c0f7e7729717c2dac36f81 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 25 Dec 2023 11:02:42 +0100 Subject: gnu: Remove ocaml4.07-ppx-optcomp. * gnu/packages/ocaml.scm (ocaml4.07-ppx-optcomp): Remove variable. (ocaml-ppx-optcomp)[properties]: Remove variant. Change-Id: I030cadf5a90d8386b892d2318244f997fc55283c --- gnu/packages/ocaml.scm | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index d961bb7ec7..ceb1c80506 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -7260,25 +7260,13 @@ else expression.") (build-system dune-build-system) (propagated-inputs (list ocaml-base ocaml-stdio ocaml-ppxlib)) - (properties `((upstream-name . "ppx_optcomp") - (ocaml4.07-variant . ,(delay ocaml4.07-ppx-optcomp)))) + (properties `((upstream-name . "ppx_optcomp"))) (synopsis "Optional compilation for OCaml") (description "Ppx_optcomp stands for Optional Compilation. It is a tool used to handle optional compilations of pieces of code depending of the word size, the version of the compiler, ...") (license license:asl2.0))) -(define-public ocaml4.07-ppx-optcomp - (package-with-ocaml4.07 - (package - (inherit ocaml-ppx-optcomp) - (version "0.11.0") - (source - (janestreet-origin - "ppx_optcomp" version - "1bb52p2j2h4s9f06vrcpla80rj93jinnzq6jzilapyx9q068929i")) - (properties `((upstream-name . "ppx_optcomp")))))) - (define-public ocaml-ppx-let (package (name "ocaml-ppx-let") -- cgit 1.4.1 From 5ecb3d4383b4b66248f5477e14baea217cfaea35 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 25 Dec 2023 11:03:47 +0100 Subject: gnu: Remove ocaml4.07-ppx-tools-versioned. * gnu/packages/ocaml.scm (ocaml4.07-ppx-tools-versioned): Remove variable. Change-Id: I74f5f3f9cdc7d7be2f1d52c933e27b688a8d2558 --- gnu/packages/ocaml.scm | 26 -------------------------- 1 file changed, 26 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index ceb1c80506..ac2da9cead 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1970,32 +1970,6 @@ functions to the next and/or previous version.") "16x8sxc4ygxrr1868qpzfqyrvjf3hfxvjzmxmf6ibgglq7ixa2nq")))) (properties '((upstream-name . "ocaml-migrate-parsetree")))))) -(define-public ocaml4.07-ppx-tools-versioned - (package-with-ocaml4.07 - (package - (name "ocaml-ppx-tools-versioned") - (version "5.4.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/ocaml-ppx/ppx_tools_versioned") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "07lnj4yzwvwyh5fhpp1dxrys4ddih15jhgqjn59pmgxinbnddi66")))) - (build-system dune-build-system) - (arguments - `(#:package "ppx_tools_versioned")) - (propagated-inputs - (list ocaml-migrate-parsetree)) - (properties `((upstream-name . "ppx_tools_versioned"))) - (home-page "https://github.com/let-def/ppx_tools_versioned") - (synopsis "Variant of ppx_tools") - (description "This package is a variant of ppx_tools based on -ocaml-migrate-parsetree") - (license license:expat)))) - (define-public ocaml-linenoise (package (name "ocaml-linenoise") -- cgit 1.4.1 From b3a0e3ea37d61f1e7fc529adb6eef62ddc89338d Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 25 Dec 2023 11:04:29 +0100 Subject: gnu: Remove ocaml4.07-ppx-hash. * gnu/packages/ocaml.scm (ocaml4.07-ppx-hash): Remove variable. (ocaml-ppx-hash)[properties]: Remove variant. Change-Id: I38a4e5a4deb88398ae714b0671c9477551e7b6d9 --- gnu/packages/ocaml.scm | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index ac2da9cead..bbcf97ccb0 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6897,32 +6897,13 @@ currently provides SHA1, SHA256 and SHA512 hash functions.") (propagated-inputs (list ocaml-base ocaml-ppx-compare ocaml-ppx-sexp-conv ocaml-migrate-parsetree ocaml-ppxlib)) - (properties `((upstream-name . "ppx_hash") - (ocaml4.07-variant . ,(delay ocaml4.07-ppx-hash)))) + (properties `((upstream-name . "ppx_hash"))) (home-page "https://github.com/janestreet/ppx_hash") (synopsis "Generation of hash functions from type expressions and definitions") (description "This package is a collection of ppx rewriters that generate hash functions from type exrpessions and definitions.") (license license:asl2.0))) -(define-public ocaml4.07-ppx-hash - (package-with-ocaml4.07 - (package - (inherit ocaml-ppx-hash) - (name "ocaml-ppx-hash") - (home-page "https://github.com/janestreet/ppx_hash") - (version "0.11.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url home-page) - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1p0ic6aijxlrdggpmycj12q3cy9xksbq2vq727215maz4snvlf5p")))) - (properties `((upstream-name . "ppx_hash")))))) - (define-public ocaml-ppx-enumerate (package (name "ocaml-ppx-enumerate") -- cgit 1.4.1 From cddf767eed7322fb94c1ff31b2ba9613b28ad2b7 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 25 Dec 2023 11:05:04 +0100 Subject: gnu: Remove ocaml4.07-ppx-js-style. * gnu/packages/ocaml.scm (ocaml4.07-ppx-js-style): Remove variable. (ocaml-ppx-js-style)[properties]: Remove variant. Change-Id: I2243b4ae20136fb3d91c578d9bb2eeea306b0bb1 --- gnu/packages/ocaml.scm | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index bbcf97ccb0..407a46d15d 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -7436,8 +7436,7 @@ to denote the expected output.") (arguments `(#:tests? #f)) ; No tests (propagated-inputs (list ocaml-base ocaml-migrate-parsetree ocaml-octavius ocaml-ppxlib)) - (properties `((upstream-name . "ppx_js_style") - (ocaml4.07-variant . ,(delay ocaml4.07-ppx-js-style)))) + (properties `((upstream-name . "ppx_js_style"))) (home-page "https://github.com/janestreet/ppx_js_style") (synopsis "Code style checker for Jane Street Packages") (description "This package is a no-op ppx rewriter. It is used as a @@ -7445,16 +7444,6 @@ to denote the expected output.") packages.") (license license:asl2.0))) -(define-public ocaml4.07-ppx-js-style - (package-with-ocaml4.07 - (package - (inherit ocaml-ppx-js-style) - (version "0.11.0") - (source - (janestreet-origin "ppx_js_style" version - "0z3fc55jdjhhsblla6z4fqc13kljpcz29q79rvs5h2vsraqrldr2")) - (properties `((upstream-name . "ppx_js_style")))))) - (define-public ocaml-ppx-typerep-conv (package (name "ocaml-ppx-typerep-conv") -- cgit 1.4.1 From 7c44828fab9f1c32eb564749d472242df63573f3 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 25 Dec 2023 11:05:39 +0100 Subject: gnu: Remove ocaml4.07-ppx-enumerate. * gnu/packages/ocaml.scm (ocaml4.07-ppx-enumerate): Remove variable. (ocaml-ppx-enumerate)[properties]: Remove variant. Change-Id: I4923573de50e9e1795562cc7b974b8da7c88a64c --- gnu/packages/ocaml.scm | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 407a46d15d..a32d64bf6b 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6917,8 +6917,7 @@ hash functions from type exrpessions and definitions.") `(#:tests? #f)) ; no test suite (propagated-inputs (list ocaml-base ocaml-migrate-parsetree ocaml-ppxlib)) - (properties `((upstream-name . "ppx_enumerate") - (ocaml4.07-variant . ,(delay ocaml4.07-ppx-enumerate)))) + (properties `((upstream-name . "ppx_enumerate"))) (home-page "https://github.com/janestreet/ppx_enumerate") (synopsis "Generate a list containing all values of a finite type") (description "Ppx_enumerate is a ppx rewriter which generates a definition @@ -6926,24 +6925,6 @@ for the list of all values of a type (for a type which only has finitely many values).") (license license:asl2.0))) -(define-public ocaml4.07-ppx-enumerate - (package-with-ocaml4.07 - (package - (inherit ocaml-ppx-enumerate) - (name "ocaml-ppx-enumerate") - (version "0.11.1") - (home-page "https://github.com/janestreet/ppx_enumerate") - (source (origin - (method git-fetch) - (uri (git-reference - (url home-page) - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0spx9k1v7vjjb6sigbfs69yndgq76v114jhxvzjmffw7q989cyhr")))) - (properties `((upstream-name . "ppx_enumerate")))))) - (define-public ocaml-ppx-bench (package (name "ocaml-ppx-bench") -- cgit 1.4.1 From c56a00a90fada361e2b534f868c9b44a1da552d0 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 25 Dec 2023 11:06:18 +0100 Subject: gnu: Remove ocaml4.07-ppx-let. * gnu/packages/ocaml.scm (ocaml4.07-ppx-let): Remove variable. (ocaml-ppx-let)[properties]: Remove variant. Change-Id: Ia173d6bd784b6c1347c3ec2e3cc4e10b9537b092 --- gnu/packages/ocaml.scm | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index a32d64bf6b..6688f6c52b 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -7213,25 +7213,13 @@ size, the version of the compiler, ...") (build-system dune-build-system) (propagated-inputs (list ocaml-base ocaml-migrate-parsetree ocaml-ppxlib ocaml-ppx-here)) - (properties `((upstream-name . "ppx_let") - (ocaml4.07-variant . ,(delay ocaml4.07-ppx-let)))) + (properties `((upstream-name . "ppx_let"))) (home-page "https://github.com/janestreet/ppx_let") (synopsis "Monadic let-bindings") (description "A ppx rewriter for monadic and applicative let bindings, match expressions, and if expressions.") (license license:asl2.0))) -(define-public ocaml4.07-ppx-let - (package-with-ocaml4.07 - (package - (inherit ocaml-ppx-let) - (version "0.11.0") - (source - (janestreet-origin "ppx_let" version - "1wdfw6w4xbg97a35yg6bif9gggxniy9ddnrjfw1a0inkl2yamxkj")) - - (properties `((upstream-name . "ppx_let")))))) - (define-public ocaml-ppx-fail (package (name "ocaml-ppx-fail") -- cgit 1.4.1 From 9c52f8b8678b4d17655b8ca29f2748203f498d6f Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 25 Dec 2023 11:07:07 +0100 Subject: gnu: Remove ocaml4.07-ppx-expect. * gnu/packages/ocaml.scm (ocaml4.07-ppx-expect): Remove variable. (ocaml-ppx-expect)[properties]: Remove variant. Change-Id: Iad2ab78be171d8e0c7526c27fd0c7f77e62c6c68 --- gnu/packages/ocaml.scm | 25 ------------------------- 1 file changed, 25 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 6688f6c52b..8f811a28fc 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -7330,7 +7330,6 @@ useful errors on failure.") ocaml-migrate-parsetree ocaml-re)) (properties `((upstream-name . "ppx_expect") - (ocaml4.07-variant . ,(delay ocaml4.07-ppx-expect)) (ocaml5.0-variant . ,(delay ocaml5.0-ppx-expect)))) (home-page "https://github.com/janestreet/ppx_expect") (synopsis "Cram like framework for OCaml") @@ -7363,30 +7362,6 @@ to denote the expected output.") "05r7wlmrhb5biwyw6bjcpmr77srglijcbf7nm7h2hiil0d0i7bkz")))) (properties '()))))) -(define-public ocaml4.07-ppx-expect - (package-with-ocaml4.07 - (package - (inherit ocaml-ppx-expect) - (version "0.12.0") - (source - (janestreet-origin "ppx_expect" version - "1zpci8c49yn2ixchmwjx1kf9pwybv3dnn4l2dgnd6m36qnkralfk")) - (propagated-inputs - `(("ocaml-base" ,ocaml-base) - ("ocaml-ppx-assert" ,ocaml-ppx-assert) - ("ocaml-ppx-compare" ,ocaml-ppx-compare) - ("ocaml-ppx-custom-printf" ,ocaml-ppx-custom-printf) - ("ocaml-ppx-fields-conv" ,ocaml-ppx-fields-conv) - ("ocaml-ppx-here" ,ocaml-ppx-here) - ("ocaml-ppx-inline-test" ,ocaml-ppx-inline-test) - ("ocaml-ppx-sexp-conv" ,ocaml-ppx-sexp-conv) - ("ocaml-ppx-variants-conv" ,ocaml-ppx-variants-conv) - ("ocaml-stdio" ,ocaml-stdio) - ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) - ("ocaml-ppxlib" ,ocaml-ppxlib) - ("ocaml-re" ,ocaml-re))) - (properties `((upstream-name . "ppx_expect")))))) - (define-public ocaml-ppx-js-style (package (name "ocaml-ppx-js-style") -- cgit 1.4.1 From 711f2b10dccc0a8b95781753014a703e1c31b6b6 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 25 Dec 2023 11:07:44 +0100 Subject: gnu: Remove ocaml4.07-ppx-bench. * gnu/packages/ocaml.scm (ocaml4.07-ppx-bench): Remove variable. (ocaml-ppx-bench)[properties]: Remove variant. Change-Id: I407067f56a2e8a73ab9c311dafb2fd6dd5b583f8 --- gnu/packages/ocaml.scm | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 8f811a28fc..83d1cb8777 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6943,31 +6943,12 @@ many values).") ;; No tests `(#:tests? #f)) (propagated-inputs (list ocaml-ppx-inline-test ocaml-ppxlib)) - (properties `((upstream-name . "ppx_bench") - (ocaml4.07-variant . ,(delay ocaml4.07-ppx-bench)))) + (properties `((upstream-name . "ppx_bench"))) (home-page "https://github.com/janestreet/ppx_bench") (synopsis "Syntax extension for writing in-line benchmarks in ocaml code") (description "Syntax extension for writing in-line benchmarks in ocaml code.") (license license:expat))) -(define-public ocaml4.07-ppx-bench - (package-with-ocaml4.07 - (package - (inherit ocaml-ppx-bench) - (version "0.11.0") - (source (origin - (method url-fetch) - (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" - (version-major+minor version) - "/files/ppx_bench-v" version ".tar.gz")) - (sha256 - (base32 - "0ys4pblbcjbk9dn073rqiwm7r6rc7fah03j7riklkwnb5n44andl")))) - (propagated-inputs - (list ocaml-ppx-inline-test ocaml-migrate-parsetree ocaml-ppxlib)) - (properties '()) - (license license:asl2.0)))) - (define-public ocaml-ppx-here (package (name "ocaml-ppx-here") -- cgit 1.4.1 From 2cd18578e783e4ffba24ae65f78e419615d9746e Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 25 Dec 2023 11:08:59 +0100 Subject: gnu: Remove ocaml4.07-ppx-inline-test. * gnu/packages/ocaml.scm (ocaml4.07-ppx-inline-test): Remove variable. (ocaml-ppx-inline-test)[properties]: Remove variant. Change-Id: Ia7a74c7872b200d22fe56ec62de144534fc9e1ae --- gnu/packages/ocaml.scm | 29 +---------------------------- 1 file changed, 1 insertion(+), 28 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 83d1cb8777..96b3d86c7d 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5594,40 +5594,13 @@ since the start of the Unix epoch.") ocaml-stdio ocaml-ppxlib ocaml-time-now)) - (properties `((upstream-name . "ppx_inline_test") - (ocaml4.07-variant . ,(delay ocaml4.07-ppx-inline-test)))) + (properties `((upstream-name . "ppx_inline_test"))) (synopsis "Syntax extension for writing in-line tests in ocaml code") (description "This package contains a syntax extension for writing in-line tests in ocaml code. It is part of Jane Street's PPX rewriters collection.") (license license:expat))) -(define-public ocaml4.07-ppx-inline-test - (package-with-ocaml4.07 - (package - (inherit ocaml-ppx-inline-test) - (name "ocaml-ppx-inline-test") - (version "0.12.0") - (home-page "https://github.com/janestreet/ppx_inline_test") - (source - (origin - (method git-fetch) - (uri (git-reference - (url (string-append home-page ".git")) - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0nyz411zim94pzbxm2l2v2l9jishcxwvxhh142792g2s18r4vn50")))) - (propagated-inputs - `(("ocaml-base" ,ocaml-base) - ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) - ("ocaml-compiler-libs" ,ocaml-compiler-libs) - ("ocaml-sexplib0" ,ocaml-sexplib0) - ("ocaml-stdio" ,ocaml-stdio) - ("ocaml-ppxlib" ,ocaml-ppxlib))) - (properties `((upstream-name . "ppx_inline_test")))))) - (define-public ocaml-bindlib (package (name "ocaml-bindlib") -- cgit 1.4.1 From 1667e151ba28bed7f6d7e905ac6b0868bc1d9d17 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 25 Dec 2023 11:09:35 +0100 Subject: gnu: Remove ocaml4.07-ppx-assert. * gnu/packages/ocaml.scm (ocaml4.07-ppx-assert): Remove variable. (ocaml-ppx-assert)[properties]: Remove variant. Change-Id: Iba0b987323b8ee3feb2330b1e5eed199856466ee --- gnu/packages/ocaml.scm | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 96b3d86c7d..9fbb265413 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -7232,31 +7232,13 @@ https://github.com/ocaml/ocaml/issues/8563.") ocaml-ppx-sexp-conv ocaml-migrate-parsetree ocaml-ppxlib)) - (properties `((upstream-name . "ppx_assert") - (ocaml4.07-variant . ,(delay ocaml4.07-ppx-assert)))) + (properties `((upstream-name . "ppx_assert"))) (home-page "https://github.com/janestreet/ppx_assert") (synopsis "Assert-like extension nodes that raise useful errors on failure") (description "This package contains assert-like extension nodes that raise useful errors on failure.") (license license:asl2.0))) -(define-public ocaml4.07-ppx-assert - (package-with-ocaml4.07 - (package - (inherit ocaml-ppx-assert) - (version "0.11.0") - (source - (janestreet-origin "ppx_assert" version - "17kd311n0l9f72gblf9kv8i5rghr106w37x4f0m5qwh6nlgl0j9k")) - (propagated-inputs - `(("ocaml-base" ,ocaml-base) - ("ocaml-ppx-compare" ,ocaml-ppx-compare) - ("ocaml-ppx-here" ,ocaml-ppx-here) - ("ocaml-ppx-sexp-conv" ,ocaml-ppx-sexp-conv) - ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) - ("ocaml-ppxlib" ,ocaml-ppxlib))) - (properties `((upstream-name . "ppx_assert")))))) - (define-public ocaml-ppx-expect (package (name "ocaml-ppx-expect") -- cgit 1.4.1 From 952963aba8db1a052fd86920d95be16ad56de187 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 25 Dec 2023 11:10:37 +0100 Subject: gnu: Remove ocaml4.07-sexplib. * gnu/packages/ocaml.scm (ocaml4.07-sexplib): Remove variable. (ocaml-sexplib)[properties]: Remove variant. Change-Id: I5d682457888b57d7d68c2e3e2b28d6cd4f4f3a85 --- gnu/packages/ocaml.scm | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 9fbb265413..34bb570dd4 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6070,7 +6070,6 @@ parsexp_io.") (build-system dune-build-system) (propagated-inputs (list ocaml-base ocaml-num ocaml-parsexp ocaml-sexplib0)) - (properties `((ocaml4.07-variant . ,(delay ocaml4.07-sexplib)))) (synopsis "Library for serializing OCaml values to and from S-expressions") (description @@ -6078,16 +6077,6 @@ parsexp_io.") functionality for parsing and pretty-printing s-expressions.") (license license:expat))) -(define-public ocaml4.07-sexplib - (package-with-ocaml4.07 - (package - (inherit ocaml-sexplib) - (version "0.11.0") - (source - (janestreet-origin "sexplib" version - "0ksx62zsxhz8xmdrsn41n2hbc2qbyh3bxxc6946xisvgwh42h3q3")) - (properties '())))) - (define-public ocaml-sexp-pretty (package (name "ocaml-sexp-pretty") -- cgit 1.4.1 From ab51be3aba72f857363a2fca3358ef74a1e87d1f Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 25 Dec 2023 11:11:41 +0100 Subject: gnu: Remove ocaml4.07-ppx-here. * gnu/packages/ocaml.scm (ocaml4.07-ppx-here): Remove variable. (ocaml-ppx-here)[properties]: Remove variant. Change-Id: I7b54d003c6bf988eb93d6a2345296d11add14f6d --- gnu/packages/ocaml.scm | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 34bb570dd4..c31176720b 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6924,24 +6924,13 @@ many values).") `(#:tests? #f)) (propagated-inputs (list ocaml-base ocaml-migrate-parsetree ocaml-ppxlib)) - (properties `((upstream-name . "ppx_here") - (ocaml4.07-variant . ,(delay ocaml4.07-ppx-here)))) + (properties `((upstream-name . "ppx_here"))) (home-page "https://github.com/janestreet/ppx_here") (synopsis "Expands [%here] into its location") (description "Part of the Jane Street's PPX rewriters collection.") (license license:asl2.0))) -(define-public ocaml4.07-ppx-here - (package-with-ocaml4.07 - (package - (inherit ocaml-ppx-here) - (version "0.11.0") - (source - (janestreet-origin "ppx_here" version - "0wxcak3ay4jpigm3pfdcpr65qw4hxfa8whhkryhcd8gy71x056z5")) - (properties `((upstream-name . "ppx_here")))))) - (define-public ocaml-typerep (package (name "ocaml-typerep") -- cgit 1.4.1 From 7c8ee30ca691c4fdf57f0868fe56e2eaefe878f8 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 25 Dec 2023 11:12:57 +0100 Subject: gnu: Remove ocaml4.07-bin-prot. * gnu/packages/ocaml.scm (ocaml4.07-bin-prot): Remove variable. (ocaml-bin-prot)[properties]: Remove variant. Change-Id: I8d16ef26b58cc179bcc9d93d2e3e18116c474d25 --- gnu/packages/ocaml.scm | 27 +-------------------------- 1 file changed, 1 insertion(+), 26 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index c31176720b..5010377fc8 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6735,8 +6735,7 @@ string conversion.") ocaml-ppx-optcomp ocaml-ppx-sexp-conv ocaml-ppx-variants-conv)) - (properties `((upstream-name . "bin_prot") - (ocaml4.07-variant . ,(delay ocaml4.07-bin-prot)))) + (properties `((upstream-name . "bin_prot"))) (home-page "https://github.com/janestreet/bin_prot") (synopsis "Binary protocol generator") (description "This library contains functionality for reading and writing @@ -6747,30 +6746,6 @@ protocol is also heavily optimized for size, making it ideal for long-term storage of large amounts of data.") (license license:expat))) -(define-public ocaml4.07-bin-prot - (package-with-ocaml4.07 - (package - (inherit ocaml-bin-prot) - (version "0.11.0") - (source (origin - (method url-fetch) - (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" - (version-major+minor version) - "/files/bin_prot-v" version ".tar.gz")) - (sha256 - (base32 - "1rsd91gx36prj4whi76nsiz1bzpgal9nzyw3pxdz1alv4ilk2il6")))) - (propagated-inputs (list ocaml-base - ocaml-ppx-compare - ocaml-ppx-custom-printf - ocaml-ppx-fields-conv - ocaml-ppx-variants-conv - ocaml-migrate-parsetree)) - (properties '()) - (license (list - license:asl2.0 - license:bsd-3))))) - (define-public ocaml-protocol-version-header (package (name "ocaml-protocol-version-header") -- cgit 1.4.1 From bffb7e524bbf9f88643af745a3d8b9a6cd6ce60f Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 25 Dec 2023 11:13:39 +0100 Subject: gnu: Remove ocaml4.07-typerep. * gnu/packages/ocaml.scm (ocaml4.07-typerep): Remove variable. (ocaml-typerep)[properties]: Remove variant. Change-Id: I6e856bd96ca7dedeb0078e662b19a1f12143c0d2 --- gnu/packages/ocaml.scm | 17 ----------------- 1 file changed, 17 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 5010377fc8..584e3cf35e 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6922,28 +6922,11 @@ many values).") (build-system dune-build-system) (arguments `(#:tests? #f)); no tests (propagated-inputs (list ocaml-base)) - (properties `((ocaml4.07-variant . ,(delay ocaml4.07-typerep)))) (home-page "https://github.com/janestreet/typerep") (synopsis "Typerep is a library for runtime types") (description "Typerep is a library for runtime types.") (license license:expat))) -(define-public ocaml4.07-typerep - (package-with-ocaml4.07 - (package - (inherit ocaml-typerep) - (version "0.11.0") - (source (origin - (method url-fetch) - (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" - (version-major+minor version) - "/files/typerep-v" version ".tar.gz")) - (sha256 - (base32 - "1zi7hy0prpgzqhr4lkacr04wvlvbp21jfbdfvffhrm6cd400rb5v")))) - (properties '()) - (license license:asl2.0)))) - (define-public ocaml-ppx-sexp-value (package (name "ocaml-ppx-sexp-value") -- cgit 1.4.1 From b79835b5b5c1f0b0409da749af1ef06a91a57a14 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 25 Dec 2023 11:14:13 +0100 Subject: gnu: Remove ocaml4.07-alcotest. * gnu/packages/ocaml.scm (ocaml4.07-alcotest): Remove variable. (ocaml-alcotest)[properties]: Remove variant. Change-Id: I32402499e6c4b5b2c586e0fe8abc1aede3504fa2 --- gnu/packages/ocaml.scm | 19 ------------------- 1 file changed, 19 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 584e3cf35e..fdf2e9a815 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2451,7 +2451,6 @@ immutability.") ocaml-stdlib-shims ocaml-uuidm ocaml-uutf)) - (properties `((ocaml4.07-variant . ,(delay ocaml4.07-alcotest)))) (home-page "https://github.com/mirage/alcotest") (synopsis "Lightweight OCaml test framework") (description "Alcotest exposes simple interface to perform unit tests. It @@ -2462,24 +2461,6 @@ displayed at the end of the run (with the full logs ready to inspect), with a simple (yet expressive) query language to select the tests to run.") (license license:isc))) -(define-public ocaml4.07-alcotest - (package-with-ocaml4.07 - (package - (inherit ocaml-alcotest) - (version "1.0.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/mirage/alcotest") - (commit version))) - (file-name (git-file-name "ocaml-alcotest" version)) - (sha256 - (base32 - "1frwi185z4aadmaf0vp8xk5227nyg7nmh28ijj5l7ncjr5slvhz8")))) - (arguments - `(#:package "alcotest")) - (properties '())))) - (define-public ocaml-expect-test-helpers-core (package (name "ocaml-expect-test-helpers-core") -- cgit 1.4.1 From 43d528a532ca80193d16346b715aa7a620608d81 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 25 Dec 2023 11:37:09 +0100 Subject: gnu: Remove ocaml4.07-ppx-custom-printf. * gnu/packages/ocaml.scm (ocaml4.07-ppx-custom-printf): Remove variable. (ocaml-ppx-custom-printf)[properties]: Remove variant. Change-Id: Icc9e85727c28f9fd4aab07c7661282aed7dd1567 --- gnu/packages/ocaml.scm | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index fdf2e9a815..2057721e7e 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6676,24 +6676,12 @@ variant types.") (propagated-inputs (list ocaml-base ocaml-ppx-sexp-conv ocaml-migrate-parsetree ocaml-ppxlib)) - (properties `((upstream-name . "ppx_custom_printf") - (ocaml4.07-variant . ,(delay ocaml4.07-ppx-custom-printf)))) + (properties `((upstream-name . "ppx_custom_printf"))) (synopsis "Printf-style format-strings for user-defined string conversion") (description "Extensions to printf-style format-strings for user-defined string conversion.") (license license:asl2.0))) -(define-public ocaml4.07-ppx-custom-printf - (package-with-ocaml4.07 - (package - (inherit ocaml-ppx-custom-printf) - (version "0.11.0") - (source - (janestreet-origin - "ppx_custom_printf" version - "11b73smf3g3bpd9lg014pr4rx285nk9mnk6g6464ph51jv0sqzhj")) - (properties `((upstream-name . "ppx_custom_printf")))))) - (define-public ocaml-bin-prot (package (name "ocaml-bin-prot") -- cgit 1.4.1 From dee924ac2635352cd744c4d04c25a0c16736675c Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 25 Dec 2023 11:37:52 +0100 Subject: gnu: Remove ocaml4.07-ppx-variants-conv. * gnu/packages/ocaml.scm (ocaml4.07-ppx-variants-conv): Remove variable. (ocaml-ppx-variants-conv)[properties]: Remove variant. Change-Id: Ib386d87c5b1cdd031155da7c8cfdcbc763624470 --- gnu/packages/ocaml.scm | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 2057721e7e..902417fb9b 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6629,8 +6629,7 @@ definitions.") (list ocaml-base ocaml-variantslib ocaml-migrate-parsetree ocaml-ppxlib)) (properties - `((upstream-name . "ppx_variants_conv") - (ocaml4.07-variant . ,(delay ocaml4.07-ppx-variants-conv)))) + `((upstream-name . "ppx_variants_conv"))) (home-page "https://github.com/janestreet/ppx_variants_conv") (synopsis "Generation of accessor and iteration functions for OCaml variant types") @@ -6639,24 +6638,6 @@ definitions.") variant types.") (license license:asl2.0))) -(define-public ocaml4.07-ppx-variants-conv - (package-with-ocaml4.07 - (package - (inherit ocaml-ppx-variants-conv) - (name "ocaml-ppx-variants-conv") - (version "0.11.1") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/janestreet/ppx_variants_conv") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1yc0gsds5m2nv39zga8nnrca2n75rkqy5dz4xj1635ybz20hhbjd")))) - (properties `((upstream-name . "ppx_variants_conv")))))) - (define-public ocaml-ppx-custom-printf (package (name "ocaml-ppx-custom-printf") -- cgit 1.4.1 From c0505c907302bfd72afe885fa5484fd845055c09 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 25 Dec 2023 11:38:35 +0100 Subject: gnu: Remove ocaml4.07-ppx-compare. * gnu/packages/ocaml.scm (ocaml4.07-ppx-compare): Remove variable. (ocaml-ppx-compare)[properties]: Remove variant. Change-Id: Idac9eb2fe20e6849a791b758507211b47969aafa --- gnu/packages/ocaml.scm | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 902417fb9b..d36edf73e8 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6433,8 +6433,7 @@ OCaml AST in the OCaml syntax; '(#:tests? #f)) (propagated-inputs (list ocaml-base ocaml-migrate-parsetree ocaml-ppxlib)) - (properties `((upstream-name . "ppx_compare") - (ocaml4.07-variant . ,(delay ocaml4.07-ppx-compare)))) + (properties `((upstream-name . "ppx_compare"))) (home-page "https://github.com/janestreet/ppx_compare") (synopsis "Generation of comparison functions from types") (description "Generation of fast comparison functions from type expressions @@ -6445,24 +6444,6 @@ flexibility by allowing you to override them for a specific type and more safety by making sure that you only compare comparable values.") (license license:asl2.0))) -(define-public ocaml4.07-ppx-compare - (package-with-ocaml4.07 - (package - (inherit ocaml-ppx-compare) - (name "ocaml-ppx-compare") - (version "0.11.1") - (home-page "https://github.com/janestreet/ppx_compare") - (source (origin - (method git-fetch) - (uri (git-reference - (url home-page) - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "06bq4m1bsm4jlx4g7wh5m99qky7xm4c2g52kaz6pv25hdn5agi2m")))) - (properties `((upstream-name . "ppx_compare")))))) - (define-public ocaml-fieldslib (package (name "ocaml-fieldslib") -- cgit 1.4.1 From f6cda7691f8dd221647ac4898510918c522d97f0 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 25 Dec 2023 11:39:17 +0100 Subject: gnu: Remove ocaml4.07-ppx-fields-conv. * gnu/packages/ocaml.scm (ocaml4.07-ppx-fields-conv): Remove variable. (ocaml-ppx-fields-conv)[properties]: Remove variant. Change-Id: Ie109e8ac78166e2df6cfece2fd80961a4d5cb6db --- gnu/packages/ocaml.scm | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index d36edf73e8..157d9d34bb 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6530,8 +6530,7 @@ standard library.") (propagated-inputs (list ocaml-base ocaml-fieldslib ocaml-migrate-parsetree ocaml-ppxlib)) - (properties `((upstream-name . "ppx_fields_conv") - (ocaml4.07-variant . ,(delay ocaml4.07-ppx-fields-conv)))) + (properties `((upstream-name . "ppx_fields_conv"))) (synopsis "Generation of accessor and iteration functions for ocaml records") (description "Ppx_fields_conv is a ppx rewriter that can be used to define first class values representing record fields, and additional routines, to get @@ -6539,16 +6538,6 @@ and set record fields, iterate and fold over all fields of a record and create new record values.") (license license:asl2.0))) -(define-public ocaml4.07-ppx-fields-conv - (package-with-ocaml4.07 - (package - (inherit ocaml-ppx-fields-conv) - (version "0.11.0") - (source (janestreet-origin - "ppx_fields_conv" version - "07zrd3qky2ppbfl55gpm90rvqa5860xgwcsvihrjmkrw6d0jirkc")) - (properties `((upstream-name . "ppx_fields_conv")))))) - (define-public ocaml-ppx-sexp-conv (package (name "ocaml-ppx-sexp-conv") -- cgit 1.4.1 From 697328419e365f3f93a205fc54be860b5bfd4263 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 25 Dec 2023 11:40:48 +0100 Subject: gnu: Remove ocaml4.07-ppx-sexp-conv. * gnu/packages/ocaml.scm (ocaml4.07-ppx-sexp-conv): Remove variable. (ocaml-ppx-sexp-conv)[properties]: Remove variant. Change-Id: I6471c4e4f0c7cd8d3dd04f0ea0f4ce064759b37b --- gnu/packages/ocaml.scm | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 157d9d34bb..b5c576ac89 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6556,30 +6556,12 @@ new record values.") (build-system dune-build-system) (propagated-inputs (list ocaml-base ocaml-ppxlib)) - (properties `((upstream-name . "ppx_sexp_conv") - (ocaml4.07-variant . ,(delay ocaml4.07-ppx-sexp-conv)))) + (properties `((upstream-name . "ppx_sexp_conv"))) (synopsis "Generation of S-expression conversion functions from type definitions") (description "This package generates S-expression conversion functions from type definitions.") (license license:asl2.0))) -(define-public ocaml4.07-ppx-sexp-conv - (package-with-ocaml4.07 - (package - (inherit ocaml-ppx-sexp-conv) - (name "ocaml-ppx-sexp-conv") - (version "0.11.2") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/janestreet/ppx_sexp_conv") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0pqwnqy1xp309wvdcaax4lg02yk64lq2w03mbgfvf6ps5ry4gis9")))) - (properties `((upstream-name . "ppx_sexp_conv")))))) - (define-public ocaml-ppx-variants-conv (package (name "ocaml-ppx-variants-conv") -- cgit 1.4.1 From c02058bef6152f48b601aeb2c8334e08358ee625 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 25 Dec 2023 11:41:29 +0100 Subject: gnu: Remove ocaml4.07-fieldslib. * gnu/packages/ocaml.scm (ocaml4.07-fieldslib): Remove variable. (ocaml-fieldslib)[properties]: Remove variant. Change-Id: Ic915d16ee2f45a198f63896ad0ad22ac57815958 --- gnu/packages/ocaml.scm | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index b5c576ac89..9c72b93f4d 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6455,8 +6455,7 @@ by making sure that you only compare comparable values.") (arguments `(#:tests? #f)) ; No tests (propagated-inputs (list ocaml-base ocaml-migrate-parsetree ocaml-ppxlib)) - (properties `((upstream-name . "fieldslib") - (ocaml4.07-variant . ,(delay ocaml4.07-fieldslib)))) + (properties `((upstream-name . "fieldslib"))) (home-page "https://github.com/janestreet/fieldslib") (synopsis "Syntax extension to record fields") (description "Syntax extension to define first class values representing @@ -6464,16 +6463,6 @@ record fields, to get and set record fields, iterate and fold over all fields of a record and create new record values.") (license license:asl2.0))) -(define-public ocaml4.07-fieldslib - (package-with-ocaml4.07 - (package - (inherit ocaml-fieldslib) - (version "0.11.0") - (source (janestreet-origin - "fieldslib" version - "12948pzxrl360lybm9fzyvplgcl87zjbn4m3sk1aw75zk85p1388")) - (properties `((upstream-name . "fieldslib")))))) - (define-public ocaml-variantslib (package (name "ocaml-variantslib") -- cgit 1.4.1 From dc86d672c95b6164f5501868e551886abe317782 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 25 Dec 2023 11:42:16 +0100 Subject: gnu: Remove ocaml4.07-variantslib. * gnu/packages/ocaml.scm (ocaml4.07-variantslib): Remove variable. (ocaml-variantslib)[properties]: Remove variant. Change-Id: Ie05207ed1bb675c91e68058cd2a1ff0e63ccf532 --- gnu/packages/ocaml.scm | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 9c72b93f4d..9682f5be8a 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6476,30 +6476,13 @@ of a record and create new record values.") `(#:tests? #f)) (propagated-inputs (list ocaml-base ocaml-migrate-parsetree ocaml-ppxlib)) - (properties `((upstream-name . "variantslib") - (ocaml4.07-variant . ,(delay ocaml4.07-variantslib)))) + (properties `((upstream-name . "variantslib"))) (home-page "https://github.com/janestreet/variantslib") (synopsis "OCaml variants as first class values") (description "The Core suite of libraries is an alternative to OCaml's standard library.") (license license:asl2.0))) -(define-public ocaml4.07-variantslib - (package-with-ocaml4.07 - (package - (inherit ocaml-variantslib) - (name "ocaml-variantslib") - (version "0.11.0") - (source (origin - (method url-fetch) - (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" - (version-major+minor version) - "/files/variantslib-v" version ".tar.gz")) - (sha256 - (base32 - "1hsdwmkslvk4cznqr4lyyiy7vvk5spil226k0z2in26fxq6y0hf3")))) - (properties `((upstream-name . "variantslib")))))) - (define-public ocaml-ppx-fields-conv (package (name "ocaml-ppx-fields-conv") -- cgit 1.4.1 From 571878854c90f3a0546dbaf1dd69223200ac5001 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 25 Dec 2023 11:42:56 +0100 Subject: gnu: Remove ocaml4.07-parsexp. * gnu/packages/ocaml.scm (ocaml4.07-parsexp): Remove variable. (ocaml-parsexp)[properties]: Remove variant. Change-Id: I8f4ba60895845ba8a45d87107c5b0f7ce0674f99 --- gnu/packages/ocaml.scm | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 9682f5be8a..33340e95af 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5994,7 +5994,6 @@ that was developed by Jane Street, the largest industrial user of OCaml.") (build-system dune-build-system) (inputs (list ocaml-sexplib0 ocaml-base)) - (properties `((ocaml4.07-variant . ,(delay ocaml4.07-parsexp)))) (synopsis "S-expression parsing library") (description "This library provides generic parsers for parsing S-expressions from @@ -6023,17 +6022,6 @@ s-expressions from files or other external sources, you should use parsexp_io.") (license license:expat))) -(define-public ocaml4.07-parsexp - (package-with-ocaml4.07 - (package - (inherit ocaml-parsexp) - (name "ocaml-parsexp") - (version "0.11.0") - (source - (janestreet-origin "parsexp" version - "11a30zkfgbi6pb4whq22k1zc8ghdp9bwxl5s5cdlmx1z8s4yxsf0")) - (properties '())))) - (define-public ocaml-sexplib (package (name "ocaml-sexplib") -- cgit 1.4.1 From 1cef2c561f51acc309060855b963892ebf776c36 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 25 Dec 2023 11:43:31 +0100 Subject: gnu: Remove ocaml4.07-fmt. * gnu/packages/ocaml.scm (ocaml4.07-fmt): Remove variable. (ocaml-fmt)[properties]: Remove variant. Change-Id: I35d294d764a1e3fd8160a7da9cbd5cab9bea4660 --- gnu/packages/ocaml.scm | 15 --------------- 1 file changed, 15 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 33340e95af..cc3e15ff9c 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2363,27 +2363,12 @@ most of the POSIX and GNU conventions.") #:phases (modify-phases %standard-phases (delete 'configure)))) - (properties `((ocaml4.07-variant . ,(delay ocaml4.07-fmt)))) (home-page "https://erratique.ch/software/fmt") (synopsis "OCaml Format pretty-printer combinators") (description "Fmt exposes combinators to devise Format pretty-printing functions.") (license license:isc))) -(define-public ocaml4.07-fmt - (package-with-ocaml4.07 - (package - (inherit ocaml-fmt) - (version "0.8.9") - (source (origin - (method url-fetch) - (uri (string-append "http://erratique.ch/software/fmt/releases/fmt-" - version ".tbz")) - (sha256 - (base32 - "0gkkkj4x678vxdda4xaw2dd44qjacavsvn5nx8gydfwah6pjbkxk")))) - (properties '())))) - (define-public ocaml-astring (package (name "ocaml-astring") -- cgit 1.4.1 From aed922fcdd68af287eb231b3476d592978ef4cf1 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 25 Dec 2023 11:44:29 +0100 Subject: gnu: Remove ocaml4.07-migrate-parsetree. * gnu/packages/ocaml.scm (ocaml4.07-migrate-parsetree): Remove variable. (ocaml-migrate-parsetree)[properties]: Remove variant. Change-Id: Iec470c670517fbb8b1b554c3a357b08972c48853 --- gnu/packages/ocaml.scm | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index cc3e15ff9c..a3c664e62d 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1942,34 +1942,13 @@ module of this library is parameterised by the type of S-expressions.") (arguments `(#:tests? #f)) (propagated-inputs (list ocaml-ppx-derivers ocamlbuild ocaml-result)) - (properties `((upstream-name . "ocaml-migrate-parsetree") - (ocaml4.07-variant . ,(delay ocaml4.07-migrate-parsetree)))) + (properties `((upstream-name . "ocaml-migrate-parsetree"))) (synopsis "OCaml parsetree converter") (description "This library converts between parsetrees of different OCaml versions. For each version, there is a snapshot of the parsetree and conversion functions to the next and/or previous version.") (license license:lgpl2.1+))) -;; OCaml 4.07 packages require version 1.* -(define-public ocaml4.07-migrate-parsetree - (package-with-ocaml4.07 - (package - (inherit ocaml-migrate-parsetree) - (name "ocaml-migrate-parsetree") - (version "1.8.0") - (home-page "https://github.com/ocaml-ppx/ocaml-migrate-parsetree") - (source - (origin - (method git-fetch) - (uri (git-reference - (url home-page) - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "16x8sxc4ygxrr1868qpzfqyrvjf3hfxvjzmxmf6ibgglq7ixa2nq")))) - (properties '((upstream-name . "ocaml-migrate-parsetree")))))) - (define-public ocaml-linenoise (package (name "ocaml-linenoise") -- cgit 1.4.1 From 937cae5bbe46b59c4546d86cd8faaf091d9ec5fd Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 25 Dec 2023 11:45:12 +0100 Subject: gnu: Remove ocaml4.07-configurator. * gnu/packages/ocaml.scm (ocaml4.07-configurator): Remove variable. Change-Id: If30443dcb2004f5248e6dff33c96b14e4d00daa9 --- gnu/packages/ocaml.scm | 37 ------------------------------------- 1 file changed, 37 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index a3c664e62d..7d4f63a7e3 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -7416,43 +7416,6 @@ Haskell's Quickcheck library, with support for built-in types as well as types provided by Base.") (license license:expat))) -(define-public ocaml4.07-configurator - (package - (name "ocaml4.07-configurator") - (version "0.11.0") - (source (origin - (method url-fetch) - (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" - (version-major+minor version) - "/files/configurator-v" version ".tar.gz")) - (sha256 - (base32 - "0kwgi3sh92v4n242dk5hgpwd85zzgnczgbkqi0q0kr6m93zgbf7p")))) - (build-system dune-build-system) - (arguments - ;; No tests - `(#:tests? #f - #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) - (propagated-inputs - `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)))) - (home-page "https://github.com/janestreet/configurator") - (synopsis "Helper library for gathering system configuration") - (description "Configurator is a small library that helps writing OCaml -scripts that test features available on the system, in order to generate config.h -files for instance. - -Configurator allows one to: -@itemize -@item test if a C program compiles -@item query pkg-config -@item import #define from OCaml header files -@item generate config.h file -@end itemize") - (license license:asl2.0))) - (define-public ocaml-spawn (package (name "ocaml-spawn") -- cgit 1.4.1 From 34063642500ff05d595a80993f584ba80c8caa12 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 25 Dec 2023 11:45:54 +0100 Subject: gnu: Remove ocaml4.07-ppxlib. * gnu/packages/ocaml.scm (ocaml4.07-ppxlib): Remove variable. (ocaml-ppxlib)[properties]: Remove variant. Change-Id: I6b19e7751d1c21549d261281ae400f90c8d88c6c --- gnu/packages/ocaml.scm | 41 ----------------------------------------- 1 file changed, 41 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 7d4f63a7e3..a411bb78e0 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6313,7 +6313,6 @@ the OCaml code.") (list ocaml-stdio ocaml-cinaps ocaml-base)) - (properties `((ocaml4.07-variant . ,(delay ocaml4.07-ppxlib)))) (synopsis "Base library and tools for ppx rewriters") (description @@ -6331,46 +6330,6 @@ OCaml AST in the OCaml syntax; @end itemize") (license license:expat))) -(define-public ocaml4.07-ppxlib - (package-with-ocaml4.07 - (package - (inherit ocaml-ppxlib) - (name "ocaml-ppxlib") - (version "0.6.0") - (home-page "https://github.com/ocaml-ppx/ppxlib") - (source - (origin - (method git-fetch) - (uri (git-reference - (url home-page) - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0my9x7sxb329h0lzshppdaawiyfbaw6g5f41yiy7bhl071rnlvbv")))) - (build-system dune-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'check 'set-topfind - (lambda* (#:key inputs #:allow-other-keys) - ;; add the line #directory ".." at the top of each file - ;; using #use "topfind";; to be able to find topfind - (let* ((findlib-path (assoc-ref inputs "findlib")) - (findlib-libdir - (string-append findlib-path "/lib/ocaml/site-lib"))) - (substitute* '("test/base/test.ml" - "test/code_path/test.ml" - "test/deriving/test.ml" - "test/driver/attributes/test.ml" - "test/driver/non-compressible-suffix/test.ml" - "test/driver/transformations/test.ml") - (("#use \"topfind\";;" all) - (string-append "#directory \"" findlib-libdir "\"\n" - all)))) - #t))))) - (properties '())))) - (define-public ocaml-ppx-compare (package (name "ocaml-ppx-compare") -- cgit 1.4.1 From ad5a1abec87d861b1d4c45a42fd754a3c5493e9c Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 25 Dec 2023 11:46:37 +0100 Subject: gnu: Remove ocaml4.07-uuidm. * gnu/packages/ocaml.scm (ocaml4.07-uuidm): Remove variable. (ocaml-uuidm)[properties]: Remove variant. Change-Id: I8ff5a145eb1057f8aff869f865c562134c9afc9d --- gnu/packages/ocaml.scm | 15 --------------- 1 file changed, 15 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index a411bb78e0..f59bdb938d 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -4829,7 +4829,6 @@ tool and piqi-ocaml.") (propagated-inputs `(("cmdliner" ,ocaml-cmdliner) ("topkg" ,ocaml-topkg))) - (properties `((ocaml4.07-variant . ,(delay ocaml4.07-uuidm)))) (home-page "https://erratique.ch/software/uuidm") (synopsis "Universally unique identifiers for OCaml") (description "Uuidm is an OCaml module implementing 128 bits universally @@ -4837,20 +4836,6 @@ unique identifiers (UUIDs) version 3, 5 (named based with MD5, SHA-1 hashing) and 4 (random based) according to RFC 4122.") (license license:isc))) -(define-public ocaml4.07-uuidm - (package-with-ocaml4.07 - (package - (inherit ocaml-uuidm) - (version "0.9.7") - (source (origin - (method url-fetch) - (uri (string-append "http://erratique.ch/software/uuidm/" - "releases/uuidm-" version ".tbz")) - (sha256 - (base32 - "1ivxb3hxn9bk62rmixx6px4fvn52s4yr1bpla7rgkcn8981v45r8")))) - (properties '())))) - (define-public ocaml-graph (package (name "ocaml-graph") -- cgit 1.4.1 From 3936d07da2220c7a130f579f438f47862b69e1b8 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 25 Dec 2023 11:47:33 +0100 Subject: gnu: Remove ocaml4.07-lablgtk. * gnu/packages/ocaml.scm (ocaml4.07-lablgtk): Remove variable. (lablgtk)[properties]: Remove variant. Change-Id: I931b9316834d109fe291dbb8d1217690e129b9ee --- gnu/packages/ocaml.scm | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index f59bdb938d..7f891f34d0 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1332,7 +1332,6 @@ Knuth’s LR(1) parser construction technique.") (substitute* "config.make" ((ocaml) out)) #t)))))) - (properties `((ocaml4.07-variant . ,(delay ocaml4.07-lablgtk)))) (home-page "http://lablgtk.forge.ocamlcore.org/") (synopsis "GTK+ bindings for OCaml") (description @@ -1346,16 +1345,6 @@ libglade (and it an generate OCaml code from .glade files), libpanel, librsvg and quartz.") (license license:lgpl2.1))) -(define-public ocaml4.07-lablgtk - (package - (inherit lablgtk) - (name "ocaml4.07-lablgtk") - (native-inputs - `(("ocaml" ,ocaml-4.07) - ("findlib" ,ocaml4.07-findlib) - ("pkg-config" ,pkg-config))) - (properties '()))) - (define-public unison (package (name "unison") -- cgit 1.4.1 From 29a82bf5fcc4c6d000e93b2c5bcd791cac926fa3 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 25 Dec 2023 11:48:21 +0100 Subject: gnu: Remove ocaml4.07-cmdliner. * gnu/packages/ocaml.scm (ocaml4.07-cmdliner): Remove variable. (ocaml-cmdliner)[properties]: Remove variant. Change-Id: I83cd2ca87356a103201b3c1ffb1a8de4b081a9da --- gnu/packages/ocaml.scm | 15 --------------- 1 file changed, 15 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 7f891f34d0..46c96b87c3 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2280,7 +2280,6 @@ dates and times.") (("Sys.readdir dir") "let a = Sys.readdir dir in Array.sort String.compare a; a")) #t))))) - (properties `((ocaml4.07-variant . ,(delay ocaml4.07-cmdliner)))) (home-page "https://erratique.ch/software/cmdliner") (synopsis "Declarative definition of command line interfaces for OCaml") (description "Cmdliner is a module for the declarative definition of command @@ -2291,20 +2290,6 @@ generation. It supports programs with single or multiple commands and respects most of the POSIX and GNU conventions.") (license license:bsd-3))) -(define-public ocaml4.07-cmdliner - (package-with-ocaml4.07 - (package - (inherit ocaml-cmdliner) - (version "1.0.4") - (source (origin - (method url-fetch) - (uri (string-append "https://erratique.ch/software/cmdliner/releases/" - "cmdliner-" version ".tbz")) - (sha256 - (base32 - "1h04q0zkasd0mw64ggh4y58lgzkhg6yhzy60lab8k8zq9ba96ajw")))) - (properties '())))) - (define-public ocaml-fmt (package (name "ocaml-fmt") -- cgit 1.4.1 From aca25d415b0c59b4b692d06bb2194c9274399452 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 25 Dec 2023 11:48:59 +0100 Subject: gnu: Remove ocaml4.07-compiler-libs. * gnu/packages/ocaml.scm (ocaml4.07-compiler-libs): Remove variable. (ocaml-compiler-libs)[properties]: Remove variant. Change-Id: Idf54330537c2ff9317a4650df06ece7bd980b1da --- gnu/packages/ocaml.scm | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 46c96b87c3..0ab46bb8bf 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6084,33 +6084,13 @@ provided by companion libraries such as "00if2f7j9d8igdkj4rck3p74y17j6b233l91mq02drzrxj199qjv")))) (build-system dune-build-system) (arguments `(#:tests? #f)) ;no tests - (properties `((upstream-name . "ocaml-compiler-libs") - (ocaml4.07-variant . ,(delay ocaml4.07-compiler-libs)))) + (properties `((upstream-name . "ocaml-compiler-libs"))) (synopsis "Compiler libraries repackaged") (description "This package simply repackages the OCaml compiler libraries so they don't expose everything at toplevel. For instance, @code{Ast_helper} is now @code{Ocaml_common.Ast_helper}.") (license license:expat))) -(define-public ocaml4.07-compiler-libs - (package-with-ocaml4.07 - (package - (inherit ocaml-compiler-libs) - (name "ocaml-compiler-libs") - (version "0.11.0") - (home-page "https://github.com/janestreet/ocaml-compiler-libs") - (source - (origin - (method git-fetch) - (uri (git-reference - (url home-page) - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "03jds7bszh8wwpfwxb3dg0gyr1j1872wxwx1xqhry5ir0i84bg0s")))) - (properties `((upstream-name . "ocaml-compiler-libs")))))) - (define-public ocaml-stdio (package (name "ocaml-stdio") -- cgit 1.4.1 From 0806c87cb288b90b99bf2620e03beaad25a4b4dd Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 25 Dec 2023 11:49:41 +0100 Subject: gnu: Remove ocaml4.07-re. * gnu/packages/ocaml.scm (ocaml4.07-re): Remove variable. (ocaml-re)[properties]: Remove variant. Change-Id: Ib3cf5188737579908e945bd49617b6d717da4250 --- gnu/packages/ocaml.scm | 13 ------------- 1 file changed, 13 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 0ab46bb8bf..82d6aec9a8 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -4521,7 +4521,6 @@ standard iterator type starting from 4.07.") (list ocaml-seq)) (native-inputs `(("ounit" ,ocaml-ounit))) - (properties `((ocaml4.07-variant . ,(delay ocaml4.07-re)))) (home-page "https://github.com/ocaml/ocaml-re/") (synopsis "Regular expression library for OCaml") (description "Pure OCaml regular expressions with: @@ -4534,18 +4533,6 @@ standard iterator type starting from 4.07.") @end enumerate") (license license:expat))) -(define-public ocaml4.07-re - (package-with-ocaml4.07 - (package - (inherit ocaml-re) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-dune-version - (lambda _ - (delete-file "dune-project")))))) - (properties '())))) - (define-public ocaml-ocplib-endian (package (name "ocaml-ocplib-endian") -- cgit 1.4.1 From cad3698635f1687d01ba54545d7f8512f8c402b9 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 25 Dec 2023 11:50:20 +0100 Subject: gnu: Remove ocaml4.07-stdio. * gnu/packages/ocaml.scm (ocaml4.07-stdio): Remove variable. (ocaml-stdio)[properties]: Remove variant. Change-Id: I5a664b5130408eba41266f36cfc03641e2a8fd9d --- gnu/packages/ocaml.scm | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 82d6aec9a8..f750159c1d 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6090,7 +6090,6 @@ is now @code{Ocaml_common.Ast_helper}.") (propagated-inputs (list ocaml-base ocaml-sexplib0)) (arguments `(#:tests? #f)) ;no tests - (properties `((ocaml4.07-variant . ,(delay ocaml4.07-stdio)))) (synopsis "Standard IO library for OCaml") (description "Stdio implements simple input/output functionalities for OCaml. It @@ -6098,16 +6097,6 @@ re-exports the input/output functions of the OCaml standard libraries using a more consistent API.") (license license:expat))) -(define-public ocaml4.07-stdio - (package-with-ocaml4.07 - (package - (inherit ocaml-stdio) - (version "0.11.0") - (source - (janestreet-origin "stdio" version - "0pqbp2wy5fgmc38irwvmj9nlcvclb1ix1mp4y7l39bgvvlz303h9")) - (properties '())))) - (define-public ocaml-ppx-deriving (package (name "ocaml-ppx-deriving") -- cgit 1.4.1 From b1b2eb4040579dc95c600128b561a5d0c8eb033f Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 25 Dec 2023 11:51:26 +0100 Subject: gnu: Remove ocaml4.07-base. * gnu/packages/ocaml.scm (ocaml4.07-base): Remove variable. (ocaml-base)[properties]: Remove variant. Change-Id: I07813a2865b3bb42e0adf75e74bfebe372f1e789 --- gnu/packages/ocaml.scm | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index f750159c1d..5d8237d80a 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5997,8 +5997,7 @@ rules than the default pretty printer in Sexplib.") (build-system dune-build-system) (propagated-inputs (list ocaml-sexplib0)) - (properties `((ocaml4.07-variant . ,(delay ocaml4.07-base)) - (ocaml5.0-variant . ,(delay ocaml5.0-base)))) + (properties `((ocaml5.0-variant . ,(delay ocaml5.0-base)))) (synopsis "Full standard library replacement for OCaml") (description @@ -6035,25 +6034,6 @@ provided by companion libraries such as "15vsiv3q53l1bzrvqgspf3lp2104s9dzw62z3nl75f53jvjvsyf6")))) (properties '()))))) -(define-public ocaml4.07-base - (package-with-ocaml4.07 - (package - (inherit ocaml-base) - (name "ocaml-base") - (version "0.11.1") - (source - (origin - ;; version 0.11.1 is not released on ocaml.janestreet.org. - (method git-fetch) - (uri (git-reference - (url "https://github.com/janestreet/base.git") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0j6xb4265jr41vw4fjzak6yr8s30qrnzapnc6rl1dxy8bjai0nir")))) - (properties '())))) - (define-public ocaml-compiler-libs (package (name "ocaml-compiler-libs") -- cgit 1.4.1 From e22e54aa0488189e76eaa308af01bc84b2bbb477 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 25 Dec 2023 11:52:01 +0100 Subject: gnu: Remove ocaml4.07-lwt. * gnu/packages/ocaml.scm (ocaml4.07-lwt): Remove variable. (ocaml-lwt)[properties]: Remove variant. Change-Id: I3db8b1656ead127a9081d843a3ad387706bcc982 --- gnu/packages/ocaml.scm | 18 ------------------ 1 file changed, 18 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 5d8237d80a..ed868ea1f9 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2825,26 +2825,8 @@ OCaml with fibers.") make it easy to run normally-blocking I/O operations concurrently in a single process. Also, in many cases, Lwt threads can interact without the need for locks or other synchronization primitives.") - (properties `((ocaml4.07-variant . ,(delay ocaml4.07-lwt)))) (license license:lgpl2.1))) -(define-public ocaml4.07-lwt - (package-with-ocaml4.07 - (package - (inherit ocaml-lwt) - (name "ocaml-lwt") - (version "5.5.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/ocsigen/lwt") - (commit version))) - (file-name (git-file-name name version)) - (sha256 (base32 - "1jbjz2rsz3j56k8vh5qlmm87hhkr250bs2m3dvpy9vsri8rkzj9z")))) - (properties '())))) - ;; TODO this alias is not ideal but ocaml-lwt already explicitly specifies a ;; package argument and at least this way the importer doesn't try to ;; re-import it. -- cgit 1.4.1 From 4a7b5889237cf785efc6b1feb0acf1fe7622c776 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 25 Dec 2023 11:52:55 +0100 Subject: gnu: Remove ocaml4.07-sexplib0. * gnu/packages/ocaml.scm (ocaml4.07-sexplib0): Remove variable. (ocaml-sexplib0)[properties]: Remove variant. Change-Id: Ie370668adc446fc4c2b04206a6657380e5e09790 --- gnu/packages/ocaml.scm | 13 ------------- 1 file changed, 13 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index ed868ea1f9..f636ce0085 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5849,7 +5849,6 @@ exclusion algorithms are typical examples of such systems.") "05m93g4m4jhj1v8pazg3s2ydcfymr3h4476yjhdca5fm4sn35bg8")))) (build-system dune-build-system) (arguments `(#:tests? #f)) ;no tests - (properties `((ocaml4.07-variant . ,(delay ocaml4.07-sexplib0)))) (synopsis "Library containing the definition of S-expressions and some base converters") (description "Part of Jane Street's Core library The Core suite of @@ -5857,18 +5856,6 @@ libraries is an industrial strength alternative to OCaml's standard library that was developed by Jane Street, the largest industrial user of OCaml.") (license license:expat))) -(define-public ocaml4.07-sexplib0 - (package-with-ocaml4.07 - (package - (inherit ocaml-sexplib0) - (name "ocaml-sexplib0") - (version "0.11.0") - (source - (janestreet-origin "sexplib0" version - "1p06p2s7p9xsjn0z9qicniv1ai54d8sj11k8j633di2mm7jzxpin")) - (arguments `(#:tests? #f)) ; no tests - (properties '())))) - (define-public ocaml-parsexp (package (name "ocaml-parsexp") -- cgit 1.4.1 From b8aea26c4f45dfb34deefe980c6d6002d6aa12f3 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 25 Dec 2023 12:14:54 +0100 Subject: gnu: Remove ocaml-markup0.8.0. This is only used for ocaml4.07. * gnu/packages/ocaml.scm (ocaml-markup0.8.0): Remove variable. (ocaml-markup)[properties]: Remove variant. Change-Id: Ib6444d67f5b8fba13e8ca7bca444ed9e29efa7de --- gnu/packages/ocaml.scm | 24 ------------------------ 1 file changed, 24 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index f636ce0085..a8c497da95 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -7608,8 +7608,6 @@ that can later be used to manipulate time in core_kernel or core.") (list ocaml-bisect-ppx ocaml-uchar ocaml-uutf ocaml-lwt)) (native-inputs (list ocaml-ounit2 pkg-config)) - (properties - `((ocaml4.07-variant . ,(delay (package-with-ocaml4.07 ocaml-markup0.8.0))))) (synopsis "Error-recovering functional HTML5 and XML parsers and writers") (description "Markup.ml provides an HTML parser and an XML parser. The parsers are wrapped in a simple interface: they are functions that transform @@ -7631,28 +7629,6 @@ a single pass. They automatically detect the character encoding of the input stream, and convert everything to UTF-8.") (license license:bsd-3))) -;; ocaml-markup 1.0.0 can not be built with old version of dune used in -;; package-with-ocaml4.07 -(define-public ocaml-markup0.8.0 - (package - (inherit ocaml-markup) - (name "ocaml-markup") - (version "0.8.0") - (home-page "https://github.com/aantron/markup.ml") - (source - (origin - (method git-fetch) - (uri (git-reference - (url (string-append home-page ".git")) - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0aif4abvfmi9xc1pvw5n5rbm6rzkkpsxyvdn0lanr33rjpvkwdlm")))) - (native-inputs - (list ocaml-ounit pkg-config)) - (properties '()))) - (define-public ocaml-tyxml (package (name "ocaml-tyxml") -- cgit 1.4.1 From 976fe648dffe3a90d4bf5e48cf002fe55494c7fc Mon Sep 17 00:00:00 2001 From: Kaelyn Takata Date: Tue, 19 Dec 2023 21:46:33 +0800 Subject: gnu: glfw: Update to 3.3.9. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gl.scm (glfw): Update to 3.3.9. Change-Id: Ide5ec168e97d431dba007bd6095635dab83b87c4 Signed-off-by: 宋文武 --- gnu/packages/gl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 192b5e84e0..2c109ee124 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -915,7 +915,7 @@ OpenGL.") (define-public glfw (package (name "glfw") - (version "3.3.4") + (version "3.3.9") (source (origin (method url-fetch) (uri (string-append "https://github.com/glfw/glfw" @@ -923,7 +923,7 @@ OpenGL.") "/glfw-" version ".zip")) (sha256 (base32 - "1kcrpl4d6b6h23ib5j9q670d9w3knd07whgbanbmwwhbcqnc9lmv")))) + "023dn97n4h14n5lbjpzjv0y6a2plj254c0w3rr3wraf3z08189jm")))) (build-system cmake-build-system) (arguments (list -- cgit 1.4.1 From 7310d4fcc3669ba9df34314df5e691725c4e16ea Mon Sep 17 00:00:00 2001 From: Bruno Victal Date: Fri, 29 Dec 2023 13:44:05 +0000 Subject: gnu: mympd: Update to 13.0.6. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/mpd.scm (mympd): Update to 13.0.6. Signed-off-by: 宋文武 Change-Id: Iaaf3985ce4c1399bb0709f2e6702df2a232a1e48 --- gnu/packages/mpd.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm index dc827a4670..e462f0f01d 100644 --- a/gnu/packages/mpd.scm +++ b/gnu/packages/mpd.scm @@ -623,7 +623,7 @@ mpdevil loads all tags and covers on demand.") (define-public mympd (package (name "mympd") - (version "13.0.5") + (version "13.0.6") (source (origin (method git-fetch) (uri (git-reference @@ -632,7 +632,7 @@ mpdevil loads all tags and covers on demand.") (file-name (git-file-name name version)) (sha256 (base32 - "1ly3iw4irybfxyafgrldldwc28a879wwnd1pg32m2sgrwyhr0czm")))) + "17mx6qkdcnm4z6qw0ns8wmihahcnk3kidfcr6fapa34cdadsjapg")))) (outputs '("out" "doc")) (build-system cmake-build-system) (arguments -- cgit 1.4.1 From f36bcd14c62cccb2b424db2041165308c067dc55 Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Thu, 28 Dec 2023 20:28:36 +0000 Subject: gnu: shflags: Update to 1.3.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/version-control.scm (shflags): Update to 1.3.0. Change-Id: I8463a45d4a2526d971441292e7ec94c9e0710521 Signed-off-by: 宋文武 --- gnu/packages/version-control.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 013504875b..d561fb32e3 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1440,7 +1440,7 @@ management by roles and individual account maintenance.") (define-public shflags (package (name "shflags") - (version "1.2.3") + (version "1.3.0") (source (origin (method git-fetch) (uri (git-reference @@ -1449,7 +1449,7 @@ management by roles and individual account maintenance.") (file-name (git-file-name name version)) (sha256 (base32 - "1ydx0sb6vz9s2dgp5bd64y7fpzh9qvmlfjxrbmzac8saknijrlly")))) + "0jj0zkly8yg42b8jvih2cmmafv95vm8mv80n3dyalvr5i14lzqd8")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no tests -- cgit 1.4.1 From 111d010921fea8c803427dc316086434e748e773 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Fri, 22 Dec 2023 17:23:49 -0800 Subject: gnu: diffoscope: Update to 253. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/diffoscope.scm (diffoscope): Update to 253. Signed-off-by: 宋文武 Change-Id: I70d0130c8cc3cdea03546969a0e87eb4c637fc5b --- gnu/packages/diffoscope.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm index 1ac5aff719..d950466ffe 100644 --- a/gnu/packages/diffoscope.scm +++ b/gnu/packages/diffoscope.scm @@ -74,7 +74,7 @@ (define-public diffoscope (package (name "diffoscope") - (version "252") + (version "253") (source (origin (method git-fetch) @@ -83,7 +83,7 @@ (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1hnsnqpr0v9siqja1wxm64wv0vjacg6j9ph9n4xsiaarpndj1b4r")))) + (base32 "1nvq0lv246rah0ryb2qd20yf3gfy0iwfi3335rg9c3gpz0ha4wnb")))) (build-system python-build-system) (arguments (list -- cgit 1.4.1 From 9d148d08be9d77781e8103915b1f498b03fd3dd2 Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Tue, 19 Dec 2023 22:45:18 +0800 Subject: gnu: font-lxgw-wenkai: Update to 1.315. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/fonts.scm (font-lxgw-wenkai): Update to 1.315. Change-Id: I28d0526af7868a50a378fcbd5bd2d11d27b02aa1 Signed-off-by: 宋文武 --- gnu/packages/fonts.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 1b2bc319f7..7516e1642b 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -3159,7 +3159,7 @@ and readability. This package bundles those icons into a font.") (define-public font-lxgw-wenkai (package (name "font-lxgw-wenkai") - (version "1.311") + (version "1.315") (source (origin (method url-fetch) (uri (string-append @@ -3167,7 +3167,7 @@ and readability. This package bundles those icons into a font.") version "/lxgw-wenkai-v" version ".tar.gz")) (sha256 (base32 - "0f5fnqcwp8kicrbkncn5j1w06cil771jfdcjf2w48vl62m4gmf27")))) + "0isb7rbg8yb6hv8xk1ngngkgzpyb3papkl19jczwrwm373m8bn3f")))) (build-system font-build-system) (home-page "https://lxgw.github.io/2021/01/28/Klee-Simpchin/") (synopsis "Simplified Chinese Imitation Song typeface") -- cgit 1.4.1 From 2a242e86379ebddbdddf2927f26e5e27a98fc605 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 30 Dec 2023 23:44:29 -0500 Subject: gnu: Remove emacs-mu4e-conversation. * gnu/packages/emacs-xyz.scm (emacs-mu4e-conversation): Delete variable. Reported-by: Cayetano Santos Change-Id: I45126ecabdfc475e5cd19a342c78e7e98e91fe54 --- gnu/packages/emacs-xyz.scm | 31 ------------------------------- 1 file changed, 31 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 6bec2bca46..a8ac238f58 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -27112,37 +27112,6 @@ to start sxiv from a Dired buffer, allowing you to mark or unmark image files in said buffer using sxiv.") (license license:unlicense))) -(define-public emacs-mu4e-conversation - (let ((commit "98110bb9c300fc9866dee8e0023355f9f79c9b96") - (revision "5")) - (package - (name "emacs-mu4e-conversation") - (version (git-version "0.0.1" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://gitlab.com/Ambrevar/mu4e-conversation.git") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "080s96jkcw2p288sp1vgds91rgl693iz6hi2dv56p2ih0nnivwlg")))) - (build-system emacs-build-system) - (propagated-inputs - (list mu)) - (home-page - "https://gitlab.com/Ambrevar/mu4e-conversation") - (synopsis - "Show a complete thread in a single buffer") - (description - "This package offers an alternate view to mu4e's e-mail display. It -shows all e-mails of a thread in a single view, where each correspondent has -their own face. Threads can be displayed linearly (in which case e-mails are -displayed in chronological order) or as an Org document where the node tree -maps the thread tree.") - (license license:gpl3+)))) - ;; Package has no releases or tags. Version is extracted from "Version:" ;; keyword in main file. (define-public emacs-mu4e-dashboard -- cgit 1.4.1 From c3d8a7242a179f96f583d6c66300e838ea19fc7d Mon Sep 17 00:00:00 2001 From: Adam Faiz Date: Mon, 25 Dec 2023 08:16:08 +0800 Subject: gnu: Add inform. * gnu/packages/game-development.scm (inform): New variable. Signed-off-by: Liliana Marie Prikler --- gnu/packages/game-development.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index f2139b315f..dc6de4a801 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -2583,6 +2583,33 @@ added. The permanent goal is to create a Quake 3 distribution upon which people base their games, ports to new platforms, and other projects.") (license license:gpl2)))) +(define-public inform + ;; The latest release does not yet have a build system. + ;; This commit is the earliest to have one. + (let ((commit "20cbfff96015938809d0e3da6cd0d83b76d27f14") + (revision "0")) + (package + (name "inform") + (version (git-version "6.41" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://jxself.org/git/inform.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "19z8pgrj1s2irany5s6xxwsm3bdnri1as46fdi16zdp4aah523jy")))) + (build-system gnu-build-system) + (native-inputs (list autoconf automake)) + (synopsis "The Inform 6 compiler") + (description + "Inform 6 is a programming language designed for interactive fiction. +This version of the compiler has been modified slightly to work better when the +Inform standard library is in a non-standard location.") + (home-page "https://jxself.org/git/inform.git") + (license license:gpl3+)))) + (define-public instead (package (name "instead") -- cgit 1.4.1 From c95ad4e38d8c87073b4f9f7e8a4505718fe8cd98 Mon Sep 17 00:00:00 2001 From: Adam Faiz Date: Mon, 25 Dec 2023 08:17:13 +0800 Subject: gnu: Add informlib. * gnu/packages/game-development.scm (informlib): New variable. Signed-off-by: Liliana Marie Prikler --- gnu/packages/game-development.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index dc6de4a801..73f93a9992 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -56,6 +56,7 @@ #:use-module (guix svn-download) #:use-module (guix utils) #:use-module (guix build-system cmake) + #:use-module (guix build-system copy) #:use-module (guix build-system gnu) #:use-module (guix build-system python) #:use-module (guix build-system scons) @@ -2610,6 +2611,30 @@ Inform standard library is in a non-standard location.") (home-page "https://jxself.org/git/inform.git") (license license:gpl3+)))) +(define-public informlib + (package + (name "informlib") + (version "6.12.6") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://jxself.org/git/informlib.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0fcnw4jjzln402qk097n2s8y24vw1p3mmlmh6k1mbr2zfajjcn5r")))) + (build-system copy-build-system) + (arguments + (list + #:install-plan + #~'(("." "lib")))) + (synopsis "Inform 6 standard library") + (description + "This package provides the standard library for Inform 6.") + (home-page "https://jxself.org/git/informlib.git") + (license license:agpl3+))) + (define-public instead (package (name "instead") -- cgit 1.4.1 From a98b4abe769bec752c7f755fd88b093385d1f29b Mon Sep 17 00:00:00 2001 From: Adam Faiz Date: Mon, 25 Dec 2023 08:18:35 +0800 Subject: gnu: Add devours. * gnu/packages/games.scm (devours): New variable. Signed-off-by: Liliana Marie Prikler --- gnu/packages/games.scm | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 8313c02754..c7813790a1 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -10939,6 +10939,80 @@ implemented using ncurses user interface. An SDL graphical version is also available.") (license license:gpl3+))) +(define-public devours + (let ((commit "d50e745aa14aa48f7555ae12eb3d1000de1cc150") + (revision "0")) + (package + (name "devours") + (version (git-version "3" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://jxself.org/git/devours.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1ksl6mh76jfx64rmasz2571f88ws45vby2977srhgkh355zp3lzn")))) + (build-system gnu-build-system) + (arguments + (list + #:tests? #f ; no tests + #:phases + #~(modify-phases %standard-phases + (delete 'configure) ; no configure + (replace 'build + (lambda _ + (invoke "inform" + (string-append "+include_path=" + #$(this-package-native-input "informlib") + "/lib") + "devours.inf"))) + (replace 'install + (lambda* (#:key inputs #:allow-other-keys) + ;; Create standalone executable. + (let* ((bash (search-input-file inputs "/bin/bash")) + (share (string-append #$output "/share")) + (scummvm (search-input-file inputs "/bin/scummvm")) + (bin (string-append #$output "/bin")) + (executable (string-append bin "/devours"))) + (mkdir-p share) + (copy-file "devours.z5" (string-append share "/devours.z5")) + (mkdir-p bin) + (with-output-to-file executable + (lambda () + (format #t "#!~a~%" bash) + (format #t + "exec ~a --path=~a glk:zcode~%" + scummvm share))) + (chmod executable #o755)))) + (add-after 'install-executable 'install-desktop-file + (lambda _ + (let* ((apps (string-append #$output "/share/applications")) + (share (string-append #$output ""))) + (mkdir-p apps) + (make-desktop-entry-file + (string-append apps "/devours.desktop") + #:name "All Things Devours" + #:generic-name "All Things Devours" + #:exec (string-append #$output "/bin/devours") + #:categories '("AdventureGame" "Game" "RolePlaying") + #:keywords '("game" "adventure" "sci-fi") + #:comment '((#f "Sci-fi text adventure game"))))))))) + (inputs + (list bash scummvm)) + (native-inputs + (list inform informlib)) + (synopsis "All Things Devours") + (description + "All Things Devours is a short piece of sci-fi interactive fiction, +leaning strongly towards the text-adventure end of the spectrum. +Any move you make may put things into an unwinnable state. You are therefore +encouraged to save frequently, and also to realise that you will probably have +to start over several times to find the most satisfactory ending.") + (home-page "https://jxself.org/git/devours.git") + (license license:agpl3+)))) + (define-public schiffbruch ;; There haven't been any releases for several years, so I've taken the most ;; recent commit from the master branch that didn't fail to build (the last -- cgit 1.4.1 From 7330b71256531e152999bb505788dee3ba168560 Mon Sep 17 00:00:00 2001 From: Kaelyn Takata Date: Sat, 9 Dec 2023 18:11:44 +0000 Subject: gnu: wine-staging: Update to 8.18. * gnu/packages/wine.scm (wine-staging): Update to 8.18. (wine-staging-patchset-data)[#:builder]: Adjust accordingly. [native-inputs]: Drop bash. (wine-staging)[native-inputs]: Add python-3. [#:phases]: Adjust path to patch script. (wine64-staging)[#:phases]: Likewise. Change-Id: Ie71ed785c1e821b1d1752e46b3da11809b4331e5 Signed-off-by: Liliana Marie Prikler --- gnu/packages/wine.scm | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index 400f0e7607..48f7499ba2 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -304,7 +304,7 @@ integrate Windows applications into your desktop.") (define-public wine-staging-patchset-data (package (name "wine-staging-patchset-data") - (version "8.0") + (version "8.18") (source (origin (method git-fetch) @@ -313,10 +313,10 @@ integrate Windows applications into your desktop.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "11q9fa1jdrv1pd9piaicgqvidq1c08imkwpqhyzcj5r711rl7581")))) + (base32 "0qabyw5139xdfsvzbwbrn1nnqssgwk8mn88mxnq2cdkk9gbjvq56")))) (build-system trivial-build-system) (native-inputs - (list bash coreutils)) + (list coreutils)) (arguments `(#:modules ((guix build utils)) #:builder @@ -324,16 +324,12 @@ integrate Windows applications into your desktop.") (use-modules (guix build utils)) (let* ((build-directory ,(string-append name "-" version)) (source (assoc-ref %build-inputs "source")) - (bash (assoc-ref %build-inputs "bash")) (coreutils (assoc-ref %build-inputs "coreutils")) (out (assoc-ref %outputs "out")) (wine-staging (string-append out "/share/wine-staging"))) (copy-recursively source build-directory) (with-directory-excursion build-directory - (substitute* "patches/patchinstall.sh" - (("/bin/sh") - (string-append bash "/bin/sh"))) - (substitute* "patches/gitapply.sh" + (substitute* '("patches/gitapply.sh" "staging/patchinstall.py") (("/usr/bin/env") (string-append coreutils "/bin/env")))) (copy-recursively build-directory wine-staging) @@ -363,7 +359,7 @@ integrate Windows applications into your desktop.") "wine-" wine-version ".tar.xz")) (file-name (string-append name "-" wine-version ".tar.xz")) (sha256 - (base32 "0bkr3klvjy8h4djddr31fvapsi9pc2rsiyhaa7j1lwpq704w4wh2"))))) + (base32 "1nv06awb3hv26v64nqnks9yiz7w368scxznj77vxa3zpmhafzyih"))))) (inputs (modify-inputs (package-inputs wine) (prepend autoconf ; for autoreconf ffmpeg @@ -373,6 +369,9 @@ integrate Windows applications into your desktop.") python util-linux ; for hexdump wine-staging-patchset-data))) + (native-inputs + (modify-inputs (package-native-inputs wine) + (prepend python-3))) (arguments (substitute-keyword-arguments (package-arguments wine) ((#:phases phases) @@ -382,7 +381,7 @@ integrate Windows applications into your desktop.") (lambda* (#:key inputs #:allow-other-keys) (invoke (search-input-file inputs - "/share/wine-staging/patches/patchinstall.sh") + "/share/wine-staging/staging/patchinstall.py") "DESTDIR=." "--all"))) (add-after 'apply-wine-staging-patches 'patch-SHELL @@ -417,7 +416,7 @@ integrated into the main branch.") (lambda* (#:key inputs #:allow-other-keys) (invoke (search-input-file inputs - "/share/wine-staging/patches/patchinstall.sh") + "/share/wine-staging/staging/patchinstall.py") "DESTDIR=." "--all"))) (add-after 'apply-wine-staging-patches 'patch-SHELL -- cgit 1.4.1 From 94b5db7bbc28195de29d71caf219330dc960dbad Mon Sep 17 00:00:00 2001 From: Kaelyn Takata Date: Sun, 24 Dec 2023 15:35:02 +0000 Subject: gnu: Remove dxvk. This package has been broken for some time, and upstream removed support for building with winelib in version 1.7 released in May 2020. * gnu/packages/wine.scm (dxvk): Delete variable. Change-Id: I393853aa6e0c9257907549f346a36a1fe37a61a0 Signed-off-by: Liliana Marie Prikler --- gnu/packages/wine.scm | 84 --------------------------------------------------- 1 file changed, 84 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index 48f7499ba2..38f6217da2 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -424,87 +424,3 @@ integrated into the main branch.") (synopsis "Implementation of the Windows API (staging branch, WoW64 version)") (supported-systems '("x86_64-linux" "aarch64-linux")))) - -(define dxvk32 - ;; This package provides 32-bit dxvk libraries on 64-bit systems. - (package - (name "dxvk32") - (version "1.5.5") - (home-page "https://github.com/doitsujin/dxvk/") - (source (origin - (method git-fetch) - (uri (git-reference - (url home-page) - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1inl0qswgvbp0fs76md86ilqf9mbshkpjm8ga81khn9zd6v3fvan")))) - (build-system meson-build-system) - (arguments - `(#:system "i686-linux" - #:configure-flags (list "--cross-file" - (string-append (assoc-ref %build-inputs "source") - "/build-wine32.txt")))) - (native-inputs - `(("glslang" ,glslang))) - (inputs - `(("wine" ,wine-staging))) - (synopsis "Vulkan-based D3D9, D3D10 and D3D11 implementation for Wine") - (description "A Vulkan-based translation layer for Direct3D 9/10/11 which -allows running complex 3D applications with high performance using Wine. - -Use @command{setup_dxvk} to install the required libraries to a Wine prefix.") - (supported-systems '("x86_64-linux")) - (license license:zlib))) - -(define-public dxvk - (package - (inherit dxvk32) - (name "dxvk") - (arguments - `(#:configure-flags (list "--cross-file" - (string-append (assoc-ref %build-inputs "source") - "/build-wine" - ,(match (%current-system) - ("x86_64-linux" "64") - (_ "32")) - ".txt")) - #:phases - (modify-phases %standard-phases - ,@(if (string=? (%current-system) "x86_64-linux") - `((add-after 'unpack 'install-32 - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (dxvk32 (assoc-ref inputs "dxvk32"))) - (mkdir-p (string-append out "/lib32")) - (copy-recursively (string-append dxvk32 "/lib") - (string-append out "/lib32")) - #t)))) - '()) - (add-after 'install 'install-setup - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin/setup_dxvk"))) - (mkdir-p (string-append out "/bin")) - (copy-file "../source/setup_dxvk.sh" - bin) - (chmod bin #o755) - (substitute* bin - (("wine=\"wine\"") - (string-append "wine=" (assoc-ref inputs "wine") "/bin/wine")) - (("x32") ,(match (%current-system) - ("x86_64-linux" "../lib32") - (_ "../lib"))) - (("x64") "../lib")))))))) - (inputs - `(("wine" ,(match (%current-system) - ;; ("x86_64-linux" wine64) - ("x86_64-linux" wine64-staging) - ;; ("x86_64-linux" mingw-w64-x86_64) - (_ wine))) - ,@(match (%current-system) - ("x86_64-linux" - `(("dxvk32" ,dxvk32))) - (_ '())))) - (supported-systems '("i686-linux" "x86_64-linux")))) -- cgit 1.4.1 From b7466215cd05c2a1cd7c7a18c92af30376d21043 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 31 Dec 2023 08:00:20 +0200 Subject: gnu: go-github-com-stretchr-testify-bootstrap: Move to golang-check.scm * gnu/packages/golang.scm (go-github-com-stretchr-testify-bootstrap): Move from here ... * gnu/packages/golang-check.scm: ... to here. Change-Id: Iaa32e1c17a0e5a372613302e5e7fbf8de4d9572a --- gnu/packages/golang-check.scm | 12 ++++++++++++ gnu/packages/golang.scm | 11 ----------- 2 files changed, 12 insertions(+), 11 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang-check.scm b/gnu/packages/golang-check.scm index 42e501a6e3..ec886985d6 100644 --- a/gnu/packages/golang-check.scm +++ b/gnu/packages/golang-check.scm @@ -414,6 +414,18 @@ Features include: @end itemize") (license license:expat))) +(define-public go-github-com-stretchr-testify-bootstrap + (hidden-package + (package + (inherit go-github-com-stretchr-testify) + (arguments + '(#:import-path "github.com/stretchr/testify" + #:tests? #f + #:phases (modify-phases %standard-phases + (delete 'build)))) + (propagated-inputs + (list go-gopkg-in-yaml-v3))))) + (define-public go-github-com-tdewolff-test (package (name "go-github-com-tdewolff-test") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 476edf6b4d..ea809f9be0 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -4466,17 +4466,6 @@ Go.") slices, JSON and other data.") (license license:expat))) -(define go-github-com-stretchr-testify-bootstrap - (package - (inherit go-github-com-stretchr-testify) - (arguments - '(#:import-path "github.com/stretchr/testify" - #:tests? #f - #:phases (modify-phases %standard-phases - (delete 'build)))) - (propagated-inputs - (list go-gopkg-in-yaml-v3)))) - (define-public go-github-com-technoweenie-multipartstreamer (package (name "go-github-com-technoweenie-multipartstreamer") -- cgit 1.4.1 From 1709f1bc924d1ebbd21797fc41c061a5eee5c352 Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Sat, 30 Dec 2023 20:14:03 +0100 Subject: gnu: jq: Update to 1.7.1 [security fixes]. Fixes CVE-2023-50246 and CVE-2023-50268. * gnu/packages/web.scm (jq): Update to 1.7.1. Change-Id: I21999732036c76faea711e0484fa8c0d75d8736f Signed-off-by: John Kehayias --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 67f59ca9f9..f61c4f045c 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5159,7 +5159,7 @@ It uses the uwsgi protocol for all the networking/interprocess communications.") (define-public jq (package (name "jq") - (version "1.7") + (version "1.7.1") (source (origin (method url-fetch) @@ -5167,7 +5167,7 @@ It uses the uwsgi protocol for all the networking/interprocess communications.") "/releases/download/jq-" version "/jq-" version ".tar.gz")) (sha256 - (base32 "0qnv8k9x8i6i24n9vx3cxgw0yjj1411silc4wksfcinrfmlhsaj0")) + (base32 "1hl0wppdwwrqf3gzg3xwc260s7i1br2lnc97zr1k8bpx56hrr327")) (modules '((guix build utils))) (snippet ;; Remove bundled onigurama. -- cgit 1.4.1 From 37c33eb0d4f0baecd5f7c7b251b32f78fcfa6641 Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Thu, 17 Aug 2023 13:43:18 -0600 Subject: gnu: Add go-1.21. * gnu/packages/golang.scm (go-1.21): New variable. Signed-off-by: John Kehayias Change-Id: Ifa9fa61ed1ae49831621bdbabd530d29f6fa164a --- gnu/packages/golang.scm | 134 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 134 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index ea809f9be0..fc298cd6c5 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -971,6 +971,140 @@ in the style of communicating sequential processes (@dfn{CSP}).") ;; https://go.dev/issue/44505 (alist-replace "go" (list go-1.17) (package-native-inputs go-1.17))))) +(define-public go-1.21 + (package + (inherit go-1.20) + (name "go") + (version "1.21.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/golang/go") + (commit (string-append "go" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "04cpahl10i1sncymdfm0vzcj3czv6lv0axwa1sisl9cz3rdrp7hj")))) + (arguments + (substitute-keyword-arguments (package-arguments go-1.20) + ;; Source patching phases are broken up into discrete steps to allow + ;; future versions to discard individual phases without having to + ;; discard all source patching. + ((#:phases phases) + #~(modify-phases #$phases + (delete 'skip-TestGoPathShlibGccgo-tests) + (delete 'patch-source) + (add-after 'unpack 'patch-os-tests + (lambda _ + (substitute* "src/os/os_test.go" + (("/usr/bin") (getcwd)) + (("/bin/sh") (which "sh"))))) + + (add-after 'unpack 'apply-patches + (lambda* (#:key inputs #:allow-other-keys) + ;; Having the patch in the 'patches' field of breaks + ;; the 'TestServeContent' test due to the fact that timestamps + ;; are reset. Thus, apply it from here. + (invoke "patch" "-p1" "--force" "-i" + (assoc-ref inputs "go-fix-script-tests.patch")))) + + (add-after 'unpack 'patch-src/net + (lambda* (#:key inputs #:allow-other-keys) + (let ((net-base (assoc-ref inputs "net-base"))) + (substitute* "src/net/lookup_unix.go" + (("/etc/protocols") + (string-append net-base "/etc/protocols"))) + (substitute* "src/net/port_unix.go" + (("/etc/services") + (string-append net-base "/etc/services")))))) + + (add-after 'unpack 'patch-zoneinfo + (lambda* (#:key inputs #:allow-other-keys) + ;; Add the path to this specific version of tzdata's zoneinfo + ;; file to the top of the list to search. We don't want to + ;; replace any sources because it will affect how binaries + ;; compiled with this Go toolchain behave on non-guix + ;; platforms. + (substitute* "src/time/zoneinfo_unix.go" + (("var platformZoneSources.+" all) + (format #f "~a~%\"~a/share/zoneinfo\",~%" + all + (assoc-ref inputs "tzdata")))))) + + (add-after 'unpack 'patch-cmd/go/testdata/script + (lambda _ + (substitute* "src/cmd/go/testdata/script/cgo_path_space.txt" + (("/bin/sh") (which "sh"))))) + + (add-after 'enable-external-linking 'enable-external-linking-1.21 + (lambda _ + ;; Invoke GCC to link any archives created with GCC (that is, + ;; any packages built using 'cgo'), because Go doesn't know + ;; how to handle the runpaths but GCC does. Use substitute* + ;; rather than a patch since these files are liable to change + ;; often. + ;; + ;; XXX: Replace with GO_EXTLINK_ENABLED=1 or similar when + ;; and/or + ;; are resolved. + (substitute* "src/cmd/link/internal/ld/config.go" + (("\\(iscgo && \\(.+\\)") "iscgo")) + (substitute* "src/internal/testenv/testenv.go" + (("!CanInternalLink.+") "true {\n")) + (substitute* "src/syscall/exec_linux_test.go" + (("testenv.MustHaveExecPath\\(t, \"whoami\"\\)") + "t.Skipf(\"no passwd file present\")")))) + + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + ;; Notably, we do not install archives (180M), which Go will + ;; happily recompile quickly (and cache) if needed, almost + ;; surely faster than they could be substituted. + ;; + ;; The main motivation for pre-compiled archives is to use + ;; libc-linked `net' or `os' packages without a C compiler, + ;; but on Guix a C compiler is necessary to properly link the + ;; final binaries anyway. Many build flags also invalidate + ;; these pre-compiled archives, so in practice Go often + ;; recompiles them anyway. + ;; + ;; Upstream is also planning to no longer install these + ;; archives: . + ;; + ;; When necessary, a custom pre-compiled library package can + ;; be created with `#:import-path "std"' and used with + ;; `-pkgdir'. + ;; + ;; When moving files into place, any files that come from + ;; GOROOT should remain in GOROOT to continue functioning. If + ;; they need to be referenced from some other directory, they + ;; need to be symlinked from GOROOT. For more information, + ;; please see . + (let* ((out (assoc-ref outputs "out")) + (tests (assoc-ref outputs "tests"))) + (for-each + (lambda (file) + (copy-recursively file (string-append out "/lib/go/" file))) + '("bin" "go.env" "lib" "VERSION" "pkg/include" "pkg/tool")) + + (symlink "lib/go/bin" (string-append out "/bin")) + + (for-each + (match-lambda + ((file dest output) + ;; Copy to output/dest and symlink from + ;; output/lib/go/file. + (let ((file* (string-append output "/lib/go/" file)) + (dest* (string-append output "/" dest))) + (copy-recursively file dest*) + (mkdir-p (dirname file*)) + (symlink (string-append "../../" dest) file*)))) + `(("src" "share/go/src" ,out) + ("misc" "share/go/misc" ,out) + ("doc" "share/doc/go/doc" ,out) + ("api" "share/go/api" ,tests) + ("test" "share/go/test" ,tests)))))))))))) + (define-public go go-1.17) (define make-go-std -- cgit 1.4.1 From c314115dd054c000116dfc4a75df8e1a5e56e715 Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Sun, 31 Dec 2023 15:35:17 -0500 Subject: gnu: Add the Go standard library 1.21. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/golang.scm (go-std-1.21): New variable. Co-authored-by: VÖRÖSKŐI András Change-Id: I8f26611fc5a9398d915e74d3e55a0f0310b27133 --- gnu/packages/golang.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index fc298cd6c5..0e8828072b 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -1147,6 +1147,7 @@ in the style of communicating sequential processes (@dfn{CSP}).") (define-public go-std-1.18 (make-go-std go-1.18)) (define-public go-std-1.19 (make-go-std go-1.19)) (define-public go-std-1.20 (make-go-std go-1.20)) +(define-public go-std-1.21 (make-go-std go-1.21)) (define-public go-0xacab-org-leap-shapeshifter (let ((commit "0aa6226582efb8e563540ec1d3c5cfcd19200474") -- cgit 1.4.1 From 19f5302d136783d861b42107ae5e2920bbd769d9 Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Sun, 31 Dec 2023 15:37:16 -0500 Subject: gnu: go-1.21: Update to 1.21.5. * gnu/packages/golang.scm (go-1.21): Update to 1.21.5. Change-Id: Ie7d275e698c3884c93d7618d99859d6019fa8893 --- gnu/packages/golang.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 0e8828072b..fb77f610e7 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -975,7 +975,7 @@ in the style of communicating sequential processes (@dfn{CSP}).") (package (inherit go-1.20) (name "go") - (version "1.21.0") + (version "1.21.5") (source (origin (method git-fetch) (uri (git-reference @@ -984,7 +984,7 @@ in the style of communicating sequential processes (@dfn{CSP}).") (file-name (git-file-name name version)) (sha256 (base32 - "04cpahl10i1sncymdfm0vzcj3czv6lv0axwa1sisl9cz3rdrp7hj")))) + "0f11kya6rpqfldpw82g0yiknz657i655d3c0yh3qy6f8xa8x7zn2")))) (arguments (substitute-keyword-arguments (package-arguments go-1.20) ;; Source patching phases are broken up into discrete steps to allow -- cgit 1.4.1 From b20b624b0244ba9bec832b5c466cda07a94b06ce Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 1 Jan 2024 08:35:53 +0200 Subject: gnu: gccgo-12: Fix building with 1 core. * gnu/packages/gcc.scm (make-gccgo)[arguments]: When building gccgo-12 or higher add a phase to build libbacktrace before libgo. Change-Id: I9bb225b58ffa439f9461e4126f51ab453683efbe --- gnu/packages/gcc.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index e352cff5f9..a8b74a3632 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -1182,6 +1182,21 @@ provides the GNU compiler for the Go programming language.") (substitute-keyword-arguments (package-arguments gccgo) ((#:phases phases) #~(modify-phases #$phases + #$@(if (version>=? (package-version gccgo) "12.0") + #~((add-after 'unpack 'adjust-libgo-dependencies + (lambda _ + (substitute* "Makefile.in" + ;; libgo.la depends on libbacktrace.la but the + ;; current dependency rules don't have libbacktrace + ;; building early enough for libgo. When built + ;; with more than 1 core this issue doesn't appear. + ;; see commit 5fee5ec362f7a243f459e6378fd49dfc89dc9fb5. + (("all-target-libgo: maybe-all-target-libffi") + (string-append + "all-target-libgo: maybe-all-target-libbacktrace\n" + "all-target-libgo: maybe-all-target-libffi\n" + "all-target-libgo: maybe-all-target-libatomic")))))) + #~()) (add-after 'install 'wrap-go-with-tool-path (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) -- cgit 1.4.1 From def924439d361908e70329ea812fd1391883f1b0 Mon Sep 17 00:00:00 2001 From: Jean-Pierre De Jesus DIAZ Date: Wed, 27 Dec 2023 16:31:46 +0100 Subject: gnu: vim-vader: Allow using neovim for tests. * gnu/packages/vim.scm (vim-vader): Allow using neovim for tests. Change-Id: Id5b4423f24fdd42814b0a0e3fab801ec871611f7 Signed-off-by: Efraim Flashner --- gnu/packages/vim.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index 9debed0b86..03d1e5bed5 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -1509,7 +1509,7 @@ operations are available for most filetypes.") #:phases (modify-phases %standard-phases (add-before 'install 'check - (lambda* (#:key tests? #:allow-other-keys) + (lambda* (#:key tests? vim? neovim? #:allow-other-keys) (when tests? ;; FIXME: suite1.vader fails with an unknown reason, ;; lang-if.vader requires Python and Ruby. @@ -1519,9 +1519,11 @@ operations are available for most filetypes.") (display "Running Vim tests\n") (with-directory-excursion "test" - (setenv "VADER_TEST_VIM" "vim -E") + (when vim? + (setenv "VADER_TEST_VIM" "vim -E")) + (when neovim? + (setenv "VADER_TEST_VIM" "nvim --headless")) (invoke "bash" "./run-tests.sh")))))))) - (native-inputs (list vim)) (home-page "https://github.com/junegunn/vader.vim") (synopsis "Test framework for Vimscript") (description "Vader is a test framework for Vimscript designed to -- cgit 1.4.1 From b34d0ceb85c4a286f4c982f987acb198dce3c8a3 Mon Sep 17 00:00:00 2001 From: Jean-Pierre De Jesus DIAZ Date: Wed, 27 Dec 2023 16:31:47 +0100 Subject: gnu: Add neovim-vader. * gnu/packages/vim.scm (neovim-vader): New variable. Change-Id: Ib507c2086c31a42088f3f433b57ac1e345e27113 Signed-off-by: Efraim Flashner --- gnu/packages/vim.scm | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index 03d1e5bed5..7fc6cae6e9 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -1533,6 +1533,11 @@ be integrated with @acronym{CI, Continuous Integration} pipelines to automate testing and is compatible with Vim and Neovim.") (license license:expat)))) ;; Specified in README.md. +(define-public neovim-vader + (package + (inherit vim-vader) + (name "neovim-vader"))) + (define-public vim-jedi-vim (package (name "vim-jedi-vim") -- cgit 1.4.1 From cb651129a3f061b619749d3e35fa0054ae40797d Mon Sep 17 00:00:00 2001 From: Jean-Pierre De Jesus DIAZ Date: Wed, 27 Dec 2023 16:31:48 +0100 Subject: gnu: vim-coqtail: Move vim-full to arguments. * gnu/packages/vim.scm (vim-coqtail)[arguments]: Set #:vim to use vim-full. Adjust custom 'check phase accordingly. [native-inputs]: Remove vim-full. Remove input labels. Change-Id: I20cc1e0772727f8fc7db70b42151432fb6349fc7 Signed-off-by: Efraim Flashner --- gnu/packages/vim.scm | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index 7fc6cae6e9..e27feb13f7 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -470,7 +470,8 @@ trouble using them, because you do not have to remember each snippet name.") "0av2m075n6z05ah9ndrgnp9s16yrz6n2lj0igd9fh3c5k41x5xks")))) (build-system vim-build-system) (arguments - '(#:plugin-name "coqtail" + `(#:plugin-name "coqtail" + #:vim ,vim-full ; Plugin needs Python 3. #:phases (modify-phases %standard-phases (add-before 'install 'check @@ -491,9 +492,7 @@ trouble using them, because you do not have to remember each snippet name.") "/share/vim/vimfiles/pack/guix/start/vader"))) (with-directory-excursion "tests/vim" (setenv "VADER_PATH" vader-path) - (invoke (string-append - (assoc-ref (or native-inputs inputs) "vim-full") - "/bin/vim") + (invoke "vim" "-E" "-Nu" "vimrc" "-c" "Vader! *.vader"))) @@ -501,10 +500,9 @@ trouble using them, because you do not have to remember each snippet name.") ;; they don't get installed. (delete-file-recursively "python/__pycache__"))))))) (native-inputs - `(("coq-for-coqtail" ,coq-for-coqtail) - ("python-pytest" ,python-pytest) - ("vim-full" ,vim-full) ; Plugin needs Python 3. - ("vim-vader" ,vim-vader))) + (list coq-for-coqtail + python-pytest + vim-vader)) (propagated-inputs (list coq coq-ide-server)) (synopsis "Interactive Coq proofs in Vim") (description "Coqtail enables interactive Coq proof development in Vim -- cgit 1.4.1 From 6abff4eafab1206f1de1451501550ade1eaccd3c Mon Sep 17 00:00:00 2001 From: Jean-Pierre De Jesus DIAZ Date: Wed, 27 Dec 2023 16:31:49 +0100 Subject: gnu: vim-coqtail: Allow using neovim for tests. * gnu/packages/vim.scm (vim-coqtail): Allow using neovim for tests. Change-Id: I114b07dd9cf525a5571a37f51b2e6b2a57d5be46 Signed-off-by: Efraim Flashner --- gnu/packages/vim.scm | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index e27feb13f7..5f211b120d 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -475,7 +475,8 @@ trouble using them, because you do not have to remember each snippet name.") #:phases (modify-phases %standard-phases (add-before 'install 'check - (lambda* (#:key inputs native-inputs tests? #:allow-other-keys) + (lambda* (#:key inputs native-inputs tests? vim? neovim? + #:allow-other-keys) (when tests? (display "Running Python unit tests.\n") (setenv "PYTHONPATH" (string-append (getcwd) "/python")) @@ -489,12 +490,19 @@ trouble using them, because you do not have to remember each snippet name.") "vim-vader")) (vader-path (string-append vim-vader - "/share/vim/vimfiles/pack/guix/start/vader"))) + (if vim? + "/share/vim/vimfiles" + "/share/nvim/site") + "/pack/guix/start/vader")) + (command `(,@(if vim? '("vim" "-E") '()) + ,@(if neovim? '("nvim" "--headless") '()) + "-Nu" "vimrc" + "-c" "Vader! *.vader"))) (with-directory-excursion "tests/vim" + (when neovim? + (setenv "HOME" (getcwd))) (setenv "VADER_PATH" vader-path) - (invoke "vim" - "-E" "-Nu" "vimrc" - "-c" "Vader! *.vader"))) + (apply invoke command))) ;; Remove __pycache__ files generated during testing so that ;; they don't get installed. -- cgit 1.4.1 From 3bb1390171fe71ce8786648a5d8e2b4ed142e4ea Mon Sep 17 00:00:00 2001 From: Jean-Pierre De Jesus DIAZ Date: Wed, 27 Dec 2023 16:31:50 +0100 Subject: gnu: Add neovim-coqtail. * gnu/packages/vim.scm (neovim-coqtail): New variable. Change-Id: I431571925da02788410fc8bf3b1e1aea93bcb1bb Signed-off-by: Efraim Flashner --- gnu/packages/vim.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index 5f211b120d..1f7a005cb1 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -518,6 +518,18 @@ similar to CoqIDE or ProofGeneral.") (home-page "https://github.com/whonore/Coqtail") (license license:expat)))) +(define-public neovim-coqtail + (package + (inherit vim-coqtail) + (name "neovim-coqtail") + (synopsis "Interactive Coq proofs in Neovim") + (description "Coqtail enables interactive Coq proof development in Neovim +similar to CoqIDE or ProofGeneral.") + (native-inputs + (modify-inputs (package-native-inputs vim-coqtail) + (replace "vim-vader" neovim-vader) + (append python-minimal python-pynvim))))) + (define-public vim-fugitive (package (name "vim-fugitive") -- cgit 1.4.1 From 8ba7a4a042cf04923ca1c686980efc170e9db086 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 23 Dec 2023 19:30:52 +0100 Subject: gnu: Add java-jakarta-annotations-api. * gnu/packages/java.scm (java-jakarta-annotations-api): New variable. Change-Id: I374d1be6f1c509c9c6391e0551de5362eae13357 --- gnu/packages/java.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index d73550c042..e2c2a041a9 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -13719,6 +13719,34 @@ Processing specification.") ;; with classpath exception (license license:epl2.0))) +(define-public java-jakarta-annotations-api + (package + (name "java-jakarta-annotations-api") + (version "2.1.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jakartaee/common-annotations-api") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0xq2n2pijal5p75vl9dz10i6hhdmaxw5q8j3aza717xkpxxby9p6")))) + (build-system ant-build-system) + (arguments + `(#:jar-name "jakarta-annotations-api.jar" + #:source-dir "api/src/main/java" + #:tests? #f; no tests + #:jdk ,openjdk11)) + (home-page "https://github.com/jakartaee/common-annotations-api") + (synopsis "Collection of Java annotations") + (description "Jakarta Annotations defines a collection of annotations +representing common semantic concepts that enable a declarative style of +programming that applies across a variety of Java technologies.") + ;; with classpath exception + (license (list license:epl2.0 + license:gpl2)))) + (define-public java-xmp (package (name "java-xmp") -- cgit 1.4.1 From 9bfb7db8f66a62005bb76bef27273fc7101f9b52 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 23 Dec 2023 19:31:25 +0100 Subject: gnu. josm. Update to 18907. * gnu/packages/geo.scm (josm): Update to 18907. Change-Id: Ica61eabb49489bc5716b2b0bd029bbffcb7f84d3 --- gnu/packages/geo.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 053ea40408..31abb2cc36 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -1940,7 +1940,7 @@ to the OSM opening hours specification.") (define-public josm (package (name "josm") - (version "18822") + (version "18907") (source (origin (method svn-fetch) (uri (svn-reference @@ -1949,7 +1949,7 @@ to the OSM opening hours specification.") (recursive? #f))) (sha256 (base32 - "0b4q6n3jbqrh7dsfmcf2g0xdd1wjj62sjq8lwvggvrpqlk1fyn1b")) + "0vkczijw537f4y1b7hfxa45k3ww6nf2cf485b19dnbgh9ab6mnjl")) (file-name (string-append name "-" version "-checkout")) (modules '((guix build utils))) (snippet @@ -1963,6 +1963,7 @@ to the OSM opening hours specification.") (list java-commons-jcs java-commons-compress java-jmapviewer + java-jakarta-annotations-api java-jakarta-json java-jsr305 java-metadata-extractor -- cgit 1.4.1 From 4ee04aa632afbc30e2ddd40c70489c423649ee64 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 27 Dec 2023 11:23:45 +0100 Subject: gnu: r-littler: Update to 0.3.19. * gnu/packages/cran.scm (r-littler): Update to 0.3.19. [properties]: Specify updater-extra-inputs. [native-inputs]: Remove pkg-config. Change-Id: Ic152e560fa9f5609aebc8c4a68a60265b7626bcb --- gnu/packages/cran.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 9547086bf1..2fe41fbd05 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -7693,14 +7693,16 @@ functions from LINPACK.") (define-public r-littler (package (name "r-littler") - (version "0.3.18") + (version "0.3.19") (source (origin (method url-fetch) (uri (cran-uri "littler" version)) (sha256 (base32 - "1lp6a62g3yhzr4pv9kynibv7k9pd546w6hifs1aficyxbyg4dgqq")))) - (properties `((upstream-name . "littler"))) + "02b5lfdhajngs2l0fgy47zn7zn68qbx6m41cs5yzzi80qdfapkz1")))) + (properties + `((upstream-name . "littler") + (updater-extra-inputs . ("icu4c" "zlib")))) (build-system r-build-system) (arguments (list @@ -7712,7 +7714,7 @@ functions from LINPACK.") (string-append #$output "/bin"))))))) (inputs (list icu4c zlib)) (native-inputs - (list r-simplermarkdown pkg-config)) + (list r-simplermarkdown)) (home-page "https://github.com/eddelbuettel/littler") (synopsis "R at the command-line via r") (description -- cgit 1.4.1 From 71b8ed4a28c96cfd527a89d2797813f4c2b8ee4a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 27 Dec 2023 11:25:43 +0100 Subject: gnu: r-rmpi: Update to 0.7-2. * gnu/packages/cran.scm (r-rmpi): Update to 0.7-2. [properties]: Specify updater-extra-inputs. [arguments]: Use G-expression. Change-Id: Ic15015bf181ae1e7689b7c81a3bf11258e2df946 --- gnu/packages/cran.scm | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 2fe41fbd05..453ca4c11b 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -7221,20 +7221,24 @@ matrices.") (define-public r-rmpi (package (name "r-rmpi") - (version "0.7-1") + (version "0.7-2") (source (origin (method url-fetch) (uri (cran-uri "Rmpi" version)) (sha256 (base32 - "1h9dvlh9mvbc4lhxbv9c8yak3yrq4p7xym92pk5al5wkx9yy5nhp")))) - (properties `((upstream-name . "Rmpi"))) + "1vrf6bakx9i73sdgggpxzl1lxjn68b8pwvmk69d56lnya2gzm4c5")))) + (properties + `((upstream-name . "Rmpi") + (updater-extra-inputs . ("openmpi")))) (build-system r-build-system) (arguments - `(#:configure-flags '("--configure-args=\"--with-Rmpi-type=OPENMPI\"") - #:phases (modify-phases %standard-phases - (add-before 'install 'mpi-setup - ,%openmpi-setup)))) + (list + #:configure-flags '(list "--configure-args=\"--with-Rmpi-type=OPENMPI\"") + #:phases + #~(modify-phases %standard-phases + (add-before 'install 'mpi-setup + #$%openmpi-setup)))) (inputs (list openmpi)) (native-inputs -- cgit 1.4.1 From 5654f61541731442cbff191ba50e1f3c30fe89b3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 27 Dec 2023 13:47:10 +0100 Subject: gnu: Add xnnpack-for-torch2. * gnu/packages/machine-learning.scm (xnnpack-for-torch2): New variable. * gnu/packages/patches/xnnpack-for-torch2-system-libraries.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. Change-Id: I1c35f5fbd064fcc6732b924d7cafaa1a7d03ce04 --- gnu/local.mk | 1 + gnu/packages/machine-learning.scm | 28 + .../xnnpack-for-torch2-system-libraries.patch | 2660 ++++++++++++++++++++ 3 files changed, 2689 insertions(+) create mode 100644 gnu/packages/patches/xnnpack-for-torch2-system-libraries.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 3e9ac33945..a6167ee95a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2161,6 +2161,7 @@ dist_patch_DATA = \ %D%/packages/patches/xgboost-use-system-dmlc-core.patch \ %D%/packages/patches/xmonad-dynamic-linking.patch \ %D%/packages/patches/xnnpack-system-libraries.patch \ + %D%/packages/patches/xnnpack-for-torch2-system-libraries.patch \ %D%/packages/patches/xplanet-1.3.1-cxx11-eof.patch \ %D%/packages/patches/xplanet-1.3.1-libdisplay_DisplayOutput.cpp.patch \ %D%/packages/patches/xplanet-1.3.1-libimage_gif.c.patch \ diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 53a955bb90..c27b4b394b 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -3878,6 +3878,34 @@ high-level machine learning frameworks, such as TensorFlow Lite, TensorFlow.js, PyTorch, and MediaPipe.") (license license:bsd-3)))) +(define-public xnnpack-for-torch2 + ;; There's currently no tag on this repo. + (let ((version "0.0") + (commit "51a987591a6fc9f0fc0707077f53d763ac132cbf") + (revision "3")) + (package + (inherit xnnpack) + (name "xnnpack") + (version (git-version version revision commit)) + (home-page "https://github.com/google/XNNPACK") ;fork of QNNPACK + (source (origin + (method git-fetch) + (uri (git-reference (url home-page) (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1rzby82xq8d0rl1d148yz88jh9cpsw5c8b2yw7yg39mi7qmr55rm")) + (patches (search-patches "xnnpack-for-torch2-system-libraries.patch")))) + (arguments + (list + #:tests? #false + #:configure-flags '(list "-DXNNPACK_USE_SYSTEM_LIBS=YES" + "-DBUILD_SHARED_LIBS=ON" + "-DCMAKE_POSITION_INDEPENDENT_CODE=ON" + "-DXNNPACK_LIBRARY_TYPE=shared" + "-DXNNPACK_BUILD_TESTS=FALSE" ;FIXME: see below + "-DXNNPACK_BUILD_BENCHMARKS=FALSE")))))) + ;; Please also update python-torchvision when updating this package. (define-public python-pytorch (package diff --git a/gnu/packages/patches/xnnpack-for-torch2-system-libraries.patch b/gnu/packages/patches/xnnpack-for-torch2-system-libraries.patch new file mode 100644 index 0000000000..a711aa0d6c --- /dev/null +++ b/gnu/packages/patches/xnnpack-for-torch2-system-libraries.patch @@ -0,0 +1,2660 @@ +This patch allows the build process to use the provided dependencies instead +of adding their source as CMake sub-directories (in which case "make install" +would install googletest's and googlebenchmark's libraries and headers). + +diff a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt 2023-12-27 13:29:04.608138355 +0100 +@@ -850,25 +850,8 @@ + SET_PROPERTY(TARGET pthreadpool PROPERTY IMPORTED_IMPLIB "${PTHREADPOOL_LIBRARY}") + ENDIF() + ENDIF() +-TARGET_LINK_LIBRARIES(microkernels-all PRIVATE pthreadpool) +-TARGET_LINK_LIBRARIES(microkernels-prod PRIVATE pthreadpool) +-TARGET_LINK_LIBRARIES(hardware-config PRIVATE pthreadpool) +-TARGET_LINK_LIBRARIES(indirection PRIVATE pthreadpool) +-TARGET_LINK_LIBRARIES(jit PRIVATE pthreadpool) +-TARGET_LINK_LIBRARIES(logging PRIVATE pthreadpool) +-TARGET_LINK_LIBRARIES(microparams-init PRIVATE pthreadpool) +-TARGET_LINK_LIBRARIES(normalization PRIVATE pthreadpool) +-TARGET_LINK_LIBRARIES(packing PRIVATE pthreadpool) + IF(XNNPACK_BUILD_LIBRARY) + TARGET_LINK_LIBRARIES(XNNPACK PUBLIC pthreadpool) +- TARGET_LINK_LIBRARIES(allocator PRIVATE pthreadpool) +- TARGET_LINK_LIBRARIES(cache PRIVATE memory pthreadpool) +- TARGET_LINK_LIBRARIES(subgraph PRIVATE pthreadpool) +- TARGET_LINK_LIBRARIES(operators PRIVATE pthreadpool) +- TARGET_LINK_LIBRARIES(operator-run PRIVATE pthreadpool) +- TARGET_LINK_LIBRARIES(operator-utils PRIVATE pthreadpool) +- TARGET_LINK_LIBRARIES(mutex PRIVATE pthreadpool) +- TARGET_LINK_LIBRARIES(memory PRIVATE pthreadpool) + TARGET_LINK_LIBRARIES(post-operation PUBLIC pthreadpool allocator) + ENDIF() + +@@ -889,12 +872,6 @@ + SET_PROPERTY(TARGET fxdiv PROPERTY LINKER_LANGUAGE C) + ENDIF() + ENDIF() +-TARGET_LINK_LIBRARIES(microkernels-all PRIVATE fxdiv) +-TARGET_LINK_LIBRARIES(microkernels-prod PRIVATE fxdiv) +-TARGET_LINK_LIBRARIES(indirection PRIVATE fxdiv) +-IF(XNNPACK_BUILD_LIBRARY) +- TARGET_LINK_LIBRARIES(XNNPACK PRIVATE fxdiv) +-ENDIF() + + # ---[ Configure FP16 + IF(NOT TARGET fp16) +@@ -913,17 +890,7 @@ + SET_PROPERTY(TARGET fp16 PROPERTY LINKER_LANGUAGE C) + ENDIF() + ENDIF() +-TARGET_LINK_LIBRARIES(microkernels-all PRIVATE fp16) +-TARGET_LINK_LIBRARIES(microkernels-prod PRIVATE fp16) +-TARGET_LINK_LIBRARIES(microparams-init PRIVATE fp16) +-TARGET_LINK_LIBRARIES(packing PRIVATE fp16) +-TARGET_LINK_LIBRARIES(indirection PRIVATE fp16) + IF(XNNPACK_BUILD_LIBRARY) +- TARGET_LINK_LIBRARIES(subgraph PRIVATE fp16) +- TARGET_LINK_LIBRARIES(operators PRIVATE fp16) +- TARGET_LINK_LIBRARIES(operator-run PRIVATE fp16) +- +- TARGET_LINK_LIBRARIES(XNNPACK PRIVATE fp16) + INSTALL(TARGETS XNNPACK + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} +@@ -943,7 +910,7 @@ + # Helper libraries + ADD_LIBRARY(gemm-microkernel-tester STATIC test/gemm-microkernel-tester.cc) + TARGET_INCLUDE_DIRECTORIES(gemm-microkernel-tester PRIVATE . include src test) +- TARGET_LINK_LIBRARIES(gemm-microkernel-tester PRIVATE fp16 pthreadpool gtest) ++ TARGET_LINK_LIBRARIES(gemm-microkernel-tester PRIVATE gtest) + TARGET_LINK_LIBRARIES(gemm-microkernel-tester PRIVATE jit packing) + IF(XNNPACK_BUILD_LIBRARY) + TARGET_LINK_LIBRARIES(gemm-microkernel-tester PRIVATE XNNPACK post-operation) +@@ -960,22 +927,22 @@ + # ---[ Build operator-level unit tests + ADD_EXECUTABLE(abs-nc-test test/abs-nc.cc) + TARGET_INCLUDE_DIRECTORIES(abs-nc-test PRIVATE src test) +- TARGET_LINK_LIBRARIES(abs-nc-test PRIVATE XNNPACK fp16 gtest gtest_main) ++ TARGET_LINK_LIBRARIES(abs-nc-test PRIVATE XNNPACK gtest gtest_main) + ADD_TEST(NAME abs-nc-test COMMAND abs-nc-test) + + ADD_EXECUTABLE(abs-nc-eager-test test/abs-nc-eager.cc) + TARGET_INCLUDE_DIRECTORIES(abs-nc-eager-test PRIVATE src test) +- TARGET_LINK_LIBRARIES(abs-nc-eager-test PRIVATE XNNPACK fp16 gtest gtest_main) ++ TARGET_LINK_LIBRARIES(abs-nc-eager-test PRIVATE XNNPACK gtest gtest_main) + ADD_TEST(NAME abs-nc-eager-test COMMAND abs-nc-eager-test) + + ADD_EXECUTABLE(add-nd-test test/add-nd.cc) + TARGET_INCLUDE_DIRECTORIES(add-nd-test PRIVATE src test) +- TARGET_LINK_LIBRARIES(add-nd-test PRIVATE XNNPACK fp16 gtest gtest_main) ++ TARGET_LINK_LIBRARIES(add-nd-test PRIVATE XNNPACK gtest gtest_main) + ADD_TEST(NAME add-nd-test COMMAND add-nd-test) + + ADD_EXECUTABLE(add-nd-eager-test test/add-nd-eager.cc) + TARGET_INCLUDE_DIRECTORIES(add-nd-eager-test PRIVATE src test) +- TARGET_LINK_LIBRARIES(add-nd-eager-test PRIVATE XNNPACK fp16 gtest gtest_main) ++ TARGET_LINK_LIBRARIES(add-nd-eager-test PRIVATE XNNPACK gtest gtest_main) + ADD_TEST(NAME add-nd-eager-test COMMAND add-nd-eager-test) + + ADD_EXECUTABLE(argmax-pooling-nhwc-test test/argmax-pooling-nhwc.cc) +@@ -985,27 +952,27 @@ + + ADD_EXECUTABLE(average-pooling-nhwc-test test/average-pooling-nhwc.cc) + TARGET_INCLUDE_DIRECTORIES(average-pooling-nhwc-test PRIVATE src test) +- TARGET_LINK_LIBRARIES(average-pooling-nhwc-test PRIVATE XNNPACK fp16 gtest gtest_main) ++ TARGET_LINK_LIBRARIES(average-pooling-nhwc-test PRIVATE XNNPACK gtest gtest_main) + ADD_TEST(NAME average-pooling-nhwc-test COMMAND average-pooling-nhwc-test) + + ADD_EXECUTABLE(bankers-rounding-nc-test test/bankers-rounding-nc.cc) + TARGET_INCLUDE_DIRECTORIES(bankers-rounding-nc-test PRIVATE src test) +- TARGET_LINK_LIBRARIES(bankers-rounding-nc-test PRIVATE XNNPACK fp16 gtest gtest_main) ++ TARGET_LINK_LIBRARIES(bankers-rounding-nc-test PRIVATE XNNPACK gtest gtest_main) + ADD_TEST(NAME bankers-rounding-nc-test COMMAND bankers-rounding-nc-test) + + ADD_EXECUTABLE(bankers-rounding-nc-eager-test test/bankers-rounding-nc-eager.cc) + TARGET_INCLUDE_DIRECTORIES(bankers-rounding-nc-eager-test PRIVATE src test) +- TARGET_LINK_LIBRARIES(bankers-rounding-nc-eager-test PRIVATE XNNPACK fp16 gtest gtest_main) ++ TARGET_LINK_LIBRARIES(bankers-rounding-nc-eager-test PRIVATE XNNPACK gtest gtest_main) + ADD_TEST(NAME bankers-rounding-nc-eager-test COMMAND bankers-rounding-nc-eager-test) + + ADD_EXECUTABLE(ceiling-nc-test test/ceiling-nc.cc) + TARGET_INCLUDE_DIRECTORIES(ceiling-nc-test PRIVATE src test) +- TARGET_LINK_LIBRARIES(ceiling-nc-test PRIVATE XNNPACK fp16 gtest gtest_main) ++ TARGET_LINK_LIBRARIES(ceiling-nc-test PRIVATE XNNPACK gtest gtest_main) + ADD_TEST(NAME ceiling-nc-test COMMAND ceiling-nc-test) + + ADD_EXECUTABLE(ceiling-nc-eager-test test/ceiling-nc-eager.cc) + TARGET_INCLUDE_DIRECTORIES(ceiling-nc-eager-test PRIVATE src test) +- TARGET_LINK_LIBRARIES(ceiling-nc-eager-test PRIVATE XNNPACK fp16 gtest gtest_main) ++ TARGET_LINK_LIBRARIES(ceiling-nc-eager-test PRIVATE XNNPACK gtest gtest_main) + ADD_TEST(NAME ceiling-nc-eager-test COMMAND ceiling-nc-eager-test) + + ADD_EXECUTABLE(channel-shuffle-nc-test test/channel-shuffle-nc.cc) +@@ -1015,12 +982,12 @@ + + ADD_EXECUTABLE(clamp-nc-test test/clamp-nc.cc) + TARGET_INCLUDE_DIRECTORIES(clamp-nc-test PRIVATE src test) +- TARGET_LINK_LIBRARIES(clamp-nc-test PRIVATE XNNPACK fp16 gtest gtest_main) ++ TARGET_LINK_LIBRARIES(clamp-nc-test PRIVATE XNNPACK gtest gtest_main) + ADD_TEST(NAME clamp-nc-test COMMAND clamp-nc-test) + + ADD_EXECUTABLE(clamp-nc-eager-test test/clamp-nc-eager.cc) + TARGET_INCLUDE_DIRECTORIES(clamp-nc-eager-test PRIVATE src test) +- TARGET_LINK_LIBRARIES(clamp-nc-eager-test PRIVATE XNNPACK fp16 gtest gtest_main) ++ TARGET_LINK_LIBRARIES(clamp-nc-eager-test PRIVATE XNNPACK gtest gtest_main) + ADD_TEST(NAME clamp-nc-eager-test COMMAND clamp-nc-eager-test) + + ADD_EXECUTABLE(constant-pad-nd-test test/constant-pad-nd.cc) +@@ -1035,25 +1002,25 @@ + + ADD_EXECUTABLE(convert-nc-test test/convert-nc.cc) + TARGET_INCLUDE_DIRECTORIES(convert-nc-test PRIVATE src test) +- TARGET_LINK_LIBRARIES(convert-nc-test PRIVATE XNNPACK fp16 gtest gtest_main) ++ TARGET_LINK_LIBRARIES(convert-nc-test PRIVATE XNNPACK gtest gtest_main) + ADD_TEST(NAME convert-nc-test COMMAND convert-nc-test) + + ADD_EXECUTABLE(convert-nc-eager-test test/convert-nc-eager.cc) + TARGET_INCLUDE_DIRECTORIES(convert-nc-eager-test PRIVATE src test) +- TARGET_LINK_LIBRARIES(convert-nc-eager-test PRIVATE XNNPACK fp16 gtest gtest_main) ++ TARGET_LINK_LIBRARIES(convert-nc-eager-test PRIVATE XNNPACK gtest gtest_main) + ADD_TEST(NAME convert-nc-eager-test COMMAND convert-nc-eager-test) + + ADD_EXECUTABLE(convolution-nhwc-test test/convolution-nhwc.cc) + SET_TARGET_PROPERTIES(convolution-nhwc-test PROPERTIES CXX_EXTENSIONS YES) + TARGET_INCLUDE_DIRECTORIES(convolution-nhwc-test PRIVATE src test) +- TARGET_LINK_LIBRARIES(convolution-nhwc-test PRIVATE XNNPACK fp16 gtest gtest_main) ++ TARGET_LINK_LIBRARIES(convolution-nhwc-test PRIVATE XNNPACK gtest gtest_main) + TARGET_LINK_LIBRARIES(convolution-nhwc-test PRIVATE convolution-test-helpers) + ADD_TEST(NAME convolution-nhwc-test COMMAND convolution-nhwc-test) + + ADD_EXECUTABLE(convolution-nchw-test test/convolution-nchw.cc) + SET_TARGET_PROPERTIES(convolution-nchw-test PROPERTIES CXX_EXTENSIONS YES) + TARGET_INCLUDE_DIRECTORIES(convolution-nchw-test PRIVATE src test) +- TARGET_LINK_LIBRARIES(convolution-nchw-test PRIVATE XNNPACK fp16 gtest gtest_main) ++ TARGET_LINK_LIBRARIES(convolution-nchw-test PRIVATE XNNPACK gtest gtest_main) + ADD_TEST(NAME convolution-nchw-test COMMAND convolution-nchw-test) + + ADD_EXECUTABLE(copy-nc-test test/copy-nc.cc) +@@ -1068,7 +1035,7 @@ + + ADD_EXECUTABLE(deconvolution-nhwc-test test/deconvolution-nhwc.cc) + TARGET_INCLUDE_DIRECTORIES(deconvolution-nhwc-test PRIVATE src test) +- TARGET_LINK_LIBRARIES(deconvolution-nhwc-test PRIVATE XNNPACK fp16 gtest gtest_main) ++ TARGET_LINK_LIBRARIES(deconvolution-nhwc-test PRIVATE XNNPACK gtest gtest_main) + ADD_TEST(NAME deconvolution-nhwc-test COMMAND deconvolution-nhwc-test) + + ADD_EXECUTABLE(depth-to-space-nchw2nhwc-test test/depth-to-space-nchw2nhwc.cc) +@@ -1083,197 +1050,197 @@ + + ADD_EXECUTABLE(divide-nd-test test/divide-nd.cc) + TARGET_INCLUDE_DIRECTORIES(divide-nd-test PRIVATE src test) +- TARGET_LINK_LIBRARIES(divide-nd-test PRIVATE XNNPACK fp16 gtest gtest_main) ++ TARGET_LINK_LIBRARIES(divide-nd-test PRIVATE XNNPACK gtest gtest_main) + ADD_TEST(NAME divide-nd-test COMMAND divide-nd-test) + + ADD_EXECUTABLE(divide-nd-eager-test test/divide-nd-eager.cc) + TARGET_INCLUDE_DIRECTORIES(divide-nd-eager-test PRIVATE src test) +- TARGET_LINK_LIBRARIES(divide-nd-eager-test PRIVATE XNNPACK fp16 gtest gtest_main) ++ TARGET_LINK_LIBRARIES(divide-nd-eager-test PRIVATE XNNPACK gtest gtest_main) + ADD_TEST(NAME divide-nd-eager-test COMMAND divide-nd-eager-test) + + ADD_EXECUTABLE(elu-nc-test test/elu-nc.cc) + TARGET_INCLUDE_DIRECTORIES(elu-nc-test PRIVATE src test) +- TARGET_LINK_LIBRARIES(elu-nc-test PRIVATE XNNPACK fp16 gtest gtest_main) ++ TARGET_LINK_LIBRARIES(elu-nc-test PRIVATE XNNPACK gtest gtest_main) + ADD_TEST(NAME elu-nc-test COMMAND elu-nc-test) + + ADD_EXECUTABLE(elu-nc-eager-test test/elu-nc-eager.cc) + TARGET_INCLUDE_DIRECTORIES(elu-nc-eager-test PRIVATE src test) +- TARGET_LINK_LIBRARIES(elu-nc-eager-test PRIVATE XNNPACK fp16 gtest gtest_main) ++ TARGET_LINK_LIBRARIES(elu-nc-eager-test PRIVATE XNNPACK gtest gtest_main) + ADD_TEST(NAME elu-nc-eager-test COMMAND elu-nc-eager-test) + + ADD_EXECUTABLE(fully-connected-nc-test test/fully-connected-nc.cc) + TARGET_INCLUDE_DIRECTORIES(fully-connected-nc-test PRIVATE src test) +- TARGET_LINK_LIBRARIES(fully-connected-nc-test PRIVATE XNNPACK fp16 gtest gtest_main) ++ TARGET_LINK_LIBRARIES(fully-connected-nc-test PRIVATE XNNPACK gtest gtest_main) + ADD_TEST(NAME fully-connected-nc-test COMMAND fully-connected-nc-test) + + ADD_EXECUTABLE(floor-nc-test test/floor-nc.cc) + TARGET_INCLUDE_DIRECTORIES(floor-nc-test PRIVATE src test) +- TARGET_LINK_LIBRARIES(floor-nc-test PRIVATE XNNPACK fp16 gtest gtest_main) ++ TARGET_LINK_LIBRARIES(floor-nc-test PRIVATE XNNPACK gtest gtest_main) + ADD_TEST(NAME floor-nc-test COMMAND floor-nc-test) + + ADD_EXECUTABLE(floor-nc-eager-test test/floor-nc-eager.cc) + TARGET_INCLUDE_DIRECTORIES(floor-nc-eager-test PRIVATE src test) +- TARGET_LINK_LIBRARIES(floor-nc-eager-test PRIVATE XNNPACK fp16 gtest gtest_main) ++ TARGET_LINK_LIBRARIES(floor-nc-eager-test PRIVATE XNNPACK gtest gtest_main) + ADD_TEST(NAME floor-nc-eager-test COMMAND floor-nc-eager-test) + + ADD_EXECUTABLE(global-average-pooling-nwc-test test/global-average-pooling-nwc.cc) + TARGET_INCLUDE_DIRECTORIES(global-average-pooling-nwc-test PRIVATE src test) +- TARGET_LINK_LIBRARIES(global-average-pooling-nwc-test PRIVATE XNNPACK fp16 gtest gtest_main) ++ TARGET_LINK_LIBRARIES(global-average-pooling-nwc-test PRIVATE XNNPACK gtest gtest_main) + ADD_TEST(NAME global-average-pooling-nwc-test COMMAND global-average-pooling-nwc-test) + + ADD_EXECUTABLE(global-average-pooling-ncw-test test/global-average-pooling-ncw.cc) + TARGET_INCLUDE_DIRECTORIES(global-average-pooling-ncw-test PRIVATE src test) +- TARGET_LINK_LIBRARIES(global-average-pooling-ncw-test PRIVATE XNNPACK fp16 gtest gtest_main) ++ TARGET_LINK_LIBRARIES(global-average-pooling-ncw-test PRIVATE XNNPACK gtest gtest_main) + ADD_TEST(NAME global-average-pooling-ncw-test COMMAND global-average-pooling-ncw-test) + + ADD_EXECUTABLE(hardswish-nc-test test/hardswish-nc.cc) + TARGET_INCLUDE_DIRECTORIES(hardswish-nc-test PRIVATE src test) +- TARGET_LINK_LIBRARIES(hardswish-nc-test PRIVATE XNNPACK fp16 gtest gtest_main) ++ TARGET_LINK_LIBRARIES(hardswish-nc-test PRIVATE XNNPACK gtest gtest_main) + ADD_TEST(NAME hardswish-nc-test COMMAND hardswish-nc-test) + + ADD_EXECUTABLE(hardswish-nc-eager-test test/hardswish-nc-eager.cc) + TARGET_INCLUDE_DIRECTORIES(hardswish-nc-eager-test PRIVATE src test) +- TARGET_LINK_LIBRARIES(hardswish-nc-eager-test PRIVATE XNNPACK fp16 gtest gtest_main) ++ TARGET_LINK_LIBRARIES(hardswish-nc-eager-test PRIVATE XNNPACK gtest gtest_main) + ADD_TEST(NAME hardswish-nc-eager-test COMMAND hardswish-nc-eager-test) + + ADD_EXECUTABLE(leaky-relu-nc-test test/leaky-relu-nc.cc) + TARGET_INCLUDE_DIRECTORIES(leaky-relu-nc-test PRIVATE src test) +- TARGET_LINK_LIBRARIES(leaky-relu-nc-test PRIVATE XNNPACK fp16 gtest gtest_main) ++ TARGET_LINK_LIBRARIES(leaky-relu-nc-test PRIVATE XNNPACK gtest gtest_main) + ADD_TEST(NAME leaky-relu-nc-test COMMAND leaky-relu-nc-test) + + ADD_EXECUTABLE(leaky-relu-nc-eager-test test/leaky-relu-nc-eager.cc) + TARGET_INCLUDE_DIRECTORIES(leaky-relu-nc-eager-test PRIVATE src test) +- TARGET_LINK_LIBRARIES(leaky-relu-nc-eager-test PRIVATE XNNPACK fp16 gtest gtest_main) ++ TARGET_LINK_LIBRARIES(leaky-relu-nc-eager-test PRIVATE XNNPACK gtest gtest_main) + ADD_TEST(NAME leaky-relu-nc-eager-test COMMAND leaky-relu-nc-eager-test) + + ADD_EXECUTABLE(max-pooling-nhwc-test test/max-pooling-nhwc.cc) + TARGET_INCLUDE_DIRECTORIES(max-pooling-nhwc-test PRIVATE src test) +- TARGET_LINK_LIBRARIES(max-pooling-nhwc-test PRIVATE XNNPACK fp16 gtest gtest_main) ++ TARGET_LINK_LIBRARIES(max-pooling-nhwc-test PRIVATE XNNPACK gtest gtest_main) + ADD_TEST(NAME max-pooling-nhwc-test COMMAND max-pooling-nhwc-test) + + ADD_EXECUTABLE(maximum-nd-test test/maximum-nd.cc) + TARGET_INCLUDE_DIRECTORIES(maximum-nd-test PRIVATE src test) +- TARGET_LINK_LIBRARIES(maximum-nd-test PRIVATE XNNPACK fp16 gtest gtest_main) ++ TARGET_LINK_LIBRARIES(maximum-nd-test PRIVATE XNNPACK gtest gtest_main) + ADD_TEST(NAME maximum-nd-test COMMAND maximum-nd-test) + + ADD_EXECUTABLE(maximum-nd-eager-test test/maximum-nd-eager.cc) + TARGET_INCLUDE_DIRECTORIES(maximum-nd-eager-test PRIVATE src test) +- TARGET_LINK_LIBRARIES(maximum-nd-eager-test PRIVATE XNNPACK fp16 gtest gtest_main) ++ TARGET_LINK_LIBRARIES(maximum-nd-eager-test PRIVATE XNNPACK gtest gtest_main) + ADD_TEST(NAME maximum-nd-eager-test COMMAND maximum-nd-eager-test) + + ADD_EXECUTABLE(minimum-nd-test test/minimum-nd.cc) + TARGET_INCLUDE_DIRECTORIES(minimum-nd-test PRIVATE src test) +- TARGET_LINK_LIBRARIES(minimum-nd-test PRIVATE XNNPACK fp16 gtest gtest_main) ++ TARGET_LINK_LIBRARIES(minimum-nd-test PRIVATE XNNPACK gtest gtest_main) + ADD_TEST(NAME minimum-nd-test COMMAND minimum-nd-test) + + ADD_EXECUTABLE(minimum-nd-eager-test test/minimum-nd-eager.cc) + TARGET_INCLUDE_DIRECTORIES(minimum-nd-eager-test PRIVATE src test) +- TARGET_LINK_LIBRARIES(minimum-nd-eager-test PRIVATE XNNPACK fp16 gtest gtest_main) ++ TARGET_LINK_LIBRARIES(minimum-nd-eager-test PRIVATE XNNPACK gtest gtest_main) + ADD_TEST(NAME minimum-nd-eager-test COMMAND minimum-nd-eager-test) + + ADD_EXECUTABLE(multiply-nd-test test/multiply-nd.cc) + TARGET_INCLUDE_DIRECTORIES(multiply-nd-test PRIVATE src test) +- TARGET_LINK_LIBRARIES(multiply-nd-test PRIVATE XNNPACK fp16 gtest gtest_main) ++ TARGET_LINK_LIBRARIES(multiply-nd-test PRIVATE XNNPACK gtest gtest_main) + ADD_TEST(NAME multiply-nd-test COMMAND multiply-nd-test) + + ADD_EXECUTABLE(multiply-nd-eager-test test/multiply-nd-eager.cc) + TARGET_INCLUDE_DIRECTORIES(multiply-nd-eager-test PRIVATE src test) +- TARGET_LINK_LIBRARIES(multiply-nd-eager-test PRIVATE XNNPACK fp16 gtest gtest_main) ++ TARGET_LINK_LIBRARIES(multiply-nd-eager-test PRIVATE XNNPACK gtest gtest_main) + ADD_TEST(NAME multiply-nd-eager-test COMMAND multiply-nd-eager-test) + + ADD_EXECUTABLE(negate-nc-test test/negate-nc.cc) + TARGET_INCLUDE_DIRECTORIES(negate-nc-test PRIVATE src test) +- TARGET_LINK_LIBRARIES(negate-nc-test PRIVATE XNNPACK fp16 gtest gtest_main) ++ TARGET_LINK_LIBRARIES(negate-nc-test PRIVATE XNNPACK gtest gtest_main) + ADD_TEST(NAME negate-nc-test COMMAND negate-nc-test) + + ADD_EXECUTABLE(negate-nc-eager-test test/negate-nc-eager.cc) + TARGET_INCLUDE_DIRECTORIES(negate-nc-eager-test PRIVATE src test) +- TARGET_LINK_LIBRARIES(negate-nc-eager-test PRIVATE XNNPACK fp16 gtest gtest_main) ++ TARGET_LINK_LIBRARIES(negate-nc-eager-test PRIVATE XNNPACK gtest gtest_main) + ADD_TEST(NAME negate-nc-eager-test COMMAND negate-nc-eager-test) + + ADD_EXECUTABLE(prelu-nc-test test/prelu-nc.cc) + TARGET_INCLUDE_DIRECTORIES(prelu-nc-test PRIVATE src test) +- TARGET_LINK_LIBRARIES(prelu-nc-test PRIVATE XNNPACK fp16 gtest gtest_main) ++ TARGET_LINK_LIBRARIES(prelu-nc-test PRIVATE XNNPACK gtest gtest_main) + ADD_TEST(NAME prelu-nc-test COMMAND prelu-nc-test) + + ADD_EXECUTABLE(resize-bilinear-nhwc-test test/resize-bilinear-nhwc.cc) + TARGET_INCLUDE_DIRECTORIES(resize-bilinear-nhwc-test PRIVATE src test) +- TARGET_LINK_LIBRARIES(resize-bilinear-nhwc-test PRIVATE XNNPACK fp16 gtest gtest_main) ++ TARGET_LINK_LIBRARIES(resize-bilinear-nhwc-test PRIVATE XNNPACK gtest gtest_main) + ADD_TEST(NAME resize-bilinear-nhwc-test COMMAND resize-bilinear-nhwc-test) + + ADD_EXECUTABLE(resize-bilinear-nchw-test test/resize-bilinear-nchw.cc) + TARGET_INCLUDE_DIRECTORIES(resize-bilinear-nchw-test PRIVATE src test) +- TARGET_LINK_LIBRARIES(resize-bilinear-nchw-test PRIVATE XNNPACK fp16 gtest gtest_main) ++ TARGET_LINK_LIBRARIES(resize-bilinear-nchw-test PRIVATE XNNPACK gtest gtest_main) + ADD_TEST(NAME resize-bilinear-nchw-test COMMAND resize-bilinear-nchw-test) + + ADD_EXECUTABLE(sigmoid-nc-test test/sigmoid-nc.cc) + TARGET_INCLUDE_DIRECTORIES(sigmoid-nc-test PRIVATE src test) +- TARGET_LINK_LIBRARIES(sigmoid-nc-test PRIVATE XNNPACK fp16 gtest gtest_main) ++ TARGET_LINK_LIBRARIES(sigmoid-nc-test PRIVATE XNNPACK gtest gtest_main) + ADD_TEST(NAME sigmoid-nc-test COMMAND sigmoid-nc-test) + + ADD_EXECUTABLE(sigmoid-nc-eager-test test/sigmoid-nc-eager.cc) + TARGET_INCLUDE_DIRECTORIES(sigmoid-nc-eager-test PRIVATE src test) +- TARGET_LINK_LIBRARIES(sigmoid-nc-eager-test PRIVATE XNNPACK fp16 gtest gtest_main) ++ TARGET_LINK_LIBRARIES(sigmoid-nc-eager-test PRIVATE XNNPACK gtest gtest_main) + ADD_TEST(NAME sigmoid-nc-eager-test COMMAND sigmoid-nc-eager-test) + + ADD_EXECUTABLE(slice-nd-test test/slice-nd.cc) + TARGET_INCLUDE_DIRECTORIES(slice-nd-test PRIVATE src test) +- TARGET_LINK_LIBRARIES(slice-nd-test PRIVATE XNNPACK fp16 gtest gtest_main) ++ TARGET_LINK_LIBRARIES(slice-nd-test PRIVATE XNNPACK gtest gtest_main) + ADD_TEST(NAME slice-nd-test COMMAND slice-nd-test) + + ADD_EXECUTABLE(slice-nd-eager-test test/slice-nd-eager.cc) + TARGET_INCLUDE_DIRECTORIES(slice-nd-eager-test PRIVATE src test) +- TARGET_LINK_LIBRARIES(slice-nd-eager-test PRIVATE XNNPACK fp16 gtest gtest_main) ++ TARGET_LINK_LIBRARIES(slice-nd-eager-test PRIVATE XNNPACK gtest gtest_main) + ADD_TEST(NAME slice-nd-eager-test COMMAND slice-nd-eager-test) + + ADD_EXECUTABLE(softmax-nc-test test/softmax-nc.cc) + TARGET_INCLUDE_DIRECTORIES(softmax-nc-test PRIVATE src test) +- TARGET_LINK_LIBRARIES(softmax-nc-test PRIVATE XNNPACK fp16 gtest gtest_main) ++ TARGET_LINK_LIBRARIES(softmax-nc-test PRIVATE XNNPACK gtest gtest_main) + ADD_TEST(NAME softmax-nc-test COMMAND softmax-nc-test) + + ADD_EXECUTABLE(space-to-depth-nhwc-test test/space-to-depth-nhwc.cc) + TARGET_INCLUDE_DIRECTORIES(space-to-depth-nhwc-test PRIVATE src test) +- TARGET_LINK_LIBRARIES(space-to-depth-nhwc-test PRIVATE XNNPACK fp16 gtest gtest_main) ++ TARGET_LINK_LIBRARIES(space-to-depth-nhwc-test PRIVATE XNNPACK gtest gtest_main) + ADD_TEST(NAME space-to-depth-nhwc-test COMMAND space-to-depth-nhwc-test) + + ADD_EXECUTABLE(square-nc-test test/square-nc.cc) + TARGET_INCLUDE_DIRECTORIES(square-nc-test PRIVATE src test) +- TARGET_LINK_LIBRARIES(square-nc-test PRIVATE XNNPACK fp16 gtest gtest_main) ++ TARGET_LINK_LIBRARIES(square-nc-test PRIVATE XNNPACK gtest gtest_main) + ADD_TEST(NAME square-nc-test COMMAND square-nc-test) + + ADD_EXECUTABLE(square-nc-eager-test test/square-nc-eager.cc) + TARGET_INCLUDE_DIRECTORIES(square-nc-eager-test PRIVATE src test) +- TARGET_LINK_LIBRARIES(square-nc-eager-test PRIVATE XNNPACK fp16 gtest gtest_main) ++ TARGET_LINK_LIBRARIES(square-nc-eager-test PRIVATE XNNPACK gtest gtest_main) + ADD_TEST(NAME square-nc-eager-test COMMAND square-nc-eager-test) + + ADD_EXECUTABLE(square-root-nc-test test/square-root-nc.cc) + TARGET_INCLUDE_DIRECTORIES(square-root-nc-test PRIVATE src test) +- TARGET_LINK_LIBRARIES(square-root-nc-test PRIVATE XNNPACK fp16 gtest gtest_main) ++ TARGET_LINK_LIBRARIES(square-root-nc-test PRIVATE XNNPACK gtest gtest_main) + ADD_TEST(NAME square-root-nc-test COMMAND square-root-nc-test) + + ADD_EXECUTABLE(square-root-nc-eager-test test/square-root-nc-eager.cc) + TARGET_INCLUDE_DIRECTORIES(square-root-nc-eager-test PRIVATE src test) +- TARGET_LINK_LIBRARIES(square-root-nc-eager-test PRIVATE XNNPACK fp16 gtest gtest_main) ++ TARGET_LINK_LIBRARIES(square-root-nc-eager-test PRIVATE XNNPACK gtest gtest_main) + ADD_TEST(NAME square-root-nc-eager-test COMMAND square-root-nc-eager-test) + + ADD_EXECUTABLE(squared-difference-nd-test test/squared-difference-nd.cc) + TARGET_INCLUDE_DIRECTORIES(squared-difference-nd-test PRIVATE src test) +- TARGET_LINK_LIBRARIES(squared-difference-nd-test PRIVATE XNNPACK fp16 gtest gtest_main) ++ TARGET_LINK_LIBRARIES(squared-difference-nd-test PRIVATE XNNPACK gtest gtest_main) + ADD_TEST(NAME squared-difference-nd-test COMMAND squared-difference-nd-test) + + ADD_EXECUTABLE(squared-difference-nd-eager-test test/squared-difference-nd-eager.cc) + TARGET_INCLUDE_DIRECTORIES(squared-difference-nd-eager-test PRIVATE src test) +- TARGET_LINK_LIBRARIES(squared-difference-nd-eager-test PRIVATE XNNPACK fp16 gtest gtest_main) ++ TARGET_LINK_LIBRARIES(squared-difference-nd-eager-test PRIVATE XNNPACK gtest gtest_main) + ADD_TEST(NAME squared-difference-nd-eager-test COMMAND squared-difference-nd-eager-test) + + ADD_EXECUTABLE(subtract-nd-test test/subtract-nd.cc) + TARGET_INCLUDE_DIRECTORIES(subtract-nd-test PRIVATE src test) +- TARGET_LINK_LIBRARIES(subtract-nd-test PRIVATE XNNPACK fp16 gtest gtest_main) ++ TARGET_LINK_LIBRARIES(subtract-nd-test PRIVATE XNNPACK gtest gtest_main) + ADD_TEST(NAME subtract-nd-test COMMAND subtract-nd-test) + + ADD_EXECUTABLE(subtract-nd-eager-test test/subtract-nd-eager.cc) + TARGET_INCLUDE_DIRECTORIES(subtract-nd-eager-test PRIVATE src test) +- TARGET_LINK_LIBRARIES(subtract-nd-eager-test PRIVATE XNNPACK fp16 gtest gtest_main) ++ TARGET_LINK_LIBRARIES(subtract-nd-eager-test PRIVATE XNNPACK gtest gtest_main) + ADD_TEST(NAME subtract-nd-eager-test COMMAND subtract-nd-eager-test) + + ADD_EXECUTABLE(tanh-nc-test test/tanh-nc.cc) +@@ -1293,12 +1260,12 @@ + + ADD_EXECUTABLE(truncation-nc-test test/truncation-nc.cc) + TARGET_INCLUDE_DIRECTORIES(truncation-nc-test PRIVATE src test) +- TARGET_LINK_LIBRARIES(truncation-nc-test PRIVATE XNNPACK fp16 gtest gtest_main) ++ TARGET_LINK_LIBRARIES(truncation-nc-test PRIVATE XNNPACK gtest gtest_main) + ADD_TEST(NAME truncation-nc-test COMMAND truncation-nc-test) + + ADD_EXECUTABLE(truncation-nc-eager-test test/truncation-nc-eager.cc) + TARGET_INCLUDE_DIRECTORIES(truncation-nc-eager-test PRIVATE src test) +- TARGET_LINK_LIBRARIES(truncation-nc-eager-test PRIVATE XNNPACK fp16 gtest gtest_main) ++ TARGET_LINK_LIBRARIES(truncation-nc-eager-test PRIVATE XNNPACK gtest gtest_main) + ADD_TEST(NAME truncation-nc-eager-test COMMAND truncation-nc-eager-test) + + ADD_EXECUTABLE(unpooling-nhwc-test test/unpooling-nhwc.cc) +@@ -1350,22 +1317,22 @@ + + ADD_EXECUTABLE(average-pooling-2d-test test/average-pooling-2d.cc) + TARGET_INCLUDE_DIRECTORIES(average-pooling-2d-test PRIVATE src test) +- TARGET_LINK_LIBRARIES(average-pooling-2d-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph) ++ TARGET_LINK_LIBRARIES(average-pooling-2d-test PRIVATE XNNPACK gtest gtest_main subgraph) + ADD_TEST(NAME average-pooling-2d-test COMMAND average-pooling-2d-test) + + ADD_EXECUTABLE(bankers-rounding-test test/bankers-rounding.cc) + TARGET_INCLUDE_DIRECTORIES(bankers-rounding-test PRIVATE src test) +- TARGET_LINK_LIBRARIES(bankers-rounding-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph) ++ TARGET_LINK_LIBRARIES(bankers-rounding-test PRIVATE XNNPACK gtest gtest_main subgraph) + ADD_TEST(NAME bankers-rounding-test COMMAND bankers-rounding-test) + + ADD_EXECUTABLE(ceiling-test test/ceiling.cc) + TARGET_INCLUDE_DIRECTORIES(ceiling-test PRIVATE src test) +- TARGET_LINK_LIBRARIES(ceiling-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph) ++ TARGET_LINK_LIBRARIES(ceiling-test PRIVATE XNNPACK gtest gtest_main subgraph) + ADD_TEST(NAME ceiling-test COMMAND ceiling-test) + + ADD_EXECUTABLE(clamp-test test/clamp.cc) + TARGET_INCLUDE_DIRECTORIES(clamp-test PRIVATE src test) +- TARGET_LINK_LIBRARIES(clamp-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph) ++ TARGET_LINK_LIBRARIES(clamp-test PRIVATE XNNPACK gtest gtest_main subgraph) + ADD_TEST(NAME clamp-test COMMAND clamp-test) + + ADD_EXECUTABLE(concatenate2-test test/concatenate2.cc) +@@ -1385,187 +1352,187 @@ + + ADD_EXECUTABLE(convert-test test/convert.cc) + TARGET_INCLUDE_DIRECTORIES(convert-test PRIVATE src test) +- TARGET_LINK_LIBRARIES(convert-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph) ++ TARGET_LINK_LIBRARIES(convert-test PRIVATE XNNPACK gtest gtest_main subgraph) + ADD_TEST(NAME convert-test COMMAND convert-test) + + ADD_EXECUTABLE(convolution-2d-test test/convolution-2d.cc) + SET_TARGET_PROPERTIES(convolution-2d-test PROPERTIES CXX_EXTENSIONS YES) + TARGET_INCLUDE_DIRECTORIES(convolution-2d-test PRIVATE src test) +- TARGET_LINK_LIBRARIES(convolution-2d-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph convolution-test-helpers) ++ TARGET_LINK_LIBRARIES(convolution-2d-test PRIVATE XNNPACK gtest gtest_main subgraph convolution-test-helpers) + ADD_TEST(NAME convolution-2d-test COMMAND convolution-2d-test) + + ADD_EXECUTABLE(copy-test test/copy.cc) + TARGET_INCLUDE_DIRECTORIES(copy-test PRIVATE src test) +- TARGET_LINK_LIBRARIES(copy-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph) ++ TARGET_LINK_LIBRARIES(copy-test PRIVATE XNNPACK gtest gtest_main subgraph) + ADD_TEST(NAME copy-test COMMAND copy-test) + + ADD_EXECUTABLE(deconvolution-2d-test test/deconvolution-2d.cc) + SET_TARGET_PROPERTIES(deconvolution-2d-test PROPERTIES CXX_EXTENSIONS YES) + TARGET_INCLUDE_DIRECTORIES(deconvolution-2d-test PRIVATE src test) +- TARGET_LINK_LIBRARIES(deconvolution-2d-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph convolution-test-helpers) ++ TARGET_LINK_LIBRARIES(deconvolution-2d-test PRIVATE XNNPACK gtest gtest_main subgraph convolution-test-helpers) + ADD_TEST(NAME deconvolution-2d-test COMMAND deconvolution-2d-test) + + ADD_EXECUTABLE(depth-to-space-test test/depth-to-space.cc) + TARGET_INCLUDE_DIRECTORIES(depth-to-space-test PRIVATE src test) +- TARGET_LINK_LIBRARIES(depth-to-space-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph) ++ TARGET_LINK_LIBRARIES(depth-to-space-test PRIVATE XNNPACK gtest gtest_main subgraph) + ADD_TEST(NAME depth-to-space-test COMMAND depth-to-space-test) + + ADD_EXECUTABLE(depthwise-convolution-2d-test test/depthwise-convolution-2d.cc) + SET_TARGET_PROPERTIES(depthwise-convolution-2d-test PROPERTIES CXX_EXTENSIONS YES) + TARGET_INCLUDE_DIRECTORIES(depthwise-convolution-2d-test PRIVATE src test) +- TARGET_LINK_LIBRARIES(depthwise-convolution-2d-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph convolution-test-helpers) ++ TARGET_LINK_LIBRARIES(depthwise-convolution-2d-test PRIVATE XNNPACK gtest gtest_main subgraph convolution-test-helpers) + ADD_TEST(NAME depthwise-convolution-2d-test COMMAND depthwise-convolution-2d-test) + + ADD_EXECUTABLE(divide2-test test/divide2.cc) + TARGET_INCLUDE_DIRECTORIES(divide2-test PRIVATE src test) +- TARGET_LINK_LIBRARIES(divide2-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph) ++ TARGET_LINK_LIBRARIES(divide2-test PRIVATE XNNPACK gtest gtest_main subgraph) + ADD_TEST(NAME divide2-test COMMAND divide2-test) + + ADD_EXECUTABLE(elu-test test/elu.cc) + TARGET_INCLUDE_DIRECTORIES(elu-test PRIVATE src test) +- TARGET_LINK_LIBRARIES(elu-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph) ++ TARGET_LINK_LIBRARIES(elu-test PRIVATE XNNPACK gtest gtest_main subgraph) + ADD_TEST(NAME elu-test COMMAND elu-test) + + ADD_EXECUTABLE(even-split2-test test/even-split2.cc) + TARGET_INCLUDE_DIRECTORIES(even-split2-test PRIVATE src test) +- TARGET_LINK_LIBRARIES(even-split2-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph) ++ TARGET_LINK_LIBRARIES(even-split2-test PRIVATE XNNPACK gtest gtest_main subgraph) + ADD_TEST(NAME even-split2-test COMMAND even-split2-test) + + ADD_EXECUTABLE(even-split3-test test/even-split3.cc) + TARGET_INCLUDE_DIRECTORIES(even-split3-test PRIVATE src test) +- TARGET_LINK_LIBRARIES(even-split3-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph) ++ TARGET_LINK_LIBRARIES(even-split3-test PRIVATE XNNPACK gtest gtest_main subgraph) + ADD_TEST(NAME even-split3-test COMMAND even-split3-test) + + ADD_EXECUTABLE(even-split4-test test/even-split4.cc) + TARGET_INCLUDE_DIRECTORIES(even-split4-test PRIVATE src test) +- TARGET_LINK_LIBRARIES(even-split4-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph) ++ TARGET_LINK_LIBRARIES(even-split4-test PRIVATE XNNPACK gtest gtest_main subgraph) + ADD_TEST(NAME even-split4-test COMMAND even-split4-test) + + ADD_EXECUTABLE(floor-test test/floor.cc) + TARGET_INCLUDE_DIRECTORIES(floor-test PRIVATE src test) +- TARGET_LINK_LIBRARIES(floor-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph) ++ TARGET_LINK_LIBRARIES(floor-test PRIVATE XNNPACK gtest gtest_main subgraph) + ADD_TEST(NAME floor-test COMMAND floor-test) + + ADD_EXECUTABLE(fully-connected-test test/fully-connected.cc) + TARGET_INCLUDE_DIRECTORIES(fully-connected-test PRIVATE src test) +- TARGET_LINK_LIBRARIES(fully-connected-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph) ++ TARGET_LINK_LIBRARIES(fully-connected-test PRIVATE XNNPACK gtest gtest_main subgraph) + ADD_TEST(NAME fully-connected-test COMMAND fully-connected-test) + + ADD_EXECUTABLE(global-average-pooling-1d-test test/global-average-pooling-1d.cc) + TARGET_INCLUDE_DIRECTORIES(global-average-pooling-1d-test PRIVATE src test) +- TARGET_LINK_LIBRARIES(global-average-pooling-1d-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph) ++ TARGET_LINK_LIBRARIES(global-average-pooling-1d-test PRIVATE XNNPACK gtest gtest_main subgraph) + ADD_TEST(NAME global-average-pooling-1d-test COMMAND global-average-pooling-1d-test) + + ADD_EXECUTABLE(global-average-pooling-2d-test test/global-average-pooling-2d.cc) + TARGET_INCLUDE_DIRECTORIES(global-average-pooling-2d-test PRIVATE src test) +- TARGET_LINK_LIBRARIES(global-average-pooling-2d-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph) ++ TARGET_LINK_LIBRARIES(global-average-pooling-2d-test PRIVATE XNNPACK gtest gtest_main subgraph) + ADD_TEST(NAME global-average-pooling-2d-test COMMAND global-average-pooling-2d-test) + + ADD_EXECUTABLE(hardswish-test test/hardswish.cc) + TARGET_INCLUDE_DIRECTORIES(hardswish-test PRIVATE src test) +- TARGET_LINK_LIBRARIES(hardswish-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph) ++ TARGET_LINK_LIBRARIES(hardswish-test PRIVATE XNNPACK gtest gtest_main subgraph) + ADD_TEST(NAME hardswish-test COMMAND hardswish-test) + + ADD_EXECUTABLE(leaky-relu-test test/leaky-relu.cc) + TARGET_INCLUDE_DIRECTORIES(leaky-relu-test PRIVATE src test) +- TARGET_LINK_LIBRARIES(leaky-relu-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph) ++ TARGET_LINK_LIBRARIES(leaky-relu-test PRIVATE XNNPACK gtest gtest_main subgraph) + ADD_TEST(NAME leaky-relu-test COMMAND leaky-relu-test) + + ADD_EXECUTABLE(max-pooling-2d-test test/max-pooling-2d.cc) + TARGET_INCLUDE_DIRECTORIES(max-pooling-2d-test PRIVATE src test) +- TARGET_LINK_LIBRARIES(max-pooling-2d-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph) ++ TARGET_LINK_LIBRARIES(max-pooling-2d-test PRIVATE XNNPACK gtest gtest_main subgraph) + ADD_TEST(NAME max-pooling-2d-test COMMAND max-pooling-2d-test) + + ADD_EXECUTABLE(maximum2-test test/maximum2.cc) + TARGET_INCLUDE_DIRECTORIES(maximum2-test PRIVATE src test) +- TARGET_LINK_LIBRARIES(maximum2-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph) ++ TARGET_LINK_LIBRARIES(maximum2-test PRIVATE XNNPACK gtest gtest_main subgraph) + ADD_TEST(NAME maximum2-test COMMAND maximum2-test) + + ADD_EXECUTABLE(minimum2-test test/minimum2.cc) + TARGET_INCLUDE_DIRECTORIES(minimum2-test PRIVATE src test) +- TARGET_LINK_LIBRARIES(minimum2-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph) ++ TARGET_LINK_LIBRARIES(minimum2-test PRIVATE XNNPACK gtest gtest_main subgraph) + ADD_TEST(NAME minimum2-test COMMAND minimum2-test) + + ADD_EXECUTABLE(multiply2-test test/multiply2.cc) + TARGET_INCLUDE_DIRECTORIES(multiply2-test PRIVATE src test) +- TARGET_LINK_LIBRARIES(multiply2-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph) ++ TARGET_LINK_LIBRARIES(multiply2-test PRIVATE XNNPACK gtest gtest_main subgraph) + ADD_TEST(NAME multiply2-test COMMAND multiply2-test) + + ADD_EXECUTABLE(negate-test test/negate.cc) + TARGET_INCLUDE_DIRECTORIES(negate-test PRIVATE src test) +- TARGET_LINK_LIBRARIES(negate-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph) ++ TARGET_LINK_LIBRARIES(negate-test PRIVATE XNNPACK gtest gtest_main subgraph) + ADD_TEST(NAME negate-test COMMAND negate-test) + + ADD_EXECUTABLE(prelu-test test/prelu.cc) + TARGET_INCLUDE_DIRECTORIES(prelu-test PRIVATE src test) +- TARGET_LINK_LIBRARIES(prelu-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph) ++ TARGET_LINK_LIBRARIES(prelu-test PRIVATE XNNPACK gtest gtest_main subgraph) + ADD_TEST(NAME prelu-test COMMAND prelu-test) + + ADD_EXECUTABLE(sigmoid-test test/sigmoid.cc) + SET_TARGET_PROPERTIES(sigmoid-test PROPERTIES CXX_EXTENSIONS YES) + TARGET_INCLUDE_DIRECTORIES(sigmoid-test PRIVATE src test) +- TARGET_LINK_LIBRARIES(sigmoid-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph) ++ TARGET_LINK_LIBRARIES(sigmoid-test PRIVATE XNNPACK gtest gtest_main subgraph) + ADD_TEST(NAME sigmoid-test COMMAND sigmoid-test) + + ADD_EXECUTABLE(static-slice-test test/static-slice.cc) + SET_TARGET_PROPERTIES(static-slice-test PROPERTIES CXX_EXTENSIONS YES) + TARGET_INCLUDE_DIRECTORIES(static-slice-test PRIVATE src test) +- TARGET_LINK_LIBRARIES(static-slice-test PRIVATE XNNPACK fp16 gmock gtest gtest_main subgraph) ++ TARGET_LINK_LIBRARIES(static-slice-test PRIVATE XNNPACK gmock gtest gtest_main subgraph) + ADD_TEST(NAME static-slice-test COMMAND static-slice-test) + + ADD_EXECUTABLE(softmax-test test/softmax.cc) + TARGET_INCLUDE_DIRECTORIES(softmax-test PRIVATE src test) +- TARGET_LINK_LIBRARIES(softmax-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph) ++ TARGET_LINK_LIBRARIES(softmax-test PRIVATE XNNPACK gtest gtest_main subgraph) + ADD_TEST(NAME softmax-test COMMAND softmax-test) + + ADD_EXECUTABLE(space-to-depth-2d-test test/space-to-depth-2d.cc) + TARGET_INCLUDE_DIRECTORIES(space-to-depth-2d-test PRIVATE src test) +- TARGET_LINK_LIBRARIES(space-to-depth-2d-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph) ++ TARGET_LINK_LIBRARIES(space-to-depth-2d-test PRIVATE XNNPACK gtest gtest_main subgraph) + ADD_TEST(NAME space-to-depth-2d-test COMMAND space-to-depth-2d-test) + + ADD_EXECUTABLE(square-test test/square.cc) + TARGET_INCLUDE_DIRECTORIES(square-test PRIVATE src test) +- TARGET_LINK_LIBRARIES(square-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph) ++ TARGET_LINK_LIBRARIES(square-test PRIVATE XNNPACK gtest gtest_main subgraph) + ADD_TEST(NAME square-test COMMAND square-test) + + ADD_EXECUTABLE(square-root-test test/square.cc) + TARGET_INCLUDE_DIRECTORIES(square-root-test PRIVATE src test) +- TARGET_LINK_LIBRARIES(square-root-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph) ++ TARGET_LINK_LIBRARIES(square-root-test PRIVATE XNNPACK gtest gtest_main subgraph) + ADD_TEST(NAME square-root-test COMMAND square-root-test) + + ADD_EXECUTABLE(squared-difference-test test/squared-difference.cc) + TARGET_INCLUDE_DIRECTORIES(squared-difference-test PRIVATE src test) +- TARGET_LINK_LIBRARIES(squared-difference-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph) ++ TARGET_LINK_LIBRARIES(squared-difference-test PRIVATE XNNPACK gtest gtest_main subgraph) + ADD_TEST(NAME squared-difference-test COMMAND squared-difference-test) + + ADD_EXECUTABLE(static-constant-pad-test test/static-constant-pad.cc) + TARGET_INCLUDE_DIRECTORIES(static-constant-pad-test PRIVATE src test) +- TARGET_LINK_LIBRARIES(static-constant-pad-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph) ++ TARGET_LINK_LIBRARIES(static-constant-pad-test PRIVATE XNNPACK gtest gtest_main subgraph) + ADD_TEST(NAME static-constant-pad-test COMMAND static-constant-pad-test) + + ADD_EXECUTABLE(static-reshape-test test/static-reshape.cc) + TARGET_INCLUDE_DIRECTORIES(static-reshape-test PRIVATE src test) +- TARGET_LINK_LIBRARIES(static-reshape-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph) ++ TARGET_LINK_LIBRARIES(static-reshape-test PRIVATE XNNPACK gtest gtest_main subgraph) + ADD_TEST(NAME static-reshape-test COMMAND static-reshape-test) + + ADD_EXECUTABLE(static-resize-bilinear-2d-test test/static-resize-bilinear-2d.cc) + TARGET_INCLUDE_DIRECTORIES(static-resize-bilinear-2d-test PRIVATE src test) +- TARGET_LINK_LIBRARIES(static-resize-bilinear-2d-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph) ++ TARGET_LINK_LIBRARIES(static-resize-bilinear-2d-test PRIVATE XNNPACK gtest gtest_main subgraph) + ADD_TEST(NAME static-resize-bilinear-2d-test COMMAND static-resize-bilinear-2d-test) + + ADD_EXECUTABLE(static-transpose-test test/static-transpose.cc) + TARGET_INCLUDE_DIRECTORIES(static-transpose-test PRIVATE src test) +- TARGET_LINK_LIBRARIES(static-transpose-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph) ++ TARGET_LINK_LIBRARIES(static-transpose-test PRIVATE XNNPACK gtest gtest_main subgraph) + ADD_TEST(NAME static-transpose-test COMMAND static-transpose-test) + + ADD_EXECUTABLE(subtract2-test test/subtract2.cc) + TARGET_INCLUDE_DIRECTORIES(subtract2-test PRIVATE src test) +- TARGET_LINK_LIBRARIES(subtract2-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph) ++ TARGET_LINK_LIBRARIES(subtract2-test PRIVATE XNNPACK gtest gtest_main subgraph) + ADD_TEST(NAME subtract2-test COMMAND subtract2-test) + + ADD_EXECUTABLE(unpooling-2d-test test/unpooling-2d.cc) + TARGET_INCLUDE_DIRECTORIES(unpooling-2d-test PRIVATE src test) +- TARGET_LINK_LIBRARIES(unpooling-2d-test PRIVATE XNNPACK fp16 gtest gtest_main subgraph) ++ TARGET_LINK_LIBRARIES(unpooling-2d-test PRIVATE XNNPACK gtest gtest_main subgraph) + ADD_TEST(NAME unpooling-2d-test COMMAND unpooling-2d-test) + ENDIF() + +@@ -1591,355 +1558,355 @@ + + ADD_EXECUTABLE(f16-f32-vcvt-test test/f16-f32-vcvt.cc) + TARGET_INCLUDE_DIRECTORIES(f16-f32-vcvt-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f16-f32-vcvt-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f16-f32-vcvt-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f16-f32-vcvt-test PRIVATE hardware-config logging microkernels-all microparams-init) + ADD_TEST(NAME f16-f32-vcvt-test COMMAND f16-f32-vcvt-test) + + ADD_EXECUTABLE(f16-gavgpool-cw-test test/f16-gavgpool-cw.cc) + TARGET_INCLUDE_DIRECTORIES(f16-gavgpool-cw-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f16-gavgpool-cw-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f16-gavgpool-cw-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f16-gavgpool-cw-test PRIVATE hardware-config logging microkernels-all microparams-init) + ADD_TEST(NAME f16-gavgpool-cw-test COMMAND f16-gavgpool-cw-test) + + ADD_EXECUTABLE(f16-avgpool-minmax-test test/f16-avgpool-minmax.cc) + TARGET_INCLUDE_DIRECTORIES(f16-avgpool-minmax-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f16-avgpool-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f16-avgpool-minmax-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f16-avgpool-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init) + ADD_TEST(NAME f16-avgpool-minmax-test COMMAND f16-avgpool-minmax-test) + + ADD_EXECUTABLE(f16-conv-hwc2chw-test test/f16-conv-hwc2chw.cc) + TARGET_INCLUDE_DIRECTORIES(f16-conv-hwc2chw-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f16-conv-hwc2chw-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f16-conv-hwc2chw-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f16-conv-hwc2chw-test PRIVATE hardware-config logging microkernels-all microparams-init packing) + ADD_TEST(NAME f16-conv-hwc2chw-test COMMAND f16-conv-hwc2chw-test) + + ADD_EXECUTABLE(f16-dwconv-unipass-minmax-test test/f16-dwconv-unipass-minmax.cc) + TARGET_INCLUDE_DIRECTORIES(f16-dwconv-unipass-minmax-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f16-dwconv-unipass-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f16-dwconv-unipass-minmax-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f16-dwconv-unipass-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init packing) + ADD_TEST(NAME f16-dwconv-unipass-minmax-test COMMAND f16-dwconv-unipass-minmax-test) + + ADD_EXECUTABLE(f16-dwconv2d-chw-test test/f16-dwconv2d-chw.cc) + TARGET_INCLUDE_DIRECTORIES(f16-dwconv2d-chw-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f16-dwconv2d-chw-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f16-dwconv2d-chw-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f16-dwconv2d-chw-test PRIVATE hardware-config logging microkernels-all microparams-init packing) + ADD_TEST(NAME f16-dwconv2d-chw-test COMMAND f16-dwconv2d-chw-test) + + ADD_EXECUTABLE(f16-gavgpool-minmax-test test/f16-gavgpool-minmax.cc) + TARGET_INCLUDE_DIRECTORIES(f16-gavgpool-minmax-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f16-gavgpool-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f16-gavgpool-minmax-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f16-gavgpool-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init) + ADD_TEST(NAME f16-gavgpool-minmax-test COMMAND f16-gavgpool-minmax-test) + + ADD_EXECUTABLE(f16-gemm-minmax-test test/f16-gemm-minmax.cc) + TARGET_INCLUDE_DIRECTORIES(f16-gemm-minmax-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f16-gemm-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f16-gemm-minmax-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f16-gemm-minmax-test PRIVATE gemm-microkernel-tester hardware-config logging microkernels-all microparams-init) + ADD_TEST(NAME f16-gemm-minmax-test COMMAND f16-gemm-minmax-test) + + ADD_EXECUTABLE(f16-ibilinear-chw-test test/f16-ibilinear-chw.cc) + TARGET_INCLUDE_DIRECTORIES(f16-ibilinear-chw-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f16-ibilinear-chw-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f16-ibilinear-chw-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f16-ibilinear-chw-test PRIVATE hardware-config logging microkernels-all) + ADD_TEST(NAME f16-ibilinear-chw-test COMMAND f16-ibilinear-chw-test) + + ADD_EXECUTABLE(f16-ibilinear-test test/f16-ibilinear.cc) + TARGET_INCLUDE_DIRECTORIES(f16-ibilinear-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f16-ibilinear-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f16-ibilinear-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f16-ibilinear-test PRIVATE hardware-config logging microkernels-all) + ADD_TEST(NAME f16-ibilinear-test COMMAND f16-ibilinear-test) + + ADD_EXECUTABLE(f16-igemm-minmax-test test/f16-igemm-minmax.cc) + TARGET_INCLUDE_DIRECTORIES(f16-igemm-minmax-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f16-igemm-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f16-igemm-minmax-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f16-igemm-minmax-test PRIVATE gemm-microkernel-tester hardware-config logging microkernels-all microparams-init) + ADD_TEST(NAME f16-igemm-minmax-test COMMAND f16-igemm-minmax-test) + + ADD_EXECUTABLE(f16-maxpool-minmax-test test/f16-maxpool-minmax.cc) + TARGET_INCLUDE_DIRECTORIES(f16-maxpool-minmax-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f16-maxpool-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f16-maxpool-minmax-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f16-maxpool-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init) + ADD_TEST(NAME f16-maxpool-minmax-test COMMAND f16-maxpool-minmax-test) + + ADD_EXECUTABLE(f16-spmm-minmax-test test/f16-spmm-minmax.cc) + TARGET_INCLUDE_DIRECTORIES(f16-spmm-minmax-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f16-spmm-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f16-spmm-minmax-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f16-spmm-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init) + ADD_TEST(NAME f16-spmm-minmax-test COMMAND f16-spmm-minmax-test) + + ADD_EXECUTABLE(f16-rmax-test test/f16-rmax.cc) + TARGET_INCLUDE_DIRECTORIES(f16-rmax-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f16-rmax-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f16-rmax-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f16-rmax-test PRIVATE hardware-config logging microkernels-all) + ADD_TEST(NAME f16-rmax-test COMMAND f16-rmax-test) + + ADD_EXECUTABLE(f16-vabs-test test/f16-vabs.cc) + TARGET_INCLUDE_DIRECTORIES(f16-vabs-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f16-vabs-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f16-vabs-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f16-vabs-test PRIVATE hardware-config logging microkernels-all microparams-init) + ADD_TEST(NAME f16-vabs-test COMMAND f16-vabs-test) + + ADD_EXECUTABLE(f16-vadd-minmax-test test/f16-vadd-minmax.cc) + TARGET_INCLUDE_DIRECTORIES(f16-vadd-minmax-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f16-vadd-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f16-vadd-minmax-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f16-vadd-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init) + ADD_TEST(NAME f16-vadd-minmax-test COMMAND f16-vadd-minmax-test) + + ADD_EXECUTABLE(f16-vaddc-minmax-test test/f16-vaddc-minmax.cc) + TARGET_INCLUDE_DIRECTORIES(f16-vaddc-minmax-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f16-vaddc-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f16-vaddc-minmax-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f16-vaddc-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init) + ADD_TEST(NAME f16-vaddc-minmax-test COMMAND f16-vaddc-minmax-test) + + ADD_EXECUTABLE(f16-vclamp-test test/f16-vclamp.cc) + TARGET_INCLUDE_DIRECTORIES(f16-vclamp-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f16-vclamp-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f16-vclamp-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f16-vclamp-test PRIVATE hardware-config logging microkernels-all microparams-init) + ADD_TEST(NAME f16-vclamp-test COMMAND f16-vclamp-test) + + ADD_EXECUTABLE(f16-vdiv-minmax-test test/f16-vdiv-minmax.cc) + TARGET_INCLUDE_DIRECTORIES(f16-vdiv-minmax-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f16-vdiv-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f16-vdiv-minmax-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f16-vdiv-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init) + ADD_TEST(NAME f16-vdiv-minmax-test COMMAND f16-vdiv-minmax-test) + + ADD_EXECUTABLE(f16-vdivc-minmax-test test/f16-vdivc-minmax.cc) + TARGET_INCLUDE_DIRECTORIES(f16-vdivc-minmax-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f16-vdivc-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f16-vdivc-minmax-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f16-vdivc-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init) + ADD_TEST(NAME f16-vdivc-minmax-test COMMAND f16-vdivc-minmax-test) + + ADD_EXECUTABLE(f16-vrdivc-minmax-test test/f16-vrdivc-minmax.cc) + TARGET_INCLUDE_DIRECTORIES(f16-vrdivc-minmax-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f16-vrdivc-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f16-vrdivc-minmax-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f16-vrdivc-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init) + ADD_TEST(NAME f16-vrdivc-minmax-test COMMAND f16-vrdivc-minmax-test) + + ADD_EXECUTABLE(f16-velu-test test/f16-velu.cc) + TARGET_INCLUDE_DIRECTORIES(f16-velu-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f16-velu-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f16-velu-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f16-velu-test PRIVATE hardware-config logging microkernels-all microparams-init) + ADD_TEST(NAME f16-velu-test COMMAND f16-velu-test) + + ADD_EXECUTABLE(f16-vhswish-test test/f16-vhswish.cc) + TARGET_INCLUDE_DIRECTORIES(f16-vhswish-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f16-vhswish-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f16-vhswish-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f16-vhswish-test PRIVATE hardware-config logging microkernels-all microparams-init) + ADD_TEST(NAME f16-vhswish-test COMMAND f16-vhswish-test) + + ADD_EXECUTABLE(f16-vlrelu-test test/f16-vlrelu.cc) + TARGET_INCLUDE_DIRECTORIES(f16-vlrelu-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f16-vlrelu-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f16-vlrelu-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f16-vlrelu-test PRIVATE hardware-config logging microkernels-all microparams-init) + ADD_TEST(NAME f16-vlrelu-test COMMAND f16-vlrelu-test) + + ADD_EXECUTABLE(f16-vmax-test test/f16-vmax.cc) + TARGET_INCLUDE_DIRECTORIES(f16-vmax-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f16-vmax-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f16-vmax-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f16-vmax-test PRIVATE hardware-config logging microkernels-all) + ADD_TEST(NAME f16-vmax-test COMMAND f16-vmax-test) + + ADD_EXECUTABLE(f16-vmaxc-test test/f16-vmaxc.cc) + TARGET_INCLUDE_DIRECTORIES(f16-vmaxc-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f16-vmaxc-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f16-vmaxc-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f16-vmaxc-test PRIVATE hardware-config logging microkernels-all) + ADD_TEST(NAME f16-vmaxc-test COMMAND f16-vmaxc-test) + + ADD_EXECUTABLE(f16-vmin-test test/f16-vmin.cc) + TARGET_INCLUDE_DIRECTORIES(f16-vmin-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f16-vmin-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f16-vmin-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f16-vmin-test PRIVATE hardware-config logging microkernels-all) + ADD_TEST(NAME f16-vmin-test COMMAND f16-vmin-test) + + ADD_EXECUTABLE(f16-vminc-test test/f16-vminc.cc) + TARGET_INCLUDE_DIRECTORIES(f16-vminc-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f16-vminc-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f16-vminc-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f16-vminc-test PRIVATE hardware-config logging microkernels-all) + ADD_TEST(NAME f16-vminc-test COMMAND f16-vminc-test) + + ADD_EXECUTABLE(f16-vmul-minmax-test test/f16-vmul-minmax.cc) + TARGET_INCLUDE_DIRECTORIES(f16-vmul-minmax-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f16-vmul-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f16-vmul-minmax-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f16-vmul-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init) + ADD_TEST(NAME f16-vmul-minmax-test COMMAND f16-vmul-minmax-test) + + ADD_EXECUTABLE(f16-vmulc-minmax-test test/f16-vmulc-minmax.cc) + TARGET_INCLUDE_DIRECTORIES(f16-vmulc-minmax-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f16-vmulc-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f16-vmulc-minmax-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f16-vmulc-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init) + ADD_TEST(NAME f16-vmulc-minmax-test COMMAND f16-vmulc-minmax-test) + + ADD_EXECUTABLE(f16-vmulcaddc-minmax-test test/f16-vmulcaddc-minmax.cc) + TARGET_INCLUDE_DIRECTORIES(f16-vmulcaddc-minmax-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f16-vmulcaddc-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f16-vmulcaddc-minmax-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f16-vmulcaddc-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init packing) + ADD_TEST(NAME f16-vmulcaddc-minmax-test COMMAND f16-vmulcaddc-minmax-test) + + ADD_EXECUTABLE(f16-vneg-test test/f16-vneg.cc) + TARGET_INCLUDE_DIRECTORIES(f16-vneg-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f16-vneg-test PRIVATE fp16 pthreadpool gtest gtest_main microparams-init) ++ TARGET_LINK_LIBRARIES(f16-vneg-test PRIVATE gtest gtest_main microparams-init) + TARGET_LINK_LIBRARIES(f16-vneg-test PRIVATE hardware-config logging microkernels-all microparams-init) + ADD_TEST(NAME f16-vneg-test COMMAND f16-vneg-test) + + ADD_EXECUTABLE(f16-pavgpool-minmax-test test/f16-pavgpool-minmax.cc) + TARGET_INCLUDE_DIRECTORIES(f16-pavgpool-minmax-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f16-pavgpool-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f16-pavgpool-minmax-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f16-pavgpool-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init) + ADD_TEST(NAME f16-pavgpool-minmax-test COMMAND f16-pavgpool-minmax-test) + + ADD_EXECUTABLE(f16-prelu-test test/f16-prelu.cc) + TARGET_INCLUDE_DIRECTORIES(f16-prelu-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f16-prelu-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f16-prelu-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f16-prelu-test PRIVATE hardware-config logging microkernels-all) + ADD_TEST(NAME f16-prelu-test COMMAND f16-prelu-test) + + ADD_EXECUTABLE(f16-raddstoreexpminusmax-test test/f16-raddstoreexpminusmax.cc) + TARGET_INCLUDE_DIRECTORIES(f16-raddstoreexpminusmax-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f16-raddstoreexpminusmax-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f16-raddstoreexpminusmax-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f16-raddstoreexpminusmax-test PRIVATE hardware-config logging microkernels-all microparams-init) + ADD_TEST(NAME f16-raddstoreexpminusmax-test COMMAND f16-raddstoreexpminusmax-test) + + ADD_EXECUTABLE(f16-vrndne-test test/f16-vrndne.cc) + TARGET_INCLUDE_DIRECTORIES(f16-vrndne-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f16-vrndne-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f16-vrndne-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f16-vrndne-test PRIVATE hardware-config logging microkernels-all) + ADD_TEST(NAME f16-vrndne-test COMMAND f16-vrndne-test) + + ADD_EXECUTABLE(f16-vrndz-test test/f16-vrndz.cc) + TARGET_INCLUDE_DIRECTORIES(f16-vrndz-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f16-vrndz-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f16-vrndz-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f16-vrndz-test PRIVATE hardware-config logging microkernels-all) + ADD_TEST(NAME f16-vrndz-test COMMAND f16-vrndz-test) + + ADD_EXECUTABLE(f16-vrndu-test test/f16-vrndu.cc) + TARGET_INCLUDE_DIRECTORIES(f16-vrndu-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f16-vrndu-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f16-vrndu-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f16-vrndu-test PRIVATE hardware-config logging microkernels-all) + ADD_TEST(NAME f16-vrndu-test COMMAND f16-vrndu-test) + + ADD_EXECUTABLE(f16-vrndd-test test/f16-vrndd.cc) + TARGET_INCLUDE_DIRECTORIES(f16-vrndd-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f16-vrndd-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f16-vrndd-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f16-vrndd-test PRIVATE hardware-config logging microkernels-all) + ADD_TEST(NAME f16-vrndd-test COMMAND f16-vrndd-test) + + ADD_EXECUTABLE(f16-vsigmoid-test test/f16-vsigmoid.cc) + TARGET_INCLUDE_DIRECTORIES(f16-vsigmoid-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f16-vsigmoid-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f16-vsigmoid-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f16-vsigmoid-test PRIVATE hardware-config logging microkernels-all microparams-init) + ADD_TEST(NAME f16-vsigmoid-test COMMAND f16-vsigmoid-test) + + ADD_EXECUTABLE(f16-vsqr-test test/f16-vsqr.cc) + TARGET_INCLUDE_DIRECTORIES(f16-vsqr-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f16-vsqr-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f16-vsqr-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f16-vsqr-test PRIVATE hardware-config logging microkernels-all) + ADD_TEST(NAME f16-vsqr-test COMMAND f16-vsqr-test) + + ADD_EXECUTABLE(f16-vsqrt-test test/f16-vsqrt.cc) + TARGET_INCLUDE_DIRECTORIES(f16-vsqrt-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f16-vsqrt-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f16-vsqrt-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f16-vsqrt-test PRIVATE hardware-config logging microkernels-all) + ADD_TEST(NAME f16-vsqrt-test COMMAND f16-vsqrt-test) + + ADD_EXECUTABLE(f16-vsub-minmax-test test/f16-vsub-minmax.cc) + TARGET_INCLUDE_DIRECTORIES(f16-vsub-minmax-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f16-vsub-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f16-vsub-minmax-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f16-vsub-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init) + ADD_TEST(NAME f16-vsub-minmax-test COMMAND f16-vsub-minmax-test) + + ADD_EXECUTABLE(f16-vsubc-minmax-test test/f16-vsubc-minmax.cc) + TARGET_INCLUDE_DIRECTORIES(f16-vsubc-minmax-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f16-vsubc-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f16-vsubc-minmax-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f16-vsubc-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init) + ADD_TEST(NAME f16-vsubc-minmax-test COMMAND f16-vsubc-minmax-test) + + ADD_EXECUTABLE(f16-vrsubc-minmax-test test/f16-vrsubc-minmax.cc) + TARGET_INCLUDE_DIRECTORIES(f16-vrsubc-minmax-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f16-vrsubc-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f16-vrsubc-minmax-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f16-vrsubc-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init) + ADD_TEST(NAME f16-vrsubc-minmax-test COMMAND f16-vrsubc-minmax-test) + + ADD_EXECUTABLE(f32-argmaxpool-test test/f32-argmaxpool.cc) + TARGET_INCLUDE_DIRECTORIES(f32-argmaxpool-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f32-argmaxpool-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f32-argmaxpool-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f32-argmaxpool-test PRIVATE hardware-config logging microkernels-all) + ADD_TEST(NAME f32-argmaxpool-test COMMAND f32-argmaxpool-test) + + ADD_EXECUTABLE(f32-avgpool-minmax-test test/f32-avgpool-minmax.cc) + TARGET_INCLUDE_DIRECTORIES(f32-avgpool-minmax-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f32-avgpool-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f32-avgpool-minmax-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f32-avgpool-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init) + ADD_TEST(NAME f32-avgpool-minmax-test COMMAND f32-avgpool-minmax-test) + + ADD_EXECUTABLE(f32-conv-hwc-test test/f32-conv-hwc.cc) + TARGET_INCLUDE_DIRECTORIES(f32-conv-hwc-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f32-conv-hwc-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f32-conv-hwc-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f32-conv-hwc-test PRIVATE hardware-config logging microkernels-all microparams-init packing) + ADD_TEST(NAME f32-conv-hwc-test COMMAND f32-conv-hwc-test) + + ADD_EXECUTABLE(f32-conv-hwc2chw-test test/f32-conv-hwc2chw.cc) + TARGET_INCLUDE_DIRECTORIES(f32-conv-hwc2chw-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f32-conv-hwc2chw-test PRIVATE fp16 pthreadpool gtest gtest_main microparams-init) ++ TARGET_LINK_LIBRARIES(f32-conv-hwc2chw-test PRIVATE gtest gtest_main microparams-init) + TARGET_LINK_LIBRARIES(f32-conv-hwc2chw-test PRIVATE hardware-config logging microkernels-all microparams-init packing) + ADD_TEST(NAME f32-conv-hwc2chw-test COMMAND f32-conv-hwc2chw-test) + + ADD_EXECUTABLE(f32-dwconv2d-chw-test test/f32-dwconv2d-chw.cc) + TARGET_INCLUDE_DIRECTORIES(f32-dwconv2d-chw-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f32-dwconv2d-chw-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f32-dwconv2d-chw-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f32-dwconv2d-chw-test PRIVATE hardware-config logging microkernels-all microparams-init) + ADD_TEST(NAME f32-dwconv2d-chw-test COMMAND f32-dwconv2d-chw-test) + + ADD_EXECUTABLE(f32-dwconv-multipass-test test/f32-dwconv-multipass.cc) + TARGET_INCLUDE_DIRECTORIES(f32-dwconv-multipass-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f32-dwconv-multipass-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f32-dwconv-multipass-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f32-dwconv-multipass-test PRIVATE hardware-config logging microkernel-utils microkernels-all microparams-init packing) + ADD_TEST(NAME f32-dwconv-multipass-test COMMAND f32-dwconv-multipass-test) + + ADD_EXECUTABLE(f32-dwconv-multipass-minmax-test test/f32-dwconv-multipass-minmax.cc) + TARGET_INCLUDE_DIRECTORIES(f32-dwconv-multipass-minmax-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f32-dwconv-multipass-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f32-dwconv-multipass-minmax-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f32-dwconv-multipass-minmax-test PRIVATE hardware-config logging microkernel-utils microkernels-all microparams-init packing) + ADD_TEST(NAME f32-dwconv-multipass-minmax-test COMMAND f32-dwconv-multipass-minmax-test) + + ADD_EXECUTABLE(f32-dwconv-unipass-test test/f32-dwconv-unipass.cc) + TARGET_INCLUDE_DIRECTORIES(f32-dwconv-unipass-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f32-dwconv-unipass-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f32-dwconv-unipass-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f32-dwconv-unipass-test PRIVATE hardware-config logging microkernels-all microparams-init packing) + ADD_TEST(NAME f32-dwconv-unipass-test COMMAND f32-dwconv-unipass-test) + + ADD_EXECUTABLE(f32-dwconv-unipass-minmax-test test/f32-dwconv-unipass-minmax.cc) + TARGET_INCLUDE_DIRECTORIES(f32-dwconv-unipass-minmax-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f32-dwconv-unipass-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f32-dwconv-unipass-minmax-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f32-dwconv-unipass-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init packing) + ADD_TEST(NAME f32-dwconv-unipass-minmax-test COMMAND f32-dwconv-unipass-minmax-test) + + ADD_EXECUTABLE(f32-f16-vcvt-test test/f32-f16-vcvt.cc) + TARGET_INCLUDE_DIRECTORIES(f32-f16-vcvt-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f32-f16-vcvt-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f32-f16-vcvt-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f32-f16-vcvt-test PRIVATE hardware-config logging microkernels-all microparams-init) + ADD_TEST(NAME f32-f16-vcvt-test COMMAND f32-f16-vcvt-test) + + ADD_EXECUTABLE(f32-qs8-vcvt-test test/f32-qs8-vcvt.cc) + TARGET_INCLUDE_DIRECTORIES(f32-qs8-vcvt-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f32-qs8-vcvt-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f32-qs8-vcvt-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f32-qs8-vcvt-test PRIVATE hardware-config logging microkernels-all microparams-init) + ADD_TEST(NAME f32-qs8-vcvt-test COMMAND f32-qs8-vcvt-test) + + ADD_EXECUTABLE(f32-qu8-vcvt-test test/f32-qu8-vcvt.cc) + TARGET_INCLUDE_DIRECTORIES(f32-qu8-vcvt-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f32-qu8-vcvt-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f32-qu8-vcvt-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f32-qu8-vcvt-test PRIVATE hardware-config logging microkernels-all microparams-init) + ADD_TEST(NAME f32-qu8-vcvt-test COMMAND f32-qu8-vcvt-test) + + ADD_EXECUTABLE(f32-gavgpool-cw-test test/f32-gavgpool-cw.cc) + TARGET_INCLUDE_DIRECTORIES(f32-gavgpool-cw-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f32-gavgpool-cw-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f32-gavgpool-cw-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f32-gavgpool-cw-test PRIVATE hardware-config logging microkernels-all microparams-init) + ADD_TEST(NAME f32-gavgpool-cw-test COMMAND f32-gavgpool-cw-test) + + ADD_EXECUTABLE(f32-gavgpool-minmax-test test/f32-gavgpool-minmax.cc) + TARGET_INCLUDE_DIRECTORIES(f32-gavgpool-minmax-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f32-gavgpool-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f32-gavgpool-minmax-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f32-gavgpool-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init) + ADD_TEST(NAME f32-gavgpool-minmax-test COMMAND f32-gavgpool-minmax-test) + +@@ -1975,13 +1942,13 @@ + + ADD_EXECUTABLE(f32-ibilinear-test test/f32-ibilinear.cc) + TARGET_INCLUDE_DIRECTORIES(f32-ibilinear-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f32-ibilinear-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f32-ibilinear-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f32-ibilinear-test PRIVATE hardware-config logging microkernels-all) + ADD_TEST(NAME f32-ibilinear-test COMMAND f32-ibilinear-test) + + ADD_EXECUTABLE(f32-ibilinear-chw-test test/f32-ibilinear-chw.cc) + TARGET_INCLUDE_DIRECTORIES(f32-ibilinear-chw-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f32-ibilinear-chw-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f32-ibilinear-chw-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f32-ibilinear-chw-test PRIVATE hardware-config logging microkernels-all) + ADD_TEST(NAME f32-ibilinear-chw-test COMMAND f32-ibilinear-chw-test) + +@@ -2016,13 +1983,13 @@ + + ADD_EXECUTABLE(f32-maxpool-minmax-test test/f32-maxpool-minmax.cc) + TARGET_INCLUDE_DIRECTORIES(f32-maxpool-minmax-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f32-maxpool-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f32-maxpool-minmax-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f32-maxpool-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init) + ADD_TEST(NAME f32-maxpool-minmax-test COMMAND f32-maxpool-minmax-test) + + ADD_EXECUTABLE(f32-pavgpool-minmax-test test/f32-pavgpool-minmax.cc) + TARGET_INCLUDE_DIRECTORIES(f32-pavgpool-minmax-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f32-pavgpool-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f32-pavgpool-minmax-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f32-pavgpool-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init) + ADD_TEST(NAME f32-pavgpool-minmax-test COMMAND f32-pavgpool-minmax-test) + +@@ -2034,259 +2001,259 @@ + + ADD_EXECUTABLE(f32-prelu-test test/f32-prelu.cc) + TARGET_INCLUDE_DIRECTORIES(f32-prelu-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f32-prelu-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f32-prelu-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f32-prelu-test PRIVATE hardware-config logging microkernels-all) + ADD_TEST(NAME f32-prelu-test COMMAND f32-prelu-test) + + ADD_EXECUTABLE(f32-raddexpminusmax-test test/f32-raddexpminusmax.cc) + TARGET_INCLUDE_DIRECTORIES(f32-raddexpminusmax-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f32-raddexpminusmax-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f32-raddexpminusmax-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f32-raddexpminusmax-test PRIVATE hardware-config logging microkernels-all microparams-init) + ADD_TEST(NAME f32-raddexpminusmax-test COMMAND f32-raddexpminusmax-test) + + ADD_EXECUTABLE(f32-raddextexp-test test/f32-raddextexp.cc) + TARGET_INCLUDE_DIRECTORIES(f32-raddextexp-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f32-raddextexp-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f32-raddextexp-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f32-raddextexp-test PRIVATE hardware-config logging microkernels-all microparams-init) + ADD_TEST(NAME f32-raddextexp-test COMMAND f32-raddextexp-test) + + ADD_EXECUTABLE(f32-raddstoreexpminusmax-test test/f32-raddstoreexpminusmax.cc) + TARGET_INCLUDE_DIRECTORIES(f32-raddstoreexpminusmax-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f32-raddstoreexpminusmax-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f32-raddstoreexpminusmax-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f32-raddstoreexpminusmax-test PRIVATE hardware-config logging microkernels-all microparams-init) + ADD_TEST(NAME f32-raddstoreexpminusmax-test COMMAND f32-raddstoreexpminusmax-test) + + ADD_EXECUTABLE(f32-rmax-test test/f32-rmax.cc) + TARGET_INCLUDE_DIRECTORIES(f32-rmax-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f32-rmax-test PRIVATE fp16 pthreadpool gtest gtest_main microparams-init) ++ TARGET_LINK_LIBRARIES(f32-rmax-test PRIVATE gtest gtest_main microparams-init) + TARGET_LINK_LIBRARIES(f32-rmax-test PRIVATE hardware-config logging microkernels-all) + ADD_TEST(NAME f32-rmax-test COMMAND f32-rmax-test) + + ADD_EXECUTABLE(f32-spmm-minmax-test test/f32-spmm-minmax.cc) + TARGET_INCLUDE_DIRECTORIES(f32-spmm-minmax-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f32-spmm-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f32-spmm-minmax-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f32-spmm-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init) + ADD_TEST(NAME f32-spmm-minmax-test COMMAND f32-spmm-minmax-test) + + ADD_EXECUTABLE(f32-vabs-test test/f32-vabs.cc) + TARGET_INCLUDE_DIRECTORIES(f32-vabs-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f32-vabs-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f32-vabs-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f32-vabs-test PRIVATE hardware-config logging microkernels-all microparams-init) + ADD_TEST(NAME f32-vabs-test COMMAND f32-vabs-test) + + ADD_EXECUTABLE(f32-vadd-test test/f32-vadd.cc) + TARGET_INCLUDE_DIRECTORIES(f32-vadd-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f32-vadd-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f32-vadd-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f32-vadd-test PRIVATE hardware-config logging microkernels-all) + ADD_TEST(NAME f32-vadd-test COMMAND f32-vadd-test) + + ADD_EXECUTABLE(f32-vadd-minmax-test test/f32-vadd-minmax.cc) + TARGET_INCLUDE_DIRECTORIES(f32-vadd-minmax-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f32-vadd-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f32-vadd-minmax-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f32-vadd-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init) + ADD_TEST(NAME f32-vadd-minmax-test COMMAND f32-vadd-minmax-test) + + ADD_EXECUTABLE(f32-vadd-relu-test test/f32-vadd-relu.cc) + TARGET_INCLUDE_DIRECTORIES(f32-vadd-relu-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f32-vadd-relu-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f32-vadd-relu-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f32-vadd-relu-test PRIVATE hardware-config logging microkernels-all) + ADD_TEST(NAME f32-vadd-relu-test COMMAND f32-vadd-relu-test) + + ADD_EXECUTABLE(f32-vaddc-test test/f32-vaddc.cc) + TARGET_INCLUDE_DIRECTORIES(f32-vaddc-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f32-vaddc-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f32-vaddc-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f32-vaddc-test PRIVATE hardware-config logging microkernels-all) + ADD_TEST(NAME f32-vaddc-test COMMAND f32-vaddc-test) + + ADD_EXECUTABLE(f32-vaddc-minmax-test test/f32-vaddc-minmax.cc) + TARGET_INCLUDE_DIRECTORIES(f32-vaddc-minmax-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f32-vaddc-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f32-vaddc-minmax-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f32-vaddc-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init) + ADD_TEST(NAME f32-vaddc-minmax-test COMMAND f32-vaddc-minmax-test) + + ADD_EXECUTABLE(f32-vaddc-relu-test test/f32-vaddc-relu.cc) + TARGET_INCLUDE_DIRECTORIES(f32-vaddc-relu-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f32-vaddc-relu-test PRIVATE fp16 pthreadpool gtest gtest_main microparams-init) ++ TARGET_LINK_LIBRARIES(f32-vaddc-relu-test PRIVATE gtest gtest_main microparams-init) + TARGET_LINK_LIBRARIES(f32-vaddc-relu-test PRIVATE hardware-config logging microkernels-all) + ADD_TEST(NAME f32-vaddc-relu-test COMMAND f32-vaddc-relu-test) + + ADD_EXECUTABLE(f32-vclamp-test test/f32-vclamp.cc) + TARGET_INCLUDE_DIRECTORIES(f32-vclamp-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f32-vclamp-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f32-vclamp-test PRIVATE test gtest_main) + TARGET_LINK_LIBRARIES(f32-vclamp-test PRIVATE hardware-config logging microkernels-all microparams-init) + ADD_TEST(NAME f32-vclamp-test COMMAND f32-vclamp-test) + + ADD_EXECUTABLE(f32-vhswish-test test/f32-vhswish.cc) + TARGET_INCLUDE_DIRECTORIES(f32-vhswish-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f32-vhswish-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f32-vhswish-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f32-vhswish-test PRIVATE hardware-config logging microkernels-all microparams-init) + ADD_TEST(NAME f32-vhswish-test COMMAND f32-vhswish-test) + + ADD_EXECUTABLE(f32-vdiv-test test/f32-vdiv.cc) + TARGET_INCLUDE_DIRECTORIES(f32-vdiv-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f32-vdiv-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f32-vdiv-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f32-vdiv-test PRIVATE hardware-config logging microkernels-all) + ADD_TEST(NAME f32-vdiv-test COMMAND f32-vdiv-test) + + ADD_EXECUTABLE(f32-vdiv-minmax-test test/f32-vdiv-minmax.cc) + TARGET_INCLUDE_DIRECTORIES(f32-vdiv-minmax-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f32-vdiv-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f32-vdiv-minmax-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f32-vdiv-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init) + ADD_TEST(NAME f32-vdiv-minmax-test COMMAND f32-vdiv-minmax-test) + + ADD_EXECUTABLE(f32-vdiv-relu-test test/f32-vdiv-relu.cc) + TARGET_INCLUDE_DIRECTORIES(f32-vdiv-relu-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f32-vdiv-relu-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f32-vdiv-relu-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f32-vdiv-relu-test PRIVATE hardware-config logging microkernels-all) + ADD_TEST(NAME f32-vdiv-relu-test COMMAND f32-vdiv-relu-test) + + ADD_EXECUTABLE(f32-vdivc-test test/f32-vdivc.cc) + TARGET_INCLUDE_DIRECTORIES(f32-vdivc-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f32-vdivc-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f32-vdivc-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f32-vdivc-test PRIVATE hardware-config logging microkernels-all) + ADD_TEST(NAME f32-vdivc-test COMMAND f32-vdivc-test) + + ADD_EXECUTABLE(f32-vdivc-minmax-test test/f32-vdivc-minmax.cc) + TARGET_INCLUDE_DIRECTORIES(f32-vdivc-minmax-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f32-vdivc-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f32-vdivc-minmax-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f32-vdivc-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init) + ADD_TEST(NAME f32-vdivc-minmax-test COMMAND f32-vdivc-minmax-test) + + ADD_EXECUTABLE(f32-vdivc-relu-test test/f32-vdivc-relu.cc) + TARGET_INCLUDE_DIRECTORIES(f32-vdivc-relu-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f32-vdivc-relu-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f32-vdivc-relu-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f32-vdivc-relu-test PRIVATE hardware-config logging microkernels-all) + ADD_TEST(NAME f32-vdivc-relu-test COMMAND f32-vdivc-relu-test) + + ADD_EXECUTABLE(f32-vrdivc-test test/f32-vrdivc.cc) + TARGET_INCLUDE_DIRECTORIES(f32-vrdivc-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f32-vrdivc-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f32-vrdivc-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f32-vrdivc-test PRIVATE hardware-config logging microkernels-all) + ADD_TEST(NAME f32-vrdivc-test COMMAND f32-vrdivc-test) + + ADD_EXECUTABLE(f32-vrdivc-minmax-test test/f32-vrdivc-minmax.cc) + TARGET_INCLUDE_DIRECTORIES(f32-vrdivc-minmax-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f32-vrdivc-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f32-vrdivc-minmax-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f32-vrdivc-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init) + ADD_TEST(NAME f32-vrdivc-minmax-test COMMAND f32-vrdivc-minmax-test) + + ADD_EXECUTABLE(f32-vrdivc-relu-test test/f32-vrdivc-relu.cc) + TARGET_INCLUDE_DIRECTORIES(f32-vrdivc-relu-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f32-vrdivc-relu-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f32-vrdivc-relu-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f32-vrdivc-relu-test PRIVATE hardware-config logging microkernels-all) + ADD_TEST(NAME f32-vrdivc-relu-test COMMAND f32-vrdivc-relu-test) + + ADD_EXECUTABLE(f32-velu-test test/f32-velu.cc) + TARGET_INCLUDE_DIRECTORIES(f32-velu-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f32-velu-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f32-velu-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f32-velu-test PRIVATE hardware-config logging microkernels-all microparams-init) + ADD_TEST(NAME f32-velu-test COMMAND f32-velu-test) + + ADD_EXECUTABLE(f32-vlrelu-test test/f32-vlrelu.cc) + TARGET_INCLUDE_DIRECTORIES(f32-vlrelu-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f32-vlrelu-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f32-vlrelu-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f32-vlrelu-test PRIVATE hardware-config logging microkernels-all microparams-init) + ADD_TEST(NAME f32-vlrelu-test COMMAND f32-vlrelu-test) + + ADD_EXECUTABLE(f32-vmax-test test/f32-vmax.cc) + TARGET_INCLUDE_DIRECTORIES(f32-vmax-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f32-vmax-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f32-vmax-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f32-vmax-test PRIVATE hardware-config logging microkernels-all microparams-init) + ADD_TEST(NAME f32-vmax-test COMMAND f32-vmax-test) + + ADD_EXECUTABLE(f32-vmaxc-test test/f32-vmaxc.cc) + TARGET_INCLUDE_DIRECTORIES(f32-vmaxc-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f32-vmaxc-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f32-vmaxc-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f32-vmaxc-test PRIVATE hardware-config logging microkernels-all microparams-init) + ADD_TEST(NAME f32-vmaxc-test COMMAND f32-vmaxc-test) + + ADD_EXECUTABLE(f32-vmin-test test/f32-vmin.cc) + TARGET_INCLUDE_DIRECTORIES(f32-vmin-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f32-vmin-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f32-vmin-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f32-vmin-test PRIVATE hardware-config logging microkernels-all microparams-init) + ADD_TEST(NAME f32-vmin-test COMMAND f32-vmin-test) + + ADD_EXECUTABLE(f32-vminc-test test/f32-vminc.cc) + TARGET_INCLUDE_DIRECTORIES(f32-vminc-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f32-vminc-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f32-vminc-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f32-vminc-test PRIVATE hardware-config logging microkernels-all microparams-init) + ADD_TEST(NAME f32-vminc-test COMMAND f32-vminc-test) + + ADD_EXECUTABLE(f32-vmul-test test/f32-vmul.cc) + TARGET_INCLUDE_DIRECTORIES(f32-vmul-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f32-vmul-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f32-vmul-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f32-vmul-test PRIVATE hardware-config logging microkernels-all microparams-init) + ADD_TEST(NAME f32-vmul-test COMMAND f32-vmul-test) + + ADD_EXECUTABLE(f32-vmul-minmax-test test/f32-vmul-minmax.cc) + TARGET_INCLUDE_DIRECTORIES(f32-vmul-minmax-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f32-vmul-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f32-vmul-minmax-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f32-vmul-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init) + ADD_TEST(NAME f32-vmul-minmax-test COMMAND f32-vmul-minmax-test microparams-init) + + ADD_EXECUTABLE(f32-vmul-relu-test test/f32-vmul-relu.cc) + TARGET_INCLUDE_DIRECTORIES(f32-vmul-relu-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f32-vmul-relu-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f32-vmul-relu-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f32-vmul-relu-test PRIVATE hardware-config logging microkernels-all microparams-init) + ADD_TEST(NAME f32-vmul-relu-test COMMAND f32-vmul-relu-test) + + ADD_EXECUTABLE(f32-vmulc-test test/f32-vmulc.cc) + TARGET_INCLUDE_DIRECTORIES(f32-vmulc-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f32-vmulc-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f32-vmulc-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f32-vmulc-test PRIVATE hardware-config logging microkernels-all microparams-init) + ADD_TEST(NAME f32-vmulc-test COMMAND f32-vmulc-test) + + ADD_EXECUTABLE(f32-vmulc-minmax-test test/f32-vmulc-minmax.cc) + TARGET_INCLUDE_DIRECTORIES(f32-vmulc-minmax-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f32-vmulc-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f32-vmulc-minmax-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f32-vmulc-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init) + ADD_TEST(NAME f32-vmulc-minmax-test COMMAND f32-vmulc-minmax-test) + + ADD_EXECUTABLE(f32-vmulc-relu-test test/f32-vmulc-relu.cc) + TARGET_INCLUDE_DIRECTORIES(f32-vmulc-relu-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f32-vmulc-relu-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f32-vmulc-relu-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f32-vmulc-relu-test PRIVATE hardware-config logging microkernels-all microparams-init) + ADD_TEST(NAME f32-vmulc-relu-test COMMAND f32-vmulc-relu-test) + + ADD_EXECUTABLE(f32-vmulcaddc-minmax-test test/f32-vmulcaddc-minmax.cc) + TARGET_INCLUDE_DIRECTORIES(f32-vmulcaddc-minmax-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f32-vmulcaddc-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f32-vmulcaddc-minmax-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f32-vmulcaddc-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init packing) + ADD_TEST(NAME f32-vmulcaddc-minmax-test COMMAND f32-vmulcaddc-minmax-test) + + ADD_EXECUTABLE(f32-vneg-test test/f32-vneg.cc) + TARGET_INCLUDE_DIRECTORIES(f32-vneg-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f32-vneg-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f32-vneg-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f32-vneg-test PRIVATE hardware-config logging microkernels-all microparams-init) + ADD_TEST(NAME f32-vneg-test COMMAND f32-vneg-test) + + ADD_EXECUTABLE(f32-vrelu-test test/f32-vrelu.cc) + TARGET_INCLUDE_DIRECTORIES(f32-vrelu-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f32-vrelu-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f32-vrelu-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f32-vrelu-test PRIVATE hardware-config logging microkernels-all) + ADD_TEST(NAME f32-vrelu-test COMMAND f32-vrelu-test) + + ADD_EXECUTABLE(f32-vrndne-test test/f32-vrndne.cc) + TARGET_INCLUDE_DIRECTORIES(f32-vrndne-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f32-vrndne-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f32-vrndne-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f32-vrndne-test PRIVATE hardware-config logging microkernels-all microparams-init) + ADD_TEST(NAME f32-vrndne-test COMMAND f32-vrndne-test) + + ADD_EXECUTABLE(f32-vrndz-test test/f32-vrndz.cc) + TARGET_INCLUDE_DIRECTORIES(f32-vrndz-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f32-vrndz-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f32-vrndz-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f32-vrndz-test PRIVATE hardware-config logging microkernels-all microparams-init) + ADD_TEST(NAME f32-vrndz-test COMMAND f32-vrndz-test) + + ADD_EXECUTABLE(f32-vrndu-test test/f32-vrndu.cc) + TARGET_INCLUDE_DIRECTORIES(f32-vrndu-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f32-vrndu-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f32-vrndu-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f32-vrndu-test PRIVATE hardware-config logging microkernels-all microparams-init) + ADD_TEST(NAME f32-vrndu-test COMMAND f32-vrndu-test) + + ADD_EXECUTABLE(f32-vrndd-test test/f32-vrndd.cc) + TARGET_INCLUDE_DIRECTORIES(f32-vrndd-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f32-vrndd-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f32-vrndd-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f32-vrndd-test PRIVATE hardware-config logging microkernels-all microparams-init) + ADD_TEST(NAME f32-vrndd-test COMMAND f32-vrndd-test) + +@@ -2304,91 +2271,91 @@ + + ADD_EXECUTABLE(f32-vsigmoid-test test/f32-vsigmoid.cc) + TARGET_INCLUDE_DIRECTORIES(f32-vsigmoid-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f32-vsigmoid-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f32-vsigmoid-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f32-vsigmoid-test PRIVATE hardware-config logging microkernels-all microparams-init) + ADD_TEST(NAME f32-vsigmoid-test COMMAND f32-vsigmoid-test) + + ADD_EXECUTABLE(f32-vsqr-test test/f32-vsqr.cc) + TARGET_INCLUDE_DIRECTORIES(f32-vsqr-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f32-vsqr-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f32-vsqr-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f32-vsqr-test PRIVATE hardware-config logging microkernels-all microparams-init) + ADD_TEST(NAME f32-vsqr-test COMMAND f32-vsqr-test) + + ADD_EXECUTABLE(f32-vsqrdiff-test test/f32-vsqrdiff.cc) + TARGET_INCLUDE_DIRECTORIES(f32-vsqrdiff-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f32-vsqrdiff-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f32-vsqrdiff-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f32-vsqrdiff-test PRIVATE hardware-config logging microkernels-all microparams-init) + ADD_TEST(NAME f32-vsqrdiff-test COMMAND f32-vsqrdiff-test) + + ADD_EXECUTABLE(f32-vsqrdiffc-test test/f32-vsqrdiffc.cc) + TARGET_INCLUDE_DIRECTORIES(f32-vsqrdiffc-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f32-vsqrdiffc-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f32-vsqrdiffc-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f32-vsqrdiffc-test PRIVATE hardware-config logging microkernels-all microparams-init) + ADD_TEST(NAME f32-vsqrdiffc-test COMMAND f32-vsqrdiffc-test) + + ADD_EXECUTABLE(f32-vsqrt-test test/f32-vsqrt.cc) + TARGET_INCLUDE_DIRECTORIES(f32-vsqrt-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f32-vsqrt-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f32-vsqrt-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f32-vsqrt-test PRIVATE hardware-config logging microkernels-all microparams-init) + ADD_TEST(NAME f32-vsqrt-test COMMAND f32-vsqrt-test) + + ADD_EXECUTABLE(f32-vsub-test test/f32-vsub.cc) + TARGET_INCLUDE_DIRECTORIES(f32-vsub-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f32-vsub-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f32-vsub-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f32-vsub-test PRIVATE hardware-config logging microkernels-all) + ADD_TEST(NAME f32-vsub-test COMMAND f32-vsub-test) + + ADD_EXECUTABLE(f32-vsub-minmax-test test/f32-vsub-minmax.cc) + TARGET_INCLUDE_DIRECTORIES(f32-vsub-minmax-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f32-vsub-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f32-vsub-minmax-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f32-vsub-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init) + ADD_TEST(NAME f32-vsub-minmax-test COMMAND f32-vsub-minmax-test) + + ADD_EXECUTABLE(f32-vsub-relu-test test/f32-vsub-relu.cc) + TARGET_INCLUDE_DIRECTORIES(f32-vsub-relu-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f32-vsub-relu-test PRIVATE fp16 pthreadpool gtest gtest_main microparams-init) ++ TARGET_LINK_LIBRARIES(f32-vsub-relu-test PRIVATE gtest gtest_main microparams-init) + TARGET_LINK_LIBRARIES(f32-vsub-relu-test PRIVATE hardware-config logging microkernels-all) + ADD_TEST(NAME f32-vsub-relu-test COMMAND f32-vsub-relu-test) + + ADD_EXECUTABLE(f32-vsubc-test test/f32-vsubc.cc) + TARGET_INCLUDE_DIRECTORIES(f32-vsubc-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f32-vsubc-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f32-vsubc-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f32-vsubc-test PRIVATE hardware-config logging microkernels-all) + ADD_TEST(NAME f32-vsubc-test COMMAND f32-vsubc-test) + + ADD_EXECUTABLE(f32-vsubc-minmax-test test/f32-vsubc-minmax.cc) + TARGET_INCLUDE_DIRECTORIES(f32-vsubc-minmax-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f32-vsubc-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f32-vsubc-minmax-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f32-vsubc-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init) + ADD_TEST(NAME f32-vsubc-minmax-test COMMAND f32-vsubc-minmax-test) + + ADD_EXECUTABLE(f32-vsubc-relu-test test/f32-vsubc-relu.cc) + TARGET_INCLUDE_DIRECTORIES(f32-vsubc-relu-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f32-vsubc-relu-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f32-vsubc-relu-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f32-vsubc-relu-test PRIVATE hardware-config logging microkernels-all) + ADD_TEST(NAME f32-vsubc-relu-test COMMAND f32-vsubc-relu-test) + + ADD_EXECUTABLE(f32-vrsubc-test test/f32-vrsubc.cc) + TARGET_INCLUDE_DIRECTORIES(f32-vrsubc-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f32-vrsubc-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f32-vrsubc-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f32-vrsubc-test PRIVATE hardware-config logging microkernels-all) + ADD_TEST(NAME f32-vrsubc-test COMMAND f32-vrsubc-test) + + ADD_EXECUTABLE(f32-vrsubc-minmax-test test/f32-vrsubc-minmax.cc) + TARGET_INCLUDE_DIRECTORIES(f32-vrsubc-minmax-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f32-vrsubc-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f32-vrsubc-minmax-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f32-vrsubc-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init) + ADD_TEST(NAME f32-vrsubc-minmax-test COMMAND f32-vrsubc-minmax-test) + + ADD_EXECUTABLE(f32-vrsubc-relu-test test/f32-vrsubc-relu.cc) + TARGET_INCLUDE_DIRECTORIES(f32-vrsubc-relu-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(f32-vrsubc-relu-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f32-vrsubc-relu-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f32-vrsubc-relu-test PRIVATE hardware-config logging microkernels-all) + ADD_TEST(NAME f32-vrsubc-relu-test COMMAND f32-vrsubc-relu-test) + + ADD_EXECUTABLE(qc8-dwconv-unipass-minmax-fp32-test test/qc8-dwconv-unipass-minmax-fp32.cc) + TARGET_INCLUDE_DIRECTORIES(qc8-dwconv-unipass-minmax-fp32-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(qc8-dwconv-unipass-minmax-fp32-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(qc8-dwconv-unipass-minmax-fp32-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(qc8-dwconv-unipass-minmax-fp32-test PRIVATE hardware-config logging microkernels-all microparams-init packing) + ADD_TEST(NAME qc8-dwconv-unipass-minmax-fp32-test COMMAND qc8-dwconv-unipass-minmax-fp32-test) + +@@ -2406,31 +2373,31 @@ + + ADD_EXECUTABLE(qs8-dwconv-unipass-minmax-fp32-test test/qs8-dwconv-unipass-minmax-fp32.cc) + TARGET_INCLUDE_DIRECTORIES(qs8-dwconv-unipass-minmax-fp32-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(qs8-dwconv-unipass-minmax-fp32-test PRIVATE fp16 pthreadpool gtest gtest_main microparams-init) ++ TARGET_LINK_LIBRARIES(qs8-dwconv-unipass-minmax-fp32-test PRIVATE gtest gtest_main microparams-init) + TARGET_LINK_LIBRARIES(qs8-dwconv-unipass-minmax-fp32-test PRIVATE hardware-config logging microkernels-all microparams-init packing) + ADD_TEST(NAME qs8-dwconv-unipass-minmax-fp32-test COMMAND qs8-dwconv-unipass-minmax-fp32-test) + + ADD_EXECUTABLE(qs8-dwconv-unipass-minmax-rndnu-test test/qs8-dwconv-unipass-minmax-rndnu.cc) + TARGET_INCLUDE_DIRECTORIES(qs8-dwconv-unipass-minmax-rndnu-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(qs8-dwconv-unipass-minmax-rndnu-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(qs8-dwconv-unipass-minmax-rndnu-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(qs8-dwconv-unipass-minmax-rndnu-test PRIVATE hardware-config logging microkernels-all microparams-init packing) + ADD_TEST(NAME qs8-dwconv-unipass-minmax-rndnu-test COMMAND qs8-dwconv-unipass-minmax-rndnu-test) + + ADD_EXECUTABLE(qs8-f32-vcvt-test test/f32-f16-vcvt.cc) + TARGET_INCLUDE_DIRECTORIES(qs8-f32-vcvt-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(qs8-f32-vcvt-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(qs8-f32-vcvt-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(qs8-f32-vcvt-test PRIVATE hardware-config logging microkernels-all microparams-init) + ADD_TEST(NAME qs8-f32-vcvt-test COMMAND qs8-f32-vcvt-test) + + ADD_EXECUTABLE(qs8-gavgpool-minmax-fp32-test test/qs8-gavgpool-minmax-fp32.cc) + TARGET_INCLUDE_DIRECTORIES(qs8-gavgpool-minmax-fp32-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(qs8-gavgpool-minmax-fp32-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(qs8-gavgpool-minmax-fp32-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(qs8-gavgpool-minmax-fp32-test PRIVATE hardware-config logging microkernels-all microparams-init) + ADD_TEST(NAME qs8-gavgpool-minmax-fp32-test COMMAND qs8-gavgpool-minmax-fp32-test) + + ADD_EXECUTABLE(qs8-gavgpool-minmax-rndnu-test test/qs8-gavgpool-minmax-rndnu.cc) + TARGET_INCLUDE_DIRECTORIES(qs8-gavgpool-minmax-rndnu-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(qs8-gavgpool-minmax-rndnu-test PRIVATE fp16 pthreadpool gtest gtest_main microparams-init) ++ TARGET_LINK_LIBRARIES(qs8-gavgpool-minmax-rndnu-test PRIVATE gtest gtest_main microparams-init) + TARGET_LINK_LIBRARIES(qs8-gavgpool-minmax-rndnu-test PRIVATE hardware-config logging microkernels-all microparams-init) + ADD_TEST(NAME qs8-gavgpool-minmax-rndnu-test COMMAND qs8-gavgpool-minmax-rndnu-test) + +@@ -2461,81 +2428,81 @@ + ADD_EXECUTABLE(qs8-requantization-test test/qs8-requantization.cc) + SET_TARGET_PROPERTIES(qs8-requantization-test PROPERTIES CXX_EXTENSIONS YES) + TARGET_INCLUDE_DIRECTORIES(qs8-requantization-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(qs8-requantization-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(qs8-requantization-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(qs8-requantization-test PRIVATE hardware-config logging microkernels-all) + ADD_TEST(NAME qs8-requantization-test COMMAND qs8-requantization-test) + + ADD_EXECUTABLE(qs8-vadd-minmax-test test/qs8-vadd-minmax.cc) + TARGET_INCLUDE_DIRECTORIES(qs8-vadd-minmax-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(qs8-vadd-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(qs8-vadd-minmax-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(qs8-vadd-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init) + ADD_TEST(NAME qs8-vadd-minmax-test COMMAND qs8-vadd-minmax-test) + + ADD_EXECUTABLE(qs8-vaddc-minmax-test test/qs8-vaddc-minmax.cc) + TARGET_INCLUDE_DIRECTORIES(qs8-vaddc-minmax-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(qs8-vaddc-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(qs8-vaddc-minmax-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(qs8-vaddc-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init) + ADD_TEST(NAME qs8-vaddc-minmax-test COMMAND qs8-vaddc-minmax-test) + + ADD_EXECUTABLE(qs8-vcvt-test test/qs8-vcvt.cc) + TARGET_INCLUDE_DIRECTORIES(qs8-vcvt-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(qs8-vcvt-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(qs8-vcvt-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(qs8-vcvt-test PRIVATE hardware-config logging microkernels-all microparams-init) + ADD_TEST(NAME qs8-vcvt-test COMMAND qs8-vcvt-test) + + ADD_EXECUTABLE(qs8-vlrelu-test test/qs8-vlrelu.cc) + TARGET_INCLUDE_DIRECTORIES(qs8-vlrelu-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(qs8-vlrelu-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(qs8-vlrelu-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(qs8-vlrelu-test PRIVATE hardware-config logging microkernels-all microparams-init) + ADD_TEST(NAME qs8-vlrelu-test COMMAND qs8-vlrelu-test) + + ADD_EXECUTABLE(qs8-vmul-minmax-fp32-test test/qs8-vmul-minmax-fp32.cc) + SET_TARGET_PROPERTIES(qs8-vmul-minmax-fp32-test PROPERTIES CXX_EXTENSIONS YES) + TARGET_INCLUDE_DIRECTORIES(qs8-vmul-minmax-fp32-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(qs8-vmul-minmax-fp32-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(qs8-vmul-minmax-fp32-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(qs8-vmul-minmax-fp32-test PRIVATE hardware-config logging microkernels-all microparams-init) + ADD_TEST(NAME qs8-vmul-minmax-fp32-test COMMAND qs8-vmul-minmax-fp32-test) + + ADD_EXECUTABLE(qs8-vmulc-minmax-fp32-test test/qs8-vmulc-minmax-fp32.cc) + SET_TARGET_PROPERTIES(qs8-vmulc-minmax-fp32-test PROPERTIES CXX_EXTENSIONS YES) + TARGET_INCLUDE_DIRECTORIES(qs8-vmulc-minmax-fp32-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(qs8-vmulc-minmax-fp32-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(qs8-vmulc-minmax-fp32-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(qs8-vmulc-minmax-fp32-test PRIVATE hardware-config logging microkernels-all microparams-init) + ADD_TEST(NAME qs8-vmulc-minmax-fp32-test COMMAND qs8-vmulc-minmax-fp32-test) + + ADD_EXECUTABLE(qu8-avgpool-minmax-fp32-test test/qu8-avgpool-minmax-fp32.cc) + TARGET_INCLUDE_DIRECTORIES(qu8-avgpool-minmax-fp32-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(qu8-avgpool-minmax-fp32-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(qu8-avgpool-minmax-fp32-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(qu8-avgpool-minmax-fp32-test PRIVATE hardware-config logging microkernels-all microparams-init) + ADD_TEST(NAME qu8-avgpool-minmax-fp32-test COMMAND qu8-avgpool-minmax-fp32-test) + + ADD_EXECUTABLE(qu8-dwconv-unipass-minmax-fp32-test test/qu8-dwconv-unipass-minmax-fp32.cc) + TARGET_INCLUDE_DIRECTORIES(qu8-dwconv-unipass-minmax-fp32-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(qu8-dwconv-unipass-minmax-fp32-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(qu8-dwconv-unipass-minmax-fp32-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(qu8-dwconv-unipass-minmax-fp32-test PRIVATE hardware-config logging microkernels-all microparams-init packing) + ADD_TEST(NAME qu8-dwconv-unipass-minmax-fp32-test COMMAND qu8-dwconv-unipass-minmax-fp32-test) + + ADD_EXECUTABLE(qu8-dwconv-unipass-minmax-rndnu-test test/qu8-dwconv-unipass-minmax-rndnu.cc) + TARGET_INCLUDE_DIRECTORIES(qu8-dwconv-unipass-minmax-rndnu-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(qu8-dwconv-unipass-minmax-rndnu-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(qu8-dwconv-unipass-minmax-rndnu-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(qu8-dwconv-unipass-minmax-rndnu-test PRIVATE hardware-config logging microkernels-all microparams-init packing) + ADD_TEST(NAME qu8-dwconv-unipass-minmax-rndnu-test COMMAND qu8-dwconv-unipass-minmax-rndnu-test) + + ADD_EXECUTABLE(qu8-f32-vcvt-test test/f32-f16-vcvt.cc) + TARGET_INCLUDE_DIRECTORIES(qu8-f32-vcvt-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(qu8-f32-vcvt-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(qu8-f32-vcvt-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(qu8-f32-vcvt-test PRIVATE hardware-config logging microkernels-all microparams-init) + ADD_TEST(NAME qu8-f32-vcvt-test COMMAND qu8-f32-vcvt-test) + + ADD_EXECUTABLE(qu8-gavgpool-minmax-fp32-test test/qu8-gavgpool-minmax-fp32.cc) + TARGET_INCLUDE_DIRECTORIES(qu8-gavgpool-minmax-fp32-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(qu8-gavgpool-minmax-fp32-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(qu8-gavgpool-minmax-fp32-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(qu8-gavgpool-minmax-fp32-test PRIVATE hardware-config logging microkernels-all microparams-init) + ADD_TEST(NAME qu8-gavgpool-minmax-fp32-test COMMAND qu8-gavgpool-minmax-fp32-test) + + ADD_EXECUTABLE(qu8-gavgpool-minmax-rndnu-test test/qu8-gavgpool-minmax-rndnu.cc) + TARGET_INCLUDE_DIRECTORIES(qu8-gavgpool-minmax-rndnu-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(qu8-gavgpool-minmax-rndnu-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(qu8-gavgpool-minmax-rndnu-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(qu8-gavgpool-minmax-rndnu-test PRIVATE hardware-config logging microkernels-all microparams-init) + ADD_TEST(NAME qu8-gavgpool-minmax-rndnu-test COMMAND qu8-gavgpool-minmax-rndnu-test) + +@@ -2566,161 +2533,161 @@ + ADD_EXECUTABLE(qu8-requantization-test test/qu8-requantization.cc) + SET_TARGET_PROPERTIES(qu8-requantization-test PROPERTIES CXX_EXTENSIONS YES) + TARGET_INCLUDE_DIRECTORIES(qu8-requantization-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(qu8-requantization-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(qu8-requantization-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(qu8-requantization-test PRIVATE hardware-config logging microkernels-all) + ADD_TEST(NAME qu8-requantization-test COMMAND qu8-requantization-test) + + ADD_EXECUTABLE(qu8-vadd-minmax-test test/qu8-vadd-minmax.cc) + TARGET_INCLUDE_DIRECTORIES(qu8-vadd-minmax-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(qu8-vadd-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main microparams-init) ++ TARGET_LINK_LIBRARIES(qu8-vadd-minmax-test PRIVATE gtest gtest_main microparams-init) + TARGET_LINK_LIBRARIES(qu8-vadd-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init) + ADD_TEST(NAME qu8-vadd-minmax-test COMMAND qu8-vadd-minmax-test) + + ADD_EXECUTABLE(qu8-vaddc-minmax-test test/qu8-vaddc-minmax.cc) + TARGET_INCLUDE_DIRECTORIES(qu8-vaddc-minmax-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(qu8-vaddc-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(qu8-vaddc-minmax-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(qu8-vaddc-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init) + ADD_TEST(NAME qu8-vaddc-minmax-test COMMAND qu8-vaddc-minmax-test) + + ADD_EXECUTABLE(qu8-vcvt-test test/qu8-vcvt.cc) + TARGET_INCLUDE_DIRECTORIES(qu8-vcvt-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(qu8-vcvt-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(qu8-vcvt-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(qu8-vcvt-test PRIVATE hardware-config logging microkernels-all microparams-init) + ADD_TEST(NAME qu8-vcvt-test COMMAND qu8-vcvt-test) + + ADD_EXECUTABLE(qu8-vlrelu-test test/qu8-vlrelu.cc) + TARGET_INCLUDE_DIRECTORIES(qu8-vlrelu-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(qu8-vlrelu-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(qu8-vlrelu-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(qu8-vlrelu-test PRIVATE hardware-config logging microkernels-all microparams-init) + ADD_TEST(NAME qu8-vlrelu-test COMMAND qu8-vlrelu-test) + + ADD_EXECUTABLE(qu8-vmul-minmax-fp32-test test/qu8-vmul-minmax-fp32.cc) + SET_TARGET_PROPERTIES(qu8-vmul-minmax-fp32-test PROPERTIES CXX_EXTENSIONS YES) + TARGET_INCLUDE_DIRECTORIES(qu8-vmul-minmax-fp32-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(qu8-vmul-minmax-fp32-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(qu8-vmul-minmax-fp32-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(qu8-vmul-minmax-fp32-test PRIVATE hardware-config logging microkernels-all microparams-init) + ADD_TEST(NAME qu8-vmul-minmax-fp32-test COMMAND qu8-vmul-minmax-fp32-test) + + ADD_EXECUTABLE(qu8-vmul-minmax-rndnu-test test/qu8-vmul-minmax-rndnu.cc) + SET_TARGET_PROPERTIES(qu8-vmul-minmax-rndnu-test PROPERTIES CXX_EXTENSIONS YES) + TARGET_INCLUDE_DIRECTORIES(qu8-vmul-minmax-rndnu-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(qu8-vmul-minmax-rndnu-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(qu8-vmul-minmax-rndnu-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(qu8-vmul-minmax-rndnu-test PRIVATE hardware-config logging microkernels-all microparams-init) + ADD_TEST(NAME qu8-vmul-minmax-rndnu-test COMMAND qu8-vmul-minmax-rndnu-test) + + ADD_EXECUTABLE(qu8-vmulc-minmax-fp32-test test/qu8-vmulc-minmax-fp32.cc) + SET_TARGET_PROPERTIES(qu8-vmulc-minmax-fp32-test PROPERTIES CXX_EXTENSIONS YES) + TARGET_INCLUDE_DIRECTORIES(qu8-vmulc-minmax-fp32-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(qu8-vmulc-minmax-fp32-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(qu8-vmulc-minmax-fp32-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(qu8-vmulc-minmax-fp32-test PRIVATE hardware-config logging microkernels-all microparams-init) + ADD_TEST(NAME qu8-vmulc-minmax-fp32-test COMMAND qu8-vmulc-minmax-fp32-test) + + ADD_EXECUTABLE(qu8-vmulc-minmax-rndnu-test test/qu8-vmulc-minmax-rndnu.cc) + SET_TARGET_PROPERTIES(qu8-vmulc-minmax-rndnu-test PROPERTIES CXX_EXTENSIONS YES) + TARGET_INCLUDE_DIRECTORIES(qu8-vmulc-minmax-rndnu-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(qu8-vmulc-minmax-rndnu-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(qu8-vmulc-minmax-rndnu-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(qu8-vmulc-minmax-rndnu-test PRIVATE hardware-config logging microkernels-all microparams-init) + ADD_TEST(NAME qu8-vmulc-minmax-rndnu-test COMMAND qu8-vmulc-minmax-rndnu-test) + + ADD_EXECUTABLE(s16-rmaxabs-test test/s16-rmaxabs.cc) + TARGET_INCLUDE_DIRECTORIES(s16-rmaxabs-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(s16-rmaxabs-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(s16-rmaxabs-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(s16-rmaxabs-test PRIVATE hardware-config logging microkernels-all) + ADD_TEST(NAME s16-rmaxabs-test COMMAND s16-rmaxabs-test) + + ADD_EXECUTABLE(s16-window-test test/s16-window.cc) + TARGET_INCLUDE_DIRECTORIES(s16-window-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(s16-window-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(s16-window-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(s16-window-test PRIVATE hardware-config logging microkernels-all) + ADD_TEST(NAME s16-window-test COMMAND s16-window-test) + + ADD_EXECUTABLE(u32-filterbank-accumulate-test test/u32-filterbank-accumulate.cc) + TARGET_INCLUDE_DIRECTORIES(u32-filterbank-accumulate-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(u32-filterbank-accumulate-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(u32-filterbank-accumulate-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(u32-filterbank-accumulate-test PRIVATE hardware-config logging microkernels-all) + ADD_TEST(NAME u32-filterbank-accumulate-test COMMAND u32-filterbank-accumulate-test) + + ADD_EXECUTABLE(u32-filterbank-subtract-test test/u32-filterbank-subtract.cc) + TARGET_INCLUDE_DIRECTORIES(u32-filterbank-subtract-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(u32-filterbank-subtract-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(u32-filterbank-subtract-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(u32-filterbank-subtract-test PRIVATE hardware-config logging microkernels-all) + ADD_TEST(NAME u32-filterbank-subtract-test COMMAND u32-filterbank-subtract-test) + + ADD_EXECUTABLE(u32-vlog-test test/u32-vlog.cc) + TARGET_INCLUDE_DIRECTORIES(u32-vlog-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(u32-vlog-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(u32-vlog-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(u32-vlog-test PRIVATE hardware-config logging microkernels-all) + ADD_TEST(NAME u32-vlog-test COMMAND u32-vlog-test) + + ADD_EXECUTABLE(i16-vlshift-test test/i16-vlshift.cc) + TARGET_INCLUDE_DIRECTORIES(i16-vlshift-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(i16-vlshift-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(i16-vlshift-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(i16-vlshift-test PRIVATE hardware-config logging microkernels-all) + ADD_TEST(NAME i16-vlshift-test COMMAND i16-vlshift-test) + + ADD_EXECUTABLE(cs16-vsquareabs-test test/cs16-vsquareabs.cc) + TARGET_INCLUDE_DIRECTORIES(cs16-vsquareabs-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(cs16-vsquareabs-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(cs16-vsquareabs-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(cs16-vsquareabs-test PRIVATE hardware-config logging microkernels-all) + ADD_TEST(NAME cs16-vsquareabs-test COMMAND cs16-vsquareabs-test) + + ADD_EXECUTABLE(cs16-bfly4-test test/cs16-bfly4.cc) + TARGET_INCLUDE_DIRECTORIES(cs16-bfly4-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(cs16-bfly4-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(cs16-bfly4-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(cs16-bfly4-test PRIVATE hardware-config logging microkernels-all) + ADD_TEST(NAME cs16-bfly4-test COMMAND cs16-bfly4-test) + + ADD_EXECUTABLE(cs16-fftr-test test/cs16-fftr.cc) + TARGET_INCLUDE_DIRECTORIES(cs16-fftr-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(cs16-fftr-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(cs16-fftr-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(cs16-fftr-test PRIVATE hardware-config logging microkernels-all) + ADD_TEST(NAME cs16-fftr-test COMMAND cs16-fftr-test) + + ADD_EXECUTABLE(s8-ibilinear-test test/s8-ibilinear.cc) + TARGET_INCLUDE_DIRECTORIES(s8-ibilinear-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(s8-ibilinear-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(s8-ibilinear-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(s8-ibilinear-test PRIVATE hardware-config logging microkernels-all) + ADD_TEST(NAME s8-ibilinear-test COMMAND s8-ibilinear-test) + + ADD_EXECUTABLE(s8-maxpool-minmax-test test/s8-maxpool-minmax.cc) + TARGET_INCLUDE_DIRECTORIES(s8-maxpool-minmax-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(s8-maxpool-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(s8-maxpool-minmax-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(s8-maxpool-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init) + ADD_TEST(NAME s8-maxpool-minmax-test COMMAND s8-maxpool-minmax-test) + + ADD_EXECUTABLE(s8-vclamp-test test/s8-vclamp.cc) + TARGET_INCLUDE_DIRECTORIES(s8-vclamp-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(s8-vclamp-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(s8-vclamp-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(s8-vclamp-test PRIVATE hardware-config logging microkernels-all microparams-init) + ADD_TEST(NAME s8-vclamp-test COMMAND s8-vclamp-test) + + ADD_EXECUTABLE(u8-lut32norm-test test/u8-lut32norm.cc) + TARGET_INCLUDE_DIRECTORIES(u8-lut32norm-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(u8-lut32norm-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(u8-lut32norm-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(u8-lut32norm-test PRIVATE hardware-config logging microkernels-all) + ADD_TEST(NAME u8-lut32norm-test COMMAND u8-lut32norm-test) + + ADD_EXECUTABLE(u8-ibilinear-test test/u8-ibilinear.cc) + TARGET_INCLUDE_DIRECTORIES(u8-ibilinear-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(u8-ibilinear-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(u8-ibilinear-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(u8-ibilinear-test PRIVATE hardware-config logging microkernels-all) + ADD_TEST(NAME u8-ibilinear-test COMMAND u8-ibilinear-test) + + ADD_EXECUTABLE(u8-maxpool-minmax-test test/u8-maxpool-minmax.cc) + TARGET_INCLUDE_DIRECTORIES(u8-maxpool-minmax-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(u8-maxpool-minmax-test PRIVATE fp16 pthreadpool gtest gtest_main microparams-init) ++ TARGET_LINK_LIBRARIES(u8-maxpool-minmax-test PRIVATE gtest gtest_main microparams-init) + TARGET_LINK_LIBRARIES(u8-maxpool-minmax-test PRIVATE hardware-config logging microkernels-all microparams-init) + ADD_TEST(NAME u8-maxpool-minmax-test COMMAND u8-maxpool-minmax-test) + + ADD_EXECUTABLE(u8-rmax-test test/u8-rmax.cc) + TARGET_INCLUDE_DIRECTORIES(u8-rmax-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(u8-rmax-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(u8-rmax-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(u8-rmax-test PRIVATE hardware-config logging microkernels-all) + ADD_TEST(NAME u8-rmax-test COMMAND u8-rmax-test) + + ADD_EXECUTABLE(u8-vclamp-test test/u8-vclamp.cc) + TARGET_INCLUDE_DIRECTORIES(u8-vclamp-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(u8-vclamp-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(u8-vclamp-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(u8-vclamp-test PRIVATE hardware-config logging microkernels-all microparams-init) + ADD_TEST(NAME u8-vclamp-test COMMAND u8-vclamp-test) + +@@ -2762,25 +2729,25 @@ + + ADD_EXECUTABLE(x32-zip-test test/x32-zip.cc) + TARGET_INCLUDE_DIRECTORIES(x32-zip-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(x32-zip-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(x32-zip-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(x32-zip-test PRIVATE hardware-config logging microkernels-all) + ADD_TEST(NAME x32-zip-test COMMAND x32-zip-test) + + ADD_EXECUTABLE(x64-transpose-test test/x64-transpose.cc) + TARGET_INCLUDE_DIRECTORIES(x64-transpose-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(x64-transpose-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(x64-transpose-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(x64-transpose-test PRIVATE hardware-config logging microkernels-all microparams-init) + ADD_TEST(NAME x64-transpose-test COMMAND x64-transpose-test) + + ADD_EXECUTABLE(x8-lut-test test/x8-lut.cc) + TARGET_INCLUDE_DIRECTORIES(x8-lut-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(x8-lut-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(x8-lut-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(x8-lut-test PRIVATE hardware-config logging microkernels-all) + ADD_TEST(NAME x8-lut-test COMMAND x8-lut-test) + + ADD_EXECUTABLE(x8-zip-test test/x8-zip.cc) + TARGET_INCLUDE_DIRECTORIES(x8-zip-test PRIVATE include src test) +- TARGET_LINK_LIBRARIES(x8-zip-test PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(x8-zip-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(x8-zip-test PRIVATE hardware-config logging microkernels-all) + ADD_TEST(NAME x8-zip-test COMMAND x8-zip-test) + +@@ -2842,12 +2809,12 @@ + + ADD_EXECUTABLE(packing-test test/packing.cc) + TARGET_INCLUDE_DIRECTORIES(packing-test PRIVATE include src) +- TARGET_LINK_LIBRARIES(packing-test PRIVATE fp16 gtest gtest_main pthreadpool) ++ TARGET_LINK_LIBRARIES(packing-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(packing-test PRIVATE XNNPACK microkernel-utils operator-utils packing) + + ADD_EXECUTABLE(indirection-test test/indirection.cc) + TARGET_INCLUDE_DIRECTORIES(indirection-test PRIVATE include src) +- TARGET_LINK_LIBRARIES(indirection-test PRIVATE gtest gtest_main pthreadpool) ++ TARGET_LINK_LIBRARIES(indirection-test PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(indirection-test PRIVATE XNNPACK indirection) + ENDIF() + +@@ -2864,7 +2831,7 @@ + ADD_LIBRARY(bench-utils STATIC bench/utils.cc) + TARGET_INCLUDE_DIRECTORIES(bench-utils PRIVATE .) + TARGET_INCLUDE_DIRECTORIES(bench-utils PUBLIC include src) +- TARGET_LINK_LIBRARIES(bench-utils PRIVATE benchmark cpuinfo pthreadpool) ++ TARGET_LINK_LIBRARIES(bench-utils PRIVATE benchmark cpuinfo) + TARGET_LINK_LIBRARIES(bench-utils PRIVATE hardware-config) + IF(XNNPACK_BUILD_LIBRARY) + TARGET_LINK_LIBRARIES(bench-utils PRIVATE logging memory) +@@ -2873,134 +2840,134 @@ + # ---[ Build accuracy microbenchmarks + ADD_EXECUTABLE(f16-exp-ulp-eval eval/f16-exp-ulp.cc) + TARGET_INCLUDE_DIRECTORIES(f16-exp-ulp-eval PRIVATE . src) +- TARGET_LINK_LIBRARIES(f16-exp-ulp-eval PRIVATE benchmark cpuinfo fp16 pthreadpool) ++ TARGET_LINK_LIBRARIES(f16-exp-ulp-eval PRIVATE benchmark cpuinfo) + TARGET_LINK_LIBRARIES(f16-exp-ulp-eval PRIVATE bench-utils microkernels-all) + + ADD_EXECUTABLE(f16-expminus-ulp-eval eval/f16-expminus-ulp.cc) + TARGET_INCLUDE_DIRECTORIES(f16-expminus-ulp-eval PRIVATE . src) +- TARGET_LINK_LIBRARIES(f16-expminus-ulp-eval PRIVATE benchmark cpuinfo fp16 pthreadpool) ++ TARGET_LINK_LIBRARIES(f16-expminus-ulp-eval PRIVATE benchmark cpuinfo) + TARGET_LINK_LIBRARIES(f16-expminus-ulp-eval PRIVATE bench-utils microkernels-all) + + ADD_EXECUTABLE(f16-expm1minus-ulp-eval eval/f16-expm1minus-ulp.cc) + TARGET_INCLUDE_DIRECTORIES(f16-expm1minus-ulp-eval PRIVATE . src) +- TARGET_LINK_LIBRARIES(f16-expm1minus-ulp-eval PRIVATE benchmark cpuinfo fp16 pthreadpool) ++ TARGET_LINK_LIBRARIES(f16-expm1minus-ulp-eval PRIVATE benchmark cpuinfo) + TARGET_LINK_LIBRARIES(f16-expm1minus-ulp-eval PRIVATE bench-utils microkernels-all) + + ADD_EXECUTABLE(f16-sigmoid-ulp-eval eval/f16-sigmoid-ulp.cc) + TARGET_INCLUDE_DIRECTORIES(f16-sigmoid-ulp-eval PRIVATE . src) +- TARGET_LINK_LIBRARIES(f16-sigmoid-ulp-eval PRIVATE benchmark cpuinfo fp16 pthreadpool) ++ TARGET_LINK_LIBRARIES(f16-sigmoid-ulp-eval PRIVATE benchmark cpuinfo) + TARGET_LINK_LIBRARIES(f16-sigmoid-ulp-eval PRIVATE bench-utils microkernels-all) + + ADD_EXECUTABLE(f16-sqrt-ulp-eval eval/f16-sqrt-ulp.cc) + TARGET_INCLUDE_DIRECTORIES(f16-sqrt-ulp-eval PRIVATE . src) +- TARGET_LINK_LIBRARIES(f16-sqrt-ulp-eval PRIVATE benchmark cpuinfo fp16 pthreadpool) ++ TARGET_LINK_LIBRARIES(f16-sqrt-ulp-eval PRIVATE benchmark cpuinfo) + TARGET_LINK_LIBRARIES(f16-sqrt-ulp-eval PRIVATE bench-utils microkernels-all) + + ADD_EXECUTABLE(f32-exp-ulp-eval eval/f32-exp-ulp.cc) + TARGET_INCLUDE_DIRECTORIES(f32-exp-ulp-eval PRIVATE . src) +- TARGET_LINK_LIBRARIES(f32-exp-ulp-eval PRIVATE benchmark cpuinfo fp16 pthreadpool) ++ TARGET_LINK_LIBRARIES(f32-exp-ulp-eval PRIVATE benchmark cpuinfo) + TARGET_LINK_LIBRARIES(f32-exp-ulp-eval PRIVATE bench-utils microkernels-all) + + ADD_EXECUTABLE(f32-expminus-ulp-eval eval/f32-expminus-ulp.cc) + TARGET_INCLUDE_DIRECTORIES(f32-expminus-ulp-eval PRIVATE . src) +- TARGET_LINK_LIBRARIES(f32-expminus-ulp-eval PRIVATE benchmark cpuinfo fp16 pthreadpool) ++ TARGET_LINK_LIBRARIES(f32-expminus-ulp-eval PRIVATE benchmark cpuinfo) + TARGET_LINK_LIBRARIES(f32-expminus-ulp-eval PRIVATE bench-utils microkernels-all) + + ADD_EXECUTABLE(f32-expm1minus-ulp-eval eval/f32-expm1minus-ulp.cc) + TARGET_INCLUDE_DIRECTORIES(f32-expm1minus-ulp-eval PRIVATE . src) +- TARGET_LINK_LIBRARIES(f32-expm1minus-ulp-eval PRIVATE benchmark cpuinfo fp16 pthreadpool) ++ TARGET_LINK_LIBRARIES(f32-expm1minus-ulp-eval PRIVATE benchmark cpuinfo) + TARGET_LINK_LIBRARIES(f32-expm1minus-ulp-eval PRIVATE bench-utils microkernels-all) + + ADD_EXECUTABLE(f32-extexp-ulp-eval eval/f32-extexp-ulp.cc) + SET_TARGET_PROPERTIES(f32-extexp-ulp-eval PROPERTIES CXX_EXTENSIONS YES) + TARGET_INCLUDE_DIRECTORIES(f32-extexp-ulp-eval PRIVATE . src) +- TARGET_LINK_LIBRARIES(f32-extexp-ulp-eval PRIVATE benchmark cpuinfo fp16 pthreadpool) ++ TARGET_LINK_LIBRARIES(f32-extexp-ulp-eval PRIVATE benchmark cpuinfo) + TARGET_LINK_LIBRARIES(f32-extexp-ulp-eval PRIVATE bench-utils microkernels-all) + + ADD_EXECUTABLE(f32-sigmoid-ulp-eval eval/f32-sigmoid-ulp.cc) + TARGET_INCLUDE_DIRECTORIES(f32-sigmoid-ulp-eval PRIVATE . src) +- TARGET_LINK_LIBRARIES(f32-sigmoid-ulp-eval PRIVATE benchmark cpuinfo fp16 pthreadpool) ++ TARGET_LINK_LIBRARIES(f32-sigmoid-ulp-eval PRIVATE benchmark cpuinfo) + TARGET_LINK_LIBRARIES(f32-sigmoid-ulp-eval PRIVATE bench-utils microkernels-all) + + ADD_EXECUTABLE(f32-sqrt-ulp-eval eval/f32-sqrt-ulp.cc) + TARGET_INCLUDE_DIRECTORIES(f32-sqrt-ulp-eval PRIVATE . src) +- TARGET_LINK_LIBRARIES(f32-sqrt-ulp-eval PRIVATE benchmark cpuinfo fp16 pthreadpool) ++ TARGET_LINK_LIBRARIES(f32-sqrt-ulp-eval PRIVATE benchmark cpuinfo) + TARGET_LINK_LIBRARIES(f32-sqrt-ulp-eval PRIVATE bench-utils microkernels-all) + + ADD_EXECUTABLE(f32-tanh-ulp-eval eval/f32-tanh-ulp.cc) + TARGET_INCLUDE_DIRECTORIES(f32-tanh-ulp-eval PRIVATE . src) +- TARGET_LINK_LIBRARIES(f32-tanh-ulp-eval PRIVATE benchmark cpuinfo fp16 pthreadpool) ++ TARGET_LINK_LIBRARIES(f32-tanh-ulp-eval PRIVATE benchmark cpuinfo) + TARGET_LINK_LIBRARIES(f32-tanh-ulp-eval PRIVATE bench-utils microkernels-all) + + # ---[ Build accuracy tests + ADD_EXECUTABLE(f16-sqrt-eval eval/f16-sqrt.cc) + TARGET_INCLUDE_DIRECTORIES(f16-sqrt-eval PRIVATE include src) +- TARGET_LINK_LIBRARIES(f16-sqrt-eval PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f16-sqrt-eval PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f16-sqrt-eval PRIVATE hardware-config logging microkernels-all) + + ADD_EXECUTABLE(f16-f32-cvt-eval eval/f16-f32-cvt.cc) + TARGET_INCLUDE_DIRECTORIES(f16-f32-cvt-eval PRIVATE include src) +- TARGET_LINK_LIBRARIES(f16-f32-cvt-eval PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f16-f32-cvt-eval PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f16-f32-cvt-eval PRIVATE hardware-config logging microkernels-all) + + ADD_EXECUTABLE(f32-f16-cvt-eval eval/f32-f16-cvt.cc) + TARGET_INCLUDE_DIRECTORIES(f32-f16-cvt-eval PRIVATE include src) +- TARGET_LINK_LIBRARIES(f32-f16-cvt-eval PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f32-f16-cvt-eval PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f32-f16-cvt-eval PRIVATE hardware-config logging microkernels-all) + + ADD_EXECUTABLE(f32-qs8-cvt-eval eval/f32-qs8-cvt.cc) + TARGET_INCLUDE_DIRECTORIES(f32-qs8-cvt-eval PRIVATE include src) +- TARGET_LINK_LIBRARIES(f32-qs8-cvt-eval PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f32-qs8-cvt-eval PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f32-qs8-cvt-eval PRIVATE hardware-config logging microkernels-all) + + ADD_EXECUTABLE(f32-qu8-cvt-eval eval/f32-qu8-cvt.cc) + TARGET_INCLUDE_DIRECTORIES(f32-qu8-cvt-eval PRIVATE include src) +- TARGET_LINK_LIBRARIES(f32-qu8-cvt-eval PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f32-qu8-cvt-eval PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f32-qu8-cvt-eval PRIVATE hardware-config logging microkernels-all) + + ADD_EXECUTABLE(f32-exp-eval eval/f32-exp.cc) + TARGET_INCLUDE_DIRECTORIES(f32-exp-eval PRIVATE include src) +- TARGET_LINK_LIBRARIES(f32-exp-eval PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f32-exp-eval PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f32-exp-eval PRIVATE hardware-config logging microkernels-all) + + ADD_EXECUTABLE(f32-expm1minus-eval eval/f32-expm1minus.cc) + TARGET_INCLUDE_DIRECTORIES(f32-expm1minus-eval PRIVATE include src) +- TARGET_LINK_LIBRARIES(f32-expm1minus-eval PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f32-expm1minus-eval PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f32-expm1minus-eval PRIVATE hardware-config logging microkernels-all) + + ADD_EXECUTABLE(f32-expminus-eval eval/f32-expminus.cc) + TARGET_INCLUDE_DIRECTORIES(f32-expminus-eval PRIVATE include src) +- TARGET_LINK_LIBRARIES(f32-expminus-eval PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f32-expminus-eval PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f32-expminus-eval PRIVATE hardware-config logging microkernels-all) + + ADD_EXECUTABLE(f32-roundne-eval eval/f32-roundne.cc) + TARGET_INCLUDE_DIRECTORIES(f32-roundne-eval PRIVATE include src) +- TARGET_LINK_LIBRARIES(f32-roundne-eval PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f32-roundne-eval PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f32-roundne-eval PRIVATE hardware-config logging microkernels-all) + + ADD_EXECUTABLE(f32-roundd-eval eval/f32-roundd.cc) + TARGET_INCLUDE_DIRECTORIES(f32-roundd-eval PRIVATE include src) +- TARGET_LINK_LIBRARIES(f32-roundd-eval PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f32-roundd-eval PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f32-roundd-eval PRIVATE hardware-config logging microkernels-all) + + ADD_EXECUTABLE(f32-roundu-eval eval/f32-roundu.cc) + TARGET_INCLUDE_DIRECTORIES(f32-roundu-eval PRIVATE include src) +- TARGET_LINK_LIBRARIES(f32-roundu-eval PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f32-roundu-eval PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f32-roundu-eval PRIVATE hardware-config logging microkernels-all) + + ADD_EXECUTABLE(f32-roundz-eval eval/f32-roundz.cc) + TARGET_INCLUDE_DIRECTORIES(f32-roundz-eval PRIVATE include src) +- TARGET_LINK_LIBRARIES(f32-roundz-eval PRIVATE fp16 pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(f32-roundz-eval PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(f32-roundz-eval PRIVATE hardware-config logging microkernels-all) + + ADD_EXECUTABLE(u32-sqrt-eval eval/u32-sqrt.cc) + TARGET_INCLUDE_DIRECTORIES(u32-sqrt-eval PRIVATE include src) +- TARGET_LINK_LIBRARIES(u32-sqrt-eval PRIVATE pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(u32-sqrt-eval PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(u32-sqrt-eval PRIVATE hardware-config logging microkernels-all) + + ADD_EXECUTABLE(u64-sqrt-eval eval/u64-sqrt.cc) + TARGET_INCLUDE_DIRECTORIES(u64-sqrt-eval PRIVATE include src) +- TARGET_LINK_LIBRARIES(u64-sqrt-eval PRIVATE pthreadpool gtest gtest_main) ++ TARGET_LINK_LIBRARIES(u64-sqrt-eval PRIVATE gtest gtest_main) + TARGET_LINK_LIBRARIES(u64-sqrt-eval PRIVATE hardware-config logging microkernels-all) + + IF(XNNPACK_BUILD_LIBRARY) +@@ -3030,7 +2997,7 @@ + models/qu8-mobilenet-v2.cc) + SET_TARGET_PROPERTIES(bench-models PROPERTIES CXX_EXTENSIONS YES) + TARGET_INCLUDE_DIRECTORIES(bench-models PRIVATE .) +- TARGET_LINK_LIBRARIES(bench-models PRIVATE fp16 benchmark) ++ TARGET_LINK_LIBRARIES(bench-models PRIVATE benchmark) + TARGET_LINK_LIBRARIES(bench-models PRIVATE XNNPACK bench-utils) + + ADD_EXECUTABLE(end2end-bench bench/end2end.cc) +@@ -3039,7 +3006,7 @@ + + ADD_EXECUTABLE(f16-gemm-e2e-bench bench/f16-gemm-e2e.cc) + TARGET_INCLUDE_DIRECTORIES(f16-gemm-e2e-bench PRIVATE . src) +- TARGET_LINK_LIBRARIES(f16-gemm-e2e-bench PRIVATE fp16 benchmark) ++ TARGET_LINK_LIBRARIES(f16-gemm-e2e-bench PRIVATE benchmark) + TARGET_LINK_LIBRARIES(f16-gemm-e2e-bench PRIVATE XNNPACK bench-models bench-utils hardware-config logging microkernels-all microparams-init) + + ADD_EXECUTABLE(f32-dwconv-e2e-bench bench/f32-dwconv-e2e.cc) +@@ -3049,33 +3016,33 @@ + + ADD_EXECUTABLE(f32-gemm-e2e-bench bench/f32-gemm-e2e.cc) + TARGET_INCLUDE_DIRECTORIES(f32-gemm-e2e-bench PRIVATE . src) +- TARGET_LINK_LIBRARIES(f32-gemm-e2e-bench PRIVATE fp16 benchmark) ++ TARGET_LINK_LIBRARIES(f32-gemm-e2e-bench PRIVATE benchmark) + TARGET_LINK_LIBRARIES(f32-gemm-e2e-bench PRIVATE XNNPACK bench-models bench-utils hardware-config logging microkernels-all microparams-init) + + ADD_EXECUTABLE(qs8-dwconv-e2e-bench bench/qs8-dwconv-e2e.cc) + TARGET_INCLUDE_DIRECTORIES(qs8-dwconv-e2e-bench PRIVATE . src) +- TARGET_LINK_LIBRARIES(qs8-dwconv-e2e-bench PRIVATE fp16 benchmark) ++ TARGET_LINK_LIBRARIES(qs8-dwconv-e2e-bench PRIVATE benchmark) + TARGET_LINK_LIBRARIES(qs8-dwconv-e2e-bench PRIVATE XNNPACK bench-models bench-utils hardware-config logging microkernels-all microparams-init) + + ADD_EXECUTABLE(qs8-gemm-e2e-bench bench/qs8-gemm-e2e.cc) + TARGET_INCLUDE_DIRECTORIES(qs8-gemm-e2e-bench PRIVATE . src) +- TARGET_LINK_LIBRARIES(qs8-gemm-e2e-bench PRIVATE fp16 benchmark) ++ TARGET_LINK_LIBRARIES(qs8-gemm-e2e-bench PRIVATE benchmark) + TARGET_LINK_LIBRARIES(qs8-gemm-e2e-bench PRIVATE XNNPACK bench-models bench-utils hardware-config logging microkernels-all microparams-init) + + ADD_EXECUTABLE(qu8-gemm-e2e-bench bench/qu8-gemm-e2e.cc) + TARGET_INCLUDE_DIRECTORIES(qu8-gemm-e2e-bench PRIVATE . src) +- TARGET_LINK_LIBRARIES(qu8-gemm-e2e-bench PRIVATE fp16 benchmark) ++ TARGET_LINK_LIBRARIES(qu8-gemm-e2e-bench PRIVATE benchmark) + TARGET_LINK_LIBRARIES(qu8-gemm-e2e-bench PRIVATE XNNPACK bench-models bench-utils hardware-config logging microkernels-all microparams-init) + + ADD_EXECUTABLE(qu8-dwconv-e2e-bench bench/qu8-dwconv-e2e.cc) + TARGET_INCLUDE_DIRECTORIES(qu8-dwconv-e2e-bench PRIVATE . src) +- TARGET_LINK_LIBRARIES(qu8-dwconv-e2e-bench PRIVATE fp16 benchmark) ++ TARGET_LINK_LIBRARIES(qu8-dwconv-e2e-bench PRIVATE benchmark) + TARGET_LINK_LIBRARIES(qu8-dwconv-e2e-bench PRIVATE XNNPACK bench-models bench-utils hardware-config logging microkernels-all microparams-init) + + # ---[ Build operator-level microbenchmarks + ADD_EXECUTABLE(abs-bench bench/abs.cc) + TARGET_INCLUDE_DIRECTORIES(abs-bench PRIVATE .) +- TARGET_LINK_LIBRARIES(abs-bench PRIVATE XNNPACK fp16 benchmark bench-utils) ++ TARGET_LINK_LIBRARIES(abs-bench PRIVATE XNNPACK benchmark bench-utils) + + ADD_EXECUTABLE(average-pooling-bench bench/average-pooling.cc) + TARGET_INCLUDE_DIRECTORIES(average-pooling-bench PRIVATE .) +@@ -3083,11 +3050,11 @@ + + ADD_EXECUTABLE(bankers-rounding-bench bench/bankers-rounding.cc) + TARGET_INCLUDE_DIRECTORIES(bankers-rounding-bench PRIVATE .) +- TARGET_LINK_LIBRARIES(bankers-rounding-bench PRIVATE XNNPACK fp16 benchmark bench-utils) ++ TARGET_LINK_LIBRARIES(bankers-rounding-bench PRIVATE XNNPACK benchmark bench-utils) + + ADD_EXECUTABLE(ceiling-bench bench/ceiling.cc) + TARGET_INCLUDE_DIRECTORIES(ceiling-bench PRIVATE .) +- TARGET_LINK_LIBRARIES(ceiling-bench PRIVATE XNNPACK fp16 benchmark bench-utils) ++ TARGET_LINK_LIBRARIES(ceiling-bench PRIVATE XNNPACK benchmark bench-utils) + + ADD_EXECUTABLE(channel-shuffle-bench bench/channel-shuffle.cc) + TARGET_INCLUDE_DIRECTORIES(channel-shuffle-bench PRIVATE .) +@@ -3095,11 +3062,11 @@ + + ADD_EXECUTABLE(convert-bench bench/convert.cc) + TARGET_INCLUDE_DIRECTORIES(convert-bench PRIVATE .) +- TARGET_LINK_LIBRARIES(convert-bench PRIVATE XNNPACK fp16 benchmark bench-utils) ++ TARGET_LINK_LIBRARIES(convert-bench PRIVATE XNNPACK benchmark bench-utils) + + ADD_EXECUTABLE(convolution-bench bench/convolution.cc) + TARGET_INCLUDE_DIRECTORIES(convolution-bench PRIVATE .) +- TARGET_LINK_LIBRARIES(convolution-bench PRIVATE XNNPACK fp16 benchmark bench-utils) ++ TARGET_LINK_LIBRARIES(convolution-bench PRIVATE XNNPACK benchmark bench-utils) + + ADD_EXECUTABLE(deconvolution-bench bench/deconvolution.cc) + TARGET_INCLUDE_DIRECTORIES(deconvolution-bench PRIVATE .) +@@ -3107,23 +3074,23 @@ + + ADD_EXECUTABLE(elu-bench bench/elu.cc) + TARGET_INCLUDE_DIRECTORIES(elu-bench PRIVATE .) +- TARGET_LINK_LIBRARIES(elu-bench PRIVATE XNNPACK fp16 benchmark bench-utils) ++ TARGET_LINK_LIBRARIES(elu-bench PRIVATE XNNPACK benchmark bench-utils) + + ADD_EXECUTABLE(floor-bench bench/floor.cc) + TARGET_INCLUDE_DIRECTORIES(floor-bench PRIVATE .) +- TARGET_LINK_LIBRARIES(floor-bench PRIVATE XNNPACK fp16 benchmark bench-utils) ++ TARGET_LINK_LIBRARIES(floor-bench PRIVATE XNNPACK benchmark bench-utils) + + ADD_EXECUTABLE(global-average-pooling-bench bench/global-average-pooling.cc) + TARGET_INCLUDE_DIRECTORIES(global-average-pooling-bench PRIVATE .) +- TARGET_LINK_LIBRARIES(global-average-pooling-bench PRIVATE XNNPACK fp16 benchmark bench-utils) ++ TARGET_LINK_LIBRARIES(global-average-pooling-bench PRIVATE XNNPACK benchmark bench-utils) + + ADD_EXECUTABLE(hardswish-bench bench/hardswish.cc) + TARGET_INCLUDE_DIRECTORIES(hardswish-bench PRIVATE .) +- TARGET_LINK_LIBRARIES(hardswish-bench PRIVATE XNNPACK fp16 benchmark bench-utils) ++ TARGET_LINK_LIBRARIES(hardswish-bench PRIVATE XNNPACK benchmark bench-utils) + + ADD_EXECUTABLE(leaky-relu-bench bench/leaky-relu.cc) + TARGET_INCLUDE_DIRECTORIES(leaky-relu-bench PRIVATE .) +- TARGET_LINK_LIBRARIES(leaky-relu-bench PRIVATE XNNPACK fp16 benchmark bench-utils) ++ TARGET_LINK_LIBRARIES(leaky-relu-bench PRIVATE XNNPACK benchmark bench-utils) + + ADD_EXECUTABLE(max-pooling-bench bench/max-pooling.cc) + TARGET_INCLUDE_DIRECTORIES(max-pooling-bench PRIVATE .) +@@ -3139,7 +3106,7 @@ + + ADD_EXECUTABLE(sigmoid-bench bench/sigmoid.cc) + TARGET_INCLUDE_DIRECTORIES(sigmoid-bench PRIVATE .) +- TARGET_LINK_LIBRARIES(sigmoid-bench PRIVATE XNNPACK fp16 benchmark bench-utils) ++ TARGET_LINK_LIBRARIES(sigmoid-bench PRIVATE XNNPACK benchmark bench-utils) + + ADD_EXECUTABLE(softmax-bench bench/softmax.cc) + TARGET_INCLUDE_DIRECTORIES(softmax-bench PRIVATE .) +@@ -3161,378 +3128,378 @@ + # ---[ Build microkernel-level microbenchmarks + ADD_EXECUTABLE(bf16-gemm-bench bench/bf16-gemm.cc) + TARGET_INCLUDE_DIRECTORIES(bf16-gemm-bench PRIVATE . include src) +- TARGET_LINK_LIBRARIES(bf16-gemm-bench PRIVATE benchmark fp16 pthreadpool) ++ TARGET_LINK_LIBRARIES(bf16-gemm-bench PRIVATE benchmark) + TARGET_LINK_LIBRARIES(bf16-gemm-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init packing) + + ADD_EXECUTABLE(f16-conv-hwc2chw-bench bench/f16-conv-hwc2chw.cc) + TARGET_INCLUDE_DIRECTORIES(f16-conv-hwc2chw-bench PRIVATE . include src) +- TARGET_LINK_LIBRARIES(f16-conv-hwc2chw-bench PRIVATE benchmark fp16 pthreadpool) ++ TARGET_LINK_LIBRARIES(f16-conv-hwc2chw-bench PRIVATE benchmark) + TARGET_LINK_LIBRARIES(f16-conv-hwc2chw-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init packing) + + ADD_EXECUTABLE(f16-dwconv-bench bench/f16-dwconv.cc) + TARGET_INCLUDE_DIRECTORIES(f16-dwconv-bench PRIVATE . include src) +- TARGET_LINK_LIBRARIES(f16-dwconv-bench PRIVATE benchmark fp16 pthreadpool) ++ TARGET_LINK_LIBRARIES(f16-dwconv-bench PRIVATE benchmark) + TARGET_LINK_LIBRARIES(f16-dwconv-bench PRIVATE bench-utils indirection hardware-config logging microkernels-all microparams-init packing) + + ADD_EXECUTABLE(f16-dwconv2d-chw-bench bench/f16-dwconv2d-chw.cc) + TARGET_INCLUDE_DIRECTORIES(f16-dwconv2d-chw-bench PRIVATE . include src) +- TARGET_LINK_LIBRARIES(f16-dwconv2d-chw-bench PRIVATE benchmark fp16 pthreadpool) ++ TARGET_LINK_LIBRARIES(f16-dwconv2d-chw-bench PRIVATE benchmark) + TARGET_LINK_LIBRARIES(f16-dwconv2d-chw-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init packing) + + ADD_EXECUTABLE(f16-gavgpool-cw-bench bench/f16-gavgpool-cw.cc) + TARGET_INCLUDE_DIRECTORIES(f16-gavgpool-cw-bench PRIVATE . include src) +- TARGET_LINK_LIBRARIES(f16-gavgpool-cw-bench PRIVATE benchmark fp16 pthreadpool) ++ TARGET_LINK_LIBRARIES(f16-gavgpool-cw-bench PRIVATE benchmark) + TARGET_LINK_LIBRARIES(f16-gavgpool-cw-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init) + + ADD_EXECUTABLE(f16-gemm-bench bench/f16-gemm.cc) + TARGET_INCLUDE_DIRECTORIES(f16-gemm-bench PRIVATE . include src) +- TARGET_LINK_LIBRARIES(f16-gemm-bench PRIVATE benchmark fp16 pthreadpool) ++ TARGET_LINK_LIBRARIES(f16-gemm-bench PRIVATE benchmark) + TARGET_LINK_LIBRARIES(f16-gemm-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init packing) + + ADD_EXECUTABLE(f16-igemm-bench bench/f16-igemm.cc) + TARGET_INCLUDE_DIRECTORIES(f16-igemm-bench PRIVATE . include src) +- TARGET_LINK_LIBRARIES(f16-igemm-bench PRIVATE benchmark fp16 pthreadpool) ++ TARGET_LINK_LIBRARIES(f16-igemm-bench PRIVATE benchmark) + TARGET_LINK_LIBRARIES(f16-igemm-bench PRIVATE bench-utils indirection hardware-config logging microkernels-all microparams-init packing) + + ADD_EXECUTABLE(f16-raddstoreexpminusmax-bench bench/f16-raddstoreexpminusmax.cc) + TARGET_INCLUDE_DIRECTORIES(f16-raddstoreexpminusmax-bench PRIVATE . include src) +- TARGET_LINK_LIBRARIES(f16-raddstoreexpminusmax-bench PRIVATE benchmark fp16 pthreadpool) ++ TARGET_LINK_LIBRARIES(f16-raddstoreexpminusmax-bench PRIVATE benchmark) + TARGET_LINK_LIBRARIES(f16-raddstoreexpminusmax-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init) + + ADD_EXECUTABLE(f16-spmm-bench bench/f16-spmm.cc) + TARGET_INCLUDE_DIRECTORIES(f16-spmm-bench PRIVATE . include src) +- TARGET_LINK_LIBRARIES(f16-spmm-bench PRIVATE benchmark fp16 pthreadpool) ++ TARGET_LINK_LIBRARIES(f16-spmm-bench PRIVATE benchmark) + TARGET_LINK_LIBRARIES(f16-spmm-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init) + + ADD_EXECUTABLE(f16-velu-bench bench/f16-velu.cc) + TARGET_INCLUDE_DIRECTORIES(f16-velu-bench PRIVATE . include src) +- TARGET_LINK_LIBRARIES(f16-velu-bench PRIVATE benchmark fp16 pthreadpool) ++ TARGET_LINK_LIBRARIES(f16-velu-bench PRIVATE benchmark) + TARGET_LINK_LIBRARIES(f16-velu-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init) + + ADD_EXECUTABLE(f16-vsigmoid-bench bench/f16-vsigmoid.cc) + TARGET_INCLUDE_DIRECTORIES(f16-vsigmoid-bench PRIVATE . include src) +- TARGET_LINK_LIBRARIES(f16-vsigmoid-bench PRIVATE benchmark fp16 pthreadpool) ++ TARGET_LINK_LIBRARIES(f16-vsigmoid-bench PRIVATE benchmark) + TARGET_LINK_LIBRARIES(f16-vsigmoid-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init) + + ADD_EXECUTABLE(f16-vsqrt-bench bench/f16-vsqrt.cc) + TARGET_INCLUDE_DIRECTORIES(f16-vsqrt-bench PRIVATE . include src) +- TARGET_LINK_LIBRARIES(f16-vsqrt-bench PRIVATE benchmark fp16 pthreadpool) ++ TARGET_LINK_LIBRARIES(f16-vsqrt-bench PRIVATE benchmark) + TARGET_LINK_LIBRARIES(f16-vsqrt-bench PRIVATE bench-utils microkernels-all) + + ADD_EXECUTABLE(f16-f32-vcvt-bench bench/f16-f32-vcvt.cc) + TARGET_INCLUDE_DIRECTORIES(f16-f32-vcvt-bench PRIVATE . include src) +- TARGET_LINK_LIBRARIES(f16-f32-vcvt-bench PRIVATE benchmark fp16 pthreadpool) ++ TARGET_LINK_LIBRARIES(f16-f32-vcvt-bench PRIVATE benchmark) + TARGET_LINK_LIBRARIES(f16-f32-vcvt-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init) + + ADD_EXECUTABLE(f32-conv-hwc-bench bench/f32-conv-hwc.cc) + TARGET_INCLUDE_DIRECTORIES(f32-conv-hwc-bench PRIVATE . include src) +- TARGET_LINK_LIBRARIES(f32-conv-hwc-bench PRIVATE benchmark pthreadpool) ++ TARGET_LINK_LIBRARIES(f32-conv-hwc-bench PRIVATE benchmark) + TARGET_LINK_LIBRARIES(f32-conv-hwc-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init packing) + + ADD_EXECUTABLE(f32-conv-hwc2chw-bench bench/f32-conv-hwc2chw.cc) + TARGET_INCLUDE_DIRECTORIES(f32-conv-hwc2chw-bench PRIVATE . include src) +- TARGET_LINK_LIBRARIES(f32-conv-hwc2chw-bench PRIVATE benchmark pthreadpool) ++ TARGET_LINK_LIBRARIES(f32-conv-hwc2chw-bench PRIVATE benchmark) + TARGET_LINK_LIBRARIES(f32-conv-hwc2chw-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init packing) + + ADD_EXECUTABLE(f32-dwconv-bench bench/f32-dwconv.cc) + TARGET_INCLUDE_DIRECTORIES(f32-dwconv-bench PRIVATE . include src) +- TARGET_LINK_LIBRARIES(f32-dwconv-bench PRIVATE benchmark pthreadpool) ++ TARGET_LINK_LIBRARIES(f32-dwconv-bench PRIVATE benchmark) + TARGET_LINK_LIBRARIES(f32-dwconv-bench PRIVATE bench-utils indirection hardware-config logging microkernel-utils microkernels-all microparams-init packing) + + ADD_EXECUTABLE(f32-dwconv2d-chw-bench bench/f32-dwconv2d-chw.cc) + TARGET_INCLUDE_DIRECTORIES(f32-dwconv2d-chw-bench PRIVATE . include src) +- TARGET_LINK_LIBRARIES(f32-dwconv2d-chw-bench PRIVATE benchmark pthreadpool) ++ TARGET_LINK_LIBRARIES(f32-dwconv2d-chw-bench PRIVATE benchmark) + TARGET_LINK_LIBRARIES(f32-dwconv2d-chw-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init) + + ADD_EXECUTABLE(f32-f16-vcvt-bench bench/f32-f16-vcvt.cc) + TARGET_INCLUDE_DIRECTORIES(f32-f16-vcvt-bench PRIVATE . include src) +- TARGET_LINK_LIBRARIES(f32-f16-vcvt-bench PRIVATE benchmark pthreadpool) ++ TARGET_LINK_LIBRARIES(f32-f16-vcvt-bench PRIVATE benchmark) + TARGET_LINK_LIBRARIES(f32-f16-vcvt-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init) + + ADD_EXECUTABLE(f32-gavgpool-cw-bench bench/f32-gavgpool-cw.cc) + TARGET_INCLUDE_DIRECTORIES(f32-gavgpool-cw-bench PRIVATE . include src) +- TARGET_LINK_LIBRARIES(f32-gavgpool-cw-bench PRIVATE benchmark pthreadpool) ++ TARGET_LINK_LIBRARIES(f32-gavgpool-cw-bench PRIVATE benchmark) + TARGET_LINK_LIBRARIES(f32-gavgpool-cw-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init) + + ADD_EXECUTABLE(f32-gemm-bench bench/f32-gemm.cc) + TARGET_INCLUDE_DIRECTORIES(f32-gemm-bench PRIVATE . include src) +- TARGET_LINK_LIBRARIES(f32-gemm-bench PRIVATE benchmark pthreadpool) ++ TARGET_LINK_LIBRARIES(f32-gemm-bench PRIVATE benchmark) + TARGET_LINK_LIBRARIES(f32-gemm-bench PRIVATE jit bench-utils hardware-config logging microkernels-all microparams-init packing) + + ADD_EXECUTABLE(f32-igemm-bench bench/f32-igemm.cc) + TARGET_INCLUDE_DIRECTORIES(f32-igemm-bench PRIVATE . include src) +- TARGET_LINK_LIBRARIES(f32-igemm-bench PRIVATE benchmark pthreadpool) ++ TARGET_LINK_LIBRARIES(f32-igemm-bench PRIVATE benchmark) + TARGET_LINK_LIBRARIES(f32-igemm-bench PRIVATE jit bench-utils indirection hardware-config logging microkernels-all microparams-init packing) + + ADD_EXECUTABLE(f32-im2col-gemm-bench bench/f32-im2col-gemm.cc src/im2col.c) + TARGET_INCLUDE_DIRECTORIES(f32-im2col-gemm-bench PRIVATE . include src) +- TARGET_LINK_LIBRARIES(f32-im2col-gemm-bench PRIVATE benchmark pthreadpool) ++ TARGET_LINK_LIBRARIES(f32-im2col-gemm-bench PRIVATE benchmark) + TARGET_LINK_LIBRARIES(f32-im2col-gemm-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init packing) + + ADD_EXECUTABLE(f32-qs8-vcvt-bench bench/f32-qs8-vcvt.cc) + TARGET_INCLUDE_DIRECTORIES(f32-qs8-vcvt-bench PRIVATE . include src) +- TARGET_LINK_LIBRARIES(f32-qs8-vcvt-bench PRIVATE benchmark pthreadpool) ++ TARGET_LINK_LIBRARIES(f32-qs8-vcvt-bench PRIVATE benchmark) + TARGET_LINK_LIBRARIES(f32-qs8-vcvt-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init) + + ADD_EXECUTABLE(f32-qu8-vcvt-bench bench/f32-qu8-vcvt.cc) + TARGET_INCLUDE_DIRECTORIES(f32-qu8-vcvt-bench PRIVATE . include src) +- TARGET_LINK_LIBRARIES(f32-qu8-vcvt-bench PRIVATE benchmark pthreadpool) ++ TARGET_LINK_LIBRARIES(f32-qu8-vcvt-bench PRIVATE benchmark) + TARGET_LINK_LIBRARIES(f32-qu8-vcvt-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init) + + ADD_EXECUTABLE(f32-raddstoreexpminusmax-bench bench/f32-raddstoreexpminusmax.cc) + TARGET_INCLUDE_DIRECTORIES(f32-raddstoreexpminusmax-bench PRIVATE . include src) +- TARGET_LINK_LIBRARIES(f32-raddstoreexpminusmax-bench PRIVATE benchmark pthreadpool) ++ TARGET_LINK_LIBRARIES(f32-raddstoreexpminusmax-bench PRIVATE benchmark) + TARGET_LINK_LIBRARIES(f32-raddstoreexpminusmax-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init) + + ADD_EXECUTABLE(f32-raddexpminusmax-bench bench/f32-raddexpminusmax.cc) + TARGET_INCLUDE_DIRECTORIES(f32-raddexpminusmax-bench PRIVATE . include src) +- TARGET_LINK_LIBRARIES(f32-raddexpminusmax-bench PRIVATE benchmark pthreadpool) ++ TARGET_LINK_LIBRARIES(f32-raddexpminusmax-bench PRIVATE benchmark) + TARGET_LINK_LIBRARIES(f32-raddexpminusmax-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init) + + ADD_EXECUTABLE(f32-raddextexp-bench bench/f32-raddextexp.cc) + TARGET_INCLUDE_DIRECTORIES(f32-raddextexp-bench PRIVATE . include src) +- TARGET_LINK_LIBRARIES(f32-raddextexp-bench PRIVATE benchmark pthreadpool) ++ TARGET_LINK_LIBRARIES(f32-raddextexp-bench PRIVATE benchmark) + TARGET_LINK_LIBRARIES(f32-raddextexp-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init) + + ADD_EXECUTABLE(f32-vscaleexpminusmax-bench bench/f32-vscaleexpminusmax.cc) + TARGET_INCLUDE_DIRECTORIES(f32-vscaleexpminusmax-bench PRIVATE . include src) +- TARGET_LINK_LIBRARIES(f32-vscaleexpminusmax-bench PRIVATE benchmark pthreadpool) ++ TARGET_LINK_LIBRARIES(f32-vscaleexpminusmax-bench PRIVATE benchmark) + TARGET_LINK_LIBRARIES(f32-vscaleexpminusmax-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init) + + ADD_EXECUTABLE(f32-vscaleextexp-bench bench/f32-vscaleextexp.cc) + TARGET_INCLUDE_DIRECTORIES(f32-vscaleextexp-bench PRIVATE . include src) +- TARGET_LINK_LIBRARIES(f32-vscaleextexp-bench PRIVATE benchmark pthreadpool) ++ TARGET_LINK_LIBRARIES(f32-vscaleextexp-bench PRIVATE benchmark) + TARGET_LINK_LIBRARIES(f32-vscaleextexp-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init) + + ADD_EXECUTABLE(f32-rmax-bench bench/f32-rmax.cc) + TARGET_INCLUDE_DIRECTORIES(f32-rmax-bench PRIVATE . include src) +- TARGET_LINK_LIBRARIES(f32-rmax-bench PRIVATE benchmark pthreadpool) ++ TARGET_LINK_LIBRARIES(f32-rmax-bench PRIVATE benchmark) + TARGET_LINK_LIBRARIES(f32-rmax-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init) + + ADD_EXECUTABLE(f32-spmm-bench bench/f32-spmm.cc) + TARGET_INCLUDE_DIRECTORIES(f32-spmm-bench PRIVATE . include src) +- TARGET_LINK_LIBRARIES(f32-spmm-bench PRIVATE benchmark pthreadpool) ++ TARGET_LINK_LIBRARIES(f32-spmm-bench PRIVATE benchmark) + TARGET_LINK_LIBRARIES(f32-spmm-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init) + + ADD_EXECUTABLE(f32-softmax-bench bench/f32-softmax.cc) + TARGET_INCLUDE_DIRECTORIES(f32-softmax-bench PRIVATE . include src) +- TARGET_LINK_LIBRARIES(f32-softmax-bench PRIVATE benchmark pthreadpool) ++ TARGET_LINK_LIBRARIES(f32-softmax-bench PRIVATE benchmark) + TARGET_LINK_LIBRARIES(f32-softmax-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init) + + ADD_EXECUTABLE(f32-velu-bench bench/f32-velu.cc) + TARGET_INCLUDE_DIRECTORIES(f32-velu-bench PRIVATE . include src) +- TARGET_LINK_LIBRARIES(f32-velu-bench PRIVATE benchmark pthreadpool) ++ TARGET_LINK_LIBRARIES(f32-velu-bench PRIVATE benchmark) + TARGET_LINK_LIBRARIES(f32-velu-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init) + + ADD_EXECUTABLE(f32-vhswish-bench bench/f32-vhswish.cc) + TARGET_INCLUDE_DIRECTORIES(f32-vhswish-bench PRIVATE . include src) +- TARGET_LINK_LIBRARIES(f32-vhswish-bench PRIVATE benchmark pthreadpool) ++ TARGET_LINK_LIBRARIES(f32-vhswish-bench PRIVATE benchmark) + TARGET_LINK_LIBRARIES(f32-vhswish-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init) + + ADD_EXECUTABLE(f32-vlrelu-bench bench/f32-vlrelu.cc) + TARGET_INCLUDE_DIRECTORIES(f32-vlrelu-bench PRIVATE . include src) +- TARGET_LINK_LIBRARIES(f32-vlrelu-bench PRIVATE benchmark pthreadpool) ++ TARGET_LINK_LIBRARIES(f32-vlrelu-bench PRIVATE benchmark) + TARGET_LINK_LIBRARIES(f32-vlrelu-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init) + + ADD_EXECUTABLE(f32-vrelu-bench bench/f32-vrelu.cc) + TARGET_INCLUDE_DIRECTORIES(f32-vrelu-bench PRIVATE . include src) +- TARGET_LINK_LIBRARIES(f32-vrelu-bench PRIVATE benchmark pthreadpool) ++ TARGET_LINK_LIBRARIES(f32-vrelu-bench PRIVATE benchmark) + TARGET_LINK_LIBRARIES(f32-vrelu-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init) + + ADD_EXECUTABLE(f32-vsigmoid-bench bench/f32-vsigmoid.cc) + TARGET_INCLUDE_DIRECTORIES(f32-vsigmoid-bench PRIVATE . include src) +- TARGET_LINK_LIBRARIES(f32-vsigmoid-bench PRIVATE benchmark pthreadpool) ++ TARGET_LINK_LIBRARIES(f32-vsigmoid-bench PRIVATE benchmark) + TARGET_LINK_LIBRARIES(f32-vsigmoid-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init) + + ADD_EXECUTABLE(f32-vsqrt-bench bench/f32-vsqrt.cc) + TARGET_INCLUDE_DIRECTORIES(f32-vsqrt-bench PRIVATE . include src) +- TARGET_LINK_LIBRARIES(f32-vsqrt-bench PRIVATE benchmark pthreadpool) ++ TARGET_LINK_LIBRARIES(f32-vsqrt-bench PRIVATE benchmark) + TARGET_LINK_LIBRARIES(f32-vsqrt-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init) + + ADD_EXECUTABLE(qs8-dwconv-bench bench/qs8-dwconv.cc) + TARGET_INCLUDE_DIRECTORIES(qs8-dwconv-bench PRIVATE . include src) +- TARGET_LINK_LIBRARIES(qs8-dwconv-bench PRIVATE benchmark pthreadpool) ++ TARGET_LINK_LIBRARIES(qs8-dwconv-bench PRIVATE benchmark) + TARGET_LINK_LIBRARIES(qs8-dwconv-bench PRIVATE bench-utils indirection hardware-config logging microkernels-all microparams-init packing) + + ADD_EXECUTABLE(qs8-f32-vcvt-bench bench/qs8-f32-vcvt.cc) + TARGET_INCLUDE_DIRECTORIES(qs8-f32-vcvt-bench PRIVATE . include src) +- TARGET_LINK_LIBRARIES(qs8-f32-vcvt-bench PRIVATE benchmark pthreadpool) ++ TARGET_LINK_LIBRARIES(qs8-f32-vcvt-bench PRIVATE benchmark) + TARGET_LINK_LIBRARIES(qs8-f32-vcvt-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init) + + ADD_EXECUTABLE(qs8-gemm-bench bench/qs8-gemm.cc) + TARGET_INCLUDE_DIRECTORIES(qs8-gemm-bench PRIVATE . include src) +- TARGET_LINK_LIBRARIES(qs8-gemm-bench PRIVATE benchmark pthreadpool jit microparams-init) ++ TARGET_LINK_LIBRARIES(qs8-gemm-bench PRIVATE benchmark jit microparams-init) + TARGET_LINK_LIBRARIES(qs8-gemm-bench PRIVATE bench-utils jit hardware-config logging microkernels-all microparams-init packing) + + ADD_EXECUTABLE(qs8-requantization-bench bench/qs8-requantization.cc) + SET_TARGET_PROPERTIES(qs8-requantization-bench PROPERTIES CXX_EXTENSIONS YES) + TARGET_INCLUDE_DIRECTORIES(qs8-requantization-bench PRIVATE . include src) +- TARGET_LINK_LIBRARIES(qs8-requantization-bench PRIVATE benchmark pthreadpool) ++ TARGET_LINK_LIBRARIES(qs8-requantization-bench PRIVATE benchmark) + TARGET_LINK_LIBRARIES(qs8-requantization-bench PRIVATE bench-utils microkernels-all) + + ADD_EXECUTABLE(qs8-vadd-bench bench/qs8-vadd.cc) + TARGET_INCLUDE_DIRECTORIES(qs8-vadd-bench PRIVATE . include src) +- TARGET_LINK_LIBRARIES(qs8-vadd-bench PRIVATE benchmark pthreadpool) ++ TARGET_LINK_LIBRARIES(qs8-vadd-bench PRIVATE benchmark) + TARGET_LINK_LIBRARIES(qs8-vadd-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init) + + ADD_EXECUTABLE(qs8-vaddc-bench bench/qs8-vaddc.cc) + TARGET_INCLUDE_DIRECTORIES(qs8-vaddc-bench PRIVATE . include src) +- TARGET_LINK_LIBRARIES(qs8-vaddc-bench PRIVATE benchmark pthreadpool) ++ TARGET_LINK_LIBRARIES(qs8-vaddc-bench PRIVATE benchmark) + TARGET_LINK_LIBRARIES(qs8-vaddc-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init) + + ADD_EXECUTABLE(qs8-vcvt-bench bench/qs8-vcvt.cc) + TARGET_INCLUDE_DIRECTORIES(qs8-vcvt-bench PRIVATE . include src) +- TARGET_LINK_LIBRARIES(qs8-vcvt-bench PRIVATE benchmark pthreadpool) ++ TARGET_LINK_LIBRARIES(qs8-vcvt-bench PRIVATE benchmark) + TARGET_LINK_LIBRARIES(qs8-vcvt-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init) + + ADD_EXECUTABLE(qs8-vlrelu-bench bench/qs8-vlrelu.cc) + TARGET_INCLUDE_DIRECTORIES(qs8-vlrelu-bench PRIVATE . include src) +- TARGET_LINK_LIBRARIES(qs8-vlrelu-bench PRIVATE benchmark pthreadpool) ++ TARGET_LINK_LIBRARIES(qs8-vlrelu-bench PRIVATE benchmark) + TARGET_LINK_LIBRARIES(qs8-vlrelu-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init) + + ADD_EXECUTABLE(qs8-vmul-bench bench/qs8-vmul.cc) + TARGET_INCLUDE_DIRECTORIES(qs8-vmul-bench PRIVATE . include src) +- TARGET_LINK_LIBRARIES(qs8-vmul-bench PRIVATE benchmark pthreadpool) ++ TARGET_LINK_LIBRARIES(qs8-vmul-bench PRIVATE benchmark) + TARGET_LINK_LIBRARIES(qs8-vmul-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init) + + ADD_EXECUTABLE(qs8-vmulc-bench bench/qs8-vmulc.cc) + TARGET_INCLUDE_DIRECTORIES(qs8-vmulc-bench PRIVATE . include src) +- TARGET_LINK_LIBRARIES(qs8-vmulc-bench PRIVATE benchmark pthreadpool) ++ TARGET_LINK_LIBRARIES(qs8-vmulc-bench PRIVATE benchmark) + TARGET_LINK_LIBRARIES(qs8-vmulc-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init) + + ADD_EXECUTABLE(qu8-f32-vcvt-bench bench/qu8-f32-vcvt.cc) + TARGET_INCLUDE_DIRECTORIES(qu8-f32-vcvt-bench PRIVATE . include src) +- TARGET_LINK_LIBRARIES(qu8-f32-vcvt-bench PRIVATE benchmark pthreadpool) ++ TARGET_LINK_LIBRARIES(qu8-f32-vcvt-bench PRIVATE benchmark) + TARGET_LINK_LIBRARIES(qu8-f32-vcvt-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init) + + ADD_EXECUTABLE(qu8-gemm-bench bench/qu8-gemm.cc) + TARGET_INCLUDE_DIRECTORIES(qu8-gemm-bench PRIVATE . include src) +- TARGET_LINK_LIBRARIES(qu8-gemm-bench PRIVATE benchmark pthreadpool) ++ TARGET_LINK_LIBRARIES(qu8-gemm-bench PRIVATE benchmark) + TARGET_LINK_LIBRARIES(qu8-gemm-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init packing) + + ADD_EXECUTABLE(qu8-requantization-bench bench/qu8-requantization.cc) + SET_TARGET_PROPERTIES(qu8-requantization-bench PROPERTIES CXX_EXTENSIONS YES) + TARGET_INCLUDE_DIRECTORIES(qu8-requantization-bench PRIVATE . include src) +- TARGET_LINK_LIBRARIES(qu8-requantization-bench PRIVATE benchmark pthreadpool) ++ TARGET_LINK_LIBRARIES(qu8-requantization-bench PRIVATE benchmark) + TARGET_LINK_LIBRARIES(qu8-requantization-bench PRIVATE bench-utils microkernels-all) + + ADD_EXECUTABLE(qu8-vadd-bench bench/qu8-vadd.cc) + TARGET_INCLUDE_DIRECTORIES(qu8-vadd-bench PRIVATE . include src) +- TARGET_LINK_LIBRARIES(qu8-vadd-bench PRIVATE benchmark pthreadpool) ++ TARGET_LINK_LIBRARIES(qu8-vadd-bench PRIVATE benchmark) + TARGET_LINK_LIBRARIES(qu8-vadd-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init) + + ADD_EXECUTABLE(qu8-vaddc-bench bench/qu8-vaddc.cc) + TARGET_INCLUDE_DIRECTORIES(qu8-vaddc-bench PRIVATE . include src) +- TARGET_LINK_LIBRARIES(qu8-vaddc-bench PRIVATE benchmark pthreadpool) ++ TARGET_LINK_LIBRARIES(qu8-vaddc-bench PRIVATE benchmark) + TARGET_LINK_LIBRARIES(qu8-vaddc-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init) + + ADD_EXECUTABLE(qu8-vcvt-bench bench/qu8-vcvt.cc) + TARGET_INCLUDE_DIRECTORIES(qu8-vcvt-bench PRIVATE . include src) +- TARGET_LINK_LIBRARIES(qu8-vcvt-bench PRIVATE benchmark pthreadpool) ++ TARGET_LINK_LIBRARIES(qu8-vcvt-bench PRIVATE benchmark) + TARGET_LINK_LIBRARIES(qu8-vcvt-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init) + + ADD_EXECUTABLE(qu8-vlrelu-bench bench/qu8-vlrelu.cc) + TARGET_INCLUDE_DIRECTORIES(qu8-vlrelu-bench PRIVATE . include src) +- TARGET_LINK_LIBRARIES(qu8-vlrelu-bench PRIVATE benchmark pthreadpool) ++ TARGET_LINK_LIBRARIES(qu8-vlrelu-bench PRIVATE benchmark) + TARGET_LINK_LIBRARIES(qu8-vlrelu-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init) + + ADD_EXECUTABLE(qu8-vmul-bench bench/qu8-vmul.cc) + TARGET_INCLUDE_DIRECTORIES(qu8-vmul-bench PRIVATE . include src) +- TARGET_LINK_LIBRARIES(qu8-vmul-bench PRIVATE benchmark pthreadpool) ++ TARGET_LINK_LIBRARIES(qu8-vmul-bench PRIVATE benchmark) + TARGET_LINK_LIBRARIES(qu8-vmul-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init) + + ADD_EXECUTABLE(qu8-vmulc-bench bench/qu8-vmulc.cc) + TARGET_INCLUDE_DIRECTORIES(qu8-vmulc-bench PRIVATE . include src) +- TARGET_LINK_LIBRARIES(qu8-vmulc-bench PRIVATE benchmark pthreadpool) ++ TARGET_LINK_LIBRARIES(qu8-vmulc-bench PRIVATE benchmark) + TARGET_LINK_LIBRARIES(qu8-vmulc-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init) + + ADD_EXECUTABLE(rounding-bench bench/rounding.cc) + TARGET_INCLUDE_DIRECTORIES(rounding-bench PRIVATE . include src) +- TARGET_LINK_LIBRARIES(rounding-bench PRIVATE benchmark cpuinfo pthreadpool) ++ TARGET_LINK_LIBRARIES(rounding-bench PRIVATE benchmark cpuinfo) + TARGET_LINK_LIBRARIES(rounding-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init) + + ADD_EXECUTABLE(s16-rmaxabs-bench bench/s16-rmaxabs.cc) + TARGET_INCLUDE_DIRECTORIES(s16-rmaxabs-bench PRIVATE . include src) +- TARGET_LINK_LIBRARIES(s16-rmaxabs-bench PRIVATE benchmark pthreadpool) ++ TARGET_LINK_LIBRARIES(s16-rmaxabs-bench PRIVATE benchmark) + TARGET_LINK_LIBRARIES(s16-rmaxabs-bench PRIVATE bench-utils microkernels-all) + + ADD_EXECUTABLE(s16-window-bench bench/s16-window.cc) + TARGET_INCLUDE_DIRECTORIES(s16-window-bench PRIVATE . include src) +- TARGET_LINK_LIBRARIES(s16-window-bench PRIVATE benchmark pthreadpool) ++ TARGET_LINK_LIBRARIES(s16-window-bench PRIVATE benchmark) + TARGET_LINK_LIBRARIES(s16-window-bench PRIVATE bench-utils microkernels-all) + + ADD_EXECUTABLE(u32-filterbank-accumulate-bench bench/u32-filterbank-accumulate.cc) + TARGET_INCLUDE_DIRECTORIES(u32-filterbank-accumulate-bench PRIVATE . include src) +- TARGET_LINK_LIBRARIES(u32-filterbank-accumulate-bench PRIVATE benchmark pthreadpool) ++ TARGET_LINK_LIBRARIES(u32-filterbank-accumulate-bench PRIVATE benchmark) + TARGET_LINK_LIBRARIES(u32-filterbank-accumulate-bench PRIVATE bench-utils microkernels-all) + + ADD_EXECUTABLE(u32-filterbank-subtract-bench bench/u32-filterbank-subtract.cc) + TARGET_INCLUDE_DIRECTORIES(u32-filterbank-subtract-bench PRIVATE . include src) +- TARGET_LINK_LIBRARIES(u32-filterbank-subtract-bench PRIVATE benchmark pthreadpool) ++ TARGET_LINK_LIBRARIES(u32-filterbank-subtract-bench PRIVATE benchmark) + TARGET_LINK_LIBRARIES(u32-filterbank-subtract-bench PRIVATE bench-utils microkernels-all) + + ADD_EXECUTABLE(u32-vlog-bench bench/u32-vlog.cc) + TARGET_INCLUDE_DIRECTORIES(u32-vlog-bench PRIVATE . include src) +- TARGET_LINK_LIBRARIES(u32-vlog-bench PRIVATE benchmark pthreadpool) ++ TARGET_LINK_LIBRARIES(u32-vlog-bench PRIVATE benchmark) + TARGET_LINK_LIBRARIES(u32-vlog-bench PRIVATE bench-utils microkernels-all) + + ADD_EXECUTABLE(u64-u32-vsqrtshift-bench bench/u64-u32-vsqrtshift.cc) + TARGET_INCLUDE_DIRECTORIES(u64-u32-vsqrtshift-bench PRIVATE . include src) +- TARGET_LINK_LIBRARIES(u64-u32-vsqrtshift-bench PRIVATE benchmark pthreadpool) ++ TARGET_LINK_LIBRARIES(u64-u32-vsqrtshift-bench PRIVATE benchmark) + TARGET_LINK_LIBRARIES(u64-u32-vsqrtshift-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init) + + ADD_EXECUTABLE(i16-vlshift-bench bench/i16-vlshift.cc) + TARGET_INCLUDE_DIRECTORIES(i16-vlshift-bench PRIVATE . include src) +- TARGET_LINK_LIBRARIES(i16-vlshift-bench PRIVATE benchmark pthreadpool) ++ TARGET_LINK_LIBRARIES(i16-vlshift-bench PRIVATE benchmark) + TARGET_LINK_LIBRARIES(i16-vlshift-bench PRIVATE bench-utils microkernels-all) + + ADD_EXECUTABLE(cs16-vsquareabs-bench bench/cs16-vsquareabs.cc) + TARGET_INCLUDE_DIRECTORIES(cs16-vsquareabs-bench PRIVATE . include src) +- TARGET_LINK_LIBRARIES(cs16-vsquareabs-bench PRIVATE benchmark pthreadpool) ++ TARGET_LINK_LIBRARIES(cs16-vsquareabs-bench PRIVATE benchmark) + TARGET_LINK_LIBRARIES(cs16-vsquareabs-bench PRIVATE bench-utils microkernels-all) + + ADD_EXECUTABLE(cs16-bfly4-bench bench/cs16-bfly4.cc) + TARGET_INCLUDE_DIRECTORIES(cs16-bfly4-bench PRIVATE . include src) +- TARGET_LINK_LIBRARIES(cs16-bfly4-bench PRIVATE benchmark pthreadpool) ++ TARGET_LINK_LIBRARIES(cs16-bfly4-bench PRIVATE benchmark) + TARGET_LINK_LIBRARIES(cs16-bfly4-bench PRIVATE bench-utils microkernels-all) + + ADD_EXECUTABLE(cs16-fftr-bench bench/cs16-fftr.cc) + TARGET_INCLUDE_DIRECTORIES(cs16-fftr-bench PRIVATE . include src) +- TARGET_LINK_LIBRARIES(cs16-fftr-bench PRIVATE benchmark pthreadpool) ++ TARGET_LINK_LIBRARIES(cs16-fftr-bench PRIVATE benchmark) + TARGET_LINK_LIBRARIES(cs16-fftr-bench PRIVATE bench-utils microkernels-all) + + ADD_EXECUTABLE(xx-transpose-bench bench/xx-transpose.cc) + TARGET_INCLUDE_DIRECTORIES(xx-transpose-bench PRIVATE . include src) +- TARGET_LINK_LIBRARIES(xx-transpose-bench PRIVATE benchmark pthreadpool) ++ TARGET_LINK_LIBRARIES(xx-transpose-bench PRIVATE benchmark) + TARGET_LINK_LIBRARIES(xx-transpose-bench PRIVATE bench-utils microkernels-all) + + ADD_EXECUTABLE(x8-lut-bench bench/x8-lut.cc) + TARGET_INCLUDE_DIRECTORIES(x8-lut-bench PRIVATE . include src) +- TARGET_LINK_LIBRARIES(x8-lut-bench PRIVATE benchmark pthreadpool) ++ TARGET_LINK_LIBRARIES(x8-lut-bench PRIVATE benchmark) + TARGET_LINK_LIBRARIES(x8-lut-bench PRIVATE bench-utils microkernels-all) + + ADD_EXECUTABLE(x8-transpose-bench bench/x32-transpose.cc) + TARGET_INCLUDE_DIRECTORIES(x8-transpose-bench PRIVATE . include src) +- TARGET_LINK_LIBRARIES(x8-transpose-bench PRIVATE benchmark pthreadpool) ++ TARGET_LINK_LIBRARIES(x8-transpose-bench PRIVATE benchmark) + TARGET_LINK_LIBRARIES(x8-transpose-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init) + + ADD_EXECUTABLE(x16-transpose-bench bench/x16-transpose.cc) + TARGET_INCLUDE_DIRECTORIES(x16-transpose-bench PRIVATE . include src) +- TARGET_LINK_LIBRARIES(x16-transpose-bench PRIVATE benchmark pthreadpool) ++ TARGET_LINK_LIBRARIES(x16-transpose-bench PRIVATE benchmark) + TARGET_LINK_LIBRARIES(x16-transpose-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init) + + ADD_EXECUTABLE(x24-transpose-bench bench/x16-transpose.cc) + TARGET_INCLUDE_DIRECTORIES(x24-transpose-bench PRIVATE . include src) +- TARGET_LINK_LIBRARIES(x24-transpose-bench PRIVATE benchmark pthreadpool) ++ TARGET_LINK_LIBRARIES(x24-transpose-bench PRIVATE benchmark) + TARGET_LINK_LIBRARIES(x24-transpose-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init) + + ADD_EXECUTABLE(x32-transpose-bench bench/x32-transpose.cc) + TARGET_INCLUDE_DIRECTORIES(x32-transpose-bench PRIVATE . include src) +- TARGET_LINK_LIBRARIES(x32-transpose-bench PRIVATE benchmark pthreadpool) ++ TARGET_LINK_LIBRARIES(x32-transpose-bench PRIVATE benchmark) + TARGET_LINK_LIBRARIES(x32-transpose-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init) + + ADD_EXECUTABLE(x64-transpose-bench bench/x64-transpose.cc) + TARGET_INCLUDE_DIRECTORIES(x64-transpose-bench PRIVATE . include src) +- TARGET_LINK_LIBRARIES(x64-transpose-bench PRIVATE benchmark pthreadpool) ++ TARGET_LINK_LIBRARIES(x64-transpose-bench PRIVATE benchmark) + TARGET_LINK_LIBRARIES(x64-transpose-bench PRIVATE bench-utils hardware-config logging microkernels-all microparams-init) + ENDIF() -- cgit 1.4.1 From 745edcc4c074237034b3c9176ff7b25ad370b01c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 27 Dec 2023 15:58:51 +0100 Subject: gnu: Add r-safetensors. * gnu/packages/cran.scm (r-safetensors): New variable. Change-Id: I40bcee87cdbba9776f3448a2567f94ebb1e652b9 --- gnu/packages/cran.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 453ca4c11b..49b9ed3627 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -4670,6 +4670,29 @@ calculations, cut up and filter, change key names and values, perform conditionals and comparisons, and more.") (license license:expat))) +(define-public r-safetensors + (package + (name "r-safetensors") + (version "0.1.2") + (source + (origin + (method url-fetch) + (uri (cran-uri "safetensors" version)) + (sha256 + (base32 "0xvg5y2sd7gzcal0qqgxbx8vcvmy50jm0j2ajr8iw3wyy5qpyvkp")))) + (properties `((upstream-name . "safetensors"))) + (build-system r-build-system) + (propagated-inputs (list r-cli r-jsonlite r-r6 r-rlang)) + (home-page "https://github.com/mlverse/safetensors") + (synopsis "Safetensors file format") + (description + "This package provides a file format for storing tensors that is +secure (doesn't allow for code execution), fast and simple to implement. +@code{safetensors} also enables cross language and cross frameworks +compatibility making it an ideal format for storing machine learning model +weights.") + (license license:expat))) + (define-public r-sass (package (name "r-sass") -- cgit 1.4.1 From 77204306783ef7aae8b44bcafe699cbe35fb761d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 27 Dec 2023 16:14:17 +0100 Subject: gnu: python-protobuf: Update to 3.20.2. * gnu/packages/protobuf.scm (python-protobuf): Update to 3.20.2. Change-Id: Ic7a0f199f522ebf1e62e9179b4a7e4223594299c --- gnu/packages/protobuf.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/protobuf.scm b/gnu/packages/protobuf.scm index c157eabce0..d47b67fa61 100644 --- a/gnu/packages/protobuf.scm +++ b/gnu/packages/protobuf.scm @@ -429,14 +429,14 @@ from protobuf specification files.") (define-public python-protobuf (package (name "python-protobuf") - (version "3.20.1") + (version "3.20.2") (source (origin (method url-fetch) (uri (pypi-uri "protobuf" version)) (sha256 (base32 - "1ja2vpk9nklllmsirmil2s4l7ni9yfqvbvj47zz5xx17s1k1bhxd")))) + "0l0p2lczs5iahgkhzm3298pjl49bk9iiwngkglg7ll7fkqqwlbbi")))) (build-system python-build-system) (inputs (list protobuf)) (arguments -- cgit 1.4.1 From 43c92f323e1750d2d3661b419e53c45c673501af Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 27 Dec 2023 16:13:30 +0100 Subject: gnu: Add onnx-for-torch2. * gnu/packages/machine-learning.scm (onnx-for-torch2): New variable. * gnu/packages/patches/onnx-1.13.1-use-system-googletest.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. Change-Id: I8a46b9a8096a33bcf949bc4f5d497e22902ab301 --- gnu/local.mk | 1 + gnu/packages/machine-learning.scm | 23 +++++++++ .../onnx-1.13.1-use-system-googletest.patch | 55 ++++++++++++++++++++++ 3 files changed, 79 insertions(+) create mode 100644 gnu/packages/patches/onnx-1.13.1-use-system-googletest.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index a6167ee95a..4de5603091 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1720,6 +1720,7 @@ dist_patch_DATA = \ %D%/packages/patches/online-judge-tools.patch \ %D%/packages/patches/onnx-optimizer-system-library.patch \ %D%/packages/patches/onnx-use-system-googletest.patch \ + %D%/packages/patches/onnx-1.13.1-use-system-googletest.patch \ %D%/packages/patches/onnx-shared-libraries.patch \ %D%/packages/patches/onnx-skip-model-downloads.patch \ %D%/packages/patches/openbios-aarch64-riscv64-support.patch \ diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index c27b4b394b..bef4d62163 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -1214,6 +1214,29 @@ an extensible computation graph model, as well as definitions of built-in operators and standard data types.") (license license:expat))) +(define-public onnx-for-torch2 + (package + (inherit onnx) + (name "onnx") + (version "1.13.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/onnx/onnx") + (commit (string-append "v" version)))) + (sha256 + (base32 + "16967dbq2j40diqd0s37r19llsab8q8vbxkg1ppgy0p9fpdhfhyp")) + (file-name (git-file-name name version)) + (patches (search-patches "onnx-1.13.1-use-system-googletest.patch" + "onnx-shared-libraries.patch")) + (modules '((guix build utils))) + (snippet + '(begin + (delete-file-recursively "third_party") + (substitute* "onnx/backend/test/runner/__init__.py" + (("urlretrieve\\(.*") "raise unittest.SkipTest('Skipping download')\n")))))))) + (define-public python-onnx ;; This used to be called "python-onnx" because it provided nothing but ;; Python bindings. The package now provides shared libraries and C++ diff --git a/gnu/packages/patches/onnx-1.13.1-use-system-googletest.patch b/gnu/packages/patches/onnx-1.13.1-use-system-googletest.patch new file mode 100644 index 0000000000..b6a5e5d828 --- /dev/null +++ b/gnu/packages/patches/onnx-1.13.1-use-system-googletest.patch @@ -0,0 +1,55 @@ +ONNX will build googletest from a Git checkout. Patch CMake to use our +googletest package and enable tests by default. + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0aa9fda2..a573170c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -22,7 +22,7 @@ option(BUILD_ONNX_PYTHON "Build Python binaries" OFF) + option(ONNX_GEN_PB_TYPE_STUBS "Generate protobuf python type stubs" ON) + option(ONNX_WERROR "Build with Werror" OFF) + option(ONNX_COVERAGE "Build with coverage instrumentation" OFF) +-option(ONNX_BUILD_TESTS "Build ONNX C++ APIs Tests" OFF) ++option(ONNX_BUILD_TESTS "Build ONNX C++ APIs Tests" ON) + option(ONNX_USE_LITE_PROTO "Use lite protobuf instead of full." OFF) + option(ONNXIFI_ENABLE_EXT "Enable onnxifi extensions." OFF) + if(NOT DEFINED ONNX_ML) +@@ -82,8 +82,10 @@ if(CMAKE_SYSTEM_NAME STREQUAL "AIX") + endif() + + if(ONNX_BUILD_TESTS) +- list(APPEND CMAKE_MODULE_PATH ${ONNX_ROOT}/cmake/external) +- include(googletest) ++ find_package(GTest REQUIRED) ++ if(NOT GTest_FOUND) ++ message(FATAL_ERROR "cannot find googletest") ++ endif() + endif() + + if((ONNX_USE_LITE_PROTO AND TARGET protobuf::libprotobuf-lite) OR ((NOT ONNX_USE_LITE_PROTO) AND TARGET protobuf::libprotobuf)) +diff --git a/cmake/unittest.cmake b/cmake/unittest.cmake +index e29a93ff..ae146390 100644 +--- a/cmake/unittest.cmake ++++ b/cmake/unittest.cmake +@@ -7,7 +7,7 @@ + + find_package(Threads) + +-set(${UT_NAME}_libs ${googletest_STATIC_LIBRARIES}) ++set(${UT_NAME}_libs ${GTEST_LIBRARIES}) + + list(APPEND ${UT_NAME}_libs onnx) + list(APPEND ${UT_NAME}_libs onnx_proto) +@@ -22,9 +22,9 @@ + list(REMOVE_DUPLICATES _UT_SOURCES) + + add_executable(${_UT_TARGET} ${_UT_SOURCES}) +- add_dependencies(${_UT_TARGET} onnx onnx_proto googletest) ++ add_dependencies(${_UT_TARGET} onnx onnx_proto) + + target_include_directories(${_UT_TARGET} +- PUBLIC ${googletest_INCLUDE_DIRS} ++ PUBLIC ${GTEST_INCLUDE_DIRS} + ${ONNX_INCLUDE_DIRS} + ${PROTOBUF_INCLUDE_DIRS} + ${ONNX_ROOT} \ No newline at end of file -- cgit 1.4.1 From 6055bb3163414f84c818926e1573a7cc17669bc5 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 27 Dec 2023 23:27:12 +0100 Subject: gnu: Add onnx-optimizer-for-torch2. * gnu/packages/machine-learning.scm (onnx-optimizer-for-torch2): New variable. Change-Id: Icf48cba3f0a30f171b6f01cd033dd135a078ba1a --- gnu/packages/machine-learning.scm | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index bef4d62163..6455fcc024 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -1282,6 +1282,13 @@ aim is to provide all such passes along with ONNX so that they can be re-used with a single function call.") (license license:expat))) +(define-public onnx-optimizer-for-torch2 + (package + (inherit onnx-optimizer) + (inputs + (modify-inputs (package-inputs onnx-optimizer) + (replace "onnx" onnx-for-torch2))))) + (define-public rxcpp (package (name "rxcpp") -- cgit 1.4.1 From 1e5faccecd6bdb24cc6b23221dc3080c5bc00699 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 27 Dec 2023 23:32:21 +0100 Subject: gnu: python-pytorch-for-r-torch: Update to 2.0.1. * gnu/packages/machine-learning.scm (python-pytorch-for-r-torch): Update to 2.0.1. * gnu/packages/patches/python-pytorch2-system-libraries.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. Change-Id: I97551d543e50f6e511aa0529c097d156cf3f96de --- gnu/local.mk | 1 + gnu/packages/machine-learning.scm | 54 ++++++- .../patches/python-pytorch2-system-libraries.patch | 156 +++++++++++++++++++++ 3 files changed, 210 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/python-pytorch2-system-libraries.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 4de5603091..264b186f41 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1777,6 +1777,7 @@ dist_patch_DATA = \ %D%/packages/patches/python-random2-getrandbits-test.patch \ %D%/packages/patches/python-poppler-qt5-fix-build.patch \ %D%/packages/patches/python-pypdf-annotate-tests-appropriately.patch \ + %D%/packages/patches/python-pytorch2-system-libraries.patch \ %D%/packages/patches/python-sip-include-dirs.patch \ %D%/packages/patches/python-sgmllib3k-assertions.patch \ %D%/packages/patches/python-sphinx-prompt-docutils-0.19.patch \ diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 6455fcc024..3ddd56f69b 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -4085,7 +4085,59 @@ PyTorch when needed. Note: currently this package does not provide GPU support.") (license license:bsd-3))) -(define-public python-pytorch-for-r-torch python-pytorch) +(define-public python-pytorch-for-r-torch + (package + (inherit python-pytorch) + (name "python-pytorch") + (version "2.0.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/pytorch/pytorch") + (commit (string-append "v" version)) + (recursive? #t))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "14m7v54zyd2qg2xk9mqdpbf4ps7091mdzinzh4vq9p5k4bpznj65")) + (patches (search-patches "python-pytorch2-system-libraries.patch" + "python-pytorch-runpath.patch")) + (modules '((guix build utils))) + (snippet + '(begin + ;; XXX: Let's be clear: this package is a bundling fest. We + ;; delete as much as we can, but there's still a lot left. + (for-each (lambda (directory) + (delete-file-recursively + (string-append "third_party/" directory))) + '("benchmark" "cpuinfo" "eigen" + + ;; FIXME: QNNPACK (of which XNNPACK is a fork) + ;; needs these. + ;; "FP16" "FXdiv" "gemmlowp" "psimd" + + "gloo" "googletest" "ios-cmake" "NNPACK" + "onnx" "protobuf" "pthreadpool" + "pybind11" "python-enum" "python-peachpy" + "python-six" "tbb" "XNNPACK" "zstd")) + (substitute* "caffe2/CMakeLists.txt" + (("target_link_libraries\\(\\$\\{test_name\\}_\\$\\{CPU_CAPABILITY\\} c10 sleef gtest_main\\)") + "target_link_libraries(${test_name}_${CPU_CAPABILITY} c10 sleef gtest gtest_main)")) + (substitute* "functorch/CMakeLists.txt" + (("\\$\\{_rpath_portable_origin\\}/../torch/lib") + "$ORIGIN/../torch/lib")))))) + (inputs + (modify-inputs (package-inputs python-pytorch) + (replace "xnnpack" xnnpack-for-torch2))) + (propagated-inputs + (modify-inputs (package-propagated-inputs python-pytorch) + (append python-filelock + python-jinja2 + python-networkx + python-opt-einsum + python-sympy) + (replace "onnx" onnx-for-torch2) + (replace "onnx-optimizer" onnx-optimizer-for-torch2))))) (define-public python-lightning-cloud (package diff --git a/gnu/packages/patches/python-pytorch2-system-libraries.patch b/gnu/packages/patches/python-pytorch2-system-libraries.patch new file mode 100644 index 0000000000..c2c44badbb --- /dev/null +++ b/gnu/packages/patches/python-pytorch2-system-libraries.patch @@ -0,0 +1,156 @@ +Use our own googletest rather than the bundled one. +Get NNPACK to use our own PeachPy rather than the bundled one. + +diff --git a/caffe2/CMakeLists.txt b/caffe2/CMakeLists.txt +--- a/caffe2/CMakeLists.txt 2023-12-27 12:14:24.308751288 +0100 ++++ b/caffe2/CMakeLists.txt 2023-12-27 12:30:15.941562126 +0100 +@@ -1570,7 +1570,7 @@ + add_executable(static_runtime_bench "${STATIC_RUNTIME_BENCHMARK_SRCS}") + add_executable(static_runtime_test "${STATIC_RUNTIME_TEST_SRCS}") + target_link_libraries(static_runtime_bench torch_library benchmark) +- target_link_libraries(static_runtime_test torch_library gtest_main) ++ target_link_libraries(static_runtime_test torch_library gtest_main gtest) + endif() + + if(BUILD_TENSOREXPR_BENCHMARK) +@@ -1601,7 +1601,7 @@ + foreach(test_src ${ATen_MOBILE_TEST_SRCS}) + get_filename_component(test_name ${test_src} NAME_WE) + add_executable(${test_name} "${test_src}") +- target_link_libraries(${test_name} torch_library gtest_main) ++ target_link_libraries(${test_name} torch_library gtest_main gtest) + target_include_directories(${test_name} PRIVATE $) + target_include_directories(${test_name} PRIVATE $) + target_include_directories(${test_name} PRIVATE ${ATen_CPU_INCLUDE}) +@@ -1628,7 +1628,7 @@ + endif() + else() + add_executable(${test_name}_${CPU_CAPABILITY} "${test_src}") +- target_link_libraries(${test_name}_${CPU_CAPABILITY} torch_library gtest_main) ++ target_link_libraries(${test_name}_${CPU_CAPABILITY} torch_library gtest_main gtest) + endif() + target_include_directories(${test_name}_${CPU_CAPABILITY} PRIVATE $) + target_include_directories(${test_name}_${CPU_CAPABILITY} PRIVATE $) +@@ -1645,7 +1645,7 @@ + foreach(test_src ${Caffe2_CPU_TEST_SRCS}) + get_filename_component(test_name ${test_src} NAME_WE) + add_executable(${test_name} "${test_src}") +- target_link_libraries(${test_name} torch_library gtest_main) ++ target_link_libraries(${test_name} torch_library gtest_main gtest) + target_include_directories(${test_name} PRIVATE $) + target_include_directories(${test_name} PRIVATE $) + target_include_directories(${test_name} PRIVATE ${Caffe2_CPU_INCLUDE}) +@@ -1666,7 +1666,7 @@ + foreach(test_src ${Caffe2_MPS_TEST_SRCS}) + get_filename_component(test_name ${test_src} NAME_WE) + add_executable(${test_name} "${test_src}") +- target_link_libraries(${test_name} torch_library gtest_main) ++ target_link_libraries(${test_name} torch_library gtest_main gtest) + target_include_directories(${test_name} PRIVATE $) + target_include_directories(${test_name} PRIVATE $) + target_include_directories(${test_name} PRIVATE ${Caffe2_CPU_INCLUDE}) +diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake +index 557ab649..ee9cf410 100644 +--- a/cmake/Dependencies.cmake ++++ b/cmake/Dependencies.cmake +@@ -732,11 +732,6 @@ if(BUILD_TEST OR BUILD_MOBILE_BENCHMARK OR BUILD_MOBILE_TEST) + # this shouldn't be necessary anymore. + get_property(INC_DIR_temp DIRECTORY PROPERTY INCLUDE_DIRECTORIES) + set_property(DIRECTORY PROPERTY INCLUDE_DIRECTORIES "") +- add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/../third_party/googletest) +- set_property(DIRECTORY PROPERTY INCLUDE_DIRECTORIES ${INC_DIR_temp}) +- +- include_directories(BEFORE SYSTEM ${CMAKE_CURRENT_LIST_DIR}/../third_party/googletest/googletest/include) +- include_directories(BEFORE SYSTEM ${CMAKE_CURRENT_LIST_DIR}/../third_party/googletest/googlemock/include) + + # We will not need to test benchmark lib itself. + set(BENCHMARK_ENABLE_TESTING OFF CACHE BOOL "Disable benchmark testing as we don't need it.") +@@ -1543,7 +1538,7 @@ if(CAFFE2_CMAKE_BUILDING_WITH_MAIN_REPO AND NOT INTERN_DISABLE_ONNX) + endif() + set_property(TARGET onnx_proto PROPERTY IMPORTED_LOCATION ${ONNX_PROTO_LIBRARY}) + message("-- Found onnx: ${ONNX_LIBRARY} ${ONNX_PROTO_LIBRARY}") +- list(APPEND Caffe2_DEPENDENCY_LIBS onnx_proto onnx) ++ list(APPEND Caffe2_DEPENDENCY_LIBS onnx_proto onnx onnx_optimizer) + endif() + include_directories(${FOXI_INCLUDE_DIRS}) + list(APPEND Caffe2_DEPENDENCY_LIBS foxi_loader) +diff --git a/cmake/External/nnpack.cmake b/cmake/External/nnpack.cmake +index a41343cb..6075bdd0 100644 +--- a/cmake/External/nnpack.cmake ++++ b/cmake/External/nnpack.cmake +@@ -40,7 +40,7 @@ endif() + # (3) Android, iOS, Linux, macOS - supported + ############################################################################## + +-if(ANDROID OR IOS OR ${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR ${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") ++if(FALSE) + message(STATUS "Brace yourself, we are building NNPACK") + set(CAFFE2_THIRD_PARTY_ROOT ${PROJECT_SOURCE_DIR}/third_party) + +@@ -114,6 +114,5 @@ endif() + # (4) Catch-all: not supported. + ############################################################################## + +-message(WARNING "Unknown platform - I don't know how to build NNPACK. " +- "See cmake/External/nnpack.cmake for details.") +-set(USE_NNPACK OFF) ++set(NNPACK_FOUND TRUE) ++set(USE_NNPACK ON) +diff --git a/test/cpp/c10d/CMakeLists.txt b/test/cpp/c10d/CMakeLists.txt +index bf91460c..ef56948f 100644 +--- a/test/cpp/c10d/CMakeLists.txt ++++ b/test/cpp/c10d/CMakeLists.txt +@@ -16,14 +16,14 @@ function(c10d_add_test test_src) + add_test(NAME ${test_name} COMMAND $) + endfunction() + +-c10d_add_test(FileStoreTest.cpp torch_cpu gtest_main) +-c10d_add_test(TCPStoreTest.cpp torch_cpu gtest_main) ++c10d_add_test(FileStoreTest.cpp torch_cpu gtest_main gtest) ++c10d_add_test(TCPStoreTest.cpp torch_cpu gtest_main gtest) + if(INSTALL_TEST) + install(TARGETS FileStoreTest DESTINATION bin) + install(TARGETS TCPStoreTest DESTINATION bin) + endif() + if(NOT WIN32) +- c10d_add_test(HashStoreTest.cpp torch_cpu gtest_main) ++ c10d_add_test(HashStoreTest.cpp torch_cpu gtest_main gtest) + if(INSTALL_TEST) + install(TARGETS HashStoreTest DESTINATION bin) + endif() +@@ -31,11 +31,11 @@ endif() + + if(USE_CUDA) + if(USE_GLOO AND USE_C10D_GLOO) +- c10d_add_test(ProcessGroupGlooTest.cpp torch_cpu c10d_cuda_test gtest_main) ++ c10d_add_test(ProcessGroupGlooTest.cpp torch_cpu c10d_cuda_test gtest_main gtest) + if(INSTALL_TEST) + install(TARGETS ProcessGroupGlooTest DESTINATION bin) + endif() +- c10d_add_test(ProcessGroupGlooAsyncTest.cpp torch_cpu c10d_cuda_test gtest_main) ++ c10d_add_test(ProcessGroupGlooAsyncTest.cpp torch_cpu c10d_cuda_test gtest_main gtest) + endif() + if(USE_NCCL AND USE_C10D_NCCL) + # NCCL is a private dependency of libtorch, but the tests include some +@@ -56,7 +56,7 @@ if(USE_CUDA) + endif() + else() + if(USE_GLOO AND USE_C10D_GLOO) +- c10d_add_test(ProcessGroupGlooTest.cpp torch_cpu gtest_main) ++ c10d_add_test(ProcessGroupGlooTest.cpp torch_cpu gtest_main gtest) + endif() + endif() + +diff --git a/test/cpp/tensorexpr/CMakeLists.txt b/test/cpp/tensorexpr/CMakeLists.txt +index 8fc5a0a1..643202f6 100644 +--- a/test/cpp/tensorexpr/CMakeLists.txt ++++ b/test/cpp/tensorexpr/CMakeLists.txt +@@ -53,7 +53,7 @@ target_include_directories(tutorial_tensorexpr PRIVATE ${ATen_CPU_INCLUDE}) + # pthreadpool header. For some build environment we need add the dependency + # explicitly. + if(USE_PTHREADPOOL) +- target_link_libraries(test_tensorexpr PRIVATE pthreadpool_interface) ++ target_link_libraries(test_tensorexpr PRIVATE pthreadpool) + endif() + if(USE_CUDA) + target_link_libraries(test_tensorexpr PRIVATE -- cgit 1.4.1 From 5a5a5cf31d20c0314d903a38a2c40bfd99f2383e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 28 Dec 2023 00:04:56 +0100 Subject: gnu: liblantern: Update to 0.11.0-1.4d83bd0. * gnu/packages/machine-learning.scm (liblantern): Update to 0.11.0-1.4d83bd0. Change-Id: I04ac3d64df8ec3b4ba628886640020a24361f4e3 --- gnu/packages/machine-learning.scm | 132 ++++++++++++++++++++------------------ 1 file changed, 68 insertions(+), 64 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 3ddd56f69b..14fc2a0a72 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -4550,70 +4550,74 @@ of Hidden Markov Models.") ;; Keep this in sync with the r-torch package. (define-public liblantern - (package - (name "liblantern") - (version "0.10.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/mlverse/torch") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "12480fac9xq7rgw0q5f2cnvmakhakjsnq1gvh2ncjfwxz34n8fl7")))) - (build-system cmake-build-system) - (arguments - (list - #:tests? #false ;no test target - #:phases - (let ((python-version (version-major+minor (package-version python)))) - #~(modify-phases %standard-phases - (add-after 'unpack 'chdir - (lambda _ (chdir "src/lantern"))) - (add-after 'chdir 'do-not-download-binaries - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "CMakeLists.txt" - (("find_package\\(Torch.*") "set(TORCH_CXX_FLAGS \"-ltorch\")\n") - (("retrieve_lib\\(.*") "")) - (let ((site-packages (string-append "/lib/python" - #$python-version - "/site-packages"))) - (setenv "LIBRARY_PATH" - (string-append - (search-input-directory - inputs (string-append site-packages "/torch/lib")) - ":" (or (getenv "LIBRARY_PATH") ""))) - (setenv "CPLUS_INCLUDE_PATH" - (string-append - (search-input-directory - inputs (string-append - site-packages "/torch/include/torch/csrc/api/include/")) - ":" - (search-input-directory - inputs (string-append site-packages "/torch/include/")) - ":" - (or (getenv "CPLUS_INCLUDE_PATH") ""))) - (setenv "C_INCLUDE_PATH" - (string-append - (search-input-directory - inputs (string-append site-packages "/torch/include/")) - ":" - (or (getenv "C_INCLUDE_PATH") "")))))) - (replace 'install - (lambda _ - (install-file - "../build/liblantern.so" - (string-append #$output "/lib")) - (copy-recursively - "../lantern/include" - (string-append #$output "/include")))))))) - (inputs (list python-pytorch-for-r-torch)) - (home-page "https://github.com/mlverse/torch/") - (synopsis "C API to libtorch") - (description - "Lantern provides a C API to the libtorch machine learning library.") - (license license:expat))) + ;; There has been no release or tagged commit for r-torch 0.12.0. The + ;; selected commit corresponds to the 0.12.0 release. + (let ((commit "4d83bd087be581f7db321c27f55897ff021d2537") + (revision "1")) + (package + (name "liblantern") + (version (git-version "0.11.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mlverse/torch") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1xxc6vr7sr2mg0va0hc2fs4f6v5b78mx43dp2shzzbcgw90mgpvk")))) + (build-system cmake-build-system) + (arguments + (list + #:tests? #false ;no test target + #:phases + (let ((python-version (version-major+minor (package-version python)))) + #~(modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ (chdir "src/lantern"))) + (add-after 'chdir 'do-not-download-binaries + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "CMakeLists.txt" + (("find_package\\(Torch.*") "set(TORCH_CXX_FLAGS \"-ltorch\")\n") + (("retrieve_lib\\(.*") "")) + (let ((site-packages (string-append "/lib/python" + #$python-version + "/site-packages"))) + (setenv "LIBRARY_PATH" + (string-append + (search-input-directory + inputs (string-append site-packages "/torch/lib")) + ":" (or (getenv "LIBRARY_PATH") ""))) + (setenv "CPLUS_INCLUDE_PATH" + (string-append + (search-input-directory + inputs (string-append + site-packages "/torch/include/torch/csrc/api/include/")) + ":" + (search-input-directory + inputs (string-append site-packages "/torch/include/")) + ":" + (or (getenv "CPLUS_INCLUDE_PATH") ""))) + (setenv "C_INCLUDE_PATH" + (string-append + (search-input-directory + inputs (string-append site-packages "/torch/include/")) + ":" + (or (getenv "C_INCLUDE_PATH") "")))))) + (replace 'install + (lambda _ + (install-file + "../build/liblantern.so" + (string-append #$output "/lib")) + (copy-recursively + "../lantern/include" + (string-append #$output "/include")))))))) + (inputs (list python-pytorch-for-r-torch)) + (home-page "https://github.com/mlverse/torch/") + (synopsis "C API to libtorch") + (description + "Lantern provides a C API to the libtorch machine learning library.") + (license license:expat)))) (define-public python-lap (package -- cgit 1.4.1 From 54c2ed9e2e1cde58644a650a02532df74f8eae77 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 28 Dec 2023 00:05:59 +0100 Subject: gnu: r-torch: Update to 0.12.0. * gnu/packages/cran.scm (r-torch): Update to 0.12.0. [propagated-inputs]: Add r-jsonlite and r-safetensors. Change-Id: I7d35b494640159975485846416e03630c7cd451f --- gnu/packages/cran.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 49b9ed3627..9ced81af4d 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -29846,13 +29846,13 @@ Visualizations are also available for most of these settings.") (define-public r-torch (package (name "r-torch") - (version "0.11.0") + (version "0.12.0") (source (origin (method url-fetch) (uri (cran-uri "torch" version)) (sha256 - (base32 "04hvr3f4rgnxxc42fiv58kpyld4aagj6ambhw769v3bfz7s2v879")))) + (base32 "024c8szg3xa2zrl5406jx3bmazbjwp2f07ja7m61ja0dr3z7lvbq")))) (properties `((upstream-name . "torch"))) (build-system r-build-system) (arguments @@ -29886,10 +29886,12 @@ Visualizations are also available for most of these settings.") r-desc r-ellipsis r-glue + r-jsonlite r-magrittr r-r6 r-rcpp r-rlang + r-safetensors r-withr)) (native-inputs (list r-knitr)) (home-page "https://torch.mlverse.org/docs") -- cgit 1.4.1 From ffa5bec66447bff94e8f34c10987276cd289724e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 28 Dec 2023 00:25:33 +0100 Subject: gnu: r-shiny: Update to 1.8.0. * gnu/packages/cran.scm (r-shiny): Update to 1.8.0. [arguments]: Do not use quasiquote for argument list. Change-Id: Id36b3168a13a254e26cda30d7eaa45874d40c4e3 --- gnu/packages/cran.scm | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 9ced81af4d..916113503b 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -4845,7 +4845,7 @@ previewing themes in real time.") (define-public r-shiny (package (name "r-shiny") - (version "1.7.4") + (version "1.8.0") (source (origin (method git-fetch) @@ -4855,7 +4855,7 @@ previewing themes in real time.") (file-name (git-file-name name version)) (sha256 (base32 - "0297sbrc7wfj0qfn63yrgs4xkxaxp95ppipdp9pqjg5qhm9k5wbi")) + "0rfrch2147yhp2vkr3198gn1ww00ckzcw4i6rywfl38c6fdw9vr1")) (snippet '(for-each delete-file '("inst/www/shared/bootstrap/js/bootstrap.min.js" @@ -4874,14 +4874,16 @@ previewing themes in real time.") "inst/www/shared/strftime/strftime-min.js"))))) (build-system r-build-system) (arguments - `(#:modules ((guix build r-build-system) + (list + #:modules '((guix build r-build-system) (guix build minify-build-system) (guix build utils) (ice-9 match)) - #:imported-modules (,@%r-build-system-modules - (guix build minify-build-system)) - #:phases - (modify-phases (@ (guix build r-build-system) %standard-phases) + #:imported-modules + `(,@%r-build-system-modules + (guix build minify-build-system)) + #:phases + '(modify-phases (@ (guix build r-build-system) %standard-phases) (add-after 'unpack 'replace-bundled-minified-JavaScript (lambda* (#:key inputs #:allow-other-keys) (let ((replace-file (lambda (old new) -- cgit 1.4.1 From 8c7904e424e985ed8f883d55b55a976bbaf680a8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 28 Dec 2023 00:29:00 +0100 Subject: gnu: r-radiant-data: Update to 1.6.3. * gnu/packages/cran.scm (r-radiant-data): Update to 1.6.3. [source]: Do not delete help files, because they are now under CC-BY-SA. [arguments]: Simplify by using minify-build-system. Change-Id: Ic4a2bdd3a8df9f27d703505eaeba080e28982c80 --- gnu/packages/cran.scm | 41 ++++++++++++++++------------------------- 1 file changed, 16 insertions(+), 25 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 916113503b..9d096b35a3 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -11627,44 +11627,35 @@ local smoothers and many more.") (define-public r-radiant-data (package (name "r-radiant-data") - (version "1.6.2") + (version "1.6.3") (source (origin (method url-fetch) (uri (cran-uri "radiant.data" version)) (sha256 (base32 - "0227ry366v9kmksa4vyjmhix0jbl894gdc6gckg209wna35fn20p")) + "1nwiw5dps0030f893gs0fixis6xigfr8y8rqhi3l505yx2bsrjbj")) (modules '((guix build utils))) (snippet - '(begin - ;; Delete files that are under CC-NC-SA. - (delete-file-recursively "inst/app/tools/help") - (delete-file "inst/assets/html2canvas/html2canvas.min.js"))))) + '(delete-file "inst/assets/html2canvas/html2canvas.min.js")))) (properties `((upstream-name . "radiant.data"))) (build-system r-build-system) (arguments (list - #:modules '((guix build utils) - (guix build r-build-system) - (srfi srfi-1)) + #:modules + '((guix build r-build-system) + (guix build minify-build-system) + (guix build utils)) + #:imported-modules + `(,@%r-build-system-modules + (guix build minify-build-system)) #:phases - '(modify-phases %standard-phases - (add-after 'unpack 'process-javascript - (lambda* (#:key inputs #:allow-other-keys) - (with-directory-excursion "inst/assets/html2canvas/" - (call-with-values - (lambda () - (unzip2 - `((,(assoc-ref inputs "_") - "html2canvas.min.js")))) - (lambda (sources targets) - (for-each (lambda (source target) - (format #true "Processing ~a --> ~a~%" - source target) - (invoke "esbuild" source "--minify" - (string-append "--outfile=" target))) - sources targets))))))))) + #~(modify-phases (@ (guix build r-build-system) %standard-phases) + (add-after 'unpack 'process-javascript + (lambda* (#:key inputs #:allow-other-keys) + (with-directory-excursion "inst/assets/html2canvas/" + (minify (assoc-ref inputs "_") + #:target "html2canvas.min.js"))))))) (propagated-inputs (list r-arrow r-base64enc -- cgit 1.4.1 From 2b08c05bffbbd71106b76eec32cc016d5f9eee33 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 28 Dec 2023 00:31:20 +0100 Subject: gnu: r-diversitree: Update to 0.10-0. * gnu/packages/cran.scm (r-diversitree): Update to 0.10-0. [native-inputs]: Remove gfortran. Change-Id: Ie54ba8374d85b66d712d2c50d7ad1f05edc01b75 --- gnu/packages/cran.scm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 9d096b35a3..75a8fb49e3 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -36594,17 +36594,15 @@ Maximum Parsimony, distance methods and Hadamard conjugation.") (define-public r-diversitree (package (name "r-diversitree") - (version "0.9-20") + (version "0.10-0") (source (origin (method url-fetch) (uri (cran-uri "diversitree" version)) (sha256 (base32 - "0lm098ysk6np4dy1cifbhd85jd1f1iz4bqhgzlcx7x8qnhh3zc1c")))) + "1xl2swbmgpni2y2divl29xh702b88kxgcswa47g62ny59gh2fdn1")))) (build-system r-build-system) - (native-inputs - (list gfortran)) (inputs (list fftw gsl)) (propagated-inputs (list r-ape r-desolve r-rcpp r-subplex)) -- cgit 1.4.1 From 4ea4101d6606dfd098f6bf4dfce5d5a09756fb8f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 28 Dec 2023 00:33:16 +0100 Subject: gnu: r-ggvenndiagram: Update to 1.4.9. * gnu/packages/cran.scm (r-ggvenndiagram): Update to 1.4.9. [propagated-inputs]: Add r-aplot, r-forcats, and r-tidyr; remove r-magrittr, r-plotly, r-purrr, r-rvenn, r-sf, and r-yulab-utils. Change-Id: I7e1f701e893aff8d75fa9de46d4f451cfa98f820 --- gnu/packages/cran.scm | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 75a8fb49e3..a20be1159b 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -2390,26 +2390,23 @@ scale-sensitive information.") (define-public r-ggvenndiagram (package (name "r-ggvenndiagram") - (version "1.2.3") + (version "1.4.9") (source (origin (method url-fetch) (uri (cran-uri "ggVennDiagram" version)) (sha256 (base32 - "083qr0qd3333qmr42v9k0r0sq5842cca83p87h5gikk8v1vljv7j")))) + "1nf4prkpciy1q1ix7chy0ymk5d3dlxxb53c29pg6yjp3py0hiw2h")))) (properties `((upstream-name . "ggVennDiagram"))) (build-system r-build-system) (propagated-inputs - (list r-dplyr + (list r-aplot + r-dplyr + r-forcats r-ggplot2 - r-magrittr - r-plotly - r-purrr - r-rvenn - r-sf r-tibble - r-yulab-utils)) + r-tidyr)) (native-inputs (list r-knitr)) (home-page "https://github.com/gaospecial/ggVennDiagram") (synopsis "Implementention of the Venn diagram using ggplot2") -- cgit 1.4.1 From 6d564299c6f01a98f41ed5ecfde895f412dde3fa Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 28 Dec 2023 00:44:27 +0100 Subject: gnu: r-aod: Update to 1.3.3. * gnu/packages/cran.scm (r-aod): Update to 1.3.3. Change-Id: Ifcf95c006c6adc76197cba6ab8dbb8234bf5c1cd --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index a20be1159b..be6e0a3c6f 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -171,13 +171,13 @@ kinematics to varying flight conditions.") (define-public r-aod (package (name "r-aod") - (version "1.3.2") + (version "1.3.3") (source (origin (method url-fetch) (uri (cran-uri "aod" version)) (sha256 - (base32 "0p2i536s0aa54rah1l465g77k2ldn6jm6s25y9vc06mk29xvx1cv")))) + (base32 "0zh8sjzbsq3sjzayv8wa0n1vh654g47xkxklgzxcsy3xpy55w95p")))) (properties `((upstream-name . "aod"))) (build-system r-build-system) (home-page "https://cran.r-project.org/package=aod") -- cgit 1.4.1 From 59970a9c57bc39044f9ec3841cc53e7d40be515e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 28 Dec 2023 00:44:27 +0100 Subject: gnu: r-datawizard: Update to 0.9.1. * gnu/packages/cran.scm (r-datawizard): Update to 0.9.1. Change-Id: I91de1685b889eb516204499c6e21c0fb1475ea13 --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index be6e0a3c6f..5bf8894fcf 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -571,14 +571,14 @@ etc.") (define-public r-datawizard (package (name "r-datawizard") - (version "0.9.0") + (version "0.9.1") (source (origin (method url-fetch) (uri (cran-uri "datawizard" version)) (sha256 (base32 - "1w1d18ssd6nbwg2r9gs0779wf33vpl8xivlc79ci5mi4db2m7zsd")))) + "0d01akddrbvdf16rvws3fh4pjl64myxn7is4qv2szm7hp6wjb4p5")))) (properties `((upstream-name . "datawizard"))) (build-system r-build-system) (propagated-inputs -- cgit 1.4.1 From 27f965c7faa885507e8a74a62d8c6c8c78074c46 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 28 Dec 2023 00:44:27 +0100 Subject: gnu: r-rticles: Update to 0.26. * gnu/packages/cran.scm (r-rticles): Update to 0.26. Change-Id: I5c2c25477990a87c3b1cec7f7830cddb862d2b6a --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 5bf8894fcf..c3d39e1948 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -1612,14 +1612,14 @@ bioinformaticians to assemble complex plots for publication.") (define-public r-rticles (package (name "r-rticles") - (version "0.25") + (version "0.26") (source (origin (method url-fetch) (uri (cran-uri "rticles" version)) (sha256 (base32 - "17nggn3zrbi1nj8g8v0hq3sakjvl742vhljdnxw7h6cx3j7123xg")))) + "0v1sji223iifqmq9hakr1wcgzfca52nvmh3vbi6s6d309qc77vkk")))) (properties `((upstream-name . "rticles"))) (build-system r-build-system) (propagated-inputs -- cgit 1.4.1 From bbf076f5b21eeb61fb56311178971eba4b1dce69 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 28 Dec 2023 00:44:28 +0100 Subject: gnu: r-servr: Update to 0.28. * gnu/packages/cran.scm (r-servr): Update to 0.28. Change-Id: If6af9c2b2902039434ca858853de01bd59975ba5 --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index c3d39e1948..6060a4873f 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -4252,13 +4252,13 @@ in systems and applications.") (define-public r-servr (package (name "r-servr") - (version "0.27") + (version "0.28") (source (origin (method url-fetch) (uri (cran-uri "servr" version)) (sha256 (base32 - "1iaqah3896660d609fb6960x3mg17jak3j5akmmli0z4pdb3rhh1")))) + "10nl6aal2kr0k1j7yfpggcxpjxby6z5hhc6wb4nkqhy2w5qi6g26")))) (build-system r-build-system) (propagated-inputs (list r-httpuv r-jsonlite r-mime r-xfun)) -- cgit 1.4.1 From dcb8b43e4111babb4e677287fc75d7ec1db45db3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 28 Dec 2023 00:44:28 +0100 Subject: gnu: r-maps: Update to 3.4.2. * gnu/packages/cran.scm (r-maps): Update to 3.4.2. Change-Id: Id5063b752e807e6bbba40e52894c1a92917f8799 --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 6060a4873f..a763a14f0f 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5650,14 +5650,14 @@ and/or higher-resolution databases.") (define-public r-maps (package (name "r-maps") - (version "3.4.1.1") + (version "3.4.2") (source (origin (method url-fetch) (uri (cran-uri "maps" version)) (sha256 (base32 - "06l58919kgks9adwzgfir44q6gnx46j3c7ah9c6d4dn36xsld7fk")))) + "032b8348k8vjhwj0d58v7akjkvfpvqzfva0nl7acyy8pky47prak")))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/maps") (synopsis "Draw geographical maps") -- cgit 1.4.1 From 6ed18e6552dd3cd1a43cf958349809d9f7ffeb71 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 28 Dec 2023 00:44:28 +0100 Subject: gnu: r-gensa: Update to 1.1.12. * gnu/packages/cran.scm (r-gensa): Update to 1.1.12. Change-Id: I5be3cff03ad8edfc7f635a349f85570f9c4dfd2e --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index a763a14f0f..707d9216bc 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5715,13 +5715,13 @@ coordinates.") (define-public r-gensa (package (name "r-gensa") - (version "1.1.10.1") + (version "1.1.12") (source (origin (method url-fetch) (uri (cran-uri "GenSA" version)) (sha256 (base32 - "16wla8k6ibxy58hhn7qd02k96lc7j6skaj6g5ap6lqmm854ki4wh")))) + "0m5y0hmhcc40d9a24pz5iqw5diip7sn7bih5s01x5dvqqasnx6vk")))) (properties `((upstream-name . "GenSA"))) (build-system r-build-system) (home-page "https://cran.r-project.org/package=GenSA") -- cgit 1.4.1 From 1cef2df3ad817f3c174a4390dcc183a1c695bed2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 28 Dec 2023 00:44:28 +0100 Subject: gnu: r-bindrcpp: Update to 0.2.3. * gnu/packages/cran.scm (r-bindrcpp): Update to 0.2.3. Change-Id: I6cde68e383bb776bfe18fe82cb3075a1ceb0c4f4 --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 707d9216bc..e3ef22533a 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6463,14 +6463,14 @@ where the bound function accepts additional arguments.") (define-public r-bindrcpp (package (name "r-bindrcpp") - (version "0.2.2") + (version "0.2.3") (source (origin (method url-fetch) (uri (cran-uri "bindrcpp" version)) (sha256 (base32 - "0rz4ibjdjsxl99ff3ha79z7cnjmilx4rx58fk9kk7ld9xc4hf4s8")))) + "1yn9is89r76ay314s216whr0igych4r78kjz85amhwgfb9wawbb6")))) (build-system r-build-system) (propagated-inputs (list r-bindr r-plogr r-rcpp)) -- cgit 1.4.1 From 318dcc40e0065e0bcf519322e6df34d98164f3e4 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 28 Dec 2023 00:44:29 +0100 Subject: gnu: r-timedate: Update to 4032.109. * gnu/packages/cran.scm (r-timedate): Update to 4032.109. Change-Id: Ib9718ee4e9c35182e892c23fa5b930ab71489acd --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index e3ef22533a..01251b044e 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -8177,14 +8177,14 @@ included in this package.") (define-public r-timedate (package (name "r-timedate") - (version "4022.108") + (version "4032.109") (source (origin (method url-fetch) (uri (cran-uri "timeDate" version)) (sha256 (base32 - "1vyfpz2ac43c0s6a4j4d0xfc430mwgw3syf03xszzggnw97rp555")))) + "0n5rzi3bb1wjpqcgpxcagjy815vy8ksjzpkkjzs3333yljyl2a20")))) (properties `((upstream-name . "timeDate"))) (build-system r-build-system) (home-page "https://www.rmetrics.org") -- cgit 1.4.1 From cb71656a2a01ea4afd842fb8338fd98feafd7466 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 28 Dec 2023 00:44:29 +0100 Subject: gnu: r-psych: Update to 2.3.12. * gnu/packages/cran.scm (r-psych): Update to 2.3.12. Change-Id: I7bb3783e4df94655ab4d71bc6e14303691e39500 --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 01251b044e..2f1d87cf1f 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -8510,14 +8510,14 @@ problems as well as resampling based estimators of prediction error.") (define-public r-psych (package (name "r-psych") - (version "2.3.9") + (version "2.3.12") (source (origin (method url-fetch) (uri (cran-uri "psych" version)) (sha256 (base32 - "1c8r42yv7x1vjxz8j2hvkii6jxapffiib2s5vvlsm4hp2qffihh4")))) + "0q8qms180gxk7wlm8li3j5r8rwniqj01xfm00gkvkc8q9djcsm8p")))) (build-system r-build-system) (propagated-inputs (list r-lattice r-mnormt r-nlme)) -- cgit 1.4.1 From 2a48f00a2df0995448c822f3372c88c25f6c2210 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 28 Dec 2023 00:44:29 +0100 Subject: gnu: r-recipes: Update to 1.0.9. * gnu/packages/cran.scm (r-recipes): Update to 1.0.9. Change-Id: Ia73c9091f6d45f1690a4bfcae014e9571b317182 --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 2f1d87cf1f..435cd08a1e 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -8602,14 +8602,14 @@ provides a one-row summary of model-level statistics.") (define-public r-recipes (package (name "r-recipes") - (version "1.0.8") + (version "1.0.9") (source (origin (method url-fetch) (uri (cran-uri "recipes" version)) (sha256 (base32 - "03d0g36svzc64fa2w2kcylsw654px0xjqqrb0znra4bfncj0ilnk")))) + "146p9ij2i4rmzaa5v76lm7z8iaw5wqb47i9cqf4a0q7xsgqvf6hi")))) (build-system r-build-system) (propagated-inputs (list r-cli -- cgit 1.4.1 From 18c921aedb9d695c234d84aca5b69c6b377be65b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 28 Dec 2023 00:44:30 +0100 Subject: gnu: r-ucminf: Update to 1.2.1. * gnu/packages/cran.scm (r-ucminf): Update to 1.2.1. Change-Id: I8008943c653e2ce1c998353aeef383f5a79332b1 --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 435cd08a1e..925e6efd6b 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -8912,14 +8912,14 @@ of the text. All return names of the encodings are iconv-compatible.") (define-public r-ucminf (package (name "r-ucminf") - (version "1.2.0") + (version "1.2.1") (source (origin (method url-fetch) (uri (cran-uri "ucminf" version)) (sha256 (base32 - "1x3d3l500kyqamzfjpz4qc38d6d3sha9av3rpxz0m4dhms28zpas")))) + "10ycpzxx73div9vpzmkhy524yd47kzmpl7ajpm248clsv6ivngpd")))) (build-system r-build-system) (native-inputs (list gfortran)) (home-page "https://cran.r-project.org/web/packages/ucminf/") -- cgit 1.4.1 From 249148231f5dee71c6c2a57a1b8b956bb2856c2c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 28 Dec 2023 00:44:30 +0100 Subject: gnu: r-ggridges: Update to 0.5.5. * gnu/packages/cran.scm (r-ggridges): Update to 0.5.5. Change-Id: Ife748b75a0132b35020bfec0d58851e529aa2ebe --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 925e6efd6b..c649bcd214 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -9640,14 +9640,14 @@ plotting. a three dimensional point cloud.") (define-public r-ggridges (package (name "r-ggridges") - (version "0.5.4") + (version "0.5.5") (source (origin (method url-fetch) (uri (cran-uri "ggridges" version)) (sha256 (base32 - "0lfqx21g09s3fp74mld47qfx1nnav18xqj37griyqk406hh1rxrb")))) + "18bmbq5pd751hnw8rpvshvapg09630i2pqpwk5a3yhgz4hwa8xvm")))) (build-system r-build-system) (propagated-inputs (list r-ggplot2 r-scales r-withr)) -- cgit 1.4.1 From 53de8edf154c6a393f44795631f55c06bd1b2c26 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 28 Dec 2023 00:44:31 +0100 Subject: gnu: r-timeseries: Update to 4032.108. * gnu/packages/cran.scm (r-timeseries): Update to 4032.108. Change-Id: I9fd9ae02405dd4c25beb4da7876ac9ff1f13278c --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index c649bcd214..58a5a8786d 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -9839,13 +9839,13 @@ timeout. It can also poll several processes at once.") (define-public r-timeseries (package (name "r-timeseries") - (version "4031.107") + (version "4032.108") (source (origin (method url-fetch) (uri (cran-uri "timeSeries" version)) (sha256 (base32 - "0hmmv8ml2ryw1zkbk55f85ml664as8l0qksj9h1335zn58s6lf44")))) + "1mcx059f9hnzgcxcil7hvgp9hz7gancj4gjgpdlpa4by77nwygpd")))) (properties `((upstream-name . "timeSeries"))) (build-system r-build-system) (propagated-inputs (list r-timedate)) -- cgit 1.4.1 From 7faf9df0d2d3cc575857bd10bcec0aba9ccfc346 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 28 Dec 2023 00:44:31 +0100 Subject: gnu: r-seriation: Update to 1.5.4. * gnu/packages/cran.scm (r-seriation): Update to 1.5.4. Change-Id: I33dd04e9ef572e0731634149da3b0af0ee66929a --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 58a5a8786d..e22d56559a 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -9980,14 +9980,14 @@ Markdown documents.") (define-public r-seriation (package (name "r-seriation") - (version "1.5.3") + (version "1.5.4") (source (origin (method url-fetch) (uri (cran-uri "seriation" version)) (sha256 (base32 - "1kz1g4dy076bc72hivv26ygbvnjv3li29xxikv1mwanwap4jc2ds")))) + "17rk4674r5knfgqyik9gbz6yj42qv6h79j2prw79glc1ym99qcyj")))) (build-system r-build-system) (propagated-inputs (list r-ca -- cgit 1.4.1 From a27e4eed2d045cfe42bea37f2f88ab026332b82d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 28 Dec 2023 00:44:31 +0100 Subject: gnu: r-dofuture: Update to 1.0.1. * gnu/packages/cran.scm (r-dofuture): Update to 1.0.1. Change-Id: If6bb0ca6c3d9bc788a7166dd09b8a9e908d75870 --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index e22d56559a..a077f7957a 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -15131,14 +15131,14 @@ both to consistency and asymptotic normality.") (define-public r-dofuture (package (name "r-dofuture") - (version "1.0.0") + (version "1.0.1") (source (origin (method url-fetch) (uri (cran-uri "doFuture" version)) (sha256 (base32 - "1pxwpfmxswbsd1f2ifj9kdq9hi9q0x2wwv2kv0xq178ymmywi2sz")))) + "1avv5kv1c43gmvbh5iwxlwk7yl6prndpcgy0blkwarl3nsgcq4cm")))) (properties `((upstream-name . "doFuture"))) (build-system r-build-system) (arguments -- cgit 1.4.1 From 3039dbf453541bc8996d3ce49fd2b6f043a8389d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 28 Dec 2023 00:44:32 +0100 Subject: gnu: r-mixsqp: Update to 0.3-54. * gnu/packages/cran.scm (r-mixsqp): Update to 0.3-54. Change-Id: I92fa69bf895833f8ba6b68cbcc933c1e6cb170a0 --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index a077f7957a..d278b67938 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -15933,13 +15933,13 @@ multiple-imputation datasets.") (define-public r-mixsqp (package (name "r-mixsqp") - (version "0.3-48") + (version "0.3-54") (source (origin (method url-fetch) (uri (cran-uri "mixsqp" version)) (sha256 (base32 - "02cjg33m5iqziyy0xi11wvbm5qnlgfy51r1dbpjzyhqsrv1dfx48")))) + "13pv3mmz514kl4svxqwyk5b241dy1q52khwdc6rmh712ia8xxl7p")))) (properties `((upstream-name . "mixsqp"))) (build-system r-build-system) (propagated-inputs -- cgit 1.4.1 From b73b056abbed1b031360b8cbb1a8e23aa07bca60 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 28 Dec 2023 00:44:32 +0100 Subject: gnu: r-magick: Update to 2.8.2. * gnu/packages/cran.scm (r-magick): Update to 2.8.2. Change-Id: Ibdba20895ea4934b047ec1cc463a7edd3e46806c --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index d278b67938..c59747f4db 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -15962,14 +15962,14 @@ samples is large and the number of mixture components is not too large.") (define-public r-magick (package (name "r-magick") - (version "2.8.1") + (version "2.8.2") (source (origin (method url-fetch) (uri (cran-uri "magick" version)) (sha256 (base32 - "13j55dwvcqbyqgx0c6vj9knqrz25pc2xz19f22b2gm0p307d3z6q")))) + "15ja7f46f77a67wmzqfaxvhmvvzgb9yj92p2if5di7i61vlmnid1")))) (properties '((updater-extra-inputs . ("imagemagick")))) (build-system r-build-system) -- cgit 1.4.1 From a39df977c1827b6f05bd9d81cb10fe682f751228 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 28 Dec 2023 00:44:32 +0100 Subject: gnu: r-targets: Update to 1.4.0. * gnu/packages/cran.scm (r-targets): Update to 1.4.0. Change-Id: Id2912083268d8021e99ce58b452b87505cd14f5e --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index c59747f4db..2fb82b4151 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -16110,13 +16110,13 @@ were influenced by the drake R package by Will Landau (2018) (define-public r-targets (package (name "r-targets") - (version "1.3.2") + (version "1.4.0") (source (origin (method url-fetch) (uri (cran-uri "targets" version)) (sha256 (base32 - "0zlbq658zxflz2fk9pksbjx3r5dmay4411byl33gkp3rnynvchgh")))) + "0nbvyh1v88lz1fv09ap9p6qw4zw23f1rvmv2f01w1r17z53z7w3c")))) (properties `((upstream-name . "targets"))) (build-system r-build-system) (propagated-inputs (list r-base64url -- cgit 1.4.1 From 3e833ade110d8a3e57f3f3b979b1115804ab04d3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 28 Dec 2023 00:44:33 +0100 Subject: gnu: r-quickjsr: Update to 1.0.9. * gnu/packages/cran.scm (r-quickjsr): Update to 1.0.9. Change-Id: Ia7ce3d44b71d5d2493f2dcebbcdf55fa7a9cea98 --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 2fb82b4151..67bf7f1eb4 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -16286,13 +16286,13 @@ estimation problem.") (define-public r-quickjsr (package (name "r-quickjsr") - (version "1.0.8") + (version "1.0.9") (source (origin (method url-fetch) (uri (cran-uri "QuickJSR" version)) (sha256 (base32 - "10cyi8wja24j68wqmsphsr19h977hr6ffsxf339bfrvwdnigm5vn")))) + "12a0m57kwn2k9j5k6vl8hb10081rydpz9rczc9hccdj9ky9wiv0k")))) (properties `((upstream-name . "QuickJSR"))) (build-system r-build-system) (propagated-inputs (list r-jsonlite r-r6 r-rcpp)) -- cgit 1.4.1 From 4c7066b67365ff539736a55ab253ebb37d93664a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 28 Dec 2023 00:44:33 +0100 Subject: gnu: r-sandwich: Update to 3.1-0. * gnu/packages/cran.scm (r-sandwich): Update to 3.1-0. Change-Id: Ibe33dfa1bcdb1c8fac8f46131042d4829ac12a9e --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 67bf7f1eb4..547b6194d1 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -16447,14 +16447,14 @@ observation.") (define-public r-sandwich (package (name "r-sandwich") - (version "3.0-2") + (version "3.1-0") (source (origin (method url-fetch) (uri (cran-uri "sandwich" version)) (sha256 (base32 - "1d72vwxidsyac9mbyxrm06qds63rzcr82nn4c05466gbajsvcc3f")) + "1yi3l2q63j0vlaqqh1x3bxb0i7v6lrmmbsc6s8gilfahxq2y3c4n")) (modules '((guix build utils))) (snippet '(with-directory-excursion "inst/doc" -- cgit 1.4.1 From 24e08f8f1d31e1ef380084599d348e6551424aad Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 28 Dec 2023 00:44:33 +0100 Subject: gnu: r-emmeans: Update to 1.9.0. * gnu/packages/cran.scm (r-emmeans): Update to 1.9.0. Change-Id: I078b8023106b085716444240b6e49edafce30592 --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 547b6194d1..3ef24ae85d 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -16553,14 +16553,14 @@ the differences were not significantly different.") (define-public r-emmeans (package (name "r-emmeans") - (version "1.8.9") + (version "1.9.0") (source (origin (method url-fetch) (uri (cran-uri "emmeans" version)) (sha256 (base32 - "1ipzs88inyif52rbifqwrfv8vwxw8fwq2hb489vgws8xznhz034a")))) + "18gib8ly7kfzdbi3srczrdqvjghf7swp127ksfs1fvs9dzgkkg96")))) (build-system r-build-system) (propagated-inputs (list r-estimability r-mvtnorm r-numderiv)) -- cgit 1.4.1 From bf98450f01fcaeb23fa3321286343ba89c9d9503 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 28 Dec 2023 00:44:34 +0100 Subject: gnu: r-tmb: Update to 1.9.10. * gnu/packages/cran.scm (r-tmb): Update to 1.9.10. Change-Id: I698e60a2f79fb84452b02e9d78053621c5aa8398 --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 3ef24ae85d..7910c47088 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -16690,14 +16690,14 @@ Bayesian modeling.") (define-public r-tmb (package (name "r-tmb") - (version "1.9.9") + (version "1.9.10") (source (origin (method url-fetch) (uri (cran-uri "TMB" version)) (sha256 (base32 - "0k37xspfk9vqin63ggkm8qlki498h3k3kqg8wa9kff3y1mi8lf84")))) + "1cc34zxn2x88fbh4clgbzia36800i30pdlywbkwc26zm50nsxpwi")))) (properties `((upstream-name . "TMB"))) (build-system r-build-system) (propagated-inputs -- cgit 1.4.1 From 7e5c54a3ef3a9c38e5ed1e26bd57685fb4d60c59 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 28 Dec 2023 00:44:34 +0100 Subject: gnu: r-ggeffects: Update to 1.3.4. * gnu/packages/cran.scm (r-ggeffects): Update to 1.3.4. Change-Id: I30d18c4aef8494dc49e0149f2ca5f7276c49b840 --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 7910c47088..8fa48831ca 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -16848,14 +16848,14 @@ effects models and Bayesian models.") (define-public r-ggeffects (package (name "r-ggeffects") - (version "1.3.2") + (version "1.3.4") (source (origin (method url-fetch) (uri (cran-uri "ggeffects" version)) (sha256 (base32 - "1wp9q2zqygxg2ibmrwdh614sdxqhj80rx0ixbz8kxld99b37ixl7")))) + "0hxcal1rldi3295hy5n1nzad092gis1cxnjsbbhfrbj3z35aacbs")))) (build-system r-build-system) (propagated-inputs (list r-insight)) -- cgit 1.4.1 From 7681ab3d6dc0e59ad30388cc0a1dcb5044827852 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 28 Dec 2023 00:44:34 +0100 Subject: gnu: r-tidytree: Update to 0.4.6. * gnu/packages/cran.scm (r-tidytree): Update to 0.4.6. Change-Id: Ia2dd2b6dd74f08b3377906aa3895d3a9437983ea --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 8fa48831ca..710e03c75d 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -18791,13 +18791,13 @@ maps.") (define-public r-tidytree (package (name "r-tidytree") - (version "0.4.5") + (version "0.4.6") (source (origin (method url-fetch) (uri (cran-uri "tidytree" version)) (sha256 - (base32 "0wllr18ip4vc37pr3qni1vbn68jj6iz5gh1vxdi24438y1gqww6j")))) + (base32 "14i2v6ryqw4cd74n8kz4qwwx730wzx4f0rssg5vgm0vjfsx0kafv")))) (build-system r-build-system) (propagated-inputs (list r-ape -- cgit 1.4.1 From 73010bea3120ad098307702e4fcbfd0b5d33fdfa Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 28 Dec 2023 00:44:35 +0100 Subject: gnu: r-rnaturalearth: Update to 1.0.1. * gnu/packages/cran.scm (r-rnaturalearth): Update to 1.0.1. [propagated-inputs]: Remove r-sp. Change-Id: Iceee064560f5719ccc2fb0d3377160c1bc914ac3 --- gnu/packages/cran.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 710e03c75d..148a3c4ae0 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -19235,16 +19235,16 @@ Touzet and Varre (2007).") (define-public r-rnaturalearth (package (name "r-rnaturalearth") - (version "0.3.4") + (version "1.0.1") (source (origin (method url-fetch) (uri (cran-uri "rnaturalearth" version)) (sha256 (base32 - "1lqgv2v72jgp3xrxdwh0x644jwd2ixqjqja32r3sj9dfwnpx6b65")))) + "1vfkn4bf77mr2n7dhmnl55ma4cvwy2nazhizmdqd98w2ydl13z3p")))) (properties `((upstream-name . "rnaturalearth"))) (build-system r-build-system) - (propagated-inputs (list r-httr r-jsonlite r-sf r-sp r-terra)) + (propagated-inputs (list r-httr r-jsonlite r-sf r-terra)) (native-inputs (list r-knitr)) (home-page "https://cran.r-project.org/package=rnaturalearth") (synopsis "World map data from Natural Earth") -- cgit 1.4.1 From 709cd4f42c8ac4401e96ac55648e7dddb7466896 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 28 Dec 2023 00:44:35 +0100 Subject: gnu: r-protviz: Update to 0.7.9. * gnu/packages/cran.scm (r-protviz): Update to 0.7.9. Change-Id: I26fbd01cf6d4e5e50b3f4513193c14feea53a2b2 --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 148a3c4ae0..b00df79e00 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -20859,14 +20859,14 @@ sampling.") (define-public r-protviz (package (name "r-protviz") - (version "0.7.7") + (version "0.7.9") (source (origin (method url-fetch) (uri (cran-uri "protViz" version)) (sha256 (base32 - "18l4aw0fx47w9czw73lxh68aj4ljbfr3z39vakbbx6xp2llyw8b1")))) + "1wsjr4asjsknv8fkfv15xqnl67zfv8d2xmvw1i2l0wflxbps3af7")))) (properties `((upstream-name . "protViz"))) (build-system r-build-system) (propagated-inputs (list r-rcpp)) -- cgit 1.4.1 From 390a25d35cd98a57fc883bbe8fed9ce59d5cde63 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 28 Dec 2023 00:44:35 +0100 Subject: gnu: r-future: Update to 1.33.1. * gnu/packages/cran.scm (r-future): Update to 1.33.1. Change-Id: Ica13d8821eecd0b65fdbcb435293aa174781c93b --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index b00df79e00..6e293c1024 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -21140,14 +21140,14 @@ port-forwarding to your local computer.") (define-public r-future (package (name "r-future") - (version "1.33.0") + (version "1.33.1") (source (origin (method url-fetch) (uri (cran-uri "future" version)) (sha256 (base32 - "0nwk8y3qv2dj41qxrciic6rkpy6lzrhpd5v886zmcjyf6ndyna22")))) + "1xvb7rhwnsi7l735jfrh7ij0l6q6hazwcb2620hvfjwl2kkpk00r")))) (build-system r-build-system) (arguments `(#:phases -- cgit 1.4.1 From 413f2553dc53bf51b07f02a3c686f306e07387cb Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 28 Dec 2023 00:44:36 +0100 Subject: gnu: r-future-apply: Update to 1.11.1. * gnu/packages/cran.scm (r-future-apply): Update to 1.11.1. Change-Id: Ib50aff8c551c3eb23b2c321761a04a4173e6e161 --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 6e293c1024..41c5a5fed1 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -21175,14 +21175,14 @@ the local machine to, say, distributed processing on a remote compute cluster.") (define-public r-future-apply (package (name "r-future-apply") - (version "1.11.0") + (version "1.11.1") (source (origin (method url-fetch) (uri (cran-uri "future.apply" version)) (sha256 (base32 - "1s019gdmmv0yr8011vm23p7apznbzfw54z9nmymkxc5mp7730yri")))) + "0zf22vip8w50pywc47xjghca9wkvcsvvfaa2yfaydwwzc3ss3bh2")))) (properties `((upstream-name . "future.apply"))) (build-system r-build-system) (arguments -- cgit 1.4.1 From 6c2c12de934b77bfd56a443e66233f0524859b24 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 28 Dec 2023 00:44:36 +0100 Subject: gnu: r-tensora: Update to 0.36.2.1. * gnu/packages/cran.scm (r-tensora): Update to 0.36.2.1. Change-Id: I9d8ae1b94fd43ceb68044b944335d341b84bed70 --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 41c5a5fed1..6197f54947 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -21583,14 +21583,14 @@ Coefficient Logit Models.") (define-public r-tensora (package (name "r-tensora") - (version "0.36.2") + (version "0.36.2.1") (source (origin (method url-fetch) (uri (cran-uri "tensorA" version)) (sha256 (base32 - "19wwh654qlja4z1n7afjpzsrrm53p8ddysa2vra5mdnkddb4g2cf")))) + "1dvxc4d5c8k3mqkx6bjgfmnb98rrdd1rsazyva76mzvxzrhq4n06")))) (properties `((upstream-name . "tensorA"))) (build-system r-build-system) (home-page "http://www.stat.boogaart.de/tensorA") -- cgit 1.4.1 From 4cad958bb3b73ad73646793987c77d9483dfb4ec Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 28 Dec 2023 00:44:36 +0100 Subject: gnu: r-lavaan: Update to 0.6-17. * gnu/packages/cran.scm (r-lavaan): Update to 0.6-17. Change-Id: I1b02e94154badf23becd6c95cca13ca8188f3168 --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 6197f54947..a1a47d59ff 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -21978,14 +21978,14 @@ probabilities from a standard bivariate normal CDF.") (define-public r-lavaan (package (name "r-lavaan") - (version "0.6-16") + (version "0.6-17") (source (origin (method url-fetch) (uri (cran-uri "lavaan" version)) (sha256 (base32 - "150asz3k42ql6k2faldbbzvhnlq5zy94syznc451ns52jdrr5vqx")))) + "1bppbv17b35h48vfci6zplix9zb5isi210za52cs9yyc68g2acwj")))) (build-system r-build-system) (propagated-inputs (list r-mass r-mnormt r-numderiv r-pbivnorm r-quadprog)) -- cgit 1.4.1 From 8d01590dc28f054e2baa5cf43da02f8f3c6d2baa Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 28 Dec 2023 00:44:36 +0100 Subject: gnu: r-s2: Update to 1.1.6. * gnu/packages/cran.scm (r-s2): Update to 1.1.6. Change-Id: Ia4fec706e071401d0b2999bf94e1871898224bf4 --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index a1a47d59ff..083ab3ad56 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -22869,14 +22869,14 @@ high-performance functions are provided here.") (define-public r-s2 (package (name "r-s2") - (version "1.1.5") + (version "1.1.6") (source (origin (method url-fetch) (uri (cran-uri "s2" version)) (sha256 (base32 - "07k9j3sqlqjmcgws2x7accnd5pbqcn8n2pwbviw00sg74sz3xz1v")))) + "0rm0jd5k5w725v1bnn6ix8vic40grdh61y6qdy8jy4lhg1mjx78x")))) (properties `((upstream-name . "s2"))) (build-system r-build-system) (arguments -- cgit 1.4.1 From c774b097a85858f9c16841a722f8594277ddd894 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 28 Dec 2023 00:44:37 +0100 Subject: gnu: r-sf: Update to 1.0-15. * gnu/packages/cran.scm (r-sf): Update to 1.0-15. Change-Id: I56c17f3d492664e080e5936a6bffad1f219d6231 --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 083ab3ad56..f0e205783a 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -22910,14 +22910,14 @@ information about geometries.") (define-public r-sf (package (name "r-sf") - (version "1.0-14") + (version "1.0-15") (source (origin (method url-fetch) (uri (cran-uri "sf" version)) (sha256 (base32 - "1xrrqd91601lcd83zzwksb4ampy1j8vf8f6941csk89psm45clwb")))) + "0b9whfi709gjkzslkrkm8ki1yz5az6vrv5b1l2w712sjqy8r47f8")))) (build-system r-build-system) (inputs (list curl -- cgit 1.4.1 From eb50f38a6d8704d5332445327f4f8fd3eb5f5d58 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 28 Dec 2023 00:44:37 +0100 Subject: gnu: r-pegas: Update to 1.3. * gnu/packages/cran.scm (r-pegas): Update to 1.3. Change-Id: If0c384c10f6203eaa8c4c15c17856a89351b6830 --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index f0e205783a..101323df45 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -23055,13 +23055,13 @@ also provided to illustrate various methods.") (define-public r-pegas (package (name "r-pegas") - (version "1.2") + (version "1.3") (source (origin (method url-fetch) (uri (cran-uri "pegas" version)) (sha256 - (base32 "0mdd6wwbgln7272am9pk3p5garmkkf3j76lli4hnxsh9gj9z6fcx")))) + (base32 "1j1xrnwi80ycwziwcsb48sfdm2ifdzgsn8clh0ai7rvhknrb4ghh")))) (build-system r-build-system) (propagated-inputs (list r-ape)) -- cgit 1.4.1 From 5709ad0046f729011982e15b1b613523453c9833 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 28 Dec 2023 00:44:37 +0100 Subject: gnu: r-haplo-stats: Update to 1.9.5. * gnu/packages/cran.scm (r-haplo-stats): Update to 1.9.5. Change-Id: Ic7e9c54242a0112de0b110e1b2c3c30288dd135a --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 101323df45..9c713e7890 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -23260,14 +23260,14 @@ include (define-public r-haplo-stats (package (name "r-haplo-stats") - (version "1.9.3") + (version "1.9.5") (source (origin (method url-fetch) (uri (cran-uri "haplo.stats" version)) (sha256 (base32 - "1nwxmx3v0085bdr14sr1n4wpipyp1bdq9qhx2gxmx9h3l02glkis")))) + "17h7nxpc5ggxwpc4j4cxf7n0qglc93vhwd4ljwa8ic33x3yab673")))) (properties `((upstream-name . "haplo.stats"))) (build-system r-build-system) (propagated-inputs -- cgit 1.4.1 From ea6b9e91ff61f038d4b6e2120f8c981cf17a2af8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 28 Dec 2023 00:44:38 +0100 Subject: gnu: r-yulab-utils: Update to 0.1.2. * gnu/packages/cran.scm (r-yulab-utils): Update to 0.1.2. Change-Id: If6c7afd545aae041a8f9a541845ae12b2285314e --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 9c713e7890..1cbc848314 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -24001,14 +24001,14 @@ package.") (define-public r-yulab-utils (package (name "r-yulab-utils") - (version "0.1.0") + (version "0.1.2") (source (origin (method url-fetch) (uri (cran-uri "yulab.utils" version)) (sha256 (base32 - "045s3xg723a8m9cqql74ifqir5k6zl4csdq39vw5im2zgvyajkzg")))) + "0pjm4fnc30kv8xl6akh9y0jpqdsww83558cvyfl4j3xxnafrk8cs")))) (properties `((upstream-name . "yulab.utils"))) (build-system r-build-system) (propagated-inputs -- cgit 1.4.1 From 8b5768d5093d384d2154a759d3b5e99998a5e0f0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 28 Dec 2023 00:44:38 +0100 Subject: gnu: r-terra: Update to 1.7-65. * gnu/packages/cran.scm (r-terra): Update to 1.7-65. Change-Id: I4fbb281b56600d51e59c863e5cfba00005db91de --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 1cbc848314..45cefe635a 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -26767,14 +26767,14 @@ emphasize hidden group structures in networks or focus on specific nodes.") (define-public r-terra (package (name "r-terra") - (version "1.7-55") + (version "1.7-65") (source (origin (method url-fetch) (uri (cran-uri "terra" version)) (sha256 (base32 - "1v1if9ypmra02ngg4r8qg1hldmxan8lyyhgq3j969glihpyvs03h")))) + "0m9s5am8l6il1q0skab614cx0qjsb1i9xcv6nm0sdzj7p9lrzkfl")))) (properties `((upstream-name . "terra"))) (build-system r-build-system) (inputs -- cgit 1.4.1 From b7e2c6b1c8c1e3225064fd2c59f07f1a0154c043 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 28 Dec 2023 00:44:39 +0100 Subject: gnu: r-tidygraph: Update to 1.3.0. * gnu/packages/cran.scm (r-tidygraph): Update to 1.3.0. [propagated-inputs]: Add r-lifecycle. Change-Id: I99834ca5ee3ca760d2d5f16245118cd56c5e2b75 --- gnu/packages/cran.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 45cefe635a..95a4f86bd8 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -26805,14 +26805,14 @@ files is supported.") (define-public r-tidygraph (package (name "r-tidygraph") - (version "1.2.3") + (version "1.3.0") (source (origin (method url-fetch) (uri (cran-uri "tidygraph" version)) (sha256 (base32 - "11sn8z7bwv84lqlgnqc36n14nyhv1qdfc0gcs7nmgbl34nqhd75h")))) + "11qlnpn54bdlkh2jcrk807z86vw54jrb6r9za1jkb03x9dqi9cwk")))) (properties `((upstream-name . "tidygraph"))) (build-system r-build-system) (propagated-inputs @@ -26820,6 +26820,7 @@ files is supported.") r-cpp11 r-dplyr r-igraph + r-lifecycle r-magrittr r-pillar r-r6 -- cgit 1.4.1 From 9fb3c0057b1972325b8b4e3fc3c3c304880f116a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 28 Dec 2023 00:44:39 +0100 Subject: gnu: r-gghighlight: Update to 0.4.1. * gnu/packages/cran.scm (r-gghighlight): Update to 0.4.1. Change-Id: Ic4067391a7713b59081f8a688704175e5bb024aa --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 95a4f86bd8..f9996b3fa4 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -30321,13 +30321,13 @@ from PLINK results.") (define-public r-gghighlight (package (name "r-gghighlight") - (version "0.4.0") + (version "0.4.1") (source (origin (method url-fetch) (uri (cran-uri "gghighlight" version)) (sha256 - (base32 "0vfcn3gg6j7g20n2z1iwr94jnpqn0zl5j9jfc8bnbsrmz49dzqpd")))) + (base32 "1lsvy9ha4d8zs927h8jbdj5r39xqcy1n6g5prw4awiihdvcv9v66")))) (properties `((upstream-name . "gghighlight"))) (build-system r-build-system) (propagated-inputs -- cgit 1.4.1 From 4b7022835818ff1ffd79a80ea0660a8697b304b0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 28 Dec 2023 00:44:39 +0100 Subject: gnu: r-rsconnect: Update to 1.2.0. * gnu/packages/cran.scm (r-rsconnect): Update to 1.2.0. Change-Id: I8611d8a82b040f33292cdd81b5a278bdf500e956 --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index f9996b3fa4..fb9420306e 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -31943,14 +31943,14 @@ and reproducible way.") (define-public r-rsconnect (package (name "r-rsconnect") - (version "1.1.1") + (version "1.2.0") (source (origin (method url-fetch) (uri (cran-uri "rsconnect" version)) (sha256 (base32 - "1v88ary1gbrhmcbr2syq4jh7ln5ldd9b6pdh508bwxnkivqfdg3p")))) + "0g2av3838nnsb51h64ypad0c31gh98zyhib8yf9ffg53ijyqmjs1")))) (properties `((upstream-name . "rsconnect"))) (build-system r-build-system) (propagated-inputs -- cgit 1.4.1 From ae27de6649ad5d47dbdf38724cb60fd126acf114 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 28 Dec 2023 00:44:40 +0100 Subject: gnu: r-rcdd: Update to 1.6. * gnu/packages/cran.scm (r-rcdd): Update to 1.6. Change-Id: I6b76442004bb2fe3a6bb66c296562df295da2378 --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index fb9420306e..27ffc53e8e 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -32988,14 +32988,14 @@ Mean Test, Durbin-Watson statistic etc.") (define-public r-rcdd (package (name "r-rcdd") - (version "1.5-2") + (version "1.6") (source (origin (method url-fetch) (uri (cran-uri "rcdd" version)) (sha256 (base32 - "15dk0805yq2fgla2nafxswwvq2lakvb6kpgwzrag5l0xbrwcvv6q")))) + "0xfvfcjd9gpp6qaalkfkx2f11lyj4sm6n6b763lnk0rrmn6cv2lz")))) (properties `((upstream-name . "rcdd"))) (build-system r-build-system) -- cgit 1.4.1 From c5df00c1d1f74dd1569c50b55aa0d3cdd069e362 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 28 Dec 2023 00:44:40 +0100 Subject: gnu: r-projpred: Update to 2.8.0. * gnu/packages/cran.scm (r-projpred): Update to 2.8.0. Change-Id: I01cfa407b53ccb02eea729319454f1f1f409d1d3 --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 27ffc53e8e..07aee08cbe 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -33138,14 +33138,14 @@ here.") (define-public r-projpred (package (name "r-projpred") - (version "2.7.0") + (version "2.8.0") (source (origin (method url-fetch) (uri (cran-uri "projpred" version)) (sha256 (base32 - "0dydkvb0znqli4lbncihk8yimsiakvdyra5cx1cakvm73mn37s5r")))) + "1xm1444qv0pkxdf2nacxnb2apx5lar1f3qz4jrxp6xd2xk2xv0xk")))) (properties `((upstream-name . "projpred"))) (build-system r-build-system) (propagated-inputs -- cgit 1.4.1 From 42c76e2f49e40eb60e8b48ed0399e37c500c7987 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 28 Dec 2023 00:44:40 +0100 Subject: gnu: r-mlr3: Update to 0.17.1. * gnu/packages/cran.scm (r-mlr3): Update to 0.17.1. [propagated-inputs]: Add r-rhpcblasctl. Change-Id: Ida585a8ac45d8f78de787a243808788927ab765a --- gnu/packages/cran.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 07aee08cbe..135945a58a 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -37079,13 +37079,13 @@ implemented as @code{R6} classes.") (define-public r-mlr3 (package (name "r-mlr3") - (version "0.17.0") + (version "0.17.1") (source (origin (method url-fetch) (uri (cran-uri "mlr3" version)) (sha256 (base32 - "1gnn9i33sa2s0s35lhbbjqffjj9m7yhnhh7lyvp7jv9sncw123sa")))) + "0q6px0l0ab3xcrf6ylnw9a3i50mnks3hlgqj424d6bpqdjqyh5s4")))) (build-system r-build-system) (propagated-inputs (list r-backports @@ -37102,6 +37102,7 @@ implemented as @code{R6} classes.") r-paradox r-parallelly r-r6 + r-rhpcblasctl r-uuid)) (home-page "https://mlr3.mlr-org.com/") (synopsis "Machine Learning in R - Next Generation") -- cgit 1.4.1 From 6b86c1f3db7cf813910cb5d7b2bc5acf33a55910 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 28 Dec 2023 00:44:40 +0100 Subject: gnu: r-mlr3learners: Update to 0.5.8. * gnu/packages/cran.scm (r-mlr3learners): Update to 0.5.8. Change-Id: Icae31b1458044eb224a19f06b46a45906a9c0f6d --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 135945a58a..e259ba3612 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -37117,13 +37117,13 @@ computational operations, add-on packages provide additional functionality.") (define-public r-mlr3learners (package (name "r-mlr3learners") - (version "0.5.7") + (version "0.5.8") (source (origin (method url-fetch) (uri (cran-uri "mlr3learners" version)) (sha256 (base32 - "0l4f500qa2xfcwd4b81sxx9cvj9j349bl77c9vwi45sfsjk19w8g")))) + "0q44qmd9zfc68jl2zz684rx9744g83vd7z40dck8cdvnnrxcff5g")))) (build-system r-build-system) (propagated-inputs (list r-checkmate -- cgit 1.4.1 From ba23ca977e1d9511e0b5de7651786d9660f3d292 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 28 Dec 2023 00:44:41 +0100 Subject: gnu: r-ragg: Update to 1.2.7. * gnu/packages/cran.scm (r-ragg): Update to 1.2.7. Change-Id: I95f8c91f678181066745cad09295c4bcf24993de --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index e259ba3612..abef208210 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -37468,14 +37468,14 @@ the font tool-set provided by the @code{systemfonts} package.") (define-public r-ragg (package (name "r-ragg") - (version "1.2.6") + (version "1.2.7") (source (origin (method url-fetch) (uri (cran-uri "ragg" version)) (sha256 (base32 - "1izpw02b8kq6pm37kvxp9pbd9srvfp5bzfjg27j9hbmm794xq50h")))) + "17qc53scxf02f8hlpyirsjdav4wjh3mk6q04npf82y0j5mk1hynp")))) (properties `((upstream-name . "ragg"))) (build-system r-build-system) (inputs -- cgit 1.4.1 From b9e33a7fd41204a85daede106d1041a1c13fb03d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 28 Dec 2023 00:44:41 +0100 Subject: gnu: r-ggh4x: Update to 0.2.7. * gnu/packages/cran.scm (r-ggh4x): Update to 0.2.7. Change-Id: I0211d69404806922d6725f4936593573674d7e59 --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index abef208210..86af55c070 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -40626,14 +40626,14 @@ be efficient and easy to use.") (define-public r-ggh4x (package (name "r-ggh4x") - (version "0.2.6") + (version "0.2.7") (source (origin (method url-fetch) (uri (cran-uri "ggh4x" version)) (sha256 (base32 - "0frbkdylyz630y7rjyif0whf74r89ca5bmhk9djcwz8nqfs2jygb")))) + "114xvlpdhnsdnw1g89yls3z80dxcj9fah09kvfddhlwbqbknxjxf")))) (properties `((upstream-name . "ggh4x"))) (build-system r-build-system) (propagated-inputs -- cgit 1.4.1 From 5106fc899a5849102b2a9ac3e644a0090d4e635b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 28 Dec 2023 00:44:41 +0100 Subject: gnu: r-mgcv: Update to 1.9-1. * gnu/packages/statistics.scm (r-mgcv): Update to 1.9-1. Change-Id: I9275750902b6e2d2bd1c7394363bdbc66043c4de --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 0c3a560562..218c6f4d74 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -716,13 +716,13 @@ nonlinear mixed-effects models.") (define-public r-mgcv (package (name "r-mgcv") - (version "1.9-0") + (version "1.9-1") (source (origin (method url-fetch) (uri (cran-uri "mgcv" version)) (sha256 - (base32 "0w1v0hdswb332xz3br1fcgacib7ddr4hb96cmlycxcpqq5w01cdj")))) + (base32 "0cnvbdda243as2bxfsgnnk7xjmp1msgr9i4vbd84jfnxpqvvq3vh")))) (build-system r-build-system) (propagated-inputs (list r-matrix r-nlme)) -- cgit 1.4.1 From 7f7c2a48059a296c74cd7c6e22a948646ad1f0bf Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 28 Dec 2023 00:44:41 +0100 Subject: gnu: r-stringi: Update to 1.8.3. * gnu/packages/statistics.scm (r-stringi): Update to 1.8.3. Change-Id: Id600b65a926a233400870444ad3028690be3e92e --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 218c6f4d74..c0fd2a6bbd 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1178,14 +1178,14 @@ solution for sending email, including attachments, from within R.") (define-public r-stringi (package (name "r-stringi") - (version "1.8.2") + (version "1.8.3") (source (origin (method url-fetch) (uri (cran-uri "stringi" version)) (sha256 (base32 - "0bd7x9gl0rhpkpdi9j7a449dw2xsgczgbdj600658z5b6wq25l3a")))) + "09a964g8q3iphq24ln9c9g5158ynr75pfh3ghddarn0xvn7bw0hn")))) (build-system r-build-system) (inputs (list icu4c)) (native-inputs (list pkg-config)) -- cgit 1.4.1 From da284708900812fec1469cfc798e269c685f2796 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 28 Dec 2023 00:44:42 +0100 Subject: gnu: r-dbi: Update to 1.2.0. * gnu/packages/statistics.scm (r-dbi): Update to 1.2.0. Change-Id: I4384d37dd602b396fce736ff5c3b33e3da965233 --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index c0fd2a6bbd..32dc64c991 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1408,13 +1408,13 @@ evaluation (NSE) in R.") (define-public r-dbi (package (name "r-dbi") - (version "1.1.3") + (version "1.2.0") (source (origin (method url-fetch) (uri (cran-uri "DBI" version)) (sha256 (base32 - "13a2656w5j9shpcwa7gj2szy7nk9sajjhlisi5wdpgd57msk7frq")))) + "1g4c2qfyjwbjwbsczhk83xmx74764nn53gnqzb6xxrwqjbxj4dpn")))) (build-system r-build-system) (native-inputs (list r-knitr)) -- cgit 1.4.1 From 373c9b4efc6df86f047c7f7c78672395cd0f8ab5 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 28 Dec 2023 00:44:42 +0100 Subject: gnu: r-yaml: Update to 2.3.8. * gnu/packages/statistics.scm (r-yaml): Update to 2.3.8. Change-Id: I0b654db60d894e160c1ad8aa77000fc90ea649c3 --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 32dc64c991..774d1e794d 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1560,13 +1560,13 @@ syntax that can be converted to XHTML or other formats.") (define-public r-yaml (package (name "r-yaml") - (version "2.3.7") + (version "2.3.8") (source (origin (method url-fetch) (uri (cran-uri "yaml" version)) (sha256 (base32 - "1aw0cvaqw8a0d1r3cplj5kiabkcyz8fghcpi0ax8mi7rw0cv436j")))) + "1n1zlbnq3ldipnnm08whpvm8r21vxg4c9jzg7x7j3blw2pi7kl4y")))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/yaml/") (synopsis "Methods to convert R data to YAML and back") -- cgit 1.4.1 From cd1ea61bc0e7a3f17ef889c759f68c199ee04597 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 28 Dec 2023 00:44:42 +0100 Subject: gnu: r-brew: Update to 1.0-10. * gnu/packages/statistics.scm (r-brew): Update to 1.0-10. Change-Id: I8d3045477d8b329f0c626738a0cd8cf02862e34c --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 774d1e794d..35d8c2f87e 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -2738,13 +2738,13 @@ SLURM and Sun Grid Engine. Multicore and SSH systems are also supported.") (define-public r-brew (package (name "r-brew") - (version "1.0-8") + (version "1.0-10") (source (origin (method url-fetch) (uri (cran-uri "brew" version)) (sha256 (base32 - "09kq14nbaw0mmpb2vbfklz786q6lyizzkyg5bg64bmj2f1d2sr8i")))) + "13x3vnrhfcvr479r4dya61a5vcky2gb4kv2xbivy0ah39qrzg0a1")))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/brew") (synopsis "Templating framework for report generation") -- cgit 1.4.1 From 2b2ad785974b1f007c029c8c85f286dd93c9b4c0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 28 Dec 2023 00:44:42 +0100 Subject: gnu: r-segmented: Update to 2.0-1. * gnu/packages/statistics.scm (r-segmented): Update to 2.0-1. Change-Id: Ieb6dac2712af46fffd29959d9510153dd1f1fb5d --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 35d8c2f87e..718213e553 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -3535,14 +3535,14 @@ statements.") (define-public r-segmented (package (name "r-segmented") - (version "2.0-0") + (version "2.0-1") (source (origin (method url-fetch) (uri (cran-uri "segmented" version)) (sha256 (base32 - "1j7flzav26ldhg50gzcx8azfh9sx4ay30g75ipq56vqibzc33fwd")))) + "0r3l39sihncrmhs6y3nydr6izp5ss86rfwjyhwf2x0clvqq2gkz9")))) (build-system r-build-system) (propagated-inputs (list r-mass r-nlme)) (home-page "https://cran.r-project.org/web/packages/segmented") -- cgit 1.4.1 From 8047e5328b9830aee43336af863b70f2453bec6b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 28 Dec 2023 00:44:43 +0100 Subject: gnu: r-matrixstats: Update to 1.2.0. * gnu/packages/statistics.scm (r-matrixstats): Update to 1.2.0. Change-Id: I08ad75b3cdfefdeb9718086be75bb24153e117c9 --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 718213e553..6205983856 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -4402,13 +4402,13 @@ t-probabilities, quantiles, random deviates and densities.") (define-public r-matrixstats (package (name "r-matrixstats") - (version "1.1.0") + (version "1.2.0") (source (origin (method url-fetch) (uri (cran-uri "matrixStats" version)) (sha256 (base32 - "0h85hjvsmc8s3hyjdj83fykb2vl8jc7pb9ynp2xsl0q9v1sihrxl")))) + "0ws5lmzqm42vrn5791l21zr05l78x0xi6b89jw0gi0vjb4pc20z4")))) (properties `((upstream-name . "matrixStats"))) (build-system r-build-system) (arguments -- cgit 1.4.1 From df69fcac77d4fece802438d987822596859f8327 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 28 Dec 2023 00:44:43 +0100 Subject: gnu: r-vipor: Update to 0.4.7. * gnu/packages/statistics.scm (r-vipor): Update to 0.4.7. Change-Id: I7a7442ae64d5a96a4ab20427ab5fb8bcdc2e51e2 --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 6205983856..81a3182f73 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -5190,13 +5190,13 @@ with alternating row colors) in LaTeX and HTML formats easily from (define-public r-vipor (package (name "r-vipor") - (version "0.4.5") + (version "0.4.7") (source (origin (method url-fetch) (uri (cran-uri "vipor" version)) (sha256 (base32 - "112gc0d7f8iavgf56pnzfxb7hy75yhd0zlyjzshdcfbnqcd2a6bx")))) + "17hb6y1i9bva0fr4k9m6wncmnzdjad1b7fhsvfhva4xavpll3bds")))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/vipor") (synopsis "Plot categorical data using noise and density estimates") -- cgit 1.4.1 From 79fe5cbad00dacfd4c9d994e5ef7f9e05aaf00ba Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 28 Dec 2023 00:44:43 +0100 Subject: gnu: r-cowplot: Update to 1.1.2. * gnu/packages/statistics.scm (r-cowplot): Update to 1.1.2. Change-Id: Ie1688b1eb38e2c3ef04460cc4dd7c35179b6c48e --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 81a3182f73..cb210898cb 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -5391,14 +5391,14 @@ Farebrother's algorithm or Liu et al.'s algorithm.") (define-public r-cowplot (package (name "r-cowplot") - (version "1.1.1") + (version "1.1.2") (source (origin (method url-fetch) (uri (cran-uri "cowplot" version)) (sha256 (base32 - "0j7d5vhzdxn1blrsfafx5z8lhq122rp8230hp9czrpsnnhjydp67")))) + "1ppsg3rbqz9a16zq87izdj5w8ylb6jb6v13xb01k7m3n2h4mv4f6")))) (build-system r-build-system) (propagated-inputs (list r-ggplot2 r-gtable r-rlang r-scales)) -- cgit 1.4.1 From a2a8c4c13aaf02038939706d9aaf6d9f386032c5 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 28 Dec 2023 00:44:43 +0100 Subject: gnu: r-fpc: Update to 2.2-11. * gnu/packages/statistics.scm (r-fpc): Update to 2.2-11. Change-Id: Iebf343be3f9ce37fc9d740286b185e9c5c733efb --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index cb210898cb..92bf3d5d96 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -5779,14 +5779,14 @@ of the points.") (define-public r-fpc (package (name "r-fpc") - (version "2.2-10") + (version "2.2-11") (source (origin (method url-fetch) (uri (cran-uri "fpc" version)) (sha256 (base32 - "1lj7j74yx747iic1hcngzbym0sqxppja8bxw64m0j6na5s7m9d4r")))) + "06j1dzlf96qcaiqg8m5iah9rmwdppky04xjhs8k4rh0k12wr0mc2")))) (build-system r-build-system) (propagated-inputs (list r-class -- cgit 1.4.1 From 25d7dbd61c5420e105c36eef9b3583c87088bb40 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 28 Dec 2023 10:58:14 +0100 Subject: gnu: Add r-inext. * gnu/packages/cran.scm (r-inext): New variable. Change-Id: I6a87cfb57bfc8000520b98999cf260d2873f0b61 --- gnu/packages/cran.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 86af55c070..19d1e7d043 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -7530,6 +7530,32 @@ experiments\" (2011), Annals of Applied Statistics, Vol. 5, No. 3, 1752-1779, by Li, Brown, Huang, and Bickel") (license license:gpl2+))) +(define-public r-inext + (package + (name "r-inext") + (version "3.0.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "iNEXT" version)) + (sha256 + (base32 "1yfvadvdwgby047svj9sjwkm7hhrni2ifn6d2g5bv9djcvi22msh")))) + (properties `((upstream-name . "iNEXT"))) + (build-system r-build-system) + (propagated-inputs (list r-ggplot2 r-rcpp r-reshape2)) + (native-inputs (list r-knitr)) + (home-page "http://chao.stat.nthu.edu.tw/wordpress/software_download/") + (synopsis "Interpolation and extrapolation for species diversity") + (description + "This package provides simple functions to compute and plot two types +(sample-size- and coverage-based) rarefaction and extrapolation curves for +species diversity (Hill numbers) based on individual-based abundance data or +sampling-unit- based incidence data; see Chao and others (2014, Ecological +Monographs) for pertinent theory and methodologies, and Hsieh, Ma and Chao +(2016, Methods in Ecology and Evolution) for an introduction of the R +package.") + (license license:gpl3+))) + (define-public r-inline (package (name "r-inline") -- cgit 1.4.1 From a72c6ba19a51a3eed9c7198f4b358849dd7543be Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 28 Dec 2023 11:20:34 +0100 Subject: gnu: r-genomeinfodb: Update to 1.38.4. * gnu/packages/bioconductor.scm (r-genomeinfodb): Update to 1.38.4. Change-Id: Icdd7237e7a4d15a6b9554fca77423148d6f7438e --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 7805fa938e..34a968c793 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -7611,13 +7611,13 @@ genomic intervals. In addition, it can use BAM or BigWig files as input.") (define-public r-genomeinfodb (package (name "r-genomeinfodb") - (version "1.38.2") + (version "1.38.4") (source (origin (method url-fetch) (uri (bioconductor-uri "GenomeInfoDb" version)) (sha256 (base32 - "07xncxak8yjy04m7zh779jfjbsdmdbk8a5xs4rbajx4zp3hm4wb7")))) + "1vb0s8pharfbm72j33ya4d4kc3qan2kaqyz2lrmlp7vkrq7zrb9m")))) (properties `((upstream-name . "GenomeInfoDb"))) (build-system r-build-system) -- cgit 1.4.1 From 5673484cbc2ed74c61ae81d623646fa7829fbc32 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 28 Dec 2023 11:20:35 +0100 Subject: gnu: r-biocneighbors: Update to 1.20.1. * gnu/packages/bioconductor.scm (r-biocneighbors): Update to 1.20.1. Change-Id: I34aa795404d8c083585f83d5a02810a9005bef32 --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 34a968c793..d1c61ad8c4 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -13085,14 +13085,14 @@ samples.") (define-public r-biocneighbors (package (name "r-biocneighbors") - (version "1.20.0") + (version "1.20.1") (source (origin (method url-fetch) (uri (bioconductor-uri "BiocNeighbors" version)) (sha256 (base32 - "0a5wg099fgwjbzd6r3mr4l02rcmjqlkdcz1w97qzwx1mir41fmas")))) + "0w7hd6w0lmj1jaaq9zd5gwnnpkzcr0byqm5q584wjg4xgvsb981j")))) (properties `((upstream-name . "BiocNeighbors"))) (build-system r-build-system) (propagated-inputs -- cgit 1.4.1 From e15b95c1266e5388dc9439426fcd5c0445d0dac4 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 28 Dec 2023 11:20:35 +0100 Subject: gnu: r-metapod: Update to 1.10.1. * gnu/packages/bioconductor.scm (r-metapod): Update to 1.10.1. Change-Id: Iafd5b48420d12f9fd02966c83914feb1ef38e510 --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index d1c61ad8c4..f75d320285 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -13242,14 +13242,14 @@ data.") (define-public r-metapod (package (name "r-metapod") - (version "1.10.0") + (version "1.10.1") (source (origin (method url-fetch) (uri (bioconductor-uri "metapod" version)) (sha256 (base32 - "1nhxwj6gwc3hqji7icp1q6n0hj1gnvv1y5zhd2myhm7kj3sic2qc")))) + "05cy3xvj78n2p9l2pxfys7aczr51gm2ywprn4qmzr7ppb6rq5f66")))) (properties `((upstream-name . "metapod"))) (build-system r-build-system) (propagated-inputs -- cgit 1.4.1 From 31e882e4b1cc4517ac38c72906b022677f54d1da Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 28 Dec 2023 11:20:35 +0100 Subject: gnu: r-genomicscores: Update to 2.14.3. * gnu/packages/bioconductor.scm (r-genomicscores): Update to 2.14.3. Change-Id: I973721a2ba3a5c5d7e23c4063f363fea7bdfe77e --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index f75d320285..7d300dc56a 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -15821,14 +15821,14 @@ type and symbol colors.") (define-public r-genomicscores (package (name "r-genomicscores") - (version "2.14.2") + (version "2.14.3") (source (origin (method url-fetch) (uri (bioconductor-uri "GenomicScores" version)) (sha256 (base32 - "1wjq6lb2x7vazlr838hlh1ar5pis2bgzya9lm8ki30d1m0hpk66k")))) + "0rhyfbm5whz4jygar9cqcrfy92h1lyam5wd8d9svhh80f15v53m9")))) (properties `((upstream-name . "GenomicScores"))) (build-system r-build-system) (propagated-inputs -- cgit 1.4.1 From 2510849ec90359f1c61b66b36443320b84ebb75e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 28 Dec 2023 11:20:35 +0100 Subject: gnu: r-sparsearray: Update to 1.2.3. * gnu/packages/bioconductor.scm (r-sparsearray): Update to 1.2.3. Change-Id: I5907db78a1261a3dbe0390737cc357bafbdb331e --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 7d300dc56a..b9f18055d9 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -21332,13 +21332,13 @@ variable and significantly correlated genes.") (define-public r-sparsearray (package (name "r-sparsearray") - (version "1.2.2") + (version "1.2.3") (source (origin (method url-fetch) (uri (bioconductor-uri "SparseArray" version)) (sha256 - (base32 "1kjs3v2ycpcc0plr88af1661ngmclmalkiy6am7i4m75cpa3889p")))) + (base32 "19cy1nmmi65fxh012ymgp1kg112yl1m0khcs4y034p5iwlfv7fp6")))) (properties `((upstream-name . "SparseArray"))) (build-system r-build-system) (propagated-inputs (list r-biocgenerics -- cgit 1.4.1 From b0580a05be13b64a018cea4e4cafccc3fc782025 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 28 Dec 2023 12:31:13 +0100 Subject: gnu: r-seuratdisk: Update to 0.0.0.9021-1.877d4e1. * gnu/packages/cran.scm (r-seuratdisk): Update to 0.0.0.9021-1.877d4e1. Change-Id: Iab1426efe5b792aacf19ab15e9d6d95be0bac38b --- gnu/packages/cran.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 19d1e7d043..894767e1de 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -36506,11 +36506,11 @@ discovery of differentially expressed genes and markers.") r-uwot))))) (define-public r-seuratdisk - (let ((commit "163f1aade5bac38ed1e9e9c912283a7e74781610") + (let ((commit "877d4e18ab38c686f5db54f8cd290274ccdbe295") (revision "1")) (package (name "r-seuratdisk") - (version (git-version "0.0.0.9019" revision commit)) + (version (git-version "0.0.0.9021" revision commit)) (source (origin (method git-fetch) @@ -36519,7 +36519,7 @@ discovery of differentially expressed genes and markers.") (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "1d1v8qi6kknzy5fj6bl8akwy74h5h143i00lyidsnqjbwp9n4qnw")))) + (base32 "0ma9qk95symk95slp8klriqg64d8klqf1634y93ml74icarxw1dm")))) (properties `((upstream-name . "SeuratDisk"))) (build-system r-build-system) (propagated-inputs -- cgit 1.4.1 From c8d1f64f40fb4588b6f41b572365b02cdf541085 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 1 Jan 2024 11:30:54 +0100 Subject: gnu: r-genomeinfodb: Update to 1.38.5. * gnu/packages/bioconductor.scm (r-genomeinfodb): Update to 1.38.5. Change-Id: I000bf46cc66ed4a6f1e44b12989326c121acde4c --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index b9f18055d9..fdcded2351 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -7611,13 +7611,13 @@ genomic intervals. In addition, it can use BAM or BigWig files as input.") (define-public r-genomeinfodb (package (name "r-genomeinfodb") - (version "1.38.4") + (version "1.38.5") (source (origin (method url-fetch) (uri (bioconductor-uri "GenomeInfoDb" version)) (sha256 (base32 - "1vb0s8pharfbm72j33ya4d4kc3qan2kaqyz2lrmlp7vkrq7zrb9m")))) + "17w5zrvpk2x0sc55xfkbn9krphg4aszmvwmj1qfsf1bdrazfpwic")))) (properties `((upstream-name . "GenomeInfoDb"))) (build-system r-build-system) -- cgit 1.4.1 From 00e6f55ddb08679afa6792ddf4fea3c195151d19 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 1 Jan 2024 11:31:08 +0100 Subject: gnu: r-batchelor: Update to 1.18.1. * gnu/packages/bioconductor.scm (r-batchelor): Update to 1.18.1. Change-Id: Ic541acacc7e02951f0b2cc6d08d257fe22d7d4b4 --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index fdcded2351..316aa20026 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -13728,14 +13728,14 @@ multiplication and calculation of row/column sums or means.") (define-public r-batchelor (package (name "r-batchelor") - (version "1.18.0") + (version "1.18.1") (source (origin (method url-fetch) (uri (bioconductor-uri "batchelor" version)) (sha256 (base32 - "1d5zik3bhz26ky2kpxd9kdzs9ff696qqys5gl8qwmmp8qym520l2")))) + "1z4ddkdd3mzqg0c6l94qmrdwrm7427k5xiwzgkzx43gh1j4911d5")))) (properties `((upstream-name . "batchelor"))) (build-system r-build-system) (propagated-inputs -- cgit 1.4.1 From ff586211aaf0e3b468ff3cedc5ede18e8ab529dd Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 1 Jan 2024 13:22:06 +0100 Subject: gnu: Remove r-rmetasim. This package fails to build and has been archived on CRAN in 2021. * gnu/packages/cran.scm (r-rmetasim): Remove variable. Change-Id: I46a6c98d7e05faac6f83e29dfb21196a69bae56b --- gnu/packages/cran.scm | 24 ------------------------ 1 file changed, 24 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 894767e1de..36c00d2885 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -23102,30 +23102,6 @@ population structure (Fst, Amova) and equilibrium (HWE), haplotype networks, minimum spanning tree and network, and median-joining networks.") (license license:gpl2+))) -(define-public r-rmetasim - (package - (name "r-rmetasim") - (version "3.1.14") - (source - (origin - (method url-fetch) - (uri (cran-uri "rmetasim" version)) - (sha256 - (base32 - "0rdkhfgyr97r2d1kd9g8ipb2pn563qxm1y4m9z678q0kqan2ddl0")))) - (build-system r-build-system) - (propagated-inputs - (list r-ade4 r-adegenet r-gtools r-pegas)) - (home-page "https://cran.r-project.org/web/packages/rmetasim") - (synopsis "Individual-based population genetic simulation environment") - (description - "This package provides an interface between R and the metasim simulation -engine. The simulation environment is documented in: Strand, A.(2002), -Metasim 1.0: an individual-based environment for simulating population -genetics of complex population dynamics.") - ;; Any GPL version - (license license:gpl2+))) - (define-public r-genetics (package (name "r-genetics") -- cgit 1.4.1 From 510c2206e4faabee1978c4194745183707bb943e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 1 Jan 2024 19:21:37 +0100 Subject: gnu: Add r-job. * gnu/packages/cran.scm (r-job): New variable. Change-Id: I37a0870bd22d5bc2e700f843fca49f242a197440 --- gnu/packages/cran.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 36c00d2885..bf9e94adee 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -4201,6 +4201,29 @@ performance evaluation of BSS algorithms, are given. The package is described in Miettinen, Nordhausen and Taskinen (2017) .") (license license:gpl2+))) +(define-public r-job + (package + (name "r-job") + (version "0.3.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "job" version)) + (sha256 + (base32 "0d7pw3q5lqlgmav1vx63y8l6gdav96656bg378wj001rx5gx052h")))) + (properties `((upstream-name . "job"))) + (build-system r-build-system) + (propagated-inputs (list r-digest r-rstudioapi)) + (home-page "https://cran.r-project.org/package=job") + (synopsis "Run code as an RStudio job") + (description + "Call @code{job::job({})} to run R code as an RStudio job and +keep your console free in the meantime. This allows for a productive workflow +while testing (multiple) long-running chunks of code. It can also be used to +organize results using the RStudio Jobs GUI or to test code in a clean +environment. Two RStudio Addins can be used to run selected code as a job.") + (license license:expat))) + (define-public r-jsonify (package (name "r-jsonify") -- cgit 1.4.1 From 679560ffca1217ffd7d024266f0ae571b1fc940d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 1 Jan 2024 19:21:59 +0100 Subject: gnu: Add r-databaselinke-r. * gnu/packages/bioinformatics.scm (r-databaselinke-r): New variable. Change-Id: I0cfcb5b6810b7afebbb9ccb02aafcce05507536c --- gnu/packages/bioinformatics.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index de37d19264..2cfbd4eda6 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -17996,6 +17996,34 @@ The tool enables the de novo search for new structural elements and facilitates comparative analysis of known RNA families.") (license license:bsd-3))) +(define-public r-databaselinke-r + (let ((commit "cf3d6cc3d36f2e1c9a557390232e9a8ed5abb7fd") + (revision "1")) + (package + (name "r-databaselinke-r") + (version (git-version "1.7.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/vertesy/DatabaseLinke.R") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0hk76sb3w1v8a7c1knpc572ypsbgqlrv0p49c9y55a0dr12n16s1")))) + (properties `((upstream-name . "DatabaseLinke.R"))) + (build-system r-build-system) + (propagated-inputs (list r-readwriter)) + (home-page "https://github.com/vertesy/DatabaseLinke.R") + (synopsis + "Parse links to databases from your list of gene symbols") + (description + "This package provides a set of functions to parse and open (search +query) links to genomics related and other websites for R. Useful when you +want to explore e.g.: the function of a set of differentially expressed +genes.") + (license license:gpl3)))) + (define-public r-seurat-utils (let ((commit "0b6f5b548a49148cfbeaa654e8a618c0a020afa5") (revision "1")) -- cgit 1.4.1 From ee0cf3b9ff4cd5a9d3637d09677195ea9ee1a8c0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 1 Jan 2024 19:22:11 +0100 Subject: gnu: r-seurat-utils: Update to 2.5.0-1.c0374cc. * gnu/packages/bioinformatics.scm (r-seurat-utils): Update to 2.5.0-1.c0374cc. [propagated-inputs]: Add r-databaselinke-r, r-enhancedvolcano, r-foreach, r-job, r-magrittr, r-pheatmap, r-plotly, r-qs, r-rstudioapi, and r-tidyverse. Change-Id: Iea2df8205357e7717c0adec00f6852794817d295 --- gnu/packages/bioinformatics.scm | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 2cfbd4eda6..2e4bc876d4 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -18025,11 +18025,11 @@ genes.") (license license:gpl3)))) (define-public r-seurat-utils - (let ((commit "0b6f5b548a49148cfbeaa654e8a618c0a020afa5") + (let ((commit "c0374cc9e25ce391ba8013fda0f8c7babbb9201d") (revision "1")) (package (name "r-seurat-utils") - (version (git-version "1.6.5" revision commit)) + (version (git-version "2.5.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -18038,12 +18038,15 @@ genes.") (file-name (git-file-name name version)) (sha256 (base32 - "1mn64h375mkj6x4ix5493z32gqg96yc507j5jr0lx9g5wk1bf762")))) + "15l86b43q245gzz7gsr5rhs4sir74lc14d64yqxfqcb0zrb2bzzd")))) (properties `((upstream-name . "Seurat.utils"))) (build-system r-build-system) (propagated-inputs (list r-codeandroll2 r-cowplot + r-databaselinke-r r-dplyr + r-enhancedvolcano + r-foreach r-ggcorrplot r-ggexpress r-ggplot2 @@ -18051,15 +18054,21 @@ genes.") r-ggrepel r-hgnchelper r-htmlwidgets + r-job + r-magrittr r-markdownhelpers r-markdownreports r-matrix r-matrixstats + r-pheatmap + r-plotly r-princurve + r-qs r-r-utils r-readr r-readwriter r-reshape2 + r-rstudioapi r-scales r-seurat r-soupx @@ -18068,6 +18077,7 @@ genes.") r-stringr r-tibble r-tictoc + r-tidyverse r-vroom)) (home-page "https://github.com/vertesy/Seurat.utils") (synopsis "Collection of utility functions for Seurat") -- cgit 1.4.1 From 8f8fbb79baa1b9313105b5ee3ba9bdd9265b093d Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jan 2024 18:25:17 +0100 Subject: gnu: emacs-rec-mode: Update to 1.9.3. * gnu/packages/databases.scm (emacs-rec-mode): Update to 1.9.3. Change-Id: I4268c08171b75442a6ba5b5da2887ae9764df98d --- gnu/packages/databases.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index ba5d4b9f29..1ca534aa00 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -1600,14 +1600,14 @@ types are supported, as is encryption.") (define-public emacs-rec-mode (package (name "emacs-rec-mode") - (version "1.9.1") + (version "1.9.3") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "rec-mode-" version ".tar")) (sha256 (base32 - "0f60bw07l6kk1kkjjxsk30p6rxj9mpngaxqy8piyabnijfgjzd3s")) + "15m0h84fcrcxpx67mc9any4ap2dcqysfjm1d2a7sx4clx8h3mgk0")) (snippet #~(begin (delete-file "rec-mode.info"))))) (build-system emacs-build-system) (arguments -- cgit 1.4.1 From 2bfcb104b70306af3e21576da8986570efde847e Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jan 2024 18:25:40 +0100 Subject: gnu: emacs-auctex: Update to 13.2.3. * gnu/packages/emacs-xyz.scm (emacs-auctex): Update to 13.2.3. Change-Id: Iabeb142f7fe1f5fcf925f788263c76eb0bbf1382 --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index a8ac238f58..51d7b88d22 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -4216,14 +4216,14 @@ as a library for other Emacs packages.") (define-public emacs-auctex (package (name "emacs-auctex") - (version "13.2.2") + (version "13.2.3") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "auctex-" version ".tar")) (sha256 - (base32 "1k8ypxp2iwg7a0m5lyk1sy5chcnmas0gs6frk6xw6k0r974f193s")))) + (base32 "1590g2yd8q88xgxc449fxbxwgrbjh2cbcalcs7jk50lhzy3y8mc8")))) (build-system emacs-build-system) ;; We use 'emacs' because AUCTeX requires dbus at compile time ;; ('emacs-minimal' does not provide dbus). -- cgit 1.4.1 From 6ca99feaf5cd871bacd320744c3d86322051b1e8 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jan 2024 18:26:10 +0100 Subject: gnu: emacs-subed: Update to 1.2.11. * gnu/packages/emacs-xyz.scm (emacs-subed): Update to 1.2.11. Change-Id: Ib3838ec91afdeefef267df49394ee4b1f75fa63a --- gnu/packages/emacs-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 51d7b88d22..23d52d6be7 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -14,7 +14,7 @@ ;;; Copyright © 2016, 2017 Roel Janssen ;;; Copyright © 2016, 2017 Nikita ;;; Copyright © 2016, 2019 Alex Griffin -;;; Copyright © 2016-2023 Nicolas Goaziou +;;; Copyright © 2016-2024 Nicolas Goaziou ;;; Copyright © 2016, 2017, 2018 Alex Vong ;;; Copyright © 2016-2022 Arun Isaac ;;; Copyright © 2017 Christopher Baines @@ -8749,14 +8749,14 @@ user.") (define-public emacs-subed (package (name "emacs-subed") - (version "1.2.7") + (version "1.2.11") (source (origin (method url-fetch) (uri (string-append "https://elpa.nongnu.org/nongnu/subed-" version ".tar")) (sha256 (base32 - "1rvc17pvig3ihc74d7i25kl3lnigp0h8lh634x0676hdx38h91ib")))) + "1dlh7vd8kc16wr9sqd3v7kkxfvqadi56pa52h35b86krndh4vazp")))) (arguments (list #:tests? #t -- cgit 1.4.1 From cab4cf27dcc072c3da6a10e84746c331af13c9e2 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jan 2024 18:26:23 +0100 Subject: gnu: emacs-eldoc: Update to 1.15.0. * gnu/packages/emacs-xyz.scm (emacs-eldoc): Update to 1.15.0. Change-Id: Icea7f7d60301892e9476b930ab19a85f41b29f4f --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 23d52d6be7..f395e474ba 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -19601,14 +19601,14 @@ more information.") (define-public emacs-eldoc (package (name "emacs-eldoc") - (version "1.14.0") + (version "1.15.0") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/eldoc-" version ".tar")) (sha256 - (base32 "15bg61nbfb6l51frlsn430ga3vscns2651wvi6377vlyra7kgn39")))) + (base32 "1wn7q2f19lfdc3b639ffhbmsglnm3zc6rvgyc6amqwnpc2n2gkdl")))) (build-system emacs-build-system) (home-page "https://elpa.gnu.org/packages/eldoc.html") (synopsis "Show function arglist or variable docstring in echo area") -- cgit 1.4.1 From 4dc30915cc051c6d34b6b6398d7323cc325f84f0 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jan 2024 18:26:29 +0100 Subject: gnu: emacs-kind-icon: Update to 0.2.1. * gnu/packages/emacs-xyz.scm (emacs-kind-icon): Update to 0.2.1. Change-Id: Id0fe5f72a3252cf3bf7348cd45db89da9e80b6ec --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index f395e474ba..f85f098dee 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -24145,14 +24145,14 @@ or expressions with SVG rounded box labels that are fully customizable.") (define-public emacs-kind-icon (package (name "emacs-kind-icon") - (version "0.2.0") + (version "0.2.1") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/kind-icon-" version ".tar")) (sha256 - (base32 "1vgwbd99vx793iy04albkxl24c7vq598s7bg0raqwmgx84abww6r")))) + (base32 "0ri5k2bgr9cf0qsdznsil70b4zs4z00fs4k35c3dj7kxx9nlncfi")))) (build-system emacs-build-system) (propagated-inputs (list emacs-svg-lib)) (home-page "https://github.com/jdtsmith/kind-icon") -- cgit 1.4.1 From 08c08b22b25efaa54020cd23e07db8b017072b57 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jan 2024 18:26:43 +0100 Subject: gnu: emacs-tramp: Update to 2.6.2.0. * gnu/packages/emacs-xyz.scm (emacs-tramp): Update to 2.6.2.0. Change-Id: Id3db704243d269b1b0979a4ed2fe36bd42f8e9bb --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index f85f098dee..6849958f03 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -32244,14 +32244,14 @@ well as an option for visually flashing evaluated s-expressions.") (define-public emacs-tramp (package (name "emacs-tramp") - (version "2.6.1.4") + (version "2.6.2.0") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "tramp-" version ".tar")) (sha256 - (base32 "1ajlx0982hx6ypby9dvw1yh9zyl1h4j9xp4n9rfzxhfvvq3139bi")))) + (base32 "06wpaqjr3qw1424k9rh5i28yxrkzh1z5dczpgp7mpv823l2x8ip3")))) (build-system emacs-build-system) (arguments (list -- cgit 1.4.1 From 9e195fa0eda6117859c6dcba80f824c8cfc90fec Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jan 2024 18:26:50 +0100 Subject: gnu: emacs-ebdb: Update to 0.8.20. * gnu/packages/emacs-xyz.scm (emacs-ebdb): Update to 0.8.20. Change-Id: Ib3420c220beadc022bf3e65c8d904a0237f9dd18 --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 6849958f03..8240bd9c2d 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -33285,14 +33285,14 @@ federated microblogging social network.") (define-public emacs-ebdb (package (name "emacs-ebdb") - (version "0.8.18") + (version "0.8.20") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "ebdb-" version ".tar")) (sha256 - (base32 "1mb1qsw3dfaa6x52vsg73by6w7x5i6w5l7b0d2jr667y006q2vvf")))) + (base32 "1kcygkfw7r3ixbb2dgsf3rl2662xls24992y2j1w32fdh9gqk03s")))) (build-system emacs-build-system) (home-page "https://github.com/girzel/ebdb") (synopsis "EIEIO port of BBDB, Emacs's contact-management package") -- cgit 1.4.1 From 30a7f0212ab838ebc882a5b6d4cc14d41a42d0b6 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jan 2024 18:26:59 +0100 Subject: gnu: emacs-vertico-posframe: Update to 0.7.5. * gnu/packages/emacs-xyz.scm (emacs-vertico-posframe): Update to 0.7.5. Change-Id: Ifff04b43f978e0664cafca2ab8b8e5a8b826bca4 --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 8240bd9c2d..023afb05b9 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -38897,7 +38897,7 @@ in Emacs.") (define-public emacs-vertico-posframe (package (name "emacs-vertico-posframe") - (version "0.7.3") + (version "0.7.5") (source (origin (method url-fetch) (uri (string-append @@ -38905,7 +38905,7 @@ in Emacs.") ".tar")) (sha256 (base32 - "1gfapchkj9jkzlyz3hzkb9kpifcak0fn4y5jw6f2cs6379sjwvzm")))) + "1fa8kg5lqpa1xk2vf1mp420iqki866gd83vzsj166b8mnd34fdlr")))) (build-system emacs-build-system) (propagated-inputs (list emacs-posframe emacs-vertico)) (home-page "https://github.com/tumashu/vertico-posframe") -- cgit 1.4.1 From 0306d83bed41accd5a17382fee15ce5403dffc53 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jan 2024 18:29:02 +0100 Subject: gnu: emacs-apheleia: Update to 4.0. * gnu/packages/emacs-xyz.scm (emacs-apheleia): Update to 4.0. Change-Id: I2d61a20e434400f8dbae7d33894ab6f6134c9630 --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 023afb05b9..18342e07b7 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -6504,7 +6504,7 @@ This mode supports Apache HTTP Server 2.4 and major modules.") (define-public emacs-apheleia (package (name "emacs-apheleia") - (version "3.2") + (version "4.0") (source (origin (method git-fetch) @@ -6513,7 +6513,7 @@ This mode supports Apache HTTP Server 2.4 and major modules.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0rcga3nq1ly5xg61zv3jxgqi0krxk86c24wcrij4vzidhn0s9ncn")))) + (base32 "0afv75w028v59qf777nrf57xj9yaz3jj2bixfmkgiqrn1wii9pm6")))) (build-system emacs-build-system) (home-page "https://github.com/raxod502/apheleia") (synopsis "Reformat buffer stably") -- cgit 1.4.1 From 332077506397ae63946f001a98a0cb246bb96d1a Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jan 2024 18:30:18 +0100 Subject: gnu: emacs-beframe: Update to 1.0.0. * gnu/packages/emacs-xyz.scm (emacs-beframe): Update to 1.0.0. Change-Id: I1df7f004c24cc783869421f656a59610006fcf90 --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 18342e07b7..19dde75fa4 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -17263,7 +17263,7 @@ using a convenient notation.") (define-public emacs-beframe (package (name "emacs-beframe") - (version "0.3.0") + (version "1.0.0") (source (origin (method git-fetch) (uri (git-reference @@ -17272,7 +17272,7 @@ using a convenient notation.") (file-name (git-file-name name version)) (sha256 (base32 - "1nblpac1pkhgwpbw0k0p9xx6yc5kiai4pznw39slx703mzzqzqyj")))) + "08k9lwfxfvpm50n1c0gcm07sicd6yw7dbyyvhp8lai6pfxl465v9")))) (build-system emacs-build-system) (arguments (list -- cgit 1.4.1 From 78c55428c340698a39be135306fcf713c15688ee Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jan 2024 18:31:45 +0100 Subject: gnu: emacs-buttercup: Update to 1.33. * gnu/packages/emacs-xyz.scm (emacs-buttercup): Update to 1.33. Change-Id: Ie98b77b883b084886797680ef317b9668f1d0445 --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 19dde75fa4..e0f7549b47 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -28866,7 +28866,7 @@ targets the Emacs based IDEs (CIDER, ESS, Geiser, Robe, SLIME etc.)") (define-public emacs-buttercup (package (name "emacs-buttercup") - (version "1.31") + (version "1.33") (source (origin (method git-fetch) @@ -28876,7 +28876,7 @@ targets the Emacs based IDEs (CIDER, ESS, Geiser, Robe, SLIME etc.)") (file-name (git-file-name name version)) (sha256 (base32 - "1rvc9r6swb74lhzd877jidkkf2cxl5v4zz302j2imqhsbk844qzh")))) + "10q6zr837yaal1g3l7vmj08b3c301j99b290pylshb0si360a27h")))) (build-system emacs-build-system) (arguments (list -- cgit 1.4.1 From 0f9beffa43dbd518e4cb597afe2b87b4892d446e Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jan 2024 18:32:47 +0100 Subject: gnu: emacs-async: Update to 1.9.8. * gnu/packages/emacs-xyz.scm (emacs-async): Update to 1.9.8. Change-Id: I2b83724cee2f77d49417c104f7ab0bf299c671ea --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index e0f7549b47..c21ec16b12 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -4194,7 +4194,7 @@ while paused.") (package (name "emacs-async") (home-page "https://github.com/jwiegley/emacs-async") - (version "1.9.7") + (version "1.9.8") (source (origin (method git-fetch) (uri (git-reference @@ -4203,7 +4203,7 @@ while paused.") (file-name (git-file-name name version)) (sha256 (base32 - "18pysi1pf6hbv6w0nq50j5xclvgd006iqqijh44wck9hxhdwyfr1")))) + "191bjmwg5bgih1322n4q4i2jxx7aa3cb9lx0ymkwc3r2bdhkn0lp")))) (build-system emacs-build-system) (synopsis "Asynchronous processing in Emacs") (description -- cgit 1.4.1 From 551e159467d26b68a9bfc7c930895bd4743d7655 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jan 2024 18:35:07 +0100 Subject: gnu: emacs-async: Run tests. * gnu/packages/emacs-xyz.scm (emacs-async)[arguments]: Run tests. [native-inputs]: Add EMACS-BUTTERCUP. Change-Id: Ifa442644dbd259afb5584fbb4160a8b2346a6364 --- gnu/packages/emacs-xyz.scm | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index c21ec16b12..d608a7405b 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -4205,6 +4205,11 @@ while paused.") (base32 "191bjmwg5bgih1322n4q4i2jxx7aa3cb9lx0ymkwc3r2bdhkn0lp")))) (build-system emacs-build-system) + (arguments + `(#:tests? #t + #:test-command '("buttercup" "-L" "."))) + (native-inputs + (list emacs-buttercup)) (synopsis "Asynchronous processing in Emacs") (description "This package provides the ability to call asynchronous functions and -- cgit 1.4.1 From 3b8ff1d10183933318f6c2dca365c0c2281f60d7 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jan 2024 18:36:17 +0100 Subject: gnu: emacs-cape: Update to 1.1. * gnu/packages/emacs-xyz.scm (emacs-cape): Update to 1.1. Change-Id: I7b2c1c415e62d4c13d0f3d5b946d93423dc08fb4 --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index d608a7405b..5ba2a90d26 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -4675,7 +4675,7 @@ be regarded as @code{emacs-company-quickhelp} for @code{emacs-corfu}.") (define-public emacs-cape (package (name "emacs-cape") - (version "0.17") + (version "1.1") (source (origin (method git-fetch) @@ -4684,7 +4684,7 @@ be regarded as @code{emacs-company-quickhelp} for @code{emacs-corfu}.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1kzhiffzv20rwjcx0iywj39hxibw0wga9ck77yam9xv7ips2mav4")))) + (base32 "0nx08i11s0z9kk711r7wp8sgj00n8hjk5gx0rqr9awrl9fmw1kp2")))) (build-system emacs-build-system) (arguments (list -- cgit 1.4.1 From 8b41c305d8e8a1f30954ef3b50f082c0298e98a5 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jan 2024 18:37:43 +0100 Subject: gnu: emacs-cider: Update to 1.12.0. * gnu/packages/emacs-xyz.scm (emacs-cider): Update to 1.12.0. Change-Id: Icc26d1b51125913009e425279d59db123d3722e1 --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 5ba2a90d26..24800ae18b 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -15449,7 +15449,7 @@ implementation.") (define-public emacs-cider (package (name "emacs-cider") - (version "1.9.0") + (version "1.12.0") (source (origin (method git-fetch) @@ -15458,7 +15458,7 @@ implementation.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0sjscbi3qgwn3wcpq5lz7k4gam69h0svh8wbhxcbskr9ys1rmysp")))) + (base32 "11bibkbv3x0z4ilxra3p91nh8klgg3mg3h4f63pxnnp8fjhqpsph")))) (build-system emacs-build-system) (arguments '(#:include (cons* "^lein\\.sh$" "^clojure\\.sh$" %default-include) -- cgit 1.4.1 From ea2eaaa46cf60280f4827380426a549d8b4d1712 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jan 2024 18:38:37 +0100 Subject: gnu: emacs-clj-refactor: Update to 3.11.2. * gnu/packages/emacs-xyz.scm (emacs-clj-refactor): Update to 3.11.2. Change-Id: I338a2a8a172d5ea486f1d693b7a8c52cca3ec1f7 --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 24800ae18b..3417144cd0 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -13284,7 +13284,7 @@ Clojure projects from templates.") (define-public emacs-clj-refactor (package (name "emacs-clj-refactor") - (version "3.10.0") + (version "3.11.2") (source (origin (method git-fetch) @@ -13293,7 +13293,7 @@ Clojure projects from templates.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "100ngpgvff0xvw1h5krvh40sa3ympl241imwskcv62yk29m9z411")))) + (base32 "1y8xphmmd2ciwnrr7lbiwq0v5c7chq60wssxng9mw0fiz2i3ix22")))) (build-system emacs-build-system) (propagated-inputs (list emacs-cider -- cgit 1.4.1 From 4103d685c0cd1e715b2c599ea0d76746ccc946c4 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jan 2024 18:39:37 +0100 Subject: gnu: emacs-clojure-mode: Update to 5.18.1. * gnu/packages/emacs-xyz.scm (emacs-clojure-mode): Update to 5.18.1. Change-Id: I374f3ebca45fdce8ed84036fe999ace26d73c1ea --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 3417144cd0..b94ab8cbc0 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -13232,7 +13232,7 @@ allowing unprefixed keys to insert their respective characters as expected.") (define-public emacs-clojure-mode (package (name "emacs-clojure-mode") - (version "5.18.0") + (version "5.18.1") (source (origin (method git-fetch) @@ -13241,7 +13241,7 @@ allowing unprefixed keys to insert their respective characters as expected.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0g4x587fpzcj9y59k8sb1g7c6yvga9gjs8ximpmar7d8jq2cv5qa")))) + (base32 "1d5kkq2i8d04k2qfrb31zyjpij92ckbccnzvz01mls3xrvpr57m5")))) (build-system emacs-build-system) (native-inputs (list emacs-buttercup emacs-dash emacs-paredit emacs-s)) -- cgit 1.4.1 From f1059e2c26a128533b40f242291850a9611477dc Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jan 2024 18:40:52 +0100 Subject: gnu: emacs-code-cells: Update to 0.4. * gnu/packages/emacs-xyz.scm (emacs-code-cells): Update to 0.4. Change-Id: Iac21fa3441fc85387ebc3d404205bd4f8716359f --- gnu/packages/emacs-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index b94ab8cbc0..7b4998c61d 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -37636,10 +37636,10 @@ future.") (define-public emacs-code-cells ;; XXX: Upstream does not tag releases. The commit below matches version ;; bump. - (let ((commit "fd68a33eb43b3cbd44fed767f48e230382903592")) + (let ((commit "44546ca256f3da29e3ac884e3d699c8455acbd6e")) (package (name "emacs-code-cells") - (version "0.3") + (version "0.4") (source (origin (method git-fetch) @@ -37648,7 +37648,7 @@ future.") (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "072d5vldjfg9mj4a86bw8xmxl3hmywsnx4f2k6nayqy4whry5fmq")))) + (base32 "1fc5l87kzmnwxmrq2v7x4jzcplq375v9j0h2yz4grzaql3jcc419")))) (build-system emacs-build-system) (home-page "https://github.com/astoff/code-cells.el") (synopsis "Emacs utilities for code split into cells, including Jupyter -- cgit 1.4.1 From 116b63bbabb2c84af75d8b0324edce6c82b929c9 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jan 2024 18:41:57 +0100 Subject: gnu: emacs-consult: Update to 1.1. * gnu/packages/emacs-xyz.scm (emacs-consult): Update to 1.1. Change-Id: I303c64cef5419be1b8ff66a30ca9b7f8f44ccfa1 --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 7b4998c61d..346ab94038 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -11827,7 +11827,7 @@ style, or as multiple word prefixes.") (define-public emacs-consult (package (name "emacs-consult") - (version "0.35") + (version "1.1") (source (origin (method git-fetch) @@ -11835,7 +11835,7 @@ style, or as multiple word prefixes.") (url "https://github.com/minad/consult") (commit version))) (sha256 - (base32 "0a20rfqv2yfwqal1vx6zzg92qgr32p3rp7n6awnyb010jnykqszw")) + (base32 "11fgjgny10falyjs0dlb8cvvfqpvc538mskq4j60j68v36nnkb23")) (file-name (git-file-name name version)))) (build-system emacs-build-system) (arguments -- cgit 1.4.1 From 9e02261d5e7c60d6f10b31bfb5fb6d33b6947f98 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jan 2024 18:43:29 +0100 Subject: gnu: emacs-consult-flycheck: Update to 1.0. * gnu/packages/emacs-xyz.scm (emacs-consult-flycheck): Update to 1.0. Change-Id: Ic52b212be42f59f70365d907d6b8992b7fc1101e --- gnu/packages/emacs-xyz.scm | 41 +++++++++++++++++++---------------------- 1 file changed, 19 insertions(+), 22 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 346ab94038..a8aec80070 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -11982,29 +11982,26 @@ call.") (license license:gpl3+)))) (define-public emacs-consult-flycheck - ;; This particular commit introduces bug fixes above latest release. - (let ((commit "3f2a7c17cc2fe64e0c07e3bf90e33c885c0d7062") - (revision "0")) - (package - (name "emacs-consult-flycheck") - (version (git-version "0.9" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/minad/consult-flycheck") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0cvxl6ynbns3wlpzilhg4ldakb91ikpibbr9wpb2wkzbgi5c766c")))) - (build-system emacs-build-system) - (propagated-inputs (list emacs-consult emacs-flycheck)) - (home-page "https://github.com/minad/consult-flycheck") - (synopsis "Consult integration for Flycheck") - (description - "This package provides the @code{consult-flycheck} command for Emacs, + (package + (name "emacs-consult-flycheck") + (version "1.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/minad/consult-flycheck") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1yi2qa4gbxlyhwc4rj3iidgr1dpdij68gbkgkk55l53p3yl1p2ww")))) + (build-system emacs-build-system) + (propagated-inputs (list emacs-consult emacs-flycheck)) + (home-page "https://github.com/minad/consult-flycheck") + (synopsis "Consult integration for Flycheck") + (description + "This package provides the @code{consult-flycheck} command for Emacs, which integrates @code{Consult} with @code{Flycheck}.") - (license license:gpl3+)))) + (license license:gpl3+))) (define-public emacs-eglot-tempel (let ((commit "e08b203d6a7c495d4b91ed4537506b5f1ea8a84f") -- cgit 1.4.1 From 113cb7980815a1ec7d8eaf346d47fe84e81bd184 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jan 2024 18:44:32 +0100 Subject: gnu: emacs-corfu: Update to 1.1. * gnu/packages/emacs-xyz.scm (emacs-corfu): Update to 1.1. Change-Id: Ic2737697cfe4f5005172e05ab5d7343eb9f0ca23 --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index a8aec80070..a6f75ea88a 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -4581,7 +4581,7 @@ of bibliographic references.") (define-public emacs-corfu (package (name "emacs-corfu") - (version "0.38") + (version "1.1") (source (origin (method git-fetch) @@ -4590,7 +4590,7 @@ of bibliographic references.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0wh1lw96b2nghwk6lic4k01pfqj73ssw710lx3s8nj2lv5bzh94n")))) + (base32 "1c900hl01vf43r6vikjy2glrac1cl2z54rahs5kb4q77cz0z1zxf")))) (build-system emacs-build-system) (arguments (list -- cgit 1.4.1 From baea8607b670cd2391dded0af9b64bc3b209914e Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jan 2024 18:45:37 +0100 Subject: gnu: emacs-denote: Update to 2.2.0. * gnu/packages/emacs-xyz.scm (emacs-denote): Update to 2.2.0. Change-Id: I0552023075748b859dff361794726b7955873d0d --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index a6f75ea88a..11d12eb502 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -17136,7 +17136,7 @@ you to deal with multiple log levels.") (define-public emacs-denote (package (name "emacs-denote") - (version "2.1.0") + (version "2.2.0") (source (origin (method git-fetch) @@ -17145,7 +17145,7 @@ you to deal with multiple log levels.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1gfjckqh170z8slhm0wdqf0570ywgni7b1wdnifxf5cb69h3izpr")))) + (base32 "0w9r5d0br5hpay13vbx78ak2n0yy8bbwlaxnz4p5ggxiv8g5044q")))) (build-system emacs-build-system) (native-inputs (list texinfo)) (home-page "https://protesilaos.com/emacs/denote/") -- cgit 1.4.1 From 8853096fbb755c813623d90c045badd38e4cbccc Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jan 2024 18:48:15 +0100 Subject: gnu: emacs-docker: Update to 2.3.1. * gnu/packages/emacs-xyz.scm (emacs-docker): Update to 2.3.1. Change-Id: Ib463a11ce6295118a846692b480edc4464a80d8f --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 11d12eb502..1217336b86 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -30073,7 +30073,7 @@ constant expressions.") (define-public emacs-docker (package (name "emacs-docker") - (version "2.2.0") + (version "2.3.1") (source (origin (method git-fetch) @@ -30082,7 +30082,7 @@ constant expressions.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1743x2s7ss7h329yayima3pqi62f0qjv56g5y6b7iwk40wpnhv9v")))) + (base32 "13927ns3393q40gxrfzyqh6ajxzfjg14d0srfxi6ild3pmaz0460")))) (inputs (list emacs-undercover)) (propagated-inputs -- cgit 1.4.1 From ac0e32fca2adfefc2b1e8d709d25071b022b0ef5 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jan 2024 18:49:12 +0100 Subject: gnu: emacs-ebib: Update to 2.40.3. * gnu/packages/emacs-xyz.scm (emacs-ebib): Update to 2.40.3. [propagated-inputs]: Add EMACS-COMPAT. Change-Id: I7d37822ee5c41f5155ceb8e6b518a86dfcc9b5b3 --- gnu/packages/emacs-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 1217336b86..2631b9c155 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -23271,7 +23271,7 @@ files to be expanded upon opening them.") (define-public emacs-ebib (package (name "emacs-ebib") - (version "2.39.4") + (version "2.40.3") (source (origin (method git-fetch) @@ -23280,10 +23280,10 @@ files to be expanded upon opening them.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "08j6z4rpnvz7vhdrm7y3prf2jpxclqicid6as4qljysq3czzfhay")))) + (base32 "07pyb76impqpczx6hl6amfs4hfnszfwydp27az46dkqc17hy0fgy")))) (build-system emacs-build-system) (propagated-inputs - (list emacs-biblio emacs-ivy emacs-parsebib)) + (list emacs-biblio emacs-compat emacs-ivy emacs-parsebib)) (home-page "https://joostkremers.github.io/ebib/") (synopsis "BibTeX database manager for Emacs") (description -- cgit 1.4.1 From 3e19d2106bc18292eba28f935e90a483bcaa3e56 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jan 2024 18:50:53 +0100 Subject: gnu: emacs-el-patch: Update to 3.1. * gnu/packages/emacs-xyz.scm (emacs-el-patch): Update to 3.1. Change-Id: Iba1df4faccb7c87052c48e5bed9f974092e9e3ea --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 2631b9c155..809e875177 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -31994,7 +31994,7 @@ all of your projects, then override or add variables on a per-project basis.") (define-public emacs-el-patch (package (name "emacs-el-patch") - (version "3.0") + (version "3.1") (source (origin (method git-fetch) @@ -32003,7 +32003,7 @@ all of your projects, then override or add variables on a per-project basis.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0qkx7f19kl85n56bp3q40200a6ynpkhimcnb3k6x4n6idn6ff2pa")))) + (base32 "0x2x3ci5i428wgagbwjh9qp2zlflkzlrkbpi6qa4fv7dq3vgkrv2")))) (build-system emacs-build-system) (home-page "https://github.com/raxod502/el-patch") (synopsis "Future-proof your Emacs customizations") -- cgit 1.4.1 From 1f500b96b50d79e461bdde17d77a376822c9dc8f Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jan 2024 18:56:04 +0100 Subject: gnu: emacs-eldev: Update to 1.8.1. * gnu/packages/emacs-xyz.scm (emacs-eldev): Update to 1.8.1. Change-Id: Iaaa7ac51401114706b7d4192e363c7a358d86f47 --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 809e875177..04f6c43945 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -23057,7 +23057,7 @@ according to a parsing expression grammar.") (define-public emacs-eldev (package (name "emacs-eldev") - (version "1.7") + (version "1.8.1") (source (origin (method git-fetch) @@ -23066,7 +23066,7 @@ according to a parsing expression grammar.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1q30r6di3r8dxxfbxfyii7kfvjj83c16bxx8ixadki3ix6imd6l5")))) + (base32 "058f2k2qhwbyr7a759wig9x6v6n2rl7zshqjbp4jnhnkcqkr70g5")))) (build-system emacs-build-system) (arguments (list -- cgit 1.4.1 From 3bb78ceb9ddcbef3b5e33a6b4c24eb3c743a28e9 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jan 2024 18:57:30 +0100 Subject: gnu: emacs-emms-print-metadata: Update to 17. * gnu/packages/emacs-xyz.scm (emacs-emms-print-metadata): Update to 17. Change-Id: I9d09cdf200cebab408f103ab33075a0b55973b68 --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 04f6c43945..576a986473 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -3348,14 +3348,14 @@ podcasts) in Emacs.") (define emacs-emms-print-metadata (package (name "emacs-emms-print-metadata") - (version "16") + (version "17") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "emms-" version ".tar")) (sha256 - (base32 "1c18lrrfg1n5vn1av9p7q3jys27pdmxq8pq5gqb6397jnv9xywby")))) + (base32 "103gqlmda24izhb5xrh14k0bwhijr98vnlnmdr9a9xxfla9n5xw0")))) (build-system gnu-build-system) (arguments (list -- cgit 1.4.1 From d7f6c26691bb4a0b9d6fb7514973a524cae12bff Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jan 2024 18:58:44 +0100 Subject: gnu: emacs-geiser: Update to 0.30. * gnu/packages/emacs-xyz.scm (emacs-geiser): Update to 0.30. Change-Id: I18d7c0132a13f8306de536c240edae8521ec9864 --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 576a986473..db9bba57b8 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -435,7 +435,7 @@ input via a small child-frame spawned at the position of the cursor.") (define-public emacs-geiser (package (name "emacs-geiser") - (version "0.29.1") + (version "0.30") (source (origin (method git-fetch) @@ -444,7 +444,7 @@ input via a small child-frame spawned at the position of the cursor.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1jbjhljjbwz2inh8x0ivsx6l1amm550cji6q2rdaay2jl8a8db0q")))) + (base32 "1y9k9v7ll816rs20krchrk080b3a5q4hikskaamvr5hrmi0jw938")))) (build-system emacs-build-system) (arguments '(#:phases -- cgit 1.4.1 From 8855e3017c2dc3c7268ab08015a4aa631b7b6864 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jan 2024 18:59:42 +0100 Subject: gnu: emacs-gptel: Update to 0.5.5. * gnu/packages/emacs-xyz.scm (emacs-gptel): Update to 0.5.5. Change-Id: I3d158ab5a5cd0277c210de706cc78a0561eca1d9 --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index db9bba57b8..a7828773dd 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -482,7 +482,7 @@ e.g. emacs-geiser-guile for Guile.") (define-public emacs-gptel (package (name "emacs-gptel") - (version "0.4.0") + (version "0.5.5") (source (origin (method git-fetch) (uri (git-reference @@ -491,7 +491,7 @@ e.g. emacs-geiser-guile for Guile.") (file-name (git-file-name name version)) (sha256 (base32 - "1aac0jds8hzyfvav06mhqm32v81swrnvyv0ldrkd7qxc2b1x4q7n")))) + "1vqs03plivb1dmal53j53y4r567ggx4781n2mqyjk6s6wfvyvn93")))) (build-system emacs-build-system) (arguments (list -- cgit 1.4.1 From 47a67d34b2b5f01e7092442cb318c61d1876dc25 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jan 2024 19:03:42 +0100 Subject: gnu: emacs-haskell-mode: Update to 17.5. * gnu/packages/emacs-xyz.scm (emacs-haskell-mode): Update to 17.5. * gnu/packages/patches/emacs-haskell-mode-no-redefine-builtin.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Apply file deletion. Change-Id: Ic7d11737af87995610ecf2c3178320901991423d --- gnu/local.mk | 1 - gnu/packages/emacs-xyz.scm | 6 +- .../emacs-haskell-mode-no-redefine-builtin.patch | 75 ---------------------- 3 files changed, 2 insertions(+), 80 deletions(-) delete mode 100644 gnu/packages/patches/emacs-haskell-mode-no-redefine-builtin.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 264b186f41..4b2393bfdd 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1114,7 +1114,6 @@ dist_patch_DATA = \ %D%/packages/patches/emacs-git-email-missing-parens.patch \ %D%/packages/patches/emacs-fix-scheme-indent-function.patch \ %D%/packages/patches/emacs-json-reformat-fix-tests.patch \ - %D%/packages/patches/emacs-haskell-mode-no-redefine-builtin.patch \ %D%/packages/patches/emacs-helpful-fix-tests.patch \ %D%/packages/patches/emacs-highlight-stages-add-gexp.patch \ %D%/packages/patches/emacs-lispy-fix-thread-last-test.patch \ diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index a7828773dd..848eaa7ecb 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -2403,7 +2403,7 @@ replacement.") (define-public emacs-haskell-mode (package (name "emacs-haskell-mode") - (version "17.4") + (version "17.5") (source (origin (method git-fetch) @@ -2412,9 +2412,7 @@ replacement.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "03j94fgw1bljbjqmikbn9mnrfifxf7g9zrb727zmnnrjwyi0wd4n")) - (patches - (search-patches "emacs-haskell-mode-no-redefine-builtin.patch")))) + (base32 "0ndi986rxq9gz61ss2vazadn7rn0niv1gnpk9nfq9sw3m336glsf")))) (propagated-inputs (list emacs-dash)) (native-inputs diff --git a/gnu/packages/patches/emacs-haskell-mode-no-redefine-builtin.patch b/gnu/packages/patches/emacs-haskell-mode-no-redefine-builtin.patch deleted file mode 100644 index 65ace2ee5e..0000000000 --- a/gnu/packages/patches/emacs-haskell-mode-no-redefine-builtin.patch +++ /dev/null @@ -1,75 +0,0 @@ -From faa95a784d2c74c72e70367a5d531df6dd61aeab Mon Sep 17 00:00:00 2001 -From: Steve Purcell -Date: Sun, 6 Aug 2023 16:41:48 +0200 -Subject: [PATCH] Don't redefine built-in function - -Fixes #1817 ---- - tests/haskell-indent-tests.el | 14 ++++++++------ - tests/haskell-indentation-tests.el | 14 ++++++++------ - 2 files changed, 16 insertions(+), 12 deletions(-) - -diff --git a/tests/haskell-indent-tests.el b/tests/haskell-indent-tests.el -index 7196405b8..9a3de4ad3 100644 ---- a/tests/haskell-indent-tests.el -+++ b/tests/haskell-indent-tests.el -@@ -40,11 +40,13 @@ - ;; (haskell-indent-put-region-in-literate (point-min) (point-max) -1) - ;; (buffer-substring-no-properties (point-min) (point-max)))))) - --(defsubst string-trim-left (string) -- "Remove leading whitespace from STRING." -- (if (string-match "\\`[ \t\n\r]+" string) -- (replace-match "" t t string) -- string)) -+(if (fboundp 'string-trim-left) -+ (defalias 'haskell--string-trim-left 'string-trim-left) -+ (defun haskell--string-trim-left (string &optional regexp) -+ "Remove leading whitespace from STRING." -+ (if (string-match (concat "\\`\\(?:" (or regexp "[ \t\n\r]+") "\\)") string) -+ (substring string (match-end 0)) -+ string))) - - (defun haskell-indent-format-info (info) - (if (cdr info) -@@ -128,7 +130,7 @@ macro quotes them for you." - :expected-result - ,(if allow-failure :failed :passed) - (haskell-indent-check -- ,(string-trim-left source) -+ ,(haskell--string-trim-left source) - ,@(mapcar (lambda (x) - (list 'quote x)) - test-cases)))))) -diff --git a/tests/haskell-indentation-tests.el b/tests/haskell-indentation-tests.el -index 4889b76a7..cd783a4f4 100644 ---- a/tests/haskell-indentation-tests.el -+++ b/tests/haskell-indentation-tests.el -@@ -33,11 +33,13 @@ - - ;;; Code: - --(defsubst string-trim-left (string) -- "Remove leading whitespace from STRING." -- (if (string-match "\\`[ \t\n\r]+" string) -- (replace-match "" t t string) -- string)) -+(if (fboundp 'string-trim-left) -+ (defalias 'haskell--string-trim-left 'string-trim-left) -+ (defun haskell--string-trim-left (string &optional regexp) -+ "Remove leading whitespace from STRING." -+ (if (string-match (concat "\\`\\(?:" (or regexp "[ \t\n\r]+") "\\)") string) -+ (substring string (match-end 0)) -+ string))) - - (defun haskell-indentation-check (source &rest test-cases) - "Check if `haskell-indentation-find-indentations' returns expected results. -@@ -115,7 +117,7 @@ macro quotes them for you." - :expected-result - ,(if allow-failure :failed :passed) - (haskell-indentation-check -- ,(string-trim-left source) -+ ,(haskell--string-trim-left source) - ,@(mapcar (lambda (x) - (list 'quote x)) - test-cases)))))) -- cgit 1.4.1 From ff808d4d2229236af70735bd6de35e75f9c6de10 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jan 2024 19:05:31 +0100 Subject: gnu: emacs-helm: Update to 3.9.6. * gnu/packages/emacs-xyz.scm (emacs-helm): Update to 3.9.6. Change-Id: Ica2d7af2db908e37f17f6e4f8d8b83de3a5af349 --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 848eaa7ecb..e86ffa7104 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -15148,7 +15148,7 @@ ack, ag, helm and pt.") (define-public emacs-helm (package (name "emacs-helm") - (version "3.9.5") + (version "3.9.6") (source (origin (method git-fetch) @@ -15157,7 +15157,7 @@ ack, ag, helm and pt.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "067nc728dfbwzfs07z26cwcqjj00l4lvw3n9bl1zw094v0x6hxxm")))) + (base32 "01b2608gsly557927wdkp71mbakk7h23icjnxq097r12zra4agc7")))) (build-system emacs-build-system) (propagated-inputs (list emacs-async emacs-popup)) -- cgit 1.4.1 From 60dc957e2f1994cb0eb97dfd3910cd0fcdd988e5 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jan 2024 19:07:34 +0100 Subject: gnu: emacs-inf-ruby: Update to 2.8.1. * gnu/packages/emacs-xyz.scm (emacs-inf-ruby): Update to 2.8.1. Change-Id: I7f46a1ee645a24f96077cc70bf0ad30706979eb5 --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index e86ffa7104..8aa64b319d 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -6999,7 +6999,7 @@ then refine or modify the search results.") (define-public emacs-inf-ruby (package (name "emacs-inf-ruby") - (version "2.8.0") + (version "2.8.1") (source (origin (method git-fetch) @@ -7008,7 +7008,7 @@ then refine or modify the search results.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0dxjcr34xsa0m25yw8pp4iwjq8cqdgs6r8ls4lwfb69rnii7jmn5")))) + (base32 "043ml560z69rlgw60w7m03r6cdwp8gfi1zs38qykg2yi98l6gg3x")))) (build-system emacs-build-system) (home-page "https://github.com/nonsequitur/inf-ruby") (synopsis "Provides a REPL buffer connected to a Ruby subprocess in Emacs") -- cgit 1.4.1 From 2c5cf24680e1e1683992e09a3eff521efcc0381a Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jan 2024 19:08:19 +0100 Subject: gnu: emacs-jinx: Update to 1.1. * gnu/packages/emacs-xyz.scm (emacs-jinx): Update to 1.1. Change-Id: I58919dd335a7f93339b362e95fc99449e80d2c31 --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 8aa64b319d..e23bd9b9f0 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -10650,7 +10650,7 @@ sgml/html integration, and indentation (working with sgml).") (define-public emacs-jinx (package (name "emacs-jinx") - (version "1.0") + (version "1.1") (source (origin (method git-fetch) @@ -10660,7 +10660,7 @@ sgml/html integration, and indentation (working with sgml).") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "00rlp7iby02zd3sqigpyskph4a26r0dgp53y17hm4xjr6zqifhz5")))) + (base32 "08ajkhpds3m8dk1m2h84vcn6pg5w6hbq55xyd50593kb012a2pmz")))) (build-system emacs-build-system) (arguments (list -- cgit 1.4.1 From c38dd0c482ad63dfce53392a9dcaf185bc17fa59 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jan 2024 19:09:24 +0100 Subject: gnu: emacs-js2-mode: Update to 20231224. * gnu/packages/emacs-xyz.scm (emacs-js2-mode): Update to 20231224. Change-Id: Iffbe84ddee2559b526ba4345f4ff14f6ac1ca050 --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index e23bd9b9f0..80d04484f4 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -13816,7 +13816,7 @@ to all the other commands, too.") (define-public emacs-js2-mode (package (name "emacs-js2-mode") - (version "20230408") + (version "20231224") (source (origin (method git-fetch) @@ -13825,7 +13825,7 @@ to all the other commands, too.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1vwykla43315wlky52807pn2nm508dx6593alk7hnrl2qkl7852s")))) + (base32 "11ppp1m7hl4ii79zjw62bqvksyzh5xmp3q1qw21wlj2s47mkpm73")))) (build-system emacs-build-system) (arguments `(#:tests? #t -- cgit 1.4.1 From 0a5cde84f62fcc11c7ba4916e38c739aea132aa5 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jan 2024 19:11:01 +0100 Subject: gnu: emacs-json-mode: Update to 1.9.0. * gnu/packages/emacs-xyz.scm (emacs-json-mode): Update to 1.9.0. Change-Id: I47d1ff6f21cdb1055ab0dea61e0768f391087a2e --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 80d04484f4..fe63347395 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -19844,7 +19844,7 @@ a @url{http://json.org/, JSON} file.") (define-public emacs-json-mode (package (name "emacs-json-mode") - (version "1.8.0") + (version "1.9.0") (source (origin (method git-fetch) @@ -19853,7 +19853,7 @@ a @url{http://json.org/, JSON} file.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0r0k56q58kb133l9x9nbisz9p2kbphfgw1l4g2xp0pjqsc9wvq8z")))) + (base32 "0irz9gpw43wkhiq8828wm9nsc3baqg299dgly9iv7jiygk2lp14s")))) (build-system emacs-build-system) (propagated-inputs (list emacs-json-snatcher)) -- cgit 1.4.1 From 5a977eb98cf611826d9f2c3cef54f95aac002e99 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jan 2024 19:14:50 +0100 Subject: gnu: emacs-keycast: Update to 1.3.3. * gnu/packages/emacs-xyz.scm (emacs-keycast): Update to 1.3.3. Change-Id: I771419e3cd2281fa8577e411e66fe7d006a91f89 --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index fe63347395..8c8685c2dc 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -5882,7 +5882,7 @@ kmonad's configuration files (@file{.kbd}).") (define-public emacs-keycast (package (name "emacs-keycast") - (version "1.3.2") + (version "1.3.3") (source (origin (method git-fetch) @@ -5891,7 +5891,7 @@ kmonad's configuration files (@file{.kbd}).") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0nqx53a1hjgibqrmkdic6syqb2fb5fkna0k5dbbg6igb5k775c8r")))) + (base32 "0hwmjy90ngnbvhxiyf4l3lb7212i5bsqdz73qnfg1iwa7vgkv1q7")))) (build-system emacs-build-system) (propagated-inputs (list emacs-compat)) -- cgit 1.4.1 From 27ab4e948aa65d9b006582236be3d89e2503e457 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jan 2024 19:15:52 +0100 Subject: gnu: emacs-marginalia: Update to 1.5. * gnu/packages/emacs-xyz.scm (emacs-marginalia): Update to 1.5. Change-Id: Id57e4fe99764856dc46ae3324077a00b6ac0af52 --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 8c8685c2dc..f871301e53 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -12090,7 +12090,7 @@ expansion and overwriting the marked region with a new snippet completion.") (define-public emacs-marginalia (package (name "emacs-marginalia") - (version "1.3") + (version "1.5") (source (origin (method git-fetch) @@ -12099,7 +12099,7 @@ expansion and overwriting the marked region with a new snippet completion.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0fjbif2l5fj4xjb9drqfc8zxla8y7mha0imdd1nm4x83i0y4fa6l")))) + (base32 "12ncif2lv6d7r2g87lyjr7idbqa283ijb3qgd5a61i3760czs7d6")))) (build-system emacs-build-system) (arguments (list -- cgit 1.4.1 From 7ce1c8aecb32e3fc0cc134fc566a40ae6a059966 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jan 2024 19:17:46 +0100 Subject: gnu: emacs-mc-extras: Update to 1.3.0. * gnu/packages/emacs-xyz.scm (emacs-mc-extras): Update to 1.3.0. Change-Id: I0550c0a04e6a5ed188e4740e2c65d68162822a9e --- gnu/packages/emacs-xyz.scm | 42 ++++++++++++++++++++---------------------- 1 file changed, 20 insertions(+), 22 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index f871301e53..1f553008fc 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -9689,30 +9689,28 @@ one Emacs buffer.") (license license:gpl3+)))) (define-public emacs-mc-extras - (let ((commit "053abc52181b8718559d7361a587bbb795faf164") - (revision "1")) - (package - (name "emacs-mc-extras") - (version (git-version "1.2.4" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/knu/mc-extras.el") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 "16y48qrd20m20vypvys5jp4v4gc1qrqlkm75s1pk1r68i9zrw481")))) - (build-system emacs-build-system) - (propagated-inputs - (list emacs-multiple-cursors)) - (home-page "https://github.com/knu/mc-extras.el") - (synopsis "Extra functions for manipulating multiple cursors") - (description - "This package provides additional functions for + (package + (name "emacs-mc-extras") + (version "1.3.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/knu/mc-extras.el") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1xrlp192wi51qpzgpkn9ph5zlpj08ifd8r3444llskyv0bay6g14")))) + (build-system emacs-build-system) + (propagated-inputs + (list emacs-multiple-cursors)) + (home-page "https://github.com/knu/mc-extras.el") + (synopsis "Extra functions for manipulating multiple cursors") + (description + "This package provides additional functions for @code{multiple-cursors}, including functions for marking s-expressions, comparing characters, removing cursors, and more.") - (license license:bsd-2)))) + (license license:bsd-2))) (define-public emacs-substitute (package -- cgit 1.4.1 From 791bd4ca89c394a8597fbf52cbe7585b8a6de93c Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jan 2024 19:19:42 +0100 Subject: gnu: emacs-mood-line: Update to 3.1.1. * gnu/packages/emacs-xyz.scm (emacs-mood-line): Update to 3.1.1. Change-Id: I3511f594fb499722bf2f22581e5c151d920552f0 --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 1f553008fc..20a637484a 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -34338,7 +34338,7 @@ icon support, git integration, and several other utilities.") (define-public emacs-mood-line (package (name "emacs-mood-line") - (version "2.2.0") + (version "3.1.1") (source (origin (method git-fetch) @@ -34347,7 +34347,7 @@ icon support, git integration, and several other utilities.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1z50vr3ymn466z26qh0ybbm8aaizl5ghi471a47cp8bnnn9y9dqg")))) + (base32 "19yh93kkyailczv1yyg7jhmzwl768sg0rk4as5kgqays87h9bnfn")))) (build-system emacs-build-system) (home-page "https://gitlab.com/jessieh/mood-line") (synopsis "Minimal mode-line for Emacs") -- cgit 1.4.1 From 62898c267694b9f71b281c1a941790b31b38e4fb Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jan 2024 19:20:37 +0100 Subject: gnu: emacs-jsonrpc: Update to 1.0.23. * gnu/packages/emacs-xyz.scm (emacs-jsonrpc): Update to 1.0.23. Change-Id: Ie676ff2b113e962a328f637a88caeefb58892ee7 --- gnu/packages/emacs-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 20a637484a..0d1ce80d27 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -19866,10 +19866,10 @@ highlighting.") ;; upstreamed. By convention, it should refer to a commit in which ;; jsonrpc.el was actually touched. In order to find this, you can refer to ;; . - (let ((commit "2d835d64ba339bb375f0d55c4679149d6da3f209")) ;version bump + (let ((commit "731cfee3b45361158d88bded3c32c9a48ace7bdb")) ;version bump (package (name "emacs-jsonrpc") - (version "1.0.17") + (version "1.0.23") (source (origin (method git-fetch) @@ -19879,7 +19879,7 @@ highlighting.") (file-name (git-file-name name version)) (sha256 (base32 - "1jv8pcq0yad5wmqsdvamwq6674p6ghpyyznbd2x5mlxyp6za6cx5")))) + "0xrlqjd4kj7z5ssidi159n8fm1hx35if2h1ds586ppf8y057bmhn")))) (build-system emacs-build-system) (arguments (list #:phases -- cgit 1.4.1 From 8553499aee8fb61dbc7db28e0023cd4261819dd8 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jan 2024 19:23:17 +0100 Subject: gnu: emacs-osm: Update to 1.2. * gnu/packages/emacs-xyz.scm (emacs-osm): Update to 1.2. Change-Id: I794f486f2fc9dd4dab186c7dbd77f8a79532dedd --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 0d1ce80d27..4dced7f78c 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -38226,7 +38226,7 @@ hacker.") (define-public emacs-osm (package (name "emacs-osm") - (version "0.14") + (version "1.2") (source (origin (method git-fetch) (uri (git-reference @@ -38235,7 +38235,7 @@ hacker.") (file-name (git-file-name name version)) (sha256 (base32 - "1y0zkfc27pnhz5hqpapsqin2kc6al1zjgd6cd4nhzqmh49h81bsb")))) + "0mmq83ill1vzx1x07vxjn53di2cskid2gmj5qqa6694s1xzpywf4")))) (build-system emacs-build-system) (arguments (list #:phases #~(modify-phases %standard-phases -- cgit 1.4.1 From 80bbdf4f106c2716c82eda5d35bdb67757e3f717 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jan 2024 19:24:00 +0100 Subject: gnu: emacs-org: Update to 9.6.14. * gnu/packages/emacs-xyz.scm (emacs-org): Update to 9.6.14. Change-Id: I75bd6ce590f269c2796ebf63a7b9ff51cf9d1b6e --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 4dced7f78c..6211a8e0e4 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -16526,7 +16526,7 @@ passive voice.") (define-public emacs-org (package (name "emacs-org") - (version "9.6.12") + (version "9.6.14") (source (origin (method git-fetch) @@ -16535,7 +16535,7 @@ passive voice.") (commit (string-append "release_" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1anzvsa7kj2rp419qc5rv8jz50h7np391lcgbxcin727njyc7wpr")))) + (base32 "0g59nfx8gqzkqidqvyvh83yd7mahjm9khhr1ccwqj3r4phwpciqx")))) (build-system emacs-build-system) (arguments (list -- cgit 1.4.1 From aca2259d7d9fa0e4d5027c932f2b9ff7f723810f Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jan 2024 19:25:19 +0100 Subject: gnu: emacs-parseclj: Update to 1.1.1. * gnu/packages/emacs-xyz.scm (emacs-parseclj): Update to 1.1.1. Change-Id: I9a2bbbf3e575623993421bedee0ebce58658b0c8 --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 6211a8e0e4..f2f17e55c7 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -34974,7 +34974,7 @@ It uses parseclj's shift-reduce parser internally.") (define-public emacs-parseclj (package (name "emacs-parseclj") - (version "1.1.0") + (version "1.1.1") (source (origin (method git-fetch) @@ -34983,7 +34983,7 @@ It uses parseclj's shift-reduce parser internally.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0ifc9gyp7hr97ssnsqxiwrzmldqysz874crlg6jm4iy5l9fyls22")))) + (base32 "1iz7qbsq4whmb3iqy777jlm47chjp62313hc6nfcp0lfqsanmcmv")))) (build-system emacs-build-system) (propagated-inputs (list emacs-a)) (home-page "https://cider.mx") -- cgit 1.4.1 From 746b4d639faeb58bacf8457bd3b55541eb7d5885 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jan 2024 19:26:21 +0100 Subject: gnu: emacs-parseedn: Update to 1.2.1. * gnu/packages/emacs-xyz.scm (emacs-parseedn): Update to 1.2.1. Change-Id: I4d6fd0b3a5e134002695368ea1184c24d9fcef8d --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index f2f17e55c7..1fd8ae4620 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -34951,7 +34951,7 @@ data, including buffers, window configuration, variables, and more.") (define-public emacs-parseedn (package (name "emacs-parseedn") - (version "1.2.0") + (version "1.2.1") (source (origin (method git-fetch) @@ -34960,7 +34960,7 @@ data, including buffers, window configuration, variables, and more.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1pxm50i74id3c4c0j2ifac0wx5zkdq431dmcqbyb6w6k0s05l23c")))) + (base32 "0b2jralm5lm4z4lpkn8ygzfga67xsalaszc8gqqv36khmz2mrckc")))) (build-system emacs-build-system) (propagated-inputs (list emacs-a emacs-parseclj)) -- cgit 1.4.1 From 0e1237204ddc07ae8e3c9f6de3583dd457cf4794 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jan 2024 19:27:40 +0100 Subject: gnu: emacs-php-mode: Update to 1.25.1. * gnu/packages/emacs-xyz.scm (emacs-php-mode): Update to 1.25.1. Change-Id: Ia9b91ee48f2faa55bf479568cd1f42b49a060b4d --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 1fd8ae4620..54a826c220 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -18671,7 +18671,7 @@ in Emacs.") (define-public emacs-php-mode (package (name "emacs-php-mode") - (version "1.25.0") + (version "1.25.1") (home-page "https://github.com/emacs-php/php-mode") (source (origin @@ -18681,7 +18681,7 @@ in Emacs.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1vwbxaxjvz2hhb6pli1bh1qlrc2r991zl4i18wiwk78ffanqx6q0")))) + (base32 "1pxv4c63dma1il6w8vl2485yddp0ngm3gvfdqwjjszanfdxa4fg1")))) (build-system emacs-build-system) (arguments (list -- cgit 1.4.1 From de03608b35b0a6ce180a24d8496b007dcccaad9a Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jan 2024 19:28:47 +0100 Subject: gnu: emacs-prescient: Update to 6.2. * gnu/packages/emacs-xyz.scm (emacs-prescient): Update to 6.2. Change-Id: I11041e12583ec5a84924daf70b56690a2de772e5 --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 54a826c220..24dd9248c8 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -11740,7 +11740,7 @@ include installing, removing or visiting the homepage.") (define-public emacs-prescient (package (name "emacs-prescient") - (version "6.1") + (version "6.2") (source (origin (method git-fetch) @@ -11749,7 +11749,7 @@ include installing, removing or visiting the homepage.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1mc9pjb80bxcmzaylfwh0sgpvwbx3h35jalznwz464hw3vqfff83")))) + (base32 "1vj21kcqlsa02nvslmxgxsbv4pc93gakj4x2a6rbk87zl6ccw7pk")))) (build-system emacs-build-system) (propagated-inputs (list emacs-company emacs-corfu emacs-ivy emacs-selectrum emacs-vertico)) -- cgit 1.4.1 From 8023d1d25ad2e2c23225456b6b1245b99d780182 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jan 2024 19:31:00 +0100 Subject: gnu: emacs-org-ql: Update to 0.8. * gnu/packages/emacs-xyz.scm (emacs-org-ql): Update to 0.8. [propagated-inputs]: Add EMACS-COMPAT. Change-Id: I62149e53160ceb249ef49c052c28ecb30dd2a717 --- gnu/packages/emacs-xyz.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 24dd9248c8..4022f5a2cf 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -23142,7 +23142,7 @@ interactive commands and functions, such as @code{completing-read}.") (define-public emacs-org-ql (package (name "emacs-org-ql") - (version "0.7.3") + (version "0.8") (source (origin (method git-fetch) (uri (git-reference @@ -23150,7 +23150,7 @@ interactive commands and functions, such as @code{completing-read}.") (commit (string-append "v" version)))) (sha256 (base32 - "1jdkk837z8fw2dff5v8fh2dhx7rz348sf5jqpj2aja5ji48p0fs9")) + "0l403n75xyjf14pbk7hfdzajv393mk5m0xp9csv8dl805rgzrdkr")) (file-name (git-file-name name version)))) (build-system emacs-build-system) (arguments @@ -23160,7 +23160,8 @@ interactive commands and functions, such as @code{completing-read}.") (native-inputs (list emacs-buttercup emacs-with-simulated-input emacs-xr)) (propagated-inputs - (list emacs-dash + (list emacs-compat + emacs-dash emacs-f emacs-helm emacs-helm-org -- cgit 1.4.1 From 310f7e94dbf3032e9458320c52c4b1b81cf636c2 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jan 2024 19:32:16 +0100 Subject: gnu: emacs-org-re-reveal: Update to 3.24.2. * gnu/packages/emacs-xyz.scm (emacs-org-re-reveal): Update to 3.24.2. Change-Id: I35af71a8f93c823bc405de51553ffbfcf14d9040 --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 4022f5a2cf..18c2e66e68 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -24773,7 +24773,7 @@ powerful Org contents.") (define-public emacs-org-re-reveal (package (name "emacs-org-re-reveal") - (version "3.23.0") + (version "3.24.2") (source (origin (method git-fetch) @@ -24782,7 +24782,7 @@ powerful Org contents.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1ss71iy1xnhr3p4mmfbnbgvp7kjqxpqag49f851wgmmwwg8gajvd")))) + (base32 "10x1cinn97wlm3dmv35dxrs78gfzgw59qf4j57m3vgss5q93mqq5")))) (build-system emacs-build-system) (propagated-inputs (list emacs-htmlize emacs-org)) -- cgit 1.4.1 From f4667feaea1d853bd8389caae4ac5c3d8213cc8f Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jan 2024 19:33:11 +0100 Subject: gnu: emacs-org-web-tools: Update to 1.3. * gnu/packages/emacs-xyz.scm (emacs-org-web-tools): Update to 1.3. Change-Id: Id555aa9788cdeaa7a6fe1c27d33839b22b22234b --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 18c2e66e68..3c1b8ef993 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -28265,7 +28265,7 @@ This package also includes a @code{yt-dlp} front-end.") (define-public emacs-org-web-tools (package (name "emacs-org-web-tools") - (version "1.2") + (version "1.3") (source (origin (method git-fetch) @@ -28275,7 +28275,7 @@ This package also includes a @code{yt-dlp} front-end.") (file-name (git-file-name name version)) (sha256 (base32 - "1w24d1cxzgjqycqz894kg3707n3ckwpv5cmbywfaffsz1v5i2p3a")))) + "0x1j1y2pl6a8f97cw04nm0w6g4jh449cjfsr2aryn316ms4nj1a0")))) (build-system emacs-build-system) (propagated-inputs (list emacs-compat emacs-dash emacs-esxml emacs-request emacs-s)) -- cgit 1.4.1 From 4828d4bf4f203770f0cc1c7c980b184d341de356 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jan 2024 19:36:08 +0100 Subject: gnu: emacs-transient: Update to 0.5.3. * gnu/packages/emacs-xyz.scm (emacs-transient): Update to 0.5.3. Change-Id: Ie770cec3eab70e9a5e010adf3341d1e7dc9590db --- gnu/packages/emacs-xyz.scm | 70 ++++++++++++++++++++++------------------------ 1 file changed, 33 insertions(+), 37 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 3c1b8ef993..a91e1b0c9c 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -30713,47 +30713,43 @@ as Emacs Lisp.") (license license:gpl3+))) (define-public emacs-transient - ;; Use this unreleased commit to support a recent Magit change needed to add - ;; Reviewed-by: tags for any contributor. - (let ((commit "cc0fa80530b02493f73b870032bfcdd1435286cd") - (revision "0")) - (package - (name "emacs-transient") - (version (git-version "0.4.3" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/magit/transient") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "10yaanpz3krh3f9vzyafg6n85yp8sk58gj9vrpsqg926x4m0w1p1")))) - (build-system emacs-build-system) - (arguments - `(#:tests? #f ;no test suite - #:phases (modify-phases %standard-phases - (add-after 'unpack 'build-info-manual - (lambda _ - (invoke "make" "info") - ;; Move the info file to lisp so that it gets - ;; installed by the emacs-build-system. - (rename-file "docs/transient.info" - "lisp/transient.info"))) - (add-after 'build-info-manual 'enter-lisp-directory - (lambda _ - (chdir "lisp")))))) - (native-inputs (list texinfo)) - (propagated-inputs (list emacs-compat)) - (home-page "https://magit.vc/manual/transient") - (synopsis "Transient commands in Emacs") - (description - "Taking inspiration from prefix keys and prefix arguments + (package + (name "emacs-transient") + (version "0.5.3") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/magit/transient") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0fr0pan4dffckfywnx7a0dkb2l71fnc47cqqqb1lckqwr1gr9z6l")))) + (build-system emacs-build-system) + (arguments + `(#:tests? #f ;no test suite + #:phases (modify-phases %standard-phases + (add-after 'unpack 'build-info-manual + (lambda _ + (invoke "make" "info") + ;; Move the info file to lisp so that it gets + ;; installed by the emacs-build-system. + (rename-file "docs/transient.info" + "lisp/transient.info"))) + (add-after 'build-info-manual 'enter-lisp-directory + (lambda _ + (chdir "lisp")))))) + (native-inputs (list texinfo)) + (propagated-inputs (list emacs-compat)) + (home-page "https://magit.vc/manual/transient") + (synopsis "Transient commands in Emacs") + (description + "Taking inspiration from prefix keys and prefix arguments in Emacs, Transient implements a similar abstraction involving a prefix command, infix arguments and suffix commands. We could call this abstraction a \"transient command\", but because it always involves at least two commands (a prefix and a suffix) we prefer to call it just a \"transient\".") - (license license:gpl3+)))) + (license license:gpl3+))) (define-public emacs-forge (package -- cgit 1.4.1 From cb0fd4b4124248364c95991e554d736616dcc795 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jan 2024 19:37:08 +0100 Subject: gnu: emacs-vertico: Update to 1.6. * gnu/packages/emacs-xyz.scm (emacs-vertico): Update to 1.6. Change-Id: I944b8016f1afdd7d588f9940da6c9bd5b73c6787 --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index a91e1b0c9c..abfba3f092 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -37401,7 +37401,7 @@ and preferred services can easily be configured.") (define-public emacs-vertico (package (name "emacs-vertico") - (version "1.4") + (version "1.6") (source (origin (method git-fetch) @@ -37410,7 +37410,7 @@ and preferred services can easily be configured.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0pf6qm89nysrri3xx7pda32yfsyv5fwswg6695qivldpq2biwx2x")))) + (base32 "088x0xqmhicdg44xprhimay0v9hcy12g15c7lk5kvhylxmkbg8wb")))) (build-system emacs-build-system) (arguments (list -- cgit 1.4.1 From db1d91ae6ffa40a807d14b857f6f418e0b7139a2 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jan 2024 19:38:23 +0100 Subject: gnu: emacs-yaml: Update to 0.5.5. * gnu/packages/emacs-xyz.scm (emacs-yaml): Update to 0.5.5. Change-Id: Id20c84596a74cd44055fc70892c4b843555c5ca7 --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index abfba3f092..f9cc2db1f1 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -14979,7 +14979,7 @@ that uses the standard completion function completing-read.") (define-public emacs-yaml (package (name "emacs-yaml") - (version "0.5.4") + (version "0.5.5") (source (origin (method git-fetch) @@ -14988,7 +14988,7 @@ that uses the standard completion function completing-read.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "10sdcihgd8yvdf7yab5fsvq65amp25msjh7mbrxgk3w4zc96fxzi")))) + (base32 "0qq9jr1ihk1b5wfvppyvb8c2pq2gma9wysggd22iln4nqz2mjc81")))) (build-system emacs-build-system) (home-page "https://github.com/zkry/yaml.el") (synopsis "YAML parser in Elisp") -- cgit 1.4.1 From f2102cb5b9239be2ed2023b908b726af542e0124 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jan 2024 19:40:22 +0100 Subject: gnu: emacs-yaml: Run tests. * gnu/packages/emacs-xyz.scm (emacs-yaml): [arguments]: Run tests. Change-Id: Ie395af0fb107313170509986e1ee2d0d996c6689 --- gnu/packages/emacs-xyz.scm | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index f9cc2db1f1..2a24f4a106 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -14990,6 +14990,13 @@ that uses the standard completion function completing-read.") (sha256 (base32 "0qq9jr1ihk1b5wfvppyvb8c2pq2gma9wysggd22iln4nqz2mjc81")))) (build-system emacs-build-system) + (arguments + (list + #:tests? #true + #:test-command #~(list "emacs" "--batch" "-Q" + "-l" "yaml.el" + "-l" "yaml-tests.el" + "-f" "ert-run-tests-batch-and-exit"))) (home-page "https://github.com/zkry/yaml.el") (synopsis "YAML parser in Elisp") (description -- cgit 1.4.1 From 7593364d70fa81b761c1d9b0269510b21364c6fa Mon Sep 17 00:00:00 2001 From: Mădălin Ionel Patrașcu Date: Wed, 27 Dec 2023 11:02:34 +0100 Subject: gnu: Add r-scgate. * gnu/packages/bioconductor.scm (r-scgate): New variable. Change-Id: I441bbea5a68882f5f619dea72abdf84619c9d02f --- gnu/packages/bioconductor.scm | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 316aa20026..427fa4ebfe 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -10314,6 +10314,49 @@ includes methods formerly found in the scran package, and the new fast and comprehensive scDblFinder method.") (license license:gpl3))) +;; This is a CRAN package, but it depends on packages from Bioconductor. +(define-public r-scgate + (package + (name "r-scgate") + (version "1.6.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "scGate" version)) + (sha256 + (base32 "0h12d36zjc6fvxbhkxrzbpvw49z9fgyn1jc941q70ajw1yqi2hhh")))) + (properties `((upstream-name . "scGate"))) + (build-system r-build-system) + (propagated-inputs + (list r-biocparallel + r-dplyr + r-ggplot2 + r-ggridges + r-patchwork + r-reshape2 + r-seurat + r-ucell)) + (native-inputs (list r-knitr)) + (home-page "https://github.com/carmonalab/scGate") + (synopsis + "Marker-based cell type purification for single-cell sequencing data") + (description + "This package provides a method to purify a cell type or cell population +of interest from heterogeneous datasets. scGate package automatizes +marker-based purification of specific cell populations, without requiring +training data or reference gene expression profiles. scGate takes as input a +gene expression matrix stored in a Seurat object and a @acronym{GM, gating +model}, consisting of a set of marker genes that define the cell population of +interest. It evaluates the strength of signature marker expression in each +cell using the rank-based method UCell, and then performs @acronym{kNN, +k-nearest neighbor} smoothing by calculating the mean UCell score across +neighboring cells. kNN-smoothing aims at compensating for the large degree of +sparsity in scRNAseq data. Finally, a universal threshold over kNN-smoothed +signature scores is applied in binary decision trees generated from the +user-provided gating model, to annotate cells as either “pure” or “impure”, +with respect to the cell population of interest.") + (license license:gpl3))) + ;; This is a CRAN package, but it depends on packages from Bioconductor. (define-public r-scistreer (package -- cgit 1.4.1 From c8e2b85ed1cbb3e17701c838db797ab718d18be0 Mon Sep 17 00:00:00 2001 From: Mădălin Ionel Patrașcu Date: Wed, 27 Dec 2023 11:02:35 +0100 Subject: gnu: Add r-stacas. * gnu/packages/bioinformatics.scm (r-stacas): New variable. Change-Id: I258a315465ed88b8013d26a36718250c950aa107 --- gnu/packages/bioinformatics.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 2e4bc876d4..34039b2eb5 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -1070,6 +1070,42 @@ of single-cell data using Seurat, RcppML nmf, SingleCellExperiments and similar.") (license license:gpl2+)))) +(define-public r-stacas + (package + (name "r-stacas") + (version "2.2.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/carmonalab/STACAS") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "13i0h5i6vlbrb8ndq9gr81560z9d74b2c7m3rjfzls01irjza9hm")))) + (properties `((upstream-name . "STACAS"))) + (build-system r-build-system) + (propagated-inputs + (list r-biocneighbors + r-biocparallel + r-ggplot2 + r-ggridges + r-pbapply + r-r-utils + r-seurat)) + (home-page "https://github.com/carmonalab/STACAS") + (synopsis "Sub-type anchoring correction for alignment in Seurat") + (description + "This package implements methods for batch correction and integration of +scRNA-seq datasets, based on the Seurat anchor-based integration framework. +In particular, STACAS is optimized for the integration of heterogenous +datasets with only limited overlap between cell sub-types (e.g. TIL sets of +CD8 from tumor with CD8/CD4 T cells from lymphnode), for which the default +Seurat alignment methods would tend to over-correct biological differences. +The 2.0 version of the package allows the users to incorporate explicit +information about cell-types in order to assist the integration process.") + (license license:gpl3))) + (define-public r-stringendo (let ((commit "15594b1bba11048a812874bafec0eea1dcc8618a") (revision "1")) -- cgit 1.4.1 From 404c4a5abac34c2a645e1af9a60c8899bd790ed9 Mon Sep 17 00:00:00 2001 From: Mădălin Ionel Patrașcu Date: Wed, 27 Dec 2023 11:02:36 +0100 Subject: gnu: Add r-projectils. * gnu/packages/bioinformatics.scm (r-projectils): New variable. Change-Id: Ia975cfcb9c79e59b029c6839dc87b5dcb89bf72a --- gnu/packages/bioinformatics.scm | 45 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 34039b2eb5..56219c55a5 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -10349,6 +10349,51 @@ data. This package includes panel editing or renaming for FCS files, bead-based normalization and debarcoding.") (license license:gpl3)))) +(define-public r-projectils + (let ((commit "cc73b97471b4b6eea11ce779b5c4a7dc5c3e1709") + (revision "1")) + (package + (name "r-projectils") + (version (git-version "3.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/carmonalab/ProjecTILs") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0dpzvbhhb9andnj7angpj32cgkwd6rs6qgpl6i21pqzcn6vqqhqw")))) + (properties `((upstream-name . "ProjecTILs"))) + (build-system r-build-system) + (propagated-inputs + (list r-biocneighbors + r-biocparallel + r-dplyr + r-ggplot2 + r-matrix + r-patchwork + r-pheatmap + r-pracma + r-purrr + r-rcolorbrewer + r-reshape2 + r-scales + r-scgate + r-seurat + r-seuratobject + r-stacas + r-ucell + r-umap + r-uwot)) + (home-page "https://github.com/carmonalab/ProjecTILs") + (synopsis "Reference-based analysis of scRNA-seq data") + (description + "This package implements methods to project single-cell RNA-seq data +onto a reference atlas, enabling interpretation of unknown cell transcriptomic +states in the the context of known, reference states.") + (license license:gpl3)))) + (define-public r-presto (let ((commit "052085db9c88aa70a28d11cc58ebc807999bf0ad") (revision "0")) -- cgit 1.4.1 From 707921ba23593b044381e15ac60143e13f4aa0e6 Mon Sep 17 00:00:00 2001 From: Sergey Trofimov Date: Tue, 2 Jan 2024 09:56:38 +0100 Subject: gnu: tdlib: Update to 1.8.23. * gnu/packages/messaging.scm (tdlib): Update to 1.8.23. Signed-off-by: Andrew Tropin --- gnu/packages/messaging.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 1c5bc4bbd7..491901edf3 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -2636,11 +2636,11 @@ replacement.") (license license:gpl2+))) (define-public tdlib - (let ((commit "4ed0b23c9c99868ab4d2d28e8ff244687f7b3144") + (let ((commit "27c3eaeb4964bd5f18d8488e354abde1a4383e49") (revision "0")) (package (name "tdlib") - (version (git-version "1.8.20" revision commit)) + (version (git-version "1.8.23" revision commit)) (source (origin (method git-fetch) @@ -2648,7 +2648,7 @@ replacement.") (url "https://github.com/tdlib/td") (commit commit))) (sha256 - (base32 "16kprlcnphi89yfwgnlaxjwwb1xx24az8xd710rx8cslb4zv00qw")) + (base32 "14f65dfmg2p5hyvi3lffvvazwcd3i3jrrw3c2pwrc5yfgxk3662g")) (file-name (git-file-name name version)))) (build-system cmake-build-system) (arguments -- cgit 1.4.1 From 344108df6882270b3f50b2411edd9af23027560f Mon Sep 17 00:00:00 2001 From: Sergey Trofimov Date: Tue, 2 Jan 2024 09:56:39 +0100 Subject: gnu: emacs-telega-server: Update to 0.8.230. * gnu/packages/emacs-xyz.scm (emacs-telega-server): Update to 0.8.230. Signed-off-by: Andrew Tropin --- gnu/packages/emacs-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 2a24f4a106..ad02b91c56 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -34193,11 +34193,11 @@ other @code{helm-type-file} sources such as @code{helm-locate}.") (license license:gpl3+))) (define-public emacs-telega-server - (let ((commit "4f08c835c08e762137ca04e12055cf9dc0b2b8cf") + (let ((commit "304705fa007c3dae3c5d0c6dc66641ae783f0081") (revision "0")) (package (name "emacs-telega-server") - (version (git-version "0.8.203" revision commit)) + (version (git-version "0.8.230" revision commit)) (source (origin (method git-fetch) @@ -34205,7 +34205,7 @@ other @code{helm-type-file} sources such as @code{helm-locate}.") (url "https://github.com/zevlg/telega.el") (commit commit))) (sha256 - (base32 "02iv2cxwsmfpx2b6wvp7l22izvqw21f1b98jm0yihmfh39idxwn8")) + (base32 "02yxjaxpf2f6pjg3ixw7jvx56x6lfh30mnsmiz1p2yi64kyllaan")) (file-name (git-file-name "emacs-telega" version)) (patches (search-patches "emacs-telega-path-placeholder.patch" -- cgit 1.4.1 From 8f03c69b428923dc4d51cda23b10aa7fa7d89f05 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 2 Jan 2024 13:34:22 +0100 Subject: gnu: r-vcd: Update to 1.4-12. * gnu/packages/cran.scm (r-vcd): Update to 1.4-12. Change-Id: I5db4c5aeb21692312e05dc6483c4e52a6ec23888 --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index bf9e94adee..a7630f25fa 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -9498,14 +9498,14 @@ modeling for empirical income distributions.") (define-public r-vcd (package (name "r-vcd") - (version "1.4-11") + (version "1.4-12") (source (origin (method url-fetch) (uri (cran-uri "vcd" version)) (sha256 (base32 - "0ch9ks25ab4h4fh4y267s0psvc4ndyaplk8ddva2j54yd1ayhm3s")))) + "127dkln826ah5ydp3pmd5bqyns9m9m6yrjnmn7fir4r9al8yycf9")))) (build-system r-build-system) (propagated-inputs (list r-colorspace r-lmtest r-mass)) -- cgit 1.4.1 From 85dabe71e62587b835d5abc425ee8826be552a7b Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 2 Jan 2024 17:46:45 +0100 Subject: gnu: emacs-org-web-tools: Fix build. * gnu/packages/emacs-xyz.scm (emacs-org-web-tools)[propagated-inputs]: Add EMACS-PLZ. Change-Id: Icf62d3774257f7b93e114503e6c31ea2fb81d807 --- gnu/packages/emacs-xyz.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index ad02b91c56..bb3c905252 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -28285,7 +28285,12 @@ This package also includes a @code{yt-dlp} front-end.") "0x1j1y2pl6a8f97cw04nm0w6g4jh449cjfsr2aryn316ms4nj1a0")))) (build-system emacs-build-system) (propagated-inputs - (list emacs-compat emacs-dash emacs-esxml emacs-request emacs-s)) + (list emacs-compat + emacs-dash + emacs-esxml + emacs-plz + emacs-request + emacs-s)) (inputs (list pandoc)) (arguments -- cgit 1.4.1 From f1bf43cdff9a06d91f4598c90203c685a908f624 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 2 Jan 2024 18:34:15 +0100 Subject: gnu: r-excelr: Reuse minify-build-system tools. * gnu/packages/cran.scm (r-excelr)[arguments]: Use minify-build-system. [native-inputs]: Use git repository for jexcel.js. [description]: Reformat. Change-Id: I82f7e466bbab6ad837359f04ee616a7766433c13 --- gnu/packages/cran.scm | 65 ++++++++++++++++++++++++++++++--------------------- 1 file changed, 38 insertions(+), 27 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index a7630f25fa..85c527dc32 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -7437,6 +7437,10 @@ consistency with the base functions in the evd package is provided, so that user can safely interchange most code.") (license license:gpl3))) +;; This package contains minified JavaScript: jExcel CE Spreadsheet, +;; version 3.9.1. It is not clear how to obtain this particular +;; version as there is no tag for 3.9.1. There only is 3.6.1 and +;; 4.2.0 at https://github.com/jspreadsheet/ce. (define-public r-excelr (package (name "r-excelr") @@ -7452,37 +7456,44 @@ can safely interchange most code.") (properties `((upstream-name . "excelR"))) (build-system r-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'process-javascript - (lambda* (#:key inputs #:allow-other-keys) - (with-directory-excursion "inst/htmlwidgets/lib/jexcel/js/" - (let ((source (assoc-ref inputs "js-jexcel")) - (target "jexcel.min.js")) - (format #true "Processing ~a --> ~a~%" - source target) - (invoke "esbuild" source "--minify" - (string-append "--outfile=" target))))))))) - (native-inputs - `(("esbuild" ,esbuild) - ;; There is no tag for this particular commit, but comparison of the - ;; contents of the JavaScript files point to this commit as the most - ;; likely source. - ("js-jexcel" - ,(origin - (method url-fetch) - (uri (string-append "https://raw.githubusercontent.com/jspreadsheet/ce/" - "8af1960f76e6803bebc5750013d2ebe95354e88a/dist/jexcel.js")) - (sha256 - (base32 - "0y88hsr9d8cpnvdmbm17m328pc4kc5wbcv02kzmhm0bryzhviw7h")))))) + (list + #:modules + '((guix build r-build-system) + (guix build minify-build-system) + (guix build utils)) + #:imported-modules + `(,@%r-build-system-modules + (guix build minify-build-system)) + #:phases + #~(modify-phases (@ (guix build r-build-system) %standard-phases) + (add-after 'unpack 'process-javascript + (lambda* (#:key inputs #:allow-other-keys) + (with-directory-excursion "inst/htmlwidgets/lib/jexcel/js" + (minify (search-input-file inputs "/dist/jexcel.js") + #:target "jexcel.min.js"))))))) (propagated-inputs (list r-htmlwidgets r-jsonlite)) + (native-inputs + (list esbuild + ;; There is no tag for this particular commit, but comparison of + ;; the contents of the JavaScript files point to this commit as the + ;; most likely source. + (let* ((commit "8af1960f76e6803bebc5750013d2ebe95354e88a") + (version (git-version "3.9.1" "0" commit))) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jspreadsheet/ce") + (commit commit))) + (file-name (git-file-name "jexcel" version)) + (sha256 + (base32 + "1zk0wc4h0vax7zgimhwqq2icrvjr84agm3qv42l16gim7gq7fqfq")))))) (home-page "https://github.com/Swechhya/excelR") (synopsis "Wrapper of the JavaScript library jExcel") (description - "This package provides an R interface to the jExcel library to -create web-based interactive tables and spreadsheets compatible with -spreadsheet software.") + "This package provides an R interface to the jExcel library to create +web-based interactive tables and spreadsheets compatible with spreadsheet +software.") (license license:expat))) (define-public r-extremes -- cgit 1.4.1 From 5b030de3866f450209f39079abe63a5fbcb719a0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 2 Jan 2024 19:22:13 +0100 Subject: gnu: Add r-epidish. * gnu/packages/bioconductor.scm (r-epidish): New variable. Change-Id: Ib8ca5980149a5d3eabb3d4a68ae686b855e372d4 --- gnu/packages/bioconductor.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 427fa4ebfe..72a0fe377f 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -7462,6 +7462,37 @@ chromosome region or transcript models of lincRNA genes.") ;; No version specified (license license:lgpl3+))) +(define-public r-epidish + (package + (name "r-epidish") + (version "2.18.0") + (source + (origin + (method url-fetch) + (uri (bioconductor-uri "EpiDISH" version)) + (sha256 + (base32 "170ym3y6gd1kxghz2g5ynvgi1wrxx87b568cjcvzidpqkrkg87s6")))) + (properties `((upstream-name . "EpiDISH"))) + (build-system r-build-system) + (propagated-inputs (list r-e1071 + r-locfdr + r-mass + r-matrix + r-matrixstats + r-quadprog + r-stringr)) + (native-inputs (list r-knitr)) + (home-page "https://github.com/sjczheng/EpiDISH") + (synopsis "Epigenetic dissection of intra-sample-heterogeneity") + (description + "@code{EpiDISH} is a R package to infer the proportions of a priori known +cell-types present in a sample representing a mixture of such cell-types. +Right now, the package can be used on DNAm data of whole blood, generic +epithelial tissue and breast tissue. Besides, the package provides a function +that allows the identification of differentially methylated cell-types and +their directionality of change in Epigenome-Wide Association Studies.") + (license license:gpl2))) + (define-public r-fastseg (package (name "r-fastseg") -- cgit 1.4.1 From e8814809c2de6fe2f23169775207b3d2e537724f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 2 Jan 2024 19:23:51 +0100 Subject: gnu: Add r-toast. * gnu/packages/bioconductor.scm (r-toast): New variable. Change-Id: I922508bce0bdf0304e2f40d93a63ffdb58d03aa6 --- gnu/packages/bioconductor.scm | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 72a0fe377f..1ea5e47321 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -10867,6 +10867,44 @@ identifier translation via the GDC API.") "This package implements widgets to provide user interfaces.") (license license:artistic2.0))) +(define-public r-toast + (package + (name "r-toast") + (version "1.16.0") + (source + (origin + (method url-fetch) + (uri (bioconductor-uri "TOAST" version)) + (sha256 + (base32 "00wpgs2zdrgrh9xmp6m5h9xgv85mhdi36qvwg9gwbz9i7cfabmy1")))) + (properties `((upstream-name . "TOAST"))) + (build-system r-build-system) + (propagated-inputs (list r-corpcor + r-doparallel + r-epidish + r-ggally + r-ggplot2 + r-limma + r-nnls + r-quadprog + r-summarizedexperiment + r-tidyr)) + (native-inputs (list r-knitr)) + (home-page "https://bioconductor.org/packages/TOAST") + (synopsis "Tools for the analysis of heterogeneous tissues") + (description + "This package is devoted to analyzing high-throughput data (e.g. gene +expression microarray, DNA methylation microarray, RNA-seq) from complex +tissues. Current functionalities include + +@enumerate +@item detect cell-type specific or cross-cell type differential signals +@item tree-based differential analysis +@item improve variable selection in reference-free deconvolution +@item partial reference-free deconvolution with prior knowledge. +@end enumerate") + (license license:gpl2))) + ;; TODO: check javascript (define-public r-trackviewer (package -- cgit 1.4.1 From fb3ac987c94e0a77b5c39913dace0b565afc3291 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 2 Jan 2024 21:40:44 +0100 Subject: gnu: Add r-wasabi. * gnu/packages/bioinformatics.scm (r-wasabi): New variable. Change-Id: I5ce6c47f1fb3b1d5dfedd0977e53cb70ce379077 --- gnu/packages/bioinformatics.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 56219c55a5..e03eb21531 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -1192,6 +1192,32 @@ shape. This package provides an @code{htmlwidget} for building streamgraph visualizations.") (license license:expat)))) +(define-public r-wasabi + (let ((commit "8c33cabde8d18c2657cd6e38e7cb834f87cf9846") + (revision "1")) + (package + (name "r-wasabi") + (version (git-version "1.0.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/COMBINE-lab/wasabi") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0rpdj6n4cnx8n2zl60dzgl638474sg49dknwi9x3qb4g56dpphfa")))) + (properties `((upstream-name . "wasabi"))) + (build-system r-build-system) + (propagated-inputs (list r-data-table r-rhdf5 r-rjson)) + (home-page "https://github.com/COMBINE-lab/wasabi") + (synopsis "Use Sailfish and Salmon with Sleuth") + (description + "This package converts the output of the Sailfish and Salmon RNA-seq +quantification tools so that it can be used with the Sleuth differential +analysis package.") + (license license:bsd-3)))) + (define-public pbbam (package (name "pbbam") -- cgit 1.4.1 From ebd00a4e917461ba770be60637b2b041795b2f44 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 2 Jan 2024 21:45:16 +0100 Subject: gnu: r-tgutil: Update to 0.1.15-1.db4ff8b. * gnu/packages/statistics.scm (r-tgutil): Update to 0.1.15-1.db4ff8b. [description]: Update to use full sentences. Change-Id: I6cb7e60b0759bd307a676783a9ceb9c451ce7a82 --- gnu/packages/statistics.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 92bf3d5d96..c2cf68fca8 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -6448,7 +6448,7 @@ can load multiple parameters to the current environment.") (license license:gpl3+)))) (define-public r-tgutil - (let ((commit "0e4a2e84e5cf1f74bc66df0a3d8eac89633fd7b1") + (let ((commit "db4ff8b98082f8e4dbdeacb452641d215fd3c7ff") (revision "1")) (package (name "r-tgutil") @@ -6461,7 +6461,7 @@ can load multiple parameters to the current environment.") (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "0pmacpzhrigprlpl8b5j4xz7l110ifw98017xwk569dghbf8zrq1")))) + (base32 "00rsqs7f896piywh84jr8fkphbbx4jb7radf6znhhj6fip63yn91")))) (properties `((upstream-name . "tgutil"))) (build-system r-build-system) (propagated-inputs (list r-broom @@ -6481,7 +6481,9 @@ can load multiple parameters to the current environment.") r-tidyr)) (home-page "https://github.com/tanaylab/tgutil") (synopsis "Simple utility functions for Tanay lab code") - (description "Shared utility functions for multiple Tanay lab packages.") + (description + "This package provides simple utility functions that are shared +across several packages maintained by the Tanay lab.") (license license:gpl3)))) (define-public r-catterplots -- cgit 1.4.1 From 8ed9ffedd4b7a01fe1ecb73e75931d2ccfcd4923 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 2 Jan 2024 21:49:13 +0100 Subject: gnu: Add r-sleuth. * gnu/packages/bioinformatics.scm (r-sleuth): New variable. Change-Id: Ic358945548631fd3ac5de96b2efcf1fd93005898 --- gnu/packages/bioinformatics.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index e03eb21531..bdad03b000 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -10634,6 +10634,43 @@ analysis of cell types, subtypes, transcriptional gradients,cell-cycle variation, gene modules and their regulatory models and more.") (license license:expat)))) +(define-public r-sleuth + (package + (name "r-sleuth") + (version "0.30.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/pachterlab/sleuth") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "09xgc7r6iisjkk0c0wn0q56zy0aph386kphwixfzq4422y7vlqci")))) + (properties `((upstream-name . "sleuth"))) + (build-system r-build-system) + (propagated-inputs (list r-aggregation + r-data-table + r-dplyr + r-ggplot2 + r-lazyeval + r-matrixstats + r-pheatmap + r-reshape2 + r-rhdf5 + r-shiny + r-tidyr)) + (native-inputs (list r-knitr)) + (home-page "https://github.com/pachterlab/sleuth") + (synopsis "Tools for investigating RNA-Seq") + (description + "Sleuth is a program for differential analysis of RNA-Seq data. +It makes use of quantification uncertainty estimates obtained via Kallisto for +accurate differential analysis of isoforms or genes, allows testing in the +context of experiments with complex designs, and supports interactive +exploratory data analysis via sleuth live.") + (license license:gpl3))) + (define-public r-snapatac (package (name "r-snapatac") -- cgit 1.4.1 From f4628000024219bf373922ff4a6fa752eb821797 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 2 Jan 2024 22:46:00 +0100 Subject: gnu: Add cpat. * gnu/packages/bioinformatics.scm (cpat): New variable. Change-Id: I7b3acca1bdec2610d7cdaaf6f96440fe000421dd --- gnu/packages/bioinformatics.scm | 44 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index bdad03b000..41cac296fe 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -617,6 +617,50 @@ Compared to cellSNP, this package is more efficient with higher speed and less memory usage.") (license license:asl2.0)))) +(define-public cpat + (package + (name "cpat") + (version "3.0.4") + (source (origin + (method url-fetch) + (uri (pypi-uri "CPAT" version)) + (sha256 + (base32 + "0dfrwwbhv1n4nh2a903d1qfb30fgxgya89sa70aci3wzf8h2z0vd")) + (modules '((guix build utils))) + (snippet + '(for-each delete-file-recursively + (list ".eggs" + "lib/__pycache__/" + "lib/cpmodule/__pycache__/"))))) + (build-system pyproject-build-system) + (arguments + (list + #:phases + '(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (with-directory-excursion "test" + ;; There is no test4.fa + (substitute* "test.sh" + ((".*-g test4.fa.*") "")) + (invoke "bash" "test.sh")))))))) + (propagated-inputs + (list python-numpy python-pysam)) + (inputs + (list r-minimal)) + (home-page "https://wlcb.oit.uci.edu/cpat/") + (synopsis "Alignment-free distinction between coding and noncoding RNA") + (description + "CPAT is a method to distinguish coding and noncoding RNA by using a +logistic regression model based on four pure sequence-based, linguistic +features: ORF size, ORF coverage, Ficket TESTCODE, and Hexamer usage bias. +Linguistic features based method does not require other genomes or protein +databases to perform alignment and is more robust. Because it is +alignment-free, it runs much faster and also easier to use.") + (license license:gpl2+))) + (define-public pbcopper (package (name "pbcopper") -- cgit 1.4.1 From 5312b63ea0032648316b7cfad947d6d1cdb99ed1 Mon Sep 17 00:00:00 2001 From: Ekaitz Zarraga Date: Tue, 12 Dec 2023 21:34:49 +0100 Subject: gnu: icedove-minimal: Add argument to desktop file. Icedove was not able to handle mailto: links, even if it responded to them, it only activated the window, but didn't compose a new email. Calling it directly by `icedove mailto:...` worked. According to: It was missing the argument in the `Exec` line of the desktop file. * gnu/packages/gnuzilla.scm (icedove-minimal)[phases] {install-desktop-file}: Add arguments to Exe line in .desktop file. Change-Id: I3de5e57ed2c5eef23eee88e264487e6460c174b3 Signed-off-by: Efraim Flashner --- gnu/packages/gnuzilla.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 7318ec727c..54643c314e 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -1774,7 +1774,7 @@ ca495991b7852b855")) (format #t "[Desktop Entry]~@ Name=Icedove~@ - Exec=~a/bin/icedove~@ + Exec=~a/bin/icedove %u~@ Icon=icedove~@ GenericName=Mail/News Client~@ Categories=Network;Email;~@ -- cgit 1.4.1 From e2ad70c951c0c8a79883fe232afa0ae88a6f1d84 Mon Sep 17 00:00:00 2001 From: Zheng Junjie Date: Sat, 30 Dec 2023 12:53:29 +0800 Subject: gnu: glew: Fix cross-compiling. gnu/packages/gl.scm(glew): [arguments]<#:make-flags>: when cross-compiling, use {cc,strip}-for-target. Change-Id: I365f6635120a85359083beb88cb138f09a99fe33 --- gnu/packages/gl.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 2c109ee124..b0ee413acd 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -690,7 +690,12 @@ glxdemo, glxgears, glxheads, and glxinfo.") #t)))) (build-system gnu-build-system) (arguments - (list #:make-flags #~(list (string-append "GLEW_PREFIX=" #$output) + (list #:make-flags #~(list #$@(if (%current-target-system) + #~((string-append "CC=" #$(cc-for-target)) + (string-append "LD=" #$(cc-for-target)) + (string-append "STRIP=" #$(strip-for-target))) + #~()) + (string-append "GLEW_PREFIX=" #$output) (string-append "GLEW_DEST=" #$output)) #:phases #~(modify-phases %standard-phases -- cgit 1.4.1 From 80f6e5a9ea87bb6665d6323c5a73ad5e929409fa Mon Sep 17 00:00:00 2001 From: Zheng Junjie Date: Sat, 30 Dec 2023 13:31:36 +0800 Subject: gnu: vulkan-loader: Fix cross-compiling. gnu/packages/vulkan.scm(vulkan-loader): [arguments]<#:configure-flags>: When cross-compiling, set -DBUILD_TESTS=OFF and -DUSE_GAS=OFF. [inputs]: Add libxrandr. Change-Id: I580e1c77c4b9b5a3483e93ff9eda78fbe07ec292 --- gnu/packages/vulkan.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index ca771a30b1..285d6be7f5 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2021 Mathieu Othacehe ;;; Copyright © 2022 Kaelyn Takata ;;; Copyright © 2022 dan +;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -270,7 +271,9 @@ interpretation of the specifications for these languages.") (dirname (dirname (search-input-directory %build-inputs "include/vulkan")))) - "-DBUILD_TESTS=ON") + #$@(if (%current-target-system) + #~("-DBUILD_TESTS=OFF" "-DUSE_GAS=OFF") + #~("-DBUILD_TESTS=ON"))) #:phases #~(modify-phases %standard-phases (add-after 'unpack 'fix-pkg-config-file @@ -299,7 +302,7 @@ interpretation of the specifications for these languages.") python wayland)) (inputs - (list vulkan-headers)) + (list vulkan-headers libxrandr)) (home-page "https://github.com/KhronosGroup/Vulkan-Loader") (synopsis "Khronos official ICD loader and validation layers for Vulkan") -- cgit 1.4.1 From 24eb32f2806fb7d42f4b560422d3f1715cd46e85 Mon Sep 17 00:00:00 2001 From: Zheng Junjie Date: Sat, 30 Dec 2023 18:52:02 +0800 Subject: gnu: slurp: Fix cross-compiling. gnu/packages/image.scm(slurp): [native-inputs]: When cross compiling, add wayland, pkg-config-for-build. Change-Id: I5000d681b1428c5b7d123239c1f1ba00f121fb7e Signed-off-by: Mathieu Othacehe --- gnu/packages/image.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 79f1a293ec..9179cb8b90 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -2259,7 +2259,11 @@ identical visual appearance.") (base32 "1i6g4dfiv2mwkjvvrx3wizb1n05xmd4j9nkhdii4klwd1gdrhjwd")))) (build-system meson-build-system) (native-inputs - (list pkg-config scdoc)) + (append (if (%current-target-system) + ;; for wayland-scanner + (list wayland pkg-config-for-build) + '()) + (list pkg-config scdoc))) (inputs (list cairo libxkbcommon wayland wayland-protocols)) (home-page "https://github.com/emersion/slurp") -- cgit 1.4.1 From aed1b570815cc539e5039dc213535c2850de40f6 Mon Sep 17 00:00:00 2001 From: Zheng Junjie Date: Sat, 30 Dec 2023 18:52:03 +0800 Subject: gnu: slurp: Update to 1.5.0. * gnu/packages/image.scm (slurp): Update to 1.5.0. Change-Id: I72a60742af26a2544ee21e052963c0a8ad549d0e Signed-off-by: Mathieu Othacehe --- gnu/packages/image.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 9179cb8b90..acf0cc8570 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -2247,7 +2247,7 @@ identical visual appearance.") (define-public slurp (package (name "slurp") - (version "1.4.0") + (version "1.5.0") (source (origin (method git-fetch) @@ -2256,7 +2256,7 @@ identical visual appearance.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1i6g4dfiv2mwkjvvrx3wizb1n05xmd4j9nkhdii4klwd1gdrhjwd")))) + (base32 "0wlml42c3shma50bsvqzll7p3zn251jaf0jm59q2idks8gg1zkyq")))) (build-system meson-build-system) (native-inputs (append (if (%current-target-system) -- cgit 1.4.1 From 2d38579e010b802aaef489be1da8c74e5ba53f15 Mon Sep 17 00:00:00 2001 From: Zheng Junjie Date: Sat, 30 Dec 2023 19:07:19 +0800 Subject: gnu: grim: Update to 1.4.1. * gnu/packages/image.scm (grim): Update to 1.4.1. [home-page]: update to new home-page [source]: update url. Change-Id: I8c2e4ebbf198df7cedda7c1c946ecb33a6e92fb1 Signed-off-by: Mathieu Othacehe --- gnu/packages/image.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index acf0cc8570..9c3e797437 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -2225,20 +2225,20 @@ identical visual appearance.") (define-public grim (package (name "grim") - (version "1.4.0") + (version "1.4.1") (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/emersion/grim") + (url "https://git.sr.ht/~emersion/grim") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1b1k5cmmk7gzis0rncyl98lnhdwpjkdsv9pada5mmgxcpka6f0lp")))) + (base32 "1snp4qlj05d0nx4f0qr8kywv0i1xcw5i278ybng1rand2alhkjz5")))) (build-system meson-build-system) (native-inputs (list pkg-config scdoc)) (inputs (list pixman libpng libjpeg-turbo wayland wayland-protocols)) - (home-page "https://github.com/emersion/grim") + (home-page "https://sr.ht/~emersion/grim/") (synopsis "Create screenshots from a Wayland compositor") (description "grim can create screenshots from a Wayland compositor.") ;; MIT license. -- cgit 1.4.1 From ae63bb5e7de70011d8861c23ebabc946210ec56f Mon Sep 17 00:00:00 2001 From: Zheng Junjie Date: Sat, 30 Dec 2023 19:07:20 +0800 Subject: gnu: grim: Fix cross-compiling. gnu/packages/image.scm(grim): [native-inputs]: When cross compiling, add wayland, pkg-config-for-build. Change-Id: I9dbf99d0bc92a62b17ded36937827dfbc6b29bb2 Signed-off-by: Mathieu Othacehe --- gnu/packages/image.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 9c3e797437..baaff1d0c1 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -2236,7 +2236,11 @@ identical visual appearance.") (sha256 (base32 "1snp4qlj05d0nx4f0qr8kywv0i1xcw5i278ybng1rand2alhkjz5")))) (build-system meson-build-system) - (native-inputs (list pkg-config scdoc)) + (native-inputs (append (if (%current-target-system) + ;; for wayland-scanner + (list pkg-config-for-build wayland) + '()) + (list pkg-config scdoc))) (inputs (list pixman libpng libjpeg-turbo wayland wayland-protocols)) (home-page "https://sr.ht/~emersion/grim/") (synopsis "Create screenshots from a Wayland compositor") -- cgit 1.4.1 From c880652fec3303c0d57c076f7187d95d9396983f Mon Sep 17 00:00:00 2001 From: Zheng Junjie Date: Mon, 1 Jan 2024 13:59:09 +0800 Subject: gnu: libassuan: Fix cross-compiling. gnu/packages/gnupg.scm(libassuan): [arguments]: When cross-compiling, set the --with-libgpg-error-prefix configure option. Change-Id: I320c48f320c34939a8e94589610beb5c40fdf53a Signed-off-by: Mathieu Othacehe --- gnu/packages/gnupg.scm | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 73e9c3a78a..a6ba57d7f3 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -23,6 +23,7 @@ ;;; Copyright © 2021 Aleksandr Vityazev ;;; Copyright © 2022 Maxim Cournoyer ;;; Copyright © 2023 Janneke Nieuwenhuizen +;;; Copyright © 2024 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -236,6 +237,12 @@ generation.") (base32 "1r1lvcp67gn5lfrj1g388sd77ca6qwnmxndirdysd71gk362z34f")))) (build-system gnu-build-system) + (arguments (if (%current-target-system) + (list #:configure-flags + #~(list (string-append + "--with-libgpg-error-prefix=" + #$(this-package-input "libgpg-error")))) + '())) (propagated-inputs (list libgpg-error pth)) (home-page "https://gnupg.org") -- cgit 1.4.1 From 2f642b602398ab32b18faceecd074f49da92e95e Mon Sep 17 00:00:00 2001 From: Connor Clark Date: Thu, 28 Dec 2023 23:47:37 -0500 Subject: services: docker: Add config-file option. * gnu/services/docker.scm (docker-configuration)[config-file] Add file-like field. * doc/guix.texi (Docker Service): Add information about config-file. Signed-off-by: Mathieu Othacehe --- doc/guix.texi | 3 +++ gnu/services/docker.scm | 12 +++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/doc/guix.texi b/doc/guix.texi index 3002cdfa13..924dbf23ba 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -39711,6 +39711,9 @@ This must be a list of strings where each string has the form "TMPDIR=/tmp/dockerd") @end lisp +@item @code{config-file} (type: maybe-file-like) +JSON configuration file pass to @command{dockerd}. + @end table @end deftp diff --git a/gnu/services/docker.scm b/gnu/services/docker.scm index 72ef7d74db..4d32b96847 100644 --- a/gnu/services/docker.scm +++ b/gnu/services/docker.scm @@ -61,6 +61,8 @@ oci-container-service-type oci-container-shepherd-service)) +(define-maybe file-like) + (define-configuration docker-configuration (docker (file-like docker) @@ -87,6 +89,9 @@ loop-back communications.") (environment-variables (list '()) "Environment variables to set for dockerd") + (config-file + (maybe-file-like) + "JSON configuration file to pass to dockerd") (no-serialization)) (define %docker-accounts @@ -131,7 +136,8 @@ loop-back communications.") (enable-iptables? (docker-configuration-enable-iptables? config)) (environment-variables (docker-configuration-environment-variables config)) (proxy (docker-configuration-proxy config)) - (debug? (docker-configuration-debug? config))) + (debug? (docker-configuration-debug? config)) + (config-file (docker-configuration-config-file config))) (shepherd-service (documentation "Docker daemon.") (provision '(dockerd)) @@ -144,6 +150,10 @@ loop-back communications.") (start #~(make-forkexec-constructor (list (string-append #$docker "/bin/dockerd") "-p" "/var/run/docker.pid" + #$@(if (not (eq? config-file %unset-value)) + (list #~(string-append + "--config-file=" #$config-file)) + '()) #$@(if debug? '("--debug" "--log-level=debug") '()) -- cgit 1.4.1 From d14389f10ec8c7e4c0a91c1c5094befc4445ddf0 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:34:39 +0000 Subject: gnu: Add (gnu packages golang-web) module. * gnu/packages/golang-web.scm: New file. * gnu/local.mk: Add to gnu/packages/golang-web.scm scope. --- gnu/local.mk | 1 + gnu/packages/golang-web.scm | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 gnu/packages/golang-web.scm (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 4b2393bfdd..ee25e1535e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -306,6 +306,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/gobby.scm \ %D%/packages/golang.scm \ %D%/packages/golang-check.scm \ + %D%/packages/golang-web.scm \ %D%/packages/gperf.scm \ %D%/packages/gpodder.scm \ %D%/packages/gps.scm \ diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm new file mode 100644 index 0000000000..feb2854d9c --- /dev/null +++ b/gnu/packages/golang-web.scm @@ -0,0 +1,39 @@ +;;; GNU Guix --- Functional package management for GNU +;;; +;;; 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 . + +(define-module (gnu packages golang-web) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix packages) + #:use-module (guix build-system go) + #:use-module (guix git-download) + #:use-module (gnu packages) + #:use-module (gnu packages golang)) + +;;; Commentary: +;;; +;;; Golang modules (libraries) related to HTML, CSS, SCSS, JavaScript, JSON, +;;; Web-framework, REST-API or similar functionality. +;;; +;;; Please: Try to add new module packages in alphabetic order. +;;; +;;; Code: + +;;; +;;; Avoid adding new packages to the end of this file. To reduce the chances +;;; of a merge conflict, place them above by existing packages with similar +;;; functionality or similar names. +;;; -- cgit 1.4.1 From a0006c4dc5354c703c74b7561a3e7866297e95dd Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:34:40 +0000 Subject: gnu: go-github-com-gorilla-mux: Move to (gnu packages golang-web). * gnu/packages/golang.scm (go-github-com-gorilla-mux): Move from here... * gnu/packages/golang-web.scm: ...to here. * gnu/packages/finance.scm: Add (gnu packages golang-web) module. * gnu/packages/web.scm: As above... Change-Id: I1cb94377d581af93593dbb29cb60ddf5fb287ada --- gnu/packages/finance.scm | 1 + gnu/packages/golang-web.scm | 25 +++++++++++++++++++++++++ gnu/packages/golang.scm | 24 ------------------------ gnu/packages/web.scm | 1 + 4 files changed, 27 insertions(+), 24 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 98a220385b..749f741710 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -93,6 +93,7 @@ #:use-module (gnu packages gnome) #:use-module (gnu packages gnupg) #:use-module (gnu packages golang) + #:use-module (gnu packages golang-web) #:use-module (gnu packages graphviz) #:use-module (gnu packages groff) #:use-module (gnu packages gsasl) diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index feb2854d9c..c779600411 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -1,4 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2018 Pierre-Antoine Rouby +;;; Copyright © 2020 Martin Becze ;;; ;;; This file is part of GNU Guix. ;;; @@ -32,6 +34,29 @@ ;;; ;;; Code: +(define-public go-github-com-gorilla-mux + (package + (name "go-github-com-gorilla-mux") + (version "1.8.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/gorilla/mux") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "18f0q9qxgq1yh4ji07mqhiydfcwvi56z9d775v7dc7yckj33kpdk")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/gorilla/mux")) + (home-page "https://github.com/gorilla/mux") + (synopsis "URL router and dispatcher for Go") + (description + "Gorilla/Mux implements a request router and dispatcher for matching +incoming requests with their respective handler.") + (license license:bsd-3))) + ;;; ;;; Avoid adding new packages to the end of this file. To reduce the chances ;;; of a merge conflict, place them above by existing packages with similar diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index fb77f610e7..edc8c2bec0 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -4862,30 +4862,6 @@ containers.") (description "This package provides @code{gorilla/context}, which is a general purpose registry for global request variables in the Go programming language.") (license license:bsd-3)))) -(define-public go-github-com-gorilla-mux - (package - (name "go-github-com-gorilla-mux") - (version "1.8.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/gorilla/mux") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "18f0q9qxgq1yh4ji07mqhiydfcwvi56z9d775v7dc7yckj33kpdk")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/gorilla/mux")) - (home-page "https://github.com/gorilla/mux") - (synopsis "URL router and dispatcher for Go") - (description - "Gorilla/Mux implements a request router and dispatcher for matching -incoming requests with their respective handler.") - (license license:bsd-3))) - (define-public go-github-com-andybalholm-brotli (package (name "go-github-com-andybalholm-brotli") diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index f61c4f045c..13ae53aa8c 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -142,6 +142,7 @@ #:use-module (gnu packages gnunet) #:use-module (gnu packages gnupg) #:use-module (gnu packages golang) + #:use-module (gnu packages golang-web) #:use-module (gnu packages gperf) #:use-module (gnu packages graphviz) #:use-module (gnu packages gtk) -- cgit 1.4.1 From d17d7e6ca1b4517162049dfa7f163b0ab0f737fd Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:34:41 +0000 Subject: gnu: go-github-com-gorilla-css: Move to (gnu packages golang-web). * gnu/packages/golang.scm (go-github-com-gorilla-css): Move from here... * gnu/packages/golang-web.scm: ...to here. * gnu/packages/configuration-management.sc: Add (gnu packages golang-web) module. * gnu/packages/golang.scm: As above... Change-Id: I6e387966d05c40321b9116b93d76fce68aad8c7f --- gnu/packages/configuration-management.scm | 1 + gnu/packages/golang-web.scm | 23 +++++++++++++++++++++++ gnu/packages/golang.scm | 23 +---------------------- 3 files changed, 25 insertions(+), 22 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/configuration-management.scm b/gnu/packages/configuration-management.scm index 95a7e8615f..296f48dcd5 100644 --- a/gnu/packages/configuration-management.scm +++ b/gnu/packages/configuration-management.scm @@ -21,6 +21,7 @@ #:use-module (guix build-system go) #:use-module (guix git-download) #:use-module (gnu packages golang) + #:use-module (gnu packages golang-web) #:use-module (gnu packages version-control) #:use-module (gnu packages textutils) #:use-module ((guix licenses) #:prefix license:) diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index c779600411..1d61a76268 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018 Pierre-Antoine Rouby ;;; Copyright © 2020 Martin Becze +;;; Copyright © 2020 Oleg Pykhalov ;;; ;;; This file is part of GNU Guix. ;;; @@ -34,6 +35,28 @@ ;;; ;;; Code: +(define-public go-github-com-gorilla-css + (package + (name "go-github-com-gorilla-css") + (version "1.0.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/gorilla/css") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "116fhy3n7bsq3psyn4pa0i4x9zy916kh1zxslmbbp0p9l4i7ysrj")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/gorilla/css/scanner" + #:unpack-path "github.com/gorilla/css")) + (home-page "https://github.com/gorilla/css/") + (synopsis "CSS3 tokenizer") + (description "This package provides a CSS3 tokenizer.") + (license license:bsd-3))) + (define-public go-github-com-gorilla-mux (package (name "go-github-com-gorilla-mux") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index edc8c2bec0..74b5df2fb8 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -80,6 +80,7 @@ #:use-module (gnu packages glib) #:use-module (gnu packages gnupg) #:use-module (gnu packages golang-check) + #:use-module (gnu packages golang-web) #:use-module (gnu packages lua) #:use-module (gnu packages mail) #:use-module (gnu packages mp3) @@ -4816,28 +4817,6 @@ information about the resource usage and performance characteristics of running containers.") (license license:asl2.0)))) -(define-public go-github-com-gorilla-css - (package - (name "go-github-com-gorilla-css") - (version "1.0.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/gorilla/css") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "116fhy3n7bsq3psyn4pa0i4x9zy916kh1zxslmbbp0p9l4i7ysrj")))) - (build-system go-build-system) - (arguments - `(#:import-path "github.com/gorilla/css/scanner" - #:unpack-path "github.com/gorilla/css")) - (home-page "https://github.com/gorilla/css/") - (synopsis "CSS3 tokenizer") - (description "This package provides a CSS3 tokenizer.") - (license license:bsd-3))) - (define-public go-github-com-gorilla-context (let ((commit "08b5f424b9271eedf6f9f0ce86cb9396ed337a42") (revision "0")) -- cgit 1.4.1 From 213a54e8de6f534a01420335411bd9cfb3220795 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:34:42 +0000 Subject: gnu: go-github-com-aymerick-douceur: Move to (gnu packages golang-web). * gnu/packages/golang.scm (go-github-com-aymerick-douceur): Move from here... * gnu/packages/golang-web.scm: ...to here. Change-Id: I2e94858736f88333f56d4eb4301acd35e6bb1a33 --- gnu/packages/golang-web.scm | 26 ++++++++++++++++++++++++++ gnu/packages/golang.scm | 25 ------------------------- 2 files changed, 26 insertions(+), 25 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 1d61a76268..39a83990ce 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -35,6 +35,32 @@ ;;; ;;; Code: +(define-public go-github-com-aymerick-douceur + (package + (name "go-github-com-aymerick-douceur") + (version "0.2.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/aymerick/douceur/") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1hfysznib0fqbp8vqxpk0xiggpp0ayk2bsddi36vbg6f8zq5f81n")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/aymerick/douceur")) + (native-inputs + (list go-github-com-andybalholm-cascadia + go-github-com-gorilla-css + go-github-com-puerkitobio-goquery + go-golang-org-x-net)) + (home-page "https://github.com/aymerick/douceur/") + (synopsis "CSS parser and inliner") + (description "This package provides a CSS parser and inliner.") + (license license:expat))) + (define-public go-github-com-gorilla-css (package (name "go-github-com-gorilla-css") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 74b5df2fb8..5c397ea81a 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -9541,31 +9541,6 @@ to jQuery to the Go language.") transforms one JSON document into another through a JMESPath expression.") (license license:asl2.0))) -(define-public go-github-com-aymerick-douceur - (package - (name "go-github-com-aymerick-douceur") - (version "0.2.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/aymerick/douceur/") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1hfysznib0fqbp8vqxpk0xiggpp0ayk2bsddi36vbg6f8zq5f81n")))) - (build-system go-build-system) - (arguments - `(#:import-path "github.com/aymerick/douceur")) - (native-inputs - (list go-github-com-puerkitobio-goquery - go-github-com-andybalholm-cascadia go-golang-org-x-net - go-github-com-gorilla-css)) - (home-page "https://github.com/aymerick/douceur/") - (synopsis "CSS parser and inliner") - (description "This package provides a CSS parser and inliner.") - (license license:expat))) - (define-public go-github-com-chris-ramon-douceur (package (name "go-github-com-chris-ramon-douceur") -- cgit 1.4.1 From 1bc5e65aadb9677313a9b30b0bb67208694710c7 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:34:43 +0000 Subject: gnu: go-github-com-andybalholm-cascadia: Move to (gnu packages golang-web). * gnu/packages/golang.scm (go-github-com-andybalholm-cascadia): Move from here... * gnu/packages/golang-web.scm: ...to here. Change-Id: I185cb923d21685eb5a3952b9990833d3a0709312 --- gnu/packages/golang-web.scm | 25 +++++++++++++++++++++++++ gnu/packages/golang.scm | 24 ------------------------ 2 files changed, 25 insertions(+), 24 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 39a83990ce..3c1abfff2c 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2018 Pierre-Antoine Rouby ;;; Copyright © 2020 Martin Becze ;;; Copyright © 2020 Oleg Pykhalov +;;; Copyright © 2022 Giacomo Leidi ;;; ;;; This file is part of GNU Guix. ;;; @@ -35,6 +36,30 @@ ;;; ;;; Code: +(define-public go-github-com-andybalholm-cascadia + (package + (name "go-github-com-andybalholm-cascadia") + (version "1.3.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/andybalholm/cascadia") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0zgc9fjkn7d66cnmgnmalr9lrq4ii1spap95pf2x1hln4pflib5s")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/andybalholm/cascadia")) + (native-inputs + (list go-golang-org-x-net)) + (home-page "https://github.com/andybalholm/cascadia/") + (synopsis "CSS selectors for HTML") + (description "The Cascadia package implements CSS selectors for use with +the parse trees produced by the html package.") + (license license:bsd-2))) + (define-public go-github-com-aymerick-douceur (package (name "go-github-com-aymerick-douceur") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 5c397ea81a..5b78ed8576 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -9466,30 +9466,6 @@ synchronizing plain text: converts it into syntax highlighted HTML, ANSI-coloured text, etc.") (license license:expat))) -(define-public go-github-com-andybalholm-cascadia - (package - (name "go-github-com-andybalholm-cascadia") - (version "1.3.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/andybalholm/cascadia") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0zgc9fjkn7d66cnmgnmalr9lrq4ii1spap95pf2x1hln4pflib5s")))) - (build-system go-build-system) - (arguments - `(#:import-path "github.com/andybalholm/cascadia")) - (native-inputs - (list go-golang-org-x-net)) - (home-page "https://github.com/andybalholm/cascadia/") - (synopsis "CSS selectors for HTML") - (description "The Cascadia package implements CSS selectors for use with -the parse trees produced by the html package.") - (license license:bsd-2))) - (define-public go-github-com-puerkitobio-goquery (package (name "go-github-com-puerkitobio-goquery") -- cgit 1.4.1 From 5dbb2511e77390a65249a7efe9c4badf0ed95d66 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:34:44 +0000 Subject: gnu: go-github-com-puerkitobio-goquery: Move to (gnu packages golang-web). * gnu/packages/golang.scm (go-github-com-puerkitobio-goquery): Move from here... * gnu/packages/golang-web.scm: ...to here. Change-Id: Ic0415a8b280ebd12086a5976c9765c1dbbf50bd2 --- gnu/packages/golang-web.scm | 26 ++++++++++++++++++++++++++ gnu/packages/golang.scm | 24 ------------------------ 2 files changed, 26 insertions(+), 24 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 3c1abfff2c..8d8b4fb85c 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -2,6 +2,8 @@ ;;; Copyright © 2018 Pierre-Antoine Rouby ;;; Copyright © 2020 Martin Becze ;;; Copyright © 2020 Oleg Pykhalov +;;; Copyright © 2021 Efraim Flashner +;;; Copyright © 2021 Sarah Morgensen ;;; Copyright © 2022 Giacomo Leidi ;;; ;;; This file is part of GNU Guix. @@ -131,6 +133,30 @@ the parse trees produced by the html package.") incoming requests with their respective handler.") (license license:bsd-3))) +(define-public go-github-com-puerkitobio-goquery + (package + (name "go-github-com-puerkitobio-goquery") + (version "1.7.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/PuerkitoBio/goquery") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0gh1d99l5xc9hvwa4j40pfq3y9vfyq52mnrz6bf1kw2r2zr2gbcc")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/PuerkitoBio/goquery")) + (propagated-inputs + (list go-github-com-andybalholm-cascadia go-golang-org-x-net)) + (home-page "https://github.com/PuerkitoBio/goquery") + (synopsis "Features similar to jQuery to the Go language") + (description "@code{goquery} brings a syntax and a set of features similar +to jQuery to the Go language.") + (license license:bsd-3))) + ;;; ;;; Avoid adding new packages to the end of this file. To reduce the chances ;;; of a merge conflict, place them above by existing packages with similar diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 5b78ed8576..729d50f600 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -9466,30 +9466,6 @@ synchronizing plain text: converts it into syntax highlighted HTML, ANSI-coloured text, etc.") (license license:expat))) -(define-public go-github-com-puerkitobio-goquery - (package - (name "go-github-com-puerkitobio-goquery") - (version "1.7.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/PuerkitoBio/goquery") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0gh1d99l5xc9hvwa4j40pfq3y9vfyq52mnrz6bf1kw2r2zr2gbcc")))) - (build-system go-build-system) - (arguments - `(#:import-path "github.com/PuerkitoBio/goquery")) - (propagated-inputs - (list go-github-com-andybalholm-cascadia go-golang-org-x-net)) - (home-page "https://github.com/PuerkitoBio/goquery") - (synopsis "Features similar to jQuery to the Go language") - (description "@code{goquery} brings a syntax and a set of features similar -to jQuery to the Go language.") - (license license:bsd-3))) - (define-public go-github-com-jmespath-go-jmespath (package (name "go-github-com-jmespath-go-jmespath") -- cgit 1.4.1 From 7b2c29095672dd330b17ccabc01128a7e4f45924 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:34:45 +0000 Subject: gnu: go-github-com-chris-ramon-douceur: Move to (gnu packages golang-web). * gnu/packages/golang.scm (go-github-com-chris-ramon-douceur): Move from here... * gnu/packages/golang-web.scm: ...to here. Change-Id: I9d0fdccc4ff557870dad60e9ac062ccb2e995979 --- gnu/packages/golang-web.scm | 30 +++++++++++++++++++++++++++++- gnu/packages/golang.scm | 28 ---------------------------- 2 files changed, 29 insertions(+), 29 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 8d8b4fb85c..79a69bc842 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2018 Pierre-Antoine Rouby ;;; Copyright © 2020 Martin Becze ;;; Copyright © 2020 Oleg Pykhalov -;;; Copyright © 2021 Efraim Flashner +;;; Copyright © 2021, 2022 Efraim Flashner ;;; Copyright © 2021 Sarah Morgensen ;;; Copyright © 2022 Giacomo Leidi ;;; @@ -88,6 +88,34 @@ the parse trees produced by the html package.") (description "This package provides a CSS parser and inliner.") (license license:expat))) +(define-public go-github-com-chris-ramon-douceur + (package + (name "go-github-com-chris-ramon-douceur") + (version "0.2.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/chris-ramon/douceur") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1hfysznib0fqbp8vqxpk0xiggpp0ayk2bsddi36vbg6f8zq5f81n")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/chris-ramon/douceur")) + (propagated-inputs + (list go-github-com-aymerick-douceur + go-github-com-gorilla-css)) + (native-inputs + (list go-github-com-puerkitobio-goquery + go-github-com-andybalholm-cascadia + go-golang-org-x-net)) + (home-page "https://github.com/chris-ramon/douceur/") + (synopsis "CSS parser and inliner") + (description "This package provides a CSS parser and inliner.") + (license license:expat))) + (define-public go-github-com-gorilla-css (package (name "go-github-com-gorilla-css") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 729d50f600..52168b93cb 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -9493,34 +9493,6 @@ converts it into syntax highlighted HTML, ANSI-coloured text, etc.") transforms one JSON document into another through a JMESPath expression.") (license license:asl2.0))) -(define-public go-github-com-chris-ramon-douceur - (package - (name "go-github-com-chris-ramon-douceur") - (version "0.2.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/chris-ramon/douceur") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1hfysznib0fqbp8vqxpk0xiggpp0ayk2bsddi36vbg6f8zq5f81n")))) - (build-system go-build-system) - (arguments - `(#:import-path "github.com/chris-ramon/douceur")) - (propagated-inputs - (list go-github-com-aymerick-douceur - go-github-com-gorilla-css)) - (native-inputs - (list go-github-com-puerkitobio-goquery - go-github-com-andybalholm-cascadia - go-golang-org-x-net)) - (home-page "https://github.com/chris-ramon/douceur/") - (synopsis "CSS parser and inliner") - (description "This package provides a CSS parser and inliner.") - (license license:expat))) - (define-public go-github-com-microcosm-cc-bluemonday (package (name "go-github-com-microcosm-cc-bluemonday") -- cgit 1.4.1 From 13ab4abe98f1a88256d4ecd9b3ee3cb026515f4e Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:34:46 +0000 Subject: gnu: go-github-com-gorilla-websocket: Move to (gnu packages golang-web). * gnu/packages/golang.scm (go-github-com-gorilla-websocket): Move from here... * gnu/packages/golang-web.scm: ...to here. * gnu/packages/ipfs.scm: Add (gnu packages golang-web) module. Change-Id: I844738ec0b178a6a1746b01659c93a20919c2736 --- gnu/packages/golang-web.scm | 23 +++++++++++++++++++++++ gnu/packages/golang.scm | 21 --------------------- gnu/packages/ipfs.scm | 1 + 3 files changed, 24 insertions(+), 21 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 79a69bc842..0ca70cec38 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2021, 2022 Efraim Flashner ;;; Copyright © 2021 Sarah Morgensen ;;; Copyright © 2022 Giacomo Leidi +;;; Copyright © 2022 muradm ;;; ;;; This file is part of GNU Guix. ;;; @@ -161,6 +162,28 @@ the parse trees produced by the html package.") incoming requests with their respective handler.") (license license:bsd-3))) +(define-public go-github-com-gorilla-websocket + (package + (name "go-github-com-gorilla-websocket") + (version "1.5.0") + (home-page "https://github.com/gorilla/websocket") + (source + (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1xrr6snvs9g1nzxxg05w4i4pq6k1xjljl5mvavd838qc468n118i")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/gorilla/websocket")) + (synopsis "Fast WebSocket implementation for Go") + (description "Gorilla WebSocket is a Go implementation of the WebSocket +protocol.") + (license license:bsd-2))) + (define-public go-github-com-puerkitobio-goquery (package (name "go-github-com-puerkitobio-goquery") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 52168b93cb..9fe55bc551 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -12909,27 +12909,6 @@ to use in various HTML contexts and with various DOM APIs.") using shell-style rules for quoting and commenting.") (license license:asl2.0))) -(define-public go-github-com-gorilla-websocket - (package - (name "go-github-com-gorilla-websocket") - (version "1.5.0") - (home-page "https://github.com/gorilla/websocket") - (source (origin - (method git-fetch) - (uri (git-reference - (url home-page) - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1xrr6snvs9g1nzxxg05w4i4pq6k1xjljl5mvavd838qc468n118i")))) - (build-system go-build-system) - (arguments - `(#:import-path "github.com/gorilla/websocket")) - (synopsis "Fast WebSocket implementation for Go") - (description "Gorilla WebSocket is a Go implementation of the WebSocket protocol.") - (license license:bsd-2))) - (define-public go-github-com-sourcegraph-jsonrpc2 (package (name "go-github-com-sourcegraph-jsonrpc2") diff --git a/gnu/packages/ipfs.scm b/gnu/packages/ipfs.scm index a4c0613e40..fc66582c8a 100644 --- a/gnu/packages/ipfs.scm +++ b/gnu/packages/ipfs.scm @@ -30,6 +30,7 @@ #:use-module (guix build-system go) #:use-module (gnu packages golang) #:use-module (gnu packages golang-check) + #:use-module (gnu packages golang-web) #:use-module (gnu packages python) #:use-module (gnu packages shells) #:use-module (gnu packages syncthing)) -- cgit 1.4.1 From e0060729b5dfa678bd686ad20435485a73f3d4d0 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:34:47 +0000 Subject: gnu: go-github-com-sourcegraph-jsonrpc2: Move to (gnu packages golang-web). * gnu/packages/golang.scm (go-github-com-sourcegraph-jsonrpc2): Move from here... * gnu/packages/golang-web.scm: ...to here. * gnu/packages/databases.scm: Add (gnu packages golang-web) module. Change-Id: Idda2e18ae5d3e19f72265bdd017eadddc25bcad9 --- gnu/packages/databases.scm | 1 + gnu/packages/golang-web.scm | 26 ++++++++++++++++++++++++++ gnu/packages/golang.scm | 26 -------------------------- 3 files changed, 27 insertions(+), 26 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 1ca534aa00..564927c2a7 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -108,6 +108,7 @@ #:use-module (gnu packages gnupg) #:use-module (gnu packages golang) #:use-module (gnu packages golang-check) + #:use-module (gnu packages golang-web) #:use-module (gnu packages gperf) #:use-module (gnu packages gtk) #:use-module (gnu packages guile) diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 0ca70cec38..f9e7039707 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -208,6 +208,32 @@ protocol.") to jQuery to the Go language.") (license license:bsd-3))) +(define-public go-github-com-sourcegraph-jsonrpc2 + (package + (name "go-github-com-sourcegraph-jsonrpc2") + (version "0.1.0") + (home-page "https://github.com/sourcegraph/jsonrpc2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1dk0w32k96vxrwnmm24wqx337dn8ylch65qwrbc3wh7whw2xx71q")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/sourcegraph/jsonrpc2")) + (propagated-inputs + (list go-github-com-daviddengcn-go-colortext + go-github-com-gorilla-websocket + go-github-com-motemen-go-colorine)) + (synopsis "Provides a client and server implementation of JSON-RPC 2.0") + (description + "Package jsonrpc2 provides a Go implementation of JSON-RPC 2.0.") + (license license:expat))) + ;;; ;;; Avoid adding new packages to the end of this file. To reduce the chances ;;; of a merge conflict, place them above by existing packages with similar diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 9fe55bc551..f51d8fd455 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -12909,32 +12909,6 @@ to use in various HTML contexts and with various DOM APIs.") using shell-style rules for quoting and commenting.") (license license:asl2.0))) -(define-public go-github-com-sourcegraph-jsonrpc2 - (package - (name "go-github-com-sourcegraph-jsonrpc2") - (version "0.1.0") - (home-page "https://github.com/sourcegraph/jsonrpc2") - (source (origin - (method git-fetch) - (uri (git-reference - (url home-page) - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1dk0w32k96vxrwnmm24wqx337dn8ylch65qwrbc3wh7whw2xx71q")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/sourcegraph/jsonrpc2")) - (propagated-inputs - (list - go-github-com-daviddengcn-go-colortext - go-github-com-motemen-go-colorine - go-github-com-gorilla-websocket)) - (synopsis "Provides a client and server implementation of JSON-RPC 2.0") - (description - "Package jsonrpc2 provides a Go implementation of JSON-RPC 2.0.") - (license license:expat))) - (define-public go-github-com-disintegration-imaging (package (name "go-github-com-disintegration-imaging") -- cgit 1.4.1 From fae3b9d5988393e5385c5d3d067b1412fd1044a2 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:34:48 +0000 Subject: gnu: go-github-com-gorilla-handlers: Move to (gnu packages golang-web). * gnu/packages/golang.scm (go-github-com-gorilla-handlers): Move from here... * gnu/packages/golang-web.scm: ...to here. * gnu/packages/backup.scm: Add (gnu packages golang-web) module. Change-Id: I7535bdecc681e230f4aee70115a3dea847d40e6f --- gnu/packages/backup.scm | 1 + gnu/packages/golang-web.scm | 28 +++++++++++++++++++++++++++- gnu/packages/golang.scm | 26 -------------------------- 3 files changed, 28 insertions(+), 27 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 58c071e1fa..3126464347 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -71,6 +71,7 @@ #:use-module (gnu packages glib) #:use-module (gnu packages gnupg) #:use-module (gnu packages golang) + #:use-module (gnu packages golang-web) #:use-module (gnu packages gperf) #:use-module (gnu packages gtk) #:use-module (gnu packages guile) diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index f9e7039707..0480f648eb 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -1,9 +1,10 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018 Pierre-Antoine Rouby ;;; Copyright © 2020 Martin Becze +;;; Copyright © 2020 Martin Becze ;;; Copyright © 2020 Oleg Pykhalov -;;; Copyright © 2021, 2022 Efraim Flashner ;;; Copyright © 2021 Sarah Morgensen +;;; Copyright © 2021, 2022 Efraim Flashner ;;; Copyright © 2022 Giacomo Leidi ;;; Copyright © 2022 muradm ;;; @@ -139,6 +140,31 @@ the parse trees produced by the html package.") (description "This package provides a CSS3 tokenizer.") (license license:bsd-3))) +(define-public go-github-com-gorilla-handlers + (package + (name "go-github-com-gorilla-handlers") + (version "1.5.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/gorilla/handlers") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "15gycdz9lkjnsvvichsbdf25vf6pi1sfn41khhz53iqf300l0w0s")))) + (build-system go-build-system) + (propagated-inputs + `(("github.com/felixge/httpsnoop" ,go-github-com-felixge-httpsnoop))) + (arguments + '(#:tests? #f ; Tries to download from the internet + #:import-path "github.com/gorilla/handlers")) + (home-page "https://github.com/gorilla/handlers") + (synopsis "Middleware for Go HTTP services and web applications") + (description "A collection of useful middleware for Go HTTP services and +web applications.") + (license license:bsd-3))) + (define-public go-github-com-gorilla-mux (package (name "go-github-com-gorilla-mux") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index f51d8fd455..fb826c2743 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -4867,32 +4867,6 @@ the @code{c2go} tool at @url{https://github.com/andybalholm/c2go,https://github.com/andybalholm/c2go}.") (license license:expat))) -(define-public go-github-com-gorilla-handlers - (package - (name "go-github-com-gorilla-handlers") - (version "1.5.1") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/gorilla/handlers") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "15gycdz9lkjnsvvichsbdf25vf6pi1sfn41khhz53iqf300l0w0s")))) - (build-system go-build-system) - (propagated-inputs - `(("github.com/felixge/httpsnoop" ,go-github-com-felixge-httpsnoop))) - (arguments - '(#:tests? #f ; Tries to download from the internet - #:import-path "github.com/gorilla/handlers")) - (home-page "https://github.com/gorilla/handlers") - (synopsis "Middleware for Go HTTP services and web applications") - (description "A collection of useful middleware for Go HTTP services -and web applications.") - (license license:bsd-3))) - (define-public go-github-com-gorilla-securecookie (package (name "go-github-com-gorilla-securecookie") -- cgit 1.4.1 From 170d43cd0d954f09480ed71b29a981ac2a179065 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:34:49 +0000 Subject: gnu: go-github-com-gorilla-handlers: Remove input labels. * gnu/packages/golang-web.scm (go-github-com-gorilla-handlers): Remove labels. Change-Id: I955408970a64d03823327912fdafcac5d7fbda93 --- gnu/packages/golang-web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 0480f648eb..3a3c5f9621 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -154,11 +154,11 @@ the parse trees produced by the html package.") (sha256 (base32 "15gycdz9lkjnsvvichsbdf25vf6pi1sfn41khhz53iqf300l0w0s")))) (build-system go-build-system) - (propagated-inputs - `(("github.com/felixge/httpsnoop" ,go-github-com-felixge-httpsnoop))) (arguments '(#:tests? #f ; Tries to download from the internet #:import-path "github.com/gorilla/handlers")) + (propagated-inputs + (list go-github-com-felixge-httpsnoop)) (home-page "https://github.com/gorilla/handlers") (synopsis "Middleware for Go HTTP services and web applications") (description "A collection of useful middleware for Go HTTP services and -- cgit 1.4.1 From 2a0b7df5b4b9e7b27a79e7ecc646113af97808b1 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:34:50 +0000 Subject: gnu: go-github-com-felixge-httpsnoop: Move to (gnu packages golang-web). * gnu/packages/golang.scm (go-github-com-felixge-httpsnoop): Move from here... * gnu/packages/golang-web.scm: ...to here. Change-Id: Ic2494b3e45c934ecddaa621f00f474b9079dc5ed --- gnu/packages/golang-web.scm | 24 ++++++++++++++++++++++++ gnu/packages/golang.scm | 25 ------------------------- 2 files changed, 24 insertions(+), 25 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 3a3c5f9621..c0ceb5b7ce 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -118,6 +118,30 @@ the parse trees produced by the html package.") (description "This package provides a CSS parser and inliner.") (license license:expat))) +(define-public go-github-com-felixge-httpsnoop + (package + (name "go-github-com-felixge-httpsnoop") + (version "1.0.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/felixge/httpsnoop") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0ncd8lar5zxiwjhsp315s4hsl4bhnm271h49jhyxc66r5yffgmac")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/felixge/httpsnoop")) + (home-page "https://github.com/felixge/httpsnoop/") + (synopsis "Capture http related metrics") + (description + "Httpsnoop provides an easy way to capture http related +metrics (i.e. response time, bytes written, and http status code) from your +application's http.Handlers.") + (license license:expat))) + (define-public go-github-com-gorilla-css (package (name "go-github-com-gorilla-css") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index fb826c2743..841b507cda 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -5145,31 +5145,6 @@ GNU extensions} to the POSIX recommendations for command-line options.") all types of configuration needs and formats.") (license license:expat))) -(define-public go-github-com-felixge-httpsnoop - (package - (name "go-github-com-felixge-httpsnoop") - (version "1.0.1") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/felixge/httpsnoop") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0ncd8lar5zxiwjhsp315s4hsl4bhnm271h49jhyxc66r5yffgmac")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/felixge/httpsnoop")) - (home-page "https://github.com/felixge/httpsnoop/") - (synopsis "Capture http related metrics") - (description - "Httpsnoop provides an easy way to capture http related -metrics (i.e. response time, bytes written, and http status code) from your -application's http.Handlers.") - (license license:expat))) - (define-public go-github-com-fsnotify-fsnotify (package (name "go-github-com-fsnotify-fsnotify") -- cgit 1.4.1 From 1754f847aa854d004348a6d1090b0132ad87055a Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:34:51 +0000 Subject: gnu: go-github-com-gorilla-securecookie: Move to (gnu packages golang-web). * gnu/packages/golang.scm (go-github-com-gorilla-securecookie): Move from here... * gnu/packages/golang-web.scm: ...to here. Change-Id: Iae8beed5e7a099033585bcab33cd42d237d2746d --- gnu/packages/golang-web.scm | 24 ++++++++++++++++++++++++ gnu/packages/golang.scm | 25 ------------------------- 2 files changed, 24 insertions(+), 25 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index c0ceb5b7ce..1a77e0f6f2 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -212,6 +212,30 @@ web applications.") incoming requests with their respective handler.") (license license:bsd-3))) +(define-public go-github-com-gorilla-securecookie + (package + (name "go-github-com-gorilla-securecookie") + (version "1.1.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/gorilla/securecookie") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "16bqimpxs9vj5n59vm04y04v665l7jh0sddxn787pfafyxcmh410")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/gorilla/securecookie")) + (home-page "https://github.com/gorilla/securecookie") + (synopsis "Encodes and decodes authenticated and optionally encrypted +cookie values") + (description + "Gorilla/securecookie encodes and decodes authenticated and optionally +encrypted cookie values for Go web applications.") + (license license:bsd-3))) + (define-public go-github-com-gorilla-websocket (package (name "go-github-com-gorilla-websocket") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 841b507cda..53ae15e2e2 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -4867,31 +4867,6 @@ the @code{c2go} tool at @url{https://github.com/andybalholm/c2go,https://github.com/andybalholm/c2go}.") (license license:expat))) -(define-public go-github-com-gorilla-securecookie - (package - (name "go-github-com-gorilla-securecookie") - (version "1.1.1") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/gorilla/securecookie") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "16bqimpxs9vj5n59vm04y04v665l7jh0sddxn787pfafyxcmh410")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/gorilla/securecookie")) - (home-page "https://github.com/gorilla/securecookie") - (synopsis "Encodes and decodes authenticated and optionally encrypted -cookie values") - (description - "Gorilla/securecookie encodes and decodes authenticated and optionally -encrypted cookie values for Go web applications.") - (license license:bsd-3))) - (define-public go-github-com-gorilla-sessions (package (name "go-github-com-gorilla-sessions") -- cgit 1.4.1 From b870f17a83f9a17e0f4677cf0f8303d120106328 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:34:52 +0000 Subject: gnu: go-github-com-gorilla-sessions: Move to (gnu packages golang-web). * gnu/packages/golang.scm (go-github-com-gorilla-sessions): Move from here... * gnu/packages/golang-web.scm: ...to here. Change-Id: Ic4cc128724583a7c50102e476c6b96ea4e322bdd --- gnu/packages/golang-web.scm | 27 +++++++++++++++++++++++++++ gnu/packages/golang.scm | 25 ------------------------- 2 files changed, 27 insertions(+), 25 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 1a77e0f6f2..971b370115 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2021, 2022 Efraim Flashner ;;; Copyright © 2022 Giacomo Leidi ;;; Copyright © 2022 muradm +;;; Copyright © 2023 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -236,6 +237,32 @@ cookie values") encrypted cookie values for Go web applications.") (license license:bsd-3))) +(define-public go-github-com-gorilla-sessions + (package + (name "go-github-com-gorilla-sessions") + (version "1.2.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/gorilla/sessions") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1zjw2s37yggk9231db0vmgs67z8m3am8i8l4gpgz6fvlbv52baxp")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/gorilla/sessions")) + (propagated-inputs + (list go-github-com-gorilla-securecookie)) + (home-page "https://github.com/gorilla/sessions") + (synopsis "Manage user sessions in web applications") + (description + "This package that provides infrastructure for creating and managing user +sessions in web applications. It supports cookie and filesystem-based +sessions, flash messages, custom backends, and more.") + (license license:bsd-3))) + (define-public go-github-com-gorilla-websocket (package (name "go-github-com-gorilla-websocket") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 53ae15e2e2..14b6fef71d 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -4867,31 +4867,6 @@ the @code{c2go} tool at @url{https://github.com/andybalholm/c2go,https://github.com/andybalholm/c2go}.") (license license:expat))) -(define-public go-github-com-gorilla-sessions - (package - (name "go-github-com-gorilla-sessions") - (version "1.2.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/gorilla/sessions") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1zjw2s37yggk9231db0vmgs67z8m3am8i8l4gpgz6fvlbv52baxp")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/gorilla/sessions")) - (propagated-inputs (list go-github-com-gorilla-securecookie)) - (home-page "https://github.com/gorilla/sessions") - (synopsis "Manage user sessions in web applications") - (description - "This package that provides infrastructure for creating and -managing user sessions in web applications. It supports cookie and -filesystem-based sessions, flash messages, custom backends, and more.") - (license license:bsd-3))) - (define-public go-github-com-gorilla-csrf (package (name "go-github-com-gorilla-csrf") -- cgit 1.4.1 From ddb3448cf071ae6b9f6efecb413716a5da848669 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:34:53 +0000 Subject: gnu: go-github-com-jcmturner-gokrb5-v8: Move to (gnu packages golang-web). * gnu/packages/golang.scm (go-github-com-jcmturner-gokrb5-v8): Move from here... * gnu/packages/golang-web.scm: ...to here. Change-Id: Ie7833a1f5712cc3899fd140741774e6b71f03967 --- gnu/packages/golang-web.scm | 52 ++++++++++++++++++++++++++++++++++++++++++++- gnu/packages/golang.scm | 48 ----------------------------------------- 2 files changed, 51 insertions(+), 49 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 971b370115..ae10a86551 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -30,7 +30,8 @@ #:use-module (guix build-system go) #:use-module (guix git-download) #:use-module (gnu packages) - #:use-module (gnu packages golang)) + #:use-module (gnu packages golang) + #:use-module (gnu packages golang-check)) ;;; Commentary: ;;; @@ -285,6 +286,55 @@ sessions, flash messages, custom backends, and more.") protocol.") (license license:bsd-2))) +(define-public go-github-com-jcmturner-gokrb5-v8 + (package + (name "go-github-com-jcmturner-gokrb5-v8") + (version "8.4.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jcmturner/gokrb5") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0w9d1pa3r6qmdblk25bghf78ncs03l15l1sxnh4n536c356rzq4b")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/jcmturner/gokrb5/v8" + #:unpack-path "github.com/jcmturner/gokrb5")) + (propagated-inputs + (list go-github-com-gorilla-sessions + go-github-com-hashicorp-go-uuid + go-github-com-jcmturner-aescts-v2 + go-github-com-jcmturner-dnsutils-v2 + go-github-com-jcmturner-gofork + go-github-com-jcmturner-goidentity-v6 + go-github-com-jcmturner-rpc-v2-mstypes + go-github-com-jcmturner-rpc-v2-ndr + go-github-com-stretchr-testify + go-golang-org-x-crypto + go-golang-org-x-net)) + (home-page "https://github.com/jcmturner/gokrb5") + (synopsis "Pure Go Kerberos library for clients and services") + (description "This package provides a pure Go Kerberos library. It +features: +@itemize +@item Kerberos libraries for custom integration +@item Parsing Keytab files +@item Parsing krb5.conf files +@item Parsing client credentials cache files such as /tmp/krb5cc_$(id -u $(whoami)) +@end itemize + +On the client side, it provides a client that can authenticate to an SPNEGO +Kerberos authenticated web service, and the ability to change client's +password. + +On the server side, the library provides a HTTP handler wrapper implements +SPNEGO Kerberos authentication, as well as a HTTP handler wrapper decodes +Microsoft AD PAC authorization data.") + (license license:asl2.0))) + (define-public go-github-com-puerkitobio-goquery (package (name "go-github-com-puerkitobio-goquery") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 14b6fef71d..421a1e1181 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -1573,54 +1573,6 @@ authenticated identities and their attributes.") arounds until issues are addressed in the official distribution.") (license license:bsd-3))) -(define-public go-github-com-jcmturner-gokrb5-v8 - (package - (name "go-github-com-jcmturner-gokrb5-v8") - (version "8.4.2") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/jcmturner/gokrb5") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0w9d1pa3r6qmdblk25bghf78ncs03l15l1sxnh4n536c356rzq4b")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/jcmturner/gokrb5/v8" - #:unpack-path "github.com/jcmturner/gokrb5")) - (propagated-inputs (list go-golang-org-x-net - go-golang-org-x-crypto - go-github-com-stretchr-testify - go-github-com-jcmturner-rpc-v2-ndr - go-github-com-jcmturner-rpc-v2-mstypes - go-github-com-jcmturner-goidentity-v6 - go-github-com-jcmturner-gofork - go-github-com-jcmturner-dnsutils-v2 - go-github-com-jcmturner-aescts-v2 - go-github-com-hashicorp-go-uuid - go-github-com-gorilla-sessions)) - (home-page "https://github.com/jcmturner/gokrb5") - (synopsis "Pure Go Kerberos library for clients and services") - (description "This package provides a pure Go Kerberos library. It -features: -@itemize -@item Kerberos libraries for custom integration -@item Parsing Keytab files -@item Parsing krb5.conf files -@item Parsing client credentials cache files such as /tmp/krb5cc_$(id -u $(whoami)) -@end itemize - -On the client side, it provides a client that can authenticate to an SPNEGO -Kerberos authenticated web service, and the ability to change client's -password. - -On the server side, the library provides a HTTP handler wrapper implements -SPNEGO Kerberos authentication, as well as a HTTP handler wrapper decodes -Microsoft AD PAC authorization data.") - (license license:asl2.0))) - (define-public go-github-com-jcmturner-rpc (package (name "go-github-com-jcmturner-rpc") -- cgit 1.4.1 From 88b168ed27e48b2a45b0f27d2bfa0a6870d52a47 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:34:54 +0000 Subject: gnu: go-github-com-jcmturner-gokrb5-v8: Adjust inputs. * gnu/packages/golang-web.scm (go-github-com-jcmturner-gokrb5-v8) [propagated-inputs]: go-github-com-stretchr-testify move from here ... [native-inputs]: ... to here. Change-Id: I93be99c60c15ba7861dd909e8856c800f8cf8314 --- gnu/packages/golang-web.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index ae10a86551..580877f8fe 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -303,6 +303,8 @@ protocol.") (arguments '(#:import-path "github.com/jcmturner/gokrb5/v8" #:unpack-path "github.com/jcmturner/gokrb5")) + (native-inputs + (list go-github-com-stretchr-testify)) (propagated-inputs (list go-github-com-gorilla-sessions go-github-com-hashicorp-go-uuid @@ -312,7 +314,6 @@ protocol.") go-github-com-jcmturner-goidentity-v6 go-github-com-jcmturner-rpc-v2-mstypes go-github-com-jcmturner-rpc-v2-ndr - go-github-com-stretchr-testify go-golang-org-x-crypto go-golang-org-x-net)) (home-page "https://github.com/jcmturner/gokrb5") -- cgit 1.4.1 From 15593105894af86d86e627d136e5a3c5a791d2ea Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:34:55 +0000 Subject: gnu: go-github-com-jcmturner-dnsutils-v2: Move to (gnu packages golang-web). * gnu/packages/golang.scm (go-github-com-jcmturner-dnsutils-v2): Move from here... * gnu/packages/golang-web.scm: ...to here. Change-Id: I65f87f8e8cd7970a15d3b1e09c5ef4202f0542db --- gnu/packages/golang-web.scm | 28 ++++++++++++++++++++++++++++ gnu/packages/golang.scm | 27 --------------------------- 2 files changed, 28 insertions(+), 27 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 580877f8fe..9b2bcd7cbd 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -286,6 +286,34 @@ sessions, flash messages, custom backends, and more.") protocol.") (license license:bsd-2))) +(define-public go-github-com-jcmturner-dnsutils-v2 + (package + (name "go-github-com-jcmturner-dnsutils-v2") + (version "2.0.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jcmturner/dnsutils") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "116zbgvfj88vv93fnapmmgyd5g8kzy774cdyzsnnzyzng92j61c9")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/jcmturner/dnsutils/v2")) + (propagated-inputs + (list go-github-com-stretchr-testify)) + (home-page "https://github.com/jcmturner/dnsutils") + (synopsis "Go library with DNS utils") + (description + "The dnsutils package provides a Go function to return a map of Service +Records (SRV) in the order they should be used for a given service, protocol +and name. The order is determined by the records' priority and randomized +selection based on their relative weighting. This package is useful for +network applications that require accessing services using SRV records.") + (license license:asl2.0))) + (define-public go-github-com-jcmturner-gokrb5-v8 (package (name "go-github-com-jcmturner-gokrb5-v8") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 421a1e1181..44eb9122b9 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -1499,33 +1499,6 @@ not included in the Go standard library.") encryption and decryption methods.") (license license:asl2.0))) -(define-public go-github-com-jcmturner-dnsutils-v2 - (package - (name "go-github-com-jcmturner-dnsutils-v2") - (version "2.0.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/jcmturner/dnsutils") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "116zbgvfj88vv93fnapmmgyd5g8kzy774cdyzsnnzyzng92j61c9")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/jcmturner/dnsutils/v2")) - (propagated-inputs (list go-github-com-stretchr-testify)) - (home-page "https://github.com/jcmturner/dnsutils") - (synopsis "Go library with DNS utils") - (description - "The dnsutils package provides a Go function to return a map of Service -Records (SRV) in the order they should be used for a given service, protocol -and name. The order is determined by the records' priority and randomized -selection based on their relative weighting. This package is useful for -network applications that require accessing services using SRV records.") - (license license:asl2.0))) - (define-public go-github-com-jcmturner-goidentity-v6 (package (name "go-github-com-jcmturner-goidentity-v6") -- cgit 1.4.1 From db6f2a0f8aa03110ae6d6179610f3e277110f1ab Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:34:56 +0000 Subject: gnu: go-github-com-jcmturner-dnsutils-v2: Adjust inputs. * gnu/packages/golang-web.scm (go-github-com-jcmturner-dnsutils-v2): Swap propagated-inputs to native-inputs. Change-Id: I1d02b45559214d72828a78437766cf7c1e06f1b0 --- gnu/packages/golang-web.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 9b2bcd7cbd..6a832291ab 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -302,7 +302,7 @@ protocol.") (build-system go-build-system) (arguments '(#:import-path "github.com/jcmturner/dnsutils/v2")) - (propagated-inputs + (native-inputs (list go-github-com-stretchr-testify)) (home-page "https://github.com/jcmturner/dnsutils") (synopsis "Go library with DNS utils") -- cgit 1.4.1 From c058e08d8b9cb6880c7485615e92623dc349fb33 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:34:57 +0000 Subject: gnu: go-github-com-jcmturner-goidentity-v6: Move to (gnu packages golang-web). * gnu/packages/golang.scm (go-github-com-jcmturner-goidentity-v6): Move from here... * gnu/packages/golang-web.scm: ...to here. Change-Id: Ibd9202efe7fc1002bc34376107a0e88872c888be --- gnu/packages/golang-web.scm | 24 ++++++++++++++++++++++++ gnu/packages/golang.scm | 24 ------------------------ 2 files changed, 24 insertions(+), 24 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 6a832291ab..751eb41b58 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -314,6 +314,30 @@ selection based on their relative weighting. This package is useful for network applications that require accessing services using SRV records.") (license license:asl2.0))) +(define-public go-github-com-jcmturner-goidentity-v6 + (package + (name "go-github-com-jcmturner-goidentity-v6") + (version "6.0.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jcmturner/goidentity") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "064ysvxvrvij843s7qj1nkzl5qc6j1qbrsb3s0zmwd1sa7vq8q1n")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/jcmturner/goidentity/v6")) + (propagated-inputs + (list go-github-com-stretchr-testify go-github-com-hashicorp-go-uuid)) + (home-page "https://github.com/jcmturner/goidentity") + (synopsis "Hold authenticated identities and their attributes") + (description "This package provides a standard interface for holding +authenticated identities and their attributes.") + (license license:asl2.0))) + (define-public go-github-com-jcmturner-gokrb5-v8 (package (name "go-github-com-jcmturner-gokrb5-v8") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 44eb9122b9..6cccf2098a 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -1499,30 +1499,6 @@ not included in the Go standard library.") encryption and decryption methods.") (license license:asl2.0))) -(define-public go-github-com-jcmturner-goidentity-v6 - (package - (name "go-github-com-jcmturner-goidentity-v6") - (version "6.0.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/jcmturner/goidentity") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "064ysvxvrvij843s7qj1nkzl5qc6j1qbrsb3s0zmwd1sa7vq8q1n")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/jcmturner/goidentity/v6")) - (propagated-inputs - (list go-github-com-stretchr-testify go-github-com-hashicorp-go-uuid)) - (home-page "https://github.com/jcmturner/goidentity") - (synopsis "Hold authenticated identities and their attributes") - (description "This package provides a standard interface for holding -authenticated identities and their attributes.") - (license license:asl2.0))) - (define-public go-github-com-jcmturner-gofork (package (name "go-github-com-jcmturner-gofork") -- cgit 1.4.1 From f1fab4912270bcc81890d7e9d8f55ce54915be1d Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:34:58 +0000 Subject: gnu: go-github-com-jcmturner-goidentity-v6: Adjust inputs. * gnu/packages/golang-web.scm (go-github-com-jcmturner-goidentity-v6): [propagated-inputs]: Move go-github-com-stretchr-testify from here ... [native-inputs]: ... to here. Change-Id: I1e7bd72b3bf1c0879426a6a4c5b3b1de1d316069 --- gnu/packages/golang-web.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 751eb41b58..8ced6a4c6f 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -330,8 +330,10 @@ network applications that require accessing services using SRV records.") (build-system go-build-system) (arguments '(#:import-path "github.com/jcmturner/goidentity/v6")) + (native-inputs + (list go-github-com-stretchr-testify)) (propagated-inputs - (list go-github-com-stretchr-testify go-github-com-hashicorp-go-uuid)) + (list go-github-com-hashicorp-go-uuid)) (home-page "https://github.com/jcmturner/goidentity") (synopsis "Hold authenticated identities and their attributes") (description "This package provides a standard interface for holding -- cgit 1.4.1 From 80f52867abde1ba7ed4831fe5d489c9cd0be862f Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:34:59 +0000 Subject: gnu: go-github-com-gorilla-csrf: Move to (gnu packages golang-web). * gnu/packages/golang.scm (go-github-com-gorilla-csrf): Move from here... * gnu/packages/golang-web.scm: ...to here. Change-Id: I77bcbdaf515152b95418f9e2632d810202a1e23a --- gnu/packages/golang-web.scm | 26 ++++++++++++++++++++++++++ gnu/packages/golang.scm | 27 --------------------------- 2 files changed, 26 insertions(+), 27 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 8ced6a4c6f..5be08caf2e 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -144,6 +144,32 @@ metrics (i.e. response time, bytes written, and http status code) from your application's http.Handlers.") (license license:expat))) +(define-public go-github-com-gorilla-csrf + (package + (name "go-github-com-gorilla-csrf") + (version "1.7.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/gorilla/csrf") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0iryq0z48yi7crfbd8jxyn7lh1gsglpiglvjgnf23bz6xfisssav")))) + (build-system go-build-system) + (propagated-inputs + `(("github.com/gorilla/securecookie" ,go-github-com-gorilla-securecookie) + ("github.com/pkg/errors" ,go-github-com-pkg-errors))) + (arguments + '(#:import-path "github.com/gorilla/csrf")) + (home-page "https://github.com/gorilla/csrf") + (synopsis "Cross Site Request Forgery (CSRF) prevention middleware") + (description + "Gorilla/csrf provides Cross Site Request Forgery (CSRF) prevention +middleware for Go web applications and services.") + (license license:bsd-3))) + (define-public go-github-com-gorilla-css (package (name "go-github-com-gorilla-css") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 6cccf2098a..e0c5ef31af 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -4768,33 +4768,6 @@ the @code{c2go} tool at @url{https://github.com/andybalholm/c2go,https://github.com/andybalholm/c2go}.") (license license:expat))) -(define-public go-github-com-gorilla-csrf - (package - (name "go-github-com-gorilla-csrf") - (version "1.7.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/gorilla/csrf") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0iryq0z48yi7crfbd8jxyn7lh1gsglpiglvjgnf23bz6xfisssav")))) - (build-system go-build-system) - (propagated-inputs - `(("github.com/gorilla/securecookie" ,go-github-com-gorilla-securecookie) - ("github.com/pkg/errors" ,go-github-com-pkg-errors))) - (arguments - '(#:import-path "github.com/gorilla/csrf")) - (home-page "https://github.com/gorilla/csrf") - (synopsis "Cross Site Request Forgery (CSRF) prevention middleware") - (description - "Gorilla/csrf provides Cross Site Request Forgery (CSRF) prevention -middleware for Go web applications and services.") - (license license:bsd-3))) - (define-public go-github-com-jonboulle-clockwork (let ((commit "e3653ace2d63753697e0e5b07b9393971c0bba9d") (revision "0")) -- cgit 1.4.1 From fd51ae6a374cb2f151884dc27de2ff11141f5f5c Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:00 +0000 Subject: gnu: go-github-com-tdewolff-minify-v2: Move to (gnu packages golang-web). * gnu/packages/golang.scm (go-github-com-tdewolff-minify-v2): Move from here... * gnu/packages/golang-web.scm: ...to here. Change-Id: I4cee7a25e618cc7427d8669c4b17d028817e378f --- gnu/packages/golang-web.scm | 43 +++++++++++++++++++++++++++++++++++++++++++ gnu/packages/golang.scm | 40 ---------------------------------------- 2 files changed, 43 insertions(+), 40 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 5be08caf2e..d82cac46b9 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2021, 2022 Efraim Flashner ;;; Copyright © 2022 Giacomo Leidi ;;; Copyright © 2022 muradm +;;; Copyright © 2023 Hilton Chain ;;; Copyright © 2023 Nicolas Graves ;;; ;;; This file is part of GNU Guix. @@ -28,6 +29,7 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix build-system go) + #:use-module (guix gexp) #:use-module (guix git-download) #:use-module (gnu packages) #:use-module (gnu packages golang) @@ -466,6 +468,47 @@ to jQuery to the Go language.") "Package jsonrpc2 provides a Go implementation of JSON-RPC 2.0.") (license license:expat))) +(define-public go-github-com-tdewolff-minify-v2 + (package + (name "go-github-com-tdewolff-minify-v2") + (version "2.12.7") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/tdewolff/minify") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0qhslaq885zbqs83nvbi29yh09b89kkb6ycami8lz28wkwrlayap")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/tdewolff/minify/v2" + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'regenerate-hash + (lambda* (#:key import-path #:allow-other-keys) + (for-each + (lambda (dir) + (with-directory-excursion + (format #f "src/~a/~a" import-path dir) + (make-file-writable "hash.go") + (format #t "Generating `hash.go' for ~a...~%" dir) + (invoke "go" "generate"))) + '("css" "html" "svg"))))))) + (propagated-inputs + (list go-github-com-tdewolff-parse-v2)) + (native-inputs + (list go-github-com-tdewolff-hasher + go-github-com-tdewolff-test)) + (home-page "https://go.tacodewolff.nl/minify") + (synopsis "Go minifiers for web formats") + (description + "This package provides HTML5, CSS3, JS, JSON, SVG and XML minifiers and +an interface to implement any other minifier.") + (license license:expat))) + ;;; ;;; Avoid adding new packages to the end of this file. To reduce the chances ;;; of a merge conflict, place them above by existing packages with similar diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index e0c5ef31af..74bd542d42 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -3573,46 +3573,6 @@ per-goroutine.") @code{string} to @code{uint32} mapper.") (license license:bsd-3))) -(define-public go-github-com-tdewolff-minify-v2 - (package - (name "go-github-com-tdewolff-minify-v2") - (version "2.12.7") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/tdewolff/minify") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0qhslaq885zbqs83nvbi29yh09b89kkb6ycami8lz28wkwrlayap")))) - (build-system go-build-system) - (arguments - (list #:import-path "github.com/tdewolff/minify/v2" - #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'regenerate-hash - (lambda* (#:key import-path #:allow-other-keys) - (for-each - (lambda (dir) - (with-directory-excursion - (format #f "src/~a/~a" import-path dir) - (make-file-writable "hash.go") - (format #t "Generating `hash.go' for ~a...~%" dir) - (invoke "go" "generate"))) - '("css" "html" "svg"))))))) - (propagated-inputs - (list go-github-com-tdewolff-parse-v2)) - (native-inputs - (list go-github-com-tdewolff-hasher - go-github-com-tdewolff-test)) - (home-page "https://go.tacodewolff.nl/minify") - (synopsis "Go minifiers for web formats") - (description - "This package provides HTML5, CSS3, JS, JSON, SVG and XML minifiers and -an interface to implement any other minifier.") - (license license:expat))) - (define-public go-github-com-tdewolff-parse-v2 (package (name "go-github-com-tdewolff-parse-v2") -- cgit 1.4.1 From b184a16c141d110840b023851b233dfe032a2f72 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:01 +0000 Subject: gnu: go-github-com-tdewolff-parse-v2: Move to (gnu packages golang-web). * gnu/packages/golang.scm (go-github-com-tdewolff-parse-v2): Move from here... * gnu/packages/golang-web.scm: ...to here. Change-Id: Id58c54359f1bf55c6fc8178ce142bf985858bb87 --- gnu/packages/golang-web.scm | 38 ++++++++++++++++++++++++++++++++++++++ gnu/packages/golang.scm | 37 ------------------------------------- 2 files changed, 38 insertions(+), 37 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index d82cac46b9..9e68e96baf 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -509,6 +509,44 @@ to jQuery to the Go language.") an interface to implement any other minifier.") (license license:expat))) +(define-public go-github-com-tdewolff-parse-v2 + (package + (name "go-github-com-tdewolff-parse-v2") + (version "2.6.6") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/tdewolff/parse") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1dqki9ima079k9a3l72igmx5dml8qsl9z8rzw8a433f4gjhlv320")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/tdewolff/parse/v2" + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'regenerate-hash + (lambda* (#:key import-path #:allow-other-keys) + (for-each + (lambda (dir) + (with-directory-excursion + (format #f "src/~a/~a" import-path dir) + (make-file-writable "hash.go") + (format #t "Generating `hash.go' for ~a...~%" dir) + (invoke "go" "generate"))) + '("css" "html"))))))) + (native-inputs + (list go-github-com-tdewolff-hasher + go-github-com-tdewolff-test)) + (home-page "https://github.com/tdewolff/parse") + (synopsis "Go parsers for web formats") + (description + "This package contains several lexers and parsers written in Go.") + (license license:expat))) + ;;; ;;; Avoid adding new packages to the end of this file. To reduce the chances ;;; of a merge conflict, place them above by existing packages with similar diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 74bd542d42..acffd91dde 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -3573,43 +3573,6 @@ per-goroutine.") @code{string} to @code{uint32} mapper.") (license license:bsd-3))) -(define-public go-github-com-tdewolff-parse-v2 - (package - (name "go-github-com-tdewolff-parse-v2") - (version "2.6.6") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/tdewolff/parse") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1dqki9ima079k9a3l72igmx5dml8qsl9z8rzw8a433f4gjhlv320")))) - (build-system go-build-system) - (arguments - (list #:import-path "github.com/tdewolff/parse/v2" - #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'regenerate-hash - (lambda* (#:key import-path #:allow-other-keys) - (for-each - (lambda (dir) - (with-directory-excursion - (format #f "src/~a/~a" import-path dir) - (make-file-writable "hash.go") - (format #t "Generating `hash.go' for ~a...~%" dir) - (invoke "go" "generate"))) - '("css" "html"))))))) - (native-inputs - (list go-github-com-tdewolff-hasher - go-github-com-tdewolff-test)) - (home-page "https://github.com/tdewolff/parse") - (synopsis "Go parsers for web formats") - (description - "This package contains several lexers and parsers written in Go.") - (license license:expat))) - (define-public go-github-com-tj-docopt (package (name "go-github-com-tj-docopt") -- cgit 1.4.1 From 032cac46ed01ceb628a08bdbcc97b256a71002ab Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:02 +0000 Subject: gnu: go-github-com-gorilla-context: Move to (gnu packages golang-web). * gnu/packages/golang.scm (go-github-com-gorilla-context): Move from here... * gnu/packages/golang-web.scm: ...to here. Change-Id: I22ba5493a48fe619ef2aca185c559da3a81f8d81 --- gnu/packages/golang-web.scm | 26 ++++++++++++++++++++++++++ gnu/packages/golang.scm | 24 ------------------------ 2 files changed, 26 insertions(+), 24 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 9e68e96baf..012ed0429c 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -146,6 +146,32 @@ metrics (i.e. response time, bytes written, and http status code) from your application's http.Handlers.") (license license:expat))) +(define-public go-github-com-gorilla-context + (let ((commit "08b5f424b9271eedf6f9f0ce86cb9396ed337a42") + (revision "0")) + (package + (name "go-github-com-gorilla-context") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/gorilla/context") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "03p4hn87vcmfih0p9w663qbx9lpsf7i7j3lc7yl7n84la3yz63m4")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/gorilla/context")) + (home-page "https://github.com/gorilla/context") + (synopsis "Go registry for request variables") + (description + "This package provides @code{gorilla/context}, which is a general +purpose registry for global request variables in the Go programming +language.") + (license license:bsd-3)))) + (define-public go-github-com-gorilla-csrf (package (name "go-github-com-gorilla-csrf") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index acffd91dde..52d65d4967 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -4641,30 +4641,6 @@ information about the resource usage and performance characteristics of running containers.") (license license:asl2.0)))) -(define-public go-github-com-gorilla-context - (let ((commit "08b5f424b9271eedf6f9f0ce86cb9396ed337a42") - (revision "0")) - (package - (name "go-github-com-gorilla-context") - (version (git-version "0.0.0" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/gorilla/context") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "03p4hn87vcmfih0p9w663qbx9lpsf7i7j3lc7yl7n84la3yz63m4")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/gorilla/context")) - (home-page "https://github.com/gorilla/context") - (synopsis "Go registry for request variables") - (description "This package provides @code{gorilla/context}, which is a general purpose registry for global request variables in the Go programming language.") - (license license:bsd-3)))) - (define-public go-github-com-andybalholm-brotli (package (name "go-github-com-andybalholm-brotli") -- cgit 1.4.1 From d0dc31a56ec497e070eb6662c8ff6b4b3e5c7cef Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:03 +0000 Subject: gnu: go-github-com-microcosm-cc-bluemonday: Move to (gnu packages golang-web). * gnu/packages/golang.scm (go-github-com-microcosm-cc-bluemonday): Move from here... * gnu/packages/golang-web.scm: ...to here. Change-Id: Ie5122f8afb2a29574c0e0bb5eb96665ecb77176b --- gnu/packages/golang-web.scm | 24 ++++++++++++++++++++++++ gnu/packages/golang.scm | 24 ------------------------ 2 files changed, 24 insertions(+), 24 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 012ed0429c..117742dc07 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -444,6 +444,30 @@ SPNEGO Kerberos authentication, as well as a HTTP handler wrapper decodes Microsoft AD PAC authorization data.") (license license:asl2.0))) +(define-public go-github-com-microcosm-cc-bluemonday + (package + (name "go-github-com-microcosm-cc-bluemonday") + (version "1.0.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/microcosm-cc/bluemonday") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "071ph097c1iwbcc33x6kblj9rxb1r4mp3qfkrj4qw5mg7qcqxydk")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/microcosm-cc/bluemonday")) + (propagated-inputs + (list go-github-com-chris-ramon-douceur + go-golang-org-x-net)) + (home-page "https://github.com/microcosm-cc/bluemonday/") + (synopsis "HTML sanitizer") + (description "@code{bluemonday} is a HTML sanitizer implemented in Go.") + (license license:bsd-3))) + (define-public go-github-com-puerkitobio-goquery (package (name "go-github-com-puerkitobio-goquery") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 52d65d4967..292d4f799d 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -9165,30 +9165,6 @@ converts it into syntax highlighted HTML, ANSI-coloured text, etc.") transforms one JSON document into another through a JMESPath expression.") (license license:asl2.0))) -(define-public go-github-com-microcosm-cc-bluemonday - (package - (name "go-github-com-microcosm-cc-bluemonday") - (version "1.0.3") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/microcosm-cc/bluemonday") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "071ph097c1iwbcc33x6kblj9rxb1r4mp3qfkrj4qw5mg7qcqxydk")))) - (build-system go-build-system) - (arguments - `(#:import-path "github.com/microcosm-cc/bluemonday")) - (propagated-inputs - (list go-github-com-chris-ramon-douceur - go-golang-org-x-net)) - (home-page "https://github.com/microcosm-cc/bluemonday/") - (synopsis "HTML sanitizer") - (description "@code{bluemonday} is a HTML sanitizer implemented in Go.") - (license license:bsd-3))) - (define-public go-github-com-muesli-reflow-wordwrap (package (name "go-github-com-muesli-reflow-wordwrap") -- cgit 1.4.1 From 815821c139798e42e2c022a5c2128ea10e9d2fea Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:04 +0000 Subject: gnu: go-github-com-google-safehtml: Move to (gnu packages golang-web). * gnu/packages/golang.scm (go-github-com-google-safehtml): Move from here... * gnu/packages/golang-web.scm: ...to here. Change-Id: Ia1f14486f262d3695077c8e2f409f4928874c4f8 --- gnu/packages/golang-web.scm | 26 ++++++++++++++++++++++++++ gnu/packages/golang.scm | 25 ------------------------- 2 files changed, 26 insertions(+), 25 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 117742dc07..ce95d1b467 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2022 Giacomo Leidi ;;; Copyright © 2022 muradm ;;; Copyright © 2023 Hilton Chain +;;; Copyright © 2023 Katherine Cox-Buday ;;; Copyright © 2023 Nicolas Graves ;;; ;;; This file is part of GNU Guix. @@ -146,6 +147,31 @@ metrics (i.e. response time, bytes written, and http status code) from your application's http.Handlers.") (license license:expat))) +(define-public go-github-com-google-safehtml + (package + (name "go-github-com-google-safehtml") + (version "0.1.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/google/safehtml") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0j2xjy8xrk9y9k6bqpvimj84i6hg1wwsyvwsb0axhmp49cmnrp86")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/google/safehtml")) + (propagated-inputs `(("go-golang-org-x-text" ,go-golang-org-x-text))) + (home-page "https://github.com/google/safehtml") + (synopsis "Safe HTML for Go") + (description + "Package safehtml provides immutable string-like types which represent +values that are guaranteed to be safe, by construction or by escaping or +sanitization, to use in various HTML contexts and with various DOM APIs.") + (license license:bsd-3))) + (define-public go-github-com-gorilla-context (let ((commit "08b5f424b9271eedf6f9f0ce86cb9396ed337a42") (revision "0")) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 292d4f799d..84dead6293 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -12510,31 +12510,6 @@ production-ready implementation, compatible with the original Jsonnet C++ implementation.") (license license:asl2.0))) -(define-public go-github-com-google-safehtml - (package - (name "go-github-com-google-safehtml") - (version "0.1.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/google/safehtml") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0j2xjy8xrk9y9k6bqpvimj84i6hg1wwsyvwsb0axhmp49cmnrp86")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/google/safehtml")) - (propagated-inputs `(("go-golang-org-x-text" ,go-golang-org-x-text))) - (home-page "https://github.com/google/safehtml") - (synopsis "Safe HTML for Go") - (description - "Package safehtml provides immutable string-like types which represent values -that are guaranteed to be safe, by construction or by escaping or sanitization, -to use in various HTML contexts and with various DOM APIs.") - (license license:bsd-3))) - (define-public go-github-com-google-shlex (package (name "go-github-com-google-shlex") -- cgit 1.4.1 From a3a25490ec6d7da6f8da2bc374e28d11ccc3a4d8 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:05 +0000 Subject: gnu: go-github-com-google-safehtml: Remove input labels. * gnu/packages/golang-web (go-github-com-google-safehtml): Remove labels. Change-Id: I20f5748496988c9e64fa0783bb51507c6cfa933e --- gnu/packages/golang-web.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index ce95d1b467..9aa3fe8233 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -163,7 +163,8 @@ application's http.Handlers.") (build-system go-build-system) (arguments '(#:import-path "github.com/google/safehtml")) - (propagated-inputs `(("go-golang-org-x-text" ,go-golang-org-x-text))) + (propagated-inputs + (list go-golang-org-x-text)) (home-page "https://github.com/google/safehtml") (synopsis "Safe HTML for Go") (description -- cgit 1.4.1 From 8a8b218b3fa963e078d63b38774539ee1cf9ae15 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:06 +0000 Subject: gnu: go-github-com-bep-golibsass: Move to (gnu packages golang-web). * gnu/packages/golang.scm (go-github-com-bep-golibsass): Move from here... * gnu/packages/golang-web.scm: ...to here. Change-Id: I514ae05a8c04eea2084cbcb7e4d84c83b6b71bb4 --- gnu/packages/golang-web.scm | 61 ++++++++++++++++++++++++++++++++++++++++++++- gnu/packages/golang.scm | 58 ------------------------------------------ 2 files changed, 60 insertions(+), 59 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 9aa3fe8233..72f2a7d84c 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2020 Martin Becze ;;; Copyright © 2020 Martin Becze ;;; Copyright © 2020 Oleg Pykhalov +;;; Copyright © 2020 Ryan Prior ;;; Copyright © 2021 Sarah Morgensen ;;; Copyright © 2021, 2022 Efraim Flashner ;;; Copyright © 2022 Giacomo Leidi @@ -34,7 +35,8 @@ #:use-module (guix git-download) #:use-module (gnu packages) #:use-module (gnu packages golang) - #:use-module (gnu packages golang-check)) + #:use-module (gnu packages golang-check) + #:use-module (gnu packages web)) ;;; Commentary: ;;; @@ -95,6 +97,63 @@ the parse trees produced by the html package.") (description "This package provides a CSS parser and inliner.") (license license:expat))) +(define-public go-github-com-bep-golibsass + (package + (name "go-github-com-bep-golibsass") + (version "0.7.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/bep/golibsass") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0xk3m2ynbydzx87dz573ihwc4ryq0r545vz937szz175ivgfrhh3")) + (modules '((guix build utils))) + (snippet + '(begin + (delete-file-recursively "libsass_src") + #t)))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/bep/golibsass/libsass" + #:unpack-path "github.com/bep/golibsass" + ;; The dev build tag modifies the build to link to system libsass + ;; instead of including the bundled one (which we remove.) + ;; https://github.com/bep/golibsass/blob/v0.7.0/internal/libsass/a__cgo_dev.go + #:build-flags '("-tags" "dev") + #:phases + (modify-phases %standard-phases + (add-before 'build 'generate-bindings + ;; Generate bindings for system libsass, replacing the + ;; pre-generated bindings. + (lambda* (#:key inputs unpack-path #:allow-other-keys) + (mkdir-p (string-append "src/" unpack-path "/internal/libsass")) + (let ((libsass-src (string-append (assoc-ref inputs "libsass-src") "/src"))) + (substitute* (string-append "src/" unpack-path "/gen/main.go") + (("filepath.Join\\(rootDir, \"libsass_src\", \"src\"\\)") + (string-append "\"" libsass-src "\"")) + (("../../libsass_src/src/") + libsass-src))) + (invoke "go" "generate" (string-append unpack-path "/gen")) + #t)) + (replace 'check + (lambda* (#:key tests? import-path #:allow-other-keys) + (if tests? + (invoke "go" "test" import-path "-tags" "dev")) + #t))))) + (propagated-inputs + (list libsass)) + (native-inputs + `(("go-github-com-frankban-quicktest" ,go-github-com-frankban-quicktest) + ("libsass-src" ,(package-source libsass)))) + (home-page "https://github.com/bep/golibsass") + (synopsis "Easy to use Go bindings for LibSass") + (description + "This package provides SCSS compiler support for Go applications.") + (license license:expat))) + (define-public go-github-com-chris-ramon-douceur (package (name "go-github-com-chris-ramon-douceur") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 84dead6293..a49df748f7 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -10508,64 +10508,6 @@ is unchanged. This package contains a series of small enhancements and additions.") (license license:bsd-3)))) -(define-public go-github-com-bep-golibsass - (package - (name "go-github-com-bep-golibsass") - (version "0.7.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/bep/golibsass") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0xk3m2ynbydzx87dz573ihwc4ryq0r545vz937szz175ivgfrhh3")) - (modules '((guix build utils))) - (snippet - '(begin - (delete-file-recursively "libsass_src") - #t)))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/bep/golibsass/libsass" - #:unpack-path "github.com/bep/golibsass" - ;; The dev build tag modifies the build to link to system libsass - ;; instead of including the bundled one (which we remove.) - ;; https://github.com/bep/golibsass/blob/v0.7.0/internal/libsass/a__cgo_dev.go - #:build-flags '("-tags" "dev") - #:phases - (modify-phases %standard-phases - (add-before 'build 'generate-bindings - ;; Generate bindings for system libsass, replacing the - ;; pre-generated bindings. - (lambda* (#:key inputs unpack-path #:allow-other-keys) - (mkdir-p (string-append "src/" unpack-path "/internal/libsass")) - (let ((libsass-src (string-append (assoc-ref inputs "libsass-src") "/src"))) - (substitute* (string-append "src/" unpack-path "/gen/main.go") - (("filepath.Join\\(rootDir, \"libsass_src\", \"src\"\\)") - (string-append "\"" libsass-src "\"")) - (("../../libsass_src/src/") - libsass-src))) - (invoke "go" "generate" (string-append unpack-path "/gen")) - #t)) - (replace 'check - (lambda* (#:key tests? import-path #:allow-other-keys) - (if tests? - (invoke "go" "test" import-path "-tags" "dev")) - #t))))) - (propagated-inputs - (list libsass)) - (native-inputs - `(("go-github-com-frankban-quicktest" ,go-github-com-frankban-quicktest) - ("libsass-src" ,(package-source libsass)))) - (home-page "https://github.com/bep/golibsass") - (synopsis "Easy to use Go bindings for LibSass") - (description - "This package provides SCSS compiler support for Go applications.") - (license license:expat))) - (define-public go-github-com-hashicorp-go-syslog (package (name "go-github-com-hashicorp-go-syslog") -- cgit 1.4.1 From 584bff22f27436c095a56560865cae05b31fbd84 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:07 +0000 Subject: gnu: go-gopkg-in-square-go-jose-v2: Move to (gnu packages golang-web). * gnu/packages/golang.scm (go-gopkg-in-square-go-jose-v2): Move from here... * gnu/packages/golang-web.scm: ...to here. Change-Id: Ifdc5b240c2f3af874d6b4b8b0422dfd9326348a3 --- gnu/packages/golang-web.scm | 29 +++++++++++++++++++++++++++++ gnu/packages/golang.scm | 29 ----------------------------- 2 files changed, 29 insertions(+), 29 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 72f2a7d84c..976179f44e 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -683,6 +683,35 @@ an interface to implement any other minifier.") "This package contains several lexers and parsers written in Go.") (license license:expat))) +(define-public go-gopkg-in-square-go-jose-v2 + (package + (name "go-gopkg-in-square-go-jose-v2") + (version "2.6.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/square/go-jose") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1b1nhqxfmhzwrfk7pkvp2w3z3d0pf5ir00vizmy2d4xdbnldn70r")))) + (build-system go-build-system) + (arguments + (list #:import-path "gopkg.in/square/go-jose.v2")) + (propagated-inputs + (list go-golang-org-x-crypto)) + (native-inputs + (list go-github-com-google-go-cmp-cmp + go-github-com-stretchr-testify)) + (home-page "https://gopkg.in/square/go-jose.v2") + (synopsis "Implementation of JOSE standards (JWE, JWS, JWT) in Go") + (description + "This package aims to provide an implementation of the Javascript Object +Signing and Encryption set of standards. This includes support for JSON Web +Encryption, JSON Web Signature, and JSON Web Token standards.") + (license license:asl2.0))) + ;;; ;;; Avoid adding new packages to the end of this file. To reduce the chances ;;; of a merge conflict, place them above by existing packages with similar diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index a49df748f7..f222b40ead 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -3359,35 +3359,6 @@ and anniversaries.") "This is the official AWS SDK for the Go programming language.") (license license:asl2.0))) -(define-public go-gopkg-in-square-go-jose-v2 - (package - (name "go-gopkg-in-square-go-jose-v2") - (version "2.6.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/square/go-jose") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1b1nhqxfmhzwrfk7pkvp2w3z3d0pf5ir00vizmy2d4xdbnldn70r")))) - (build-system go-build-system) - (arguments - (list #:import-path "gopkg.in/square/go-jose.v2")) - (propagated-inputs - (list go-golang-org-x-crypto)) - (native-inputs - (list go-github-com-google-go-cmp-cmp - go-github-com-stretchr-testify)) - (home-page "https://gopkg.in/square/go-jose.v2") - (synopsis "Implementation of JOSE standards (JWE, JWS, JWT) in Go") - (description - "This package aims to provide an implementation of the Javascript Object -Signing and Encryption set of standards. This includes support for JSON Web -Encryption, JSON Web Signature, and JSON Web Token standards.") - (license license:asl2.0))) - (define-public go-github-com-go-jose-go-jose-v3 (package (inherit go-gopkg-in-square-go-jose-v2) -- cgit 1.4.1 From 66ea5eebb192dd144d44b0520166e9b095f8ac8b Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:08 +0000 Subject: gnu: go-github-com-coreos-go-oidc: Move to (gnu packages golang-web). * gnu/packages/golang.scm (go-github-com-coreos-go-oidc): Move from here... * gnu/packages/golang-web.scm: ...to here. Change-Id: Iadefbc9c3df2aa291a3eb4c8cc31a5fdf562e138 --- gnu/packages/golang-web.scm | 27 +++++++++++++++++++++++++++ gnu/packages/golang.scm | 27 --------------------------- 2 files changed, 27 insertions(+), 27 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 976179f44e..792406ab97 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -182,6 +182,33 @@ the parse trees produced by the html package.") (description "This package provides a CSS parser and inliner.") (license license:expat))) +(define-public go-github-com-coreos-go-oidc + (package + (name "go-github-com-coreos-go-oidc") + (version "2.2.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/coreos/go-oidc") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "11m6slbpi33ynffml7812piq4anhjlf1qszjlsf26f5y7x3qh8n5")))) + (build-system go-build-system) + (arguments + (list #:import-path "github.com/coreos/go-oidc")) + (propagated-inputs + (list go-github-com-pquerna-cachecontrol + go-golang-org-x-oauth2 + go-gopkg-in-square-go-jose-v2)) + (home-page "https://github.com/coreos/go-oidc") + (synopsis "OpenID Connect support for Go") + (description + "This package enables OpenID Connect support for the +@code{go-golang-org-x-oauth2} package.") + (license license:asl2.0))) + (define-public go-github-com-felixge-httpsnoop (package (name "go-github-com-felixge-httpsnoop") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index f222b40ead..f67b38f34e 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -9379,33 +9379,6 @@ templates on ANSI compatible terminals. You can create your own stylesheet or use one of our glamorous default themes.") (license license:expat))) -(define-public go-github-com-coreos-go-oidc - (package - (name "go-github-com-coreos-go-oidc") - (version "2.2.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/coreos/go-oidc") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "11m6slbpi33ynffml7812piq4anhjlf1qszjlsf26f5y7x3qh8n5")))) - (build-system go-build-system) - (arguments - (list #:import-path "github.com/coreos/go-oidc")) - (propagated-inputs - (list go-github-com-pquerna-cachecontrol - go-golang-org-x-oauth2 - go-gopkg-in-square-go-jose-v2)) - (home-page "https://github.com/coreos/go-oidc") - (synopsis "OpenID Connect support for Go") - (description - "This package enables OpenID Connect support for the -@code{go-golang-org-x-oauth2} package.") - (license license:asl2.0))) - (define-public go-github-com-coreos-go-oidc-v3 (package (inherit go-github-com-coreos-go-oidc) -- cgit 1.4.1 From cb523a9b6bce0332c796d4a2033d7d60a712a58b Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:09 +0000 Subject: gnu: go-github-com-coreos-go-oidc-v3: Move to (gnu packages golang-web). * gnu/packages/golang.scm (go-github-com-coreos-go-oidc-v3): Move from here... * gnu/packages/golang-web.scm: ...to here. Change-Id: If049d6172219bf144d3f30877f3c9f5138bcc78c --- gnu/packages/golang-web.scm | 22 ++++++++++++++++++++++ gnu/packages/golang.scm | 22 ---------------------- 2 files changed, 22 insertions(+), 22 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 792406ab97..0219ffb5e5 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -209,6 +209,28 @@ the parse trees produced by the html package.") @code{go-golang-org-x-oauth2} package.") (license license:asl2.0))) +(define-public go-github-com-coreos-go-oidc-v3 + (package + (inherit go-github-com-coreos-go-oidc) + (name "go-github-com-coreos-go-oidc-v3") + (version "3.6.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/coreos/go-oidc") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1sbm6n3lp48lymn0g921afhq2j6inb38w3wy5rhyx9h8gpzhnxx9")))) + (arguments + (list ;; no Go files in [...]/src/github.com/coreos/go-oidc/v3. + #:import-path "github.com/coreos/go-oidc/v3/oidc" + #:unpack-path "github.com/coreos/go-oidc/v3")) + (propagated-inputs + (list go-github-com-go-jose-go-jose-v3 + go-golang-org-x-oauth2)))) + (define-public go-github-com-felixge-httpsnoop (package (name "go-github-com-felixge-httpsnoop") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index f67b38f34e..aa158f5620 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -9379,28 +9379,6 @@ templates on ANSI compatible terminals. You can create your own stylesheet or use one of our glamorous default themes.") (license license:expat))) -(define-public go-github-com-coreos-go-oidc-v3 - (package - (inherit go-github-com-coreos-go-oidc) - (name "go-github-com-coreos-go-oidc-v3") - (version "3.6.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/coreos/go-oidc") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1sbm6n3lp48lymn0g921afhq2j6inb38w3wy5rhyx9h8gpzhnxx9")))) - (arguments - (list ;; no Go files in [...]/src/github.com/coreos/go-oidc/v3. - #:import-path "github.com/coreos/go-oidc/v3/oidc" - #:unpack-path "github.com/coreos/go-oidc/v3")) - (propagated-inputs - (list go-github-com-go-jose-go-jose-v3 - go-golang-org-x-oauth2)))) - (define-public go-github-com-coreos-go-semver (package (name "go-github-com-coreos-go-semver") -- cgit 1.4.1 From 157369092adae975e2cd5f8f6e68f234e685900f Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:10 +0000 Subject: gnu: go-github-com-aws-sdk: Move to (gnu packages golang-web). * gnu/packages/golang.scm (go-github-com-aws-sdk): Move from here... * gnu/packages/golang-web.scm: ...to here. Change-Id: I8e82019c75b115548c2e0eea54b261ff8c3dd4a7 --- gnu/packages/golang-web.scm | 28 ++++++++++++++++++++++++++++ gnu/packages/golang.scm | 28 ---------------------------- 2 files changed, 28 insertions(+), 28 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 0219ffb5e5..352c831e41 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -71,6 +71,34 @@ the parse trees produced by the html package.") (license license:bsd-2))) +(define-public go-github-com-aws-sdk + (package + (name "go-github-com-aws-sdk") + (version "1.35.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/aws/aws-sdk-go") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1ky5lw2s2zpslnnqcs6hgsrwvwbxwgflb5jwf16dd4aga3vrg10c")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/aws/aws-sdk-go/aws" + #:unpack-path "github.com/aws/aws-sdk-go")) + (propagated-inputs + (list go-github-com-go-sql-driver-mysql + go-github-com-jmespath-go-jmespath + go-github-com-pkg-errors + go-golang-org-x-net)) + (home-page "https://github.com/aws/aws-sdk-go") + (synopsis "Library to access Amazon Web Services (AWS)") + (description + "This is the official AWS SDK for the Go programming language.") + (license license:asl2.0))) + (define-public go-github-com-aymerick-douceur (package (name "go-github-com-aymerick-douceur") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index aa158f5620..1a02f66ac8 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -3331,34 +3331,6 @@ specified. Algorithms are included to calculate yahrzeits, birthdays, and anniversaries.") (license license:gpl2+)))) -(define-public go-github-com-aws-sdk - (package - (name "go-github-com-aws-sdk") - (version "1.35.2") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/aws/aws-sdk-go") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1ky5lw2s2zpslnnqcs6hgsrwvwbxwgflb5jwf16dd4aga3vrg10c")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/aws/aws-sdk-go/aws" - #:unpack-path "github.com/aws/aws-sdk-go")) - (propagated-inputs - (list go-github-com-go-sql-driver-mysql - go-github-com-jmespath-go-jmespath go-github-com-pkg-errors - go-golang-org-x-net)) - (home-page "https://github.com/aws/aws-sdk-go") - (synopsis "Library to access Amazon Web Services (AWS)") - (description - "This is the official AWS SDK for the Go programming language.") - (license license:asl2.0))) - (define-public go-github-com-go-jose-go-jose-v3 (package (inherit go-gopkg-in-square-go-jose-v2) -- cgit 1.4.1 From 61b29e1cf2a2093ae5f4a14685bdc993552ff041 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:11 +0000 Subject: gnu: go-github-com-valyala-fasthttp: Move to (gnu packages golang-web). * gnu/packages/golang.scm (go-github-com-valyala-fasthttp): Move from here... * gnu/packages/golang-web.scm: ...to here. Change-Id: I60676c0204e198c6050724efa5410c5b695f88fb --- gnu/packages/golang-web.scm | 41 +++++++++++++++++++++++++++++++++++++++++ gnu/packages/golang.scm | 40 ---------------------------------------- 2 files changed, 41 insertions(+), 40 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 352c831e41..f59415452f 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -11,6 +11,7 @@ ;;; Copyright © 2023 Hilton Chain ;;; Copyright © 2023 Katherine Cox-Buday ;;; Copyright © 2023 Nicolas Graves +;;; Copyright © 2022 Sharlatan Hellseher ;;; ;;; This file is part of GNU Guix. ;;; @@ -760,6 +761,46 @@ an interface to implement any other minifier.") "This package contains several lexers and parsers written in Go.") (license license:expat))) +(define-public go-github-com-valyala-fasthttp + (package + (name "go-github-com-valyala-fasthttp") + (version "1.39.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/valyala/fasthttp") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "12qwx0yk7wjj25v4fswgmj28r69gk94kqdmzavca8k9f0yznniz1")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/valyala/fasthttp" + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key inputs #:allow-other-keys #:rest args) + (unless + ;; Tests hang forever with gccgo. + (false-if-exception (search-input-file inputs "/bin/gccgo")) + (apply (assoc-ref %standard-phases 'check) args))))))) + (propagated-inputs + (list go-github-com-andybalholm-brotli + go-github-com-klauspost-compress + go-github-com-valyala-bytebufferpool + go-github-com-valyala-tcplisten + go-golang-org-x-crypto + go-golang-org-x-net + go-golang-org-x-sys)) + (home-page "https://github.com/valyala/fasthttp") + (synopsis "Provides fast HTTP server and client API") + (description + "This package provides a Go module @code{fasthttp} which may be used as +replacement for native @code{net/http} module.") + (license license:expat))) + (define-public go-gopkg-in-square-go-jose-v2 (package (name "go-gopkg-in-square-go-jose-v2") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 1a02f66ac8..e79179679c 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -11304,46 +11304,6 @@ non-cryptographic hash algorithm, working at speeds close to RAM limits.") anti-fragmentation protection.") (license license:expat))) -(define-public go-github-com-valyala-fasthttp - (package - (name "go-github-com-valyala-fasthttp") - (version "1.39.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/valyala/fasthttp") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "12qwx0yk7wjj25v4fswgmj28r69gk94kqdmzavca8k9f0yznniz1")))) - (build-system go-build-system) - (arguments - (list - #:import-path "github.com/valyala/fasthttp" - #:phases - #~(modify-phases %standard-phases - (replace 'check - (lambda* (#:key inputs #:allow-other-keys #:rest args) - (unless - ;; Tests hang forever with gccgo. - (false-if-exception (search-input-file inputs "/bin/gccgo")) - (apply (assoc-ref %standard-phases 'check) args))))))) - (propagated-inputs - (list go-golang-org-x-sys - go-golang-org-x-net - go-golang-org-x-crypto - go-github-com-valyala-tcplisten - go-github-com-valyala-bytebufferpool - go-github-com-klauspost-compress - go-github-com-andybalholm-brotli)) - (home-page "https://github.com/valyala/fasthttp") - (synopsis "Provides fast HTTP server and client API") - (description - "This package provides a Go module @code{fasthttp} which may be used as -replacement for native @code{net/http} module.") - (license license:expat))) - (define-public go-github-com-valyala-tcplisten (package (name "go-github-com-valyala-tcplisten") -- cgit 1.4.1 From 9b7806717f4ab244ba0cc4ec23dd4a841cbd910b Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:12 +0000 Subject: gnu: go-github-com-go-chi-chi-v5: Move to (gnu packages golang-web). * gnu/packages/golang.scm (go-github-com-go-chi-chi-v5): Move from here... * gnu/packages/golang-web.scm: ...to here. Change-Id: I120c2cb142935430443a7e6c9e53aa8544bbaf8e --- gnu/packages/golang-web.scm | 27 +++++++++++++++++++++++++-- gnu/packages/golang.scm | 23 ----------------------- 2 files changed, 25 insertions(+), 25 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index f59415452f..2570be62f7 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -1,17 +1,17 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018 Pierre-Antoine Rouby ;;; Copyright © 2020 Martin Becze -;;; Copyright © 2020 Martin Becze ;;; Copyright © 2020 Oleg Pykhalov ;;; Copyright © 2020 Ryan Prior ;;; Copyright © 2021 Sarah Morgensen ;;; Copyright © 2021, 2022 Efraim Flashner ;;; Copyright © 2022 Giacomo Leidi +;;; Copyright © 2022 Sharlatan Hellseher +;;; Copyright © 2022 jgart via Guix-patches via ;;; Copyright © 2022 muradm ;;; Copyright © 2023 Hilton Chain ;;; Copyright © 2023 Katherine Cox-Buday ;;; Copyright © 2023 Nicolas Graves -;;; Copyright © 2022 Sharlatan Hellseher ;;; ;;; This file is part of GNU Guix. ;;; @@ -284,6 +284,29 @@ metrics (i.e. response time, bytes written, and http status code) from your application's http.Handlers.") (license license:expat))) +(define-public go-github-com-go-chi-chi-v5 + (package + (name "go-github-com-go-chi-chi-v5") + (version "5.0.7") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/go-chi/chi") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0rzrsxz4xj0973c6nxklvq2vmg2m795snhk25836i0gnd1jnx79k")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/go-chi/chi/v5")) + (home-page "https://github.com/go-chi/chi") + (synopsis "Composable router for HTTP services written in Go") + (description + "@code{go-github-com-go-chi-chi-v5} is an HTTP router that lets the user +decompose request handling into many smaller layers.") + (license license:expat))) + (define-public go-github-com-google-safehtml (package (name "go-github-com-google-safehtml") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index e79179679c..b66e49801c 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -12117,29 +12117,6 @@ Features: @end itemize") (license license:asl2.0))) -(define-public go-github-com-go-chi-chi-v5 - (package - (name "go-github-com-go-chi-chi-v5") - (version "5.0.7") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/go-chi/chi") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0rzrsxz4xj0973c6nxklvq2vmg2m795snhk25836i0gnd1jnx79k")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/go-chi/chi/v5")) - (home-page "https://github.com/go-chi/chi") - (synopsis "Composable router for HTTP services written in Go") - (description - "@code{go-github-com-go-chi-chi-v5} is an HTTP router that lets the user -decompose request handling into many smaller layers.") - (license license:expat))) - (define-public go-sigs-k8s-io-yaml (package (name "go-sigs-k8s-io-yaml") -- cgit 1.4.1 From 0ca7181c80d8d8d2ddd9741dd30fb19f87a2266f Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:13 +0000 Subject: gnu: go-github-com-julienschmidt-httprouter: Move to (gnu packages golang-web). * gnu/packages/golang.scm (go-github-com-julienschmidt-httprouter): Move from here... * gnu/packages/golang-web.scm: ...to here. * gnu/packages/high-availability.scm: Add (gnu packages golang-web) module. Change-Id: I277e4a7ed835b0dc00f08e102e982e0cd019b828 --- gnu/packages/golang-web.scm | 25 ++++++++++++++++++++++++- gnu/packages/golang.scm | 23 ----------------------- gnu/packages/high-availability.scm | 1 + 3 files changed, 25 insertions(+), 24 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 2570be62f7..c501f55685 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -6,9 +6,9 @@ ;;; Copyright © 2021 Sarah Morgensen ;;; Copyright © 2021, 2022 Efraim Flashner ;;; Copyright © 2022 Giacomo Leidi -;;; Copyright © 2022 Sharlatan Hellseher ;;; Copyright © 2022 jgart via Guix-patches via ;;; Copyright © 2022 muradm +;;; Copyright © 2022, 2023 Sharlatan Hellseher ;;; Copyright © 2023 Hilton Chain ;;; Copyright © 2023 Katherine Cox-Buday ;;; Copyright © 2023 Nicolas Graves @@ -631,6 +631,29 @@ SPNEGO Kerberos authentication, as well as a HTTP handler wrapper decodes Microsoft AD PAC authorization data.") (license license:asl2.0))) +(define-public go-github-com-julienschmidt-httprouter + (package + (name "go-github-com-julienschmidt-httprouter") + (version "1.3.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/julienschmidt/httprouter") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1a6sy0ysqknsjssjh7qg1dqn21xmj9a36c57nrk7srfmab4ffmk1")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/julienschmidt/httprouter")) + (home-page "https://github.com/julienschmidt/httprouter") + (synopsis "High performance HTTP request router") + (description + "Package @code{httprouter} is a trie based high performance HTTP request +router.") + (license license:bsd-3))) + (define-public go-github-com-microcosm-cc-bluemonday (package (name "go-github-com-microcosm-cc-bluemonday") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index b66e49801c..fad77f7a27 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -9601,29 +9601,6 @@ extensions.") for color and styles.") (license license:lgpl3))) -(define-public go-github-com-julienschmidt-httprouter - (package - (name "go-github-com-julienschmidt-httprouter") - (version "1.3.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/julienschmidt/httprouter") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1a6sy0ysqknsjssjh7qg1dqn21xmj9a36c57nrk7srfmab4ffmk1")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/julienschmidt/httprouter")) - (home-page "https://github.com/julienschmidt/httprouter") - (synopsis "High performance HTTP request router") - (description - "Package @code{httprouter} is a trie based high performance HTTP request -router.") - (license license:bsd-3))) - (define-public go-github-com-kevinburke-ssh-config (package (name "go-github-com-kevinburke-ssh-config") diff --git a/gnu/packages/high-availability.scm b/gnu/packages/high-availability.scm index 553095cb75..6808bcd597 100644 --- a/gnu/packages/high-availability.scm +++ b/gnu/packages/high-availability.scm @@ -35,6 +35,7 @@ #:use-module (gnu packages gettext) #:use-module (gnu packages glib) #:use-module (gnu packages golang) + #:use-module (gnu packages golang-web) #:use-module (gnu packages hardware) #:use-module (gnu packages linux) #:use-module (gnu packages lua) -- cgit 1.4.1 From 9a5946bc7aa56f541c374832c2e2ef08c25d19b9 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:14 +0000 Subject: gnu: go-github-com-emicklei-go-restful: Move to (gnu packages golang-web). * gnu/packages/golang.scm (go-github-com-emicklei-go-restful): Move from here... * gnu/packages/golang-web.scm: ...to here. Change-Id: Idc88242d2ec3274a0b68244f5e91bbfc2dd8543c --- gnu/packages/golang-web.scm | 24 ++++++++++++++++++++++++ gnu/packages/golang.scm | 24 ------------------------ 2 files changed, 24 insertions(+), 24 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index c501f55685..4cef7b6641 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018 Pierre-Antoine Rouby +;;; Copyright © 2020 Jack Hill ;;; Copyright © 2020 Martin Becze ;;; Copyright © 2020 Oleg Pykhalov ;;; Copyright © 2020 Ryan Prior @@ -260,6 +261,29 @@ the parse trees produced by the html package.") (list go-github-com-go-jose-go-jose-v3 go-golang-org-x-oauth2)))) +(define-public go-github-com-emicklei-go-restful + (package + (name "go-github-com-emicklei-go-restful") + (version "3.4.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/emicklei/go-restful") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0m1y5a6xr6hmdj77afrvyh2llkbhn1166lcrgis654shl8zs9qhz")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/emicklei/go-restful")) + (home-page "https://github.com/emicklei/go-restful") + (synopsis "Build REST-style web services using Go") + (description "This package provides @code{go-restful}, which helps +developers to use @code{http} methods explicitly and in a way that's +consistent with the HTTP protocol definition.") + (license license:expat))) + (define-public go-github-com-felixge-httpsnoop (package (name "go-github-com-felixge-httpsnoop") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index fad77f7a27..e3c4577a57 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -4507,30 +4507,6 @@ sockets.") (description "Semver is a library for Semantic versioning written in Go.") (license license:expat)))) -(define-public go-github-com-emicklei-go-restful - (package - (name "go-github-com-emicklei-go-restful") - (version "3.4.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/emicklei/go-restful") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0m1y5a6xr6hmdj77afrvyh2llkbhn1166lcrgis654shl8zs9qhz")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/emicklei/go-restful")) - (home-page "https://github.com/emicklei/go-restful") - (synopsis "Build REST-style web services using Go") - (description "This package provides @code{go-restful}, which helps -developers to use @code{http} methods explicitly and in a way that's consistent -with the HTTP protocol definition.") - (license license:expat))) - (define-public go-cloud-google-com-go-compute-metadata (package (name "go-cloud-google-com-go-compute-metadata") -- cgit 1.4.1 From 75641bbd7398c8344450d54eeba035c0bbebdcaa Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:15 +0000 Subject: gnu: go-github-com-tv42-httpunix: Move to (gnu packages golang-web). * gnu/packages/golang.scm (go-github-com-tv42-httpunix): Move from here... * gnu/packages/golang-web.scm: ...to here. Change-Id: I1b81c93afd803dfd68fae5292cb2103855cdba6d --- gnu/packages/golang-web.scm | 25 +++++++++++++++++++++++++ gnu/packages/golang.scm | 24 ------------------------ 2 files changed, 25 insertions(+), 24 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 4cef7b6641..caccb126bc 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2018 Pierre-Antoine Rouby ;;; Copyright © 2020 Jack Hill ;;; Copyright © 2020 Martin Becze +;;; Copyright © 2020 Nicolas Goaziou ;;; Copyright © 2020 Oleg Pykhalov ;;; Copyright © 2020 Ryan Prior ;;; Copyright © 2021 Sarah Morgensen @@ -831,6 +832,30 @@ an interface to implement any other minifier.") "This package contains several lexers and parsers written in Go.") (license license:expat))) +(define-public go-github-com-tv42-httpunix + (let ((commit "2ba4b9c3382c77e7b9ea89d00746e6111d142a22") + (revision "0")) + (package + (name "go-github-com-tv42-httpunix") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/tv42/httpunix") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0xbwpip2hsfhd2kd878jn5ndl8y1i9658lggha4x3xb5m1rsds9w")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/tv42/httpunix")) + (home-page "https://github.com/tv42/httpunix") + (synopsis "Go library to talk HTTP over Unix domain sockets") + (description "This package is a Go library to talk HTTP over Unix domain +sockets.") + (license license:expat)))) + (define-public go-github-com-valyala-fasthttp (package (name "go-github-com-valyala-fasthttp") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index e3c4577a57..be31cd0f43 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -4459,30 +4459,6 @@ to use line-based tools such as grep to search for what you want and see the absolute \"path\" to it.") (license license:expat))) -(define-public go-github-com-tv42-httpunix - (let ((commit "2ba4b9c3382c77e7b9ea89d00746e6111d142a22") - (revision "0")) - (package - (name "go-github-com-tv42-httpunix") - (version (git-version "0.0.0" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/tv42/httpunix") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0xbwpip2hsfhd2kd878jn5ndl8y1i9658lggha4x3xb5m1rsds9w")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/tv42/httpunix")) - (home-page "https://github.com/tv42/httpunix") - (synopsis "Go library to talk HTTP over Unix domain sockets") - (description "This package is a Go library to talk HTTP over Unix domain -sockets.") - (license license:expat)))) - (define-public go-github-com-blang-semver (let ((commit "60ec3488bfea7cca02b021d106d9911120d25fe9") (revision "0")) -- cgit 1.4.1 From 7a9f0869d4677b553083f6439b673b95beae766c Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:16 +0000 Subject: gnu: go-github-com-opentracing-opentracing-go: Move to (gnu packages golang-web). * gnu/packages/golang.scm (go-github-com-opentracing-opentracing-go): Move from here... * gnu/packages/golang-web.scm: ...to here. Change-Id: I87e615589cdb038e2b633ecd63194c81d5864a5b --- gnu/packages/golang-web.scm | 25 +++++++++++++++++++++++++ gnu/packages/golang.scm | 24 ------------------------ 2 files changed, 25 insertions(+), 24 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index caccb126bc..d021be005f 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2020 Nicolas Goaziou ;;; Copyright © 2020 Oleg Pykhalov ;;; Copyright © 2020 Ryan Prior +;;; Copyright © 2021 Raghav Gururajan ;;; Copyright © 2021 Sarah Morgensen ;;; Copyright © 2021, 2022 Efraim Flashner ;;; Copyright © 2022 Giacomo Leidi @@ -703,6 +704,30 @@ router.") (description "@code{bluemonday} is a HTML sanitizer implemented in Go.") (license license:bsd-3))) +(define-public go-github-com-opentracing-opentracing-go + (package + (name "go-github-com-opentracing-opentracing-go") + (version "1.2.0") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/opentracing/opentracing-go") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "04rgdwl29kimp2wnm4dycnzp7941hvpj6wym85x23c6fclacm94h")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/opentracing/opentracing-go")) + (native-inputs + (list go-github-com-stretchr-testify)) + (home-page "https://github.com/opentracing/opentracing-go") + (synopsis "OpenTracing API for Go") + (description "OpenTracing-Go is a Go implementation of the OpenTracing API.") + (license license:asl2.0))) + (define-public go-github-com-puerkitobio-goquery (package (name "go-github-com-puerkitobio-goquery") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index be31cd0f43..40ffc1143d 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -1934,30 +1934,6 @@ standardized in RFC 7539.") (description "InterConv converts interfaces into any data type.") (license license:expat)))) -(define-public go-github-com-opentracing-opentracing-go - (package - (name "go-github-com-opentracing-opentracing-go") - (version "1.2.0") - (source - (origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/opentracing/opentracing-go") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "04rgdwl29kimp2wnm4dycnzp7941hvpj6wym85x23c6fclacm94h")))) - (build-system go-build-system) - (arguments - `(#:import-path "github.com/opentracing/opentracing-go")) - (native-inputs - (list go-github-com-stretchr-testify)) - (home-page "https://github.com/opentracing/opentracing-go") - (synopsis "OpenTracing API for Go") - (description "OpenTracing-Go is a Go implementation of the OpenTracing API.") - (license license:asl2.0))) - (define-public go-github-com-operatorfoundation-monolith-go (package (name "go-github-com-operatorfoundation-monolith-go") -- cgit 1.4.1 From d087261febf44b44936548849f155bc57680dadb Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:17 +0000 Subject: gnu: go-github-com-francoispqt-gojay: Move to (gnu packages golang-web). * gnu/packages/golang.scm (go-github-com-francoispqt-gojay): Move from here... * gnu/packages/golang-web.scm: ...to here. Change-Id: I2ff041a91e2d37d79495a3ebda1b602784161c4a --- gnu/packages/golang-web.scm | 27 ++++++++++++++++++++++++++- gnu/packages/golang.scm | 25 ------------------------- 2 files changed, 26 insertions(+), 26 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index d021be005f..2790e2b5aa 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -5,9 +5,9 @@ ;;; Copyright © 2020 Nicolas Goaziou ;;; Copyright © 2020 Oleg Pykhalov ;;; Copyright © 2020 Ryan Prior +;;; Copyright © 2020-2022 Efraim Flashner ;;; Copyright © 2021 Raghav Gururajan ;;; Copyright © 2021 Sarah Morgensen -;;; Copyright © 2021, 2022 Efraim Flashner ;;; Copyright © 2022 Giacomo Leidi ;;; Copyright © 2022 jgart via Guix-patches via ;;; Copyright © 2022 muradm @@ -310,6 +310,31 @@ metrics (i.e. response time, bytes written, and http status code) from your application's http.Handlers.") (license license:expat))) +(define-public go-github-com-francoispqt-gojay + (package + (name "go-github-com-francoispqt-gojay") + (version "1.2.13") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/francoispqt/gojay") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1ix95qdyajfmxhf9y52vjrih63f181pjs4v5as8905s4d5vmkd06")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/francoispqt/gojay")) + (propagated-inputs + (list go-github-com-stretchr-testify)) + (synopsis "JSON encoder/decoder with powerful stream API for Golang") + (description "GoJay is a performant JSON encoder/decoder for Golang. It has +a simple API and doesn't use reflection. It relies on small interfaces to +decode/encode structures and slices.") + (home-page "https://github.com/francoispqt/gojay") + (license license:expat))) + (define-public go-github-com-go-chi-chi-v5 (package (name "go-github-com-go-chi-chi-v5") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 40ffc1143d..beb14e0c3f 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -7479,31 +7479,6 @@ designed to clean up raw terminal output by stripping escape sequences, optionally preserving color.") (license license:expat))) -(define-public go-github-com-francoispqt-gojay - (package - (name "go-github-com-francoispqt-gojay") - (version "1.2.13") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/francoispqt/gojay") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1ix95qdyajfmxhf9y52vjrih63f181pjs4v5as8905s4d5vmkd06")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/francoispqt/gojay")) - (propagated-inputs - (list go-github-com-stretchr-testify)) - (synopsis "JSON encoder/decoder with powerful stream API for Golang") - (description "GoJay is a performant JSON encoder/decoder for Golang. It has -a simple API and doesn't use reflection. It relies on small interfaces to -decode/encode structures and slices.") - (home-page "https://github.com/francoispqt/gojay") - (license license:expat))) - (define-public go-github-com-pkg-errors (package (name "go-github-com-pkg-errors") -- cgit 1.4.1 From 502c8a7442e20c8d9aced661db4a4f8f7551ea44 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:18 +0000 Subject: gnu: go-github-com-francoispqt-gojay: Adjust inputs. * gnu/packages/golang-web.scm (go-github-com-francoispqt-gojay): [propagated-inputs]: Swap to [native-inputs]. Change-Id: Ie83ea13685036b2688f668cde8bbb831ba5cd602 --- gnu/packages/golang-web.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 2790e2b5aa..59312f791a 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -326,7 +326,7 @@ application's http.Handlers.") (build-system go-build-system) (arguments '(#:import-path "github.com/francoispqt/gojay")) - (propagated-inputs + (native-inputs (list go-github-com-stretchr-testify)) (synopsis "JSON encoder/decoder with powerful stream API for Golang") (description "GoJay is a performant JSON encoder/decoder for Golang. It has -- cgit 1.4.1 From 8e3a60728ab21f60bbc1fbcfacffede5f2aad92e Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:19 +0000 Subject: gnu: go-github-com-goccy-go-json: Move to (gnu packages golang-web). * gnu/packages/golang.scm (go-github-com-goccy-go-json): Move from here... * gnu/packages/golang-web.scm: ...to here. Change-Id: I83fc749483f9f60a05c823e2f792efda0481b505 --- gnu/packages/golang-web.scm | 22 ++++++++++++++++++++++ gnu/packages/golang.scm | 22 ---------------------- 2 files changed, 22 insertions(+), 22 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 59312f791a..e92e04979e 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2020-2022 Efraim Flashner ;;; Copyright © 2021 Raghav Gururajan ;;; Copyright © 2021 Sarah Morgensen +;;; Copyright © 2022 Adam Kandur ;;; Copyright © 2022 Giacomo Leidi ;;; Copyright © 2022 jgart via Guix-patches via ;;; Copyright © 2022 muradm @@ -358,6 +359,27 @@ decode/encode structures and slices.") decompose request handling into many smaller layers.") (license license:expat))) +(define-public go-github-com-goccy-go-json + (package + (name "go-github-com-goccy-go-json") + (version "0.9.10") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/goccy/go-json") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1bg8p4c6r8r0kixdxv2m8xmdsmb1zl5sd8czswpccldjk3c358wp")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/goccy/go-json")) + (home-page "https://github.com/goccy/go-json") + (synopsis "JSON encoder/decoder in Go") + (description "Fast JSON encoder/decoder compatible with encoding/json for Go.") + (license license:expat))) + (define-public go-github-com-google-safehtml (package (name "go-github-com-google-safehtml") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index beb14e0c3f..f601d315af 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -4174,28 +4174,6 @@ loading algorithms.") is similar to Go's standard library @code{json} and @code{xml} package.") (license license:expat))) -(define-public go-github-com-goccy-go-json - (package - (name "go-github-com-goccy-go-json") - (version "0.9.10") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/goccy/go-json") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1bg8p4c6r8r0kixdxv2m8xmdsmb1zl5sd8czswpccldjk3c358wp")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/goccy/go-json")) - (home-page "https://github.com/goccy/go-json") - (synopsis "JSON encoder/decoder in Go") - (description - "Fast JSON encoder/decoder compatible with encoding/json for Go.") - (license license:expat))) - (define-public go-github-com-getsentry-raven-go (let ((commit "5c24d5110e0e198d9ae16f1f3465366085001d92") (revision "0")) -- cgit 1.4.1 From a8378baeb088cc41dc7bb0230b95e8cffbd544fa Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:20 +0000 Subject: gnu: go-github-com-jmespath-go-jmespath: Move to (gnu packages golang-web). * gnu/packages/golang.scm (go-github-com-jmespath-go-jmespath): Move from here... * gnu/packages/golang-web.scm: ...to here. Change-Id: I7f16dd3153ca6fd626061f7da5792192a48041bd --- gnu/packages/golang-web.scm | 27 +++++++++++++++++++++++++++ gnu/packages/golang.scm | 27 --------------------------- 2 files changed, 27 insertions(+), 27 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index e92e04979e..9f7b0e39dc 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -704,6 +704,33 @@ SPNEGO Kerberos authentication, as well as a HTTP handler wrapper decodes Microsoft AD PAC authorization data.") (license license:asl2.0))) +(define-public go-github-com-jmespath-go-jmespath + (package + (name "go-github-com-jmespath-go-jmespath") + (version "0.4.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jmespath/go-jmespath") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "18zyr9nlywmwp3wpzcjxrgq9s9d2mmc6zg6xhsna00m663nkyc3n")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/jmespath/go-jmespath")) + (native-inputs + (list go-github-com-davecgh-go-spew + go-github-com-pmezard-go-difflib + go-gopkg-in-yaml-v2)) + (home-page "https://github.com/jmespath/go-jmespath") + (synopsis "Golang implementation of JMESPath") + (description + "This package implements JMESPath, a query language for JSON. It +transforms one JSON document into another through a JMESPath expression.") + (license license:asl2.0))) + (define-public go-github-com-julienschmidt-httprouter (package (name "go-github-com-julienschmidt-httprouter") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index f601d315af..6add5de065 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -8962,33 +8962,6 @@ synchronizing plain text: converts it into syntax highlighted HTML, ANSI-coloured text, etc.") (license license:expat))) -(define-public go-github-com-jmespath-go-jmespath - (package - (name "go-github-com-jmespath-go-jmespath") - (version "0.4.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/jmespath/go-jmespath") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "18zyr9nlywmwp3wpzcjxrgq9s9d2mmc6zg6xhsna00m663nkyc3n")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/jmespath/go-jmespath")) - (native-inputs - (list go-github-com-davecgh-go-spew go-github-com-pmezard-go-difflib - go-gopkg-in-yaml-v2)) - (home-page "https://github.com/jmespath/go-jmespath") - (synopsis "Golang implementation of JMESPath") - (description - "This package implements JMESPath, a query language for JSON. It -transforms one JSON document into another through a JMESPath expression.") - (license license:asl2.0))) - (define-public go-github-com-muesli-reflow-wordwrap (package (name "go-github-com-muesli-reflow-wordwrap") -- cgit 1.4.1 From 59be3604e3eaae399428ee11043964de0cbdf06a Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:21 +0000 Subject: gnu: go-github-com-aws-smithy-go: Move to (gnu packages golang-web). * gnu/packages/golang.scm (go-github-com-aws-smithy-go): Move from here... * gnu/packages/golang-web.scm: ...to here. Change-Id: I3a4731ae27cc7365c1704cf5a9eab56ca79974a4 --- gnu/packages/golang-web.scm | 24 ++++++++++++++++++++++++ gnu/packages/golang.scm | 24 ------------------------ 2 files changed, 24 insertions(+), 24 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 9f7b0e39dc..c23e6df581 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -104,6 +104,30 @@ the parse trees produced by the html package.") "This is the official AWS SDK for the Go programming language.") (license license:asl2.0))) +(define-public go-github-com-aws-smithy-go + (package + (name "go-github-com-aws-smithy-go") + (version "1.13.5") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/aws/smithy-go") + (commit "v1.13.5"))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1rgyk0m2d3agknnlzjqvac1a61wwdq1pbck7vyl587m38n5zi2cz")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/aws/smithy-go")) + (propagated-inputs + (list go-github-com-jmespath-go-jmespath go-github-com-google-go-cmp-cmp)) + (home-page "https://github.com/aws/smithy-go") + (synopsis "Smithy code generators for Go") + (description + "Package smithy provides the core components for a Smithy SDK.") + (license license:asl2.0))) + (define-public go-github-com-aymerick-douceur (package (name "go-github-com-aymerick-douceur") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 6add5de065..f2066618f2 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -11436,30 +11436,6 @@ encrypting JSON Web Tokens (JWT). It relies only on the standard library.") (home-page "https://github.com/dvsekhvalnov/jose2go") (license license:expat))) -(define-public go-github-com-aws-smithy-go - (package - (name "go-github-com-aws-smithy-go") - (version "1.13.5") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/aws/smithy-go") - (commit "v1.13.5"))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1rgyk0m2d3agknnlzjqvac1a61wwdq1pbck7vyl587m38n5zi2cz")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/aws/smithy-go")) - (propagated-inputs - (list go-github-com-jmespath-go-jmespath go-github-com-google-go-cmp-cmp)) - (home-page "https://github.com/aws/smithy-go") - (synopsis "Smithy code generators for Go") - (description - "Package smithy provides the core components for a Smithy SDK.") - (license license:asl2.0))) - (define-public go-github-com-aws-aws-sdk-go-v2 (package (name "go-github-com-aws-aws-sdk-go-v2") -- cgit 1.4.1 From a171f12286a96613999c2fe67c65b2c342e545fb Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:22 +0000 Subject: gnu: go-github-com-aws-smithy-go: Adjust description. * gnu/packages/golang-web.scm (go-github-com-aws-smithy-go):[description] Add link to Smithy. Change-Id: I3c913db5940dc97fb3fa8874fd8b1bf9baaf4a59 --- gnu/packages/golang-web.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index c23e6df581..ae9ffd3fd2 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -123,7 +123,8 @@ the parse trees produced by the html package.") (propagated-inputs (list go-github-com-jmespath-go-jmespath go-github-com-google-go-cmp-cmp)) (home-page "https://github.com/aws/smithy-go") - (synopsis "Smithy code generators for Go") + (synopsis "@url{https://smithy.io/2.0/index.html,Smithy} code generators +for Go") (description "Package smithy provides the core components for a Smithy SDK.") (license license:asl2.0))) -- cgit 1.4.1 From ae1d9ed08f9c45dd07b4429aebcb3cbd7b90116e Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:23 +0000 Subject: gnu: go-github-com-aws-aws-sdk-go-v2: Move to (gnu packages golang-web). * gnu/packages/golang.scm (go-github-com-aws-aws-sdk-go-v2): Move from here... * gnu/packages/golang-web.scm: ...to here. * gnu/packages/version-control.scm: Add (gnu packages golang-web) module. Change-Id: I6e980749d9f9c1373adfc717b0195a1b8c32d6af --- gnu/packages/golang-web.scm | 26 ++++++++++++++++++++++++++ gnu/packages/golang.scm | 25 ------------------------- gnu/packages/version-control.scm | 1 + 3 files changed, 27 insertions(+), 25 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index ae9ffd3fd2..1542c409fe 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -104,6 +104,32 @@ the parse trees produced by the html package.") "This is the official AWS SDK for the Go programming language.") (license license:asl2.0))) +(define-public go-github-com-aws-aws-sdk-go-v2 + (package + (name "go-github-com-aws-aws-sdk-go-v2") + (version "1.17.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/aws/aws-sdk-go-v2") + (commit "v1.17.3"))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1a07xab1cn96iff7zvp5a82fzhqwl0i4bhplkm2h1qbkxgldn6x0")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/aws/aws-sdk-go-v2")) + (propagated-inputs + (list go-github-com-aws-smithy-go + go-github-com-google-go-cmp-cmp + go-github-com-jmespath-go-jmespath)) + (home-page "https://github.com/aws/aws-sdk-go-v2") + (synopsis "AWS SDK for Go v2") + (description + "Package sdk is the official AWS SDK v2 for the Go programming language.") + (license license:asl2.0))) + (define-public go-github-com-aws-smithy-go (package (name "go-github-com-aws-smithy-go") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index f2066618f2..2ccbcae7bf 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -11436,31 +11436,6 @@ encrypting JSON Web Tokens (JWT). It relies only on the standard library.") (home-page "https://github.com/dvsekhvalnov/jose2go") (license license:expat))) -(define-public go-github-com-aws-aws-sdk-go-v2 - (package - (name "go-github-com-aws-aws-sdk-go-v2") - (version "1.17.3") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/aws/aws-sdk-go-v2") - (commit "v1.17.3"))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1a07xab1cn96iff7zvp5a82fzhqwl0i4bhplkm2h1qbkxgldn6x0")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/aws/aws-sdk-go-v2")) - (propagated-inputs (list go-github-com-jmespath-go-jmespath - go-github-com-google-go-cmp-cmp - go-github-com-aws-smithy-go)) - (home-page "https://github.com/aws/aws-sdk-go-v2") - (synopsis "AWS SDK for Go v2") - (description - "Package sdk is the official AWS SDK v2 for the Go programming language.") - (license license:asl2.0))) - (define-public go-github-com-aws-aws-sdk-go-v2-config (package (inherit go-github-com-aws-aws-sdk-go-v2) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index d561fb32e3..40d7a00dae 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -107,6 +107,7 @@ #:use-module (gnu packages gnupg) #:use-module (gnu packages golang) #:use-module (gnu packages golang-check) + #:use-module (gnu packages golang-web) #:use-module (gnu packages groff) #:use-module (gnu packages guile) #:use-module (gnu packages guile-xyz) -- cgit 1.4.1 From 31af3c2e3703202803927543a4473d4c0f56e6fc Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:24 +0000 Subject: gnu: go-github-com-aws-aws-sdk-go: Move to (gnu packages golang-web). * gnu/packages/golang.scm (go-github-com-aws-aws-sdk-go): Move from here... * gnu/packages/golang-web.scm: ...to here. Change-Id: Ic639856afb340c2a7aea6dc917d2bcd32290d1b7 --- gnu/packages/golang-web.scm | 28 ++++++++++++++++++++++++++++ gnu/packages/golang.scm | 25 ------------------------- 2 files changed, 28 insertions(+), 25 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 1542c409fe..7ecdcbd8b5 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2020 Oleg Pykhalov ;;; Copyright © 2020 Ryan Prior ;;; Copyright © 2020-2022 Efraim Flashner +;;; Copyright © 2021 Collin J. Doering ;;; Copyright © 2021 Raghav Gururajan ;;; Copyright © 2021 Sarah Morgensen ;;; Copyright © 2022 Adam Kandur @@ -104,6 +105,33 @@ the parse trees produced by the html package.") "This is the official AWS SDK for the Go programming language.") (license license:asl2.0))) +;; XXX: This package might be a duplicate of go-github-com-aws-sdk, it's not +;; in use anywhere. Keep it here for the farther review. +(define-public go-github-com-aws-aws-sdk-go + (package + (name "go-github-com-aws-aws-sdk-go") + (version "1.36.18") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/aws/aws-sdk-go") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "169mkkw1cff1px6326krwvfpfj07sb4y5rbn003gi4bk176h6ry9")))) + (build-system go-build-system) + (propagated-inputs + (list go-github-com-jmespath-go-jmespath)) + (arguments + '(#:import-path "github.com/aws/aws-sdk-go" + #:phases %standard-phases)) + (synopsis "The official AWS SDK for the Go programming language") + (description + "The official AWS SDK for the Go programming language.") + (home-page "https://github.com/aws/aws-sdk-go") + (license license:asl2.0))) + (define-public go-github-com-aws-aws-sdk-go-v2 (package (name "go-github-com-aws-aws-sdk-go-v2") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 2ccbcae7bf..e32b0f538b 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -11686,31 +11686,6 @@ pcredential store, Pass, Secret Service, KDE Wallet, Encrypted File.") (define-public go-github-com-androiddnsfix (deprecated-package "go-github-com-androiddnsfix" go-github-com-mtibben-androiddnsfix)) -(define-public go-github-com-aws-aws-sdk-go - (package - (name "go-github-com-aws-aws-sdk-go") - (version "1.36.18") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/aws/aws-sdk-go") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "169mkkw1cff1px6326krwvfpfj07sb4y5rbn003gi4bk176h6ry9")))) - (build-system go-build-system) - (propagated-inputs - (list go-github-com-jmespath-go-jmespath)) - (arguments - '(#:import-path "github.com/aws/aws-sdk-go" - #:phases %standard-phases)) - (synopsis "The official AWS SDK for the Go programming language") - (description - "The official AWS SDK for the Go programming language.") - (home-page "https://github.com/aws/aws-sdk-go") - (license license:asl2.0))) - (define-public go-gopkg-in-ini (package (name "go-gopkg-in-ini") -- cgit 1.4.1 From d9246c6b8961cc4fc99cd991a511046bcc212912 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:25 +0000 Subject: gnu: go-github-com-aws-aws-sdk-go-v2-config: Move to (gnu packages golang-web). * gnu/packages/golang.scm (go-github-com-aws-aws-sdk-go-v2-config): Move from here... * gnu/packages/golang-web.scm: ...to here. Change-Id: Ie775eff088ac4ad0327e2479a63f677ac9c75da2 --- gnu/packages/golang-web.scm | 12 ++++++++++++ gnu/packages/golang.scm | 11 ----------- 2 files changed, 12 insertions(+), 11 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 7ecdcbd8b5..fde9a89ea3 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -158,6 +158,18 @@ the parse trees produced by the html package.") "Package sdk is the official AWS SDK v2 for the Go programming language.") (license license:asl2.0))) +(define-public go-github-com-aws-aws-sdk-go-v2-config + (package + (inherit go-github-com-aws-aws-sdk-go-v2) + (name "go-github-com-aws-aws-sdk-go-v2-config") + (version "1.18.5") + (arguments + '(#:import-path "github.com/aws/aws-sdk-go-v2/config" + #:unpack-path "github.com/aws/aws-sdk-go-v2")) + (propagated-inputs + (list go-github-com-google-go-cmp-cmp + go-github-com-aws-smithy-go)))) + (define-public go-github-com-aws-smithy-go (package (name "go-github-com-aws-smithy-go") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index e32b0f538b..cc205a39bf 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -11436,17 +11436,6 @@ encrypting JSON Web Tokens (JWT). It relies only on the standard library.") (home-page "https://github.com/dvsekhvalnov/jose2go") (license license:expat))) -(define-public go-github-com-aws-aws-sdk-go-v2-config - (package - (inherit go-github-com-aws-aws-sdk-go-v2) - (name "go-github-com-aws-aws-sdk-go-v2-config") - (version "1.18.5") - (arguments - '(#:import-path "github.com/aws/aws-sdk-go-v2/config" - #:unpack-path "github.com/aws/aws-sdk-go-v2")) - (propagated-inputs (list go-github-com-google-go-cmp-cmp - go-github-com-aws-smithy-go)))) - (define-public go-github-com-aws-aws-sdk-go-v2-service-iam (package (inherit go-github-com-aws-aws-sdk-go-v2) -- cgit 1.4.1 From 8f22dbde7ea3bf5f4bf83736dd3dd9192269da1c Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:26 +0000 Subject: gnu: go-github-com-aws-aws-sdk-go-v2-service-iam: Move to (gnu packages golang-web). * gnu/packages/golang.scm (go-github-com-aws-aws-sdk-go-v2-service-iam): Move from here... * gnu/packages/golang-web.scm: ...to here. Change-Id: Id479cc90005de14f0916cb06fa140127812787b1 --- gnu/packages/golang-web.scm | 11 +++++++++++ gnu/packages/golang.scm | 10 ---------- 2 files changed, 11 insertions(+), 10 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index fde9a89ea3..bfda5ffa31 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -170,6 +170,17 @@ the parse trees produced by the html package.") (list go-github-com-google-go-cmp-cmp go-github-com-aws-smithy-go)))) +(define-public go-github-com-aws-aws-sdk-go-v2-service-iam + (package + (inherit go-github-com-aws-aws-sdk-go-v2) + (name "go-github-com-aws-aws-sdk-go-v2-service-iam") + (version "1.44.161") + (arguments + '(#:import-path "github.com/aws/aws-sdk-go-v2/service/iam" + #:unpack-path "github.com/aws/aws-sdk-go-v2")) + (propagated-inputs + (list go-github-com-aws-smithy-go)))) + (define-public go-github-com-aws-smithy-go (package (name "go-github-com-aws-smithy-go") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index cc205a39bf..d74331ad53 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -11436,16 +11436,6 @@ encrypting JSON Web Tokens (JWT). It relies only on the standard library.") (home-page "https://github.com/dvsekhvalnov/jose2go") (license license:expat))) -(define-public go-github-com-aws-aws-sdk-go-v2-service-iam - (package - (inherit go-github-com-aws-aws-sdk-go-v2) - (name "go-github-com-aws-aws-sdk-go-v2-service-iam") - (version "1.44.161") - (arguments - '(#:import-path "github.com/aws/aws-sdk-go-v2/service/iam" - #:unpack-path "github.com/aws/aws-sdk-go-v2")) - (propagated-inputs (list go-github-com-aws-smithy-go)))) - (define-public go-github-com-aws-aws-sdk-go-v2-service-sso (package (inherit go-github-com-aws-aws-sdk-go-v2) -- cgit 1.4.1 From d6285224ad7b0baff6b76bb0061ebab7171babdc Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:27 +0000 Subject: gnu: go-github-com-aws-aws-sdk-go-v2-service-sso: Move to (gnu packages golang-web). * gnu/packages/golang.scm (go-github-com-aws-aws-sdk-go-v2-service-sso): Move from here... * gnu/packages/golang-web.scm: ...to here. Change-Id: I7d9008a277e97adc2b496b11b75d63efd1b839f3 --- gnu/packages/golang-web.scm | 11 +++++++++++ gnu/packages/golang.scm | 10 ---------- 2 files changed, 11 insertions(+), 10 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index bfda5ffa31..5dd73bd4db 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -181,6 +181,17 @@ the parse trees produced by the html package.") (propagated-inputs (list go-github-com-aws-smithy-go)))) +(define-public go-github-com-aws-aws-sdk-go-v2-service-sso + (package + (inherit go-github-com-aws-aws-sdk-go-v2) + (name "go-github-com-aws-aws-sdk-go-v2-service-sso") + (version "1.11.27") + (arguments + '(#:import-path "github.com/aws/aws-sdk-go-v2/service/sso" + #:unpack-path "github.com/aws/aws-sdk-go-v2")) + (propagated-inputs + (list go-github-com-aws-smithy-go)))) + (define-public go-github-com-aws-smithy-go (package (name "go-github-com-aws-smithy-go") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index d74331ad53..8cdf80712d 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -11436,16 +11436,6 @@ encrypting JSON Web Tokens (JWT). It relies only on the standard library.") (home-page "https://github.com/dvsekhvalnov/jose2go") (license license:expat))) -(define-public go-github-com-aws-aws-sdk-go-v2-service-sso - (package - (inherit go-github-com-aws-aws-sdk-go-v2) - (name "go-github-com-aws-aws-sdk-go-v2-service-sso") - (version "1.11.27") - (arguments - '(#:import-path "github.com/aws/aws-sdk-go-v2/service/sso" - #:unpack-path "github.com/aws/aws-sdk-go-v2")) - (propagated-inputs (list go-github-com-aws-smithy-go)))) - (define-public go-github-com-aws-aws-sdk-go-v2-service-ssooidc (package (inherit go-github-com-aws-aws-sdk-go-v2) -- cgit 1.4.1 From 24d16888ab6b4af3436d0bf882b2ffbe0e4551f1 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:28 +0000 Subject: gnu: go-github-com-aws-aws-sdk-go-v2-service-ssooidc: Move to (gnu packages golang-web). * gnu/packages/golang.scm (go-github-com-aws-aws-sdk-go-v2-service-ssooidc): Move from here... * gnu/packages/golang-web.scm: ...to here. Change-Id: I7c1fc41bb4b7ae8b92204e3daee5628602328384 --- gnu/packages/golang-web.scm | 11 +++++++++++ gnu/packages/golang.scm | 10 ---------- 2 files changed, 11 insertions(+), 10 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 5dd73bd4db..4bc9c944cb 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -192,6 +192,17 @@ the parse trees produced by the html package.") (propagated-inputs (list go-github-com-aws-smithy-go)))) +(define-public go-github-com-aws-aws-sdk-go-v2-service-ssooidc + (package + (inherit go-github-com-aws-aws-sdk-go-v2) + (name "go-github-com-aws-aws-sdk-go-v2-service-ssooidc") + (version "1.13.10") + (arguments + '(#:import-path "github.com/aws/aws-sdk-go-v2/service/ssooidc" + #:unpack-path "github.com/aws/aws-sdk-go-v2")) + (propagated-inputs + (list go-github-com-aws-smithy-go)))) + (define-public go-github-com-aws-smithy-go (package (name "go-github-com-aws-smithy-go") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 8cdf80712d..8869e3317d 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -11436,16 +11436,6 @@ encrypting JSON Web Tokens (JWT). It relies only on the standard library.") (home-page "https://github.com/dvsekhvalnov/jose2go") (license license:expat))) -(define-public go-github-com-aws-aws-sdk-go-v2-service-ssooidc - (package - (inherit go-github-com-aws-aws-sdk-go-v2) - (name "go-github-com-aws-aws-sdk-go-v2-service-ssooidc") - (version "1.13.10") - (arguments - '(#:import-path "github.com/aws/aws-sdk-go-v2/service/ssooidc" - #:unpack-path "github.com/aws/aws-sdk-go-v2")) - (propagated-inputs (list go-github-com-aws-smithy-go)))) - (define-public go-github-com-aws-aws-sdk-go-v2-service-sts (package (inherit go-github-com-aws-aws-sdk-go-v2) -- cgit 1.4.1 From b344dc44beca7818be87d87aa0bbf0097df90048 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:29 +0000 Subject: gnu: go-github-com-aws-aws-sdk-go-v2-service-sts: Move to (gnu packages golang-web). * gnu/packages/golang.scm (go-github-com-aws-aws-sdk-go-v2-service-sts): Move from here... * gnu/packages/golang-web.scm: ...to here. Change-Id: I3503dbde93a46ff47dcc035243a7f320b7090794 --- gnu/packages/golang-web.scm | 11 +++++++++++ gnu/packages/golang.scm | 10 ---------- 2 files changed, 11 insertions(+), 10 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 4bc9c944cb..aadf8ac73e 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -203,6 +203,17 @@ the parse trees produced by the html package.") (propagated-inputs (list go-github-com-aws-smithy-go)))) +(define-public go-github-com-aws-aws-sdk-go-v2-service-sts + (package + (inherit go-github-com-aws-aws-sdk-go-v2) + (name "go-github-com-aws-aws-sdk-go-v2-service-sts") + (version "1.17.7") + (arguments + '(#:import-path "github.com/aws/aws-sdk-go-v2/service/sts" + #:unpack-path "github.com/aws/aws-sdk-go-v2")) + (propagated-inputs + (list go-github-com-aws-smithy-go)))) + (define-public go-github-com-aws-smithy-go (package (name "go-github-com-aws-smithy-go") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 8869e3317d..6331f0d2c7 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -11436,16 +11436,6 @@ encrypting JSON Web Tokens (JWT). It relies only on the standard library.") (home-page "https://github.com/dvsekhvalnov/jose2go") (license license:expat))) -(define-public go-github-com-aws-aws-sdk-go-v2-service-sts - (package - (inherit go-github-com-aws-aws-sdk-go-v2) - (name "go-github-com-aws-aws-sdk-go-v2-service-sts") - (version "1.17.7") - (arguments - '(#:import-path "github.com/aws/aws-sdk-go-v2/service/sts" - #:unpack-path "github.com/aws/aws-sdk-go-v2")) - (propagated-inputs (list go-github-com-aws-smithy-go)))) - (define-public go-github-com-aws-aws-sdk-go-v2-service-s3 (package (inherit go-github-com-aws-aws-sdk-go-v2) -- cgit 1.4.1 From 04bb3c7af6ccb656486e738a87bdc49b0e0eb246 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:30 +0000 Subject: gnu: go-github-com-aws-aws-sdk-go-v2-service-s3: Move to (gnu packages golang-web). * gnu/packages/golang.scm (go-github-com-aws-aws-sdk-go-v2-service-s3): Move from here... * gnu/packages/golang-web.scm: ...to here. Change-Id: I11426c93b58f1c0c9c48527621ded345cc4f062b --- gnu/packages/golang-web.scm | 11 +++++++++++ gnu/packages/golang.scm | 10 ---------- 2 files changed, 11 insertions(+), 10 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index aadf8ac73e..e87634cdaa 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -181,6 +181,17 @@ the parse trees produced by the html package.") (propagated-inputs (list go-github-com-aws-smithy-go)))) +(define-public go-github-com-aws-aws-sdk-go-v2-service-s3 + (package + (inherit go-github-com-aws-aws-sdk-go-v2) + (name "go-github-com-aws-aws-sdk-go-v2-service-s3") + (version "1.30.0") + (arguments + '(#:import-path "github.com/aws/aws-sdk-go-v2/service/s3" + #:unpack-path "github.com/aws/aws-sdk-go-v2")) + (propagated-inputs + (list go-github-com-aws-smithy-go)))) + (define-public go-github-com-aws-aws-sdk-go-v2-service-sso (package (inherit go-github-com-aws-aws-sdk-go-v2) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 6331f0d2c7..7350d2ccc5 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -11436,16 +11436,6 @@ encrypting JSON Web Tokens (JWT). It relies only on the standard library.") (home-page "https://github.com/dvsekhvalnov/jose2go") (license license:expat))) -(define-public go-github-com-aws-aws-sdk-go-v2-service-s3 - (package - (inherit go-github-com-aws-aws-sdk-go-v2) - (name "go-github-com-aws-aws-sdk-go-v2-service-s3") - (version "1.30.0") - (arguments - '(#:import-path "github.com/aws/aws-sdk-go-v2/service/s3" - #:unpack-path "github.com/aws/aws-sdk-go-v2")) - (propagated-inputs (list go-github-com-aws-smithy-go)))) - (define-public go-github-com-aws-aws-sdk-go-v2-feature-s3-manager (package (inherit go-github-com-aws-aws-sdk-go-v2) -- cgit 1.4.1 From d0f3a60169ebb2505653afd588aea33ab02e8ca5 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:31 +0000 Subject: gnu: go-github-com-aws-aws-sdk-go-v2-feature-s3-manager: Move to (gnu packages golang-web). * gnu/packages/golang.scm (go-github-com-aws-aws-sdk-go-v2-feature-s3-manager): Move from here... * gnu/packages/golang-web.scm: ...to here. Change-Id: Ia97de141c3c96e99b4824ea93925c5d2b5d9aa8d --- gnu/packages/golang-web.scm | 10 ++++++++++ gnu/packages/golang.scm | 10 ---------- 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index e87634cdaa..616a14fdf1 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -170,6 +170,16 @@ the parse trees produced by the html package.") (list go-github-com-google-go-cmp-cmp go-github-com-aws-smithy-go)))) +(define-public go-github-com-aws-aws-sdk-go-v2-feature-s3-manager + (package + (inherit go-github-com-aws-aws-sdk-go-v2) + (name "go-github-com-aws-aws-sdk-go-v2-feature-s3-manager") + (version "1.11.44") + (arguments + '(#:import-path "github.com/aws/aws-sdk-go-v2/feature/s3/manager" + #:unpack-path "github.com/aws/aws-sdk-go-v2")) + (propagated-inputs (list go-github-com-aws-smithy-go)))) + (define-public go-github-com-aws-aws-sdk-go-v2-service-iam (package (inherit go-github-com-aws-aws-sdk-go-v2) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 7350d2ccc5..bcc10946b1 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -11436,16 +11436,6 @@ encrypting JSON Web Tokens (JWT). It relies only on the standard library.") (home-page "https://github.com/dvsekhvalnov/jose2go") (license license:expat))) -(define-public go-github-com-aws-aws-sdk-go-v2-feature-s3-manager - (package - (inherit go-github-com-aws-aws-sdk-go-v2) - (name "go-github-com-aws-aws-sdk-go-v2-feature-s3-manager") - (version "1.11.44") - (arguments - '(#:import-path "github.com/aws/aws-sdk-go-v2/feature/s3/manager" - #:unpack-path "github.com/aws/aws-sdk-go-v2")) - (propagated-inputs (list go-github-com-aws-smithy-go)))) - (define-public aws-vault (package (name "aws-vault") -- cgit 1.4.1 From ba8babd9e74ab5692cfccc32f7dbafe9506a5002 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:32 +0000 Subject: gnu: go-github-com-nwidger-jsoncolor: Move to (gnu packages golang-web). * gnu/packages/golang.scm (go-github-com-nwidger-jsoncolor): Move from here... * gnu/packages/golang-web.scm: ...to here. Change-Id: I924581a553c7b59b1be3e274a1845af68b438bcb --- gnu/packages/golang-web.scm | 27 +++++++++++++++++++++++++++ gnu/packages/golang.scm | 27 --------------------------- 2 files changed, 27 insertions(+), 27 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 616a14fdf1..96873f020c 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018 Pierre-Antoine Rouby ;;; Copyright © 2020 Jack Hill +;;; Copyright © 2020 Joseph LaFreniere ;;; Copyright © 2020 Martin Becze ;;; Copyright © 2020 Nicolas Goaziou ;;; Copyright © 2020 Oleg Pykhalov @@ -934,6 +935,32 @@ router.") (description "@code{bluemonday} is a HTML sanitizer implemented in Go.") (license license:bsd-3))) +(define-public go-github-com-nwidger-jsoncolor + (package + (name "go-github-com-nwidger-jsoncolor") + (version "0.3.0") + (home-page "https://github.com/nwidger/jsoncolor") + (source + (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "13rd146pnj7qm70r1333gyd1f61x40nafxlpvdxlci9h7mx8c5p8")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/nwidger/jsoncolor")) + (native-inputs + (list go-github-com-fatih-color)) + (synopsis "Colorized JSON marshalling and encoding") + (description + "@code{jsoncolor} is a drop-in replacement for @code{encoding/json}'s +@code{Marshal} and @code{MarshalIndent} functions and @code{Encoder} type +which produce colorized output using github.com/fatih/color.") + (license license:expat))) + (define-public go-github-com-opentracing-opentracing-go (package (name "go-github-com-opentracing-opentracing-go") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index bcc10946b1..9fbe2d5b97 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -9049,33 +9049,6 @@ style your output, without you having to deal with all kinds of weird ANSI escape sequences and color conversions.") (license license:expat))) -(define-public go-github-com-nwidger-jsoncolor - (package - (name "go-github-com-nwidger-jsoncolor") - (version "0.3.0") - (home-page "https://github.com/nwidger/jsoncolor") - (source - (origin - (method git-fetch) - (uri (git-reference - (url home-page) - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "13rd146pnj7qm70r1333gyd1f61x40nafxlpvdxlci9h7mx8c5p8")))) - (build-system go-build-system) - (arguments - `(#:import-path "github.com/nwidger/jsoncolor")) - (native-inputs - (list go-github-com-fatih-color)) - (synopsis "Colorized JSON marshalling and encoding") - (description - "@code{jsoncolor} is a drop-in replacement for @code{encoding/json}'s -@code{Marshal} and @code{MarshalIndent} functions and @code{Encoder} type -which produce colorized output using github.com/fatih/color.") - (license license:expat))) - (define-public go-github-com-olekukonko-tablewriter (package (name "go-github-com-olekukonko-tablewriter") -- cgit 1.4.1 From ab7511ad0d29c74e464087e67081cc87836a9c09 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:33 +0000 Subject: gnu: go-github-com-hjson-hjson-go: Move to (gnu packages golang-web). * gnu/packages/golang.scm (go-github-com-hjson-hjson-go): Move from here... * gnu/packages/golang-web.scm: ...to here. * gnu/packages/networking.scm: Add (gnu packages golang-web) module. * gnu/packages/uucp.scm: As above. Change-Id: If1ba5e4d866ce74fa35ae9126c6ba4cd0b149dab --- gnu/packages/golang-web.scm | 24 ++++++++++++++++++++++++ gnu/packages/golang.scm | 24 ------------------------ gnu/packages/networking.scm | 1 + gnu/packages/uucp.scm | 1 + 4 files changed, 26 insertions(+), 24 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 96873f020c..4771657add 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2020 Nicolas Goaziou ;;; Copyright © 2020 Oleg Pykhalov ;;; Copyright © 2020 Ryan Prior +;;; Copyright © 2020 raingloom ;;; Copyright © 2020-2022 Efraim Flashner ;;; Copyright © 2021 Collin J. Doering ;;; Copyright © 2021 Raghav Gururajan @@ -757,6 +758,29 @@ sessions, flash messages, custom backends, and more.") protocol.") (license license:bsd-2))) +(define-public go-github-com-hjson-hjson-go + (package + (name "go-github-com-hjson-hjson-go") + (version "3.1.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/hjson/hjson-go") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1dfdiahimg6z9idg8jiqxwnlwjnmasbjccx8gnag49cz4yfqskaz")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/hjson/hjson-go")) + (home-page "https://hjson.org/") + (synopsis "Human JSON implementation for Go") + (description "Hjson is a syntax extension to JSON. It is intended to be +used like a user interface for humans, to read and edit before passing the +JSON data to the machine.") + (license license:expat))) + (define-public go-github-com-jcmturner-dnsutils-v2 (package (name "go-github-com-jcmturner-dnsutils-v2") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 9fbe2d5b97..5505a6c071 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -10228,30 +10228,6 @@ additions.") (description "This package is a very simple wrapper around log/syslog") (license license:expat))) -(define-public go-github-com-hjson-hjson-go - (package - (name "go-github-com-hjson-hjson-go") - (version "4.3.1") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/hjson/hjson-go") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "138vmbnrwzxf64cia27k407clrydvs2jx927dlv6ziydiqyvy7m3")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/hjson/hjson-go")) - (home-page "https://hjson.org/") - (synopsis "Human JSON implementation for Go") - (description "Hjson is a syntax extension to JSON. It is intended to be -used like a user interface for humans, to read and edit before passing the -JSON data to the machine.") - (license license:expat))) - (define-public go-golang-zx2c4-com-wireguard (package (name "go-golang-zx2c4-com-wireguard") diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index dad217beb0..c3796f7328 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -123,6 +123,7 @@ #:use-module (gnu packages gnome) #:use-module (gnu packages gnupg) #:use-module (gnu packages golang) + #:use-module (gnu packages golang-web) #:use-module (gnu packages graphviz) #:use-module (gnu packages gstreamer) #:use-module (gnu packages gtk) diff --git a/gnu/packages/uucp.scm b/gnu/packages/uucp.scm index e10de59aa2..1626c90c36 100644 --- a/gnu/packages/uucp.scm +++ b/gnu/packages/uucp.scm @@ -19,6 +19,7 @@ (define-module (gnu packages uucp) #:use-module (gnu packages golang) + #:use-module (gnu packages golang-web) #:use-module (gnu packages texinfo) #:use-module (guix licenses) #:use-module (guix packages) -- cgit 1.4.1 From 65b1156d2b92bebacef1792615c85140c5ce41a3 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:34 +0000 Subject: gnu: go-github-com-xeipuuv-gojsonschema: Move to (gnu packages golang-web). * gnu/packages/golang.scm (go-github-com-xeipuuv-gojsonschema): Move from here... * gnu/packages/golang-web.scm: ...to here. Change-Id: Iaf68b653f279c98f62ce9e07f2ce010c8e1741e2 --- gnu/packages/golang-web.scm | 41 +++++++++++++++++++++++++++++++++++++++++ gnu/packages/golang.scm | 40 ---------------------------------------- 2 files changed, 41 insertions(+), 40 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 4771657add..c97dfa7757 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -1202,6 +1202,47 @@ sockets.") replacement for native @code{net/http} module.") (license license:expat))) +(define-public go-github-com-xeipuuv-gojsonschema + (let ((commit "6b67b3fab74d992bd07f72550006ab2c6907c416") + (revision "0")) + (package + (name "go-github-com-xeipuuv-gojsonschema") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/xeipuuv/gojsonschema") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1q937a6q7canlr3dllqdw0qwa6z2fpwn1w9kycavx8jmwh6q3f69")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/xeipuuv/gojsonschema" + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'disable-failing-tests + (lambda* (#:key import-path #:allow-other-keys) + (with-directory-excursion (string-append "src/" import-path) + (substitute* "schema_test.go" + (("\\{\"phase\": \"remote ref, " all) + (string-append "// " all)) + (("\\{\"phase\": \"valid definition" all) + (string-append "// " all)) + (("\\{\"phase\": \"invalid definition" all) + (string-append "// " all))))))))) + (propagated-inputs + (list go-github-com-xeipuuv-gojsonreference + go-github-com-xeipuuv-gojsonpointer + go-github-com-stretchr-testify)) + (home-page "https://github.com/xeipuuv/gojsonschema") + (synopsis "Implementation of JSON Schema for Go") + (description + "This package provides an implementation of JSON Schema for the Go +programming language, which supports draft-04, draft-06 and draft-07.") + (license license:asl2.0)))) + (define-public go-gopkg-in-square-go-jose-v2 (package (name "go-gopkg-in-square-go-jose-v2") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 5505a6c071..819d0b81b7 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -12439,46 +12439,6 @@ programming language.") programming language.") (license license:asl2.0)))) -(define-public go-github-com-xeipuuv-gojsonschema - (let ((commit "6b67b3fab74d992bd07f72550006ab2c6907c416") - (revision "0")) - (package - (name "go-github-com-xeipuuv-gojsonschema") - (version (git-version "0.0.0" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/xeipuuv/gojsonschema") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1q937a6q7canlr3dllqdw0qwa6z2fpwn1w9kycavx8jmwh6q3f69")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/xeipuuv/gojsonschema" - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'disable-failing-tests - (lambda* (#:key import-path #:allow-other-keys) - (with-directory-excursion (string-append "src/" import-path) - (substitute* "schema_test.go" - (("\\{\"phase\": \"remote ref, " all) - (string-append "// " all)) - (("\\{\"phase\": \"valid definition" all) - (string-append "// " all)) - (("\\{\"phase\": \"invalid definition" all) - (string-append "// " all))))))))) - (propagated-inputs (list go-github-com-xeipuuv-gojsonreference - go-github-com-xeipuuv-gojsonpointer - go-github-com-stretchr-testify)) - (home-page "https://github.com/xeipuuv/gojsonschema") - (synopsis "Implementation of JSON Schema for Go") - (description - "This package provides an implementation of JSON Schema for the Go -programming language, which supports draft-04, draft-06 and draft-07.") - (license license:asl2.0)))) - (define-public go-github-com-niemeyer-pretty (package (name "go-github-com-niemeyer-pretty") -- cgit 1.4.1 From 1371b119f3678e592c6aa03648df8bcd902dfeed Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:35 +0000 Subject: gnu: go-github-com-xeipuuv-gojsonschema: Adjust inputs. * gnu/packages/golang-web.scm (go-github-com-xeipuuv-gojsonschema): [propagated-inputs]: Move go-github-com-stretchr-testify from here ... [native-inputs]: ... to here. Change-Id: Id865d5821060cd847aeb9ccfc7b7a477e12f7b7b --- gnu/packages/golang-web.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index c97dfa7757..346ca87cc7 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -1232,10 +1232,11 @@ replacement for native @code{net/http} module.") (string-append "// " all)) (("\\{\"phase\": \"invalid definition" all) (string-append "// " all))))))))) + (native-inputs + (list go-github-com-stretchr-testify)) (propagated-inputs (list go-github-com-xeipuuv-gojsonreference - go-github-com-xeipuuv-gojsonpointer - go-github-com-stretchr-testify)) + go-github-com-xeipuuv-gojsonpointer)) (home-page "https://github.com/xeipuuv/gojsonschema") (synopsis "Implementation of JSON Schema for Go") (description -- cgit 1.4.1 From 3a3484bf5dd485b0a8ade2deb68368477eabca9c Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:36 +0000 Subject: gnu: go-github-com-xeipuuv-gojsonpointer: Move to (gnu packages golang-web). * gnu/packages/golang.scm (go-github-com-xeipuuv-gojsonpointer): Move from here... * gnu/packages/golang-web.scm: ...to here. Change-Id: I1c77a5a1b0e85fa57578ff29c9e3c403e4d62bc8 --- gnu/packages/golang-web.scm | 25 +++++++++++++++++++++++++ gnu/packages/golang.scm | 25 ------------------------- 2 files changed, 25 insertions(+), 25 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 346ca87cc7..1f9fe0ffca 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -1202,6 +1202,31 @@ sockets.") replacement for native @code{net/http} module.") (license license:expat))) +(define-public go-github-com-xeipuuv-gojsonpointer + (let ((commit "4e3ac2762d5f479393488629ee9370b50873b3a6") + (revision "0")) + (package + (name "go-github-com-xeipuuv-gojsonpointer") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/xeipuuv/gojsonpointer") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "13y6iq2nzf9z4ls66bfgnnamj2m3438absmbpqry64bpwjfbsi9q")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/xeipuuv/gojsonpointer")) + (home-page "https://github.com/xeipuuv/gojsonpointer") + (synopsis "Implementation of JSON Pointer for Go") + (description + "This package provides an implementation of JSON Pointer for the Go +programming language.") + (license license:asl2.0)))) + (define-public go-github-com-xeipuuv-gojsonschema (let ((commit "6b67b3fab74d992bd07f72550006ab2c6907c416") (revision "0")) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 819d0b81b7..31e7871e80 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -12388,31 +12388,6 @@ reflect.DeepEqual but returns a list of differences. This is helpful when comparing complex types like structures and maps.") (license license:expat))) -(define-public go-github-com-xeipuuv-gojsonpointer - (let ((commit "4e3ac2762d5f479393488629ee9370b50873b3a6") - (revision "0")) - (package - (name "go-github-com-xeipuuv-gojsonpointer") - (version (git-version "0.0.0" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/xeipuuv/gojsonpointer") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "13y6iq2nzf9z4ls66bfgnnamj2m3438absmbpqry64bpwjfbsi9q")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/xeipuuv/gojsonpointer")) - (home-page "https://github.com/xeipuuv/gojsonpointer") - (synopsis "Implementation of JSON Pointer for Go") - (description - "This package provides an implementation of JSON Pointer for the Go -programming language.") - (license license:asl2.0)))) - (define-public go-github-com-xeipuuv-gojsonreference (let ((commit "bd5ef7bd5415a7ac448318e64f11a24cd21e594b") (revision "0")) -- cgit 1.4.1 From a249278269e59c955d1a43dd3dce648f56fa7270 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:37 +0000 Subject: gnu: go-github-com-xeipuuv-gojsonreference: Move to (gnu packages golang-web). * gnu/packages/golang.scm (go-github-com-xeipuuv-gojsonreference): Move from here... * gnu/packages/golang-web.scm: ...to here. Change-Id: Iba8903cba4efa0b806cb19237db3ee51a46646c6 --- gnu/packages/golang-web.scm | 27 +++++++++++++++++++++++++++ gnu/packages/golang.scm | 26 -------------------------- 2 files changed, 27 insertions(+), 26 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 1f9fe0ffca..7f6ced049c 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -1227,6 +1227,33 @@ replacement for native @code{net/http} module.") programming language.") (license license:asl2.0)))) +(define-public go-github-com-xeipuuv-gojsonreference + (let ((commit "bd5ef7bd5415a7ac448318e64f11a24cd21e594b") + (revision "0")) + (package + (name "go-github-com-xeipuuv-gojsonreference") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/xeipuuv/gojsonreference") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1xby79padc7bmyb8rfbad8wfnfdzpnh51b1n8c0kibch0kwc1db5")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/xeipuuv/gojsonreference")) + (propagated-inputs + (list go-github-com-xeipuuv-gojsonpointer)) + (home-page "https://github.com/xeipuuv/gojsonreference") + (synopsis "Implementation of JSON Reference for Go") + (description + "This package provides an implementation of JSON Reference for the Go +programming language.") + (license license:asl2.0)))) + (define-public go-github-com-xeipuuv-gojsonschema (let ((commit "6b67b3fab74d992bd07f72550006ab2c6907c416") (revision "0")) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 31e7871e80..17d08a1f40 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -12388,32 +12388,6 @@ reflect.DeepEqual but returns a list of differences. This is helpful when comparing complex types like structures and maps.") (license license:expat))) -(define-public go-github-com-xeipuuv-gojsonreference - (let ((commit "bd5ef7bd5415a7ac448318e64f11a24cd21e594b") - (revision "0")) - (package - (name "go-github-com-xeipuuv-gojsonreference") - (version (git-version "0.0.0" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/xeipuuv/gojsonreference") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1xby79padc7bmyb8rfbad8wfnfdzpnh51b1n8c0kibch0kwc1db5")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/xeipuuv/gojsonreference")) - (propagated-inputs (list go-github-com-xeipuuv-gojsonpointer)) - (home-page "https://github.com/xeipuuv/gojsonreference") - (synopsis "Implementation of JSON Reference for Go") - (description - "This package provides an implementation of JSON Reference for the Go -programming language.") - (license license:asl2.0)))) - (define-public go-github-com-niemeyer-pretty (package (name "go-github-com-niemeyer-pretty") -- cgit 1.4.1 From 236ae7820e8ee6071975ee880a586a36751ecf13 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:38 +0000 Subject: gnu: go-github-com-whyrusleeping-json-filter: Move to (gnu packages golang-web). * gnu/packages/golang.scm (go-github-com-whyrusleeping-json-filter): Move from here... * gnu/packages/golang-web.scm: ...to here. Change-Id: I41d725c82adc3f5571c50bdf6a092e9a310e0f6c --- gnu/packages/golang-web.scm | 25 +++++++++++++++++++++++++ gnu/packages/golang.scm | 26 -------------------------- 2 files changed, 25 insertions(+), 26 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 7f6ced049c..fbfa1049a4 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -1202,6 +1202,31 @@ sockets.") replacement for native @code{net/http} module.") (license license:expat))) +(define-public go-github-com-whyrusleeping-json-filter + (let ((commit "ff25329a9528f01c5175414f16cc0a6a162a5b8b") + (revision "0")) + (package + (name "go-github-com-whyrusleeping-json-filter") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/whyrusleeping/json-filter") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0cai0drvx4c8j686l908vpcsz3mw3vxi3ziz94b0f3c5ylpj07j7")))) + (build-system go-build-system) + (arguments + '(#:import-path + "github.com/whyrusleeping/json-filter")) + (home-page "https://github.com/whyrusleeping/json-filter") + (synopsis "Library to query JSON objects marshalled into map[string]interface") + (description "A library to query JSON objects marshalled into +@command{map[string]interface{}}.") + (license license:expat)))) + (define-public go-github-com-xeipuuv-gojsonpointer (let ((commit "4e3ac2762d5f479393488629ee9370b50873b3a6") (revision "0")) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 17d08a1f40..add75b11d2 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -6671,32 +6671,6 @@ anchor names.") (description "This package provides unified and context-aware diffs in Go.") (license license:bsd-3))) -(define-public go-github-com-whyrusleeping-json-filter - (let ((commit "ff25329a9528f01c5175414f16cc0a6a162a5b8b") - (revision "0")) - (package - (name "go-github-com-whyrusleeping-json-filter") - (version (git-version "0.0.0" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/whyrusleeping/json-filter") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0cai0drvx4c8j686l908vpcsz3mw3vxi3ziz94b0f3c5ylpj07j7")))) - (build-system go-build-system) - (arguments - '(#:import-path - "github.com/whyrusleeping/json-filter")) - (home-page "https://github.com/whyrusleeping/json-filter") - (synopsis "Library to query JSON objects marshalled into map[string]interface") - (description "A library to query JSON objects marshalled into -@command{map[string]interface{}}.") - (license license:expat)))) - (define-public go-github-com-whyrusleeping-progmeter (let ((commit "f3e57218a75b913eff88d49a52c1debf9684ea04") (revision "0")) -- cgit 1.4.1 From bd0898a9cce91e9db742800b98cde15d722510d3 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:40 +0000 Subject: gnu: go-github-com-google-go-github: Move to (gnu packages golang-web). * gnu/packages/golang.scm (go-github-com-google-go-github): Move from here... * gnu/packages/golang-web.scm: ...to here. Change-Id: I17711a8f0bfd58a12cf805f1678688d2946c985b --- gnu/packages/golang-web.scm | 26 ++++++++++++++++++++++++++ gnu/packages/golang.scm | 26 -------------------------- 2 files changed, 26 insertions(+), 26 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index fbfa1049a4..20c3b0f3e1 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -538,6 +538,32 @@ decompose request handling into many smaller layers.") (description "Fast JSON encoder/decoder compatible with encoding/json for Go.") (license license:expat))) +(define-public go-github-com-google-go-github + (package + (name "go-github-com-google-go-github") + (version "26.1.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/google/go-github") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0x0zz1vcmllp6r6l2qin9b2llm5cxbf6n84rf99h8wrmhvzs2ipi")))) + (build-system go-build-system) + (arguments + `(#:tests? #f ;application/octet-stream instead of text/plain + #:import-path "github.com/google/go-github/v26/github" + #:unpack-path "github.com/google/go-github/v26")) + (native-inputs + (list go-github-com-google-go-querystring go-golang-org-x-crypto)) + (home-page "https://github.com/google/go-github/") + (synopsis "Client library for accessing the GitHub API v3") + (description "@code{go-github} is a Go client library for accessing the +GitHub API v3.") + (license license:bsd-3))) + (define-public go-github-com-google-safehtml (package (name "go-github-com-google-safehtml") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index add75b11d2..0d83c2b270 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -7987,32 +7987,6 @@ and from termios translations, readCh, reading passwords, etc.") into URL query parameters.") (license license:bsd-3)))) -(define-public go-github-com-google-go-github - (package - (name "go-github-com-google-go-github") - (version "26.1.3") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/google/go-github") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0x0zz1vcmllp6r6l2qin9b2llm5cxbf6n84rf99h8wrmhvzs2ipi")))) - (build-system go-build-system) - (arguments - `(#:tests? #f ;application/octet-stream instead of text/plain - #:import-path "github.com/google/go-github/v26/github" - #:unpack-path "github.com/google/go-github/v26")) - (native-inputs - (list go-github-com-google-go-querystring go-golang-org-x-crypto)) - (home-page "https://github.com/google/go-github/") - (synopsis "Client library for accessing the GitHub API v3") - (description "@code{go-github} is a Go client library for accessing the -GitHub API v3.") - (license license:bsd-3))) - (define-public go-github-com-google-renameio (package (name "go-github-com-google-renameio") -- cgit 1.4.1 From 972c1245c6e7595bd26a2ca279c750d2ccd76e1c Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:41 +0000 Subject: gnu: go-cloud-google-com-go-compute-metadata: Move to (gnu packages golang-web). * gnu/packages/golang.scm (go-cloud-google-com-go-compute-metadata): Move from here... * gnu/packages/golang-web.scm: ...to here. * gnu/packages/mail.scm: Add (gnu packages golang-web) module. Change-Id: Ic97e5f4afd26376d37860fbb4758e8037e758f58 --- gnu/packages/golang-web.scm | 27 +++++++++++++++++++++++++++ gnu/packages/golang.scm | 27 --------------------------- gnu/packages/mail.scm | 1 + 3 files changed, 28 insertions(+), 27 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 20c3b0f3e1..c046e0d46a 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2020 raingloom ;;; Copyright © 2020-2022 Efraim Flashner ;;; Copyright © 2021 Collin J. Doering +;;; Copyright © 2021 Philip McGrath ;;; Copyright © 2021 Raghav Gururajan ;;; Copyright © 2021 Sarah Morgensen ;;; Copyright © 2022 Adam Kandur @@ -55,6 +56,32 @@ ;;; ;;; Code: +(define-public go-cloud-google-com-go-compute-metadata + (package + (name "go-cloud-google-com-go-compute-metadata") + (version "0.81.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/googleapis/google-cloud-go") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "15jgynqb5pbxqbj3a7ii970yn4srsw1dbxzxnhpkfkmplalpgyh3")))) + (build-system go-build-system) + (arguments + '(#:unpack-path "cloud.google.com/go" + #:import-path "cloud.google.com/go/compute/metadata")) + (home-page + "https://pkg.go.dev/cloud.google.com/go/compute/metadata") + (synopsis + "Go wrapper for Google Compute Engine metadata service") + (description + "This package provides access to Google Compute Engine (GCE) metadata and +API service accounts for Go.") + (license license:asl2.0))) + (define-public go-github-com-andybalholm-cascadia (package (name "go-github-com-andybalholm-cascadia") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 0d83c2b270..0fbc031c67 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -4437,33 +4437,6 @@ absolute \"path\" to it.") (description "Semver is a library for Semantic versioning written in Go.") (license license:expat)))) -(define-public go-cloud-google-com-go-compute-metadata - (package - (name "go-cloud-google-com-go-compute-metadata") - (version "0.81.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/googleapis/google-cloud-go") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "15jgynqb5pbxqbj3a7ii970yn4srsw1dbxzxnhpkfkmplalpgyh3")))) - (build-system go-build-system) - (arguments - '(#:unpack-path "cloud.google.com/go" - #:import-path "cloud.google.com/go/compute/metadata")) - (home-page - "https://pkg.go.dev/cloud.google.com/go/compute/metadata") - (synopsis - "Go wrapper for Google Compute Engine metadata service") - (description - "This package provides access to Google Compute Engine (GCE) metadata and -API service accounts for Go.") - (license license:asl2.0))) - (define-public go-github-com-google-cadvisor (let ((commit "2ed7198f77395ee9a172878a0a7ab92ab59a2cfd") (revision "0")) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 523c20c4a9..4466e5e6d9 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -109,6 +109,7 @@ #:use-module (gnu packages gnupg) #:use-module (gnu packages golang) #:use-module (gnu packages golang-check) + #:use-module (gnu packages golang-web) #:use-module (gnu packages groff) #:use-module (gnu packages gsasl) #:use-module (gnu packages gtk) -- cgit 1.4.1 From ea94cb36d6568491a75dbd783dd1bb691821b8a5 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:42 +0000 Subject: gnu: go-github-com-getsentry-raven-go: Move to (gnu packages golang-web). * gnu/packages/golang.scm (go-github-com-getsentry-raven-go): Move from here... * gnu/packages/golang-web.scm: ...to here. Change-Id: If7e155b3e85d8bda8fd099f6a4d1eb6b87e9eee3 --- gnu/packages/golang-web.scm | 31 +++++++++++++++++++++++++++++++ gnu/packages/golang.scm | 27 --------------------------- 2 files changed, 31 insertions(+), 27 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index c046e0d46a..41c8c37a0b 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2020 raingloom ;;; Copyright © 2020-2022 Efraim Flashner ;;; Copyright © 2021 Collin J. Doering +;;; Copyright © 2021 Leo Famulari ;;; Copyright © 2021 Philip McGrath ;;; Copyright © 2021 Raghav Gururajan ;;; Copyright © 2021 Sarah Morgensen @@ -45,6 +46,7 @@ #:use-module (gnu packages) #:use-module (gnu packages golang) #:use-module (gnu packages golang-check) + #:use-module (gnu packages tls) #:use-module (gnu packages web)) ;;; Commentary: @@ -521,6 +523,35 @@ decode/encode structures and slices.") (home-page "https://github.com/francoispqt/gojay") (license license:expat))) +;; TODO: This repository has been archived by the owner on Aug 30, 2023. It is +;; now read-only. The raven-go SDK is no longer maintained and was superseded +;; by the sentry-go +(define-public go-github-com-getsentry-raven-go + (let ((commit "5c24d5110e0e198d9ae16f1f3465366085001d92") + (revision "0")) + (package + (name "go-github-com-getsentry-raven-go") + (version (git-version "0.2.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/getsentry/raven-go") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0lvc376sq8r8jhy2v1m6rf1wyld61pvbk0x6j9xpg56ivqy69xs7")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/getsentry/raven-go")) + (propagated-inputs + (list go-github-com-certifi-gocertifi go-github-com-pkg-errors)) + (home-page "https://github.com/getsentry/raven-go") + (synopsis "Sentry client in Go") + (description "This package is a Go client API for the Sentry event/error +logging system.") + (license license:bsd-3)))) + (define-public go-github-com-go-chi-chi-v5 (package (name "go-github-com-go-chi-chi-v5") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 0fbc031c67..dcf7fcc2a8 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -4174,33 +4174,6 @@ loading algorithms.") is similar to Go's standard library @code{json} and @code{xml} package.") (license license:expat))) -(define-public go-github-com-getsentry-raven-go - (let ((commit "5c24d5110e0e198d9ae16f1f3465366085001d92") - (revision "0")) - (package - (name "go-github-com-getsentry-raven-go") - (version (git-version "0.2.0" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/getsentry/raven-go") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0lvc376sq8r8jhy2v1m6rf1wyld61pvbk0x6j9xpg56ivqy69xs7")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/getsentry/raven-go")) - (propagated-inputs - (list go-github-com-certifi-gocertifi go-github-com-pkg-errors)) - (home-page "https://github.com/getsentry/raven-go") - (synopsis "Sentry client in Go") - (description "This package is a Go client API for the Sentry event/error -logging system.") - (license license:bsd-3)))) - (define-public go-github-com-hashicorp-go-uuid (package (name "go-github-com-hashicorp-go-uuid") -- cgit 1.4.1 From d041bf2bb058bceab3832b464aa49aa6c1c5d861 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:43 +0000 Subject: gnu: go-github-com-go-telegram-bot-api-telegram-bot-api: Move to (gnu packages golang-web). * gnu/packages/golang.scm (go-github-com-go-telegram-bot-api-telegram-bot-api): Move from here... * gnu/packages/golang-web.scm: ...to here. Change-Id: Ia631773394faaff150c18b074c943565f6998e1f --- gnu/packages/golang-web.scm | 25 +++++++++++++++++++++++++ gnu/packages/golang.scm | 25 ------------------------- 2 files changed, 25 insertions(+), 25 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 41c8c37a0b..7759916c35 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -575,6 +575,31 @@ logging system.") decompose request handling into many smaller layers.") (license license:expat))) +(define-public go-github-com-go-telegram-bot-api-telegram-bot-api + (package + (name "go-github-com-go-telegram-bot-api-telegram-bot-api") + (version "4.6.4") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/go-telegram-bot-api/telegram-bot-api") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1x6j0k3aiicsr8l53na99ci10zm3qpn2syz4f60fzh164w5k1l7w")))) + (build-system go-build-system) + (home-page "https://go-telegram-bot-api.dev/") + (arguments + (list #:tests? #f ; Upstream tests are broken. + #:import-path "github.com/go-telegram-bot-api/telegram-bot-api")) + (propagated-inputs + (list go-github-com-technoweenie-multipartstreamer)) + (synopsis "Golang bindings for the Telegram Bot API") + (description + "This package provides Golang bindings for the Telegram Bot API.") + (license license:expat))) + (define-public go-github-com-goccy-go-json (package (name "go-github-com-goccy-go-json") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index dcf7fcc2a8..4ee41f671d 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -10236,31 +10236,6 @@ modifying them.") parsers, and related tools.") (license license:expat)))) -(define-public go-github-com-go-telegram-bot-api-telegram-bot-api - (package - (name "go-github-com-go-telegram-bot-api-telegram-bot-api") - (version "4.6.4") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/go-telegram-bot-api/telegram-bot-api") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1x6j0k3aiicsr8l53na99ci10zm3qpn2syz4f60fzh164w5k1l7w")))) - (build-system go-build-system) - (home-page "https://go-telegram-bot-api.dev/") - (arguments - (list #:tests? #f ; Upstream tests are broken. - #:import-path "github.com/go-telegram-bot-api/telegram-bot-api")) - (propagated-inputs - (list go-github-com-technoweenie-multipartstreamer)) - (synopsis "Golang bindings for the Telegram Bot API") - (description - "This package provides Golang bindings for the Telegram Bot API.") - (license license:expat))) - (define-public go-github.com-ulikunitz-xz (package (name "go-github.com-ulikunitz-xz") -- cgit 1.4.1 From 7b0863f07a113caef26fea13909bd97d250b629e Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:44 +0000 Subject: gnu: actionlint: Update to 1.6.26. * gnu/packages/check.scm (actionlint): Update to 1.6.26. [inputs]: Swap go-github-com-robfig-cron-1.2 to go-github-com-robfig-cron * gnu/packages/golang.scm (go-github-com-robfig-cron-1.2): Delete variable. Change-Id: Ie2c25254ffefb99f8808f74ae4a9d85bbbcb6437 --- gnu/packages/check.scm | 8 ++++---- gnu/packages/golang.scm | 18 ------------------ 2 files changed, 4 insertions(+), 22 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 5181d3a164..80e0b94d01 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -39,7 +39,7 @@ ;;; Copyright © 2021 Hugo Lecomte ;;; Copyright © 2022 Maxime Devos ;;; Copyright © 2022, 2023 David Elsing -;;; Copyright © 2022 Sharlatan Hellseher +;;; Copyright © 2022, 2023 Sharlatan Hellseher ;;; Copyright © 2022 jgart ;;; Copyright © 2023 Luis Felipe López Acevedo ;;; Copyright © 2023 Timo Wilken @@ -1069,7 +1069,7 @@ but it works for any C/C++ project.") (define-public actionlint (package (name "actionlint") - (version "1.6.23") + (version "1.6.26") (source (origin (method git-fetch) (uri (git-reference @@ -1078,7 +1078,7 @@ but it works for any C/C++ project.") (file-name (git-file-name name version)) (sha256 (base32 - "07is4920a40zrl7mfldg0az2pisi7f6dv4vh3ijn3nzb4i7fqbni")))) + "0j4ni2cryvqn3qim1r6q6sargh0wig6l4vjjwc40cgqvvkrdla04")))) (build-system go-build-system) (arguments '(#:import-path "github.com/rhysd/actionlint/cmd/actionlint" @@ -1087,7 +1087,7 @@ but it works for any C/C++ project.") (inputs (list go-github-com-fatih-color go-github-com-mattn-go-colorable go-github-com-mattn-go-runewidth - go-github-com-robfig-cron-1.2 + go-github-com-robfig-cron go-golang.org-x-sync-errgroup go-golang.org-x-sync-semaphore go-gopkg-in-yaml-v3)) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 4ee41f671d..36e2c4b23e 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -7454,24 +7454,6 @@ and aid debugging.") a cron spec parser and job runner.") (license license:expat))) -;; Required by actionlint. The version of `go-github-com-robfig-cron' -;; packaged in Guix is newer and changed some error messages, causing -;; unit tests in actionlint to fail. -(define-public go-github-com-robfig-cron-1.2 - (package - (inherit go-github-com-robfig-cron) - (name "go-github-com-robfig-cron") - (version "1.2.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/robfig/cron") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0nv31m3940d9kf38lw2zs4hpj435bdi9mmim098rb3n4l07qrvva")))))) - (define-public go-github-com-shirou-gopsutil (let ((commit "47ef3260b6bf6ead847e7c8fc4101b33c365e399") (revision "0")) -- cgit 1.4.1