aboutsummaryrefslogtreecommitdiff
path: root/tests/guix-pack.sh
blob: 3204e821cfac88aa9ea114ca9638fd227accfc66 (about) (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
# GNU Guix --- Functional package management for GNU
# Copyright © 2018 Chris Marusich <cmmarusich@gmail.com>
# Copyright © 2018, 2019, 2020, 2022, 2023 Ludovic Courtès <ludo@gnu.org>
#
# This file is part of GNU Guix.
#
# GNU Guix is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 3 of the License, or (at
# your option) any later version.
#
# GNU Guix is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.

#
# Test the `guix pack' command-line utility.
#

# A network connection is required to build %bootstrap-coreutils&co,
# which is required to run these tests with the --bootstrap option.
if ! guile -c '(getaddrinfo "www.gnu.org" "80" AI_NUMERICSERV)' 2> /dev/null; then
    exit 77
fi

guix pack --version

# Use --no-substitutes because we need to verify we can do this ourselves.
# Use --no-grafts to avoid interference--e.g., --dry-run passing even when
# given an unsupported package.
GUIX_BUILD_OPTIONS="--no-substitutes --no-grafts"
export GUIX_BUILD_OPTIONS

test_directory="`mktemp -d`"
trap 'chmod -Rf +w "$test_directory"; rm -rf "$test_directory"' EXIT

# Reject unsuppoted packages.
guix pack intelmetool -s armhf-linux -n && false

# Compute the derivation of a pack.
drv="`guix pack coreutils -d --no-grafts`"
guix gc -R "$drv" | grep "`guix build coreutils -d --no-grafts`"

# Compute the derivation of a cross-compiled pack.  Make sure it refers to the
# cross-compiled package and not to the native package.
drv="`guix pack idutils -d --no-grafts --target=arm-linux-gnueabihf`"
guix gc -R "$drv" | \
    grep "`guix build idutils --target=arm-linux-gnueabihf -d --no-grafts`"
guix gc -R "$drv" | grep "`guix build idutils -d --no-grafts`" && false

# Build a tarball with no compression.
guix pack --compression=none --bootstrap guile-bootstrap

# Build a tarball (with compression).  Check that '-e' works as well.
out1="`guix pack --bootstrap guile-bootstrap`"
out2="`guix pack --bootstrap -e '(@ (gnu packages bootstrap) %bootstrap-guile)'`"
test -n "$out1"
test "$out1" = "$out2"

# Test '--root'.
guix pack -r "$test_directory/my-guile" --bootstrap guile-bootstrap
test "`readlink "$test_directory/my-guile"`" = "$out1"
guix gc --list-roots | grep "^$test_directory/my-guile$"
rm "$test_directory/my-guile"

# Build a tarball with a symlink.
the_pack="`guix pack --bootstrap -S /opt/gnu/bin=bin guile-bootstrap`"

# Try to extract it.  Note: we cannot test whether /opt/gnu/bin/guile itself
# exists because /opt/gnu/bin may be an absolute symlink to a store item that
# has been GC'd.
cd "$test_directory"
tar -xf "$the_pack"
test -L opt/gnu/bin

is_available () {
    # Use the "type" shell builtin to see if the program is on PATH.
    type "$1" > /dev/null
}

if is_available chroot && is_available unshare && unshare -r true; then
    # Verify we can use what we built.
    unshare -r chroot . /opt/gnu/bin/guile --version
    cd -
else
    echo "warning: skipped some verification because chroot or unshare is unavailable" >&2
fi

# For the tests that build Docker images below, we currently have to use
# --dry-run because if we don't, there are only two possible cases:
#
#     Case 1: We do not use --bootstrap, and the build takes hours to finish
#             because it needs to build tar etc.
#
#     Case 2: We use --bootstrap, and the build fails because the bootstrap
#             Guile cannot dlopen shared libraries.  Not to mention the fact
#             that we would still have to build many non-bootstrap inputs
#             (e.g., guile-json) in order to create the Docker image.

# Build a Docker image.
guix pack --dry-run --bootstrap -f docker guile-bootstrap

# Build a Docker image with a symlink.
guix pack --dry-run --bootstrap -f docker -S /opt/gnu= guile-bootstrap

# Build a tarball pack of cross-compiled software.  Use coreutils because
# guile-bootstrap is not intended to be cross-compiled.
guix pack --dry-run --bootstrap --target=arm-linux-gnueabihf coreutils

# Likewise, 'guix pack -R' requires a full-blown toolchain (because
# 'glibc-bootstrap' lacks 'libc.a'), hence '--dry-run'.
guix pack -R --dry-run --bootstrap -S /mybin=bin guile-bootstrap

# Make sure package transformation options are honored.
chmod -Rf +w "$test_directory"; rm -r "$test_directory"
mkdir -p "$test_directory" -m 755
drv1="`guix pack --no-grafts -n guile 2>&1 | grep pack.*\.drv`"
drv2="`guix pack --no-grafts -n --with-source=guile=$test_directory guile 2>&1 | grep pack.*\.drv`"
test -n "$drv1"
test "$drv1" != "$drv2"

# Try '--manifest' options.
cat > "$test_directory/manifest1.scm" <<EOF
(specifications->manifest '("guile"))
EOF
cat > "$test_directory/manifest2.scm" <<EOF
(specifications->manifest '("emacs"))
EOF
drv="`guix pack --no-grafts -d -m "$test_directory/manifest1.scm" -m "$test_directory/manifest2.scm"`"
guix gc -R "$drv" | grep `guix build guile -d --no-grafts`
guix gc -R "$drv" | grep `guix build emacs -d --no-grafts`
ass='none' style='width: 98.7%;'/> -rw-r--r--gnu/packages/freedesktop.scm46
-rw-r--r--gnu/packages/gnome.scm6
-rw-r--r--gnu/packages/gnuzilla.scm12
-rw-r--r--gnu/packages/image.scm13
-rw-r--r--gnu/packages/libusb.scm15
-rw-r--r--gnu/packages/linux.scm32
-rw-r--r--gnu/packages/lisp-xyz.scm89
-rw-r--r--gnu/packages/messaging.scm46
-rw-r--r--gnu/packages/music.scm35
-rw-r--r--gnu/packages/networking.scm12
-rw-r--r--gnu/packages/nss.scm4
-rw-r--r--gnu/packages/patches/dbxfs-remove-sentry-sdk.patch63
-rw-r--r--gnu/packages/patches/eigen-fix-strict-aliasing-bug.patch73
-rw-r--r--gnu/packages/patches/eigen-remove-openmp-error-counting.patch64
-rw-r--r--gnu/packages/patches/eigen-stabilise-sparseqr-test.patch74
-rw-r--r--gnu/packages/patches/php-curl-compat.patch17
-rw-r--r--gnu/packages/patches/php-openssl_x509_checkpurpose_basic.patch108
-rw-r--r--gnu/packages/pdf.scm23
-rw-r--r--gnu/packages/perl.scm8
-rw-r--r--gnu/packages/php.scm9
-rw-r--r--gnu/packages/protobuf.scm17
-rw-r--r--gnu/packages/python-xyz.scm4
-rw-r--r--gnu/packages/shells.scm15
-rw-r--r--gnu/packages/toolkits.scm6
-rw-r--r--gnu/packages/version-control.scm6
-rw-r--r--gnu/packages/video.scm14
-rw-r--r--gnu/packages/virtualization.scm4
-rw-r--r--gnu/packages/vpn.scm9
-rw-r--r--gnu/packages/web.scm2
-rw-r--r--gnu/packages/xdisorg.scm42
48 files changed, 2571 insertions, 947 deletions
diff --git a/gnu/local.mk b/gnu/local.mk
index 2654b7309f..f6dcfb95b4 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1013,8 +1013,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 \
@@ -1618,8 +1617,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-openssl_x509_checkpurpose_basic.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/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/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")))
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
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/clojure.scm b/gnu/packages/clojure.scm
index c8157bfdcd..9876192f5f 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"
(("<attribute name=\"Class-Path\" value=\".\"/>") ""))
#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"
+ (("<sysproperty key=\"java.awt.headless\" value=\"true\"/>")
+ ,(string-join
+ '("<sysproperty key=\"java.awt.headless\" value=\"true\"/>"
+ "<sysproperty key=\"clojure.spec.skip-macros\" value=\"true\"/>\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"
+ (("<arg value=\"clojure.math\"/>")
+ ,(string-join
+ '("<arg value=\"clojure.math\"/>"
+ "<arg value=\"clojure.spec.alpha\"/>"
+ "<arg value=\"clojure.spec.gen.alpha\"/>"
+ "<arg value=\"clojure.spec.test.alpha\"/>"
+ "<arg value=\"clojure.core.specs.alpha\"/>"))))
+ #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")
@@ -153,14 +204,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
@@ -224,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
@@ -261,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
@@ -354,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)
@@ -363,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.
@@ -458,7 +527,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 +536,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/")
@@ -482,7 +551,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 +561,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")
@@ -544,7 +613,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 +623,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")
diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm
index 5ae5efc330..8330f0d157 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,10 +1483,12 @@ 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
+ `(#:configure-flags
+ (list "--disable-static")
+ #:phases
(modify-phases %standard-phases
(replace 'bootstrap
(lambda _ (invoke "sh" "bootstrap" "--noconfigure"))))))
diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm
index d1a9c4dd6d..f0414602bc 100644
--- a/gnu/packages/crates-graphics.scm
+++ b/gnu/packages/crates-graphics.scm
@@ -12,6 +12,7 @@
;;; Copyright © 2020 Antoine Côté <antoine.cote@posteo.net>
;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2021 Zheng Junjie <873216071@qq.com>
+;;; Copyright © 2022 Marius Bakke <marius@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -345,8 +346,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 +390,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 +401,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
@@ -966,8 +991,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 +1042,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 +1063,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
@@ -1079,7 +1139,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 +1148,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
@@ -1945,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)
@@ -2087,28 +2174,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")
@@ -2161,8 +2265,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
@@ -2186,12 +2323,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
@@ -2389,8 +2521,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
@@ -2418,14 +2592,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
@@ -2487,26 +2654,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
@@ -2514,6 +2682,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)
@@ -2554,24 +2744,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
@@ -2580,20 +2770,40 @@ 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-cursor-0.28
(package
- (name "rust-wayland-egl")
+ (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")
+ (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))
@@ -2606,25 +2816,43 @@ 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-egl-0.28
(package
- (name "rust-wayland-protocols")
+ (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")
+ (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
@@ -2632,6 +2860,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)
@@ -2679,17 +2928,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))
@@ -2702,6 +2951,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)
@@ -2738,17 +3002,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
@@ -2756,7 +3020,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
@@ -2764,12 +3028,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")
@@ -2778,6 +3042,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)
@@ -2832,35 +3129,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))
@@ -2873,6 +3171,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)
@@ -2911,17 +3243,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
@@ -2936,24 +3268,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
@@ -2967,6 +3298,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)
diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm
index e392220a01..316e427522 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
@@ -277,8 +303,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 +343,6 @@
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32 "0w3md4xk87ign30wb3rqfmmj0q6pvg5arbm35flgsd08jxvbhj5l"))))
- (build-system cargo-build-system)
(arguments
`(#:skip-build?
#t
@@ -298,12 +352,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
@@ -440,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
@@ -461,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
@@ -549,8 +625,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
@@ -572,13 +682,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
@@ -719,8 +823,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
@@ -746,13 +890,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
@@ -848,8 +986,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
@@ -868,13 +1049,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
@@ -939,8 +1114,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
@@ -966,13 +1184,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
@@ -1057,8 +1269,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
@@ -1079,11 +1320,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
@@ -1109,8 +1346,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 +1389,6 @@
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32 "1bjlymn3fw4g8slij6iiggaipknf9072mr2qm3i4a91199an078w"))))
- (build-system cargo-build-system)
(arguments
`(#:skip-build?
#t
@@ -1130,12 +1398,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
@@ -1181,28 +1444,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/")
@@ -1210,6 +1477,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)
@@ -1482,29 +1771,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/")
@@ -1512,6 +1803,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)
@@ -1592,8 +1908,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
@@ -1603,7 +1950,6 @@ library.")
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32 "1zj236n9kjldf47wwlxvhshwm5zhg589a0fml5mm8qg7lnf0jrr3"))))
- (build-system cargo-build-system)
(arguments
`(#:skip-build?
#t
@@ -1611,13 +1957,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
@@ -1662,8 +2002,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
@@ -1690,14 +2066,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
@@ -1729,8 +2098,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
@@ -1752,13 +2156,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
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 16ac36c9f5..2e71a89e6b 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm