From a5b2474037d749f42a816c60f0393941ba97444e Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Tue, 15 Jun 2021 16:31:41 +0000 Subject: gnu: Consolidate duplicate copyright names. * gnu/packages/android.scm: Consolidate copyright lines with the same email address. * gnu/packages/code.scm: Likewise. * gnu/packages/cpp.scm: Likewise. * gnu/packages/databases.scm: Likewise. * gnu/packages/emacs-xyz.scm: Likewise. * gnu/packages/file.scm: Likewise. * gnu/packages/freedesktop.scm: Likewise. * gnu/packages/gl.scm: Likewise. * gnu/packages/gps.scm: Likewise. * gnu/packages/linux.scm: Likewise. * gnu/packages/networking.scm: Likewise. * gnu/packages/python-xyz.scm: Likewise. * gnu/packages/python.scm: Likewise. * gnu/packages/video.scm: Likewise. * gnu/packages/xdisorg.scm: Likewise. * gnu/services/web.scm: Likewise. Signed-off-by: Liliana Marie Prikler --- gnu/packages/xdisorg.scm | 1 - 1 file changed, 1 deletion(-) (limited to 'gnu/packages/xdisorg.scm') diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index eb3f30eca7..2e4eb30a9c 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -13,7 +13,6 @@ ;;; Copyright © 2016, 2018 Ricardo Wurmus ;;; Copyright © 2016, 2017, 2018, 2019, 2020 Efraim Flashner ;;; Copyright © 2016 Leo Famulari -;;; Copyright © 2016 Alex Kost ;;; Copyright © 2016, 2017, 2019, 2020 Marius Bakke ;;; Copyright © 2016 Petter ;;; Copyright © 2017 Mekeor Melire -- cgit v1.2.3 From 328fac47890ad63d1f92c9fd7ed89f8f5f92b336 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 3 Oct 2021 16:24:24 +0200 Subject: gnu: sx: Update to 2.1.7. * gnu/packages/xdisorg.scm (sx): Update to 2.1.7. --- gnu/packages/xdisorg.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu/packages/xdisorg.scm') diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 2e4eb30a9c..9646f55b99 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -2851,7 +2851,7 @@ and execute @file{.desktop} files of the Application type.") (define-public sx (package (name "sx") - (version "2.1.6") + (version "2.1.7") (source (origin (method git-fetch) (uri (git-reference @@ -2860,7 +2860,7 @@ and execute @file{.desktop} files of the Application type.") (file-name (git-file-name name version)) (sha256 (base32 - "0p24ghp1ygvyc2hv81byhxax7491yhcc5priq5ldv07nzl7akagc")))) + "0xv15m30nhcknasqiybj5wwf7l91q4a4jf6xind8x5x00c6br6nl")))) (build-system gnu-build-system) (arguments '(#:tests? #f ; no tests @@ -2869,8 +2869,7 @@ and execute @file{.desktop} files of the Application type.") (list (string-append "PREFIX=" out))) #:phases (modify-phases %standard-phases - ;; no configure script - (delete 'configure)))) + (delete 'configure)))) ; no configure script (propagated-inputs `(("xauth" ,xauth))) (home-page "https://github.com/Earnestly/sx") -- cgit v1.2.3 From ddec076b963a80056fc5af3f0c74dd8870ae491e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 3 Oct 2021 16:30:53 +0200 Subject: gnu: sx: Don't propagate xauth. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/xdisorg.scm (sx)[arguments]: Patch sx to refer to xauth. [propagated-inputs]: Move xauth from here… [inputs]: …to here. --- gnu/packages/xdisorg.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'gnu/packages/xdisorg.scm') diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 9646f55b99..68f856f81f 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -2869,8 +2869,13 @@ and execute @file{.desktop} files of the Application type.") (list (string-append "PREFIX=" out))) #:phases (modify-phases %standard-phases + (add-after 'unpack 'refer-to-xauth + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "sx" + (("\\bxauth\\b" command) + (string-append (assoc-ref inputs "xauth") "/bin/" command))))) (delete 'configure)))) ; no configure script - (propagated-inputs + (inputs `(("xauth" ,xauth))) (home-page "https://github.com/Earnestly/sx") (synopsis "Start an xorg server") -- cgit v1.2.3 From 43c110673263ec3ca66a7a44579a1608d7d053eb Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 3 Oct 2021 22:36:47 +0200 Subject: gnu: slop: Update to 7.6. * gnu/packages/xdisorg.scm (slop): Update to 7.6. --- gnu/packages/xdisorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/xdisorg.scm') diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 68f856f81f..45ea4f2e76 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -802,7 +802,7 @@ of the screen selected by mouse.") (define-public slop (package (name "slop") - (version "7.5") + (version "7.6") (source (origin (method git-fetch) (uri (git-reference @@ -811,7 +811,7 @@ of the screen selected by mouse.") (file-name (git-file-name name version)) (sha256 (base32 - "1k8xxb4rj2fylr4vj16yvsf73cyywliz9cy78pl4ibmi03jhg837")))) + "1xaka98vka5kh3wmby68ifwi6rp0985dj13fgs96bw8a1z3m1l1d")))) (build-system cmake-build-system) (arguments '(#:tests? #f)) ; no "check" target -- cgit v1.2.3