From 32189dcd2c098b95fe693e534721cc9271587876 Mon Sep 17 00:00:00 2001 From: SqrtMinusOne Date: Sun, 18 Jun 2023 12:24:57 +0300 Subject: [PATCH] gcc:lib -> libgccjit --- hugo-extended.scm | 70 +++++++++++++++++++++++------------------------ jless.scm | 4 +-- nushell-bin.scm | 38 ++++++++++++------------- starship.scm | 10 +++---- texlab.scm | 62 ++++++++++++++++++++--------------------- 5 files changed, 92 insertions(+), 92 deletions(-) diff --git a/hugo-extended.scm b/hugo-extended.scm index d3b12ba..8324dad 100644 --- a/hugo-extended.scm +++ b/hugo-extended.scm @@ -8,39 +8,39 @@ (define-public hugo-extended (package - (name "hugo-extended") - (version "0.87.0") - (source - (origin - (method url-fetch) - (uri (string-append - "https://github.com/gohugoio/hugo/releases/download/v" - version - "/hugo_extended_" - version - "_Linux-64bit.tar.gz")) - (sha256 - (base32 - "0q52b5kllbc0zzxgvjfk2l3njgadwly52vr9h4ww02b8q29ay5pj")))) - (inputs - `(("gcc:lib" ,gcc "lib"))) - (build-system binary-build-system) - (arguments - `(#:validate-runpath? #f - #:strip-binaries? #f - #:install-plan - `(("hugo" "/bin/")) - #:patchelf-plan - `(("hugo" ("gcc:lib"))) - #:phases - (modify-phases %standard-phases - (replace 'unpack - (lambda* (#:key inputs #:allow-other-keys) - (invoke "tar" "-xvzf" (assoc-ref inputs "source"))))))) - (native-inputs - `(("gzip" ,gzip))) - (synopsis "The world’s fastest framework for building websites.") - (description "Hugo is a static HTML and CSS website generator + (name "hugo-extended") + (version "0.87.0") + (source + (origin + (method url-fetch) + (uri (string-append + "https://github.com/gohugoio/hugo/releases/download/v" + version + "/hugo_extended_" + version + "_Linux-64bit.tar.gz")) + (sha256 + (base32 + "0q52b5kllbc0zzxgvjfk2l3njgadwly52vr9h4ww02b8q29ay5pj")))) + (inputs + `(("libgccjit" ,libgccjit))) + (build-system binary-build-system) + (arguments + `(#:validate-runpath? #f + #:strip-binaries? #f + #:install-plan + `(("hugo" "/bin/")) + #:patchelf-plan + `(("hugo" ("libgccjit"))) + #:phases + (modify-phases %standard-phases + (replace 'unpack + (lambda* (#:key inputs #:allow-other-keys) + (invoke "tar" "-xvzf" (assoc-ref inputs "source"))))))) + (native-inputs + `(("gzip" ,gzip))) + (synopsis "The world’s fastest framework for building websites.") + (description "Hugo is a static HTML and CSS website generator written in Go. It is optimized for speed, ease of use, and configurability. Hugo takes a directory with content and templates and renders them into a full HTML website. @@ -55,5 +55,5 @@ around 1 millisecond. Hugo is designed to work well for any kind of website including blogs, tumbles, and docs.") - (home-page "https://gohugo.io") - (license license:asl2.0))) + (home-page "https://gohugo.io") + (license license:asl2.0))) diff --git a/jless.scm b/jless.scm index d5b3e25..08f1b1d 100644 --- a/jless.scm +++ b/jless.scm @@ -27,9 +27,9 @@ `(#:install-plan `(("jless" "/bin/")) #:patchelf-plan - `(("jless" ("glibc" "libxcb" "gcc:lib"))))) + `(("jless" ("glibc" "libxcb" "libgccjit"))))) (inputs - `(("gcc:lib" ,gcc "lib") + `(("libgccjit" ,libgccjit) ("glibc" ,glibc) ("libxcb" ,libxcb))) (native-inputs diff --git a/nushell-bin.scm b/nushell-bin.scm index 0259634..12ef09b 100644 --- a/nushell-bin.scm +++ b/nushell-bin.scm @@ -1,16 +1,16 @@ (define-module (nushell-bin) - #:use-module (ice-9 string-fun) - #:use-module (gnu packages base) - #:use-module (gnu packages curl) - #:use-module (gnu packages version-control) - #:use-module (gnu packages xorg) - #:use-module (gnu packages tls) - #:use-module (gnu packages compression) - #:use-module (gnu packages gcc) - #:use-module (guix download) - #:use-module (guix packages) - #:use-module ((guix licenses) #:prefix license:) - #:use-module (nonguix build-system binary)) + #:use-module (ice-9 string-fun) + #:use-module (gnu packages base) + #:use-module (gnu packages curl) + #:use-module (gnu packages version-control) + #:use-module (gnu packages xorg) + #:use-module (gnu packages tls) + #:use-module (gnu packages compression) + #:use-module (gnu packages gcc) + #:use-module (guix download) + #:use-module (guix packages) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (nonguix build-system binary)) (define-public nushell-bin (package @@ -36,15 +36,15 @@ #:install-plan `(("nushell" "/bin/" #:exclude ("README.txt" "LICENSE"))) #:patchelf-plan - `(("nushell/nu" ("glibc" "zlib" "gcc:lib")) - ("nushell/nu_plugin_custom_values" ("glibc" "gcc:lib")) - ("nushell/nu_plugin_example" ("glibc" "gcc:lib")) - ("nushell/nu_plugin_gstat" ("glibc" "gcc:lib" "zlib")) - ("nushell/nu_plugin_inc" ("glibc" "gcc:lib")) - ("nushell/nu_plugin_query" ("glibc" "gcc:lib"))))) + `(("nushell/nu" ("glibc" "zlib" "libgccjit")) + ("nushell/nu_plugin_custom_values" ("glibc" "libgccjit")) + ("nushell/nu_plugin_example" ("glibc" "libgccjit")) + ("nushell/nu_plugin_gstat" ("glibc" "libgccjit" "zlib")) + ("nushell/nu_plugin_inc" ("glibc" "libgccjit")) + ("nushell/nu_plugin_query" ("glibc" "libgccjit"))))) (inputs `(("curl" ,curl) - ("gcc:lib" ,gcc "lib") + ("libgccjit" ,libgccjit) ("libgit2" ,libgit2) ("libx11" ,libx11) ("libxcb" ,libxcb) diff --git a/starship.scm b/starship.scm index 3b41e6e..1e79988 100644 --- a/starship.scm +++ b/starship.scm @@ -10,7 +10,7 @@ (define-public starship (package (name "starship-bin") - (version "1.12.0") + (version "1.15.0") (source (origin (method url-fetch) @@ -20,21 +20,21 @@ "/starship-x86_64-unknown-linux-gnu.tar.gz")) (sha256 (base32 - "0zq5mn8m3jaqhx1px108izh5ibi23jcwy0wragip8dy1swb3kzr3")))) + "05dn81h699jjw8q1x1kv28mlk02a3rlirm1p1xwph1j5z8a9a9np")))) (build-system binary-build-system) (arguments `(#:install-plan `(("starship" "/bin/")) #:patchelf-plan - `(("starship" ("gcc:lib" "glibc"))) + `(("starship" ("libgccjit" "glibc"))) #:phases (modify-phases %standard-phases (replace 'unpack (lambda* (#:key inputs #:allow-other-keys) (invoke "tar" "-xvzf" (assoc-ref inputs "source"))))))) (inputs - `(("gcc:lib" ,gcc "lib") - ("glibc" ,glibc))) + `(("glibc" ,glibc) + ("libgccjit" ,libgccjit))) (native-inputs `(("gzip" ,gzip))) (synopsis "Starship is the minimal, blazing fast, and extremely customizable prompt for any shell!") diff --git a/texlab.scm b/texlab.scm index 23490e7..60bfff7 100644 --- a/texlab.scm +++ b/texlab.scm @@ -8,34 +8,34 @@ (define-public texlab (package - (name "texlab-bin") - (version "3.2.0") - (source - (origin - (method url-fetch) - (uri (string-append - "https://github.com/latex-lsp/texlab/releases/download/v" - version - "/texlab-x86_64-linux.tar.gz")) - (sha256 - (base32 - "05wxf7w1kbapr81j0h23cdxvh71cz5bd2sprljxd629s6z33javw")))) - (build-system binary-build-system) - (arguments - `(#:install-plan - `(("texlab" "/bin/")) - #:patchelf-plan - `(("texlab" ("gcc:lib"))) - #:phases - (modify-phases %standard-phases - (replace 'unpack - (lambda* (#:key inputs #:allow-other-keys) - (invoke "tar" "-xvzf" (assoc-ref inputs "source"))))))) - (inputs - `(("gcc:lib" ,gcc "lib"))) - (native-inputs - `(("gzip" ,gzip))) - (synopsis "An implementation of the Language Server Protocol for LaTeX ") - (description "A cross-platform implementation of the Language Server Protocol providing rich cross-editing support for the LaTeX typesetting system. The server may be used with any editor that implements the Language Server Protocol.") - (home-page "https://texlab.netlify.app/") - (license license:gpl3))) + (name "texlab-bin") + (version "3.2.0") + (source + (origin + (method url-fetch) + (uri (string-append + "https://github.com/latex-lsp/texlab/releases/download/v" + version + "/texlab-x86_64-linux.tar.gz")) + (sha256 + (base32 + "05wxf7w1kbapr81j0h23cdxvh71cz5bd2sprljxd629s6z33javw")))) + (build-system binary-build-system) + (arguments + `(#:install-plan + `(("texlab" "/bin/")) + #:patchelf-plan + `(("texlab" ("libgccjit"))) + #:phases + (modify-phases %standard-phases + (replace 'unpack + (lambda* (#:key inputs #:allow-other-keys) + (invoke "tar" "-xvzf" (assoc-ref inputs "source"))))))) + (inputs + `(("libgccjit" ,libgccjit))) + (native-inputs + `(("gzip" ,gzip))) + (synopsis "An implementation of the Language Server Protocol for LaTeX ") + (description "A cross-platform implementation of the Language Server Protocol providing rich cross-editing support for the LaTeX typesetting system. The server may be used with any editor that implements the Language Server Protocol.") + (home-page "https://texlab.netlify.app/") + (license license:gpl3)))