Re: [PATCH v2] gnu: Add rust

[ng0 <ng0@we.make.ritual.n0.is>]

Hi,

I can not apply this patch with git am. Can you resend the patch as an
appended file created with git format-patch or something similar, and
not inlined?

Eric Le Bihan <eric.le.bihan.dev@free.fr> writes:

> * gnu/packages/rust.scm(rust): New variable.
>
> Signed-off-by: Eric Le Bihan <eric.le.bihan.dev@free.fr>
> ---
>  gnu/packages/rust.scm | 143 ++++++++++++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 143 insertions(+)
>  create mode 100644 gnu/packages/rust.scm
>
> diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm
> new file mode 100644
> index 0000000..7f2edb8
> --- /dev/null
> +++ b/gnu/packages/rust.scm
> @@ -0,0 +1,143 @@
> +;;; GNU Guix --- Functional package management for GNU
> +;;; Copyright © 2016 Eric Le Bihan <eric.le.bihan.dev@free.fr>
> +;;;
> +;;; This file is part of GNU Guix.
> +;;;
> +;;; GNU Guix is free software; you can redistribute it and/or modify it
> +;;; under the terms of the GNU General Public License as published by
> +;;; the Free Software Foundation; either version 3 of the License, or (at
> +;;; your option) any later version.
> +;;;
> +;;; GNU Guix is distributed in the hope that it will be useful, but
> +;;; WITHOUT ANY WARRANTY; without even the implied warranty of
> +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> +;;; GNU General Public License for more details.
> +;;;
> +;;; You should have received a copy of the GNU General Public License
> +;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
> +
> +(define-module (gnu packages rust)
> +  #:use-module (ice-9 regex)
> +  #:use-module ((guix licenses) #:select (asl2.0 x11-style))
> +  #:use-module (guix packages)
> +  #:use-module (guix download)
> +  #:use-module (guix build-system gnu)
> +  #:use-module (gnu packages base)
> +  #:use-module (gnu packages bootstrap)
> +  #:use-module (gnu packages curl)
> +  #:use-module (gnu packages elf)
> +  #:use-module (gnu packages gcc)
> +  #:use-module (gnu packages jemalloc)
> +  #:use-module (gnu packages perl)
> +  #:use-module (gnu packages python))
> +
> +(define rust-bootstrap-x86_64-1.9.0
> +  (origin
> +   (method url-fetch)
> +   (uri
> +    "https://static.rust-lang.org/dist/2016-05-24/rustc-1.9.0-x86_64-unknown-linux-gnu.tar.gz")
> +   (sha256
> +    (base32
> +     "1i44rlvvn3pr81sli6bdbkzd78ar1ibybxx6mzpw6rkw4c84sw6h"))))
> +
> +(define rust-bootstrap-i686-1.9.0
> +  (origin
> +   (method url-fetch)
> +   (uri
> +    "https://static.rust-lang.org/dist/2016-05-24/rustc-1.9.0-i686-unknown-linux-gnu.tar.gz")
> +   (sha256
> +    (base32
> +     "0fdf5xvh3g4hdza0y80w1r9vnfczjqnbzbvs7k878yc26p4dwl99"))))
> +
> +(define-public rust
> +  (package
> +   (name "rust")
> +   (version "1.10.0")
> +   (source (origin
> +            (method url-fetch)
> +            (uri (string-append "https://static.rust-lang.org/dist/rustc-"
> +                                version "-src.tar.gz"))
> +            (sha256
> +             (base32
> +              "0sb82xb8y2pzs8l1hk91z228bambwx3dmi2kj8isin7nyjn5l0d4"))))
> +   (build-system gnu-build-system)
> +   (native-inputs
> +    `(("curl" ,curl)
> +      ("gcc" ,gcc)
> +      ("gcc-lib" ,gcc "lib")
> +      ("jemalloc" ,jemalloc)
> +      ("patchelf" ,patchelf)
> +      ("perl" ,perl)
> +      ("python" ,python-2)
> +      ("rust-bootstrap"
> +       ,(if (string-match "x86_64"
> +                          (or (%current-target-system) (%current-system)))
> +            rust-bootstrap-x86_64-1.9.0
> +            rust-bootstrap-i686-1.9.0))
> +      ("which" ,which)))
> +   (arguments
> +    `(#:phases
> +      (modify-phases %standard-phases
> +        (add-after 'unpack 'unpack-bootstrap
> +                   (lambda* (#:key inputs #:allow-other-keys)
> +                     (with-directory-excursion (getcwd)
> +                       (zero? (system*
> +                               "tar"
> +                               "--strip-components=1"
> +                               "-xzf"
> +                               (assoc-ref inputs "rust-bootstrap"))))))
> +        (replace 'configure
> +                 (lambda* (#:key inputs outputs #:allow-other-keys)
> +                   (let ((out (assoc-ref outputs "out"))
> +                         (binutils (assoc-ref inputs "binutils"))
> +                         (gcc (assoc-ref inputs "gcc"))
> +                         (gcc-lib (assoc-ref inputs "gcc-lib"))
> +                         (jemalloc (assoc-ref inputs "jemalloc"))
> +                         (ld-so (string-append
> +                                 (assoc-ref inputs "libc")
> +                                 ,(glibc-dynamic-linker)))
> +                         (python (assoc-ref inputs "python")))
> +                     (setenv "SHELL" (which "sh"))
> +                     (setenv "CONFIG_SHELL" (which "sh"))
> +                     ;; Tell where to find libgcc_s.so
> +                     (setenv "LD_LIBRARY_PATH" (string-append gcc-lib "/lib"))
> +                     ;; Remove reference to "/lib64/ld-linux-x86-64.so.2" from binary
> +                     (zero? (system*
> +                             "patchelf"
> +                             "--set-interpreter" ld-so
> +                             "rustc/bin/rustc"))
> +                     (zero? (system*
> +                             "./configure"
> +                             (string-append "--prefix=" out)
> +                             (string-append "--default-linker=" gcc "/bin/gcc")
> +                             (string-append "--default-ar=" binutils "/bin/ar")
> +                             (string-append "--jemalloc-root=" jemalloc "/lib")
> +                             (string-append "--enable-rpath")
> +                             (string-append "--enable-local-rust")
> +                             (string-append "--local-rust-root=" (getcwd) "/rustc")
> +                             (string-append "--python=" python "/bin/python2")
> +                             "--disable-manage-submodules")))))
> +        (add-before 'build 'create-linker-wrapper
> +                    (lambda _
> +                      (let* ((bindir (string-append (getcwd) "/bin"))
> +                             (cc (string-append bindir "/cc")))
> +                        (mkdir bindir)
> +                        (call-with-output-file cc
> +                          (lambda (port)
> +                            (format port
> +                                    "#!~a\n\nexec gcc \"$@\"\n" (which "sh"))))
> +                        (chmod cc #o755))))
> +        (add-before 'build 'change-PATH
> +                    (lambda _
> +                      (setenv "PATH"
> +                              (string-append (getcwd)
> +                                             "/bin:"
> +                                             (getenv "PATH"))))))
> +      ;; Disable tests which can only be run from Git repository
> +      #:tests? #f))
> +   (synopsis "Compiler for the Rust progamming language")
> +   (description
> +    "Rust is a systems programming language that runs blazingly fast, prevents
> +segfaults, and guarantees thread safety.")
> +   (home-page "https://www.rust-lang.org")
> +   (license (list asl2.0 (x11-style "file://LICENSE-MIT")))))
> -- 
> 2.4.11
>
>

-- 
ng0
For non-prism friendly talk find me on http://www.psyced.org