From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id 0CcwBYvrQGH9SAAAgWs5BA (envelope-from ) for ; Tue, 14 Sep 2021 20:35:55 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id EN2yAIvrQGGfSgAAB5/wlQ (envelope-from ) for ; Tue, 14 Sep 2021 18:35:55 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id E4F4E1DE5F for ; Tue, 14 Sep 2021 20:35:53 +0200 (CEST) Received: from localhost ([::1]:43718 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mQDHd-0000Hd-2B for larch@yhetil.org; Tue, 14 Sep 2021 14:35:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58226) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mQDFq-0000Fk-Fv for guix-patches@gnu.org; Tue, 14 Sep 2021 14:34:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:38612) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mQDFq-0008LO-66 for guix-patches@gnu.org; Tue, 14 Sep 2021 14:34:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mQDFp-0007Qb-VG for guix-patches@gnu.org; Tue, 14 Sep 2021 14:34:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50582] Acknowledgement ([PATCH 0/4] Julia-documenter) Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 14 Sep 2021 18:34:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50582 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50582@debbugs.gnu.org Received: via spool by 50582-submit@debbugs.gnu.org id=B50582.163164443028536 (code B ref 50582); Tue, 14 Sep 2021 18:34:01 +0000 Received: (at 50582) by debbugs.gnu.org; 14 Sep 2021 18:33:50 +0000 Received: from localhost ([127.0.0.1]:50158 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mQDFd-0007QB-DZ for submit@debbugs.gnu.org; Tue, 14 Sep 2021 14:33:50 -0400 Received: from flashner.co.il ([178.62.234.194]:37880) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mQDFa-0007Pv-SU for 50582@debbugs.gnu.org; Tue, 14 Sep 2021 14:33:47 -0400 Received: from localhost (unknown [141.226.169.107]) by flashner.co.il (Postfix) with ESMTPSA id A21DD4035D for <50582@debbugs.gnu.org>; Tue, 14 Sep 2021 18:33:40 +0000 (UTC) Date: Tue, 14 Sep 2021 21:31:54 +0300 From: Efraim Flashner Message-ID: Mail-Followup-To: Efraim Flashner , 50582@debbugs.gnu.org References: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="ioLHq8g8uxfXQemy" Content-Disposition: inline In-Reply-To: X-PGP-Key-ID: 0x41AAE7DCCA3D8351 X-PGP-Key: https://flashner.co.il/~efraim/efraim_flashner.asc X-PGP-Fingerprint: A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1631644554; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post; bh=5/sRX/xHtk4QmiM+M9DeVT0zfqGN79qIK1IsXai+F4k=; b=JEKrdC5ih5x3GOXQh9TTU/D/QrtYqE9RvR+W2kIDw4rEtLSthizrV5h39Z7mkNdLnLUktu No0nB8TAB/5xVp7cmIh1DP7iyo96jPHgiYtpSqr8xpAGihbmCsb/jndVXOkLVIpc6h8f+Z dM+WCqbD8QvEOnSDGzu/aUqDEN0BtPj3beRCBDKrX0r1ZsTWYwHPKBbHdVRdfTAfWti5HS ZkbbgUDCJRmfwG02Jp/6p+ZSHxr+x1hEXclk/eIfuV6R7sr/Sfy3XhbhbWjI7TT1jDsP50 4DOsjFuYlOXUXboW3DCKcLzx7sA8xFbpdM/hC6PC+kJ2G7VSxfEZH0qxMvTJuQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1631644554; a=rsa-sha256; cv=none; b=fKK1vK9XnnFwue6GJfkvK55kGaSmSqEOK2yfDNsdWn8CX3hhH650eD+0PgH//gBHdPstDd z0HYX+kVSQ10lmFKVXm/VCPlPboaaO8Kdn0s1AutqUchmjBQvPSF6NrPZloGgsYKbuQ020 2Yx9Vs9zACJU5YJo+a95xgntVFkqqG2yXneIPZRKSLmWL+nuUFx7/PeyVXq6JoujJLuQTL XlBQ7t4lO24gyx29YhMLQiQat4PCSZvGEkHVMMQghrnw+1m27o3b5fGgfqvhr65jkZZsMc rdOKymC1gS0653kKF6fH0jjW7WqlaEa7Qlmtl1NYdUaCdKHmLcvrnHaKKfPfWA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: -4.00 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: E4F4E1DE5F X-Spam-Score: -4.00 X-Migadu-Scanner: scn0.migadu.com X-TUID: /yXV6C8tmeN1 --ioLHq8g8uxfXQemy Content-Type: multipart/mixed; boundary="8eYDbOlMT7SDvQz2" Content-Disposition: inline --8eYDbOlMT7SDvQz2 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable I seem to be having a hard time sending the patches so I'm attaching them to this email. --=20 Efraim Flashner =D7=A8=D7=A0=D7=A9=D7=9C=D7=A4 = =D7=9D=D7=99=D7=A8=D7=A4=D7=90 GPG key =3D A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted --8eYDbOlMT7SDvQz2 Content-Type: text/plain; charset=utf-8 Content-Disposition: attachment; filename="0001-gnu-Add-julia-libsass-jll.patch" Content-Transfer-Encoding: quoted-printable =46rom 60b1c99f84e660d692abbb480f3a1ee7f40c2a90 Mon Sep 17 00:00:00 2001 Message-Id: <60b1c99f84e660d692abbb480f3a1ee7f40c2a90.1631624546.git.efraim= @flashner.co.il> In-Reply-To: References: =46rom: Efraim Flashner Date: Tue, 14 Sep 2021 15:43:00 +0300 Subject: [PATCH 1/4] gnu: Add julia-libsass-jll. * gnu/packages/julia-jll.scm (julia-libsass-jll): New variable. --- gnu/packages/julia-jll.scm | 43 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/gnu/packages/julia-jll.scm b/gnu/packages/julia-jll.scm index d18971ad48..d3677d0a33 100644 --- a/gnu/packages/julia-jll.scm +++ b/gnu/packages/julia-jll.scm @@ -1064,6 +1064,49 @@ (define-public julia-libpng-jll (description "This package provides a wrapper for the libpng library.") (license license:expat))) =20 +(define-public julia-libsass-jll + (let ((commit "69bf10603aad0ebf1f6df088c5fd7c4a5d1eb0ca")) + (package + (name "julia-libsass-jll") + (version "3.5.5+0") ;tag not created upstream + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/JuliaBinaryWrappers/libsass_jll.jl= ") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1fb6rf422533bsmfslvc20ag1hr50bf9xaj32rvh7nv593sbiygn"))= )) + (build-system julia-build-system) + (arguments + `(#:tests? #f ; no runtests.jl + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'override-binary-path + (lambda* (#:key inputs #:allow-other-keys) + (map + (lambda (wrapper) + (substitute* wrapper + (("generate_wrapper_header.*") + (string-append + "generate_wrapper_header(\"libsass\", \"" + (assoc-ref inputs "libsass") "\")\n")))) + ;; There's a Julia file for each platform, override them a= ll + (find-files "src/wrappers/" "\\.jl$")) + #t))))) + (inputs + `(("libsass" ,libsass))) + (propagated-inputs + `(("julia-jllwrappers" ,julia-jllwrappers))) + (home-page "https://github.com/JuliaBinaryWrappers/libsass_jll.jl") + (synopsis "Julia wrapper for libsass") + (description "This package provides a wrapper for libsass. It is an +autogenerated source package constructed using @code{BinaryBuilder.jl}. T= he +originating @code{build_tarballs.jl} script can be found on the community +build tree Yggdrasil.") + (license license:expat)))) + (define-public julia-libtiff-jll (package (name "julia-libtiff-jll") --=20 2.33.0 --8eYDbOlMT7SDvQz2 Content-Type: text/plain; charset=utf-8 Content-Disposition: attachment; filename="0002-gnu-Add-julia-sass.patch" Content-Transfer-Encoding: quoted-printable =46rom eca237a402eef4f1c053a937ea24138e366e33d3 Mon Sep 17 00:00:00 2001 Message-Id: In-Reply-To: References: =46rom: Efraim Flashner Date: Tue, 14 Sep 2021 15:43:30 +0300 Subject: [PATCH 2/4] gnu: Add julia-sass. * gnu/packages/julia-xyz.scm (julia-sass): New variable. --- gnu/packages/julia-xyz.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index a80964c2b0..2f953a33b7 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -3403,6 +3403,28 @@ (define-public julia-safetestsets a loadable module.") (license license:expat)))) =20 +(define-public julia-sass + (package + (name "julia-sass") + (version "0.2.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/piever/Sass.jl") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0y7kkkj717h5cj659ssry89i5r64symr6pvhr6vv4qmaxrnjxj92")))) + (build-system julia-build-system) + (propagated-inputs + `(("julia-libsass-jll" ,julia-libsass-jll))) + (home-page "https://github.com/piever/Sass.jl") + (synopsis "Compile scss and sass file to css in Julia") + (description "This library provides a simple Julian API to use the +@code{libsass} library to compile scss and sass files to css.") + (license license:expat))) + (define-public julia-scratch (package (name "julia-scratch") --=20 2.33.0 --8eYDbOlMT7SDvQz2 Content-Type: text/plain; charset=utf-8 Content-Disposition: attachment; filename="0003-gnu-Add-julia-ansicoloredprinters.patch" Content-Transfer-Encoding: quoted-printable =46rom 0bfad7f4ecde531573c6c7cf957301ab49306876 Mon Sep 17 00:00:00 2001 Message-Id: <0bfad7f4ecde531573c6c7cf957301ab49306876.1631624546.git.efraim= @flashner.co.il> In-Reply-To: References: =46rom: Efraim Flashner Date: Tue, 14 Sep 2021 15:48:23 +0300 Subject: [PATCH 3/4] gnu: Add julia-ansicoloredprinters. * gnu/packages/julia-xyz.scm (julia-ansicoloredprinters): New variable. --- gnu/packages/julia-xyz.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index 2f953a33b7..309687019d 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -98,6 +98,26 @@ (define-public julia-adapt be GPU compatible without throwing away the wrapper.") (license license:expat))) =20 +(define-public julia-ansicoloredprinters + (package + (name "julia-ansicoloredprinters") + (version "0.0.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/JuliaDocs/ANSIColoredPrinters.jl") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0dp5agljr0g50s5gn0pr70wrz01ggck6pb40ay3l4szhswq7mqzf")))) + (build-system julia-build-system) + (home-page "https://github.com/JuliaDocs/ANSIColoredPrinters.jl") + (synopsis "ANSI escape code translator") + (description "@code{ANSIColoredPrinters.jl} converts a text qualified = by +ANSI escape codes to another format.") + (license license:expat))) + (define-public julia-aqua (package (name "julia-aqua") --=20 2.33.0 --8eYDbOlMT7SDvQz2 Content-Type: text/plain; charset=utf-8 Content-Disposition: attachment; filename="0004-gnu-Add-julia-documenter.patch" Content-Transfer-Encoding: quoted-printable =46rom eeb8e3dfcaf3040232e9d53f07ace058f72510bf Mon Sep 17 00:00:00 2001 Message-Id: In-Reply-To: References: =46rom: Efraim Flashner Date: Tue, 14 Sep 2021 15:49:51 +0300 Subject: [PATCH 4/4] gnu: Add julia-documenter. * gnu/packages/julia-xyz.scm (julia-documenter, julia-documentermarkdown, julia-documentertools): New variables. (julia-documenter-0.22): New hidden variable. --- gnu/packages/julia-xyz.scm | 146 ++++++++++++++++++++++++++++++++++++- 1 file changed, 145 insertions(+), 1 deletion(-) diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index 309687019d..e7e7680cca 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -26,7 +26,9 @@ (define-module (gnu packages julia-xyz) #:use-module (guix git-download) #:use-module (guix build-system julia) #:use-module (gnu packages gcc) - #:use-module (gnu packages julia-jll)) + #:use-module (gnu packages julia-jll) + #:use-module (gnu packages python) + #:use-module (gnu packages version-control)) =20 (define-public julia-abstractffts (package @@ -990,6 +992,148 @@ (define-public julia-docstringextensions valuable enough at this time.") (license license:expat))) =20 +;; By removing all the javascript and css downloads any HTML documentation +;; produced by this package will not be very useful. +(define-public julia-documenter + (package + (name "julia-documenter") + (version "0.27.6") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/JuliaDocs/Documenter.jl") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1y6rql7cxc7hfhc8rfq1mdmffp70sqzyh4vnnq93fziwrc8c8sbj")))) + (build-system julia-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-source + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "src/Deps.jl" + (("pip install") + (string-append (assoc-ref inputs "python") + "/bin/pip install"))) + #t)) + (add-after 'unpack 'remove-javascript-downloads + (lambda _ + (substitute* "src/Writers/HTMLWriter.jl" + (("cdnjs.cloudflare.com") "example.com")) + ;; Removing the javascript downloads causes these tests fail. + (substitute* "test/examples/tests.jl" + ((".*Main\\.examples_html_doc.*") "") + ((".*Main\\.examples_html_mathjax3_doc.*") "")) + #t))))) + (propagated-inputs + `(("julia-ansicoloredprinters" ,julia-ansicoloredprinters) + ("julia-docstringextensions" ,julia-docstringextensions) + ("julia-iocapture" ,julia-iocapture) + ("julia-json" ,julia-json))) + (inputs + `(("python" ,python-wrapper))) + (native-inputs + `(("git" ,git-minimal) + ("julia-documentermarkdown" ,julia-documentermarkdown) + ("julia-documentertools" ,julia-documentertools))) + (home-page "https://juliadocs.github.io/Documenter.jl") + (synopsis "Documentation generator for Julia") + (description "This package provides a documentation generator for Juli= a.") + (license license:expat))) + +(define-public julia-documenter-0.22 + (package + (inherit julia-documenter) + (name "julia-documenter") + (version "0.22.6") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/JuliaDocs/Documenter.jl") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1z8b7267y7yn5nx8sjwkmc0ph97vmv42q52jg7s89ghqb9xx3wv5")))) + (arguments + `(#:tests? #f ; Some tests require network. + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'remove-javascript-downloads + (lambda _ + ;; This isn't problematic because we only use + ;; this package for bootstrapping. + (substitute* '("assets/html/documenter.js" + "assets/html/search.js" + "src/Writers/HTMLWriter.jl") + (("cdnjs.cloudflare.com") "example.com")) + #t))))) + (propagated-inputs + `(("julia-docstringextensions" ,julia-docstringextensions) + ("julia-json" ,julia-json))) + (inputs `()) + (native-inputs `()) + (properties '((hidden? . #t))))) + +(define-public julia-documentermarkdown + (package + (name "julia-documentermarkdown") + (version "0.2.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/JuliaDocs/DocumenterMarkdown.jl") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0sx89hi5p2f8zi2rp5qrv06m270d90pxj5d2y5cxls1spax7wqx8")))) + (build-system julia-build-system) + (inputs + ;; We don't want to propagate the bootstrap version. + ;; Cycle with Documenter.jl in later versions. + `(("julia-documenter" ,julia-documenter-0.22))) + (home-page "https://github.com/JuliaDocs/DocumenterMarkdown.jl") + (synopsis "Documenter's Markdown") + (description "This package enables the Markdown / MkDocs backend of +@code{Documenter.jl}.") + (license license:expat))) + +(define-public julia-documentertools + (package + (name "julia-documentertools") + (version "0.1.13") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/JuliaDocs/DocumenterTools.jl") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "05p57p8xlkn42m1lv9gq4hl96vp7hpj19d51p828ai1rbpcpi3a6")))) + (build-system julia-build-system) + (arguments + `(#:tests? #f)) ; Tests require network. + (inputs + ;; We don't want to propagate the bootstrap version. + ;; Cycle with Documenter.jl in later versions. + `(("julia-documenter" ,julia-documenter-0.22))) + (propagated-inputs + `(("julia-docstringextensions" ,julia-docstringextensions) + ("julia-gumbo" ,julia-gumbo) + ("julia-sass" ,julia-sass))) + (native-inputs + `(("julia-example" ,julia-example))) + (home-page "https://github.com/JuliaDocs/DocumenterTools.jl") + (synopsis "Extra tools for setting up Documenter") + (description "This package contains utilities for setting up documenta= tion +generation with @code{Documenter.jl}.") + (license license:expat))) + (define-public julia-diffresults (package (name "julia-diffresults") --=20 2.33.0 --8eYDbOlMT7SDvQz2-- --ioLHq8g8uxfXQemy Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEoov0DD5VE3JmLRT3Qarn3Mo9g1EFAmFA6poACgkQQarn3Mo9 g1FiARAAlePJLjEhybLFlrzNwHVrQuwMdOffwoHsWJKYSwJXMzkMAJhVW0JRGShS d7WcIQoonxOmkuIYOtnTZbaFHa/sci5Jt/jffy8fFotzI0bJ+nZPyjzmwNMNn+cm p1QmaNhuFThaSoPfuUhEoWjN9hd4gJf3lRoAk7OBsc3YNMlGdda3pJQhOKhlr+Xq iLjYZPOeiEytIj93sBbxcqYLB9df4qa0LMaRwzae+DiwJIQh99m0Cf/rmrjEBF8W nSJi2XNke9Ll586FuJZUU+pOR6Uv9Gy3W6q4GNkqP1vu/RdNwVikhxg0w9+sRXco jv93t9K85qB+nNeq2mkI9AMKpmqRhyaQlNHqyShyMCqJ2JdaY0BOC6h5kPbkjGIr l2bos7OR3ZONqQmgwSo1hMy6xIGbsW7KbqrvN6ZUiCZ089EzW9m/lMSU5J122OgK nTz67uZTcWBm1YDCG98fF+uTExjlcSIDBHGELCvCCuLS29kWADEa0OPA+q/5lAvE iJA8zYxjMEu2poUwFch+UvqMYnI9tkAoUj3GwAfyfgi4ufgo0YqPPs90tCZnZPST VHEOzm8BRRSkIB1NVIVfYuaDx9YUdEbHnfNDW1NJ3/YPdoF4H6Z0ulzQP/BESGVX Kvwa6PjFTrcYd/yj7XIAEQAnNzMyE1TfAAKiVlrXuHP60JvpFgc= =Ukp4 -----END PGP SIGNATURE----- --ioLHq8g8uxfXQemy--