From e1f02f92e90dac57431c3a0c557162fe1d5e9192 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 28 Mar 2017 17:12:20 +0200 Subject: [PATCH] Replace (compose not PROC) with simpler idioms. * gnu/packages/bioinformatics.scm (python-pysam)[arguments] : Use (negate proc) instead of (compose not proc). * guix/import/cran.scm (recursive-import): Likewise. * guix/import/elpa.scm (filter-dependencies): Use 'remove' instead of '(filter (compose not proc) ...)'. --- gnu/packages/bioinformatics.scm | 2 +- guix/import/cran.scm | 2 +- guix/import/elpa.scm | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 232c7db838..477ad60f71 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -1454,7 +1454,7 @@ multiple sequence alignments.") (getenv "PYTHONPATH") ":" (getcwd) "/build/" (car (scandir "build" - (compose not (cut string-prefix? "." <>)))))) + (negate (cut string-prefix? "." <>)))))) ;; Step out of source dir so python does not import from CWD. (with-directory-excursion "tests" (setenv "HOME" "/tmp") diff --git a/guix/import/cran.scm b/guix/import/cran.scm index 0d3ce5aa2d..a5f91fe8d2 100644 --- a/guix/import/cran.scm +++ b/guix/import/cran.scm @@ -336,7 +336,7 @@ dependencies." (cran->guix-package (next state) repo)) ;; predicate - (compose not done?) + (negate done?) ;; generator: update the queue (lambda (state) diff --git a/guix/import/elpa.scm b/guix/import/elpa.scm index c0b0c415cf..b1003304d0 100644 --- a/guix/import/elpa.scm +++ b/guix/import/elpa.scm @@ -57,7 +57,7 @@ past were distributed separately from Emacs." (define (filter-dependencies names) "Remove the package names included with Emacs from the list of NAMES (strings)." - (filter (compose not emacs-standard-library?) names)) + (remove emacs-standard-library? names)) (define (elpa-name->package-name name) "Given the NAME of an Emacs package, return the corresponding Guix name."