From 37db2370db884ceac3bc97123aaaed84377398eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20K=C4=85dzio=C5=82ka?= Date: Wed, 12 Feb 2020 20:24:31 +0100 Subject: gnu: icecat: Remove about:buildconfig store references. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gnuzilla.scm (icecat)[arguments]: New ‘neutralise-store-references’ phase. Co-authored-by: Tobias Geerinckx-Rice --- gnu/packages/gnuzilla.scm | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 863edb3b4e..bb2a4d60dc 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -7,10 +7,11 @@ ;;; Copyright © 2016 Alex Griffin ;;; Copyright © 2017 Clément Lassieur ;;; Copyright © 2017 ng0 -;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2018, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2018 Ricardo Wurmus ;;; Copyright © 2019 Ivan Petkov ;;; Copyright © 2020 Oleg Pykhalov +;;; Copyright © 2020 Jakub Kądziołka ;;; ;;; This file is part of GNU Guix. ;;; @@ -882,6 +883,7 @@ from forcing GEXP-PROMISE." #:modules ((ice-9 ftw) (ice-9 rdelim) + (ice-9 regex) (ice-9 match) (srfi srfi-34) (srfi srfi-35) @@ -1067,6 +1069,20 @@ from forcing GEXP-PROMISE." (force-output) (retry (- remaining-attempts 1)))) (apply build args))))))) + (add-after 'build 'neutralise-store-references + (lambda _ + ;; Mangle the store references to compilers & other build tools in + ;; about:buildconfig, reducing IceCat's closure by 1 GiB on x86-64. + (substitute* + "dist/bin/chrome/toolkit/content/global/buildconfig.html" + (((format #f "(~a/)([0-9a-df-np-sv-z]{32})" + (regexp-quote (%store-directory))) + _ store hash) + (string-append store + (string-take hash 8) + "" + (string-drop hash 8)))) + #t)) (add-before 'configure 'install-desktop-entry (lambda* (#:key outputs #:allow-other-keys) ;; Install the '.desktop' file. -- cgit v1.2.3 From c3435e2e60be3382863b3ae3061dff0ec8642151 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 26 Feb 2020 22:31:46 +0100 Subject: gnu: Add emacs-org-superstar. * gnu/packages/emacs-xyz.scm (emacs-org-superstar): New variable. --- gnu/packages/emacs-xyz.scm | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index b61eb19069..fdd4ffe648 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -4711,6 +4711,47 @@ number.") @code{org-mode} to be rendered as UTF-8 characters.") (license license:gpl3+))) +(define-public emacs-org-superstar + (package + (name "emacs-org-superstar") + (version "1.0.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/integral-dw/org-superstar-mode.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0q6180qwjpha10zsiw0ni6lanyjwlj8141a6qivfcs8nwczz7nvz")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-org" ,emacs-org))) + (home-page "https://github.com/integral-dw/org-superstar-mode") + (synopsis "Prettify headings and plain lists in Org mode") + (description "This package prettifies headings and plain lists in +Org mode. It is a direct descendant of @code{org-bullets}, with most +of the code base completely rewritten. + +Currently, this package prettifies Org heading lines by: +@itemize +@item replacing trailing bullets by UTF-8 bullets, +@item hiding leading stars, customizing their look or removing them from vision, +@item applying a custom face to the header bullet, +@item applying a custom face to the leading bullets, +@item using double-bullets for inline tasks, +@item (optional) using special bullets for TODO keywords. +@end itemize + +It also prettifies Org plain list bullets by: +@itemize +@item replacing each bullet type (*, + and -) with UTF-8 bullets, +@item applying a custom face to item bullets. +@end itemize + +Features degrade gracefully when viewed from terminal.") + (license license:gpl3+))) + (define-public emacs-org-pomodoro ;; Last release version was from 2016. (let ((commit "aa07c11318f91219336197e62c47bc7a3d090479") -- cgit v1.2.3 From 760dfc67cd37fffea57803d2637468a19c345de6 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sat, 15 Feb 2020 07:16:08 +0000 Subject: gnu: u-boot-pinebook: Fix LCD video output. * gnu/packages/bootloaders (u-boot-pinebook): Add phase applying patch submitted upstream. --- gnu/packages/bootloaders.scm | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 63a88dd7ec..770647935a 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -670,7 +670,20 @@ it fits within common partitioning schemes.") (make-u-boot-sunxi64-package "pine64-lts" "aarch64-linux-gnu")) (define-public u-boot-pinebook - (make-u-boot-sunxi64-package "pinebook" "aarch64-linux-gnu")) + (let ((base (make-u-boot-sunxi64-package "pinebook" "aarch64-linux-gnu"))) + (package + (inherit base) + (arguments + (substitute-keyword-arguments (package-arguments base) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'unpack 'patch-pinebook-config + ;; Fix regression with LCD video output introduced in 2020.01 + ;; https://patchwork.ozlabs.org/patch/1225130/ + (lambda _ + (substitute* "configs/pinebook_defconfig" + (("CONFIG_VIDEO_BRIDGE_ANALOGIX_ANX6345=y") "CONFIG_VIDEO_BRIDGE_ANALOGIX_ANX6345=y\nCONFIG_VIDEO_BPP32=y")) + #t))))))))) (define-public u-boot-bananapi-m2-ultra (make-u-boot-package "Bananapi_M2_Ultra" "arm-linux-gnueabihf")) -- cgit v1.2.3 From d854ab159544cb20ff3956aa1f134e07403c01e2 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Thu, 27 Feb 2020 05:35:51 +0000 Subject: gnu: python-construct: Update to 2.10.56. * gnu/packages/python-xyz (python-construct): Update to 2.10.56. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 7a335c04b6..4ea09b756e 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -16366,14 +16366,14 @@ class in a @acronym{DRY, Don't Repeat Yourself} way.") (define-public python-construct (package (name "python-construct") - (version "2.9.45") + (version "2.10.56") (source (origin (method url-fetch) (uri (pypi-uri "construct" version)) (sha256 (base32 - "130iy05awzigm2xah2yvlmb08mac5bi4gzr5m3g7k1krs3ps0w92")))) + "0q86jjzsvy835h3c8pjj4619vbp7ihfg8njmyw86ym4qrpni7flp")))) (build-system python-build-system) (arguments `(#:tests? #f)) ; No tests exist. -- cgit v1.2.3 From 5eeb70a7092b0c3bc1d9a333f5f0ec06e12fb294 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Thu, 27 Feb 2020 07:40:33 +0000 Subject: gnu: opensbi: Update to 0.6. * gnu/packages/firmware (make-opensbi-package): Update to 0.6. --- gnu/packages/firmware.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index 826de90ccc..abe8b0eca6 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -188,7 +188,7 @@ by the b43-open driver of Linux-libre.") (name (string-replace-substring (string-append "opensbi-" platform "-" variant) "_" "-")) - (version "0.5") + (version "0.6") (source (origin (method git-fetch) @@ -197,7 +197,7 @@ by the b43-open driver of Linux-libre.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0qc73xbiy79qqkwxmp4mg15q8n8k26njkyqb6n0jw5dyibd6hb85")))) + (base32 "129ypdga0fzn657n2f42g2a1vx3hf8x7sd78h06d35pgkry0jkl7")))) (build-system gnu-build-system) (native-inputs `(,@(if (and (not (string-prefix? "riscv64" (%current-system))) -- cgit v1.2.3 From 2d9b05817dbc75d7a57ae296069529ade2119419 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Thu, 27 Feb 2020 07:43:23 +0000 Subject: gnu: opensbi-qemu-sifive-u: Mark as deprecated. * gnu/packages/firmware (opensbi-qemu-sifive-u): Deprecated by opensbi-sifive-fu540. --- gnu/packages/firmware.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index abe8b0eca6..8822ff35da 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -240,12 +240,14 @@ for platform-specific firmwares executing in M-mode.") (define-public opensbi-qemu-virt (make-opensbi-package "qemu" "virt")) -(define-public opensbi-qemu-sifive-u - (make-opensbi-package "qemu" "sifive_u")) - (define-public opensbi-sifive-fu540 (make-opensbi-package "sifive" "fu540")) +(define-public opensbi-qemu-sifive-u + ;; Dropped upstream, as all functionality is present in the sifive-fu540 + ;; target for recent versions of qemu, u-boot and linux. + (deprecated-package "opensbi-qemu-sifive-u" opensbi-sifive-fu540)) + (define-public seabios (package (name "seabios") -- cgit v1.2.3 From b4e0f0dc37d6a3a887e85008194daf4178f827ef Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Thu, 27 Feb 2020 10:42:14 +0100 Subject: gnu: Add emacs-exiftool. * gnu/packages/emacs-xyz.scm (emacs-exiftool): New variable. --- gnu/packages/emacs-xyz.scm | 40 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index fdd4ffe648..177b2f3406 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -16,7 +16,7 @@ ;;; Copyright © 2016, 2019 Alex Griffin ;;; Copyright © 2016, 2017, 2018, 2019, 2020 Nicolas Goaziou ;;; Copyright © 2016, 2017, 2018 Alex Vong -;;; Copyright © 2016, 2017, 2018, 2019 Arun Isaac +;;; Copyright © 2016, 2017, 2018, 2019, 2020 Arun Isaac ;;; Copyright © 2017 Christopher Baines ;;; Copyright © 2017, 2018, 2019, 2020 Mathieu Othacehe ;;; Copyright © 2017, 2018, 2019 Clément Lassieur @@ -155,6 +155,7 @@ #:use-module (gnu packages video) #:use-module (gnu packages haskell-xyz) #:use-module (gnu packages wordnet) + #:use-module (gnu packages photo) #:use-module (guix utils) #:use-module (srfi srfi-1) #:use-module (ice-9 match)) @@ -21601,3 +21602,40 @@ variables.") "This library is a Company back-end providing auto-completion for emoji.") (license license:gpl3+))) + +(define-public emacs-exiftool + (package + (name "emacs-exiftool") + (version "0.3.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://git.systemreboot.net/exiftool.el/") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0bv58is66cz21yhc0qqkp1z4nk13zfi2l7i6pjbhyi0g1n88qqyv")))) + (build-system emacs-build-system) + (arguments + `(#:tests? #t + #:test-command '("make" "-C" "tests") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'configure + (lambda* (#:key inputs #:allow-other-keys) + (make-file-writable "exiftool.el") + (emacs-substitute-variables "exiftool.el" + ("exiftool-executable" + (string-append (assoc-ref inputs "perl-image-exiftool") + "/bin/exiftool"))) + #t))))) + (inputs + `(("perl-image-exiftool" ,perl-image-exiftool))) + (home-page "https://git.systemreboot.net/exiftool.el/about/") + (synopsis "Elisp wrapper around ExifTool") + (description "@code{emacs-exiftool} is an Elisp wrapper around ExifTool. +ExifTool supports reading and writing metadata in various formats including +EXIF, XMP and IPTC.") + (license license:gpl3+))) -- cgit v1.2.3 From 83ee1e91b05e324edcdfbafe5b203064f1caf802 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Wed, 26 Feb 2020 23:36:01 +0530 Subject: gnu: Add emacs-password-generator. * gnu/packages/emacs-xyz.scm (emacs-password-generator): New variable. --- gnu/packages/emacs-xyz.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 177b2f3406..0120392eaf 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -21639,3 +21639,25 @@ emoji.") ExifTool supports reading and writing metadata in various formats including EXIF, XMP and IPTC.") (license license:gpl3+))) + +(define-public emacs-password-generator + (package + (name "emacs-password-generator") + (version "1.01") + (home-page "https://github.com/zargener/emacs-password-genarator") + (source + (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit "904cdb591a04305ba882ce19e1d117f5fa60f7d3"))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1qgvn79qz1h8ykm5i1qv2fja4v2y0g2i0n5sf7byhnqhqlwn63nv")))) + (build-system emacs-build-system) + (synopsis "Generate passwords inside Emacs") + (description "@code{emacs-password-generator} provides simple functions to +generate random passwords and insert them into the current buffer. It also +supports generation of phonetic and numeric passwords.") + (license license:artistic2.0))) -- cgit v1.2.3 From b7d0590bb2179f659ff800d8b8b801f2a06db6d7 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Thu, 27 Feb 2020 10:57:57 +0100 Subject: gnu: emacs-evil-collection: Update to 20200219. * gnu/packages/emacs-xyz.scm (emacs-evil-collection): Update to 20200219. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 0120392eaf..76b9746f69 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -7683,7 +7683,7 @@ extensions.") (license license:gpl3+))) (define-public emacs-evil-collection - (let ((commit "eb36c82a84d313e961777dc78fd4ff1d718efdf6") + (let ((commit "a478a95a8a3665e40bdae3bab2a0519db6c1f29c") (revision "13")) (package (name "emacs-evil-collection") @@ -7696,7 +7696,7 @@ extensions.") (file-name (git-file-name name version)) (sha256 (base32 - "0wi84x9176y4xjl7zpn882achfamx3a2ixlj4nvflxfh6q1qg7bz")))) + "15ii5lw6hs4yyl22yyzfwzagdma2sman4rm5gq4m9773g4ava515")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-evil" ,emacs-evil) -- cgit v1.2.3 From fdd481354705d8f7ec64f0383ecdfee587fb7a71 Mon Sep 17 00:00:00 2001 From: Alex Griffin Date: Fri, 21 Feb 2020 16:25:27 -0600 Subject: gnu: Add gnome-shell-extension-gsconnect. * gnu/packages/gnome-xyz.scm (gnome-shell-extension-gsconnect): New variable. --- gnu/packages/gnome-xyz.scm | 99 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 99 insertions(+) diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm index cd334abb53..a3074288de 100644 --- a/gnu/packages/gnome-xyz.scm +++ b/gnu/packages/gnome-xyz.scm @@ -24,15 +24,20 @@ #:use-module (guix build-system trivial) #:use-module (guix build-system gnu) #:use-module (guix build-system copy) + #:use-module (guix build-system meson) #:use-module (guix git-download) #:use-module (guix packages) #:use-module ((guix licenses) #:prefix license:) #:use-module (gnu packages base) #:use-module (gnu packages bash) + #:use-module (gnu packages gettext) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) #:use-module (gnu packages gtk) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages python-xyz) + #:use-module (gnu packages ssh) + #:use-module (gnu packages tls) #:use-module (gnu packages ruby) #:use-module (gnu packages xml)) @@ -188,6 +193,100 @@ faster window switching.") (home-page "https://micheleg.github.io/dash-to-dock/") (license license:gpl2+))) +(define-public gnome-shell-extension-gsconnect + (package + (name "gnome-shell-extension-gsconnect") + ;; v28 is the last version to support GNOME 3.32 + (version "28") + (source (origin + (method git-fetch) + (uri (git-reference + (url (string-append "https://github.com/andyholmes" + "/gnome-shell-extension-gsconnect.git")) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0grqkzqm7mlkbzin4nx9w7bh5cgygph8pn0cvim4a4gg99nfcp5z")))) + (build-system meson-build-system) + (arguments + `(#:configure-flags + (let* ((out (assoc-ref %outputs "out")) + (name+version (strip-store-file-name out)) + (gschema-dir (string-append out + "/share/gsettings-schemas/" + name+version + "/glib-2.0/schemas")) + (gnome-shell (assoc-ref %build-inputs "gnome-shell")) + (openssh (assoc-ref %build-inputs "openssh")) + (openssl (assoc-ref %build-inputs "openssl"))) + (list + (string-append "-Dgnome_shell_libdir=" gnome-shell "/lib") + (string-append "-Dgsettings_schemadir=" gschema-dir) + (string-append "-Dopenssl_path=" openssl "/bin/openssl") + (string-append "-Dsshadd_path=" openssh "/bin/ssh-add") + (string-append "-Dsshkeygen_path=" openssh "/bin/ssh-keygen") + (string-append "-Dsession_bus_services_dir=" out "/share/dbus-1/services") + "-Dpost_install=true")) + #:phases + (modify-phases %standard-phases + (add-before 'configure 'fix-paths + (lambda* (#:key inputs #:allow-other-keys) + (let* ((glib (assoc-ref inputs "glib:bin")) + (gapplication (string-append glib "/bin/gapplication")) + (gi-typelib-path (getenv "GI_TYPELIB_PATH"))) + (substitute* "data/org.gnome.Shell.Extensions.GSConnect.desktop" + (("gapplication") gapplication)) + (for-each + (lambda (file) + (substitute* file + (("'use strict';") + (string-append "'use strict';\n\n" + "'" gi-typelib-path "'.split(':').forEach(" + "path => imports.gi.GIRepository.Repository." + "prepend_search_path(path));")))) + '("src/extension.js" "src/prefs.js")) + #t))) + (add-after 'install 'wrap-daemons + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (service-dir + (string-append out "/share/gnome-shell/extensions" + "/gsconnect@andyholmes.github.io/service")) + (gi-typelib-path (getenv "GI_TYPELIB_PATH"))) + (wrap-program (string-append service-dir "/daemon.js") + `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))) + #t)))))) + (inputs + `(("at-spi2-core" ,at-spi2-core) + ("caribou" ,caribou) + ("evolution-data-server" ,evolution-data-server) + ("folks" ,folks) + ("gjs" ,gjs) + ("glib" ,glib) + ("glib:bin" ,glib "bin") + ("gsound" ,gsound) + ("gnome-shell" ,gnome-shell) + ("gtk+" ,gtk+) + ("nautilus" ,nautilus) + ("openssh" ,openssh) + ("openssl" ,openssl) + ("python-nautilus" ,python-nautilus) + ("python-pygobject" ,python-pygobject) + ("upower" ,upower))) + (native-inputs + `(("gettext" ,gettext-minimal) + ("gobject-introspection" ,gobject-introspection) + ("libxml2" ,libxml2) + ("pkg-config" ,pkg-config))) + (home-page "https://github.com/andyholmes/gnome-shell-extension-gsconnect/wiki") + (synopsis "Connect GNOME Shell with your Android phone") + (description "GSConnect is a complete implementation of KDE Connect +especially for GNOME Shell, allowing devices to securely share content, like +notifications or files, and other features like SMS messaging and remote +control.") + (license license:gpl2))) + (define-public gnome-shell-extension-hide-app-icon (let ((commit "4188aa5f4ba24901a053a0c3eb0d83baa8625eab") (revision "0")) -- cgit v1.2.3 From f6a151cdc620b037fed1b899ad40a073111786e3 Mon Sep 17 00:00:00 2001 From: Leo Prikler Date: Fri, 21 Feb 2020 17:32:14 +0100 Subject: gnu: gnome-shell-extension-appindicator: Use the copy-build-system. * gnu/packages/gnome-xyz.scm (gnome-shell-extension-appindicator): Use the copy-build-system. --- gnu/packages/gnome-xyz.scm | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm index a3074288de..87830194fd 100644 --- a/gnu/packages/gnome-xyz.scm +++ b/gnu/packages/gnome-xyz.scm @@ -136,19 +136,11 @@ the Obsidian icon theme.") (base32 "1fjhx23jqwv3d0smwhnjvc35gqhwk9p5f96ic22pfax653cn5vh8")) (file-name (git-file-name name version)))) - (build-system trivial-build-system) + (build-system copy-build-system) (arguments - '(#:modules ((guix build utils)) - #:builder - (begin - (use-modules (guix build utils)) - (let* ((source (assoc-ref %build-inputs "source")) - (install-dir (string-append (assoc-ref %outputs "out") - "/share/gnome-shell/extensions" - "/appindicatorsupport@rgcjonas.gmail.com"))) - (mkdir-p install-dir) - (copy-recursively source install-dir) - #t)))) + `(#:install-plan + '(("." ,(string-append "share/gnome-shell/extensions/" + "appindicatorsupport@rgcjonas.gmail.com"))))) (synopsis "Adds KStatusNotifierItem support to GNOME Shell") (description "This extension integrates Ubuntu AppIndicators and KStatusNotifierItems (KDE's successor of the systray) into -- cgit v1.2.3 From c456d18b50f764d008ef46029201ef20584cd6f7 Mon Sep 17 00:00:00 2001 From: Leo Prikler Date: Fri, 21 Feb 2020 17:32:15 +0100 Subject: gnu: gnome-shell-extension-noannoyance: Use the copy-build-system. * gnu/packages/gnome-xyz.scm (gnome-shell-extension-noannoyance): Use the copy-build-system. --- gnu/packages/gnome-xyz.scm | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm index 87830194fd..5215658912 100644 --- a/gnu/packages/gnome-xyz.scm +++ b/gnu/packages/gnome-xyz.scm @@ -380,18 +380,10 @@ into a single panel, similar to that found in KDE Plasma and Windows 7+.") (base32 "0fa8l3xlh8kbq07y4385wpb908zm6x53z81q16xlmin97dln32hh")) (file-name (git-file-name name version)))) - (build-system trivial-build-system) + (build-system copy-build-system) (arguments - '(#:modules ((guix build utils)) - #:builder - (begin - (use-modules (guix build utils)) - (let ((dst (string-append - (assoc-ref %outputs "out") - "/share/gnome-shell/extensions/" - "noannoyance@daase.net"))) - (mkdir-p dst) - (copy-recursively (assoc-ref %build-inputs "source") dst))))) + '(#:install-plan + '(("." "share/gnome-shell/extensions/noannoyance@daase.net")))) (synopsis "Removes 'Window is ready' annotation") (description "One of the many extensions, that remove this message. It uses ES6 syntax and claims to be more actively maintained than others.") -- cgit v1.2.3 From e10587c5a597a62178cfa5bcc7242f94728ccd0b Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Thu, 27 Feb 2020 11:32:37 +0100 Subject: gnu: gnome-shell-extension-noannoyance: Fix synopsis and description. * gnu/packages/gnome-xyz.scm (gnome-shell-extension-noannoyance)[synopsis]: Use imperative form. [description]: Remove spurious comma. --- gnu/packages/gnome-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm index 5215658912..bedaacf092 100644 --- a/gnu/packages/gnome-xyz.scm +++ b/gnu/packages/gnome-xyz.scm @@ -384,8 +384,8 @@ into a single panel, similar to that found in KDE Plasma and Windows 7+.") (arguments '(#:install-plan '(("." "share/gnome-shell/extensions/noannoyance@daase.net")))) - (synopsis "Removes 'Window is ready' annotation") - (description "One of the many extensions, that remove this message. + (synopsis "Remove 'Window is ready' annotation") + (description "One of the many extensions that remove this message. It uses ES6 syntax and claims to be more actively maintained than others.") (home-page "https://extensions.gnome.org/extension/2182/noannoyance/") (license license:gpl2))) -- cgit v1.2.3 From a69bc7386f22687015bcb326e7f13f353b8fedc4 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Thu, 27 Feb 2020 14:06:57 +0100 Subject: gnu: Add lttng-ust. * gnu/packages/linux.scm (lttng-ust): New variable. --- gnu/packages/linux.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 78182555c1..0b656629df 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -39,6 +39,7 @@ ;;; Copyright © 2019 Brice Waegeneire ;;; Copyright © 2019 Kei Kebreau ;;; Copyright © 2020 Oleg Pykhalov +;;; Copyright © 2020 Pierre Neidhardt ;;; ;;; This file is part of GNU Guix. ;;; @@ -6382,3 +6383,28 @@ the Linux kernel, C standard library, and libdl (for dynamic linking). While ELL is designed to be efficient and compact enough for use on embedded Linux platforms, it is not limited to resource-constrained systems.") (license license:lgpl2.1+))) + +(define-public lttng-ust + (package + (name "lttng-ust") + (version "2.11.0") + (source (origin + (method url-fetch) + (uri (string-append "https://lttng.org/files/lttng-ust/" + "lttng-ust-" version ".tar.bz2")) + (sha256 + (base32 + "1n646yz7882svf5a4ay3vqiiz3qjn3pgkkij9kk22871wp7q0ck8")))) + (build-system gnu-build-system) + (inputs + `(("liburcu" ,liburcu) + ("numactl" ,numactl))) + (native-inputs + `(("python" ,python-3))) + (home-page "https://lttng.org/") + (synopsis "LTTng userspace tracer libraries") + (description "The user space tracing library, liblttng-ust, is the LTTng +user space tracer. It receives commands from a session daemon, for example to +enable and disable specific instrumentation points, and writes event records +to ring buffers shared with a consumer daemon.") + (license license:lgpl2.1+))) -- cgit v1.2.3 From 259e65aac183c76323a15de18bc2c2897e728dba Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Sun, 16 Feb 2020 22:28:29 +0100 Subject: gnu: Add kicad-footprints. * gnu/packages/engineering.scm (kicad-footprints): New variable. Signed-off-by: Danny Milosavljevic --- gnu/packages/engineering.scm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 33c12215e3..5a1554c6aa 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -14,6 +14,7 @@ ;;; Copyright © 2019 Jovany Leandro G.C ;;; Copyright © 2019 Steve Sprang ;;; Copyright © 2019 John Soo +;;; Copyright © 2020 Brice Waegeneire ;;; ;;; This file is part of GNU Guix. ;;; @@ -954,6 +955,23 @@ libraries for KiCad 5.") ;; See . (license license:cc-by-sa4.0))) +(define-public kicad-footprints + (package + (inherit kicad-symbols) + (name "kicad-footprints") + (version "5.1.5") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/KiCad/kicad-footprints.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1c4whgn14qhz4yqkl46w13p6rpv1k0hsc9s9h9368fxfcz9knb2j")))) + (synopsis "Official KiCad footprint libraries") + (description "This package contains the official KiCad footprint libraries."))) + (define-public linsmith (package (name "linsmith") -- cgit v1.2.3 From c595150709f6ead12d17f303821a7a6e916aa1d0 Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Sun, 16 Feb 2020 22:28:30 +0100 Subject: gnu: Add kicad-packages3d. * gnu/packages/engineering.scm (kicad-packages3d): New variable. Signed-off-by: Danny Milosavljevic --- gnu/packages/engineering.scm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 5a1554c6aa..c22432bafa 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -972,6 +972,23 @@ libraries for KiCad 5.") (synopsis "Official KiCad footprint libraries") (description "This package contains the official KiCad footprint libraries."))) +(define-public kicad-packages3d + (package + (inherit kicad-symbols) + (name "kicad-packages3d") + (version "5.1.5") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/KiCad/kicad-packages3d.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0cff2ms1bsw530kqb1fr1m2pjixyxzwa81mxgac3qpbcf8fnpvaz")))) + (synopsis "Official KiCad 3D model libraries") + (description "This package contains the official KiCad 3D model libraries."))) + (define-public linsmith (package (name "linsmith") -- cgit v1.2.3 From ca839f3c1867903d217a2a61ebcc7dfb250b5e5f Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Sun, 16 Feb 2020 22:28:31 +0100 Subject: gnu: Add kicad-templates. * gnu/packages/engineering.scm (kicad-templates): New variable. Signed-off-by: Danny Milosavljevic --- gnu/packages/engineering.scm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index c22432bafa..28a10bb90e 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -989,6 +989,24 @@ libraries for KiCad 5.") (synopsis "Official KiCad 3D model libraries") (description "This package contains the official KiCad 3D model libraries."))) +(define-public kicad-templates + (package + (inherit kicad-symbols) + (name "kicad-templates") + (version "5.1.5") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/KiCad/kicad-templates.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0cs3bm3zb5ngw5ldn0lzw5bvqm4kvcidyrn76438alffwiz2b15g")))) + (synopsis "Official KiCad project and worksheet templates") + (description "This package contains the official KiCad project and +worksheet templates."))) + (define-public linsmith (package (name "linsmith") -- cgit v1.2.3 From 052847422341e580f79bda8384f03746baa5b5e2 Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Sun, 16 Feb 2020 22:28:32 +0100 Subject: gnu: Remove kicad-library. * gnu/packages/engineering.scm (kicad-library): Remove variable. Signed-off-by: Danny Milosavljevic --- gnu/packages/engineering.scm | 62 -------------------------------------------- 1 file changed, 62 deletions(-) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 28a10bb90e..00971cd0fd 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -865,68 +865,6 @@ perform specific functions, for example, pcbnew (Editing PCB), eeschema (editing electrical diagrams), gerbview (viewing Gerber files) and others.") (license license:gpl3+))) -(define-public kicad-library - (let ((version "4.0.7")) - (package - (name "kicad-library") - (version version) - (source - (origin - (method url-fetch) - (uri (string-append - "https://kicad-downloads.s3.cern.ch/libraries/kicad-library-" - version ".tar.gz")) - (sha256 - (base32 "1azb7v1y3l6j329r9gg7f4zlg0wz8nh4s4i5i0l9s4yh9r6i9zmv")))) - (build-system cmake-build-system) - (arguments - `(#:out-of-source? #t - #:tests? #f ; no tests - #:phases - (modify-phases %standard-phases - (add-after 'install 'install-footprints ; from footprints tarball - (lambda* (#:key inputs outputs #:allow-other-keys) - (invoke "tar" "xvf" - (assoc-ref inputs "kicad-footprints") - "-C" (string-append (assoc-ref outputs "out") - "/share/kicad/modules") - "--strip-components=1"))) - ;; We change the default global footprint file, which is generated if - ;; it doesn't exist in user's home directory, from the one using the - ;; github plugin, to the one using the KISYSMOD environment path. - (add-after 'install-footprints 'use-pretty-footprint-table - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (template-dir (string-append out "/share/kicad/template")) - (fp-lib-table (string-append template-dir "/fp-lib-table"))) - (delete-file fp-lib-table) - (copy-file (string-append fp-lib-table ".for-pretty") - fp-lib-table)) - #t))))) - (native-search-paths - (list (search-path-specification - (variable "KISYSMOD") ; footprint path - (files '("share/kicad/modules"))) - (search-path-specification - (variable "KISYS3DMOD") ; 3D model path - (files '("share/kicad/modules/packages3d"))))) - ;; Kicad distributes footprints in a separate tarball. - (native-inputs - `(("kicad-footprints" - ,(origin - (method url-fetch) - (uri (string-append - "http://downloads.kicad-pcb.org/libraries/kicad-footprints-" - version ".tar.gz")) - (sha256 - (base32 - "08qrz5zzsb5127jlnv24j0sgiryd5nqwg3lfnwi8j9a25agqk13j")))))) - (home-page "https://kicad-pcb.org/") - (synopsis "Libraries for kicad") - (description "This package provides Kicad component, footprint and 3D -render model libraries.") - (license license:lgpl2.0+)))) - (define-public kicad-symbols (package (name "kicad-symbols") -- cgit v1.2.3 From badc3c6783c37d88bcea5b8905f76841c76c1b99 Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Sun, 16 Feb 2020 22:28:33 +0100 Subject: gnu: kicad-symbols: Update synopsis and description. * gnu/packages/engineering.scm (kicad-symbols)[synopsis]: Update. [description]: Update. Signed-off-by: Danny Milosavljevic --- gnu/packages/engineering.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 00971cd0fd..b25de15a27 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -882,9 +882,9 @@ electrical diagrams), gerbview (viewing Gerber files) and others.") (arguments `(#:tests? #f)) ; no tests exist (home-page "https://kicad-pcb.org/") - (synopsis "Official KiCad schematic symbol libraries for KiCad 5") + (synopsis "Official KiCad schematic symbol libraries") (description "This package contains the official KiCad schematic symbol -libraries for KiCad 5.") +libraries.") ;; TODO: Exception: "To the extent that the creation of electronic designs ;; that use 'Licensed Material' can be considered to be 'Adapted Material', ;; then the copyright holder waives article 3 of the license with respect to -- cgit v1.2.3 From e7075353e02a761e8cfb71afb1496da0418edcf2 Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Sun, 16 Feb 2020 22:28:34 +0100 Subject: gnu: kicad: Add translations and search paths. * gnu/packages/engineering.scm (kicad)[arguments]<#:phases>[install-translations]: New phase. [native-search-paths]: Add specification for KICAD_TEMPLATE_DIR, KICAD_SYMBOL_DIR, KISYSMOD and KISYS3DMOD. [native-inputs]: Add desktop-file-utils and kicad-i18l. [inputs]: Remove desktop-file-utils. Replace python by python-wrapper. (kicad-i18l): New variable. Signed-off-by: Danny Milosavljevic --- gnu/packages/engineering.scm | 179 +++++++++++++++++++++++++++---------------- 1 file changed, 113 insertions(+), 66 deletions(-) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index b25de15a27..f06125db0b 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -794,76 +794,123 @@ language.") (define-public ao (deprecated-package "ao-cad" libfive)) +;; TODO Add doc https://gitlab.com/kicad/services/kicad-doc/-/tree/master (define-public kicad - (package - (name "kicad") - (version "5.1.5") - (source - (origin - (method url-fetch) - (file-name (string-append name "-" version ".tar.xz")) - (uri (string-append - "https://launchpad.net/kicad/" (version-major version) - ".0/" version "/+download/kicad-" version ".tar.xz")) - (sha256 - (base32 "0x3417f2pa7p65s9f7l49rqbnrzy8gz6i0n07mlbxqbnm0fmlql0")))) - (build-system cmake-build-system) - (arguments - `(#:out-of-source? #t - #:tests? #f ; no tests - #:build-type "Release" - #:configure-flags - (list "-DKICAD_SCRIPTING_PYTHON3=ON" - "-DKICAD_SCRIPTING_WXPYTHON_PHOENIX=ON" - "-DCMAKE_BUILD_WITH_INSTALL_RPATH=TRUE") - #:phases - (modify-phases %standard-phases - (add-after 'install 'wrap-program - ;; Ensure correct Python at runtime. - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (python (assoc-ref inputs "python")) - (file (string-append out "/bin/kicad")) - (path (string-append - out - "/lib/python" - ,(version-major+minor - (package-version python)) - "/site-packages:" - (getenv "PYTHONPATH")))) - (wrap-program file - `("PYTHONPATH" ":" prefix (,path)) - `("PATH" ":" prefix - (,(string-append python "/bin:"))))) - #t))))) - (native-inputs - `(("boost" ,boost) - ("gettext" ,gnu-gettext) - ("pkg-config" ,pkg-config) - ("swig" ,swig) - ("zlib" ,zlib))) - (inputs - `(("cairo" ,cairo) - ("curl" ,curl) - ("desktop-file-utils" ,desktop-file-utils) - ("glew" ,glew) - ("glm" ,glm) - ("hicolor-icon-theme" ,hicolor-icon-theme) - ("libngspice" ,libngspice) - ("libsm" ,libsm) - ("mesa" ,mesa) - ("opencascade-oce" ,opencascade-oce) - ("openssl" ,openssl) - ("python" ,python) - ("wxwidgets" ,wxwidgets) - ("wxpython" ,python-wxpython))) - (home-page "https://kicad-pcb.org/") - (synopsis "Electronics Design Automation Suite") - (description "Kicad is a program for the formation of printed circuit + (package + (name "kicad") + (version "5.1.5") + (source + (origin + (method url-fetch) + (file-name (string-append name "-" version ".tar.xz")) + (uri (string-append + "https://launchpad.net/kicad/" (version-major version) + ".0/" version "/+download/kicad-" version ".tar.xz")) + (sha256 + (base32 "0x3417f2pa7p65s9f7l49rqbnrzy8gz6i0n07mlbxqbnm0fmlql0")))) + (build-system cmake-build-system) + (arguments + `(#:out-of-source? #t + #:tests? #f ; no tests + #:build-type "Release" + #:configure-flags + (list "-DKICAD_SCRIPTING_PYTHON3=ON" + "-DKICAD_SCRIPTING_WXPYTHON_PHOENIX=ON" + "-DCMAKE_BUILD_WITH_INSTALL_RPATH=TRUE") + #:phases + (modify-phases %standard-phases + (add-after 'install 'install-translations + (lambda* (#:key inputs outputs #:allow-other-keys) + (copy-recursively (assoc-ref inputs "kicad-i18l") + (assoc-ref outputs "out")) + #t)) + (add-after 'install 'wrap-program + ;; Ensure correct Python at runtime. + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (python (assoc-ref inputs "python")) + (file (string-append out "/bin/kicad")) + (path (string-append + out + "/lib/python" + ,(version-major+minor + (package-version python)) + "/site-packages:" + (getenv "PYTHONPATH")))) + (wrap-program file + `("PYTHONPATH" ":" prefix (,path)) + `("PATH" ":" prefix + (,(string-append python "/bin:"))))) + #t))))) + (native-search-paths + (list (search-path-specification + (variable "KICAD_TEMPLATE_DIR") + (files '("share/kicad/template"))) + (search-path-specification + (variable "KICAD_SYMBOL_DIR") ; symbol path + (files '("share/kicad/library"))) + (search-path-specification + (variable "KISYSMOD") ; footprint path + (files '("share/kicad/modules"))) + (search-path-specification + (variable "KISYS3DMOD") ; 3D model path + (files '("share/kicad/modules/packages3d"))))) + (native-inputs + `(("boost" ,boost) + ("desktop-file-utils" ,desktop-file-utils) + ("gettext" ,gnu-gettext) + ("kicad-i18l" ,kicad-i18l) + ("pkg-config" ,pkg-config) + ("swig" ,swig) + ("zlib" ,zlib))) + (inputs + `(("cairo" ,cairo) + ("curl" ,curl) + ("glew" ,glew) + ("glm" ,glm) + ("hicolor-icon-theme" ,hicolor-icon-theme) + ("libngspice" ,libngspice) + ("libsm" ,libsm) + ("mesa" ,mesa) + ("opencascade-oce" ,opencascade-oce) + ("openssl" ,openssl) + ("python" ,python-wrapper) + ("wxwidgets" ,wxwidgets) + ("wxpython" ,python-wxpython))) + (home-page "https://kicad-pcb.org/") + (synopsis "Electronics Design Automation Suite") + (description "Kicad is a program for the formation of printed circuit boards and electrical circuits. The software has a number of programs that perform specific functions, for example, pcbnew (Editing PCB), eeschema (editing electrical diagrams), gerbview (viewing Gerber files) and others.") - (license license:gpl3+))) + (license license:gpl3+))) + +(define kicad-i18l + (package + (name "kicad-i18l") + (version "5.1.5") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/kicad/code/kicad-i18n.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1rfpifl8vky1gba2angizlb2n7mwmsiai3r6ip6qma60wdj8sbd3")))) + (build-system cmake-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (delete 'build) + (delete 'check)))) + (native-inputs + `(("gettext" ,gnu-gettext))) + (home-page "https://kicad-pcb.org/") + (synopsis "KiCad GUI translations") + (description "This package contains the po files that are used for the GUI +translations for KiCad.") + (license license:gpl3+))) (define-public kicad-symbols (package -- cgit v1.2.3 From 0c0156089cac0b8d4d3c761ba27d3e7e8d6d3bca Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 26 Feb 2020 09:13:03 -0500 Subject: gnu: git-repo: Update to 2.4.1. * gnu/packages/android.scm (git-repo): Update to 2.4.1. --- gnu/packages/android.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/android.scm b/gnu/packages/android.scm index ba883f1ff9..e4f3bff17c 100644 --- a/gnu/packages/android.scm +++ b/gnu/packages/android.scm @@ -717,7 +717,7 @@ to be passed to the @code{udev} service.") (define-public git-repo (package (name "git-repo") - (version "2.3") + (version "2.4.1") (source (origin (method git-fetch) @@ -726,7 +726,7 @@ to be passed to the @code{udev} service.") (commit (string-append "v" version)))) (file-name (string-append "git-repo-" version "-checkout")) (sha256 - (base32 "0jrll0mjfwakyjvlhbxwsdi32jhgss9mwz8c8h24n1qbqqxysrk4")))) + (base32 "0khg1731927gvin73dcbw1657kbfq4k7agla5rpzqcnwkk5agzg3")))) (build-system python-build-system) (arguments `(#:phases -- cgit v1.2.3 From e64c5a8fe4e99eb4af24ca37574b5d4ab5a389d6 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 26 Feb 2020 11:20:54 -0500 Subject: gnu: git-repo: Really disable self update. * gnu/packages/android.scm (git-repo)[phases]{do-not-self-update}: Rename phase from 'do-not-clone-this-source. Rework the patching done to prevent repo from self updating. {set-executable-paths}: Do not patch the reference to GnuPG, as it is only necessary for the self update mechanism, which is disabled. [inputs]: Remove gnupg. --- gnu/packages/android.scm | 62 ++++++++++++++++++++++++------------------------ 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/gnu/packages/android.scm b/gnu/packages/android.scm index e4f3bff17c..17f5f41fcb 100644 --- a/gnu/packages/android.scm +++ b/gnu/packages/android.scm @@ -735,47 +735,48 @@ to be passed to the @code{udev} service.") (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (git (assoc-ref inputs "git")) - (gpg (assoc-ref inputs "gnupg")) (ssh (assoc-ref inputs "ssh"))) (substitute* '("repo" "git_command.py") (("^GIT = 'git'") (string-append "GIT = '" git "/bin/git'"))) - (substitute* "repo" - ((" cmd = \\['gpg',") - (string-append " cmd = ['" gpg "/bin/gpg',"))) (substitute* "git_config.py" ((" command_base = \\['ssh',") (string-append " command_base = ['" ssh "/bin/ssh',"))) #t))) - (add-before 'build 'do-not-clone-this-source + (add-before 'build 'do-not-self-update (lambda* (#:key outputs #:allow-other-keys) + ;; Setting the REPO_MAIN variable to an absolute file name is + ;; enough to have _FindRepo return the store main.py file. The + ;; self update mechanism is activated with the call to _Init() in + ;; main(), so we bypass it. + + ;; Ticket requesting upstream to provide a mean to disable the + ;; self update mechanism: + ;; https://bugs.chromium.org/p/gerrit/issues/detail?id=12407. (let* ((out (assoc-ref outputs "out")) - (repo-dir (string-append out "/share/" ,name))) + (repo-main (string-append out "/share/git-repo/main.py"))) (substitute* "repo" - (("^def _FindRepo\\(\\):.*") - (format #f " -def _FindRepo(): - '''Look for a repo installation, starting at the current directory.''' - # Use the installed version of git-repo. - repo_main = '~a/main.py' - curdir = os.getcwd() - olddir = None - while curdir != '/' and curdir != olddir: - dot_repo = os.path.join(curdir, repodir) - if os.path.isdir(dot_repo): - return (repo_main, dot_repo) - else: - olddir = curdir - curdir = os.path.dirname(curdir) - return None, '' - - # The remaining of this function is dead code. It was used to - # find a git-checked-out version in the local project.\n" repo-dir)) - ;; Neither clone, check out, nor verify the git repository - (("(^\\s+)_Clone\\(.*\\)") "") - (("(^\\s+)_Checkout\\(.*\\)") "") - ((" rev = _Verify\\(.*\\)") " rev = None")) - #t))) + (("^REPO_MAIN = .*") + (format #f "REPO_MAIN = ~s~%" repo-main)) + ((" _Init\\(args, gitc_init=\\(cmd ==.*" all) + (string-append "True #" all))) + ;; Prevent repo from trying to git describe its version from + ;; the (disabled) self updated copy. + (substitute* "git_command.py" + (("ver = getattr\\(RepoSourceVersion.*") + (format #f "ver = ~s~%" ,version))) + (substitute* "subcmds/version.py" + (("rp_ver = .*") + (format #f "rp_ver = ~s~%" ,version))) + ;; Prevent repo from adding its (disabled) self update copy to + ;; the list of projects to fetch when using 'repo sync'. + (substitute* "subcmds/sync.py" + (("to_fetch\\.extend\\(all_projects\\).*" all) + (string-append "#" all)) + (("self\\._Fetch\\(to_fetch") + "self._Fetch(all_projects") + (("_PostRepoFetch\\(rp, opt\\.repo_verify).*" all) + (string-append "#" all)))))) (delete 'build) ; nothing to build (add-before 'check 'configure-git (lambda _ @@ -800,7 +801,6 @@ def _FindRepo(): (inputs ;; TODO: Add git-remote-persistent-https once it is available in guix `(("git" ,git) - ("gnupg" ,gnupg) ("ssh" ,openssh))) (native-inputs `(("pytest" ,python-pytest))) -- cgit v1.2.3 From faa0fa3978bad240f245c79aa487e0594ae9fc9a Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 27 Feb 2020 09:27:14 -0500 Subject: gnu: earlyoom: Update to latest commit to resolve a test failure. * gnu/packages/linux.scm (earlyoom): Update to commit 7bd4b2c9a285d2b9a4ef6e7a080e83ab95fcdeea. --- gnu/packages/linux.scm | 85 ++++++++++++++++++++++++++------------------------ 1 file changed, 45 insertions(+), 40 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 0b656629df..50fa7b31d0 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2737,49 +2737,54 @@ kmod. The aim is to be compatible with tools, configurations and indices from the module-init-tools project.") (license license:gpl2+))) ; library under lgpl2.1+ +;;; Use a recent commit, because the latest 1.3 tag suffers from test failures +;;; (see: +;;; https://github.com/rfjakob/earlyoom/issues/156#issuecomment-591997405). (define-public earlyoom - (package - (name "earlyoom") - (version "1.3") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/rfjakob/earlyoom.git") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0fwbx0y80nqgkxrc9kf9j3iwa0wbps2jmqir3pgqbc2cj0wjh0lr")))) - (build-system gnu-build-system) - (arguments - `(#:phases (modify-phases %standard-phases - (delete 'configure) - (add-before 'check 'set-home - (lambda _ - (setenv "HOME" (getcwd)) - #t)) - (add-after 'build 'install-contribs - ;; Install what seems useful from the contrib directory. - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (contrib (string-append - out "/share/earlyoom/contrib"))) - (install-file "contrib/notify_all_users.py" contrib) - #t)))) - #:make-flags (let* ((prefix (assoc-ref %outputs "out"))) - (list "CC=gcc" - (string-append "VERSION=v" ,version) - (string-append "PREFIX=" prefix) - (string-append "SYSCONFDIR=" prefix "/etc"))) - #:test-target "test")) - (native-inputs `(("go" ,go) ;for the test suite - ("pandoc" ,ghc-pandoc))) ;to generate the manpage - (home-page "https://github.com/rfjakob/earlyoom") - (synopsis "Simple out of memory (OOM) daemon for the Linux kernel") - (description "Early OOM is a minimalist out of memory (OOM) daemon that + (let ((commit "7bd4b2c9a285d2b9a4ef6e7a080e83ab95fcdeea") + (revision "1")) + (package + (name "earlyoom") + (version (git-version "1.3" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/rfjakob/earlyoom.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0sxk8gh734q4rbh9r1q8ab840bn4kffdm8j93x55jspnmmy1wd2c")))) + (build-system gnu-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + (delete 'configure) + (add-before 'check 'set-home + (lambda _ + (setenv "HOME" (getcwd)) + #t)) + (add-after 'build 'install-contribs + ;; Install what seems useful from the contrib directory. + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (contrib (string-append + out "/share/earlyoom/contrib"))) + (install-file "contrib/notify_all_users.py" contrib) + #t)))) + #:make-flags (let* ((prefix (assoc-ref %outputs "out"))) + (list "CC=gcc" + (string-append "VERSION=v" ,version) + (string-append "PREFIX=" prefix) + (string-append "SYSCONFDIR=" prefix "/etc"))) + #:test-target "test")) + (native-inputs `(("go" ,go) ;for the test suite + ("pandoc" ,ghc-pandoc))) ;to generate the manpage + (home-page "https://github.com/rfjakob/earlyoom") + (synopsis "Simple out of memory (OOM) daemon for the Linux kernel") + (description "Early OOM is a minimalist out of memory (OOM) daemon that runs in user space and provides a more responsive and configurable alternative to the in-kernel OOM killer.") - (license license:expat))) + (license license:expat)))) (define-public eudev ;; The post-systemd fork, maintained by Gentoo. -- cgit v1.2.3 From d24b3b02133e5e3ccc4236656c60377a369bd7b5 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 26 Feb 2020 14:19:03 +0100 Subject: gnu: rseqc: Update to 3.0.1. * gnu/packages/bioinformatics.scm (rseqc): Update to 3.0.1. [source]: Remove snippet. [arguments]: Remove to build with Python 3. [inputs]: Replace python2-cython, python2-pysam, and python2-numpy with python-cython, python-pysam, and python-numpy, respectively; add python-bx-python and python-pybigwig. [native-inputs]: Replace python2-nose with python-nose. --- gnu/packages/bioinformatics.scm | 28 +++++++++------------------- 1 file changed, 9 insertions(+), 19 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 8ed13b22e5..51ffa00860 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -5306,7 +5306,7 @@ BAM and Wiggle files in both transcript-coordinate and genomic-coordinate.") (define-public rseqc (package (name "rseqc") - (version "2.6.1") + (version "3.0.1") (source (origin (method url-fetch) @@ -5314,28 +5314,18 @@ BAM and Wiggle files in both transcript-coordinate and genomic-coordinate.") (string-append "mirror://sourceforge/rseqc/" "RSeQC-" version ".tar.gz")) (sha256 - (base32 "15ly0254yi032qzkdplg00q144qfdsd986gh62829rl5bkxhj330")) - (modules '((guix build utils))) - (snippet - '(begin - ;; remove bundled copy of pysam - (delete-file-recursively "lib/pysam") - (substitute* "setup.py" - ;; remove dependency on outdated "distribute" module - (("^from distribute_setup import use_setuptools") "") - (("^use_setuptools\\(\\)") "") - ;; do not use bundled copy of pysam - (("^have_pysam = False") "have_pysam = True")) - #t)))) + (base32 + "0gbb9iyb7swiv5455fm5rg98r7l6qn27v564yllqjd574hncpx6m")))) (build-system python-build-system) - (arguments `(#:python ,python-2)) (inputs - `(("python-cython" ,python2-cython) - ("python-pysam" ,python2-pysam) - ("python-numpy" ,python2-numpy) + `(("python-cython" ,python-cython) + ("python-bx-python" ,python-bx-python) + ("python-pybigwig" ,python-pybigwig) + ("python-pysam" ,python-pysam) + ("python-numpy" ,python-numpy) ("zlib" ,zlib))) (native-inputs - `(("python-nose" ,python2-nose))) + `(("python-nose" ,python-nose))) (home-page "http://rseqc.sourceforge.net/") (synopsis "RNA-seq quality control package") (description -- cgit v1.2.3 From 6c32e9b4dc7e7cbf6580e7b97d1c526cb15c6099 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 27 Feb 2020 17:37:32 +0100 Subject: gnu: bedtools: Update to 2.29.2. * gnu/packages/bioinformatics.scm (bedtools): Update to 2.29.2. [native-inputs]: Replace python-2 with python-wrapper. [license]: Change to Expat. --- gnu/packages/bioinformatics.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 51ffa00860..2b13ad4839 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -410,7 +410,7 @@ computational cluster.") (define-public bedtools (package (name "bedtools") - (version "2.27.1") + (version "2.29.2") (source (origin (method url-fetch) (uri (string-append "https://github.com/arq5x/bedtools2/releases/" @@ -418,7 +418,7 @@ computational cluster.") "bedtools-" version ".tar.gz")) (sha256 (base32 - "1ndg5yknrxl4djx8ddzgk12rrbiidfpmkkg5z3f95jzryfxarhn8")))) + "0m3hk6548846w83a9s5drsczvy67n2azx41kj71n03klb2gbzwg3")))) (build-system gnu-build-system) (arguments '(#:test-target "test" @@ -427,7 +427,8 @@ computational cluster.") #:phases (modify-phases %standard-phases (delete 'configure)))) - (native-inputs `(("python" ,python-2))) + (native-inputs + `(("python" ,python-wrapper))) (inputs `(("samtools" ,samtools) ("zlib" ,zlib))) @@ -440,7 +441,7 @@ genome arithmetic: that is, set theory on the genome. For example, bedtools allows one to intersect, merge, count, complement, and shuffle genomic intervals from multiple files in widely-used genomic file formats such as BAM, BED, GFF/GTF, VCF.") - (license license:gpl2))) + (license license:expat))) ;; Later releases of bedtools produce files with more columns than ;; what Ribotaper expects. -- cgit v1.2.3 From 0b61e1a0966943a343b49dabebdd344ec43641bc Mon Sep 17 00:00:00 2001 From: Kyle Meyer Date: Wed, 26 Feb 2020 21:38:06 -0500 Subject: gnu: git-annex: Update to 8.20200226. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/haskell-apps.scm (git-annex): Update to 8.20200226. Signed-off-by: Jakub Kądziołka --- gnu/packages/haskell-apps.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/haskell-apps.scm b/gnu/packages/haskell-apps.scm index 70348ee3cb..662f084fad 100644 --- a/gnu/packages/haskell-apps.scm +++ b/gnu/packages/haskell-apps.scm @@ -269,14 +269,14 @@ unique algebra of patches called @url{http://darcs.net/Theory,Patchtheory}. (define-public git-annex (package (name "git-annex") - (version "7.20200219") + (version "8.20200226") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" "git-annex/git-annex-" version ".tar.gz")) (sha256 - (base32 "0pzwjh98jpirgssbd7pqfk7mzraibrk277dn34s2mrah8zy75b58")))) + (base32 "09v80ni1w9z1im79lzrnpz7xlivwna44zqpwq4axwyd17cffqi9m")))) (build-system haskell-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From e6cc426fbb1687f8a88256154f11dd213dd725cf Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 27 Feb 2020 17:42:14 +0100 Subject: gnu: vcftools: Update to 0.1.16. * gnu/packages/bioinformatics.scm (vcftools): Update to 0.1.16. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 2b13ad4839..4cce508c09 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -6572,7 +6572,7 @@ profiles, and associated taxonomic information.") (define-public vcftools (package (name "vcftools") - (version "0.1.15") + (version "0.1.16") (source (origin (method url-fetch) (uri (string-append @@ -6580,7 +6580,7 @@ profiles, and associated taxonomic information.") version "/vcftools-" version ".tar.gz")) (sha256 (base32 - "1qw30c45wihgy632rbz4rh3njnwj4msj46l1rsgdhyg6bgypmr1i")))) + "1qqlx7flfv7axrjwkaz6njkscsl1d0jw98ns8d8bh1n1hd1pgz6v")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no "check" target -- cgit v1.2.3 From 643d90bf7475d2939b1fbd437965a5b978c8d3ec Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 27 Feb 2020 18:18:06 +0100 Subject: gnu: infernal: Update to 1.1.3. * gnu/packages/bioinformatics.scm (infernal): Update to 1.1.3. [native-inputs]: Add python. --- gnu/packages/bioinformatics.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 4cce508c09..3df146c40d 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -6608,17 +6608,18 @@ data in the form of VCF files.") (define-public infernal (package (name "infernal") - (version "1.1.2") + (version "1.1.3") (source (origin (method url-fetch) (uri (string-append "http://eddylab.org/software/infernal/" "infernal-" version ".tar.gz")) (sha256 (base32 - "0sr2hiz3qxfwqpz3whxr6n82p3x27336v3f34iqznp10hks2935c")))) + "0pm8bm3s6nfa0av4x6m6h27lsg12b3lz3jm0fyh1mc77l2isd61v")))) (build-system gnu-build-system) (native-inputs - `(("perl" ,perl))) ; for tests + `(("perl" ,perl) + ("python" ,python))) ; for tests (home-page "http://eddylab.org/infernal/") (synopsis "Inference of RNA alignments") (description "Infernal (\"INFERence of RNA ALignment\") is a tool for @@ -6629,7 +6630,7 @@ profile, but it scores a combination of sequence consensus and RNA secondary structure consensus, so in many cases, it is more capable of identifying RNA homologs that conserve their secondary structure more than their primary sequence.") - ;; Infernal 1.1.2 requires VMX or SSE capability for parallel instructions. + ;; Infernal 1.1.3 requires VMX or SSE capability for parallel instructions. (supported-systems '("i686-linux" "x86_64-linux")) (license license:bsd-3))) -- cgit v1.2.3 From af5271b275cda8a92d698e846aa1e21e722974a0 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 26 Jan 2020 16:38:02 +0300 Subject: gnu: Add rust-user32-sys-0.2. * gnu/packages/crates-io.scm (rust-user32-sys-0.2): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 5b5c36525c..413599d064 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -18394,6 +18394,39 @@ untrusted inputs in Rust.") ("rust-rustc-test" ,rust-rustc-test-0.3) ("rust-serde-json" ,rust-serde-json-1.0)))))) +(define-public rust-user32-sys-0.2 + (package + (name "rust-user32-sys") + (version "0.2.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "user32-sys" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0ivxc7hmsxax9crdhxdd1nqwik4s9lhb2x59lc8b88bv20fp3x2f")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-winapi" ,rust-winapi-0.2)) + #:cargo-development-inputs + (("rust-winapi-build" ,rust-winapi-build-0.1)) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-cargo-toml + (lambda _ + (substitute* "Cargo.toml" + ((", path =.*}") "}")) + #t))))) + (home-page "https://github.com/retep998/winapi-rs") + (synopsis "Function definitions for the Windows API library user32") + (description + "Contains function definitions for the Windows API library user32. +See winapi for types and constants.") + (license license:expat))) + (define-public rust-users-0.9 (package (name "rust-users") -- cgit v1.2.3 From 1f38bd3394fc05802ba19f83ead034951ada347f Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 26 Jan 2020 16:38:54 +0300 Subject: gnu: Add rust-urlocator-0.1. * gnu/packages/crates-io.scm (rust-urlocator-0.1): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 413599d064..98ecb9055b 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -18394,6 +18394,25 @@ untrusted inputs in Rust.") ("rust-rustc-test" ,rust-rustc-test-0.3) ("rust-serde-json" ,rust-serde-json-1.0)))))) +(define-public rust-urlocator-0.1 + (package + (name "rust-urlocator") + (version "0.1.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "urlocator" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1xzhwmqrqyk8p3s5npqpidrn0gjapqx5fshrx633fk56j7cm8qm1")))) + (build-system cargo-build-system) + (home-page "https://github.com/chrisduerr/urlocator.git") + (synopsis "Locate URLs in character streams") + (description "Locate URLs in character streams.") + (license (list license:expat license:asl2.0)))) + (define-public rust-user32-sys-0.2 (package (name "rust-user32-sys") -- cgit v1.2.3 From ad9e129f1ed2923ddcd848dc59ea99240b05905a Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 26 Jan 2020 16:40:04 +0300 Subject: gnu: Add rust-openssl-sys-0.7. * gnu/packages/crates-io.scm (rust-openssl-sys-0.7): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 98ecb9055b..9495d0b7d9 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -10415,6 +10415,42 @@ system for OpenSSL.") "This package provides FFI bindings to OpenSSL for use in rust crates.") (license license:expat))) +(define-public rust-openssl-sys-0.7 + (package + (inherit rust-openssl-sys-0.9) + (name "rust-openssl-sys") + (version "0.7.17") + (source + (origin + (method url-fetch) + (uri (crate-uri "openssl-sys" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0gswbbfkhhj8f9jifwvdssv3p2lpgyz69qzqvafylbim9klpxi49")) + (modules '((guix build utils))) + (snippet + '(begin + ;; rust-libressl-pnacl-sys vendors libressl. + (substitute* "Cargo.toml" + ((".*nacl.*") "")) + #t)))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-gdi32-sys" ,rust-gdi32-sys-0.2) + ("rust-libc" ,rust-libc-0.2) + ("rust-user32-sys" ,rust-user32-sys-0.2) + ("rust-pkg-config" ,rust-pkg-config-0.3)) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'find-openssl + (lambda* (#:key inputs #:allow-other-keys) + (let ((openssl (assoc-ref inputs "openssl"))) + (setenv "OPENSSL_DIR" openssl)) + #t))))))) + (define-public rust-ordered-float-1.0 (package (name "rust-ordered-float") -- cgit v1.2.3 From 1240782c9940a6d935bda6b14627f1c185eeac42 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 26 Feb 2020 18:40:32 +0200 Subject: gnu: rust-gdi31-sys-0.2: Fix inputs. * gnu/packages/crates-io.scm (rust-gdi32-sys-0.2)[arguments]: Move rust-winapi-build-0.1 from cargo-development-inputs to cargo-inputs. --- gnu/packages/crates-io.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 9495d0b7d9..1586e431b8 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -5782,9 +5782,8 @@ archive to be linked into Rustcode.") (arguments `(#:skip-build? #t #:cargo-inputs - (("rust-winapi" ,rust-winapi-0.2)) - #:cargo-development-inputs - (("rust-winapi-build" ,rust-winapi-build-0.1)))) + (("rust-winapi" ,rust-winapi-0.2) + ("rust-winapi-build" ,rust-winapi-build-0.1)))) (home-page "https://github.com/retep998/winapi-rs") (synopsis "Function definitions for the Windows API library gdi32") (description "This package contains function definitions for the Windows -- cgit v1.2.3 From 7c4e3488ff1fa1e374440ba728316a0534802179 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 26 Feb 2020 18:41:08 +0200 Subject: Revert "gnu: Add rust-libressl-pnacl-sys-2." This crate includes a vendored copy of libressl. This reverts commit a86fc40dc384ae237b10a1d401f984c6f277aa88. --- gnu/packages/crates-io.scm | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 1586e431b8..ac3f1bba5e 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -8160,30 +8160,6 @@ functions and static variables these libraries contain.") (base32 "16pc0gx4gkg0q2s1ssq8268brn14j8344623vwhadmivc4lsmivz")))))) -(define-public rust-libressl-pnacl-sys-2 - (package - (name "rust-libressl-pnacl-sys") - (version "2.1.6") - (source - (origin - (method url-fetch) - (uri (crate-uri "libressl-pnacl-sys" version)) - (file-name - (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "0w9yvgrf591phpr1222j0dj7x1n489v2sihnr8syz8xn3aamih6b")))) - (build-system cargo-build-system) - (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-pnacl-build-helper" ,rust-pnacl-build-helper-1.4)))) - (home-page "https://github.com/DiamondLovesYou/libressl-pnacl-sys") - (synopsis "Openssl linking provider for PNaCl/NaCl targets") - (description - "This package provides an openssl linking provider for PNaCl/NaCl targets.") - (license license:expat))) - (define-public rust-libssh2-sys-0.2 (package (name "rust-libssh2-sys") -- cgit v1.2.3 From f1e4f87e77994b5021b676cf6c48e343744519f9 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 26 Jan 2020 16:40:51 +0300 Subject: gnu: Add rust-openssl-sys-extras-0.7. * gnu/packages/crates-io.scm (rust-openssl-sys-extras-0.7): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index ac3f1bba5e..6138a0e01c 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -10426,6 +10426,41 @@ system for OpenSSL.") (setenv "OPENSSL_DIR" openssl)) #t))))))) +(define-public rust-openssl-sys-extras-0.7 + (package + (name "rust-openssl-sys-extras") + (version "0.7.14") + (source + (origin + (method url-fetch) + (uri (crate-uri "openssl-sys-extras" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1ymrmfnknyjji74fflbnnq9r5ihx25h0vgs5y203vl6klzdy3i8i")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-libc" ,rust-libc-0.2) + ("rust-openssl-sys" ,rust-openssl-sys-0.7) + ("rust-gcc" ,rust-gcc-0.3)) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-cargo-toml + (lambda _ + (substitute* "Cargo.toml" + ((", path =.*}") "}")) + #t))))) + (native-inputs + `(("openssl" ,openssl-1.0))) ; openssl-1.0 specifically + (home-page "https://github.com/sfackler/rust-openssl") + (synopsis + "Extra FFI bindings to OpenSSL that require a C shim") + (description + "Extra FFI bindings to OpenSSL that require a C shim.") + (license license:expat))) + (define-public rust-ordered-float-1.0 (package (name "rust-ordered-float") -- cgit v1.2.3 From b090c2fd80f16cbbd9b1770673407ed17a62fb78 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 26 Jan 2020 16:41:25 +0300 Subject: gnu: Add rust-openssl-0.7. * gnu/packages/crates-io.scm (rust-openssl-0.7): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 6138a0e01c..c637fbc711 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -10332,6 +10332,44 @@ Things in odds may move to more appropriate crates if we find them.") (description "OpenSSL bindings.") (license license:asl2.0))) +(define-public rust-openssl-0.7 + (package + (inherit rust-openssl-0.10) + (name "rust-openssl") + (version "0.7.14") + (source + (origin + (method url-fetch) + (uri (crate-uri "openssl" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0cw767rbasg4dbsfcsnxqm3q5ljkv6s1jq0a2p82xi5a8ii7n4f4")))) + (arguments + `(#:tests? #f ; Test directory not included in release + #:cargo-inputs + (("rust-bitflags" ,rust-bitflags-0.7) + ("rust-gcc" ,rust-gcc-0.3) + ("rust-lazy-static" ,rust-lazy-static-0.2) + ("rust-libc" ,rust-libc-0.2) + ("rust-openssl-sys" ,rust-openssl-sys-0.7) + ("rust-openssl-sys-extras" ,rust-openssl-sys-extras-0.7)) + #:cargo-development-inputs + (("rust-net2" ,rust-net2-0.2) + ("rust-rustc-serialize" ,rust-rustc-serialize-0.3) + ("rust-winapi" ,rust-winapi-0.2) + ("rust-ws2-32-sys" ,rust-ws2-32-sys-0.2)) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-cargo-toml + (lambda _ + (substitute* "Cargo.toml" + ((", path =.*}") "}")) + #t))))) + (native-inputs + `(("openssl" ,openssl-1.0))))) ; for openssl-sys-extras + (define-public rust-openssl-probe-0.1 (package (name "rust-openssl-probe") -- cgit v1.2.3 From e3249fe2cec9f49bdbafe53f31953f4f1c7ced0f Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 26 Jan 2020 16:41:45 +0300 Subject: gnu: Add rust-sha1-0.2. * gnu/packages/crates-io.scm (rust-sha1-0.2): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index c637fbc711..e648e217c4 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -15053,6 +15053,34 @@ for the serde framework.") "Minimal implementation of SHA1 for Rust.") (license license:bsd-3))) +(define-public rust-sha1-0.2 + (package + (inherit rust-sha1-0.6) + (name "rust-sha1") + (version "0.2.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "sha1" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0p09zfhd27z6yr5in07gfjcx345010rw51ivlcf14364x3hv2c6c")))) + (arguments + `(#:cargo-development-inputs + (("rust-openssl" ,rust-openssl-0.7) + ("rust-rand" ,rust-rand-0.3)) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-cargo-toml + (lambda _ + (substitute* "Cargo.toml" + ((", path =.*}") "}")) + #t))))) + (native-inputs + `(("openssl" ,openssl-1.0))))) ; for openssl-sys-extras + (define-public rust-sha1-asm-0.4 (package (name "rust-sha1-asm") -- cgit v1.2.3 From 355658ee60cd4a2f1ee1b2ff1fb671486b118236 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 26 Jan 2020 16:42:33 +0300 Subject: gnu: Add rust-uuid-0.5. * gnu/packages/crates-io.scm (rust-uuid-0.5): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index e648e217c4..e5a089fbf9 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -18700,6 +18700,28 @@ Unix users and groups.") "This package provides a library to generate and parse UUIDs.") (license (list license:asl2.0 license:expat)))) +(define-public rust-uuid-0.5 + (package + (inherit rust-uuid-0.7) + (name "rust-uuid") + (version "0.5.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "uuid" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "08nw3famk1w1zf9ck32pmklk24wd4n4nqnr9wl46qvxak2wf7ixw")))) + (arguments + `(#:cargo-inputs + (("rust-md5" ,rust-md5-0.3) + ("rust-rand" ,rust-rand-0.3) + ("rust-rustc-serialize" ,rust-rustc-serialize-0.3) + ("rust-serde" ,rust-serde-1.0) + ("rust-sha1" ,rust-sha1-0.2)))))) + (define-public rust-vcpkg-0.2 (package (name "rust-vcpkg") -- cgit v1.2.3 From 4b6f844ec25477ccbfcdb774767bccfdc1531f9b Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 26 Jan 2020 16:43:08 +0300 Subject: gnu: Add rust-core-foundation-0.6. * gnu/packages/crates-io.scm (rust-core-foundation-0.6): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index e5a089fbf9..3ba5058c35 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2626,6 +2626,34 @@ semantics than those provided by @code{as} or @code{From}/@code{Into}.") intrinsics.") (license (list license:expat license:asl2.0)))) +(define-public rust-core-foundation-0.6 + (package + (name "rust-core-foundation") + (version "0.6.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "core-foundation" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0va97wf49c8dzm9c8pgyk1jn7z21rl0bj1syf2zz5m2z2hzy1f95")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t ; only for macOS + #:cargo-inputs + (("rust-chrono" ,rust-chrono-0.4) + ("rust-core-foundation-sys" ,rust-core-foundation-sys-0.6) + ("rust-libc" ,rust-libc-0.2) + ("rust-uuid" ,rust-uuid-0.5)))) + (home-page "https://github.com/servo/core-foundation-rs") + (synopsis + "Bindings to Core Foundation for macOS") + (description + "Bindings to Core Foundation for macOS.") + (license (list license:expat license:asl2.0)))) + (define-public rust-core-foundation-sys-0.6 (package (name "rust-core-foundation-sys") -- cgit v1.2.3 From 67aee1c04623082da914e42f05e8799eebc71d59 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 26 Jan 2020 16:43:56 +0300 Subject: gnu: Add rust-core-graphics-0.17. * gnu/packages/crates-io.scm (rust-core-graphics-0.17): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 3ba5058c35..e09e6932c2 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2675,6 +2675,33 @@ intrinsics.") (license (list license:asl2.0 license:expat)))) +(define-public rust-core-graphics-0.17 + (package + (name "rust-core-graphics") + (version "0.17.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "core-graphics" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1acm3vygngnilzlr6klym5ywh7kfzh2xxrh2l41152hwmdl0jyan")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t ; only for macOS + #:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-core-foundation" ,rust-core-foundation-0.6) + ("rust-foreign-types" ,rust-foreign-types-0.3) + ("rust-libc" ,rust-libc-0.2)))) + (home-page "https://github.com/servo/core-graphics-rs") + (synopsis "Bindings to Core Graphics for macOS") + (description + "Bindings to Core Graphics for macOS.") + (license (list license:expat license:asl2.0)))) + (define-public rust-crates-index-0.13 (package (name "rust-crates-index") -- cgit v1.2.3 From b5bda2cda4a6d0ac7e3c1349a8bdde82e0fc5923 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 26 Jan 2020 16:44:33 +0300 Subject: gnu: Add rust-core-text-13. * gnu/packages/crates-io.scm (rust-core-text-13): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index e09e6932c2..cc6048ec98 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2702,6 +2702,33 @@ intrinsics.") "Bindings to Core Graphics for macOS.") (license (list license:expat license:asl2.0)))) +(define-public rust-core-text-13 + (package + (name "rust-core-text") + (version "13.3.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "core-text" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0v9lxn277p39cf81pb45r7k0lzf17pwgd5cpry1c04ajv556b16v")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t ; only for macOS + #:cargo-inputs + (("rust-core-foundation" ,rust-core-foundation-0.6) + ("rust-core-graphics" ,rust-core-graphics-0.17) + ("rust-foreign-types" ,rust-foreign-types-0.3) + ("rust-libc" ,rust-libc-0.2)))) + (home-page "https://github.com/servo/core-foundation-rs") + (synopsis "Bindings to the Core Text framework") + (description + "Bindings to the Core Text framework.") + (license (list license:expat license:asl2.0)))) + (define-public rust-crates-index-0.13 (package (name "rust-crates-index") -- cgit v1.2.3 From db8da4de980bd0a499d45694b83d66e7676eb2eb Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 26 Jan 2020 16:46:12 +0300 Subject: gnu: Add rust-cocoa-0.19. * gnu/packages/crates-io.scm (rust-cocoa-0.19): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index cc6048ec98..107578407b 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2357,6 +2357,35 @@ CMAKE environmental variable is set.") (license (list license:asl2.0 license:expat)))) +(define-public rust-cocoa-0.19 + (package + (name "rust-cocoa") + (version "0.19.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "cocoa" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0034vahbfv574q4b63rj241b8rnka5cjiqsqc6wiggnin9l7g7zj")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t ; only for macOS + #:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-block" ,rust-block-0.1) + ("rust-core-foundation" ,rust-core-foundation-0.6) + ("rust-core-graphics" ,rust-core-graphics-0.17) + ("rust-foreign-types" ,rust-foreign-types-0.3) + ("rust-libc" ,rust-libc-0.2) + ("rust-objc" ,rust-objc-0.2)))) + (home-page "https://github.com/servo/core-foundation-rs") + (synopsis "Bindings to Cocoa for macOS") + (description "Bindings to Cocoa for macOS.") + (license (list license:expat license:asl2.0)))) + (define-public rust-color-quant-1.0 (package (name "rust-color-quant") -- cgit v1.2.3 From f78f0d7ffee6a51d997705038842b3f8341bfa4b Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 26 Jan 2020 16:46:28 +0300 Subject: gnu: Add rust-cocoa-0.18. * gnu/packages/crates-io.scm (rust-cocoa-0.18): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 107578407b..e51ed9331a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2386,6 +2386,21 @@ CMAKE environmental variable is set.") (description "Bindings to Cocoa for macOS.") (license (list license:expat license:asl2.0)))) +(define-public rust-cocoa-0.18 + (package + (inherit rust-cocoa-0.19) + (name "rust-cocoa") + (version "0.18.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "cocoa" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0m6fgdr4d2fp8jhkqvwr23hrqqqjv72g0j9vdgijc58k05j9j1hp")))))) + (define-public rust-color-quant-1.0 (package (name "rust-color-quant") -- cgit v1.2.3 From 4199ee10509356166b352842d6a527c291bd282e Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 2 Feb 2020 00:20:01 +0300 Subject: gnu: Add rust-glutin-egl-sys-0.1. * gnu/packages/crates-io.scm (rust-glutin-egl-sys-0.1): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index e51ed9331a..a4768973ab 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6333,6 +6333,29 @@ the process of matching one or more glob patterns against a single candidate path simultaneously, and returning all of the globs that matched.") (license (list license:expat license:unlicense)))) +(define-public rust-glutin-egl-sys-0.1 + (package + (name "rust-glutin-egl-sys") + (version "0.1.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "glutin-egl-sys" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0k1x1frdp4wp47qkai8zzmgqxzpfcn7780m29qgd92lbnbrxwbkp")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-winapi" ,rust-winapi-0.3) + ("rust-gl-generator" ,rust-gl-generator-0.13)))) + (home-page "https://github.com/rust-windowing/glutin") + (synopsis "Egl bindings for glutin") + (description "The egl bindings for glutin.") + (license license:asl2.0))) + (define-public rust-glutin-emscripten-sys-0.1 (package (name "rust-glutin-emscripten-sys") -- cgit v1.2.3 From 0d35d892203e50603f3c2cdd2b39fb8496a10c66 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 2 Feb 2020 00:21:15 +0300 Subject: gnu: Add rust-glutin-gles2-sys-0.1. * gnu/packages/crates-io.scm (rust-glutin-gles2-sys-0.1): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index a4768973ab..719fce3e4a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6375,6 +6375,29 @@ path simultaneously, and returning all of the globs that matched.") (description "The emscripten bindings for glutin.") (license license:asl2.0))) +(define-public rust-glutin-gles2-sys-0.1 + (package + (name "rust-glutin-gles2-sys") + (version "0.1.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "glutin_gles2_sys" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1pswvl5zyqmqwzjr674yzslj0al2xbqsp2ai9ggb9qbshlq6r6c9")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-objc" ,rust-objc-0.2) + ("rust-gl-generator" ,rust-gl-generator-0.11)))) + (home-page "https://github.com/tomaka/glutin") + (synopsis "The gles2 bindings for glutin") + (description "The gles2 bindings for glutin.") + (license license:asl2.0))) + (define-public rust-goblin-0.0 (package (name "rust-goblin") -- cgit v1.2.3 From 4bf45749b83c1c01d934891fee847c466070d019 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 2 Feb 2020 00:21:53 +0300 Subject: gnu: Add rust-glutin-glx-sys-0.1. * gnu/packages/crates-io.scm (rust-glutin-glx-sys-0.1): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 719fce3e4a..9fc4b57926 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6398,6 +6398,29 @@ path simultaneously, and returning all of the globs that matched.") (description "The gles2 bindings for glutin.") (license license:asl2.0))) +(define-public rust-glutin-glx-sys-0.1 + (package + (name "rust-glutin-glx-sys") + (version "0.1.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "glutin-glx-sys" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0mxs3mil68xqqb49466n5rpwpcllj6fwqjgrcrzzmz26bv5ab40j")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-x11-dl" ,rust-x11-dl-2) + ("rust-gl-generator" ,rust-gl-generator-0.11)))) + (home-page "https://github.com/tomaka/glutin") + (synopsis "Glx bindings for glutin") + (description "The glx bindings for glutin.") + (license license:asl2.0))) + (define-public rust-goblin-0.0 (package (name "rust-goblin") -- cgit v1.2.3 From 8d715e6e75cadfcfaf14c7f527974a9a491b7581 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 2 Feb 2020 00:23:32 +0300 Subject: gnu: Add rust-glutin-wgl-sys-0.1. * gnu/packages/crates-io.scm (rust-glutin-wgl-sys-0.1): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 9fc4b57926..ad6f39566e 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6421,6 +6421,28 @@ path simultaneously, and returning all of the globs that matched.") (description "The glx bindings for glutin.") (license license:asl2.0))) +(define-public rust-glutin-wgl-sys-0.1 + (package + (name "rust-glutin-wgl-sys") + (version "0.1.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "glutin-wgl-sys" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "08chlfzpj59q36qm212i4k879gvjzha7i90q90fds8pw3v4vn0gq")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-gl-generator" ,rust-gl-generator-0.11)))) + (home-page "https://github.com/tomaka/glutin") + (synopsis "Wgl bindings for glutin") + (description "The wgl bindings for glutin.") + (license license:asl2.0))) + (define-public rust-goblin-0.0 (package (name "rust-goblin") -- cgit v1.2.3 From c4f37fc1e0671589cb610e6296a524eeb8dd0dcf Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 2 Feb 2020 00:53:45 +0300 Subject: gnu: Add rust-weedle-0.10. * gnu/packages/crates-io.scm (rust-weedle-0.10): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index ad6f39566e..4d10562c2f 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -19470,6 +19470,28 @@ attribute that is not in the shared backend crate.") (license (list license:asl2.0 license:expat)))) +(define-public rust-weedle-0.10 + (package + (name "rust-weedle") + (version "0.10.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "weedle" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0r0i2kllvkn9jil6cjzxdi1zsc6p1gjyk751w8lyclaii1q3zd1v")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-nom" ,rust-nom-4.2)))) + (home-page "https://github.com/rustwasm/weedle") + (synopsis "WebIDL Parser") + (description + "This package provides a WebIDL Parser.") + (license license:expat))) + (define-public rust-which-2.0 (package (name "rust-which") -- cgit v1.2.3 From 11b8038d6f00289685823c51fe63bcaa190dacd7 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 2 Feb 2020 01:07:36 +0300 Subject: gnu: Add rust-wasm-bindgen-webidl-0.2. * gnu/packages/crates-io.scm (rust-wasm-bindgen-webidl-0.2): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 4d10562c2f..ca68074998 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -19470,6 +19470,37 @@ attribute that is not in the shared backend crate.") (license (list license:asl2.0 license:expat)))) +(define-public rust-wasm-bindgen-webidl-0.2 + (package + (name "rust-wasm-bindgen-webidl") + (version "0.2.58") + (source + (origin + (method url-fetch) + (uri (crate-uri "wasm-bindgen-webidl" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0pcpaw8w3xgfrg9y24ljrsl2bkidgdaaz3ka2bgk417wjc6jl0gg")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-anyhow" ,rust-anyhow-1.0) + ("rust-heck" ,rust-heck-0.3) + ("rust-log" ,rust-log-0.4) + ("rust-proc-macro2" ,rust-proc-macro2-1.0) + ("rust-quote" ,rust-quote-1.0) + ("rust-syn" ,rust-syn-1.0) + ("rust-wasm-bindgen-backend" ,rust-wasm-bindgen-backend-0.2) + ("rust-weedle" ,rust-weedle-0.10)))) + (home-page "https://rustwasm.github.io/wasm-bindgen/") + (synopsis "Support for parsing WebIDL specific to wasm-bindgen") + (description + "Support for parsing WebIDL specific to wasm-bindgen.") + (license (list license:expat license:asl2.0)))) + (define-public rust-weedle-0.10 (package (name "rust-weedle") -- cgit v1.2.3 From 7c1396236064c12fa05e4768d66f6aba223e6d51 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 27 Feb 2020 09:09:10 +0200 Subject: gnu: rust-wasm-bindgen-test-macro-0.2: Update to 0.2.50. * gnu/packages/crates-io.scm (rust-wasm-bindgen-test-macro-0.2): Update to 0.2.50. [arguments]: Don't skip build. --- gnu/packages/crates-io.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index ca68074998..0684b3c4f3 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -19448,7 +19448,7 @@ attribute that is not in the shared backend crate.") (define-public rust-wasm-bindgen-test-macro-0.2 (package (name "rust-wasm-bindgen-test-macro") - (version "0.2.48") + (version "0.2.50") (source (origin (method url-fetch) @@ -19456,11 +19456,10 @@ attribute that is not in the shared backend crate.") (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "0n28mr6vncf1k1qr2b5bvfxq4jvqkjdzq0z0ab6w2f5d6v8q3q3l")))) + "19bvmw8mqlwh6wkbzgs3cnlkywrv8q2kkqggz6y0p158930xm287")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-0.4) ("rust-quote" ,rust-quote-0.6)))) (home-page "https://github.com/rustwasm/wasm-bindgen") -- cgit v1.2.3 From d125c4f428c20d75c72ef21455649ca76f1bfeba Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 2 Feb 2020 01:36:44 +0300 Subject: gnu: Add rust-wasm-bindgen-test-macro-0.3. * gnu/packages/crates-io.scm (rust-wasm-bindgen-test-macro-0.3): New variable. (rust-wasm-bindgen-test-macro-0.2): Inherit from rust-wasm-bindgen-test-macro-0.3. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 34 ++++++++++++++++++++++++++-------- 1 file changed, 26 insertions(+), 8 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 0684b3c4f3..37b97b5ca8 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -19445,8 +19445,33 @@ attribute that is not in the shared backend crate.") "Internal testing crate for wasm-bindgen.") (license (list license:expat license:asl2.0)))) +(define-public rust-wasm-bindgen-test-macro-0.3 + (package + (name "rust-wasm-bindgen-test-macro") + (version "0.3.8") + (source + (origin + (method url-fetch) + (uri (crate-uri "wasm-bindgen-test-macro" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0kybf3shpp8ysz4v4j259d7vad9kw5bs4i4dlfrs895bhdp7m0wp")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-proc-macro2" ,rust-proc-macro2-1.0) + ("rust-quote" ,rust-quote-1.0)))) + (home-page "https://github.com/rustwasm/wasm-bindgen") + (synopsis "Internal testing macro for wasm-bindgen") + (description + "This library contains the internal testing macro for wasm-bindgen.") + (license (list license:expat license:asl2.0)))) + (define-public rust-wasm-bindgen-test-macro-0.2 (package + (inherit rust-wasm-bindgen-test-macro-0.3) (name "rust-wasm-bindgen-test-macro") (version "0.2.50") (source @@ -19457,17 +19482,10 @@ attribute that is not in the shared backend crate.") (sha256 (base32 "19bvmw8mqlwh6wkbzgs3cnlkywrv8q2kkqggz6y0p158930xm287")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-0.4) - ("rust-quote" ,rust-quote-0.6)))) - (home-page "https://github.com/rustwasm/wasm-bindgen") - (synopsis "Internal testing macro for wasm-bindgen") - (description - "This library contains the internal testing macro for wasm-bindgen.") - (license (list license:asl2.0 - license:expat)))) + ("rust-quote" ,rust-quote-0.6)))))) (define-public rust-wasm-bindgen-webidl-0.2 (package -- cgit v1.2.3 From ede4cbc0ba4276004f83762ff030a22b25f1c72b Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 2 Feb 2020 01:42:30 +0300 Subject: gnu: Add rust-wasm-bindgen-futures-0.4 and its dependencies. * gnu/packages/crates-io.scm (rust-wasm-bindgen-futures-0.4): New variable. * gnu/packages/crates-io.scm (rust-wasm-bindgen-test-0.3): New variable. * gnu/packages/crates-io.scm (rust-web-sys-0.3): New variable. Added in one commit because they have cyclic dependencies on each other. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 94 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 94 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 37b97b5ca8..968b75a56d 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -19302,6 +19302,37 @@ in Rust.") "Backend code generation of the wasm-bindgen tool.") (license (list license:expat license:asl2.0)))) +(define-public rust-wasm-bindgen-futures-0.4 + (package + (name "rust-wasm-bindgen-futures") + (version "0.4.8") + (source + (origin + (method url-fetch) + (uri (crate-uri "wasm-bindgen-futures" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1n9ma4kinr4w6r2sh4wm04my6p14k1vx3a4vdbn0vd187sgd9gcb")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-cfg-if" ,rust-cfg-if-0.1) + ("rust-js-sys" ,rust-js-sys-0.3) + ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2) + ("rust-web-sys" ,rust-web-sys-0.3)) + #:cargo-development-inputs + (("rust-futures-channel-preview" ,rust-futures-channel-preview-0.3) + ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3)))) + (home-page "https://rustwasm.github.io/wasm-bindgen/") + (synopsis + "Bridging the gap between Rust Futures and JavaScript Promises") + (description + "Bridging the gap between Rust Futures and JavaScript Promises.") + (license (list license:expat license:asl2.0)))) + (define-public rust-wasm-bindgen-futures-0.3 (package (name "rust-wasm-bindgen-futures") @@ -19415,6 +19446,36 @@ attribute that is not in the shared backend crate.") (license (list license:asl2.0 license:expat)))) +(define-public rust-wasm-bindgen-test-0.3 + (package + (name "rust-wasm-bindgen-test") + (version "0.3.8") + (source + (origin + (method url-fetch) + (uri (crate-uri "wasm-bindgen-test" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0bn833hghwbcg9cqz1bx9biq271bc4jcbgn2nqk1fkf4ab1hxzcq")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-console-error-panic-hook" ,rust-console-error-panic-hook-0.1) + ("rust-js-sys" ,rust-js-sys-0.3) + ("rust-scoped-tls" ,rust-scoped-tls-1.0) + ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2) + ("rust-wasm-bindgen-futures" ,rust-wasm-bindgen-futures-0.4) + ("rust-wasm-bindgen-test-macro" ,rust-wasm-bindgen-test-macro-0.3)))) + (home-page "https://github.com/rustwasm/wasm-bindgen") + (synopsis + "Internal testing crate for wasm-bindgen") + (description + "Internal testing crate for wasm-bindgen.") + (license (list license:expat license:asl2.0)))) + (define-public rust-wasm-bindgen-test-0.2 (package (name "rust-wasm-bindgen-test") @@ -19518,6 +19579,39 @@ attribute that is not in the shared backend crate.") "Support for parsing WebIDL specific to wasm-bindgen.") (license (list license:expat license:asl2.0)))) +(define-public rust-web-sys-0.3 + (package + (name "rust-web-sys") + (version "0.3.35") + (source + (origin + (method url-fetch) + (uri (crate-uri "web-sys" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0fzmxcyahy3ghl8lkjkchj9krmnr56shvbqgr7db3hm8dappryda")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-js-sys" ,rust-js-sys-0.3) + ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2) + ("rust-anyhow" ,rust-anyhow-1.0) + ("rust-env-logger" ,rust-env-logger-0.7) + ("rust-sourcefile" ,rust-sourcefile-0.1) + ("rust-wasm-bindgen-webidl" ,rust-wasm-bindgen-webidl-0.2)) + #:cargo-development-inputs + (("rust-wasm-bindgen-futures" ,rust-wasm-bindgen-futures-0.4) + ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3)))) + (home-page "https://rustwasm.github.io/wasm-bindgen/web-sys/index.html") + (synopsis + "Bindings for all Web APIs, a procedurally generated crate from WebIDL") + (description + "Bindings for all Web APIs, a procedurally generated crate from WebIDL.") + (license (list license:expat license:asl2.0)))) + (define-public rust-weedle-0.10 (package (name "rust-weedle") -- cgit v1.2.3 From deeedc269b30ed6e75a92dca0914e4193c2a88f7 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 2 Feb 2020 01:47:12 +0300 Subject: gnu: rust-wasm-bindgen-test-0.2: Inherit from rust-wasm-bindgen-test-0.3. * gnu/packages/crates-io.scm (rust-wasm-bindgen-test-0.2): Inherit from rust-wasm-bindgen-test-0.3. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 968b75a56d..60fb5dc5c0 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -19478,6 +19478,7 @@ attribute that is not in the shared backend crate.") (define-public rust-wasm-bindgen-test-0.2 (package + (inherit rust-wasm-bindgen-test-0.3) (name "rust-wasm-bindgen-test") (version "0.2.48") (source @@ -19489,7 +19490,6 @@ attribute that is not in the shared backend crate.") (sha256 (base32 "0gwslc2sfkghzzb3r0gvd8i5rig2nlqgpl1rn43y2w4mr1ci494k")))) - (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs @@ -19499,12 +19499,7 @@ attribute that is not in the shared backend crate.") ("rust-scoped-tls" ,rust-scoped-tls-1.0) ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2) ("rust-wasm-bindgen-futures" ,rust-wasm-bindgen-futures-0.3) - ("rust-wasm-bindgen-test-macro" ,rust-wasm-bindgen-test-macro-0.2)))) - (home-page "https://github.com/rustwasm/wasm-bindgen") - (synopsis "Internal testing crate for wasm-bindgen") - (description - "Internal testing crate for wasm-bindgen.") - (license (list license:expat license:asl2.0)))) + ("rust-wasm-bindgen-test-macro" ,rust-wasm-bindgen-test-macro-0.2)))))) (define-public rust-wasm-bindgen-test-macro-0.3 (package -- cgit v1.2.3 From 0f71a6a750c609a065ec1b26df24850edc04156b Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 2 Feb 2020 01:49:25 +0300 Subject: gnu: rust-wasm-bindgen-futures-0.3: Inherit from rust-wasm-bindgen-futures-0.4. * gnu/packages/crates-io.scm (rust-wasm-bindgen-futures-0.3): Inherit rust-wasm-bindgen-futures-0.4. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 60fb5dc5c0..647e62e2cf 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -19335,6 +19335,7 @@ in Rust.") (define-public rust-wasm-bindgen-futures-0.3 (package + (inherit rust-wasm-bindgen-futures-0.4) (name "rust-wasm-bindgen-futures") (version "0.3.24") (source @@ -19346,7 +19347,6 @@ in Rust.") (sha256 (base32 "0bf9x6qfjczspc4zs605z1n4j15cdd8kk2z7rah0yggw8b6zl5nc")))) - (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs @@ -19358,13 +19358,7 @@ in Rust.") ("rust-lazy-static" ,rust-lazy-static-1) ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2)) #:cargo-development-inputs - (("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.2)))) - (home-page "https://rustwasm.github.io/wasm-bindgen/") - (synopsis - "Bridging the gap between Rust Futures and JavaScript Promises") - (description - "Bridging the gap between Rust Futures and JavaScript Promises.") - (license (list license:expat license:asl2.0)))) + (("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.2)))))) (define-public rust-wasm-bindgen-macro-0.2 (package -- cgit v1.2.3 From c6ce1477ea752ef813ab363aa90d3708044d1ec5 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 2 Feb 2020 01:50:52 +0300 Subject: gnu: Add rust-wasm-bindgen-test-crate-a-0.1. * gnu/packages/crates-io.scm (rust-wasm-bindgen-test-crate-a-0.1): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 647e62e2cf..a5d13cdaf1 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -19495,6 +19495,30 @@ attribute that is not in the shared backend crate.") ("rust-wasm-bindgen-futures" ,rust-wasm-bindgen-futures-0.3) ("rust-wasm-bindgen-test-macro" ,rust-wasm-bindgen-test-macro-0.2)))))) +(define-public rust-wasm-bindgen-test-crate-a-0.1 + (package + (name "rust-wasm-bindgen-test-crate-a") + (version "0.1.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "wasm-bindgen-test-crate-a" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "06l9rcxykg2vnp706a6axchjp6lh9ym1awwyyxzmbkv410kqwvsp")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2)))) + (home-page "https://github.com/rustwasm/wasm-bindgen") + (synopsis "Internal test crate for wasm-bindgen") + (description + "Internal test crate for wasm-bindgen.") + (license license:expat))) + (define-public rust-wasm-bindgen-test-macro-0.3 (package (name "rust-wasm-bindgen-test-macro") -- cgit v1.2.3 From bed6f02e51916e6dd25c6c148f52b291627ab513 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 2 Feb 2020 01:51:35 +0300 Subject: gnu: Add rust-wasm-bindgen-test-crate-b-0.1. * gnu/packages/crates-io.scm (rust-wasm-bindgen-test-crate-b-0.1): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index a5d13cdaf1..1dc52b42b1 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -19519,6 +19519,30 @@ attribute that is not in the shared backend crate.") "Internal test crate for wasm-bindgen.") (license license:expat))) +(define-public rust-wasm-bindgen-test-crate-b-0.1 + (package + (name "rust-wasm-bindgen-test-crate-b") + (version "0.1.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "wasm-bindgen-test-crate-b" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "16p3gx9vhngdf236zxx2qijqx5sq0lid25j8wy6j522ybxs4vbh8")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2)))) + (home-page "https://github.com/rustwasm/wasm-bindgen") + (synopsis "Internal test crate for wasm-bindgen") + (description + "Internal test crate for wasm-bindgen.") + (license (list license:expat license:asl2.0)))) + (define-public rust-wasm-bindgen-test-macro-0.3 (package (name "rust-wasm-bindgen-test-macro") -- cgit v1.2.3 From bf7ac9dc5574886b9e6f79d49356c2213a431338 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 2 Feb 2020 01:52:36 +0300 Subject: gnu: rust-js-sys-0.3: Update to 0.3.35. * gnu/packages/crates-io.scm (rust-js-sys-0.3): Update to 0.3.35. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 1dc52b42b1..caf20783f8 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -7807,7 +7807,7 @@ primitives to an @code{io::Write}.") (define-public rust-js-sys-0.3 (package (name "rust-js-sys") - (version "0.3.24") + (version "0.3.35") (source (origin (method url-fetch) @@ -7816,16 +7816,15 @@ primitives to an @code{io::Write}.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "045fgafggkjdfg4f33vb87silyl9xpbifrhx1ciqi4wvm90nzhga")))) + "1ybwazllkbif71i195dadgrsw64k6l04ggk5yimiy5c2cb1wg2bq")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2)) #:cargo-development-inputs - (("rust-futures" ,rust-futures-0.1) - ("rust-wasm-bindgen-futures" ,rust-wasm-bindgen-futures-0.3) - ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.2)))) + (("rust-wasm-bindgen-futures" ,rust-wasm-bindgen-futures-0.4) + ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3)))) (home-page "https://rustwasm.github.io/wasm-bindgen/") (synopsis "Bindings for all JS global objects and functions in WASM") (description -- cgit v1.2.3 From b8dbebdd733b1281eb8b76e05479d5758dc05d4e Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 2 Feb 2020 02:11:45 +0300 Subject: gnu: rust-wasm-bindgen-0.2: Update to 0.2.58. * gnu/packages/crates-io.scm (rust-wasm-bindgen-0.2, (rust-wasm-bindgen-backend-0.2, rust-wasm-bindgen-macro-0.2 rust-wasm-bindgen-macro-support-0.2, rust-wasm-bindgen-shared-0.2): Update to 0.2.58. They all update at the same time. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 63 +++++++++++++++++++++++++--------------------- 1 file changed, 35 insertions(+), 28 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index caf20783f8..6f9128e527 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -19247,7 +19247,7 @@ in Rust.") (define-public rust-wasm-bindgen-0.2 (package (name "rust-wasm-bindgen") - (version "0.2.48") + (version "0.2.58") (source (origin (method url-fetch) @@ -19256,15 +19256,23 @@ in Rust.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0m8vq3jkhz04fn3wjvb7ii7xql60w32nlvr10jcskcbbh2hpzsad")))) + "0v31s91andxcj73w63g3fkbw3ld6cfsaa4135qcjna22vypyj1aj")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-serde" ,rust-serde-1.0) - ("rust-serde-json" ,rust-serde-json-1.0) - ("rust-wasm-bindgen-macro" - ,rust-wasm-bindgen-macro-0.2)))) + `(#:cargo-inputs + (("rust-cfg-if" ,rust-cfg-if-0.1) + ("rust-serde" ,rust-serde-1.0) + ("rust-serde-json" ,rust-serde-json-1.0) + ("rust-wasm-bindgen-macro" ,rust-wasm-bindgen-macro-0.2)) + #:cargo-development-inputs + (("rust-js-sys" ,rust-js-sys-0.3) + ("rust-serde-derive" ,rust-serde-derive-1.0) + ("rust-wasm-bindgen-futures" ,rust-wasm-bindgen-futures-0.4) + ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3) + ("rust-wasm-bindgen-test-crate-a" + ,rust-wasm-bindgen-test-crate-a-0.1) + ("rust-wasm-bindgen-test-crate-b" + ,rust-wasm-bindgen-test-crate-b-0.1)))) (home-page "https://rustwasm.github.io/") (synopsis "Easy support for interacting between JS and Rust") (description @@ -19274,7 +19282,7 @@ in Rust.") (define-public rust-wasm-bindgen-backend-0.2 (package (name "rust-wasm-bindgen-backend") - (version "0.2.48") + (version "0.2.58") (source (origin (method url-fetch) @@ -19283,17 +19291,16 @@ in Rust.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1qxqkbjkjg4pphhcr91nk95c0gizx77dyq24mmijqnwzxxqc30jx")))) + "0icskn0qlj30np6x6nbyl1i9dndckx0pczaq69dm42r92rcbkk8i")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-bumpalo" ,rust-bumpalo-2.5) + `(#:cargo-inputs + (("rust-bumpalo" ,rust-bumpalo-3) ("rust-lazy-static" ,rust-lazy-static-1) ("rust-log" ,rust-log-0.4) - ("rust-proc-macro2" ,rust-proc-macro2-0.4) + ("rust-proc-macro2" ,rust-proc-macro2-1.0) ("rust-quote" ,rust-quote-1.0) - ("rust-syn" ,rust-syn-0.15) + ("rust-syn" ,rust-syn-1.0) ("rust-wasm-bindgen-shared" ,rust-wasm-bindgen-shared-0.2)))) (home-page "https://rustwasm.github.io/wasm-bindgen/") (synopsis "Backend code generation of the wasm-bindgen tool") @@ -19362,7 +19369,7 @@ in Rust.") (define-public rust-wasm-bindgen-macro-0.2 (package (name "rust-wasm-bindgen-macro") - (version "0.2.48") + (version "0.2.58") (source (origin (method url-fetch) @@ -19371,17 +19378,18 @@ in Rust.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "07fqzzlbncccmnxbbkg9v4n53qc1lps5g0bb9wq3i9zp9gvm0zgh")))) + "1hwxw0nhi2n4izhjn2fvnrrn59xqjxs3ybkgzdv1b4p65ivr8h2p")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t + `(#:tests? #f ; 'Async blocks are unstable' #:cargo-inputs (("rust-quote" ,rust-quote-1.0) ("rust-wasm-bindgen-macro-support" ,rust-wasm-bindgen-macro-support-0.2)) #:cargo-development-inputs (("rust-trybuild" ,rust-trybuild-1.0) - ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2)))) + ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2) + ("rust-wasm-bindgen-futures" ,rust-wasm-bindgen-futures-0.4)))) (home-page "https://rustwasm.github.io/wasm-bindgen/") (synopsis "Definition of the @code{#[wasm_bindgen]} attribute") (description @@ -19392,7 +19400,7 @@ dependency.") (define-public rust-wasm-bindgen-macro-support-0.2 (package (name "rust-wasm-bindgen-macro-support") - (version "0.2.48") + (version "0.2.58") (source (origin (method url-fetch) @@ -19401,14 +19409,13 @@ dependency.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1mxi6rj11k67sks88pfqiqylnijxmb1s0gcgpj8mzfj5gvkqzkwm")))) + "0s3n7v741i4wkzib41m126li40qlhqyirnxpigkypsi59wsk2l78")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-proc-macro2" ,rust-proc-macro2-0.4) + `(#:cargo-inputs + (("rust-proc-macro2" ,rust-proc-macro2-1.0) ("rust-quote" ,rust-quote-1.0) - ("rust-syn" ,rust-syn-0.15) + ("rust-syn" ,rust-syn-1.0) ("rust-wasm-bindgen-backend" ,rust-wasm-bindgen-backend-0.2) ("rust-wasm-bindgen-shared" ,rust-wasm-bindgen-shared-0.2)))) (home-page "https://rustwasm.github.io/wasm-bindgen/") @@ -19421,7 +19428,7 @@ attribute that is not in the shared backend crate.") (define-public rust-wasm-bindgen-shared-0.2 (package (name "rust-wasm-bindgen-shared") - (version "0.2.48") + (version "0.2.58") (source (origin (method url-fetch) @@ -19429,9 +19436,9 @@ attribute that is not in the shared backend crate.") (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "08rnfhjyk0f6liv8n4rdsvhx7r02glkhcbj2lp9lcbkbfpad9hnr")))) + "00cnbabf4k9bahb217vkilmjwqwzpwp112vlvgfw1x19r4gydrzm")))) (build-system cargo-build-system) - (arguments '(#:skip-build? #t)) + ;(arguments '(#:skip-build? #t)) (home-page "https://rustwasm.github.io/wasm-bindgen/") (synopsis "Shared support between wasm-bindgen and wasm-bindgen cli") (description "This package provides shared support between -- cgit v1.2.3 From d5eee77850c313d5bc235740f052cf1f08c166f6 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 2 Feb 2020 02:22:11 +0300 Subject: gnu: Add rust-wayland-sys-0.23. * gnu/packages/crates-io.scm (rust-wayland-sys-0.23): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 6f9128e527..220bcbfefd 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -19622,6 +19622,33 @@ attribute that is not in the shared backend crate.") "Support for parsing WebIDL specific to wasm-bindgen.") (license (list license:expat license:asl2.0)))) +(define-public rust-wayland-sys-0.23 + (package + (name "rust-wayland-sys") + (version "0.23.6") + (source + (origin + (method url-fetch) + (uri (crate-uri "wayland-sys" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1x2qafvj8hd2x5qfaan2dfpw9amg0f5g9sqrkdy7qvbddsl8jknr")))) + (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)))) + (home-page "https://github.com/smithay/wayland-rs") + (synopsis "FFI bindings to the various libwayland-*.so libraries") + (description + "FFI bindings to the various libwayland-*.so libraries. +You should only need this crate if you are working on custom wayland +protocol extensions. Look at the crate wayland-client for usable bindings.") + (license license:expat))) + (define-public rust-web-sys-0.3 (package (name "rust-web-sys") -- cgit v1.2.3 From 36908ef9f0af65bf32949a427c27410980d70b49 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 2 Feb 2020 02:23:33 +0300 Subject: gnu: Add rust-wayland-commons-0.23. * gnu/packages/crates-io.scm (rust-wayland-commons-0.23): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 220bcbfefd..a86e91cc86 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -19649,6 +19649,31 @@ You should only need this crate if you are working on custom wayland protocol extensions. Look at the crate wayland-client for usable bindings.") (license license:expat))) +(define-public rust-wayland-commons-0.23 + (package + (name "rust-wayland-commons") + (version "0.23.6") + (source + (origin + (method url-fetch) + (uri (crate-uri "wayland-commons" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1nyvcs6xxxzqgh0wvc7z0fgi89bf3h9p4qrbf77bnfbwlb8v0rmv")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-nix" ,rust-nix-0.14) + ("rust-wayland-sys" ,rust-wayland-sys-0.23)))) + (home-page "https://github.com/smithay/wayland-rs") + (synopsis + "Common types and structures used by wayland-client and wayland-server") + (description + "Common types and structures used by wayland-client and wayland-server.") + (license license:expat))) + (define-public rust-web-sys-0.3 (package (name "rust-web-sys") -- cgit v1.2.3 From 7d28b64dd9a0591aa86ec0a4f1b0cdb1c57d4700 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 2 Feb 2020 02:29:35 +0300 Subject: gnu: Add rust-wayland-scanner-0.23. * gnu/packages/crates-io.scm (rust-wayland-scanner-0.23): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index a86e91cc86..41728bf87e 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -19674,6 +19674,35 @@ protocol extensions. Look at the crate wayland-client for usable bindings.") "Common types and structures used by wayland-client and wayland-server.") (license license:expat))) +(define-public rust-wayland-scanner-0.23 + (package + (name "rust-wayland-scanner") + (version "0.23.6") + (source + (origin + (method url-fetch) + (uri (crate-uri "wayland-scanner" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0g8wcphykjrcpslznyi3qccx1pckw97rckq5b295nfbg6r3j5c4k")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-proc-macro2" ,rust-proc-macro2-0.4) + ("rust-quote" ,rust-quote-0.6) + ("rust-xml-rs" ,rust-xml-rs-0.8)))) + (home-page "https://github.com/smithay/wayland-rs") + (synopsis + "Wayland Scanner for generating rust APIs from XML wayland protocol files") + (description + "Wayland Scanner for generating rust APIs from XML wayland protocol files. +Intented for use with wayland-sys. You should only need this crate if +you are working on custom wayland protocol extensions. +Look at the crate wayland-client for usable bindings.") + (license license:expat))) + (define-public rust-web-sys-0.3 (package (name "rust-web-sys") -- cgit v1.2.3 From 63f130193510727ab7a3f6726f3c8e121dd33793 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 2 Feb 2020 02:30:31 +0300 Subject: gnu: Add rust-wayland-client-0.23. * gnu/packages/crates-io.scm (rust-wayland-client-0.23): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 41728bf87e..6ce3ee10e3 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -19649,6 +19649,42 @@ You should only need this crate if you are working on custom wayland protocol extensions. Look at the crate wayland-client for usable bindings.") (license license:expat))) +(define-public rust-wayland-client-0.23 + (package + (name "rust-wayland-client") + (version "0.23.6") + (source + (origin + (method url-fetch) + (uri (crate-uri "wayland-client" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1nmw2kz70llc5mxwzg6bglnqy0qnyr9224zjmq9czazgw3mq045g")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-calloop" ,rust-calloop-0.4) + ("rust-downcast-rs" ,rust-downcast-rs-1.1) + ("rust-libc" ,rust-libc-0.2) + ("rust-mio" ,rust-mio-0.6) + ("rust-nix" ,rust-nix-0.14) + ("rust-wayland-commons" ,rust-wayland-commons-0.23) + ("rust-wayland-sys" ,rust-wayland-sys-0.23) + ("rust-wayland-scanner" ,rust-wayland-scanner-0.23)) + #:cargo-development-inputs + (("rust-byteorder" ,rust-byteorder-1.3) + ("rust-tempfile" ,rust-tempfile-3.1)))) + (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-commons-0.23 (package (name "rust-wayland-commons") -- cgit v1.2.3 From 895bb1f7d24d41dde90de185abd9d37856dc7f43 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 2 Feb 2020 02:33:51 +0300 Subject: gnu: Add rust-wayland-server-0.23. * gnu/packages/crates-io.scm (rust-wayland-server-0.23): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 6ce3ee10e3..8f105ba1a5 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -19739,6 +19739,39 @@ you are working on custom wayland protocol extensions. Look at the crate wayland-client for usable bindings.") (license license:expat))) +(define-public rust-wayland-server-0.23 + (package + (name "rust-wayland-server") + (version "0.23.6") + (source + (origin + (method url-fetch) + (uri (crate-uri "wayland-server" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1ccsalq6gnf07klnbjx2dxcbibhw03rqsgi578p913s3zsjlcg8a")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-calloop" ,rust-calloop-0.4) + ("rust-downcast-rs" ,rust-downcast-rs-1.1) + ("rust-libc" ,rust-libc-0.2) + ("rust-mio" ,rust-mio-0.6) + ("rust-nix" ,rust-nix-0.14) + ("rust-wayland-commons" ,rust-wayland-commons-0.23) + ("rust-wayland-sys" ,rust-wayland-sys-0.23) + ("rust-wayland-scanner" ,rust-wayland-scanner-0.23)))) + (home-page "https://github.com/smithay/wayland-rs") + (synopsis + "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, server side.") + (license license:expat))) + (define-public rust-web-sys-0.3 (package (name "rust-web-sys") -- cgit v1.2.3 From 07a7f722e6d7e71cb0eac8a6f75d1e8e539195a0 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 2 Feb 2020 02:37:06 +0300 Subject: gnu: Add rust-wayland-protocols-0.23. * gnu/packages/crates-io.scm (rust-wayland-protocols-0.23): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 8f105ba1a5..25497bbb44 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -19710,6 +19710,34 @@ the wayland protocol, client side.") "Common types and structures used by wayland-client and wayland-server.") (license license:expat))) +(define-public rust-wayland-protocols-0.23 + (package + (name "rust-wayland-protocols") + (version "0.23.6") + (source + (origin + (method url-fetch) + (uri (crate-uri "wayland-protocols" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1ygwbzqlnks5xzafka3c8ag6k92g2h6ygj2xsmvjfx2n6rj8dhkc")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-wayland-client" ,rust-wayland-client-0.23) + ("rust-wayland-commons" ,rust-wayland-commons-0.23) + ("rust-wayland-server" ,rust-wayland-server-0.23) + ("rust-wayland-scanner" ,rust-wayland-scanner-0.23)))) + (home-page "https://github.com/smithay/wayland-rs") + (synopsis + "Generated API for the officials wayland protocol extensions") + (description + "Generated API for the officials wayland protocol extensions.") + (license license:expat))) + (define-public rust-wayland-scanner-0.23 (package (name "rust-wayland-scanner") -- cgit v1.2.3 From abd2e421d07490271a45c27063df8c5eef3c77fb Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 2 Feb 2020 02:39:46 +0300 Subject: gnu: Add rust-smithay-client-toolkit-0.6. * gnu/packages/crates-io.scm (rust-smithay-client-toolkit-0.6): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 25497bbb44..d413343159 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -15641,6 +15641,40 @@ stack.") #:cargo-development-inputs (("rust-bincode" ,rust-bincode-1.1)))))) +(define-public rust-smithay-client-toolkit-0.6 + (package + (name "rust-smithay-client-toolkit") + (version "0.6.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "smithay-client-toolkit" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0m20687zs36l6xak2s5k9s7qp78ly8xfjpbmrhacp7whfn4hx5lk")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-andrew" ,rust-andrew-0.2) + ("rust-bitflags" ,rust-bitflags-1) + ("rust-dlib" ,rust-dlib-0.4) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-memmap" ,rust-memmap-0.7) + ("rust-nix" ,rust-nix-0.14) + ("rust-wayland-client" ,rust-wayland-client-0.23) + ("rust-wayland-protocols" ,rust-wayland-protocols-0.23)) + #:cargo-development-inputs + (("rust-byteorder" ,rust-byteorder-1.3) + ("rust-image" ,rust-image-0.21) + ("rust-wayland-client" ,rust-wayland-client-0.23)))) + (home-page "https://github.com/smithay/client-toolkit") + (synopsis "Toolkit for making client wayland applications") + (description + "Toolkit for making client wayland applications.") + (license license:expat))) + (define-public rust-socket2-0.3 (package (name "rust-socket2") -- cgit v1.2.3 From 3571af3e0f3be2e0eadc53914e2a00fb7077615d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 27 Feb 2020 20:56:13 +0200 Subject: gnu: Add rust-console-log-0.1. * gnu/packages/crates-io.scm (rust-console-log-0.1): New variable. --- gnu/packages/crates-io.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index d413343159..191a786671 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2590,6 +2590,31 @@ harness.") that logs panics to @code{console.error}.") (license (list license:expat license:asl2.0)))) +(define-public rust-console-log-0.1 + (package + (name "rust-console-log") + (version "0.1.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "console-log" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0j1wd2885m3245bhsb2qjvw08lzplbi1rgg2v3yv0hbljk972y0y")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-log" ,rust-log-0.4) + ("rust-web-sys" ,rust-web-sys-0.3)))) + (home-page "https://github.com/iamcodemaker/console_log") + (synopsis "Route Rust log messages to the browser's console") + (description + "This package provides a logging facility that routes Rust log messages to +the browser's console.") + (license (list license:expat license:asl2.0)))) + (define-public rust-constant-time-eq-0.1 (package (name "rust-constant-time-eq") -- cgit v1.2.3 From 97d8c6cd1512cad0574d9737bd6d666061cadf1e Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 2 Feb 2020 02:41:00 +0300 Subject: gnu: Add rust-winit-0.20. * gnu/packages/crates-io.scm (rust-winit-0.20): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 61 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 191a786671..18719511a6 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -20142,6 +20142,67 @@ color in a Windows console.") (license (list license:unlicense license:expat)))) +(define-public rust-winit-0.20 + (package + (name "rust-winit") + (version "0.20.0-alpha6") + (source + (origin + (method url-fetch) + (uri (crate-uri "winit" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1g5cchl97zcg525j6jdr77yby8cmhwv1qqwcd3sf4l4zl263195z")) + (patches + (list + (origin + (method url-fetch) + (uri "https://github.com/rust-windowing/winit/commit/d1c6506865c7bddbb5fb4d80a613e43ddc1370b5.patch") + (file-name (string-append name "-fix-bindings.patch")) + (sha256 + (base32 + "03q4bvdq86kii53d0vsywv08g8vqirf9h1lz2cl6rcc7gjfynpds"))))))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-android-glue" ,rust-android-glue-0.2) + ("rust-bitflags" ,rust-bitflags-1) + ("rust-calloop" ,rust-calloop-0.4) + ("rust-cocoa" ,rust-cocoa-0.19) + ("rust-core-foundation" ,rust-core-foundation-0.6) + ("rust-core-graphics" ,rust-core-graphics-0.17) + ("rust-core-video-sys" ,rust-core-video-sys-0.1) + ("rust-dispatch" ,rust-dispatch-0.1) + ("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-objc" ,rust-objc-0.2) + ("rust-parking-lot" ,rust-parking-lot-0.10) + ("rust-percent-encoding" ,rust-percent-encoding-2.1) + ("rust-raw-window-handle" ,rust-raw-window-handle-0.3) + ("rust-serde" ,rust-serde-1.0) + ("rust-smithay-client-toolkit" ,rust-smithay-client-toolkit-0.6) + ("rust-stdweb" ,rust-stdweb-0.4) + ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2) + ("rust-wayland-client" ,rust-wayland-client-0.23) + ("rust-web-sys" ,rust-web-sys-0.3) + ("rust-winapi" ,rust-winapi-0.3) + ("rust-x11-dl" ,rust-x11-dl-2)) + #:cargo-development-inputs + (("rust-console-log" ,rust-console-log-0.1) + ("rust-env-logger" ,rust-env-logger-0.5) + ("rust-image" ,rust-image-0.21)))) + (home-page "https://github.com/rust-windowing/winit") + (synopsis + "Cross-platform window creation library") + (description + "Cross-platform window creation library.") + (license license:asl2.0))) + (define-public rust-winpty-sys-0.4 (package (name "rust-winpty-sys") -- cgit v1.2.3 From 41c4270724def1fd1f946e8b73c00d8f49edd1c0 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 2 Feb 2020 02:43:30 +0300 Subject: gnu: Add rust-glutin-0.22. * gnu/packages/crates-io.scm (rust-glutin-0.22): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 18719511a6..ba13289cdb 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6358,6 +6358,48 @@ the process of matching one or more glob patterns against a single candidate path simultaneously, and returning all of the globs that matched.") (license (list license:expat license:unlicense)))) +(define-public rust-glutin-0.22 + (package + (name "rust-glutin") + (version "0.22.0-alpha5") + (source + (origin + (method url-fetch) + (uri (crate-uri "glutin" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0lilr4f335m1fq1acmshd51zblfaglw1hha6lhalnc1fw3cg0aag")))) + (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.19) + ("rust-core-foundation" ,rust-core-foundation-0.6) + ("rust-core-graphics" ,rust-core-graphics-0.17) + ("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.5) + ("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.9) + ("rust-wayland-client" ,rust-wayland-client-0.23) + ("rust-winapi" ,rust-winapi-0.3) + ("rust-winit" ,rust-winit-0.20)))) + (home-page "https://github.com/tomaka/glutin") + (synopsis + "Cross-platform OpenGL context provider") + (description + "Cross-platform OpenGL context provider.") + (license license:asl2.0))) + (define-public rust-glutin-egl-sys-0.1 (package (name "rust-glutin-egl-sys") -- cgit v1.2.3 From d78c798bd70219307d6a7554d9380709fce7be87 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 2 Feb 2020 02:47:57 +0300 Subject: gnu: Add rust-wayland-sys-0.21. * gnu/packages/crates-io.scm (rust-wayland-sys-0.21): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index ba13289cdb..5bc939a098 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -19750,6 +19750,21 @@ You should only need this crate if you are working on custom wayland protocol extensions. Look at the crate wayland-client for usable bindings.") (license license:expat))) +(define-public rust-wayland-sys-0.21 + (package + (inherit rust-wayland-sys-0.23) + (name "rust-wayland-sys") + (version "0.21.13") + (source + (origin + (method url-fetch) + (uri (crate-uri "wayland-sys" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0a0ndgkg98pvmkv44yya4f7mxzjaxylknqh64bpa05w0azyv02jj")))))) + (define-public rust-wayland-client-0.23 (package (name "rust-wayland-client") -- cgit v1.2.3 From 75e4ad671307a2ab6d725738d84d7dc8d8ba2c15 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 2 Feb 2020 02:48:44 +0300 Subject: gnu: Add rust-wayland-scanner-0.21. * gnu/packages/crates-io.scm (rust-wayland-scanner-0.21): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 5bc939a098..cdf02bbce4 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -19883,6 +19883,21 @@ you are working on custom wayland protocol extensions. Look at the crate wayland-client for usable bindings.") (license license:expat))) +(define-public rust-wayland-scanner-0.21 + (package + (inherit rust-wayland-scanner-0.23) + (name "rust-wayland-scanner") + (version "0.21.13") + (source + (origin + (method url-fetch) + (uri (crate-uri "wayland-scanner" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "17mp49v7w0p0x5ry628lj2llljnwkr9aj9g4bqqhfibid32jhf5z")))))) + (define-public rust-wayland-server-0.23 (package (name "rust-wayland-server") -- cgit v1.2.3 From 7592c7c3e416f7c5199ec461840182067f4d9f83 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 2 Feb 2020 02:49:16 +0300 Subject: gnu: Add rust-wayland-commons-0.21. * gnu/packages/crates-io.scm (rust-wayland-commons-0.21): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index cdf02bbce4..643e634a25 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -19826,6 +19826,25 @@ the wayland protocol, client side.") "Common types and structures used by wayland-client and wayland-server.") (license license:expat))) +(define-public rust-wayland-commons-0.21 + (package + (inherit rust-wayland-commons-0.23) + (name "rust-wayland-commons") + (version "0.21.13") + (source + (origin + (method url-fetch) + (uri (crate-uri "wayland-commons" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1v1jpcsnn6cwwy5ii5pdl58i6b9slmi8mn4my4fpwrlbfsb8ih20")))) + (arguments + `(#:cargo-inputs + (("rust-nix" ,rust-nix-0.14) + ("rust-wayland-sys" ,rust-wayland-sys-0.21)))))) + (define-public rust-wayland-protocols-0.23 (package (name "rust-wayland-protocols") -- cgit v1.2.3 From 77f099aa5f2e8951a1ec45d77e4d83aa4b8a0aaa Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 2 Feb 2020 02:52:23 +0300 Subject: gnu: Add rust-wayland-client-0.21. * gnu/packages/crates-io.scm (rust-wayland-client-0.21): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 643e634a25..99c1e20355 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -19801,6 +19801,35 @@ protocol extensions. Look at the crate wayland-client for usable bindings.") the wayland protocol, client side.") (license license:expat))) +(define-public rust-wayland-client-0.21 + (package + (inherit rust-wayland-client-0.23) + (name "rust-wayland-client") + (version "0.21.13") + (source + (origin + (method url-fetch) + (uri (crate-uri "wayland-client" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "04r7dy074hhdalsi1day482wvmczr40hg7qvrnzkgxpakrgkx5j9")))) + (arguments + `(#:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-calloop" ,rust-calloop-0.4) + ("rust-downcast-rs" ,rust-downcast-rs-1.1) + ("rust-libc" ,rust-libc-0.2) + ("rust-mio" ,rust-mio-0.6) + ("rust-nix" ,rust-nix-0.14) + ("rust-wayland-commons" ,rust-wayland-commons-0.21) + ("rust-wayland-sys" ,rust-wayland-sys-0.21) + ("rust-wayland-scanner" ,rust-wayland-scanner-0.21)) + #:cargo-development-inputs + (("rust-byteorder" ,rust-byteorder-1.3) + ("rust-tempfile" ,rust-tempfile-3.1)))))) + (define-public rust-wayland-commons-0.23 (package (name "rust-wayland-commons") -- cgit v1.2.3 From 4bf64e891cfb4907332235c39346c95cf35bb555 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 2 Feb 2020 02:52:56 +0300 Subject: gnu: Add rust-wayland-server-0.21. * gnu/packages/crates-io.scm (rust-wayland-server-0.21): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 99c1e20355..c756b5575d 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -19979,6 +19979,32 @@ Look at the crate wayland-client for usable bindings.") the wayland protocol, server side.") (license license:expat))) +(define-public rust-wayland-server-0.21 + (package + (inherit rust-wayland-server-0.23) + (name "rust-wayland-server") + (version "0.21.13") + (source + (origin + (method url-fetch) + (uri (crate-uri "wayland-server" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0ayn4wlrpg0fw04prri9awpkjvbzjil0d3l3a8zs9pdbnspvw6ah")))) + (arguments + `(#:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-calloop" ,rust-calloop-0.4) + ("rust-downcast-rs" ,rust-downcast-rs-1.1) + ("rust-libc" ,rust-libc-0.2) + ("rust-mio" ,rust-mio-0.6) + ("rust-nix" ,rust-nix-0.14) + ("rust-wayland-commons" ,rust-wayland-commons-0.21) + ("rust-wayland-sys" ,rust-wayland-sys-0.21) + ("rust-wayland-scanner" ,rust-wayland-scanner-0.21)))))) + (define-public rust-web-sys-0.3 (package (name "rust-web-sys") -- cgit v1.2.3 From bef445485089689ba1ad124429d2d479a2831ba2 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 2 Feb 2020 02:53:10 +0300 Subject: gnu: Add rust-wayland-protocols-0.21. * gnu/packages/crates-io.scm (rust-wayland-protocols-0.21): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index c756b5575d..74f66d1e32 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -19902,6 +19902,29 @@ the wayland protocol, client side.") "Generated API for the officials wayland protocol extensions.") (license license:expat))) +(define-public rust-wayland-protocols-0.21 + (package + (inherit rust-wayland-protocols-0.23) + (name "rust-wayland-protocols") + (version "0.21.13") + (source + (origin + (method url-fetch) + (uri (crate-uri "wayland-protocols" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0i91yh3nxk9llhly2ly3nvlfx0lbpvyq919cgmnyx3j25bmf5zaa")))) + (arguments + `(#:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-wayland-client" ,rust-wayland-client-0.21) + ("rust-wayland-commons" ,rust-wayland-commons-0.21) + ("rust-wayland-server" ,rust-wayland-server-0.21) + ("rust-wayland-sys" ,rust-wayland-sys-0.21) + ("rust-wayland-scanner" ,rust-wayland-scanner-0.21)))))) + (define-public rust-wayland-scanner-0.23 (package (name "rust-wayland-scanner") -- cgit v1.2.3 From 78afc9a1bff4141e83ac545dfb85a307f937e330 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 2 Feb 2020 02:57:48 +0300 Subject: gnu: Add rust-smithay-client-toolkit-0.4. * gnu/packages/crates-io.scm (rust-smithay-client-toolkit-0.4): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 74f66d1e32..def0900177 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -15742,6 +15742,36 @@ stack.") "Toolkit for making client wayland applications.") (license license:expat))) +(define-public rust-smithay-client-toolkit-0.4 + (package + (inherit rust-smithay-client-toolkit-0.6) + (name "rust-smithay-client-toolkit") + (version "0.4.6") + (source + (origin + (method url-fetch) + (uri (crate-uri "smithay-client-toolkit" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1yj8yzd0lhqpsgq0x4iikl9a02q2hnkky81brk938alv0ibqrjrc")))) + (arguments + `(#:cargo-inputs + (("rust-andrew" ,rust-andrew-0.2) + ("rust-bitflags" ,rust-bitflags-1) + ("rust-dlib" ,rust-dlib-0.4) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-memmap" ,rust-memmap-0.7) + ("rust-nix" ,rust-nix-0.14) + ("rust-wayland-client" ,rust-wayland-client-0.21) + ("rust-wayland-commons" ,rust-wayland-commons-0.21) + ("rust-wayland-protocols" ,rust-wayland-protocols-0.21)) + #:cargo-development-inputs + (("rust-byteorder" ,rust-byteorder-1.3) + ("rust-image" ,rust-image-0.20) + ("rust-wayland-client" ,rust-wayland-client-0.21)))))) + (define-public rust-socket2-0.3 (package (name "rust-socket2") -- cgit v1.2.3 From b6bbd9f248882a04e881fde520df1048ecb59046 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 2 Feb 2020 02:59:04 +0300 Subject: gnu: Add rust-winit-0.19. * gnu/packages/crates-io.scm (rust-winit-0.19): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index def0900177..08e8bd2cb7 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -20402,6 +20402,42 @@ color in a Windows console.") "Cross-platform window creation library.") (license license:asl2.0))) +(define-public rust-winit-0.19 + (package + (inherit rust-winit-0.20) + (name "rust-winit") + (version "0.19.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "winit" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1a4lnfyvlc4jabhs30wlmkgdjv7qhbplmyp833kl7ykjni5yp5hy")))) + (arguments + `(#:cargo-inputs + (("rust-android-glue" ,rust-android-glue-0.2) + ("rust-backtrace" ,rust-backtrace-0.3) + ("rust-bitflags" ,rust-bitflags-1) + ("rust-cocoa" ,rust-cocoa-0.18) + ("rust-core-foundation" ,rust-core-foundation-0.6) + ("rust-core-graphics" ,rust-core-graphics-0.17) + ("rust-image" ,rust-image-0.21) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-libc" ,rust-libc-0.2) + ("rust-log" ,rust-log-0.4) + ("rust-objc" ,rust-objc-0.2) + ("rust-parking-lot" ,rust-parking-lot-0.9) + ("rust-percent-encoding" ,rust-percent-encoding-2.1) + ("rust-raw-window-handle" ,rust-raw-window-handle-0.3) + ("rust-serde" ,rust-serde-1.0) + ("rust-smithay-client-toolkit" ,rust-smithay-client-toolkit-0.4) + ("rust-wayland-client" ,rust-wayland-client-0.21) + ("rust-winapi" ,rust-winapi-0.3) + ("rust-x11-dl" ,rust-x11-dl-2)))))) + (define-public rust-winpty-sys-0.4 (package (name "rust-winpty-sys") -- cgit v1.2.3 From b4d0afdfbdf37f119e9d891368faf11417532477 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 2 Feb 2020 03:03:35 +0300 Subject: gnu: Add rust-metal-0.14. * gnu/packages/crates-io.scm (rust-metal-0.14): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 08e8bd2cb7..3137b9f172 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -9082,6 +9082,41 @@ for Rust structs.") "1cvm2z7dy138s302ii7wlzcxbka5a8yfl5pl5di7lbdnw9hw578g")))) (arguments `(#:skip-build? #t)))) +(define-public rust-metal-0.14 + (package + (name "rust-metal") + (version "0.14.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "metal" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0my1xwlv562i80y3jbk0nygayi383j5skdwk48clb286b7922gyd")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-block" ,rust-block-0.1) + ("rust-cocoa" ,rust-cocoa-0.18) + ("rust-core-graphics" ,rust-core-graphics-0.17) + ("rust-foreign-types" ,rust-foreign-types-0.3) + ("rust-libc" ,rust-libc-0.2) + ("rust-log" ,rust-log-0.4) + ("rust-objc" ,rust-objc-0.2) + ("rust-objc-foundation" ,rust-objc-foundation-0.1) + ("rust-objc-id" ,rust-objc-id-0.1)) + #:cargo-development-inputs + (("rust-sema" ,rust-sema-0.1) + ("rust-winit" ,rust-winit-0.19)))) ; 0.17? + (home-page "https://github.com/gfx-rs/metal-rs") + (synopsis "Rust bindings for Metal") + (description "Rust bindings for Metal.") + (license (list license:expat license:asl2.0)))) + (define-public rust-mime-0.3 (package (name "rust-mime") -- cgit v1.2.3 From 61de013c2451b4fdb6314b6c8d4e25b8c8a462ac Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 2 Feb 2020 03:04:34 +0300 Subject: gnu: Add rust-core-video-sys-0.1. * gnu/packages/crates-io.scm (rust-core-video-sys-0.1): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 3137b9f172..50e4f456ba 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2798,6 +2798,36 @@ intrinsics.") "Bindings to the Core Text framework.") (license (list license:expat license:asl2.0)))) +(define-public rust-core-video-sys-0.1 + (package + (name "rust-core-video-sys") + (version "0.1.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "core-video-sys" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1l59cg88482hkl95ssb30ac9x65hpbdsmxz9s5r6y222jlhnbh4d")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t ; only for macOS + #:cargo-inputs + (("rust-cfg-if" ,rust-cfg-if-0.1) + ("rust-core-foundation-sys" ,rust-core-foundation-sys-0.6) + ("rust-core-graphics" ,rust-core-graphics-0.17) + ("rust-libc" ,rust-libc-0.2) + ("rust-metal" ,rust-metal-0.14) + ("rust-objc" ,rust-objc-0.2)))) + (home-page "https://github.com/luozijun/rust-core-video-sys") + (synopsis + "Bindings to CoreVideo.framework for macOS and iOS") + (description + "Bindings to CoreVideo.framework for macOS and iOS.") + (license license:expat))) + (define-public rust-crates-index-0.13 (package (name "rust-crates-index") -- cgit v1.2.3 From da9c2c1bc408184070eb124b6ac431696ae894cb Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 2 Feb 2020 03:06:39 +0300 Subject: gnu: Add rust-glutin-0.21. * gnu/packages/crates-io.scm (rust-glutin-0.21): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 50e4f456ba..efe8d7eea3 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6430,6 +6430,41 @@ path simultaneously, and returning all of the globs that matched.") "Cross-platform OpenGL context provider.") (license license:asl2.0))) +(define-public rust-glutin-0.21 + (package + (inherit rust-glutin-0.22) + (name "rust-glutin") + (version "0.21.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "glutin" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1ggyyqn7dvz4yx5ygqfvnxwfb78wvdm5y6xqw5my1b4x61dv6wak")))) + (arguments + `(#:cargo-inputs + (("rust-android-glue" ,rust-android-glue-0.2) + ("rust-cgl" ,rust-cgl-0.2) + ("rust-cocoa" ,rust-cocoa-0.18) + ("rust-core-foundation" ,rust-core-foundation-0.6) + ("rust-core-graphics" ,rust-core-graphics-0.17) + ("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.5) + ("rust-objc" ,rust-objc-0.2) + ("rust-osmesa-sys" ,rust-osmesa-sys-0.1) + ("rust-parking-lot" ,rust-parking-lot-0.9) + ("rust-wayland-client" ,rust-wayland-client-0.21) + ("rust-winapi" ,rust-winapi-0.3) + ("rust-winit" ,rust-winit-0.19)))))) + (define-public rust-glutin-egl-sys-0.1 (package (name "rust-glutin-egl-sys") -- cgit v1.2.3 From a9e090cba0f4d8536142ebe6e03548c5e204e4dc Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 2 Feb 2020 03:09:37 +0300 Subject: gnu: Add rust-glium-0.25. * gnu/packages/crates-io.scm (rust-glium-0.25): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index efe8d7eea3..6cc0a60c4e 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6315,6 +6315,44 @@ reading and writing git repositories.") "Generated OpenGL bindings and wrapper for Servo.") (license (list license:asl2.0 license:expat)))) +(define-public rust-glium-0.25 + (package + (name "rust-glium") + (version "0.25.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "glium" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0mhjly07x10lxg802ppg16wbxddhh4fdnlg10i99qwpfamvqhzbd")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-backtrace" ,rust-backtrace-0.3) + ("rust-fnv" ,rust-fnv-1.0) + ("rust-glutin" ,rust-glutin-0.21) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-smallvec" ,rust-smallvec-0.6) + ("rust-takeable-option" ,rust-takeable-option-0.4)) + #:cargo-development-inputs + (("rust-cgmath" ,rust-cgmath-0.17) + ("rust-genmesh" ,rust-genmesh-0.6) + ("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))) + (define-public rust-glob-0.3 (package (name "rust-glob") -- cgit v1.2.3 From eadeca1f6b01d6f2972e696a103869d1de809370 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 2 Feb 2020 03:10:49 +0300 Subject: gnu: Add rust-rusttype-0.7. * gnu/packages/crates-io.scm (rust-rusttype-0.7): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 6cc0a60c4e..4d008cb78b 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -14325,6 +14325,32 @@ It also provides an implementation of a dynamic GPU glyph cache for hardware font rendering.") (license (list license:expat license:asl2.0)))) +(define-public rust-rusttype-0.7 + (package + (inherit rust-rusttype-0.8) + (name "rust-rusttype") + (version "0.7.9") + (source + (origin + (method url-fetch) + (uri (crate-uri "rusttype" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1m9ms4p94cgif74y1rzkj04rx8i1la193c0jgvnip61rd904429i")))) + (arguments + `(#:tests? #f ; Artifacts for tests not included. + #:cargo-inputs + (("rust-rusttype" ,rust-rusttype-0.8)) + #:cargo-development-inputs + (("rust-arrayvec" ,rust-arrayvec-0.4) + ("rust-blake2" ,rust-blake2-0.8) + ("rust-glium" ,rust-glium-0.25) + ("rust-image" ,rust-image-0.21) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-unicode-normalization" ,rust-unicode-normalization-0.1)))))) + (define-public rust-rustversion-1.0 (package (name "rust-rustversion") -- cgit v1.2.3 From fbbd94bec9a8819c5dfcbe2c84e34d0b7e49182b Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 2 Feb 2020 03:12:14 +0300 Subject: gnu: Add rust-andrew-0.2. * gnu/packages/crates-io.scm (rust-andrew-0.2): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 4d008cb78b..488257f5b4 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -30,6 +30,7 @@ #:use-module (gnu packages) #:use-module (gnu packages compression) #:use-module (gnu packages fontutils) + #:use-module (gnu packages freedesktop) #:use-module (gnu packages jemalloc) #:use-module (gnu packages llvm) #:use-module (gnu packages pcre) @@ -216,6 +217,39 @@ Rust, using gimli.") ("rust-rand" ,rust-rand-0.3) ("rust-rustc-serialize" ,rust-rustc-serialize-0.3)))))) +(define-public rust-andrew-0.2 + (package + (name "rust-andrew") + (version "0.2.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "andrew" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0pmklwcwy8g1jras46fz8xcny779zfqpg4riksrbdhkjk3w0jzwv")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-line-drawing" ,rust-line-drawing-0.7) + ("rust-rusttype" ,rust-rusttype-0.7) + ("rust-walkdir" ,rust-walkdir-2.2) + ("rust-xdg" ,rust-xdg-2.2) + ("rust-xml-rs" ,rust-xml-rs-0.8)) + #:cargo-development-inputs + (("rust-smithay-client-toolkit" ,rust-smithay-client-toolkit-0.4)))) + (inputs + `(("wayland" ,wayland))) + (home-page "https://github.com/trimental/andrew") + (synopsis "Provides convenient drawing of objects to buffers") + (description + "The @code{andrew} crate provides convenient drawing of objects such as +shapes, lines and text to buffers.") + (license license:expat))) + (define-public rust-android-glue-0.2 (package (name "rust-android-glue") -- cgit v1.2.3 From 337b4212e6172b00ea805c83a4067a8c6a2194fa Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 2 Feb 2020 03:42:39 +0300 Subject: gnu: Add rust-security-framework-0.3. * gnu/packages/crates-io.scm (rust-security-framework-0.3): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 488257f5b4..50f25fbeff 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -14770,6 +14770,37 @@ Pwrite traits from the scroll crate.") proven statistical guarantees.") (license license:expat))) +(define-public rust-security-framework-0.3 + (package + (name "rust-security-framework") + (version "0.3.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "security-framework" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1pqn79cl9njnnhsmjvvphkzx8is5jhfd8bhxpllgvrgggjfl5wlf")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; Some test files not included in release. + #:cargo-inputs + (("rust-core-foundation" ,rust-core-foundation-0.6) + ("rust-core-foundation-sys" ,rust-core-foundation-sys-0.6) + ("rust-libc" ,rust-libc-0.2) + ("rust-security-framework-sys" ,rust-security-framework-sys-0.3)) + #:cargo-development-inputs + (("rust-hex" ,rust-hex-0.4) + ("rust-tempdir" ,rust-tempdir-0.3)))) + (home-page "https://lib.rs/crates/security_framework") + (synopsis + "Security.framework bindings for macOS and iOS") + (description + "Security.framework bindings for macOS and iOS.") + (license (list license:expat license:asl2.0)))) + (define-public rust-security-framework-sys-0.3 (package (name "rust-security-framework-sys") -- cgit v1.2.3 From e4c27df85b5187236ac5c452020c1a5e495c69b3 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 2 Feb 2020 03:40:00 +0300 Subject: gnu: Add rust-simd-0.1. * gnu/packages/crates-io.scm (rust-simd-0.1): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 50f25fbeff..cc4fa442fb 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -15795,6 +15795,28 @@ CPUs, as well as raw interfaces to platform-specific instructions. ") (license (list license:expat license:asl2.0)))) +(define-public rust-simd-0.1 + (package + (inherit rust-simd-0.2) + (name "rust-simd") + (version "0.1.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "simd" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "08vhhz1w5m7amfp1d9lvfyyzl0jqjm82hrr7fb7afv3n5my89db3")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-serde" ,rust-serde-0.4) + ("rust-serde-macros" ,rust-serde-macros-0.4)) + #:cargo-development-inputs + (("rust-cfg-if" ,rust-cfg-if-0.1)))))) + (define-public rust-siphasher-0.2 (package (name "rust-siphasher") -- cgit v1.2.3 From 46f89491634149488fd14034d7ef9df94ab4c9de Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 2 Feb 2020 03:15:28 +0300 Subject: gnu: Add rust-instant-0.1. * gnu/packages/crates-io.scm (rust-instant-0.1): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index cc4fa442fb..e1bded118b 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -7751,6 +7751,36 @@ in Rust.") "This package provides a snapshot testing library for Rust.") (license license:asl2.0))) +(define-public rust-instant-0.1 + (package + (name "rust-instant") + (version "0.1.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "instant" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1bwca9fr29a1pyimfl94q6m6k2l57ljw1hhhvjafzs1zkqlnqd3c")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-stdweb" ,rust-stdweb-0.4) + ("rust-time" ,rust-time-0.1) + ("rust-web-sys" ,rust-web-sys-0.3)) + #:cargo-development-inputs + (("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.2)))) + (home-page "https://github.com/sebcrozet/instant") + (synopsis + "Partial replacement for std::time::Instant that works on WASM too") + (description + "This package provides a partial replacement for @code{std::time::Instant} +that works on WASM too.") + (license license:bsd-3))) + (define-public rust-intervaltree-0.2 (package (name "rust-intervaltree") -- cgit v1.2.3 From 293334468b693bc0d10c9a3de7b1b68721cfcb95 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 2 Feb 2020 03:12:40 +0300 Subject: gnu: Add rust-smithay-clipboard-0.3. * gnu/packages/crates-io.scm (rust-smithay-clipboard-0.3): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index e1bded118b..883c64fd90 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -16053,6 +16053,35 @@ stack.") ("rust-image" ,rust-image-0.20) ("rust-wayland-client" ,rust-wayland-client-0.21)))))) +(define-public rust-smithay-clipboard-0.3 + (package + (name "rust-smithay-clipboard") + (version "0.3.6") + (source + (origin + (method url-fetch) + (uri (crate-uri "smithay-clipboard" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1h7qhcx44cgwncgpn5llky0c56vgsg9mqrkybb2z37vsxxia4rwn")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-nix" ,rust-nix-0.14) + ("rust-smithay-client-toolkit" ,rust-smithay-client-toolkit-0.6)) + #:cargo-development-inputs + (("rust-andrew" ,rust-andrew-0.2)))) + (inputs + `(("wayland" ,wayland))) + (home-page "https://github.com/smithay/smithay-clipboard") + (synopsis + "Provides access to the wayland clipboard for client applications") + (description + "This package provides access to the wayland clipboard for client applications.") + (license license:expat))) + (define-public rust-socket2-0.3 (package (name "rust-socket2") -- cgit v1.2.3 From 7cb8191cce7b3b38fc75efa44c38417ab6853ea3 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 2 Feb 2020 03:43:52 +0300 Subject: gnu: Add rust-native-tls-0.2. * gnu/packages/crates-io.scm (rust-native-tls-0.2): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 883c64fd90..bcee89b2b2 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -9684,6 +9684,52 @@ checking.") IO of Windows's named pipes.") (license (list license:expat license:asl2.0)))) +(define-public rust-native-tls-0.2 + (package + (name "rust-native-tls") + (version "0.2.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "native-tls" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0ki7cj4wzyd2nach4qdjly69sp7rs0yz3n3z2ii4mm1gqajg2bab")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; tests require network access + #:cargo-inputs + (("rust-lazy-static" ,rust-lazy-static-1) + ("rust-libc" ,rust-libc-0.2) + ("rust-log" ,rust-log-0.4) + ("rust-openssl" ,rust-openssl-0.10) + ("rust-openssl-probe" ,rust-openssl-probe-0.1) + ("rust-openssl-sys" ,rust-openssl-sys-0.9) + ("rust-schannel" ,rust-schannel-0.1) + ("rust-security-framework" ,rust-security-framework-0.3) + ("rust-security-framework-sys" ,rust-security-framework-sys-0.3) + ("rust-tempfile" ,rust-tempfile-3.1)) + #:cargo-development-inputs + (("rust-hex" ,rust-hex-0.3)) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'find-openssl + (lambda* (#:key inputs #:allow-other-keys) + (let ((openssl (assoc-ref inputs "openssl"))) + (setenv "OPENSSL_DIR" openssl)) + #t))))) + (native-inputs + `(("openssl" ,openssl) + ("pkg-config" ,pkg-config))) + (home-page "https://github.com/sfackler/rust-native-tls") + (synopsis + "Wrapper over a platform's native TLS implementation") + (description + "This package provides a wrapper over a platform's native TLS implementation.") + (license (list license:expat license:asl2.0)))) + (define-public rust-natord-1.0 (package (name "rust-natord") -- cgit v1.2.3 From d082ffe2c312f511ab1f77ad68374b725c1b194a Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 2 Feb 2020 03:44:17 +0300 Subject: gnu: Add rust-http-req-0.5. * gnu/packages/crates-io.scm (rust-http-req-0.5): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/crates-io.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index bcee89b2b2..3352bfa4a2 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -7320,6 +7320,33 @@ compile time.") requests and responses.") (license (list license:asl2.0 license:expat)))) +(define-public rust-http-req-0.5 + (package + (name "rust-http-req") + (version "0.5.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "http_req" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0qaw43nwvvxbnqddxhb9fh9316dn64nmkzj08pq8n49qdy51xrys")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + ;; Haven't packaged rustls and webpki because of license + (("rust-native-tls" ,rust-native-tls-0.2) + ("rust-unicase" ,rust-unicase-2.4)))) + (home-page "https://github.com/jayjamesjay/http_req") + (synopsis + "HTTP client with built-in HTTPS support") + (description + "Simple and lightweight HTTP client with built-in HTTPS support.") + (license license:expat))) + (define-public rust-httparse-1.3 (package (name "rust-httparse") -- cgit v1.2.3 From 22e928003d417cb08f268d823007330ed2852a33 Mon Sep 17 00:00:00 2001 From: Valentin Ignatev Date: Sun, 2 Feb 2020 21:31:24 +0300 Subject: gnu: Add alacritty. * gnu/packages/terminals.scm (alacritty): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/terminals.scm | 182 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 182 insertions(+) diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index 885912be41..482e9e8d1b 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -18,6 +18,7 @@ ;;; Copyright © 2019 Pierre Langlois ;;; Copyright © 2019 Brett Gilio ;;; Copyright © 2020 Jakub Kądziołka +;;; Copyright © 2020 Valentin Ignatev ;;; ;;; This file is part of GNU Guix. ;;; @@ -36,6 +37,7 @@ (define-module (gnu packages terminals) #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix build-system cargo) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) #:use-module (guix build-system glib-or-gtk) @@ -47,7 +49,9 @@ #:use-module (gnu packages) #:use-module (gnu packages autotools) #:use-module (gnu packages check) + #:use-module (gnu packages cmake) #:use-module (gnu packages compression) + #:use-module (gnu packages crates-io) #:use-module (gnu packages crypto) #:use-module (gnu packages docbook) #:use-module (gnu packages fontutils) @@ -1141,3 +1145,181 @@ while also supporting native scrolling and @command{tmux} control mode an st fork using wld. st is a simple terminal emulator for X originally made by suckless.") (license license:x11))) + +(define-public alacritty + (package + (name "alacritty") + (version "0.4.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jwilm/alacritty.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "05jcg33ifngpzw2hdhgb614j87ihhhlqgar0kky183rywg0dxikg")) + (modules '((guix build utils))) + (snippet + ;; Don't use a custom location for winit-0.20-alpha6. + '(begin (substitute* "Cargo.toml" + (("winit .*") "")) + #t)))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-clap" ,rust-clap-2) + ("rust-log" ,rust-log-0.4) + ("rust-time" ,rust-time-0.1) + ("rust-env-logger" ,rust-env-logger-0.7) + ("rust-serde" ,rust-serde-1.0) + ("rust-serde-yaml" ,rust-serde-yaml-0.8) + ("rust-serde-json" ,rust-serde-json-1.0) + ("rust-glutin" ,rust-glutin-0.22) ; adjust 'patch-glutin-libgl-path as needed + ("rust-notify" ,rust-notify-4) + ("rust-libc" ,rust-libc-0.2) + ("rust-unicode-width" ,rust-unicode-width-0.1) + ("rust-parking-lot" ,rust-parking-lot-0.9) + ("rust-urlocator" ,rust-urlocator-0.1) + ("rust-xdg" ,rust-xdg-2.2) + ("rust-image" ,rust-image-0.22) + ("rust-dirs" ,rust-dirs-2.0) + ("rust-x11-dl" ,rust-x11-dl-2) + ("rust-winapi" ,rust-winapi-0.3) + ("rust-base64" ,rust-base64-0.11) + ("rust-bigflags" ,rust-bitflags-1) + ("rust-fnv" ,rust-fnv-1.0) + ("rust-mio" ,rust-mio-0.6) + ("rust-mio-extras" ,rust-mio-extras-2) + ("rust-terminfo" ,rust-terminfo-0.6) + ("rust-url" ,rust-url-2.1) + ("rust-vte" ,rust-vte-0.3) + ("rust-nix" ,rust-nix-0.15) + ("rust-miow" ,rust-miow-0.3) + ("rust-mio-anonymous-pipes" ,rust-mio-anonymous-pipes-0.1) + ("rust-mio-named-pipes" ,rust-mio-named-pipes-0.1) + ("rust-signal-hook" ,rust-signal-hook-0.1) + ("rust-clipboard-win" ,rust-clipboard-win-2.1) + ("rust-objc" ,rust-objc-0.2) + ("rust-objc-id" ,rust-objc-id-0.1) + ("rust-objc-foundation" ,rust-objc-foundation-0.1) + ("rust-x11-clipboard" ,rust-x11-clipboard-0.4) + ("rust-smithay-clipboard" ,rust-smithay-clipboard-0.3) + ("rust-wayland-client" ,rust-wayland-client-0.23) + ("rust-euclid" ,rust-euclid-0.20) + ("rust-foreign-types" ,rust-foreign-types-0.5) + ("rust-servo-fontconfig" ,rust-servo-fontconfig-0.4) + ("rust-freetype-rs" ,rust-freetype-rs-0.23) + ("rust-core-foundation" ,rust-core-foundation-0.6) + ("rust-core-foundation-sys" ,rust-core-foundation-sys-0.6) + ("rust-core-text" ,rust-core-text-13) + ("rust-core-graphics" ,rust-core-graphics-0.17) + ("rust-dwrote" ,rust-dwrote-0.9) + ("rust-winpty-sys" ,rust-winpty-sys-0.4)) + #:cargo-development-inputs + (("rust-rustc-tools-util" ,rust-rustc-tools-util-0.2) + ("rust-gl-generator" ,rust-gl-generator-0.14) + ("rust-andrew" ,rust-andrew-0.2) + ("rust-smithay-client-toolkit" ,rust-smithay-client-toolkit-0.6) + ("rust-embed-resource" ,rust-embed-resource-1.3) + ("rust-http-req" ,rust-http-req-0.5) + ("rust-zip" ,rust-zip-0.5) + ("rust-tempfile" ,rust-tempfile-3.1) + ("rust-named-pipe" ,rust-named-pipe-0.4) + ("rust-winapi" ,rust-winapi-0.3)) + #:phases + (modify-phases %standard-phases + (add-after 'configure 'patch-glutin-libgl-path + (lambda* (#:key inputs cargo-inputs vendor-dir #:allow-other-keys) + (let* ((glutin-name ,(package-name rust-glutin-0.22)) + (glutin-version ,(package-version rust-glutin-0.22)) + (src-api + (string-append + glutin-name "-" glutin-version ".tar.gz/src/api/")) + (mesa (assoc-ref inputs "mesa"))) + (substitute* (string-append vendor-dir "/" src-api "glx/mod.rs") + (("libGL.so") (string-append mesa "/lib/libGL.so"))) + (substitute* (string-append vendor-dir "/" src-api "egl/mod.rs") + (("libEGL.so") (string-append mesa "/lib/libEGL.so"))) + #t))) + (add-after 'configure 'remove-alacritty-vendor + (lambda* (#:key vendor-dir #:allow-other-keys) + ;; We don't want Alacritty to be a dependency of itself + ;; If we don't delete it from guix-vendor then build will fail + ;; because Alacritty has a virtual workspace Cargo.toml. + (delete-file-recursively + (string-append vendor-dir "/alacritty-" ,version ".tar.xz")) + #t)) + (replace 'install + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (share (string-append out "/share")) + (icons (string-append share "/icons/hicolor/scalable/apps")) + (tic (string-append (assoc-ref inputs "ncurses") "/bin/tic")) + (man (string-append share "/man/man1")) + (alacritty-bin "target/release/alacritty")) + + ;; Install binary + (install-file alacritty-bin (string-append out "/bin")) + + ;; Install man pages + (mkdir-p man) + (copy-file "extra/alacritty.man" + (string-append man "/alacritty.1")) + + ;; Install desktop file + (install-file "extra/linux/alacritty.desktop" + (string-append share "/applications")) + + ;; Install icon + (mkdir-p icons) + (copy-file "extra/logo/alacritty-term.svg" + (string-append icons "/Alacritty.svg")) + + ;; Install terminfo + (mkdir-p (string-append share "/terminfo")) + ;; We don't compile alacritty-common entry because + ;; it's being used only for inheritance. + (invoke tic "-x" "-e" "alacritty,alacritty-direct" + "-o" (string-append share "/terminfo/") + "extra/alacritty.info") + + ;; Install completions + (install-file + "extra/completions/alacritty.bash" + (string-append out "/etc/bash_completion.d")) + (install-file + "extra/completions/_alacritty" + (string-append share "/zsh/site-functions")) + (install-file + "extra/completions/alacritty.fish" + (string-append share "/fish/vendor_completions.d")) + #t)))))) + (inputs + `(("expat" ,expat) + ("fontconfig" ,fontconfig) + ("freetype" ,freetype) + ("libx11" ,libx11) + ("libxcb" ,libxcb) + ("libxcursor" ,libxcursor) + ("libxi" ,libxi) + ("libxkbcommon" ,libxkbcommon) + ("libxrandr" ,libxrandr) + ("libxxf86vm" ,libxxf86vm) + ("wayland" ,wayland) + ("mesa" ,mesa))) + (native-inputs + `(("cmake" ,cmake) + ("ncurses" ,ncurses) + ("pkg-config" ,pkg-config) + ("python3" ,python))) + (home-page "https://github.com/alacritty/alacritty") + (synopsis "GPU-accelerated terminal emulator") + (description + "Alacritty is a GPU-accelerated terminal emulator with a strong focus on +simplicity and performance. With such a strong focus on performance, included +features are carefully considered and you can always expect Alacritty to be +blazingly fast. By making sane choices for defaults, Alacritty requires no +additional setup. However, it does allow configuration of many aspects of the +terminal. Note that you need support for OpenGL 3.2 or higher.") + (license license:asl2.0))) -- cgit v1.2.3 From ba8992d28b1616d05b7cb04ef032944c5d19cd5a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 27 Feb 2020 21:29:32 +0200 Subject: gnu: emacs-edbi: Fix build. * gnu/packages/emacs-xyz.scm (emacs-edbi)[arguments]: Fix emacs install directory. --- gnu/packages/emacs-xyz.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 76b9746f69..ec43efe182 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -8,7 +8,7 @@ ;;; Copyright © 2016, 2017, 2018, 2019 Chris Marusich ;;; Copyright © 2015, 2016, 2018 Christopher Lemmer Webber ;;; Copyright © 2016 Adriano Peluso -;;; Copyright © 2016, 2017, 2018, 2019 Efraim Flashner +;;; Copyright © 2016, 2017, 2018, 2019, 2020 Efraim Flashner ;;; Copyright © 2016 David Thompson ;;; Copyright © 2016 Matthew Jordan ;;; Copyright © 2016, 2017 Roel Janssen @@ -17407,8 +17407,7 @@ asynchronous communications, the RPC response is fairly good.") (lambda* (#:key inputs outputs #:allow-other-keys) (let ((perl (assoc-ref inputs "perl")) (dir (string-append (assoc-ref outputs "out") - "/share/emacs/site-lisp/guix.d/edbi-" - ,version))) + "/share/emacs/site-lisp"))) (substitute* (string-append dir "/edbi.el") (("\"perl\"") (string-append "\"" perl "/bin/perl\""))) (chmod (string-append dir "/edbi-bridge.pl") #o555) -- cgit v1.2.3 From 579235562d6b6551f20a1a5c18e88d4ec0aee542 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 27 Feb 2020 21:35:45 +0200 Subject: gnu: emacs-flycheck-grammalecte: Fix build. * gnu/packages/emacs-xyz.scm (emacs-flycheck-grammalecte)[arguments]: Fix emacs install directory. --- gnu/packages/emacs-xyz.scm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index ec43efe182..db02fb0a72 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -3435,9 +3435,7 @@ for Flow files.") (out (assoc-ref outputs "out")) (version ,(version-major+minor (package-version python)))) (with-directory-excursion - (string-append out - "/share/emacs/site-lisp/guix.d/" - "flycheck-grammalecte-" ,version) + (string-append out "/share/emacs/site-lisp") (symlink (string-append grammalecte "/lib/" "python" version "/site-packages/" "grammalecte") -- cgit v1.2.3 From 4714d0fc1a96eb6d421b64b0b585fe8043dcd07b Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 5 Dec 2019 13:40:32 +0900 Subject: gnu: emacs: Byte compile the site-lisp directory. * gnu/packages/emacs.scm (emacs): Use the (gnu build emacs-utils) module. Byte compile the site-lisp directory as part of the 'install-site-start' phase. (emacs-minimal, emacs-xwidgets, emacs-no-x, emacs-no-x-toolkit): Reset modules to those of the gnu-build-system. --- gnu/packages/emacs.scm | 43 +++++++++++++++++++++++++++++++++++++++---- 1 file changed, 39 insertions(+), 4 deletions(-) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index b26c928e87..18c8549cb9 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -129,6 +129,11 @@ `(#:tests? #f ; no check target #:configure-flags (list "--with-modules" "--disable-build-details") + #:modules ((guix build emacs-utils) + (guix build glib-or-gtk-build-system) + (guix build utils)) + #:imported-modules ((guix build emacs-utils) + ,@%glib-or-gtk-build-system-modules) #:phases (modify-phases %standard-phases (add-before 'configure 'fix-/bin/pwd @@ -145,7 +150,8 @@ ;; automatically found. (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) - (lisp-dir (string-append out "/share/emacs/site-lisp"))) + (lisp-dir (string-append out "/share/emacs/site-lisp")) + (emacs (string-append out "/bin/emacs"))) (copy-file (assoc-ref inputs "guix-emacs.el") (string-append lisp-dir "/guix-emacs.el")) (with-output-to-file (string-append lisp-dir "/site-start.el") @@ -158,6 +164,9 @@ ;; share/emacs/site-lisp union when added to EMACSLOADPATH, ;; which leads to conflicts. (delete-file (string-append lisp-dir "/subdirs.el")) + ;; Byte compile the site-start files. + (parameterize ((%emacs emacs)) + (emacs-byte-compile-directory lisp-dir)) #t)))))) (inputs `(("gnutls" ,gnutls) @@ -326,6 +335,12 @@ languages.") (build-system gnu-build-system) (arguments (substitute-keyword-arguments (package-arguments emacs) + ((#:modules _) + `((guix build emacs-utils) + ,@%gnu-build-system-modules)) + ((#:imported-modules _) + `((guix build emacs-utils) + ,@%gnu-build-system-modules)) ((#:phases phases) `(modify-phases ,phases (delete 'install-site-start))) @@ -345,6 +360,12 @@ editor (with xwidgets support)") (build-system gnu-build-system) (arguments (substitute-keyword-arguments (package-arguments emacs) + ((#:modules _) + `((guix build emacs-utils) + ,@%gnu-build-system-modules)) + ((#:imported-modules _) + `((guix build emacs-utils) + ,@%gnu-build-system-modules)) ((#:configure-flags flags ''()) `(cons "--with-xwidgets" ,flags)))) (inputs @@ -358,6 +379,14 @@ editor (with xwidgets support)") (synopsis "The extensible, customizable, self-documenting text editor (console only)") (build-system gnu-build-system) + (arguments + (substitute-keyword-arguments (package-arguments emacs) + ((#:modules _) + `((guix build emacs-utils) + ,@%gnu-build-system-modules)) + ((#:imported-modules _) + `((guix build emacs-utils) + ,@%gnu-build-system-modules)))) (inputs (fold alist-delete (package-inputs emacs) '("libx11" "gtk+" "libxft" "libtiff" "giflib" "libjpeg" @@ -376,9 +405,15 @@ editor (without an X toolkit)" ) (inputs (append `(("inotify-tools" ,inotify-tools)) (alist-delete "gtk+" (package-inputs emacs)))) (arguments - `(,@(substitute-keyword-arguments (package-arguments emacs) - ((#:configure-flags cf) - `(cons "--with-x-toolkit=no" ,cf))))))) + (substitute-keyword-arguments (package-arguments emacs) + ((#:modules _) + `((guix build emacs-utils) + ,@%gnu-build-system-modules)) + ((#:imported-modules _) + `((guix build emacs-utils) + ,@%gnu-build-system-modules)) + ((#:configure-flags cf) + `(cons "--with-x-toolkit=no" ,cf)))))) (define-public guile-emacs (let ((commit "41120e0f595b16387eebfbf731fff70481de1b4b") -- cgit v1.2.3 From 9659459f0640ebfd2f662c26e939f38b0a4abf2b Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 6 Dec 2019 15:12:32 +0900 Subject: emacs-build-system: Byte compile the autoload files. * guix/build/emacs-build-system.scm (enable-autoloads-compilation) (validate-compiled-autoloads): Add procedures. (%standard-phases): Register the new procedures. * gnu/packages/aux-files/emacs/guix-emacs.el (guix-emacs-find-autoloads): Remove duplicates in the list of autoload files found. * guix/build/emacs-utils.scm (expr->string): Add procedure. (emacs-batch-eval, emacs-batch-edit-file): Use it. --- gnu/packages/aux-files/emacs/guix-emacs.el | 5 +++-- guix/build/emacs-build-system.scm | 22 ++++++++++++++++++++-- guix/build/emacs-utils.scm | 10 ++++++++-- 3 files changed, 31 insertions(+), 6 deletions(-) diff --git a/gnu/packages/aux-files/emacs/guix-emacs.el b/gnu/packages/aux-files/emacs/guix-emacs.el index 05fc9709b6..25a87ee52d 100644 --- a/gnu/packages/aux-files/emacs/guix-emacs.el +++ b/gnu/packages/aux-files/emacs/guix-emacs.el @@ -35,8 +35,9 @@ "Return a list of Emacs 'autoloads' files in DIRECTORY. The files in the list do not have extensions (.el, .elc)." ;; `directory-files' doesn't honor group in regexp. - (mapcar #'file-name-sans-extension - (directory-files directory 'full-name guix-emacs-autoloads-regexp))) + (delete-dups (mapcar #'file-name-sans-extension + (directory-files directory 'full-name + guix-emacs-autoloads-regexp)))) ;;;###autoload (defun guix-emacs-autoload-packages () diff --git a/guix/build/emacs-build-system.scm b/guix/build/emacs-build-system.scm index 09de244993..219310cf08 100644 --- a/guix/build/emacs-build-system.scm +++ b/guix/build/emacs-build-system.scm @@ -225,6 +225,21 @@ parallel. PARALLEL-TESTS? is ignored when using a non-make TEST-COMMAND." (parameterize ((%emacs emacs)) (emacs-generate-autoloads elpa-name site-lisp)))) +(define* (enable-autoloads-compilation #:key outputs #:allow-other-keys) + "Remove the NO-BYTE-COMPILATION local variable embedded in the generated +autoload files." + (let* ((out (assoc-ref outputs "out")) + (autoloads (find-files out "-autoloads.el$"))) + (substitute* autoloads + ((";; no-byte-compile.*") "")) + #t)) + +(define* (validate-compiled-autoloads #:key outputs #:allow-other-keys) + "Verify whether the byte compiled autoloads load fine." + (let* ((out (assoc-ref outputs "out")) + (autoloads (find-files out "-autoloads.elc$"))) + (emacs-batch-eval (format #f "(mapc #'load '~s)" autoloads)))) + (define (emacs-package? name) "Check if NAME correspond to the name of an Emacs package." (string-prefix? "emacs-" name)) @@ -253,10 +268,13 @@ second hyphen. This corresponds to 'name-version' as used in ELPA packages." (replace 'check check) (replace 'install install) (add-after 'install 'make-autoloads make-autoloads) - (add-after 'make-autoloads 'patch-el-files patch-el-files) + (add-after 'make-autoloads 'enable-autoloads-compilation + enable-autoloads-compilation) + (add-after 'enable-autoloads-compilation 'patch-el-files patch-el-files) ;; The .el files are byte compiled directly in the store. (add-after 'patch-el-files 'build build) - (add-after 'build 'move-doc move-doc))) + (add-after 'build 'validate-compiled-autoloads validate-compiled-autoloads) + (add-after 'validate-compiled-autoloads 'move-doc move-doc))) (define* (emacs-build #:key inputs (phases %standard-phases) #:allow-other-keys #:rest args) diff --git a/guix/build/emacs-utils.scm b/guix/build/emacs-utils.scm index 885fd0a217..ab64e3714c 100644 --- a/guix/build/emacs-utils.scm +++ b/guix/build/emacs-utils.scm @@ -41,16 +41,22 @@ ;; The `emacs' command. (make-parameter "emacs")) +(define (expr->string expr) + "Converts EXPR, an expression, into a string." + (if (string? expr) + expr + (format #f "~s" expr))) + (define (emacs-batch-eval expr) "Run Emacs in batch mode, and execute the elisp code EXPR." (invoke (%emacs) "--quick" "--batch" - (format #f "--eval=~S" expr))) + (string-append "--eval=" (expr->string expr)))) (define (emacs-batch-edit-file file expr) "Load FILE in Emacs using batch mode, and execute the elisp code EXPR." (invoke (%emacs) "--quick" "--batch" (string-append "--visit=" file) - (format #f "--eval=~S" expr))) + (string-append "--eval=" (expr->string expr)))) (define (emacs-batch-disable-compilation file) (emacs-batch-edit-file file -- cgit v1.2.3 From c6a91adabfc223f09f4648b7c1f620acc73b8aa4 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 27 Feb 2020 14:20:58 -0500 Subject: gnu: emacs: Fix comment. * gnu/packages/emacs.scm (emacs): Fix comment. --- gnu/packages/emacs.scm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 18c8549cb9..fd9c7fa875 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -144,10 +144,8 @@ "pwd")) #t)) (add-after 'install 'install-site-start - ;; Use 'guix-emacs' in "site-start.el". This way, Emacs packages - ;; provided by Guix and installed in - ;; ~/.guix-profile/share/emacs/site-lisp/guix.d/PACKAGE-VERSION are - ;; automatically found. + ;; Use 'guix-emacs' in "site-start.el", which is used autoload the + ;; Elisp packages found in EMACSLOADPATH. (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (lisp-dir (string-append out "/share/emacs/site-lisp")) -- cgit v1.2.3 From 67dc3cdf9b25f43052fbd3407685778262396f25 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 7 Dec 2019 02:47:25 +0900 Subject: gnu: emacs-cl-generic: Disable byte compilation of its autoload file. *gnu/packages/emacs-xyz.scm (emacs-cl-generic)[phases] {enable-autoloads-compilation}: Delete. --- gnu/packages/emacs-xyz.scm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index db02fb0a72..b99d371e97 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -12064,6 +12064,10 @@ match and total match information in the mode-line in various search modes.") (base32 "0vb338bhjpsnrf60qgxny4z5rjrnifahnrv9axd4shay89d894zq")))) (build-system emacs-build-system) + ;; Byte compilation of the autoload file fails. + (arguments + `(#:phases (modify-phases %standard-phases + (delete 'enable-autoloads-compilation)))) (home-page "https://elpa.gnu.org/packages/seq.html") (synopsis "Forward @code{cl-generic} compatibility for Emacs before version 25") -- cgit v1.2.3 From 70d86540edc9fd6c5a6e61b8f2e39ab22da73a6e Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 27 Feb 2020 16:00:58 -0500 Subject: gnu: emacs-sly-macrostep: Remove the enable-autoloads-compilation phase. * gnu/packages/emacs-xyz.scm (emacs-sly-macrostep)[phases] {enable-autoloads-compilation}: Remove. --- gnu/packages/emacs-xyz.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index b99d371e97..568fd0e315 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -7565,7 +7565,8 @@ file.") #:phases ;; The package provides autoloads. (modify-phases %standard-phases - (delete 'make-autoloads)))) + (delete 'make-autoloads) + (delete 'enable-autoloads-compilation)))) (synopsis "Expand Common Lisp macros inside source files with SLY") (description "@command{sly-macrostep} is a SLY contrib for expanding CL macros right -- cgit v1.2.3 From cc09ad9115f0ac2cbd240f79b5e4d65ae5f91634 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 27 Feb 2020 16:03:33 -0500 Subject: gnu: emacs-sly-quicklisp: Remove the enable-autoloads-compilation phase. * gnu/packages/emacs-xyz.scm (emacs-sly-quicklisp)[phases] {enable-autoloads-compilation}: Remove. --- gnu/packages/emacs-xyz.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 568fd0e315..59d6cfe846 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -7474,7 +7474,8 @@ xref, etc...) are still available, but with better integration.") #:phases ;; The package provides autoloads. (modify-phases %standard-phases - (delete 'make-autoloads)))) + (delete 'make-autoloads) + (delete 'enable-autoloads-compilation)))) (synopsis "Quicklisp support for SLY") (description "@command{sly-quicklisp} is an external contrib for SLY that provides a -- cgit v1.2.3 From 10a6b859695d88d799c3e448ddad954910156f6f Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 27 Feb 2020 16:07:06 -0500 Subject: gnu: emacs-sly-named-readtables: Disable byte compilation of its autoload file. *gnu/packages/emacs-xyz.scm (emacs-sly-named-readtables)[phases] {enable-autoloads-compilation}: Delete. --- gnu/packages/emacs-xyz.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 59d6cfe846..a9b36dd882 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -7532,7 +7532,10 @@ additional support for working with ASDF projects.") (propagated-inputs `(("emacs-sly" ,emacs-sly))) (arguments - '(#:include (cons* "\\.lisp$" "\\.asd$" %default-include))) + '(#:include (cons* "\\.lisp$" "\\.asd$" %default-include) + #:phases (modify-phases %standard-phases + ;; Byte compilation of the autoload file fails. + (delete 'enable-autoloads-compilation)))) (synopsis "Named-readtables support for SLY") (description "@command{sly-named-readtables} is an external contrib for SLY that -- cgit v1.2.3 From 749b9582061f7d929be83a194040b63b41afec81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 27 Feb 2020 23:20:48 +0100 Subject: swh: Adjust 'origin' test. This is a followup to 3d2f29382de2d0ee852745cc002dfe2b5d22e1c2. * tests/swh.scm (%origin): Remove "id". ("lookup-origin"): Remove use of 'origin-id'. --- tests/swh.scm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/tests/swh.scm b/tests/swh.scm index e36c54e5fb..aef68acbe7 100644 --- a/tests/swh.scm +++ b/tests/swh.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2019 Ludovic Courtès +;;; Copyright © 2019, 2020 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -25,8 +25,7 @@ ;; Test the JSON mapping machinery used in (guix swh). (define %origin - "{ \"id\": 42, - \"visits_url\": \"/visits/42\", + "{ \"visits_url\": \"/visits/42\", \"type\": \"git\", \"url\": \"http://example.org/guix.git\" }") @@ -48,11 +47,10 @@ (test-begin "swh") (test-equal "lookup-origin" - (list 42 "git" "http://example.org/guix.git") + (list "git" "http://example.org/guix.git") (with-json-result %origin (let ((origin (lookup-origin "http://example.org/guix.git"))) - (list (origin-id origin) - (origin-type origin) + (list (origin-type origin) (origin-url origin))))) (test-equal "lookup-origin, not found" -- cgit v1.2.3 From 6b0653e7ec8a9a842fb62e28fe83c9677f40d552 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 27 Feb 2020 23:24:56 +0100 Subject: guix package: Don't error out when failing to create ~/.guix-profile. This is a followup to 7842ddcbc118cbc2799e22651732b7cdc06b93ee, which broke tests when 'HOME' is unset. * guix/scripts/package.scm (ensure-default-profile): Silently ignore 'symlink' exceptions. --- guix/scripts/package.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/guix/scripts/package.scm b/guix/scripts/package.scm index 1cb0d382bf..d2f4f1ccd3 100644 --- a/guix/scripts/package.scm +++ b/guix/scripts/package.scm @@ -81,12 +81,15 @@ "Ensure the default profile symlink and directory exist and are writable." (ensure-profile-directory) - ;; Create ~/.guix-profile if it doesn't exist yet. + ;; Try to create ~/.guix-profile if it doesn't exist yet. (when (and %user-profile-directory %current-profile (not (false-if-exception (lstat %user-profile-directory)))) - (symlink %current-profile %user-profile-directory))) + (catch 'system-error + (lambda () + (symlink %current-profile %user-profile-directory)) + (const #t)))) (define (delete-generations store profile generations) "Delete GENERATIONS from PROFILE. -- cgit v1.2.3 From 71c3c3df92375ca9b4bd28b2be90dda67288fa5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 27 Feb 2020 23:56:14 +0100 Subject: scripts: Adjust disk-space warning functionality. This is a followup to fb7eec3a84afd7464027d2492a8b551a61df2725. * guix/scripts.scm (warn-about-disk-space): Do not multiply ABSOLUTE-THRESHOLD-IN-BYTES by 2^30. Compare AVAILABLE to the max of RELATIVE-THRESHOLD-IN-BYTES and ABSOLUTE-THRESHOLD-IN-BYTES, not the min. Display AVAILABLE divided by 2^30. --- guix/scripts.scm | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/guix/scripts.scm b/guix/scripts.scm index 7ad1d5194c..e235c8d4c3 100644 --- a/guix/scripts.scm +++ b/guix/scripts.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2015, 2017, 2018, 2019 Ludovic Courtès +;;; Copyright © 2013, 2014, 2015, 2017, 2018, 2019, 2020 Ludovic Courtès ;;; Copyright © 2014 Deck Pickard ;;; Copyright © 2015, 2016 Alex Kost ;;; @@ -228,17 +228,19 @@ Show what and how will/would be built." (thresholds (%disk-space-warning))) "Display a hint about 'guix gc' if less than THRESHOLD of /gnu/store is available. -THRESHOLD is a pair of (ABSOLUTE-THRESHOLD RELATIVE-THRESHOLD)." +THRESHOLDS is a pair (ABSOLUTE-THRESHOLD . RELATIVE-THRESHOLD)." + (define GiB (expt 2 30)) + (let* ((stats (statfs (%store-prefix))) (block-size (file-system-block-size stats)) (available (* block-size (file-system-blocks-available stats))) (total (* block-size (file-system-block-count stats))) (relative-threshold-in-bytes (* total (cadr thresholds))) - (absolute-threshold-in-bytes (* 1024 1024 1024 (car thresholds)))) - (when (< available (min relative-threshold-in-bytes + (absolute-threshold-in-bytes (car thresholds))) + (when (< available (max relative-threshold-in-bytes absolute-threshold-in-bytes)) (warning (G_ "only ~,1f GiB of free space available on ~a~%") - available (%store-prefix)) + (/ available 1. GiB) (%store-prefix)) (display-hint (format #f (G_ "Consider deleting old profile generations and collecting garbage, along these lines: -- cgit v1.2.3 From c2f9ea2b502a617bb69227d5f858eee9d4288a6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 28 Feb 2020 00:03:34 +0100 Subject: Revert "ui: Only display link in capable terminals." This reverts commit d7545a6b538813e88195d084f75a3e87065c999e. The commit led to a test failure in 'tests/guix-package-net.sh'. It also led to disagreements discussed here: https://lists.gnu.org/archive/html/guix-devel/2020-02/msg00353.html Reverting until these are addressed. --- guix/scripts/describe.scm | 15 ++++----------- guix/ui.scm | 2 +- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/guix/scripts/describe.scm b/guix/scripts/describe.scm index 5e00067ef8..f13f221da9 100644 --- a/guix/scripts/describe.scm +++ b/guix/scripts/describe.scm @@ -201,11 +201,7 @@ way and displaying details about the channel's source code." (format #t (G_ " commit: ~a~%") (if (supports-hyperlinks?) (channel-commit-hyperlink channel commit) - commit)) - (when (not (supports-hyperlinks?)) - (format #t (G_ " URL: ~a~%") - (channel-commit-hyperlink channel commit - (lambda (url msg) url)))))) + commit)))) (_ #f))) ;; Show most recently installed packages last. @@ -237,12 +233,9 @@ way and displaying details about the channel's source code." (define* (channel-commit-hyperlink channel #:optional - (commit (channel-commit channel)) - (transformer hyperlink)) + (commit (channel-commit channel))) "Return a hyperlink for COMMIT in CHANNEL, using COMMIT as the hyperlink's -text. The hyperlink links to a web view of COMMIT, when available. -TRANSFORMER is a procedure of 2 arguments, a URI and text, and returns a -string for display." +text. The hyperlink links to a web view of COMMIT, when available." (let* ((url (channel-url channel)) (uri (string->uri url)) (host (and uri (uri-host uri)))) @@ -251,7 +244,7 @@ string for display." (#f commit) ((_ template) - (transformer (template url commit) commit))) + (hyperlink (template url commit) commit))) commit))) diff --git a/guix/ui.scm b/guix/ui.scm index 22a6d6c8e3..fbe2b70485 100644 --- a/guix/ui.scm +++ b/guix/ui.scm @@ -1638,7 +1638,7 @@ DURATION-RELATION with the current time." (let* ((file (generation-file-name profile number)) (link (if (supports-hyperlinks?) (cut file-hyperlink file <>) - (cut format #f (G_ "~a~%file: ~a") <> file))) + identity)) (header (format #f (link (highlight (G_ "Generation ~a\t~a"))) number (date->string -- cgit v1.2.3 From a64cef121a9e3753f41c9541239c0ccfba57b3ae Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 28 Feb 2020 00:47:15 +0100 Subject: gnu: nghttp2@1.40: Do not inherit the replacement field. * gnu/packages/web.scm (nghttp2-1.40): Use INHERIT instead of PACKAGE/INHERIT. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 2be3dfefe4..1ada569834 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -7027,8 +7027,8 @@ compressed JSON header blocks. ;; 'Node' requires this newer version, to be removed on the next rebuild cycle. (define-public nghttp2-1.40 - (package/inherit - nghttp2 + (package + (inherit nghttp2) (version "1.40.0") (source (origin (method url-fetch) -- cgit v1.2.3 From 2e76ddd67ff2e10a151b5de3c67a480d94c01671 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 28 Feb 2020 00:55:09 +0100 Subject: gnu: OpenSSL: Do not inherit grafts on replacement package. * gnu/packages/tls.scm (openssl-1.1.1d): Use INHERIT instead of PACKAGE/INHERIT. --- gnu/packages/tls.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 86910a63fd..8967bb127d 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -403,8 +403,8 @@ required structures.") (home-page "https://www.openssl.org/"))) (define openssl-1.1.1d - (package/inherit - openssl + (package + (inherit openssl) (version "1.1.1d") (source (origin (method url-fetch) -- cgit v1.2.3 From a3b1f878dfeddfc8516fba8483e3191a3e4c887e Mon Sep 17 00:00:00 2001 From: Leo Prikler Date: Thu, 27 Feb 2020 14:49:11 +0100 Subject: build-system: copy-build-system: Keep symlinks symbolic. guix/build/copy-build-system.scm (install)[install-file]: Read symlinks as is done in install-simple through copy-recursively. Signed-off-by: Pierre Neidhardt --- guix/build/copy-build-system.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/guix/build/copy-build-system.scm b/guix/build/copy-build-system.scm index 6d9dc8f93b..a86f0cde29 100644 --- a/guix/build/copy-build-system.scm +++ b/guix/build/copy-build-system.scm @@ -91,7 +91,13 @@ if TARGET ends with a '/', the source is installed underneath." file)))) (format (current-output-port) "`~a' -> `~a'~%" file dest) (mkdir-p (dirname dest)) - (copy-file file dest))) + (let ((stat (lstat file))) + (case (stat:type stat) + ((symlink) + (let ((target (readlink file))) + (symlink target dest))) + (else + (copy-file file dest)))))) (define* (make-file-predicate suffixes matches-regexp #:optional (default-value #t)) "Return a predicate that returns #t if its file argument matches the -- cgit v1.2.3 From 3282137d0e4a32cd1c6b049e6ce7c44ab65bfdff Mon Sep 17 00:00:00 2001 From: Leo Prikler Date: Fri, 21 Feb 2020 17:17:56 +0100 Subject: gnu: delft-icon-theme: Use the copy-build-system. * gnu/packages/gnome-xyz.scm (delft-icon-theme): Use the copy-build-system. Signed-off-by: Pierre Neidhardt --- gnu/packages/gnome-xyz.scm | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm index bedaacf092..b0bc35c4b1 100644 --- a/gnu/packages/gnome-xyz.scm +++ b/gnu/packages/gnome-xyz.scm @@ -101,19 +101,17 @@ like Gnome, Unity, Budgie, Pantheon, XFCE, Mate and others.") (base32 "0vw3yw9f9ygzfd2k3zrfih3r0vkzlhk1bmsk8sapvk7np24i1z9s")) (file-name (git-file-name name version)))) - (build-system trivial-build-system) + (build-system copy-build-system) (arguments - `(#:modules ((guix build utils)) - #:builder - (begin - (use-modules (guix build utils)) - (copy-recursively (assoc-ref %build-inputs "source") "icons") - (substitute* "icons/Delft/index.theme" - (("gnome") "Adwaita")) - (delete-file "icons/README.md") - (delete-file "icons/LICENSE") - (delete-file "icons/logo.jpg") - (copy-recursively "icons" (string-append %output "/share/icons"))))) + `(#:install-plan + `(("." "share/icons" #:exclude ("README.md" "LICENSE" "logo.jpg"))) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-index.theme + (lambda _ + (substitute* "Delft/index.theme" + (("gnome") "Adwaita")) + #t))))) (home-page "https://www.gnome-look.org/p/1199881/") (synopsis "Continuation of Faenza icon theme with up to date app icons") (description "Delft is a fork of the popular icon theme Faenza with up to -- cgit v1.2.3 From 28c06217fb986219000cfb4c0c6ec602ad17b8d4 Mon Sep 17 00:00:00 2001 From: Leo Prikler Date: Thu, 27 Feb 2020 15:47:39 +0100 Subject: gnu: delft-icon-theme: Update to 1.11. * gnu/packages/gnome-xyz.scm (delft-icon-theme): Update to 1.11. Signed-off-by: Pierre Neidhardt --- gnu/packages/gnome-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm index b0bc35c4b1..b8cd32db08 100644 --- a/gnu/packages/gnome-xyz.scm +++ b/gnu/packages/gnome-xyz.scm @@ -90,7 +90,7 @@ like Gnome, Unity, Budgie, Pantheon, XFCE, Mate and others.") (define-public delft-icon-theme (package (name "delft-icon-theme") - (version "1.10") + (version "1.11") (source (origin (method git-fetch) @@ -99,7 +99,7 @@ like Gnome, Unity, Budgie, Pantheon, XFCE, Mate and others.") (commit (string-append "v" version)))) (sha256 (base32 - "0vw3yw9f9ygzfd2k3zrfih3r0vkzlhk1bmsk8sapvk7np24i1z9s")) + "1m3r4i4m3y3xsjb5f4bik0ylmi64amkfyr0y8pjbvv6gyj492mi6")) (file-name (git-file-name name version)))) (build-system copy-build-system) (arguments -- cgit v1.2.3 From 5144f5425a4d81405e0db7c53c7c992ac9840af4 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 28 Feb 2020 10:06:21 +0100 Subject: gnu: guile-debbugs: Update to 0.0.3. * gnu/packages/guile-xyz.scm (guile-debbugs): Update to 0.0.3. [source]: Remove snippet. [propagated-inputs]: Add guile-email. --- gnu/packages/guile-xyz.scm | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 37a5198e4e..b35ee7c07b 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -970,20 +970,17 @@ using S-expressions.") (define-public guile-debbugs (package (name "guile-debbugs") - (version "0.0.2") + (version "0.0.3") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/guile-debbugs/guile-debbugs-" version ".tar.gz")) (sha256 (base32 - "16l8910p57im6s3j93xhdaqvgfy6ms5n97177mrch3y961z5hy0i")) - (modules '((guix build utils))) - (snippet - '(substitute* "Makefile.in" - (("^godir = (.*)/ccache" _ prefix) - (string-append "godir = " prefix "/site-ccache")))))) + "1cc63nw3xdfjrfk8c58r6d5lidmfq5cpqcy32yd5xp81yccprvn9")))) (build-system gnu-build-system) + (propagated-inputs + `(("guile-email" ,guile-email))) (native-inputs `(("guile" ,guile-2.2) ("pkg-config" ,pkg-config))) -- cgit v1.2.3 From a954dc57f2b642b3873732128012b537cc22abb3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 28 Feb 2020 10:06:53 +0100 Subject: gnu: Remove guile-debbugs-next. * gnu/packages/guile-xyz.scm (guile-debbugs-next): Remove variable. * gnu/packages/mail.scm (mumi)[inputs]: Replace guile-debbugs-next with guile-debbugs. --- gnu/packages/guile-xyz.scm | 25 ------------------------- gnu/packages/mail.scm | 2 +- 2 files changed, 1 insertion(+), 26 deletions(-) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index b35ee7c07b..08f909b132 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -1020,31 +1020,6 @@ Extensions) compliant email messages and reading emails from the mbox format.") (license license:agpl3+))) -(define-public guile-debbugs-next - (let ((commit "fb0ae064037a38a0d526e08b4ad24c52e205edb9") - (revision "2")) - (package (inherit guile-debbugs) - (name "guile-debbugs") - (version (git-version "0.0.3" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://git.savannah.gnu.org/git/guile-debbugs.git") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "195sacx2xc1mzzfljj62nfpi8mxn0rc6dabxckizjksnhb5irfwy")))) - (build-system gnu-build-system) - (native-inputs - `(("pkg-config" ,pkg-config) - ("autoconf" ,autoconf) - ("automake" ,automake) - ("texinfo" ,texinfo))) - (inputs - `(("guile" ,guile-2.2) - ("guile-email" ,guile-email)))))) - (define-public guile-newt (package (name "guile-newt") diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index a2e8503ccd..7052664aca 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -3034,7 +3034,7 @@ assetsjs_DATA = $(wildcard assets/js/*)\n")) (,go ,(getenv "GUILE_LOAD_COMPILED_PATH")))) #t)))))) (inputs - `(("guile-debbugs" ,guile-debbugs-next) + `(("guile-debbugs" ,guile-debbugs) ("guile-email" ,guile-email) ("guile-fibers" ,guile-fibers) ("guile-json" ,guile-json-1) -- cgit v1.2.3 From 6813cb3fb358829c03910345493587dc1eaee436 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 28 Feb 2020 11:22:45 +0100 Subject: gnu: guix: Update to c2f9ea2. * gnu/packages/package-management.scm (guix): Update to c2f9ea2. --- gnu/packages/package-management.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 6c80806457..221cbd509f 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -110,8 +110,8 @@ ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "1.0.1") - (commit "50299ade040e934fa5533768aacb081eb340af3f") - (revision 13)) + (commit "c2f9ea2b502a617bb69227d5f858eee9d4288a6a") + (revision 14)) (package (name "guix") @@ -127,7 +127,7 @@ (commit commit))) (sha256 (base32 - "0rbnyy0vqmsl7z350cdazm5xzx74cdia3nxp0msk8xalyb76hff4")) + "0hg6yrqlzqiv4gmk9liqar6m9qhhn66q75jsmh86awjwq4qmvyab")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From 9b17c4f7b8a7665e9c0ddce71dc5c35467c6eda1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 28 Feb 2020 13:53:14 +0100 Subject: gnu: Add lighttpd. * gnu/packages/web.scm (lighttpd): New variable. --- gnu/packages/web.scm | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 64 insertions(+), 1 deletion(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 1ada569834..c6e59cff44 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2013 Aljosha Papsch ;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès ;;; Copyright © 2014, 2015, 2016 Mark H Weaver -;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus +;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Ricardo Wurmus ;;; Copyright © 2018 Raoul Jean Pierre Bonnal ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Eric Bavier @@ -114,12 +114,14 @@ #:use-module (gnu packages libevent) #:use-module (gnu packages libidn) #:use-module (gnu packages libunistring) + #:use-module (gnu packages libunwind) #:use-module (gnu packages linux) #:use-module (gnu packages lisp-xyz) #:use-module (gnu packages lua) #:use-module (gnu packages markup) #:use-module (gnu packages ncurses) #:use-module (gnu packages nss) + #:use-module (gnu packages openldap) #:use-module (gnu packages openstack) #:use-module (gnu packages base) #:use-module (gnu packages package-management) @@ -548,6 +550,67 @@ supported at your website.") ;; binary: (package-license nginx))))))) +(define-public lighttpd + (package + (name "lighttpd") + (version "1.4.55") + (source (origin + (method url-fetch) + (uri (string-append "https://download.lighttpd.net/lighttpd/" + "releases-" (version-major+minor version) ".x/" + "lighttpd-" version ".tar.xz")) + (sha256 + (base32 + "09z947730yjh438wrqb3z1c5hr1dbb11a8sr92g3vk6mr7lm02va")))) + (build-system gnu-build-system) + (arguments + `(#:configure-flags + (list "--with-krb5" + "--with-ldap" + "--with-libev" + "--with-libunwind" + "--with-openssl" + "--with-pam" + "--with-sasl") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'embed-/bin/sh-reference + (lambda _ + (substitute* "src/mod_ssi.c" + (("/bin/sh") (which "sh"))) + #t)) + (add-after 'unpack 'fix-tests + (lambda _ + (setenv "SHELL" (which "sh")) + ;; gethostbyaddr fails + (substitute* "tests/LightyTest.pm" + (("\\{HOSTNAME\\} = \\$name;") + "{HOSTNAME} = \"127.0.0.1\";")) + #t))))) + (inputs + `(("cyrus-sasl" ,cyrus-sasl) + ("libev" ,libev) + ("libunwind" ,libunwind) + ("linux-pam" ,linux-pam) + ("mit-krb5" ,mit-krb5) + ("openldap" ,openldap) + ("openssl" ,openssl) + ("pcre" ,pcre) + ("pcre:bin" ,pcre "bin") + ("zlib" ,zlib))) + (native-inputs + `(("perl" ,perl) ; for tests + ("pkg-config" ,pkg-config) + ("which" ,which))) + (home-page "https://www.lighttpd.net/") + (synopsis "Lightweight HTTP and reverse proxy server") + (description + "Lighttpd is a secure, fast, compliant, and very flexible web-server that +has been optimized for high-performance environments. It has a very low +memory footprint compared to other webservers. Its features include FastCGI, +CGI, authentication, output compression, URL rewriting and many more.") + (license license:bsd-3))) + (define-public fcgi (package (name "fcgi") -- cgit v1.2.3 From 93f351c72fd7c4d69782de01a9666e8fda5201cf Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 28 Feb 2020 16:10:07 +0200 Subject: gnu: rust-yaml-rust-0.4: Don't skip build. * gnu/packages/crates-io.scm (rust-yaml-rust-0.4)[arguments]: Don't skip build. Replace rust-quickcheck-0.8 with 0.7 in cargo-development-inputs. --- gnu/packages/crates-io.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 3352bfa4a2..f50b6daf4d 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -21112,11 +21112,10 @@ to XDG Base Directory specification") "0ka3qhqc5lvk3hz14wmsj32jhmh44blcbfrx5hfxli2gg38kv4k5")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-linked-hash-map" ,rust-linked-hash-map-0.5)) #:cargo-development-inputs - (("rust-quickcheck" ,rust-quickcheck-0.8)))) + (("rust-quickcheck" ,rust-quickcheck-0.7)))) (home-page "https://chyh1990.github.io/yaml-rust/") (synopsis "The missing YAML 1.2 parser for rust") (description -- cgit v1.2.3 From 9f7a441defcfe778b77416c39adf854fb5f587d7 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 28 Feb 2020 10:34:36 -0500 Subject: gnu: earlyoom: Update to 1.3.1. * gnu/packages/linux.scm (earlyoom): Update to 1.3.1. --- gnu/packages/linux.scm | 85 ++++++++++++++++++++++++-------------------------- 1 file changed, 40 insertions(+), 45 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 50fa7b31d0..9f2a818688 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2737,54 +2737,49 @@ kmod. The aim is to be compatible with tools, configurations and indices from the module-init-tools project.") (license license:gpl2+))) ; library under lgpl2.1+ -;;; Use a recent commit, because the latest 1.3 tag suffers from test failures -;;; (see: -;;; https://github.com/rfjakob/earlyoom/issues/156#issuecomment-591997405). (define-public earlyoom - (let ((commit "7bd4b2c9a285d2b9a4ef6e7a080e83ab95fcdeea") - (revision "1")) - (package - (name "earlyoom") - (version (git-version "1.3" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/rfjakob/earlyoom.git") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0sxk8gh734q4rbh9r1q8ab840bn4kffdm8j93x55jspnmmy1wd2c")))) - (build-system gnu-build-system) - (arguments - `(#:phases (modify-phases %standard-phases - (delete 'configure) - (add-before 'check 'set-home - (lambda _ - (setenv "HOME" (getcwd)) - #t)) - (add-after 'build 'install-contribs - ;; Install what seems useful from the contrib directory. - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (contrib (string-append - out "/share/earlyoom/contrib"))) - (install-file "contrib/notify_all_users.py" contrib) - #t)))) - #:make-flags (let* ((prefix (assoc-ref %outputs "out"))) - (list "CC=gcc" - (string-append "VERSION=v" ,version) - (string-append "PREFIX=" prefix) - (string-append "SYSCONFDIR=" prefix "/etc"))) - #:test-target "test")) - (native-inputs `(("go" ,go) ;for the test suite - ("pandoc" ,ghc-pandoc))) ;to generate the manpage - (home-page "https://github.com/rfjakob/earlyoom") - (synopsis "Simple out of memory (OOM) daemon for the Linux kernel") - (description "Early OOM is a minimalist out of memory (OOM) daemon that + (package + (name "earlyoom") + (version "1.3.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/rfjakob/earlyoom.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "06sd3jpkdrwqbphsf8jrgs5rxfi7j3xjmygjjvj4xjk4gncz7r2i")))) + (build-system gnu-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + (delete 'configure) + (add-before 'check 'set-home + (lambda _ + (setenv "HOME" (getcwd)) + #t)) + (add-after 'build 'install-contribs + ;; Install what seems useful from the contrib directory. + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (contrib (string-append + out "/share/earlyoom/contrib"))) + (install-file "contrib/notify_all_users.py" contrib) + #t)))) + #:make-flags (let* ((prefix (assoc-ref %outputs "out"))) + (list "CC=gcc" + (string-append "VERSION=v" ,version) + (string-append "PREFIX=" prefix) + (string-append "SYSCONFDIR=" prefix "/etc"))) + #:test-target "test")) + (native-inputs `(("go" ,go) ;for the test suite + ("pandoc" ,ghc-pandoc))) ;to generate the manpage + (home-page "https://github.com/rfjakob/earlyoom") + (synopsis "Simple out of memory (OOM) daemon for the Linux kernel") + (description "Early OOM is a minimalist out of memory (OOM) daemon that runs in user space and provides a more responsive and configurable alternative to the in-kernel OOM killer.") - (license license:expat)))) + (license license:expat))) (define-public eudev ;; The post-systemd fork, maintained by Gentoo. -- cgit v1.2.3 From 20c87138a9ca1bbccef2ee91589f11ec70985555 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 28 Feb 2020 18:54:49 +0100 Subject: gnu: elogind: Enable tests again. * gnu/packages/freedesktop.scm (elogind)[arguments]: Remove "-Dtests" from #:configure-flags. Add phase 'adjust-tests'. --- gnu/packages/freedesktop.scm | 43 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 41 insertions(+), 2 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 9d10f51257..90956968b2 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -8,7 +8,7 @@ ;;; Copyright © 2016, 2017, 2019 Efraim Flashner ;;; Copyright © 2016 Kei Kebreau ;;; Copyright © 2017, 2018 Mark H Weaver -;;; Copyright © 2017, 2018, 2019 Marius Bakke +;;; Copyright © 2017, 2018, 2019, 2020 Marius Bakke ;;; Copyright © 2017, 2018, 2019 Rutger Helling ;;; Copyright © 2017 Brendan Tildesley ;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice @@ -306,7 +306,6 @@ the freedesktop.org XDG Base Directory specification.") "-Dcgroup-controller=elogind" "-Dman=true" ;; Disable some tests. - "-Dtests=false" "-Dslow-tests=false")) #:phases (modify-phases %standard-phases @@ -324,6 +323,46 @@ the freedesktop.org XDG Base Directory specification.") (("=/run/dbus/system_bus_socket") "=/var/run/dbus/system_bus_socket")) #t)) + (add-after 'unpack 'adjust-tests + (lambda _ + ;; This test tries to copy some bytes from /usr/lib/os-release, + ;; which does not exist in the build container. Choose something + ;; more likely to be available. + (substitute* "src/test/test-copy.c" + (("/usr/lib/os-release") + "/etc/passwd")) + ;; Use a shebang that works in the build container. + (substitute* "src/test/test-exec-util.c" + (("#!/bin/sh") + (string-append "#!" (which "sh")))) + ;; Do not look for files or directories that do not exist. + (substitute* "src/test/test-fs-util.c" + (("usr") "etc") + (("/etc/machine-id") "/etc/passwd")) + ;; FIXME: Why is sd_id128_get_machine_app_specific failing. + ;; Disable for now by hooking into the kernel support check. + (substitute* "src/test/test-id128.c" + (("if \\(r == -EOPNOTSUPP\\)") + "if (1)")) + ;; This test expects that /sys is available. + (substitute* "src/test/test-mountpoint-util.c" + (("assert_se\\(path_is_mount_point\\(\"/sys.*") + "")) + ;; /bin/sh does not exist in the build container. + (substitute* "src/test/test-path-util.c" + (("/bin/sh") (which "sh"))) + ;; This test uses sd_device_new_from_syspath to allocate a + ;; loopback device, but that fails because /sys is unavailable. + (substitute* "src/libelogind/sd-device/test-sd-device-thread.c" + ((".*sd_device_new_from_syspath.*/sys/class/net/lo.*") + "return 77;")) + ;; Most of these tests require cgroups or an actual live + ;; logind system so that it can flicker the monitor, etc. + ;; Just skip it until a more narrow selection can be made. + (substitute* "src/libelogind/sd-login/test-login.c" + (("r = sd_pid_get_slice.*") + "return 77;")) + #t)) (add-after 'unpack 'change-pid-file-path (lambda _ (substitute* "src/login/elogind.c" -- cgit v1.2.3