From d5640c587f141ff60127848dc95528ca1a4f1b14 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 28 Mar 2019 09:33:34 +0100 Subject: gnu: googletest: Don't use unstable tarball. * gnu/packages/check.scm (googletest)[source]: Download using git-fetch. * gnu/packages/crypto.scm (encfs)[arguments]: Adjust accordingly. * gnu/packages/gnucash.scm (gnucash)[arguments]: Same. * gnu/packages/terminals.scm (eternalterminal)[arguments]: Same. * gnu/packages/graphics.scm (ogre)[arguments]: Same. Remove now unnecessary custom 'pre-build phase. --- 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 3839aa1b52..2d46585865 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -1042,8 +1042,8 @@ comfortably in a pager or editor. (add-after 'unpack 'insert-googletests (lambda* (#:key inputs #:allow-other-keys) (let ((tests (assoc-ref inputs "googletest"))) - (invoke "tar" "xvf" tests "-C" "external/googletest" - "--strip-components=1")))) + (copy-recursively tests "external/googletest")) + #t)) (add-after 'install 'dont-provide-gtest-libraries (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) -- cgit v1.2.3 From 10eefb70920500a6b8d9ae23df7989b62a61803d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 11 Apr 2019 03:10:48 +0200 Subject: gnu: beep: Update to 1.4.4. * gnu/packages/terminals.scm (beep): Update to 1.4.4. --- 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 2d46585865..103ec128d8 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -377,7 +377,7 @@ to all types of devices that provide serial consoles.") (define-public beep (package (name "beep") - (version "1.4.3") + (version "1.4.4") (source (origin (method git-fetch) @@ -390,7 +390,7 @@ to all types of devices that provide serial consoles.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1gramwa2zm59kqjhv96fi8vg7l6lyffv02h0310vb90naschi99g")))) + (base32 "1bk7g63qpiclbq20iz2x238by8s1b2iafdim7i6dq1i5n01s7lgx")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no tests -- cgit v1.2.3 From 24356427af0844dafd596b300ca80d1d2aa0d93d Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 15 Apr 2019 11:26:44 +0200 Subject: gnu: kmscon: Remove dependency on MESA. * gnu/packages/terminals.scm (kmscon)[inputs]: Remove MESA. [arguments]: Add #:disallowed-references. --- gnu/packages/terminals.scm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'gnu/packages/terminals.scm') diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index 103ec128d8..ece01b5b02 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -252,7 +252,10 @@ compatibility to existing emulators like xterm, gnome-terminal, konsole, etc.") (modules '((guix build utils))))) (build-system gnu-build-system) (arguments - `(#:phases (modify-phases %standard-phases + `(;; The closure of MESA is huge so we'd rather avoid it. + #:disallowed-references (,mesa) + + #:phases (modify-phases %standard-phases (replace 'bootstrap (lambda _ (setenv "NOCONFIGURE" "indeed") @@ -285,7 +288,10 @@ compatibility to existing emulators like xterm, gnome-terminal, konsole, etc.") ("libtsm" ,libtsm) ("libxkbcommon" ,libxkbcommon) ("logind" ,elogind) - ("mesa" ,mesa) + ;; MESA can be used for accelerated video output via OpenGLESv2, but + ;; it's a bit dependency that we'd rather avoid in the installation + ;; image. + ;; ("mesa" ,mesa) ("pango" ,pango) ("udev" ,eudev))) (synopsis "Linux KMS-based terminal emulator") -- cgit v1.2.3 From 2c6c002ab7d23d21d592f3c3d1534c6791db2e72 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 15 Apr 2019 11:27:15 +0200 Subject: gnu: kmscon: Provide source file name. * gnu/packages/terminals.scm (kmscon)[source]: Add 'file-name'. --- 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 ece01b5b02..d0531b0c14 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -249,7 +249,8 @@ compatibility to existing emulators like xterm, gnome-terminal, konsole, etc.") "0q62kjsvy2iwy8adfiygx2bfwlh83rphgxbis95ycspqidg9py87")) (patches (search-patches "kmscon-runtime-keymap-switch.patch")) - (modules '((guix build utils))))) + (modules '((guix build utils))) + (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments `(;; The closure of MESA is huge so we'd rather avoid it. -- cgit v1.2.3 From 14da3daafc8dd92fdabd3367694c930440fd72cb Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 1 May 2019 18:28:31 +0200 Subject: gnu: termite: Update to 15. * gnu/packages/terminals.scm (termite): Update to 15. --- 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 d0531b0c14..a3ea05538b 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -115,7 +115,7 @@ configurable through a graphical wizard.") (define-public termite (package (name "termite") - (version "14") + (version "15") (source (origin (method git-fetch) @@ -127,7 +127,7 @@ configurable through a graphical wizard.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "0dmz9rpc2fdvcwhcmjnhb48ixn403gxpq03g334d1hgjw2hsyx7x")))) + "0hp1x6lj098m3jgna274wv5dv60lnzg22297di68g4hw9djjyd2k")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3