From e5d757709a05169e4f1d87baf17358aab0dd8bb1 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 24 Oct 2018 05:43:00 +0200 Subject: gnu: loksh: Don't use unstable tarball. * gnu/packages/shells.scm (loksh)[source]: Use GIT-FETCH and GIT-FILE-NAME. --- gnu/packages/shells.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu/packages/shells.scm') diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index 8362d00f60..7a7f2ae2bd 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -572,13 +572,13 @@ The OpenBSD Korn Shell is a cleaned up and enhanced ksh.") (version "6.3") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/dimkr/loksh/archive/" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/dimkr/loksh.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 - "0i1b60g1p19s5cnzz0nmjzjnxywm9szzyp1rcwfcx3gmzvrwr2sc")))) + (base32 "0hx57y73g807x321wpa6sr0vvw6igwhaq88rrdryjjbw6p4k0vcc")))) (build-system gnu-build-system) (inputs `(("libbsd" ,libbsd))) -- cgit v1.2.3 From 716cd19ad2357cb40f9236512656d5b198ea9806 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 24 Oct 2018 05:52:54 +0200 Subject: gnu: loksh: Update to 6.4. * gnu/packages/shells.scm (loksh): Update to 6.4. [inputs]: Add ncurses. --- gnu/packages/shells.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu/packages/shells.scm') diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index 7a7f2ae2bd..47efe5db1b 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -569,7 +569,7 @@ The OpenBSD Korn Shell is a cleaned up and enhanced ksh.") (define-public loksh (package (name "loksh") - (version "6.3") + (version "6.4") (source (origin (method git-fetch) @@ -578,10 +578,11 @@ The OpenBSD Korn Shell is a cleaned up and enhanced ksh.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0hx57y73g807x321wpa6sr0vvw6igwhaq88rrdryjjbw6p4k0vcc")))) + (base32 "1d92cf5iadj1vwg0wwksaq1691zaxjrd2y4qygj4sdd25zsahj6p")))) (build-system gnu-build-system) (inputs - `(("libbsd" ,libbsd))) + `(("libbsd" ,libbsd) + ("ncurses" ,ncurses))) (native-inputs `(("pkg-config" ,pkg-config))) (arguments -- cgit v1.2.3 From f437e39aa2cd9214b03d5cf4f5bda22441834e04 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 24 Oct 2018 05:54:35 +0200 Subject: gnu: loksh: Use PREFIX. * gnu/packages/shells.scm (loksh)[argumentss]: Substitute PREFIX for DESTDIR #:make-flags. --- gnu/packages/shells.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'gnu/packages/shells.scm') diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index 47efe5db1b..3e9d797e2c 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -586,14 +586,13 @@ The OpenBSD Korn Shell is a cleaned up and enhanced ksh.") (native-inputs `(("pkg-config" ,pkg-config))) (arguments - `(#:tests? #f ;No tests included + `(#:tests? #f ; no tests included #:make-flags (list "CC=gcc" "HAVE_LIBBSD=1" - (string-append "DESTDIR=" - (assoc-ref %outputs "out")) - "PREFIX=") + (string-append "PREFIX=" + (assoc-ref %outputs "out"))) #:phases (modify-phases %standard-phases - (delete 'configure)))) ;No configure script + (delete 'configure)))) ; no configure script (home-page "https://github.com/dimkr/loksh") (synopsis "Korn Shell from OpenBSD") (description -- cgit v1.2.3 From bc74e9e4cd409ec31a227ad3c6ddd1c45a3e5d36 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 11 Nov 2018 12:56:22 +0100 Subject: gnu: scsh: Remove custom bootstrap phase. * gnu/packages/shells.scm (scsh)[arguments]: Remove autoreconf phase. --- gnu/packages/shells.scm | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'gnu/packages/shells.scm') diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index 3e9d797e2c..38eeaa7831 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2015 Jeff Mickey ;;; Copyright © 2016, 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2016 Stefan Reichör -;;; Copyright © 2017 Ricardo Wurmus +;;; Copyright © 2017, 2018 Ricardo Wurmus ;;; Copyright © 2017, 2018 Nils Gillmann ;;; Copyright © 2017, 2018 Leo Famulari ;;; Copyright © 2017 Arun Isaac @@ -414,10 +414,7 @@ use of experts and novices alike.") "/rx"))) (delete-file-recursively "rx") (symlink rxpath "rx")) - #t)) - (add-after 'unpack 'autoreconf - (lambda _ - (invoke "autoreconf")))))) + #t))))) (inputs `(("scheme48" ,scheme48) ("scheme48-rx" ,scheme48-rx))) -- cgit v1.2.3