From 64466063ec5ca218ee295ca4a45eb956135f2fb2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 17 Jul 2022 02:00:01 +0200 Subject: gnu: Add xvkbd. * gnu/packages/xdisorg.scm (xvkbd): New public variable. --- gnu/packages/xdisorg.scm | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index d345bc461d..6100008393 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -161,6 +161,48 @@ specified window, otherwise it outputs the title of the active window. With outputs when titles change.") (license license:unlicense))) +(define-public xvkbd + (package + (name "xvkbd") + (version "4.1") + (source + (origin + (method url-fetch) + (uri (string-append "http://t-sato.in.coocan.jp/xvkbd/xvkbd-" + version ".tar.gz")) + (sha256 + (base32 "1x5yldv9y99cw5hzzs73ygdn1z80zns9hz0baa355r711zghfbcm")))) + (build-system gnu-build-system) + (arguments + (list #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'remove-bugs + ;; Both variables are inexplicably but explicitly set to + ;; $(pkg-config --variable=VARIABLE xt) instead of our own. + (lambda _ + (substitute* "Makefile.in" + (("^(appdefaultdir|datarootdir) = .*" _ variable) + (string-append variable " = @" variable "@\n")))))))) + (native-inputs + (list pkg-config)) + (inputs + (list libxaw libxmu libxtst)) + (home-page "http://t-sato.in.coocan.jp/xvkbd/") + (synopsis "Virtual computer keyboard for the X Window System") + (description + "The @acronym{xvkbd, X virtual keyboard} displays a drawing of a computer +keyboard in a window on the screen. Clicking on its keys sends the +corresponding keystroke(s) to other X clients, as if typed on a physical +keyboard. + +This is useful for systems without keyboard hardware but with a pointing device, +such as kiosk terminals or handheld devices with touch screens. + +A limited number of keyboard layouts are available, as is dictionary completion. +You can also use xvkbd to send a series of predetermined keystrokes from the +command line, without displaying a keyboard at all.") + (license license:gpl2+))) + (define-public arandr (package (name "arandr") -- cgit 1.4.1 From 2dc229a30e8da6d7e449cbd2077f19d519d3649b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 17 Jul 2022 02:00:03 +0200 Subject: gnu: gsm: Update to 1.0.20. * gnu/packages/audio.scm (gsm): Update to 1.0.20. [arguments]: Don't explicitly return #t from phases. --- gnu/packages/audio.scm | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 262994c998..66654b99fc 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -4352,7 +4352,7 @@ code, used in @code{libtoxcore}.") (define-public gsm (package (name "gsm") - (version "1.0.19") + (version "1.0.20") (source (origin (method url-fetch) @@ -4360,8 +4360,7 @@ code, used in @code{libtoxcore}.") (string-append "http://www.quut.com/" name "/" name "-" version ".tar.gz")) (sha256 - (base32 - "1xkha9ss5g5qnfaybi8il0mcvp8knwg9plgh8404vh58d0pna0s9")))) + (base32 "1gwhmqs24c14gc9qr91iqb2jkbr3qqy4dvf27yf8j7mq322w65b3")))) (build-system gnu-build-system) (arguments `(#:test-target "tst" @@ -4374,8 +4373,7 @@ code, used in @code{libtoxcore}.") ;; mediastreamer. (substitute* "Makefile" (("^CCFLAGS.*" all) - (string-append all "CCFLAGS += -fPIC\n"))) - #t)) + (string-append all "CCFLAGS += -fPIC\n"))))) (add-before 'install 'pre-install (lambda _ (let ((out (assoc-ref %outputs "out"))) @@ -4384,8 +4382,7 @@ code, used in @code{libtoxcore}.") (mkdir-p (string-append out "/man/man1")) (mkdir-p (string-append out "/man/man3")) (mkdir-p (string-append out "/bin")) - (mkdir-p (string-append out "/lib"))) - #t)) + (mkdir-p (string-append out "/lib"))))) (add-after 'install 'post-install (lambda _ (let ((out (assoc-ref %outputs "out"))) @@ -4393,8 +4390,7 @@ code, used in @code{libtoxcore}.") (string-append out "/include")) (mkdir-p (string-append out "/include/gsm")) (copy-recursively "inc" - (string-append out "/include/gsm"))) - #t)) + (string-append out "/include/gsm"))))) (delete 'configure)))) ; no configure script (synopsis "GSM 06.10 lossy speech compression library") (description "This C library provides an encoder and a decoder for the GSM -- cgit 1.4.1 From cd3c4ad8fc113608eade2e5c29ba8486cde01157 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 17 Jul 2022 02:00:01 +0200 Subject: gnu: bind: Update to 9.16.31. * gnu/packages/dns.scm (isc-bind): Update to 9.16.31. --- gnu/packages/dns.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index aa10b96fdf..a6521eafb5 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -333,14 +333,14 @@ and BOOTP/TFTP for network booting of diskless machines.") ;; When updating, check whether isc-dhcp's bundled copy should be as well. ;; The BIND release notes are available here: ;; https://www.isc.org/bind/ - (version "9.16.30") + (version "9.16.31") (source (origin (method url-fetch) (uri (string-append "https://ftp.isc.org/isc/bind9/" version "/bind-" version ".tar.xz")) (sha256 - (base32 "1nv02apqpqk7mi1330jgsacpplhgnkx6mba5nmbsx1x72gqc77q0")) + (base32 "1yvwdvcyy996p50j7nr4b010w16jjj5czw15g87wf1dn6xncp8lc")) (patches (search-patches "bind-re-add-attr-constructor-priority.patch")))) (build-system gnu-build-system) -- cgit 1.4.1 From a0f39b7d797c4d775eea5df5a40bedf5f0d22ae1 Mon Sep 17 00:00:00 2001 From: vicvbcun Date: Sat, 16 Jul 2022 12:38:11 +0200 Subject: gnu: eigen: Update to 3.4.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/algebra.scm (eigen): Update to 3.4.0. * gnu/packages/patches/eigen-fix-strict-aliasing-bug.patch: New file. * gnu/packages/patches/eigen-remove-openmp-error-counting.patch, gnu/packages/patches/eigen-stabilise-sparseqr-test.patch: Delete files. * gnu/local.mk (dist_patch_DATA): Update accordingly. Signed-off-by: Ludovic Courtès --- gnu/local.mk | 3 +- gnu/packages/algebra.scm | 19 +++--- .../patches/eigen-fix-strict-aliasing-bug.patch | 73 +++++++++++++++++++++ .../eigen-remove-openmp-error-counting.patch | 64 ------------------- .../patches/eigen-stabilise-sparseqr-test.patch | 74 ---------------------- 5 files changed, 82 insertions(+), 151 deletions(-) create mode 100644 gnu/packages/patches/eigen-fix-strict-aliasing-bug.patch delete mode 100644 gnu/packages/patches/eigen-remove-openmp-error-counting.patch delete mode 100644 gnu/packages/patches/eigen-stabilise-sparseqr-test.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index 412d512775..5c71848616 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1018,8 +1018,7 @@ dist_patch_DATA = \ %D%/packages/patches/ecl-16-libffi.patch \ %D%/packages/patches/efibootmgr-remove-extra-decl.patch \ %D%/packages/patches/efivar-211.patch \ - %D%/packages/patches/eigen-remove-openmp-error-counting.patch \ - %D%/packages/patches/eigen-stabilise-sparseqr-test.patch \ + %D%/packages/patches/eigen-fix-strict-aliasing-bug.patch \ %D%/packages/patches/einstein-build.patch \ %D%/packages/patches/elfutils-tests-ptrace.patch \ %D%/packages/patches/elixir-path-length.patch \ diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index 95fbdb5e36..bb71373aa9 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -986,20 +986,17 @@ extends it by a set of algebraic capabilities.") (define-public eigen (package (name "eigen") - (version "3.3.8") + (version "3.4.0") (source (origin - (method url-fetch) - (uri (list - (string-append "https://bitbucket.org/eigen/eigen/get/" - version ".tar.bz2") - (string-append "mirror://debian/pool/main/e/eigen3/eigen3_" - version ".orig.tar.bz2"))) + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/libeigen/eigen.git") + (commit version))) (sha256 (base32 - "1vxrsncfnkyq6gwxpsannpryp12mk7lc8f42ybvz3saf7icwc582")) - (file-name (string-append name "-" version ".tar.bz2")) - (patches (search-patches "eigen-remove-openmp-error-counting.patch" - "eigen-stabilise-sparseqr-test.patch")) + "0k1c4qnymwwvm68rv6s0cyk08xbw65ixvwqccsh36c2axcqk3znp")) + (file-name (git-file-name name version)) + (patches (search-patches "eigen-fix-strict-aliasing-bug.patch")) (modules '((guix build utils))) (snippet ;; There are 3 test failures in the "unsupported" directory, diff --git a/gnu/packages/patches/eigen-fix-strict-aliasing-bug.patch b/gnu/packages/patches/eigen-fix-strict-aliasing-bug.patch new file mode 100644 index 0000000000..139d633c44 --- /dev/null +++ b/gnu/packages/patches/eigen-fix-strict-aliasing-bug.patch @@ -0,0 +1,73 @@ +From f046e326d9e30772725d8fb26dc33328e418d9d3 Mon Sep 17 00:00:00 2001 +From: Antonio Sanchez +Date: Fri, 17 Sep 2021 12:49:01 -0700 +Subject: [PATCH] Fix strict aliasing bug causing product_small failure. + +Packet loading is skipped due to aliasing violation, leading to nullopt matrix +multiplication. + +Fixes #2327. + + +(cherry picked from commit 3c724c44cff3f9e2e9e35351abff0b5c022b320d) +--- + Eigen/src/Core/arch/AVX/Complex.h | 4 +++- + Eigen/src/Core/arch/AVX512/Complex.h | 4 +++- + Eigen/src/Core/arch/SSE/Complex.h | 11 +++-------- + 3 files changed, 9 insertions(+), 10 deletions(-) + +diff --git a/Eigen/src/Core/arch/AVX/Complex.h b/Eigen/src/Core/arch/AVX/Complex.h +index ab7bd6c65..e9096c0a1 100644 +--- a/Eigen/src/Core/arch/AVX/Complex.h ++++ b/Eigen/src/Core/arch/AVX/Complex.h +@@ -99,7 +99,9 @@ template<> EIGEN_STRONG_INLINE Packet4cf ploadu(const std::complex EIGEN_STRONG_INLINE Packet4cf pset1(const std::complex& from) + { +- return Packet4cf(_mm256_castpd_ps(_mm256_broadcast_sd((const double*)(const void*)&from))); ++ const float re = std::real(from); ++ const float im = std::imag(from); ++ return Packet4cf(_mm256_set_ps(im, re, im, re, im, re, im, re)); + } + + template<> EIGEN_STRONG_INLINE Packet4cf ploaddup(const std::complex* from) +diff --git a/Eigen/src/Core/arch/AVX512/Complex.h b/Eigen/src/Core/arch/AVX512/Complex.h +index 49c72b3f1..074253859 100644 +--- a/Eigen/src/Core/arch/AVX512/Complex.h ++++ b/Eigen/src/Core/arch/AVX512/Complex.h +@@ -97,7 +97,9 @@ template<> EIGEN_STRONG_INLINE Packet8cf ploadu(const std::complex EIGEN_STRONG_INLINE Packet8cf pset1(const std::complex& from) + { +- return Packet8cf(_mm512_castpd_ps(pload1((const double*)(const void*)&from))); ++ const float re = std::real(from); ++ const float im = std::imag(from); ++ return Packet8cf(_mm512_set_ps(im, re, im, re, im, re, im, re, im, re, im, re, im, re, im, re)); + } + + template<> EIGEN_STRONG_INLINE Packet8cf ploaddup(const std::complex* from) +diff --git a/Eigen/src/Core/arch/SSE/Complex.h b/Eigen/src/Core/arch/SSE/Complex.h +index 8fe22da46..215bfd7bb 100644 +--- a/Eigen/src/Core/arch/SSE/Complex.h ++++ b/Eigen/src/Core/arch/SSE/Complex.h +@@ -106,14 +106,9 @@ template<> EIGEN_STRONG_INLINE Packet2cf ploadu(const std::complex EIGEN_STRONG_INLINE Packet2cf pset1(const std::complex& from) + { +- Packet2cf res; +-#ifdef EIGEN_VECTORIZE_SSE3 +- res.v = _mm_castpd_ps(_mm_loaddup_pd(reinterpret_cast(&from))); +-#else +- res.v = _mm_castpd_ps(_mm_load_sd(reinterpret_cast(&from))); +- res.v = _mm_movelh_ps(res.v, res.v); +-#endif +- return res; ++ const float re = std::real(from); ++ const float im = std::imag(from); ++ return Packet2cf(_mm_set_ps(im, re, im, re)); + } + + template<> EIGEN_STRONG_INLINE Packet2cf ploaddup(const std::complex* from) { return pset1(*from); } +-- +2.37.0 + diff --git a/gnu/packages/patches/eigen-remove-openmp-error-counting.patch b/gnu/packages/patches/eigen-remove-openmp-error-counting.patch deleted file mode 100644 index 556474e8b3..0000000000 --- a/gnu/packages/patches/eigen-remove-openmp-error-counting.patch +++ /dev/null @@ -1,64 +0,0 @@ -From ef3cc72cb65e2d500459c178c63e349bacfa834f Mon Sep 17 00:00:00 2001 -From: Luke Peterson -Date: Thu, 8 Oct 2020 12:16:53 -0700 -Subject: [PATCH] Remove error counting in OpenMP parallelize_gemm - -This resolves a compilation error associated with -Eigen::eigen_assert_exception. It also eliminates the counting of -exceptions that may occur in the OpenMP parallel section. If an -unhandled exception occurs in this section, the behavior is non-conforming -according to the OpenMP specification. ---- - Eigen/src/Core/products/Parallelizer.h | 14 +++++--------- - test/CMakeLists.txt | 2 +- - 2 files changed, 6 insertions(+), 10 deletions(-) - -diff --git a/Eigen/src/Core/products/Parallelizer.h b/Eigen/src/Core/products/Parallelizer.h -index 67b2442b5..a3cc05b77 100644 ---- a/Eigen/src/Core/products/Parallelizer.h -+++ b/Eigen/src/Core/products/Parallelizer.h -@@ -132,8 +132,7 @@ void parallelize_gemm(const Functor& func, Index rows, Index cols, Index depth, - - ei_declare_aligned_stack_constructed_variable(GemmParallelInfo,info,threads,0); - -- int errorCount = 0; -- #pragma omp parallel num_threads(threads) reduction(+: errorCount) -+ #pragma omp parallel num_threads(threads) - { - Index i = omp_get_thread_num(); - // Note that the actual number of threads might be lower than the number of request ones. -@@ -152,14 +151,11 @@ void parallelize_gemm(const Functor& func, Index rows, Index cols, Index depth, - info[i].lhs_start = r0; - info[i].lhs_length = actualBlockRows; - -- EIGEN_TRY { -- if(transpose) func(c0, actualBlockCols, 0, rows, info); -- else func(0, rows, c0, actualBlockCols, info); -- } EIGEN_CATCH(...) { -- ++errorCount; -- } -+ if(transpose) -+ func(c0, actualBlockCols, 0, rows, info); -+ else -+ func(0, rows, c0, actualBlockCols, info); - } -- if (errorCount) EIGEN_THROW_X(Eigen::eigen_assert_exception()); - #endif - } - -diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt -index 0747aa6cb..b02577780 100644 ---- a/test/CMakeLists.txt -+++ b/test/CMakeLists.txt -@@ -163,7 +163,7 @@ ei_add_test(constructor) - ei_add_test(linearstructure) - ei_add_test(integer_types) - ei_add_test(unalignedcount) --if(NOT EIGEN_TEST_NO_EXCEPTIONS) -+if(NOT EIGEN_TEST_NO_EXCEPTIONS AND NOT EIGEN_TEST_OPENMP) - ei_add_test(exceptions) - endif() - ei_add_test(redux) --- -GitLab - diff --git a/gnu/packages/patches/eigen-stabilise-sparseqr-test.patch b/gnu/packages/patches/eigen-stabilise-sparseqr-test.patch deleted file mode 100644 index b95b46077a..0000000000 --- a/gnu/packages/patches/eigen-stabilise-sparseqr-test.patch +++ /dev/null @@ -1,74 +0,0 @@ -From: Tobias Geerinckx-Rice -Date: Mon, 16 Mar 2020 22:51:37 +0000 -Subject: gnu: eigen: Stabilise sparseqr test. - -Taken verbatim from this[0] upstream commit. - -[0]: https://gitlab.com/libeigen/eigen/-/commit/3b5deeb546d4017b24846f5b0dc3296a50a039fe - -From 3b5deeb546d4017b24846f5b0dc3296a50a039fe Mon Sep 17 00:00:00 2001 -From: Gael Guennebaud -Date: Tue, 19 Feb 2019 22:57:51 +0100 -Subject: [PATCH] bug #899: make sparseqr unit test more stable by 1) trying - with larger threshold and 2) relax rank computation for rank-deficient - problems. - ---- - test/sparseqr.cpp | 31 ++++++++++++++++++++++++++----- - 1 file changed, 26 insertions(+), 5 deletions(-) - -diff --git a/test/sparseqr.cpp b/test/sparseqr.cpp -index 3ffe62314..3576cc626 100644 ---- a/test/sparseqr.cpp -+++ b/test/sparseqr.cpp -@@ -43,6 +43,7 @@ int generate_sparse_rectangular_problem(MatrixType& A, DenseMat& dA, int maxRows - - template void test_sparseqr_scalar() - { -+ typedef typename NumTraits::Real RealScalar; - typedef SparseMatrix MatrixType; - typedef Matrix DenseMat; - typedef Matrix DenseVector; -@@ -91,14 +92,34 @@ template void test_sparseqr_scalar() - exit(0); - return; - } -- -- VERIFY_IS_APPROX(A * x, b); -- -- //Compare with a dense QR solver -+ -+ // Compare with a dense QR solver - ColPivHouseholderQR dqr(dA); - refX = dqr.solve(b); - -- VERIFY_IS_EQUAL(dqr.rank(), solver.rank()); -+ bool rank_deficient = A.cols()>A.rows() || dqr.rank() we might have to increase the threshold -+ // to get a correct solution. -+ RealScalar th = RealScalar(20)*dA.colwise().norm().maxCoeff()*(A.rows()+A.cols()) * NumTraits::epsilon(); -+ for(Index k=0; (k<16) && !test_isApprox(A*x,b); ++k) -+ { -+ th *= RealScalar(10); -+ solver.setPivotThreshold(th); -+ solver.compute(A); -+ x = solver.solve(b); -+ } -+ } -+ -+ VERIFY_IS_APPROX(A * x, b); -+ -+ // For rank deficient problem, the estimated rank might -+ // be slightly off, so let's only raise a warning in such cases. -+ if(rank_deficient) ++g_test_level; -+ VERIFY_IS_EQUAL(solver.rank(), dqr.rank()); -+ if(rank_deficient) --g_test_level; -+ - if(solver.rank()==A.cols()) // full rank - VERIFY_IS_APPROX(x, refX); - // else --- -2.24.1 - -- cgit 1.4.1 From b11fc326fa2c030d39b076320d4f43e298e9fc1f Mon Sep 17 00:00:00 2001 From: r0man Date: Sat, 16 Jul 2022 20:24:04 +0200 Subject: gnu: clojure-tools-cli: Update to 1.0.206. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/clojure.scm (clojure-tools-cli): Update to 1.0.206. Signed-off-by: Ludovic Courtès --- gnu/packages/clojure.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/clojure.scm b/gnu/packages/clojure.scm index c8157bfdcd..ff8b4b1dfb 100644 --- a/gnu/packages/clojure.scm +++ b/gnu/packages/clojure.scm @@ -458,7 +458,7 @@ concise, powerful tests.") (define-public clojure-tools-cli (package (name "clojure-tools-cli") - (version "0.4.2") + (version "1.0.206") (home-page "https://github.com/clojure/tools.cli") (source (origin (method git-fetch) @@ -467,7 +467,7 @@ concise, powerful tests.") (commit (string-append "tools.cli-" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1yqlm8lwbcjm0dp032z7vzc4bdlmc4jixznvf4adsqhvqw85hvj2")))) + (base32 "1hvk5zacl3fr8lfcbfgckaicqjx697j0kzw2x5hwj8j5xlr8ri2r")))) (build-system clojure-build-system) (arguments '(#:source-dirs '("src/main/clojure/") -- cgit 1.4.1 From b20af3b5c335674713950abd6c5d14e71db18333 Mon Sep 17 00:00:00 2001 From: r0man Date: Sat, 16 Jul 2022 20:24:09 +0200 Subject: gnu: clojure-tools-gitlibs: Update to 2.4.181. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/clojure.scm (clojure-tools-gitlibs): Update to 2.4.181. Signed-off-by: Ludovic Courtès --- gnu/packages/clojure.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/clojure.scm b/gnu/packages/clojure.scm index ff8b4b1dfb..eeedbfd88c 100644 --- a/gnu/packages/clojure.scm +++ b/gnu/packages/clojure.scm @@ -544,7 +544,7 @@ dependency graph expansion and the creation of classpaths.") (define-public clojure-tools-gitlibs (package (name "clojure-tools-gitlibs") - (version "2.4.172") + (version "2.4.181") (home-page "https://github.com/clojure/tools.gitlibs") (source (origin (method git-fetch) @@ -554,7 +554,7 @@ dependency graph expansion and the creation of classpaths.") (file-name (git-file-name name version)) (sha256 (base32 - "19d83wigmigy66f5i61a3ishg7zrlv8jngj8m9brsh9v38a0fwdr")))) + "1d8c79f33axghadwqa955yjfsxa6fgl8jq4nfll2zrp6sjw0597k")))) (build-system clojure-build-system) (arguments '(#:source-dirs '("src/main/clojure") -- cgit 1.4.1 From 1eb357fdace536c2047cccf7e24d52f3e2166e42 Mon Sep 17 00:00:00 2001 From: r0man Date: Sat, 16 Jul 2022 20:24:12 +0200 Subject: gnu: clojure-tools-deps-alpha: Update to 0.14.1212. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/clojure.scm (clojure-tools-deps-alpha): Update to 0.14.1212. Signed-off-by: Ludovic Courtès --- gnu/packages/clojure.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/clojure.scm b/gnu/packages/clojure.scm index eeedbfd88c..ba229070b7 100644 --- a/gnu/packages/clojure.scm +++ b/gnu/packages/clojure.scm @@ -482,7 +482,7 @@ work with command-line arguments.") (define-public clojure-tools-deps-alpha (package (name "clojure-tools-deps-alpha") - (version "0.12.1104") + (version "0.14.1212") (home-page "https://github.com/clojure/tools.deps.alpha") (source (origin (method git-fetch) @@ -492,7 +492,7 @@ work with command-line arguments.") (file-name (git-file-name name version)) (sha256 (base32 - "174m83n5m3arai2vbg434zjibbsr3r4pp7lz3adja8lxq7g21r80")))) + "0r8qfihii6cf95kl86x6zfldnm7wlkgda2qmq3340j1x03v244dd")))) (build-system clojure-build-system) (arguments `(#:source-dirs '("src/main/clojure" "src/main/resources") -- cgit 1.4.1 From 9599122c4f73518783854a1964564d211a1a8fba Mon Sep 17 00:00:00 2001 From: r0man Date: Sat, 16 Jul 2022 20:24:15 +0200 Subject: gnu: clojure-tools: Update to 1.11.1.1149. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/clojure.scm (clojure-tools): Update to 1.11.1.1149. Signed-off-by: Ludovic Courtès --- gnu/packages/clojure.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/clojure.scm b/gnu/packages/clojure.scm index ba229070b7..8b94d118a2 100644 --- a/gnu/packages/clojure.scm +++ b/gnu/packages/clojure.scm @@ -153,14 +153,14 @@ designs.") (define-public clojure-tools (package (name "clojure-tools") - (version "1.10.3.1040") + (version "1.11.1.1149") (source (origin (method url-fetch) (uri (string-append "https://download.clojure.org/install/clojure-tools-" version ".tar.gz")) - (sha256 (base32 "0xvr9nmk9q789vp32zmmzj4macv8v7y9ivnfd6lf7i8vxgg6hvgv")) + (sha256 (base32 "196wl87br8zg3npfwpr5c1q0knxd1810vzgb0b6h195hyjf6i210")) ;; Remove AOT compiled JAR. The other JAR only contains uncompiled ;; Clojure source code. (snippet -- cgit 1.4.1 From af7dd521363ea9b8476b8e92a44782678b3b5a5e Mon Sep 17 00:00:00 2001 From: r0man Date: Sat, 16 Jul 2022 20:24:18 +0200 Subject: gnu: clojure: Update to 1.11.1. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This patch updates Clojure to 1.11.1. It also adds the 'reset-class-timestamps phase to the Clojure build system. This phase makes sure the timestamp of compiled class files is set to a later point in time than the timestamp of the corresponding Clojure source files. If the timestamps of the class and source files are the same, the Clojure compiler will compile the sources again which can lead to issues. This problem has been discussed here [1]. The suggested solution was to keep/adjust the timestamps of the class files. [1] https://www.mail-archive.com/clojure@googlegroups.com/msg99928.html * gnu/packages/clojure.scm (clojure): Update to 1.11.1 and update all of LIBRARIES accordingly. [arguments]: In 'unpack-library-sources' phase, copy from "core-specs-alpha-src" and "spec-alpha-src" as well. Add phases 'closure-spec-skip-macros', 'clojure-spec-compile', 'maven-classpath-properties', and 'reset-class-timestamps'. * guix/build/clojure-build-system.scm (regular-jar-file?) (reset-class-timestamps): New procedures. (%standard-phases): Add 'reset-class-timestamps' phase. Co-authored-by: Ludovic Courtès --- gnu/packages/clojure.scm | 93 ++++++++++++++++++++++++++++--------- guix/build/clojure-build-system.scm | 58 ++++++++++++++++++++++- 2 files changed, 128 insertions(+), 23 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/clojure.scm b/gnu/packages/clojure.scm index 8b94d118a2..dfff54f8ee 100644 --- a/gnu/packages/clojure.scm +++ b/gnu/packages/clojure.scm @@ -43,36 +43,44 @@ ;; The libraries below are needed to run the tests. (libraries `(("core-specs-alpha-src" - ,(lib "core.specs.alpha/archive/core.specs.alpha-" - "0.1.24" - "0v2a0svf1ar2y42ajxwsjr7zmm5j7pp2zwrd2jh3k7xzd1p9x1fv")) + ,(lib "core.specs.alpha/archive/v" + "0.2.62" + "0v6nhghsigpzm8y7dykfm318q5dvk5l8sykmn1hr0qgs1jsjqh9j")) ("data-generators-src" ,(lib "data.generators/archive/data.generators-" - "0.1.2" - "0kki093jp4ckwxzfnw8ylflrfqs8b1i1wi9iapmwcsy328dmgzp1")) + "1.0.0" + "0s3hf1njvs68b8igasikvzagzqxl0gbri7w2qhzsypkhfh60v2cp")) + ("java-classpath-src" + ,(lib "java.classpath/archive/java.classpath-" + "1.0.0" + "178zajjsc9phk5l61r8w9hcpk0wgc9a811pl7kjgvn7rg4l7fh7j")) ("spec-alpha-src" - ,(lib "spec.alpha/archive/spec.alpha-" - "0.1.143" - "00alf0347licdn773w2jarpllyrbl52qz4d8mw61anjksacxylzz")) + ,(lib "spec.alpha/archive/v" + "0.3.218" + "0h5nd9xlind1a2vmllr2yfhnirgj2pm5dndgqzrly78l5iwcc3wa")) ("test-check-src" - ,(lib "test.check/archive/test.check-" - "0.9.0" - "0p0mnyhr442bzkz0s4k5ra3i6l5lc7kp6ajaqkkyh4c2k5yck1md")) + ,(lib "test.check/archive/v" + "1.1.1" + "0kx8l79mhpnn94rpsgc7nac7gb222g7a47mzrycj8crfc54wf0c1")) ("test-generative-src" ,(lib "test.generative/archive/test.generative-" - "0.5.2" - "1pjafy1i7yblc7ixmcpfq1lfbyf3jaljvkgrajn70sws9xs7a9f8")) + "1.0.0" + "0yy2vc38s4j5n94jdcjx1v7l2gdq0lywam31id1jh07sx37lv5il")) ("tools-namespace-src" ,(lib "tools.namespace/archive/tools.namespace-" - "0.2.11" - "10baak8v0hnwz2hr33bavshm7y49mmn9zsyyms1dwjz45p5ymhy0")))) + "1.0.0" + "1ifpk93m33rj2xm1qnnninlsdvm1liqmsp9igr63pjjwwwjw1cnn")) + ("tools-reader-src" + ,(lib "tools.reader/archive/tools.reader-" + "1.3.2" + "1n4dhg61iyypnjbxmihhqjb7lfpc0lzfvlk4jd8w0yr6za414f3a")))) (library-names (match libraries (((library-name _) ...) library-name)))) (package (name "clojure") - (version "1.10.0") + (version "1.11.1") (source (let ((name+version (string-append name "-" version))) (origin (method git-fetch) @@ -81,18 +89,23 @@ (commit name+version))) (file-name (string-append name+version "-checkout")) (sha256 - (base32 "1kcyv2836acs27vi75hvf3r773ahv2nlh9b3j9xa9m9sdanz1h83"))))) + (base32 "1xbab21rm9zvhmw1i2h5lqm7612vrdkxprq0rgb2i3sbgsxcdsn4"))))) (build-system ant-build-system) (inputs `(("jre" ,icedtea))) (arguments `(#:imported-modules ((guix build clojure-utils) + (guix build clojure-build-system) (guix build guile-build-system) ,@%ant-build-system-modules) #:modules ((guix build ant-build-system) + ((guix build clojure-build-system) #:prefix clj:) (guix build clojure-utils) (guix build java-utils) (guix build utils) + (guix build syscalls) + (ice-9 match) + (ice-9 regex) (srfi srfi-26)) #:test-target "test" #:phases @@ -106,22 +119,60 @@ "--extract" "--verbose" "--file" (assoc-ref inputs name) - "--strip-components=1")) - (copy-recursively (string-append name "/src/main/clojure/") - "src/clj/")) + "--strip-components=1"))) (for-each extract-library ',library-names) + (copy-recursively "core-specs-alpha-src/src/main/clojure" + "src/clj/") + (copy-recursively "spec-alpha-src/src/main/clojure" + "src/clj/") #t)) (add-after 'unpack-library-sources 'fix-manifest-classpath (lambda _ (substitute* "build.xml" (("") "")) #t)) + (add-after 'unpack-library-sources 'clojure-spec-skip-macros + ;; Disable spec macro instrumentation when compiling clojure.spec + ;; See: https://clojure.atlassian.net/browse/CLJ-2254 + (lambda _ + (substitute* "build.xml" + (("") + ,(string-join + '("" + "\n") + "\n"))) + #t)) + (add-after 'unpack-library-sources 'clojure-spec-compile + ;; Compile and include clojure.spec.alpha & clojure.core.specs.alpha + (lambda _ + (substitute* "build.xml" + (("") + ,(string-join + '("" + "" + "" + "" + "")))) + #t)) + (add-before 'build 'maven-classpath-properties + (lambda _ + (define (make-classpath libraries) + (string-join (map (lambda (library) + (string-append library "/src/main/clojure")) + libraries) ":")) + (with-output-to-file "maven-classpath.properties" + (lambda () + (let ((classpath (make-classpath ',library-names))) + (display (string-append "maven.compile.classpath=" classpath "\n")) + (display (string-append "maven.test.classpath=" classpath "\n"))))) + #t)) (add-after 'build 'build-javadoc ant-build-javadoc) (replace 'install (install-jars "./")) (add-after 'install-license-files 'install-doc (cut install-doc #:doc-dirs '("doc/clojure/") <...>)) (add-after 'install-doc 'install-javadoc - (install-javadoc "target/javadoc/"))))) + (install-javadoc "target/javadoc/")) + (add-after 'reset-gzip-timestamps 'reset-class-timestamps clj:reset-class-timestamps)))) (native-inputs libraries) (home-page "https://clojure.org/") (synopsis "Lisp dialect running on the JVM") diff --git a/guix/build/clojure-build-system.scm b/guix/build/clojure-build-system.scm index 7d494078ea..cacbefb386 100644 --- a/guix/build/clojure-build-system.scm +++ b/guix/build/clojure-build-system.scm @@ -22,11 +22,15 @@ ant-build)) #:use-module (guix build clojure-utils) #:use-module (guix build java-utils) + #:use-module (guix build syscalls) #:use-module (guix build utils) + #:use-module (ice-9 match) + #:use-module (ice-9 regex) #:use-module (srfi srfi-1) #:use-module (srfi srfi-26) #:export (%standard-phases - clojure-build)) + clojure-build + reset-class-timestamps)) ;; Commentary: ;; @@ -108,6 +112,55 @@ priority over TEST-INCLUDE." jar-names))) #t) +(define (regular-jar-file? file stat) + "Predicate returning true if FILE is ending on '.jar' +and STAT indicates it is a regular file." + (and (string-suffix? ".jar" file) + (eq? 'regular (stat:type stat)))) + +;; XXX: The only difference compared to 'strip-jar-timestamps' in +;; ant-build-system.scm is the date. TODO: Adjust and factorize. +(define* (reset-class-timestamps #:key outputs #:allow-other-keys) + "Unpack all jar archives, reset the timestamp of all contained class files, +and repack them. This is necessary to ensure that archives are reproducible." + (define (repack-archive jar) + (format #t "resetting class timestamps and repacking ~a\n" jar) + + ;; Note: .class files need to be strictly newer than source files, + ;; otherwise the Clojure compiler will recompile sources. + (let* ((early-1980 315619200) ; 1980-01-02 UTC + (dir (mkdtemp! "jar-contents.XXXXXX")) + (manifest (string-append dir "/META-INF/MANIFEST.MF"))) + (with-directory-excursion dir + (invoke "jar" "xf" jar)) + (delete-file jar) + (for-each (lambda (file) + (let ((s (lstat file))) + (unless (eq? (stat:type s) 'symlink) + (when (string-match "^(.*)\\.class$" file) + (utime file early-1980 early-1980))))) + (find-files dir #:directories? #t)) + ;; The jar tool will always set the timestamp on the manifest file + ;; and the containing directory to the current time, even when we + ;; reuse an existing manifest file. To avoid this we use "zip" + ;; instead of "jar". It is important that the manifest appears + ;; first. + (with-directory-excursion dir + (let* ((files (find-files "." ".*" #:directories? #t)) + ;; To ensure that the reference scanner can detect all + ;; store references in the jars we disable compression + ;; with the "-0" option. + (command (if (file-exists? manifest) + `("zip" "-0" "-X" ,jar ,manifest ,@files) + `("zip" "-0" "-X" ,jar ,@files)))) + (apply invoke command))) + (utime jar 0 0))) + (for-each (match-lambda + ((output . directory) + (for-each repack-archive + (find-files directory regular-jar-file?)))) + outputs)) + (define-with-docs install "Standard 'install' phase for clojure-build-system." (install-jars "./")) @@ -119,7 +172,8 @@ priority over TEST-INCLUDE." (replace 'build build) (replace 'check check) (replace 'install install) - (add-after 'install-license-files 'install-doc install-doc))) + (add-after 'install-license-files 'install-doc install-doc) + (add-after 'reset-gzip-timestamps 'reset-class-timestamps reset-class-timestamps))) (define* (clojure-build #:key inputs -- cgit 1.4.1 From 884c87a1006a35e78f4db4eafd5b98d4b4328136 Mon Sep 17 00:00:00 2001 From: r0man Date: Sat, 16 Jul 2022 20:24:22 +0200 Subject: gnu: clojure-algo-generic: Fix test failing under AOT in Clojure 1.11.1. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/clojure.scm (clojure-algo-generic)[arguments]: Add 'fix-import' phase. Signed-off-by: Ludovic Courtès --- gnu/packages/clojure.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/clojure.scm b/gnu/packages/clojure.scm index dfff54f8ee..840584b162 100644 --- a/gnu/packages/clojure.scm +++ b/gnu/packages/clojure.scm @@ -275,7 +275,15 @@ Clojure repl, use Clojure and Java libraries, and start Clojure programs.") (arguments '(#:source-dirs '("src/main/clojure/") #:test-dirs '("src/test/clojure/") - #:doc-dirs '())) + #:doc-dirs '() + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-import + (lambda _ + (substitute* + "src/main/clojure/clojure/algo/generic/math_functions.clj" + (("clojure.algo.generic.math-functions") + "clojure.algo.generic.math-functions\n(:refer-clojure :exclude [abs])"))))))) (synopsis "Generic versions of common functions") (description "Generic versions of commonly used functions, implemented as multimethods -- cgit 1.4.1 From f65270c799e4897ae1785b7dacb1fc9ac07d3358 Mon Sep 17 00:00:00 2001 From: r0man Date: Sat, 16 Jul 2022 20:24:25 +0200 Subject: gnu: clojure-core-match: Update to 1.0.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/clojure.scm (clojure-core-match): Update to 1.0.0. Signed-off-by: Ludovic Courtès --- gnu/packages/clojure.scm | 46 ++++++++++++++++++++++------------------------ 1 file changed, 22 insertions(+), 24 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/clojure.scm b/gnu/packages/clojure.scm index 840584b162..f2e08eb539 100644 --- a/gnu/packages/clojure.scm +++ b/gnu/packages/clojure.scm @@ -320,31 +320,29 @@ defining and using monads and useful monadic functions.") (license license:epl1.0))) (define-public clojure-core-match - (let ((commit "1837ffbd4a150e8f3953b2d9ed5cf4a4ad3720a7") - (revision "1")) ; this is the 1st commit buildable with clojure 1.9 - (package - (name "clojure-core-match") - (version (git-version "0.3.0-alpha5" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/clojure/core.match") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "04bdlp5dgkrqzrz0lw3mfwmygj2218qnm1cz3dkb9wy4m0238s4d")))) - (build-system clojure-build-system) - (arguments - '(#:source-dirs '("src/main/clojure") - #:test-dirs '("src/test/clojure") - #:doc-dirs '())) - (synopsis "Optimized pattern matching for Clojure") - (description - "An optimized pattern matching library for Clojure. + (package + (name "clojure-core-match") + (version "1.0.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/clojure/core.match") + (commit (string-append "core.match-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0ajpxjv4yc282cm0jw8819fay2j6jqp9nfy69k7vll09q7vqsd22")))) + (build-system clojure-build-system) + (arguments + '(#:source-dirs '("src/main/clojure") + #:test-dirs '("src/test/clojure") + #:doc-dirs '())) + (synopsis "Optimized pattern matching for Clojure") + (description + "An optimized pattern matching library for Clojure. It supports Clojure 1.5.1 and later as well as ClojureScript.") - (home-page "https://github.com/clojure/core.match") - (license license:epl1.0)))) + (home-page "https://github.com/clojure/core.match") + (license license:epl1.0))) (define-public clojure-data-codec (package -- cgit 1.4.1 From 666f12f125d3fd5b36d84ab20271f0a5519e53a5 Mon Sep 17 00:00:00 2001 From: r0man Date: Sat, 16 Jul 2022 20:24:29 +0200 Subject: gnu: clojure-instaparse: Update to 1.4.12. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This patch updates clojure-instaparse to 1.4.12. Due to the following AOT related error I disabled AOT compilation for this package. ``` starting phase `build' Execution error (IllegalArgumentException) at instaparse.auto-flatten-seq/fn$G (auto_flatten_seq.cljc:7). No implementation of method: :conj-flat of protocol: #'instaparse.auto-flatten-seq/ConjFlat found for class: instaparse.auto_flatten_seq.AutoFlattenSeq ``` This seems to be a known issue with AOT compilation. The issue has been discussed [1] and seems to be still an open issue. [1] https://github.com/Engelberg/instaparse/issues/85 * gnu/packages/clojure.scm (clojure-instaparse): Update to 1.4.12. [arguments]: Add 'fix-import' phase. Signed-off-by: Ludovic Courtès --- gnu/packages/clojure.scm | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/clojure.scm b/gnu/packages/clojure.scm index f2e08eb539..9876192f5f 100644 --- a/gnu/packages/clojure.scm +++ b/gnu/packages/clojure.scm @@ -411,8 +411,7 @@ lazy - should allow parsing and emitting of large XML documents") (license license:epl1.0))) (define-public clojure-instaparse - (let ((commit "dcfffad5b065e750f0f5835f017cdd8188b8ca2e") - (version "1.4.9")) ; upstream forget to tag this release + (let ((version "1.4.12")) (package (name "clojure-instaparse") (version version) @@ -420,14 +419,27 @@ lazy - should allow parsing and emitting of large XML documents") (method git-fetch) (uri (git-reference (url "https://github.com/Engelberg/instaparse") - (commit commit))) + (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 (base32 - "002mrgin4z3dqy88r1lak7smd0m7x8d22vmliw0m6w6mh5pa17lk")))) + "1xdiwsv1dc8mvrmvgs4xdqk3z6ddsammc6brhcb771yhimx8jjcr")))) (build-system clojure-build-system) (arguments - '(#:doc-dirs '("docs/"))) + '(;; Disabled AOT, because of failing test: No implementation of + ;; method: :conj-flat of protocol: + ;; #'instaparse.auto-flatten-seq/ConjFlat found for class: + ;; instaparse.auto_flatten_seq.AutoFlattenSeq + #:aot-exclude '(#:all) + #:doc-dirs '("docs/") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-import + (lambda _ + (substitute* + "test/instaparse/defparser_test.cljc" + (("AssertionError") + "Exception"))))))) (synopsis "No grammar left behind") (description "Instaparse aims to be the simplest way to build parsers in Clojure. -- cgit 1.4.1 From 50d2556149b55ca583afdba17070cb7cb596078d Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Wed, 20 Jul 2022 18:21:32 +0000 Subject: gnu: git: Update to 2.37.1. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/version-control.scm (git): Update to 2.37.1. Signed-off-by: Ludovic Courtès --- gnu/packages/version-control.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 612f69597f..6652ac717f 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -221,14 +221,14 @@ Python 3.3 and later, rather than on Python 2.") (define-public git (package (name "git") - (version "2.37.0") + (version "2.37.1") (source (origin (method url-fetch) (uri (string-append "mirror://kernel.org/software/scm/git/git-" version ".tar.xz")) (sha256 (base32 - "07s1jmsc1d4dlmr3qpibfzj14gy1gm049zp2vp1lw36h3dqs2zwz")))) + "001m3gnal902hv22gp1m44c6247357pb80db0svms74gidmjq5n8")))) (build-system gnu-build-system) (native-inputs `(("native-perl" ,perl) @@ -248,7 +248,7 @@ Python 3.3 and later, rather than on Python 2.") version ".tar.xz")) (sha256 (base32 - "1q68mnbpznapxxyjpysjx5lz8m6y25frxl5yshgx139c0xcr64c0")))) + "098yz8kzvzmmrkyiv8j79s5nryws302pnq6jcbrqbidrziwcxkjd")))) ;; For subtree documentation. ("asciidoc" ,asciidoc) ("docbook-xsl" ,docbook-xsl) -- cgit 1.4.1 From 32a00363435ac8c1bc93ef1281b2c2afc28a8877 Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Fri, 22 Jul 2022 14:48:36 +0000 Subject: gnu: iotop: Update to 1.22. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/linux.scm (iotop): Update to 1.22. Signed-off-by: Ludovic Courtès --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index c519e1d58c..0c40b00912 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -3229,7 +3229,7 @@ processes currently causing I/O.") (define-public iotop (package (name "iotop") - (version "1.21") + (version "1.22") (source (origin (method git-fetch) @@ -3238,7 +3238,7 @@ processes currently causing I/O.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "03wdnkfl51dapilg6r9vjga1xrl9lxlypfz07k50nscvbq8v8fb7")))) + (base32 "04a77qir35s1bwvd39qddx2kfizdbf5jxlnz8zmy1cnrigbwcy1h")))) (build-system gnu-build-system) (arguments (list #:make-flags -- cgit 1.4.1 From c0c6944f1a663e994f50b2154e40378a802b08a4 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 22 Jul 2022 16:13:15 +0200 Subject: gnu: perl-pod-parser: Update to 1.65. * gnu/packages/perl.scm (perl-pod-parser): Update to 1.65. --- gnu/packages/perl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index c4e9367a73..93284da2bc 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -8571,7 +8571,7 @@ for a given module is comprehensive.") (define-public perl-pod-parser (package (name "perl-pod-parser") - (version "1.63") + (version "1.65") (source (origin (method url-fetch) (uri (string-append @@ -8579,7 +8579,7 @@ for a given module is comprehensive.") version ".tar.gz")) (sha256 (base32 - "1k8clxxdjag56zm6cv38c3q81gj7xphfhh98l21jynwp55hvbq6v")))) + "12mj07a34shx5h203l693fra7ip9hc49zrd7w8gsa5llcpnbv9rv")))) (build-system perl-build-system) (home-page "https://metacpan.org/release/Pod-Parser") (synopsis "Modules for parsing/translating POD format documents") -- cgit 1.4.1 From 9b4b5e33c448f9f31829fca2533f6e3a08451908 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 23 Jul 2022 06:14:36 +0200 Subject: gnu: perl-file-basedir: Update to 0.09. * gnu/packages/freedesktop.scm (perl-file-basedir): Update to 0.09. --- gnu/packages/freedesktop.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index e17cc51f02..2f7589d6e2 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -1868,15 +1868,15 @@ manually by a user.") (define-public perl-file-basedir (package (name "perl-file-basedir") - (version "0.08") + (version "0.09") (source (origin (method url-fetch) - (uri (string-append "mirror://cpan/authors/id/K/KI/KIMRYAN/" + (uri (string-append "mirror://cpan/authors/id/P/PL/PLICEASE/" "File-BaseDir-" version ".tar.gz")) (sha256 (base32 - "1qq5ag9zffx8zc5i9b4z03ar80pqj4drgk3vjdlyfapjwb9zqrf0")))) + "1nb757cyyy80xln147qgns113i2ivfpgcfhsxw8qzb322llgg9kd")))) (build-system perl-build-system) (native-inputs (list perl-module-build perl-file-which perl-test-pod -- cgit 1.4.1 From c948b935e1ed9673027dec5e366badfd0aae0077 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 22 Jul 2022 02:02:03 +0200 Subject: gnu: perl-cpanel-json-xs: Update to 4.30. * gnu/packages/perl.scm (perl-cpanel-json-xs): Update to 4.30. --- gnu/packages/perl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index c4e9367a73..a152f7de6f 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -2147,14 +2147,14 @@ CPAN::Meta object are present.") (define-public perl-cpanel-json-xs (package (name "perl-cpanel-json-xs") - (version "4.26") + (version "4.30") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/R/RU/RURBAN/" "Cpanel-JSON-XS-" version ".tar.gz")) (sha256 - (base32 "0c07jfh6pq0f3hlhg0cqmznna7rlcflgrqv17mbkz9gnvg4x3szv")))) + (base32 "1d5xwk3j3pvc2s439vjrnhwcx44wkskda9mrwv3ix2c6pp7slpsn")))) (build-system perl-build-system) (propagated-inputs (list perl-common-sense)) -- cgit 1.4.1 From 3d446d85ce672ed7d9e5d138ad68a1b8fcf3aa24 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 22 Jul 2022 16:17:31 +0200 Subject: gnu: perl-catalystx-script-server-starman: Add missing input. * gnu/packages/web.scm (perl-catalystx-script-server-starman)[native-inputs]: Add PERL-POD-PARSER. --- gnu/packages/web.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 9342873bc0..29526c8002 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -2871,7 +2871,7 @@ application classes.") "08jvibq4v8xjj0c3cr93h0w8w0c88ajwjn37xjy7ygxl9krlffp6")))) (build-system perl-build-system) (native-inputs - (list perl-module-install perl-test-www-mechanize-catalyst)) + (list perl-module-install perl-pod-parser perl-test-www-mechanize-catalyst)) (propagated-inputs (list perl-catalyst-runtime perl-moose perl-namespace-autoclean starman)) -- cgit 1.4.1 From 8f2be58833d6229576719e1c3578919ec873807e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 23 Jul 2022 16:30:29 +0200 Subject: gnu: PHP: Update to 7.4.30. * gnu/packages/php.scm (php): Update to 7.4.30. [source](patches): Remove obsolete patch. * gnu/packages/patches/php-openssl_x509_checkpurpose_basic.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. --- gnu/local.mk | 1 - .../php-openssl_x509_checkpurpose_basic.patch | 108 --------------------- gnu/packages/php.scm | 8 +- 3 files changed, 3 insertions(+), 114 deletions(-) delete mode 100644 gnu/packages/patches/php-openssl_x509_checkpurpose_basic.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index 5c71848616..9dd87d2e88 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1632,7 +1632,6 @@ dist_patch_DATA = \ %D%/packages/patches/perl-www-curl-remove-symbol.patch \ %D%/packages/patches/phoronix-test-suite-fsdg.patch \ %D%/packages/patches/php-bug-74093-test.patch \ - %D%/packages/patches/php-openssl_x509_checkpurpose_basic.patch \ %D%/packages/patches/picard-fix-id3-rename-test.patch \ %D%/packages/patches/picprog-non-intel-support.patch \ %D%/packages/patches/pidgin-add-search-path.patch \ diff --git a/gnu/packages/patches/php-openssl_x509_checkpurpose_basic.patch b/gnu/packages/patches/php-openssl_x509_checkpurpose_basic.patch deleted file mode 100644 index 427965f231..0000000000 --- a/gnu/packages/patches/php-openssl_x509_checkpurpose_basic.patch +++ /dev/null @@ -1,108 +0,0 @@ -From 98175fc7f1623873ceb2e9a017a319d19bfb3912 Mon Sep 17 00:00:00 2001 -From: "Christoph M. Becker" -Date: Sun, 12 Dec 2021 13:41:37 +0100 -Subject: [PATCH] Fix openssl_x509_checkpurpose_basic.phpt - -This test fails because san-cert.pem and san-ca.pem have expired. We -fix that by using the CertificateGenerator to generate temporary certs -during the test run. Since san-cert.pem and san-ca.pem have been -identical, we only generate one certificate. - -Closes GH-7763. ---- - .../openssl_x509_checkpurpose_basic.phpt | 10 +++++- - ext/openssl/tests/san-ca.pem | 15 --------- - ext/openssl/tests/san-cert.pem | 31 ------------------- - 3 files changed, 9 insertions(+), 47 deletions(-) - delete mode 100644 ext/openssl/tests/san-ca.pem - delete mode 100644 ext/openssl/tests/san-cert.pem - -diff --git a/ext/openssl/tests/openssl_x509_checkpurpose_basic.phpt b/ext/openssl/tests/openssl_x509_checkpurpose_basic.phpt -index 99b4f0bdff31..35629bd93626 100644 ---- a/ext/openssl/tests/openssl_x509_checkpurpose_basic.phpt -+++ b/ext/openssl/tests/openssl_x509_checkpurpose_basic.phpt -@@ -8,10 +8,14 @@ if (OPENSSL_VERSION_NUMBER < 0x10000000) die("skip Output requires OpenSSL 1.0") - ?> - --FILE-- - saveCaCert(__DIR__ . "/san-cert.pem"); -+ - $cert = "file://" . __DIR__ . "/cert.crt"; - $bert = "file://" . __DIR__ . "/bug41033.pem"; - $sert = "file://" . __DIR__ . "/san-cert.pem"; --$cpca = __DIR__ . "/san-ca.pem"; -+$cpca = __DIR__ . "/san-cert.pem"; - $utfl = __DIR__ . "/sni_server_uk.pem"; - $rcrt = openssl_x509_read($cert); - -@@ -84,6 +88,10 @@ var_dump(openssl_x509_checkpurpose($sert, X509_PURPOSE_SMIME_ENCRYPT, array($cpc - var_dump(openssl_x509_checkpurpose($sert, X509_PURPOSE_CRL_SIGN, array($cpca), $utfl)); - var_dump(openssl_x509_checkpurpose($sert, X509_PURPOSE_ANY, array($cpca), $utfl)); - ?> -+--CLEAN-- -+ - --EXPECT-- - bool(false) - bool(false) -diff --git a/ext/openssl/tests/san-ca.pem b/ext/openssl/tests/san-ca.pem -deleted file mode 100644 -index 88682ba2dcf6..000000000000 ---- a/ext/openssl/tests/san-ca.pem -+++ /dev/null -@@ -1,15 +0,0 @@ -------BEGIN CERTIFICATE----- --MIICYTCCAcqgAwIBAgIJAIaqxtY5dwjtMA0GCSqGSIb3DQEBBQUAMFMxCzAJBgNV --BAYTAlVTMQswCQYDVQQIEwJNTjEUMBIGA1UEBxMLTWlubmVhcG9saXMxITAfBgNV --BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDAeFw0xMzA5MjQwODA1NTFaFw0y --MTEyMTEwODA1NTFaMFMxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJNTjEUMBIGA1UE --BxMLTWlubmVhcG9saXMxITAfBgNVBAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRl --ZDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAsFGqfbU/8D+KjroQl4XMyt9m --dcSP7iZtqphOu9nVZxYAAqfaqj8FnC/pwYV3TU6ZHndLTQAllwYT3sQBQPPGmZQ9 --clSIMEL003t3pi4ZVXkttG6Vvr+Z9PBcHhlKLQ7WMHnn4qctllWXTSoyTQpkETF3 --Fc3mrG5G37BhoUno7NECAwEAAaM9MDswOQYDVR0RBDIwMIILZXhhbXBsZS5vcmeC --D3d3dy5leGFtcGxlLm9yZ4IQdGVzdC5leGFtcGxlLm9yZzANBgkqhkiG9w0BAQUF --AAOBgQBf/FZhzheIcQJ+dyTk8xQ/nJLvpmBhbd1LNtfwk/MsC9UHsz4QXs9sBw1k --rH0FjoqgM6avj7zKHJFTj6q7Rd+OX5V4HynYPhX67sWbN3KWEHffL98nGGd/bo3X --pSjNk5vnyKYiwdUUe11Ac9csh0HcSBbhOYjy0T/i9AlQcKbuCg== -------END CERTIFICATE----- -diff --git a/ext/openssl/tests/san-cert.pem b/ext/openssl/tests/san-cert.pem -deleted file mode 100644 -index 923d490e72fd..000000000000 ---- a/ext/openssl/tests/san-cert.pem -+++ /dev/null -@@ -1,31 +0,0 @@ -------BEGIN CERTIFICATE----- --MIICYTCCAcqgAwIBAgIJAIaqxtY5dwjtMA0GCSqGSIb3DQEBBQUAMFMxCzAJBgNV --BAYTAlVTMQswCQYDVQQIEwJNTjEUMBIGA1UEBxMLTWlubmVhcG9saXMxITAfBgNV --BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDAeFw0xMzA5MjQwODA1NTFaFw0y --MTEyMTEwODA1NTFaMFMxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJNTjEUMBIGA1UE --BxMLTWlubmVhcG9saXMxITAfBgNVBAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRl --ZDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAsFGqfbU/8D+KjroQl4XMyt9m --dcSP7iZtqphOu9nVZxYAAqfaqj8FnC/pwYV3TU6ZHndLTQAllwYT3sQBQPPGmZQ9 --clSIMEL003t3pi4ZVXkttG6Vvr+Z9PBcHhlKLQ7WMHnn4qctllWXTSoyTQpkETF3 --Fc3mrG5G37BhoUno7NECAwEAAaM9MDswOQYDVR0RBDIwMIILZXhhbXBsZS5vcmeC --D3d3dy5leGFtcGxlLm9yZ4IQdGVzdC5leGFtcGxlLm9yZzANBgkqhkiG9w0BAQUF --AAOBgQBf/FZhzheIcQJ+dyTk8xQ/nJLvpmBhbd1LNtfwk/MsC9UHsz4QXs9sBw1k --rH0FjoqgM6avj7zKHJFTj6q7Rd+OX5V4HynYPhX67sWbN3KWEHffL98nGGd/bo3X --pSjNk5vnyKYiwdUUe11Ac9csh0HcSBbhOYjy0T/i9AlQcKbuCg== -------END CERTIFICATE----- -------BEGIN PRIVATE KEY----- --MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBALBRqn21P/A/io66 --EJeFzMrfZnXEj+4mbaqYTrvZ1WcWAAKn2qo/BZwv6cGFd01OmR53S00AJZcGE97E --AUDzxpmUPXJUiDBC9NN7d6YuGVV5LbRulb6/mfTwXB4ZSi0O1jB55+KnLZZVl00q --Mk0KZBExdxXN5qxuRt+wYaFJ6OzRAgMBAAECgYB11e5iWvqjPmQEZRdnnJU0VD8u --n7ItT+Nk6qtb4gY8Abj6DWIW+01th5vqqJ8FvGyartFVYa69kuM+srG/zevAZWeu --fGZtwiwZR4DRSyRcPp4rnNiksK3dkAZA6UewmRDPv8uyHJlXc5i+Ft1ILJ5Q5jgn --UkC4z3EJP5Se9KZywQJBAOO4lRq42wLsYr2SDrQDSs4leie3FKc2bgvjF7Djosh1 --ZYbf55F5b9w1zgnccmni2HkqOnyFu4SKarmXyCsYxrkCQQDGNvnUh7/zZswrdWZ/ --PMp9zVDTh/5Oc2B4ByNLw1ERDwYhjchKgPRlQvn4cp3Pwf3UYPQ/8XGXzzEJey3A --r0rZAkBf/tDEOgcBPXsGZQrTscuYCU5sbY5ESvqrAilbhSp7DJom+D5bIfEYyIm5 --uHd20Yzlzvpmwc1huyPwZt6X5FLpAkATDReoGMAXSesXxjnqwtIHk2NQYYLM0YQV --JUJ8NrKk/Bevw+vbVVeoH+7ctU97t36JGiR/vNoZKD3jVmaIXZDJAkEA4wJbwzIo --L32mu9VmZa7wjmfkraQEmXTPaA5D9lNC0AwRTgkj+x2Qe1vawNblNK9PPLBDdplQ --L//53ADq/wv5rA== -------END PRIVATE KEY----- diff --git a/gnu/packages/php.scm b/gnu/packages/php.scm index 191dcafb4a..22cf674218 100644 --- a/gnu/packages/php.scm +++ b/gnu/packages/php.scm @@ -61,7 +61,7 @@ (define-public php (package (name "php") - (version "7.4.26") + (version "7.4.30") (home-page "https://secure.php.net/") (source (origin (method url-fetch) @@ -69,10 +69,8 @@ "php-" version ".tar.xz")) (sha256 (base32 - "1y0f1xgfi8cks6npdhrycg8r9g3q0pikqgf5h4xafpy8znmb61g3")) - (patches - (search-patches "php-bug-74093-test.patch" - "php-openssl_x509_checkpurpose_basic.patch")) + "03d7icwys4ikl45q3rgsxv1m3i7kfxhykpx75nn7jzn6697s6wpa")) + (patches (search-patches "php-bug-74093-test.patch")) (modules '((guix build utils))) (snippet '(with-directory-excursion "ext" -- cgit 1.4.1 From 7aab4eddd04e4b26986903680b28dce2de0f4db0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 23 Jul 2022 16:32:33 +0200 Subject: gnu: PHP: Fix test failure with newer cURL. * gnu/packages/patches/php-curl-compat.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/php.scm (php)[source](patches): Add it. --- gnu/local.mk | 3 ++- gnu/packages/patches/php-curl-compat.patch | 17 +++++++++++++++++ gnu/packages/php.scm | 3 ++- 3 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/php-curl-compat.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index 9dd87d2e88..0c4edf6e56 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1631,7 +1631,8 @@ dist_patch_DATA = \ %D%/packages/patches/perl-www-curl-fix-struct-void.patch \ %D%/packages/patches/perl-www-curl-remove-symbol.patch \ %D%/packages/patches/phoronix-test-suite-fsdg.patch \ - %D%/packages/patches/php-bug-74093-test.patch \ + %D%/packages/patches/php-bug-74093-test.patch \ + %D%/packages/patches/php-curl-compat.patch \ %D%/packages/patches/picard-fix-id3-rename-test.patch \ %D%/packages/patches/picprog-non-intel-support.patch \ %D%/packages/patches/pidgin-add-search-path.patch \ diff --git a/gnu/packages/patches/php-curl-compat.patch b/gnu/packages/patches/php-curl-compat.patch new file mode 100644 index 0000000000..0617251194 --- /dev/null +++ b/gnu/packages/patches/php-curl-compat.patch @@ -0,0 +1,17 @@ +Fix test result with cURL 7.83 and later. + +Taken from upstream: + + https://github.com/php/php-src/commit/a4179e4c92b6365d39e09cb9cd63c476848013af + +diff --git a/ext/curl/tests/curl_basic_007.phpt b/ext/curl/tests/curl_basic_007.phpt +index 3b53658d6a7e..3834e4674f82 100644 +--- a/ext/curl/tests/curl_basic_007.phpt ++++ b/ext/curl/tests/curl_basic_007.phpt +@@ -20,5 +20,5 @@ curl_close($ch); + + ?> + --EXPECTF-- +-string(%d) "No URL set!%w" ++string(%d) "No URL set%A" + int(3) diff --git a/gnu/packages/php.scm b/gnu/packages/php.scm index 22cf674218..fdea27160d 100644 --- a/gnu/packages/php.scm +++ b/gnu/packages/php.scm @@ -70,7 +70,8 @@ (sha256 (base32 "03d7icwys4ikl45q3rgsxv1m3i7kfxhykpx75nn7jzn6697s6wpa")) - (patches (search-patches "php-bug-74093-test.patch")) + (patches (search-patches "php-bug-74093-test.patch" + "php-curl-compat.patch")) (modules '((guix build utils))) (snippet '(with-directory-excursion "ext" -- cgit 1.4.1 From c3da692293a5ea592d54e86119d98bca0c71f370 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 23 Jul 2022 06:16:17 +0200 Subject: gnu: perl-file-mimeinfo: Update to 0.33. * gnu/packages/freedesktop.scm (perl-file-mimeinfo): Update to 0.33. --- gnu/packages/freedesktop.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 2f7589d6e2..cce71afa58 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -1920,7 +1920,7 @@ applications define in those files.") (define-public perl-file-mimeinfo (package (name "perl-file-mimeinfo") - (version "0.29") + (version "0.33") (source (origin (method url-fetch) @@ -1928,7 +1928,7 @@ applications define in those files.") "File-MimeInfo-" version ".tar.gz")) (sha256 (base32 - "1sh8r6vczyz08zm8vfsjmkg6a165wch54akjdrd1vbifcmwjg5pi")))) + "1i5iw6ri0w9clwpqf40xmsh4isc8xvx2lyf2r5g34886i6rsdgpn")))) (build-system perl-build-system) ;; If the tests are fixed, add perl-test-pod, perl-test-pod-coverage, and ;; perl-test-tiny as native-inputs. -- cgit 1.4.1 From 4625519f2c24fb56544ef7fe1737e3edd96127bb Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 23 Jul 2022 22:36:53 +0200 Subject: gnu: libmbim: Update to 1.26.4. * gnu/packages/freedesktop.scm (libmbim): Update to 1.26.4. --- gnu/packages/freedesktop.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index cce71afa58..e65ae4c926 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -1453,7 +1453,7 @@ these interfaces, based on the useradd, usermod and userdel commands.") (define-public libmbim (package (name "libmbim") - (version "1.20.2") + (version "1.26.4") (source (origin (method url-fetch) (uri (string-append @@ -1461,7 +1461,7 @@ these interfaces, based on the useradd, usermod and userdel commands.") "libmbim-" version ".tar.xz")) (sha256 (base32 - "16q550sy84izi5ic3sbbhjnnka2fwhj8vvdrirpn9xspbsgbc3sm")))) + "1ncaarl4lgc7i52rwz50yq701wk2rr478cjybxbifsjqqk2cx27n")))) (build-system gnu-build-system) (native-inputs (list `(,glib "bin") ; for glib-mkenums -- cgit 1.4.1 From 718f75a55a716944b03c84af8680db18fafb87d3 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 23 Jul 2022 22:37:48 +0200 Subject: gnu: libqmi: Update to 1.30.8. * gnu/packages/freedesktop.scm (libqmi): Update to 1.30.8. --- gnu/packages/freedesktop.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index e65ae4c926..11b4e81159 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -1483,7 +1483,7 @@ which speak the Mobile Interface Broadband Model (MBIM) protocol.") (define-public libqmi (package (name "libqmi") - (version "1.24.14") + (version "1.30.8") (source (origin (method url-fetch) (uri (string-append @@ -1491,7 +1491,7 @@ which speak the Mobile Interface Broadband Model (MBIM) protocol.") "libqmi-" version ".tar.xz")) (sha256 (base32 - "0zshxqbm9ldybgrzh7pjmwmfjvvvfd0xh8qhgl8xiqdb9ply73r0")))) + "140rmjw436rh6rqmnfw6yaflpffd27ilwcv4s9jvvl1skv784946")))) (build-system gnu-build-system) (inputs (list libgudev)) -- cgit 1.4.1 From 40992a1e02961e5f76f0cb4cfa0fce3b333d417f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 23 Jul 2022 22:44:35 +0200 Subject: gnu: modem-manager: Remove input labels. * gnu/packages/freedesktop.scm (modem-manager)[native-inputs]: Remove labels. --- gnu/packages/freedesktop.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 11b4e81159..0964ad104e 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -1527,13 +1527,13 @@ which speak the Qualcomm MSM Interface (QMI) protocol.") '(#:configure-flags `(,(string-append "--with-udev-base-dir=" %output "/lib/udev")))) (native-inputs - `(("glib:bin" ,glib "bin") ; for glib-mkenums - ("gobject-introspection" ,gobject-introspection) - ("intltool" ,intltool) - ("pkg-config" ,pkg-config) - ("vala" ,vala) - ;; For testing. - ("dbus" ,dbus))) + (list `(,glib "bin") ; for glib-mkenums + gobject-introspection + intltool + pkg-config + vala + ;; For testing. + dbus)) (propagated-inputs (list glib)) ; required by mm-glib.pc (inputs -- cgit 1.4.1 From 9ee4069eb0c3fafb326163d44a3b18a22b50aa67 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 23 Jul 2022 22:45:35 +0200 Subject: gnu: modem-manager: Use G-expression. * gnu/packages/freedesktop.scm (modem-manager)[arguments]: Use gexp. --- gnu/packages/freedesktop.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 0964ad104e..536a2dfffc 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -1524,8 +1524,9 @@ which speak the Qualcomm MSM Interface (QMI) protocol.") "1apq9camys2gaw6y6ic1ld20cncfwpmxnzvh4j5zkbbjpf5hbcxj")))) (build-system gnu-build-system) (arguments - '(#:configure-flags - `(,(string-append "--with-udev-base-dir=" %output "/lib/udev")))) + (list + #:configure-flags + #~(list (string-append "--with-udev-base-dir=" #$output "/lib/udev")))) (native-inputs (list `(,glib "bin") ; for glib-mkenums gobject-introspection -- cgit 1.4.1 From fdd40f391ca84f48d45b2790e694169ac209e8e3 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 23 Jul 2022 22:46:15 +0200 Subject: gnu: modem-manager: Remove obsolete input. * gnu/packages/freedesktop.scm (modem-manager)[native-inputs]: Remove INTLTOOL. Add GETTEXT-MINIMAL. --- gnu/packages/freedesktop.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 536a2dfffc..a48c472fe5 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -1528,9 +1528,9 @@ which speak the Qualcomm MSM Interface (QMI) protocol.") #:configure-flags #~(list (string-append "--with-udev-base-dir=" #$output "/lib/udev")))) (native-inputs - (list `(,glib "bin") ; for glib-mkenums + (list gettext-minimal + `(,glib "bin") ; for glib-mkenums gobject-introspection - intltool pkg-config vala ;; For testing. -- cgit 1.4.1 From 68aab436af9904abb8d296b0bd9ab9c8940f2a51 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 23 Jul 2022 22:43:48 +0200 Subject: gnu: modem-manager: Update to 1.18.10. * gnu/packages/freedesktop.scm (modem-manager): Update to 1.18.10. [native-inputs]: Add PYTHON, PYTHON-DBUS, and PYTHON-PYGOBJECT. --- gnu/packages/freedesktop.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index a48c472fe5..c0e8114c93 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -1513,7 +1513,7 @@ which speak the Qualcomm MSM Interface (QMI) protocol.") (define-public modem-manager (package (name "modem-manager") - (version "1.12.10") + (version "1.18.10") (source (origin (method url-fetch) (uri (string-append @@ -1521,7 +1521,7 @@ which speak the Qualcomm MSM Interface (QMI) protocol.") "ModemManager-" version ".tar.xz")) (sha256 (base32 - "1apq9camys2gaw6y6ic1ld20cncfwpmxnzvh4j5zkbbjpf5hbcxj")))) + "1sv53lvz9nfbq6jzprl5xhai0vylc01kglcdrgz2vszf5615y98n")))) (build-system gnu-build-system) (arguments (list @@ -1534,7 +1534,10 @@ which speak the Qualcomm MSM Interface (QMI) protocol.") pkg-config vala ;; For testing. - dbus)) + dbus + python + python-dbus + python-pygobject)) (propagated-inputs (list glib)) ; required by mm-glib.pc (inputs -- cgit 1.4.1 From c5a80784e2a08f676e2f49cbdab1f81db8d7dbb6 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Sun, 24 Jul 2022 08:59:07 +0200 Subject: gnu: Add ospm. * gnu/packages/lisp-xyz.scm (cl-ospm, ecl-ospm, sbcl-ospm): New variables. --- gnu/packages/lisp-xyz.scm | 51 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 2f6d22fe7d..c0df8b9c86 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -95,6 +95,7 @@ #:use-module (gnu packages mpi) #:use-module (gnu packages ncurses) #:use-module (gnu packages networking) + #:use-module (gnu packages package-management) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) @@ -22779,3 +22780,53 @@ binding @code{*debugger-hook*} is not enough -- most notably, for (arguments ;; Tests fail on ECL: https://github.com/phoe/trivial-custom-debugger/issues/3 '(#:tests? #f)))) + +(define-public sbcl-ospm + (package + (name "sbcl-ospm") + (version "0.0.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/atlas-engineer/ospm") + (commit version))) + (file-name (git-file-name "cl-ospm" version)) + (sha256 + (base32 "1b64ar6x08bcig4brlsim445favjf1zhyj6qz018cildp3xs4miz")))) + (build-system asdf-build-system/sbcl) + (inputs + (list sbcl-alexandria + sbcl-calispel + sbcl-hu.dwim.defclass-star + sbcl-local-time + sbcl-moptilities + sbcl-named-readtables + sbcl-serapeum + sbcl-trivia)) + (native-inputs + ;; FIXME: Tests have execution errors because of Guix being run in a container. + (list sbcl-lisp-unit2 guix)) + (home-page "https://github.com/atlas-engineer/ospm") + (synopsis "System package manager in Common Lisp") + (description + "This library is a universal interface to the operating system package manager. +It has extensive support for Guix, among others: + +@itemize +@item package listing and searching; +@item package installation and uninstallation; +@item package file listing; +@item profile listing; +@item manifest listing and installation; +@item generation listing, switching and deletion. +@end itemize\n") + (license license:bsd-3))) + +(define-public cl-ospm + (let ((pkg (sbcl-package->cl-source-package sbcl-ospm))) + (package + (inherit pkg) + (inputs + (cons (list "osicat" cl-osicat) + (package-inputs pkg)))))) -- cgit 1.4.1 From 5bc131ca7a686b1c1081372f447344b1d6c620b4 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Sun, 24 Jul 2022 11:32:29 +0200 Subject: gnu: Add ndebug. * gnu/packages/lisp-xyz.scm (cl-ndebug, ecl-ndebug, sbcl-ndebug): New variables. --- gnu/packages/lisp-xyz.scm | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index c0df8b9c86..51d74bd8af 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -22830,3 +22830,41 @@ It has extensive support for Guix, among others: (inputs (cons (list "osicat" cl-osicat) (package-inputs pkg)))))) + +(define-public sbcl-ndebug + (package + (name "sbcl-ndebug") + (version "0.1.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/atlas-engineer/ndebug") + (commit version))) + (file-name (git-file-name "ndebug" version)) + (sha256 + (base32 "0wdp0wqk6clq3hh9yqmgdm55x50b5m7ly9004j2c8k5zz1rgi4rr")))) + (build-system asdf-build-system/sbcl) + (inputs + (list + sbcl-dissect + sbcl-lparallel + sbcl-slime-swank + sbcl-trivial-custom-debugger)) + (native-inputs + (list sbcl-lisp-unit2)) + (home-page "https://github.com/atlas-engineer/ndebug/") + (synopsis "Toolkit to build UI-aware Common Lisp debugger hooks") + (description + "NDebug provides a small set of utilities to make graphical (or, rather +non-REPL-resident) Common Lisp applications easier to integrate with the +standard Lisp debugger (@code{*debugger-hook*}, namely) and +implementation-specific debugger hooks (via @code{trivial-custom-debugger}), +especially in a multi-threaded context.") + (license license:bsd-3))) + +(define-public cl-ndebug + (sbcl-package->cl-source-package sbcl-ndebug)) + +(define-public ecl-ndebug + (sbcl-package->ecl-package sbcl-ndebug)) -- cgit 1.4.1 From 0248d5fe15e35ba3c3311d0bfda1fe2d46c77abf Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 24 Jul 2022 15:13:09 +0300 Subject: gnu: python-userspacefs: Update to 2.0.5. * gnu/packages/python-xyz.scm (python-userspacefs): Update to 2.0.5. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 11f709f7b5..ac7c0d6066 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -22003,14 +22003,14 @@ package updates.") (define-public python-userspacefs (package (name "python-userspacefs") - (version "2.0.4") + (version "2.0.5") (source (origin (method url-fetch) (uri (pypi-uri "userspacefs" version)) (sha256 (base32 - "06f2gsiypas270nqfjir4wwjlpkjp097pm6zchc7k20ggg32gv1k")))) + "0v0qkdwfc61s2yiq7d7amin93x5biypfmi9pfhf8yj1rdpx5yvsx")))) (build-system python-build-system) (propagated-inputs (list python-fusepyng)) -- cgit 1.4.1 From 0e57c02ce51d662e1f6869f3758cad1d235e8ce7 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 24 Jul 2022 15:19:47 +0300 Subject: gnu: python-dropbox: Update to 11.33.0. * gnu/packages/file-systems.scm (python-dropbox): Update to 11.33.0. --- gnu/packages/file-systems.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm index a792bd8700..42cc8afffb 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -1478,13 +1478,13 @@ compatible directories.") (define-public python-dropbox (package (name "python-dropbox") - (version "11.25.0") + (version "11.33.0") (source (origin (method url-fetch) (uri (pypi-uri "dropbox" version)) (sha256 - (base32 "0vq9c2hp2amsxr2ys2mlgqp6a8hxmvrcwav70ri7wjzalfs32gj6")))) + (base32 "1hd9gprvcr6h0p8fxhynf97qf6799whfpsmr73g619392598nqvw")))) (build-system python-build-system) (arguments '(#:tests? #f)) ; Tests require a network connection. (native-inputs -- cgit 1.4.1 From a2011d73bc92ffc408d82d983e8b02a20f7a257f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 24 Jul 2022 15:12:21 +0300 Subject: gnu: dbxfs: Update to 1.0.63. * gnu/packages/file-systems.scm (dbxfs): Update to 1.0.63. * gnu/packages/patches/dbxfs-remove-sentry-sdk.patch: Update patch. --- gnu/packages/file-systems.scm | 4 +- gnu/packages/patches/dbxfs-remove-sentry-sdk.patch | 63 ++++++++++++++-------- 2 files changed, 42 insertions(+), 25 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm index 42cc8afffb..c6063c42c4 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -1500,7 +1500,7 @@ Dropbox API v2.") (define-public dbxfs (package (name "dbxfs") - (version "1.0.51") + (version "1.0.63") (source (origin ;; Release tarball contains files not in git repository. @@ -1511,7 +1511,7 @@ Dropbox API v2.") (file-name (git-file-name name version)) (sha256 (base32 - "0bidb1gg5lqa1561f20qnj7gy323q65qwzfrb8h8gs6dsl3g6yfg")) + "1vzfhw3z2r0rb6s0qdzirh3pl7rv1z8xmxa0z5h7h1wqhpl05ai7")) (patches (search-patches "dbxfs-remove-sentry-sdk.patch")))) (build-system python-build-system) (arguments diff --git a/gnu/packages/patches/dbxfs-remove-sentry-sdk.patch b/gnu/packages/patches/dbxfs-remove-sentry-sdk.patch index e4f660000d..6f7ba53542 100644 --- a/gnu/packages/patches/dbxfs-remove-sentry-sdk.patch +++ b/gnu/packages/patches/dbxfs-remove-sentry-sdk.patch @@ -1,38 +1,48 @@ sentry-sdk provides a link to sentry.io, a service which monitors applications deployed in the wild. Defaults to true. Best to just remove the option. ---- - dbxfs/main.py | 16 ---------------- - setup.py | 1 - - 2 files changed, 17 deletions(-) - diff --git a/dbxfs/main.py b/dbxfs/main.py -index 5a6cea1..5d00818 100755 +index 458e82a..784dd2a 100755 --- a/dbxfs/main.py +++ b/dbxfs/main.py -@@ -40,8 +40,6 @@ import userspacefs +@@ -43,8 +43,6 @@ import userspacefs import keyring from keyring.errors import KeyringError -import sentry_sdk - - from block_tracing import block_tracing, BLOCK_TRACING_INHERITS + from block_tracing import block_tracing from dbxfs.dbxfs import FileSystem as DropboxFileSystem -@@ -299,12 +297,6 @@ def _main(argv=None): - config['keyring_user'] = keyring_user - save_config = True +@@ -127,16 +125,6 @@ def on_new_process(proc_args): + level = [logging.WARNING, logging.INFO, logging.DEBUG][min(2, verbose)] + logging.basicConfig(level=level, handlers=[logging_stream], format=format_) -- if not config.get("asked_send_error_reports", False): -- if yes_no_input("Would you like to help us improve %s by providing anonymous error reports?" % (APP_NAME,), default_yes=True): -- config['send_error_reports'] = True -- config['asked_send_error_reports'] = True +- if int(proc_args.get('send_error_reports', '0')): +- version = proc_args['version'] +- try: +- sentry_sdk.init("https://b4b13ebd300849bd92260507a594e618@sentry.io/1293235", +- release='%s@%s' % (APP_NAME, version), +- with_locals=False) +- sentry_sdk.set_user(dict(id=proc_args['sentry_user'])) +- except Exception: +- log.warning("Failed to initialize sentry", exc_info=True) +- + def create_fs(fs_args): + refresh_token = fs_args.get('refresh_token') + access_token = fs_args.get('access_token') +@@ -527,10 +515,6 @@ deprecated, this functionality will be removed in the future. + config['asked_send_error_reports'] = True + save_config = True + +- if config.get("send_error_reports", False) and not isinstance(config.get("sentry_user", None), str): +- config['sentry_user'] = uuid.uuid4().hex - save_config = True - - if save_access_token and yes_no_input("Do you want \"%s\" to be the default mount point?" % (mount_point,), default_yes=True): + if save_refresh_token and yes_no_input("Do you want \"%s\" to be the default mount point?" % (mount_point,), default_yes=True): config['mount_point'] = mount_point save_config = True -@@ -315,14 +307,6 @@ def _main(argv=None): +@@ -541,15 +525,6 @@ deprecated, this functionality will be removed in the future. log.info("Starting %s...", APP_NAME) @@ -41,24 +51,31 @@ index 5a6cea1..5d00818 100755 - sentry_sdk.init("https://b4b13ebd300849bd92260507a594e618@sentry.io/1293235", - release='%s@%s' % (APP_NAME, version), - with_locals=False) +- sentry_sdk.set_user(dict(id=config['sentry_user'])) - except Exception: - log.warning("Failed to initialize sentry", exc_info=True) - if cache_folder is None: cache_folder = os.path.join(appdirs.user_cache_dir(APP_NAME), "file_cache") try: +@@ -602,8 +577,6 @@ deprecated, this functionality will be removed in the future. + proc_args['verbose'] = str(args.verbose) + proc_args['version'] = version + proc_args['send_error_reports'] = str(int(config.get('send_error_reports', False))) +- if config.get('send_error_reports', False): +- proc_args['sentry_user'] = config['sentry_user'] + + return userspacefs.simple_main(mount_point, display_name, + ('dbxfs.main.create_fs', fs_args), diff --git a/setup.py b/setup.py -index 89e25c6..f940d47 100644 +index ae696e9..869d0db 100644 --- a/setup.py +++ b/setup.py -@@ -43,7 +43,6 @@ setup( +@@ -47,7 +47,6 @@ setup( "privy>=6.0,<7", "keyring>=15.1.0", "keyrings.alt>=3.1,<5", -- "sentry_sdk>=0.3,<1", +- "sentry_sdk>=1.0,<2", ], extras_require={ 'safefs': ["safefs"], --- -2.28.0 - -- cgit 1.4.1 From 212ca81895b2baa819ea11a308ad21880b84a546 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 24 Jul 2022 02:00:04 +0200 Subject: gnu: python-fontpens: Remove failing docstring assertion. * gnu/packages/fontutils.scm (python-fontpens)[arguments]: Add a new 'drop-flaky-docstring phase. --- gnu/packages/fontutils.scm | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index 44b050795d..ce4709773d 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2017 Rene Saavedra ;;; Copyright © 2017 Leo Famulari ;;; Copyright © 2017 Nikita -;;; Copyright © 2017, 2018, 2020, 2021 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2018, 2020–2022 Tobias Geerinckx-Rice ;;; Copyright © 2018 Ricardo Wurmus ;;; Copyright © 2018, 2019, 2020, 2021 Ludovic Courtès ;;; Copyright © 2019, 2020 Marius Bakke @@ -460,7 +460,18 @@ implementing the pen protocol for manipulating glyphs.") (arguments (substitute-keyword-arguments (package-arguments python-fontpens-bootstrap) ((#:tests? _ #f) - #t))) + #t) + ((#:phases phases #~%standard-phases) + #~(modify-phases #$phases + (add-after 'unpack 'drop-flaky-docstring + ;; XXX This assertion fails on certain (Intel?) machines, but not + ;; others (AMD?), so we can't patch in a ‘correct’ value. Just + ;; drop it until the proper fix lands upstream. Reported there + ;; as . + (lambda _ + (substitute* "Lib/fontPens/penTools.py" + ((".*\\(\\(0, 0), \\(50, 20), \\(100, 40)).*") "") + ((".*107\\.70329614269009.*") "")))))))) (native-inputs (modify-inputs (package-native-inputs python-fontpens-bootstrap) (append python-fontparts-bootstrap -- cgit 1.4.1 From e78bb31aa14a29ddda35a5b4aa28e3633154bd03 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 25 Jul 2022 10:05:53 -0400 Subject: gnu: emacs-robot-log: Update to 0.1.4. * gnu/packages/emacs-xyz.scm (emacs-robot-log): Update to 0.1.4. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 312cb58b28..702378c206 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -5758,7 +5758,7 @@ keywords and smart indentation.") (define-public emacs-robot-log (package (name "emacs-robot-log") - (version "0.1.3") + (version "0.1.4") (source (origin (method git-fetch) (uri (git-reference @@ -5767,7 +5767,7 @@ keywords and smart indentation.") (file-name (git-file-name name version)) (sha256 (base32 - "0pv0kljx2n2n7ql6rfw1x63mbd1k2qwbq3zkw452lb8jmnp7dr3y")))) + "1l9yxryrhvylh2x17cczd8v8978w1nv8173d4l9hv0cr26kp5b68")))) (build-system emacs-build-system) (native-inputs (list python-robotframework)) (arguments (list #:tests? #t)) -- cgit 1.4.1 From f55e83fa3dd249591551fa4dfe367c8e5204da03 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Tue, 26 Jul 2022 00:41:32 +0530 Subject: gnu: phockup: Make exiftool substitution more specific. * gnu/packages/image.scm (phockup)[arguments]: Make exiftool substitution in configure phase more specific. --- gnu/packages/image.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index d52d57b3b1..f2bcf13d0f 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -11,7 +11,7 @@ ;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021, 2022 Efraim Flashner ;;; Copyright © 2016–2022 Tobias Geerinckx-Rice ;;; Copyright © 2016 Eric Bavier -;;; Copyright © 2016, 2017, 2020, 2021 Arun Isaac +;;; Copyright © 2016, 2017, 2020, 2021, 2022 Arun Isaac ;;; Copyright © 2016, 2017 Kei Kebreau ;;; Copyright © 2017 Nikita ;;; Copyright © 2017,2019,2020 Hartmut Goebel @@ -2402,8 +2402,8 @@ Wacom-style graphics tablets.") (add-after 'unpack 'configure (lambda* (#:key inputs #:allow-other-keys) (substitute* (list "src/dependency.py" "src/exif.py") - (("exiftool") - (search-input-file inputs "/bin/exiftool"))))) + (("'exiftool'") + (string-append "'" (search-input-file inputs "/bin/exiftool") "'"))))) (add-before 'install 'check (lambda _ (invoke "pytest"))) -- cgit 1.4.1 From 14dbb549f8da2810d82740679cbe9e0b16bc9bf3 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Tue, 26 Jul 2022 00:43:05 +0530 Subject: gnu: phockup: Add bash-minimal to inputs. * gnu/packages/image.scm (phockup)[inputs]: Add bash-minimal. --- gnu/packages/image.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index f2bcf13d0f..7951c952eb 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -55,6 +55,7 @@ #:use-module (gnu packages assembly) #:use-module (gnu packages autotools) #:use-module (gnu packages base) + #:use-module (gnu packages bash) #:use-module (gnu packages boost) #:use-module (gnu packages check) #:use-module (gnu packages cmake) @@ -2421,7 +2422,7 @@ Wacom-style graphics tablets.") ,(search-path-as-string->list (getenv "GUIX_PYTHONPATH")))))))))) (inputs - (list perl-image-exiftool python python-tqdm)) + (list bash-minimal perl-image-exiftool python python-tqdm)) (native-inputs (list python-pytest python-pytest-mock)) (home-page "https://github.com/ivandokov/phockup") -- cgit 1.4.1 From dbcd7876566840f31b763e28bb74394f0914b397 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Tue, 26 Jul 2022 00:46:25 +0530 Subject: gnu: phockup: Update to 1.9.0. * gnu/packages/image.scm (phockup): Update to 1.9.0. --- gnu/packages/image.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 7951c952eb..7afe96d149 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -2383,7 +2383,7 @@ Wacom-style graphics tablets.") (define-public phockup (package (name "phockup") - (version "1.7.1") + (version "1.9.0") (source (origin (method git-fetch) @@ -2393,7 +2393,7 @@ Wacom-style graphics tablets.") (file-name (git-file-name name version)) (sha256 (base32 - "0nqd89g4ppwc96gxyh9npain7ipnzj66p6n3irsvhrpi4k54h388")))) + "1xs2h3nj19wsfffl87akinx14drk5nn2svjwyj0csv10apk0q4pp")))) (build-system copy-build-system) (arguments `(#:install-plan '(("src" "share/phockup/") -- cgit 1.4.1 From 67375109122e5f15ad1b1551466be3da207a5725 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Tue, 26 Jul 2022 17:32:32 +0530 Subject: gnu: openfortivpn: Update to 1.17.3. * gnu/packages/vpn.scm (openfortivpn): Update to 1.17.3. --- gnu/packages/vpn.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index af6be7257d..d2c7882d52 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -22,6 +22,7 @@ ;;; Copyright © 2022 Lu hui ;;; Copyright © 2022 Maxim Cournoyer ;;; Copyright © 2022 Jean-Pierre De Jesus DIAZ +;;; Copyright © 2022 Arun Isaac ;;; ;;; This file is part of GNU Guix. ;;; @@ -769,7 +770,7 @@ and probably others.") (define-public openfortivpn (package (name "openfortivpn") - (version "1.15.0") + (version "1.17.3") (source (origin (method git-fetch) (uri (git-reference @@ -778,7 +779,7 @@ and probably others.") (file-name (git-file-name name version)) (sha256 (base32 - "1qsfgpxg553s8rc9cyrc4k96z0pislxsdxb9wyhp8fdprkak2mw2")))) + "0an58f0qcyxdx3d5zb5m8vi45a0251b950b5lh16572n8z2g6s2l")))) (build-system gnu-build-system) (native-inputs (list autoconf automake pkg-config)) -- cgit 1.4.1 From 08e64ee6a9b6d58d733dff031453d5bf78c087cd Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Tue, 26 Jul 2022 18:33:08 +0530 Subject: gnu: openconnect: Update to 9.01. * gnu/packages/vpn.scm (openconnect): Update to 9.01. --- gnu/packages/vpn.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index d2c7882d52..3ab7dc6be9 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -677,13 +677,13 @@ the user specifically asks to proxy, so the @dfn{VPN} interface no longer (define-public openconnect (package (name "openconnect") - (version "8.10") + (version "9.01") (source (origin (method url-fetch) (uri (string-append "ftp://ftp.infradead.org/pub/openconnect/" "openconnect-" version ".tar.gz")) (sha256 - (base32 "1cdsx4nsrwawbsisfkldfc9i4qn60g03vxb13nzppr2br9p4rrih")))) + (base32 "1iz4j00031a5ircrx30lkiwf58yl9kc827m4ssck4yg963wgmmxk")))) (build-system gnu-build-system) (propagated-inputs (list libxml2 gnutls zlib)) -- cgit 1.4.1 From 76d34d1e08d36cda193f237ab86f38d6890b44a2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 24 Jul 2022 02:00:06 +0200 Subject: gnu: linux-libre@5.18: Update to 5.18.14. * gnu/packages/linux.scm (linux-libre-5.18-version): Update to 5.18.14. (linux-libre-5.18-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 0c40b00912..33f8522dd9 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -352,7 +352,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;; The current "stable" kernels. That is, the most recently released major ;; versions that are still supported upstream. -(define-public linux-libre-5.18-version "5.18.12") +(define-public linux-libre-5.18-version "5.18.14") (define-public linux-libre-5.18-gnu-revision "gnu") (define deblob-scripts-5.18 (linux-libre-deblob-scripts @@ -362,7 +362,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "0vjpn8iw9yg39sr6jfhzyvivf159h9zfgnjamwa283zfll0h0a53"))) (define-public linux-libre-5.18-pristine-source (let ((version linux-libre-5.18-version) - (hash (base32 "09wmgfrnv1df6jg9v3svwhvnxl0j6h4f240p903xlmgj884lvds0"))) + (hash (base32 "1bsnk2rskdkimciij5q3hjs00lc7ks1h1qh9kc4s7lrk252lczg1"))) (make-linux-libre-source version (%upstream-linux-source version hash) -- cgit 1.4.1 From 65a38722531aab19c1d0fe45df1e7cc09c4bf281 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 24 Jul 2022 02:00:09 +0200 Subject: gnu: linux-libre@5.10: Update to 5.10.132. * gnu/packages/linux.scm (linux-libre-5.10-version): Update to 5.10.132. (linux-libre-5.10-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 33f8522dd9..b02d9afb1c 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -386,7 +386,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.15))) -(define-public linux-libre-5.10-version "5.10.131") +(define-public linux-libre-5.10-version "5.10.132") (define-public linux-libre-5.10-gnu-revision "gnu1") (define deblob-scripts-5.10 (linux-libre-deblob-scripts @@ -396,7 +396,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1981axxswghza3iadp94q54y8w30h9w9vyq4cbjiiv9alvbv0pb8"))) (define-public linux-libre-5.10-pristine-source (let ((version linux-libre-5.10-version) - (hash (base32 "1ki11mvl3dky7iih90znr47vr66dxnlwrqwg2jkk1hqn5i243i4b"))) + (hash (base32 "0aps3kglzw480ps9agw1k3zn8ipibwkrx13kzijfl7g0xqqsj1bx"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.10))) -- cgit 1.4.1 From ef567e0fe5d99a927baa54b9ef8bb721072db2ac Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 24 Jul 2022 02:00:08 +0200 Subject: gnu: linux-libre@4.9: Update to 4.9.324. * gnu/packages/linux.scm (linux-libre-4.9-version): Update to 4.9.324. (linux-libre-4.9-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index b02d9afb1c..ad418e26f7 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -446,7 +446,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.14))) -(define-public linux-libre-4.9-version "4.9.323") +(define-public linux-libre-4.9-version "4.9.324") (define-public linux-libre-4.9-gnu-revision "gnu1") (define deblob-scripts-4.9 (linux-libre-deblob-scripts @@ -456,7 +456,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "0bib3641dbcqdkx3anna3caxnsg3nw9cnmhcklq0s93g3m57041h"))) (define-public linux-libre-4.9-pristine-source (let ((version linux-libre-4.9-version) - (hash (base32 "1h96ai9w5q2axhliw85aymdsg8py9y6gl8big5r2gwkbls6h7pa3"))) + (hash (base32 "0g51vfp0g3py82l3q66p7nvl03h6l1nlny18gangji75a3c39yh4"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.9))) -- cgit 1.4.1 From 827dca851058ace1f1ec0da4d58fa05d4ecd6cfd Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 24 Jul 2022 02:00:10 +0200 Subject: gnu: linux-libre@4.19: Update to 4.19.253. * gnu/packages/linux.scm (linux-libre-4.19-version): Update to 4.19.253. (linux-libre-4.19-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index ad418e26f7..2791177f89 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -416,7 +416,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.4))) -(define-public linux-libre-4.19-version "4.19.252") +(define-public linux-libre-4.19-version "4.19.253") (define-public linux-libre-4.19-gnu-revision "gnu1") (define deblob-scripts-4.19 (linux-libre-deblob-scripts @@ -426,7 +426,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "00i91lx938nqlgy63hiricqd0fnbbf26vgya9c5lb7m1f4x324im"))) (define-public linux-libre-4.19-pristine-source (let ((version linux-libre-4.19-version) - (hash (base32 "0ac7k6x9h8gqi37n8d4fyi52h4cmzyy8f5vfv1aiihww4kvzca7v"))) + (hash (base32 "1jc2j0wskgr1bdzpz6sn2bvafpviiin6mwr93yykcczzfjijr8yz"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.19))) -- cgit 1.4.1 From 4d1ce332f41277a3289784dca3d8426b5bea292c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 24 Jul 2022 02:00:10 +0200 Subject: gnu: linux-libre@4.14: Update to 4.14.289. * gnu/packages/linux.scm (linux-libre-4.14-version): Update to 4.14.289. (linux-libre-4.14-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 2791177f89..ac8f152877 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -431,7 +431,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.19))) -(define-public linux-libre-4.14-version "4.14.288") +(define-public linux-libre-4.14-version "4.14.289") (define-public linux-libre-4.14-gnu-revision "gnu1") (define deblob-scripts-4.14 (linux-libre-deblob-scripts @@ -441,7 +441,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "00i91lx938nqlgy63hiricqd0fnbbf26vgya9c5lb7m1f4x324im"))) (define-public linux-libre-4.14-pristine-source (let ((version linux-libre-4.14-version) - (hash (base32 "0yyzxyz66mfngx3ll3pl43413xb67iyxddzh3lpzqcfg7d0rxfwz"))) + (hash (base32 "1v24mv49skgijcbafgai0glrzwiv2j1hndkz7v6ygc18jxh5fqg6"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.14))) -- cgit 1.4.1 From 3487aa4f243cdc4dfb31c9e4f4a89bf5244458b8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 24 Jul 2022 02:00:03 +0200 Subject: gnu: linux-libre@5.15: Update to 5.15.57. * gnu/packages/linux.scm (linux-libre-5.15-version): Update to 5.15.57. (linux-libre-5.15-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index ac8f152877..d0d9c678d2 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -371,7 +371,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;; The "longterm" kernels — the older releases with long-term upstream support. ;; Here are the support timelines: ;; -(define-public linux-libre-5.15-version "5.15.55") +(define-public linux-libre-5.15-version "5.15.57") (define-public linux-libre-5.15-gnu-revision "gnu") (define deblob-scripts-5.15 (linux-libre-deblob-scripts @@ -381,7 +381,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "129qlhwdv2mfb85gbvq03kkbdfp73b444rryr4rrbvi0jmq4cp24"))) (define-public linux-libre-5.15-pristine-source (let ((version linux-libre-5.15-version) - (hash (base32 "1k7x7fp675wglfd357n7hjidnm3j8zj3gcymyazg6fkcid8bvxhy"))) + (hash (base32 "1zgh43pgn8fsyxzksfw6llxqw6fc8qassfn9a18k2xn83xd0kqv2"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.15))) -- cgit 1.4.1 From eafdd4f2c4f7f993b0491b1045cc7fe53f2f18a5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 24 Jul 2022 02:00:01 +0200 Subject: gnu: linux-libre@5.4: Update to 5.4.207. * gnu/packages/linux.scm (linux-libre-5.4-version): Update to 5.4.207. (linux-libre-5.4-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index d0d9c678d2..b2a17036d8 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -401,7 +401,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.10))) -(define-public linux-libre-5.4-version "5.4.206") +(define-public linux-libre-5.4-version "5.4.207") (define-public linux-libre-5.4-gnu-revision "gnu1") (define deblob-scripts-5.4 (linux-libre-deblob-scripts @@ -411,7 +411,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1vnjbdyssa7dwyjl9kg35alwvf7yh597cl74yr1wy2gk5bc9paw6"))) (define-public linux-libre-5.4-pristine-source (let ((version linux-libre-5.4-version) - (hash (base32 "1asvc7y1f938icspxx39n6y6r0w9mp0k9vik84rsx1hzzv0db41c"))) + (hash (base32 "1wwpd26qhv6i00p0yxjisns6qiz9bfrxvn1xb4ylwr8ls7zyx78v"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.4))) -- cgit 1.4.1 From ce480594aaf60daf5e801eacb6e7ff8862245460 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 26 Jul 2022 20:48:28 +0300 Subject: gnu: gnuastro: Update to 0.18. * gnu/packages/astronomy.scm (gnuastro): Update to 0.18. --- gnu/packages/astronomy.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 498252aaf4..e84eb188ff 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -426,7 +426,7 @@ astronomical image-processing packages like Drizzle, Swarp or SExtractor.") (define-public gnuastro (package (name "gnuastro") - (version "0.17") + (version "0.18") (source (origin (method url-fetch) @@ -434,7 +434,7 @@ astronomical image-processing packages like Drizzle, Swarp or SExtractor.") version ".tar.lz")) (sha256 (base32 - "1gq37axs9l556pxxmnh47h088gbmp7sk3xjg59qzk2bsycg3dkgh")))) + "1y9ig2kkwiwl0rmp9ip9n83fyjjpg2cc2pxzvdzr8rysq5az357y")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--disable-static"))) -- cgit 1.4.1 From ecc9886180c52103ce235775d17549157a35ee43 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 26 Jul 2022 20:48:28 +0300 Subject: gnu: datamash: Update to 1.8. * gnu/packages/datamash.scm (datamash): Update to 1.8. --- gnu/packages/datamash.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/datamash.scm b/gnu/packages/datamash.scm index 4ce1dbda7d..ac5094935a 100644 --- a/gnu/packages/datamash.scm +++ b/gnu/packages/datamash.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014, 2018 Eric Bavier -;;; Copyright © 2016, 2017, 2018, 2019, 2020 Efraim Flashner +;;; Copyright © 2016-2020, 2022 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -35,7 +35,7 @@ (define-public datamash (package (name "datamash") - (version "1.7") + (version "1.8") (source (origin (method url-fetch) @@ -43,7 +43,7 @@ version ".tar.gz")) (sha256 (base32 - "1cxdlhgz3wzjqlq8bgwad93fgqymk2abbldfzw1ffnhcp4mmjjjp")))) + "1zgn55gvf60w2rs5f7vx7vdp50j89ki7mmjvm81xs5pngs67xnbs")))) (native-inputs (list which ;for tests perl)) ;for help2man -- cgit 1.4.1 From 80961ca44c08dd38b9100a54501f71fe693c6171 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 26 Jul 2022 21:07:41 +0300 Subject: gnu: poke: Update to 2.4. * gnu/packages/engineering.scm (poke): Update to 2.4. --- gnu/packages/engineering.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 6eefd14d7e..bf32187dde 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -2791,13 +2791,13 @@ program that can perform mesh processing tasks in batch mode, without a GUI.") (define-public poke (package (name "poke") - (version "2.3") + (version "2.4") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/poke/poke-" version ".tar.gz")) (sha256 - (base32 "0rn7ph7fvbwasf7jhai122sniqjkw81p0kvbxjlv6z6s2q8wz41n")) + (base32 "0ivfzslpdy0n9wcdjyascnqczppaxcq0x4x6hblqqwy62xcjh7l4")) (modules '((guix build utils))) (snippet '(begin -- cgit 1.4.1 From 57ee9b069d3680dcaf4140d01b35ecf98fc6047a Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Mon, 25 Jul 2022 15:08:56 -0400 Subject: gnu: icecat: Update to 91.12.0-guix0-preview1 [security fixes]. Includes fixes for CVE-2022-36318 and CVE-2022-36319. * gnu/packages/gnuzilla.scm (%icecat-version, %icecat-build-id): Update. (icecat-source): Update gnuzilla commit, base version, and hashes. --- gnu/packages/gnuzilla.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 7d8c531de3..013e834d13 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -371,8 +371,8 @@ in C/C++.") ;; XXXX: Workaround 'snippet' limitations. (define computed-origin-method (@@ (guix packages) computed-origin-method)) -(define %icecat-version "91.11.0-guix0-preview1") -(define %icecat-build-id "20220628000000") ;must be of the form YYYYMMDDhhmmss +(define %icecat-version "91.12.0-guix0-preview1") +(define %icecat-build-id "20220726000000") ;must be of the form YYYYMMDDhhmmss ;; 'icecat-source' is a "computed" origin that generates an IceCat tarball ;; from the corresponding upstream Firefox ESR tarball, using the 'makeicecat' @@ -394,11 +394,11 @@ in C/C++.") "firefox-" upstream-firefox-version ".source.tar.xz")) (sha256 (base32 - "1905595fsydd8q4bqxsp5gb4h9s47qjj90wjrqv4ky8yxs9bx6z5")))) + "0p1bhc1qla4a7iqk0fc6sj224ld6wplpmj4yw6nfx1b8hbqqy2vc")))) - (upstream-icecat-base-version "91.11.0") ; maybe older than base-version + (upstream-icecat-base-version "91.12.0") ; maybe older than base-version ;;(gnuzilla-commit (string-append "v" upstream-icecat-base-version)) - (gnuzilla-commit "65a61287a5142a9403ec00d973cb5e5d658a3c71") + (gnuzilla-commit "298024d727053a1609df4003fb4438836d5181f4") (gnuzilla-source (origin (method git-fetch) @@ -410,7 +410,7 @@ in C/C++.") (string-take gnuzilla-commit 8))) (sha256 (base32 - "02mg7vg0bv5lxkdg86z18mf43rx7sh5i2w69lnirr8zqcrr5yd48")))) + "1lgz6knklxbrqr1vaj9d0y0997f4f6v44a8cng8ihkmn7aa7lvwg")))) ;; 'search-patch' returns either a valid file name or #f, so wrap it ;; in 'assume-valid-file-name' to avoid 'local-file' warnings. -- cgit 1.4.1 From 588e63ee94067a437d748d793af504ae377b1740 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 24 Jul 2022 02:00:02 +0200 Subject: gnu: linux-libre@5.10: Update to 5.10.133. * gnu/packages/linux.scm (linux-libre-5.10-version): Update to 5.10.133. (linux-libre-5.10-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index b2a17036d8..81a7f99693 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -386,7 +386,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.15))) -(define-public linux-libre-5.10-version "5.10.132") +(define-public linux-libre-5.10-version "5.10.133") (define-public linux-libre-5.10-gnu-revision "gnu1") (define deblob-scripts-5.10 (linux-libre-deblob-scripts @@ -396,7 +396,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1981axxswghza3iadp94q54y8w30h9w9vyq4cbjiiv9alvbv0pb8"))) (define-public linux-libre-5.10-pristine-source (let ((version linux-libre-5.10-version) - (hash (base32 "0aps3kglzw480ps9agw1k3zn8ipibwkrx13kzijfl7g0xqqsj1bx"))) + (hash (base32 "03i84g3pfh24f10zsdyyqyv9fhy01ah9lk02y48hqwnabdylqp1v"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.10))) -- cgit 1.4.1 From a7068d3e972732a244695c0a418690513bbb7e12 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 24 Jul 2022 02:00:02 +0200 Subject: gnu: qdirstat: Update to 1.8.1. * gnu/packages/disk.scm (qdirstat): Update to 1.8.1. --- gnu/packages/disk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index 47b15e588f..90035f7255 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -1401,7 +1401,7 @@ wrapper for disk usage querying and visualisation.") (define-public qdirstat (package (name "qdirstat") - (version "1.8") + (version "1.8.1") (source (origin (method git-fetch) (uri (git-reference @@ -1410,7 +1410,7 @@ wrapper for disk usage querying and visualisation.") (file-name (git-file-name name version)) (sha256 (base32 - "079rmy3j0442y5gjh6la6w1j6jaw83wklamrf19yxi20zsm99xs7")))) + "04vpdlwk01kgmc4r5rnrmrgd4sf2kfh1rjzb2rjkfxdd4pbghsy9")))) (arguments `(#:phases (modify-phases %standard-phases -- cgit 1.4.1 From 47248f526f98c77c62eb8d18990edc00a9dba7d7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 24 Jul 2022 02:00:01 +0200 Subject: gnu: gnome-commander: Update to 1.14.3. * gnu/packages/gnome.scm (gnome-commander): Update to 1.14.3. --- gnu/packages/gnome.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 96ec260dec..55fbe583ef 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -21,7 +21,7 @@ ;;; Copyright © 2016 Alex Griffin ;;; Copyright © 2016, 2017 Nikita ;;; Copyright © 2016 David Craven -;;; Copyright © 2016–2021 Tobias Geerinckx-Rice +;;; Copyright © 2016–2022 Tobias Geerinckx-Rice ;;; Copyright © 2017 Thomas Danckaert ;;; Copyright © 2017 Hartmut Goebel ;;; Copyright © 2017, 2018 nee @@ -1846,7 +1846,7 @@ either on a local, or remote machine via a number of methods.") (define-public gnome-commander (package (name "gnome-commander") - (version "1.14.2") + (version "1.14.3") (source (origin (method url-fetch) @@ -1854,7 +1854,7 @@ either on a local, or remote machine via a number of methods.") (version-major+minor version) "/" "gnome-commander-" version ".tar.xz")) (sha256 - (base32 "1s8fdwp0z1smzkwrsvssp9g3yak6z4cdk0qx0c4qmwca9z9fyy0k")))) + (base32 "0yzx9slg632iflw9p96nlh9i50dhacq7hrzpkj8b48mr1zkxrn3q")))) (build-system glib-or-gtk-build-system) (native-inputs (list desktop-file-utils -- cgit 1.4.1 From 237a7f6bbc9390ff88ba983208c9916eb61c34e3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 24 Jul 2022 02:00:02 +0200 Subject: gnu: libmtp: Update to 1.1.20. * gnu/packages/libusb.scm (libmtp): Update to 1.1.20. --- gnu/packages/libusb.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/libusb.scm b/gnu/packages/libusb.scm index 45cc2cda0d..26eb296c21 100644 --- a/gnu/packages/libusb.scm +++ b/gnu/packages/libusb.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2016 Efraim Flashner ;;; Copyright © 2016 Theodoros Foradis ;;; Copyright © 2017 Jonathan Brielmaier -;;; Copyright © 2018, 2020, 2021 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2020–2022 Tobias Geerinckx-Rice ;;; Copyright © 2018 Vagrant Cascadian ;;; Copyright © 2020 Marius Bakke ;;; Copyright © 2020 Christopher Howard @@ -471,14 +471,14 @@ over USB.") (define-public libmtp (package (name "libmtp") - (version "1.1.19") + (version "1.1.20") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/libmtp/libmtp/" version "/libmtp-" version ".tar.gz")) (sha256 (base32 - "0a1jlf5b2c2vylkvdd3cxjs20a96jlbrdyx7rwai5rzmcdpszd6y")))) + "1l2npk3b5v9cxhs2g01w3b13mxvin881cr085r0cyi2p5yn1s6f9")))) (build-system gnu-build-system) (native-inputs (list pkg-config)) -- cgit 1.4.1 From 555d53d486c58aa79d6ef0fd90e66a2d7d46595c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 24 Jul 2022 02:00:03 +0200 Subject: gnu: libmtp: Use G-expressions. * gnu/packages/libusb.scm (libmtp)[arguments]: Rewrite as G-expressions. --- gnu/packages/libusb.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/libusb.scm b/gnu/packages/libusb.scm index 26eb296c21..8a5967f7b4 100644 --- a/gnu/packages/libusb.scm +++ b/gnu/packages/libusb.scm @@ -28,6 +28,7 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages libusb) + #:use-module (guix gexp) #:use-module (gnu packages) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) @@ -488,11 +489,9 @@ over USB.") ;; libmtp.pc refers to all these. (list libusb)) (arguments - `(#:configure-flags - (list "--disable-static" - (string-append "--with-udev=" - (assoc-ref %outputs "out") - "/lib/udev")))) + (list #:configure-flags + #~(list "--disable-static" + (string-append "--with-udev=" #$output "/lib/udev")))) (home-page "http://libmtp.sourceforge.net/") (synopsis "Library implementing the Media Transfer Protocol") (description "Libmtp implements an MTP (Media Transfer Protocol) -- cgit 1.4.1 From ac65e3029bba3507844d69cc0e302705cdf7addf Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 24 Jul 2022 02:00:10 +0200 Subject: gnu: axc: Update to 0.3.7. * gnu/packages/messaging.scm (axc): Update to 0.3.7. --- gnu/packages/messaging.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index b68a798715..a593310e36 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -583,7 +583,7 @@ end-to-end encryption.") (define-public axc (package (name "axc") - (version "0.3.6") + (version "0.3.7") (source (origin (method git-fetch) @@ -593,12 +593,13 @@ end-to-end encryption.") (modules '((guix build utils))) (snippet `(begin - ;; Submodules + ;; Empty directories meant to hold submodules that we provide as + ;; proper inputs below. (delete-file-recursively "lib"))) (file-name (git-file-name name version)) (sha256 - (base32 "05sv7l6lk0xk4wb2bspc2sdpygrb1f0szzi82a1kyfm0fjz887b3")))) + (base32 "0b02b9flri374f8aw6xfz7mm9s57rb7393r8mdphv7kcsf76i7i5")))) (build-system cmake-build-system) (arguments `(#:phases (modify-phases %standard-phases -- cgit 1.4.1 From e6480571a094e27dc50db2b42334f17a6d1957d4 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 26 Jul 2022 21:45:24 -0400 Subject: gnu: opendht: Really disable the problematic testListen test. * gnu/packages/networking.scm (opendht) [phases]{disable-problematic-tests}: Adjust regexp pattern. Reported-by: Jack Hill --- gnu/packages/networking.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 9101aac472..3249bddbb2 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -3506,8 +3506,8 @@ and targeted primarily for asynchronous processing of HTTP-requests.") ;; on, introducing nondeterminism (see: ;; https://github.com/savoirfairelinux/opendht/issues/626). (substitute* "tests/Makefile.am" - (("tests/dhtrunnertester.(h|cpp)$" all) - (string-append "# " all))))) + (("\\bdhtrunnertester\\.(h|cpp)\\b") + "")))) (add-after 'unpack 'fix-python-installation-prefix ;; Specify the installation prefix for the compiled Python module ;; that would otherwise attempt to installs itself to Python's own -- cgit 1.4.1 From 8007a835cdc8ed5d4950cf5d9c98e813ebb78b02 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 23 Jul 2022 22:42:23 +0200 Subject: gnu: modem-manager: Add 'upstream-name' property. * gnu/packages/freedesktop.scm (modem-manager)[properties]: New field. --- gnu/packages/freedesktop.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 4d06235771..cde7156383 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -1546,6 +1546,8 @@ broadband (2G/3G/4G) devices and connections. Whether built-in devices, USB dongles, bluetooth-paired telephones, or professional RS232/USB devices with external power supplies, ModemManager is able to prepare and configure the modems and setup connections with them.") + (properties + '((upstream-name . "ModemManager"))) (license license:gpl2+))) (define-public telepathy-logger -- cgit 1.4.1 From 9a1cd6e7e89b4f03c5c4a96c5fc55483bfadb776 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 23 Jul 2022 23:17:50 +0200 Subject: gnu: FFmpeg: Update to 5.1. * gnu/packages/video.scm (ffmpeg-5): Update to 5.1. --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 4118d8465e..ac7329d4b7 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1562,14 +1562,14 @@ operate properly.") (define-public ffmpeg-5 (package (name "ffmpeg") - (version "5.0.1") + (version "5.1") (source (origin (method url-fetch) (uri (string-append "https://ffmpeg.org/releases/ffmpeg-" version ".tar.xz")) (sha256 (base32 - "0yq0jcdc4qm5znrzylj3dsicrkk2n3n8bv28vr0a506fb7iglbpg")))) + "00wbd5skv6ba5yqq4ca505ncckhvpzwflcsall7madg2bsmnmssm")))) (build-system gnu-build-system) (inputs (append -- cgit 1.4.1 From 540b74847da947861020dc1bc8afcf7c46a717dd Mon Sep 17 00:00:00 2001 From: Nicolas Graves Date: Tue, 26 Jul 2022 08:41:57 +0200 Subject: gnu: rust-miniz-oxide: Do not skip build. * gnu/packages/crates-io.scm (rust-miniz-oxide-0.2): Keeping skip-build? #t. (rust-miniz-oxide-0.3): Deleting skip-build? #t. (rust-miniz-oxide-0.4): Deleting skip-build? #t. Signed-off-by: Marius Bakke --- gnu/packages/crates-io.scm | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 16ac36c9f5..be72c29d33 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -23,7 +23,7 @@ ;;; Copyright © 2021, 2022 Petr Hodina ;;; Copyright © 2021, 2022 Ricardo Wurmus ;;; Copyright © 2021 Jacob Hrbek -;;; Copyright © 2021 Nicolas Graves +;;; Copyright © 2021, 2022 Nicolas Graves ;;; Copyright © 2022 Aleksandr Vityazev ;;; Copyright © 2022 Marius Bakke ;;; Copyright © 2022 Evgenii Lepikhin @@ -34808,8 +34808,7 @@ float parser.") (base32 "17d1xp29v5xgh4vahxld14w1c1hgh38qmxpv7i18wy096gn2cb8g")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-adler" ,rust-adler-0.2) ("rust-autocfg" ,rust-autocfg-1) ("rust-compiler-builtins" ,rust-compiler-builtins-0.1) @@ -34837,8 +34836,7 @@ streaming API for miniz_oxide.") (base32 "198n4hfpq0qcxf275l6fpzh7b9cl7ck2xs6pjgpds74bazv9yrxa")))) (arguments - `(#:skip-build? #t - #:cargo-inputs (("rust-adler32" ,rust-adler32-1)))))) + `(#:cargo-inputs (("rust-adler32" ,rust-adler32-1)))))) (define-public rust-miniz-oxide-0.2 (package @@ -34853,7 +34851,8 @@ streaming API for miniz_oxide.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "17f92krv9hhsyc38prpfyn99m2hqhr4fgszpsla66a6gcrnpbhxn")))))) + "17f92krv9hhsyc38prpfyn99m2hqhr4fgszpsla66a6gcrnpbhxn")))) + (arguments `(#:skip-build? #t)))) (define-public rust-miniz-oxide-c-api-0.2 (package -- cgit 1.4.1 From a05897522994e2f315fef7679ecd1a873a8f3dcb Mon Sep 17 00:00:00 2001 From: Nicolas Graves Date: Tue, 26 Jul 2022 09:26:04 +0200 Subject: gnu: Add rust-adler-1. * gnu/packages/crates-io.scm (rust-adler-1): New variable. (rust-adler-0.2): Add development-inputs. Signed-off-by: Marius Bakke --- gnu/packages/crates-io.scm | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index be72c29d33..e5278061ef 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1815,23 +1815,24 @@ Rust, using gimli.") ("rust-memmap" ,rust-memmap-0.7) ("rust-rustc-test" ,rust-rustc-test-0.3)))))) -(define-public rust-adler-0.2 +(define-public rust-adler-1 (package (name "rust-adler") - (version "0.2.3") + (version "1.0.2") (source (origin (method url-fetch) (uri (crate-uri "adler" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0zpdsrfq5bd34941gmrlamnzjfbsx0x586afb7b0jqhr8g1lwapf")))) + (base32 "1zim79cvzd5yrkzl3nyfx0avijwgk9fqv3yrscdy1cc79ih02qpj")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-compiler-builtins" ,rust-compiler-builtins-0.1) - ("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1)))) + ("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1)) + #:cargo-development-inputs + (("rust-criterion" ,rust-criterion-0.3)))) (home-page "https://github.com/jonas-schievink/adler") (synopsis "Implementation of the Adler-32 checksum") (description @@ -1842,6 +1843,20 @@ checksum, used in the zlib compression format.") license:asl2.0 (license:non-copyleft "https://spdx.org/licenses/0BSD.html"))))) +(define-public rust-adler-0.2 + (package + (inherit rust-adler-1) + (name "rust-adler") + (version "0.2.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "adler" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0zpdsrfq5bd34941gmrlamnzjfbsx0x586afb7b0jqhr8g1lwapf")))) + (build-system cargo-build-system))) + (define-public rust-adler32-1 (package (name "rust-adler32") -- cgit 1.4.1 From d851cecc14ed889019f77f3b3e329b4e120d83f0 Mon Sep 17 00:00:00 2001 From: Nicolas Graves Date: Tue, 26 Jul 2022 09:26:06 +0200 Subject: gnu: Add rust-simd-adler32-0.3. * gnu/packages/crates-io.scm (rust-simd-adler32-0.3): New variable. Signed-off-by: Marius Bakke --- gnu/packages/crates-io.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index e5278061ef..231bc9cff6 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -56393,6 +56393,33 @@ CPUs, as well as raw interfaces to platform-specific instructions. #:cargo-development-inputs (("rust-cfg-if" ,rust-cfg-if-0.1)))))) +(define-public rust-simd-adler32-0.3 + (package + (name "rust-simd-adler32") + (version "0.3.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "simd-adler32" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "060b9v15s3miq06582cj2ywam92ph6xs34s62mc8az3xc4wxz98l")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-development-inputs + (("rust-adler" ,rust-adler-1) + ("rust-adler32" ,rust-adler32-1) + ("rust-criterion" ,rust-criterion-0.3) + ("rust-rand" ,rust-rand-0.8)))) + (home-page "https://github.com/mcountryman/simd-adler32") + (synopsis + "Adler-32 rolling hash algorithm implementation") + (description + "This package provides a SIMD-accelerated Adler-32 rolling hash algorithm +implementation in Rust.") + (license license:expat))) + (define-public rust-simd-helpers-0.1 (package (name "rust-simd-helpers") -- cgit 1.4.1 From 56e17f6493b8ed9d0aeaeea69fb4caa1736ac620 Mon Sep 17 00:00:00 2001 From: Nicolas Graves Date: Tue, 26 Jul 2022 19:06:13 +0200 Subject: gnu: Add rust-miniz-oxide-0.5. * gnu/packages/crates-io.scm (rust-miniz-oxide-0.5): New variable. Signed-off-by: Marius Bakke --- gnu/packages/crates-io.scm | 32 ++++++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 231bc9cff6..3ea747cbf8 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -34810,25 +34810,25 @@ float parser.") (sha256 (base32 "0xynhr97vyv5n5lls41dl7bfa3ba122lix9mqij1l7yprl6n6r4w")))))) -(define-public rust-miniz-oxide-0.4 +(define-public rust-miniz-oxide-0.5 (package (name "rust-miniz-oxide") - (version "0.4.3") + (version "0.5.3") (source (origin (method url-fetch) (uri (crate-uri "miniz_oxide" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "17d1xp29v5xgh4vahxld14w1c1hgh38qmxpv7i18wy096gn2cb8g")))) + (base32 "1k1wfxb35v129mhqy14yqhrj3wvknafrwygiq7zvi0m5iml7ap3g")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs - (("rust-adler" ,rust-adler-0.2) - ("rust-autocfg" ,rust-autocfg-1) + (("rust-adler" ,rust-adler-1) ("rust-compiler-builtins" ,rust-compiler-builtins-0.1) ("rust-rustc-std-workspace-alloc" ,rust-rustc-std-workspace-alloc-1) - ("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1)))) + ("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1) + ("rust-simd-adler32" ,rust-simd-adler32-0.3)))) (home-page "https://github.com/Frommi/miniz_oxide/tree/master/miniz_oxide") (synopsis "Pure rust replacement for the miniz DEFLATE/zlib encoder/decoder") (description @@ -34837,6 +34837,26 @@ float parser.") streaming API for miniz_oxide.") (license (list license:expat license:zlib license:asl2.0)))) +(define-public rust-miniz-oxide-0.4 + (package + (inherit rust-miniz-oxide-0.5) + (name "rust-miniz-oxide") + (version "0.4.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "miniz_oxide" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "17d1xp29v5xgh4vahxld14w1c1hgh38qmxpv7i18wy096gn2cb8g")))) + (arguments + `(#:cargo-inputs + (("rust-adler" ,rust-adler-0.2) + ("rust-autocfg" ,rust-autocfg-1) + ("rust-compiler-builtins" ,rust-compiler-builtins-0.1) + ("rust-rustc-std-workspace-alloc" ,rust-rustc-std-workspace-alloc-1) + ("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1)))))) + (define-public rust-miniz-oxide-0.3 (package (inherit rust-miniz-oxide-0.4) -- cgit 1.4.1 From d62b180ffd403df551329a653e526a8cc660b2d1 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 24 Jul 2022 02:00:01 +0200 Subject: gnu: freetalk: Update to 4.2. * gnu/packages/messaging.scm (freetalk): Update to 4.2. [arguments]: Remove unneeded "CFLAGS=-fcommon" from #:configure-flags. Don't explicitly return #t from phases. [inputs]: Update guile-2.0 to guile-3.0. --- gnu/packages/messaging.scm | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index a593310e36..1581434ae8 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -2081,19 +2081,17 @@ support, and more.") (define-public freetalk (package (name "freetalk") - (version "4.1") + (version "4.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/freetalk/freetalk-" version ".tar.gz")) (sha256 (base32 - "1rmrn7a1bb7vm26yaklrvx008a9qhwc32s57dwrlf40lv9gffwny")))) + "105mw7pg2mcp85r82cs4rv77nwvbw8025047364jzbq6lwllynxv")))) (build-system gnu-build-system) (arguments - `(#:configure-flags - (list "CFLAGS=-fcommon") - #:phases + `(#:phases (modify-phases %standard-phases ;; For 'system' commands in Scheme code. (add-after 'install 'wrap-program @@ -2106,14 +2104,13 @@ support, and more.") `("PATH" ":" prefix ,(map (lambda (dir) (string-append dir "/bin")) - (list bash coreutils less)))) - #t)))))) + (list bash coreutils less)))))))))) (native-inputs (list autoconf automake pkg-config texinfo)) (inputs (list bash glib - guile-2.0 + guile-3.0 less loudmouth readline)) -- cgit 1.4.1 From f8b7320ab22a9df2450b338d5755ae4ae1e281c6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 24 Jul 2022 02:00:00 +0200 Subject: gnu: freetalk: Modernise arguments' style. * gnu/packages/messaging.scm (freetalk)[arguments]: Use a G-expression. Use SEARCH-INPUT-FILE to find representative binaries instead of relying on package names, and 'suffix rather than 'prefix their location to PATH. --- gnu/packages/messaging.scm | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 1581434ae8..eee082ed8e 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -2091,20 +2091,22 @@ support, and more.") "105mw7pg2mcp85r82cs4rv77nwvbw8025047364jzbq6lwllynxv")))) (build-system gnu-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - ;; For 'system' commands in Scheme code. - (add-after 'install 'wrap-program - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bash (assoc-ref inputs "bash")) - (coreutils (assoc-ref inputs "coreutils")) - (less (assoc-ref inputs "less"))) - (wrap-program (string-append out "/bin/freetalk") - `("PATH" ":" prefix - ,(map (lambda (dir) - (string-append dir "/bin")) - (list bash coreutils less)))))))))) + (list #:phases + #~(modify-phases %standard-phases + (add-after 'install 'wrap-program + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (wrap-program (string-append out "/bin/freetalk") + `("PATH" ":" suffix + ,(map (lambda (command) + (dirname + (search-input-file + inputs (string-append "bin/" command)))) + ;; This list is not exhaustive: we assume that, + ;; e.g., cat is packaged with other coreutils. + (list "bash" ; src/{commands,util}.c et al + "cat" ; extensions/first-time-run.sh + "less")))))))))) ; extensions/history.scm. (native-inputs (list autoconf automake pkg-config texinfo)) (inputs -- cgit 1.4.1 From 3dab424a3d4bbd7c552fc848f05e0f497e2f562e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 24 Jul 2022 02:00:01 +0200 Subject: gnu: es: Update to 0.9.2. * gnu/packages/shells.scm (es): Update to 0.9.2. --- gnu/packages/shells.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index 2caefd3dd0..21035498a6 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -360,15 +360,14 @@ has a small feature set similar to a traditional Bourne shell.") (define-public es (package (name "es") - (version "0.9.1") + (version "0.9.2") (source (origin (method url-fetch) (uri (string-append "https://github.com/wryun/es-shell/releases/" "download/v" version "/es-" version ".tar.gz")) (sha256 - (base32 - "1fplzxc6lncz2lv2fyr2ig23rgg5j96rm2bbl1rs28mik771zd5h")) + (base32 "1pgmqhsk14wyvl489sxdy7kdl2gwrsq1xvkip0z90kh888mlh9n9")) (file-name (string-append name "-" version ".tar.gz")))) (build-system gnu-build-system) (arguments -- cgit 1.4.1 From c5320bdf0698484f05fa18893c4b6e682e21daea Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 24 Jul 2022 02:00:00 +0200 Subject: gnu: beancount: Update home page. * gnu/packages/finance.scm (beancount)[home-page]: Update. --- gnu/packages/finance.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 89f5fc055c..444a1bb9be 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -1843,7 +1843,7 @@ that allows you to run services and through them access the Bitcoin Cash network python-requests)) (native-inputs (list python-pytest)) - (home-page "http://furius.ca/beancount") + (home-page "https://beancount.github.io/") (synopsis "Command-line double-entry accounting tool") (description "Beancount is a double-entry bookkeeping computer language that lets you -- cgit 1.4.1 From 171964da5bd3e85babad90ad81fb429944347dfd Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 24 Jul 2022 02:00:00 +0200 Subject: gnu: es: Use URL-FETCH/TARBOMB. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/shells.scm (es)[source]: Use URL-FETCH/TARBOMB to let us… [arguments]: …delete the ad-hoc 're-enter-rootdir phase. --- gnu/packages/shells.scm | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index 21035498a6..a8a42f0544 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -363,7 +363,7 @@ has a small feature set similar to a traditional Bourne shell.") (version "0.9.2") (source (origin - (method url-fetch) + (method url-fetch/tarbomb) (uri (string-append "https://github.com/wryun/es-shell/releases/" "download/v" version "/es-" version ".tar.gz")) (sha256 @@ -371,13 +371,7 @@ has a small feature set similar to a traditional Bourne shell.") (file-name (string-append name "-" version ".tar.gz")))) (build-system gnu-build-system) (arguments - `(#:test-target "test" - #:phases - (modify-phases %standard-phases - (add-before 'configure 're-enter-rootdir - ;; The tarball has no folder. - (lambda _ - (chdir "..")))))) + (list #:test-target "test")) (inputs (list readline)) (native-inputs -- cgit 1.4.1 From 6f3961ec00bb747ed4dcb771a4c2afb83d3d8dde Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 24 Jul 2022 02:00:00 +0200 Subject: gnu: bitcoin: Use language-agnostic home page. * gnu/packages/finance.scm (beancount)[home-page]: Remove "/en". --- gnu/packages/finance.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 444a1bb9be..adceb98f83 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -190,7 +190,7 @@ "python3" "./test/functional/test_runner.py" (string-append "--jobs=" (number->string (parallel-job-count)))) #t))))) - (home-page "https://bitcoin.org/en/") + (home-page "https://bitcoin.org/") (synopsis "Bitcoin peer-to-peer client") (description "Bitcoin is a digital currency that enables instant payments to anyone -- cgit 1.4.1 From 66292654141c98705bbe14fa4d4ed38d0f1e192e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 24 Jul 2022 02:00:01 +0200 Subject: gnu: imgui: Update to 1.88. * gnu/packages/toolkits.scm (imgui): Update to 1.88. --- gnu/packages/toolkits.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/toolkits.scm b/gnu/packages/toolkits.scm index fd3385122e..3030e3aa49 100644 --- a/gnu/packages/toolkits.scm +++ b/gnu/packages/toolkits.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2022 Maxim Cournoyer -;;; Copyright © 2020 Tobias Geerinckx-Rice +;;; Copyright © 2020, 2022 Tobias Geerinckx-Rice ;;; Copyright © 2022 John Kehayias ;;; ;;; This file is part of GNU Guix. @@ -32,7 +32,7 @@ (define-public imgui (package (name "imgui") - (version "1.87") + (version "1.88") (source (origin (method git-fetch) (uri (git-reference @@ -41,7 +41,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "10qil22s5qak3as41787iz273sibpq1bq66bakgn7yvhj5fym6hz")) + "13cw4hx55y5z678r558hv7znfz666wh0w849c5padnj4nkpbihdi")) (modules '((guix build utils))) (snippet ;; Remove bundled fonts. -- cgit 1.4.1 From b167c54e517f8fc5025e6e3bc0cbfaa80461c214 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 24 Jul 2022 02:00:08 +0200 Subject: gnu: fstrm: Update to 0.6.1. * gnu/packages/protobuf.scm (fstrm): Update to 0.6.1. [license]: Update too. --- gnu/packages/protobuf.scm | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/protobuf.scm b/gnu/packages/protobuf.scm index daf7b933ad..4fc893e416 100644 --- a/gnu/packages/protobuf.scm +++ b/gnu/packages/protobuf.scm @@ -49,15 +49,14 @@ (define-public fstrm (package (name "fstrm") - (version "0.3.2") + (version "0.6.1") (source (origin (method url-fetch) - (uri (string-append "https://dl.farsightsecurity.com/dist/" name "/" - name "-" version ".tar.gz")) + (uri (string-append "https://dl.farsightsecurity.com/dist/fstrm/" + "fstrm-" version ".tar.gz")) (sha256 - (base32 - "1i9y8a1712aj80p5a1kcp378bnjrg3s2127q7304hklhmjcrjl1d")))) + (base32 "13q9iz5fpp607zvk0i39158fvvjciz4y5k14rly94b9ak0gar95w")))) (build-system gnu-build-system) (native-inputs (list pkg-config)) @@ -79,7 +78,7 @@ XML, JSON, MessagePack, YAML, etc. Frame Streams can be used either as a streaming transport over a reliable byte stream socket (TCP sockets, TLS connections, @code{AF_UNIX} sockets, etc.) for data in motion, or as a file format for data at rest.") - (license (list license:asl2.0 + (license (list license:expat (license:non-copyleft #f "See libmy/argv*"))))) (define-public protobuf -- cgit 1.4.1 From 85347b0f341fd6e665d27d0b468613608aa3830e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 24 Jul 2022 02:00:01 +0200 Subject: gnu: qtractor: Update to 0.9.27. * gnu/packages/music.scm (qtractor): Update to 0.9.27. [inputs]: Add qtsvg. --- gnu/packages/music.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 697fae8fc0..b83200723d 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -3287,19 +3287,20 @@ from the command line.") (define-public qtractor (package (name "qtractor") - (version "0.9.26") + (version "0.9.27") (source (origin (method url-fetch) (uri (string-append "https://downloads.sourceforge.net/qtractor/" "qtractor-" version ".tar.gz")) (sha256 (base32 - "02r4dhhbn3dzhqi5cnm2vwimqk10bdlpy233n4a3590qg4krnqkd")))) + "11131hb6n13n51rr319jhaa9jjxl9q8n9vkxq3si7gcxlli6pdbs")))) (build-system cmake-build-system) (arguments `(#:tests? #f)) ; no "check" target (inputs `(("qt" ,qtbase-5) + ("qtsvg" ,qtsvg) ("qtx11extras" ,qtx11extras) ("alsa-lib" ,alsa-lib) ("jack" ,jack-1) -- cgit 1.4.1 From 59d7976782da5e478ff32482e45616fc90d9b697 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 24 Jul 2022 02:00:00 +0200 Subject: gnu: fstrm: Omit static library. * gnu/packages/protobuf.scm (fstrm)[arguments]: Add "--disable-static" to #:configure-flags. --- gnu/packages/protobuf.scm | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/protobuf.scm b/gnu/packages/protobuf.scm index 4fc893e416..a8dcbeb002 100644 --- a/gnu/packages/protobuf.scm +++ b/gnu/packages/protobuf.scm @@ -25,6 +25,7 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages protobuf) + #:use-module (guix gexp) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix git-download) @@ -58,6 +59,9 @@ (sha256 (base32 "13q9iz5fpp607zvk0i39158fvvjciz4y5k14rly94b9ak0gar95w")))) (build-system gnu-build-system) + (arguments + (list #:configure-flags + #~(list "--disable-static"))) (native-inputs (list pkg-config)) (inputs -- cgit 1.4.1 From 80108cac05adc2f01d510440b75d21ceee60aa6a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 24 Jul 2022 02:00:01 +0200 Subject: gnu: qtractor: Remove input labels. * gnu/packages/music.scm (qtractor)[inputs]: Remove input labels. --- gnu/packages/music.scm | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index b83200723d..520d64d33c 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -3299,22 +3299,22 @@ from the command line.") (arguments `(#:tests? #f)) ; no "check" target (inputs - `(("qt" ,qtbase-5) - ("qtsvg" ,qtsvg) - ("qtx11extras" ,qtx11extras) - ("alsa-lib" ,alsa-lib) - ("jack" ,jack-1) - ("libsndfile" ,libsndfile) - ("ladspa" ,ladspa) - ("lv2" ,lv2) - ("lilv" ,lilv) - ("suil" ,suil) - ("libsamplerate" ,libsamplerate) - ("libvorbis" ,libvorbis) - ("libmad" ,libmad) - ("rubberband" ,rubberband) - ("liblo" ,liblo) - ("zlib" ,zlib))) + (list alsa-lib + jack-1 + ladspa + liblo + libmad + libsamplerate + libsndfile + libvorbis + lilv + lv2 + qtbase-5 + qtsvg + qtx11extras + rubberband + suil + zlib)) (native-inputs (list pkg-config qttools)) (home-page "https://qtractor.org/") -- cgit 1.4.1 From 84be8bc1f4202d1c6e33995815d2c42ab4cb29bd Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 24 Jul 2022 02:00:01 +0200 Subject: gnu: podofo: Update to 0.9.8. * gnu/packages/pdf.scm (podofo): Update to 0.9.8. [arguments]: Don't explicitly return #t from phases. --- gnu/packages/pdf.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index a0c4b4dc15..52ef052f75 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -660,14 +660,14 @@ interaction.") (define-public podofo (package (name "podofo") - (version "0.9.7") + (version "0.9.8") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/podofo/podofo/" version "/podofo-" version ".tar.gz")) (sha256 (base32 - "1f0yvkx6nf99fp741w2y706d8bs9824x1z2gqm3rdy5fv8bfgwkw")))) + "0m2icjy35jd0900g0fyfrmf0zsldv1chfc1q0zcqlaqrbzhhgrjx")))) (build-system cmake-build-system) (native-inputs (list cppunit pkg-config)) @@ -690,8 +690,7 @@ interaction.") (let ((freetype (assoc-ref inputs "freetype"))) ;; Look for freetype include files in the correct place. (substitute* "cmake/modules/FindFREETYPE.cmake" - (("/usr/local") freetype))) - #t))))) + (("/usr/local") freetype)))))))) (home-page "http://podofo.sourceforge.net") (synopsis "Tools to work with the PDF file format") (description -- cgit 1.4.1 From 9177a281694f21a28871adaa972dff2bc6f44f79 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 24 Jul 2022 02:00:01 +0200 Subject: gnu: podofo: Remove input labels. * gnu/packages/pdf.scm (podofo)[inputs]: Remove input labels. --- gnu/packages/pdf.scm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 52ef052f75..f269449a92 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -672,14 +672,14 @@ interaction.") (native-inputs (list cppunit pkg-config)) (inputs - `(("libjpeg" ,libjpeg-turbo) - ("libtiff" ,libtiff) - ("fontconfig" ,fontconfig) - ("freetype" ,freetype) - ("libpng" ,libpng) - ("lua" ,lua-5.1) - ("openssl" ,openssl) - ("zlib" ,zlib))) + (list fontconfig + freetype + libjpeg-turbo + libpng + libtiff + lua-5.1 + openssl + zlib)) (arguments `(#:configure-flags (list "-DPODOFO_BUILD_SHARED=ON") -- cgit 1.4.1 From 8d1f308e1decd48f62b9ae5174cf51b09ba2eb51 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 24 Jul 2022 02:00:01 +0200 Subject: gnu: nbd: Update to 3.24. * gnu/packages/networking.scm (nbd): Update to 3.24. --- gnu/packages/networking.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 3249bddbb2..36958c4c4b 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -4111,14 +4111,14 @@ stamps.") (define-public nbd (package (name "nbd") - (version "3.23") + (version "3.24") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/nbd/nbd/" version "/nbd-" version ".tar.xz")) (sha256 - (base32 "1d2phi0m9x32p9zddv9fpkhj1rbhlvq93wsn9niy7i3aavn71x6y")))) + (base32 "036ib2d5722sx9nn7jydqfpl5ici5if2z7g8xrskzcx74dniaxv8")))) (build-system gnu-build-system) (inputs (list glib)) -- cgit 1.4.1 From 15ac9ace9cf5d86261d29e115379fa21fb135697 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 24 Jul 2022 02:00:02 +0200 Subject: gnu: ndisc6: Update to 1.0.6. * gnu/packages/networking.scm (ndisc6): Update to 1.0.6. --- gnu/packages/networking.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 36958c4c4b..85ded36804 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -906,14 +906,14 @@ residing in IPv4-only networks, even when they are behind a NAT device.") (define-public ndisc6 (package (name "ndisc6") - (version "1.0.5") + (version "1.0.6") (source (origin (method url-fetch) (uri (string-append "https://www.remlab.net/files/ndisc6/ndisc6-" version ".tar.bz2")) (sha256 (base32 - "0lgkbnnll8nrr7h63ywd42sg8fiv6jhhymd7rnml8a3yqjgjz4rn")))) + "1yrw8maj1646d498ax8xi0jmzk80idrc5x0913x5rwg1kc7224x7")))) (build-system gnu-build-system) (home-page "https://www.remlab.net/ndisc6/") (synopsis "IPv6 diagnostic tools") -- cgit 1.4.1 From 6efe29d2e7c17c7609f56a0bceaa491d01ac3e96 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 24 Jul 2022 02:00:01 +0200 Subject: gnu: libconfini: Update to 1.16.4. * gnu/packages/cpp.scm (libconfini): Update to 1.16.4. --- gnu/packages/cpp.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 5ae5efc330..481671f443 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -1474,7 +1474,7 @@ output randomness while retaining speed, simplicity, and conciseness.") (define-public libconfini (package (name "libconfini") - (version "1.16.3") + (version "1.16.4") (source (origin (method git-fetch) (uri (git-reference @@ -1483,7 +1483,7 @@ output randomness while retaining speed, simplicity, and conciseness.") (file-name (git-file-name name version)) (sha256 (base32 - "01g8ai2z4fwshk06k824j6ib8nfb3cwxs5kqpqjvv4k5ayzm892h")))) + "002lmf1b2phmc6s348k00yx5shrcc7psn3pgqvraxvr6n8g747jx")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit 1.4.1 From 5f4cd5243c8a409f63a443d093b5a554ad7d3c92 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 24 Jul 2022 02:00:00 +0200 Subject: gnu: libconfini: Omit static library. * gnu/packages/cpp.scm (libconfini)[arguments]: Add "--disable-static" to #:configure-flags. --- gnu/packages/cpp.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 481671f443..8330f0d157 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -1486,7 +1486,9 @@ output randomness while retaining speed, simplicity, and conciseness.") "002lmf1b2phmc6s348k00yx5shrcc7psn3pgqvraxvr6n8g747jx")))) (build-system gnu-build-system) (arguments - `(#:phases + `(#:configure-flags + (list "--disable-static") + #:phases (modify-phases %standard-phases (replace 'bootstrap (lambda _ (invoke "sh" "bootstrap" "--noconfigure")))))) -- cgit 1.4.1 From 313a442f7bd4bb3054d271fbda4527a0ea943788 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 24 Jul 2022 02:00:02 +0200 Subject: gnu: get-iplayer: Update to 3.30. * gnu/packages/video.scm (get-iplayer): Update to 3.30. [arguments]: Don't explicitly return #t from phases. --- gnu/packages/video.scm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index ac7329d4b7..af658ea8d7 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -5387,7 +5387,7 @@ brightness, contrast, and frame rate.") (define-public get-iplayer (package (name "get-iplayer") - (version "3.27") + (version "3.30") (source (origin (method git-fetch) @@ -5396,7 +5396,7 @@ brightness, contrast, and frame rate.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "077y31gg020wjpx5pcivqgkqawcjxh5kjnvq97x2gd7i3wwc30qi")))) + (base32 "1kzsdq1mhm5h83bbdbhh3jhpfvq4f13ly22mfd6vvmhj8mq084pi")))) (build-system perl-build-system) (arguments `(#:tests? #f ; no tests @@ -5411,8 +5411,7 @@ brightness, contrast, and frame rate.") (man (string-append out "/share/man/man1"))) (install-file "get_iplayer" bin) (install-file "get_iplayer.cgi" bin) - (install-file "get_iplayer.1" man)) - #t)) + (install-file "get_iplayer.1" man)))) (add-after 'install 'wrap-program (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -5423,8 +5422,7 @@ brightness, contrast, and frame rate.") prefix (,(string-append perllib ":" (getenv "PERL5LIB"))))) (wrap-program (string-append out "/bin/get_iplayer.cgi") `("PERL5LIB" ":" - prefix (,(string-append perllib ":" (getenv "PERL5LIB"))))) - #t)))))) + prefix (,(string-append perllib ":" (getenv "PERL5LIB"))))))))))) (inputs (list perl-mojolicious perl-lwp-protocol-https perl-xml-libxml)) (home-page "https://github.com/get-iplayer/get_iplayer") -- cgit 1.4.1 From ff44eff58b239149aea3188aafaa7411f30f3907 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 24 Jul 2022 02:00:00 +0200 Subject: gnu: osinfo-db: Update to 20220516. * gnu/packages/virtualization.scm (osinfo-db): Update to 20220516. --- gnu/packages/virtualization.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index e184f54e81..136574b270 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -2334,14 +2334,14 @@ administrators and developers in managing the database.") (define-public osinfo-db (package (name "osinfo-db") - (version "20211216") + (version "20220516") (source (origin (method url-fetch) (uri (string-append "https://releases.pagure.org/libosinfo/osinfo-db-" version ".tar.xz")) (sha256 (base32 - "10hhpciqk4lzsj66zkdvghd1i5zh6hg1fn9as4qhwcr1wnqfgv09")))) + "0vfsdk3c6n6y04c5rf92m31zvl969kaniyx2fqywbp69mzc6j3yn")))) (build-system trivial-build-system) (arguments `(#:modules ((guix build utils)) -- cgit 1.4.1 From 069d6a3f646b0f4761c37718dc90d8043d2505a5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 24 Jul 2022 02:00:00 +0200 Subject: gnu: fstrm: Refer to HPND licence by name. * gnu/packages/protobuf.scm (fstrm)[license]: Use license:hpnd directly. --- gnu/packages/protobuf.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/protobuf.scm b/gnu/packages/protobuf.scm index a8dcbeb002..6c3a47986d 100644 --- a/gnu/packages/protobuf.scm +++ b/gnu/packages/protobuf.scm @@ -82,8 +82,8 @@ XML, JSON, MessagePack, YAML, etc. Frame Streams can be used either as a streaming transport over a reliable byte stream socket (TCP sockets, TLS connections, @code{AF_UNIX} sockets, etc.) for data in motion, or as a file format for data at rest.") - (license (list license:expat - (license:non-copyleft #f "See libmy/argv*"))))) + (license (list license:expat ; the combined work + license:hpnd)))) ; libmy/argv* (define-public protobuf (package -- cgit 1.4.1 From f098d93352dcc620c8d1501b49443535f30a5184 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 25 Jul 2022 03:00:28 +0200 Subject: gnu: nss, nss-certs: Update to 3.81. * gnu/packages/certs.scm (nss-certs): Update to 3.81. * gnu/packages/nss.scm (nss): Likewise. --- gnu/packages/certs.scm | 4 ++-- gnu/packages/nss.scm | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/certs.scm b/gnu/packages/certs.scm index b184a434d4..b8dfe96e6d 100644 --- a/gnu/packages/certs.scm +++ b/gnu/packages/certs.scm @@ -131,7 +131,7 @@ that was originally contributed to Debian.") ;; XXX We used to refer to the nss package here, but that eventually caused ;; module cycles. The below is a quick copy-paste job that must be kept in ;; sync manually. Surely there's a better way…? - (version "3.80") + (version "3.81") (source (origin (method url-fetch) (uri (let ((version-with-underscores @@ -142,7 +142,7 @@ that was originally contributed to Debian.") "nss-" version ".tar.gz"))) (sha256 (base32 - "0sjbg248kfabv9av2jwkr28fqgj4zjm2nqh9nc16p6p2qz91zgy0")) + "19ncvhz45dhr0nmymwkxspq9l44gaafkspxiwxbqs1hpnqxmzgx8")) ;; Create nss.pc and nss-config. (patches (search-patches "nss-3.56-pkgconfig.patch" "nss-getcwd-nonnull.patch" diff --git a/gnu/packages/nss.scm b/gnu/packages/nss.scm index 23bd2cb2a7..0d18592be4 100644 --- a/gnu/packages/nss.scm +++ b/gnu/packages/nss.scm @@ -112,7 +112,7 @@ in the Mozilla clients.") (name "nss") ;; Also update and test the nss-certs package, which duplicates version and ;; source to avoid a top-level variable reference & module cycle. - (version "3.80") + (version "3.81") (source (origin (method url-fetch) (uri (let ((version-with-underscores @@ -123,7 +123,7 @@ in the Mozilla clients.") "nss-" version ".tar.gz"))) (sha256 (base32 - "0sjbg248kfabv9av2jwkr28fqgj4zjm2nqh9nc16p6p2qz91zgy0")) + "19ncvhz45dhr0nmymwkxspq9l44gaafkspxiwxbqs1hpnqxmzgx8")) ;; Create nss.pc and nss-config. (patches (search-patches "nss-3.56-pkgconfig.patch" "nss-getcwd-nonnull.patch" -- cgit 1.4.1 From 7aad4a99f790e256ef03bcf4c6a619560ae48075 Mon Sep 17 00:00:00 2001 From: Nicolas Graves Date: Tue, 26 Jul 2022 09:26:05 +0200 Subject: gnu: rust-adler32-1: Update to 1.2.0. * gnu/packages/crates-io.scm (rust-adler32-1): Update to 1.2.0. Signed-off-by: Marius Bakke --- gnu/packages/crates-io.scm | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 16ac36c9f5..fbb701d064 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1845,7 +1845,7 @@ checksum, used in the zlib compression format.") (define-public rust-adler32-1 (package (name "rust-adler32") - (version "1.1.0") + (version "1.2.0") (source (origin (method url-fetch) @@ -1854,15 +1854,19 @@ checksum, used in the zlib compression format.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0bgks405vz823bphgwhj4l9h6vpfh900s0phfk4qqijyh9xhfysn")))) + "0d7jq7jsjyhsgbhnfq5fvrlh9j0i9g1fqrl2735ibv5f75yjgqda")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-compiler-builtins" ,rust-compiler-builtins-0.1) ("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1)) #:cargo-development-inputs - (("rust-bencher" ,rust-bencher-0.1) - ("rust-rand" ,rust-rand-0.4)))) + (("rust-criterion" ,rust-criterion-0.3) + ("rust-getrandom" ,rust-getrandom-0.1) + ("rust-humansize" ,rust-humansize-1) + ("rust-rand" ,rust-rand-0.7) + ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2) + ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3)))) (home-page "https://github.com/remram44/adler32-rs") (synopsis "Implementation of the Adler32 rolling hash algorithm") (description -- cgit 1.4.1 From 6fd0b018c6dbcf89b02417fa50e9892366a7b879 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 24 Jul 2022 00:53:49 +0200 Subject: gnu: rust-version-compare: Add 0.1. * gnu/packages/crates-io.scm (rust-version-compare-0.1): New variable. (rust-version-compare-0.0.11): Inherit from it. --- gnu/packages/crates-io.scm | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 3ea747cbf8..1b2a284161 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -69277,8 +69277,28 @@ If that fails, no determination is made, and calls return None.") (base32 "1pf91pvj8n6akh7w6j5ypka6aqz08b3qpzgs0ak2kjf4frkiljwi")))))) +(define-public rust-version-compare-0.1 + (package + (name "rust-version-compare") + (version "0.1.0") + (source (origin + (method url-fetch) + (uri (crate-uri "version-compare" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0wyasmnqqngvm54x0gsxbwpxznvn747jkp0dx1nnppy1j9xj927y")))) + (build-system cargo-build-system) + (home-page "https://github.com/timvisee/version-compare") + (synopsis "Rust library to easily compare version numbers") + (description + "This package provides a Rust library to easily compare version +numbers, and test them against various comparison operators.") + (license license:expat))) + (define-public rust-version-compare-0.0.11 (package + (inherit rust-version-compare-0.1) (name "rust-version-compare") (version "0.0.11") (source @@ -69288,14 +69308,7 @@ If that fails, no determination is made, and calls return None.") (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "06v688jg6gd00zvm3cp7qh2h3mz8cs2ngr09bnwxhyddxrcwh60w")))) - (build-system cargo-build-system) - (home-page "https://github.com/timvisee/version-compare") - (synopsis "Rust library to easily compare version numbers") - (description - "This package provides a Rust library to easily compare version -numbers, and test them against various comparison operators.") - (license license:expat))) + (base32 "06v688jg6gd00zvm3cp7qh2h3mz8cs2ngr09bnwxhyddxrcwh60w")))))) (define-public rust-version-compare-0.0 rust-version-compare-0.0.11) -- cgit 1.4.1 From b9ad6cb413f7de052e24654201f7a56dcb3411b0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 27 Jul 2022 12:04:16 +0200 Subject: gnu: Add rust-similar-asserts. * gnu/packages/crates-io.scm (rust-similar-asserts-1): New variable. --- gnu/packages/crates-io.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 1b2a284161..eeab528ced 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -56532,6 +56532,32 @@ extensions.") (description "This package provides a diff library for Rust.") (license license:asl2.0))) +(define-public rust-similar-asserts-1 + (package + (name "rust-similar-asserts") + (version "1.2.0") + (source (origin + (method url-fetch) + (uri (crate-uri "similar-asserts" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1789db0fm85p4zvy44b2jwdjgw6h2b51bi133kak2l1pl8qzbjb4")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-console" ,rust-console-0.15) + ("rust-serde" ,rust-serde-1) + ("rust-similar" ,rust-similar-2)) + #:cargo-development-inputs + (("rust-serde" ,rust-serde-1)))) + (home-page "https://github.com/mitsuhiko/similar-asserts") + (synopsis "Asserts macros with colorized diff output") + (description + "This crate provides @code{assert_eq!}-like macros with colorized +diff output.") + (license license:asl2.0))) + (define-public rust-simplelog-0.11 (package (name "rust-simplelog") -- cgit 1.4.1 From 433cca4bc1da760693a5c9ff74e4429bb7cff9f3 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 25 Jul 2022 15:38:58 +0200 Subject: gnu: rust-cast: Add 0.3. * gnu/packages/crates-io.scm (rust-cast-0.3): New variable. (rust-cast-0.2): Inherit from it. --- gnu/packages/crates-io.scm | 32 +++++++++++++++++++++++++------- 1 file changed, 25 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index eeab528ced..38b10b6232 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -10177,8 +10177,32 @@ using linear constraints, like ``this button must line up with this text box''.") (license (list license:expat license:asl2.0)))) +(define-public rust-cast-0.3 + (package + (name "rust-cast") + (version "0.3.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "cast" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1dbyngbyz2qkk0jn2sxil8vrz3rnpcj142y184p9l4nbl9radcip")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-development-inputs + (("rust-quickcheck" ,rust-quickcheck-1)))) + (home-page "https://github.com/japaric/cast.rs") + (synopsis + "Ergonomic, checked cast functions for primitive types") + (description + "Ergonomic, checked cast functions for primitive types.") + (license (list license:expat license:asl2.0)))) + (define-public rust-cast-0.2 (package + (inherit rust-cast-0.3) (name "rust-cast") (version "0.2.3") (source @@ -10196,13 +10220,7 @@ box''.") #:cargo-inputs (("rust-rustc-version" ,rust-rustc-version-0.2)) #:cargo-development-inputs - (("rust-quickcheck" ,rust-quickcheck-0.9)))) - (home-page "https://github.com/japaric/cast.rs") - (synopsis - "Ergonomic, checked cast functions for primitive types") - (description - "Ergonomic, checked cast functions for primitive types.") - (license (list license:expat license:asl2.0)))) + (("rust-quickcheck" ,rust-quickcheck-0.9)))))) (define-public rust-cblas-sys-0.1 (package -- cgit 1.4.1 From df17c1aeb0a45c264f6a3e603c60c5bdf705cfb3 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 25 Jul 2022 16:05:34 +0200 Subject: gnu: rust-serial-test-derive: Add 0.6.0. * gnu/packages/crates-io.scm (rust-serial-test-derive-0.6): New variable. (rust-serial-test-derive-0.5): Inherit from it. --- gnu/packages/crates-io.scm | 33 ++++++++++++++++++++++++++++----- 1 file changed, 28 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 38b10b6232..886b1534b7 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -55157,31 +55157,54 @@ for later processing.") `(#:cargo-inputs (("rust-lazy-static" ,rust-lazy-static-1)))))) -(define-public rust-serial-test-derive-0.5 +(define-public rust-serial-test-derive-0.6 (package (name "rust-serial-test-derive") - (version "0.5.1") + (version "0.6.0") (source (origin (method url-fetch) (uri (crate-uri "serial_test_derive" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1m8sd97xr8dn6p9by0xwfqm0rz8cbn1ghs5l1fv1xd6xzvgddb5j")))) + (base32 "1s6aj2bs0rr8hnralx16bvbqlbrihmii7cyplggk5yv0gp6vr098")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs - (("rust-proc-macro2" ,rust-proc-macro2-1) + (("rust-proc-macro-error" ,rust-proc-macro-error-1) + ("rust-proc-macro2" ,rust-proc-macro2-1) ("rust-quote" ,rust-quote-1) + ("rust-rustversion" ,rust-rustversion-1) ("rust-syn" ,rust-syn-1)) #:cargo-development-inputs - (("rust-env-logger" ,rust-env-logger-0.7)))) + (("rust-env-logger" ,rust-env-logger-0.7) + ("rust-trybuild" ,rust-trybuild-1)))) (home-page "https://github.com/palfrey/serial_test") (synopsis "Helper crate for serial_test") (description "This package is an helper crate for @code{rust-serial-test}.") (license license:expat))) +(define-public rust-serial-test-derive-0.5 + (package + (inherit rust-serial-test-derive-0.6) + (name "rust-serial-test-derive") + (version "0.5.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "serial_test_derive" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1m8sd97xr8dn6p9by0xwfqm0rz8cbn1ghs5l1fv1xd6xzvgddb5j")))) + (arguments + `(#:cargo-inputs + (("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-1)) + #:cargo-development-inputs + (("rust-env-logger" ,rust-env-logger-0.7)))))) + (define-public rust-serial-test-derive-0.1 (package (inherit rust-serial-test-derive-0.5) -- cgit 1.4.1 From ead1112bb95f79e5f484dd661de0ecda8af24a33 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 25 Jul 2022 16:10:38 +0200 Subject: gnu: Add rust-fslock. * gnu/packages/crates-io.scm (rust-fslock-0.2): New variable. --- gnu/packages/crates-io.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 886b1534b7..4ab639e0eb 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -23054,6 +23054,27 @@ macOS API for file changes notifications") `(#:skip-build? #t ; only available on macOS #:cargo-inputs (("rust-libc" ,rust-libc-0.2)))))) +(define-public rust-fslock-0.2 + (package + (name "rust-fslock") + (version "0.2.1") + (source (origin + (method url-fetch) + (uri (crate-uri "fslock" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1yrv9j44k3njzpnh8m2jc0gr3hklzyzwfj3gmsdklbi76n4jnh84")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-libc" ,rust-libc-0.2) + ("rust-winapi" ,rust-winapi-0.3)))) + (home-page "https://github.com/brunoczim/fslock") + (synopsis "Lock file library") + (description "This package provides a library to use files as locks.") + (license license:expat))) + (define-public rust-fst-0.4 (package (name "rust-fst") -- cgit 1.4.1 From 37d28a662b6983bde397645e2e33ed1158170bd7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 25 Jul 2022 16:12:00 +0200 Subject: gnu: rust-serial-test: Add 0.6.0. * gnu/packages/crates-io.scm (rust-serial-test-0.6): New variable. (rust-serial-test-0.5): Inherit from it. --- gnu/packages/crates-io.scm | 31 ++++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 4ab639e0eb..0550947107 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -55136,10 +55136,10 @@ for later processing.") (description "This package provides YAML support for Serde.") (license (list license:expat license:asl2.0)))) -(define-public rust-serial-test-0.5 +(define-public rust-serial-test-0.6 (package (name "rust-serial-test") - (version "0.5.1") + (version "0.6.0") (source (origin (method url-fetch) @@ -55147,19 +55147,40 @@ for later processing.") (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0pchc7imdi9wv8xxnwkb9lzs6cg06ghs0gaajjb834y8837wpg70")))) + (base32 "05gcah6s133r44y4z5qskx7prs1vjlzgv06h4l2xb8gp30fw9g75")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs - (("rust-lazy-static" ,rust-lazy-static-1) + (("rust-document-features" ,rust-document-features-0.2) + ("rust-fslock" ,rust-fslock-0.2) + ("rust-lazy-static" ,rust-lazy-static-1) ("rust-parking-lot" ,rust-parking-lot-0.11) - ("rust-serial-test-derive" ,rust-serial-test-derive-0.5)))) + ("rust-serial-test-derive" ,rust-serial-test-derive-0.6)))) (home-page "https://github.com/palfrey/serial_test") (synopsis "Allows for the creation of serialised Rust tests") (description "This package allows for the creation of serialised Rust tests.") (license license:expat))) +(define-public rust-serial-test-0.5 + (package + (inherit rust-serial-test-0.6) + (name "rust-serial-test") + (version "0.5.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "serial-test" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0pchc7imdi9wv8xxnwkb9lzs6cg06ghs0gaajjb834y8837wpg70")))) + (arguments + `(#:cargo-inputs + (("rust-lazy-static" ,rust-lazy-static-1) + ("rust-parking-lot" ,rust-parking-lot-0.11) + ("rust-serial-test-derive" ,rust-serial-test-derive-0.5)))))) + (define-public rust-serial-test-0.1 (package (inherit rust-serial-test-0.5) -- cgit 1.4.1 From 74900a671a1ab215e46a6839e6159f728d9e78c0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 25 Jul 2022 16:25:49 +0200 Subject: gnu: rust-language-tags: Add 0.3.2. * gnu/packages/crates-io.scm (rust-language-tags-0.3): New variable. (rust-language-tags-0.2): Inherit from it. --- gnu/packages/crates-io.scm | 34 +++++++++++++++++++++++++++------- 1 file changed, 27 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 0550947107..6f09ab1e6a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -30630,10 +30630,10 @@ kernel32.") "This package provides a Log macro for log's kv-unstable backend.") (license (list license:expat license:asl2.0)))) -(define-public rust-language-tags-0.2 +(define-public rust-language-tags-0.3 (package (name "rust-language-tags") - (version "0.2.2") + (version "0.3.2") (source (origin (method url-fetch) @@ -30641,13 +30641,14 @@ kernel32.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "16hrjdpa827carq5x4b8zhas24d8kg4s16m6nmmn1kb7cr5qh7d9")))) + "124k6w9nx33q4xs8rpa9f7klshrsa0x4f7qngdwq890lpdj5jd6l")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-heapsize" ,rust-heapsize-0.3) - ("rust-heapsize-plugin" ,rust-heapsize-plugin-0.1)))) + `(#:cargo-inputs + (("rust-serde" ,rust-serde-1)) + #:cargo-development-inputs + (("rust-bencher" ,rust-bencher-0.1) + ("rust-serde-json" ,rust-serde-json-1)))) (home-page "https://github.com/pyfisch/rust-language-tags") (synopsis "Language tags for Rust") (description @@ -30658,6 +30659,25 @@ currently supports parsing (fully conformant parser), formatting and comparing language tags.") (license license:expat))) +(define-public rust-language-tags-0.2 + (package + (inherit rust-language-tags-0.3) + (name "rust-language-tags") + (version "0.2.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "language-tags" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "16hrjdpa827carq5x4b8zhas24d8kg4s16m6nmmn1kb7cr5qh7d9")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-heapsize" ,rust-heapsize-0.3) + ("rust-heapsize-plugin" ,rust-heapsize-plugin-0.1)))))) + (define-public rust-lab-0.11 (package (name "rust-lab") -- cgit 1.4.1 From 0a7560ec6f3fd2a0bc3adf97b9e3be3616d2ef20 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 25 Jul 2022 23:51:39 +0200 Subject: gnu: rust-safe-arch: Add 0.6.0. * gnu/packages/crates-io.scm (rust-safe-arch-0.6): New variable. (rust-safe-arch-0.5): Inherit from it. --- gnu/packages/crates-io.scm | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 6f09ab1e6a..e7fb388ef0 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -52619,21 +52619,20 @@ computation (experimental)") cipher.") (license (list license:expat license:asl2.0)))) -(define-public rust-safe-arch-0.5 +(define-public rust-safe-arch-0.6 (package (name "rust-safe-arch") - (version "0.5.2") + (version "0.6.0") (source (origin (method url-fetch) (uri (crate-uri "safe_arch" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "01ffy9aw9v1n4bcwl525zw3gnh18jk7aq38iqcn51bwnjrnkvzy1")))) + (base32 "0ad5ykwgq9ll1ymp83d9cayzj8q191rik71ga5wzkndhrkj22j3r")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-bytemuck" ,rust-bytemuck-1)))) (home-page "https://github.com/Lokathor/safe_arch") (synopsis "Access core::arch safely") @@ -52641,6 +52640,24 @@ cipher.") @code{#[cfg()]}.") (license (list license:zlib license:asl2.0 license:expat)))) + +(define-public rust-safe-arch-0.5 + (package + (inherit rust-safe-arch-0.6) + (name "rust-safe-arch") + (version "0.5.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "safe_arch" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "01ffy9aw9v1n4bcwl525zw3gnh18jk7aq38iqcn51bwnjrnkvzy1")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-bytemuck" ,rust-bytemuck-1)))))) + (define-public rust-safemem-0.3 (package (name "rust-safemem") -- cgit 1.4.1 From 29787b45f01be9580c705112ff91e861c6c4fc3c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 25 Jul 2022 23:52:37 +0200 Subject: gnu: rust-wide: Add 0.7.4. * gnu/packages/crates-io.scm (rust-wide-0.7): New variable. (rust-wide-0.6, rust-wide-0.4): Inherit from it. --- gnu/packages/crates-io.scm | 36 ++++++++++++++++++++++++++++-------- 1 file changed, 28 insertions(+), 8 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index e7fb388ef0..ad9052c1a1 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -71042,10 +71042,10 @@ It locates installed executable in cross platforms.") environment.") (license (list license:expat license:boost1.0)))) -(define-public rust-wide-0.4 +(define-public rust-wide-0.7 (package (name "rust-wide") - (version "0.4.6") + (version "0.7.4") (source (origin (method url-fetch) @@ -71054,22 +71054,23 @@ environment.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0ad75vnzygj8qfcl1l9n4wi93xmqzvhqlpqn4hfayrwbn6wa69aq")))) + "0psw31mh21cn4w7i0klsz7law8p8iddsqir8x35cf6n3vb8s5axk")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs - (("rust-bytemuck" ,rust-bytemuck-1)))) + (("rust-bytemuck" ,rust-bytemuck-1) + ("rust-safe-arch" ,rust-safe-arch-0.6)))) (home-page "https://github.com/Lokathor/wide") (synopsis "Rust for wide blocks") (description "This crate has data types for blocks of primitives packed together and used as a single unit. This works very well with SIMD/vector hardware of various targets. Both in terms of explicit SIMD usage and also in terms of allowing LLVM's auto-vectorizer to do its job.") - (license license:zlib))) + (license (list license:zlib license:asl2.0 license:expat)))) (define-public rust-wide-0.6 (package - (inherit rust-wide-0.4) + (inherit rust-wide-0.7) (name "rust-wide") (version "0.6.5") (source @@ -71083,8 +71084,27 @@ terms of allowing LLVM's auto-vectorizer to do its job.") (arguments `(#:cargo-inputs (("rust-bytemuck" ,rust-bytemuck-1) - ("rust-safe-arch" ,rust-safe-arch-0.5)))) - (license (list license:zlib license:asl2.0 license:expat)))) + ("rust-safe-arch" ,rust-safe-arch-0.5)))))) + +(define-public rust-wide-0.4 + (package + (inherit rust-wide-0.6) + (name "rust-wide") + (version "0.4.6") + (source + (origin + (method url-fetch) + (uri (crate-uri "wide" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0ad75vnzygj8qfcl1l9n4wi93xmqzvhqlpqn4hfayrwbn6wa69aq")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-bytemuck" ,rust-bytemuck-1)))) + (license (list license:zlib)))) (define-public rust-widestring-0.4 (package -- cgit 1.4.1 From 4c7888f628e4e9c6eef033a9d39f84e1c9b242dc Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 26 Jul 2022 00:10:46 +0200 Subject: gnu: rust-simba: Add 0.6.0. * gnu/packages/crates-io.scm (rust-simba-0.6): New variable. (rust-simba-0.5, rust-simba-0.1): Inherit from it. --- gnu/packages/crates-io.scm | 57 ++++++++++++++++++++++++++++++++++------------ 1 file changed, 42 insertions(+), 15 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index ad9052c1a1..89fd79e205 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -56389,32 +56389,33 @@ It's not intended to be used directly. See the signature crate's documentation for additional details.") (license (list license:asl2.0 license:expat)))) -(define-public rust-simba-0.1 +(define-public rust-simba-0.6 (package (name "rust-simba") - (version "0.1.5") + (version "0.6.0") (source (origin (method url-fetch) (uri (crate-uri "simba" version)) - (file-name - (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1chz3abrvrj4qz86gwrrzajsl5zcc2l0dhxi39mymbgscw9ip4zv")))) + "0px0nncs3ki86pjcldz40mhvraywh7y9jypfcqqdcihs287q9dzh")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs - (("rust-approx" ,rust-approx-0.3) + (("rust-approx" ,rust-approx-0.5) ("rust-cordic" ,rust-cordic-0.1) ("rust-decimal" ,rust-decimal-2) ("rust-fixed" ,rust-fixed-1) - ("rust-num-complex" ,rust-num-complex-0.2) + ("rust-libm" ,rust-libm-0.2) + ("rust-num-complex" ,rust-num-complex-0.4) ("rust-num-traits" ,rust-num-traits-0.2) ("rust-packed-simd" ,rust-packed-simd-0.3) - ("rust-paste" ,rust-paste-0.1) - ("rust-rand" ,rust-rand-0.7) - ("rust-wide" ,rust-wide-0.4)))) + ("rust-paste" ,rust-paste-1) + ("rust-rand" ,rust-rand-0.8) + ("rust-serde" ,rust-serde-1) + ("rust-wide" ,rust-wide-0.7)))) (home-page "https://github.com/dimforge/simba") (synopsis "SIMD algebra for Rust") (description "This package provides a set of mathematical traits to @@ -56424,7 +56425,7 @@ pattern in Rust.") (define-public rust-simba-0.5 (package - (inherit rust-simba-0.1) + (inherit rust-simba-0.6) (name "rust-simba") (version "0.5.1") (source @@ -56434,7 +56435,6 @@ pattern in Rust.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "0p1x1ndajy4j3dr9zbh79cz5k0hbj4p9bagd7cj00gc5aws0d0lf")))) - (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs @@ -56449,12 +56449,11 @@ pattern in Rust.") ("rust-paste" ,rust-paste-1) ("rust-rand" ,rust-rand-0.8) ("rust-serde" ,rust-serde-1) - ("rust-wide" ,rust-wide-0.6)))) - (license license:asl2.0))) + ("rust-wide" ,rust-wide-0.6)))))) (define-public rust-simba-0.4 (package - (inherit rust-simba-0.1) + (inherit rust-simba-0.5) (name "rust-simba") (version "0.4.0") (source @@ -56481,6 +56480,34 @@ pattern in Rust.") ("rust-wide" ,rust-wide-0.6)))) (license license:asl2.0))) +(define-public rust-simba-0.1 + (package + (inherit rust-simba-0.4) + (name "rust-simba") + (version "0.1.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "simba" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1chz3abrvrj4qz86gwrrzajsl5zcc2l0dhxi39mymbgscw9ip4zv")))) + (arguments + `(#:cargo-inputs + (("rust-approx" ,rust-approx-0.3) + ("rust-cordic" ,rust-cordic-0.1) + ("rust-decimal" ,rust-decimal-2) + ("rust-fixed" ,rust-fixed-1) + ("rust-num-complex" ,rust-num-complex-0.2) + ("rust-num-traits" ,rust-num-traits-0.2) + ("rust-packed-simd" ,rust-packed-simd-0.3) + ("rust-paste" ,rust-paste-0.1) + ("rust-rand" ,rust-rand-0.7) + ("rust-wide" ,rust-wide-0.4)))) + (license license:bsd-3))) + (define-public rust-simd-0.2 (package (name "rust-simd") -- cgit 1.4.1 From 5830332150ae26412b0bfba0bd6e6ea674087442 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 26 Jul 2022 00:24:18 +0200 Subject: gnu: rust-nalgebra: Add 0.29.0. * gnu/packages/crates-io.scm (rust-nalgebra-0.29): New variable. (rust-nalgebra-0.26): Inherit from it. --- gnu/packages/crates-io.scm | 65 +++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 58 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 89fd79e205..f889cf417c 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -35919,8 +35919,65 @@ quick compile time, and minimal dependencies.") #:cargo-inputs (("rust-rayon" ,rust-rayon-1)))))) +(define-public rust-nalgebra-0.29 + (package + (name "rust-nalgebra") + (version "0.29.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "nalgebra" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1zri11vkrbk3ayvy8xqcdvvyjvfcbl5a18x8z82racnn11zfn1nm")) + (modules '((guix build utils))))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ;TODO: how to enable required features? + #:cargo-inputs + (("rust-abomonation" ,rust-abomonation-0.7) + ("rust-alga" ,rust-alga-0.9) + ("rust-approx" ,rust-approx-0.5) + ("rust-bytemuck" ,rust-bytemuck-1) + ("rust-glam" ,rust-glam-0.17) + ("rust-glam" ,rust-glam-0.16) + ("rust-glam" ,rust-glam-0.15) + ("rust-glam" ,rust-glam-0.14) + ("rust-glam" ,rust-glam-0.13) + ("rust-matrixcompare-core" ,rust-matrixcompare-core-0.1) + ("rust-matrixmultiply" ,rust-matrixmultiply-0.3) + ("rust-mint" ,rust-mint-0.5) + ("rust-nalgebra-macros" ,rust-nalgebra-macros-0.1) + ("rust-num-complex" ,rust-num-complex-0.4) + ("rust-num-rational" ,rust-num-rational-0.4) + ("rust-num-traits" ,rust-num-traits-0.2) + ("rust-pest" ,rust-pest-2) + ("rust-pest-derive" ,rust-pest-derive-2) + ("rust-proptest" ,rust-proptest-1) + ("rust-quickcheck" ,rust-quickcheck-1) + ("rust-rand" ,rust-rand-0.8) + ("rust-rand-distr" ,rust-rand-distr-0.4) + ("rust-rkyv" ,rust-rkyv-0.6) + ("rust-serde" ,rust-serde-1) + ("rust-simba" ,rust-simba-0.6) + ("rust-typenum" ,rust-typenum-1)) + #:cargo-development-inputs + (("rust-criterion" ,rust-criterion-0.3) + ("rust-itertools" ,rust-itertools-0.10) + ("rust-matrixcompare" ,rust-matrixcompare-0.3) + ("rust-rand-isaac" ,rust-rand-isaac-0.3) + ("rust-rand-xorshift" ,rust-rand-xorshift-0.3) + ("rust-serde-json" ,rust-serde-json-1)))) + (home-page "https://nalgebra.org") + (synopsis "Linear algebra library") + (description + "This package provides a general-purpose linear algebra library with +transformations and statically-sized or dynamically-sized matrices.") + (license license:bsd-3))) + (define-public rust-nalgebra-0.26 (package + (inherit rust-nalgebra-0.29) (name "rust-nalgebra") (version "0.26.2") (source @@ -35966,13 +36023,7 @@ quick compile time, and minimal dependencies.") ("rust-matrixcompare" ,rust-matrixcompare-0.2) ("rust-rand-isaac" ,rust-rand-isaac-0.3) ("rust-rand-xorshift" ,rust-rand-xorshift-0.3) - ("rust-serde-json" ,rust-serde-json-1)))) - (home-page "https://nalgebra.org") - (synopsis "Linear algebra library") - (description - "This package provides a general-purpose linear algebra library with -transformations and statically-sized or dynamically-sized matrices.") - (license license:bsd-3))) + ("rust-serde-json" ,rust-serde-json-1)))))) (define-public rust-nalgebra-0.21 (package -- cgit 1.4.1 From da5fdb971038e09632b8bfd7a526d4ef206009bb Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 26 Jul 2022 00:31:05 +0200 Subject: gnu: rust-rctree: Add 0.4. * gnu/packages/crates-io.scm (rust-rctree-0.4): New variable. (rust-rctree-0.3): Inherit from it. --- gnu/packages/crates-io.scm | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index f889cf417c..e907f6cc6a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -48088,19 +48088,18 @@ Rust.") (description "This package provides core APIs for Rayon.") (license (list license:asl2.0 license:expat)))) -(define-public rust-rctree-0.3 +(define-public rust-rctree-0.4 (package (name "rust-rctree") - (version "0.3.3") + (version "0.4.0") (source (origin (method url-fetch) (uri (crate-uri "rctree" version)) - (file-name - (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1a54z2b850albiqx9vw009p9xg363vqzh1ybkwb89zn8375jk7my")))) + "1s92472lniqn2c0b5ln8ssl014x0raiyzkk0hagrvsd6far2iq4s")))) (build-system cargo-build-system) (home-page "https://github.com/RazrFalcon/rctree") (synopsis "DOM-like tree implemented using reference counting") @@ -48108,6 +48107,20 @@ Rust.") reference counting.") (license license:expat))) +(define-public rust-rctree-0.3 + (package + (inherit rust-rctree-0.4) + (name "rust-rctree") + (version "0.3.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "rctree" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1a54z2b850albiqx9vw009p9xg363vqzh1ybkwb89zn8375jk7my")))))) + (define-public rust-rdrand-0.4 (package (name "rust-rdrand") -- cgit 1.4.1 From 42eaddb1e1f36f8ca54196e009071a35ce742e03 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 26 Jul 2022 00:37:01 +0200 Subject: gnu: rust-selectors: Add 0.23.0. * gnu/packages/crates-io.scm (rust-selectors-0.23): New variable. (rust-selectors-0.22): Inherit from it. --- gnu/packages/crates-io.scm | 37 ++++++++++++++++++++++++++++++++----- 1 file changed, 32 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index e907f6cc6a..a79ccf7d92 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -53910,8 +53910,39 @@ macOS and iOS.") (("rust-core-foundation-sys" ,rust-core-foundation-sys-0.2) ("rust-libc" ,rust-libc-0.2)))))) +(define-public rust-selectors-0.23 + (package + (name "rust-selectors") + (version "0.23.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "selectors" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "17w7slv2bkksvbq6pggx3db23vh1g022hxv06smilwmyhv38gspx")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-cssparser" ,rust-cssparser-0.28) + ("rust-derive-more" ,rust-derive-more-0.99) + ("rust-fxhash" ,rust-fxhash-0.2) + ("rust-log" ,rust-log-0.4) + ("rust-phf" ,rust-phf-0.8) + ("rust-phf-codegen" ,rust-phf-codegen-0.8) + ("rust-precomputed-hash" ,rust-precomputed-hash-0.1) + ("rust-servo-arc" ,rust-servo-arc-0.1) + ("rust-smallvec" ,rust-smallvec-1)))) + (home-page "https://github.com/servo/servo") + (synopsis "CSS Selectors matching for Rust") + (description "This package provides CSS Selectors matching for Rust.") + (license license:mpl2.0))) + (define-public rust-selectors-0.22 (package + (inherit rust-selectors-0.23) (name "rust-selectors") (version "0.22.0") (source @@ -53938,11 +53969,7 @@ macOS and iOS.") ("rust-smallvec" ,rust-smallvec-1) ("rust-thin-slice" ,rust-thin-slice-0.1)) #:cargo-development-inputs - (("rust-phf-codegen" ,rust-phf-codegen-0.8)))) - (home-page "https://github.com/servo/servo") - (synopsis "CSS Selectors matching for Rust") - (description "This package provides CSS Selectors matching for Rust.") - (license license:mpl2.0))) + (("rust-phf-codegen" ,rust-phf-codegen-0.8)))))) (define-public rust-selectors-0.21 (package -- cgit 1.4.1 From 65a0cb14cd27bfe53a233dd391e451dc3ffd7fca Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 26 Jul 2022 00:41:37 +0200 Subject: gnu: Add rust-test-generator. * gnu/packages/crates-io.scm (rust-test-generator-0.3): New variable. --- gnu/packages/crates-io.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index a79ccf7d92..544d85a544 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -62780,6 +62780,33 @@ into mod, giving clear and readable test results.") for TLS).") (license (list license:expat license:asl2.0)))) +(define-public rust-test-generator-0.3 + (package + (name "rust-test-generator") + (version "0.3.0") + (source (origin + (method url-fetch) + (uri (crate-uri "test-generator" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1h03y4503jhhrks4m7xqfjya9lsx3ip5dlbldr7mgcws6j8bx5za")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-glob" ,rust-glob-0.3) + ("rust-proc-macro2" ,rust-proc-macro2-0.4) + ("rust-quote" ,rust-quote-0.6) + ("rust-syn" ,rust-syn-0.15)))) + (home-page "https://github.com/frehberg/test-generator") + (synopsis "Generate parameterized tests from different input parameters") + (description + "This crate provides @code{#[test_resources]} and @code{#[bench_resources]} +procedural macro attributes that generates multiple parameterized tests using +one body with different resource input parameters. A test is generated for +each resource matching the specific resource location pattern.") + (license license:asl2.0))) + (define-public rust-tester-0.5 (package (name "rust-tester") -- cgit 1.4.1 From 28364584af22b9367615b08c77e81474d255d641 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 26 Jul 2022 00:47:48 +0200 Subject: gnu: rust-dlib: Add 0.5.0. * gnu/packages/crates-io.scm (rust-dlib-0.5): New variable. (rust-dlib-0.4): Inherit from it. --- gnu/packages/crates-io.scm | 34 ++++++++++++++++++++++++++-------- 1 file changed, 26 insertions(+), 8 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 544d85a544..0802330a78 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -18420,8 +18420,33 @@ Central Dispatch.") Google's diff-match-patch.") (license (list license:expat license:asl2.0)))) +(define-public rust-dlib-0.5 + (package + (name "rust-dlib") + (version "0.5.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "dlib" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1547hy7nrhkrb2i09va244c0h8mr845ccbs2d2mc414c68bpa6xc")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ;FIXME: Several macros are not found. + #:cargo-inputs + (("rust-libloading" ,rust-libloading-0.7)))) + (home-page "https://github.com/vberger/dlib") + (synopsis "Helper macros for manually loading optional system libraries") + (description + "This package provides helper macros for handling manually loading optional +system libraries.") + (license license:expat))) + (define-public rust-dlib-0.4 (package + (inherit rust-dlib-0.5) (name "rust-dlib") (version "0.4.2") (source @@ -18433,18 +18458,11 @@ Google's diff-match-patch.") (sha256 (base32 "0xlsf3lrz9hd7q3ff6lp5mw4kn3nbryn746kd07i93r6wg8ia7xi")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-libloading" ,rust-libloading-0.6)))) (inputs - (list rust-libloading-0.6)) - (home-page "https://github.com/vberger/dlib") - (synopsis "Helper macros for manually loading optional system libraries") - (description - "This package provides helper macros for handling manually loading optional -system libraries.") - (license license:expat))) + (list rust-libloading-0.6)))) (define-public rust-dlv-list-0.2 (package -- cgit 1.4.1 From 665fb3b1886771a2a842bf7deb88389a77c4cabe Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 26 Jul 2022 00:50:17 +0200 Subject: gnu: Add rust-const-cstr. * gnu/packages/crates-io.scm (rust-const-cstr-0.3): New variable. --- gnu/packages/crates-io.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 0802330a78..da16a6ef15 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -12260,6 +12260,25 @@ idiomatic wrappers for Mac OS X's CommonCrypto library.") "Common path finds the common prefix between a set of paths.") (license (list license:expat license:asl2.0)))) +(define-public rust-const-cstr-0.3 + (package + (name "rust-const-cstr") + (version "0.3.0") + (source (origin + (method url-fetch) + (uri (crate-uri "const-cstr" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "19ij6m8s16d0i7vma535l7w4x8bcanjcxs7c6n7sci86ydghnggd")))) + (build-system cargo-build-system) + (home-page "https://github.com/cybergeek94/const-cstr") + (synopsis "Create static C-compatible strings from Rust string literals") + (description + "This crate lets you create static C-compatible strings from Rust string +literals.") + (license (list license:expat license:asl2.0)))) + ;; This package requires features which are unavailable ;; on the stable releases of Rust. (define-public rust-compiler-builtins-0.1 -- cgit 1.4.1 From 6f7b463cbb2418f8858b22bb23edb93c4ca34caa Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 26 Jul 2022 00:54:12 +0200 Subject: gnu: Add rust-yeslogic-fontconfig-sys. * gnu/packages/crates-io.scm (rust-yeslogic-fontconfig-sys-3): New variable. --- gnu/packages/crates-io.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index da16a6ef15..4d5c6070d5 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -72389,6 +72389,35 @@ Read/Write streams as well as low-level in-memory encoding and decoding.") library.") (license (list license:expat license:asl2.0)))) +(define-public rust-yeslogic-fontconfig-sys-3 + (package + (name "rust-yeslogic-fontconfig-sys") + (version "3.2.0") + (source (origin + (method url-fetch) + (uri (crate-uri "yeslogic-fontconfig-sys" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "11n3126s717rjqxhf5js3hc0qq8qv7jbicbiyszyp5yk6s8ddfzj")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-const-cstr" ,rust-const-cstr-0.3) + ("rust-dlib" ,rust-dlib-0.5) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-pkg-config" ,rust-pkg-config-0.3)))) + (native-inputs + (list pkg-config)) + (inputs + (list fontconfig)) + (home-page "https://github.com/yeslogic/fontconfig-rs") + (synopsis "Raw bindings to Fontconfig without a vendored C library") + (description + "This package provides a wrapper around the @code{Fontconfig} library, +for locating fonts.") + (license license:expat))) + (define-public rust-zbase32-0.1 (package (name "rust-zbase32") -- cgit 1.4.1 From c5837dfd8117ca93d161f3eb345b9974520eb7dd Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 26 Jul 2022 00:57:21 +0200 Subject: gnu: rust-takeable-option: Add 0.5.0. * gnu/packages/crates-io.scm (rust-takeable-option): Add 0.5.0. (rust-takeable-option-0.4): Inherit from it. --- gnu/packages/crates-io.scm | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 4d5c6070d5..55d89f6527 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -61392,19 +61392,18 @@ without a mutable reference.") (description "This package lets you temporarily take a T from a &mut T.") (license license:expat))) -(define-public rust-takeable-option-0.4 +(define-public rust-takeable-option-0.5 (package (name "rust-takeable-option") - (version "0.4.0") + (version "0.5.0") (source (origin (method url-fetch) (uri (crate-uri "takeable-option" version)) - (file-name - (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0hvd6vk4ksgg2y99498jw52ric4lxm0i6ygpzqm95gdrhvsxyynp")))) + "182axkm8pq7cynsfn65ar817mmdhayrjmbl371yqp8zyzhr8kbin")))) (build-system cargo-build-system) (home-page "https://docs.rs/takeable-option/") (synopsis "Small wrapper around option") @@ -61412,6 +61411,21 @@ without a mutable reference.") "This package provides a small wrapper around option.") (license (list license:asl2.0 license:expat)))) +(define-public rust-takeable-option-0.4 + (package + (inherit rust-takeable-option-0.5) + (name "rust-takeable-option") + (version "0.4.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "takeable-option" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0hvd6vk4ksgg2y99498jw52ric4lxm0i6ygpzqm95gdrhvsxyynp")))))) + (define-public rust-tap-1 (package (name "rust-tap") -- cgit 1.4.1 From 986fc1795618304075616a4463a4dfddae5f0791 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 26 Jul 2022 11:18:41 +0200 Subject: gnu: rust-num-enum-derive: Add 0.5.7. * gnu/packages/crates-io.scm (rust-num-enum-derive-0.5): New variable. (rust-num-enum-derive-0.4): Inherit from it. --- gnu/packages/crates-io.scm | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 55d89f6527..58074a075a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -38604,22 +38604,22 @@ Rust.") primitives and enums easier.") (license license:bsd-3))) -(define-public rust-num-enum-derive-0.4 +(define-public rust-num-enum-derive-0.5 (package (name "rust-num-enum-derive") - (version "0.4.3") + (version "0.5.7") (source (origin (method url-fetch) (uri (crate-uri "num_enum_derive" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "17fvb7xpxq2dsqp5nsz98w1qhkk3gnc56xis53009vnzvlys79gz")))) + (base32 "1kj6b8f2fx8prlcl6y1k97668s5aiia4f9gjlk0nmpak3rj9h11v")))) (build-system cargo-build-system) (arguments `(#:tests? #f ;FIXME: some doc tests fail #:cargo-inputs - (("rust-proc-macro-crate" ,rust-proc-macro-crate-0.1) + (("rust-proc-macro-crate" ,rust-proc-macro-crate-1) ("rust-proc-macro2" ,rust-proc-macro2-1) ("rust-quote" ,rust-quote-1) ("rust-syn" ,rust-syn-1)))) @@ -38630,6 +38630,27 @@ primitives and enums easier.") primitives and enums easier.") (license license:bsd-3))) +(define-public rust-num-enum-derive-0.4 + (package + (inherit rust-num-enum-derive-0.5) + (name "rust-num-enum-derive") + (version "0.4.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "num_enum_derive" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "17fvb7xpxq2dsqp5nsz98w1qhkk3gnc56xis53009vnzvlys79gz")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ;FIXME: some doc tests fail + #:cargo-inputs + (("rust-proc-macro-crate" ,rust-proc-macro-crate-0.1) + ("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-1)))))) + (define-public rust-num-format-0.4 (package (name "rust-num-format") -- cgit 1.4.1 From 2e217866cdfd67403db17d8bf011b12a9cbe4889 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 26 Jul 2022 11:27:53 +0200 Subject: gnu: rust-num-enum: Add 0.5.7. * gnu/packages/crates-io.scm (rust-num-enum-0.5): New variable. (rust-num-enum-0.4): Inherit from it. --- gnu/packages/crates-io.scm | 34 +++++++++++++++++++++++++++++----- 1 file changed, 29 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 58074a075a..0cf8f899a2 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -38579,8 +38579,37 @@ Rust.") (description "Numeric syntax extensions in Rust.") (license (list license:expat license:asl2.0)))) +(define-public rust-num-enum-0.5 + (package + (name "rust-num-enum") + (version "0.5.7") + (source + (origin + (method url-fetch) + (uri (crate-uri "num_enum" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1j8rq7i4xnbzy72z82k41469xlj1bmn4ixagd9wlbvv2ark9alyg")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #false ;missing files + #:cargo-inputs + (("rust-num-enum-derive" ,rust-num-enum-derive-0.5)) + #:cargo-development-inputs + (("rust-anyhow" ,rust-anyhow-1) + ("rust-rustversion" ,rust-rustversion-1) + ("rust-trybuild" ,rust-trybuild-1) + ("rust-walkdir" ,rust-walkdir-2)))) + (home-page "https://github.com/illicitonion/num_enum") + (synopsis "Macros easing inter-operation between primitives and enums") + (description + "This library provides procedural macros to make inter-operation between +primitives and enums easier.") + (license (list license:bsd-3 license:expat license:asl2.0)))) + (define-public rust-num-enum-0.4 (package + (inherit rust-num-enum-0.5) (name "rust-num-enum") (version "0.4.3") (source @@ -38597,11 +38626,6 @@ Rust.") (("rust-derivative" ,rust-derivative-2) ("rust-num-enum" ,rust-num-enum-0.4) ("rust-num-enum-derive" ,rust-num-enum-derive-0.4)))) - (home-page "https://github.com/illicitonion/num_enum") - (synopsis "Macros easing inter-operation between primitives and enums") - (description - "This library provides procedural macros to make inter-operation between -primitives and enums easier.") (license license:bsd-3))) (define-public rust-num-enum-derive-0.5 -- cgit 1.4.1 From 551e9e958754f675cdd674405bf24924383f8362 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 26 Jul 2022 11:35:50 +0200 Subject: gnu: rust-calloop: Add 0.9.3. * gnu/packages/crates-io.scm (rust-calloop-0.9): New variable. (rust-calloop-0.6): Inherit from it. --- gnu/packages/crates-io.scm | 33 ++++++++++++++++++++++++++++----- 1 file changed, 28 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 0cf8f899a2..696aef620a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -9449,8 +9449,35 @@ spreadsheet file.") ("rust-serde" ,rust-serde-1) ("rust-zip" ,rust-zip-0.5)))))) +(define-public rust-calloop-0.9 + (package + (name "rust-calloop") + (version "0.9.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "calloop" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "10mbcsd7fj3cg0a463h3003wycv955cnj4pm2gla2sp5xxhyqbmz")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ;XXX fails without stdin, fixed in 0.11 + #:cargo-inputs + (("rust-futures-io" ,rust-futures-io-0.3) + ("rust-futures-util" ,rust-futures-util-0.3) + ("rust-log" ,rust-log-0.4) + ("rust-nix" ,rust-nix-0.22)) + #:cargo-development-inputs + (("rust-futures" ,rust-futures-0.3)))) + (home-page "https://github.com/Smithay/calloop") + (synopsis "Callback-based event loop") + (description "This package provides a callback-based event loop.") + (license license:expat))) + (define-public rust-calloop-0.6 (package + (inherit rust-calloop-0.9) (name "rust-calloop") (version "0.6.5") (source @@ -9465,11 +9492,7 @@ spreadsheet file.") `(#:skip-build? #t #:cargo-inputs (("rust-log" ,rust-log-0.4) - ("rust-nix" ,rust-nix-0.18)))) - (home-page "https://github.com/Smithay/calloop") - (synopsis "Callback-based event loop") - (description "This package provides a callback-based event loop.") - (license license:expat))) + ("rust-nix" ,rust-nix-0.18)))))) (define-public rust-calloop-0.4 (package -- cgit 1.4.1 From 25d59733a52075fe802b7928fdaa2f236814cd15 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 26 Jul 2022 11:39:44 +0200 Subject: gnu: rust-raw-window-handle: Add 0.4.3. * gnu/packages/crates-graphics.scm (rust-raw-window-handle-0.4): New variable. (rust-raw-window-handle-0.3): Inherit from it. --- gnu/packages/crates-graphics.scm | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm index d1a9c4dd6d..5d88cb0372 100644 --- a/gnu/packages/crates-graphics.scm +++ b/gnu/packages/crates-graphics.scm @@ -2087,28 +2087,45 @@ interactive applications.") images in AVIF format.") (license license:bsd-3))) -(define-public rust-raw-window-handle-0.3 +(define-public rust-raw-window-handle-0.4 (package (name "rust-raw-window-handle") - (version "0.3.3") + (version "0.4.3") (source (origin (method url-fetch) (uri (crate-uri "raw-window-handle" version)) - (file-name - (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "04c2wir7qq3g2b143yav52a1g5ack8ffqx2bpmrn9bc0dix1li0a")))) + "0hgvrqbr2b62zhq4ryv08h92mwis9v8f7j9pwcgxzlp7nswvw05q")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs (("rust-libc" ,rust-libc-0.2)))) + `(#:cargo-inputs + (("rust-cty" ,rust-cty-0.2)))) (home-page "https://github.com/rust-windowing/raw-window-handle") (synopsis "Interoperability library for Rust Windowing applications") (description "Interoperability library for Rust Windowing applications.") (license license:expat))) +(define-public rust-raw-window-handle-0.3 + (package + (inherit rust-raw-window-handle-0.4) + (name "rust-raw-window-handle") + (version "0.3.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "raw-window-handle" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "04c2wir7qq3g2b143yav52a1g5ack8ffqx2bpmrn9bc0dix1li0a")))) + (arguments + `(#:cargo-inputs (("rust-libc" ,rust-libc-0.2)))))) + (define-public rust-resize-0.3 (package (name "rust-resize") -- cgit 1.4.1 From f3673447cc9f3f943925cc0983bd61fe7c7fa67d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 24 Jul 2022 00:54:57 +0200 Subject: gnu: rust-smallvec: Update to 1.9.0. * gnu/packages/crates-io.scm (rust-smallvec-1): Update to 1.9.0. [arguments]: Add RUST-ARBITRATY-1 to #:cargo-inputs. --- gnu/packages/crates-io.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 75009b6cf1..5e077fc98a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -57669,7 +57669,7 @@ inline storage.") (define-public rust-smallvec-1 (package (name "rust-smallvec") - (version "1.6.1") + (version "1.9.0") (source (origin (method url-fetch) @@ -57678,11 +57678,12 @@ inline storage.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0kk08axr0ybfbjzk65a41k84mb6sfhyajmfndaka9igkx34kf3zy")))) + "1lfss4vs5z5njm3ac9c499s5m1gphzm5a7gxcbw1zncpjmsdpl1g")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs - (("rust-serde" ,rust-serde-1)) + (("rust-arbitrary" ,rust-arbitrary-1) + ("rust-serde" ,rust-serde-1)) #:cargo-development-inputs (("rust-bincode" ,rust-bincode-1)))) (home-page "https://github.com/servo/rust-smallvec") -- cgit 1.4.1 From ca5f1dd01e9ac11f41175303280b0b34bba5548d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 24 Jul 2022 00:57:24 +0200 Subject: gnu: rust-target-lexicon: Update to 0.12.4. * gnu/packages/crates-io.scm (rust-target-lexicon-0.12): Update to 0.12.4. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 5e077fc98a..bc37722ae0 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -61579,14 +61579,14 @@ memory all at once.") (define-public rust-target-lexicon-0.12 (package (name "rust-target-lexicon") - (version "0.12.2") + (version "0.12.4") (source (origin (method url-fetch) (uri (crate-uri "target-lexicon" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1zsvillq0zsggg3fb0mfmcia0f68wfclahaqc0zgln14pkfzrgyr")))) + (base32 "1hfk4v8gbhczr6jwsy1ja6yg4npkvznym6b7r4fbgjc0fw428960")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t)) (home-page "https://github.com/CraneStation/target-lexicon") -- cgit 1.4.1 From 7b38d7731ab06046f3dfd68f83e7aacf611e6e21 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 24 Jul 2022 00:55:48 +0200 Subject: gnu: rust-cfg-expr: Add 0.10.3. * gnu/packages/crates-io.scm (rust-cfg-expr-0.10): New variable. (rust-cfg-expr-0.8): Inherit from it. --- gnu/packages/crates-io.scm | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index bc37722ae0..1958f1c209 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -10421,24 +10421,24 @@ that need to represent UTF-16 data as 8-bit characters.") winded @code{#[cfg()]} checks.") (license license:expat))) -(define-public rust-cfg-expr-0.8 +(define-public rust-cfg-expr-0.10 (package (name "rust-cfg-expr") - (version "0.8.1") + (version "0.10.3") (source (origin (method url-fetch) (uri (crate-uri "cfg-expr" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "03lgv8psc2qrr93hxgdfmfwbj1crpzghxd7qh6w2nz0l4qryh4ml")))) + (base32 "1nw50j1sl6q96067399r1c6ppwp483q6vvmqdsnv493cv7sarb0a")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-smallvec" ,rust-smallvec-1) ("rust-target-lexicon" ,rust-target-lexicon-0.12)) #:cargo-development-inputs - (("rust-difference" ,rust-difference-2)))) + (("rust-similar-asserts" ,rust-similar-asserts-1)))) (home-page "https://github.com/EmbarkStudios/cfg-expr") (synopsis "Parser and evaluator for Rust @code{cfg()} expressions") (description @@ -10446,6 +10446,26 @@ winded @code{#[cfg()]} checks.") expressions.") (license (list license:expat license:asl2.0)))) +(define-public rust-cfg-expr-0.8 + (package + (inherit rust-cfg-expr-0.10) + (name "rust-cfg-expr") + (version "0.8.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "cfg-expr" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "03lgv8psc2qrr93hxgdfmfwbj1crpzghxd7qh6w2nz0l4qryh4ml")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-smallvec" ,rust-smallvec-1) + ("rust-target-lexicon" ,rust-target-lexicon-0.12)) + #:cargo-development-inputs + (("rust-difference" ,rust-difference-2)))))) + (define-public rust-cfg-expr-0.7 (package (inherit rust-cfg-expr-0.8) -- cgit 1.4.1 From 8d05800f67041365c50f1d963dce6198b7b85754 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 24 Jul 2022 00:56:44 +0200 Subject: gnu: rust-system-deps: Add 6.0.2. * gnu/packages/crates-io.scm (rust-system-deps-6): New variable. (rust-system-deps-3): Inherit from it. --- gnu/packages/crates-io.scm | 43 +++++++++++++++++++++++++++++++++++++------ 1 file changed, 37 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 1958f1c209..2944a7249c 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -61353,31 +61353,31 @@ processors, disks, components and networks.") (description "Send log messages to syslog.") (license license:expat))) -(define-public rust-system-deps-3 +(define-public rust-system-deps-6 (package (name "rust-system-deps") - (version "3.2.0") + (version "6.0.2") (source (origin (method url-fetch) (uri (crate-uri "system-deps" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "19ig3hxgyq9d7qy8cwpl74l75ay2w0y0a4rginqb68h7hygjc328")))) + (base32 "02g750rlhh7ynqa3p4a3qm7jrkjp3d0jlzrl29z225ch9hf5m951")))) (build-system cargo-build-system) (arguments `(#:tests? #f ;source is missing some test files #:cargo-inputs (("rust-anyhow" ,rust-anyhow-1) - ("rust-cfg-expr" ,rust-cfg-expr-0.8) - ("rust-heck" ,rust-heck-0.3) + ("rust-cfg-expr" ,rust-cfg-expr-0.10) + ("rust-heck" ,rust-heck-0.4) ("rust-itertools" ,rust-itertools-0.10) ("rust-pkg-config" ,rust-pkg-config-0.3) ("rust-strum" ,rust-strum-0.21) ("rust-strum-macros" ,rust-strum-macros-0.21) ("rust-thiserror" ,rust-thiserror-1) ("rust-toml" ,rust-toml-0.5) - ("rust-version-compare" ,rust-version-compare-0.0)) + ("rust-version-compare" ,rust-version-compare-0.1)) #:cargo-development-inputs (("rust-assert-matches" ,rust-assert-matches-1) ("rust-itertools" ,rust-itertools-0.10) @@ -61390,6 +61390,37 @@ This makes those dependencies declarative, so other tools can read them as well.") (license (list license:expat license:asl2.0)))) +(define-public rust-system-deps-3 + (package + (inherit rust-system-deps-6) + (name "rust-system-deps") + (version "3.2.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "system-deps" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "19ig3hxgyq9d7qy8cwpl74l75ay2w0y0a4rginqb68h7hygjc328")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ;source is missing some test files + #:cargo-inputs + (("rust-anyhow" ,rust-anyhow-1) + ("rust-cfg-expr" ,rust-cfg-expr-0.8) + ("rust-heck" ,rust-heck-0.3) + ("rust-itertools" ,rust-itertools-0.10) + ("rust-pkg-config" ,rust-pkg-config-0.3) + ("rust-strum" ,rust-strum-0.21) + ("rust-strum-macros" ,rust-strum-macros-0.21) + ("rust-thiserror" ,rust-thiserror-1) + ("rust-toml" ,rust-toml-0.5) + ("rust-version-compare" ,rust-version-compare-0.0)) + #:cargo-development-inputs + (("rust-assert-matches" ,rust-assert-matches-1) + ("rust-itertools" ,rust-itertools-0.10) + ("rust-lazy-static" ,rust-lazy-static-1)))))) + (define-public rust-system-deps-1 (package (inherit rust-system-deps-3) -- cgit 1.4.1 From e31cc7f0c9f66372cf5bb5f04a903ffc7b697b56 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 25 Jul 2022 14:44:36 +0200 Subject: gnu: rust-glib-sys: Add 0.15. * gnu/packages/crates-gtk.scm (rust-glib-sys-0.15): New variable. (rust-glib-sys-0.14): Inherit from it. --- gnu/packages/crates-gtk.scm | 40 +++++++++++++++++++++++++++++++++------- 1 file changed, 33 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm index e392220a01..bfde93560c 100644 --- a/gnu/packages/crates-gtk.scm +++ b/gnu/packages/crates-gtk.scm @@ -1109,8 +1109,40 @@ ("rust-quote" ,rust-quote-1) ("rust-syn" ,rust-syn-1)))))) +(define-public rust-glib-sys-0.15 + (package + (name "rust-glib-sys") + (version "0.15.10") + (source (origin + (method url-fetch) + (uri (crate-uri "glib-sys" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1m5sqm69fdk8vaw6hggyizhs1r1vivx73splrdvczsb5iqpijjzg")))) + (build-system cargo-build-system) + (arguments + `(;; XXX: Tests are sensitive to the version of glib, even though + ;; the library supports a wide range. Skip for now. + #:tests? #f + #:cargo-inputs + (("rust-libc" ,rust-libc-0.2) + ("rust-system-deps" ,rust-system-deps-6)) + #:cargo-development-inputs + (("rust-shell-words" ,rust-shell-words-1) + ("rust-tempfile" ,rust-tempfile-3)))) + (native-inputs + (list pkg-config)) + (inputs + (list glib)) + (home-page "https://gtk-rs.org/") + (synopsis "FFI bindings to libglib-2.0") + (description "This package provides FFI bindings to libglib-2.0.") + (license license:expat))) + (define-public rust-glib-sys-0.14 (package + (inherit rust-glib-sys-0.15) (name "rust-glib-sys") (version "0.14.0") (source @@ -1120,7 +1152,6 @@ (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "1bjlymn3fw4g8slij6iiggaipknf9072mr2qm3i4a91199an078w")))) - (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -1130,12 +1161,7 @@ #:cargo-development-inputs (("rust-shell-words" ,rust-shell-words-0.1) ("rust-tempfile" ,rust-tempfile-3)))) - (inputs - (list glib)) - (home-page "https://gtk-rs.org/") - (synopsis "FFI bindings to libglib-2.0") - (description "This package provides FFI bindings to libglib-2.0.") - (license license:expat))) + (native-inputs '()))) (define-public rust-glib-sys-0.10 (package -- cgit 1.4.1 From 21e5e408bfb310d6d285cedad68551684473afca Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 25 Jul 2022 14:45:33 +0200 Subject: gnu: rust-cairo-sys: Add 0.15.1. * gnu/packages/crates-gtk.scm (rust-cairo-sys-rs-0.15): New variable. (rust-cairo-sys-rs-0.14): Inherit from it. --- gnu/packages/crates-gtk.scm | 37 ++++++++++++++++++++++++++++++------- 1 file changed, 30 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm index bfde93560c..f389c707d6 100644 --- a/gnu/packages/crates-gtk.scm +++ b/gnu/packages/crates-gtk.scm @@ -277,8 +277,37 @@ #:cargo-development-inputs (("rust-tempfile" ,rust-tempfile-3)))))) +(define-public rust-cairo-sys-rs-0.15 + (package + (name "rust-cairo-sys-rs") + (version "0.15.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "cairo-sys-rs" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1j6k4pps3dv6g0vlpmxc2xyk0s40vj2wpzi55lbwjspmpqlx8m9w")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-glib-sys" ,rust-glib-sys-0.15) + ("rust-libc" ,rust-libc-0.2) + ("rust-system-deps" ,rust-system-deps-6) + ("rust-winapi" ,rust-winapi-0.3) + ("rust-x11" ,rust-x11-2)))) + (native-inputs + (list pkg-config)) + (inputs + (list cairo)) + (home-page "https://gtk-rs.org/") + (synopsis "FFI bindings to libcairo") + (description "This package provides FFI bindings to libcairo.") + (license license:expat))) + (define-public rust-cairo-sys-rs-0.14 (package + (inherit rust-cairo-sys-rs-0.15) (name "rust-cairo-sys-rs") (version "0.14.9") (source @@ -288,7 +317,6 @@ (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "0w3md4xk87ign30wb3rqfmmj0q6pvg5arbm35flgsd08jxvbhj5l")))) - (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -298,12 +326,7 @@ ("rust-system-deps" ,rust-system-deps-3) ("rust-winapi" ,rust-winapi-0.3) ("rust-x11" ,rust-x11-2)))) - (inputs - (list cairo)) - (home-page "https://gtk-rs.org/") - (synopsis "FFI bindings to libcairo") - (description "This package provides FFI bindings to libcairo.") - (license license:expat))) + (native-inputs '()))) (define-public rust-cairo-sys-rs-0.10 (package -- cgit 1.4.1 From 633c4ca4074698a2c950ddb82bf1daf77c2949a7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 25 Jul 2022 14:52:23 +0200 Subject: gnu: rust-gobject-sys: Add 0.15.10. * gnu/packages/crates-gtk.scm (rust-gobject-sys-0.15): New variable. (rust-gobject-sys-0.14): Inherit from it. --- gnu/packages/crates-gtk.scm | 42 ++++++++++++++++++++++++++++++++++-------- 1 file changed, 34 insertions(+), 8 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm index f389c707d6..99b8c08a4f 100644 --- a/gnu/packages/crates-gtk.scm +++ b/gnu/packages/crates-gtk.scm @@ -1230,28 +1230,32 @@ (("rust-shell-words" ,rust-shell-words-0.1) ("rust-tempfile" ,rust-tempfile-3)))))) -(define-public rust-gobject-sys-0.14 +(define-public rust-gobject-sys-0.15 (package (name "rust-gobject-sys") - (version "0.14.0") + (version "0.15.10") (source (origin (method url-fetch) (uri (crate-uri "gobject-sys" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1xf3jiwzrjingq8jr15bjkbv6m5dypzp67cjnm5f7njrjzicm4ma")))) + (base32 "02hyilvpi4hw4gr03z2plsbf1zicsfs5l0xxadqx3v3b4i2cwmqd")))) (build-system cargo-build-system) (arguments - `(#:skip-build? - #t + `(;; FIXME: Constant value mismatch for G_TYPE_FUNDAMENTAL_MAX + ;; Rust: "255" + ;; C: "1020" + #:tests? #f #:cargo-inputs - (("rust-glib-sys" ,rust-glib-sys-0.14) + (("rust-glib-sys" ,rust-glib-sys-0.15) ("rust-libc" ,rust-libc-0.2) - ("rust-system-deps" ,rust-system-deps-3)) + ("rust-system-deps" ,rust-system-deps-6)) #:cargo-development-inputs - (("rust-shell-words" ,rust-shell-words-0.1) + (("rust-shell-words" ,rust-shell-words-1) ("rust-tempfile" ,rust-tempfile-3)))) + (native-inputs + (list pkg-config)) (inputs (list glib)) (home-page "https://gtk-rs.org/") @@ -1259,6 +1263,28 @@ (description "This package provides FFI bindings to libgobject-2.0.") (license license:expat))) +(define-public rust-gobject-sys-0.14 + (package + (inherit rust-gobject-sys-0.15) + (version "0.14.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "gobject-sys" version)) + (file-name (string-append "rust-gobject-sys-" version ".tar.gz")) + (sha256 + (base32 "1xf3jiwzrjingq8jr15bjkbv6m5dypzp67cjnm5f7njrjzicm4ma")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-glib-sys" ,rust-glib-sys-0.14) + ("rust-libc" ,rust-libc-0.2) + ("rust-system-deps" ,rust-system-deps-3)) + #:cargo-development-inputs + (("rust-shell-words" ,rust-shell-words-0.1) + ("rust-tempfile" ,rust-tempfile-3)))) + (native-inputs '()))) + (define-public rust-gobject-sys-0.10 (package (inherit rust-gobject-sys-0.14) -- cgit 1.4.1 From ac393134e5d2bd59f90557f25db017040843913c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 25 Jul 2022 14:59:33 +0200 Subject: gnu: rust-glib-macros: Add 0.15. * gnu/packages/crates-gtk.scm (rust-glib-macros-0.15): New variable. (rust-glib-macros-0.14): Inherit from it. --- gnu/packages/crates-gtk.scm | 35 ++++++++++++++++++++++++++++++----- 1 file changed, 30 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm index 99b8c08a4f..63a3b3db78 100644 --- a/gnu/packages/crates-gtk.scm +++ b/gnu/packages/crates-gtk.scm @@ -1080,8 +1080,37 @@ #:cargo-development-inputs (("rust-tempfile" ,rust-tempfile-3)))))) +(define-public rust-glib-macros-0.15 + (package + (name "rust-glib-macros") + (version "0.15.11") + (source + (origin + (method url-fetch) + (uri (crate-uri "glib-macros" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0r3cr0c79rs91z0sps089nsf8ppnm8agp48qwwqlkc32lqqq39i5")))) + (build-system cargo-build-system) + (arguments + `(;; XXX: Circular dependency on rust-glib?? + #:tests? #f + #:cargo-inputs + (("rust-anyhow" ,rust-anyhow-1) + ("rust-heck" ,rust-heck-0.4) + ("rust-proc-macro-crate" ,rust-proc-macro-crate-1) + ("rust-proc-macro-error" ,rust-proc-macro-error-1) + ("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-1)))) + (home-page "https://gtk-rs.org/") + (synopsis "Rust bindings for the GLib library, proc macros crate") + (description "Rust bindings for the GLib library, proc macros crate.") + (license license:expat))) + (define-public rust-glib-macros-0.14 (package + (inherit rust-glib-macros-0.15) (name "rust-glib-macros") (version "0.14.1") (source @@ -1102,11 +1131,7 @@ ("rust-proc-macro-error" ,rust-proc-macro-error-1) ("rust-proc-macro2" ,rust-proc-macro2-1) ("rust-quote" ,rust-quote-1) - ("rust-syn" ,rust-syn-1)))) - (home-page "https://gtk-rs.org/") - (synopsis "Rust bindings for the GLib library, proc macros crate") - (description "Rust bindings for the GLib library, proc macros crate.") - (license license:expat))) + ("rust-syn" ,rust-syn-1)))))) (define-public rust-glib-macros-0.10 (package -- cgit 1.4.1 From bc9ea4f6e84f806f8b0294dafbeb31d98865e76c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 25 Jul 2022 15:05:01 +0200 Subject: gnu: rust-glib: Add 0.15.12. * gnu/packages/crates-gtk.scm (rust-glib-0.15): New variable. (rust-glib-0.14): Inherit from it. --- gnu/packages/crates-gtk.scm | 51 ++++++++++++++++++++++++++++++++++++++------- 1 file changed, 44 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm index 63a3b3db78..f132303970 100644 --- a/gnu/packages/crates-gtk.scm +++ b/gnu/packages/crates-gtk.scm @@ -962,8 +962,51 @@ (description "File format checker in Rust.") (license license:expat))) +(define-public rust-glib-0.15 + (package + (name "rust-glib") + (version "0.15.12") + (source + (origin + (method url-fetch) + (uri (crate-uri "glib" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0pahikbwxr3vafdrr5l2hnlhkf9xi4illryan0l59ayhp9pk1c7d")))) + (build-system cargo-build-system) + (arguments + `(;; FIXME: error[E0277]: `Errors` doesn't implement `std::fmt::Display` + #:tests? #f + #:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-futures-channel" ,rust-futures-channel-0.3) + ("rust-futures-core" ,rust-futures-core-0.3) + ("rust-futures-executor" ,rust-futures-executor-0.3) + ("rust-futures-task" ,rust-futures-task-0.3) + ("rust-glib-macros" ,rust-glib-macros-0.15) + ("rust-glib-sys" ,rust-glib-sys-0.15) + ("rust-gobject-sys" ,rust-gobject-sys-0.15) + ("rust-libc" ,rust-libc-0.2) + ("rust-log" ,rust-log-0.4) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-smallvec" ,rust-smallvec-1) + ("rust-thiserror" ,rust-thiserror-1)) + #:cargo-development-inputs + (("rust-futures-util" ,rust-futures-util-0.3) + ("rust-gir-format-check" ,rust-gir-format-check-0.1) + ("rust-tempfile" ,rust-tempfile-3)))) + (native-inputs + (list pkg-config)) + (inputs + (list glib)) + (home-page "https://gtk-rs.org/") + (synopsis "Rust bindings for the GLib library") + (description "Rust bindings for the GLib library") + (license license:expat))) + (define-public rust-glib-0.14 (package + (inherit rust-glib-0.15) (name "rust-glib") (version "0.14.8") (source @@ -989,13 +1032,7 @@ ("rust-libc" ,rust-libc-0.2) ("rust-log" ,rust-log-0.4) ("rust-once-cell" ,rust-once-cell-1) - ("rust-smallvec" ,rust-smallvec-1)))) - (inputs - (list glib)) - (home-page "https://gtk-rs.org/") - (synopsis "Rust bindings for the GLib library") - (description "Rust bindings for the GLib library") - (license license:expat))) + ("rust-smallvec" ,rust-smallvec-1)))))) (define-public rust-glib-0.10 (package -- cgit 1.4.1 From 01c410a440d6e444648ff1e979cf5f5097d4790d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 25 Jul 2022 15:08:54 +0200 Subject: gnu: rust-cairo-rs: Add 0.15.12. * gnu/packages/crates-gtk.scm (rust-cairo-rs-0.15): New variable. (rust-cairo-rs-0.14): Inherit from it. --- gnu/packages/crates-gtk.scm | 40 +++++++++++++++++++++++++++++++++------- 1 file changed, 33 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm index f132303970..860ec68fda 100644 --- a/gnu/packages/crates-gtk.scm +++ b/gnu/packages/crates-gtk.scm @@ -168,8 +168,40 @@ #:cargo-development-inputs (("rust-gir-format-check" ,rust-gir-format-check-0.1)))))) +(define-public rust-cairo-rs-0.15 + (package + (name "rust-cairo-rs") + (version "0.15.12") + (source + (origin + (method url-fetch) + (uri (crate-uri "cairo-rs" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1g396fdz8crf74dmmjarcsdbsm8qgxy3a5x9kw6m2d9xn28y6vn7")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-cairo-sys-rs" ,rust-cairo-sys-rs-0.15) + ("rust-freetype" ,rust-freetype-0.7) + ("rust-glib" ,rust-glib-0.15) + ("rust-libc" ,rust-libc-0.2) + ("rust-thiserror" ,rust-thiserror-1)) + #:cargo-development-inputs + (("rust-tempfile" ,rust-tempfile-3)))) + (native-inputs + (list pkg-config)) + (inputs + (list cairo)) + (home-page "https://gtk-rs.org/") + (synopsis "Rust bindings for the Cairo library") + (description "Rust bindings for the Cairo library") + (license license:expat))) + (define-public rust-cairo-rs-0.14 (package + (inherit rust-cairo-rs-0.15) (name "rust-cairo-rs") (version "0.14.9") (source @@ -191,13 +223,7 @@ ("rust-libc" ,rust-libc-0.2) ("rust-thiserror" ,rust-thiserror-1)) #:cargo-development-inputs - (("rust-tempfile" ,rust-tempfile-3)))) - (inputs - (list cairo)) - (home-page "https://gtk-rs.org/") - (synopsis "Rust bindings for the Cairo library") - (description "Rust bindings for the Cairo library") - (license license:expat))) + (("rust-tempfile" ,rust-tempfile-3)))))) (define-public rust-cairo-rs-0.9 (package -- cgit 1.4.1 From def0acd5e5c0e8c5e32ac69d9e9a18a536be7962 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 25 Jul 2022 15:17:47 +0200 Subject: gnu: rust-pango-sys: Add 0.15. * gnu/packages/crates-gtk.scm (rust-pango-sys-0.15): New variable. (rust-pango-sys-0.14): Inherit from it. --- gnu/packages/crates-gtk.scm | 40 ++++++++++++++++++++++++++++++++-------- 1 file changed, 32 insertions(+), 8 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm index 860ec68fda..074206cd8e 100644 --- a/gnu/packages/crates-gtk.scm +++ b/gnu/packages/crates-gtk.scm @@ -1755,8 +1755,39 @@ library.") #:cargo-development-inputs (("rust-gir-format-check" ,rust-gir-format-check-0.1)))))) +(define-public rust-pango-sys-0.15 + (package + (name "rust-pango-sys") + (version "0.15.10") + (source + (origin + (method url-fetch) + (uri (crate-uri "pango-sys" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1an3c931kbkr08n9d9d1dapsq3n26zs0xn4ixn11jrp4rn0h186j")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-glib-sys" ,rust-glib-sys-0.15) + ("rust-gobject-sys" ,rust-gobject-sys-0.15) + ("rust-libc" ,rust-libc-0.2) + ("rust-system-deps" ,rust-system-deps-6)) + #:cargo-development-inputs + (("rust-shell-words" ,rust-shell-words-1) + ("rust-tempfile" ,rust-tempfile-3)))) + (native-inputs + (list pkg-config)) + (inputs + (list pango)) + (home-page "https://gtk-rs.org/") + (synopsis "FFI bindings to libpango-1.0") + (description "This package provides FFI bindings to @code{libpango-1.0}.") + (license license:expat))) + (define-public rust-pango-sys-0.14 (package + (inherit rust-pango-sys-0.15) (name "rust-pango-sys") (version "0.14.0") (source @@ -1766,7 +1797,6 @@ library.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "1zj236n9kjldf47wwlxvhshwm5zhg589a0fml5mm8qg7lnf0jrr3")))) - (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -1774,13 +1804,7 @@ library.") (("rust-glib-sys" ,rust-glib-sys-0.14) ("rust-gobject-sys" ,rust-gobject-sys-0.14) ("rust-libc" ,rust-libc-0.2) - ("rust-system-deps" ,rust-system-deps-3)))) - (inputs - (list pango)) - (home-page "https://gtk-rs.org/") - (synopsis "FFI bindings to libpango-1.0") - (description "This package provides FFI bindings to @code{libpango-1.0}.") - (license license:expat))) + ("rust-system-deps" ,rust-system-deps-3)))))) (define-public rust-pango-sys-0.10 (package -- cgit 1.4.1 From 713b289ff0037981de91ec844cfa835d7e7c8049 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 25 Jul 2022 15:19:15 +0200 Subject: gnu: rust-pango: Add 0.15.10. * gnu/packages/crates-gtk.scm (rust-pango-0.15): New variable. (rust-pango-0.14): Inherit from it. --- gnu/packages/crates-gtk.scm | 41 ++++++++++++++++++++++++++++++++++------- 1 file changed, 34 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm index 074206cd8e..4056290e9c 100644 --- a/gnu/packages/crates-gtk.scm +++ b/gnu/packages/crates-gtk.scm @@ -1645,29 +1645,31 @@ library.") (license license:expat))) -(define-public rust-pango-0.14 +(define-public rust-pango-0.15 (package (name "rust-pango") - (version "0.14.8") + (version "0.15.10") (source (origin (method url-fetch) (uri (crate-uri "pango" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "10c5q8wl9gkjh323whq6pg9yfvr2vmz00f98z1d77jp506cdavsl")))) + (base32 "0ksf85fqkw4y5pf21p84g5xn4fnqn21cbrmx2d9yx6k591ah9r12")))) (build-system cargo-build-system) (arguments - `(#:skip-build? - #t + `(;; FIXME: error[E0277]: `Errors` doesn't implement `std::fmt::Display` + #:tests? #f #:cargo-inputs (("rust-bitflags" ,rust-bitflags-1) - ("rust-glib" ,rust-glib-0.14) + ("rust-glib" ,rust-glib-0.15) ("rust-libc" ,rust-libc-0.2) ("rust-once-cell" ,rust-once-cell-1) - ("rust-pango-sys" ,rust-pango-sys-0.14)) + ("rust-pango-sys" ,rust-pango-sys-0.15)) #:cargo-development-inputs (("rust-gir-format-check" ,rust-gir-format-check-0.1)))) + (native-inputs + (list pkg-config)) (inputs (list pango)) (home-page "https://gtk-rs.org/") @@ -1675,6 +1677,31 @@ library.") (description "Rust bindings for the Pango library") (license license:expat))) +(define-public rust-pango-0.14 + (package + (inherit rust-pango-0.15) + (name "rust-pango") + (version "0.14.8") + (source + (origin + (method url-fetch) + (uri (crate-uri "pango" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "10c5q8wl9gkjh323whq6pg9yfvr2vmz00f98z1d77jp506cdavsl")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? + #t + #:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-glib" ,rust-glib-0.14) + ("rust-libc" ,rust-libc-0.2) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-pango-sys" ,rust-pango-sys-0.14)) + #:cargo-development-inputs + (("rust-gir-format-check" ,rust-gir-format-check-0.1)))))) + (define-public rust-pango-0.9 (package (inherit rust-pango-0.14) -- cgit 1.4.1 From c5d4f2e8f077c783475cc6b1c103cd0a7ea570eb Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 25 Jul 2022 15:27:24 +0200 Subject: gnu: rust-pangocairo-sys: Add 0.15. * gnu/packages/crates-gtk.scm (rust-pangocairo-sys-0.15): New variable. (rust-pangocairo-sys-0.10): Inherit from it. --- gnu/packages/crates-gtk.scm | 43 ++++++++++++++++++++++++++++++++++++------- 1 file changed, 36 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm index 4056290e9c..28297f95cf 100644 --- a/gnu/packages/crates-gtk.scm +++ b/gnu/packages/crates-gtk.scm @@ -1943,8 +1943,43 @@ library.") #:cargo-development-inputs (("rust-gir-format-check" ,rust-gir-format-check-0.1)))))) +(define-public rust-pangocairo-sys-0.15 + (package + (name "rust-pangocairo-sys") + (version "0.15.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "pangocairo-sys" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "154llaawy60zh8fkw2yq0r31ynpmqlsr7brryzaq2v4ijijp9kvq")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-cairo-sys-rs" ,rust-cairo-sys-rs-0.15) + ("rust-glib-sys" ,rust-glib-sys-0.15) + ("rust-libc" ,rust-libc-0.2) + ("rust-pango-sys" ,rust-pango-sys-0.15) + ("rust-system-deps" ,rust-system-deps-6)) + #:cargo-development-inputs + (("rust-shell-words" ,rust-shell-words-1) + ("rust-tempfile" ,rust-tempfile-3)))) + (native-inputs + (list pkg-config)) + (inputs + ;; XXX: Should these be propagated from their respective crates? + (list cairo glib pango)) + (home-page "https://gtk-rs.org/") + (synopsis "FFI bindings to libgtk-3") + (description "This package provides FFI bindings to libgtk-3.") + (license license:expat))) + (define-public rust-pangocairo-sys-0.10 (package + (inherit rust-pangocairo-sys-0.15) (name "rust-pangocairo-sys") (version "0.10.1") (source @@ -1966,13 +2001,7 @@ library.") ("rust-pkg-config" ,rust-pkg-config-0.3)) #:cargo-development-inputs (("rust-shell-words" ,rust-shell-words-0.1) - ("rust-tempfile" ,rust-tempfile-3)))) - (inputs - (list gtk+)) - (home-page "https://gtk-rs.org/") - (synopsis "FFI bindings to libgtk-3") - (description "This package provides FFI bindings to libgtk-3.") - (license license:expat))) + ("rust-tempfile" ,rust-tempfile-3)))))) (define-public rust-soup-sys-0.10 (package -- cgit 1.4.1 From 2f9aa892c633d8263c3e97a93024d6638fd4a6c6 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 25 Jul 2022 15:33:21 +0200 Subject: gnu: rust-pangocairo: Add 0.15.1. * gnu/packages/crates-gtk.scm (rust-pangocairo-0.15): New variable. (rust-pangocairo-0.9): Inherit from it. --- gnu/packages/crates-gtk.scm | 45 +++++++++++++++++++++++++++++++++++++-------- 1 file changed, 37 insertions(+), 8 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm index 28297f95cf..552b1f41f4 100644 --- a/gnu/packages/crates-gtk.scm +++ b/gnu/packages/crates-gtk.scm @@ -1876,8 +1876,44 @@ library.") (("rust-shell-words" ,rust-shell-words-0.1) ("rust-tempfile" ,rust-tempfile-3)))))) +(define-public rust-pangocairo-0.15 + (package + (name "rust-pangocairo") + (version "0.15.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "pangocairo" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0rjk0clrjxah4kc0kybn7l7bxa5m5kpxkihxc2i7a6hx3xfa8xkq")))) + (build-system cargo-build-system) + (arguments + `(;; FIXME: error[E0277]: `Errors` doesn't implement `std::fmt::Display` + #:tests? #f + #:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-cairo-rs" ,rust-cairo-rs-0.15) + ("rust-glib" ,rust-glib-0.15) + ("rust-libc" ,rust-libc-0.2) + ("rust-pango" ,rust-pango-0.15) + ("rust-pangocairo-sys" ,rust-pangocairo-sys-0.15)) + #:cargo-development-inputs + (("rust-gir-format-check" ,rust-gir-format-check-0.1)))) + (native-inputs + (list pkg-config)) + (inputs + (list pango)) + (home-page "https://gtk-rs.org/") + (synopsis "Rust bindings for the PangoCairo library") + (description + "Rust bindings for the PangoCairo library.") + (license license:expat))) + (define-public rust-pangocairo-0.9 (package + (inherit rust-pangocairo-0.15) (name "rust-pangocairo") (version "0.9.0") (source @@ -1904,14 +1940,7 @@ library.") ("rust-pangocairo-sys" ,rust-pangocairo-sys-0.10) ("rust-gtk-rs-lgpl-docs" ,rust-gtk-rs-lgpl-docs-0.1)) #:cargo-development-inputs - (("rust-gir-format-check" ,rust-gir-format-check-0.1)))) - (inputs - (list gtk+)) - (home-page "https://gtk-rs.org/") - (synopsis "Rust bindings for the PangoCairo library") - (description - "Rust bindings for the PangoCairo library.") - (license license:expat))) + (("rust-gir-format-check" ,rust-gir-format-check-0.1)))))) (define-public rust-pangocairo-0.8 (package -- cgit 1.4.1 From b4678e44886f712288b2e7c53cc2828292df8a2b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 25 Jul 2022 15:51:34 +0200 Subject: gnu: rust-gio-sys: Add 0.15.10. * gnu/packages/crates-gtk.scm (rust-gio-sys-0.15): New variable. (rust-gio-sys-0.14): Inherit from it. --- gnu/packages/crates-gtk.scm | 51 ++++++++++++++++++++++++++++++++++++++------- 1 file changed, 44 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm index 552b1f41f4..34979fed30 100644 --- a/gnu/packages/crates-gtk.scm +++ b/gnu/packages/crates-gtk.scm @@ -897,8 +897,51 @@ #:cargo-development-inputs (("rust-gir-format-check" ,rust-gir-format-check-0.1)))))) +(define-public rust-gio-sys-0.15 + (package + (name "rust-gio-sys") + (version "0.15.10") + (source + (origin + (method url-fetch) + (uri (crate-uri "gio-sys" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "13fgmc2xdzg9qk9l3nlp1bilwn6466mrqbiq4fhc9qkia93pl59j")))) + (build-system cargo-build-system) + (arguments + `(;; FIXME: some GLib macros are not found + #:tests? #f + #:cargo-inputs + (("rust-glib-sys" ,rust-glib-sys-0.15) + ("rust-gobject-sys" ,rust-gobject-sys-0.15) + ("rust-libc" ,rust-libc-0.2) + ("rust-system-deps" ,rust-system-deps-6) + ("rust-winapi" ,rust-winapi-0.3)) + #:cargo-development-inputs + (("rust-shell-words" ,rust-shell-words-1) + ("rust-tempfile" ,rust-tempfile-3)) + #:phases (modify-phases %standard-phases + (add-before 'check 'extend-include-path + (lambda* (#:key inputs #:allow-other-keys) + (let ((gio-headers (search-input-directory + inputs "include/gio-unix-2.0"))) + ;; Tests rely on these headers. + (setenv "C_INCLUDE_PATH" + (string-append gio-headers ":" + (getenv "C_INCLUDE_PATH"))))))))) + (native-inputs + (list pkg-config)) + (inputs + (list glib)) + (home-page "https://gtk-rs.org/") + (synopsis "FFI bindings to libgio-2.0") + (description "This package provides FFI bindings to libgio-2.0.") + (license license:expat))) + (define-public rust-gio-sys-0.14 (package + (inherit rust-gio-sys-0.15) (name "rust-gio-sys") (version "0.14.0") (source @@ -917,13 +960,7 @@ ("rust-gobject-sys" ,rust-gobject-sys-0.14) ("rust-libc" ,rust-libc-0.2) ("rust-system-deps" ,rust-system-deps-3) - ("rust-winapi" ,rust-winapi-0.3)))) - (inputs - (list glib)) - (home-page "https://gtk-rs.org/") - (synopsis "FFI bindings to libgio-2.0") - (description "This package provides FFI bindings to libgio-2.0.") - (license license:expat))) + ("rust-winapi" ,rust-winapi-0.3)))))) (define-public rust-gio-sys-0.10 (package -- cgit 1.4.1 From bdd55817edeac77964fd8f9d642b30cb44b1ccb4 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 25 Jul 2022 15:52:22 +0200 Subject: gnu: rust-gdk-pixbuf-sys: Add 0.15. * gnu/packages/crates-gtk.scm (rust-gdk-pixbuf-sys-0.15): New variable. (rust-gdk-pixbuf-sys-0.14): Inherit from it. --- gnu/packages/crates-gtk.scm | 42 +++++++++++++++++++++++++++++++++++------- 1 file changed, 35 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm index 34979fed30..92ade296ec 100644 --- a/gnu/packages/crates-gtk.scm +++ b/gnu/packages/crates-gtk.scm @@ -598,8 +598,42 @@ #:cargo-development-inputs (("rust-gir-format-check" ,rust-gir-format-check-0.1)))))) +(define-public rust-gdk-pixbuf-sys-0.15 + (package + (name "rust-gdk-pixbuf-sys") + (version "0.15.10") + (source + (origin + (method url-fetch) + (uri (crate-uri "gdk-pixbuf-sys" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "19q2qjrzmmgc7bbs59sk6k0sv3xhpmnk9a2h0cajfr95g19jy2ql")))) + (build-system cargo-build-system) + (arguments + `(;#:skip-build? + ;#t + #:cargo-inputs + (("rust-gio-sys" ,rust-gio-sys-0.15) + ("rust-glib-sys" ,rust-glib-sys-0.15) + ("rust-gobject-sys" ,rust-gobject-sys-0.15) + ("rust-libc" ,rust-libc-0.2) + ("rust-system-deps" ,rust-system-deps-6)) + #:cargo-development-inputs + (("rust-shell-words" ,rust-shell-words-1) + ("rust-tempfile" ,rust-tempfile-3)))) + (native-inputs + (list pkg-config)) + (inputs + (list gdk-pixbuf)) + (home-page "https://gtk-rs.org/") + (synopsis "FFI bindings to libgdk_pixbuf-2.0") + (description "This package provides FFI bindings to @code{libgdk_pixbuf-2.0}.") + (license license:expat))) + (define-public rust-gdk-pixbuf-sys-0.14 (package + (inherit rust-gdk-pixbuf-sys-0.15) (name "rust-gdk-pixbuf-sys") (version "0.14.0") (source @@ -621,13 +655,7 @@ ("rust-system-deps" ,rust-system-deps-3)) #:cargo-development-inputs (("rust-shell-words" ,rust-shell-words-0.1) - ("rust-tempfile" ,rust-tempfile-3)))) - (inputs - (list gdk-pixbuf)) - (home-page "https://gtk-rs.org/") - (synopsis "FFI bindings to libgdk_pixbuf-2.0") - (description "This package provides FFI bindings to @code{libgdk_pixbuf-2.0}.") - (license license:expat))) + ("rust-tempfile" ,rust-tempfile-3)))))) (define-public rust-gdk-pixbuf-sys-0.10 (package -- cgit 1.4.1 From 79ee7d783acb0a11c0a527d268ca8f70e4465080 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 25 Jul 2022 16:17:36 +0200 Subject: gnu: rust-gio: Add 0.15.12. * gnu/packages/crates-gtk.scm (rust-gio-0.15): New variable. (rust-gio-0.14): Inherit from it. --- gnu/packages/crates-gtk.scm | 48 ++++++++++++++++++++++++++++++++++++++------- 1 file changed, 41 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm index 92ade296ec..d7318f080c 100644 --- a/gnu/packages/crates-gtk.scm +++ b/gnu/packages/crates-gtk.scm @@ -796,8 +796,48 @@ (("rust-shell-words" ,rust-shell-words-0.1) ("rust-tempfile" ,rust-tempfile-3)))))) +(define-public rust-gio-0.15 + (package + (name "rust-gio") + (version "0.15.12") + (source + (origin + (method url-fetch) + (uri (crate-uri "gio" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0fr8qiqjf9yzl8867kgqdsxpkcx2jrns3xwmlf0jfiid668brzb8")))) + (build-system cargo-build-system) + (arguments + `(;; FIXME: error[E0277]: `Errors` doesn't implement `std::fmt::Display` + #:tests? #f + #:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-futures-channel" ,rust-futures-channel-0.3) + ("rust-futures-core" ,rust-futures-core-0.3) + ("rust-futures-io" ,rust-futures-io-0.3) + ("rust-futures-util" ,rust-futures-util-0.3) + ("rust-gio-sys" ,rust-gio-sys-0.15) + ("rust-glib" ,rust-glib-0.15) + ("rust-libc" ,rust-libc-0.2) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-thiserror" ,rust-thiserror-1)) + #:cargo-development-inputs + (("rust-futures-util" ,rust-futures-util-0.3) + ("rust-gir-format-check" ,rust-gir-format-check-0.1) + ("rust-serial-test" ,rust-serial-test-0.6)))) + (native-inputs + (list pkg-config)) + (inputs + (list glib)) + (home-page "https://gtk-rs.org/") + (synopsis "Rust bindings for the Gio library") + (description "Rust bindings for the Gio library") + (license license:expat))) + (define-public rust-gio-0.14 (package + (inherit rust-gio-0.15) (name "rust-gio") (version "0.14.8") (source @@ -823,13 +863,7 @@ ("rust-thiserror" ,rust-thiserror-1)) #:cargo-development-inputs (("rust-gir-format-check" ,rust-gir-format-check-0.1) - ("rust-serial-test" ,rust-serial-test-0.4)))) - (inputs - (list glib)) - (home-page "https://gtk-rs.org/") - (synopsis "Rust bindings for the Gio library") - (description "Rust bindings for the Gio library") - (license license:expat))) + ("rust-serial-test" ,rust-serial-test-0.4)))))) (define-public rust-gio-0.9 (package -- cgit 1.4.1 From c7bbf937ff9d59823a91069e547bb3fdc804d084 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 25 Jul 2022 16:20:22 +0200 Subject: gnu: rust-gdk-pixbuf: Add 0.15.11. * gnu/packages/crates-gtk.scm (rust-gdk-pixbuf-0.15): New variable. (rust-gdk-pixbuf-0.14): Inherit from it. --- gnu/packages/crates-gtk.scm | 41 ++++++++++++++++++++++++++++++++++------- 1 file changed, 34 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm index d7318f080c..316e427522 100644 --- a/gnu/packages/crates-gtk.scm +++ b/gnu/packages/crates-gtk.scm @@ -489,8 +489,41 @@ #:cargo-development-inputs (("rust-gir-format-check" ,rust-gir-format-check-0.1)))))) +(define-public rust-gdk-pixbuf-0.15 + (package + (name "rust-gdk-pixbuf") + (version "0.15.11") + (source + (origin + (method url-fetch) + (uri (crate-uri "gdk-pixbuf" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "16k1z21r76m620z61kfmgid1n6s8dnxpa4zlrppcr6dhr2fdsf5d")))) + (build-system cargo-build-system) + (arguments + `(;; FIXME: error[E0277]: `Errors` doesn't implement `std::fmt::Display` + #:tests? #f + #:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-gdk-pixbuf-sys" ,rust-gdk-pixbuf-sys-0.15) + ("rust-gio" ,rust-gio-0.15) + ("rust-glib" ,rust-glib-0.15) + ("rust-libc" ,rust-libc-0.2)) + #:cargo-development-inputs + (("rust-gir-format-check" ,rust-gir-format-check-0.1)))) + (native-inputs + (list pkg-config)) + (inputs + (list gdk-pixbuf)) + (home-page "https://gtk-rs.org/") + (synopsis "Rust bindings for the GdkPixbuf library") + (description "Rust bindings for the GdkPixbuf library") + (license license:expat))) + (define-public rust-gdk-pixbuf-0.14 (package + (inherit rust-gdk-pixbuf-0.15) (name "rust-gdk-pixbuf") (version "0.14.0") (source @@ -510,13 +543,7 @@ ("rust-glib" ,rust-glib-0.14) ("rust-libc" ,rust-libc-0.2)) #:cargo-development-inputs - (("rust-gir-format-check" ,rust-gir-format-check-0.1)))) - (inputs - (list gdk-pixbuf)) - (home-page "https://gtk-rs.org/") - (synopsis "Rust bindings for the GdkPixbuf library") - (description "Rust bindings for the GdkPixbuf library") - (license license:expat))) + (("rust-gir-format-check" ,rust-gir-format-check-0.1)))))) (define-public rust-gdk-pixbuf-0.9 (package -- cgit 1.4.1 From de212cb74ebb746ba0233b9ad0c6578cadb3de33 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 26 Jul 2022 01:15:12 +0200 Subject: gnu: rust-itertools@0.10: Update to 0.10.3. * gnu/packages/crates-io.scm (rust-itertools-0.10): Update to 0.10.3. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 2944a7249c..30245a54db 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -29758,14 +29758,14 @@ whether or not a given path points to an executable file.") (define-public rust-itertools-0.10 (package (name "rust-itertools") - (version "0.10.0") + (version "0.10.3") (source (origin (method url-fetch) (uri (crate-uri "itertools" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "06dkghwi1a6ah2103gibxnr2ys762m5x4rp75x0q43imis8p5m9p")))) + (base32 "1qy55fqbaisr9qgbn7cvdvqlfqbh1f4ddf99zwan56z7l6gx3ad9")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t -- cgit 1.4.1 From 26afc27f29f3bdfa1b60838b1777a9cebbc4aab5 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 26 Jul 2022 01:15:43 +0200 Subject: gnu: rust-tinyvec@1: Update to 1.2.0. * gnu/packages/crates-io.scm (rust-tinyvec-1): Update to 1.2.0. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 30245a54db..5af3aa016c 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -63935,14 +63935,14 @@ C library.") (define-public rust-tinyvec-1 (package (name "rust-tinyvec") - (version "1.1.1") + (version "1.2.0") (source (origin (method url-fetch) (uri (crate-uri "tinyvec" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "08qhf0a9vxf85bj1hd38i8qzwiwm6v4vvwd11k7c728f59bwlz1i")))) + (base32 "0hn3fkpb9nca9nf9znz2dxlp4ccv37hnbh67aczpzpmpbgq20ljv")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t -- cgit 1.4.1 From e62dd8e7622d5ddd8da6fb024f58c09b0aa01ac1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 26 Jul 2022 11:01:12 +0200 Subject: gnu: rust-crc32fast: Update to 1.3.2. * gnu/packages/crates-io.scm (rust-crc32fast-1): Update to 1.3.2. [arguments]: Update #:cargo-inputs. Remove #:skip-build?. --- gnu/packages/crates-io.scm | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 5af3aa016c..b34f6186b9 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -13979,7 +13979,7 @@ final xor value. It has many built-in CRC functions.") (define-public rust-crc32fast-1 (package (name "rust-crc32fast") - (version "1.2.0") + (version "1.3.2") (source (origin (method url-fetch) @@ -13988,15 +13988,14 @@ final xor value. It has many built-in CRC functions.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1c9dhkvf3brrzzplcijaywxi2w8wv5578i0ryhcm7x8dmzi5s4ms")))) + "03c8f29yx293yf43xar946xbls1g60c207m9drf8ilqhr25vsh5m")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-cfg-if" ,rust-cfg-if-0.1)) + `(#:cargo-inputs + (("rust-cfg-if" ,rust-cfg-if-1)) #:cargo-development-inputs (("rust-bencher" ,rust-bencher-0.1) - ("rust-quickcheck" ,rust-quickcheck-0.8) + ("rust-quickcheck" ,rust-quickcheck-1) ("rust-rand" ,rust-rand-0.4)))) (home-page "https://github.com/srijs/rust-crc32fast") (synopsis -- cgit 1.4.1 From 822edbf08b754dfd1c9f25500c4e9490b99276f4 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 26 Jul 2022 11:07:17 +0200 Subject: gnu: rust-gzip-header: Add 1.0.0. * gnu/packages/crates-io.scm (rust-gzip-header-1): New variable. (rust-gzip-header-0.3): Inherit from it. --- gnu/packages/crates-io.scm | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index b34f6186b9..bb2c676608 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -26103,19 +26103,18 @@ support.") ("rust-quote" ,rust-quote-1) ("rust-syn" ,rust-syn-1)))))) -(define-public rust-gzip-header-0.3 +(define-public rust-gzip-header-1 (package (name "rust-gzip-header") - (version "0.3.0") + (version "1.0.0") (source (origin (method url-fetch) (uri (crate-uri "gzip-header" version)) - (file-name - (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0fg6vm8sgsm69szwqyz7abfbyziv6pv0jkcailimlamvsfrzwc81")))) + "18lm2y96mahkmcd76pzyam2sl3v6lsl9mn8ajri9l0p6j9xm5k4m")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -26127,6 +26126,25 @@ support.") of gzip files based on the gzip header implementation in the @code{flate2} crate.") (license (list license:expat license:asl2.0)))) +(define-public rust-gzip-header-0.3 + (package + (inherit rust-gzip-header-1) + (name "rust-gzip-header") + (version "0.3.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "gzip-header" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0fg6vm8sgsm69szwqyz7abfbyziv6pv0jkcailimlamvsfrzwc81")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-crc32fast" ,rust-crc32fast-1)))))) + (define-public rust-h2-0.3 (package (name "rust-h2") -- cgit 1.4.1 From fe76e27789b198d0f8579376a86c4bf2031c974b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 26 Jul 2022 11:11:41 +0200 Subject: gnu: rust-mint: Update to 0.5.9. * gnu/packages/crates-io.scm (rust-mint-0.5): Update to 0.5.9. [arguments]: New field. --- gnu/packages/crates-io.scm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index bb2c676608..e2304cb6fd 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -35106,7 +35106,7 @@ drop-in replacement for miniz.") (define-public rust-mint-0.5 (package (name "rust-mint") - (version "0.5.4") + (version "0.5.9") (source (origin (method url-fetch) @@ -35115,8 +35115,13 @@ drop-in replacement for miniz.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0c4190gr348fkfijij7vm19iagwl36mssj1irc9f6m448hbhgn68")))) + "1zw5glv8z2d99c82jy2za97hh9p6377xmf4rbwz7jynsdfxfngg5")))) (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-serde" ,rust-serde-1)) + #:cargo-development-inputs + (("rust-serde-json" ,rust-serde-json-1)))) (home-page "https://github.com/kvark/mint") (synopsis "Math interoperability standard types") (description -- cgit 1.4.1 From 3f7cef4f95f6ac79c0b9a89604d94484d51bb0fd Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 27 Jul 2022 13:51:26 +0200 Subject: gnu: rust-dlib: Add rust-libloading to inputs. This is a follow-up to commit 28364584af22b9367615b08c77e81474d255d641. * gnu/packages/crates-io.scm (rust-dlib-0.5)[inputs]: Add RUST-LIBLOADING-0.7. --- gnu/packages/crates-io.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 696aef620a..3390ce3ec8 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -18479,6 +18479,8 @@ Google's diff-match-patch.") `(#:tests? #f ;FIXME: Several macros are not found. #:cargo-inputs (("rust-libloading" ,rust-libloading-0.7)))) + (inputs + (list rust-libloading-0.7)) (home-page "https://github.com/vberger/dlib") (synopsis "Helper macros for manually loading optional system libraries") (description -- cgit 1.4.1 From 8aef4c5071968d8f5e91c9241a1a83847ac5374b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 27 Jul 2022 13:40:19 +0200 Subject: gnu: rust-wayland-scanner: Add 0.29.4. * gnu/packages/crates-graphics.scm (rust-wayland-scanner-0.29): New variable. (rust-wayland-scanner-0.28): Inherit from it. --- gnu/packages/crates-graphics.scm | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm index 5d88cb0372..da61607266 100644 --- a/gnu/packages/crates-graphics.scm +++ b/gnu/packages/crates-graphics.scm @@ -2696,17 +2696,17 @@ extensions.") ("rust-wayland-sys" ,rust-wayland-sys-0.21) ("rust-wayland-scanner" ,rust-wayland-scanner-0.21)))))) -(define-public rust-wayland-scanner-0.28 +(define-public rust-wayland-scanner-0.29 (package (name "rust-wayland-scanner") - (version "0.28.3") + (version "0.29.4") (source (origin (method url-fetch) (uri (crate-uri "wayland-scanner" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0g8ky63qk27in7zajycj3fyydsxlj19hanfcvr8d7z5kcxbvl43h")))) + (base32 "1q7r764z8k922xf51fj56b1xm29ffi9ap8jnf4c478gp8cqyv89r")))) (build-system cargo-build-system) (inputs (list rust-proc-macro2-1 rust-quote-1 rust-xml-rs-0.8)) @@ -2719,6 +2719,21 @@ you are working on custom Wayland protocol extensions. Look at the wayland-client crate for usable bindings.") (license license:expat))) +(define-public rust-wayland-scanner-0.28 + (package + (inherit rust-wayland-scanner-0.29) + (name "rust-wayland-scanner") + (version "0.28.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "wayland-scanner" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0g8ky63qk27in7zajycj3fyydsxlj19hanfcvr8d7z5kcxbvl43h")))) + (inputs + (list rust-proc-macro2-1 rust-quote-1 rust-xml-rs-0.8)))) + (define-public rust-wayland-scanner-0.23 (package (inherit rust-wayland-scanner-0.28) -- cgit 1.4.1 From b6242d29f499cf8547783cad4af1cee0fe0bfce6 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 27 Jul 2022 13:40:55 +0200 Subject: gnu: rust-wayland-sys: Add 0.29. * gnu/packages/crates-graphics.scm (rust-wayland-sys-0.29): New variable. (rust-wayland-sys-0.28): Inherit from it. --- gnu/packages/crates-graphics.scm | 51 +++++++++++++++++++++++++++++++++------- 1 file changed, 43 insertions(+), 8 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm index da61607266..616a0bf6f7 100644 --- a/gnu/packages/crates-graphics.scm +++ b/gnu/packages/crates-graphics.scm @@ -2864,35 +2864,36 @@ the wayland protocol, server side.") ("rust-wayland-sys" ,rust-wayland-sys-0.21) ("rust-wayland-scanner" ,rust-wayland-scanner-0.21)))))) -(define-public rust-wayland-sys-0.28 +(define-public rust-wayland-sys-0.29 (package (name "rust-wayland-sys") - (version "0.28.3") + (version "0.29.4") (source (origin (method url-fetch) (uri (crate-uri "wayland-sys" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "16f03jsy7q6p2wpaazc4w4kycyyk0fz7lacpdbcizl9m1i7874v7")))) + (base32 "1m2jwk5q36jidwbdmdicmi27r9dzi4wanzg3i28nfxc9kbvisd6r")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs - (("rust-dlib" ,rust-dlib-0.4) + (("rust-dlib" ,rust-dlib-0.5) ("rust-lazy-static" ,rust-lazy-static-1) ("rust-libc" ,rust-libc-0.2) + ("rust-memoffset" ,rust-memoffset-0.6) ("rust-pkg-config" ,rust-pkg-config-0.3)) #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-libraries (lambda* (#:key inputs #:allow-other-keys) - (let ((libwayland (assoc-ref inputs "wayland"))) + (let ((libwayland (dirname (search-input-file + inputs "lib/libwayland-client.so")))) (substitute* (find-files "src" "\\.rs$") (("libwayland.*\\.so" shared-lib) - (string-append libwayland "/lib/" shared-lib))) - #t)))))) + (string-append libwayland "/" shared-lib))))))))) (inputs - (list rust-dlib-0.4 rust-lazy-static-1 rust-libc-0.2 + (list rust-dlib-0.5 rust-lazy-static-1 rust-libc-0.2 rust-pkg-config-0.3)) (propagated-inputs (list wayland)) @@ -2905,6 +2906,40 @@ you are working on custom Wayland protocol extensions. Look at the crate @code{rust-wayland-client} for usable bindings.") (license license:expat))) +(define-public rust-wayland-sys-0.28 + (package + (inherit rust-wayland-sys-0.29) + (name "rust-wayland-sys") + (version "0.28.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "wayland-sys" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "16f03jsy7q6p2wpaazc4w4kycyyk0fz7lacpdbcizl9m1i7874v7")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-dlib" ,rust-dlib-0.4) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-libc" ,rust-libc-0.2) + ("rust-pkg-config" ,rust-pkg-config-0.3)) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-libraries + (lambda* (#:key inputs #:allow-other-keys) + (let ((libwayland (assoc-ref inputs "wayland"))) + (substitute* (find-files "src" "\\.rs$") + (("libwayland.*\\.so" shared-lib) + (string-append libwayland "/lib/" shared-lib))) + #t)))))) + (inputs + (list rust-dlib-0.4 rust-lazy-static-1 rust-libc-0.2 + rust-pkg-config-0.3)) + (propagated-inputs + (list wayland)))) + (define-public rust-wayland-sys-0.23 (package (inherit rust-wayland-sys-0.28) -- cgit 1.4.1 From 90ff6c9a0b0e2b0acf10b17f1f8ebc386c9fbf47 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 27 Jul 2022 13:45:22 +0200 Subject: gnu: rust-wayland-commons: Add 0.29.4. * gnu/packages/crates-graphics.scm (rust-wayland-commons-0.29): New variable. (rust-wayland-commons-0.28): Inherit from it. --- gnu/packages/crates-graphics.scm | 37 ++++++++++++++++++++++++++++++------- 1 file changed, 30 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm index 616a0bf6f7..3bff94baf8 100644 --- a/gnu/packages/crates-graphics.scm +++ b/gnu/packages/crates-graphics.scm @@ -2504,26 +2504,27 @@ the wayland protocol, client side.") (("rust-byteorder" ,rust-byteorder-1) ("rust-tempfile" ,rust-tempfile-3)))))) -(define-public rust-wayland-commons-0.28 +(define-public rust-wayland-commons-0.29 (package (name "rust-wayland-commons") - (version "0.28.3") + (version "0.29.4") (source (origin (method url-fetch) (uri (crate-uri "wayland-commons" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0mid1sgy3bmiywnrhsr31b8w6zvk1ll2ci2as15ddv8pczvm0128")))) + (base32 "0gnk4a771i3g1k4fbzx54xnganpc9j68jrx8xj839hfp83iybxll")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs - (("rust-nix" ,rust-nix-0.18) + (("rust-nix" ,rust-nix-0.22) ("rust-once-cell" ,rust-once-cell-1) - ("rust-smallvec" ,rust-smallvec-1)))) + ("rust-smallvec" ,rust-smallvec-1) + ("rust-wayland-sys" ,rust-wayland-sys-0.29)))) (inputs - (list rust-nix-0.18 rust-once-cell-1 rust-smallvec-1 - rust-wayland-sys-0.28)) + (list rust-nix-0.22 rust-once-cell-1 rust-smallvec-1 + rust-wayland-sys-0.29)) (home-page "https://github.com/smithay/wayland-rs") (synopsis "Types and structures used by wayland-client and wayland-server") (description @@ -2531,6 +2532,28 @@ the wayland protocol, client side.") and wayland-server.") (license license:expat))) +(define-public rust-wayland-commons-0.28 + (package + (inherit rust-wayland-commons-0.29) + (name "rust-wayland-commons") + (version "0.28.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "wayland-commons" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0mid1sgy3bmiywnrhsr31b8w6zvk1ll2ci2as15ddv8pczvm0128")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-nix" ,rust-nix-0.18) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-smallvec" ,rust-smallvec-1)))) + (inputs + (list rust-nix-0.18 rust-once-cell-1 rust-smallvec-1 + rust-wayland-sys-0.28)))) + (define-public rust-wayland-commons-0.23 (package (inherit rust-wayland-commons-0.28) -- cgit 1.4.1 From 1638f2c5c5a6e02b1efc3bda56471fa48d89e6b3 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 27 Jul 2022 14:35:24 +0200 Subject: gnu: rust-libloading: Add cargo-inputs to inputs. * gnu/packages/crates-io.scm (rust-libloading-0.7)[inputs]: New field. --- gnu/packages/crates-io.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 3390ce3ec8..0cf92d9443 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -31628,6 +31628,7 @@ library.") (("rust-libc" ,rust-libc-0.2) ("rust-static-assertions" ,rust-static-assertions-1)))) + (inputs (list rust-cfg-if-1 rust-winapi-0.3)) (home-page "https://github.com/nagisa/rust_libloading/") (synopsis "Safer binding to dynamic library loading utilities") (description "This package provides a safer binding to dynamic library -- cgit 1.4.1 From 615234a1d1d2f802584b14598f16e90ad52bbcff Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 27 Jul 2022 14:36:30 +0200 Subject: gnu: rust-libloading: Don't skip build. * gnu/packages/crates-io.scm (rust-libloading-0.7)[arguments]: Remove #:skip-build?. --- gnu/packages/crates-io.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 0cf92d9443..0420707eca 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -31620,8 +31620,7 @@ library.") "0sidr67nsa693mqrqgk2np3bkqni0778yk147xncspy171jdk13g")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-cfg-if" ,rust-cfg-if-1) ("rust-winapi" ,rust-winapi-0.3)) #:cargo-development-inputs -- cgit 1.4.1 From c132e088817f0adc77ac4f61ec1afdf15573c376 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 27 Jul 2022 14:06:46 +0200 Subject: gnu: rust-nix@0.22: Add dependent packages to inputs. * gnu/packages/crates-io.scm (rust-nix-0.22)[inputs]: New field. --- gnu/packages/crates-io.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 0420707eca..7a83089045 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -37291,7 +37291,10 @@ while still providing platform specific APIs.") ("rust-cc" ,rust-cc-1) ("rust-cfg-if" ,rust-cfg-if-1) ("rust-libc" ,rust-libc-0.2) - ("rust-memoffset" ,rust-memoffset-0.6)))))) + ("rust-memoffset" ,rust-memoffset-0.6)))) + (inputs + (list rust-bitflags-1.2 rust-cc-1 rust-cfg-if-1 rust-libc-0.2 + rust-memoffset-0.6)))) (define-public rust-nix-0.21 (package -- cgit 1.4.1 From cc97bb913b038dce692237c2ada2cea9a0649d0f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 27 Jul 2022 14:12:42 +0200 Subject: gnu: rust-memoffset: Don't skip build. * gnu/packages/crates-io.scm (rust-memoffset-0.6)[arguments]: Remove #:skip-build?. Add RUST-DOC-COMMENT-0.3 to #:cargo-development-inputs. --- gnu/packages/crates-io.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 7a83089045..5f2fd7bea0 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -34304,9 +34304,10 @@ file IO.") (base32 "1yfx2v8kmkhr2d4gwk8ghihdwg73vapn3vvp0im06f0kgx8crb2r")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-autocfg" ,rust-autocfg-1)))) + `(#:cargo-inputs + (("rust-autocfg" ,rust-autocfg-1)) + #:cargo-development-inputs + (("rust-doc-comment" ,rust-doc-comment-0.3)))) (home-page "https://github.com/Gilnaa/memoffset") (synopsis "C-like offset_of functionality for Rust structs") (description -- cgit 1.4.1 From 31b08f77e7f31cfaef0e485dc35cfda9d4b0a510 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 27 Jul 2022 14:13:37 +0200 Subject: gnu: rust-memoffset: Add cargo-inputs to inputs. * gnu/packages/crates-io.scm (rust-memoffset-0.6)[inputs]: New field. (rust-memoffset-0.5)[inputss]: Don't inherit. --- gnu/packages/crates-io.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 5f2fd7bea0..8ce4627e8d 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -34308,6 +34308,7 @@ file IO.") (("rust-autocfg" ,rust-autocfg-1)) #:cargo-development-inputs (("rust-doc-comment" ,rust-doc-comment-0.3)))) + (inputs (list rust-autocfg-1)) (home-page "https://github.com/Gilnaa/memoffset") (synopsis "C-like offset_of functionality for Rust structs") (description @@ -34334,7 +34335,8 @@ for Rust structs.") #:cargo-inputs (("rust-rustc-version" ,rust-rustc-version-0.2)) #:cargo-development-inputs - (("rust-doc-comment" ,rust-doc-comment-0.3)))))) + (("rust-doc-comment" ,rust-doc-comment-0.3)))) + (inputs '()))) (define-public rust-memoffset-0.2 (package -- cgit 1.4.1 From 8764f1bffc3a6efb1ce11276ac232a051448f3d6 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 27 Jul 2022 13:54:51 +0200 Subject: gnu: rust-wayland-client: Add 0.29.4. * gnu/packages/crates-graphics.scm (rust-wayland-client-0.29): New variable. (rust-wayland-client-0.28): Inherit from it. --- gnu/packages/crates-graphics.scm | 51 +++++++++++++++++++++++++++++++++------- 1 file changed, 43 insertions(+), 8 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm index 3bff94baf8..0c9b323295 100644 --- a/gnu/packages/crates-graphics.scm +++ b/gnu/packages/crates-graphics.scm @@ -2406,8 +2406,50 @@ applications.") ("rust-num-derive" ,rust-num-derive-0.2) ("rust-num-traits" ,rust-num-traits-0.2)))))) +(define-public rust-wayland-client-0.29 + (package + (name "rust-wayland-client") + (version "0.29.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "wayland-client" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "13s5sj9344izk2g48yizk81kcg8jg4940gg2v6bzcmrjwxh388li")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #false ;circular dependency on wayland-protocols + #:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-downcast-rs" ,rust-downcast-rs-1) + ("rust-libc" ,rust-libc-0.2) + ("rust-nix" ,rust-nix-0.22) + ("rust-scoped-tls" ,rust-scoped-tls-1) + ("rust-wayland-commons" ,rust-wayland-commons-0.29) + ("rust-wayland-scanner" ,rust-wayland-scanner-0.29)) + #:cargo-development-inputs + (("rust-tempfile" ,rust-tempfile-3)))) + (inputs + (list rust-bitflags-1 + rust-downcast-rs-1 + rust-libc-0.2 + rust-nix-0.22 + rust-scoped-tls-1 + rust-wayland-commons-0.29 + rust-wayland-scanner-0.29 + rust-wayland-sys-0.29)) + (home-page "https://github.com/smithay/wayland-rs") + (synopsis + "Rust bindings to the standard C implementation of the wayland protocol") + (description + "This package provides Rust bindings to the standard C implementation of +the wayland protocol, client side.") + (license license:expat))) + (define-public rust-wayland-client-0.28 (package + (inherit rust-wayland-client-0.29) (name "rust-wayland-client") (version "0.28.3") (source @@ -2435,14 +2477,7 @@ applications.") rust-scoped-tls-1 rust-wayland-commons-0.28 rust-wayland-scanner-0.28 - rust-wayland-sys-0.28)) - (home-page "https://github.com/smithay/wayland-rs") - (synopsis - "Rust bindings to the standard C implementation of the wayland protocol") - (description - "This package provides Rust bindings to the standard C implementation of -the wayland protocol, client side.") - (license license:expat))) + rust-wayland-sys-0.28)))) (define-public rust-wayland-client-0.23 (package -- cgit 1.4.1 From 0470b4b47452405907b70f27c7d048285be7f01e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 27 Jul 2022 14:15:52 +0200 Subject: gnu: rust-wayland-server: Add 0.29.4. * gnu/packages/crates-graphics.scm (rust-wayland-server-0.29): New variable. (rust-wayland-server-0.28): Inherit from it. --- gnu/packages/crates-graphics.scm | 49 +++++++++++++++++++++++++++++++++------- 1 file changed, 41 insertions(+), 8 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm index 0c9b323295..2b30720120 100644 --- a/gnu/packages/crates-graphics.scm +++ b/gnu/packages/crates-graphics.scm @@ -2828,17 +2828,17 @@ wayland-client crate for usable bindings.") (base32 "17mp49v7w0p0x5ry628lj2llljnwkr9aj9g4bqqhfibid32jhf5z")))))) -(define-public rust-wayland-server-0.28 +(define-public rust-wayland-server-0.29 (package (name "rust-wayland-server") - (version "0.28.3") + (version "0.29.4") (source (origin (method url-fetch) (uri (crate-uri "wayland-server" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "09jfdjfqhjfcpiz4csgh60ymfkmz1cl3jmxyzq9hzcp0kyyxix93")))) + (base32 "1wj8gf28dbjwb824i29wf3wr5r6wp6ssknjm9b5dnb1fah47mk66")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -2846,7 +2846,7 @@ wayland-client crate for usable bindings.") ("rust-downcast-rs" ,rust-downcast-rs-1) ("rust-lazy-static" ,rust-lazy-static-1) ("rust-libc" ,rust-libc-0.2) - ("rust-nix" ,rust-nix-0.18) + ("rust-nix" ,rust-nix-0.22) ("rust-parking-lot" ,rust-parking-lot-0.11) ("rust-scoped-tls" ,rust-scoped-tls-1)))) (inputs @@ -2854,12 +2854,12 @@ wayland-client crate for usable bindings.") rust-downcast-rs-1 rust-lazy-static-1 rust-libc-0.2 - rust-nix-0.18 + rust-nix-0.22 rust-parking-lot-0.11 rust-scoped-tls-1 - rust-wayland-commons-0.28 - rust-wayland-scanner-0.28 - rust-wayland-sys-0.28)) + rust-wayland-commons-0.29 + rust-wayland-scanner-0.29 + rust-wayland-sys-0.29)) (home-page "https://github.com/smithay/wayland-rs") (synopsis "Bindings to the standard C implementation of the wayland protocol") @@ -2868,6 +2868,39 @@ wayland-client crate for usable bindings.") the wayland protocol, server side.") (license license:expat))) +(define-public rust-wayland-server-0.28 + (package + (inherit rust-wayland-server-0.29) + (name "rust-wayland-server") + (version "0.28.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "wayland-server" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "09jfdjfqhjfcpiz4csgh60ymfkmz1cl3jmxyzq9hzcp0kyyxix93")))) + (arguments + `(#:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-downcast-rs" ,rust-downcast-rs-1) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-libc" ,rust-libc-0.2) + ("rust-nix" ,rust-nix-0.18) + ("rust-parking-lot" ,rust-parking-lot-0.11) + ("rust-scoped-tls" ,rust-scoped-tls-1)))) + (inputs + (list rust-bitflags-1 + rust-downcast-rs-1 + rust-lazy-static-1 + rust-libc-0.2 + rust-nix-0.18 + rust-parking-lot-0.11 + rust-scoped-tls-1 + rust-wayland-commons-0.28 + rust-wayland-scanner-0.28 + rust-wayland-sys-0.28)))) + (define-public rust-wayland-server-0.23 (package (inherit rust-wayland-server-0.28) -- cgit 1.4.1 From a9107f2703d002bbc37c5649c6d5bcf327946d5f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 27 Jul 2022 14:16:33 +0200 Subject: gnu: rust-wayland-protocols: Add 0.29.4. * gnu/packages/crates-graphics.scm (rust-wayland-protocols-0.29): New variable. (rust-wayland-protocols-0.28): Inherit from it. --- gnu/packages/crates-graphics.scm | 35 ++++++++++++++++++++++++++++------- 1 file changed, 28 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm index 2b30720120..7b64c46065 100644 --- a/gnu/packages/crates-graphics.scm +++ b/gnu/packages/crates-graphics.scm @@ -2681,25 +2681,25 @@ WlSurface, which can then play the role of the base surface for initializing an OpenGL or Vulkan context.") (license license:expat))) -(define-public rust-wayland-protocols-0.28 +(define-public rust-wayland-protocols-0.29 (package (name "rust-wayland-protocols") - (version "0.28.3") + (version "0.29.4") (source (origin (method url-fetch) (uri (crate-uri "wayland-protocols" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0c0sw13qssrvf3jgygwqpiimpaagz3haxn9jridd4k85sfs856ii")))) + (base32 "0hap8vky2fwsq05c98c8xs00gb9m5kxp8kq3zr0jwh036gi7l530")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs - (("rust-bitflags" ,rust-bitflags-1)))) + (("rust-bitflags" ,rust-bitflags-1.2)))) (inputs - (list rust-bitflags-1 rust-wayland-client-0.28 - rust-wayland-commons-0.28 rust-wayland-scanner-0.28 - rust-wayland-server-0.28)) + (list rust-bitflags-1.2 rust-wayland-client-0.29 + rust-wayland-commons-0.29 rust-wayland-scanner-0.29 + rust-wayland-server-0.29)) (home-page "https://github.com/smithay/wayland-rs") (synopsis "Generated API for the officials Wayland protocol extensions") (description @@ -2707,6 +2707,27 @@ initializing an OpenGL or Vulkan context.") extensions.") (license license:expat))) +(define-public rust-wayland-protocols-0.28 + (package + (inherit rust-wayland-protocols-0.29) + (name "rust-wayland-protocols") + (version "0.28.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "wayland-protocols" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0c0sw13qssrvf3jgygwqpiimpaagz3haxn9jridd4k85sfs856ii")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1)))) + (inputs + (list rust-bitflags-1 rust-wayland-client-0.28 + rust-wayland-commons-0.28 rust-wayland-scanner-0.28 + rust-wayland-server-0.28)))) + (define-public rust-wayland-protocols-0.23 (package (inherit rust-wayland-protocols-0.28) -- cgit 1.4.1 From 4c980a2b9af6cc33abb85713a989d55c1e654b9c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 27 Jul 2022 14:37:20 +0200 Subject: gnu: rust-wayland-egl: Add 0.29.4. * gnu/packages/crates-graphics.scm (rust-wayland-egl-0.29): New variable. (rust-wayland-egl-0.28): Inherit from it. --- gnu/packages/crates-graphics.scm | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm index 7b64c46065..d69a8292de 100644 --- a/gnu/packages/crates-graphics.scm +++ b/gnu/packages/crates-graphics.scm @@ -2655,20 +2655,20 @@ and load them into WlBuffers as well as obtain the necessary metadata to properly display animated cursors.") (license license:expat))) -(define-public rust-wayland-egl-0.28 +(define-public rust-wayland-egl-0.29 (package (name "rust-wayland-egl") - (version "0.28.3") + (version "0.29.4") (source (origin (method url-fetch) (uri (crate-uri "wayland-egl" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1xd7iap0x4sidmy9dv02cdnxjhnbk9li7r7f39x9cg0i8xs50ly6")))) + (base32 "0flslbp8q4nv3hcw941vapn3jh6y7glqaqv63h1mjaqnxrlisa43")))) (build-system cargo-build-system) (inputs - (list rust-wayland-client-0.28 rust-wayland-sys-0.28)) + (list rust-wayland-client-0.29 rust-wayland-sys-0.29)) ;; For the PKG_CONFIG_PATH environment variable. (native-inputs (list pkg-config)) @@ -2681,6 +2681,24 @@ WlSurface, which can then play the role of the base surface for initializing an OpenGL or Vulkan context.") (license license:expat))) +(define-public rust-wayland-egl-0.28 + (package + (inherit rust-wayland-egl-0.29) + (name "rust-wayland-egl") + (version "0.28.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "wayland-egl" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1xd7iap0x4sidmy9dv02cdnxjhnbk9li7r7f39x9cg0i8xs50ly6")))) + (build-system cargo-build-system) + (inputs + (list rust-wayland-client-0.28 rust-wayland-sys-0.28)) + (native-inputs + (list pkg-config)))) + (define-public rust-wayland-protocols-0.29 (package (name "rust-wayland-protocols") -- cgit 1.4.1 From 2b2670399e4227d37f033e66234616d7f5e9c7e6 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 27 Jul 2022 14:39:00 +0200 Subject: gnu: rust-wayland-cursor: Add 0.29.4. * gnu/packages/crates-graphics.scm (rust-wayland-cursor-0.29): New variable. (rust-wayland-cursor-0.28): Inherit from it. --- gnu/packages/crates-graphics.scm | 30 +++++++++++++++++++++++++----- 1 file changed, 25 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm index d69a8292de..64ae99ce27 100644 --- a/gnu/packages/crates-graphics.scm +++ b/gnu/packages/crates-graphics.scm @@ -2629,24 +2629,24 @@ and wayland-server.") (("rust-nix" ,rust-nix-0.14) ("rust-wayland-sys" ,rust-wayland-sys-0.21)))))) -(define-public rust-wayland-cursor-0.28 +(define-public rust-wayland-cursor-0.29 (package (name "rust-wayland-cursor") - (version "0.28.3") + (version "0.29.4") (source (origin (method url-fetch) (uri (crate-uri "wayland-cursor" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0pvf96a9hg7b40vyvamcg491sa0006fr9bzf1xkaf8q22qn15syn")))) + (base32 "1gd6aswkrdz556n54pjpd4rchw7jkgcx6hnrhgy62y2y7pqmh9y5")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs - (("rust-nix" ,rust-nix-0.18) + (("rust-nix" ,rust-nix-0.22) ("rust-xcursor" ,rust-xcursor-0.3)))) (inputs - (list rust-nix-0.18 rust-wayland-client-0.28 rust-xcursor-0.3)) + (list rust-nix-0.22 rust-wayland-client-0.29 rust-xcursor-0.3)) (home-page "https://github.com/smithay/wayland-rs") (synopsis "Bindings to libwayland-cursor") (description @@ -2655,6 +2655,26 @@ and load them into WlBuffers as well as obtain the necessary metadata to properly display animated cursors.") (license license:expat))) +(define-public rust-wayland-cursor-0.28 + (package + (inherit rust-wayland-cursor-0.29) + (name "rust-wayland-cursor") + (version "0.28.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "wayland-cursor" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0pvf96a9hg7b40vyvamcg491sa0006fr9bzf1xkaf8q22qn15syn")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-nix" ,rust-nix-0.18) + ("rust-xcursor" ,rust-xcursor-0.3)))) + (inputs + (list rust-nix-0.18 rust-wayland-client-0.28 rust-xcursor-0.3)))) + (define-public rust-wayland-egl-0.29 (package (name "rust-wayland-egl") -- cgit 1.4.1 From 3113747e929d2d0c89214d5a05a2496e1156883c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 27 Jul 2022 14:42:50 +0200 Subject: gnu: rust-smithay-client-toolkit: Add 0.15.4. * gnu/packages/crates-graphics.scm (rust-smithay-client-toolkit-0.15): New variable. (rust-smithay-client-toolkit-0.12): Inherit from it. --- gnu/packages/crates-graphics.scm | 40 ++++++++++++++++++++++++++++++++++------ 1 file changed, 34 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm index 64ae99ce27..21cc6c546c 100644 --- a/gnu/packages/crates-graphics.scm +++ b/gnu/packages/crates-graphics.scm @@ -2178,8 +2178,41 @@ implements standard Rust traits to make `RGB`/`RGBA` pixels and slices first-class Rust objects.") (license license:expat))) +(define-public rust-smithay-client-toolkit-0.15 + (package + (name "rust-smithay-client-toolkit") + (version "0.15.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "smithay-client-toolkit" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "18wxla80y6m4l3dwawi7bl1d9m9dfcg4sxxjcgjqq3psjxmg2a4a")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-calloop" ,rust-calloop-0.9) + ("rust-dlib" ,rust-dlib-0.5) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-log" ,rust-log-0.4) + ("rust-memmap2" ,rust-memmap2-0.3) + ("rust-nix" ,rust-nix-0.22) + ("rust-pkg-config" ,rust-pkg-config-0.3) + ("rust-wayland-client" ,rust-wayland-client-0.29) + ("rust-wayland-cursor" ,rust-wayland-cursor-0.29) + ("rust-wayland-protocols" ,rust-wayland-protocols-0.29)))) + (home-page "https://github.com/smithay/client-toolkit") + (synopsis "Toolkit for making client Wayland applications") + (description + "This package provides a toolkit for making client Wayland applications.") + (license license:expat))) + (define-public rust-smithay-client-toolkit-0.12 (package + (inherit rust-smithay-client-toolkit-0.15) (name "rust-smithay-client-toolkit") (version "0.12.2") (source @@ -2203,12 +2236,7 @@ first-class Rust objects.") ("rust-nix" ,rust-nix-0.18) ("rust-wayland-client" ,rust-wayland-client-0.28) ("rust-wayland-cursor" ,rust-wayland-cursor-0.28) - ("rust-wayland-protocols" ,rust-wayland-protocols-0.28)))) - (home-page "https://github.com/smithay/client-toolkit") - (synopsis "Toolkit for making client Wayland applications") - (description - "This package provides a toolkit for making client Wayland applications.") - (license license:expat))) + ("rust-wayland-protocols" ,rust-wayland-protocols-0.28)))))) (define-public rust-smithay-client-toolkit-0.6 (package -- cgit 1.4.1 From 3336406334bb268983256625d69dbe7790bf1a79 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 27 Jul 2022 14:45:33 +0200 Subject: gnu: rust-ndk-macro: Add 0.3.0. * gnu/packages/crates-io.scm (rust-ndk-macro-0.3): New variable. (rust-ndk-macro-0.2): Inherit from it. --- gnu/packages/crates-io.scm | 30 +++++++++++++++++++++++++----- 1 file changed, 25 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 8ce4627e8d..df1f256395 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -36720,22 +36720,22 @@ general elements and for numerics.") "This package provides startup code for Android binaries.") (license (list license:expat license:asl2.0)))) -(define-public rust-ndk-macro-0.2 +(define-public rust-ndk-macro-0.3 (package (name "rust-ndk-macro") - (version "0.2.0") + (version "0.3.0") (source (origin (method url-fetch) (uri (crate-uri "ndk-macro" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "07a8vjr4fpksssgp453bf82n73i4i17yj1lvbgvd0964glqcdl85")))) + (base32 "0v3sxc11kq3d5vdwfml62l7y5dr0flsf6kp5xid9sbv7qh0arxqd")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs - (("rust-darling" ,rust-darling-0.10) - ("rust-proc-macro-crate" ,rust-proc-macro-crate-0.1) + (("rust-darling" ,rust-darling-0.13) + ("rust-proc-macro-crate" ,rust-proc-macro-crate-1) ("rust-proc-macro2" ,rust-proc-macro2-1) ("rust-quote" ,rust-quote-1) ("rust-syn" ,rust-syn-1)))) @@ -36744,6 +36744,26 @@ general elements and for numerics.") (description "This package provides helper macros for android ndk.") (license (list license:expat license:asl2.0)))) +(define-public rust-ndk-macro-0.2 + (package + (inherit rust-ndk-macro-0.3) + (name "rust-ndk-macro") + (version "0.2.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "ndk-macro" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "07a8vjr4fpksssgp453bf82n73i4i17yj1lvbgvd0964glqcdl85")))) + (arguments + `(#:cargo-inputs + (("rust-darling" ,rust-darling-0.10) + ("rust-proc-macro-crate" ,rust-proc-macro-crate-0.1) + ("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-1)))))) + (define-public rust-ndk-sys-0.2 (package (name "rust-ndk-sys") -- cgit 1.4.1 From 3219f25c27bd1c0a848bfbb8b4ca1013beb1af93 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 27 Jul 2022 14:49:35 +0200 Subject: gnu: Add rust-ndk-context. * gnu/packages/crates-io.scm (rust-ndk-context-0.1): New variable. --- gnu/packages/crates-io.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index df1f256395..b1dcde37fd 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -36692,6 +36692,26 @@ general elements and for numerics.") "This package provides safe Rust bindings to the Android NDK.") (license (list license:expat license:asl2.0)))) +(define-public rust-ndk-context-0.1 + (package + (name "rust-ndk-context") + (version "0.1.1") + (source (origin + (method url-fetch) + (uri (crate-uri "ndk-context" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "12sai3dqsblsvfd1l1zab0z6xsnlha3xsfl7kagdnmj3an3jvc17")))) + (build-system cargo-build-system) + (arguments + '(#:tests? #f)) ;TODO: requires many dependencies + setup + (home-page "https://github.com/rust-windowing/android-ndk-rs") + (synopsis "Handles for accessing Android APIs") + (description + "This package provides handles for accessing Android APIs.") + (license (list license:expat license:asl2.0)))) + (define-public rust-ndk-glue-0.2 (package (name "rust-ndk-glue") -- cgit 1.4.1 From 42a9a357c83b6a35665a2145537de72d3745d301 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 27 Jul 2022 14:51:21 +0200 Subject: gnu: rust-android-log-sys: Add 0.2.0. * gnu/packages/crates-io.scm (rust-android-log-sys-0.2): New variable. (rust-android-log-sys-0.1): Inherit from it. --- gnu/packages/crates-io.scm | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index b1dcde37fd..7db98e7456 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2762,17 +2762,17 @@ applications.") (description "This package provides the glue for the Android JNI.") (license license:expat))) -(define-public rust-android-log-sys-0.1 +(define-public rust-android-log-sys-0.2 (package (name "rust-android-log-sys") - (version "0.1.2") + (version "0.2.0") (source (origin (method url-fetch) (uri (crate-uri "android_log-sys" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0klq7cp4lm74gjf9p12zdjcr159blbicrfvadmaqvfxbi8njw1dq")))) + (base32 "0bhhs1cgzp9vzjvkn2q31ppc7w4am5s273hkvl5iac5475kmp5l5")))) (arguments `(#:skip-build? #true)) ;XXX: Android only (build-system cargo-build-system) (home-page "https://github.com/nercury/android_log-sys-rs") @@ -2780,6 +2780,20 @@ applications.") (description "This package provides FFI bindings to Android log Library.") (license (list license:expat license:asl2.0)))) +(define-public rust-android-log-sys-0.1 + (package + (inherit rust-android-log-sys-0.2) + (name "rust-android-log-sys") + (version "0.1.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "android_log-sys" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0klq7cp4lm74gjf9p12zdjcr159blbicrfvadmaqvfxbi8njw1dq")))) + (arguments `(#:skip-build? #true)))) ;XXX: Android only + (define-public rust-android-logger-0.8 (package (name "rust-android-logger") -- cgit 1.4.1 From 596b9235c3743d80e2d1a647731f7d0606fbe05c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 27 Jul 2022 14:53:26 +0200 Subject: gnu: rust-android-logger: Add 0.10.1. * gnu/packages/crates-io.scm (rust-android-logger-0.10): New variable. (rust-android-logger-0.8): Inherit from it. --- gnu/packages/crates-io.scm | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 7db98e7456..2d0c441d4a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2794,22 +2794,22 @@ applications.") (base32 "0klq7cp4lm74gjf9p12zdjcr159blbicrfvadmaqvfxbi8njw1dq")))) (arguments `(#:skip-build? #true)))) ;XXX: Android only -(define-public rust-android-logger-0.8 +(define-public rust-android-logger-0.10 (package (name "rust-android-logger") - (version "0.8.6") + (version "0.10.1") (source (origin (method url-fetch) (uri (crate-uri "android_logger" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0kj8i03fqqwxd803hrk27j2399v27ajjj9zxi2nnyml0s4nm9gcc")))) + (base32 "0rigzgkaik2y7pvsilpjdy19mdq1kkamw2rdf9fjkvb5hfqhkvfr")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs - (("rust-android-log-sys" ,rust-android-log-sys-0.1) - ("rust-env-logger" ,rust-env-logger-0.7) + (("rust-android-log-sys" ,rust-android-log-sys-0.2) + ("rust-env-logger" ,rust-env-logger-0.8) ("rust-lazy-static" ,rust-lazy-static-1) ("rust-log" ,rust-log-0.4)))) (home-page "https://github.com/Nercury/android_logger-rs") @@ -2819,6 +2819,25 @@ applications.") it outputs messages to Android's logcat.") (license (list license:expat license:asl2.0)))) +(define-public rust-android-logger-0.8 + (package + (inherit rust-android-logger-0.10) + (name "rust-android-logger") + (version "0.8.6") + (source + (origin + (method url-fetch) + (uri (crate-uri "android_logger" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0kj8i03fqqwxd803hrk27j2399v27ajjj9zxi2nnyml0s4nm9gcc")))) + (arguments + `(#:cargo-inputs + (("rust-android-log-sys" ,rust-android-log-sys-0.1) + ("rust-env-logger" ,rust-env-logger-0.7) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-log" ,rust-log-0.4)))))) + (define-public rust-ansi-parser-0.6 (package (name "rust-ansi-parser") -- cgit 1.4.1 From 94753408f3abde5a87ec99072b40f911caa8fedb Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 27 Jul 2022 14:54:34 +0200 Subject: gnu: rust-ndk-sys: Update to 0.2.2. * gnu/packages/crates-io.scm (rust-ndk-sys-0.2): Update to 0.2.2. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 2d0c441d4a..949812f4ba 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -36820,14 +36820,14 @@ general elements and for numerics.") (define-public rust-ndk-sys-0.2 (package (name "rust-ndk-sys") - (version "0.2.1") + (version "0.2.2") (source (origin (method url-fetch) (uri (crate-uri "ndk-sys" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "13c68a217ag3k18vlffpcj2qjfinchxxchzlwnsp075v7p5j4jf4")))) + (base32 "08915adplysmvx0ha12if1v7zxzx82xgj3nnmiddkm8aq9sdvg71")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t)) (home-page "https://github.com/rust-windowing/android-ndk-rs") -- cgit 1.4.1 From 591ae23cea4868c5f0f3627758ed3dc0420c1092 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 27 Jul 2022 14:56:33 +0200 Subject: gnu: rust-ndk: Add 0.5.0. * gnu/packages/crates-io.scm (rust-ndk-0.5): New variable. (rust-ndk-0.2): Inherit from it. --- gnu/packages/crates-io.scm | 33 ++++++++++++++++++++++++++++----- 1 file changed, 28 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 949812f4ba..f1a7f65f60 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -36698,26 +36698,27 @@ general elements and for numerics.") ("rust-quickcheck" ,rust-quickcheck-0.7) ("rust-rawpointer" ,rust-rawpointer-0.1)))))) -(define-public rust-ndk-0.2 +(define-public rust-ndk-0.5 (package (name "rust-ndk") - (version "0.2.1") + (version "0.5.0") (source (origin (method url-fetch) (uri (crate-uri "ndk" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0wvf4hy18lpfkr4bap846qv2cx1vdg3x0d4hcfba9l5yzv0ngcay")))) + (base32 "17b9imdmv6cffr12bdpvxw1myxdyvaf6jwkmd3w7abn7akv6in4n")))) (build-system cargo-build-system) (arguments `(#:skip-build? #true ;XXX: Android only #:cargo-inputs - (("rust-jni" ,rust-jni-0.14) + (("rust-bitflags" ,rust-bitflags-1) + ("rust-jni" ,rust-jni-0.18) ("rust-jni-glue" ,rust-jni-glue-0.0) ("rust-jni-sys" ,rust-jni-sys-0.3) ("rust-ndk-sys" ,rust-ndk-sys-0.2) - ("rust-num-enum" ,rust-num-enum-0.4) + ("rust-num-enum" ,rust-num-enum-0.5) ("rust-thiserror" ,rust-thiserror-1)))) (home-page "https://github.com/rust-windowing/android-ndk-rs") (synopsis "Safe Rust bindings to the Android NDK") @@ -36725,6 +36726,28 @@ general elements and for numerics.") "This package provides safe Rust bindings to the Android NDK.") (license (list license:expat license:asl2.0)))) +(define-public rust-ndk-0.2 + (package + (inherit rust-ndk-0.5) + (name "rust-ndk") + (version "0.2.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "ndk" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0wvf4hy18lpfkr4bap846qv2cx1vdg3x0d4hcfba9l5yzv0ngcay")))) + (arguments + `(#:skip-build? #true ;XXX: Android only + #:cargo-inputs + (("rust-jni" ,rust-jni-0.14) + ("rust-jni-glue" ,rust-jni-glue-0.0) + ("rust-jni-sys" ,rust-jni-sys-0.3) + ("rust-ndk-sys" ,rust-ndk-sys-0.2) + ("rust-num-enum" ,rust-num-enum-0.4) + ("rust-thiserror" ,rust-thiserror-1)))))) + (define-public rust-ndk-context-0.1 (package (name "rust-ndk-context") -- cgit 1.4.1 From 86da387b6566523535c8fe6f5e78acd25586fd83 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 27 Jul 2022 15:02:05 +0200 Subject: gnu: rust-ndk-glue: Add 0.5.2. * gnu/packages/crates-io.scm (rust-ndk-glue-0.5): New variable. (rust-ndk-glue-0.2): Inherit from it. --- gnu/packages/crates-io.scm | 36 ++++++++++++++++++++++++++++++------ 1 file changed, 30 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index f1a7f65f60..968e38fabc 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -36768,27 +36768,28 @@ general elements and for numerics.") "This package provides handles for accessing Android APIs.") (license (list license:expat license:asl2.0)))) -(define-public rust-ndk-glue-0.2 +(define-public rust-ndk-glue-0.5 (package (name "rust-ndk-glue") - (version "0.2.1") + (version "0.5.2") (source (origin (method url-fetch) (uri (crate-uri "ndk-glue" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0hajn6nsg6i3khi7yr2ayafpiznm5z3k5v64afqnz753nyw9kwxx")))) + (base32 "1m44jh4f9sirs757ikc8sracg6dzw77h9l4bw9vm8s1dly7fw6y7")))) (build-system cargo-build-system) (arguments `(#:skip-build? #true ;XXX: Android only #:cargo-inputs - (("rust-android-logger" ,rust-android-logger-0.8) + (("rust-android-logger" ,rust-android-logger-0.10) ("rust-lazy-static" ,rust-lazy-static-1) ("rust-libc" ,rust-libc-0.2) ("rust-log" ,rust-log-0.4) - ("rust-ndk" ,rust-ndk-0.2) - ("rust-ndk-macro" ,rust-ndk-macro-0.2) + ("rust-ndk" ,rust-ndk-0.5) + ("rust-ndk-context" ,rust-ndk-context-0.1) + ("rust-ndk-macro" ,rust-ndk-macro-0.3) ("rust-ndk-sys" ,rust-ndk-sys-0.2)))) (home-page "https://github.com/rust-windowing/android-ndk-rs") (synopsis "Startup code for Android binaries") @@ -36796,6 +36797,29 @@ general elements and for numerics.") "This package provides startup code for Android binaries.") (license (list license:expat license:asl2.0)))) +(define-public rust-ndk-glue-0.2 + (package + (inherit rust-ndk-glue-0.5) + (name "rust-ndk-glue") + (version "0.2.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "ndk-glue" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0hajn6nsg6i3khi7yr2ayafpiznm5z3k5v64afqnz753nyw9kwxx")))) + (arguments + `(#:skip-build? #true ;XXX: Android only + #:cargo-inputs + (("rust-android-logger" ,rust-android-logger-0.8) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-libc" ,rust-libc-0.2) + ("rust-log" ,rust-log-0.4) + ("rust-ndk" ,rust-ndk-0.2) + ("rust-ndk-macro" ,rust-ndk-macro-0.2) + ("rust-ndk-sys" ,rust-ndk-sys-0.2)))))) + (define-public rust-ndk-macro-0.3 (package (name "rust-ndk-macro") -- cgit 1.4.1 From 36f4b7df99eee163daf941525030359e695b0178 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 27 Jul 2022 15:03:53 +0200 Subject: gnu: rust-winit: Add 0.26.1. * gnu/packages/crates-graphics.scm (rust-winit-0.26): New variable. (rust-winit-0.24): Inherit from it. --- gnu/packages/crates-graphics.scm | 65 +++++++++++++++++++++++++++++++++------- 1 file changed, 54 insertions(+), 11 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm index 21cc6c546c..fef1083b91 100644 --- a/gnu/packages/crates-graphics.scm +++ b/gnu/packages/crates-graphics.scm @@ -3156,17 +3156,17 @@ crate @code{rust-wayland-client} for usable bindings.") (base32 "0a0ndgkg98pvmkv44yya4f7mxzjaxylknqh64bpa05w0azyv02jj")))))) -(define-public rust-winit-0.24 +(define-public rust-winit-0.26 (package (name "rust-winit") - (version "0.24.0") + (version "0.26.1") (source (origin (method url-fetch) (uri (crate-uri "winit" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "15zmpx5ip6ziqhds7md1s0ri0blhxfa8fg1ylg84pf0frrpxlkns")))) + (base32 "0fp7cdh7llbqmm6ga8f6bzk9785jmkbyy1w631hr9faq3n9wqhwv")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -3181,24 +3181,23 @@ crate @code{rust-wayland-client} for usable bindings.") ("rust-lazy-static" ,rust-lazy-static-1) ("rust-libc" ,rust-libc-0.2) ("rust-log" ,rust-log-0.4) - ("rust-mio" ,rust-mio-0.6) - ("rust-mio-extras" ,rust-mio-extras-2) - ("rust-ndk" ,rust-ndk-0.2) - ("rust-ndk-glue" ,rust-ndk-glue-0.2) + ("rust-mint" ,rust-mint-0.5) + ("rust-mio" ,rust-mio-0.8) + ("rust-ndk" ,rust-ndk-0.5) + ("rust-ndk-glue" ,rust-ndk-glue-0.5) ("rust-ndk-sys" ,rust-ndk-sys-0.2) ("rust-objc" ,rust-objc-0.2) ("rust-parking-lot" ,rust-parking-lot-0.11) ("rust-percent-encoding" ,rust-percent-encoding-2) - ("rust-raw-window-handle" ,rust-raw-window-handle-0.3) + ("rust-raw-window-handle" ,rust-raw-window-handle-0.4) ("rust-serde" ,rust-serde-1) - ("rust-smithay-client-toolkit" ,rust-smithay-client-toolkit-0.12) - ("rust-stdweb" ,rust-stdweb-0.4) + ("rust-smithay-client-toolkit" ,rust-smithay-client-toolkit-0.15) ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2) ("rust-web-sys" ,rust-web-sys-0.3) ("rust-winapi" ,rust-winapi-0.3) ("rust-x11-dl" ,rust-x11-dl-2)))) (inputs - (list rust-wayland-client-0.28)) + (list rust-wayland-client-0.29 rust-wayland-protocols-0.29)) (home-page "https://github.com/rust-windowing/winit") (synopsis "Window creation library") (description @@ -3212,6 +3211,50 @@ Consequently, in order to show something on the window you need to use the platform-specific getters provided by winit, or another library.") (license license:asl2.0))) +(define-public rust-winit-0.24 + (package + (inherit rust-winit-0.26) + (name "rust-winit") + (version "0.24.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "winit" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "15zmpx5ip6ziqhds7md1s0ri0blhxfa8fg1ylg84pf0frrpxlkns")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-cocoa" ,rust-cocoa-0.24) + ("rust-core-foundation" ,rust-core-foundation-0.9) + ("rust-core-graphics" ,rust-core-graphics-0.22) + ("rust-core-video-sys" ,rust-core-video-sys-0.1) + ("rust-dispatch" ,rust-dispatch-0.2) + ("rust-instant" ,rust-instant-0.1) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-libc" ,rust-libc-0.2) + ("rust-log" ,rust-log-0.4) + ("rust-mio" ,rust-mio-0.6) + ("rust-mio-extras" ,rust-mio-extras-2) + ("rust-ndk" ,rust-ndk-0.2) + ("rust-ndk-glue" ,rust-ndk-glue-0.2) + ("rust-ndk-sys" ,rust-ndk-sys-0.2) + ("rust-objc" ,rust-objc-0.2) + ("rust-parking-lot" ,rust-parking-lot-0.11) + ("rust-percent-encoding" ,rust-percent-encoding-2) + ("rust-raw-window-handle" ,rust-raw-window-handle-0.3) + ("rust-serde" ,rust-serde-1) + ("rust-smithay-client-toolkit" ,rust-smithay-client-toolkit-0.12) + ("rust-stdweb" ,rust-stdweb-0.4) + ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2) + ("rust-web-sys" ,rust-web-sys-0.3) + ("rust-winapi" ,rust-winapi-0.3) + ("rust-x11-dl" ,rust-x11-dl-2)))) + (inputs + (list rust-wayland-client-0.28)))) + (define-public rust-winit-0.20 (package (inherit rust-winit-0.24) -- cgit 1.4.1 From 68dbcbbbe626b6ef88f48d21763fd51353cfe021 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 27 Jul 2022 15:05:55 +0200 Subject: gnu: rust-glutin-egl-sys: Update to 0.1.5. * gnu/packages/crates-graphics.scm (rust-glutin-egl-sys-0.1): Update to 0.1.5. --- gnu/packages/crates-graphics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm index fef1083b91..9f4d489255 100644 --- a/gnu/packages/crates-graphics.scm +++ b/gnu/packages/crates-graphics.scm @@ -1079,7 +1079,7 @@ EUI-64, also known as MAC-48 media access control addresses.") (define-public rust-glutin-egl-sys-0.1 (package (name "rust-glutin-egl-sys") - (version "0.1.4") + (version "0.1.5") (source (origin (method url-fetch) @@ -1088,7 +1088,7 @@ EUI-64, also known as MAC-48 media access control addresses.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0k1x1frdp4wp47qkai8zzmgqxzpfcn7780m29qgd92lbnbrxwbkp")))) + "04f2ci9kb8q4dv4kviigvgfy54lr4jmbnmjsvi50qj13anjnmfra")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs -- cgit 1.4.1 From a11fc74a87df96defbb512bafe9d30553b6ae69e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 27 Jul 2022 15:12:02 +0200 Subject: gnu: rust-glutin: Add 0.28.0. * gnu/packages/crates-graphics.scm (rust-glutin-0.28): New variable. (rust-glutin-0.26): Inherit from it. --- gnu/packages/crates-graphics.scm | 47 +++++++++++++++++++++++++++++++++++----- 1 file changed, 41 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm index 9f4d489255..4bc1aec619 100644 --- a/gnu/packages/crates-graphics.scm +++ b/gnu/packages/crates-graphics.scm @@ -966,8 +966,48 @@ EUI-64, also known as MAC-48 media access control addresses.") "Generated OpenGL bindings and wrapper for Servo.") (license (list license:asl2.0 license:expat)))) +(define-public rust-glutin-0.28 + (package + (name "rust-glutin") + (version "0.28.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "glutin" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1lpnf61x4jbm55bpdr10k1a1pl3cs719i9y4qibsdj2bajz9vsh0")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-android-glue" ,rust-android-glue-0.2) + ("rust-cgl" ,rust-cgl-0.3) + ("rust-cocoa" ,rust-cocoa-0.24) + ("rust-core-foundation" ,rust-core-foundation-0.9) + ("rust-glutin-egl-sys" ,rust-glutin-egl-sys-0.1) + ("rust-glutin-emscripten-sys" ,rust-glutin-emscripten-sys-0.1) + ("rust-glutin-gles2-sys" ,rust-glutin-gles2-sys-0.1) + ("rust-glutin-glx-sys" ,rust-glutin-glx-sys-0.1) + ("rust-glutin-wgl-sys" ,rust-glutin-wgl-sys-0.1) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-libloading" ,rust-libloading-0.7) + ("rust-log" ,rust-log-0.4) + ("rust-objc" ,rust-objc-0.2) + ("rust-osmesa-sys" ,rust-osmesa-sys-0.1) + ("rust-parking-lot" ,rust-parking-lot-0.11) + ("rust-wayland-egl" ,rust-wayland-egl-0.29) + ("rust-winapi" ,rust-winapi-0.3) + ("rust-winit" ,rust-winit-0.26)))) + (inputs + (list rust-wayland-client-0.29 rust-wayland-egl-0.29)) + (home-page "https://github.com/tomaka/glutin") + (synopsis "Cross-platform OpenGL context provider") + (description "This package provides an OpenGL context provider.") + (license license:asl2.0))) + (define-public rust-glutin-0.26 (package + (inherit rust-glutin-0.28) (name "rust-glutin") (version "0.26.0") (source @@ -977,7 +1017,6 @@ EUI-64, also known as MAC-48 media access control addresses.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "18szbh4dixcr7pmymvbrpv21hv0wrpii5w03rv2534bb2ywwpq8s")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-android-glue" ,rust-android-glue-0.2) @@ -999,11 +1038,7 @@ EUI-64, also known as MAC-48 media access control addresses.") ("rust-winapi" ,rust-winapi-0.3) ("rust-winit" ,rust-winit-0.24)))) (inputs - (list rust-wayland-client-0.28 rust-wayland-egl-0.28)) - (home-page "https://github.com/tomaka/glutin") - (synopsis "Cross-platform OpenGL context provider") - (description "This package provides an OpenGL context provider.") - (license license:asl2.0))) + (list rust-wayland-client-0.28 rust-wayland-egl-0.28)))) (define-public rust-glutin-0.22 (package -- cgit 1.4.1 From daf54d67e87d0f7ce6700d30d41b8f5c58a10f05 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 27 Jul 2022 15:22:14 +0200 Subject: gnu: rust-cgmath: Add 0.18.0. * gnu/packages/crates-graphics.scm (rust-cgmath-0.18): New variable. (rust-cgmath-0.17): Inherit from it. --- gnu/packages/crates-graphics.scm | 40 ++++++++++++++++++++++++++++++++-------- 1 file changed, 32 insertions(+), 8 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm index 4bc1aec619..c5d9555599 100644 --- a/gnu/packages/crates-graphics.scm +++ b/gnu/packages/crates-graphics.scm @@ -345,8 +345,39 @@ alpha channel embedding.") (("rust-gleam" ,rust-gleam-0.6) ("rust-libc" ,rust-libc-0.2)))))) +(define-public rust-cgmath-0.18 + (package + (name "rust-cgmath") + (version "0.18.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "cgmath" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "05sk7c1c1jg5ygqvc3y77kxddp177gwazfibhd864ag3800x760s")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-approx" ,rust-approx-0.4) + ("rust-mint" ,rust-mint-0.5) + ("rust-num-traits" ,rust-num-traits-0.2) + ("rust-rand" ,rust-rand-0.8) + ("rust-serde" ,rust-serde-1)) + #:cargo-development-inputs + (("rust-serde-json" ,rust-serde-json-1)))) + (home-page "https://github.com/brendanzab/cgmath") + (synopsis "Linear algebra and mathematics library") + (description + "This package provides a linear algebra and mathematics library +for computer graphics.") + (license license:asl2.0))) + (define-public rust-cgmath-0.17 (package + (inherit rust-cgmath-0.18) (name "rust-cgmath") (version "0.17.0") (source @@ -358,7 +389,6 @@ alpha channel embedding.") (sha256 (base32 "1rvgila6ivr0dh1bxza450a4yfwdi2pwj3h1vnwg0jy4xk6l8f98")))) - (build-system cargo-build-system) (arguments `(#:skip-build? #t ; Crate won't build without glium. #:cargo-inputs @@ -370,13 +400,7 @@ alpha channel embedding.") ("rust-simd" ,rust-simd-0.2)) #:cargo-development-inputs (;("rust-glium" ,rust-glium-0.23) - ("rust-serde-json" ,rust-serde-json-1)))) - (home-page "https://github.com/brendanzab/cgmath") - (synopsis "Linear algebra and mathematics library") - (description - "This package provides a linear algebra and mathematics library -for computer graphics.") - (license license:asl2.0))) + ("rust-serde-json" ,rust-serde-json-1)))))) (define-public rust-cgmath-0.16 (package -- cgit 1.4.1 From d10effc13f6b973acae147f1c0aa3d7307246130 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 27 Jul 2022 15:27:17 +0200 Subject: gnu: rust-glium: Add 0.31.0. * gnu/packages/crates-io.scm (rust-glium-0.31): New variable. (rust-glium-0.25): Inherit from it. --- gnu/packages/crates-io.scm | 45 +++++++++++++++++++++++++++++++++++---------- 1 file changed, 35 insertions(+), 10 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 968e38fabc..910b2e68df 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -25506,8 +25506,42 @@ graphics.") graphics.") (license (list license:expat license:asl2.0)))) +(define-public rust-glium-0.31 + (package + (name "rust-glium") + (version "0.31.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "glium" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "06cfsq3mgjlq3bnxv7jh5bb5is7040xyvf8cf1x45vnq8fdz1d0a")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #true ;XXX circular dependencies + #:cargo-inputs + (("rust-backtrace" ,rust-backtrace-0.3) + ("rust-fnv" ,rust-fnv-1) + ("rust-glutin" ,rust-glutin-0.28) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-memoffset" ,rust-memoffset-0.6) + ("rust-smallvec" ,rust-smallvec-1) + ("rust-takeable-option" ,rust-takeable-option-0.5)) + #:cargo-development-inputs + (("rust-gl-generator" ,rust-gl-generator-0.14)))) + (home-page "https://github.com/glium/glium") + (synopsis "OpenGL wrapper") + (description + "Glium is an intermediate layer between OpenGL and your application. You +still need to manually handle the graphics pipeline, but without having to use +OpenGL's old and error-prone API.") + (license license:asl2.0))) + (define-public rust-glium-0.25 (package + (inherit rust-glium-0.31) (name "rust-glium") (version "0.25.1") (source @@ -25519,7 +25553,6 @@ graphics.") (sha256 (base32 "0mhjly07x10lxg802ppg16wbxddhh4fdnlg10i99qwpfamvqhzbd")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-backtrace" ,rust-backtrace-0.3) @@ -25534,15 +25567,7 @@ graphics.") ("rust-gl-generator" ,rust-gl-generator-0.11) ("rust-image" ,rust-image-0.21) ("rust-obj" ,rust-obj-0.9) - ("rust-rand" ,rust-rand-0.6)))) - (home-page "https://github.com/glium/glium") - (synopsis - "OpenGL wrapper") - (description - "Glium is an intermediate layer between OpenGL and your application. You -still need to manually handle the graphics pipeline, but without having to use -OpenGL's old and error-prone API.") - (license license:asl2.0))) + ("rust-rand" ,rust-rand-0.6)))))) (define-public rust-glob-0.3 (package -- cgit 1.4.1 From 1160932ea09fdf7d95559116afa5bbfbc2be4778 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 27 Jul 2022 14:23:13 +0200 Subject: gnu: rust-deflate: Add 1.0.0. * gnu/packages/crates-io.scm (rust-deflate-1): New variable. (rust-deflate-0.9): Inherit from it. --- gnu/packages/crates-io.scm | 31 ++++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index d9cb823515..2e71a89e6b 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -16770,10 +16770,10 @@ the Debug trait manually.") thread.") (license license:mpl2.0))) -(define-public rust-deflate-0.9 +(define-public rust-deflate-1 (package (name "rust-deflate") - (version "0.9.1") + (version "1.0.0") (source (origin (method url-fetch) @@ -16781,21 +16781,42 @@ thread.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0w0ww0hrq4bjnihxgbnrri4lj5c8yzg31fyzx36fd9pvvw2vz5az")))) + "0bs319wa9wl7pn9j6jrrxg1gaqbak581rkx210cbix0qyljpwvy8")))) (build-system cargo-build-system) (arguments `(#:tests? #f ; not all test files included #:cargo-inputs (("rust-adler32" ,rust-adler32-1) - ("rust-gzip-header" ,rust-gzip-header-0.3)) + ("rust-gzip-header" ,rust-gzip-header-1)) #:cargo-development-inputs - (("rust-miniz-oxide" ,rust-miniz-oxide-0.3)))) + (("rust-miniz-oxide" ,rust-miniz-oxide-0.5)))) (home-page "https://github.com/image-rs/deflate-rs") (synopsis "DEFLATE, zlib and gzip encoder written in rust") (description "This package provides a DEFLATE, zlib and gzip encoder written in rust.") (license (list license:expat license:asl2.0)))) +(define-public rust-deflate-0.9 + (package + (inherit rust-deflate-1) + (name "rust-deflate") + (version "0.9.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "deflate" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0w0ww0hrq4bjnihxgbnrri4lj5c8yzg31fyzx36fd9pvvw2vz5az")))) + (arguments + `(#:tests? #f ; not all test files included + #:cargo-inputs + (("rust-adler32" ,rust-adler32-1) + ("rust-gzip-header" ,rust-gzip-header-0.3)) + #:cargo-development-inputs + (("rust-miniz-oxide" ,rust-miniz-oxide-0.3)))))) + (define-public rust-deflate-0.8 (package (inherit rust-deflate-0.9) -- cgit 1.4.1 From 4059158e6a284976c80b0fe8f64f69868d59ab10 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 27 Jul 2022 15:30:27 +0200 Subject: gnu: rust-png: Add 0.17. * gnu/packages/crates-graphics.scm (rust-png-0.17): New variable. (rust-png-0.16): Inherit from it. --- gnu/packages/crates-graphics.scm | 42 +++++++++++++++++++++++++++++++++------- 1 file changed, 35 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm index c5d9555599..f0414602bc 100644 --- a/gnu/packages/crates-graphics.scm +++ b/gnu/packages/crates-graphics.scm @@ -12,6 +12,7 @@ ;;; Copyright © 2020 Antoine Côté ;;; Copyright © 2021 Maxim Cournoyer ;;; Copyright © 2021 Zheng Junjie <873216071@qq.com> +;;; Copyright © 2022 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -2004,31 +2005,58 @@ interactive applications.") "This package provides a library for window abstraction.") (license license:expat))) -(define-public rust-png-0.16 +(define-public rust-png-0.17 (package (name "rust-png") - (version "0.16.8") + (version "0.17.5") (source (origin (method url-fetch) (uri (crate-uri "png" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1ipl44q3vy4kvx6j296vk7d4v8gvcg203lrkvvixwixq1j98fciw")))) + (base32 "1fp3vnaxmjdv71dcakc21k07ir5s31dlx1mrazfqddzgaynw0f6w")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t + `(#:tests? #false ;XXX missing files in tarball #:cargo-inputs (("rust-bitflags" ,rust-bitflags-1) ("rust-crc32fast" ,rust-crc32fast-1) - ("rust-deflate" ,rust-deflate-0.8) - ("rust-miniz-oxide" ,rust-miniz-oxide-0.3)))) - (home-page "https://github.com/image-rs/image-png.git") + ("rust-deflate" ,rust-deflate-1) + ("rust-miniz-oxide" ,rust-miniz-oxide-0.5)) + #:cargo-development-inputs + (("rust-criterion" ,rust-criterion-0.3) + ("rust-getopts" ,rust-getopts-0.2) + ("rust-glium" ,rust-glium-0.31) + ("rust-glob" ,rust-glob-0.3) + ("rust-rand" ,rust-rand-0.8) + ("rust-term" ,rust-term-0.7)))) + (home-page "https://github.com/image-rs/image-png") (synopsis "PNG decoding and encoding library in pure Rust") (description "This package is a PNG decoding and encoding library in pure Rust.") (license (list license:expat license:asl2.0)))) +(define-public rust-png-0.16 + (package + (inherit rust-png-0.17) + (name "rust-png") + (version "0.16.8") + (source + (origin + (method url-fetch) + (uri (crate-uri "png" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1ipl44q3vy4kvx6j296vk7d4v8gvcg203lrkvvixwixq1j98fciw")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-crc32fast" ,rust-crc32fast-1) + ("rust-deflate" ,rust-deflate-0.8) + ("rust-miniz-oxide" ,rust-miniz-oxide-0.3)))))) + (define-public rust-png-0.15 (package (inherit rust-png-0.16) -- cgit 1.4.1