From f3b98f4fec43c951a9e28c67561395992bf190a7 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Wed, 28 Sep 2016 13:30:54 +0200 Subject: gnu: Remove python-setuptools and python2-setuptools from inputs (part 2) This patch contains the changes where removing setuptools from the inputs affected some code-lines beside. * gnu/packages/admin.scm (ansible): Remove all [inputs], [native-inputs] and [propagated-inputs] where python-setuptools or python2-setuptools are the sole entries. Remove python-setuptools and python2-setuptools listed on a line by its own from [inputs], [native-inputs] and [propagated-inputs]. * gnu/packages/backup.scm (duplicity): Likewise. * gnu/packages/bioinformatics.scm (bamm, python2-pybedtools, python2-bx-python, python2-dendropy, python-pysam, python2-pysam, clipper, crossmap, cutadapt, deeptools, grit, idr, python2-warpedlmm, pbtranscript-tofu, seqmagick): Likewise. * gnu/packages/docbook.scm (dblatex): Likewise. * gnu/packages/freedesktop.scm (python-pyxdg, python2-pyxdg): Likewise. * gnu/packages/lirc.scm (python2-lirc): Likewise. * gnu/packages/mp3.scm (eyed3): Likewise. * gnu/packages/nutrition.scm (gourmet): Likewise. * gnu/packages/openstack.scm (python-hacking, python2-hacking, python-os-testr, python2-os-testr, python-stevedore, python2-stevedore, python-tempest-lib, python2-tempest-lib, python-oslo.log, python2-oslo.log, python-keystoneclient, python2-keystoneclient): Likewise. * gnu/packages/password-utils.scm (assword): Likewise. * gnu/packages/python.scm (python-passlib, python2-passlib, python-babel, python2-babel, python-parse-type, python-pytest, python2-pytest, python-scripttest, python2-scripttest, python-testtools, python2-testtools, python-testscenarios, python2-testscenarios, python-subunit, python2-subunit, python-pbr-0.11, python-pbr, python2-pbr, python-testrepository, python2-testrepository, behave, python-wheel, python2-wheel, python-requests, python2-requests, python-jsonschema, python2-jsonschema, python-pyjwt, python2-pyjwt, python-virtualenv, python2-virtualenv, python-jinja2, python2-jinja2, python-joblib, python2-joblib, python-sphinx, python2-sphinx, python-feedgenerator, python2-feedgenerator, python-scikit-image, python2-scikit-image, python-redis, python2-redis, python2-fastlmm, python-numpydoc, python2-numpydoc, python-matplotlib, python2-matplotlib, python2-pysnptools, python-rpy2, python2-rpy2, python-pillow, python2-pillow, python-pycparser, python2-pycparser, python-cffi, python2-cffi, python-cairocffi, python2-cairocffi, python-drmaa, python2-drmaa, python-pathpy, python2-pathpy, python-simplegeneric, python2-simplegeneric, python-ipython, python2-ipython, python-apsw, python2-apsw, python-lxml, python2-lxml, python-networkx, python2-networkx, python-pyzmq, python2-pyzmq, python-mccabe, python2-mccabe, python-mccabe-0.2.1, python-flake8, python2-flake8, python-flake8-2.2.4, python-mistune, python2-mistune, python-ptyprocess, python2-ptyprocess, python-llfuse, python2-llfuse, python-webob, python2-webob, python-xlrd, python2-xlrd, python-tables, python2-tables, python-pip, python2-pip, python-libarchive-c, python2-libarchive-c, python-docopt, python2-docopt, python-pyrfc3339, python2-pyrfc3339, python-configobj, python2-configobj, python-clint, python2-clint, python-rply, python2-rply, python2-rpython, python-widgetsnbextension, python2-widgetsnbextension jupyter, python-jupyter-console, python2-jupyter-console, python-hy, python2-hy, python-urllib3, python2-urllib3, python-rsa, python2-rsa, python-tox, python2-tox, python2-hypothesis, python-paste, python2-paste, python-pastescript, python2-pastescript, python2-unicodecsv, python-pkgconfig, python2-pkgconfig, python2-rope, python-sqlparse, python2-sqlparse, python-gevent, python2-gevent, python-tabulate, python2-tabulate, python-arrow, python2-arrow, python-cleo, python2-cleo, python-fake-factory, python2-fake-factory, ptpython): Likewise. * gnu/packages/rdf.scm (python-rdflib, python2-rdflib): Likewise. * gnu/packages/terminals.scm (asciinema): Likewise. * gnu/packages/version-control.scm (git-annex-remote-hubic): Likewise. * gnu/packages/xdisorg.scm (arandr): Likewise. --- gnu/packages/terminals.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'gnu/packages/terminals.scm') diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index 97dd0a82bd..e1076c7c60 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -161,8 +161,7 @@ insert mode and command mode where keybindings have different functions.") (("'tput'") (string-append "'" ncurses "/bin/tput'")))) #t))))) - (inputs `(("ncurses" ,ncurses) - ("python-setuptools" ,python-setuptools))) + (inputs `(("ncurses" ,ncurses))) (home-page "https://asciinema.org") (synopsis "Terminal session recorder") (description -- cgit v1.2.3 From db913ac431fbffb54465f51cb499e886b21c34fd Mon Sep 17 00:00:00 2001 From: José Miguel Sánchez García Date: Wed, 7 Dec 2016 18:03:09 +0100 Subject: gnu: Add libtermkey. * gnu/packages/terminals.scm (libtermkey): New variable. Signed-off-by: Marius Bakke --- gnu/packages/terminals.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'gnu/packages/terminals.scm') diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index e1076c7c60..efedba480f 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2016 Alex Griffin ;;; Copyright © 2016 David Craven ;;; Copyright © 2016 Ludovic Courtès +;;; Copyright © 2016 José Miguel Sánchez García ;;; ;;; This file is part of GNU Guix. ;;; @@ -36,6 +37,7 @@ #:use-module (gnu packages gnome) #:use-module (gnu packages gtk) #:use-module (gnu packages linux) + #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages wm) @@ -261,6 +263,35 @@ multi-seat support, a replacement for @command{mingetty}, and more.") (supported-systems (filter (cut string-suffix? "-linux" <>) %supported-systems)))) +(define-public libtermkey + (package + (name "libtermkey") + (version "0.18") + (source (origin + (method url-fetch) + (uri (string-append "http://www.leonerd.org.uk/code/" + name "/" name "-" version ".tar.gz")) + (sha256 + (base32 "09ir16kaarv55mnc4jn2sqnjjhzpb1aha51wpd9ayif887g4d5r3")))) + (build-system gnu-build-system) + (arguments + '(#:make-flags (list + "CC=gcc" + (string-append "PREFIX=" (assoc-ref %outputs "out"))) + #:phases (modify-phases %standard-phases + (delete 'configure)) + #:test-target "test")) + (inputs `(("ncurses", ncurses))) + (native-inputs `(("libtool", libtool) + ("perl-test-harness" ,perl-test-harness) + ("pkg-config", pkg-config))) + (synopsis "Keyboard entry processing library for terminal-based programs") + (description + "Libtermkey handles all the necessary logic to recognise special keys, UTF-8 +combining, and so on, with a simple interface.") + (home-page "http://www.leonerd.org.uk/code/libtermkey") + (license license:expat))) + (define-public picocom (package (name "picocom") -- cgit v1.2.3 From 68415aa4e16f1951fa319cca00c322fa96fee494 Mon Sep 17 00:00:00 2001 From: José Miguel Sánchez García Date: Fri, 30 Dec 2016 16:09:36 -0500 Subject: gnu: libtermkey: Update to 0.19. * gnu/packages/terminals.scm (libtermkey): Update to 0.19. Co-authored-by: Leo Famulari --- gnu/packages/terminals.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/terminals.scm') diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index efedba480f..52767ba6cb 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -266,13 +266,13 @@ multi-seat support, a replacement for @command{mingetty}, and more.") (define-public libtermkey (package (name "libtermkey") - (version "0.18") + (version "0.19") (source (origin (method url-fetch) (uri (string-append "http://www.leonerd.org.uk/code/" name "/" name "-" version ".tar.gz")) (sha256 - (base32 "09ir16kaarv55mnc4jn2sqnjjhzpb1aha51wpd9ayif887g4d5r3")))) + (base32 "1ds8gdr8p2dfr970z8kxgfz6x7m1jxmmfrb2aafab3wcni6al1f5")))) (build-system gnu-build-system) (arguments '(#:make-flags (list -- cgit v1.2.3 From abe2ec735fd8c13985901377ba358e51c57e817c Mon Sep 17 00:00:00 2001 From: José Miguel Sánchez García Date: Thu, 5 Jan 2017 00:23:18 +0100 Subject: gnu: Add beep. * gnu/packages/terminals.scm (beep): New variable. Co-authored-by: Tobias Geerinckx-Rice --- gnu/packages/terminals.scm | 37 ++++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) (limited to 'gnu/packages/terminals.scm') diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index 52767ba6cb..0b671d0ba9 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -4,7 +4,8 @@ ;;; Copyright © 2016 Alex Griffin ;;; Copyright © 2016 David Craven ;;; Copyright © 2016 Ludovic Courtès -;;; Copyright © 2016 José Miguel Sánchez García +;;; Copyright © 2016, 2017 José Miguel Sánchez García +;;; Copyright © 2017 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -326,3 +327,37 @@ configuration, testing, and debugging tool. It has also serves well as a low-tech serial communications program to allow access to all types of devices that provide serial consoles.") (license license:gpl2+))) + +(define-public beep + (package + (name "beep") + (version "1.3") + (source (origin + (method url-fetch) + (uri (string-append "http://www.johnath.com/" name "/" + name "-" version ".tar.gz")) + (sha256 + (base32 + "0bgch6jq5cahakk3kbr9549iysf2dik09afixxy5brbxk1xfzb2r")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; no tests. + #:phases + (modify-phases %standard-phases + (delete 'configure) + (add-after 'unpack 'patch-makefile + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "Makefile" (("/usr") (assoc-ref outputs "out"))))) + (add-before 'install 'create-output-directories + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref %outputs "out"))) + (mkdir-p (string-append out "/bin")) + (mkdir-p (string-append out "/man/man1")))))))) + (synopsis "Linux command-line utility to control the PC speaker") + (description "beep allows the user to control the PC speaker with precision, +allowing different sounds to indicate different events. While it can be run +quite happily on the command line, its intended place of residence is within +scripts, notifying the user when something interesting occurs. Of course, it +has no notion of what's interesing, but it's very good at that notifying part.") + (home-page "http://www.johnath.com/beep") + (license license:gpl2+))) -- cgit v1.2.3 From 12c15242f422ab62bc0e653365c692047386b604 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 5 Jan 2017 17:24:03 +0100 Subject: gnu: beep: Ignore substitute* return value. * gnu/packages/terminals.scm (beep)[arguments]: End 'patch-makefile phase with truth. --- gnu/packages/terminals.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages/terminals.scm') diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index 0b671d0ba9..20897860d2 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -347,7 +347,8 @@ types of devices that provide serial consoles.") (delete 'configure) (add-after 'unpack 'patch-makefile (lambda* (#:key outputs #:allow-other-keys) - (substitute* "Makefile" (("/usr") (assoc-ref outputs "out"))))) + (substitute* "Makefile" (("/usr") (assoc-ref outputs "out"))) + #t)) (add-before 'install 'create-output-directories (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref %outputs "out"))) -- cgit v1.2.3