Danny Milosavljevic <dannym@scratchpost.org> writes:

> * gnu/packages/rust.scm (rustc): Update to 1.16.0.
> (cargo): Update to 0.17.0.

Do these have to be updated together? I would prefer them as separate
patches. Also, the changes to the various [arguments] and
[native-inputs] should be mentioned here.

> ---
>  gnu/packages/rust.scm | 66 ++++++++++++++++++++++++++++++++++++++-------------
>  1 file changed, 49 insertions(+), 17 deletions(-)
>
> diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm
> index 9a56b1ffe..aa2617a04 100644
> --- a/gnu/packages/rust.scm
> +++ b/gnu/packages/rust.scm
> @@ -44,7 +44,7 @@
>    #:use-module (srfi srfi-26))
>  
>  ;; Should be one less than the current released version.
> -(define %rust-bootstrap-binaries-version "1.14.0")
> +(define %rust-bootstrap-binaries-version "1.15.0")
>  
>  (define %rust-bootstrap-binaries
>    (origin
> @@ -55,7 +55,7 @@
>            "-i686-unknown-linux-gnu.tar.gz"))
>      (sha256
>       (base32
> -      "0h384prpabcl08mxs1bilyb0dbk0knpdylcnz4b84ij4idr7ap4d"))))
> +      "0wmkfx8pxmkkw021mrq9s3xhra8f0daqdl6j56pxyn4w39i0rzrw"))))
>  
>  (define (increment-rust-version rust-version major patch)
>    (match (string-split rust-version #\.)
> @@ -205,13 +205,14 @@ rustc-bootstrap and cargo-bootstrap packages.")
>                      "rustc-" version "-src.tar.gz"))
>                (sha256
>                 (base32
> -                "0wvn8m1nfg664b95qrdpfh72q1a6ir09rqkrnlzbkay2r7xf8mgn"))))
> +                "1d78jq7mc34n265by68amr9r4nzbiqrilfbwh7gx56ydn4gb6rpr"))))
>      (build-system gnu-build-system)
>      (native-inputs
>       `(("cmake" ,cmake)
>         ("git" ,git)
>         ("python-2" ,python-2)
>         ("rust-bootstrap" ,rust-bootstrap)
> +       ("cargo-bootstrap" ,cargo-bootstrap)
>         ("which" ,which)))
>      (inputs
>       `(("jemalloc" ,jemalloc)
> @@ -226,7 +227,16 @@ rustc-bootstrap and cargo-bootstrap packages.")
>             (lambda _
>               (substitute* "configure"
>                 (("/usr/bin/env") (which "env")) ; Detect target CPU correctly.
> -               (("probe_need CFG_CURL curl") "")) ; Avoid curl as a build dependency.
> +               (("probe_need CFG_CURL curl") "") ; Avoid curl build dependency.
> +               ;; See <https://github.com/rust-lang/rust/issues/40698>
> +               (("-DLLVM_TARGETS_TO_BUILD='")
> +                "-DLLVM_TARGETS_TO_BUILD='NVPTX;")) ; Make LLVM >= 3.8.1 work.
> +             (substitute* "src/tools/compiletest/src/util.rs"
> +               (("(\"amd64\", \"x86_64\"),") "(\"amd64\", \"x86_64\"),
> +(\"nvptx\", \"nvptx\"),")) ; Make LLVM >= 3.8.1 work.
> +             (substitute* "mk/main.mk"
> +               (("LLVM_OPTIONAL_COMPONENTS=")
> +                "LLVM_OPTIONAL_COMPONENTS=nvptx ")) ; Make LLVM >= 3.8.1 work.

Phew! I think a sentence or two above the github URL stating the problem
and mentioning that the following three substitutions resolves a flob
with the gnord would be nice here, since it's not obvious that the
substitutions have anything to do with LLVM (even with the comments).

Reading the github issue, it should probably also be mentioned that these
workarounds will be obsolete in the next release.

>               #t))
>           (add-after 'unpack 'set-env
>             (lambda _
> @@ -264,7 +274,8 @@ rustc-bootstrap and cargo-bootstrap packages.")
>                              "--enable-rpath"
>                              "--enable-local-rust"
>                              "--disable-rustbuild" ; use Makefiles
> -                            "--disable-manage-submodules")))
> +                            "--disable-manage-submodules"
> +                            "--enable-llvm-link-shared")))
>                 ;; Rust uses a custom configure script (no autoconf).
>                 (zero? (apply system* "./configure" flags)))))
>           (add-after 'install 'wrap-rustc
> @@ -297,7 +308,7 @@ safety and thread safety guarantees.")
>                (file-name (string-append name "-" version ".tar.gz"))
>                (sha256
>                 (base32
> -                "194i06y9nql0p93gahh0vm4qwv6c1kpd9rprpf22w5gav9lpcyjz"))))
> +                "1y0zy8gk1ly0wh57y78fisk7cdd92qk0x7z664f6l7lzl2krqs7w"))))
>      (build-system cargo-build-system)
>      (propagated-inputs
>       `(("cmake" ,cmake)
> @@ -313,10 +324,10 @@ safety and thread safety guarantees.")
>       `(("rust-openssl"
>          ,(origin
>             (method url-fetch)
> -           (uri (crate-uri "openssl" "0.9.1"))
> +           (uri (crate-uri "openssl" "0.9.6"))
>             (sha256
>              (base32
> -             "1m2mhiar87qnw4gxci286q9g85ljafbc41salbj2hmcgh8aagchy"))))
> +             "0g28g692gby6izp9qmnwnyxyhf9b0870yhd500p18j9l69lxl00c"))))
>         ("rust-strsim"
>          ,(origin
>             (method url-fetch)
> @@ -411,17 +422,17 @@ safety and thread safety guarantees.")
>         ("rust-libssh2-sys"
>          ,(origin
>             (method url-fetch)
> -           (uri (crate-uri "libssh2-sys" "0.2.4"))
> +           (uri (crate-uri "libssh2-sys" "0.2.5"))
>             (sha256
>              (base32
> -             "1pmmh0hcx14856wg9bp740yf618qfl2765vhf67sfs5lmf39227d"))))
> +             "0d2r36hrh9vc1821r0v4kywv30svpf37d31calwql69fbij3bqci"))))
>         ("rust-libz-sys"
>          ,(origin
>             (method url-fetch)
> -           (uri (crate-uri "libz-sys" "1.0.10"))
> +           (uri (crate-uri "libz-sys" "1.0.13"))
>             (sha256
>              (base32
> -             "1rl85x045sk5d345hgcahx99plpbdg2a3bx5vjfxig30qah74p4h"))))
> +             "034pgvxzgsv37iafgs0lmvd1ifm0bg0zm1xcsn9x71nn8lm93vp5"))))
>         ("rust-curl-sys"
>          ,(origin
>             (method url-fetch)
> @@ -429,13 +440,27 @@ safety and thread safety guarantees.")
>             (sha256
>              (base32
>               "0fi8kjz3f8m8vfazycs3ddm0h6j3x78hw78gwbvybx71129192i1"))))
> +       ("rust-error-chain"
> +        ,(origin
> +           (method url-fetch)
> +           (uri (crate-uri "error-chain" "0.7.2"))
> +           (sha256
> +            (base32
> +             "03qjh6l2a9fkiyg0428p7q3dcpi47cbmrqf9zmlymkg43v3v731i"))))
> +       ("rust-metadeps"
> +        ,(origin
> +           (method url-fetch)
> +           (uri (crate-uri "metadeps" "1.1.1"))
> +           (sha256
> +            (base32
> +             "0l818461bslb7nrs7r1amkqv45n53fcp5sabyqipwx0xxbkzz7w2"))))
>         ("rust-openssl-sys"
>          ,(origin
>             (method url-fetch)
> -           (uri (crate-uri "openssl-sys" "0.9.1"))
> +           (uri (crate-uri "openssl-sys" "0.9.6"))
>             (sha256
>              (base32
> -             "1sdhgalfm2zdqf144xhdnxdha7ifjgsfbmlrqbx0j9f3mh4gpscm"))))
> +             "1hzpyf9z8xg1yn5r9g17bl5j20nifd6s2zp10xh90v7m0sd2yj5i"))))
>         ("rust-fs2"
>          ,(origin
>             (method url-fetch)
> @@ -635,10 +660,10 @@ safety and thread safety guarantees.")
>         ("rust-libgit2-sys"
>          ,(origin
>             (method url-fetch)
> -           (uri (crate-uri "libgit2-sys" "0.6.5"))
> +           (uri (crate-uri "libgit2-sys" "0.6.6"))
>             (sha256
>              (base32
> -             "0yl80n12ih4jh1halpbj3zqlqvw5zxdr6m6xdcvdz67svjy50bjh"))))
> +             "074h9q4p60xh6canb0sj4vrc801wqv6p53l9lp0q724bkwzf7967"))))
>         ("rust-env_logger"
>          ,(origin
>             (method url-fetch)
> @@ -785,7 +810,14 @@ safety and thread safety guarantees.")
>             (uri (crate-uri "num-complex" "0.1.35"))
>             (sha256
>              (base32
> -             "0bzrjfppnnzf9vmkpklhp2dw9sb1lqzydb8r6k83z76i9l2qxizh"))))))
> +             "0bzrjfppnnzf9vmkpklhp2dw9sb1lqzydb8r6k83z76i9l2qxizh"))))
> +       ("rust-shell-escape"
> +        ,(origin
> +           (method url-fetch)
> +           (uri (crate-uri "shell-escape" "0.1.3"))
> +           (sha256
> +            (base32
> +             "1y2fp2brv639icv4a0fdqs1zhlrxq8qbz27ygfa86ifmh5jcjp6x"))))))
>      (arguments
>       `(#:cargo ,cargo-bootstrap
>         #:tests? #f ; FIXME