diff options
author | Marius Bakke <mbakke@fastmail.com> | 2019-06-29 23:23:59 +0200 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2019-06-29 23:23:59 +0200 |
commit | 6e1f8d552b73e508bba47dedb5676ce5ccdcc398 (patch) | |
tree | 952a8fa2652ad26946100707311824b8c7a88768 /gnu/packages/xdisorg.scm | |
parent | c24b896365ebf0c783140e53e000305e682d18c5 (diff) | |
parent | 8e92d5465fc154fed5d06f7e4a64d7dcccded74d (diff) | |
download | patches-6e1f8d552b73e508bba47dedb5676ce5ccdcc398.tar patches-6e1f8d552b73e508bba47dedb5676ce5ccdcc398.tar.gz |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/xdisorg.scm')
-rw-r--r-- | gnu/packages/xdisorg.scm | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 7afa7c74e6..8d547969b3 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -519,6 +519,7 @@ move windows, switch between desktops, etc.).") (git-reference (url "https://github.com/resurrecting-open-source-projects/scrot.git") (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 "1dg0pnmk09p7zlbyxv7d40vf54amrv73y976ds5p7096x6lmlndy")))) (build-system gnu-build-system) @@ -1178,7 +1179,7 @@ connectivity of the X server running on a particular @code{DISPLAY}.") (define-public rofi (package (name "rofi") - (version "1.5.2") + (version "1.5.3") (source (origin (method url-fetch) (uri (string-append "https://github.com/DaveDavenport/rofi/" @@ -1186,7 +1187,7 @@ connectivity of the X server running on a particular @code{DISPLAY}.") version "/rofi-" version ".tar.xz")) (sha256 (base32 - "17faa0rj8vqidrijwx9jrq0c29003n8v3izvc66yssfljgb8kcpj")))) + "0y78ya2va2lg3ww17n11y9awn8lhcp1px2d8gxaimxfqlxczs8la")))) (build-system gnu-build-system) (inputs `(("pango" ,pango) @@ -1206,7 +1207,7 @@ connectivity of the X server running on a particular @code{DISPLAY}.") ("glib:bin" ,glib "bin") ("pkg-config" ,pkg-config))) (arguments - `(#:parallel-tests? #f ; May fail in some circumstances. + `(#:parallel-tests? #f ; fails in some circumstances #:phases (modify-phases %standard-phases (add-before 'configure 'adjust-tests |