From cfeb51a6de11393aa275c0bf23b620572d2fd9ad Mon Sep 17 00:00:00 2001 From: kiasoc5 Date: Tue, 15 Nov 2022 21:49:02 -0500 Subject: gnu: trash-cli: Update to 0.22.10.20. * gnu/packages/shellutils.scm (trash-cli): Update to 0.22.10.20. [native-inputs]: Add python-parameterized and python-flexmock. Signed-off-by: Christopher Baines --- gnu/packages/shellutils.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu/packages/shellutils.scm') diff --git a/gnu/packages/shellutils.scm b/gnu/packages/shellutils.scm index e70b9ef706..40f33f5227 100644 --- a/gnu/packages/shellutils.scm +++ b/gnu/packages/shellutils.scm @@ -369,7 +369,7 @@ (define-public envstore (define-public trash-cli (package (name "trash-cli") - (version "0.21.10.24") + (version "0.22.10.20") (source (origin (method git-fetch) @@ -379,7 +379,7 @@ (define-public trash-cli (file-name (git-file-name name version)) (sha256 (base32 - "01is32lk6prwhajvlmgn3xs4fcpmiqivizcqkj9k80jx6mqjifzs")))) + "0hkn0hmwrag56g447ddqapib0s399a6b4a9wlliif6zmirxlww9n")))) (build-system python-build-system) (arguments `(#:phases @@ -410,6 +410,8 @@ (define-public trash-cli (invoke "pytest"))))))) (native-inputs (list python-pytest + python-parameterized + python-flexmock python-mock python-six)) (inputs (list coreutils)) -- cgit v1.2.3 From 024a98cb83c6b7d6bebbd56645bc6534d77f3ebc Mon Sep 17 00:00:00 2001 From: kiasoc5 Date: Tue, 15 Nov 2022 21:49:04 -0500 Subject: gnu: trash-cli: Use G-expressions. * gnu/packages/shellutils.scm (trash-cli)[arguments]: Use G-expressions. Signed-off-by: Christopher Baines --- gnu/packages/shellutils.scm | 51 ++++++++++++++++++++++----------------------- 1 file changed, 25 insertions(+), 26 deletions(-) (limited to 'gnu/packages/shellutils.scm') diff --git a/gnu/packages/shellutils.scm b/gnu/packages/shellutils.scm index 40f33f5227..3fd98ecba8 100644 --- a/gnu/packages/shellutils.scm +++ b/gnu/packages/shellutils.scm @@ -382,32 +382,31 @@ (define-public trash-cli "0hkn0hmwrag56g447ddqapib0s399a6b4a9wlliif6zmirxlww9n")))) (build-system python-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'build 'patch-path-constants - (lambda* (#:key inputs #:allow-other-keys) - (let ((libc (assoc-ref inputs "libc")) - (coreutils (assoc-ref inputs "coreutils"))) - (substitute* "trashcli/list_mount_points.py" - (("\"/lib/libc.so.6\".*") - (string-append "\"" libc "/lib/libc.so.6\"\n")) - (("\"df\"") - (string-append "\"" coreutils "/bin/df\"")))))) - (add-before 'build 'fix-setup.py - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin"))) - (mkdir-p bin) - (substitute* "setup.py" - (("add_script\\('") - (string-append "add_script('" bin "/" )))))) - ;; Whenever setup.py is invoked, scripts in out/bin/ are - ;; replaced. Thus we cannot invoke setup.py for testing. - ;; Upstream also uses pytest. - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (invoke "pytest"))))))) + (list #:phases + #~(modify-phases %standard-phases + (add-before 'build 'patch-path-constants + (lambda* (#:key inputs #:allow-other-keys) + (let ((libc (search-input-file inputs "lib/libc.so.6")) + (df #$(file-append coreutils "/bin/df"))) + (substitute* "trashcli/list_mount_points.py" + (("\"/lib/libc.so.6\".*") + (string-append "\"" libc "\"\n")) + (("\"df\"") + (string-append "\"" df "\"")))))) + (add-before 'build 'fix-setup.py + (lambda* (#:key outputs #:allow-other-keys) + (let ((bin (string-append #$output "/bin"))) + (mkdir-p bin) + (substitute* "setup.py" + (("add_script\\('") + (string-append "add_script('" bin "/" )))))) + ;; Whenever setup.py is invoked, scripts in out/bin/ are + ;; replaced. Thus we cannot invoke setup.py for testing. + ;; Upstream also uses pytest. + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "pytest"))))))) (native-inputs (list python-pytest python-parameterized -- cgit v1.2.3 From 81f3f31b3c29001d353fdca91e34523e0c2110bd Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 11 Dec 2022 01:00:00 +0100 Subject: gnu: direnv: Update to 2.32.2. * gnu/packages/shellutils.scm (direnv): Update to 2.32.2. --- gnu/packages/shellutils.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/shellutils.scm') diff --git a/gnu/packages/shellutils.scm b/gnu/packages/shellutils.scm index 3fd98ecba8..0f7616616e 100644 --- a/gnu/packages/shellutils.scm +++ b/gnu/packages/shellutils.scm @@ -428,7 +428,7 @@ (define-public trash-cli (define-public direnv (package (name "direnv") - (version "2.32.1") + (version "2.32.2") (source (origin (method git-fetch) (uri (git-reference @@ -437,7 +437,7 @@ (define-public direnv (file-name (git-file-name name version)) (sha256 (base32 - "1i473j7j4sx8p83zqlnakskqk0jyd3byajp7jmv2gym9s4k841y7")))) + "17nn4qg1fj4i9rh1gdpbddn2nky71h9dkxyz5a4jsdq25bsx0ps2")))) (build-system go-build-system) (arguments '(#:import-path "github.com/direnv/direnv" -- cgit v1.2.3 From 1752e30f0253cda49bade267e931beaf37a2ab5b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 11 Dec 2022 01:00:01 +0100 Subject: gnu: grml-zsh-config: Update to 0.19.5. * gnu/packages/shellutils.scm (grml-zsh-config): Update to 0.19.5. --- gnu/packages/shellutils.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/shellutils.scm') diff --git a/gnu/packages/shellutils.scm b/gnu/packages/shellutils.scm index 0f7616616e..b1c1373376 100644 --- a/gnu/packages/shellutils.scm +++ b/gnu/packages/shellutils.scm @@ -275,7 +275,7 @@ (define-public zsh-syntax-highlighting (define-public grml-zsh-config (package (name "grml-zsh-config") - (version "0.19.3") + (version "0.19.5") (source (origin (method url-fetch) (uri (string-append @@ -283,7 +283,7 @@ (define-public grml-zsh-config version ".tar.gz")) (sha256 (base32 - "05fri77028znjnvmh8mz3424rn8ilysj7hn8br2hk1qwkp4zzwp9")))) + "0ifw490z3v9ljccbmm04adz39fj2dmx8mjgayxqj0a9ln90yfdc4")))) (build-system copy-build-system) (arguments (list -- cgit v1.2.3 From 91bcc26b1c97d440c203ea9e258ca56a89377bc8 Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Fri, 16 Dec 2022 10:42:04 +0100 Subject: gnu: hstr: Update to 2.6. * gnu/packages/shellutils.scm (hstr): Update to 2.6. Signed-off-by: Mathieu Othacehe --- gnu/packages/shellutils.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/shellutils.scm') diff --git a/gnu/packages/shellutils.scm b/gnu/packages/shellutils.scm index b1c1373376..a192bd16f7 100644 --- a/gnu/packages/shellutils.scm +++ b/gnu/packages/shellutils.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2018 Benjamin Slade ;;; Copyright © 2019 Collin J. Doering -;;; Copyright © 2020 Michael Rohleder +;;; Copyright © 2020, 2022 Michael Rohleder ;;; Copyright © 2020 aecepoglu ;;; Copyright © 2020 Dion Mendel ;;; Copyright © 2021 Brice Waegeneire @@ -519,7 +519,7 @@ (define-public fzy (define-public hstr (package (name "hstr") - (version "2.5") + (version "2.6") (source (origin (method git-fetch) (uri (git-reference @@ -528,7 +528,7 @@ (define-public hstr (file-name (git-file-name name version)) (sha256 (base32 - "0xg10jyiq12bcygi6aa9qq9pki7bipdsvsza037p2iqix19jg0x8")))) + "1iqvqm4mirx7imwwmz4blxbsr215lcgbw3h31ssbs3fk54hq7xn9")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3