From 93242b54e4eff90432df9de4841297f19b358e55 Mon Sep 17 00:00:00 2001 From: luhui Date: Sun, 25 Apr 2021 16:49:05 +0800 Subject: gnu: global: Fix globash. * gnu/packages/code.scm (global)[arguments]: Add 'fix-globash phase. Signed-off-by: Efraim Flashner --- gnu/packages/code.scm | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'gnu/packages/code.scm') diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm index a79d8b4a2b..5518d5f5d2 100644 --- a/gnu/packages/code.scm +++ b/gnu/packages/code.scm @@ -15,6 +15,7 @@ ;;; Copyright © 2020 Maxim Cournoyer ;;; Copyright © 2020 Marius Bakke ;;; Copyright © 2020 Julien Lepiller +;;; Copyright © 2021 lu hui ;;; ;;; This file is part of GNU Guix. ;;; @@ -149,6 +150,12 @@ highlighting your own code that seemed comprehensible when you wrote it.") #:phases (modify-phases %standard-phases + (add-after 'unpack 'fix-globash + (lambda* (#:key inputs #:allow-other-keys) + (let* ((echo (string-append + (assoc-ref inputs "coreutils") "/bin/echo"))) + (substitute* "globash/globash.in" + (("/bin/echo") echo))))) (add-after 'install 'post-install (lambda* (#:key outputs #:allow-other-keys) ;; Install the plugin files in the right place. -- cgit v1.2.3 From f7ff88621310d2902f147b1120210f7e117c461a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 28 Apr 2021 14:37:44 +0300 Subject: gnu: global: Fix cross compiling. Coreutils was removed during patch review erroneously. Reported by Maxime Devos . * gnu/packages/code.scm (global)[inputs]: Add coreutils. --- gnu/packages/code.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages/code.scm') diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm index 5518d5f5d2..25c8064993 100644 --- a/gnu/packages/code.scm +++ b/gnu/packages/code.scm @@ -136,7 +136,8 @@ highlighting your own code that seemed comprehensible when you wrote it.") (base32 "10vvsgx8v54whb4j9mk5qqyb5h3rdd9da0il3wir8pcpksyk0dww")))) (build-system gnu-build-system) - (inputs `(("ncurses" ,ncurses) + (inputs `(("coreutils" ,coreutils) + ("ncurses" ,ncurses) ("libltdl" ,libltdl) ("sqlite" ,sqlite) ("python-wrapper" ,python-wrapper))) -- cgit v1.2.3 From aa74d37b6f4d95461e1b5e43dd560f4cb82a36c3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 2 May 2021 22:56:55 +0200 Subject: gnu: cloc: Update to 1.90. * gnu/packages/code.scm (cloc): Update to 1.90. --- gnu/packages/code.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/code.scm') diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm index 25c8064993..15e004858e 100644 --- a/gnu/packages/code.scm +++ b/gnu/packages/code.scm @@ -242,16 +242,16 @@ COCOMO model or user-provided parameters.") (define-public cloc (package (name "cloc") - (version "1.88") + (version "1.90") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/AlDanial/cloc") - (commit version))) + (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1ixgswzbzv63bl50gb2kgaqr0jcicjz6w610hi9fal1i7744zraw")))) + (base32 "0ic9q6qqw5f1wafp9lpmhr0miasbdb9zr59c0jlymnzffdmnliyc")))) (build-system gnu-build-system) (inputs `(("coreutils" ,coreutils) -- cgit v1.2.3 From bf5374f493772c126a2deba07b9213dd30b65055 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 2 May 2021 23:52:12 +0200 Subject: gnu: global: Update to 6.6.6. * gnu/packages/code.scm (global): Update to 6.6.6. --- gnu/packages/code.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/code.scm') diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm index 15e004858e..2e9b4f0016 100644 --- a/gnu/packages/code.scm +++ b/gnu/packages/code.scm @@ -127,14 +127,14 @@ highlighting your own code that seemed comprehensible when you wrote it.") (define-public global ; a global variable (package (name "global") - (version "6.6.5") + (version "6.6.6") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/global/global-" version ".tar.gz")) (sha256 (base32 - "10vvsgx8v54whb4j9mk5qqyb5h3rdd9da0il3wir8pcpksyk0dww")))) + "0pad5p31rdspyrzqky3ppgx7f6gdlfnwg1c7qm8w1m4qzyppi03m")))) (build-system gnu-build-system) (inputs `(("coreutils" ,coreutils) ("ncurses" ,ncurses) -- cgit v1.2.3